diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/mozconfig.automation thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/mozconfig.automation
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/mozconfig.automation	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/mozconfig.automation	2014-11-26 21:44:57.000000000 +0000
@@ -10,13 +10,10 @@
 # overridden by setting them earlier in the appropriate mozconfig.
 
 mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
-mk_add_options "export MOZ_AUTOMATION_CHECK=${MOZ_AUTOMATION_CHECK-1}"
 mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
 mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
-mk_add_options "export MOZ_AUTOMATION_TALOS_SENDCHANGE=${MOZ_AUTOMATION_TALOS_SENDCHANGE-1}"
-mk_add_options "export MOZ_AUTOMATION_UNITTEST_SENDCHANGE=${MOZ_AUTOMATION_UNITTEST_SENDCHANGE-1}"
 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}"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/mozconfig.vs2010-common thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/mozconfig.vs2010-common
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/mozconfig.vs2010-common	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/mozconfig.vs2010-common	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-# Pymake needs Windows-style paths. Use cmd.exe to hack around this.
-mk_export_correct_style() {
-  mk_add_options "export $1=$(cmd.exe //c echo %$1%)"
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/mozconfig.vs-common thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/mozconfig.vs-common
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/mozconfig.vs-common	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/mozconfig.vs-common	2014-11-26 21:44:57.000000000 +0000
@@ -0,0 +1,4 @@
+# Pymake needs Windows-style paths. Use cmd.exe to hack around this.
+mk_export_correct_style() {
+  mk_add_options "export $1=$(cmd.exe //c echo %$1%)"
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/unix/uniq.pl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/unix/uniq.pl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/unix/uniq.pl	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/unix/uniq.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-#!/usr/bin/env perl
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-##----------------------------##
-##---] CORE/CPAN INCLUDES [---##
-##----------------------------##
-use strict;
-use warnings;
-use Getopt::Long;
-
-##-------------------##
-##---]  EXPORTS  [---##
-##-------------------##
-our $VERSION = qw(1.1);
-
-##-------------------##
-##---]  GLOBALS  [---##
-##-------------------##
-my %argv;
-my $modver = $Getopt::Long::VERSION || 0;
-my $isOldGetopt = ($modver eq '2.25') ? 1 : 0;
-
-###########################################################################
-## Intent: Script init function
-###########################################################################
-sub init
-{
-    if ($isOldGetopt)
-    {
-	# mozilla.build/mingw perl in need of an upgrade
-	# emulate Getopt::Long switch|short:init
-	foreach (qw(debug regex sort))
-	{
-	    if (defined($argv{$_}))
-	    {
-		$argv{$_} ||= 1;
-	    }
-	}
-    }
-} # init
-
-##----------------##
-##---]  MAIN  [---##
-##----------------##
-my @args = ($isOldGetopt)
-    ? qw(debug|d regex|r sort|s)
-    : qw(debug|d:1 regex|r:1 sort|s:1)
-    ;
-
-unless(GetOptions(\%argv, @args))
-{
-    print "Usage: $0\n";
-    print "  --sort   Sort list elements early\n";
-    print "  --regex  Exclude subdirs by pattern\n";
-}
-
-init();
-my $debug = $argv{debug} || 0;
-
-my %seen;
-my @out;
-my @in = ($argv{sort}) ? sort @ARGV : @ARGV;
-
-foreach my $d (@in)
-{
-    next if ($seen{$d}++);
-
-    print "   arg is $d\n" if ($debug);
-
-    if ($argv{regex})
-    {
-        my $found = 0;
-        foreach my $dir (@out)
-	{
-	    my $dirM = quotemeta($dir);
-            $found++, last if ($d eq $dir || $d =~ m!^${dirM}\/!);
-        }
-	print "Adding $d\n" if ($debug && !$found);
-        push @out, $d if (!$found);
-    } else {
-	print "Adding: $d\n" if ($debug);
-        push(@out, $d);
-    }
-}
-
-print "@out\n"
-
-# EOF
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/win32/mozconfig.vs2010 thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/win32/mozconfig.vs2010
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/win32/mozconfig.vs2010	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/win32/mozconfig.vs2010	2014-11-26 21:44:57.000000000 +0000
@@ -4,7 +4,7 @@
 export PATH="/d/msvs10/VSTSDB/Deploy:/d/msvs10/Common7/IDE/:/d/msvs10/VC/BIN:/d/msvs10/Common7/Tools:/d/msvs10/VC/VCPackages:${PATH}"
 export WIN32_REDIST_DIR=/d/msvs10/VC/redist/x86/Microsoft.VC100.CRT
 
-. $topsrcdir/build/mozconfig.vs2010-common
+. $topsrcdir/build/mozconfig.vs-common
 
 mk_export_correct_style LIB
 mk_export_correct_style LIBPATH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/win32/mozconfig.vs2010-win64 thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/win32/mozconfig.vs2010-win64
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/win32/mozconfig.vs2010-win64	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/win32/mozconfig.vs2010-win64	2014-11-26 21:44:57.000000000 +0000
@@ -25,7 +25,7 @@
 ## WindowsSDKDir ##
 export WINDOWSSDKDIR="/c/Program Files (x86)/Windows Kits/8.0/"
 
-. $topsrcdir/build/mozconfig.vs2010-common
+. $topsrcdir/build/mozconfig.vs-common
 
 mk_export_correct_style LIB
 mk_export_correct_style LIBPATH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/win64/mozconfig.vs2010 thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/win64/mozconfig.vs2010
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/build/win64/mozconfig.vs2010	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/build/win64/mozconfig.vs2010	2014-11-26 21:44:57.000000000 +0000
@@ -31,7 +31,7 @@
   export LD=c:/tools/msvs10/VC/BIN/x86_amd64/link.exe
 fi
 
-. $topsrcdir/build/mozconfig.vs2010-common
+. $topsrcdir/build/mozconfig.vs-common
 
 mk_export_correct_style LIB
 mk_export_correct_style LIBPATH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/agenda-listbox.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/agenda-listbox.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/agenda-listbox.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/agenda-listbox.js	2014-11-26 21:44:57.000000000 +0000
@@ -12,7 +12,7 @@
 
 var agendaListbox = {
     agendaListboxControl: null,
-    pendingRefresh: null,
+    mPendingRefreshJobs: null,
     kDefaultTimezone: null,
     showsToday: false
 };
@@ -33,6 +33,7 @@
     var soondays = Preferences.get("calendar.agendaListbox.soondays", 5);
     this.soon = new Synthetic(showSoonHeader, soondays);
     this.periods = [this.today, this.tomorrow, this.soon];
+    this.mPendingRefreshJobs = new Map();
 
     // Make sure the agenda listbox is unloaded
     var self = this;
@@ -603,35 +604,86 @@
  */
 agendaListbox.refreshCalendarQuery =
 function refreshCalendarQuery(aStart, aEnd, aCalendar) {
-    let pendingRefresh = cal.wrapInstance(this.pendingRefresh, Components.interfaces.calIOperation);
-    if (this.pendingRefresh) {
-        if (pendingRefresh) {
-            this.pendingRefresh = null;
-            pendingRefresh.cancel(null);
-        } else {
-            return;
-        }
-    }
-    if (!(aStart || aEnd || aCalendar)) {
-        this.removeListItems();
-    }
-    if (!aStart) {
-        aStart = this.getStart();
-    }
-    if (!aEnd) {
-        aEnd = this.getEnd();
-    }
-    if (aStart && aEnd) {
-        var filter = this.calendar.ITEM_FILTER_CLASS_OCCURRENCES |
-                     this.calendar.ITEM_FILTER_TYPE_EVENT;
-        this.pendingRefresh = true;
-        let refreshCalendar = aCalendar || this.calendar;
-        pendingRefresh = refreshCalendar.getItems(filter, 0, aStart, aEnd,
-                                                  this.calendarOpListener);
-        if (pendingRefresh && pendingRefresh.isPending) { // support for calIOperation
-            this.pendingRefresh = pendingRefresh;
+    let refreshJob = {
+        agendaListbox: this,
+        calendar: null,
+        calId: null,
+        operation: null,
+        cancelled: false,
+
+        onOperationComplete: function(aCalendar, aStatus, aOperationType, aId, aDateTime) {
+            if (this.agendaListbox.mPendingRefreshJobs.has(this.calId)) {
+                this.agendaListbox.mPendingRefreshJobs.delete(this.calId);
+            }
+
+            if (!this.cancelled) {
+                setCurrentEvent();
+            }
+        },
+
+        onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems) {
+            if (this.cancelled || !Components.isSuccessCode(aStatus)) {
+                return;
+            }
+            for (let item of aItems) {
+                this.agendaListbox.addItem(item);
+            }
+        },
+
+        cancel: function() {
+            this.cancelled = true;
+            if (this.operation && this.operation.isPending) {
+                this.operation.cancel();
+                this.operation = null;
+            }
+        },
+
+        execute: function(aStart, aEnd, aCalendar) {
+            if (!(aStart || aEnd || aCalendar)) {
+                this.agendaListbox.removeListItems();
+            }
+
+            if (!aCalendar) {
+                aCalendar = this.agendaListbox.calendar;
+            }
+            if (!aStart) {
+                aStart = this.agendaListbox.getStart();
+            }
+            if (!aEnd) {
+                aEnd = this.agendaListbox.getEnd();
+            }
+            if (!(aStart || aEnd || aCalendar)) {
+                return;
+            }
+
+            if (aCalendar.type == "composite") {
+                // we're refreshing from the composite calendar, so we can cancel
+                // all other pending refresh jobs.
+                this.calId = "composite";
+                for (let job of this.agendaListbox.mPendingRefreshJobs.values()) {
+                    job.cancel();
+                }
+                this.agendaListbox.mPendingRefreshJobs.clear();
+            } else {
+                this.calId = aCalendar.id;
+                if (this.agendaListbox.mPendingRefreshJobs.has(this.calId)) {
+                    this.agendaListbox.mPendingRefreshJobs.get(this.calId).cancel();
+                    this.agendaListbox.mPendingRefreshJobs.delete(this.calId);
+                }
+            }
+            this.calendar = aCalendar;
+
+            let filter = this.calendar.ITEM_FILTER_CLASS_OCCURRENCES |
+                         this.calendar.ITEM_FILTER_TYPE_EVENT;
+            let op = this.calendar.getItems(filter, 0, aStart, aEnd, this);
+            if (op && op.isPending) {
+                this.operation = op;
+                this.agendaListbox.mPendingRefreshJobs.set(this.calId, this);
+            }
         }
-    }
+    };
+
+    refreshJob.execute(aStart, aEnd, aCalendar);
 };
 
 /**
@@ -830,29 +882,6 @@
 };
 
 /**
- * Called when all items have been retrieved from the calendar.
- * @see calIOperationListener
- */
-agendaListbox.calendarOpListener.onOperationComplete =
-function listener_onOperationComplete(calendar, status, optype, id,
-                                      detail) {
-    // signal that the current operation finished.
-    this.agendaListbox.pendingRefresh = null;
-    setCurrentEvent();
-};
-
-/**
- * Called when an item has been retrieved, adds all items to the agenda listbox.
- * @see calIOperationListener
- */
-agendaListbox.calendarOpListener.onGetResult =
-function listener_onGetResult(calendar, status, itemtype, detail, count, items) {
-    if (!Components.isSuccessCode(status))
-        return;
-    items.forEach(this.agendaListbox.addItem, this.agendaListbox);
-};
-
-/**
  * Calendar and composite observer, used to keep agenda listbox up to date.
  * @see calIObserver
  * @see calICompositeObserver
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/calendar-calendars-list.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/calendar-calendars-list.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/calendar-calendars-list.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/calendar-calendars-list.xul	2014-11-26 21:44:57.000000000 +0000
@@ -14,6 +14,17 @@
   <popupset id="calendar-popupset">
     <menupopup id="list-calendars-context-menu"
                onpopupshowing="return calendarListSetupContextMenu(event);">
+      <menuitem id="list-calendars-context-togglevisible"
+                accesskey="&calendar.context.togglevisible.accesskey;"
+                oncommand="toggleCalendarVisible(document.getElementById('list-calendars-context-menu').contextCalendar);"/>
+      <menuitem id="list-calendars-context-showonly"
+                accesskey="&calendar.context.showonly.accesskey;"
+                oncommand="showOnlyCalendar(document.getElementById('list-calendars-context-menu').contextCalendar);"/>
+      <menuitem id="list-calendars-context-showall"
+                label="&calendar.context.showall.label;"
+                accesskey="&calendar.context.showall.accesskey;"
+                oncommand="showAllCalendars();"/>
+      <menuseparator id="list-calendars-context-showops-menuseparator"/>
       <menuitem id="list-calendars-context-new"
                 label="&calendar.context.newserver.label;"
                 accesskey="&calendar.context.newserver.accesskey;"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/calendar-item-editing.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/calendar-item-editing.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/calendar-item-editing.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/calendar-item-editing.js	2014-11-26 21:44:57.000000000 +0000
@@ -138,6 +138,7 @@
                     break;
                 case "offsetnexthour":
                     start = initDate.clone();
+                    start.second = 0;
                     start.minute = 0;
                     start.hour++;
                     start.addDuration(startOffset);
@@ -188,6 +189,7 @@
                     break;
                 case "offsetnexthour":
                     due = start.clone();
+                    due.second = 0;
                     due.minute = 0;
                     due.hour++;
                     due.addDuration(dueOffset);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/calendar-management.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/calendar-management.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/content/calendar-management.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/content/calendar-management.js	2014-11-26 21:44:57.000000000 +0000
@@ -142,6 +142,7 @@
     let calendar;
     let calendars = getCalendarManager().getCalendars({});
     let treeNode = document.getElementById("calendar-list-tree-widget");
+    let composite = getCompositeCalendar();
 
     if (document.popupNode.localName == "tree") {
         // Using VK_APPS to open the context menu will target the tree
@@ -177,10 +178,26 @@
         if (calendars.length > 1) {
             enableElement("list-calendars-context-delete");
         }
+
+        enableElement("list-calendars-context-togglevisible");
+        setElementValue("list-calendars-context-togglevisible", false, "collapsed");
+        let stringName = composite.getCalendarById(calendar.id) ? "hideCalendar" : "showCalendar";
+        setElementValue("list-calendars-context-togglevisible",
+                        cal.calGetString("calendar", stringName, [calendar.name]),
+                        "label");
+        enableElement("list-calendars-context-showonly");
+        setElementValue("list-calendars-context-showonly", false, "collapsed");
+        setElementValue("list-calendars-context-showonly",
+                        cal.calGetString("calendar", "showOnlyCalendar", [calendar.name]),
+                        "label");
     } else {
         disableElement("list-calendars-context-edit");
         disableElement("list-calendars-context-publish");
         disableElement("list-calendars-context-delete");
+        disableElement("list-calendars-context-togglevisible");
+        setElementValue("list-calendars-context-togglevisible", true, "collapsed");
+        disableElement("list-calendars-context-showonly");
+        setElementValue("list-calendars-context-showonly", true, "collapsed");
     }
     return true;
 }
@@ -195,6 +212,55 @@
     document.getElementById("calendar-list-tree-widget").ensureCalendarVisible(aCalendar);
 }
 
+/**
+ * Hides the specified calendar if it is visible, or shows it if it is hidden.
+ *
+ * @param aCalendar   The calendar to show or hide
+ */
+function toggleCalendarVisible(aCalendar) {
+    let composite = getCompositeCalendar();
+    if (composite.getCalendarById(aCalendar.id)) {
+        composite.removeCalendar(aCalendar);
+    } else {
+        composite.addCalendar(aCalendar);
+    }
+}
+
+/**
+ * Shows all hidden calendars.
+ */
+function showAllCalendars() {
+    let composite = getCompositeCalendar();
+    let cals = cal.getCalendarManager().getCalendars({});
+
+    composite.startBatch();
+    for (let calendar of cals) {
+        if (!composite.getCalendarById(calendar.id)) {
+            composite.addCalendar(calendar);
+        }
+    }
+    composite.endBatch();
+}
+
+/**
+ * Shows only the specified calendar, and hides all others.
+ *
+ * @param aCalendar   The calendar to show as the only visible calendar
+ */
+function showOnlyCalendar(aCalendar) {
+    let composite = getCompositeCalendar();
+    let cals = composite.getCalendars({}) || [];
+
+    composite.startBatch();
+    for (let calendar of cals) {
+        if (calendar.id != aCalendar.id) {
+            composite.removeCalendar(calendar);
+        }
+    }
+    composite.addCalendar(aCalendar);
+    composite.endBatch();
+}
+
 var compositeObserver = {
     QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIObserver,
                                            Components.interfaces.calICompositeObserver]),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/modules/calUtils.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/modules/calUtils.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/modules/calUtils.jsm	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/modules/calUtils.jsm	2014-11-26 21:44:57.000000000 +0000
@@ -6,7 +6,7 @@
 
 var gCalThreadingEnabled;
 
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/Preferences.jsm");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/src/calDeletedItems.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/src/calDeletedItems.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/src/calDeletedItems.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/src/calDeletedItems.js	2014-11-26 21:44:57.000000000 +0000
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://calendar/modules/calUtils.jsm");
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
-Components.utils.import("resource:///modules/FileUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/FileUtils.jsm");
 
 /**
  * Handles remembering deleted items.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/src/calRecurrenceDate.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/src/calRecurrenceDate.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/base/src/calRecurrenceDate.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/base/src/calRecurrenceDate.js	2014-11-26 21:44:57.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/. */
 
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://calendar/modules/calUtils.jsm");
 
 function calRecurrenceDate() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/locales/en-US/chrome/calendar/calendar.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/locales/en-US/chrome/calendar/calendar.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/locales/en-US/chrome/calendar/calendar.dtd	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/locales/en-US/chrome/calendar/calendar.dtd	2014-11-26 21:44:58.000000000 +0000
@@ -243,6 +243,16 @@
 <!ENTITY calendar.context.properties.label             "Properties">
 <!ENTITY calendar.context.properties.accesskey         "P">
 
+<!-- LOCALIZATION NOTE (calendar.context.togglevisible.accesskey)
+     This is the access key used for the showCalendar string -->
+<!ENTITY calendar.context.togglevisible.accesskey      "H">
+
+<!-- LOCALIZATION NOTE (calendar.context.showonly.accesskey)
+     This is the access key used for the showOnlyCalendar string -->
+<!ENTITY calendar.context.showonly.accesskey           "O">
+<!ENTITY calendar.context.showall.label                "Show All Calendars">
+<!ENTITY calendar.context.showall.accesskey            "A">
+
 <!ENTITY calendar.context.convertmenu.label              "Convert To">
 <!ENTITY calendar.context.convertmenu.accesskey.mail     "n">
 <!ENTITY calendar.context.convertmenu.accesskey.calendar "v">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/locales/en-US/chrome/calendar/calendar.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/locales/en-US/chrome/calendar/calendar.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/locales/en-US/chrome/calendar/calendar.properties	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/locales/en-US/chrome/calendar/calendar.properties	2014-11-26 21:44:58.000000000 +0000
@@ -589,3 +589,12 @@
 unitMinutes=#1 minute;#1 minutes
 unitHours=#1 hour;#1 hours
 unitDays=#1 day;#1 days
+
+# LOCALIZATION NOTE (showCalendar)
+# Used in calendar list context menu
+#    %1$S will be replaced with the calendar name
+# uses the access key calendar.context.togglevisible.accesskey
+showCalendar=Show %1$S
+hideCalendar=Hide %1$S
+# uses the access key calendar.context.showonly.accesskey
+showOnlyCalendar=Show Only %1$S
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/providers/storage/calStorageUpgrade.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/providers/storage/calStorageUpgrade.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/providers/storage/calStorageUpgrade.jsm	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/providers/storage/calStorageUpgrade.jsm	2014-11-26 21:44:58.000000000 +0000
@@ -66,7 +66,7 @@
  * please file a bug.
  */
 
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://calendar/modules/calUtils.jsm");
 Components.utils.import("resource://calendar/modules/calStorageHelpers.jsm");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/mozmill/testAlarmDefaultValue.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/mozmill/testAlarmDefaultValue.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/mozmill/testAlarmDefaultValue.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/mozmill/testAlarmDefaultValue.js	2014-11-26 21:44:58.000000000 +0000
@@ -8,7 +8,7 @@
  */
 
 Components.utils.import("resource://calendar/modules/calUtils.jsm");
-Components.utils.import("resource:///modules/PluralForm.jsm");
+Components.utils.import("resource://gre/modules/PluralForm.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 var MODULE_NAME = "testAlarmDefaultValue";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/unit/test_alarmservice.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/unit/test_alarmservice.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/unit/test_alarmservice.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/unit/test_alarmservice.js	2014-11-26 21:44:58.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://calendar/modules/calUtils.jsm");
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 const EXPECT_NONE = 0;
 const EXPECT_FIRED = 1;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/unit/test_freebusy_service.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/unit/test_freebusy_service.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/unit/test_freebusy_service.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/unit/test_freebusy_service.js	2014-11-26 21:44:58.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/. */
 
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://calendar/modules/calProviderUtils.jsm");
 
 const cIFI = Components.interfaces.calIFreeBusyInterval;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/unit/test_search_service.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/unit/test_search_service.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/calendar/test/unit/test_search_service.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/calendar/test/unit/test_search_service.js	2014-11-26 21:44:58.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/. */
 
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const HINT_EXACT_MATCH = Components.interfaces.calICalendarSearchProvider.HINT_EXACT_MATCH;
 let search = Components.classes["@mozilla.org/calendar/calendarsearch-service;1"]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/components/public/imIAccount.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/components/public/imIAccount.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/components/public/imIAccount.idl	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/components/public/imIAccount.idl	2014-11-26 21:44:58.000000000 +0000
@@ -259,7 +259,10 @@
 
   attribute short firstConnectionState;
 
-  // Passwords are stored in the toolkit Password Manager.
+  /* Passwords are stored in the toolkit Password Manager.
+   * Warning: Don't attempt to access passwords during startup before
+   * Services.login.initializationPromise has resolved.
+   */
   attribute AUTF8String password;
 
   attribute AUTF8String alias;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/components/src/imAccounts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/components/src/imAccounts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/components/src/imAccounts.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/components/src/imAccounts.js	2014-11-26 21:44:58.000000000 +0000
@@ -161,23 +161,25 @@
   if (this.firstConnectionState == Ci.imIAccount.FIRST_CONNECTION_PENDING)
     this.firstConnectionState = Ci.imIAccount.FIRST_CONNECTION_CRASHED;
 
-  // Try to convert old passwords stored in the preferences.
-  // Don't try too hard if the user has canceled a master password prompt:
-  // we don't want to display several of theses prompts at startup.
-  if (gConvertingOldPasswords && !this.protocol.noPassword) {
-    try {
-      let password = this.prefBranch.getComplexValue(kPrefAccountPassword,
-                                                     Ci.nsISupportsString).data;
-      if (password && !this.password)
-        this.password = password;
-    } catch (e) { /* No password saved in the prefs for this account. */ }
-  }
+  Services.logins.initializationPromise.then(() => {
+    // Try to convert old passwords stored in the preferences.
+    // Don't try too hard if the user has canceled a master password prompt:
+    // we don't want to display several of theses prompts at startup.
+    if (gConvertingOldPasswords && !this.protocol.noPassword) {
+      try {
+        let password = this.prefBranch.getComplexValue(kPrefAccountPassword,
+                                                       Ci.nsISupportsString).data;
+        if (password && !this.password)
+          this.password = password;
+      } catch (e) { /* No password saved in the prefs for this account. */ }
+    }
 
-  // Check for errors that should prevent connection attempts.
-  if (this._passwordRequired && !this.password)
-    this._connectionErrorReason = Ci.imIAccount.ERROR_MISSING_PASSWORD;
-  else if (this.firstConnectionState == Ci.imIAccount.FIRST_CONNECTION_CRASHED)
-    this._connectionErrorReason = Ci.imIAccount.ERROR_CRASHED;
+    // Check for errors that should prevent connection attempts.
+    if (this._passwordRequired && !this.password)
+      this._connectionErrorReason = Ci.imIAccount.ERROR_MISSING_PASSWORD;
+    else if (this.firstConnectionState == Ci.imIAccount.FIRST_CONNECTION_CRASHED)
+      this._connectionErrorReason = Ci.imIAccount.ERROR_CRASHED;
+  });
 }
 
 imAccount.prototype = {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/components/src/imCore.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/components/src/imCore.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/components/src/imCore.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/components/src/imCore.js	2014-11-26 21:44:58.000000000 +0000
@@ -268,8 +268,13 @@
     Services.conversations.initConversations();
     Services.obs.notifyObservers(this, "prpl-init", null);
 
-    if (accounts.autoLoginStatus == Ci.imIAccountsService.AUTOLOGIN_ENABLED)
-      accounts.processAutoLogin();
+    // Wait with automatic connections until the password service
+    // is available.
+    if (accounts.autoLoginStatus == Ci.imIAccountsService.AUTOLOGIN_ENABLED) {
+      Services.logins.initializationPromise.then(() => {
+        Services.accounts.processAutoLogin();
+      });
+    }
   },
   observe: function(aObject, aTopic, aData) {
     if (aTopic == kQuitApplicationGranted)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/modules/imContentSink.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/modules/imContentSink.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/modules/imContentSink.jsm	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/modules/imContentSink.jsm	2014-11-26 21:44:58.000000000 +0000
@@ -102,7 +102,7 @@
   styles: {
     'font-style': true,
     'font-weight': true,
-    '-moz-text-decoration-line': true
+    'text-decoration-line': true
   }
 };
 
@@ -150,9 +150,9 @@
     'font-size': true,
     'font-style': true,
     'font-weight': true,
-    '-moz-text-decoration-color': true,
-    '-moz-text-decoration-style': true,
-    '-moz-text-decoration-line': true
+    'text-decoration-color': true,
+    'text-decoration-style': true,
+    'text-decoration-line': true
   }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/modules/test/test_filtering.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/modules/test/test_filtering.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/modules/test/test_filtering.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/modules/test/test_filtering.js	2014-11-26 21:44:58.000000000 +0000
@@ -148,8 +148,8 @@
     let string = "<span style=\"" + css + "\">foo</span>";
     do_check_eq(string, cleanupImMarkup(string));
   }
-  // text-decoration is a shorthand for several -moz-text-decoration properties.
-  do_check_eq("<span style=\"-moz-text-decoration-line: underline;\">foo</span>",
+  // text-decoration is a shorthand for several text-decoration properties.
+  do_check_eq("<span style=\"text-decoration-line: underline;\">foo</span>",
               cleanupImMarkup("<span style=\"text-decoration: underline\">foo</span>"));
 
   const badCSS = [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/irc/ircBase.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/irc/ircBase.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/irc/ircBase.jsm	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/irc/ircBase.jsm	2014-11-26 21:44:58.000000000 +0000
@@ -204,13 +204,11 @@
           conversation.joining = false;
 
           // If the user parted from this room earlier, confirm the rejoin.
-          // If conversation.chatRoomFields is present, the rejoin was due to
-          // an automatic reconnection, for which we already notify the user.
-          if (!conversation._firstJoin && !conversation.chatRoomFields) {
+          if (conversation._rejoined) {
             conversation.writeMessage(aMessage.origin, _("message.rejoined"),
                                       {system: true});
+            delete conversation._rejoined;
           }
-          delete conversation._firstJoin;
 
           // Ensure chatRoomFields information is available for reconnection.
           if (!conversation.chatRoomFields) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/irc/irc.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/irc/irc.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/irc/irc.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/irc/irc.js	2014-11-26 21:44:58.000000000 +0000
@@ -110,15 +110,6 @@
   }
 }
 
-// This copies all the properties of aBase to aPrototype (which is expected to
-// be the prototype of an object). This is necessary because JavaScript does not
-// support multiple inheritance and both conversation objects have a lot of
-// shared code (but inherit from objects exposing different XPCOM interfaces).
-function copySharedBaseToPrototype(aBase, aPrototype) {
-  for (let property in aBase)
-    aPrototype[property] = aBase[property];
-}
-
 // Properties / methods shared by both ircChannel and ircConversation.
 const GenericIRCConversation = {
   _observedNicks: [],
@@ -276,7 +267,6 @@
   this._modes = new Set();
   this._observedNicks = [];
   this.banMasks = [];
-  this._firstJoin = true;
 }
 ircChannel.prototype = {
   __proto__: GenericConvChatPrototype,
@@ -285,8 +275,8 @@
   // For IRC you're not in a channel until the JOIN command is received, open
   // all channels (initially) as left.
   _left: true,
-  // True until successfully joined for the first time.
-  _firstJoin: false,
+  // True while we are rejoining a channel previously parted by the user.
+  _rejoined: false,
   banMasks: [],
 
   // Overwrite the writeMessage function to apply CTCP formatting before
@@ -555,7 +545,7 @@
     return !this._modes.has("t") || participant.op || participant.halfOp;
   }
 };
-copySharedBaseToPrototype(GenericIRCConversation, ircChannel.prototype);
+Object.assign(ircChannel.prototype, GenericIRCConversation);
 
 function ircParticipant(aName, aConv) {
   this._name = aName;
@@ -628,7 +618,7 @@
     this.notifyObservers(null, "update-conv-title");
   }
 };
-copySharedBaseToPrototype(GenericIRCConversation, ircConversation.prototype);
+Object.assign(ircConversation.prototype, GenericIRCConversation);
 
 function ircSocket(aAccount) {
   this._account = aAccount;
@@ -1512,11 +1502,16 @@
     if (this.channelPrefixes.indexOf(channel[0]) == -1)
       channel = "#" + channel;
 
-    // No need to join a channel we are already in.
     if (this.conversations.has(channel)) {
       let conv = this.getConversation(channel);
-      if (!conv.left)
+      if (!conv.left) {
+        // No need to join a channel we are already in.
         return conv;
+      }
+      else if (!conv.chatRoomFields) {
+        // We are rejoining a channel that was parted by the user.
+        conv._rejoined = true;
+      }
     }
 
     let params = [channel];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/yahoo/test/test_yahooAccount.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/yahoo/test/test_yahooAccount.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/yahoo/test/test_yahooAccount.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/yahoo/test/test_yahooAccount.js	2014-11-26 21:44:58.000000000 +0000
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 let yahoo = {};
 Services.scriptloader.loadSubScript("resource:///components/yahoo.js", yahoo);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/yahoo/test/test_yahooLoginHelper.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/yahoo/test/test_yahooLoginHelper.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/yahoo/test/test_yahooLoginHelper.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/yahoo/test/test_yahooLoginHelper.js	2014-11-26 21:44:58.000000000 +0000
@@ -2,7 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 Components.utils.import("resource:///modules/ArrayBufferUtils.jsm");
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource:///modules/yahoo-session.jsm");
 let yahoo = {};
 Services.scriptloader.loadSubScript("resource:///modules/yahoo-session.jsm", yahoo);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/yahoo/test/test_yahoopacket.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/yahoo/test/test_yahoopacket.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/chat/protocols/yahoo/test/test_yahoopacket.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/chat/protocols/yahoo/test/test_yahoopacket.js	2014-11-26 21:44:58.000000000 +0000
@@ -2,7 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 Components.utils.import("resource:///modules/ArrayBufferUtils.jsm");
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource:///modules/yahoo-session.jsm");
 let yahoo = {};
 Services.scriptloader.loadSubScript("resource:///modules/yahoo-session.jsm", yahoo);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/config/config.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/config/config.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/config/config.mk	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/config/config.mk	2014-11-26 21:44:59.000000000 +0000
@@ -275,10 +275,6 @@
 endif # MOZ_PROFILE_USE
 endif # NO_PROFILE_GUIDED_OPTIMIZE
 
-ifdef _MSC_VER
-OS_LDFLAGS += $(DELAYLOAD_LDFLAGS)
-endif # _MSC_VER
-
 # Does the makefile specifies the internal XPCOM API linkage?
 ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
 DEFINES += -DMOZILLA_INTERNAL_API
@@ -676,24 +672,6 @@
 endif
 EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB)
 
-# EXPAND_LIBNAME - $(call EXPAND_LIBNAME,foo)
-# expands to $(LIB_PREFIX)foo.$(LIB_SUFFIX) or -lfoo, depending on linker
-# arguments syntax. Should only be used for system libraries
-
-# EXPAND_LIBNAME_PATH - $(call EXPAND_LIBNAME_PATH,foo,dir)
-# expands to dir/$(LIB_PREFIX)foo.$(LIB_SUFFIX)
-
-# EXPAND_MOZLIBNAME - $(call EXPAND_MOZLIBNAME,foo)
-# expands to $(DIST)/lib/$(LIB_PREFIX)foo.$(LIB_SUFFIX)
-
-ifdef GNU_CC
-EXPAND_LIBNAME = $(addprefix -l,$(1))
-else
-EXPAND_LIBNAME = $(foreach lib,$(1),$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
-endif
-EXPAND_LIBNAME_PATH = $(foreach lib,$(1),$(2)/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
-EXPAND_MOZLIBNAME = $(foreach lib,$(1),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
-
 # Include internal ply only if needed
 ifndef MOZ_SYSTEM_PLY
 PLY_INCLUDE = -I$(MOZILLA_DIR)/other-licenses/ply
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/config/rules.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/config/rules.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/config/rules.mk	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/config/rules.mk	2014-11-26 21:44:59.000000000 +0000
@@ -111,7 +111,7 @@
 ifdef FORCE_SHARED_LIB
 # ... except when we really want one
 ifdef NO_EXPAND_LIBS
-LIBRARY			:= $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
+LIBRARY			:= $(REAL_LIBRARY)
 else
 LIBRARY			:= $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 endif
@@ -120,9 +120,13 @@
 ifeq (,$(SDK_LIBRARY)$(DIST_INSTALL)$(NO_EXPAND_LIBS))
 LIBRARY			:= $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 else
+ifdef NO_EXPAND_LIBS
+LIBRARY                 := $(REAL_LIBRARY)
+else
 LIBRARY			:= $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 endif
 endif
+endif
 endif # REAL_LIBRARY
 endif # LIBRARY
 
@@ -442,12 +446,6 @@
 OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
 endif
 
-ifeq ($(OS_ARCH),WINNT)
-ifdef USE_DELAYIMP
-OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
-endif
-endif
-
 #
 # MINGW32
 #
@@ -791,7 +789,8 @@
 endif
 
 $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(STATIC_LIBS_DEPS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS)) $(EXTRA_DEPS) $(GLOBAL_DEPS)
-	$(RM) $(LIBRARY)
+# Always remove both library and library descriptor
+	$(RM) $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 	$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(STATIC_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))
 	$(RANLIB) $@
 
@@ -1198,10 +1197,11 @@
 ifndef NO_DIST_INSTALL
 _XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
 _XPT_NAME_DEST := $(FINAL_TARGET)/components
+_XPT_NAME_TARGET := misc
 INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
-libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
+misc:: $(call mkdir_deps,$(FINAL_TARGET)/components)
 	$(call py_action,buildlist,$(FINAL_TARGET)/components/interfaces.manifest 'interfaces $(XPT_NAME)')
 	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest components/interfaces.manifest')
 endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/build/config.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/build/config.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/build/config.mk	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/build/config.mk	2014-11-26 22:48:04.000000000 +0000
@@ -28,8 +28,6 @@
 
 # Define other variables used throughout the build
 MOZ_DEFAULT_APP_NAME	?= $(MOZ_PKG_BASENAME)
-MOZ_APP_BASENAME	?= $(shell echo $(MOZ_APP_NAME) | sed -n 's/\-.\|\<./\U&/g p')
-MOZ_DEFAULT_APP_BASENAME ?= $(shell echo $(MOZ_DEFAULT_APP_NAME) | sed -n 's/\-.\|\<./\U&/g p')
 
 MOZ_FORCE_UNOFFICIAL_BRANDING = 0
 
@@ -49,8 +47,8 @@
 MOZ_FORCE_UNOFFICIAL_BRANDING = 1
 endif
 
-ifneq ($(MOZ_APP_NAME)$(MOZ_APP_BASENAME),$(MOZ_DEFAULT_APP_NAME)$(MOZ_DEFAULT_APP_BASENAME))
-# If we change MOZ_APP_NAME or MOZ_APP_BASENAME, don't use official branding
+ifneq ($(MOZ_APP_NAME),$(MOZ_DEFAULT_APP_NAME))
+# If we change MOZ_APP_NAME, don't use official branding
 MOZ_FORCE_UNOFFICIAL_BRANDING = 1
 endif
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/build/rules.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/build/rules.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/build/rules.mk	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/build/rules.mk	2014-11-26 22:48:04.000000000 +0000
@@ -2,7 +2,7 @@
 
 # We need this to execute before the debian/control target gets called
 # and before patches are unapplied
-clean:: restore-upstream-files
+clean::
 ifneq (1, $(MOZ_DISABLE_CLEAN_CHECKS))
 	cp debian/control debian/control.old
 	touch debian/control.in
@@ -63,15 +63,14 @@
 
 MOZ_APP_SUBDIR	?=
 
-# The profile directory is determined from the Vendor and Name fields of
-# the application.ini
-ifeq (,$(MOZ_VENDOR))
-PROFILE_BASE =
-else
+# If we change MOZ_APP_NAME, we want to set the profile directory
+# to match
+ifneq (,$(MOZ_VENDOR))
 PROFILE_BASE = $(shell echo $(MOZ_VENDOR) | tr A-Z a-z)/
 endif
-MOZ_PROFILEDIR		:= .$(PROFILE_BASE)$(shell echo $(MOZ_APP_BASENAME) | tr A-Z a-z)
-MOZ_DEFAULT_PROFILEDIR	:= .$(PROFILE_BASE)$(shell echo $(MOZ_DEFAULT_APP_BASENAME) | tr A-Z a-z)
+ifneq ($(MOZ_APP_NAME),$(MOZ_DEFAULT_APP_NAME))
+MOZ_APP_PROFILE	:= .$(PROFILE_BASE)$(MOZ_APP_NAME)
+endif
 
 DEB_AUTO_UPDATE_DEBIAN_CONTROL	= no
 
@@ -132,16 +131,17 @@
 MOZ_PKG_SUPPORT_SUGGESTS ?=
 
 # Defines used for the Mozilla text preprocessor
-MOZ_DEFINES += 	-DMOZ_LIBDIR="$(MOZ_LIBDIR)" -DMOZ_APP_NAME="$(MOZ_APP_NAME)" -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
+MOZ_DEFINES += 	-DMOZ_LIBDIR="$(MOZ_LIBDIR)" -DMOZ_APP_NAME="$(MOZ_APP_NAME)" \
 		-DMOZ_INCDIR="$(MOZ_INCDIR)" -DMOZ_IDLDIR="$(MOZ_IDLDIR)" -DMOZ_VERSION="$(MOZ_VERSION)" -DDEB_HOST_ARCH="$(DEB_HOST_ARCH)" \
 		-DMOZ_DISPLAY_NAME="$(MOZ_DISPLAY_NAME)" -DMOZ_PKG_NAME="$(MOZ_PKG_NAME)" \
 		-DMOZ_BRANDING_OPTION="$(MOZ_BRANDING_OPTION)" -DTOPSRCDIR="$(CURDIR)" -DDEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
 		-DMOZ_ADDONDIR="$(MOZ_ADDONDIR)" -DMOZ_SDKDIR="$(MOZ_SDKDIR)" -DMOZ_DISTDIR="$(MOZ_DISTDIR)" -DMOZ_UPDATE_CHANNEL="$(CHANNEL)" \
-		-DMOZ_OBJDIR="$(MOZ_OBJDIR)" -DDEB_BUILDDIR="$(DEB_BUILDDIR)" -DMOZ_PYTHON="$(MOZ_PYTHON)" -DMOZ_PROFILEDIR="$(MOZ_PROFILEDIR)" \
-		-DMOZ_PKG_BASENAME="$(MOZ_PKG_BASENAME)" -DMOZ_DEFAULT_PROFILEDIR="$(MOZ_DEFAULT_PROFILEDIR)" \
-		-DMOZ_DEFAULT_APP_NAME="$(MOZ_DEFAULT_APP_NAME)" -DMOZ_DEFAULT_APP_BASENAME="$(MOZ_DEFAULT_APP_BASENAME)" \
-		-DDISTRIB_VERSION="$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)"
+		-DMOZ_OBJDIR="$(MOZ_OBJDIR)" -DDEB_BUILDDIR="$(DEB_BUILDDIR)" -DMOZ_PYTHON="$(MOZ_PYTHON)" -DMOZ_PKG_BASENAME="$(MOZ_PKG_BASENAME)" \
+		-DMOZ_DEFAULT_APP_NAME="$(MOZ_DEFAULT_APP_NAME)" -DDISTRIB_VERSION="$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)"
 
+ifneq (,$(MOZ_APP_PROFILE))
+MOZ_DEFINES += -DMOZ_APP_PROFILE="$(MOZ_APP_PROFILE)"
+endif
 ifeq (1, $(MOZ_ENABLE_BREAKPAD))
 MOZ_DEFINES += -DMOZ_ENABLE_BREAKPAD
 endif
@@ -393,29 +393,6 @@
 	cp debian/config/locales.shipped debian/config/locales.shipped.old
 pre-build:: debian/config/locales.shipped $(pkgname_subst_files) $(appname_subst_files) mozconfig
 	$(call cmp_auto_generated_file,debian/config/locales.shipped,refresh-supported-locales)
-pre-build:: debian/stamp-monkey-patch-upstream-files
-
-debian/stamp-monkey-patch-upstream-files:
-	@touch debian/monkey-patch-files
-	@echo "#!/bin/sh" >> debian/monkey-patch-files.sh
-	make -f debian/rules monkey-patch-upstream-files
-	@while read line; do \
-		cp $$line $$line.moz-orig; \
-	done < debian/monkey-patch-files
-	sh debian/monkey-patch-files.sh
-	@rm debian/monkey-patch-files.sh
-	@touch $@
-
-monkey-patch-upstream-files::
-
-restore-upstream-files::
-	@$(if $(wildcard debian/monkey-patch-files), \
-		while read line; do \
-			if [ -f $$line.moz-orig ]; then \
-				mv $$line.moz-orig $$line; \
-			fi \
-		done < debian/monkey-patch-files; \
-		rm debian/monkey-patch-files)
 
 EXTRACT_TARBALL = $(firstword $(shell TMPDIR=`mktemp -d`; tar -jxf $(1) -C $$TMPDIR > /dev/null 2>&1; echo $$TMPDIR/`ls $$TMPDIR/ | head -n1`))
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/changelog thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/changelog
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/changelog	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/changelog	2014-11-26 22:48:04.000000000 +0000
@@ -1,14 +1,32 @@
-thunderbird-trunk (36.0~a1~hg20141114r17084.215607-0ubuntu1~umd1~precise) precise; urgency=medium
+thunderbird-trunk (36.0~a1~hg20141126r17147.217518-0ubuntu1~umd1~precise) precise; urgency=medium
 
   * Refresh patches
     - update debian/patches/unity-menubar.patch
     - update debian/patches/ubuntu-ua-string-changes.patch
     - update debian/patches/revert-removal-of-native-notifications.patch
+    - update debian/patches/dont-include-hyphenation-patterns.patch
   * Disable all of the testsuite related patches and don't install anything
     in to the testsuite package for now. The patches have all bit-rotted,
     we're not running any tests and nobody is driving that anymore
   * Don't do unified builds unconditionally on i386, as they don't crash
     anymore
+  * Don't clone the nightly profile from the default profile at startup
+    - update debian/thunderbird.sh.in
+  * Don't use --with-app-basename to create the co-installable nightly build
+    as it's not useful anymore, and changing the application name to
+    "Thunderbird-Trunk" has always been problematic for code / addons that check
+    the appname. Continue to use --with-app-name as before (which just changes
+    the install name and the remoting name), and add a patch to introduce
+    --with-app-profile, which allows us to change the profile location
+    - update debian/build/rules.mk
+    - update debian/build/config.mk
+    - update debian/config/mozconfig.in
+    - update debian/rules
+    - add debian/patches/support-coinstallable-trunk-build.patch
+    - add debian/patches/set-prgname-to-remoting-name.patch
+    - update debian/patches/series
+  * Drop debian/patches/revert-removal-of-native-notifications.patch - fixed
+    upstream
 
  -- Chris Coulson <chris.coulson@canonical.com>  Sat, 01 Nov 2014 01:36:51 +0000
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/config/mozconfig.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/config/mozconfig.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/config/mozconfig.in	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/config/mozconfig.in	2014-11-26 22:48:04.000000000 +0000
@@ -55,6 +55,12 @@
 ac_add_options --disable-debug
 %%endif
 ac_add_options --disable-elf-hack
+%%if MOZ_APP_NAME != MOZ_DEFAULT_APP_NAME
+ac_add_options --with-app-name=@MOZ_APP_NAME@
+%%endif
+%%ifdef MOZ_APP_PROFILE
+ac_add_options --with-app-profile=@MOZ_APP_PROFILE@
+%%endif
 %%if DEB_HOST_ARCH != i386
 %%if DEB_HOST_ARCH != amd64
 ac_add_options --disable-webrtc
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/control thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/control
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/control	2014-11-14 10:11:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/control	2014-11-26 22:48:09.000000000 +0000
@@ -39,7 +39,7 @@
 	xvfb,
 	python (>= 2.7),
 	libffi-dev (>= 3.0.9) [arm64]
-Build-Conflicts: python-progressbar
+#Build-Conflicts: python-progressbar
 Standards-Version: 3.9.1
 #XS-Testsuite: autopkgtest
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/control.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/control.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/control.in	2014-11-14 10:11:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/control.in	2014-11-26 22:48:09.000000000 +0000
@@ -39,7 +39,7 @@
 	xvfb,
 	python (>= 2.7),
 	libffi-dev (>= 3.0.9) [arm64]
-Build-Conflicts: python-progressbar
+#Build-Conflicts: python-progressbar
 Standards-Version: 3.9.1
 #XS-Testsuite: autopkgtest
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/dont-include-hyphenation-patterns.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/dont-include-hyphenation-patterns.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/dont-include-hyphenation-patterns.patch	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/dont-include-hyphenation-patterns.patch	2014-11-26 22:48:04.000000000 +0000
@@ -8,11 +8,11 @@
 --- thunderbird-trunk-22.0~a1~hg20130317r12132.125128.orig/mail/installer/package-manifest.in	2013-03-18 02:59:56.000000000 +0000
 +++ thunderbird-trunk-22.0~a1~hg20130317r12132.125128/mail/installer/package-manifest.in	2013-03-18 22:48:38.427893985 +0000
 @@ -39,7 +39,7 @@
- @BINPATH@/@PREF_DIR@/all-l10n.js
- @BINPATH@/searchplugins/*
- @BINPATH@/dictionaries/*
--@BINPATH@/hyphenation/*
-+; @BINPATH@/hyphenation/*
+ @RESPATH@/@PREF_DIR@/all-l10n.js
+ @RESPATH@/searchplugins/*
+ @RESPATH@/dictionaries/*
+-@RESPATH@/hyphenation/*
++; @RESPATH@/hyphenation/*
  #ifdef XP_WIN32
  @BINPATH@/uninstall/helper.exe
  #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/revert-removal-of-native-notifications.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/revert-removal-of-native-notifications.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/revert-removal-of-native-notifications.patch	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/revert-removal-of-native-notifications.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-# HG changeset patch
-# Parent 36da3cb921935478b6a37936b18b5c85a33d5617
-# User Chris Coulson <chris.coulson@canonical.com>
-
-Index: thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsAlertsIconListener.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsAlertsIconListener.h	2014-11-03 19:19:05.000000000 +0000
-@@ -0,0 +1,90 @@
-+/* -*- 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 nsAlertsIconListener_h__
-+#define nsAlertsIconListener_h__
-+
-+#include "nsCOMPtr.h"
-+#include "imgINotificationObserver.h"
-+#include "nsStringAPI.h"
-+#include "nsIObserver.h"
-+#include "nsWeakReference.h"
-+
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+
-+class imgIRequest;
-+
-+struct NotifyNotification;
-+
-+class nsAlertsIconListener : public imgINotificationObserver,
-+                             public nsIObserver,
-+                             public nsSupportsWeakReference
-+{
-+public:
-+  NS_DECL_ISUPPORTS
-+  NS_DECL_IMGINOTIFICATIONOBSERVER
-+  NS_DECL_NSIOBSERVER
-+
-+  nsAlertsIconListener();
-+
-+  nsresult InitAlertAsync(const nsAString & aImageUrl,
-+                          const nsAString & aAlertTitle, 
-+                          const nsAString & aAlertText,
-+                          bool aAlertTextClickable,
-+                          const nsAString & aAlertCookie,
-+                          nsIObserver * aAlertListener);
-+
-+  void SendCallback();
-+  void SendClosed();
-+
-+private:
-+  virtual ~nsAlertsIconListener();
-+
-+protected:
-+  nsresult OnStopRequest(imgIRequest* aRequest);
-+  nsresult OnStopFrame(imgIRequest* aRequest);
-+
-+  /**
-+   * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols
-+   * is that notify_notification_new takes three arguments in libnotify.so.4 and
-+   * four in libnotify.so.1.
-+   * Passing the fourth argument as NULL is binary compatible.
-+   */
-+  typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer);
-+  typedef bool (*notify_is_initted_t)(void);
-+  typedef bool (*notify_init_t)(const char*);
-+  typedef GList* (*notify_get_server_caps_t)(void);
-+  typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*);
-+  typedef bool (*notify_notification_show_t)(void*, char*);
-+  typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*);
-+  typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc);
-+
-+  nsCOMPtr<imgIRequest> mIconRequest;
-+  nsCString mAlertTitle;
-+  nsCString mAlertText;
-+
-+  nsCOMPtr<nsIObserver> mAlertListener;
-+  nsString mAlertCookie;
-+
-+  bool mLoadedFrame;
-+  bool mAlertHasAction;
-+
-+  static void* libNotifyHandle;
-+  static bool libNotifyNotAvail;
-+  static notify_is_initted_t notify_is_initted;
-+  static notify_init_t notify_init;
-+  static notify_get_server_caps_t notify_get_server_caps;
-+  static notify_notification_new_t notify_notification_new;
-+  static notify_notification_show_t notify_notification_show;
-+  static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf;
-+  static notify_notification_add_action_t notify_notification_add_action;
-+  NotifyNotification* mNotification;
-+  gulong mClosureHandler;
-+
-+  nsresult StartRequest(const nsAString & aImageUrl);
-+  nsresult ShowAlert(GdkPixbuf* aPixbuf);
-+};
-+
-+#endif
-Index: thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp	2014-11-03 19:19:05.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/. */
-+
-+#include "nsSystemAlertsService.h"
-+#include "nsAlertsIconListener.h"
-+#include "nsAutoPtr.h"
-+
-+NS_IMPL_ADDREF(nsSystemAlertsService)
-+NS_IMPL_RELEASE(nsSystemAlertsService)
-+
-+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService)
-+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
-+   NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
-+NS_INTERFACE_MAP_END_THREADSAFE
-+
-+nsSystemAlertsService::nsSystemAlertsService()
-+{}
-+
-+nsSystemAlertsService::~nsSystemAlertsService()
-+{}
-+
-+nsresult
-+nsSystemAlertsService::Init()
-+{
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl,
-+                                             const nsAString & aAlertTitle, 
-+                                             const nsAString & aAlertText,
-+                                             bool aAlertTextClickable,
-+                                             const nsAString & aAlertCookie,
-+                                             nsIObserver * aAlertListener,
-+                                             const nsAString & aAlertName,
-+                                             const nsAString & aBidi,
-+                                             const nsAString & aLang,
-+                                             const nsAString & aData,
-+                                             nsIPrincipal * principal)
-+{
-+  nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
-+  if (!alertListener)
-+    return NS_ERROR_OUT_OF_MEMORY;
-+
-+  return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
-+                                       aAlertCookie, aAlertListener);
-+}
-+
-+NS_IMETHODIMP
-+nsSystemAlertsService::CloseAlert(const nsAString & aAlertName,
-+                                  nsIPrincipal * principal)
-+{
-+  return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
-Index: thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsSystemAlertsService.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsSystemAlertsService.h	2014-11-03 19:19:05.000000000 +0000
-@@ -0,0 +1,26 @@
-+/* -*- 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 nsSystemAlertsService_h__
-+#define nsSystemAlertsService_h__
-+
-+#include "nsIAlertsService.h"
-+#include "nsCOMPtr.h"
-+
-+class nsSystemAlertsService : public nsIAlertsService
-+{
-+public:
-+  NS_DECL_NSIALERTSSERVICE
-+  NS_DECL_THREADSAFE_ISUPPORTS
-+
-+  nsSystemAlertsService();
-+
-+  nsresult Init();
-+
-+private:
-+  virtual ~nsSystemAlertsService();
-+};
-+
-+#endif /* nsSystemAlertsService_h__ */
-Index: thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/moz.build
-===================================================================
---- thunderbird-trunk-36.0~a1~hg20141101r16984.213438.orig/mozilla/toolkit/system/gnome/moz.build	2014-11-01 20:40:07.000000000 +0000
-+++ thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/moz.build	2014-11-03 19:19:05.000000000 +0000
-@@ -5,7 +5,9 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- SOURCES += [
-+    'nsAlertsIconListener.cpp',
-     'nsGnomeModule.cpp',
-+    'nsSystemAlertsService.cpp',
- ]
- 
- if CONFIG['MOZ_ENABLE_GCONF']:
-Index: thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsGnomeModule.cpp
-===================================================================
---- thunderbird-trunk-36.0~a1~hg20141101r16984.213438.orig/mozilla/toolkit/system/gnome/nsGnomeModule.cpp	2014-11-01 20:40:07.000000000 +0000
-+++ thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsGnomeModule.cpp	2014-11-03 19:19:05.000000000 +0000
-@@ -22,6 +22,8 @@
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
- NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
- #endif
-+#include "nsSystemAlertsService.h"
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
- 
- #ifdef MOZ_ENABLE_GCONF
- NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
-@@ -33,6 +35,7 @@
- NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
- #endif
-+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
- 
- static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
- #ifdef MOZ_ENABLE_GCONF
-@@ -45,6 +48,7 @@
-   { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor },
-   { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
- #endif
-+  { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
-   { nullptr }
- };
- 
-@@ -59,6 +63,7 @@
-   { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID },
-   { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
- #endif
-+  { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
-   { nullptr }
- };
- 
-Index: thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
-===================================================================
---- thunderbird-trunk-36.0~a1~hg20141101r16984.213438.orig/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp	2014-11-01 20:40:07.000000000 +0000
-+++ thunderbird-trunk-36.0~a1~hg20141101r16984.213438/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp	2014-11-03 19:18:21.338061869 +0000
-@@ -8,6 +8,7 @@
- #include "imgILoader.h"
- #include "imgIRequest.h"
- #include "nsNetUtil.h"
-+#include "nsIContentPolicy.h"
- #include "nsIImageToPixbuf.h"
- #include "nsIStringBundle.h"
- #include "nsIObserverService.h"
-@@ -203,7 +204,8 @@
- 
-   return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr,
-                             this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
--                            nullptr, getter_AddRefs(mIconRequest));
-+                            nsIContentPolicy::TYPE_IMAGE,
-+                            getter_AddRefs(mIconRequest));
- }
- 
- void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/series thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/series
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/series	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/series	2014-11-26 22:48:04.000000000 +0000
@@ -5,7 +5,6 @@
 dont-override-general-useragent-locale.patch
 no_neon_on_arm.patch
 unity-menubar.patch
-revert-removal-of-native-notifications.patch
 #test-integration/automation-output-junit-xml.patch
 #test-integration/xpcshell-output-valid-junit-xml.patch
 #test-fixes/mozmill-workaround-shebang-char-limit.patch
@@ -17,3 +16,5 @@
 #test-integration/xpcshell-dont-return-nonzero-on-test-failure.patch
 #test-fixes/xpcshell-chrome-fix-test_bug848297-with-locale-matchOS.patch
 #test-integration/xpcshell-write-time-for-failed-test.patch
+support-coinstallable-trunk-build.patch
+set-prgname-to-remoting-name.patch
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/set-prgname-to-remoting-name.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/set-prgname-to-remoting-name.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/set-prgname-to-remoting-name.patch	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/set-prgname-to-remoting-name.patch	2014-11-26 22:48:04.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Ensure the WM class is set to the remoting name rather than
+ the application name, so that window matching works in the shell with
+ parallel installs
+Author: Chris Coulson <chris.coulson@canonical.com>
+Forwarded: no
+
+Index: firefox-trunk-36.0~a1~hg20141113r215607/mozilla/toolkit/xre/nsAppRunner.cpp
+===================================================================
+--- firefox-trunk-36.0~a1~hg20141113r215607.orig/mozilla/toolkit/xre/nsAppRunner.cpp	2014-11-14 09:30:08.000000000 +0000
++++ firefox-trunk-36.0~a1~hg20141113r215607/mozilla/toolkit/xre/nsAppRunner.cpp	2014-11-14 13:16:28.186684790 +0000
+@@ -3547,7 +3547,7 @@
+ 
+   // Set program name to the one defined in application.ini.
+   {
+-    nsAutoCString program(gAppData->name);
++    nsAutoCString program(gAppData->remotingName);
+     ToLowerCase(program);
+     g_set_prgname(program.get());
+   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/support-coinstallable-trunk-build.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/support-coinstallable-trunk-build.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/support-coinstallable-trunk-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/support-coinstallable-trunk-build.patch	2014-11-26 22:48:04.000000000 +0000
@@ -0,0 +1,26 @@
+Description: Introduce --with-app-profile to change the profile location, so
+ that we can have nightly builds that are fully coinstallable with release
+ builds
+Author: Chris Coulson <chris.coulson@canonical.com>
+Forwarded: no
+
+Index: firefox-trunk-36.0~a1~hg20141113r215607/mozilla/configure.in
+===================================================================
+--- firefox-trunk-36.0~a1~hg20141113r215607.orig/mozilla/configure.in	2014-11-14 13:36:25.000000000 +0000
++++ firefox-trunk-36.0~a1~hg20141113r215607/mozilla/configure.in	2014-11-14 13:37:55.348948101 +0000
+@@ -4158,6 +4158,15 @@
+     MOZ_APP_BASENAME="$WITH_APP_BASENAME"
+ fi
+ 
++MOZ_ARG_WITH_STRING(app-profile,
++[--with-app-profile=APPPROFILE sets MOZ_APP_PROFILE to APPPROFILE],
++WITH_APP_PROFILE=$withval,
++)
++
++if test -n "$WITH_APP_PROFILE" ; then
++    MOZ_APP_PROFILE="$WITH_APP_PROFILE"
++fi
++
+ # Now is a good time to test for logic errors, define mismatches, etc.
+ case "$MOZ_BUILD_APP" in
+ xulrunner)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/unity-menubar.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/unity-menubar.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/patches/unity-menubar.patch	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/patches/unity-menubar.patch	2014-11-26 22:48:04.000000000 +0000
@@ -1,7 +1,7 @@
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/browser/base/content/browser-menubar.inc
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/browser/base/content/browser-menubar.inc
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/browser/base/content/browser-menubar.inc	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/browser/base/content/browser-menubar.inc	2014-11-01 00:15:08.057774885 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/browser/base/content/browser-menubar.inc	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/browser/base/content/browser-menubar.inc	2014-11-26 18:10:27.018413527 +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-36.0~a1~hg20141031r213433/mozilla/browser/components/places/content/places.xul
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/browser/components/places/content/places.xul
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/browser/components/places/content/places.xul	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/browser/components/places/content/places.xul	2014-11-01 00:15:08.057774885 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/browser/components/places/content/places.xul	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/browser/components/places/content/places.xul	2014-11-26 18:10:27.018413527 +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-36.0~a1~hg20141031r213433/mozilla/modules/libpref/init/all.js
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/modules/libpref/init/all.js
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/modules/libpref/init/all.js	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/modules/libpref/init/all.js	2014-11-01 00:15:08.057774885 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/modules/libpref/init/all.js	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/modules/libpref/init/all.js	2014-11-26 18:10:27.018413527 +0000
 @@ -175,6 +175,9 @@
  pref("browser.sessionhistory.max_total_viewers", -1);
  
@@ -41,10 +41,10 @@
  pref("ui.click_hold_context_menus", false);
  pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
  pref("browser.display.use_document_colors", true);
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/toolkit/content/widgets/popup.xml
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/toolkit/content/widgets/popup.xml
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/toolkit/content/widgets/popup.xml	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/toolkit/content/widgets/popup.xml	2014-11-01 00:15:08.057774885 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/toolkit/content/widgets/popup.xml	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/toolkit/content/widgets/popup.xml	2014-11-26 18:10:27.022413536 +0000
 @@ -25,8 +25,14 @@
          </getter>
        </property>
@@ -62,10 +62,10 @@
  
        <property name="triggerNode" readonly="true"
                  onget="return this.popupBoxObject.triggerNode"/>
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/toolkit/content/xul.css
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/toolkit/content/xul.css
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/toolkit/content/xul.css	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/toolkit/content/xul.css	2014-11-01 00:15:08.057774885 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/toolkit/content/xul.css	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/toolkit/content/xul.css	2014-11-26 18:10:27.022413536 +0000
 @@ -284,6 +284,18 @@
  }
  %endif
@@ -85,10 +85,10 @@
  toolbarseparator {
    -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
  }
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsDbusmenu.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsDbusmenu.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsDbusmenu.cpp	2014-11-01 00:15:08.057774885 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsDbusmenu.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -149,10 +149,10 @@
 +
 +    return NS_OK;
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsDbusmenu.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsDbusmenu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsDbusmenu.h	2014-11-01 00:15:08.057774885 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsDbusmenu.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,99 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -253,10 +253,10 @@
 +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut
 +
 +#endif /* __nsDbusmenu_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenu.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenu.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenu.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenu.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,866 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1124,10 +1124,10 @@
 +
 +    MaybeAddPlaceholderItem();
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenu.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenu.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenu.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,166 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1295,10 +1295,10 @@
 +};
 +
 +#endif /* __nsMenu_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuBar.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuBar.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuBar.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuBar.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,545 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1845,10 +1845,10 @@
 +    DebugOnly<nsresult> rv = RemoveChild(aChild);
 +    NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar");
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuBar.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuBar.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuBar.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuBar.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,112 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1962,10 +1962,10 @@
 +};
 +
 +#endif /* __nsMenuBar_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuContainer.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuContainer.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuContainer.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuContainer.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,179 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2146,10 +2146,10 @@
 +
 +    return aContent;
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuContainer.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuContainer.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuContainer.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuContainer.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,66 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2217,10 +2217,10 @@
 +};
 +
 +#endif /* __nsMenuContainer_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuItem.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuItem.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuItem.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuItem.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,739 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2961,10 +2961,10 @@
 +        UpdateIcon(sc);
 +    }
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuItem.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuItem.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuItem.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuItem.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,107 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -3073,11 +3073,11 @@
 +};
 +
 +#endif /* __nsMenuItem_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuObject.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuObject.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuObject.cpp	2014-11-01 00:43:20.288619652 +0000
-@@ -0,0 +1,706 @@
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuObject.cpp	2014-11-26 18:40:43.303065274 +0000
+@@ -0,0 +1,707 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -3324,8 +3324,9 @@
 +            return;
 +        }
 +
-+        loader->LoadImage(uri, nullptr, nullptr, nullptr, loadGroup, this,
-+                          nullptr, nsIRequest::LOAD_NORMAL, nullptr,
++        loader->LoadImage(uri, nullptr, nullptr, mozilla::net::RP_Default,
++                          nullptr, loadGroup, this, nullptr,
++                          nsIRequest::LOAD_NORMAL, nullptr,
 +                          nsIContentPolicy::TYPE_IMAGE, EmptyString(),
 +                          getter_AddRefs(mImageRequest));
 +    }
@@ -3784,10 +3785,10 @@
 +        weak = weak->GetPrevious();
 +    }
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuObject.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuObject.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuObject.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuObject.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,242 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4031,10 +4032,10 @@
 +};
 +
 +#endif /* __nsMenuObject_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuSeparator.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuSeparator.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuSeparator.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuSeparator.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,90 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4126,10 +4127,10 @@
 +        UpdateVisibility(sc);
 +    }
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuSeparator.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuSeparator.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsMenuSeparator.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsMenuSeparator.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,41 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4172,10 +4173,10 @@
 +};
 +
 +#endif /* __nsMenuSeparator_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuAtomList.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuAtomList.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuAtomList.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuAtomList.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,11 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4188,10 +4189,10 @@
 +WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")
 +WIDGET_ATOM(openedwithkey)
 +WIDGET_ATOM(shellshowingmenubar)
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuAtoms.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuAtoms.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuAtoms.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuAtoms.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,39 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4232,10 +4233,10 @@
 +{
 +    NS_RegisterStaticAtoms(gAtoms);
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuAtoms.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuAtoms.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuAtoms.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuAtoms.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,25 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4262,10 +4263,10 @@
 +};
 +
 +#endif /* __nsNativeMenuAtoms_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuDocListener.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuDocListener.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuDocListener.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuDocListener.cpp	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,369 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4636,10 +4637,10 @@
 +    CancelFlush(this);
 +    mPendingMutations.Clear();
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuDocListener.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuDocListener.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuDocListener.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuDocListener.h	2014-11-26 18:10:27.022413536 +0000
 @@ -0,0 +1,152 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4793,10 +4794,10 @@
 +};
 +
 +#endif /* __nsNativeMenuDocListener_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuService.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuService.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuService.cpp	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuService.cpp	2014-11-26 18:10:27.026413546 +0000
 @@ -0,0 +1,506 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5304,10 +5305,10 @@
 +
 +    return NS_OK;
 +}
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuService.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuService.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuService.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuService.h	2014-11-26 18:10:27.026413546 +0000
 @@ -0,0 +1,88 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5397,10 +5398,10 @@
 +};
 +
 +#endif /* __nsNativeMenuService_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuUtils.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuUtils.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsNativeMenuUtils.h	2014-11-01 00:15:08.061774893 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsNativeMenuUtils.h	2014-11-26 18:10:27.026413546 +0000
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5461,10 +5462,10 @@
 +};
 +
 +#endif /* __nsNativeMenuUtils_h__ */
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsWidgetFactory.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsWidgetFactory.cpp
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/widget/gtk/nsWidgetFactory.cpp	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsWidgetFactory.cpp	2014-11-01 00:15:08.061774893 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/widget/gtk/nsWidgetFactory.cpp	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsWidgetFactory.cpp	2014-11-26 18:10:27.026413546 +0000
 @@ -44,6 +44,9 @@
  #include "GfxInfoX11.h"
  #endif
@@ -5533,11 +5534,11 @@
      nsWidgetGtk2ModuleDtor
  };
  
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsWindow.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsWindow.cpp
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/widget/gtk/nsWindow.cpp	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsWindow.cpp	2014-11-01 00:15:08.061774893 +0000
-@@ -4777,6 +4777,11 @@
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/widget/gtk/nsWindow.cpp	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsWindow.cpp	2014-11-26 18:10:27.026413546 +0000
+@@ -4778,6 +4778,11 @@
      return NS_OK;
  }
  
@@ -5549,10 +5550,10 @@
  bool
  nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
                           bool aIsWheel, bool aAlwaysRollup)
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsWindow.h
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsWindow.h
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/widget/gtk/nsWindow.h	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/nsWindow.h	2014-11-01 00:15:08.061774893 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/widget/gtk/nsWindow.h	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/nsWindow.h	2014-11-26 18:10:27.026413546 +0000
 @@ -34,6 +34,8 @@
  
  #include "nsGtkIMModule.h"
@@ -5562,8 +5563,8 @@
  #undef LOG
  #ifdef MOZ_LOGGING
  
-@@ -148,6 +150,8 @@
-     NS_IMETHOD         MakeFullScreen(bool aFullScreen);
+@@ -149,6 +151,8 @@
+     NS_IMETHOD         MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr);
      NS_IMETHOD         HideWindowChrome(bool aShouldHide);
  
 +    void               SetMenuBar(nsMenuBar *aMenuBar);
@@ -5571,7 +5572,7 @@
      /**
       * GetLastUserInputTime returns a timestamp for the most recent user input
       * event.  This is intended for pointer grab requests (including drags).
-@@ -467,6 +471,8 @@
+@@ -473,6 +477,8 @@
       * however, IME doesn't work at that time.
       */
      nsRefPtr<nsGtkIMModule> mIMModule;
@@ -5580,10 +5581,10 @@
  };
  
  class nsChildWindow : public nsWindow {
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/xpfe/appshell/nsWebShellWindow.cpp
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/xpfe/appshell/nsWebShellWindow.cpp
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2014-11-01 00:15:08.061774893 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2014-11-26 18:10:27.026413546 +0000
 @@ -58,6 +58,7 @@
  #include "nsIScreen.h"
  
@@ -5616,10 +5617,10 @@
    if (nms && menubarContent)
      nms->CreateNativeMenuBar(aParentWindow, menubarContent);
  }
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/moz.build
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/moz.build
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/widget/gtk/moz.build	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/gtk/moz.build	2014-11-01 00:15:08.065774901 +0000
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/widget/gtk/moz.build	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/gtk/moz.build	2014-11-26 18:10:27.026413546 +0000
 @@ -19,11 +19,20 @@
      'nsAppShell.cpp',
      'nsBidiKeyboard.cpp',
@@ -5657,11 +5658,11 @@
      '/layout/xul',
      '/other-licenses/atk-1.0',
      '/widget',
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/browser/base/content/browser.js
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/browser/base/content/browser.js
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/browser/base/content/browser.js	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/browser/base/content/browser.js	2014-11-01 00:15:08.065774901 +0000
-@@ -4475,6 +4475,8 @@
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/browser/base/content/browser.js	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/browser/base/content/browser.js	2014-11-26 18:10:27.026413546 +0000
+@@ -4660,6 +4660,8 @@
    let toolbarNodes = Array.slice(gNavToolbox.childNodes);
    toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
    toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
@@ -5670,11 +5671,11 @@
    return toolbarNodes;
  }
  
-Index: firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/moz.build
+Index: firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/moz.build
 ===================================================================
---- firefox-trunk-36.0~a1~hg20141031r213433.orig/mozilla/widget/moz.build	2014-11-01 00:15:08.065774901 +0000
-+++ firefox-trunk-36.0~a1~hg20141031r213433/mozilla/widget/moz.build	2014-11-01 00:15:08.065774901 +0000
-@@ -36,10 +36,12 @@
+--- firefox-trunk-36.0~a1~hg20141125r217359.orig/mozilla/widget/moz.build	2014-11-26 18:10:27.030413557 +0000
++++ firefox-trunk-36.0~a1~hg20141125r217359/mozilla/widget/moz.build	2014-11-26 18:10:27.026413546 +0000
+@@ -37,10 +37,12 @@
          'nsITaskbarProgress.idl',
      ]
      EXPORTS += [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/rules thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/rules
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/rules	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/rules	2014-11-26 22:48:04.000000000 +0000
@@ -118,30 +118,6 @@
 pre-build::
 	$(shell /usr/bin/docbook-to-man $(CURDIR)/debian/thunderbird.sgml > $(CURDIR)/debian/$(MOZ_APP_NAME).1)
 
-monkey-patch-upstream-files::
-ifneq ($(MOZ_APP_BASENAME),$(MOZ_DEFAULT_APP_BASENAME))
-	@echo "Changing Name in application.ini to $(MOZ_APP_BASENAME)"
-	$(call moz_monkey_patch_file,$(DEB_SRCDIR)/mail/app/application.ini, \
-		sed -i 's/^\(Name\=\).*/\1$(MOZ_APP_BASENAME)/')
-	@echo "Setting MOZ_APP_UA_NAME to $(MOZ_DEFAULT_APP_BASENAME)"
-	$(call moz_monkey_patch_file,$(DEB_SRCDIR)/mail/confvars.sh, \
-		echo "MOZ_APP_UA_NAME=$(MOZ_DEFAULT_APP_BASENAME)" >>)
-	@echo "Setting MOZ_APP_BASENAME to $(MOZ_APP_BASENAME)"
-	$(call moz_monkey_patch_file,$(DEB_SRCDIR)/mail/confvars.sh, \
-		sed -i 's/^\(MOZ_APP_BASENAME\=\).*/\1$(MOZ_APP_BASENAME)/')
-endif
-ifneq ($(MOZ_APP_NAME),$(MOZ_DEFAULT_APP_NAME))
-	@echo "Setting MOZ_APP_NAME to $(MOZ_APP_NAME)"
-	$(call moz_monkey_patch_file,$(DEB_SRCDIR)/mail/confvars.sh, \
-		sed -i 's/^\(MOZ_APP_NAME\=\).*/\1$(MOZ_APP_NAME)/')
-	@echo "Replacing instances of \"%APP%\" with \"thunderbird\" in mail/app/profile/all-thunderbird.js"
-	$(call moz_monkey_patch_file,mail/app/profile/all-thunderbird.js, \
-		sed -ri 's/%APP%/thunderbird/g')
-	@echo "Replacing instances of \"%APP%\" with \"thunderbird\" in $(MOZ_BRANDING_DIR)/thunderbird-branding.js"
-	$(call moz_monkey_patch_file,$(MOZ_BRANDING_DIR)/thunderbird-branding.js, \
-		sed -ri 's/%APP%/thunderbird/g')
-endif
-
 clean::
 	rm -f debian/messagingmenu/*.xpi
 	rm -f debian/eds/*.xpi
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/thunderbird.sh.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/thunderbird.sh.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/debian/thunderbird.sh.in	2014-11-14 10:11:42.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/debian/thunderbird.sh.in	2014-11-26 22:48:04.000000000 +0000
@@ -16,8 +16,6 @@
 MOZ_APP_LAUNCHER=`which $0`
 EXE=@MOZ_APP_NAME@
 MOZ_APP_NAME=@MOZ_APP_NAME@
-MOZ_DEFAULT_PROFILEDIR=@MOZ_DEFAULT_PROFILEDIR@
-MOZ_PROFILEDIR=@MOZ_PROFILEDIR@
 
 export MOZ_APP_LAUNCHER
 
@@ -81,14 +79,6 @@
     esac
 done
 
-%%if MOZ_PROFILEDIR != MOZ_DEFAULT_PROFILEDIR
-if [ $MOZ_PROFILEDIR != $MOZ_DEFAULT_PROFILEDIR ] &&
-   [ ! -e ${HOME}/${MOZ_PROFILEDIR} ] &&
-   [ -d ${HOME}/${MOZ_DEFAULT_PROFILEDIR} ] ; then
-    cp -r ${HOME}/${MOZ_DEFAULT_PROFILEDIR} ${HOME}/${MOZ_PROFILEDIR}
-fi
-%%endif
-
 if [ $moz_debug -eq 1 ] ; then
     case $moz_debugger in
         memcheck)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/editor/ui/dialogs/content/EdReplace.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/editor/ui/dialogs/content/EdReplace.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/editor/ui/dialogs/content/EdReplace.xul	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/editor/ui/dialogs/content/EdReplace.xul	2014-11-26 21:44:59.000000000 +0000
@@ -14,7 +14,7 @@
    persist="screenX screenY"
    buttons="cancel"
    onload = "onLoad()"
-   ondialogaccept="return onFindNext();">
+   ondialogaccept="onFindNext(); return false">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/accounts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/accounts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/accounts.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/accounts.js	2014-11-26 21:44:59.000000000 +0000
@@ -31,37 +31,42 @@
   disableTimerID: 0,
   _connectedLabelInterval: 0,
   load: function am_load() {
-    this.accountList = document.getElementById("accountlist");
-    let defaultID;
-    for (let acc in this.getAccounts()) {
-      var elt = document.createElement("richlistitem");
-      this.accountList.appendChild(elt);
-      elt.build(acc);
-      if (!defaultID && acc.firstConnectionState == acc.FIRST_CONNECTION_CRASHED)
-        defaultID = acc.id;
-    }
-    for each (let event in events)
-      Services.obs.addObserver(this, event, false);
-    if (!this.accountList.getRowCount())
-      // This is horrible, but it works. Otherwise (at least on mac)
-      // the wizard is not centered relatively to the account manager
-      setTimeout(function() { gAccountManager.new(); }, 0);
-    else {
-      // we have accounts, show the list
-      document.getElementById("accountsDesk").selectedIndex = 1;
-
-      // ensure an account is selected
-      if (defaultID)
-        this.selectAccount(defaultID);
-      else
-        this.accountList.selectedIndex = 0;
-    }
+    // Wait until the password service is ready before offering anything.
+    Services.logins.initializationPromise.then(() => {
+      this.accountList = document.getElementById("accountlist");
+      let defaultID;
+      for (let acc in this.getAccounts()) {
+        var elt = document.createElement("richlistitem");
+        this.accountList.appendChild(elt);
+        elt.build(acc);
+        if (!defaultID && acc.firstConnectionState == acc.FIRST_CONNECTION_CRASHED)
+          defaultID = acc.id;
+      }
+      for each (let event in events)
+        Services.obs.addObserver(this, event, false);
+      if (!this.accountList.getRowCount())
+        // This is horrible, but it works. Otherwise (at least on mac)
+        // the wizard is not centered relatively to the account manager
+        setTimeout(function() { gAccountManager.new(); }, 0);
+      else {
+        // we have accounts, show the list
+        document.getElementById("accountsDesk").selectedIndex = 1;
+
+        // ensure an account is selected
+        if (defaultID)
+          this.selectAccount(defaultID);
+        else
+          this.accountList.selectedIndex = 0;
+      }
 
-    this.setAutoLoginNotification();
+      this.setAutoLoginNotification();
 
-    this.accountList.addEventListener("keypress", this.onKeyPress, true);
-    window.addEventListener("unload", this.unload.bind(this));
-    this._connectedLabelInterval = setInterval(this.updateConnectedLabels, 60000);
+      this.accountList.addEventListener("keypress", this.onKeyPress, true);
+      window.addEventListener("unload", this.unload.bind(this));
+      this._connectedLabelInterval = setInterval(this.updateConnectedLabels, 60000);
+    }, () => {
+      this.close();
+    });
   },
   unload: function am_unload() {
     clearInterval(this._connectedLabelInterval);
@@ -256,6 +261,11 @@
     Cc["@mozilla.org/widget/clipboardhelper;1"]
       .getService(Ci.nsIClipboardHelper).copyString(text);
   },
+  showDebugLog: function am_showDebugLog() {
+    if (!("Core" in window))
+      Cu.import("resource:///modules/ibCore.jsm");
+    Core.showDebugLog(this.accountList.selectedItem.account.id);
+  },
   updateConnectedLabels: function am_updateConnectedLabels() {
     for (let i = 0; i < gAccountManager.accountList.itemCount; ++i) {
       let item = gAccountManager.accountList.getItemAtIndex(i);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/accounts.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/accounts.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/accounts.xul	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/accounts.xul	2014-11-26 21:44:59.000000000 +0000
@@ -52,6 +52,10 @@
              label="&account.copyDebugLog.label;"
              accesskey="&account.copyDebugLog.accesskey;"
              oncommand="gAccountManager.copyDebugLog();"/>
+    <command id="cmd_showDebugLog"
+             label="&account.showDebugLog.label;"
+             accesskey="&account.showDebugLog.accesskey;"
+             oncommand="gAccountManager.showDebugLog();"/>
     <command id="cmd_moveup"
              label="&account.moveup.label;"
              oncommand="gAccountManager.moveCurrentItem(-1)"/>
@@ -104,6 +108,8 @@
               observes="contextAccountsItems"/>
     <menuitem id="context_copyDebugLog"
               command="cmd_copyDebugLog"/>
+    <menuitem id="context_showDebugLog"
+              command="cmd_showDebugLog"/>
     <menuseparator id="context_accountsItemsSeparator"
                    observes="contextAccountsItems"/>
     <menuitem command="cmd_new"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/blist.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/blist.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/blist.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/blist.js	2014-11-26 21:44:59.000000000 +0000
@@ -5,7 +5,7 @@
 const Cu = Components.utils;
 
 Cu.import("resource:///modules/imStatusUtils.jsm");
-Cu.import("resource:///modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
 const events = ["buddy-authorization-request",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/debugLog.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/debugLog.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/debugLog.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/debugLog.html	2014-11-26 21:44:59.000000000 +0000
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <link href="chrome://instantbird/skin/debugLog.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/debugLogPanel.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/debugLogPanel.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/debugLogPanel.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/debugLogPanel.xml	2014-11-26 21:44:59.000000000 +0000
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<bindings id="debugLogPanelBindings"
+          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="debugLogPanel">
+    <resources>
+      <stylesheet src="chrome://instantbird/skin/debugLogPanel.css"/>
+    </resources>
+
+    <content flex="1">
+      <xul:vbox flex="1">
+        <xul:toolbar class="debugLogTab-toolbar">
+          <xul:menulist class="accountList" anonid="accountList" flex="1"
+                        onselect="document.getBindingParent(this).onAccountSelect()"/>
+          <xul:toolbarbutton class="debugLogTab-button" anonid="refreshButton"
+                             label="Refresh"
+                             oncommand="document.getBindingParent(this).showDebugLog();"/>
+          <xul:toolbarbutton class="debugLogTab-button" anonid="copyButton"
+                             label="Copy"
+                             oncommand="document.getBindingParent(this).copyDebugLog()"/>
+        </xul:toolbar>
+        <xul:browser anonid="debugLogBrowser" disablehistory="true" type="content"
+                     flex="1" src="chrome://instantbird/content/debugLog.html"/>
+      </xul:vbox>
+    </content>
+
+    <implementation>
+      <property name="browser" readonly="true">
+        <getter>
+          return document.getAnonymousElementByAttribute(this, "anonid", "debugLogBrowser");
+        </getter>
+      </property>
+
+      <property name="accountList" readonly="true">
+        <getter>
+          return document.getAnonymousElementByAttribute(this, "anonid", "accountList");
+        </getter>
+      </property>
+
+      <!-- Only show the debug log if the account list is already populated. This
+           is useful, for example, if we are importing into a new window and only
+           need to repopulate the account list without re-displaying the log. -->
+      <method name="onAccountSelect">
+        <body>
+        <![CDATA[
+          if (this._accountListInited)
+            this.showDebugLog();
+        ]]>
+        </body>
+      </method>
+
+      <!-- This method populates the list of accounts and ensures the specified
+           account is selected. Since the _inited flag is set here before returning,
+           no debug log will be shown. -->
+      <method name="initAccountList">
+        <parameter name="aAccountId"/>
+        <body>
+        <![CDATA[
+          if (!("Services" in window))
+            Components.utils.import("resource:///modules/imServices.jsm");
+          let accounts = Services.accounts.getAccounts();
+          while (accounts.hasMoreElements()) {
+            let acc = accounts.getNext();
+            var proto = acc.protocol;
+            var item = this.accountList.appendItem(acc.name, acc.id, proto.name);
+            item.setAttribute("image", proto.iconBaseURI + "icon.png");
+            item.setAttribute("class", "menuitem-iconic");
+            let accId = acc.id;
+            item.accountId = accId;
+            if (accId == aAccountId)
+              this.accountList.selectedItem = item;
+          }
+          this._accountListInited = true;
+        ]]>
+        </body>
+      </method>
+
+      <method name="copyDebugLog">
+        <body>
+        <![CDATA[
+          Components.classes["@mozilla.org/widget/clipboardhelper;1"]
+                    .getService(Components.interfaces.nsIClipboardHelper)
+                    .copyString(this.browser.contentDocument.body.textContent);
+        ]]>
+        </body>
+      </method>
+
+      <method name="showDebugLog">
+        <body>
+        <![CDATA[
+          let accId = this.accountList.selectedItem.accountId;
+          let account = Services.accounts.getAccountById(accId);
+          this.tab.setAttribute("label", "Debug log for " + account.name);
+          let doc = this.browser.contentDocument;
+          let table = doc.createElement("table");
+          table.style = "width: 100%";
+          // Clear out any existing content before appending the table.
+          doc.body.innerHTML = "";
+          doc.body.appendChild(table);
+          for (let dbgMsg of account.getDebugMessages()) {
+            let m = dbgMsg.message;
+            const dateServ = Cc["@mozilla.org/intl/scriptabledateformat;1"]
+                               .getService(Ci.nsIScriptableDateFormat);
+            let time = new Date(m.timeStamp);
+            time = dateServ.FormatDateTime("", dateServ.dateFormatShort,
+                                           dateServ.timeFormatSeconds,
+                                           time.getFullYear(), time.getMonth() + 1,
+                                           time.getDate(), time.getHours(),
+                                           time.getMinutes(), time.getSeconds());
+            let level = dbgMsg.logLevel;
+            let rowClass = "default";
+            let formattedMsg;
+            if (!level)
+              formattedMsg = "(" + m.errorMessage + ")";
+            else {
+              if (level == dbgMsg.LEVEL_ERROR) {
+                level = "ERROR";
+                rowClass = "error";
+              }
+              else if (level == dbgMsg.LEVEL_WARNING) {
+                level = "WARN.";
+                rowClass = "warn";
+              }
+              else if (level == dbgMsg.LEVEL_LOG) {
+                level = "LOG  ";
+                rowClass = "log";
+              }
+              else {
+                level = "DEBUG";
+                rowClass = "debug";
+              }
+              formattedMsg = level + " (@ " + m.sourceLine +
+                " " + m.sourceName + ":" + m.lineNumber + ")\n" +
+                m.errorMessage;
+            }
+            let tr = doc.createElement("tr");
+            tr.className = rowClass;
+            let timeCell = doc.createElement("td");
+            timeCell.className = "time";
+            let msgCell = doc.createElement("td");
+            msgCell.className = "msg";
+            // The trailing space and newline are necessary to ensure correct
+            // formatting when text is selected/copied.
+            timeCell.textContent = "[" + time + "] ";
+            msgCell.textContent = formattedMsg + "\n";
+            tr.appendChild(timeCell);
+            tr.appendChild(msgCell);
+            table.appendChild(tr);
+          }
+          // Ensure the scroll position is reset.
+          doc.body.scrollTop = 0;
+          doc.body.scrollLeft = 0;
+        ]]>
+        </body>
+      </method>
+
+      <method name="finishImport">
+        <parameter name="aDebugLogPanel"/>
+        <body>
+        <![CDATA[
+          this.browser.swapDocShells(aDebugLogPanel.browser);
+          this.initAccountList(aDebugLogPanel.accountList.selectedItem.accountId);
+          this.tab.setAttribute("label", aDebugLogPanel.tab.getAttribute("label"));
+        ]]>
+        </body>
+      </method>
+    </implementation>
+  </binding>
+</bindings>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/instantbird.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/instantbird.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/instantbird.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/instantbird.css	2014-11-26 21:44:59.000000000 +0000
@@ -14,6 +14,10 @@
   -moz-binding: url("chrome://instantbird/content/newtab.xml#newtab-item");
 }
 
+debugLogPanel {
+  -moz-binding: url("chrome://instantbird/content/debugLogPanel.xml#debugLogPanel")
+}
+
 aboutPanel {
   -moz-binding: url("chrome://instantbird/content/aboutPanel.xml#aboutPanel");
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/jar.mn thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/jar.mn
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/content/jar.mn	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/content/jar.mn	2014-11-26 21:44:59.000000000 +0000
@@ -32,6 +32,8 @@
 	content/instantbird/conversation.xml
 	content/instantbird/conv.xml
 	content/instantbird/credits.xhtml
+	content/instantbird/debugLogPanel.xml
+	content/instantbird/debugLog.html
 	content/instantbird/engineManager.js
 	content/instantbird/engineManager.xul
 	content/instantbird/extensions.js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/installer/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/installer/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/installer/Makefile.in	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/installer/Makefile.in	2014-11-26 21:44:59.000000000 +0000
@@ -120,6 +120,13 @@
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+RESPATH = $(_APPNAME)/Contents/Resources
+else
+RESPATH = $(BINPATH)
+endif
+DEFINES += -DRESPATH=$(RESPATH)
+
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
 ifdef MOZ_NATIVE_ICU
 DEFINES += -DMOZ_NATIVE_ICU
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/installer/package-manifest.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/installer/package-manifest.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/installer/package-manifest.in	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/installer/package-manifest.in	2014-11-26 21:44:59.000000000 +0000
@@ -16,6 +16,19 @@
 ; ; file comment
 ;
 
+; Due to Apple Mac OS X packaging requirements, files that are in the same
+; directory on other platforms must be located in different directories on
+; Mac OS X. The following defines allow specifying the Mac OS X bundle
+; location which also work on other platforms.
+;
+; @BINPATH@
+; Equals Contents/MacOS/ on Mac OS X and is the path to the main binary on other
+; platforms.
+;
+; @RESPATH@
+; Equals Contents/Resources/ on Mac OS X and is equivalent to @BINPATH@ on other
+; platforms.
+
 #filter substitution
 
 #ifdef XP_UNIX
@@ -28,27 +41,27 @@
 ; Mac bundle stuff
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
-@APPNAME@/Contents/Resources/instantbird.icns
-@APPNAME@/Contents/Resources/en.lproj/*
+@RESPATH@/instantbird.icns
+@RESPATH@/en.lproj/*
 #endif
 
 [@AB_CD@]
-@BINPATH@/chrome/@AB_CD@@JAREXT@
-@BINPATH@/chrome/@AB_CD@.manifest
-@BINPATH@/@PREF_DIR@/all-l10n.js
-@BINPATH@/searchplugins/*
-@BINPATH@/dictionaries/*
-@BINPATH@/hyphenation/*
+@RESPATH@/chrome/@AB_CD@@JAREXT@
+@RESPATH@/chrome/@AB_CD@.manifest
+@RESPATH@/@PREF_DIR@/all-l10n.js
+@RESPATH@/searchplugins/*
+@RESPATH@/dictionaries/*
+@RESPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
-@BINPATH@/update.locale
-@BINPATH@/updater.ini
+@RESPATH@/update.locale
+@RESPATH@/updater.ini
 #endif
 
 [xpcom]
-@BINPATH@/dependentlibs.list
+@RESPATH@/dependentlibs.list
 #ifndef MOZ_NATIVE_NSPR
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@@ -57,12 +70,8 @@
 #endif
 #endif
 #ifndef MOZ_STATIC_JS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
-#endif
 #ifdef GKMEDIAS_SHARED_LIBRARY
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
@@ -85,26 +94,18 @@
 @BINPATH@/msvcr110.dll
 #endif
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#endif
 #ifdef MOZ_SHARED_MOZGLUE
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozglue@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
-#endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/XUL
+@BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_CHILD_PROCESS_NAME@.app/
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
@@ -141,134 +142,131 @@
 #endif
 
 ; Modules
-@BINPATH@/modules/*
+@RESPATH@/modules/*
 
 [instantbird]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
-#elif XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 @BINPATH@/@MOZ_APP_NAME@
 #endif
-@BINPATH@/application.ini
-@BINPATH@/platform.ini
+@RESPATH@/application.ini
+@RESPATH@/platform.ini
 #ifndef MOZ_NATIVE_SQLITE
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #endif
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/run-mozilla.sh
+@RESPATH@/run-mozilla.sh
 #ifdef MOZ_UPDATER
-@BINPATH@/icons/*.png
+@RESPATH@/icons/*.png
 #endif
 #endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Instantbird Specific Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-@BINPATH@/defaults/profile/localstore.rdf
-@BINPATH@/defaults/profile/prefs.js
-@BINPATH@/defaults/profile/mimeTypes.rdf
+@RESPATH@/defaults/profile/localstore.rdf
+@RESPATH@/defaults/profile/prefs.js
+@RESPATH@/defaults/profile/mimeTypes.rdf
 
 #ifdef XP_MACOSX
-@BINPATH@/components/ibDockBadge.js
-@BINPATH@/components/ibDockBadge.manifest
+@RESPATH@/components/ibDockBadge.js
+@RESPATH@/components/ibDockBadge.manifest
 #ifdef MOZ_PURPLE
-@BINPATH@/components/components.manifest
+@RESPATH@/components/components.manifest
 #endif
 #else
-@BINPATH@/components/components.manifest
-@BINPATH@/components/@DLL_PREFIX@trayToolkit@DLL_SUFFIX@
-@BINPATH@/components/trayToolkit.xpt
-@BINPATH@/components/profileMigrator.js
-@BINPATH@/components/profileMigrator.manifest
-#endif
-@BINPATH@/components/instantbird.xpt
-@BINPATH@/components/contentHandler.js
-@BINPATH@/components/contentHandler.manifest
-@BINPATH@/components/ibCommandLineHandler.js
-@BINPATH@/components/ibCommandLineHandler.manifest
-@BINPATH@/components/ibConvStatsService.js
-@BINPATH@/components/ibConvStatsService.manifest
-@BINPATH@/components/ibStatusCommandLineHandler.js
-@BINPATH@/components/ibStatusCommandLineHandler.manifest
-@BINPATH@/components/xpcom_base.xpt
-@BINPATH@/components/xpcom_system.xpt
-@BINPATH@/components/xpcom_components.xpt
-@BINPATH@/components/xpcom_ds.xpt
-@BINPATH@/components/xpcom_io.xpt
-@BINPATH@/components/xpcom_threads.xpt
-@BINPATH@/components/xpcom_xpti.xpt
-@BINPATH@/chrome/toolkit@JAREXT@
-@BINPATH@/chrome/toolkit.manifest
-@BINPATH@/chrome/instantbird@JAREXT@
-@BINPATH@/chrome/instantbird.manifest
+@RESPATH@/components/components.manifest
+@RESPATH@/components/@DLL_PREFIX@trayToolkit@DLL_SUFFIX@
+@RESPATH@/components/trayToolkit.xpt
+@RESPATH@/components/profileMigrator.js
+@RESPATH@/components/profileMigrator.manifest
+#endif
+@RESPATH@/components/instantbird.xpt
+@RESPATH@/components/contentHandler.js
+@RESPATH@/components/contentHandler.manifest
+@RESPATH@/components/ibCommandLineHandler.js
+@RESPATH@/components/ibCommandLineHandler.manifest
+@RESPATH@/components/ibConvStatsService.js
+@RESPATH@/components/ibConvStatsService.manifest
+@RESPATH@/components/ibStatusCommandLineHandler.js
+@RESPATH@/components/ibStatusCommandLineHandler.manifest
+@RESPATH@/components/xpcom_base.xpt
+@RESPATH@/components/xpcom_system.xpt
+@RESPATH@/components/xpcom_components.xpt
+@RESPATH@/components/xpcom_ds.xpt
+@RESPATH@/components/xpcom_io.xpt
+@RESPATH@/components/xpcom_threads.xpt
+@RESPATH@/components/xpcom_xpti.xpt
+@RESPATH@/chrome/toolkit@JAREXT@
+@RESPATH@/chrome/toolkit.manifest
+@RESPATH@/chrome/instantbird@JAREXT@
+@RESPATH@/chrome/instantbird.manifest
 #ifndef XP_UNIX
-@BINPATH@/chrome/icons/default/blistWindow.ico
-@BINPATH@/chrome/icons/default/convWindow.ico
-@BINPATH@/chrome/icons/default/default.ico
+@RESPATH@/chrome/icons/default/blistWindow.ico
+@RESPATH@/chrome/icons/default/convWindow.ico
+@RESPATH@/chrome/icons/default/default.ico
 #elifdef UNIX_BUT_NOT_MAC
-@BINPATH@/chrome/icons/default/*.png
+@RESPATH@/chrome/icons/default/*.png
 #endif
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; chat
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-@BINPATH@/@PREF_DIR@/chat-prefs.js
-@BINPATH@/chrome/chat@JAREXT@
-@BINPATH@/chrome/chat.manifest
-@BINPATH@/components/chat.xpt
-@BINPATH@/components/imAccounts.js
-@BINPATH@/components/imAccounts.manifest
-@BINPATH@/components/imCommands.js
-@BINPATH@/components/imCommands.manifest
-@BINPATH@/components/imContacts.js
-@BINPATH@/components/imContacts.manifest
-@BINPATH@/components/imConversations.js
-@BINPATH@/components/imConversations.manifest
-@BINPATH@/components/imCore.js
-@BINPATH@/components/imCore.manifest
-@BINPATH@/components/facebook.js
-@BINPATH@/components/facebook.manifest
-@BINPATH@/components/gtalk.js
-@BINPATH@/components/gtalk.manifest
-@BINPATH@/components/twitter.js
-@BINPATH@/components/twitter.manifest
-@BINPATH@/components/irc.js
-@BINPATH@/components/irc.manifest
-@BINPATH@/components/xmpp.js
-@BINPATH@/components/xmpp.manifest
-@BINPATH@/components/yahoo.js
-@BINPATH@/components/yahoo.manifest
-@BINPATH@/components/odnoklassniki.js
-@BINPATH@/components/odnoklassniki.manifest
-@BINPATH@/components/smileProtocolHandler.js
-@BINPATH@/components/smileProtocolHandler.manifest
-@BINPATH@/components/logger.js
-@BINPATH@/components/logger.manifest
+@RESPATH@/@PREF_DIR@/chat-prefs.js
+@RESPATH@/chrome/chat@JAREXT@
+@RESPATH@/chrome/chat.manifest
+@RESPATH@/components/chat.xpt
+@RESPATH@/components/imAccounts.js
+@RESPATH@/components/imAccounts.manifest
+@RESPATH@/components/imCommands.js
+@RESPATH@/components/imCommands.manifest
+@RESPATH@/components/imContacts.js
+@RESPATH@/components/imContacts.manifest
+@RESPATH@/components/imConversations.js
+@RESPATH@/components/imConversations.manifest
+@RESPATH@/components/imCore.js
+@RESPATH@/components/imCore.manifest
+@RESPATH@/components/facebook.js
+@RESPATH@/components/facebook.manifest
+@RESPATH@/components/gtalk.js
+@RESPATH@/components/gtalk.manifest
+@RESPATH@/components/twitter.js
+@RESPATH@/components/twitter.manifest
+@RESPATH@/components/irc.js
+@RESPATH@/components/irc.manifest
+@RESPATH@/components/xmpp.js
+@RESPATH@/components/xmpp.manifest
+@RESPATH@/components/yahoo.js
+@RESPATH@/components/yahoo.manifest
+@RESPATH@/components/odnoklassniki.js
+@RESPATH@/components/odnoklassniki.manifest
+@RESPATH@/components/smileProtocolHandler.js
+@RESPATH@/components/smileProtocolHandler.manifest
+@RESPATH@/components/logger.js
+@RESPATH@/components/logger.manifest
 
 #ifdef MOZ_PURPLE
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; libpurple
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-@BINPATH@/chrome/purple@JAREXT@
-@BINPATH@/chrome/purple.manifest
-@BINPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@
-@BINPATH@/components/purplexpcom.xpt
-@BINPATH@/components/prpl.manifest
+@RESPATH@/chrome/purple@JAREXT@
+@RESPATH@/chrome/purple.manifest
+@RESPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@
+@RESPATH@/components/purplexpcom.xpt
+@RESPATH@/components/prpl.manifest
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/components/@DLL_PREFIX@bonjour@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@sipe@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@bonjour@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@sipe@DLL_SUFFIX@
 #endif
-@BINPATH@/defaults/pref/purple-prefs.js
+@RESPATH@/defaults/pref/purple-prefs.js
 #endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -276,287 +274,290 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; default pref files
-@BINPATH@/defaults/pref/all-instantbird.js
-@BINPATH@/defaults/pref/channel-prefs.js
-@BINPATH@/greprefs.js
+@RESPATH@/defaults/pref/all-instantbird.js
+@RESPATH@/defaults/pref/channel-prefs.js
+@RESPATH@/greprefs.js
 
 ; login manager
-@BINPATH@/components/loginmgr.xpt
-@BINPATH@/components/nsLoginInfo.js
-@BINPATH@/components/nsLoginManager.js
-@BINPATH@/components/nsLoginManagerPrompter.js
-@BINPATH@/components/passwordmgr.manifest
-@BINPATH@/components/storage-json.js
-@BINPATH@/components/crypto-SDR.js
+@RESPATH@/components/loginmgr.xpt
+@RESPATH@/components/nsLoginInfo.js
+@RESPATH@/components/nsLoginManager.js
+@RESPATH@/components/nsLoginManagerPrompter.js
+@RESPATH@/components/passwordmgr.manifest
+@RESPATH@/components/storage-json.js
+@RESPATH@/components/crypto-SDR.js
 
 ; download progress
-@BINPATH@/components/nsHelperAppDlg.js
-@BINPATH@/components/nsHelperAppDlg.manifest
-@BINPATH@/components/nsDownloadManagerUI.js
-@BINPATH@/components/nsDownloadManagerUI.manifest
-@BINPATH@/components/downloads.xpt
+@RESPATH@/components/nsHelperAppDlg.js
+@RESPATH@/components/nsHelperAppDlg.manifest
+@RESPATH@/components/nsDownloadManagerUI.js
+@RESPATH@/components/nsDownloadManagerUI.manifest
+@RESPATH@/components/downloads.xpt
 
 ; Protocol/Content handling
-@BINPATH@/components/nsContentDispatchChooser.js
-@BINPATH@/components/nsContentDispatchChooser.manifest
-@BINPATH@/components/nsHandlerService.js
-@BINPATH@/components/nsHandlerService.manifest
-@BINPATH@/components/nsWebHandlerApp.js
-@BINPATH@/components/nsWebHandlerApp.manifest
+@RESPATH@/components/nsContentDispatchChooser.js
+@RESPATH@/components/nsContentDispatchChooser.manifest
+@RESPATH@/components/nsHandlerService.js
+@RESPATH@/components/nsHandlerService.manifest
+@RESPATH@/components/nsWebHandlerApp.js
+@RESPATH@/components/nsWebHandlerApp.manifest
 
 ; spellchecker (may not be present)
-@BINPATH@/components/spellchecker.xpt
+@RESPATH@/components/spellchecker.xpt
 
 ; misson control, autoconfig
-@BINPATH@/defaults/autoconfig/platform.js
-@BINPATH@/defaults/autoconfig/prefcalls.js
-@BINPATH@/components/autoconfig.xpt
+@RESPATH@/defaults/autoconfig/platform.js
+@RESPATH@/defaults/autoconfig/prefcalls.js
+@RESPATH@/components/autoconfig.xpt
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Base Package Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; xpconnect
-@BINPATH@/components/xpconnect.xpt
+@RESPATH@/components/xpconnect.xpt
 
 ; XP widgets/graphics
-@BINPATH@/components/widget.xpt
+@RESPATH@/components/widget.xpt
 #ifdef XP_MACOSX
-@BINPATH@/components/widget_cocoa.xpt
+@RESPATH@/components/widget_cocoa.xpt
 #endif
-@BINPATH@/components/gfx.xpt
+@RESPATH@/components/gfx.xpt
 
 ; layout
-@BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_xslt.xpt
-@BINPATH@/components/html5.xpt
-@BINPATH@/components/htmlparser.xpt
-@BINPATH@/components/identity.xpt
-@BINPATH@/components/layout_base.xpt
+@RESPATH@/components/content_events.xpt
+@RESPATH@/components/content_html.xpt
+@RESPATH@/components/content_xslt.xpt
+@RESPATH@/components/html5.xpt
+@RESPATH@/components/htmlparser.xpt
+@RESPATH@/components/identity.xpt
+@RESPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
-@BINPATH@/components/layout_printing.xpt
+@RESPATH@/components/layout_printing.xpt
 #endif
-@BINPATH@/components/layout_xul.xpt
-@BINPATH@/components/xulapp.xpt
-@BINPATH@/components/xul.xpt
-@BINPATH@/components/xultmpl.xpt
+@RESPATH@/components/layout_xul.xpt
+@RESPATH@/components/xulapp.xpt
+@RESPATH@/components/xul.xpt
+@RESPATH@/components/xultmpl.xpt
 
-@BINPATH@/components/inspector.xpt
+@RESPATH@/components/inspector.xpt
 
 ; Imaging:
-@BINPATH@/components/imgicon.xpt
-@BINPATH@/components/imglib2.xpt
+@RESPATH@/components/imgicon.xpt
+@RESPATH@/components/imglib2.xpt
 
 ; accessibility (out of process API support)
 #ifdef ACCESSIBILITY
-@BINPATH@/components/accessibility.xpt
+@RESPATH@/components/accessibility.xpt
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
 #endif
 
 ; caps (JavaScript security)
-@BINPATH@/components/caps.xpt
+@RESPATH@/components/caps.xpt
 
 ; glue: appshell, docshell, uriloader, chrome, components
-@BINPATH@/components/appshell.xpt
-@BINPATH@/components/appstartup.xpt
-@BINPATH@/components/docshell.xpt
-@BINPATH@/components/uriloader.xpt
-@BINPATH@/components/webBrowser_core.xpt
-@BINPATH@/components/windowwatcher.xpt
-@BINPATH@/components/webbrowserpersist.xpt
-@BINPATH@/components/commandhandler.xpt
+@RESPATH@/components/appshell.xpt
+@RESPATH@/components/appstartup.xpt
+@RESPATH@/components/docshell.xpt
+@RESPATH@/components/uriloader.xpt
+@RESPATH@/components/webBrowser_core.xpt
+@RESPATH@/components/windowwatcher.xpt
+@RESPATH@/components/webbrowserpersist.xpt
+@RESPATH@/components/commandhandler.xpt
 
 ; jar
-@BINPATH@/components/jar.xpt
+@RESPATH@/components/jar.xpt
 
 ; prefs
-@BINPATH@/components/pref.xpt
+@RESPATH@/components/pref.xpt
 
 ; profile
-@BINPATH@/components/profile.xpt
-@BINPATH@/components/toolkitprofile.xpt
-@BINPATH@/components/toolkit_finalizationwitness.xpt
+@RESPATH@/components/profile.xpt
+@RESPATH@/components/toolkitprofile.xpt
+@RESPATH@/components/toolkit_finalizationwitness.xpt
 
 ; toolkit
-@BINPATH@/components/AppsService.js
-@BINPATH@/components/AppsService.manifest
-@BINPATH@/components/BrowserElementParent.js
-@BINPATH@/components/BrowserElementParent.manifest
-@BINPATH@/components/ColorAnalyzer.js
-@BINPATH@/components/Identity.manifest
-@BINPATH@/components/PageThumbsProtocol.js
-@BINPATH@/components/XULStore.js
-@BINPATH@/components/XULStore.manifest
-@BINPATH@/components/PermissionSettings.js
-@BINPATH@/components/SettingsManager.js
-@BINPATH@/components/SettingsManager.manifest
-@BINPATH@/components/SiteSpecificUserAgent.js
-@BINPATH@/components/SiteSpecificUserAgent.manifest
-@BINPATH@/components/Webapps.js
-@BINPATH@/components/Webapps.manifest
-@BINPATH@/components/browser-element.xpt
-@BINPATH@/components/commandlines.xpt
-@BINPATH@/components/chrome.xpt
-@BINPATH@/components/cryptoComponents.manifest
-@BINPATH@/components/Downloads.manifest
-@BINPATH@/components/DownloadLegacy.js
-@BINPATH@/components/nsDefaultCLH.js
-@BINPATH@/components/nsDefaultCLH.manifest
-@BINPATH@/components/nsDOMIdentity.js
-@BINPATH@/components/nsFormAutoComplete.js
-@BINPATH@/components/nsFormHistory.js
-@BINPATH@/components/FormHistoryStartup.js
-@BINPATH@/components/UnifiedComplete.manifest
-@BINPATH@/components/UnifiedComplete.js
-@BINPATH@/components/nsAsyncShutdown.manifest
-@BINPATH@/components/nsAsyncShutdown.js
-@BINPATH@/components/nsIDService.js
-@BINPATH@/components/nsInputListAutoComplete.js
-@BINPATH@/components/nsLivemarkService.js
-@BINPATH@/components/nsPlacesAutoComplete.js
-@BINPATH@/components/nsPlacesAutoComplete.manifest
-@BINPATH@/components/nsPlacesExpiration.js
-@BINPATH@/components/nsPrompter.js
-@BINPATH@/components/nsPrompter.manifest
-@BINPATH@/components/nsSearchService.js
-@BINPATH@/components/nsSearchSuggestions.js
-@BINPATH@/components/nsTaggingService.js
-@BINPATH@/components/PlacesCategoriesStarter.js
-@BINPATH@/components/servicesComponents.manifest
-@BINPATH@/components/TCPSocket.js
-@BINPATH@/components/TCPServerSocket.js
-@BINPATH@/components/TCPSocketParentIntermediary.js
-@BINPATH@/components/TCPSocket.manifest
+@RESPATH@/components/AppsService.js
+@RESPATH@/components/AppsService.manifest
+@RESPATH@/components/BrowserElementParent.js
+@RESPATH@/components/BrowserElementParent.manifest
+@RESPATH@/components/ColorAnalyzer.js
+@RESPATH@/components/Identity.manifest
+@RESPATH@/components/PageThumbsProtocol.js
+@RESPATH@/components/XULStore.js
+@RESPATH@/components/XULStore.manifest
+@RESPATH@/components/PermissionSettings.js
+@RESPATH@/components/SettingsManager.js
+@RESPATH@/components/SettingsManager.manifest
+@RESPATH@/components/SiteSpecificUserAgent.js
+@RESPATH@/components/SiteSpecificUserAgent.manifest
+@RESPATH@/components/Webapps.js
+@RESPATH@/components/Webapps.manifest
+@RESPATH@/components/browser-element.xpt
+@RESPATH@/components/commandlines.xpt
+@RESPATH@/components/chrome.xpt
+@RESPATH@/components/cryptoComponents.manifest
+@RESPATH@/components/Downloads.manifest
+@RESPATH@/components/DownloadLegacy.js
+@RESPATH@/components/nsDefaultCLH.js
+@RESPATH@/components/nsDefaultCLH.manifest
+@RESPATH@/components/nsDOMIdentity.js
+@RESPATH@/components/nsFormAutoComplete.js
+@RESPATH@/components/nsFormHistory.js
+@RESPATH@/components/FormHistoryStartup.js
+@RESPATH@/components/UnifiedComplete.manifest
+@RESPATH@/components/UnifiedComplete.js
+@RESPATH@/components/nsAsyncShutdown.manifest
+@RESPATH@/components/nsAsyncShutdown.js
+@RESPATH@/components/nsIDService.js
+@RESPATH@/components/nsInputListAutoComplete.js
+@RESPATH@/components/nsLivemarkService.js
+@RESPATH@/components/nsPlacesAutoComplete.js
+@RESPATH@/components/nsPlacesAutoComplete.manifest
+@RESPATH@/components/nsPlacesExpiration.js
+@RESPATH@/components/nsPrompter.js
+@RESPATH@/components/nsPrompter.manifest
+@RESPATH@/components/nsSearchService.js
+@RESPATH@/components/nsSearchSuggestions.js
+@RESPATH@/components/nsTaggingService.js
+@RESPATH@/components/PlacesCategoriesStarter.js
+@RESPATH@/components/servicesComponents.manifest
+@RESPATH@/components/TCPSocket.js
+@RESPATH@/components/TCPServerSocket.js
+@RESPATH@/components/TCPSocketParentIntermediary.js
+@RESPATH@/components/TCPSocket.manifest
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/PeerConnection.js
-@BINPATH@/components/PeerConnection.manifest
+@RESPATH@/components/PeerConnection.js
+@RESPATH@/components/PeerConnection.manifest
 #endif
-@BINPATH@/components/toolkit_asyncshutdown.xpt
-@BINPATH@/components/toolkit_filewatcher.xpt
-@BINPATH@/components/toolkit_formautofill.xpt
-@BINPATH@/components/toolkit_osfile.xpt
-@BINPATH@/components/toolkit_xulstore.xpt
-@BINPATH@/components/toolkitplaces.manifest
-@BINPATH@/components/toolkitsearch.manifest
+@RESPATH@/components/toolkit_asyncshutdown.xpt
+@RESPATH@/components/toolkit_filewatcher.xpt
+@RESPATH@/components/toolkit_formautofill.xpt
+@RESPATH@/components/toolkit_osfile.xpt
+@RESPATH@/components/toolkit_xulstore.xpt
+@RESPATH@/components/toolkitplaces.manifest
+@RESPATH@/components/toolkitsearch.manifest
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/components/toolkitremote.xpt
+@RESPATH@/components/toolkitremote.xpt
 #endif
 #ifdef MOZ_GTK2
-@BINPATH@/components/filepicker.xpt
-@BINPATH@/components/nsFilePicker.js
-@BINPATH@/components/nsFilePicker.manifest
+@RESPATH@/components/filepicker.xpt
+@RESPATH@/components/nsFilePicker.js
+@RESPATH@/components/nsFilePicker.manifest
 #endif
 #ifdef MOZ_ENABLE_DBUS
-@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@BINPATH@/components/profiler.xpt
+@RESPATH@/components/profiler.xpt
 #endif
+@RESPATH@/components/ProcessSingleton.manifest
+@RESPATH@/components/MainProcessSingleton.js
+@RESPATH@/components/ContentProcessSingleton.js
 
 ; rdf
-@BINPATH@/components/rdf.xpt
+@RESPATH@/components/rdf.xpt
 
 ; required i18n libraries
-@BINPATH@/components/intl.xpt
-@BINPATH@/components/locale.xpt
-@BINPATH@/components/uconv.xpt
-@BINPATH@/components/unicharutil.xpt
+@RESPATH@/components/intl.xpt
+@RESPATH@/components/locale.xpt
+@RESPATH@/components/uconv.xpt
+@RESPATH@/components/unicharutil.xpt
 
 ; dom
-@BINPATH@/components/dom.xpt
-@BINPATH@/components/dom_alarm.xpt
-@BINPATH@/components/dom_apps.xpt
-@BINPATH@/components/dom_base.xpt
-@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_core.xpt
-@BINPATH@/components/dom_css.xpt
-@BINPATH@/components/dom_devicestorage.xpt
-@BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_gamepad.xpt
-@BINPATH@/components/dom_geolocation.xpt
-@BINPATH@/components/dom_html.xpt
-@BINPATH@/components/dom_json.xpt
-@BINPATH@/components/dom_media.xpt
-@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_network.xpt
-@BINPATH@/components/dom_notification.xpt
-@BINPATH@/components/dom_offline.xpt
-@BINPATH@/components/dom_permissionsettings.xpt
-@BINPATH@/components/dom_power.xpt
-@BINPATH@/components/dom_quota.xpt
-@BINPATH@/components/dom_range.xpt
-@BINPATH@/components/dom_settings.xpt
-@BINPATH@/components/dom_sidebar.xpt
-@BINPATH@/components/dom_smil.xpt
-@BINPATH@/components/dom_storage.xpt
-@BINPATH@/components/dom_stylesheets.xpt
-@BINPATH@/components/dom_system.xpt
-@BINPATH@/components/dom_traversal.xpt
-@BINPATH@/components/dom_webspeechrecognition.xpt
-@BINPATH@/components/dom_webspeechsynth.xpt
-@BINPATH@/components/dom_xbl.xpt
-@BINPATH@/components/dom_xul.xpt
-@BINPATH@/components/NetworkGeolocationProvider.js
-@BINPATH@/components/NetworkGeolocationProvider.manifest
+@RESPATH@/components/dom.xpt
+@RESPATH@/components/dom_alarm.xpt
+@RESPATH@/components/dom_apps.xpt
+@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_canvas.xpt
+@RESPATH@/components/dom_core.xpt
+@RESPATH@/components/dom_css.xpt
+@RESPATH@/components/dom_devicestorage.xpt
+@RESPATH@/components/dom_events.xpt
+@RESPATH@/components/dom_gamepad.xpt
+@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_html.xpt
+@RESPATH@/components/dom_json.xpt
+@RESPATH@/components/dom_media.xpt
+@RESPATH@/components/dom_mobilemessage.xpt
+@RESPATH@/components/dom_network.xpt
+@RESPATH@/components/dom_notification.xpt
+@RESPATH@/components/dom_offline.xpt
+@RESPATH@/components/dom_permissionsettings.xpt
+@RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_quota.xpt
+@RESPATH@/components/dom_range.xpt
+@RESPATH@/components/dom_settings.xpt
+@RESPATH@/components/dom_sidebar.xpt
+@RESPATH@/components/dom_smil.xpt
+@RESPATH@/components/dom_storage.xpt
+@RESPATH@/components/dom_stylesheets.xpt
+@RESPATH@/components/dom_system.xpt
+@RESPATH@/components/dom_traversal.xpt
+@RESPATH@/components/dom_webspeechrecognition.xpt
+@RESPATH@/components/dom_webspeechsynth.xpt
+@RESPATH@/components/dom_xbl.xpt
+@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/NetworkGeolocationProvider.js
+@RESPATH@/components/NetworkGeolocationProvider.manifest
 
 ; editor / composer for HTML compose
-@BINPATH@/components/editor.xpt
-@BINPATH@/components/composer.xpt
-@BINPATH@/components/txmgr.xpt
+@RESPATH@/components/editor.xpt
+@RESPATH@/components/composer.xpt
+@RESPATH@/components/txmgr.xpt
 
 ; find functionality
-@BINPATH@/components/txtsvc.xpt
+@RESPATH@/components/txtsvc.xpt
 
 ; moz storage
-@BINPATH@/components/storage.xpt
+@RESPATH@/components/storage.xpt
 
 ; netwerk
-@BINPATH@/components/necko.xpt
-@BINPATH@/components/necko_about.xpt
-@BINPATH@/components/necko_dns.xpt
-@BINPATH@/components/necko_http.xpt
-@BINPATH@/components/necko_ipc.xpt
-@BINPATH@/components/necko_res.xpt
-@BINPATH@/components/necko_strconv.xpt
-@BINPATH@/components/necko_file.xpt
-@BINPATH@/components/necko_ftp.xpt
-@BINPATH@/components/necko_cache.xpt
-@BINPATH@/components/necko_cache2.xpt
-@BINPATH@/components/necko_cookie.xpt
-@BINPATH@/components/necko_socket.xpt
-@BINPATH@/components/necko_viewsource.xpt
-@BINPATH@/components/necko_websocket.xpt
+@RESPATH@/components/necko.xpt
+@RESPATH@/components/necko_about.xpt
+@RESPATH@/components/necko_dns.xpt
+@RESPATH@/components/necko_http.xpt
+@RESPATH@/components/necko_ipc.xpt
+@RESPATH@/components/necko_res.xpt
+@RESPATH@/components/necko_strconv.xpt
+@RESPATH@/components/necko_file.xpt
+@RESPATH@/components/necko_ftp.xpt
+@RESPATH@/components/necko_cache.xpt
+@RESPATH@/components/necko_cache2.xpt
+@RESPATH@/components/necko_cookie.xpt
+@RESPATH@/components/necko_socket.xpt
+@RESPATH@/components/necko_viewsource.xpt
+@RESPATH@/components/necko_websocket.xpt
 #ifdef NECKO_WIFI
-@BINPATH@/components/necko_wifi.xpt
+@RESPATH@/components/necko_wifi.xpt
 #endif
-@BINPATH@/components/necko_wyciwyg.xpt
+@RESPATH@/components/necko_wyciwyg.xpt
 
 ; extensions
-@BINPATH@/components/addonManager.js
-@BINPATH@/components/amContentHandler.js
-@BINPATH@/components/amWebInstallListener.js
-@BINPATH@/components/nsBlocklistService.js
+@RESPATH@/components/addonManager.js
+@RESPATH@/components/amContentHandler.js
+@RESPATH@/components/amWebInstallListener.js
+@RESPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
-@BINPATH@/components/nsUpdateService.js
-@BINPATH@/components/nsUpdateService.manifest
-@BINPATH@/components/nsUpdateServiceStub.js
-#endif
-@BINPATH@/components/nsUpdateTimerManager.js
-@BINPATH@/components/nsUpdateTimerManager.manifest
-@BINPATH@/components/extensions.xpt
-@BINPATH@/components/extensions.manifest
-@BINPATH@/components/update.xpt
+@RESPATH@/components/nsUpdateService.js
+@RESPATH@/components/nsUpdateService.manifest
+@RESPATH@/components/nsUpdateServiceStub.js
+#endif
+@RESPATH@/components/nsUpdateTimerManager.js
+@RESPATH@/components/nsUpdateTimerManager.manifest
+@RESPATH@/components/extensions.xpt
+@RESPATH@/components/extensions.manifest
+@RESPATH@/components/update.xpt
 #ifdef MOZ_WEBSERVICES
-@BINPATH@/components/websrvcs.xpt
+@RESPATH@/components/websrvcs.xpt
 #endif
-@BINPATH@/components/nsURLFormatter.js
-@BINPATH@/components/nsURLFormatter.manifest
-@BINPATH@/components/urlformatter.xpt
-@BINPATH@/components/nsContentPrefService.js
-@BINPATH@/components/nsContentPrefService.manifest
+@RESPATH@/components/nsURLFormatter.js
+@RESPATH@/components/nsURLFormatter.manifest
+@RESPATH@/components/urlformatter.xpt
+@RESPATH@/components/nsContentPrefService.js
+@RESPATH@/components/nsContentPrefService.manifest
 
 ; [Personal Security Manager]
 ;
@@ -564,45 +565,29 @@
 ; meaning their .chk files are created there directly.
 ;
 #ifndef MOZ_NATIVE_NSS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@freebl3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nss3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#endif
 #ifndef NSS_DISABLE_DBM
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@softokn3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
-#endif
-@BINPATH@/chrome/pippki@JAREXT@
-@BINPATH@/chrome/pippki.manifest
-@BINPATH@/components/pipboot.xpt
-@BINPATH@/components/pipnss.xpt
-@BINPATH@/components/pippki.xpt
+@RESPATH@/chrome/pippki@JAREXT@
+@RESPATH@/chrome/pippki.manifest
+@RESPATH@/components/pipboot.xpt
+@RESPATH@/components/pipnss.xpt
+@RESPATH@/components/pippki.xpt
 
 ; For process sandboxing
+#if defined(MOZ_SANDBOX)
 #if defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
-#elif defined(XP_LINUX)
-#if defined(MOZ_CONTENT_SANDBOX) || defined(MOZ_GMP_SANDBOX)
-@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
 #endif
 #endif
 
@@ -614,100 +599,100 @@
 #endif
 
 ; core platform files
-@BINPATH@/components/FeedProcessor.js
-@BINPATH@/components/FeedProcessor.manifest
-@BINPATH@/components/FormAutofillContentService.js
-@BINPATH@/components/FormAutofillStartup.js
-@BINPATH@/components/formautofill.manifest
-@BINPATH@/components/autocomplete.xpt
-@BINPATH@/components/alerts.xpt
-@BINPATH@/components/jsdebugger.xpt
-@BINPATH@/components/jsdownloads.xpt
-@BINPATH@/components/jsinspector.xpt
-@BINPATH@/components/fastfind.xpt
-@BINPATH@/components/find.xpt
-@BINPATH@/components/ConsoleAPIStorage.js
-@BINPATH@/components/ConsoleAPI.manifest
-@BINPATH@/components/ContactManager.js
-@BINPATH@/components/ContactManager.manifest
-@BINPATH@/components/contentAreaDropListener.js
-@BINPATH@/components/contentAreaDropListener.manifest
-@BINPATH@/components/devtools_security.xpt
-@BINPATH@/components/directory.xpt
-@BINPATH@/components/jsconsole-clhandler.js
-@BINPATH@/components/jsconsole-clhandler.manifest
-@BINPATH@/components/layout_xul_tree.xpt
-@BINPATH@/components/mozfind.xpt
-@BINPATH@/components/mimetype.xpt
-@BINPATH@/components/parentalcontrols.xpt
+@RESPATH@/components/FeedProcessor.js
+@RESPATH@/components/FeedProcessor.manifest
+@RESPATH@/components/FormAutofillContentService.js
+@RESPATH@/components/FormAutofillStartup.js
+@RESPATH@/components/formautofill.manifest
+@RESPATH@/components/autocomplete.xpt
+@RESPATH@/components/alerts.xpt
+@RESPATH@/components/jsdebugger.xpt
+@RESPATH@/components/jsdownloads.xpt
+@RESPATH@/components/jsinspector.xpt
+@RESPATH@/components/fastfind.xpt
+@RESPATH@/components/find.xpt
+@RESPATH@/components/ConsoleAPIStorage.js
+@RESPATH@/components/ConsoleAPI.manifest
+@RESPATH@/components/ContactManager.js
+@RESPATH@/components/ContactManager.manifest
+@RESPATH@/components/contentAreaDropListener.js
+@RESPATH@/components/contentAreaDropListener.manifest
+@RESPATH@/components/devtools_security.xpt
+@RESPATH@/components/directory.xpt
+@RESPATH@/components/jsconsole-clhandler.js
+@RESPATH@/components/jsconsole-clhandler.manifest
+@RESPATH@/components/layout_xul_tree.xpt
+@RESPATH@/components/mozfind.xpt
+@RESPATH@/components/mimetype.xpt
+@RESPATH@/components/parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/peerconnection.xpt
+@RESPATH@/components/peerconnection.xpt
 #endif
-@BINPATH@/components/exthandler.xpt
-@BINPATH@/components/exthelper.xpt
-@BINPATH@/components/embed_base.xpt
-@BINPATH@/components/windowds.xpt
-@BINPATH@/components/dom_xpath.xpt
-@BINPATH@/components/lwbrk.xpt
-@BINPATH@/components/nsINIProcessor.js
-@BINPATH@/components/nsINIProcessor.manifest
-@BINPATH@/components/pluginGlue.manifest
-@BINPATH@/components/txEXSLTRegExFunctions.js
-@BINPATH@/components/txEXSLTRegExFunctions.manifest
-@BINPATH@/components/feeds.xpt
-@BINPATH@/components/saxparser.xpt
-@BINPATH@/components/satchel.manifest
-@BINPATH@/components/satchel.xpt
-@BINPATH@/components/shistory.xpt
-@BINPATH@/components/telemetry.xpt
-@BINPATH@/components/zipwriter.xpt
-@BINPATH@/components/cookie.xpt
-@BINPATH@/components/places.xpt
-@BINPATH@/components/plugin.xpt
-@BINPATH@/components/prefetch.xpt
-@BINPATH@/res/langGroups.properties
-@BINPATH@/res/language.properties
-@BINPATH@/res/entityTables/*
-@BINPATH@/res/dtd/*
-@BINPATH@/res/fonts/*
-@BINPATH@/res/contenteditable.css
-@BINPATH@/res/designmode.css
-@BINPATH@/res/html/folder.png
+@RESPATH@/components/exthandler.xpt
+@RESPATH@/components/exthelper.xpt
+@RESPATH@/components/embed_base.xpt
+@RESPATH@/components/windowds.xpt
+@RESPATH@/components/dom_xpath.xpt
+@RESPATH@/components/lwbrk.xpt
+@RESPATH@/components/nsINIProcessor.js
+@RESPATH@/components/nsINIProcessor.manifest
+@RESPATH@/components/pluginGlue.manifest
+@RESPATH@/components/txEXSLTRegExFunctions.js
+@RESPATH@/components/txEXSLTRegExFunctions.manifest
+@RESPATH@/components/feeds.xpt
+@RESPATH@/components/saxparser.xpt
+@RESPATH@/components/satchel.manifest
+@RESPATH@/components/satchel.xpt
+@RESPATH@/components/shistory.xpt
+@RESPATH@/components/telemetry.xpt
+@RESPATH@/components/zipwriter.xpt
+@RESPATH@/components/cookie.xpt
+@RESPATH@/components/places.xpt
+@RESPATH@/components/plugin.xpt
+@RESPATH@/components/prefetch.xpt
+@RESPATH@/res/langGroups.properties
+@RESPATH@/res/language.properties
+@RESPATH@/res/entityTables/*
+@RESPATH@/res/dtd/*
+@RESPATH@/res/fonts/*
+@RESPATH@/res/contenteditable.css
+@RESPATH@/res/designmode.css
+@RESPATH@/res/html/folder.png
 #ifdef XP_MACOSX
-@BINPATH@/res/cursors/
-@BINPATH@/res/MainMenu.nib/
+@RESPATH@/res/cursors/
+@RESPATH@/res/MainMenu.nib/
 #endif
 
 ; editor resource files
-@BINPATH@/res/EditorOverride.css
-@BINPATH@/res/grabber.gif
-@BINPATH@/res/table-add-column-after-active.gif
-@BINPATH@/res/table-add-column-after-hover.gif
-@BINPATH@/res/table-add-column-after.gif
-@BINPATH@/res/table-add-column-before-active.gif
-@BINPATH@/res/table-add-column-before-hover.gif
-@BINPATH@/res/table-add-column-before.gif
-@BINPATH@/res/table-add-row-after-active.gif
-@BINPATH@/res/table-add-row-after-hover.gif
-@BINPATH@/res/table-add-row-after.gif
-@BINPATH@/res/table-add-row-before-active.gif
-@BINPATH@/res/table-add-row-before-hover.gif
-@BINPATH@/res/table-add-row-before.gif
-@BINPATH@/res/table-remove-column-active.gif
-@BINPATH@/res/table-remove-column-hover.gif
-@BINPATH@/res/table-remove-column.gif
-@BINPATH@/res/table-remove-row-active.gif
-@BINPATH@/res/table-remove-row-hover.gif
-@BINPATH@/res/table-remove-row.gif
+@RESPATH@/res/EditorOverride.css
+@RESPATH@/res/grabber.gif
+@RESPATH@/res/table-add-column-after-active.gif
+@RESPATH@/res/table-add-column-after-hover.gif
+@RESPATH@/res/table-add-column-after.gif
+@RESPATH@/res/table-add-column-before-active.gif
+@RESPATH@/res/table-add-column-before-hover.gif
+@RESPATH@/res/table-add-column-before.gif
+@RESPATH@/res/table-add-row-after-active.gif
+@RESPATH@/res/table-add-row-after-hover.gif
+@RESPATH@/res/table-add-row-after.gif
+@RESPATH@/res/table-add-row-before-active.gif
+@RESPATH@/res/table-add-row-before-hover.gif
+@RESPATH@/res/table-add-row-before.gif
+@RESPATH@/res/table-remove-column-active.gif
+@RESPATH@/res/table-remove-column-hover.gif
+@RESPATH@/res/table-remove-column.gif
+@RESPATH@/res/table-remove-row-active.gif
+@RESPATH@/res/table-remove-row-hover.gif
+@RESPATH@/res/table-remove-row.gif
 
 ; svg
-@BINPATH@/res/svg.css
-@BINPATH@/components/dom_svg.xpt
+@RESPATH@/res/svg.css
+@RESPATH@/components/dom_svg.xpt
 
 ; [Updater]
 #ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/updater.app/
+@BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
@@ -716,15 +701,15 @@
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
-@BINPATH@/components/CrashService.manifest
-@BINPATH@/components/CrashService.js
+@RESPATH@/components/CrashService.manifest
+@RESPATH@/components/CrashService.js
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/crashreporter.app/
+@BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
-@BINPATH@/crashreporter.ini
+@RESPATH@/crashreporter.ini
 #ifdef XP_UNIX
-@BINPATH@/Throbber-small.gif
+@RESPATH@/Throbber-small.gif
 #endif
 #endif
 #ifdef MOZ_CRASHREPORTER_INJECTOR
@@ -734,5 +719,5 @@
 
 ; GNOME hooks
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
-@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/locales/en-US/chrome/instantbird/accounts.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/locales/en-US/chrome/instantbird/accounts.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/locales/en-US/chrome/instantbird/accounts.dtd	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/locales/en-US/chrome/instantbird/accounts.dtd	2014-11-26 21:44:59.000000000 +0000
@@ -29,6 +29,8 @@
 <!ENTITY account.cancelReconnection.accesskey     "A">
 <!ENTITY account.copyDebugLog.label     "Copy Debug Log">
 <!ENTITY account.copyDebugLog.accesskey "C">
+<!ENTITY account.showDebugLog.label     "Show Debug Log">
+<!ENTITY account.showDebugLog.accesskey "H">
 <!ENTITY account.connecting           "Connecting…">
 <!ENTITY account.disconnecting        "Disconnecting…">
 <!ENTITY account.disconnected         "Not Connected">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/locales/en-US/chrome/instantbird/core.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/locales/en-US/chrome/instantbird/core.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/locales/en-US/chrome/instantbird/core.properties	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/locales/en-US/chrome/instantbird/core.properties	2014-11-26 21:44:59.000000000 +0000
@@ -12,6 +12,7 @@
 startupFailure.purplexpcomFileError=Description: The file "instantbird.xpt" is missing or corrupted.
 startupFailure.xpcomRegistrationError=Description: XPCOM registration of the core component failed.
 startupFailure.purplexpcomInitError=An exception occurred while initializing the core component: %S
+startupFailure.passwordServiceError=Password service initialization failed.
 
 startupFailure.buttonUpdate=Check for Updates
 startupFailure.buttonClose=Close Instantbird
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/modules/ibCore.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/modules/ibCore.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/modules/ibCore.jsm	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/modules/ibCore.jsm	2014-11-26 21:45:00.000000000 +0000
@@ -61,6 +61,11 @@
       return false;
     }
 
+    // Trigger asynchronous initialization of the password service.
+    Services.logins.initializationPromise.catch(() => {
+      this._promptError("startupFailure.passwordServiceError");
+    });
+
     this.initLibpurpleOverrides();
 
     try {
@@ -95,7 +100,7 @@
       get helpString() self.bundle("aboutCommand.help"),
       usageContext: Ci.imICommand.CMD_CONTEXT_ALL,
       priority: Ci.imICommand.CMD_PRIORITY_DEFAULT,
-      run: function(aMsg, aConv) {
+      run: function (aMsg, aConv) {
         let page = aMsg.replace(/^about:/, "");
         let url = "about:" + page;
         // If the page doesn't exist, we avoid opening a tab.
@@ -110,40 +115,37 @@
           Components.utils.reportError(e); // Log unexpected errors.
           return false;
         }
-        // Try to get the most recent conversation window. If no such window exists,
-        // win will be null.
-        let win = Services.wm.getMostRecentWindow("Messenger:convs");
-        // Tries to open an aboutPanel in the specified window.
-        let showPage = function(aWindow, aPage) {
-          // Return false if the window doesn't exist.
-          if (!aWindow)
-            return false;
-          let panel = aWindow.document.createElementNS(
-            "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-            "aboutPanel");
-          // Try to add the panel, and return false if the window couldn't accept
-          // it (e.g. tabbed conversations are disabled).
-          if (!aWindow.getTabBrowser().addPanel(panel))
-            return false;
-          panel.showAboutPage(aPage);
-          aWindow.getTabBrowser().selectPanel(panel);
-          return true;
-        }
-        // Try to show the page in win, and open a new window if it didn't work.
-        if (!showPage(win, page)) {
-          win = Services.ww.openWindow(null, "chrome://instantbird/content/instantbird.xul",
-                                       "_blank", "chrome,toolbar,resizable", null);
-          win.addEventListener("load", showPage.bind(null, win, page));
-          return true;
-        }
+        self.showTab("aboutPanel", aPanel => aPanel.showAboutPage(page));
+        return true;
+      }
+    });
+
+    Services.cmd.registerCommand({
+      name: "debug",
+      get helpString() self.bundle("debugCommand.help"),
+      usageContext: Ci.imICommand.CMD_CONTEXT_ALL,
+      priority: Ci.imICommand.CMD_PRIORITY_DEFAULT,
+      run: (aMsg, aConv) => {
+        this.showDebugLog(aConv.account.id);
         return true;
       }
     });
 
-    this._showAccountManagerIfNeeded(true);
+    Services.logins.initializationPromise.then(() => {
+      this._showAccountManagerIfNeeded(true);
+    });
     return true;
   },
 
+  showDebugLog: function(aAccountId) {
+    this.showTab("debugLogPanel", aPanel => {
+      aPanel.browser.addEventListener("DOMContentLoaded", () => {
+        aPanel.initAccountList(aAccountId);
+        aPanel.showDebugLog();
+      });
+    });
+  },
+
   showWindow: function(aWindowType, aUrl, aName, aFeatures) {
     var win = Services.wm.getMostRecentWindow(aWindowType);
     if (win)
@@ -192,6 +194,38 @@
       prompter.checkForUpdates();
   },
 
+  // Creates a panel from the given binding name, and opens it in a new tab,
+  // creating a new window if necessary. The callback is invoked after adding
+  // the panel, which is passed as a parameter.
+  showTab: function(aPanelName, aCallback) {
+    // Try to get the most recent conversation window. If no such window exists,
+    // win will be null.
+    let win = Services.wm.getMostRecentWindow("Messenger:convs");
+    // Tries to open the panel in the specified window.
+    let showPanel = function(aWindow) {
+      // Return false if the window doesn't exist.
+      if (!aWindow)
+        return false;
+      let panel = aWindow.document.createElementNS(
+        "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+        aPanelName);
+      // Try to add the panel, and return false if the window couldn't accept
+      // it (e.g. tabbed conversations are disabled).
+      if (!aWindow.getTabBrowser().addPanel(panel))
+        return false;
+      aWindow.getTabBrowser().selectPanel(panel);
+      panel.ownerDocument.defaultView.focus();
+      aCallback(panel);
+      return true;
+    }
+    // Try to show the debug logs in win, and open a new window if it didn't work.
+    if (showPanel(win))
+      return;
+    win = Services.ww.openWindow(null, "chrome://instantbird/content/instantbird.xul",
+                                 "_blank", "chrome,toolbar,resizable", null);
+    win.addEventListener("load", showPanel.bind(null, win));
+  },
+
   getIter: function(aEnumerator) {
     while (aEnumerator.hasMoreElements())
       yield aEnumerator.getNext();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/conversation.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/conversation.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/conversation.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/conversation.css	2014-11-26 21:45:00.000000000 +0000
@@ -2,6 +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/. */
 
+%ifdef XP_UNIX
+%ifndef XP_MACOSX
+%define XP_LINUX
+%endif
+%endif
+
 .browser {
   margin: 0 0;
 }
@@ -297,11 +303,11 @@
 
 .conv-textbox {
   margin: 0;
+  -moz-appearance: none;
 }
 
 %ifdef XP_MACOSX
 .conv-textbox {
-  -moz-appearance: none;
   padding: 3px;
   border: none;
   box-shadow: inset 0 1px 3px 0px rgba(0, 0, 0, 0.6);
@@ -336,13 +342,6 @@
 %ifndef XP_WIN
 .conv-textbox {
   -moz-margin-start: 1px;
-  -moz-appearance: none;
-}
-%else
-.conv-textbox {
-   -moz-appearance: none;
-  /* Right/left margins so the borders show up on all sides. */
-  margin: 0 1px 0 1px;
 }
 %endif
 %endif
@@ -389,26 +388,19 @@
 .conv-counter {
   padding-bottom: 1px;
   -moz-padding-end: 6px;
-  margin: 0;
+  margin: 0 !important;  /* override margins from description */
 }
 
 .conv-counter[value^="-"] {
-  margin-bottom: 1px;
+  margin-bottom: 1px !important;
   /* The 6px padding-end from .conv-counter is split into a 1px
      margin-end (to avoid the border) and 5px padding-end (as
      regular padding). */
-  -moz-margin-end: 1px;
+  -moz-margin-end: 1px !important;
   padding-top: 1px;
   padding-bottom: 0;
   -moz-padding-end: 5px;
 }
-
-%ifdef XP_WIN
-.conv-counter[value^="-"] {
-  -moz-margin-end: 2px;
-  -moz-padding-end: 4px;
-}
-%endif
 %endif
 
 
@@ -428,7 +420,7 @@
 
 .splitter-bottom {
   background: #ddd; /* match URL popup bottom edge from tabbrowser-*.css */
-%ifdef XP_MACOSX
+%ifndef XP_LINUX
   min-height: 1px;
   height: 1px;
 %endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/debugLog.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/debugLog.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/debugLog.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/debugLog.css	2014-11-26 21:45:00.000000000 +0000
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+  margin: 0;
+}
+
+table {
+  border-collapse: collapse;
+  font-size: small;
+}
+
+td {
+  padding: 5px;
+}
+
+tr {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
+}
+
+tr.debug {
+  background-color: #ecffe0;
+}
+
+tr.log {
+  background-color: #d3edff;
+}
+
+tr.warn {
+  background-color: #f8f3cc;
+}
+
+tr.error {
+  background-color: #ffd0dc;
+}
+
+td.time {
+  white-space: nowrap;
+  vertical-align: top;
+}
+
+td.msg {
+  white-space: pre-wrap;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/debugLogPanel.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/debugLogPanel.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/debugLogPanel.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/debugLogPanel.css	2014-11-26 21:45:00.000000000 +0000
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.debugLogTab-button {
+  -moz-appearance: toolbarbutton;
+}
+
+.debugLogTab-toolbar {
+  margin: 0;
+  padding: 2px;
+  border-style: none;
+  -moz-appearance: none;
+%ifdef XP_MACOSX
+  background-color: -moz-mac-chrome-active;
+  background-image: -moz-linear-gradient(rgba(255,255,255,.43), rgba(255,255,255,0));
+  border-bottom: 1px solid rgba(0, 0, 0, 0.57);
+}
+
+.debugLogTab-toolbar:-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+  border-bottom-color: rgba(0, 0, 0, 0.32);
+%else
+  background-color: -moz-Dialog;
+%ifdef XP_WIN
+  background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,0));
+%else
+  background-image: -moz-linear-gradient(rgba(255,255,255,.3), rgba(255,255,255,0));
+%endif
+  border-bottom: 1px solid ThreeDShadow;
+%endif
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/jar.mn thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/jar.mn
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/im/themes/jar.mn	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/im/themes/jar.mn	2014-11-26 21:45:00.000000000 +0000
@@ -16,6 +16,8 @@
 *	skin/classic/instantbird/richlistbox.css
 *	skin/classic/instantbird/accountWizard.css
 *	skin/classic/instantbird/newtab.css
+	skin/classic/instantbird/debugLog.css
+*	skin/classic/instantbird/debugLogPanel.css
 	skin/classic/instantbird/newConversation.png
 	skin/classic/instantbird/founder.png
 	skin/classic/instantbird/operator.png
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/changesets thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/changesets
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/changesets	2014-11-14 09:41:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/changesets	2014-11-26 21:49:30.000000000 +0000
@@ -1,47 +1,47 @@
 af 157:aa5e4f272a8a
 ar 409:4a00eaa60720
-be 296:be9f6cecb752
+be 300:1b552d3187f1
 bg 130:d5fa24dd602a
 bn-BD 106:770ac0af49cd
 br 247:b2a174c5dec1
 ca 671:0427dac6c811
-cs 1954:aacee5f32680
-da 682:9e007b7981c5
-de 2955:6256d1995c37
+cs 1955:c061cecb5dbb
+da 735:3da200622aa9
+de 2956:b083f8d83b7c
 el 356:6b23a751385f
 en-GB 444:876cf60b4ae5
-es-AR 922:b9a455a6e440
-es-ES 2275:aac02a51f3a8
+es-AR 926:337f1bed3346
+es-ES 2289:60dbce069644
 et 530:54f9fbfcd622
 eu 379:d7df5b30dd48
 fi 557:9fa360eef979
-fr 5185:9d416cdadc49
+fr 5194:7faa19dfd54b
 fy-NL 1157:453401a56b04
 ga-IE 465:f841e9037f9e
 gd 503:1071593d8bd0
 gl 1412:5a2771dfcbed
 he 505:6c592b9d28a8
 hu 791:a0b74bf9e53c
-id 510:401debcf2fe0
+id 512:b520186368ec
 is 297:33af74865c25
-it 3479:121b49056bf2
+it 3497:39dc89ca3bcf
 ja 632:f98d72356bd5
 ja-JP-mac 633:6cb67110bfd8
 ka 56:2ee9bc162267
 ko 631:c48ac18de542
 lt 1189:bb0201611515
 nb-NO 1067:40cb88f976f9
-nl 3715:a0f625f8cbe0
+nl 3743:202c48b64562
 nn-NO 636:2032d95af2a7
 pa-IN 589:b51530b15a00
-pl 4939:96d2add10227
+pl 4953:57b180543235
 pt-BR 664:723658175bdd
-pt-PT 2034:983f00287bb3
+pt-PT 2038:f74a20ef24b7
 rm 388:945a12b3635b
 ro 414:9a349bbcf451
-ru 2225:923013712a32
+ru 2244:addf0fe9300d
 si 414:fb01300c5c4a
-sk 1148:31fe74da9783
+sk 1172:2c067bb4b69b
 sl 819:8aa9b9e13c21
 sq 722:e52cdd5b2979
 sr 254:e6fa777ae177
@@ -50,5 +50,5 @@
 tr 574:72ab8cc561e2
 uk 1162:a5cf4538556c
 vi 126:57cb46a94324
-zh-CN 707:b431e0e61c2c
-zh-TW 1069:a94ef92b86f9
+zh-CN 715:ff104561593e
+zh-TW 1071:8e2ace0e1731
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/cs/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/cs/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/cs/dom/chrome/dom/dom.properties	2014-11-14 09:38:44.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/cs/dom/chrome/dom/dom.properties	2014-11-26 21:47:08.000000000 +0000
@@ -119,7 +119,7 @@
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Použití Mutation Events je zastaralé. Používejte raději MutationObserver.
 # LOCALIZATION NOTE: Do not translate "Components"
-ComponentsWarning=Použití objektu Components je zastaralé. Objekt bude brzo odstraněn.
+ComponentsWarning=Použití objektu Components je zastaralé. Objekt bude brzy odstraněn.
 PluginHangUITitle=Upozornění: Zásuvný modul nereaguje
 PluginHangUIMessage=Zásuvný modul %S je buď zaneprázdněn nebo přestal reagovat. Nyní můžete modul ukončit nebo počkat, zda se dokončí sám.
 PluginHangUIWaitButton=PokraÄŤovat
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/cs/webapprt/webapprt/overrides/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/cs/webapprt/webapprt/overrides/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/cs/webapprt/webapprt/overrides/dom.properties	2014-11-14 09:38:44.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/cs/webapprt/webapprt/overrides/dom.properties	2014-11-26 21:47:08.000000000 +0000
@@ -119,7 +119,7 @@
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Použití Mutation Events je zastaralé. Používejte raději MutationObserver.
 # LOCALIZATION NOTE: Do not translate "Components"
-ComponentsWarning=Použití objektu Components je zastaralé. Objekt bude brzo odstraněn.
+ComponentsWarning=Použití objektu Components je zastaralé. Objekt bude brzy odstraněn.
 PluginHangUITitle=Upozornění: Zásuvný modul nereaguje
 PluginHangUIMessage=Zásuvný modul %S je buď zaneprázdněn nebo přestal reagovat. Nyní můžete modul ukončit nebo počkat, zda se dokončí sám.
 PluginHangUIWaitButton=PokraÄŤovat
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/accessibility/AccessFu.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/accessibility/AccessFu.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/accessibility/AccessFu.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/accessibility/AccessFu.properties	2014-11-26 21:47:11.000000000 +0000
@@ -94,11 +94,10 @@
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 listItemsCount =       1 objekt;#1 objekter
 
-# LOCALIZATION NOTE: %1$S is the item's role name (e.g. "tab"),
-# %2$S is the position of the item n the set.
-# %3$S is the total number of such items in the set.
-# An expanded example would read "tab 2 of 5".
-objItemOf      =       %1$S %2$S af %3$S
+# LOCALIZATION NOTE: # %1$S is the position of the item n the set.
+# %2$S is the total number of such items in the set.
+# An expanded example would read "2 of 5".
+objItemOfN      =       %1$S af %2$S
 
 # Landmark announcements
 banner         =       banner
@@ -108,17 +107,14 @@
 navigation     =       navigation
 search         =       søg
 
-# Description of a table or grid:
-# 1 is a dynamically retrieved localized role of either 'table' or 'grid'.
-# 2 is the number of columns within the table.
-# 3 is the number of rows within the table or grid.
-tableInfo = %S med %S og %S
-# LOCALIZATION NOTE (tableColumnInfo): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tblColumnInfo): Semi-colon list of plural forms.
+# Number of columns within the table.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableColumnInfo = 1 kolonne;#1 kolonner
-# LOCALIZATION NOTE (tableRowInfo): Semi-colon list of plural forms.
+tblColumnInfo = med 1 kolonne;med #1 kolonner
+# LOCALIZATION NOTE (tblRowInfo): Semi-colon list of plural forms.
+# Number of rows within the table or grid.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableRowInfo = 1 række;#1 rækker
+tblRowInfo = og 1 række;og #1 rækker
 
 # table or grid cell information
 columnInfo = Kolonne %S
@@ -160,6 +156,7 @@
 stateExpanded    =    udvidet
 stateCollapsed   =    sammenfoldet
 stateUnavailable =    ikke tilgængelig
+stateReadonly    =    ikke skrivbar
 stateRequired    =    påkrævet
 stateTraversed   =    besøgt
 stateHasPopup    =    har pop op
@@ -189,18 +186,85 @@
 quicknav_Checkbox    = Afkrydsningsfelter
 
 # Shortened role names for braille
+menubarAbbr        =       menulinje
+scrollbarAbbr      =       rullepanel
+gripAbbr           =       greb
+alertAbbr          =       besked
+menupopupAbbr      =       pop op-menu
+documentAbbr       =       dokument
+paneAbbr           =       rude
+dialogAbbr         =       dialog
+separatorAbbr      =       separator
+toolbarAbbr        =       værktøjslinje
+statusbarAbbr      =       statuslinje
+tableAbbr          =       tbl
+columnheaderAbbr   =      kolonneoverskrift
+rowheaderAbbr      =       rækkeoverskrift
+columnAbbr         =       kolonne
+rowAbbr            =       række
+cellAbbr           =       celle
 linkAbbr           =       lnk
+listAbbr           =       liste
+listitemAbbr       =       listepunkt
+outlineAbbr        =       oversigt
+outlineitemAbbr    =       oversigtspunkt
+pagetabAbbr        =       faneblad
+propertypageAbbr   =       egenskabsside
+graphicAbbr        =       grafik
 pushbuttonAbbr     =       btn
+checkbuttonAbbr    =       afkrydsningsfelt
+radiobuttonAbbr    =       alternativknap
+comboboxAbbr       =       kombinationsboks
+progressbarAbbr    =       aktivitetslinje
+sliderAbbr         =       forskyder
+spinbuttonAbbr     =       rotationsknap
+diagramAbbr        =       diagram
+animationAbbr      =       animation
+equationAbbr       =       ligning
+buttonmenuAbbr     =       knapmenu
+whitespaceAbbr     =       mellemrum
+pagetablistAbbr    =       fanebladsliste
+canvasAbbr         =       lærred
+checkmenuitemAbbr  =       afkrydsningsmenupunkt
+labelAbbr          =       etiket
 passwordtextAbbr   =       passwdtxt
+radiomenuitemAbbr  =       valgmulighedsmenupunkt
+textcontainerAbbr  =       tekstboks
+togglebuttonAbbr   =       skifteknap
+treetableAbbr      =       trætabel
+headerAbbr         =       hoved
+footerAbbr         =       fod
+paragraphAbbr      =       afsnit
+entryAbbr          =       inddatering
+captionAbbr        =       figurtekst
+headingAbbr        =       overskrift
+sectionAbbr        =       sektion
+formAbbr           =       formular
+comboboxlistAbbr   =       liste til kombinationsboks
+comboboxoptionAbbr =       valgmulighed i kombinationsboks
 imagemapAbbr       =       imgmap
+listboxoptionAbbr  =       punkt i valgmulighedsliste
+listboxAbbr        =       valgmulighedsliste
+flatequationAbbr   =       flad ligning
+gridcellAbbr       =       celle i tern
+noteAbbr           =       note
 figureAbbr         =       fig
+definitionlistAbbr =       definitionsliste
+termAbbr           =       term
+definitionAbbr     =       definition
 textareaAbbr       =       txtarea
-tableAbbr          =       tbl
-tableInfoAbbr = %S %S %S
-# LOCALIZATION NOTE (tableColumnInfoAbbr): Semi-colon list of plural forms.
+
+# LOCALIZATION NOTE (tblColumnInfoAbbr): Semi-colon list of plural forms.
+# Number of columns within the table.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableColumnInfoAbbr = #1k;#1k
-# LOCALIZATION NOTE (tableRowInfoAbbr): Semi-colon list of plural forms.
+tblColumnInfoAbbr = #1k;#1k
+# LOCALIZATION NOTE (tblRowInfoAbbr): Semi-colon list of plural forms.
+# Number of rows within the table or grid.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tableRowInfoAbbr = #1r;#1r
+tblRowInfoAbbr = #1r;#1r
 cellInfoAbbr = k%Sr%S
+
+stateCheckedAbbr = (x)
+stateUncheckedAbbr = ( )
+statePressedAbbr = (x)
+stateUnpressedAbbr = ( )
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/dom/dom.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/dom/dom.properties	2014-11-26 21:47:11.000000000 +0000
@@ -208,3 +208,4 @@
 # LOCALIZATION NOTE: Do not translate "KeyboardEvent.key" and "Dead".
 KeyNameDeadKeysWarning=Værdier, der starter med "Dead" for KeyboardEvent.key er forældede og vil blive erstattet med "Dead". Læs mere på https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
 ImportXULIntoContentWarning=Importering af XUL-nodes ind i et indholdsdokument er forældet. Funktionen vil snart blive fjernet.
+XMLDocumentLoadPrincipalMismatch=Brug af document.load er ikke tilladt pĂĄ dokumenter, som stammer fra andre vinduer. Kun vinduet, hvor et dokument blev skabt, mĂĄ kalde .load pĂĄ dokumentet. Brug i stedet XMLHttpRequest.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/layout/css.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/layout/css.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/layout/css.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/layout/css.properties	2014-11-26 21:47:11.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/.
 
-MimeNotCss=Stilarket %1$S blev ikke indlæst, fordi dets MIME type, "%2$S",  ikke er "text/css".
-MimeNotCssWarn=Stilarket %1$S blev indlæst, på trods af at dets MIME type, "%2$S",  ikke er "text/css".
+MimeNotCss=Stilarket %1$S blev ikke indlæst, fordi dets MIME type, "%2$S", ikke er "text/css".
+MimeNotCssWarn=Stilarket %1$S blev indlæst, på trods af at dets MIME type, "%2$S", ikke er "text/css".
 
-PEUnexpEOF2=Enden af filen blev uventet nået under søgning efter %1$S.
+PEUnexpEOF2=Afslutning af filen blev uventet nået under søgning efter %1$S.
 PEParseRuleWSOnly=En streng, kun indeholdende blanke tegn, blev givet som regel til tolkning.
 PEDeclDropped=Erklæring droppet.
 PEDeclSkipped=Skippet til næste erklæring.
@@ -13,9 +13,9 @@
 PEValueParsingError=Fejl i fortolkningen af værdien for '%1$S'.
 PEExpectEndValue=Forventede 'end of value' men fandt '%1$S'.
 PERuleTrailing=Forventede 'end of rule' men fandt '%1$S'.
-PESkipAtRuleEOF2=enden af at-regel
+PESkipAtRuleEOF2=afslutning af at-regel
 PEUnknownAtRule=Ugenkendelig at-regel eller fejl under tolkning af at-regel '%1$S'.
-PECharsetRuleEOF=Tegnkodningsstreng i @charset-regel
+PECharsetRuleEOF=tegnkodningsstreng i @charset-regel
 PECharsetRuleNotString=Forventede tegnkodningsstreng men fandt i stedet '%1$S'.
 PEGatherMediaEOF=afslutning af media-liste i @import- eller @media-regel
 PEGatherMediaNotComma=Forventede ',' i media-liste, men fandt '%1$S'.
@@ -32,14 +32,14 @@
 PEMozDocRuleNotURI=Forventede URI i @-moz-document-regel men fandt '%1$S'.
 PEMozDocRuleNotString=Forventede en streng i @-moz-document-reglens regexp() funktion, men fandt '%1$S'.
 PEMozDocRuleEOF=næste URI i @-moz-document-regel
-PEAtNSPrefixEOF=namespace præfiks i @namespace-egel.
+PEAtNSPrefixEOF=namespace præfiks i @namespace-regel.
 PEAtNSURIEOF=namespace URI i @namespace-regel.
 PEAtNSUnexpected=Uventet token i @namespace: '%1$S'.
 PEKeyframeNameEOF=navn pĂĄ @keyframes-regel.
 PEKeyframeBadName=Forventede 'identifier' for navn pĂĄ @keyframes-regel.
-PEKeyframeBrace=Forventede ĂĄbnings-{ pĂĄ @keyframes-regel.
-PESkipDeclBraceEOF=Lukkende } af erklæringsblok.
-PESkipRSBraceEOF=Lukkende } af ugyldig regelsæt.
+PEKeyframeBrace=Forventede start-{ pĂĄ @keyframes-regel.
+PESkipDeclBraceEOF=afsluttende } af erklæringsblok.
+PESkipRSBraceEOF=afsluttende } af ugyldig regelsæt.
 PEBadSelectorRSIgnored=Regelsæt ignoreret pga. ugyldig selector.
 PEBadSelectorKeyframeRuleIgnored=Keyframe regel ignoreret pga. ugyldig selector.
 PESelectorListExtraEOF=',' eller '{'
@@ -51,11 +51,12 @@
 PECounterStyleBadBlockStart=Forventede '{' i starten af reglen @counter-style men fandt '%1$S'.
 PECounterStyleEOF=afsluttende '}' i blokken @counter-style
 PECounterDescExpected=Forventede tællerbeskrivelse men fandt '%1$S'.
-PEUnknownCounterDesc=Ukendt  deskriptor, '%1$S', i reglen @counter-style.
+PEUnknownCounterDesc=Ukendt deskriptor, '%1$S', i reglen @counter-style.
 PECounterExtendsNotIdent=Forventede identifikator for extends-systemet men fandt '%1$S'.
 PECounterASWeight=Hver vægt i beskrivelsen af additive-symboler skal være mindre end den foregående vægt.
-PEClassSelEOF=Klassenavn.
+PEClassSelEOF=klassenavn.
 PEClassSelNotIdent=Forventede identifier for klasse-selector, men fandt '%1$S'.
+PECoordinatePair=Forventede koordinatsæt, men fandt '%1$S'.
 PETypeSelEOF=elementtype
 PETypeSelNotType=Forventede element navn eller '*', men fandt '%1$S'.
 PEUnknownNamespacePrefix=Ukendt namespace-præfiks '%1$S'.
@@ -109,13 +110,13 @@
 PEDeclEndEOF=';' eller '}' for at afslutte erklæring
 PEParseDeclarationNoColon=Forventede ':', men fandt '%1$S'.
 PEParseDeclarationDeclExpected=Forventede erklæring, men fandt '%1$S'.
-PEEndOfDeclEOF=enden af erklæring
-PEImportantEOF=vigtigt
-PEExpectedImportant=Forventede 'vigtigt', men fandt '%1$S'.
+PEEndOfDeclEOF=afslutning af erklæring
+PEImportantEOF=important
+PEExpectedImportant=Forventede 'important', men fandt '%1$S'.
 PEBadDeclEnd=Forventede ';' for at afslutte erklæring, men fandt '%1$S'.
 PEBadDeclOrRuleEnd2=Forventede ';' eller '}' for at afslutte erklæring, men fandt '%1$S'.
 PEInaccessibleProperty2=Kan ikke angive værdi for intern egenskab.
-PECommentEOF=enden af kommentar
+PECommentEOF=afslutning af kommentar
 SEUnterminatedString=Fandt ulukket streng '%1$S'.
 PEFontDescExpected=Forventede font deskriptor men fandt '%1$S'.
 PEUnknownFontDesc=Ukendt deskriptor '%1$S' i @font-face regel.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/security/csp.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/security/csp.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/security/csp.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/security/csp.properties	2014-11-26 21:47:11.000000000 +0000
@@ -20,9 +20,6 @@
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = Forsøgte at sende en rapport til en ugyldig URI: "%1$S"
-# LOCALIZATION NOTE (errorWas):
-# %1$S is the error resulting from attempting to send the report
-errorWas = fejlen var: "%1$S"
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = kunne ikke hĂĄndtere rapport-URI'en: %1$S
@@ -35,26 +32,12 @@
 # LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
 # %1$S is the ETLD of the report URI that is not HTTP or HTTPS
 reportURInotHttpsOrHttp2 = Rapport-URIen (%1$S) skal være en HTTP- eller en HTTPS-URI.
-
 # LOCALIZATION NOTE (reportURInotInReportOnlyHeader):
 # %1$S is the ETLD of the page with the policy
 reportURInotInReportOnlyHeader = Dette websted (%1$S) benytter en Report-Only-policy uden at have angivet en rapport-URI. CSP blokerer ikke, og kan ikke rapportere overtrædelser af denne politik.
-
-# LOCALIZATION NOTE (pageCannotSendReportsTo):
-# %1$S is the URI of the page with the policy
-# %2$S is the report URI that could not be used
-pageCannotSendReportsTo = side pĂĄ %1$S kan ikke sende rapporter til %2$S
-allowOrDefaultSrcRequired = 'allow' eller 'default-src'-regel er påkrævet, men ikke til stede.  Anvender "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = Kunne ikke fortolke den ukendte kilde %1$S
-# LOCALIZATION NOTE (reportPostRedirect):
-# %1$S is the specified report URI before redirect
-reportPostRedirect =Afsendelse af rapport om brud til %1$S fejlede pĂĄ grund af en viderestillen
-# LOCALIZATION NOTE (allowDirectiveIsDeprecated):
-# Don't translate "allow" and "default-src" as they are keywords and part of
-# the CSP protocol syntax.
-allowDirectiveIsDeprecated = allow-reglen er forældet, brug i stedet den tilsvarende default-src-regel.
 # LOCALIZATION NOTE (inlineScriptBlocked):
 # inline script refers to JavaScript code that is embedded into the HTML document.
 inlineScriptBlocked = Et forsøg på at udføre inline scripts er blevet blokeret
@@ -67,41 +50,14 @@
 # LOCALIZATION NOTE (hostNameMightBeKeyword):
 # %1$S is the hostname in question and %2$S is the keyword
 hostNameMightBeKeyword = Fortolker %1$S som et værtsnavn, ikke et nøgleord. Hvis du ville bruge det som et nøgleord, så brug '%2$S' (i enkelte anførselstegn).
+# LOCALIZATION NOTE (notSupportingDirective):
+# directive is not supported (e.g. 'reflected-xss')
+notSupportingDirective = Reglen '%1$S' understøttes ikke. Reglen og værdierne ignoreres.
 
 # CSP Errors:
-policyURINotAlone = "policy-uri"-reglen kan kun bruges alene
-noParentRequest =policy-uri'en kan ikke hentes uden en forældreforespørgsel og en CSP.
-# LOCALIZATION NOTE (policyURIParseError):
-# %1$S is the URI that could not be parsed
-policyURIParseError = kunne ikke fortolke URI i politik-URI: %1$S
-# LOCALIZATION NOTE (nonMatchingHost):
-# %1$S is the URI host that does not match
-nonMatchingHost = kan ikke hente politik-URI fra det ikke-matchende værtsnavn: %1$S
-# LOCALIZATION NOTE (nonMatchingPort):
-# %1$S is the URI port that does not match
-nonMatchingPort = kan ikke hente politik-URI fra den ikke-matchende port: %1$S
-# LOCALIZATION NOTE (nonMatchingScheme):
-# %1$S is the URI scheme that does not match
-nonMatchingScheme = kan ikke hente politik-URI fra det ikke-matchende URI-skema: %1$S
-# LOCALIZATION NOTE (errorFetchingPolicy):
-# %1$S is the error that caused fetching to fail
-errorFetchingPolicy = Fejl ved hentning af policy-uri: %1$S
-cspSourceNotURI = Det angivne argument er ikke en nsIURI
-argumentIsNotString = Det angivne argument er ikke en streng
-selfDataNotProvided = Kan ikke bruge 'self' hvis der ikke er oplysninger om 'self'
-# LOCALIZATION NOTE (uriWithoutScheme):
-# %1$S is the URI without a scheme
-uriWithoutScheme = kan ikke fortolke en URI uden en protokol: %1$S
-selfKeywordNoSelfData = nøgleordet 'self' benyttet, men der er ikke oplysninger om 'self'
 # LOCALIZATION NOTE (couldntParseInvalidSource):
 # %1$S is the source that could not be parsed
 couldntParseInvalidSource = Kunne ikke fortolke den ugyldige kilde %1$S
-# LOCALIZATION NOTE (hostSourceWithoutData):
-# %1$S is the source
-hostSourceWithoutData = kan ikke oprette værtsspecifik kilde %1$S uden oplysninger om 'self'
-# LOCALIZATION NOTE (sourceWithoutData):
-# %1$S is the source
-sourceWithoutData = Kan ikke oprette kilden %1$S uden oplysninger om 'self'
 # LOCALIZATION NOTE (couldntParseInvalidHost):
 # %1$S is the host that's invalid
 couldntParseInvalidHost = Kunne ikke fortolke det ugyldige værtsnavn %1$S
@@ -111,21 +67,6 @@
 # LOCALIZATION NOTE (couldntParsePort):
 # %1$S is the string source
 couldntParsePort = Kunne ikke fortolke porten i %1$S
-# LOCALIZATION NOTE (notIntersectPort):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectPort = Kunne ikke flette %1$S med %2$S pĂĄ grund af port-problemer.
-# LOCALIZATION NOTE (notIntersectScheme):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectScheme = Kunne ikke flette %1$S med %2$S pĂĄ grund af skema-problemer.
-# LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
-# %1$S is the source
-intersectingSourceWithUndefinedHost = fletter kilde med udefineret vært: %1$S
-# LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
-# %1$S is the first source
-# %2$S is the second source
-intersectingSourcesWithUndefinedHosts = fletter to kilder med udefinerede værter: %1$S og %2$S
 # LOCALIZATION NOTE (duplicateDirective):
 # %1$S is the name of the duplicate directive
 duplicateDirective = Der er fundet flere %1$S-regler. Alle undtagen den første vil blive ignoreret.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/security/security.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/security/security.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/dom/chrome/security/security.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/dom/chrome/security/security.properties	2014-11-26 21:47:11.000000000 +0000
@@ -3,20 +3,17 @@
 BlockMixedDisplayContent = Blokerede indlæsning af blandet indhold "%1$S"
 BlockMixedActiveContent = Blokerede indlæsning af blandet aktivt indhold "%1$S"
 
-# CSP
-ReportOnlyCSPIgnored=Report-only CSP policy'en vil blive ignoreret, da der er andre non-report-only CSP policies angivet.
-# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy", "X-Content-Security-Policy-Report-Only",  "Content-Security-Policy" eller "Content-Security-Policy-Report-Only"
-OldCSPHeaderDeprecated=X-Content-Security-Policy og X-Content-Security-Report-Only headers vil blive forældede. Brug i stedet Content-Security-Policy og Content-Security-Report-Only headers med CSP spec compliant-syntaks.
-# LOCALIZATION NOTE: Do not translate "X-Content-Security-Policy/Report-Only" or "Content-Security-Policy/Report-Only"
-BothCSPHeadersPresent=Dette websted har angivet bĂĄde en X-Content-Security-Policy/Report-Only header og en Content-Security-Policy/Report-Only header. X-Content-Security-Policy/Report-Only header(e) ignoreres.
-
 # CORS
 CrossSiteRequestBlocked=Forespørgsel til fremmed websted blokeret. Politikken for samme oprindelse tillader ikke læsning af fjernressourcen %1$S. Dette kan løses ved at flytte ressourcen til samme websted eller ved at tillade CORS.
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=Webstedet angav en ugyldig Strict-Transport-Security-header.
+# LOCALIZATION NOTE: Do not translate "Public-Key-Pins or HPKP"
+InvalidPKPHeaders=Webstedet angav en ugyldig Public-Key-Pins-header.
 InsecurePasswordsPresentOnPage=Login-felterne er placeret på en usikker side (http://). Dette udgør en sikkerhedsrisiko, da det er muligt at stjæle dine login-koder.
 InsecureFormActionPasswordsPresent=Login-felterne er placeret i en usikker formular (http://). Dette udgør en sikkerhedsrisiko, da det er muligt at stjæle dine login-koder.
 InsecurePasswordsPresentOnIframe=Login-felterne er placeret i en usikker iframe (http://).  Dette udgør en sikkerhedsrisiko, da det er muligt at stjæle dine login-koder.
 LoadingMixedActiveContent=Indlæser blandet (usikkert) indhold på en sikker side "%1$S"
 LoadingMixedDisplayContent=Indlæser blandet (usikkert) indhold på en sikker side "%1$S"
+# LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
+BothAllowScriptsAndSameOriginPresent=En iframe som bĂĄde indeholder allow-scripts og allow-same-origin i sin sandbox-attribut kan deaktivere dens sandboxning.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/mail/chrome/messenger/aboutDialog.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/mail/chrome/messenger/aboutDialog.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -8,7 +8,7 @@
 -->
 <!ENTITY update.checkForUpdatesButton.label       "Søg efter opdateringer">
 <!ENTITY update.checkForUpdatesButton.accesskey   "S">
-<!ENTITY update.updateButton.label                "Genstart for at opdatere">
+<!ENTITY update.updateButton.label2               "Genstart &brandShortName; for at opdatere">
 <!ENTITY update.updateButton.accesskey            "G">
 <!ENTITY update.applyButtonBillboard.label        "Installer opdatering…">
 <!ENTITY update.applyButtonBillboard.accesskey    "I">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/mail/chrome/messenger/messenger.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/mail/chrome/messenger/messenger.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/mail/chrome/messenger/messenger.properties	2014-11-26 21:47:11.000000000 +0000
@@ -731,9 +731,6 @@
 websearch.isDefault=Denne søgetjeneste er valgt som standard
 
 # missing plugin installer
-missingpluginsMessage.title=Yderligere plugins er påkrævet for at vise alle medie-typer på denne side.
-missingpluginsMessage.button.label=Installer manglende plugins…
-missingpluginsMessage.button.accesskey=I
 outdatedpluginsMessage.title=Nogle plugins som bruges på denne side er forældede.
 outdatedpluginsMessage.updateButton.label=Opdater plugins…
 outdatedpluginsMessage.updateButton.accesskey=O
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/mail/chrome/messenger/preferences/advanced.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/mail/chrome/messenger/preferences/advanced.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -111,10 +111,10 @@
 <!ENTITY certs.auto.accesskey            "a">
 <!ENTITY certs.ask                       "Spørg mig hver gang">
 <!ENTITY certs.ask.accesskey             "ø">
+<!ENTITY enableOCSP.label                "Send forespørgsel til OCSP responder-servere for at bekræfte certifikaters aktuelle gyldighed">
+<!ENTITY enableOCSP.accesskey            "e">
 
 <!ENTITY viewCertificates.label         "Vis certifikater">
 <!ENTITY viewCertificates.accesskey     "c">
-<!ENTITY validation.label               "Verifikation">
-<!ENTITY validation.accesskey           "V">
 <!ENTITY viewSecurityDevices.label      "Sikkerhedsmoduler">
 <!ENTITY viewSecurityDevices.accesskey  "S">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/netwerk/necko.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/netwerk/necko.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/netwerk/necko.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/netwerk/necko.properties	2014-11-26 21:47:11.000000000 +0000
@@ -37,3 +37,5 @@
 PhishingAuthAccept=Jeg er indforstået og vil være meget forsigtig
 SuperfluousAuth=Du er ved at logge ind på websted "%1$S" med brugernavnet "%2$S," men webstedet kræver ikke godkendelse. Dette kan være et forsøg på at snyde dig.\n\nEr "%1$S" siden du ønsker at besøge?
 AutomaticAuth=Du er ved at logge ind pĂĄ webstedet "%1$S" med brugernavnet "%2$S."
+
+TrackingUriBlocked=Ressourcen pĂĄ "%1$S" blev blokeret, fordi beskyttelse mod sporing er aktiveret.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/README.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/README.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/README.md	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/README.md	2014-11-26 21:47:11.000000000 +0000
@@ -0,0 +1,3 @@
+# Velkommen til den danske oversættelse af Firefox, Firefox til Android, Thunderbird og Lightning. #
+
+Hjælp os med at læse korrektur på [oversættelsen](https://bitbucket.org/mozilladanmark/mozilla-dk/src) og [rapporter oversættelsesfejl og forbedringsforslag](https://bitbucket.org/mozilladanmark/mozilla-dk/issues?status=new&status=open). Du kan også bidrage til [oversættelsen af Firefox OS](https://bitbucket.org/mozilladanmark/gaia-da) eller [bidrage med andre ting](http://mozilladanmark.dk/vaermed/). Er du interesseret, så [kontakt os](http://forum.mozilladanmark.dk/viewforum.php?f=7) gerne.
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pipnss/nsserrors.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pipnss/nsserrors.properties	2014-11-26 21:47:11.000000000 +0000
@@ -24,8 +24,8 @@
 SSL_ERROR_EXPIRED_CERT_ALERT=SSL-modparten afviste dit certifikat med begrundelsen, at det er udløbet.
 SSL_ERROR_SSL_DISABLED=Kan ikke forbinde: SSL er deaktiveret.
 SSL_ERROR_FORTEZZA_PQG=Kan ikke forbinde: SSL-modparten befinder sig i et andet FORTEZZA-domæne.
-SSL_ERROR_UNKNOWN_CIPHER_SUITE=En ukendt SSL-kodepakke (cipher suite) blev forespurgt.
-SSL_ERROR_NO_CIPHERS_SUPPORTED=Der findes ingen aktiverede kodepakker (cipher suites) i dette program.
+SSL_ERROR_UNKNOWN_CIPHER_SUITE=En ukendt SSL-cipher suite blev forespurgt.
+SSL_ERROR_NO_CIPHERS_SUPPORTED=Der findes ingen aktiverede cipher suites i dette program.
 SSL_ERROR_BAD_BLOCK_PADDING=SSL modtog en attest med en forkert blokudfyldning.
 SSL_ERROR_RX_RECORD_TOO_LONG=SSL modtog en attest som overskred den maksimalt tilladte længde.
 SSL_ERROR_TX_RECORD_TOO_LONG=SSL forsøgte at sende en attest som overskred den maksimalt tilladte længde.
@@ -72,17 +72,17 @@
 SSL_ERROR_EXTRACT_PUBLIC_KEY_FAILURE=SSL kunne ikke læse den offentlige nøgle fra modpartens certifikat.
 SSL_ERROR_SERVER_KEY_EXCHANGE_FAILURE=Uventet fejl under udførsel af håndtrykket SSL Server Key Exchange.
 SSL_ERROR_CLIENT_KEY_EXCHANGE_FAILURE=Uventet fejl under udførsel af håndtrykket SSL Client Key Exchange.
-SSL_ERROR_ENCRYPTION_FAILURE=Den overordnede krypteringsalgoritme kunne ikke bruge den valgte kodepakke (cipher suite).
-SSL_ERROR_DECRYPTION_FAILURE=Den overordnede dekrypteringsalgoritme kunne ikke bruge den valgte kodepakke (cipher suite).
+SSL_ERROR_ENCRYPTION_FAILURE=Den overordnede krypteringsalgoritme kunne ikke bruge den valgte cipher suite.
+SSL_ERROR_DECRYPTION_FAILURE=Den overordnede dekrypteringsalgoritme kunne ikke bruge den valgte cipher suite.
 SSL_ERROR_SOCKET_WRITE_FAILURE=Forsøg på at skrive krypteret data til den underliggende socket-forbindelse mislykkedes.
 SSL_ERROR_MD5_DIGEST_FAILURE=Fejl i MD5-digest-funktionen.
 SSL_ERROR_SHA_DIGEST_FAILURE=Fejl i SHA-1-digest-funktionen.
 SSL_ERROR_MAC_COMPUTATION_FAILURE=Beregning af MAC mislykkedes.
 SSL_ERROR_SYM_KEY_CONTEXT_FAILURE=Kunne ikke oprette kontekst til symmetrisk nøgle.
 SSL_ERROR_SYM_KEY_UNWRAP_FAILURE=Kunne ikke læse symmetrisk nøgle fra beskeden Client Key Exchange.
-SSL_ERROR_PUB_KEY_SIZE_LIMIT_EXCEEDED=SSL-serveren forsøgte at bruge en offentlig nøgle af intern kvalitet sammen med en eksporteret kodepakke (cipher suite).
+SSL_ERROR_PUB_KEY_SIZE_LIMIT_EXCEEDED=SSL-serveren forsøgte at bruge en offentlig nøgle af intern kvalitet sammen med en eksporteret cipher suite.
 SSL_ERROR_IV_PARAM_FAILURE=PKCS11-kode kunne ikke oversætte en IV til en param.
-SSL_ERROR_INIT_CIPHER_SUITE_FAILURE=Kunne ikke initialisere den valgte kodepakke (cipher suite).
+SSL_ERROR_INIT_CIPHER_SUITE_FAILURE=Kunne ikke initialisere den valgte cipher suite.
 SSL_ERROR_SESSION_KEY_GEN_FAILURE=Klienten kunne ikke generere sessionsnøgler til SSL-sessionen.
 SSL_ERROR_NO_SERVER_KEY_FOR_ALG=Serveren har ingen nøgle til den valgte nøgleoverførselsalgoritme.
 SSL_ERROR_TOKEN_INSERTION_REMOVAL=En PKCS#11-token blev tilføjet eller fjernet men en anden operation var i gang.
@@ -122,6 +122,18 @@
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=SSL-funktionen understøtter ikke SSL 2.0-forbindelser.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=SSL-funktionen understøtter ikke servere.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=SSL-funktionen understøtter ikke klienter.
+SSL_ERROR_INVALID_VERSION_RANGE=SSL-versionsspændet er ikke gyldigt.
+SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=SSL-modparten valgte en cipher suite, som ikke er tilladt i den valgte protokolversion.
+SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL modtog et forkert udformet Hello Verify Request-meddelelse.
+SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL modtog en uventet Hello Verify Request-handshake-meddelelse.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=SSL-funktionen er ikke understøttet i denne protokolversion.
+SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL modtog en uventet Certificate Status-handshake-meddelelse.
+SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM=TLS-modparten benyttede en ikke understøttet hash-algoritme.
+SSL_ERROR_DIGEST_FAILURE=Digest-funktionen mislykkedes.
+SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM=Forkert signatur-algoritme angivet i et digitalt signeret element.
+SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK=Udvidelsen next protocol negotiation blev brugt, men callback-funktionen blev fjernet for tidligt.
+SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL=Serveren understøtter ikke nogle af de protokoller, som klienten tilbyder i ALPN-udvidelsen.
+SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT=Serveren afviste handshaket, fordi klienten nedgraderede til en lavere version af TLS end serveren understøtter.
 SEC_ERROR_IO=Der opstod en I/O-fejl under sikkerhedsgodkendelsen.
 SEC_ERROR_LIBRARY_FAILURE=fejl i sikkerhedsbiblioteket.
 SEC_ERROR_BAD_DATA=sikkerhedsbibliotek: modtog forkert data.
@@ -299,3 +311,6 @@
 SEC_ERROR_UNKNOWN_PKCS11_ERROR=Ukendt PKCS #11-fejl.
 SEC_ERROR_BAD_CRL_DP_URL=URL'en i distribution point-navn er ugyldig eller understøttes ikke.
 SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=Certifikatet er signeret med en signatur-algoritme, der er slĂĄet fra, fordi den ikke er sikker.
+MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=Serveren benytter key pinning (HPKP) men det var ikke muligt at oprette en certifikatkæde, der matcher pinsættet. Overtrædelse af key pinning kan ikke tilsidesættes.
+MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Serveren benytter et certifikat med udvidelsen med grundlæggende begrænsninger til at identificere den som en certifikatautoritet. Dette bør ikke være tilfældet for et korrekt udstedt certifikat.
+MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Serveren benytter et certifikat med en nøglestørrelse, der er for lille til at oprette en sikker forbindelse.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pipnss/pipnss.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pipnss/pipnss.properties	2014-11-26 21:47:11.000000000 +0000
@@ -299,7 +299,7 @@
 certErrorTrust_CaInvalid=Der stoles ikke pĂĄ certifikatet, da det er udstedt af et ugyldigt CA-certifikat.
 certErrorTrust_Issuer=Der stoles ikke pĂĄ certifikatet, fordi der ikke stoles pĂĄ udstederens certifikat.
 certErrorTrust_SignatureAlgorithmDisabled=Der stoles ikke pĂĄ certifikatet, fordi det er underskrevet med en usikker algoritme.
-certErrorTrust_ExpiredIssuer=Der stoles ikker på certifikatet, da udstederens certifikat er udløbet.
+certErrorTrust_ExpiredIssuer=Der stoles ikke på certifikatet, da udstederens certifikat er udløbet.
 certErrorTrust_Untrusted=Certifikatet stammer ikke fra en kilde, der er tillid til.
 
 certErrorMismatch=Certifikatet gælder ikke til navnet %S.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pippki/pippki.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pippki/pippki.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pippki/pippki.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -83,11 +83,6 @@
 <!ENTITY createCertInfo.msg1 "Nøglegenerering i gang. Dette kan tage er par minutter…">
 <!ENTITY createCertInfo.msg2 "Vent venligst…">
 
-<!-- Form Signing confirmation prompt -->
-<!ENTITY formSigning.title "Signering af tekst">
-<!ENTITY formSigning.cert "Signerer certifikat">
-<!ENTITY formSigning.confirmPassword "For at bekræfte at du ønsker at signere denne tekstbesked med det valgte certifikat, indtast da venligst hovedadgangskoden: ">
-
 <!-- Strings for protectedAuth dialog -->
 <!ENTITY protectedAuth.title "Beskyttet token-godkendelse">
 <!ENTITY protectedAuth.msg "Identificer dig selv over for denne token. Godkendelsesmetoden afhænger af typen af dit token.">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:47:11.000000000 +0000
@@ -135,9 +135,6 @@
 importServerCertPrompt=Vælg den fil, der indeholder det servercertifikat, du vil importere
 file_browse_Certificate_spec=Certifikatfiler
 
-# Form Signing confirmation prompt
-formSigningIntro=Webstedet '%S' beder dig signere den følgende tekstbesked:
-
 # Cert export
 SaveCertAs=Gem certifikatet i en fil
 CertFormatBase64=X.509-certifikat (PEM)
@@ -154,9 +151,9 @@
 
 #Add Security Exception dialog
 addExceptionBrandedWarning2=Du er ved at tilsidesætte hvordan %S identificerer dette websted.
-addExceptionInvalidHeader=Denne side forsøger at identificere sig selv med ugyldig information.
-addExceptionDomainMismatchShort=Forkert side
-addExceptionDomainMismatchLong=Certifikatet tilhører en anden side, hvilket kan indikere identitetstyveri.
+addExceptionInvalidHeader=Dette websted forsøger at identificere sig selv med ugyldig information.
+addExceptionDomainMismatchShort=Forkert websted
+addExceptionDomainMismatchLong=Certifikatet tilhører et andet websted, hvilket kan indikere identitetstyveri.
 addExceptionExpiredShort=Forældet information
 addExceptionExpiredLong=Certifikatet er ikke gyldigt i øjeblikket. Det er ikke muligt at finde ud af, om identiteten er stjålet eller gået tabt.
 addExceptionUnverifiedOrBadSignatureShort=Ukendt identitet
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/aboutSupport.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/aboutSupport.properties	2014-11-26 21:47:11.000000000 +0000
@@ -64,6 +64,7 @@
 adapterDescription = Adapter-beskrivelse
 adapterVendorID = Producentidentifikation
 adapterDeviceID = Enhedsidentifikation
+adapterSubsysID = Subsys-identifikation
 adapterDrivers = Adapter-drivere
 adapterRAM = Adapter-RAM
 driverVersion = Driver-version
@@ -71,6 +72,7 @@
 adapterDescription2 = Adapter-beskrivelse (GPU #2)
 adapterVendorID2 = Producentidentifikation (GPU #2)
 adapterDeviceID2 = Enhedsidentifikation (GPU #2)
+adapterSubsysID2 = Subsys-identifikation (GPU #2)
 adapterDrivers2 = Adapter-drivere (GPU #2)
 adapterRAM2 = Adapter-RAM (GPU #2)
 driverVersion2 = Driver-version (GPU #2)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/actions.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/actions.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/actions.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/actions.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY action.switchToTab.label "Skift til faneblad">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/autocomplete.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/autocomplete.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/autocomplete.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/autocomplete.properties	2014-11-26 21:47:11.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/.
+
+# LOCALIZATION NOTE (searchWithEngine): %S will be replaced with
+# the search engine provider's name. This format was chosen because
+# the provider can also end with "Search" (e.g.: MSN Search).
+searchWithEngine = Søg med %S
+# LOCALIZATION NOTE (searchWithEngineForQuery):
+# %1$S is the search engine's name, %2$S is the search query.
+# This format was chosen because the provider can also end with "Search"
+# (e.g.: MSN Search).
+searchWithEngineForQuery = %2$S — søg med %1$S 
+switchToTab = Skift til faneblad
+# LOCALIZATION NOTE (visitURL):
+# %S is the URL to visit.
+visitURL = GĂĄ til %S
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/charsetMenu.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/charsetMenu.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/charsetMenu.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/charsetMenu.properties	2014-11-26 21:47:11.000000000 +0000
@@ -68,11 +68,6 @@
 # gbk.bis.key never appears together with gbk.key and, hence, can be the same.
 gbk.bis.key      =          f
 gbk.bis          = Kinesisk, forenklet
-# The strings gbk.key, gbk and gb18030 are no longer used but are retained
-# in order to enable backout after string freeze, just in case.
-gbk.key          =          f
-gbk              = Kinesisk, forenklet (GBK)
-gb18030          = Kinesisk, forenklet (GB18030)
 
 # Chinese, Traditional
 Big5.key         =          T
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/devtools/styleinspector.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/devtools/styleinspector.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/devtools/styleinspector.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/devtools/styleinspector.properties	2014-11-26 21:47:11.000000000 +0000
@@ -100,14 +100,6 @@
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=k
 
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources): Text displayed in the rule view
-# context menu.
-ruleView.contextmenu.showCSSSources=Vis CSS-kildekode
-
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
-# the rule view context menu "Show CSS sources" entry.
-ruleView.contextmenu.showCSSSources.accessKey=C
-
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
 ruleView.contextmenu.addRule=Tilføj en regel
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/resetProfile.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/resetProfile.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/resetProfile.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/resetProfile.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -2,14 +2,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/.  -->
 
-<!ENTITY resetProfile.dialog.title        "Nulstil &brandShortName;">
-<!ENTITY resetProfile.dialog.description  "Er du sikker pĂĄ, at du vil nulstille  &brandShortName; til programmets oprindelige tilstand?">
-<!ENTITY resetProfile.dialog.items2.label "&brandShortName; vil prøve at bevare dine:">
-<!ENTITY resetProfile.dialog.footer.label "&brandShortName; vil genstarte og alt andet vil blive fjernet.">
-<!ENTITY resetProfile.dialog.button.label "Nulstil &brandShortName;">
+<!ENTITY refreshProfile.dialog.title         "Nulstil &brandShortName;">
+<!ENTITY refreshProfile.dialog.description1  "Start forfra for at rette problemer og genoprette ydelsen.">
+<!ENTITY refreshProfile.dialog.description2  "Dette vil:">
+<!ENTITY refreshProfile.dialog.items.label1  "Fjerne dine tilføjelser og tilpasninger">
+<!ENTITY refreshProfile.dialog.items.label2  "Gendanne din browsers indstillinger til standardindstillingerne">
+<!ENTITY refreshProfile.dialog.button.label  "Nulstil &brandShortName;">
 
-<!ENTITY resetProfile.title               "Nulstil &brandShortName; til programmets oprindelige tilstand">
-<!ENTITY resetProfile.description         "Hvis du har store problemer, som du ikke kan løse, kan du nulstille og starte på en frisk med dine grundliggende oplysninger.">
-<!ENTITY resetProfile.button.label2       "Nulstil &brandShortName;…">
+<!ENTITY refreshProfile.title                "Giv &brandShortName; en tuning">
+<!ENTITY refreshProfile.button.label         "Nulstil &brandShortName;…">
 
-<!ENTITY resetProfile.cleaning.description "Vent mens &brandShortName; rydder op i dine gamle data…">
+<!ENTITY refreshProfile.cleaning.description "Næsten færdig…">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/resetProfile.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/resetProfile.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/resetProfile.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/resetProfile.properties	2014-11-26 21:47:11.000000000 +0000
@@ -7,6 +7,6 @@
 # LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
 resetUnusedProfile.message=Det ser ud som om, du ikke har brugt %S i et stykke tid. Vil du nulstille for at starte med en frisk profil? For øvrigt, velkommen tilbage!
 
-# LOCALIZATION NOTE (resetProfile.resetButton.label): %S is brandShortName.
-resetProfile.resetButton.label=Nulstil %S…
-resetProfile.resetButton.accesskey=N
+# LOCALIZATION NOTE (refreshProfile.resetButton.label): %S is brandShortName.
+refreshProfile.resetButton.label=Nulstil %S…
+refreshProfile.resetButton.accesskey=N
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/xpinstall/xpinstall.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/xpinstall/xpinstall.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/global/xpinstall/xpinstall.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/global/xpinstall/xpinstall.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +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/.
-
-#--------------------------------------------------------------------
-#   Install Actions
-#--------------------------------------------------------------------
-InstallFile=Installerer: %s
-InstallSharedFile=Installere den delte fil: %s
-ReplaceFile=Erstatter: %s
-ReplaceSharedFile=Erstatter den delte fil: %s
-SkipFile=Springer over: %s
-SkipSharedFile=Springer over delt fil: %s
-
-DeleteFile=Sletter filen: %s
-DeleteComponent=Sletter komponent: %s
-
-Execute=Eksekverer: %s
-ExecuteWithArgs=Eksekverer: %s med argumentet: %s
-
-CopyFile=Kopiere fil: %s til %s
-ExecuteFile=Eksekver filen: %s
-ExecuteFileWithArgs=Eksekver filen: %s med argumentet: %s
-MoveFile=Flyt filen: %s til %s
-RenameFile=Omdøb filen: %s til %s
-CreateFolder=Opret mappe: %s
-RemoveFolder=Fjern mappe: %s
-RenameFolder=Omdøb mappe: %s til %s
-WindowsShortcut=Windows-genvej: %s
-MacAlias=Mac Alias: %s
-WindowsRegisterServer=Windows register-server: %s
-UnknownFileOpCommand=Ukendt fil kommando!
-
-Patch=Patcher: %s
-
-Uninstall=Afinstallerer: %s
-
-RegSkin=Registrer Skind: %s
-RegLocale=Registrer Locale: %s
-RegContent=Registrer indhold: %s
-RegPackage=Registre pakke: %s
-
-#--------------------------------------------------------------------
-#   Dialog Messages
-#--------------------------------------------------------------------
-
-ApplyNowSkin=Brug dette tema
-ApplyNowLocale=Brug dette lokale sprog
-
-ConfirmSkin=Installer temaet "%1$S" fra %2$S?
-ConfirmLocale=Installer locale "%1$S" fra %2$S?
-
-OK=Installer
-
-progress.queued=I kø
-progress.downloading=Henter…
-progress.downloaded=Hentede
-progress.installing=Installerer…
-
-Unsigned=Ikke underskrevet
-
-#--------------------------------------------------------------------
-#   Miscellaneous
-#--------------------------------------------------------------------
-ERROR=FEJL
-
-error0=Det lykkedes
-error999=Genstart for at færdiggøre
-error-202=Adgang nægtet
-error-203=Uventet installationsfejl\nUndersøg fejlkonsol-loggen for flere detaljer.
-error-204=Installationsscript ikke fundet
-error-207=Ikke en korrekt installations pakke
-error-208=Forkert argument
-error-210=Bruger annulleret
-error-214=Den krævede fil eksisterer ikke
-error-215=Skrivebeskyttet
-error-218=AppleSingle udpakningsfejl
-error-219=Forkert sti
-error-225=UDPAKNING_MISLYKKET
-error-227=Annulleret
-error-228=Fejl ved hentning
-error-229=Script fejl
-error-230=Eksisterer allerede
-error-235=Ikke mere plads
-error-239=Chrome registrering mislykkedes
-error-240=Ikke færdiggjort installation
-error-244=Pakke ikke understøttet
-error-260=Underskriften kunne ikke verificeres.
-error-261=Ugyldigt fil hash (muligvis fejlbehæftet hentning)
-error-262=Ukendt eller ugyldig fil hash type
-error-299=Løb tør for hukommelse
-
-# there are other error codes, either rare or obsolete,
-# that are not worth translating at this time.
-unknown.error=Uventet fejl %S
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/mozapps/plugins/plugins.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/mozapps/plugins/plugins.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -1,22 +1,3 @@
-<!ENTITY pluginWizard.title                                  "Plugin Finder-tjenesten">
-<!ENTITY pluginWizard.firstPage.title                        "Velkommen til &pluginWizard.title;">
-
-<!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; undersøger nu for tilgængelige plugins…">
-
-<!ENTITY pluginWizard.availablePluginsPage.title             "Tilgængelige plugins">
-<!ENTITY pluginWizard.availablePluginsPage.description.label "Følgende plugins er tilgængelige:">
-<!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Klik på Næste for at installere disse plugins.">
-<!ENTITY pluginWizard.availablePluginsPage.installerUI       "Nogle plugins kan måske kræve yderligere informationer fra dig under installationen.">
-
-<!ENTITY pluginWizard.licensePage.title                      "Plugin-licens">
-<!ENTITY pluginWizard.licensePage.accept.label               "Jeg accepterer.">
-<!ENTITY pluginWizard.licensePage.deny.label                 "Jeg accepterer IKKE (plugin'et vil ikke blive installeret).">
-
-<!ENTITY pluginWizard.installPluginsPage.title               "Installerer plugins">
-<!ENTITY pluginWizard.installPluginsPage.description.label   "&brandShortName; installerer plugins…">
-
-<!ENTITY pluginWizard.finalPage.description.label            "&brandShortName; blev færdig med at installere de manglende plugins:">
-
 <!-- LOCALIZATION NOTE (unsupportedPlatform.pre): Mobile only. Flash (the only plugin available on mobile)
      is not supported on some devices. Include a trailing space as needed. -->
 <!ENTITY unsupportedPlatform.pre                             "&brandShortName; kan desværre ikke afvikle Flash på denne enhed. ">
@@ -26,9 +7,6 @@
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
 <!ENTITY unsupportedPlatform.post                            "">
 
-<!ENTITY pluginWizard.finalPage.moreInfo.label               "Hør mere om plugins eller find selv flere plugins.">
-<!ENTITY pluginWizard.finalPage.restart.label                "&brandShortName; skal genstartes for at de nye plugins kan blive aktiveret.">
-
 <!ENTITY missingPlugin                                       "Et plugin er nødvendigt for at vise dette indhold.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Tryk her for at aktivere plugin.">
@@ -39,7 +17,6 @@
 <!ENTITY disabledPlugin                                      "Dette plugin er deaktiveret.">
 <!ENTITY blockedPlugin.label                                 "Plugin'et er blevet blokeret for din sikkerhed.">
 <!ENTITY hidePluginBtn.label                                 "Skjul plugin">
-<!ENTITY installPlugin                                       "Installer plugin…">
 <!ENTITY managePlugins                                       "Administrer plugins…">
 
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/mozapps/plugins/plugins.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/mozapps/plugins/plugins.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/mozapps/plugins/plugins.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/mozapps/plugins/plugins.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-pluginLicenseAgreement.label=For at installere %S, skal du acceptere følgende:
-
-pluginInstallation.download.start=Henter %S…
-pluginInstallation.download.finish=Hentning af %S afsluttet.
-
-pluginInstallation.install.start=Installerer %S…
-pluginInstallation.install.finish=%S blev installeret korrekt.
-pluginInstallation.install.error=Installation af %S (%S) mislykkedes.
-
-pluginInstallation.complete=Installation af plugins er færdiggjort.
-
-pluginInstallationSummary.success=Installeret
-pluginInstallationSummary.failed=Mislykkedes
-pluginInstallationSummary.licenseNotAccepted=Licens ikke accepteret
-pluginInstallationSummary.notAvailable=Ikke tilgængelig
-pluginInstallationSummary.manualInstall.label=Manuel installation
-pluginInstallationSummary.manualInstall.tooltip=Installer plugin manuelt.
-
-pluginInstallation.noPluginsFound=Ingen passende plugins fundet.
-pluginInstallation.noPluginsInstalled=Ingen plugins installeret.
-pluginInstallation.unknownPlugin=Ukendt plugin (%S)
-
-pluginInstallation.restart.label=Genstart %S
-pluginInstallation.restart.accesskey=G
-pluginInstallation.close.label=Luk
-pluginInstallation.close.accesskey=L
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/mozapps/update/updates.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/mozapps/update/updates.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/toolkit/chrome/mozapps/update/updates.dtd	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/toolkit/chrome/mozapps/update/updates.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -39,7 +39,7 @@
 
 <!ENTITY  license.titleText               "Software licensaftale">
 <!ENTITY  license.introText               "VilkĂĄr og betingelser for anvendelse af denne software.">
-<!ENTITY  license.instructionText         "Læs venligst den følgende licensaftale. Brug rullebjælken for at se resten af aftalen.">
+<!ENTITY  license.instructionText         "Læs venligst den følgende licensaftale. Brug rullepanelet for at se resten af aftalen.">
 <!ENTITY  license.accept                  "Jeg accepterer licensaftalen">
 <!ENTITY  license.accept.accesskey        "a">
 <!ENTITY  license.decline                 "Jeg accepterer IKKE licensaftalen">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/webapprt/webapprt/downloads/downloads.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/webapprt/webapprt/downloads/downloads.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/webapprt/webapprt/downloads/downloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/webapprt/webapprt/downloads/downloads.dtd	2014-11-26 21:47:11.000000000 +0000
@@ -0,0 +1,52 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 (window.width2, window.height): These values should be
+close to the golden ratio (1.618:1) while making sure it's wide enough for long
+file names and tall enough to hint that there are more downloads in the list -->
+<!ENTITY window.width2                    "485">
+<!ENTITY window.height                    "300">
+
+<!ENTITY starting.label                   "Starter…">
+<!ENTITY scanning.label                   "Skanner for virus…">
+
+<!ENTITY downloads.title                  "Filhentning">
+
+<!ENTITY cmd.pause.label                  "Pause">
+<!ENTITY cmd.pause.accesskey              "P">
+<!ENTITY cmd.resume.label                 "Genoptag">
+<!ENTITY cmd.resume.accesskey             "G">
+<!ENTITY cmd.cancel.label                 "Annuller">
+<!ENTITY cmd.cancel.accesskey             "A">
+<!ENTITY cmd.show.label                   "Ă…bn hentningsmappe">
+<!ENTITY cmd.show.accesskey               "h">
+<!ENTITY cmd.showMac.label                "Vis i Finder">
+<!ENTITY cmd.showMac.accesskey            "V">
+<!ENTITY cmd.open.label                   "Ă…bn">
+<!ENTITY cmd.open.accesskey               "Ă…">
+<!ENTITY cmd.openWith.label               "Åbn med…">
+<!ENTITY cmd.openWith.accesskey           "m">
+<!ENTITY cmd.retry.label                  "Prøv igen">
+<!ENTITY cmd.retry.accesskey              "i">
+<!ENTITY cmd.goToDownloadPage.label       "GĂĄ til siden, filen blev hentet fra">
+<!ENTITY cmd.goToDownloadPage.accesskey   "t">
+<!ENTITY cmd.copyDownloadLink.label       "Kopier linkadresse">
+<!ENTITY cmd.copyDownloadLink.accesskey   "K">
+<!ENTITY cmd.removeFromList.label         "Fjern fra liste">
+<!ENTITY cmd.removeFromList.accesskey     "F">
+
+<!ENTITY cmd.close.commandKey             "w">
+<!ENTITY cmd.close2.commandKey            "j">
+<!ENTITY cmd.close2Unix.commandKey        "y">
+<!ENTITY cmd.clearList.label              "Ryd liste">
+<!ENTITY cmd.clearList.tooltip            "Fjerner færdige, afbrudte og mislykkedes filhentninger fra listen">
+<!ENTITY cmd.clearList.accesskey          "R">
+<!ENTITY cmd.find.commandKey              "f">
+<!ENTITY cmd.search.commandKey            "k">
+
+<!ENTITY closeWhenDone.label              "Luk når filhentninger er færdige">
+<!ENTITY closeWhenDone.tooltip            "Lukker Filhentning, nĂĄr alle filer er hentet">
+
+<!ENTITY showFolder.label                 "Vis denne mappe">
+<!ENTITY searchBox.label                  "Søg…">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/webapprt/webapprt/webapp.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/webapprt/webapprt/webapp.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/da/webapprt/webapprt/webapp.properties	2014-11-14 09:38:46.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/da/webapprt/webapprt/webapp.properties	2014-11-26 21:47:11.000000000 +0000
@@ -41,5 +41,14 @@
 webapps.install.install=Installer app
 webapps.install.dontinstall=Installer ikke
 
+# LOCALIZATION NOTE (webapps.uninstall.title): %S will be replaced with the name
+# of the webapp being uninstalled.
+webapps.uninstall.title=Afinstaller %S
+# LOCALIZATION NOTE (webapps.uninstall.description): %S will be replaced with the
+# name of the webapp being uninstalled.
+webapps.uninstall.description=Vil du afinstallere %S?
+webapps.uninstall.uninstall=Afinstaller app
+webapps.uninstall.dontuninstall=Afinstaller ikke
+
 paymentDialog.title=Betaling
 paymentDialog.message=Hvilken betalingstjeneste vil du bruge?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/dom/chrome/appstrings.properties	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/dom/chrome/appstrings.properties	2014-11-26 21:47:24.000000000 +0000
@@ -30,7 +30,7 @@
 externalProtocolLaunchBtn=Iniciar aplicaciĂłn
 malwareBlocked=El sitio web %S ha sido reportado como un sitio de ataque y fue bloqueado basado en sus preferencias de seguridad.
 phishingBlocked=El sitio web %S ha sido reportado como un sitio fraudulento diseñado para engañar usuarios para que compartan información personal o financiera.
-cspFrameAncestorBlocked=Esta página tiene una política de seguridad de contenido que evita que sea incrustada de esta forma.
+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.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/dom/chrome/dom/dom.properties	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/dom/chrome/dom/dom.properties	2014-11-26 21:47:24.000000000 +0000
@@ -207,3 +207,5 @@
 ImportXULIntoContentWarning=Importar nodos XUL en un documento de contenido es obsoleto. Esta funcionalidad será eliminada pronto.
 XMLDocumentLoadPrincipalMismatch=El uso de document.load está prohibido en documentos que vienen desde otras ventanas. Solamente la ventana el cual el documento fue creado tiene permitido llamar a .load en ese documento. Preferiblemente, use XMLHttpRequest en su lugar.
 XMLDocumentLoadPrincipalMismatch=El uso de document.load está prohibido en documentos que vienen de otras ventanas. Solamente la ventana en la que el documento fue creado tiene permiso para llamar .load en ese documento. Preferiblemente use XMLHttpRequest en su lugar.
+# LOCALIZATION NOTE: Do not translate "IndexedDB".
+IndexedDBTransactionAbortNavigation=Una transacción IndexedDB que fue aún completada fue abortada por la navegación de la página.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/dom/chrome/netError.dtd	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/dom/chrome/netError.dtd	2014-11-26 21:47:24.000000000 +0000
@@ -91,8 +91,8 @@
 <p>Estos tipos de falsificaciones web son usados en estafas conocidas como ataques de <i>phishing</i>, en los que páginas web y correos electrónicos fraudulentos son usados para imitar páginas en las que puede confiar.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Bloqueado por polĂ­tica de seguridad de contenido">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>El navegador evitó que se cargue esta página de esta forma porque tiene una política de seguridad de contenido que no lo permite.</p>">
+<!ENTITY cspBlocked.title "Bloqueado por polĂ­tica de seguridad de contenido">
+<!ENTITY cspBlocked.longDesc "<p>El navegador evitó que esta página se cargue de esta forma porque tiene una política de seguridad que la deshabilita.</p>">
 
 <!ENTITY corruptedContentError.title "Error de contenido corrupto">
 <!ENTITY corruptedContentError.longDesc "<p>La página que está tratando de ver no puede mostrarse porque se detectó un error en la transmisión de los datos.</p><ul><li>Contacte a los dueños del sitio web para informarles de este problema.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/mail/chrome/messenger/charsetTitles.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/mail/chrome/messenger/charsetTitles.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/mail/chrome/messenger/charsetTitles.properties	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/mail/chrome/messenger/charsetTitles.properties	2014-11-26 21:47:24.000000000 +0000
@@ -35,21 +35,17 @@
 euc-jp.title = Japonés (EUC-JP)
 big5.title = Chino tradicional (Big5)
 big5-hkscs.title = Chino tradicional (Big5-HKSCS)
-x-euc-tw.title = Chino tradicional (EUC-TW)
 gb2312.title = Chino simplificado (GB2312)
 hz-gb-2312.title = Chino simplificado (HZ)
 gbk.title = Chino simplificado (GBK)
-iso-2022-cn.title = Chino simplificado (ISO-2022-CN)
 euc-kr.title = Coreano (EUC-KR)
 x-johab.title = Coreano (JOHAB)
-iso-2022-kr.title = Coreano (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16LE)
 utf-16be.title = Unicode (UTF-16BE)
 iso-8859-5.title = CirĂ­lico (ISO-8859-5)
-iso-ir-111.title = CirĂ­lico (ISO-IR-111)
 windows-1251.title = CirĂ­lico (Windows-1251)
 x-mac-cyrillic.title = Cyrillic (MacCyrillic)
 x-mac-ukrainian.title = CirĂ­lico/ucraniano (MacUkrainian)
@@ -63,7 +59,6 @@
 viscii.title = Vietnamita (VISCII)
 x-viet-vps.title = Vietnamita (VPS)
 windows-874.title = Tailandés (Windows-874)
-ibm874.title = Tailandés (IBM-874)
 armscii-8.title = Armenio (ARMSCII-8)
 iso-8859-6.title = Arábigo (ISO-8859-6)
 iso-8859-6-i.title = Arábigo (ISO-8859-6-I)
@@ -75,11 +70,6 @@
 windows-1256.title = Arábigo (Windows-1256)
 x-user-defined.title = Definido por el usuario
 ibm866.title = CirĂ­lico/ruso (CP-866)
-ibm850.title = Occidental (IBM-850)
-ibm852.title = Centroeuropeo (IBM-852)
-ibm855.title = CirĂ­lico (IBM-855)
-ibm857.title = Turco (IBM-857)
-ibm862.title = Hebreo (IBM-862)
 gb18030.title = Chino simplificado (GB18030)
 x-mac-arabic.title = Arábigo (MacArabic)
 x-mac-farsi.title = Farsi (MacFarsi)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/mail/chrome/messenger/preferences/privacy.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/mail/chrome/messenger/preferences/privacy.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/mail/chrome/messenger/preferences/privacy.dtd	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/mail/chrome/messenger/preferences/privacy.dtd	2014-11-26 21:47:24.000000000 +0000
@@ -33,11 +33,7 @@
 <!ENTITY showCookies.label "Mostrar cookies…">
 <!ENTITY showCookies.accesskey "S">
 
-<!ENTITY dntTrackingNopref.label2 "No decirle a los sitios sobre mis preferencias de rastreo">
-<!ENTITY dntTrackingNopref.accesskey "o">
 <!ENTITY dntTrackingNotOkay.label2 "Decirle a los sitios que no quiero ser rastreado">
 <!ENTITY dntTrackingNotOkay.accesskey "n">
-<!ENTITY dntTrackingOkay.label2 "Decirle a los sitios que quiero ser rastreado">
-<!ENTITY dntTrackingOkay.accesskey "t">
 <!ENTITY doNotTrackInfo.label "Conocer más sobre no rastrear">
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/mail/chrome/overrides/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/mail/chrome/overrides/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/mail/chrome/overrides/netError.dtd	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/mail/chrome/overrides/netError.dtd	2014-11-26 21:47:24.000000000 +0000
@@ -170,8 +170,8 @@
 <p>Estos tipos de falsificaciones web son usados en estafas conocidas como ataques de <i>phishing</i>, en los que páginas web y correos electrónicos fraudulentos son usados para imitar fuentes en las que puede confiar.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Bloqueado por polĂ­tica de seguridad de contenido">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; evitó que se cargue esta página de esta forma porque tiene una política de seguridad de contenido que no lo permite.</p>">
+<!ENTITY cspBlocked.title "Bloqueado por polĂ­tica de seguridad de contenido">
+<!ENTITY cspBlocked.longDesc "<p>&brandShortName; evitó que se cargue esta página de esta forma porque tiene una política de seguridad de contenido que no lo permite.</p>">
 
 <!ENTITY corruptedContentError.title "Error de contenido corrupto">
 <!ENTITY corruptedContentError.longDesc "<p>El contenido que está tratando de ver no puede mostrarse porque se detectó un error en la transmisión de los datos.</p><ul><li>Contacte a los dueños para inormarles de este problema.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:38:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:47:24.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Iniciar aplicaciĂłn
 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.
-cspFrameAncestorBlocked=This application tried to access a resource that has a content security policy that prevents it from being embedded in this way.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/b2g/chrome/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/b2g/chrome/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/b2g/chrome/overrides/appstrings.properties	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/b2g/chrome/overrides/appstrings.properties	2014-11-26 21:47:27.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Ejecutar aplicaciĂłn
 malwareBlocked = El sitio en %S ha sido identificado como un sitio atacante y ha sido bloqueado basándose en sus preferencias de seguridad.
 phishingBlocked = El sitio web en %S ha sido identificado como una copia fraudulenta que ha sido diseñada para engañar a los usuarios para introducir información personal o bancaria.
-cspFrameAncestorBlocked = Esta página tiene una política de seguridad de contenido que impide que pueda ser incrustado de esta forma.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/dom/chrome/appstrings.properties	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/dom/chrome/appstrings.properties	2014-11-26 21:47:27.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Ejecutar aplicaciĂłn
 malwareBlocked = El sitio en %S ha sido identificado como un sitio atacante y ha sido bloqueado basándose en sus preferencias de seguridad.
 phishingBlocked = El sitio web en %S ha sido identificado como una suplantación de web diseñada para engañar a los usuarios y que compartan información personal o financiera.
-cspFrameAncestorBlocked = Esta página tiene una política de seguridad de contenido que impide que pueda ser incrustado de esta forma.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/dom/chrome/dom/dom.properties	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/dom/chrome/dom/dom.properties	2014-11-26 21:47:27.000000000 +0000
@@ -143,3 +143,4 @@
 KeyNameDeadKeysWarning = Los valores de KeyboardEvent.key que comienzan con "Dead" es obsoleto y será convertido a simplemente "Dead". Para más ayuda vea https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
 ImportXULIntoContentWarning = Importar nodos XUL en un documento de contenido está desaprobado. Esta funcionalidad puede desaparecer pronto.
 XMLDocumentLoadPrincipalMismatch = El uso de document.load está prohibido en documentos que vienen de otras ventanas. Sólo la ventana en la que se ha creado un documento puede llamar a .load en ese documento. Es preferible usar XMLHttpRequest en su lugar.
+IndexedDBTransactionAbortNavigation = Se ha anulado una transacción de IndexedDB incompleta debido a navegación entre páginas.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/dom/chrome/netError.dtd	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/dom/chrome/netError.dtd	2014-11-26 21:47:27.000000000 +0000
@@ -64,8 +64,8 @@
 <p>Introducir información personal en esta página puede dar lugar a una suplantación de identidad u otro fraude.</p>
 <p>Estos tipos de falsificaciones de webs se usan en timos conocidos como ataques de phishing, en los cuales se usan páginas web y mensajes de correo electrónico fraudulentos para imitar fuentes en las que se confía.</p>
 ">
-<!ENTITY cspFrameAncestorBlocked.title "Bloqueado por la polĂ­tica de seguridad de contenido">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>El navegador ha impedido que esta página se cargue de esta forma porque la página tiene una política de seguridad de contenido que no lo permite.</p>">
+<!ENTITY cspBlocked.title "Bloqueado por polĂ­ticas de seguridad de contenido">
+<!ENTITY cspBlocked.longDesc "<p>El navegador ha impedido que esta página se cargue de esta forma porque la página tiene una política de seguridad de contenido que lo impide.</p>">
 <!ENTITY corruptedContentError.title "Error por contenido corrupto">
 <!ENTITY corruptedContentError.longDesc "<p>La página que está intentando ver no puede mostrarse porque se ha detectado un error en la transmisión de datos.</p><ul><li>Contacte con los propietarios del sitio web para informarles de este problema.</li></ul>">
 <!ENTITY remoteXUL.title "XUL remoto">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/mail/chrome/messenger/preferences/privacy.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/mail/chrome/messenger/preferences/privacy.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/mail/chrome/messenger/preferences/privacy.dtd	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/mail/chrome/messenger/preferences/privacy.dtd	2014-11-26 21:47:27.000000000 +0000
@@ -27,10 +27,6 @@
 <!ENTITY cookieExceptions.accesskey "n">
 <!ENTITY showCookies.label "Mostrar cookies…">
 <!ENTITY showCookies.accesskey "M">
-<!ENTITY dntTrackingNopref.label2 "No indicar a los sitios nada sobre mis preferencias de rastreo">
-<!ENTITY dntTrackingNopref.accesskey "o">
 <!ENTITY dntTrackingNotOkay.label2 "Indicar a los sitios que no quiero ser rastreado">
 <!ENTITY dntTrackingNotOkay.accesskey "">
-<!ENTITY dntTrackingOkay.label2 "Indicar a los sitios que quiero ser rastreado">
-<!ENTITY dntTrackingOkay.accesskey "I">
 <!ENTITY doNotTrackInfo.label "Saber más sobre No rastrear">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/security/manager/chrome/pipnss/nsserrors.properties	2014-11-26 21:47:27.000000000 +0000
@@ -314,4 +314,4 @@
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE = Este servidor usa key pinning (HPKP) pero no se ha podido construir una cadena de certificados confiables que coincida con el pinset. Las violaciones de key pinning no se pueden solventar.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY = El servidor usa un certificado con una extensión básica de restricciones que lo identifica como autoridad de certificación. Esto no debería ser el caso para un certificado emitido correctamente.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE = El servidor ha presentado un certificado con un tamaño de clave que es demasiado pequeño para establecer una conexión segura.
-MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA = Para emitir el certificado del servidor se ha usado un certificado X.509 versión 1 que no es confiable. Los certificados X.509 versión 1 están desaprobaados no deben usarse para firmar otros certificados
+MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA = Para emitir el certificado del servidor se ha usado un certificado X.509 versión 1 que no es confiable. Los certificados X.509 versión 1 están desaprobaados no deben usarse para firmar otros certificados.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:47:27.000000000 +0000
@@ -53,7 +53,7 @@
 pageInfo_Privacy_Encrypted1 = La página que está viendo fue cifrada antes de transmitirse por Internet.
 pageInfo_Privacy_Encrypted2 = El cifrado dificulta que personas no autorizadas vean la información que viaja entre sistemas. Es, por tanto, improbable que nadie lea esta página mientras viajó por la red.
 pageInfo_MixedContent = ConexiĂłn parcialmente cifrada
-pageInfo_Privacy_Mixed1 = Hay partes de la página que está viendo que no fueron cifradas antes de transmitirse por internet.
+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>
@@ -108,17 +108,17 @@
 addExceptionBrandedWarning2 = Está a punto de alterar cómo identifica %S este sitio.
 addExceptionInvalidHeader = Este sitio intenta identificarse a sí mismo con información no válida.
 addExceptionDomainMismatchShort = Sitio errĂłneo
-addExceptionDomainMismatchLong = El certificado pertenece a un sitio diferente, lo que podrĂ­a indicar una suplantaciĂłn de identidad.
+addExceptionDomainMismatchLong2 = El certificado pertenece a un sitio diferente, lo que podría significar que alquien está intentando hacer pasar por este sitio.
 addExceptionExpiredShort = InformaciĂłn obsoleta
-addExceptionExpiredLong = El certificado no es válido actualmente. Es imposible verificar si esta identidad se ha perdido o ha sido robada.
+addExceptionExpiredLong2 = El certificado no es actualmente válido. Puede haber sido robado o perdido, y podría estar siendo usado por alquien para hacerse pasar por este sitio.
 addExceptionUnverifiedOrBadSignatureShort = Identidad desconocida
-addExceptionUnverifiedOrBadSignatureLong = No se confĂ­a en el certificado porque no ha sido verificado por una autoridad reconocida usando una firma segura.
+addExceptionUnverifiedOrBadSignatureLong2 = No se confĂ­a en el certificado porque no ha sido verificado como emitido por una autoridad confiable usando una firma segura.
 addExceptionValidShort = Certificado válido
 addExceptionValidLong = Este sitio proporciona identificación válida y verificada. No hay necesidad de añadir una excepción.
 addExceptionCheckingShort = Comprobando informaciĂłn
-addExceptionCheckingLong = Intentando identificar el sitio…
+addExceptionCheckingLong2 = Intentando identificar este sitio…
 addExceptionNoCertShort = No hay informaciĂłn disponible
-addExceptionNoCertLong = No es posible obtener el estado de identificaciĂłn para el sitio dado.
+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-36.0~a1~hg20141114r17084.215607/l10n/es-ES/toolkit/chrome/global/aboutRights.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/toolkit/chrome/global/aboutRights.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/toolkit/chrome/global/aboutRights.dtd	2014-11-14 09:38:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/toolkit/chrome/global/aboutRights.dtd	2014-11-26 21:47:27.000000000 +0000
@@ -8,7 +8,7 @@
 <!ENTITY rights.intro "&brandFullName; es un software gratuito y de cĂłdigo abierto construido por una comunidad de miles de colaboradores de todo el mundo. Hay una serie de cosas que deberĂ­a conocer:">
 <!ENTITY rights.intro-point1a "&brandShortName; está disponible para usted bajo los términos de la ">
 <!ENTITY rights.intro-point1b "Mozilla Public License (Licencia PĂşblica de Mozilla)">
-<!ENTITY rights.intro-point1c ". Esto significa que puede usar, copiar y distribuir &brandShortName; a los demás. También puede modificar el código fuente para adaptarlo a sus necesidades. La Mozilla Public License (Licencia Pública de Mozilla) le otorga el derecho de distribuir sus versiones modificadas.">
+<!ENTITY rights.intro-point1c ". Esto significa que puede usar, copiar y distribuir &brandShortName; a los demás. También puede modificar el código fuente de &brandShortName; para adaptarlo a sus necesidades. La Mozilla Public License (Licencia Pública de Mozilla) le otorga el derecho de distribuir sus versiones modificadas.">
 <!ENTITY rights.intro-point2-a "No se le concede ningĂşn derecho ni licencia sobre las marcas comerciales de Mozilla Foundation o sus filiales, incluyendo sin limitaciĂłn el nombre y logo de Firefox. Puede encontrarse informaciĂłn adicional sobre las marcas comerciales ">
 <!ENTITY rights.intro-point2-b "aquĂ­">
 <!ENTITY rights.intro-point2-c ".">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:39:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:47:27.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Ejecutar aplicaciĂłn
 malwareBlocked = El sitio en %S ha sido identificado como un sitio atacante y ha sido bloqueado basándose en sus preferencias de seguridad.
 phishingBlocked = El sitio web en %S ha sido identificado como una suplantación de web diseñada para engañar a los usuarios y que compartan información personal o financiera.
-cspFrameAncestorBlocked = Esta aplicaciĂłn ha intentado acceder a un recurso que tiene una polĂ­tica de seguridad de contenido que le impide ser incrustado de esta forma.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/appstrings.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/appstrings.properties	2014-11-26 21:47:39.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Lancer l'application
 malwareBlocked=Le site situé à %S a été signalé comme une source d'attaques et a été bloqué suivant vos préférences de sécurité.
 phishingBlocked=Le site web sur %S a été signalé comme étant une contrefaçon conçue pour piéger les utilisateurs pour qu'ils partagent des informations personnelles ou financières.
-cspFrameAncestorBlocked=Cette page a une stratégie de sécurité de contenu qui l'empêche d'être intégrée de cette façon.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/dom/dom.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/dom/dom.properties	2014-11-26 21:47:39.000000000 +0000
@@ -205,3 +205,5 @@
 KeyNameDeadKeysWarning=Les valeurs de KeyboardEvent.key commençant par « Dead » sont obsolètes et seront fusionnées sous la forme unique « Dead ». Consulter https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key pour plus d'informations.
 ImportXULIntoContentWarning=L'importation de nœuds XUL dans le contenu d'un document est obsolète. Cette fonctionnalité pourrait être bientôt retirée.
 XMLDocumentLoadPrincipalMismatch=L'utilisation de document.load est interdite sur les documents provenant d'autres fenêtres. Seule la fenêtre dans laquelle le document a été créé est autorisée à appeler .load sur ce document. Utilisez de préférence XMLHttpRequest à la place.
+# LOCALIZATION NOTE: Do not translate "IndexedDB".
+IndexedDBTransactionAbortNavigation=Une transaction IndexedDB incomplète a été annulée en raison de la navigation vers une autre page.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/netError.dtd	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/netError.dtd	2014-11-26 21:47:39.000000000 +0000
@@ -204,8 +204,8 @@
 web et les courriels frauduleux sont utilisés pour imiter des sources en
 lesquelles vous avez confiance.</p>">
 
-<!ENTITY cspFrameAncestorBlocked.title "Bloqué par une stratégie de sécurité de contenu">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>Le navigateur a empêché le chargement de cette page de cette manière car la page a une stratégie de sécurité de contenu qui ne le permet pas.</p>">
+<!ENTITY cspBlocked.title "Bloqué par une stratégie de sécurité de contenu">
+<!ENTITY cspBlocked.longDesc "<p>Le navigateur a empêché le chargement de cette page de cette manière car la page a une stratégie de sécurité de contenu qui ne le permet pas.</p>">
 
 <!-- Include app-specific error messages - do not change this in localization!
      Some applications might override netErrorApp.dtd with their specific version,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/security/security.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/security/security.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/dom/chrome/security/security.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/dom/chrome/security/security.properties	2014-11-26 21:47:39.000000000 +0000
@@ -13,6 +13,8 @@
 InvalidSTSHeaders=Le site a spécifié un en-tête Strict-Transport-Security non valide.
 # LOCALIZATION NOTE: Do not translate "Public-Key-Pins or HPKP"
 InvalidPKPHeaders=Le site a spécifié un en-tête Public-Key-Pins non valide.
+# LOCALIZATION NOTE: Do not translate "SHA-1"
+SHA1Sig=Ce site utilise un certificat SHA-1 ; il est recommandé d'utiliser des certificats possédant des algorithmes de signature ayant recours à des fonctions de hachage plus robustes que SHA-1.
 InsecurePasswordsPresentOnPage=Champs mot de passe présents sur une page non sécurisée (http://). Cela représente un risque de sécurité permettant le vol d'identifiants de connexion.
 InsecureFormActionPasswordsPresent=Champs mot de passe présents dans un formulaire possédant une action de formulaire non sécurisée (http://). Cela représente un risque de sécurité permettant le vol d'identifiants de connexion.
 InsecurePasswordsPresentOnIframe=Champs mot de passe présents dans une iframe non sécurisée (http://). Cela représente un risque de sécurité permettant le vol d'identifiants de connexion.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/security/manager/chrome/pipnss/nsserrors.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/security/manager/chrome/pipnss/nsserrors.properties	2014-11-26 21:47:39.000000000 +0000
@@ -314,3 +314,4 @@
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=Le serveur utilise le mécanisme de « key pinning » (HPKP) mais aucune chaîne de confiance pour les certificats n'a pu être établie pour correspondre au pinset. Les violations de « key pinning » ne peuvent pas être forcées.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Le serveur utilise un certificat avec une extension de contraintes basiques qui l'identifie en tant qu'autorité de certification. Pour un certificat correctement émis cela ne devrait pas être le cas.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Le serveur a présenté un certificat dont la taille de la clé est trop petite pour établir une connexion sécurisée.
+MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Un certificat X.509 version 1 qui n'est pas une ancre de confiance a été utilisé pour signer le certificat du serveur. Les certificats X.509 version 1 sont obsolètes et ne devraient pas être utilisés pour signer d'autres certificats.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:47:39.000000000 +0000
@@ -71,14 +71,11 @@
 pageInfo_Privacy_None1=Le site web %S ne prend pas en charge le chiffrement pour la page actuellement affichée.
 pageInfo_Privacy_None2=Les informations envoyées sur Internet sans chiffrement peuvent être vues par d'autres personnes durant leur transit.
 pageInfo_Privacy_None3=La page actuellement affichée n'est pas chiffrée.
-pageInfo_StrongEncryptionWithBits=Connexion chiffrée : chiffrement de haut niveau (clés %S, %S bits)
-pageInfo_Privacy_Strong1=La page que vous voyez a été chiffrée avant sa transmission sur Internet.
-pageInfo_Privacy_Strong2=Le chiffrement rend très difficile aux personnes non autorisées la visualisation de la page durant son transit entre ordinateurs. Il est donc très improbable que quelqu'un puisse lire cette page durant son transit sur le réseau.
-pageInfo_WeakEncryptionWithBits=Connexion chiffrée : chiffrement de bas niveau (clés %S, %S bits)
-pageInfo_Privacy_Weak1=Le site web %S utilise un chiffrement de bas niveau pour la page que vous voyez.
-pageInfo_Privacy_Weak2=Un chiffrement de bas niveau peut permettre à certaines personnes non autorisées de voir les données transmises.
+pageInfo_EncryptionWithBitsAndProtocol=Connexion chiffrée (clés %1$S, %2$S bits, %3$S)
+pageInfo_Privacy_Encrypted1=La page actuellement affichée a été chiffrée avant d'avoir été envoyée sur Internet.
+pageInfo_Privacy_Encrypted2=Le chiffrement rend très difficile aux personnes non autorisées la visualisation de la page durant son transit entre ordinateurs. Il est donc très improbable que quelqu'un puisse lire cette page durant son transit sur le réseau.
 pageInfo_MixedContent=Connexion partiellement chiffrée
-pageInfo_Privacy_Mixed1=Certaines parties de la page que vous visionnez n'ont pas été chiffrées avant d'être transmises sur Internet.
+pageInfo_Privacy_Broken1=Certaines parties de la page que vous visionnez n'ont pas été chiffrées ou leur niveau de chiffrement est trop bas pour pouvoir être transmises sur Internet.
 
 #Cert Viewer
 certDetails=Détails du certificat :
@@ -149,17 +146,17 @@
 addExceptionBrandedWarning2=Vous êtes en train de passer outre la façon dont %S identifie ce site.
 addExceptionInvalidHeader=Ce site essaie de s'identifier lui-mĂŞme avec des informations invalides.
 addExceptionDomainMismatchShort=Mauvais site
-addExceptionDomainMismatchLong=Le certificat appartient à un site différent, ce qui pourrait indiquer un vol d'identité.
+addExceptionDomainMismatchLong2=Le certificat appartient à un site différent, ce qui pourrait indiquer que quelqu'un tente d'usurper l'identité de ce site.
 addExceptionExpiredShort=Informations obsolètes
-addExceptionExpiredLong=Le certificat n'est pas valide actuellement. Il est impossible de vérifier si cette identité a été signalée comme volée ou perdue.
+addExceptionExpiredLong2=Le certificat n'est pas valide actuellement. Il a pu être volé ou perdu et peut être utilisé par quelqu'un pour usurper l'identité de ce site.
 addExceptionUnverifiedOrBadSignatureShort=Identité inconnue
-addExceptionUnverifiedOrBadSignatureLong=Le certificat n'est pas sûr car il n'a pas été vérifié par une autorité reconnue utilisant une signature sécurisée.
+addExceptionUnverifiedOrBadSignatureLong2=Le certificat n'est pas sûr car il est impossible de vérifier qu'il ait été délivré par une autorité de confiance utilisant une signature sécurisée.
 addExceptionValidShort=Certificat valide
 addExceptionValidLong=Ce site fournit une identification valide et certifiée. Il n'est pas nécessaire d'ajouter une exception.
 addExceptionCheckingShort=VĂ©rification des informations
-addExceptionCheckingLong=Tentative d'identification du site…
+addExceptionCheckingLong2=Tentative d'identification de ce site…
 addExceptionNoCertShort=Pas d'informations disponibles
-addExceptionNoCertLong=Impossible d'obtenir l'état d'identification pour le site donné.
+addExceptionNoCertLong2=Impossible d'obtenir l'Ă©tat d'identification de ce site.
 
 addExceptionConnectionFailed=La connexion a échoué
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/aboutSupport.dtd	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/aboutSupport.dtd	2014-11-26 21:47:39.000000000 +0000
@@ -96,3 +96,5 @@
 
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copier le texte dans le presse-papiers">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copier les informations brutes dans le presse-papiers">
+
+<!ENTITY aboutSupport.sandboxTitle "Bac Ă  sable">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/aboutSupport.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/aboutSupport.properties	2014-11-26 21:47:39.000000000 +0000
@@ -82,3 +82,7 @@
 
 minLibVersions = Version minimale attendue
 loadedLibVersions = Version utilisée
+
+hasSeccompBPF = Seccomp-BPF (Filtrage des appels système)
+canSandboxContent = Bac Ă  sable pour les processus de contenu
+canSandboxMedia = Bac à sable pour les plugins multimédia
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-26 21:47:39.000000000 +0000
@@ -32,6 +32,10 @@
   Histogrammes
 ">
 
+<!ENTITY aboutTelemetry.keyedHistogramsSection "
+  Histogrammes avec mots-clés
+">
+
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "
   Mesures simples
 ">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/charsetMenu.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/charsetMenu.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/global/charsetMenu.dtd	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/global/charsetMenu.dtd	2014-11-26 21:47:39.000000000 +0000
@@ -4,16 +4,3 @@
 
 <!ENTITY charsetMenu.label             "Encodage de caractères">
 <!ENTITY charsetMenu.accesskey         "E">
-
-<!-- The strings below are unused on m-c. They will be removed post-Australis -->
-<!ENTITY charsetMenuAutodet.label      "Auto-Detect">
-<!ENTITY charsetMenuAutodet.accesskey  "D"><!-- A reserved for Arabic -->
-
-<!ENTITY charsetMenuAutodet.off.label     "(désactivée)">
-<!ENTITY charsetMenuAutodet.off.accesskey "s">
-<!ENTITY charsetMenuAutodet.ja.label      "Japonais">
-<!ENTITY charsetMenuAutodet.ja.accesskey  "J">
-<!ENTITY charsetMenuAutodet.ru.label      "Russe">
-<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
-<!ENTITY charsetMenuAutodet.uk.label      "Ukrainien">
-<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/passwordmgr/passwordManager.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/passwordmgr/passwordManager.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/toolkit/chrome/passwordmgr/passwordManager.dtd	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/toolkit/chrome/passwordmgr/passwordManager.dtd	2014-11-26 21:47:39.000000000 +0000
@@ -34,3 +34,4 @@
 <!ENTITY copyPasswordCmd.accesskey "C">
 
 <!ENTITY copyUsernameCmd.label "Copier le nom d'utilisateur">
+<!ENTITY copyUsernameCmd.accesskey "o">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/fr/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:39:09.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/fr/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:47:39.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Lancer l'application
 malwareBlocked=Le site situé à %S a été signalé comme une source d'attaques et a été bloqué suivant vos préférences de sécurité.
 phishingBlocked=Le site web sur %S a été signalé comme étant une contrefaçon conçue pour piéger les utilisateurs pour qu'ils partagent des informations personnelles ou financières.
-cspFrameAncestorBlocked=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 intégrée de cette façon.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/accessibility/AccessFu.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/accessibility/AccessFu.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/accessibility/AccessFu.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/accessibility/AccessFu.properties	2014-11-26 21:48:00.000000000 +0000
@@ -155,6 +155,7 @@
 stateExpanded    =    dibentangkan
 stateCollapsed   =    diciutkan
 stateUnavailable =    tidak tersedia
+stateReadonly    =    hanya-baca
 stateRequired    =    diwajibkan
 stateTraversed   =    dikunjungi
 stateHasPopup    =    mengandung pop up
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/layout/css.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/layout/css.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/layout/css.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/layout/css.properties	2014-11-26 21:48:00.000000000 +0000
@@ -56,6 +56,7 @@
 PECounterASWeight=Tiap berat pada deskriptor additive-symbols harus lebih kecil dari berat sebelumnya.
 PEClassSelEOF=nama kelas
 PEClassSelNotIdent=Diharapkan identifier pada selector kelas tetapi ditemukan '%1$S'.
+PECoordinatePair=Diharapkan pasangan koordinat tetapi ditemukan '%1$S'.
 PETypeSelEOF=jenis elemen
 PETypeSelNotType=Diharapkan nama elemen atau '*' tetapi ditemukan '%1$S'.
 PEUnknownNamespacePrefix=Prefiks namespace '%1$S' tidak diketahui.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/security/csp.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/security/csp.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/security/csp.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/security/csp.properties	2014-11-26 21:48:00.000000000 +0000
@@ -20,9 +20,6 @@
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = Mencoba mengirimkan laporan ke URI yang tidak valid: "%1$S"
-# LOCALIZATION NOTE (errorWas):
-# %1$S is the error resulting from attempting to send the report
-errorWas = galat sebelumnya: "%1$S"
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = tidak dapat mengurai URI laporan: %1$S
@@ -38,21 +35,9 @@
 # LOCALIZATION NOTE (reportURInotInReportOnlyHeader):
 # %1$S is the ETLD of the page with the policy
 reportURInotInReportOnlyHeader = Situs ini (%1$S) memiliki kebijakan Hanya-Lapor tanpa URI pelaporan. CSP tidak akan memblokir dan tidak dapat melaporkan pelanggaran oatas kebijakan ini.
-# LOCALIZATION NOTE (pageCannotSendReportsTo):
-# %1$S is the URI of the page with the policy
-# %2$S is the report URI that could not be used
-pageCannotSendReportsTo = laman pada %1$S tidak dapat mengirim laporan ke %2$S
-allowOrDefaultSrcRequired = direktif 'allow' atau 'default-src' wajib ada, tapi tidak tersedia. Kembali ke "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = Gagal mengurai sumber tak dikenal %1$S
-# LOCALIZATION NOTE (reportPostRedirect):
-# %1$S is the specified report URI before redirect
-reportPostRedirect = Pengiriman laporan pelanggaran ke %1$S gagal karena terjadi pengarahan ulang
-# LOCALIZATION NOTE (allowDirectiveIsDeprecated):
-# Don't translate "allow" and "default-src" as they are keywords and part of
-# the CSP protocol syntax.
-allowDirectiveIsDeprecated = direktif allow tidak disarankan untuk digunakan, gunakan direktif default-source yang berarti sama
 # LOCALIZATION NOTE (inlineScriptBlocked):
 # inline script refers to JavaScript code that is embedded into the HTML document.
 inlineScriptBlocked = Percobaan untuk mengseksekusi skrip dalam baris telah diblokir
@@ -68,41 +53,9 @@
 # LOCALIZATION NOTE (notSupportingDirective):
 # directive is not supported (e.g. 'reflected-xss')
 notSupportingDirective = Direktif '%1$S' tidak didukung. Direktif dan nilainya akan diabaikan.
-
-# CSP Errors:
-policyURINotAlone = Direktif policy-uri hanya dapat tampil mandiri
-noParentRequest = policy-uri tidak dapat diambil tanpa adanya permintaan induk dan CSP.
-# LOCALIZATION NOTE (policyURIParseError):
-# %1$S is the URI that could not be parsed
-policyURIParseError = tidak dapat mengurai URI pada URI kebijakan: %1$S
-# LOCALIZATION NOTE (nonMatchingHost):
-# %1$S is the URI host that does not match
-nonMatchingHost = tidak dapat mengambil URI kebijakan dari nama inang yang tidak cocok: %1$S
-# LOCALIZATION NOTE (nonMatchingPort):
-# %1$S is the URI port that does not match
-nonMatchingPort = tidak dapat mengambil URI kebijakan dari port yang tidak cocok: %1$S
-# LOCALIZATION NOTE (nonMatchingScheme):
-# %1$S is the URI scheme that does not match
-nonMatchingScheme = tidak dapat mengambil URI kebijakan dari skema yang tidak cocok: %1$S
-# LOCALIZATION NOTE (errorFetchingPolicy):
-# %1$S is the error that caused fetching to fail
-errorFetchingPolicy = Gagal mengambil policy-uri: %1$S
-cspSourceNotURI = Argumen yang disediakan bukan nsIURI
-argumentIsNotString = Argumen yang disediakan bukan string
-selfDataNotProvided = Tidak dapat menggunakan 'self' jika datanya tidak disediakan
-# LOCALIZATION NOTE (uriWithoutScheme):
-# %1$S is the URI without a scheme
-uriWithoutScheme = tidak dapat mengurai URL tanpa skema: %1$S
-selfKeywordNoSelfData = kata kunci self digunakan tapi data pada self tidak ditentukan
 # LOCALIZATION NOTE (couldntParseInvalidSource):
 # %1$S is the source that could not be parsed
 couldntParseInvalidSource = Tidak dapat mengurai sumber yang tidak valid %1$S
-# LOCALIZATION NOTE (hostSourceWithoutData):
-# %1$S is the source
-hostSourceWithoutData = Tidak dapat membuat sumber inang-saja %1$S tanpa data 'self'
-# LOCALIZATION NOTE (sourceWithoutData):
-# %1$S is the source
-sourceWithoutData = Tidak dapat membuat sumber %1$S tanpa data 'self'
 # LOCALIZATION NOTE (couldntParseInvalidHost):
 # %1$S is the host that's invalid
 couldntParseInvalidHost = Tidak dapat mengurai inang yang tidak valid %1$S
@@ -112,21 +65,6 @@
 # LOCALIZATION NOTE (couldntParsePort):
 # %1$S is the string source
 couldntParsePort = Tidak dapat mengurai port pada %1$S
-# LOCALIZATION NOTE (notIntersectPort):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectPort = Tidak dapat mengintersesksi %1$S dengan %2$S karena ada masalah pada port.
-# LOCALIZATION NOTE (notIntersectScheme):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectScheme = Tidak dapat menginterseksi %1$S dengan %2$S karena ada masalah pada skema.
-# LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
-# %1$S is the source
-intersectingSourceWithUndefinedHost = menginterseksi sumber dengan inang yang tidak didefinisikan: %1$S
-# LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
-# %1$S is the first source
-# %2$S is the second source
-intersectingSourcesWithUndefinedHosts = mengintersesksi dua sumber dengan inang yang tidak didefinisikan: %1$S dan %2$S
 # LOCALIZATION NOTE (duplicateDirective):
 # %1$S is the name of the duplicate directive
 duplicateDirective = Terdeteksi direktif %1$S ganda.  Hanya yang pertama yang akan berfungsi, yang lain akan diabaikan.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/security/security.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/security/security.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/dom/chrome/security/security.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/dom/chrome/security/security.properties	2014-11-26 21:48:00.000000000 +0000
@@ -9,8 +9,12 @@
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=Situs ini menentukan header Strict-Transport-Security yang tidak valid.
+# LOCALIZATION NOTE: Do not translate "Public-Key-Pins or HPKP"
+InvalidPKPHeaders=Situs ini menentukan header Public-Key-Pins yang tidak valid.
 InsecurePasswordsPresentOnPage=Isian sandi pada laman web yang tidak aman (http://). Hal ini berisiko info masuk pengguna dapat dicuri.
 InsecureFormActionPasswordsPresent=Isian sandi pada formulir yang menuju ke aksi form yang tidak aman (http://). Hal ini berisiko info masuk pengguna dapat dicuri.
 InsecurePasswordsPresentOnIframe=Isian sandi pada iframe yang tidak aman (http://). Hal ini berisiko info masuk pengguna dapat dicuri.
 LoadingMixedActiveContent=Memuat konten aktif campuran (tidak aman) pada laman aman "%1$S"
 LoadingMixedDisplayContent=Memuat konten tampilan campuran (tidak aman) pada laman aman "%1$S"
+# LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
+BothAllowScriptsAndSameOriginPresent=Sebuah iframe yang mengizinkan allow-scripts dan allow-same-origin sekaligus untuk kotak hitamnya dapat membuang proses pengotakhitamannya.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/netwerk/necko.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/netwerk/necko.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/netwerk/necko.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/netwerk/necko.properties	2014-11-26 21:48:00.000000000 +0000
@@ -37,3 +37,5 @@
 PhishingAuthAccept=Saya memahami dan akan berhati-hati
 SuperfluousAuth=Anda akan masuk ke situs "%1$S" dengan nama pengguna "%2$S", akan tetapi situs web tidak mewajibkan autentikasi. Kemungkinan ini merupakan usaha untuk menipu Anda.\n\nApakah benar "%1$S" adalah situs yang akan dikunjungi?
 AutomaticAuth=Anda akan masuk ke situs "%1$S" dengan nama pengguna "%2$S".
+
+TrackingUriBlocked=Sumber daya pada "%1$S" diblokir karena perlindungan pelacakan diaktifkan.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/security/manager/chrome/pipnss/nsserrors.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/security/manager/chrome/pipnss/nsserrors.properties	2014-11-26 21:48:00.000000000 +0000
@@ -122,6 +122,18 @@
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=Fitur SSL tidak didukung pada sambungan SSL 2.0.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=Fitur SSL tidak didukung server.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=Fitur SSL tidak didukung klien.
+SSL_ERROR_INVALID_VERSION_RANGE=Rentang versi SSL tidak valid.
+SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=Pihak lain SSL memilih cipher suite yang tidak diizinkan untuk versi protokol yang dipilih.
+SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL menerima pesan handshake Hello Verify Request yang salah.
+SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL menerima pesan handshake Hello Verify Request yang tidak diharapkan.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=SSL feature not supported for the protocol version.
+SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL menerima pesan handshake Certificate Status yang tidak diharapkan.
+SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM=Algoritme hash yang tidak didukung yang digunakan oleh pihak lain TLS.
+SSL_ERROR_DIGEST_FAILURE=Fungsi digest gagal.
+SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM=Algoritme tanda tangan yang salah yang ditentukan pada elemen yang ditandatangani digital.
+SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK=Ekstensi negosiasi protokol berikutnya tidak diaktifkan, tetapi pemanggilan kembali telah dibersihkan sebelum dibutuhkan.
+SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL=Server mendukung tidak satu pun protokol yang diajukan klien pada ekstensi ALPN.
+SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT=Server menilah handshake karena klien menurunkan ke versi TLS yang lebih rendah dari yang didukung server.
 SEC_ERROR_IO=Kesalahan Input/Output terjadi saat otorisasi keamanan.
 SEC_ERROR_LIBRARY_FAILURE=kegagalan pustaka keamanan.
 SEC_ERROR_BAD_DATA=pustaka keamanan: menerima data salah.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/autocomplete.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/autocomplete.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/autocomplete.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/autocomplete.properties	2014-11-26 21:48:00.000000000 +0000
@@ -6,4 +6,12 @@
 # the search engine provider's name. This format was chosen because
 # the provider can also end with "Search" (e.g.: MSN Search).
 searchWithEngine = Cari lewat %S
-switchToTab = Pindah ke tab
\ No newline at end of file
+# LOCALIZATION NOTE (searchWithEngineForQuery):
+# %1$S is the search engine's name, %2$S is the search query.
+# This format was chosen because the provider can also end with "Search"
+# (e.g.: MSN Search).
+searchWithEngineForQuery = %2$S — Cari lewat %1$S 
+switchToTab = Pindah ke tab
+# LOCALIZATION NOTE (visitURL):
+# %S is the URL to visit.
+visitURL = Kunjungi %S
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/charsetMenu.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/charsetMenu.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/charsetMenu.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/charsetMenu.properties	2014-11-26 21:48:00.000000000 +0000
@@ -66,11 +66,6 @@
 # gbk.bis.key never appears together with gbk.key and, hence, can be the same.
 gbk.bis.key      =          S
 gbk.bis          = Tiongkok, Sederhana
-# The strings gbk.key, gbk and gb18030 are no longer used but are retained
-# in order to enable backout after string freeze, just in case.
-gbk.key          =          S
-gbk              = Tiongkok, Sederhana (GBK)
-gb18030          = Tiongkok, Sederhana (GB18030)
 
 # Chinese, Traditional
 Big5.key         =          T
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/devtools/styleinspector.properties	2014-11-26 21:48:00.000000000 +0000
@@ -100,14 +100,6 @@
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=a
 
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources): Text displayed in the rule view
-# context menu.
-ruleView.contextmenu.showCSSSources=Tampilkan sumber CSS
-
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
-# the rule view context menu "Show CSS sources" entry.
-ruleView.contextmenu.showCSSSources.accessKey=C
-
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
 ruleView.contextmenu.addRule=Tambahkan rule
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/resetProfile.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/resetProfile.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/resetProfile.dtd	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/resetProfile.dtd	2014-11-26 21:48:00.000000000 +0000
@@ -2,14 +2,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/.  -->
 
-<!ENTITY resetProfile.dialog.title        "Setel Ulang &brandShortName;">
-<!ENTITY resetProfile.dialog.description  "Yakin ingin menyetel ulang &brandShortName; ke kondisi bawaan?">
-<!ENTITY resetProfile.dialog.items2.label "&brandShortName; akan mencoba tetap mempertahankan:">
-<!ENTITY resetProfile.dialog.footer.label "&brandShortName; akan dimulai ulang dan data lainnya akan dihapus.">
-<!ENTITY resetProfile.dialog.button.label "Setel Ulang &brandShortName;">
+<!ENTITY refreshProfile.dialog.title         "Segarkan &brandShortName;">
+<!ENTITY refreshProfile.dialog.description1  "Mulai dari awal untuk memperbaiki masalah dan memulihkan kinerja.">
+<!ENTITY refreshProfile.dialog.description2  "Proses ini akan:">
+<!ENTITY refreshProfile.dialog.items.label1  "Menghapus pengaya dan pengubahsuaian">
+<!ENTITY refreshProfile.dialog.items.label2  "Memulihkan setelan peramban ke setelan bawaan">
+<!ENTITY refreshProfile.dialog.button.label  "Segarkan &brandShortName;">
 
-<!ENTITY resetProfile.title               "Setel ulang &brandShortName; ke kondisi bawaan">
-<!ENTITY resetProfile.description         "Jika Anda memiliki masalah yang sulit diatasi, mulai saja dari awal dengan data penting milik Anda.">
-<!ENTITY resetProfile.button.label2       "Setel Ulang &brandShortName;…">
+<!ENTITY refreshProfile.title                "Lakukan penyegaran untuk &brandShortName;">
+<!ENTITY refreshProfile.button.label         "Segarkan &brandShortName;…">
 
-<!ENTITY resetProfile.cleaning.description "Mohon tunggu, &brandShortName; sedang membersihkan data lama Anda…">
+<!ENTITY refreshProfile.cleaning.description "Hampir selesai…">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/resetProfile.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/resetProfile.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/resetProfile.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/resetProfile.properties	2014-11-26 21:48:00.000000000 +0000
@@ -7,6 +7,6 @@
 # LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
 resetUnusedProfile.message=Tampaknya Anda sudah agak lama belum menjalankan %S. Apakah Anda ingin membersihkannya agar terasa seperti baru diinstal? Oh iya, selamat datang kembali!
 
-# LOCALIZATION NOTE (resetProfile.resetButton.label): %S is brandShortName.
-resetProfile.resetButton.label=Setel Ulang %S…
-resetProfile.resetButton.accesskey=e
+# LOCALIZATION NOTE (refreshProfile.resetButton.label): %S is brandShortName.
+refreshProfile.resetButton.label=Segarkan %S…
+refreshProfile.resetButton.accesskey=e
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/xpinstall/xpinstall.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/xpinstall/xpinstall.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/global/xpinstall/xpinstall.properties	2014-11-14 09:39:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/global/xpinstall/xpinstall.properties	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/.
-
-#--------------------------------------------------------------------
-#   Install Actions
-#--------------------------------------------------------------------
-InstallFile=Memasang: %s
-InstallSharedFile=Memasang Berkas Berbagi-pakai: %s
-ReplaceFile=Mengganti: %s
-ReplaceSharedFile=Mengganti Berkas Berbagi-pakai: %s
-SkipFile=Melewati: %s
-SkipSharedFile=Melewati Berkas Berbagi-pakai: %s
-
-DeleteFile=Menghapus berkas: %s
-DeleteComponent=Menghapus komponen: %s
-
-Execute=Menjalankan: %s
-ExecuteWithArgs=Menjalankan: %s dengan argumen: %s
-
-CopyFile=Menyalin berkas: %s ke %s
-ExecuteFile=Menjalankan Berkas: %s
-ExecuteFileWithArgs=Menjalankan Berkas: %s dengan argumen: %s
-MoveFile=Memindahkan Berkas: %s ke %s
-RenameFile=Mengganti Nama Berkas: %s to %s
-CreateFolder=Membuat Folder: %s
-RemoveFolder=Menghapus Folder: %s
-RenameFolder=Mengganti Nama Folder: %s ke %s
-WindowsShortcut=Jalan Pintas Windows: %s
-MacAlias=Alias untuk Mac: %s
-WindowsRegisterServer=Server Pendaftaran Windows: %s
-UnknownFileOpCommand=Perintah operasi berkas tidak diketahui!
-
-Patch=Menambal: %s
-
-Uninstall=Menghapus Pemasangan: %s
-
-RegSkin=Mendaftarkan Skin: %s
-RegLocale=Mendaftarkan Lokalisasi: %s
-RegContent=Mendaftarkan Isi: %s
-RegPackage=Mendaftarkan Paket: %s
-
-#--------------------------------------------------------------------
-#   Dialog Messages
-#--------------------------------------------------------------------
-
-ApplyNowSkin=Gunakan tema ini
-ApplyNowLocale=Gunakan lokalisasi ini
-
-ConfirmSkin=Pasang tema "%1$S" dari %2$S?
-ConfirmLocale=Pasang lokalisasi "%1$S" dari %2$S?
-
-OK=Pasang
-
-progress.queued=Mengantre
-progress.downloading=Mengunduh…
-progress.downloaded=Selesai Diunduh
-progress.installing=Memasang…
-
-Unsigned=Tidak Ditandatangani
-
-#--------------------------------------------------------------------
-#   Miscellaneous
-#--------------------------------------------------------------------
-ERROR=KESALAHAN
-
-error0=Sukses
-error999=Mulai ulang untuk menyelesaikan
-error-202=Akses ditolak
-error-203=Kesalahan pemasangan tak terduga\nPeriksa Konsol Kesalahan JavaScript untuk detail lebih lanjut.
-error-204=Skrip pemasangan tidak ditemukan
-error-207=Bukan paket pemasangan yang sah
-error-208=Argumen tidak sah
-error-210=Dibatalkan Pengguna
-error-214=Berkas yang dibutuhkan tidak ada
-error-215=Baca saja
-error-218=Kesalahan ekstraksi AppleSingle
-error-219=Path tidak sah
-error-225=EXTRACTION_FAILED
-error-227=Dibatalkan
-error-228=Kesalahan mengunduh
-error-229=Kesalahan skrip
-error-230=Sudah ada
-error-235=Kehabisan ruang
-error-239=Pendaftaran chrome gagal
-error-240=Pemasangan tidak terselesaikan
-error-244=Paket tidak didukung
-error-260=Penandatanganan tidak dapat diverifikasi.
-error-261=Hash berkas tidak sah (kemungkinan kerusakan unduhan)
-error-262=Tipe hash berkas tidak diketahui atau tidak sah
-error-299=Kehabisan memori
-
-# there are other error codes, either rare or obsolete,
-# that are not worth translating at this time.
-unknown.error=Kesalahan tak terduga %S
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd	2014-11-14 09:39:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd	2014-11-26 21:48:00.000000000 +0000
@@ -1,27 +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/. -->
-<!ENTITY pluginWizard.title                                  "Layanan Pencari Plugin">
-<!ENTITY pluginWizard.firstPage.title                        "Selamat datang di &pluginWizard.title;">
-
-<!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; sekarang memeriksa plugin yang tersedia…">
-
-<!ENTITY pluginWizard.availablePluginsPage.title             "Unduhan Plugin yang Tersedia">
-<!ENTITY pluginWizard.availablePluginsPage.description.label "Plugin berikut ini tersedia:">
-<!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Tekan Lanjut untuk memasang plugin ini.">
-<!ENTITY pluginWizard.availablePluginsPage.installerUI       "Beberapa plugin mungkin membutuhkan informasi tambahan dari Anda selama pemasangan.">
-
-<!ENTITY pluginWizard.licensePage.title                      "Lisensi Plugin">
-<!ENTITY pluginWizard.licensePage.accept.label               "Saya setuju.">
-<!ENTITY pluginWizard.licensePage.deny.label                 "Saya tidak setuju (plugin tidak akan dipasang).">
-
-<!ENTITY pluginWizard.installPluginsPage.title               "Memasang Plugin">
-<!ENTITY pluginWizard.installPluginsPage.description.label   "&brandShortName; sedang memasang plugin…">
-
-<!ENTITY pluginWizard.finalPage.description.label            "&brandShortName; selesai memasang plugin yang belum tersedia:">
-
-<!ENTITY pluginWizard.finalPage.moreInfo.label               "Cari tahu tentang Plugin atau cari sendiri plugin-nya.">
-<!ENTITY pluginWizard.finalPage.restart.label                "&brandShortName; perlu dimulai ulang agar plugin bisa bekerja.">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.pre): Mobile only. Flash (the only plugin available on mobile)
      is not supported on some devices. Include a trailing space as needed. -->
 
@@ -40,7 +19,6 @@
 <!ENTITY disabledPlugin                                      "Plugin untuk isi berikut telah dimatikan.">
 <!ENTITY blockedPlugin.label                                 "Plugin berikut telah diblokir untuk keamanan Anda.">
 <!ENTITY hidePluginBtn.label                                 "Sembunyikan plugin">
-<!ENTITY installPlugin                                       "Pasang plugin…">
 <!ENTITY managePlugins                                       "Kelola plugin…">
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/mozapps/plugins/plugins.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/mozapps/plugins/plugins.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/id/toolkit/chrome/mozapps/plugins/plugins.properties	2014-11-14 09:39:59.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/id/toolkit/chrome/mozapps/plugins/plugins.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +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/.
-
-pluginLicenseAgreement.label=Untuk memasang %S, Anda perlu menyetujui hal berikut:
-
-pluginInstallation.download.start=Mengunduh %S…
-pluginInstallation.download.finish=Selesai mengunduh %S.
-
-pluginInstallation.install.start=Memasang %S…
-pluginInstallation.install.finish=Berhasil memasang %S.
-pluginInstallation.install.error=Gagal memasang %S (%S).
-
-pluginInstallation.complete=Selesai memasang plugin.
-
-pluginInstallationSummary.success=Terpasang
-pluginInstallationSummary.failed=Gagal
-pluginInstallationSummary.licenseNotAccepted=Lisensi tidak disetujui
-pluginInstallationSummary.notAvailable=Tidak Tersedia
-pluginInstallationSummary.manualInstall.label=Pemasangan Sendiri
-pluginInstallationSummary.manualInstall.tooltip=Pasang plugin secara manual.
-
-pluginInstallation.noPluginsFound=Tidak menemukan plugin yang cocok.
-pluginInstallation.noPluginsInstalled=Tidak ada plugin yang dipasang.
-pluginInstallation.unknownPlugin=Plugin Tak Dikenal (%S)
-
-pluginInstallation.restart.label=Mulai Ulang %S
-pluginInstallation.restart.accesskey=U
-pluginInstallation.close.label=Tutup
-pluginInstallation.close.accesskey=T
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/dom/chrome/appstrings.properties	2014-11-14 09:40:04.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/dom/chrome/appstrings.properties	2014-11-26 21:48:06.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Avvia applicazione
 malwareBlocked = Il sito web %S è stato segnalato come sito web malevolo ed è stato bloccato sulla base delle impostazioni di sicurezza.
 phishingBlocked = Il sito web %S è stato segnalato come sito contraffatto, realizzato per indurre gli utenti a rivelare informazioni personali o finanziarie.
-cspFrameAncestorBlocked = Questa pagina presenta dei criteri sulla sicurezza dei contenuti che ne impediscono l’inclusione con questa modalità.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/dom/chrome/dom/dom.properties	2014-11-14 09:40:04.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/dom/chrome/dom/dom.properties	2014-11-26 21:48:06.000000000 +0000
@@ -143,3 +143,4 @@
 KeyNameDeadKeysWarning = I valori che iniziano con “Dead” per KeyboardEvent.key sono obsoleti e verranno sostituiti semplicemente da “Dead”. Per ulteriori informazioni consultare https://developer.mozilla.org/docs/Web/API/KeyboardEvent.key
 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.
+IndexedDBTransactionAbortNavigation = Una transazione IndexedDB incompleta è stata annullata dalla navigazione nella pagina.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/dom/chrome/netError.dtd	2014-11-14 09:40:04.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/dom/chrome/netError.dtd	2014-11-26 21:48:06.000000000 +0000
@@ -65,8 +65,8 @@
 <!ENTITY phishingBlocked.longDesc "
 <p>L’inserimento di informazioni personali in questa pagina può dare origine a furti d’identità o altre frodi.</p>
 <p>Questo tipo di contraffazione viene sfruttato nei cosiddetti attacchi phishing, dove vengono utilizzate in modo fraudolento pagine web ed email per imitare fonti di cui solitamente ci si fida.</p>">
-<!ENTITY cspFrameAncestorBlocked.title "Bloccato dai criteri sulla sicurezza dei contenuti">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>Il browser ha bloccato il caricamento della pagina con questa modalitĂ  in quanto include dei criteri sulla sicurezza dei contenuti che lo impediscono.</p>">
+<!ENTITY cspBlocked.title "Bloccato dai criteri sulla sicurezza dei contenuti">
+<!ENTITY cspBlocked.longDesc "<p>Il browser ha bloccato il caricamento della pagina con questa modalitĂ  in quanto include dei criteri sulla sicurezza dei contenuti che lo impediscono.</p>">
 <!ENTITY corruptedContentError.title "Errore contenuto danneggiato">
 <!ENTITY corruptedContentError.longDesc "<p>La pagina richiesta non può essere visualizzata a causa di un errore rilevato durante la trasmissione dei dati.</p><ul><li>Contattare il proprietario del sito web e segnalare il problema.</li></ul>">
 <!ENTITY remoteXUL.title "XUL remoto">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/it/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:40:04.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/it/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:48:06.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Avvia applicazione
 malwareBlocked = Il sito web %S è stato segnalato come sito web malevolo ed è stato bloccato sulla base delle impostazioni di sicurezza.
 phishingBlocked = Il sito web %S è stato segnalato come sito contraffatto, realizzato per indurre gli utenti a rivelare informazioni personali o finanziarie.
-cspFrameAncestorBlocked = Tentativo da parte dell’applicazione di accedere a una risorsa con criteri sulla sicurezza dei contenuti che ne impediscono l’inclusione con questa modalità.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/appstrings.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/appstrings.properties	2014-11-26 21:48:29.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Toepassing starten
 malwareBlocked=De website op %S is gerapporteerd als een aanvalsite en is geblokkeerd op basis van uw beveiligingsinstellingen.
 phishingBlocked=De website op %S is gerapporteerd als een vervalsing, ontworpen om gebruikers te misleiden en persoonlijke of financiële gegevens te laten delen.
-cspFrameAncestorBlocked=Deze pagina heeft een inhoudbeveiligingsbeleid dat embedding op deze manier voorkomt.
+cspBlocked=Deze pagina heeft een inhoudbeveiligingsbeleid dat laden op deze manier voorkomt.
 corruptedContentError=De pagina die u wilt bekijken kan niet worden weergegeven, omdat er een fout in de gegevensoverdracht is gedetecteerd.
 remoteXUL=Deze pagina gebruikt een niet-ondersteunde technologie die niet meer standaard beschikbaar is.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/dom/dom.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/dom/dom.properties	2014-11-26 21:48:29.000000000 +0000
@@ -209,3 +209,5 @@
 KeyNameDeadKeysWarning=KeyboardEvent.key-waarden die met “Dead” beginnen zijn verouderd en worden samengevoegd tot alleen “Dead”. Zie https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key voor meer informatie
 ImportXULIntoContentWarning=Het importeren van XUL-nodes in een inhoudsdocument wordt niet meer ondersteund. Deze functionaliteit kan binnenkort worden verwijderd.
 XMLDocumentLoadPrincipalMismatch=Gebruik van document.load is verboden bij documenten uit andere vensters. Alleen het venster waarin een document is gemaakt mag .load aanroepen voor dat document. Gebruik in plaats daarvan bij voorkeur XMLHttpRequest.
+# LOCALIZATION NOTE: Do not translate "IndexedDB".
+IndexedDBTransactionAbortNavigation=Een onvoltooide IndexedDB-transactie is afgebroken vanwege paginanavigatie.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/layout/css.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/layout/css.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/layout/css.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/layout/css.properties	2014-11-26 21:48:29.000000000 +0000
@@ -56,7 +56,7 @@
 PECounterASWeight=Elk gewicht in de additive-symbols-descriptor moet kleiner zijn dan het voorgaande gewicht.
 PEClassSelEOF=klassenaam
 PEClassSelNotIdent=�%1$S’ gevonden waar identificator voor klasseselector verwacht.
-PECoordinatePair=�%1$S’ gevonden waar coördinaten verwacht.
+PECoordinatePair=�%1$S’ gevonden waar coördinatenpaar verwacht.
 PETypeSelEOF=elementtype
 PETypeSelNotType=�%1$S’ gevonden waar elementnaam of �*’ verwacht.
 PEUnknownNamespacePrefix=Onbekende namespace-prefix �%1$S’.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/netError.dtd	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/netError.dtd	2014-11-26 21:48:29.000000000 +0000
@@ -87,8 +87,8 @@
 <p>Dit soort webvervalsingen wordt gebruikt in e-mailscams die bekend staan als phishingaanvallen, waarbij frauduleuze webpagina’s en e-mails worden gebruikt om bronnen die u misschien vertrouwt na te bootsen.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Geblokkeerd door inhoudbeveiligingsbeleid">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>De browser voorkomt dat de pagina op deze manier wordt geladen, omdat de pagina een inhoudbeveiligingsbeleid heeft dat dit niet toestaat.</p>">
+<!ENTITY cspBlocked.title "Geblokkeerd door inhoudbeveiligingsbeleid">
+<!ENTITY cspBlocked.longDesc "<p>De browser heeft voorkomen dat de pagina op deze manier werd geladen, omdat de pagina een inhoudbeveiligingsbeleid heeft dat dit niet toestaat.</p>">
 
 <!ENTITY corruptedContentError.title "Beschadigde-inhoudsfout">
 <!ENTITY corruptedContentError.longDesc "<p>De pagina die u wilt bekijken kan niet worden weergegeven, omdat er een fout in de gegevensoverdracht is gedetecteerd.</p><ul><li>Neem contact op met de website-eigenaars om ze te informeren over dit probleem.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/security/security.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/security/security.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/dom/chrome/security/security.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/dom/chrome/security/security.properties	2014-11-26 21:48:29.000000000 +0000
@@ -18,4 +18,4 @@
 LoadingMixedActiveContent=Laden van gemengde (onveilige) actieve inhoud op een beveiligde pagina “%1$S”
 LoadingMixedDisplayContent=Laden van gemengde (onveilige) vensterinhoud op een beveiligde pagina “%1$S”
 # LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
-BothAllowScriptsAndSameOriginPresent=Een iframe met als sandboxattribute allow-scripts en allow-same-origin kan zijn sandbox verwijderen.
+BothAllowScriptsAndSameOriginPresent=Een iframe met zowel allow-scripts als allow-same-origin voor zijn sandbox-attribuut kan zijn sandboxing verwijderen.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/netwerk/necko.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/netwerk/necko.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/netwerk/necko.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/netwerk/necko.properties	2014-11-26 21:48:29.000000000 +0000
@@ -26,7 +26,7 @@
 
 # Directory listing strings
 DirTitle=Index van %1$S
-DirGoUp=Naar map op hoger niveau gaan
+DirGoUp=Naar bovenliggende map
 ShowHidden=Verborgen objecten tonen
 DirColName=Naam
 DirColSize=Grootte
@@ -38,4 +38,4 @@
 SuperfluousAuth=U gaat zich aanmelden bij de website “%1$S” met de gebruikersnaam “%2$S”, maar de website vereist geen authenticatie. Dit kan een poging zijn om u te misleiden.\n\nIs “%1$S” de website die u wilt bezoeken?
 AutomaticAuth=U gaat zich aanmelden bij de website “%1$S” met de gebruikersnaam “%2$S”.
 
-TrackingUriBlocked=De bron op “%1$S” is geblokkeerd omdat volgbescherming is ingeschakeld.
+TrackingUriBlocked=De bron op “%1$S” is geblokkeerd, omdat volgbescherming is ingeschakeld.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/security/manager/chrome/pipnss/nsserrors.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/security/manager/chrome/pipnss/nsserrors.properties	2014-11-26 21:48:29.000000000 +0000
@@ -75,8 +75,8 @@
 SSL_ERROR_ENCRYPTION_FAILURE=Bulkgegevens-coderingsalgoritme mislukt in geselecteerde coderingsserie.
 SSL_ERROR_DECRYPTION_FAILURE=Bulkgegevens-decoderingsalgoritme mislukt in geselecteerde coderingsserie.
 SSL_ERROR_SOCKET_WRITE_FAILURE=Poging om versleutelde gegevens naar onderliggende socket te schrijven mislukt.
-SSL_ERROR_MD5_DIGEST_FAILURE=MD5-controlefunctie mislukt.
-SSL_ERROR_SHA_DIGEST_FAILURE=SHA-1-controlefunctie mislukt.
+SSL_ERROR_MD5_DIGEST_FAILURE=MD5-digest-functie mislukt.
+SSL_ERROR_SHA_DIGEST_FAILURE=SHA-1-digest-functie mislukt.
 SSL_ERROR_MAC_COMPUTATION_FAILURE=MAC-berekening mislukt.
 SSL_ERROR_SYM_KEY_CONTEXT_FAILURE=Fout bij creëren van Symmetric Key-context.
 SSL_ERROR_SYM_KEY_UNWRAP_FAILURE=Fout bij uitpakken van de symmetrische sleutel in Client Key Exchange-bericht.
@@ -122,19 +122,19 @@
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=SSL-functie wordt niet ondersteund voor SSL 2.0-verbindingen.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=SSL-functie wordt niet ondersteund voor servers.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=SSL-functie wordt niet ondersteund voor clients.
-SSL_ERROR_INVALID_VERSION_RANGE=SSL version range is not valid.
-SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=SSL peer selected a cipher suite disallowed for the selected protocol version.
-SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL received a malformed Hello Verify Request handshake message.
-SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL received an unexpected Hello Verify Request handshake message.
-SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=SSL feature not supported for the protocol version.
-SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL received an unexpected Certificate Status handshake message.
-SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM=Unsupported hash algorithm used by TLS peer.
-SSL_ERROR_DIGEST_FAILURE=Digest function failed.
-SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM=Incorrect signature algorithm specified in a digitally-signed element.
-SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK=The next protocol negotiation extension was enabled, but the callback was cleared prior to being needed.
-SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL=The server supports no protocols that the client advertises in the ALPN extension.
-SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT=The server rejected the handshake because the client downgraded to a lower TLS version than the server supports.
-SEC_ERROR_IO=Er is een I/O-fout opgetreden tijdens beveiligingsautorisatie.SSL_ERROR_INVALID_VERSION_RANGE=SSL version range is not valid.
+SSL_ERROR_INVALID_VERSION_RANGE=SSL-versiebereik is niet geldig.
+SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=SSL-peer selecteerde een niet-toegestane coderingsserie voor de geselecteerde protocolversie.
+SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL ontving een ongeldig Hello Verify Request-handshakebericht.
+SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL ontving een onverwacht Hello Verify Request-handshakebericht.
+SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=SSL-functie niet ondersteund voor de protocolversie.
+SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL ontving een onverwacht Certificate Status-handshakebericht.
+SSL_ERROR_UNSUPPORTED_HASH_ALGORITHM=Niet-ondersteund hash-algoritme gebruikt door TLS-peer.
+SSL_ERROR_DIGEST_FAILURE=Digest-functie mislukt.
+SSL_ERROR_INCORRECT_SIGNATURE_ALGORITHM=Onjuist ondertekeningsalgoritme gespecificeerd in een digitaal ondertekend element.
+SSL_ERROR_NEXT_PROTOCOL_NO_CALLBACK=De volgende protocolonderhandelingsextensie is ingeschakeld, maar de callback werd gewist voordat deze nodig was.
+SSL_ERROR_NEXT_PROTOCOL_NO_PROTOCOL=De server ondersteunt geen protocollen die de client in de ALPN-extensie aankondigt.
+SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT=De server heeft de handshake geweigerd, omdat de client een downgrade heeft uitgevoerd naar een lagere TLS-versie dan die welke de server ondersteunt.
+SEC_ERROR_IO=Er is een I/O-fout opgetreden tijdens beveiligingsautorisatie.
 SEC_ERROR_LIBRARY_FAILURE=fout in beveiligingsbibliotheek.
 SEC_ERROR_BAD_DATA=beveiligingsbibliotheek: onjuiste gegevens ontvangen.
 SEC_ERROR_OUTPUT_LEN=beveiligingsbibliotheek: fout bij uitvoerlengte.
@@ -314,3 +314,4 @@
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=De server gebruikt key pinning (HPKP), maar er kon geen vertrouwde certificaatketen worden geconstrueerd die met de pinset overeenkomt. Schendingen van key pinning kunnen niet worden genegeerd.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=De server gebruikt een certificaat met een extensie voor basisbeperkingen die deze identificeert als een certificatieautoriteit. Voor een correct uitgegeven certificaat hoort dit niet het geval te zijn.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=De server heeft een certificaat gepresenteerd met een te kleine sleutelgrootte om een beveiligde verbinding te maken.
+MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Een X.509 versie 1 certificaat dat geen vertrouwensanker is, is gebruikt voor de uitgave van de serversertificaat. X.509 versie 1 certificaten worden niet meer ondersteund en kunnen beter niet gebruikt worden voor het ondertekenen van andere certificaten.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/security/manager/chrome/pipnss/pipnss.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/security/manager/chrome/pipnss/pipnss.properties	2014-11-26 21:48:29.000000000 +0000
@@ -116,7 +116,7 @@
 CertDumpExtKeyUsage=Uitgebreid sleutelgebruik
 CertDumpAuthInfoAccess=Toegang tot informatie over de organisatie
 CertDumpAnsiX9DsaSignature=ANSI X9.57 DSA-ondertekening
-CertDumpAnsiX9DsaSignatureWithSha1=ANSI X9.57 DSA-ondertekening met SHA1-Digest
+CertDumpAnsiX9DsaSignatureWithSha1=ANSI X9.57 DSA-ondertekening met SHA1-digest
 CertDumpAnsiX962ECDsaSignatureWithSha1=ANSI X9.62 ECDSA-ondertekening met SHA1
 CertDumpKUSign=Ondertekenen
 CertDumpKUNonRep=Erkenning
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:48:29.000000000 +0000
@@ -73,18 +73,14 @@
 pageInfo_Privacy_None1=De website %S ondersteunt geen versleuteling voor de pagina die u bekijkt.
 pageInfo_Privacy_None2=Informatie die zonder versleuteling over het internet wordt verzonden kan tijdens de overdracht worden gezien door andere personen.
 pageInfo_Privacy_None3=De pagina die u bekijkt is niet beveiligd.
-# LOCALIZATION NOTE (pageInfo_StrongEncryptionWithBits): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
-pageInfo_StrongEncryptionWithBits=Beveiligde verbinding: hoge graad van versleuteling (%1$S, %2$S-bits sleutels)
-pageInfo_Privacy_Strong1=De pagina die u bekijkt was beveiligd voordat deze over het internet werd verzonden.
-pageInfo_Privacy_Strong2=Versleuteling maakt het erg moeilijk voor onbevoegde personen om informatie te bekijken die tussen computers wordt uitgewisseld. Het is daarom erg onwaarschijnlijk dat iemand deze pagina heeft gelezen terwijl hij over het netwerk werd verzonden.
-# LOCALIZATION NOTE (pageInfo_WeakEncryptionWithBits): %1$S is the name of the encryption standard,
-# %2$S is the key size of the cipher.
-pageInfo_WeakEncryptionWithBits=Beveiligde verbinding: lage graad van versleuteling (%1$S, %2$S-bits sleutels)
-pageInfo_Privacy_Weak1=De website %S gebruikt een lage graad van versleuteling voor de pagina die u bekijkt.
-pageInfo_Privacy_Weak2=Een lage graad van versleuteling kan sommige onbevoegde personen in staat stellen deze informatie te bekijken.
+# %3$S is protocol version like "SSL 3" or "TLS 1.2"
+pageInfo_EncryptionWithBitsAndProtocol=Beveiligde verbinding (%1$S, %2$S-bits sleutels, %3$S)
+pageInfo_Privacy_Encrypted1=De pagina die u bekijkt was beveiligd voordat deze over het internet werd verzonden.
+pageInfo_Privacy_Encrypted2=Versleuteling maakt het moeilijk voor onbevoegde personen om informatie te bekijken die tussen computers wordt uitgewisseld. Het is daarom onwaarschijnlijk dat iemand deze pagina heeft gelezen terwijl hij over het netwerk werd verzonden.
 pageInfo_MixedContent=Gedeeltelijk beveiligde verbinding
-pageInfo_Privacy_Mixed1=Delen van de pagina die u bekijkt waren niet versleuteld voordat deze over het internet werden verzonden. 
+pageInfo_Privacy_Broken1=Delen van de pagina die u bekijkt waren niet versleuteld of de versleuteling is niet sterk genoeg voordat deze over het internet werden verzonden.
 
 #Cert Viewer
 certDetails=Certificaatweergave:
@@ -151,17 +147,17 @@
 addExceptionBrandedWarning2=U staat op het punt te overschrijven hoe %S deze website identificeert.
 addExceptionInvalidHeader=Deze website probeert zich te identificeren met ongeldige informatie.
 addExceptionDomainMismatchShort=Verkeerde website
-addExceptionDomainMismatchLong=Het certificaat behoort toe aan een andere website, wat kan duiden op identiteitsdiefstal.
+addExceptionDomainMismatchLong2=Het certificaat behoort toe aan een andere website, wat kan betekenen dat iemand deze website probeert na te bootsen.
 addExceptionExpiredShort=Verouderde informatie
-addExceptionExpiredLong=Het certificaat is momenteel niet geldig. Het is onmogelijk om te controleren of deze identiteit is gerapporteerd als vermist of gestolen.
+addExceptionExpiredLong2=Het certificaat is momenteel niet geldig. Het kan zijn gestolen of vermist en gebruikt worden door iemand deze website probeert na te bootsen.
 addExceptionUnverifiedOrBadSignatureShort=Onbekende identiteit
-addExceptionUnverifiedOrBadSignatureLong=Het certificaat wordt niet vertrouwd, omdat het niet is geverifieerd door een erkende autoriteit via een beveiligde ondertekening.
+addExceptionUnverifiedOrBadSignatureLong2=Het certificaat wordt niet vertrouwd, omdat het niet is geverifieerd dat het is uitgegeven door een vertrouwde autoriteit via een beveiligde ondertekening.
 addExceptionValidShort=Geldig certificaat
 addExceptionValidLong=Deze website verzorgt geldige, geverifieerde identificatie. U hoeft geen uitzondering toe te voegen.
 addExceptionCheckingShort=Informatie controleren
-addExceptionCheckingLong=Poging tot identificatie van de website…
+addExceptionCheckingLong2=Poging tot identificatie van de website…
 addExceptionNoCertShort=Geen informatie beschikbaar
-addExceptionNoCertLong=Identificatiestatus van de gegeven website is niet te verkrijgen.
+addExceptionNoCertLong2=Identificatiestatus van deze website is niet te verkrijgen.
 addExceptionConnectionFailed=Verbinding mislukt
 
 #Certificate Exists in database
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/aboutTelemetry.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/aboutTelemetry.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-26 21:48:29.000000000 +0000
@@ -25,13 +25,17 @@
 ">
 
 <!ENTITY aboutTelemetry.threadHangStatsSection "
-  Conversatievastlopers
+  Threadvastlopers
 ">
 
 <!ENTITY aboutTelemetry.histogramsSection "
   Histogrammen
 ">
 
+<!ENTITY aboutTelemetry.keyedHistogramsSection "
+  Keyed histogrammen
+">
+
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "
   Eenvoudige metingen
 ">
@@ -53,7 +57,7 @@
 ">
 
 <!ENTITY aboutTelemetry.toggle "
-  Klik om sectie in-/uit te vouwen
+  Klik om sectie uit/samen te vouwen
 ">
 
 <!ENTITY aboutTelemetry.emptySection "
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/autocomplete.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/autocomplete.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/autocomplete.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/autocomplete.properties	2014-11-26 21:48:29.000000000 +0000
@@ -10,7 +10,7 @@
 # %1$S is the search engine's name, %2$S is the search query.
 # This format was chosen because the provider can also end with "Search"
 # (e.g.: MSN Search).
-searchWithEngineForQuery = %2$S — Zoeken met %1$S
+searchWithEngineForQuery = %2$S – Zoeken met %1$S
 switchToTab = Wisselen naar tabblad
 # LOCALIZATION NOTE (visitURL):
 # %S is the URL to visit.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/charsetMenu.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/charsetMenu.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/charsetMenu.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/charsetMenu.properties	2014-11-26 21:48:29.000000000 +0000
@@ -6,7 +6,7 @@
 # Localizations may add or delete properties where the property key ends with
 # ".key" as appropriate for the localization. The code that uses this data can
 # deal with the absence of an access key for an item.
-# 
+#
 # For gbk, gbk.bis and gbk.bis.key are used to trigger string changes in
 # localizations.
 #
@@ -61,7 +61,7 @@
 ISO-8859-2       = Centraal-Europees (ISO)
 
 # Chinese, Simplified
-gbk.bis.key      =          S
+gbk.bis.key      = s
 gbk.bis          = Chinees, vereenvoudigd
 
 # Chinese, Traditional
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/printjoboptions.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/printjoboptions.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/printjoboptions.dtd	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/printjoboptions.dtd	2014-11-26 21:48:29.000000000 +0000
@@ -15,7 +15,7 @@
 <!ENTITY resolutionInput.label "Resolutie/Kwaliteit:">
 <!ENTITY resolutionInput.accesskey "e">
 
-<!ENTITY cmdInput.label "Afdrukcommando:">
+<!ENTITY cmdInput.label "Afdrukopdracht:">
 <!ENTITY cmdInput.accesskey "o">
 
 <!ENTITY jobTitleInput.label "Opdrachttitel:">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/resetProfile.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/resetProfile.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/toolkit/chrome/global/resetProfile.dtd	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/toolkit/chrome/global/resetProfile.dtd	2014-11-26 21:48:29.000000000 +0000
@@ -5,11 +5,11 @@
 <!ENTITY refreshProfile.dialog.title         "&brandShortName; vernieuwen">
 <!ENTITY refreshProfile.dialog.description1  "Een frisse start om problemen op te lossen en prestaties te herstellen.">
 <!ENTITY refreshProfile.dialog.description2  "Dit zal:">
-<!ENTITY refreshProfile.dialog.items.label1  "Uw bladwijzers en persoonlijke aanpasingen verwijderen">
-<!ENTITY refreshProfile.dialog.items.label2  "Uw browserinstellingen herstellen naar de standaardwaarden">
+<!ENTITY refreshProfile.dialog.items.label1  "Uw add-ons en aanpassingen verwijderen">
+<!ENTITY refreshProfile.dialog.items.label2  "Uw browserinstellingen naar de standaardwaarden terugzetten">
 <!ENTITY refreshProfile.dialog.button.label  "&brandShortName; vernieuwen">
 
-<!ENTITY refreshProfile.title                "&brandShortName; hertunen">
+<!ENTITY refreshProfile.title                "&brandShortName; optimaliseren">
 <!ENTITY refreshProfile.button.label         "&brandShortName; vernieuwen…">
 
-<!ENTITY refreshProfile.cleaning.description "Bijna klaar…">
+<!ENTITY refreshProfile.cleaning.description "Bijna gereed…">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/webapprt/webapprt/webapp.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/webapprt/webapprt/webapp.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/nl/webapprt/webapprt/webapp.properties	2014-11-14 09:40:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/nl/webapprt/webapprt/webapp.properties	2014-11-26 21:48:29.000000000 +0000
@@ -50,4 +50,4 @@
 webapps.uninstall.dontuninstall=Niet de-installeren
 
 paymentDialog.title=Betaling
-paymentDialog.message=Welke betaalprovider wilt u gebruiken?
+paymentDialog.message=Welke betalingsprovider wilt u gebruiken?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pl/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pl/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pl/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:40:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pl/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:48:38.000000000 +0000
@@ -72,16 +72,15 @@
 pageInfo_Privacy_None1=Pobierana strona WWW z witryny %S nie obsługuje szyfrowania danych.
 pageInfo_Privacy_None2=Informacje przesyłane przez sieć Internet bez uprzedniego szyfrowania mogą zostać odczytane przez inne osoby.
 pageInfo_Privacy_None3=OglÄ…dana strona nie jest zaszyfrowana.
-# LOCALIZATION NOTE (pageInfo_StrongEncryptionWithBits): %1$S is the name of the encryption standard,
-# %2$S is the key size of the cipher.
-pageInfo_StrongEncryptionWithBits=Połączenie szyfrowane: wysoki poziom szyfrowania (%1$S, %2$S-bitowe klucze)
-pageInfo_Privacy_Strong1=Oglądana strona została zaszyfrowana przed przesłaniem przez sieć Internet.
-pageInfo_Privacy_Strong2=Szyfrowanie danych poważnie utrudnia niepowołanym osobom dostęp do informacji przesyłanych pomiędzy komputerami. Dzięki temu prawdopodobieństwo odczytania przez osobę nieuprawnioną danych przesyłanych w sieci jest bardzo niskie.
-# LOCALIZATION NOTE (pageInfo_WeakEncryptionWithBits): %1$S is the name of the encryption standard,
-# %2$S is the key size of the cipher.
-pageInfo_WeakEncryptionWithBits=Połączenie szyfrowane: niski poziom szyfrowania (%1$S, %2$S-bitowe klucze)
-pageInfo_Privacy_Weak1=Pobierana strona WWW z witryny %S używa niskiego poziomu szyfrowania przy przesyłaniu danych.
-pageInfo_Privacy_Weak2=Niski poziom szyfrowania danych może pozwolić na dostęp do przesyłanych informacji niepowołanym osobom.
+  pageInfo_StrongEncryptionWithBitsAndProtocol=Połączenie szyfrowane: wysoki poziom szyfrowania (%1$S, %2$S-bitowe klucze, %3$S)
+  pageInfo_Privacy_Strong1=Oglądana strona została zaszyfrowana przed przesłaniem przez sieć Internet.
+  pageInfo_Privacy_Strong2=Szyfrowanie danych poważnie utrudnia niepowołanym osobom dostęp do informacji przesyłanych pomiędzy komputerami. Dzięki temu prawdopodobieństwo odczytania przez osobę nieuprawnioną danych przesyłanych w sieci jest bardzo niskie.
+  pageInfo_WeakEncryptionWithBitsAndProtocol=Połączenie szyfrowane: niski poziom szyfrowania (%1$S, %2$S-bitowe klucze, %3$S)
+  pageInfo_Privacy_Weak1=Pobierana strona WWW z witryny %S używa niskiego poziomu szyfrowania przy przesyłaniu danych.
+  pageInfo_Privacy_Weak2=Niski poziom szyfrowania danych może pozwolić na dostęp do przesyłanych informacji niepowołanym osobom.
+pageInfo_EncryptionWithBitsAndProtocol=Połączenie szyfrowane (%1$S, %2$S-bitowe klucze,, %3$S)
+pageInfo_Privacy_Encrypted1=Wyświetlana strona została zaszyfrowana przed przesłaniem poprzez Internet.
+pageInfo_Privacy_Encrypted2=Szyfrowanie utrudnia nieupoważnionym osobom dostęp do informacji przesyłanych między komputerami. Jest dlatego mało prawdopodobne, że ktokolwiek miał dostęp do treści tej strony, gdy podróżowała przez Internet.
 pageInfo_MixedContent=Połączenie częściowo szyfrowane
 pageInfo_Privacy_Mixed1=Niektóre części obecnie wyświetlanej strony nie zostały zaszyfrowane przed przesłaniem przez Internet.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-14 09:40:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pl/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-26 21:48:38.000000000 +0000
@@ -25,7 +25,7 @@
 <!ENTITY aboutTelemetry.histogramsSection "
   Histogramy
 ">
-
+<!ENTITY aboutTelemetry.keyedHistogramsSection "Indeksowane histogramy">
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "
   Proste pomiary
 ">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/charsetTitles.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/charsetTitles.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/charsetTitles.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/charsetTitles.properties	2014-11-26 21:48:44.000000000 +0000
@@ -15,7 +15,6 @@
 iso-8859-2.title    = Europa Central (ISO-8859-2)
 iso-8859-3.title    = Europa do Sul (ISO-8859-3)
 iso-8859-4.title    = Báltico (ISO-8859-4)
-iso-8859-9.title    = Turco (ISO-8859-9)
 iso-8859-10.title   = NĂłrdico (ISO-8859-10)
 iso-8859-13.title   = Báltico (ISO-8859-13)
 iso-8859-14.title   = Celta (ISO-8859-14)
@@ -36,14 +35,11 @@
 euc-jp.title = JaponĂŞs (EUC-JP)
 big5.title = Mandarim Tradicional (Big5)
 big5-hkscs.title = Mandarim Tradicional (Big5-HKSCS)
-x-euc-tw.title = Mandarim Tradicional (EUC-TW)
 gb2312.title = Mandarim Simplificado (GB2312)
 hz-gb-2312.title = Mandarim Simplificado (HZ)
 gbk.title = Mandarim Simplificado (GBK)
-iso-2022-cn.title = Mandarim Simplificado (ISO-2022-CN)
 euc-kr.title = Coreano (EUC-KR)
 x-johab.title = Coreano (JOHAB)
-iso-2022-kr.title = Coreano (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
@@ -64,9 +60,7 @@
 viscii.title = Vietnamita (VISCII)
 x-viet-vps.title = Vietnamita (VPS)
 tis-620.title = TailandĂŞs (TIS-620)
-iso-8859-11.title = TailandĂŞs (ISO-8859-11)
 windows-874.title = TailandĂŞs (Windows-874)
-ibm874.title = TailandĂŞs (IBM-874)
 armscii-8.title = Arménio (ARMSCII-8)
 iso-8859-6.title = �rabe (ISO-8859-6)
 iso-8859-6-i.title = �rabe (ISO-8859-6-I)
@@ -78,11 +72,6 @@
 windows-1256.title = �rabe (Windows-1256)
 x-user-defined.title = Definido pelo utilizador
 ibm866.title = CirĂ­lico/Russo (CP-866)
-ibm850.title = Ocidental (IBM-850)
-ibm852.title = Europa Central (IBM-852)
-ibm855.title = CirĂ­lico (IBM-855)
-ibm857.title = Turco (IBM-857)
-ibm862.title = Hebraico (IBM-862)
 gb18030.title = Mandarim Simplificado (GB18030)
 x-mac-arabic.title = �rabe (MacArabic)
 x-mac-farsi.title = Persa (MacFarsi)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -3,9 +3,5 @@
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 <!ENTITY fileExceedsQuota.title   "Hightail">
 <!ENTITY fileExceedsQuota.storageLimitReached   "Alcançado o limite do armazenamento">
-<!ENTITY fileExceedsQuota.accept "Atualizar">
-<!ENTITY fileExceedsQuota.cancel "Cancelar">
 <!ENTITY fileExceedsQuota.description "Alcançou o limite de armazenamento de 2GB da sua conta.">
 <!ENTITY fileExceedsQuota.description1 "O seu armazenamento atual Ă© de #XXX GB.">
-<!ENTITY fileExceedsQuota.description2 "Upgrade today to Pro Plus account and get more storage.">
-<!ENTITY fileExceedsQuota.description3 "Também pode escolher eliminar ficheiros na sua conta para ganhar mais espaço.">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/messenger.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/messenger.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/messenger.properties	2014-11-26 21:48:44.000000000 +0000
@@ -726,9 +726,6 @@
 websearch.isDefault=Este motor de procura já é o pré-definido
 
 # missing plugin installer
-missingpluginsMessage.title=São necessários plugins adicionais para mostrar o conteúdo desta página.
-missingpluginsMessage.button.label=Instalar plugins em falta...
-missingpluginsMessage.button.accesskey=I
 outdatedpluginsMessage.title=Alguns plugins usados nesta página estão desatualizados.
 outdatedpluginsMessage.updateButton.label=Atualizar plugins...
 outdatedpluginsMessage.updateButton.accesskey=U
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/preferences/privacy.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/preferences/privacy.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/mail/chrome/messenger/preferences/privacy.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/mail/chrome/messenger/preferences/privacy.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -33,10 +33,6 @@
 <!ENTITY showCookies.label "Mostrar cookies">
 <!ENTITY showCookies.accesskey "s">
 
-<!ENTITY dntTrackingNopref.label2 "NĂŁo informar os sĂ­tios web sobre as minhas preferĂŞncias de rastreio">
-<!ENTITY dntTrackingNopref.accesskey "o">
 <!ENTITY dntTrackingNotOkay.label2 "Informar os sĂ­tios web que nĂŁo quero ser monitorizado">
 <!ENTITY dntTrackingNotOkay.accesskey "n">
-<!ENTITY dntTrackingOkay.label2 "Informar os sĂ­tios web que quero ser monitorizado">
-<!ENTITY dntTrackingOkay.accesskey "t">
 <!ENTITY doNotTrackInfo.label "Saber mais sobre Do Not Track">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/security/manager/chrome/pipnss/nsserrors.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/security/manager/chrome/pipnss/nsserrors.properties	2014-11-26 21:48:44.000000000 +0000
@@ -17,8 +17,8 @@
 SSL_ERROR_BAD_CERT_DOMAIN=Incapaz de comunicar com a outra máquina: domínio pedido não corresponde ao certificado do servidor.
 SSL_ERROR_POST_WARNING=CĂłdigo de erro SSL desconhecido.
 SSL_ERROR_SSL2_DISABLED=A outra máquina só suporta SSL versão 2, que está inibida nesta configuração.
-SSL_ERROR_BAD_MAC_READ=SSL recebeu um registo com um Código de Mensagem de Autenticação incorrecto.
-SSL_ERROR_BAD_MAC_ALERT=A outra máquina SSL reporta um Código de Mensagem de Autenticação incorrecto.
+SSL_ERROR_BAD_MAC_READ=SSL recebeu um registo com um Código de Mensagem de Autenticação incorreto.
+SSL_ERROR_BAD_MAC_ALERT=A outra máquina SSL reporta um Código de Mensagem de Autenticação incorreto.
 SSL_ERROR_BAD_CERT_ALERT=A outra máquina SSL não consegue verificar o seu certificado.
 SSL_ERROR_REVOKED_CERT_ALERT=A outra máquina SSL rejeitou o seu certificado como revogado.
 SSL_ERROR_EXPIRED_CERT_ALERT=A outra máquina SSL rejeitou o seu certificado como expirado.
@@ -72,8 +72,8 @@
 SSL_ERROR_EXTRACT_PUBLIC_KEY_FAILURE=SSL foi incapaz de extrair a chave pública do certificado da outra máquina.
 SSL_ERROR_SERVER_KEY_EXCHANGE_FAILURE=Falha não especificada ao processar a ligação SSL de Intercâmbio de Chave de Servidor.
 SSL_ERROR_CLIENT_KEY_EXCHANGE_FAILURE=Falha não especificada ao processar a ligação SSL de Intercâmbio de Chave de Cliente.
-SSL_ERROR_ENCRYPTION_FAILURE=A codificação dos dados do algoritmo de cifra falhou no pacote de cifra seleccionado.
-SSL_ERROR_DECRYPTION_FAILURE=A descodificação dos dados do algoritmo de decifração falhou no pacote de cifra seleccionado.
+SSL_ERROR_ENCRYPTION_FAILURE=A codificação dos dados do algoritmo de cifra falhou no pacote de cifra selecionado.
+SSL_ERROR_DECRYPTION_FAILURE=A descodificação dos dados do algoritmo de decifração falhou no pacote de cifra selecionado.
 SSL_ERROR_SOCKET_WRITE_FAILURE=A tentativa de escrever dados cifrados para o pacote de cifra falhou.
 SSL_ERROR_MD5_DIGEST_FAILURE=A função de resumo MD5 falhou.
 SSL_ERROR_SHA_DIGEST_FAILURE=A função de resumo SHA-1 falhou.
@@ -82,14 +82,14 @@
 SSL_ERROR_SYM_KEY_UNWRAP_FAILURE=Falha ao desocultar a chave simétrica na mensagem de intercâmbio de chave de cliente.
 SSL_ERROR_PUB_KEY_SIZE_LIMIT_EXCEEDED=O servidor SSL tentou utilizar uma chave pública doméstica com a exportação de pacote de cifra.
 SSL_ERROR_IV_PARAM_FAILURE=O código PKCS11 falhou a tradução de um IV para um param.
-SSL_ERROR_INIT_CIPHER_SUITE_FAILURE=Falhou a inicialização do pacote de cifra seleccionado.
+SSL_ERROR_INIT_CIPHER_SUITE_FAILURE=Falhou a inicialização do pacote de cifra selecionado.
 SSL_ERROR_SESSION_KEY_GEN_FAILURE=O cliente falhou a criação de chaves de sessão para a sessão SSL.
 SSL_ERROR_NO_SERVER_KEY_FOR_ALG=O servidor não tem chave para a tentativa de intercâmbio de algoritmo de chave.
 SSL_ERROR_TOKEN_INSERTION_REMOVAL=O token PKCS#11 foi inserido ou removido enquanto a operação estava em curso.
 SSL_ERROR_TOKEN_SLOT_NOT_FOUND=Não foi encontrado nenhum token PKCS#11 para a operação requerida.
 SSL_ERROR_NO_COMPRESSION_OVERLAP=Não é possível comunicar de forma segura com o par: não há nenhum algoritmo(s) comum(ns) de compressão.
-SSL_ERROR_HANDSHAKE_NOT_COMPLETED=Não é possível iniciar outra ligação SSL até que a ligação actual seja terminada.
-SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE=Recebido do par um handshake de hash incorrecto.
+SSL_ERROR_HANDSHAKE_NOT_COMPLETED=Não é possível iniciar outra ligação SSL até que a ligação atual seja terminada.
+SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE=Recebido do par uma negociação de hash incorreta.
 SSL_ERROR_CERT_KEA_MISMATCH=O certificado recebido não pode ser utilizado com o algoritmo de intercâmbio de chave fornecido.
 SSL_ERROR_NO_TRUSTED_SSL_CLIENT_CA=Nenhuma autoridades de certificação é fiável para a autenticação SSL do cliente.
 SSL_ERROR_SESSION_NOT_FOUND=O ID da sessĂŁo SSL do Cliente nĂŁo foi encontrada na cache de sessĂŁo do servidor.
@@ -299,8 +299,8 @@
 SEC_ERROR_BAD_HTTP_RESPONSE=O servidor retornou uma má resposta HTTP
 SEC_ERROR_BAD_LDAP_RESPONSE=O servidor retornou uma má resposta LDAP
 SEC_ERROR_FAILED_TO_ENCODE_DATA=Falha ao codificar os dados com o codificador ASN1
-SEC_ERROR_BAD_INFO_ACCESS_LOCATION=Informação incorrecta na localização de acesso no cert da extensão
-SEC_ERROR_LIBPKIX_INTERNAL=Ocorreu um erro interno Libpkix durante a validação do cert.
+SEC_ERROR_BAD_INFO_ACCESS_LOCATION=Informação incorreta na localização de acesso no certificado da extensão
+SEC_ERROR_LIBPKIX_INTERNAL=Ocorreu um erro interno Libpkix durante a validação do certificado.
 SEC_ERROR_PKCS11_GENERAL_ERROR=Um módulo PKCS #11 retornou CKR_GENERAL_ERROR, indicando que ocorreu um erro irrecuperável.
 SEC_ERROR_PKCS11_FUNCTION_FAILED=Um módulo PKCS #11 retornou CKR_FUNCTION_FAILED, indicando que a função pedida não pode ser executada.  Tentar novamente poderá ser bem sucedido.
 SEC_ERROR_PKCS11_DEVICE_ERROR=Um mĂłdulo PKCS #11 retornou CKR_DEVICE_ERROR, indicando que ocorreu um problema com o token ou slot.
@@ -311,6 +311,7 @@
 SEC_ERROR_UNKNOWN_PKCS11_ERROR=Erro PKCS #11 desconhecido.
 SEC_ERROR_BAD_CRL_DP_URL=URL não suportado ou inválido no ponto de distribuição CRL.
 SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=O certificado foi assinado usando um algoritmo da assinatura que foi desativado pois nĂŁo Ă© seguro.
-MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=O servidor usa uma chave pinning (HPKP) mas não foi possível construir uma cadeia de confiança do certificado que corresponda ao pinset. Violações da chave não podem ser sobrescritas.
-MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=O servidor usa um certificado com uma extensão base constraída identificando-a como uma autoridade de certificação. Para um certificado correto esse problema não se coloca.
+MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=O servidor utiliza uma chave pinning (HPKP) mas não foi possível construir uma cadeia de confiança do certificado que corresponda ao pinset. Violações da chave não podem ser sobrescritas.
+MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=O servidor usa um certificado com uma extensão com restrições base identificando-a como uma autoridade de certificação. Para um certificado correto esse problema não se coloca.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=O servidor apresentou um certificado com o tamanho da chave demasiado pequena para estabelecer uma ligação segura.
+MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Um certificado X.509 versão que não é uma âncora de confiança foi usada para resolver o certificado do servidor. Os certificados X.509 versão 1 está obsoleto e não deve ser usado para assinar outros certificados.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:48:44.000000000 +0000
@@ -75,16 +75,12 @@
 pageInfo_Privacy_None3=A página que está a visualizar não está cifrada.
 # LOCALIZATION NOTE (pageInfo_StrongEncryptionWithBits): %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
-pageInfo_StrongEncryptionWithBits=Ligação cifrada: cifra forte (%S, %S chaves de bit)
-pageInfo_Privacy_Strong1=A página que está a visualizar foi cifrada antes de ser transmitida através da Internet.
-pageInfo_Privacy_Strong2=A cifra torna a informação que viaja entre computadores muito difícil de ver por pessoas não autorizadas. Assim é muito improvável que alguém consiga ler esta página enquanto ela se desloca através da rede.
-# LOCALIZATION NOTE (pageInfo_WeakEncryptionWithBits): %1$S is the name of the encryption standard,
-# %2$S is the key size of the cipher.
-pageInfo_WeakEncryptionWithBits=Ligação cifrada: cifra fraca (%S, %S chaves de bit)
-pageInfo_Privacy_Weak1=O sítio %S está a utilizar uma cifra fraca na página que está a visualizar.
-pageInfo_Privacy_Weak2=A cifra fraca pode permitir que esta informação seja vista por pessoas não autorizadas.
+# %3$S is protocol version like "SSL 3" or "TLS 1.2"
+pageInfo_WeakEncryptionWithBits=A página que está a visualizar foi cifrada antes de ser transmitidaLigação cifrada: cifra fraca (%1$S, %2$S bit keys, %3$S)
+pageInfo_Privacy_Encrypted1=A página que está a visualizar foi cifrada antes de ser transmitida através da internet.
+pageInfo_Privacy_Encrypted2=A cifra torna difícil que pessoas não autorizadas vejam informação que circula pelos computadores. É por isso improvável que alguém leia esta pagina enquanto circula pela rede.
 pageInfo_MixedContent=Ligação parcialmente cifrada
-pageInfo_Privacy_Mixed1=Partes da página que está a visualizar neste momento não foram cifrada antes de serem enviadas através da Internet.
+pageInfo_Privacy_Broken1=Partes da página que está a visualizar neste momento não foram cifrada antes de serem enviadas através da Internet.
 
 #Cert Viewer
 certDetails=Visualizador de certificados:
@@ -124,7 +120,6 @@
 fips_nonempty_password_required=O modo FIPS necessita que tenha uma senha mestra definida para cada dispositivo de segurança. Por favor defina a senha antes de tentar activar o modo FIPS.
 unable_to_toggle_fips=Não foi possível mudar o modo FIPS para o dispositivo de segurança. É recomendado que saia e reinicie esta aplicação.
 
-# CRL next update.
 resetPasswordConfirmationTitle=Repor a senha mestra
 resetPasswordConfirmationMessage=A sua senha foi reposta.
 
@@ -152,17 +147,17 @@
 addExceptionBrandedWarning2=Está prestes a modificar a forma como o %S identifica este sítio web.
 addExceptionInvalidHeader=Este sítio tenta identificar-se com informação inválida.
 addExceptionDomainMismatchShort=SĂ­tio Errado
-addExceptionDomainMismatchLong=Este certificado pertence a um sĂ­tio diferente, o que pode indiciar um roubo de identidade.
+addExceptionDomainMismatchLong2=Este certificado pertence a um sĂ­tio diferente, o que pode indiciar um roubo de identidade.
 addExceptionExpiredShort=Informação Desactualizada
-addExceptionExpiredLong=O certificado não é válido neste momento. É impossível verificar se esta identidade foi reportada como roubada ou perdida.
+addExceptionExpiredLong2=O certificado não é válido neste momento. É impossível verificar se esta identidade foi reportada como roubada ou perdida.
 addExceptionUnverifiedOrBadSignatureShort=Identidade Desconhecida
 addExceptionUnverifiedOrBadSignatureLong=Este certificado não é de confiança, uma vez que não foi verificado por uma autoridade reconhecida.
 addExceptionValidShort=Certificado Válido
 addExceptionValidLong=Este sítio fornece um identificação válida e verificável. Não é necessária nenhuma excepção.
 addExceptionCheckingShort=A Verificar a Informação
-addExceptionCheckingLong=A tentar identificar o sĂ­tio web...
+addExceptionCheckingLong2=A tentar identificar o sĂ­tio web...
 addExceptionNoCertShort=Informação indisponível
-addExceptionNoCertLong=Incapaz de obter o estado de identificação de um determinado sítio.
+addExceptionNoCertLong2=Incapaz de obter o estado de identificação de um determinado sítio.
 addExceptionConnectionFailed=A ligação falhou
 
 #Certificate Exists in database
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -93,3 +93,5 @@
 
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copiar texto para a área de transferência">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copiar dados para a área de transferência">
+
+<!ENTITY aboutSupport.sandboxTitle "Sandbox">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutSupport.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutSupport.properties	2014-11-26 21:48:44.000000000 +0000
@@ -82,3 +82,7 @@
 
 minLibVersions = VersĂŁo mĂ­nima esperada
 loadedLibVersions = Versão em utilização
+
+hasSeccompBPF = Seccomp-BPF (Filtro de chamada do sistema)
+canSandboxContent = Content Process Sandboxing
+canSandboxMedia = Media Plugin Sandboxing
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -5,11 +5,15 @@
 <!ENTITY aboutTelemetry.pageTitle "Dados de telemetria">
 
 <!ENTITY aboutTelemetry.telemetryEnabled "
-  A telemetria está <span>ativa</span>.
+  A telemetria está <span>ativada</span>.
 ">
 
 <!ENTITY aboutTelemetry.telemetryDisabled "
-  A telemetria está <span>inativa</span>.
+  A telemetria está <span>desativada</span>.
+">
+
+<!ENTITY aboutTelemetry.generalDataSection "
+  Dados gerais
 ">
 
 <!ENTITY aboutTelemetry.slowSqlSection "
@@ -28,6 +32,10 @@
   Histogramas
 ">
 
+<!ENTITY aboutTelemetry.keyedHistogramsSection "
+  Histogramas teclados
+">
+
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "
   Medições simples
 ">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/aboutTelemetry.properties	2014-11-26 21:48:44.000000000 +0000
@@ -7,6 +7,10 @@
 # - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
 pageSubtitle = Esta página mostra as informações sobre o desempenho, equipamento, utilização e personalização obtidas pela telemetria. Estas informações são enviadas à %1$S para ajudar a melhorar o %2$S.
 
+generalDataHeadingName = Nome
+
+generalDataHeadingValue = Valor
+
 slowSqlMain = Instrução SQL lenta na linha principal
 
 slowSqlOther = Instrução SQL lenta nas linhas de ajuda
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/charsetMenu.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/charsetMenu.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/charsetMenu.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/charsetMenu.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -3,19 +3,4 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY charsetMenu.label             "Codificação de caracteres">
-<!ENTITY charsetMenu.accesskey         "C">
-
-
-<!-- The strings below are unused on m-c. They will be removed post-Australis -->
-<!ENTITY charsetMenuAutodet.label      "Auto-detetar">
-<!ENTITY charsetMenuAutodet.accesskey  "D"><!-- A reserved for Arabic -->
-
-<!ENTITY charsetMenuAutodet.off.label     "(desligado)">
-<!ENTITY charsetMenuAutodet.off.accesskey "o">
-<!ENTITY charsetMenuAutodet.ja.label      "JaponĂŞs">
-<!ENTITY charsetMenuAutodet.ja.accesskey  "J">
-<!ENTITY charsetMenuAutodet.ru.label      "Russon">
-<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
-<!ENTITY charsetMenuAutodet.uk.label      "Ucraniano">
-<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
-
+<!ENTITY charsetMenu.accesskey         "C">
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/devtools/styleinspector.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/devtools/styleinspector.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/devtools/styleinspector.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/devtools/styleinspector.properties	2014-11-26 21:48:44.000000000 +0000
@@ -100,14 +100,6 @@
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=o
 
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources): Text displayed in the rule view
-# context menu.
-ruleView.contextmenu.showCSSSources=Mostrar fontes CSS
-
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
-# the rule view context menu "Show CSS sources" entry.
-ruleView.contextmenu.showCSSSources.accessKey=C
-
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
 ruleView.contextmenu.addRule=Adicionar regra
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/resetProfile.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/resetProfile.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/resetProfile.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/resetProfile.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -2,14 +2,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/.  -->
 
-<!ENTITY resetProfile.dialog.title        "Reiniciar o &brandShortName;">
-<!ENTITY resetProfile.dialog.description  "Tem a certeza que deseja reiniciar o &brandShortName; para o seu estado inicial?">
-<!ENTITY resetProfile.dialog.items2.label "O &brandShortName; irá tentar guardar o seu:">
-<!ENTITY resetProfile.dialog.footer.label "O &brandShortName; irá reiniciar e tudo o resto será removido.">
-<!ENTITY resetProfile.dialog.button.label "Reiniciar o &brandShortName;">
+<!ENTITY refreshProfile.dialog.title         "Atualizar o &brandShortName;">
+<!ENTITY refreshProfile.dialog.description1  "Comece de novo para resolver problemas e restaurar o desempenho.">
+<!ENTITY refreshProfile.dialog.description2  "Isto vai:">
+<!ENTITY refreshProfile.dialog.items.label1  "Remover os seus extras e personalizações">
+<!ENTITY refreshProfile.dialog.items.label2  "Restaurar as definições pré-definidas do navegador">
+<!ENTITY refreshProfile.dialog.button.label  "Atualizar o &brandShortName;">
 
-<!ENTITY resetProfile.title               "Reiniciar o &brandShortName; para o seu estado pré-definido">
-<!ENTITY resetProfile.description         "Se está a ter problemas que não consegue resolver, comece apenas com a informação essencial.">
-<!ENTITY resetProfile.button.label2       "Reiniciar o &brandShortName;...">
+<!ENTITY refreshProfile.title                "DĂŞ ao &brandShortName; um tune up">
+<!ENTITY refreshProfile.button.label         "Atualizar o &brandShortName;…">
 
-<!ENTITY resetProfile.cleaning.description "Por favor, aguarde enquanto o &brandShortName; limpa os seus dados antigos…">
+<!ENTITY refreshProfile.cleaning.description "Quase lá…">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/resetProfile.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/resetProfile.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/global/resetProfile.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/global/resetProfile.properties	2014-11-26 21:48:44.000000000 +0000
@@ -7,6 +7,6 @@
 # LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
 resetUnusedProfile.message=Parece que não inicia o %S à algum tempo. Deseja limpá-lo para uma nova experiência? E, já agora, bem vindo de volta!
 
-# LOCALIZATION NOTE (resetProfile.resetButton.label): %S is brandShortName.
-resetProfile.resetButton.label=Reiniciar o %S…
-resetProfile.resetButton.accesskey=e
+# LOCALIZATION NOTE (refreshProfile.resetButton.label): %S is brandShortName.
+refreshProfile.resetButton.label=Atualizar o %S…
+refreshProfile.resetButton.accesskey=z
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/passwordmgr/passwordManager.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/passwordmgr/passwordManager.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/toolkit/chrome/passwordmgr/passwordManager.dtd	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/toolkit/chrome/passwordmgr/passwordManager.dtd	2014-11-26 21:48:44.000000000 +0000
@@ -33,3 +33,4 @@
 <!ENTITY      copyPasswordCmd.accesskey       "C">
 
 <!ENTITY      copyUsernameCmd.label           "Copiar nomedeutilizador">
+<!ENTITY      copyUsernameCmd.accesskey       "u">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/pt-PT/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:40:48.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/pt-PT/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:48:44.000000000 +0000
@@ -29,7 +29,7 @@
 externalProtocolChkMsg=Memorizar escolha para todas as ligações deste tipo.
 externalProtocolLaunchBtn=Iniciar aplicação
 malwareBlocked=O sítio web em %S foi reportado como sendo um sítio de ataque e foi bloqueado tendo por base as suas definições de segurança.
-cspFrameAncestorBlocked=Esta página tem uma política de conteúdo que impede a sua incorporação.
 phishingBlocked=O sĂ­tio web em %S foi reportado como sendo uma fraude web criado para enganar os utilizadores e fazer com que estes partilhem dados pessoais e/ou financeiros.
+cspBlocked=Esta aplicação tentou aceder a um recurso que tem uma política de segurança de conteúdos que previne que seja carregada desta maneira.
 corruptedContentError=A página que está a tentar ver não pode ser apresentada porque foi detetado um erro na transmissão de dados.
 remoteXUL=Esta página utiliza uma tecnologia que já não é suportada.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/b2g/chrome/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/b2g/chrome/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/b2g/chrome/overrides/appstrings.properties	2014-11-14 09:40:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/b2g/chrome/overrides/appstrings.properties	2014-11-26 21:48:54.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Зап��тить приложение
 malwareBlocked = �меет�я информация о том, что �айт %S и�польз�ет�я для атак на компьютеры пользователей. В �оответ�твии � ва�ими на�тройками безопа�но�ти он был заблокирован.
 phishingBlocked = �меет�я информация о том, что %S являет�я мо�енниче�ким веб-�айтом, �озданным для того, чтобы обманным п�тем выманить � пользователей информацию личного или финан�ового характера.
-cspFrameAncestorBlocked = Эта �траница имеет политик� защиты �одержимого, предотвращающ�ю её в�траивание данным �по�обом.
+cspBlocked = Эта �траница имеет политик� защиты �одержимого, блокир�ющ�ю данный �по�об её загр�зки.
 corruptedContentError = Страница, котор�ю вы пытаете�ь про�мотреть, не может быть показана, так как была обнар�жена о�ибка при передаче данных.
 remoteXUL = Эта �траница и�польз�ет неподдерживаем�ю технологию, которая по �молчанию более недо�т�пна в Firefox.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/dom/chrome/appstrings.properties	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/dom/chrome/appstrings.properties	2014-11-26 21:48:54.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Зап��тить приложение
 malwareBlocked = �меет�я информация о том, что �айт %S и�польз�ет�я для атак на компьютеры пользователей. В �оответ�твии � ва�ими на�тройками безопа�но�ти он был заблокирован.
 phishingBlocked = �меет�я информация о том, что %S являет�я мо�енниче�ким веб-�айтом, �озданным для того, чтобы обманным п�тем выманить � пользователей информацию личного или финан�ового характера.
-cspFrameAncestorBlocked = Эта �траница имеет политик� защиты �одержимого, предотвращающ�ю её в�траивание данным �по�обом.
+cspBlocked = Эта �траница имеет политик� защиты �одержимого, блокир�ющ�ю данный �по�об её загр�зки.
 corruptedContentError = Страница, котор�ю вы пытаете�ь про�мотреть, не может быть показана, так как была обнар�жена о�ибка при передаче данных.
 remoteXUL = Эта �траница и�польз�ет неподдерживаем�ю технологию, которая по �молчанию более недо�т�пна.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/dom/chrome/dom/dom.properties	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/dom/chrome/dom/dom.properties	2014-11-26 21:48:54.000000000 +0000
@@ -143,3 +143,4 @@
 KeyNameDeadKeysWarning = Значения ключа KeyboardEvent.key начинающие�я � "Dead" являют�я ��тарев�ими и б�д�т �литы � про�то "Dead". Более подробно на https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
 ImportXULIntoContentWarning = �мпорт �злов XUL в �одержимое док�мента являет�я ��тарев�им. Эта ф�нкционально�ть может быть �коро �далена.
 XMLDocumentLoadPrincipalMismatch = ��пользование document.load для Док�ментов, которые приходят из др�гих Окон, запрещено. Только Окн�, в котором был �оздан Док�мент, разре�ено вызывать .load для этого Док�мента. Е�ли возможно, и�польз�йте вме�то этого XMLHttpRequest.
+IndexedDBTransactionAbortNavigation = Незавер�ённая транзакция IndexedDB была прервана из-за навигации по �транице.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/dom/chrome/netError.dtd	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/dom/chrome/netError.dtd	2014-11-26 21:48:54.000000000 +0000
@@ -59,8 +59,8 @@
 <!ENTITY phishingBlocked.longDesc "
 <p>Ввод на этой �транице любой личной информации может приве�ти к её хищению или и�пользованию в мо�енниче�ких целях.</p>
 <p>Подобные типы веб-�айтов и�польз�ют�я в мо�енниче�твах, изве�тных как фи�инговые атаки, при которых поддельные веб-�траницы и почтовые �ообщения и�польз�ют�я для имитации и�точников, которым вы можете доверять.</p>">
-<!ENTITY cspFrameAncestorBlocked.title "Заблокировано политикой защиты �одержимого">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>Бра�зер предотвратил загр�зк� этой �траницы данным �по�обом, так как �траница имеет политик� защиты �одержимого, запрещающ�ю это.</p>">
+<!ENTITY cspBlocked.title "Заблокировано политикой защиты �одержимого">
+<!ENTITY cspBlocked.longDesc "<p>Бра�зер заблокировал данный �по�об загр�зки этой �траницы, так как �траница имеет политик� защиты �одержимого, которая это запрещает.</p>">
 <!ENTITY corruptedContentError.title "О�ибка и�кажения �одержимого">
 <!ENTITY corruptedContentError.longDesc "<p>Страница, котор�ю вы пытаете�ь про�мотреть, не может быть показана, так как была обнар�жена о�ибка при передаче данных.</p><ul><li>Пожал�й�та, �вяжите�ь � владельцами веб-�айта и проинформир�йте их об этой проблеме.</li></ul>">
 <!ENTITY remoteXUL.title "Удалённый XUL">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/mail/chrome/messenger/charsetTitles.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/mail/chrome/messenger/charsetTitles.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/mail/chrome/messenger/charsetTitles.properties	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/mail/chrome/messenger/charsetTitles.properties	2014-11-26 21:48:54.000000000 +0000
@@ -27,21 +27,17 @@
 euc-jp.title = Япон�кая (EUC-JP)
 big5.title = Китай�кая традиционная (Big5)
 big5-hkscs.title = Китай�кая традиционная (Big5-HKSCS)
-x-euc-tw.title = Китай�кая традиционная (EUC-TW)
 gb2312.title = Китай�кая �прощённая (GB2312)
 hz-gb-2312.title = Китай�кая �прощённая (HZ)
 gbk.title = Китай�кая �прощённая (GBK)
-iso-2022-cn.title = Китай�кая �прощённая (ISO-2022-CN)
 euc-kr.title = Корей�кая (EUC-KR)
 x-johab.title = Корей�кая (JOHAB)
-iso-2022-kr.title = Корей�кая (ISO-2022-KR)
 utf-7.title = Юникод (UTF-7)
 utf-8.title = Юникод (UTF-8)
 utf-16.title = Юникод (UTF-16)
 utf-16le.title = Юникод (UTF-16LE)
 utf-16be.title = Юникод (UTF-16BE)
 iso-8859-5.title = Кириллица (ISO-8859-5)
-iso-ir-111.title = Кириллица (ISO-IR-111)
 windows-1251.title = Кириллица (Windows-1251)
 x-mac-cyrillic.title = Кириллица (MacCyrillic)
 x-mac-ukrainian.title = Кириллица/Украина (MacUkrainian)
@@ -55,7 +51,6 @@
 viscii.title = Вьетнам�кая (VISCII)
 x-viet-vps.title = Вьетнам�кая (VPS)
 windows-874.title = Тай�кая (Windows-874)
-ibm874.title = Тай�кая (IBM-874)
 armscii-8.title = �рмян�кая (ARMSCII-8)
 iso-8859-6.title = �раб�кая (ISO-8859-6)
 iso-8859-6-i.title = �раб�кая (ISO-8859-6-I)
@@ -67,11 +62,6 @@
 windows-1256.title = �раб�кая (Windows-1256)
 x-user-defined.title = Определённая пользователем
 ibm866.title = Кириллица/Ро��ия (CP-866)
-ibm850.title = Западноевропей�кая (IBM-850)
-ibm852.title = Центральноевропей�кая (IBM-852)
-ibm855.title = Кириллица (IBM-855)
-ibm857.title = Т�рецкая (IBM-857)
-ibm862.title = �врит (IBM-862)
 gb18030.title = Китай�кая �прощённая (GB18030)
 x-mac-arabic.title = �раб�кая (MacArabic)
 x-mac-farsi.title = Фар�и (MacFarsi)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/mail/chrome/messenger/preferences/privacy.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/mail/chrome/messenger/preferences/privacy.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/mail/chrome/messenger/preferences/privacy.dtd	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/mail/chrome/messenger/preferences/privacy.dtd	2014-11-26 21:48:54.000000000 +0000
@@ -27,10 +27,6 @@
 <!ENTITY cookieExceptions.accesskey "Đş">
 <!ENTITY showCookies.label "Показать к�ки…">
 <!ENTITY showCookies.accesskey "Đ·">
-<!ENTITY dntTrackingNopref.label2 "Не �ообщать �айтам ничего о моих на�тройках от�леживания">
-<!ENTITY dntTrackingNopref.accesskey "е">
 <!ENTITY dntTrackingNotOkay.label2 "Сообщать �айтам, что я не хоч�, чтобы меня от�леживали">
 <!ENTITY dntTrackingNotOkay.accesskey "Đľ">
-<!ENTITY dntTrackingOkay.label2 "Сообщать �айтам, что я хоч�, чтобы меня от�леживали">
-<!ENTITY dntTrackingOkay.accesskey "ŃŚ">
 <!ENTITY doNotTrackInfo.label "Подробнее об Отказе-от-от�леживания">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/mail/chrome/overrides/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/mail/chrome/overrides/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/mail/chrome/overrides/netError.dtd	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/mail/chrome/overrides/netError.dtd	2014-11-26 21:48:54.000000000 +0000
@@ -120,7 +120,7 @@
 <p>Ввод на этой �транице любой личной информации может приве�ти к её хищению или и�пользованию в мо�енниче�ких целях.</p>
 <p>Подобные типы веб-�айтов и�польз�ют�я в мо�енниче�твах, изве�тных как фи�инговые атаки, при которых поддельные веб-�траницы и почтовые �ообщения и�польз�ют�я для имитации и�точников, которым вы можете доверять.</p>">
 <!ENTITY cspFrameAncestorBlocked.title "Заблокировано политикой защиты �одержимого">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; предотвратил загр�зк� этой �траницы данным �по�обом, так как �траница имеет политик� защиты �одержимого, запрещающ�ю это.</p>">
+<!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; заблокировал данный �по�об загр�зки этой �траницы, так как �траница имеет политик� защиты �одержимого, которая это запрещает.</p>">
 <!ENTITY corruptedContentError.title "О�ибка и�кажения �одержимого">
 <!ENTITY corruptedContentError.longDesc "<p>Содержимое, которое вы пытаете�ь про�мотреть, не может быть показано, так как была обнар�жена о�ибка при передаче данных.</p><ul><li>Пожал�й�та, �вяжите�ь � владельцами �одержимого и проинформир�йте их об этой проблеме.</li></ul>">
 <!ENTITY securityOverride.linkText "�ли же вы можете добавить и�ключение…">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:40:57.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:48:54.000000000 +0000
@@ -53,7 +53,7 @@
 pageInfo_Privacy_Encrypted1 = Про�матриваемая вами �траница была за�ифрована перед передачей через �нтернет.
 pageInfo_Privacy_Encrypted2 = Шифрование �ильно затр�дняет про�мотр информации, переходящей от компьютера к компьютер�, по�торонними лицами. Поэтом� маловероятно, что кто-либо прочитает эт� �траниц�, во время передачи её по �ети.
 pageInfo_MixedContent = Соединение ча�тично за�ифровано
-pageInfo_Privacy_Mixed1 = Некоторые ча�ти про�матриваемой вами �траницы не были за�ифрованы перед передачей через �нтернет.
+pageInfo_Privacy_Broken1 = Некоторые ча�ти про�матриваемой вами �траницы не были за�ифрованы или �ифрование являло�ь недо�таточно �ильным перед её передачей через �нтернет.
 certDetails = Про�мотр �ертификата:
 notPresent = <Не являет�я ча�тью �ертификата>
 unknownIssuer = <Неизве�тный центр выдачи>
@@ -108,17 +108,17 @@
 addExceptionBrandedWarning2 = Вы �обираете�ь прин�дительно изменить идентификацию �айта в %S.
 addExceptionInvalidHeader = Этот �айт пытает�я идентифицировать �ебя, и�польз�я некорректн�ю информацию.
 addExceptionDomainMismatchShort = Неверный �айт
-addExceptionDomainMismatchLong = Сертификат принадлежит др�гом� �айт�, что может �казывать на попытк� подмены.
+addExceptionDomainMismatchLong2 = Сертификат принадлежит др�гом� �айт�, что может значить, что кто-то пытает�я подменить этот �айт др�гим.
 addExceptionExpiredShort = У�тарев�ая информация
-addExceptionExpiredLong = Сертификат в данное время недей�твителен. Невозможно проверить, не было ли �ообщений о его �тере или краже.
+addExceptionExpiredLong2 = Сертификат в данное время недей�твителен. Он мог быть �краден или потерян, и мог быть и�пользовать кем-то, чтобы подменить этот �айт др�гим.
 addExceptionUnverifiedOrBadSignatureShort = Неизве�тный центр �ертификации
-addExceptionUnverifiedOrBadSignatureLong = К �ертификат� нет доверия, так как он не был верифицирован доверенным центром �ертификации � и�пользованием безопа�ной подпи�и.
+addExceptionUnverifiedOrBadSignatureLong2 = К �ертификат� нет доверия, так как он не был верифицирован в каче�тве изданного доверенным центром �ертификации � и�пользованием безопа�ной подпи�и.
 addExceptionValidShort = Дей�твительный �ертификат
 addExceptionValidLong = �дентификация этого �айта дей�твительна и проверена. Нет необходимо�ти добавлять и�ключение.
 addExceptionCheckingShort = �дёт проверка информации
-addExceptionCheckingLong = Попытка идентификации �айта…
+addExceptionCheckingLong2 = Попытка идентификации этого �айта…
 addExceptionNoCertShort = Нет до�т�пной информации
-addExceptionNoCertLong = Не �дало�ь пол�чить информацию о подлинном �тат��е данного �айта.
+addExceptionNoCertLong2 = Не �дало�ь пол�чить информацию о подлинном �тат��е этого �айта.
 addExceptionConnectionFailed = Соединение не �дало�ь
 caCertExistsTitle = Сертификат ��ще�тв�ет
 caCertExistsMessage = Сертификат �же ��ще�тв�ет.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/ru/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:40:58.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/ru/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:48:54.000000000 +0000
@@ -29,6 +29,6 @@
 externalProtocolLaunchBtn = Зап��тить приложение
 malwareBlocked = �меет�я информация о том, что �айт %S и�польз�ет�я для атак на компьютеры пользователей. В �оответ�твии � ва�ими на�тройками безопа�но�ти он был заблокирован.
 phishingBlocked = �меет�я информация о том, что %S являет�я мо�енниче�ким веб-�айтом, �озданным для того, чтобы обманным п�тем выманить � пользователей информацию личного или финан�ового характера.
-cspFrameAncestorBlocked = Приложение попытало�ь пол�чить до�т�п к ре��р��, который имеет политик� защиты �одержимого, предотвращающ�ю его в�траивание данным �по�обом.
+cspBlocked = Приложение попытало�ь пол�чить до�т�п к ре��р��, который имеет политик� защиты �одержимого, блокир�ющ�ю данный �по�об его загр�зки.
 corruptedContentError = Приложение не может продолжить загр�зк�, так как была обнар�жена о�ибка при передаче данных.
 remoteXUL = Приложение попытало�ь и�пользовать неподдерживаем�ю технологию, которая более недо�т�пна.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/b2g/chrome/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/b2g/chrome/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/b2g/chrome/overrides/appstrings.properties	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/b2g/chrome/overrides/appstrings.properties	2014-11-26 21:49:00.000000000 +0000
@@ -31,6 +31,6 @@
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
 phishingBlocked=Webová stránka %S je nahlásená ako podozrivá stránka pokúšajúca sa podvodným spôsobom vylákať od používateľov osobné alebo finančné údaje.
-cspFrameAncestorBlocked=Táto stránka obsahuje zásady ochrany obsahu, ktoré nepovoľujú tento spôsob jej vloženia do objektu.
+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á.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/dom/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/dom/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/dom/chrome/appstrings.properties	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/dom/chrome/appstrings.properties	2014-11-26 21:49:00.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
 phishingBlocked=Webová stránka %S je nahlásená ako podozrivá stránka pokúšajúca sa podvodným spôsobom vylákať od používateľov osobné alebo finančné údaje.
-cspFrameAncestorBlocked=Táto stránka obsahuje zásady ochrany obsahu, ktoré nepovoľujú tento spôsob jej vloženia do objektu.
+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á.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/dom/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/dom/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/dom/chrome/dom/dom.properties	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/dom/chrome/dom/dom.properties	2014-11-26 21:49:00.000000000 +0000
@@ -209,3 +209,5 @@
 KeyNameDeadKeysWarning=Hodnoty pre KeyboardEvent.key začínajúce reťazcom "Dead" sú zavrhnuté a budú spojené len ako "Dead". Ďalšie informácie na stránke https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
 ImportXULIntoContentWarning=Importovanie uzlov XUL do obsahu dokumentu je zavrhnuté. Táto funkcionalita bude čoskoro odstránená.
 XMLDocumentLoadPrincipalMismatch=Používanie document.load je zakázané na dokumentoch, ktoré pochádzajú z iných okien. Pre dokument je možné zavolať .load len z okna, v ktorom bol daný dokument vytvorený. Použite radšej XMLHttpRequest.
+# LOCALIZATION NOTE: Do not translate "IndexedDB".
+IndexedDBTransactionAbortNavigation=Stále prebiehajúca transakcia IndexedDB bola prerušená navigáciou stránky.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/dom/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/dom/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/dom/chrome/netError.dtd	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/dom/chrome/netError.dtd	2014-11-26 21:49:00.000000000 +0000
@@ -87,8 +87,8 @@
 <p>Tieto typy falošných stránok sa používajú na podvody, pri ktorých sa kombináciou webovej stránky a e-mailových správ napodob�ujú dôveryhodné zdroje.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Blokované kvôli zásadám ochrany obsahu">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>Prehliadač nepovolil načítanie stránky týmto spôsobom, pretože stránka obsahuje zásady ochrany obsahu, ktoré takéto načítanie neumož�ujú.</p>">
+<!ENTITY cspBlocked.title "Blokované kvôli zásadám ochrany obsahu">
+<!ENTITY cspBlocked.longDesc "<p>Prehliadač nepovolil načítanie stránky týmto spôsobom, pretože stránka obsahuje zásady ochrany obsahu, ktoré takéto načítanie neumož�ujú.</p>">
 
 <!ENTITY corruptedContentError.title "Poškodený obsah stránky">
 <!ENTITY corruptedContentError.longDesc "<p>Táto stránka nemohla byť zobrazená kvôli chybe pri prenose údajov.</p><ul><li>Kontaktuje prevádzkovateľa webovej stránky a informujte ho o tomto probléme.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/mail/chrome/messenger/charsetTitles.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/mail/chrome/messenger/charsetTitles.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/mail/chrome/messenger/charsetTitles.properties	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/mail/chrome/messenger/charsetTitles.properties	2014-11-26 21:49:00.000000000 +0000
@@ -35,21 +35,17 @@
 euc-jp.title=Japonské (EUC-JP)
 big5.title=Tradičné čínske (Big5)
 big5-hkscs.title=Tradičné čínske (Big5-HKSCS)
-x-euc-tw.title=Tradičné čínske (EUC-TW)
 gb2312.title=Zjednodušené čínske (GB2312)
 hz-gb-2312.title=Zjednodušené čínske (HZ)
 gbk.title=Zjednodušené čínske (GBK)
-iso-2022-cn.title=Zjednodušené čínske (ISO-2022-CN)
 euc-kr.title=Kórejské (EUC-KR)
 x-johab.title=Kórejské (JOHAB)
-iso-2022-kr.title=Kórejské (ISO-2022-KR)
 utf-7.title=Unicode (UTF-7)
 utf-8.title=Unicode (UTF-8)
 utf-16.title=Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16LE)
 utf-16be.title = Unicode (UTF-16BE)
 iso-8859-5.title=Azbuka (ISO-8859-5)
-iso-ir-111.title=Azbuka (ISO-IR-111)
 windows-1251.title=Azbuka (Windows-1251)
 x-mac-cyrillic.title=Azbuka (MacCyrillic)
 x-mac-ukrainian.title=Azbuka/Ukrajinská (MacUkrainian)
@@ -63,7 +59,6 @@
 viscii.title=Vietnamské (VISCII)
 x-viet-vps.title=Vietnamské (VPS)
 windows-874.title=Thajské (Windows-874)
-ibm874.title=Thajské (IBM-874)
 armscii-8.title=Arménske (ARMSCII-8)
 iso-8859-6.title=Arabské (ISO-8859-6)
 iso-8859-6-i.title=Arabské (ISO-8859-6-I)
@@ -75,11 +70,6 @@
 windows-1256.title=Arabské (Windows-1256)
 x-user-defined.title=Vlastné
 ibm866.title=Azbuka/Ruské (IBM-866)
-ibm850.title=Západné (IBM-850)
-ibm852.title=StredoeurĂłpske (IBM-852)
-ibm855.title=Azbuka (IBM-855)
-ibm857.title=Turecké (IBM-857)
-ibm862.title=Hebrejské (IBM-862)
 gb18030.title=Zjednodušené čínske (GB18030)
 x-mac-arabic.title=Arabské (MacArabic)
 x-mac-farsi.title=PerzskĂ˝ (MacFarsi)
@@ -88,7 +78,6 @@
 x-mac-gujarati.title=Gujaratské (MacGujarati)
 x-mac-gurmukhi.title=Gurmukhské (MacGurmukhi)
 
-
 chardet.off.title=(vypnuté)
 chardet.universal_charset_detector.title=Univerzálne
 chardet.ja_parallel_state_machine.title=JaponÄŤina
@@ -99,4 +88,3 @@
 chardet.cjk_parallel_state_machine.title=Východná �zia
 chardet.ruprob.title=Ruština
 chardet.ukprob.title=UkrajinÄŤina
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/mail/chrome/overrides/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/mail/chrome/overrides/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/mail/chrome/overrides/netError.dtd	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/mail/chrome/overrides/netError.dtd	2014-11-26 21:49:00.000000000 +0000
@@ -157,8 +157,8 @@
 <p>Tieto typy falošných stránok sa používajú na podvody, pri ktorých sa kombináciou webovej stránky a e-mailových správ napodob�ujú dôveryhodné zdroje.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Blokované kvôli zásadám ochrany obsahu">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>Program &brandShortName; nepovolil načítanie stránky týmto spôsobom, pretože stránka obsahuje zásady ochrany obsahu, ktoré takéto načítanie neumož�ujú.</p>">
+<!ENTITY cspBlocked.title "Blokované kvôli zásadám ochrany obsahu">
+<!ENTITY cspBlocked.longDesc "<p>Program &brandShortName; nepovolil načítanie stránky týmto spôsobom, pretože stránka obsahuje zásady ochrany obsahu, ktoré takéto načítanie neumož�ujú.</p>">
 
 <!ENTITY corruptedContentError.title "Poškodený obsah">
 <!ENTITY corruptedContentError.longDesc "<p>Tento obsah nemohol byť zobrazený kvôli chybe pri prenose údajov.</p><ul><li>Kontaktuje poskytovateľa obsahu a informujte ho o tomto probléme.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/sk/webapprt/webapprt/overrides/appstrings.properties	2014-11-14 09:41:03.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/sk/webapprt/webapprt/overrides/appstrings.properties	2014-11-26 21:49:00.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Spustiť aplikáciu
 malwareBlocked=Stránka %S bola označená ako podvodná a na základe nastavení zabezpečenia bola zablokovaná.
 phishingBlocked=Webová stránka %S je nahlásená ako podozrivá stránka pokúšajúca sa podvodným spôsobom vylákať od používateľov osobné alebo finančné údaje.
-cspFrameAncestorBlocked=Táto aplikácia sa pokúsila pristúpiť k zdroju, ktorý obsahuje zásady ochrany obsahu, ktoré nepovoľujú tento spôsob jeho vloženia do objektu.
+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á.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/mail/chrome/messenger/activity.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/mail/chrome/messenger/activity.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/mail/chrome/messenger/activity.properties	2014-11-14 09:41:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/mail/chrome/messenger/activity.properties	2014-11-26 21:49:30.000000000 +0000
@@ -37,7 +37,7 @@
 # Place the word %1$S in your translation where the number of the message being downloaded should appear.
 # Place the word %2$S in your translation where the total number of pending messages should appear.
 # Place the word %3$S in your translation where the name of the folder being processed should appear.
-autosyncProcessProgress=正在下載 %1$S / %2$S 於 %3$S
+autosyncProcessProgress=正在下載 %1$S / %2$S �訊�� %3$S
 # LOCALIZATION NOTE (autosyncProcessDisplayText): %S will be replaced by the folder name
 autosyncProcessDisplayText=正在更新資料夾 %S
 # LOCALIZATION NOTE (autosyncEventDisplayText): %S will be replaced by the account name
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/mail/chrome/messenger/chat.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/mail/chrome/messenger/chat.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/mail/chrome/messenger/chat.dtd	2014-11-14 09:41:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/mail/chrome/messenger/chat.dtd	2014-11-26 21:49:30.000000000 +0000
@@ -29,7 +29,7 @@
 <!ENTITY deleteCmd.label               "移除�絡人">
 <!ENTITY deleteCmd.accesskey           "v">
 
-<!ENTITY openConversationButton.tooltip  "開啟一個對話">
+<!ENTITY openConversationButton.tooltip  "開始對話">
 <!ENTITY closeConversationButton.tooltip "關閉對話">
 
 <!ENTITY addBuddyButton.label          "新增�絡人">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/security/manager/chrome/pipnss/pipnss.properties	2014-11-14 09:41:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/security/manager/chrome/pipnss/pipnss.properties	2014-11-26 21:49:29.000000000 +0000
@@ -118,11 +118,11 @@
 CertDumpAnsiX9DsaSignature=ANSI X9.57 DSA 簽章
 CertDumpAnsiX9DsaSignatureWithSha1=ANSI X9.57 DSA 簽章加 SHA1 ��
 CertDumpAnsiX962ECDsaSignatureWithSha1=ANSI X9.62 ECDSA 簽章加 SHA1
-CertDumpKUSign=簽署中
+CertDumpKUSign=簽署
 CertDumpKUNonRep=無可�認服務
-CertDumpKUEnc=Key 加密
+CertDumpKUEnc=加密金鑰
 CertDumpKUDEnc=資料加密
-CertDumpKUKA=金鑰�意書
+CertDumpKUKA=�意金鑰
 CertDumpKUCertSign=憑證簽署者
 CertDumpKUCRLSigner=廢止清冊簽署者
 CertDumpCritical=Critical
@@ -132,11 +132,11 @@
 CertDumpExtensionFailure=錯誤: 無法處�擴充欄位
 CertDumpIsCA=這�憑證機構
 CertDumpIsNotCA=這不�憑證機構
-CertDumpPathLen=中繼憑證機構最大值: %S
+CertDumpPathLen=中繼憑證機構數量最大值: %S
 CertDumpPathLenUnlimited=不�
 CertDumpEKU_1_3_6_1_5_5_7_3_1=TLS Web 伺服器鑑�
 CertDumpEKU_1_3_6_1_5_5_7_3_2=TLS Web 用�端鑑�
-CertDumpEKU_1_3_6_1_5_5_7_3_3=代碼簽署
+CertDumpEKU_1_3_6_1_5_5_7_3_3=簽署程式碼
 CertDumpEKU_1_3_6_1_5_5_7_3_4=E-mail äżťč­·
 CertDumpEKU_1_3_6_1_5_5_7_3_8=時間��
 CertDumpEKU_1_3_6_1_5_5_7_3_9=OCSP 簽署
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/l10n/zh-TW/security/manager/chrome/pippki/pippki.properties	2014-11-14 09:41:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/l10n/zh-TW/security/manager/chrome/pippki/pippki.properties	2014-11-26 21:49:29.000000000 +0000
@@ -88,7 +88,7 @@
 
 #Cert Viewer
 certDetails=憑證檢視器:
-notPresent=<非憑證�份>
+notPresent=<不�在於憑證中>
 unknownIssuer=<未知的簽發者>
 
 escrowFinalMessage=如果您信任「%S」可保護您的加密�密金鑰，請按「確定」。
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/base/content/plugins.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/base/content/plugins.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/base/content/plugins.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/base/content/plugins.js	2014-11-26 21:44:57.000000000 +0000
@@ -494,18 +494,17 @@
   // Crashed-plugin event listener. Called for every instance of a
   // plugin in content.
   pluginInstanceCrashed: function (plugin, aEvent) {
-    // Ensure the plugin and event are of the right type.
-    if (!(aEvent instanceof Components.interfaces.nsIDOMCustomEvent))
+    if (!(aEvent instanceof PluginCrashedEvent))
       return;
 
-    let propBag = aEvent.detail.QueryInterface(Components.interfaces.nsIPropertyBag2);
-    let submittedReport = propBag.getPropertyAsBool("submittedCrashReport");
-    let doPrompt = true; // XXX followup for .getData("doPrompt");
-    let submitReports = true; // XXX followup for .getData("submitReports");
-    let pluginName = propBag.getPropertyAsAString("pluginName");
-    let pluginFilename = propBag.getPropertyAsAString("pluginFilename");
-    let pluginDumpID = propBag.getPropertyAsAString("pluginDumpID");
-    let browserDumpID = propBag.getPropertyAsAString("browserDumpID");
+    let submittedReport = aEvent.submittedCrashReport;
+    let doPrompt        = true; // XXX followup for aEvent.doPrompt;
+    let submitReports   = true; // XXX followup for aEvent.submitReports;
+    let pluginName      = aEvent.pluginName;
+    let pluginFilename  = aEvent.pluginFilename;
+    let pluginDumpID    = aEvent.pluginDumpID;
+    let browserDumpID   = aEvent.browserDumpID;
+
     let messengerBundle = document.getElementById("bundle_messenger");
     let tabmail = document.getElementById('tabmail');
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/addrbook/content/abCommon.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/addrbook/content/abCommon.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/addrbook/content/abCommon.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/addrbook/content/abCommon.js	2014-11-26 21:44:57.000000000 +0000
@@ -483,22 +483,18 @@
                     {selectedAB:selectedAB});
 }
 
-function goEditListDialog(abCard, listUri)
+function goEditListDialog(abCard, listURI)
 {
   let params = {
-    inParam: {
-      abCard: abCard,
-      listUri: listUri,
-    },
-    outParam: {
-      ok: false, // true if OK in dialog is clicked
-    },
+    abCard: abCard,
+    listURI: listURI,
+    refresh: false, // This is an out param, true if OK in dialog is clicked.
   };
   window.openDialog("chrome://messenger/content/addressbook/abEditListDialog.xul",
                     "",
                     "chrome,modal,resizable=no,centerscreen",
                     params);
-  if (params.outParam.ok) {
+  if (params.refresh) {
     ChangeDirectoryByURI(listUri); // force refresh
   }
 }
@@ -607,6 +603,74 @@
   }
 }
 
+/**
+ * There is an exact replica of this method in mailnews/.
+ * We need to remove this duplication with the help of a jsm in mailnews/
+ *
+ * Parse the multiword search string to extract individual search terms
+ * (separated on the basis of spaces) or quoted exact phrases to search
+ * against multiple fields of the addressbook cards.
+ *
+ * @param aSearchString The full search string entered by the user.
+ *
+ * @return an array of separated search terms from the full search string.
+ */
+function getSearchTokens(aSearchString)
+{
+  let searchString = aSearchString.trim();
+  if (searchString == "")
+    return [];
+
+  let quotedTerms = [];
+
+  // Split up multiple search words to create a *foo* and *bar* search against
+  // search fields, using the OR-search template from modelQuery for each word.
+  // If the search query has quoted terms as "foo bar", extract them as is.
+  let startIndex;
+  while ((startIndex = searchString.indexOf('"')) != -1) {
+    let endIndex = searchString.indexOf('"', startIndex + 1);
+    if (endIndex == -1)
+      endIndex = searchString.length;
+
+    quotedTerms.push(searchString.substring(startIndex + 1, endIndex));
+    let query = searchString.substring(0, startIndex);
+    if (endIndex < searchString.length)
+      query += searchString.substr(endIndex + 1);
+
+    searchString = query.trim();
+  }
+
+  let searchWords = [];
+  if (searchString.length != 0) {
+    searchWords = quotedTerms.concat(searchString.split(/\s+/));
+  } else {
+    searchWords = quotedTerms;
+  }
+
+  return searchWords;
+}
+
+/*
+ * Given a database model query and a list of search tokens,
+ * return query URI.
+ *
+ * @param aModelQuery database model query
+ * @param aSearchWords an array of search tokens.
+ *
+ * @return query URI.
+ */
+function generateQueryURI(aModelQuery, aSearchWords)
+{
+  let queryURI = "";
+  aSearchWords.forEach(searchWord =>
+    queryURI += aModelQuery.replace(/@V/g, encodeABTermValue(searchWord)));
+
+  // queryURI has all the (or(...)) searches, link them up with (and(...)).
+  queryURI = "?(and" + queryURI + ")";
+
+  return queryURI;
+}
+
 function onAbClearSearch()
 {
   var searchInput = document.getElementById("peopleSearchInput");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/addrbook/content/abContactsPanel.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/addrbook/content/abContactsPanel.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/addrbook/content/abContactsPanel.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/addrbook/content/abContactsPanel.js	2014-11-26 21:44:57.000000000 +0000
@@ -154,16 +154,11 @@
   var searchURI = GetSelectedDirectory();
   var searchInput = document.getElementById("peopleSearchInput");
 
-  // Split up multiple search words to create a *foo* and *bar* search against
-  // search fields, using the OR-search template from gQueryURIFormat for each word.
-  if (searchInput.value != "") {
-    let searchWords = searchInput.value.trim().split(/\s+/);
-    let queryURI = "";
-    searchWords.forEach(searchWord =>
-      queryURI += gQueryURIFormat.replace(/@V/g, encodeABTermValue(searchWord)));
-
-   // queryURI has all the (or(...)) searches, link them up with (and(...)).
-    searchURI += "?(and" + queryURI + ")";
+  // Use helper method to split up search query to multi-word search
+  // query against multiple fields.
+  if (searchInput) {
+    let searchWords = getSearchTokens(searchInput.value);
+    searchURI += generateQueryURI(gQueryURIFormat, searchWords);
   }
 
   SetAbView(searchURI);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/addrbook/content/addressbook.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/addrbook/content/addressbook.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/addrbook/content/addressbook.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/addrbook/content/addressbook.js	2014-11-26 21:44:57.000000000 +0000
@@ -519,16 +519,11 @@
    moz-abldapdirectory://nsdirectory.netscape.com:389/ou=People,dc=netscape,dc=com?(or(Department,=,Applications))
   */
   var searchInput = document.getElementById("peopleSearchInput");
-  if (searchInput && searchInput.value != "") {
-    // Split up multiple search words to create a *foo* and *bar* search against
-    // search fields, using the OR-search template from gQueryURIFormat for each word.
-    let searchWords = searchInput.value.trim().split(/\s+/);
-    let queryURI = "";
-    searchWords.forEach(searchWord =>
-      queryURI += gQueryURIFormat.replace(/@V/g, encodeABTermValue(searchWord)));
-
-    // queryURI has all the (or(...)) searches, link them up with (and(...)).
-    searchURI += "?(and" + queryURI + ")";
+  // Use helper method to split up search query to multi-word search
+  // query against multiple fields.
+  if (searchInput) {
+    let searchWords = getSearchTokens(searchInput.value);
+    searchURI += generateQueryURI(gQueryURIFormat, searchWords);
   }
 
   SetAbView(searchURI);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/compose/content/MsgComposeCommands.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/compose/content/MsgComposeCommands.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/compose/content/MsgComposeCommands.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/compose/content/MsgComposeCommands.js	2014-11-26 21:44:57.000000000 +0000
@@ -228,6 +228,7 @@
     //Reset editor
     EditorResetFontAndColorAttributes();
     EditorCleanup();
+    gAttachmentNotifier.redetectKeywords();
 
     //Release the nsIMsgComposeParams object
     if (window.arguments && window.arguments[0])
@@ -1846,10 +1847,10 @@
  * again if keywords change (if no attachments and no manual reminder).
  *
  * @param aForce  If set to true, notification will be shown immediately if
- *                there are any keywords. If set to true, it is shown only when
+ *                there are any keywords. If set to false, it is shown only when
  *                they have changed.
  */
-function manageAttachmentNotification(aForce)
+function manageAttachmentNotification(aForce = false)
 {
   let keywords;
   let keywordsCount = 0;
@@ -1871,7 +1872,7 @@
       // We don't know keywords, so get them first.
       // If aForce was true, and some keywords are found, we get to run again from
       // attachmentWorker.onmessage().
-      redetectKeywords(aForce);
+      gAttachmentNotifier.redetectKeywords(aForce);
       return;
     }
   }
@@ -1995,108 +1996,6 @@
 };
 
 /**
- * Checks for new keywords synchronously and run the usual handler.
- *
- * @param aManage  Determines whether to manage the notification according to keywords found.
- */
-function redetectKeywords(aManage) {
-  attachmentWorker.onmessage({ data: CheckForAttachmentKeywords(false) }, aManage);
-}
-
-/**
- * Check if there are any keywords in the message.
- *
- * @param async  Whether we should run the regex checker asynchronously or not.
- *
- * @return  If async is true, attachmentWorker.message is called with the array
- *          of found keywords and this function returns null.
- *          If it is false, the array is returned from this function immediately.
- */
-function CheckForAttachmentKeywords(async)
-{
-  let warn = getPref("mail.compose.attachment_reminder");
-  if (warn) {
-    if (attachmentNotificationSupressed()) {
-      // If we know we don't need to show the notification,
-      // we can skip the expensive checking of keywords in the message.
-      // but mark it in the .lastMessage that the keywords are unknown.
-      attachmentWorker.lastMessage = null;
-      return false;
-    }
-
-    let keywordsInCsv = Services.prefs.getComplexValue(
-      "mail.compose.attachment_reminder_keywords",
-      Components.interfaces.nsIPrefLocalizedString).data;
-    let mailBody = document.getElementById("content-frame")
-                           .contentDocument.querySelector("body");
-    let mailBodyNode = mailBody.cloneNode(true);
-
-    // Don't check quoted text from reply.
-    let blockquotes = mailBodyNode.getElementsByTagName("blockquote");
-    for (let i = blockquotes.length - 1; i >= 0; i--) {
-      blockquotes[i].remove();
-    }
-
-    // For plaintext composition the quotes we need to find and exclude are
-    // <span _moz_quote="true">.
-    let spans = mailBodyNode.querySelectorAll("span[_moz_quote]");
-    for (let i = spans.length - 1; i >= 0; i--) {
-      spans[i].remove();
-    }
-
-    // Ignore signature (html compose mode).
-    let sigs = mailBodyNode.getElementsByClassName("moz-signature");
-    for (let i = sigs.length - 1; i >= 0; i--) {
-      sigs[i].remove();
-    }
-
-    // Replace brs with line breaks so node.textContent won't pull foo<br>bar
-    // together to foobar.
-    let brs = mailBodyNode.getElementsByTagName("br");
-    for (let i = brs.length - 1; i >= 0; i--) {
-      brs[i].parentNode.replaceChild(mailBodyNode.ownerDocument.createTextNode("\n"), brs[i]);
-    }
-
-    // Ignore signature (plain text compose mode).
-    let mailData = mailBodyNode.textContent;
-    let sigIndex = mailData.indexOf("-- \n");
-    if (sigIndex > 0)
-      mailData = mailData.substring(0, sigIndex);
-
-    // Ignore replied messages (plain text and html compose mode).
-    let repText = getComposeBundle().getString("mailnews.reply_header_originalmessage");
-    let repIndex = mailData.indexOf(repText);
-    if (repIndex > 0)
-      mailData = mailData.substring(0, repIndex);
-
-    // Ignore forwarded messages (plain text and html compose mode).
-    let fwdText = getComposeBundle().getString("mailnews.forward_header_originalmessage");
-    let fwdIndex = mailData.indexOf(fwdText);
-    if (fwdIndex > 0)
-      mailData = mailData.substring(0, fwdIndex);
-
-    // Prepend the subject to see if the subject contains any attachment
-    // keywords too, after making sure that the subject has changed.
-    let subject = GetMsgSubjectElement().value;
-    if (subject && (gSubjectChanged ||
-       (gEditingDraft &&
-         (gComposeType == nsIMsgCompType.New ||
-         gComposeType == nsIMsgCompType.NewsPost ||
-         gComposeType == nsIMsgCompType.Draft ||
-         gComposeType == nsIMsgCompType.Template ||
-         gComposeType == nsIMsgCompType.MailToUrl))))
-      mailData = subject + " " + mailData;
-
-    if (!async)
-      return GetAttachmentKeywords(mailData, keywordsInCsv);
-
-    attachmentWorker.postMessage([mailData, keywordsInCsv]);
-    return null;
-  }
-  return false;
-}
-
-/**
  * Called when number of attachments changes.
  */
 function AttachmentsChanged() {
@@ -4614,14 +4513,23 @@
   gAutoSaveTimeout = setTimeout(AutoSave, gAutoSaveInterval);
 }
 
+/**
+ * Periodically check for keywords in the message.
+ */
 const gAttachmentNotifier =
 {
   _obs: null,
 
+  enabled: false,
+
   init: function gAN_init(aDocument) {
     if (this._obs)
       this.shutdown();
 
+    this.enabled = getPref("mail.compose.attachment_reminder");
+    if (!this.enabled)
+      return;
+
     this._obs = new MutationObserver(function gAN_handleMutations(aMutations) {
       gAttachmentNotifier.timer.cancel();
       gAttachmentNotifier.timer.initWithCallback(gAttachmentNotifier.event, 500,
@@ -4641,14 +4549,6 @@
       this.subjectObserver, true);
   },
 
-  shutdown: function gAN_shutdown() {
-    if (this._obs)
-      this._obs.disconnect();
-    gAttachmentNotifier.timer.cancel();
-
-    this._obs = null;
-  },
-
   // Timer based function triggered by the inputEventListener
   // for the subject field.
   subjectObserver: function handleEvent() {
@@ -4657,6 +4557,118 @@
                                                Components.interfaces.nsITimer.TYPE_ONE_SHOT);
   },
 
+  /**
+   * Checks for new keywords synchronously and run the usual handler.
+   *
+   * @param aManage  Determines whether to manage the notification according to keywords found.
+   */
+  redetectKeywords: function(aManage) {
+    if (!this.enabled)
+      return;
+
+    attachmentWorker.onmessage({ data: this._checkForAttachmentKeywords(false) }, aManage);
+  },
+
+  /**
+   * Check if there are any keywords in the message.
+   *
+   * @param async  Whether we should run the regex checker asynchronously or not.
+   *
+   * @return  If async is true, attachmentWorker.message is called with the array
+   *          of found keywords and this function returns null.
+   *          If it is false, the array is returned from this function immediately.
+   */
+  _checkForAttachmentKeywords: function(async)
+  {
+    if (!this.enabled)
+      return (async ? null : []);
+
+    if (attachmentNotificationSupressed()) {
+      // If we know we don't need to show the notification,
+      // we can skip the expensive checking of keywords in the message.
+      // but mark it in the .lastMessage that the keywords are unknown.
+      attachmentWorker.lastMessage = null;
+      return (async ? null : []);
+    }
+
+    let keywordsInCsv = Services.prefs.getComplexValue(
+      "mail.compose.attachment_reminder_keywords",
+      Components.interfaces.nsIPrefLocalizedString).data;
+    let mailBody = document.getElementById("content-frame")
+                           .contentDocument.querySelector("body");
+    let mailBodyNode = mailBody.cloneNode(true);
+
+    // Don't check quoted text from reply.
+    let blockquotes = mailBodyNode.getElementsByTagName("blockquote");
+    for (let i = blockquotes.length - 1; i >= 0; i--) {
+      blockquotes[i].remove();
+    }
+
+    // For plaintext composition the quotes we need to find and exclude are
+    // <span _moz_quote="true">.
+    let spans = mailBodyNode.querySelectorAll("span[_moz_quote]");
+    for (let i = spans.length - 1; i >= 0; i--) {
+      spans[i].remove();
+    }
+
+    // Ignore signature (html compose mode).
+    let sigs = mailBodyNode.getElementsByClassName("moz-signature");
+    for (let i = sigs.length - 1; i >= 0; i--) {
+      sigs[i].remove();
+    }
+
+    // Replace brs with line breaks so node.textContent won't pull foo<br>bar
+    // together to foobar.
+    let brs = mailBodyNode.getElementsByTagName("br");
+    for (let i = brs.length - 1; i >= 0; i--) {
+      brs[i].parentNode.replaceChild(mailBodyNode.ownerDocument.createTextNode("\n"), brs[i]);
+    }
+
+    // Ignore signature (plain text compose mode).
+    let mailData = mailBodyNode.textContent;
+    let sigIndex = mailData.indexOf("-- \n");
+    if (sigIndex > 0)
+      mailData = mailData.substring(0, sigIndex);
+
+    // Ignore replied messages (plain text and html compose mode).
+    let repText = getComposeBundle().getString("mailnews.reply_header_originalmessage");
+    let repIndex = mailData.indexOf(repText);
+    if (repIndex > 0)
+      mailData = mailData.substring(0, repIndex);
+
+    // Ignore forwarded messages (plain text and html compose mode).
+    let fwdText = getComposeBundle().getString("mailnews.forward_header_originalmessage");
+    let fwdIndex = mailData.indexOf(fwdText);
+    if (fwdIndex > 0)
+      mailData = mailData.substring(0, fwdIndex);
+
+    // Prepend the subject to see if the subject contains any attachment
+    // keywords too, after making sure that the subject has changed.
+    let subject = GetMsgSubjectElement().value;
+    if (subject && (gSubjectChanged ||
+       (gEditingDraft &&
+         (gComposeType == nsIMsgCompType.New ||
+         gComposeType == nsIMsgCompType.NewsPost ||
+         gComposeType == nsIMsgCompType.Draft ||
+         gComposeType == nsIMsgCompType.Template ||
+         gComposeType == nsIMsgCompType.MailToUrl))))
+      mailData = subject + " " + mailData;
+
+    if (!async)
+      return GetAttachmentKeywords(mailData, keywordsInCsv);
+
+    attachmentWorker.postMessage([mailData, keywordsInCsv]);
+    return null;
+  },
+
+  shutdown: function gAN_shutdown() {
+    if (this._obs)
+      this._obs.disconnect();
+    gAttachmentNotifier.timer.cancel();
+
+    this._obs = null;
+  },
+
   event: {
     notify: function(timer)
     {
@@ -4665,7 +4677,7 @@
       if (gMsgCompose) {
         // This runs the attachmentWorker asynchronously so if keywords are found
         // manageAttachmentNotification is run from attachmentWorker.onmessage.
-        CheckForAttachmentKeywords(true);
+        gAttachmentNotifier._checkForAttachmentKeywords(true);
       }
     }
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/devtools/content/dbg-messenger-overlay.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/devtools/content/dbg-messenger-overlay.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/devtools/content/dbg-messenger-overlay.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/devtools/content/dbg-messenger-overlay.js	2014-11-26 21:44:57.000000000 +0000
@@ -3,7 +3,7 @@
  * 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/RemoteDebuggerServer.jsm");
+Components.utils.import("resource:///modules/RemoteDebuggerServer.jsm");
 
 /**
  * Handler to call when the checked state of the menuitem is toggled. Sets the
@@ -14,7 +14,7 @@
   Services.prefs.setBoolPref("devtools.debugger.remote-enabled", shouldEnable);
 
   RemoteDebuggerServer.extraInit = function(DebuggerServer) {
-    DebuggerServer.registerModule("resource://gre/modules/XULRootActor.js");
+    DebuggerServer.registerModule("resource:///modules/XULRootActor.js");
   };
   RemoteDebuggerServer.startstop(shouldEnable);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/im/content/imAccounts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/im/content/imAccounts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/im/content/imAccounts.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/im/content/imAccounts.js	2014-11-26 21:44:57.000000000 +0000
@@ -33,39 +33,44 @@
   disableTimerID: 0,
   _connectedLabelInterval: 0,
   load: function am_load() {
-    this.accountList = document.getElementById("accountlist");
-    let defaultID;
-    Services.core.init(); // ensure the imCore is initialized.
-    for (let acc in this.getAccounts()) {
-      var elt = document.createElement("richlistitem");
-      this.accountList.appendChild(elt);
-      elt.build(acc);
-      if (!defaultID && acc.firstConnectionState == acc.FIRST_CONNECTION_CRASHED)
-        defaultID = acc.id;
-    }
-    for each (let event in events)
-      Services.obs.addObserver(this, event, false);
-    if (!this.accountList.getRowCount())
-      // This is horrible, but it works. Otherwise (at least on mac)
-      // the wizard is not centered relatively to the account manager
-      setTimeout(function() { gAccountManager.new(); }, 0);
-    else {
-      // we have accounts, show the list
-      document.getElementById("accountsDesk").selectedIndex = 1;
+    // Wait until the password service is ready before offering anything.
+    Services.logins.initializationPromise.then(() => {
+      this.accountList = document.getElementById("accountlist");
+      let defaultID;
+      Services.core.init(); // ensure the imCore is initialized.
+      for (let acc in this.getAccounts()) {
+        var elt = document.createElement("richlistitem");
+        this.accountList.appendChild(elt);
+        elt.build(acc);
+        if (!defaultID && acc.firstConnectionState == acc.FIRST_CONNECTION_CRASHED)
+          defaultID = acc.id;
+      }
+      for each (let event in events)
+        Services.obs.addObserver(this, event, false);
+      if (!this.accountList.getRowCount())
+        // This is horrible, but it works. Otherwise (at least on mac)
+        // the wizard is not centered relatively to the account manager
+        setTimeout(function() { gAccountManager.new(); }, 0);
+      else {
+        // we have accounts, show the list
+        document.getElementById("accountsDesk").selectedIndex = 1;
 
-      // ensure an account is selected
-      if (defaultID)
-        this.selectAccount(defaultID);
-      else
-        this.accountList.selectedIndex = 0;
-    }
+        // ensure an account is selected
+        if (defaultID)
+          this.selectAccount(defaultID);
+        else
+          this.accountList.selectedIndex = 0;
+      }
 
-    this.setAutoLoginNotification();
+      this.setAutoLoginNotification();
 
-    this.accountList.addEventListener("keypress", this.onKeyPress, true);
-    window.addEventListener("unload", this.unload.bind(this));
-    this._connectedLabelInterval = setInterval(this.updateConnectedLabels, 60000);
-    statusSelector.init();
+      this.accountList.addEventListener("keypress", this.onKeyPress, true);
+      window.addEventListener("unload", this.unload.bind(this));
+      this._connectedLabelInterval = setInterval(this.updateConnectedLabels, 60000);
+      statusSelector.init();
+    }, () => {
+      this.close();
+    });
   },
   unload: function am_unload() {
     clearInterval(this._connectedLabelInterval);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/im/modules/chatHandler.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/im/modules/chatHandler.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/im/modules/chatHandler.jsm	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/im/modules/chatHandler.jsm	2014-11-26 21:44:57.000000000 +0000
@@ -28,7 +28,8 @@
     Services.obs.addObserver(this, "contact-removed", false);
 
     // The initialization of the im core may trigger a master password prompt,
-    // so wrap it with the async prompter service.
+    // so wrap it with the async prompter service. Note this service already
+    // waits for the asynchronous initialization of the password service.
     Components.classes["@mozilla.org/messenger/msgAsyncPrompter;1"]
               .getService(Components.interfaces.nsIMsgAsyncPrompter)
               .queueAsyncAuthPrompt("im", false, {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/newmailaccount/content/uriListener.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/newmailaccount/content/uriListener.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/newmailaccount/content/uriListener.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/newmailaccount/content/uriListener.js	2014-11-26 21:44:57.000000000 +0000
@@ -16,7 +16,7 @@
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
-Cu.import("resource://gre/modules/JXON.js");
+Cu.import("resource:///modules/JXON.js");
 
 /**
  * This is an observer that watches all HTTP requests for one where the
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/preferences/display.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/preferences/display.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/preferences/display.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/preferences/display.js	2014-11-26 21:44:57.000000000 +0000
@@ -240,6 +240,19 @@
                  "",
                  "chrome,titlebar,modal",
                  args);
+  },
+
+  onSelect: function()
+  {
+    let btnEdit = document.getElementById("editTagButton");
+    let listBox = document.getElementById("tagList");
+
+    if (listBox.selectedCount > 0)
+      btnEdit.disabled = false;
+    else
+      btnEdit.disabled = true;
+
+    document.getElementById("removeTagButton").disabled = btnEdit.disabled;
   }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/preferences/display.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/preferences/display.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/preferences/display.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/preferences/display.xul	2014-11-26 21:44:57.000000000 +0000
@@ -158,13 +158,18 @@
         <tabpanel orient="vertical">
           <label control="tagList">&displayTagsText.label;</label>
           <hbox>
-            <listbox id="tagList" flex="1" rows="10" ondblclick="gDisplayPane.editTag();"/>
+            <listbox id="tagList" flex="1" rows="10" ondblclick="gDisplayPane.editTag();"
+                     onselect="gDisplayPane.onSelect();"/>
             <vbox>
               <button label="&addTagButton.label;" accesskey="&addTagButton.accesskey;"
                       oncommand="gDisplayPane.addTag();"/>
-              <button label="&editTagButton.label;" accesskey="&editTagButton.accesskey;"
+              <button id="editTagButton" disabled="true"
+                      label="&editTagButton.label;"
+                      accesskey="&editTagButton.accesskey;"
                       oncommand="gDisplayPane.editTag();"/>
-              <button label="&removeTagButton.label;" accesskey="&removeTagButton.accesskey;"
+              <button id="removeTagButton" disabled="true"
+                      label="&removeTagButton.label;"
+                      accesskey="&removeTagButton.accesskey;"
                       oncommand="gDisplayPane.removeTag();"/>
             </vbox>
           </hbox>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/shell/nsMailGNOMEIntegration.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/shell/nsMailGNOMEIntegration.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/components/shell/nsMailGNOMEIntegration.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/components/shell/nsMailGNOMEIntegration.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -51,7 +51,8 @@
 static const AppTypeAssociation sAppTypes[] = {
   {
     nsIShellService::MAIL, sMailProtocols, ArrayLength(sMailProtocols),
-    "message/rfc822", "eml"
+    "message/rfc822",
+    nullptr // don't associate .eml extension, as that breaks printing those
   },
   {
     nsIShellService::NEWS, sNewsProtocols, ArrayLength(sNewsProtocols),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/installer/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/installer/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/installer/Makefile.in	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/installer/Makefile.in	2014-11-26 21:44:58.000000000 +0000
@@ -112,6 +112,13 @@
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+RESPATH = $(_APPNAME)/Contents/Resources
+else
+RESPATH = $(BINPATH)
+endif
+DEFINES += -DRESPATH=$(RESPATH)
+
 AB = $(firstword $(subst -, ,$(AB_CD)))
 DEFINES += -DAB=$(AB)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/installer/package-manifest.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/installer/package-manifest.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/installer/package-manifest.in	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/installer/package-manifest.in	2014-11-26 21:44:58.000000000 +0000
@@ -16,6 +16,19 @@
 ; ; file comment
 ;
 
+; Due to Apple Mac OS X packaging requirements, files that are in the same
+; directory on other platforms must be located in different directories on
+; Mac OS X. The following defines allow specifying the Mac OS X bundle
+; location which also work on other platforms.
+;
+; @BINPATH@
+; Equals Contents/MacOS/ on Mac OS X and is the path to the main binary on other
+; platforms.
+;
+; @RESPATH@
+; Equals Contents/Resources/ on Mac OS X and is equivalent to @BINPATH@ on other
+; platforms.
+
 #filter substitution
 
 #ifdef XP_UNIX
@@ -29,27 +42,27 @@
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
 @APPNAME@/Contents/Library/
-@APPNAME@/Contents/Resources/thunderbird.icns
-@APPNAME@/Contents/Resources/@AB@.lproj/*
+@RESPATH@/thunderbird.icns
+@RESPATH@/@AB@.lproj/*
 #endif
 
 [@AB_CD@]
-@BINPATH@/chrome/@AB_CD@@JAREXT@
-@BINPATH@/chrome/@AB_CD@.manifest
-@BINPATH@/@PREF_DIR@/all-l10n.js
-@BINPATH@/searchplugins/*
-@BINPATH@/dictionaries/*
-@BINPATH@/hyphenation/*
+@RESPATH@/chrome/@AB_CD@@JAREXT@
+@RESPATH@/chrome/@AB_CD@.manifest
+@RESPATH@/@PREF_DIR@/all-l10n.js
+@RESPATH@/searchplugins/*
+@RESPATH@/dictionaries/*
+@RESPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
-@BINPATH@/update.locale
-@BINPATH@/updater.ini
+@RESPATH@/update.locale
+@RESPATH@/updater.ini
 #endif
 
 [xpcom]
-@BINPATH@/dependentlibs.list
+@RESPATH@/dependentlibs.list
 #ifndef MOZ_NATIVE_NSPR
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@@ -58,12 +71,8 @@
 #endif
 #endif
 #ifndef MOZ_STATIC_JS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
-#endif
 #ifdef GKMEDIAS_SHARED_LIBRARY
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
@@ -86,26 +95,18 @@
 @BINPATH@/msvcr110.dll
 #endif
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#endif
 #ifdef MOZ_SHARED_MOZGLUE
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozglue@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
-#endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/XUL
+@BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_CHILD_PROCESS_NAME@.app/
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
@@ -130,9 +131,9 @@
 @BINPATH@/icuin@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
 @BINPATH@/icuuc@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
 #elif defined(XP_MACOSX)
-@BINPATH@/libicudata.@MOZ_ICU_VERSION@.dylib
-@BINPATH@/libicui18n.@MOZ_ICU_VERSION@.dylib
-@BINPATH@/libicuuc.@MOZ_ICU_VERSION@.dylib
+@RESPATH@/libicudata.@MOZ_ICU_VERSION@.dylib
+@RESPATH@/libicui18n.@MOZ_ICU_VERSION@.dylib
+@RESPATH@/libicuuc.@MOZ_ICU_VERSION@.dylib
 #elif defined(XP_UNIX)
 @BINPATH@/libicudata.so.@MOZ_ICU_VERSION@
 @BINPATH@/libicui18n.so.@MOZ_ICU_VERSION@
@@ -142,134 +143,131 @@
 #endif
 
 ; Modules
-@BINPATH@/modules/*
+@RESPATH@/modules/*
 
 ; Optional RSS extension
 [newsblog]
-@BINPATH@/chrome/newsblog@JAREXT@
-@BINPATH@/chrome/newsblog.manifest
-@BINPATH@/components/newsblog.js
-@BINPATH@/components/newsblog.manifest
+@RESPATH@/chrome/newsblog@JAREXT@
+@RESPATH@/chrome/newsblog.manifest
+@RESPATH@/components/newsblog.js
+@RESPATH@/components/newsblog.manifest
 
 [mail]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
-#elif XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 @BINPATH@/@MOZ_APP_NAME@
 #endif
-@BINPATH@/application.ini
+@RESPATH@/application.ini
 #ifdef MOZ_UPDATER
-@BINPATH@/update-settings.ini
+@RESPATH@/update-settings.ini
 #endif
-@BINPATH@/blocklist.xml
-@BINPATH@/platform.ini
+@RESPATH@/blocklist.xml
+@RESPATH@/platform.ini
 #ifndef MOZ_NATIVE_SQLITE
 #ifndef MOZ_FOLD_LIBS
-@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+@RESPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #endif
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/run-mozilla.sh
+@RESPATH@/run-mozilla.sh
 #ifdef MOZ_UPDATER
-@BINPATH@/icons/*.png
+@RESPATH@/icons/*.png
 #endif
 #endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Mail Specific Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-@BINPATH@/defaults/messenger/mailViews.dat
-@BINPATH@/defaults/profile/localstore.rdf
-@BINPATH@/defaults/profile/prefs.js
-@BINPATH@/defaults/profile/mimeTypes.rdf
+@RESPATH@/defaults/messenger/mailViews.dat
+@RESPATH@/defaults/profile/localstore.rdf
+@RESPATH@/defaults/profile/prefs.js
+@RESPATH@/defaults/profile/mimeTypes.rdf
 
-@BINPATH@/isp/*
+@RESPATH@/isp/*
 
 #if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS)
-@BINPATH@/components/components.manifest
+@RESPATH@/components/components.manifest
 #endif
-@BINPATH@/components/aboutRedirector.js
-@BINPATH@/components/activity.xpt
-@BINPATH@/components/activityComponents.manifest
-@BINPATH@/components/cloudFileComponents.manifest
-@BINPATH@/components/cloudfile.xpt
-@BINPATH@/components/addrbook.xpt
-@BINPATH@/components/fts3tok.xpt
-@BINPATH@/components/folderLookupService.js
+@RESPATH@/components/aboutRedirector.js
+@RESPATH@/components/activity.xpt
+@RESPATH@/components/activityComponents.manifest
+@RESPATH@/components/cloudFileComponents.manifest
+@RESPATH@/components/cloudfile.xpt
+@RESPATH@/components/addrbook.xpt
+@RESPATH@/components/fts3tok.xpt
+@RESPATH@/components/folderLookupService.js
 ; interfaces.manifest doesn't get packaged because it is dynamically
 ; re-created at packaging time when linking the xpts that will actually
 ; go into the package, so the test related interfaces aren't included.
-@BINPATH@/components/mime.xpt
-@BINPATH@/components/mimeJSComponents.js
-@BINPATH@/components/msgMime.manifest
-@BINPATH@/components/steel.xpt
-@BINPATH@/components/msgAsyncPrompter.js
-@BINPATH@/components/msgbase.xpt
-@BINPATH@/components/msgBase.manifest
-@BINPATH@/components/msgcompose.xpt
-@BINPATH@/components/msgdb.xpt
-@BINPATH@/components/msgimap.xpt
-@BINPATH@/components/msglocal.xpt
-@BINPATH@/components/msgnews.xpt
-@BINPATH@/components/msgsearch.xpt
-@BINPATH@/components/import.xpt
-@BINPATH@/components/mailcompsbase.xpt
-@BINPATH@/components/mailview.xpt
-@BINPATH@/components/mailprofilemigration.xpt
-@BINPATH@/components/XULStore.js
-@BINPATH@/components/XULStore.manifest
-@BINPATH@/components/messageWakeupService.js
-@BINPATH@/components/messageWakeupService.manifest
-@BINPATH@/components/nsActivity.js
-@BINPATH@/components/nsActivityManager.js
-@BINPATH@/components/nsActivityManagerUI.js
-@BINPATH@/components/nsHightail.js
-@BINPATH@/components/nsBox.js
-@BINPATH@/components/nsAddrbook.manifest
-@BINPATH@/components/nsMailNewsCommandLineHandler.js
-@BINPATH@/components/nsNewsAutoCompleteSearch.js
-@BINPATH@/components/nsNewsAutoCompleteSearch.manifest
-@BINPATH@/components/services-crypto-component.xpt
-@BINPATH@/components/shellservice.xpt
-@BINPATH@/components/xpcom_base.xpt
-@BINPATH@/components/xpcom_system.xpt
-@BINPATH@/components/xpcom_components.xpt
-@BINPATH@/components/xpcom_ds.xpt
-@BINPATH@/components/xpcom_io.xpt
-@BINPATH@/components/xpcom_threads.xpt
-@BINPATH@/components/xpcom_xpti.xpt
-@BINPATH@/chrome/toolkit@JAREXT@
-@BINPATH@/chrome/toolkit.manifest
-@BINPATH@/chrome/comm@JAREXT@
-@BINPATH@/chrome/comm.manifest
-@BINPATH@/chrome/messenger@JAREXT@
-@BINPATH@/chrome/messenger.manifest
+@RESPATH@/components/mime.xpt
+@RESPATH@/components/mimeJSComponents.js
+@RESPATH@/components/msgMime.manifest
+@RESPATH@/components/steel.xpt
+@RESPATH@/components/msgAsyncPrompter.js
+@RESPATH@/components/msgbase.xpt
+@RESPATH@/components/msgBase.manifest
+@RESPATH@/components/msgcompose.xpt
+@RESPATH@/components/msgdb.xpt
+@RESPATH@/components/msgimap.xpt
+@RESPATH@/components/msglocal.xpt
+@RESPATH@/components/msgnews.xpt
+@RESPATH@/components/msgsearch.xpt
+@RESPATH@/components/import.xpt
+@RESPATH@/components/mailcompsbase.xpt
+@RESPATH@/components/mailview.xpt
+@RESPATH@/components/mailprofilemigration.xpt
+@RESPATH@/components/XULStore.js
+@RESPATH@/components/XULStore.manifest
+@RESPATH@/components/messageWakeupService.js
+@RESPATH@/components/messageWakeupService.manifest
+@RESPATH@/components/nsActivity.js
+@RESPATH@/components/nsActivityManager.js
+@RESPATH@/components/nsActivityManagerUI.js
+@RESPATH@/components/nsHightail.js
+@RESPATH@/components/nsBox.js
+@RESPATH@/components/nsAddrbook.manifest
+@RESPATH@/components/nsMailNewsCommandLineHandler.js
+@RESPATH@/components/nsNewsAutoCompleteSearch.js
+@RESPATH@/components/nsNewsAutoCompleteSearch.manifest
+@RESPATH@/components/services-crypto-component.xpt
+@RESPATH@/components/shellservice.xpt
+@RESPATH@/components/xpcom_base.xpt
+@RESPATH@/components/xpcom_system.xpt
+@RESPATH@/components/xpcom_components.xpt
+@RESPATH@/components/xpcom_ds.xpt
+@RESPATH@/components/xpcom_io.xpt
+@RESPATH@/components/xpcom_threads.xpt
+@RESPATH@/components/xpcom_xpti.xpt
+@RESPATH@/chrome/toolkit@JAREXT@
+@RESPATH@/chrome/toolkit.manifest
+@RESPATH@/chrome/comm@JAREXT@
+@RESPATH@/chrome/comm.manifest
+@RESPATH@/chrome/messenger@JAREXT@
+@RESPATH@/chrome/messenger.manifest
 #ifndef XP_UNIX
-@BINPATH@/chrome/icons/default/abcardWindow.ico
-@BINPATH@/chrome/icons/default/addressbookWindow.ico
-@BINPATH@/chrome/icons/default/messengerWindow.ico
-@BINPATH@/chrome/icons/default/msgcomposeWindow.ico
+@RESPATH@/chrome/icons/default/abcardWindow.ico
+@RESPATH@/chrome/icons/default/addressbookWindow.ico
+@RESPATH@/chrome/icons/default/messengerWindow.ico
+@RESPATH@/chrome/icons/default/msgcomposeWindow.ico
 #elifdef UNIX_BUT_NOT_MAC
-@BINPATH@/chrome/icons/default/*.png
+@RESPATH@/chrome/icons/default/*.png
 #endif
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 
 ; Gloda
-@BINPATH@/chrome/gloda@JAREXT@
-@BINPATH@/chrome/gloda.manifest
-@BINPATH@/components/glautocomp.js
-@BINPATH@/components/gloda.manifest
-@BINPATH@/components/jsmimeemitter.js
+@RESPATH@/chrome/gloda@JAREXT@
+@RESPATH@/chrome/gloda.manifest
+@RESPATH@/components/glautocomp.js
+@RESPATH@/components/gloda.manifest
+@RESPATH@/components/jsmimeemitter.js
 
 ; New message notification
-@BINPATH@/components/newMailNotificationService.js
+@RESPATH@/components/newMailNotificationService.js
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Mail Extensions (smime, etc.)
@@ -277,106 +275,102 @@
 #ifdef MOZ_MAPI_SUPPORT
 @BINPATH@/MapiProxy.dll
 @BINPATH@/mozMapi32.dll
-@BINPATH@/components/mapihook.xpt
+@RESPATH@/components/mapihook.xpt
 #endif
-@BINPATH@/components/mailComponents.manifest
-@BINPATH@/components/mailContentHandler.js
-@BINPATH@/components/mailGlue.js
-@BINPATH@/components/nsMailDefaultHandler.js
-@BINPATH@/components/nsSetDefaultMail.js
-@BINPATH@/components/shell.manifest
-@BINPATH@/components/offlineStartup.js
-@BINPATH@/components/offlineStartup.manifest
-@BINPATH@/components/steelApplication.js
-@BINPATH@/components/steelApplication.manifest
-
-
-@BINPATH@/components/mdn-service.js
-@BINPATH@/components/mdn-service.manifest
-@BINPATH@/components/smime-service.js
-@BINPATH@/components/smime-service.manifest
-@BINPATH@/components/msgsmime.xpt
+@RESPATH@/components/mailComponents.manifest
+@RESPATH@/components/mailContentHandler.js
+@RESPATH@/components/mailGlue.js
+@RESPATH@/components/nsMailDefaultHandler.js
+@RESPATH@/components/nsSetDefaultMail.js
+@RESPATH@/components/shell.manifest
+@RESPATH@/components/offlineStartup.js
+@RESPATH@/components/offlineStartup.manifest
+@RESPATH@/components/steelApplication.js
+@RESPATH@/components/steelApplication.manifest
+
+
+@RESPATH@/components/mdn-service.js
+@RESPATH@/components/mdn-service.manifest
+@RESPATH@/components/smime-service.js
+@RESPATH@/components/smime-service.manifest
+@RESPATH@/components/msgsmime.xpt
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; instant messaging
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; shared with Instantbird
-@BINPATH@/@PREF_DIR@/chat-prefs.js
-@BINPATH@/chrome/chat@JAREXT@
-@BINPATH@/chrome/chat.manifest
-@BINPATH@/components/chat.xpt
-@BINPATH@/components/imAccounts.js
-@BINPATH@/components/imAccounts.manifest
-@BINPATH@/components/imCommands.js
-@BINPATH@/components/imCommands.manifest
-@BINPATH@/components/imContacts.js
-@BINPATH@/components/imContacts.manifest
-@BINPATH@/components/imConversations.js
-@BINPATH@/components/imConversations.manifest
-@BINPATH@/components/imCore.js
-@BINPATH@/components/imCore.manifest
-@BINPATH@/components/facebook.js
-@BINPATH@/components/facebook.manifest
-@BINPATH@/components/gtalk.js
-@BINPATH@/components/gtalk.manifest
-@BINPATH@/components/twitter.js
-@BINPATH@/components/twitter.manifest
-@BINPATH@/components/irc.js
-@BINPATH@/components/irc.manifest
-@BINPATH@/components/xmpp.js
-@BINPATH@/components/xmpp.manifest
-@BINPATH@/components/yahoo.js
-@BINPATH@/components/yahoo.manifest
-@BINPATH@/components/smileProtocolHandler.js
-@BINPATH@/components/smileProtocolHandler.manifest
-@BINPATH@/components/logger.js
-@BINPATH@/components/logger.manifest
+@RESPATH@/@PREF_DIR@/chat-prefs.js
+@RESPATH@/chrome/chat@JAREXT@
+@RESPATH@/chrome/chat.manifest
+@RESPATH@/components/chat.xpt
+@RESPATH@/components/imAccounts.js
+@RESPATH@/components/imAccounts.manifest
+@RESPATH@/components/imCommands.js
+@RESPATH@/components/imCommands.manifest
+@RESPATH@/components/imContacts.js
+@RESPATH@/components/imContacts.manifest
+@RESPATH@/components/imConversations.js
+@RESPATH@/components/imConversations.manifest
+@RESPATH@/components/imCore.js
+@RESPATH@/components/imCore.manifest
+@RESPATH@/components/facebook.js
+@RESPATH@/components/facebook.manifest
+@RESPATH@/components/gtalk.js
+@RESPATH@/components/gtalk.manifest
+@RESPATH@/components/twitter.js
+@RESPATH@/components/twitter.manifest
+@RESPATH@/components/irc.js
+@RESPATH@/components/irc.manifest
+@RESPATH@/components/xmpp.js
+@RESPATH@/components/xmpp.manifest
+@RESPATH@/components/yahoo.js
+@RESPATH@/components/yahoo.manifest
+@RESPATH@/components/smileProtocolHandler.js
+@RESPATH@/components/smileProtocolHandler.manifest
+@RESPATH@/components/logger.js
+@RESPATH@/components/logger.manifest
 
 ; Thunderbird specific
-@BINPATH@/@PREF_DIR@/all-im.js
-@BINPATH@/components/im.manifest
-@BINPATH@/components/imIncomingServer.js
-@BINPATH@/components/imProtocolInfo.js
+@RESPATH@/@PREF_DIR@/all-im.js
+@RESPATH@/components/im.manifest
+@RESPATH@/components/imIncomingServer.js
+@RESPATH@/components/imProtocolInfo.js
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Chrome Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-@BINPATH@/chrome/classic@JAREXT@
-@BINPATH@/chrome/classic.manifest
+@RESPATH@/chrome/classic@JAREXT@
+@RESPATH@/chrome/classic.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Default Profile Settings
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; default pref files
-@BINPATH@/defaults/pref/all-thunderbird.js
-@BINPATH@/defaults/pref/channel-prefs.js
-@BINPATH@/defaults/pref/composer.js
-@BINPATH@/defaults/pref/mailnews.js
-@BINPATH@/defaults/pref/mdn.js
-@BINPATH@/defaults/pref/smime.js
-@BINPATH@/defaults/pref/thunderbird-branding.js
-@BINPATH@/greprefs.js
+@RESPATH@/defaults/pref/all-thunderbird.js
+@RESPATH@/defaults/pref/channel-prefs.js
+@RESPATH@/defaults/pref/composer.js
+@RESPATH@/defaults/pref/mailnews.js
+@RESPATH@/defaults/pref/mdn.js
+@RESPATH@/defaults/pref/smime.js
+@RESPATH@/defaults/pref/thunderbird-branding.js
+@RESPATH@/greprefs.js
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; App extensions to Mail
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; LDAP components
-@BINPATH@/components/mozldap.xpt
-@BINPATH@/components/nsAbLDAPAttributeMap.js
-@BINPATH@/components/nsAbLDAPAutoCompleteSearch.js
-@BINPATH@/components/nsLDAPProtocolHandler.js
-@BINPATH@/components/ldapComponents.manifest
+@RESPATH@/components/mozldap.xpt
+@RESPATH@/components/nsAbLDAPAttributeMap.js
+@RESPATH@/components/nsAbLDAPAutoCompleteSearch.js
+@RESPATH@/components/nsLDAPProtocolHandler.js
+@RESPATH@/components/ldapComponents.manifest
 #ifdef XP_WIN32
 @BINPATH@/nsldap32v60@DLL_SUFFIX@
 @BINPATH@/nsldappr32v60@DLL_SUFFIX@
 @BINPATH@/nsldif32v60@DLL_SUFFIX@
-#elif defined(XP_MACOSX)
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@ldap60@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@ldif60@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@prldap60@DLL_SUFFIX@
 #else
 @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
@@ -384,311 +378,318 @@
 #endif
 
 ; login manager
-@BINPATH@/components/loginmgr.xpt
-@BINPATH@/components/nsLoginInfo.js
-@BINPATH@/components/nsLoginManager.js
-@BINPATH@/components/nsLoginManagerPrompter.js
-@BINPATH@/components/passwordmgr.manifest
-@BINPATH@/components/storage-json.js
-@BINPATH@/components/crypto-SDR.js
+@RESPATH@/components/loginmgr.xpt
+@RESPATH@/components/nsLoginInfo.js
+@RESPATH@/components/nsLoginManager.js
+@RESPATH@/components/nsLoginManagerPrompter.js
+@RESPATH@/components/passwordmgr.manifest
+@RESPATH@/components/storage-json.js
+@RESPATH@/components/crypto-SDR.js
 
 ; download progress
-@BINPATH@/components/nsHelperAppDlg.js
-@BINPATH@/components/nsHelperAppDlg.manifest
-@BINPATH@/components/nsDownloadManagerUI.js
-@BINPATH@/components/nsDownloadManagerUI.manifest
-@BINPATH@/components/downloads.xpt
+@RESPATH@/components/nsHelperAppDlg.js
+@RESPATH@/components/nsHelperAppDlg.manifest
+@RESPATH@/components/nsDownloadManagerUI.js
+@RESPATH@/components/nsDownloadManagerUI.manifest
+@RESPATH@/components/downloads.xpt
 
 ; Protocol/Content handling
-@BINPATH@/components/nsContentDispatchChooser.js
-@BINPATH@/components/nsContentDispatchChooser.manifest
-@BINPATH@/components/nsHandlerService.js
-@BINPATH@/components/nsHandlerService.manifest
-@BINPATH@/components/nsWebHandlerApp.js
-@BINPATH@/components/nsWebHandlerApp.manifest
-@BINPATH@/components/nsSMTPProtocolHandler.js
-@BINPATH@/components/nsSMTPProtocolHandler.manifest
+@RESPATH@/components/nsContentDispatchChooser.js
+@RESPATH@/components/nsContentDispatchChooser.manifest
+@RESPATH@/components/nsHandlerService.js
+@RESPATH@/components/nsHandlerService.manifest
+@RESPATH@/components/nsWebHandlerApp.js
+@RESPATH@/components/nsWebHandlerApp.manifest
+@RESPATH@/components/nsSMTPProtocolHandler.js
+@RESPATH@/components/nsSMTPProtocolHandler.manifest
 
 ; spellchecker (may not be present)
-@BINPATH@/components/spellchecker.xpt
+@RESPATH@/components/spellchecker.xpt
 
 ; misson control, autoconfig
-@BINPATH@/defaults/autoconfig/platform.js
-@BINPATH@/defaults/autoconfig/prefcalls.js
-@BINPATH@/components/autoconfig.xpt
+@RESPATH@/defaults/autoconfig/platform.js
+@RESPATH@/defaults/autoconfig/prefcalls.js
+@RESPATH@/components/autoconfig.xpt
 
 ; Phishing Protection
-@BINPATH@/components/phishing.manifest
-@BINPATH@/components/nsPhishingProtectionApplication.js
-@BINPATH@/components/nsUrlClassifierListManager.js
-@BINPATH@/components/nsUrlClassifierHashCompleter.js
-@BINPATH@/components/nsUrlClassifierLib.js
-@BINPATH@/components/nsURLClassifier.manifest
-@BINPATH@/components/url-classifier.xpt
+@RESPATH@/components/phishing.manifest
+@RESPATH@/components/nsPhishingProtectionApplication.js
+@RESPATH@/components/nsUrlClassifierListManager.js
+@RESPATH@/components/nsUrlClassifierHashCompleter.js
+@RESPATH@/components/nsUrlClassifierLib.js
+@RESPATH@/components/nsURLClassifier.manifest
+@RESPATH@/components/url-classifier.xpt
 
 ; Address Book autocomplete
-@BINPATH@/components/nsAbAutoCompleteMyDomain.js
-@BINPATH@/components/nsAbAutoCompleteSearch.js
+@RESPATH@/components/nsAbAutoCompleteMyDomain.js
+@RESPATH@/components/nsAbAutoCompleteSearch.js
 
 ; Windows Search integration
 ; the module is included as part of the "Modules" rule
 #ifdef XP_WIN32
-@BINPATH@/components/mailwinsearch.xpt
+@RESPATH@/components/mailwinsearch.xpt
 @BINPATH@/WSEnable.exe
 #endif
 
 ; Bayesian trait analysis
-@BINPATH@/components/nsMsgTraitService.js
-@BINPATH@/components/nsMsgTraitService.manifest
+@RESPATH@/components/nsMsgTraitService.js
+@RESPATH@/components/nsMsgTraitService.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Base Package Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; xpconnect
-@BINPATH@/components/xpconnect.xpt
+@RESPATH@/components/xpconnect.xpt
 
 ; XP widgets/graphics
-@BINPATH@/components/widget.xpt
+@RESPATH@/components/widget.xpt
 #ifdef XP_MACOSX
-@BINPATH@/components/widget_cocoa.xpt
+@RESPATH@/components/widget_cocoa.xpt
 #endif
-@BINPATH@/components/gfx.xpt
+@RESPATH@/components/gfx.xpt
 
 ; layout
-@BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_xslt.xpt
-@BINPATH@/components/html5.xpt
-@BINPATH@/components/htmlparser.xpt
-@BINPATH@/components/identity.xpt
-@BINPATH@/components/layout_base.xpt
+@RESPATH@/components/content_events.xpt
+@RESPATH@/components/content_html.xpt
+@RESPATH@/components/content_xslt.xpt
+@RESPATH@/components/html5.xpt
+@RESPATH@/components/htmlparser.xpt
+@RESPATH@/components/identity.xpt
+@RESPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
-@BINPATH@/components/layout_printing.xpt
+@RESPATH@/components/layout_printing.xpt
 #endif
-@BINPATH@/components/layout_xul.xpt
-@BINPATH@/components/xulapp.xpt
-@BINPATH@/components/xul.xpt
-@BINPATH@/components/xultmpl.xpt
+@RESPATH@/components/layout_xul.xpt
+@RESPATH@/components/xulapp.xpt
+@RESPATH@/components/xul.xpt
+@RESPATH@/components/xultmpl.xpt
 
-@BINPATH@/components/inspector.xpt
+@RESPATH@/components/inspector.xpt
 
 ; Imaging:
-@BINPATH@/components/imgicon.xpt
-@BINPATH@/components/imglib2.xpt
+@RESPATH@/components/imgicon.xpt
+@RESPATH@/components/imglib2.xpt
 
 ; accessibility (out of process API support)
 #ifdef ACCESSIBILITY
-@BINPATH@/components/accessibility.xpt
+@RESPATH@/components/accessibility.xpt
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
 #endif
 
 ; caps (JavaScript security)
-@BINPATH@/components/caps.xpt
+@RESPATH@/components/caps.xpt
 
 ; glue: appshell, docshell, uriloader, chrome, components
-@BINPATH@/components/appshell.xpt
-@BINPATH@/components/appstartup.xpt
-@BINPATH@/components/docshell.xpt
-@BINPATH@/components/uriloader.xpt
-@BINPATH@/components/webBrowser_core.xpt
-@BINPATH@/components/windowwatcher.xpt
-@BINPATH@/components/webbrowserpersist.xpt
-@BINPATH@/components/commandhandler.xpt
+@RESPATH@/components/appshell.xpt
+@RESPATH@/components/appstartup.xpt
+@RESPATH@/components/docshell.xpt
+@RESPATH@/components/uriloader.xpt
+@RESPATH@/components/webBrowser_core.xpt
+@RESPATH@/components/windowwatcher.xpt
+@RESPATH@/components/webbrowserpersist.xpt
+@RESPATH@/components/commandhandler.xpt
 
 ; jar
-@BINPATH@/components/jar.xpt
+@RESPATH@/components/jar.xpt
 
 ; prefs
-@BINPATH@/components/pref.xpt
+@RESPATH@/components/pref.xpt
 
 ; profile
-@BINPATH@/components/profile.xpt
-@BINPATH@/components/toolkitprofile.xpt
-@BINPATH@/components/toolkit_finalizationwitness.xpt
+@RESPATH@/components/profile.xpt
+@RESPATH@/components/toolkitprofile.xpt
+@RESPATH@/components/toolkit_finalizationwitness.xpt
 
 ; toolkit
-@BINPATH@/components/AppsService.js
-@BINPATH@/components/AppsService.manifest
-@BINPATH@/components/BrowserElementParent.js
-@BINPATH@/components/BrowserElementParent.manifest
-@BINPATH@/components/ColorAnalyzer.js
-@BINPATH@/components/Identity.manifest
-@BINPATH@/components/PageThumbsProtocol.js
-@BINPATH@/components/PermissionSettings.js
-@BINPATH@/components/SettingsManager.js
-@BINPATH@/components/SettingsManager.manifest
-@BINPATH@/components/SiteSpecificUserAgent.js
-@BINPATH@/components/SiteSpecificUserAgent.manifest
-@BINPATH@/components/Webapps.js
-@BINPATH@/components/Webapps.manifest
-@BINPATH@/components/browser-element.xpt
-@BINPATH@/components/commandlines.xpt
-@BINPATH@/components/chrome.xpt
-@BINPATH@/components/cryptoComponents.manifest
-@BINPATH@/components/Downloads.manifest
-@BINPATH@/components/DownloadLegacy.js
-@BINPATH@/components/crashmonitor.manifest
-@BINPATH@/components/nsCrashMonitor.js
-@BINPATH@/components/nsDefaultCLH.js
-@BINPATH@/components/nsDefaultCLH.manifest
-@BINPATH@/components/nsDOMIdentity.js
-@BINPATH@/components/nsFormAutoComplete.js
-@BINPATH@/components/nsFormHistory.js
-@BINPATH@/components/FormHistoryStartup.js
-@BINPATH@/components/UnifiedComplete.manifest
-@BINPATH@/components/UnifiedComplete.js
-@BINPATH@/components/nsAsyncShutdown.manifest
-@BINPATH@/components/nsAsyncShutdown.js
-@BINPATH@/components/nsIDService.js
-@BINPATH@/components/nsInputListAutoComplete.js
-@BINPATH@/components/nsLivemarkService.js
-@BINPATH@/components/nsPlacesAutoComplete.js
-@BINPATH@/components/nsPlacesAutoComplete.manifest
-@BINPATH@/components/nsPlacesExpiration.js
-@BINPATH@/components/nsPrompter.js
-@BINPATH@/components/nsPrompter.manifest
-@BINPATH@/components/nsSearchService.js
-@BINPATH@/components/nsSearchSuggestions.js
-@BINPATH@/components/nsTaggingService.js
-@BINPATH@/components/PlacesCategoriesStarter.js
-@BINPATH@/components/servicesComponents.manifest
-@BINPATH@/components/TCPSocket.js
-@BINPATH@/components/TCPServerSocket.js
-@BINPATH@/components/TCPSocketParentIntermediary.js
-@BINPATH@/components/TCPSocket.manifest
+@RESPATH@/components/AppsService.js
+@RESPATH@/components/AppsService.manifest
+@RESPATH@/components/BrowserElementParent.js
+@RESPATH@/components/BrowserElementParent.manifest
+@RESPATH@/components/ColorAnalyzer.js
+@RESPATH@/components/Identity.manifest
+@RESPATH@/components/PageThumbsProtocol.js
+@RESPATH@/components/PermissionSettings.js
+@RESPATH@/components/SettingsManager.js
+@RESPATH@/components/SettingsManager.manifest
+@RESPATH@/components/SiteSpecificUserAgent.js
+@RESPATH@/components/SiteSpecificUserAgent.manifest
+@RESPATH@/components/Webapps.js
+@RESPATH@/components/Webapps.manifest
+@RESPATH@/components/browser-element.xpt
+@RESPATH@/components/commandlines.xpt
+@RESPATH@/components/chrome.xpt
+@RESPATH@/components/cryptoComponents.manifest
+@RESPATH@/components/Downloads.manifest
+@RESPATH@/components/DownloadLegacy.js
+@RESPATH@/components/crashmonitor.manifest
+@RESPATH@/components/nsCrashMonitor.js
+@RESPATH@/components/nsDefaultCLH.js
+@RESPATH@/components/nsDefaultCLH.manifest
+@RESPATH@/components/nsDOMIdentity.js
+@RESPATH@/components/nsFormAutoComplete.js
+@RESPATH@/components/nsFormHistory.js
+@RESPATH@/components/FormHistoryStartup.js
+@RESPATH@/components/UnifiedComplete.manifest
+@RESPATH@/components/UnifiedComplete.js
+@RESPATH@/components/nsAsyncShutdown.manifest
+@RESPATH@/components/nsAsyncShutdown.js
+@RESPATH@/components/nsIDService.js
+@RESPATH@/components/nsInputListAutoComplete.js
+@RESPATH@/components/nsLivemarkService.js
+@RESPATH@/components/nsPlacesAutoComplete.js
+@RESPATH@/components/nsPlacesAutoComplete.manifest
+@RESPATH@/components/nsPlacesExpiration.js
+@RESPATH@/components/nsPrompter.js
+@RESPATH@/components/nsPrompter.manifest
+@RESPATH@/components/nsSearchService.js
+@RESPATH@/components/nsSearchSuggestions.js
+@RESPATH@/components/nsTaggingService.js
+@RESPATH@/components/PlacesCategoriesStarter.js
+@RESPATH@/components/servicesComponents.manifest
+@RESPATH@/components/TCPSocket.js
+@RESPATH@/components/TCPServerSocket.js
+@RESPATH@/components/TCPSocketParentIntermediary.js
+@RESPATH@/components/TCPSocket.manifest
+@RESPATH@/components/TelemetryStartup.js
+@RESPATH@/components/TelemetryStartup.manifest
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/PeerConnection.js
-@BINPATH@/components/PeerConnection.manifest
+@RESPATH@/components/PeerConnection.js
+@RESPATH@/components/PeerConnection.manifest
 #endif
-@BINPATH@/components/toolkit_asyncshutdown.xpt
-@BINPATH@/components/toolkit_filewatcher.xpt
-@BINPATH@/components/toolkit_formautofill.xpt
-@BINPATH@/components/toolkit_osfile.xpt
-@BINPATH@/components/toolkit_xulstore.xpt
-@BINPATH@/components/toolkitplaces.manifest
-@BINPATH@/components/toolkitsearch.manifest
+@RESPATH@/components/toolkit_asyncshutdown.xpt
+@RESPATH@/components/toolkit_filewatcher.xpt
+@RESPATH@/components/toolkit_formautofill.xpt
+@RESPATH@/components/toolkit_osfile.xpt
+@RESPATH@/components/toolkit_xulstore.xpt
+@RESPATH@/components/toolkitplaces.manifest
+@RESPATH@/components/toolkitsearch.manifest
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/components/toolkitremote.xpt
+@RESPATH@/components/toolkitremote.xpt
 #endif
 #ifdef MOZ_GTK2
-@BINPATH@/components/filepicker.xpt
-@BINPATH@/components/nsFilePicker.js
-@BINPATH@/components/nsFilePicker.manifest
+@RESPATH@/components/filepicker.xpt
+@RESPATH@/components/nsFilePicker.js
+@RESPATH@/components/nsFilePicker.manifest
 #endif
 #ifdef MOZ_ENABLE_DBUS
-@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@BINPATH@/components/profiler.xpt
+@RESPATH@/components/profiler.xpt
 #endif
+@RESPATH@/components/ProcessSingleton.manifest
+@RESPATH@/components/MainProcessSingleton.js
+@RESPATH@/components/ContentProcessSingleton.js
+@RESPATH@/components/nsTerminatorTelemetry.js
+@RESPATH@/components/terminator.manifest
 
 ; rdf
-@BINPATH@/components/rdf.xpt
+@RESPATH@/components/rdf.xpt
 
 ; required i18n libraries
-@BINPATH@/components/intl.xpt
-@BINPATH@/components/locale.xpt
-@BINPATH@/components/uconv.xpt
-@BINPATH@/components/commuconv.xpt
-@BINPATH@/components/unicharutil.xpt
+@RESPATH@/components/intl.xpt
+@RESPATH@/components/locale.xpt
+@RESPATH@/components/uconv.xpt
+@RESPATH@/components/commuconv.xpt
+@RESPATH@/components/unicharutil.xpt
 
 ; dom
-@BINPATH@/components/dom.xpt
-@BINPATH@/components/dom_alarm.xpt
-@BINPATH@/components/dom_apps.xpt
-@BINPATH@/components/dom_base.xpt
-@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_core.xpt
-@BINPATH@/components/dom_css.xpt
-@BINPATH@/components/dom_devicestorage.xpt
-@BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_gamepad.xpt
-@BINPATH@/components/dom_geolocation.xpt
-@BINPATH@/components/dom_html.xpt
-@BINPATH@/components/dom_json.xpt
-@BINPATH@/components/dom_media.xpt
-@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_network.xpt
-@BINPATH@/components/dom_notification.xpt
-@BINPATH@/components/dom_offline.xpt
-@BINPATH@/components/dom_permissionsettings.xpt
-@BINPATH@/components/dom_power.xpt
-@BINPATH@/components/dom_quota.xpt
-@BINPATH@/components/dom_range.xpt
-@BINPATH@/components/dom_security.xpt
-@BINPATH@/components/dom_settings.xpt
-@BINPATH@/components/dom_sidebar.xpt
-@BINPATH@/components/dom_smil.xpt
-@BINPATH@/components/dom_storage.xpt
-@BINPATH@/components/dom_stylesheets.xpt
-@BINPATH@/components/dom_system.xpt
-@BINPATH@/components/dom_traversal.xpt
-@BINPATH@/components/dom_tv.xpt
-@BINPATH@/components/dom_webspeechrecognition.xpt
-@BINPATH@/components/dom_webspeechsynth.xpt
-@BINPATH@/components/dom_xbl.xpt
-@BINPATH@/components/dom_xul.xpt
-@BINPATH@/components/NetworkGeolocationProvider.js
-@BINPATH@/components/NetworkGeolocationProvider.manifest
+@RESPATH@/components/dom.xpt
+@RESPATH@/components/dom_alarm.xpt
+@RESPATH@/components/dom_apps.xpt
+@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_canvas.xpt
+@RESPATH@/components/dom_core.xpt
+@RESPATH@/components/dom_css.xpt
+@RESPATH@/components/dom_devicestorage.xpt
+@RESPATH@/components/dom_events.xpt
+@RESPATH@/components/dom_gamepad.xpt
+@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_html.xpt
+@RESPATH@/components/dom_json.xpt
+@RESPATH@/components/dom_media.xpt
+@RESPATH@/components/dom_mobilemessage.xpt
+@RESPATH@/components/dom_network.xpt
+@RESPATH@/components/dom_notification.xpt
+@RESPATH@/components/dom_offline.xpt
+@RESPATH@/components/dom_permissionsettings.xpt
+@RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_quota.xpt
+@RESPATH@/components/dom_range.xpt
+@RESPATH@/components/dom_security.xpt
+@RESPATH@/components/dom_settings.xpt
+@RESPATH@/components/dom_sidebar.xpt
+@RESPATH@/components/dom_smil.xpt
+@RESPATH@/components/dom_storage.xpt
+@RESPATH@/components/dom_stylesheets.xpt
+@RESPATH@/components/dom_system.xpt
+@RESPATH@/components/dom_traversal.xpt
+@RESPATH@/components/dom_tv.xpt
+@RESPATH@/components/dom_webspeechrecognition.xpt
+@RESPATH@/components/dom_webspeechsynth.xpt
+@RESPATH@/components/dom_xbl.xpt
+@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/NetworkGeolocationProvider.js
+@RESPATH@/components/NetworkGeolocationProvider.manifest
 
 ; editor / composer for HTML compose
-@BINPATH@/components/editor.xpt
-@BINPATH@/components/composer.xpt
-@BINPATH@/components/txmgr.xpt
+@RESPATH@/components/editor.xpt
+@RESPATH@/components/composer.xpt
+@RESPATH@/components/txmgr.xpt
 
 ; find functionality
-@BINPATH@/components/txtsvc.xpt
+@RESPATH@/components/txtsvc.xpt
 
 ; moz storage
-@BINPATH@/components/storage.xpt
+@RESPATH@/components/storage.xpt
 
 ; netwerk
-@BINPATH@/components/necko.xpt
-@BINPATH@/components/necko_about.xpt
-@BINPATH@/components/necko_dns.xpt
-@BINPATH@/components/necko_http.xpt
-@BINPATH@/components/necko_ipc.xpt
-@BINPATH@/components/necko_res.xpt
-@BINPATH@/components/necko_strconv.xpt
-@BINPATH@/components/necko_file.xpt
-@BINPATH@/components/necko_ftp.xpt
-@BINPATH@/components/necko_cache.xpt
-@BINPATH@/components/necko_cache2.xpt
-@BINPATH@/components/necko_cookie.xpt
-@BINPATH@/components/necko_socket.xpt
-@BINPATH@/components/necko_viewsource.xpt
-@BINPATH@/components/necko_websocket.xpt
+@RESPATH@/components/necko.xpt
+@RESPATH@/components/necko_about.xpt
+@RESPATH@/components/necko_dns.xpt
+@RESPATH@/components/necko_http.xpt
+@RESPATH@/components/necko_ipc.xpt
+@RESPATH@/components/necko_res.xpt
+@RESPATH@/components/necko_strconv.xpt
+@RESPATH@/components/necko_file.xpt
+@RESPATH@/components/necko_ftp.xpt
+@RESPATH@/components/necko_cache.xpt
+@RESPATH@/components/necko_cache2.xpt
+@RESPATH@/components/necko_cookie.xpt
+@RESPATH@/components/necko_socket.xpt
+@RESPATH@/components/necko_viewsource.xpt
+@RESPATH@/components/necko_websocket.xpt
 #ifdef NECKO_WIFI
-@BINPATH@/components/necko_wifi.xpt
+@RESPATH@/components/necko_wifi.xpt
 #endif
-@BINPATH@/components/necko_wyciwyg.xpt
+@RESPATH@/components/necko_wyciwyg.xpt
 
 ; extensions
-@BINPATH@/components/addonManager.js
-@BINPATH@/components/amContentHandler.js
-@BINPATH@/components/amWebInstallListener.js
-@BINPATH@/components/nsBlocklistService.js
+@RESPATH@/components/addonManager.js
+@RESPATH@/components/amContentHandler.js
+@RESPATH@/components/amWebInstallListener.js
+@RESPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
-@BINPATH@/components/nsUpdateService.js
-@BINPATH@/components/nsUpdateService.manifest
-@BINPATH@/components/nsUpdateServiceStub.js
-#endif
-@BINPATH@/components/nsUpdateTimerManager.js
-@BINPATH@/components/nsUpdateTimerManager.manifest
-@BINPATH@/components/extensions.xpt
-@BINPATH@/components/extensions.manifest
-@BINPATH@/components/update.xpt
+@RESPATH@/components/nsUpdateService.js
+@RESPATH@/components/nsUpdateService.manifest
+@RESPATH@/components/nsUpdateServiceStub.js
+#endif
+@RESPATH@/components/nsUpdateTimerManager.js
+@RESPATH@/components/nsUpdateTimerManager.manifest
+@RESPATH@/components/extensions.xpt
+@RESPATH@/components/extensions.manifest
+@RESPATH@/components/update.xpt
 #ifdef MOZ_WEBSERVICES
-@BINPATH@/components/websrvcs.xpt
+@RESPATH@/components/websrvcs.xpt
 #endif
-@BINPATH@/components/nsURLFormatter.js
-@BINPATH@/components/nsURLFormatter.manifest
-@BINPATH@/components/urlformatter.xpt
-@BINPATH@/components/nsContentPrefService.js
-@BINPATH@/components/nsContentPrefService.manifest
+@RESPATH@/components/nsURLFormatter.js
+@RESPATH@/components/nsURLFormatter.manifest
+@RESPATH@/components/urlformatter.xpt
+@RESPATH@/components/nsContentPrefService.js
+@RESPATH@/components/nsContentPrefService.manifest
 
 ; [Personal Security Manager]
 ;
@@ -696,45 +697,29 @@
 ; meaning their .chk files are created there directly.
 ;
 #ifndef MOZ_NATIVE_NSS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@freebl3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nss3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#endif
 #ifndef NSS_DISABLE_DBM
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@softokn3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
-#endif
-@BINPATH@/chrome/pippki@JAREXT@
-@BINPATH@/chrome/pippki.manifest
-@BINPATH@/components/pipboot.xpt
-@BINPATH@/components/pipnss.xpt
-@BINPATH@/components/pippki.xpt
+@RESPATH@/chrome/pippki@JAREXT@
+@RESPATH@/chrome/pippki.manifest
+@RESPATH@/components/pipboot.xpt
+@RESPATH@/components/pipnss.xpt
+@RESPATH@/components/pippki.xpt
 
 ; For process sandboxing
+#if defined(MOZ_SANDBOX)
 #if defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
-#elif defined(XP_LINUX)
-#if defined(MOZ_CONTENT_SANDBOX) || defined(MOZ_GMP_SANDBOX)
-@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
 #endif
 #endif
 
@@ -746,104 +731,104 @@
 #endif
 
 ; core platform files
-@BINPATH@/components/FeedProcessor.js
-@BINPATH@/components/FeedProcessor.manifest
-@BINPATH@/components/FormAutofillContentService.js
-@BINPATH@/components/FormAutofillStartup.js
-@BINPATH@/components/formautofill.manifest
-@BINPATH@/components/autocomplete.xpt
-@BINPATH@/components/alerts.xpt
-@BINPATH@/components/jsdebugger.xpt
-@BINPATH@/components/jsdownloads.xpt
-@BINPATH@/components/jsinspector.xpt
-@BINPATH@/components/fastfind.xpt
-@BINPATH@/components/find.xpt
-@BINPATH@/components/ConsoleAPIStorage.js
-@BINPATH@/components/ConsoleAPI.manifest
-@BINPATH@/components/ContactManager.js
-@BINPATH@/components/ContactManager.manifest
-@BINPATH@/components/contentAreaDropListener.js
-@BINPATH@/components/contentAreaDropListener.manifest
+@RESPATH@/components/FeedProcessor.js
+@RESPATH@/components/FeedProcessor.manifest
+@RESPATH@/components/FormAutofillContentService.js
+@RESPATH@/components/FormAutofillStartup.js
+@RESPATH@/components/formautofill.manifest
+@RESPATH@/components/autocomplete.xpt
+@RESPATH@/components/alerts.xpt
+@RESPATH@/components/jsdebugger.xpt
+@RESPATH@/components/jsdownloads.xpt
+@RESPATH@/components/jsinspector.xpt
+@RESPATH@/components/fastfind.xpt
+@RESPATH@/components/find.xpt
+@RESPATH@/components/ConsoleAPIStorage.js
+@RESPATH@/components/ConsoleAPI.manifest
+@RESPATH@/components/ContactManager.js
+@RESPATH@/components/ContactManager.manifest
+@RESPATH@/components/contentAreaDropListener.js
+@RESPATH@/components/contentAreaDropListener.manifest
 #ifdef MOZ_DATA_REPORTING
-@BINPATH@/components/DataReporting.manifest
-@BINPATH@/components/DataReportingService.js
+@RESPATH@/components/DataReporting.manifest
+@RESPATH@/components/DataReportingService.js
 #endif
-@BINPATH@/components/devtools_security.xpt
-@BINPATH@/components/directory.xpt
-@BINPATH@/components/jsconsole-clhandler.js
-@BINPATH@/components/jsconsole-clhandler.manifest
-@BINPATH@/components/layout_xul_tree.xpt
-@BINPATH@/components/mozfind.xpt
-@BINPATH@/components/mimetype.xpt
-@BINPATH@/components/parentalcontrols.xpt
+@RESPATH@/components/devtools_security.xpt
+@RESPATH@/components/directory.xpt
+@RESPATH@/components/jsconsole-clhandler.js
+@RESPATH@/components/jsconsole-clhandler.manifest
+@RESPATH@/components/layout_xul_tree.xpt
+@RESPATH@/components/mozfind.xpt
+@RESPATH@/components/mimetype.xpt
+@RESPATH@/components/parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/peerconnection.xpt
+@RESPATH@/components/peerconnection.xpt
 #endif
-@BINPATH@/components/exthandler.xpt
-@BINPATH@/components/exthelper.xpt
-@BINPATH@/components/embed_base.xpt
-@BINPATH@/components/windowds.xpt
-@BINPATH@/components/dom_xpath.xpt
-@BINPATH@/components/lwbrk.xpt
-@BINPATH@/components/nsINIProcessor.js
-@BINPATH@/components/nsINIProcessor.manifest
-@BINPATH@/components/pluginGlue.manifest
-@BINPATH@/components/txEXSLTRegExFunctions.js
-@BINPATH@/components/txEXSLTRegExFunctions.manifest
-@BINPATH@/components/feeds.xpt
-@BINPATH@/components/saxparser.xpt
-@BINPATH@/components/satchel.manifest
-@BINPATH@/components/satchel.xpt
-@BINPATH@/components/shistory.xpt
-@BINPATH@/components/telemetry.xpt
-@BINPATH@/components/zipwriter.xpt
-@BINPATH@/components/cookie.xpt
-@BINPATH@/components/places.xpt
-@BINPATH@/components/plugin.xpt
-@BINPATH@/components/prefetch.xpt
-@BINPATH@/res/langGroups.properties
-@BINPATH@/res/language.properties
-@BINPATH@/res/entityTables/*
-@BINPATH@/res/dtd/*
-@BINPATH@/res/fonts/*
-@BINPATH@/res/contenteditable.css
-@BINPATH@/res/designmode.css
-@BINPATH@/res/html/folder.png
+@RESPATH@/components/exthandler.xpt
+@RESPATH@/components/exthelper.xpt
+@RESPATH@/components/embed_base.xpt
+@RESPATH@/components/windowds.xpt
+@RESPATH@/components/dom_xpath.xpt
+@RESPATH@/components/lwbrk.xpt
+@RESPATH@/components/nsINIProcessor.js
+@RESPATH@/components/nsINIProcessor.manifest
+@RESPATH@/components/pluginGlue.manifest
+@RESPATH@/components/txEXSLTRegExFunctions.js
+@RESPATH@/components/txEXSLTRegExFunctions.manifest
+@RESPATH@/components/feeds.xpt
+@RESPATH@/components/saxparser.xpt
+@RESPATH@/components/satchel.manifest
+@RESPATH@/components/satchel.xpt
+@RESPATH@/components/shistory.xpt
+@RESPATH@/components/telemetry.xpt
+@RESPATH@/components/zipwriter.xpt
+@RESPATH@/components/cookie.xpt
+@RESPATH@/components/places.xpt
+@RESPATH@/components/plugin.xpt
+@RESPATH@/components/prefetch.xpt
+@RESPATH@/res/langGroups.properties
+@RESPATH@/res/language.properties
+@RESPATH@/res/entityTables/*
+@RESPATH@/res/dtd/*
+@RESPATH@/res/fonts/*
+@RESPATH@/res/contenteditable.css
+@RESPATH@/res/designmode.css
+@RESPATH@/res/html/folder.png
 #ifdef XP_MACOSX
-@BINPATH@/res/cursors/
-@BINPATH@/res/MainMenu.nib/
+@RESPATH@/res/cursors/
+@RESPATH@/res/MainMenu.nib/
 #endif
 
 ; editor resource files
-@BINPATH@/res/EditorOverride.css
-@BINPATH@/res/grabber.gif
-@BINPATH@/res/table-add-column-after-active.gif
-@BINPATH@/res/table-add-column-after-hover.gif
-@BINPATH@/res/table-add-column-after.gif
-@BINPATH@/res/table-add-column-before-active.gif
-@BINPATH@/res/table-add-column-before-hover.gif
-@BINPATH@/res/table-add-column-before.gif
-@BINPATH@/res/table-add-row-after-active.gif
-@BINPATH@/res/table-add-row-after-hover.gif
-@BINPATH@/res/table-add-row-after.gif
-@BINPATH@/res/table-add-row-before-active.gif
-@BINPATH@/res/table-add-row-before-hover.gif
-@BINPATH@/res/table-add-row-before.gif
-@BINPATH@/res/table-remove-column-active.gif
-@BINPATH@/res/table-remove-column-hover.gif
-@BINPATH@/res/table-remove-column.gif
-@BINPATH@/res/table-remove-row-active.gif
-@BINPATH@/res/table-remove-row-hover.gif
-@BINPATH@/res/table-remove-row.gif
+@RESPATH@/res/EditorOverride.css
+@RESPATH@/res/grabber.gif
+@RESPATH@/res/table-add-column-after-active.gif
+@RESPATH@/res/table-add-column-after-hover.gif
+@RESPATH@/res/table-add-column-after.gif
+@RESPATH@/res/table-add-column-before-active.gif
+@RESPATH@/res/table-add-column-before-hover.gif
+@RESPATH@/res/table-add-column-before.gif
+@RESPATH@/res/table-add-row-after-active.gif
+@RESPATH@/res/table-add-row-after-hover.gif
+@RESPATH@/res/table-add-row-after.gif
+@RESPATH@/res/table-add-row-before-active.gif
+@RESPATH@/res/table-add-row-before-hover.gif
+@RESPATH@/res/table-add-row-before.gif
+@RESPATH@/res/table-remove-column-active.gif
+@RESPATH@/res/table-remove-column-hover.gif
+@RESPATH@/res/table-remove-column.gif
+@RESPATH@/res/table-remove-row-active.gif
+@RESPATH@/res/table-remove-row-hover.gif
+@RESPATH@/res/table-remove-row.gif
 
 ; svg
-@BINPATH@/res/svg.css
-@BINPATH@/components/dom_svg.xpt
+@RESPATH@/res/svg.css
+@RESPATH@/components/dom_svg.xpt
 
 ; [Updater]
 #ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/updater.app/
+@BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
@@ -859,15 +844,15 @@
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
-@BINPATH@/components/CrashService.manifest
-@BINPATH@/components/CrashService.js
+@RESPATH@/components/CrashService.manifest
+@RESPATH@/components/CrashService.js
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/crashreporter.app/
+@BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
-@BINPATH@/crashreporter.ini
+@RESPATH@/crashreporter.ini
 #ifdef XP_UNIX
-@BINPATH@/Throbber-small.gif
+@RESPATH@/Throbber-small.gif
 #endif
 #endif
 #ifdef MOZ_CRASHREPORTER_INJECTOR
@@ -877,5 +862,5 @@
 
 ; GNOME hooks
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
-@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/chrome/messenger/charsetTitles.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/chrome/messenger/charsetTitles.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/chrome/messenger/charsetTitles.properties	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/chrome/messenger/charsetTitles.properties	2014-11-26 21:44:58.000000000 +0000
@@ -35,21 +35,17 @@
 euc-jp.title = Japanese (EUC-JP)
 big5.title = Chinese Traditional (Big5)
 big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
-x-euc-tw.title = Chinese Traditional (EUC-TW)
 gb2312.title = Chinese Simplified (GB2312)
 hz-gb-2312.title = Chinese Simplified (HZ)
 gbk.title = Chinese Simplified (GBK)
-iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
-iso-2022-kr.title = Korean (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16LE)
 utf-16be.title = Unicode (UTF-16BE)
 iso-8859-5.title = Cyrillic (ISO-8859-5)
-iso-ir-111.title = Cyrillic (ISO-IR-111)
 windows-1251.title = Cyrillic (Windows-1251)
 x-mac-cyrillic.title = Cyrillic (MacCyrillic)
 x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
@@ -63,7 +59,6 @@
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
-ibm874.title = Thai (IBM-874)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-6-i.title = Arabic (ISO-8859-6-I)
@@ -75,11 +70,6 @@
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined
 ibm866.title = Cyrillic/Russian (CP-866)
-ibm850.title = Western (IBM-850)
-ibm852.title = Central European (IBM-852)
-ibm855.title = Cyrillic (IBM-855)
-ibm857.title = Turkish (IBM-857)
-ibm862.title = Hebrew (IBM-862)
 gb18030.title = Chinese Simplified (GB18030)
 x-mac-arabic.title = Arabic (MacArabic)
 x-mac-farsi.title = Farsi (MacFarsi)
@@ -88,7 +78,6 @@
 x-mac-gujarati.title = Gujarati (MacGujarati)
 x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
 
-
 chardet.off.title                           = (Off)
 chardet.universal_charset_detector.title    = Universal
 chardet.ja_parallel_state_machine.title     = Japanese
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/chrome/overrides/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/chrome/overrides/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/chrome/overrides/netError.dtd	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/chrome/overrides/netError.dtd	2014-11-26 21:44:58.000000000 +0000
@@ -169,8 +169,8 @@
 <p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
+<!ENTITY cspBlocked.title "Blocked by Content Security Policy">
+<!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentError.title "Corrupted Content Error">
 <!ENTITY corruptedContentError.longDesc "<p>The content you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the owners to inform them of this problem.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/amazondotcom.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/amazondotcom.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/amazondotcom.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/amazondotcom.xml	2014-11-26 21:44:58.000000000 +0000
@@ -10,12 +10,9 @@
 <Url type="text/html"
      method="GET"
      template="http://www.amazon.com/exec/obidos/external-search/"
-     resultdomain="amazon.com">
+     resultdomain="amazon.com"
+     rel="searchform">
   <Param name="field-keywords" value="{searchTerms}"/>
   <Param name="mode" value="blended"/>
 </Url>
-<Url type="text/html"
-     method="GET"
-     template="http://www.amazon.com/"
-     rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/aol-web-search.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/aol-web-search.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/aol-web-search.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/aol-web-search.xml	2014-11-26 21:44:58.000000000 +0000
@@ -6,15 +6,12 @@
 <ShortName>AOL Web Search</ShortName>
 <Description>The AOL Search engine delivers great web search results, enhanced by Google, plus relevant multimedia results delivered on a single page-so you can search less and discover more.</Description>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%06bKGD%00%FF%00%FF%00%FF%A0%BD%A7%93%00%00%00%09pHYs%00%00%00H%00%00%00H%00F%C9k%3E%00%00%00%FAIDAT8%CB%9D%D3%B1q%C2%40%10%85%E1%0F%8F%0B%A0%04%97%00%1D%40%05%C6%01%B9%95*1%AA%C0C%05%E0%84%D4%E4%0A%0C%15H%EE%40%1D%98%12%D4%81%1D%E84%C8B%60%C9%2F9%AD%EE%EE%9F%DD%B7%7B%23%B0%DC%7D%A3D%22%8D%F7%06h%D4%00%D4*%02(%EF%03%B8%EB%F87Af%B9%7B%EF%03%B8o%C59%DE%A4%F1%E1%3F%25%EC%91%60%83%87%B0%FF%89m%F8%5Et%F9S%032%3C%E1%0B%E3%D6%99%02s%7C%848%91%C6E%1B0%C1%0B%9E%AFd%9A%E0%D4%80l%B1%96%C6eebE%9C%DC(%F51dRk%15%B2%FD%D5%85%B1a*%CF%80%AA%84%FC%C6%E1%23f%8Dx%8D)%E76n%10aq%C5%C4%03%B2%B0%26%D2%F8To%D6%80Y0q%8AW%97m%1C%23%EA%9A%CE%E6%20%AD%82%91%5D%83T%AA%BAp%A1%AE%B7Pk%2F%8D%A3%BF%9C%ECz%0B9%E6%7D.7K(%C3%3A%F89%FF%00_%82G%C3%D5%0E(%3E%00%00%00%00IEND%AEB%60%82<Image>
+<Image width="16" height="16">data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%06bKGD%00%FF%00%FF%00%FF%A0%BD%A7%93%00%00%00%09pHYs%00%00%00H%00%00%00H%00F%C9k%3E%00%00%00%FAIDAT8%CB%9D%D3%B1q%C2%40%10%85%E1%0F%8F%0B%A0%04%97%00%1D%40%05%C6%01%B9%95*1%AA%C0C%05%E0%84%D4%E4%0A%0C%15H%EE%40%1D%98%12%D4%81%1D%E84%C8B%60%C9%2F9%AD%EE%EE%9F%DD%B7%7B%23%B0%DC%7D%A3D%22%8D%F7%06h%D4%00%D4*%02(%EF%03%B8%EB%F87Af%B9%7B%EF%03%B8o%C59%DE%A4%F1%E1%3F%25%EC%91%60%83%87%B0%FF%89m%F8%5Et%F9S%032%3C%E1%0B%E3%D6%99%02s%7C%848%91%C6E%1B0%C1%0B%9E%AFd%9A%E0%D4%80l%B1%96%C6eebE%9C%DC(%F51dRk%15%B2%FD%D5%85%B1a*%CF%80%AA%84%FC%C6%E1%23f%8Dx%8D)%E76n%10aq%C5%C4%03%B2%B0%26%D2%F8To%D6%80Y0q%8AW%97m%1C%23%EA%9A%CE%E6%20%AD%82%91%5D%83T%AA%BAp%A1%AE%B7Pk%2F%8D%A3%BF%9C%ECz%0B9%E6%7D.7K(%C3%3A%F89%FF%00_%82G%C3%D5%0E(%3E%00%00%00%00IEND%AEB%60%82</Image>
 <Url type="text/html"
      method="GET"
      template="http://search.aol.com/aol/search"
-     resultdomain="aol.com">
+     resultdomain="aol.com"
+     rel="searchform">
   <Param name="query" value="{searchTerms}"/>
 </Url>
-<Url type="text/html"
-     method="GET"
-     template="http://search.aol.com"
-     rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/bing.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/bing.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/bing.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/bing.xml	2014-11-26 21:44:58.000000000 +0000
@@ -11,7 +11,10 @@
         <Param name="query" value="{searchTerms}"/>
         <Param name="form" value="OSDJAS"/>
     </Url>
-    <Url type="text/html" method="GET" template="http://www.bing.com/search">
+    <Url type="text/html"
+         method="GET"
+         template="http://www.bing.com/search"
+         rel="searchform">
         <Param name="q" value="{searchTerms}"/>
         <Param name="form" value="MOZESB"/>
         <MozParam name="pc" condition="pref" pref="ms-pc"/>
@@ -21,8 +24,4 @@
         <Param name="form" value="MOZESB"/>
         <MozParam name="pc" condition="pref" pref="ms-pc"/>
     </Url>
-    <Url type="text/html"
-         method="GET"
-         template="http://www.bing.com/search"
-         rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/eBay.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/eBay.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/eBay.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/eBay.xml	2014-11-26 21:44:58.000000000 +0000
@@ -10,11 +10,8 @@
 <Url type="text/html"
      method="GET"
      template="http://rover.ebay.com/rover/1/711-47294-18009-3/4"
-     resultdomain="ebay.com">
+     resultdomain="ebay.com"
+     rel="searchform">
   <Param name="satitle" value="{searchTerms}"/>
 </Url>
-<Url type="text/html"
-     method="GET"
-     template="http://search.ebay.com/"
-     rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/google.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/google.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/google.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/google.xml	2014-11-26 21:44:58.000000000 +0000
@@ -9,18 +9,17 @@
 <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
 <Url type="application/x-suggestions+json"
      method="GET"
-     template="https://www.google.com/complete/search"
+     template="https://www.google.com/complete/search">
   <Param name="client" value="firefox"/>
   <Param name="q" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="https://www.google.com/search">
+<Url type="text/html"
+     method="GET"
+     template="https://www.google.com/search"
+     rel="searchform">
   <Param name="q" value="{searchTerms}"/>
   <Param name="ie" value="utf-8"/>
   <Param name="oe" value="utf-8"/>
   <Param name="aq" value="t"/>
 </Url>
-<Url type="text/html"
-     method="GET"
-     template="https://www.google.com/"
-     rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/twitter.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/twitter.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/twitter.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/twitter.xml	2014-11-26 21:44:58.000000000 +0000
@@ -7,12 +7,11 @@
 <Description>Realtime Twitter Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAiklEQVR42mNgGDxgzTsBnOJr3hUAcQMQJyCJCaArXA9XgCp+Hoj/I+H9QHwfUy1EAqRgPtz0Ne8M0DTD8HuwHJoBCWgKQAb14zAgAJtf9+NQjIlxBJYB1GZCBpzHFxMNRBiSgM8AByyhTqTtqF5Zj1UzrrQCTRjz8Th/Pm7NmLY3IGFQ1CowDG8AAK5P9364gzTrAAAAAElFTkSuQmCC</Image>
-<Url type="text/html" method="GET" template="https://twitter.com/search">
-  <Param name="q" value="{searchTerms}"/>
-</Url>
 <Url type="text/html"
      method="GET"
-     template="https://twitter.com/search/"
-     rel="searchform"/>
+     template="https://twitter.com/search"
+     rel="searchform">
+  <Param name="q" value="{searchTerms}"/>
+</Url>
 </SearchPlugin>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/wikipedia.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/wikipedia.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/wikipedia.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/wikipedia.xml	2014-11-26 21:44:58.000000000 +0000
@@ -14,11 +14,8 @@
 <Url type="text/html"
      method="GET"
      template="http://en.wikipedia.org/wiki/Special:Search"
-     resultdomain="wikipedia.org">
+     resultdomain="wikipedia.org"
+     rel="searchform">
   <Param name="search" value="{searchTerms}"/>
 </Url>
-<Url type="text/html"
-     method="GET"
-     template="http://en.wikipedia.org/wiki/Special:Search"
-     rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/yahoo.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/yahoo.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/locales/en-US/searchplugins/yahoo.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/locales/en-US/searchplugins/yahoo.xml	2014-11-26 21:44:58.000000000 +0000
@@ -17,12 +17,9 @@
 <Url type="text/html"
      method="GET"
      template="https://search.yahoo.com/search"
-     resultdomain="yahoo.com">
+     resultdomain="yahoo.com"
+     rel="searchform">
   <Param name="p" value="{searchTerms}"/>
   <Param name="ei" value="UTF-8"/>
 </Url>
-<Url type="text/html"
-     method="GET"
-     template="https://search.yahoo.com/"
-     rel="searchform"/>
 </SearchPlugin>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/addrbook/test-address-book.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/addrbook/test-address-book.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/addrbook/test-address-book.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/addrbook/test-address-book.js	2014-11-26 21:44:58.000000000 +0000
@@ -14,7 +14,7 @@
                        'prompt-helpers'];
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/Services.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/mailServices.js");
 
 let abController = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/composition/test-attachment-reminder.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/composition/test-attachment-reminder.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/composition/test-attachment-reminder.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/composition/test-attachment-reminder.js	2014-11-26 21:44:58.000000000 +0000
@@ -22,16 +22,19 @@
 
 const kBoxId = "attachmentNotificationBox";
 const kNotificationId = "attachmentReminder";
+const kReminderPref = "mail.compose.attachment_reminder";
 
 function setupModule(module) {
   for (let lib of MODULE_REQUIRES) {
     collector.getModule(lib).installInto(module);
   }
-};
+
+  assert_true(Services.prefs.getBoolPref(kReminderPref));
+}
 
 function setupComposeWin(aCwc, toAddr, subj, body) {
-  aCwc.type(null, toAddr);
-  aCwc.type(aCwc.eid("msgSubject"), subj)
+  aCwc.type(aCwc.eid("addressCol2#1"), toAddr);
+  aCwc.type(aCwc.eid("msgSubject"), subj);
   aCwc.type(aCwc.eid("content-frame"), body);
 }
 
@@ -101,6 +104,7 @@
   return notification.querySelector("#attachmentKeywords").getAttribute("value");
 }
 
+
 /**
  * Test that the attachment reminder works, in general.
  */
@@ -405,10 +409,10 @@
  * Assert if there is any notification in the compose window.
  *
  * @param aCwc         Compose Window Controller
- * @param aValue       True if notification should exist
+ * @param aValue       True if notification should exist.
  *                     False otherwise.
  */
-function assert_no_notification(aCwc, aValue)
+function assert_any_notification(aCwc, aValue)
 {
   let notification = aCwc.e(kBoxId).currentNotification;
   if ((notification == null) == aValue)
@@ -427,7 +431,7 @@
                   "There is no body. I hope you don't mind!");
 
   // There should be no notification yet.
-  assert_no_notification(cwc, false);
+  assert_any_notification(cwc, false);
 
   // Bring up the FileLink notification.
   let kOfferThreshold = "mail.compose.big_attachments.threshold_kb";
@@ -505,6 +509,84 @@
 }
 
 /**
+ * Bug 1099866
+ * Test proper behaviour of attachment reminder when keyword reminding
+ * is turned off.
+ */
+function test_disabled_attachment_reminder() {
+
+  Services.prefs.setBoolPref(kReminderPref, false);
+
+  // Open a sample message with no attachment keywords.
+  let cwc = open_compose_new_mail();
+  setupComposeWin(cwc, "test@example.invalid", "Testing disabled keyword reminder!",
+                  "Some body...");
+
+  // This one should have the manual reminder disabled.
+  assert_manual_reminder_state(cwc, false);
+  // There should be no attachment notification.
+  assert_automatic_reminder_state(cwc, false);
+
+  // Add some keyword so the automatic notification
+  // could potentially show up.
+  setupComposeWin(cwc, "", "", " and look for your attachment!");
+  // Give the notification time to appear. It shouldn't.
+  wait_for_reminder_state(cwc, false);
+
+  // Enable the manual reminder.
+  click_manual_reminder(cwc, true);
+  assert_automatic_reminder_state(cwc, false);
+
+  // Disable the manual reminder and the notification should still be hidden
+  // even when there are still keywords in the body.
+  click_manual_reminder(cwc, false);
+  assert_automatic_reminder_state(cwc, false);
+
+  // There should be no attachment message upon send.
+  click_send_and_handle_send_error(cwc);
+
+  close_compose_window(cwc);
+
+  Services.prefs.setBoolPref(kReminderPref, true);
+}
+
+/**
+ * Bug 1099866
+ * Check if reminder does not stay open on compose window reopen
+ * due to window recycling.
+ */
+function test_recycling_attachment_reminder() {
+  let recycledWindows = Services.prefs.getIntPref("mail.compose.max_recycled_windows");
+  assert_true(recycledWindows > 0);
+  // Open a sample message with no attachment keywords.
+  let cwc = open_compose_new_mail();
+  setupComposeWin(cwc, "test@example.invalid", "Testing recycling a reminder!",
+                  "Some body...");
+
+  // There should be no attachment notification.
+  assert_automatic_reminder_state(cwc, false);
+
+  // Add some keyword so the automatic notification
+  // could potentially show up.
+  setupComposeWin(cwc, "", "", " and look for your attachment!");
+  // Give the notification time to appear. It should.
+  wait_for_reminder_state(cwc, true);
+
+  close_compose_window(cwc, true);
+
+  // Another compose window without any keywords.
+  cwc = open_compose_new_mail();
+  setupComposeWin(cwc, "test@example.invalid", "Testing reminder after recycling!",
+                  "Some body...");
+
+  // There should be no attachment notification.
+  assert_automatic_reminder_state(cwc, false);
+
+  close_compose_window(cwc);
+}
+
+
+/**
  * Click the send button and handle the send error dialog popping up.
  * It will return us back to the compose window.
  *
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/folder-display/test-columns.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/folder-display/test-columns.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/folder-display/test-columns.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/folder-display/test-columns.js	2014-11-26 21:44:58.000000000 +0000
@@ -29,6 +29,8 @@
 // these are for the reset/apply to other/apply to other+child tests.
 var folderSource, folderParent, folderChild1, folderChild2;
 
+var gColumnStateUpdated = false;
+
 function setupModule(module) {
   let fdh = collector.getModule('folder-display-helpers');
   fdh.installInto(module);
@@ -465,6 +467,20 @@
   this.items = [];
 }
 
+function plan_for_columns_state_update() {
+  gColumnStateUpdated = false;
+}
+
+function wait_for_columns_state_updated() {
+  const STATE_PREF = "mailnews.database.global.views.global";
+  let columns_state_updated = function() {
+    gColumnStateUpdated = true;
+  }
+  Services.prefs.addObserver(STATE_PREF, columns_state_updated, false);
+  mc.waitFor(() => gColumnStateUpdated, "Timeout waiting for columns state updated.");
+  Services.prefs.removeObserver(STATE_PREF, columns_state_updated);
+}
+
 function test_column_defaults_gloda_collection() {
   let fakeCollection = new FakeCollection();
   mc.tabmail.openTab("glodaList", { collection: fakeCollection });
@@ -476,8 +492,14 @@
   let fakeCollection = new FakeCollection();
   mc.tabmail.openTab("glodaList", { collection: fakeCollection });
   wait_for_all_messages_to_load();
+
+  plan_for_columns_state_update();
   hide_column("locationCol");
+  wait_for_columns_state_updated();
+
+  plan_for_columns_state_update();
   show_column("accountCol");
+  wait_for_columns_state_updated();
 
   glodaColumns = GLODA_DEFAULTS.slice(0, -1);
   glodaColumns.push("accountCol");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/folder-widget/test-message-filters.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/folder-widget/test-message-filters.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/folder-widget/test-message-filters.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/folder-widget/test-message-filters.js	2014-11-26 21:44:58.000000000 +0000
@@ -88,12 +88,12 @@
 function test_customize_toolbar_doesnt_double_get_mail_menu()
 {
   be_in_folder(folderA);
-  wait_for_window_focused(mc.window);
 
   /**
    * Get the getAllNewMessages menu and check the number of items.
    */
   function check_getAllNewMsgMenu() {
+    wait_for_window_focused(mc.window);
     mc.click(mc.eid("menu_File"), 5, 5);
     wait_for_popup_to_open(mc.e("menu_FilePopup"));
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/shared-modules/test-address-book-helpers.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/shared-modules/test-address-book-helpers.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/test/mozmill/shared-modules/test-address-book-helpers.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/test/mozmill/shared-modules/test-address-book-helpers.js	2014-11-26 21:44:58.000000000 +0000
@@ -8,7 +8,7 @@
 const MODULE_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
 Cu.import("resource:///modules/mailServices.js");
-Cu.import("resource:///modules/Services.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
 const ABMDB_PREFIX = "moz-abmdbdirectory://";
 const ABLDAP_PREFIX = "moz-abldapdirectory://";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/addrbook/addressbook.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/addrbook/addressbook.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/addrbook/addressbook.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/addrbook/addressbook.css	2014-11-26 21:44:59.000000000 +0000
@@ -418,6 +418,23 @@
   color: #FFFFFF;
 }
 
+@media (-moz-mac-yosemite-theme) {
+  #folderTree treechildren::-moz-tree-cell-text {
+    font-family: 'Helvetica Neue';
+  }
+
+  #dirTree treechildren::-moz-tree-cell-text(selected, focus),
+  #dirTree treechildren::-moz-tree-cell-text(selected) {
+    color: black;
+  }
+
+  #dirTree treechildren::-moz-tree-row(selected),
+  #dirTree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected),
+  #dirTree treechildren:-moz-window-inactive::-moz-tree-row(selected) {
+    background: rgba(0, 0, 0, .1);
+  }
+}
+
 treechildren::-moz-tree-image(DirCol) {
   -moz-margin-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/chat.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/chat.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/chat.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/chat.css	2014-11-26 21:44:59.000000000 +0000
@@ -265,6 +265,24 @@
                               #9ca9c6 95%, #939fba 100%);
 }
 
+@media (-moz-mac-yosemite-theme) {
+  :-moz-any(imconv, imcontact, imgroup) treechildren::-moz-tree-cell-text {
+    font-family: 'Helvetica Neue';
+  }
+
+  :-moz-any(imconv, imcontact, imgroup) treechildren::-moz-tree-cell-text(selected, focus),
+  :-moz-any(imconv, imcontact, imgroup) treechildren::-moz-tree-cell-text(selected),
+  :-moz-any(imconv, imcontact, imgroup)[selected] {
+    color: black;
+  }
+
+  :-moz-any(imconv, imcontact, imgroup)[selected],
+  :-moz-any(imconv, imcontact, imgroup)[selected]:-moz-system-metric(mac-graphite-theme),
+  :-moz-any(imconv, imcontact, imgroup)[selected]:-moz-window-inactive {
+    background: rgba(0, 0, 0, .1);
+  }
+}
+
 #displayNameAndstatusMessageStack #statusMessage {
   margin: 32px 0 0;
   min-height: 16px;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/mailWindow1.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/mailWindow1.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/mailWindow1.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/mailWindow1.css	2014-11-26 21:44:59.000000000 +0000
@@ -22,6 +22,17 @@
   margin-bottom: 5px;
 }
 
+/* Instead of box-shadow, we use actual borders on Yosemite,
+ * so we need to reduce the margin by 2px to make the height 42px.
+ */
+@media (-moz-mac-yosemite-theme) {
+  .mail-toolbox:not([mode="full"]) > toolbar:only-of-type,
+  .mail-toolbox[mode="full"][labelalign="end"] > toolbar:only-of-type {
+    margin-top: 5px;
+    margin-bottom: 4px;
+  }
+}
+
 /* ::::::::: Global override :::::::::: */
 
 treechildren::-moz-tree-twisty {
@@ -64,7 +75,6 @@
   border: 0;
 }
 
-
 #folderTree treechildren::-moz-tree-indentation {
  background-color: black !important;
 }
@@ -95,6 +105,23 @@
   color: HighlightText;
 }
 
+@media (-moz-mac-yosemite-theme) {
+  #folderTree treechildren::-moz-tree-cell-text {
+    font-family: 'Helvetica Neue';
+  }
+
+  #folderTree treechildren::-moz-tree-cell-text(selected, focus),
+  #folderTree treechildren::-moz-tree-cell-text(selected) {
+    color: black;
+  }
+
+  #folderTree treechildren::-moz-tree-row(selected),
+  #folderTree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected),
+  #folderTree treechildren:-moz-window-inactive::-moz-tree-row(selected) {
+    background: rgba(0, 0, 0, .1);
+  }
+}
+
 treecol,
 treecolpicker {
   border: none;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/messenger.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/messenger.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/messenger.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/messenger.css	2014-11-26 21:44:59.000000000 +0000
@@ -15,6 +15,18 @@
   height: 22px;
 }
 
+@media (-moz-mac-yosemite-theme) {
+  #titlebar {
+    -moz-appearance: -moz-mac-vibrancy-light !important;
+  }
+
+  #tabmail {
+    box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.4) inset !important;
+    border-top: solid 1px rgba(0, 0, 0, 0.2);
+    border-bottom: solid 1px rgba(0, 0, 0, 0.2);
+  }
+}
+
 #messengerWindow[tabsintitlebar="true"] #titlebar-content {
   margin-bottom: 9px;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/tabmail.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/tabmail.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mail/themes/osx/mail/tabmail.css	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mail/themes/osx/mail/tabmail.css	2014-11-26 21:45:00.000000000 +0000
@@ -13,6 +13,16 @@
                                     transparent 1px);
 }
 
+@media (-moz-mac-yosemite-theme) {
+  #tabs-toolbar {
+    margin-bottom: -1px;
+  }
+
+  #messengerWindow[tabsintitlebar="true"] #tabs-toolbar {
+    -moz-appearance: -moz-mac-vibrancy-light !important;
+  }
+}
+
 .tabmail-arrowscrollbox {
   margin-bottom: -1px;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/addrbook/content/abMailListDialog.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/addrbook/content/abMailListDialog.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/addrbook/content/abMailListDialog.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/addrbook/content/abMailListDialog.js	2014-11-26 21:44:57.000000000 +0000
@@ -236,7 +236,7 @@
     NotifySaveListeners(gEditList);
     gEditList.editMailListToDatabase(gListCard);
 
-    window.arguments[0].outParam.ok = true;
+    window.arguments[0].refresh = true;
     return true;  // close the window
   }
 
@@ -247,9 +247,8 @@
 {
   InitCommonJS();
 
-  gListCard = window.arguments[0].inParam.abCard;
-  var listUri  = window.arguments[0].inParam.listUri;
-  window.arguments[0].outParam.ok = false;
+  gListCard = window.arguments[0].abCard;
+  var listUri  = window.arguments[0].listURI;
 
   gEditList = GetDirectoryFromURI(listUri);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/addrbook/src/nsAbAutoCompleteSearch.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/addrbook/src/nsAbAutoCompleteSearch.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/addrbook/src/nsAbAutoCompleteSearch.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/addrbook/src/nsAbAutoCompleteSearch.js	2014-11-26 21:44:57.000000000 +0000
@@ -334,8 +334,9 @@
     }
 
     // Array of all the terms from the fullString search query
-    // (separated on the basis of spaces).
-    let searchWords = fullString.split(/\s+/);
+    // (separated on the basis of spaces or exact terms on the
+    // basis of quotes).
+    let searchWords = getSearchTokens(fullString);
 
     // Find out about the comment column
     try {
@@ -371,14 +372,14 @@
       // for each word separately so that each result contains all the words
       // from the fullstring in the fields of the addressbook card
       // (see bug 558931 for explanations).
-      let searchQuery = "";
       let modelQuery = "(or(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)" +
                        "(NickName,c,@V)(PrimaryEmail,c,@V)(SecondEmail,c,@V)" +
                        "(and(IsMailList,=,TRUE)(Notes,c,@V)))";
-      for (let searchWord of searchWords) {
-        searchQuery += modelQuery.replace(/@V/g, encodeABTermValue(searchWord));
-      }
-      searchQuery = "?(and" + searchQuery + ")";
+      // Use helper method to split up search query to multi-word search
+      // query against multiple fields.
+      let searchWords = getSearchTokens(fullString);
+      let searchQuery = generateQueryURI(modelQuery, searchWords);
+
       // Now do the searching
       let allABs = this._abManager.directories;
 
@@ -434,6 +435,75 @@
   return encodeURIComponent(aString).replace(/\(/g, "%28").replace(/\)/g, "%29");
 }
 
+/**
+ * This is an exact replica of the method in abCommon.js and needs to
+ * be merged to remove this duplication.
+ *
+ * Parse the multiword search string to extract individual search terms
+ * (separated on the basis of spaces) or quoted exact phrases to search
+ * against multiple fields of the addressbook cards.
+ *
+ * @param aSearchString The full search string entered by the user.
+ *
+ * @return  an array of separated search terms from the full search string.
+ */
+function getSearchTokens(aSearchString)
+{
+  let searchString = aSearchString.trim();
+
+  if (searchString == "")
+    return [];
+
+  let quotedTerms = [];
+
+  // Split up multiple search words to create a *foo* and *bar* search against
+  // search fields, using the OR-search template from modelQuery for each word.
+  // If the search query has quoted terms as "foo bar", extract them as is.
+  let startIndex;
+  while ((startIndex = searchString.indexOf('"')) != -1) {
+    let endIndex = searchString.indexOf('"', startIndex + 1);
+    if (endIndex == -1)
+      endIndex = searchString.length;
+
+    quotedTerms.push(searchString.substring(startIndex + 1, endIndex));
+    let query = searchString.substring(0, startIndex);
+    if (endIndex < searchString.length)
+      query += searchString.substr(endIndex + 1);
+
+    searchString = query.trim();
+  }
+
+  let searchWords = [];
+  if (searchString.length != 0) {
+    searchWords = quotedTerms.concat(searchString.split(/\s+/));
+  } else {
+    searchWords = quotedTerms;
+  }
+
+  return searchWords;
+}
+
+/*
+ * Given a database model query and a list of search tokens,
+ * return query URI.
+ *
+ * @param aModelQuery database model query
+ * @param aSearchWords an array of search tokens.
+ *
+ * @return query URI.
+ */
+function generateQueryURI(aModelQuery, aSearchWords)
+{
+  let queryURI = "";
+  aSearchWords.forEach(searchWord =>
+    queryURI += aModelQuery.replace(/@V/g, encodeABTermValue(searchWord)));
+
+  // queryURI has all the (or(...)) searches, link them up with (and(...)).
+  queryURI = "?(and" + queryURI + ")";
+
+  return queryURI;
+}
+
 // Module
 
 var components = [nsAbAutoCompleteSearch];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch6.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch6.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch6.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/addrbook/test/unit/test_nsAbAutoCompleteSearch6.js	2014-11-26 21:44:57.000000000 +0000
@@ -59,6 +59,24 @@
   { // 10
     email: "10@example.com", displayName: "däsh l18n",
     popularityIndex: 0, value: "däsh l18n <10@example.com>"
+  },
+
+  { // 11
+    email: "11@example.com", displayName: "paul mary",
+    popularityIndex: 0, firstName: "paul", lastName: "mary meyer",
+    value: "paul mary <11@example.com>"
+  },
+
+  { // 12
+    email: "12@example.com", displayName: "paul meyer",
+    popularityIndex: 0, firstName: "paul", lastName: "mary meyer",
+    value: "paul meyer <12@example.com>"
+  },
+
+  { // 13
+    email: "13@example.com", displayName: "mr iron man (exp dev)",
+    popularityIndex: 0, firstName: "iron", lastName: "man",
+    value: "mr iron man (exp dev) <13@example.com>"
   }
 ];
 
@@ -70,7 +88,10 @@
   { search: "xx", expected: [0, 5] },
   { search: "jan", expected: [1, 3] },
   { search: "sh", expected: [2, 10, 7] },
-  { search: "st", expected: [3,8] }
+  { search: "st", expected: [3,8] },
+  { search: "paul mary", expected: [11, 12] },
+  { search: "\"paul mary\"", expected: [11] },
+  { search: "\"iron man\" mr \"exp dev\"", expected: [13] }
 ];
 
 function acObserver() {}
@@ -103,6 +124,7 @@
     card.displayName = element.displayName;
     card.setProperty("PopularityIndex", element.popularityIndex);
     card.firstName = element.firstName;
+    card.lastName = element.lastName;
 
     ab.addCard(card);
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/MailNewsTypes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/MailNewsTypes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/MailNewsTypes.h	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/MailNewsTypes.h	2014-11-26 21:44:57.000000000 +0000
@@ -30,4 +30,10 @@
 
 const nsMsgViewIndex nsMsgViewIndex_None = 0xFFFFFFFF;
 
+/* kSizeUnknown is a special value of folder size that indicates the size
+ * is unknown yet. Usually this causes the folder to determine the real size
+ * immediately as it is queried by a consumer.
+ */
+const int64_t kSizeUnknown = -1;
+
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsIFolderListener.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsIFolderListener.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsIFolderListener.idl	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsIFolderListener.idl	2014-11-26 21:44:57.000000000 +0000
@@ -11,7 +11,7 @@
 
 typedef unsigned long folderListenerNotifyFlagValue;
 
-[scriptable, uuid(f60ee1a2-6d81-422c-958f-d408b1b2daa6)]
+[scriptable, uuid(f60ee1a2-6d81-422c-958f-d408b1b2daa7)]
 interface nsIFolderListener : nsISupports {
   const folderListenerNotifyFlagValue added = 0x1;
   void OnItemAdded(in nsIMsgFolder aParentItem,
@@ -28,10 +28,12 @@
                              in string aNewValue);
   
   const folderListenerNotifyFlagValue intPropertyChanged = 0x8;
+  // While this property handles long long (64bit wide) values,
+  // the Javascript engine will only pass values up to 2^53 to the consumers.
   void OnItemIntPropertyChanged(in nsIMsgFolder aItem,
                                 in nsIAtom aProperty,
-                                in long aOldValue,
-                                in long aNewValue);
+                                in long long aOldValue,
+                                in long long aNewValue);
   
   const folderListenerNotifyFlagValue boolPropertyChanged = 0x10;
   void OnItemBoolPropertyChanged(in nsIMsgFolder aItem,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsIMsgFolderCacheElement.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsIMsgFolderCacheElement.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsIMsgFolderCacheElement.idl	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsIMsgFolderCacheElement.idl	2014-11-26 21:44:57.000000000 +0000
@@ -6,12 +6,14 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(D7ED2508-A608-46cd-AA01-FBB019B0FA44)]
-interface nsIMsgFolderCacheElement : nsISupports 
+[scriptable, uuid(c7392b12-f68a-46b2-af5e-d47350bb17c3)]
+interface nsIMsgFolderCacheElement : nsISupports
 {
   attribute ACString key;
   ACString getStringProperty(in string propertyName);
   long getInt32Property(in string propertyName);
+  long long getInt64Property(in string propertyName);
   void setStringProperty(in string propertyName, in ACString propertyValue);
   void setInt32Property(in string propertyName, in long propertyValue);
+  void setInt64Property(in string propertyName, in long long propertyValue);
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsIMsgFolder.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsIMsgFolder.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsIMsgFolder.idl	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsIMsgFolder.idl	2014-11-26 21:44:57.000000000 +0000
@@ -29,7 +29,8 @@
 
 // enumerated type for determining if a message has been replied to, forwarded, etc.
 typedef long nsMsgDispositionState;
-[scriptable, uuid(25cbee16-95bc-11e3-9320-00269e4fddc1)]
+
+[scriptable, uuid(9ce446f3-398c-4462-a4c6-0ce562d5bd30)]
 interface nsIMsgFolder : nsISupports {
 
   const nsMsgBiffState nsMsgBiffState_NewMail = 0; // User has new mail waiting.
@@ -293,7 +294,7 @@
    * size of this folder on disk (not including .msf file)
    * for imap, it's the sum of the size of the messages
    */
-  attribute unsigned long sizeOnDisk;
+  attribute long long sizeOnDisk;
 
   readonly attribute ACString username;
   readonly attribute ACString hostname;
@@ -655,8 +656,8 @@
                              in ACString oldValue,
                              in ACString newValue);
   void NotifyIntPropertyChanged(in nsIAtom property,
-                                in long oldValue,
-                                in long newValue);
+                                in long long oldValue,
+                                in long long newValue);
   void NotifyBoolPropertyChanged(in nsIAtom property,
                                  in boolean oldValue,
                                  in boolean newValue);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsMsgFolderFlags.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsMsgFolderFlags.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/public/nsMsgFolderFlags.idl	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/public/nsMsgFolderFlags.idl	2014-11-26 21:44:57.000000000 +0000
@@ -3,6 +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/. */
 
+// This must be limited to unsigned long (uint32_t, no uint64_t)
+// as long as nsIMsgFolder exposes the 'flags' property which contains
+// all the flags values. The callers are used to do
+// (folder.flags & nsMsgFolderFlags.<flagname>) in Javascript
+// which cuts the value to 32bit only. See bug 813459.
 typedef unsigned long nsMsgFolderFlagType;
 
 /// Flags about a folder or a newsgroup.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessenger.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessenger.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessenger.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessenger.cpp	2014-11-26 21:44:57.000000000 +0000
@@ -2193,8 +2193,8 @@
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* void OnItemIntPropertyChanged (in nsIMsgFolder item, in nsIAtom property, in long oldValue, in long newValue); */
-NS_IMETHODIMP nsMessenger::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int32_t oldValue, int32_t newValue)
+/* void OnItemIntPropertyChanged (in nsIMsgFolder item, in nsIAtom property, in long long oldValue, in long long newValue); */
+NS_IMETHODIMP nsMessenger::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int64_t oldValue, int64_t newValue)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessengerOSXIntegration.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessengerOSXIntegration.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessengerOSXIntegration.mm	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessengerOSXIntegration.mm	2014-11-26 21:44:57.000000000 +0000
@@ -417,8 +417,8 @@
 NS_IMETHODIMP
 nsMessengerOSXIntegration::OnItemIntPropertyChanged(nsIMsgFolder *aFolder,
                                                     nsIAtom *aProperty,
-                                                    int32_t aOldValue,
-                                                    int32_t aNewValue)
+                                                    int64_t aOldValue,
+                                                    int64_t aNewValue)
 {
   // if we got new mail show an alert
   if (aNewValue == nsIMsgFolder::nsMsgBiffState_NewMail)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessengerUnixIntegration.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessengerUnixIntegration.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessengerUnixIntegration.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessengerUnixIntegration.cpp	2014-11-26 21:44:57.000000000 +0000
@@ -655,7 +655,7 @@
 }
 
 NS_IMETHODIMP
-nsMessengerUnixIntegration::OnItemIntPropertyChanged(nsIMsgFolder *aItem, nsIAtom *aProperty, int32_t aOldValue, int32_t aNewValue)
+nsMessengerUnixIntegration::OnItemIntPropertyChanged(nsIMsgFolder *aItem, nsIAtom *aProperty, int64_t aOldValue, int64_t aNewValue)
 {
   nsCString atomName;
   // if we got new mail show an icon in the system tray
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessengerWinIntegration.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessengerWinIntegration.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMessengerWinIntegration.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMessengerWinIntegration.cpp	2014-11-26 21:44:57.000000000 +0000
@@ -894,7 +894,7 @@
 }
 
 NS_IMETHODIMP
-nsMessengerWinIntegration::OnItemIntPropertyChanged(nsIMsgFolder *aItem, nsIAtom *aProperty, int32_t aOldValue, int32_t aNewValue)
+nsMessengerWinIntegration::OnItemIntPropertyChanged(nsIMsgFolder *aItem, nsIAtom *aProperty, int64_t aOldValue, int64_t aNewValue)
 {
   // if we got new mail show a icon in the system tray
   if (mBiffStateAtom == aProperty && mFoldersWithNewMail)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgAccountManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgAccountManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgAccountManager.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgAccountManager.cpp	2014-11-26 21:44:57.000000000 +0000
@@ -3562,8 +3562,8 @@
 NS_IMETHODIMP
 nsMsgAccountManager::OnItemIntPropertyChanged(nsIMsgFolder *aFolder,
                                               nsIAtom *aProperty,
-                                              int32_t oldValue,
-                                              int32_t newValue)
+                                              int64_t oldValue,
+                                              int64_t newValue)
 {
   if (aProperty == mFolderFlagAtom)
   {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgAccountManagerDS.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgAccountManagerDS.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgAccountManagerDS.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgAccountManagerDS.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -1169,7 +1169,7 @@
 }
 
 nsresult
-nsMsgAccountManagerDataSource::OnItemIntPropertyChanged(nsIMsgFolder *, nsIAtom *, int32_t, int32_t)
+nsMsgAccountManagerDataSource::OnItemIntPropertyChanged(nsIMsgFolder *, nsIAtom *, int64_t, int64_t)
 {
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgFolderCacheElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgFolderCacheElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgFolderCacheElement.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgFolderCacheElement.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -79,6 +79,29 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP nsMsgFolderCacheElement::GetInt64Property(const char *propertyName, int64_t *aResult)
+{
+  NS_ENSURE_ARG_POINTER(propertyName);
+  NS_ENSURE_ARG_POINTER(aResult);
+  NS_ENSURE_TRUE(m_mdbRow, NS_ERROR_FAILURE);
+
+  nsCString resultStr;
+  GetStringProperty(propertyName, resultStr);
+  if (resultStr.IsEmpty())
+    return NS_ERROR_FAILURE;
+
+  // This must be an inverse function to nsCString.AppentInt(),
+  // which uses snprintf("%x") internally, so that the wrapped negative numbers
+  // are decoded properly.
+  if (PR_sscanf(resultStr.get(), "%llx", aResult) != 1)
+  {
+    NS_WARNING("Unexpected failure to decode hex string.");
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsMsgFolderCacheElement::SetStringProperty(const char *propertyName, const nsACString& propertyValue)
 {
   NS_ENSURE_ARG_POINTER(propertyName);
@@ -119,6 +142,18 @@
   nsAutoCString propertyStr;
   propertyStr.AppendInt(propertyValue, 16);
   return SetStringProperty(propertyName, propertyStr);
+}
+
+NS_IMETHODIMP nsMsgFolderCacheElement::SetInt64Property(const char *propertyName, int64_t propertyValue)
+{
+  NS_ENSURE_ARG_POINTER(propertyName);
+  NS_ENSURE_TRUE(m_mdbRow, NS_ERROR_FAILURE);
+
+  // This also supports encoding negative numbers into hex
+  // by integer wrapping them (e.g. -1 -> "ffffffffffffffff").
+  nsAutoCString propertyStr;
+  propertyStr.AppendInt(propertyValue, 16);
+  return SetStringProperty(propertyName, propertyStr);
 }
 
 void nsMsgFolderCacheElement::SetMDBRow(nsIMdbRow *row)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgFolderDataSource.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgFolderDataSource.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgFolderDataSource.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgFolderDataSource.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -118,6 +118,8 @@
 
 static const uint32_t kDisplayBlankCount = 0xFFFFFFFE;
 static const uint32_t kDisplayQuestionCount = 0xFFFFFFFF;
+static const int64_t kDisplayBlankCount64 = -2;
+static const int64_t kDisplayQuestionCount64 = -1;
 
 nsMsgFolderDataSource::nsMsgFolderDataSource()
 {
@@ -806,8 +808,8 @@
 NS_IMETHODIMP
 nsMsgFolderDataSource::OnItemIntPropertyChanged(nsIMsgFolder *folder,
                                                 nsIAtom *property,
-                                                int32_t oldValue,
-                                                int32_t newValue)
+                                                int64_t oldValue,
+                                                int64_t newValue)
 {
   nsCOMPtr<nsIRDFResource> resource(do_QueryInterface(folder));
   if (kTotalMessagesAtom == property)
@@ -1454,19 +1456,19 @@
   nsresult rv = folder->GetIsServer(&isServer);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  int32_t folderSize;
-  if(isServer)
-    folderSize = kDisplayBlankCount;
+  int64_t folderSize;
+  if (isServer) {
+    folderSize = kDisplayBlankCount64;
+  }
   else
   {
     // XXX todo, we are asserting here for news
-    // for offline news, we'd know the size on disk, right?
-    rv = folder->GetSizeOnDisk((uint32_t *) &folderSize);
+    // for offline news, we'd know the size on disk, right? Yes, bug 851275.
+    rv = folder->GetSizeOnDisk(&folderSize);
     NS_ENSURE_SUCCESS(rv, rv);
   }
-  GetFolderSizeNode(folderSize, target);
 
-  return rv;
+  return GetFolderSizeNode(folderSize, target);
 }
 
 nsresult
@@ -1758,7 +1760,7 @@
 }
 
 nsresult
-nsMsgFolderDataSource::OnFolderSizePropertyChanged(nsIRDFResource *folderResource, int32_t oldValue, int32_t newValue)
+nsMsgFolderDataSource::OnFolderSizePropertyChanged(nsIRDFResource *folderResource, int64_t oldValue, int64_t newValue)
 {
   nsCOMPtr<nsIRDFNode> newNode;
   GetFolderSizeNode(newValue, getter_AddRefs(newNode));
@@ -1789,18 +1791,17 @@
 }
 
 nsresult
-nsMsgFolderDataSource::GetFolderSizeNode(int32_t aFolderSize, nsIRDFNode **aNode)
+nsMsgFolderDataSource::GetFolderSizeNode(int64_t aFolderSize, nsIRDFNode **aNode)
 {
   nsresult rv;
-  uint32_t folderSize = aFolderSize;
-  if (folderSize == kDisplayBlankCount || folderSize == 0)
+  if (aFolderSize == kDisplayBlankCount64)
     createNode(EmptyString().get(), aNode, getRDFService());
-  else if(folderSize == kDisplayQuestionCount)
+  else if (aFolderSize == kDisplayQuestionCount64)
     createNode(MOZ_UTF16("???"), aNode, getRDFService());
   else
   {
     nsAutoString sizeString;
-    rv = FormatFileSize(folderSize, true, sizeString);
+    rv = FormatFileSize(aFolderSize, true, sizeString);
     NS_ENSURE_SUCCESS(rv, rv);
 
     createNode(sizeString.get(), aNode, getRDFService());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgFolderDataSource.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgFolderDataSource.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgFolderDataSource.h	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgFolderDataSource.h	2014-11-26 21:44:58.000000000 +0000
@@ -176,14 +176,14 @@
 
   nsresult OnUnreadMessagePropertyChanged(nsIRDFResource *folderResource, int32_t oldValue, int32_t newValue);
   nsresult OnTotalMessagePropertyChanged(nsIRDFResource *folderResource, int32_t oldValue, int32_t newValue);
-  nsresult OnFolderSizePropertyChanged(nsIRDFResource *folderResource, int32_t oldValue, int32_t newValue);
+  nsresult OnFolderSizePropertyChanged(nsIRDFResource *folderResource, int64_t oldValue, int64_t newValue);
   nsresult OnFolderSortOrderPropertyChanged(nsIRDFResource *folderResource, int32_t oldValue, int32_t newValue);
   nsresult NotifyFolderTreeNameChanged(nsIMsgFolder *folder, nsIRDFResource *folderResource, int32_t aUnreadMessages);
   nsresult NotifyFolderTreeSimpleNameChanged(nsIMsgFolder *folder, nsIRDFResource *folderResource);
   nsresult NotifyFolderNameChanged(nsIMsgFolder *folder, nsIRDFResource *folderResource);
   nsresult NotifyAncestors(nsIMsgFolder *aFolder, nsIRDFResource *aPropertyResource, nsIRDFNode *aNode);
   nsresult GetNumMessagesNode(int32_t numMessages, nsIRDFNode **node);
-  nsresult GetFolderSizeNode(int32_t folderSize, nsIRDFNode **node);
+  nsresult GetFolderSizeNode(int64_t folderSize, nsIRDFNode **node);
   nsresult CreateLiterals(nsIRDFService *rdf);
 
   virtual nsresult GetFolderDisplayName(nsIMsgFolder *folder, nsString& folderName);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgMailSession.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgMailSession.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsMsgMailSession.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsMsgMailSession.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -118,8 +118,8 @@
 NS_IMETHODIMP
 nsMsgMailSession::OnItemIntPropertyChanged(nsIMsgFolder *aItem,
                                            nsIAtom *aProperty,
-                                           int32_t aOldValue,
-                                           int32_t aNewValue)
+                                           int64_t aOldValue,
+                                           int64_t aNewValue)
 {
   NOTIFY_FOLDER_LISTENERS(intPropertyChanged, OnItemIntPropertyChanged,
                           (aItem, aProperty, aOldValue, aNewValue));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsStatusBarBiffManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsStatusBarBiffManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/src/nsStatusBarBiffManager.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/src/nsStatusBarBiffManager.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -182,7 +182,7 @@
 }
 
 NS_IMETHODIMP
-nsStatusBarBiffManager::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int32_t oldValue, int32_t newValue)
+nsStatusBarBiffManager::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int64_t oldValue, int64_t newValue)
 {
   if (kBiffStateAtom == property && mCurrentBiffState != newValue) {
     // if we got new mail, attempt to play a sound.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/test/unit/test_autoconfigXML.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/test/unit/test_autoconfigXML.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/test/unit/test_autoconfigXML.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/test/unit/test_autoconfigXML.js	2014-11-26 21:44:58.000000000 +0000
@@ -17,7 +17,7 @@
 // Globals
 
 Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/JXON.js");
+Components.utils.import("resource:///modules/JXON.js");
 
 var DOMParser = Components.Constructor("@mozilla.org/xmlextras/domparser;1");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgDBFolder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgDBFolder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgDBFolder.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgDBFolder.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -137,7 +137,7 @@
   mSemaphoreHolder(nullptr),
   mNumPendingUnreadMessages(0),
   mNumPendingTotalMessages(0),
-  mFolderSize(0),
+  mFolderSize(kSizeUnknown),
   mNumNewBiffMessages(0),
   mIsCachable(true),
   mHaveParsedURI(false),
@@ -1302,7 +1302,7 @@
   element->GetInt32Property("pendingUnreadMsgs", &mNumPendingUnreadMessages);
   element->GetInt32Property("pendingMsgs", &mNumPendingTotalMessages);
   element->GetInt32Property("expungedBytes", (int32_t *) &mExpungedBytes);
-  element->GetInt32Property("folderSize", (int32_t *) &mFolderSize);
+  element->GetInt64Property("folderSize", &mFolderSize);
   element->GetStringProperty("charset", mCharset);
 
 #ifdef DEBUG_bienvenu1
@@ -1425,7 +1425,7 @@
   element->SetInt32Property("pendingUnreadMsgs", mNumPendingUnreadMessages);
   element->SetInt32Property("pendingMsgs", mNumPendingTotalMessages);
   element->SetInt32Property("expungedBytes", mExpungedBytes);
-  element->SetInt32Property("folderSize", mFolderSize);
+  element->SetInt64Property("folderSize", mFolderSize);
   element->SetStringProperty("charset", mCharset);
 
 #ifdef DEBUG_bienvenu1
@@ -4560,14 +4560,14 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgDBFolder::GetSizeOnDisk(uint32_t *size)
+NS_IMETHODIMP nsMsgDBFolder::GetSizeOnDisk(int64_t *size)
 {
   NS_ENSURE_ARG_POINTER(size);
-  *size = 0;
+  *size = kSizeUnknown;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgDBFolder::SetSizeOnDisk(uint32_t aSizeOnDisk)
+NS_IMETHODIMP nsMsgDBFolder::SetSizeOnDisk(int64_t aSizeOnDisk)
 {
   NotifyIntPropertyChanged(kFolderSizeAtom, mFolderSize, aSizeOnDisk);
   mFolderSize = aSizeOnDisk;
@@ -4946,8 +4946,8 @@
 }
 
 NS_IMETHODIMP
-nsMsgDBFolder::NotifyIntPropertyChanged(nsIAtom *aProperty, int32_t aOldValue,
-                                        int32_t aNewValue)
+nsMsgDBFolder::NotifyIntPropertyChanged(nsIAtom *aProperty, int64_t aOldValue,
+                                        int64_t aNewValue)
 {
   // Don't send off count notifications if they are turned off.
   if (!mNotifyCountChanges &&
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgDBFolder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgDBFolder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgDBFolder.h	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgDBFolder.h	2014-11-26 21:44:58.000000000 +0000
@@ -206,7 +206,7 @@
   // we don't want to do an expensive select until the user actually opens that folder
   int32_t mNumPendingUnreadMessages;
   int32_t mNumPendingTotalMessages;
-  uint32_t mFolderSize;
+  int64_t mFolderSize;
 
   int32_t mNumNewBiffMessages;
   bool mIsCachable;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgUtils.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgUtils.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -471,7 +471,7 @@
   return NS_OK;
 }
 
-nsresult FormatFileSize(uint64_t size, bool useKB, nsAString &formattedSize)
+nsresult FormatFileSize(int64_t size, bool useKB, nsAString &formattedSize)
 {
   NS_NAMED_LITERAL_STRING(byteAbbr, "byteAbbreviation2");
   NS_NAMED_LITERAL_STRING(kbAbbr,   "kiloByteAbbreviation2");
@@ -493,7 +493,7 @@
                                getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  float unitSize = size;
+  float unitSize = size < 0 ? 0.0 : size;
   uint32_t unitIndex = 0;
 
   if (useKB) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/nsMsgUtils.h	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/nsMsgUtils.h	2014-11-26 21:44:58.000000000 +0000
@@ -62,7 +62,7 @@
 NS_MSG_BASE nsresult NS_MsgHashIfNecessary(nsAutoString &name);
 NS_MSG_BASE nsresult NS_MsgHashIfNecessary(nsAutoCString &name);
 
-NS_MSG_BASE nsresult FormatFileSize(uint64_t size, bool useKB, nsAString &formattedSize);
+NS_MSG_BASE nsresult FormatFileSize(int64_t size, bool useKB, nsAString &formattedSize);
 
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/OAuth2.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/OAuth2.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/base/util/OAuth2.jsm	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/base/util/OAuth2.jsm	2014-11-26 21:44:58.000000000 +0000
@@ -10,8 +10,8 @@
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Http.jsm");
-Cu.import("resource:///modules/Services.jsm");
-Cu.import("resource:///modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/gloda/log4moz.js");
 
 function parseURLData(aData) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/compose/src/nsMsgSendLater.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/compose/src/nsMsgSendLater.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/compose/src/nsMsgSendLater.cpp	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/compose/src/nsMsgSendLater.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -1503,7 +1503,7 @@
 
 NS_IMETHODIMP
 nsMsgSendLater::OnItemIntPropertyChanged(nsIMsgFolder *aItem, nsIAtom *aProperty,
-                                         int32_t aOldValue, int32_t aNewValue)
+                                         int64_t aOldValue, int64_t aNewValue)
 {
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/imap/src/nsImapMailFolder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/imap/src/nsImapMailFolder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/imap/src/nsImapMailFolder.cpp	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/imap/src/nsImapMailFolder.cpp	2014-11-26 21:44:59.000000000 +0000
@@ -1763,7 +1763,7 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsImapMailFolder::GetSizeOnDisk(uint32_t * size)
+NS_IMETHODIMP nsImapMailFolder::GetSizeOnDisk(int64_t *size)
 {
   NS_ENSURE_ARG_POINTER(size);
   *size = mFolderSize;
@@ -4814,7 +4814,7 @@
 
   // Take this opportunity to recalculate the folder size, if we're not a 
   // partial (condstore) fetch.
-  uint64_t newFolderSize = 0;
+  int64_t newFolderSize = 0;
 
   flagState->GetNumberOfMessages(&messageIndex);
 
@@ -4847,8 +4847,8 @@
   }
   if (!partialUIDFetch && newFolderSize != mFolderSize)
   {
-    uint32_t oldFolderSize = mFolderSize;
-    mFolderSize = (uint32_t) newFolderSize;
+    int64_t oldFolderSize = mFolderSize;
+    mFolderSize = newFolderSize;
     NotifyIntPropertyChanged(kFolderSizeAtom, oldFolderSize, mFolderSize);
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/imap/src/nsImapMailFolder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/imap/src/nsImapMailFolder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/imap/src/nsImapMailFolder.h	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/imap/src/nsImapMailFolder.h	2014-11-26 21:44:59.000000000 +0000
@@ -232,7 +232,7 @@
 
   NS_IMETHOD GetDeletable (bool *deletable) MOZ_OVERRIDE;
 
-  NS_IMETHOD GetSizeOnDisk(uint32_t * size) MOZ_OVERRIDE;
+  NS_IMETHOD GetSizeOnDisk(int64_t *size) MOZ_OVERRIDE;
 
   NS_IMETHOD GetCanCreateSubfolders(bool *aResult) MOZ_OVERRIDE;
   NS_IMETHOD GetCanSubscribe(bool *aResult) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/intl/charsetalias.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/intl/charsetalias.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/intl/charsetalias.properties	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/intl/charsetalias.properties	2014-11-26 21:44:59.000000000 +0000
@@ -1,105 +1,41 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.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 Original Code has been modified by IBM Corporation.
-# Modifications made by IBM described herein are
-# Copyright (c) International Business Machines
-# Corporation, 1999
-#
-# Modifications to Mozilla code or documentation
-# identified per MPL Section 3.3
-#
-# Date         Modified by     Description of modification
-# 12/09/1999   IBM Corp.       Support for IBM codepages - 850,852,855,857,862,864
-#
+
 # Rule of this file:
 # 1. key should always be in lower case ascii so we can do case insensitive
 #    comparison in the code faster.
 # 2. value should be the one used in unicode converter
-#
 # 3. If the charset is not used for document charset, but font charset
 #    (e.g. XLFD charset- such as JIS x0201, JIS x0208), don't put here
 #
+# This file contains mainly aliases. Actual labels for encodings are in
+# labelsencodings.properties. Besides aliases it contains labels for charsets
+# that are not part of the HTML5 world, but still are supported for e-mail.
 
 ascii=us-ascii
 us-ascii=us-ascii
 ansi_x3.4-1968=us-ascii
 646=us-ascii
 iso-8859-1=ISO-8859-1
-iso-8859-2=ISO-8859-2
-iso-8859-3=ISO-8859-3
-iso-8859-4=ISO-8859-4
-iso-8859-5=ISO-8859-5
-iso-8859-6=ISO-8859-6
 iso-8859-6-i=ISO-8859-6-I
 iso-8859-6-e=ISO-8859-6-E
-iso-8859-7=ISO-8859-7
-iso-8859-8=ISO-8859-8
-iso-8859-8-i=ISO-8859-8-I
 iso-8859-8-e=ISO-8859-8-E
-iso-8859-10=ISO-8859-10
-iso-8859-13=ISO-8859-13
-iso-8859-14=ISO-8859-14
-iso-8859-15=ISO-8859-15
-iso-8859-16=ISO-8859-16
-iso-ir-111=ISO-IR-111
-iso-2022-cn=ISO-2022-CN
-iso-2022-cn-ext=ISO-2022-CN
-iso-2022-kr=ISO-2022-KR
-iso-2022-jp=ISO-2022-JP
-utf-16be=UTF-16BE
-utf-16le=UTF-16LE
 utf-16=UTF-16
-windows-1250=windows-1250
-windows-1251=windows-1251
-windows-1252=windows-1252
-windows-1253=windows-1253
-windows-1254=windows-1254
-windows-1255=windows-1255
-windows-1256=windows-1256
-windows-1257=windows-1257
-windows-1258=windows-1258
-ibm866=IBM866
-ibm850=IBM850
-ibm852=IBM852
-ibm855=IBM855
-ibm857=IBM857
-ibm862=IBM862
-ibm864=IBM864
-utf-8=UTF-8
 utf-7=UTF-7
-shift_jis=Shift_JIS
-big5=Big5
-euc-jp=EUC-JP
-euc-kr=EUC-KR
 gb2312=GB2312
-gb18030=gb18030
 viscii=VISCII
-koi8-r=KOI8-R
-koi8_r=KOI8-R
-cskoi8r=KOI8-R
-koi=KOI8-R
-koi8=KOI8-R
-koi8-u=KOI8-U
 t.61-8bit=T.61-8bit
 hz-gb-2312=HZ-GB-2312
-big5-hkscs=Big5-HKSCS
-gbk=gbk
-cns11643=x-euc-tw
-#
+
 # Netscape private ...
-#
 x-imap4-modified-utf7=x-imap4-modified-utf7
-x-euc-tw=x-euc-tw
 x-mac-ce=x-mac-ce
 x-mac-turkish=x-mac-turkish
 x-mac-greek=x-mac-greek
 x-mac-icelandic=x-mac-icelandic
 x-mac-croatian=x-mac-croatian
 x-mac-romanian=x-mac-romanian
-x-mac-cyrillic=x-mac-cyrillic
-x-mac-ukrainian=x-mac-cyrillic
 x-mac-hebrew=x-mac-hebrew
 x-mac-arabic=x-mac-arabic
 x-mac-farsi=x-mac-farsi
@@ -112,168 +48,48 @@
 iso-10646-ucs-2=UTF-16BE
 x-iso-10646-ucs-2-be=UTF-16BE
 x-iso-10646-ucs-2-le=UTF-16LE
-x-user-defined=x-user-defined
 x-johab=x-johab
-#
+
 # Aliases for ISO-8859-1
-#
 latin1=ISO-8859-1
 iso_8859-1=ISO-8859-1
 iso8859-1=ISO-8859-1
-iso8859-2=ISO-8859-2
-iso8859-3=ISO-8859-3
-iso8859-4=ISO-8859-4
-iso8859-5=ISO-8859-5
-iso8859-6=ISO-8859-6
-iso8859-7=ISO-8859-7
-iso8859-8=ISO-8859-8
-iso8859-10=ISO-8859-10
-iso8859-13=ISO-8859-13
-iso8859-14=ISO-8859-14
-iso8859-15=ISO-8859-15
 iso_8859-1:1987=ISO-8859-1
 iso-ir-100=ISO-8859-1
 l1=ISO-8859-1
-ibm819=ISO-8859-1
 cp819=ISO-8859-1
 csisolatin1=ISO-8859-1
-#
-# Aliases for ISO-8859-2
-#
-latin2=ISO-8859-2
-iso_8859-2=ISO-8859-2
-iso_8859-2:1987=ISO-8859-2
-iso-ir-101=ISO-8859-2
-l2=ISO-8859-2
-csisolatin2=ISO-8859-2
-#
-# Aliases for ISO-8859-3
-#
-latin3=ISO-8859-3
-iso_8859-3=ISO-8859-3
-iso_8859-3:1988=ISO-8859-3
-iso-ir-109=ISO-8859-3
-l3=ISO-8859-3
-csisolatin3=ISO-8859-3
-#
-# Aliases for ISO-8859-4
-#
-latin4=ISO-8859-4
-iso_8859-4=ISO-8859-4
-iso_8859-4:1988=ISO-8859-4
-iso-ir-110=ISO-8859-4
-l4=ISO-8859-4
-csisolatin4=ISO-8859-4
-#
-# Aliases for ISO-8859-5
-#
-cyrillic=ISO-8859-5
-iso_8859-5=ISO-8859-5
-iso_8859-5:1988=ISO-8859-5
-iso-ir-144=ISO-8859-5
-csisolatincyrillic=ISO-8859-5
-#
-# Aliases for ISO-8859-6
-#
-arabic=ISO-8859-6
-iso_8859-6=ISO-8859-6
-iso_8859-6:1987=ISO-8859-6
-iso-ir-127=ISO-8859-6
-ecma-114=ISO-8859-6
-asmo-708=ISO-8859-6
-csisolatinarabic=ISO-8859-6
-#
+
 # Aliases for ISO-8859-6-I
-#
 csiso88596i=ISO-8859-6-I
-#
+
 # Aliases for ISO-8859-6-E
-#
 csiso88596e=ISO-8859-6-E
-#
-# Aliases for ISO-8859-7
-#
-greek=ISO-8859-7
-greek8=ISO-8859-7
-sun_eu_greek=ISO-8859-7
-iso_8859-7=ISO-8859-7
-iso_8859-7:1987=ISO-8859-7
-iso-ir-126=ISO-8859-7
-elot_928=ISO-8859-7
-ecma-118=ISO-8859-7
-csisolatingreek=ISO-8859-7
-#
-# Aliases for ISO-8859-8
-#
-hebrew=ISO-8859-8
-iso_8859-8=ISO-8859-8
-visual=ISO-8859-8
-iso_8859-8:1988=ISO-8859-8
-iso-ir-138=ISO-8859-8
-csisolatinhebrew=ISO-8859-8
-#
+
 # Aliases for ISO-8859-8-I
-#
-csiso88598i=ISO-8859-8-I
 iso-8859-8i=ISO-8859-8-I
-logical=ISO-8859-8-I
-#
+
 # Aliases for ISO-8859-8-E
-#
 csiso88598e=ISO-8859-8-E
-#
-# Aliases for UTF-8
-#
-unicode-1-1-utf-8=UTF-8
-# nl_langinfo(CODESET) in HP/UX returns 'utf8' under UTF-8 locales
-utf8=UTF-8
-#
+
 # Aliases for Shift_JIS
-#
-x-sjis=Shift_JIS
-shift-jis=Shift_JIS
-ms_kanji=Shift_JIS
-csshiftjis=Shift_JIS
-windows-31j=Shift_JIS
 cp932=Shift_JIS
-sjis=Shift_JIS
-#
-# Aliases for EUC_JP
-#
-cseucpkdfmtjapanese=EUC-JP
-x-euc-jp=EUC-JP
-#
+
 # Aliases for ISO-2022-JP
-#
-csiso2022jp=ISO-2022-JP
 # The following are really not aliases ISO-2022-JP, but sharing the same decoder
 iso-2022-jp-2=ISO-2022-JP
 csiso2022jp2=ISO-2022-JP
-#
+
 # Aliases for Big5
-#
-csbig5=Big5
-cn-big5=Big5
 # x-x-big5 is not really a alias for Big5, add it only for MS FrontPage
-x-x-big5=Big5
 # Sun Solaris
+
 zh_tw-big5=Big5
-#
+
 # Aliases for EUC-KR
-#
-cseuckr=EUC-KR
-ks_c_5601-1987=EUC-KR
-iso-ir-149=EUC-KR
-ks_c_5601-1989=EUC-KR
-ksc_5601=EUC-KR
-ksc5601=EUC-KR
-korean=EUC-KR
-csksc56011987=EUC-KR
 5601=EUC-KR
-windows-949=EUC-KR
-#
+
 # Aliases for GB2312
-#
 # The following are really not aliases GB2312, add them only for MS FrontPage
 gb_2312-80=GB2312
 iso-ir-58=GB2312
@@ -281,107 +97,28 @@
 csiso58gb231280=GB2312
 csgb2312=GB2312
 zh_cn.euc=GB2312
+
 # Sun Solaris
 gb_2312=GB2312
-#
-# Aliases for windows-125x
-#
-x-cp1250=windows-1250
-x-cp1251=windows-1251
-x-cp1252=windows-1252
-x-cp1253=windows-1253
-x-cp1254=windows-1254
-iso-8859-9=windows-1254
-iso8859-9=windows-1254
-iso88599=windows-1254
-latin5=windows-1254
-iso_8859-9=windows-1254
-iso_8859-9:1989=windows-1254
-iso-ir-148=windows-1254
-l5=windows-1254
-csisolatin5=windows-1254
-x-cp1255=windows-1255
-x-cp1256=windows-1256
-x-cp1257=windows-1257
-x-cp1258=windows-1258
-#
+
 # Aliases for windows-874 
-#
-windows-874=windows-874
-ibm874=windows-874
-dos-874=windows-874
-tis-620=windows-874
 tis620=windows-874
-iso-8859-11=windows-874
-iso8859-11=windows-874
-iso885911=windows-874
-#
-# Aliases for macintosh
-#
-macintosh=macintosh
-x-mac-roman=macintosh
-mac=macintosh
-csmacintosh=macintosh
-#
+
 # Aliases for IBM866
-#
-cp866=IBM866
 cp-866=IBM866
-866=IBM866
-csibm866=IBM866
-#
-# Aliases for IBM850
-#
-cp850=IBM850
-850=IBM850
-csibm850=IBM850
-#
-# Aliases for IBM852
-#
-cp852=IBM852
-852=IBM852
-csibm852=IBM852
-#
-# Aliases for IBM855
-#
-cp855=IBM855
-855=IBM855
-csibm855=IBM855
-#
-# Aliases for IBM857
-#
-cp857=IBM857
-857=IBM857
-csibm857=IBM857
-#
-# Aliases for IBM862
-#
-cp862=IBM862
-862=IBM862
-csibm862=IBM862
-#
-# Aliases for IBM864
-#
-cp864=IBM864
-864=IBM864
-csibm864=IBM864
-ibm-864=IBM864
-#
+
 # Aliases for T.61-8bit
-#
 t.61=T.61-8bit
 iso-ir-103=T.61-8bit
 csiso103t618bit=T.61-8bit
-#
+
 # Aliases for UTF-7
-#
 x-unicode-2-0-utf-7=UTF-7
 unicode-2-0-utf-7=UTF-7
 unicode-1-1-utf-7=UTF-7
 csunicode11utf7=UTF-7
-#
+
 # Aliases for ISO-10646-UCS-2
-#
 csunicode=UTF-16BE
 csunicode11=UTF-16BE
 iso-10646-ucs-basic=UTF-16BE
@@ -390,67 +127,15 @@
 csunicodelatin1=UTF-16BE
 iso-10646=UTF-16BE
 iso-10646-j-1=UTF-16BE
-#
-# Aliases for ISO-8859-10
-#
-latin6=ISO-8859-10
-iso-ir-157=ISO-8859-10
-l6=ISO-8859-10
-# Currently .properties cannot handle : in key
-#iso_8859-10:1992=ISO-8859-10
-csisolatin6=ISO-8859-10
-#
-# Aliases for ISO-8859-15
-#
-iso_8859-15=ISO-8859-15
-csisolatin9=ISO-8859-15
-l9=ISO-8859-15
-#
-# Aliases for ISO-IR-111
-#
-ecma-cyrillic=ISO-IR-111
-csiso111ecmacyrillic=ISO-IR-111
-#
-# Aliases for ISO-2022-KR
-#
-csiso2022kr=ISO-2022-KR
-#
+
 # Aliases for VISCII
-#
 csviscii=VISCII
-#
-# Aliases for x-euc-tw
-#
-zh_tw-euc=x-euc-tw
-#
+
 # Following names appears in unix nl_langinfo(CODESET)
 # They can be compiled as platform specific if necessary
 # DONT put things here if it does not look generic enough (like hp15CN)
-#
 iso88591=ISO-8859-1
-iso88592=ISO-8859-2
-iso88593=ISO-8859-3
-iso88594=ISO-8859-4
-iso88595=ISO-8859-5
-iso88596=ISO-8859-6
-iso88597=ISO-8859-7
-iso88598=ISO-8859-8
-iso885910=ISO-8859-10
 iso885912=ISO-8859-12
-iso885913=ISO-8859-13
-iso885914=ISO-8859-14
-iso885915=ISO-8859-15
-
-cp1250=windows-1250
-cp1251=windows-1251
-cp1252=windows-1252
-cp1253=windows-1253
-cp1254=windows-1254
-cp1255=windows-1255
-cp1256=windows-1256
-cp1257=windows-1257
-cp1258=windows-1258
-
-x-gbk=gbk
 windows-936=gbk
 ansi-1251=windows-1251
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/intl/charsetData.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/intl/charsetData.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/intl/charsetData.properties	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/intl/charsetData.properties	2014-11-26 21:44:59.000000000 +0000
@@ -24,7 +24,6 @@
 x-mac-hebrew.isInternal                 = true
 x-imap4-modified-utf7.isInternal        = true
 t.61-8bit.isInternal                    = true
-ibm864.isInternal                       = true
 replacement.isInternal                  = true
 
 t.61-8bit.notForOutgoing                = true
@@ -33,13 +32,10 @@
 us-ascii.notForOutgoing                 = true
 iso-8859-6-e.notForOutgoing             = true
 iso-8859-6-i.notForOutgoing             = true
-ibm864.notForOutgoing                   = true
-ibm869.notForOutgoing                   = true
 ibm1125.notForOutgoing                  = true
 ibm1131.notForOutgoing                  = true
 iso-8859-8-e.notForOutgoing             = true
 iso-8859-8.notForOutgoing               = true
-iso-2022-kr.notForOutgoing              = true
 x-johab.notForOutgoing                  = true
 replacement.notForOutgoing              = true
 
@@ -77,19 +73,10 @@
 gb18030.2000-1.LangGroup           = zh-CN
 hkscs-1.LangGroup                  = zh-HK
 hz-gb-2312.LangGroup               = zh-CN
-ibm850.LangGroup                   = x-western
-ibm852.LangGroup                   = x-central-euro
-ibm855.LangGroup                   = x-cyrillic
-ibm857.LangGroup                   = tr
-ibm862.LangGroup                   = he
-ibm864.LangGroup                   = ar
 ibm866.LangGroup                   = x-cyrillic
-ibm869.LangGroup                   = el
 ibm1125.LangGroup                  = x-cyrillic
 ibm1131.LangGroup                  = x-cyrillic
-iso-2022-cn.LangGroup              = zh-CN
 iso-2022-jp.LangGroup              = ja
-iso-2022-kr.LangGroup              = ko
 iso-8859-1.LangGroup               = x-western
 iso-8859-10.LangGroup              = x-western
 iso-8859-14.LangGroup              = x-western
@@ -110,7 +97,6 @@
 jis_0208-1983.LangGroup            = ja
 koi8-r.LangGroup                   = x-cyrillic
 koi8-u.LangGroup                   = x-cyrillic
-iso-ir-111.LangGroup               = x-cyrillic
 shift_jis.LangGroup                = ja
 windows-874.LangGroup              = th
 us-ascii.LangGroup                 = x-western
@@ -134,7 +120,6 @@
 windows-1256.LangGroup             = ar
 windows-1257.LangGroup             = x-baltic
 windows-1258.LangGroup             = x-western
-x-euc-tw.LangGroup                 = zh-TW
 gbk.LangGroup                      = zh-CN
 gb_2312-80.LangGroup               = zh-CN
 x-mac-ce.LangGroup                 = x-central-euro
@@ -161,10 +146,8 @@
 euc-jp.isMultibyte          = true
 big5.isMultibyte            = true
 big5-hkscs.isMultibyte      = true
-x-euc-tw.isMultibyte        = true
 gb2312.isMultibyte          = true
 hz-gb-2312.isMultibyte      = true
-iso-2022-kr.isMultibyte     = true
 euc-kr.isMultibyte          = true
 x-johab.isMultibyte         = true
 utf-7.isMultibyte           = true
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/intl/nsCharsetAlias.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/intl/nsCharsetAlias.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/intl/nsCharsetAlias.cpp	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/intl/nsCharsetAlias.cpp	2014-11-26 21:44:59.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/dom/EncodingUtils.h"
 
 #include "nsCharsetAlias.h"
 
@@ -13,6 +14,7 @@
 #include "nsUConvPropertySearch.h"
 
 using namespace mozilla;
+using namespace mozilla::dom;
 
 // 
 static const char* kAliases[][3] = {
@@ -25,11 +27,18 @@
 nsCharsetAlias::GetPreferredInternal(const nsACString& aAlias,
                                      nsACString& oResult)
 {
+   // First check charsetalias.properties and if there is no match, continue to
+   // call EncodingUtils::FindEncodingForLabel.
    nsAutoCString key(aAlias);
    ToLowerCase(key);
 
-   return nsUConvPropertySearch::SearchPropertyValue(kAliases,
+   nsresult rv = nsUConvPropertySearch::SearchPropertyValue(kAliases,
       ArrayLength(kAliases), key, oResult);
+   if (NS_SUCCEEDED(rv)) {
+     return NS_OK;
+   }
+   return EncodingUtils::FindEncodingForLabel(key, oResult) ?
+      NS_OK: NS_ERROR_NOT_AVAILABLE;
 }
 
 //--------------------------------------------------------------
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/src/nsLocalMailFolder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/src/nsLocalMailFolder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/src/nsLocalMailFolder.cpp	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/src/nsLocalMailFolder.cpp	2014-11-26 21:44:59.000000000 +0000
@@ -197,6 +197,7 @@
   rv = msgStore->RebuildIndex(this, mDatabase, aMsgWindow, this);
   if (NS_SUCCEEDED(rv))
     m_parsingFolder = true;
+
   return rv;
 }
 
@@ -1102,27 +1103,30 @@
 
 NS_IMETHODIMP nsMsgLocalMailFolder::RefreshSizeOnDisk()
 {
-  uint32_t oldFolderSize = mFolderSize;
-  mFolderSize = 0; // we set this to 0 to force it to get recalculated from disk
+  int64_t oldFolderSize = mFolderSize;
+  // we set this to unknown to force it to get recalculated from disk
+  mFolderSize = kSizeUnknown;
   if (NS_SUCCEEDED(GetSizeOnDisk(&mFolderSize)))
     NotifyIntPropertyChanged(kFolderSizeAtom, oldFolderSize, mFolderSize);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgLocalMailFolder::GetSizeOnDisk(uint32_t* aSize)
+NS_IMETHODIMP nsMsgLocalMailFolder::GetSizeOnDisk(int64_t *aSize)
 {
   NS_ENSURE_ARG_POINTER(aSize);
   nsresult rv = NS_OK;
-  if (!mFolderSize)
+  if (mFolderSize == kSizeUnknown)
   {
-    nsCOMPtr <nsIFile> file;
+    nsCOMPtr<nsIFile> file;
     rv = GetFilePath(getter_AddRefs(file));
     NS_ENSURE_SUCCESS(rv, rv);
+    // Use a temporary variable so that we keep mFolderSize on kSizeUnknown
+    // if GetFileSize() fails.
     int64_t folderSize;
     rv = file->GetFileSize(&folderSize);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    mFolderSize = (uint32_t) folderSize;
+    mFolderSize = folderSize;
   }
   *aSize = mFolderSize;
   return rv;
@@ -3140,6 +3144,17 @@
     // Clear this before calling OnStopRunningUrl, in case the url listener
     // tries to get the database.
     m_parsingFolder = false;
+
+    // TODO: Updating the size should be pushed down into the msg store backend
+    // so that the size is recalculated as part of parsing the folder data
+    // (important for maildir), once GetSizeOnDisk is pushed into the msgStores
+    // (bug 1032360).
+    (void)RefreshSizeOnDisk();
+
+    // Update the summary totals so the front end will
+    // show the right thing.
+    UpdateSummaryTotals(true);
+
     if (mReparseListener)
     {
       nsCOMPtr<nsIUrlListener> saveReparseListener = mReparseListener;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/src/nsLocalMailFolder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/src/nsLocalMailFolder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/src/nsLocalMailFolder.h	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/src/nsLocalMailFolder.h	2014-11-26 21:44:59.000000000 +0000
@@ -131,12 +131,12 @@
 
   NS_IMETHOD GetFolderURL(nsACString& url) MOZ_OVERRIDE;
 
-  NS_IMETHOD  GetManyHeadersToDownload(bool *retval) MOZ_OVERRIDE;
+  NS_IMETHOD GetManyHeadersToDownload(bool *retval) MOZ_OVERRIDE;
 
   NS_IMETHOD GetDeletable (bool *deletable) MOZ_OVERRIDE;
-  NS_IMETHOD GetSizeOnDisk(uint32_t* size) MOZ_OVERRIDE;
+  NS_IMETHOD GetSizeOnDisk(int64_t *size) MOZ_OVERRIDE;
 
-  NS_IMETHOD  GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) MOZ_OVERRIDE;
+  NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatabase **db) MOZ_OVERRIDE;
 
   NS_IMETHOD DeleteMessages(nsIArray *messages, 
                       nsIMsgWindow *msgWindow, bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/src/nsLocalUndoTxn.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/src/nsLocalUndoTxn.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/src/nsLocalUndoTxn.cpp	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/src/nsLocalUndoTxn.cpp	2014-11-26 21:44:59.000000000 +0000
@@ -460,7 +460,7 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsLocalMoveCopyMsgTxn::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int32_t oldValue, int32_t newValue)
+NS_IMETHODIMP nsLocalMoveCopyMsgTxn::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int64_t oldValue, int64_t newValue)
 {
   return NS_OK;
 }
@@ -512,7 +512,7 @@
     return NS_OK;
 }
 
-NS_IMETHODIMP nsLocalUndoFolderListener::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int32_t oldValue, int32_t newValue)
+NS_IMETHODIMP nsLocalUndoFolderListener::OnItemIntPropertyChanged(nsIMsgFolder *item, nsIAtom *property, int64_t oldValue, int64_t newValue)
 {
     return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/test/unit/test_over4GBMailboxes.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/test/unit/test_over4GBMailboxes.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/local/test/unit/test_over4GBMailboxes.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/local/test/unit/test_over4GBMailboxes.js	2014-11-26 21:44:59.000000000 +0000
@@ -35,8 +35,10 @@
 const kNearLimit = kSizeLimit - 0x1000000; // -16MiB
 
 var gGotAlert = false;
-var gInboxFile = null;
-var gInboxSize = 0;
+var gInboxFile = null;         // The mbox file storing the Inbox folder
+var gInboxSize = 0;            // The size of the Inbox folder
+var gInbox;                    // The nsIMsgFolder object of the Inbox folder in Local Folders
+var gExpectedNewMessages = 0;  // The number of messages pushed manually into the mbox file
 
 // This alert() is triggered when file size becomes close (enough) to or
 // exceeds 4 GiB.
@@ -47,23 +49,59 @@
   gGotAlert = true;
 }
 
+// A stub nsIMsgFolderListener that only listens to changes on Inbox and stores
+// the seen values for interesting folder properties so we can later test them.
+var FListener = {
+  folderSize: [-1], // an array of seen values of "FolderSize"
+  totalMsgs: [-1],  // an array of seen values of "TotalMessages"
+
+  // Returns the value that is stored 'aBack' entries from the last one in the history.
+  sizeHistory: function (aBack) {
+    return this.folderSize[this.folderSize.length - 1 - aBack];
+  },
+  msgsHistory: function (aBack) {
+    return this.totalMsgs[this.totalMsgs.length - 1 - aBack];
+  },
+
+  OnItemAdded: function act_add(aRDFParentItem, aItem) {},
+  OnItemRemoved: function act_remove(aRDFParentItem, aItem) {},
+  OnItemPropertyChanged: function(aItem, aProperty, aOld, aNew) {},
+  OnItemIntPropertyChanged: function(aItem, aProperty, aOld, aNew) {
+    if (aItem.prettyName == "Inbox") {
+      dump("Property change on folder Inbox:" + aProperty + "=" + aOld + "->" + aNew + "\n");
+      if (aProperty == "FolderSize")
+        this.folderSize.push(aNew);
+      else if (aProperty == "TotalMessages")
+        this.totalMsgs.push(aNew);
+    }
+  },
+  OnItemBoolPropertyChanged: function(aItem, aProperty, aOld, aNew) {},
+  OnItemUnicharPropertyChanged: function(aItem, aProperty, aOld, aNew) {},
+  OnItemPropertyFlagChanged: function(aItem, aProperty, aOld, aNew) {},
+  OnItemEvent: function(aFolder, aEvent) {},
+};
+
 /**
  * Grow local inbox folder to the wanted size using direct appending
  * to the underlying file. The folder is filled with copies of a dummy
  * message with kSparseBlockSize bytes in size.
  * The file is marked as sparse in the filesystem so that it does not
  * really take 4GiB and working with it is faster.
+ *
+ * @return  The number of messages created in the folder file.
  */
 function growInbox(aWantedSize) {
+  let msgsAdded = 0;
   // Put a single message in the Inbox.
   let messageGenerator = new MessageGenerator();
   let message = messageGenerator.makeMessage();
 
   // Refresh 'gInboxFile'.
-  gInboxFile = localAccountUtils.inboxFolder.filePath;
+  gInboxFile = gInbox.filePath;
+  let localSize = 0;
 
   let mboxString = message.toMboxString();
-  let plugStore = localAccountUtils.inboxFolder.msgStore;
+  let plugStore = gInbox.msgStore;
   // Grow local inbox to our wished size that is below the max limit.
   do {
     let nextOffset = gInboxFile.fileSize +
@@ -73,8 +111,7 @@
     // Get stream to write a new message.
     let reusable = new Object;
     let newMsgHdr = new Object;
-    let outputStream = plugStore.getNewMsgOutputStream(localAccountUtils.inboxFolder,
-                                                       newMsgHdr, reusable)
+    let outputStream = plugStore.getNewMsgOutputStream(gInbox, newMsgHdr, reusable)
                                 .QueryInterface(Ci.nsISeekableStream);
     // Write message header.
     outputStream.write(mboxString, mboxString.length);
@@ -90,14 +127,18 @@
     outputStream.write("\r\n", 2);
     outputStream.close();
     plugStore.finishNewMessage(outputStream, newMsgHdr);
+    msgsAdded++;
 
     // Refresh 'gInboxFile'.
-    gInboxFile = localAccountUtils.inboxFolder.filePath;
+    gInboxFile = gInbox.filePath;
+    localSize = gInboxFile.fileSize;
   }
-  while (gInboxFile.fileSize < aWantedSize);
+  while (localSize < aWantedSize);
 
-  do_print("Local inbox size = " + gInboxFile.fileSize + "bytes = " +
-           gInboxFile.fileSize / 1024 / 1024 + "MiB");
+  do_print("Local inbox size = " + localSize + "bytes = " +
+           mailTestUtils.toMiBString(localSize));
+  do_check_eq(localSize, aWantedSize);
+  return msgsAdded;
 }
 
 function run_test()
@@ -108,7 +149,8 @@
   // all the operations.
   do_test_pending();
 
-  gInboxFile = localAccountUtils.inboxFolder.filePath;
+  gInbox = localAccountUtils.inboxFolder;
+  gInboxFile = gInbox.filePath;
 
   let neededFreeSpace = kSizeLimit + 0x10000000; // +256MiB
   // On Windows, check whether the drive is NTFS. If it is, mark the file as
@@ -134,16 +176,17 @@
     return;
   }
 
-  // Grow inbox to size near the max limit.
-  growInbox(kNearLimit);
+  MailServices.mailSession.AddFolderListener(FListener, Ci.nsIFolderListener.all);
+
+  // Grow inbox to a size near the max limit.
+  gExpectedNewMessages = growInbox(kNearLimit);
 
   // Force the db closed, so that getDatabaseWithReparse will notice
   // that it's out of date.
-  localAccountUtils.inboxFolder.msgDatabase.ForceClosed();
-  localAccountUtils.inboxFolder.msgDatabase = null;
+  gInbox.msgDatabase.ForceClosed();
+  gInbox.msgDatabase = null;
   try {
-    localAccountUtils.inboxFolder.getDatabaseWithReparse(ParseListener_run_test,
-                                                         gDummyMsgWindow);
+    gInbox.getDatabaseWithReparse(ParseListener_run_test, gDummyMsgWindow);
   } catch (ex) {
     do_check_eq(ex.result, Cr.NS_ERROR_NOT_INITIALIZED);
   }
@@ -179,6 +222,7 @@
   let localInboxSize = gInboxFile.fileSize;
   do_check_true(localInboxSize > kNearLimit);
   do_check_true(localInboxSize < kSizeLimit);
+  do_check_eq(gInbox.sizeOnDisk, localInboxSize);
   // The big file is between 1 and 2 MiB. Append it 16 times to attempt to cross the 4GiB limit.
   gPOP3Pump.files = ["../../../data/mime-torture", "../../../data/mime-torture",
                      "../../../data/mime-torture", "../../../data/mime-torture",
@@ -203,16 +247,15 @@
   gPOP3Pump = null;
 
   // Grow inbox to size greater than the max limit (+16 MiB).
-  growInbox(kSizeLimit + 0x1000000);
+  gExpectedNewMessages = growInbox(kSizeLimit + 0x1000000);
   do_check_true(gInboxFile.fileSize > kSizeLimit);
 
   // Force the db closed, so that getDatabaseWithReparse will notice
   // that it's out of date.
-  localAccountUtils.inboxFolder.msgDatabase.ForceClosed();
-  localAccountUtils.inboxFolder.msgDatabase = null;
+  gInbox.msgDatabase.ForceClosed();
+  gInbox.msgDatabase = null;
   try {
-    localAccountUtils.inboxFolder.getDatabaseWithReparse(ParseListener_growOver4GiB,
-                                                         gDummyMsgWindow);
+    gInbox.getDatabaseWithReparse(ParseListener_growOver4GiB, gDummyMsgWindow);
   } catch (ex) {
     do_check_eq(ex.result, Cr.NS_ERROR_NOT_INITIALIZED);
   }
@@ -240,7 +283,7 @@
   do_check_true(gGotAlert);
 
   // Make sure inbox file did not grow (i.e., no data were appended).
-  let newLocalInboxSize = localAccountUtils.inboxFolder.filePath.fileSize;
+  let newLocalInboxSize = gInbox.filePath.fileSize;
   do_print("Local inbox size (after copyFileMessageInLocalFolder()) = " +
            newLocalInboxSize);
   do_check_eq(newLocalInboxSize, localInboxSize);
@@ -251,11 +294,10 @@
 
   // Force the db closed, so that getDatabaseWithReparse will notice
   // that it's out of date.
-  localAccountUtils.inboxFolder.msgDatabase.ForceClosed();
-  localAccountUtils.inboxFolder.msgDatabase = null;
+  gInbox.msgDatabase.ForceClosed();
+  gInbox.msgDatabase = null;
   try {
-    localAccountUtils.inboxFolder.getDatabaseWithReparse(ParseListener_copyIntoOver4GiB,
-                                                         gDummyMsgWindow);
+    gInbox.getDatabaseWithReparse(ParseListener_copyIntoOver4GiB, gDummyMsgWindow);
   } catch (ex) {
     do_check_eq(ex.result, Cr.NS_ERROR_NOT_INITIALIZED);
   }
@@ -271,7 +313,7 @@
   gInboxSize = gInboxFile.fileSize;
   do_check_true(gInboxSize > kSizeLimit);
   // Delete the last small message at folder end.
-  let msgDB = localAccountUtils.inboxFolder.msgDatabase;
+  let msgDB = gInbox.msgDatabase;
   let enumerator = msgDB.EnumerateMessages();
   let messages = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
   while (enumerator.hasMoreElements()) {
@@ -281,7 +323,7 @@
       messages.appendElement(header, false);
     }
   }
-  localAccountUtils.inboxFolder.deleteMessages(messages, null, true, false, null, false);
+  gInbox.deleteMessages(messages, null, true, false, null, false);
 
   /* Unfortunately, the compaction now would kill the sparse markings in the file
    * so it will really take 4GiB of space in the filesystem and may be slow
@@ -291,11 +333,11 @@
   if (Math.random() * 100 < 1) {
     // Note: compact() will also add 'X-Mozilla-Status' and 'X-Mozilla-Status2'
     // lines to message(s).
-    localAccountUtils.inboxFolder.compact(CompactListener_compactOver4GiB, null);
+    gInbox.compact(CompactListener_compactOver4GiB, null);
     // Execution continues in compactUnder4GiB() when done.
   } else {
     // Just continue directly without compacting yet.
-    dump("compactOver4GiB test skipped deliberately due to long expected run time. It will may be run in other test run with a 1 in 100 chance.");
+    dump("compactOver4GiB test skipped deliberately due to long expected run time. It will be run in other test run with a 1 in 100 chance.");
     compactUnder4GiB();
   }
 }
@@ -306,10 +348,23 @@
  */
 function compactUnder4GiB()
 {
+  // The folder is still above 4GB.
   do_check_true(gInboxFile.fileSize > kSizeLimit);
+  let folderSize = gInbox.sizeOnDisk;
+  let totalMsgs = gInbox.getTotalMessages(false);
+  // Let's close the database and re-open the folder (hopefully dumping memory caches)
+  // and re-reading the values from disk (msg database). That is to test if
+  // the values were properly serialized to the database.
+  gInbox.ForceDBClosed();
+  gInbox.msgDatabase = null;
+  gInbox.getDatabaseWOReparse();
+
+  do_check_eq(gInbox.sizeOnDisk, folderSize);
+  do_check_eq(gInbox.getTotalMessages(false), totalMsgs);
+
   // Very first header in msgDB is retained,
   // then all other headers are marked as deleted.
-  let msgDB = localAccountUtils.inboxFolder.msgDatabase;
+  let msgDB = gInbox.msgDatabase;
   let enumerator = msgDB.EnumerateMessages();
   let firstHdr = true;
   let messages = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
@@ -319,11 +374,11 @@
       messages.appendElement(header, false);
     firstHdr = false;
   }
-  localAccountUtils.inboxFolder.deleteMessages(messages, null, true, false, null, false);
+  gInbox.deleteMessages(messages, null, true, false, null, false);
 
   // Note: compact() will also add 'X-Mozilla-Status' and 'X-Mozilla-Status2'
   // lines to message(s).
-  localAccountUtils.inboxFolder.compact(CompactListener_compactUnder4GiB, null);
+  gInbox.compact(CompactListener_compactUnder4GiB, null);
   // Test ends after compaction is done.
 }
 
@@ -333,8 +388,14 @@
   OnStopRunningUrl: function (aUrl, aExitCode) {
     // Check: reparse successful
     do_check_eq(aExitCode, 0);
-    do_check_neq(localAccountUtils.inboxFolder.msgDatabase, null);
-    do_check_true(localAccountUtils.inboxFolder.msgDatabase.summaryValid);
+    do_check_neq(gInbox.msgDatabase, null);
+    do_check_true(gInbox.msgDatabase.summaryValid);
+    // Bug 813459
+    // Check if the OnItemIntPropertyChanged folder listener hook can return
+    // values below 2^32 for properties which are not 64 bits long.
+    do_check_eq(FListener.msgsHistory(0), gExpectedNewMessages);
+    do_check_eq(FListener.msgsHistory(0), gInbox.getTotalMessages(false));
+    do_check_eq(FListener.sizeHistory(0), gInbox.sizeOnDisk);
 
     downloadUnder4GiB();
   }
@@ -346,8 +407,18 @@
   OnStopRunningUrl: function (aUrl, aExitCode) {
     // Check: reparse successful
     do_check_eq(aExitCode, 0);
-    do_check_neq(localAccountUtils.inboxFolder.msgDatabase, null);
-    do_check_true(localAccountUtils.inboxFolder.msgDatabase.summaryValid);
+    do_check_neq(gInbox.msgDatabase, null);
+    do_check_true(gInbox.msgDatabase.summaryValid);
+    // Bug 789679
+    // Check if the public SizeOnDisk method can return sizes above 4GB.
+    do_check_true(gInbox.sizeOnDisk > kSizeLimit);
+    // Bug 813459
+    // Check if the OnItemIntPropertyChanged folder listener hook can return
+    // values above 2^32 for properties where it is relevant.
+    do_check_eq(FListener.sizeHistory(0), gInbox.sizeOnDisk);
+    do_check_true(FListener.sizeHistory(1) < FListener.sizeHistory(0));
+    do_check_eq(FListener.msgsHistory(0),
+                FListener.msgsHistory(1) + gExpectedNewMessages);
 
     copyIntoOver4GiB();
   }
@@ -359,8 +430,8 @@
   OnStopRunningUrl: function (aUrl, aExitCode) {
     // Check: reparse successful
     do_check_eq(aExitCode, 0);
-    do_check_neq(localAccountUtils.inboxFolder.msgDatabase, null);
-    do_check_true(localAccountUtils.inboxFolder.msgDatabase.summaryValid);
+    do_check_neq(gInbox.msgDatabase, null);
+    do_check_true(gInbox.msgDatabase.summaryValid);
 
     compactOver4GiB();
   }
@@ -372,13 +443,14 @@
   OnStopRunningUrl: function (aUrl, aExitCode) {
     // Check: message successfully copied.
     do_check_eq(aExitCode, 0);
-    do_check_true(localAccountUtils.inboxFolder.msgDatabase.summaryValid);
+    do_check_true(gInbox.msgDatabase.summaryValid);
     // Check that folder size is still above max limit ...
-    let localInboxSize = localAccountUtils.inboxFolder.filePath.fileSize;
-    do_print("Local inbox size (after compact()) = " + localInboxSize);
+    let localInboxSize = gInbox.filePath.fileSize;
+    do_print("Local inbox size (after compact 1) = " + localInboxSize);
     do_check_true(localInboxSize > kSizeLimit);
     // ... but it got smaller by removing 1 message.
     do_check_true(gInboxSize > localInboxSize);
+    do_check_eq(gInbox.sizeOnDisk, localInboxSize);
 
     compactUnder4GiB();
   }
@@ -390,14 +462,17 @@
   OnStopRunningUrl: function (aUrl, aExitCode) {
     // Check: message successfully copied.
     do_check_eq(aExitCode, 0);
-    do_check_true(localAccountUtils.inboxFolder.msgDatabase.summaryValid);
+    do_check_true(gInbox.msgDatabase.summaryValid);
 
     // Check that folder size isn't much bigger than our sparse block size, ...
-    let localInboxSize = localAccountUtils.inboxFolder.filePath.fileSize;
-    do_print("Local inbox size (after compact()) = " + localInboxSize);
+    let localInboxSize = gInbox.filePath.fileSize;
+    do_print("Local inbox size (after compact 2) = " + localInboxSize);
+    do_check_eq(gInbox.sizeOnDisk, localInboxSize);
     do_check_true(localInboxSize < kSparseBlockSize + 1000);
     // ... i.e., that we just have one message.
-    do_check_eq(localAccountUtils.inboxFolder.getTotalMessages(false), 1);
+    do_check_eq(gInbox.getTotalMessages(false), 1);
+    do_check_eq(FListener.sizeHistory(0), gInbox.sizeOnDisk);
+    do_check_eq(FListener.msgsHistory(0), 1);
 
     endTest();
   }
@@ -405,9 +480,10 @@
 
 function endTest()
 {
+   MailServices.mailSession.RemoveFolderListener(FListener);
   // Free up disk space - if you want to look at the file after running
   // this test, comment out this line.
-  localAccountUtils.inboxFolder.filePath.remove(false);
+  gInbox.filePath.remove(false);
 
   do_test_finished();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/src/jsmime.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/src/jsmime.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/src/jsmime.jsm	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/src/jsmime.jsm	2014-11-26 21:45:00.000000000 +0000
@@ -3,7 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 // vim:set ts=2 sw=2 sts=2 et ft=javascript:
 
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 /**
  * This file exports the JSMime code, polyfilling code as appropriate for use in
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/src/mimeJSComponents.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/src/mimeJSComponents.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/src/mimeJSComponents.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/src/mimeJSComponents.js	2014-11-26 21:45:00.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/. */
 
-Components.utils.import("resource:///modules/Deprecated.jsm");
+Components.utils.import("resource://gre/modules/Deprecated.jsm");
 Components.utils.import("resource:///modules/jsmime.jsm");
 Components.utils.import("resource:///modules/mimeParser.jsm");
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function HeaderHandler() {
   this.value = "";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/src/mimeParser.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/src/mimeParser.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/src/mimeParser.jsm	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/src/mimeParser.jsm	2014-11-26 21:45:00.000000000 +0000
@@ -3,8 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 // vim:set ts=2 sw=2 sts=2 et ft=javascript:
 
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource:///modules/jsmime.jsm");
 
 var EXPORTED_SYMBOLS = ["MimeParser"];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/test/unit/test_structured_headers.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/test/unit/test_structured_headers.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/mime/test/unit/test_structured_headers.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/mime/test/unit/test_structured_headers.js	2014-11-26 21:45:00.000000000 +0000
@@ -5,7 +5,7 @@
 // This tests the msgIStructuredHeaders and msgIWritableStructuredHeaders
 // interfaces.
 
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 /// Verify that a specific XPCOM error code is thrown.
 function verifyError(block, errorCode) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/news/src/nsNewsFolder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/news/src/nsNewsFolder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/news/src/nsNewsFolder.cpp	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/news/src/nsNewsFolder.cpp	2014-11-26 21:45:00.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsIMsgMailNewsUrl.h"
 #include "nsNewsFolder.h"
 #include "nsMsgFolderFlags.h"
+#include "MailNewsTypes.h"
 #include "prprf.h"
 #include "prsystem.h"
 #include "nsIArray.h"
@@ -73,8 +74,6 @@
 
 #define kNewsSortOffset 9000
 
-#define kSizeUnknown 1
-
 #define NEWS_SCHEME "news:"
 #define SNEWS_SCHEME "snews:"
 
@@ -758,7 +757,7 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgNewsFolder::GetSizeOnDisk(uint32_t *size)
+NS_IMETHODIMP nsMsgNewsFolder::GetSizeOnDisk(int64_t *size)
 {
   NS_ENSURE_ARG_POINTER(size);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/news/src/nsNewsFolder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/news/src/nsNewsFolder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/news/src/nsNewsFolder.h	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/news/src/nsNewsFolder.h	2014-11-26 21:45:00.000000000 +0000
@@ -53,7 +53,7 @@
 
   NS_IMETHOD RefreshSizeOnDisk();
 
-  NS_IMETHOD GetSizeOnDisk(uint32_t *size) MOZ_OVERRIDE;
+  NS_IMETHOD GetSizeOnDisk(int64_t *size) MOZ_OVERRIDE;
 
   NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo,
                                   nsIMsgDatabase **db) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/test/fakeserver/pop3d.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/test/fakeserver/pop3d.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/test/fakeserver/pop3d.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/test/fakeserver/pop3d.js	2014-11-26 21:45:00.000000000 +0000
@@ -13,7 +13,7 @@
   'POP3_RFC5034_handler'
 ];
 
-Components.utils.import("resource://gre/modules/IOUtils.js");
+Components.utils.import("resource:///modules/IOUtils.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://testing-common/mailnews/auth.js");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/test/resources/IMAPpump.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/test/resources/IMAPpump.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/test/resources/IMAPpump.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/test/resources/IMAPpump.js	2014-11-26 21:45:00.000000000 +0000
@@ -18,8 +18,8 @@
 ];
 
 Components.utils.import("resource:///modules/mailServices.js");
-Components.utils.import("resource:///modules/Services.jsm");
-Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://testing-common/mailnews/localAccountUtils.js");
 Components.utils.import("resource://testing-common/mailnews/maild.js");
 Components.utils.import("resource://testing-common/mailnews/auth.js");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/test/resources/passwordStorage.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/test/resources/passwordStorage.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mailnews/test/resources/passwordStorage.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mailnews/test/resources/passwordStorage.js	2014-11-26 21:45:00.000000000 +0000
@@ -1,7 +1,7 @@
 if (typeof gDEPTH == "undefined")
   do_throw("gDEPTH must be defined when using passwordStorage.js");
 
-Components.utils.import("resource:///modules/Services.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 /**
  * Use the given storage database as the current signon database.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/base/nsAccessibilityService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/base/nsAccessibilityService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/base/nsAccessibilityService.cpp	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/base/nsAccessibilityService.cpp	2014-11-26 21:45:44.000000000 +0000
@@ -1555,6 +1555,9 @@
       if (aContext->IsList() &&
           aContext->GetContent() == aContent->GetParent()) {
         newAcc = new HTMLLIAccessible(aContent, document);
+      } else {
+        // Otherwise create a generic text accessible to avoid text jamming.
+        newAcc = new HyperTextAccessibleWrap(aContent, document);
       }
       break;
     case eHTMLSelectListType:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/base/nsAccessibilityService.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/base/nsAccessibilityService.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/base/nsAccessibilityService.h	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/base/nsAccessibilityService.h	2014-11-26 21:45:44.000000000 +0000
@@ -251,6 +251,8 @@
 inline bool
 IPCAccessibilityActive()
 {
+  // XXX temporarily disable ipc accessibility because of crashes.
+return false;
 #ifdef MOZ_B2G
   return false;
 #else
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/generic/HyperTextAccessible.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/generic/HyperTextAccessible.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/generic/HyperTextAccessible.cpp	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/generic/HyperTextAccessible.cpp	2014-11-26 21:45:45.000000000 +0000
@@ -508,7 +508,7 @@
   const bool kIsKeyboardSelect = true; // is keyboard selection
   const bool kIsVisualBidi = false; // use visual order for bidi text
   nsPeekOffsetStruct pos(aAmount, aDirection, innerContentOffset,
-                         0, kIsJumpLinesOk, kIsScrollViewAStop,
+                         nsPoint(0, 0), kIsJumpLinesOk, kIsScrollViewAStop,
                          kIsKeyboardSelect, kIsVisualBidi,
                          aWordMovementType);
   nsresult rv = frameAtOffset->PeekOffset(&pos);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/jsat/Presentation.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/jsat/Presentation.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/jsat/Presentation.jsm	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/jsat/Presentation.jsm	2014-11-26 21:45:45.000000000 +0000
@@ -451,6 +451,18 @@
       UtteranceGenerator.genForLiveRegion(aContext, aIsHide, aModifiedText));
   };
 
+AndroidPresenter.prototype.noMove =
+  function AndroidPresenter_noMove(aMoveMethod) {
+    return {
+      type: this.type,
+      details: [
+      { eventType: this.ANDROID_VIEW_ACCESSIBILITY_FOCUSED,
+        exitView: aMoveMethod,
+        text: ['']
+      }]
+    };
+  };
+
 /**
  * A B2G presenter for Gaia.
  */
@@ -495,7 +507,8 @@
           pattern: this.PIVOT_CHANGE_HAPTIC_PATTERN,
           isKey: Utils.isActivatableOnFingerUp(aContext.accessible),
           reason: this.pivotChangedReasons[aReason],
-          isUserInput: aIsUserInput
+          isUserInput: aIsUserInput,
+          hints: aContext.interactionHints
         }
       }
     };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/jsat/Utils.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/jsat/Utils.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/jsat/Utils.jsm	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/jsat/Utils.jsm	2014-11-26 21:45:45.000000000 +0000
@@ -828,6 +828,25 @@
     }
   },
 
+  /**
+   * Get interaction hints for the context ancestry.
+   * @return {Array} Array of interaction hints.
+   */
+  get interactionHints() {
+    let hints = [];
+    this.newAncestry.concat(this.accessible).reverse().forEach(aAccessible => {
+      let hint = Utils.getAttributes(aAccessible)['moz-hint'];
+      if (hint) {
+        hints.push(hint);
+      } else if (aAccessible.actionCount > 0) {
+        hints.push({
+          string: Utils.AccRetrieval.getStringRole(aAccessible.role) + '-hint'
+        });
+      }
+    });
+    return hints;
+  },
+
   /*
    * A subtree generator function, used to generate a flattened
    * list of the accessible's subtree in pre or post order.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/jsat/a11y.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/jsat/a11y.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/jsat/a11y.ini	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/jsat/a11y.ini	2014-11-26 21:45:45.000000000 +0000
@@ -15,6 +15,7 @@
 skip-if = buildapp == 'mulet'
 [test_explicit_names.html]
 [test_gesture_tracker.html]
+[test_hints.html]
 [test_landmarks.html]
 [test_live_regions.html]
 [test_output.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/jsat/output.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/jsat/output.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/jsat/output.js	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/jsat/output.js	2014-11-26 21:45:45.000000000 +0000
@@ -99,3 +99,16 @@
   }
   testObjectOutput(aAccOrElmOrID, generator);
 }
+
+function testHints(expected, aAccOrElmOrID, aOldAccOrElmOrID) {
+  var accessible = getAccessible(aAccOrElmOrID);
+  var oldAccessible = aOldAccOrElmOrID !== null ?
+  getAccessible(aOldAccOrElmOrID || 'root') : null;
+  var context = new PivotContext(accessible, oldAccessible);
+  var hints = context.interactionHints;
+
+  isDeeply(hints, expected,
+           "Context hitns are correct for " + aAccOrElmOrID +
+           " (hints: " + JSON.stringify(hints) + ") ==" +
+           " (expected: " + JSON.stringify(expected) + ")");
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/jsat/test_hints.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/jsat/test_hints.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/jsat/test_hints.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/jsat/test_hints.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,85 @@
+<html>
+<head>
+  <title> [AccessFu] Interaction Hints </title>
+
+  <link rel="stylesheet" type="text/css"
+        href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript"
+          src="../common.js"></script>
+  <script type="application/javascript"
+          src="output.js"></script>
+  <script type="application/javascript">
+
+    function doTest() {
+      var tests = [{
+        accOrElmOrID: 'can_wheel',
+        expectedHints: ['Swipe with two fingers to move between pages']
+      }, {
+        accOrElmOrID: 'nested_link',
+        expectedHints: [{string: 'link-hint'},
+          'Swipe with two fingers to move between pages']
+      }, {
+        accOrElmOrID: 'nested_link',
+        oldAccOrElmOrID: 'can_wheel',
+        expectedHints: [{string: 'link-hint'}]
+      }, {
+        accOrElmOrID: 'link_with_default_hint',
+        expectedHints: [{string: 'link-hint'}]
+      }, {
+        accOrElmOrID: 'link_with_hint_override',
+        expectedHints: ['Tap and hold to get to menu']
+      }, {
+        accOrElmOrID: 'button_with_default_hint',
+        expectedHints: [{string: 'pushbutton-hint'}]
+      }, {
+        accOrElmOrID: 'button_with_hint_override',
+        expectedHints: ['Tap and hold to activate']
+      }, {
+        accOrElmOrID: 'nested_link2',
+        expectedHints: [{string: 'link-hint'}]
+      }, {
+        accOrElmOrID: 'nested_link3',
+        expectedHints: [{string: 'link-hint'}, {string: 'pushbutton-hint'},
+          "Double tap and hold to activate"]
+      }];
+
+      // Test hints.
+      tests.forEach(function run(test) {
+        testHints(test.expectedHints, test.accOrElmOrID, test.oldAccOrElmOrID);
+      });
+
+      SimpleTest.finish();
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addA11yLoadEvent(doTest);
+  </script>
+</head>
+<body>
+  <div id="root">
+    <a target="_blank"
+       href="https://bugzilla.mozilla.org/show_bug.cgi?id=1069574"
+       title="[AccessFu] Interaction Hints">
+       Mozilla Bug 1069574
+       </a>
+    <p id="display"></p>
+    <div id="content" style="display: none"></div>
+    <pre id="test"></pre>
+      <span role="region" id="can_wheel" aria-moz-hint="Swipe with two fingers to move between pages">
+        <a href="#" id="nested_link">I can be clicked</a>
+      </span>
+      <span role="region" aria-moz-hint="">
+        <a><a href="#" id="nested_link2">I can be clicked</a></a>
+      </span>
+      <span role="region" aria-moz-hint="Double tap and hold to activate">
+        <button><a href="#" id="nested_link3">I can be clicked</a></button>
+      </span>
+      <a href="#" id="link_with_default_hint">I can be clicked</a>
+      <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>
+  </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/textattrs/test_general.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/textattrs/test_general.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/textattrs/test_general.html	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/textattrs/test_general.html	2014-11-26 21:45:45.000000000 +0000
@@ -709,12 +709,12 @@
   </p>
 
   <p id="area17">
-    <span style="-moz-text-decoration-line: underline;">underline
-    </span><span style="text-decoration: underline; -moz-text-decoration-color: blue;">blue
-    </span><span style="text-decoration: underline; -moz-text-decoration-style: dotted;">dotted
-    </span><span style="-moz-text-decoration-line: line-through;">linethrough
-    </span><span style="text-decoration: line-through; -moz-text-decoration-color: blue;">blue
-    </span><span style="text-decoration: line-through; -moz-text-decoration-style: wavy;">wavy
+    <span style="text-decoration-line: underline;">underline
+    </span><span style="text-decoration: underline; text-decoration-color: blue;">blue
+    </span><span style="text-decoration: underline; text-decoration-style: dotted;">dotted
+    </span><span style="text-decoration-line: line-through;">linethrough
+    </span><span style="text-decoration: line-through; text-decoration-color: blue;">blue
+    </span><span style="text-decoration: line-through; text-decoration-style: wavy;">wavy
     </span>
   </p>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/tree/test_aria_list.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/tree/test_aria_list.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/tree/test_aria_list.html	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/tree/test_aria_list.html	2014-11-26 21:45:45.000000000 +0000
@@ -34,10 +34,15 @@
       accTree = { // div@role="list"
         role: ROLE_LIST,
         children: [
-          { // li text leaf
-             role: ROLE_TEXT_LEAF,
-             name: "item1",
-             children: [ ]
+          { // li
+            role: ROLE_PARAGRAPH,
+            children: [
+              { // li text leaf
+                role: ROLE_TEXT_LEAF,
+                name: "item1",
+                children: [ ]
+              }
+            ]
           },
           { // li@role="listitem"
             role: ROLE_LISTITEM,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html	2014-11-26 21:45:45.000000000 +0000
@@ -56,6 +56,15 @@
       ] };
     testAccessibleTree("tblfocusable_cnt", tree);
 
+    // Presentation list, expose generic accesisble for list items.
+    tree =
+      { SECTION: [ // container
+        { PARAGRAPH: [ // li generic accessible
+          { TEXT_LEAF: [ ] } // li text
+        ] }
+      ] };
+    testAccessibleTree("list_cnt", tree);
+
     // Has ARIA globals or referred by ARIA relationship.
     tree =
       { SECTION: [ // container
@@ -113,6 +122,12 @@
     </table>
   </div>
 
+  <div id="list_cnt">
+    <ul role="presentation">
+      <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>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/tree/test_brokencontext.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/tree/test_brokencontext.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/accessible/tests/mochitest/tree/test_brokencontext.html	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/accessible/tests/mochitest/tree/test_brokencontext.html	2014-11-26 21:45:45.000000000 +0000
@@ -80,15 +80,15 @@
 
     ok(!isAccessible("presentation_ul"),
                      "presentational ul shouldn't be accessible");
-    ok(!isAccessible("item_in_presentation_ul"),
-                     "li in presentational ul shouldn't be accessible");
-    ok(!isAccessible("styleditem_in_presentation_ul"),
-                     "list styled span in presentational ul shouldn't be accessible");
+    ok(isAccessible("item_in_presentation_ul"),
+                    "li in presentational ul should have generic accessible");
+    ok(isAccessible("styleditem_in_presentation_ul"),
+                    "list styled span in presentational ul should have generic accessible");
 
     ok(!isAccessible("presentation_ol"),
                      "presentational ol shouldn't be accessible");
-    ok(!isAccessible("item_in_presentation_ol"),
-                     "li in presentational ol shouldn't be accessible");
+    ok(isAccessible("item_in_presentation_ol"),
+                    "li in presentational ol should have generic accessible");
 
     ok(!isAccessible("presentation_dl"),
                      "presentational dl shouldn't be accessible");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/moz.build	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/moz.build	2014-11-26 21:45:45.000000000 +0000
@@ -171,6 +171,7 @@
 ]
 
 EXTRA_JS_MODULES.commonjs.framescript += [
+    'source/lib/framescript/contextmenu-events.js',
     'source/lib/framescript/FrameScriptManager.jsm',
     'source/lib/framescript/LoaderHelper.jsm',
     'source/lib/framescript/tab-events.js',
@@ -235,6 +236,7 @@
 EXTRA_JS_MODULES.commonjs.sdk.content += [
     'source/lib/sdk/content/content-worker.js',
     'source/lib/sdk/content/content.js',
+    'source/lib/sdk/content/context-menu.js',
     'source/lib/sdk/content/events.js',
     'source/lib/sdk/content/loader.js',
     'source/lib/sdk/content/mod.js',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/framescript/contextmenu-events.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/framescript/contextmenu-events.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/framescript/contextmenu-events.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/framescript/contextmenu-events.js	2014-11-26 21:45:45.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/. */
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
+
+// Holds remote items for this frame.
+let keepAlive = new Map();
+
+// Called to create remote proxies for items. If they already exist we destroy
+// and recreate. This cna happen if the item changes in some way or in odd
+// timing cases where the frame script is create around the same time as the
+// item is created in the main process
+addMessageListener('sdk/contextmenu/createitems', ({ data: { items, addon }}) => {
+  let { loader } = Cu.import(addon.paths[''] + 'framescript/LoaderHelper.jsm', {});
+
+  for (let itemoptions of items) {
+    let { RemoteItem } = loader(addon).require('sdk/content/context-menu');
+    let item = new RemoteItem(itemoptions, this);
+
+    let oldItem = keepAlive.get(item.id);
+    if (oldItem) {
+      oldItem.destroy();
+    }
+
+    keepAlive.set(item.id, item);
+  }
+});
+
+addMessageListener('sdk/contextmenu/destroyitems', ({ data: { items }}) => {
+  for (let id of items) {
+    let item = keepAlive.get(id);
+    item.destroy();
+    keepAlive.delete(id);
+  }
+});
+
+sendAsyncMessage('sdk/contextmenu/requestitems');
+
+Services.obs.addObserver(function(subject, topic, data) {
+  // Many frame scripts run in the same process, check that the context menu
+  // node is in this frame
+  let { event: { target: popupNode }, addonInfo } = subject.wrappedJSObject;
+  if (popupNode.ownerDocument.defaultView.top != content)
+    return;
+
+  for (let item of keepAlive.values()) {
+    item.getContextState(popupNode, addonInfo);
+  }
+}, "content-contextmenu", false);
+
+addMessageListener('sdk/contextmenu/activateitems', ({ data: { items, data }, objects: { popupNode }}) => {
+  for (let id of items) {
+    let item = keepAlive.get(id);
+    if (!item)
+      continue;
+
+    item.activate(popupNode, data);
+  }
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/framescript/FrameScriptManager.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/framescript/FrameScriptManager.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/framescript/FrameScriptManager.jsm	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/framescript/FrameScriptManager.jsm	2014-11-26 21:45:45.000000000 +0000
@@ -15,11 +15,21 @@
 let loadedTabEvents = false;
 
 function enableTabEvents() {
-  if (loadedTabEvents) 
+  if (loadedTabEvents)
     return;
 
   loadedTabEvents = true;
   globalMM.loadFrameScript(PATH + 'tab-events.js', true);
 }
 
-const EXPORTED_SYMBOLS = ['enableTabEvents'];
+let loadedCMEvents = false;
+
+function enableCMEvents() {
+  if (loadedCMEvents)
+    return;
+
+  loadedCMEvents = true;
+  globalMM.loadFrameScript(PATH + 'contextmenu-events.js', true);
+}
+
+const EXPORTED_SYMBOLS = ['enableTabEvents', 'enableCMEvents'];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/sdk/content/context-menu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/sdk/content/context-menu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/sdk/content/context-menu.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/sdk/content/context-menu.js	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,354 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { Class } = require("../core/heritage");
+const self = require("../self");
+const { WorkerChild } = require("./worker-child");
+const { getInnerId } = require("../window/utils");
+const { Ci } = require("chrome");
+const { Services } = require("resource://gre/modules/Services.jsm");
+
+// These functions are roughly copied from sdk/selection which doesn't work
+// in the content process
+function getElementWithSelection(window) {
+  let element = Services.focus.getFocusedElementForWindow(window, false, {});
+  if (!element)
+    return null;
+
+  try {
+    // Accessing selectionStart and selectionEnd on e.g. a button
+    // results in an exception thrown as per the HTML5 spec.  See
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#textFieldSelection
+
+    let { value, selectionStart, selectionEnd } = element;
+
+    let hasSelection = typeof value === "string" &&
+                      !isNaN(selectionStart) &&
+                      !isNaN(selectionEnd) &&
+                      selectionStart !== selectionEnd;
+
+    return hasSelection ? element : null;
+  }
+  catch (err) {
+    console.exception(err);
+    return null;
+  }
+}
+
+function safeGetRange(selection, rangeNumber) {
+  try {
+    let { rangeCount } = selection;
+    let range = null;
+
+    for (let rangeNumber = 0; rangeNumber < rangeCount; rangeNumber++ ) {
+      range = selection.getRangeAt(rangeNumber);
+
+      if (range && range.toString())
+        break;
+
+      range = null;
+    }
+
+    return range;
+  }
+  catch (e) {
+    return null;
+  }
+}
+
+function getSelection(window) {
+  let selection = window.getSelection();
+  let range = safeGetRange(selection);
+  if (range)
+    return range.toString();
+
+  let node = getElementWithSelection(window);
+  if (!node)
+    return null;
+
+  return node.value.substring(node.selectionStart, node.selectionEnd);
+}
+
+//These are used by PageContext.isCurrent below. If the popupNode or any of
+//its ancestors is one of these, Firefox uses a tailored context menu, and so
+//the page context doesn't apply.
+const NON_PAGE_CONTEXT_ELTS = [
+  Ci.nsIDOMHTMLAnchorElement,
+  Ci.nsIDOMHTMLAppletElement,
+  Ci.nsIDOMHTMLAreaElement,
+  Ci.nsIDOMHTMLButtonElement,
+  Ci.nsIDOMHTMLCanvasElement,
+  Ci.nsIDOMHTMLEmbedElement,
+  Ci.nsIDOMHTMLImageElement,
+  Ci.nsIDOMHTMLInputElement,
+  Ci.nsIDOMHTMLMapElement,
+  Ci.nsIDOMHTMLMediaElement,
+  Ci.nsIDOMHTMLMenuElement,
+  Ci.nsIDOMHTMLObjectElement,
+  Ci.nsIDOMHTMLOptionElement,
+  Ci.nsIDOMHTMLSelectElement,
+  Ci.nsIDOMHTMLTextAreaElement,
+];
+
+// List all editable types of inputs.  Or is it better to have a list
+// of non-editable inputs?
+let editableInputs = {
+  email: true,
+  number: true,
+  password: true,
+  search: true,
+  tel: true,
+  text: true,
+  textarea: true,
+  url: true
+};
+
+let CONTEXTS = {};
+
+let Context = Class({
+  initialize: function(id) {
+    this.id = id;
+  },
+
+  adjustPopupNode: function adjustPopupNode(popupNode) {
+    return popupNode;
+  },
+
+  // Gets state to pass through to the parent process for the node the user
+  // clicked on
+  getState: function(popupNode) {
+    return false;
+  }
+});
+
+// Matches when the context-clicked node doesn't have any of
+// NON_PAGE_CONTEXT_ELTS in its ancestors
+CONTEXTS.PageContext = Class({
+  extends: Context,
+
+  getState: function(popupNode) {
+    // If there is a selection in the window then this context does not match
+    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
+      return false;
+
+    // If the clicked node or any of its ancestors is one of the blacklisted
+    // NON_PAGE_CONTEXT_ELTS then this context does not match
+    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
+      if (NON_PAGE_CONTEXT_ELTS.some(function(type) popupNode instanceof type))
+        return false;
+
+      popupNode = popupNode.parentNode;
+    }
+
+    return true;
+  }
+});
+
+// Matches when there is an active selection in the window
+CONTEXTS.SelectionContext = Class({
+  extends: Context,
+
+  getState: function(popupNode) {
+    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
+      return true;
+
+    try {
+      // The node may be a text box which has selectionStart and selectionEnd
+      // properties. If not this will throw.
+      let { selectionStart, selectionEnd } = popupNode;
+      return !isNaN(selectionStart) && !isNaN(selectionEnd) &&
+             selectionStart !== selectionEnd;
+    }
+    catch (e) {
+      return false;
+    }
+  }
+});
+
+// Matches when the context-clicked node or any of its ancestors matches the
+// selector given
+CONTEXTS.SelectorContext = Class({
+  extends: Context,
+
+  initialize: function initialize(id, selector) {
+    Context.prototype.initialize.call(this, id);
+    this.selector = selector;
+  },
+
+  adjustPopupNode: function adjustPopupNode(popupNode) {
+    let selector = this.selector;
+
+    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
+      if (popupNode.mozMatchesSelector(selector))
+        return popupNode;
+
+      popupNode = popupNode.parentNode;
+    }
+
+    return null;
+  },
+
+  getState: function(popupNode) {
+    return !!this.adjustPopupNode(popupNode);
+  }
+});
+
+// Matches when the page url matches any of the patterns given
+CONTEXTS.URLContext = Class({
+  extends: Context,
+
+  getState: function(popupNode) {
+    return popupNode.ownerDocument.URL;
+  }
+});
+
+// Matches when the user-supplied predicate returns true
+CONTEXTS.PredicateContext = Class({
+  extends: Context,
+
+  getState: function(node) {
+    let window = node.ownerDocument.defaultView;
+    let data = {};
+
+    data.documentType = node.ownerDocument.contentType;
+
+    data.documentURL = node.ownerDocument.location.href;
+    data.targetName = node.nodeName.toLowerCase();
+    data.targetID = node.id || null ;
+
+    if ((data.targetName === 'input' && editableInputs[node.type]) ||
+        data.targetName === 'textarea') {
+      data.isEditable = !node.readOnly && !node.disabled;
+    }
+    else {
+      data.isEditable = node.isContentEditable;
+    }
+
+    data.selectionText = getSelection(window, "TEXT");
+
+    data.srcURL = node.src || null;
+    data.value = node.value || null;
+
+    while (!data.linkURL && node) {
+      data.linkURL = node.href || null;
+      node = node.parentNode;
+    }
+
+    return data;
+  },
+});
+
+function instantiateContext({ id, type, args }) {
+  if (!(type in CONTEXTS)) {
+    console.error("Attempt to use unknown context " + type);
+    return;
+  }
+  return new CONTEXTS[type](id, ...args);
+}
+
+let ContextWorker = Class({
+  implements: [ WorkerChild ],
+
+  // Calls the context workers context listeners and returns the first result
+  // that is either a string or a value that evaluates to true. If all of the
+  // listeners returned false then returns false. If there are no listeners,
+  // returns true (show the menu item by default).
+  getMatchedContext: function getCurrentContexts(popupNode) {
+    let results = this.sandbox.emitSync("context", popupNode);
+    if (!results.length)
+      return true;
+    return results.reduce((val, result) => val || result);
+  },
+
+  // Emits a click event in the worker's port. popupNode is the node that was
+  // context-clicked, and clickedItemData is the data of the item that was
+  // clicked.
+  fireClick: function fireClick(popupNode, clickedItemData) {
+    this.sandbox.emitSync("click", popupNode, clickedItemData);
+  }
+});
+
+// Gets the item's content script worker for a window, creating one if necessary
+// Once created it will be automatically destroyed when the window unloads.
+// If there is not content scripts for the item then null will be returned.
+function getItemWorkerForWindow(item, window) {
+  if (!item.contentScript && !item.contentScriptFile)
+    return null;
+
+  let id = getInnerId(window);
+  let worker = item.workerMap.get(id);
+
+  if (worker)
+    return worker;
+
+  worker = ContextWorker({
+    id: item.id,
+    window: id,
+    manager: item.manager,
+    contentScript: item.contentScript,
+    contentScriptFile: item.contentScriptFile,
+    onDetach: function() {
+      item.workerMap.delete(id);
+    }
+  });
+
+  item.workerMap.set(id, worker);
+
+  return worker;
+}
+
+// A very simple remote proxy for every item. It's job is to provide data for
+// the main process to use to determine visibility state and to call into
+// content scripts when clicked.
+let RemoteItem = Class({
+  initialize: function(options, manager) {
+    this.id = options.id;
+    this.contexts = [instantiateContext(c) for (c of options.contexts)];
+    this.contentScript = options.contentScript;
+    this.contentScriptFile = options.contentScriptFile;
+
+    this.manager = manager;
+
+    this.workerMap = new Map();
+  },
+
+  destroy: function() {
+    for (let worker of this.workerMap.values()) {
+      worker.destroy();
+    }
+  },
+
+  activate: function(popupNode, data) {
+    let worker = getItemWorkerForWindow(this, popupNode.ownerDocument.defaultView);
+    if (!worker)
+      return;
+
+    for (let context of this.contexts)
+      popupNode = context.adjustPopupNode(popupNode);
+
+    worker.fireClick(popupNode, data);
+  },
+
+  // Fills addonInfo with state data to send through to the main process
+  getContextState: function(popupNode, addonInfo) {
+    if (!(self.id in addonInfo))
+      addonInfo[self.id] = {};
+
+    let worker = getItemWorkerForWindow(this, popupNode.ownerDocument.defaultView);
+    let contextStates = {};
+    for (let context of this.contexts)
+      contextStates[context.id] = context.getState(popupNode);
+
+    addonInfo[self.id][this.id] = {
+      // It isn't ideal to create a PageContext for every item but there isn't
+      // a good shared place to do it.
+      pageContext: (new CONTEXTS.PageContext()).getState(popupNode),
+      contextStates,
+      hasWorker: !!worker,
+      workerContext: worker ? worker.getMatchedContext(popupNode) : true
+    }
+  }
+});
+exports.RemoteItem = RemoteItem;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/sdk/context-menu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/sdk/context-menu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/lib/sdk/context-menu.js	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/lib/sdk/context-menu.js	2014-11-26 21:45:45.000000000 +0000
@@ -19,14 +19,20 @@
 const { URL, isValidURI } = require("./url");
 const { WindowTracker, browserWindowIterator } = require("./deprecated/window-utils");
 const { isBrowser, getInnerId } = require("./window/utils");
-const { Ci } = require("chrome");
+const { Ci, Cc, Cu } = require("chrome");
 const { MatchPattern } = require("./util/match-pattern");
 const { Worker } = require("./content/worker");
 const { EventTarget } = require("./event/target");
 const { emit } = require('./event/core');
 const { when } = require('./system/unload');
-const selection = require('./selection');
 const { contract: loaderContract } = require('./content/loader');
+const { omit } = require('./util/object');
+const self = require('./self')
+
+// null-out cycles in .modules to make @loader/options JSONable
+const ADDON = omit(require('@loader/options'), ['modules', 'globals']);
+
+require('../framescript/FrameScriptManager.jsm').enableCMEvents();
 
 // All user items we add have this class.
 const ITEM_CLASS = "addon-context-menu-item";
@@ -59,30 +65,13 @@
 // The class of the overflow submenu's xul:menupopup.
 const OVERFLOW_POPUP_CLASS = "addon-content-menu-overflow-popup";
 
-//These are used by PageContext.isCurrent below. If the popupNode or any of
-//its ancestors is one of these, Firefox uses a tailored context menu, and so
-//the page context doesn't apply.
-const NON_PAGE_CONTEXT_ELTS = [
-  Ci.nsIDOMHTMLAnchorElement,
-  Ci.nsIDOMHTMLAppletElement,
-  Ci.nsIDOMHTMLAreaElement,
-  Ci.nsIDOMHTMLButtonElement,
-  Ci.nsIDOMHTMLCanvasElement,
-  Ci.nsIDOMHTMLEmbedElement,
-  Ci.nsIDOMHTMLImageElement,
-  Ci.nsIDOMHTMLInputElement,
-  Ci.nsIDOMHTMLMapElement,
-  Ci.nsIDOMHTMLMediaElement,
-  Ci.nsIDOMHTMLMenuElement,
-  Ci.nsIDOMHTMLObjectElement,
-  Ci.nsIDOMHTMLOptionElement,
-  Ci.nsIDOMHTMLSelectElement,
-  Ci.nsIDOMHTMLTextAreaElement,
-];
-
 // Holds private properties for API objects
 let internal = ns();
 
+function uuid() {
+  return require('./util/uuid').uuid().toString();
+}
+
 function getScheme(spec) {
   try {
     return URL(spec).scheme;
@@ -92,15 +81,22 @@
   }
 }
 
+let MessageManager = Cc["@mozilla.org/globalmessagemanager;1"].
+                     getService(Ci.nsIMessageBroadcaster);
+
 let Context = Class({
+  initialize: function() {
+    internal(this).id = uuid();
+  },
+
   // Returns the node that made this context current
   adjustPopupNode: function adjustPopupNode(popupNode) {
     return popupNode;
   },
 
   // Returns whether this context is current for the current node
-  isCurrent: function isCurrent(popupNode) {
-    return false;
+  isCurrent: function isCurrent(state) {
+    return state;
   }
 });
 
@@ -109,21 +105,12 @@
 let PageContext = Class({
   extends: Context,
 
-  isCurrent: function isCurrent(popupNode) {
-    // If there is a selection in the window then this context does not match
-    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
-      return false;
-
-    // If the clicked node or any of its ancestors is one of the blacklisted
-    // NON_PAGE_CONTEXT_ELTS then this context does not match
-    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
-      if (NON_PAGE_CONTEXT_ELTS.some(function(type) popupNode instanceof type))
-        return false;
-
-      popupNode = popupNode.parentNode;
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "PageContext",
+      args: []
     }
-
-    return true;
   }
 });
 exports.PageContext = PageContext;
@@ -132,19 +119,11 @@
 let SelectionContext = Class({
   extends: Context,
 
-  isCurrent: function isCurrent(popupNode) {
-    if (!popupNode.ownerDocument.defaultView.getSelection().isCollapsed)
-      return true;
-
-    try {
-      // The node may be a text box which has selectionStart and selectionEnd
-      // properties. If not this will throw.
-      let { selectionStart, selectionEnd } = popupNode;
-      return !isNaN(selectionStart) && !isNaN(selectionEnd) &&
-             selectionStart !== selectionEnd;
-    }
-    catch (e) {
-      return false;
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "SelectionContext",
+      args: []
     }
   }
 });
@@ -156,6 +135,7 @@
   extends: Context,
 
   initialize: function initialize(selector) {
+    Context.prototype.initialize.call(this);
     let options = validateOptions({ selector: selector }, {
       selector: {
         is: ["string"],
@@ -165,21 +145,12 @@
     internal(this).selector = options.selector;
   },
 
-  adjustPopupNode: function adjustPopupNode(popupNode) {
-    let selector = internal(this).selector;
-
-    while (!(popupNode instanceof Ci.nsIDOMDocument)) {
-      if (popupNode.mozMatchesSelector(selector))
-        return popupNode;
-
-      popupNode = popupNode.parentNode;
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "SelectorContext",
+      args: [internal(this).selector]
     }
-
-    return null;
-  },
-
-  isCurrent: function isCurrent(popupNode) {
-    return !!this.adjustPopupNode(popupNode);
   }
 });
 exports.SelectorContext = SelectorContext;
@@ -189,6 +160,7 @@
   extends: Context,
 
   initialize: function initialize(patterns) {
+    Context.prototype.initialize.call(this);
     patterns = Array.isArray(patterns) ? patterns : [patterns];
 
     try {
@@ -198,12 +170,18 @@
       throw new Error("Patterns must be a string, regexp or an array of " +
                       "strings or regexps: " + err);
     }
-
   },
 
-  isCurrent: function isCurrent(popupNode) {
-    let url = popupNode.ownerDocument.URL;
+  isCurrent: function isCurrent(url) {
     return internal(this).patterns.some(function (p) p.test(url));
+  },
+
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "URLContext",
+      args: []
+    }
   }
 });
 exports.URLContext = URLContext;
@@ -213,6 +191,7 @@
   extends: Context,
 
   initialize: function initialize(predicate) {
+    Context.prototype.initialize.call(this);
     let options = validateOptions({ predicate: predicate }, {
       predicate: {
         is: ["function"],
@@ -222,56 +201,20 @@
     internal(this).predicate = options.predicate;
   },
 
-  isCurrent: function isCurrent(popupNode) {
-    return internal(this).predicate(populateCallbackNodeData(popupNode));
+  isCurrent: function isCurrent(state) {
+    return internal(this).predicate(state);
+  },
+
+  serialize: function() {
+    return {
+      id: internal(this).id,
+      type: "PredicateContext",
+      args: []
+    }
   }
 });
 exports.PredicateContext = PredicateContext;
 
-// List all editable types of inputs.  Or is it better to have a list
-// of non-editable inputs?
-let editableInputs = {
-  email: true,
-  number: true,
-  password: true,
-  search: true,
-  tel: true,
-  text: true,
-  textarea: true,
-  url: true
-};
-
-function populateCallbackNodeData(node) {
-  let window = node.ownerDocument.defaultView;
-  let data = {};
-
-  data.documentType = node.ownerDocument.contentType;
-
-  data.documentURL = node.ownerDocument.location.href;
-  data.targetName = node.nodeName.toLowerCase();
-  data.targetID = node.id || null ;
-
-  if ((data.targetName === 'input' && editableInputs[node.type]) ||
-      data.targetName === 'textarea') {
-    data.isEditable = !node.readOnly && !node.disabled;
-  }
-  else {
-    data.isEditable = node.isContentEditable;
-  }
-
-  data.selectionText = selection.text;
-
-  data.srcURL = node.src || null;
-  data.value = node.value || null;
-
-  while (!data.linkURL && node) {
-    data.linkURL = node.href || null;
-    node = node.parentNode;
-  }
-
-  return data;
-}
-
 function removeItemFromArray(array, item) {
   return array.filter(function(i) i !== item);
 }
@@ -362,130 +305,82 @@
   }
 });
 
-let ContextWorker = Class({
-  implements: [ Worker ],
-
-  // Calls the context workers context listeners and returns the first result
-  // that is either a string or a value that evaluates to true. If all of the
-  // listeners returned false then returns false. If there are no listeners,
-  // returns true (show the menu item by default).
-  getMatchedContext: function getCurrentContexts(popupNode) {
-    let results = this.getSandbox().emitSync("context", popupNode);
-    if (!results.length)
-      return true;
-    return results.reduce((val, result) => val || result);
-  },
-
-  // Emits a click event in the worker's port. popupNode is the node that was
-  // context-clicked, and clickedItemData is the data of the item that was
-  // clicked.
-  fireClick: function fireClick(popupNode, clickedItemData) {
-    this.getSandbox().emitSync("click", popupNode, clickedItemData);
-  }
-});
-
 // Returns true if any contexts match. If there are no contexts then a
 // PageContext is tested instead
-function hasMatchingContext(contexts, popupNode) {
-  for (let context in contexts) {
-    if (!context.isCurrent(popupNode))
+function hasMatchingContext(contexts, addonInfo) {
+  for (let context of contexts) {
+    if (!(internal(context).id in addonInfo.contextStates)) {
+      console.error("Missing state for context " + internal(context).id + " this is an error in the SDK modules.");
+      return false;
+    }
+    if (!context.isCurrent(addonInfo.contextStates[internal(context).id]))
       return false;
   }
 
   return true;
 }
 
-// Gets the matched context from any worker for this item. If there is no worker
-// or no matched context then returns false.
-function getCurrentWorkerContext(item, popupNode) {
-  let worker = getItemWorkerForWindow(item, popupNode.ownerDocument.defaultView);
-  if (!worker)
-    return true;
-  return worker.getMatchedContext(popupNode);
-}
-
 // Tests whether an item should be visible or not based on its contexts and
 // content scripts
-function isItemVisible(item, popupNode, defaultVisibility) {
+function isItemVisible(item, addonInfo, usePageWorker) {
   if (!item.context.length) {
-    let worker = getItemWorkerForWindow(item, popupNode.ownerDocument.defaultView);
-    if (!worker)
-      return defaultVisibility;
+    if (!addonInfo.hasWorker)
+      return usePageWorker ? addonInfo.pageContext : true;
   }
 
-  if (!hasMatchingContext(item.context, popupNode))
+  if (!hasMatchingContext(item.context, addonInfo))
     return false;
 
-  let context = getCurrentWorkerContext(item, popupNode);
+  let context = addonInfo.workerContext;
   if (typeof(context) === "string" && context != "")
     item.label = context;
 
   return !!context;
 }
 
-// Gets the item's content script worker for a window, creating one if necessary
-// Once created it will be automatically destroyed when the window unloads.
-// If there is not content scripts for the item then null will be returned.
-function getItemWorkerForWindow(item, window) {
-  if (!item.contentScript && !item.contentScriptFile)
-    return null;
-
-  let id = getInnerId(window);
-  let worker = internal(item).workerMap.get(id);
-
-  if (worker)
-    return worker;
-
-  worker = ContextWorker({
-    window: window,
-    contentScript: item.contentScript,
-    contentScriptFile: item.contentScriptFile,
-    onMessage: function(msg) {
-      emit(item, "message", msg);
-    },
-    onDetach: function() {
-      internal(item).workerMap.delete(id);
-    }
-  });
-
-  internal(item).workerMap.set(id, worker);
-
-  return worker;
-}
-
 // Called when an item is clicked to send out click events to the content
 // scripts
-function itemActivated(item, clickedItem, popupNode) {
-  let worker = getItemWorkerForWindow(item, popupNode.ownerDocument.defaultView);
+function itemActivated(item, clickedNode) {
+  let data = {
+    items: [internal(item).id],
+    data: item.data,
+  }
 
-  if (worker) {
-    let adjustedNode = popupNode;
-    for (let context in item.context)
-        adjustedNode = context.adjustPopupNode(adjustedNode);
-    worker.fireClick(adjustedNode, clickedItem.data);
+  while (item.parentMenu) {
+    item = item.parentMenu;
+    data.items.push(internal(item).id);
   }
 
-  if (item.parentMenu)
-    itemActivated(item.parentMenu, clickedItem, popupNode);
+  let menuData = clickedNode.ownerDocument.defaultView.gContextMenuContentData;
+  let messageManager = menuData.browser.messageManager;
+  messageManager.sendAsyncMessage('sdk/contextmenu/activateitems', data, {
+    popupNode: menuData.popupNode
+  });
+}
+
+function serializeItem(item) {
+  return {
+    id: internal(item).id,
+    contexts: [c.serialize() for (c of item.context)],
+    contentScript: item.contentScript,
+    contentScriptFile: item.contentScriptFile,
+  };
 }
 
 // All things that appear in the context menu extend this
 let BaseItem = Class({
   initialize: function initialize() {
-    addCollectionProperty(this, "context");
-
-    // Used to cache content script workers and the windows they have been
-    // created for
-    internal(this).workerMap = new Map();
+    internal(this).id = uuid();
 
+    internal(this).contexts = [];
     if ("context" in internal(this).options && internal(this).options.context) {
       let contexts = internal(this).options.context;
       if (Array.isArray(contexts)) {
         for (let context of contexts)
-          this.context.add(context);
+          internal(this).contexts.push(context);
       }
       else {
-        this.context.add(contexts);
+        internal(this).contexts.push(contexts);
       }
     }
 
@@ -500,15 +395,59 @@
       value: internal(this).options.contentScript
     });
 
+    // Resolve URIs here as tests may have overriden self
+    let files = internal(this).options.contentScriptFile;
+    if (files) {
+      if (!Array.isArray(files))
+        files = [files];
+      files = files.map(self.data.url);
+    }
+    internal(this).options.contentScriptFile = files;
     Object.defineProperty(this, "contentScriptFile", {
       enumerable: true,
       value: internal(this).options.contentScriptFile
     });
+
+    // Notify all frames of this new item
+    sendItems([serializeItem(this)]);
   },
 
   destroy: function destroy() {
+    if (internal(this).destroyed)
+      return;
+
+    // Tell all existing frames that this item has been destroyed
+    MessageManager.broadcastAsyncMessage("sdk/contextmenu/destroyitems", {
+      items: [internal(this).id]
+    });
+
     if (this.parentMenu)
       this.parentMenu.removeItem(this);
+
+    internal(this).destroyed = true;
+  },
+
+  get context() {
+    let contexts = internal(this).contexts.slice(0);
+    contexts.add = (context) => {
+      internal(this).contexts.push(context);
+      // Notify all frames that this item has changed
+      sendItems([serializeItem(this)]);
+    };
+    contexts.remove = (context) => {
+      internal(this).contexts = internal(this).contexts.filter(c => {
+        return c != context;
+      });
+      // Notify all frames that this item has changed
+      sendItems([serializeItem(this)]);
+    };
+    return contexts;
+  },
+
+  set context(val) {
+    internal(this).contexts = val.slice(0);
+    // Notify all frames that this item has changed
+    sendItems([serializeItem(this)]);
   },
 
   get parentMenu() {
@@ -516,6 +455,13 @@
   },
 });
 
+function workerMessageReceived({ data: { id, args } }) {
+  if (internal(this).id != id)
+    return;
+
+  emit(this, ...args);
+}
+
 // All things that have a label on the context menu extend this
 let LabelledItem = Class({
   extends: BaseItem,
@@ -524,11 +470,16 @@
   initialize: function initialize(options) {
     BaseItem.prototype.initialize.call(this);
     EventTarget.prototype.initialize.call(this, options);
+
+    internal(this).messageListener = workerMessageReceived.bind(this);
+    MessageManager.addMessageListener('sdk/worker/event', internal(this).messageListener);
   },
 
   destroy: function destroy() {
-    for (let [,worker] of internal(this).workerMap)
-      worker.destroy();
+    if (internal(this).destroyed)
+      return;
+
+    MessageManager.removeMessageListener('sdk/worker/event', internal(this).messageListener);
 
     BaseItem.prototype.destroy.call(this);
   },
@@ -712,7 +663,39 @@
 let contentContextMenu = ItemContainer();
 exports.contentContextMenu = contentContextMenu;
 
+function getContainerItems(container) {
+  let items = [];
+  for (let item of internal(container).children) {
+    items.push(serializeItem(item));
+    if (item instanceof Menu)
+      items = items.concat(getContainerItems(item));
+  }
+  return items;
+}
+
+// Notify all frames of these new or changed items
+function sendItems(items) {
+  MessageManager.broadcastAsyncMessage("sdk/contextmenu/createitems", {
+    items,
+    addon: ADDON,
+  });
+}
+
+// Called when a new frame is created and wants to get the current list of items
+function remoteItemRequest({ target: { messageManager } }) {
+  let items = getContainerItems(contentContextMenu);
+  if (items.length == 0)
+    return;
+
+  messageManager.sendAsyncMessage("sdk/contextmenu/createitems", {
+    items,
+    addon: ADDON,
+  });
+}
+MessageManager.addMessageListener('sdk/contextmenu/requestitems', remoteItemRequest);
+
 when(function() {
+  MessageManager.removeMessageListener('sdk/contextmenu/requestitems', remoteItemRequest);
   contentContextMenu.destroy();
 });
 
@@ -800,16 +783,16 @@
 
   // Recurses through the menu setting the visibility of items. Returns true
   // if any of the items in this menu were visible
-  setVisibility: function setVisibility(menu, popupNode, defaultVisibility) {
+  setVisibility: function setVisibility(menu, addonInfo, usePageWorker) {
     let anyVisible = false;
 
     for (let item of internal(menu).children) {
-      let visible = isItemVisible(item, popupNode, defaultVisibility);
+      let visible = isItemVisible(item, addonInfo[internal(item).id], usePageWorker);
 
       // Recurse through Menus, if none of the sub-items were visible then the
       // menu is hidden too.
       if (visible && (item instanceof Menu))
-        visible = this.setVisibility(item, popupNode, true);
+        visible = this.setVisibility(item, addonInfo, false);
 
       let xulNode = this.getXULNodeForItem(item);
       xulNode.hidden = !visible;
@@ -912,7 +895,7 @@
         if (event.target !== xulNode)
           return;
 
-        itemActivated(item, item, self.contextMenu.triggerNode);
+        itemActivated(item, xulNode);
       }, false);
     }
 
@@ -1027,8 +1010,14 @@
         this.populate(this.items);
       }
 
-      let popupNode = event.target.triggerNode;
-      this.setVisibility(this.items, popupNode, PageContext().isCurrent(popupNode));
+      let mainWindow = event.target.ownerDocument.defaultView;
+      this.contextMenuContentData = mainWindow.gContextMenuContentData
+      let addonInfo = this.contextMenuContentData.addonInfo[self.id];
+      if (!addonInfo) {
+        console.warn("No context menu state data was provided.");
+        return;
+      }
+      this.setVisibility(this.items, addonInfo, true);
     }
     catch (e) {
       console.exception(e);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/test/test-context-menu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/test/test-context-menu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/addon-sdk/source/test/test-context-menu.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/addon-sdk/source/test/test-context-menu.js	2014-11-26 21:45:46.000000000 +0000
@@ -11,6 +11,7 @@
 const timer = require("sdk/timers");
 const { merge } = require("sdk/util/object");
 const { defer } = require("sdk/core/promise");
+const observers = require("sdk/system/events");
 
 // These should match the same constants in the module.
 const ITEM_CLASS = "addon-context-menu-item";
@@ -103,7 +104,7 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu([item], [], []);
       test.done();
     });
@@ -125,7 +126,7 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
       test.checkMenu([item], [], []);
       test.done();
     });
@@ -209,7 +210,7 @@
   ];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, items, []);
       test.done();
     });
@@ -249,9 +250,8 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    let textfield = doc.getElementById("textfield");
-    textfield.setSelectionRange(0, textfield.value.length);
-    test.showMenu(textfield, function (popup) {
+    test.selectRange("#textfield", 0, null);
+    test.showMenu("#textfield", function (popup) {
       test.checkMenu([item], [], []);
       test.done();
     });
@@ -271,9 +271,8 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    let textfield = doc.getElementById("textfield");
-    textfield.setSelectionRange(0, 0);
-    test.showMenu(textfield, function (popup) {
+    test.selectRange("#textfield", 0, 0);
+    test.showMenu("#textfield", function (popup) {
       test.checkMenu([item], [item], []);
       test.done();
     });
@@ -314,25 +313,31 @@
     let link = doc.getElementById("targetlink");
     link.click();
 
-    test.delayedEventListener(this.tabBrowser, "load", function () {
-      let browser = test.tabBrowser.selectedBrowser;
-      let window = browser.contentWindow;
-      let doc = browser.contentDocument;
-      window.getSelection().selectAllChildren(doc.body);
+    let tablistener = event => {
+      this.tabBrowser.tabContainer.removeEventListener("TabOpen", tablistener, false);
+      let tab = event.target;
+      let browser = tab.linkedBrowser;
+      this.loadFrameScript(browser);
+      this.delayedEventListener(browser, "load", () => {
+        let window = browser.contentWindow;
+        let doc = browser.contentDocument;
+        window.getSelection().selectAllChildren(doc.body);
 
-      test.showMenu(null, function (popup) {
-        test.checkMenu([item], [], []);
-        popup.hidePopup();
+        test.showMenu(null, function (popup) {
+          test.checkMenu([item], [], []);
+          popup.hidePopup();
 
-        test.tabBrowser.removeTab(test.tabBrowser.selectedTab);
-        test.tabBrowser.selectedTab = test.tab;
+          test.tabBrowser.removeTab(test.tabBrowser.selectedTab);
+          test.tabBrowser.selectedTab = test.tab;
 
-        test.showMenu(null, function (popup) {
-          test.checkMenu([item], [item], []);
-          test.done();
+          test.showMenu(null, function (popup) {
+            test.checkMenu([item], [item], []);
+            test.done();
+          });
         });
-      });
-    }, true);
+      }, true);
+    };
+    this.tabBrowser.tabContainer.addEventListener("TabOpen", tablistener, false);
   });
 };
 
@@ -349,8 +354,7 @@
 
   test.withTestDoc(function (window, doc) {
     window.getSelection().selectAllChildren(doc.body);
-    let button = doc.getElementById("button");
-    test.showMenu(button, function (popup) {
+    test.showMenu("#button", function (popup) {
       test.checkMenu([item], [], []);
       test.done();
     });
@@ -369,8 +373,7 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    let button = doc.getElementById("button");
-    test.showMenu(button, function (popup) {
+    test.showMenu("#button", function (popup) {
       test.checkMenu([item], [item], []);
       test.done();
     });
@@ -436,55 +439,6 @@
 };
 
 
-// Removing a non-matching URL context after its item is created and the page is
-// loaded should cause the item's content script to be evaluated when the
-// context menu is next opened.
-exports.testURLContextRemove = function (assert, done) {
-  let test = new TestHelper(assert, done);
-  let loader = test.newLoader();
-
-  let shouldBeEvaled = false;
-  let context = loader.cm.URLContext("*.bogus.com");
-  let item = loader.cm.Item({
-    label: "item",
-    context: context,
-    contentScript: 'self.postMessage("ok"); self.on("context", function () true);',
-    onMessage: function (msg) {
-      assert.ok(shouldBeEvaled,
-                  "content script should be evaluated when expected");
-      assert.equal(msg, "ok", "Should have received the right message");
-      shouldBeEvaled = false;
-    }
-  });
-
-  test.withTestDoc(function (window, doc) {
-    test.showMenu(null, function (popup) {
-      test.checkMenu([item], [item], []);
-
-      item.context.remove(context);
-
-      shouldBeEvaled = true;
-
-      test.hideMenu(function () {
-        test.showMenu(null, function (popup) {
-          test.checkMenu([item], [], []);
-
-          assert.ok(!shouldBeEvaled,
-                      "content script should have been evaluated");
-
-          test.hideMenu(function () {
-            // Shouldn't get evaluated again
-            test.showMenu(null, function (popup) {
-              test.checkMenu([item], [], []);
-              test.done();
-            });
-          });
-        });
-      });
-    });
-  });
-};
-
 // Loading a new page in the same tab should correctly start a new worker for
 // any content scripts
 exports.testPageReload = function (assert, done) {
@@ -772,7 +726,7 @@
   ];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, [items[2], items[3]], []);
       test.done();
     });
@@ -810,7 +764,7 @@
   ];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, items, []);
       test.done();
     });
@@ -848,7 +802,7 @@
   ];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, items, []);
       test.done();
     });
@@ -915,7 +869,6 @@
       itemScript[1].resolve();
     }
   });
-  console.log(item.contentScriptFile, item2.contentScriptFile);
 
   test.showMenu(null, function (popup) {
     test.checkMenu([item, item2], [], []);
@@ -949,8 +902,7 @@
   });
 };
 
-// Multiple contexts imply intersection, not union, and content context
-// listeners should not be called if all declarative contexts are not current.
+// Multiple contexts imply intersection, not union.
 exports.testMultipleContexts = function (assert, done) {
   let test = new TestHelper(assert, done);
   let loader = test.newLoader();
@@ -958,14 +910,10 @@
   let item = new loader.cm.Item({
     label: "item",
     context: [loader.cm.SelectorContext("a[href]"), loader.cm.PageContext()],
-    contentScript: 'self.on("context", function () self.postMessage());',
-    onMessage: function () {
-      test.fail("Context listener should not be called");
-    }
   });
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
       test.checkMenu([item], [item], []);
       test.done();
     });
@@ -984,7 +932,7 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
 
       // The item should be present at first.
       test.checkMenu([item], [], []);
@@ -992,7 +940,35 @@
 
       // Remove the img context and check again.
       item.context.remove(ctxt);
-      test.showMenu(doc.getElementById("image"), function (popup) {
+      test.showMenu("#image", function (popup) {
+        test.checkMenu([item], [item], []);
+        test.done();
+      });
+    });
+  });
+};
+
+// Once a context is removed, it should no longer cause its item to appear.
+exports.testSetContextRemove = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let ctxt = loader.cm.SelectorContext("img");
+  let item = new loader.cm.Item({
+    label: "item",
+    context: ctxt
+  });
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu("#image", function (popup) {
+
+      // The item should be present at first.
+      test.checkMenu([item], [], []);
+      popup.hidePopup();
+
+      // Remove the img context and check again.
+      item.context = [];
+      test.showMenu("#image", function (popup) {
         test.checkMenu([item], [item], []);
         test.done();
       });
@@ -1000,6 +976,59 @@
   });
 };
 
+// Once a context is added, it should affect whether the item appears.
+exports.testAddContext = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let ctxt = loader.cm.SelectorContext("img");
+  let item = new loader.cm.Item({
+    label: "item"
+  });
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu("#image", function (popup) {
+
+      // The item should not be present at first.
+      test.checkMenu([item], [item], []);
+      popup.hidePopup();
+
+      // Add the img context and check again.
+      item.context.add(ctxt);
+      test.showMenu("#image", function (popup) {
+        test.checkMenu([item], [], []);
+        test.done();
+      });
+    });
+  });
+};
+
+// Once a context is added, it should affect whether the item appears.
+exports.testSetContextAdd = function (assert, done) {
+  let test = new TestHelper(assert, done);
+  let loader = test.newLoader();
+
+  let ctxt = loader.cm.SelectorContext("img");
+  let item = new loader.cm.Item({
+    label: "item"
+  });
+
+  test.withTestDoc(function (window, doc) {
+    test.showMenu("#image", function (popup) {
+
+      // The item should not be present at first.
+      test.checkMenu([item], [item], []);
+      popup.hidePopup();
+
+      // Add the img context and check again.
+      item.context = [ctxt];
+      test.showMenu("#image", function (popup) {
+        test.checkMenu([item], [], []);
+        test.done();
+      });
+    });
+  });
+};
 
 // Lots of items should overflow into the overflow submenu.
 exports.testOverflow = function (assert, done) {
@@ -1636,12 +1665,12 @@
   let allItems = pItems.concat(aItems);
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("link"), function (popup) {
+    test.showMenu("#link", function (popup) {
       // The menu should contain all items and will overflow
       test.checkMenu(allItems, [], []);
       popup.hidePopup();
 
-      test.showMenu(doc.getElementById("text"), function (popup) {
+      test.showMenu("#text", function (popup) {
         // Only contains hald the items and will not overflow
         test.checkMenu(allItems, aItems, []);
         popup.hidePopup();
@@ -1651,12 +1680,12 @@
           test.checkMenu(allItems, allItems, []);
           popup.hidePopup();
 
-          test.showMenu(doc.getElementById("text"), function (popup) {
+          test.showMenu("#text", function (popup) {
             // Only contains hald the items and will not overflow
             test.checkMenu(allItems, aItems, []);
             popup.hidePopup();
 
-            test.showMenu(doc.getElementById("link"), function (popup) {
+            test.showMenu("#link", function (popup) {
               // The menu should contain all items and will overflow
               test.checkMenu(allItems, [], []);
               popup.hidePopup();
@@ -1666,7 +1695,7 @@
                 test.checkMenu(allItems, allItems, []);
                 popup.hidePopup();
 
-                test.showMenu(doc.getElementById("link"), function (popup) {
+                test.showMenu("#link", function (popup) {
                   // The menu should contain all items and will overflow
                   test.checkMenu(allItems, [], []);
                   test.done();
@@ -1758,7 +1787,7 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
       test.checkMenu([topMenu], [], []);
       let topMenuElt = test.getItemElt(popup, topMenu);
       let topMenuPopup = topMenuElt.firstChild;
@@ -1884,7 +1913,7 @@
   });
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("span-link"), function (popup) {
+    test.showMenu("#span-link", function (popup) {
       test.checkMenu([topMenu], [], []);
       let topMenuElt = test.getItemElt(popup, topMenu);
       let topMenuPopup = topMenuElt.firstChild;
@@ -2224,7 +2253,7 @@
           test.done();
       }
     });
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu([item], [], []);
       test.getItemElt(popup, item).click();
     });
@@ -2560,7 +2589,7 @@
     let item = new loader.cm.Item({
       label: "item"
     });
-    test.showMenu(doc.getElementById("iframe"), function (popup) {
+    test.showMenu("#iframe", function (popup) {
       test.checkMenu([item], [], []);
       test.done();
     });
@@ -3004,7 +3033,7 @@
   let hiddenItems = [items[0].items[2]];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, hiddenItems, []);
       test.done();
     });
@@ -3175,7 +3204,7 @@
     let frame = doc.getElementById("iframe");
     frame.contentWindow.getSelection().selectAllChildren(frame.contentDocument.body);
 
-    test.showMenu(frame.contentDocument.getElementById("text"), function (popup) {
+    test.showMenu(["#iframe", "#text"], function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3201,7 +3230,7 @@
     let frame = doc.getElementById("iframe");
     window.getSelection().selectAllChildren(doc.body);
 
-    test.showMenu(frame.contentDocument.getElementById("text"), function (popup) {
+    test.showMenu(["#iframe", "#text"], function (popup) {
       test.checkMenu(items, items, []);
       test.done();
     });
@@ -3288,7 +3317,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("button"), function (popup) {
+    test.showMenu("#button", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3310,7 +3339,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("button"), function (popup) {
+    test.showMenu("#button", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3331,7 +3360,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementsByClassName("predicate-test-a")[0], function (popup) {
+    test.showMenu(".predicate-test-a", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3352,7 +3381,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("textbox"), function (popup) {
+    test.showMenu("#textbox", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3373,7 +3402,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("readonly-textbox"), function (popup) {
+    test.showMenu("#readonly-textbox", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3394,7 +3423,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("disabled-textbox"), function (popup) {
+    test.showMenu("#disabled-textbox", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3415,7 +3444,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("textfield"), function (popup) {
+    test.showMenu("#textfield", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3436,7 +3465,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("button"), function (popup) {
+    test.showMenu("#button", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3458,7 +3487,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3480,7 +3509,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("editable"), function (popup) {
+    test.showMenu("#editable", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3549,9 +3578,8 @@
 
   test.withTestDoc(function (window, doc) {
     let textbox = doc.getElementById("textbox");
-    textbox.focus();
-    textbox.setSelectionRange(3, 6);
-    test.showMenu(textbox, function (popup) {
+    test.selectRange("#textbox", 3, 6);
+    test.showMenu("#textbox", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3574,7 +3602,7 @@
 
   test.withTestDoc(function (window, doc) {
     image = doc.getElementById("image");
-    test.showMenu(image, function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3595,7 +3623,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("link"), function (popup) {
+    test.showMenu("#link", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3618,7 +3646,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementsByClassName("predicate-test-a")[0], function (popup) {
+    test.showMenu(".predicate-test-a", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3639,7 +3667,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3660,7 +3688,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("predicate-test-nested-image"), function (popup) {
+    test.showMenu("#predicate-test-nested-image", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3681,7 +3709,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("predicate-test-nested-structure"), function (popup) {
+    test.showMenu("#predicate-test-nested-structure", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3703,7 +3731,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("textbox"), function (popup) {
+    test.showMenu("#textbox", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -3724,7 +3752,7 @@
   })];
 
   test.withTestDoc(function (window, doc) {
-    test.showMenu(doc.getElementById("image"), function (popup) {
+    test.showMenu("#image", function (popup) {
       test.checkMenu(items, [], []);
       test.done();
     });
@@ -4098,14 +4126,69 @@
             OVERFLOW_THRESH_DEFAULT);
   },
 
-  // Opens the context menu on the current page.  If targetNode is null, the
+  // Loads scripts necessary in the content process
+  loadFrameScript: function(browser = this.browserWindow.gBrowser.selectedBrowser) {
+    function frame_script() {
+      let { interfaces: Ci } = Components;
+      addMessageListener('test:contextmenu', ({ data: { selectors } }) => {
+        let targetNode = null;
+        let contentWin = content;
+        if (selectors) {
+          while (selectors.length) {
+            targetNode = contentWin.document.querySelector(selectors.shift());
+            if (selectors.length)
+              contentWin = targetNode.contentWindow;
+          }
+        }
+
+        let rect = targetNode ?
+                   targetNode.getBoundingClientRect() :
+                   { left: 0, top: 0, width: 0, height: 0 };
+        contentWin.QueryInterface(Ci.nsIInterfaceRequestor)
+                  .getInterface(Ci.nsIDOMWindowUtils)
+                  .sendMouseEvent('contextmenu',
+                  rect.left + (rect.width / 2),
+                  rect.top + (rect.height / 2),
+                  2, 1, 0);
+      });
+
+      addMessageListener('test:ping', () => {
+        sendAsyncMessage('test:pong');
+      });
+
+      addMessageListener('test:select', ({ data: { selector, start, end } }) => {
+        let element = content.document.querySelector(selector);
+        element.focus();
+        if (end === null)
+          end = element.value.length;
+        element.setSelectionRange(start, end);
+      });
+    }
+
+    let messageManager = browser.messageManager;
+    messageManager.loadFrameScript("data:,(" + frame_script.toString() + ")();", true);
+  },
+
+  selectRange: function(selector, start, end) {
+    let messageManager = this.browserWindow.gBrowser.selectedBrowser.messageManager;
+    messageManager.sendAsyncMessage('test:select', { selector, start, end });
+  },
+
+  // Opens the context menu on the current page.  If selectors is null, the
   // menu is opened in the top-left corner.  onShowncallback is passed the
-  // popup.
-  showMenu: function(targetNode, onshownCallback) {
+  // popup. selectors is an array of selectors. Starting from the main document
+  // each selector points to an iframe, the last selector gives the target node.
+  // In the simple case of a single selector just that string can be passed
+  // instead of an array
+  showMenu: function(selectors, onshownCallback) {
     let { promise, resolve } = defer();
 
-    function sendEvent() {
-      this.delayedEventListener(this.browserWindow, "popupshowing",
+    if (selectors && !Array.isArray(selectors))
+      selectors = [selectors];
+
+    let sendEvent = () => {
+      let menu = this.browserWindow.document.getElementById("contentAreaContextMenu");
+      this.delayedEventListener(menu, "popupshowing",
         function (e) {
           let popup = e.target;
           if (onshownCallback) {
@@ -4114,35 +4197,41 @@
           resolve(popup);
         }, false);
 
-      let rect = targetNode ?
-                 targetNode.getBoundingClientRect() :
-                 { left: 0, top: 0, width: 0, height: 0 };
-      let contentWin = targetNode ? targetNode.ownerDocument.defaultView
-                                  : this.browserWindow.content;
-      contentWin.
-        QueryInterface(Ci.nsIInterfaceRequestor).
-        getInterface(Ci.nsIDOMWindowUtils).
-        sendMouseEvent("contextmenu",
-                       rect.left + (rect.width / 2),
-                       rect.top + (rect.height / 2),
-                       2, 1, 0);
+      let messageManager = this.browserWindow.gBrowser.selectedBrowser.messageManager;
+      messageManager.sendAsyncMessage('test:contextmenu', { selectors });
+    }
+
+    // Bounces an asynchronous message through the browser message manager.
+    // This ensures that any pending messages have been delivered to the frame
+    // scripts and so the remote proxies have been updated
+    let flushMessages = () => {
+      let listener = () => {
+        messageManager.removeMessageListener('test:pong', listener);
+        sendEvent();
+      };
+
+      let messageManager = this.browserWindow.gBrowser.selectedBrowser.messageManager;
+      messageManager.addMessageListener('test:pong', listener);
+      messageManager.sendAsyncMessage('test:ping');
     }
 
     // If a new tab or window has not yet been opened, open a new tab now.  For
     // some reason using the tab already opened when the test starts causes
     // leaks.  See bug 566351 for details.
-    if (!targetNode && !this.oldSelectedTab && !this.oldBrowserWindow) {
+    if (!selectors && !this.oldSelectedTab && !this.oldBrowserWindow) {
       this.oldSelectedTab = this.tabBrowser.selectedTab;
       this.tab = this.tabBrowser.addTab("about:blank");
       let browser = this.tabBrowser.getBrowserForTab(this.tab);
 
       this.delayedEventListener(browser, "load", function () {
         this.tabBrowser.selectedTab = this.tab;
-        sendEvent.call(this);
+        this.loadFrameScript();
+        flushMessages();
       }, true);
     }
-    else
-      sendEvent.call(this);
+    else {
+      flushMessages();
+    }
 
     return promise;
   },
@@ -4155,9 +4244,14 @@
 
   // Opens a new browser window.  The window will be closed automatically when
   // done() is called.
-  withNewWindow: function (onloadCallback) {
-    let win = this.browserWindow.OpenBrowserWindow();
-    this.delayedEventListener(win, "load", onloadCallback, true);
+  withNewWindow: function (onloadCallback, makePrivate = false) {
+    let win = this.browserWindow.OpenBrowserWindow({ private: makePrivate });
+    observers.once("browser-delayed-startup-finished", () => {
+      // Open a new tab so we can make sure it is remote and loaded
+      win.gBrowser.selectedTab = win.gBrowser.addTab();
+      this.loadFrameScript();
+      this.delayedEventListener(win.gBrowser.selectedBrowser, "load", onloadCallback, true);
+    });
     this.oldBrowserWindow = this.browserWindow;
     this.browserWindow = win;
   },
@@ -4165,10 +4259,7 @@
   // Opens a new private browser window.  The window will be closed
   // automatically when done() is called.
   withNewPrivateWindow: function (onloadCallback) {
-    let win = this.browserWindow.OpenBrowserWindow({private: true});
-    this.delayedEventListener(win, "load", onloadCallback, true);
-    this.oldBrowserWindow = this.browserWindow;
-    this.browserWindow = win;
+    this.withNewWindow(onloadCallback, true);
   },
 
   // Opens a new tab with our test page in the current window.  The tab will
@@ -4180,6 +4271,7 @@
 
     this.delayedEventListener(browser, "load", function () {
       this.tabBrowser.selectedTab = this.tab;
+      this.loadFrameScript();
       onloadCallback.call(this, browser.contentWindow, browser.contentDocument);
     }, true, function(evt) {
       return evt.target.location == TEST_DOC_URL;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/app/b2g.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/app/b2g.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/app/b2g.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/app/b2g.js	2014-11-26 21:45:46.000000000 +0000
@@ -433,7 +433,8 @@
 pref("dom.ipc.processCount", 100000);
 
 pref("dom.ipc.browser_frames.oop_by_default", false);
-pref("dom.browser_frames.useAsyncPanZoom", true);
+
+pref("dom.meta-viewport.enabled", true);
 
 // SMS/MMS
 pref("dom.sms.enabled", true);
@@ -1008,9 +1009,9 @@
 
 // Overscroll-related settings
 pref("apz.overscroll.enabled", true);
-pref("apz.overscroll.stretch_factor", "0.5");
-pref("apz.overscroll.spring_stiffness", "0.001");
-pref("apz.overscroll.spring_friction", "0.015");
+pref("apz.overscroll.stretch_factor", "0.15");
+pref("apz.overscroll.spring_stiffness", "0.002");
+pref("apz.overscroll.spring_friction", "0.02");
 pref("apz.overscroll.stop_distance_threshold", "5.0");
 pref("apz.overscroll.stop_velocity_threshold", "0.01");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/app/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/app/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/app/Makefile.in	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/app/Makefile.in	2014-11-26 21:45:46.000000000 +0000
@@ -20,14 +20,6 @@
 # Make sure the standalone glue doesn't try to get libxpcom.so from b2g/app.
 NSDISTMODE = copy
 
-# Copy the Firefox OS fonts if available
-ifdef MOZTTDIR
-include $(MOZTTDIR)/fonts.mk
-MOZTT_DEST = $(FINAL_TARGET)/fonts
-MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
-INSTALL_TARGETS += MOZTT
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 APP_ICON = b2g
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/branding/unofficial/configure.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/branding/unofficial/configure.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/branding/unofficial/configure.sh	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/branding/unofficial/configure.sh	2014-11-26 21:45:46.000000000 +0000
@@ -2,6 +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/.
 
-ANDROID_PACKAGE_NAME=org.mozilla.b2g_`echo $USER`
+ANDROID_PACKAGE_NAME=org.mozilla.b2g_`echo $USER | sed 's/-/_/g'`
 MOZ_APP_DISPLAYNAME=B2G
 MOZ_UPDATER=
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/chrome/content/desktop.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/chrome/content/desktop.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/chrome/content/desktop.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/chrome/content/desktop.js	2014-11-26 21:45:46.000000000 +0000
@@ -30,11 +30,15 @@
   // so that click events are delayed and it is better to
   // listen for touch events.
   homeButton.addEventListener('touchstart', function() {
-    shell.sendChromeEvent({type: 'home-button-press'});
+    let window = shell.contentBrowser.contentWindow;
+    let e = new window.KeyboardEvent('keydown', {key: 'Home'});
+    window.dispatchEvent(e);
     homeButton.classList.add('active');
   });
   homeButton.addEventListener('touchend', function() {
-    shell.sendChromeEvent({type: 'home-button-release'});
+    let window = shell.contentBrowser.contentWindow;
+    let e = new window.KeyboardEvent('keyup', {key: 'Home'});
+    window.dispatchEvent(e);
     homeButton.classList.remove('active');
   });
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/chrome/content/settings.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/chrome/content/settings.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/chrome/content/settings.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/chrome/content/settings.js	2014-11-26 21:45:46.000000000 +0000
@@ -510,10 +510,6 @@
     defaultValue: 0
   },
   'app.update.interval': 86400,
-  'apz.force-enable': {
-    prefName: 'dom.browser_frames.useAsyncPanZoom',
-    defaultValue: false
-  },
   'apz.overscroll.enabled': true,
   'debug.fps.enabled': {
     prefName: 'layers.acceleration.draw-fps',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/LogCapture.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/LogCapture.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/LogCapture.jsm	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/LogCapture.jsm	2014-11-26 21:45:46.000000000 +0000
@@ -8,22 +8,27 @@
 
 this.EXPORTED_SYMBOLS = ['LogCapture'];
 
-/**
- * readLogFile
- * Read in /dev/log/{{log}} in nonblocking mode, which will return -1 if
- * reading would block the thread.
- *
- * @param log {String} The log from which to read. Must be present in /dev/log
- * @return {Uint8Array} Raw log data
- */
-let readLogFile = function(logLocation) {
-  if (!this.ctypes) {
+const SYSTEM_PROPERTY_KEY_MAX = 32;
+const SYSTEM_PROPERTY_VALUE_MAX = 92;
+
+function debug(msg) {
+  dump('LogCapture.jsm: ' + msg + '\n');
+}
+
+let LogCapture = {
+  ensureLoaded: function() {
+    if (!this.ctypes) {
+      this.load();
+    }
+  },
+
+  load: function() {
     // load in everything on first use
     Components.utils.import('resource://gre/modules/ctypes.jsm', this);
 
-    this.lib = this.ctypes.open(this.ctypes.libraryName('c'));
+    this.libc = this.ctypes.open(this.ctypes.libraryName('c'));
 
-    this.read = this.lib.declare('read',
+    this.read = this.libc.declare('read',
       this.ctypes.default_abi,
       this.ctypes.int,       // bytes read (out)
       this.ctypes.int,       // file descriptor (in)
@@ -31,61 +36,124 @@
       this.ctypes.size_t     // size_t size of buffer (in)
     );
 
-    this.open = this.lib.declare('open',
+    this.open = this.libc.declare('open',
       this.ctypes.default_abi,
       this.ctypes.int,      // file descriptor (returned)
       this.ctypes.char.ptr, // path
       this.ctypes.int       // flags
     );
 
-    this.close = this.lib.declare('close',
+    this.close = this.libc.declare('close',
       this.ctypes.default_abi,
       this.ctypes.int, // error code (returned)
       this.ctypes.int  // file descriptor
     );
-  }
 
-  const O_READONLY = 0;
-  const O_NONBLOCK = 1 << 11;
+    this.property_find_nth =
+      this.libc.declare("__system_property_find_nth",
+                        this.ctypes.default_abi,
+                        this.ctypes.voidptr_t,     // return value: nullable prop_info*
+                        this.ctypes.unsigned_int); // n: the index of the property to return
+
+    this.property_read =
+      this.libc.declare("__system_property_read",
+                        this.ctypes.default_abi,
+                        this.ctypes.void_t,     // return: none
+                        this.ctypes.voidptr_t,  // non-null prop_info*
+                        this.ctypes.char.ptr,   // key
+                        this.ctypes.char.ptr);  // value
+
+    this.key_buf   = this.ctypes.char.array(SYSTEM_PROPERTY_KEY_MAX)();
+    this.value_buf = this.ctypes.char.array(SYSTEM_PROPERTY_VALUE_MAX)();
+  },
+
+  cleanup: function() {
+    this.libc.close();
+
+    this.read = null;
+    this.open = null;
+    this.close = null;
+    this.property_find_nth = null;
+    this.property_read = null;
+    this.key_buf = null;
+    this.value_buf = null;
+
+    this.libc = null;
+    this.ctypes = null;
+  },
+
+  /**
+   * readLogFile
+   * Read in /dev/log/{{log}} in nonblocking mode, which will return -1 if
+   * reading would block the thread.
+   *
+   * @param log {String} The log from which to read. Must be present in /dev/log
+   * @return {Uint8Array} Raw log data
+   */
+  readLogFile: function(logLocation) {
+    this.ensureLoaded();
+
+    const O_READONLY = 0;
+    const O_NONBLOCK = 1 << 11;
+
+    const BUF_SIZE = 2048;
+
+    let BufType = this.ctypes.ArrayType(this.ctypes.char);
+    let buf = new BufType(BUF_SIZE);
+    let logArray = [];
+
+    let logFd = this.open(logLocation, O_READONLY | O_NONBLOCK);
+    if (logFd === -1) {
+      return null;
+    }
 
-  const BUF_SIZE = 2048;
+    let readStart = Date.now();
+    let readCount = 0;
+    while (true) {
+      let count = this.read(logFd, buf, BUF_SIZE);
+      readCount += 1;
+
+      if (count <= 0) {
+        // log has return due to being nonblocking or running out of things
+        break;
+      }
+      for(let i = 0; i < count; i++) {
+        logArray.push(buf[i]);
+      }
+    }
 
-  let BufType = this.ctypes.ArrayType(this.ctypes.char);
-  let buf = new BufType(BUF_SIZE);
-  let logArray = [];
-
-  let logFd = this.open(logLocation, O_READONLY | O_NONBLOCK);
-  if (logFd === -1) {
-    return null;
-  }
+    let logTypedArray = new Uint8Array(logArray);
 
-  let readStart = Date.now();
-  let readCount = 0;
-  while (true) {
-    let count = this.read(logFd, buf, BUF_SIZE);
-    readCount += 1;
-
-    if (count <= 0) {
-      // log has return due to being nonblocking or running out of things
-      break;
-    }
-    for(let i = 0; i < count; i++) {
-      logArray.push(buf[i]);
-    }
-  }
+    this.close(logFd);
 
-  let logTypedArray = new Uint8Array(logArray);
+    return logTypedArray;
+  },
 
-  this.close(logFd);
+ /**
+   * Get all system properties as a dict with keys mapping to values
+   */
+  readProperties: function() {
+    this.ensureLoaded();
+    let n = 0;
+    let propertyDict = {};
+
+    while(true) {
+      let prop_info = this.property_find_nth(n);
+      if(prop_info.isNull()) {
+        break;
+      }
+
+      // read the prop_info into the key and value buffers
+      this.property_read(prop_info, this.key_buf, this.value_buf);
+      let key = this.key_buf.readString();;
+      let value = this.value_buf.readString()
 
-  return logTypedArray;
-};
+      propertyDict[key] = value;
+      n++;
+    }
 
-let cleanup = function() {
-  this.lib.close();
-  this.read = this.open = this.close = null;
-  this.lib = null;
-  this.ctypes = null;
+    return propertyDict;
+  }
 };
 
-this.LogCapture = { readLogFile: readLogFile, cleanup: cleanup };
+this.LogCapture = LogCapture;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/LogParser.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/LogParser.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/LogParser.jsm	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/LogParser.jsm	2014-11-26 21:45:46.000000000 +0000
@@ -215,71 +215,14 @@
 }
 
 /**
- * Parse an array of bytes as a properties file. The structure of the
- * properties file is derived from bionic/libc/bionic/system_properties.c
- * @param array {Uint8Array} Array containing property data
- * @return {Object} Map from property name to property value, both strings
- */
-function parsePropertiesArray(array) {
-  let data = new DataView(array.buffer);
-  let byteString = String.fromCharCode.apply(null, array);
-
-  let properties = {};
-
-  let propIndex = 0;
-  let propCount = data.getUint32(0, true);
-
-  // first TOC entry is at 32
-  let tocOffset = 32;
-
-  const PROP_NAME_MAX = 32;
-  const PROP_VALUE_MAX = 92;
-
-  while (propIndex < propCount) {
-    // Retrieve offset from file start
-    let infoOffset = data.getUint32(tocOffset, true) & 0xffffff;
-
-    // Now read the name, integer serial, and value
-    let propName = "";
-    let nameOffset = infoOffset;
-    while (byteString[nameOffset] != "\0" &&
-           (nameOffset - infoOffset) < PROP_NAME_MAX) {
-      propName += byteString[nameOffset];
-      nameOffset ++;
-    }
-
-    infoOffset += PROP_NAME_MAX;
-    // Skip serial number
-    infoOffset += 4;
-
-    let propValue = "";
-    nameOffset = infoOffset;
-    while (byteString[nameOffset] != "\0" &&
-           (nameOffset - infoOffset) < PROP_VALUE_MAX) {
-      propValue += byteString[nameOffset];
-      nameOffset ++;
-    }
-
-    // Move to next table of contents entry
-    tocOffset += 4;
-
-    properties[propName] = propValue;
-    propIndex += 1;
-  }
-
-  return properties;
-}
-
-/**
- * Pretty-print an array read from the /dev/__properties__ file.
- * @param array {Uint8Array} File data array
+ * Pretty-print an array read from the list of propreties.
+ * @param {Object} Object representing the properties
  * @return {String} Human-readable string of property name: property value
  */
-function prettyPrintPropertiesArray(array) {
-  let properties = parsePropertiesArray(array);
+function prettyPrintPropertiesArray(properties) {
   let propertiesString = "";
   for(let propName in properties) {
-    propertiesString += propName + ": " + properties[propName] + "\n";
+    propertiesString += "[" + propName + "]: [" + properties[propName] + "]\n";
   }
   return propertiesString;
 }
@@ -294,7 +237,6 @@
 
 this.LogParser = {
   parseLogArray: parseLogArray,
-  parsePropertiesArray: parsePropertiesArray,
   prettyPrintArray: prettyPrintArray,
   prettyPrintLogArray: prettyPrintLogArray,
   prettyPrintPropertiesArray: prettyPrintPropertiesArray
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/LogShake.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/LogShake.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/LogShake.jsm	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/LogShake.jsm	2014-11-26 21:45:46.000000000 +0000
@@ -79,7 +79,6 @@
    * Map of files which have log-type information to their parsers
    */
   LOGS_WITH_PARSERS: {
-    '/dev/__properties__': LogParser.prettyPrintPropertiesArray,
     '/dev/log/main': LogParser.prettyPrintLogArray,
     '/dev/log/system': LogParser.prettyPrintLogArray,
     '/dev/log/radio': LogParser.prettyPrintLogArray,
@@ -210,6 +209,14 @@
    */
   readLogs: function() {
     let logArrays = {};
+
+    try {
+      logArrays["properties"] =
+        LogParser.prettyPrintPropertiesArray(LogCapture.readProperties());
+    } catch (ex) {
+      Cu.reportError("Unable to get device properties: " + ex);
+    }
+
     for (let loc in this.LOGS_WITH_PARSERS) {
       let logArray;
       try {
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/data/test_properties and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/data/test_properties differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/test_logcapture.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/test_logcapture.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/test_logcapture.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/test_logcapture.js	2014-11-26 21:45:46.000000000 +0000
@@ -8,7 +8,7 @@
  * log devices
  */
 function run_test() {
-  Components.utils.import('resource:///modules/LogCapture.jsm');
+  Components.utils.import("resource:///modules/LogCapture.jsm");
 
   function verifyLog(log) {
     // log exists
@@ -17,9 +17,14 @@
     ok(log.length >= 0);
   }
 
-  let mainLog = LogCapture.readLogFile('/dev/log/main');
+  let propertiesLog = LogCapture.readProperties();
+  notEqual(propertiesLog, null, "Properties should not be null");
+  notEqual(propertiesLog, undefined, "Properties should not be undefined");
+  equal(propertiesLog["ro.kernel.qemu"], "1", "QEMU property should be 1");
+
+  let mainLog = LogCapture.readLogFile("/dev/log/main");
   verifyLog(mainLog);
 
-  let meminfoLog = LogCapture.readLogFile('/proc/meminfo');
+  let meminfoLog = LogCapture.readLogFile("/proc/meminfo");
   verifyLog(meminfoLog);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/test_logparser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/test_logparser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/test_logparser.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/test_logparser.js	2014-11-26 21:45:46.000000000 +0000
@@ -2,48 +2,73 @@
 
 const {utils: Cu, classes: Cc, interfaces: Ci} = Components;
 
+function debug(msg) {
+  var timestamp = Date.now();
+  dump("LogParser: " + timestamp + ": " + msg + "\n");
+}
+
 function run_test() {
-  Cu.import('resource:///modules/LogParser.jsm');
+  Cu.import("resource:///modules/LogParser.jsm");
+  debug("Starting");
+  run_next_test();
+}
 
-  let propertiesFile = do_get_file('data/test_properties');
-  let loggerFile = do_get_file('data/test_logger_file');
+function makeStream(file) {
+  var fileStream = Cc["@mozilla.org/network/file-input-stream;1"]
+                .createInstance(Ci.nsIFileInputStream);
+  fileStream.init(file, -1, -1, 0);
+  var bis = Cc["@mozilla.org/binaryinputstream;1"]
+                .createInstance(Ci.nsIBinaryInputStream);
+  bis.setInputStream(fileStream);
+  return bis;
+}
+
+add_test(function test_parse_logfile() {
+  let loggerFile = do_get_file("data/test_logger_file");
 
-  let propertiesStream = makeStream(propertiesFile);
   let loggerStream = makeStream(loggerFile);
 
   // Initialize arrays to hold the file contents (lengths are hardcoded)
-  let propertiesArray = new Uint8Array(propertiesStream.readByteArray(65536));
   let loggerArray = new Uint8Array(loggerStream.readByteArray(4037));
 
-  propertiesStream.close();
   loggerStream.close();
 
-  let properties = LogParser.parsePropertiesArray(propertiesArray);
   let logMessages = LogParser.parseLogArray(loggerArray);
 
-  // Test arbitrary property entries for correctness
-  equal(properties['ro.boot.console'], 'ttyHSL0');
-  equal(properties['net.tcp.buffersize.lte'],
-        '524288,1048576,2097152,262144,524288,1048576');
-
-  ok(logMessages.length === 58, 'There should be 58 messages in the log');
+  ok(logMessages.length === 58, "There should be 58 messages in the log");
 
   let expectedLogEntry = {
     processId: 271, threadId: 271,
     seconds: 790796, nanoseconds: 620000001, time: 790796620.000001,
-    priority: 4, tag: 'Vold',
-    message: 'Vold 2.1 (the revenge) firing up\n'
+    priority: 4, tag: "Vold",
+    message: "Vold 2.1 (the revenge) firing up\n"
   };
 
   deepEqual(expectedLogEntry, logMessages[0]);
-}
+  run_next_test();
+});
 
-function makeStream(file) {
-  var fileStream = Cc['@mozilla.org/network/file-input-stream;1']
-                .createInstance(Ci.nsIFileInputStream);
-  fileStream.init(file, -1, -1, 0);
-  var bis = Cc['@mozilla.org/binaryinputstream;1']
-                .createInstance(Ci.nsIBinaryInputStream);
-  bis.setInputStream(fileStream);
-  return bis;
-}
+add_test(function test_print_properties() {
+  let properties = {
+    "ro.secure": "1",
+    "sys.usb.state": "diag,serial_smd,serial_tty,rmnet_bam,mass_storage,adb"
+  };
+
+  let logMessages = LogParser.prettyPrintPropertiesArray(properties);
+  let logMessagesArray = logMessages.split("\n");
+
+  ok(logMessagesArray.length === 3, "There should be 3 lines in the log.");
+  notEqual(logMessagesArray[0], "", "First line should not be empty");
+  notEqual(logMessagesArray[1], "", "Second line should not be empty");
+  equal(logMessagesArray[2], "", "Last line should be empty");
+
+  let expectedLog = [
+    "[ro.secure]: [1]",
+    "[sys.usb.state]: [diag,serial_smd,serial_tty,rmnet_bam,mass_storage,adb]",
+    ""
+  ].join("\n");
+
+  deepEqual(expectedLog, logMessages);
+
+  run_next_test();
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/test_logshake.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/test_logshake.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/test_logshake.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/test_logshake.js	2014-11-26 21:45:46.000000000 +0000
@@ -8,19 +8,19 @@
 
 /* disable use strict warning */
 /* jshint -W097 */
-'use strict';
+"use strict";
 
 const Cu = Components.utils;
 
-Cu.import('resource://gre/modules/LogCapture.jsm');
-Cu.import('resource://gre/modules/LogShake.jsm');
+Cu.import("resource://gre/modules/LogCapture.jsm");
+Cu.import("resource://gre/modules/LogShake.jsm");
 
 // Force logshake to handle a device motion event with given components
 // Does not use SystemAppProxy because event needs special
 // accelerationIncludingGravity property
 function sendDeviceMotionEvent(x, y, z) {
   let event = {
-    type: 'devicemotion',
+    type: "devicemotion",
     accelerationIncludingGravity: {
       x: x,
       y: y,
@@ -34,7 +34,7 @@
 // conditions.
 function sendScreenChangeEvent(screenEnabled) {
   let event = {
-    type: 'screenchange',
+    type: "screenchange",
     detail: {
       screenEnabled: screenEnabled
     }
@@ -44,7 +44,7 @@
 
 function debug(msg) {
   var timestamp = Date.now();
-  dump('LogShake: ' + timestamp + ': ' + msg);
+  dump("LogShake: " + timestamp + ": " + msg);
 }
 
 add_test(function test_do_log_capture_after_shaking() {
@@ -61,7 +61,7 @@
   sendDeviceMotionEvent(9001, 9001, 9001);
 
   ok(readLocations.length > 0,
-      'LogShake should attempt to read at least one log');
+      "LogShake should attempt to read at least one log");
 
   LogShake.uninit();
   run_next_test();
@@ -81,15 +81,15 @@
   sendDeviceMotionEvent(0, 9.8, 9.8);
 
   ok(readLocations.length === 0,
-      'LogShake should not read any logs');
+      "LogShake should not read any logs");
 
-  debug('test_do_nothing_when_resting: stop');
+  debug("test_do_nothing_when_resting: stop");
   LogShake.uninit();
   run_next_test();
 });
 
 add_test(function test_do_nothing_when_disabled() {
-  debug('test_do_nothing_when_disabled: start');
+  debug("test_do_nothing_when_disabled: start");
   // Disable LogShake
   LogShake.uninit();
 
@@ -103,7 +103,7 @@
   sendDeviceMotionEvent(0, 9001, 9001);
 
   ok(readLocations.length === 0,
-      'LogShake should not read any logs');
+      "LogShake should not read any logs");
 
   run_next_test();
 });
@@ -126,7 +126,7 @@
   sendDeviceMotionEvent(0, 9001, 9001);
 
   ok(readLocations.length === 0,
-      'LogShake should not read any logs');
+      "LogShake should not read any logs");
 
   // Restore the screen
   sendScreenChangeEvent(true);
@@ -149,7 +149,7 @@
   sendDeviceMotionEvent(9001, 9001, 9001);
 
   ok(readLocations.length > 0,
-      'LogShake should attempt to read at least one log');
+      "LogShake should attempt to read at least one log");
 
   LogShake.uninit();
   run_next_test();
@@ -172,13 +172,13 @@
   sendDeviceMotionEvent(9001, 9001, 9001);
 
   ok(readLocations.length > 0,
-      'LogShake should attempt to read at least one log');
+      "LogShake should attempt to read at least one log");
 
   LogShake.uninit();
   run_next_test();
 });
 
 function run_test() {
-  debug('Starting');
+  debug("Starting");
   run_next_test();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/components/test/unit/xpcshell.ini	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/components/test/unit/xpcshell.ini	2014-11-26 21:45:46.000000000 +0000
@@ -4,7 +4,6 @@
 
 support-files =
   data/test_logger_file
-  data/test_properties
 
 [test_bug793310.js]
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/dolphin/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/dolphin/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/dolphin/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/dolphin/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <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="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <!-- 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"/>
@@ -111,7 +111,7 @@
   <project name="platform/libcore" path="libcore" revision="e195beab082c09217318fc19250caeaf4c1bd800"/>
   <project name="platform/libnativehelper" path="libnativehelper" revision="feeb36c2bd4adfe285f98f5de92e0f3771b2c115"/>
   <project name="platform/ndk" path="ndk" revision="e58ef003be4306bb53a8c11331146f39e4eab31f"/>
-  <project name="platform/prebuilts/misc" path="prebuilts/misc" revision="ee724654c72825f8d732ba45caf75ca59e06975d"/>
+  <project name="platform_prebuilts_misc" path="prebuilts/misc" remote="b2g" revision="0e7c060db684b409616fe67ea433ef19f5634c60"/>
   <project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="c792f0bd9fff7aea2887c60bbb3a9bbdb534ffa3"/>
   <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="c24c8871173bf6aedcf236cab075edf092a7015c"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="cfcef469537869947abb9aa1d656774cc2678d4c"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -19,13 +19,13 @@
     <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="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="67f2907bc340bad250b4ea6ce2902b52896c9ef0"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a47dd04f8f66e42fd331711140f2c3e2fed0767d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
   <project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator-ics/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator-ics/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator-ics/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator-ics/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -19,13 +19,13 @@
     <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="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="67f2907bc340bad250b4ea6ce2902b52896c9ef0"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a47dd04f8f66e42fd331711140f2c3e2fed0767d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
   <project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator-jb/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator-jb/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator-jb/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator-jb/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
@@ -134,7 +134,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="9663d24afcda9f96146185972ade780714727beb"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="b06bb64646c5a109856ad461ac91336f8edc2579"/>
   <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-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator-kk/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator-kk/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/emulator-kk/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/emulator-kk/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <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="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <!-- 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"/>
@@ -111,7 +111,7 @@
   <project name="platform/libcore" path="libcore" revision="9877ade9617bb0db6e59aa2a54719a9bc92600f3"/>
   <project name="platform/libnativehelper" path="libnativehelper" revision="46c96ace65eb1ccab05bf15b9bf8e53e443039af"/>
   <project name="platform/ndk" path="ndk" revision="cb5519af32ae7b4a9c334913a612462ecd04c5d0"/>
-  <project name="platform/prebuilts/misc" path="prebuilts/misc" revision="99c9a644e84a1b0e0a5d240406753b6bc4caca54"/>
+  <project name="platform_prebuilts_misc" path="prebuilts/misc" remote="b2g" revision="0e7c060db684b409616fe67ea433ef19f5634c60"/>
   <project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="6aa61f8557a22039a30b42b7f283996381fd625d"/>
   <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="c24c8871173bf6aedcf236cab075edf092a7015c"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="b562b01c93de9578d5db537b6a602a38e1aaa0ce"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/flame/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/flame/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/flame/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/flame/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
@@ -122,7 +122,7 @@
   <!-- Flame specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="e8a318f7690092e639ba88891606f4183e846d3f"/>
   <project name="device/qcom/common" path="device/qcom/common" revision="878804e0becfe5635bb8ccbf2671333d546c6fb6"/>
-  <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="b04c1a7d96f01a743f23a544870cd5be2c8d172e"/>
+  <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="47f828c8a9a6673bbe05ac8868634d04a1798305"/>
   <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="49417cfc622074daa3c76b345a199f6731375800"/>
   <project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="6f00133ac0f47e90027bd7e263a16b405bfac503"/>
   <project name="platform_bootable_recovery" path="bootable/recovery" remote="b2g" revision="e81502511cda303c803e63f049574634bc96f9f2"/>
@@ -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="9663d24afcda9f96146185972ade780714727beb"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="b06bb64646c5a109856ad461ac91336f8edc2579"/>
   <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-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/flame-kk/releng-flame-kk.tt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/flame-kk/releng-flame-kk.tt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/flame-kk/releng-flame-kk.tt	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/flame-kk/releng-flame-kk.tt	2014-11-26 21:45:46.000000000 +0000
@@ -1,8 +1,9 @@
 [
 {
-"size": 91247216,
-"digest": "2b4be549f98695488ea7288d9e7f8ac0fa45112bedefa485a6e016c4af73fa21bb6b3992beda516f268417207c5deb57afad3959d3b1fbd07d5269b3a6be6a27",
+"size": 120750384,
+"digest": "0e0a0b0dcca020e3283ce8deb33d0eed48fab16ef2fd919120bd7b5abba00713210be17f466d11bf77cca3c9e3b663805be61774476cc669f0a75736d901edfd",
 "algorithm": "sha512",
-"filename": "backup-flame.tar.xz"
+"filename": "backup-flame.tar.xz",
+"comment": "v188-1"
 }
 ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/flame-kk/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/flame-kk/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/flame-kk/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/flame-kk/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -15,15 +15,15 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <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="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <!-- 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"/>
@@ -111,7 +111,7 @@
   <project name="platform/libcore" path="libcore" revision="baf7d8068dd501cfa338d3a8b1b87216d6ce0571"/>
   <project name="platform/libnativehelper" path="libnativehelper" revision="50c4430e32849530ced32680fd6ee98963b3f7ac"/>
   <project name="platform/ndk" path="ndk" revision="e58ef003be4306bb53a8c11331146f39e4eab31f"/>
-  <project name="platform/prebuilts/misc" path="prebuilts/misc" revision="a094aa8f160e211fb4994fdfaaac8a78aa6cc897"/>
+  <project name="platform_prebuilts_misc" path="prebuilts/misc" remote="b2g" revision="0e7c060db684b409616fe67ea433ef19f5634c60"/>
   <project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="c792f0bd9fff7aea2887c60bbb3a9bbdb534ffa3"/>
   <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="c24c8871173bf6aedcf236cab075edf092a7015c"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="69d524e80cdf3981006627c65ac85f3a871238a3"/>
@@ -135,7 +135,7 @@
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="1bb28abbc215f45220620af5cd60a8ac1be93722"/>
   <project name="device/qcom/common" path="device/qcom/common" revision="54c32c2ddef066fbdf611d29e4b7c47e0363599e"/>
   <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="48835395daa6a49b281db62c50805bd6ca24077e"/>
-  <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="3c4f041e3e3dc676f2111caf20a186ec0467dbdb"/>
+  <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="3d986de16450c382c97e092e7579df16928e35d5"/>
   <project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="fda40423ffa573dc6cafd3780515010cb2a086be"/>
   <project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="30b96dfca99cb384bf520a16b81f3aba56f09907"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="5b71e40213f650459e95d35b6f14af7e88d8ab62"/>
@@ -153,7 +153,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="350eac5403124dacb2a5fd9e28ac290a59fc3b8e"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="9663d24afcda9f96146185972ade780714727beb"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="b06bb64646c5a109856ad461ac91336f8edc2579"/>
   <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="018b44e52b2bac5d3631d559550e88a4b68c6e67"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/gaia.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/gaia.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/gaia.json	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/gaia.json	2014-11-26 21:45:46.000000000 +0000
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "26b4d06af9d942c3b6ab81f119d33951823bc256", 
+    "revision": "769491b138582de92f5636413928de13268e1a63", 
     "repo_path": "integration/gaia-central"
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/hamachi/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/hamachi/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/hamachi/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/hamachi/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -17,11 +17,11 @@
     <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="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/helix/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/helix/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/helix/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/helix/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -15,11 +15,11 @@
     <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="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/debug thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/debug
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/debug	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/debug	2014-11-26 21:45:46.000000000 +0000
@@ -10,7 +10,6 @@
 export TOOLCHAIN_HOST=linux-x86
 export GONK_PRODUCT=generic
 ac_add_options --with-gonk-toolchain-prefix="$topsrcdir/gonk-toolchain/prebuilt/$TOOLCHAIN_HOST/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-"
-ac_add_options --disable-elf-hack
 ac_add_options --enable-debug-symbols
 ac_add_options --enable-debug
 #. "$topsrcdir/build/mozconfig.cache"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/nightly	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/ics_armv7a_gecko/nightly	2014-11-26 21:45:46.000000000 +0000
@@ -11,7 +11,6 @@
 export TOOLCHAIN_HOST=linux-x86
 export GONK_PRODUCT=generic
 ac_add_options --with-gonk-toolchain-prefix="$topsrcdir/gonk-toolchain/prebuilt/$TOOLCHAIN_HOST/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-"
-ac_add_options --disable-elf-hack
 ac_add_options --enable-debug-symbols
 # ac_add_options --enable-profiling
 #. "$topsrcdir/build/mozconfig.cache"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux32_gecko/debug thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux32_gecko/debug
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux32_gecko/debug	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux32_gecko/debug	2014-11-26 21:45:46.000000000 +0000
@@ -29,7 +29,6 @@
 #B2G options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
-ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux32_gecko/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux32_gecko/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux32_gecko/nightly	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux32_gecko/nightly	2014-11-26 21:45:46.000000000 +0000
@@ -27,7 +27,6 @@
 
 #B2G options
 ac_add_options --enable-application=b2g
-ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux64_gecko/debug thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux64_gecko/debug
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux64_gecko/debug	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux64_gecko/debug	2014-11-26 21:45:46.000000000 +0000
@@ -29,7 +29,6 @@
 #B2G options
 ac_add_options --enable-application=b2g
 ENABLE_MARIONETTE=1
-ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux64_gecko/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux64_gecko/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/mozconfigs/linux64_gecko/nightly	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/mozconfigs/linux64_gecko/nightly	2014-11-26 21:45:46.000000000 +0000
@@ -27,7 +27,6 @@
 
 #B2G options
 ac_add_options --enable-application=b2g
-ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/nexus-4/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/nexus-4/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/nexus-4/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/nexus-4/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
@@ -129,7 +129,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="9663d24afcda9f96146185972ade780714727beb"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="b06bb64646c5a109856ad461ac91336f8edc2579"/>
   <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-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/wasabi/sources.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/wasabi/sources.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/config/wasabi/sources.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/config/wasabi/sources.xml	2014-11-26 21:45:46.000000000 +0000
@@ -17,12 +17,12 @@
     <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="c4f85f8825f0c1795fcd9152185c48f4f2eee9d6"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="45c54a55e31758f7e54e5eafe0d01d387f35897a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="41b7be7c67167f367c3c4982ff08651d55455373"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="50ad16a280fe9cfa0716f8c6ba16afdf7f266b49"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
-  <project name="moztt" path="external/moztt" remote="b2g" revision="562d357b72279a9e35d4af5aeecc8e1ffa2f44f1"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0494efbb157e863dec6f1fd4d4652b0917ce263d"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="6499615ecece69e726657dc5caaeefa05fbb66bf"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/installer/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/installer/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/installer/Makefile.in	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/installer/Makefile.in	2014-11-26 21:45:46.000000000 +0000
@@ -83,9 +83,6 @@
 DEFINES += -DGKMEDIAS_SHARED_LIBRARY
 endif
 
-ifdef MOZ_REPLACE_MALLOC
-DEFINES += -DMOZ_REPLACE_MALLOC
-endif
 ifdef MOZ_JEMALLOC3
 DEFINES += -DMOZ_JEMALLOC3
 endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/installer/package-manifest.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/installer/package-manifest.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/installer/package-manifest.in	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/installer/package-manifest.in	2014-11-26 21:45:46.000000000 +0000
@@ -449,6 +449,10 @@
 @BINPATH@/components/RadioInterfaceLayer.js
 @BINPATH@/components/RadioInterfaceLayer.manifest
 @BINPATH@/components/RILContentHelper.js
+@BINPATH@/components/RILSystemMessengerHelper.js
+@BINPATH@/components/RILSystemMessengerHelper.manifest
+@BINPATH@/components/TelephonyAudioService.js
+@BINPATH@/components/TelephonyAudioService.manifest
 @BINPATH@/components/TelephonyService.js
 @BINPATH@/components/TelephonyService.manifest
 @BINPATH@/components/VoicemailService.js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties	2014-11-26 21:45:46.000000000 +0000
@@ -31,6 +31,6 @@
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspFrameAncestorBlocked=This page has a content security policy that prevents it from being embedded in this way.
+cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/blocklist.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/blocklist.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/blocklist.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/blocklist.xml	2014-11-26 21:45:46.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1415397193000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1416506840000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -451,10 +451,8 @@
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i502" id="{df6bb2ec-333b-4267-8c4f-3f27dc8c6e07}">
-                        <versionRange  minVersion="0" maxVersion="*" severity="3">
-                    </versionRange>
-                                <versionRange  minVersion="0" maxVersion="*" severity="3">
+      <emItem  blockID="i346" id="{a6e67e6f-8615-4fe0-a599-34a73fc3fba5}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                     <prefs>
               </prefs>
@@ -534,14 +532,22 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i784" id="{41e5ef7a-171d-4ab5-8351-951c65a29908}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i374" id="update@firefox.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i346" id="{a6e67e6f-8615-4fe0-a599-34a73fc3fba5}">
-                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+      <emItem  blockID="i502" id="{df6bb2ec-333b-4267-8c4f-3f27dc8c6e07}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                                <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
                     <prefs>
               </prefs>
@@ -887,6 +893,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i782" id="safebrowse@safebrowse.co">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i654" id="{7b1bf0b6-a1b9-42b0-b75d-252036438bdc}">
                         <versionRange  minVersion="27.8" maxVersion="27.9" severity="3">
                     </versionRange>
@@ -1458,6 +1470,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i788" id="{729c9605-0626-4792-9584-4cbe65b243e6}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i750" id="{46eddf51-a4f6-4476-8d6c-31c5187b2a2f}">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -1543,6 +1561,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i780" id="{b6ef1336-69bb-45b6-8cba-e578fc0e4433}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i96" id="youtubeee@youtuber3.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
@@ -2019,6 +2043,12 @@
                     </versionRange>
                     <prefs>
               </prefs>
+    </emItem>
+      <emItem  blockID="i786" id="{63eb5ed4-e1b3-47ec-a253-f8462f205350}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
     </emItem>
       <emItem  blockID="i342" id="lbmsrvfvxcblvpane@lpaezhjez.org">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/moz.build	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/moz.build	2014-11-26 21:45:46.000000000 +0000
@@ -6,7 +6,7 @@
 
 DIRS += ['profile/extensions']
 
-if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_METRO']:
+if CONFIG['OS_ARCH'] == 'WINNT' and (CONFIG['MOZ_METRO'] or CONFIG['MOZ_ASAN']):
     GeckoProgram(CONFIG['MOZ_APP_NAME'])
 else:
     GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/nsBrowserApp.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/nsBrowserApp.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/nsBrowserApp.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/nsBrowserApp.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -37,6 +37,11 @@
 
 #ifdef XP_WIN
 // we want a wmain entry point
+#ifdef MOZ_ASAN
+// ASAN requires firefox.exe to be built with -MD, and it's OK if we don't
+// support Windows XP SP2 in ASAN builds.
+#define XRE_DONT_SUPPORT_XPSP2
+#endif
 #include "nsWindowsWMain.cpp"
 #define snprintf _snprintf
 #define strcasecmp _stricmp
@@ -121,7 +126,7 @@
   return false;
 }
 
-#ifdef XP_WIN
+#if defined(XP_WIN) && defined(MOZ_METRO)
 /*
  * AttachToTestHarness - Windows helper for when we are running
  * in the immersive environment. Firefox is launched by Windows in
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/profile/firefox.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/profile/firefox.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/app/profile/firefox.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/app/profile/firefox.js	2014-11-26 21:45:46.000000000 +0000
@@ -183,7 +183,7 @@
 pref("app.update.silent", false);
 
 // If set to true, the hamburger button will show badges for update events.
-#ifdef MOZ_DEV_EDITION
+#ifndef RELEASE_BUILD
 pref("app.update.badge", true);
 #else
 pref("app.update.badge", false);
@@ -323,7 +323,7 @@
 pref("browser.urlbar.autoFill.typed", true);
 
 // Use the new unifiedComplete component
-pref("browser.urlbar.unifiedcomplete", true);
+pref("browser.urlbar.unifiedcomplete", false);
 
 // 0: Match anywhere (e.g., middle of words)
 // 1: Match on word boundaries and then try matching anywhere
@@ -1319,7 +1319,7 @@
 pref("devtools.devedition.promo.url", "https://mozilla.org/firefox/developer");
 
 // Only potentially show in beta release
-#ifdef MOZ_UPDATE_CHANNEL == beta
+#if MOZ_UPDATE_CHANNEL == beta
   pref("devtools.devedition.promo.enabled", true);
 #else
   pref("devtools.devedition.promo.enabled", false);
@@ -1642,8 +1642,10 @@
 pref("image.mem.max_decoded_image_kb", 256000);
 
 pref("loop.enabled", true);
-pref("loop.server", "https://loop.services.mozilla.com");
+pref("loop.server", "https://loop.services.mozilla.com/v0");
 pref("loop.seenToS", "unseen");
+pref("loop.gettingStarted.seen", false);
+pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start");
 pref("loop.learnMoreUrl", "https://www.firefox.com/hello/");
 pref("loop.legal.ToS_url", "https://hello.firefox.com/legal/terms/");
 pref("loop.legal.privacy_url", "https://www.mozilla.org/privacy/");
@@ -1664,9 +1666,10 @@
 #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.rooms.enabled", false);
+pref("loop.rooms.enabled", true);
 pref("loop.fxa_oauth.tokendata", "");
 pref("loop.fxa_oauth.profile", "");
+pref("loop.support_url", "https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc");
 
 // serverURL to be assigned by services team
 pref("services.push.serverURL", "wss://push.services.mozilla.com/");
@@ -1808,7 +1811,7 @@
 #endif
 
 #ifdef NIGHTLY_BUILD
-pref("browser.tabs.remote.autostart.1", true);
+pref("browser.tabs.remote.autostart.1", false);
 #endif
 
 // Temporary pref to allow printing in e10s windows on some platforms.
@@ -1818,4 +1821,9 @@
 pref("print.enable_e10s_testing", true);
 #endif
 
+#ifdef NIGHTLY_BUILD
+// Enable e10s add-on interposition by default.
+pref("extensions.interposition.enabled", true);
+#endif
+
 pref("browser.defaultbrowser.notificationbar", false);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/aboutaccounts/aboutaccounts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/aboutaccounts/aboutaccounts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/aboutaccounts/aboutaccounts.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/aboutaccounts/aboutaccounts.js	2014-11-26 21:45:46.000000000 +0000
@@ -99,16 +99,6 @@
   iframe: null,
 
   init: function (url, urlParams) {
-    let weave = Cc["@mozilla.org/weave/service;1"]
-                  .getService(Ci.nsISupports)
-                  .wrappedJSObject;
-
-    // Don't show about:accounts with FxA disabled.
-    if (!weave.fxAccountsEnabled) {
-      document.body.remove();
-      return;
-    }
-
     // If a master-password is enabled, we want to encourage the user to
     // unlock it.  Things still work if not, but the user will probably need
     // to re-auth next startup (in which case we will get here again and
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/aboutNetError.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/aboutNetError.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/aboutNetError.xhtml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/aboutNetError.xhtml	2014-11-26 21:45:46.000000000 +0000
@@ -186,8 +186,8 @@
           document.getElementById("errorTryAgain").style.display = "none";
         }
 
-        if (err == "cspFrameAncestorBlocked") {
-          // Remove the "Try again" button for CSP frame ancestors violation, since it's
+        if (err == "cspBlocked") {
+          // Remove the "Try again" button for CSP violations, since it's
           // almost certainly useless. (Bug 553180)
           document.getElementById("errorTryAgain").style.display = "none";
         }
@@ -353,7 +353,7 @@
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
         <h1 id="et_malwareBlocked">&malwareBlocked.title;</h1>
-        <h1 id="et_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.title;</h1>
+        <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
       </div>
@@ -379,7 +379,7 @@
         <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
         <div id="ed_malwareBlocked">&malwareBlocked.longDesc;</div>
-        <div id="ed_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.longDesc;</div>
+        <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
       </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/aboutTabCrashed.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/aboutTabCrashed.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/aboutTabCrashed.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/aboutTabCrashed.js	2014-11-26 21:45:46.000000000 +0000
@@ -12,6 +12,22 @@
 
 document.title = parseQueryString();
 
+addEventListener("DOMContentLoaded", () => {
+  let tryAgain = document.getElementById("tryAgain");
+  let sendCrashReport = document.getElementById("checkSendReport");
+
+  tryAgain.addEventListener("click", () => {
+    let event = new CustomEvent("AboutTabCrashedTryAgain", {
+      bubbles: true,
+      detail: {
+        sendCrashReport: sendCrashReport.checked,
+      },
+    });
+
+    document.dispatchEvent(event);
+  });
+});
+
 // Error pages are loaded as LOAD_BACKGROUND, so they don't get load events.
 var event = new CustomEvent("AboutTabCrashedLoad", {bubbles:true});
 document.dispatchEvent(event);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser-devedition.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser-devedition.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser-devedition.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser-devedition.js	2014-11-26 21:45:46.000000000 +0000
@@ -50,6 +50,17 @@
     }
   },
 
+  _inferBrightness: function() {
+    ToolbarIconColor.inferFromText();
+    // Get an inverted full screen button if the dark theme is applied.
+    if (this.styleSheet &&
+        document.documentElement.getAttribute("devtoolstheme") == "dark") {
+      document.documentElement.setAttribute("brighttitlebarforeground", "true");
+    } else {
+      document.documentElement.removeAttribute("brighttitlebarforeground");
+    }
+  },
+
   _updateDevtoolsThemeAttribute: function() {
     // Set an attribute on root element to make it possible
     // to change colors based on the selected devtools theme.
@@ -58,7 +69,7 @@
       devtoolsTheme = "light";
     }
     document.documentElement.setAttribute("devtoolstheme", devtoolsTheme);
-    ToolbarIconColor.inferFromText();
+    this._inferBrightness();
     this._updateStyleSheetFromPrefs();
   },
 
@@ -83,7 +94,7 @@
     if (e.type === "load") {
       this.styleSheet.removeEventListener("load", this);
       gBrowser.tabContainer._positionPinnedTabs();
-      ToolbarIconColor.inferFromText();
+      this._inferBrightness();
       Services.obs.notifyObservers(window, "devedition-theme-state-changed", true);
     }
   },
@@ -102,7 +113,7 @@
       this.styleSheet.remove();
       this.styleSheet = null;
       gBrowser.tabContainer._positionPinnedTabs();
-      ToolbarIconColor.inferFromText();
+      this._inferBrightness();
       Services.obs.notifyObservers(window, "devedition-theme-state-changed", false);
     }
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser.js	2014-11-26 21:45:46.000000000 +0000
@@ -841,9 +841,9 @@
     browser.userTypedClear++;
   }
 
+  let shouldBeRemote = gMultiProcessBrowser &&
+                       E10SUtils.shouldBrowserBeRemote(uri);
   try {
-    let shouldBeRemote = gMultiProcessBrowser &&
-                         E10SUtils.shouldBrowserBeRemote(uri);
     if (browser.isRemoteBrowser == shouldBeRemote) {
       browser.webNavigation.loadURI(uri, flags, referrer, postdata, null);
     } else {
@@ -853,6 +853,13 @@
         referrer: referrer ? referrer.spec : null,
       });
     }
+  } catch (e) {
+    // If anything goes wrong just switch remoteness manually and load the URI.
+    // We might lose history that way but at least the browser loaded a page.
+    // This might be necessary if SessionStore wasn't initialized yet i.e.
+    // when the homepage is a non-remote page.
+    gBrowser.updateBrowserRemoteness(browser, shouldBeRemote);
+    browser.webNavigation.loadURI(uri, flags, referrer, postdata, null);
   } finally {
     if (browser.userTypedClear) {
       browser.userTypedClear--;
@@ -1135,6 +1142,28 @@
 #endif
     }, false, true);
 
+    gBrowser.addEventListener("AboutTabCrashedTryAgain", function(event) {
+      let ownerDoc = event.originalTarget;
+
+      if (!ownerDoc.documentURI.startsWith("about:tabcrashed")) {
+        return;
+      }
+
+      let isTopFrame = (ownerDoc.defaultView.parent === ownerDoc.defaultView);
+      if (!isTopFrame) {
+        return;
+      }
+
+      let browser = gBrowser.getBrowserForDocument(ownerDoc);
+#ifdef MOZ_CRASHREPORTER
+      if (event.detail.sendCrashReport) {
+        TabCrashReporter.submitCrashReport(browser);
+      }
+#endif
+      let tab = gBrowser.getTabForBrowser(browser);
+      SessionStore.reviveCrashedTab(tab);
+    }, false, true);
+
     if (uriToLoad && uriToLoad != "about:blank") {
       if (uriToLoad instanceof Ci.nsISupportsArray) {
         let count = uriToLoad.Count();
@@ -1736,7 +1765,7 @@
                      gBrowser.selectedBrowser);
     break;
   case "Save":
-    saveDocument(window.content.document);
+    saveDocument(gBrowser.selectedBrowser.contentDocumentAsCPOW);
     break;
   case "SendMail":
     MailIntegration.sendLinkForWindow(window.content);
@@ -2599,9 +2628,6 @@
         ownerDoc.documentURI.toLowerCase() == "about:newtab") {
       this.onE10sAboutNewTab(event, ownerDoc);
     }
-    else if (ownerDoc.documentURI.startsWith("about:tabcrashed")) {
-      this.onAboutTabCrashed(event, ownerDoc);
-    }
   },
 
   receiveMessage: function (msg) {
@@ -2862,29 +2888,6 @@
     }
   },
 
-  /**
-   * The about:tabcrashed can't do window.reload() because that
-   * would reload the page but not use a remote browser.
-   */
-  onAboutTabCrashed: function(event, ownerDoc) {
-    let isTopFrame = (ownerDoc.defaultView.parent === ownerDoc.defaultView);
-    if (!isTopFrame) {
-      return;
-    }
-
-    let button = event.originalTarget;
-    if (button.id == "tryAgain") {
-      let browser = gBrowser.getBrowserForDocument(ownerDoc);
-#ifdef MOZ_CRASHREPORTER
-      if (ownerDoc.getElementById("checkSendReport").checked) {
-        TabCrashReporter.submitCrashReport(browser);
-      }
-#endif
-      let tab = gBrowser.getTabForBrowser(browser);
-      SessionStore.reviveCrashedTab(tab);
-    }
-  },
-
   ignoreWarningButton: function (isMalware) {
     // Allow users to override and continue through to the site,
     // but add a notify bar as a reminder, so that they don't lose
@@ -7302,9 +7305,13 @@
 
     if (gURLBar &&
         !PrivateBrowsingUtils.permanentPrivateBrowsing) {
-      // Disable switch to tab autocompletion for private windows 
-      // (not for "Always use private browsing" mode)
-      gURLBar.setAttribute("autocompletesearchparam", "");
+      // Disable switch to tab autocompletion for private windows.
+      // We leave it enabled for permanent private browsing mode though.
+      let value = gURLBar.getAttribute("autocompletesearchparam") || "";
+      if (!value.contains("disable-private-actions")) {
+        gURLBar.setAttribute("autocompletesearchparam",
+                             value + " disable-private-actions");
+      }
     }
   }
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser-loop.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser-loop.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser-loop.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser-loop.js	2014-11-26 21:45:46.000000000 +0000
@@ -11,7 +11,6 @@
 
 
 (function() {
-
   LoopUI = {
     get toolbarButton() {
       delete this.toolbarButton;
@@ -84,8 +83,28 @@
         state = "active";
       } else if (MozLoopService.doNotDisturb) {
         state = "disabled";
+      } else if (MozLoopService.roomsParticipantsCount > 0) {
+        state = "active";
       }
       this.toolbarButton.node.setAttribute("state", state);
     },
+
+    /**
+     * Play a sound in this window IF there's no sound playing yet.
+     *
+     * @param {String} name Name of the sound, like 'ringtone' or 'room-joined'
+     */
+    playSound: function(name) {
+      if (this.ActiveSound || MozLoopService.doNotDisturb) {
+        return;
+      }
+
+      this.activeSound = new window.Audio();
+      this.activeSound.src = `chrome://browser/content/loop/shared/sounds/${name}.ogg`;
+      this.activeSound.load();
+      this.activeSound.play();
+
+      this.activeSound.addEventListener("ended", () => this.activeSound = undefined, false);
+    },
   };
 })();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser-sets.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser-sets.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser-sets.inc	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser-sets.inc	2014-11-26 21:45:46.000000000 +0000
@@ -22,7 +22,7 @@
 
     <command id="cmd_newNavigatorTab" oncommand="BrowserOpenNewTabOrWindow(event);"/>
     <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
-    <command id="Browser:SavePage" oncommand="saveDocument(window.content.document);"/>
+    <command id="Browser:SavePage" oncommand="saveDocument(gBrowser.selectedBrowser.contentDocumentAsCPOW);"/>
 
     <command id="Browser:SendLink"
              oncommand="MailIntegration.sendLinkForWindow(window.content);"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/browser.xul	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/browser.xul	2014-11-26 21:45:46.000000000 +0000
@@ -720,7 +720,6 @@
                      enablehistory="true"
                      maxrows="6"
                      newlines="stripsurroundingwhitespace"
-                     oninput="gBrowser.userTypedValue = this.value;"
                      ontextentered="this.handleCommand(param);"
                      ontextreverted="return this.handleRevert();"
                      pageproxystate="invalid"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/content.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/content.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/content.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/content.js	2014-11-26 21:45:46.000000000 +0000
@@ -87,41 +87,61 @@
   LoginManagerContent.onUsernameInput(event);
 });
 
-if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
-  let handleContentContextMenu = function (event) {
-    let defaultPrevented = event.defaultPrevented;
-    if (!Services.prefs.getBoolPref("dom.event.contextmenu.enabled")) {
-      let plugin = null;
-      try {
-        plugin = event.target.QueryInterface(Ci.nsIObjectLoadingContent);
-      } catch (e) {}
-      if (plugin && plugin.displayedType == Ci.nsIObjectLoadingContent.TYPE_PLUGIN) {
-        // Don't open a context menu for plugins.
-        return;
-      }
-
-      defaultPrevented = false;
+let handleContentContextMenu = function (event) {
+  let defaultPrevented = event.defaultPrevented;
+  if (!Services.prefs.getBoolPref("dom.event.contextmenu.enabled")) {
+    let plugin = null;
+    try {
+      plugin = event.target.QueryInterface(Ci.nsIObjectLoadingContent);
+    } catch (e) {}
+    if (plugin && plugin.displayedType == Ci.nsIObjectLoadingContent.TYPE_PLUGIN) {
+      // Don't open a context menu for plugins.
+      return;
     }
 
-    if (!defaultPrevented) {
-      let editFlags = SpellCheckHelper.isEditable(event.target, content);
-      let spellInfo;
-      if (editFlags &
-          (SpellCheckHelper.EDITABLE | SpellCheckHelper.CONTENTEDITABLE)) {
-        spellInfo =
-          InlineSpellCheckerContent.initContextMenu(event, editFlags, this);
-      }
-
-      sendSyncMessage("contextmenu", { editFlags, spellInfo }, { event });
-    }
+    defaultPrevented = false;
   }
 
-  Cc["@mozilla.org/eventlistenerservice;1"]
-    .getService(Ci.nsIEventListenerService)
-    .addSystemEventListener(global, "contextmenu", handleContentContextMenu, true);
+  if (defaultPrevented)
+    return;
+
+  let addonInfo = {};
+  let subject = {
+    event: event,
+    addonInfo: addonInfo,
+  };
+  subject.wrappedJSObject = subject;
+  Services.obs.notifyObservers(subject, "content-contextmenu", null);
+
+  if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
+    let editFlags = SpellCheckHelper.isEditable(event.target, content);
+    let spellInfo;
+    if (editFlags &
+        (SpellCheckHelper.EDITABLE | SpellCheckHelper.CONTENTEDITABLE)) {
+      spellInfo =
+        InlineSpellCheckerContent.initContextMenu(event, editFlags, this);
+    }
 
+    sendSyncMessage("contextmenu", { editFlags, spellInfo, addonInfo }, { event, popupNode: event.target });
+  }
+  else {
+    // Break out to the parent window and pass the add-on info along
+    let browser = docShell.chromeEventHandler;
+    let mainWin = browser.ownerDocument.defaultView;
+    mainWin.gContextMenuContentData = {
+      isRemote: false,
+      event: event,
+      popupNode: event.target,
+      browser: browser,
+      addonInfo: addonInfo,
+    };
+  }
 }
 
+Cc["@mozilla.org/eventlistenerservice;1"]
+  .getService(Ci.nsIEventListenerService)
+  .addSystemEventListener(global, "contextmenu", handleContentContextMenu, false);
+
 let AboutNetErrorListener = {
   init: function(chromeGlobal) {
     chromeGlobal.addEventListener('AboutNetErrorLoad', this, false, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/nsContextMenu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/nsContextMenu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/nsContextMenu.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/nsContextMenu.js	2014-11-26 21:45:46.000000000 +0000
@@ -528,17 +528,16 @@
 
   // Set various context menu attributes based on the state of the world.
   setTarget: function (aNode, aRangeParent, aRangeOffset) {
-    // If gContextMenuContentData is not null, this event was forwarded from a
-    // child process, so use that information instead.
+    // gContextMenuContentData.isRemote tells us if the event came from a remote
+    // process. gContextMenuContentData can be null if something (like tests)
+    // opens the context menu directly.
     let editFlags;
-    if (gContextMenuContentData) {
-      this.isRemote = true;
+    this.isRemote = gContextMenuContentData && gContextMenuContentData.isRemote;
+    if (this.isRemote) {
       aNode = gContextMenuContentData.event.target;
       aRangeParent = gContextMenuContentData.event.rangeParent;
       aRangeOffset = gContextMenuContentData.event.rangeOffset;
       editFlags = gContextMenuContentData.editFlags;
-    } else {
-      this.isRemote = false;
     }
 
     const xulNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@@ -628,7 +627,10 @@
         this.onCanvas = true;
       }
       else if (this.target instanceof HTMLVideoElement) {
-        this.mediaURL = this.target.currentSrc || this.target.src;
+        let mediaURL = this.target.currentSrc || this.target.src;
+        if (this.isMediaURLReusable(mediaURL)) {
+          this.mediaURL = mediaURL;
+        }
         // Firefox always creates a HTMLVideoElement when loading an ogg file
         // directly. If the media is actually audio, be smarter and provide a
         // context menu with audio operations.
@@ -641,13 +643,16 @@
       }
       else if (this.target instanceof HTMLAudioElement) {
         this.onAudio = true;
-        this.mediaURL = this.target.currentSrc || this.target.src;
+        let mediaURL = this.target.currentSrc || this.target.src;
+        if (this.isMediaURLReusable(mediaURL)) {
+          this.mediaURL = mediaURL;
+        }
       }
       else if (editFlags & (SpellCheckHelper.INPUT | SpellCheckHelper.TEXTAREA)) {
         this.onTextInput = (editFlags & SpellCheckHelper.TEXTINPUT) !== 0;
         this.onEditableArea = (editFlags & SpellCheckHelper.EDITABLE) !== 0;
         if (this.onEditableArea) {
-          if (gContextMenuContentData) {
+          if (this.isRemote) {
             InlineSpellCheckerUI.initFromRemote(gContextMenuContentData.spellInfo);
           }
           else {
@@ -772,7 +777,7 @@
         this.hasBGImage        = false;
         this.isDesignMode      = true;
         this.onEditableArea = true;
-        if (gContextMenuContentData) {
+        if (this.isRemote) {
           InlineSpellCheckerUI.initFromRemote(gContextMenuContentData.spellInfo);
         }
         else {
@@ -1505,6 +1510,10 @@
     return !this.focusedWindow.getSelection().isCollapsed;
   },
 
+  isMediaURLReusable: function(aURL) {
+    return !/^(?:blob|mediasource):/.test(aURL);
+  },
+
   toString: function () {
     return "contextMenu.target     = " + this.target + "\n" +
            "contextMenu.onImage    = " + this.onImage + "\n" +
@@ -1764,31 +1773,18 @@
   },
 
   _getTelemetryPageContextInfo: function() {
-    if (this.isContentSelected) {
-      return "selection";
-    }
-    if (this.onLink) {
-      if (this.onImage || this.onCanvas) {
-        return "image-link";
+    let rv = [];
+    for (let k of ["isContentSelected", "onLink", "onImage", "onCanvas", "onVideo", "onAudio",
+                   "onTextInput", "onSocial"]) {
+      if (this[k]) {
+        rv.push(k.replace(/^(?:is|on)(.)/, (match, firstLetter) => firstLetter.toLowerCase()));
       }
-      return "link";
     }
-    if (this.onImage) {
-      return "image"
+    if (!rv.length) {
+      rv.push('other');
     }
-    if (this.onCanvas) {
-      return "canvas";
-    }
-    if (this.onVideo || this.onAudio) {
-      return "media";
-    }
-    if (this.onTextInput) {
-      return "input";
-    }
-    if (this.onSocial) {
-      return "social";
-    }
-    return "other";
+
+    return JSON.stringify(rv);
   },
 
   _checkTelemetryForMenu: function(aXulMenu) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/socialchat.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/socialchat.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/socialchat.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/socialchat.xml	2014-11-26 21:45:46.000000000 +0000
@@ -193,6 +193,9 @@
             () => {
               this.swapDocShells(cb);
 
+              chatbar.focus();
+              this.close();
+
               // chatboxForURL is a map of URL -> chatbox used to avoid opening
               // duplicate chat windows. Ensure reattached chat windows aren't
               // registered with about:blank as their URL, otherwise reattaching
@@ -200,8 +203,6 @@
               chatbar.chatboxForURL.delete("about:blank");
               chatbar.chatboxForURL.set(this.src, Cu.getWeakReference(cb));
 
-              chatbar.focus();
-              this.close();
               deferred.resolve(cb);
             }
           );
@@ -527,7 +528,9 @@
           let cb = this.chatboxForURL.get(aURL);
           if (cb) {
             cb = cb.get();
-            if (cb.parentNode) {
+            // A chatbox is still alive to us when it's parented and still has
+            // content.
+            if (cb.parentNode && cb.contentWindow) {
               this.showChat(cb, aMode);
               if (aCallback) {
                 if (cb._callbacks == null) {
@@ -646,6 +649,7 @@
         <parameter name="aOptions"/>
         <body><![CDATA[
           let deferred = Promise.defer();
+          let chatbar = this;
           let options = "";
           for (let name in aOptions)
             options += "," + name + "=" + aOptions[name];
@@ -661,6 +665,8 @@
             let otherChatbox = otherWin.document.getElementById("chatter");
             aChatbox.swapDocShells(otherChatbox);
             aChatbox.close();
+            chatbar.chatboxForURL.set(aChatbox.src, Cu.getWeakReference(otherChatbox));
+
             deferred.resolve(otherChatbox);
           }, true);
           return deferred.promise;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/tabbrowser.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/tabbrowser.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/tabbrowser.xml	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/tabbrowser.xml	2014-11-26 21:45:47.000000000 +0000
@@ -2837,18 +2837,16 @@
 
       <method name="attachFormFill">
         <body><![CDATA[
-          for (var i = 0; i < this.mPanelContainer.childNodes.length; ++i) {
-            var cb = this.getBrowserAtIndex(i);
-            cb.attachFormFill();
+          for (let browser of this.browsers) {
+            browser.attachFormFill();
           }
         ]]></body>
       </method>
 
       <method name="detachFormFill">
         <body><![CDATA[
-          for (var i = 0; i < this.mPanelContainer.childNodes.length; ++i) {
-            var cb = this.getBrowserAtIndex(i);
-            cb.detachFormFill();
+          for (let browser of this.browsers) {
+            browser.detachFormFill();
           }
         ]]></body>
       </method>
@@ -3084,10 +3082,13 @@
               let spellInfo = aMessage.data.spellInfo;
               if (spellInfo)
                 spellInfo.target = aMessage.target.messageManager;
-              gContextMenuContentData = { event: aMessage.objects.event,
+              gContextMenuContentData = { isRemote: true,
+                                          event: aMessage.objects.event,
+                                          popupNode: aMessage.objects.popupNode,
                                           browser: browser,
                                           editFlags: aMessage.data.editFlags,
-                                          spellInfo: spellInfo };
+                                          spellInfo: spellInfo,
+                                          addonInfo: aMessage.data.addonInfo };
               let popup = browser.ownerDocument.getElementById("contentAreaContextMenu");
               let event = gContextMenuContentData.event;
               let pos = browser.mapScreenCoordinatesFromContent(event.screenX, event.screenY);
@@ -3464,7 +3465,7 @@
             return;
 
           var tab = this._getTabForContentWindow(contentWin);
-          if (tab.hasAttribute("pending"))
+          if (!tab || tab.hasAttribute("pending"))
             return;
 
           var titleChanged = this.setTabTitle(tab);
@@ -5368,7 +5369,10 @@
           }, () => {
             // If the promise rejected, that means we don't want to actually
             // flip the deck, so we cancel the tab switch.
-            gBrowser._cancelTabSwitch(toTab);
+            // 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-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_action_searchengine.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_action_searchengine.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_action_searchengine.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_action_searchengine.js	2014-11-26 21:45:47.000000000 +0000
@@ -43,11 +43,14 @@
 
   let result = yield promise_first_result("open a search");
   isnot(result, null, "Should have a result");
+  is(result.getAttribute("url"),
+     `moz-action:searchengine,{"engineName":"MozSearch","input":"open a search","searchQuery":"open a search"}`,
+     "Result should be a moz-action: for the correct search engine");
   is(result.hasAttribute("image"), false, "Result shouldn't have an image attribute");
 
   let tabPromise = promiseTabLoaded(gBrowser.selectedTab);
   EventUtils.synthesizeMouseAtCenter(result, {});
   yield tabPromise;
 
-  is(gBrowser.selectedBrowser.currentURI.spec, "http://example.com/?q=open+a+search");
+  is(gBrowser.selectedBrowser.currentURI.spec, "http://example.com/?q=open+a+search", "Correct URL should be loaded");
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_alltabslistener.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_alltabslistener.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_alltabslistener.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_alltabslistener.js	2014-11-26 21:45:47.000000000 +0000
@@ -94,7 +94,11 @@
 
   // We must wait until the about:blank page has completed loading before
   // starting tests or we get notifications from that
-  gForegroundBrowser.addEventListener("load", startTests, true);
+  let promises = [
+    waitForDocLoadComplete(gBackgroundBrowser),
+    waitForDocLoadComplete(gForegroundBrowser)
+  ];
+  Promise.all(promises).then(startTest1);
 }
 
 function runTest(browser, url, next) {
@@ -105,11 +109,6 @@
   browser.loadURI(url);
 }
 
-function startTests() {
-  gForegroundBrowser.removeEventListener("load", startTests, true);
-  executeSoon(startTest1);
-}
-
 function startTest1() {
   info("\nTest 1");
   gBrowser.addProgressListener(gFrontProgressListener);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_autocomplete_autoselect.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_autocomplete_autoselect.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_autocomplete_autoselect.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_autocomplete_autoselect.js	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,59 @@
+function repeat(limit, func) {
+  for (let i = 0; i < limit; i++) {
+    func(i);
+  }
+}
+
+function* promiseAutoComplete(inputText) {
+  gURLBar.focus();
+  gURLBar.value = inputText.slice(0, -1);
+  EventUtils.synthesizeKey(inputText.slice(-1), {});
+  yield promiseSearchComplete();
+}
+
+function is_selected(index) {
+  is(gURLBar.popup.richlistbox.selectedIndex, index, `Item ${index + 1} should be selected`);
+}
+
+add_task(function*() {
+  registerCleanupFunction(promiseClearHistory);
+
+  let visits = [];
+  repeat(10, i => {
+    visits.push({
+      uri: makeURI("http://example.com/autocomplete/?" + i),
+    });
+  });
+  yield PlacesTestUtils.addVisits(visits);
+
+  yield promiseAutoComplete("example.com/autocomplete");
+
+  let popup = gURLBar.popup;
+  let results = popup.richlistbox.children;
+  // 1 extra for the current search engine match
+  is(results.length, 11, "Should get 11 results");
+  is_selected(0);
+
+  info("Key Down to select the next item");
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is_selected(1);
+
+  info("Key Down 11 times should wrap around all the way around");
+  repeat(11, () => EventUtils.synthesizeKey("VK_DOWN", {}));
+  is_selected(1);
+
+  info("Key Up 11 times should wrap around the other way");
+  repeat(11, () => EventUtils.synthesizeKey("VK_UP", {}));
+  is_selected(1);
+
+  info("Page Up will go up the list, but not wrap");
+  EventUtils.synthesizeKey("VK_PAGE_UP", {})
+  is_selected(0);
+
+  info("Page Up again will wrap around to the end of the list");
+  EventUtils.synthesizeKey("VK_PAGE_UP", {})
+  is_selected(10);
+
+  EventUtils.synthesizeKey("VK_ESCAPE", {});
+  yield promisePopupHidden(gURLBar.popup);
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_autocomplete_no_title.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_autocomplete_no_title.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_autocomplete_no_title.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_autocomplete_no_title.js	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,27 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function* check_title(inputText, expectedTitle) {
+  gURLBar.focus();
+  gURLBar.value = inputText.slice(0, -1);
+  EventUtils.synthesizeKey(inputText.slice(-1) , {});
+  yield promiseSearchComplete();
+
+  ok(gURLBar.popup.richlistbox.children.length > 1, "Should get at least 2 results");
+  let result = gURLBar.popup.richlistbox.children[1];
+  is(result._title.textContent, expectedTitle, "Result title should be as expected");
+}
+
+add_task(function*() {
+  // This test is only relevant if UnifiedComplete is enabled.
+  if (!Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete"))
+    return;
+
+  let uri = NetUtil.newURI("http://bug1060642.example.com/beards/are/pretty/great");
+  yield PlacesTestUtils.addVisits([{uri: uri, title: ""}]);
+
+  yield check_title("bug1060642", "bug1060642.example.com");
+
+  gURLBar.popup.hidePopup();
+  yield promisePopupHidden(gURLBar.popup);
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug1003461-switchtab-override.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug1003461-switchtab-override.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug1003461-switchtab-override.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug1003461-switchtab-override.js	2014-11-26 21:45:47.000000000 +0000
@@ -35,7 +35,7 @@
     onSearchComplete.apply(gURLBar);
     deferred.resolve();
   }
-  
+
   gURLBar.focus();
   gURLBar.value = "dummy_pag";
   EventUtils.synthesizeKey("e" , {});
@@ -43,7 +43,6 @@
 
   info("Select second autocomplete popup entry");
   EventUtils.synthesizeKey("VK_DOWN" , {});
-  EventUtils.synthesizeKey("VK_DOWN" , {});
   ok(/moz-action:switchtab/.test(gURLBar.value), "switch to tab entry found");
 
   info("Override switch-to-tab");
@@ -61,6 +60,7 @@
 
   EventUtils.synthesizeKey("VK_SHIFT" , { type: "keydown" });
   EventUtils.synthesizeKey("VK_RETURN" , { });
+  info(`gURLBar.value = ${gURLBar.value}`);
   EventUtils.synthesizeKey("VK_SHIFT" , { type: "keyup" });
   yield deferred.promise;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js	2014-11-26 21:45:47.000000000 +0000
@@ -21,26 +21,13 @@
     return promiseClearHistory();
   });
 
-  info("Wait for autocomplete")
-  let searchDeferred = Promise.defer();
-  let onSearchComplete = gURLBar.onSearchComplete;
-  registerCleanupFunction(() => {
-    gURLBar.onSearchComplete = onSearchComplete;
-  });
-  gURLBar.onSearchComplete = function () {
-    ok(gURLBar.popupOpen, "The autocomplete popup is correctly open");
-    onSearchComplete.apply(gURLBar);
-    searchDeferred.resolve();
-  }
-
   gURLBar.focus();
   gURLBar.value = "dummy_pag";
   EventUtils.synthesizeKey("e" , {});
-  yield searchDeferred.promise;
+  yield promiseSearchComplete();
 
   info("Select second autocomplete popup entry");
   EventUtils.synthesizeKey("VK_DOWN" , {});
-  EventUtils.synthesizeKey("VK_DOWN" , {});
   ok(/moz-action:switchtab/.test(gURLBar.value), "switch to tab entry found");
 
   info("Shift+left on switch-to-tab entry");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug1070778.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug1070778.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug1070778.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug1070778.js	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,62 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function* promiseAutoComplete(inputText) {
+  gURLBar.focus();
+  gURLBar.value = inputText.slice(0, -1);
+  EventUtils.synthesizeKey(inputText.slice(-1) , {});
+  yield promiseSearchComplete();
+}
+
+function is_selected(index) {
+  is(gURLBar.popup.richlistbox.selectedIndex, index, `Item ${index + 1} should be selected`);
+}
+
+add_task(function*() {
+  // This test is only relevant if UnifiedComplete is enabled.
+  if (!Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete"))
+    return;
+
+  registerCleanupFunction(() => {
+    PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
+  });
+
+  let itemId =
+    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                         NetUtil.newURI("http://example.com/?q=%s"),
+                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                         "test");
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
+
+  // This item only needed so we can select the keyword item, select something
+  // else, then select the keyword item again.
+  itemId =
+    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                         NetUtil.newURI("http://example.com/keyword"),
+                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                         "keyword abc");
+
+  yield promiseAutoComplete("keyword a");
+
+  // First item should already be selected
+  is_selected(0);
+  // Select next one (important!)
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is_selected(1);
+  // Re-select keyword item
+  EventUtils.synthesizeKey("VK_UP", {});
+  is_selected(0);
+
+  EventUtils.synthesizeKey("b", {});
+  yield promiseSearchComplete();
+
+  is(gURLBar.value, "keyword ab", "urlbar should have expected input");
+
+  let result = gURLBar.popup.richlistbox.firstChild;
+  isnot(result, null, "Should have first item");
+  let uri = NetUtil.newURI(result.getAttribute("url"));
+  is(uri.spec, makeActionURI("keyword", {url: "http://example.com/?q=ab", input: "keyword ab"}).spec, "Expect correct url");
+
+  EventUtils.synthesizeKey("VK_ESCAPE", {});
+  yield promisePopupHidden(gURLBar.popup);
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug304198.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug304198.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug304198.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug304198.js	2014-11-26 21:45:47.000000000 +0000
@@ -21,16 +21,15 @@
 
   function cycleTabs() {
     gBrowser.selectedTab = fullURLTab;
-    is(gURLBar.value, testURL, 'gURLBar.value should be testURL after switching back to fullURLTab');
+    is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after switching back to fullURLTab');
 
     gBrowser.selectedTab = partialURLTab;
-    is(gURLBar.value, testPartialURL, 'gURLBar.value should be testPartialURL after switching back to partialURLTab');
-
+    is(gURLBar.textValue, testPartialURL, 'gURLBar.textValue should be testPartialURL after switching back to partialURLTab');
     gBrowser.selectedTab = deletedURLTab;
-    is(gURLBar.value, '', 'gURLBar.value should be "" after switching back to deletedURLTab');
+    is(gURLBar.textValue, '', 'gURLBar.textValue should be "" after switching back to deletedURLTab');
 
     gBrowser.selectedTab = fullURLTab;
-    is(gURLBar.value, testURL, 'gURLBar.value should be testURL after switching back to fullURLTab');
+    is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after switching back to fullURLTab');
   }
 
   // function borrowed from browser_bug386835.js
@@ -59,13 +58,13 @@
 
   function prepareDeletedURLTab(cb) {
     gBrowser.selectedTab = deletedURLTab;
-    is(gURLBar.value, testURL, 'gURLBar.value should be testURL after initial switch to deletedURLTab');
+    is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after initial switch to deletedURLTab');
 
     // simulate the user removing the whole url from the location bar
     gPrefService.setBoolPref("browser.urlbar.clickSelectsAll", true);
 
     urlbarBackspace(function () {
-      is(gURLBar.value, "", 'gURLBar.value should be "" (just set)');
+      is(gURLBar.textValue, "", 'gURLBar.textValue should be "" (just set)');
       if (gPrefService.prefHasUserValue("browser.urlbar.clickSelectsAll"))
         gPrefService.clearUserPref("browser.urlbar.clickSelectsAll");
       cb();
@@ -74,13 +73,13 @@
 
   function prepareFullURLTab(cb) {
     gBrowser.selectedTab = fullURLTab;
-    is(gURLBar.value, testURL, 'gURLBar.value should be testURL after initial switch to fullURLTab');
+    is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after initial switch to fullURLTab');
     cb();
   }
 
   function preparePartialURLTab(cb) {
     gBrowser.selectedTab = partialURLTab;
-    is(gURLBar.value, testURL, 'gURLBar.value should be testURL after initial switch to partialURLTab');
+    is(gURLBar.textValue, testURL, 'gURLBar.textValue should be testURL after initial switch to partialURLTab');
 
     // simulate the user removing part of the url from the location bar
     gPrefService.setBoolPref("browser.urlbar.clickSelectsAll", false);
@@ -91,7 +90,7 @@
       if (deleted < charsToDelete) {
         urlbarBackspace(arguments.callee);
       } else {
-        is(gURLBar.value, testPartialURL, "gURLBar.value should be testPartialURL (just set)");
+        is(gURLBar.textValue, testPartialURL, "gURLBar.textValue should be testPartialURL (just set)");
         if (gPrefService.prefHasUserValue("browser.urlbar.clickSelectsAll"))
           gPrefService.clearUserPref("browser.urlbar.clickSelectsAll");
         cb();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug481560.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug481560.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug481560.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug481560.js	2014-11-26 21:45:47.000000000 +0000
@@ -1,14 +1,8 @@
 function test() {
   waitForExplicitFinish();
 
-  var win = openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no");
-
-  win.addEventListener("load", function () {
-    win.removeEventListener("load", arguments.callee, false);
-
-    win.content.addEventListener("focus", function () {
-      win.content.removeEventListener("focus", arguments.callee, false);
-
+  whenNewWindowLoaded(null, function (win) {
+    waitForFocus(function () {
       function onTabClose() {
         ok(false, "shouldn't have gotten the TabClose event for the last tab");
       }
@@ -22,6 +16,6 @@
       tab.removeEventListener("TabClose", onTabClose, false);
 
       finish();
-    }, false);
-  }, false);
+    }, win);
+  });
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug556061.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug556061.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug556061.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug556061.js	2014-11-26 21:45:47.000000000 +0000
@@ -31,7 +31,8 @@
     setup: function() {
       gURLBar.value = testActionURL;
       gURLBar.valueIsTyped = true;
-      is(gURLBar.value, testActionURL, "gURLBar.value starts with correct value");
+      is(gURLBar.value, testActionURL, "gURLBar starts with the correct real value");
+      is(gURLBar.textValue, testURL, "gURLBar starts with the correct display value");
 
       // Focus the urlbar so we can select it all & copy
       gURLBar.focus();
@@ -73,7 +74,8 @@
       gURLBar.value = testActionURL;
       gURLBar.valueIsTyped = true;
       // Sanity check that we have the right value
-      is(gURLBar.value, testActionURL, "gURLBar.value starts with correct value");
+      is(gURLBar.value, testActionURL, "gURLBar starts with the correct real value");
+      is(gURLBar.textValue, testURL, "gURLBar starts with the correct display value");
 
       // Now just select part of the value & cut that.
       gURLBar.selectionStart = testURL.length - 10;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug633691.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug633691.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug633691.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug633691.js	2014-11-26 21:45:47.000000000 +0000
@@ -6,12 +6,15 @@
   waitForExplicitFinish();
   gBrowser.selectedTab = gBrowser.addTab();
   // Open a html page with about:certerror in an iframe
-  window.content.addEventListener("load", testIframeCert, true);
+  gBrowser.selectedBrowser.addEventListener("load", testIframeCert, true);
   content.location = "data:text/html,<iframe width='700' height='700' src='about:certerror'></iframe>";
 }
 
-function testIframeCert() {
-  window.content.removeEventListener("load", testIframeCert, true);
+function testIframeCert(e) {
+  if (e.target.location.href == "about:blank") {
+    return;
+  }
+  gBrowser.selectedBrowser.removeEventListener("load", testIframeCert, true);
   // Confirm that the expert section is hidden
   var doc = gBrowser.contentDocument.getElementsByTagName('iframe')[0].contentDocument;
   var eC = doc.getElementById("expertContent");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug816527.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug816527.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug816527.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug816527.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-function test() {
-  waitForExplicitFinish();
-
-  let testURL = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
-
-  function testOnWindow(aOptions, aCallback) {
-    whenNewWindowLoaded(aOptions, function(aWin) {
-      // 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));
-    });
-  };
-
-  testOnWindow({}, function(aNormalWindow) {
-    testOnWindow({private: true}, function(aPrivateWindow) {
-      runTest(aNormalWindow, aPrivateWindow, false, function() {
-        aNormalWindow.close();
-        aPrivateWindow.close();
-        testOnWindow({}, function(aNormalWindow) {
-          testOnWindow({private: true}, function(aPrivateWindow) {
-            runTest(aPrivateWindow, aNormalWindow, false, function() {
-              aNormalWindow.close();
-              aPrivateWindow.close();
-              testOnWindow({private: true}, function(aPrivateWindow) {
-                runTest(aPrivateWindow, aPrivateWindow, false, function() {
-                  aPrivateWindow.close();
-                  testOnWindow({}, function(aNormalWindow) {
-                    runTest(aNormalWindow, aNormalWindow, true, function() {
-                      aNormalWindow.close();
-                      finish();
-                    });
-                  });
-                });
-              });
-            });
-          });
-        });
-      });
-    });
-  });
-
-  function runTest(aSourceWindow, aDestWindow, aExpectSuccess, aCallback) {
-    // Open the base tab
-    let baseTab = aSourceWindow.gBrowser.addTab(testURL);
-    baseTab.linkedBrowser.addEventListener("load", function() {
-      // Wait for the tab to be fully loaded so matching happens correctly
-      if (baseTab.linkedBrowser.currentURI.spec == "about:blank")
-        return;
-      baseTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-
-      let testTab = aDestWindow.gBrowser.addTab();
-
-      waitForFocus(function() {
-        // Select the testTab
-        aDestWindow.gBrowser.selectedTab = testTab;
-
-        // Ensure that this tab has no history entries
-        ok(testTab.linkedBrowser.sessionHistory.count < 2,
-           "The test tab has 1 or less history entries");
-        // Ensure that this tab is on about:blank
-        is(testTab.linkedBrowser.currentURI.spec, "about:blank",
-           "The test tab is on about:blank");
-        // Ensure that this tab's document has no child nodes
-        ok(!testTab.linkedBrowser.contentDocument.body.hasChildNodes(),
-           "The test tab has no child nodes");
-        ok(!testTab.hasAttribute("busy"),
-           "The test tab doesn't have the busy attribute");
-
-        // Set the urlbar to include the moz-action
-        aDestWindow.gURLBar.value = "moz-action:switchtab," + JSON.stringify({url: testURL});
-        // Focus the urlbar so we can press enter
-        aDestWindow.gURLBar.focus();
-
-        // We want to see if the switchtab action works.  If it does, the
-        // current tab will get closed, and that's what we detect with the
-        // TabClose handler.  If pressing enter triggers a load in that tab,
-        // then the load handler will get called.  Neither of these are
-        // the desired effect here.  So if the test goes successfully, it is
-        // the timeout handler which gets called.
-        //
-        // The reason that we can't avoid the timeout here is because we are
-        // trying to test something which should not happen, so we just need
-        // to wait for a while and then check whether any bad things have
-        // happened.
-
-        function onTabClose(aEvent) {
-          aDestWindow.gBrowser.tabContainer.removeEventListener("TabClose", onTabClose, false);
-          aDestWindow.gBrowser.removeEventListener("load", onLoad, false);
-          clearTimeout(timeout);
-          // Should only happen when we expect success
-          ok(aExpectSuccess, "Tab closed as expected");
-          aCallback();
-        }
-        function onLoad(aEvent) {
-          aDestWindow.gBrowser.tabContainer.removeEventListener("TabClose", onTabClose, false);
-          aDestWindow.gBrowser.removeEventListener("load", onLoad, false);
-          clearTimeout(timeout);
-          // Should only happen when we expect success
-          ok(aExpectSuccess, "Tab loaded as expected");
-          aCallback();
-        }
-
-        aDestWindow.gBrowser.tabContainer.addEventListener("TabClose", onTabClose, false);
-        aDestWindow.gBrowser.addEventListener("load", onLoad, false);
-        let timeout = setTimeout(function() {
-          aDestWindow.gBrowser.tabContainer.removeEventListener("TabClose", onTabClose, false);
-          aDestWindow.gBrowser.removeEventListener("load", onLoad, false);
-          aCallback();
-        }, 500);
-
-        // Press enter!
-        EventUtils.synthesizeKey("VK_RETURN", {});
-      }, aDestWindow);
-    }, true);
-  }
-}
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug906190.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug906190.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_bug906190.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_bug906190.js	2014-11-26 21:45:47.000000000 +0000
@@ -98,7 +98,7 @@
 let clickHandler = function (aEvent, aFunc) {
   gTestWin.gBrowser.removeEventListener("click", curClickHandler, true);
   gTestWin.contentAreaClick(aEvent, true);
-  gTestWin.gBrowser.addEventListener("load", aFunc, true);
+  waitForSomeTabToLoad(aFunc);
   aEvent.preventDefault();
   aEvent.stopPropagation();
 }
@@ -108,7 +108,7 @@
 // from the contextmenu which dispatches to the function openLinkInTab.
 let contextMenuOpenHandler = function(aEvent, aFunc) {
   gTestWin.document.removeEventListener("popupshown", curContextMenu, false);
-  gTestWin.gBrowser.addEventListener("load", aFunc, true);
+  waitForSomeTabToLoad(aFunc);
   var openLinkInTabCommand = gTestWin.document.getElementById("context-openlinkintab");
   openLinkInTabCommand.doCommand();
   aEvent.target.hidePopup();
@@ -124,12 +124,24 @@
   let target = gTestWin.content.document.getElementById(aIDForNextTest);
   gTestWin.gBrowser.addTab(target);
   gTestWin.gBrowser.selectTabAtIndex(1);
-  gTestWin.gBrowser.addEventListener("load", checkPopUpNotification, true);
+  waitForSomeTabToLoad(checkPopUpNotification);
+}
+
+// Waits for a load event somewhere in the browser but ignore events coming
+// from <xul:browser>s without a tab assigned. That are most likely browsers
+// that preload the new tab page.
+function waitForSomeTabToLoad(callback) {
+  gTestWin.gBrowser.addEventListener("load", function onLoad(event) {
+    let tab = gTestWin.gBrowser._getTabForContentWindow(event.target.defaultView.top);
+    if (tab) {
+      gTestWin.gBrowser.removeEventListener("load", onLoad, true);
+      callback();
+    }
+  }, true);
 }
 
 function checkPopUpNotification() {
-  gTestWin.gBrowser.removeEventListener("load", checkPopUpNotification, true);
-  gTestWin.gBrowser.addEventListener("load", reloadedTabAfterDisablingMCB, true);
+  waitForSomeTabToLoad(reloadedTabAfterDisablingMCB);
 
   var notification = PopupNotifications.getNotification("bad-content", gTestWin.gBrowser.selectedBrowser);
   ok(notification, "OK: Mixed Content Doorhanger did appear in " + curTestName + "!");
@@ -142,8 +154,6 @@
 }
 
 function reloadedTabAfterDisablingMCB() {
-  gTestWin.gBrowser.removeEventListener("load", reloadedTabAfterDisablingMCB, true);
-
   var expected = "Mixed Content Blocker disabled";
   waitForCondition(
     function() gTestWin.content.document.getElementById('mctestdiv').innerHTML == expected,
@@ -177,7 +187,6 @@
 }
 
 function test1A() {
-  gTestWin.gBrowser.removeEventListener("load", test1A, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear but isMixedContentBlocked should be >> NOT << true,
@@ -206,7 +215,6 @@
 }
 
 function test1C() {
-  gTestWin.gBrowser.removeEventListener("load", test1C, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear but isMixedContentBlocked should be >> NOT << true,
@@ -241,7 +249,6 @@
 }
 
 function test2A() {
-  gTestWin.gBrowser.removeEventListener("load", test2A, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear and isMixedContentBlocked should be >> TRUE <<,
@@ -270,7 +277,6 @@
 }
 
 function test2C() {
-  gTestWin.gBrowser.removeEventListener("load", test2C, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear and isMixedContentBlocked should be >> TRUE <<,
@@ -306,12 +312,10 @@
 
 function test3A() {
   // we need this indirection because the page is reloaded caused by meta-refresh
-  gTestWin.gBrowser.removeEventListener("load", test3A, true);
-  gTestWin.gBrowser.addEventListener("load", test3B, true);
+  waitForSomeTabToLoad(test3B);
 }
 
 function test3B() {
-  gTestWin.gBrowser.removeEventListener("load", test3B, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear but isMixedContentBlocked should be >> NOT << true!
@@ -340,12 +344,10 @@
 
 function test3D() {
   // we need this indirection because the page is reloaded caused by meta-refresh
-  gTestWin.gBrowser.removeEventListener("load", test3D, true);
-  gTestWin.gBrowser.addEventListener("load", test3E, true);
+  waitForSomeTabToLoad(test3E);
 }
 
 function test3E() {
-  gTestWin.gBrowser.removeEventListener("load", test3E, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear but isMixedContentBlocked should be >> NOT << true!
@@ -380,12 +382,10 @@
 
 function test4A() {
   // we need this indirection because the page is reloaded caused by meta-refresh
-  gTestWin.gBrowser.removeEventListener("load", test4A, true);
-  gTestWin.gBrowser.addEventListener("load", test4B, true);
+  waitForSomeTabToLoad(test4B);
 }
 
 function test4B() {
-  gTestWin.gBrowser.removeEventListener("load", test4B, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear and isMixedContentBlocked should be >> TRUE <<
@@ -414,12 +414,10 @@
 
 function test4D() {
   // we need this indirection because the page is reloaded caused by meta-refresh
-  gTestWin.gBrowser.removeEventListener("load", test4D, true);
-  gTestWin.gBrowser.addEventListener("load", test4E, true);
+  waitForSomeTabToLoad(test4E);
 }
 
 function test4E() {
-  gTestWin.gBrowser.removeEventListener("load", test4E, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear and isMixedContentBlocked should be >> TRUE <<
@@ -454,7 +452,6 @@
 }
 
 function test5A() {
-  gTestWin.gBrowser.removeEventListener("load", test5A, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear but isMixedContentBlocked should be >> NOT << true
@@ -483,7 +480,6 @@
 }
 
 function test5C() {
-  gTestWin.gBrowser.removeEventListener("load", test5C, true);
   // move the tab again
   gTestWin.gBrowser.selectTabAtIndex(2);
 
@@ -520,7 +516,6 @@
 }
 
 function test6A() {
-  gTestWin.gBrowser.removeEventListener("load", test6A, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear and isMixedContentBlocked should be >> TRUE <<
@@ -548,7 +543,6 @@
 }
 
 function test6C() {
-  gTestWin.gBrowser.removeEventListener("load", test6C, true);
   gTestWin.gBrowser.selectTabAtIndex(2);
 
   // The Doorhanger should appear and isMixedContentBlocked should be >> TRUE <<
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_canonizeURL.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_canonizeURL.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_canonizeURL.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_canonizeURL.js	2014-11-26 21:45:47.000000000 +0000
@@ -45,10 +45,12 @@
 
   gURLBar.addEventListener("focus", function onFocus() {
     gURLBar.removeEventListener("focus", onFocus);
+    gURLBar.inputField.value = inputValue.slice(0, -1);
+    EventUtils.synthesizeKey(inputValue.slice(-1) , {});
     EventUtils.synthesizeKey("VK_RETURN", { shiftKey: true });
   });
 
   gBrowser.selectedBrowser.focus();
-  gURLBar.inputField.value = inputValue;
   gURLBar.focus();
+
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_devedition.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_devedition.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_devedition.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_devedition.js	2014-11-26 21:45:47.000000000 +0000
@@ -16,12 +16,7 @@
   Services.prefs.clearUserPref(PREF_DEVTOOLS_THEME);
 });
 
-function test() {
-  waitForExplicitFinish();
-  startTests();
-}
-
-function startTests() {
+add_task(function* startTests() {
   Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "dark");
 
   info ("Setting browser.devedition.theme.enabled to false.");
@@ -37,40 +32,54 @@
   ok (!DevEdition.styleSheet, "The devedition stylesheet has been removed when a lightweight theme is applied.");
 
   info ("Removing a lightweight theme.");
+  let onAttributeAdded = waitForBrightTitlebarAttribute();
   Services.prefs.setBoolPref(PREF_LWTHEME, false);
   ok (DevEdition.styleSheet, "The devedition stylesheet has been added when a lightweight theme is removed.");
+  yield onAttributeAdded;
+
+  is (document.documentElement.getAttribute("brighttitlebarforeground"), "true",
+     "The brighttitlebarforeground attribute is set on the window.");
 
   info ("Setting browser.devedition.theme.enabled to false.");
   Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, false);
   ok (!DevEdition.styleSheet, "The devedition stylesheet has been removed.");
 
-  testDevtoolsTheme();
-  testLightweightThemePreview();
-  finish();
-}
+  ok (!document.documentElement.hasAttribute("brighttitlebarforeground"),
+     "The brighttitlebarforeground attribute is not set on the window after devedition.theme is false.");
+});
 
-function testDevtoolsTheme() {
+add_task(function* testDevtoolsTheme() {
   info ("Checking that Australis is shown when the light devtools theme is applied.");
 
+  let onAttributeAdded = waitForBrightTitlebarAttribute();
   Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
   ok (DevEdition.styleSheet, "The devedition stylesheet exists.");
+  yield onAttributeAdded;
+  ok (document.documentElement.hasAttribute("brighttitlebarforeground"),
+     "The brighttitlebarforeground attribute is set on the window with dark devtools theme.");
 
   info ("Checking stylesheet and :root attributes based on devtools theme.");
   Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "light");
   is (document.documentElement.getAttribute("devtoolstheme"), "light",
     "The documentElement has an attribute based on devtools theme.");
   ok (DevEdition.styleSheet, "The devedition stylesheet is still there with the light devtools theme.");
+  ok (!document.documentElement.hasAttribute("brighttitlebarforeground"),
+     "The brighttitlebarforeground attribute is not set on the window with light devtools theme.");
 
   Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "dark");
   is (document.documentElement.getAttribute("devtoolstheme"), "dark",
     "The documentElement has an attribute based on devtools theme.");
   ok (DevEdition.styleSheet, "The devedition stylesheet is still there with the dark devtools theme.");
+  is (document.documentElement.getAttribute("brighttitlebarforeground"), "true",
+     "The brighttitlebarforeground attribute is set on the window with dark devtools theme.");
 
   Services.prefs.setCharPref(PREF_DEVTOOLS_THEME, "foobar");
   is (document.documentElement.getAttribute("devtoolstheme"), "light",
     "The documentElement has 'light' as a default for the devtoolstheme attribute");
   ok (DevEdition.styleSheet, "The devedition stylesheet is still there with the foobar devtools theme.");
-}
+  ok (!document.documentElement.hasAttribute("brighttitlebarforeground"),
+     "The brighttitlebarforeground attribute is not set on the window with light devtools theme.");
+});
 
 function dummyLightweightTheme(id) {
   return {
@@ -83,7 +92,7 @@
   };
 }
 
-function testLightweightThemePreview() {
+add_task(function* testLightweightThemePreview() {
   let {LightweightThemeManager} = Components.utils.import("resource://gre/modules/LightweightThemeManager.jsm", {});
 
   info ("Turning the pref on, then previewing lightweight themes");
@@ -114,4 +123,21 @@
   ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after the default theme is applied.");
   LightweightThemeManager.resetPreview();
   ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after resetting the preview.");
+});
+
+// Use a mutation observer to wait for the brighttitlebarforeground
+// attribute to change.  Using this instead of waiting for the load
+// event on the DevEdition styleSheet.
+function waitForBrightTitlebarAttribute() {
+  return new Promise((resolve, reject) => {
+    let mutationObserver = new MutationObserver(function (mutations) {
+      for (let mutation of mutations) {
+        if (mutation.attributeName == "brighttitlebarforeground") {
+          mutationObserver.disconnect();
+          resolve();
+        }
+      }
+    });
+    mutationObserver.observe(document.documentElement, { attributes: true });
+  });
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser.ini	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser.ini	2014-11-26 21:45:47.000000000 +0000
@@ -120,11 +120,14 @@
 [browser_search_favicon.js]
 skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
 [browser_alltabslistener.js]
-skip-if = os == "linux" || e10s # Linux: Intermittent failures, bug 951680; e10s: Bug 1093594 - notifications for tabs come in in the wrong order / unexpectedly
 [browser_autocomplete_a11y_label.js]
-skip-if = e10s # Bug ????? - no e10s switch-to-tab support yet
+skip-if = e10s # Bug 1101993 - times out for unknown reasons when run in the dir (works on its own)
+[browser_autocomplete_no_title.js]
+skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
+[browser_autocomplete_autoselect.js]
+skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
 [browser_backButtonFitts.js]
-skip-if = os != "win" || e10s # The Fitts Law back button is only supported on Windows (bug 571454) / e10s - Bug ?????? test touches content (attempts to add an event listener directly to the contentWindow)
+skip-if = os != "win" || e10s # The Fitts Law back button is only supported on Windows (bug 571454) / e10s - Bug 1099154: test touches content (attempts to add an event listener directly to the contentWindow)
 [browser_blob-channelname.js]
 [browser_bookmark_titles.js]
 skip-if = buildapp == 'mulet' || toolkit == "windows" || e10s # Disabled on Windows due to frequent failures (bugs 825739, 841341) / e10s - Bug 1094205 - places doesn't return the right thing in e10s mode, for some reason
@@ -159,13 +162,12 @@
 [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 ?????? - "content window is focused - Got [object ChromeWindow], expected [object XrayWrapper [object Window]]"
+skip-if = e10s # Bug 1102015 - "content window is focused - Got [object ChromeWindow], expected [object CPOW [object Window]]"
 [browser_bug431826.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (eg, var expertDiv = gBrowser.contentDocument.getElementById("expertContent");)
 [browser_bug432599.js]
 [browser_bug435035.js]
 [browser_bug435325.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content
+skip-if = buildapp == 'mulet' || e10s # Bug 1099156 - test directly manipulates content
 [browser_bug441778.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1056146 - zoom tests use FullZoomHelper and break in e10s
 [browser_bug455852.js]
@@ -173,7 +175,7 @@
 [browser_bug460146.js]
 skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_bug462289.js]
-skip-if = toolkit == "cocoa" || e10s # Bug ?????? - not sure why this is timing out and crashing!!
+skip-if = toolkit == "cocoa" || e10s # Bug 1102017 - middle-button mousedown on selected tab2 does not activate tab - Didn't expect [object XULElement], but got it
 [browser_bug462673.js]
 skip-if = e10s # Bug 1093404 - test expects sync window opening from content and is disappointed in that expectation
 [browser_bug477014.js]
@@ -181,7 +183,6 @@
 [browser_bug479408.js]
 skip-if = buildapp == 'mulet'
 [browser_bug481560.js]
-skip-if = e10s # Bug ????? - This bug attached an event listener directly to the content
 [browser_bug484315.js]
 skip-if = e10s
 [browser_bug491431.js]
@@ -191,14 +192,13 @@
 [browser_bug517902.js]
 skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_bug519216.js]
-skip-if = e10s # Bug ?????? - some weird timing issue with progress listeners that fails intermittently
 [browser_bug520538.js]
 [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)
 [browser_bug537474.js]
-skip-if = e10s # Bug ?????? - test doesn't wait for document to be created before it checks it
+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]
 [browser_bug553455.js]
 skip-if = true # Bug 1094312
@@ -227,7 +227,6 @@
 skip-if = e10s # Bug 1056146 - zoom tests use FullZoomHelper and break in e10s
 [browser_bug577121.js]
 [browser_bug578534.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug579872.js]
 [browser_bug580638.js]
 [browser_bug580956.js]
@@ -250,11 +249,9 @@
 [browser_bug597218.js]
 [browser_bug609700.js]
 [browser_bug623155.js]
-skip-if = e10s # Bug ?????? - URLBar issues (apparently issues with redirection)
 [browser_bug623893.js]
 [browser_bug624734.js]
 [browser_bug633691.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (eg, var expertDiv = gBrowser.contentDocument.getElementById("expertContent");)
 [browser_bug647886.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093373 - Relies on browser.sessionHistory
 [browser_bug655584.js]
@@ -263,9 +260,9 @@
 [browser_bug676619.js]
 skip-if = buildapp == 'mulet' || os == "mac" # mac: Intermittent failures, bug 925225
 [browser_bug678392.js]
-skip-if = e10s # Bug ?????? - Obscure non-windows failures ("Snapshot array has correct length of 1 after loading one page. - Got 0, expected 1" and more)
+skip-if = e10s # bug 1102331 - does focus things on the content window which break in e10s mode
 [browser_bug710878.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (doc.querySelector)
+skip-if = e10s # Bug 1100653 - test uses waitForFocus on content
 [browser_bug719271.js]
 skip-if = e10s # Bug 1056146 - zoom tests use FullZoomHelper and break in e10s
 [browser_bug724239.js]
@@ -277,12 +274,8 @@
 [browser_bug763468_perwindowpb.js]
 skip-if = e10s
 [browser_bug767836_perwindowpb.js]
-skip-if = e10s # Bug ?????? - test reports a leaked nsGlobalWindow with e10s enabled.
 [browser_bug771331.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_bug783614.js]
-[browser_bug816527.js]
-skip-if = e10s # Bug 1093373 - relies on browser.sessionHistory
 [browser_bug817947.js]
 [browser_bug822367.js]
 [browser_bug832435.js]
@@ -297,6 +290,8 @@
 [browser_bug1015721.js]
 skip-if = os == 'win' || e10s # Bug 1056146 - zoom tests use FullZoomHelper and break in e10s
 [browser_bug1064280_changeUrlInPinnedTab.js]
+[browser_bug1070778.js]
+skip-if = os == "linux" || e10s # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
 [browser_canonizeURL.js]
 skip-if = e10s # Bug 1094510 - test hits the network in e10s mode only
 [browser_contentAreaClick.js]
@@ -304,7 +299,6 @@
 [browser_contextSearchTabPosition.js]
 skip-if = os == "mac" || e10s # bug 967013; e10s: bug 1094761 - test hits the network in e10s, causing next test to crash
 [browser_ctrlTab.js]
-skip-if = e10s # Bug ????? - thumbnail captures need e10s love (tabPreviews_capture fails with Argument 1 of CanvasRenderingContext2D.drawWindow does not implement interface Window.)
 [browser_customize_popupNotification.js]
 [browser_datareporting_notification.js]
 run-if = datareporting
@@ -334,13 +328,11 @@
 [browser_homeDrop.js]
 skip-if = buildapp == 'mulet'
 [browser_identity_UI.js]
-skip-if = e10s # Bug ?????? - this test fails for obscure reasons on non-windows builds only.
 [browser_keywordBookmarklets.js]
-skip-if = e10s # Bug ?????? - this test fails for obscure reasons on non-windows builds only.
+skip-if = e10s # Bug 1102025 - different principals for the bookmarklet only in e10s mode (unclear if test or 'real' issue)
 [browser_keywordSearch.js]
 skip-if = e10s # Bug 921957 - remote webprogress doesn't supply cancel method on the request object
 [browser_keywordSearch_postData.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (gBrowser.contentDocument.body.textContent)
 [browser_lastAccessedTab.js]
 skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bug 969405)
 [browser_locationBarCommand.js]
@@ -352,17 +344,16 @@
 [browser_middleMouse_noJSPaste.js]
 skip-if = e10s # Bug 921952 - Content:Click event issues
 [browser_minimize.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (TypeError: gBrowser.docShell is null)
+skip-if = e10s # Bug 1100664 - test directly access content docShells (TypeError: gBrowser.docShell is null)
 [browser_mixedcontent_securityflags.js]
 [browser_notification_tab_switching.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32
+skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
 [browser_offlineQuotaNotification.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 1093603 - test breaks with PopupNotifications.panel.firstElementChild is null
 [browser_overflowScroll.js]
 [browser_pageInfo.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_page_style_menu.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content
 
 [browser_parsable_css.js]
 skip-if = e10s
@@ -373,10 +364,10 @@
 [browser_plainTextLinks.js]
 skip-if = e10s # Bug 1093155 - tries to use context menu from browser-chrome and gets in a mess when in e10s mode
 [browser_popupUI.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (tries to get a popup element directly from content)
+skip-if = buildapp == 'mulet' || e10s # Bug 1100707 - test fails in e10s because it can't get accel-w to close the popup (?)
 [browser_popup_blocker.js]
 [browser_printpreview.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - timeout after logging "Error: Channel closing: too late to send/recv, messages will be lost"
+skip-if = buildapp == 'mulet' || e10s # Bug 1101973 - breaks the next test in e10s, and may be responsible for later timeout after logging "Error: Channel closing: too late to send/recv, messages will be lost"
 [browser_private_browsing_window.js]
 skip-if = buildapp == 'mulet'
 [browser_private_no_prompt.js]
@@ -402,11 +393,11 @@
                 # back to the clear recent history dialog (sanitize.xul), if
                 # it ever is (bug 480169)
 [browser_save_link-perwindowpb.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (event.target)
+skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_private_link_perwindowpb.js]
 skip-if = buildapp == 'mulet' || e10s # e10s: Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_video.js]
-skip-if = buildapp == 'mulet' || e10s # Bug ?????? - test directly manipulates content (event.target)
+skip-if = buildapp == 'mulet' || e10s # Bug 1100698 - test uses synthesizeMouse and then does a load of other stuff that breaks in e10s
 [browser_save_video_frame.js]
 [browser_scope.js]
 [browser_searchSuggestionUI.js]
@@ -415,14 +406,14 @@
   searchSuggestionUI.html
   searchSuggestionUI.js
 [browser_selectTabAtIndex.js]
-skip-if = e10s # Bug ?????? - no idea! "Accel+9 selects expected tab - Got 0, expected 9"
 [browser_star_hsts.js]
-skip-if = e10s # Bug ?????? - timeout after logging "Error: Channel closing: too late to send/recv, messages will be lost"
 [browser_subframe_favicons_not_used.js]
 [browser_tabDrop.js]
 skip-if = buildapp == 'mulet' || e10s
-[browser_tabMatchesInAwesomebar_perwindowpb.js]
+[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 # Bug 1093373 - relies on browser.sessionHistory
 [browser_tab_drag_drop_perwindow.js]
 skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop.js]
@@ -437,19 +428,17 @@
 [browser_tabkeynavigation.js]
 skip-if = e10s
 [browser_tabopen_reflows.js]
-skip-if = e10s # Bug ?????? - test needs to be updated for e10s (captures a stack that isn't correct in e10s)
 [browser_tabs_isActive.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (tries to get/set attributes directly on content docshell)
+skip-if = e10s # Bug 1100664 - test relies on linkedBrowser.docShell
 [browser_tabs_owner.js]
 [browser_trackingUI.js]
-skip-if = e10s # Bug 1093155 - tries to use context menu from browser-chrome and gets in a mess when in e10s mode
 support-files =
   trackingPage.html
   benignPage.html
 [browser_typeAheadFind.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 921935 - focusmanager issues with e10s (test calls waitForFocus)
 [browser_unloaddialogs.js]
-skip-if = e10s # Bug ?????? - test uses chrome windowMediator to try and see alert() from content
+skip-if = e10s # Bug 1100700 - test relies on unload event firing on closed tabs, which it doesn't
 [browser_urlHighlight.js]
 [browser_urlbarAutoFillTrimURLs.js]
 skip-if = e10s # Bug 1093941 - Waits indefinitely for onSearchComplete
@@ -459,7 +448,6 @@
 [browser_urlbarRevert.js]
 skip-if = e10s # Bug 1093941 - ESC reverted the location bar value - Got foobar, expected example.com
 [browser_urlbarSearchSingleWordNotification.js]
-skip-if = e10s # Bug 1093997 - intermittent failures in e10s-mode only
 [browser_urlbarStop.js]
 skip-if = e10s # Bug 1093941 - test calls gBrowser.contentWindow.stop
 [browser_urlbarTrimURLs.js]
@@ -479,7 +467,7 @@
 [browser_windowopen_reflows.js]
 skip-if = buildapp == 'mulet'
 [browser_wyciwyg_urlbarCopying.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (content.document.getElementById)
+skip-if = e10s # Bug 1100703 - test directly manipulates content (content.document.getElementById)
 [browser_zbug569342.js]
 skip-if = e10s # Bug 1094240 - has findbar-related failures
 [browser_registerProtocolHandler_notification.js]
@@ -491,10 +479,10 @@
 skip-if = e10s
 [browser_bug1025195_switchToTabHavingURI_ignoreFragment.js]
 [browser_addCertException.js]
-skip-if = e10s # Bug ?????? - test directly manipulates content (content.document.getElementById)
+skip-if = e10s # Bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_bug1045809.js]
 [browser_e10s_switchbrowser.js]
 [browser_blockHPKP.js]
-skip-if = e10s # bug ?????? - test directly manipulates content (content.document.getElementById)
+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
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_locationBarCommand.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_locationBarCommand.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_locationBarCommand.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_locationBarCommand.js	2014-11-26 21:45:47.000000000 +0000
@@ -37,10 +37,10 @@
     addPageShowListener(aWindow.gBrowser.selectedBrowser, function() {
       executeSoon(function () {
         info("URL should be loaded in a new window");
-        is(gURLBar.value, "", "Urlbar reverted to original value");       
+        is(gURLBar.value, "", "Urlbar reverted to original value");
         is(gFocusManager.focusedElement, null, "There should be no focused element");
         is(gFocusManager.focusedWindow, aWindow.gBrowser.contentWindow, "Content window should be focused");
-        is(aWindow.gURLBar.value, TEST_VALUE, "New URL is loaded in new window");
+        is(aWindow.gURLBar.textValue, TEST_VALUE, "New URL is loaded in new window");
 
         aWindow.close();
 
@@ -61,7 +61,7 @@
     finish();
     return;
   }
-  
+
   info("Running test: " + test.desc);
   // Tab will be blank if test.startValue is null
   let tab = gBrowser.selectedTab = gBrowser.addTab(test.startValue);
@@ -106,7 +106,7 @@
       is(gURLBar.value, "", "Urlbar reverted to original value");
       ok(!gURLBar.focused, "Urlbar is no longer focused after urlbar command");
       is(gBrowser.selectedTab, aTab, "Focus did not change to the new tab");
-    
+
       // Select the new background tab
       gBrowser.selectedTab = gBrowser.selectedTab.nextSibling;
       is(gURLBar.value, TEST_VALUE, "New URL is loaded in new tab");
@@ -143,7 +143,7 @@
   if (aClick) {
     is(gURLBar.getAttribute("pageproxystate"), "invalid",
        "page proxy state must be invalid for go button to be visible");
-    EventUtils.synthesizeMouseAtCenter(gGoButton, aEvent); 
+    EventUtils.synthesizeMouseAtCenter(gGoButton, aEvent);
   }
   else
     EventUtils.synthesizeKey("VK_RETURN", aEvent);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js	2014-11-26 21:45:47.000000000 +0000
@@ -41,7 +41,7 @@
 
   gURLBar.focus();
   paste(inputValue, function() {
-    is(gURLBar.value, expectedURL, "entering '" + inputValue + "' strips relevant bits.");
+    is(gURLBar.textValue, expectedURL, "entering '" + inputValue + "' strips relevant bits.");
 
     setTimeout(testNext, 0);
   });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,249 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+ * 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/. */
+
+const TEST_URL_BASES = [
+  "http://example.org/browser/browser/base/content/test/general/dummy_page.html#tabmatch",
+  "http://example.org/browser/browser/base/content/test/general/moz.png#tabmatch"
+];
+
+var gController = Cc["@mozilla.org/autocomplete/controller;1"].
+                  getService(Ci.nsIAutoCompleteController);
+
+var gTabWaitCount = 0;
+var gTabCounter = 0;
+
+var gTestSteps = [
+  function() {
+    info("Running step 1");
+    for (let i = 0; i < 10; i++) {
+      let tab = gBrowser.addTab();
+      loadTab(tab, TEST_URL_BASES[0] + (++gTabCounter));
+    }
+  },
+  function() {
+    info("Running step 2");
+    gBrowser.selectTabAtIndex(1);
+    gBrowser.removeCurrentTab();
+    gBrowser.selectTabAtIndex(1);
+    gBrowser.removeCurrentTab();
+    for (let i = 1; i < gBrowser.tabs.length; i++)
+      loadTab(gBrowser.tabs[i], TEST_URL_BASES[1] + (++gTabCounter));
+  },
+  function() {
+    info("Running step 3");
+    for (let i = 1; i < gBrowser.tabs.length; i++)
+      loadTab(gBrowser.tabs[i], TEST_URL_BASES[0] + gTabCounter);
+  },
+  function() {
+    info("Running step 4 - ensure we don't register subframes as open pages");
+    let tab = gBrowser.addTab();
+    tab.linkedBrowser.addEventListener("load", function () {
+      tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+      // Start the sub-document load.
+      executeSoon(function () {
+        tab.linkedBrowser.addEventListener("load", function (e) {
+          tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+            ensure_opentabs_match_db(nextStep);
+        }, true);
+        tab.linkedBrowser.contentDocument.querySelector("iframe").src = "http://test2.example.org/";
+      });
+    }, true);
+    tab.linkedBrowser.loadURI('data:text/html,<body><iframe src=""></iframe></body>');
+  },
+  function() {
+    info("Running step 5 - remove tab immediately");
+    let tab = gBrowser.addTab("about:logo");
+    gBrowser.removeTab(tab);
+    ensure_opentabs_match_db(nextStep);
+  },
+  function() {
+    info("Running step 6 - check swapBrowsersAndCloseOther preserves registered switch-to-tab result");
+    let tabToKeep = gBrowser.addTab();
+    let tab = gBrowser.addTab();
+    tab.linkedBrowser.addEventListener("load", function () {
+      tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+      gBrowser.swapBrowsersAndCloseOther(tabToKeep, tab);
+      ensure_opentabs_match_db(function () {
+        gBrowser.removeTab(tabToKeep);
+        ensure_opentabs_match_db(nextStep);
+      });
+    }, true);
+    tab.linkedBrowser.loadURI("about:mozilla");
+  },
+  function() {
+    info("Running step 7 - close all tabs");
+
+    Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
+
+    gBrowser.addTab("about:blank", {skipAnimation: true});
+    while (gBrowser.tabs.length > 1) {
+      info("Removing tab: " + gBrowser.tabs[0].linkedBrowser.currentURI.spec);
+      gBrowser.selectTabAtIndex(0);
+      gBrowser.removeCurrentTab();
+    }
+    ensure_opentabs_match_db(nextStep);
+  }
+];
+
+
+
+function test() {
+  waitForExplicitFinish();
+  nextStep();
+}
+
+function loadTab(tab, url) {
+  // Because adding visits is async, we will not be notified immediately.
+  let visited = false;
+  let loaded = false;
+
+  function maybeCheckResults() {
+    if (visited && loaded && --gTabWaitCount == 0) {
+      ensure_opentabs_match_db(nextStep);
+    }
+  }
+
+  tab.linkedBrowser.addEventListener("load", function () {
+    tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+    loaded = true;
+    maybeCheckResults();
+  }, true);
+
+  if (!visited) {
+    Services.obs.addObserver(
+      function (aSubject, aTopic, aData) {
+        if (url != aSubject.QueryInterface(Ci.nsIURI).spec)
+          return;
+        Services.obs.removeObserver(arguments.callee, aTopic);
+        visited = true;
+        maybeCheckResults();
+      },
+      "uri-visit-saved",
+      false
+    );
+  }
+
+  gTabWaitCount++;
+  info("Loading page: " + url);
+  tab.linkedBrowser.loadURI(url);
+}
+
+function waitForRestoredTab(tab) {
+  gTabWaitCount++;
+
+  tab.linkedBrowser.addEventListener("load", function () {
+    tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+    if (--gTabWaitCount == 0) {
+      ensure_opentabs_match_db(nextStep);
+    }
+  }, true);
+}
+
+
+function nextStep() {
+  if (gTestSteps.length == 0) {
+    while (gBrowser.tabs.length > 1) {
+      gBrowser.selectTabAtIndex(1);
+      gBrowser.removeCurrentTab();
+    }
+
+    waitForClearHistory(finish);
+
+    return;
+  }
+
+  var stepFunc = gTestSteps.shift();
+  stepFunc();
+}
+
+function ensure_opentabs_match_db(aCallback) {
+  var tabs = {};
+
+  var winEnum = Services.wm.getEnumerator("navigator:browser");
+  while (winEnum.hasMoreElements()) {
+    let browserWin = winEnum.getNext();
+    // skip closed-but-not-destroyed windows
+    if (browserWin.closed)
+      continue;
+
+    for (let i = 0; i < browserWin.gBrowser.tabContainer.childElementCount; i++) {
+      let browser = browserWin.gBrowser.getBrowserAtIndex(i);
+      let url = browser.currentURI.spec;
+      if (browserWin.isBlankPageURL(url))
+        continue;
+      if (!(url in tabs))
+        tabs[url] = 1;
+      else
+        tabs[url]++;
+    }
+  }
+
+  checkAutocompleteResults(tabs, aCallback);
+}
+
+/**
+ * Clears history invoking callback when done.
+ */
+function waitForClearHistory(aCallback) {
+  const TOPIC_EXPIRATION_FINISHED = "places-expiration-finished";
+  let observer = {
+    observe: function(aSubject, aTopic, aData) {
+      Services.obs.removeObserver(this, TOPIC_EXPIRATION_FINISHED);
+      aCallback();
+    }
+  };
+  Services.obs.addObserver(observer, TOPIC_EXPIRATION_FINISHED, false);
+
+  PlacesUtils.bhistory.removeAllPages();
+}
+
+function checkAutocompleteResults(aExpected, aCallback)
+{
+  gController.input = {
+    timeout: 10,
+    textValue: "",
+    searches: ["history"],
+    searchParam: "enable-actions",
+    popupOpen: false,
+    minResultsForPopup: 0,
+    invalidate: function() {},
+    disableAutoComplete: false,
+    completeDefaultIndex: false,
+    get popup() { return this; },
+    onSearchBegin: function() {},
+    onSearchComplete:  function ()
+    {
+      info("Found " + gController.matchCount + " matches.");
+      // Check to see the expected uris and titles match up (in any order)
+      for (let i = 0; i < gController.matchCount; i++) {
+        let uri = gController.getValueAt(i).replace(/^moz-action:[^,]+,/i, "");
+
+        info("Search for '" + uri + "' in open tabs.");
+        let expected = uri in aExpected;
+        ok(expected, uri + " was found in autocomplete, was " + (expected ? "" : "not ") + "expected");
+        // Remove the found entry from expected results.
+        delete aExpected[uri];
+      }
+
+      // Make sure there is no reported open page that is not open.
+      for (let entry in aExpected) {
+        ok(false, "'" + entry + "' should be found in autocomplete");
+      }
+
+      executeSoon(aCallback);
+    },
+    setSelectedIndex: function() {},
+    get searchCount() { return this.searches.length; },
+    getSearchAt: function(aIndex) this.searches[aIndex],
+    QueryInterface: XPCOMUtils.generateQI([
+      Ci.nsIAutoCompleteInput,
+      Ci.nsIAutoCompletePopup,
+    ])
+  };
+
+  info("Searching open pages.");
+  gController.startSearch(Services.prefs.getCharPref("browser.urlbar.restrict.openpage"));
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar_perwindowpb.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar_perwindowpb.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar_perwindowpb.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar_perwindowpb.js	2014-11-26 21:45:47.000000000 +0000
@@ -1,249 +1,122 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
- * vim:set ts=2 sw=2 sts=2 et:
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.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 TEST_URL_BASES = [
-  "http://example.org/browser/browser/base/content/test/general/dummy_page.html#tabmatch",
-  "http://example.org/browser/browser/base/content/test/general/moz.png#tabmatch"
-];
-
-var gController = Cc["@mozilla.org/autocomplete/controller;1"].
-                  getService(Ci.nsIAutoCompleteController);
-
-var gTabWaitCount = 0;
-var gTabCounter = 0;
-
-var gTestSteps = [
-  function() {
-    info("Running step 1");
-    for (let i = 0; i < 10; i++) {
-      let tab = gBrowser.addTab();
-      loadTab(tab, TEST_URL_BASES[0] + (++gTabCounter));
-    }
-  },
-  function() {
-    info("Running step 2");
-    gBrowser.selectTabAtIndex(1);
-    gBrowser.removeCurrentTab();
-    gBrowser.selectTabAtIndex(1);
-    gBrowser.removeCurrentTab();
-    for (let i = 1; i < gBrowser.tabs.length; i++)
-      loadTab(gBrowser.tabs[i], TEST_URL_BASES[1] + (++gTabCounter));
-  },
-  function() {
-    info("Running step 3");
-    for (let i = 1; i < gBrowser.tabs.length; i++)
-      loadTab(gBrowser.tabs[i], TEST_URL_BASES[0] + gTabCounter);
-  },
-  function() {
-    info("Running step 4 - ensure we don't register subframes as open pages");
-    let tab = gBrowser.addTab();
-    tab.linkedBrowser.addEventListener("load", function () {
-      tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-      // Start the sub-document load.
-      executeSoon(function () {
-        tab.linkedBrowser.addEventListener("load", function (e) {
-          tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-            ensure_opentabs_match_db(nextStep);
-        }, true);
-        tab.linkedBrowser.contentDocument.querySelector("iframe").src = "http://test2.example.org/";
-      });
-    }, true);
-    tab.linkedBrowser.loadURI('data:text/html,<body><iframe src=""></iframe></body>');
-  },
-  function() {
-    info("Running step 5 - remove tab immediately");
-    let tab = gBrowser.addTab("about:logo");
-    gBrowser.removeTab(tab);
-    ensure_opentabs_match_db(nextStep);
-  },
-  function() {
-    info("Running step 6 - check swapBrowsersAndCloseOther preserves registered switch-to-tab result");
-    let tabToKeep = gBrowser.addTab();
-    let tab = gBrowser.addTab();
-    tab.linkedBrowser.addEventListener("load", function () {
-      tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-      gBrowser.swapBrowsersAndCloseOther(tabToKeep, tab);
-      ensure_opentabs_match_db(function () {
-        gBrowser.removeTab(tabToKeep);
-        ensure_opentabs_match_db(nextStep);
-      });
-    }, true);
-    tab.linkedBrowser.loadURI("about:mozilla");
-  },
-  function() {
-    info("Running step 7 - close all tabs");
-
-    Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
-
-    gBrowser.addTab("about:blank", {skipAnimation: true});
-    while (gBrowser.tabs.length > 1) {
-      info("Removing tab: " + gBrowser.tabs[0].linkedBrowser.currentURI.spec);
-      gBrowser.selectTabAtIndex(0);
-      gBrowser.removeCurrentTab();
-    }
-    ensure_opentabs_match_db(nextStep);
-  }
-];
-
-
-
 function test() {
   waitForExplicitFinish();
-  nextStep();
-}
-
-function loadTab(tab, url) {
-  // Because adding visits is async, we will not be notified immediately.
-  let visited = false;
-  let loaded = false;
-
-  function maybeCheckResults() {
-    if (visited && loaded && --gTabWaitCount == 0) {
-      ensure_opentabs_match_db(nextStep);
-    }
-  }
-
-  tab.linkedBrowser.addEventListener("load", function () {
-    tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-    loaded = true;
-    maybeCheckResults();
-  }, true);
-
-  if (!visited) {
-    Services.obs.addObserver(
-      function (aSubject, aTopic, aData) {
-        if (url != aSubject.QueryInterface(Ci.nsIURI).spec)
-          return;
-        Services.obs.removeObserver(arguments.callee, aTopic);
-        visited = true;
-        maybeCheckResults();
-      },
-      "uri-visit-saved",
-      false
-    );
-  }
-
-  gTabWaitCount++;
-  info("Loading page: " + url);
-  tab.linkedBrowser.loadURI(url);
-}
-
-function waitForRestoredTab(tab) {
-  gTabWaitCount++;
-
-  tab.linkedBrowser.addEventListener("load", function () {
-    tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-    if (--gTabWaitCount == 0) {
-      ensure_opentabs_match_db(nextStep);
-    }
-  }, true);
-}
-
-
-function nextStep() {
-  if (gTestSteps.length == 0) {
-    while (gBrowser.tabs.length > 1) {
-      gBrowser.selectTabAtIndex(1);
-      gBrowser.removeCurrentTab();
-    }
 
-    waitForClearHistory(finish);
-
-    return;
-  }
+  let testURL = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
 
-  var stepFunc = gTestSteps.shift();
-  stepFunc();
-}
-
-function ensure_opentabs_match_db(aCallback) {
-  var tabs = {};
-
-  var winEnum = Services.wm.getEnumerator("navigator:browser");
-  while (winEnum.hasMoreElements()) {
-    let browserWin = winEnum.getNext();
-    // skip closed-but-not-destroyed windows
-    if (browserWin.closed)
-      continue;
-
-    for (let i = 0; i < browserWin.gBrowser.tabContainer.childElementCount; i++) {
-      let browser = browserWin.gBrowser.getBrowserAtIndex(i);
-      let url = browser.currentURI.spec;
-      if (browserWin.isBlankPageURL(url))
-        continue;
-      if (!(url in tabs))
-        tabs[url] = 1;
-      else
-        tabs[url]++;
-    }
-  }
-
-  checkAutocompleteResults(tabs, aCallback);
-}
-
-/**
- * Clears history invoking callback when done.
- */
-function waitForClearHistory(aCallback) {
-  const TOPIC_EXPIRATION_FINISHED = "places-expiration-finished";
-  let observer = {
-    observe: function(aSubject, aTopic, aData) {
-      Services.obs.removeObserver(this, TOPIC_EXPIRATION_FINISHED);
-      aCallback();
-    }
+  function testOnWindow(aOptions, aCallback) {
+    whenNewWindowLoaded(aOptions, function(aWin) {
+      // 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));
+    });
   };
-  Services.obs.addObserver(observer, TOPIC_EXPIRATION_FINISHED, false);
 
-  PlacesUtils.bhistory.removeAllPages();
-}
+  testOnWindow({}, function(aNormalWindow) {
+    testOnWindow({private: true}, function(aPrivateWindow) {
+      runTest(aNormalWindow, aPrivateWindow, false, function() {
+        aNormalWindow.close();
+        aPrivateWindow.close();
+        testOnWindow({}, function(aNormalWindow) {
+          testOnWindow({private: true}, function(aPrivateWindow) {
+            runTest(aPrivateWindow, aNormalWindow, false, function() {
+              aNormalWindow.close();
+              aPrivateWindow.close();
+              testOnWindow({private: true}, function(aPrivateWindow) {
+                runTest(aPrivateWindow, aPrivateWindow, false, function() {
+                  aPrivateWindow.close();
+                  testOnWindow({}, function(aNormalWindow) {
+                    runTest(aNormalWindow, aNormalWindow, true, function() {
+                      aNormalWindow.close();
+                      finish();
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
 
-function checkAutocompleteResults(aExpected, aCallback)
-{
-  gController.input = {
-    timeout: 10,
-    textValue: "",
-    searches: ["history"],
-    searchParam: "enable-actions",
-    popupOpen: false,
-    minResultsForPopup: 0,
-    invalidate: function() {},
-    disableAutoComplete: false,
-    completeDefaultIndex: false,
-    get popup() { return this; },
-    onSearchBegin: function() {},
-    onSearchComplete:  function ()
-    {
-      info("Found " + gController.matchCount + " matches.");
-      // Check to see the expected uris and titles match up (in any order)
-      for (let i = 0; i < gController.matchCount; i++) {
-        let uri = gController.getValueAt(i).replace(/^moz-action:[^,]+,/i, "");
-
-        info("Search for '" + uri + "' in open tabs.");
-        let expected = uri in aExpected;
-        ok(expected, uri + " was found in autocomplete, was " + (expected ? "" : "not ") + "expected");
-        // Remove the found entry from expected results.
-        delete aExpected[uri];
-      }
-
-      // Make sure there is no reported open page that is not open.
-      for (let entry in aExpected) {
-        ok(false, "'" + entry + "' should be found in autocomplete");
-      }
-
-      executeSoon(aCallback);
-    },
-    setSelectedIndex: function() {},
-    get searchCount() { return this.searches.length; },
-    getSearchAt: function(aIndex) this.searches[aIndex],
-    QueryInterface: XPCOMUtils.generateQI([
-      Ci.nsIAutoCompleteInput,
-      Ci.nsIAutoCompletePopup,
-    ])
-  };
+  function runTest(aSourceWindow, aDestWindow, aExpectSwitch, aCallback) {
+    // Open the base tab
+    let baseTab = aSourceWindow.gBrowser.addTab(testURL);
+    baseTab.linkedBrowser.addEventListener("load", function() {
+      // Wait for the tab to be fully loaded so matching happens correctly
+      if (baseTab.linkedBrowser.currentURI.spec == "about:blank")
+        return;
+      baseTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+
+      let testTab = aDestWindow.gBrowser.addTab();
+
+      waitForFocus(function() {
+        // Select the testTab
+        aDestWindow.gBrowser.selectedTab = testTab;
+
+        // Ensure that this tab has no history entries
+        ok(testTab.linkedBrowser.sessionHistory.count < 2,
+           "The test tab has 1 or less history entries");
+        // Ensure that this tab is on about:blank
+        is(testTab.linkedBrowser.currentURI.spec, "about:blank",
+           "The test tab is on about:blank");
+        // Ensure that this tab's document has no child nodes
+        ok(!testTab.linkedBrowser.contentDocument.body.hasChildNodes(),
+           "The test tab has no child nodes");
+        ok(!testTab.hasAttribute("busy"),
+           "The test tab doesn't have the busy attribute");
+
+        let urlbar = aDestWindow.gURLBar;
+        let controller = urlbar.controller;
+
+        // Focus URL bar, enter value, and start searching.
+        urlbar.focus();
+        urlbar.value = testURL;
+        controller.startSearch(testURL);
+
+        // Wait for the Awesomebar popup to appear.
+        promisePopupShown(aDestWindow.gURLBar.popup).then(() => {
+          function searchIsComplete() {
+            return controller.searchStatus ==
+              Ci.nsIAutoCompleteController.STATUS_COMPLETE_MATCH;
+          }
+
+          // Wait until the search is complete.
+          waitForCondition(searchIsComplete, function () {
+            if (aExpectSwitch) {
+              // If we expect a tab switch then the current tab
+              // will be closed and we switch to the other tab.
+              let tabContainer = aDestWindow.gBrowser.tabContainer;
+              tabContainer.addEventListener("TabClose", function onClose(event) {
+                if (event.target == testTab) {
+                  tabContainer.removeEventListener("TabClose", onClose);
+                  executeSoon(aCallback);
+                }
+              });
+            } else {
+              // If we don't expect a tab switch then wait for the tab to load.
+              testTab.addEventListener("load", function onLoad() {
+                testTab.removeEventListener("load", onLoad, true);
+                executeSoon(aCallback);
+              }, true);
+            }
+
+            // Select the second match, if any.
+            if (controller.matchCount > 1) {
+              controller.handleKeyNavigation(KeyEvent.DOM_VK_DOWN);
+            }
+
+            // Execute the selected action.
+            controller.handleEnter(true);
+          });
+        });
 
-  info("Searching open pages.");
-  gController.startSearch(Services.prefs.getCharPref("browser.urlbar.restrict.openpage"));
+      }, aDestWindow);
+    }, true);
+  }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarAutoFillTrimURLs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarAutoFillTrimURLs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarAutoFillTrimURLs.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarAutoFillTrimURLs.js	2014-11-26 21:45:47.000000000 +0000
@@ -27,7 +27,7 @@
   };
   let history = Cc["@mozilla.org/browser/history;1"]
                   .getService(Ci.mozIAsyncHistory);
-  history.updatePlaces({ uri: NetUtil.newURI("http://www.autofilltrimurl.com/")
+  history.updatePlaces({ uri: NetUtil.newURI("http://www.autofilltrimurl.com/whatever")
                        , visits: [ { transitionType: Ci.nsINavHistoryService.TRANSITION_TYPED
                                    , visitDate:      Date.now() * 1000
                                    } ]
@@ -44,7 +44,8 @@
 
     EventUtils.synthesizeKey(aTyped.substr(-1), {});
     waitForSearchComplete(function () {
-      is(gURLBar.value, aExpected, "trim was applied correctly");
+      info(`Got value: ${gURLBar.value}`);
+      is(gURLBar.value, aExpected, "Autofilled value is as expected");
       aCallback();
     });
   }
@@ -53,9 +54,9 @@
     test_autoFill("http://au", "http://autofilltrimurl.com/", function () {
       test_autoFill("http://www.autofilltrimurl.com", "http://www.autofilltrimurl.com/", function () {
         // Now ensure selecting from the popup correctly trims.
-        is(gURLBar.controller.matchCount, 1, "Found the expected number of matches");
+        is(gURLBar.controller.matchCount, 2, "Found the expected number of matches");
         EventUtils.synthesizeKey("VK_DOWN", {});
-        is(gURLBar.value, "www.autofilltrimurl.com", "trim was applied correctly");
+        is(gURLBar.textValue, "www.autofilltrimurl.com/whatever", "trim was applied correctly");
         gURLBar.closePopup();
         waitForClearHistory(finish);
       });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarCopying.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarCopying.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarCopying.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarCopying.js	2014-11-26 21:45:47.000000000 +0000
@@ -156,7 +156,7 @@
   function doCheck() {
     if (test.setURL || test.loadURL) {
       gURLBar.valueIsTyped = !!test.setURL;
-      is(gURLBar.value, test.expectedURL, "url bar value set");
+      is(gURLBar.textValue, test.expectedURL, "url bar value set");
     }
 
     testCopy(test.copyVal, test.copyExpected, cb);
@@ -180,7 +180,7 @@
       let endBracket = copyVal.indexOf(">");
       if (startBracket == -1 || endBracket == -1 ||
           startBracket > endBracket ||
-          copyVal.replace("<", "").replace(">", "") != gURLBar.value) {
+          copyVal.replace("<", "").replace(">", "") != gURLBar.textValue) {
         ok(false, "invalid copyVal: " + copyVal);
       }
       gURLBar.selectionStart = startBracket;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarEnter.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarEnter.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarEnter.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarEnter.js	2014-11-26 21:45:47.000000000 +0000
@@ -51,12 +51,12 @@
 ]
 
 function checkCurrent(aTab) {
-  is(gURLBar.value, TEST_VALUE, "Urlbar should preserve the value on return keypress");
+  is(gURLBar.textValue, TEST_VALUE, "Urlbar should preserve the value on return keypress");
   is(gBrowser.selectedTab, aTab, "New URL was loaded in the current tab");
 }
 
 function checkNewTab(aTab) {
-  is(gURLBar.value, TEST_VALUE, "Urlbar should preserve the value on return keypress");
+  is(gURLBar.textValue, TEST_VALUE, "Urlbar should preserve the value on return keypress");
   isnot(gBrowser.selectedTab, aTab, "New URL was loaded in a new tab");
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_URLBarSetURI.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_URLBarSetURI.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_URLBarSetURI.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_URLBarSetURI.js	2014-11-26 21:45:47.000000000 +0000
@@ -31,7 +31,7 @@
   function revert(next) {
     loadTabInWindow(window, function (tab) {
       gURLBar.handleRevert();
-      is(gURLBar.value, "example.com", "URL bar had user/pass stripped after reverting");
+      is(gURLBar.textValue, "example.com", "URL bar had user/pass stripped after reverting");
       gBrowser.removeTab(tab);
       next();
     });
@@ -44,7 +44,7 @@
         loadTabInWindow(win, function () {
           openToolbarCustomizationUI(function () {
             closeToolbarCustomizationUI(function () {
-              is(win.gURLBar.value, "example.com", "URL bar had user/pass stripped after customize");
+              is(win.gURLBar.textValue, "example.com", "URL bar had user/pass stripped after customize");
               win.close();
               next();
             }, win);
@@ -59,7 +59,7 @@
       // error.
       tab.linkedBrowser.loadURI("http://test1.example.com");
       tab.linkedBrowser.stop();
-      is(gURLBar.value, "example.com", "URL bar had user/pass stripped after load error");
+      is(gURLBar.textValue, "example.com", "URL bar had user/pass stripped after load error");
       gBrowser.removeTab(tab);
       next();
     });
@@ -76,7 +76,7 @@
       return;
     tab.linkedBrowser.removeEventListener("load", listener, true);
 
-    is(win.gURLBar.value, "example.com", "URL bar had user/pass stripped initially");
+    is(win.gURLBar.textValue, "example.com", "URL bar had user/pass stripped initially");
     callback(tab);
   }, true);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarStop.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarStop.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarStop.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarStop.js	2014-11-26 21:45:47.000000000 +0000
@@ -11,23 +11,23 @@
 function onload() {
   gBrowser.selectedBrowser.removeEventListener("load", onload, true);
 
-  is(gURLBar.value, gURLBar.trimValue(goodURL), "location bar reflects loaded page");
+  is(gURLBar.textValue, gURLBar.trimValue(goodURL), "location bar reflects loaded page");
 
   typeAndSubmit(badURL);
-  is(gURLBar.value, gURLBar.trimValue(badURL), "location bar reflects loading page");
+  is(gURLBar.textValue, gURLBar.trimValue(badURL), "location bar reflects loading page");
 
   gBrowser.contentWindow.stop();
-  is(gURLBar.value, gURLBar.trimValue(goodURL), "location bar reflects loaded page after stop()");
+  is(gURLBar.textValue, gURLBar.trimValue(goodURL), "location bar reflects loaded page after stop()");
   gBrowser.removeCurrentTab();
 
   gBrowser.selectedTab = gBrowser.addTab("about:blank");
-  is(gURLBar.value, "", "location bar is empty");
+  is(gURLBar.textValue, "", "location bar is empty");
 
   typeAndSubmit(badURL);
-  is(gURLBar.value, gURLBar.trimValue(badURL), "location bar reflects loading page");
+  is(gURLBar.textValue, gURLBar.trimValue(badURL), "location bar reflects loading page");
 
   gBrowser.contentWindow.stop();
-  is(gURLBar.value, gURLBar.trimValue(badURL), "location bar reflects stopped page in an empty tab");
+  is(gURLBar.textValue, gURLBar.trimValue(badURL), "location bar reflects stopped page in an empty tab");
   gBrowser.removeCurrentTab();
 
   finish();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarTrimURLs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarTrimURLs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/browser_urlbarTrimURLs.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/browser_urlbarTrimURLs.js	2014-11-26 21:45:47.000000000 +0000
@@ -5,7 +5,7 @@
 function testVal(originalValue, targetValue) {
   gURLBar.value = originalValue;
   gURLBar.valueIsTyped = false;
-  is(gURLBar.value, targetValue || originalValue, "url bar value set");
+  is(gURLBar.textValue, targetValue || originalValue, "url bar value set");
 }
 
 function test() {
@@ -96,7 +96,7 @@
 
 function testCopy(originalValue, targetValue, cb) {
   waitForClipboard(targetValue, function () {
-    is(gURLBar.value, originalValue, "url bar copy value set");
+    is(gURLBar.textValue, originalValue, "url bar copy value set");
 
     gURLBar.focus();
     gURLBar.select();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/general/head.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/general/head.js	2014-11-26 21:45:47.000000000 +0000
@@ -6,6 +6,8 @@
   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
   "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
+  "resource://testing-common/PlacesTestUtils.jsm");
 
 function closeAllNotifications () {
   let notificationBox = document.getElementById("global-notificationbox");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/newtab/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/newtab/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/newtab/browser.ini	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/newtab/browser.ini	2014-11-26 21:45:47.000000000 +0000
@@ -21,6 +21,7 @@
 [browser_newtab_bug998387.js]
 [browser_newtab_disable.js]
 [browser_newtab_drag_drop.js]
+skip-if = os == "win" && debug # bug 1097056; test fails in --run-by-dir mode on win8 x64 debug
 [browser_newtab_drag_drop_ext.js]
 [browser_newtab_drop_preview.js]
 [browser_newtab_enhanced.js]
@@ -44,3 +45,4 @@
 [browser_newtab_undo.js]
 [browser_newtab_unpin.js]
 [browser_newtab_update.js]
+skip-if = true # Bug 1008029
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/plugins/browser_globalplugin_crashinfobar.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/plugins/browser_globalplugin_crashinfobar.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/plugins/browser_globalplugin_crashinfobar.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/plugins/browser_globalplugin_crashinfobar.js	2014-11-26 21:45:47.000000000 +0000
@@ -4,11 +4,13 @@
 
 let gTestBrowser = null;
 
-let propBagProperties = {
+let crashedEventProperties = {
   pluginName: "GlobalTestPlugin",
   pluginDumpID: "1234",
   browserDumpID: "5678",
-  submittedCrashReport: false
+  submittedCrashReport: false,
+  bubbles: true,
+  cancelable: true
 }
 
 // Test that plugin crash submissions still work properly after
@@ -34,15 +36,9 @@
 
 function generateCrashEvent() {
   let window = gTestBrowser.contentWindow;
-  let propBag = Cc["@mozilla.org/hash-property-bag;1"]
-                  .createInstance(Ci.nsIWritablePropertyBag);
-  for (let [name, val] of Iterator(propBagProperties)) {
-    propBag.setProperty(name, val);
-  }
+  let crashedEvent = new window.PluginCrashedEvent("PluginCrashed", crashedEventProperties);
 
-  let event = window.document.createEvent("CustomEvent");
-  event.initCustomEvent("PluginCrashed", true, true, propBag);
-  window.dispatchEvent(event);
+  window.dispatchEvent(crashedEvent);
 }
 
 
@@ -50,13 +46,10 @@
   let target = event.target;
   is (target, gTestBrowser.contentWindow, "Event target is the window.");
 
-  let propBag = event.detail.QueryInterface(Ci.nsIPropertyBag2);
-  for (let [name, val] of Iterator(propBagProperties)) {
-    let type = typeof val;
-    let propVal = type == "string"
-                  ? propBag.getPropertyAsAString(name)
-                  : propBag.getPropertyAsBool(name);
-    is (propVal, val, "Correct property in detail propBag: " + name + ".");
+  for (let [name, val] of Iterator(crashedEventProperties)) {
+    let propVal = event[name];
+
+    is (propVal, val, "Correct property: " + name + ".");
   }
 
   waitForNotificationBar("plugin-crashed", gTestBrowser, (notification) => {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js	2014-11-26 21:45:47.000000000 +0000
@@ -57,10 +57,8 @@
       }
 
       if (message.data.sendCrashMessage) {
-        let propBag = event.detail.QueryInterface(Ci.nsIPropertyBag2);
-        let crashID = propBag.getPropertyAsAString("pluginDumpID");
         sendAsyncMessage("test:crash-plugin:crashed", {
-          crashID: crashID,
+          crashID: event.pluginDumpID,
         });
         return;
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/urlbarBindings.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/urlbarBindings.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/base/content/urlbarBindings.xml	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/base/content/urlbarBindings.xml	2014-11-26 21:45:47.000000000 +0000
@@ -132,9 +132,7 @@
       -->
       <method name="onBeforeValueGet">
         <body><![CDATA[
-          if (this.hasAttribute("actiontype"))
-            return {value: this._value};
-          return null;
+          return {value: this._value};
         ]]></body>
       </method>
 
@@ -285,31 +283,31 @@
           var mayInheritPrincipal = false;
           var postData = null;
 
-          var action = this._parseActionUrl(url);
+          let action = this._parseActionUrl(this._value);
           let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
 
           let matchLastLocationChange = true;
           if (action) {
-            if (this.hasAttribute("actiontype")) {
-              if (action.type == "switchtab") {
-                url = action.params.url;
+            if (action.type == "switchtab") {
+              url = action.params.url;
+              if (this.hasAttribute("actiontype")) {
                 this.handleRevert();
                 let prevTab = gBrowser.selectedTab;
                 if (switchToTabHavingURI(url) &&
                     isTabEmpty(prevTab))
                   gBrowser.removeTab(prevTab);
                 return;
-              } else if (action.type == "keyword") {
-                url = action.params.url;
-              } else if (action.type == "searchengine") {
-                let engine = Services.search.getEngineByName(action.params.engineName);
-                let submission = engine.getSubmission(action.params.searchQuery);
-
-                url = submission.uri.spec;
-                postData = submission.postData;
-              } else if (action.type == "visiturl") {
-                url = action.params.url;
               }
+            } else if (action.type == "keyword") {
+              url = action.params.url;
+            } else if (action.type == "searchengine") {
+              let engine = Services.search.getEngineByName(action.params.engineName);
+              let submission = engine.getSubmission(action.params.searchQuery);
+
+              url = submission.uri.spec;
+              postData = submission.postData;
+            } else if (action.type == "visiturl") {
+              url = action.params.url;
             }
             continueOperation.call(this);
           }
@@ -584,7 +582,11 @@
               urlbar.inputField.value = urlbar.inputField.value.substring(0, start) +
                                         urlbar.inputField.value.substring(end);
               urlbar.selectionStart = urlbar.selectionEnd = start;
-              urlbar.removeAttribute("actiontype");
+
+              let event = document.createEvent("UIEvents");
+              event.initUIEvent("input", true, false, window, 0);
+              urlbar.dispatchEvent(event);
+
               SetPageProxyState("invalid");
             }
 
@@ -704,8 +706,10 @@
         ]]></body>
       </method>
 
-      <property name="textValue"
-                onget="return this.value;">
+      <property name="textValue">
+        <getter><![CDATA[
+          return this.inputField.value;
+        ]]></getter>
         <setter>
           <![CDATA[
           try {
@@ -714,8 +718,10 @@
 
           // Trim popup selected values, but never trim results coming from
           // autofill.
-          if (this.popup.selectedIndex == -1)
+          if (this.popup.selectedIndex == -1 ||
+              this.mController.getStyleAt(this.popup.selectedIndex) == "autofill") {
             this._disableTrim = true;
+          }
           this.value = val;
           this._disableTrim = false;
 
@@ -740,7 +746,6 @@
 
           // URL is in the format moz-action:ACTION,PARAMS
           // Where PARAMS is a JSON encoded object.
-          aUrl = decodeURI(aUrl);
           let [, type, params] = aUrl.match(/^moz-action:([^,]+),(.*)$/);
 
           let action = {
@@ -786,6 +791,19 @@
           this.inputField.setSelectionRange(aStartIndex, aEndIndex);
         ]]></body>
       </method>
+
+      <method name="onInput">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (!this.mIgnoreInput && this.mController.input == this) {
+            this._value = this.inputField.value;
+            gBrowser.userTypedValue = this.value;
+            this.valueIsTyped = true;
+            this.mController.handleText();
+          }
+          this.resetActionType();
+        ]]></body>
+      </method>
     </implementation>
 
     <handlers>
@@ -819,7 +837,7 @@
 
       <handler event="dragstart" phase="capturing"><![CDATA[
         // Drag only if the gesture starts from the input field.
-        if (this.inputField != event.originalTarget && 
+        if (this.inputField != event.originalTarget &&
             !(this.inputField.compareDocumentPosition(event.originalTarget) &
               Node.DOCUMENT_POSITION_CONTAINED_BY))
           return;
@@ -943,6 +961,35 @@
           createBundle("chrome://browser/locale/places/places.properties");
       </field>
 
+      <!-- Override this so that navigating between items results in an item
+           always being selected. This is contrary to the normal behaviour where
+           if you navigate beyond either end of the list, no item will be
+           selected. -->
+      <method name="getNextIndex">
+        <parameter name="reverse"/>
+        <parameter name="amount"/>
+        <parameter name="index"/>
+        <parameter name="maxRow"/>
+        <body><![CDATA[
+          if (maxRow < 0)
+            return -1;
+
+          let newIndex = index + (reverse ? -1 : 1) * amount;
+
+          // We don't want to wrap if navigation in any direction by one item.
+          // Otherwise we clamp to one end of the list.
+          // ie, hitting page-down will only cause is to wrap if we're already
+          // at one end of the list.
+          if (newIndex < 0) {
+            newIndex = index > 0 ? 0 : maxRow;
+          } else if (newIndex > maxRow) {
+            newIndex = index < maxRow ? maxRow : 0;
+          }
+
+          return newIndex;
+        ]]></body>
+      </method>
+
       <property name="maxResults" readonly="true">
         <getter>
           <![CDATA[
@@ -1049,6 +1096,18 @@
           ]]>
         </body>
       </method>
+
+      <method name="onResultsAdded">
+        <body>
+          <![CDATA[
+            if (!Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete"))
+              return;
+
+            if (this._matchCount > 0 && this.selectedIndex == -1)
+              this.selectedIndex = 0;
+          ]]>
+        </body>
+      </method>
 
     </implementation>
   </binding>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/content/customizeMode.inc.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/content/customizeMode.inc.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/content/customizeMode.inc.xul	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/content/customizeMode.inc.xul	2014-11-26 21:45:48.000000000 +0000
@@ -56,8 +56,8 @@
       <button id="customization-devedition-theme-button"
               class="customizationmode-button"
               hidden="true"
-              label="&customizeMode.deveditionTheme.label;"
-              oncommand="gCustomizeMode.toggleDevEditionTheme()"
+              label="&customizeMode.deveditionTheme.label2;"
+              oncommand="gCustomizeMode.toggleDevEditionTheme(this.hasAttribute('checked'))"
               type="checkbox" />
 
       <spacer id="customization-footer-spacer"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/CustomizableUI.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/CustomizableUI.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/CustomizableUI.jsm	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/CustomizableUI.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -2056,25 +2056,23 @@
     // If we're restoring the widget to it's old placement, fire off the
     // onWidgetAdded event - our own handler will take care of adding it to
     // any build areas.
-    if (widget.currentArea) {
-      this.notifyListeners("onWidgetAdded", widget.id, widget.currentArea,
-                           widget.currentPosition);
-    } else if (widgetMightNeedAutoAdding) {
-      let autoAdd = true;
-      try {
-        autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd);
-      } catch (e) {}
-
-      // If the widget doesn't have an existing placement, and it hasn't been
-      // seen before, then add it to its default area so it can be used.
-      // If the widget is not removable, we *have* to add it to its default
-      // area here.
-      let canBeAutoAdded = autoAdd && !gSeenWidgets.has(widget.id);
-      if (!widget.currentArea && (!widget.removable || canBeAutoAdded)) {
-        this.beginBatchUpdate();
+    this.beginBatchUpdate();
+    try {
+      if (widget.currentArea) {
+        this.notifyListeners("onWidgetAdded", widget.id, widget.currentArea,
+                             widget.currentPosition);
+      } else if (widgetMightNeedAutoAdding) {
+        let autoAdd = true;
         try {
-          gSeenWidgets.add(widget.id);
+          autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd);
+        } catch (e) {}
 
+        // If the widget doesn't have an existing placement, and it hasn't been
+        // seen before, then add it to its default area so it can be used.
+        // If the widget is not removable, we *have* to add it to its default
+        // area here.
+        let canBeAutoAdded = autoAdd && !gSeenWidgets.has(widget.id);
+        if (!widget.currentArea && (!widget.removable || canBeAutoAdded)) {
           if (widget.defaultArea) {
             if (this.isAreaLazy(widget.defaultArea)) {
               gFuturePlacements.get(widget.defaultArea).add(widget.id);
@@ -2082,10 +2080,13 @@
               this.addWidgetToArea(widget.id, widget.defaultArea);
             }
           }
-        } finally {
-          this.endBatchUpdate(true);
         }
       }
+    } finally {
+      // Ensure we always have this widget in gSeenWidgets, and save
+      // state in case this needs to be done here.
+      gSeenWidgets.add(widget.id);
+      this.endBatchUpdate(true);
     }
 
     this.notifyListeners("onWidgetAfterCreation", widget.id, widget.currentArea);
@@ -2119,7 +2120,7 @@
   normalizeWidget: function(aData, aSource) {
     let widget = {
       implementation: aData,
-      source: aSource || "addon",
+      source: aSource || CustomizableUI.SOURCE_EXTERNAL,
       instances: new Map(),
       currentArea: null,
       removable: true,
@@ -2323,6 +2324,15 @@
     // was reset above.
     this._rebuildRegisteredAreas();
 
+    for (let [widgetId, widget] of gPalette) {
+      if (widget.source == CustomizableUI.SOURCE_EXTERNAL) {
+        gSeenWidgets.add(widgetId);
+      }
+    }
+    if (gSeenWidgets.size) {
+      gDirty = true;
+    }
+
     gResetting = false;
   },
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/CustomizableWidgets.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/CustomizableWidgets.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/CustomizableWidgets.jsm	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/CustomizableWidgets.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -308,7 +308,7 @@
                 aEvent.target.ownerDocument &&
                 aEvent.target.ownerDocument.defaultView;
       if (win && typeof win.saveDocument == "function") {
-        win.saveDocument(win.content.document);
+        win.saveDocument(win.gBrowser.selectedBrowser.contentDocumentAsCPOW);
       }
     }
   }, {
@@ -399,8 +399,6 @@
     }
   }, {
     id: "social-share-button",
-    tooltiptext: "social-share-button.label",
-    label: "social-share-button.tooltiptext",
     // custom build our button so we can attach to the share command
     type: "custom",
     onBuild: function(aDocument) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/CustomizeMode.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/CustomizeMode.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/CustomizeMode.jsm	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/CustomizeMode.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -1545,19 +1545,19 @@
       button.setAttribute("hidden", "true");
     }
   },
-  toggleDevEditionTheme: function() {
+
+  toggleDevEditionTheme: function(shouldEnable) {
     const DEFAULT_THEME_ID = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
-    let button = this.document.getElementById("customization-devedition-theme-button");
-    let shouldEnable = button.hasAttribute("checked");
 
     Services.prefs.setBoolPref(kDeveditionThemePref, shouldEnable);
+
     let currentLWT = LightweightThemeManager.currentTheme;
     if (currentLWT && shouldEnable) {
       this._lastLightweightTheme = currentLWT;
       AddonManager.getAddonByID(DEFAULT_THEME_ID, function(aDefaultTheme) {
         // Theoretically, this could race if people are /very/ quick in switching
         // something else here, so doublecheck:
-        if (button.hasAttribute("checked")) {
+        if (Services.prefs.getBoolPref(kDeveditionThemePref)) {
           aDefaultTheme.userDisabled = false;
         }
       });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,30 @@
+"use strict";
+
+const BUTTONID = "test-seenwidget-post-reset";
+
+add_task(function*() {
+  let widget = CustomizableUI.createWidget({
+    id: BUTTONID,
+    label: "Test widget seen post reset",
+    defaultArea: CustomizableUI.AREA_NAVBAR
+  });
+
+  let bsPass = Cu.import("resource:///modules/CustomizableUI.jsm", {});
+  ok(bsPass.gSeenWidgets.has(BUTTONID), "Widget should be seen after createWidget is called.");
+  CustomizableUI.reset();
+  ok(bsPass.gSeenWidgets.has(BUTTONID), "Widget should still be seen after reset.");
+  ok(!Services.prefs.prefHasUserValue(bsPass.kPrefCustomizationState), "Pref shouldn't be set right now, because that'd break undo.");
+  CustomizableUI.addWidgetToArea(BUTTONID, CustomizableUI.AREA_NAVBAR);
+  gCustomizeMode.removeFromArea(document.getElementById(BUTTONID));
+  let hasUserValue = Services.prefs.prefHasUserValue(bsPass.kPrefCustomizationState);
+  ok(hasUserValue, "Pref should be set right now.");
+  if (hasUserValue) {
+    let seenArray = JSON.parse(Services.prefs.getCharPref(bsPass.kPrefCustomizationState)).seen;
+    isnot(seenArray.indexOf(BUTTONID), -1, "Widget should be in saved 'seen' list.");
+  }
+});
+
+registerCleanupFunction(function() {
+  CustomizableUI.destroyWidget(BUTTONID);
+  CustomizableUI.reset();
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/customizableui/test/browser.ini	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/customizableui/test/browser.ini	2014-11-26 21:45:48.000000000 +0000
@@ -130,6 +130,7 @@
 skip-if = e10s # bug 1090635
 [browser_981305_separator_insertion.js]
 [browser_988072_sidebar_events.js]
+skip-if = e10s # bug 1101482 - fails in --run-by-dir
 [browser_989338_saved_placements_not_resaved.js]
 [browser_989751_subviewbutton_class.js]
 [browser_987177_destroyWidget_xul.js]
@@ -154,3 +155,4 @@
 [browser_bootstrapped_custom_toolbar.js]
 [browser_panel_toggle.js]
 [browser_1089591_still_customizable_after_reset.js]
+[browser_1096763_seen_widgets_post_reset.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/downloads/DownloadsCommon.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/downloads/DownloadsCommon.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/downloads/DownloadsCommon.jsm	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/downloads/DownloadsCommon.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -413,13 +413,12 @@
     if (shouldApplySmoothing) {
       // Apply hysteresis to favor downward over upward swings.  Trust only 30%
       // of the new value if lower, and 10% if higher (exponential smoothing).
-      let (diff = aSeconds - aLastSeconds) {
-        aSeconds = aLastSeconds + (diff < 0 ? .3 : .1) * diff;
-      }
+      let diff = aSeconds - aLastSeconds;
+      aSeconds = aLastSeconds + (diff < 0 ? .3 : .1) * diff;
 
       // If the new time is similar, reuse something close to the last time
       // left, but subtract a little to provide forward progress.
-      let diff = aSeconds - aLastSeconds;
+      diff = aSeconds - aLastSeconds;
       let diffPercent = diff / aLastSeconds * 100;
       if (Math.abs(diff) < 5 || Math.abs(diffPercent) < 5) {
         aSeconds = aLastSeconds - (diff < 0 ? .4 : .2);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/conversation.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/conversation.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/conversation.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/conversation.html	2014-11-26 21:45:48.000000000 +0000
@@ -34,9 +34,12 @@
     <script type="text/javascript" src="loop/shared/js/validate.js"></script>
     <script type="text/javascript" src="loop/shared/js/dispatcher.js"></script>
     <script type="text/javascript" src="loop/shared/js/otSdkDriver.js"></script>
-    <script type="text/javascript" src="loop/shared/js/conversationStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/store.js"></script>
     <script type="text/javascript" src="loop/shared/js/roomStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/conversationStore.js"></script>
     <script type="text/javascript" src="loop/shared/js/activeRoomStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/feedbackStore.js"></script>
+    <script type="text/javascript" src="loop/shared/js/feedbackViews.js"></script>
     <script type="text/javascript" src="loop/js/conversationViews.js"></script>
     <script type="text/javascript" src="loop/shared/js/websocket.js"></script>
     <script type="text/javascript" src="loop/js/conversationAppStore.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/client.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/client.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/client.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/client.js	2014-11-26 21:45:48.000000000 +0000
@@ -82,40 +82,29 @@
     },
 
     /**
-     * Ensures the client is registered with the push server.
-     *
-     * Callback parameters:
-     * - err null on successful registration, non-null otherwise.
-     *
-     * @param {LOOP_SESSION_TYPE} sessionType Guest or FxA
-     * @param {Function} cb Callback(err)
-     */
-    _ensureRegistered: function(sessionType, cb) {
-      this.mozLoop.ensureRegistered(sessionType, function(error) {
-        if (error) {
-          console.log("Error registering with Loop server, code: " + error);
-          cb(error);
-          return;
-        } else {
-          cb(null);
-        }
-      });
-    },
-
-    /**
-     * Internal handler for requesting a call url from the server.
+     * Requests a call URL from the Loop server. It will note the
+     * expiry time for the url with the mozLoop api.  It will select the
+     * appropriate hawk session to use based on whether or not the user
+     * is currently logged into a Firefox account profile.
      *
      * Callback parameters:
-     * - err null on successful registration, non-null otherwise.
+     * - err null on successful request, non-null otherwise.
      * - callUrlData an object of the obtained call url data if successful:
      * -- callUrl: The url of the call
      * -- expiresAt: The amount of hours until expiry of the url
      *
-     * @param {LOOP_SESSION_TYPE} sessionType
+     * @param  {String} simplepushUrl a registered Simple Push URL
      * @param  {string} nickname the nickname of the future caller
      * @param  {Function} cb Callback(err, callUrlData)
      */
-    _requestCallUrlInternal: function(sessionType, nickname, cb) {
+    requestCallUrl: function(nickname, cb) {
+      var sessionType;
+      if (this.mozLoop.userProfile) {
+        sessionType = this.mozLoop.LOOP_SESSION_TYPE.FXA;
+      } else {
+        sessionType = this.mozLoop.LOOP_SESSION_TYPE.GUEST;
+      }
+
       this.mozLoop.hawkRequest(sessionType, "/call-url/", "POST",
                                {callerId: nickname},
         function (error, responseText) {
@@ -154,17 +143,6 @@
      *                      it does not make sense to display an error.
      **/
     deleteCallUrl: function(token, sessionType, cb) {
-      this._ensureRegistered(sessionType, function(err) {
-        if (err) {
-          cb(err);
-          return;
-        }
-
-        this._deleteCallUrlInternal(token, sessionType, cb);
-      }.bind(this));
-    },
-
-    _deleteCallUrlInternal: function(token, sessionType, cb) {
       function deleteRequestCallback(error, responseText) {
         if (error) {
           this._failureHandler(cb, error);
@@ -185,40 +163,6 @@
     },
 
     /**
-     * Requests a call URL from the Loop server. It will note the
-     * expiry time for the url with the mozLoop api.  It will select the
-     * appropriate hawk session to use based on whether or not the user
-     * is currently logged into a Firefox account profile.
-     *
-     * Callback parameters:
-     * - err null on successful registration, non-null otherwise.
-     * - callUrlData an object of the obtained call url data if successful:
-     * -- callUrl: The url of the call
-     * -- expiresAt: The amount of hours until expiry of the url
-     *
-     * @param  {String} simplepushUrl a registered Simple Push URL
-     * @param  {string} nickname the nickname of the future caller
-     * @param  {Function} cb Callback(err, callUrlData)
-     */
-    requestCallUrl: function(nickname, cb) {
-      var sessionType;
-      if (this.mozLoop.userProfile) {
-        sessionType = this.mozLoop.LOOP_SESSION_TYPE.FXA;
-      } else {
-        sessionType = this.mozLoop.LOOP_SESSION_TYPE.GUEST;
-      }
-
-      this._ensureRegistered(sessionType, function(err) {
-        if (err) {
-          cb(err);
-          return;
-        }
-
-        this._requestCallUrlInternal(sessionType, nickname, cb);
-      }.bind(this));
-    },
-
-    /**
      * Sets up an outgoing call, getting the relevant data from the server.
      *
      * Callback parameters:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/contacts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/contacts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/contacts.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/contacts.js	2014-11-26 21:45:48.000000000 +0000
@@ -52,36 +52,33 @@
    *  for the contact. Both fields are optional.
    * @param   {object} contact
    *          The contact object to get the field from.
-   * @param   {object} data
-   *          An object that has a 'field' property. If the 'optional' field
-   *          is defined and true, then the field will only be set if the
-   *          'value' is not empty or if the previous value was defined.
+   * @param   {string} field
+   *          The field within the contact to set.
+   * @param   {string} value
+   *          The value that the field should be set to.
    */
-  let setPreferred = function(contact, data) {
-    if (data.optional) {
-      // Don't clear the field if it doesn't exist.
-      if (!data.value &&
-          (!contact[data.field] || !contact[data.field].length)) {
-        return;
-      }
+  let setPreferred = function(contact, field, value) {
+    // Don't clear the field if it doesn't exist.
+    if (!value && (!contact[field] || !contact[field].length)) {
+      return;
     }
 
-    if (!contact[data.field]) {
-      contact[data.field] = [];
+    if (!contact[field]) {
+      contact[field] = [];
     }
 
-    if (!contact[data.field].length) {
-      contact[data.field][0] = {"value": data.value};
+    if (!contact[field].length) {
+      contact[field][0] = {"value": value};
       return;
     }
     // Set the value in the preferred tuple and return.
-    for (let i in contact[data.field]) {
-      if (contact[data.field][i].pref) {
-        contact[data.field][i].value = data.value;
+    for (let i in contact[field]) {
+      if (contact[field][i].pref) {
+        contact[field][i].value = value;
         return;
       }
     }
-    contact[data.field][0].value = data.value;
+    contact[field][0].value = value;
   };
 
   const ContactDropdown = React.createClass({displayName: 'ContactDropdown',
@@ -563,8 +560,11 @@
         pristine: false,
       });
 
+      let emailInput = this.refs.email.getDOMNode();
+      let telInput = this.refs.tel.getDOMNode();
       if (!this.refs.name.getDOMNode().checkValidity() ||
-          !this.refs.email.getDOMNode().checkValidity()) {
+          ((emailInput.required || emailInput.value) && !emailInput.checkValidity()) ||
+          ((telInput.required || telInput.value) && !telInput.checkValidity())) {
         return;
       }
 
@@ -575,10 +575,8 @@
       switch (this.props.mode) {
         case "edit":
           this.state.contact.name[0] = this.state.name.trim();
-          setPreferred(this.state.contact,
-                       {field: "email", value: this.state.email.trim()});
-          setPreferred(this.state.contact,
-                       {field: "tel", value: this.state.tel.trim(), optional: true});
+          setPreferred(this.state.contact, "email", this.state.email.trim());
+          setPreferred(this.state.contact, "tel", this.state.tel.trim());
           contactsAPI.update(this.state.contact, err => {
             if (err) {
               throw err;
@@ -622,7 +620,8 @@
 
     render: function() {
       let cx = React.addons.classSet;
-      // XXX do we need the ref="" attributes below?
+      let phoneOrEmailRequired = !this.state.email && !this.state.tel;
+
       return (
         React.DOM.div({className: "content-area contact-form"}, 
           React.DOM.header(null, this.props.mode == "add"
@@ -633,11 +632,11 @@
                  className: cx({pristine: this.state.pristine}), 
                  valueLink: this.linkState("name")}), 
           React.DOM.label(null, mozL10n.get("edit_contact_email_label")), 
-          React.DOM.input({ref: "email", required: true, type: "email", 
+          React.DOM.input({ref: "email", type: "email", required: phoneOrEmailRequired, 
                  className: cx({pristine: this.state.pristine}), 
                  valueLink: this.linkState("email")}), 
           React.DOM.label(null, mozL10n.get("new_contact_phone_placeholder")), 
-          React.DOM.input({ref: "tel", type: "tel", 
+          React.DOM.input({ref: "tel", type: "tel", required: phoneOrEmailRequired, 
                  className: cx({pristine: this.state.pristine}), 
                  valueLink: this.linkState("tel")}), 
           ButtonGroup(null, 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/contacts.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/contacts.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/contacts.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/contacts.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -52,36 +52,33 @@
    *  for the contact. Both fields are optional.
    * @param   {object} contact
    *          The contact object to get the field from.
-   * @param   {object} data
-   *          An object that has a 'field' property. If the 'optional' field
-   *          is defined and true, then the field will only be set if the
-   *          'value' is not empty or if the previous value was defined.
+   * @param   {string} field
+   *          The field within the contact to set.
+   * @param   {string} value
+   *          The value that the field should be set to.
    */
-  let setPreferred = function(contact, data) {
-    if (data.optional) {
-      // Don't clear the field if it doesn't exist.
-      if (!data.value &&
-          (!contact[data.field] || !contact[data.field].length)) {
-        return;
-      }
+  let setPreferred = function(contact, field, value) {
+    // Don't clear the field if it doesn't exist.
+    if (!value && (!contact[field] || !contact[field].length)) {
+      return;
     }
 
-    if (!contact[data.field]) {
-      contact[data.field] = [];
+    if (!contact[field]) {
+      contact[field] = [];
     }
 
-    if (!contact[data.field].length) {
-      contact[data.field][0] = {"value": data.value};
+    if (!contact[field].length) {
+      contact[field][0] = {"value": value};
       return;
     }
     // Set the value in the preferred tuple and return.
-    for (let i in contact[data.field]) {
-      if (contact[data.field][i].pref) {
-        contact[data.field][i].value = data.value;
+    for (let i in contact[field]) {
+      if (contact[field][i].pref) {
+        contact[field][i].value = value;
         return;
       }
     }
-    contact[data.field][0].value = data.value;
+    contact[field][0].value = value;
   };
 
   const ContactDropdown = React.createClass({
@@ -563,8 +560,11 @@
         pristine: false,
       });
 
+      let emailInput = this.refs.email.getDOMNode();
+      let telInput = this.refs.tel.getDOMNode();
       if (!this.refs.name.getDOMNode().checkValidity() ||
-          !this.refs.email.getDOMNode().checkValidity()) {
+          ((emailInput.required || emailInput.value) && !emailInput.checkValidity()) ||
+          ((telInput.required || telInput.value) && !telInput.checkValidity())) {
         return;
       }
 
@@ -575,10 +575,8 @@
       switch (this.props.mode) {
         case "edit":
           this.state.contact.name[0] = this.state.name.trim();
-          setPreferred(this.state.contact,
-                       {field: "email", value: this.state.email.trim()});
-          setPreferred(this.state.contact,
-                       {field: "tel", value: this.state.tel.trim(), optional: true});
+          setPreferred(this.state.contact, "email", this.state.email.trim());
+          setPreferred(this.state.contact, "tel", this.state.tel.trim());
           contactsAPI.update(this.state.contact, err => {
             if (err) {
               throw err;
@@ -622,7 +620,8 @@
 
     render: function() {
       let cx = React.addons.classSet;
-      // XXX do we need the ref="" attributes below?
+      let phoneOrEmailRequired = !this.state.email && !this.state.tel;
+
       return (
         <div className="content-area contact-form">
           <header>{this.props.mode == "add"
@@ -633,11 +632,11 @@
                  className={cx({pristine: this.state.pristine})}
                  valueLink={this.linkState("name")} />
           <label>{mozL10n.get("edit_contact_email_label")}</label>
-          <input ref="email" required type="email"
+          <input ref="email" type="email" required={phoneOrEmailRequired}
                  className={cx({pristine: this.state.pristine})}
                  valueLink={this.linkState("email")} />
           <label>{mozL10n.get("new_contact_phone_placeholder")}</label>
-          <input ref="tel" type="tel"
+          <input ref="tel" type="tel" required={phoneOrEmailRequired}
                  className={cx({pristine: this.state.pristine})}
                  valueLink={this.linkState("tel")} />
           <ButtonGroup>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversation.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversation.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversation.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversation.js	2014-11-26 21:45:48.000000000 +0000
@@ -20,6 +20,9 @@
   var CallIdentifierView = loop.conversationViews.CallIdentifierView;
   var DesktopRoomConversationView = loop.roomViews.DesktopRoomConversationView;
 
+  // Matches strings of the form "<nonspaces>@<nonspaces>" or "+<digits>"
+  var EMAIL_OR_PHONE_RE = /^(:?\S+@\S+|\+\d+)$/;
+
   var IncomingCallView = React.createClass({displayName: 'IncomingCallView',
     mixins: [sharedMixins.DropdownMenuMixin, sharedMixins.AudioMixin],
 
@@ -220,13 +223,17 @@
    * At the moment, it does more than that, these parts need refactoring out.
    */
   var IncomingConversationView = React.createClass({displayName: 'IncomingConversationView',
+    mixins: [sharedMixins.AudioMixin],
+
     propTypes: {
       client: React.PropTypes.instanceOf(loop.Client).isRequired,
       conversation: React.PropTypes.instanceOf(sharedModels.ConversationModel)
                          .isRequired,
       sdk: React.PropTypes.object.isRequired,
       conversationAppStore: React.PropTypes.instanceOf(
-        loop.store.ConversationAppStore).isRequired
+        loop.store.ConversationAppStore).isRequired,
+      feedbackStore:
+        React.PropTypes.instanceOf(loop.store.FeedbackStore).isRequired
     },
 
     getInitialState: function() {
@@ -298,21 +305,11 @@
 
           document.title = mozL10n.get("conversation_has_ended");
 
-          var feebackAPIBaseUrl = navigator.mozLoop.getLoopCharPref(
-            "feedback.baseUrl");
-
-          var appVersionInfo = navigator.mozLoop.appVersionInfo;
-
-          var feedbackClient = new loop.FeedbackAPIClient(feebackAPIBaseUrl, {
-            product: navigator.mozLoop.getLoopCharPref("feedback.product"),
-            platform: appVersionInfo.OS,
-            channel: appVersionInfo.channel,
-            version: appVersionInfo.version
-          });
+          this.play("terminated");
 
           return (
             sharedViews.FeedbackView({
-              feedbackApiClient: feedbackClient, 
+              feedbackStore: this.props.feedbackStore, 
               onAfterFeedbackReceived: this.closeWindow.bind(this)}
             )
           );
@@ -505,14 +502,27 @@
     declineAndBlock: function() {
       navigator.mozLoop.stopAlerting();
       var token = this.props.conversation.get("callToken");
-      this.props.client.deleteCallUrl(token,
-        this.props.conversation.get("sessionType"),
-        function(error) {
+      var callerId = this.props.conversation.get("callerId");
+
+      // If this is a direct call, we'll need to block the caller directly.
+      if (callerId && EMAIL_OR_PHONE_RE.test(callerId)) {
+        navigator.mozLoop.calls.blockDirectCaller(callerId, function(err) {
           // XXX The conversation window will be closed when this cb is triggered
           // figure out if there is a better way to report the error to the user
-          // (bug 1048909).
-          console.log(error);
+          // (bug 1103150).
+          console.log(err.fileName + ":" + err.lineNumber + ": " + err.message);
         });
+      } else {
+        this.props.client.deleteCallUrl(token,
+          this.props.conversation.get("sessionType"),
+          function(error) {
+            // XXX The conversation window will be closed when this cb is triggered
+            // figure out if there is a better way to report the error to the user
+            // (bug 1048909).
+            console.log(error);
+          });
+      }
+
       this._declineCall();
     },
 
@@ -546,7 +556,9 @@
       conversationStore: React.PropTypes.instanceOf(loop.store.ConversationStore)
                               .isRequired,
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
-      roomStore: React.PropTypes.instanceOf(loop.store.RoomStore)
+      roomStore: React.PropTypes.instanceOf(loop.store.RoomStore),
+      feedbackStore:
+        React.PropTypes.instanceOf(loop.store.FeedbackStore).isRequired
     },
 
     getInitialState: function() {
@@ -574,26 +586,26 @@
             client: this.props.client, 
             conversation: this.props.conversation, 
             sdk: this.props.sdk, 
-            conversationAppStore: this.props.conversationAppStore}
+            conversationAppStore: this.props.conversationAppStore, 
+            feedbackStore: this.props.feedbackStore}
           ));
         }
         case "outgoing": {
           return (OutgoingConversationView({
             store: this.props.conversationStore, 
-            dispatcher: this.props.dispatcher}
+            dispatcher: this.props.dispatcher, 
+            feedbackStore: this.props.feedbackStore}
           ));
         }
         case "room": {
           return (DesktopRoomConversationView({
             dispatcher: this.props.dispatcher, 
             roomStore: this.props.roomStore, 
-            dispatcher: this.props.dispatcher}
+            feedbackStore: this.props.feedbackStore}
           ));
         }
         case "failed": {
-          return (GenericFailureView({
-            cancelCall: this.closeWindow}
-          ));
+          return GenericFailureView({cancelCall: this.closeWindow});
         }
         default: {
           // If we don't have a windowType, we don't know what we are yet,
@@ -616,10 +628,10 @@
     // don't work in the conversation window
     window.OT.overrideGuidStorage({
       get: function(callback) {
-        callback(null, navigator.mozLoop.getLoopCharPref("ot.guid"));
+        callback(null, navigator.mozLoop.getLoopPref("ot.guid"));
       },
       set: function(guid, callback) {
-        navigator.mozLoop.setLoopCharPref("ot.guid", guid);
+        navigator.mozLoop.setLoopPref("ot.guid", guid);
         callback(null);
       }
     });
@@ -630,6 +642,14 @@
       dispatcher: dispatcher,
       sdk: OT
     });
+    var appVersionInfo = navigator.mozLoop.appVersionInfo;
+    var feedbackClient = new loop.FeedbackAPIClient(
+      navigator.mozLoop.getLoopPref("feedback.baseUrl"), {
+      product: navigator.mozLoop.getLoopPref("feedback.product"),
+      platform: appVersionInfo.OS,
+      channel: appVersionInfo.channel,
+      version: appVersionInfo.version
+    });
 
     // Create the stores.
     var conversationAppStore = new loop.store.ConversationAppStore({
@@ -641,16 +661,17 @@
       dispatcher: dispatcher,
       sdkDriver: sdkDriver
     });
-    var activeRoomStore = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: navigator.mozLoop,
       sdkDriver: sdkDriver
     });
-    var roomStore = new loop.store.RoomStore({
-      dispatcher: dispatcher,
+    var roomStore = new loop.store.RoomStore(dispatcher, {
       mozLoop: navigator.mozLoop,
       activeRoomStore: activeRoomStore
     });
+    var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: feedbackClient
+    });
 
     // XXX Old class creation for the incoming conversation view, whilst
     // we transition across (bug 1072323).
@@ -683,6 +704,7 @@
     React.renderComponent(AppControllerView({
       conversationAppStore: conversationAppStore, 
       roomStore: roomStore, 
+      feedbackStore: feedbackStore, 
       conversationStore: conversationStore, 
       client: client, 
       conversation: conversation, 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversation.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversation.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversation.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversation.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -20,6 +20,9 @@
   var CallIdentifierView = loop.conversationViews.CallIdentifierView;
   var DesktopRoomConversationView = loop.roomViews.DesktopRoomConversationView;
 
+  // Matches strings of the form "<nonspaces>@<nonspaces>" or "+<digits>"
+  var EMAIL_OR_PHONE_RE = /^(:?\S+@\S+|\+\d+)$/;
+
   var IncomingCallView = React.createClass({
     mixins: [sharedMixins.DropdownMenuMixin, sharedMixins.AudioMixin],
 
@@ -220,13 +223,17 @@
    * At the moment, it does more than that, these parts need refactoring out.
    */
   var IncomingConversationView = React.createClass({
+    mixins: [sharedMixins.AudioMixin],
+
     propTypes: {
       client: React.PropTypes.instanceOf(loop.Client).isRequired,
       conversation: React.PropTypes.instanceOf(sharedModels.ConversationModel)
                          .isRequired,
       sdk: React.PropTypes.object.isRequired,
       conversationAppStore: React.PropTypes.instanceOf(
-        loop.store.ConversationAppStore).isRequired
+        loop.store.ConversationAppStore).isRequired,
+      feedbackStore:
+        React.PropTypes.instanceOf(loop.store.FeedbackStore).isRequired
     },
 
     getInitialState: function() {
@@ -298,21 +305,11 @@
 
           document.title = mozL10n.get("conversation_has_ended");
 
-          var feebackAPIBaseUrl = navigator.mozLoop.getLoopCharPref(
-            "feedback.baseUrl");
-
-          var appVersionInfo = navigator.mozLoop.appVersionInfo;
-
-          var feedbackClient = new loop.FeedbackAPIClient(feebackAPIBaseUrl, {
-            product: navigator.mozLoop.getLoopCharPref("feedback.product"),
-            platform: appVersionInfo.OS,
-            channel: appVersionInfo.channel,
-            version: appVersionInfo.version
-          });
+          this.play("terminated");
 
           return (
             <sharedViews.FeedbackView
-              feedbackApiClient={feedbackClient}
+              feedbackStore={this.props.feedbackStore}
               onAfterFeedbackReceived={this.closeWindow.bind(this)}
             />
           );
@@ -505,14 +502,27 @@
     declineAndBlock: function() {
       navigator.mozLoop.stopAlerting();
       var token = this.props.conversation.get("callToken");
-      this.props.client.deleteCallUrl(token,
-        this.props.conversation.get("sessionType"),
-        function(error) {
+      var callerId = this.props.conversation.get("callerId");
+
+      // If this is a direct call, we'll need to block the caller directly.
+      if (callerId && EMAIL_OR_PHONE_RE.test(callerId)) {
+        navigator.mozLoop.calls.blockDirectCaller(callerId, function(err) {
           // XXX The conversation window will be closed when this cb is triggered
           // figure out if there is a better way to report the error to the user
-          // (bug 1048909).
-          console.log(error);
+          // (bug 1103150).
+          console.log(err.fileName + ":" + err.lineNumber + ": " + err.message);
         });
+      } else {
+        this.props.client.deleteCallUrl(token,
+          this.props.conversation.get("sessionType"),
+          function(error) {
+            // XXX The conversation window will be closed when this cb is triggered
+            // figure out if there is a better way to report the error to the user
+            // (bug 1048909).
+            console.log(error);
+          });
+      }
+
       this._declineCall();
     },
 
@@ -546,7 +556,9 @@
       conversationStore: React.PropTypes.instanceOf(loop.store.ConversationStore)
                               .isRequired,
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
-      roomStore: React.PropTypes.instanceOf(loop.store.RoomStore)
+      roomStore: React.PropTypes.instanceOf(loop.store.RoomStore),
+      feedbackStore:
+        React.PropTypes.instanceOf(loop.store.FeedbackStore).isRequired
     },
 
     getInitialState: function() {
@@ -575,25 +587,25 @@
             conversation={this.props.conversation}
             sdk={this.props.sdk}
             conversationAppStore={this.props.conversationAppStore}
+            feedbackStore={this.props.feedbackStore}
           />);
         }
         case "outgoing": {
           return (<OutgoingConversationView
             store={this.props.conversationStore}
             dispatcher={this.props.dispatcher}
+            feedbackStore={this.props.feedbackStore}
           />);
         }
         case "room": {
           return (<DesktopRoomConversationView
             dispatcher={this.props.dispatcher}
             roomStore={this.props.roomStore}
-            dispatcher={this.props.dispatcher}
+            feedbackStore={this.props.feedbackStore}
           />);
         }
         case "failed": {
-          return (<GenericFailureView
-            cancelCall={this.closeWindow}
-          />);
+          return <GenericFailureView cancelCall={this.closeWindow} />;
         }
         default: {
           // If we don't have a windowType, we don't know what we are yet,
@@ -616,10 +628,10 @@
     // don't work in the conversation window
     window.OT.overrideGuidStorage({
       get: function(callback) {
-        callback(null, navigator.mozLoop.getLoopCharPref("ot.guid"));
+        callback(null, navigator.mozLoop.getLoopPref("ot.guid"));
       },
       set: function(guid, callback) {
-        navigator.mozLoop.setLoopCharPref("ot.guid", guid);
+        navigator.mozLoop.setLoopPref("ot.guid", guid);
         callback(null);
       }
     });
@@ -630,6 +642,14 @@
       dispatcher: dispatcher,
       sdk: OT
     });
+    var appVersionInfo = navigator.mozLoop.appVersionInfo;
+    var feedbackClient = new loop.FeedbackAPIClient(
+      navigator.mozLoop.getLoopPref("feedback.baseUrl"), {
+      product: navigator.mozLoop.getLoopPref("feedback.product"),
+      platform: appVersionInfo.OS,
+      channel: appVersionInfo.channel,
+      version: appVersionInfo.version
+    });
 
     // Create the stores.
     var conversationAppStore = new loop.store.ConversationAppStore({
@@ -641,16 +661,17 @@
       dispatcher: dispatcher,
       sdkDriver: sdkDriver
     });
-    var activeRoomStore = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: navigator.mozLoop,
       sdkDriver: sdkDriver
     });
-    var roomStore = new loop.store.RoomStore({
-      dispatcher: dispatcher,
+    var roomStore = new loop.store.RoomStore(dispatcher, {
       mozLoop: navigator.mozLoop,
       activeRoomStore: activeRoomStore
     });
+    var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: feedbackClient
+    });
 
     // XXX Old class creation for the incoming conversation view, whilst
     // we transition across (bug 1072323).
@@ -683,6 +704,7 @@
     React.renderComponent(<AppControllerView
       conversationAppStore={conversationAppStore}
       roomStore={roomStore}
+      feedbackStore={feedbackStore}
       conversationStore={conversationStore}
       client={client}
       conversation={conversation}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversationViews.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversationViews.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversationViews.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversationViews.js	2014-11-26 21:45:48.000000000 +0000
@@ -356,7 +356,7 @@
           nameDisplayMode: "off",
           videoDisabledDisplayMode: "off"
         }
-      }
+      };
     },
 
     /**
@@ -428,10 +428,13 @@
    * the different views that need displaying.
    */
   var OutgoingConversationView = React.createClass({displayName: 'OutgoingConversationView',
+    mixins: [sharedMixins.AudioMixin],
+
     propTypes: {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       store: React.PropTypes.instanceOf(
-        loop.store.ConversationStore).isRequired
+        loop.store.ConversationStore).isRequired,
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore)
     },
 
     getInitialState: function() {
@@ -462,22 +465,9 @@
     _renderFeedbackView: function() {
       document.title = mozL10n.get("conversation_has_ended");
 
-      // XXX Bug 1076754 Feedback view should be redone in the Flux style.
-      var feebackAPIBaseUrl = navigator.mozLoop.getLoopCharPref(
-        "feedback.baseUrl");
-
-      var appVersionInfo = navigator.mozLoop.appVersionInfo;
-
-      var feedbackClient = new loop.FeedbackAPIClient(feebackAPIBaseUrl, {
-        product: navigator.mozLoop.getLoopCharPref("feedback.product"),
-        platform: appVersionInfo.OS,
-        channel: appVersionInfo.channel,
-        version: appVersionInfo.version
-      });
-
       return (
         sharedViews.FeedbackView({
-          feedbackApiClient: feedbackClient, 
+          feedbackStore: this.props.feedbackStore, 
           onAfterFeedbackReceived: this._closeWindow.bind(this)}
         )
       );
@@ -505,6 +495,7 @@
           );
         }
         case CALL_STATES.FINISHED: {
+          this.play("terminated");
           return this._renderFeedbackView();
         }
         case CALL_STATES.INIT: {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversationViews.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversationViews.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/conversationViews.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/conversationViews.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -356,7 +356,7 @@
           nameDisplayMode: "off",
           videoDisabledDisplayMode: "off"
         }
-      }
+      };
     },
 
     /**
@@ -428,10 +428,13 @@
    * the different views that need displaying.
    */
   var OutgoingConversationView = React.createClass({
+    mixins: [sharedMixins.AudioMixin],
+
     propTypes: {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
       store: React.PropTypes.instanceOf(
-        loop.store.ConversationStore).isRequired
+        loop.store.ConversationStore).isRequired,
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore)
     },
 
     getInitialState: function() {
@@ -462,22 +465,9 @@
     _renderFeedbackView: function() {
       document.title = mozL10n.get("conversation_has_ended");
 
-      // XXX Bug 1076754 Feedback view should be redone in the Flux style.
-      var feebackAPIBaseUrl = navigator.mozLoop.getLoopCharPref(
-        "feedback.baseUrl");
-
-      var appVersionInfo = navigator.mozLoop.appVersionInfo;
-
-      var feedbackClient = new loop.FeedbackAPIClient(feebackAPIBaseUrl, {
-        product: navigator.mozLoop.getLoopCharPref("feedback.product"),
-        platform: appVersionInfo.OS,
-        channel: appVersionInfo.channel,
-        version: appVersionInfo.version
-      });
-
       return (
         <sharedViews.FeedbackView
-          feedbackApiClient={feedbackClient}
+          feedbackStore={this.props.feedbackStore}
           onAfterFeedbackReceived={this._closeWindow.bind(this)}
         />
       );
@@ -505,6 +495,7 @@
           );
         }
         case CALL_STATES.FINISHED: {
+          this.play("terminated");
           return this._renderFeedbackView();
         }
         case CALL_STATES.INIT: {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/panel.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/panel.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/panel.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/panel.js	2014-11-26 21:45:48.000000000 +0000
@@ -20,7 +20,6 @@
   var ButtonGroup = sharedViews.ButtonGroup;
   var ContactsList = loop.contacts.ContactsList;
   var ContactDetailsForm = loop.contacts.ContactDetailsForm;
-  var __ = mozL10n.get; // aliasing translation function as __ for concision
 
   var TabView = React.createClass({displayName: 'TabView',
     propTypes: {
@@ -31,13 +30,19 @@
 
     getDefaultProps: function() {
       return {
-        buttonsHidden: false,
-        selectedTab: "call"
+        buttonsHidden: false
       };
     },
 
     getInitialState: function() {
-      return {selectedTab: this.props.selectedTab};
+      // XXX Work around props.selectedTab being undefined initially.
+      // When we don't need to rely on the pref, this can move back to
+      // getDefaultProps (bug 1100258).
+      return {
+        selectedTab: this.props.selectedTab ||
+          (navigator.mozLoop.getLoopPref("rooms.enabled") ?
+            "rooms" : "call")
+      };
     },
 
     handleSelectTab: function(event) {
@@ -132,8 +137,8 @@
         'hide': !this.state.showMenu
       });
       var availabilityText = this.state.doNotDisturb ?
-                              __("display_name_dnd_status") :
-                              __("display_name_available_status");
+                              mozL10n.get("display_name_dnd_status") :
+                              mozL10n.get("display_name_available_status");
 
       return (
         React.DOM.div({className: "dropdown"}, 
@@ -146,12 +151,12 @@
             React.DOM.li({onClick: this.changeAvailability("available"), 
                 className: "dropdown-menu-item dnd-make-available"}, 
               React.DOM.i({className: "status status-available"}), 
-              React.DOM.span(null, __("display_name_available_status"))
+              React.DOM.span(null, mozL10n.get("display_name_available_status"))
             ), 
             React.DOM.li({onClick: this.changeAvailability("do-not-disturb"), 
                 className: "dropdown-menu-item dnd-make-unavailable"}, 
               React.DOM.i({className: "status status-dnd"}), 
-              React.DOM.span(null, __("display_name_dnd_status"))
+              React.DOM.span(null, mozL10n.get("display_name_dnd_status"))
             )
           )
         )
@@ -159,30 +164,65 @@
     }
   });
 
+  var GettingStartedView = React.createClass({displayName: 'GettingStartedView',
+    handleButtonClick: function() {
+      navigator.mozLoop.openGettingStartedTour("getting-started");
+      navigator.mozLoop.setLoopPref("gettingStarted.seen", true);
+      var event = new CustomEvent("GettingStartedSeen");
+      window.dispatchEvent(event);
+    },
+
+    render: function() {
+      if (navigator.mozLoop.getLoopPref("gettingStarted.seen")) {
+        return null;
+      }
+      return (
+        React.DOM.div({id: "fte-getstarted"}, 
+          React.DOM.header({id: "fte-title"}, 
+            mozL10n.get("first_time_experience_title", {
+              "clientShortname": mozL10n.get("clientShortname2")
+            })
+          ), 
+          Button({htmlId: "fte-button", 
+                  onClick: this.handleButtonClick, 
+                  caption: mozL10n.get("first_time_experience_button_label")})
+        )
+      );
+    }
+  });
+
   var ToSView = React.createClass({displayName: 'ToSView',
     getInitialState: function() {
-      return {seenToS: navigator.mozLoop.getLoopCharPref('seenToS')};
+      return {seenToS: navigator.mozLoop.getLoopPref("seenToS")};
     },
 
     render: function() {
       if (this.state.seenToS == "unseen") {
-        var terms_of_use_url = navigator.mozLoop.getLoopCharPref('legal.ToS_url');
-        var privacy_notice_url = navigator.mozLoop.getLoopCharPref('legal.privacy_url');
-        var tosHTML = __("legal_text_and_links3", {
-          "clientShortname": __("clientShortname2"),
+        var locale = mozL10n.getLanguage();
+        var terms_of_use_url = navigator.mozLoop.getLoopPref('legal.ToS_url');
+        var privacy_notice_url = navigator.mozLoop.getLoopPref('legal.privacy_url');
+        var tosHTML = mozL10n.get("legal_text_and_links3", {
+          "clientShortname": mozL10n.get("clientShortname2"),
           "terms_of_use": React.renderComponentToStaticMarkup(
             React.DOM.a({href: terms_of_use_url, target: "_blank"}, 
-              __("legal_text_tos")
+              mozL10n.get("legal_text_tos")
             )
           ),
           "privacy_notice": React.renderComponentToStaticMarkup(
             React.DOM.a({href: privacy_notice_url, target: "_blank"}, 
-              __("legal_text_privacy")
+              mozL10n.get("legal_text_privacy")
             )
           ),
         });
-        return React.DOM.p({className: "terms-service", 
-                  dangerouslySetInnerHTML: {__html: tosHTML}});
+        return React.DOM.div(null, 
+          React.DOM.p({id: "powered-by"}, 
+            mozL10n.get("powered_by_beforeLogo"), 
+            React.DOM.img({id: "powered-by-logo", className: locale}), 
+            mozL10n.get("powered_by_afterLogo")
+          ), 
+          React.DOM.p({className: "terms-service", 
+             dangerouslySetInnerHTML: {__html: tosHTML}})
+         );
       } else {
         return React.DOM.div(null);
       }
@@ -241,10 +281,21 @@
       }
     },
 
+    handleHelpEntry: function(event) {
+      event.preventDefault();
+      var helloSupportUrl = navigator.mozLoop.getLoopPref('support_url');
+      window.open(helloSupportUrl);
+      window.close();
+    },
+
     _isSignedIn: function() {
       return !!navigator.mozLoop.userProfile;
     },
 
+    openGettingStartedTour: function() {
+      navigator.mozLoop.openGettingStartedTour("settings-menu");
+    },
+
     render: function() {
       var cx = React.addons.classSet;
 
@@ -256,23 +307,28 @@
       return (
         React.DOM.div({className: "settings-menu dropdown"}, 
           React.DOM.a({className: "button-settings", onClick: this.showDropdownMenu, 
-             title: __("settings_menu_button_tooltip")}), 
+             title: mozL10n.get("settings_menu_button_tooltip")}), 
           React.DOM.ul({className: cx({"dropdown-menu": true, hide: !this.state.showMenu}), 
               onMouseLeave: this.hideDropdownMenu}, 
-            SettingsDropdownEntry({label: __("settings_menu_item_settings"), 
+            SettingsDropdownEntry({label: mozL10n.get("settings_menu_item_settings"), 
                                    onClick: this.handleClickSettingsEntry, 
                                    displayed: false, 
                                    icon: "settings"}), 
-            SettingsDropdownEntry({label: __("settings_menu_item_account"), 
+            SettingsDropdownEntry({label: mozL10n.get("settings_menu_item_account"), 
                                    onClick: this.handleClickAccountEntry, 
                                    icon: "account", 
                                    displayed: this._isSignedIn()}), 
+            SettingsDropdownEntry({label: mozL10n.get("tour_label"), 
+                                   onClick: this.openGettingStartedTour}), 
             SettingsDropdownEntry({label: this._isSignedIn() ?
-                                          __("settings_menu_item_signout") :
-                                          __("settings_menu_item_signin"), 
+                                          mozL10n.get("settings_menu_item_signout") :
+                                          mozL10n.get("settings_menu_item_signin"), 
                                    onClick: this.handleClickAuthEntry, 
                                    displayed: navigator.mozLoop.fxAEnabled, 
-                                   icon: this._isSignedIn() ? "signout" : "signin"})
+                                   icon: this._isSignedIn() ? "signout" : "signin"}), 
+            SettingsDropdownEntry({label: mozL10n.get("help_label"), 
+                                   onClick: this.handleHelpEntry, 
+                                   icon: "help"})
           )
         )
       );
@@ -401,7 +457,7 @@
       var cx = React.addons.classSet;
       return (
         React.DOM.div({className: "generate-url"}, 
-          React.DOM.header(null, __("share_link_header_text")), 
+          React.DOM.header({id: "share-link-header"}, mozL10n.get("share_link_header_text")), 
           React.DOM.div({className: "generate-url-stack"}, 
             React.DOM.input({type: "url", value: this.state.callUrl, readOnly: "true", 
                    onCopy: this.handleLinkExfiltration, 
@@ -445,7 +501,7 @@
       return (
         React.DOM.p({className: "signin-link"}, 
           React.DOM.a({href: "#", onClick: this.handleSignUpLinkClick}, 
-            __("panel_footer_signin_or_signup_link")
+            mozL10n.get("panel_footer_signin_or_signup_link")
           )
         )
       );
@@ -647,6 +703,7 @@
     getInitialState: function() {
       return {
         userProfile: this.props.userProfile || navigator.mozLoop.userProfile,
+        gettingStartedSeen: navigator.mozLoop.getLoopPref("gettingStarted.seen"),
       };
     },
 
@@ -678,31 +735,52 @@
       }
     },
 
+    _roomsEnabled: function() {
+      return navigator.mozLoop.getLoopPref("rooms.enabled");
+    },
+
     _onStatusChanged: function() {
       var profile = navigator.mozLoop.userProfile;
       var currUid = this.state.userProfile ? this.state.userProfile.uid : null;
       var newUid = profile ? profile.uid : null;
       if (currUid != newUid) {
         // On profile change (login, logout), switch back to the default tab.
-        this.selectTab("call");
+        this.selectTab(this._roomsEnabled() ? "rooms" : "call");
         this.setState({userProfile: profile});
       }
       this.updateServiceErrors();
     },
 
+    _gettingStartedSeen: function() {
+      this.setState({
+        gettingStartedSeen: navigator.mozLoop.getLoopPref("gettingStarted.seen"),
+      });
+    },
+
     /**
      * The rooms feature is hidden by default for now. Once it gets mainstream,
-     * this method can be safely removed.
+     * this method can be simplified.
      */
-    _renderRoomsTab: function() {
-      if (!navigator.mozLoop.getLoopBoolPref("rooms.enabled")) {
-        return null;
+    _renderRoomsOrCallTab: function() {
+      if (!this._roomsEnabled()) {
+        return (
+          Tab({name: "call"}, 
+            React.DOM.div({className: "content-area"}, 
+              CallUrlResult({client: this.props.client, 
+                             notifications: this.props.notifications, 
+                             callUrl: this.props.callUrl}), 
+              ToSView(null)
+            )
+          )
+        );
       }
+
       return (
         Tab({name: "rooms"}, 
           RoomList({dispatcher: this.props.dispatcher, 
                     store: this.props.roomStore, 
-                    userDisplayName: this._getUserDisplayName()})
+                    userDisplayName: this._getUserDisplayName()}), 
+          ToSView(null)
         )
       );
     },
@@ -722,34 +800,40 @@
 
     componentDidMount: function() {
       window.addEventListener("LoopStatusChanged", this._onStatusChanged);
+      window.addEventListener("GettingStartedSeen", this._gettingStartedSeen);
     },
 
     componentWillUnmount: function() {
       window.removeEventListener("LoopStatusChanged", this._onStatusChanged);
+      window.removeEventListener("GettingStartedSeen", this._gettingStartedSeen);
     },
 
     _getUserDisplayName: function() {
       return this.state.userProfile && this.state.userProfile.email ||
-             __("display_name_guest");
+             mozL10n.get("display_name_guest");
     },
 
     render: function() {
       var NotificationListView = sharedViews.NotificationListView;
+
+      if (!this.state.gettingStartedSeen) {
+        return (
+          React.DOM.div(null, 
+            NotificationListView({notifications: this.props.notifications, 
+                                  clearOnDocumentHidden: true}), 
+            GettingStartedView(null), 
+            ToSView(null)
+          )
+        );
+      }
+
       return (
         React.DOM.div(null, 
           NotificationListView({notifications: this.props.notifications, 
                                 clearOnDocumentHidden: true}), 
           TabView({ref: "tabView", selectedTab: this.props.selectedTab, 
             buttonsHidden: !this.state.userProfile && !this.props.showTabButtons}, 
-            Tab({name: "call"}, 
-              React.DOM.div({className: "content-area"}, 
-                CallUrlResult({client: this.props.client, 
-                               notifications: this.props.notifications, 
-                               callUrl: this.props.callUrl}), 
-                ToSView(null)
-              )
-            ), 
-            this._renderRoomsTab(), 
+            this._renderRoomsOrCallTab(), 
             Tab({name: "contacts"}, 
               ContactsList({selectTab: this.selectTab, 
                             startForm: this.startForm})
@@ -794,9 +878,8 @@
     var client = new loop.Client();
     var notifications = new sharedModels.NotificationCollection();
     var dispatcher = new loop.Dispatcher();
-    var roomStore = new loop.store.RoomStore({
-      mozLoop: navigator.mozLoop,
-      dispatcher: dispatcher
+    var roomStore = new loop.store.RoomStore(dispatcher, {
+      mozLoop: navigator.mozLoop
     });
 
     React.renderComponent(PanelView({
@@ -816,15 +899,16 @@
 
   return {
     init: init,
-    UserIdentity: UserIdentity,
     AuthLink: AuthLink,
     AvailabilityDropdown: AvailabilityDropdown,
     CallUrlResult: CallUrlResult,
+    GettingStartedView: GettingStartedView,
     PanelView: PanelView,
     RoomEntry: RoomEntry,
     RoomList: RoomList,
     SettingsDropdown: SettingsDropdown,
-    ToSView: ToSView
+    ToSView: ToSView,
+    UserIdentity: UserIdentity,
   };
 })(_, document.mozL10n);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/panel.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/panel.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/panel.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/panel.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -20,7 +20,6 @@
   var ButtonGroup = sharedViews.ButtonGroup;
   var ContactsList = loop.contacts.ContactsList;
   var ContactDetailsForm = loop.contacts.ContactDetailsForm;
-  var __ = mozL10n.get; // aliasing translation function as __ for concision
 
   var TabView = React.createClass({
     propTypes: {
@@ -31,13 +30,19 @@
 
     getDefaultProps: function() {
       return {
-        buttonsHidden: false,
-        selectedTab: "call"
+        buttonsHidden: false
       };
     },
 
     getInitialState: function() {
-      return {selectedTab: this.props.selectedTab};
+      // XXX Work around props.selectedTab being undefined initially.
+      // When we don't need to rely on the pref, this can move back to
+      // getDefaultProps (bug 1100258).
+      return {
+        selectedTab: this.props.selectedTab ||
+          (navigator.mozLoop.getLoopPref("rooms.enabled") ?
+            "rooms" : "call")
+      };
     },
 
     handleSelectTab: function(event) {
@@ -132,8 +137,8 @@
         'hide': !this.state.showMenu
       });
       var availabilityText = this.state.doNotDisturb ?
-                              __("display_name_dnd_status") :
-                              __("display_name_available_status");
+                              mozL10n.get("display_name_dnd_status") :
+                              mozL10n.get("display_name_available_status");
 
       return (
         <div className="dropdown">
@@ -146,12 +151,12 @@
             <li onClick={this.changeAvailability("available")}
                 className="dropdown-menu-item dnd-make-available">
               <i className="status status-available"></i>
-              <span>{__("display_name_available_status")}</span>
+              <span>{mozL10n.get("display_name_available_status")}</span>
             </li>
             <li onClick={this.changeAvailability("do-not-disturb")}
                 className="dropdown-menu-item dnd-make-unavailable">
               <i className="status status-dnd"></i>
-              <span>{__("display_name_dnd_status")}</span>
+              <span>{mozL10n.get("display_name_dnd_status")}</span>
             </li>
           </ul>
         </div>
@@ -159,30 +164,65 @@
     }
   });
 
+  var GettingStartedView = React.createClass({
+    handleButtonClick: function() {
+      navigator.mozLoop.openGettingStartedTour("getting-started");
+      navigator.mozLoop.setLoopPref("gettingStarted.seen", true);
+      var event = new CustomEvent("GettingStartedSeen");
+      window.dispatchEvent(event);
+    },
+
+    render: function() {
+      if (navigator.mozLoop.getLoopPref("gettingStarted.seen")) {
+        return null;
+      }
+      return (
+        <div id="fte-getstarted">
+          <header id="fte-title">
+            {mozL10n.get("first_time_experience_title", {
+              "clientShortname": mozL10n.get("clientShortname2")
+            })}
+          </header>
+          <Button htmlId="fte-button"
+                  onClick={this.handleButtonClick}
+                  caption={mozL10n.get("first_time_experience_button_label")} />
+        </div>
+      );
+    }
+  });
+
   var ToSView = React.createClass({
     getInitialState: function() {
-      return {seenToS: navigator.mozLoop.getLoopCharPref('seenToS')};
+      return {seenToS: navigator.mozLoop.getLoopPref("seenToS")};
     },
 
     render: function() {
       if (this.state.seenToS == "unseen") {
-        var terms_of_use_url = navigator.mozLoop.getLoopCharPref('legal.ToS_url');
-        var privacy_notice_url = navigator.mozLoop.getLoopCharPref('legal.privacy_url');
-        var tosHTML = __("legal_text_and_links3", {
-          "clientShortname": __("clientShortname2"),
+        var locale = mozL10n.getLanguage();
+        var terms_of_use_url = navigator.mozLoop.getLoopPref('legal.ToS_url');
+        var privacy_notice_url = navigator.mozLoop.getLoopPref('legal.privacy_url');
+        var tosHTML = mozL10n.get("legal_text_and_links3", {
+          "clientShortname": mozL10n.get("clientShortname2"),
           "terms_of_use": React.renderComponentToStaticMarkup(
             <a href={terms_of_use_url} target="_blank">
-              {__("legal_text_tos")}
+              {mozL10n.get("legal_text_tos")}
             </a>
           ),
           "privacy_notice": React.renderComponentToStaticMarkup(
             <a href={privacy_notice_url} target="_blank">
-              {__("legal_text_privacy")}
+              {mozL10n.get("legal_text_privacy")}
             </a>
           ),
         });
-        return <p className="terms-service"
-                  dangerouslySetInnerHTML={{__html: tosHTML}}></p>;
+        return <div>
+          <p id="powered-by">
+            {mozL10n.get("powered_by_beforeLogo")}
+            <img id="powered-by-logo" className={locale} />
+            {mozL10n.get("powered_by_afterLogo")}
+          </p>
+          <p className="terms-service"
+             dangerouslySetInnerHTML={{__html: tosHTML}}></p>
+         </div>;
       } else {
         return <div />;
       }
@@ -241,10 +281,21 @@
       }
     },
 
+    handleHelpEntry: function(event) {
+      event.preventDefault();
+      var helloSupportUrl = navigator.mozLoop.getLoopPref('support_url');
+      window.open(helloSupportUrl);
+      window.close();
+    },
+
     _isSignedIn: function() {
       return !!navigator.mozLoop.userProfile;
     },
 
+    openGettingStartedTour: function() {
+      navigator.mozLoop.openGettingStartedTour("settings-menu");
+    },
+
     render: function() {
       var cx = React.addons.classSet;
 
@@ -256,23 +307,28 @@
       return (
         <div className="settings-menu dropdown">
           <a className="button-settings" onClick={this.showDropdownMenu}
-             title={__("settings_menu_button_tooltip")} />
+             title={mozL10n.get("settings_menu_button_tooltip")} />
           <ul className={cx({"dropdown-menu": true, hide: !this.state.showMenu})}
               onMouseLeave={this.hideDropdownMenu}>
-            <SettingsDropdownEntry label={__("settings_menu_item_settings")}
+            <SettingsDropdownEntry label={mozL10n.get("settings_menu_item_settings")}
                                    onClick={this.handleClickSettingsEntry}
                                    displayed={false}
                                    icon="settings" />
-            <SettingsDropdownEntry label={__("settings_menu_item_account")}
+            <SettingsDropdownEntry label={mozL10n.get("settings_menu_item_account")}
                                    onClick={this.handleClickAccountEntry}
                                    icon="account"
                                    displayed={this._isSignedIn()} />
+            <SettingsDropdownEntry label={mozL10n.get("tour_label")}
+                                   onClick={this.openGettingStartedTour} />
             <SettingsDropdownEntry label={this._isSignedIn() ?
-                                          __("settings_menu_item_signout") :
-                                          __("settings_menu_item_signin")}
+                                          mozL10n.get("settings_menu_item_signout") :
+                                          mozL10n.get("settings_menu_item_signin")}
                                    onClick={this.handleClickAuthEntry}
                                    displayed={navigator.mozLoop.fxAEnabled}
                                    icon={this._isSignedIn() ? "signout" : "signin"} />
+            <SettingsDropdownEntry label={mozL10n.get("help_label")}
+                                   onClick={this.handleHelpEntry}
+                                   icon="help" />
           </ul>
         </div>
       );
@@ -401,7 +457,7 @@
       var cx = React.addons.classSet;
       return (
         <div className="generate-url">
-          <header>{__("share_link_header_text")}</header>
+          <header id="share-link-header">{mozL10n.get("share_link_header_text")}</header>
           <div className="generate-url-stack">
             <input type="url" value={this.state.callUrl} readOnly="true"
                    onCopy={this.handleLinkExfiltration}
@@ -445,7 +501,7 @@
       return (
         <p className="signin-link">
           <a href="#" onClick={this.handleSignUpLinkClick}>
-            {__("panel_footer_signin_or_signup_link")}
+            {mozL10n.get("panel_footer_signin_or_signup_link")}
           </a>
         </p>
       );
@@ -647,6 +703,7 @@
     getInitialState: function() {
       return {
         userProfile: this.props.userProfile || navigator.mozLoop.userProfile,
+        gettingStartedSeen: navigator.mozLoop.getLoopPref("gettingStarted.seen"),
       };
     },
 
@@ -678,31 +735,52 @@
       }
     },
 
+    _roomsEnabled: function() {
+      return navigator.mozLoop.getLoopPref("rooms.enabled");
+    },
+
     _onStatusChanged: function() {
       var profile = navigator.mozLoop.userProfile;
       var currUid = this.state.userProfile ? this.state.userProfile.uid : null;
       var newUid = profile ? profile.uid : null;
       if (currUid != newUid) {
         // On profile change (login, logout), switch back to the default tab.
-        this.selectTab("call");
+        this.selectTab(this._roomsEnabled() ? "rooms" : "call");
         this.setState({userProfile: profile});
       }
       this.updateServiceErrors();
     },
 
+    _gettingStartedSeen: function() {
+      this.setState({
+        gettingStartedSeen: navigator.mozLoop.getLoopPref("gettingStarted.seen"),
+      });
+    },
+
     /**
      * The rooms feature is hidden by default for now. Once it gets mainstream,
-     * this method can be safely removed.
+     * this method can be simplified.
      */
-    _renderRoomsTab: function() {
-      if (!navigator.mozLoop.getLoopBoolPref("rooms.enabled")) {
-        return null;
+    _renderRoomsOrCallTab: function() {
+      if (!this._roomsEnabled()) {
+        return (
+          <Tab name="call">
+            <div className="content-area">
+              <CallUrlResult client={this.props.client}
+                             notifications={this.props.notifications}
+                             callUrl={this.props.callUrl} />
+              <ToSView />
+            </div>
+          </Tab>
+        );
       }
+
       return (
         <Tab name="rooms">
           <RoomList dispatcher={this.props.dispatcher}
                     store={this.props.roomStore}
                     userDisplayName={this._getUserDisplayName()}/>
+          <ToSView />
         </Tab>
       );
     },
@@ -722,34 +800,40 @@
 
     componentDidMount: function() {
       window.addEventListener("LoopStatusChanged", this._onStatusChanged);
+      window.addEventListener("GettingStartedSeen", this._gettingStartedSeen);
     },
 
     componentWillUnmount: function() {
       window.removeEventListener("LoopStatusChanged", this._onStatusChanged);
+      window.removeEventListener("GettingStartedSeen", this._gettingStartedSeen);
     },
 
     _getUserDisplayName: function() {
       return this.state.userProfile && this.state.userProfile.email ||
-             __("display_name_guest");
+             mozL10n.get("display_name_guest");
     },
 
     render: function() {
       var NotificationListView = sharedViews.NotificationListView;
+
+      if (!this.state.gettingStartedSeen) {
+        return (
+          <div>
+            <NotificationListView notifications={this.props.notifications}
+                                  clearOnDocumentHidden={true} />
+            <GettingStartedView />
+            <ToSView />
+          </div>
+        );
+      }
+
       return (
         <div>
           <NotificationListView notifications={this.props.notifications}
                                 clearOnDocumentHidden={true} />
           <TabView ref="tabView" selectedTab={this.props.selectedTab}
             buttonsHidden={!this.state.userProfile && !this.props.showTabButtons}>
-            <Tab name="call">
-              <div className="content-area">
-                <CallUrlResult client={this.props.client}
-                               notifications={this.props.notifications}
-                               callUrl={this.props.callUrl} />
-                <ToSView />
-              </div>
-            </Tab>
-            {this._renderRoomsTab()}
+            {this._renderRoomsOrCallTab()}
             <Tab name="contacts">
               <ContactsList selectTab={this.selectTab}
                             startForm={this.startForm} />
@@ -794,9 +878,8 @@
     var client = new loop.Client();
     var notifications = new sharedModels.NotificationCollection();
     var dispatcher = new loop.Dispatcher();
-    var roomStore = new loop.store.RoomStore({
-      mozLoop: navigator.mozLoop,
-      dispatcher: dispatcher
+    var roomStore = new loop.store.RoomStore(dispatcher, {
+      mozLoop: navigator.mozLoop
     });
 
     React.renderComponent(<PanelView
@@ -816,15 +899,16 @@
 
   return {
     init: init,
-    UserIdentity: UserIdentity,
     AuthLink: AuthLink,
     AvailabilityDropdown: AvailabilityDropdown,
     CallUrlResult: CallUrlResult,
+    GettingStartedView: GettingStartedView,
     PanelView: PanelView,
     RoomEntry: RoomEntry,
     RoomList: RoomList,
     SettingsDropdown: SettingsDropdown,
-    ToSView: ToSView
+    ToSView: ToSView,
+    UserIdentity: UserIdentity,
   };
 })(_, document.mozL10n);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/roomViews.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/roomViews.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/roomViews.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/roomViews.js	2014-11-26 21:45:48.000000000 +0000
@@ -12,11 +12,10 @@
   "use strict";
 
   var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var sharedViews = loop.shared.views;
 
-  function noop() {}
-
   /**
    * ActiveRoomStore mixin.
    * @type {Object}
@@ -59,7 +58,7 @@
    * Desktop room invitation view (overlay).
    */
   var DesktopRoomInvitationView = React.createClass({displayName: 'DesktopRoomInvitationView',
-    mixins: [ActiveRoomStoreMixin],
+    mixins: [ActiveRoomStoreMixin, React.addons.LinkedStateMixin],
 
     propTypes: {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
@@ -67,13 +66,23 @@
 
     getInitialState: function() {
       return {
-        copiedUrl: false
-      }
+        copiedUrl: false,
+        newRoomName: ""
+      };
     },
 
     handleFormSubmit: function(event) {
       event.preventDefault();
-      // XXX
+
+      var newRoomName = this.state.newRoomName;
+
+      if (newRoomName && this.state.roomName != newRoomName) {
+        this.props.dispatcher.dispatch(
+          new sharedActions.RenameRoom({
+            roomToken: this.state.roomToken,
+            newRoomName: newRoomName
+          }));
+      }
     },
 
     handleEmailButtonClick: function(event) {
@@ -96,7 +105,9 @@
       return (
         React.DOM.div({className: "room-invitation-overlay"}, 
           React.DOM.form({onSubmit: this.handleFormSubmit}, 
-            React.DOM.input({type: "text", ref: "roomName", 
+            React.DOM.input({type: "text", className: "input-room-name", 
+              valueLink: this.linkState("newRoomName"), 
+              onBlur: this.handleFormSubmit, 
               placeholder: mozL10n.get("rooms_name_this_room_label")})
           ), 
           React.DOM.p(null, mozL10n.get("invite_header_text")), 
@@ -120,10 +131,16 @@
    * Desktop room conversation view.
    */
   var DesktopRoomConversationView = React.createClass({displayName: 'DesktopRoomConversationView',
-    mixins: [ActiveRoomStoreMixin, loop.shared.mixins.DocumentTitleMixin],
+    mixins: [
+      ActiveRoomStoreMixin,
+      sharedMixins.DocumentTitleMixin,
+      sharedMixins.RoomsAudioMixin
+    ],
 
     propTypes: {
-      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      feedbackStore:
+        React.PropTypes.instanceOf(loop.store.FeedbackStore).isRequired,
     },
 
     _renderInvitationOverlay: function() {
@@ -199,6 +216,13 @@
     },
 
     /**
+     * User clicked on the "Leave" button.
+     */
+    leaveRoom: function() {
+      this.props.dispatcher.dispatch(new sharedActions.LeaveRoom());
+    },
+
+    /**
      * Closes the window if the cancel button is pressed in the generic failure view.
      */
     closeWindow: function() {
@@ -240,6 +264,12 @@
             cancelCall: this.closeWindow}
           );
         }
+        case ROOM_STATES.ENDED: {
+          return sharedViews.FeedbackView({
+            feedbackStore: this.props.feedbackStore, 
+            onAfterFeedbackReceived: this.closeWindow}
+          );
+        }
         default: {
           return (
             React.DOM.div({className: "room-conversation-wrapper"}, 
@@ -256,7 +286,7 @@
                     video: {enabled: !this.state.videoMuted, visible: true}, 
                     audio: {enabled: !this.state.audioMuted, visible: true}, 
                     publishStream: this.publishStream, 
-                    hangup: noop})
+                    hangup: this.leaveRoom})
                 )
               )
             )
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/roomViews.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/roomViews.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/js/roomViews.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/js/roomViews.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -12,11 +12,10 @@
   "use strict";
 
   var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var sharedViews = loop.shared.views;
 
-  function noop() {}
-
   /**
    * ActiveRoomStore mixin.
    * @type {Object}
@@ -59,7 +58,7 @@
    * Desktop room invitation view (overlay).
    */
   var DesktopRoomInvitationView = React.createClass({
-    mixins: [ActiveRoomStoreMixin],
+    mixins: [ActiveRoomStoreMixin, React.addons.LinkedStateMixin],
 
     propTypes: {
       dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
@@ -67,13 +66,23 @@
 
     getInitialState: function() {
       return {
-        copiedUrl: false
-      }
+        copiedUrl: false,
+        newRoomName: ""
+      };
     },
 
     handleFormSubmit: function(event) {
       event.preventDefault();
-      // XXX
+
+      var newRoomName = this.state.newRoomName;
+
+      if (newRoomName && this.state.roomName != newRoomName) {
+        this.props.dispatcher.dispatch(
+          new sharedActions.RenameRoom({
+            roomToken: this.state.roomToken,
+            newRoomName: newRoomName
+          }));
+      }
     },
 
     handleEmailButtonClick: function(event) {
@@ -96,7 +105,9 @@
       return (
         <div className="room-invitation-overlay">
           <form onSubmit={this.handleFormSubmit}>
-            <input type="text" ref="roomName"
+            <input type="text" className="input-room-name"
+              valueLink={this.linkState("newRoomName")}
+              onBlur={this.handleFormSubmit}
               placeholder={mozL10n.get("rooms_name_this_room_label")} />
           </form>
           <p>{mozL10n.get("invite_header_text")}</p>
@@ -120,10 +131,16 @@
    * Desktop room conversation view.
    */
   var DesktopRoomConversationView = React.createClass({
-    mixins: [ActiveRoomStoreMixin, loop.shared.mixins.DocumentTitleMixin],
+    mixins: [
+      ActiveRoomStoreMixin,
+      sharedMixins.DocumentTitleMixin,
+      sharedMixins.RoomsAudioMixin
+    ],
 
     propTypes: {
-      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      feedbackStore:
+        React.PropTypes.instanceOf(loop.store.FeedbackStore).isRequired,
     },
 
     _renderInvitationOverlay: function() {
@@ -199,6 +216,13 @@
     },
 
     /**
+     * User clicked on the "Leave" button.
+     */
+    leaveRoom: function() {
+      this.props.dispatcher.dispatch(new sharedActions.LeaveRoom());
+    },
+
+    /**
      * Closes the window if the cancel button is pressed in the generic failure view.
      */
     closeWindow: function() {
@@ -240,6 +264,12 @@
             cancelCall={this.closeWindow}
           />;
         }
+        case ROOM_STATES.ENDED: {
+          return <sharedViews.FeedbackView
+            feedbackStore={this.props.feedbackStore}
+            onAfterFeedbackReceived={this.closeWindow}
+          />;
+        }
         default: {
           return (
             <div className="room-conversation-wrapper">
@@ -256,7 +286,7 @@
                     video={{enabled: !this.state.videoMuted, visible: true}}
                     audio={{enabled: !this.state.audioMuted, visible: true}}
                     publishStream={this.publishStream}
-                    hangup={noop} />
+                    hangup={this.leaveRoom} />
                 </div>
               </div>
             </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/panel.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/panel.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/panel.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/panel.html	2014-11-26 21:45:48.000000000 +0000
@@ -27,6 +27,7 @@
     <script type="text/javascript" src="loop/shared/js/validate.js"></script>
     <script type="text/javascript" src="loop/shared/js/actions.js"></script>
     <script type="text/javascript" src="loop/shared/js/dispatcher.js"></script>
+    <script type="text/javascript" src="loop/shared/js/store.js"></script>
     <script type="text/javascript" src="loop/shared/js/roomStore.js"></script>
     <script type="text/javascript" src="loop/shared/js/activeRoomStore.js"></script>
     <script type="text/javascript" src="loop/js/client.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/css/contacts.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/css/contacts.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/css/contacts.css	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/css/contacts.css	2014-11-26 21:45:48.000000000 +0000
@@ -42,7 +42,7 @@
 
 .contact-separator {
   height: 24px;
-  background: #eee;
+  background-color: #eee;
   color: #888;
 }
 
@@ -55,7 +55,7 @@
 }
 
 .contact:hover {
-  background: #eee;
+  background-color: #eee;
 }
 
 .contact:hover > .icons {
@@ -80,7 +80,7 @@
 .contact > .avatar {
   width: 40px;
   height: 40px;
-  background: #ccc;
+  background-color: #ccc;
   border-radius: 50%;
   margin-right: 10px;
   overflow: hidden;
@@ -132,7 +132,7 @@
   background-position: center;
   background-size: 16px 16px;
   background-repeat: no-repeat;
-  background-color: fff;
+  background-color: #fff;
 }
 
 .contact > .details > .email {
@@ -145,9 +145,9 @@
   cursor: pointer;
   display: none;
   margin-left: auto;
-  padding: 12px 10px;
+  padding: 10px;
   border-radius: 2px;
-  background: #5bc0a4;
+  background-color: #5bc0a4;
   color: #fff;
   -moz-user-select: none;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/css/conversation.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/css/conversation.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/css/conversation.css	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/css/conversation.css	2014-11-26 21:45:48.000000000 +0000
@@ -697,11 +697,55 @@
   height: 100%;
 }
 
-/**
- * Hides the hangup button for room conversations.
- */
-.room-conversation .conversation-toolbar .btn-hangup-entry {
-  display: none;
+.standalone .room-conversation-wrapper {
+  height: calc(100% - 50px - 60px);
+  background: #000;
+}
+
+.room-conversation-wrapper header {
+  background: #000;
+  height: 50px;
+  text-align: left;
+  width: 75%;
+}
+
+.room-conversation-wrapper header h1 {
+  font-size: 1.5em;
+  color: #fff;
+  line-height: 50px;
+  text-indent: 50px;
+  background-image: url("../img/firefox-logo.png");
+  background-size: 30px;
+  background-position: 10px;
+  background-repeat: no-repeat;
+  display: inline-block;
+}
+
+.room-conversation-wrapper header a {
+  float: right;
+}
+
+.room-conversation-wrapper header .icon-help {
+  display: inline-block;
+  background-size: contain;
+  margin-top: 20px;
+  width: 20px;
+  height: 20px;
+  background: transparent url("../img/svg/glyph-help-16x16.svg") no-repeat;
+}
+
+.room-conversation-wrapper footer {
+  background: #000;
+  height: 60px;
+  margin-top: -12px;
+}
+
+.room-conversation-wrapper footer a {
+  color: #555;
+}
+
+.fx-embedded .room-conversation .conversation-toolbar .btn-hangup {
+  background-image: url("../img/icons-16x16.svg#leave");
 }
 
 .room-invitation-overlay {
@@ -745,7 +789,7 @@
 
 .standalone .room-inner-info-area {
   position: absolute;
-  top: 35%;
+  top: 50%;
   left: 0;
   right: 25%;
   z-index: 1000;
@@ -767,6 +811,7 @@
   padding: .5em 3em .3em 3em;
   border-radius: 3px;
   font-weight: normal;
+  max-width: 400px;
 }
 
 .standalone .room-conversation h2.room-name {
@@ -796,7 +841,7 @@
 
 .standalone .room-conversation .conversation-toolbar {
   background: #000;
-  border-top: none;
+  border: none;
 }
 
 .standalone .room-conversation .conversation-toolbar .btn-hangup-entry {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/css/panel.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/css/panel.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/css/panel.css	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/css/panel.css	2014-11-26 21:45:48.000000000 +0000
@@ -102,10 +102,35 @@
 
 .content-area header {
   font-weight: 700;
-  -moz-padding-start: 20px;
 }
 
-.tab-view + .tab .content-area header {
+#fte-getstarted {
+  padding-top: 1em;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+
+#fte-title {
+  text-align: center;
+  margin-bottom: .5em;
+}
+
+#fte-button {
+  width: 50%;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  font-size: 1rem;
+  padding: .5rem 1rem;
+  height: auto; /* Needed to override .button's height:26px; */
+}
+
+/* Need to remove when these rules when the Beta tag is removed */
+#share-link-header {
+  -moz-padding-start: 20px;
+}
+#fte-getstarted + .generate-url > #share-link-header,
+.tab-view + .tab .content-area > .generate-url > #share-link-header {
   /* The header shouldn't be indented if the tabs are present. */
   -moz-padding-start: 0;
 }
@@ -140,7 +165,6 @@
 
 /* Rooms */
 .rooms {
-  background: #f5f5f5;
   min-height: 100px;
 }
 
@@ -435,6 +459,7 @@
   right: auto;
 }
 
+#fte-button,
 .generate-url .button {
   background-color: #0096dd;
   border-color: #0096dd;
@@ -447,13 +472,73 @@
   color: #fff;
 }
 
+#powered-by,
 .terms-service {
   color: #888;
   text-align: center;
   font-size: .9em;
 }
 
-.terms-service a {
+#powered-by {
+  border-top: 1px solid #ccc;
+  padding-top: 1em;
+  margin-left: -14px;
+  margin-right: -14px;
+}
+
+#powered-by-logo {
+  display: inline-block;
+  margin-left: 10px;
+  margin-right: 10px;
+  vertical-align: middle;
+  background-image: url("../img/telefonica.png");
+  background-size: 72px 20px;
+  width: 72px;
+  height: 20px;
+}
+
+#powered-by-logo.en-GB,
+#powered-by-logo.de {
+  background-image: url("../img/02.png");
+  background-size: 21px 20px;
+  width: 21px;
+  height: 20px;
+}
+
+#powered-by-logo.pt-BR {
+  background-image: url("../img/vivo.png");
+  background-size: 53px 26px;
+  width: 53px;
+  height: 26px;
+}
+
+#powered-by-logo[class^="es-"] {
+  background-image: url("../img/movistar.png");
+  background-size: 92px 20px;
+  width: 92px;
+  height: 20px;
+}
+
+@media (min-resolution: 2dppx) {
+  #powered-by-logo {
+    background-image: url("../img/telefonica@2x.png");
+  }
+
+  #powered-by-logo.en-GB,
+  #powered-by-logo.de {
+    background-image: url("../img/02@2x.png");
+  }
+
+  #powered-by-logo.pt-BR {
+    background-image: url("../img/vivo@2x.png");
+  }
+
+  #powered-by-logo[class^="es-"] {
+    background-image: url("../img/movistar@2x.png");
+  }
+}
+
+.terms-service > a {
   color: #00caee;
 }
 
@@ -574,6 +659,10 @@
   background: transparent url(../img/svg/glyph-signout-16x16.svg) no-repeat center center;
 }
 
+.settings-menu .icon-help {
+  background: transparent url(../img/svg/glyph-help-16x16.svg) no-repeat center center;
+}
+
 /* Footer */
 
 .footer {
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/02@2x.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/02@2x.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/02.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/02.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/icons-16x16.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/icons-16x16.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/icons-16x16.svg	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/icons-16x16.svg	2014-11-26 21:45:48.000000000 +0000
@@ -118,6 +118,10 @@
     <polyline fill="#FFFFFF" points="9.25,7.542 8.75,7.542 8.75,11.542 9.25,11.542  "/>
     <rect x="6.75" y="7.542" fill="#FFFFFF" width="0.5" height="4"/>
   </g>
+  <g id="leave-shape">
+    <polygon fill="#FFFFFF" points="2.08,11.52 2.08,4 8,4 8,2.24 0.32,2.24 0.32,13.28 8,13.28 8,11.52"/>
+    <polygon fill="#FFFFFF" points="15.66816,7.77344 9.6,2.27456 9.6,5.6 3.68,5.6 3.68,9.92 9.6,9.92 9.6,13.27232"/>
+  </g>
 </defs>
 <use id="audio"               xlink:href="#audio-shape"/>
 <use id="audio-hover"         xlink:href="#audio-shape"/>
@@ -137,6 +141,7 @@
 <use id="history"             xlink:href="#history-shape"/>
 <use id="history-hover"       xlink:href="#history-shape"/>
 <use id="history-active"      xlink:href="#history-shape"/>
+<use id="leave"               xlink:href="#leave-shape"/>
 <use id="precall"             xlink:href="#precall-shape"/>
 <use id="precall-hover"       xlink:href="#precall-shape"/>
 <use id="precall-active"      xlink:href="#precall-shape"/>
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/movistar@2x.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/movistar@2x.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/movistar.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/movistar.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/svg/glyph-help-16x16.svg	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,15 @@
+<?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/. -->
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<circle fill="#5A5A5A" cx="8" cy="8" r="8"/>
+<g>
+	<path fill="#FFFFFF" d="M10.716,5.643c0,1.943-2.158,1.812-2.158,3.154v0.3H6.831V8.726c0-2.075,1.907-1.932,1.907-2.915
+		c0-0.432-0.312-0.684-0.84-0.684c-0.491,0-0.972,0.24-1.403,0.731L5.284,4.923C5.967,4.121,6.855,3.64,8.09,3.64
+		C9.841,3.64,10.716,4.576,10.716,5.643z M8.797,11.268c0,0.6-0.479,1.092-1.079,1.092s-1.079-0.492-1.079-1.092
+		c0-0.588,0.479-1.079,1.079-1.079S8.797,10.68,8.797,11.268z"/>
+</g>
+</svg>
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/telefonica@2x.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/telefonica@2x.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/telefonica.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/telefonica.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/vivo@2x.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/vivo@2x.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/img/vivo.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/img/vivo.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/actions.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/actions.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/actions.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/actions.js	2014-11-26 21:45:48.000000000 +0000
@@ -30,6 +30,8 @@
   };
 
   return {
+    Action: Action,
+
     /**
      * Get the window data for the provided window id
      */
@@ -223,7 +225,10 @@
      * XXX: should move to some roomActions module - refs bug 1079284
      */
     GetAllRoomsError: Action.define("getAllRoomsError", {
-      error: Error
+      // There's two types of error possible - one thrown by our code (and Error)
+      // and the other is an Object about the error codes from the server as
+      // returned by the Hawk request.
+      error: [Error, Object]
     }),
 
     /**
@@ -243,6 +248,15 @@
     }),
 
     /**
+     * Renames a room.
+     * XXX: should move to some roomActions module - refs bug 1079284
+     */
+    RenameRoom: Action.define("renameRoom", {
+      roomToken: String,
+      newRoomName: String
+    }),
+
+    /**
      * Copy a room url into the user's clipboard.
      * XXX: should move to some roomActions module - refs bug 1079284
      */
@@ -266,6 +280,19 @@
     }),
 
     /**
+     * Sets up the room information when it is received.
+     * XXX: should move to some roomActions module - refs bug 1079284
+     *
+     * @see https://wiki.mozilla.org/Loop/Architecture/Rooms#GET_.2Frooms.2F.7Btoken.7D
+     */
+    SetupRoomInfo: Action.define("setupRoomInfo", {
+      roomName: String,
+      roomOwner: String,
+      roomToken: String,
+      roomUrl: String
+    }),
+
+    /**
      * Updates the room information when it is received.
      * XXX: should move to some roomActions module - refs bug 1079284
      *
@@ -274,7 +301,6 @@
     UpdateRoomInfo: Action.define("updateRoomInfo", {
       roomName: String,
       roomOwner: String,
-      roomToken: String,
       roomUrl: String
     }),
 
@@ -302,6 +328,28 @@
      * Used to indicate the user wishes to leave the room.
      */
     LeaveRoom: Action.define("leaveRoom", {
+    }),
+
+    /**
+     * Requires detailed information on sad feedback.
+     */
+    RequireFeedbackDetails: Action.define("requireFeedbackDetails", {
+    }),
+
+    /**
+     * Send feedback data.
+     */
+    SendFeedback: Action.define("sendFeedback", {
+      happy: Boolean,
+      category: String,
+      description: String
+    }),
+
+    /**
+     * Reacts on feedback submission error.
+     */
+    SendFeedbackError: Action.define("sendFeedbackError", {
+      error: Error
     })
   };
 })();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js	2014-11-26 21:45:48.000000000 +0000
@@ -6,10 +6,20 @@
 
 var loop = loop || {};
 loop.store = loop.store || {};
+
 loop.store.ActiveRoomStore = (function() {
   "use strict";
 
   var sharedActions = loop.shared.actions;
+  var FAILURE_REASONS = loop.shared.utils.FAILURE_REASONS;
+
+  // Error numbers taken from
+  // https://github.com/mozilla-services/loop-server/blob/master/loop/errno.json
+  var SERVER_CODES = loop.store.SERVER_CODES = {
+    INVALID_TOKEN: 105,
+    EXPIRED: 111,
+    ROOM_FULL: 202
+  };
 
   var ROOM_STATES = loop.store.ROOM_STATES = {
     // The initial state of the room
@@ -27,83 +37,58 @@
     // There was an issue with the room
     FAILED: "room-failed",
     // The room is full
-    FULL: "room-full"
+    FULL: "room-full",
+    // The room conversation has ended
+    ENDED: "room-ended"
   };
 
   /**
-   * Store for things that are local to this instance (in this profile, on
-   * this machine) of this roomRoom store, in addition to a mirror of some
-   * remote-state.
-   *
-   * @extends {Backbone.Events}
+   * Active room store.
    *
-   * @param {Object}          options - Options object
-   * @param {loop.Dispatcher} options.dispatch - The dispatcher for dispatching
-   *                            actions and registering to consume them.
-   * @param {MozLoop}         options.mozLoop - MozLoop API provider object
+   * @param {loop.Dispatcher} dispatcher  The dispatcher for dispatching actions
+   *                                      and registering to consume actions.
+   * @param {Object} options Options object:
+   * - {mozLoop}     mozLoop    The MozLoop API object.
+   * - {OTSdkDriver} sdkDriver  The SDK driver instance.
    */
-  function ActiveRoomStore(options) {
-    options = options || {};
-
-    if (!options.dispatcher) {
-      throw new Error("Missing option dispatcher");
-    }
-    this._dispatcher = options.dispatcher;
-
-    if (!options.mozLoop) {
-      throw new Error("Missing option mozLoop");
-    }
-    this._mozLoop = options.mozLoop;
-
-    if (!options.sdkDriver) {
-      throw new Error("Missing option sdkDriver");
-    }
-    this._sdkDriver = options.sdkDriver;
+  var ActiveRoomStore = loop.store.createStore({
+    /**
+     * The time factor to adjust the expires time to ensure that we send a refresh
+     * before the expiry. Currently set as 90%.
+     */
+    expiresTimeFactor: 0.9,
 
     // XXX Further actions are registered in setupWindowData and
     // fetchServerData when we know what window type this is. At some stage,
     // we might want to consider store mixins or some alternative which
     // means the stores would only be created when we want them.
-    this._dispatcher.register(this, [
+    actions: [
       "setupWindowData",
       "fetchServerData"
-    ]);
-
-    /**
-     * Stored data reflecting the local state of a given room, used to drive
-     * the room's views.
-     *
-     * @see https://wiki.mozilla.org/Loop/Architecture/Rooms#GET_.2Frooms.2F.7Btoken.7D
-     *      for the main data. Additional properties below.
-     *
-     * @property {ROOM_STATES} roomState - the state of the room.
-     * @property {Error=} error - if the room is an error state, this will be
-     *                            set to an Error object reflecting the problem;
-     *                            otherwise it will be unset.
-     */
-    this._storeState = {
-      roomState: ROOM_STATES.INIT,
-      audioMuted: false,
-      videoMuted: false
-    };
-  }
+    ],
 
-  ActiveRoomStore.prototype = _.extend({
-    /**
-     * The time factor to adjust the expires time to ensure that we send a refresh
-     * before the expiry. Currently set as 90%.
-     */
-    expiresTimeFactor: 0.9,
+    initialize: function(options) {
+      if (!options.mozLoop) {
+        throw new Error("Missing option mozLoop");
+      }
+      this._mozLoop = options.mozLoop;
 
-    getStoreState: function() {
-      return this._storeState;
+      if (!options.sdkDriver) {
+        throw new Error("Missing option sdkDriver");
+      }
+      this._sdkDriver = options.sdkDriver;
     },
 
-    setStoreState: function(newState) {
-      for (var key in newState) {
-        this._storeState[key] = newState[key];
-      }
-      this.trigger("change");
+    /**
+     * Returns initial state data for this active room.
+     */
+    getInitialStoreState: function() {
+      return {
+        roomState: ROOM_STATES.INIT,
+        audioMuted: false,
+        videoMuted: false,
+        failureReason: undefined
+      };
     },
 
     /**
@@ -112,23 +97,35 @@
      * @param {sharedActions.RoomFailure} actionData
      */
     roomFailure: function(actionData) {
+      function getReason(serverCode) {
+        switch (serverCode) {
+          case SERVER_CODES.INVALID_TOKEN:
+          case SERVER_CODES.EXPIRED:
+            return FAILURE_REASONS.EXPIRED_OR_INVALID;
+          default:
+            return FAILURE_REASONS.UNKNOWN;
+        }
+      }
+
       console.error("Error in state `" + this._storeState.roomState + "`:",
         actionData.error);
 
       this.setStoreState({
         error: actionData.error,
-        roomState: actionData.error.errno === 202 ? ROOM_STATES.FULL
-                                                  : ROOM_STATES.FAILED
+        failureReason: getReason(actionData.error.errno),
+        roomState: actionData.error.errno === SERVER_CODES.ROOM_FULL ?
+          ROOM_STATES.FULL : ROOM_STATES.FAILED
       });
     },
 
     /**
      * Registers the actions with the dispatcher that this store is interested
-     * in.
+     * in after the initial setup has been performed.
      */
-    _registerActions: function() {
-      this._dispatcher.register(this, [
+    _registerPostSetupActions: function() {
+      this.dispatcher.register(this, [
         "roomFailure",
+        "setupRoomInfo",
         "updateRoomInfo",
         "joinRoom",
         "joinedRoom",
@@ -156,7 +153,7 @@
         return;
       }
 
-      this._registerActions();
+      this._registerPostSetupActions();
 
       this.setStoreState({
         roomState: ROOM_STATES.GATHER
@@ -166,14 +163,11 @@
       this._mozLoop.rooms.get(actionData.roomToken,
         function(error, roomData) {
           if (error) {
-            this._dispatcher.dispatch(new sharedActions.RoomFailure({
-              error: error
-            }));
+            this.dispatchAction(new sharedActions.RoomFailure({error: error}));
             return;
           }
 
-          this._dispatcher.dispatch(
-            new sharedActions.UpdateRoomInfo({
+          this.dispatchAction(new sharedActions.SetupRoomInfo({
             roomToken: actionData.roomToken,
             roomName: roomData.roomName,
             roomOwner: roomData.roomOwner,
@@ -182,7 +176,7 @@
 
           // For the conversation window, we need to automatically
           // join the room.
-          this._dispatcher.dispatch(new sharedActions.JoinRoom());
+          this.dispatchAction(new sharedActions.JoinRoom());
         }.bind(this));
     },
 
@@ -200,21 +194,24 @@
         return;
       }
 
-      this._registerActions();
+      this._registerPostSetupActions();
 
       this.setStoreState({
         roomToken: actionData.token,
         roomState: ROOM_STATES.READY
       });
+
+      this._mozLoop.rooms.on("update:" + actionData.roomToken,
+        this._handleRoomUpdate.bind(this));
     },
 
     /**
-     * Handles the updateRoomInfo action. Updates the room data and
+     * Handles the setupRoomInfo action. Sets up the initial room data and
      * sets the state to `READY`.
      *
-     * @param {sharedActions.UpdateRoomInfo} actionData
+     * @param {sharedActions.SetupRoomInfo} actionData
      */
-    updateRoomInfo: function(actionData) {
+    setupRoomInfo: function(actionData) {
       this.setStoreState({
         roomName: actionData.roomName,
         roomOwner: actionData.roomOwner,
@@ -222,21 +219,55 @@
         roomToken: actionData.roomToken,
         roomUrl: actionData.roomUrl
       });
+
+      this._mozLoop.rooms.on("update:" + actionData.roomToken,
+        this._handleRoomUpdate.bind(this));
+    },
+
+    /**
+     * Handles the updateRoomInfo action. Updates the room data.
+     *
+     * @param {sharedActions.UpdateRoomInfo} actionData
+     */
+    updateRoomInfo: function(actionData) {
+      this.setStoreState({
+        roomName: actionData.roomName,
+        roomOwner: actionData.roomOwner,
+        roomUrl: actionData.roomUrl
+      });
+    },
+
+    /**
+     * Handles room updates notified by the mozLoop rooms API.
+     *
+     * @param {String} eventName The name of the event
+     * @param {Object} roomData  The new roomData.
+     */
+    _handleRoomUpdate: function(eventName, roomData) {
+      this.dispatchAction(new sharedActions.UpdateRoomInfo({
+        roomName: roomData.roomName,
+        roomOwner: roomData.roomOwner,
+        roomUrl: roomData.roomUrl
+      }));
     },
 
     /**
      * Handles the action to join to a room.
      */
     joinRoom: function() {
+      // Reset the failure reason if necessary.
+      if (this.getStoreState().failureReason) {
+        this.setStoreState({failureReason: undefined});
+      }
+
       this._mozLoop.rooms.join(this._storeState.roomToken,
         function(error, responseData) {
           if (error) {
-            this._dispatcher.dispatch(
-              new sharedActions.RoomFailure({error: error}));
+            this.dispatchAction(new sharedActions.RoomFailure({error: error}));
             return;
           }
 
-          this._dispatcher.dispatch(new sharedActions.JoinedRoom({
+          this.dispatchAction(new sharedActions.JoinedRoom({
             apiKey: responseData.apiKey,
             sessionToken: responseData.sessionToken,
             sessionId: responseData.sessionId,
@@ -275,11 +306,17 @@
 
     /**
      * Handles disconnection of this local client from the sdk servers.
+     *
+     * @param {sharedActions.ConnectionFailure} actionData
      */
-    connectionFailure: function() {
+    connectionFailure: function(actionData) {
       // Treat all reasons as something failed. In theory, clientDisconnected
       // could be a success case, but there's no way we should be intentionally
       // sending that and still have the window open.
+      this.setStoreState({
+        failureReason: actionData.reason
+      });
+
       this._leaveRoom(ROOM_STATES.FAILED);
     },
 
@@ -301,6 +338,9 @@
       this.setStoreState({
         roomState: ROOM_STATES.HAS_PARTICIPANTS
       });
+
+      // We've connected with a third-party, therefore stop displaying the ToS etc.
+      this._mozLoop.setLoopPref("seenToS", "seen");
     },
 
     /**
@@ -319,6 +359,10 @@
      */
     windowUnload: function() {
       this._leaveRoom();
+
+      // If we're closing the window, we can stop listening to updates.
+      this._mozLoop.rooms.off("update:" + this.getStoreState().roomToken,
+        this._handleRoomUpdate.bind(this));
     },
 
     /**
@@ -347,8 +391,7 @@
         this._storeState.sessionToken,
         function(error, responseData) {
           if (error) {
-            this._dispatcher.dispatch(
-              new sharedActions.RoomFailure({error: error}));
+            this.dispatchAction(new sharedActions.RoomFailure({error: error}));
             return;
           }
 
@@ -383,12 +426,10 @@
       }
 
       this.setStoreState({
-        roomState: nextState ? nextState : ROOM_STATES.READY
+        roomState: nextState ? nextState : ROOM_STATES.ENDED
       });
     }
-
-  }, Backbone.Events);
+  });
 
   return ActiveRoomStore;
-
 })();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/conversationStore.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/conversationStore.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/conversationStore.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/conversationStore.js	2014-11-26 21:45:48.000000000 +0000
@@ -53,6 +53,7 @@
     TERMINATED: "cs-terminated"
   };
 
+  // XXX this needs to migrate to use loop.store.createStore
   var ConversationStore = Backbone.Model.extend({
     defaults: {
       // The id of the window. Currently used for getting the window id.
@@ -74,6 +75,8 @@
       // Call Connection information
       // The call id from the loop-server
       callId: undefined,
+      // The caller id of the contacting side
+      callerId: undefined,
       // The connection progress url to connect the websocket
       progressURL: undefined,
       // The websocket token that allows connection to the progress url
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackApiClient.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackApiClient.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackApiClient.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackApiClient.js	2014-11-26 21:45:48.000000000 +0000
@@ -107,8 +107,8 @@
       req.fail(function(jqXHR, textStatus, errorThrown) {
         var message = "Error posting user feedback data";
         var httpError = jqXHR.status + " " + errorThrown;
-        console.error(message, httpError, JSON.stringify(jqXHR.responseJSON));
-        cb(new Error(message + ": " + httpError));
+        cb(new Error(message + ": " + httpError + "; " +
+                     (jqXHR.responseJSON && jqXHR.responseJSON.detail || "")));
       });
     }
   };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackStore.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackStore.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackStore.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackStore.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,98 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+loop.store = loop.store || {};
+
+loop.store.FeedbackStore = (function() {
+  "use strict";
+
+  var sharedActions = loop.shared.actions;
+  var FEEDBACK_STATES = loop.store.FEEDBACK_STATES = {
+    // Initial state (mood selection)
+    INIT: "feedback-init",
+    // User detailed feedback form step
+    DETAILS: "feedback-details",
+    // Pending feedback data submission
+    PENDING: "feedback-pending",
+    // Feedback has been sent
+    SENT: "feedback-sent",
+    // There was an issue with the feedback API
+    FAILED: "feedback-failed"
+  };
+
+  /**
+   * Feedback store.
+   *
+   * @param {loop.Dispatcher} dispatcher  The dispatcher for dispatching actions
+   *                                      and registering to consume actions.
+   * @param {Object} options Options object:
+   * - {mozLoop}        mozLoop                 The MozLoop API object.
+   * - {feedbackClient} loop.FeedbackAPIClient  The feedback API client.
+   */
+  var FeedbackStore = loop.store.createStore({
+    actions: [
+      "requireFeedbackDetails",
+      "sendFeedback",
+      "sendFeedbackError"
+    ],
+
+    initialize: function(options) {
+      if (!options.feedbackClient) {
+        throw new Error("Missing option feedbackClient");
+      }
+      this._feedbackClient = options.feedbackClient;
+    },
+
+    /**
+     * Returns initial state data for this active room.
+     */
+    getInitialStoreState: function() {
+      return {feedbackState: FEEDBACK_STATES.INIT};
+    },
+
+    /**
+     * Requires user detailed feedback.
+     */
+    requireFeedbackDetails: function() {
+      this.setStoreState({feedbackState: FEEDBACK_STATES.DETAILS});
+    },
+
+    /**
+     * Sends feedback data to the feedback server.
+     *
+     * @param {sharedActions.SendFeedback} actionData The action data.
+     */
+    sendFeedback: function(actionData) {
+      delete actionData.name;
+      this._feedbackClient.send(actionData, function(err) {
+        if (err) {
+          this.dispatchAction(new sharedActions.SendFeedbackError({
+            error: err
+          }));
+          return;
+        }
+        this.setStoreState({feedbackState: FEEDBACK_STATES.SENT});
+      }.bind(this));
+
+      this.setStoreState({feedbackState: FEEDBACK_STATES.PENDING});
+    },
+
+    /**
+     * Notifies a store from any error encountered while sending feedback data.
+     *
+     * @param {sharedActions.SendFeedback} actionData The action data.
+     */
+    sendFeedbackError: function(actionData) {
+      this.setStoreState({
+        feedbackState: FEEDBACK_STATES.FAILED,
+        error: actionData.error
+      });
+    }
+  });
+
+  return FeedbackStore;
+})();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackViews.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackViews.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackViews.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackViews.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,322 @@
+/** @jsx React.DOM */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* jshint newcap:false */
+/* global loop:true, React */
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.views = loop.shared.views || {};
+loop.shared.views.FeedbackView = (function(l10n) {
+  "use strict";
+
+  var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
+
+  var WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS = 5;
+  var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
+
+  /**
+   * Feedback outer layout.
+   *
+   * Props:
+   * -
+   */
+  var FeedbackLayout = React.createClass({displayName: 'FeedbackLayout',
+    propTypes: {
+      children: React.PropTypes.component.isRequired,
+      title: React.PropTypes.string.isRequired,
+      reset: React.PropTypes.func // if not specified, no Back btn is shown
+    },
+
+    render: function() {
+      var backButton = React.DOM.div(null);
+      if (this.props.reset) {
+        backButton = (
+          React.DOM.button({className: "fx-embedded-btn-back", type: "button", 
+                  onClick: this.props.reset}, 
+            "« ", l10n.get("feedback_back_button")
+          )
+        );
+      }
+      return (
+        React.DOM.div({className: "feedback"}, 
+          backButton, 
+          React.DOM.h3(null, this.props.title), 
+          this.props.children
+        )
+      );
+    }
+  });
+
+  /**
+   * Detailed feedback form.
+   */
+  var FeedbackForm = React.createClass({displayName: 'FeedbackForm',
+    propTypes: {
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore),
+      pending:       React.PropTypes.bool,
+      reset:         React.PropTypes.func
+    },
+
+    getInitialState: function() {
+      return {category: "", description: ""};
+    },
+
+    getDefaultProps: function() {
+      return {pending: false};
+    },
+
+    _getCategories: function() {
+      return {
+        audio_quality: l10n.get("feedback_category_audio_quality"),
+        video_quality: l10n.get("feedback_category_video_quality"),
+        disconnected : l10n.get("feedback_category_was_disconnected"),
+        confusing:     l10n.get("feedback_category_confusing"),
+        other:         l10n.get("feedback_category_other")
+      };
+    },
+
+    _getCategoryFields: function() {
+      var categories = this._getCategories();
+      return Object.keys(categories).map(function(category, key) {
+        return (
+          React.DOM.label({key: key, className: "feedback-category-label"}, 
+            React.DOM.input({type: "radio", ref: "category", name: "category", 
+                   className: "feedback-category-radio", 
+                   value: category, 
+                   onChange: this.handleCategoryChange, 
+                   checked: this.state.category === category}), 
+            categories[category]
+          )
+        );
+      }, this);
+    },
+
+    /**
+     * Checks if the form is ready for submission:
+     *
+     * - no feedback submission should be pending.
+     * - a category (reason) must be chosen;
+     * - if the "other" category is chosen, a custom description must have been
+     *   entered by the end user;
+     *
+     * @return {Boolean}
+     */
+    _isFormReady: function() {
+      if (this.props.pending || !this.state.category) {
+        return false;
+      }
+      if (this.state.category === "other" && !this.state.description) {
+        return false;
+      }
+      return true;
+    },
+
+    handleCategoryChange: function(event) {
+      var category = event.target.value;
+      this.setState({
+        category: category,
+        description: category == "other" ? "" : this._getCategories()[category]
+      });
+      if (category == "other") {
+        this.refs.description.getDOMNode().focus();
+      }
+    },
+
+    handleDescriptionFieldChange: function(event) {
+      this.setState({description: event.target.value});
+    },
+
+    handleDescriptionFieldFocus: function(event) {
+      this.setState({category: "other", description: ""});
+    },
+
+    handleFormSubmit: function(event) {
+      event.preventDefault();
+      // XXX this feels ugly, we really want a feedbackActions object here.
+      this.props.feedbackStore.dispatchAction(new sharedActions.SendFeedback({
+        happy: false,
+        category: this.state.category,
+        description: this.state.description
+      }));
+    },
+
+    render: function() {
+      var descriptionDisplayValue = this.state.category === "other" ?
+                                    this.state.description : "";
+      return (
+        FeedbackLayout({title: l10n.get("feedback_what_makes_you_sad"), 
+                        reset: this.props.reset}, 
+          React.DOM.form({onSubmit: this.handleFormSubmit}, 
+            this._getCategoryFields(), 
+            React.DOM.p(null, 
+              React.DOM.input({type: "text", ref: "description", name: "description", 
+                className: "feedback-description", 
+                onChange: this.handleDescriptionFieldChange, 
+                onFocus: this.handleDescriptionFieldFocus, 
+                value: descriptionDisplayValue, 
+                placeholder: 
+                  l10n.get("feedback_custom_category_text_placeholder")})
+            ), 
+            React.DOM.button({type: "submit", className: "btn btn-success", 
+                    disabled: !this._isFormReady()}, 
+              l10n.get("feedback_submit_button")
+            )
+          )
+        )
+      );
+    }
+  });
+
+  /**
+   * Feedback received view.
+   *
+   * Props:
+   * - {Function} onAfterFeedbackReceived Function to execute after the
+   *   WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS timeout has elapsed
+   */
+  var FeedbackReceived = React.createClass({displayName: 'FeedbackReceived',
+    propTypes: {
+      onAfterFeedbackReceived: React.PropTypes.func
+    },
+
+    getInitialState: function() {
+      return {countdown: WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS};
+    },
+
+    componentDidMount: function() {
+      this._timer = setInterval(function() {
+        this.setState({countdown: this.state.countdown - 1});
+      }.bind(this), 1000);
+    },
+
+    componentWillUnmount: function() {
+      if (this._timer) {
+        clearInterval(this._timer);
+      }
+    },
+
+    render: function() {
+      if (this.state.countdown < 1) {
+        clearInterval(this._timer);
+        if (this.props.onAfterFeedbackReceived) {
+          this.props.onAfterFeedbackReceived();
+        }
+      }
+      return (
+        FeedbackLayout({title: l10n.get("feedback_thank_you_heading")}, 
+          React.DOM.p({className: "info thank-you"}, 
+            l10n.get("feedback_window_will_close_in2", {
+              countdown: this.state.countdown,
+              num: this.state.countdown
+            }))
+        )
+      );
+    }
+  });
+
+  /**
+   * Feedback view.
+   */
+  var FeedbackView = React.createClass({displayName: 'FeedbackView',
+    mixins: [Backbone.Events],
+
+    propTypes: {
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore),
+      onAfterFeedbackReceived: React.PropTypes.func,
+      // Used by the UI showcase.
+      feedbackState: React.PropTypes.string
+    },
+
+    getInitialState: function() {
+      var storeState = this.props.feedbackStore.getStoreState();
+      return _.extend({}, storeState, {
+        feedbackState: this.props.feedbackState || storeState.feedbackState
+      });
+    },
+
+    componentWillMount: function() {
+      this.listenTo(this.props.feedbackStore, "change", this._onStoreStateChanged);
+    },
+
+    componentWillUnmount: function() {
+      this.stopListening(this.props.feedbackStore);
+    },
+
+    _onStoreStateChanged: function() {
+      this.setState(this.props.feedbackStore.getStoreState());
+    },
+
+    reset: function() {
+      this.setState(this.props.feedbackStore.getInitialStoreState());
+    },
+
+    handleHappyClick: function() {
+      // XXX: If the user is happy, we directly send this information to the
+      //      feedback API; this is a behavior we might want to revisit later.
+      this.props.feedbackStore.dispatchAction(new sharedActions.SendFeedback({
+        happy: true,
+        category: "",
+        description: ""
+      }));
+    },
+
+    handleSadClick: function() {
+      this.props.feedbackStore.dispatchAction(
+        new sharedActions.RequireFeedbackDetails());
+    },
+
+    _onFeedbackSent: function(err) {
+      if (err) {
+        // XXX better end user error reporting, see bug 1046738
+        console.error("Unable to send user feedback", err);
+      }
+      this.setState({pending: false, step: "finished"});
+    },
+
+    render: function() {
+      switch(this.state.feedbackState) {
+        default:
+        case FEEDBACK_STATES.INIT: {
+          return (
+            FeedbackLayout({title: 
+              l10n.get("feedback_call_experience_heading2")}, 
+              React.DOM.div({className: "faces"}, 
+                React.DOM.button({className: "face face-happy", 
+                        onClick: this.handleHappyClick}), 
+                React.DOM.button({className: "face face-sad", 
+                        onClick: this.handleSadClick})
+              )
+            )
+          );
+        }
+        case FEEDBACK_STATES.DETAILS: {
+          return (
+            FeedbackForm({
+              feedbackStore: this.props.feedbackStore, 
+              reset: this.reset, 
+              pending: this.state.feedbackState === FEEDBACK_STATES.PENDING})
+            );
+        }
+        case FEEDBACK_STATES.PENDING:
+        case FEEDBACK_STATES.SENT:
+        case FEEDBACK_STATES.FAILED: {
+          if (this.state.error) {
+            // XXX better end user error reporting, see bug 1046738
+            console.error("Error encountered while submitting feedback",
+                          this.state.error);
+          }
+          return (
+            FeedbackReceived({
+              onAfterFeedbackReceived: this.props.onAfterFeedbackReceived})
+          );
+        }
+      }
+    }
+  });
+
+  return FeedbackView;
+})(navigator.mozL10n || document.mozL10n);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackViews.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackViews.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/feedbackViews.jsx	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/feedbackViews.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,322 @@
+/** @jsx React.DOM */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* jshint newcap:false */
+/* global loop:true, React */
+var loop = loop || {};
+loop.shared = loop.shared || {};
+loop.shared.views = loop.shared.views || {};
+loop.shared.views.FeedbackView = (function(l10n) {
+  "use strict";
+
+  var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
+
+  var WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS = 5;
+  var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
+
+  /**
+   * Feedback outer layout.
+   *
+   * Props:
+   * -
+   */
+  var FeedbackLayout = React.createClass({
+    propTypes: {
+      children: React.PropTypes.component.isRequired,
+      title: React.PropTypes.string.isRequired,
+      reset: React.PropTypes.func // if not specified, no Back btn is shown
+    },
+
+    render: function() {
+      var backButton = <div />;
+      if (this.props.reset) {
+        backButton = (
+          <button className="fx-embedded-btn-back" type="button"
+                  onClick={this.props.reset}>
+            &laquo;&nbsp;{l10n.get("feedback_back_button")}
+          </button>
+        );
+      }
+      return (
+        <div className="feedback">
+          {backButton}
+          <h3>{this.props.title}</h3>
+          {this.props.children}
+        </div>
+      );
+    }
+  });
+
+  /**
+   * Detailed feedback form.
+   */
+  var FeedbackForm = React.createClass({
+    propTypes: {
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore),
+      pending:       React.PropTypes.bool,
+      reset:         React.PropTypes.func
+    },
+
+    getInitialState: function() {
+      return {category: "", description: ""};
+    },
+
+    getDefaultProps: function() {
+      return {pending: false};
+    },
+
+    _getCategories: function() {
+      return {
+        audio_quality: l10n.get("feedback_category_audio_quality"),
+        video_quality: l10n.get("feedback_category_video_quality"),
+        disconnected : l10n.get("feedback_category_was_disconnected"),
+        confusing:     l10n.get("feedback_category_confusing"),
+        other:         l10n.get("feedback_category_other")
+      };
+    },
+
+    _getCategoryFields: function() {
+      var categories = this._getCategories();
+      return Object.keys(categories).map(function(category, key) {
+        return (
+          <label key={key} className="feedback-category-label">
+            <input type="radio" ref="category" name="category"
+                   className="feedback-category-radio"
+                   value={category}
+                   onChange={this.handleCategoryChange}
+                   checked={this.state.category === category} />
+            {categories[category]}
+          </label>
+        );
+      }, this);
+    },
+
+    /**
+     * Checks if the form is ready for submission:
+     *
+     * - no feedback submission should be pending.
+     * - a category (reason) must be chosen;
+     * - if the "other" category is chosen, a custom description must have been
+     *   entered by the end user;
+     *
+     * @return {Boolean}
+     */
+    _isFormReady: function() {
+      if (this.props.pending || !this.state.category) {
+        return false;
+      }
+      if (this.state.category === "other" && !this.state.description) {
+        return false;
+      }
+      return true;
+    },
+
+    handleCategoryChange: function(event) {
+      var category = event.target.value;
+      this.setState({
+        category: category,
+        description: category == "other" ? "" : this._getCategories()[category]
+      });
+      if (category == "other") {
+        this.refs.description.getDOMNode().focus();
+      }
+    },
+
+    handleDescriptionFieldChange: function(event) {
+      this.setState({description: event.target.value});
+    },
+
+    handleDescriptionFieldFocus: function(event) {
+      this.setState({category: "other", description: ""});
+    },
+
+    handleFormSubmit: function(event) {
+      event.preventDefault();
+      // XXX this feels ugly, we really want a feedbackActions object here.
+      this.props.feedbackStore.dispatchAction(new sharedActions.SendFeedback({
+        happy: false,
+        category: this.state.category,
+        description: this.state.description
+      }));
+    },
+
+    render: function() {
+      var descriptionDisplayValue = this.state.category === "other" ?
+                                    this.state.description : "";
+      return (
+        <FeedbackLayout title={l10n.get("feedback_what_makes_you_sad")}
+                        reset={this.props.reset}>
+          <form onSubmit={this.handleFormSubmit}>
+            {this._getCategoryFields()}
+            <p>
+              <input type="text" ref="description" name="description"
+                className="feedback-description"
+                onChange={this.handleDescriptionFieldChange}
+                onFocus={this.handleDescriptionFieldFocus}
+                value={descriptionDisplayValue}
+                placeholder={
+                  l10n.get("feedback_custom_category_text_placeholder")} />
+            </p>
+            <button type="submit" className="btn btn-success"
+                    disabled={!this._isFormReady()}>
+              {l10n.get("feedback_submit_button")}
+            </button>
+          </form>
+        </FeedbackLayout>
+      );
+    }
+  });
+
+  /**
+   * Feedback received view.
+   *
+   * Props:
+   * - {Function} onAfterFeedbackReceived Function to execute after the
+   *   WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS timeout has elapsed
+   */
+  var FeedbackReceived = React.createClass({
+    propTypes: {
+      onAfterFeedbackReceived: React.PropTypes.func
+    },
+
+    getInitialState: function() {
+      return {countdown: WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS};
+    },
+
+    componentDidMount: function() {
+      this._timer = setInterval(function() {
+        this.setState({countdown: this.state.countdown - 1});
+      }.bind(this), 1000);
+    },
+
+    componentWillUnmount: function() {
+      if (this._timer) {
+        clearInterval(this._timer);
+      }
+    },
+
+    render: function() {
+      if (this.state.countdown < 1) {
+        clearInterval(this._timer);
+        if (this.props.onAfterFeedbackReceived) {
+          this.props.onAfterFeedbackReceived();
+        }
+      }
+      return (
+        <FeedbackLayout title={l10n.get("feedback_thank_you_heading")}>
+          <p className="info thank-you">{
+            l10n.get("feedback_window_will_close_in2", {
+              countdown: this.state.countdown,
+              num: this.state.countdown
+            })}</p>
+        </FeedbackLayout>
+      );
+    }
+  });
+
+  /**
+   * Feedback view.
+   */
+  var FeedbackView = React.createClass({
+    mixins: [Backbone.Events],
+
+    propTypes: {
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore),
+      onAfterFeedbackReceived: React.PropTypes.func,
+      // Used by the UI showcase.
+      feedbackState: React.PropTypes.string
+    },
+
+    getInitialState: function() {
+      var storeState = this.props.feedbackStore.getStoreState();
+      return _.extend({}, storeState, {
+        feedbackState: this.props.feedbackState || storeState.feedbackState
+      });
+    },
+
+    componentWillMount: function() {
+      this.listenTo(this.props.feedbackStore, "change", this._onStoreStateChanged);
+    },
+
+    componentWillUnmount: function() {
+      this.stopListening(this.props.feedbackStore);
+    },
+
+    _onStoreStateChanged: function() {
+      this.setState(this.props.feedbackStore.getStoreState());
+    },
+
+    reset: function() {
+      this.setState(this.props.feedbackStore.getInitialStoreState());
+    },
+
+    handleHappyClick: function() {
+      // XXX: If the user is happy, we directly send this information to the
+      //      feedback API; this is a behavior we might want to revisit later.
+      this.props.feedbackStore.dispatchAction(new sharedActions.SendFeedback({
+        happy: true,
+        category: "",
+        description: ""
+      }));
+    },
+
+    handleSadClick: function() {
+      this.props.feedbackStore.dispatchAction(
+        new sharedActions.RequireFeedbackDetails());
+    },
+
+    _onFeedbackSent: function(err) {
+      if (err) {
+        // XXX better end user error reporting, see bug 1046738
+        console.error("Unable to send user feedback", err);
+      }
+      this.setState({pending: false, step: "finished"});
+    },
+
+    render: function() {
+      switch(this.state.feedbackState) {
+        default:
+        case FEEDBACK_STATES.INIT: {
+          return (
+            <FeedbackLayout title={
+              l10n.get("feedback_call_experience_heading2")}>
+              <div className="faces">
+                <button className="face face-happy"
+                        onClick={this.handleHappyClick}></button>
+                <button className="face face-sad"
+                        onClick={this.handleSadClick}></button>
+              </div>
+            </FeedbackLayout>
+          );
+        }
+        case FEEDBACK_STATES.DETAILS: {
+          return (
+            <FeedbackForm
+              feedbackStore={this.props.feedbackStore}
+              reset={this.reset}
+              pending={this.state.feedbackState === FEEDBACK_STATES.PENDING} />
+            );
+        }
+        case FEEDBACK_STATES.PENDING:
+        case FEEDBACK_STATES.SENT:
+        case FEEDBACK_STATES.FAILED: {
+          if (this.state.error) {
+            // XXX better end user error reporting, see bug 1046738
+            console.error("Error encountered while submitting feedback",
+                          this.state.error);
+          }
+          return (
+            <FeedbackReceived
+              onAfterFeedbackReceived={this.props.onAfterFeedbackReceived} />
+          );
+        }
+      }
+    }
+  });
+
+  return FeedbackView;
+})(navigator.mozL10n || document.mozL10n);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/mixins.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/mixins.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/mixins.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/mixins.js	2014-11-26 21:45:48.000000000 +0000
@@ -154,6 +154,10 @@
      * @param {String} name The filename to play (excluding the extension).
      */
     play: function(name, options) {
+      if (this._isLoopDesktop() && rootObject.navigator.mozLoop.doNotDisturb) {
+        return;
+      }
+
       options = options || {};
       options.loop = options.loop || false;
 
@@ -222,8 +226,66 @@
     }
   };
 
+  /**
+   * A mixin especially for rooms. This plays the right sound according to
+   * the state changes. Requires AudioMixin to also be used.
+   */
+  var RoomsAudioMixin = {
+    mixins: [AudioMixin],
+
+    componentWillUpdate: function(nextProps, nextState) {
+      var ROOM_STATES = loop.store.ROOM_STATES;
+
+      function isConnectedToRoom(state) {
+        return state === ROOM_STATES.HAS_PARTICIPANTS ||
+               state === ROOM_STATES.SESSION_CONNECTED;
+      }
+
+      function notConnectedToRoom(state) {
+        // Failed and full are states that the user is not
+        // really connected to the room, but we don't want to
+        // catch those here, as they get their own sounds.
+        return state === ROOM_STATES.INIT ||
+               state === ROOM_STATES.GATHER ||
+               state === ROOM_STATES.READY ||
+               state === ROOM_STATES.JOINED ||
+               state === ROOM_STATES.ENDED;
+      }
+
+      // Joining the room.
+      if (notConnectedToRoom(this.state.roomState) &&
+          isConnectedToRoom(nextState.roomState)) {
+        this.play("room-joined");
+      }
+
+      // Other people coming and leaving.
+      if (this.state.roomState === ROOM_STATES.SESSION_CONNECTED &&
+          nextState.roomState === ROOM_STATES.HAS_PARTICIPANTS) {
+        this.play("room-joined-in");
+      }
+
+      if (this.state.roomState === ROOM_STATES.HAS_PARTICIPANTS &&
+          nextState.roomState === ROOM_STATES.SESSION_CONNECTED) {
+        this.play("room-left");
+      }
+
+      // Leaving the room - same sound as if a participant leaves
+      if (isConnectedToRoom(this.state.roomState) &&
+          notConnectedToRoom(nextState.roomState)) {
+        this.play("room-left");
+      }
+
+      // Room failures
+      if (nextState.roomState === ROOM_STATES.FAILED ||
+          nextState.roomState === ROOM_STATES.FULL) {
+        this.play("failure");
+      }
+    }
+  };
+
   return {
     AudioMixin: AudioMixin,
+    RoomsAudioMixin: RoomsAudioMixin,
     setRootObject: setRootObject,
     DropdownMenuMixin: DropdownMenuMixin,
     DocumentVisibilityMixin: DocumentVisibilityMixin,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/models.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/models.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/models.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/models.js	2014-11-26 21:45:48.000000000 +0000
@@ -95,6 +95,13 @@
       if (selectedCallType) {
         this.set("selectedCallType", selectedCallType);
       }
+      this.trigger("call:outgoing:get-media-privs");
+    },
+
+    /**
+     * Used to indicate that media privileges have been accepted.
+     */
+    gotMediaPrivs: function() {
       this.trigger("call:outgoing:setup");
     },
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js	2014-11-26 21:45:48.000000000 +0000
@@ -8,6 +8,7 @@
 loop.OTSdkDriver = (function() {
 
   var sharedActions = loop.shared.actions;
+  var FAILURE_REASONS = loop.shared.utils.FAILURE_REASONS;
 
   /**
    * This is a wrapper for the OT sdk. It is used to translate the SDK events into
@@ -47,8 +48,11 @@
       // the initial connect of the session. This saves time when setting up
       // the media.
       this.publisher = this.sdk.initPublisher(this.getLocalElement(),
-        this.publisherConfig,
-        this._onPublishComplete.bind(this));
+        this.publisherConfig);
+      this.publisher.on("accessAllowed", this._onPublishComplete.bind(this));
+      this.publisher.on("accessDenied", this._onPublishDenied.bind(this));
+      this.publisher.on("accessDialogOpened",
+        this._onAccessDialogOpened.bind(this));
     },
 
     /**
@@ -96,16 +100,12 @@
      */
     disconnectSession: function() {
       if (this.session) {
-        this.session.off("streamCreated", this._onRemoteStreamCreated.bind(this));
-        this.session.off("connectionDestroyed",
-          this._onConnectionDestroyed.bind(this));
-        this.session.off("sessionDisconnected",
-          this._onSessionDisconnected.bind(this));
-
+        this.session.off("streamCreated connectionDestroyed sessionDisconnected");
         this.session.disconnect();
         delete this.session;
       }
       if (this.publisher) {
+        this.publisher.off("accessAllowed accessDenied accessDialogOpened");
         this.publisher.destroy();
         delete this.publisher;
       }
@@ -126,7 +126,7 @@
       if (error) {
         console.error("Failed to complete connection", error);
         this.dispatcher.dispatch(new sharedActions.ConnectionFailure({
-          reason: "couldNotConnect"
+          reason: FAILURE_REASONS.COULD_NOT_CONNECT
         }));
         return;
       }
@@ -159,7 +159,7 @@
       // We only need to worry about the network disconnected reason here.
       if (event.reason === "networkDisconnected") {
         this.dispatcher.dispatch(new sharedActions.ConnectionFailure({
-          reason: "networkDisconnected"
+          reason: FAILURE_REASONS.NETWORK_DISCONNECTED
         }));
       }
     },
@@ -189,24 +189,42 @@
     },
 
     /**
-     * Handles the publishing being complete.
+     * Called from the sdk when the media access dialog is opened.
+     * Prevents the default action, to prevent the SDK's "allow access"
+     * dialog from being shown.
      *
-     * @param {Error} error An OT error object, null if there was no error.
+     * @param {OT.Event} event
      */
-    _onPublishComplete: function(error) {
-      if (error) {
-        console.error("Failed to initialize publisher", error);
-        this.dispatcher.dispatch(new sharedActions.ConnectionFailure({
-          reason: "noMedia"
-        }));
-        return;
-      }
+    _onAccessDialogOpened: function(event) {
+      event.preventDefault();
+    },
 
+    /**
+     * Handles the publishing being complete.
+     *
+     * @param {OT.Event} event
+     */
+    _onPublishComplete: function(event) {
+      event.preventDefault();
       this._publisherReady = true;
       this._maybePublishLocalStream();
     },
 
     /**
+     * Handles publishing of media being denied.
+     *
+     * @param {OT.Event} event
+     */
+    _onPublishDenied: function(event) {
+      // This prevents the SDK's "access denied" dialog showing.
+      event.preventDefault();
+
+      this.dispatcher.dispatch(new sharedActions.ConnectionFailure({
+        reason: FAILURE_REASONS.MEDIA_DENIED
+      }));
+    },
+
+    /**
      * Publishes the local stream if the session is connected
      * and the publisher is ready.
      */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/roomStore.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/roomStore.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/roomStore.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/roomStore.js	2014-11-26 21:45:48.000000000 +0000
@@ -47,51 +47,14 @@
   /**
    * Room store.
    *
-   * Options:
-   * - {loop.Dispatcher} dispatcher       The dispatcher for dispatching actions
+   * @param {loop.Dispatcher} dispatcher  The dispatcher for dispatching actions
    *                                      and registering to consume actions.
+   * @param {Object} options Options object:
    * - {mozLoop}         mozLoop          The MozLoop API object.
    * - {ActiveRoomStore} activeRoomStore  An optional substore for active room
    *                                      state.
-   *
-   * @extends {Backbone.Events}
-   * @param {Object} options Options object.
    */
-  function RoomStore(options) {
-    options = options || {};
-
-    if (!options.dispatcher) {
-      throw new Error("Missing option dispatcher");
-    }
-    this._dispatcher = options.dispatcher;
-
-    if (!options.mozLoop) {
-      throw new Error("Missing option mozLoop");
-    }
-    this._mozLoop = options.mozLoop;
-
-    if (options.activeRoomStore) {
-      this.activeRoomStore = options.activeRoomStore;
-      this.setStoreState({activeRoom: this.activeRoomStore.getStoreState()});
-      this.activeRoomStore.on("change",
-                              this._onActiveRoomStoreChange.bind(this));
-    }
-
-    this._dispatcher.register(this, [
-      "createRoom",
-      "createRoomError",
-      "copyRoomUrl",
-      "deleteRoom",
-      "deleteRoomError",
-      "emailRoomUrl",
-      "getAllRooms",
-      "getAllRoomsError",
-      "openRoom",
-      "updateRoomList"
-    ]);
-  }
-
-  RoomStore.prototype = _.extend({
+  loop.store.RoomStore = loop.store.createStore({
     /**
      * Maximum size given to createRoom; only 2 is supported (and is
      * always passed) because that's what the user-experience is currently
@@ -107,58 +70,44 @@
     defaultExpiresIn: 24 * 7 * 8,
 
     /**
-     * Internal store state representation.
-     * @type {Object}
-     * @see  #getStoreState
+     * Registered actions.
+     * @type {Array}
      */
-    _storeState: {
-      activeRoom: {},
-      error: null,
-      pendingCreation: false,
-      pendingInitialRetrieval: false,
-      rooms: []
-    },
+    actions: [
+      "createRoom",
+      "createRoomError",
+      "copyRoomUrl",
+      "deleteRoom",
+      "deleteRoomError",
+      "emailRoomUrl",
+      "getAllRooms",
+      "getAllRoomsError",
+      "openRoom",
+      "renameRoom",
+      "updateRoomList"
+    ],
 
-    /**
-     * Retrieves current store state. The returned state object holds the
-     * following properties:
-     *
-     * - {Boolean} pendingCreation         Pending room creation flag.
-     * - {Boolean} pendingInitialRetrieval Pending initial list retrieval flag.
-     * - {Array}   rooms                   The current room list.
-     * - {Error}   error                   Latest error encountered, if any.
-     * - {Object}  activeRoom              Active room data, if any.
-     *
-     * You can request a given state property by providing the `key` argument.
-     *
-     * @param  {String|undefined} key An optional state property name.
-     * @return {Object}
-     */
-    getStoreState: function(key) {
-      if (key) {
-        return this._storeState[key];
+    initialize: function(options) {
+      if (!options.mozLoop) {
+        throw new Error("Missing option mozLoop");
       }
-      return this._storeState;
-    },
+      this._mozLoop = options.mozLoop;
 
-    /**
-     * Updates store state and trigger a global "change" event, plus one for
-     * each provided newState property:
-     *
-     * - change:rooms
-     * - change:pendingInitialRetrieval
-     * - change:pendingCreation
-     * - change:error
-     * - change:activeRoom
-     *
-     * @param {Object} newState The new store state object.
-     */
-    setStoreState: function(newState) {
-      for (var key in newState) {
-        this._storeState[key] = newState[key];
-        this.trigger("change:" + key);
+      if (options.activeRoomStore) {
+        this.activeRoomStore = options.activeRoomStore;
+        this.activeRoomStore.on("change",
+                                this._onActiveRoomStoreChange.bind(this));
       }
-      this.trigger("change");
+    },
+
+    getInitialStoreState: function() {
+      return {
+        activeRoom: this.activeRoomStore ? this.activeRoomStore.getStoreState() : {},
+        error: null,
+        pendingCreation: false,
+        pendingInitialRetrieval: false,
+        rooms: []
+      };
     },
 
     /**
@@ -179,15 +128,6 @@
     },
 
     /**
-     * Local proxy helper to dispatch an action.
-     *
-     * @param {Action} action The action to dispatch.
-     */
-    _dispatchAction: function(action) {
-      this._dispatcher.dispatch(action);
-    },
-
-    /**
      * Updates current room list when a new room is available.
      *
      * @param {String} eventName     The event name (unused).
@@ -196,7 +136,7 @@
     _onRoomAdded: function(eventName, addedRoomData) {
       addedRoomData.participants = [];
       addedRoomData.ctime = new Date().getTime();
-      this._dispatchAction(new sharedActions.UpdateRoomList({
+      this.dispatchAction(new sharedActions.UpdateRoomList({
         roomList: this._storeState.rooms.concat(new Room(addedRoomData))
       }));
     },
@@ -208,7 +148,7 @@
      * @param {Object} updatedRoomData The updated room data.
      */
     _onRoomUpdated: function(eventName, updatedRoomData) {
-      this._dispatchAction(new sharedActions.UpdateRoomList({
+      this.dispatchAction(new sharedActions.UpdateRoomList({
         roomList: this._storeState.rooms.map(function(room) {
           return room.roomToken === updatedRoomData.roomToken ?
                  updatedRoomData : room;
@@ -223,7 +163,7 @@
      * @param {Object} removedRoomData The removed room data.
      */
     _onRoomRemoved: function(eventName, removedRoomData) {
-      this._dispatchAction(new sharedActions.UpdateRoomList({
+      this.dispatchAction(new sharedActions.UpdateRoomList({
         roomList: this._storeState.rooms.filter(function(room) {
           return room.roomToken !== removedRoomData.roomToken;
         })
@@ -302,7 +242,7 @@
       this._mozLoop.rooms.create(roomCreationData, function(err) {
         this.setStoreState({pendingCreation: false});
         if (err) {
-          this._dispatchAction(new sharedActions.CreateRoomError({error: err}));
+          this.dispatchAction(new sharedActions.CreateRoomError({error: err}));
         }
       }.bind(this));
     },
@@ -345,7 +285,7 @@
     deleteRoom: function(actionData) {
       this._mozLoop.rooms.delete(actionData.roomToken, function(err) {
         if (err) {
-         this._dispatchAction(new sharedActions.DeleteRoomError({error: err}));
+         this.dispatchAction(new sharedActions.DeleteRoomError({error: err}));
         }
       }.bind(this));
     },
@@ -375,7 +315,7 @@
           action = new sharedActions.UpdateRoomList({roomList: rawRoomList});
         }
 
-        this._dispatchAction(action);
+        this.dispatchAction(action);
 
         // We can only start listening to room events after getAll() has been
         // called executed first.
@@ -411,8 +351,21 @@
      */
     openRoom: function(actionData) {
       this._mozLoop.rooms.open(actionData.roomToken);
-    }
-  }, Backbone.Events);
+    },
 
-  loop.store.RoomStore = RoomStore;
+    /**
+     * Renames a room.
+     *
+     * @param {sharedActions.RenameRoom} actionData
+     */
+    renameRoom: function(actionData) {
+      this._mozLoop.rooms.rename(actionData.roomToken, actionData.newRoomName,
+        function(err) {
+          if (err) {
+            // XXX Give this a proper UI - bug 1100595.
+            console.error("Failed to rename the room", err);
+          }
+        });
+    }
+  });
 })();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/store.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/store.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/store.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/store.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,96 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+loop.store = loop.store || {};
+
+loop.store.createStore = (function() {
+  "use strict";
+
+  var baseStorePrototype = {
+    __registerActions: function(actions) {
+      // check that store methods are implemented
+      actions.forEach(function(handler) {
+        if (typeof this[handler] !== "function") {
+          throw new Error("Store should implement an action handler for " +
+                          handler);
+        }
+      }, this);
+      this.dispatcher.register(this, actions);
+    },
+
+    /**
+     * Proxy helper for dispatching an action from this store.
+     *
+     * @param  {sharedAction.Action} action The action to dispatch.
+     */
+    dispatchAction: function(action) {
+      this.dispatcher.dispatch(action);
+    },
+
+    /**
+     * Returns current store state. You can request a given state property by
+     * providing the `key` argument.
+     *
+     * @param  {String|undefined} key An optional state property name.
+     * @return {Mixed}
+     */
+    getStoreState: function(key) {
+      return key ? this._storeState[key] : this._storeState;
+    },
+
+    /**
+     * Updates store state and trigger a global "change" event, plus one for
+     * each provided newState property.
+     *
+     * @param {Object} newState The new store state object.
+     */
+    setStoreState: function(newState) {
+      for (var key in newState) {
+        this._storeState[key] = newState[key];
+        this.trigger("change:" + key);
+      }
+      this.trigger("change");
+    }
+  };
+
+  /**
+   * Creates a new Store constructor.
+   *
+   * @param  {Object}   storeProto The store prototype.
+   * @return {Function}            A store constructor.
+   */
+  function createStore(storeProto) {
+    var BaseStore = function(dispatcher, options) {
+      options = options || {};
+
+      if (!dispatcher) {
+        throw new Error("Missing required dispatcher");
+      }
+      this.dispatcher = dispatcher;
+      if (Array.isArray(this.actions)) {
+        this.__registerActions(this.actions);
+      }
+
+      if (typeof this.initialize === "function") {
+        this.initialize(options);
+      }
+
+      if (typeof this.getInitialStoreState === "function") {
+        this._storeState = this.getInitialStoreState();
+      } else {
+        this._storeState = {};
+      }
+    };
+    BaseStore.prototype = _.extend({}, // destination object
+                                   Backbone.Events,
+                                   baseStorePrototype,
+                                   storeProto);
+    return BaseStore;
+  }
+
+  return createStore;
+})();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/utils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/utils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/utils.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/utils.js	2014-11-26 21:45:48.000000000 +0000
@@ -17,6 +17,14 @@
     AUDIO_ONLY: "audio"
   };
 
+  var FAILURE_REASONS = {
+    MEDIA_DENIED: "reason-media-denied",
+    COULD_NOT_CONNECT: "reason-could-not-connect",
+    NETWORK_DISCONNECTED: "reason-network-disconnected",
+    EXPIRED_OR_INVALID: "reason-expired-or-invalid",
+    UNKNOWN: "reason-unknown"
+  };
+
   /**
    * Format a given date into an l10n-friendly string.
    *
@@ -40,7 +48,7 @@
    */
   function getBoolPreference(prefName) {
     if (navigator.mozLoop) {
-      return !!navigator.mozLoop.getLoopBoolPref(prefName);
+      return !!navigator.mozLoop.getLoopPref(prefName);
     }
 
     return !!localStorage.getItem(prefName);
@@ -102,7 +110,7 @@
       mozL10n.get("share_email_body4", {
         callUrl: callUrl,
         clientShortname: mozL10n.get("clientShortname2"),
-        learnMoreUrl: navigator.mozLoop.getLoopCharPref("learnMoreUrl")
+        learnMoreUrl: navigator.mozLoop.getLoopPref("learnMoreUrl")
       }),
       recipient
     );
@@ -110,6 +118,7 @@
 
   return {
     CALL_TYPES: CALL_TYPES,
+    FAILURE_REASONS: FAILURE_REASONS,
     Helper: Helper,
     composeCallUrlEmail: composeCallUrlEmail,
     formatDate: formatDate,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/views.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/views.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/views.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/views.js	2014-11-26 21:45:48.000000000 +0000
@@ -14,8 +14,6 @@
   var sharedModels = loop.shared.models;
   var sharedMixins = loop.shared.mixins;
 
-  var WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS = 5;
-
   /**
    * Media control button.
    *
@@ -346,287 +344,6 @@
   });
 
   /**
-   * Feedback outer layout.
-   *
-   * Props:
-   * -
-   */
-  var FeedbackLayout = React.createClass({displayName: 'FeedbackLayout',
-    propTypes: {
-      children: React.PropTypes.component.isRequired,
-      title: React.PropTypes.string.isRequired,
-      reset: React.PropTypes.func // if not specified, no Back btn is shown
-    },
-
-    render: function() {
-      var backButton = React.DOM.div(null);
-      if (this.props.reset) {
-        backButton = (
-          React.DOM.button({className: "fx-embedded-btn-back", type: "button", 
-                  onClick: this.props.reset}, 
-            "« ", l10n.get("feedback_back_button")
-          )
-        );
-      }
-      return (
-        React.DOM.div({className: "feedback"}, 
-          backButton, 
-          React.DOM.h3(null, this.props.title), 
-          this.props.children
-        )
-      );
-    }
-  });
-
-  /**
-   * Detailed feedback form.
-   */
-  var FeedbackForm = React.createClass({displayName: 'FeedbackForm',
-    propTypes: {
-      pending:      React.PropTypes.bool,
-      sendFeedback: React.PropTypes.func,
-      reset:        React.PropTypes.func
-    },
-
-    getInitialState: function() {
-      return {category: "", description: ""};
-    },
-
-    getDefaultProps: function() {
-      return {pending: false};
-    },
-
-    _getCategories: function() {
-      return {
-        audio_quality: l10n.get("feedback_category_audio_quality"),
-        video_quality: l10n.get("feedback_category_video_quality"),
-        disconnected : l10n.get("feedback_category_was_disconnected"),
-        confusing:     l10n.get("feedback_category_confusing"),
-        other:         l10n.get("feedback_category_other")
-      };
-    },
-
-    _getCategoryFields: function() {
-      var categories = this._getCategories();
-      return Object.keys(categories).map(function(category, key) {
-        return (
-          React.DOM.label({key: key, className: "feedback-category-label"}, 
-            React.DOM.input({type: "radio", ref: "category", name: "category", 
-                   className: "feedback-category-radio", 
-                   value: category, 
-                   onChange: this.handleCategoryChange, 
-                   checked: this.state.category === category}), 
-            categories[category]
-          )
-        );
-      }, this);
-    },
-
-    /**
-     * Checks if the form is ready for submission:
-     *
-     * - no feedback submission should be pending.
-     * - a category (reason) must be chosen;
-     * - if the "other" category is chosen, a custom description must have been
-     *   entered by the end user;
-     *
-     * @return {Boolean}
-     */
-    _isFormReady: function() {
-      if (this.props.pending || !this.state.category) {
-        return false;
-      }
-      if (this.state.category === "other" && !this.state.description) {
-        return false;
-      }
-      return true;
-    },
-
-    handleCategoryChange: function(event) {
-      var category = event.target.value;
-      this.setState({
-        category: category,
-        description: category == "other" ? "" : this._getCategories()[category]
-      });
-      if (category == "other") {
-        this.refs.description.getDOMNode().focus();
-      }
-    },
-
-    handleDescriptionFieldChange: function(event) {
-      this.setState({description: event.target.value});
-    },
-
-    handleDescriptionFieldFocus: function(event) {
-      this.setState({category: "other", description: ""});
-    },
-
-    handleFormSubmit: function(event) {
-      event.preventDefault();
-      this.props.sendFeedback({
-        happy: false,
-        category: this.state.category,
-        description: this.state.description
-      });
-    },
-
-    render: function() {
-      var descriptionDisplayValue = this.state.category === "other" ?
-                                    this.state.description : "";
-      return (
-        FeedbackLayout({title: l10n.get("feedback_what_makes_you_sad"), 
-                        reset: this.props.reset}, 
-          React.DOM.form({onSubmit: this.handleFormSubmit}, 
-            this._getCategoryFields(), 
-            React.DOM.p(null, 
-              React.DOM.input({type: "text", ref: "description", name: "description", 
-                className: "feedback-description", 
-                onChange: this.handleDescriptionFieldChange, 
-                onFocus: this.handleDescriptionFieldFocus, 
-                value: descriptionDisplayValue, 
-                placeholder: 
-                  l10n.get("feedback_custom_category_text_placeholder")})
-            ), 
-            React.DOM.button({type: "submit", className: "btn btn-success", 
-                    disabled: !this._isFormReady()}, 
-              l10n.get("feedback_submit_button")
-            )
-          )
-        )
-      );
-    }
-  });
-
-  /**
-   * Feedback received view.
-   *
-   * Props:
-   * - {Function} onAfterFeedbackReceived Function to execute after the
-   *   WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS timeout has elapsed
-   */
-  var FeedbackReceived = React.createClass({displayName: 'FeedbackReceived',
-    propTypes: {
-      onAfterFeedbackReceived: React.PropTypes.func
-    },
-
-    getInitialState: function() {
-      return {countdown: WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS};
-    },
-
-    componentDidMount: function() {
-      this._timer = setInterval(function() {
-        this.setState({countdown: this.state.countdown - 1});
-      }.bind(this), 1000);
-    },
-
-    componentWillUnmount: function() {
-      if (this._timer) {
-        clearInterval(this._timer);
-      }
-    },
-
-    render: function() {
-      if (this.state.countdown < 1) {
-        clearInterval(this._timer);
-        if (this.props.onAfterFeedbackReceived) {
-          this.props.onAfterFeedbackReceived();
-        }
-      }
-      return (
-        FeedbackLayout({title: l10n.get("feedback_thank_you_heading")}, 
-          React.DOM.p({className: "info thank-you"}, 
-            l10n.get("feedback_window_will_close_in2", {
-              countdown: this.state.countdown,
-              num: this.state.countdown
-            }))
-        )
-      );
-    }
-  });
-
-  /**
-   * Feedback view.
-   */
-  var FeedbackView = React.createClass({displayName: 'FeedbackView',
-    mixins: [sharedMixins.AudioMixin],
-
-    propTypes: {
-      // A loop.FeedbackAPIClient instance
-      feedbackApiClient: React.PropTypes.object.isRequired,
-      onAfterFeedbackReceived: React.PropTypes.func,
-      // The current feedback submission flow step name
-      step: React.PropTypes.oneOf(["start", "form", "finished"])
-    },
-
-    getInitialState: function() {
-      return {pending: false, step: this.props.step || "start"};
-    },
-
-    getDefaultProps: function() {
-      return {step: "start"};
-    },
-
-    componentDidMount: function() {
-      this.play("terminated");
-    },
-
-    reset: function() {
-      this.setState(this.getInitialState());
-    },
-
-    handleHappyClick: function() {
-      this.sendFeedback({happy: true}, this._onFeedbackSent);
-    },
-
-    handleSadClick: function() {
-      this.setState({step: "form"});
-    },
-
-    sendFeedback: function(fields) {
-      // Setting state.pending to true will disable the submit button to avoid
-      // multiple submissions
-      this.setState({pending: true});
-      // Sends feedback data
-      this.props.feedbackApiClient.send(fields, this._onFeedbackSent);
-    },
-
-    _onFeedbackSent: function(err) {
-      if (err) {
-        // XXX better end user error reporting, see bug 1046738
-        console.error("Unable to send user feedback", err);
-      }
-      this.setState({pending: false, step: "finished"});
-    },
-
-    render: function() {
-      switch(this.state.step) {
-        case "finished":
-          return (
-            FeedbackReceived({
-              onAfterFeedbackReceived: this.props.onAfterFeedbackReceived})
-          );
-        case "form":
-          return FeedbackForm({feedbackApiClient: this.props.feedbackApiClient, 
-                               sendFeedback: this.sendFeedback, 
-                               reset: this.reset, 
-                               pending: this.state.pending});
-        default:
-          return (
-            FeedbackLayout({title: 
-              l10n.get("feedback_call_experience_heading2")}, 
-              React.DOM.div({className: "faces"}, 
-                React.DOM.button({className: "face face-happy", 
-                        onClick: this.handleHappyClick}), 
-                React.DOM.button({className: "face face-sad", 
-                        onClick: this.handleSadClick})
-              )
-            )
-          );
-      }
-    }
-  });
-
-  /**
    * Notification view.
    */
   var NotificationView = React.createClass({displayName: 'NotificationView',
@@ -718,12 +435,14 @@
       onClick: React.PropTypes.func.isRequired,
       disabled: React.PropTypes.bool,
       additionalClass: React.PropTypes.string,
+      htmlId: React.PropTypes.string,
     },
 
     getDefaultProps: function() {
       return {
         disabled: false,
         additionalClass: "",
+        htmlId: "",
       };
     },
 
@@ -736,11 +455,12 @@
       return (
         React.DOM.button({onClick: this.props.onClick, 
                 disabled: this.props.disabled, 
+                id: this.props.htmlId, 
                 className: cx(classObject)}, 
           React.DOM.span({className: "button-caption"}, this.props.caption), 
           this.props.children
         )
-      )
+      );
     }
   });
 
@@ -765,7 +485,7 @@
         React.DOM.div({className: cx(classObject)}, 
           this.props.children
         )
-      )
+      );
     }
   });
 
@@ -774,7 +494,6 @@
     ButtonGroup: ButtonGroup,
     ConversationView: ConversationView,
     ConversationToolbar: ConversationToolbar,
-    FeedbackView: FeedbackView,
     MediaControlButton: MediaControlButton,
     NotificationListView: NotificationListView
   };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/views.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/views.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/js/views.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/js/views.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -14,8 +14,6 @@
   var sharedModels = loop.shared.models;
   var sharedMixins = loop.shared.mixins;
 
-  var WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS = 5;
-
   /**
    * Media control button.
    *
@@ -346,287 +344,6 @@
   });
 
   /**
-   * Feedback outer layout.
-   *
-   * Props:
-   * -
-   */
-  var FeedbackLayout = React.createClass({
-    propTypes: {
-      children: React.PropTypes.component.isRequired,
-      title: React.PropTypes.string.isRequired,
-      reset: React.PropTypes.func // if not specified, no Back btn is shown
-    },
-
-    render: function() {
-      var backButton = <div />;
-      if (this.props.reset) {
-        backButton = (
-          <button className="fx-embedded-btn-back" type="button"
-                  onClick={this.props.reset}>
-            &laquo;&nbsp;{l10n.get("feedback_back_button")}
-          </button>
-        );
-      }
-      return (
-        <div className="feedback">
-          {backButton}
-          <h3>{this.props.title}</h3>
-          {this.props.children}
-        </div>
-      );
-    }
-  });
-
-  /**
-   * Detailed feedback form.
-   */
-  var FeedbackForm = React.createClass({
-    propTypes: {
-      pending:      React.PropTypes.bool,
-      sendFeedback: React.PropTypes.func,
-      reset:        React.PropTypes.func
-    },
-
-    getInitialState: function() {
-      return {category: "", description: ""};
-    },
-
-    getDefaultProps: function() {
-      return {pending: false};
-    },
-
-    _getCategories: function() {
-      return {
-        audio_quality: l10n.get("feedback_category_audio_quality"),
-        video_quality: l10n.get("feedback_category_video_quality"),
-        disconnected : l10n.get("feedback_category_was_disconnected"),
-        confusing:     l10n.get("feedback_category_confusing"),
-        other:         l10n.get("feedback_category_other")
-      };
-    },
-
-    _getCategoryFields: function() {
-      var categories = this._getCategories();
-      return Object.keys(categories).map(function(category, key) {
-        return (
-          <label key={key} className="feedback-category-label">
-            <input type="radio" ref="category" name="category"
-                   className="feedback-category-radio"
-                   value={category}
-                   onChange={this.handleCategoryChange}
-                   checked={this.state.category === category} />
-            {categories[category]}
-          </label>
-        );
-      }, this);
-    },
-
-    /**
-     * Checks if the form is ready for submission:
-     *
-     * - no feedback submission should be pending.
-     * - a category (reason) must be chosen;
-     * - if the "other" category is chosen, a custom description must have been
-     *   entered by the end user;
-     *
-     * @return {Boolean}
-     */
-    _isFormReady: function() {
-      if (this.props.pending || !this.state.category) {
-        return false;
-      }
-      if (this.state.category === "other" && !this.state.description) {
-        return false;
-      }
-      return true;
-    },
-
-    handleCategoryChange: function(event) {
-      var category = event.target.value;
-      this.setState({
-        category: category,
-        description: category == "other" ? "" : this._getCategories()[category]
-      });
-      if (category == "other") {
-        this.refs.description.getDOMNode().focus();
-      }
-    },
-
-    handleDescriptionFieldChange: function(event) {
-      this.setState({description: event.target.value});
-    },
-
-    handleDescriptionFieldFocus: function(event) {
-      this.setState({category: "other", description: ""});
-    },
-
-    handleFormSubmit: function(event) {
-      event.preventDefault();
-      this.props.sendFeedback({
-        happy: false,
-        category: this.state.category,
-        description: this.state.description
-      });
-    },
-
-    render: function() {
-      var descriptionDisplayValue = this.state.category === "other" ?
-                                    this.state.description : "";
-      return (
-        <FeedbackLayout title={l10n.get("feedback_what_makes_you_sad")}
-                        reset={this.props.reset}>
-          <form onSubmit={this.handleFormSubmit}>
-            {this._getCategoryFields()}
-            <p>
-              <input type="text" ref="description" name="description"
-                className="feedback-description"
-                onChange={this.handleDescriptionFieldChange}
-                onFocus={this.handleDescriptionFieldFocus}
-                value={descriptionDisplayValue}
-                placeholder={
-                  l10n.get("feedback_custom_category_text_placeholder")} />
-            </p>
-            <button type="submit" className="btn btn-success"
-                    disabled={!this._isFormReady()}>
-              {l10n.get("feedback_submit_button")}
-            </button>
-          </form>
-        </FeedbackLayout>
-      );
-    }
-  });
-
-  /**
-   * Feedback received view.
-   *
-   * Props:
-   * - {Function} onAfterFeedbackReceived Function to execute after the
-   *   WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS timeout has elapsed
-   */
-  var FeedbackReceived = React.createClass({
-    propTypes: {
-      onAfterFeedbackReceived: React.PropTypes.func
-    },
-
-    getInitialState: function() {
-      return {countdown: WINDOW_AUTOCLOSE_TIMEOUT_IN_SECONDS};
-    },
-
-    componentDidMount: function() {
-      this._timer = setInterval(function() {
-        this.setState({countdown: this.state.countdown - 1});
-      }.bind(this), 1000);
-    },
-
-    componentWillUnmount: function() {
-      if (this._timer) {
-        clearInterval(this._timer);
-      }
-    },
-
-    render: function() {
-      if (this.state.countdown < 1) {
-        clearInterval(this._timer);
-        if (this.props.onAfterFeedbackReceived) {
-          this.props.onAfterFeedbackReceived();
-        }
-      }
-      return (
-        <FeedbackLayout title={l10n.get("feedback_thank_you_heading")}>
-          <p className="info thank-you">{
-            l10n.get("feedback_window_will_close_in2", {
-              countdown: this.state.countdown,
-              num: this.state.countdown
-            })}</p>
-        </FeedbackLayout>
-      );
-    }
-  });
-
-  /**
-   * Feedback view.
-   */
-  var FeedbackView = React.createClass({
-    mixins: [sharedMixins.AudioMixin],
-
-    propTypes: {
-      // A loop.FeedbackAPIClient instance
-      feedbackApiClient: React.PropTypes.object.isRequired,
-      onAfterFeedbackReceived: React.PropTypes.func,
-      // The current feedback submission flow step name
-      step: React.PropTypes.oneOf(["start", "form", "finished"])
-    },
-
-    getInitialState: function() {
-      return {pending: false, step: this.props.step || "start"};
-    },
-
-    getDefaultProps: function() {
-      return {step: "start"};
-    },
-
-    componentDidMount: function() {
-      this.play("terminated");
-    },
-
-    reset: function() {
-      this.setState(this.getInitialState());
-    },
-
-    handleHappyClick: function() {
-      this.sendFeedback({happy: true}, this._onFeedbackSent);
-    },
-
-    handleSadClick: function() {
-      this.setState({step: "form"});
-    },
-
-    sendFeedback: function(fields) {
-      // Setting state.pending to true will disable the submit button to avoid
-      // multiple submissions
-      this.setState({pending: true});
-      // Sends feedback data
-      this.props.feedbackApiClient.send(fields, this._onFeedbackSent);
-    },
-
-    _onFeedbackSent: function(err) {
-      if (err) {
-        // XXX better end user error reporting, see bug 1046738
-        console.error("Unable to send user feedback", err);
-      }
-      this.setState({pending: false, step: "finished"});
-    },
-
-    render: function() {
-      switch(this.state.step) {
-        case "finished":
-          return (
-            <FeedbackReceived
-              onAfterFeedbackReceived={this.props.onAfterFeedbackReceived} />
-          );
-        case "form":
-          return <FeedbackForm feedbackApiClient={this.props.feedbackApiClient}
-                               sendFeedback={this.sendFeedback}
-                               reset={this.reset}
-                               pending={this.state.pending} />;
-        default:
-          return (
-            <FeedbackLayout title={
-              l10n.get("feedback_call_experience_heading2")}>
-              <div className="faces">
-                <button className="face face-happy"
-                        onClick={this.handleHappyClick}></button>
-                <button className="face face-sad"
-                        onClick={this.handleSadClick}></button>
-              </div>
-            </FeedbackLayout>
-          );
-      }
-    }
-  });
-
-  /**
    * Notification view.
    */
   var NotificationView = React.createClass({
@@ -718,12 +435,14 @@
       onClick: React.PropTypes.func.isRequired,
       disabled: React.PropTypes.bool,
       additionalClass: React.PropTypes.string,
+      htmlId: React.PropTypes.string,
     },
 
     getDefaultProps: function() {
       return {
         disabled: false,
         additionalClass: "",
+        htmlId: "",
       };
     },
 
@@ -736,11 +455,12 @@
       return (
         <button onClick={this.props.onClick}
                 disabled={this.props.disabled}
+                id={this.props.htmlId}
                 className={cx(classObject)}>
           <span className="button-caption">{this.props.caption}</span>
           {this.props.children}
         </button>
-      )
+      );
     }
   });
 
@@ -765,7 +485,7 @@
         <div className={cx(classObject)}>
           {this.props.children}
         </div>
-      )
+      );
     }
   });
 
@@ -774,7 +494,6 @@
     ButtonGroup: ButtonGroup,
     ConversationView: ConversationView,
     ConversationToolbar: ConversationToolbar,
-    FeedbackView: FeedbackView,
     MediaControlButton: MediaControlButton,
     NotificationListView: NotificationListView
   };
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/sounds/room-joined-in.ogg and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/sounds/room-joined-in.ogg differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/sounds/room-joined.ogg and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/sounds/room-joined.ogg differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/content/shared/sounds/room-left.ogg and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/content/shared/sounds/room-left.ogg differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/jar.mn thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/jar.mn
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/jar.mn	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/jar.mn	2014-11-26 21:45:48.000000000 +0000
@@ -50,23 +50,35 @@
   content/browser/loop/shared/img/svg/glyph-account-16x16.svg   (content/shared/img/svg/glyph-account-16x16.svg)
   content/browser/loop/shared/img/svg/glyph-signin-16x16.svg    (content/shared/img/svg/glyph-signin-16x16.svg)
   content/browser/loop/shared/img/svg/glyph-signout-16x16.svg   (content/shared/img/svg/glyph-signout-16x16.svg)
+  content/browser/loop/shared/img/svg/glyph-help-16x16.svg      (content/shared/img/svg/glyph-help-16x16.svg)
   content/browser/loop/shared/img/audio-call-avatar.svg         (content/shared/img/audio-call-avatar.svg)
   content/browser/loop/shared/img/beta-ribbon.svg               (content/shared/img/beta-ribbon.svg)
   content/browser/loop/shared/img/icons-10x10.svg               (content/shared/img/icons-10x10.svg)
   content/browser/loop/shared/img/icons-14x14.svg               (content/shared/img/icons-14x14.svg)
   content/browser/loop/shared/img/icons-16x16.svg               (content/shared/img/icons-16x16.svg)
+  content/browser/loop/shared/img/movistar.png                  (content/shared/img/movistar.png)
+  content/browser/loop/shared/img/movistar@2x.png               (content/shared/img/movistar@2x.png)
+  content/browser/loop/shared/img/vivo.png                      (content/shared/img/vivo.png)
+  content/browser/loop/shared/img/vivo@2x.png                   (content/shared/img/vivo@2x.png)
+  content/browser/loop/shared/img/02.png                        (content/shared/img/02.png)
+  content/browser/loop/shared/img/02@2x.png                     (content/shared/img/02@2x.png)
+  content/browser/loop/shared/img/telefonica.png                (content/shared/img/telefonica.png)
+  content/browser/loop/shared/img/telefonica@2x.png             (content/shared/img/telefonica@2x.png)
 
   # Shared scripts
   content/browser/loop/shared/js/actions.js           (content/shared/js/actions.js)
   content/browser/loop/shared/js/conversationStore.js (content/shared/js/conversationStore.js)
+  content/browser/loop/shared/js/store.js             (content/shared/js/store.js)
   content/browser/loop/shared/js/roomStore.js         (content/shared/js/roomStore.js)
   content/browser/loop/shared/js/activeRoomStore.js   (content/shared/js/activeRoomStore.js)
+  content/browser/loop/shared/js/feedbackStore.js     (content/shared/js/feedbackStore.js)
   content/browser/loop/shared/js/dispatcher.js        (content/shared/js/dispatcher.js)
   content/browser/loop/shared/js/feedbackApiClient.js (content/shared/js/feedbackApiClient.js)
   content/browser/loop/shared/js/models.js            (content/shared/js/models.js)
   content/browser/loop/shared/js/mixins.js            (content/shared/js/mixins.js)
   content/browser/loop/shared/js/otSdkDriver.js       (content/shared/js/otSdkDriver.js)
   content/browser/loop/shared/js/views.js             (content/shared/js/views.js)
+  content/browser/loop/shared/js/feedbackViews.js     (content/shared/js/feedbackViews.js)
   content/browser/loop/shared/js/utils.js             (content/shared/js/utils.js)
   content/browser/loop/shared/js/validate.js          (content/shared/js/validate.js)
   content/browser/loop/shared/js/websocket.js         (content/shared/js/websocket.js)
@@ -82,11 +94,14 @@
   content/browser/loop/shared/libs/backbone-1.1.2.js  (content/shared/libs/backbone-1.1.2.js)
 
   # Shared sounds
-  content/browser/loop/shared/sounds/ringtone.ogg     (content/shared/sounds/ringtone.ogg)
-  content/browser/loop/shared/sounds/connecting.ogg   (content/shared/sounds/connecting.ogg)
-  content/browser/loop/shared/sounds/connected.ogg    (content/shared/sounds/connected.ogg)
-  content/browser/loop/shared/sounds/terminated.ogg   (content/shared/sounds/terminated.ogg)
-  content/browser/loop/shared/sounds/failure.ogg      (content/shared/sounds/failure.ogg)
+  content/browser/loop/shared/sounds/ringtone.ogg       (content/shared/sounds/ringtone.ogg)
+  content/browser/loop/shared/sounds/connecting.ogg     (content/shared/sounds/connecting.ogg)
+  content/browser/loop/shared/sounds/connected.ogg      (content/shared/sounds/connected.ogg)
+  content/browser/loop/shared/sounds/terminated.ogg     (content/shared/sounds/terminated.ogg)
+  content/browser/loop/shared/sounds/room-joined.ogg    (content/shared/sounds/room-joined.ogg)
+  content/browser/loop/shared/sounds/room-joined-in.ogg (content/shared/sounds/room-joined-in.ogg)
+  content/browser/loop/shared/sounds/room-left.ogg      (content/shared/sounds/room-left.ogg)
+  content/browser/loop/shared/sounds/failure.ogg        (content/shared/sounds/failure.ogg)
 
   # Partner SDK assets
   content/browser/loop/libs/sdk.js                                                    (content/shared/libs/sdk.js)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/LoopCalls.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/LoopCalls.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/LoopCalls.jsm	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/LoopCalls.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -11,12 +11,19 @@
 
 this.EXPORTED_SYMBOLS = ["LoopCalls"];
 
+const EMAIL_OR_PHONE_RE = /^(:?\S+@\S+|\+\d+)$/;
+
 XPCOMUtils.defineLazyModuleGetter(this, "MozLoopService",
                                   "resource:///modules/loop/MozLoopService.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "LOOP_SESSION_TYPE",
                                   "resource:///modules/loop/MozLoopService.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "LoopContacts",
+                                  "resource:///modules/loop/LoopContacts.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
+
  /**
  * Attempts to open a websocket.
  *
@@ -269,7 +276,35 @@
    *                          "outgoing".
    */
   _startCall: function(callData) {
-    this.conversationInProgress.id = MozLoopService.openChatWindow(callData);
+    const openChat = () => {
+      this.conversationInProgress.id = MozLoopService.openChatWindow(callData);
+    };
+
+    if (callData.type == "incoming" && ("callerId" in callData) &&
+        EMAIL_OR_PHONE_RE.test(callData.callerId)) {
+      LoopContacts.search({
+        q: callData.callerId,
+        field: callData.callerId.contains("@") ? "email" : "tel"
+      }, (err, contacts) => {
+        if (err) {
+          // Database error, helas!
+          openChat();
+          return;
+        }
+
+        for (let contact of contacts) {
+          if (contact.blocked) {
+            // Blocked! Send a busy signal back to the caller.
+            this._returnBusy(callData);
+            return;
+          }
+        }
+
+        openChat();
+      })
+    } else {
+      openChat();
+    }
   },
 
   /**
@@ -293,6 +328,50 @@
     return true;
   },
 
+  /**
+   * Block a caller so it will show up in the contacts list as a blocked contact.
+   * If the contact is not yet part of the users' contacts list, it will be added
+   * as a blocked contact directly.
+   *
+   * @param {String}   callerId Email address or phone number that may identify
+   *                            the caller as an existing contact
+   * @param {Function} callback Function that will be invoked once the operation
+   *                            has completed. When an error occurs, it will be
+   *                            passed as its first argument
+   */
+  blockDirectCaller: function(callerId, callback) {
+    let field = callerId.contains("@") ? "email" : "tel";
+    Task.spawn(function* () {
+      // See if we can find the caller in our database.
+      let contacts = yield LoopContacts.promise("search", {
+        q: callerId,
+        field: field
+      });
+
+      let contact;
+      if (contacts.length) {
+        for (contact of contacts) {
+          yield LoopContacts.promise("block", contact._guid);
+        }
+      } else {
+        // If the contact doesn't exist yet, add it as a blocked contact.
+        contact = {
+          id: MozLoopService.generateUUID(),
+          name: [callerId],
+          category: ["local"],
+          blocked: true
+        };
+        // Add the phone OR email field to the contact.
+        contact[field] = [{
+          pref: true,
+          value: callerId
+        }];
+
+        yield LoopContacts.promise("add", contact);
+      }
+    }).then(callback, callback);
+  },
+
    /**
    * Open call progress websocket and terminate with a reason of busy
    * the server.
@@ -367,6 +446,13 @@
      */
   startDirectCall: function(contact, callType) {
     LoopCallsInternal.startDirectCall(contact, callType);
+  },
+
+  /**
+   * @see LoopCallsInternal#blockDirectCaller
+   */
+  blockDirectCaller: function(callerId, callback) {
+    return LoopCallsInternal.blockDirectCaller(callerId, callback);
   }
 };
 Object.freeze(LoopCalls);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/LoopRooms.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/LoopRooms.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/LoopRooms.jsm	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/LoopRooms.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -6,6 +6,7 @@
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 const {MozLoopService, LOOP_SESSION_TYPE} = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
@@ -15,6 +16,9 @@
   const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
   return new EventEmitter();
 });
+XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {
+  return Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
+});
 
 this.EXPORTED_SYMBOLS = ["LoopRooms", "roomsPushNotification"];
 
@@ -56,7 +60,11 @@
  */
 const containsParticipant = function(room, participant) {
   for (let user of room.participants) {
-    if (user.roomConnectionId == participant.roomConnectionId) {
+    // XXX until a bug 1100318 is implemented and deployed,
+    // we need to check the "id" field here as well - roomConnectionId is the
+    // official value for the interface.
+    if (user.roomConnectionId == participant.roomConnectionId &&
+        user.id == participant.id) {
       return true;
     }
   }
@@ -107,14 +115,35 @@
  * violated. You'll notice this as well in the documentation for each method.
  */
 let LoopRoomsInternal = {
+  /**
+   * @var {Map} rooms Collection of rooms currently in cache.
+   */
   rooms: new Map(),
 
+  /**
+   * @var {String} sessionType The type of user session. May be 'FXA' or 'GUEST'.
+   */
   get sessionType() {
     return MozLoopService.userProfile ? LOOP_SESSION_TYPE.FXA :
                                         LOOP_SESSION_TYPE.GUEST;
   },
 
   /**
+   * @var {Number} participantsCount The total amount of participants currently
+   *                                 inside all rooms.
+   */
+  get participantsCount() {
+    let count = 0;
+    for (let room of this.rooms.values()) {
+      if (!("participants" in room)) {
+        continue;
+      }
+      count += room.participants.length;
+    }
+    return count;
+  },
+
+  /**
    * Fetch a list of rooms that the currently registered user is a member of.
    *
    * @param {String}   [version] If set, we will fetch a list of changed rooms since
@@ -131,10 +160,6 @@
     }
 
     Task.spawn(function* () {
-      let deferredInitialization = Promise.defer();
-      MozLoopService.delayedInitialize(deferredInitialization);
-      yield deferredInitialization.promise;
-
       if (!gDirty) {
         callback(null, [...this.rooms.values()]);
         return;
@@ -154,17 +179,21 @@
         if (orig) {
           checkForParticipantsUpdate(orig, room);
         }
-        this.rooms.set(room.roomToken, room);
-        // When a version is specified, all the data is already provided by this
-        // request.
-        if (version) {
-          eventEmitter.emit("update", room);
-          eventEmitter.emit("update" + ":" + room.roomToken, room);
-        } else {
-          // Next, request the detailed information for each room. If the request
-          // fails the room data will not be added to the map.
-          yield LoopRooms.promise("get", room.roomToken);
+        // Remove the `currSize` for posterity.
+        if ("currSize" in room) {
+          delete room.currSize;
         }
+        this.rooms.set(room.roomToken, room);
+
+        let eventName = orig ? "update" : "add";
+        eventEmitter.emit(eventName, room);
+        eventEmitter.emit(eventName + ":" + room.roomToken, room);
+      }
+
+      // If there's no rooms in the list, remove the guest created room flag, so that
+      // we don't keep registering for guest when we don't need to.
+      if (this.sessionType == LOOP_SESSION_TYPE.GUEST && !this.rooms.size) {
+        this.setGuestCreatedRoom(false);
       }
 
       // Set the 'dirty' flag back to FALSE, since the list is as fresh as can be now.
@@ -203,11 +232,6 @@
         room.roomToken = roomToken;
         checkForParticipantsUpdate(room, data);
         extend(room, data);
-
-        // Remove the `currSize` for posterity.
-        if ("currSize" in room) {
-          delete room.currSize;
-        }
         this.rooms.set(roomToken, room);
 
         let eventName = !needsUpdate ? "update" : "add";
@@ -241,11 +265,39 @@
         delete room.expiresIn;
         this.rooms.set(room.roomToken, room);
 
+        if (this.sessionType == LOOP_SESSION_TYPE.GUEST) {
+          this.setGuestCreatedRoom(true);
+        }
+
         eventEmitter.emit("add", room);
         callback(null, room);
       }, error => callback(error)).catch(error => callback(error));
   },
 
+  /**
+   * Sets whether or not the user has created a room in guest mode.
+   *
+   * @param {Boolean} created If the user has created the room.
+   */
+  setGuestCreatedRoom: function(created) {
+    if (created) {
+      Services.prefs.setBoolPref("loop.createdRoom", created);
+    } else {
+      Services.prefs.clearUserPref("loop.createdRoom");
+    }
+  },
+
+  /**
+   * Returns true if the user has a created room in guest mode.
+   */
+  getGuestCreatedRoom: function() {
+    try {
+      return Services.prefs.getBoolPref("loop.createdRoom");
+    } catch (x) {
+      return false;
+    }
+  },
+
   open: function(roomToken) {
     let windowData = {
       roomToken: roomToken,
@@ -303,9 +355,16 @@
    *                            `Error` object or `null`.
    */
   join: function(roomToken, callback) {
+    let displayName;
+    if (MozLoopService.userProfile && MozLoopService.userProfile.email) {
+      displayName = MozLoopService.userProfile.email;
+    } else {
+      displayName = gLoopBundle.GetStringFromName("display_name_guest");
+    }
+
     this._postToRoom(roomToken, {
       action: "join",
-      displayName: MozLoopService.userProfile.email,
+      displayName: displayName,
       clientMaxSize: CLIENT_MAX_SIZE
     }, callback);
   },
@@ -353,6 +412,34 @@
   },
 
   /**
+   * Renames a room.
+   *
+   * @param {String} roomToken   The room token
+   * @param {String} newRoomName The new name for the room
+   * @param {Function} callback   Function that will be invoked once the operation
+   *                              finished. The first argument passed will be an
+   *                              `Error` object or `null`.
+   */
+  rename: function(roomToken, newRoomName, callback) {
+    let room = this.rooms.get(roomToken);
+    let url = "/rooms/" + encodeURIComponent(roomToken);
+
+    let origRoom = this.rooms.get(roomToken);
+    let patchData = {
+      roomName: newRoomName,
+      // XXX We have to supply the max size and room owner due to bug 1099063.
+      maxSize: origRoom.maxSize,
+      roomOwner: origRoom.roomOwner
+    };
+    MozLoopService.hawkRequest(this.sessionType, url, "PATCH", patchData)
+      .then(response => {
+        let data = JSON.parse(response.body);
+        extend(room, data);
+        callback(null, room);
+      }, error => callback(error)).catch(error => callback(error));
+  },
+
+  /**
    * Callback used to indicate changes to rooms data on the LoopServer.
    *
    * @param {String} version   Version number assigned to this change set.
@@ -382,6 +469,10 @@
  * See the internal code for the API documentation.
  */
 this.LoopRooms = {
+  get participantsCount() {
+    return LoopRoomsInternal.participantsCount;
+  },
+
   getAll: function(version, callback) {
     return LoopRoomsInternal.getAll(version, callback);
   },
@@ -415,6 +506,14 @@
     return LoopRoomsInternal.leave(roomToken, sessionToken, callback);
   },
 
+  rename: function(roomToken, newRoomName, callback) {
+    return LoopRoomsInternal.rename(roomToken, newRoomName, callback);
+  },
+
+  getGuestCreatedRoom: function() {
+    return LoopRoomsInternal.getGuestCreatedRoom();
+  },
+
   promise: function(method, ...params) {
     return new Promise((resolve, reject) => {
       this[method](...params, (error, result) => {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/MozLoopAPI.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/MozLoopAPI.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/MozLoopAPI.jsm	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/MozLoopAPI.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -89,7 +89,15 @@
     return cloneErrorObject(value, targetWindow);
   }
 
-  return Cu.cloneInto(value, targetWindow);
+  let clone;
+  try {
+    clone = Cu.cloneInto(value, targetWindow);
+  } catch (ex) {
+    MozLoopService.log.debug("Failed to clone value:", value);
+    throw ex;
+  }
+
+  return clone;
 };
 
 /**
@@ -106,11 +114,18 @@
   Object.keys(api).forEach(func => {
     injectedAPI[func] = function(...params) {
       let lastParam = params.pop();
+      let callbackIsFunction = (typeof lastParam == "function");
 
       // If the last parameter is a function, assume its a callback
       // and wrap it differently.
-      if (lastParam && typeof lastParam === "function") {
+      if (callbackIsFunction) {
         api[func](...params, function(...results) {
+          // When the function was garbage collected due to async events, like
+          // closing a window, we want to circumvent a JS error.
+          if (callbackIsFunction && typeof lastParam != "function") {
+            MozLoopService.log.debug(func + ": callback function was lost.");
+            return;
+          }
           lastParam(...[cloneValueInto(r, targetWindow) for (r of results)]);
         });
       } else {
@@ -231,7 +246,7 @@
       enumerable: true,
       writable: true,
       value: function(conversationWindowId) {
-        return Cu.cloneInto(MozLoopService.getConversationWindowData(conversationWindowId),
+        return cloneValueInto(MozLoopService.getConversationWindowData(conversationWindowId),
           targetWindow);
       }
     },
@@ -368,32 +383,6 @@
     },
 
     /**
-     * Call to ensure that any necessary registrations for the Loop Service
-     * have taken place.
-     *
-     * Callback parameters:
-     * - err null on successful registration, non-null otherwise.
-     *
-     * @param {LOOP_SESSION_TYPE} sessionType
-     * @param {Function} callback Will be called once registration is complete,
-     *                            or straight away if registration has already
-     *                            happened.
-     */
-    ensureRegistered: {
-      enumerable: true,
-      writable: true,
-      value: function(sessionType, callback) {
-        // We translate from a promise to a callback, as we can't pass promises from
-        // Promise.jsm across the priv versus unpriv boundary.
-        MozLoopService.promiseRegisteredWithServers(sessionType).then(() => {
-          callback(null);
-        }, err => {
-          callback(cloneValueInto(err, targetWindow));
-        }).catch(Cu.reportError);
-      }
-    },
-
-    /**
      * Used to note a call url expiry time. If the time is later than the current
      * latest expiry time, then the stored expiry time is increased. For times
      * sooner, this function is a no-op; this ensures we always have the latest
@@ -414,61 +403,41 @@
     },
 
     /**
-     * Set any character preference under "loop."
+     * Set any preference under "loop."
      *
      * @param {String} prefName The name of the pref without the preceding "loop."
-     * @param {String} stringValue The value to set.
+     * @param {*} value The value to set.
+     * @param {Enum} prefType Type of preference, defined at Ci.nsIPrefBranch. Optional.
      *
      * Any errors thrown by the Mozilla pref API are logged to the console
      * and cause false to be returned.
      */
-    setLoopCharPref: {
-      enumerable: true,
-      writable: true,
-      value: function(prefName, value) {
-        MozLoopService.setLoopCharPref(prefName, value);
-      }
-    },
-
-    /**
-     * Return any preference under "loop." that's coercible to a character
-     * preference.
-     *
-     * @param {String} prefName The name of the pref without the preceding
-     * "loop."
-     *
-     * Any errors thrown by the Mozilla pref API are logged to the console
-     * and cause null to be returned. This includes the case of the preference
-     * not being found.
-     *
-     * @return {String} on success, null on error
-     */
-    getLoopCharPref: {
+    setLoopPref: {
       enumerable: true,
       writable: true,
-      value: function(prefName) {
-        return MozLoopService.getLoopCharPref(prefName);
+      value: function(prefName, value, prefType) {
+        MozLoopService.setLoopPref(prefName, value, prefType);
       }
     },
 
     /**
-     * Return any preference under "loop." that's coercible to a boolean
-     * preference.
+     * Return any preference under "loop.".
      *
      * @param {String} prefName The name of the pref without the preceding
      * "loop."
+     * @param {Enum} prefType Type of preference, defined at Ci.nsIPrefBranch. Optional.
      *
      * Any errors thrown by the Mozilla pref API are logged to the console
      * and cause null to be returned. This includes the case of the preference
      * not being found.
      *
-     * @return {String} on success, null on error
+     * @return {*} on success, null on error
      */
-    getLoopBoolPref: {
+    getLoopPref: {
       enumerable: true,
       writable: true,
-      value: function(prefName) {
-        return MozLoopService.getLoopBoolPref(prefName);
+      value: function(prefName, prefType) {
+        return MozLoopService.getLoopPref(prefName);
       }
     },
 
@@ -541,9 +510,16 @@
       writable: true,
       value: function(sessionType, path, method, payloadObj, callback) {
         // XXX Should really return a DOM promise here.
+        let callbackIsFunction = (typeof callback == "function");
         MozLoopService.hawkRequest(sessionType, path, method, payloadObj).then((response) => {
           callback(null, response.body);
         }, hawkError => {
+          // When the function was garbage collected due to async events, like
+          // closing a window, we want to circumvent a JS error.
+          if (callbackIsFunction && typeof callback != "function") {
+            MozLoopService.log.debug("hawkRequest: callback function was lost.");
+            return;
+          }
           // The hawkError.error property, while usually a string representing
           // an HTTP response status message, may also incorrectly be a native
           // error object that will cause the cloning function to fail.
@@ -596,6 +572,20 @@
       },
     },
 
+    /**
+     * Opens the Getting Started tour in the browser.
+     *
+     * @param {String} aSrc
+     *   - The UI element that the user used to begin the tour, optional.
+     */
+    openGettingStartedTour: {
+      enumerable: true,
+      writable: true,
+      value: function(aSrc) {
+        return MozLoopService.openGettingStartedTour(aSrc);
+      },
+    },
+
     /**
      * Copies passed string onto the system clipboard.
      *
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/MozLoopService.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/MozLoopService.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/MozLoopService.jsm	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/MozLoopService.jsm	2014-11-26 21:45:48.000000000 +0000
@@ -18,8 +18,6 @@
 // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error".
 const PREF_LOG_LEVEL = "loop.debug.loglevel";
 
-const EMAIL_OR_PHONE_RE = /^(:?\S+@\S+|\+\d+)$/;
-
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
@@ -81,6 +79,10 @@
                                    "@mozilla.org/network/dns-service;1",
                                    "nsIDNSService");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gWM",
+                                   "@mozilla.org/appshell/window-mediator;1",
+                                   "nsIWindowMediator");
+
 // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
 XPCOMUtils.defineLazyGetter(this, "log", () => {
   let ConsoleAPI = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).ConsoleAPI;
@@ -102,7 +104,7 @@
 }
 
 let gHawkClient = null;
-let gLocalizedStrings = null;
+let gLocalizedStrings = new Map();
 let gFxAEnabled = true;
 let gFxAOAuthClientPromise = null;
 let gFxAOAuthClient = null;
@@ -291,12 +293,12 @@
       messageString = "generic_failure_title";
     }
 
-    error.friendlyMessage = this.localizedStrings[messageString].textContent;
+    error.friendlyMessage = this.localizedStrings.get(messageString);
     error.friendlyDetails = detailsString ?
-                              this.localizedStrings[detailsString].textContent :
+                              this.localizedStrings.get(detailsString) :
                               null;
     error.friendlyDetailsButtonLabel = detailsButtonLabelString ?
-                                         this.localizedStrings[detailsButtonLabelString].textContent :
+                                         this.localizedStrings.get(detailsButtonLabelString) :
                                          null;
 
     error.friendlyDetailsButtonCallback = actionCallback || detailsButtonCallback || null;
@@ -326,8 +328,8 @@
    */
   promiseRegisteredWithPushServer: function(sessionType) {
     if (!this.deferredRegistrations.has(sessionType)) {
-      return Promise.reject("promiseRegisteredWithPushServer must be called while there is a " +
-                            "deferred in deferredRegistrations in order to prevent reentrancy");
+      return Promise.reject(new Error("promiseRegisteredWithPushServer must be called while there is a " +
+                            "deferred in deferredRegistrations in order to prevent reentrancy"));
     }
     // Wrap push notification registration call-back in a Promise.
     function registerForNotification(channelID, onNotification) {
@@ -373,7 +375,7 @@
       return Promise.all([callsRegFxA, roomsRegFxA]);
     }
 
-    return Promise.reject("promiseRegisteredWithPushServer: Invalid sessionType");
+    return Promise.reject(new Error("promiseRegisteredWithPushServer: Invalid sessionType"));
   },
 
   /**
@@ -415,7 +417,8 @@
   },
 
   /**
-   * Performs a hawk based request to the loop server.
+   * Performs a hawk based request to the loop server - there is no pre-registration
+   * for this request, if this is required, use hawkRequest.
    *
    * @param {LOOP_SESSION_TYPE} sessionType The type of session to use for the request.
    *                                        This is one of the LOOP_SESSION_TYPE members.
@@ -429,8 +432,7 @@
    *        as JSON and contains an 'error' property, the promise will be
    *        rejected with this JSON-parsed response.
    */
-  hawkRequest: function(sessionType, path, method, payloadObj) {
-    log.debug("hawkRequest: " + path, sessionType);
+  hawkRequestInternal: function(sessionType, path, method, payloadObj) {
     if (!gHawkClient) {
       gHawkClient = new HawkClient(this.loopServerUri);
     }
@@ -476,6 +478,32 @@
   },
 
   /**
+   * Performs a hawk based request to the loop server, registering if necessary.
+   *
+   * @param {LOOP_SESSION_TYPE} sessionType The type of session to use for the request.
+   *                                        This is one of the LOOP_SESSION_TYPE members.
+   * @param {String} path The path to make the request to.
+   * @param {String} method The request method, e.g. 'POST', 'GET'.
+   * @param {Object} payloadObj An object which is converted to JSON and
+   *                            transmitted with the request.
+   * @returns {Promise}
+   *        Returns a promise that resolves to the response of the API call,
+   *        or is rejected with an error.  If the server response can be parsed
+   *        as JSON and contains an 'error' property, the promise will be
+   *        rejected with this JSON-parsed response.
+   */
+  hawkRequest: function(sessionType, path, method, payloadObj) {
+    log.debug("hawkRequest: " + path, sessionType);
+    return new Promise((resolve, reject) => {
+      MozLoopService.promiseRegisteredWithServers(sessionType).then(() => {
+        this.hawkRequestInternal(sessionType, path, method, payloadObj).then(resolve, reject);
+      }, err => {
+        reject(err);
+      }).catch(reject);
+    });
+  },
+
+  /**
    * Generic hawkRequest onError handler for the hawkRequest promise.
    *
    * @param {Object} error - error reporting object
@@ -565,7 +593,7 @@
     }
 
     if (!callsPushURL || !roomsPushURL) {
-      return Promise.reject("Invalid sessionType or missing push URLs for registerWithLoopServer: " + sessionType);
+      return Promise.reject(new Error("Invalid sessionType or missing push URLs for registerWithLoopServer: " + sessionType));
     }
 
     // create a registration payload with a backwards compatible attribute (simplePushURL)
@@ -577,11 +605,11 @@
           rooms: roomsPushURL,
         },
     };
-    return this.hawkRequest(sessionType, "/registration", "POST", msg)
+    return this.hawkRequestInternal(sessionType, "/registration", "POST", msg)
       .then((response) => {
         // If this failed we got an invalid token.
         if (!this.storeSessionToken(sessionType, response.headers)) {
-          return Promise.reject("session-token-wrong-size");
+          return Promise.reject(new Error("session-token-wrong-size"));
         }
 
         log.debug("Successfully registered with server for sessionType", sessionType);
@@ -633,7 +661,7 @@
     }
 
     let unregisterURL = "/registration?simplePushURL=" + encodeURIComponent(pushURL);
-    return this.hawkRequest(sessionType, unregisterURL, "DELETE")
+    return this.hawkRequestInternal(sessionType, unregisterURL, "DELETE")
       .then(() => {
         log.debug("Successfully unregistered from server for sessionType", sessionType);
       },
@@ -652,33 +680,22 @@
    * A getter to obtain and store the strings for loop. This is structured
    * for use by l10n.js.
    *
-   * @returns {Object} a map of element ids with attributes to set.
+   * @returns {Map} a map of element ids with localized string values
    */
   get localizedStrings() {
-    if (gLocalizedStrings)
+    if (gLocalizedStrings.size)
       return gLocalizedStrings;
 
-    var stringBundle =
-      Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
+    let stringBundle =
+      Services.strings.createBundle("chrome://browser/locale/loop/loop.properties");
 
-    var map = {};
-    var enumerator = stringBundle.getSimpleEnumeration();
+    let enumerator = stringBundle.getSimpleEnumeration();
     while (enumerator.hasMoreElements()) {
-      var string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
-
-      // 'textContent' is the default attribute to set if none are specified.
-      var key = string.key, property = 'textContent';
-      var i = key.lastIndexOf('.');
-      if (i >= 0) {
-        property = key.substring(i + 1);
-        key = key.substring(0, i);
-      }
-      if (!(key in map))
-        map[key] = {};
-      map[key][property] = string.value;
+      let string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
+      gLocalizedStrings.set(string.key, string.value);
     }
 
-    return gLocalizedStrings = map;
+    return gLocalizedStrings;
   },
 
   /**
@@ -757,7 +774,14 @@
   openChatWindow: function(conversationWindowData) {
     // So I guess the origin is the loop server!?
     let origin = this.loopServerUri;
-    let windowId = gLastWindowId++;
+    // Try getting a window ID that can (re-)identify this conversation, or resort
+    // to a globally unique one as a last resort.
+    // XXX We can clean this up once rooms and direct contact calling are the only
+    //     two modes left.
+    let windowId = ("contact" in conversationWindowData) ?
+                   conversationWindowData.contact._guid || gLastWindowId++ :
+                   conversationWindowData.roomToken || conversationWindowData.callId ||
+                   gLastWindowId++;
     // Store the id as a string, as that's what we use elsewhere.
     windowId = windowId.toString();
 
@@ -822,7 +846,7 @@
    */
   promiseFxAOAuthParameters: function() {
     const SESSION_TYPE = LOOP_SESSION_TYPE.FXA;
-    return this.hawkRequest(SESSION_TYPE, "/fxa-oauth/params", "POST").then(response => {
+    return this.hawkRequestInternal(SESSION_TYPE, "/fxa-oauth/params", "POST").then(response => {
       if (!this.storeSessionToken(SESSION_TYPE, response.headers)) {
         throw new Error("Invalid FxA hawk token returned");
       }
@@ -965,6 +989,10 @@
     gInitializeTimerFunc = value;
   },
 
+  get roomsParticipantsCount() {
+    return LoopRooms.participantsCount;
+  },
+
   /**
    * Initialized the loop service, and starts registration with the
    * push and loop servers.
@@ -985,7 +1013,7 @@
 
     // Don't do anything if loop is not enabled.
     if (!Services.prefs.getBoolPref("loop.enabled")) {
-      return Promise.reject("loop is not enabled");
+      return Promise.reject(new Error("loop is not enabled"));
     }
 
     if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {
@@ -995,9 +1023,30 @@
       }
     }
 
+    // The Loop toolbar button should change icon when the room participant count
+    // changes from 0 to something.
+    const onRoomsChange = () => {
+      MozLoopServiceInternal.notifyStatusChanged();
+    };
+    LoopRooms.on("add", onRoomsChange);
+    LoopRooms.on("update", onRoomsChange);
+    LoopRooms.on("joined", (e, roomToken, participant) => {
+      // Don't alert if we're in the doNotDisturb mode, or the participant
+      // is the owner - the content code deals with the rest of the sounds.
+      if (MozLoopServiceInternal.doNotDisturb || participant.owner) {
+        return;
+      }
+
+      let window = gWM.getMostRecentWindow("navigator:browser");
+      if (window) {
+        window.LoopUI.playSound("room-joined");
+      }
+    });
+
     // If expiresTime is not in the future and the user hasn't
     // previously authenticated then skip registration.
     if (!MozLoopServiceInternal.urlExpiryTimeIsInFuture() &&
+        !LoopRooms.getGuestCreatedRoom() &&
         !MozLoopServiceInternal.fxAOAuthTokenData) {
       return Promise.resolve("registration not needed");
     }
@@ -1031,7 +1080,8 @@
     });
 
     try {
-      if (MozLoopServiceInternal.urlExpiryTimeIsInFuture()) {
+      if (MozLoopServiceInternal.urlExpiryTimeIsInFuture() ||
+          LoopRooms.getGuestCreatedRoom()) {
         yield this.promiseRegisteredWithServers(LOOP_SESSION_TYPE.GUEST);
       } else {
         log.debug("delayedInitialize: URL expiry time isn't in the future so not registering as a guest");
@@ -1096,21 +1146,20 @@
   },
 
   /**
-   * Returns the strings for the specified element. Designed for use
-   * with l10n.js.
+   * Returns the strings for the specified element. Designed for use with l10n.js.
    *
    * @param {key} The element id to get strings for.
-   * @return {String} A JSON string containing the localized
-   *                  attribute/value pairs for the element.
+   * @return {String} A JSON string containing the localized attribute/value pairs
+   *                  for the element.
    */
   getStrings: function(key) {
-      var stringData = MozLoopServiceInternal.localizedStrings;
-      if (!(key in stringData)) {
-        log.error("No string found for key: ", key);
-        return "";
-      }
+    var stringData = MozLoopServiceInternal.localizedStrings;
+    if (!stringData.has(key)) {
+      log.error("No string found for key: ", key);
+      return "";
+    }
 
-      return JSON.stringify(stringData[key]);
+    return JSON.stringify({ textContent: stringData.get(key) });
   },
 
   /**
@@ -1192,63 +1241,75 @@
   },
 
   /**
-   * Set any character preference under "loop.".
+   * Set any preference under "loop.".
    *
-   * @param {String} prefName The name of the pref without the preceding "loop."
-   * @param {String} value The value to set.
+   * @param {String} prefSuffix The name of the pref without the preceding "loop."
+   * @param {*} value The value to set.
+   * @param {Enum} prefType Type of preference, defined at Ci.nsIPrefBranch. Optional.
    *
    * Any errors thrown by the Mozilla pref API are logged to the console.
    */
-  setLoopCharPref: function(prefName, value) {
+  setLoopPref: function(prefSuffix, value, prefType) {
+    let prefName = "loop." + prefSuffix;
     try {
-      Services.prefs.setCharPref("loop." + prefName, value);
-    } catch (ex) {
-      log.error("setLoopCharPref had trouble setting " + prefName +
-        "; exception: " + ex);
-    }
-  },
-
-  /**
-   * Return any preference under "loop." that's coercible to a character
-   * preference.
-   *
-   * @param {String} prefName The name of the pref without the preceding
-   * "loop."
-   *
-   * Any errors thrown by the Mozilla pref API are logged to the console
-   * and cause null to be returned. This includes the case of the preference
-   * not being found.
-   *
-   * @return {String} on success, null on error
-   */
-  getLoopCharPref: function(prefName) {
-    try {
-      return Services.prefs.getCharPref("loop." + prefName);
+      if (!prefType) {
+        prefType = Services.prefs.getPrefType(prefName);
+      }
+      switch (prefType) {
+        case Ci.nsIPrefBranch.PREF_STRING:
+          Services.prefs.setCharPref(prefName, value);
+          break;
+        case Ci.nsIPrefBranch.PREF_INT:
+          Services.prefs.setIntPref(prefName, value);
+          break;
+        case Ci.nsIPrefBranch.PREF_BOOL:
+          Services.prefs.setBoolPref(prefName, value);
+          break;
+        default:
+          log.error("invalid preference type setting " + prefName);
+          break;
+      }
     } catch (ex) {
-      log.error("getLoopCharPref had trouble getting " + prefName +
+      log.error("setLoopPref had trouble setting " + prefName +
         "; exception: " + ex);
-      return null;
     }
   },
 
   /**
-   * Return any preference under "loop." that's coercible to a character
-   * preference.
+   * Return any preference under "loop.".
    *
    * @param {String} prefName The name of the pref without the preceding
    * "loop."
+   * @param {Enum} prefType Type of preference, defined at Ci.nsIPrefBranch. Optional.
    *
    * Any errors thrown by the Mozilla pref API are logged to the console
    * and cause null to be returned. This includes the case of the preference
    * not being found.
    *
-   * @return {String} on success, null on error
+   * @return {*} on success, null on error
    */
-  getLoopBoolPref: function(prefName) {
+  getLoopPref: function(prefSuffix, prefType) {
+    let prefName = "loop." + prefSuffix;
     try {
-      return Services.prefs.getBoolPref("loop." + prefName);
+      if (!prefType) {
+        prefType = Services.prefs.getPrefType(prefName);
+      } else if (prefType != Services.prefs.getPrefType(prefName)) {
+        log.error("invalid type specified for preference");
+        return null;
+      }
+      switch (prefType) {
+        case Ci.nsIPrefBranch.PREF_STRING:
+          return Services.prefs.getCharPref(prefName);
+        case Ci.nsIPrefBranch.PREF_INT:
+          return Services.prefs.getIntPref(prefName);
+        case Ci.nsIPrefBranch.PREF_BOOL:
+          return Services.prefs.getBoolPref(prefName);
+        default:
+          log.error("invalid preference type getting " + prefName);
+          return null;
+      }
     } catch (ex) {
-      log.error("getLoopBoolPref had trouble getting " + prefName +
+      log.error("getLoopPref had trouble getting " + prefName +
         "; exception: " + ex);
       return null;
     }
@@ -1359,6 +1420,28 @@
     }
   }),
 
+  /**
+   * Opens the Getting Started tour in the browser.
+   *
+   * @param {String} aSrc
+   *   - The UI element that the user used to begin the tour, optional.
+   */
+  openGettingStartedTour: Task.async(function(aSrc = null) {
+    try {
+      let urlStr = Services.prefs.getCharPref("loop.gettingStarted.url");
+      let url = new URL(Services.urlFormatter.formatURL(urlStr));
+      if (aSrc) {
+        url.searchParams.set("utm_source", "firefox-browser");
+        url.searchParams.set("utm_medium", "firefox-browser");
+        url.searchParams.set("utm_campaign", aSrc);
+      }
+      let win = Services.wm.getMostRecentWindow("navigator:browser");
+      win.switchToTabHavingURI(url, true, {replaceQueryString: true});
+    } catch (ex) {
+      log.error("Error opening Getting Started tour", ex);
+    }
+  }),
+
   /**
    * Performs a hawk based request to the loop server.
    *
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/css/webapp.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/css/webapp.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/css/webapp.css	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/css/webapp.css	2014-11-26 21:45:48.000000000 +0000
@@ -18,6 +18,13 @@
   font-family: Open Sans,sans-serif;
 }
 
+/**
+ * Note: the is-standalone-room class is dynamically set by the StandaloneRoomView.
+ */
+.standalone.is-standalone-room {
+  background-color: #000;
+}
+
 .standalone-header {
   border-radius: 4px;
   background: #fff;
@@ -80,15 +87,19 @@
     color: #777;
   }
 
-.footer-external-links a {
+.footer-external-links {
   padding: .2rem .7rem;
+}
+
+.footer-external-links a {
   margin: 0 .5rem;
   text-decoration: none;
+  color: #adadad;
 }
 
-  .footer-external-links a:hover {
-    color: #111;
-  }
+.footer-external-links a:hover {
+  color: #777;
+}
 
 .footer-logo {
   width: 100px;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/index.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/index.html	2014-11-26 21:45:48.000000000 +0000
@@ -5,14 +5,14 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta name="locales" content="en-US" />
+    <meta name="default_locale" content="en-US" />
+
     <link rel="stylesheet" type="text/css" href="shared/css/reset.css">
     <link rel="stylesheet" type="text/css" href="shared/css/common.css">
     <link rel="stylesheet" type="text/css" href="shared/css/conversation.css">
     <link rel="stylesheet" type="text/css" href="css/webapp.css">
-    <link rel="localization" href="l10n/loop.{locale}.properties">
-
-    <meta name="locales" content="en-US" />
-    <meta name="default_locale" content="en-US" />
+    <link rel="localization" href="l10n/{locale}/loop.properties">
   </head>
   <body class="standalone">
 
@@ -42,7 +42,7 @@
         myCustomEvent.prototype = window.Event.prototype;
         window.CustomEvent = myCustomEvent;
       }
- 
+
       // To support IE for the l10n-gaia library on IE <= 10.
       if (!"language" in navigator) {
         navigator.language = navigator.browserLanguage;
@@ -97,7 +97,10 @@
     <script type="text/javascript" src="shared/js/dispatcher.js"></script>
     <script type="text/javascript" src="shared/js/websocket.js"></script>
     <script type="text/javascript" src="shared/js/otSdkDriver.js"></script>
+    <script type="text/javascript" src="shared/js/store.js"></script>
     <script type="text/javascript" src="shared/js/activeRoomStore.js"></script>
+    <script type="text/javascript" src="shared/js/feedbackStore.js"></script>
+    <script type="text/javascript" src="shared/js/feedbackViews.js"></script>
     <script type="text/javascript" src="js/standaloneAppStore.js"></script>
     <script type="text/javascript" src="js/standaloneClient.js"></script>
     <script type="text/javascript" src="js/standaloneMozLoop.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/standaloneMozLoop.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/standaloneMozLoop.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/standaloneMozLoop.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/standaloneMozLoop.js	2014-11-26 21:45:48.000000000 +0000
@@ -170,7 +170,13 @@
         action: "leave",
         sessionToken: sessionToken
       }, null, callback);
-    }
+    },
+
+    // Dummy functions to reflect those in the desktop mozLoop.rooms that we
+    // don't currently use.
+    on: function() {},
+    once: function() {},
+    off: function() {}
   };
 
   var StandaloneMozLoop = function(options) {
@@ -184,5 +190,33 @@
     this.rooms = new StandaloneMozLoopRooms(options);
   };
 
+  StandaloneMozLoop.prototype = {
+    /**
+     * Stores a preference in the local storage for standalone.
+     * Note: Some prefs are filtered out as they are not applicable
+     * to the standalone UI.
+     *
+     * @param {String} prefName The name of the pref
+     * @param {String} value The value to set.
+     */
+    setLoopPref: function(prefName, value) {
+      if (prefName === "seenToS") {
+        return;
+      }
+
+      localStorage.setItem(prefName, value);
+    },
+
+    /**
+     * Gets a preference from the local storage for standalone.
+     *
+     * @param {String} prefName The name of the pref
+     * @param {String} value The value to set.
+     */
+    getLoopPref: function(prefName) {
+      return localStorage.getItem(prefName);
+    }
+  };
+
   return StandaloneMozLoop;
 })(navigator.mozL10n);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2014-11-26 21:45:48.000000000 +0000
@@ -11,8 +11,10 @@
 loop.standaloneRoomViews = (function(mozL10n) {
   "use strict";
 
+  var FAILURE_REASONS = loop.shared.utils.FAILURE_REASONS;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
   var sharedViews = loop.shared.views;
 
   var StandaloneRoomInfoArea = React.createClass({displayName: 'StandaloneRoomInfoArea',
@@ -39,10 +41,26 @@
       );
     },
 
+    /**
+     * @return String An appropriate string according to the failureReason.
+     */
+    _getFailureString: function() {
+      switch(this.props.failureReason) {
+        case FAILURE_REASONS.MEDIA_DENIED:
+          return mozL10n.get("rooms_media_denied_message");
+        case FAILURE_REASONS.EXPIRED_OR_INVALID:
+          return mozL10n.get("rooms_unavailable_notification_message");
+        default:
+          return mozL10n.get("status_error");
+      }
+    },
+
     _renderContent: function() {
       switch(this.props.roomState) {
         case ROOM_STATES.INIT:
-        case ROOM_STATES.READY: {
+        case ROOM_STATES.READY:
+        case ROOM_STATES.ENDED: {
+          // XXX: In ENDED state, we should rather display the feedback form.
           return (
             React.DOM.button({className: "btn btn-join btn-info", 
                     onClick: this.props.joinRoom}, 
@@ -67,6 +85,12 @@
               React.DOM.p(null, this._renderCallToActionLink())
             )
           );
+        case ROOM_STATES.FAILED:
+          return (
+            React.DOM.p({className: "failed-room-message"}, 
+              this._getFailureString()
+            )
+          );
         default:
           return null;
       }
@@ -81,8 +105,51 @@
     }
   });
 
+  var StandaloneRoomHeader = React.createClass({displayName: 'StandaloneRoomHeader',
+    render: function() {
+      return (
+        React.DOM.header(null, 
+          React.DOM.h1(null, mozL10n.get("clientShortname2")), 
+          React.DOM.a({target: "_blank", href: loop.config.roomsSupportUrl}, 
+            React.DOM.i({className: "icon icon-help"})
+          )
+        )
+      );
+    }
+  });
+
+  var StandaloneRoomFooter = React.createClass({displayName: 'StandaloneRoomFooter',
+    _getContent: function() {
+      return mozL10n.get("legal_text_and_links", {
+        "clientShortname": mozL10n.get("clientShortname2"),
+        "terms_of_use_url": React.renderComponentToStaticMarkup(
+          React.DOM.a({href: loop.config.legalWebsiteUrl, target: "_blank"}, 
+            mozL10n.get("terms_of_use_link_text")
+          )
+        ),
+        "privacy_notice_url": React.renderComponentToStaticMarkup(
+          React.DOM.a({href: loop.config.privacyWebsiteUrl, target: "_blank"}, 
+            mozL10n.get("privacy_notice_link_text")
+          )
+        ),
+      });
+    },
+
+    render: function() {
+      return (
+        React.DOM.footer(null, 
+          React.DOM.p({dangerouslySetInnerHTML: {__html: this._getContent()}}), 
+          React.DOM.div({className: "footer-logo"})
+        )
+      );
+    }
+  });
+
   var StandaloneRoomView = React.createClass({displayName: 'StandaloneRoomView',
-    mixins: [Backbone.Events],
+    mixins: [
+      Backbone.Events,
+      sharedMixins.RoomsAudioMixin
+    ],
 
     propTypes: {
       activeRoomStore:
@@ -144,18 +211,24 @@
       };
     },
 
+    componentDidMount: function() {
+      // Adding a class to the document body element from here to ease styling it.
+      document.body.classList.add("is-standalone-room");
+    },
+
     componentWillUnmount: function() {
       this.stopListening(this.props.activeRoomStore);
     },
 
     /**
-     * Watches for when we transition from READY to JOINED room state, so we can
-     * request user media access.
+     * Watches for when we transition to JOINED room state, so we can request
+     * user media access.
+     *
      * @param  {Object} nextProps (Unused)
      * @param  {Object} nextState Next state object.
      */
     componentWillUpdate: function(nextProps, nextState) {
-      if (this.state.roomState === ROOM_STATES.READY &&
+      if (this.state.roomState !== ROOM_STATES.JOINED &&
           nextState.roomState === ROOM_STATES.JOINED) {
         this.props.dispatcher.dispatch(new sharedActions.SetupStreamElements({
           publisherConfig: this._getPublisherConfig(),
@@ -207,7 +280,9 @@
 
       return (
         React.DOM.div({className: "room-conversation-wrapper"}, 
+          StandaloneRoomHeader(null), 
           StandaloneRoomInfoArea({roomState: this.state.roomState, 
+                                  failureReason: this.state.failureReason, 
                                   joinRoom: this.joinRoom, 
                                   helper: this.props.helper}), 
           React.DOM.div({className: "video-layout-wrapper"}, 
@@ -229,7 +304,8 @@
                 hangupButtonLabel: mozL10n.get("rooms_leave_button_label"), 
                 enableHangup: this._roomIsActive()})
             )
-          )
+          ), 
+          StandaloneRoomFooter(null)
         )
       );
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -11,8 +11,10 @@
 loop.standaloneRoomViews = (function(mozL10n) {
   "use strict";
 
+  var FAILURE_REASONS = loop.shared.utils.FAILURE_REASONS;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
   var sharedViews = loop.shared.views;
 
   var StandaloneRoomInfoArea = React.createClass({
@@ -39,10 +41,26 @@
       );
     },
 
+    /**
+     * @return String An appropriate string according to the failureReason.
+     */
+    _getFailureString: function() {
+      switch(this.props.failureReason) {
+        case FAILURE_REASONS.MEDIA_DENIED:
+          return mozL10n.get("rooms_media_denied_message");
+        case FAILURE_REASONS.EXPIRED_OR_INVALID:
+          return mozL10n.get("rooms_unavailable_notification_message");
+        default:
+          return mozL10n.get("status_error");
+      }
+    },
+
     _renderContent: function() {
       switch(this.props.roomState) {
         case ROOM_STATES.INIT:
-        case ROOM_STATES.READY: {
+        case ROOM_STATES.READY:
+        case ROOM_STATES.ENDED: {
+          // XXX: In ENDED state, we should rather display the feedback form.
           return (
             <button className="btn btn-join btn-info"
                     onClick={this.props.joinRoom}>
@@ -67,6 +85,12 @@
               <p>{this._renderCallToActionLink()}</p>
             </div>
           );
+        case ROOM_STATES.FAILED:
+          return (
+            <p className="failed-room-message">
+              {this._getFailureString()}
+            </p>
+          );
         default:
           return null;
       }
@@ -81,8 +105,51 @@
     }
   });
 
+  var StandaloneRoomHeader = React.createClass({
+    render: function() {
+      return (
+        <header>
+          <h1>{mozL10n.get("clientShortname2")}</h1>
+          <a target="_blank" href={loop.config.roomsSupportUrl}>
+            <i className="icon icon-help"></i>
+          </a>
+        </header>
+      );
+    }
+  });
+
+  var StandaloneRoomFooter = React.createClass({
+    _getContent: function() {
+      return mozL10n.get("legal_text_and_links", {
+        "clientShortname": mozL10n.get("clientShortname2"),
+        "terms_of_use_url": React.renderComponentToStaticMarkup(
+          <a href={loop.config.legalWebsiteUrl} target="_blank">
+            {mozL10n.get("terms_of_use_link_text")}
+          </a>
+        ),
+        "privacy_notice_url": React.renderComponentToStaticMarkup(
+          <a href={loop.config.privacyWebsiteUrl} target="_blank">
+            {mozL10n.get("privacy_notice_link_text")}
+          </a>
+        ),
+      });
+    },
+
+    render: function() {
+      return (
+        <footer>
+          <p dangerouslySetInnerHTML={{__html: this._getContent()}}></p>
+          <div className="footer-logo" />
+        </footer>
+      );
+    }
+  });
+
   var StandaloneRoomView = React.createClass({
-    mixins: [Backbone.Events],
+    mixins: [
+      Backbone.Events,
+      sharedMixins.RoomsAudioMixin
+    ],
 
     propTypes: {
       activeRoomStore:
@@ -144,18 +211,24 @@
       };
     },
 
+    componentDidMount: function() {
+      // Adding a class to the document body element from here to ease styling it.
+      document.body.classList.add("is-standalone-room");
+    },
+
     componentWillUnmount: function() {
       this.stopListening(this.props.activeRoomStore);
     },
 
     /**
-     * Watches for when we transition from READY to JOINED room state, so we can
-     * request user media access.
+     * Watches for when we transition to JOINED room state, so we can request
+     * user media access.
+     *
      * @param  {Object} nextProps (Unused)
      * @param  {Object} nextState Next state object.
      */
     componentWillUpdate: function(nextProps, nextState) {
-      if (this.state.roomState === ROOM_STATES.READY &&
+      if (this.state.roomState !== ROOM_STATES.JOINED &&
           nextState.roomState === ROOM_STATES.JOINED) {
         this.props.dispatcher.dispatch(new sharedActions.SetupStreamElements({
           publisherConfig: this._getPublisherConfig(),
@@ -207,7 +280,9 @@
 
       return (
         <div className="room-conversation-wrapper">
+          <StandaloneRoomHeader />
           <StandaloneRoomInfoArea roomState={this.state.roomState}
+                                  failureReason={this.state.failureReason}
                                   joinRoom={this.joinRoom}
                                   helper={this.props.helper} />
           <div className="video-layout-wrapper">
@@ -230,6 +305,7 @@
                 enableHangup={this._roomIsActive()} />
             </div>
           </div>
+          <StandaloneRoomFooter />
         </div>
       );
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/webapp.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/webapp.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/webapp.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/webapp.js	2014-11-26 21:45:48.000000000 +0000
@@ -259,13 +259,91 @@
         React.DOM.div({className: "standalone-footer container-box"}, 
           React.DOM.div({title: mozL10n.get("vendor_alttext",
                                   {vendorShortname: mozL10n.get("vendorShortname")}), 
-               className: "footer-logo"})
+               className: "footer-logo"}), 
+          React.DOM.div({className: "footer-external-links"}, 
+            React.DOM.a({target: "_blank", href: loop.config.guestSupportUrl}, 
+              mozL10n.get("support_link")
+            )
+          )
         )
       );
     }
   });
 
+  /**
+   * A view for when conversations are pending, displays any messages
+   * and an option cancel button.
+   */
   var PendingConversationView = React.createClass({displayName: 'PendingConversationView',
+    propTypes: {
+      callState: React.PropTypes.string.isRequired,
+      // If not supplied, the cancel button is not displayed.
+      cancelCallback: React.PropTypes.func
+    },
+
+    render: function() {
+      var cancelButtonClasses = React.addons.classSet({
+        btn: true,
+        "btn-large": true,
+        "btn-cancel": true,
+        hide: !this.props.cancelCallback
+      });
+
+      return (
+        React.DOM.div({className: "container"}, 
+          React.DOM.div({className: "container-box"}, 
+            React.DOM.header({className: "pending-header header-box"}, 
+              ConversationBranding(null)
+            ), 
+
+            React.DOM.div({id: "cameraPreview"}), 
+
+            React.DOM.div({id: "messages"}), 
+
+            React.DOM.p({className: "standalone-btn-label"}, 
+              this.props.callState
+            ), 
+
+            React.DOM.div({className: "btn-pending-cancel-group btn-group"}, 
+              React.DOM.div({className: "flex-padding-1"}), 
+              React.DOM.button({className: cancelButtonClasses, 
+                      onClick: this.props.cancelCallback}, 
+                React.DOM.span({className: "standalone-call-btn-text"}, 
+                  mozL10n.get("initiate_call_cancel_button")
+                )
+              ), 
+              React.DOM.div({className: "flex-padding-1"})
+            )
+          ), 
+          ConversationFooter(null)
+        )
+      );
+    }
+  });
+
+  /**
+   * View displayed whilst the get user media prompt is being displayed. Indicates
+   * to the user to accept the prompt.
+   */
+  var GumPromptConversationView = React.createClass({displayName: 'GumPromptConversationView',
+    render: function() {
+      var callState = mozL10n.get("call_progress_getting_media_description", {
+        clientShortname: mozL10n.get("clientShortname2")
+      });
+      document.title = mozL10n.get("standalone_title_with_status", {
+        clientShortname: mozL10n.get("clientShortname2"),
+        currentStatus: mozL10n.get("call_progress_getting_media_title")
+      });
+
+      return PendingConversationView({callState: callState});
+    }
+  });
+
+  /**
+   * View displayed waiting for a call to be connected. Updates the display
+   * once the websocket shows that the callee is being alerted.
+   */
+  var WaitingConversationView = React.createClass({displayName: 'WaitingConversationView',
     mixins: [sharedMixins.AudioMixin],
 
     getInitialState: function() {
@@ -301,33 +379,11 @@
       document.title = mozL10n.get("standalone_title_with_status",
                                    {clientShortname: mozL10n.get("clientShortname2"),
                                     currentStatus: mozL10n.get(callStateStringEntityName)});
-      return (
-        React.DOM.div({className: "container"}, 
-          React.DOM.div({className: "container-box"}, 
-            React.DOM.header({className: "pending-header header-box"}, 
-              ConversationBranding(null)
-            ), 
-
-            React.DOM.div({id: "cameraPreview"}), 
-
-            React.DOM.div({id: "messages"}), 
 
-            React.DOM.p({className: "standalone-btn-label"}, 
-              callState
-            ), 
-
-            React.DOM.div({className: "btn-pending-cancel-group btn-group"}, 
-              React.DOM.div({className: "flex-padding-1"}), 
-              React.DOM.button({className: "btn btn-large btn-cancel", 
-                      onClick: this._cancelOutgoingCall}, 
-                React.DOM.span({className: "standalone-call-btn-text"}, 
-                  mozL10n.get("initiate_call_cancel_button")
-                )
-              ), 
-              React.DOM.div({className: "flex-padding-1"})
-            )
-          ), 
-          ConversationFooter(null)
+      return (
+        PendingConversationView({
+          callState: callState, 
+          cancelCallback: this._cancelOutgoingCall}
         )
       );
     }
@@ -453,15 +509,8 @@
      */
     startCall: function(callType) {
       return function() {
-        multiplexGum.getPermsAndCacheMedia({audio:true, video:true},
-          function(localStream) {
-            this.props.conversation.setupOutgoingCall(callType);
-            this.setState({disableCallButton: true});
-          }.bind(this),
-          function(errorCode) {
-            multiplexGum.reset();
-          }.bind(this)
-        );
+        this.props.conversation.setupOutgoingCall(callType);
+        this.setState({disableCallButton: true});
       }.bind(this);
     },
 
@@ -538,7 +587,7 @@
       conversation: React.PropTypes.instanceOf(sharedModels.ConversationModel)
                          .isRequired,
       sdk: React.PropTypes.object.isRequired,
-      feedbackApiClient: React.PropTypes.object.isRequired,
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore),
       onAfterFeedbackReceived: React.PropTypes.func.isRequired
     },
 
@@ -549,7 +598,7 @@
       return (
         React.DOM.div({className: "ended-conversation"}, 
           sharedViews.FeedbackView({
-            feedbackApiClient: this.props.feedbackApiClient, 
+            feedbackStore: this.props.feedbackStore, 
             onAfterFeedbackReceived: this.props.onAfterFeedbackReceived}
           ), 
           sharedViews.ConversationView({
@@ -611,7 +660,7 @@
       notifications: React.PropTypes.instanceOf(sharedModels.NotificationCollection)
                           .isRequired,
       sdk: React.PropTypes.object.isRequired,
-      feedbackApiClient: React.PropTypes.object.isRequired
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore)
     },
 
     getInitialState: function() {
@@ -622,6 +671,7 @@
 
     componentDidMount: function() {
       this.props.conversation.on("call:outgoing", this.startCall, this);
+      this.props.conversation.on("call:outgoing:get-media-privs", this.getMediaPrivs, this);
       this.props.conversation.on("call:outgoing:setup", this.setupOutgoingCall, this);
       this.props.conversation.on("change:publishedStream", this._checkConnected, this);
       this.props.conversation.on("change:subscribedStream", this._checkConnected, this);
@@ -669,8 +719,11 @@
             )
           );
         }
+        case "gumPrompt": {
+          return GumPromptConversationView(null);
+        }
         case "pending": {
-          return PendingConversationView({websocket: this._websocket});
+          return WaitingConversationView({websocket: this._websocket});
         }
         case "connected": {
           document.title = mozL10n.get("standalone_title_with_status",
@@ -690,7 +743,7 @@
             EndedConversationView({
               sdk: this.props.sdk, 
               conversation: this.props.conversation, 
-              feedbackApiClient: this.props.feedbackApiClient, 
+              feedbackStore: this.props.feedbackStore, 
               onAfterFeedbackReceived: this.callStatusSwitcher("start")}
             )
           );
@@ -770,6 +823,22 @@
     },
 
     /**
+     * Asks the user for the media privileges, handling the result appropriately.
+     */
+    getMediaPrivs: function() {
+      this.setState({callStatus: "gumPrompt"});
+      multiplexGum.getPermsAndCacheMedia({audio:true, video:true},
+        function(localStream) {
+          this.props.conversation.gotMediaPrivs();
+        }.bind(this),
+        function(errorCode) {
+          multiplexGum.reset();
+          this.setState({callStatus: "failure"});
+        }.bind(this)
+      );
+    },
+
+    /**
      * Actually starts the call.
      */
     startCall: function() {
@@ -861,6 +930,8 @@
      * Handles ending a call by resetting the view to the start state.
      */
     _endCall: function() {
+      multiplexGum.reset();
+
       if (this.state.callStatus !== "failure") {
         this.setState({callStatus: "end"});
       }
@@ -887,14 +958,14 @@
       notifications: React.PropTypes.instanceOf(sharedModels.NotificationCollection)
                           .isRequired,
       sdk: React.PropTypes.object.isRequired,
-      feedbackApiClient: React.PropTypes.object.isRequired,
 
       // XXX New types for flux style
       standaloneAppStore: React.PropTypes.instanceOf(
         loop.store.StandaloneAppStore).isRequired,
       activeRoomStore: React.PropTypes.instanceOf(
         loop.store.ActiveRoomStore).isRequired,
-      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore)
     },
 
     getInitialState: function() {
@@ -931,7 +1002,7 @@
                helper: this.props.helper, 
                notifications: this.props.notifications, 
                sdk: this.props.sdk, 
-               feedbackApiClient: this.props.feedbackApiClient}
+               feedbackStore: this.props.feedbackStore}
             )
           );
         }
@@ -992,18 +1063,27 @@
       dispatcher: dispatcher,
       sdk: OT
     });
+    var feedbackClient = new loop.FeedbackAPIClient(
+      loop.config.feedbackApiUrl, {
+      product: loop.config.feedbackProductName,
+      user_agent: navigator.userAgent,
+      url: document.location.origin
+    });
 
+    // Stores
     var standaloneAppStore = new loop.store.StandaloneAppStore({
       conversation: conversation,
       dispatcher: dispatcher,
       helper: helper,
       sdk: OT
     });
-    var activeRoomStore = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: standaloneMozLoop,
       sdkDriver: sdkDriver
     });
+    var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: feedbackClient
+    });
 
     window.addEventListener("unload", function() {
       dispatcher.dispatch(new sharedActions.WindowUnload());
@@ -1015,7 +1095,7 @@
       helper: helper, 
       notifications: notifications, 
       sdk: OT, 
-      feedbackApiClient: feedbackApiClient, 
+      feedbackStore: feedbackStore, 
       standaloneAppStore: standaloneAppStore, 
       activeRoomStore: activeRoomStore, 
       dispatcher: dispatcher}
@@ -1036,6 +1116,8 @@
   return {
     CallUrlExpiredView: CallUrlExpiredView,
     PendingConversationView: PendingConversationView,
+    GumPromptConversationView: GumPromptConversationView,
+    WaitingConversationView: WaitingConversationView,
     StartConversationView: StartConversationView,
     FailedConversationView: FailedConversationView,
     OutgoingConversationView: OutgoingConversationView,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/webapp.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/webapp.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/js/webapp.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/js/webapp.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -260,12 +260,90 @@
           <div title={mozL10n.get("vendor_alttext",
                                   {vendorShortname: mozL10n.get("vendorShortname")})}
                className="footer-logo"></div>
+          <div className="footer-external-links">
+            <a target="_blank" href={loop.config.guestSupportUrl}>
+              {mozL10n.get("support_link")}
+            </a>
+          </div>
         </div>
       );
     }
   });
 
+  /**
+   * A view for when conversations are pending, displays any messages
+   * and an option cancel button.
+   */
   var PendingConversationView = React.createClass({
+    propTypes: {
+      callState: React.PropTypes.string.isRequired,
+      // If not supplied, the cancel button is not displayed.
+      cancelCallback: React.PropTypes.func
+    },
+
+    render: function() {
+      var cancelButtonClasses = React.addons.classSet({
+        btn: true,
+        "btn-large": true,
+        "btn-cancel": true,
+        hide: !this.props.cancelCallback
+      });
+
+      return (
+        <div className="container">
+          <div className="container-box">
+            <header className="pending-header header-box">
+              <ConversationBranding />
+            </header>
+
+            <div id="cameraPreview" />
+
+            <div id="messages" />
+
+            <p className="standalone-btn-label">
+              {this.props.callState}
+            </p>
+
+            <div className="btn-pending-cancel-group btn-group">
+              <div className="flex-padding-1" />
+              <button className={cancelButtonClasses}
+                      onClick={this.props.cancelCallback} >
+                <span className="standalone-call-btn-text">
+                  {mozL10n.get("initiate_call_cancel_button")}
+                </span>
+              </button>
+              <div className="flex-padding-1" />
+            </div>
+          </div>
+          <ConversationFooter />
+        </div>
+      );
+    }
+  });
+
+  /**
+   * View displayed whilst the get user media prompt is being displayed. Indicates
+   * to the user to accept the prompt.
+   */
+  var GumPromptConversationView = React.createClass({
+    render: function() {
+      var callState = mozL10n.get("call_progress_getting_media_description", {
+        clientShortname: mozL10n.get("clientShortname2")
+      });
+      document.title = mozL10n.get("standalone_title_with_status", {
+        clientShortname: mozL10n.get("clientShortname2"),
+        currentStatus: mozL10n.get("call_progress_getting_media_title")
+      });
+
+      return <PendingConversationView callState={callState}/>;
+    }
+  });
+
+  /**
+   * View displayed waiting for a call to be connected. Updates the display
+   * once the websocket shows that the callee is being alerted.
+   */
+  var WaitingConversationView = React.createClass({
     mixins: [sharedMixins.AudioMixin],
 
     getInitialState: function() {
@@ -301,34 +379,12 @@
       document.title = mozL10n.get("standalone_title_with_status",
                                    {clientShortname: mozL10n.get("clientShortname2"),
                                     currentStatus: mozL10n.get(callStateStringEntityName)});
-      return (
-        <div className="container">
-          <div className="container-box">
-            <header className="pending-header header-box">
-              <ConversationBranding />
-            </header>
-
-            <div id="cameraPreview" />
 
-            <div id="messages" />
-
-            <p className="standalone-btn-label">
-              {callState}
-            </p>
-
-            <div className="btn-pending-cancel-group btn-group">
-              <div className="flex-padding-1" />
-              <button className="btn btn-large btn-cancel"
-                      onClick={this._cancelOutgoingCall} >
-                <span className="standalone-call-btn-text">
-                  {mozL10n.get("initiate_call_cancel_button")}
-                </span>
-              </button>
-              <div className="flex-padding-1" />
-            </div>
-          </div>
-          <ConversationFooter />
-        </div>
+      return (
+        <PendingConversationView
+          callState={callState}
+          cancelCallback={this._cancelOutgoingCall}
+        />
       );
     }
   });
@@ -453,15 +509,8 @@
      */
     startCall: function(callType) {
       return function() {
-        multiplexGum.getPermsAndCacheMedia({audio:true, video:true},
-          function(localStream) {
-            this.props.conversation.setupOutgoingCall(callType);
-            this.setState({disableCallButton: true});
-          }.bind(this),
-          function(errorCode) {
-            multiplexGum.reset();
-          }.bind(this)
-        );
+        this.props.conversation.setupOutgoingCall(callType);
+        this.setState({disableCallButton: true});
       }.bind(this);
     },
 
@@ -538,7 +587,7 @@
       conversation: React.PropTypes.instanceOf(sharedModels.ConversationModel)
                          .isRequired,
       sdk: React.PropTypes.object.isRequired,
-      feedbackApiClient: React.PropTypes.object.isRequired,
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore),
       onAfterFeedbackReceived: React.PropTypes.func.isRequired
     },
 
@@ -549,7 +598,7 @@
       return (
         <div className="ended-conversation">
           <sharedViews.FeedbackView
-            feedbackApiClient={this.props.feedbackApiClient}
+            feedbackStore={this.props.feedbackStore}
             onAfterFeedbackReceived={this.props.onAfterFeedbackReceived}
           />
           <sharedViews.ConversationView
@@ -611,7 +660,7 @@
       notifications: React.PropTypes.instanceOf(sharedModels.NotificationCollection)
                           .isRequired,
       sdk: React.PropTypes.object.isRequired,
-      feedbackApiClient: React.PropTypes.object.isRequired
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore)
     },
 
     getInitialState: function() {
@@ -622,6 +671,7 @@
 
     componentDidMount: function() {
       this.props.conversation.on("call:outgoing", this.startCall, this);
+      this.props.conversation.on("call:outgoing:get-media-privs", this.getMediaPrivs, this);
       this.props.conversation.on("call:outgoing:setup", this.setupOutgoingCall, this);
       this.props.conversation.on("change:publishedStream", this._checkConnected, this);
       this.props.conversation.on("change:subscribedStream", this._checkConnected, this);
@@ -669,8 +719,11 @@
             />
           );
         }
+        case "gumPrompt": {
+          return <GumPromptConversationView />;
+        }
         case "pending": {
-          return <PendingConversationView websocket={this._websocket} />;
+          return <WaitingConversationView websocket={this._websocket} />;
         }
         case "connected": {
           document.title = mozL10n.get("standalone_title_with_status",
@@ -690,7 +743,7 @@
             <EndedConversationView
               sdk={this.props.sdk}
               conversation={this.props.conversation}
-              feedbackApiClient={this.props.feedbackApiClient}
+              feedbackStore={this.props.feedbackStore}
               onAfterFeedbackReceived={this.callStatusSwitcher("start")}
             />
           );
@@ -770,6 +823,22 @@
     },
 
     /**
+     * Asks the user for the media privileges, handling the result appropriately.
+     */
+    getMediaPrivs: function() {
+      this.setState({callStatus: "gumPrompt"});
+      multiplexGum.getPermsAndCacheMedia({audio:true, video:true},
+        function(localStream) {
+          this.props.conversation.gotMediaPrivs();
+        }.bind(this),
+        function(errorCode) {
+          multiplexGum.reset();
+          this.setState({callStatus: "failure"});
+        }.bind(this)
+      );
+    },
+
+    /**
      * Actually starts the call.
      */
     startCall: function() {
@@ -861,6 +930,8 @@
      * Handles ending a call by resetting the view to the start state.
      */
     _endCall: function() {
+      multiplexGum.reset();
+
       if (this.state.callStatus !== "failure") {
         this.setState({callStatus: "end"});
       }
@@ -887,14 +958,14 @@
       notifications: React.PropTypes.instanceOf(sharedModels.NotificationCollection)
                           .isRequired,
       sdk: React.PropTypes.object.isRequired,
-      feedbackApiClient: React.PropTypes.object.isRequired,
 
       // XXX New types for flux style
       standaloneAppStore: React.PropTypes.instanceOf(
         loop.store.StandaloneAppStore).isRequired,
       activeRoomStore: React.PropTypes.instanceOf(
         loop.store.ActiveRoomStore).isRequired,
-      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired
+      dispatcher: React.PropTypes.instanceOf(loop.Dispatcher).isRequired,
+      feedbackStore: React.PropTypes.instanceOf(loop.store.FeedbackStore)
     },
 
     getInitialState: function() {
@@ -931,7 +1002,7 @@
                helper={this.props.helper}
                notifications={this.props.notifications}
                sdk={this.props.sdk}
-               feedbackApiClient={this.props.feedbackApiClient}
+               feedbackStore={this.props.feedbackStore}
             />
           );
         }
@@ -992,18 +1063,27 @@
       dispatcher: dispatcher,
       sdk: OT
     });
+    var feedbackClient = new loop.FeedbackAPIClient(
+      loop.config.feedbackApiUrl, {
+      product: loop.config.feedbackProductName,
+      user_agent: navigator.userAgent,
+      url: document.location.origin
+    });
 
+    // Stores
     var standaloneAppStore = new loop.store.StandaloneAppStore({
       conversation: conversation,
       dispatcher: dispatcher,
       helper: helper,
       sdk: OT
     });
-    var activeRoomStore = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: standaloneMozLoop,
       sdkDriver: sdkDriver
     });
+    var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: feedbackClient
+    });
 
     window.addEventListener("unload", function() {
       dispatcher.dispatch(new sharedActions.WindowUnload());
@@ -1015,7 +1095,7 @@
       helper={helper}
       notifications={notifications}
       sdk={OT}
-      feedbackApiClient={feedbackApiClient}
+      feedbackStore={feedbackStore}
       standaloneAppStore={standaloneAppStore}
       activeRoomStore={activeRoomStore}
       dispatcher={dispatcher}
@@ -1036,6 +1116,8 @@
   return {
     CallUrlExpiredView: CallUrlExpiredView,
     PendingConversationView: PendingConversationView,
+    GumPromptConversationView: GumPromptConversationView,
+    WaitingConversationView: WaitingConversationView,
     StartConversationView: StartConversationView,
     FailedConversationView: FailedConversationView,
     OutgoingConversationView: OutgoingConversationView,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/l10n/en-US/loop.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/l10n/en-US/loop.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/l10n/en-US/loop.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/l10n/en-US/loop.properties	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,129 @@
+## LOCALIZATION NOTE: In this file, don't translate the part between {{..}}
+restart_call=Rejoin
+conversation_has_ended=Your conversation has ended.
+call_timeout_notification_text=Your call did not go through.
+missing_conversation_info=Missing conversation information.
+network_disconnected=The network connection terminated abruptly.
+peer_ended_conversation2=The person you were calling has ended the conversation.
+call_failed_title=Call failed.
+generic_failure_title=Something went wrong.
+generic_failure_with_reason2=You can try again or email a link to be reached at later.
+generic_failure_no_reason2=Would you like to try again?
+retry_call_button=Retry
+unable_retrieve_call_info=Unable to retrieve conversation information.
+hangup_button_title=Hang up
+hangup_button_caption2=Exit
+mute_local_audio_button_title=Mute your audio
+unmute_local_audio_button_title=Unmute your audio
+mute_local_video_button_title=Mute your video
+unmute_local_video_button_title=Unmute your video
+outgoing_call_title=Start conversation?
+call_with_contact_title=Conversation with {{incomingCallIdentity}}
+welcome=Welcome to the {{clientShortname}} web client.
+incompatible_browser=Incompatible Browser
+powered_by_webrtc=The audio and video components of {{clientShortname}} are powered by WebRTC.
+use_latest_firefox=Please try this link in a WebRTC-enabled browser, such as {{firefoxBrandNameLink}}.
+incompatible_device=Incompatible device
+sorry_device_unsupported=Sorry, {{clientShortname}} does not currently support your device.
+use_firefox_windows_mac_linux=Please open this page using the latest {{brandShortname}} on Windows, Android, Mac or Linux.
+connection_error_see_console_notification=Call failed; see console for details.
+call_url_unavailable_notification_heading=Oops!
+call_url_unavailable_notification_message2=Sorry, this URL is not available. It may be expired or entered incorrectly.
+promote_firefox_hello_heading=Download {{brandShortname}} to make free audio and video calls!
+get_firefox_button=Get {{brandShortname}}
+initiate_call_button_label2=Ready to start your conversation?
+initiate_audio_video_call_button2=Start
+initiate_audio_video_call_tooltip2=Start a video conversation
+initiate_audio_call_button2=Voice conversation
+initiate_call_cancel_button=Cancel
+legal_text_and_links=By using {{clientShortname}} you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
+terms_of_use_link_text=Terms of use
+privacy_notice_link_text=Privacy notice
+invite_header_text=Invite someone to join you.
+
+## LOCALIZATION NOTE(brandShortname): This should not be localized and
+## should remain "Firefox" for all locales.
+brandShortname=Firefox
+## LOCALIZATION NOTE(clientShortname2): This should not be localized and
+## should remain "Firefox Hello" for all locales.
+clientShortname2=Firefox Hello
+## LOCALIZATION NOTE(vendorShortname): This should not be localized and
+## should remain "Mozilla" for all locales.
+vendorShortname=Mozilla
+
+## LOCALIZATION NOTE(client_alttext): {{clientShortname}} will be replaced with the
+## value of the clientShortname2 string above.
+client_alttext={{clientShortname}} logo
+vendor_alttext={{vendorShortname}} logo
+
+## LOCALIZATION NOTE (call_url_creation_date_label): Example output: (from May 26, 2014)
+call_url_creation_date_label=(from {{call_url_creation_date}})
+call_progress_getting_media_description={{clientShortname}} requires access to your camera and microphone.
+call_progress_getting_media_title=Waiting for media…
+call_progress_connecting_description=Connecting…
+call_progress_ringing_description=Ringing…
+fxos_app_needed=Please install the {{fxosAppName}} app from the Firefox Marketplace.
+
+feedback_call_experience_heading2=How was your conversation?
+feedback_what_makes_you_sad=What makes you sad?
+feedback_thank_you_heading=Thank you for your feedback!
+feedback_category_audio_quality=Audio quality
+feedback_category_video_quality=Video quality
+feedback_category_was_disconnected=Was disconnected
+feedback_category_confusing=Confusing
+feedback_category_other=Other:
+feedback_custom_category_text_placeholder=What went wrong?
+feedback_submit_button=Submit
+feedback_back_button=Back
+## LOCALIZATION NOTE (feedback_window_will_close_in2):
+## Gaia l10n format; see https://github.com/mozilla-b2g/gaia/blob/f108c706fae43cd61628babdd9463e7695b2496e/apps/email/locales/email.en-US.properties#L387
+## In this item, don't translate the part between {{..}}
+feedback_window_will_close_in2={[ plural(countdown) ]}
+feedback_window_will_close_in2[one] = This window will close in {{countdown}} second
+feedback_window_will_close_in2[two] = This window will close in {{countdown}} seconds
+feedback_window_will_close_in2[few] = This window will close in {{countdown}} seconds
+feedback_window_will_close_in2[many] = This window will close in {{countdown}} seconds
+feedback_window_will_close_in2[other] = This window will close in {{countdown}} seconds
+
+## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
+## a signed-in to signed-in user call.
+## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#feedback
+feedback_rejoin_button=Rejoin
+## LOCALIZATION NOTE (feedback_report_user_button): Used to report a user in the case of
+## an abusive user.
+feedback_report_user_button=Report User
+
+## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
+## replaced by the brand name
+first_time_experience_title={{clientShortname}} — Join the conversation
+first_time_experience_button_label=Get Started
+
+help_label=Help
+tour_label=Tour
+
+rooms_default_room_name_template=Conversation {{conversationLabel}}
+rooms_leave_button_label=Leave
+rooms_list_copy_url_tooltip=Copy Link
+rooms_list_delete_tooltip=Delete conversation
+rooms_list_deleteConfirmation_label=Are you sure?
+rooms_name_this_room_label=Name this conversation
+rooms_new_room_button_label=Start a conversation
+rooms_only_occupant_label=You're the first one here.
+rooms_panel_title=Choose a conversation or start a new one
+rooms_room_full_label=There are already two people in this conversation.
+rooms_room_full_call_to_action_nonFx_label=Download {{brandShortname}} to start your own
+rooms_room_full_call_to_action_label=Learn more about {{clientShortname}} »
+rooms_room_joined_label=Someone has joined the conversation!
+rooms_room_join_label=Join the conversation
+rooms_display_name_guest=Guest
+rooms_unavailable_notification_message=Sorry, you cannot join this conversation. The link may be expired or invalid.
+rooms_media_denied_message=We could not get access to your microphone or camera. Please reload the page to try again.
+
+## LOCALIZATION_NOTE(standalone_title_with_status): {{clientShortname}} will be
+## replaced by the brand name and {{currentStatus}} will be replaced
+## by the current call status (Connecting, Ringing, etc.)
+standalone_title_with_status={{clientShortname}} — {{currentStatus}}
+status_in_conversation=In conversation
+status_conversation_ended=Conversation ended
+status_error=Something went wrong
+support_link=Get Help
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/l10n/loop.en-US.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/l10n/loop.en-US.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/content/l10n/loop.en-US.properties	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/content/l10n/loop.en-US.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-## LOCALIZATION NOTE: In this file, don't translate the part between {{..}}
-restart_call=Rejoin
-conversation_has_ended=Your conversation has ended.
-call_timeout_notification_text=Your call did not go through.
-missing_conversation_info=Missing conversation information.
-network_disconnected=The network connection terminated abruptly.
-peer_ended_conversation2=The person you were calling has ended the conversation.
-call_failed_title=Call failed.
-connection_error_see_console_notification=Call failed; see console for details.
-generic_failure_title=Something went wrong.
-generic_failure_with_reason2=You can try again or email a link to be reached at later.
-generic_failure_no_reason2=Would you like to try again?
-retry_call_button=Retry
-feedback_report_user_button=Report User
-unable_retrieve_call_info=Unable to retrieve conversation information.
-hangup_button_title=Hang up
-hangup_button_caption2=Exit
-mute_local_audio_button_title=Mute your audio
-unmute_local_audio_button_title=Unmute your audio
-mute_local_video_button_title=Mute your video
-unmute_local_video_button_title=Unmute your video
-outgoing_call_title=Start conversation?
-call_with_contact_title=Conversation with {{incomingCallIdentity}}
-welcome=Welcome to the {{clientShortname}} web client.
-incompatible_browser=Incompatible Browser
-powered_by_webrtc=The audio and video components of {{clientShortname}} are powered by WebRTC.
-use_latest_firefox=Please try this link in a WebRTC-enabled browser, such as {{firefoxBrandNameLink}}.
-incompatible_device=Incompatible device
-sorry_device_unsupported=Sorry, {{clientShortname}} does not currently support your device.
-use_firefox_windows_mac_linux=Please open this page using the latest {{brandShortname}} on Windows, Android, Mac or Linux.
-connection_error_see_console_notification=Call failed; see console for details.
-call_url_unavailable_notification_heading=Oops!
-call_url_unavailable_notification_message2=Sorry, this URL is not available. It may be expired or entered incorrectly.
-promote_firefox_hello_heading=Download {{brandShortname}} to make free audio and video calls!
-get_firefox_button=Get {{brandShortname}}
-initiate_call_button_label2=Ready to start your conversation?
-initiate_audio_video_call_button2=Start
-initiate_audio_video_call_tooltip2=Start a video conversation
-initiate_audio_call_button2=Voice conversation
-initiate_call_cancel_button=Cancel
-legal_text_and_links=By using {{clientShortname}} you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
-terms_of_use_link_text=Terms of use
-privacy_notice_link_text=Privacy notice
-invite_header_text=Invite someone to join you.
-
-## LOCALIZATION NOTE(brandShortname): This should not be localized and
-## should remain "Firefox" for all locales.
-brandShortname=Firefox
-## LOCALIZATION NOTE(clientShortname2): This should not be localized and
-## should remain "Firefox Hello" for all locales.
-clientShortname2=Firefox Hello
-## LOCALIZATION NOTE(vendorShortname): This should not be localized and
-## should remain "Mozilla" for all locales.
-vendorShortname=Mozilla
-
-## LOCALIZATION NOTE(client_alttext): {{clientShortname}} will be replaced with the
-## value of the clientShortname2 string above.
-client_alttext={{clientShortname}} logo
-vendor_alttext={{vendorShortname}} logo
-
-## LOCALIZATION NOTE (call_url_creation_date_label): Example output: (from May 26, 2014)
-call_url_creation_date_label=(from {{call_url_creation_date}})
-call_progress_connecting_description=Connecting…
-call_progress_ringing_description=Ringing…
-fxos_app_needed=Please install the {{fxosAppName}} app from the Firefox Marketplace.
-
-feedback_call_experience_heading2=How was your conversation?
-feedback_what_makes_you_sad=What makes you sad?
-feedback_thank_you_heading=Thank you for your feedback!
-feedback_category_audio_quality=Audio quality
-feedback_category_video_quality=Video quality
-feedback_category_was_disconnected=Was disconnected
-feedback_category_confusing=Confusing
-feedback_category_other=Other:
-feedback_custom_category_text_placeholder=What went wrong?
-feedback_submit_button=Submit
-feedback_back_button=Back
-## LOCALIZATION NOTE (feedback_window_will_close_in2):
-## Gaia l10n format; see https://github.com/mozilla-b2g/gaia/blob/f108c706fae43cd61628babdd9463e7695b2496e/apps/email/locales/email.en-US.properties#L387
-## In this item, don't translate the part between {{..}}
-feedback_window_will_close_in2={[ plural(countdown) ]}
-feedback_window_will_close_in2[one] = This window will close in {{countdown}} second
-feedback_window_will_close_in2[two] = This window will close in {{countdown}} seconds
-feedback_window_will_close_in2[few] = This window will close in {{countdown}} seconds
-feedback_window_will_close_in2[many] = This window will close in {{countdown}} seconds
-feedback_window_will_close_in2[other] = This window will close in {{countdown}} seconds
-
-## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
-## a signed-in to signed-in user call.
-## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#feedback
-feedback_rejoin_button=Rejoin
-## LOCALIZATION NOTE (feedback_report_user_button): Used to report a user in the case of
-## an abusive user.
-feedback_report_user_button=Report User
-
-## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
-## replaced by the brand name
-first_time_experience_title={{clientShortname}} — Join the conversation
-first_time_experience_button_label=Get Started
-
-help_label=Help
-tour_label=Tour
-
-rooms_default_room_name_template=Conversation {{conversationLabel}}
-rooms_leave_button_label=Leave
-rooms_list_copy_url_tooltip=Copy Link
-rooms_list_delete_tooltip=Delete conversation
-rooms_list_deleteConfirmation_label=Are you sure?
-rooms_name_this_room_label=Name this conversation
-rooms_new_room_button_label=Start a conversation
-rooms_only_occupant_label=You're the first one here.
-rooms_panel_title=Choose a conversation or start a new one
-rooms_room_full_label=There are already two people in this conversation.
-rooms_room_full_call_to_action_nonFx_label=Download {{brandShortname}} to start your own
-rooms_room_full_call_to_action_label=Learn more about {{clientShortname}} »
-rooms_room_joined_label=Someone has joined the conversation!
-rooms_room_join_label=Join the conversation
-rooms_display_name_guest=Guest
-
-## LOCALIZATION_NOTE(standalone_title_with_status): {{clientShortname}} will be
-## replaced by the brand name and {{currentStatus}} will be replaced
-## by the current call status (Connecting, Ringing, etc.)
-standalone_title_with_status={{clientShortname}} — {{currentStatus}}
-status_in_conversation=In conversation
-status_conversation_ended=Conversation ended
-status_error=Something went wrong
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/Makefile thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/Makefile
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/Makefile	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/Makefile	2014-11-26 21:45:48.000000000 +0000
@@ -12,7 +12,7 @@
 # Bug 1066176 tracks moving all functionality currently here
 # to the Gruntfile and getting rid of this Makefile entirely.
 
-LOOP_SERVER_URL := $(shell echo $${LOOP_SERVER_URL-http://localhost:5000})
+LOOP_SERVER_URL := $(shell echo $${LOOP_SERVER_URL-http://localhost:5000/v0})
 LOOP_FEEDBACK_API_URL := $(shell echo $${LOOP_FEEDBACK_API_URL-"https://input.allizom.org/api/v1/feedback"})
 LOOP_FEEDBACK_PRODUCT_NAME := $(shell echo $${LOOP_FEEDBACK_PRODUCT_NAME-Loop})
 LOOP_BRAND_WEBSITE_URL := $(shell echo $${LOOP_BRAND_WEBSITE_URL-"https://www.mozilla.org/firefox/"})
@@ -84,3 +84,5 @@
 	@echo "loop.config.fxosApp = loop.config.fxosApp || {};" >> content/config.js
 	@echo "loop.config.fxosApp.name = 'Loop';" >> content/config.js
 	@echo "loop.config.fxosApp.manifestUrl = 'http://fake-market.herokuapp.com/apps/packagedApp/manifest.webapp';" >> content/config.js
+	@echo "loop.config.roomsSupportUrl = 'https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc';" >> content/config.js
+	@echo "loop.config.guestSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';" >> content/config.js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/server.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/server.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/standalone/server.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/standalone/server.js	2014-11-26 21:45:48.000000000 +0000
@@ -18,7 +18,7 @@
   res.send([
     "var loop = loop || {};",
     "loop.config = loop.config || {};",
-    "loop.config.serverUrl = 'http://localhost:" + loopServerPort + "';",
+    "loop.config.serverUrl = 'http://localhost:" + loopServerPort + "/v0';",
     "loop.config.feedbackApiUrl = '" + feedbackApiUrl + "';",
     "loop.config.feedbackProductName = '" + feedbackProductName + "';",
     // XXX Update with the real marketplace url once the FxOS Loop app is
@@ -30,7 +30,9 @@
     "loop.config.legalWebsiteUrl = '/legal/terms';",
     "loop.config.fxosApp = loop.config.fxosApp || {};",
     "loop.config.fxosApp.name = 'Loop';",
-    "loop.config.fxosApp.manifestUrl = 'http://fake-market.herokuapp.com/apps/packagedApp/manifest.webapp';"
+    "loop.config.fxosApp.manifestUrl = 'http://fake-market.herokuapp.com/apps/packagedApp/manifest.webapp';",
+    "loop.config.roomsSupportUrl = 'https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc';",
+    "loop.config.guestSupportUrl = 'https://support.mozilla.org/kb/respond-firefox-hello-invitation-guest-mode';"
   ].join("\n"));
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/client_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/client_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/client_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/client_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -28,11 +28,10 @@
     callback = sinon.spy();
     fakeToken = "fakeTokenText";
     mozLoop = {
-      getLoopCharPref: sandbox.stub()
+      getLoopPref: sandbox.stub()
         .returns(null)
         .withArgs("hawk-session-token")
         .returns(fakeToken),
-      ensureRegistered: sinon.stub().callsArgWith(1, null),
       noteCallUrlExpiry: sinon.spy(),
       hawkRequest: sinon.stub(),
       LOOP_SESSION_TYPE: {
@@ -55,21 +54,6 @@
 
   describe("loop.Client", function() {
     describe("#deleteCallUrl", function() {
-      it("should ensure loop is registered", function() {
-        client.deleteCallUrl("fakeToken", mozLoop.LOOP_SESSION_TYPE.FXA, callback);
-
-        sinon.assert.calledOnce(mozLoop.ensureRegistered);
-      });
-
-      it("should send an error when registration fails", function() {
-        mozLoop.ensureRegistered.callsArgWith(1, "offline");
-
-        client.deleteCallUrl("fakeToken", mozLoop.LOOP_SESSION_TYPE.FXA, callback);
-
-        sinon.assert.calledOnce(callback);
-        sinon.assert.calledWithExactly(callback, "offline");
-      });
-
       it("should make a delete call to /call-url/{fakeToken}", function() {
         client.deleteCallUrl(fakeToken, mozLoop.LOOP_SESSION_TYPE.GUEST, callback);
 
@@ -106,21 +90,6 @@
     });
 
     describe("#requestCallUrl", function() {
-      it("should ensure loop is registered", function() {
-        client.requestCallUrl("foo", callback);
-
-        sinon.assert.calledOnce(mozLoop.ensureRegistered);
-      });
-
-      it("should send an error when registration fails", function() {
-        mozLoop.ensureRegistered.callsArgWith(1, "offline");
-
-        client.requestCallUrl("foo", callback);
-
-        sinon.assert.calledOnce(callback);
-        sinon.assert.calledWithExactly(callback, "offline");
-      });
-
       it("should post to /call-url/", function() {
         client.requestCallUrl("foo", callback);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/contacts_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/contacts_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/contacts_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/contacts_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -75,6 +75,80 @@
           expect(addButton).to.not.equal(null);
           expect(addButton.textContent).to.eql(fakeAddContactButtonText);
         });
+        it("should have all fields required by default", function() {
+          var view = TestUtils.renderIntoDocument(
+            loop.contacts.ContactDetailsForm({mode: "add"}));
+          var nameInput = view.getDOMNode().querySelector("input[type='text']");
+          var telInput = view.getDOMNode().querySelector("input[type='tel']");
+          var emailInput = view.getDOMNode().querySelector("input[type='email']");
+
+          expect(nameInput.required).to.equal(true);
+          expect(emailInput.required).to.equal(true);
+          expect(telInput.required).to.equal(true);
+        });
+        it("should have email and tel required after a name is input", function() {
+          var view = TestUtils.renderIntoDocument(
+            loop.contacts.ContactDetailsForm({mode: "add"}));
+          var nameInput = view.getDOMNode().querySelector("input[type='text']");
+          TestUtils.Simulate.change(nameInput, {target: {value: "Jenny"}});
+          var telInput = view.getDOMNode().querySelector("input[type='tel']");
+          var emailInput = view.getDOMNode().querySelector("input[type='email']");
+
+          expect(nameInput.required).to.equal(true);
+          expect(emailInput.required).to.equal(true);
+          expect(telInput.required).to.equal(true);
+        });
+        it("should allow a contact with only a name and a phone number", function() {
+          var view = TestUtils.renderIntoDocument(
+            loop.contacts.ContactDetailsForm({mode: "add"}));
+          var nameInput = view.getDOMNode().querySelector("input[type='text']");
+          TestUtils.Simulate.change(nameInput, {target: {value: "Jenny"}});
+          var telInput = view.getDOMNode().querySelector("input[type='tel']");
+          TestUtils.Simulate.change(telInput, {target: {value: "867-5309"}});
+          var emailInput = view.getDOMNode().querySelector("input[type='email']");
+
+          expect(nameInput.checkValidity()).to.equal(true, "nameInput");
+          expect(emailInput.required).to.equal(false, "emailInput");
+          expect(telInput.checkValidity()).to.equal(true, "telInput");
+        });
+        it("should allow a contact with only a name and email", function() {
+          var view = TestUtils.renderIntoDocument(
+            loop.contacts.ContactDetailsForm({mode: "add"}));
+          var nameInput = view.getDOMNode().querySelector("input[type='text']");
+          TestUtils.Simulate.change(nameInput, {target: {value: "Example"}});
+          var emailInput = view.getDOMNode().querySelector("input[type='email']");
+          TestUtils.Simulate.change(emailInput, {target: {value: "test@example.com"}});
+          var telInput = view.getDOMNode().querySelector("input[type='tel']");
+
+          expect(nameInput.checkValidity()).to.equal(true);
+          expect(emailInput.checkValidity()).to.equal(true);
+          expect(telInput.required).to.equal(false);
+        });
+        it("should not allow a contact with only a name", function() {
+          var view = TestUtils.renderIntoDocument(
+            loop.contacts.ContactDetailsForm({mode: "add"}));
+          var nameInput = view.getDOMNode().querySelector("input[type='text']");
+          TestUtils.Simulate.change(nameInput, {target: {value: "Example"}});
+          var emailInput = view.getDOMNode().querySelector("input[type='email']");
+          var telInput = view.getDOMNode().querySelector("input[type='tel']");
+
+          expect(nameInput.checkValidity()).to.equal(true);
+          expect(emailInput.checkValidity()).to.equal(false);
+          expect(telInput.checkValidity()).to.equal(false);
+        });
+        it("should not allow a contact without name", function() {
+          var view = TestUtils.renderIntoDocument(
+            loop.contacts.ContactDetailsForm({mode: "add"}));
+          var nameInput = view.getDOMNode().querySelector("input[type='text']");
+          var emailInput = view.getDOMNode().querySelector("input[type='email']");
+          TestUtils.Simulate.change(emailInput, {target: {value: "test@example.com"}});
+          var telInput = view.getDOMNode().querySelector("input[type='tel']");
+          TestUtils.Simulate.change(telInput, {target: {value: "867-5309"}});
+
+          expect(nameInput.checkValidity()).to.equal(false);
+          expect(emailInput.checkValidity()).to.equal(true);
+          expect(telInput.checkValidity()).to.equal(true);
+        });
       });
       describe("edit mode", function() {
         it("should render 'edit' header", function() {
@@ -137,28 +211,21 @@
     it("should not set the value on the object if the new value is empty," +
        " it didn't exist before, and it is optional", function() {
           var contact = {};
-          loop.contacts._setPreferred(contact, {field: "fakeField", value: "", optional: true});
+          loop.contacts._setPreferred(contact, "fakeField", "");
 
           expect(contact).to.not.have.property("fakeField");
        });
     it("should clear the value on the object if the new value is empty," +
        " it existed before, and it is optional", function() {
           var contact = {fakeField: [{value: "foobar"}]};
-          loop.contacts._setPreferred(contact, {field: "fakeField", value: "", optional: true});
+          loop.contacts._setPreferred(contact, "fakeField", "");
 
           expect(contact["fakeField"][0].value).to.eql("");
        });
     it("should set the value on the object if the new value is empty," +
        " and it did not exist before", function() {
-          var contact = {};
-          loop.contacts._setPreferred(contact, {field: "fakeField", value: ""});
-
-          expect(contact).to.have.property("fakeField");
-       });
-    it("should set the value on the object if the new value is empty," +
-       " and it did not exist before", function() {
           var contact = {fakeField: [{value: "foobar"}]};
-          loop.contacts._setPreferred(contact, {field: "fakeField", value: "barbaz"});
+          loop.contacts._setPreferred(contact, "fakeField", "barbaz");
 
           expect(contact["fakeField"][0].value).to.eql("barbaz");
        });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/conversation_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/conversation_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/conversation_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/conversation_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -38,9 +38,14 @@
       get locale() {
         return "en-US";
       },
-      setLoopCharPref: sinon.stub(),
-      getLoopCharPref: sinon.stub().returns("http://fakeurl"),
-      getLoopBoolPref: sinon.stub(),
+      setLoopPref: sinon.stub(),
+      getLoopPref: function(prefName) {
+        if (prefName == "debug.sdk") {
+          return false;
+        }
+
+        return "http://fake";
+      },
       calls: {
         clearCallInProgress: sinon.stub()
       },
@@ -169,9 +174,8 @@
         dispatcher: dispatcher,
         sdkDriver: {}
       });
-      roomStore = new loop.store.RoomStore({
+      roomStore = new loop.store.RoomStore(dispatcher, {
         mozLoop: navigator.mozLoop,
-        dispatcher: dispatcher
       });
       conversationAppStore = new loop.store.ConversationAppStore({
         dispatcher: dispatcher,
@@ -229,7 +233,8 @@
   });
 
   describe("IncomingConversationView", function() {
-    var conversationAppStore, conversation, client, icView, oldTitle;
+    var conversationAppStore, conversation, client, icView, oldTitle,
+        feedbackStore;
 
     function mountTestComponent() {
       return TestUtils.renderIntoDocument(
@@ -237,7 +242,8 @@
           client: client,
           conversation: conversation,
           sdk: {},
-          conversationAppStore: conversationAppStore
+          conversationAppStore: conversationAppStore,
+          feedbackStore: feedbackStore
         }));
     }
 
@@ -253,6 +259,9 @@
         dispatcher: dispatcher,
         mozLoop: navigator.mozLoop
       });
+      feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+        feedbackClient: {}
+      });
       sandbox.stub(conversation, "setOutgoingSessionData");
     });
 
@@ -547,7 +556,7 @@
       });
 
       describe("#blocked", function() {
-        var mozLoop;
+        var mozLoop, deleteCallUrlStub;
 
         beforeEach(function() {
           icView = mountTestComponent();
@@ -564,6 +573,9 @@
               FXA: 2
             }
           };
+
+          deleteCallUrlStub = sandbox.stub(loop.Client.prototype,
+                                           "deleteCallUrl");
         });
 
         it("should call mozLoop.stopAlerting", function() {
@@ -578,12 +590,10 @@
                                            .withArgs("sessionType")
                                            .returns(mozLoop.LOOP_SESSION_TYPE.FXA);
 
-          var deleteCallUrl = sandbox.stub(loop.Client.prototype,
-                                           "deleteCallUrl");
           icView.declineAndBlock();
 
-          sinon.assert.calledOnce(deleteCallUrl);
-          sinon.assert.calledWithExactly(deleteCallUrl,
+          sinon.assert.calledOnce(deleteCallUrlStub);
+          sinon.assert.calledWithExactly(deleteCallUrlStub,
             "fakeToken", mozLoop.LOOP_SESSION_TYPE.FXA, sinon.match.func);
         });
 
@@ -602,9 +612,7 @@
           var fakeError = {
             error: true
           };
-          sandbox.stub(loop.Client.prototype, "deleteCallUrl", function(_, __, cb) {
-            cb(fakeError);
-          });
+          deleteCallUrlStub.callsArgWith(2, fakeError);
           icView.declineAndBlock();
 
           sinon.assert.calledOnce(log);
@@ -647,7 +655,6 @@
         icView = mountTestComponent();
 
         conversation.set("loopToken", "fakeToken");
-        navigator.mozLoop.getLoopCharPref.returns("http://fake");
         stubComponent(sharedView, "ConversationView");
       });
 
@@ -917,6 +924,7 @@
         pause: sinon.spy(),
         removeAttribute: sinon.spy()
       };
+      navigator.mozLoop.doNotDisturb = false;
       sandbox.stub(window, "Audio").returns(fakeAudio);
 
       view = TestUtils.renderIntoDocument(
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/conversationViews_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/conversationViews_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/conversationViews_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/conversationViews_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -44,7 +44,7 @@
     };
 
     navigator.mozLoop = {
-      getLoopCharPref: sinon.stub().returns("http://fakeurl"),
+      getLoopPref: sinon.stub().returns("http://fakeurl"),
       composeEmail: sinon.spy(),
       get appVersionInfo() {
         return {
@@ -445,13 +445,14 @@
   });
 
   describe("OutgoingConversationView", function() {
-    var store;
+    var store, feedbackStore;
 
     function mountTestComponent() {
       return TestUtils.renderIntoDocument(
         loop.conversationViews.OutgoingConversationView({
           dispatcher: dispatcher,
-          store: store
+          store: store,
+          feedbackStore: feedbackStore
         }));
     }
 
@@ -461,6 +462,9 @@
         client: {},
         sdkDriver: {}
       });
+      feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+        feedbackClient: {}
+      });
     });
 
     it("should render the CallFailedView when the call state is 'terminated'",
@@ -506,6 +510,22 @@
           loop.shared.views.FeedbackView);
     });
 
+    it("should play the terminated sound when the call state is 'finished'",
+      function() {
+        var fakeAudio = {
+          play: sinon.spy(),
+          pause: sinon.spy(),
+          removeAttribute: sinon.spy()
+        };
+        sandbox.stub(window, "Audio").returns(fakeAudio);
+
+        store.set({callState: CALL_STATES.FINISHED});
+
+        view = mountTestComponent();
+
+        sinon.assert.calledOnce(fakeAudio.play);
+    });
+
     it("should update the rendered views when the state is changed.",
       function() {
         store.set({
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/index.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/index.html	2014-11-26 21:45:48.000000000 +0000
@@ -43,8 +43,11 @@
   <script src="../../content/shared/js/validate.js"></script>
   <script src="../../content/shared/js/dispatcher.js"></script>
   <script src="../../content/shared/js/otSdkDriver.js"></script>
+  <script src="../../content/shared/js/store.js"></script>
   <script src="../../content/shared/js/roomStore.js"></script>
   <script src="../../content/shared/js/activeRoomStore.js"></script>
+  <script src="../../content/shared/js/feedbackStore.js"></script>
+  <script src="../../content/shared/js/feedbackViews.js"></script>
   <script src="../../content/js/client.js"></script>
   <script src="../../content/js/conversationAppStore.js"></script>
   <script src="../../content/js/roomViews.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/panel_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/panel_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/panel_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/panel_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -34,9 +34,8 @@
       get locale() {
         return "en-US";
       },
-      getLoopBoolPref: sandbox.stub(),
-      setLoopCharPref: sandbox.stub(),
-      getLoopCharPref: sandbox.stub().returns("unseen"),
+      setLoopPref: sandbox.stub(),
+      getLoopPref: sandbox.stub().returns("unseen"),
       getPluralForm: function() {
         return "fakeText";
       },
@@ -155,8 +154,7 @@
       };
 
       dispatcher = new loop.Dispatcher();
-      roomStore = new loop.store.RoomStore({
-        dispatcher: dispatcher,
+      roomStore = new loop.store.RoomStore(dispatcher, {
         mozLoop: navigator.mozLoop
       });
     });
@@ -176,15 +174,16 @@
 
       describe("loop.rooms.enabled on", function() {
         beforeEach(function() {
-          navigator.mozLoop.getLoopBoolPref = function(pref) {
-            if (pref === "rooms.enabled") {
+          navigator.mozLoop.getLoopPref = function(pref) {
+            if (pref === "rooms.enabled" ||
+                pref === "gettingStarted.seen") {
               return true;
             }
           };
 
           view = createTestPanelView();
 
-          [callTab, roomsTab, contactsTab] =
+          [roomsTab, contactsTab] =
             TestUtils.scryRenderedDOMComponentsWithClass(view, "tab");
         });
 
@@ -203,21 +202,15 @@
           expect(roomsTab.getDOMNode().classList.contains("selected"))
             .to.be.true;
         });
-
-        it("should select call tab when clicking tab button", function() {
-          TestUtils.Simulate.click(
-            view.getDOMNode().querySelector("li[data-tab-name=\"call\"]"));
-
-          expect(callTab.getDOMNode().classList.contains("selected"))
-            .to.be.true;
-        });
       });
 
       describe("loop.rooms.enabled off", function() {
         beforeEach(function() {
-          navigator.mozLoop.getLoopBoolPref = function(pref) {
+          navigator.mozLoop.getLoopPref = function(pref) {
             if (pref === "rooms.enabled") {
               return false;
+            } else if (pref === "gettingStarted.seen") {
+              return true;
             }
           };
 
@@ -363,12 +356,71 @@
       });
     });
 
+    describe("Help", function() {
+      var supportUrl = "https://example.com";
+
+      beforeEach(function() {
+        navigator.mozLoop.getLoopPref = function(pref) {
+          if (pref === "support_url")
+            return supportUrl;
+          return "unseen";
+        };
+
+        sandbox.stub(window, "open");
+        sandbox.stub(window, "close");
+      });
+
+      it("should open a tab to the support page", function() {
+        var view = TestUtils.renderIntoDocument(loop.panel.SettingsDropdown());
+
+        TestUtils.Simulate
+          .click(view.getDOMNode().querySelector(".icon-help"));
+
+        sinon.assert.calledOnce(window.open);
+        sinon.assert.calledWithExactly(window.open, supportUrl);
+      });
+    });
+
     describe("#render", function() {
       it("should render a ToSView", function() {
         var view = createTestPanelView();
 
         TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
       });
+
+      it("should not render a ToSView when the view has been 'seen'", function() {
+        navigator.mozLoop.getLoopPref = function() {
+          return "seen";
+        };
+        var view = createTestPanelView();
+
+        try {
+          TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
+          sinon.assert.fail("Should not find the ToSView if it has been 'seen'");
+        } catch (ex) {}
+      });
+
+      it("should render a GettingStarted view", function() {
+        navigator.mozLoop.getLoopPref = function(pref) {
+          return false;
+        };
+        var view = createTestPanelView();
+
+        TestUtils.findRenderedComponentWithType(view, loop.panel.GettingStartedView);
+      });
+
+      it("should not render a GettingStartedView when the view has been seen", function() {
+        navigator.mozLoop.getLoopPref = function() {
+          return true;
+        };
+        var view = createTestPanelView();
+
+        try {
+          TestUtils.findRenderedComponentWithType(view, loop.panel.GettingStartedView);
+          sinon.assert.fail("Should not find the GettingStartedView if it has been seen");
+        } catch (ex) {}
+      });
+
     });
   });
 
@@ -764,8 +816,7 @@
     beforeEach(function() {
       fakeEmail = "fakeEmail@example.com";
       dispatcher = new loop.Dispatcher();
-      roomStore = new loop.store.RoomStore({
-        dispatcher: dispatcher,
+      roomStore = new loop.store.RoomStore(dispatcher, {
         mozLoop: navigator.mozLoop
       });
       roomStore.setStoreState({
@@ -841,7 +892,7 @@
 
     it("should not render when the value of loop.seenToS is set to 'seen'",
       function(done) {
-        navigator.mozLoop.getLoopCharPref = function() {
+        navigator.mozLoop.getLoopPref = function() {
           return "seen";
         };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/roomViews_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/roomViews_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/desktop-local/roomViews_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/desktop-local/roomViews_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -30,13 +30,11 @@
       return x;
     });
 
-    activeRoomStore = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: {},
       sdkDriver: {}
     });
-    roomStore = new loop.store.RoomStore({
-      dispatcher: dispatcher,
+    roomStore = new loop.store.RoomStore(dispatcher, {
       mozLoop: {},
       activeRoomStore: activeRoomStore
     });
@@ -65,6 +63,7 @@
         roomState: ROOM_STATES.INIT,
         audioMuted: false,
         videoMuted: false,
+        failureReason: undefined,
         foo: "bar"
       });
     });
@@ -118,6 +117,48 @@
           new sharedActions.EmailRoomUrl({roomUrl: "http://invalid"}));
       });
 
+    describe("Rename Room", function() {
+      var roomNameBox;
+
+      beforeEach(function() {
+        view = mountTestComponent();
+        view.setState({
+          roomToken: "fakeToken",
+          roomName: "fakeName"
+        });
+
+        roomNameBox = view.getDOMNode().querySelector('.input-room-name');
+
+        React.addons.TestUtils.Simulate.change(roomNameBox, { target: {
+          value: "reallyFake"
+        }});
+      });
+
+      it("should dispatch a RenameRoom action when the focus is lost",
+        function() {
+          React.addons.TestUtils.Simulate.blur(roomNameBox);
+
+          sinon.assert.calledOnce(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.RenameRoom({
+              roomToken: "fakeToken",
+              newRoomName: "reallyFake"
+            }));
+        });
+
+      it("should dispatch a RenameRoom action when enter is pressed",
+        function() {
+          React.addons.TestUtils.Simulate.submit(roomNameBox);
+
+          sinon.assert.calledOnce(dispatcher.dispatch);
+          sinon.assert.calledWithExactly(dispatcher.dispatch,
+            new sharedActions.RenameRoom({
+              roomToken: "fakeToken",
+              newRoomName: "reallyFake"
+            }));
+        });
+    });
+
     describe("Copy Button", function() {
       beforeEach(function() {
         view = mountTestComponent();
@@ -158,7 +199,10 @@
       return TestUtils.renderIntoDocument(
         new loop.roomViews.DesktopRoomConversationView({
           dispatcher: dispatcher,
-          roomStore: roomStore
+          roomStore: roomStore,
+          feedbackStore: new loop.store.FeedbackStore(dispatcher, {
+            feedbackClient: {}
+          })
         }));
     }
 
@@ -275,6 +319,16 @@
           TestUtils.findRenderedComponentWithType(view,
             loop.roomViews.DesktopRoomConversationView);
         });
+
+      it("should render the FeedbackView if roomState is `ENDED`",
+        function() {
+          activeRoomStore.setStoreState({roomState: ROOM_STATES.ENDED});
+
+          view = mountTestComponent();
+
+          TestUtils.findRenderedComponentWithType(view,
+            loop.shared.views.FeedbackView);
+        });
     });
   });
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/browser_fxa_login.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/browser_fxa_login.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/browser_fxa_login.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/browser_fxa_login.js	2014-11-26 21:45:48.000000000 +0000
@@ -40,6 +40,7 @@
 add_task(function* setup() {
   Services.prefs.setCharPref("loop.server", BASE_URL);
   Services.prefs.setCharPref("services.push.serverURL", "ws://localhost/");
+  Services.prefs.setBoolPref("loop.gettingStarted.seen", true);
   MozLoopServiceInternal.mocks.pushHandler = mockPushHandler;
   // Normally the same pushUrl would be registered but we change it in the test
   // to be able to check for success on the second registration.
@@ -51,6 +52,7 @@
     yield promiseDeletedOAuthParams(BASE_URL);
     Services.prefs.clearUserPref("loop.server");
     Services.prefs.clearUserPref("services.push.serverURL");
+    Services.prefs.clearUserPref("loop.gettingStarted.seen");
     MozLoopServiceInternal.mocks.pushHandler = undefined;
     delete mockPushHandler.registeredChannels[MozLoopService.channelIDs.callsFxA];
     delete mockPushHandler.registeredChannels[MozLoopService.channelIDs.roomsFxA];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js	2014-11-26 21:45:48.000000000 +0000
@@ -17,13 +17,13 @@
 
   Assert.ok(gMozLoopAPI, "mozLoop should exist");
 
-  // Test setLoopCharPref
-  gMozLoopAPI.setLoopCharPref("test", "foo");
+  // Test setLoopPref
+  gMozLoopAPI.setLoopPref("test", "foo", Ci.nsIPrefBranch.PREF_STRING);
   Assert.equal(Services.prefs.getCharPref("loop.test"), "foo",
                "should set loop pref value correctly");
 
-  // Test getLoopCharPref
-  Assert.equal(gMozLoopAPI.getLoopCharPref("test"), "foo",
+  // Test getLoopPref
+  Assert.equal(gMozLoopAPI.getLoopPref("test"), "foo",
                "should get loop pref value correctly");
 });
 
@@ -36,7 +36,7 @@
 
   Services.prefs.setBoolPref("loop.testBool", true);
 
-  // Test getLoopCharPref
-  Assert.equal(gMozLoopAPI.getLoopBoolPref("testBool"), true,
+  // Test getLoopPref
+  Assert.equal(gMozLoopAPI.getLoopPref("testBool"), true,
                "should get loop pref value correctly");
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js	2014-11-26 21:45:48.000000000 +0000
@@ -8,11 +8,14 @@
 "use strict";
 
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
+const {LoopRoomsInternal} = Components.utils.import("resource:///modules/loop/LoopRooms.jsm", {});
+Services.prefs.setBoolPref("loop.gettingStarted.seen", true);
 
 registerCleanupFunction(function*() {
   MozLoopService.doNotDisturb = false;
   MozLoopServiceInternal.fxAOAuthProfile = null;
   yield MozLoopServiceInternal.clearError("testing");
+  Services.prefs.clearUserPref("loop.gettingStarted.seen");
 });
 
 add_task(function* test_doNotDisturb() {
@@ -79,3 +82,14 @@
   Assert.strictEqual(LoopUI.toolbarButton.node.getAttribute("state"), "", "Check button is in default state");
 });
 
+add_task(function* test_room_participants() {
+  Assert.strictEqual(LoopUI.toolbarButton.node.getAttribute("state"), "", "Check button is in default state");
+  LoopRoomsInternal.rooms.set("test_room", {participants: [{displayName: "hugh", id: "008"}]});
+  MozLoopServiceInternal.notifyStatusChanged();
+  Assert.strictEqual(LoopUI.toolbarButton.node.getAttribute("state"), "active", "Check button is in active state");
+  LoopRoomsInternal.rooms.set("test_room", {participants: []});
+  MozLoopServiceInternal.notifyStatusChanged();
+  Assert.strictEqual(LoopUI.toolbarButton.node.getAttribute("state"), "", "Check button is in default state");
+  LoopRoomsInternal.rooms.delete("test_room");
+});
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/mochitest/head.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/mochitest/head.js	2014-11-26 21:45:48.000000000 +0000
@@ -183,7 +183,7 @@
 }
 
 function getLoopString(stringID) {
-  return MozLoopServiceInternal.localizedStrings[stringID].textContent;
+  return MozLoopServiceInternal.localizedStrings.get(stringID);
 }
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -6,7 +6,9 @@
 describe("loop.store.ActiveRoomStore", function () {
   "use strict";
 
+  var SERVER_CODES = loop.store.SERVER_CODES;
   var ROOM_STATES = loop.store.ROOM_STATES;
+  var FAILURE_REASONS = loop.shared.utils.FAILURE_REASONS;
   var sandbox, dispatcher, store, fakeMozLoop, fakeSdkDriver;
   var fakeMultiplexGum;
 
@@ -18,11 +20,14 @@
     sandbox.stub(dispatcher, "dispatch");
 
     fakeMozLoop = {
+      setLoopPref: sandbox.stub(),
       rooms: {
-        get: sandbox.stub(),
-        join: sandbox.stub(),
-        refreshMembership: sandbox.stub(),
-        leave: sandbox.stub()
+        get: sinon.stub(),
+        join: sinon.stub(),
+        refreshMembership: sinon.stub(),
+        leave: sinon.stub(),
+        on: sinon.stub(),
+        off: sinon.stub()
       }
     };
 
@@ -39,8 +44,7 @@
       multiplexGum: fakeMultiplexGum
     };
 
-    store = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    store = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: fakeMozLoop,
       sdkDriver: fakeSdkDriver
     });
@@ -51,21 +55,15 @@
   });
 
   describe("#constructor", function() {
-    it("should throw an error if the dispatcher is missing", function() {
-      expect(function() {
-        new loop.store.ActiveRoomStore({mozLoop: {}});
-      }).to.Throw(/dispatcher/);
-    });
-
     it("should throw an error if mozLoop is missing", function() {
       expect(function() {
-        new loop.store.ActiveRoomStore({dispatcher: dispatcher});
+        new loop.store.ActiveRoomStore(dispatcher);
       }).to.Throw(/mozLoop/);
     });
 
     it("should throw an error if sdkDriver is missing", function() {
       expect(function() {
-        new loop.store.ActiveRoomStore({dispatcher: dispatcher, mozLoop: {}});
+        new loop.store.ActiveRoomStore(dispatcher, {mozLoop: {}});
       }).to.Throw(/sdkDriver/);
     });
   });
@@ -91,8 +89,8 @@
         sinon.match(ROOM_STATES.READY), fakeError);
     });
 
-    it("should set the state to `FULL` on server errno 202", function() {
-      fakeError.errno = 202;
+    it("should set the state to `FULL` on server error room full", function() {
+      fakeError.errno = SERVER_CODES.ROOM_FULL;
 
       store.roomFailure({error: fakeError});
 
@@ -103,7 +101,28 @@
       store.roomFailure({error: fakeError});
 
       expect(store._storeState.roomState).eql(ROOM_STATES.FAILED);
+      expect(store._storeState.failureReason).eql(FAILURE_REASONS.UNKNOWN);
     });
+
+    it("should set the failureReason to EXPIRED_OR_INVALID on server error: " +
+      "invalid token", function() {
+        fakeError.errno = SERVER_CODES.INVALID_TOKEN;
+
+        store.roomFailure({error: fakeError});
+
+        expect(store._storeState.roomState).eql(ROOM_STATES.FAILED);
+        expect(store._storeState.failureReason).eql(FAILURE_REASONS.EXPIRED_OR_INVALID);
+      });
+
+    it("should set the failureReason to EXPIRED_OR_INVALID on server error: " +
+      "expired", function() {
+        fakeError.errno = SERVER_CODES.EXPIRED;
+
+        store.roomFailure({error: fakeError});
+
+        expect(store._storeState.roomState).eql(ROOM_STATES.FAILED);
+        expect(store._storeState.failureReason).eql(FAILURE_REASONS.EXPIRED_OR_INVALID);
+      });
   });
 
   describe("#setupWindowData", function() {
@@ -117,6 +136,10 @@
         roomUrl: "http://invalid"
       };
 
+      store = new loop.store.ActiveRoomStore(dispatcher, {
+        mozLoop: fakeMozLoop,
+        sdkDriver: {}
+      });
       fakeMozLoop.rooms.get.
         withArgs(fakeToken).
         callsArgOnWith(1, // index of callback argument
@@ -138,7 +161,7 @@
           to.have.property('roomState', ROOM_STATES.GATHER);
       });
 
-    it("should dispatch an UpdateRoomInfo action if the get is successful",
+    it("should dispatch an SetupRoomInfo action if the get is successful",
       function() {
         store.setupWindowData(new sharedActions.SetupWindowData({
           windowId: "42",
@@ -148,7 +171,7 @@
 
         sinon.assert.calledTwice(dispatcher.dispatch);
         sinon.assert.calledWithExactly(dispatcher.dispatch,
-          new sharedActions.UpdateRoomInfo(_.extend({
+          new sharedActions.SetupRoomInfo(_.extend({
             roomToken: fakeToken
           }, fakeRoomData)));
       });
@@ -210,7 +233,7 @@
     });
   });
 
-  describe("#updateRoomInfo", function() {
+  describe("#setupRoomInfo", function() {
     var fakeRoomInfo;
 
     beforeEach(function() {
@@ -223,13 +246,13 @@
     });
 
     it("should set the state to READY", function() {
-      store.updateRoomInfo(new sharedActions.UpdateRoomInfo(fakeRoomInfo));
+      store.setupRoomInfo(new sharedActions.SetupRoomInfo(fakeRoomInfo));
 
       expect(store._storeState.roomState).eql(ROOM_STATES.READY);
     });
 
     it("should save the room information", function() {
-      store.updateRoomInfo(new sharedActions.UpdateRoomInfo(fakeRoomInfo));
+      store.setupRoomInfo(new sharedActions.SetupRoomInfo(fakeRoomInfo));
 
       var state = store.getStoreState();
       expect(state.roomName).eql(fakeRoomInfo.roomName);
@@ -239,11 +262,40 @@
     });
   });
 
+  describe("#updateRoomInfo", function() {
+    var fakeRoomInfo;
+
+    beforeEach(function() {
+      fakeRoomInfo = {
+        roomName: "Its a room",
+        roomOwner: "Me",
+        roomUrl: "http://invalid"
+      };
+    });
+
+    it("should save the room information", function() {
+      store.updateRoomInfo(new sharedActions.UpdateRoomInfo(fakeRoomInfo));
+
+      var state = store.getStoreState();
+      expect(state.roomName).eql(fakeRoomInfo.roomName);
+      expect(state.roomOwner).eql(fakeRoomInfo.roomOwner);
+      expect(state.roomUrl).eql(fakeRoomInfo.roomUrl);
+    });
+  });
+
   describe("#joinRoom", function() {
     beforeEach(function() {
       store.setStoreState({roomToken: "tokenFake"});
     });
 
+    it("should reset failureReason", function() {
+      store.setStoreState({failureReason: "Test"});
+
+      store.joinRoom();
+
+      expect(store.getStoreState().failureReason).eql(undefined);
+    });
+
     it("should call rooms.join on mozLoop", function() {
       store.joinRoom();
 
@@ -380,22 +432,34 @@
   });
 
   describe("#connectionFailure", function() {
+    var connectionFailureAction;
+
     beforeEach(function() {
       store.setStoreState({
         roomState: ROOM_STATES.JOINED,
         roomToken: "fakeToken",
         sessionToken: "1627384950"
       });
+
+      connectionFailureAction = new sharedActions.ConnectionFailure({
+        reason: "FAIL"
+      });
+    });
+
+    it("should store the failure reason", function() {
+      store.connectionFailure(connectionFailureAction);
+
+      expect(store.getStoreState().failureReason).eql("FAIL");
     });
 
     it("should reset the multiplexGum", function() {
-      store.leaveRoom();
+      store.connectionFailure(connectionFailureAction);
 
       sinon.assert.calledOnce(fakeMultiplexGum.reset);
     });
 
     it("should disconnect from the servers via the sdk", function() {
-      store.connectionFailure();
+      store.connectionFailure(connectionFailureAction);
 
       sinon.assert.calledOnce(fakeSdkDriver.disconnectSession);
     });
@@ -404,13 +468,13 @@
       sandbox.stub(window, "clearTimeout");
       store._timeout = {};
 
-      store.connectionFailure();
+      store.connectionFailure(connectionFailureAction);
 
       sinon.assert.calledOnce(clearTimeout);
     });
 
     it("should call mozLoop.rooms.leave", function() {
-      store.connectionFailure();
+      store.connectionFailure(connectionFailureAction);
 
       sinon.assert.calledOnce(fakeMozLoop.rooms.leave);
       sinon.assert.calledWithExactly(fakeMozLoop.rooms.leave,
@@ -418,7 +482,7 @@
     });
 
     it("should set the state to `FAILED`", function() {
-      store.connectionFailure();
+      store.connectionFailure(connectionFailureAction);
 
       expect(store.getStoreState().roomState).eql(ROOM_STATES.FAILED);
     });
@@ -454,6 +518,14 @@
 
       expect(store.getStoreState().roomState).eql(ROOM_STATES.HAS_PARTICIPANTS);
     });
+
+    it("should set the pref for ToS to `seen`", function() {
+      store.remotePeerConnected();
+
+      sinon.assert.calledOnce(fakeMozLoop.setLoopPref);
+      sinon.assert.calledWithExactly(fakeMozLoop.setLoopPref,
+        "seenToS", "seen");
+    });
   });
 
   describe("#remotePeerDisconnected", function() {
@@ -502,10 +574,10 @@
         "fakeToken", "1627384950");
     });
 
-    it("should set the state to ready", function() {
+    it("should set the state to ENDED", function() {
       store.windowUnload();
 
-      expect(store._storeState.roomState).eql(ROOM_STATES.READY);
+      expect(store._storeState.roomState).eql(ROOM_STATES.ENDED);
     });
   });
 
@@ -547,10 +619,39 @@
         "fakeToken", "1627384950");
     });
 
-    it("should set the state to ready", function() {
+    it("should set the state to ENDED", function() {
       store.leaveRoom();
 
-      expect(store._storeState.roomState).eql(ROOM_STATES.READY);
+      expect(store._storeState.roomState).eql(ROOM_STATES.ENDED);
+    });
+  });
+
+  describe("Events", function() {
+    describe("update:{roomToken}", function() {
+      beforeEach(function() {
+        store.setupRoomInfo(new sharedActions.SetupRoomInfo({
+          roomName: "Its a room",
+          roomOwner: "Me",
+          roomToken: "fakeToken",
+          roomUrl: "http://invalid"
+        }));
+      });
+
+      it("should dispatch an UpdateRoomInfo action", function() {
+        sinon.assert.calledOnce(fakeMozLoop.rooms.on);
+
+        var fakeRoomData = {
+          roomName: "fakeName",
+          roomOwner: "you",
+          roomUrl: "original"
+        };
+
+        fakeMozLoop.rooms.on.callArgWith(1, "update", fakeRoomData);
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithExactly(dispatcher.dispatch,
+          new sharedActions.UpdateRoomInfo(fakeRoomData));
+      });
     });
   });
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/conversationStore_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/conversationStore_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/conversationStore_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/conversationStore_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -37,7 +37,7 @@
     };
 
     navigator.mozLoop = {
-      getLoopBoolPref: sandbox.stub(),
+      getLoopPref: sandbox.stub(),
       calls: {
         setCallInProgress: sandbox.stub(),
         clearCallInProgress: sandbox.stub()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/feedbackStore_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/feedbackStore_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/feedbackStore_test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/feedbackStore_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,108 @@
+/* global chai, loop */
+
+var expect = chai.expect;
+var sharedActions = loop.shared.actions;
+
+describe("loop.store.FeedbackStore", function () {
+  "use strict";
+
+  var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
+  var sandbox, dispatcher, store, feedbackClient;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+
+    dispatcher = new loop.Dispatcher();
+
+    feedbackClient = new loop.FeedbackAPIClient("http://invalid", {
+      product: "Loop"
+    });
+
+    store = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: feedbackClient
+    });
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  describe("#constructor", function() {
+    it("should throw an error if feedbackClient is missing", function() {
+      expect(function() {
+        new loop.store.FeedbackStore(dispatcher);
+      }).to.Throw(/feedbackClient/);
+    });
+
+    it("should set the store to the INIT feedback state", function() {
+      var store = new loop.store.FeedbackStore(dispatcher, {
+        feedbackClient: feedbackClient
+      });
+
+      expect(store.getStoreState("feedbackState")).eql(FEEDBACK_STATES.INIT);
+    });
+  });
+
+  describe("#requireFeedbackDetails", function() {
+    it("should transition to DETAILS state", function() {
+      store.requireFeedbackDetails(new sharedActions.RequireFeedbackDetails());
+
+      expect(store.getStoreState("feedbackState")).eql(FEEDBACK_STATES.DETAILS);
+    });
+  });
+
+  describe("#sendFeedback", function() {
+    var sadFeedbackData = {
+      happy: false,
+      category: "fakeCategory",
+      description: "fakeDescription"
+    };
+
+    beforeEach(function() {
+      store.requireFeedbackDetails();
+    });
+
+    it("should send feedback data over the feedback client", function() {
+      sandbox.stub(feedbackClient, "send");
+
+      store.sendFeedback(new sharedActions.SendFeedback(sadFeedbackData));
+
+      sinon.assert.calledOnce(feedbackClient.send);
+      sinon.assert.calledWithMatch(feedbackClient.send, sadFeedbackData);
+    });
+
+    it("should transition to PENDING state", function() {
+      sandbox.stub(feedbackClient, "send");
+
+      store.sendFeedback(new sharedActions.SendFeedback(sadFeedbackData));
+
+      expect(store.getStoreState("feedbackState")).eql(FEEDBACK_STATES.PENDING);
+    });
+
+    it("should transition to SENT state on successful submission", function(done) {
+      sandbox.stub(feedbackClient, "send", function(data, cb) {
+        cb(null);
+      });
+
+      store.once("change:feedbackState", function() {
+        expect(store.getStoreState("feedbackState")).eql(FEEDBACK_STATES.SENT);
+        done();
+      });
+
+      store.sendFeedback(new sharedActions.SendFeedback(sadFeedbackData));
+    });
+
+    it("should transition to FAILED state on failed submission", function(done) {
+      sandbox.stub(feedbackClient, "send", function(data, cb) {
+        cb(new Error("failed"));
+      });
+
+      store.once("change:feedbackState", function() {
+        expect(store.getStoreState("feedbackState")).eql(FEEDBACK_STATES.FAILED);
+        done();
+      });
+
+      store.sendFeedback(new sharedActions.SendFeedback(sadFeedbackData));
+    });
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/feedbackViews_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/feedbackViews_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/feedbackViews_test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/feedbackViews_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,196 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/*global loop, sinon, React */
+/* jshint newcap:false */
+
+var expect = chai.expect;
+var l10n = navigator.mozL10n || document.mozL10n;
+var TestUtils = React.addons.TestUtils;
+var sharedActions = loop.shared.actions;
+var sharedViews = loop.shared.views;
+
+var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
+
+describe("loop.shared.views.FeedbackView", function() {
+  "use strict";
+
+  var sandbox, comp, dispatcher, fakeFeedbackClient, feedbackStore;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    dispatcher = new loop.Dispatcher();
+    fakeFeedbackClient = {send: sandbox.stub()};
+    feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: fakeFeedbackClient
+    });
+    comp = TestUtils.renderIntoDocument(sharedViews.FeedbackView({
+      feedbackStore: feedbackStore
+    }));
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  // local test helpers
+  function clickHappyFace(comp) {
+    var happyFace = comp.getDOMNode().querySelector(".face-happy");
+    TestUtils.Simulate.click(happyFace);
+  }
+
+  function clickSadFace(comp) {
+    var sadFace = comp.getDOMNode().querySelector(".face-sad");
+    TestUtils.Simulate.click(sadFace);
+  }
+
+  function fillSadFeedbackForm(comp, category, text) {
+    TestUtils.Simulate.change(
+      comp.getDOMNode().querySelector("[value='" + category + "']"));
+
+    if (text) {
+      TestUtils.Simulate.change(
+        comp.getDOMNode().querySelector("[name='description']"), {
+          target: {value: "fake reason"}
+        });
+    }
+  }
+
+  function submitSadFeedbackForm(comp, category, text) {
+    TestUtils.Simulate.submit(comp.getDOMNode().querySelector("form"));
+  }
+
+  describe("Happy feedback", function() {
+    it("should dispatch a SendFeedback action", function() {
+      var dispatch = sandbox.stub(dispatcher, "dispatch");
+
+      clickHappyFace(comp);
+
+      sinon.assert.calledWithMatch(dispatch, new sharedActions.SendFeedback({
+        happy: true,
+        category: "",
+        description: ""
+      }));
+    });
+
+    it("should thank the user once feedback data is sent", function() {
+      feedbackStore.setStoreState({feedbackState: FEEDBACK_STATES.SENT});
+
+      expect(comp.getDOMNode().querySelectorAll(".thank-you")).not.eql(null);
+      expect(comp.getDOMNode().querySelector("button.fx-embedded-btn-back"))
+        .eql(null);
+    });
+  });
+
+  describe("Sad feedback", function() {
+    it("should bring the user to feedback form when clicking on the sad face",
+      function() {
+        clickSadFace(comp);
+
+        expect(comp.getDOMNode().querySelectorAll("form")).not.eql(null);
+      });
+
+    it("should render a back button", function() {
+      feedbackStore.setStoreState({feedbackState: FEEDBACK_STATES.DETAILS});
+
+      expect(comp.getDOMNode().querySelector("button.fx-embedded-btn-back"))
+        .not.eql(null);
+    });
+
+    it("should reset the view when clicking the back button", function() {
+      feedbackStore.setStoreState({feedbackState: FEEDBACK_STATES.DETAILS});
+
+      TestUtils.Simulate.click(
+        comp.getDOMNode().querySelector("button.fx-embedded-btn-back"));
+
+      expect(comp.getDOMNode().querySelector(".faces")).not.eql(null);
+    });
+
+    it("should disable the form submit button when no category is chosen",
+      function() {
+        clickSadFace(comp);
+
+        expect(comp.getDOMNode().querySelector("form button").disabled).eql(true);
+      });
+
+    it("should disable the form submit button when the 'other' category is " +
+       "chosen but no description has been entered yet",
+      function() {
+        clickSadFace(comp);
+        fillSadFeedbackForm(comp, "other");
+
+        expect(comp.getDOMNode().querySelector("form button").disabled).eql(true);
+      });
+
+    it("should enable the form submit button when the 'other' category is " +
+       "chosen and a description is entered",
+      function() {
+        clickSadFace(comp);
+        fillSadFeedbackForm(comp, "other", "fake");
+
+        expect(comp.getDOMNode().querySelector("form button").disabled).eql(false);
+      });
+
+    it("should empty the description field when a predefined category is " +
+       "chosen",
+      function() {
+        clickSadFace(comp);
+
+        fillSadFeedbackForm(comp, "confusing");
+
+        expect(comp.getDOMNode().querySelector(".feedback-description").value).eql("");
+      });
+
+    it("should enable the form submit button once a predefined category is " +
+       "chosen",
+      function() {
+        clickSadFace(comp);
+
+        fillSadFeedbackForm(comp, "confusing");
+
+        expect(comp.getDOMNode().querySelector("form button").disabled).eql(false);
+      });
+
+    it("should send feedback data when the form is submitted", function() {
+      var dispatch = sandbox.stub(dispatcher, "dispatch");
+      feedbackStore.setStoreState({feedbackState: FEEDBACK_STATES.DETAILS});
+      fillSadFeedbackForm(comp, "confusing");
+
+      submitSadFeedbackForm(comp);
+
+      sinon.assert.calledOnce(dispatch);
+      sinon.assert.calledWithMatch(dispatch, new sharedActions.SendFeedback({
+        happy: false,
+        category: "confusing",
+        description: ""
+      }));
+    });
+
+    it("should send feedback data when user has entered a custom description",
+      function() {
+        clickSadFace(comp);
+
+        fillSadFeedbackForm(comp, "other", "fake reason");
+        submitSadFeedbackForm(comp);
+
+        sinon.assert.calledOnce(fakeFeedbackClient.send);
+        sinon.assert.calledWith(fakeFeedbackClient.send, {
+          happy: false,
+          category: "other",
+          description: "fake reason"
+        });
+      });
+
+    it("should thank the user when feedback data has been sent", function() {
+      fakeFeedbackClient.send = function(data, cb) {
+        cb();
+      };
+      clickSadFace(comp);
+      fillSadFeedbackForm(comp, "confusing");
+      submitSadFeedbackForm(comp);
+
+      expect(comp.getDOMNode().querySelectorAll(".thank-you")).not.eql(null);
+    });
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/index.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/index.html	2014-11-26 21:45:48.000000000 +0000
@@ -43,9 +43,12 @@
   <script src="../../content/shared/js/actions.js"></script>
   <script src="../../content/shared/js/dispatcher.js"></script>
   <script src="../../content/shared/js/otSdkDriver.js"></script>
+  <script src="../../content/shared/js/store.js"></script>
   <script src="../../content/shared/js/activeRoomStore.js"></script>
-  <script src="../../content/shared/js/conversationStore.js"></script>
   <script src="../../content/shared/js/roomStore.js"></script>
+  <script src="../../content/shared/js/conversationStore.js"></script>
+  <script src="../../content/shared/js/feedbackStore.js"></script>
+  <script src="../../content/shared/js/feedbackViews.js"></script>
 
   <!-- Test scripts -->
   <script src="models_test.js"></script>
@@ -54,11 +57,14 @@
   <script src="views_test.js"></script>
   <script src="websocket_test.js"></script>
   <script src="feedbackApiClient_test.js"></script>
+  <script src="feedbackViews_test.js"></script>
   <script src="validate_test.js"></script>
   <script src="dispatcher_test.js"></script>
   <script src="activeRoomStore_test.js"></script>
   <script src="conversationStore_test.js"></script>
+  <script src="feedbackStore_test.js"></script>
   <script src="otSdkDriver_test.js"></script>
+  <script src="store_test.js"></script>
   <script src="roomStore_test.js"></script>
   <script>
     mocha.run(function () {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/mixins_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/mixins_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/mixins_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/mixins_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -12,6 +12,7 @@
 
   var sandbox;
   var sharedMixins = loop.shared.mixins;
+  var ROOM_STATES = loop.store.ROOM_STATES;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -166,4 +167,129 @@
         sinon.assert.calledOnce(onDocumentHiddenStub);
       });
   });
+
+  describe("loop.shared.mixins.AudioMixin", function() {
+    var view, fakeAudio, TestComp;
+
+    beforeEach(function() {
+      navigator.mozLoop = {
+        doNotDisturb: true,
+        getAudioBlob: sinon.spy(function(name, callback) {
+          callback(null, new Blob([new ArrayBuffer(10)], {type: 'audio/ogg'}));
+        })
+      };
+
+      fakeAudio = {
+        play: sinon.spy(),
+        pause: sinon.spy(),
+        removeAttribute: sinon.spy()
+      };
+      sandbox.stub(window, "Audio").returns(fakeAudio);
+
+      TestComp = React.createClass({
+        mixins: [loop.shared.mixins.AudioMixin],
+        componentDidMount: function() {
+          this.play("failure");
+        },
+        render: function() {
+          return React.DOM.div();
+        }
+      });
+
+    });
+
+    it("should not play a failure sound when doNotDisturb true", function() {
+      view = TestUtils.renderIntoDocument(TestComp());
+      sinon.assert.notCalled(navigator.mozLoop.getAudioBlob);
+      sinon.assert.notCalled(fakeAudio.play);
+    });
+
+    it("should play a failure sound, once", function() {
+      navigator.mozLoop.doNotDisturb = false;
+      view = TestUtils.renderIntoDocument(TestComp());
+      sinon.assert.calledOnce(navigator.mozLoop.getAudioBlob);
+      sinon.assert.calledWithExactly(navigator.mozLoop.getAudioBlob,
+                                     "failure", sinon.match.func);
+      sinon.assert.calledOnce(fakeAudio.play);
+      expect(fakeAudio.loop).to.equal(false);
+    });
+  });
+
+  describe("loop.shared.mixins.RoomsAudioMixin", function() {
+    var view, fakeAudioMixin, TestComp, comp;
+
+    function createTestComponent(initialState) {
+      var TestComp = React.createClass({
+        mixins: [loop.shared.mixins.RoomsAudioMixin],
+        render: function() {
+          return React.DOM.div();
+        },
+
+        getInitialState: function() {
+          return { roomState: initialState};
+        }
+      });
+
+      var renderedComp = TestUtils.renderIntoDocument(TestComp());
+      sandbox.stub(renderedComp, "play");
+      return renderedComp;
+    }
+
+    beforeEach(function() {
+    });
+
+    it("should play a sound when the local user joins the room", function() {
+      comp = createTestComponent(ROOM_STATES.INIT);
+
+      comp.setState({roomState: ROOM_STATES.SESSION_CONNECTED});
+
+      sinon.assert.calledOnce(comp.play);
+      sinon.assert.calledWithExactly(comp.play, "room-joined");
+    });
+
+    it("should play a sound when another user joins the room", function() {
+      comp = createTestComponent(ROOM_STATES.SESSION_CONNECTED);
+
+      comp.setState({roomState: ROOM_STATES.HAS_PARTICIPANTS});
+
+      sinon.assert.calledOnce(comp.play);
+      sinon.assert.calledWithExactly(comp.play, "room-joined-in");
+    });
+
+    it("should play a sound when another user leaves the room", function() {
+      comp = createTestComponent(ROOM_STATES.HAS_PARTICIPANTS);
+
+      comp.setState({roomState: ROOM_STATES.SESSION_CONNECTED});
+
+      sinon.assert.calledOnce(comp.play);
+      sinon.assert.calledWithExactly(comp.play, "room-left");
+    });
+
+    it("should play a sound when the local user leaves the room", function() {
+      comp = createTestComponent(ROOM_STATES.HAS_PARTICIPANTS);
+
+      comp.setState({roomState: ROOM_STATES.READY});
+
+      sinon.assert.calledOnce(comp.play);
+      sinon.assert.calledWithExactly(comp.play, "room-left");
+    });
+
+    it("should play a sound when if there is a failure", function() {
+      comp = createTestComponent(ROOM_STATES.HAS_PARTICIPANTS);
+
+      comp.setState({roomState: ROOM_STATES.FAILED});
+
+      sinon.assert.calledOnce(comp.play);
+      sinon.assert.calledWithExactly(comp.play, "failure");
+    });
+
+    it("should play a sound when if the room is full", function() {
+      comp = createTestComponent(ROOM_STATES.READY);
+
+      comp.setState({roomState: ROOM_STATES.FULL});
+
+      sinon.assert.calledOnce(comp.play);
+      sinon.assert.calledWithExactly(comp.play, "failure");
+    });
+  });
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/models_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/models_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/models_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/models_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -91,12 +91,22 @@
             expect(conversation.get("selectedCallType")).eql("audio-video");
           });
 
+        it("should trigger a `call:outgoing:get-media-privs` event", function(done) {
+          conversation.once("call:outgoing:get-media-privs", function() {
+            done();
+          });
+
+          conversation.setupOutgoingCall();
+        });
+      });
+
+      describe("#gotMediaPrivs", function() {
         it("should trigger a `call:outgoing:setup` event", function(done) {
           conversation.once("call:outgoing:setup", function() {
             done();
           });
 
-          conversation.setupOutgoingCall();
+          conversation.gotMediaPrivs();
         });
       });
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -7,16 +7,19 @@
   "use strict";
 
   var sharedActions = loop.shared.actions;
-
+  var FAILURE_REASONS = loop.shared.utils.FAILURE_REASONS;
   var sandbox;
   var dispatcher, driver, publisher, sdk, session, sessionData;
-  var fakeLocalElement, fakeRemoteElement, publisherConfig;
+  var fakeLocalElement, fakeRemoteElement, publisherConfig, fakeEvent;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
 
     fakeLocalElement = {fake: 1};
     fakeRemoteElement = {fake: 2};
+    fakeEvent = {
+      preventDefault: sinon.stub()
+    };
     publisherConfig = {
       fake: "config"
     };
@@ -34,14 +37,14 @@
       subscribe: sinon.stub()
     }, Backbone.Events);
 
-    publisher = {
+    publisher = _.extend({
       destroy: sinon.stub(),
       publishAudio: sinon.stub(),
       publishVideo: sinon.stub()
-    };
+    }, Backbone.Events);
 
     sdk = {
-      initPublisher: sinon.stub(),
+      initPublisher: sinon.stub().returns(publisher),
       initSession: sinon.stub().returns(session)
     };
 
@@ -80,51 +83,6 @@
       sinon.assert.calledOnce(sdk.initPublisher);
       sinon.assert.calledWith(sdk.initPublisher, fakeLocalElement, publisherConfig);
     });
-
-    describe("On Publisher Complete", function() {
-      it("should publish the stream if the connection is ready", function() {
-        sdk.initPublisher.callsArgWith(2, null);
-
-        driver.session = session;
-        driver._sessionConnected = true;
-
-        dispatcher.dispatch(new sharedActions.SetupStreamElements({
-          getLocalElementFunc: function() {return fakeLocalElement;},
-          getRemoteElementFunc: function() {return fakeRemoteElement;},
-          publisherConfig: publisherConfig
-        }));
-
-        sinon.assert.calledOnce(session.publish);
-      });
-
-      it("should dispatch connectionFailure if connecting failed", function() {
-        sdk.initPublisher.callsArgWith(2, new Error("Failure"));
-
-        // Special stub, as we want to use the dispatcher, but also know that
-        // we've been called correctly for the second dispatch.
-        var dispatchStub = (function() {
-          var originalDispatch = dispatcher.dispatch.bind(dispatcher);
-          return sandbox.stub(dispatcher, "dispatch", function(action) {
-            originalDispatch(action);
-          });
-        }());
-
-        driver.session = session;
-        driver._sessionConnected = true;
-
-        dispatcher.dispatch(new sharedActions.SetupStreamElements({
-          getLocalElementFunc: function() {return fakeLocalElement;},
-          getRemoteElementFunc: function() {return fakeRemoteElement;},
-          publisherConfig: publisherConfig
-        }));
-
-        sinon.assert.called(dispatcher.dispatch);
-        sinon.assert.calledWithMatch(dispatcher.dispatch,
-          sinon.match.hasOwn("name", "connectionFailure"));
-        sinon.assert.calledWithMatch(dispatcher.dispatch,
-          sinon.match.hasOwn("reason", "noMedia"));
-      });
-    });
   });
 
   describe("#setMute", function() {
@@ -194,7 +152,7 @@
         sinon.assert.calledWithMatch(dispatcher.dispatch,
           sinon.match.hasOwn("name", "connectionFailure"));
         sinon.assert.calledWithMatch(dispatcher.dispatch,
-          sinon.match.hasOwn("reason", "couldNotConnect"));
+          sinon.match.hasOwn("reason", FAILURE_REASONS.COULD_NOT_CONNECT));
       });
     });
   });
@@ -269,7 +227,7 @@
           sinon.assert.calledWithMatch(dispatcher.dispatch,
             sinon.match.hasOwn("name", "connectionFailure"));
           sinon.assert.calledWithMatch(dispatcher.dispatch,
-            sinon.match.hasOwn("reason", "networkDisconnected"));
+            sinon.match.hasOwn("reason", FAILURE_REASONS.NETWORK_DISCONNECTED));
         });
     });
 
@@ -328,5 +286,41 @@
           sinon.assert.notCalled(dispatcher.dispatch);
         });
     });
+
+    describe("accessAllowed", function() {
+      it("should publish the stream if the connection is ready", function() {
+        driver._sessionConnected = true;
+
+        publisher.trigger("accessAllowed", fakeEvent);
+
+        sinon.assert.calledOnce(session.publish);
+      });
+    });
+
+    describe("accessDenied", function() {
+      it("should prevent the default event behavior", function() {
+        publisher.trigger("accessDenied", fakeEvent);
+
+        sinon.assert.calledOnce(fakeEvent.preventDefault);
+      });
+
+      it("should dispatch connectionFailure", function() {
+        publisher.trigger("accessDenied", fakeEvent);
+
+        sinon.assert.called(dispatcher.dispatch);
+        sinon.assert.calledWithMatch(dispatcher.dispatch,
+          sinon.match.hasOwn("name", "connectionFailure"));
+        sinon.assert.calledWithMatch(dispatcher.dispatch,
+          sinon.match.hasOwn("reason", FAILURE_REASONS.MEDIA_DENIED));
+      });
+    });
+
+    describe("accessDialogOpened", function() {
+      it("should prevent the default event behavior", function() {
+        publisher.trigger("accessDialogOpened", fakeEvent);
+
+        sinon.assert.calledOnce(fakeEvent.preventDefault);
+      });
+    });
   });
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/roomStore_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/roomStore_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/roomStore_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/roomStore_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -56,15 +56,9 @@
   });
 
   describe("#constructor", function() {
-    it("should throw an error if the dispatcher is missing", function() {
-      expect(function() {
-        new loop.store.RoomStore({mozLoop: {}});
-      }).to.Throw(/dispatcher/);
-    });
-
     it("should throw an error if mozLoop is missing", function() {
       expect(function() {
-        new loop.store.RoomStore({dispatcher: dispatcher});
+        new loop.store.RoomStore(dispatcher);
       }).to.Throw(/mozLoop/);
     });
   });
@@ -89,10 +83,7 @@
           on: sandbox.stub()
         }
       };
-      store = new loop.store.RoomStore({
-        dispatcher: dispatcher,
-        mozLoop: fakeMozLoop
-      });
+      store = new loop.store.RoomStore(dispatcher, {mozLoop: fakeMozLoop});
       store.setStoreState(defaultStoreState);
     });
 
@@ -154,19 +145,6 @@
       });
     });
 
-    describe("#getStoreState", function() {
-      it("should retrieve the whole state by default", function() {
-        expect(store.getStoreState()).eql(defaultStoreState);
-      });
-
-      it("should retrieve a given property state", function() {
-        var fakeActiveRoom = {fake: true};
-        store.setStoreState({activeRoom: fakeActiveRoom});
-
-        expect(store.getStoreState().activeRoom).eql(fakeActiveRoom);
-      });
-    });
-
     describe("#findNextAvailableRoomNumber", function() {
       var fakeNameTemplate = "RoomWord {{conversationLabel}}";
 
@@ -383,13 +361,11 @@
       var store, activeRoomStore;
 
       beforeEach(function() {
-        activeRoomStore = new loop.store.ActiveRoomStore({
-          dispatcher: dispatcher,
+        activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
           mozLoop: fakeMozLoop,
           sdkDriver: {}
         });
-        store = new loop.store.RoomStore({
-          dispatcher: dispatcher,
+        store = new loop.store.RoomStore(dispatcher, {
           mozLoop: fakeMozLoop,
           activeRoomStore: activeRoomStore
         });
@@ -424,10 +400,7 @@
           open: sinon.spy()
         }
       };
-      store = new loop.store.RoomStore({
-        dispatcher: dispatcher,
-        mozLoop: fakeMozLoop
-      });
+      store = new loop.store.RoomStore(dispatcher, {mozLoop: fakeMozLoop});
     });
 
     it("should open the room via mozLoop", function() {
@@ -437,4 +410,28 @@
       sinon.assert.calledWithExactly(fakeMozLoop.rooms.open, "42abc");
     });
   });
+
+  describe("#renameRoom", function() {
+    var store, fakeMozLoop;
+
+    beforeEach(function() {
+      fakeMozLoop = {
+        rooms: {
+          rename: sinon.spy()
+        }
+      };
+      store = new loop.store.RoomStore(dispatcher, {mozLoop: fakeMozLoop});
+    });
+
+    it("should rename the room via mozLoop", function() {
+      dispatcher.dispatch(new sharedActions.RenameRoom({
+        roomToken: "42abc",
+        newRoomName: "silly name"
+      }));
+
+      sinon.assert.calledOnce(fakeMozLoop.rooms.rename);
+      sinon.assert.calledWith(fakeMozLoop.rooms.rename, "42abc",
+        "silly name");
+    });
+  });
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/store_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/store_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/store_test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/store_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -0,0 +1,160 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var expect = chai.expect;
+
+describe("loop.store.createStore", function () {
+  "use strict";
+
+  var sandbox;
+  var sharedActions = loop.shared.actions;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+  });
+
+  it("should create a store constructor", function() {
+    expect(loop.store.createStore({})).to.be.a("function");
+  });
+
+  it("should implement Backbone.Events", function() {
+    expect(loop.store.createStore({}).prototype).to.include.keys(["on", "off"])
+  });
+
+  describe("Store API", function() {
+    var dispatcher;
+
+    beforeEach(function() {
+      dispatcher = new loop.Dispatcher();
+    });
+
+    describe("#constructor", function() {
+      it("should require a dispatcher", function() {
+        var TestStore = loop.store.createStore({});
+        expect(function() {
+          new TestStore();
+        }).to.Throw(/required dispatcher/);
+      });
+
+      it("should call initialize() when constructed, if defined", function() {
+        var initialize = sandbox.spy();
+        var TestStore = loop.store.createStore({initialize: initialize});
+        var options = {fake: true};
+
+        new TestStore(dispatcher, options);
+
+        sinon.assert.calledOnce(initialize);
+        sinon.assert.calledWithExactly(initialize, options);
+      });
+
+      it("should register actions", function() {
+        sandbox.stub(dispatcher, "register");
+        var TestStore = loop.store.createStore({
+          actions: ["a", "b"],
+          a: function() {},
+          b: function() {}
+        });
+
+        var store = new TestStore(dispatcher);
+
+        sinon.assert.calledOnce(dispatcher.register);
+        sinon.assert.calledWithExactly(dispatcher.register, store, ["a", "b"]);
+      });
+
+      it("should throw if a registered action isn't implemented", function() {
+        var TestStore = loop.store.createStore({
+          actions: ["a", "b"],
+          a: function() {} // missing b
+        });
+
+        expect(function() {
+          new TestStore(dispatcher);
+        }).to.Throw(/should implement an action handler for b/);
+      });
+    });
+
+    describe("#getInitialStoreState", function() {
+      it("should set initial store state if provided", function() {
+        var TestStore = loop.store.createStore({
+          getInitialStoreState: function() {
+            return {foo: "bar"};
+          }
+        });
+
+        var store = new TestStore(dispatcher);
+
+        expect(store.getStoreState()).eql({foo: "bar"});
+      });
+    });
+
+    describe("#dispatchAction", function() {
+      it("should dispatch an action", function() {
+        sandbox.stub(dispatcher, "dispatch");
+        var TestStore = loop.store.createStore({});
+        var TestAction = sharedActions.Action.define("TestAction", {});
+        var action = new TestAction({});
+        var store = new TestStore(dispatcher);
+
+        store.dispatchAction(action);
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithExactly(dispatcher.dispatch, action);
+      });
+    });
+
+    describe("#getStoreState", function() {
+      var TestStore = loop.store.createStore({});
+      var store;
+
+      beforeEach(function() {
+        store = new TestStore(dispatcher);
+        store.setStoreState({foo: "bar", bar: "baz"});
+      });
+
+      it("should retrieve the whole state by default", function() {
+        expect(store.getStoreState()).eql({foo: "bar", bar: "baz"});
+      });
+
+      it("should retrieve a given property state", function() {
+        expect(store.getStoreState("bar")).eql("baz");
+      });
+    });
+
+    describe("#setStoreState", function() {
+      var TestStore = loop.store.createStore({});
+      var store;
+
+      beforeEach(function() {
+        store = new TestStore(dispatcher);
+        store.setStoreState({foo: "bar"});
+      });
+
+      it("should update store state data", function() {
+        store.setStoreState({foo: "baz"});
+
+        expect(store.getStoreState("foo")).eql("baz");
+      });
+
+      it("should trigger a `change` event", function(done) {
+        store.once("change", function() {
+          done();
+        });
+
+        store.setStoreState({foo: "baz"});
+      });
+
+      it("should trigger a `change:<prop>` event", function(done) {
+        store.once("change:foo", function() {
+          done();
+        });
+
+        store.setStoreState({foo: "baz"});
+      });
+    });
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/utils_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/utils_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/utils_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/utils_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -117,7 +117,7 @@
     describe("mozLoop set", function() {
       beforeEach(function() {
         navigator.mozLoop = {
-          getLoopBoolPref: function(prefName) {
+          getLoopPref: function(prefName) {
             return prefName === "test.true";
           }
         };
@@ -156,7 +156,7 @@
       });
       composeEmail = sandbox.spy();
       navigator.mozLoop = {
-        getLoopCharPref: sandbox.spy(),
+        getLoopPref: sandbox.spy(),
         composeEmail: composeEmail
       };
     });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/views_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/views_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/shared/views_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/shared/views_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -526,177 +526,6 @@
     });
   });
 
-  describe("FeedbackView", function() {
-    var comp, fakeFeedbackApiClient;
-
-    beforeEach(function() {
-      fakeFeedbackApiClient = {send: sandbox.stub()};
-      sandbox.stub(window, "XMLHttpRequest").returns(fakeAudioXHR);
-      comp = TestUtils.renderIntoDocument(sharedViews.FeedbackView({
-        feedbackApiClient: fakeFeedbackApiClient
-      }));
-    });
-
-    // local test helpers
-    function clickHappyFace(comp) {
-      var happyFace = comp.getDOMNode().querySelector(".face-happy");
-      TestUtils.Simulate.click(happyFace);
-    }
-
-    function clickSadFace(comp) {
-      var sadFace = comp.getDOMNode().querySelector(".face-sad");
-      TestUtils.Simulate.click(sadFace);
-    }
-
-    function fillSadFeedbackForm(comp, category, text) {
-      TestUtils.Simulate.change(
-        comp.getDOMNode().querySelector("[value='" + category + "']"));
-
-      if (text) {
-        TestUtils.Simulate.change(
-          comp.getDOMNode().querySelector("[name='description']"), {
-            target: {value: "fake reason"}
-          });
-      }
-    }
-
-    function submitSadFeedbackForm(comp, category, text) {
-      TestUtils.Simulate.submit(comp.getDOMNode().querySelector("form"));
-    }
-
-    describe("Happy feedback", function() {
-      it("should send feedback data when clicking on the happy face",
-        function() {
-          clickHappyFace(comp);
-
-          sinon.assert.calledOnce(fakeFeedbackApiClient.send);
-          sinon.assert.calledWith(fakeFeedbackApiClient.send, {happy: true});
-        });
-
-      it("should thank the user once happy feedback data is sent", function() {
-        fakeFeedbackApiClient.send = function(data, cb) {
-          cb();
-        };
-
-        clickHappyFace(comp);
-
-        expect(comp.getDOMNode()
-                   .querySelectorAll(".feedback .thank-you").length).eql(1);
-        expect(comp.getDOMNode().querySelector("button.back")).to.be.a("null");
-      });
-    });
-
-    describe("Sad feedback", function() {
-      it("should bring the user to feedback form when clicking on the sad face",
-        function() {
-          clickSadFace(comp);
-
-          expect(comp.getDOMNode().querySelectorAll("form").length).eql(1);
-        });
-
-      it("should disable the form submit button when no category is chosen",
-        function() {
-          clickSadFace(comp);
-
-          expect(comp.getDOMNode()
-                     .querySelector("form button").disabled).eql(true);
-        });
-
-      it("should disable the form submit button when the 'other' category is " +
-         "chosen but no description has been entered yet",
-        function() {
-          clickSadFace(comp);
-          fillSadFeedbackForm(comp, "other");
-
-          expect(comp.getDOMNode()
-                     .querySelector("form button").disabled).eql(true);
-        });
-
-      it("should enable the form submit button when the 'other' category is " +
-         "chosen and a description is entered",
-        function() {
-          clickSadFace(comp);
-          fillSadFeedbackForm(comp, "other", "fake");
-
-          expect(comp.getDOMNode()
-                     .querySelector("form button").disabled).eql(false);
-        });
-
-      it("should empty the description field when a predefined category is " +
-         "chosen",
-        function() {
-          clickSadFace(comp);
-
-          fillSadFeedbackForm(comp, "confusing");
-
-          expect(comp.getDOMNode()
-                     .querySelector(".feedback-description").value).eql("");
-        });
-
-      it("should enable the form submit button once a predefined category is " +
-         "chosen",
-        function() {
-          clickSadFace(comp);
-
-          fillSadFeedbackForm(comp, "confusing");
-
-          expect(comp.getDOMNode()
-                     .querySelector("form button").disabled).eql(false);
-        });
-
-      it("should disable the form submit button once the form is submitted",
-        function() {
-          clickSadFace(comp);
-          fillSadFeedbackForm(comp, "confusing");
-
-          submitSadFeedbackForm(comp);
-
-          expect(comp.getDOMNode()
-                     .querySelector("form button").disabled).eql(true);
-        });
-
-      it("should send feedback data when the form is submitted", function() {
-        clickSadFace(comp);
-        fillSadFeedbackForm(comp, "confusing");
-
-        submitSadFeedbackForm(comp);
-
-        sinon.assert.calledOnce(fakeFeedbackApiClient.send);
-        sinon.assert.calledWithMatch(fakeFeedbackApiClient.send, {
-          happy: false,
-          category: "confusing"
-        });
-      });
-
-      it("should send feedback data when user has entered a custom description",
-        function() {
-          clickSadFace(comp);
-
-          fillSadFeedbackForm(comp, "other", "fake reason");
-          submitSadFeedbackForm(comp);
-
-          sinon.assert.calledOnce(fakeFeedbackApiClient.send);
-          sinon.assert.calledWith(fakeFeedbackApiClient.send, {
-            happy: false,
-            category: "other",
-            description: "fake reason"
-          });
-        });
-
-      it("should thank the user when feedback data has been sent", function() {
-        fakeFeedbackApiClient.send = function(data, cb) {
-          cb();
-        };
-        clickSadFace(comp);
-        fillSadFeedbackForm(comp, "confusing");
-        submitSadFeedbackForm(comp);
-
-        expect(comp.getDOMNode()
-                   .querySelectorAll(".feedback .thank-you").length).eql(1);
-      });
-    });
-  });
-
   describe("NotificationListView", function() {
     var coll, view, testNotif;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/index.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/index.html	2014-11-26 21:45:48.000000000 +0000
@@ -40,7 +40,10 @@
   <script src="../../content/shared/js/actions.js"></script>
   <script src="../../content/shared/js/validate.js"></script>
   <script src="../../content/shared/js/dispatcher.js"></script>
+  <script src="../../content/shared/js/store.js"></script>
   <script src="../../content/shared/js/activeRoomStore.js"></script>
+  <script src="../../content/shared/js/feedbackStore.js"></script>
+  <script src="../../content/shared/js/feedbackViews.js"></script>
   <script src="../../content/shared/js/otSdkDriver.js"></script>
   <script src="../../standalone/content/js/multiplexGum.js"></script>
   <script src="../../standalone/content/js/standaloneAppStore.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/standaloneMozLoop_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/standaloneMozLoop_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/standaloneMozLoop_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/standaloneMozLoop_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -46,6 +46,36 @@
     });
   });
 
+  describe("#setLoopPref", function() {
+    afterEach(function() {
+      localStorage.removeItem("fakePref");
+    });
+
+    it("should store the value of the preference", function() {
+      mozLoop.setLoopPref("fakePref", "fakeValue");
+
+      expect(localStorage.getItem("fakePref")).eql("fakeValue");
+    });
+
+    it("should not store the value of seenToS", function() {
+      mozLoop.setLoopPref("seenToS", "fakeValue1");
+
+      expect(localStorage.getItem("seenToS")).eql(null);
+    });
+  });
+
+  describe("#getLoopPref", function() {
+    afterEach(function() {
+      localStorage.removeItem("fakePref");
+    });
+
+    it("should return the value of the preference", function() {
+      localStorage.setItem("fakePref", "fakeValue");
+
+      expect(mozLoop.getLoopPref("fakePref")).eql("fakeValue");
+    });
+  });
+
   describe("#rooms.join", function() {
     it("should POST to the server", function() {
       mozLoop.rooms.join("fakeToken", callback);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/standaloneRoomViews_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -18,8 +18,7 @@
     sandbox = sinon.sandbox.create();
     dispatcher = new loop.Dispatcher();
     dispatch = sandbox.stub(dispatcher, "dispatch");
-    activeRoomStore = new loop.store.ActiveRoomStore({
-      dispatcher: dispatcher,
+    activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
       mozLoop: {},
       sdkDriver: {}
     });
@@ -39,27 +38,42 @@
         }));
     }
 
+    function expectActionDispatched(view) {
+      sinon.assert.calledOnce(dispatch);
+      sinon.assert.calledWithExactly(dispatch,
+        sinon.match.instanceOf(sharedActions.SetupStreamElements));
+      sinon.assert.calledWithExactly(dispatch, sinon.match(function(value) {
+        return value.getLocalElementFunc() ===
+               view.getDOMNode().querySelector(".local");
+      }));
+      sinon.assert.calledWithExactly(dispatch, sinon.match(function(value) {
+        return value.getRemoteElementFunc() ===
+               view.getDOMNode().querySelector(".remote");
+      }));
+    }
+
     describe("#componentWillUpdate", function() {
-      it("dispatch an `SetupStreamElements` action on room joined", function() {
-        activeRoomStore.setStoreState({roomState: ROOM_STATES.READY});
-        var view = mountTestComponent();
+      it("should dispatch a `SetupStreamElements` action on room joined",
+        function() {
+          activeRoomStore.setStoreState({roomState: ROOM_STATES.READY});
+          var view = mountTestComponent();
 
-        sinon.assert.notCalled(dispatch);
+          sinon.assert.notCalled(dispatch);
 
-        activeRoomStore.setStoreState({roomState: ROOM_STATES.JOINED});
+          activeRoomStore.setStoreState({roomState: ROOM_STATES.JOINED});
 
-        sinon.assert.calledOnce(dispatch);
-        sinon.assert.calledWithExactly(dispatch,
-          sinon.match.instanceOf(sharedActions.SetupStreamElements));
-        sinon.assert.calledWithExactly(dispatch, sinon.match(function(value) {
-          return value.getLocalElementFunc() ===
-                 view.getDOMNode().querySelector(".local");
-        }));
-        sinon.assert.calledWithExactly(dispatch, sinon.match(function(value) {
-          return value.getRemoteElementFunc() ===
-                 view.getDOMNode().querySelector(".remote");
-        }));
-      });
+          expectActionDispatched(view);
+        });
+
+      it("should dispatch a `SetupStreamElements` action on room rejoined",
+        function() {
+          activeRoomStore.setStoreState({roomState: ROOM_STATES.ENDED});
+          var view = mountTestComponent();
+
+          activeRoomStore.setStoreState({roomState: ROOM_STATES.JOINED});
+
+          expectActionDispatched(view);
+        });
     });
 
     describe("#publishStream", function() {
@@ -138,6 +152,16 @@
               .not.eql(null);
           });
       });
+
+      describe("Failed room message", function() {
+        it("should display a failed room message on FAILED",
+          function() {
+            activeRoomStore.setStoreState({roomState: ROOM_STATES.FAILED});
+
+            expect(view.getDOMNode().querySelector(".failed-room-message"))
+              .not.eql(null);
+          });
+      });
 
       describe("Join button", function() {
         function getJoinButton(view) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/webapp_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/webapp_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/standalone/webapp_test.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/standalone/webapp_test.js	2014-11-26 21:45:48.000000000 +0000
@@ -19,14 +19,20 @@
       notifications,
       feedbackApiClient,
       stubGetPermsAndCacheMedia,
-      fakeAudioXHR;
+      fakeAudioXHR,
+      dispatcher,
+      feedbackStore;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
+    dispatcher = new loop.Dispatcher();
     notifications = new sharedModels.NotificationCollection();
     feedbackApiClient = new loop.FeedbackAPIClient("http://invalid", {
       product: "Loop"
     });
+    feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+      feedbackClient: {}
+    });
 
     stubGetPermsAndCacheMedia = sandbox.stub(
       loop.standaloneMedia._MultiplexGum.prototype, "getPermsAndCacheMedia");
@@ -123,7 +129,7 @@
         conversation: conversation,
         notifications: notifications,
         sdk: {},
-        feedbackApiClient: feedbackApiClient
+        feedbackStore: feedbackStore
       });
     });
 
@@ -363,6 +369,16 @@
       });
 
       describe("session:ended", function() {
+        it("should call multiplexGum.reset", function() {
+          var multiplexGum = new standaloneMedia._MultiplexGum();
+          standaloneMedia.setSingleton(multiplexGum);
+          sandbox.stub(standaloneMedia._MultiplexGum.prototype, "reset");
+
+          conversation.trigger("session:ended");
+
+          sinon.assert.calledOnce(multiplexGum.reset);
+        });
+
         it("should display the StartConversationView", function() {
           conversation.trigger("session:ended");
 
@@ -468,14 +484,14 @@
           });
 
           it("should display the FailedConversationView", function() {
-            conversation.setupOutgoingCall();
+            ocView.setupOutgoingCall();
 
             TestUtils.findRenderedComponentWithType(ocView,
               loop.webapp.FailedConversationView);
           });
 
           it("should display an error", function() {
-            conversation.setupOutgoingCall();
+            ocView.setupOutgoingCall();
 
             sinon.assert.calledOnce(notifications.errorL10n);
           });
@@ -488,7 +504,8 @@
 
           it("should call requestCallInfo on the client",
             function() {
-              conversation.setupOutgoingCall("audio-video");
+              conversation.set("selectedCallType", "audio-video");
+              ocView.setupOutgoingCall();
 
               sinon.assert.calledOnce(client.requestCallInfo);
               sinon.assert.calledWith(client.requestCallInfo, "fakeToken",
@@ -500,7 +517,7 @@
                function() {
                 client.requestCallInfo.callsArgWith(2, {errno: 105});
 
-                conversation.setupOutgoingCall();
+                ocView.setupOutgoingCall();
 
                 TestUtils.findRenderedComponentWithType(ocView,
                   loop.webapp.CallUrlExpiredView);
@@ -510,7 +527,7 @@
                function() {
                 client.requestCallInfo.callsArgWith(2, {errno: 104});
 
-                conversation.setupOutgoingCall();
+                ocView.setupOutgoingCall();
 
                 TestUtils.findRenderedComponentWithType(ocView,
                   loop.webapp.FailedConversationView);
@@ -519,7 +536,7 @@
             it("should notify the user on any other error", function() {
               client.requestCallInfo.callsArgWith(2, {errno: 104});
 
-              conversation.setupOutgoingCall();
+              ocView.setupOutgoingCall();
 
               sinon.assert.calledOnce(notifications.errorL10n);
             });
@@ -528,7 +545,7 @@
                "are successfully received", function() {
                 client.requestCallInfo.callsArgWith(2, null, fakeSessionData);
 
-                conversation.setupOutgoingCall();
+                ocView.setupOutgoingCall();
 
                 sinon.assert.calledOnce(conversation.outgoing);
                 sinon.assert.calledWithExactly(conversation.outgoing, fakeSessionData);
@@ -536,6 +553,52 @@
           });
         });
       });
+
+      describe("getMediaPrivs", function() {
+        var multiplexGum;
+
+        beforeEach(function() {
+          multiplexGum = new standaloneMedia._MultiplexGum();
+          standaloneMedia.setSingleton(multiplexGum);
+          sandbox.stub(standaloneMedia._MultiplexGum.prototype, "reset");
+
+          sandbox.stub(conversation, "gotMediaPrivs");
+        });
+
+        it("should call getPermsAndCacheMedia", function() {
+          conversation.trigger("call:outgoing:get-media-privs");
+
+          sinon.assert.calledOnce(stubGetPermsAndCacheMedia);
+        });
+
+        it("should call gotMediaPrevs on the model when successful", function() {
+          stubGetPermsAndCacheMedia.callsArgWith(1, {});
+
+          conversation.trigger("call:outgoing:get-media-privs");
+
+          sinon.assert.calledOnce(conversation.gotMediaPrivs);
+        });
+
+        it("should call multiplexGum.reset when getPermsAndCacheMedia fails",
+          function() {
+            stubGetPermsAndCacheMedia.callsArgWith(2, "FAKE_ERROR");
+
+            conversation.trigger("call:outgoing:get-media-privs");
+
+            sinon.assert.calledOnce(multiplexGum.reset);
+          });
+
+        it("should set state to `failure` when getPermsAndCacheMedia fails",
+          function() {
+            stubGetPermsAndCacheMedia.callsArgWith(2, "FAKE_ERROR");
+
+            conversation.trigger("call:outgoing:get-media-privs");
+
+            expect(ocView.state.callStatus).eql("failure");
+          });
+      });
+
+
     });
 
     describe("FailedConversationView", function() {
@@ -582,7 +645,7 @@
 
   describe("WebappRootView", function() {
     var helper, sdk, conversationModel, client, props, standaloneAppStore;
-    var dispatcher, activeRoomStore;
+    var activeRoomStore;
 
     function mountTestComponent() {
       return TestUtils.renderIntoDocument(
@@ -609,9 +672,7 @@
       client = new loop.StandaloneClient({
         baseServerUrl: "fakeUrl"
       });
-      dispatcher = new loop.Dispatcher();
-      activeRoomStore = new loop.store.ActiveRoomStore({
-        dispatcher: dispatcher,
+      activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
         mozLoop: {},
         sdkDriver: {}
       });
@@ -689,7 +750,7 @@
     });
   });
 
-  describe("PendingConversationView", function() {
+  describe("WaitingConversationView", function() {
     var view, websocket, fakeAudio;
 
     beforeEach(function() {
@@ -709,7 +770,7 @@
       sandbox.stub(window, "XMLHttpRequest").returns(fakeAudioXHR);
 
       view = React.addons.TestUtils.renderIntoDocument(
-        loop.webapp.PendingConversationView({
+        loop.webapp.WaitingConversationView({
           websocket: websocket
         })
       );
@@ -798,27 +859,8 @@
               client: standaloneClientStub
             })
         );
-
-        // default to succeeding with a null local media object
-        stubGetPermsAndCacheMedia.callsArgWith(1, {});
       });
 
-      it("should fire multiplexGum.reset when getPermsAndCacheMedia calls" +
-        " back an error",
-        function() {
-          var setupOutgoingCall = sinon.stub(conversation, "setupOutgoingCall");
-          var multiplexGum = new standaloneMedia._MultiplexGum();
-          standaloneMedia.setSingleton(multiplexGum);
-          sandbox.stub(standaloneMedia._MultiplexGum.prototype, "reset");
-          stubGetPermsAndCacheMedia.callsArgWith(2, "FAKE_ERROR");
-
-          var button = view.getDOMNode().querySelector(".btn-accept");
-          React.addons.TestUtils.Simulate.click(button);
-
-          sinon.assert.calledOnce(multiplexGum.reset);
-          sinon.assert.calledWithExactly(multiplexGum.reset);
-        });
-
       it("should start the audio-video conversation establishment process",
         function() {
           var setupOutgoingCall = sinon.stub(conversation, "setupOutgoingCall");
@@ -1040,7 +1082,7 @@
         loop.webapp.EndedConversationView({
           conversation: conversation,
           sdk: {},
-          feedbackApiClient: feedbackApiClient,
+          feedbackStore: feedbackStore,
           onAfterFeedbackReceived: function(){}
         })
       );
@@ -1053,22 +1095,6 @@
     it("should render a FeedbackView", function() {
       TestUtils.findRenderedComponentWithType(view, sharedViews.FeedbackView);
     });
-
-    describe("#componentDidMount", function() {
-
-      it("should play a terminating sound, once", function() {
-        fakeAudioXHR.onload();
-
-        sinon.assert.called(fakeAudioXHR.open);
-        sinon.assert.calledWithExactly(
-          fakeAudioXHR.open, "GET", "shared/sounds/terminated.ogg", true);
-
-        sinon.assert.calledOnce(fakeAudio.play);
-        expect(fakeAudio.loop).to.not.equal(true);
-      });
-
-    });
-
   });
 
   describe("PromoteFirefoxView", function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/head.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/head.js	2014-11-26 21:45:48.000000000 +0000
@@ -73,7 +73,7 @@
 }
 
 function getLoopString(stringID) {
-  return MozLoopServiceInternal.localizedStrings[stringID].textContent;
+  return MozLoopServiceInternal.localizedStrings.get(stringID);
 }
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_looprooms.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_looprooms.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_looprooms.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_looprooms.js	2014-11-26 21:45:48.000000000 +0000
@@ -209,16 +209,22 @@
     res.finish();
   }
 
+  function getJSONData(body) {
+    return JSON.parse(CommonUtils.readBytesFromInputStream(body));
+  }
+
   // Add a request handler for each room in the list.
   [...kRooms.values()].forEach(function(room) {
     loopServer.registerPathHandler("/rooms/" + encodeURIComponent(room.roomToken), (req, res) => {
       if (req.method == "POST") {
-        let body = CommonUtils.readBytesFromInputStream(req.bodyInputStream);
-        let data = JSON.parse(body);
+        let data = getJSONData(req.bodyInputStream);
         res.setStatusLine(null, 200, "OK");
         res.write(JSON.stringify(data));
         res.processAsync();
         res.finish();
+      } else if (req.method == "PATCH") {
+        let data = getJSONData(req.bodyInputStream);
+        returnRoomDetails(res, data.roomName);
       } else {
         returnRoomDetails(res, room.roomName);
       }
@@ -293,8 +299,8 @@
 
   Assert.ok(openedUrl, "should open a chat window");
 
-  // Stop the busy kicking in for following tests.
-  let windowId = openedUrl.match(/about:loopconversation\#(\d+)$/)[1];
+  // Stop the busy kicking in for following tests. (note: windowId can be 'fakeToken')
+  let windowId = openedUrl.match(/about:loopconversation\#(\w+)$/)[1];
   let windowData = MozLoopService.getConversationWindowData(windowId);
 
   Assert.equal(windowData.type, "room", "window data should contain room as the type");
@@ -331,6 +337,13 @@
 });
 
 // Test if joining a room works as expected.
+add_task(function* test_joinRoomGuest() {
+  // We need these set up for getting the email address.
+  let roomToken = "_nxD4V4FflQ";
+  let joinedData = yield LoopRooms.promise("join", roomToken);
+  Assert.equal(joinedData.action, "join");
+});
+
 add_task(function* test_joinRoom() {
   // We need these set up for getting the email address.
   Services.prefs.setCharPref("loop.fxa_oauth.profile", JSON.stringify({
@@ -344,6 +357,9 @@
   let joinedData = yield LoopRooms.promise("join", roomToken);
   Assert.equal(joinedData.action, "join");
   Assert.equal(joinedData.displayName, "fake@invalid.com");
+
+  Services.prefs.clearUserPref("loop.fxa_oauth.profile");
+  Services.prefs.clearUserPref("loop.fxa_oauth.tokendata");
 });
 
 // Test if refreshing a room works as expected.
@@ -363,6 +379,13 @@
   Assert.equal(leaveData.sessionToken, "fakeLeaveSessionToken");
 });
 
+// Test if renaming a room works as expected.
+add_task(function* test_renameRoom() {
+  let roomToken = "_nxD4V4FflQ";
+  let renameData = yield LoopRooms.promise("rename", roomToken, "fakeName");
+  Assert.equal(renameData.roomName, "fakeName");
+});
+
 // Test if the event emitter implementation doesn't leak and is working as expected.
 add_task(function* () {
   Assert.strictEqual(gExpectedAdds.length, 0, "No room additions should be expected anymore");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js	2014-11-26 21:45:48.000000000 +0000
@@ -37,7 +37,7 @@
 
 add_task(function* error_offline() {
   Services.io.offline = true;
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.GUEST, "/offline", "GET").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/offline", "GET").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       MozLoopServiceInternal.setError("testing", error);
@@ -58,7 +58,7 @@
 add_task(function* guest_401() {
   Services.prefs.setCharPref("loop.hawk-session-token", "guest");
   Services.prefs.setCharPref("loop.hawk-session-token.fxa", "fxa");
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.GUEST, "/401", "POST").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/401", "POST").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       Assert.strictEqual(Services.prefs.getPrefType("loop.hawk-session-token"),
@@ -83,7 +83,7 @@
 add_task(function* fxa_401() {
   Services.prefs.setCharPref("loop.hawk-session-token", "guest");
   Services.prefs.setCharPref("loop.hawk-session-token.fxa", "fxa");
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.FXA, "/401", "POST").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.FXA, "/401", "POST").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       Assert.strictEqual(Services.prefs.getCharPref("loop.hawk-session-token"),
@@ -105,7 +105,7 @@
 add_task(cleanup_between_tests);
 
 add_task(function* error_404() {
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.GUEST, "/404", "GET").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/404", "GET").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       MozLoopServiceInternal.setError("testing", error);
@@ -122,7 +122,7 @@
 add_task(cleanup_between_tests);
 
 add_task(function* error_500() {
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.GUEST, "/500", "GET").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/500", "GET").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       MozLoopServiceInternal.setError("testing", error);
@@ -139,7 +139,7 @@
 add_task(cleanup_between_tests);
 
 add_task(function* profile_500() {
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.GUEST, "/500", "GET").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/500", "GET").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       MozLoopServiceInternal.setError("profile", error);
@@ -156,7 +156,7 @@
 add_task(cleanup_between_tests);
 
 add_task(function* error_503() {
-  yield MozLoopService.hawkRequest(LOOP_SESSION_TYPE.GUEST, "/503", "GET").then(
+  yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/503", "GET").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
       MozLoopServiceInternal.setError("testing", error);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js	2014-11-26 21:45:48.000000000 +0000
@@ -6,39 +6,39 @@
 var fakeBoolPrefName = "boolean";
 var fakePrefValue = "green";
 
-function test_getLoopCharPref()
+function test_getLoopPref()
 {
   Services.prefs.setCharPref("loop." + fakeCharPrefName, fakePrefValue);
 
-  var returnedPref = MozLoopService.getLoopCharPref(fakeCharPrefName);
+  var returnedPref = MozLoopService.getLoopPref(fakeCharPrefName, Ci.nsIPrefBranch.PREF_STRING);
 
   Assert.equal(returnedPref, fakePrefValue,
     "Should return a char pref under the loop. branch");
   Services.prefs.clearUserPref("loop." + fakeCharPrefName);
 }
 
-function test_getLoopCharPref_not_found()
+function test_getLoopPref_not_found()
 {
-  var returnedPref = MozLoopService.getLoopCharPref(fakeCharPrefName);
+  var returnedPref = MozLoopService.getLoopPref(fakeCharPrefName);
 
   Assert.equal(returnedPref, null,
     "Should return null if a preference is not found");
 }
 
-function test_getLoopCharPref_non_coercible_type()
+function test_getLoopPref_non_coercible_type()
 {
   Services.prefs.setBoolPref("loop." + fakeCharPrefName, false);
 
-  var returnedPref = MozLoopService.getLoopCharPref(fakeCharPrefName);
+  var returnedPref = MozLoopService.getLoopPref(fakeCharPrefName, Ci.nsIPrefBranch.PREF_STRING);
 
   Assert.equal(returnedPref, null,
     "Should return null if the preference exists & is of a non-coercible type");
 }
 
-function test_setLoopCharPref()
+function test_setLoopPref()
 {
   Services.prefs.setCharPref("loop." + fakeCharPrefName, "red");
-  MozLoopService.setLoopCharPref(fakeCharPrefName, fakePrefValue);
+  MozLoopService.setLoopPref(fakeCharPrefName, fakePrefValue);
 
   var returnedPref = Services.prefs.getCharPref("loop." + fakeCharPrefName);
 
@@ -47,10 +47,10 @@
   Services.prefs.clearUserPref("loop." + fakeCharPrefName);
 }
 
-function test_setLoopCharPref_new()
+function test_setLoopPref_new()
 {
   Services.prefs.clearUserPref("loop." + fakeCharPrefName);
-  MozLoopService.setLoopCharPref(fakeCharPrefName, fakePrefValue);
+  MozLoopService.setLoopPref(fakeCharPrefName, fakePrefValue, Ci.nsIPrefBranch.PREF_STRING);
 
   var returnedPref = Services.prefs.getCharPref("loop." + fakeCharPrefName);
 
@@ -59,28 +59,28 @@
   Services.prefs.clearUserPref("loop." + fakeCharPrefName);
 }
 
-function test_setLoopCharPref_non_coercible_type()
+function test_setLoopPref_non_coercible_type()
 {
-  MozLoopService.setLoopCharPref(fakeCharPrefName, true);
+  MozLoopService.setLoopPref(fakeCharPrefName, true);
 
   ok(true, "Setting non-coercible type should not fail");
 }
 
 
-function test_getLoopBoolPref()
+function test_getLoopPref_bool()
 {
   Services.prefs.setBoolPref("loop." + fakeBoolPrefName, true);
 
-  var returnedPref = MozLoopService.getLoopBoolPref(fakeBoolPrefName);
+  var returnedPref = MozLoopService.getLoopPref(fakeBoolPrefName);
 
   Assert.equal(returnedPref, true,
     "Should return a bool pref under the loop. branch");
   Services.prefs.clearUserPref("loop." + fakeBoolPrefName);
 }
 
-function test_getLoopBoolPref_not_found()
+function test_getLoopPref_not_found_bool()
 {
-  var returnedPref = MozLoopService.getLoopBoolPref(fakeBoolPrefName);
+  var returnedPref = MozLoopService.getLoopPref(fakeBoolPrefName);
 
   Assert.equal(returnedPref, null,
     "Should return null if a preference is not found");
@@ -91,15 +91,15 @@
 {
   setupFakeLoopServer();
 
-  test_getLoopCharPref();
-  test_getLoopCharPref_not_found();
-  test_getLoopCharPref_non_coercible_type();
-  test_setLoopCharPref();
-  test_setLoopCharPref_new();
-  test_setLoopCharPref_non_coercible_type();
+  test_getLoopPref();
+  test_getLoopPref_not_found();
+  test_getLoopPref_non_coercible_type();
+  test_setLoopPref();
+  test_setLoopPref_new();
+  test_setLoopPref_non_coercible_type();
 
-  test_getLoopBoolPref();
-  test_getLoopBoolPref_not_found();
+  test_getLoopPref_bool();
+  test_getLoopPref_not_found_bool();
 
   do_register_cleanup(function() {
     Services.prefs.clearUserPref("loop." + fakeCharPrefName);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js	2014-11-26 21:45:48.000000000 +0000
@@ -20,7 +20,7 @@
     do_throw("should not succeed with a bogus token");
   }, err => {
 
-    Assert.equal(err, "session-token-wrong-size", "Should cause an error to be" +
+    Assert.equal(err.message, "session-token-wrong-size", "Should cause an error to be" +
       " called back if the session-token is not 64 characters long");
 
     // for some reason, Assert.throw is misbehaving, so....
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/fake-mozLoop.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/fake-mozLoop.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/fake-mozLoop.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/fake-mozLoop.js	2014-11-26 21:45:48.000000000 +0000
@@ -49,13 +49,14 @@
  */
 navigator.mozLoop = {
   ensureRegistered: function() {},
-  getLoopCharPref: function() {},
-  getLoopBoolPref: function(pref) {
+  getAudioBlob: function(){},
+  getLoopPref: function(pref) {
     // Ensure UI for rooms is displayed in the showcase.
     if (pref === "rooms.enabled") {
       return true;
     }
   },
+  setLoopPref: function(){},
   releaseCallData: function() {},
   copyString: function() {},
   contacts: {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/index.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/index.html	2014-11-26 21:45:48.000000000 +0000
@@ -41,9 +41,12 @@
     <script src="../content/shared/js/websocket.js"></script>
     <script src="../content/shared/js/validate.js"></script>
     <script src="../content/shared/js/dispatcher.js"></script>
-    <script src="../content/shared/js/conversationStore.js"></script>
+    <script src="../content/shared/js/store.js"></script>
     <script src="../content/shared/js/roomStore.js"></script>
+    <script src="../content/shared/js/conversationStore.js"></script>
     <script src="../content/shared/js/activeRoomStore.js"></script>
+    <script src="../content/shared/js/feedbackStore.js"></script>
+    <script src="../content/shared/js/feedbackViews.js"></script>
     <script src="../content/js/roomViews.js"></script>
     <script src="../content/js/conversationViews.js"></script>
     <script src="../content/js/client.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/ui-showcase.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/ui-showcase.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/ui-showcase.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/ui-showcase.js	2014-11-26 21:45:48.000000000 +0000
@@ -28,7 +28,8 @@
   var UnsupportedBrowserView  = loop.webapp.UnsupportedBrowserView;
   var UnsupportedDeviceView   = loop.webapp.UnsupportedDeviceView;
   var CallUrlExpiredView      = loop.webapp.CallUrlExpiredView;
-  var PendingConversationView = loop.webapp.PendingConversationView;
+  var GumPromptConversationView = loop.webapp.GumPromptConversationView;
+  var WaitingConversationView = loop.webapp.WaitingConversationView;
   var StartConversationView   = loop.webapp.StartConversationView;
   var FailedConversationView  = loop.webapp.FailedConversationView;
   var EndedConversationView   = loop.webapp.EndedConversationView;
@@ -39,8 +40,9 @@
   var ConversationView = loop.shared.views.ConversationView;
   var FeedbackView = loop.shared.views.FeedbackView;
 
-  // Room constants
+  // Store constants
   var ROOM_STATES = loop.store.ROOM_STATES;
+  var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
 
   // Local helpers
   function returnTrue() {
@@ -62,15 +64,16 @@
   );
 
   var dispatcher = new loop.Dispatcher();
-  var activeRoomStore = new loop.store.ActiveRoomStore({
-    dispatcher: dispatcher,
+  var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
     mozLoop: navigator.mozLoop,
     sdkDriver: {}
   });
-  var roomStore = new loop.store.RoomStore({
-    dispatcher: dispatcher,
+  var roomStore = new loop.store.RoomStore(dispatcher, {
     mozLoop: navigator.mozLoop
   });
+  var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+    feedbackClient: stageFeedbackApiClient
+  });
 
   // Local mocks
 
@@ -126,7 +129,7 @@
       "audio", "audio-hover", "audio-active", "block",
       "block-red", "block-hover", "block-active", "contacts", "contacts-hover",
       "contacts-active", "copy", "checkmark", "google", "google-hover",
-      "google-active", "history", "history-hover", "history-active",
+      "google-active", "history", "history-hover", "history-active", "leave",
       "precall", "precall-hover", "precall-active", "settings", "settings-hover",
       "settings-active", "tag", "tag-hover", "tag-active", "trash", "unblock",
       "unblock-hover", "unblock-active", "video", "video-hover", "video-active"
@@ -324,16 +327,24 @@
             )
           ), 
 
-          Section({name: "PendingConversationView"}, 
-            Example({summary: "Pending conversation view (connecting)", dashed: "true"}, 
+          Section({name: "GumPromptConversationView"}, 
+            Example({summary: "Gum Prompt conversation view", dashed: "true"}, 
               React.DOM.div({className: "standalone"}, 
-                PendingConversationView({websocket: mockWebSocket, 
+                GumPromptConversationView(null)
+              )
+            )
+          ), 
+
+          Section({name: "WaitingConversationView"}, 
+            Example({summary: "Waiting conversation view (connecting)", dashed: "true"}, 
+              React.DOM.div({className: "standalone"}, 
+                WaitingConversationView({websocket: mockWebSocket, 
                                          dispatcher: dispatcher})
               )
             ), 
-            Example({summary: "Pending conversation view (ringing)", dashed: "true"}, 
+            Example({summary: "Waiting conversation view (ringing)", dashed: "true"}, 
               React.DOM.div({className: "standalone"}, 
-                PendingConversationView({websocket: mockWebSocket, 
+                WaitingConversationView({websocket: mockWebSocket, 
                                          dispatcher: dispatcher, 
                                          callState: "ringing"})
               )
@@ -462,13 +473,13 @@
               React.DOM.a({href: "https://input.allizom.org/"}, "input.allizom.org"), "."
             ), 
             Example({summary: "Default (useable demo)", dashed: "true", style: {width: "260px"}}, 
-              FeedbackView({feedbackApiClient: stageFeedbackApiClient})
+              FeedbackView({feedbackStore: feedbackStore})
             ), 
             Example({summary: "Detailed form", dashed: "true", style: {width: "260px"}}, 
-              FeedbackView({feedbackApiClient: stageFeedbackApiClient, step: "form"})
+              FeedbackView({feedbackStore: feedbackStore, feedbackState: FEEDBACK_STATES.DETAILS})
             ), 
             Example({summary: "Thank you!", dashed: "true", style: {width: "260px"}}, 
-              FeedbackView({feedbackApiClient: stageFeedbackApiClient, step: "finished"})
+              FeedbackView({feedbackStore: feedbackStore, feedbackState: FEEDBACK_STATES.SENT})
             )
           ), 
 
@@ -488,7 +499,7 @@
                                        video: {enabled: true}, 
                                        audio: {enabled: true}, 
                                        conversation: mockConversationModel, 
-                                       feedbackApiClient: stageFeedbackApiClient, 
+                                       feedbackStore: feedbackStore, 
                                        onAfterFeedbackReceived: noop})
               )
             )
@@ -608,6 +619,16 @@
                   roomState: ROOM_STATES.FULL, 
                   helper: {isFirefox: returnFalse}})
               )
+            ), 
+
+            Example({summary: "Standalone room conversation (failed)"}, 
+              React.DOM.div({className: "standalone"}, 
+                StandaloneRoomView({
+                  dispatcher: dispatcher, 
+                  activeRoomStore: activeRoomStore, 
+                  roomState: ROOM_STATES.FAILED, 
+                  helper: {isFirefox: returnFalse}})
+              )
             )
           ), 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/ui-showcase.jsx thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/ui-showcase.jsx
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/loop/ui/ui-showcase.jsx	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/loop/ui/ui-showcase.jsx	2014-11-26 21:45:48.000000000 +0000
@@ -28,7 +28,8 @@
   var UnsupportedBrowserView  = loop.webapp.UnsupportedBrowserView;
   var UnsupportedDeviceView   = loop.webapp.UnsupportedDeviceView;
   var CallUrlExpiredView      = loop.webapp.CallUrlExpiredView;
-  var PendingConversationView = loop.webapp.PendingConversationView;
+  var GumPromptConversationView = loop.webapp.GumPromptConversationView;
+  var WaitingConversationView = loop.webapp.WaitingConversationView;
   var StartConversationView   = loop.webapp.StartConversationView;
   var FailedConversationView  = loop.webapp.FailedConversationView;
   var EndedConversationView   = loop.webapp.EndedConversationView;
@@ -39,8 +40,9 @@
   var ConversationView = loop.shared.views.ConversationView;
   var FeedbackView = loop.shared.views.FeedbackView;
 
-  // Room constants
+  // Store constants
   var ROOM_STATES = loop.store.ROOM_STATES;
+  var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
 
   // Local helpers
   function returnTrue() {
@@ -62,15 +64,16 @@
   );
 
   var dispatcher = new loop.Dispatcher();
-  var activeRoomStore = new loop.store.ActiveRoomStore({
-    dispatcher: dispatcher,
+  var activeRoomStore = new loop.store.ActiveRoomStore(dispatcher, {
     mozLoop: navigator.mozLoop,
     sdkDriver: {}
   });
-  var roomStore = new loop.store.RoomStore({
-    dispatcher: dispatcher,
+  var roomStore = new loop.store.RoomStore(dispatcher, {
     mozLoop: navigator.mozLoop
   });
+  var feedbackStore = new loop.store.FeedbackStore(dispatcher, {
+    feedbackClient: stageFeedbackApiClient
+  });
 
   // Local mocks
 
@@ -126,7 +129,7 @@
       "audio", "audio-hover", "audio-active", "block",
       "block-red", "block-hover", "block-active", "contacts", "contacts-hover",
       "contacts-active", "copy", "checkmark", "google", "google-hover",
-      "google-active", "history", "history-hover", "history-active",
+      "google-active", "history", "history-hover", "history-active", "leave",
       "precall", "precall-hover", "precall-active", "settings", "settings-hover",
       "settings-active", "tag", "tag-hover", "tag-active", "trash", "unblock",
       "unblock-hover", "unblock-active", "video", "video-hover", "video-active"
@@ -324,16 +327,24 @@
             </div>
           </Section>
 
-          <Section name="PendingConversationView">
-            <Example summary="Pending conversation view (connecting)" dashed="true">
+          <Section name="GumPromptConversationView">
+            <Example summary="Gum Prompt conversation view" dashed="true">
               <div className="standalone">
-                <PendingConversationView websocket={mockWebSocket}
+                <GumPromptConversationView />
+              </div>
+            </Example>
+          </Section>
+
+          <Section name="WaitingConversationView">
+            <Example summary="Waiting conversation view (connecting)" dashed="true">
+              <div className="standalone">
+                <WaitingConversationView websocket={mockWebSocket}
                                          dispatcher={dispatcher} />
               </div>
             </Example>
-            <Example summary="Pending conversation view (ringing)" dashed="true">
+            <Example summary="Waiting conversation view (ringing)" dashed="true">
               <div className="standalone">
-                <PendingConversationView websocket={mockWebSocket}
+                <WaitingConversationView websocket={mockWebSocket}
                                          dispatcher={dispatcher}
                                          callState="ringing"/>
               </div>
@@ -462,13 +473,13 @@
               <a href="https://input.allizom.org/">input.allizom.org</a>.
             </p>
             <Example summary="Default (useable demo)" dashed="true" style={{width: "260px"}}>
-              <FeedbackView feedbackApiClient={stageFeedbackApiClient} />
+              <FeedbackView feedbackStore={feedbackStore} />
             </Example>
             <Example summary="Detailed form" dashed="true" style={{width: "260px"}}>
-              <FeedbackView feedbackApiClient={stageFeedbackApiClient} step="form" />
+              <FeedbackView feedbackStore={feedbackStore} feedbackState={FEEDBACK_STATES.DETAILS} />
             </Example>
             <Example summary="Thank you!" dashed="true" style={{width: "260px"}}>
-              <FeedbackView feedbackApiClient={stageFeedbackApiClient} step="finished" />
+              <FeedbackView feedbackStore={feedbackStore} feedbackState={FEEDBACK_STATES.SENT} />
             </Example>
           </Section>
 
@@ -488,7 +499,7 @@
                                        video={{enabled: true}}
                                        audio={{enabled: true}}
                                        conversation={mockConversationModel}
-                                       feedbackApiClient={stageFeedbackApiClient}
+                                       feedbackStore={feedbackStore}
                                        onAfterFeedbackReceived={noop} />
               </div>
             </Example>
@@ -609,6 +620,16 @@
                   helper={{isFirefox: returnFalse}} />
               </div>
             </Example>
+
+            <Example summary="Standalone room conversation (failed)">
+              <div className="standalone">
+                <StandaloneRoomView
+                  dispatcher={dispatcher}
+                  activeRoomStore={activeRoomStore}
+                  roomState={ROOM_STATES.FAILED}
+                  helper={{isFirefox: returnFalse}} />
+              </div>
+            </Example>
           </Section>
 
           <Section name="SVG icons preview">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/nsBrowserGlue.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/nsBrowserGlue.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/nsBrowserGlue.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/nsBrowserGlue.js	2014-11-26 21:45:48.000000000 +0000
@@ -2527,11 +2527,14 @@
       } catch(e) {}
 
       let isHardwareAccelerated = true;
+      // Linux and Windows are currently ok, mac not so much.
+#ifdef XP_MACOSX
       try {
         let win = RecentWindow.getMostRecentBrowserWindow();
         let winutils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
         isHardwareAccelerated = winutils.layerManagerType != "Basic";
       } catch (e) {}
+#endif
 
       if (!Services.appinfo.inSafeMode &&
           !Services.appinfo.accessibilityEnabled &&
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/preferences/in-content/privacy.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/preferences/in-content/privacy.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/preferences/in-content/privacy.xul	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/preferences/in-content/privacy.xul	2014-11-26 21:45:48.000000000 +0000
@@ -241,7 +241,7 @@
           data-category="panePrivacy"
           hidden="true">
   <caption><label>&locationBar.label;</label></caption>
-  <label id="locationBarSuggestionLabel">&locbar.pre.label;</label>
+  <label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
   <checkbox id="historySuggestion" label="&locbar.history.label;"
             onsyncfrompreference="return gPrivacyPane.writeSuggestionPref();"
             accesskey="&locbar.history.accesskey;"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/preferences/privacy.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/preferences/privacy.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/preferences/privacy.xul	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/preferences/privacy.xul	2014-11-26 21:45:48.000000000 +0000
@@ -259,7 +259,7 @@
     <groupbox id="locationBarGroup">
       <caption label="&locationBar.label;"/>
 
-      <label id="locationBarSuggestionLabel">&locbar.pre.label;</label>
+      <label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
 
       <vbox id="tabPrefsBox" align="start" flex="1">
         <checkbox id="historySuggestion" label="&locbar.history.label;"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/search/content/search.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/search/content/search.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/search/content/search.xml	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/search/content/search.xml	2014-11-26 21:45:49.000000000 +0000
@@ -242,9 +242,7 @@
       <method name="offerNewEngine">
         <parameter name="aEngine"/>
         <body><![CDATA[
-          var allbrowsers = getBrowser().mPanelContainer.childNodes;
-          for (var tab = 0; tab < allbrowsers.length; tab++) {
-            var browser = getBrowser().getBrowserAtIndex(tab);
+          for (let browser of gBrowser.browsers) {
             if (browser.hiddenEngines) {
               // XXX This will need to be changed when engines are identified by
               // URL rather than title; see bug 335102.
@@ -269,9 +267,7 @@
       <method name="hideNewEngine">
         <parameter name="aEngine"/>
         <body><![CDATA[
-          var allbrowsers = getBrowser().mPanelContainer.childNodes;
-          for (var tab = 0; tab < allbrowsers.length; tab++) {
-            var browser = getBrowser().getBrowserAtIndex(tab);
+          for (let browser of gBrowser.browsers) {
             if (browser.engines) {
               // XXX This will need to be changed when engines are identified by
               // URL rather than title; see bug 335102.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/search/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/search/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/search/test/browser.ini	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/search/test/browser.ini	2014-11-26 21:45:49.000000000 +0000
@@ -36,4 +36,4 @@
 [browser_yahoo_behavior.js]
 skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}]
 [browser_abouthome_behavior.js]
-skip-if = e10s # Bug ???????
+skip-if = e10s || true # Bug ??????, Bug 1100301 - leaks windows until shutdown when --run-by-dir
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/search/test/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/search/test/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/search/test/head.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/search/test/head.js	2014-11-26 21:45:49.000000000 +0000
@@ -123,14 +123,16 @@
 }
 
 function* promiseOnLoad() {
-  let deferred = Promise.defer();
-
-  gBrowser.addEventListener("load", function onLoadListener(aEvent) {
-    info("onLoadListener: " + aEvent.originalTarget.location);
-    gBrowser.removeEventListener("load", onLoadListener, true);
-    deferred.resolve(aEvent);
-  }, true);
-
-  return deferred.promise;
+  return new Promise(resolve => {
+    gBrowser.addEventListener("load", function onLoadListener(aEvent) {
+      let cw = aEvent.target.defaultView;
+      let tab = gBrowser._getTabForContentWindow(cw);
+      if (tab) {
+        info("onLoadListener: " + aEvent.originalTarget.location);
+        gBrowser.removeEventListener("load", onLoadListener, true);
+        resolve(aEvent);
+      }
+    }, true);
+  });
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/SessionHistory.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/SessionHistory.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/SessionHistory.jsm	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/SessionHistory.jsm	2014-11-26 21:45:49.000000000 +0000
@@ -187,8 +187,10 @@
 
     // We will include the property only if it's truthy to save a couple of
     // bytes when the resulting object is stringified and saved to disk.
-    if (shEntry.referrerURI)
+    if (shEntry.referrerURI) {
       entry.referrer = shEntry.referrerURI.spec;
+      entry.referrerPolicy = shEntry.referrerPolicy;
+    }
 
     if (shEntry.srcdocData)
       entry.srcdocData = shEntry.srcdocData;
@@ -340,8 +342,10 @@
     shEntry.loadType = Ci.nsIDocShellLoadInfo.loadHistory;
     if (entry.contentType)
       shEntry.contentType = entry.contentType;
-    if (entry.referrer)
+    if (entry.referrer) {
       shEntry.referrerURI = Utils.makeURI(entry.referrer);
+      shEntry.referrerPolicy = entry.referrerPolicy;
+    }
     if (entry.isSrcdocEntry)
       shEntry.srcdocData = entry.srcdocData;
     if (entry.baseURI)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/SessionStore.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/SessionStore.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/SessionStore.jsm	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/SessionStore.jsm	2014-11-26 21:45:49.000000000 +0000
@@ -74,6 +74,16 @@
   "SessionStore:reloadPendingTab",
 ];
 
+// The list of messages we accept from <xul:browser>s that have no tab
+// assigned. Those are for example the ones that preload about:newtab pages.
+const FMM_NOTAB_MESSAGES = new Set([
+  // For a description see above.
+  "SessionStore:setupSyncHandler",
+
+  // For a description see above.
+  "SessionStore:update",
+]);
+
 // Messages that will be received via the Parent Process Message Manager.
 const PPMM_MESSAGES = [
   // A tab is being revived from the crashed state. The sender of this
@@ -605,9 +615,12 @@
     var browser = aMessage.target;
     var win = browser.ownerDocument.defaultView;
     let tab = win.gBrowser.getTabForBrowser(browser);
-    if (!tab) {
-      // Ignore messages from <browser> elements that are not tabs.
-      return;
+
+    // Ensure we receive only specific messages from <xul:browser>s that
+    // have no tab assigned, e.g. the ones that preload aobut:newtab pages.
+    if (!tab && !FMM_NOTAB_MESSAGES.has(aMessage.name)) {
+      throw new Error(`received unexpected message '${aMessage.name}' ` +
+                      `from a browser that has no tab`);
     }
 
     switch (aMessage.name) {
@@ -635,8 +648,21 @@
           let uri = activePageData ? activePageData.url || null : null;
           browser.userTypedValue = uri;
 
-          // Update tab label and icon again after the tab history was updated.
-          this.updateTabLabelAndIcon(tab, tabData);
+          // If the page has a title, set it.
+          if (activePageData) {
+            if (activePageData.title) {
+              tab.label = activePageData.title;
+              tab.crop = "end";
+            } else if (activePageData.url != "about:blank") {
+              tab.label = activePageData.url;
+              tab.crop = "center";
+            }
+          }
+
+          // Restore the tab icon.
+          if ("image" in tabData) {
+            win.gBrowser.setIcon(tab, tabData.image);
+          }
 
           let event = win.document.createEvent("Events");
           event.initEvent("SSTabRestoring", true, false);
@@ -691,7 +717,7 @@
         }
         break;
       default:
-        debug(`received unknown message '${aMessage.name}'`);
+        throw new Error(`received unknown message '${aMessage.name}'`);
         break;
     }
   },
@@ -1847,26 +1873,6 @@
     }
   },
 
-  updateTabLabelAndIcon(tab, tabData) {
-    let activePageData = tabData.entries[tabData.index - 1] || null;
-
-    // If the page has a title, set it.
-    if (activePageData) {
-      if (activePageData.title) {
-        tab.label = activePageData.title;
-        tab.crop = "end";
-      } else if (activePageData.url != "about:blank") {
-        tab.label = activePageData.url;
-        tab.crop = "center";
-      }
-    }
-
-    // Restore the tab icon.
-    if ("image" in tabData) {
-      tab.ownerDocument.defaultView.gBrowser.setIcon(tab, tabData.image);
-    }
-  },
-
   /**
    * Restores the session state stored in LastSession. This will attempt
    * to merge data into the current session. If a window was opened at startup
@@ -2539,17 +2545,9 @@
       this._windows[aWindow.__SSi].selected = aSelectTab;
     }
 
-    // If we restore the selected tab, make sure it goes first.
-    let selectedIndex = aTabs.indexOf(tabbrowser.selectedTab);
-    if (selectedIndex > -1) {
-      this.restoreTab(tabbrowser.selectedTab, aTabData[selectedIndex]);
-    }
-
     // Restore all tabs.
     for (let t = 0; t < aTabs.length; t++) {
-      if (t != selectedIndex) {
-        this.restoreTab(aTabs[t], aTabData[t]);
-      }
+      this.restoreTab(aTabs[t], aTabData[t]);
     }
   },
 
@@ -2655,10 +2653,6 @@
     browser.messageManager.sendAsyncMessage("SessionStore:restoreHistory",
                                             {tabData: tabData, epoch: epoch});
 
-    // Update tab label and icon to show something
-    // while we wait for the messages to be processed.
-    this.updateTabLabelAndIcon(tab, tabData);
-
     // Restore tab attributes.
     if ("attributes" in tabData) {
       TabAttributes.set(tab, tabData.attributes);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/test/browser_522545.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/test/browser_522545.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/test/browser_522545.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/test/browser_522545.js	2014-11-26 21:45:49.000000000 +0000
@@ -193,16 +193,16 @@
       is(browser.userTypedValue, null, "userTypedValue is empty to start");
       is(browser.userTypedClear, 0, "userTypedClear is 0 to start");
 
-      gURLBar.value = "example.org";
-      let event = document.createEvent("Events");
-      event.initEvent("input", true, false);
-      gURLBar.dispatchEvent(event);
+      let inputText = "example.org";
+      gURLBar.focus();
+      gURLBar.value = inputText.slice(0, -1);
+      EventUtils.synthesizeKey(inputText.slice(-1) , {});
 
       executeSoon(function () {
         is(browser.userTypedValue, "example.org",
-           "userTypedValue was set when changing gURLBar.value");
+           "userTypedValue was set when changing URLBar value");
         is(browser.userTypedClear, 0,
-           "userTypedClear was not changed when changing gURLBar.value");
+           "userTypedClear was not changed when changing URLBar value");
 
         // Now make sure ss gets these values too
         let newState = JSON.parse(ss.getBrowserState());
@@ -235,7 +235,7 @@
          "userTypedValue was null after loading a URI");
       is(browser.userTypedClear, 0,
          "userTypeClear reset to 0");
-      is(gURLBar.value, gURLBar.trimValue("http://example.com/"),
+      is(gURLBar.textValue, gURLBar.trimValue("http://example.com/"),
          "Address bar's value set after loading URI");
       runNextTest();
     });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/test/browser_586068-reload.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/test/browser_586068-reload.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/test/browser_586068-reload.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/test/browser_586068-reload.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,11 +9,6 @@
 }
 
 function runTests() {
-  // Request a longer timeout because the test takes quite a while
-  // to complete on slow Windows debug machines and we would otherwise
-  // see a lot of (not so) intermittent test failures.
-  requestLongerTimeout(2);
-
   Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, true);
   registerCleanupFunction(function () {
     Services.prefs.clearUserPref(PREF_RESTORE_ON_DEMAND);
@@ -29,112 +24,31 @@
     { entries: [{ url: "http://example.org/#7" }], extData: { "uniq": r() } },
     { entries: [{ url: "http://example.org/#8" }], extData: { "uniq": r() } },
     { entries: [{ url: "http://example.org/#9" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#10" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#11" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#12" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#13" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#14" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#15" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#16" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#17" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.org/#18" }], extData: { "uniq": r() } }
   ], selected: 1 }] };
 
   let loadCount = 0;
-  gProgressListener.setCallback(function (aBrowser, aNeedRestore, aRestoring, aRestored) {
-    loadCount++;
-    is(aBrowser.currentURI.spec, state.windows[0].tabs[loadCount - 1].entries[0].url,
-       "load " + loadCount + " - browser loaded correct url");
-
-    if (loadCount <= state.windows[0].tabs.length) {
-      // double check that this tab was the right one
-      let expectedData = state.windows[0].tabs[loadCount - 1].extData.uniq;
-      let tab;
-      for (let i = 0; i < window.gBrowser.tabs.length; i++) {
-        if (!tab && window.gBrowser.tabs[i].linkedBrowser == aBrowser)
-          tab = window.gBrowser.tabs[i];
-      }
-      is(ss.getTabValue(tab, "uniq"), expectedData,
-         "load " + loadCount + " - correct tab was restored");
-
-      if (loadCount == state.windows[0].tabs.length) {
-        gProgressListener.unsetCallback();
-        executeSoon(function () {
-          reloadAllTabs(state, function () {
-            waitForBrowserState(TestRunner.backupState, testCascade);
-          });
-        });
-      } else {
-        // reload the next tab
-        window.gBrowser.reloadTab(window.gBrowser.tabs[loadCount]);
-      }
-    }
-  });
-
-  yield ss.setBrowserState(JSON.stringify(state));
-}
-
-function testCascade() {
-  Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, false);
-
-  let state = { windows: [{ tabs: [
-    { entries: [{ url: "http://example.com/#1" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.com/#2" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.com/#3" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.com/#4" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.com/#5" }], extData: { "uniq": r() } },
-    { entries: [{ url: "http://example.com/#6" }], extData: { "uniq": r() } }
-  ] }] };
-
-  let loadCount = 0;
-  gProgressListener.setCallback(function (aBrowser, aNeedRestore, aRestoring, aRestored) {
-    if (++loadCount < state.windows[0].tabs.length) {
-      return;
-    }
-
-    gProgressListener.unsetCallback();
-    executeSoon(function () {
-      reloadAllTabs(state, next);
-    });
-  });
+  gBrowser.tabContainer.addEventListener("SSTabRestored", function onRestored(event) {
+    let tab = event.target;
+    let browser = tab.linkedBrowser;
+    let tabData = state.windows[0].tabs[loadCount++];
 
-  ss.setBrowserState(JSON.stringify(state));
-}
+    // double check that this tab was the right one
+    is(browser.currentURI.spec, tabData.entries[0].url,
+       "load " + loadCount + " - browser loaded correct url");
+    is(ss.getTabValue(tab, "uniq"), tabData.extData.uniq,
+       "load " + loadCount + " - correct tab was restored");
 
-function reloadAllTabs(aState, aCallback) {
-  // Simulate a left mouse button click with no modifiers, which is what
-  // Command-R, or clicking reload does.
-  let fakeEvent = {
-    button: 0,
-    metaKey: false,
-    altKey: false,
-    ctrlKey: false,
-    shiftKey: false
-  };
+    if (loadCount == state.windows[0].tabs.length) {
+      gBrowser.tabContainer.removeEventListener("SSTabRestored", onRestored);
 
-  let loadCount = 0;
-  gWebProgressListener.setCallback(function (aBrowser) {
-    if (++loadCount <= aState.windows[0].tabs.length) {
-      // double check that this tab was the right one
-      let expectedData = aState.windows[0].tabs[loadCount - 1].extData.uniq;
-      let tab;
-      for (let i = 0; i < window.gBrowser.tabs.length; i++) {
-        if (!tab && window.gBrowser.tabs[i].linkedBrowser == aBrowser)
-          tab = window.gBrowser.tabs[i];
-      }
-      is(ss.getTabValue(tab, "uniq"), expectedData,
-         "load " + loadCount + " - correct tab was reloaded");
-
-      if (loadCount == aState.windows[0].tabs.length) {
-        gWebProgressListener.unsetCallback();
-        executeSoon(aCallback);
-      } else {
-        // reload the next tab
-        window.gBrowser.selectTabAtIndex(loadCount);
-        BrowserReloadOrDuplicate(fakeEvent);
-      }
+      executeSoon(function () {
+        waitForBrowserState(TestRunner.backupState, finish);
+      });
+    } else {
+      // reload the next tab
+      gBrowser.browsers[loadCount].reload();
     }
   });
 
-  BrowserReloadOrDuplicate(fakeEvent);
+  yield ss.setBrowserState(JSON.stringify(state));
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/test/content.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/test/content.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/sessionstore/test/content.js	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/sessionstore/test/content.js	2014-11-26 21:45:49.000000000 +0000
@@ -82,7 +82,7 @@
   // content-sessionStore.js. We run ours a little later to make sure
   // that the session store code has seen the event before we allow
   // the test to proceed.
-  executeSoon(() => sendSyncMessage("ss-test:MozStorageChanged"));
+  executeSoon(() => sendAsyncMessage("ss-test:MozStorageChanged"));
 }, true);
 
 addMessageListener("ss-test:modifySessionStorage", function (msg) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/shell/nsMacShellService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/shell/nsMacShellService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/shell/nsMacShellService.cpp	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/shell/nsMacShellService.cpp	2014-11-26 21:45:49.000000000 +0000
@@ -205,7 +205,9 @@
     loadContext = do_QueryInterface(docShell);
   }
 
-  return wbp->SaveURI(imageURI, nullptr, docURI, nullptr, nullptr,
+  return wbp->SaveURI(imageURI, nullptr,
+                      docURI, content->OwnerDoc()->GetReferrerPolicy(),
+                      nullptr, nullptr,
                       mBackgroundFile, loadContext);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/tabview/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/tabview/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/components/tabview/test/browser.ini	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/components/tabview/test/browser.ini	2014-11-26 21:45:49.000000000 +0000
@@ -19,7 +19,7 @@
 [browser_tabview_bug587231.js]
 skip-if = buildapp == 'mulet'
 [browser_tabview_bug587276.js]
-skip-if = e10s # Bug 1091200
+skip-if = e10s || true # Bug 1091200, bug 1096285
 [browser_tabview_bug587351.js]
 [browser_tabview_bug587503.js]
 [browser_tabview_bug587990.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux32/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux32/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux32/nightly	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux32/nightly	2014-11-26 21:45:49.000000000 +0000
@@ -2,7 +2,6 @@
 
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux32/valgrind thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux32/valgrind
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux32/valgrind	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux32/valgrind	2014-11-26 21:45:49.000000000 +0000
@@ -5,7 +5,6 @@
 
 ac_add_options --enable-valgrind
 ac_add_options --disable-jemalloc
-ac_add_options --disable-elf-hack
 ac_add_options --enable-optimize="-g -O -freorder-blocks"
 ac_add_options --disable-install-strip
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux64/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux64/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux64/nightly	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux64/nightly	2014-11-26 21:45:49.000000000 +0000
@@ -2,7 +2,6 @@
 
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux64/valgrind thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux64/valgrind
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/linux64/valgrind	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/linux64/valgrind	2014-11-26 21:45:49.000000000 +0000
@@ -5,7 +5,6 @@
 
 ac_add_options --enable-valgrind
 ac_add_options --disable-jemalloc
-ac_add_options --disable-elf-hack
 ac_add_options --enable-optimize="-g -O -freorder-blocks"
 ac_add_options --disable-install-strip
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/whitelist thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/whitelist
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/config/mozconfigs/whitelist	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/config/mozconfigs/whitelist	2014-11-26 21:45:49.000000000 +0000
@@ -34,7 +34,6 @@
     'export MOZ_TELEMETRY_REPORTING=1',
     "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
     'STRIP_FLAGS="--strip-debug"',
-    'ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling',
 ]
 
 whitelist['nightly']['linux64'] += [
@@ -44,7 +43,6 @@
     'STRIP_FLAGS="--strip-debug"',
     'ac_add_options --with-ccache=/usr/bin/ccache',
     '. "$topsrcdir/build/mozconfig.cache"',
-    'ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling',
 ]
 
 whitelist['nightly']['macosx-universal'] += [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/app-manager/app-projects.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/app-manager/app-projects.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/app-manager/app-projects.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/app-manager/app-projects.js	2014-11-26 21:45:49.000000000 +0000
@@ -16,14 +16,15 @@
 
 const IDB = {
   _db: null,
+  databaseName: "AppProjects",
 
   open: function () {
     let deferred = promise.defer();
 
-    let request = indexedDB.open("AppProjects", 5);
+    let request = indexedDB.open(IDB.databaseName, 5);
     request.onerror = function(event) {
-      deferred.reject("Unable to open AppProjects indexedDB. " +
-                      "Error code: " + event.target.errorCode);
+      deferred.reject("Unable to open AppProjects indexedDB: " +
+                      this.error.name + " - " + this.error.message );
     };
     request.onupgradeneeded = function(event) {
       let db = event.target.result;
@@ -147,11 +148,10 @@
 
 let loadDeferred = promise.defer();
 
-IDB.open().then(function (projects) {
+loadDeferred.resolve(IDB.open().then(function (projects) {
   store.object.projects = projects;
   AppProjects.emit("ready", store.object.projects);
-  loadDeferred.resolve();
-});
+}));
 
 const AppProjects = {
   load: function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/debugger-controller.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/debugger-controller.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/debugger-controller.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/debugger-controller.js	2014-11-26 21:45:49.000000000 +0000
@@ -198,14 +198,14 @@
     }
 
     let target = this._target;
-    let { client, form: { chromeDebugger, traceActor, addonActor } } = target;
+    let { client, form: { chromeDebugger, traceActor, actor } } = target;
     target.on("close", this._onTabDetached);
     target.on("navigate", this._onTabNavigated);
     target.on("will-navigate", this._onTabNavigated);
     this.client = client;
 
-    if (addonActor) {
-      yield this._startAddonDebugging(addonActor);
+    if (target.isAddon) {
+      yield this._startAddonDebugging(actor);
     } else if (target.chrome) {
       yield this._startChromeDebugging(chromeDebugger);
     } else {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js	2014-11-26 21:45:49.000000000 +0000
@@ -14,15 +14,14 @@
   // GC from previous tests does not interfere with the debugger suite.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     ok(aTab, "Should have a tab available.");
-    ok(aDebuggee, "Should have a debuggee available.");
     ok(aPanel, "Should have a debugger pane available.");
 
     waitForSourceAndCaretAndScopes(aPanel, "-02.js", 1).then(() => {
       resumeDebuggerThenCloseAndFinish(aPanel);
     });
 
-    aDebuggee.firstCall();
+    callInTab(aTab, "firstCall");
   });
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_auto-pretty-print-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_auto-pretty-print-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_auto-pretty-print-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_auto-pretty-print-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -5,7 +5,7 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_auto-pretty-print-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gPrefs, gOptions, gView;
 
 let gFirstSourceLabel = "code_ugly-5.js";
@@ -15,9 +15,8 @@
 Services.prefs.setBoolPref("devtools.debugger.auto-pretty-print", true);
 
 function test(){
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -99,7 +98,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gFrames;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -28,7 +27,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 
   function checkNavigationWhileNotFocused() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,7 +8,7 @@
 const TAB_URL = EXAMPLE_URL + "doc_event-listeners-02.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let gDebugger = aPanel.panelWin;
     let gView = gDebugger.DebuggerView;
     let gEvents = gView.EventListeners;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location2.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location2.js	2014-11-26 21:45:49.000000000 +0000
@@ -10,12 +10,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_breakpoint-move.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources, gBreakpoints, gBreakpointsAdded, gBreakpointsRemoving;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -25,7 +24,7 @@
     gBreakpointsRemoving = gBreakpoints._removing;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 1).then(performTest);
-    gDebuggee.ermahgerd();
+    callInTab(gTab, "ermahgerd");
   });
 
   function performTest() {
@@ -62,7 +61,7 @@
       yield resumeAndTestBreakpoint(20);
       yield doResume(gPanel);
 
-      executeSoon(() => gDebuggee.ermahgerd());
+      callInTab(gTab, "ermahgerd");
       yield waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES);
 
       yield resumeAndTestBreakpoint(20);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-actual-location.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,12 +9,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources, gBreakpoints, gBreakpointsAdded, gBreakpointsRemoving;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -24,7 +23,7 @@
     gBreakpointsRemoving = gBreakpoints._removing;
 
     waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest);
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 
   function performTest() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js	2014-11-26 21:45:49.000000000 +0000
@@ -15,7 +15,7 @@
 
   let gPanel, gDebugger, gThreadClient, gEvents;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gThreadClient = gDebugger.gThreadClient;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gBreakpoints;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-button-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,12 +9,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gBreakpoints;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu-add.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources, gContextMenu, gBreakpoints, gBreakpointsAdded;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -29,7 +28,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 
   function performTest() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-contextmenu.js	2014-11-26 21:45:49.000000000 +0000
@@ -11,12 +11,11 @@
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gBreakpoints;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -95,13 +94,7 @@
     ok(isCaretPos(gPanel, 9),
       "The editor location is correct before pausing.");
 
-    // Spin the event loop before causing the debuggee to pause, to allow
-    // this function to return first.
-    executeSoon(() => {
-      EventUtils.sendMouseEvent({ type: "click" },
-        gDebuggee.document.querySelector("button"),
-        gDebuggee);
-    });
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
     return finished;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,7 +8,8 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
+    let gTab = aTab;
     let gDebugger = aPanel.panelWin;
     let gEvents = gDebugger.EVENTS;
     let gEditor = gDebugger.DebuggerView.editor;
@@ -66,7 +67,7 @@
         yield ensureSourceIs(aPanel, "-01.js");
         yield verifyView({ disabled: false, visible: true });
 
-        executeSoon(() => aDebuggee.firstCall());
+        callInTab(gTab, "firstCall");
         yield waitForDebuggerEvents(aPanel, gEvents.FETCHED_SCOPES);
         yield ensureSourceIs(aPanel, "-01.js");
         yield ensureCaretAt(aPanel, 5);
@@ -83,7 +84,7 @@
         yield ensureSourceIs(aPanel, "-02.js", true);
         yield verifyView({ disabled: false, visible: false });
 
-        executeSoon(() => aDebuggee.firstCall());
+        callInTab(gTab, "firstCall");
         yield waitForSourceAndCaretAndScopes(aPanel, "-01.js", 1);
         yield verifyView({ disabled: false, visible: true });
 
@@ -98,7 +99,7 @@
         yield ensureSourceIs(aPanel, "-02.js", true);
         yield verifyView({ disabled: true, visible: false });
 
-        executeSoon(() => aDebuggee.firstCall());
+        callInTab(gTab, "firstCall");
         yield waitForDebuggerEvents(aPanel, gEvents.FETCHED_SCOPES);
         yield ensureSourceIs(aPanel, "-02.js");
         yield ensureCaretAt(aPanel, 1);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-editor.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-editor.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-editor.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-editor.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,12 +9,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources, gBreakpoints, gBreakpointsAdded, gBreakpointsRemoving;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -24,7 +23,7 @@
     gBreakpointsRemoving = gBreakpoints._removing;
 
     waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest);
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 
   function performTest() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-highlight.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-highlight.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-highlight.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-highlight.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-new-script.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-new-script.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-new-script.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-new-script.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_inline-script.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
@@ -33,7 +32,7 @@
     });
   });
 
-  gDebuggee.runDebuggerStatement();
+  callInTab(gTab, "runDebuggerStatement");
 }
 
 function testResume() {
@@ -54,9 +53,7 @@
       });
     });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -84,7 +81,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-other-tabs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-other-tabs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-other-tabs.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-other-tabs.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,8 +9,8 @@
 const TAB_URL = EXAMPLE_URL + "doc_breakpoints-other-tabs.html";
 
 let test = Task.async(function* () {
-  const [tab1, debuggee1, panel1] = yield initDebugger(TAB_URL);
-  const [tab2, debuggee2, panel2] = yield initDebugger(TAB_URL);
+  const [tab1,, panel1] = yield initDebugger(TAB_URL);
+  const [tab2,, panel2] = yield initDebugger(TAB_URL);
 
   yield ensureSourceIs(panel1, "code_breakpoints-other-tabs.js", true);
 
@@ -22,7 +22,7 @@
   });
 
   const paused = waitForThreadEvents(panel2, "paused");
-  executeSoon(() => debuggee2.testCase());
+  callInTab(tab2, "testCase");
   const packet = yield paused;
 
   is(packet.why.type, "debuggerStatement",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-pane.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-pane.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-pane.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-pane.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,12 +9,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources, gBreakpoints, gBreakpointsAdded, gBreakpointsRemoving;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -24,7 +23,7 @@
     gBreakpointsRemoving = gBreakpoints._removing;
 
     waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest);
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 
   let breakpointsAdded = 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-reload.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-reload.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-reload.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-reload.js	2014-11-26 21:45:49.000000000 +0000
@@ -11,7 +11,7 @@
 let test = Task.async(function* () {
   requestLongerTimeout(4);
 
-  const [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+  const [tab,, panel] = yield initDebugger(TAB_URL);
 
   yield ensureSourceIs(panel, "doc_breakpoints-reload.html", true);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_clean-exit.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_clean-exit.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_clean-exit.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_clean-exit.js	2014-11-26 21:45:49.000000000 +0000
@@ -5,14 +5,13 @@
  * Test that closing a tab with the debugger in a paused state exits cleanly.
  */
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 
 const TAB_URL = EXAMPLE_URL + "doc_inline-debugger-statement.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
@@ -28,12 +27,11 @@
     return waitForDebuggerEvents(gPanel, gDebugger.EVENTS.AFTER_FRAMES_REFILLED);
   }).then(() => closeDebuggerAndFinish(gPanel, { whilePaused: true }));
 
-  gDebuggee.runDebuggerStatement();
+  callInTab(gTab, "runDebuggerStatement");
 }
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_closure-inspection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_closure-inspection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_closure-inspection.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_closure-inspection.js	2014-11-26 21:45:49.000000000 +0000
@@ -6,14 +6,12 @@
 // Test that inspecting a closure works as expected.
 
 function test() {
-  let gPanel, gTab, gDebuggee, gDebugger;
+  let gPanel, gTab, gDebugger;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
-    gDebuggee.gRecurseLimit = 2;
 
     waitForSourceShown(gPanel, ".html")
       .then(testClosure)
@@ -24,13 +22,7 @@
   });
 
   function testClosure() {
-    // Spin the event loop before causing the debuggee to pause, to allow
-    // this function to return first.
-    executeSoon(() => {
-      EventUtils.sendMouseEvent({ type: "click" },
-        gDebuggee.document.querySelector("button"),
-        gDebuggee);
-    });
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
     return waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES).then(() => {
       let gVars = gDebugger.DebuggerView.Variables;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,7 +9,7 @@
 
 function test() {
   Task.spawn(function() {
-    let [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+    let [tab,, panel] = yield initDebugger(TAB_URL);
     let win = panel.panelWin;
     let frames = win.DebuggerController.StackFrames;
     let framesView = win.DebuggerView.StackFrames;
@@ -45,8 +45,7 @@
         "Evaluating shouldn't work while the debuggee isn't paused.");
     }
 
-    // Allow this generator function to yield first.
-    executeSoon(() => debuggee.firstCall());
+    callInTab(tab, "firstCall");
     yield waitForSourceAndCaretAndScopes(panel, "-02.js", 1);
     checkView(0, 1, 1, [/secondCall/, 118]);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,7 +9,7 @@
 
 function test() {
   Task.spawn(function() {
-    let [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+    let [tab,, panel] = yield initDebugger(TAB_URL);
     let win = panel.panelWin;
     let frames = win.DebuggerController.StackFrames;
     let framesView = win.DebuggerView.StackFrames;
@@ -38,7 +38,7 @@
     is(sources._cache.size, 2, "There should be two cached sources in the cache.");
 
     // Allow this generator function to yield first.
-    executeSoon(() => debuggee.firstCall());
+    callInTab(tab, "firstCall");
     yield waitForSourceAndCaretAndScopes(panel, "-02.js", 1);
     checkView(0, 1, 1, [/secondCall/, 118]);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_debugger-statement.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_debugger-statement.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_debugger-statement.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_debugger-statement.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,6 +8,7 @@
 const TAB_URL = EXAMPLE_URL + "doc_inline-debugger-statement.html";
 
 let gClient;
+let gTab;
 
 function test() {
   if (!DebuggerServer.initialized) {
@@ -22,7 +23,10 @@
       "Root actor should identify itself as a browser.");
 
     addTab(TAB_URL)
-      .then(() => attachTabActorForUrl(gClient, TAB_URL))
+      .then((aTab) => {
+        gTab = aTab;
+        return attachTabActorForUrl(gClient, TAB_URL)
+      })
       .then(testEarlyDebuggerStatement)
       .then(testDebuggerStatement)
       .then(closeConnection)
@@ -45,8 +49,7 @@
 
   // This should continue without nesting an event loop and calling
   // the onPaused hook, because we haven't attached yet.
-  let debuggee = gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
-  debuggee.runDebuggerStatement();
+  callInTab(gTab, "runDebuggerStatement");
 
   gClient.removeListener("paused", onPaused);
 
@@ -72,8 +75,7 @@
   });
 
   // Reach around the debugging protocol and execute the debugger statement.
-  let debuggee = gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
-  debuggee.runDebuggerStatement();
+  callInTab(gTab, "runDebuggerStatement");
 }
 
 function closeConnection() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_editor-contextmenu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_editor-contextmenu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_editor-contextmenu.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_editor-contextmenu.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gSources, gContextMenu;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -21,7 +20,7 @@
     gContextMenu = gDebugger.document.getElementById("sourceEditorContextMenu");
 
     waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest).then(null, info);
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 
   function performTest() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_editor-mode.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_editor-mode.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_editor-mode.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_editor-mode.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_editor-mode.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -29,7 +28,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -85,7 +84,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,6 +8,7 @@
 const TAB_URL = EXAMPLE_URL + "doc_event-listeners-01.html";
 
 let gClient;
+let gTab;
 
 function test() {
   if (!DebuggerServer.initialized) {
@@ -22,7 +23,10 @@
       "Root actor should identify itself as a browser.");
 
     addTab(TAB_URL)
-      .then(() => attachThreadActorForUrl(gClient, TAB_URL))
+      .then((aTab) => {
+        gTab = aTab;
+        return attachThreadActorForUrl(gClient, TAB_URL)
+      })
       .then(pauseDebuggee)
       .then(testEventListeners)
       .then(closeConnection)
@@ -45,13 +49,7 @@
     deferred.resolve(aThreadClient);
   });
 
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    EventUtils.sendMouseEvent({ type: "click" },
-      content.document.querySelector("button"),
-      content);
-  });
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   return deferred.promise;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,6 +9,7 @@
 const TAB_URL = EXAMPLE_URL + "doc_event-listeners-03.html";
 
 let gClient;
+let gTab;
 
 function test() {
   if (!DebuggerServer.initialized) {
@@ -23,7 +24,10 @@
       "Root actor should identify itself as a browser.");
 
     addTab(TAB_URL)
-      .then(() => attachThreadActorForUrl(gClient, TAB_URL))
+      .then((aTab) => {
+        gTab = aTab;
+        return attachThreadActorForUrl(gClient, TAB_URL);
+      })
       .then(pauseDebuggee)
       .then(testEventListeners)
       .then(closeConnection)
@@ -46,13 +50,7 @@
     deferred.resolve(aThreadClient);
   });
 
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    EventUtils.sendMouseEvent({ type: "click" },
-      content.document.querySelector("button"),
-      content);
-  });
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   return deferred.promise;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_event-listeners-03.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,6 +9,7 @@
 const TAB_URL = EXAMPLE_URL + "doc_native-event-handler.html";
 
 let gClient;
+let gTab;
 
 function test() {
   if (!DebuggerServer.initialized) {
@@ -23,7 +24,10 @@
       "Root actor should identify itself as a browser.");
 
     addTab(TAB_URL)
-      .then(() => attachThreadActorForUrl(gClient, TAB_URL))
+      .then((aTab) => {
+        gTab = aTab;
+        return attachThreadActorForUrl(gClient, TAB_URL)
+      })
       .then(pauseDebuggee)
       .then(testEventListeners)
       .then(closeConnection)
@@ -46,13 +50,7 @@
     deferred.resolve(aThreadClient);
   });
 
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    EventUtils.sendMouseEvent({ type: "click" },
-      content.document.querySelector("button"),
-      content);
-  });
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   return deferred.promise;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_file-reload.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_file-reload.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_file-reload.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_file-reload.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,7 +9,7 @@
 const JS_URL = EXAMPLE_URL + "sjs_random-javascript.sjs";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let gDebugger = aPanel.panelWin;
     let gEditor = gDebugger.DebuggerView.editor;
     let gSources = gDebugger.DebuggerView.Sources;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_function-display-name.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_function-display-name.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_function-display-name.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_function-display-name.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_function-display-name.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
@@ -35,7 +34,7 @@
     testInferredName();
   });
 
-  gDebuggee.evalCall();
+  callInTab(gTab, "evalCall");
 }
 
 function testInferredName() {
@@ -57,7 +56,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_global-method-override.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_global-method-override.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_global-method-override.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_global-method-override.js	2014-11-26 21:45:49.000000000 +0000
@@ -10,7 +10,7 @@
 const TAB_URL = EXAMPLE_URL + "doc_global-method-override.html";
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let gDebugger = aPanel.panelWin;
     ok(gDebugger, "Should have a debugger available.");
     is(gDebugger.gThreadClient.state, "attached", "Debugger should be attached.");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,16 +9,15 @@
 const TAB_URL = EXAMPLE_URL + "doc_same-line-functions.html";
 const CODE_URL = "code_same-line-functions.js";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor;
 
 function test() {
   Task.async(function* () {
     yield pushPrefs(["devtools.debugger.tracer", true]);
 
-    initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+    initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
       gTab = aTab;
-      gDebuggee = aDebuggee;
       gPanel = aPanel;
       gDebugger = gPanel.panelWin;
       gEditor = gDebugger.DebuggerView.editor;
@@ -44,9 +43,7 @@
 }
 
 function clickButton() {
-  EventUtils.sendMouseEvent({ type: "click" },
-                            gDebuggee.document.querySelector("button"),
-                            gDebuggee);
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 }
 
 function testHitCounts() {
@@ -58,8 +55,7 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
-});
\ No newline at end of file
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_hit-counts-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,16 +8,15 @@
 const TAB_URL = EXAMPLE_URL + "doc_same-line-functions.html";
 const CODE_URL = "code_same-line-functions.js";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor;
 
 function test() {
   Task.async(function* () {
     yield pushPrefs(["devtools.debugger.tracer", true]);
 
-    initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+    initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
       gTab = aTab;
-      gDebuggee = aDebuggee;
       gPanel = aPanel;
       gDebugger = gPanel.panelWin;
       gEditor = gDebugger.DebuggerView.editor;
@@ -46,9 +45,7 @@
 }
 
 function clickButton() {
-  EventUtils.sendMouseEvent({ type: "click" },
-                            gDebuggee.document.querySelector("button"),
-                            gDebuggee);
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 }
 
 function testHitCountsBeforeStopping() {
@@ -63,8 +60,7 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
-});
\ No newline at end of file
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_host-layout.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_host-layout.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_host-layout.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_host-layout.js	2014-11-26 21:45:49.000000000 +0000
@@ -27,14 +27,14 @@
 
   return Task.spawn(function() {
     let [tab, debuggee, panel] = yield initDebugger("about:blank");
-    yield testHost(tab, debuggee, panel, firstHost, firstLayout);
-    yield switchAndTestHost(tab, debuggee, panel, secondHost, secondLayout);
-    yield switchAndTestHost(tab, debuggee, panel, thirdHost, thirdLayout);
+    yield testHost(tab, panel, firstHost, firstLayout);
+    yield switchAndTestHost(tab, panel, secondHost, secondLayout);
+    yield switchAndTestHost(tab, panel, thirdHost, thirdLayout);
     yield teardown(panel);
   });
 }
 
-function switchAndTestHost(aTab, aDebuggee, aPanel, aHostType, aLayoutType) {
+function switchAndTestHost(aTab, aPanel, aHostType, aLayoutType) {
   let gToolbox = aPanel._toolbox;
   let gDebugger = aPanel.panelWin;
 
@@ -48,7 +48,7 @@
     yield layoutChanged;
     ok(true, "The debugger's layout has changed.");
 
-    yield testHost(aTab, aDebuggee, aPanel, aHostType, aLayoutType);
+    yield testHost(aTab, aPanel, aHostType, aLayoutType);
   });
 
   function once(aTarget, aEvent) {
@@ -58,7 +58,7 @@
   }
 }
 
-function testHost(aTab, aDebuggee, aPanel, aHostType, aLayoutType) {
+function testHost(aTab, aPanel, aHostType, aLayoutType) {
   let gDebugger = aPanel.panelWin;
   let gView = gDebugger.DebuggerView;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_instruments-pane-collapse.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_instruments-pane-collapse.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_instruments-pane-collapse.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_instruments-pane-collapse.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gPrefs, gOptions;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gPrefs = gDebugger.Prefs;
@@ -146,7 +145,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gPrefs = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_interrupts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_interrupts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_interrupts.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_interrupts.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gBreakpoints, gTarget, gResumeButton, gResumeKey, gThreadClient;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-01-simple.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-01-simple.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-01-simple.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-01-simple.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -21,7 +20,7 @@
     gFrames = gDebugger.DebuggerView.StackFrames;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 14).then(performTest);
-    gDebuggee.simpleCall();
+    callInTab(gTab, "simpleCall");
   });
 }
 
@@ -62,7 +61,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-02-blank.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-02-blank.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-02-blank.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_location-changes-02-blank.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -21,7 +20,7 @@
     gFrames = gDebugger.DebuggerView.StackFrames;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 14).then(testLocationChange);
-    gDebuggee.simpleCall();
+    callInTab(gTab, "simpleCall");
   });
 }
 
@@ -53,7 +52,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-highlight.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-highlight.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-highlight.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-highlight.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gToolbox, gToolboxTab;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gToolbox = gPanel._toolbox;
@@ -69,7 +68,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gToolbox = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_on-pause-raise.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gNewTab, gFocusedWindow, gToolbox, gToolboxTab;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gToolbox = gPanel._toolbox;
@@ -132,7 +131,6 @@
   Services.prefs.setCharPref("devtools.toolbox.host", devtools.Toolbox.HostType.BOTTOM);
 
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_optimized-out-vars.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_optimized-out-vars.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_optimized-out-vars.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_optimized-out-vars.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,7 +8,7 @@
     const TAB_URL = EXAMPLE_URL + "doc_closure-optimized-out.html";
     let gDebugger, sources;
 
-    let [, debuggee, panel] = yield initDebugger(TAB_URL);
+    let [tab,, panel] = yield initDebugger(TAB_URL);
     gDebugger = panel.panelWin;
     sources = gDebugger.DebuggerView.Sources;
 
@@ -18,11 +18,7 @@
 
     // Spin the event loop before causing the debuggee to pause, to allow
     // this function to return first.
-    executeSoon(() => {
-      EventUtils.sendMouseEvent({ type: "click" },
-        debuggee.document.querySelector("button"),
-        debuggee);
-    });
+    sendMouseClickToTab(tab, content.document.querySelector("button"));
 
     yield waitForDebuggerEvents(panel, gDebugger.EVENTS.FETCHED_SCOPES);
     let gVars = gDebugger.DebuggerView.Variables;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_panel-size.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_panel-size.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_panel-size.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_panel-size.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,12 +9,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gPrefs, gSources, gInstruments;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gPrefs = gDebugger.Prefs;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,14 +7,13 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_pause-exceptions.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gFrames, gVariables, gPrefs, gOptions;
 
 function test() {
   requestLongerTimeout(2);
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gFrames = gDebugger.DebuggerView.StackFrames;
@@ -78,9 +77,7 @@
     return finished;
   });
 
-  EventUtils.sendMouseEvent({ type: "click" },
-    gDebuggee.document.querySelector("button"),
-    gDebuggee);
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   return finished;
 }
@@ -151,9 +148,7 @@
     return finished;
   });
 
-  EventUtils.sendMouseEvent({ type: "click" },
-    gDebuggee.document.querySelector("button"),
-    gDebuggee);
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   return finished;
 }
@@ -236,7 +231,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gFrames = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-exceptions-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_pause-exceptions.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gFrames, gVariables, gPrefs, gOptions;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gFrames = gDebugger.DebuggerView.StackFrames;
@@ -105,13 +104,7 @@
     return finished;
   });
 
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee.window);
-  });
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   return finished;
 }
@@ -194,7 +187,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gFrames = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-resume.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-resume.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-resume.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-resume.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_pause-exceptions.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gResumeButton, gResumeKey, gFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gResumeButton = gDebugger.document.getElementById("resume");
@@ -69,7 +68,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gResumeButton = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-warning.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-warning.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_pause-warning.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_pause-warning.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_inline-script.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gTarget, gToolbox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gTarget = gPanel.target;
@@ -90,7 +89,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gTarget = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_progress-listener-bug.js	2014-11-26 21:45:49.000000000 +0000
@@ -6,7 +6,7 @@
  * WebProgress argument's DOMWindow property in onStateChange() (bug 771655).
  */
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gOldListener;
 
 const TAB_URL = EXAMPLE_URL + "doc_inline-script.html";
@@ -14,9 +14,8 @@
 function test() {
   installListener();
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
@@ -37,7 +36,7 @@
     resumeDebuggerThenCloseAndFinish(gPanel);
   });
 
-  gDebuggee.runDebuggerStatement();
+  callInTab(gTab, "runDebuggerStatement");
 }
 
 // This is taken almost verbatim from bug 771655.
@@ -80,7 +79,6 @@
   }
 
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gOldListener = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,13 +9,12 @@
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 const PREFERRED_URL = EXAMPLE_URL + "code_script-switching-02.js";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -39,7 +38,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_reload-preferred-script-03.js	2014-11-26 21:45:49.000000000 +0000
@@ -10,13 +10,12 @@
 const FIRST_URL = EXAMPLE_URL + "code_script-switching-01.js";
 const SECOND_URL = EXAMPLE_URL + "code_script-switching-02.js";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -52,7 +51,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_reload-same-script.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_reload-same-script.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_reload-same-script.js	2014-11-26 21:45:49.000000000 +0000
@@ -13,12 +13,11 @@
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gStep;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = aPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -32,7 +31,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -187,7 +186,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-02.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -29,7 +28,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -176,7 +175,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_scripts-switching-03.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gView, gEditor, gL10N;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gView = gDebugger.DebuggerView;
@@ -43,7 +42,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gView = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-autofill-identifier.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-autofill-identifier.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-autofill-identifier.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-autofill-identifier.js	2014-11-26 21:45:49.000000000 +0000
@@ -10,7 +10,7 @@
 function test() {
   const TAB_URL = EXAMPLE_URL + "doc_function-search.html";
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     let Source = 'code_function-search-01.js';
     let Debugger = aPanel.panelWin;
     let Editor = Debugger.DebuggerView.editor;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gFiltering, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -309,7 +308,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -33,7 +32,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -116,7 +115,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-03.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -37,7 +36,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -112,7 +111,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-04.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-basic-04.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -123,7 +122,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSearchBox, gSearchBoxPanel;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSearchBox = gDebugger.DebuggerView.Filtering._searchbox;
@@ -28,7 +27,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -52,7 +51,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSearchBox = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-help-popup-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSearchBox, gSearchBoxPanel;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -34,7 +33,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -77,7 +76,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-parse.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-parse.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-parse.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_searchbox-parse.js	2014-11-26 21:45:49.000000000 +0000
@@ -6,7 +6,7 @@
  */
 
 function test() {
-  initDebugger("about:blank").then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger("about:blank").then(([aTab,, aPanel]) => {
     let filterView = aPanel.panelWin.DebuggerView.Filtering;
     let searchbox = aPanel.panelWin.DebuggerView.Filtering._searchbox;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchView, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -31,7 +30,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -264,7 +263,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchView, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -34,7 +33,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -208,7 +207,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-03.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchView, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -30,7 +29,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -96,7 +95,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-04.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-04.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchView, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -30,7 +29,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -84,7 +83,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-05.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-05.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-05.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-05.js	2014-11-26 21:45:49.000000000 +0000
@@ -9,13 +9,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchView, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -33,7 +32,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -146,7 +145,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-06.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-06.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-06.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-global-06.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchView, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -32,7 +31,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -111,7 +110,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-popup-jank.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-popup-jank.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-popup-jank.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-popup-jank.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_editor-mode.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSearchBox = gDebugger.DebuggerView.Filtering._searchbox;
@@ -111,7 +110,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSearchBox = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,16 +7,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources, gSearchView, gSearchBox;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(3);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -226,7 +225,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,16 +7,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_editor-mode.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources, gSourceUtils, gSearchView, gSearchBox;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(3);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -268,7 +267,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-sources-03.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_editor-mode.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources, gSearchBox;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -92,7 +91,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-symbols.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-symbols.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_search-symbols.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_search-symbols.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_function-search.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gSearchBox, gFilteredFunctions;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -459,7 +458,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_sources-labels.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_sources-labels.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_sources-labels.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_sources-labels.js	2014-11-26 21:45:49.000000000 +0000
@@ -8,12 +8,11 @@
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
 function test() {
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gSources, gUtils;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_sources-sorting.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_sources-sorting.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_sources-sorting.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_sources-sorting.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gSources, gUtils;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gSources = gDebugger.DebuggerView.Sources;
@@ -129,7 +128,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gSources = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-01.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,20 +7,19 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gFrames, gClassicFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gFrames = gDebugger.DebuggerView.StackFrames;
     gClassicFrames = gDebugger.DebuggerView.StackFramesClassicList;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 14).then(performTest);
-    gDebuggee.simpleCall();
+    callInTab(gTab, "simpleCall");
   });
 }
 
@@ -37,7 +36,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gFrames = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-02.js	2014-11-26 21:45:49.000000000 +0000
@@ -7,20 +7,19 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gFrames, gClassicFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gFrames = gDebugger.DebuggerView.StackFrames;
     gClassicFrames = gDebugger.DebuggerView.StackFramesClassicList;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 1).then(performTest);
-    gDebuggee.evalCall();
+    callInTab(gTab, "evalCall");
   });
 }
 
@@ -103,7 +102,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gFrames = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-04.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-04.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,20 +7,19 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gFrames, gClassicFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gFrames = gDebugger.DebuggerView.StackFrames;
     gClassicFrames = gDebugger.DebuggerView.StackFramesClassicList;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 1).then(performTest);
-    gDebuggee.evalCall();
+    callInTab(gTab, "evalCall");
   });
 }
 
@@ -46,7 +45,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gFrames = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-05.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-05.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-05.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-05.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gFrames, gClassicFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -32,7 +31,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -158,7 +157,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-06.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-06.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-06.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-06.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gFrames, gClassicFrames;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -23,7 +22,7 @@
     gClassicFrames = gDebugger.DebuggerView.StackFramesClassicList;
 
     waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest);
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -78,7 +77,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-07.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-07.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_stack-07.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_stack-07.js	2014-11-26 21:45:50.000000000 +0000
@@ -9,13 +9,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gEditor, gSources, gFrames, gClassicFrames, gToolbar;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
@@ -25,7 +24,7 @@
     gToolbar = gDebugger.DebuggerView.Toolbar;
 
     waitForSourceAndCaretAndScopes(gPanel, "-02.js", 1).then(performTest);
-    gDebuggee.firstCall();
+    callInTab(gTab, "firstCall");
   });
 }
 
@@ -98,7 +97,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gEditor = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_step-out.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_step-out.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_step-out.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_step-out.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_step-out.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVars;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVars = gDebugger.DebuggerView.Variables;
@@ -41,9 +40,7 @@
       gDebugger);
   });
 
-  EventUtils.sendMouseEvent({ type: "click" },
-    gDebuggee.document.getElementById("return"),
-    gDebuggee);
+  sendMouseClickToTab(gTab, content.document.getElementById("return"));
 }
 
 function testReturnWithException() {
@@ -65,9 +62,7 @@
       gDebugger);
   });
 
-  EventUtils.sendMouseEvent({ type: "click" },
-    gDebuggee.document.getElementById("throw"),
-    gDebuggee);
+  sendMouseClickToTab(gTab, content.document.getElementById("throw"));
 }
 
 function resumeDebuggee() {
@@ -78,7 +73,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVars = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_terminate-on-tab-close.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_terminate-on-tab-close.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_terminate-on-tab-close.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_terminate-on-tab-close.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,12 +7,11 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_terminate-on-tab-close.html";
 
-let gTab, gDebuggee, gDebugger, gPanel;
+let gTab, gDebugger, gPanel;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
@@ -27,12 +26,11 @@
     });
   });
 
-  gDebuggee.debuggerThenThrow();
+  callInTab(gTab, "debuggerThenThrow");
 }
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js	2014-11-26 21:45:50.000000000 +0000
@@ -5,13 +5,12 @@
  * Make sure that the variables view is keyboard accessible.
  */
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariablesView;
 
 function test() {
-  initDebugger("about:blank").then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger("about:blank").then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariablesView = gDebugger.DebuggerView.Variables;
@@ -504,7 +503,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariablesView = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-data.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-data.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-data.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-data.js	2014-11-26 21:45:50.000000000 +0000
@@ -6,13 +6,12 @@
  * when given some raw data.
  */
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariablesView, gScope, gVariable;
 
 function test() {
-  initDebugger("about:blank").then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger("about:blank").then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariablesView = gDebugger.DebuggerView.Variables;
@@ -602,7 +601,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariablesView = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-cancel.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-cancel.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-cancel.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-cancel.js	2014-11-26 21:45:50.000000000 +0000
@@ -10,14 +10,13 @@
 
 function test() {
   Task.spawn(function*() {
-    let [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+    let [tab,, panel] = yield initDebugger(TAB_URL);
     let win = panel.panelWin;
     let vars = win.DebuggerView.Variables;
 
     win.DebuggerView.WatchExpressions.addExpression("this");
 
-    // Allow this generator function to yield first.
-    executeSoon(() => debuggee.ermahgerd());
+    callInTab(tab, "ermahgerd");
     yield waitForDebuggerEvents(panel, win.EVENTS.FETCHED_WATCH_EXPRESSIONS);
 
     let exprScope = vars.getScopeAtIndex(0);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,16 +7,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gL10N, gEditor, gVars, gWatch;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gL10N = gDebugger.L10N;
@@ -115,9 +114,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -288,7 +285,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gL10N = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-getset-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,16 +8,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gL10N, gEditor, gVars, gWatch;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gL10N = gDebugger.L10N;
@@ -36,9 +35,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -94,7 +91,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gL10N = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-value.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-value.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-value.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-value.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVars;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVars = gDebugger.DebuggerView.Variables;
@@ -38,9 +37,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -82,7 +79,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVars = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-watch.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-watch.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-watch.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-edit-watch.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_watch-expressions.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gL10N, gEditor, gVars, gWatch;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gL10N = gDebugger.L10N;
@@ -44,7 +43,7 @@
       });
 
     addExpressions();
-    gDebuggee.ermahgerd();
+    callInTab(gTab, "ermahgerd");
   });
 }
 
@@ -494,7 +493,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gL10N = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-pref.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-pref.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-pref.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-pref.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gPrefs, gOptions, gVariables;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gPrefs = gDebugger.Prefs;
@@ -72,7 +71,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gPrefs = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-searchbox.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-searchbox.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-searchbox.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-filter-searchbox.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -139,7 +138,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,16 +8,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -30,9 +29,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -253,7 +250,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,16 +8,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -35,9 +34,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -543,7 +540,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-parameters-03.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,16 +8,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -32,9 +31,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -148,7 +145,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frame-with.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,13 +7,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -34,9 +33,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -204,7 +201,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-frozen-sealed-nonext.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,12 +8,11 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
@@ -24,7 +23,7 @@
 function prepareTest() {
   gDebugger.once(gDebugger.EVENTS.FETCHED_SCOPES, runTest);
 
-  gDebuggee.eval("(" + function() {
+  evalInTab(gTab, "(" + function() {
     var frozen = Object.freeze({});
     var sealed = Object.seal({});
     var nonExtensible = Object.preventExtensions({});
@@ -83,7 +82,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-hide-non-enums.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-hide-non-enums.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-hide-non-enums.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-hide-non-enums.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,17 +8,16 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
 
     waitForSourceAndCaretAndScopes(gPanel, ".html", 14).then(performTest);
-    gDebuggee.simpleCall();
+    callInTab(gTab, "simpleCall");
   });
 }
 
@@ -101,7 +100,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,13 +8,12 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_large-array-buffer.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables, gEllipsis;
 
 function test() {
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -29,9 +28,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -235,7 +232,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -10,13 +10,12 @@
 
 function test() {
   Task.spawn(function() {
-    let [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+    let [tab,, panel] = yield initDebugger(TAB_URL);
     let win = panel.panelWin;
     let events = win.EVENTS;
     let variables = win.DebuggerView.Variables;
 
-    // Allow this generator function to yield first.
-    executeSoon(() => debuggee.test());
+    callInTab(tab, "test");
     yield waitForSourceAndCaretAndScopes(panel, ".html", 23);
 
     let firstScope = variables.getScopeAtIndex(0);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -9,7 +9,7 @@
 
 function test() {
   Task.spawn(function() {
-    let [tab, debuggee, panel] = yield initDebugger(TAB_URL);
+    let [tab,, panel] = yield initDebugger(TAB_URL);
     let win = panel.panelWin;
     let events = win.EVENTS;
     let variables = win.DebuggerView.Variables;
@@ -18,8 +18,7 @@
     let committedLocalScopeHierarchy = promise.defer();
     variables.oncommit = committedLocalScopeHierarchy.resolve;
 
-    // Allow this generator function to yield first.
-    executeSoon(() => debuggee.test());
+    callInTab(tab, "test");
     yield waitForSourceAndCaretAndScopes(panel, ".html", 23);
     yield committedLocalScopeHierarchy.promise;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,16 +7,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gBreakpoints, gSources, gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(4);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
@@ -45,13 +44,7 @@
 }
 
 function pauseDebuggee() {
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
-  });
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   // The first 'with' scope should be expanded by default, but the
   // variables haven't been fetched yet. This is how 'with' scopes work.
@@ -200,7 +193,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gBreakpoints = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,16 +8,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_with-frame.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gBreakpoints, gSources, gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(4);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
@@ -46,13 +45,7 @@
 }
 
 function pauseDebuggee() {
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
-  });
+  sendMouseClickToTab(gTab, content.document.querySelector("button"));
 
   // The first 'with' scope should be expanded by default, but the
   // variables haven't been fetched yet. This is how 'with' scopes work.
@@ -215,7 +208,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gBreakpoints = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-reexpand-03.js	2014-11-26 21:45:50.000000000 +0000
@@ -7,16 +7,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_scope-variable-4.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gBreakpoints, gSources, gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(4);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gBreakpoints = gDebugger.DebuggerController.Breakpoints;
@@ -45,11 +44,7 @@
 }
 
 function pauseDebuggee() {
-  // Spin the event loop before causing the debuggee to pause, to allow
-  // this function to return first.
-  executeSoon(() => {
-    gDebuggee.test();
-  });
+  callInTab(gTab, "test");
 
   return waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES);
 }
@@ -120,7 +115,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gBreakpoints = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-webidl.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-webidl.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-webidl.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-webidl.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,16 +8,15 @@
 
 const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html";
 
-let gTab, gDebuggee, gPanel, gDebugger;
+let gTab, gPanel, gDebugger;
 let gVariables;
 
 function test() {
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gVariables = gDebugger.DebuggerView.Variables;
@@ -30,9 +29,7 @@
         ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
       });
 
-    EventUtils.sendMouseEvent({ type: "click" },
-      gDebuggee.document.querySelector("button"),
-      gDebuggee);
+    sendMouseClickToTab(gTab, content.document.querySelector("button"));
   });
 }
 
@@ -253,7 +250,6 @@
 
 registerCleanupFunction(function() {
   gTab = null;
-  gDebuggee = null;
   gPanel = null;
   gDebugger = null;
   gVariables = null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -11,12 +11,11 @@
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gEditor, gWatch, gVariables;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gEditor = gDebugger.DebuggerView.editor;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser_dbg_watch-expressions-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -11,12 +11,11 @@
   // Debug test slaves are a bit slow at this test.
   requestLongerTimeout(2);
 
-  let gTab, gDebuggee, gPanel, gDebugger;
+  let gTab, gPanel, gDebugger;
   let gWatch, gVariables;
 
-  initDebugger(TAB_URL).then(([aTab, aDebuggee, aPanel]) => {
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
     gTab = aTab;
-    gDebuggee = aDebuggee;
     gPanel = aPanel;
     gDebugger = gPanel.panelWin;
     gWatch = gDebugger.DebuggerView.WatchExpressions;
@@ -113,7 +112,7 @@
       aCallback();
     });
 
-    gDebuggee.test();
+    callInTab(gTab, "test");
   }
 
   function test2(aCallback) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/browser.ini	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/browser.ini	2014-11-26 21:45:49.000000000 +0000
@@ -98,25 +98,25 @@
   testactors.js
 
 [browser_dbg_aaa_run_first_leaktest.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_addonactor.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_addon-sources.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_addon-modules.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_addon-modules-unpacked.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_addon-panels.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_addon-console.js]
-skip-if = e10s || os == 'win' # bug 1005274
+skip-if = e10s && debug || os == 'win' # bug 1005274
 [browser_dbg_auto-pretty-print-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_auto-pretty-print-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_bfcache.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_blackboxing-01.js]
 skip-if = e10s && debug
 [browser_dbg_blackboxing-02.js]
@@ -130,9 +130,9 @@
 [browser_dbg_blackboxing-06.js]
 skip-if = e10s && debug
 [browser_dbg_breadcrumbs-access.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_break-on-dom-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_break-on-dom-02.js]
 skip-if = e10s && debug
 [browser_dbg_break-on-dom-03.js]
@@ -150,51 +150,51 @@
 [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
+skip-if = e10s # TODO
 [browser_dbg_breakpoints-actual-location.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-actual-location2.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js]
-skip-if = e10s
+skip-if = e10s # Bug 1093535
 [browser_dbg_breakpoints-button-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-button-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-contextmenu-add.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-contextmenu.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-disabled-reload.js]
-skip-if = e10s
+skip-if = e10s # Bug 1093535
 [browser_dbg_breakpoints-editor.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-highlight.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-new-script.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-other-tabs.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-pane.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_breakpoints-reload.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_chrome-create.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_chrome-debugging.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_clean-exit-window.js]
 skip-if = true # Bug 933950 (leaky test)
 [browser_dbg_clean-exit.js]
 skip-if = true # Bug 1044985 (racy test)
 [browser_dbg_closure-inspection.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_cmd-blackbox.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_cmd-break.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_cmd-dbg.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_conditional-breakpoints-01.js]
 skip-if = e10s && debug
 [browser_dbg_conditional-breakpoints-02.js]
@@ -212,73 +212,73 @@
 [browser_dbg_server-conditional-bp-04.js]
 skip-if = e10s && debug
 [browser_dbg_controller-evaluate-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_controller-evaluate-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_debugger-statement.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_editor-contextmenu.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_editor-mode.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_event-listeners-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_event-listeners-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_event-listeners-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_file-reload.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_function-display-name.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_global-method-override.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_globalactor.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_hide-toolbar-buttons.js]
 skip-if = e10s
 [browser_dbg_hit-counts-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_hit-counts-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_host-layout.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_iframes.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_instruments-pane-collapse.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_interrupts.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_listaddons.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_listtabs-01.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_listtabs-02.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_listtabs-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_location-changes-01-simple.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_location-changes-02-blank.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_location-changes-03-new.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_location-changes-04-breakpoint.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_multiple-windows.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_navigation.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_no-page-sources.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_on-pause-highlight.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_on-pause-raise.js]
-skip-if = e10s || os == "linux" || e10s # Bug 888811 & bug 891176
+skip-if = e10s && debug || os == "linux" # Bug 888811 & bug 891176
 [browser_dbg_optimized-out-vars.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_panel-size.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_parser-01.js]
 skip-if = e10s && debug
 [browser_dbg_parser-02.js]
@@ -300,13 +300,13 @@
 [browser_dbg_parser-10.js]
 skip-if = e10s && debug
 [browser_dbg_pause-exceptions-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_pause-exceptions-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_pause-resume.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_pause-warning.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_paused-keybindings.js]
 skip-if = e10s
 [browser_dbg_pretty-print-01.js]
@@ -338,59 +338,59 @@
 [browser_dbg_pretty-print-on-paused.js]
 skip-if = e10s && debug
 [browser_dbg_progress-listener-bug.js]
-skip-if = e10s
+skip-if = e10a && debug
 [browser_dbg_reload-preferred-script-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_reload-preferred-script-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_reload-preferred-script-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_reload-same-script.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_scripts-switching-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_scripts-switching-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_scripts-switching-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-autofill-identifier.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-basic-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-basic-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-basic-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-basic-04.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-global-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-global-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-global-03.js]
-skip-if = e10s
+skip-if = e10s # Bug 1093535
 [browser_dbg_search-global-04.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-global-05.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-global-06.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-popup-jank.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-sources-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-sources-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-sources-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_search-symbols.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_searchbox-help-popup-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_searchbox-help-popup-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_searchbox-parse.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_source-maps-01.js]
 skip-if = e10s && debug
 [browser_dbg_source-maps-02.js]
@@ -400,35 +400,35 @@
 [browser_dbg_source-maps-04.js]
 skip-if = e10s # Bug 1093535
 [browser_dbg_sources-cache.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_sources-labels.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_sources-sorting.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_split-console-paused-reload.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_stack-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_stack-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_stack-03.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_stack-04.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_stack-05.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_stack-06.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_stack-07.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_step-out.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_tabactor-01.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_tabactor-02.js]
-skip-if = e10s
+skip-if = e10s # TODO
 [browser_dbg_terminate-on-tab-close.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_tracing-01.js]
 skip-if = e10s && debug
 [browser_dbg_tracing-02.js]
@@ -458,21 +458,21 @@
 [browser_dbg_variables-view-06.js]
 skip-if = e10s && debug
 [browser_dbg_variables-view-accessibility.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-data.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-edit-cancel.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-edit-click.js]
 skip-if = e10s || (os == 'mac' || os == 'win') && (debug == false) # Bug 986166
 [browser_dbg_variables-view-edit-getset-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-edit-getset-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-edit-value.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-edit-watch.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-filter-01.js]
 skip-if = e10s && debug
 [browser_dbg_variables-view-filter-02.js]
@@ -484,27 +484,27 @@
 [browser_dbg_variables-view-filter-05.js]
 skip-if = e10s && debug
 [browser_dbg_variables-view-filter-pref.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-filter-searchbox.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-frame-parameters-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-frame-parameters-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-frame-parameters-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-frame-with.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-frozen-sealed-nonext.js]
-skip-if = e10s || buildapp == 'mulet'
+skip-if = e10s && debug || buildapp == 'mulet'
 [browser_dbg_variables-view-hide-non-enums.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-large-array-buffer.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-override-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-override-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-popup-01.js]
 skip-if = e10s && debug
 [browser_dbg_variables-view-popup-02.js]
@@ -532,20 +532,20 @@
 [browser_dbg_variables-view-popup-13.js]
 skip-if = e10s && debug
 [browser_dbg_variables-view-popup-14.js]
-skip-if = e10s && debug
+skip-if = (e10s && debug) || (e10s && os == 'linux') # Linux e10s - bug 1029545
 [browser_dbg_variables-view-popup-15.js]
 skip-if = e10s && debug
 [browser_dbg_variables-view-popup-16.js]
 skip-if = e10s  && debug
 [browser_dbg_variables-view-reexpand-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-reexpand-02.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-reexpand-03.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_variables-view-webidl.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_watch-expressions-01.js]
-skip-if = e10s
+skip-if = e10s && debug
 [browser_dbg_watch-expressions-02.js]
-skip-if = e10s
+skip-if = e10s && debug
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/code_frame-script.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/code_frame-script.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/code_frame-script.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/code_frame-script.js	2014-11-26 21:45:50.000000000 +0000
@@ -24,3 +24,10 @@
   EventUtils.synthesizeMouseAtCenter(target, {},
                                      target.ownerDocument.defaultView);
 });
+
+addMessageListener("test:eval", function (message) {
+  dump("Evalling string " + message.data.string + ".\n");
+
+  content.eval(message.data.string);
+  sendAsyncMessage("test:eval");
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/debugger/test/head.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/debugger/test/head.js	2014-11-26 21:45:50.000000000 +0000
@@ -567,11 +567,7 @@
     let addonActor = yield getAddonActorForUrl(this.client, aUrl);
 
     let targetOptions = {
-      form: {
-        addonActor: addonActor.actor,
-        consoleActor: addonActor.consoleActor,
-        title: addonActor.name
-      },
+      form: addonActor,
       client: this.client,
       chrome: true
     };
@@ -970,6 +966,15 @@
   waitForMessageFromTab(tab, "test:call");
 }
 
+function evalInTab(tab, string) {
+  info("Evalling string " + string + " in tab.");
+
+  sendMessageToTab(tab, "test:eval", {
+    string: string,
+  });
+  waitForMessageFromTab(tab, "test:eval");
+}
+
 function sendMouseClickToTab(tab, target) {
   info("Sending mouse click to tab.");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/connect/connect.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/connect/connect.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/connect/connect.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/connect/connect.js	2014-11-26 21:45:50.000000000 +0000
@@ -154,7 +154,7 @@
 function buildAddonLink(addon, parent) {
   let a = document.createElement("a");
   a.onclick = function() {
-    openToolbox({ addonActor: addon.actor, title: addon.name }, true, "jsdebugger");
+    openToolbox(addon, true, "jsdebugger");
   }
 
   a.textContent = addon.name;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/gDevTools.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/gDevTools.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/gDevTools.jsm	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/gDevTools.jsm	2014-11-26 21:45:50.000000000 +0000
@@ -780,7 +780,7 @@
 
   isWebIDEWidgetInstalled: function() {
     let widgetWrapper = CustomizableUI.getWidget("webide-button");
-    return !!(widgetWrapper && widgetWrapper.instances.some(i => !!i.node));
+    return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
   },
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/options-panel.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/options-panel.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/options-panel.css	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/options-panel.css	2014-11-26 21:45:50.000000000 +0000
@@ -26,6 +26,11 @@
   -moz-padding-start: 5px;
 }
 
+#devtools-theme-box {
+  margin-left: 0px;
+  padding-left: 0px;
+}
+
 /* Snap to 50% width once there is not room for 3 columns anymore.
    This prevents having 2 columns showing in a row, but taking up
    only ~66% of the available space. */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/selection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/selection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/selection.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/selection.js	2014-11-26 21:45:50.000000000 +0000
@@ -251,7 +251,7 @@
 
   isHTMLNode: function() {
     let xhtml_ns = "http://www.w3.org/1999/xhtml";
-    return this.isNode() && this.node.namespaceURI == xhtml_ns;
+    return this.isNode() && this.nodeFront.namespaceURI == xhtml_ns;
   },
 
   // Node type
@@ -300,6 +300,24 @@
     return this.isNode() && this.nodeFront.nodeType == Ci.nsIDOMNode.DOCUMENT_NODE;
   },
 
+  /**
+   * @returns true if the selection is the <body> HTML element.
+   */
+  isBodyNode: function() {
+    return this.isHTMLNode() &&
+           this.isConnected() &&
+           this.nodeFront.nodeName === "BODY";
+  },
+
+  /**
+   * @returns true if the selection is the <head> HTML element.
+   */
+  isHeadNode: function() {
+    return this.isHTMLNode() &&
+           this.isConnected() &&
+           this.nodeFront.nodeName === "HEAD";
+  },
+
   isDocumentTypeNode: function() {
     return this.isNode() && this.nodeFront.nodeType == Ci.nsIDOMNode.DOCUMENT_TYPE_NODE;
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/target.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/target.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/target.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/target.js	2014-11-26 21:45:50.000000000 +0000
@@ -280,6 +280,13 @@
     if (!this.client) {
       throw new Error("TabTarget#getTrait() can only be called on remote tabs.");
     }
+
+    // If the targeted actor exposes traits and has a defined value for this traits,
+    // override the root actor traits
+    if (this.form.traits && traitName in this.form.traits) {
+      return this.form.traits[traitName];
+    }
+
     return this.client.traits[traitName];
   },
 
@@ -323,9 +330,13 @@
   },
 
   get name() {
-    return this._tab && this._tab.linkedBrowser.contentDocument ?
-           this._tab.linkedBrowser.contentDocument.title :
-           this._form.title;
+    if (this._tab && this._tab.linkedBrowser.contentDocument) {
+      return this._tab.linkedBrowser.contentDocument.title
+    } else if (this.isAddon) {
+      return this._form.name;
+    } else {
+      return this._form.title;
+    }
   },
 
   get url() {
@@ -338,7 +349,8 @@
   },
 
   get isAddon() {
-    return !!(this._form && this._form.addonActor);
+    return !!(this._form && this._form.actor &&
+              this._form.actor.match(/conn\d+\.addon\d+/));
   },
 
   get isLocalTab() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/test/browser_devtools_api.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/test/browser_devtools_api.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/test/browser_devtools_api.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/test/browser_devtools_api.js	2014-11-26 21:45:50.000000000 +0000
@@ -4,10 +4,13 @@
 ///////////////////
 //
 // Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed.
+// As part of bug 1077403, the leaking uncaught rejections should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.docShell is null");
 
+// When running in a standalone directory, we get this error
+thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.doc is undefined");
+
 // Tests devtools API
 
 const Cu = Components.utils;
@@ -76,7 +79,10 @@
 
     gDevTools.unregisterTool(toolId1);
 
-    runTests2();
+    // Wait for unregisterTool to select the next tool before calling runTests2,
+    // otherwise we will receive the wrong select event when waiting for
+    // unregisterTool to select the next tool in continueTests below.
+    toolbox.once("select", runTests2);
   });
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/test/browser.ini	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/test/browser.ini	2014-11-26 21:45:50.000000000 +0000
@@ -22,6 +22,7 @@
 [browser_toolbox_highlight.js]
 [browser_toolbox_hosts.js]
 [browser_toolbox_options.js]
+[browser_toolbox_options_devedition.js]
 [browser_toolbox_options_disable_buttons.js]
 [browser_toolbox_options_disable_cache.js]
 skip-if = e10s # Bug 1030318
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/test/browser_toolbox_options_devedition.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/test/browser_toolbox_options_devedition.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/test/browser_toolbox_options_devedition.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/test/browser_toolbox_options_devedition.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that changing preferences in the options panel updates the prefs
+// and toggles appropriate things in the toolbox.
+
+let doc = null, toolbox = null, panelWin = null;
+
+const PREF_ENABLED = "browser.devedition.theme.enabled";
+const PREF_SHOW = "browser.devedition.theme.showCustomizeButton";
+
+const URL = "data:text/html;charset=utf8,test for toggling dev edition browser theme toggling";
+
+let test = asyncTest(function*() {
+  // Set preference to false by default so this could
+  // run in Developer Edition which has it on by default.
+  Services.prefs.setBoolPref(PREF_ENABLED, false);
+  Services.prefs.setBoolPref(PREF_SHOW, true);
+
+  let tab = yield addTab(URL);
+  let target = TargetFactory.forTab(tab);
+  toolbox = yield gDevTools.showToolbox(target);
+  let tool = yield toolbox.selectTool("options");
+  panelWin = tool.panelWin;
+
+  let checkbox = tool.panelDoc.getElementById("devtools-browser-theme");
+
+  ise(Services.prefs.getBoolPref(PREF_ENABLED), false, "Dev Theme pref off on start");
+
+  let themeStatus = yield clickAndWaitForThemeChange(checkbox, panelWin);
+  ise(themeStatus, true, "Theme has been toggled on.");
+
+  themeStatus = yield clickAndWaitForThemeChange(checkbox, panelWin);
+  ise(themeStatus, false, "Theme has been toggled off.");
+
+  yield cleanup();
+});
+
+function clickAndWaitForThemeChange (el, win) {
+  let deferred = promise.defer();
+  gDevTools.on("pref-changed", function handler (event, {pref}) {
+    if (pref === PREF_ENABLED) {
+      gDevTools.off("pref-changed", handler);
+      deferred.resolve(Services.prefs.getBoolPref(PREF_ENABLED));
+    }
+  });
+
+  EventUtils.synthesizeMouseAtCenter(el, {}, win);
+
+  return deferred.promise;
+}
+
+function* cleanup() {
+  yield toolbox.destroy();
+  gBrowser.removeCurrentTab();
+  Services.prefs.clearUserPref(PREF_ENABLED);
+  Services.prefs.clearUserPref(PREF_SHOW);
+  toolbox = doc = panelWin = null;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox.js	2014-11-26 21:45:50.000000000 +0000
@@ -53,11 +53,12 @@
 // (By default, supported target is only local tab)
 const ToolboxButtons = [
   { id: "command-button-pick",
-    isTargetSupported: target => !target.isAddon },
+    isTargetSupported: target =>
+      target.getTrait("highlightable")
+  },
   { id: "command-button-frames",
-    isTargetSupported: target => (
-      !target.isAddon && target.activeTab && target.activeTab.traits.frames
-    )
+    isTargetSupported: target =>
+      ( target.activeTab && target.activeTab.traits.frames )
   },
   { id: "command-button-splitconsole",
     isTargetSupported: target => !target.isAddon },
@@ -1249,12 +1250,15 @@
       toolName = toolboxStrings("toolbox.defaultTitle");
     }
     let title = toolboxStrings("toolbox.titleTemplate",
-                               toolName, this.target.url || this.target.name);
+                               toolName,
+                               this.target.isAddon ?
+                               this.target.name :
+                               this.target.url || this.target.name);
     this._host.setTitle(title);
   },
 
   _listFrames: function (event) {
-    if (!this._target.form || !this._target.form.actor) {
+    if (!this._target.activeTab || !this._target.activeTab.traits.frames) {
       // We are not targetting a regular TabActor
       // it can be either an addon or browser toolbox actor
       return promise.resolve();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox-options.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox-options.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox-options.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox-options.js	2014-11-26 21:45:50.000000000 +0000
@@ -9,6 +9,9 @@
 const promise = require("promise");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "CustomizeMode", "resource:///modules/CustomizeMode.jsm");
+const kDeveditionChangedNotification = "devedition-theme-state-changed";
+const DEVEDITION_THEME_PREF = "browser.devedition.theme.enabled";
 
 exports.OptionsPanel = OptionsPanel;
 
@@ -71,6 +74,7 @@
 function OptionsPanel(iframeWindow, toolbox) {
   this.panelDoc = iframeWindow.document;
   this.panelWin = iframeWindow;
+
   this.toolbox = toolbox;
   this.isReady = false;
 
@@ -80,6 +84,7 @@
 
   this._addListeners();
 
+  Services.obs.addObserver(this, kDeveditionChangedNotification, false);
   const EventEmitter = require("devtools/toolkit/event-emitter");
   EventEmitter.decorate(this);
 }
@@ -104,6 +109,7 @@
       this.setupToolsList();
       this.setupToolbarButtonsList();
       this.setupThemeList();
+      this.setupBrowserThemeButton();
       this.populatePreferences();
       this.updateDefaultTheme();
 
@@ -142,6 +148,8 @@
     }
     else if (data.pref === "devtools.theme") {
       this.updateCurrentTheme();
+    } else if (data.pref === "browser.devedition.theme.enabled") {
+      this.updateBrowserTheme();
     }
   },
 
@@ -277,18 +285,58 @@
     this.updateCurrentTheme();
   },
 
+  /**
+   * Similar to `populatePrefs`, except we want more
+   * special rules for the browser theme button.
+   */
+  setupBrowserThemeButton: function() {
+    let checkbox = this.panelDoc.getElementById("devtools-browser-theme");
+
+    checkbox.addEventListener("command", function() {
+      setPrefAndEmit(DEVEDITION_THEME_PREF, this.checked);
+    }.bind(checkbox));
+
+    this.updateBrowserThemeButton();
+  },
+
+  /**
+   * Called on theme changed via observer of "devedition-theme-state-changed".
+   */
+  updateBrowserThemeButton: function() {
+    let checkbox = this.panelDoc.getElementById("devtools-browser-theme");
+
+    // Check if the dev edition style sheet is applied -- will not
+    // be applied when dev edition theme is disabled, or when there's
+    // a LWT applied.
+    if (this._isDevEditionThemeOn()) {
+      checkbox.setAttribute("checked", "true");
+    } else {
+      checkbox.removeAttribute("checked");
+    }
+
+    // Should the button be shown
+    if (GetPref("browser.devedition.theme.showCustomizeButton")) {
+      checkbox.removeAttribute("hidden");
+    } else {
+      checkbox.setAttribute("hidden", "true");
+    }
+  },
+
+  /**
+   * Called when clicking the browser theme button to enable/disable
+   * the dev edition browser theme.
+   */
+  updateBrowserTheme: function() {
+    let enabled = GetPref("browser.devedition.theme.enabled");
+    CustomizeMode.prototype.toggleDevEditionTheme.call(this, enabled);
+  },
+
   populatePreferences: function() {
     let prefCheckboxes = this.panelDoc.querySelectorAll("checkbox[data-pref]");
     for (let checkbox of prefCheckboxes) {
       checkbox.checked = GetPref(checkbox.getAttribute("data-pref"));
       checkbox.addEventListener("command", function() {
-        let data = {
-          pref: this.getAttribute("data-pref"),
-          newValue: this.checked
-        };
-        data.oldValue = GetPref(data.pref);
-        SetPref(data.pref, data.newValue);
-        gDevTools.emit("pref-changed", data);
+        setPrefAndEmit(this.getAttribute("data-pref"), this.checked);
       }.bind(checkbox));
     }
     let prefRadiogroups = this.panelDoc.querySelectorAll("radiogroup[data-pref]");
@@ -302,17 +350,7 @@
         }
       }
       radiogroup.addEventListener("select", function() {
-        let data = {
-          pref: this.getAttribute("data-pref"),
-          newValue: this.selectedItem.getAttribute("value")
-        };
-
-        data.oldValue = GetPref(data.pref);
-        SetPref(data.pref, data.newValue);
-
-        if (data.newValue != data.oldValue) {
-          gDevTools.emit("pref-changed", data);
-        }
+        setPrefAndEmit(this.getAttribute("data-pref"), this.selectedItem.getAttribute("value"));
       }.bind(radiogroup));
     }
     let prefMenulists = this.panelDoc.querySelectorAll("menulist[data-pref]");
@@ -327,13 +365,7 @@
         }
       }
       menulist.addEventListener("command", function() {
-        let data = {
-          pref: this.getAttribute("data-pref"),
-          newValue: this.value
-        };
-        data.oldValue = GetPref(data.pref);
-        SetPref(data.pref, data.newValue);
-        gDevTools.emit("pref-changed", data);
+        setPrefAndEmit(this.getAttribute("data-pref"), this.value);
       }.bind(menulist));
     }
 
@@ -388,6 +420,25 @@
     this.target.activeTab.reconfigure(options);
   },
 
+  /**
+   * Returns a boolean indicating whether or not the dev edition
+   * browser theme is applied.
+   */
+  _isDevEditionThemeOn: function() {
+    let win = Services.wm.getMostRecentWindow("navigator:browser");
+    return !!(win && win.DevEdition.styleSheet);
+  },
+
+  /**
+   * Called on observer notification for "devedition-theme-state-changed"
+   * to possibly change the state of the dev edition button
+   */
+  observe: function(aSubject, aTopic, aData) {
+    if (aTopic === kDeveditionChangedNotification) {
+      this.updateBrowserThemeButton();
+    }
+  },
+
   destroy: function() {
     if (this.destroyPromise) {
       return this.destroyPromise;
@@ -414,6 +465,22 @@
       deferred.resolve();
     }, true);
 
+    Services.obs.removeObserver(this, kDeveditionChangedNotification);
+
     return deferred.promise;
   }
 };
+
+/* Set a pref and emit the pref-changed event if needed. */
+function setPrefAndEmit(prefName, newValue) {
+  let data = {
+    pref: prefName,
+    newValue: newValue
+  };
+  data.oldValue = GetPref(data.pref);
+  SetPref(data.pref, data.newValue);
+
+  if (data.newValue != data.oldValue) {
+    gDevTools.emit("pref-changed", data);
+  }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox-options.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox-options.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox-options.xul	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox-options.xul	2014-11-26 21:45:50.000000000 +0000
@@ -28,12 +28,17 @@
 
       </vbox>
       <vbox class="options-vertical-pane" flex="1">
-        <label>&options.selectDevToolsTheme.label;</label>
-        <radiogroup id="devtools-theme-box"
-                    class="options-groupbox"
-                    data-pref="devtools.theme"
-                    orient="horizontal">
-        </radiogroup>
+        <label>&options.selectDevToolsTheme.label2;</label>
+        <vbox id="theme-options" class="options-groupbox">
+          <radiogroup id="devtools-theme-box"
+                      class="options-groupbox"
+                      data-pref="devtools.theme"
+                      orient="horizontal">
+          </radiogroup>
+          <checkbox id="devtools-browser-theme"
+                    label="&options.usedeveditiontheme.label;"
+                    tooltiptext="&options.usedeveditiontheme.tooltip;"/>
+        </vbox>
         <label>&options.commonPrefs.label;</label>
         <vbox id="commonprefs-options" class="options-groupbox">
           <checkbox label="&options.enablePersistentLogs.label;"
@@ -49,15 +54,17 @@
             <label control="defaultColorUnitMenuList"
                    accesskey="&options.defaultColorUnit.accesskey;"
             >&options.defaultColorUnit.label;</label>
-            <menulist id="defaultColorUnitMenuList"
-                      data-pref="devtools.defaultColorUnit">
-              <menupopup>
-                <menuitem label="&options.defaultColorUnit.hex;" value="hex"/>
-                <menuitem label="&options.defaultColorUnit.hsl;" value="hsl"/>
-                <menuitem label="&options.defaultColorUnit.rgb;" value="rgb"/>
-                <menuitem label="&options.defaultColorUnit.name;" value="name"/>
-              </menupopup>
-            </menulist>
+            <hbox>
+              <menulist id="defaultColorUnitMenuList"
+                        data-pref="devtools.defaultColorUnit">
+                <menupopup>
+                  <menuitem label="&options.defaultColorUnit.hex;" value="hex"/>
+                  <menuitem label="&options.defaultColorUnit.hsl;" value="hsl"/>
+                  <menuitem label="&options.defaultColorUnit.rgb;" value="rgb"/>
+                  <menuitem label="&options.defaultColorUnit.name;" value="name"/>
+                </menupopup>
+              </menulist>
+            </hbox>
           </description>
         </vbox>
         <label>&options.webconsole.label;</label>
@@ -103,29 +110,33 @@
             <label control="devtools-sourceeditor-tabsize-menulist"
                    accesskey="&options.sourceeditor.tabsize.accesskey;"
             >&options.sourceeditor.tabsize.label;</label>
-            <menulist id="devtools-sourceeditor-tabsize-menulist"
-                      data-pref="devtools.editor.tabsize">
-              <menupopup>
-                <menuitem label="2" value="2"/>
-                <menuitem label="4" value="4"/>
-                <menuitem label="8" value="8"/>
-              </menupopup>
-            </menulist>
+            <hbox>
+              <menulist id="devtools-sourceeditor-tabsize-menulist"
+                        data-pref="devtools.editor.tabsize">
+                <menupopup>
+                  <menuitem label="2" value="2"/>
+                  <menuitem label="4" value="4"/>
+                  <menuitem label="8" value="8"/>
+                </menupopup>
+              </menulist>
+            </hbox>
           </description>
           <description>
             <label control="devtools-sourceeditor-keybinding-menulist"
                    accesskey="&options.sourceeditor.keybinding.accesskey;"
             >&options.sourceeditor.keybinding.label;</label>
-            <menulist id="devtools-sourceeditor-keybinding-menulist"
-                      data-pref="devtools.editor.keymap">
-              <menupopup>
-                <menuitem value="default"
-                          label="&options.sourceeditor.keybinding.default.label;"/>
-                <menuitem label="Vim" value="vim"/>
-                <menuitem label="Emacs" value="emacs"/>
-                <menuitem label="Sublime Text" value="sublime"/>
-              </menupopup>
-            </menulist>
+            <hbox>
+              <menulist id="devtools-sourceeditor-keybinding-menulist"
+                        data-pref="devtools.editor.keymap">
+                <menupopup>
+                  <menuitem value="default"
+                            label="&options.sourceeditor.keybinding.default.label;"/>
+                  <menuitem label="Vim" value="vim"/>
+                  <menuitem label="Emacs" value="emacs"/>
+                  <menuitem label="Sublime Text" value="sublime"/>
+                </menupopup>
+              </menulist>
+            </hbox>
           </description>
         </vbox>
         <label>&options.context.advancedSettings;</label>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox-process-window.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox-process-window.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/framework/toolbox-process-window.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/framework/toolbox-process-window.js	2014-11-26 21:45:50.000000000 +0000
@@ -37,11 +37,7 @@
     if (addonID) {
       gClient.listAddons(({addons}) => {
         let addonActor = addons.filter(addon => addon.id === addonID).pop();
-        openToolbox({
-          addonActor: addonActor.actor,
-          consoleActor: addonActor.consoleActor,
-          title: addonActor.name
-        });
+        openToolbox(addonActor);
       });
     } else {
       gClient.listTabs(openToolbox);
@@ -53,6 +49,7 @@
 function setPrefDefaults() {
   Services.prefs.setBoolPref("devtools.inspector.showUserAgentStyles", true);
   Services.prefs.setBoolPref("devtools.profiler.ui.show-platform-data", true);
+  Services.prefs.setBoolPref("browser.devedition.theme.showCustomizeButton", false);
 }
 
 window.addEventListener("load", function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/inspector-panel.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/inspector-panel.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/inspector-panel.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/inspector-panel.js	2014-11-26 21:45:50.000000000 +0000
@@ -57,7 +57,6 @@
   this.panelDoc = iframeWindow.document;
   this.panelWin = iframeWindow;
   this.panelWin.inspector = this;
-  this._inspector = null;
 
   this._onBeforeNavigate = this._onBeforeNavigate.bind(this);
   this._target.on("will-navigate", this._onBeforeNavigate);
@@ -109,6 +108,10 @@
     return this._target.client.traits.getUniqueSelector;
   },
 
+  get canPasteInnerOrAdjacentHTML() {
+    return this._target.client.traits.pasteHTML;
+  },
+
   _deferredOpen: function(defaultSelection) {
     let deferred = promise.defer();
 
@@ -573,7 +576,7 @@
    * Returns the clipboard content if it is appropriate for pasting
    * into the current node's outer HTML, otherwise returns null.
    */
-  _getClipboardContentForOuterHTML: function Inspector_getClipboardContentForOuterHTML() {
+  _getClipboardContentForPaste: function Inspector_getClipboardContentForPaste() {
     let flavors = clipboard.currentFlavors;
     if (flavors.indexOf("text") != -1 ||
         (flavors.indexOf("html") != -1 && flavors.indexOf("image") == -1)) {
@@ -642,15 +645,34 @@
       editHTML.setAttribute("disabled", "true");
     }
 
-    // Enable the "paste outer HTML" item if the selection is an element and
-    // the root actor has the appropriate trait (isOuterHTMLEditable) and if
-    // the clipbard content is appropriate.
     let pasteOuterHTML = this.panelDoc.getElementById("node-menu-pasteouterhtml");
-    if (isEditableElement && this.isOuterHTMLEditable &&
-        this._getClipboardContentForOuterHTML()) {
-      pasteOuterHTML.removeAttribute("disabled");
+    let pasteInnerHTML = this.panelDoc.getElementById("node-menu-pasteinnerhtml");
+    let pasteBefore = this.panelDoc.getElementById("node-menu-pastebefore");
+    let pasteAfter = this.panelDoc.getElementById("node-menu-pasteafter");
+    let pasteFirstChild = this.panelDoc.getElementById("node-menu-pastefirstchild");
+    let pasteLastChild = this.panelDoc.getElementById("node-menu-pastelastchild");
+
+    // Is the clipboard content appropriate? Is the element editable?
+    if (isEditableElement && this._getClipboardContentForPaste()) {
+      pasteInnerHTML.disabled = !this.canPasteInnerOrAdjacentHTML;
+      // Enable the "paste outer HTML" item if the selection is an element and
+      // the root actor has the appropriate trait (isOuterHTMLEditable).
+      pasteOuterHTML.disabled = !this.isOuterHTMLEditable;
+      // Don't paste before / after a root or a BODY or a HEAD element.
+      pasteBefore.disabled = pasteAfter.disabled =
+        !this.canPasteInnerOrAdjacentHTML || this.selection.isRoot() ||
+        this.selection.isBodyNode() || this.selection.isHeadNode();
+      // Don't paste as a first / last child of a HTML document element.
+      pasteFirstChild.disabled = pasteLastChild.disabled =
+        !this.canPasteInnerOrAdjacentHTML || (this.selection.isHTMLNode() &&
+        this.selection.isRoot());
     } else {
-      pasteOuterHTML.setAttribute("disabled", "true");
+      pasteOuterHTML.disabled = true;
+      pasteInnerHTML.disabled = true;
+      pasteBefore.disabled = true;
+      pasteAfter.disabled = true;
+      pasteFirstChild.disabled = true;
+      pasteLastChild.disabled = true;
     }
 
     // Enable the "copy image data-uri" item if the selection is previewable
@@ -690,7 +712,7 @@
     this._markupBox.setAttribute("collapsed", true);
     this._markupBox.appendChild(this._markupFrame);
     this._markupFrame.setAttribute("src", "chrome://browser/content/devtools/markup-view.xhtml");
-    this._markupFrame.setAttribute("aria-label", this.strings.GetStringFromName("inspector.panelLabel.markupView"))
+    this._markupFrame.setAttribute("aria-label", this.strings.GetStringFromName("inspector.panelLabel.markupView"));
   },
 
   _onMarkupFrameLoad: function InspectorPanel__onMarkupFrameLoad() {
@@ -773,8 +795,7 @@
   /**
    * Edit the outerHTML of the selected Node.
    */
-  editHTML: function InspectorPanel_editHTML()
-  {
+  editHTML: function InspectorPanel_editHTML() {
     if (!this.selection.isNode()) {
       return;
     }
@@ -786,22 +807,49 @@
   /**
    * Paste the contents of the clipboard into the selected Node's outer HTML.
    */
-  pasteOuterHTML: function InspectorPanel_pasteOuterHTML()
-  {
-    let content = this._getClipboardContentForOuterHTML();
-    if (content) {
-      let node = this.selection.nodeFront;
-      this.markup.getNodeOuterHTML(node).then((oldContent) => {
-        this.markup.updateNodeOuterHTML(node, content, oldContent);
-      });
-    }
+  pasteOuterHTML: function InspectorPanel_pasteOuterHTML() {
+    let content = this._getClipboardContentForPaste();
+    if (!content)
+      return promise.reject("No clipboard content for paste");
+
+    let node = this.selection.nodeFront;
+    return this.markup.getNodeOuterHTML(node).then(oldContent => {
+      this.markup.updateNodeOuterHTML(node, content, oldContent);
+    });
+  },
+
+  /**
+   * Paste the contents of the clipboard into the selected Node's inner HTML.
+   */
+  pasteInnerHTML: function InspectorPanel_pasteInnerHTML() {
+    let content = this._getClipboardContentForPaste();
+    if (!content)
+      return promise.reject("No clipboard content for paste");
+
+    let node = this.selection.nodeFront;
+    return this.markup.getNodeInnerHTML(node).then(oldContent => {
+      this.markup.updateNodeInnerHTML(node, content, oldContent);
+    });
+  },
+
+  /**
+   * Paste the contents of the clipboard as adjacent HTML to the selected Node.
+   * @param position The position as specified for Element.insertAdjacentHTML
+   *        (i.e. "beforeBegin", "afterBegin", "beforeEnd", "afterEnd").
+   */
+  pasteAdjacentHTML: function InspectorPanel_pasteAdjacent(position) {
+    let content = this._getClipboardContentForPaste();
+    if (!content)
+      return promise.reject("No clipboard content for paste");
+
+    let node = this.selection.nodeFront;
+    return this.markup.insertAdjacentHTMLToNode(node, position, content);
   },
 
   /**
    * Copy the innerHTML of the selected Node to the clipboard.
    */
-  copyInnerHTML: function InspectorPanel_copyInnerHTML()
-  {
+  copyInnerHTML: function InspectorPanel_copyInnerHTML() {
     if (!this.selection.isNode()) {
       return;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/inspector.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/inspector.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/inspector.xul	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/inspector.xul	2014-11-26 21:45:50.000000000 +0000
@@ -59,10 +59,36 @@
         label="&inspectorShowDOMProperties.label;"
         oncommand="inspector.showDOMProperties()"/>
       <menuseparator/>
+      <menuitem id="node-menu-pasteinnerhtml"
+        label="&inspectorHTMLPasteInner.label;"
+        accesskey="&inspectorHTMLPasteInner.accesskey;"
+        oncommand="inspector.pasteInnerHTML()"/>
       <menuitem id="node-menu-pasteouterhtml"
         label="&inspectorHTMLPasteOuter.label;"
         accesskey="&inspectorHTMLPasteOuter.accesskey;"
         oncommand="inspector.pasteOuterHTML()"/>
+      <menu id="node-menu-paste-extra-submenu"
+        label="&inspectorHTMLPasteExtraSubmenu.label;"
+        accesskey="&inspectorHTMLPasteExtraSubmenu.accesskey;">
+        <menupopup>
+          <menuitem id="node-menu-pastebefore"
+            label="&inspectorHTMLPasteBefore.label;"
+            accesskey="&inspectorHTMLPasteBefore.accesskey;"
+            oncommand="inspector.pasteAdjacentHTML('beforeBegin')"/>
+          <menuitem id="node-menu-pasteafter"
+            label="&inspectorHTMLPasteAfter.label;"
+            accesskey="&inspectorHTMLPasteAfter.accesskey;"
+            oncommand="inspector.pasteAdjacentHTML('afterEnd')"/>
+          <menuitem id="node-menu-pastefirstchild"
+            label="&inspectorHTMLPasteFirstChild.label;"
+            accesskey="&inspectorHTMLPasteFirstChild.accesskey;"
+            oncommand="inspector.pasteAdjacentHTML('afterBegin')"/>
+          <menuitem id="node-menu-pastelastchild"
+            label="&inspectorHTMLPasteLastChild.label;"
+            accesskey="&inspectorHTMLPasteLastChild.accesskey;"
+            oncommand="inspector.pasteAdjacentHTML('beforeEnd')"/>
+        </menupopup>
+      </menu>
       <menuseparator/>
       <menuitem id="node-menu-delete"
         label="&inspectorHTMLDelete.label;"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser.ini	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser.ini	2014-11-26 21:45:50.000000000 +0000
@@ -11,9 +11,12 @@
   doc_inspector_highlighter-comments.html
   doc_inspector_highlighter_csstransform.html
   doc_inspector_highlighter.html
+  doc_inspector_highlighter_rect.html
+  doc_inspector_highlighter_rect_iframe.html
   doc_inspector_infobar_01.html
   doc_inspector_infobar_02.html
-  doc_inspector_menu.html
+  doc_inspector_menu-01.html
+  doc_inspector_menu-02.html
   doc_inspector_remove-iframe-during-load.html
   doc_inspector_search.html
   doc_inspector_search-suggestions.html
@@ -41,15 +44,19 @@
 [browser_inspector_highlighter-hover_03.js]
 [browser_inspector_highlighter-iframes.js]
 [browser_inspector_highlighter-options.js]
+[browser_inspector_highlighter-rect_01.js]
+[browser_inspector_highlighter-rect_02.js]
 [browser_inspector_highlighter-selector_01.js]
 [browser_inspector_highlighter-selector_02.js]
+[browser_inspector_highlighter-zoom.js]
 [browser_inspector_iframe-navigation.js]
 [browser_inspector_infobar_01.js]
 [browser_inspector_initialization.js]
 [browser_inspector_inspect-object-element.js]
 [browser_inspector_invalidate.js]
 [browser_inspector_keyboard-shortcuts.js]
-[browser_inspector_menu.js]
+[browser_inspector_menu-01.js]
+[browser_inspector_menu-02.js]
 [browser_inspector_navigation.js]
 [browser_inspector_picker-stop-on-destroy.js]
 [browser_inspector_picker-stop-on-tool-change.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_delete-selected-node-03.js	2014-11-26 21:45:50.000000000 +0000
@@ -17,8 +17,10 @@
 
   info("Removing iframe.");
   yield inspector.walker.removeNode(iframe);
+  yield inspector.selection.once("detached-front");
 
   let body = yield getNodeFront("body", inspector);
+
   is(inspector.selection.nodeFront, body, "Selection is now the body node");
 
   yield inspector.once("inspector-updated");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-04.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-04.js	2014-11-26 21:45:50.000000000 +0000
@@ -10,6 +10,7 @@
 
 // IDs of all highlighter elements that we expect to find in the canvasFrame.
 const ELEMENTS = ["box-model-root",
+                  "box-model-elements",
                   "box-model-margin",
                   "box-model-border",
                   "box-model-padding",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-csstransform_01.js	2014-11-26 21:45:50.000000000 +0000
@@ -33,7 +33,7 @@
 function* isHiddenByDefault(highlighterFront, inspector) {
   info("Checking that the highlighter is hidden by default");
 
-  let hidden = yield getAttribute("css-transform-root", "hidden", highlighterFront);
+  let hidden = yield getAttribute("css-transform-elements", "hidden", highlighterFront);
   ok(hidden, "The highlighter is hidden by default");
 }
 
@@ -58,7 +58,7 @@
   let node = yield getNodeFront("#untransformed", inspector);
   yield highlighterFront.show(node);
 
-  let hidden = yield getAttribute("css-transform-root", "hidden", highlighterFront);
+  let hidden = yield getAttribute("css-transform-elements", "hidden", highlighterFront);
   ok(hidden, "The highlighter is still hidden");
 }
 
@@ -68,7 +68,7 @@
   let node = yield getNodeFront("#inline", inspector);
   yield highlighterFront.show(node);
 
-  let hidden = yield getAttribute("css-transform-root", "hidden", highlighterFront);
+  let hidden = yield getAttribute("css-transform-elements", "hidden", highlighterFront);
   ok(hidden, "The highlighter is still hidden");
 }
 
@@ -78,13 +78,13 @@
   let node = yield getNodeFront("#transformed", inspector);
   yield highlighterFront.show(node);
 
-  let hidden = yield getAttribute("css-transform-root", "hidden", highlighterFront);
+  let hidden = yield getAttribute("css-transform-elements", "hidden", highlighterFront);
   ok(!hidden, "The highlighter is visible");
 
   info("Hiding the highlighter");
   yield highlighterFront.hide();
 
-  hidden = yield getAttribute("css-transform-root", "hidden", highlighterFront);
+  hidden = yield getAttribute("css-transform-elements", "hidden", highlighterFront);
   ok(hidden, "The highlighter is hidden");
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-options.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-options.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-options.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-options.js	2014-11-26 21:45:50.000000000 +0000
@@ -24,7 +24,7 @@
       let hidden = yield getAttribute("box-model-nodeinfobar-container", "hidden", toolbox);
       ok(!hidden, "Node infobar is visible");
 
-      hidden = yield getAttribute("box-model-root", "hidden", toolbox);
+      hidden = yield getAttribute("box-model-elements", "hidden", toolbox);
       ok(!hidden, "SVG container is visible");
 
       for (let side of ["top", "right", "bottom", "left"]) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_01.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,118 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 that the custom rect highlighter provides the right API, ensures that
+// the input is valid and that it does create a box with the right dimensions,
+// at the right position.
+
+const TEST_URL = "data:text/html;charset=utf-8,Rect Highlighter Test";
+
+add_task(function*() {
+  let {inspector, toolbox} = yield openInspectorForURL(TEST_URL);
+  let front = inspector.inspector;
+  let highlighter = yield front.getHighlighterByType("RectHighlighter");
+  let body = yield getNodeFront("body", inspector);
+
+  info("Make sure the highlighter returned is correct");
+
+  ok(highlighter, "The RectHighlighter custom type was created");
+  is(highlighter.typeName, "customhighlighter",
+    "The RectHighlighter has the right type");
+  ok(highlighter.show && highlighter.hide,
+    "The RectHighlighter has the expected show/hide methods");
+
+  info("Check that the highlighter is hidden by default");
+
+  let hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden by default");
+
+  info("Check that nothing is shown if no rect is passed");
+
+  yield highlighter.show(body);
+  hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden when no rect is passed");
+
+  info("Check that nothing is shown if rect is incomplete or invalid");
+
+  yield highlighter.show(body, {
+    rect: {x: 0, y: 0}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden when the rect is incomplete");
+
+  yield highlighter.show(body, {
+    rect: {x: 0, y: 0, width: -Infinity, height: 0}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden when the rect is invalid (1)");
+
+  yield highlighter.show(body, {
+    rect: {x: 0, y: 0, width: 5, height: -45}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden when the rect is invalid (2)");
+
+  yield highlighter.show(body, {
+    rect: {x: "test", y: 0, width: 5, height: 5}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden when the rect is invalid (3)");
+
+  info("Check that the highlighter is displayed when valid options are passed");
+
+  yield highlighter.show(body, {
+    rect: {x: 5, y: 5, width: 50, height: 50}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  ok(!hidden, "The highlighter is displayed");
+  let style = yield getAttribute(highlighter, "style");
+  is(style, "left:5px;top:5px;width:50px;height:50px;",
+    "The highlighter is positioned correctly");
+
+  info("Check that the highlighter can be displayed at x=0 y=0");
+
+  yield highlighter.show(body, {
+    rect: {x: 0, y: 0, width: 50, height: 50}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  ok(!hidden, "The highlighter is displayed when x=0 and y=0");
+  style = yield getAttribute(highlighter, "style");
+  is(style, "left:0px;top:0px;width:50px;height:50px;",
+    "The highlighter is positioned correctly");
+
+  info("Check that the highlighter is hidden when dimensions are 0");
+
+  yield highlighter.show(body, {
+    rect: {x: 0, y: 0, width: 0, height: 0}
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  is(hidden, "true", "The highlighter is hidden width and height are 0");
+
+  info("Check that a fill color can be passed");
+
+  yield highlighter.show(body, {
+    rect: {x: 100, y: 200, width: 500, height: 200},
+    fill: "red"
+  });
+  hidden = yield getAttribute(highlighter, "hidden");
+  ok(!hidden, "The highlighter is displayed");
+  style = yield getAttribute(highlighter, "style");
+  is(style, "left:100px;top:200px;width:500px;height:200px;background:red;",
+    "The highlighter has the right background color");
+
+  yield highlighter.hide();
+  yield highlighter.finalize();
+  gBrowser.removeCurrentTab();
+});
+
+function* getAttribute(highlighter, name) {
+  let {data: value} = yield executeInContent("Test:GetHighlighterAttribute", {
+    nodeID: "highlighted-rect",
+    name: name,
+    actorID: highlighter.actorID
+  });
+  return value;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-rect_02.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,46 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 that the custom rect highlighter positions the rectangle relative to the
+// viewport of the context node we pass to it.
+
+const TEST_URL = TEST_URL_ROOT + "doc_inspector_highlighter_rect.html";
+
+add_task(function*() {
+  let {inspector, toolbox} = yield openInspectorForURL(TEST_URL);
+  let front = inspector.inspector;
+  let highlighter = yield front.getHighlighterByType("RectHighlighter");
+
+  info("Showing the rect highlighter in the context of the iframe");
+
+  // Get the reference to a context node inside the iframe
+  let childBody = yield getNodeFrontInFrame("body", "iframe", inspector);
+  yield highlighter.show(childBody, {
+    rect: {x: 50, y: 50, width: 100, height: 100}
+  });
+
+  let style = yield getAttribute(highlighter, "style");
+
+  // The parent body has margin=50px and border=10px
+  // The parent iframe also has margin=50px and border=10px
+  // = 50 + 10 + 50 + 10 = 120px
+  // The rect is aat x=50 and y=50, so left and top should be 170px
+  is(style, "left:170px;top:170px;width:100px;height:100px;",
+    "The highlighter is correctly positioned");
+
+  yield highlighter.hide();
+  yield highlighter.finalize();
+  gBrowser.removeCurrentTab();
+});
+
+function* getAttribute(highlighter, name) {
+  let {data: value} = yield executeInContent("Test:GetHighlighterAttribute", {
+    nodeID: "highlighted-rect",
+    name: name,
+    actorID: highlighter.actorID
+  });
+  return value;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_highlighter-zoom.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,74 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 that the highlighter stays correctly positioned and has the right aspect
+// ratio even when the page is zoomed in or out.
+
+const TEST_URL = "data:text/html;charset=utf-8,<div>zoom me</div>";
+
+// TEST_LEVELS entries should contain the following properties:
+// - level: the zoom level to test
+// - expected: the style attribute value to check for on the root highlighter
+//   element.
+const TEST_LEVELS = [{
+  level: 2,
+  expected: "position:absolute;transform-origin:top left;transform:scale(0.5);width:200%;height:200%;"
+}, {
+  level: 1,
+  expected: "position:absolute;width:100%;height:100%;"
+}, {
+  level: .5,
+  expected: "position:absolute;transform-origin:top left;transform:scale(2);width:50%;height:50%;"
+}];
+
+add_task(function*() {
+  let {inspector, toolbox} = yield openInspectorForURL(TEST_URL);
+
+  info("Highlighting the test node");
+
+  yield hoverElement("div", inspector);
+  let isVisible = yield isHighlighting(toolbox);
+  ok(isVisible, "The highlighter is visible");
+
+  for (let {level, expected} of TEST_LEVELS) {
+    info("Zoom to level " + level + " and check that the highlighter is correct");
+
+    yield zoomPageTo(level, getHighlighterActorID(toolbox));
+    isVisible = yield isHighlighting(toolbox);
+    ok(isVisible, "The highlighter is still visible at zoom level " + level);
+  
+    yield isNodeCorrectlyHighlighted(getNode("div"), toolbox);
+
+    info("Check that the highlighter root wrapper node was scaled down");
+
+    let style = yield getRootNodeStyle(toolbox);
+    is(style, expected, "The style attribute of the root element is correct");
+  }
+
+  gBrowser.removeCurrentTab();
+});
+
+function* hoverElement(selector, inspector) {
+  info("Hovering node " + selector + " in the markup view");
+  let container = yield getContainerForSelector(selector, inspector);
+  yield hoverContainer(container, inspector);
+}
+
+function* hoverContainer(container, inspector) {
+  let onHighlight = inspector.toolbox.once("node-highlight");
+  EventUtils.synthesizeMouse(container.tagLine, 2, 2, {type: "mousemove"},
+      inspector.markup.doc.defaultView);
+  yield onHighlight;
+}
+
+function* getRootNodeStyle(toolbox) {
+  let {data: value} = yield executeInContent("Test:GetHighlighterAttribute", {
+    nodeID: "box-model-root",
+    name: "style",
+    actorID: getHighlighterActorID(toolbox)
+  });
+  return value;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_menu-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_menu-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_menu-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_menu-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,201 @@
+/* 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";
+
+///////////////////
+//
+// Whitelisting this test.
+// As part of bug 1077403, the leaking uncaught rejection should be fixed.
+//
+thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: jsterm.focusInput is not a function");
+
+// Test context menu functionality:
+// 1) menu items are disabled/enabled depending on the clicked node
+// 2) actions triggered by the items work correctly
+
+const TEST_URL = TEST_URL_ROOT + "doc_inspector_menu-01.html";
+const MENU_SENSITIVITY_TEST_DATA = [
+  {
+    desc: "doctype node",
+    selector: null,
+    disabled: true,
+  },
+  {
+    desc: "element node",
+    selector: "p",
+    disabled: false,
+  }
+];
+
+const COPY_ITEMS_TEST_DATA = [
+  {
+    desc: "copy inner html",
+    id: "node-menu-copyinner",
+    text: "This is some example text",
+  },
+  {
+    desc: "copy outer html",
+    id: "node-menu-copyouter",
+    text: "<p>This is some example text</p>",
+  },
+  {
+    desc: "copy unique selector",
+    id: "node-menu-copyuniqueselector",
+    text: "body > div:nth-child(1) > p:nth-child(2)",
+  },
+];
+
+let clipboard = require("sdk/clipboard");
+registerCleanupFunction(() => {
+  clipboard = null;
+});
+
+add_task(function* () {
+  let { inspector, toolbox } = yield openInspectorForURL(TEST_URL);
+
+  yield testMenuItemSensitivity();
+  yield testCopyMenuItems();
+  yield testShowDOMProperties();
+  yield testDeleteNode();
+  yield testDeleteRootNode();
+
+  function* testMenuItemSensitivity() {
+    info("Testing sensitivity of menu items for different elements.");
+
+    // The sensibility for paste options are described in browser_inspector_menu-02.js
+    const MENU_ITEMS = [
+      "node-menu-copyinner",
+      "node-menu-copyouter",
+      "node-menu-copyuniqueselector",
+      "node-menu-delete",
+      "node-menu-pseudo-hover",
+      "node-menu-pseudo-active",
+      "node-menu-pseudo-focus"
+    ];
+
+    for (let {desc, selector, disabled} of MENU_SENSITIVITY_TEST_DATA) {
+      info("Testing context menu entries for " + desc);
+
+      let front;
+      if (selector) {
+        front = yield getNodeFront(selector, inspector);
+      } else {
+        // Select the docType if no selector is provided
+        let {nodes} = yield inspector.walker.children(inspector.walker.rootNode);
+        front = nodes[0];
+      }
+      yield selectNode(front, inspector);
+
+      contextMenuClick(getContainerForNodeFront(front, inspector).tagLine);
+
+      for (let name of MENU_ITEMS) {
+        checkMenuItem(name, disabled);
+      }
+    }
+  }
+
+  function* testCopyMenuItems() {
+    info("Testing various copy actions of context menu.");
+    for (let {desc, id, text} of COPY_ITEMS_TEST_DATA) {
+      info("Testing " + desc);
+
+      let item = inspector.panelDoc.getElementById(id);
+      ok(item, "The popup has a " + desc + " menu item.");
+
+      let deferred = promise.defer();
+      waitForClipboard(text, () => item.doCommand(),
+                       deferred.resolve, deferred.reject);
+      yield deferred.promise;
+    }
+  }
+
+  function* testShowDOMProperties() {
+    info("Testing 'Show DOM Properties' menu item.");
+    let showDOMPropertiesNode = inspector.panelDoc.getElementById("node-menu-showdomproperties");
+    ok(showDOMPropertiesNode, "the popup menu has a show dom properties item");
+
+    let consoleOpened = toolbox.once("webconsole-ready");
+
+    info("Triggering 'Show DOM Properties' and waiting for inspector open");
+    dispatchCommandEvent(showDOMPropertiesNode);
+    yield consoleOpened;
+
+    let webconsoleUI = toolbox.getPanel("webconsole").hud.ui;
+    let messagesAdded = webconsoleUI.once("new-messages");
+    yield messagesAdded;
+
+    info("Checking if 'inspect($0)' was evaluated");
+    ok(webconsoleUI.jsterm.history[0] === 'inspect($0)');
+
+    yield toolbox.toggleSplitConsole();
+  }
+
+  function* testDeleteNode() {
+    info("Testing 'Delete Node' menu item for normal elements.");
+
+    yield selectNode("p", inspector);
+    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
+    ok(deleteNode, "the popup menu has a delete menu item");
+
+    let updated = inspector.once("inspector-updated");
+
+    info("Triggering 'Delete Node' and waiting for inspector to update");
+    dispatchCommandEvent(deleteNode);
+    yield updated;
+
+    ok(!getNode("p", { expectNoMatch: true }), "Node deleted");
+  }
+
+  function* testDeleteRootNode() {
+    info("Testing 'Delete Node' menu item does not delete root node.");
+    yield selectNode(inspector.walker.rootNode, inspector);
+
+    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
+    dispatchCommandEvent(deleteNode);
+
+    executeSoon(() => {
+      ok(content.document.documentElement, "Document element still alive.");
+    });
+  }
+
+  function checkMenuItem(elementId, disabled) {
+    if (disabled) {
+      checkDisabled(elementId);
+    } else {
+      checkEnabled(elementId);
+    }
+  }
+
+  function checkEnabled(elementId) {
+    let elt = inspector.panelDoc.getElementById(elementId);
+    ok(!elt.hasAttribute("disabled"),
+      '"' + elt.label + '" context menu option is not disabled');
+  }
+
+  function checkDisabled(elementId) {
+    let elt = inspector.panelDoc.getElementById(elementId);
+    ok(elt.hasAttribute("disabled"),
+      '"' + elt.label + '" context menu option is disabled');
+  }
+
+  function dispatchCommandEvent(node) {
+    info("Dispatching command event on " + node);
+    let commandEvent = document.createEvent("XULCommandEvent");
+    commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
+                                  false, false, null);
+    node.dispatchEvent(commandEvent);
+  }
+
+  function contextMenuClick(element) {
+    info("Simulating contextmenu event on " + element);
+    let evt = element.ownerDocument.createEvent('MouseEvents');
+    let button = 2;  // right click
+
+    evt.initMouseEvent('contextmenu', true, true,
+         element.ownerDocument.defaultView, 1, 0, 0, 0, 0, false,
+         false, false, false, button, null);
+
+    element.dispatchEvent(evt);
+  }
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_menu-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_menu-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_menu-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_menu-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,326 @@
+/* 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 context menu functionality:
+// 1) menu items are disabled/enabled depending on the clicked node
+// 2) actions triggered by the items work correctly
+
+///////////////////
+//
+// Whitelisting this test.
+// As part of bug 1077403, the leaking uncaught rejection should be fixed.
+//
+thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: jsterm.focusInput is not a function");
+
+const MENU_SENSITIVITY_TEST_DATA = [
+  {
+    desc: "doctype node",
+    selector: null,
+    disabled: true,
+  },
+  {
+    desc: "element node",
+    selector: "#sensitivity",
+    disabled: false,
+  },
+  {
+    desc: "document element",
+    selector: "html",
+    disabled: {
+      "node-menu-pastebefore": true,
+      "node-menu-pasteafter": true,
+      "node-menu-pastefirstchild": true,
+      "node-menu-pastelastchild": true,
+    }
+  },
+  {
+    desc: "body",
+    selector: "body",
+    disabled: {
+      "node-menu-pastebefore": true,
+      "node-menu-pasteafter": true,
+    }
+  },
+  {
+    desc: "head",
+    selector: "head",
+    disabled: {
+      "node-menu-pastebefore": true,
+      "node-menu-pasteafter": true,
+    }
+  }
+];
+
+const TEST_URL = TEST_URL_ROOT + "doc_inspector_menu-02.html";
+
+const PASTE_HTML_TEST_SENSITIVITY_DATA = [
+  {
+    desc: "some text",
+    clipboardData: "some text",
+    clipboardDataType: undefined,
+    disabled: false
+  },
+  {
+    desc: "base64 encoded image data uri",
+    clipboardData:
+      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABC" +
+      "AAAAAA6fptVAAAACklEQVQYV2P4DwABAQEAWk1v8QAAAABJRU5ErkJggg==",
+    clipboardDataType: undefined,
+    disabled: true
+  },
+  {
+    desc: "html",
+    clipboardData: "<p>some text</p>",
+    clipboardDataType: "html",
+    disabled: false
+  },
+  {
+    desc: "empty string",
+    clipboardData: "",
+    clipboardDataType: undefined,
+    disabled: true
+  },
+  {
+    desc: "whitespace only",
+    clipboardData: " \n\n\t\n\n  \n",
+    clipboardDataType: undefined,
+    disabled: true
+  },
+];
+
+const PASTE_ADJACENT_HTML_DATA = [
+  {
+    desc: "As First Child",
+    clipboardData: "2",
+    menuId: "node-menu-pastefirstchild",
+  },
+  {
+    desc: "As Last Child",
+    clipboardData: "4",
+    menuId: "node-menu-pastelastchild",
+  },
+  {
+    desc: "Before",
+    clipboardData: "1",
+    menuId: "node-menu-pastebefore",
+  },
+  {
+    desc: "After",
+    clipboardData: "<span>5</span>",
+    menuId: "node-menu-pasteafter",
+  },
+];
+
+
+let clipboard = require("sdk/clipboard");
+registerCleanupFunction(() => {
+  clipboard = null;
+});
+
+add_task(function* () {
+  let { inspector, toolbox } = yield openInspectorForURL(TEST_URL);
+
+  yield testMenuItemSensitivity();
+  yield testPasteHTMLMenuItemsSensitivity();
+  yield testPasteOuterHTMLMenu();
+  yield testPasteInnerHTMLMenu();
+  yield testPasteAdjacentHTMLMenu();
+
+  function* testMenuItemSensitivity() {
+    info("Testing sensitivity of menu items for different elements.");
+
+    const MENU_ITEMS = [
+      "node-menu-pasteinnerhtml",
+      "node-menu-pasteouterhtml",
+      "node-menu-pastebefore",
+      "node-menu-pasteafter",
+      "node-menu-pastefirstchild",
+      "node-menu-pastelastchild",
+    ];
+
+    // To ensure clipboard contains something to paste.
+    clipboard.set("<p>test</p>", "html");
+
+    for (let {desc, selector, disabled} of MENU_SENSITIVITY_TEST_DATA) {
+      info("Testing context menu entries for " + desc);
+
+      let front;
+      if (selector) {
+        front = yield getNodeFront(selector, inspector);
+      } else {
+        // Select the docType if no selector is provided
+        let {nodes} = yield inspector.walker.children(inspector.walker.rootNode);
+        front = nodes[0];
+      }
+      yield selectNode(front, inspector);
+
+      contextMenuClick(getContainerForNodeFront(front, inspector).tagLine);
+
+      for (let name of MENU_ITEMS) {
+        let disabledForMenu = typeof disabled === "object" ?
+          disabled[name] : disabled;
+        info(`${name} should be ${disabledForMenu ? "disabled" : "enabled"}  ` +
+          `for ${desc}`);
+        checkMenuItem(name, disabledForMenu);
+      }
+    }
+  }
+
+  function* testPasteHTMLMenuItemsSensitivity() {
+    let menus = [
+      "node-menu-pasteinnerhtml",
+      "node-menu-pasteouterhtml",
+      "node-menu-pastebefore",
+      "node-menu-pasteafter",
+      "node-menu-pastefirstchild",
+      "node-menu-pastelastchild",
+    ];
+
+    info("Checking Paste menu items sensitivity for different types" +
+         "of data");
+
+    let nodeFront = yield getNodeFront("#paste-area", inspector);
+    let markupTagLine = getContainerForNodeFront(nodeFront, inspector).tagLine;
+
+    for (let menuId of menus) {
+      for (let data of PASTE_HTML_TEST_SENSITIVITY_DATA) {
+        let { desc, clipboardData, clipboardDataType, disabled } = data;
+        let menuLabel = getLabelFor("#" + menuId);
+        info(`Checking ${menuLabel} for ${desc}`);
+        clipboard.set(clipboardData, clipboardDataType);
+
+        yield selectNode(nodeFront, inspector);
+
+        contextMenuClick(markupTagLine);
+        checkMenuItem(menuId, disabled);
+      }
+    }
+  }
+
+  function* testPasteOuterHTMLMenu() {
+    info("Testing that 'Paste Outer HTML' menu item works.");
+    clipboard.set("this was pasted (outerHTML)");
+    let outerHTMLSelector = "#paste-area h1";
+
+    let nodeFront = yield getNodeFront(outerHTMLSelector, inspector);
+    yield selectNode(nodeFront, inspector);
+
+    contextMenuClick(getContainerForNodeFront(nodeFront, inspector).tagLine);
+
+    let onNodeReselected = inspector.markup.once("reselectedonremoved");
+    let menu = inspector.panelDoc.getElementById("node-menu-pasteouterhtml");
+    dispatchCommandEvent(menu);
+
+    info("Waiting for inspector selection to update");
+    yield onNodeReselected;
+
+    ok(content.document.body.outerHTML.contains(clipboard.get()),
+       "Clipboard content was pasted into the node's outer HTML.");
+    ok(!getNode(outerHTMLSelector, { expectNoMatch: true }),
+      "The original node was removed.");
+  }
+
+  function* testPasteInnerHTMLMenu() {
+    info("Testing that 'Paste Inner HTML' menu item works.");
+    clipboard.set("this was pasted (innerHTML)");
+    let innerHTMLSelector = "#paste-area .inner";
+    let getInnerHTML = () => content.document.querySelector(innerHTMLSelector).innerHTML;
+    let origInnerHTML = getInnerHTML();
+
+    let nodeFront = yield getNodeFront(innerHTMLSelector, inspector);
+    yield selectNode(nodeFront, inspector);
+
+    contextMenuClick(getContainerForNodeFront(nodeFront, inspector).tagLine);
+
+    let onMutation = inspector.once("markupmutation");
+    let menu = inspector.panelDoc.getElementById("node-menu-pasteinnerhtml");
+    dispatchCommandEvent(menu);
+
+    info("Waiting for mutation to occur");
+    yield onMutation;
+
+    ok(getInnerHTML() === clipboard.get(),
+       "Clipboard content was pasted into the node's inner HTML.");
+    ok(getNode(innerHTMLSelector), "The original node has been preserved.");
+    yield undoChange(inspector);
+    ok(getInnerHTML() === origInnerHTML, "Previous innerHTML has been " +
+      "restored after undo");
+  }
+
+  function* testPasteAdjacentHTMLMenu() {
+    let refSelector = "#paste-area .adjacent .ref";
+    let adjacentNode = content.document.querySelector(refSelector).parentNode;
+    let nodeFront = yield getNodeFront(refSelector, inspector);
+    yield selectNode(nodeFront, inspector);
+    let markupTagLine = getContainerForNodeFront(nodeFront, inspector).tagLine;
+
+    for (let { desc, clipboardData, menuId } of PASTE_ADJACENT_HTML_DATA) {
+      let menu = inspector.panelDoc.getElementById(menuId);
+      info(`Testing ${getLabelFor(menu)} for ${clipboardData}`);
+      clipboard.set(clipboardData);
+
+      contextMenuClick(markupTagLine);
+      let onMutation = inspector.once("markupmutation");
+      dispatchCommandEvent(menu);
+
+      info("Waiting for mutation to occur");
+      yield onMutation;
+    }
+
+    ok(adjacentNode.innerHTML.trim() === "1<span class=\"ref\">234</span>" +
+      "<span>5</span>", "The Paste as Last Child / as First Child / Before " +
+      "/ After worked as expected");
+    yield undoChange(inspector);
+    ok(adjacentNode.innerHTML.trim() === "1<span class=\"ref\">234</span>",
+      "Undo works for paste adjacent HTML");
+  }
+
+  function checkMenuItem(elementId, disabled) {
+    if (disabled) {
+      checkDisabled(elementId);
+    } else {
+      checkEnabled(elementId);
+    }
+  }
+
+  function checkEnabled(elementId) {
+    let elt = inspector.panelDoc.getElementById(elementId);
+    ok(!elt.hasAttribute("disabled"),
+      '"' + elt.label + '" context menu option is not disabled');
+  }
+
+  function checkDisabled(elementId) {
+    let elt = inspector.panelDoc.getElementById(elementId);
+    ok(elt.hasAttribute("disabled"),
+      '"' + elt.label + '" context menu option is disabled');
+  }
+
+  function dispatchCommandEvent(node) {
+    info("Dispatching command event on " + node);
+    let commandEvent = document.createEvent("XULCommandEvent");
+    commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
+                                  false, false, null);
+    node.dispatchEvent(commandEvent);
+  }
+
+  function contextMenuClick(element) {
+    info("Simulating contextmenu event on " + element);
+    let evt = element.ownerDocument.createEvent('MouseEvents');
+    let button = 2;  // right click
+
+    evt.initMouseEvent('contextmenu', true, true,
+         element.ownerDocument.defaultView, 1, 0, 0, 0, 0, false,
+         false, false, false, button, null);
+
+    element.dispatchEvent(evt);
+  }
+
+  function getLabelFor(elt) {
+    if (typeof elt === "string")
+      elt = inspector.panelDoc.querySelector(elt);
+    let isInPasteSubMenu = elt.matches("#node-menu-paste-extra-submenu *");
+    return `"${isInPasteSubMenu ? "Paste > " : ""}${elt.label}"`;
+  }
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_menu.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_menu.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/browser_inspector_menu.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/browser_inspector_menu.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,281 +0,0 @@
-/* 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";
-
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed.
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: jsterm.focusInput is not a function");
-
-// Test context menu functionality:
-// 1) menu items are disabled/enabled depending on the clicked node
-// 2) actions triggered by the items work correctly
-
-const TEST_URL = TEST_URL_ROOT + "doc_inspector_menu.html";
-const MENU_SENSITIVITY_TEST_DATA = [
-  {
-    desc: "doctype node",
-    selector: null,
-    disabled: true,
-  },
-  {
-    desc: "element node",
-    selector: "p",
-    disabled: false,
-  }
-];
-
-const PASTE_OUTER_HTML_TEST_DATA = [
-  {
-    desc: "some text",
-    clipboardData: "some text",
-    clipboardDataType: undefined,
-    disabled: false
-  },
-  {
-    desc: "base64 encoded image data uri",
-    clipboardData:
-      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABC" +
-      "AAAAAA6fptVAAAACklEQVQYV2P4DwABAQEAWk1v8QAAAABJRU5ErkJggg==",
-    clipboardDataType: undefined,
-    disabled: true
-  },
-  {
-    desc: "html",
-    clipboardData: "<p>some text</p>",
-    clipboardDataType: "html",
-    disabled: false
-  },
-  {
-    desc: "empty string",
-    clipboardData: "",
-    clipboardDataType: undefined,
-    disabled: true
-  },
-  {
-    desc: "whitespace only",
-    clipboardData: " \n\n\t\n\n  \n",
-    clipboardDataType: undefined,
-    disabled: true
-  },
-];
-
-const COPY_ITEMS_TEST_DATA = [
-  {
-    desc: "copy inner html",
-    id: "node-menu-copyinner",
-    text: "This is some example text",
-  },
-  {
-    desc: "copy outer html",
-    id: "node-menu-copyouter",
-    text: "<p>This is some example text</p>",
-  },
-  {
-    desc: "copy unique selector",
-    id: "node-menu-copyuniqueselector",
-    text: "body > div:nth-child(1) > p:nth-child(2)",
-  },
-];
-
-let clipboard = require("sdk/clipboard");
-registerCleanupFunction(() => {
-  clipboard = null;
-});
-
-add_task(function* () {
-  let { inspector, toolbox } = yield openInspectorForURL(TEST_URL);
-
-  yield testMenuItemSensitivity();
-  yield testPasteOuterHTMLMenuItemSensitivity();
-  yield testCopyMenuItems();
-  yield testShowDOMProperties();
-  yield testPasteOuterHTMLMenu();
-  yield testDeleteNode();
-  yield testDeleteRootNode();
-
-  function* testMenuItemSensitivity() {
-    info("Testing sensitivity of menu items for different elements.");
-
-    const MENU_ITEMS = [
-      "node-menu-copyinner",
-      "node-menu-copyouter",
-      "node-menu-copyuniqueselector",
-      "node-menu-delete",
-      "node-menu-pasteouterhtml",
-      "node-menu-pseudo-hover",
-      "node-menu-pseudo-active",
-      "node-menu-pseudo-focus"
-    ];
-
-    // To ensure clipboard contains something to paste.
-    clipboard.set("<p>test</p>", "html");
-
-    for (let {desc, selector, disabled} of MENU_SENSITIVITY_TEST_DATA) {
-      info("Testing context menu entries for " + desc);
-
-      let front;
-      if (selector) {
-        front = yield getNodeFront(selector, inspector);
-      } else {
-        // Select the docType if no selector is provided
-        let {nodes} = yield inspector.walker.children(inspector.walker.rootNode);
-        front = nodes[0];
-      }
-      yield selectNode(front, inspector);
-
-      contextMenuClick(getContainerForNodeFront(front, inspector).tagLine);
-
-      for (let name of MENU_ITEMS) {
-        checkMenuItem(name, disabled);
-      }
-    }
-  }
-
-  function* testPasteOuterHTMLMenuItemSensitivity() {
-    info("Checking 'Paste Outer HTML' menu item sensitivity for different types" +
-         "of data");
-
-    let nodeFront = yield getNodeFront("p", inspector);
-    let markupTagLine = getContainerForNodeFront(nodeFront, inspector).tagLine;
-
-    for (let data of PASTE_OUTER_HTML_TEST_DATA) {
-      let { desc, clipboardData, clipboardDataType, disabled } = data;
-      info("Checking 'Paste Outer HTML' for " + desc);
-      clipboard.set(clipboardData, clipboardDataType);
-
-      yield selectNode(nodeFront, inspector);
-
-      contextMenuClick(markupTagLine);
-      checkMenuItem("node-menu-pasteouterhtml", disabled);
-    }
-  }
-
-  function* testCopyMenuItems() {
-    info("Testing various copy actions of context menu.");
-    for (let {desc, id, text} of COPY_ITEMS_TEST_DATA) {
-      info("Testing " + desc);
-
-      let item = inspector.panelDoc.getElementById(id);
-      ok(item, "The popup has a " + desc + " menu item.");
-
-      let deferred = promise.defer();
-      waitForClipboard(text, () => item.doCommand(),
-                       deferred.resolve, deferred.reject);
-      yield deferred.promise;
-    }
-  }
-
-  function* testShowDOMProperties() {
-    info("Testing 'Show DOM Properties' menu item.");
-    let showDOMPropertiesNode = inspector.panelDoc.getElementById("node-menu-showdomproperties");
-    ok(showDOMPropertiesNode, "the popup menu has a show dom properties item");
-
-    let consoleOpened = toolbox.once("webconsole-ready");
-
-    info("Triggering 'Show DOM Properties' and waiting for inspector open");
-    dispatchCommandEvent(showDOMPropertiesNode);
-    yield consoleOpened;
-
-    let webconsoleUI = toolbox.getPanel("webconsole").hud.ui;
-    let messagesAdded = webconsoleUI.once("new-messages");
-    yield messagesAdded;
-
-    info("Checking if 'inspect($0)' was evaluated");
-    ok(webconsoleUI.jsterm.history[0] === 'inspect($0)');
-
-    yield toolbox.toggleSplitConsole();
-  }
-
-  function* testPasteOuterHTMLMenu() {
-    info("Testing that 'Paste Outer HTML' menu item works.");
-    clipboard.set("this was pasted");
-
-    let nodeFront = yield getNodeFront("h1", inspector);
-    yield selectNode(nodeFront, inspector);
-
-    contextMenuClick(getContainerForNodeFront(nodeFront, inspector).tagLine);
-
-    let onNodeReselected = inspector.markup.once("reselectedonremoved");
-    let menu = inspector.panelDoc.getElementById("node-menu-pasteouterhtml");
-    dispatchCommandEvent(menu);
-
-    info("Waiting for inspector selection to update");
-    yield onNodeReselected;
-
-    ok(content.document.body.outerHTML.contains(clipboard.get()),
-       "Clipboard content was pasted into the node's outer HTML.");
-    ok(!getNode("h1", { expectNoMatch: true }), "The original node was removed.");
-  }
-
-  function* testDeleteNode() {
-    info("Testing 'Delete Node' menu item for normal elements.");
-
-    yield selectNode("p", inspector);
-    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
-    ok(deleteNode, "the popup menu has a delete menu item");
-
-    let updated = inspector.once("inspector-updated");
-
-    info("Triggering 'Delete Node' and waiting for inspector to update");
-    dispatchCommandEvent(deleteNode);
-    yield updated;
-
-    ok(!getNode("p", { expectNoMatch: true }), "Node deleted");
-  }
-
-  function* testDeleteRootNode() {
-    info("Testing 'Delete Node' menu item does not delete root node.");
-    yield selectNode(inspector.walker.rootNode, inspector);
-
-    let deleteNode = inspector.panelDoc.getElementById("node-menu-delete");
-    dispatchCommandEvent(deleteNode);
-
-    executeSoon(() => {
-      ok(content.document.documentElement, "Document element still alive.");
-    });
-  }
-
-  function checkMenuItem(elementId, disabled) {
-    if (disabled) {
-      checkDisabled(elementId);
-    } else {
-      checkEnabled(elementId);
-    }
-  }
-
-  function checkEnabled(elementId) {
-    let elt = inspector.panelDoc.getElementById(elementId);
-    ok(!elt.hasAttribute("disabled"),
-      '"' + elt.label + '" context menu option is not disabled');
-  }
-
-  function checkDisabled(elementId) {
-    let elt = inspector.panelDoc.getElementById(elementId);
-    ok(elt.hasAttribute("disabled"),
-      '"' + elt.label + '" context menu option is disabled');
-  }
-
-  function dispatchCommandEvent(node) {
-    info("Dispatching command event on " + node);
-    let commandEvent = document.createEvent("XULCommandEvent");
-    commandEvent.initCommandEvent("command", true, true, window, 0, false, false,
-                                  false, false, null);
-    node.dispatchEvent(commandEvent);
-  }
-
-  function contextMenuClick(element) {
-    info("Simulating contextmenu event on " + element);
-    let evt = element.ownerDocument.createEvent('MouseEvents');
-    let button = 2;  // right click
-
-    evt.initMouseEvent('contextmenu', true, true,
-         element.ownerDocument.defaultView, 1, 0, 0, 0, 0, false,
-         false, false, false, button, null);
-
-    element.dispatchEvent(evt);
-  }
-});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_frame_script.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_frame_script.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_frame_script.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_frame_script.js	2014-11-26 21:45:50.000000000 +0000
@@ -132,6 +132,35 @@
 });
 
 /**
+ * Change the zoom level of the page.
+ * Optionally subscribe to the box-model highlighter's update event and waiting
+ * for it to refresh before responding.
+ * @param {Object} msg The msg.data part expects the following properties
+ * - {Number} level The new zoom level
+ * - {String} actorID Optional. The highlighter actor ID
+ */
+addMessageListener("Test:ChangeZoomLevel", function(msg) {
+  let {level, actorID} = msg.data;
+  dumpn("Zooming page to " + level);
+
+  if (actorID) {
+    let {_highlighter: h} = getHighlighterActor(actorID);
+    h.once("updated", () => {
+      sendAsyncMessage("Test:ChangeZoomLevel");
+    });
+  }
+
+  let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                        .getInterface(Ci.nsIWebNavigation)
+                        .QueryInterface(Ci.nsIDocShell);
+  docShell.contentViewer.fullZoom = level;
+
+  if (!actorID) {
+    sendAsyncMessage("Test:ChangeZoomLevel");
+  }
+});
+
+/**
  * Get the element at the given x/y coordinates.
  * @param {Object} msg The msg.data part expects the following properties
  * - {Number} x
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect.html	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>rect highlighter parent test page</title>
+  <style type="text/css">
+    body {
+      margin: 50px;
+      border: 10px solid red;
+    }
+
+    iframe {
+      border: 10px solid yellow;
+      padding: 0;
+      margin: 50px;
+    }
+  </style>
+</head>
+<body>
+  <iframe src="doc_inspector_highlighter_rect_iframe.html"></iframe>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect_iframe.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect_iframe.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect_iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_highlighter_rect_iframe.html	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>rect highlighter child test page</title>
+  <style type="text/css">
+    body {
+      margin: 0;
+    }
+  </style>
+</head>
+<body>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_menu-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_menu-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_menu-01.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_menu-01.html	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<head>
+  <title>Inspector Tree Menu Test</title>
+</head>
+<body>
+  <div>
+    <h1>Inspector Tree Menu Test</h1>
+    <p>This is some example text</p>
+  </div>
+</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_menu-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_menu-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_menu-02.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_menu-02.html	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Inspector Tree Menu Test</title>
+    <meta charset="utf-8">
+  </head>
+  <body>
+    <div>
+      <div id="paste-area">
+        <h1>Inspector Tree Menu Test</h1>
+        <p class="inner">Unset</p>
+        <p class="adjacent">
+          <span class="ref">3</span>
+        </p>
+      </div>
+      <p data-id="copy">Paragraph for testing copy</p>
+      <p id="sensitivity">Paragraph for sensitivity</p>
+      <p id="delete">This has to be deleted</p>
+    </div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_menu.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_menu.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/doc_inspector_menu.html	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/doc_inspector_menu.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <title>Inspector Tree Menu Test</title>
-</head>
-<body>
-  <div>
-    <h1>Inspector Tree Menu Test</h1>
-    <p>This is some example text</p>
-  </div>
-</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/inspector/test/head.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/inspector/test/head.js	2014-11-26 21:45:50.000000000 +0000
@@ -257,8 +257,8 @@
  * to highlight the node upon selection
  * @return {Promise} Resolves when the inspector is updated with the new node
  */
-let getNodeFrontInFrame = Task.async(function*(selector, frameSelector, inspector,
-                                             reason="test") {
+let getNodeFrontInFrame = Task.async(function*(selector, frameSelector,
+                                               inspector, reason="test") {
   let iframe = yield getNodeFront(frameSelector, inspector);
   let {nodes} = yield inspector.walker.children(iframe);
   return inspector.walker.querySelector(nodes[0], selector);
@@ -395,7 +395,7 @@
  */
 let isHighlighting = Task.async(function*(toolbox) {
   let {data: value} = yield executeInContent("Test:GetHighlighterAttribute", {
-    nodeID: "box-model-root",
+    nodeID: "box-model-elements",
     name: "hidden",
     actorID: getHighlighterActorID(toolbox)
   });
@@ -556,6 +556,19 @@
 });
 
 /**
+ * Zoom the current page to a given level.
+ * @param {Number} level The new zoom level.
+ * @param {String} actorID Optional highlighter actor ID. If provided, the
+ * returned promise will only resolve when the highlighter has updated to the
+ * new zoom level.
+ * @return {Promise}
+ */
+let zoomPageTo = Task.async(function*(level, actorID) {
+  yield executeInContent("Test:ChangeZoomLevel",
+                         {level, actorID});
+});
+
+/**
  * Simulate the mouse leaving the markup-view area
  * @param {InspectorPanel} inspector The instance of InspectorPanel currently loaded in the toolbox
  * @return a promise when done
@@ -651,3 +664,43 @@
     return promise.resolve();
   }
 }
+
+/**
+ * Undo the last markup-view action and wait for the corresponding mutation to
+ * occur
+ * @param {InspectorPanel} inspector The instance of InspectorPanel currently
+ * loaded in the toolbox
+ * @return a promise that resolves when the markup-mutation has been treated or
+ * rejects if no undo action is possible
+ */
+function undoChange(inspector) {
+  let canUndo = inspector.markup.undo.canUndo();
+  ok(canUndo, "The last change in the markup-view can be undone");
+  if (!canUndo) {
+    return promise.reject();
+  }
+
+  let mutated = inspector.once("markupmutation");
+  inspector.markup.undo.undo();
+  return mutated;
+}
+
+/**
+ * Redo the last markup-view action and wait for the corresponding mutation to
+ * occur
+ * @param {InspectorPanel} inspector The instance of InspectorPanel currently
+ * loaded in the toolbox
+ * @return a promise that resolves when the markup-mutation has been treated or
+ * rejects if no redo action is possible
+ */
+function redoChange(inspector) {
+  let canRedo = inspector.markup.undo.canRedo();
+  ok(canRedo, "The last change in the markup-view can be redone");
+  if (!canRedo) {
+    return promise.reject();
+  }
+
+  let mutated = inspector.once("markupmutation");
+  inspector.markup.undo.redo();
+  return mutated;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/jar.mn thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/jar.mn
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/jar.mn	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/jar.mn	2014-11-26 21:45:50.000000000 +0000
@@ -90,6 +90,9 @@
     content/browser/devtools/performance.xul                           (performance/performance.xul)
     content/browser/devtools/performance/controller.js                 (performance/controller.js)
     content/browser/devtools/performance/views/main.js                 (performance/views/main.js)
+    content/browser/devtools/performance/views/overview.js             (performance/views/overview.js)
+    content/browser/devtools/performance/views/details.js              (performance/views/details.js)
+    content/browser/devtools/performance/views/call-tree.js            (performance/views/call-tree.js)
 #endif
     content/browser/devtools/responsivedesign/resize-commands.js       (responsivedesign/resize-commands.js)
     content/browser/devtools/commandline.css                           (commandline/commandline.css)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/main.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/main.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/main.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/main.js	2014-11-26 21:45:50.000000000 +0000
@@ -117,7 +117,7 @@
   },
 
   isTargetSupported: function(target) {
-    return !target.isAddon && target.hasActor("inspector");
+    return target.hasActor("inspector");
   },
 
   build: function(iframeWindow, toolbox) {
@@ -199,8 +199,7 @@
   commands: "devtools/styleeditor/styleeditor-commands",
 
   isTargetSupported: function(target) {
-    return !target.isAddon &&
-      (target.hasActor("styleEditor") || target.hasActor("styleSheets"));
+    return target.hasActor("styleEditor") || target.hasActor("styleSheets");
   },
 
   build: function(iframeWindow, toolbox) {
@@ -220,7 +219,7 @@
   tooltip: l10n("ToolboxShaderEditor.tooltip", shaderEditorStrings),
 
   isTargetSupported: function(target) {
-    return !target.isAddon;
+    return target.hasActor("webgl");
   },
 
   build: function(iframeWindow, toolbox) {
@@ -242,7 +241,7 @@
   // Hide the Canvas Debugger in the Add-on Debugger and Browser Toolbox
   // (bug 1047520).
   isTargetSupported: function(target) {
-    return !target.isAddon && !target.chrome;
+    return target.hasActor("canvas") && !target.chrome;
   },
 
   build: function (iframeWindow, toolbox) {
@@ -268,7 +267,7 @@
   isTargetSupported: function (target) {
     // Hide the profiler when debugging devices pre bug 1046394,
     // that don't expose profiler actor in content processes.
-    return !target.isAddon && target.hasActor("profiler");
+    return target.hasActor("profiler");
   },
 
   build: function (frame, target) {
@@ -292,7 +291,7 @@
   inMenu: true,
 
   isTargetSupported: function (target) {
-    return !target.isAddon && target.hasActor("profiler");
+    return target.hasActor("profiler");
   },
 
   build: function (frame, target) {
@@ -312,7 +311,7 @@
   tooltip: l10n("timeline.tooltip", timelineStrings),
 
   isTargetSupported: function(target) {
-    return !target.isAddon && target.hasActor("timeline");
+    return target.hasActor("timeline");
   },
 
   build: function (iframeWindow, toolbox) {
@@ -337,7 +336,7 @@
   inMenu: true,
 
   isTargetSupported: function(target) {
-    return !target.isAddon && target.getTrait("networkMonitor");
+    return target.getTrait("networkMonitor");
   },
 
   build: function(iframeWindow, toolbox) {
@@ -363,7 +362,8 @@
 
   isTargetSupported: function(target) {
     return target.isLocalTab ||
-           (target.client.traits.storageInspector && !target.isAddon);
+           ( target.hasActor("storage") &&
+             target.getTrait("storageInspector") );
   },
 
   build: function(iframeWindow, toolbox) {
@@ -383,7 +383,7 @@
   tooltip: l10n("ToolboxWebAudioEditor1.tooltip", webAudioEditorStrings),
 
   isTargetSupported: function(target) {
-    return !target.isAddon && !target.chrome && target.hasActor("webaudio");
+    return !target.chrome && target.hasActor("webaudio");
   },
 
   build: function(iframeWindow, toolbox) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/markupview/markup-view.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/markupview/markup-view.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/markupview/markup-view.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/markupview/markup-view.js	2014-11-26 21:45:50.000000000 +0000
@@ -33,7 +33,7 @@
  return Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser);
 });
 loader.lazyGetter(this, "AutocompletePopup", () => {
-  return require("devtools/shared/autocomplete-popup").AutocompletePopup
+  return require("devtools/shared/autocomplete-popup").AutocompletePopup;
 });
 
 /**
@@ -521,16 +521,17 @@
     // Retain the node so we can undo this...
     this.walker.retainNode(aNode).then(() => {
       let parent = aNode.parentNode();
-      let sibling = null;
+      let nextSibling = null;
       this.undo.do(() => {
-        if (container.selected) {
-          this.navigate(this.getContainer(parent));
-        }
-        this.walker.removeNode(aNode).then(nextSibling => {
-          sibling = nextSibling;
+        this.walker.removeNode(aNode).then(siblings => {
+          let focusNode = siblings.previousSibling || parent;
+          nextSibling = siblings.nextSibling;
+          if (container.selected) {
+            this.navigate(this.getContainer(focusNode));
+          }
         });
       }, () => {
-        this.walker.insertBefore(aNode, parent, sibling);
+        this.walker.insertBefore(aNode, parent, nextSibling);
       });
     }).then(null, console.error);
   },
@@ -701,16 +702,19 @@
             removedContainers.add(container);
           }
 
-          // If there has been additions, flash the nodes
+          // If there has been additions, flash the nodes if their associated
+          // container exist (so if their parent is expanded in the inspector).
           added.forEach(added => {
             let addedContainer = this.getContainer(added);
-            addedOrEditedContainers.add(addedContainer);
+            if (addedContainer) {
+              addedOrEditedContainers.add(addedContainer);
 
-            // The node may be added as a result of an append, in which case it
-            // it will have been removed from another container first, but in
-            // these cases we don't want to flash both the removal and the
-            // addition
-            removedContainers.delete(container);
+              // The node may be added as a result of an append, in which case
+              // it will have been removed from another container first, but in
+              // these cases we don't want to flash both the removal and the
+              // addition
+              removedContainers.delete(container);
+            }
           });
         }
       }
@@ -800,19 +804,45 @@
   },
 
   /**
+   * Returns either the innerHTML or the outerHTML for a remote node.
+   * @param aNode The NodeFront to get the outerHTML / innerHTML for.
+   * @param isOuter A boolean that, if true, makes the function return the
+   *                outerHTML, otherwise the innerHTML.
+   * @returns A promise that will be resolved with the outerHTML / innerHTML.
+   */
+  _getNodeHTML: function(aNode, isOuter) {
+    let walkerPromise = null;
+
+    if (isOuter) {
+      walkerPromise = this.walker.outerHTML(aNode);
+    } else {
+      walkerPromise = this.walker.innerHTML(aNode);
+    }
+
+    return walkerPromise.then(longstr => {
+      return longstr.string().then(html => {
+        longstr.release().then(null, console.error);
+        return html;
+      });
+    });
+  },
+
+  /**
    * Retrieve the outerHTML for a remote node.
    * @param aNode The NodeFront to get the outerHTML for.
    * @returns A promise that will be resolved with the outerHTML.
    */
   getNodeOuterHTML: function(aNode) {
-    let def = promise.defer();
-    this.walker.outerHTML(aNode).then(longstr => {
-      longstr.string().then(outerHTML => {
-        longstr.release().then(null, console.error);
-        def.resolve(outerHTML);
-      });
-    });
-    return def.promise;
+    return this._getNodeHTML(aNode, true);
+  },
+
+  /**
+   * Retrieve the innerHTML for a remote node.
+   * @param aNode The NodeFront to get the innerHTML for.
+   * @returns A promise that will be resolved with the innerHTML.
+   */
+  getNodeInnerHTML: function(aNode) {
+    return this._getNodeHTML(aNode);
   },
 
   /**
@@ -885,31 +915,89 @@
   /**
    * Replace the outerHTML of any node displayed in the inspector with
    * some other HTML code
-   * @param aNode node which outerHTML will be replaced.
-   * @param newValue The new outerHTML to set on the node.
-   * @param oldValue The old outerHTML that will be used if the user undos the update.
+   * @param {NodeFront} node node which outerHTML will be replaced.
+   * @param {string} newValue The new outerHTML to set on the node.
+   * @param {string} oldValue The old outerHTML that will be used if the
+   *                          user undoes the update.
    * @returns A promise that will resolve when the outer HTML has been updated.
    */
-  updateNodeOuterHTML: function(aNode, newValue, oldValue) {
-    let container = this._containers.get(aNode);
+  updateNodeOuterHTML: function(node, newValue, oldValue) {
+    let container = this.getContainer(node);
     if (!container) {
       return promise.reject();
     }
 
     // Changing the outerHTML removes the node which outerHTML was changed.
     // Listen to this removal to reselect the right node afterwards.
-    this.reselectOnRemoved(aNode, "outerhtml");
-    return this.walker.setOuterHTML(aNode, newValue).then(null, () => {
+    this.reselectOnRemoved(node, "outerhtml");
+    return this.walker.setOuterHTML(node, newValue).then(null, () => {
       this.cancelReselectOnRemoved();
     });
   },
 
   /**
+   * Replace the innerHTML of any node displayed in the inspector with
+   * some other HTML code
+   * @param {Node} node node which innerHTML will be replaced.
+   * @param {string} newValue The new innerHTML to set on the node.
+   * @param {string} oldValue The old innerHTML that will be used if the user
+   *                 undoes the update.
+   * @returns A promise that will resolve when the inner HTML has been updated.
+   */
+  updateNodeInnerHTML: function(node, newValue, oldValue) {
+    let container = this.getContainer(node);
+    if (!container) {
+      return promise.reject();
+    }
+
+    let def = promise.defer();
+
+    container.undo.do(() => {
+      this.walker.setInnerHTML(node, newValue).then(def.resolve, def.reject);
+    }, () => {
+      this.walker.setInnerHTML(node, oldValue);
+    });
+
+    return def.promise;
+  },
+
+  /**
+   * Insert adjacent HTML to any node displayed in the inspector.
+   *
+   * @param {NodeFront} node The reference node.
+   * @param {string} position The position as specified for Element.insertAdjacentHTML
+   *        (i.e. "beforeBegin", "afterBegin", "beforeEnd", "afterEnd").
+   * @param {string} newValue The adjacent HTML.
+   * @returns A promise that will resolve when the adjacent HTML has
+   *          been inserted.
+   */
+  insertAdjacentHTMLToNode: function(node, position, value) {
+    let container = this.getContainer(node);
+    if (!container) {
+      return promise.reject();
+    }
+
+    let def = promise.defer();
+
+    let injectedNodes = [];
+    container.undo.do(() => {
+      this.walker.insertAdjacentHTML(node, position, value).then(nodeArray => {
+        injectedNodes = nodeArray.nodes;
+        return nodeArray;
+      }).then(def.resolve, def.reject);
+    }, () => {
+      this.walker.removeNodes(injectedNodes);
+    });
+
+    return def.promise;
+  },
+
+  /**
    * Open an editor in the UI to allow editing of a node's outerHTML.
    * @param aNode The NodeFront to edit.
    */
   beginEditingOuterHTML: function(aNode) {
-    this.getNodeOuterHTML(aNode).then((oldValue)=> {
+    this.getNodeOuterHTML(aNode).then(oldValue => {
       let container = this.getContainer(aNode);
       if (!container) {
         return;
@@ -1216,7 +1304,7 @@
     this._inspector.selection.off("new-node-front", this._boundOnNewSelection);
     this._boundOnNewSelection = null;
 
-    this.walker.off("mutations", this._boundMutationObserver)
+    this.walker.off("mutations", this._boundMutationObserver);
     this._boundMutationObserver = null;
 
     this.walker.off("display-change", this._boundOnDisplayChange);
@@ -1923,7 +2011,7 @@
           }, () => {
             this.node.setNodeValue(oldValue).then(() => {
               this.markup.nodeChanged(this.node);
-            })
+            });
           });
         });
       });
@@ -2154,7 +2242,7 @@
             doMods.apply();
           }, () => {
             undoMods.apply();
-          })
+          });
         } catch(ex) {
           console.error(ex);
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/markupview/test/browser_markupview_tag_edit_04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/markupview/test/browser_markupview_tag_edit_04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/markupview/test/browser_markupview_tag_edit_04.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/markupview/test/browser_markupview_tag_edit_04.js	2014-11-26 21:45:50.000000000 +0000
@@ -4,27 +4,41 @@
 
 "use strict";
 
-// Tests that a node can be deleted from the markup-view with the delete key
+// Tests that a node can be deleted from the markup-view with the delete key.
+// Also checks that after deletion the correct element is highlighted.
+// The next sibling is preferred, but the parent is a fallback.
 
-const TEST_URL = "data:text/html,<div id='delete-me'></div>";
+const TEST_URL = "data:text/html,<div id='parent'><div id='first'></div><div id='second'></div><div id='third'></div></div>";
 
-let test = asyncTest(function*() {
-  let {toolbox, inspector} = yield addTab(TEST_URL).then(openInspector);
-
-  info("Selecting the test node by clicking on it to make sure it receives focus");
-  let node = content.document.querySelector("#delete-me");
-  yield clickContainer("#delete-me", inspector);
+function* checkDeleteAndSelection(inspector, nodeSelector, focusedNodeSelector) {
+  yield selectNode(nodeSelector, inspector);
+  yield clickContainer(nodeSelector, inspector);
 
-  info("Deleting the element with the keyboard");
+  info("Deleting the element \"" + nodeSelector + "\" with the keyboard");
   let mutated = inspector.once("markupmutation");
   EventUtils.sendKey("delete", inspector.panelWin);
-  yield mutated;
+
+  yield Promise.all([mutated, inspector.once("inspector-updated")]);
+
+  let nodeFront = yield getNodeFront(focusedNodeSelector, inspector);
+  is(inspector.selection.nodeFront, nodeFront,
+    focusedNodeSelector + " should be selected after " + nodeSelector + " node gets deleted.");
 
   info("Checking that it's gone, baby gone!");
-  ok(!content.document.querySelector("#delete-me"), "The test node does not exist");
+  ok(!content.document.querySelector(nodeSelector), "The test node does not exist");
 
   yield undoChange(inspector);
-  ok(content.document.querySelector("#delete-me"), "The test node is back!");
+  ok(content.document.querySelector(nodeSelector), "The test node is back!");
+}
+
+let test = asyncTest(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  info("Selecting the test node by clicking on it to make sure it receives focus");
+
+  yield checkDeleteAndSelection(inspector, "#first", "#parent");
+  yield checkDeleteAndSelection(inspector, "#second", "#first");
+  yield checkDeleteAndSelection(inspector, "#third", "#second");
 
   yield inspector.once("inspector-updated");
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/markupview/test/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/markupview/test/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/markupview/test/head.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/markupview/test/head.js	2014-11-26 21:45:50.000000000 +0000
@@ -252,7 +252,7 @@
   let nodeFront = yield getNodeFront(selector, inspector);
   let container = getContainerForNodeFront(nodeFront, inspector);
 
-  let updated = inspector.once("inspector-updated");
+  let updated = container.selected ? promise.resolve() : inspector.once("inspector-updated");
   EventUtils.synthesizeMouseAtCenter(container.tagLine, {type: "mousedown"},
     inspector.markup.doc.defaultView);
   EventUtils.synthesizeMouseAtCenter(container.tagLine, {type: "mouseup"},
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/controller.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/controller.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/controller.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/controller.js	2014-11-26 21:45:50.000000000 +0000
@@ -9,22 +9,41 @@
 Cu.import("resource://gre/modules/devtools/Loader.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 
+let require = devtools.require;
 devtools.lazyRequireGetter(this, "Services");
 devtools.lazyRequireGetter(this, "promise");
 devtools.lazyRequireGetter(this, "EventEmitter",
   "devtools/toolkit/event-emitter");
 devtools.lazyRequireGetter(this, "DevToolsUtils",
   "devtools/toolkit/DevToolsUtils");
+devtools.lazyRequireGetter(this, "FramerateFront",
+  "devtools/server/actors/framerate", true);
+devtools.lazyRequireGetter(this, "L10N",
+  "devtools/profiler/global", true);
+devtools.lazyImporter(this, "LineGraphWidget",
+  "resource:///modules/devtools/Graphs.jsm");
+devtools.lazyRequireGetter(this, "CallView",
+  "devtools/profiler/tree-view", true);
+devtools.lazyRequireGetter(this, "ThreadNode",
+  "devtools/profiler/tree-model", true);
 
 // Events emitted by the `PerformanceController`
 const EVENTS = {
   // When a recording is started or stopped via the controller
   RECORDING_STARTED: "Performance:RecordingStarted",
   RECORDING_STOPPED: "Performance:RecordingStopped",
+  // When the PerformanceActor front emits `framerate` data
+  TIMELINE_DATA: "Performance:TimelineData",
 
   // Emitted by the PerformanceView on record button click
   UI_START_RECORDING: "Performance:UI:StartRecording",
-  UI_STOP_RECORDING: "Performance:UI:StopRecording"
+  UI_STOP_RECORDING: "Performance:UI:StopRecording",
+
+  // Emitted by the OverviewView when more data has been rendered
+  OVERVIEW_RENDERED: "Performance:UI:OverviewRendered",
+
+  // Emitted by the CallTreeView when a call tree has been rendered
+  CALL_TREE_RENDERED: "Performance:UI:CallTreeRendered"
 };
 
 /**
@@ -83,9 +102,11 @@
   initialize: function() {
     this.startRecording = this.startRecording.bind(this);
     this.stopRecording = this.stopRecording.bind(this);
+    this._onTimelineData = this._onTimelineData.bind(this);
 
     PerformanceView.on(EVENTS.UI_START_RECORDING, this.startRecording);
     PerformanceView.on(EVENTS.UI_STOP_RECORDING, this.stopRecording);
+    gFront.on("ticks", this._onTimelineData);
   },
 
   /**
@@ -112,7 +133,14 @@
   stopRecording: Task.async(function *() {
     let results = yield gFront.stopRecording();
     this.emit(EVENTS.RECORDING_STOPPED, results);
-  })
+  }),
+
+  /**
+   * Fired whenever the gFront emits a ticks, memory, or markers event.
+   */
+  _onTimelineData: function (eventName, ...data) {
+    this.emit(EVENTS.TIMELINE_DATA, eventName, ...data);
+  }
 };
 
 /**
@@ -124,6 +152,7 @@
  * Shortcuts for accessing various profiler preferences.
  */
 const Prefs = new ViewHelpers.Prefs("devtools.profiler", {
+  showPlatformData: ["Bool", "ui.show-platform-data"]
 });
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/performance.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/performance.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/performance.xul	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/performance.xul	2014-11-26 21:45:50.000000000 +0000
@@ -16,6 +16,9 @@
   <script src="chrome://browser/content/devtools/theme-switching.js"/>
   <script type="application/javascript" src="performance/controller.js"/>
   <script type="application/javascript" src="performance/views/main.js"/>
+  <script type="application/javascript" src="performance/views/overview.js"/>
+  <script type="application/javascript" src="performance/views/details.js"/>
+  <script type="application/javascript" src="performance/views/call-tree.js"/>
 
   <vbox class="theme-body" flex="1">
     <toolbar id="performance-toolbar" class="devtools-toolbar">
@@ -38,11 +41,41 @@
     <box id="overview-pane"
          class="devtools-responsive-container"
          flex="1">
+      <vbox id="time-framerate" flex="1"/>
     </box>
     <splitter class="devtools-horizontal-splitter" />
     <box id="details-pane"
          class="devtools-responsive-container"
          flex="1">
+      <vbox class="call-tree" flex="1">
+        <hbox class="call-tree-headers-container">
+          <label class="plain call-tree-header"
+                 type="duration"
+                 crop="end"
+                 value="&profilerUI.table.totalDuration;"/>
+          <label class="plain call-tree-header"
+                 type="percentage"
+                 crop="end"
+                 value="&profilerUI.table.totalPercentage;"/>
+          <label class="plain call-tree-header"
+                 type="self-duration"
+                 crop="end"
+                 value="&profilerUI.table.selfDuration;"/>
+          <label class="plain call-tree-header"
+                 type="self-percentage"
+                 crop="end"
+                 value="&profilerUI.table.selfPercentage;"/>
+          <label class="plain call-tree-header"
+                 type="samples"
+                 crop="end"
+                 value="&profilerUI.table.samples;"/>
+          <label class="plain call-tree-header"
+                 type="function"
+                 crop="end"
+                 value="&profilerUI.table.function;"/>
+        </hbox>
+        <vbox class="call-tree-cells-container" flex="1"/>
+      </vbox>
     </box>
   </vbox>
 </window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser.ini	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser.ini	2014-11-26 21:45:50.000000000 +0000
@@ -29,3 +29,6 @@
 [browser_perf-data-samples.js]
 [browser_perf-data-massaging-01.js]
 [browser_perf-ui-recording.js]
+[browser_perf-overview-render-01.js]
+[browser_perf-overview-render-02.js]
+[browser_perf-details-calltree-render-01.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser_perf-details-calltree-render-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser_perf-details-calltree-render-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser_perf-details-calltree-render-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser_perf-details-calltree-render-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,34 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the call tree view renders after recording.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, CallTreeView } = panel.panelWin;
+
+  let updated = 0;
+  CallTreeView.on(EVENTS.CALL_TREE_RENDERED, () => updated++);
+
+  yield startRecording(panel);
+  yield busyWait(100);
+
+  let rendered = once(CallTreeView, EVENTS.CALL_TREE_RENDERED);
+  yield stopRecording(panel);
+  yield rendered;
+
+  ok(true, "CallTreeView rendered on recording completed.");
+
+  yield startRecording(panel);
+  yield busyWait(100);
+
+  rendered = once(CallTreeView, EVENTS.CALL_TREE_RENDERED);
+  yield stopRecording(panel);
+  yield rendered;
+
+  ok(true, "CallTreeView rendered again after recording completed a second time.");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser_perf-overview-render-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser_perf-overview-render-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser_perf-overview-render-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser_perf-overview-render-01.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,20 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the overview renders content when recording.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, OverviewView } = panel.panelWin;
+
+  yield startRecording(panel);
+ 
+  yield once(OverviewView, EVENTS.OVERVIEW_RENDERED);
+  yield once(OverviewView, EVENTS.OVERVIEW_RENDERED);
+
+  yield stopRecording(panel);
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser_perf-overview-render-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser_perf-overview-render-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/browser_perf-overview-render-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/browser_perf-overview-render-02.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,41 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the overview graphs cannot be selected during recording
+ * and that they're cleared upon rerecording.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, OverviewView } = panel.panelWin;
+
+  yield startRecording(panel);
+
+  ok("selectionEnabled" in OverviewView.framerateGraph,
+    "The selection should not be enabled for the framerate overview (1).");
+  is(OverviewView.framerateGraph.selectionEnabled, false,
+    "The selection should not be enabled for the framerate overview (2).");
+  is(OverviewView.framerateGraph.hasSelection(), false,
+    "The framerate overview shouldn't have a selection before recording.");
+
+  let updated = 0;
+  OverviewView.on(EVENTS.OVERVIEW_RENDERED, () => updated++);
+
+  ok((yield waitUntil(() => updated > 10)),
+    "The overviews were updated several times.");
+
+  ok("selectionEnabled" in OverviewView.framerateGraph,
+    "The selection should still not be enabled for the framerate overview (1).");
+  is(OverviewView.framerateGraph.selectionEnabled, false,
+    "The selection should still not be enabled for the framerate overview (2).");
+  is(OverviewView.framerateGraph.hasSelection(), false,
+    "The framerate overview still shouldn't have a selection before recording.");
+
+  yield stopRecording(panel);
+
+  is(OverviewView.framerateGraph.selectionEnabled, true,
+    "The selection should now be enabled for the framerate overview.");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/test/head.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/test/head.js	2014-11-26 21:45:50.000000000 +0000
@@ -219,7 +219,7 @@
   ok(!button.hasAttribute("locked"),
     "The record button should not be locked yet.");
 
-  EventUtils.synthesizeMouseAtCenter(button, {}, win);
+  EventUtils.sendMouseEvent({ type: "click" }, button, win);
 
   yield clicked;
 
@@ -247,7 +247,7 @@
   ok(!button.hasAttribute("locked"),
     "The record button should not be locked yet.");
 
-  EventUtils.synthesizeMouseAtCenter(button, {}, win);
+  EventUtils.sendMouseEvent({ type: "click" }, button, win);
 
   yield clicked;
 
@@ -263,3 +263,22 @@
   ok(!button.hasAttribute("locked"),
     "The record button should not be locked.");
 }
+
+/**
+ * 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 (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-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/call-tree.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/call-tree.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/call-tree.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/call-tree.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,73 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+/**
+ * CallTree view containing profiler call tree, controlled by DetailsView.
+ */
+let CallTreeView = {
+  /**
+   * Sets up the view with event binding.
+   */
+  initialize: function () {
+    this.el = $(".call-tree");
+    this._graphEl = $(".call-tree-cells-container");
+    this._stop = this._stop.bind(this);
+
+    PerformanceController.on(EVENTS.RECORDING_STOPPED, this._stop);
+  },
+
+  /**
+   * Unbinds events.
+   */
+  destroy: function () {
+    PerformanceController.off(EVENTS.RECORDING_STOPPED, this._stop);
+  },
+
+  _stop: function (_, { profilerData }) {
+    this._prepareCallTree(profilerData);
+  },
+
+  /**
+   * Called when the recording is stopped and prepares data to
+   * populate the call tree.
+   */
+  _prepareCallTree: function (profilerData, beginAt, endAt, options={}) {
+    let threadSamples = profilerData.profile.threads[0].samples;
+    let contentOnly = !Prefs.showPlatformData;
+    // TODO handle inverted tree bug 1102347
+    let invertTree = false;
+
+    let threadNode = new ThreadNode(threadSamples, contentOnly, beginAt, endAt, invertTree);
+    options.inverted = invertTree && threadNode.samples > 0;
+
+    this._populateCallTree(threadNode, options);
+  },
+
+  /**
+   * Renders the call tree.
+   */
+  _populateCallTree: function (frameNode, options={}) {
+    let root = new CallView({
+      autoExpandDepth: options.inverted ? 0 : undefined,
+      frame: frameNode,
+      hidden: options.inverted,
+      inverted: options.inverted
+    });
+
+    // Clear out other graphs
+    this._graphEl.innerHTML = "";
+    root.attachTo(this._graphEl);
+
+    let contentOnly = !Prefs.showPlatformData;
+    root.toggleCategories(!contentOnly);
+
+    this.emit(EVENTS.CALL_TREE_RENDERED);
+  }
+};
+
+/**
+ * Convenient way of emitting events from the view.
+ */
+EventEmitter.decorate(CallTreeView);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/details.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/details.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/details.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/details.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+/**
+ * Details view containing profiler call tree. Manages
+ * subviews and toggles visibility between them.
+ */
+let DetailsView = {
+  /**
+   * Sets up the view with event binding, initializes
+   * subviews.
+   */
+  initialize: function () {
+    this.views = {
+      callTree: CallTreeView
+    };
+
+    // Initialize subviews
+    return promise.all([
+      CallTreeView.initialize()
+    ]);
+  },
+
+  /**
+   * Unbinds events, destroys subviews.
+   */
+  destroy: function () {
+    return promise.all([
+      CallTreeView.destroy()
+    ]);
+  }
+};
+
+/**
+ * Convenient way of emitting events from the view.
+ */
+EventEmitter.decorate(DetailsView);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/main.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/main.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/main.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/main.js	2014-11-26 21:45:50.000000000 +0000
@@ -8,7 +8,7 @@
  */
 let PerformanceView = {
   /**
-   * Sets up the view with event binding.
+   * Sets up the view with event binding and main subviews.
    */
   initialize: function () {
     this._recordButton = $("#record-button");
@@ -16,20 +16,30 @@
     this._onRecordButtonClick = this._onRecordButtonClick.bind(this);
     this._unlockRecordButton = this._unlockRecordButton.bind(this);
 
-    this._recordButton.addEventListener("mouseup", this._onRecordButtonClick);
+    this._recordButton.addEventListener("click", this._onRecordButtonClick);
 
     // Bind to controller events to unlock the record button
     PerformanceController.on(EVENTS.RECORDING_STARTED, this._unlockRecordButton);
     PerformanceController.on(EVENTS.RECORDING_STOPPED, this._unlockRecordButton);
+
+    return promise.all([
+      OverviewView.initialize(),
+      DetailsView.initialize()
+    ]);
   },
 
   /**
-   * Unbinds events.
+   * Unbinds events and destroys subviews.
    */
   destroy: function () {
-    this._recordButton.removeEventListener("mouseup", this._onRecordButtonClick);
+    this._recordButton.removeEventListener("click", this._onRecordButtonClick);
     PerformanceController.off(EVENTS.RECORDING_STARTED, this._unlockRecordButton);
     PerformanceController.off(EVENTS.RECORDING_STOPPED, this._unlockRecordButton);
+
+    return promise.all([
+      OverviewView.destroy(),
+      DetailsView.destroy()
+    ]);
   },
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/overview.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/overview.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/performance/views/overview.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/performance/views/overview.js	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,107 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 OVERVIEW_UPDATE_INTERVAL = 100;
+const FRAMERATE_CALC_INTERVAL = 16; // ms
+const FRAMERATE_GRAPH_HEIGHT = 60; // px
+
+/**
+ * View handler for the overview panel's time view, displaying
+ * framerate over time.
+ */
+let OverviewView = {
+
+  /**
+   * Sets up the view with event binding.
+   */
+  initialize: function () {
+    this._framerateEl = $("#time-framerate");
+    this._ticksData = [];
+
+    this._start = this._start.bind(this);
+    this._stop = this._stop.bind(this);
+    this._onTimelineData = this._onTimelineData.bind(this);
+    this._onRecordingTick = this._onRecordingTick.bind(this);
+
+    this._initializeFramerateGraph();
+
+    PerformanceController.on(EVENTS.RECORDING_STARTED, this._start);
+    PerformanceController.on(EVENTS.RECORDING_STOPPED, this._stop);
+    PerformanceController.on(EVENTS.TIMELINE_DATA, this._onTimelineData);
+  },
+
+  /**
+   * Unbinds events.
+   */
+  destroy: function () {
+    PerformanceController.off(EVENTS.RECORDING_STARTED, this._start);
+    PerformanceController.off(EVENTS.RECORDING_STOPPED, this._stop);
+  },
+
+  /**
+   * Called at most every OVERVIEW_UPDATE_INTERVAL milliseconds
+   * and uses data fetched from `_onTimelineData` to render
+   * data into all the corresponding overview graphs.
+   */
+  _onRecordingTick: Task.async(function *() {
+    yield this.framerateGraph.setDataWhenReady(this._ticksData);
+    this.emit(EVENTS.OVERVIEW_RENDERED);
+    this._draw();
+  }),
+
+  /**
+   * Sets up the framerate graph.
+   */
+  _initializeFramerateGraph: function () {
+    let graph = new LineGraphWidget(this._framerateEl, L10N.getStr("graphs.fps"));
+    graph.minDistanceBetweenPoints = 1;
+    graph.fixedHeight = FRAMERATE_GRAPH_HEIGHT;
+    graph.selectionEnabled = false;
+    this.framerateGraph = graph;
+  },
+
+  /**
+   * Called to refresh the timer to keep firing _onRecordingTick.
+   */
+  _draw: function () {
+    // Check here to see if there's still a _timeoutId, incase
+    // `stop` was called before the _draw call was executed.
+    if (this._timeoutId) {
+      this._timeoutId = setTimeout(this._onRecordingTick, OVERVIEW_UPDATE_INTERVAL);
+    }
+  },
+
+  /**
+   * Event handlers
+   */
+
+  _start: function () {
+    this._timeoutId = setTimeout(this._onRecordingTick, OVERVIEW_UPDATE_INTERVAL);
+    this.framerateGraph.dropSelection();
+  },
+
+  _stop: function () {
+    clearTimeout(this._timeoutId);
+    this.framerateGraph.selectionEnabled = true;
+  },
+
+  /**
+   * Called when the TimelineFront has new data for
+   * framerate, markers or memory, and stores the data
+   * to be plotted subsequently.
+   */
+  _onTimelineData: function (_, eventName, ...data) {
+    if (eventName === "ticks") {
+      let [delta, timestamps] = data;
+      // the `ticks` event on the TimelineFront returns all ticks for the
+      // recording session, so just convert to plottable values
+      // and store.
+      this._ticksData = FramerateFront.plotFPS(timestamps, FRAMERATE_CALC_INTERVAL);
+    }
+  }
+};
+
+// Decorates the OverviewView as an EventEmitter
+EventEmitter.decorate(OverviewView);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/profiler/utils/tree-model.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/profiler/utils/tree-model.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/profiler/utils/tree-model.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/profiler/utils/tree-model.js	2014-11-26 21:45:50.000000000 +0000
@@ -82,8 +82,7 @@
    *        Specifies if the call tree should be inverted (youngest -> oldest
    *        frames).
    */
-  insert: function(sample, contentOnly = false, beginAt = 0, endAt = Infinity,
-                   inverted = false) {
+  insert: function(sample, contentOnly = false, beginAt = 0, endAt = Infinity, inverted = false) {
     let sampleTime = sample.time;
     if (!sampleTime || sampleTime < beginAt || sampleTime > endAt) {
       return;
@@ -94,31 +93,26 @@
     // Filter out platform frames if only content-related function calls
     // should be taken into consideration.
     if (contentOnly) {
+      // The (root) node is not considered a content function, it'll be removed.
       sampleFrames = sampleFrames.filter(isContent);
+    } else {
+      // Remove the (root) node manually.
+      sampleFrames = sampleFrames.slice(1);
     }
-
     if (!sampleFrames.length) {
       return;
     }
-
     if (inverted) {
       sampleFrames.reverse();
-      if (!contentOnly) {
-        // Remove the (root) node -- we don't want it as a leaf in the inverted
-        // tree.
-        sampleFrames.pop();
-      }
     }
 
-    let startIndex = (inverted || contentOnly) ? 0 : 1;
-
     let sampleDuration = sampleTime - this._previousSampleTime;
     this._previousSampleTime = sampleTime;
     this.samples++;
     this.duration += sampleDuration;
 
     FrameNode.prototype.insert(
-      sampleFrames, startIndex, sampleTime, sampleDuration, this.calls);
+      sampleFrames, 0, sampleTime, sampleDuration, this.calls);
   },
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/styleinspector/computed-view.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/styleinspector/computed-view.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/styleinspector/computed-view.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/styleinspector/computed-view.js	2014-11-26 21:45:50.000000000 +0000
@@ -574,7 +574,10 @@
     let mozProps = [];
     for (let i = 0, numStyles = styles.length; i < numStyles; i++) {
       let prop = styles.item(i);
-      if (prop.charAt(0) == "-") {
+      if (prop.startsWith("--")) {
+        // Skip any CSS variables used inside of browser CSS files
+        continue;
+      } else if (prop.startsWith("-")) {
         mozProps.push(prop);
       } else {
         CssHtmlTree.propertyNames.push(prop);
@@ -1009,7 +1012,7 @@
   {
     if (this.visible) {
       let isDark = this.tree._darkStripe = !this.tree._darkStripe;
-      return isDark ? "property-view theme-bg-darker" : "property-view";
+      return isDark ? "property-view row-striped" : "property-view";
     }
     return "property-view-hidden";
   },
@@ -1023,7 +1026,7 @@
   {
     if (this.visible) {
       let isDark = this.tree._darkStripe;
-      return isDark ? "property-content theme-bg-darker" : "property-content";
+      return isDark ? "property-content row-striped" : "property-content";
     }
     return "property-content-hidden";
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/styleinspector/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/styleinspector/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/styleinspector/test/browser.ini	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/styleinspector/test/browser.ini	2014-11-26 21:45:50.000000000 +0000
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = e10s && os == 'linux' # bug 1104908
 subsuite = devtools
 support-files =
   doc_content_stylesheet.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/moz.build	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/moz.build	2014-11-26 21:45:51.000000000 +0000
@@ -6,6 +6,7 @@
 EXTRA_JS_MODULES.devtools.timeline += [
     'panel.js',
     'widgets/global.js',
+    'widgets/marker-details.js',
     'widgets/markers-overview.js',
     'widgets/memory-overview.js',
     'widgets/waterfall.js'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser.ini	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,3 +15,4 @@
 [browser_timeline_waterfall-background.js]
 [browser_timeline_waterfall-generic.js]
 [browser_timeline_waterfall-styles.js]
+[browser_timeline_waterfall-sidebar.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser_timeline_panels.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser_timeline_panels.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser_timeline_panels.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser_timeline_panels.js	2014-11-26 21:45:51.000000000 +0000
@@ -34,7 +34,7 @@
 
   is($("#record-button").hasAttribute("checked"), false,
     "The record button should be unchecked again.");
-  is($("#timeline-pane").selectedPanel, $("#timeline-waterfall"),
+  is($("#timeline-pane").selectedPanel, $("#timeline-waterfall-container"),
     "A waterfall view is now displayed.");
 
   yield teardown(panel);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if the sidebar is properly updated when a marker is selected.
+ */
+
+let test = Task.async(function*() {
+  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
+  let { $, $$, EVENTS, TimelineController, TimelineView } = panel.panelWin;
+  let { L10N } = devtools.require("devtools/timeline/global");
+
+  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();
+  ok(true, "Recording has ended.");
+
+  // Select everything
+  TimelineView.markersOverview.setSelection({ start: 0, end: TimelineView.markersOverview.width })
+
+
+  let bars = $$(".waterfall-marker-item:not(spacer) > .waterfall-marker-bar");
+  let markers = TimelineController.getMarkers();
+
+  ok(bars.length > 2, "got at least 3 markers");
+
+  let sidebar = $("#timeline-waterfall-details");
+  for (let i = 0; i < bars.length; i++) {
+    let bar = bars[i];
+    bar.click();
+    let m = markers[i];
+
+    is($("#timeline-waterfall-details .marker-details-type").getAttribute("value"), m.name,
+      "sidebar title matches markers name");
+
+    let printedStartTime = $(".marker-details-start .marker-details-labelvalue").getAttribute("value");
+    let printedEndTime = $(".marker-details-end .marker-details-labelvalue").getAttribute("value");
+    let printedDuration= $(".marker-details-duration .marker-details-labelvalue").getAttribute("value");
+
+    let toMs = ms => L10N.getFormatStrWithNumbers("timeline.tick", ms);
+
+    // Values are rounded. We don't use a strict equality.
+    is(toMs(m.start), printedStartTime, "sidebar start time is valid");
+    is(toMs(m.end), printedEndTime, "sidebar end time is valid");
+    is(toMs(m.end - m.start), printedDuration, "sidebar duration is valid");
+  }
+
+  yield teardown(panel);
+  finish();
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js	2014-11-26 21:45:51.000000000 +0000
@@ -13,6 +13,8 @@
  "rgb(96, 201, 58)": "hsl(104,57%,51%)",
  "rgb(240, 195, 111)": "hsl(39,82%,69%)",
  "rgb(227, 155, 22)": "hsl(39,82%,49%)",
+ "rgb(204, 204, 204)": "hsl(0,0%,80%)",
+ "rgb(153, 153, 153)": "hsl(0,0%,60%)",
 };
 
 let test = Task.async(function*() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/doc_simple-test.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/doc_simple-test.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/test/doc_simple-test.html	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/test/doc_simple-test.html	2014-11-26 21:45:51.000000000 +0000
@@ -10,12 +10,11 @@
 
   <body>
     <script type="text/javascript">
+      var x = 1;
       function test() {
-        var a = "Hello world!";
-        document.body.style.backgroundColor = "rgba(" +
-          ((Math.random() * 64)|0) + "," +
-          ((Math.random() * 16)|0) + "," +
-          ((Math.random() * 16)|0) + ",1)";
+        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-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/timeline.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/timeline.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/timeline.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/timeline.js	2014-11-26 21:45:51.000000000 +0000
@@ -18,6 +18,8 @@
   "devtools/timeline/memory-overview", true);
 devtools.lazyRequireGetter(this, "Waterfall",
   "devtools/timeline/waterfall", true);
+devtools.lazyRequireGetter(this, "MarkerDetails",
+  "devtools/timeline/marker-details", true);
 
 devtools.lazyImporter(this, "CanvasGraphUtils",
   "resource:///modules/devtools/Graphs.jsm");
@@ -183,7 +185,17 @@
    * updating the UI as needed.
    */
   _stopRecordingAndDiscardData: function*() {
+    // Clear the markers before calling async method _stopRecording to properly
+    // reset the selection if markers were already received. Bug 1092452.
+    this._markers.length = 0;
+    this._memory.length = 0;
+
     yield this._stopRecording();
+
+    // Clear the markers after _stopRecording has finished. It's possible that
+    // server sent new markers before it received the request to stop sending
+    // them and client received them while we were waiting for _stopRecording
+    // to finish. Bug 1067287.
     this._markers.length = 0;
     this._memory.length = 0;
   },
@@ -240,11 +252,17 @@
   initialize: Task.async(function*() {
     this.markersOverview = new MarkersOverview($("#markers-overview"));
     this.waterfall = new Waterfall($("#timeline-waterfall"));
+    this.markerDetails = new MarkerDetails($("#timeline-waterfall-details"));
 
     this._onSelecting = this._onSelecting.bind(this);
     this._onRefresh = this._onRefresh.bind(this);
     this.markersOverview.on("selecting", this._onSelecting);
     this.markersOverview.on("refresh", this._onRefresh);
+    this.markerDetails.on("resize", this._onRefresh);
+
+    this._onMarkerSelected = this._onMarkerSelected.bind(this);
+    this.waterfall.on("selected", this._onMarkerSelected);
+    this.waterfall.on("unselected", this._onMarkerSelected);
 
     yield this.markersOverview.ready();
     yield this.waterfall.recalculateBounds();
@@ -254,6 +272,9 @@
    * Destruction function, called when the tool is closed.
    */
   destroy: function() {
+    this.markerDetails.off("resize", this._onRefresh);
+    this.waterfall.off("selected", this._onMarkerSelected);
+    this.waterfall.off("unselected", this._onMarkerSelected);
     this.markersOverview.off("selecting", this._onSelecting);
     this.markersOverview.off("refresh", this._onRefresh);
     this.markersOverview.destroy();
@@ -291,6 +312,18 @@
   },
 
   /**
+   * A marker has been selected in the waterfall.
+   */
+  _onMarkerSelected: function(event, marker) {
+    if (event == "selected") {
+      this.markerDetails.render(marker);
+    }
+    if (event == "unselected") {
+      this.markerDetails.empty();
+    }
+  },
+
+  /**
    * Signals that a recording session has started and triggers the appropriate
    * changes in the UI.
    */
@@ -318,7 +351,7 @@
   handleRecordingEnded: function() {
     $("#record-button").removeAttribute("checked");
     $("#memory-checkbox").removeAttribute("disabled");
-    $("#timeline-pane").selectedPanel = $("#timeline-waterfall");
+    $("#timeline-pane").selectedPanel = $("#timeline-waterfall-container");
 
     this.markersOverview.selectionEnabled = true;
 
@@ -336,9 +369,9 @@
       let end = start + this.markersOverview.width * OVERVIEW_INITIAL_SELECTION_RATIO;
       this.markersOverview.setSelection({ start, end });
     } else {
-      let timeStart = interval.startTime;
-      let timeEnd = interval.endTime;
-      this.waterfall.setData(markers, timeStart, timeStart, timeEnd);
+      let startTime = interval.startTime;
+      let endTime = interval.endTime;
+      this.waterfall.setData(markers, startTime, startTime, endTime);
     }
 
     window.emit(EVENTS.RECORDING_ENDED);
@@ -372,6 +405,14 @@
       this.waterfall.clearView();
       return;
     }
+    this.waterfall.resetSelection();
+    this.updateWaterfall();
+  },
+
+  /**
+   * Rebuild the waterfall.
+   */
+  updateWaterfall: function() {
     let selection = this.markersOverview.getSelection();
     let start = selection.start / this.markersOverview.dataScaleX;
     let end = selection.end / this.markersOverview.dataScaleX;
@@ -379,9 +420,10 @@
     let markers = TimelineController.getMarkers();
     let interval = TimelineController.getInterval();
 
-    let timeStart = interval.startTime + Math.min(start, end);
-    let timeEnd = interval.startTime + Math.max(start, end);
-    this.waterfall.setData(markers, interval.startTime, timeStart, timeEnd);
+    let startTime = interval.startTime + Math.min(start, end);
+    let endTime = interval.startTime + Math.max(start, end);
+
+    this.waterfall.setData(markers, interval.startTime, startTime, endTime);
   },
 
   /**
@@ -389,7 +431,7 @@
    */
   _onRefresh: function() {
     this.waterfall.recalculateBounds();
-    this._onSelecting();
+    this.updateWaterfall();
   }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/timeline.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/timeline.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/timeline.xul	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/timeline.xul	2014-11-26 21:45:51.000000000 +0000
@@ -4,8 +4,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/devtools/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/timeline.css" type="text/css"?>
+
 <!DOCTYPE window [
   <!ENTITY % timelineDTD SYSTEM "chrome://browser/locale/devtools/timeline.dtd">
   %timelineDTD;
@@ -66,7 +68,11 @@
         <label value="&timelineUI.stopNotice2;"/>
       </hbox>
 
-      <vbox id="timeline-waterfall" flex="1"/>
+      <hbox id="timeline-waterfall-container" class="devtools-responsive-container" flex="1">
+        <vbox id="timeline-waterfall" flex="1"/>
+        <splitter class="devtools-side-splitter"/>
+        <vbox id="timeline-waterfall-details" class="theme-sidebar" width="150" height="150"/>
+      </hbox>
     </deck>
   </vbox>
 </window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/widgets/global.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/widgets/global.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/widgets/global.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/widgets/global.js	2014-11-26 21:45:51.000000000 +0000
@@ -55,7 +55,13 @@
     fill: "hsl(0,0%,80%)",
     stroke: "hsl(0,0%,60%)",
     label: L10N.getStr("timeline.label.consoleTime")
-  }
+  },
+  "Javascript": {
+    group: 4,
+    fill: "hsl(0,0%,80%)",
+    stroke: "hsl(0,0%,60%)",
+    label: L10N.getStr("timeline.label.javascript")
+  },
 };
 
 // Exported symbols.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/widgets/marker-details.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/widgets/marker-details.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/widgets/marker-details.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/widgets/marker-details.js	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,184 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+let { Ci } = require("chrome");
+
+/**
+ * This file contains the rendering code for the marker sidebar.
+ */
+
+loader.lazyRequireGetter(this, "L10N",
+  "devtools/timeline/global", true);
+loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
+  "devtools/timeline/global", true);
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
+
+/**
+ * A detailed view for one single marker.
+ *
+ * @param nsIDOMNode parent
+ *        The parent node holding the view.
+ */
+function MarkerDetails(parent) {
+  EventEmitter.decorate(this);
+  this._document = parent.ownerDocument;
+  this._parent = parent;
+  this._splitter = this._document.querySelector("#timeline-waterfall-container > splitter");
+  this._splitter.addEventListener("mouseup", () => this.emit("resize"));
+}
+
+MarkerDetails.prototype = {
+  destroy: function() {
+    this.empty();
+    this._parent = null;
+  },
+
+  /**
+   * Clears the view.
+   */
+  empty: function() {
+    this._parent.innerHTML = "";
+  },
+
+  /**
+   * Builds the label representing marker's type.
+   *
+   * @param string type
+   *        Could be "Paint", "Reflow", "Styles", ...
+   *        See TIMELINE_BLUEPRINT in widgets/global.js
+   */
+  buildMarkerTypeLabel: function(type) {
+    let blueprint = TIMELINE_BLUEPRINT[type];
+
+    let hbox = this._document.createElement("hbox");
+    hbox.setAttribute("align", "center");
+
+    let bullet = this._document.createElement("hbox");
+    bullet.className = "marker-details-bullet";
+    bullet.style.backgroundColor = blueprint.fill;
+    bullet.style.borderColor = blueprint.stroke;
+
+    let label = this._document.createElement("label");
+    label.className = "marker-details-type";
+    label.setAttribute("value", blueprint.label);
+
+    hbox.appendChild(bullet);
+    hbox.appendChild(label);
+
+    return hbox;
+  },
+
+  /**
+   * Builds labels for name:value pairs. Like "Start: 100ms",
+   * "Duration: 200ms", ...
+   *
+   * @param string l10nName
+   *        String identifier for label's name.
+   * @param string value
+   *        Label's value.
+   */
+  buildNameValueLabel: function(l10nName, value) {
+    let hbox = this._document.createElement("hbox");
+    let labelName = this._document.createElement("label");
+    let labelValue = this._document.createElement("label");
+    labelName.className = "marker-details-labelname";
+    labelValue.className = "marker-details-labelvalue";
+    labelName.setAttribute("value", L10N.getStr(l10nName));
+    labelValue.setAttribute("value", value);
+    hbox.appendChild(labelName);
+    hbox.appendChild(labelValue);
+    return hbox;
+  },
+
+  /**
+   * Populates view with marker's details.
+   *
+   * @param object marker
+   *        The marker to display.
+   */
+  render: function(marker) {
+    this.empty();
+
+    // UI for any marker
+
+    let title = this.buildMarkerTypeLabel(marker.name);
+
+    let toMs = ms => L10N.getFormatStrWithNumbers("timeline.tick", ms);
+
+    let start = this.buildNameValueLabel("timeline.markerDetail.start", toMs(marker.start));
+    let end = this.buildNameValueLabel("timeline.markerDetail.end", toMs(marker.end));
+    let duration = this.buildNameValueLabel("timeline.markerDetail.duration", toMs(marker.end - marker.start));
+
+    start.classList.add("marker-details-start");
+    end.classList.add("marker-details-end");
+    duration.classList.add("marker-details-duration");
+
+    this._parent.appendChild(title);
+    this._parent.appendChild(start);
+    this._parent.appendChild(end);
+    this._parent.appendChild(duration);
+
+    // UI for specific markers
+
+    switch (marker.name) {
+      case "ConsoleTime":
+        this.renderConsoleTimeMarker(this._parent, marker);
+        break;
+      case "DOMEvent":
+        this.renderDOMEventMarker(this._parent, marker);
+        break;
+      default:
+    }
+  },
+
+  /**
+   * Render details of a console marker (console.time).
+   *
+   * @param nsIDOMNode parent
+   *        The parent node holding the view.
+   * @param object marker
+   *        The marker to display.
+   */
+  renderConsoleTimeMarker: function(parent, marker) {
+    if ("causeName" in marker) {
+      let timerName = this.buildNameValueLabel("timeline.markerDetail.consoleTimerName", marker.causeName);
+      this._parent.appendChild(timerName);
+    }
+  },
+
+  /**
+   * Render details of a DOM Event marker.
+   *
+   * @param nsIDOMNode parent
+   *        The parent node holding the view.
+   * @param object marker
+   *        The marker to display.
+   */
+  renderDOMEventMarker: function(parent, marker) {
+    if ("type" in marker) {
+      let type = this.buildNameValueLabel("timeline.markerDetail.DOMEventType", marker.type);
+      this._parent.appendChild(type);
+    }
+    if ("eventPhase" in marker) {
+      let phaseL10NProp;
+      if (marker.eventPhase == Ci.nsIDOMEvent.AT_TARGET) {
+        phaseL10NProp = "timeline.markerDetail.DOMEventTargetPhase";
+      }
+      if (marker.eventPhase == Ci.nsIDOMEvent.CAPTURING_PHASE) {
+        phaseL10NProp = "timeline.markerDetail.DOMEventCapturingPhase";
+      }
+      if (marker.eventPhase == Ci.nsIDOMEvent.BUBBLING_PHASE) {
+        phaseL10NProp = "timeline.markerDetail.DOMEventBubblingPhase";
+      }
+      let phase = this.buildNameValueLabel("timeline.markerDetail.DOMEventPhase", L10N.getStr(phaseL10NProp));
+      this._parent.appendChild(phase);
+    }
+  },
+
+}
+
+exports.MarkerDetails = MarkerDetails;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/widgets/waterfall.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/widgets/waterfall.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/timeline/widgets/waterfall.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/timeline/widgets/waterfall.js	2014-11-26 21:45:51.000000000 +0000
@@ -8,7 +8,7 @@
  * of all the markers in the timeline data.
  */
 
-const {Cc, Ci, Cu, Cr} = require("chrome");
+const {Ci, Cu} = require("chrome");
 
 loader.lazyRequireGetter(this, "L10N",
   "devtools/timeline/global", true);
@@ -19,6 +19,8 @@
   "resource:///modules/devtools/ViewHelpers.jsm");
 loader.lazyImporter(this, "clearNamedTimeout",
   "resource:///modules/devtools/ViewHelpers.jsm");
+loader.lazyRequireGetter(this, "EventEmitter",
+  "devtools/toolkit/event-emitter");
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 
@@ -39,6 +41,8 @@
 const WATERFALL_BACKGROUND_TICKS_OPACITY_ADD = 32; // byte
 const WATERFALL_MARKER_BAR_WIDTH_MIN = 5; // px
 
+const WATERFALL_ROWCOUNT_ONPAGEUPDOWN = 10;
+
 /**
  * A detailed waterfall view for the timeline data.
  *
@@ -46,6 +50,7 @@
  *        The parent node holding the waterfall.
  */
 function Waterfall(parent) {
+  EventEmitter.decorate(this);
   this._parent = parent;
   this._document = parent.ownerDocument;
   this._fragment = this._document.createDocumentFragment();
@@ -60,6 +65,8 @@
   this._listContents.setAttribute("flex", "1");
   this._parent.appendChild(this._listContents);
 
+  this.setupKeys();
+
   this._isRTL = this._getRTL();
 
   // Lazy require is a bit slow, and these are hot objects.
@@ -67,6 +74,10 @@
   this._blueprint = TIMELINE_BLUEPRINT;
   this._setNamedTimeout = setNamedTimeout;
   this._clearNamedTimeout = clearNamedTimeout;
+
+  // Selected row index. By default, we want the first
+  // row to be selected.
+  this._selectedRowIdx = 0;
 }
 
 Waterfall.prototype = {
@@ -77,20 +88,55 @@
    *        A list of markers received from the controller.
    * @param number timeEpoch
    *        The absolute time (in milliseconds) when the recording started.
-   * @param number timeStart
+   * @param number startTime
    *        The time (in milliseconds) to start drawing from.
-   * @param number timeEnd
+   * @param number endTime
    *        The time (in milliseconds) to end drawing at.
    */
-  setData: function(markers, timeEpoch, timeStart, timeEnd) {
+  setData: function(markers, timeEpoch, startTime, endTime) {
     this.clearView();
+    this._markers = markers;
 
-    let dataScale = this._waterfallWidth / (timeEnd - timeStart);
+    let dataScale = this._waterfallWidth / (endTime - startTime);
     this._drawWaterfallBackground(dataScale);
 
     // Label the header as if the first possible marker was at T=0.
-    this._buildHeader(this._headerContents, timeStart - timeEpoch, dataScale);
-    this._buildMarkers(this._listContents, markers, timeStart, timeEnd, dataScale);
+    this._buildHeader(this._headerContents, startTime - timeEpoch, dataScale);
+    this._buildMarkers(this._listContents, markers, startTime, endTime, dataScale);
+    this.selectRow(this._selectedRowIdx);
+  },
+
+  /**
+   * Keybindings.
+   */
+  setupKeys: function() {
+    let pane = this._document.querySelector("#timeline-pane");
+    pane.parentNode.parentNode.addEventListener("keydown", e => {
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_UP) {
+        e.preventDefault();
+        this.selectNearestRow(this._selectedRowIdx - 1);
+      }
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_DOWN) {
+        e.preventDefault();
+        this.selectNearestRow(this._selectedRowIdx + 1);
+      }
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_HOME) {
+        e.preventDefault();
+        this.selectNearestRow(0);
+      }
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_END) {
+        e.preventDefault();
+        this.selectNearestRow(this._listContents.children.length);
+      }
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_UP) {
+        e.preventDefault();
+        this.selectNearestRow(this._selectedRowIdx - WATERFALL_ROWCOUNT_ONPAGEUPDOWN);
+      }
+      if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN) {
+        e.preventDefault();
+        this.selectNearestRow(this._selectedRowIdx + WATERFALL_ROWCOUNT_ONPAGEUPDOWN);
+      }
+    }, true);
   },
 
   /**
@@ -122,12 +168,12 @@
    *
    * @param nsIDOMNode parent
    *        The parent node holding the header.
-   * @param number timeStart
+   * @param number startTime
    *        @see Waterfall.prototype.setData
    * @param number dataScale
    *        The time scale of the data source.
    */
-  _buildHeader: function(parent, timeStart, dataScale) {
+  _buildHeader: function(parent, startTime, dataScale) {
     let container = this._document.createElement("hbox");
     container.className = "waterfall-header-container";
     container.setAttribute("flex", "1");
@@ -159,7 +205,7 @@
 
     for (let x = 0; x < this._waterfallWidth; x += tickInterval) {
       let start = x + direction * WATERFALL_HEADER_TEXT_PADDING;
-      let time = Math.round(timeStart + x / dataScale);
+      let time = Math.round(startTime + x / dataScale);
       let label = this._l10n.getFormatStr("timeline.tick", time);
 
       let node = this._document.createElement("label");
@@ -177,23 +223,25 @@
    *
    * @param nsIDOMNode parent
    *        The parent node holding the markers.
-   * @param number timeStart
+   * @param number startTime
    *        @see Waterfall.prototype.setData
    * @param number dataScale
    *        The time scale of the data source.
    */
-  _buildMarkers: function(parent, markers, timeStart, timeEnd, dataScale) {
-    let processed = 0;
+  _buildMarkers: function(parent, markers, startTime, endTime, dataScale) {
+    let rowsCount = 0;
+    let markerIdx = -1;
 
     for (let marker of markers) {
-      if (!isMarkerInRange(marker, timeStart, timeEnd)) {
+      markerIdx++;
+      if (!isMarkerInRange(marker, startTime, endTime)) {
         continue;
       }
       // Only build and display a finite number of markers initially, to
       // preserve a snappy UI. After a certain delay, continue building the
       // outstanding markers while there's (hopefully) no user interaction.
-      let arguments_ = [this._fragment, marker, timeStart, dataScale];
-      if (processed++ < WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT) {
+      let arguments_ = [this._fragment, marker, startTime, dataScale, markerIdx, rowsCount];
+      if (rowsCount++ < WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT) {
         this._buildMarker.apply(this, arguments_);
       } else {
         this._outstandingMarkers.push(arguments_);
@@ -228,6 +276,7 @@
     }
     this._outstandingMarkers.length = 0;
     parent.appendChild(this._fragment);
+    this.selectRow(this._selectedRowIdx);
   },
 
   /**
@@ -237,18 +286,24 @@
    *        The parent node holding the marker.
    * @param object marker
    *        The { name, start, end } marker in the data source.
-   * @param timeStart
+   * @param startTime
    *        @see Waterfall.prototype.setData
    * @param number dataScale
    *        @see Waterfall.prototype._buildMarkers
+   * @param number markerIdx
+   *        Index of the marker in this._markers
+   * @param number rowIdx
+   *        Index of current row
    */
-  _buildMarker: function(parent, marker, timeStart, dataScale) {
+  _buildMarker: function(parent, marker, startTime, dataScale, markerIdx, rowIdx) {
     let container = this._document.createElement("hbox");
+    container.setAttribute("markerIdx", markerIdx);
     container.className = "waterfall-marker-container";
 
     if (marker) {
       this._buildMarkerSidebar(container, marker);
-      this._buildMarkerWaterfall(container, marker, timeStart, dataScale);
+      this._buildMarkerWaterfall(container, marker, startTime, dataScale, markerIdx);
+      container.onclick = () => this.selectRow(rowIdx);
     } else {
       this._buildMarkerSpacer(container);
       container.setAttribute("flex", "1");
@@ -259,6 +314,83 @@
   },
 
   /**
+   * Select first row.
+   */
+  resetSelection: function() {
+    this.selectRow(0);
+  },
+
+  /**
+   * Select a marker in the waterfall.
+   *
+   * @param number idx
+   *        Index of the row to select. -1 clears the selection.
+   */
+  selectRow: function(idx) {
+    // Unselect
+    let prev = this._listContents.children[this._selectedRowIdx];
+    if (prev) {
+      prev.classList.remove("selected");
+    }
+
+    this._selectedRowIdx = idx;
+
+    let row = this._listContents.children[idx];
+    if (row && !row.hasAttribute("is-spacer")) {
+      row.focus();
+      row.classList.add("selected");
+      let markerIdx = row.getAttribute("markerIdx");
+      this.emit("selected", this._markers[markerIdx]);
+      this.ensureRowIsVisible(row);
+    } else {
+      this.emit("unselected");
+    }
+  },
+
+  /**
+   * Find a valid row to select.
+   *
+   * @param number idx
+   *        Index of the row to select.
+   */
+  selectNearestRow: function(idx) {
+    if (this._listContents.children.length == 0) {
+      return;
+    }
+    idx = Math.max(idx, 0);
+    idx = Math.min(idx, this._listContents.children.length - 1);
+    let row = this._listContents.children[idx];
+    if (row && row.hasAttribute("is-spacer")) {
+      if (idx > 0) {
+        return this.selectNearestRow(idx - 1);
+      } else {
+        return;
+      }
+    }
+    this.selectRow(idx);
+  },
+
+  /**
+   * Scroll waterfall to ensure row is in the viewport.
+   *
+   * @param number idx
+   *        Index of the row to select.
+   */
+  ensureRowIsVisible: function(row) {
+    let parent = row.parentNode;
+    let parentRect = parent.getBoundingClientRect();
+    let rowRect = row.getBoundingClientRect();
+    let yDelta = rowRect.top - parentRect.top;
+    if (yDelta < 0) {
+      parent.scrollTop += yDelta;
+    }
+    yDelta = parentRect.bottom - rowRect.bottom;
+    if (yDelta < 0) {
+      parent.scrollTop -= yDelta;
+    }
+  },
+
+  /**
    * Creates the sidebar part of a marker in this view.
    *
    * @param nsIDOMNode container
@@ -287,10 +419,10 @@
     name.className = "plain waterfall-marker-name";
 
     let label;
-    if (marker.detail && marker.detail.causeName) {
+    if (marker.causeName) {
       label = this._l10n.getFormatStr("timeline.markerDetailFormat",
                                       blueprint.label,
-                                      marker.detail.causeName);
+                                      marker.causeName);
     } else {
       label = blueprint.label;
     }
@@ -308,12 +440,12 @@
    *        The container node representing the marker.
    * @param object marker
    *        @see Waterfall.prototype._buildMarker
-   * @param timeStart
+   * @param startTime
    *        @see Waterfall.prototype.setData
    * @param number dataScale
    *        @see Waterfall.prototype._buildMarkers
    */
-  _buildMarkerWaterfall: function(container, marker, timeStart, dataScale) {
+  _buildMarkerWaterfall: function(container, marker, startTime, dataScale) {
     let blueprint = this._blueprint[marker.name];
 
     let waterfall = this._document.createElement("hbox");
@@ -321,7 +453,7 @@
     waterfall.setAttribute("align", "center");
     waterfall.setAttribute("flex", "1");
 
-    let start = (marker.start - timeStart) * dataScale;
+    let start = (marker.start - startTime) * dataScale;
     let width = (marker.end - marker.start) * dataScale;
     let offset = this._isRTL ? this._waterfallWidth : 0;
 
@@ -329,6 +461,8 @@
     bar.className = "waterfall-marker-bar";
     bar.style.backgroundColor = blueprint.fill;
     bar.style.borderColor = blueprint.stroke;
+    // Save border color. It will change when marker is selected.
+    bar.setAttribute("borderColor", blueprint.stroke);
     bar.style.transform = "translateX(" + (start - offset) + "px)";
     bar.setAttribute("type", marker.name);
     bar.setAttribute("width", Math.max(width, WATERFALL_MARKER_BAR_WIDTH_MIN));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/content/webide.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/content/webide.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/content/webide.js	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/content/webide.js	2014-11-26 21:45:51.000000000 +0000
@@ -72,6 +72,9 @@
 
     AppProjects.load().then(() => {
       this.autoSelectProject();
+    }, e => {
+      console.error(e);
+      this.reportError("error_appProjectsLoadFailed");
     });
 
     // Auto install the ADB Addon Helper and Tools Adapters. Only once.
@@ -256,7 +259,7 @@
     this._busyTimeout = setTimeout(() => {
       this.unbusy();
       UI.reportError("error_operationTimeout", this._busyOperationDescription);
-    }, 6000);
+    }, Services.prefs.getIntPref("devtools.webide.busyTimeout"));
   },
 
   cancelBusyTimeout: function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/modules/runtimes.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/modules/runtimes.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/modules/runtimes.js	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/modules/runtimes.js	2014-11-26 21:45:51.000000000 +0000
@@ -359,7 +359,13 @@
   enable() {},
   disable() {},
   scan() { return promise.resolve(); },
-  listRuntimes() { return [gRemoteRuntime, gLocalRuntime]; }
+  listRuntimes() {
+    let runtimes = [gRemoteRuntime];
+    if (Services.prefs.getBoolPref("devtools.webide.enableLocalRuntime")) {
+      runtimes.push(gLocalRuntime);
+    }
+    return runtimes;
+  }
 };
 
 EventEmitter.decorate(StaticScanner);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/test/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/test/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/test/head.js	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/test/head.js	2014-11-26 21:45:51.000000000 +0000
@@ -22,6 +22,7 @@
 }
 
 Services.prefs.setBoolPref("devtools.webide.enabled", true);
+Services.prefs.setBoolPref("devtools.webide.enableLocalRuntime", true);
 
 Services.prefs.setCharPref("devtools.webide.addonsURL", TEST_BASE + "addons/simulators.json");
 Services.prefs.setCharPref("devtools.webide.simulatorAddonsURL", TEST_BASE + "addons/fxos_#SLASHED_VERSION#_simulator-#OS#.xpi");
@@ -32,6 +33,7 @@
 
 SimpleTest.registerCleanupFunction(() => {
   Services.prefs.clearUserPref("devtools.webide.enabled");
+  Services.prefs.clearUserPref("devtools.webide.enableLocalRuntime");
   Services.prefs.clearUserPref("devtools.webide.autoinstallADBHelper");
   Services.prefs.clearUserPref("devtools.webide.autoinstallFxdtAdapters");
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/webide-prefs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/webide-prefs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/devtools/webide/webide-prefs.js	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/devtools/webide/webide-prefs.js	2014-11-26 21:45:51.000000000 +0000
@@ -12,6 +12,7 @@
 pref("devtools.webide.autoinstallFxdtAdapters", false);
 #endif
 pref("devtools.webide.restoreLastProject", true);
+pref("devtools.webide.enableLocalRuntime", false);
 pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json");
 pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi");
 pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org");
@@ -31,3 +32,4 @@
 pref("devtools.webide.widget.inNavbarByDefault", false);
 #endif
 pref("devtools.webide.zoom", "1");
+pref("devtools.webide.busyTimeout", 10000);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/experiments/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/experiments/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/experiments/Makefile.in	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/experiments/Makefile.in	2014-11-26 21:45:51.000000000 +0000
@@ -8,9 +8,8 @@
 addondir = $(srcdir)/test/addons
 testdir = $(abspath $(DEPTH)/_tests/xpcshell/browser/experiments/test/xpcshell)
 
-libs::
+misc:: $(call mkdir_deps,$(testdir))
 	$(EXIT_ON_ERROR) \
-	$(NSINSTALL) -D $(testdir); \
 	for dir in $(addondir)/*; do \
 	  base=`basename $$dir`; \
 	  (cd $$dir && zip -qr $(testdir)/$$base.xpi *); \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/experiments/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/experiments/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/experiments/moz.build	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/experiments/moz.build	2014-11-26 21:45: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/.
 
+HAS_MISC_RULE = True
+
 EXTRA_COMPONENTS += [
     'Experiments.manifest',
     'ExperimentsService.js',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_zoom.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_zoom.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_zoom.js	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/extensions/pdfjs/test/browser_pdfjs_zoom.js	2014-11-26 21:45:51.000000000 +0000
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+Components.utils.import("resource://gre/modules/Promise.jsm", this);
+
 const RELATIVE_DIR = "browser/extensions/pdfjs/test/";
 const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/Makefile.in	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/Makefile.in	2014-11-26 21:45:51.000000000 +0000
@@ -120,6 +120,13 @@
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+RESPATH = $(_APPNAME)/Contents/Resources
+else
+RESPATH = $(BINPATH)
+endif
+DEFINES += -DRESPATH=$(RESPATH)
+
 AB = $(firstword $(subst -, ,$(AB_CD)))
 DEFINES += -DAB=$(AB)
 
@@ -130,9 +137,6 @@
 ifdef MOZ_SHARED_ICU
 DEFINES += -DMOZ_SHARED_ICU
 endif
-ifdef MOZ_REPLACE_MALLOC
-DEFINES += -DMOZ_REPLACE_MALLOC
-endif
 ifdef MOZ_JEMALLOC3
 DEFINES += -DMOZ_JEMALLOC3
 endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/package-manifest.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/package-manifest.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/package-manifest.in	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/package-manifest.in	2014-11-26 21:45:51.000000000 +0000
@@ -17,69 +17,66 @@
 ; ; file comment
 ;
 
+; Due to Apple Mac OS X packaging requirements, files that are in the same
+; directory on other platforms must be located in different directories on
+; Mac OS X. The following defines allow specifying the Mac OS X bundle
+; location which also work on other platforms.
+;
+; @BINPATH@
+; Equals Contents/MacOS/ on Mac OS X and is the path to the main binary on other
+; platforms.
+;
+; @RESPATH@
+; Equals Contents/Resources/ on Mac OS X and is equivalent to @BINPATH@ on other
+; platforms.
+
 #filter substitution
 
 #ifdef XP_MACOSX
 ; Mac bundle stuff
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
-@APPNAME@/Contents/Resources/firefox.icns
-@APPNAME@/Contents/Resources/document.icns
-@APPNAME@/Contents/Resources/@AB@.lproj/*
+@RESPATH@/firefox.icns
+@RESPATH@/document.icns
+@RESPATH@/@AB@.lproj/*
 #endif
 
 [@AB_CD@]
-@BINPATH@/browser/chrome/@AB_CD@@JAREXT@
-@BINPATH@/browser/chrome/@AB_CD@.manifest
-@BINPATH@/chrome/@AB_CD@@JAREXT@
-@BINPATH@/chrome/@AB_CD@.manifest
-@BINPATH@/browser/defaults/profile/bookmarks.html
-@BINPATH@/browser/defaults/profile/chrome/*
-@BINPATH@/browser/defaults/profile/localstore.rdf
-@BINPATH@/browser/defaults/profile/mimeTypes.rdf
-@BINPATH@/dictionaries/*
-@BINPATH@/hyphenation/*
-@BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
-@BINPATH@/browser/searchplugins/*
+@RESPATH@/browser/chrome/@AB_CD@@JAREXT@
+@RESPATH@/browser/chrome/@AB_CD@.manifest
+@RESPATH@/chrome/@AB_CD@@JAREXT@
+@RESPATH@/chrome/@AB_CD@.manifest
+@RESPATH@/browser/defaults/profile/bookmarks.html
+@RESPATH@/browser/defaults/profile/chrome/*
+@RESPATH@/browser/defaults/profile/localstore.rdf
+@RESPATH@/browser/defaults/profile/mimeTypes.rdf
+@RESPATH@/dictionaries/*
+@RESPATH@/hyphenation/*
+@RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
+@RESPATH@/browser/searchplugins/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
-@BINPATH@/update.locale
-@BINPATH@/updater.ini
+@RESPATH@/update.locale
+@RESPATH@/updater.ini
 #endif
 
 [xpcom]
-@BINPATH@/dependentlibs.list
+@RESPATH@/dependentlibs.list
 #ifdef GKMEDIAS_SHARED_LIBRARY
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#endif
 #ifdef MOZ_SHARED_MOZGLUE
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozglue@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_STATIC_JS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
-#endif
 #ifdef MOZ_DMD
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@dmd@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_NATIVE_NSPR
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@@ -88,13 +85,13 @@
 #endif
 #endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/XUL
+@BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_CHILD_PROCESS_NAME@.app/
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
@@ -124,13 +121,9 @@
 #endif
 #ifdef MOZ_REPLACE_MALLOC
 #ifndef MOZ_JEMALLOC3
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@replace_jemalloc@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@replace_jemalloc@DLL_SUFFIX@
 #endif
 #endif
-#endif
 #ifdef MOZ_GTK3
 @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@mozgtk2@DLL_SUFFIX@
@@ -140,500 +133,497 @@
 ; [Base Browser Files]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
-#elif XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 @BINPATH@/@MOZ_APP_NAME@
 #endif
-@BINPATH@/application.ini
+@RESPATH@/application.ini
 #ifdef MOZ_UPDATER
-@BINPATH@/update-settings.ini
+@RESPATH@/update-settings.ini
 #endif
-@BINPATH@/platform.ini
+@RESPATH@/platform.ini
 #ifndef MOZ_NATIVE_SQLITE
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #endif
-@BINPATH@/browser/blocklist.xml
+@RESPATH@/browser/blocklist.xml
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
-@BINPATH@/run-mozilla.sh
+@RESPATH@/run-mozilla.sh
 #endif
 #endif
 
 ; [Components]
-@BINPATH@/browser/components/components.manifest
-@BINPATH@/components/alerts.xpt
+@RESPATH@/browser/components/components.manifest
+@RESPATH@/components/alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
-@BINPATH@/components/accessibility.xpt
+@RESPATH@/components/accessibility.xpt
 #endif
-@BINPATH@/components/appshell.xpt
-@BINPATH@/components/appstartup.xpt
-@BINPATH@/components/autocomplete.xpt
-@BINPATH@/components/autoconfig.xpt
-@BINPATH@/components/browser-element.xpt
-@BINPATH@/browser/components/browsercompsbase.xpt
-@BINPATH@/browser/components/browser-feeds.xpt
-@BINPATH@/components/caps.xpt
-@BINPATH@/components/chrome.xpt
-@BINPATH@/components/commandhandler.xpt
-@BINPATH@/components/commandlines.xpt
-@BINPATH@/components/composer.xpt
-@BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_geckomediaplugins.xpt
+@RESPATH@/components/appshell.xpt
+@RESPATH@/components/appstartup.xpt
+@RESPATH@/components/autocomplete.xpt
+@RESPATH@/components/autoconfig.xpt
+@RESPATH@/components/browser-element.xpt
+@RESPATH@/browser/components/browsercompsbase.xpt
+@RESPATH@/browser/components/browser-feeds.xpt
+@RESPATH@/components/caps.xpt
+@RESPATH@/components/chrome.xpt
+@RESPATH@/components/commandhandler.xpt
+@RESPATH@/components/commandlines.xpt
+@RESPATH@/components/composer.xpt
+@RESPATH@/components/content_events.xpt
+@RESPATH@/components/content_html.xpt
+@RESPATH@/components/content_geckomediaplugins.xpt
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/content_webrtc.xpt
+@RESPATH@/components/content_webrtc.xpt
 #endif
-@BINPATH@/components/content_xslt.xpt
-@BINPATH@/components/cookie.xpt
-@BINPATH@/components/devtools_security.xpt
-@BINPATH@/components/directory.xpt
-@BINPATH@/components/docshell.xpt
-@BINPATH@/components/dom.xpt
+@RESPATH@/components/content_xslt.xpt
+@RESPATH@/components/cookie.xpt
+@RESPATH@/components/devtools_security.xpt
+@RESPATH@/components/directory.xpt
+@RESPATH@/components/docshell.xpt
+@RESPATH@/components/dom.xpt
 #ifdef MOZ_ACTIVITIES
-@BINPATH@/components/dom_activities.xpt
-@BINPATH@/components/dom_messages.xpt
+@RESPATH@/components/dom_activities.xpt
+@RESPATH@/components/dom_messages.xpt
 #endif
-@BINPATH@/components/dom_apps.xpt
-@BINPATH@/components/dom_base.xpt
-@BINPATH@/components/dom_system.xpt
+@RESPATH@/components/dom_apps.xpt
+@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_system.xpt
 #ifdef MOZ_B2G_BT
-@BINPATH@/components/dom_bluetooth.xpt
+@RESPATH@/components/dom_bluetooth.xpt
 #endif
-@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_alarm.xpt
-@BINPATH@/components/dom_core.xpt
-@BINPATH@/components/dom_css.xpt
-@BINPATH@/components/dom_devicestorage.xpt
-@BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_geolocation.xpt
-@BINPATH@/components/dom_media.xpt
-@BINPATH@/components/dom_network.xpt
-@BINPATH@/components/dom_notification.xpt
-@BINPATH@/components/dom_html.xpt
-@BINPATH@/components/dom_offline.xpt
-@BINPATH@/components/dom_json.xpt
-@BINPATH@/components/dom_power.xpt
-@BINPATH@/components/dom_quota.xpt
-@BINPATH@/components/dom_range.xpt
-@BINPATH@/components/dom_security.xpt
-@BINPATH@/components/dom_settings.xpt
-@BINPATH@/components/dom_permissionsettings.xpt
-@BINPATH@/components/dom_sidebar.xpt
-@BINPATH@/components/dom_cellbroadcast.xpt
-@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_storage.xpt
-@BINPATH@/components/dom_stylesheets.xpt
-@BINPATH@/components/dom_telephony.xpt
-@BINPATH@/components/dom_traversal.xpt
-@BINPATH@/components/dom_tv.xpt
-@BINPATH@/components/dom_voicemail.xpt
+@RESPATH@/components/dom_canvas.xpt
+@RESPATH@/components/dom_alarm.xpt
+@RESPATH@/components/dom_core.xpt
+@RESPATH@/components/dom_css.xpt
+@RESPATH@/components/dom_devicestorage.xpt
+@RESPATH@/components/dom_events.xpt
+@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_media.xpt
+@RESPATH@/components/dom_network.xpt
+@RESPATH@/components/dom_notification.xpt
+@RESPATH@/components/dom_html.xpt
+@RESPATH@/components/dom_offline.xpt
+@RESPATH@/components/dom_json.xpt
+@RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_quota.xpt
+@RESPATH@/components/dom_range.xpt
+@RESPATH@/components/dom_security.xpt
+@RESPATH@/components/dom_settings.xpt
+@RESPATH@/components/dom_permissionsettings.xpt
+@RESPATH@/components/dom_sidebar.xpt
+@RESPATH@/components/dom_cellbroadcast.xpt
+@RESPATH@/components/dom_mobilemessage.xpt
+@RESPATH@/components/dom_storage.xpt
+@RESPATH@/components/dom_stylesheets.xpt
+@RESPATH@/components/dom_telephony.xpt
+@RESPATH@/components/dom_traversal.xpt
+@RESPATH@/components/dom_tv.xpt
+@RESPATH@/components/dom_voicemail.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeechrecognition.xpt
+@RESPATH@/components/dom_webspeechrecognition.xpt
 #endif
-@BINPATH@/components/dom_workers.xpt
-@BINPATH@/components/dom_xbl.xpt
-@BINPATH@/components/dom_xpath.xpt
-@BINPATH@/components/dom_xul.xpt
+@RESPATH@/components/dom_workers.xpt
+@RESPATH@/components/dom_xbl.xpt
+@RESPATH@/components/dom_xpath.xpt
+@RESPATH@/components/dom_xul.xpt
 #ifdef MOZ_GAMEPAD
-@BINPATH@/components/dom_gamepad.xpt
+@RESPATH@/components/dom_gamepad.xpt
 #endif
-@BINPATH@/components/dom_payment.xpt
-@BINPATH@/components/downloads.xpt
-@BINPATH@/components/editor.xpt
-@BINPATH@/components/embed_base.xpt
-@BINPATH@/components/extensions.xpt
-@BINPATH@/components/exthandler.xpt
-@BINPATH@/components/exthelper.xpt
-@BINPATH@/components/fastfind.xpt
-@BINPATH@/components/feeds.xpt
+@RESPATH@/components/dom_payment.xpt
+@RESPATH@/components/downloads.xpt
+@RESPATH@/components/editor.xpt
+@RESPATH@/components/embed_base.xpt
+@RESPATH@/components/extensions.xpt
+@RESPATH@/components/exthandler.xpt
+@RESPATH@/components/exthelper.xpt
+@RESPATH@/components/fastfind.xpt
+@RESPATH@/components/feeds.xpt
 #ifdef MOZ_GTK
-@BINPATH@/components/filepicker.xpt
+@RESPATH@/components/filepicker.xpt
 #endif
-@BINPATH@/components/find.xpt
-@BINPATH@/browser/components/fuel.xpt
-@BINPATH@/components/gfx.xpt
-@BINPATH@/components/html5.xpt
-@BINPATH@/components/htmlparser.xpt
-@BINPATH@/components/identity.xpt
-@BINPATH@/components/imglib2.xpt
-@BINPATH@/components/imgicon.xpt
-@BINPATH@/components/inspector.xpt
-@BINPATH@/components/intl.xpt
-@BINPATH@/components/jar.xpt
-@BINPATH@/components/jsdebugger.xpt
-@BINPATH@/components/jsdownloads.xpt
-@BINPATH@/components/jsinspector.xpt
-@BINPATH@/components/layout_base.xpt
+@RESPATH@/components/find.xpt
+@RESPATH@/browser/components/fuel.xpt
+@RESPATH@/components/gfx.xpt
+@RESPATH@/components/html5.xpt
+@RESPATH@/components/htmlparser.xpt
+@RESPATH@/components/identity.xpt
+@RESPATH@/components/imglib2.xpt
+@RESPATH@/components/imgicon.xpt
+@RESPATH@/components/inspector.xpt
+@RESPATH@/components/intl.xpt
+@RESPATH@/components/jar.xpt
+@RESPATH@/components/jsdebugger.xpt
+@RESPATH@/components/jsdownloads.xpt
+@RESPATH@/components/jsinspector.xpt
+@RESPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
-@BINPATH@/components/layout_printing.xpt
+@RESPATH@/components/layout_printing.xpt
 #endif
-@BINPATH@/components/layout_xul_tree.xpt
-@BINPATH@/components/layout_xul.xpt
-@BINPATH@/components/locale.xpt
-@BINPATH@/components/lwbrk.xpt
-@BINPATH@/browser/components/migration.xpt
-@BINPATH@/components/mimetype.xpt
-@BINPATH@/components/mozfind.xpt
-@BINPATH@/components/necko_about.xpt
-@BINPATH@/components/necko_cache.xpt
-@BINPATH@/components/necko_cache2.xpt
-@BINPATH@/components/necko_cookie.xpt
-@BINPATH@/components/necko_dns.xpt
-@BINPATH@/components/necko_file.xpt
-@BINPATH@/components/necko_ftp.xpt
-@BINPATH@/components/necko_http.xpt
-@BINPATH@/components/necko_res.xpt
-@BINPATH@/components/necko_socket.xpt
-@BINPATH@/components/necko_strconv.xpt
-@BINPATH@/components/necko_viewsource.xpt
-@BINPATH@/components/necko_websocket.xpt
+@RESPATH@/components/layout_xul_tree.xpt
+@RESPATH@/components/layout_xul.xpt
+@RESPATH@/components/locale.xpt
+@RESPATH@/components/lwbrk.xpt
+@RESPATH@/browser/components/migration.xpt
+@RESPATH@/components/mimetype.xpt
+@RESPATH@/components/mozfind.xpt
+@RESPATH@/components/necko_about.xpt
+@RESPATH@/components/necko_cache.xpt
+@RESPATH@/components/necko_cache2.xpt
+@RESPATH@/components/necko_cookie.xpt
+@RESPATH@/components/necko_dns.xpt
+@RESPATH@/components/necko_file.xpt
+@RESPATH@/components/necko_ftp.xpt
+@RESPATH@/components/necko_http.xpt
+@RESPATH@/components/necko_res.xpt
+@RESPATH@/components/necko_socket.xpt
+@RESPATH@/components/necko_strconv.xpt
+@RESPATH@/components/necko_viewsource.xpt
+@RESPATH@/components/necko_websocket.xpt
 #ifdef NECKO_WIFI
-@BINPATH@/components/necko_wifi.xpt
+@RESPATH@/components/necko_wifi.xpt
 #endif
-@BINPATH@/components/necko_wyciwyg.xpt
-@BINPATH@/components/necko.xpt
-@BINPATH@/components/loginmgr.xpt
-@BINPATH@/components/parentalcontrols.xpt
+@RESPATH@/components/necko_wyciwyg.xpt
+@RESPATH@/components/necko.xpt
+@RESPATH@/components/loginmgr.xpt
+@RESPATH@/components/parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/peerconnection.xpt
+@RESPATH@/components/peerconnection.xpt
 #endif
-@BINPATH@/components/places.xpt
-@BINPATH@/components/plugin.xpt
-@BINPATH@/components/pref.xpt
-@BINPATH@/components/prefetch.xpt
-@BINPATH@/components/profile.xpt
+@RESPATH@/components/places.xpt
+@RESPATH@/components/plugin.xpt
+@RESPATH@/components/pref.xpt
+@RESPATH@/components/prefetch.xpt
+@RESPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@BINPATH@/components/profiler.xpt
+@RESPATH@/components/profiler.xpt
 #endif
-@BINPATH@/components/rdf.xpt
-@BINPATH@/components/satchel.xpt
-@BINPATH@/components/saxparser.xpt
-@BINPATH@/browser/components/sessionstore.xpt
-@BINPATH@/components/services-crypto-component.xpt
+@RESPATH@/components/rdf.xpt
+@RESPATH@/components/satchel.xpt
+@RESPATH@/components/saxparser.xpt
+@RESPATH@/browser/components/sessionstore.xpt
+@RESPATH@/components/services-crypto-component.xpt
 #ifdef MOZ_CAPTIVEDETECT
-@BINPATH@/components/captivedetect.xpt
+@RESPATH@/components/captivedetect.xpt
 #endif
-@BINPATH@/browser/components/shellservice.xpt
-@BINPATH@/components/shistory.xpt
-@BINPATH@/components/spellchecker.xpt
-@BINPATH@/components/storage.xpt
-@BINPATH@/components/toolkit_asyncshutdown.xpt
-@BINPATH@/components/toolkit_filewatcher.xpt
-@BINPATH@/components/toolkit_finalizationwitness.xpt
-@BINPATH@/components/toolkit_formautofill.xpt
-@BINPATH@/components/toolkit_osfile.xpt
-@BINPATH@/components/toolkit_xulstore.xpt
-@BINPATH@/components/toolkitprofile.xpt
+@RESPATH@/browser/components/shellservice.xpt
+@RESPATH@/components/shistory.xpt
+@RESPATH@/components/spellchecker.xpt
+@RESPATH@/components/storage.xpt
+@RESPATH@/components/toolkit_asyncshutdown.xpt
+@RESPATH@/components/toolkit_filewatcher.xpt
+@RESPATH@/components/toolkit_finalizationwitness.xpt
+@RESPATH@/components/toolkit_formautofill.xpt
+@RESPATH@/components/toolkit_osfile.xpt
+@RESPATH@/components/toolkit_xulstore.xpt
+@RESPATH@/components/toolkitprofile.xpt
 #ifdef MOZ_ENABLE_XREMOTE
-@BINPATH@/components/toolkitremote.xpt
-#endif
-@BINPATH@/components/txtsvc.xpt
-@BINPATH@/components/txmgr.xpt
-@BINPATH@/components/uconv.xpt
-@BINPATH@/components/unicharutil.xpt
-@BINPATH@/components/update.xpt
-@BINPATH@/components/uriloader.xpt
-@BINPATH@/components/urlformatter.xpt
-@BINPATH@/components/webBrowser_core.xpt
-@BINPATH@/components/webbrowserpersist.xpt
-@BINPATH@/components/widget.xpt
-#ifdef XP_MACOSX
-@BINPATH@/components/widget_cocoa.xpt
+@RESPATH@/components/toolkitremote.xpt
 #endif
-@BINPATH@/components/windowds.xpt
-@BINPATH@/components/windowwatcher.xpt
-@BINPATH@/components/xpcom_base.xpt
-@BINPATH@/components/xpcom_system.xpt
-@BINPATH@/components/xpcom_components.xpt
-@BINPATH@/components/xpcom_ds.xpt
-@BINPATH@/components/xpcom_io.xpt
-@BINPATH@/components/xpcom_threads.xpt
-@BINPATH@/components/xpcom_xpti.xpt
-@BINPATH@/components/xpconnect.xpt
-@BINPATH@/components/xulapp.xpt
-@BINPATH@/components/xul.xpt
-@BINPATH@/components/xultmpl.xpt
-@BINPATH@/components/zipwriter.xpt
-@BINPATH@/components/telemetry.xpt
+@RESPATH@/components/txtsvc.xpt
+@RESPATH@/components/txmgr.xpt
+@RESPATH@/components/uconv.xpt
+@RESPATH@/components/unicharutil.xpt
+@RESPATH@/components/update.xpt
+@RESPATH@/components/uriloader.xpt
+@RESPATH@/components/urlformatter.xpt
+@RESPATH@/components/webBrowser_core.xpt
+@RESPATH@/components/webbrowserpersist.xpt
+@RESPATH@/components/widget.xpt
+#ifdef XP_MACOSX
+@RESPATH@/components/widget_cocoa.xpt
+#endif
+@RESPATH@/components/windowds.xpt
+@RESPATH@/components/windowwatcher.xpt
+@RESPATH@/components/xpcom_base.xpt
+@RESPATH@/components/xpcom_system.xpt
+@RESPATH@/components/xpcom_components.xpt
+@RESPATH@/components/xpcom_ds.xpt
+@RESPATH@/components/xpcom_io.xpt
+@RESPATH@/components/xpcom_threads.xpt
+@RESPATH@/components/xpcom_xpti.xpt
+@RESPATH@/components/xpconnect.xpt
+@RESPATH@/components/xulapp.xpt
+@RESPATH@/components/xul.xpt
+@RESPATH@/components/xultmpl.xpt
+@RESPATH@/components/zipwriter.xpt
+@RESPATH@/components/telemetry.xpt
 
 ; JavaScript components
-@BINPATH@/components/ChromeNotifications.js
-@BINPATH@/components/ChromeNotifications.manifest
-@BINPATH@/components/ConsoleAPI.manifest
-@BINPATH@/components/ConsoleAPIStorage.js
-@BINPATH@/components/BrowserElementParent.manifest
-@BINPATH@/components/BrowserElementParent.js
-@BINPATH@/components/FeedProcessor.manifest
-@BINPATH@/components/FeedProcessor.js
-@BINPATH@/browser/components/BrowserFeeds.manifest
-@BINPATH@/browser/components/FeedConverter.js
-@BINPATH@/browser/components/FeedWriter.js
-@BINPATH@/browser/components/fuelApplication.manifest
-@BINPATH@/browser/components/fuelApplication.js
-@BINPATH@/browser/components/WebContentConverter.js
-@BINPATH@/browser/components/BrowserComponents.manifest
-@BINPATH@/browser/components/nsBrowserContentHandler.js
-@BINPATH@/browser/components/nsBrowserGlue.js
-@BINPATH@/browser/components/nsSetDefaultBrowser.manifest
-@BINPATH@/browser/components/nsSetDefaultBrowser.js
-@BINPATH@/browser/components/BrowserDownloads.manifest
-@BINPATH@/browser/components/DownloadsStartup.js
-@BINPATH@/browser/components/DownloadsUI.js
-@BINPATH@/browser/components/BrowserPlaces.manifest
-@BINPATH@/browser/components/devtools-clhandler.manifest
-@BINPATH@/browser/components/devtools-clhandler.js
-@BINPATH@/browser/components/webideCli.js
-@BINPATH@/browser/components/webideComponents.manifest
-@BINPATH@/browser/components/Experiments.manifest
-@BINPATH@/browser/components/ExperimentsService.js
-@BINPATH@/browser/components/translation.manifest
-@BINPATH@/components/Downloads.manifest
-@BINPATH@/components/DownloadLegacy.js
-@BINPATH@/components/BrowserPageThumbs.manifest
-@BINPATH@/components/crashmonitor.manifest
-@BINPATH@/components/nsCrashMonitor.js
-@BINPATH@/components/SiteSpecificUserAgent.js
-@BINPATH@/components/SiteSpecificUserAgent.manifest
-@BINPATH@/components/toolkitsearch.manifest
-@BINPATH@/components/nsSearchService.js
-@BINPATH@/components/nsSearchSuggestions.js
-@BINPATH@/components/passwordmgr.manifest
-@BINPATH@/components/nsLoginInfo.js
-@BINPATH@/components/nsLoginManager.js
-@BINPATH@/components/nsLoginManagerPrompter.js
-@BINPATH@/components/storage-json.js
-@BINPATH@/components/crypto-SDR.js
-@BINPATH@/components/jsconsole-clhandler.manifest
-@BINPATH@/components/jsconsole-clhandler.js
-@BINPATH@/components/webvtt.xpt
-@BINPATH@/components/WebVTT.manifest
-@BINPATH@/components/WebVTTParserWrapper.js
+@RESPATH@/components/ChromeNotifications.js
+@RESPATH@/components/ChromeNotifications.manifest
+@RESPATH@/components/ConsoleAPI.manifest
+@RESPATH@/components/ConsoleAPIStorage.js
+@RESPATH@/components/BrowserElementParent.manifest
+@RESPATH@/components/BrowserElementParent.js
+@RESPATH@/components/FeedProcessor.manifest
+@RESPATH@/components/FeedProcessor.js
+@RESPATH@/browser/components/BrowserFeeds.manifest
+@RESPATH@/browser/components/FeedConverter.js
+@RESPATH@/browser/components/FeedWriter.js
+@RESPATH@/browser/components/fuelApplication.manifest
+@RESPATH@/browser/components/fuelApplication.js
+@RESPATH@/browser/components/WebContentConverter.js
+@RESPATH@/browser/components/BrowserComponents.manifest
+@RESPATH@/browser/components/nsBrowserContentHandler.js
+@RESPATH@/browser/components/nsBrowserGlue.js
+@RESPATH@/browser/components/nsSetDefaultBrowser.manifest
+@RESPATH@/browser/components/nsSetDefaultBrowser.js
+@RESPATH@/browser/components/BrowserDownloads.manifest
+@RESPATH@/browser/components/DownloadsStartup.js
+@RESPATH@/browser/components/DownloadsUI.js
+@RESPATH@/browser/components/BrowserPlaces.manifest
+@RESPATH@/browser/components/devtools-clhandler.manifest
+@RESPATH@/browser/components/devtools-clhandler.js
+@RESPATH@/browser/components/webideCli.js
+@RESPATH@/browser/components/webideComponents.manifest
+@RESPATH@/browser/components/Experiments.manifest
+@RESPATH@/browser/components/ExperimentsService.js
+@RESPATH@/browser/components/translation.manifest
+@RESPATH@/components/Downloads.manifest
+@RESPATH@/components/DownloadLegacy.js
+@RESPATH@/components/BrowserPageThumbs.manifest
+@RESPATH@/components/crashmonitor.manifest
+@RESPATH@/components/nsCrashMonitor.js
+@RESPATH@/components/SiteSpecificUserAgent.js
+@RESPATH@/components/SiteSpecificUserAgent.manifest
+@RESPATH@/components/toolkitsearch.manifest
+@RESPATH@/components/nsSearchService.js
+@RESPATH@/components/nsSearchSuggestions.js
+@RESPATH@/components/passwordmgr.manifest
+@RESPATH@/components/nsLoginInfo.js
+@RESPATH@/components/nsLoginManager.js
+@RESPATH@/components/nsLoginManagerPrompter.js
+@RESPATH@/components/storage-json.js
+@RESPATH@/components/crypto-SDR.js
+@RESPATH@/components/jsconsole-clhandler.manifest
+@RESPATH@/components/jsconsole-clhandler.js
+@RESPATH@/components/webvtt.xpt
+@RESPATH@/components/WebVTT.manifest
+@RESPATH@/components/WebVTTParserWrapper.js
 #ifdef MOZ_GTK
-@BINPATH@/components/nsFilePicker.manifest
-@BINPATH@/components/nsFilePicker.js
+@RESPATH@/components/nsFilePicker.manifest
+@RESPATH@/components/nsFilePicker.js
 #endif
-@BINPATH@/components/nsHelperAppDlg.manifest
-@BINPATH@/components/nsHelperAppDlg.js
-@BINPATH@/components/nsDownloadManagerUI.manifest
-@BINPATH@/components/nsDownloadManagerUI.js
-@BINPATH@/components/NetworkGeolocationProvider.manifest
-@BINPATH@/components/NetworkGeolocationProvider.js
-@BINPATH@/browser/components/nsSidebar.manifest
-@BINPATH@/browser/components/nsSidebar.js
-@BINPATH@/components/extensions.manifest
-@BINPATH@/components/addonManager.js
-@BINPATH@/components/amContentHandler.js
-@BINPATH@/components/amInstallTrigger.js
-@BINPATH@/components/amWebInstallListener.js
-@BINPATH@/components/nsBlocklistService.js
+@RESPATH@/components/nsHelperAppDlg.manifest
+@RESPATH@/components/nsHelperAppDlg.js
+@RESPATH@/components/nsDownloadManagerUI.manifest
+@RESPATH@/components/nsDownloadManagerUI.js
+@RESPATH@/components/NetworkGeolocationProvider.manifest
+@RESPATH@/components/NetworkGeolocationProvider.js
+@RESPATH@/browser/components/nsSidebar.manifest
+@RESPATH@/browser/components/nsSidebar.js
+@RESPATH@/components/extensions.manifest
+@RESPATH@/components/addonManager.js
+@RESPATH@/components/amContentHandler.js
+@RESPATH@/components/amInstallTrigger.js
+@RESPATH@/components/amWebInstallListener.js
+@RESPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
-@BINPATH@/components/nsUpdateService.manifest
-@BINPATH@/components/nsUpdateService.js
-@BINPATH@/components/nsUpdateServiceStub.js
-#endif
-@BINPATH@/components/nsUpdateTimerManager.manifest
-@BINPATH@/components/nsUpdateTimerManager.js
-@BINPATH@/components/addoncompat.manifest
-@BINPATH@/components/multiprocessShims.js
-@BINPATH@/components/remoteTagService.js
-@BINPATH@/components/pluginGlue.manifest
-@BINPATH@/components/ProcessSingleton.manifest
-@BINPATH@/components/MainProcessSingleton.js
-@BINPATH@/components/ContentProcessSingleton.js
-@BINPATH@/browser/components/nsSessionStore.manifest
-@BINPATH@/browser/components/nsSessionStartup.js
-@BINPATH@/browser/components/nsSessionStore.js
-@BINPATH@/components/nsURLFormatter.manifest
-@BINPATH@/components/nsURLFormatter.js
-@BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
-@BINPATH@/components/txEXSLTRegExFunctions.manifest
-@BINPATH@/components/txEXSLTRegExFunctions.js
-@BINPATH@/components/toolkitplaces.manifest
-@BINPATH@/components/nsLivemarkService.js
-@BINPATH@/components/nsTaggingService.js
-@BINPATH@/components/nsPlacesAutoComplete.manifest
-@BINPATH@/components/nsPlacesAutoComplete.js
-@BINPATH@/components/UnifiedComplete.manifest
-@BINPATH@/components/UnifiedComplete.js
-@BINPATH@/components/nsPlacesExpiration.js
-@BINPATH@/browser/components/PlacesProtocolHandler.js
-@BINPATH@/components/PlacesCategoriesStarter.js
-@BINPATH@/components/ColorAnalyzer.js
-@BINPATH@/components/PageThumbsProtocol.js
-@BINPATH@/components/nsDefaultCLH.manifest
-@BINPATH@/components/nsDefaultCLH.js
-@BINPATH@/components/nsContentPrefService.manifest
-@BINPATH@/components/nsContentPrefService.js
-@BINPATH@/components/nsContentDispatchChooser.manifest
-@BINPATH@/components/nsContentDispatchChooser.js
-@BINPATH@/components/nsHandlerService.manifest
-@BINPATH@/components/nsHandlerService.js
-@BINPATH@/components/nsWebHandlerApp.manifest
-@BINPATH@/components/nsWebHandlerApp.js
-@BINPATH@/components/satchel.manifest
-@BINPATH@/components/nsFormAutoComplete.js
-@BINPATH@/components/nsFormHistory.js
-@BINPATH@/components/FormHistoryStartup.js
-@BINPATH@/components/nsInputListAutoComplete.js
-@BINPATH@/components/formautofill.manifest
-@BINPATH@/components/FormAutofillContentService.js
-@BINPATH@/components/FormAutofillStartup.js
-@BINPATH@/components/contentAreaDropListener.manifest
-@BINPATH@/components/contentAreaDropListener.js
-@BINPATH@/browser/components/BrowserProfileMigrators.manifest
-@BINPATH@/browser/components/ProfileMigrator.js
-@BINPATH@/browser/components/ChromeProfileMigrator.js
-@BINPATH@/browser/components/FirefoxProfileMigrator.js
+@RESPATH@/components/nsUpdateService.manifest
+@RESPATH@/components/nsUpdateService.js
+@RESPATH@/components/nsUpdateServiceStub.js
+#endif
+@RESPATH@/components/nsUpdateTimerManager.manifest
+@RESPATH@/components/nsUpdateTimerManager.js
+@RESPATH@/components/addoncompat.manifest
+@RESPATH@/components/multiprocessShims.js
+@RESPATH@/components/remoteTagService.js
+@RESPATH@/components/pluginGlue.manifest
+@RESPATH@/components/ProcessSingleton.manifest
+@RESPATH@/components/MainProcessSingleton.js
+@RESPATH@/components/ContentProcessSingleton.js
+@RESPATH@/browser/components/nsSessionStore.manifest
+@RESPATH@/browser/components/nsSessionStartup.js
+@RESPATH@/browser/components/nsSessionStore.js
+@RESPATH@/components/nsURLFormatter.manifest
+@RESPATH@/components/nsURLFormatter.js
+@RESPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
+@RESPATH@/components/txEXSLTRegExFunctions.manifest
+@RESPATH@/components/txEXSLTRegExFunctions.js
+@RESPATH@/components/toolkitplaces.manifest
+@RESPATH@/components/nsLivemarkService.js
+@RESPATH@/components/nsTaggingService.js
+@RESPATH@/components/nsPlacesAutoComplete.manifest
+@RESPATH@/components/nsPlacesAutoComplete.js
+@RESPATH@/components/UnifiedComplete.manifest
+@RESPATH@/components/UnifiedComplete.js
+@RESPATH@/components/nsPlacesExpiration.js
+@RESPATH@/browser/components/PlacesProtocolHandler.js
+@RESPATH@/components/PlacesCategoriesStarter.js
+@RESPATH@/components/ColorAnalyzer.js
+@RESPATH@/components/PageThumbsProtocol.js
+@RESPATH@/components/nsDefaultCLH.manifest
+@RESPATH@/components/nsDefaultCLH.js
+@RESPATH@/components/nsContentPrefService.manifest
+@RESPATH@/components/nsContentPrefService.js
+@RESPATH@/components/nsContentDispatchChooser.manifest
+@RESPATH@/components/nsContentDispatchChooser.js
+@RESPATH@/components/nsHandlerService.manifest
+@RESPATH@/components/nsHandlerService.js
+@RESPATH@/components/nsWebHandlerApp.manifest
+@RESPATH@/components/nsWebHandlerApp.js
+@RESPATH@/components/satchel.manifest
+@RESPATH@/components/nsFormAutoComplete.js
+@RESPATH@/components/nsFormHistory.js
+@RESPATH@/components/FormHistoryStartup.js
+@RESPATH@/components/nsInputListAutoComplete.js
+@RESPATH@/components/formautofill.manifest
+@RESPATH@/components/FormAutofillContentService.js
+@RESPATH@/components/FormAutofillStartup.js
+@RESPATH@/components/contentAreaDropListener.manifest
+@RESPATH@/components/contentAreaDropListener.js
+@RESPATH@/browser/components/BrowserProfileMigrators.manifest
+@RESPATH@/browser/components/ProfileMigrator.js
+@RESPATH@/browser/components/ChromeProfileMigrator.js
+@RESPATH@/browser/components/FirefoxProfileMigrator.js
 #ifdef XP_WIN
-@BINPATH@/browser/components/IEProfileMigrator.js
-@BINPATH@/browser/components/SafariProfileMigrator.js
+@RESPATH@/browser/components/IEProfileMigrator.js
+@RESPATH@/browser/components/SafariProfileMigrator.js
 #endif
 #ifdef XP_MACOSX
-@BINPATH@/browser/components/SafariProfileMigrator.js
+@RESPATH@/browser/components/SafariProfileMigrator.js
 #endif
 #ifdef MOZ_ENABLE_DBUS
-@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
-@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
 #ifdef MOZ_ENABLE_GNOMEVFS
-@BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
 #if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS)
-@BINPATH@/components/components.manifest
+@RESPATH@/components/components.manifest
 #endif
-@BINPATH@/components/nsINIProcessor.manifest
-@BINPATH@/components/nsINIProcessor.js
-@BINPATH@/components/nsPrompter.manifest
-@BINPATH@/components/nsPrompter.js
+@RESPATH@/components/nsINIProcessor.manifest
+@RESPATH@/components/nsINIProcessor.js
+@RESPATH@/components/nsPrompter.manifest
+@RESPATH@/components/nsPrompter.js
 #ifdef MOZ_DATA_REPORTING
-@BINPATH@/components/DataReporting.manifest
-@BINPATH@/components/DataReportingService.js
+@RESPATH@/components/DataReporting.manifest
+@RESPATH@/components/DataReportingService.js
 #endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
-@BINPATH@/components/HealthReportComponents.manifest
-@BINPATH@/browser/components/SelfSupportService.manifest
-@BINPATH@/browser/components/SelfSupportService.js
+@RESPATH@/components/HealthReportComponents.manifest
+@RESPATH@/browser/components/SelfSupportService.manifest
+@RESPATH@/browser/components/SelfSupportService.js
 #endif
 #ifdef MOZ_SERVICES_SYNC
-@BINPATH@/components/SyncComponents.manifest
-@BINPATH@/components/Weave.js
+@RESPATH@/components/SyncComponents.manifest
+@RESPATH@/components/Weave.js
 #endif
 #ifdef MOZ_CAPTIVEDETECT
-@BINPATH@/components/CaptivePortalDetectComponents.manifest
-@BINPATH@/components/captivedetect.js
+@RESPATH@/components/CaptivePortalDetectComponents.manifest
+@RESPATH@/components/captivedetect.js
 #endif
-@BINPATH@/components/servicesComponents.manifest
-@BINPATH@/components/cryptoComponents.manifest
-@BINPATH@/components/TelemetryStartup.js
-@BINPATH@/components/TelemetryStartup.manifest
-@BINPATH@/components/XULStore.js
-@BINPATH@/components/XULStore.manifest
-@BINPATH@/components/messageWakeupService.js
-@BINPATH@/components/messageWakeupService.manifest
-@BINPATH@/components/SettingsManager.js
-@BINPATH@/components/SettingsManager.manifest
-@BINPATH@/components/Webapps.js
-@BINPATH@/components/Webapps.manifest
-@BINPATH@/components/AppsService.js
-@BINPATH@/components/AppsService.manifest
-@BINPATH@/components/nsDOMIdentity.js
-@BINPATH@/components/nsIDService.js
-@BINPATH@/components/Identity.manifest
-@BINPATH@/components/recording-cmdline.js
-@BINPATH@/components/recording-cmdline.manifest
-
-@BINPATH@/components/PermissionSettings.js
-@BINPATH@/components/PermissionSettings.manifest
-@BINPATH@/components/ContactManager.js
-@BINPATH@/components/ContactManager.manifest
-@BINPATH@/components/PhoneNumberService.js
-@BINPATH@/components/PhoneNumberService.manifest
-@BINPATH@/components/NotificationStorage.js
-@BINPATH@/components/NotificationStorage.manifest
-@BINPATH@/components/AlarmsManager.js
-@BINPATH@/components/AlarmsManager.manifest
-@BINPATH@/components/Push.js
-@BINPATH@/components/Push.manifest
-@BINPATH@/components/PushServiceLauncher.js
+@RESPATH@/components/servicesComponents.manifest
+@RESPATH@/components/cryptoComponents.manifest
+@RESPATH@/components/TelemetryStartup.js
+@RESPATH@/components/TelemetryStartup.manifest
+@RESPATH@/components/XULStore.js
+@RESPATH@/components/XULStore.manifest
+@RESPATH@/components/messageWakeupService.js
+@RESPATH@/components/messageWakeupService.manifest
+@RESPATH@/components/SettingsManager.js
+@RESPATH@/components/SettingsManager.manifest
+@RESPATH@/components/Webapps.js
+@RESPATH@/components/Webapps.manifest
+@RESPATH@/components/AppsService.js
+@RESPATH@/components/AppsService.manifest
+@RESPATH@/components/nsDOMIdentity.js
+@RESPATH@/components/nsIDService.js
+@RESPATH@/components/Identity.manifest
+@RESPATH@/components/recording-cmdline.js
+@RESPATH@/components/recording-cmdline.manifest
+
+@RESPATH@/components/PermissionSettings.js
+@RESPATH@/components/PermissionSettings.manifest
+@RESPATH@/components/ContactManager.js
+@RESPATH@/components/ContactManager.manifest
+@RESPATH@/components/PhoneNumberService.js
+@RESPATH@/components/PhoneNumberService.manifest
+@RESPATH@/components/NotificationStorage.js
+@RESPATH@/components/NotificationStorage.manifest
+@RESPATH@/components/AlarmsManager.js
+@RESPATH@/components/AlarmsManager.manifest
+@RESPATH@/components/Push.js
+@RESPATH@/components/Push.manifest
+@RESPATH@/components/PushServiceLauncher.js
 
-@BINPATH@/components/SlowScriptDebug.manifest
-@BINPATH@/components/SlowScriptDebug.js
+@RESPATH@/components/SlowScriptDebug.manifest
+@RESPATH@/components/SlowScriptDebug.js
 
 #ifndef RELEASE_BUILD
-@BINPATH@/components/InterAppComm.manifest
-@BINPATH@/components/InterAppCommService.js
-@BINPATH@/components/InterAppConnection.js
-@BINPATH@/components/InterAppMessagePort.js
+@RESPATH@/components/InterAppComm.manifest
+@RESPATH@/components/InterAppCommService.js
+@RESPATH@/components/InterAppConnection.js
+@RESPATH@/components/InterAppMessagePort.js
 #endif
 
-@BINPATH@/components/TCPSocket.js
-@BINPATH@/components/TCPServerSocket.js
-@BINPATH@/components/TCPSocketParentIntermediary.js
-@BINPATH@/components/TCPSocket.manifest
+@RESPATH@/components/TCPSocket.js
+@RESPATH@/components/TCPServerSocket.js
+@RESPATH@/components/TCPSocketParentIntermediary.js
+@RESPATH@/components/TCPSocket.manifest
 
 #ifdef MOZ_ACTIVITIES
-@BINPATH@/components/SystemMessageInternal.js
-@BINPATH@/components/SystemMessageManager.js
-@BINPATH@/components/SystemMessageManager.manifest
-
-@BINPATH@/components/Activities.manifest
-@BINPATH@/components/ActivityProxy.js
-@BINPATH@/components/ActivityRequestHandler.js
-@BINPATH@/components/ActivityWrapper.js
-@BINPATH@/components/ActivityMessageConfigurator.js
+@RESPATH@/components/SystemMessageInternal.js
+@RESPATH@/components/SystemMessageManager.js
+@RESPATH@/components/SystemMessageManager.manifest
+
+@RESPATH@/components/Activities.manifest
+@RESPATH@/components/ActivityProxy.js
+@RESPATH@/components/ActivityRequestHandler.js
+@RESPATH@/components/ActivityWrapper.js
+@RESPATH@/components/ActivityMessageConfigurator.js
 #endif
 
-@BINPATH@/components/Payment.js
-@BINPATH@/components/PaymentFlowInfo.js
-@BINPATH@/components/Payment.manifest
+@RESPATH@/components/Payment.js
+@RESPATH@/components/PaymentFlowInfo.js
+@RESPATH@/components/Payment.manifest
 
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/PeerConnection.js
-@BINPATH@/components/PeerConnection.manifest
+@RESPATH@/components/PeerConnection.js
+@RESPATH@/components/PeerConnection.manifest
 #endif
 
-@BINPATH@/chrome/marionette@JAREXT@
-@BINPATH@/chrome/marionette.manifest
-@BINPATH@/components/MarionetteComponents.manifest
-@BINPATH@/components/marionettecomponent.js
+@RESPATH@/chrome/marionette@JAREXT@
+@RESPATH@/chrome/marionette.manifest
+@RESPATH@/components/MarionetteComponents.manifest
+@RESPATH@/components/marionettecomponent.js
 
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeechsynth.xpt
+@RESPATH@/components/dom_webspeechsynth.xpt
 #endif
 
-@BINPATH@/components/nsAsyncShutdown.manifest
-@BINPATH@/components/nsAsyncShutdown.js
+@RESPATH@/components/nsAsyncShutdown.manifest
+@RESPATH@/components/nsAsyncShutdown.js
 
 ; InputMethod API
-@BINPATH@/components/MozKeyboard.js
-@BINPATH@/components/InputMethod.manifest
+@RESPATH@/components/MozKeyboard.js
+@RESPATH@/components/InputMethod.manifest
 
 #ifdef MOZ_DEBUG
-@BINPATH@/components/TestInterfaceJS.js
-@BINPATH@/components/TestInterfaceJS.manifest
+@RESPATH@/components/TestInterfaceJS.js
+@RESPATH@/components/TestInterfaceJS.manifest
 #endif
 
 ; Modules
-@BINPATH@/browser/modules/*
-@BINPATH@/modules/*
+@RESPATH@/browser/modules/*
+@RESPATH@/modules/*
 
 ; Safe Browsing
 #ifdef MOZ_URL_CLASSIFIER
-@BINPATH@/components/nsURLClassifier.manifest
-@BINPATH@/components/nsUrlClassifierHashCompleter.js
-@BINPATH@/components/nsUrlClassifierListManager.js
-@BINPATH@/components/nsUrlClassifierLib.js
-@BINPATH@/components/url-classifier.xpt
+@RESPATH@/components/nsURLClassifier.manifest
+@RESPATH@/components/nsUrlClassifierHashCompleter.js
+@RESPATH@/components/nsUrlClassifierListManager.js
+@RESPATH@/components/nsUrlClassifierLib.js
+@RESPATH@/components/url-classifier.xpt
 #endif
 
 ; ANGLE GLES-on-D3D rendering library
@@ -651,115 +641,115 @@
 #endif # MOZ_ANGLE_RENDERER
 
 ; [Browser Chrome Files]
-@BINPATH@/browser/chrome.manifest
-@BINPATH@/browser/chrome/browser@JAREXT@
-@BINPATH@/browser/chrome/browser.manifest
-@BINPATH@/browser/chrome/pdfjs.manifest
-@BINPATH@/browser/chrome/pdfjs/*
+@RESPATH@/browser/chrome.manifest
+@RESPATH@/browser/chrome/browser@JAREXT@
+@RESPATH@/browser/chrome/browser.manifest
+@RESPATH@/browser/chrome/pdfjs.manifest
+@RESPATH@/browser/chrome/pdfjs/*
 #ifdef NIGHTLY_BUILD
-@BINPATH@/browser/chrome/shumway.manifest
-@BINPATH@/browser/chrome/shumway/*
+@RESPATH@/browser/chrome/shumway.manifest
+@RESPATH@/browser/chrome/shumway/*
 #endif
-@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-@BINPATH@/chrome/toolkit@JAREXT@
-@BINPATH@/chrome/toolkit.manifest
-@BINPATH@/chrome/recording.manifest
-@BINPATH@/chrome/recording/*
+@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@RESPATH@/chrome/toolkit@JAREXT@
+@RESPATH@/chrome/toolkit.manifest
+@RESPATH@/chrome/recording.manifest
+@RESPATH@/chrome/recording/*
 #ifdef MOZ_GTK
-@BINPATH@/browser/chrome/icons/default/default16.png
-@BINPATH@/browser/chrome/icons/default/default32.png
-@BINPATH@/browser/chrome/icons/default/default48.png
+@RESPATH@/browser/chrome/icons/default/default16.png
+@RESPATH@/browser/chrome/icons/default/default32.png
+@RESPATH@/browser/chrome/icons/default/default48.png
 #endif
 
 ; [Webide Files]
-@BINPATH@/browser/chrome/webide@JAREXT@
-@BINPATH@/browser/chrome/webide.manifest
-@BINPATH@/browser/@PREF_DIR@/webide-prefs.js
+@RESPATH@/browser/chrome/webide@JAREXT@
+@RESPATH@/browser/chrome/webide.manifest
+@RESPATH@/browser/@PREF_DIR@/webide-prefs.js
 
 ; shell icons
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 ; shell icons
-@BINPATH@/browser/icons/*.png
+@RESPATH@/browser/icons/*.png
 #ifdef MOZ_UPDATER
 ; updater icon
-@BINPATH@/icons/updater.png
+@RESPATH@/icons/updater.png
 #endif
 #endif
 #endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
-@BINPATH@/browser/@PREF_DIR@/firefox.js
-@BINPATH@/browser/@PREF_DIR@/firefox-branding.js
-@BINPATH@/greprefs.js
-@BINPATH@/defaults/autoconfig/platform.js
-@BINPATH@/defaults/autoconfig/prefcalls.js
-@BINPATH@/browser/defaults/profile/prefs.js
+@RESPATH@/browser/@PREF_DIR@/firefox.js
+@RESPATH@/browser/@PREF_DIR@/firefox-branding.js
+@RESPATH@/greprefs.js
+@RESPATH@/defaults/autoconfig/platform.js
+@RESPATH@/defaults/autoconfig/prefcalls.js
+@RESPATH@/browser/defaults/profile/prefs.js
 
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
-@BINPATH@/defaults/pref/channel-prefs.js
+@RESPATH@/defaults/pref/channel-prefs.js
 #else
 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
-@BINPATH@/@PREF_DIR@/channel-prefs.js
+@RESPATH@/@PREF_DIR@/channel-prefs.js
 #endif
 
 ; Services (gre) prefs
 #ifdef MOZ_SERVICES_NOTIFICATIONS
-@BINPATH@/defaults/pref/services-notifications.js
+@RESPATH@/defaults/pref/services-notifications.js
 #endif
 #ifdef MOZ_SERVICES_SYNC
-@BINPATH@/defaults/pref/services-sync.js
+@RESPATH@/defaults/pref/services-sync.js
 #endif
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
-@BINPATH@/res/EditorOverride.css
-@BINPATH@/res/contenteditable.css
-@BINPATH@/res/designmode.css
-@BINPATH@/res/ImageDocument.css
-@BINPATH@/res/TopLevelImageDocument.css
-@BINPATH@/res/TopLevelVideoDocument.css
-@BINPATH@/res/table-add-column-after-active.gif
-@BINPATH@/res/table-add-column-after-hover.gif
-@BINPATH@/res/table-add-column-after.gif
-@BINPATH@/res/table-add-column-before-active.gif
-@BINPATH@/res/table-add-column-before-hover.gif
-@BINPATH@/res/table-add-column-before.gif
-@BINPATH@/res/table-add-row-after-active.gif
-@BINPATH@/res/table-add-row-after-hover.gif
-@BINPATH@/res/table-add-row-after.gif
-@BINPATH@/res/table-add-row-before-active.gif
-@BINPATH@/res/table-add-row-before-hover.gif
-@BINPATH@/res/table-add-row-before.gif
-@BINPATH@/res/table-remove-column-active.gif
-@BINPATH@/res/table-remove-column-hover.gif
-@BINPATH@/res/table-remove-column.gif
-@BINPATH@/res/table-remove-row-active.gif
-@BINPATH@/res/table-remove-row-hover.gif
-@BINPATH@/res/table-remove-row.gif
-@BINPATH@/res/grabber.gif
-#ifdef XP_MACOSX
-@BINPATH@/res/cursors/*
-#endif
-@BINPATH@/res/fonts/*
-@BINPATH@/res/dtd/*
-@BINPATH@/res/html/*
-@BINPATH@/res/langGroups.properties
-@BINPATH@/res/language.properties
-@BINPATH@/res/entityTables/*
+@RESPATH@/res/EditorOverride.css
+@RESPATH@/res/contenteditable.css
+@RESPATH@/res/designmode.css
+@RESPATH@/res/ImageDocument.css
+@RESPATH@/res/TopLevelImageDocument.css
+@RESPATH@/res/TopLevelVideoDocument.css
+@RESPATH@/res/table-add-column-after-active.gif
+@RESPATH@/res/table-add-column-after-hover.gif
+@RESPATH@/res/table-add-column-after.gif
+@RESPATH@/res/table-add-column-before-active.gif
+@RESPATH@/res/table-add-column-before-hover.gif
+@RESPATH@/res/table-add-column-before.gif
+@RESPATH@/res/table-add-row-after-active.gif
+@RESPATH@/res/table-add-row-after-hover.gif
+@RESPATH@/res/table-add-row-after.gif
+@RESPATH@/res/table-add-row-before-active.gif
+@RESPATH@/res/table-add-row-before-hover.gif
+@RESPATH@/res/table-add-row-before.gif
+@RESPATH@/res/table-remove-column-active.gif
+@RESPATH@/res/table-remove-column-hover.gif
+@RESPATH@/res/table-remove-column.gif
+@RESPATH@/res/table-remove-row-active.gif
+@RESPATH@/res/table-remove-row-hover.gif
+@RESPATH@/res/table-remove-row.gif
+@RESPATH@/res/grabber.gif
+#ifdef XP_MACOSX
+@RESPATH@/res/cursors/*
+#endif
+@RESPATH@/res/fonts/*
+@RESPATH@/res/dtd/*
+@RESPATH@/res/html/*
+@RESPATH@/res/langGroups.properties
+@RESPATH@/res/language.properties
+@RESPATH@/res/entityTables/*
 #ifdef XP_MACOSX
-@BINPATH@/res/MainMenu.nib/
+@RESPATH@/res/MainMenu.nib/
 #endif
 
 ; svg
-@BINPATH@/res/svg.css
-@BINPATH@/components/dom_svg.xpt
-@BINPATH@/components/dom_smil.xpt
+@RESPATH@/res/svg.css
+@RESPATH@/components/dom_svg.xpt
+@RESPATH@/components/dom_smil.xpt
 
 ; [Personal Security Manager]
 ;
@@ -767,45 +757,29 @@
 ; meaning their .chk files are created there directly.
 ;
 #ifndef MOZ_NATIVE_NSS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@freebl3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nss3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#endif
 #ifndef NSS_DISABLE_DBM
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@softokn3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
-#endif
-@BINPATH@/chrome/pippki@JAREXT@
-@BINPATH@/chrome/pippki.manifest
-@BINPATH@/components/pipboot.xpt
-@BINPATH@/components/pipnss.xpt
-@BINPATH@/components/pippki.xpt
+@RESPATH@/chrome/pippki@JAREXT@
+@RESPATH@/chrome/pippki.manifest
+@RESPATH@/components/pipboot.xpt
+@RESPATH@/components/pipnss.xpt
+@RESPATH@/components/pippki.xpt
 
 ; For process sandboxing
 #if defined(MOZ_SANDBOX)
 #if defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
-#elif defined(XP_LINUX)
-@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
 #endif
 #endif
 
@@ -820,7 +794,7 @@
 ;
 #ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/updater.app/
+@BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
@@ -836,19 +810,19 @@
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
-@BINPATH@/components/CrashService.manifest
-@BINPATH@/components/CrashService.js
-@BINPATH@/components/toolkit_crashservice.xpt
+@RESPATH@/components/CrashService.manifest
+@RESPATH@/components/CrashService.js
+@RESPATH@/components/toolkit_crashservice.xpt
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/crashreporter.app/
+@BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
-@BINPATH@/crashreporter.ini
+@RESPATH@/crashreporter.ini
 #ifdef XP_UNIX
-@BINPATH@/Throbber-small.gif
+@RESPATH@/Throbber-small.gif
 #endif
 #endif
-@BINPATH@/browser/crashreporter-override.ini
+@RESPATH@/browser/crashreporter-override.ini
 #ifdef MOZ_CRASHREPORTER_INJECTOR
 @BINPATH@/breakpadinjector.dll
 #endif
@@ -859,61 +833,64 @@
 #ifdef XP_WIN
 @BINPATH@/webapp-uninstaller@BIN_SUFFIX@
 #endif
-@BINPATH@/webapprt-stub@BIN_SUFFIX@
-@BINPATH@/webapprt/webapprt.ini
-@BINPATH@/webapprt/chrome.manifest
-@BINPATH@/webapprt/chrome/webapprt@JAREXT@
-@BINPATH@/webapprt/chrome/webapprt.manifest
-@BINPATH@/webapprt/chrome/@AB_CD@@JAREXT@
-@BINPATH@/webapprt/chrome/@AB_CD@.manifest
-@BINPATH@/webapprt/components/CommandLineHandler.js
-@BINPATH@/webapprt/components/ContentPermission.js
-@BINPATH@/webapprt/components/DirectoryProvider.js
-@BINPATH@/webapprt/components/PaymentUIGlue.js
-@BINPATH@/webapprt/components/components.manifest
-@BINPATH@/webapprt/defaults/preferences/prefs.js
-@BINPATH@/webapprt/modules/DownloadView.jsm
-@BINPATH@/webapprt/modules/Startup.jsm
-@BINPATH@/webapprt/modules/WebappRT.jsm
-@BINPATH@/webapprt/modules/WebappManager.jsm
-@BINPATH@/webapprt/modules/RemoteDebugger.jsm
-@BINPATH@/webapprt/modules/WebRTCHandler.jsm
+@RESPATH@/webapprt-stub@BIN_SUFFIX@
+@RESPATH@/webapprt/webapprt.ini
+@RESPATH@/webapprt/chrome.manifest
+@RESPATH@/webapprt/chrome/webapprt@JAREXT@
+@RESPATH@/webapprt/chrome/webapprt.manifest
+@RESPATH@/webapprt/chrome/@AB_CD@@JAREXT@
+@RESPATH@/webapprt/chrome/@AB_CD@.manifest
+@RESPATH@/webapprt/components/CommandLineHandler.js
+@RESPATH@/webapprt/components/ContentPermission.js
+@RESPATH@/webapprt/components/DirectoryProvider.js
+@RESPATH@/webapprt/components/PaymentUIGlue.js
+@RESPATH@/webapprt/components/components.manifest
+@RESPATH@/webapprt/defaults/preferences/prefs.js
+@RESPATH@/webapprt/modules/DownloadView.jsm
+@RESPATH@/webapprt/modules/Startup.jsm
+@RESPATH@/webapprt/modules/WebappRT.jsm
+@RESPATH@/webapprt/modules/WebappManager.jsm
+@RESPATH@/webapprt/modules/RemoteDebugger.jsm
+@RESPATH@/webapprt/modules/WebRTCHandler.jsm
 #endif
 
 #ifdef MOZ_METRO
-@BINPATH@/components/MetroUIUtils.js
-@BINPATH@/components/MetroUIUtils.manifest
+@RESPATH@/components/MetroUIUtils.js
+@RESPATH@/components/MetroUIUtils.manifest
 [metro]
 ; gre resources
 @BINPATH@/CommandExecuteHandler@BIN_SUFFIX@
-@BINPATH@/resources.pri
-@BINPATH@/VisualElementsManifest.xml
-@BINPATH@/tileresources
+@RESPATH@/resources.pri
+@RESPATH@/VisualElementsManifest.xml
+@RESPATH@/tileresources
 ; app dir resources
-@BINPATH@/metro/chrome.manifest
-@BINPATH@/metro/searchplugins
-@BINPATH@/metro/metroapp.ini
-@BINPATH@/metro/chrome/browser@JAREXT@
-@BINPATH@/metro/chrome/browser.manifest
-@BINPATH@/metro/chrome/chrome@JAREXT@
-@BINPATH@/metro/chrome/chrome.manifest
-@BINPATH@/metro/chrome/@AB_CD@@JAREXT@
-@BINPATH@/metro/chrome/@AB_CD@.manifest
+@RESPATH@/metro/chrome.manifest
+@RESPATH@/metro/searchplugins
+@RESPATH@/metro/metroapp.ini
+@RESPATH@/metro/chrome/browser@JAREXT@
+@RESPATH@/metro/chrome/browser.manifest
+@RESPATH@/metro/chrome/chrome@JAREXT@
+@RESPATH@/metro/chrome/chrome.manifest
+@RESPATH@/metro/chrome/@AB_CD@@JAREXT@
+@RESPATH@/metro/chrome/@AB_CD@.manifest
 #ifdef NIGHTLY_BUILD
-@BINPATH@/metro/chrome/shumway.manifest
-@BINPATH@/metro/chrome/shumway/*
-@BINPATH@/metro/chrome/pdfjs.manifest
-@BINPATH@/metro/chrome/pdfjs/*
-#endif
-@BINPATH@/metro/components
-@BINPATH@/metro/defaults
-@BINPATH@/metro/modules
-#endif
-
-@BINPATH@/components/DataStore.manifest
-@BINPATH@/components/DataStoreImpl.js
-@BINPATH@/components/dom_datastore.xpt
-
+@RESPATH@/metro/chrome/shumway.manifest
+@RESPATH@/metro/chrome/shumway/*
+@RESPATH@/metro/chrome/pdfjs.manifest
+@RESPATH@/metro/chrome/pdfjs/*
+#endif
+@RESPATH@/metro/components
+@RESPATH@/metro/defaults
+@RESPATH@/metro/modules
+#endif
+
+@RESPATH@/components/DataStore.manifest
+@RESPATH@/components/DataStoreImpl.js
+@RESPATH@/components/dom_datastore.xpt
+
+; Shutdown Terminator
+@RESPATH@/components/nsTerminatorTelemetry.js
+@RESPATH@/components/terminator.manifest
 
 #ifdef MOZ_ASAN
 #ifdef CLANG_CXX
@@ -927,6 +904,6 @@
 
 ; media
 #ifdef MOZ_EME
-@BINPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
-@BINPATH@/gmp-clearkey/0.1/clearkey.info
+@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
+@RESPATH@/gmp-clearkey/0.1/clearkey.info
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/defines.nsi.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/defines.nsi.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/defines.nsi.in	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/defines.nsi.in	2014-11-26 21:45:51.000000000 +0000
@@ -36,8 +36,6 @@
 !endif
 !define BrandFullName         "${BrandFullNameInternal}"
 
-!define NO_UNINSTALL_SURVEY
-
 !define CERTIFICATE_NAME      "Mozilla Corporation"
 !define CERTIFICATE_ISSUER    "DigiCert Assured ID Code Signing CA-1"
 
@@ -94,8 +92,10 @@
 # VIAddVersionKey "Comments"        "Comments"
 
 # It isn't possible to get the size of the installation prior to downloading
-# so the stub installer uses an estimate.
-!define APPROXIMATE_REQUIRED_SPACE_MB "42.2"
+# so the stub installer uses an estimate. The size is derived from the size of
+# the complete installer, the size of the extracted complete installer, and at
+# least 15 MB additional for working room.
+!define APPROXIMATE_REQUIRED_SPACE_MB "145"
 
 # Control positions in Dialog Units so they are placed correctly with
 # non-default DPI settings
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/installer.nsi thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/installer.nsi
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/installer.nsi	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/installer.nsi	2014-11-26 21:45:51.000000000 +0000
@@ -96,7 +96,6 @@
 !insertmacro LogQuickLaunchShortcut
 !insertmacro LogStartMenuShortcut
 !insertmacro ManualCloseAppPrompt
-!insertmacro OnStubInstallUninstall
 !insertmacro PinnedToStartMenuLnkCount
 !insertmacro RegCleanAppHandler
 !insertmacro RegCleanMain
@@ -104,13 +103,13 @@
 !ifdef MOZ_METRO
 !insertmacro RemoveDEHRegistrationIfMatching
 !endif
+!insertmacro RemovePrecompleteEntries
 !insertmacro SetAppLSPCategories
 !insertmacro SetBrandNameVars
 !insertmacro UpdateShortcutAppModelIDs
 !insertmacro UnloadUAC
 !insertmacro WriteRegStr2
 !insertmacro WriteRegDWORD2
-!insertmacro CheckIfRegistryKeyExists
 
 !include shared.nsh
 
@@ -211,16 +210,33 @@
   ${Unless} ${Errors}
     ; The configuration file must also exist
     ${If} ${FileExists} "$R7"
+      ReadINIStr $R9 $R7 "Install" "RemoveDistributionDir"
       ReadINIStr $R8 $R7 "Install" "PreventRebootRequired"
       ${If} $R8 == "true"
         StrCpy $PreventRebootRequired "true"
-        StrCpy $R2 "false"
-        StrCpy $R3 "false"
-        ${OnStubInstallUninstall} "$R2" "$R3"
       ${EndIf}
     ${EndIf}
   ${EndUnless}
 
+  ; Remove directories and files we always control before parsing the uninstall
+  ; log so empty directories can be removed.
+  ${If} ${FileExists} "$INSTDIR\updates"
+    RmDir /r "$INSTDIR\updates"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\updated"
+    RmDir /r "$INSTDIR\updated"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\defaults\shortcuts"
+    RmDir /r "$INSTDIR\defaults\shortcuts"
+  ${EndIf}
+  ; Only remove the distribution directory if it exists and if the installer
+  ; isn't launched with an ini file that has RemoveDistributionDir=false in the
+  ; install section.
+  ${If} ${FileExists} "$INSTDIR\distribution"
+  ${AndIf} $R9 != "false"
+    RmDir /r "$INSTDIR\distribution"
+  ${EndIf}
+
   ; Delete the app exe if present to prevent launching the app while we are
   ; installing.
   ClearErrors
@@ -242,6 +258,31 @@
 
   ${RemoveDeprecatedFiles}
 
+  StrCpy $R2 "false"
+  StrCpy $R3 "false"
+  ${RemovePrecompleteEntries} "$R2" "$R3"
+
+  ${If} ${FileExists} "$INSTDIR\defaults\pref\channel-prefs.js"
+    Delete "$INSTDIR\defaults\pref\channel-prefs.js"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\defaults\pref"
+    RmDir "$INSTDIR\defaults\pref"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\defaults"
+    RmDir "$INSTDIR\defaults"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\uninstall"
+    ; Remove the uninstall directory that we control
+    RmDir /r "$INSTDIR\uninstall"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\update-settings.ini"
+    Delete "$INSTDIR\update-settings.ini"
+  ${EndIf}
+
+  ; Explictly remove empty webapprt dir in case it exists (bug 757978).
+  RmDir "$INSTDIR\webapprt\components"
+  RmDir "$INSTDIR\webapprt"
+
   ${InstallStartCleanupCommon}
 SectionEnd
 
@@ -252,8 +293,6 @@
   DetailPrint $(STATUS_INSTALL_APP)
   SetDetailsPrint none
 
-  RmDir /r /REBOOTOK "$INSTDIR\${TO_BE_DELETED}"
-
   ${LogHeader} "Installing Main Files"
   ${CopyFilesFromDir} "$EXEDIR\core" "$INSTDIR" \
                       "$(ERROR_CREATE_DIRECTORY_PREFIX)" \
@@ -274,18 +313,6 @@
     ${LogMsg} "Registered: $INSTDIR\AccessibleMarshal.dll"
   ${EndIf}
 
-  ; Write extra files created by the application to the uninstall log so they
-  ; will be removed when the application is uninstalled. To remove an empty
-  ; directory write a bogus filename to the deepest directory and all empty
-  ; parent directories will be removed.
-  ${LogUninstall} "File: \components\compreg.dat"
-  ${LogUninstall} "File: \components\xpti.dat"
-  ${LogUninstall} "File: \active-update.xml"
-  ${LogUninstall} "File: \install.log"
-  ${LogUninstall} "File: \install_status.log"
-  ${LogUninstall} "File: \install_wizard.log"
-  ${LogUninstall} "File: \updates.xml"
-
   ClearErrors
 
   ; Default for creating Start Menu shortcut
@@ -607,32 +634,38 @@
   ${EndIf}
 
   ${If} ${RebootFlag}
-    ; When a reboot is required give SHChangeNotify time to finish the
-    ; refreshing the icons so the OS doesn't display the icons from helper.exe
-    Sleep 10000
-    ${LogHeader} "Reboot Required To Finish Installation"
-    ; ${FileMainEXE}.moz-upgrade should never exist but just in case...
-    ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade"
-      Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-upgrade"
-    ${EndUnless}
+    ; Admin is required to delete files on reboot so only add the moz-delete if
+    ; the user is an admin. After calling UAC::IsAdmin $0 will equal 1 if the
+    ; user is an admin.
+    UAC::IsAdmin
+    ${If} "$0" == "1"
+      ; When a reboot is required give SHChangeNotify time to finish the
+      ; refreshing the icons so the OS doesn't display the icons from helper.exe
+      Sleep 10000
+      ${LogHeader} "Reboot Required To Finish Installation"
+      ; ${FileMainEXE}.moz-upgrade should never exist but just in case...
+      ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade"
+        Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-upgrade"
+      ${EndUnless}
 
-    ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
-      ClearErrors
-      Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-delete"
-      ${Unless} ${Errors}
-        Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete"
+      ${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
+        ClearErrors
+        Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-delete"
+        ${Unless} ${Errors}
+          Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete"
+        ${EndUnless}
+      ${EndIf}
+
+      ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}"
+        CopyFiles /SILENT "$INSTDIR\uninstall\helper.exe" "$INSTDIR"
+        FileOpen $0 "$INSTDIR\${FileMainEXE}" w
+        FileWrite $0 "Will be deleted on restart"
+        Rename /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}"
+        FileClose $0
+        Delete "$INSTDIR\${FileMainEXE}"
+        Rename "$INSTDIR\helper.exe" "$INSTDIR\${FileMainEXE}"
       ${EndUnless}
     ${EndIf}
-
-    ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}"
-      CopyFiles /SILENT "$INSTDIR\uninstall\helper.exe" "$INSTDIR"
-      FileOpen $0 "$INSTDIR\${FileMainEXE}" w
-      FileWrite $0 "Will be deleted on restart"
-      Rename /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}"
-      FileClose $0
-      Delete "$INSTDIR\${FileMainEXE}"
-      Rename "$INSTDIR\helper.exe" "$INSTDIR\${FileMainEXE}"
-    ${EndUnless}
   ${EndIf}
 SectionEnd
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/stub.nsi thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/stub.nsi
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/stub.nsi	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/stub.nsi	2014-11-26 21:45:51.000000000 +0000
@@ -256,7 +256,7 @@
 !insertmacro GetSingleInstallPath
 !insertmacro GetTextWidthHeight
 !insertmacro IsUserAdmin
-!insertmacro OnStubInstallUninstall
+!insertmacro RemovePrecompleteEntries
 !insertmacro SetBrandNameVars
 !insertmacro UnloadUAC
 
@@ -1540,15 +1540,17 @@
         WriteIniStr "$0" "TASKBAR" "Migrated" "true"
       ${EndIf}
 
-      ${OnStubInstallUninstall} $Progressbar $InstallCounterStep
+      ${RemovePrecompleteEntries} $Progressbar $InstallCounterStep
 
       ; Delete the install.log and let the full installer create it. When the
       ; installer closes it we can detect that it has completed.
       Delete "$INSTDIR\install.log"
 
-      ; Delete firefox.exe.moz-upgrade if it exists since it being present will
-      ; require an OS restart for the full installer.
+      ; Delete firefox.exe.moz-upgrade and firefox.exe.moz-delete if it exists
+      ; since it being present will require an OS restart for the full
+      ; installer.
       Delete "$INSTDIR\${FileMainEXE}.moz-upgrade"
+      Delete "$INSTDIR\${FileMainEXE}.moz-delete"
 
       System::Call "kernel32::GetTickCount()l .s"
       Pop $EndPreInstallPhaseTickCount
@@ -1745,44 +1747,24 @@
 
   ${If} $0 > 1024
   ${OrIf} $0 < 0
-    ; Multiply by 10 so it is possible to display a decimal in the size
-    System::Int64Op $0 * 10
-    Pop $0
     System::Int64Op $0 / 1024
     Pop $0
     StrCpy $1 "$(KILO)$(BYTE)"
-    ${If} $0 > 10240
+    ${If} $0 > 1024
     ${OrIf} $0 < 0
       System::Int64Op $0 / 1024
       Pop $0
       StrCpy $1 "$(MEGA)$(BYTE)"
-      ${If} $0 > 10240
+      ${If} $0 > 1024
       ${OrIf} $0 < 0
         System::Int64Op $0 / 1024
         Pop $0
         StrCpy $1 "$(GIGA)$(BYTE)"
       ${EndIf}
     ${EndIf}
-    StrLen $3 "$0"
-    ${If} $3 > 1
-      StrCpy $2 "$0" -1 ; All characters except the last one
-      StrCpy $0 "$0" "" -1 ; The last character
-      ${If} "$0" == "0"
-        StrCpy $0 "$2" ; Don't display the decimal if it is 0
-      ${Else}
-        StrCpy $0 "$2.$0"
-      ${EndIf}
-    ${ElseIf} $3 == 1
-      StrCpy $0 "0.$0"
-    ${Else}
-      ; This should never happen
-      System::Int64Op $0 / 10
-      Pop $0
-    ${EndIf}
   ${EndIf}
 
   SendMessage $LabelFreeSpace ${WM_SETTEXT} 0 "STR:$0 $1"
-
 FunctionEnd
 
 Function OnChange_DirRequest
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/uninstaller.nsi thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/uninstaller.nsi
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/installer/windows/nsis/uninstaller.nsi	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/installer/windows/nsis/uninstaller.nsi	2014-11-26 21:45:51.000000000 +0000
@@ -93,7 +93,6 @@
 !insertmacro UnloadUAC
 !insertmacro WriteRegDWORD2
 !insertmacro WriteRegStr2
-!insertmacro CheckIfRegistryKeyExists
 
 !insertmacro un.ChangeMUIHeaderImage
 !insertmacro un.CheckForFilesInUse
@@ -104,7 +103,6 @@
 !insertmacro un.GetSecondInstallPath
 !insertmacro un.InitHashAppModelId
 !insertmacro un.ManualCloseAppPrompt
-!insertmacro un.ParseUninstallLog
 !insertmacro un.RegCleanAppHandler
 !insertmacro un.RegCleanFileHandler
 !insertmacro un.RegCleanMain
@@ -114,6 +112,7 @@
 !insertmacro un.RemoveDEHRegistrationIfMatching
 !endif
 !insertmacro un.RemoveQuotesFromPath
+!insertmacro un.RemovePrecompleteEntries
 !insertmacro un.SetAppLSPCategories
 !insertmacro un.SetBrandNameVars
 
@@ -162,28 +161,21 @@
 !insertmacro MUI_UNPAGE_WELCOME
 
 ; Custom Uninstall Confirm Page
-UninstPage custom un.preConfirm un.leaveConfirm
+UninstPage custom un.preConfirm
 
 ; Remove Files Page
 !insertmacro MUI_UNPAGE_INSTFILES
 
 ; Finish Page
 
-; Don't setup the survey controls, functions, etc. when the application has
-; defined NO_UNINSTALL_SURVEY
-!ifndef NO_UNINSTALL_SURVEY
-!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preFinish
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME ""
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(SURVEY_TEXT)
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.Survey
-!endif
-
 !insertmacro MUI_UNPAGE_FINISH
 
 ; Use the default dialog for IDD_VERIFY for a simple Banner
 ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe"
 
+################################################################################
+# Helper Functions
+
 ; This function is used to uninstall the maintenance service if the
 ; application currently being uninstalled is the last application to use the 
 ; maintenance service.
@@ -201,12 +193,14 @@
 
   ; Figure out the number of subkeys
   StrCpy $0 0
-loop:
-  EnumRegKey $1 HKLM "Software\Mozilla\MaintenanceService" $0
-  StrCmp $1 "" doneCount
-  IntOp $0 $0 + 1
-  goto loop
-doneCount:
+  ${Do}
+    EnumRegKey $1 HKLM "Software\Mozilla\MaintenanceService" $0
+    ${If} "$1" == ""
+      ${ExitDo}
+    ${EndIf}
+    IntOp $0 $0 + 1
+  ${Loop}
+
   ; Restore back the registry view
   ${If} ${RunningX64}
     SetRegView lastUsed
@@ -409,42 +403,65 @@
   ${If} ${FileExists} "$INSTDIR\distribution"
     RmDir /r /REBOOTOK "$INSTDIR\distribution"
   ${EndIf}
-  ${If} ${FileExists} "$INSTDIR\removed-files"
-    Delete /REBOOTOK "$INSTDIR\removed-files"
-  ${EndIf}
 
   ; Remove files that may be left behind by the application in the
   ; VirtualStore directory.
   ${un.CleanVirtualStore}
 
-  ; Parse the uninstall log to unregister dll's and remove all installed
-  ; files / directories this install is responsible for.
-  ${un.ParseUninstallLog}
+  ; Only unregister the dll if the registration points to this installation
+  ReadRegStr $R1 HKCR "CLSID\{0D68D6D0-D93D-4D08-A30D-F00DD1F45B24}\InProcServer32" ""
+  ${If} "$INSTDIR\AccessibleMarshal.dll" == "$R1"
+    ${UnregisterDLL} "$INSTDIR\AccessibleMarshal.dll"
+  ${EndIf}
+
+  StrCpy $R2 "false"
+  StrCpy $R3 "false"
+  ${un.RemovePrecompleteEntries} "$R2" "$R3"
 
-  ; Remove the uninstall directory that we control
-  RmDir /r /REBOOTOK "$INSTDIR\uninstall"
+  ${If} ${FileExists} "$INSTDIR\defaults\pref\channel-prefs.js"
+    Delete /REBOOTOK "$INSTDIR\defaults\pref\channel-prefs.js"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\defaults\pref"
+    RmDir /REBOOTOK "$INSTDIR\defaults\pref"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\defaults"
+    RmDir /REBOOTOK "$INSTDIR\defaults"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\uninstall"
+    ; Remove the uninstall directory that we control
+    RmDir /r /REBOOTOK "$INSTDIR\uninstall"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\install.log"
+    Delete /REBOOTOK "$INSTDIR\install.log"
+  ${EndIf}
+  ${If} ${FileExists} "$INSTDIR\update-settings.ini"
+    Delete /REBOOTOK "$INSTDIR\update-settings.ini"
+  ${EndIf}
 
-  ; Explictly remove empty webapprt dir in case it exists
-  ; See bug 757978
+  ; Explictly remove empty webapprt dir in case it exists (bug 757978).
   RmDir "$INSTDIR\webapprt\components"
   RmDir "$INSTDIR\webapprt"
 
-  RmDir /r /REBOOTOK "$INSTDIR\${TO_BE_DELETED}"
-
   ; Remove the installation directory if it is empty
-  ${RemoveDir} "$INSTDIR"
+  RmDir "$INSTDIR"
 
   ; If firefox.exe was successfully deleted yet we still need to restart to
   ; remove other files create a dummy firefox.exe.moz-delete to prevent the
   ; installer from allowing an install without restart when it is required
   ; to complete an uninstall.
   ${If} ${RebootFlag}
-    ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-delete"
-      FileOpen $0 "$INSTDIR\${FileMainEXE}.moz-delete" w
-      FileWrite $0 "Will be deleted on restart"
-      Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete"
-      FileClose $0
-    ${EndUnless}
+    ; Admin is required to delete files on reboot so only add the moz-delete if
+    ; the user is an admin. After calling UAC::IsAdmin $0 will equal 1 if the
+    ; user is an admin.
+    UAC::IsAdmin
+    ${If} "$0" == "1"
+      ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-delete"
+        FileOpen $0 "$INSTDIR\${FileMainEXE}.moz-delete" w
+        FileWrite $0 "Will be deleted on restart"
+        Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete"
+        FileClose $0
+      ${EndUnless}
+    ${EndIf}
   ${EndIf}
 
   ; Refresh desktop icons otherwise the start menu internet item won't be
@@ -458,7 +475,7 @@
   ServicesHelper::PathToUniqueRegistryPath "$INSTDIR"
   Pop $MaintCertKey
   ${If} $MaintCertKey != ""
-    ; We always use the 64bit registry for certs
+    ; Always use the 64bit registry for certs on 64bit systems.
     ${If} ${RunningX64}
       SetRegView 64
     ${EndIf}
@@ -473,17 +490,6 @@
 SectionEnd
 
 ################################################################################
-# Helper Functions
-
-; Don't setup the survey controls, functions, etc. when the application has
-; defined NO_UNINSTALL_SURVEY
-!ifndef NO_UNINSTALL_SURVEY
-Function un.Survey
-  Exec "$\"$TmpVal$\" $\"${SurveyURL}$\""
-FunctionEnd
-!endif
-
-################################################################################
 # Language
 
 !insertmacro MOZ_MUI_LANGUAGE 'baseLocale'
@@ -594,50 +600,6 @@
   !insertmacro MUI_INSTALLOPTIONS_SHOW
 FunctionEnd
 
-Function un.leaveConfirm
-  ; Try to delete the app executable and if we can't delete it try to find the
-  ; app's message window and prompt the user to close the app. This allows
-  ; running an instance that is located in another directory. If for whatever
-  ; reason there is no message window we will just rename the app's files and
-  ; then remove them on restart if they are in use.
-  ClearErrors
-  ${DeleteFile} "$INSTDIR\${FileMainEXE}"
-  ${If} ${Errors}
-    ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)"
-  ${EndIf}
-FunctionEnd
-
-!ifndef NO_UNINSTALL_SURVEY
-Function un.preFinish
-  ; Do not modify the finish page if there is a reboot pending
-  ${Unless} ${RebootFlag}
-    ; Setup the survey controls, functions, etc.
-    StrCpy $TmpVal "SOFTWARE\Microsoft\IE Setup\Setup"
-    ClearErrors
-    ReadRegStr $0 HKLM $TmpVal "Path"
-    ${If} ${Errors}
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
-    ${Else}
-      ExpandEnvStrings $0 "$0" ; this value will usually contain %programfiles%
-      ${If} $0 != "\"
-        StrCpy $0 "$0\"
-      ${EndIf}
-      StrCpy $0 "$0\iexplore.exe"
-      ClearErrors
-      GetFullPathName $TmpVal $0
-      ${If} ${Errors}
-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
-      ${Else}
-        ; When we add an optional action to the finish page the cancel button
-        ; is enabled. This disables it and leaves the finish button as the
-        ; only choice.
-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0"
-      ${EndIf}
-    ${EndIf}
-  ${EndUnless}
-FunctionEnd
-!endif
-
 ################################################################################
 # Initialization Functions
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.properties	2014-11-26 21:45:51.000000000 +0000
@@ -1,2 +1,6 @@
-title=You're browsing privately
-title.normal=Open a private window?
\ No newline at end of file
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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=You're browsing privately
+title.normal=Open a private window?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/browser.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/browser.dtd	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/browser.dtd	2014-11-26 21:45:51.000000000 +0000
@@ -724,7 +724,7 @@
 <!ENTITY customizeMode.lwthemes.menuManage.accessKey "M">
 <!ENTITY customizeMode.lwthemes.menuGetMore "Get More Themes">
 <!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "G">
-<!ENTITY customizeMode.deveditionTheme.label "Use &brandShortName; Theme">
+<!ENTITY customizeMode.deveditionTheme.label2 "Use Developer Edition Theme">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/inspector.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/inspector.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/inspector.dtd	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/inspector.dtd	2014-11-26 21:45:51.000000000 +0000
@@ -1,26 +1,96 @@
+<!-- LOCALIZATION NOTE (inspectorHTMLEdit.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users edit the
+     (outer) HTML of the current node -->
 <!ENTITY inspectorHTMLEdit.label       "Edit As HTML">
 <!ENTITY inspectorHTMLEdit.accesskey   "E">
 
+<!-- LOCALIZATION NOTE (inspectorHTMLCopyInner.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users copy the
+     inner HTML of the current node -->
 <!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
+<!-- LOCALIZATION NOTE (inspectorHTMLCopyOuter.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users copy the
+     outer HTML of the current node -->
 <!ENTITY inspectorHTMLCopyOuter.label       "Copy Outer HTML">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
 
+<!-- LOCALIZATION NOTE (inspectorCopyUniqueSelector.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users copy
+     the CSS Selector of the current node -->
 <!ENTITY inspectorCopyUniqueSelector.label       "Copy Unique Selector">
 <!ENTITY inspectorCopyUniqueSelector.accesskey   "U">
 
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteOuter.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users paste outer
+     HTML in the current node -->
 <!ENTITY inspectorHTMLPasteOuter.label      "Paste Outer HTML">
 <!ENTITY inspectorHTMLPasteOuter.accesskey  "P">
 
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteInner.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users paste inner
+     HTML in the current node -->
+<!ENTITY inspectorHTMLPasteInner.label      "Paste Inner HTML">
+<!ENTITY inspectorHTMLPasteInner.accesskey  "N">
+
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteExtraSubmenu.label): This is the label
+     shown in the inspector contextual-menu for the sub-menu of the other Paste
+     items, which allow to paste HTML:
+     - before the current node
+     - after the current node
+     - as the first child of the current node
+     - as the last child of the current node -->
+<!ENTITY inspectorHTMLPasteExtraSubmenu.label      "Paste ...">
+<!ENTITY inspectorHTMLPasteExtraSubmenu.accesskey  "T">
+
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteBefore.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users paste
+     the HTML before the current node -->
+<!ENTITY inspectorHTMLPasteBefore.label      "Before">
+<!ENTITY inspectorHTMLPasteBefore.accesskey  "B">
+
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteAfter.label): This is the label shown
+     in the inspector contextual-menu for the item that lets users paste
+     the HTML after the current node -->
+<!ENTITY inspectorHTMLPasteAfter.label       "After">
+<!ENTITY inspectorHTMLPasteAfter.accesskey   "A">
+
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteFirstChild.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users paste
+     the HTML as the first child the current node -->
+<!ENTITY inspectorHTMLPasteFirstChild.label      "As First Child">
+<!ENTITY inspectorHTMLPasteFirstChild.accesskey  "F">
+
+<!-- LOCALIZATION NOTE (inspectorHTMLPasteLastChild.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users paste
+     the HTML as the last child the current node -->
+<!ENTITY inspectorHTMLPasteLastChild.label       "As Last Child">
+<!ENTITY inspectorHTMLPasteLastChild.accesskey   "L">
+
+
+<!-- LOCALIZATION NOTE (inspectorHTMLDelete.label): This is the label shown in
+     the inspector contextual-menu for the item that lets users delete the
+     current node -->
 <!ENTITY inspectorHTMLDelete.label          "Delete Node">
 <!ENTITY inspectorHTMLDelete.accesskey      "D">
 
 <!ENTITY inspector.selectButton.tooltip     "Select element with mouse">
 
+<!-- LOCALIZATION NOTE (inspectorSearchHTML.label): This is the label shown as
+     the placeholder in inspector search box -->
 <!ENTITY inspectorSearchHTML.label          "Search HTML">
 <!ENTITY inspectorSearchHTML.key            "F">
 
+<!-- LOCALIZATION NOTE (inspectorCopyImageDataUri.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users copy
+     the URL embedding the image data encoded in Base 64 (what we name
+     here Image Data URL). For more information:
+     https://developer.mozilla.org/en-US/docs/Web/HTTP/data_URIs -->
 <!ENTITY inspectorCopyImageDataUri.label       "Copy Image Data-URL">
 
+<!-- LOCALIZATION NOTE (inspectorShowDOMProperties.label): This is the label
+     shown in the inspector contextual-menu for the item that lets users see
+     the DOM properties of the current node. When triggered, this item
+     opens the split Console and displays the properties in its side panel. -->
 <!ENTITY inspectorShowDOMProperties.label       "Show DOM Properties">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/timeline.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/timeline.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/timeline.properties	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/timeline.properties	2014-11-26 21:45:51.000000000 +0000
@@ -38,6 +38,7 @@
 timeline.label.styles=Styles
 timeline.label.reflow=Reflow
 timeline.label.paint=Paint
+timeline.label.javascript=Javascript
 timeline.label.domevent=DOM Event
 timeline.label.consoleTime=Console
 
@@ -52,3 +53,15 @@
 # %1$S is replaced with one of the above label (timeline.label.*) and %2$S
 # with the details. For examples: Paint (200x100), or console.time (FOO)
 timeline.markerDetailFormat=%1$S (%2$S)
+
+# LOCALIZATION NOTE (time.markerDetail.*):
+# Strings used in the waterfall sidebar.
+timeline.markerDetail.start=Start:
+timeline.markerDetail.end=End:
+timeline.markerDetail.duration=Duration:
+timeline.markerDetail.consoleTimerName=Timer Name:
+timeline.markerDetail.DOMEventType=Event Type:
+timeline.markerDetail.DOMEventPhase=Phase:
+timeline.markerDetail.DOMEventTargetPhase=Target
+timeline.markerDetail.DOMEventCapturingPhase=Capture
+timeline.markerDetail.DOMEventBubblingPhase=Bubbling
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2014-11-26 21:45:51.000000000 +0000
@@ -114,10 +114,15 @@
   -  for the target of the toolbox. -->
 <!ENTITY options.toolNotSupported.label  "* Not supported for current toolbox target">
 
-<!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
+<!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label2): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
-<!ENTITY options.selectDevToolsTheme.label   "Choose DevTools theme:">
+<!ENTITY options.selectDevToolsTheme.label2   "Themes">
+
+<!-- LOCALIZATION NOTE (options.usedeveditiontheme.*) Options under the
+  -  toolbox for enabling and disabling the Developer Edition browser theme. -->
+<!ENTITY options.usedeveditiontheme.label   "Use Developer Edition browser theme">
+<!ENTITY options.usedeveditiontheme.tooltip "Toggles the Developer Edition browser theme.">
 
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
@@ -183,3 +188,4 @@
 <!ENTITY options.sourceeditor.keybinding.label          "Keybindings">
 <!ENTITY options.sourceeditor.keybinding.accesskey      "K">
 <!ENTITY options.sourceeditor.keybinding.default.label  "Default">
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/webide.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/webide.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/devtools/webide.properties	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/devtools/webide.properties	2014-11-26 21:45:51.000000000 +0000
@@ -20,7 +20,7 @@
 importHostedApp_header=Enter Manifest URL
 
 notification_showTroubleShooting_label=Troubleshooting
-notification_showTroubleShooting_accesskey=t
+notification_showTroubleShooting_accesskey=T
 
 # LOCALIZATION NOTE (project_tab_loading): This is shown as a temporary tab
 # title for browser tab projects when the tab is still loading.
@@ -42,6 +42,8 @@
 # Variable: error message (in english)
 error_cantFetchAddonsJSON=Can't fetch the add-on list: %S
 
+error_appProjectsLoadFailed=Unable to load project list. This can occur if you've used this profile with a newer version of Firefox.
+
 addons_stable=stable
 addons_unstable=unstable
 # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/preferences/privacy.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/browser/preferences/privacy.dtd	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/browser/preferences/privacy.dtd	2014-11-26 21:45:51.000000000 +0000
@@ -15,13 +15,13 @@
 
 <!ENTITY  locationBar.label             "Location Bar">
 
-<!ENTITY  locbar.pre.label              "When using the location bar, suggest:">
+<!ENTITY  locbar.suggest.label          "When using the location bar, suggest:">
 <!ENTITY  locbar.history.label          "History">
-<!ENTITY  locbar.history.accesskey      "i">
+<!ENTITY  locbar.history.accesskey      "H">
 <!ENTITY  locbar.bookmarks.label        "Bookmarks">
-<!ENTITY  locbar.bookmarks.accesskey    "d">
+<!ENTITY  locbar.bookmarks.accesskey    "k">
 <!ENTITY  locbar.openpage.label         "Open tabs">
-<!ENTITY  locbar.openpage.accesskey     "g">
+<!ENTITY  locbar.openpage.accesskey     "O">
 
 <!ENTITY  acceptCookies.label           "Accept cookies from sites">
 <!ENTITY  acceptCookies.accesskey       "A">
@@ -33,7 +33,7 @@
 <!ENTITY  acceptThirdParty.visited.label  "From visited">
 
 <!ENTITY  keepUntil.label               "Keep until:">
-<!ENTITY  keepUntil.accesskey           "K">
+<!ENTITY  keepUntil.accesskey           "u">
 
 <!ENTITY  expire.label                  "they expire">
 <!ENTITY  close.label                   "I close &brandShortName;">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2014-11-26 21:45:51.000000000 +0000
@@ -31,6 +31,6 @@
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspFrameAncestorBlocked=This page has a content security policy that prevents it from being embedded in this way.
+cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd	2014-11-26 21:45:51.000000000 +0000
@@ -170,8 +170,8 @@
 <p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
+<!ENTITY cspBlocked.title "Blocked by Content Security Policy">
+<!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentError.title "Corrupted Content Error">
 <!ENTITY corruptedContentError.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/metro/base/content/pages/netError.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/metro/base/content/pages/netError.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/metro/base/content/pages/netError.xhtml	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/metro/base/content/pages/netError.xhtml	2014-11-26 21:45:52.000000000 +0000
@@ -156,8 +156,8 @@
           document.getElementById("errorTryAgain").style.display = "none";
         }
 
-        if (err == "cspFrameAncestorBlocked") {
-          // Remove the "Try again" button for CSP frame ancestors violation, since it's
+        if (err == "cspBlocked") {
+          // Remove the "Try again" button for CSP violations, since it's
           // almost certainly useless. (Bug 553180)
           document.getElementById("errorTryAgain").style.display = "none";
         }
@@ -291,7 +291,7 @@
         <h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
-        <h1 id="et_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.title;</h1>
+        <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
       </div>
@@ -316,7 +316,7 @@
         <div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
         <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
-        <div id="ed_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.longDesc;</div>
+        <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
       </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/metro/components/SessionStore.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/metro/components/SessionStore.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/metro/components/SessionStore.js	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/metro/components/SessionStore.js	2014-11-26 21:45:52.000000000 +0000
@@ -806,7 +806,7 @@
 
       let persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].createInstance(Ci.nsIWebBrowserPersist);
       persist.persistFlags = Ci.nsIWebBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES | Ci.nsIWebBrowserPersist.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
-      persist.saveURI(source, null, null, null, null, file);
+      persist.saveURI(source, null, null, 0, null, null, file);
 
       aStringValue = target.spec;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/modules/PluginContent.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/modules/PluginContent.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/modules/PluginContent.jsm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/modules/PluginContent.jsm	2014-11-26 21:45:52.000000000 +0000
@@ -849,30 +849,16 @@
   // Crashed-plugin event listener. Called for every instance of a
   // plugin in content.
   pluginInstanceCrashed: function (target, aEvent) {
-    // Ensure the plugin and event are of the right type.
-    if (!(aEvent instanceof Ci.nsIDOMCustomEvent))
+    if (!(aEvent instanceof this.content.PluginCrashedEvent))
       return;
 
-    let propBag = aEvent.detail.QueryInterface(Ci.nsIPropertyBag2);
-    let submittedReport = propBag.getPropertyAsBool("submittedCrashReport");
-    let doPrompt        = true; // XXX followup for .getPropertyAsBool("doPrompt");
-    let submitReports   = true; // XXX followup for .getPropertyAsBool("submitReports");
-    let pluginName      = propBag.getPropertyAsAString("pluginName");
-    let pluginDumpID    = propBag.getPropertyAsAString("pluginDumpID");
-    let browserDumpID   = null;
-    let gmpPlugin       = false;
-
-    try {
-      browserDumpID = propBag.getPropertyAsAString("browserDumpID");
-    } catch (e) {
-      // For GMP crashes we don't get a browser dump.
-    }
-
-    try {
-      gmpPlugin = propBag.getPropertyAsBool("gmpPlugin");
-    } catch (e) {
-      // This property is only set for GMP plugins.
-    }
+    let submittedReport = aEvent.submittedCrashReport;
+    let doPrompt        = true; // XXX followup for aEvent.doPrompt;
+    let submitReports   = true; // XXX followup for aEvent.submitReports;
+    let pluginName      = aEvent.pluginName;
+    let pluginDumpID    = aEvent.pluginDumpID;
+    let browserDumpID   = aEvent.browserDumpID;
+    let gmpPlugin       = aEvent.gmpPlugin;
 
     // For non-GMP plugins, remap the plugin name to a more user-presentable form.
     if (!gmpPlugin) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/modules/UITour.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/modules/UITour.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/modules/UITour.jsm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/modules/UITour.jsm	2014-11-26 21:45:52.000000000 +0000
@@ -1303,15 +1303,15 @@
 
   addNavBarWidget: function (aTarget, aMessageManager, aCallbackID) {
     if (aTarget.node) {
-      log.error("UITour: can't add a widget already present: " + data.target);
+      log.error("addNavBarWidget: can't add a widget already present:", aTarget);
       return;
     }
     if (!aTarget.allowAdd) {
-      log.error("UITour: not allowed to add this widget: " + data.target);
+      log.error("addNavBarWidget: not allowed to add this widget:", aTarget);
       return;
     }
     if (!aTarget.widgetName) {
-      log.error("UITour: can't add a widget without a widgetName property: " + data.target);
+      log.error("addNavBarWidget: can't add a widget without a widgetName property:", aTarget);
       return;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/modules/WindowsJumpLists.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/modules/WindowsJumpLists.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/modules/WindowsJumpLists.jsm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/modules/WindowsJumpLists.jsm	2014-11-26 21:45:52.000000000 +0000
@@ -52,15 +52,11 @@
                  .createBundle("chrome://browser/locale/taskbar.properties");
 });
 
-XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
-  Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
-  return PlacesUtils;
-});
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+                                  "resource://gre/modules/PlacesUtils.jsm");
 
-XPCOMUtils.defineLazyGetter(this, "NetUtil", function() {
-  Components.utils.import("resource://gre/modules/NetUtil.jsm");
-  return NetUtil;
-});
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
+                                  "resource://gre/modules/NetUtil.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "_idle",
                                    "@mozilla.org/widget/idleservice;1",
@@ -77,6 +73,16 @@
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "gHistoryObserver", function() {
+  return Object.freeze({
+    onClearHistory() {
+      WinTaskbarJumpList.update();
+    },
+    QueryInterface: XPCOMUtils.generateQI(Ci.nsINavHistoryObserver),
+    __noSuchMethod__: () => {}, // Catch all of the other notifications.
+  });
+});
+
 /**
  * Global functions
  */
@@ -146,7 +152,7 @@
 
   /**
    * Startup, shutdown, and update
-   */ 
+   */
 
   startup: function WTBJL_startup() {
     // exit if this isn't win7 or higher.
@@ -155,7 +161,7 @@
 
     // Win shell shortcut maintenance. If we've gone through an update,
     // this will update any pinned taskbar shortcuts. Not specific to
-    // jump lists, but this was a convienent place to call it. 
+    // jump lists, but this was a convienent place to call it.
     try {
       // dev builds may not have helper.exe, ignore failures.
       this._shortcutMaintenance();
@@ -186,14 +192,6 @@
 
   _shutdown: function WTBJL__shutdown() {
     this._shuttingDown = true;
-
-    // Correctly handle a clear history on shutdown.  If there are no
-    // entries be sure to empty all history lists.  Luckily Places caches
-    // this value, so it's a pretty fast call.
-    if (!PlacesUtils.history.hasHistoryEntries) {
-      this.update();
-    }
-
     this._free();
   },
 
@@ -253,13 +251,13 @@
 
   /**
    * Taskbar api wrappers
-   */ 
+   */
 
   _startBuild: function WTBJL__startBuild() {
     var removedItems = Cc["@mozilla.org/array;1"].
                        createInstance(Ci.nsIMutableArray);
     this._builder.abortListBuild();
-    if (this._builder.initListBuild(removedItems)) { 
+    if (this._builder.initListBuild(removedItems)) {
       // Prior to building, delete removed items from history.
       this._clearHistory(removedItems);
       return true;
@@ -283,7 +281,7 @@
                                          task.args, task.iconIndex, null);
       items.appendElement(item, false);
     }, this);
-    
+
     if (items.length > 0)
       this._builder.addListToBuild(this._builder.JUMPLIST_CATEGORY_TASKS, items);
   },
@@ -294,11 +292,6 @@
   },
 
   _buildFrequent: function WTBJL__buildFrequent() {
-    // If history is empty, just bail out.
-    if (!PlacesUtils.history.hasHistoryEntries) {
-      return;
-    }
-
     // Windows supports default frequent and recent lists,
     // but those depend on internal windows visit tracking
     // which we don't populate. So we build our own custom
@@ -324,7 +317,7 @@
 
         let title = aResult.title || aResult.uri;
         let faviconPageUri = Services.io.newURI(aResult.uri, null, null);
-        let shortcut = this._getHandlerAppItem(title, title, aResult.uri, 1, 
+        let shortcut = this._getHandlerAppItem(title, title, aResult.uri, 1,
                                                faviconPageUri);
         items.appendElement(shortcut, false);
         this._frequentHashList.push(aResult.uri);
@@ -334,11 +327,6 @@
   },
 
   _buildRecent: function WTBJL__buildRecent() {
-    // If history is empty, just bail out.
-    if (!PlacesUtils.history.hasHistoryEntries) {
-      return;
-    }
-
     var items = Cc["@mozilla.org/array;1"].
                 createInstance(Ci.nsIMutableArray);
     // Frequent items will be skipped, so we select a double amount of
@@ -386,8 +374,8 @@
    * Jump list item creation helpers
    */
 
-  _getHandlerAppItem: function WTBJL__getHandlerAppItem(name, description, 
-                                                        args, iconIndex, 
+  _getHandlerAppItem: function WTBJL__getHandlerAppItem(name, description,
+                                                        args, iconIndex,
                                                         faviconPageUri) {
     var file = Services.dirsvc.get("XREExeF", Ci.nsILocalFile);
 
@@ -469,7 +457,7 @@
 
   /**
    * Prefs utilities
-   */ 
+   */
 
   _refreshPrefs: function WTBJL__refreshPrefs() {
     this._enabled = _prefs.getBoolPref(PREF_TASKBAR_ENABLED);
@@ -481,7 +469,7 @@
 
   /**
    * Init and shutdown utilities
-   */ 
+   */
 
   _initTaskbar: function WTBJL__initTaskbar() {
     this._builder = _taskbarService.createJumpListBuilder();
@@ -498,12 +486,14 @@
     Services.obs.addObserver(this, "profile-before-change", false);
     Services.obs.addObserver(this, "browser:purge-session-history", false);
     _prefs.addObserver("", this, false);
+    PlacesUtils.history.addObserver(gHistoryObserver, false);
   },
- 
+
   _freeObs: function WTBJL__freeObs() {
     Services.obs.removeObserver(this, "profile-before-change");
     Services.obs.removeObserver(this, "browser:purge-session-history");
     _prefs.removeObserver("", this);
+    PlacesUtils.history.removeObserver(gHistoryObserver);
   },
 
   _updateTimer: function WTBJL__updateTimer() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/browser.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/browser.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/browser.inc	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/browser.inc	2014-11-26 21:45:52.000000000 +0000
@@ -2,7 +2,7 @@
 
 % Note that zoom-reset-button is a bit different since it doesn't use an image and thus has the image with display: none.
 %define nestedButtons #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button
-%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #web-apps-button, #webide-button
+%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button
 
 %ifdef XP_MACOSX
 % Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button to exit fullscreen
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devedition.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devedition.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devedition.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devedition.inc.css	2014-11-26 21:45:52.000000000 +0000
@@ -239,6 +239,11 @@
   padding-bottom: 0;
 }
 
+/* No extra border when customizing since the nav bar doesn't have one */
+#main-window[customize-entered] #customization-container {
+  border: none;
+}
+
 /* Use smaller back button icon */
 #back-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css	2014-11-26 21:45:52.000000000 +0000
@@ -15,16 +15,8 @@
 .notice-container {
   margin-top: -50vh;
   font-size: 120%;
-}
-
-.theme-dark .notice-container {
-  background-color: #343c45; /* Toolbars */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .notice-container {
-  background-color: #f0f1f2; /* Toolbars */
-  color: #585959; /* Grey foreground text */
+  background-color: var(--theme-toolbar-background);
+  color: var(--theme-body-color-alt);
 }
 
 #empty-notice > button {
@@ -112,14 +104,9 @@
   font-size: 90%;
 }
 
-.theme-dark .snapshot-item-calls,
-.theme-dark .snapshot-item-save {
-  color: #b6babf; /* Foreground (Text) - Grey */
-}
-
-.theme-light .snapshot-item-calls,
-.theme-light .snapshot-item-save {
-  color: #585959; /* Foreground (Text) - Grey */
+.snapshot-item-calls,
+.snapshot-item-save {
+  color: var(--theme-body-color-alt);
 }
 
 .snapshot-item-save {
@@ -282,36 +269,22 @@
   }
 }
 
-.theme-dark .call-item-gutter {
-  background-color: #181d20;
-  color: #5f7387;
-  border-color: #000;
-}
-
-.theme-light .call-item-gutter {
-  background-color: #f7f7f7;
-  color: #667380;
-  border-color: #aaa;
+.call-item-gutter {
+  background-color: var(--theme-sidebar-background);
+  color: var(--theme-content-color3);
+  border-color: var(--theme-splitter-color);
 }
 
 .call-item-index {
   text-align: end;
 }
 
-.theme-dark .call-item-context {
-  color: #eb5368; /* Highlight Orange */
-}
-
-.theme-light .call-item-context {
-  color: #f13c00; /* Highlight Orange */
-}
-
-.theme-dark .call-item-name {
-  color: #46afe3; /* Highlight Blue */
+.call-item-context {
+  color: var(--theme-highlight-orange);
 }
 
-.theme-light .call-item-name {
-  color: #0088cc; /* Highlight Blue */
+.call-item-name {
+  color: var(--theme-highlight-blue);
 }
 
 .call-item-location {
@@ -319,14 +292,11 @@
   -moz-padding-end: 6px;
   text-align: end;
   cursor: pointer;
+  color: var(--theme-highlight-bluegrey);
 }
 
-.theme-dark .call-item-location:hover {
-  color: #0088cc; /* Highlight Blue */
-}
-
-.theme-light .call-item-location:hover {
-  color: #46afe3; /* Highlight Blue */
+.call-item-location:hover {
+  color: var(--theme-highlight-blue);
 }
 
 .call-item-view:hover .call-item-location,
@@ -336,12 +306,10 @@
 
 .theme-dark .call-item-location {
   border-color: #111;
-  color: #5e88b0; /* Highlight Blue-Grey */
 }
 
 .theme-light .call-item-location {
   border-color: #eee;
-  color: #5f88b0; /* Highlight Blue-Grey */
 }
 
 .call-item-stack {
@@ -370,28 +338,16 @@
   text-decoration: underline;
 }
 
-.theme-dark .call-item-stack-fn-name {
-  color: #a9bacb; /* Content (Text) - Light */
+.call-item-stack-fn-name {
+  color: var(--theme-content-color3);
 }
 
-.theme-light .call-item-stack-fn-name {
-  color: #667380; /* Content (Text) - Dark Grey */
-}
-
-.theme-dark .call-item-stack-fn-location {
-  color: #5e88b0; /* Highlight Blue-Grey */
-}
-
-.theme-light .call-item-stack-fn-location {
-  color: #5e88b0; /* Highlight Blue-Grey */
-}
-
-.theme-dark .call-item-stack-fn-location:hover {
-  color: #0088cc; /* Highlight Blue */
+.call-item-stack-fn-location {
+  color: var(--theme-highlight-bluegrey);
 }
 
-.theme-light .call-item-stack-fn-location:hover {
-  color: #46afe3; /* Highlight Blue */
+.call-item-stack-fn-location:hover {
+  color: var(--theme-highlight-blue);
 }
 
 #calls-list .selected .call-item-contents > label:not(.call-item-gutter) {
@@ -465,12 +421,12 @@
 
 .theme-dark #snapshot-filmstrip {
   border-top: 1px solid #000;
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light #snapshot-filmstrip {
   border-top: 1px solid #aaa;
-  color: #585959; /* Grey foreground text */
+  color: var(--theme-body-color-alt);
 }
 
 .filmstrip-thumbnail {
@@ -498,25 +454,13 @@
   background-color: @lightCheckerboardBackground@;
 }
 
-.theme-dark .filmstrip-thumbnail {
-  -moz-border-end: 1px solid #000;
-}
-
-.theme-light .filmstrip-thumbnail {
-  -moz-border-end: 1px solid #aaa;
-}
-
-.theme-dark #snapshot-filmstrip > .filmstrip-thumbnail:hover,
-.theme-dark #snapshot-filmstrip:not(:hover) > .filmstrip-thumbnail[highlighted] {
-  border: 1px solid #46afe3; /* Highlight Blue */
-  margin: 0 0 0 -1px;
-  padding: 0;
-  opacity: 0.66;
+.filmstrip-thumbnail {
+  -moz-border-end: 1px solid var(--theme-splitter-color)
 }
 
-.theme-light #snapshot-filmstrip > .filmstrip-thumbnail:hover,
-.theme-light #snapshot-filmstrip:not(:hover) > .filmstrip-thumbnail[highlighted] {
-  border: 1px solid #0088cc; /* Highlight Blue */
+#snapshot-filmstrip > .filmstrip-thumbnail:hover,
+#snapshot-filmstrip:not(:hover) > .filmstrip-thumbnail[highlighted] {
+  border: 1px solid var(--theme-highlight-blue);
   margin: 0 0 0 -1px;
   padding: 0;
   opacity: 0.66;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/computedview.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/computedview.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/computedview.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/computedview.css	2014-11-26 21:45:52.000000000 +0000
@@ -27,6 +27,10 @@
   flex: 1;
 }
 
+.row-striped {
+  background: var(--theme-body-background);
+}
+
 .property-view-hidden,
 .property-content-hidden {
   display: none;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/dark-theme.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/dark-theme.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/dark-theme.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/dark-theme.css	2014-11-26 21:45:52.000000000 +0000
@@ -6,39 +6,68 @@
 /* According to:
  * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
  */
+:root {
+  --theme-body-background: #14171a;
+  --theme-sidebar-background: #181d20;
+  --theme-contrast-background: #b28025;
+
+  --theme-tab-toolbar-background: #252c33;
+  --theme-toolbar-background: #343c45;
+  --theme-selection-background: #1d4f73;
+  --theme-selection-color: #f5f7fa;
+  --theme-selection-background-semitransparent: rgba(29, 79, 115, .5);
+  --theme-splitter-color: black;
+  --theme-comment: #5c6773;
+
+  --theme-body-color: #a9bacb;
+  --theme-body-color-alt: #b6babf;
+  --theme-content-color1: #a9bacb;
+  --theme-content-color2: #8fa1b2;
+  --theme-content-color3: #667380;
+
+  --theme-highlight-green: #5c9966;
+  --theme-highlight-blue: #3689b2;
+  --theme-highlight-bluegrey: #5e88b0;
+  --theme-highlight-purple: #6270b2;
+  --theme-highlight-lightorange: #a18650;
+  --theme-highlight-orange: #b26b47;
+  --theme-highlight-red: #bf5656;
+  --theme-highlight-pink: #a673bf;
+}
+
 .theme-body {
-  background: #14171a;
-  color: #a9bacb;
+  background: var(--theme-body-background);
+  color: var(--theme-body-color);
 }
 
 .theme-sidebar {
-  background: #181d20;
-  color: #a9bacb;
+  background: var(--theme-sidebar-background);
+  color: var(--theme-content-color1);
 }
 
 ::-moz-selection {
-  background-color: #1d4f73;
-  color: #f5f7fa;
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-bg-darker {
-  background-color: rgba(0,0,0,0.5);
+  background-color: var(--theme-selection-background-semitransparent);
 }
 
 .theme-selected,
 .CodeMirror-hint-active {
-  background-color: #1d4f73;
-  color: #f5f7fa; /* Light foreground text */
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-bg-contrast,
-.variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */
-  background: #B28025; /* Background - Attention */
+.variable-or-property:not([overridden])[changed] {
+  background: var(--theme-contrast-background);
 }
 
 .theme-link,
-.cm-s-mozilla .cm-link { /* blue */
-  color: #3689b2;
+.cm-s-mozilla .cm-link {
+  color: var(--theme-highlight-blue);
 }
 
 /*
@@ -47,8 +76,8 @@
  */
 .theme-link:visited,
 .cm-s-mozilla .cm-link:visited,
-.CodeMirror-Tern-type { /* blue */
-  color: #3689b2;
+.CodeMirror-Tern-type {
+  color: var(--theme-highlight-blue);
 }
 
 
@@ -57,17 +86,14 @@
 .cm-s-mozilla .cm-hr,
 .cm-s-mozilla .cm-comment,
 .variable-or-property .token-undefined,
-.variable-or-property .token-null { /* grey */
-  color: #5c6773;
-}
-
+.variable-or-property .token-null,
 .CodeMirror-Tern-completion-unknown:before {
-  background-color: #5c6773;
+  color: var(--theme-comment);
 }
 
 .theme-gutter {
   background-color: #0f171f;
-  color: #667380;
+  color: var(--theme-content-color3);
   border-color: #303b47;
 }
 
@@ -79,8 +105,8 @@
 .cm-s-mozilla .cm-number,
 .variable-or-property .token-number,
 .variable-or-property[return] > .title > .name,
-.variable-or-property[scope] > .title > .name { /* green */
-  color: #5c9966;
+.variable-or-property[scope] > .title > .name {
+  color: var(--theme-highlight-green);
 }
 
 .CodeMirror-Tern-completion-number:before {
@@ -93,8 +119,8 @@
 .cm-s-mozilla .cm-def,
 .cm-s-mozilla .cm-property,
 .cm-s-mozilla .cm-qualifier,
-.variables-view-variable > .title > .name { /* blue */
-  color: #3689b2;
+.variables-view-variable > .title > .name {
+  color: var(--theme-highlight-blue);
 }
 
 .CodeMirror-Tern-completion-object:before {
@@ -103,7 +129,7 @@
 
 .cm-s-mozilla .cm-unused-line {
   text-decoration: line-through;
-  -moz-text-decoration-color: #5f88b0;
+  text-decoration-color: #5f88b0;
 }
 
 .cm-s-mozilla .cm-executed-line {
@@ -114,30 +140,30 @@
 .cm-s-mozilla .cm-builtin,
 .cm-s-mozilla .cm-tag,
 .cm-s-mozilla .cm-header,
-.variables-view-property > .title > .name { /* pink/lavender */
-  color: #a673bf;
+.cm-s-mozilla .cm-bracket,
+.variables-view-property > .title > .name {
+  color: var(--theme-highlight-pink);
 }
 
 .CodeMirror-Tern-completion-array:before {
-  background-color: #a673bf;
+  background-color: var(--theme-highlight-bluegrey);
 }
 
-.theme-fg-color4 { /* purple/violet */
-  color: #6270b2;
+.theme-fg-color4 {
+  color: var(--theme-highlight-purple);
 }
 
 .theme-fg-color5,
-.cm-s-mozilla .cm-bracket,
-.cm-s-mozilla .cm-keyword { /* Yellow */
-  color: #a18650;
+.cm-s-mozilla .cm-keyword {
+  color: var(--theme-highlight-lightorange);
 }
 
 .theme-fg-color6,
 .cm-s-mozilla .cm-string,
 .cm-s-mozilla .cm-string-2,
 .variable-or-property .token-string,
-.CodeMirror-Tern-farg { /* Orange */
-  color: #b26b47;
+.CodeMirror-Tern-farg {
+  color: var(--theme-highlight-orange);
 }
 
 .CodeMirror-Tern-completion-string:before,
@@ -151,8 +177,8 @@
 .cm-s-mozilla .cm-error,
 .variable-or-property .token-boolean,
 .variable-or-property .token-domnode,
-.variable-or-property[exception] > .title > .name { /* Red */
-  color: #bf5656;
+.variable-or-property[exception] > .title > .name {
+  color: var(--theme-highlight-red);
 }
 
 .CodeMirror-Tern-completion-bool:before {
@@ -167,8 +193,8 @@
 .devtools-toolbar,
 .devtools-sidebar-tabs > tabs,
 .CodeMirror-dialog { /* General toolbar styling */
-  color: #b6babf;
-  background-color: #343c45;
+  color: var(--theme-body-color-alt);
+  background-color: var(--theme-toolbar-background);
   border-color: hsla(210,8%,5%,.6);
 }
 
@@ -196,8 +222,8 @@
 .cm-s-mozilla .cm-variable-2,
 .cm-s-mozilla .cm-variable-3,
 .cm-s-mozilla .cm-operator,
-.cm-s-mozilla .cm-special { /* theme-body color */
-  color: #a9bacb;
+.cm-s-mozilla .cm-special {
+  color: var(--theme-content-color1);
 }
 
 .cm-s-mozilla .CodeMirror-lines .CodeMirror-cursor {
@@ -248,12 +274,12 @@
 }
 
 .cm-s-mozilla .CodeMirror-linenumber { /* line number text */
-  color: #5f7387;
+  color: var(--theme-content-color3);
 }
 
 .cm-s-mozilla .CodeMirror-gutters { /* vertical line next to line numbers */
-  border-right-color: #343c45;
-  background-color: #181d20;
+  border-right-color: var(--theme-toolbar-background);
+  background-color: var(--theme-sidebar-background);
 }
 
 .cm-s-markup-view pre {
@@ -359,12 +385,12 @@
 }
 
 .devtools-horizontal-splitter {
-  border-bottom: 1px solid black;
+  border-bottom: 1px solid var(--theme-splitter-color);
 }
 
 .devtools-side-splitter {
-  -moz-border-end: 1px solid black;
-  border-color: black; /* Needed for responsive container at low width. */
+  -moz-border-end: 1px solid var(--theme-splitter-color);
+  border-color: var(--theme-splitter-color); /* Needed for responsive container at low width. */
 }
 
 .devtools-textinput,
@@ -381,7 +407,7 @@
 .CodeMirror-Tern-tooltip {
   box-shadow: 0 0 4px rgba(255, 255, 255, .3);
   background-color: #0f171f;
-  color: #8fa1b2;
+  color: var(--theme-body-color);
 }
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/debugger.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/debugger.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/debugger.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/debugger.inc.css	2014-11-26 21:45:52.000000000 +0000
@@ -18,14 +18,9 @@
   -moz-border-end: 1px solid;
 }
 
-.theme-dark #sources-pane > tabs,
-.theme-dark #sources-pane .devtools-toolbar {
-  -moz-border-end-color: black; /* Match the splitter color. */
-}
-
-.theme-light #sources-pane > tabs,
-.theme-light #sources-pane .devtools-toolbar {
-  -moz-border-end-color: #aaa; /* Match the splitter color. */
+#sources-pane > tabs,
+#sources-pane .devtools-toolbar {
+  -moz-border-end-color: var(--theme-splitter-color);
 }
 
 /* Sources and breakpoints list */
@@ -189,28 +184,16 @@
   text-align: end;
 }
 
-.theme-dark .dbg-classic-stackframe-details-url {
-  color: #a9bacb; /* Light content text */
-}
-
-.theme-light .dbg-classic-stackframe-details-url {
-  color: #667380; /* Dark grey content text */
-}
-
-.theme-dark .dbg-classic-stackframe-details-sep {
-  color: #b6babf; /* Grey foreground text */
-}
-
-.theme-light .dbg-classic-stackframe-details-sep {
-  color: #585959; /* Grey foreground text */
+.dbg-classic-stackframe-details-url {
+  color: var(--theme-content-color1);
 }
 
-.theme-dark .dbg-classic-stackframe-details-line {
-  color: #5e88b0; /* Highlight blue grey */
+.dbg-classic-stackframe-details-sep {
+  color: var(--theme-body-color-alt)
 }
 
-.theme-light .dbg-classic-stackframe-details-line {
-  color: #5f88b0; /* Highlight blue grey */
+.dbg-classic-stackframe-details-line {
+  color: var(--theme-highlight-bluegrey);
 }
 
 #callstack-list .selected label {
@@ -252,7 +235,7 @@
 /* Tracer dark theme */
 
 .theme-dark .trace-item {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-dark .trace-item.black-boxed {
@@ -267,31 +250,30 @@
   background-color: rgba(29,79,115,.6); /* Select highlight blue at 60% alpha */
 }
 
-.theme-dark .trace-call {
-  color: #46afe3; /* Highlight blue */
+.trace-call {
+  color: var(--theme-highlight-blue);
 }
 
-.theme-dark .trace-return,
-.theme-dark .trace-yield {
-  color: #70bf53; /* Highlight green */
+.trace-return,
+.trace-yield {
+  color: var(--theme-highlight-green);
 }
 
-.theme-dark .trace-throw {
-  color: #eb5368; /* Highlight red */
+.trace-throw {
+  color: var(--theme-highlight-red);
 }
 
-.theme-dark .trace-param {
-  color: #a9bacb; /* Content text light */
+.trace-param {
+  color: var(--theme-content-color1);
 }
 
 .theme-dark .trace-syntax {
-  color: #8fa1b2; /* Content text grey */
+  color: var(--theme-content-color2);
 }
 
 /* Tracer light theme */
-
 .theme-light .trace-item {
-  color: #292e33; /* Dark foreground text */
+  color: var(--theme-content-color1);
 }
 
 .theme-light .trace-item.black-boxed {
@@ -306,27 +288,6 @@
   background-color: rgba(76,158,217,.6); /* Select highlight blue at 60% alpha */
 }
 
-.theme-light .trace-call {
-  color: #0088cc; /* Highlight blue */
-}
-
-.theme-light .trace-return,
-.theme-light .trace-yield {
-  color: #2cbb0f; /* Highlight green */
-}
-
-.theme-light .trace-throw {
-  color: #ed2655; /* Highlight red */
-}
-
-.theme-light .trace-param {
-  color: #667380; /* Content text dark grey  */
-}
-
-.theme-light .trace-syntax {
-  color: #8fa1b2; /* Content text grey */
-}
-
 #tracer-traces .selected label {
   /* Text inside a selected item should not be custom colored. */
   color: inherit !important;
@@ -371,12 +332,8 @@
   cursor: pointer;
 }
 
-.theme-dark .dbg-expression-button {
-  color: #46afe3; /* Blue highlight color */
-}
-
-.theme-light .dbg-expression-button {
-  color: #0088cc; /* Blue highlight color */
+.dbg-expression-button {
+  color: var(--theme-highlight-blue);
 }
 
 /* Event listeners view */
@@ -385,28 +342,16 @@
   font-weight: 600;
 }
 
-.theme-dark .dbg-event-listener-location {
-  color: #a9bacb; /* Light content text */
-}
-
-.theme-light .dbg-event-listener-location {
-  color: #667380; /* Dark grey content text */
+.dbg-event-listener-location {
+  color: var(--theme-content-color1);
 }
 
-.theme-dark .dbg-event-listener-separator {
-  color: #b6babf; /* Grey foreground text */
+.dbg-event-listener-separator {
+  color: var(--theme-body-color-alt);
 }
 
-.theme-light .dbg-event-listener-separator {
-  color: #585959; /* Grey foreground text */
-}
-
-.theme-dark .dbg-event-listener-targets {
-  color: #5e88b0; /* Highlight blue grey */
-}
-
-.theme-light .dbg-event-listener-targets {
-  color: #5f88b0; /* Highlight blue grey */
+.dbg-event-listener-targets {
+  color: var(--theme-highlight-bluegrey);
 }
 
 .theme-dark #event-listeners .selected {
@@ -475,27 +420,19 @@
 }
 
 .theme-dark .results-panel-item-label {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .results-panel-item-label {
-  color: #18191a; /* Dark foreground text */
-}
-
-.theme-dark .results-panel-item-label-before {
-  color: #5e88b0; /* Highlight blue grey */
-}
-
-.theme-light .results-panel-item-label-before {
-  color: #5f88b0; /* Highlight blue grey */
+  color: var(--theme-body-color);
 }
 
-.theme-dark .results-panel-item-label-below {
-  color: #5f7387; /* Dark grey content text */
+.results-panel-item-label-before {
+  color: var(--theme-highlight-bluegrey);
 }
 
-.theme-light .results-panel-item-label-below {
-  color: #667380; /* Dark grey content text */
+.results-panel-item-label-below {
+  color: var(--theme-content-color3);
 }
 
 #results-panel .selected label {
@@ -551,22 +488,20 @@
   transform: scale(1.75, 1.75);
 }
 
-.theme-dark .dbg-source-results:not(.selected):hover {
-  background-color: #181d20; /* Sidebar background */
+.dbg-source-results:not(.selected):hover {
+  background-color: var(--theme-sidebar-background);
 }
 
-.theme-light .dbg-source-results:not(.selected):hover {
-  background-color: #f7f7f7; /* Sidebar background */
+.dbg-results-header {
+  background-color: var(--theme-tab-toolbar-background);
 }
 
 .theme-dark .dbg-results-header {
-  background-color: #252c33; /* Tab toolbar */
-  color: #a9bacb; /* Light content text */
+  color: var(--theme-content-color1);
 }
 
 .theme-light .dbg-results-header {
-  background-color: #ebeced; /* Tab toolbar */
-  color: #667380; /* Dark grey content text */
+  color: var(--theme-content-color3);
 }
 
 .theme-dark .dbg-search-result:hover {
@@ -577,38 +512,25 @@
   background-color: rgba(76,158,217,.2); /* Select highlight blue at 40% alpha */
 }
 
-.theme-dark .dbg-results-header-match-count {
-  color: #5f7387; /* Dark grey content text */
-}
-
-.theme-light .dbg-results-header-match-count {
-  color: #667380; /* Dark grey content text */
-}
-
-.theme-dark .dbg-results-line-number {
-  background-color: #252c33; /* Tab toolbars */
-  color: #b6babf; /* Grey foreground text */
-}
-
-.theme-light .dbg-results-line-number {
-  background-color: #ebeced; /* Tab toolbars */
-  color: #585959; /* Grey foreground text */
+.dbg-results-header-match-count {
+  color: var(--theme-content-color3);
 }
 
-.theme-dark .dbg-results-line-contents-string {
-  color: #b6babf; /* Grey foreground text */
+.dbg-results-line-number {
+  background-color: var(--theme-tab-toolbar-background);
+  color: var(--theme-body-color-alt);
 }
 
-.theme-light .dbg-results-line-contents-string {
-  color: #585959; /* Grey foreground text */
+.dbg-results-line-contents-string {
+  color: var(--theme-body-color-alt);
 }
 
 .theme-dark .dbg-results-line-contents-string[match=true] {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .dbg-results-line-contents-string[match=true] {
-  color: #18191a; /* Dark foreground text */
+  color: var(--theme-body-color);
 }
 
 /* Toolbar controls */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/inspector.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/inspector.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/inspector.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/inspector.css	2014-11-26 21:45:53.000000000 +0000
@@ -105,11 +105,6 @@
   margin-bottom: 0;
 }
 
-.theme-dark .event-tooltip-attributes-box {
-  background-color: #B6BABF;
-  color: #343C45;
-}
-
 .event-tooltip-attributes-container {
   display: flex;
   flex-shrink: 0;
@@ -124,6 +119,8 @@
   border-radius: 3px;
   padding: 2px;
   -moz-margin-start: 5px;
+  background-color: var(--theme-body-color-alt);
+  color: var(--theme-toolbar-background);
 }
 
 .event-tooltip-attributes {
@@ -131,8 +128,3 @@
   font-size: 9px;
   padding-top: 2px;
 }
-
-.theme-light .event-tooltip-attributes-box {
-  background-color: #585959;
-  color: #F0F1F2;
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/light-theme.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/light-theme.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/light-theme.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/light-theme.css	2014-11-26 21:45:53.000000000 +0000
@@ -6,40 +6,69 @@
 /* According to:
  * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
  */
+:root {
+  --theme-body-background: #fcfcfc;
+  --theme-sidebar-background: #f7f7f7;
+  --theme-contrast-background: #e6b064;
+
+  --theme-tab-toolbar-background: #ebeced;
+  --theme-toolbar-background: #f0f1f2;
+  --theme-selection-background: #4c9ed9;
+  --theme-selection-color: #f5f7fa;
+  --theme-selection-background-semitransparent: rgba(76, 158, 217, .23);
+  --theme-splitter-color: #aaaaaa;
+  --theme-comment: hsl(90,2%,46%);
+
+  --theme-body-color: #18191a;
+  --theme-body-color-alt: #585959;
+  --theme-content-color1: #292e33;
+  --theme-content-color2: #8fa1b2;
+  --theme-content-color3: #667380;
+
+  --theme-highlight-green: hsl(72,100%,27%);
+  --theme-highlight-blue: hsl(208,56%,40%);
+  --theme-highlight-bluegrey: hsl(208,81%,21%);
+  --theme-highlight-purple: #5b5fff;
+  --theme-highlight-lightorange: #a18650;
+  --theme-highlight-orange: hsl(24,85%,39%);
+  --theme-highlight-red: #bf5656;
+  --theme-highlight-pink: #b82ee5;
+}
+
 .theme-body {
-  background: #fcfcfc; /* Background - Editor */
-  color: #18191a;
+  background: var(--theme-body-background);
+  color: var(--theme-body-color);
 }
 
 .theme-sidebar {
-  background: #f7f7f7; /* Background - Sidebars */
-  color: #18191a;
+  background: var(--theme-sidebar-background);
+  color: var(--theme-body-color);
 }
 
 ::-moz-selection {
-  background-color: #4c9ed9;
-  color: #f5f7fa;
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-bg-darker {
-  background: #EFEFEF;
+  background: var(--theme-selection-background-semitransparent);
 }
 
 .theme-selected,
 .CodeMirror-hint-active {
-  background-color: #4c9ed9;
-  color: #f5f7fa; /* Light foreground text */
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-bg-contrast,
-.variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */
-  background: #E8B671; /* Background - Attention */
+.variable-or-property:not([overridden])[changed] {
+  background: var(--theme-contrast-background);
 }
 
 .theme-link,
 .cm-s-mozilla .cm-link,
-.CodeMirror-Tern-type { /* blue */
-  color: hsl(208,56%,40%);
+.CodeMirror-Tern-type {
+  color: var(--theme-highlight-blue);
 }
 
 /*
@@ -47,8 +76,8 @@
  * failures in debug builds.
  */
 .theme-link:visited,
-.cm-s-mozilla .cm-link:visited { /* blue */
-  color: hsl(208,56%,40%);
+.cm-s-mozilla .cm-link:visited {
+  color: var(--theme-highlight-blue);
 }
 
 .theme-comment,
@@ -56,17 +85,14 @@
 .cm-s-mozilla .cm-hr,
 .cm-s-mozilla .cm-comment,
 .variable-or-property .token-undefined,
-.variable-or-property .token-null { /* grey */
-  color: hsl(90,2%,46%);
-}
-
+.variable-or-property .token-null,
 .CodeMirror-Tern-completion-unknown:before {
-  background-color: hsl(90,2%,46%);
+  color: var(--theme-comment);
 }
 
 .theme-gutter {
   background-color: hsl(0,0%,90%);
-  color: #667380;
+  color: var(--theme-content-color3);
   border-color: hsl(0,0%,65%);
 }
 
@@ -76,7 +102,7 @@
 
 .cm-s-mozilla .cm-unused-line {
   text-decoration: line-through;
-  -moz-text-decoration-color: #5f88b0;
+  text-decoration-color: var(--theme-highlight-bluegrey);
 }
 
 .cm-s-mozilla .cm-executed-line {
@@ -87,8 +113,8 @@
 .cm-s-mozilla .cm-number,
 .variable-or-property .token-number,
 .variable-or-property[return] > .title > .name,
-.variable-or-property[scope] > .title > .name { /* green */
-  color: hsl(72,100%,27%);
+.variable-or-property[scope] > .title > .name {
+  color: var(--theme-highlight-green);
 }
 
 .CodeMirror-Tern-completion-number:before {
@@ -101,8 +127,8 @@
 .cm-s-mozilla .cm-def,
 .cm-s-mozilla .cm-property,
 .cm-s-mozilla .cm-qualifier,
-.variables-view-variable > .title > .name { /* blue */
-  color: hsl(208,56%,40%);
+.variables-view-variable > .title > .name {
+  color: var(--theme-highlight-blue);
 }
 
 .CodeMirror-Tern-completion-object:before {
@@ -113,30 +139,30 @@
 .cm-s-mozilla .cm-variable,
 .cm-s-mozilla .cm-tag,
 .cm-s-mozilla .cm-header,
-.variables-view-property > .title > .name { /* dark blue */
-  color: hsl(208,81%,21%);
+.cm-s-mozilla .cm-bracket,
+.variables-view-property > .title > .name {
+  color: var(--theme-highlight-bluegrey);
 }
 
-.CodeMirror-Tern-completion-array:before { /* dark blue */
-  background-color: hsl(208,81%,21%);
+.CodeMirror-Tern-completion-array:before {
+  background-color: var(--theme-highlight-bluegrey);
 }
 
-.theme-fg-color4 { /* Orange */
-  color: hsl(24,85%,39%);
+.theme-fg-color4 {
+  color: var(--theme-highlight-orange);
 }
 
 .theme-fg-color5,
-.cm-s-mozilla .cm-bracket,
-.cm-s-mozilla .cm-keyword { /* Yellow */
-  color: #a18650;
+.cm-s-mozilla .cm-keyword {
+  color: var(--theme-highlight-lightorange);
 }
 
 .theme-fg-color6,
 .cm-s-mozilla .cm-string,
 .cm-s-mozilla .cm-string-2,
 .variable-or-property .token-string,
-.CodeMirror-Tern-farg { /* Orange */
-  color: hsl(24,85%,39%);
+.CodeMirror-Tern-farg {
+  color: var(--theme-highlight-orange);
 }
 
 .CodeMirror-Tern-completion-string:before,
@@ -150,8 +176,8 @@
 .cm-s-mozilla .cm-error,
 .variable-or-property .token-boolean,
 .variable-or-property .token-domnode,
-.variable-or-property[exception] > .title > .name { /* Red */
-  color: #bf5656;
+.variable-or-property[exception] > .title > .name {
+  color: var(--theme-highlight-red);
 }
 
 .CodeMirror-Tern-completion-bool:before {
@@ -170,9 +196,9 @@
 .devtools-toolbar,
 .devtools-sidebar-tabs > tabs,
 .CodeMirror-dialog { /* General toolbar styling */
-  color: #585959;
-  background-color: #f0f1f2;
-  border-color: #aaa;
+  color: var(--theme-body-color-alt);
+  background-color: var(--theme-toolbar-background);
+  border-color: var(--theme-splitter-color);
 }
 
 .ruleview-colorswatch,
@@ -195,8 +221,8 @@
 .cm-s-mozilla .cm-variable-2,
 .cm-s-mozilla .cm-variable-3,
 .cm-s-mozilla .cm-operator,
-.cm-s-mozilla .cm-special { /* theme-body color */
-  color: black;
+.cm-s-mozilla .cm-special {
+  color: var(--theme-body-color);
 }
 
 .cm-s-mozilla .CodeMirror-lines .CodeMirror-cursor {
@@ -247,12 +273,12 @@
 }
 
 .cm-s-mozilla .CodeMirror-linenumber { /* line number text */
-  color: #667380;
+  color: var(--theme-content-color3);
 }
 
 .cm-s-mozilla .CodeMirror-gutters { /* vertical line next to line numbers */
-  border-right-color: #a6a6a6;
-  background-color: #f7f7f7;
+  border-right-color: var(--theme-splitter-color);
+  background-color: var(--theme-sidebar-background);
 }
 
 .cm-s-markup-view pre {
@@ -368,18 +394,18 @@
 }
 
 .devtools-horizontal-splitter {
-  border-bottom: 1px solid #aaa;
+  border-bottom: 1px solid var(--theme-splitter-color);
 }
 
 .devtools-side-splitter {
-  -moz-border-end: 1px solid #aaa;
-  border-color: #aaa; /* Needed for responsive container at low width. */
+  -moz-border-end: 1px solid var(--theme-splitter-color);
+  border-color: var(--theme-splitter-color); /* Needed for responsive container at low width. */
 }
 
 .CodeMirror-hints,
 .CodeMirror-Tern-tooltip {
   box-shadow: 0 0 4px rgba(128, 128, 128, .5);
-  background-color: #f7f7f7;
+  background-color: var(--theme-sidebar-background);
 }
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/markup-view.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/markup-view.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/markup-view.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/markup-view.css	2014-11-26 21:45:53.000000000 +0000
@@ -27,7 +27,7 @@
 .theme-selected ~ .editor .theme-fg-color5,
 .theme-selected ~ .editor .theme-fg-color6,
 .theme-selected ~ .editor .theme-fg-color7 {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 /* In case a node isn't displayed in the page, we fade the syntax highlighting */
@@ -53,14 +53,9 @@
   overflow: hidden;
 }
 
-.theme-dark #previewbar {
-  background: #252c33; /* Tab Toolbar */
-  border-color: #000; /* Splitters */
-}
-
-.theme-light #previewbar {
-  background: #ebeced; /* Tab Toolbar */
-  border-color: #aaa; /* Splitters */
+#previewbar {
+  background: var(--theme-tab-toolbar-background);
+  border-color: var(--theme-splitter-color);
 }
 
 #preview {
@@ -99,12 +94,7 @@
   -moz-user-select: none;
 }
 
-.theme-dark .markupview-events {
-  background-color: #b6babf;
-  color: #14171a;
-}
-
-.theme-light .markupview-events {
-  background-color: #585959;
-  color: #fcfcfc;
+.markupview-events {
+  background-color: var(--theme-body-color-alt);
+  color: var(--theme-body-background);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/netmonitor.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/netmonitor.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/netmonitor.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/netmonitor.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -9,14 +9,6 @@
   font-size: 120%;
 }
 
-.theme-dark #requests-menu-empty-notice {
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light #requests-menu-empty-notice {
-  color: #585959; /* Grey foreground text */
-}
-
 #notice-perf-message {
   margin-top: 2px;
 }
@@ -288,30 +280,30 @@
 }
 
 .theme-dark .requests-menu-timings-division[division-scale=millisecond] {
-  -moz-border-start-color: #f5f7fa !important; /* Light foreground text */
+  -moz-border-start-color: var(--theme-selection-color) !important;
 }
 
 .theme-light .requests-menu-timings-division[division-scale=millisecond] {
-  -moz-border-start-color: #585959 !important; /* Grey foreground text */
+  -moz-border-start-color: var(--theme-body-color-alt) !important;
 }
 
 .theme-dark .requests-menu-timings-division[division-scale=second] {
-  -moz-border-start-color: #f5f7fa !important; /* Light foreground text */
+  -moz-border-start-color: var(--theme-selection-color) !important;
   font-weight: 600;
 }
 
 .theme-light .requests-menu-timings-division[division-scale=second] {
-  -moz-border-start-color: #585959 !important; /* Grey foreground text */
+  -moz-border-start-color: var(--theme-body-color-alt) !important;
   font-weight: 600;
 }
 
 .theme-dark .requests-menu-timings-division[division-scale=minute] {
-  -moz-border-start-color: #f5f7fa !important; /* Light foreground text */
+  -moz-border-start-color: var(--theme-selection-color) !important;
   font-weight: 600;
 }
 
 .theme-light .requests-menu-timings-division[division-scale=minute] {
-  -moz-border-start-color: #585959 !important; /* Grey foreground text */
+  -moz-border-start-color: var(--theme-body-color-alt) !important;
   font-weight: 600;
 }
 
@@ -449,8 +441,8 @@
 /* Network request details tabpanels */
 
 .theme-dark .tabpanel-content {
-  background-color: #343c45; /* Toolbars */
-  color: #f5f7fa; /* Light foreground text */
+  background-color: var(--theme-toolbar-background);
+  color: var(--theme-selection-color);
 }
 
 /* Summary tabpanel */
@@ -499,16 +491,8 @@
 #response-content-info-header {
   margin: 0;
   padding: 3px 8px;
-}
-
-.theme-dark  #response-content-info-header {
-  background-color: #eb5368; /* Red highlight */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light  #response-content-info-header {
-  background-color: #ed2655; /* Red highlight */
-  color: #f5f7fa; /* Light foreground text */
+  background-color: var(--theme-highlight-red);
+  color: var(--theme-selection-color);
 }
 
 #response-content-image-box {
@@ -572,13 +556,13 @@
 .theme-dark #requests-menu-footer {
   border-top: 1px solid @table_itemDarkStartBorder@;
   box-shadow: 0 1px 0 @table_itemDarkEndBorder@ inset;
-  background-color: #343c45; /* Toolbars */
+  background-color: var(--theme-toolbar-background);
 }
 
 .theme-light #requests-menu-footer {
   border-top: 1px solid @table_itemLightStartBorder@;
   box-shadow: 0 1px 0 @table_itemLightEndBorder@ inset;
-  background-color: #f0f1f2; /* Toolbars */
+  background-color: var(--theme-toolbar-background);
 }
 
 .requests-menu-footer-button,
@@ -591,12 +575,12 @@
 
 .theme-dark .requests-menu-footer-button,
 .theme-dark .requests-menu-footer-label {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .requests-menu-footer-button,
 .theme-light .requests-menu-footer-label {
-  color: #18191a; /* Dark foreground text */
+  color: var(--theme-body-color);
 }
 
 .requests-menu-footer-spacer {
@@ -696,12 +680,8 @@
   min-height: 1px;
 }
 
-.theme-dark #network-statistics-charts {
-  background-color: #343c45; /* Toolbars */
-}
-
-.theme-light #network-statistics-charts {
-  background-color: #f0f1f2; /* Toolbars */
+#network-statistics-charts {
+  background-color: var(--theme-toolbar-background);
 }
 
 #network-statistics-charts .pie-chart-container {
@@ -714,84 +694,44 @@
   -moz-margin-end: 3vw;
 }
 
-.theme-dark .chart-colored-blob[name=html] {
-  fill: #5e88b0; /* Blue-Grey highlight */
-  background: #5e88b0;
-}
-
-.theme-light .chart-colored-blob[name=html] {
-  fill: #5f88b0; /* Blue-Grey highlight */
-  background: #5f88b0;
-}
-
-.theme-dark .chart-colored-blob[name=css] {
-  fill: #46afe3; /* Blue highlight */
-  background: #46afe3;
-}
-
-.theme-light .chart-colored-blob[name=css] {
-  fill: #0088cc; /* Blue highlight */
-  background: #0088cc;
-}
-
-.theme-dark .chart-colored-blob[name=js] {
-  fill: #d99b28; /* Light Orange highlight */
-  background: #d99b28;
-}
-
-.theme-light .chart-colored-blob[name=js] {
-  fill: #d97e00; /* Light Orange highlight */
-  background: #d97e00;
-}
-
-.theme-dark .chart-colored-blob[name=xhr] {
-  fill: #d96629; /* Orange highlight */
-  background: #d96629;
-}
-
-.theme-light .chart-colored-blob[name=xhr] {
-  fill: #f13c00; /* Orange highlight */
-  background: #f13c00;
-}
-
-.theme-dark .chart-colored-blob[name=fonts] {
-  fill: #6b7abb; /* Purple highlight */
-  background: #6b7abb;
+.chart-colored-blob[name=html] {
+  fill: var(--theme-highlight-bluegrey);
+  background: var(--theme-highlight-bluegrey);
 }
 
-.theme-light .chart-colored-blob[name=fonts] {
-  fill: #5b5fff; /* Purple highlight */
-  background: #5b5fff;
+.chart-colored-blob[name=css] {
+  fill: var(--theme-highlight-blue);
+  background: var(--theme-highlight-blue);
 }
 
-.theme-dark .chart-colored-blob[name=images] {
-  fill: #df80ff; /* Pink highlight */
-  background: #df80ff;
+.chart-colored-blob[name=js] {
+  fill: var(--theme-highlight-lightorange);
+  background: var(--theme-highlight-lightorange);
 }
 
-.theme-light .chart-colored-blob[name=images] {
-  fill: #b82ee5; /* Pink highlight */
-  background: #b82ee5;
+.chart-colored-blob[name=xhr] {
+  fill: var(--theme-highlight-orange);
+  background: var(--theme-highlight-orange);
 }
 
-.theme-dark .chart-colored-blob[name=media] {
-  fill: #70bf53; /* Green highlight */
-  background: #70bf53;
+.chart-colored-blob[name=fonts] {
+  fill: var(--theme-highlight-purple);
+  background: var(--theme-highlight-purple);
 }
 
-.theme-light .chart-colored-blob[name=media] {
-  fill: #2cbb0f; /* Green highlight */
-  background: #2cbb0f;
+.chart-colored-blob[name=images] {
+  fill: var(--theme-highlight-pink);
+  background: var(--theme-highlight-pink);
 }
 
-.theme-dark .chart-colored-blob[name=flash] {
-  fill: #eb5368; /* Red highlight */
-  background: #eb5368;
+.chart-colored-blob[name=media] {
+  fill: var(--theme-highlight-green);
+  background: var(--theme-highlight-green);
 }
 
-.theme-light .chart-colored-blob[name=flash] {
-  fill: #ed2655; /* Red highlight */
-  background: #ed2655;
+.chart-colored-blob[name=flash] {
+  fill: var(--theme-highlight-red);
+  background: var(--theme-highlight-red);
 }
 
 .table-chart-row-label[name=cached] {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/performance.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/performance.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/performance.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/performance.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -32,3 +32,226 @@
 #record-button[locked] {
   pointer-events: none;
 }
+
+/* Profile call tree */
+
+.theme-dark .call-tree-headers-container {
+  border-top: 1px solid #000;
+}
+
+.theme-light .call-tree-headers-container {
+  border-top: 1px solid #aaa;
+}
+
+.call-tree-cells-container {
+  /* Hack: force hardware acceleration */
+  transform: translateZ(1px);
+  overflow: auto;
+}
+
+.call-tree-cells-container[categories-hidden] .call-tree-category {
+  display: none;
+}
+
+.call-tree-header[type="duration"],
+.call-tree-cell[type="duration"],
+.call-tree-header[type="self-duration"],
+.call-tree-cell[type="self-duration"] {
+  width: 9em;
+}
+
+.call-tree-header[type="percentage"],
+.call-tree-cell[type="percentage"],
+.call-tree-header[type="self-percentage"],
+.call-tree-cell[type="self-percentage"] {
+  width: 6em;
+}
+
+.call-tree-header[type="samples"],
+.call-tree-cell[type="samples"] {
+  width: 5em;
+}
+
+.call-tree-header[type="function"],
+.call-tree-cell[type="function"] {
+  -moz-box-flex: 1;
+}
+
+.call-tree-header,
+.call-tree-cell {
+  -moz-box-align: center;
+  overflow: hidden;
+  padding: 1px 4px;
+}
+
+.call-tree-header:not(:last-child),
+.call-tree-cell:not(:last-child) {
+  -moz-border-end: 1px solid;
+}
+
+.theme-dark .call-tree-header,
+.theme-dark .call-tree-cell {
+  -moz-border-end-color: rgba(255,255,255,0.15);
+  color: #8fa1b2; /* Body Text */
+}
+
+.theme-light .call-tree-header,
+.theme-light .call-tree-cell {
+  -moz-border-end-color: rgba(0,0,0,0.15);
+  color: #18191a; /* Body Text */
+}
+
+.call-tree-header:not(:last-child) {
+  text-align: center;
+}
+
+.call-tree-cell:not(:last-child) {
+  text-align: end;
+}
+
+.theme-dark .call-tree-header {
+  background-color: #252c33; /* Tab Toolbar */
+}
+
+.theme-light .call-tree-header {
+  background-color: #ebeced; /* Tab Toolbar */
+}
+
+.theme-dark .call-tree-item:last-child:not(:focus) {
+  border-bottom: 1px solid rgba(255,255,255,0.15);
+}
+
+.theme-light .call-tree-item:last-child:not(:focus) {
+  border-bottom: 1px solid rgba(0,0,0,0.15);
+}
+
+.theme-dark .call-tree-item:nth-child(2n) {
+  background-color: rgba(29,79,115,0.15);
+}
+
+.theme-light .call-tree-item:nth-child(2n) {
+  background-color: rgba(76,158,217,0.1);
+}
+
+.theme-dark .call-tree-item:hover {
+  background-color: rgba(29,79,115,0.25);
+}
+
+.theme-light .call-tree-item:hover {
+  background-color: rgba(76,158,217,0.2);
+}
+
+.theme-dark .call-tree-item:focus {
+  background-color: #1d4f73; /* Select Highlight Blue */
+}
+
+.theme-light .call-tree-item:focus {
+  background-color: #4c9ed9; /* Select Highlight Blue */
+}
+
+.call-tree-item:focus label {
+  color: #f5f7fa !important; /* Light foreground text */
+}
+
+.theme-dark .call-tree-item:focus .call-tree-cell {
+  -moz-border-end-color: rgba(0,0,0,0.3);
+}
+
+.theme-light .call-tree-item:focus .call-tree-cell {
+  -moz-border-end-color: rgba(255,255,255,0.5);
+}
+
+.call-tree-item:not([origin="content"]) .call-tree-name,
+.call-tree-item:not([origin="content"]) .call-tree-url,
+.call-tree-item:not([origin="content"]) .call-tree-line {
+  /* Style chrome and non-JS nodes differently. */
+  opacity: 0.6;
+}
+
+.call-tree-url {
+  -moz-margin-start: 4px !important;
+  cursor: pointer;
+}
+
+.call-tree-url:hover {
+  text-decoration: underline;
+}
+
+.theme-dark .call-tree-url {
+  color: #46afe3;
+}
+
+.theme-light .call-tree-url {
+  color: #0088cc;
+}
+
+.theme-dark .call-tree-line {
+  color: #d96629;
+}
+
+.theme-light .call-tree-line {
+  color: #f13c00;
+}
+
+.call-tree-host {
+  -moz-margin-start: 8px !important;
+  font-size: 90%;
+}
+
+.theme-dark .call-tree-host {
+  color: #8fa1b2;
+}
+
+.theme-light .call-tree-host {
+  color: #8fa1b2;
+}
+
+.call-tree-url[value=""],
+.call-tree-line[value=""],
+.call-tree-host[value=""] {
+  display: none;
+}
+
+.call-tree-zoom {
+  -moz-appearance: none;
+  background-color: transparent;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 11px;
+  min-width: 11px;
+  -moz-margin-start: 8px !important;
+  cursor: zoom-in;
+  opacity: 0;
+}
+
+.theme-dark .call-tree-zoom {
+  background-image: url(magnifying-glass.png);
+}
+
+.theme-light .call-tree-zoom {
+  background-image: url(magnifying-glass-light.png);
+}
+
+@media (min-resolution: 2dppx) {
+  .theme-dark .call-tree-zoom {
+    background-image: url(magnifying-glass@2x.png);
+  }
+
+  .theme-light .call-tree-zoom {
+    background-image: url(magnifying-glass-light@2x.png);
+  }
+}
+
+.call-tree-item:hover .call-tree-zoom {
+  transition: opacity 0.3s ease-in;
+  opacity: 1;
+}
+
+.call-tree-item:hover .call-tree-zoom:hover {
+  opacity: 0;
+}
+
+.call-tree-category {
+  transform: scale(0.75);
+  transform-origin: center right;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/profiler.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/profiler.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/profiler.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/profiler.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -8,16 +8,8 @@
 .notice-container {
   margin-top: -50vh;
   font-size: 120%;
-}
-
-.theme-dark .notice-container {
-  background: #343c45; /* Toolbars */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .notice-container {
-  background: #f0f1f2; /* Toolbars */
-  color: #585959; /* Grey foreground text */
+  background-color: var(--theme-toolbar-background);
+  color: var(--theme-body-color-alt);
 }
 
 #empty-notice button,
@@ -55,14 +47,9 @@
   -moz-border-end-width: 1px;
 }
 
-.theme-dark #recordings-pane > tabs,
-.theme-dark #recordings-pane .devtools-toolbar {
-  -moz-border-end-color: #000; /* Splitters */
-}
-
-.theme-light #recordings-pane > tabs,
-.theme-light #recordings-pane .devtools-toolbar {
-  -moz-border-end-color: #aaa; /* Splitters */
+#recordings-pane > tabs,
+#recordings-pane .devtools-toolbar {
+  -moz-border-end-color: var(--theme-splitter-color);
 }
 
 #record-button {
@@ -97,14 +84,9 @@
   cursor: pointer;
 }
 
-.theme-dark .recording-item-duration,
-.theme-dark .recording-item-save {
-  color: #b6babf; /* Foreground (Text) - Grey */
-}
-
-.theme-light .recording-item-duration,
-.theme-light .recording-item-save {
-  color: #585959; /* Foreground (Text) - Grey */
+.recording-item-duration,
+.recording-item-save {
+  color: var(--theme-body-color-alt);
 }
 
 #recordings-list .selected label {
@@ -132,12 +114,8 @@
   transition-property: opacity, transform;
 }
 
-.theme-dark #profile-content tab {
-  color: #8fa1b2; /* Body Text */
-}
-
-.theme-light #profile-content tab {
-  color: #18191a; /* Body Text */
+#profile-content tab {
+  color: var(--theme-body-color);
 }
 
 #profile-content tab:not([selected]) {
@@ -149,14 +127,9 @@
   transform: translateY(100%);
 }
 
-.theme-dark #profile-content tab {
-  -moz-appearance: none;
-  -moz-border-end: 1px solid #000; /* Splitters */
-}
-
-.theme-light #profile-content tab {
+#profile-content tab {
   -moz-appearance: none;
-  -moz-border-end: 1px solid #aaa; /* Splitters */
+  -moz-border-end: 1px solid var(--theme-splitter-color);
 }
 
 .theme-dark #profile-content tab:hover {
@@ -167,14 +140,9 @@
   background-color: rgba(255,255,255,0.8);
 }
 
-.theme-dark #profile-content tab[selected] {
-  background-color: #1d4f73; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light #profile-content tab[selected] {
-  background-color: #4c9ed9; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
+#profile-content tab[selected] {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 #profile-content tabpanel {
@@ -229,12 +197,8 @@
 
 /* Profile call tree */
 
-.theme-dark .call-tree-headers-container {
-  border-top: 1px solid #000;
-}
-
-.theme-light .call-tree-headers-container {
-  border-top: 1px solid #aaa;
+.call-tree-headers-container {
+  border-top: 1px solid var(--theme-splitter-color);
 }
 
 .call-tree-cells-container {
@@ -276,6 +240,7 @@
   -moz-box-align: center;
   overflow: hidden;
   padding: 1px 4px;
+  color: var(--theme-body-color);
 }
 
 .call-tree-header:not(:last-child),
@@ -286,13 +251,11 @@
 .theme-dark .call-tree-header,
 .theme-dark .call-tree-cell {
   -moz-border-end-color: rgba(255,255,255,0.15);
-  color: #8fa1b2; /* Body Text */
 }
 
 .theme-light .call-tree-header,
 .theme-light .call-tree-cell {
   -moz-border-end-color: rgba(0,0,0,0.15);
-  color: #18191a; /* Body Text */
 }
 
 .call-tree-header:not(:last-child) {
@@ -303,12 +266,8 @@
   text-align: end;
 }
 
-.theme-dark .call-tree-header {
-  background-color: #252c33; /* Tab Toolbar */
-}
-
-.theme-light .call-tree-header {
-  background-color: #ebeced; /* Tab Toolbar */
+.call-tree-header {
+  background-color: var(--theme-tab-toolbar-background);
 }
 
 .theme-dark .call-tree-item:last-child:not(:focus) {
@@ -335,16 +294,12 @@
   background-color: rgba(76,158,217,0.2);
 }
 
-.theme-dark .call-tree-item:focus {
-  background-color: #1d4f73; /* Select Highlight Blue */
-}
-
-.theme-light .call-tree-item:focus {
-  background-color: #4c9ed9; /* Select Highlight Blue */
+.call-tree-item:focus {
+  background-color: var(--theme-selection-background);
 }
 
 .call-tree-item:focus label {
-  color: #f5f7fa !important; /* Light foreground text */
+  color: var(--theme-selection-color) !important;
 }
 
 .theme-dark .call-tree-item:focus .call-tree-cell {
@@ -371,33 +326,19 @@
   text-decoration: underline;
 }
 
-.theme-dark .call-tree-url {
-  color: #46afe3;
-}
-
-.theme-light .call-tree-url {
-  color: #0088cc;
+.call-tree-url {
+  color: var(--theme-highlight-blue);
 }
 
-.theme-dark .call-tree-line {
-  color: #d96629;
-}
 
-.theme-light .call-tree-line {
-  color: #f13c00;
+.call-tree-line {
+  color: var(--theme-highlight-orange);
 }
 
 .call-tree-host {
   -moz-margin-start: 8px !important;
   font-size: 90%;
-}
-
-.theme-dark .call-tree-host {
-  color: #8fa1b2;
-}
-
-.theme-light .call-tree-host {
-  color: #8fa1b2;
+  color: var(--theme-content-color2);
 }
 
 .call-tree-url[value=""],
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/ruleview.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/ruleview.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/ruleview.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/ruleview.css	2014-11-26 21:45:53.000000000 +0000
@@ -51,12 +51,8 @@
 }
 
 /* User agent styles are not editable, display them differently */
-.theme-light .ruleview-rule[uneditable=true] {
-  background: #ebeced; /* Tab Toolbar */
-}
-
-.theme-dark .ruleview-rule[uneditable=true] {
-  background: #252c33; /* Tab Toolbar */
+.ruleview-rule[uneditable=true] {
+  background: var(--theme-tab-toolbar-background);
 }
 
 .ruleview-rule[uneditable=true] :focus {
@@ -64,7 +60,7 @@
 }
 
 .ruleview-rule[uneditable=true] .theme-link {
-  color: #5f88b0; /* Blue - Grey */
+  color: var(--theme-highlight-bluegrey);
 }
 
 .ruleview-rule[uneditable=true] .ruleview-enableproperty {
@@ -198,7 +194,7 @@
 }
 
 .theme-light .ruleview-overridden {
-  -moz-text-decoration-color: #667380; /*  Content (Text) - Dark Grey */
+  text-decoration-color: var(--theme-content-color3);
 }
 
 .styleinspector-propertyeditor {
@@ -215,12 +211,8 @@
   vertical-align: middle;
 }
 
-.theme-dark .ruleview-property[dirty] {
-  border-left-color: #70bf53; /* Green */
-}
-
-.theme-light .ruleview-property[dirty] {
-  border-left-color: #2cbb0f; /* Green */
+.ruleview-property[dirty] {
+  border-left-color: var(--theme-highlight-green);
 }
 
 .ruleview-namecontainer > .ruleview-propertyname,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/shadereditor.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/shadereditor.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/shadereditor.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/shadereditor.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -6,16 +6,8 @@
 
 .notice-container {
   margin-top: -50vh;
-}
-
-.theme-dark .notice-container {
-  background-color: #343c45; /* Toolbars */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .notice-container {
-  background-color: #f0f1f2; /* Toolbars */
-  color: #585959; /* Grey foreground text */
+  background-color: var(--theme-toolbar-background);
+  color: var(--theme-body-color-alt);
 }
 
 #reload-notice {
@@ -99,26 +91,15 @@
   border-top: 1px solid;
 }
 
-.theme-dark .editor-label {
-  background: #343c45; /* Dark toolbars */
-  border-color: #000; /* Match the splitter color. */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .editor-label {
-  background: #f0f1f2; /* Light toolbars */
-  border-color: #aaa; /* Match the splitter color. */
-  color: #585959; /* Grey foreground text */
-}
-
-.theme-dark .editor-label[selected] {
-  background-color: #1d4f73; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
+.editor-label {
+  background: var(--theme-toolbar-background);
+  border-color: var(--theme-splitter-color);
+  color: var(--theme-body-color-alt);
 }
 
-.theme-light .editor-label[selected] {
-  background-color: #4c9ed9; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
+.editor-label[selected] {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 /* Responsive sidebar */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/splitview.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/splitview.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/splitview.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/splitview.css	2014-11-26 21:45:53.000000000 +0000
@@ -18,7 +18,7 @@
 }
 
 .theme-dark .splitview-nav-container {
-  background-color: #343c45; /* Toolbars */
+  background-color: var(--theme-toolbar-background);
 }
 
 .splitview-nav {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/styleeditor.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/styleeditor.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/styleeditor.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/styleeditor.css	2014-11-26 21:45:53.000000000 +0000
@@ -14,24 +14,24 @@
 
 .theme-dark .stylesheet-title,
 .theme-dark .stylesheet-name {
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
 }
 
 .theme-dark .stylesheet-rule-count,
 .theme-dark .stylesheet-linked-file,
 .theme-dark .stylesheet-saveButton {
-  color: #b6babf;
+  color: var(--theme-body-color-alt);
 }
 
 .theme-light .stylesheet-title,
 .theme-light .stylesheet-name {
-  color: #585959;
+  color: var(--theme-body-color-alt);
 }
 
 .theme-light .stylesheet-rule-count,
 .theme-light .stylesheet-linked-file,
 .theme-light .stylesheet-saveButton {
-  color: #18191a;
+  color: var(--theme-body-color);
 }
 
 .stylesheet-saveButton {
@@ -44,7 +44,7 @@
 .theme-light .splitview-active .stylesheet-rule-count,
 .theme-light .splitview-active .stylesheet-linked-file,
 .theme-light .splitview-active .stylesheet-saveButton {
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
 }
 
 .splitview-nav:focus {
@@ -205,12 +205,8 @@
   }
 }
 
-.theme-light .csscoverage-report {
-  background-color: #f0f1f2; /* Toolbars */
-}
-
-.theme-dark .csscoverage-report {
-  background-color: #343c45; /* Toolbars */
+.csscoverage-report {
+  background-color: var(--theme-toolbar-background);
 }
 
 .csscoverage-report-container {
@@ -274,34 +270,19 @@
   -moz-border-start: none;
 }
 
-.theme-dark .chart-colored-blob[name="Used Preload"] {
-  fill: #df80ff; /* Pink highlight */
-  background: #df80ff;
-}
-
-.theme-light .chart-colored-blob[name="Used Preload"] {
-  fill: #b82ee5; /* Pink highlight */
-  background: #b82ee5;
-}
-
-.theme-dark .chart-colored-blob[name=Used] {
-  fill: #70bf53; /* Green highlight */
-  background: #70bf53;
-}
-
-.theme-light .chart-colored-blob[name=Used] {
-  fill: #2cbb0f; /* Green highlight */
-  background: #2cbb0f;
+.chart-colored-blob[name="Used Preload"] {
+  fill: var(--theme-highlight-pink);
+  background: var(--theme-highlight-pink);;
 }
 
-.theme-dark .chart-colored-blob[name=Unused] {
-  fill: #d99b28; /* Light Orange highlight */
-  background: #d99b28;
+.chart-colored-blob[name=Used] {
+  fill: var(--theme-highlight-green);
+  background: var(--theme-highlight-green);
 }
 
-.theme-light .chart-colored-blob[name=Unused] {
-  fill: #d97e00; /* Light Orange highlight */
-  background: #d97e00;
+.chart-colored-blob[name=Unused] {
+  fill: var(--theme-highlight-lightorange);
+  background: var(--theme-highlight-lightorange);
 }
 
 /* Undo 'largest' customization */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/timeline.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/timeline.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/timeline.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/timeline.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -63,6 +63,10 @@
   overflow-y: auto;
 }
 
+.waterfall-header-contents {
+  overflow-x: hidden;
+}
+
 .waterfall-background-ticks {
   /* Background created on a <canvas> in js. */
   /* @see browser/devtools/timeline/widgets/waterfall.js */
@@ -153,3 +157,42 @@
   border-radius: 1px;
   transform-origin: left center;
 }
+
+.theme-light .waterfall-marker-container.selected > .waterfall-sidebar,
+.theme-light .waterfall-marker-container.selected > .waterfall-marker-item {
+  background-color: #4c9ed9; /* Select Highlight Blue */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.theme-dark .waterfall-marker-container.selected > .waterfall-sidebar,
+.theme-dark .waterfall-marker-container.selected > .waterfall-marker-item {
+  background-color: #1d4f73; /* Select Highlight Blue */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.waterfall-marker-container.selected .waterfall-marker-bullet,
+.waterfall-marker-container.selected .waterfall-marker-bar {
+  border-color: initial!important;
+}
+
+#timeline-waterfall-details {
+  padding-top: 28px;
+  overflow: auto;
+}
+
+.marker-details-bullet {
+  width: 8px;
+  height: 8px;
+  margin: 0 8px;
+  border: 1px solid;
+  border-radius: 1px;
+}
+
+.marker-details-type {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+.marker-details-duration {
+  font-weight: bold;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/toolbars.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/toolbars.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/toolbars.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/toolbars.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -57,6 +57,8 @@
   margin: 2px 3px;
   color: inherit;
   transition: background 0.05s ease-in-out;
+  color: var(--theme-content-color1);
+  background-color: var(--theme-toolbar-background);
 }
 
 .devtools-menulist:-moz-focusring,
@@ -141,14 +143,10 @@
 
 .theme-dark .devtools-menulist,
 .theme-dark .devtools-toolbarbutton {
-  color: #a9bacb; /* Body text - high contrast */
-  background-color: #343c45; /* Toolbars */
   border-color: rgba(0, 0, 0, .4); /* Splitters */
 }
 .theme-light .devtools-menulist,
 .theme-light .devtools-toolbarbutton {
-  color: #292e33; /* Body text - high contrast */
-  background-color: #f0f1f2; /* Toolbars */
   border-color: rgba(170, 170, 170, .5); /* Splitters */
 }
 
@@ -189,7 +187,7 @@
 .theme-dark .devtools-toolbarbutton[checked=true],
 .theme-dark #toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
   background: rgba(29, 79, 115, .7); /* Select highlight blue */
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
 }
 
 .theme-light .devtools-toolbarbutton[checked=true],
@@ -203,7 +201,7 @@
 .theme-dark .devtools-toolbarbutton[open=true]:hover:active,
 .theme-dark .devtools-toolbarbutton[checked=true]:hover {
   background: rgba(29, 79, 115, .8); /* Select highlight blue */
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
 }
 
 .theme-light .devtools-menulist[open=true],
@@ -259,16 +257,7 @@
   border-radius: 2px;
 %endif
   padding: 4px 6px;
-}
-
-.theme-dark .devtools-textinput,
-.theme-dark .devtools-searchinput {
-  border-color: rgb(88, 94, 101);
-}
-
-.theme-light .devtools-textinput,
-.theme-light .devtools-searchinput {
-  border-color: #aaa; /* Match the splitter color */
+  border-color: var(--theme-splitter-color);
 }
 
 .devtools-searchinput {
@@ -310,7 +299,7 @@
 }
 
 .devtools-no-search-result {
-  border-color: #eb5368 !important;
+  border-color: var(--theme-highlight-red) !important;
 }
 
 /* Close button */
@@ -349,7 +338,6 @@
 }
 
 /* In-tools sidebar */
-
 .devtools-sidebar-tabs {
   -moz-appearance: none;
   margin: 0;
@@ -363,8 +351,8 @@
 }
 
 .theme-light .devtools-sidebar-tabs > tabpanels {
-  background: #f7f7f7;
-  color: #18191a;
+  background: var(--theme-sidebar-background);
+  color: var(--theme-body-color);
 }
 
 .devtools-sidebar-tabs > tabs {
@@ -434,7 +422,7 @@
 
 .theme-dark .devtools-sidebar-tabs > tabs > tab[selected],
 .theme-dark .devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
   background: #1d4f73;
   border-image: @solidSeparatorDark@ 1 1;
 }
@@ -464,7 +452,7 @@
 
 .theme-light .devtools-sidebar-tabs > tabs > tab[selected],
 .theme-light .devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
   background: #4c9ed9;
   border-image: @solidSeparatorLight@;
 }
@@ -663,18 +651,16 @@
   border: 0px solid;
   border-bottom-width: 1px;
   padding: 0;
+  background: var(--theme-tab-toolbar-background);
+  border-bottom-color: var(--theme-splitter-color);
 }
 
 .theme-light .devtools-tabbar {
   box-shadow: 0 -2px 0 rgba(170,170,170,.1) inset;
-  background: #ebeced;
-  border-bottom-color: #aaa;
 }
 
 .theme-dark .devtools-tabbar {
   box-shadow: 0 -2px 0 rgba(0,0,0,.1) inset;
-  background: #252c33;
-  border-bottom-color: #000;
 }
 
 #toolbox-tabs {
@@ -697,13 +683,13 @@
 }
 
 .theme-dark .devtools-tab {
-  color: #b6babf;
+  color: var(--theme-body-color-alt);
   border-color: #42484f;
 }
 
 .theme-light .devtools-tab {
-  color: #18191a;
-  border-color: #aaa;
+  color: var(--theme-body-color);
+  border-color: var(--theme-splitter-color);
 }
 
 .theme-dark .devtools-tab:hover {
@@ -717,7 +703,7 @@
 
 .theme-dark .devtools-tab:hover:active {
   background-color: hsla(206,37%,4%,.4);
-  color: #f5f7fa;
+  color: var(--theme-selection-color);
 }
 
 .theme-light .devtools-tab:hover:active {
@@ -755,24 +741,25 @@
   opacity: 1;
 }
 
+.devtools-tabbar .devtools-tab[selected] {
+  color: var(--theme-selection-color);
+  background-color: var(--theme-selection-background);
+}
+
 .theme-dark .devtools-tabbar .devtools-tab[selected] {
-  color: #f5f7fa;
-  background-color: #1a4666;
   box-shadow: 0 2px 0 #d7f1ff inset,
               0 8px 3px -5px #2b82bf inset,
               0 -2px 0 rgba(0,0,0,.2) inset;
 }
 
 .theme-light .devtools-tabbar .devtools-tab[selected] {
-  color: #f5f7fa;
-  background-color: #4c9ed9;
   box-shadow: 0 2px 0 #d7f1ff inset,
               0 8px 3px -5px #2b82bf inset,
               0 -2px 0 rgba(0,0,0,.06) inset;
 }
 
-#toolbox-tabs .devtools-tab[selected]:not(:first-child),
-#toolbox-tabs .devtools-tab[highlighted]:not(:first-child) {
+#toolbox-tabs .devtools-tab[selected],
+#toolbox-tabs .devtools-tab[highlighted] {
   border-width: 0;
   -moz-padding-start: 1px;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/webaudioeditor.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/webaudioeditor.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/webaudioeditor.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/webaudioeditor.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -5,16 +5,8 @@
 /* Reload and waiting notices */
 .notice-container {
   margin-top: -50vh;
-}
-
-.theme-dark .notice-container {
-  background-color: #343c45; /* Toolbars */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .notice-container {
-  background-color: #f0f1f2; /* Toolbars */
-  color: #585959; /* Grey foreground text */
+  background-color: var(--theme-toolbar-background);
+  color: var(--theme-body-color-alt);
 }
 
 #reload-notice {
@@ -75,7 +67,7 @@
   fill: #fcfcfc; /* Background - Editor */
 }
 .theme-dark g.edgeLabel tspan {
-  fill: #b6babf; /* Grey foreground text */
+  fill: var(--theme-body-color-alt);
 }
 .theme-light g.edgeLabel tspan {
   fill: #585959; /* Grey foreground text */
@@ -87,22 +79,13 @@
   cursor: pointer;
 }
 
-.theme-dark .nodes rect {
-  stroke: #252c33; /* Tab toolbar */
-  fill: #343c45; /* Toolbars */
-}
-
-.theme-light .nodes rect {
-  stroke: #ebeced; /* Tab toolbar */
-  fill: #f0f1f2; /* Toolbar */
-}
-
-.theme-dark .nodes g.selected rect {
-  fill: #1d4f73; /* Select Highlight Blue */
+.nodes rect {
+  stroke: var(--theme-tab-toolbar-background);
+  fill: var(--theme-toolbar-background);
 }
 
-.theme-light .nodes g.selected rect {
-  fill: #4c9ed9; /* Select Highlight Blue */
+.nodes g.selected rect {
+  fill: var(--theme-selection-background);
 }
 
 /* Text in nodes and edges */
@@ -113,14 +96,12 @@
   font-size: 14px;
 }
 
-.theme-dark text {
-  fill: #b6babf; /* Grey foreground text */
-}
-.theme-light text {
-  fill: #585959; /* Grey foreground text */
+text {
+  fill: var(--theme-body-color-alt);
 }
+
 .theme-light g.selected text {
-  fill: #f0f1f2; /* Toolbars */
+  fill: var(--theme-toolbar-background);
 }
 
 .nodes text {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/webconsole.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/webconsole.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/webconsole.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/webconsole.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -160,12 +160,8 @@
   display: none;
 }
 
-.theme-dark #output-container.hideTimestamps > .message > .indent {
-  background-color: #14171a; /* .theme-body */
-}
-
-.theme-light #output-container.hideTimestamps > .message > .indent {
-  background-color: #fcfcfc; /* .theme-body */
+#output-container.hideTimestamps > .message > .indent {
+  background-color: var(--theme-body-background);
 }
 
 .filtered-by-type,
@@ -203,12 +199,8 @@
   border-color: #777;
 }
 
-.theme-light .message:hover {
-  background-color: rgba(76, 158, 217, 0.23) !important;
-}
-
-.theme-dark .message:hover {
-  background-color: rgba(29, 79, 115, 0.5) !important;
+.message:hover {
+  background-color: var(--theme-selection-background-semitransparent) !important;
 }
 
 .theme-light .message[severity=error] {
@@ -219,12 +211,8 @@
   background-color: rgba(235, 83, 104, 0.17);
 }
 
-.theme-dark .console-string {
-  color: #d99b28;
-}
-
-.theme-light .console-string {
-  color: hsl(24,85%,39%);
+.console-string {
+  color: var(--theme-highlight-lightorange);
 }
 
 .theme-selected .console-string,
@@ -499,22 +487,21 @@
   background-position: -16px 0;
 }
 
-/* Replace these values with CSS variables as available */
-.theme-dark .jsterm-input-container {
-  background-color: #252c33; /* tabToolbarBackgroundColor */
-  border-color: #14171a; /* mainBackgroundColor */
+.jsterm-input-container {
+  background-color: var(--theme-tab-toolbar-background);
+  border-color: var(--theme-body-background);
 }
 
-.theme-dark .jsterm-input-node {
-  color: #a9bacb; /* textColor */
+.jsterm-input-node {
+  color: var(--theme-content-color1);
 }
 
-.theme-dark .jsterm-complete-node {
-  color: #5c6773; /* commentColor */
+.jsterm-complete-node {
+  color: var(--theme-comment);
 }
 
-.theme-dark .navigation-marker .url {
-  background: #14171a; /* mainBackgroundColor */
+.navigation-marker .url {
+  background: var(--theme-body-background);
 }
 
 .theme-dark .inlined-variables-view iframe {
@@ -526,20 +513,13 @@
 }
 
 .theme-light .jsterm-input-container {
-  background-color: #fff; /* mainBackgroundColor */
+  /* For light theme use a white background for the input - it looks better
+     than off-white */
+  background-color: #fff;
   border-color: ThreeDShadow;
 }
-
-.theme-light .jsterm-input-node {
-  color: black; /* textColor */
-}
-
-.theme-light .jsterm-complete-node {
-  color: hsl(90,2%,46%); /* commentColor */
-}
-
 .theme-light .navigation-marker .url {
-  background: #fff; /* mainBackgroundColor */
+  background: #fff;
 }
 
 .theme-light .inlined-variables-view iframe {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/widgets.inc.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/widgets.inc.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/shared/devtools/widgets.inc.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/shared/devtools/widgets.inc.css	2014-11-26 21:45:53.000000000 +0000
@@ -122,14 +122,14 @@
 .scrollbutton-down:-moz-locale-dir(rtl) {
   border-right: solid 1px rgba(255, 255, 255, .1);
   border-left: solid 1px transparent;
-  box-shadow: 3px 0px 3px -3px #181d20;
+  box-shadow: 3px 0px 3px -3px var(--theme-sidebar-background);
 }
 
 .scrollbutton-down:-moz-locale-dir(ltr),
 .scrollbutton-up:-moz-locale-dir(rtl) {
   border-right: solid 1px transparent;
   border-left: solid 1px rgba(255, 255, 255, .1);
-  box-shadow: -3px 0px 3px -3px #181d20;
+  box-shadow: -3px 0px 3px -3px var(--theme-sidebar-background);
 }
 
 .scrollbutton-up[disabled],
@@ -161,24 +161,14 @@
   overflow: hidden;
 }
 
-.theme-dark #breadcrumb-separator-before,
-.theme-dark #breadcrumb-separator-after:after {
-  background: #1d4f73; /* Select Highlight Blue */
-}
-
-.theme-dark #breadcrumb-separator-after,
-.theme-dark #breadcrumb-separator-before:after {
-  background: #343c45; /* Toolbars */
-}
-
-.theme-light #breadcrumb-separator-before,
-.theme-light #breadcrumb-separator-after:after {
-  background: #4c9ed9; /* Select Highlight Blue */
+#breadcrumb-separator-before,
+#breadcrumb-separator-after:after {
+  background: var(--theme-selection-background);
 }
 
-.theme-light #breadcrumb-separator-after,
-.theme-light #breadcrumb-separator-before:after {
-  background: #f0f1f2; /* Toolbars */
+#breadcrumb-separator-after,
+#breadcrumb-separator-before:after {
+  background: var(--theme-toolbar-background);
 }
 
 /* This chevron arrow cannot be replicated easily in CSS, so we are using
@@ -231,12 +221,8 @@
   background: -moz-element(#breadcrumb-separator-before) no-repeat 0 0;
 }
 
-.theme-dark .breadcrumbs-widget-item[checked] {
-  background-color: #1d4f73; /* Select Highlight Blue */
-}
-
-.theme-light .breadcrumbs-widget-item[checked] {
-  background-color: #4c9ed9; /* Select Highlight Blue */
+.breadcrumbs-widget-item[checked] {
+  background-color: var(--theme-selection-background);
 }
 
 .breadcrumbs-widget-item:first-child {
@@ -270,39 +256,27 @@
 .breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-tag,
 .breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-pseudo-classes,
 .breadcrumbs-widget-item[checked] .breadcrumbs-widget-item-classes {
-  color: #f5f7fa; /* Foreground (Text) - Light */
+  color: var(--theme-selection-color);
 }
 
 .theme-dark .breadcrumbs-widget-item {
-  color: #f5f7fa; /* Foreground (Text) - Light */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .breadcrumbs-widget-item {
-  color: #18191a; /* Foreground (Text) - Dark */
-}
-
-.theme-dark .breadcrumbs-widget-item-id {
-  color: #b6babf; /* Foreground (Text) - Grey */
+  color: var(--theme-body-color);
 }
 
-.theme-light .breadcrumbs-widget-item-id {
-  color: #585959; /* Foreground (Text) - Grey */
+.breadcrumbs-widget-item-id {
+  color: var(--theme-body-color-alt);
 }
 
-.theme-dark .breadcrumbs-widget-item-classes {
-  color: #a9bacb; /* Content (Text) - Light */
+.breadcrumbs-widget-item-classes {
+  color: var(--theme-content-color1);
 }
 
-.theme-light .breadcrumbs-widget-item-classes {
-  color: #667380; /* Content (Text) - Dark Grey */
-}
-
-.theme-dark .breadcrumbs-widget-item-pseudo-classes {
-  color: #d99b28; /* Light Orange */
-}
-
-.theme-light .breadcrumbs-widget-item-pseudo-classes {
-  color: #d97e00; /* Light Orange */
+.breadcrumbs-widget-item-pseudo-classes {
+  color: var(--theme-highlight-lightorange);
 }
 
 .theme-dark .breadcrumbs-widget-item:not([checked]):hover label {
@@ -320,14 +294,9 @@
   transform: translateZ(1px);
 }
 
-.theme-dark .simple-list-widget-item.selected {
-  background-color: #1d4f73; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .simple-list-widget-item.selected {
-  background-color: #4c9ed9; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
+.simple-list-widget-item.selected {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-dark .simple-list-widget-item:not(.selected):hover {
@@ -343,14 +312,9 @@
   padding: 4px 8px;
 }
 
-.theme-dark .simple-list-widget-empty-text,
-.theme-dark .simple-list-widget-perma-text {
-  color: #b6babf; /* Light foreground text */
-}
-
-.theme-light .simple-list-widget-empty-text,
-.theme-light .simple-list-widget-perma-text {
-  color: #585959; /* Grey foreground text */
+.simple-list-widget-empty-text,
+.simple-list-widget-perma-text {
+  color: var(--theme-body-color-alt);
 }
 
 /* FastListWidget */
@@ -364,12 +328,8 @@
   padding: 4px 8px;
 }
 
-.theme-dark .fast-list-widget-empty-text {
-  color: #b6babf; /* Light foreground text */
-}
-
-.theme-light .fast-list-widget-empty-text {
-  color: #585959; /* Grey foreground text */
+.fast-list-widget-empty-text {
+  color: var(--theme-body-color-alt);
 }
 
 /* SideMenuWidget */
@@ -381,11 +341,6 @@
 
 /* SideMenuWidget container */
 
-.theme-dark .side-menu-widget-container,
-.theme-dark .side-menu-widget-empty-text {
-  background-color: #343c45; /* Toolbars */
-}
-
 .theme-dark .side-menu-widget-container:-moz-locale-dir(ltr),
 .theme-dark .side-menu-widget-empty-text:-moz-locale-dir(ltr) {
   box-shadow: inset -1px 0 0 @smw_marginDark@;
@@ -420,16 +375,15 @@
 
 .side-menu-widget-group-title {
   padding: 4px;
+  background-color: var(--theme-tab-toolbar-background);
 }
 
 .theme-dark .side-menu-widget-group-title {
-  background-color: #252c33; /* Tab toolbar */
-  color: #a9bacb; /* Light content text */
+  color: var(--theme-content-color1);
 }
 
 .theme-light .side-menu-widget-group-title {
-  background-color: #ebeced; /* Tab toolbar */
-  color: #667380; /* Dark grey content text */
+  color: var(--theme-content-color3);
 }
 
 /* SideMenuWidget items */
@@ -444,7 +398,7 @@
 .theme-dark .side-menu-widget-item {
   border-top: 1px solid @smw_itemDarkTopBorder@;
   border-bottom: 1px solid @smw_itemDarkBottomBorder@;
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-dark .side-menu-widget-item:last-of-type {
@@ -454,21 +408,16 @@
 .theme-light .side-menu-widget-item {
   border-top: 1px solid @smw_itemLightTopBorder@;
   border-bottom: 1px solid @smw_itemLightBottomBorder@;
-  color: #18191a; /* Dark foreground text */
+  color: var(--theme-body-color);
 }
 
 .theme-light .side-menu-widget-item:last-of-type {
   box-shadow: inset 0 -1px 0 @smw_itemLightTopBorder@;
 }
 
-.theme-dark .side-menu-widget-item.selected {
-  background-color: #1d4f73; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .side-menu-widget-item.selected {
-  background-color: #4c9ed9; /* Select Highlight Blue */
-  color: #f5f7fa; /* Light foreground text */
+.side-menu-widget-item.selected {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .side-menu-widget-item-arrow {
@@ -542,22 +491,17 @@
 
 .theme-dark .side-menu-widget-item.selected .side-menu-widget-item-other {
   background-color: rgba(0,0,0,.2); /* Darken the selection by 20% */
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .side-menu-widget-item.selected .side-menu-widget-item-other {
   background-color: rgba(255,255,255,.8); /* Lighten the selection by 20% */
-  color: #18191a; /* Dark foreground text */
+  color: var(--theme-body-color);
 }
 
-.theme-dark .side-menu-widget-item.selected .side-menu-widget-item-other.selected {
+.side-menu-widget-item.selected .side-menu-widget-item-other.selected {
   background-color: transparent;
-  color: #f5f7fa; /* Light foreground text */
-}
-
-.theme-light .side-menu-widget-item.selected .side-menu-widget-item-other.selected {
-  background-color: transparent;
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 /* SideMenuWidget checkboxes */
@@ -574,18 +518,13 @@
 
 /* SideMenuWidget misc */
 
-.side-menu-widget-empty-text {
-  padding: 4px 8px;
-}
-
+.theme-dark .side-menu-widget-container,
 .theme-dark .side-menu-widget-empty-text {
-  background-color: #343c45; /* Toolbars */
-  color: #b6babf; /* Foreground (Text) - Grey */
+  background-color: var(--theme-toolbar-background);
 }
 
-.theme-light .side-menu-widget-empty-text {
-  background: #f7f7f7; /* Toolbars */
-  color: #585959; /* Grey foreground text */
+.side-menu-widget-empty-text {
+  padding: 4px 8px;
 }
 
 /* VariablesView */
@@ -599,24 +538,14 @@
   padding: 2px;
 }
 
-.theme-dark .variables-view-empty-notice {
-  color: #b6babf; /* Foreground (Text) - Grey */
-}
-
-.theme-light .variables-view-empty-notice {
-  color: #585959; /* Grey foreground text */
-}
-
-.theme-dark .variables-view-scope:focus > .title,
-.theme-dark .variable-or-property:focus > .title {
-  background-color: #1d4f73; /* Selection colors */
-  color: #f5f7fa;
+.variables-view-empty-notice {
+  color: var(--theme-body-color-alt);
 }
 
-.theme-light .variables-view-scope:focus > .title,
-.theme-light .variable-or-property:focus > .title {
-  background-color: #4c9ed9; /* Selection colors */
-  color: #f5f7fa;
+.variables-view-scope:focus > .title,
+.variable-or-property:focus > .title {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .variables-view-scope > .title {
@@ -1106,21 +1035,16 @@
 }
 
 .theme-dark .generic-chart-container {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .generic-chart-container {
-  color: #585959; /* Grey foreground text */
+  color: var(--theme-body-color-alt);
 }
 
-.theme-dark .chart-colored-blob {
-  fill: #a9bacb; /* Light content text */
-  background: #a9bacb;
-}
-
-.theme-light .chart-colored-blob {
-  fill: #8fa1b2; /* Grey content text */
-  background: #8fa1b2;
+.chart-colored-blob {
+  fill: var(--theme-content-color2);
+  background: var(--theme-content-color2);
 }
 
 /* Charts: Pie */
@@ -1218,12 +1142,8 @@
   padding-top: 6px;
 }
 
-.theme-dark .table-chart-totals {
-  border-top: 1px solid #b6babf; /* Grey foreground text */
-}
-
-.theme-light .table-chart-totals {
-  border-top: 1px solid #585959; /* Grey foreground text */
+.table-chart-totals {
+  border-top: 1px solid var(--theme-body-color-alt); /* Grey foreground text */
 }
 
 .table-chart-summary-label {
@@ -1232,11 +1152,11 @@
 }
 
 .theme-dark .table-chart-summary-label {
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-light .table-chart-summary-label {
-  color: #18191a; /* Dark foreground text */
+  color: var(--theme-body-color);
 }
 
 /* Table Widget */
@@ -1252,12 +1172,12 @@
 }
 
 .theme-light .table-widget-body {
-  background: #F7F7F7; /* Background-Sidebar */
+  background: var(--theme-sidebar-background);
 }
 
 .theme-dark .table-widget-body,
 .theme-dark .table-widget-empty-text {
-  background-color: #343c45; /* Toolbars */
+  background-color: var(--theme-toolbar-background);
 }
 
 .theme-dark .table-widget-body:-moz-locale-dir(ltr) {
@@ -1347,7 +1267,7 @@
 .theme-dark .table-widget-cell {
   border-top: 1px solid @smw_itemDarkTopBorder@;
   border-bottom: 1px solid @smw_itemDarkBottomBorder@;
-  color: #f5f7fa; /* Light foreground text */
+  color: var(--theme-selection-color);
 }
 
 .theme-dark:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected),
@@ -1365,7 +1285,7 @@
 }
 
 .theme-light .table-widget-cell:not(.theme-selected) {
-  color: #18191a; /* Dark foreground text */
+  color: var(--theme-body-color);
 }
 
 .theme-light:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected),
@@ -1377,23 +1297,13 @@
   box-shadow: inset 0 -1px 0 @smw_itemLightTopBorder@;
 }
 
-.theme-light .table-widget-cell.flash-out {
-  animation: light-flash-out 0.5s ease-in;
-}
-
-@keyframes light-flash-out {
-  to {
-    background: #E8B671;
-  }
-}
-
-.theme-dark .table-widget-cell.flash-out {
-  animation: dark-flash-out 0.5s ease-in;
+.table-widget-cell.flash-out {
+  animation: flash-out 0.5s ease-in;
 }
 
-@keyframes dark-flash-out {
+@keyframes flash-out {
   to {
-    background: #B28025;
+    background: var(--theme-contrast-background);
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/windows/browser.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/windows/browser.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/browser/themes/windows/browser.css	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/browser/themes/windows/browser.css	2014-11-26 21:45:53.000000000 +0000
@@ -91,7 +91,7 @@
   background-color: ThreeDShadow;
 }
 
-#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
+#navigator-toolbox > toolbar {
   -moz-appearance: none;
   border-style: none;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/AnnotationInfo.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/AnnotationInfo.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/AnnotationInfo.java	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/AnnotationInfo.java	2014-11-26 21:45:53.000000000 +0000
@@ -12,12 +12,19 @@
     public final boolean isMultithreaded;
     public final boolean noThrow;
     public final boolean narrowChars;
+    public final boolean catchException;
 
     public AnnotationInfo(String aWrapperName, boolean aIsMultithreaded,
-                          boolean aNoThrow, boolean aNarrowChars) {
+                          boolean aNoThrow, boolean aNarrowChars, boolean aCatchException) {
         wrapperName = aWrapperName;
         isMultithreaded = aIsMultithreaded;
         noThrow = aNoThrow;
         narrowChars = aNarrowChars;
+        catchException = aCatchException;
+
+        if (!noThrow && catchException) {
+            // It doesn't make sense to have these together
+            throw new IllegalArgumentException("noThrow and catchException are not allowed together");
+        }
     }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/AnnotationProcessor.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/AnnotationProcessor.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/AnnotationProcessor.java	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/AnnotationProcessor.java	2014-11-26 21:45:53.000000000 +0000
@@ -52,7 +52,7 @@
                           "namespace mozilla {\n" +
                           "namespace widget {\n" +
                           "namespace android {\n" +
-                          "void InitStubs(JNIEnv *jEnv);\n\n");
+                          "void InitStubs(JNIEnv *env);\n\n");
 
         StringBuilder implementationFile = new StringBuilder(GENERATED_COMMENT);
         implementationFile.append("#include \"GeneratedJNIWrappers.h\"\n" +
@@ -66,7 +66,7 @@
 
         // Used to track the calls to the various class-specific initialisation functions.
         StringBuilder stubInitialiser = new StringBuilder();
-        stubInitialiser.append("void InitStubs(JNIEnv *jEnv) {\n");
+        stubInitialiser.append("void InitStubs(JNIEnv *env) {\n");
 
         while (jarClassIterator.hasNext()) {
             ClassWithOptions aClassTuple = jarClassIterator.next();
@@ -81,7 +81,7 @@
             }
             generatorInstance = new CodeGenerator(aClassTuple.wrappedClass, aClassTuple.generatedName);
 
-            stubInitialiser.append("    ").append(aClassTuple.generatedName).append("::InitStubs(jEnv);\n");
+            stubInitialiser.append("    ").append(aClassTuple.generatedName).append("::InitStubs(env);\n");
 
             // Iterate all annotated members in this class..
             while (methodIterator.hasNext()) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/CodeGenerator.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/CodeGenerator.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/CodeGenerator.java	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/CodeGenerator.java	2014-11-26 21:45:53.000000000 +0000
@@ -12,6 +12,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.HashSet;
 
@@ -40,21 +41,27 @@
     private final HashSet<String> mTakenMemberNames = new HashSet<String>();
     private int mNameMunger;
 
+    private final boolean mLazyInit;
+
     public CodeGenerator(Class<?> aClass, String aGeneratedName) {
+        this(aClass, aGeneratedName, false);
+    }
+
+    public CodeGenerator(Class<?> aClass, String aGeneratedName, boolean aLazyInit) {
         mClassToWrap = aClass;
         mCClassName = aGeneratedName;
+        mLazyInit = aLazyInit;
 
         // Write the file header things. Includes and so forth.
         // GeneratedJNIWrappers.cpp is generated as the concatenation of wrapperStartupCode with
         // wrapperMethodBodies. Similarly, GeneratedJNIWrappers.h is the concatenation of headerPublic
         // with headerProtected.
-        wrapperStartupCode.append("void ").append(mCClassName).append("::InitStubs(JNIEnv *jEnv) {\n" +
-                                  "    initInit();\n");
+        wrapperStartupCode.append("void ").append(mCClassName).append("::InitStubs(JNIEnv *env) {\n");
 
         // Now we write the various GetStaticMethodID calls here...
         headerPublic.append("class ").append(mCClassName).append(" : public AutoGlobalWrappedJavaObject {\n" +
                             "public:\n" +
-                            "    static void InitStubs(JNIEnv *jEnv);\n");
+                            "    static void InitStubs(JNIEnv *env);\n");
         headerProtected.append("protected:");
 
         generateWrapperMethod();
@@ -79,7 +86,10 @@
     private void generateMemberCommon(Member theMethod, String aCMethodName, Class<?> aClass) {
         ensureClassHeaderAndStartup(aClass);
         writeMemberIdField(theMethod, aCMethodName);
-        writeStartupCode(theMethod);
+
+        if (!mLazyInit) {
+            writeMemberInit(theMethod, wrapperStartupCode);
+        }
     }
 
     /**
@@ -101,8 +111,10 @@
         Class<?> returnType = theMethod.getReturnType();
 
         // Get the C++ method signature for this method.
-        String implementationSignature = Utils.getCImplementationMethodSignature(parameterTypes, returnType, CMethodName, mCClassName, aMethodTuple.mAnnotationInfo.narrowChars);
-        String headerSignature = Utils.getCHeaderMethodSignature(parameterTypes, theMethod.getParameterAnnotations(), returnType, CMethodName, mCClassName, isFieldStatic, aMethodTuple.mAnnotationInfo.narrowChars);
+        String implementationSignature = Utils.getCImplementationMethodSignature(parameterTypes, returnType, CMethodName,
+            mCClassName, aMethodTuple.mAnnotationInfo.narrowChars, aMethodTuple.mAnnotationInfo.catchException);
+        String headerSignature = Utils.getCHeaderMethodSignature(parameterTypes, theMethod.getParameterAnnotations(), returnType,
+            CMethodName, mCClassName, isFieldStatic, aMethodTuple.mAnnotationInfo.narrowChars, aMethodTuple.mAnnotationInfo.catchException);
 
         // Add the header signature to the header file.
         writeSignatureToHeader(headerSignature);
@@ -111,19 +123,25 @@
         writeMethodBody(implementationSignature, theMethod, mClassToWrap,
                         aMethodTuple.mAnnotationInfo.isMultithreaded,
                         aMethodTuple.mAnnotationInfo.noThrow,
-                        aMethodTuple.mAnnotationInfo.narrowChars);
+                        aMethodTuple.mAnnotationInfo.narrowChars,
+                        aMethodTuple.mAnnotationInfo.catchException);
     }
 
-    private void generateGetterOrSetterBody(Class<?> aFieldType, String aFieldName, boolean aIsFieldStatic, boolean isSetter, boolean aNarrowChars) {
+    private void generateGetterOrSetterBody(Field aField, String aFieldName, boolean aIsFieldStatic, boolean isSetter, boolean aNarrowChars) {
         StringBuilder argumentContent = null;
+        Class<?> fieldType = aField.getType();
 
         if (isSetter) {
-            Class<?>[] setterArguments = new Class<?>[]{aFieldType};
+            Class<?>[] setterArguments = new Class<?>[]{fieldType};
             // Marshall the argument..
             argumentContent = getArgumentMarshalling(setterArguments);
         }
 
-        boolean isObjectReturningMethod = Utils.isObjectType(aFieldType);
+        if (mLazyInit) {
+            writeMemberInit(aField, wrapperMethodBodies);
+        }
+
+        boolean isObjectReturningMethod = Utils.isObjectType(fieldType);
         wrapperMethodBodies.append("    ");
         if (isSetter) {
             wrapperMethodBodies.append("env->Set");
@@ -131,7 +149,7 @@
             wrapperMethodBodies.append("return ");
 
             if (isObjectReturningMethod) {
-                wrapperMethodBodies.append("static_cast<").append(Utils.getCReturnType(aFieldType, aNarrowChars)).append(">(");
+                wrapperMethodBodies.append("static_cast<").append(Utils.getCReturnType(fieldType, aNarrowChars)).append(">(");
             }
 
             wrapperMethodBodies.append("env->Get");
@@ -140,7 +158,7 @@
         if (aIsFieldStatic) {
             wrapperMethodBodies.append("Static");
         }
-        wrapperMethodBodies.append(Utils.getFieldType(aFieldType))
+        wrapperMethodBodies.append(Utils.getFieldType(fieldType))
                            .append("Field(");
 
         // Static will require the class and the field id. Nonstatic, the object and the field id.
@@ -181,14 +199,14 @@
         boolean isFieldFinal = Utils.isMemberFinal(theField);
 
         String getterName = "get" + CFieldName;
-        String getterSignature = Utils.getCImplementationMethodSignature(EMPTY_CLASS_ARRAY, fieldType, getterName, mCClassName, aFieldTuple.mAnnotationInfo.narrowChars);
-        String getterHeaderSignature = Utils.getCHeaderMethodSignature(EMPTY_CLASS_ARRAY, GETTER_ARGUMENT_ANNOTATIONS, fieldType, getterName, mCClassName, isFieldStatic, aFieldTuple.mAnnotationInfo.narrowChars);
+        String getterSignature = Utils.getCImplementationMethodSignature(EMPTY_CLASS_ARRAY, fieldType, getterName, mCClassName, aFieldTuple.mAnnotationInfo.narrowChars, false);
+        String getterHeaderSignature = Utils.getCHeaderMethodSignature(EMPTY_CLASS_ARRAY, GETTER_ARGUMENT_ANNOTATIONS, fieldType, getterName, mCClassName, isFieldStatic, aFieldTuple.mAnnotationInfo.narrowChars, false);
 
         writeSignatureToHeader(getterHeaderSignature);
 
         writeFunctionStartupBoilerPlate(getterSignature, true);
 
-        generateGetterOrSetterBody(fieldType, CFieldName, isFieldStatic, false, aFieldTuple.mAnnotationInfo.narrowChars);
+        generateGetterOrSetterBody(theField, CFieldName, isFieldStatic, false, aFieldTuple.mAnnotationInfo.narrowChars);
 
         // If field not final, also generate a setter function.
         if (!isFieldFinal) {
@@ -196,14 +214,14 @@
 
             Class<?>[] setterArguments = new Class<?>[]{fieldType};
 
-            String setterSignature = Utils.getCImplementationMethodSignature(setterArguments, Void.class, setterName, mCClassName, aFieldTuple.mAnnotationInfo.narrowChars);
-            String setterHeaderSignature = Utils.getCHeaderMethodSignature(setterArguments, SETTER_ARGUMENT_ANNOTATIONS, Void.class, setterName, mCClassName, isFieldStatic, aFieldTuple.mAnnotationInfo.narrowChars);
+            String setterSignature = Utils.getCImplementationMethodSignature(setterArguments, Void.class, setterName, mCClassName, aFieldTuple.mAnnotationInfo.narrowChars, false);
+            String setterHeaderSignature = Utils.getCHeaderMethodSignature(setterArguments, SETTER_ARGUMENT_ANNOTATIONS, Void.class, setterName, mCClassName, isFieldStatic, aFieldTuple.mAnnotationInfo.narrowChars, false);
 
             writeSignatureToHeader(setterHeaderSignature);
 
             writeFunctionStartupBoilerPlate(setterSignature, true);
 
-            generateGetterOrSetterBody(fieldType, CFieldName, isFieldStatic, true, aFieldTuple.mAnnotationInfo.narrowChars);
+            generateGetterOrSetterBody(theField, CFieldName, isFieldStatic, true, aFieldTuple.mAnnotationInfo.narrowChars);
         }
     }
 
@@ -214,8 +232,10 @@
 
         generateMemberCommon(theCtor, mCClassName, mClassToWrap);
 
-        String implementationSignature = Utils.getCImplementationMethodSignature(theCtor.getParameterTypes(), Void.class, CMethodName, mCClassName, aCtorTuple.mAnnotationInfo.narrowChars);
-        String headerSignature = Utils.getCHeaderMethodSignature(theCtor.getParameterTypes(), theCtor.getParameterAnnotations(), Void.class, CMethodName, mCClassName, false, aCtorTuple.mAnnotationInfo.narrowChars);
+        String implementationSignature = Utils.getCImplementationMethodSignature(theCtor.getParameterTypes(), Void.class, CMethodName,
+            mCClassName, aCtorTuple.mAnnotationInfo.narrowChars, aCtorTuple.mAnnotationInfo.catchException);
+        String headerSignature = Utils.getCHeaderMethodSignature(theCtor.getParameterTypes(), theCtor.getParameterAnnotations(), Void.class, CMethodName,
+            mCClassName, false, aCtorTuple.mAnnotationInfo.narrowChars, aCtorTuple.mAnnotationInfo.catchException);
 
         // Slice off the "void " from the start of the constructor declaration.
         headerSignature = headerSignature.substring(5);
@@ -227,13 +247,37 @@
         // Use the implementation signature to generate the method body...
         writeCtorBody(implementationSignature, theCtor,
             aCtorTuple.mAnnotationInfo.isMultithreaded,
-            aCtorTuple.mAnnotationInfo.noThrow);
+            aCtorTuple.mAnnotationInfo.noThrow,
+            aCtorTuple.mAnnotationInfo.catchException);
 
         if (theCtor.getParameterTypes().length == 0) {
             mHasEncounteredDefaultConstructor = true;
         }
     }
 
+    public void generateMembers(Member[] members) {
+        for (Member m : members) {
+            if (!Modifier.isPublic(m.getModifiers())) {
+                continue;
+            }
+
+            String name = m.getName();
+            name = name.substring(0, 1).toUpperCase() + name.substring(1);
+
+            AnnotationInfo info = new AnnotationInfo(name, true, true, true, true);
+            AnnotatableEntity entity = new AnnotatableEntity(m, info);
+            if (m instanceof Constructor) {
+                generateConstructor(entity);
+            } else if (m instanceof Method) {
+                generateMethod(entity);
+            } else if (m instanceof Field) {
+                generateField(entity);
+            } else {
+                throw new IllegalArgumentException("expected member to be Constructor, Method, or Field");
+            }
+        }
+    }
+
     /**
      * Writes the appropriate header and startup code to ensure the existence of a reference to the
      * class specified. If this is already done, does nothing.
@@ -258,8 +302,7 @@
                        .append(";\n");
 
         // Add startup code to populate it..
-        wrapperStartupCode.append('\n')
-                          .append(Utils.getStartupLineForClass(aClass));
+        wrapperStartupCode.append(Utils.getStartupLineForClass(aClass));
 
         seenClasses.add(className);
     }
@@ -371,14 +414,30 @@
         return argumentContent;
     }
 
+    private void writeCatchException() {
+        wrapperMethodBodies.append(
+            "    if (env->ExceptionCheck()) {\n" +
+            "        env->ExceptionClear();\n" +
+            "        if (aResult) {\n" +
+            "            *aResult = NS_ERROR_FAILURE;\n" +
+            "        }\n" +
+            "    } else if (aResult) {\n" +
+            "        *aResult = NS_OK;\n" +
+            "    }\n\n");
+    }
+
     private void writeCtorBody(String implementationSignature, Constructor<?> theCtor,
-            boolean aIsThreaded, boolean aNoThrow) {
+            boolean aIsThreaded, boolean aNoThrow, boolean aCatchException) {
         Class<?>[] argumentTypes = theCtor.getParameterTypes();
 
         writeFunctionStartupBoilerPlate(implementationSignature, aIsThreaded);
 
         writeFramePushBoilerplate(theCtor, false, aNoThrow);
 
+        if (mLazyInit) {
+            writeMemberInit(theCtor, wrapperMethodBodies);
+        }
+
         // Marshall arguments for this constructor, if any...
         boolean hasArguments = argumentTypes.length != 0;
 
@@ -402,9 +461,14 @@
         wrapperMethodBodies.append(mMembersToIds.get(theCtor))
         // Tack on the arguments, if any..
                            .append(argumentContent)
-                           .append("), env);\n" +
-                                   "    env->PopLocalFrame(nullptr);\n" +
-                                   "}\n");
+                           .append("), env);\n");
+
+        // Check for exception and set aResult
+        if (aCatchException) {
+            writeCatchException();
+        }
+
+        wrapperMethodBodies.append("    env->PopLocalFrame(nullptr);\n}\n");
     }
 
     /**
@@ -417,7 +481,8 @@
      */
     private void writeMethodBody(String methodSignature, Method aMethod,
                                  Class<?> aClass, boolean aIsMultithreaded,
-                                 boolean aNoThrow, boolean aNarrowChars) {
+                                 boolean aNoThrow, boolean aNarrowChars,
+                                 boolean aCatchException) {
         Class<?>[] argumentTypes = aMethod.getParameterTypes();
         Class<?> returnType = aMethod.getReturnType();
 
@@ -427,6 +492,10 @@
 
         writeFramePushBoilerplate(aMethod, isObjectReturningMethod, aNoThrow);
 
+        if (mLazyInit) {
+            writeMemberInit(aMethod, wrapperMethodBodies);
+        }
+
         // Marshall arguments, if we have any.
         boolean hasArguments = argumentTypes.length != 0;
 
@@ -481,6 +550,11 @@
             wrapperMethodBodies.append("    AndroidBridge::HandleUncaughtException(env);\n");
         }
 
+        // Check for exception and set aResult
+        if (aCatchException) {
+            writeCatchException();
+        }
+
         // If we're returning an object, pop the callee's stack frame extracting our ref as the return
         // value.
         if (isObjectReturningMethod) {
@@ -501,33 +575,41 @@
     }
 
     /**
-     * Generates the code to get the id of the given member on startup.
+     * Generates the code to get the id of the given member on startup or in the member body if lazy init
+     * is requested.
      *
      * @param aMember         The Java member being wrapped.
      */
-    private void writeStartupCode(Member aMember) {
-        wrapperStartupCode.append("    ")
-                          .append(mMembersToIds.get(aMember))
-                          .append(" = get");
+    private void writeMemberInit(Member aMember, StringBuilder aOutput) {
+        if (mLazyInit) {
+            aOutput.append("    if (!" + mMembersToIds.get(aMember) + ") {\n    ");
+        }
+
+        aOutput.append("    " + mMembersToIds.get(aMember)).append(" = AndroidBridge::Get");
         if (Utils.isMemberStatic(aMember)) {
-            wrapperStartupCode.append("Static");
+            aOutput.append("Static");
         }
 
         boolean isField = aMember instanceof Field;
         if (isField) {
-            wrapperStartupCode.append("Field(\"");
+            aOutput.append("FieldID(env, " + Utils.getClassReferenceName(aMember.getDeclaringClass()) + ", \"");
         } else {
-            wrapperStartupCode.append("Method(\"");
+            aOutput.append("MethodID(env, " + Utils.getClassReferenceName(aMember.getDeclaringClass()) + ", \"");
         }
+
         if (aMember instanceof Constructor) {
-            wrapperStartupCode.append("<init>");
+            aOutput.append("<init>");
         } else {
-            wrapperStartupCode.append(aMember.getName());
+            aOutput.append(aMember.getName());
         }
 
-        wrapperStartupCode.append("\", \"")
+        aOutput.append("\", \"")
                           .append(Utils.getTypeSignatureStringForMember(aMember))
                           .append("\");\n");
+
+        if (mLazyInit) {
+            aOutput.append("    }\n\n");
+        }
     }
 
     private void writeZeroingFor(Member aMember, final String aMemberName) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/Makefile.in	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/Makefile.in	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
 
 include $(topsrcdir)/config/rules.mk
 
-JAVA_CLASSPATH := $(ANDROID_SDK)/android.jar
+JAVA_CLASSPATH := $(ANDROID_SDK)/android.jar:$(ANDROID_TOOLS)/lib/lint.jar:$(ANDROID_TOOLS)/lib/lint-checks.jar
 
 # Include Android specific java flags, instead of what's in rules.mk.
 include $(topsrcdir)/config/android-common.mk
 
-libs:: annotationProcessors.jar
+export:: annotationProcessors.jar
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/moz.build	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/moz.build	2014-11-26 21:45:53.000000000 +0000
@@ -13,6 +13,7 @@
     'classloader/IterableJarLoadingURLClassLoader.java',
     'classloader/JarClassIterator.java',
     'CodeGenerator.java',
+    'SDKProcessor.java',
     'utils/AlphabeticAnnotatableEntityComparator.java',
     'utils/GeneratableElementIterator.java',
     'utils/Utils.java',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/SDKProcessor.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/SDKProcessor.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/SDKProcessor.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/SDKProcessor.java	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,251 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.annotationProcessors;
+
+import com.android.tools.lint.checks.ApiLookup;
+import com.android.tools.lint.LintCliClient;
+
+import org.mozilla.gecko.annotationProcessors.classloader.AnnotatableEntity;
+import org.mozilla.gecko.annotationProcessors.classloader.ClassWithOptions;
+import org.mozilla.gecko.annotationProcessors.classloader.IterableJarLoadingURLClassLoader;
+import org.mozilla.gecko.annotationProcessors.utils.GeneratableElementIterator;
+import org.mozilla.gecko.annotationProcessors.utils.Utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Scanner;
+import java.util.Vector;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+public class SDKProcessor {
+    public static final String GENERATED_COMMENT =
+            "// GENERATED CODE\n" +
+            "// Generated by the Java program at /build/annotationProcessors at compile time from\n" +
+            "// annotations on Java methods. To update, change the annotations on the corresponding Java\n" +
+            "// methods and rerun the build. Manually updating this file will cause your build to fail.\n\n";
+
+    private static ApiLookup sApiLookup;
+    private static int sMaxSdkVersion;
+
+    public static void main(String[] args) {
+        // We expect a list of jars on the commandline. If missing, whinge about it.
+        if (args.length < 5) {
+            System.err.println("Usage: java SDKProcessor sdkjar classlistfile outdir fileprefix max-sdk-version");
+            System.exit(1);
+        }
+
+        System.out.println("Processing platform bindings...");
+
+        String sdkJar = args[0];
+        Vector classes = getClassList(args[1]);
+        String outdir = args[2];
+        String generatedFilePrefix = args[3];
+        sMaxSdkVersion = Integer.parseInt(args[4]);
+
+        LintCliClient lintClient = new LintCliClient();
+        sApiLookup = ApiLookup.get(lintClient);
+
+        // Start the clock!
+        long s = System.currentTimeMillis();
+
+        // Get an iterator over the classes in the jar files given...
+        // Iterator<ClassWithOptions> jarClassIterator = IterableJarLoadingURLClassLoader.getIteratorOverJars(args);
+
+        StringBuilder headerFile = new StringBuilder(GENERATED_COMMENT);
+        headerFile.append("#ifndef " + generatedFilePrefix + "_h__\n" +
+                          "#define " + generatedFilePrefix + "_h__\n" +
+                          "#include \"nsXPCOMStrings.h\"\n" +
+                          "#include \"AndroidJavaWrappers.h\"\n" +
+                          "\n" +
+                          "namespace mozilla {\n" +
+                          "namespace widget {\n" +
+                          "namespace android {\n" +
+                          "namespace sdk {\n" +
+                          "void Init" + generatedFilePrefix + "Stubs(JNIEnv *jEnv);\n\n");
+
+        StringBuilder implementationFile = new StringBuilder(GENERATED_COMMENT);
+        implementationFile.append("#include \"" + generatedFilePrefix + ".h\"\n" +
+                                  "#include \"AndroidBridgeUtilities.h\"\n" +
+                                  "#include \"nsXPCOMStrings.h\"\n" +
+                                  "#include \"AndroidBridge.h\"\n" +
+                                  "\n" +
+                                  "namespace mozilla {\n" +
+                                  "namespace widget {\n" +
+                                  "namespace android {\n" +
+                                  "namespace sdk {\n");
+
+        // Used to track the calls to the various class-specific initialisation functions.
+        StringBuilder stubInitializer = new StringBuilder();
+        stubInitializer.append("void Init" + generatedFilePrefix + "Stubs(JNIEnv *jEnv) {\n");
+
+        ClassLoader loader = null;
+        try {
+            loader = URLClassLoader.newInstance(new URL[] { new URL("file://" + sdkJar) },
+                                                SDKProcessor.class.getClassLoader());
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+
+        for (Iterator<String> i = classes.iterator(); i.hasNext(); ) {
+            String className = i.next();
+            System.out.println("Looking up: " + className);
+
+            try {
+                Class<?> c = Class.forName(className, true, loader);
+
+                generateClass(Class.forName(className, true, loader),
+                              stubInitializer,
+                              implementationFile,
+                              headerFile);
+            } catch (Exception e) {
+                System.out.println("Failed to generate class " + className + ": " + e);
+            }
+        }
+
+        implementationFile.append('\n');
+        stubInitializer.append("}");
+        implementationFile.append(stubInitializer);
+
+        implementationFile.append("\n} /* sdk */\n" +
+                                    "} /* android */\n" +
+                                    "} /* widget */\n" +
+                                    "} /* mozilla */\n");
+
+        headerFile.append("\n} /* sdk */\n" +
+                            "} /* android */\n" +
+                            "} /* widget */\n" +
+                            "} /* mozilla */\n" +
+                            "#endif\n");
+
+        writeOutputFiles(outdir, generatedFilePrefix, headerFile, implementationFile);
+        long e = System.currentTimeMillis();
+        System.out.println("SDK processing complete in " + (e - s) + "ms");
+    }
+
+    private static Member[] sortAndFilterMembers(Member[] members) {
+        Arrays.sort(members, new Comparator<Member>() {
+            @Override
+            public int compare(Member a, Member b) {
+                return a.getName().compareTo(b.getName());
+            }
+        });
+
+        ArrayList<Member> list = new ArrayList<>();
+        for (Member m : members) {
+            int version = 0;
+
+            if (m instanceof Method || m instanceof Constructor) {
+                version = sApiLookup.getCallVersion(Utils.getTypeSignatureStringForClass(m.getDeclaringClass()),
+                                                    m.getName(),
+                                                    Utils.getTypeSignatureStringForMember(m));
+            } else if (m instanceof Field) {
+                version = sApiLookup.getFieldVersion(Utils.getTypeSignatureStringForClass(m.getDeclaringClass()),
+                                                     m.getName());
+            } else {
+                throw new IllegalArgumentException("expected member to be Method, Constructor, or Field");
+            }
+
+            if (version > sMaxSdkVersion) {
+                System.out.println("Skipping " + m.getDeclaringClass().getName() + "." + m.getName() +
+                    ", version " + version + " > " + sMaxSdkVersion);
+                continue;
+            }
+
+            list.add(m);
+        }
+
+        return list.toArray(new Member[list.size()]);
+    }
+
+    private static void generateClass(Class<?> clazz,
+                                      StringBuilder stubInitializer,
+                                      StringBuilder implementationFile,
+                                      StringBuilder headerFile) {
+        String generatedName = clazz.getSimpleName();
+
+        CodeGenerator generator = new CodeGenerator(clazz, generatedName, true);
+        stubInitializer.append("    ").append(generatedName).append("::InitStubs(jEnv);\n");
+
+        generator.generateMembers(sortAndFilterMembers(clazz.getDeclaredConstructors()));
+        generator.generateMembers(sortAndFilterMembers(clazz.getDeclaredMethods()));
+        generator.generateMembers(sortAndFilterMembers(clazz.getDeclaredFields()));
+
+        headerFile.append(generator.getHeaderFileContents());
+        implementationFile.append(generator.getWrapperFileContents());
+    }
+
+    private static Vector<String> getClassList(String path) {
+        Scanner scanner = null;
+        try {
+            scanner = new Scanner(new FileInputStream(path));
+
+            Vector lines = new Vector();
+            while (scanner.hasNextLine()) {
+                lines.add(scanner.nextLine());
+            }
+            return lines;
+        } catch (Exception e) {
+            System.out.println(e.toString());
+            return null;
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+    }
+
+    private static void writeOutputFiles(String aOutputDir, String aPrefix, StringBuilder aHeaderFile,
+                                         StringBuilder aImplementationFile) {
+        FileOutputStream implStream = null;
+        try {
+            implStream = new FileOutputStream(new File(aOutputDir, aPrefix + ".cpp"));
+            implStream.write(aImplementationFile.toString().getBytes());
+        } catch (IOException e) {
+            System.err.println("Unable to write " + aOutputDir + ". Perhaps a permissions issue?");
+            e.printStackTrace(System.err);
+        } finally {
+            if (implStream != null) {
+                try {
+                    implStream.close();
+                } catch (IOException e) {
+                    System.err.println("Unable to close implStream due to "+e);
+                    e.printStackTrace(System.err);
+                }
+            }
+        }
+
+        FileOutputStream headerStream = null;
+        try {
+            headerStream = new FileOutputStream(new File(aOutputDir, aPrefix + ".h"));
+            headerStream.write(aHeaderFile.toString().getBytes());
+        } catch (IOException e) {
+            System.err.println("Unable to write " + aOutputDir + ". Perhaps a permissions issue?");
+            e.printStackTrace(System.err);
+        } finally {
+            if (headerStream != null) {
+                try {
+                    headerStream.close();
+                } catch (IOException e) {
+                    System.err.println("Unable to close headerStream due to "+e);
+                    e.printStackTrace(System.err);
+                }
+            }
+        }
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/utils/GeneratableElementIterator.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/utils/GeneratableElementIterator.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/utils/GeneratableElementIterator.java	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/utils/GeneratableElementIterator.java	2014-11-26 21:45:53.000000000 +0000
@@ -76,6 +76,7 @@
                     boolean isMultithreadedStub = false;
                     boolean noThrow = false;
                     boolean narrowChars = false;
+                    boolean catchException = false;
                     try {
                         // Determine the explicitly-given name of the stub to generate, if any.
                         final Method stubNameMethod = annotationType.getDeclaredMethod("stubName");
@@ -97,6 +98,11 @@
                         narrowCharsMethod.setAccessible(true);
                         narrowChars = (Boolean) narrowCharsMethod.invoke(annotation);
 
+                        // Determine if we should catch exceptions
+                        final Method catchExceptionMethod = annotationType.getDeclaredMethod("catchException");
+                        catchExceptionMethod.setAccessible(true);
+                        catchException = (Boolean) catchExceptionMethod.invoke(annotation);
+
                     } catch (NoSuchMethodException e) {
                         System.err.println("Unable to find expected field on WrapElementForJNI annotation. Did the signature change?");
                         e.printStackTrace(System.err);
@@ -118,7 +124,7 @@
                     }
 
                     AnnotationInfo annotationInfo = new AnnotationInfo(
-                        stubName, isMultithreadedStub, noThrow, narrowChars);
+                        stubName, isMultithreadedStub, noThrow, narrowChars, catchException);
                     mNextReturnValue = new AnnotatableEntity(candidateElement, annotationInfo);
                     return;
                 }
@@ -128,7 +134,7 @@
             // thanks to the "Generate everything" annotation.
             if (mIterateEveryEntry) {
                 AnnotationInfo annotationInfo = new AnnotationInfo(
-                    candidateElement.getName(), false, false, false);
+                    candidateElement.getName(), false, false, false, false);
                 mNextReturnValue = new AnnotatableEntity(candidateElement, annotationInfo);
                 return;
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/utils/Utils.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/utils/Utils.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/annotationProcessors/utils/Utils.java	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/annotationProcessors/utils/Utils.java	2014-11-26 21:45:53.000000000 +0000
@@ -318,6 +318,10 @@
         }
     }
 
+    public static String getTypeSignatureStringForClass(Class<?> clazz) {
+        return clazz.getCanonicalName().replace('.', '/');
+    }
+
     public static String getTypeSignatureString(Constructor<?> aConstructor) {
         Class<?>[] arguments = aConstructor.getParameterTypes();
         StringBuilder sb = new StringBuilder();
@@ -341,7 +345,7 @@
      * @param c  The type of the element to write the subsignature of.
      */
     private static void writeTypeSignature(StringBuilder sb, Class<?> c) {
-        String name = c.getCanonicalName().replaceAll("\\.", "/");
+        String name = Utils.getTypeSignatureStringForClass(c);
 
         // Determine if this is an array type and, if so, peel away the array operators..
         int len = name.length();
@@ -384,7 +388,8 @@
      * @param aCClassName Name of the C++ class into which the method is declared.
      * @return The C++ method implementation signature for the method described.
      */
-    public static String getCImplementationMethodSignature(Class<?>[] aArgumentTypes, Class<?> aReturnType, String aCMethodName, String aCClassName, boolean aNarrowChars) {
+    public static String getCImplementationMethodSignature(Class<?>[] aArgumentTypes, Class<?> aReturnType,
+        String aCMethodName, String aCClassName, boolean aNarrowChars, boolean aCatchException) {
         StringBuilder retBuffer = new StringBuilder();
 
         retBuffer.append(getCReturnType(aReturnType, aNarrowChars));
@@ -406,6 +411,14 @@
                 retBuffer.append(", ");
             }
         }
+
+        if (aCatchException) {
+            if (aArgumentTypes.length > 0) {
+                retBuffer.append(", ");
+            }
+            retBuffer.append("nsresult* aResult");
+        }
+
         retBuffer.append(')');
         return retBuffer.toString();
     }
@@ -423,7 +436,8 @@
      * @param aIsStaticStub true if the generated C++ method should be static, false otherwise.
      * @return The generated C++ header method signature for the method described.
      */
-    public static String getCHeaderMethodSignature(Class<?>[] aArgumentTypes, Annotation[][] aArgumentAnnotations, Class<?> aReturnType, String aCMethodName, String aCClassName, boolean aIsStaticStub, boolean aNarrowChars) {
+    public static String getCHeaderMethodSignature(Class<?>[] aArgumentTypes, Annotation[][] aArgumentAnnotations, Class<?> aReturnType,
+        String aCMethodName, String aCClassName, boolean aIsStaticStub, boolean aNarrowChars, boolean aCatchException) {
         StringBuilder retBuffer = new StringBuilder();
 
         // Add the static keyword, if applicable.
@@ -453,6 +467,14 @@
                 retBuffer.append(", ");
             }
         }
+
+        if (aCatchException) {
+            if (aArgumentTypes.length > 0) {
+                retBuffer.append(", ");
+            }
+            retBuffer.append("nsresult* aResult = nullptr");
+        }
+
         retBuffer.append(')');
         return retBuffer.toString();
     }
@@ -587,9 +609,9 @@
         StringBuilder sb = new StringBuilder();
         sb.append("    ");
         sb.append(getClassReferenceName(aClass));
-        sb.append(" = getClassGlobalRef(\"");
+        sb.append(" = AndroidBridge::GetClassGlobalRef(env, \"");
 
-        String name = aClass.getCanonicalName().replaceAll("\\.", "/");
+        String name = Utils.getTypeSignatureStringForClass(aClass);
         Class<?> containerClass = aClass.getDeclaringClass();
         if (containerClass != null) {
             // Is an inner class. Add the $ symbol.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/autoconf/android.m4 thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/autoconf/android.m4
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/autoconf/android.m4	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/autoconf/android.m4	2014-11-26 21:45:53.000000000 +0000
@@ -376,6 +376,9 @@
     ANDROID_BUILD_TOOLS="${android_build_tools}"
     AC_SUBST(ANDROID_SDK_ROOT)
     AC_SUBST(ANDROID_SDK)
+    AC_SUBST(ANDROID_TOOLS)
+    AC_SUBST(ANDROID_PLATFORM_TOOLS)
+    AC_SUBST(ANDROID_BUILD_TOOLS)
 
     ANDROID_COMPAT_LIB=$ANDROID_COMPAT_DIR_BASE/v4/android-support-v4.jar
     AC_MSG_CHECKING([for v4 compat library])
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/automation.py.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/automation.py.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/automation.py.in	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/automation.py.in	2014-11-26 21:45:53.000000000 +0000
@@ -181,7 +181,6 @@
            "log",
            "runApp",
            "Process",
-           "addCommonOptions",
            "initializeProfile",
            "DIST_BIN",
            "DEFAULT_APP",
@@ -385,15 +384,6 @@
                       proxy=proxy)
     return profile
 
-  def addCommonOptions(self, parser):
-    "Adds command-line options which are common to mochitest and reftest."
-
-    parser.add_option("--setpref",
-                      action = "append", type = "string",
-                      default = [],
-                      dest = "extraPrefs", metavar = "PREF=VALUE",
-                      help = "defines an extra user preference")
-
   def fillCertificateDB(self, profileDir, certPath, utilityPath, xrePath):
     pwfilePath = os.path.join(profileDir, ".crtdbpw")
     pwfile = open(pwfilePath, "w")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/automationutils.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/automationutils.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/automationutils.py	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/automationutils.py	2014-11-26 21:45:53.000000000 +0000
@@ -18,7 +18,6 @@
 
 __all__ = [
   "ZipFileReader",
-  "addCommonOptions",
   "dumpLeakLog",
   "processLeakLog",
   'systemMemory',
@@ -140,30 +139,6 @@
     # This is probably a can't-happen condition on Unix, but let's be defensive
     print "TEST-INFO | %s: undecodable exit status %04x\n" % (name, status)
 
-def addCommonOptions(parser, defaults={}):
-  parser.add_option("--xre-path",
-                    action = "store", type = "string", dest = "xrePath",
-                    # individual scripts will set a sane default
-                    default = None,
-                    help = "absolute path to directory containing XRE (probably xulrunner)")
-  if 'SYMBOLS_PATH' not in defaults:
-    defaults['SYMBOLS_PATH'] = None
-  parser.add_option("--symbols-path",
-                    action = "store", type = "string", dest = "symbolsPath",
-                    default = defaults['SYMBOLS_PATH'],
-                    help = "absolute path to directory containing breakpad symbols, or the URL of a zip file containing symbols")
-  parser.add_option("--debugger",
-                    action = "store", dest = "debugger",
-                    help = "use the given debugger to launch the application")
-  parser.add_option("--debugger-args",
-                    action = "store", dest = "debuggerArgs",
-                    help = "pass the given args to the debugger _before_ "
-                           "the application on the command line")
-  parser.add_option("--debugger-interactive",
-                    action = "store_true", dest = "debuggerInteractive",
-                    help = "prevents the test harness from redirecting "
-                        "stdout and stderr for interactive debuggers")
-
 def dumpLeakLog(leakLogFile, filter = False):
   """Process the leak log, without parsing it.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/gecko_templates.mozbuild thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/gecko_templates.mozbuild
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/gecko_templates.mozbuild	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/gecko_templates.mozbuild	2014-11-26 21:45:53.000000000 +0000
@@ -90,7 +90,9 @@
     '''
     Program(name)
 
-    GeckoBinary(linkage=linkage, mozglue='program', **kwargs)
+    kwargs.setdefault('mozglue', 'program')
+
+    GeckoBinary(linkage=linkage, **kwargs)
 
 
 @template
@@ -103,7 +105,9 @@
     '''
     SimplePrograms(names)
 
-    GeckoBinary(mozglue='program', **kwargs)
+    kwargs.setdefault('mozglue', 'program')
+
+    GeckoBinary(**kwargs)
 
 
 @template
@@ -116,7 +120,9 @@
     '''
     CppUnitTests(names)
 
-    GeckoBinary(mozglue='program', **kwargs)
+    kwargs.setdefault('mozglue', 'program')
+
+    GeckoBinary(**kwargs)
 
 
 @template
@@ -128,7 +134,9 @@
     '''
     SharedLibrary(name)
 
-    GeckoBinary(mozglue='library', **kwargs)
+    kwargs.setdefault('mozglue', 'library')
+
+    GeckoBinary(**kwargs)
 
 
 @template
@@ -140,7 +148,9 @@
     '''
     Framework(name)
 
-    GeckoBinary(mozglue='library', **kwargs)
+    kwargs.setdefault('mozglue', 'library')
+
+    GeckoBinary(**kwargs)
 
 
 @template
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/mach_bootstrap.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/mach_bootstrap.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/mach_bootstrap.py	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/mach_bootstrap.py	2014-11-26 21:45:53.000000000 +0000
@@ -88,6 +88,7 @@
     'tools/docs/mach_commands.py',
     'tools/mercurial/mach_commands.py',
     'tools/mach_commands.py',
+    'mobile/android/mach_commands.py',
 ]
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/Makefile.in	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/Makefile.in	2014-11-26 21:45:53.000000000 +0000
@@ -73,6 +73,14 @@
 INSTALL_TARGETS += CLANG_RT_ASAN
 endif
 
+ifdef MOZTTDIR
+# Install the Firefox OS fonts.
+include $(MOZTTDIR)/fonts.mk
+MOZTT_DEST = $(FINAL_TARGET)/fonts
+MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
+INSTALL_TARGETS += MOZTT
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 TARGET_DEPTH = ..
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/mobile/robocop/FennecNativeActions.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/mobile/robocop/FennecNativeActions.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/mobile/robocop/FennecNativeActions.java	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/mobile/robocop/FennecNativeActions.java	2014-11-26 21:45:53.000000000 +0000
@@ -41,7 +41,7 @@
     }
 
     class GeckoEventExpecter implements RepeatedEventExpecter {
-        private static final int MAX_WAIT_MS = 90000;
+        private static final int MAX_WAIT_MS = 180000;
 
         private volatile boolean mIsRegistered;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/mobile/robocop/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/mobile/robocop/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/mobile/robocop/Makefile.in	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/mobile/robocop/Makefile.in	2014-11-26 21:45:53.000000000 +0000
@@ -65,6 +65,7 @@
   $(wildcard $(TESTPATH)/*.mp4) \
   $(wildcard $(TESTPATH)/*.webm) \
   $(wildcard $(TESTPATH)/*.swf) \
+  $(wildcard $(TESTPATH)/reader_mode_pages) \
   $(NULL)
 
 ROBOCOP_DEST = $(DEPTH)/_tests/testing/mochitest/tests/robocop/
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/index.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/index.html	2014-11-26 21:45:53.000000000 +0000
@@ -9,36 +9,36 @@
   "blueprint/forms.html",
   "blueprint/grid.html",
   "blueprint/elements.html",
-  "js-input/3d-cube.html",
-  "js-input/3d-morph.html",
-  "js-input/3d-raytrace.html",
   "js-input/3d-thingy.html",
-  "js-input/access-binary-trees.html",
-  "js-input/access-fannkuch.html",
-  "js-input/access-nbody.html",
-  "js-input/access-nsieve.html",
-  "js-input/bitops-3bit-bits-in-byte.html",
-  "js-input/bitops-bits-in-byte.html",
-  "js-input/bitops-bitwise-and.html",
-  "js-input/bitops-nsieve-bits.html",
-  "js-input/controlflow-recursive.html",
-  "js-input/crypto-aes.html",
-  "js-input/crypto-md5.html",
-  "js-input/crypto-sha1.html",
   "js-input/crypto-otp.html",
-  "js-input/date-format-tofte.html",
-  "js-input/date-format-xparb.html",
-  "js-input/math-cordic.html",
-  "js-input/math-partial-sums.html",
-  "js-input/math-spectral-norm.html",
-  "js-input/regexp-dna.html",
-  "js-input/string-base64.html",
-  "js-input/string-fasta.html",
-  "js-input/string-tagcloud.html",
-  "js-input/string-unpack-code.html",
-  "js-input/string-validate-input.html"
+  "js-input/sunspider/3d-cube.html",
+  "js-input/sunspider/3d-morph.html",
+  "js-input/sunspider/3d-raytrace.html",
+  "js-input/sunspider/access-binary-trees.html",
+  "js-input/sunspider/access-fannkuch.html",
+  "js-input/sunspider/access-nbody.html",
+  "js-input/sunspider/access-nsieve.html",
+  "js-input/sunspider/bitops-3bit-bits-in-byte.html",
+  "js-input/sunspider/bitops-bits-in-byte.html",
+  "js-input/sunspider/bitops-bitwise-and.html",
+  "js-input/sunspider/bitops-nsieve-bits.html",
+  "js-input/sunspider/controlflow-recursive.html",
+  "js-input/sunspider/crypto-aes.html",
+  "js-input/sunspider/crypto-md5.html",
+  "js-input/sunspider/crypto-sha1.html",
+  "js-input/sunspider/date-format-tofte.html",
+  "js-input/sunspider/date-format-xparb.html",
+  "js-input/sunspider/math-cordic.html",
+  "js-input/sunspider/math-partial-sums.html",
+  "js-input/sunspider/math-spectral-norm.html",
+  "js-input/sunspider/regexp-dna.html",
+  "js-input/sunspider/string-base64.html",
+  "js-input/sunspider/string-fasta.html",
+  "js-input/sunspider/string-tagcloud.html",
+  "js-input/sunspider/string-unpack-code.html",
+  "js-input/sunspider/string-validate-input.html"
      ];
- var interval = 3000; // 15000
+ var interval = 1000;
  var idx = 0;
  var w;
  
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/3d-cube.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/3d-cube.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/3d-cube.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/3d-cube.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,387 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider 3d-cube</title>
-
-</head>
-
-<body>
-<h3>3d-cube</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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;
-  for (; i < NumPix; i++) {
-    Num += NumAdd;
-    if (Num >= Den) {
-      Num -= Den;
-      x += IncX1;
-      y += IncY1;
-    }
-    x += IncX2;
-    y += IncY2;
-  }
-  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(); 
-  for (var i = 0; i < 3; i++) {
-    A[i] = V0[i] - V1[i];
-    B[i] = V2[i] - V1[i];
-  }
-  A = CalcCross(A, B);
-  var Length = Math.sqrt(A[0]*A[0] + A[1]*A[1] + A[2]*A[2]); 
-  for (var i = 0; i < 3; i++) A[i] = A[i] / Length;
-  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;
-  for (; i < 4; i++) {
-    j = 0;
-    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];
-  }
-  return M;
-}
-
-//multiplies matrix with vector
-function VMulti(M, V) {
-  var Vect = new Array();
-  var i = 0;
-  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];
-  return Vect;
-}
-
-function VMulti2(M, V) {
-  var Vect = new Array();
-  var i = 0;
-  for (;i < 3; i++) Vect[i] = M[i][0] * V[0] + M[i][1] * V[1] + M[i][2] * V[2];
-  return Vect;
-}
-
-// add to matrices
-function MAdd(M1, M2) {
-  var M = [[],[],[],[]];
-  var i = 0;
-  var j = 0;
-  for (; i < 4; i++) {
-    j = 0;
-    for (; j < 4; j++) M[i][j] = M1[i][j] + M2[i][j];
-  }
-  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;
-  for (; i > -1; i--) CurN[i] = VMulti2(MQube, Q.Normal[i]);
-  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);
-  while (TestingStr.length < 3) TestingStr = "0" + TestingStr;
-  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;
-  for (; i > -1; i--) {
-    Q[i].V = VMulti(MTrans, Q[i].V);
-  }
-  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();
-  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);
-  
-  // line drawn ?
-  Q.Line = [false,false,false,false,false,false,false,false,false,false,false,false];
-  
-  // create line pixels
-  Q.NumPx = 9 * 2 * CubeSize;
-  for (var i = 0; i < Q.NumPx; i++) CreateP(0,0,0);
-  
-  MTrans = Translate(MTrans, Origin.V[0], Origin.V[1], Origin.V[2]);
-  MQube = MMulti(MTrans, MQube);
-
-  var i = 0;
-  for (; i < 9; i++) {
-    Q[i].V = VMulti(MTrans, Q[i].V);
-  }
-  DrawQube();
-  Testing.Init = true;
-  Loop();
-}
-
-for ( var i = 20; i <= 160; i *= 2 ) {
-  Init(i);
-}
-
-Q = null;
-MTrans = null;
-MQube = null;
-I = null;
-Origin = null;
-Testing = null;
-LoopTime = null;
-DisplArea = null;
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/3d-morph.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/3d-morph.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/3d-morph.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/3d-morph.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider 3d-morph</title>
-
-</head>
-
-<body>
-<h3>3d-morph</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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))
-    
-    for (var i = 0; i < nz; ++i) {
-        for (var j = 0; j < nx; ++j) {
-            a[3*(i*nx+j)+1]    = sin((j-1) * PI2nx ) * -f30
-        }
-    }
-}
-
-    
-var a = Array()
-for (var i=0; i < nx*nz*3; ++i) 
-    a[i] = 0
-
-for (var i = 0; i < loops; ++i) {
-    morph(a, i/loops)
-}
-
-testOutput = 0;
-for (var i = 0; i < nx; i++)
-    testOutput += a[3*(i*nx+i)+1];
-a = null;
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/3d-raytrace.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/3d-raytrace.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/3d-raytrace.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/3d-raytrace.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,490 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider 3d-raytrace</title>
-</head>
-
-<body>
-<h3>3d-raytrace</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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];
-    for (h = 0; h < 3; h++) 
-        for (v = 0; v < 3; v++) 
-            temp[h + v * 4] = self[v + h * 4];
-    for (i = 0; i < 11; i++)
-        self[i] = temp[i];
-    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;
-    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;
-    }
-    
-    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]];
-    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));
-    }
-    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;
-    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;
-    }
-    
-    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) {
-    for (var y = starty; y < stopy; y++) {
-        var rays = camera.generateRayPair(y / height);
-        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;
-        }
-    }
-}
-
-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();
-    for (var y = 0; y < size; y++) {
-        pixels[y] = new Array();
-        for (var x = 0; x < size; x++) {
-            pixels[y][x] = 0;
-        }
-    }
-
-    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;
-    for (var y = 0; y < size; y++) {
-        s += "[";
-        for (var x = 0; x < size; x++) {
-            s += "[" + pixels[y][x] + "],";
-        }
-        s+= "],";
-    }
-    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());
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-binary-trees.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-binary-trees.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-binary-trees.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-binary-trees.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider access-binary-trees</title>
-
-</head>
-
-<body>
-<h3>access-binary-trees</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/* 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;
-
-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);
-    for (var depth=minDepth; depth<=maxDepth; depth+=2){
-        var iterations = 1 << (maxDepth - depth + minDepth);
-
-        check = 0;
-        for (var i=1; i<=iterations; i++){
-            check += bottomUpTree(i,depth).itemCheck();
-            check += bottomUpTree(-i,depth).itemCheck();
-        }
-    }
-
-    ret = longLivedTree.itemCheck();
-}
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-fannkuch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-fannkuch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-fannkuch.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-fannkuch.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider access-fannkuch</title>
-
-</head>
-
-<body>
-<h3>access-fannkuch</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/* 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;
-
-   for (var i = 0; i < n; i++) perm1[i] = i;
-   var r = n;
-
-   while (true) {
-      // write-out the first 30 permutations
-      if (check < 30){
-         var s = "";
-         for(var i=0; i<n; i++) s += (perm1[i]+1).toString();
-         check++;
-      }
-
-      while (r != 1) { count[r - 1] = r; r--; }
-      if (!(perm1[0] == 0 || perm1[m] == m)) {
-         for (var i = 0; i < n; i++) perm[i] = perm1[i];
-
-         var flipsCount = 0;
-         var k;
-
-         while (!((k = perm[0]) == 0)) {
-            var k2 = (k + 1) >> 1;
-            for (var i = 0; i < k2; i++) {
-               var temp = perm[i]; perm[i] = perm[k - i]; perm[k - i] = temp;
-            }
-            flipsCount++;
-         }
-
-         if (flipsCount > maxFlipsCount) {
-            maxFlipsCount = flipsCount;
-            for (var i = 0; i < n; i++) maxPerm[i] = perm1[i];
-         }
-      }
-
-      while (true) {
-         if (r == n) return maxFlipsCount;
-         var perm0 = perm1[0];
-         var i = 0;
-         while (i < r) {
-            var j = i + 1;
-            perm1[i] = perm1[j];
-            i = j;
-         }
-         perm1[r] = perm0;
-
-         count[r] = count[r] - 1;
-         if (count[r] > 0) break;
-         r++;
-      }
-   }
-}
-
-var n = 8;
-var ret = fannkuch(n);
-
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-nbody.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-nbody.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-nbody.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-nbody.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,219 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider access-nbody</title>
-
-</head>
-
-<body>
-<h3>access-nbody</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/* 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;
-   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;
-   }
-   this.bodies[0].offsetMomentum(px,py,pz);
-}
-
-NBodySystem.prototype.advance = function(dt){
-   var dx, dy, dz, distance, mag;
-   var size = this.bodies.length;
-
-   for (var i=0; i<size; i++) {
-      var bodyi = this.bodies[i];
-      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;
-      }
-   }
-
-   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;
-   }
-}
-
-NBodySystem.prototype.energy = function(){
-   var dx, dy, dz, distance;
-   var e = 0.0;
-   var size = this.bodies.length;
-
-   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 );
-
-      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;
-      }
-   }
-   return e;
-}
-
-var ret;
-
-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();
-        for (var i=0; i<max; i++){
-            bodies.advance(0.01);
-        }
-        ret = bodies.energy();
-    })();
-}
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-nsieve.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-nsieve.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/access-nsieve.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/access-nsieve.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider access-nsieve</title>
-
-</head>
-
-<body>
-<h3>access-nsieve</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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){
-      for (var i=1; i<=prefixWidth; i++) s = " " + s;
-   }
-   return s;
-}
-
-function nsieve(m, isPrime){
-   var i, k, count;
-
-   for (i=2; i<=m; i++) { isPrime[i] = true; }
-   count = 0;
-
-   for (i=2; i<=m; i++){
-      if (isPrime[i]) {
-         for (k=i+i; k<=m; k+=i) isPrime[k] = false;
-         count++;
-      }
-   }
-   return count;
-}
-
-function sieve() {
-    for (var i = 1; i <= 3; i++ ) {
-        var m = (1<<i)*10000;
-        var flags = Array(m+1);
-        nsieve(m, flags);
-    }
-}
-
-sieve();
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-3bit-bits-in-byte.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-3bit-bits-in-byte.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-3bit-bits-in-byte.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-3bit-bits-in-byte.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider bitops-3bit-bits-in-byte</title>
-
-</head>
-
-<body>
-<h3>bitops-3bit-bits-in-byte</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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;
-for(var x=0; x<500; x++)
-for(var y=0; y<256; y++) func(y);
-}
-
-TimeFunc(fast3bitlookup);
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-bits-in-byte.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-bits-in-byte.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-bits-in-byte.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-bits-in-byte.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider bitops-bits-in-byte</title>
-
-</head>
-
-<body>
-<h3>bitops-bits-in-byte</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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;
-while(m<0x100) {
-if(b & m) c++;
-m <<= 1;
-}
-return c;
-}
-
-function TimeFunc(func) {
-var x, y, t;
-for(var x=0; x<350; x++)
-for(var y=0; y<256; y++) func(y);
-}
-
-TimeFunc(bitsinbyte);
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-bitwise-and.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-bitwise-and.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-bitwise-and.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-bitwise-and.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider bitops-bitwise-and</title>
-
-</head>
-
-<body>
-<h3>bitops-bitwise-and</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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;
-for (var i = 0; i < 600000; i++)
-    bitwiseAndValue = bitwiseAndValue & i;
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-nsieve-bits.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-nsieve-bits.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/bitops-nsieve-bits.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/bitops-nsieve-bits.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider bitops-nsieve-bits</title>
-
-</head>
-
-<body>
-<h3>bitops-nsieve-bits</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// The Great Computer Language Shootout
-//  http://shootout.alioth.debian.org
-//
-//  Contributed by Ian Osgood
-
-function pad(n,width) {
-  var s = n.toString();
-  while (s.length < width) s = ' ' + s;
-  return s;
-}
-
-function primes(isPrime, n) {
-  var i, count = 0, m = 10000<<n, size = m+31>>5;
-
-  for (i=0; i<size; i++) isPrime[i] = 0xffffffff;
-
-  for (i=2; i<m; i++)
-    if (isPrime[i>>5] & 1<<(i&31)) {
-      for (var j=i+i; j<m; j+=i)
-        isPrime[j>>5] &= ~(1<<(j&31));
-      count++;
-    }
-}
-
-function sieve() {
-    for (var i = 4; i <= 4; i++) {
-        var isPrime = new Array((10000<<i)+31>>5);
-        primes(isPrime, i);
-    }
-}
-
-sieve();
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/controlflow-recursive.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/controlflow-recursive.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/controlflow-recursive.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/controlflow-recursive.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider controlflow-recursive</title>
-
-</head>
-
-<body>
-<h3>controlflow-recursive</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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));
-}
-
-for ( var i = 3; i <= 5; i++ ) {
-    ack(3,i);
-    fib(17.0+i);
-    tak(3*i+3,2*i+2,i+1);
-}
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/crypto-aes.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/crypto-aes.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/crypto-aes.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/crypto-aes.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,472 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider crypto-aes</title>
-
-</head>
-
-<body>
-<h3>crypto-aes</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-/*
- * 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]
-  for (var i=0; i<4*Nb; i++) state[i%4][Math.floor(i/4)] = input[i];
-
-  state = AddRoundKey(state, w, 0, Nb);
-
-  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);
-  }
-
-  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]
-  for (var i=0; i<4*Nb; i++) output[i] = state[i%4][Math.floor(i/4)];
-  return output;
-}
-
-
-function SubBytes(s, Nb) {    // apply SBox to state S [§5.1.1]
-  for (var r=0; r<4; r++) {
-    for (var c=0; c<Nb; c++) s[r][c] = Sbox[s[r][c]];
-  }
-  return s;
-}
-
-
-function ShiftRows(s, Nb) {    // shift row r of state S left by r bytes [§5.1.2]
-  var t = new Array(4);
-  for (var r=1; r<4; r++) {
-    for (var c=0; c<4; c++) t[c] = s[r][(c+r)%Nb];  // shift into temp copy
-    for (var c=0; c<4; c++) s[r][c] = t[c];         // and copy back
-  }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-  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]
-  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)
-    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;
-    }
-    // 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
-  }
-  return s;
-}
-
-
-function AddRoundKey(state, w, rnd, Nb) {  // xor Round Key into state S [§5.1.4]
-  for (var r=0; r<4; r++) {
-    for (var c=0; c<Nb; c++) state[r][c] ^= w[rnd*4+c][r];
-  }
-  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);
-
-  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;
-  }
-
-  for (var i=Nk; i<(Nb*(Nr+1)); i++) {
-    w[i] = new Array(4);
-    for (var t=0; t<4; t++) temp[t] = w[i-1][t];
-    if (i % Nk == 0) {
-      temp = SubWord(RotWord(temp));
-      for (var t=0; t<4; t++) temp[t] ^= Rcon[i/Nk][t];
-    } else if (Nk > 6 && i%Nk == 4) {
-      temp = SubWord(temp);
-    }
-    for (var t=0; t<4; t++) w[i][t] = w[i-Nk][t] ^ temp[t];
-  }
-
-  return w;
-}
-
-function SubWord(w) {    // apply SBox to 4-byte word w
-  for (var i=0; i<4; i++) w[i] = Sbox[w[i]];
-  return w;
-}
-
-function RotWord(w) {    // rotate 4-byte word w left by one byte
-  w[4] = w[0];
-  for (var i=0; i<4; i++) w[i] = w[i+1];
-  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);
-  for (var i=0; i<nBytes; i++) pwBytes[i] = password.charCodeAt(i) & 0xff;
-  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
-  for (var i=0; i<4; i++) counterBlock[i] = (nonce >>> i*8) & 0xff;
-  for (var i=0; i<4; i++) counterBlock[i+4] = (nonce/0x100000000 >>> i*8) & 0xff; 
-
-  // 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
-  
-  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
-    for (var c=0; c<4; c++) counterBlock[15-c] = (b >>> c*8) & 0xff;
-    for (var c=0; c<4; c++) counterBlock[15-c-4] = (b/0x100000000 >>> c*8)
-
-    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 = '';
-    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);
-    }
-    // ct is now ciphertext for this block
-
-    ciphertext[b] = escCtrlChars(ct);  // escape troublesome characters in ciphertext
-  }
-
-  // convert the nonce to a string to go on the front of the ciphertext
-  var ctrTxt = '';
-  for (var i=0; i<8; i++) ctrTxt += String.fromCharCode(counterBlock[i]);
-  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);
-  for (var i=0; i<nBytes; i++) pwBytes[i] = password.charCodeAt(i) & 0xff;
-  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]);
-  for (var i=0; i<8; i++) counterBlock[i] = ctrTxt.charCodeAt(i);
-
-  var plaintext = new Array(ciphertext.length-1);
-
-  for (var b=1; b<ciphertext.length; b++) {
-    // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-    for (var c=0; c<4; c++) counterBlock[15-c] = ((b-1) >>> c*8) & 0xff;
-    for (var c=0; c<4; c++) counterBlock[15-c-4] = ((b/0x100000000-1) >>> c*8) & 0xff;
-
-    var cipherCntr = Cipher(counterBlock, keySchedule);  // encrypt counter block
-
-    ciphertext[b] = unescCtrlChars(ciphertext[b]);
-
-    var pt = '';
-    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);
-    }
-    // pt is now plaintext for this block
-
-    plaintext[b-1] = pt;  // b-1 'cos no initial nonce block in plaintext
-  }
-
-  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
-
-   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);
-   
-   return enc;
-}
-
-function decodeBase64(str) {
-   var o1, o2, o3, h1, h2, h3, h4, bits, i=0, enc='';
-
-   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);
-
-   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 = '';
-  for (var i=0; i<b.length; i++) s += b[i].toString(16) + ' ';
-  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);
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/crypto-md5.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/crypto-md5.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/crypto-md5.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/crypto-md5.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,336 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider crypto-md5</title>
-
-</head>
-
-<body>
-<h3>crypto-md5</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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;
-
-  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);
-  }
-  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);
-  for(var i = 0; i < 16; i++)
-  {
-    ipad[i] = bkey[i] ^ 0x36363636;
-    opad[i] = bkey[i] ^ 0x5C5C5C5C;
-  }
-
-  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;
-  for(var i = 0; i < str.length * chrsz; i += chrsz)
-    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
-  return bin;
-}
-
-/*
- * Convert an array of little-endian words to a string
- */
-function binl2str(bin)
-{
-  var str = "";
-  var mask = (1 << chrsz) - 1;
-  for(var i = 0; i < bin.length * 32; i += chrsz)
-    str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
-  return str;
-}
-
-/*
- * Convert an array of little-endian words to a hex string.
- */
-function binl2hex(binarray)
-{
-  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
-  var str = "";
-  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);
-  }
-  return str;
-}
-
-/*
- * Convert an array of little-endian words to a base-64 string
- */
-function binl2b64(binarray)
-{
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  var str = "";
-  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);
-    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);
-    }
-  }
-  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."
-
-for (var i = 0; i <4; i++) {
-    plainText += plainText;
-}
-
-var md5Output = hex_md5(plainText);
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/crypto-sha1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/crypto-sha1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/crypto-sha1.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/crypto-sha1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,274 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider crypto-sha1</title>
-
-</head>
-
-<body>
-<h3>crypto-sha1</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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;
-
-  for(var i = 0; i < x.length; i += 16)
-  {
-    var olda = a;
-    var oldb = b;
-    var oldc = c;
-    var oldd = d;
-    var olde = e;
-
-    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;
-    }
-
-    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);
-  }
-  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);
-  for(var i = 0; i < 16; i++)
-  {
-    ipad[i] = bkey[i] ^ 0x36363636;
-    opad[i] = bkey[i] ^ 0x5C5C5C5C;
-  }
-
-  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;
-  for(var i = 0; i < str.length * chrsz; i += chrsz)
-    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32);
-  return bin;
-}
-
-/*
- * Convert an array of big-endian words to a string
- */
-function binb2str(bin)
-{
-  var str = "";
-  var mask = (1 << chrsz) - 1;
-  for(var i = 0; i < bin.length * 32; i += chrsz)
-    str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
-  return str;
-}
-
-/*
- * Convert an array of big-endian words to a hex string.
- */
-function binb2hex(binarray)
-{
-  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
-  var str = "";
-  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);
-  }
-  return str;
-}
-
-/*
- * Convert an array of big-endian words to a base-64 string
- */
-function binb2b64(binarray)
-{
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  var str = "";
-  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);
-    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);
-    }
-  }
-  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.";
-
-for (var i = 0; i <4; i++) {
-    plainText += plainText;
-}
-
-var sha1Output = hex_sha1(plainText);
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/date-format-tofte.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/date-format-tofte.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/date-format-tofte.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/date-format-tofte.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,349 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider date-format-tofte</title>
-
-</head>
-
-<body>
-<h3>date-format-tofte</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-function arrayExists(array, x) {
-    for (var i = 0; i < array.length; i++) {
-        if (array[i] == x) return true;
-    }
-    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;
-    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++;
-    }
-    // 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");
-
-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);
-}
-
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/date-format-xparb.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/date-format-xparb.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/date-format-xparb.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/date-format-xparb.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,467 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider date-format-xparb</title>
-
-</head>
-
-<body>
-<h3>date-format-xparb</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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 = '';
-    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);
-        }
-    }
-    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 = '';
-    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;
-            }
-        }
-    }
-
-    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;
-    for (var i = 0; i < this.getMonth(); ++i) {
-        num += Date.daysInMonth[i];
-    }
-    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 = " ";
-    }
-    while (result.length < size) {
-        result = ch + result;
-    }
-    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");
-
-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);
-}
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/math-cordic.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/math-cordic.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/math-cordic.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/math-cordic.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider math-cordic</title>
-
-</head>
-
-<body>
-<h3>math-cordic</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/*
- * 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;
-    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 CORDIC
-
-function cordic( runs ) {
-  var start = new Date();
-
-  for ( var i = 0 ; i < runs ; i++ ) {
-      cordicsincos();
-  }
-
-  var end = new Date();
-
-  return end.getTime() - start.getTime();
-}
-
-cordic(25000);
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/math-partial-sums.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/math-partial-sums.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/math-partial-sums.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/math-partial-sums.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider math-partial-sums</title>
-
-</head>
-
-<body>
-<h3>math-partial-sums</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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;
-    
-    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);
-    }
-}
-
-for (var i = 1024; i <= 16384; i *= 2) {
-    partial(i);
-}
-
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/math-spectral-norm.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/math-spectral-norm.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/math-spectral-norm.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/math-spectral-norm.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider math-spectral-norm</title>
-
-</head>
-
-<body>
-<h3>math-spectral-norm</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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) {
-  for (var i=0; i<u.length; ++i) {
-    var t = 0;
-    for (var j=0; j<u.length; ++j)
-      t += A(i,j) * u[j];
-    v[i] = t;
-  }
-}
-
-function Atu(u,v) {
-  for (var i=0; i<u.length; ++i) {
-    var t = 0;
-    for (var j=0; j<u.length; ++j)
-      t += A(j,i) * u[j];
-    v[i] = t;
-  }
-}
-
-function AtAu(u,v,w) {
-  Au(u,w);
-  Atu(w,v);
-}
-
-function spectralnorm(n) {
-  var i, u=[], v=[], w=[], vv=0, vBv=0;
-  for (i=0; i<n; ++i) {
-    u[i] = 1; v[i] = w[i] = 0;
-  }
-  for (i=0; i<10; ++i) {
-    AtAu(u,v,w);
-    AtAu(v,u,w);
-  }
-  for (i=0; i<n; ++i) {
-    vBv += u[i]*v[i];
-    vv  += v[i]*v[i];
-  }
-  return Math.sqrt(vBv/vv);
-}
-
-for (var i = 6; i <= 48; i *= 2) {
-    spectralnorm(i);
-}
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/regexp-dna.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/regexp-dna.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/regexp-dna.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/regexp-dna.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,1762 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider regexp-dna</title>
-
-</head>
-
-<body>
-<h3>regexp-dna</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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;
-
-for(i in seqs)
-    dnaOutputString += seqs[i].source + " " + (dnaInput.match(seqs[i]) || []).length + "\n";
- // match returns null if no matches, so replace with empty
-
-for(k in subs)
- dnaInput = dnaInput.replace(k, subs[k], "g")
- // search string, replacement string, flags
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-base64.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-base64.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-base64.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-base64.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider string-base64</title>
-
-</head>
-
-<body>
-<h3>string-base64</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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.
-    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];
-    }
-
-    // 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.
-    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;
-        }
-    }
-
-    // If there are any bits left, the base64 string was corrupted
-    if (leftbits)
-        throw Components.Exception('Corrupted base64 string');
-
-    return result;
-}
-
-var str = "";
-
-for ( var i = 0; i < 8192; i++ )
-        str += String.fromCharCode( (25 * Math.random()) + 97 );
-
-for ( var i = 8192; i <= 16384; i *= 2 ) {
-
-    var base64;
-
-    base64 = toBase64(str);
-    base64ToString(base64);
-
-    // Double the string
-    str += str;
-}
-
-toBinaryTable = null;
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-fasta.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-fasta.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-fasta.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-fasta.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider string-fasta</title>
-
-</head>
-
-<body>
-<h3>string-fasta</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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;
-  for (var c in table) {
-    if (last) table[c] += table[last];
-    last = c;
-  }
-}
-
-function fastaRepeat(n, seq) {
-  var seqi = 0, lenOut = 60;
-  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;
-  }
-}
-
-function fastaRandom(n, table) {
-  var line = new Array(60);
-  makeCumulative(table);
-  while (n>0) {
-    if (n<line.length) line = new Array(n);
-    for (var i=0; i<line.length; i++) {
-      var r = rand(1);
-      for (var c in table) {
-        if (r < table[c]) {
-          line[i] = c;
-          break;
-        }
-      }
-    }
-    ret = line.join('');
-    n -= line.length;
-  }
-}
-
-var ret;
-
-var count = 7;
-ret = fastaRepeat(2*count*100000, ALU);
-ret = fastaRandom(3*count*1000, IUB);
-ret = fastaRandom(5*count*1000, HomoSap);
-
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-tagcloud.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-tagcloud.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-tagcloud.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-tagcloud.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider string-tagcloud</title>
-
-</head>
-
-<body>
-<h3>string-tagcloud</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-
-/*
- * 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.
-
-        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');
-            }
-        }
-
-        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) {
-            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());
-
-                    }
-                }
-            }
-        } else {
-
-            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());
-
-                    }
-                }
-            }
-        }
-
-        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') {
-                    for (i in v) {
-                        if (Object.prototype.hasOwnProperty.apply(v, [i])) {
-                            n = walk(i, v[i]);
-                            if (n !== undefined) {
-                                v[i] = n;
-                            }
-                        }
-                    }
-                }
-                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; });
-
-    for (var i = 0; i < tagInfo.length; i++) {
-        var tag = tagInfo[i].tag;
-
-        var validates = true;
-        for (var j = 0; j < tag.length; j++) {
-            var ch = tag.charCodeAt(j);
-            if (ch < 0x20 || ch >= 0x7f) {
-                validates = false;
-                break;
-            }
-        }
-
-        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';
-    }
-
-    output += '</div>';
-    output.replace(" ", "&nbsp;");
-
-    return output;
-}
-
-var tagcloud = makeTagCloud(tagInfo);
-tagInfo = null;
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-unpack-code.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-unpack-code.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-unpack-code.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-unpack-code.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider string-unpack-code</title>
-
-</head>
-
-<body>
-<h3>string-unpack-code</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-// 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.
-***/
-
-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)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[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}('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)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[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}('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)){while(c--){d[e(c)]=k[c]||e(c)}k=[(function(e){return d[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}('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,{})
-
-}
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-validate-input.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-validate-input.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/string-validate-input.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/string-validate-input.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<head>
-<!--
- 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. 
--->
-
-<title>SunSpider string-validate-input</title>
-
-</head>
-
-<body>
-<h3>string-validate-input</h3>
-<div id="console">
-</div>
-
-<script>
-
-var _sunSpiderStartDate = new Date();
-
-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
-   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);
-      }
-   }
-
-   // make up ZIP codes
-   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
-      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);
-          }
-      }
-      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);
-      }
-   }
-}
-
-function makeName(n)
-{
-   var tmp = "";
-   for (var i=0;i<n;i++)
-   {
-      var l = Math.floor(26*Math.random());
-      tmp += letters[l];
-   }
-   return tmp;
-}
-
-function makeNumber(n)
-{
-   var tmp = "";
-   for (var i=0;i<n;i++)
-   {
-      var l = Math.floor(9*Math.random());
-      tmp = tmp.concat(l);
-   }
-   return tmp;
-}
-
-function addResult(r)
-{
-   endResult += "\n" + r;
-}
-
-doTest();
-
-
-var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
-
-document.getElementById("console").innerHTML = _sunSpiderInterval;
-</script>
-
-
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/3d-cube.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/3d-cube.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/3d-cube.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/3d-cube.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,387 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider 3d-cube</title>
+
+</head>
+
+<body>
+<h3>3d-cube</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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;
+  for (; i < NumPix; i++) {
+    Num += NumAdd;
+    if (Num >= Den) {
+      Num -= Den;
+      x += IncX1;
+      y += IncY1;
+    }
+    x += IncX2;
+    y += IncY2;
+  }
+  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(); 
+  for (var i = 0; i < 3; i++) {
+    A[i] = V0[i] - V1[i];
+    B[i] = V2[i] - V1[i];
+  }
+  A = CalcCross(A, B);
+  var Length = Math.sqrt(A[0]*A[0] + A[1]*A[1] + A[2]*A[2]); 
+  for (var i = 0; i < 3; i++) A[i] = A[i] / Length;
+  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;
+  for (; i < 4; i++) {
+    j = 0;
+    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];
+  }
+  return M;
+}
+
+//multiplies matrix with vector
+function VMulti(M, V) {
+  var Vect = new Array();
+  var i = 0;
+  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];
+  return Vect;
+}
+
+function VMulti2(M, V) {
+  var Vect = new Array();
+  var i = 0;
+  for (;i < 3; i++) Vect[i] = M[i][0] * V[0] + M[i][1] * V[1] + M[i][2] * V[2];
+  return Vect;
+}
+
+// add to matrices
+function MAdd(M1, M2) {
+  var M = [[],[],[],[]];
+  var i = 0;
+  var j = 0;
+  for (; i < 4; i++) {
+    j = 0;
+    for (; j < 4; j++) M[i][j] = M1[i][j] + M2[i][j];
+  }
+  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;
+  for (; i > -1; i--) CurN[i] = VMulti2(MQube, Q.Normal[i]);
+  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);
+  while (TestingStr.length < 3) TestingStr = "0" + TestingStr;
+  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;
+  for (; i > -1; i--) {
+    Q[i].V = VMulti(MTrans, Q[i].V);
+  }
+  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();
+  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);
+  
+  // line drawn ?
+  Q.Line = [false,false,false,false,false,false,false,false,false,false,false,false];
+  
+  // create line pixels
+  Q.NumPx = 9 * 2 * CubeSize;
+  for (var i = 0; i < Q.NumPx; i++) CreateP(0,0,0);
+  
+  MTrans = Translate(MTrans, Origin.V[0], Origin.V[1], Origin.V[2]);
+  MQube = MMulti(MTrans, MQube);
+
+  var i = 0;
+  for (; i < 9; i++) {
+    Q[i].V = VMulti(MTrans, Q[i].V);
+  }
+  DrawQube();
+  Testing.Init = true;
+  Loop();
+}
+
+for ( var i = 20; i <= 160; i *= 2 ) {
+  Init(i);
+}
+
+Q = null;
+MTrans = null;
+MQube = null;
+I = null;
+Origin = null;
+Testing = null;
+LoopTime = null;
+DisplArea = null;
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/3d-morph.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/3d-morph.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/3d-morph.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/3d-morph.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider 3d-morph</title>
+
+</head>
+
+<body>
+<h3>3d-morph</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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))
+    
+    for (var i = 0; i < nz; ++i) {
+        for (var j = 0; j < nx; ++j) {
+            a[3*(i*nx+j)+1]    = sin((j-1) * PI2nx ) * -f30
+        }
+    }
+}
+
+    
+var a = Array()
+for (var i=0; i < nx*nz*3; ++i) 
+    a[i] = 0
+
+for (var i = 0; i < loops; ++i) {
+    morph(a, i/loops)
+}
+
+testOutput = 0;
+for (var i = 0; i < nx; i++)
+    testOutput += a[3*(i*nx+i)+1];
+a = null;
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/3d-raytrace.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/3d-raytrace.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/3d-raytrace.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/3d-raytrace.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,490 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider 3d-raytrace</title>
+</head>
+
+<body>
+<h3>3d-raytrace</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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];
+    for (h = 0; h < 3; h++) 
+        for (v = 0; v < 3; v++) 
+            temp[h + v * 4] = self[v + h * 4];
+    for (i = 0; i < 11; i++)
+        self[i] = temp[i];
+    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;
+    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;
+    }
+    
+    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]];
+    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));
+    }
+    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;
+    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;
+    }
+    
+    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) {
+    for (var y = starty; y < stopy; y++) {
+        var rays = camera.generateRayPair(y / height);
+        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;
+        }
+    }
+}
+
+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();
+    for (var y = 0; y < size; y++) {
+        pixels[y] = new Array();
+        for (var x = 0; x < size; x++) {
+            pixels[y][x] = 0;
+        }
+    }
+
+    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;
+    for (var y = 0; y < size; y++) {
+        s += "[";
+        for (var x = 0; x < size; x++) {
+            s += "[" + pixels[y][x] + "],";
+        }
+        s+= "],";
+    }
+    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());
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-binary-trees.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-binary-trees.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-binary-trees.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-binary-trees.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider access-binary-trees</title>
+
+</head>
+
+<body>
+<h3>access-binary-trees</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/* 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;
+
+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);
+    for (var depth=minDepth; depth<=maxDepth; depth+=2){
+        var iterations = 1 << (maxDepth - depth + minDepth);
+
+        check = 0;
+        for (var i=1; i<=iterations; i++){
+            check += bottomUpTree(i,depth).itemCheck();
+            check += bottomUpTree(-i,depth).itemCheck();
+        }
+    }
+
+    ret = longLivedTree.itemCheck();
+}
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-fannkuch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-fannkuch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-fannkuch.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-fannkuch.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider access-fannkuch</title>
+
+</head>
+
+<body>
+<h3>access-fannkuch</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/* 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;
+
+   for (var i = 0; i < n; i++) perm1[i] = i;
+   var r = n;
+
+   while (true) {
+      // write-out the first 30 permutations
+      if (check < 30){
+         var s = "";
+         for(var i=0; i<n; i++) s += (perm1[i]+1).toString();
+         check++;
+      }
+
+      while (r != 1) { count[r - 1] = r; r--; }
+      if (!(perm1[0] == 0 || perm1[m] == m)) {
+         for (var i = 0; i < n; i++) perm[i] = perm1[i];
+
+         var flipsCount = 0;
+         var k;
+
+         while (!((k = perm[0]) == 0)) {
+            var k2 = (k + 1) >> 1;
+            for (var i = 0; i < k2; i++) {
+               var temp = perm[i]; perm[i] = perm[k - i]; perm[k - i] = temp;
+            }
+            flipsCount++;
+         }
+
+         if (flipsCount > maxFlipsCount) {
+            maxFlipsCount = flipsCount;
+            for (var i = 0; i < n; i++) maxPerm[i] = perm1[i];
+         }
+      }
+
+      while (true) {
+         if (r == n) return maxFlipsCount;
+         var perm0 = perm1[0];
+         var i = 0;
+         while (i < r) {
+            var j = i + 1;
+            perm1[i] = perm1[j];
+            i = j;
+         }
+         perm1[r] = perm0;
+
+         count[r] = count[r] - 1;
+         if (count[r] > 0) break;
+         r++;
+      }
+   }
+}
+
+var n = 8;
+var ret = fannkuch(n);
+
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-nbody.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-nbody.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-nbody.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-nbody.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider access-nbody</title>
+
+</head>
+
+<body>
+<h3>access-nbody</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/* 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;
+   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;
+   }
+   this.bodies[0].offsetMomentum(px,py,pz);
+}
+
+NBodySystem.prototype.advance = function(dt){
+   var dx, dy, dz, distance, mag;
+   var size = this.bodies.length;
+
+   for (var i=0; i<size; i++) {
+      var bodyi = this.bodies[i];
+      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;
+      }
+   }
+
+   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;
+   }
+}
+
+NBodySystem.prototype.energy = function(){
+   var dx, dy, dz, distance;
+   var e = 0.0;
+   var size = this.bodies.length;
+
+   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 );
+
+      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;
+      }
+   }
+   return e;
+}
+
+var ret;
+
+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();
+        for (var i=0; i<max; i++){
+            bodies.advance(0.01);
+        }
+        ret = bodies.energy();
+    })();
+}
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-nsieve.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-nsieve.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/access-nsieve.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/access-nsieve.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider access-nsieve</title>
+
+</head>
+
+<body>
+<h3>access-nsieve</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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){
+      for (var i=1; i<=prefixWidth; i++) s = " " + s;
+   }
+   return s;
+}
+
+function nsieve(m, isPrime){
+   var i, k, count;
+
+   for (i=2; i<=m; i++) { isPrime[i] = true; }
+   count = 0;
+
+   for (i=2; i<=m; i++){
+      if (isPrime[i]) {
+         for (k=i+i; k<=m; k+=i) isPrime[k] = false;
+         count++;
+      }
+   }
+   return count;
+}
+
+function sieve() {
+    for (var i = 1; i <= 3; i++ ) {
+        var m = (1<<i)*10000;
+        var flags = Array(m+1);
+        nsieve(m, flags);
+    }
+}
+
+sieve();
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-3bit-bits-in-byte.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-3bit-bits-in-byte.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-3bit-bits-in-byte.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-3bit-bits-in-byte.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider bitops-3bit-bits-in-byte</title>
+
+</head>
+
+<body>
+<h3>bitops-3bit-bits-in-byte</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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;
+for(var x=0; x<500; x++)
+for(var y=0; y<256; y++) func(y);
+}
+
+TimeFunc(fast3bitlookup);
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-bits-in-byte.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-bits-in-byte.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-bits-in-byte.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-bits-in-byte.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider bitops-bits-in-byte</title>
+
+</head>
+
+<body>
+<h3>bitops-bits-in-byte</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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;
+while(m<0x100) {
+if(b & m) c++;
+m <<= 1;
+}
+return c;
+}
+
+function TimeFunc(func) {
+var x, y, t;
+for(var x=0; x<350; x++)
+for(var y=0; y<256; y++) func(y);
+}
+
+TimeFunc(bitsinbyte);
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-bitwise-and.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-bitwise-and.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-bitwise-and.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-bitwise-and.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider bitops-bitwise-and</title>
+
+</head>
+
+<body>
+<h3>bitops-bitwise-and</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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;
+for (var i = 0; i < 600000; i++)
+    bitwiseAndValue = bitwiseAndValue & i;
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-nsieve-bits.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-nsieve-bits.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/bitops-nsieve-bits.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/bitops-nsieve-bits.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider bitops-nsieve-bits</title>
+
+</head>
+
+<body>
+<h3>bitops-nsieve-bits</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// The Great Computer Language Shootout
+//  http://shootout.alioth.debian.org
+//
+//  Contributed by Ian Osgood
+
+function pad(n,width) {
+  var s = n.toString();
+  while (s.length < width) s = ' ' + s;
+  return s;
+}
+
+function primes(isPrime, n) {
+  var i, count = 0, m = 10000<<n, size = m+31>>5;
+
+  for (i=0; i<size; i++) isPrime[i] = 0xffffffff;
+
+  for (i=2; i<m; i++)
+    if (isPrime[i>>5] & 1<<(i&31)) {
+      for (var j=i+i; j<m; j+=i)
+        isPrime[j>>5] &= ~(1<<(j&31));
+      count++;
+    }
+}
+
+function sieve() {
+    for (var i = 4; i <= 4; i++) {
+        var isPrime = new Array((10000<<i)+31>>5);
+        primes(isPrime, i);
+    }
+}
+
+sieve();
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/controlflow-recursive.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/controlflow-recursive.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/controlflow-recursive.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/controlflow-recursive.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider controlflow-recursive</title>
+
+</head>
+
+<body>
+<h3>controlflow-recursive</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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));
+}
+
+for ( var i = 3; i <= 5; i++ ) {
+    ack(3,i);
+    fib(17.0+i);
+    tak(3*i+3,2*i+2,i+1);
+}
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/crypto-aes.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/crypto-aes.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/crypto-aes.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/crypto-aes.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,472 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider crypto-aes</title>
+
+</head>
+
+<body>
+<h3>crypto-aes</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+
+/*
+ * 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]
+  for (var i=0; i<4*Nb; i++) state[i%4][Math.floor(i/4)] = input[i];
+
+  state = AddRoundKey(state, w, 0, Nb);
+
+  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);
+  }
+
+  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]
+  for (var i=0; i<4*Nb; i++) output[i] = state[i%4][Math.floor(i/4)];
+  return output;
+}
+
+
+function SubBytes(s, Nb) {    // apply SBox to state S [§5.1.1]
+  for (var r=0; r<4; r++) {
+    for (var c=0; c<Nb; c++) s[r][c] = Sbox[s[r][c]];
+  }
+  return s;
+}
+
+
+function ShiftRows(s, Nb) {    // shift row r of state S left by r bytes [§5.1.2]
+  var t = new Array(4);
+  for (var r=1; r<4; r++) {
+    for (var c=0; c<4; c++) t[c] = s[r][(c+r)%Nb];  // shift into temp copy
+    for (var c=0; c<4; c++) s[r][c] = t[c];         // and copy back
+  }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
+  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]
+  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)
+    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;
+    }
+    // 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
+  }
+  return s;
+}
+
+
+function AddRoundKey(state, w, rnd, Nb) {  // xor Round Key into state S [§5.1.4]
+  for (var r=0; r<4; r++) {
+    for (var c=0; c<Nb; c++) state[r][c] ^= w[rnd*4+c][r];
+  }
+  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);
+
+  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;
+  }
+
+  for (var i=Nk; i<(Nb*(Nr+1)); i++) {
+    w[i] = new Array(4);
+    for (var t=0; t<4; t++) temp[t] = w[i-1][t];
+    if (i % Nk == 0) {
+      temp = SubWord(RotWord(temp));
+      for (var t=0; t<4; t++) temp[t] ^= Rcon[i/Nk][t];
+    } else if (Nk > 6 && i%Nk == 4) {
+      temp = SubWord(temp);
+    }
+    for (var t=0; t<4; t++) w[i][t] = w[i-Nk][t] ^ temp[t];
+  }
+
+  return w;
+}
+
+function SubWord(w) {    // apply SBox to 4-byte word w
+  for (var i=0; i<4; i++) w[i] = Sbox[w[i]];
+  return w;
+}
+
+function RotWord(w) {    // rotate 4-byte word w left by one byte
+  w[4] = w[0];
+  for (var i=0; i<4; i++) w[i] = w[i+1];
+  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);
+  for (var i=0; i<nBytes; i++) pwBytes[i] = password.charCodeAt(i) & 0xff;
+  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
+  for (var i=0; i<4; i++) counterBlock[i] = (nonce >>> i*8) & 0xff;
+  for (var i=0; i<4; i++) counterBlock[i+4] = (nonce/0x100000000 >>> i*8) & 0xff; 
+
+  // 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
+  
+  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
+    for (var c=0; c<4; c++) counterBlock[15-c] = (b >>> c*8) & 0xff;
+    for (var c=0; c<4; c++) counterBlock[15-c-4] = (b/0x100000000 >>> c*8)
+
+    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 = '';
+    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);
+    }
+    // ct is now ciphertext for this block
+
+    ciphertext[b] = escCtrlChars(ct);  // escape troublesome characters in ciphertext
+  }
+
+  // convert the nonce to a string to go on the front of the ciphertext
+  var ctrTxt = '';
+  for (var i=0; i<8; i++) ctrTxt += String.fromCharCode(counterBlock[i]);
+  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);
+  for (var i=0; i<nBytes; i++) pwBytes[i] = password.charCodeAt(i) & 0xff;
+  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]);
+  for (var i=0; i<8; i++) counterBlock[i] = ctrTxt.charCodeAt(i);
+
+  var plaintext = new Array(ciphertext.length-1);
+
+  for (var b=1; b<ciphertext.length; b++) {
+    // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+    for (var c=0; c<4; c++) counterBlock[15-c] = ((b-1) >>> c*8) & 0xff;
+    for (var c=0; c<4; c++) counterBlock[15-c-4] = ((b/0x100000000-1) >>> c*8) & 0xff;
+
+    var cipherCntr = Cipher(counterBlock, keySchedule);  // encrypt counter block
+
+    ciphertext[b] = unescCtrlChars(ciphertext[b]);
+
+    var pt = '';
+    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);
+    }
+    // pt is now plaintext for this block
+
+    plaintext[b-1] = pt;  // b-1 'cos no initial nonce block in plaintext
+  }
+
+  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
+
+   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);
+   
+   return enc;
+}
+
+function decodeBase64(str) {
+   var o1, o2, o3, h1, h2, h3, h4, bits, i=0, enc='';
+
+   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);
+
+   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 = '';
+  for (var i=0; i<b.length; i++) s += b[i].toString(16) + ' ';
+  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);
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/crypto-md5.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/crypto-md5.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/crypto-md5.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/crypto-md5.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,336 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider crypto-md5</title>
+
+</head>
+
+<body>
+<h3>crypto-md5</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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;
+
+  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);
+  }
+  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);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  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;
+  for(var i = 0; i < str.length * chrsz; i += chrsz)
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
+  return bin;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < bin.length * 32; i += chrsz)
+    str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  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);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a base-64 string
+ */
+function binl2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  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);
+    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);
+    }
+  }
+  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."
+
+for (var i = 0; i <4; i++) {
+    plainText += plainText;
+}
+
+var md5Output = hex_md5(plainText);
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/crypto-sha1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/crypto-sha1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/crypto-sha1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/crypto-sha1.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,274 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider crypto-sha1</title>
+
+</head>
+
+<body>
+<h3>crypto-sha1</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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;
+
+  for(var i = 0; i < x.length; i += 16)
+  {
+    var olda = a;
+    var oldb = b;
+    var oldc = c;
+    var oldd = d;
+    var olde = e;
+
+    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;
+    }
+
+    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);
+  }
+  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);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  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;
+  for(var i = 0; i < str.length * chrsz; i += chrsz)
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32);
+  return bin;
+}
+
+/*
+ * Convert an array of big-endian words to a string
+ */
+function binb2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < bin.length * 32; i += chrsz)
+    str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
+  return str;
+}
+
+/*
+ * Convert an array of big-endian words to a hex string.
+ */
+function binb2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  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);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of big-endian words to a base-64 string
+ */
+function binb2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  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);
+    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);
+    }
+  }
+  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.";
+
+for (var i = 0; i <4; i++) {
+    plainText += plainText;
+}
+
+var sha1Output = hex_sha1(plainText);
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/date-format-tofte.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/date-format-tofte.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/date-format-tofte.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/date-format-tofte.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider date-format-tofte</title>
+
+</head>
+
+<body>
+<h3>date-format-tofte</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+function arrayExists(array, x) {
+    for (var i = 0; i < array.length; i++) {
+        if (array[i] == x) return true;
+    }
+    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;
+    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++;
+    }
+    // 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");
+
+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);
+}
+
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/date-format-xparb.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/date-format-xparb.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/date-format-xparb.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/date-format-xparb.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,467 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider date-format-xparb</title>
+
+</head>
+
+<body>
+<h3>date-format-xparb</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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 = '';
+    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);
+        }
+    }
+    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 = '';
+    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;
+            }
+        }
+    }
+
+    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;
+    for (var i = 0; i < this.getMonth(); ++i) {
+        num += Date.daysInMonth[i];
+    }
+    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 = " ";
+    }
+    while (result.length < size) {
+        result = ch + result;
+    }
+    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");
+
+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);
+}
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/math-cordic.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/math-cordic.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/math-cordic.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/math-cordic.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider math-cordic</title>
+
+</head>
+
+<body>
+<h3>math-cordic</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/*
+ * 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;
+    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 CORDIC
+
+function cordic( runs ) {
+  var start = new Date();
+
+  for ( var i = 0 ; i < runs ; i++ ) {
+      cordicsincos();
+  }
+
+  var end = new Date();
+
+  return end.getTime() - start.getTime();
+}
+
+cordic(25000);
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/math-partial-sums.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/math-partial-sums.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/math-partial-sums.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/math-partial-sums.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider math-partial-sums</title>
+
+</head>
+
+<body>
+<h3>math-partial-sums</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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;
+    
+    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);
+    }
+}
+
+for (var i = 1024; i <= 16384; i *= 2) {
+    partial(i);
+}
+
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/math-spectral-norm.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/math-spectral-norm.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/math-spectral-norm.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/math-spectral-norm.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider math-spectral-norm</title>
+
+</head>
+
+<body>
+<h3>math-spectral-norm</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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) {
+  for (var i=0; i<u.length; ++i) {
+    var t = 0;
+    for (var j=0; j<u.length; ++j)
+      t += A(i,j) * u[j];
+    v[i] = t;
+  }
+}
+
+function Atu(u,v) {
+  for (var i=0; i<u.length; ++i) {
+    var t = 0;
+    for (var j=0; j<u.length; ++j)
+      t += A(j,i) * u[j];
+    v[i] = t;
+  }
+}
+
+function AtAu(u,v,w) {
+  Au(u,w);
+  Atu(w,v);
+}
+
+function spectralnorm(n) {
+  var i, u=[], v=[], w=[], vv=0, vBv=0;
+  for (i=0; i<n; ++i) {
+    u[i] = 1; v[i] = w[i] = 0;
+  }
+  for (i=0; i<10; ++i) {
+    AtAu(u,v,w);
+    AtAu(v,u,w);
+  }
+  for (i=0; i<n; ++i) {
+    vBv += u[i]*v[i];
+    vv  += v[i]*v[i];
+  }
+  return Math.sqrt(vBv/vv);
+}
+
+for (var i = 6; i <= 48; i *= 2) {
+    spectralnorm(i);
+}
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/regexp-dna.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/regexp-dna.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/regexp-dna.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/regexp-dna.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,1762 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider regexp-dna</title>
+
+</head>
+
+<body>
+<h3>regexp-dna</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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;
+
+for(i in seqs)
+    dnaOutputString += seqs[i].source + " " + (dnaInput.match(seqs[i]) || []).length + "\n";
+ // match returns null if no matches, so replace with empty
+
+for(k in subs)
+ dnaInput = dnaInput.replace(k, subs[k], "g")
+ // search string, replacement string, flags
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-base64.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-base64.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-base64.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-base64.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider string-base64</title>
+
+</head>
+
+<body>
+<h3>string-base64</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.
+    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];
+    }
+
+    // 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.
+    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;
+        }
+    }
+
+    // If there are any bits left, the base64 string was corrupted
+    if (leftbits)
+        throw Components.Exception('Corrupted base64 string');
+
+    return result;
+}
+
+var str = "";
+
+for ( var i = 0; i < 8192; i++ )
+        str += String.fromCharCode( (25 * Math.random()) + 97 );
+
+for ( var i = 8192; i <= 16384; i *= 2 ) {
+
+    var base64;
+
+    base64 = toBase64(str);
+    base64ToString(base64);
+
+    // Double the string
+    str += str;
+}
+
+toBinaryTable = null;
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-fasta.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-fasta.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-fasta.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-fasta.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider string-fasta</title>
+
+</head>
+
+<body>
+<h3>string-fasta</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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;
+  for (var c in table) {
+    if (last) table[c] += table[last];
+    last = c;
+  }
+}
+
+function fastaRepeat(n, seq) {
+  var seqi = 0, lenOut = 60;
+  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;
+  }
+}
+
+function fastaRandom(n, table) {
+  var line = new Array(60);
+  makeCumulative(table);
+  while (n>0) {
+    if (n<line.length) line = new Array(n);
+    for (var i=0; i<line.length; i++) {
+      var r = rand(1);
+      for (var c in table) {
+        if (r < table[c]) {
+          line[i] = c;
+          break;
+        }
+      }
+    }
+    ret = line.join('');
+    n -= line.length;
+  }
+}
+
+var ret;
+
+var count = 7;
+ret = fastaRepeat(2*count*100000, ALU);
+ret = fastaRandom(3*count*1000, IUB);
+ret = fastaRandom(5*count*1000, HomoSap);
+
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-tagcloud.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-tagcloud.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-tagcloud.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-tagcloud.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,315 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider string-tagcloud</title>
+
+</head>
+
+<body>
+<h3>string-tagcloud</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+
+/*
+ * 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.
+
+        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');
+            }
+        }
+
+        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) {
+            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());
+
+                    }
+                }
+            }
+        } else {
+
+            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());
+
+                    }
+                }
+            }
+        }
+
+        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') {
+                    for (i in v) {
+                        if (Object.prototype.hasOwnProperty.apply(v, [i])) {
+                            n = walk(i, v[i]);
+                            if (n !== undefined) {
+                                v[i] = n;
+                            }
+                        }
+                    }
+                }
+                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; });
+
+    for (var i = 0; i < tagInfo.length; i++) {
+        var tag = tagInfo[i].tag;
+
+        var validates = true;
+        for (var j = 0; j < tag.length; j++) {
+            var ch = tag.charCodeAt(j);
+            if (ch < 0x20 || ch >= 0x7f) {
+                validates = false;
+                break;
+            }
+        }
+
+        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';
+    }
+
+    output += '</div>';
+    output.replace(" ", "&nbsp;");
+
+    return output;
+}
+
+var tagcloud = makeTagCloud(tagInfo);
+tagInfo = null;
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-unpack-code.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-unpack-code.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-unpack-code.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-unpack-code.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider string-unpack-code</title>
+
+</head>
+
+<body>
+<h3>string-unpack-code</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+// 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.
+***/
+
+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)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[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}('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)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[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}('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)){while(c--){d[e(c)]=k[c]||e(c)}k=[(function(e){return d[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}('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,{})
+
+}
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-validate-input.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-validate-input.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/pgo/js-input/sunspider/string-validate-input.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/pgo/js-input/sunspider/string-validate-input.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<head>
+<!--
+ 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. 
+-->
+
+<title>SunSpider string-validate-input</title>
+
+</head>
+
+<body>
+<h3>string-validate-input</h3>
+<div id="console">
+</div>
+
+<script>
+
+var _sunSpiderStartDate = new Date();
+
+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
+   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);
+      }
+   }
+
+   // make up ZIP codes
+   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
+      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);
+          }
+      }
+      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);
+      }
+   }
+}
+
+function makeName(n)
+{
+   var tmp = "";
+   for (var i=0;i<n;i++)
+   {
+      var l = Math.floor(26*Math.random());
+      tmp += letters[l];
+   }
+   return tmp;
+}
+
+function makeNumber(n)
+{
+   var tmp = "";
+   for (var i=0;i<n;i++)
+   {
+      var l = Math.floor(9*Math.random());
+      tmp = tmp.concat(l);
+   }
+   return tmp;
+}
+
+function addResult(r)
+{
+   endResult += "\n" + r;
+}
+
+doTest();
+
+
+var _sunSpiderInterval = new Date() - _sunSpiderStartDate;
+
+document.getElementById("console").innerHTML = _sunSpiderInterval;
+</script>
+
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/sanitizers/lsan_suppressions.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/sanitizers/lsan_suppressions.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/sanitizers/lsan_suppressions.txt	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/sanitizers/lsan_suppressions.txt	2014-11-26 21:45:53.000000000 +0000
@@ -26,6 +26,8 @@
 leak:GI___strdup
 # The symbol is really __GI___strdup, but if you have the leading _, it doesn't suppress it.
 
+# Bug 1078015 - If the process terminates during a PR_Sleep, LSAN  detects a leak
+leak:PR_Sleep
 
 ###
 ### Bug 979928 - WebRTC leaks. m2, m3.
@@ -92,6 +94,7 @@
 ###
 
 leak:libcairo.so
+leak:libdl.so
 leak:libdricore.so
 leak:libGL.so
 leak:libglib-2.0.so
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/valgrind/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/valgrind/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/valgrind/mach_commands.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/valgrind/mach_commands.py	2014-11-26 21:45:53.000000000 +0000
@@ -108,7 +108,8 @@
                 '--num-callers=36',
                 '--leak-check=full',
                 '--show-possibly-lost=no',
-                '--track-origins=yes'
+                '--track-origins=yes',
+                '--trace-children=yes',
             ]
 
             for s in suppressions:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/virtualenv_packages.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/virtualenv_packages.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/build/virtualenv_packages.txt	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/build/virtualenv_packages.txt	2014-11-26 21:45:53.000000000 +0000
@@ -23,3 +23,5 @@
 packages.txt:testing/mozbase/packages.txt
 objdir:build
 gyp.pth:media/webrtc/trunk/tools/gyp/pylib
+pyasn1.pth:python/pyasn1
+bitstring.pth:python/bitstring
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/caps/nsScriptSecurityManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/caps/nsScriptSecurityManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/caps/nsScriptSecurityManager.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/caps/nsScriptSecurityManager.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -332,7 +332,7 @@
         }
 
         if (loadInfo->GetForceInheritPrincipal()) {
-            NS_ADDREF(*aPrincipal = loadInfo->LoadingPrincipal());
+            NS_ADDREF(*aPrincipal = loadInfo->TriggeringPrincipal());
             return NS_OK;
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/CLOBBER thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/CLOBBER
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/CLOBBER	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/CLOBBER	2014-11-26 21:45:44.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 1095234 - Bug 1091260 stopped packaging a devtools file with EXTRA_JS_MODULES while making it require pre-processing.
+Bug 1102488 - Changes to Android build system.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/config/recurse.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/config/recurse.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/config/recurse.mk	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/config/recurse.mk	2014-11-26 21:45:54.000000000 +0000
@@ -141,6 +141,10 @@
 # Interdependencies for parallel export.
 js/xpconnect/src/export: dom/bindings/export xpcom/xpidl/export
 accessible/xpcom/export: xpcom/xpidl/export
+
+# The widget binding generator code is part of the annotationProcessors.
+widget/android/bindings/export: build/annotationProcessors/export
+
 ifdef ENABLE_CLANG_PLUGIN
 $(filter-out build/clang-plugin/%,$(compile_targets)): build/clang-plugin/target build/clang-plugin/tests/target
 build/clang-plugin/tests/target: build/clang-plugin/target
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/config/rules.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/config/rules.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/config/rules.mk	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/config/rules.mk	2014-11-26 21:45:54.000000000 +0000
@@ -1161,10 +1161,11 @@
 ifndef NO_DIST_INSTALL
 _XPT_NAME_FILES := $(DEPTH)/config/makefiles/xpidl/xpt/$(XPT_NAME)
 _XPT_NAME_DEST := $(FINAL_TARGET)/components
+_XPT_NAME_TARGET := misc
 INSTALL_TARGETS += _XPT_NAME
 
 ifndef NO_INTERFACES_MANIFEST
-libs:: $(call mkdir_deps,$(FINAL_TARGET)/components)
+misc:: $(call mkdir_deps,$(FINAL_TARGET)/components)
 	$(call py_action,buildlist,$(FINAL_TARGET)/components/interfaces.manifest 'interfaces $(XPT_NAME)')
 	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest components/interfaces.manifest')
 endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/configure.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/configure.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/configure.in	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/configure.in	2014-11-26 21:45:54.000000000 +0000
@@ -71,7 +71,7 @@
 GIO_VERSION=2.20
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
-SQLITE_VERSION=3.8.7.1
+SQLITE_VERSION=3.8.7.2
 
 MSMANIFEST_TOOL=
 
@@ -1459,6 +1459,7 @@
     # -Wignored-qualifiers - catches returns types with qualifiers like const
     # -Wint-to-pointer-cast - catches cast to pointer from integer of different size
     # -Wmultichar - catches multicharacter integer constants like 'THIS'
+    # -Wnon-literal-null-conversion - catches expressions used as a null pointer constant
     # -Wnonnull - catches NULL used with functions arguments marked as non-null
     # -Wpointer-arith - catches pointer arithmetic using NULL or sizeof(void)
     # -Wpointer-sign - catches mixing pointers to signed and unsigned types
@@ -1493,6 +1494,8 @@
         _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=sequence-point"
         _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=trigraphs"
         _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=unknown-pragmas"
+
+        MOZ_C_SUPPORTS_WARNING(-Werror=, non-literal-null-conversion, ac_c_has_werror_non_literal_null_conversion)
     fi
 
     # Turn off the following warnings that -Wall turns on:
@@ -1552,6 +1555,7 @@
     # -Wendif-labels - catches `#else FOO` and `#endif FOO` not in comment
     # -Wint-to-pointer-cast - catches cast to pointer from integer of different size
     # -Wmissing-braces - catches aggregate initializers missing nested braces
+    # -Wnon-literal-null-conversion - catches expressions used as a null pointer constant
     # -Woverloaded-virtual - function declaration hides virtual function from base class
     # -Wparentheses - catches `if (a=b)` and operator precedence bugs
     # -Wpointer-arith - catches pointer arithmetic using NULL or sizeof(void)
@@ -1583,6 +1587,8 @@
         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=trigraphs"
         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=type-limits"
         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=unused-label"
+
+        MOZ_CXX_SUPPORTS_WARNING(-Werror=, non-literal-null-conversion, ac_cxx_has_werror_non_literal_null_conversion)
     fi
 
     # Turn off the following warnings that -Wall turns on:
@@ -2206,7 +2212,7 @@
         if test "$CPU_ARCH" = "x86"; then
             WIN32_SUBSYSTEM_VERSION=5.01
         else
-            WIN32_SUBSYSTEM_VERSION=5.02
+            WIN32_SUBSYSTEM_VERSION=6.01
         fi
         WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
         WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
@@ -3982,13 +3988,7 @@
   XULRUNNER_STUB_NAME=$withval)
 
 if test -z "$XULRUNNER_STUB_NAME"; then
-  case "$target_os" in
-  darwin*)
-    XULRUNNER_STUB_NAME=xulrunner
-    ;;
-  *)
-    XULRUNNER_STUB_NAME=xulrunner-stub
-  esac
+  XULRUNNER_STUB_NAME=xulrunner-stub
 fi
 AC_SUBST(XULRUNNER_STUB_NAME)
 
@@ -5935,53 +5935,57 @@
   ######################################
   # Find _43 for use by XP.
 
-  # Get the SDK path from the registry.
-  # First try to get the June 2010 SDK
-  MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK (June 2010)' | head -n 1`
-  if test -z "$MOZ_DIRECTX_SDK_REG_KEY" ; then
-    # Otherwise just take whatever comes first
-    MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK' | head -n 1`
-  fi
-  MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's/.*\([[a-zA-Z]]\)\\:\\\\/\\1\\:\\\\/' | sed 's,\\\\,/,g'`
-
-  if test -n "$MOZ_DIRECTX_SDK_PATH" &&
-     test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_D3D_CPU_SUFFIX/dxguid.lib ; then
-    AC_MSG_RESULT([Found DirectX SDK via registry, using $MOZ_DIRECTX_SDK_PATH])
+  if test "$HAVE_64BIT_BUILD"; then
+    AC_MSG_RESULT([We are building a 64-bit binary, skip checking d3dcompiler_43.])
   else
-    AC_MSG_RESULT([DirectX SDK not found.])
-    MOZ_DIRECTX_SDK_PATH=
-  fi
-
-  # Check that our DirectX SDK is acceptable.
-  if test -n "$MOZ_DIRECTX_SDK_PATH"; then
-    if test -n "`echo $MOZ_DIRECTX_SDK_REG_KEY | grep 'February 2010'`" ; then
-      AC_MSG_RESULT([Found the February 2010 DirectX SDK, which is unacceptable to ANGLE.])
+    # Get the SDK path from the registry.
+    # First try to get the June 2010 SDK
+    MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK (June 2010)' | head -n 1`
+    if test -z "$MOZ_DIRECTX_SDK_REG_KEY" ; then
+      # Otherwise just take whatever comes first
+      MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK' | head -n 1`
+    fi
+    MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's/.*\([[a-zA-Z]]\)\\:\\\\/\\1\\:\\\\/' | sed 's,\\\\,/,g'`
+
+    if test -n "$MOZ_DIRECTX_SDK_PATH" &&
+       test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_D3D_CPU_SUFFIX/dxguid.lib ; then
+      AC_MSG_RESULT([Found DirectX SDK via registry, using $MOZ_DIRECTX_SDK_PATH])
+    else
+      AC_MSG_RESULT([DirectX SDK not found.])
       MOZ_DIRECTX_SDK_PATH=
     fi
-  fi
 
-  if test -n "$MOZ_DIRECTX_SDK_PATH"; then
-    # Find a D3D compiler DLL in the DirectX SDK, if we didn't find one already.
-    # Get the SDK numeric version (e.g. 43) by looking at the dependencies of d3dx9.lib
-    MOZ_D3DX9_VERSION=`dumpbin //headers "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_D3D_CPU_SUFFIX/d3dx9.lib | egrep d3dx9_[[0-9]][[0-9]]\.dll | head -n1 | sed 's/.*\([[0-9]][[0-9]]\).*/\\1/g'`
+    # Check that our DirectX SDK is acceptable.
+    if test -n "$MOZ_DIRECTX_SDK_PATH"; then
+      if test -n "`echo $MOZ_DIRECTX_SDK_REG_KEY | grep 'February 2010'`" ; then
+        AC_MSG_RESULT([Found the February 2010 DirectX SDK, which is unacceptable to ANGLE.])
+        MOZ_DIRECTX_SDK_PATH=
+      fi
+    fi
+
+    if test -n "$MOZ_DIRECTX_SDK_PATH"; then
+      # Find a D3D compiler DLL in the DirectX SDK, if we didn't find one already.
+      # Get the SDK numeric version (e.g. 43) by looking at the dependencies of d3dx9.lib
+      MOZ_D3DX9_VERSION=`dumpbin //headers "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_D3D_CPU_SUFFIX/d3dx9.lib | egrep d3dx9_[[0-9]][[0-9]]\.dll | head -n1 | sed 's/.*\([[0-9]][[0-9]]\).*/\\1/g'`
 
-    if test -n "$MOZ_D3DX9_VERSION" ; then
-      MOZ_D3DCOMPILER_XP_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *D3DCompiler_${MOZ_D3DX9_VERSION}_${MOZ_D3D_CPU_SUFFIX}.cab | head -n1`
+      if test -n "$MOZ_D3DX9_VERSION" ; then
+        MOZ_D3DCOMPILER_XP_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *D3DCompiler_${MOZ_D3DX9_VERSION}_${MOZ_D3D_CPU_SUFFIX}.cab | head -n1`
 
-      if test -n "$MOZ_D3DCOMPILER_XP_CAB"; then
-        MOZ_D3DCOMPILER_XP_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll
+        if test -n "$MOZ_D3DCOMPILER_XP_CAB"; then
+          MOZ_D3DCOMPILER_XP_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll
+        else
+          AC_MSG_RESULT([Couldn't find a CAB containing the D3D compiler DLL.])
+          AC_MSG_ERROR([DirectX SDK at "$MOZ_DIRECTX_SDK_PATH" appears broken.])
+          MOZ_DIRECTX_SDK_PATH=
+        fi
       else
-        AC_MSG_RESULT([Couldn't find a CAB containing the D3D compiler DLL.])
-        AC_MSG_ERROR([DirectX SDK at "$MOZ_DIRECTX_SDK_PATH" appears broken.])
+        AC_MSG_RESULT([Couldn't determine the D3DX9 version for the DirectX SDK.])
         MOZ_DIRECTX_SDK_PATH=
       fi
     else
-      AC_MSG_RESULT([Couldn't determine the D3DX9 version for the DirectX SDK.])
-      MOZ_DIRECTX_SDK_PATH=
+      AC_MSG_RESULT([Couldn't find an acceptable DirectX SDK for ANGLE, needed for d3dcompiler_43.])
+      AC_MSG_RESULT([  Either ignore, install DirectX SDK (June 2010 version or newer), or reconfigure with --disable-webgl.])
     fi
-  else
-    AC_MSG_RESULT([Couldn't find an acceptable DirectX SDK for ANGLE, needed for d3dcompiler_43.])
-    AC_MSG_RESULT([  Either ignore, install DirectX SDK (June 2010 version or newer), or reconfigure with --disable-webgl.])
   fi
 
   ######################################
@@ -7155,6 +7159,7 @@
     dnl deliberate choice not to enable it (bug 702250, for instance)
     AC_MSG_ERROR([--enable-replace-malloc requires --enable-jemalloc])
 elif test -n "$MOZ_REPLACE_MALLOC"; then
+    AC_DEFINE(MOZ_REPLACE_MALLOC)
     MOZ_NATIVE_JEMALLOC=
 
     dnl Replace-malloc Mac linkage quirks
@@ -7299,7 +7304,7 @@
 if test "$OS_TARGET" = Android; then
     MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=PR_GetEnv,--wrap=PR_SetEnv"
     if test "$MOZ_WIDGET_TOOLKIT" = gonk -a -n "$MOZ_NUWA_PROCESS"; then
-        MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=pthread_create,--wrap=epoll_wait,--wrap=poll,--wrap=pthread_cond_timedwait,--wrap=__pthread_cond_timedwait,--wrap=pthread_cond_wait,--wrap=epoll_create,--wrap=epoll_ctl,--wrap=close,--wrap=pthread_key_create,--wrap=pthread_key_delete,--wrap=socketpair,--wrap=pthread_self,--wrap=pthread_mutex_lock,--wrap=pthread_join,--wrap=pipe,--wrap=pipe2,--wrap=tgkill"
+        MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=pthread_create,--wrap=epoll_wait,--wrap=poll,--wrap=pthread_cond_timedwait,--wrap=__pthread_cond_timedwait,--wrap=pthread_cond_wait,--wrap=epoll_create,--wrap=epoll_ctl,--wrap=close,--wrap=pthread_key_create,--wrap=pthread_key_delete,--wrap=socketpair,--wrap=pthread_self,--wrap=pthread_mutex_lock,--wrap=pthread_join,--wrap=pipe,--wrap=pipe2"
     fi
 fi
 
@@ -7377,17 +7382,7 @@
 MOZ_ARG_DISABLE_BOOL(elf-hack,
 [  --disable-elf-hack      Disable elf hacks],
     [USE_ELF_HACK=],
-    [USE_ELF_HACK=F # Force enable elf-hack])
-
-# Disable elf hack for profiling because the built in profiler
-# doesn't read the segments properly with elf hack. This is
-# temporary and should be fixed soon in the profiler.
-if test "$MOZ_PROFILING" = 1; then
-  if test "$USE_ELF_HACK" = F; then
-    AC_ERROR([--enable-elf-hack is not compatible with --enable-profiling])
-  fi
-  USE_ELF_HACK=
-fi
+    [USE_ELF_HACK=1])
 
 # Only enable elfhack where supported
 if test "$USE_ELF_HACK" = 1; then
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/db/sqlite3/README.MOZILLA thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/db/sqlite3/README.MOZILLA
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/db/sqlite3/README.MOZILLA	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/db/sqlite3/README.MOZILLA	2014-11-26 21:45:54.000000000 +0000
@@ -1,6 +1,4 @@
-This is SQLite 3.8.7.1
-
--- Ryan VanderMeulen <ryanvm@gmail.com>, 11/2014
+This is SQLite 3.8.7.2
 
 See http://www.sqlite.org/ for more info.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/db/sqlite3/src/sqlite3.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/db/sqlite3/src/sqlite3.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/db/sqlite3/src/sqlite3.c	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/db/sqlite3/src/sqlite3.c	2014-11-26 21:45:54.000000000 +0000
@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.8.7.1.  By combining all the individual C code files into this 
+** version 3.8.7.2.  By combining all the individual C code files into this 
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -231,9 +231,9 @@
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.8.7.1"
+#define SQLITE_VERSION        "3.8.7.2"
 #define SQLITE_VERSION_NUMBER 3008007
-#define SQLITE_SOURCE_ID      "2014-10-29 13:59:56 3b7b72c4685aa5cf5e675c2c47ebec10d9704221"
+#define SQLITE_SOURCE_ID      "2014-11-18 20:57:56 2ab564bf9655b7c7b97ab85cafc8a48329b27f93"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -9013,7 +9013,7 @@
 SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree*, const char *zMaster);
 SQLITE_PRIVATE int sqlite3BtreeCommitPhaseTwo(Btree*, int);
 SQLITE_PRIVATE int sqlite3BtreeCommit(Btree*);
-SQLITE_PRIVATE int sqlite3BtreeRollback(Btree*,int);
+SQLITE_PRIVATE int sqlite3BtreeRollback(Btree*,int,int);
 SQLITE_PRIVATE int sqlite3BtreeBeginStmt(Btree*,int);
 SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree*, int*, int flags);
 SQLITE_PRIVATE int sqlite3BtreeIsInTrans(Btree*);
@@ -9046,7 +9046,7 @@
 SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree*, int, int*);
 SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree*, int, int*);
 SQLITE_PRIVATE int sqlite3BtreeClearTableOfCursor(BtCursor*);
-SQLITE_PRIVATE void sqlite3BtreeTripAllCursors(Btree*, int);
+SQLITE_PRIVATE int sqlite3BtreeTripAllCursors(Btree*, int, int);
 
 SQLITE_PRIVATE void sqlite3BtreeGetMeta(Btree *pBtree, int idx, u32 *pValue);
 SQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree*, int idx, u32 value);
@@ -13062,7 +13062,7 @@
 SQLITE_PRIVATE void sqlite3StrAccumInit(StrAccum*, char*, int, int);
 SQLITE_PRIVATE void sqlite3StrAccumAppend(StrAccum*,const char*,int);
 SQLITE_PRIVATE void sqlite3StrAccumAppendAll(StrAccum*,const char*);
-SQLITE_PRIVATE void sqlite3AppendSpace(StrAccum*,int);
+SQLITE_PRIVATE void sqlite3AppendChar(StrAccum*,int,char);
 SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum*);
 SQLITE_PRIVATE void sqlite3StrAccumReset(StrAccum*);
 SQLITE_PRIVATE void sqlite3SelectDestInit(SelectDest*,int,int);
@@ -20947,7 +20947,7 @@
   const et_info *infop;      /* Pointer to the appropriate info structure */
   char *zOut;                /* Rendering buffer */
   int nOut;                  /* Size of the rendering buffer */
-  char *zExtra;              /* Malloced memory used by some conversion */
+  char *zExtra = 0;          /* Malloced memory used by some conversion */
 #ifndef SQLITE_OMIT_FLOATING_POINT
   int  exp, e2;              /* exponent of real numbers */
   int nsd;                   /* Number of significant digits returned */
@@ -21064,7 +21064,6 @@
         break;
       }
     }
-    zExtra = 0;
 
     /*
     ** At this point, variables are initialized as follows:
@@ -21355,13 +21354,16 @@
         }else{
           c = va_arg(ap,int);
         }
-        buf[0] = (char)c;
-        if( precision>=0 ){
-          for(idx=1; idx<precision; idx++) buf[idx] = (char)c;
-          length = precision;
-        }else{
-          length =1;
+        if( precision>1 ){
+          width -= precision-1;
+          if( width>1 && !flag_leftjustify ){
+            sqlite3AppendChar(pAccum, width-1, ' ');
+            width = 0;
+          }
+          sqlite3AppendChar(pAccum, precision-1, c);
         }
+        length = 1;
+        buf[0] = c;
         bufpt = buf;
         break;
       case etSTRING:
@@ -21462,11 +21464,14 @@
     ** the output.
     */
     width -= length;
-    if( width>0 && !flag_leftjustify ) sqlite3AppendSpace(pAccum, width);
+    if( width>0 && !flag_leftjustify ) sqlite3AppendChar(pAccum, width, ' ');
     sqlite3StrAccumAppend(pAccum, bufpt, length);
-    if( width>0 && flag_leftjustify ) sqlite3AppendSpace(pAccum, width);
+    if( width>0 && flag_leftjustify ) sqlite3AppendChar(pAccum, width, ' ');
 
-    if( zExtra ) sqlite3_free(zExtra);
+    if( zExtra ){
+      sqlite3_free(zExtra);
+      zExtra = 0;
+    }
   }/* End for loop over the format string */
 } /* End of function */
 
@@ -21519,11 +21524,11 @@
 }
 
 /*
-** Append N space characters to the given string buffer.
+** Append N copies of character c to the given string buffer.
 */
-SQLITE_PRIVATE void sqlite3AppendSpace(StrAccum *p, int N){
+SQLITE_PRIVATE void sqlite3AppendChar(StrAccum *p, int N, char c){
   if( p->nChar+N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ) return;
-  while( (N--)>0 ) p->zText[p->nChar++] = ' ';
+  while( (N--)>0 ) p->zText[p->nChar++] = c;
 }
 
 /*
@@ -50636,7 +50641,6 @@
     }
     if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
   }
-  assert( rc==SQLITE_OK );
   return rc;
 }
 
@@ -51715,6 +51719,11 @@
 **
 ** Fields in this structure are accessed under the BtShared.mutex
 ** found at self->pBt->mutex. 
+**
+** skipNext meaning:
+**    eState==SKIPNEXT && skipNext>0:  Next sqlite3BtreeNext() is no-op.
+**    eState==SKIPNEXT && skipNext<0:  Next sqlite3BtreePrevious() is no-op.
+**    eState==FAULT:                   Cursor fault with skipNext as error code.
 */
 struct BtCursor {
   Btree *pBtree;            /* The Btree to which this cursor belongs */
@@ -51727,7 +51736,8 @@
   void *pKey;               /* Saved key that was cursor last known position */
   Pgno pgnoRoot;            /* The root page of this tree */
   int nOvflAlloc;           /* Allocated size of aOverflow[] array */
-  int skipNext;    /* Prev() is noop if negative. Next() is noop if positive */
+  int skipNext;    /* Prev() is noop if negative. Next() is noop if positive.
+                   ** Error code if eState==CURSOR_FAULT */
   u8 curFlags;              /* zero or more BTCF_* flags defined below */
   u8 eState;                /* One of the CURSOR_XXX constants (see below) */
   u8 hints;                             /* As configured by CursorSetHints() */
@@ -51773,7 +51783,7 @@
 **   on a different connection that shares the BtShared cache with this
 **   cursor.  The error has left the cache in an inconsistent state.
 **   Do nothing else with this cursor.  Any attempt to use the cursor
-**   should return the error code stored in BtCursor.skip
+**   should return the error code stored in BtCursor.skipNext
 */
 #define CURSOR_INVALID           0
 #define CURSOR_VALID             1
@@ -54355,7 +54365,7 @@
   ** The call to sqlite3BtreeRollback() drops any table-locks held by
   ** this handle.
   */
-  sqlite3BtreeRollback(p, SQLITE_OK);
+  sqlite3BtreeRollback(p, SQLITE_OK, 0);
   sqlite3BtreeLeave(p);
 
   /* If there are still other outstanding references to the shared-btree
@@ -55648,60 +55658,91 @@
 
 /*
 ** This routine sets the state to CURSOR_FAULT and the error
-** code to errCode for every cursor on BtShared that pBtree
-** references.
+** code to errCode for every cursor on any BtShared that pBtree
+** references.  Or if the writeOnly flag is set to 1, then only
+** trip write cursors and leave read cursors unchanged.
+**
+** Every cursor is a candidate to be tripped, including cursors
+** that belong to other database connections that happen to be
+** sharing the cache with pBtree.
+**
+** This routine gets called when a rollback occurs. If the writeOnly
+** flag is true, then only write-cursors need be tripped - read-only
+** cursors save their current positions so that they may continue 
+** following the rollback. Or, if writeOnly is false, all cursors are 
+** tripped. In general, writeOnly is false if the transaction being
+** rolled back modified the database schema. In this case b-tree root
+** pages may be moved or deleted from the database altogether, making
+** it unsafe for read cursors to continue.
+**
+** If the writeOnly flag is true and an error is encountered while 
+** saving the current position of a read-only cursor, all cursors, 
+** including all read-cursors are tripped.
 **
-** Every cursor is tripped, including cursors that belong
-** to other database connections that happen to be sharing
-** the cache with pBtree.
-**
-** This routine gets called when a rollback occurs.
-** All cursors using the same cache must be tripped
-** to prevent them from trying to use the btree after
-** the rollback.  The rollback may have deleted tables
-** or moved root pages, so it is not sufficient to
-** save the state of the cursor.  The cursor must be
-** invalidated.
+** SQLITE_OK is returned if successful, or if an error occurs while
+** saving a cursor position, an SQLite error code.
 */
-SQLITE_PRIVATE void sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode){
+SQLITE_PRIVATE int sqlite3BtreeTripAllCursors(Btree *pBtree, int errCode, int writeOnly){
   BtCursor *p;
-  if( pBtree==0 ) return;
-  sqlite3BtreeEnter(pBtree);
-  for(p=pBtree->pBt->pCursor; p; p=p->pNext){
-    int i;
-    sqlite3BtreeClearCursor(p);
-    p->eState = CURSOR_FAULT;
-    p->skipNext = errCode;
-    for(i=0; i<=p->iPage; i++){
-      releasePage(p->apPage[i]);
-      p->apPage[i] = 0;
+  int rc = SQLITE_OK;
+
+  assert( (writeOnly==0 || writeOnly==1) && BTCF_WriteFlag==1 );
+  if( pBtree ){
+    sqlite3BtreeEnter(pBtree);
+    for(p=pBtree->pBt->pCursor; p; p=p->pNext){
+      int i;
+      if( writeOnly && (p->curFlags & BTCF_WriteFlag)==0 ){
+        if( p->eState==CURSOR_VALID ){
+          rc = saveCursorPosition(p);
+          if( rc!=SQLITE_OK ){
+            (void)sqlite3BtreeTripAllCursors(pBtree, rc, 0);
+            break;
+          }
+        }
+      }else{
+        sqlite3BtreeClearCursor(p);
+        p->eState = CURSOR_FAULT;
+        p->skipNext = errCode;
+      }
+      for(i=0; i<=p->iPage; i++){
+        releasePage(p->apPage[i]);
+        p->apPage[i] = 0;
+      }
     }
+    sqlite3BtreeLeave(pBtree);
   }
-  sqlite3BtreeLeave(pBtree);
+  return rc;
 }
 
 /*
-** Rollback the transaction in progress.  All cursors will be
-** invalided by this operation.  Any attempt to use a cursor
-** that was open at the beginning of this operation will result
-** in an error.
+** Rollback the transaction in progress.
+**
+** If tripCode is not SQLITE_OK then cursors will be invalidated (tripped).
+** Only write cursors are tripped if writeOnly is true but all cursors are
+** tripped if writeOnly is false.  Any attempt to use
+** a tripped cursor will result in an error.
 **
 ** This will release the write lock on the database file.  If there
 ** are no active cursors, it also releases the read lock.
 */
-SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p, int tripCode){
+SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p, int tripCode, int writeOnly){
   int rc;
   BtShared *pBt = p->pBt;
   MemPage *pPage1;
 
+  assert( writeOnly==1 || writeOnly==0 );
+  assert( tripCode==SQLITE_ABORT_ROLLBACK || tripCode==SQLITE_OK );
   sqlite3BtreeEnter(p);
   if( tripCode==SQLITE_OK ){
     rc = tripCode = saveAllCursors(pBt, 0, 0);
+    if( rc ) writeOnly = 0;
   }else{
     rc = SQLITE_OK;
   }
   if( tripCode ){
-    sqlite3BtreeTripAllCursors(p, tripCode);
+    int rc2 = sqlite3BtreeTripAllCursors(p, tripCode, writeOnly);
+    assert( rc==SQLITE_OK || (writeOnly==0 && rc2==SQLITE_OK) );
+    if( rc2!=SQLITE_OK ) rc = rc2;
   }
   btreeIntegrity(p);
 
@@ -56036,13 +56077,9 @@
 */
 SQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor *pCur, i64 *pSize){
   assert( cursorHoldsMutex(pCur) );
-  assert( pCur->eState==CURSOR_INVALID || pCur->eState==CURSOR_VALID );
-  if( pCur->eState!=CURSOR_VALID ){
-    *pSize = 0;
-  }else{
-    getCellInfo(pCur);
-    *pSize = pCur->info.nKey;
-  }
+  assert( pCur->eState==CURSOR_VALID );
+  getCellInfo(pCur);
+  *pSize = pCur->info.nKey;
   return SQLITE_OK;
 }
 
@@ -61466,7 +61503,7 @@
   }
 
   /* If a transaction is still open on the Btree, roll it back. */
-  sqlite3BtreeRollback(p->pDest, SQLITE_OK);
+  sqlite3BtreeRollback(p->pDest, SQLITE_OK, 0);
 
   /* Set the error code of the destination database handle. */
   rc = (p->rc==SQLITE_DONE) ? SQLITE_OK : p->rc;
@@ -71304,7 +71341,7 @@
         pC->payloadSize = pC->szRow = avail = pReg->n;
         pC->aRow = (u8*)pReg->z;
       }else{
-        MemSetTypeFlag(pDest, MEM_Null);
+        sqlite3VdbeMemSetNull(pDest);
         goto op_column_out;
       }
     }else{
@@ -71828,11 +71865,18 @@
         db->isTransactionSavepoint = 0;
         rc = p->rc;
       }else{
+        int isSchemaChange;
         iSavepoint = db->nSavepoint - iSavepoint - 1;
         if( p1==SAVEPOINT_ROLLBACK ){
+          isSchemaChange = (db->flags & SQLITE_InternChanges)!=0;
           for(ii=0; ii<db->nDb; ii++){
-            sqlite3BtreeTripAllCursors(db->aDb[ii].pBt, SQLITE_ABORT);
+            rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt,
+                                       SQLITE_ABORT_ROLLBACK,
+                                       isSchemaChange==0);
+            if( rc!=SQLITE_OK ) goto abort_due_to_error;
           }
+        }else{
+          isSchemaChange = 0;
         }
         for(ii=0; ii<db->nDb; ii++){
           rc = sqlite3BtreeSavepoint(db->aDb[ii].pBt, p1, iSavepoint);
@@ -71840,7 +71884,7 @@
             goto abort_due_to_error;
           }
         }
-        if( p1==SAVEPOINT_ROLLBACK && (db->flags&SQLITE_InternChanges)!=0 ){
+        if( isSchemaChange ){
           sqlite3ExpirePreparedStatements(db);
           sqlite3ResetAllSchemasOfConnection(db);
           db->flags = (db->flags | SQLITE_InternChanges);
@@ -72237,7 +72281,7 @@
           || p->readOnly==0 );
 
   if( p->expired ){
-    rc = SQLITE_ABORT;
+    rc = SQLITE_ABORT_ROLLBACK;
     break;
   }
 
@@ -73404,6 +73448,10 @@
     assert( pC->pCursor!=0 );
     rc = sqlite3VdbeCursorRestore(pC);
     if( rc ) goto abort_due_to_error;
+    if( pC->nullRow ){
+      pOut->flags = MEM_Null;
+      break;
+    }
     rc = sqlite3BtreeKeySize(pC->pCursor, &v);
     assert( rc==SQLITE_OK );  /* Always so because of CursorRestore() above */
   }
@@ -82435,7 +82483,6 @@
         assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
         pSelect->iLimit = 0;
         testcase( pSelect->selFlags & SF_Distinct );
-        pSelect->selFlags &= ~SF_Distinct;
         testcase( pKeyInfo==0 ); /* Caused by OOM in sqlite3KeyInfoAlloc() */
         if( sqlite3Select(pParse, pSelect, &dest) ){
           sqlite3KeyInfoUnref(pKeyInfo);
@@ -125927,13 +125974,15 @@
 
 /*
 ** Rollback all database files.  If tripCode is not SQLITE_OK, then
-** any open cursors are invalidated ("tripped" - as in "tripping a circuit
+** any write cursors are invalidated ("tripped" - as in "tripping a circuit
 ** breaker") and made to return tripCode if there are any further
-** attempts to use that cursor.
+** attempts to use that cursor.  Read cursors remain open and valid
+** but are "saved" in case the table pages are moved around.
 */
 SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
   int i;
   int inTrans = 0;
+  int schemaChange;
   assert( sqlite3_mutex_held(db->mutex) );
   sqlite3BeginBenignMalloc();
 
@@ -125944,6 +125993,7 @@
   ** the database rollback and schema reset, which can cause false
   ** corruption reports in some cases.  */
   sqlite3BtreeEnterAll(db);
+  schemaChange = (db->flags & SQLITE_InternChanges)!=0 && db->init.busy==0;
 
   for(i=0; i<db->nDb; i++){
     Btree *p = db->aDb[i].pBt;
@@ -125951,7 +126001,7 @@
       if( sqlite3BtreeIsInTrans(p) ){
         inTrans = 1;
       }
-      sqlite3BtreeRollback(p, tripCode);
+      sqlite3BtreeRollback(p, tripCode, !schemaChange);
     }
   }
   sqlite3VtabRollback(db);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/db/sqlite3/src/sqlite3.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/db/sqlite3/src/sqlite3.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/db/sqlite3/src/sqlite3.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/db/sqlite3/src/sqlite3.h	2014-11-26 21:45:54.000000000 +0000
@@ -107,9 +107,9 @@
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.8.7.1"
+#define SQLITE_VERSION        "3.8.7.2"
 #define SQLITE_VERSION_NUMBER 3008007
-#define SQLITE_SOURCE_ID      "2014-10-29 13:59:56 3b7b72c4685aa5cf5e675c2c47ebec10d9704221"
+#define SQLITE_SOURCE_ID      "2014-11-18 20:57:56 2ab564bf9655b7c7b97ab85cafc8a48329b27f93"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/LoadInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/LoadInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/LoadInfo.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/LoadInfo.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -14,18 +14,22 @@
 
 namespace mozilla {
 
-LoadInfo::LoadInfo(nsIPrincipal* aPrincipal,
+LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
+                   nsIPrincipal* aTriggeringPrincipal,
                    nsINode* aLoadingContext,
                    nsSecurityFlags aSecurityFlags,
                    nsContentPolicyType aContentPolicyType,
                    nsIURI* aBaseURI)
-  : mPrincipal(aPrincipal)
+  : mLoadingPrincipal(aLoadingPrincipal)
+  , mTriggeringPrincipal(aTriggeringPrincipal ?
+                         aTriggeringPrincipal : aLoadingPrincipal)
   , mLoadingContext(do_GetWeakReference(aLoadingContext))
   , mSecurityFlags(aSecurityFlags)
   , mContentPolicyType(aContentPolicyType)
   , mBaseURI(aBaseURI)
 {
-  MOZ_ASSERT(aPrincipal);
+  MOZ_ASSERT(aLoadingPrincipal);
+  MOZ_ASSERT(mTriggeringPrincipal);
   // if the load is sandboxed, we can not also inherit the principal
   if (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED) {
     mSecurityFlags ^= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
@@ -39,16 +43,29 @@
 NS_IMPL_ISUPPORTS(LoadInfo, nsILoadInfo)
 
 NS_IMETHODIMP
-LoadInfo::GetLoadingPrincipal(nsIPrincipal** aPrincipal)
+LoadInfo::GetLoadingPrincipal(nsIPrincipal** aLoadingPrincipal)
 {
-  NS_ADDREF(*aPrincipal = mPrincipal);
+  NS_ADDREF(*aLoadingPrincipal = mLoadingPrincipal);
   return NS_OK;
 }
 
 nsIPrincipal*
 LoadInfo::LoadingPrincipal()
 {
-  return mPrincipal;
+  return mLoadingPrincipal;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetTriggeringPrincipal(nsIPrincipal** aTriggeringPrincipal)
+{
+  NS_ADDREF(*aTriggeringPrincipal = mTriggeringPrincipal);
+  return NS_OK;
+}
+
+nsIPrincipal*
+LoadInfo::TriggeringPrincipal()
+{
+  return mTriggeringPrincipal;
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/LoadInfo.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/LoadInfo.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/LoadInfo.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/LoadInfo.h	2014-11-26 21:45:54.000000000 +0000
@@ -26,8 +26,9 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSILOADINFO
 
-  // aPrincipal MUST NOT BE NULL.
-  LoadInfo(nsIPrincipal* aPrincipal,
+  // aLoadingPrincipal MUST NOT BE NULL.
+  LoadInfo(nsIPrincipal* aLoadingPrincipal,
+           nsIPrincipal* aTriggeringPrincipal,
            nsINode* aLoadingContext,
            nsSecurityFlags aSecurityFlags,
            nsContentPolicyType aContentPolicyType,
@@ -36,7 +37,8 @@
 private:
   ~LoadInfo();
 
-  nsCOMPtr<nsIPrincipal> mPrincipal;
+  nsCOMPtr<nsIPrincipal> mLoadingPrincipal;
+  nsCOMPtr<nsIPrincipal> mTriggeringPrincipal;
   nsWeakPtr              mLoadingContext;
   nsSecurityFlags        mSecurityFlags;
   nsContentPolicyType    mContentPolicyType;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShell.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShell.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShell.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShell.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -38,6 +38,7 @@
 #include "nsDocShellCID.h"
 #include "nsDOMCID.h"
 #include "nsNetUtil.h"
+#include "mozilla/net/ReferrerPolicy.h"
 #include "nsRect.h"
 #include "prenv.h"
 #include "nsIDOMWindow.h"
@@ -554,6 +555,7 @@
   bool    requireSameHost;
   nsIURI *target;
   nsIURI *referrer;
+  uint32_t referrerPolicy;
 };
 
 static void
@@ -633,7 +635,7 @@
     // over an encrypted connection and its address does not have the same
     // origin as "ping URL", send a referrer.
     if (!sameOrigin && !referrerIsSecure)
-      httpChan->SetReferrer(info->referrer);
+      httpChan->SetReferrerWithPolicy(info->referrer, info->referrerPolicy);
   }
 
   nsCOMPtr<nsIUploadChannel2> uploadChan = do_QueryInterface(httpChan);
@@ -691,7 +693,10 @@
 
 // Spec: http://whatwg.org/specs/web-apps/current-work/#ping
 static void
-DispatchPings(nsIContent *content, nsIURI *target, nsIURI *referrer)
+DispatchPings(nsIContent *content,
+              nsIURI *target,
+              nsIURI *referrer,
+              uint32_t referrerPolicy)
 {
   SendPingInfo info;
 
@@ -703,6 +708,7 @@
   info.numPings = 0;
   info.target = target;
   info.referrer = referrer;
+  info.referrerPolicy = referrerPolicy;
 
   ForEachPing(content, SendPing, &info);
 }
@@ -854,7 +860,8 @@
     mDefaultLoadFlags(nsIRequest::LOAD_NORMAL),
     mFrameType(eFrameTypeRegular),
     mOwnOrContainingAppId(nsIScriptSecurityManager::UNKNOWN_APP_ID),
-    mParentCharsetSource(0)
+    mParentCharsetSource(0),
+    mJSRunToCompletionDepth(0)
 {
     mHistoryID = ++gDocshellIDCounter;
     if (gDocShellCount++ == 0) {
@@ -890,6 +897,8 @@
 
 nsDocShell::~nsDocShell()
 {
+    MOZ_ASSERT(!mProfileTimelineRecording);
+
     Destroy();
 
     nsCOMPtr<nsISHistoryInternal>
@@ -1343,6 +1352,7 @@
     bool inheritOwner = false;
     bool ownerIsExplicit = false;
     bool sendReferrer = true;
+    uint32_t referrerPolicy = mozilla::net::RP_Default;
     bool isSrcdoc = false;
     nsCOMPtr<nsISHEntry> shEntry;
     nsXPIDLString target;
@@ -1376,6 +1386,7 @@
         aLoadInfo->GetPostDataStream(getter_AddRefs(postStream));
         aLoadInfo->GetHeadersStream(getter_AddRefs(headersStream));
         aLoadInfo->GetSendReferrer(&sendReferrer);
+        aLoadInfo->GetReferrerPolicy(&referrerPolicy);
         aLoadInfo->GetIsSrcdocLoad(&isSrcdoc);
         aLoadInfo->GetSrcdocData(srcdoc);
         aLoadInfo->GetSourceDocShell(getter_AddRefs(sourceDocShell));
@@ -1599,6 +1610,7 @@
 
     return InternalLoad(aURI,
                         referrer,
+                        referrerPolicy,
                         owner,
                         flags,
                         target.get(),
@@ -2829,14 +2841,15 @@
 nsDocShell::SetRecordProfileTimelineMarkers(bool aValue)
 {
 #ifdef MOZ_ENABLE_PROFILER_SPS
-  bool currentValue;
-  GetRecordProfileTimelineMarkers(&currentValue);
+  bool currentValue = nsIDocShell::GetRecordProfileTimelineMarkers();
   if (currentValue != aValue) {
     if (aValue) {
       ++gProfileTimelineRecordingsCount;
+      UseEntryScriptProfiling();
       mProfileTimelineRecording = true;
     } else {
       --gProfileTimelineRecordingsCount;
+      UnuseEntryScriptProfiling();
       mProfileTimelineRecording = false;
       ClearProfileTimelineMarkers();
     }
@@ -2873,12 +2886,11 @@
   // If we see an unpaired START, we keep it around for the next call
   // to PopProfileTimelineMarkers.  We store the kept START objects in
   // this array.
-  nsTArray<InternalProfileTimelineMarker*> keptMarkers;
+  nsTArray<TimelineMarker*> keptMarkers;
 
   for (uint32_t i = 0; i < mProfileTimelineMarkers.Length(); ++i) {
-    ProfilerMarkerTracing* startPayload = static_cast<ProfilerMarkerTracing*>(
-      mProfileTimelineMarkers[i]->mPayload);
-    const char* startMarkerName = mProfileTimelineMarkers[i]->mName.get();
+    TimelineMarker* startPayload = mProfileTimelineMarkers[i];
+    const char* startMarkerName = startPayload->GetName();
 
     bool hasSeenPaintedLayer = false;
 
@@ -2894,16 +2906,15 @@
       // enough for the amount of markers to always be small enough that the
       // nested for loop isn't going to be a performance problem.
       for (uint32_t j = i + 1; j < mProfileTimelineMarkers.Length(); ++j) {
-        ProfilerMarkerTracing* endPayload = static_cast<ProfilerMarkerTracing*>(
-          mProfileTimelineMarkers[j]->mPayload);
-        const char* endMarkerName = mProfileTimelineMarkers[j]->mName.get();
+        TimelineMarker* endPayload = mProfileTimelineMarkers[j];
+        const char* endMarkerName = endPayload->GetName();
 
         // Look for Layer markers to stream out paint markers.
         if (strcmp(endMarkerName, "Layer") == 0) {
           hasSeenPaintedLayer = true;
         }
 
-        if (strcmp(startMarkerName, endMarkerName) != 0) {
+        if (!startPayload->Equals(endPayload)) {
           continue;
         }
         bool isPaint = strcmp(startMarkerName, "Paint") == 0;
@@ -2918,9 +2929,11 @@
             // But ignore paint start/end if no layer has been painted.
             if (!isPaint || (isPaint && hasSeenPaintedLayer)) {
               mozilla::dom::ProfileTimelineMarker marker;
-              marker.mName = NS_ConvertUTF8toUTF16(startMarkerName);
-              marker.mStart = mProfileTimelineMarkers[i]->mTime;
-              marker.mEnd = mProfileTimelineMarkers[j]->mTime;
+
+              marker.mName = NS_ConvertUTF8toUTF16(startPayload->GetName());
+              marker.mStart = startPayload->GetTime();
+              marker.mEnd = endPayload->GetTime();
+              startPayload->AddDetails(marker);
               profileTimelineMarkers.AppendElement(marker);
             }
 
@@ -2969,30 +2982,18 @@
 {
 #ifdef MOZ_ENABLE_PROFILER_SPS
   if (mProfileTimelineRecording) {
-    DOMHighResTimeStamp delta;
-    Now(&delta);
-    ProfilerMarkerTracing* payload = new ProfilerMarkerTracing("Timeline",
-                                                               aMetaData);
-    mProfileTimelineMarkers.AppendElement(
-      new InternalProfileTimelineMarker(aName, payload, delta));
+    TimelineMarker* marker = new TimelineMarker(this, aName, aMetaData);
+    mProfileTimelineMarkers.AppendElement(marker);
   }
 #endif
 }
 
 void
-nsDocShell::AddProfileTimelineMarker(const char* aName,
-                                     ProfilerBacktrace* aCause,
-                                     TracingMetadata aMetaData)
+nsDocShell::AddProfileTimelineMarker(UniquePtr<TimelineMarker>& aMarker)
 {
 #ifdef MOZ_ENABLE_PROFILER_SPS
   if (mProfileTimelineRecording) {
-    DOMHighResTimeStamp delta;
-    Now(&delta);
-    ProfilerMarkerTracing* payload = new ProfilerMarkerTracing("Timeline",
-                                                               aMetaData,
-                                                               aCause);
-    mProfileTimelineMarkers.AppendElement(
-      new InternalProfileTimelineMarker(aName, payload, delta));
+    mProfileTimelineMarkers.AppendElement(aMarker.release());
   }
 #endif
 }
@@ -4243,15 +4244,17 @@
                             int32_t aChildOffset, uint32_t loadType,
                             bool aCloneChildren)
 {
-    nsresult rv;
+    nsresult rv = NS_OK;
 
-    if (mLSHE && loadType != LOAD_PUSHSTATE && !aCloneRef) {
+    if (mLSHE && loadType != LOAD_PUSHSTATE) {
         /* You get here if you are currently building a 
          * hierarchy ie.,you just visited a frameset page
          */
         nsCOMPtr<nsISHContainer> container(do_QueryInterface(mLSHE, &rv));
         if (container) {
-            rv = container->AddChild(aNewEntry, aChildOffset);
+            if (NS_FAILED(container->ReplaceChild(aNewEntry))) {
+                rv = container->AddChild(aNewEntry, aChildOffset);
+            }
         }
     }
     else if (!aCloneRef) {
@@ -4260,8 +4263,22 @@
         if (container) {
             rv = container->AddChild(aNewEntry, aChildOffset);
         }
+    } else {
+        rv = AddChildSHEntryInternal(aCloneRef, aNewEntry, aChildOffset,
+                                     loadType, aCloneChildren);
     }
-    else if (mSessionHistory) {
+    return rv;
+}
+
+nsresult
+nsDocShell::AddChildSHEntryInternal(nsISHEntry* aCloneRef,
+                                    nsISHEntry* aNewEntry,
+                                    int32_t aChildOffset,
+                                    uint32_t aLoadType,
+                                    bool aCloneChildren)
+{
+    nsresult rv = NS_OK;
+    if (mSessionHistory) {
         /* You are currently in the rootDocShell.
          * You will get here when a subframe has a new url
          * to load and you have walked up the tree all the 
@@ -4300,16 +4317,17 @@
         nsCOMPtr<nsIDocShell> parent =
             do_QueryInterface(GetAsSupports(mParent), &rv);
         if (parent) {
-            rv = parent->AddChildSHEntry(aCloneRef, aNewEntry, aChildOffset,
-                                         loadType, aCloneChildren);
-        }          
+            rv = static_cast<nsDocShell*>(parent.get())->
+              AddChildSHEntryInternal(aCloneRef, aNewEntry, aChildOffset,
+                                      aLoadType, aCloneChildren);
+        }
     }
     return rv;
 }
 
 nsresult
-nsDocShell::DoAddChildSHEntry(nsISHEntry* aNewEntry, int32_t aChildOffset,
-                              bool aCloneChildren)
+nsDocShell::AddChildSHEntryToParent(nsISHEntry* aNewEntry, int32_t aChildOffset,
+                                    bool aCloneChildren)
 {
     /* You will get here when you are in a subframe and
      * a new url has been loaded on you. 
@@ -4844,10 +4862,11 @@
         formatStrCount = 1;
         error.AssignLiteral("netTimeout");
     }
-    else if (NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION == aError) {
+    else if (NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION == aError ||
+             NS_ERROR_CSP_FORM_ACTION_VIOLATION == aError) {
         // CSP error
         cssClass.AssignLiteral("neterror");
-        error.AssignLiteral("cspFrameAncestorBlocked");
+        error.AssignLiteral("cspBlocked");
     }
     else if (NS_ERROR_GET_MODULE(aError) == NS_ERROR_MODULE_SECURITY) {
         nsCOMPtr<nsINSSErrorsService> nsserr =
@@ -5243,8 +5262,8 @@
     rv = NS_NewURI(getter_AddRefs(errorPageURI), errorPageUrl);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    return InternalLoad(errorPageURI, nullptr, nullptr,
-                        INTERNAL_LOAD_FLAGS_INHERIT_OWNER, nullptr, nullptr,
+    return InternalLoad(errorPageURI, nullptr, mozilla::net::RP_Default,
+                        nullptr, INTERNAL_LOAD_FLAGS_INHERIT_OWNER, nullptr, nullptr,
                         NullString(), nullptr, nullptr, LOAD_ERROR_PAGE,
                         nullptr, true, NullString(), this, nullptr, nullptr,
                         nullptr);
@@ -5306,6 +5325,7 @@
         }
         rv = InternalLoad(mCurrentURI,
                           mReferrerURI,
+                          mReferrerPolicy,
                           principal,
                           flags,
                           nullptr,         // No window target
@@ -9208,7 +9228,8 @@
 class InternalLoadEvent : public nsRunnable
 {
 public:
-    InternalLoadEvent(nsDocShell* aDocShell, nsIURI * aURI, nsIURI * aReferrer,
+    InternalLoadEvent(nsDocShell* aDocShell, nsIURI * aURI,
+                      nsIURI * aReferrer, uint32_t aReferrerPolicy,
                       nsISupports * aOwner, uint32_t aFlags,
                       const char* aTypeHint, nsIInputStream * aPostData,
                       nsIInputStream * aHeadersData, uint32_t aLoadType,
@@ -9219,6 +9240,7 @@
         mDocShell(aDocShell),
         mURI(aURI),
         mReferrer(aReferrer),
+        mReferrerPolicy(aReferrerPolicy),
         mOwner(aOwner),
         mPostData(aPostData),
         mHeadersData(aHeadersData),
@@ -9236,7 +9258,9 @@
     }
 
     NS_IMETHOD Run() {
-        return mDocShell->InternalLoad(mURI, mReferrer, mOwner, mFlags,
+        return mDocShell->InternalLoad(mURI, mReferrer,
+                                       mReferrerPolicy,
+                                       mOwner, mFlags,
                                        nullptr, mTypeHint.get(),
                                        NullString(), mPostData, mHeadersData,
                                        mLoadType, mSHEntry, mFirstParty,
@@ -9254,6 +9278,7 @@
     nsRefPtr<nsDocShell> mDocShell;
     nsCOMPtr<nsIURI> mURI;
     nsCOMPtr<nsIURI> mReferrer;
+    uint32_t mReferrerPolicy;
     nsCOMPtr<nsISupports> mOwner;
     nsCOMPtr<nsIInputStream> mPostData;
     nsCOMPtr<nsIInputStream> mHeadersData;
@@ -9308,6 +9333,7 @@
 NS_IMETHODIMP
 nsDocShell::InternalLoad(nsIURI * aURI,
                          nsIURI * aReferrer,
+                         uint32_t aReferrerPolicy,
                          nsISupports * aOwner,
                          uint32_t aFlags,
                          const char16_t *aWindowTarget,
@@ -9564,6 +9590,7 @@
         if (NS_SUCCEEDED(rv) && targetDocShell) {
             rv = targetDocShell->InternalLoad(aURI,
                                               aReferrer,
+                                              aReferrerPolicy,
                                               owner,
                                               aFlags,
                                               nullptr,         // No window target
@@ -9644,7 +9671,8 @@
             
             // Do this asynchronously
             nsCOMPtr<nsIRunnable> ev =
-                new InternalLoadEvent(this, aURI, aReferrer, aOwner, aFlags,
+                new InternalLoadEvent(this, aURI, aReferrer,
+                                      aReferrerPolicy, aOwner, aFlags,
                                       aTypeHint, aPostData, aHeadersData,
                                       aLoadType, aSHEntry, aFirstParty, aSrcdoc,
                                       aSourceDocShell, aBaseURI);
@@ -10096,6 +10124,7 @@
     nsCOMPtr<nsIRequest> req;
     rv = DoURILoad(aURI, aReferrer,
                    !(aFlags & INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER),
+                   aReferrerPolicy,
                    owner, aTypeHint, aFileName, aPostData, aHeadersData,
                    aFirstParty, aDocShell, getter_AddRefs(req),
                    (aFlags & INTERNAL_LOAD_FLAGS_FIRST_LOAD) != 0,
@@ -10169,6 +10198,7 @@
 nsDocShell::DoURILoad(nsIURI * aURI,
                       nsIURI * aReferrerURI,
                       bool aSendReferrer,
+                      uint32_t aReferrerPolicy,
                       nsISupports * aOwner,
                       const char * aTypeHint,
                       const nsAString & aFileName,
@@ -10243,23 +10273,23 @@
     }
 
     bool isSandBoxed = mSandboxFlags & SANDBOXED_ORIGIN;
-    // only inherit if we have a requestingPrincipal
+    // only inherit if we have a triggeringPrincipal
     bool inherit = false;
 
-    nsCOMPtr<nsIPrincipal> requestingPrincipal = do_QueryInterface(aOwner);
-    if (requestingPrincipal) {
-      inherit = nsContentUtils::ChannelShouldInheritPrincipal(requestingPrincipal,
+    nsCOMPtr<nsIPrincipal> triggeringPrincipal = do_QueryInterface(aOwner);
+    if (triggeringPrincipal) {
+      inherit = nsContentUtils::ChannelShouldInheritPrincipal(triggeringPrincipal,
                                                               aURI,
                                                               true, // aInheritForAboutBlank
                                                               isSrcdoc);
     }
-    else if (!requestingPrincipal && aReferrerURI) {
+    else if (!triggeringPrincipal && aReferrerURI) {
       rv = CreatePrincipalFromReferrer(aReferrerURI,
-                                       getter_AddRefs(requestingPrincipal));
+                                       getter_AddRefs(triggeringPrincipal));
       NS_ENSURE_SUCCESS(rv, rv);
     }
     else {
-      requestingPrincipal = nsContentUtils::GetSystemPrincipal();
+      triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
     }
 
     nsSecurityFlags securityFlags = nsILoadInfo::SEC_NORMAL;
@@ -10272,11 +10302,13 @@
 
     if (!isSrcdoc) {
       nsCOMPtr<nsILoadInfo> loadInfo =
-        new mozilla::LoadInfo(requestingPrincipal,
-                              requestingNode,
-                              securityFlags,
-                              aContentPolicyType,
-                              aBaseURI);
+        new LoadInfo(requestingNode ?
+                       requestingNode->NodePrincipal() : triggeringPrincipal.get(),
+                     triggeringPrincipal,
+                     requestingNode,
+                     securityFlags,
+                     aContentPolicyType,
+                     aBaseURI);
         rv = NS_NewChannelInternal(getter_AddRefs(channel),
                                    aURI,
                                    loadInfo,
@@ -10314,7 +10346,9 @@
             rv = vsh->NewSrcdocChannel(aURI, aSrcdoc, getter_AddRefs(channel));
             NS_ENSURE_SUCCESS(rv, rv);
             nsCOMPtr<nsILoadInfo> loadInfo =
-              new LoadInfo(requestingPrincipal,
+              new LoadInfo(requestingNode ?
+                             requestingNode->NodePrincipal() : triggeringPrincipal.get(),
+                           triggeringPrincipal,
                            requestingNode,
                            securityFlags,
                            aContentPolicyType,
@@ -10327,7 +10361,9 @@
                                                   aSrcdoc,
                                                   NS_LITERAL_CSTRING("text/html"),
                                                   requestingNode,
-                                                  requestingPrincipal,
+                                                  requestingNode ?
+                                                    requestingNode->NodePrincipal() : triggeringPrincipal.get(),
+                                                  triggeringPrincipal,
                                                   securityFlags,
                                                   aContentPolicyType,
                                                   true,
@@ -10492,7 +10528,7 @@
         // Set the referrer explicitly
         if (aReferrerURI && aSendReferrer) {
             // Referrer is currenly only set for link clicks here.
-            httpChannel->SetReferrer(aReferrerURI);
+            httpChannel->SetReferrerWithPolicy(aReferrerURI, aReferrerPolicy);
         }
     }
 
@@ -10828,6 +10864,11 @@
         if (NS_SUCCEEDED(rv)) {
             SetReferrerURI(referrer);
         }
+        uint32_t referrerPolicy;
+        rv = httpChannel->GetReferrerPolicy(&referrerPolicy);
+        if (NS_SUCCEEDED(rv)) {
+            SetReferrerPolicy(referrerPolicy);
+        }
     }
 }
 
@@ -11095,6 +11136,12 @@
     mReferrerURI = aURI;        // This assigment addrefs
 }
 
+void
+nsDocShell::SetReferrerPolicy(uint32_t referrerPolicy)
+{
+    mReferrerPolicy = referrerPolicy;
+}
+
 //*****************************************************************************
 // nsDocShell: Session History
 //*****************************************************************************
@@ -11524,6 +11571,7 @@
     // Get the post data & referrer
     nsCOMPtr<nsIInputStream> inputStream;
     nsCOMPtr<nsIURI> referrerURI;
+    uint32_t referrerPolicy = mozilla::net::RP_Default;
     nsCOMPtr<nsISupports> cacheKey;
     nsCOMPtr<nsISupports> owner = aOwner;
     bool expired = false;
@@ -11550,6 +11598,7 @@
                 uploadChannel->GetUploadStream(getter_AddRefs(inputStream));
             }
             httpChannel->GetReferrer(getter_AddRefs(referrerURI));
+            httpChannel->GetReferrerPolicy(&referrerPolicy);
 
             discardLayoutState = ShouldDiscardLayoutState(httpChannel);
         }
@@ -11563,7 +11612,7 @@
                     owner = nsNullPrincipal::CreateWithInheritedAttributes(loadInfo->LoadingPrincipal());
                     NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE);
                 } else if (loadInfo->GetForceInheritPrincipal()) {
-                    owner = loadInfo->LoadingPrincipal();
+                    owner = loadInfo->TriggeringPrincipal();
                 }
             }
         }
@@ -11580,6 +11629,7 @@
                   mHistoryID,
                   mDynamicallyCreated);
     entry->SetReferrerURI(referrerURI);
+    entry->SetReferrerPolicy(referrerPolicy);
     nsCOMPtr<nsIInputStreamChannel> inStrmChan = do_QueryInterface(aChannel);
     if (inStrmChan) {
         bool isSrcdocChannel;
@@ -11653,7 +11703,7 @@
         // This is a subframe.
         if (!mOSHE || !LOAD_TYPE_HAS_FLAGS(mLoadType,
                                            LOAD_FLAGS_REPLACE_HISTORY))
-            rv = DoAddChildSHEntry(entry, mChildOffset, aCloneChildren);
+            rv = AddChildSHEntryToParent(entry, mChildOffset, aCloneChildren);
     }
 
     // Return the new SH entry...
@@ -11679,6 +11729,7 @@
     nsCOMPtr<nsIURI> uri;
     nsCOMPtr<nsIInputStream> postData;
     nsCOMPtr<nsIURI> referrerURI;
+    uint32_t referrerPolicy;
     nsAutoCString contentType;
     nsCOMPtr<nsISupports> owner;
 
@@ -11687,6 +11738,8 @@
     NS_ENSURE_SUCCESS(aEntry->GetURI(getter_AddRefs(uri)), NS_ERROR_FAILURE);
     NS_ENSURE_SUCCESS(aEntry->GetReferrerURI(getter_AddRefs(referrerURI)),
                       NS_ERROR_FAILURE);
+    NS_ENSURE_SUCCESS(aEntry->GetReferrerPolicy(&referrerPolicy),
+                      NS_ERROR_FAILURE);
     NS_ENSURE_SUCCESS(aEntry->GetPostData(getter_AddRefs(postData)),
                       NS_ERROR_FAILURE);
     NS_ENSURE_SUCCESS(aEntry->GetContentType(contentType), NS_ERROR_FAILURE);
@@ -11763,6 +11816,7 @@
     // first created. bug 947716 has been created to address this issue.
     rv = InternalLoad(uri,
                       referrerURI,
+                      referrerPolicy,
                       owner,
                       flags,
                       nullptr,            // No window target
@@ -13135,12 +13189,15 @@
   uint32_t flags = INTERNAL_LOAD_FLAGS_NONE;
   if (IsElementAnchor(aContent)) {
     MOZ_ASSERT(aContent->IsHTML());
-    if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::rel,
-                              NS_LITERAL_STRING("noreferrer"),
-                              aContent->IsInHTMLDocument() ?
-                              eIgnoreCase : eCaseMatters)) {
+    nsAutoString referrer;
+    aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::rel, referrer);
+    nsWhitespaceTokenizerTemplate<nsContentUtils::IsHTMLWhitespace> tok(referrer);
+    while (tok.hasMoreTokens()) {
+      if (tok.nextToken().LowerCaseEqualsLiteral("noreferrer")) {
         flags |= INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER |
                  INTERNAL_LOAD_FLAGS_NO_OPENER;
+        break;
+      }
     }
   }
 
@@ -13164,6 +13221,7 @@
   }
 
   nsCOMPtr<nsIURI> referer = refererDoc->GetDocumentURI();
+  uint32_t refererPolicy = refererDoc->GetReferrerPolicy();
 
   // referer could be null here in some odd cases, but that's ok,
   // we'll just load the link w/o sending a referer in those cases.
@@ -13192,6 +13250,7 @@
 
   nsresult rv = InternalLoad(clonedURI,                 // New URI
                              referer,                   // Referer URI
+                             refererPolicy,             // Referer policy
                              aContent->NodePrincipal(), // Owner is our node's
                                                         // principal
                              flags,
@@ -13209,7 +13268,7 @@
                              aDocShell,                 // DocShell out-param
                              aRequest);                 // Request out-param
   if (NS_SUCCEEDED(rv)) {
-    DispatchPings(aContent, aURI, referer);
+    DispatchPings(aContent, aURI, referer, refererPolicy);
   }
   return rv;
 }
@@ -13592,6 +13651,30 @@
 }
 
 void
+nsDocShell::NotifyJSRunToCompletionStart()
+{
+    bool timelineOn = nsIDocShell::GetRecordProfileTimelineMarkers();
+
+    // If first start, mark interval start.
+    if (timelineOn && mJSRunToCompletionDepth == 0) {
+        AddProfileTimelineMarker("Javascript", TRACING_INTERVAL_START);
+    }
+    mJSRunToCompletionDepth++;
+}
+
+void
+nsDocShell::NotifyJSRunToCompletionStop()
+{
+    bool timelineOn = nsIDocShell::GetRecordProfileTimelineMarkers();
+
+    // If last stop, mark interval end.
+    mJSRunToCompletionDepth--;
+    if (timelineOn && mJSRunToCompletionDepth == 0) {
+        AddProfileTimelineMarker("Javascript", TRACING_INTERVAL_END);
+    }
+}
+
+void
 nsDocShell::MaybeNotifyKeywordSearchLoading(const nsString &aProvider,
                                             const nsString &aKeyword) {
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShell.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShell.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShell.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShell.h	2014-11-26 21:45:54.000000000 +0000
@@ -18,12 +18,11 @@
 #include "nsIContentViewerContainer.h"
 #include "nsIDOMStorageManager.h"
 #include "nsDocLoader.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/TimeStamp.h"
 #include "GeckoProfiler.h"
-#ifdef MOZ_ENABLE_PROFILER_SPS
-#include "ProfilerMarkers.h"
-#endif
+#include "mozilla/dom/ProfileTimelineMarkerBinding.h"
 
 // Helper Classes
 #include "nsCOMPtr.h"
@@ -259,14 +258,86 @@
     // is no longer applied
     void NotifyAsyncPanZoomStopped(const mozilla::CSSIntPoint aScrollPos);
 
+    // Objects of this type can be added to the timeline.  The class
+    // can also be subclassed to let a given marker creator provide
+    // custom details.
+    class TimelineMarker
+    {
+    public:
+        TimelineMarker(nsDocShell* aDocShell, const char* aName,
+                       TracingMetadata aMetaData)
+            : mName(aName)
+            , mMetaData(aMetaData)
+        {
+            MOZ_COUNT_CTOR(TimelineMarker);
+            MOZ_ASSERT(aName);
+            aDocShell->Now(&mTime);
+        }
+
+        TimelineMarker(nsDocShell* aDocShell, const char* aName,
+                       TracingMetadata aMetaData,
+                       const nsAString& aCause)
+            : mName(aName)
+            , mMetaData(aMetaData)
+            , mCause(aCause)
+        {
+            MOZ_COUNT_CTOR(TimelineMarker);
+            MOZ_ASSERT(aName);
+            aDocShell->Now(&mTime);
+        }
+
+        virtual ~TimelineMarker()
+        {
+            MOZ_COUNT_DTOR(TimelineMarker);
+        }
+
+        // Check whether two markers should be considered the same,
+        // for the purpose of pairing start and end markers.  Normally
+        // this definition suffices.
+        virtual bool Equals(const TimelineMarker* other)
+        {
+            return strcmp(mName, other->mName) == 0;
+        }
+
+        // Add details specific to this marker type to aMarker.  The
+        // standard elements have already been set.
+        virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker)
+        {
+        }
+
+        const char* GetName() const
+        {
+            return mName;
+        }
+
+        TracingMetadata GetMetaData() const
+        {
+            return mMetaData;
+        }
+
+        DOMHighResTimeStamp GetTime() const
+        {
+            return mTime;
+        }
+
+        const nsString& GetCause() const
+        {
+            return mCause;
+        }
+
+    private:
+        const char* mName;
+        TracingMetadata mMetaData;
+        DOMHighResTimeStamp mTime;
+        nsString mCause;
+    };
+
     // Add new profile timeline markers to this docShell. This will only add
     // markers if the docShell is currently recording profile timeline markers.
     // See nsIDocShell::recordProfileTimelineMarkers
     void AddProfileTimelineMarker(const char* aName,
                                   TracingMetadata aMetaData);
-    void AddProfileTimelineMarker(const char* aName,
-                                  ProfilerBacktrace* aCause,
-                                  TracingMetadata aMetaData);
+    void AddProfileTimelineMarker(mozilla::UniquePtr<TimelineMarker> &aMarker);
 
     // Global counter for how many docShells are currently recording profile
     // timeline markers
@@ -310,6 +381,7 @@
     virtual nsresult DoURILoad(nsIURI * aURI,
                                nsIURI * aReferrer,
                                bool aSendReferrer,
+                               uint32_t aReferrerPolicy,
                                nsISupports * aOwner,
                                const char * aTypeHint,
                                const nsAString & aFileName,
@@ -358,6 +430,7 @@
                     bool aCloneSHChildren);
 
     virtual void SetReferrerURI(nsIURI * aURI);
+    virtual void SetReferrerPolicy(uint32_t referrerPolicy);
 
     // Session History
     virtual bool ShouldAddToSessionHistory(nsIURI * aURI);
@@ -371,8 +444,12 @@
                                          nsISupports* aOwner,
                                          bool aCloneChildren,
                                          nsISHEntry ** aNewEntry);
-    nsresult DoAddChildSHEntry(nsISHEntry* aNewEntry, int32_t aChildOffset,
-                               bool aCloneChildren);
+    nsresult AddChildSHEntryToParent(nsISHEntry* aNewEntry, int32_t aChildOffset,
+                                     bool aCloneChildren);
+
+    nsresult AddChildSHEntryInternal(nsISHEntry* aCloneRef, nsISHEntry* aNewEntry,
+                                     int32_t aChildOffset, uint32_t loadType,
+                                     bool aCloneChildren);
 
     NS_IMETHOD LoadHistoryEntry(nsISHEntry * aEntry, uint32_t aLoadType);
     NS_IMETHOD PersistLayoutHistoryState();
@@ -748,6 +825,7 @@
     // mCurrentURI should be marked immutable on set if possible.
     nsCOMPtr<nsIURI>           mCurrentURI;
     nsCOMPtr<nsIURI>           mReferrerURI;
+    uint32_t                   mReferrerPolicy;
     nsRefPtr<nsGlobalWindow>   mScriptGlobal;
     nsCOMPtr<nsISHistory>      mSessionHistory;
     nsCOMPtr<nsIGlobalHistory2> mGlobalHistory;
@@ -946,31 +1024,14 @@
     nsWeakPtr mOpener;
     nsWeakPtr mOpenedRemote;
 
+    // A depth count of how many times NotifyRunToCompletionStart
+    // has been called without a matching NotifyRunToCompletionStop.
+    uint32_t          mJSRunToCompletionDepth;
+
     // True if recording profiles.
     bool mProfileTimelineRecording;
 
-#ifdef MOZ_ENABLE_PROFILER_SPS
-    struct InternalProfileTimelineMarker
-    {
-      InternalProfileTimelineMarker(const char* aName,
-                                    ProfilerMarkerTracing* aPayload,
-                                    DOMHighResTimeStamp aTime)
-        : mName(aName)
-        , mPayload(aPayload)
-        , mTime(aTime)
-      {}
-
-      ~InternalProfileTimelineMarker()
-      {
-        delete mPayload;
-      }
-
-      nsCString mName;
-      ProfilerMarkerTracing* mPayload;
-      DOMHighResTimeStamp mTime;
-    };
-    nsTArray<InternalProfileTimelineMarker*> mProfileTimelineMarkers;
-#endif
+    nsTArray<TimelineMarker*> mProfileTimelineMarkers;
 
     // Get rid of all the timeline markers accumulated so far
     void ClearProfileTimelineMarkers();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShellLoadInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShellLoadInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShellLoadInfo.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShellLoadInfo.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIInputStream.h"
 #include "nsIURI.h"
 #include "nsIDocShell.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 //*****************************************************************************
 //***    nsDocShellLoadInfo: Object Management
@@ -19,6 +20,7 @@
   : mInheritOwner(false),
     mOwnerIsExplicit(false),
     mSendReferrer(true),
+    mReferrerPolicy(mozilla::net::RP_Default),
     mLoadType(nsIDocShellLoadInfo::loadNormal),
     mIsSrcdocLoad(false)
 {
@@ -192,6 +194,18 @@
    return NS_OK;
 }
 
+NS_IMETHODIMP nsDocShellLoadInfo::GetReferrerPolicy(nsDocShellInfoReferrerPolicy* aReferrerPolicy)
+{
+   *aReferrerPolicy = mReferrerPolicy;
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsDocShellLoadInfo::SetReferrerPolicy(nsDocShellInfoReferrerPolicy aReferrerPolicy)
+{
+    mReferrerPolicy = aReferrerPolicy;
+    return NS_OK;
+}
+
 NS_IMETHODIMP nsDocShellLoadInfo::GetIsSrcdocLoad(bool* aIsSrcdocLoad)
 {
    *aIsSrcdocLoad = mIsSrcdocLoad;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShellLoadInfo.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShellLoadInfo.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsDocShellLoadInfo.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsDocShellLoadInfo.h	2014-11-26 21:45:54.000000000 +0000
@@ -37,6 +37,7 @@
   bool                             mInheritOwner;
   bool                             mOwnerIsExplicit;
   bool                             mSendReferrer;
+  nsDocShellInfoReferrerPolicy     mReferrerPolicy;
   nsDocShellInfoLoadType           mLoadType;
   nsCOMPtr<nsISHEntry>             mSHEntry;
   nsString                         mTarget;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsIDocShell.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsIDocShell.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsIDocShell.idl	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsIDocShell.idl	2014-11-26 21:45:54.000000000 +0000
@@ -54,7 +54,7 @@
  
 typedef unsigned long nsLoadFlags;
 
-[scriptable, builtinclass, uuid(da8f78f1-8f20-4d6d-be56-fe53e177b630)]
+[scriptable, builtinclass, uuid(c2756385-bc54-417b-9ae4-c5a40053a2a3)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -132,6 +132,7 @@
    *
    * @param aURI            - The URI to load.
    * @param aReferrer       - Referring URI
+   * @param aReferrerPolicy - Referrer policy
    * @param aOwner          - Owner (security principal) 
    * @param aInheritOwner   - Flag indicating whether the owner of the current
    *                          document should be inherited if aOwner is null.
@@ -157,6 +158,7 @@
    */
   [noscript]void internalLoad(in nsIURI aURI,
                               in nsIURI aReferrer,
+                              in unsigned long aReferrerPolicy,
                               in nsISupports aOwner,
                               in uint32_t aFlags,
                               in wstring aWindowTarget,
@@ -1027,6 +1029,14 @@
   [noscript,notxpcom] URLSearchParams getURLSearchParams();
 
   /**
+   * Notify DocShell when the browser is about to start executing JS, and after
+   * that execution has stopped.  This only occurs when the Timeline devtool
+   * is collecting information.
+   */
+  [noscript,notxpcom,nostdcall] void notifyJSRunToCompletionStart();
+  [noscript,notxpcom,nostdcall] void notifyJSRunToCompletionStop();
+
+  /**
    * This attribute determines whether a document which is not about:blank has
    * already be loaded by this docShell.
    */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsIDocShellLoadInfo.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsIDocShellLoadInfo.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsIDocShellLoadInfo.idl	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsIDocShellLoadInfo.idl	2014-11-26 21:45:54.000000000 +0000
@@ -17,8 +17,9 @@
 interface nsIDocShell;
 
 typedef long nsDocShellInfoLoadType;
+typedef unsigned long nsDocShellInfoReferrerPolicy;
 
-[scriptable, uuid(c8d3b1e1-565a-427e-9d68-b109910ce9b7)]
+[scriptable, uuid(c63e9d64-490d-48bf-8013-b5d8ee4dbc25)]
 interface nsIDocShellLoadInfo : nsISupports
 {
     /** This is the referrer for the load. */
@@ -85,6 +86,11 @@
      */
     attribute boolean sendReferrer;
 
+    /** Referrer policy for the load. This attribute holds one of
+     *  the values (REFERRER_POLICY_*) defined in nsIHttpChannel.
+     */
+    attribute nsDocShellInfoReferrerPolicy referrerPolicy;
+
     /** True if the docshell has been created to load an iframe where the
      * srcdoc attribute has been set.  Set when srcdocData is specified.
      */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsILoadInfo.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsILoadInfo.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/base/nsILoadInfo.idl	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/base/nsILoadInfo.idl	2014-11-26 21:45:54.000000000 +0000
@@ -17,7 +17,7 @@
 /**
  * An nsILoadOwner represents per-load information about who started the load.
  */
-[scriptable, builtinclass, uuid(b22b8ee7-047a-4351-a749-13c6d39f6b17)]
+[scriptable, builtinclass, uuid(da363267-236d-49bf-83a2-33da8d892728)]
 interface nsILoadInfo : nsISupports
 {
   /**
@@ -72,6 +72,25 @@
   [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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/resources/content/netError.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/resources/content/netError.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/resources/content/netError.xhtml	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/resources/content/netError.xhtml	2014-11-26 21:45:54.000000000 +0000
@@ -155,8 +155,8 @@
           document.getElementById("errorTryAgain").style.display = "none";
         }
 
-        if (err == "cspFrameAncestorBlocked") {
-          // Remove the "Try again" button for CSP frame ancestors violation, since it's
+        if (err == "cspBlocked") {
+          // Remove the "Try again" button for CSP violations, since it's
           // almost certainly useless. (Bug 553180)
           document.getElementById("errorTryAgain").style.display = "none";
         }
@@ -291,7 +291,7 @@
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
         <h1 id="et_malwareBlocked">&malwareBlocked.title;</h1>
-        <h1 id="et_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.title;</h1>
+        <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
       </div>
@@ -317,7 +317,7 @@
         <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
         <div id="ed_malwareBlocked">&malwareBlocked.longDesc;</div>
-        <div id="ed_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.longDesc;</div>
+        <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
       </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/public/nsISHContainer.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/public/nsISHContainer.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/public/nsISHContainer.idl	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/public/nsISHContainer.idl	2014-11-26 21:45:54.000000000 +0000
@@ -14,7 +14,7 @@
  * 
  */
 
-[scriptable, uuid(65281BA2-988A-11d3-BDC7-0050040A9B44)]
+[scriptable, uuid(67dd0357-8372-4122-bff6-217435e8b7e4)]
 interface nsISHContainer : nsISupports
 {
 	/**
@@ -38,5 +38,12 @@
 	 */
 	nsISHEntry GetChildAt(in long index);
 
+	/**
+	 * Replaces a child which is for the same docshell as aNewChild
+	 * with aNewChild.
+	 * @throw if nothing was replaced.
+	 */
+	void ReplaceChild(in nsISHEntry aNewChild);
+
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/public/nsISHEntry.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/public/nsISHEntry.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/public/nsISHEntry.idl	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/public/nsISHEntry.idl	2014-11-26 21:45:54.000000000 +0000
@@ -30,7 +30,7 @@
 [ptr] native nsDocShellEditorDataPtr(nsDocShellEditorData);
 [ptr] native nsSHEntryShared(nsSHEntryShared);
 
-[scriptable, uuid(9eed7e92-1121-46f2-95e5-2f5c0dca46f0)]
+[scriptable, uuid(d5fbeb10-f373-4677-b69a-2694aa706cac)]
 interface nsISHEntry : nsISupports
 {
     /**
@@ -64,6 +64,11 @@
     /** Referrer URI */
     attribute nsIURI referrerURI;
 
+    /** Referrer policy, holding one of the values (REFERRER_POLICY_*)
+     *  defined in nsIHttpChannel.
+     */
+    attribute unsigned long referrerPolicy;
+
     /** Content viewer, for fast restoration of presentation */
     attribute nsIContentViewer contentViewer;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/src/nsSHEntry.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/src/nsSHEntry.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/src/nsSHEntry.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/src/nsSHEntry.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -15,6 +15,7 @@
 #include "nsIStructuredCloneContainer.h"
 #include "nsIInputStream.h"
 #include "nsIURI.h"
+#include "mozilla/net/ReferrerPolicy.h"
 #include <algorithm>
 
 namespace dom = mozilla::dom;
@@ -27,7 +28,8 @@
 
 
 nsSHEntry::nsSHEntry()
-  : mLoadType(0)
+  : mReferrerPolicy(mozilla::net::RP_Default)
+  , mLoadType(0)
   , mID(gEntryID++)
   , mScrollPositionX(0)
   , mScrollPositionY(0)
@@ -42,6 +44,7 @@
   : mShared(other.mShared)
   , mURI(other.mURI)
   , mReferrerURI(other.mReferrerURI)
+  , mReferrerPolicy(other.mReferrerPolicy)
   , mTitle(other.mTitle)
   , mPostData(other.mPostData)
   , mLoadType(0)         // XXX why not copy?
@@ -134,6 +137,18 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP nsSHEntry::GetReferrerPolicy(uint32_t *aReferrerPolicy)
+{
+  *aReferrerPolicy = mReferrerPolicy;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSHEntry::SetReferrerPolicy(uint32_t aReferrerPolicy)
+{
+  mReferrerPolicy = aReferrerPolicy;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsSHEntry::SetContentViewer(nsIContentViewer *aViewer)
 {
@@ -691,6 +706,27 @@
 }
 
 NS_IMETHODIMP
+nsSHEntry::ReplaceChild(nsISHEntry* aNewEntry)
+{
+  NS_ENSURE_STATE(aNewEntry);
+
+  uint64_t docshellID;
+  aNewEntry->GetDocshellID(&docshellID);
+
+  uint64_t otherID;
+  for (int32_t i = 0; i < mChildren.Count(); ++i) {
+    if (mChildren[i] && NS_SUCCEEDED(mChildren[i]->GetDocshellID(&otherID)) &&
+        docshellID == otherID) {
+      mChildren[i]->SetParent(nullptr);
+      if (mChildren.ReplaceObjectAt(aNewEntry, i)) {
+        return aNewEntry->SetParent(this);
+      }
+    }
+  }
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
 nsSHEntry::AddChildShell(nsIDocShellTreeItem *aShell)
 {
   NS_ASSERTION(aShell, "Null child shell added to history entry");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/src/nsSHEntry.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/src/nsSHEntry.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/shistory/src/nsSHEntry.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/shistory/src/nsSHEntry.h	2014-11-26 21:45:54.000000000 +0000
@@ -50,6 +50,7 @@
   // See nsSHEntry.idl for comments on these members.
   nsCOMPtr<nsIURI>         mURI;
   nsCOMPtr<nsIURI>         mReferrerURI;
+  uint32_t                 mReferrerPolicy;
   nsString                 mTitle;
   nsCOMPtr<nsIInputStream> mPostData;
   uint32_t                 mLoadType;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_bug441169.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_bug441169.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_bug441169.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_bug441169.js	2014-11-26 21:45:54.000000000 +0000
@@ -17,7 +17,11 @@
   newBrowser.contentWindow.location = chromeURL;
 }
 
-function checkPage() {
+function checkPage(event) {
+  if (event.target != gBrowser.selectedBrowser.contentDocument) {
+    return;
+  }
+
   window.removeEventListener("DOMContentLoaded", checkPage, false);
   
   is(newBrowser.contentDocument.getElementById("test_span"), null, "Error message should not be parsed as HTML, and hence shouldn't include the 'test_span' element.");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_timelineMarkers-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_timelineMarkers-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_timelineMarkers-02.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_timelineMarkers-02.js	2014-11-26 21:45:54.000000000 +0000
@@ -54,7 +54,8 @@
     content.console.timeEnd("FOOBAR");
     let markers = docShell.popProfileTimelineMarkers();
     is(markers.length, 1, "Got one marker");
-    is(markers[0].name, "ConsoleTime:FOOBAR", "Got ConsoleTime:FOOBAR marker");
+    is(markers[0].name, "ConsoleTime", "Got ConsoleTime marker");
+    is(markers[0].causeName, "FOOBAR", "Got ConsoleTime FOOBAR detail");
     content.console.time("FOO");
     content.setTimeout(() => {
       content.console.time("BAR");
@@ -66,8 +67,10 @@
   },
   check: function(markers) {
     is(markers.length, 2, "Got 2 markers");
-    is(markers[0].name, "ConsoleTime:FOO", "Got ConsoleTime:FOO marker");
-    is(markers[1].name, "ConsoleTime:BAR", "Got ConsoleTime:BARmarker");
+    is(markers[0].name, "ConsoleTime", "Got first ConsoleTime marker");
+    is(markers[0].causeName, "FOO", "Got ConsoleTime FOO detail");
+    is(markers[1].name, "ConsoleTime", "Got second ConsoleTime marker");
+    is(markers[1].causeName, "BAR", "Got ConsoleTime BAR detail");
   }
 }];
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_timelineMarkers-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_timelineMarkers-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_timelineMarkers-03.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_timelineMarkers-03.js	2014-11-26 21:45:54.000000000 +0000
@@ -16,6 +16,8 @@
   },
   check: function(markers) {
     is(markers.length, 1, "Got 1 marker");
+    is(markers[0].type, "dog", "Got dog event name");
+    is(markers[0].eventPhase, 2, "Got phase 2");
   }
 }, {
   desc: "Event dispatch with a second handler",
@@ -29,6 +31,18 @@
     is(markers.length, 2, "Got 2 markers");
   }
 }, {
+  desc: "Event targeted at child",
+  setup: function() {
+    let child = content.document.body.firstElementChild;
+    child.addEventListener("dog", function(e) { });
+    child.dispatchEvent(new Event("dog"));
+  },
+  check: function(markers) {
+    is(markers.length, 2, "Got 2 markers");
+    is(markers[0].eventPhase, 1, "Got phase 1 marker");
+    is(markers[1].eventPhase, 2, "Got phase 2 marker");
+  }
+}, {
   desc: "Event dispatch on a new document",
   setup: function() {
     let doc = content.document.implementation.createHTMLDocument("doc");
@@ -59,7 +73,7 @@
 let test = Task.async(function*() {
   waitForExplicitFinish();
 
-  yield openUrl("data:text/html;charset=utf-8,Test page");
+  yield openUrl("data:text/html;charset=utf-8,<p>Test page</p>");
 
   let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor)
                         .getInterface(Ci.nsIWebNavigation)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_timelineMarkers-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_timelineMarkers-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/browser_timelineMarkers-04.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/browser_timelineMarkers-04.js	2014-11-26 21:45:54.000000000 +0000
@@ -43,13 +43,13 @@
     docShell.popProfileTimelineMarkers();
 
     info("Running the test setup function");
-    let onMarkers = waitForMarkers(docShell);
+    let onMarkers = waitForDOMMarkers(docShell, 5);
     setup();
     info("Waiting for new markers on the docShell");
     let markers = yield onMarkers;
 
     info("Running the test check function");
-    check(markers.filter(m => m.name == "DOMEvent"));
+    check(markers);
   }
 
   info("Stop recording");
@@ -73,21 +73,20 @@
   });
 }
 
-function waitForMarkers(docshell) {
+function waitForDOMMarkers(docshell, numExpected) {
   return new Promise(function(resolve, reject) {
     let waitIterationCount = 0;
     let maxWaitIterationCount = 10; // Wait for 2sec maximum
+    let markers = [];
 
     let interval = setInterval(() => {
-      let markers = docshell.popProfileTimelineMarkers();
-      if (markers.length > 0) {
+      let newMarkers = docshell.popProfileTimelineMarkers();
+      markers = [...markers, ...newMarkers.filter(m => m.name == "DOMEvent")];
+      if (markers.length >= numExpected
+          || waitIterationCount > maxWaitIterationCount) {
         clearInterval(interval);
         resolve(markers);
       }
-      if (waitIterationCount > maxWaitIterationCount) {
-        clearInterval(interval);
-        resolve([]);
-      }
       waitIterationCount++;
     }, 200);
   });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/timelineMarkers-04.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/timelineMarkers-04.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/browser/timelineMarkers-04.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/browser/timelineMarkers-04.html	2014-11-26 21:45:54.000000000 +0000
@@ -14,7 +14,7 @@
 
       xhr = new XMLHttpRequest();
       xhr.onreadystatechange = function() {
-        // Nothing.
+        dump("ReadyState = " + xhr.readyState + "\n");
       };
       xhr.open("get", theURL, true);
       xhr.send();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/bug530396-subframe.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/bug530396-subframe.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/bug530396-subframe.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/bug530396-subframe.html	2014-11-26 21:45:54.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <body onload="window.parent.onloadCount++">
-    <a href="bug530396-noref.sjs" rel="noreferrer" id="target1">bug530396-noref.sjs</a>
-    <a href="bug530396-noref.sjs?newwindow" rel="noreferrer" id="target2" target="newwindow">bug530396-noref.sjs with new window</a>
+    <a href="bug530396-noref.sjs" rel="noreferrer foo" id="target1">bug530396-noref.sjs</a>
+    <a href="bug530396-noref.sjs?newwindow" rel="nofollow noreferrer" id="target2" target="newwindow">bug530396-noref.sjs with new window</a>
   </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/navigation/file_nested_frames.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/navigation/file_nested_frames.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/navigation/file_nested_frames.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/navigation/file_nested_frames.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <script>
+      function nestedIframeLoaded() {
+        var tf = document.getElementById("testframe");
+        var innerf = tf.contentDocument.getElementsByTagName("iframe")[0];
+        if (innerf.contentDocument.documentURI.indexOf("frame0") < 0) {
+          innerf.contentWindow.location.href = "http://mochi.test:8888/tests/docshell/test/navigation/frame0.html";
+          return;
+        }
+        innerf.onload = null;
+        innerf.src = "about:blank";
+        var d = innerf.contentDocument;
+        d.open();
+        d.write("test");
+        d.close();
+        opener.is(window.history.length, 1, "Unexpected history length");
+        opener.nextTest();
+        window.close();
+      }
+    </script>
+  </head>
+  <body>
+  <iframe id="testframe" src="data:text/html,<iframe onload='parent.nestedIframeLoaded();'></iframe>" onload="frameLoaded()"></iframe>
+  <script>
+  </script>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/navigation/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/navigation/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/navigation/mochitest.ini	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/navigation/mochitest.ini	2014-11-26 21:45:54.000000000 +0000
@@ -9,6 +9,7 @@
   file_bug534178.html
   file_document_write_1.html
   file_fragment_handling_during_load.html
+  file_nested_frames.html
   file_static_and_dynamic_1.html
   frame0.html
   frame1.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/navigation/test_sessionhistory.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/navigation/test_sessionhistory.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/docshell/test/navigation/test_sessionhistory.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/docshell/test/navigation/test_sessionhistory.html	2014-11-26 21:45:54.000000000 +0000
@@ -27,7 +27,8 @@
     "file_document_write_1.html",    // Session history + document.write
     //"file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back
     "file_bug534178.html",           // Session history transaction clean-up.
-    "file_fragment_handling_during_load.html"
+    "file_fragment_handling_during_load.html",
+    "file_nested_frames.html"
   ];
 var testCount = 0; // Used by the test files.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/AnimationPlayer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/AnimationPlayer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/AnimationPlayer.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/AnimationPlayer.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -6,6 +6,10 @@
 #include "AnimationPlayer.h"
 #include "AnimationUtils.h"
 #include "mozilla/dom/AnimationPlayerBinding.h"
+#include "AnimationCommon.h" // For AnimationPlayerCollection,
+                             // CommonAnimationManager
+#include "nsIDocument.h" // For nsIDocument
+#include "nsIPresShell.h" // For nsIPresShell
 #include "nsLayoutUtils.h" // For PostRestyleEvent (remove after bug 1073336)
 
 namespace mozilla {
@@ -63,50 +67,17 @@
 }
 
 void
-AnimationPlayer::Play(UpdateFlags aFlags)
+AnimationPlayer::Play()
 {
-  // FIXME: When we implement finishing behavior (bug 1074630) we should
-  // not return early if mIsPaused is false since we may still need to seek.
-  // (However, we will need to pass a flag so that when we start playing due to
-  //  a change in animation-play-state we *don't* trigger finishing behavior.)
-  if (!mIsPaused) {
-    return;
-  }
-  mIsPaused = false;
-
-  Nullable<TimeDuration> timelineTime = mTimeline->GetCurrentTime();
-  if (timelineTime.IsNull()) {
-    // FIXME: We should just sit in the pending state in this case.
-    // We will introduce the pending state in Bug 927349.
-    return;
-  }
-
-  // Update start time to an appropriate offset from the current timeline time
-  MOZ_ASSERT(!mHoldTime.IsNull(), "Hold time should not be null when paused");
-  mStartTime.SetValue(timelineTime.Value() - mHoldTime.Value());
-  mHoldTime.SetNull();
-
-  if (aFlags == eUpdateStyle) {
-    MaybePostRestyle();
-  }
+  DoPlay();
+  PostUpdate();
 }
 
 void
-AnimationPlayer::Pause(UpdateFlags aFlags)
+AnimationPlayer::Pause()
 {
-  if (mIsPaused) {
-    return;
-  }
-  mIsPaused = true;
-  mIsRunningOnCompositor = false;
-
-  // Bug 927349 - check for null result here and go to pending state
-  mHoldTime = GetCurrentTime();
-  mStartTime.SetNull();
-
-  if (aFlags == eUpdateStyle) {
-    MaybePostRestyle();
-  }
+  DoPause();
+  PostUpdate();
 }
 
 Nullable<double>
@@ -115,40 +86,6 @@
   return AnimationUtils::TimeDurationToDouble(GetCurrentTime());
 }
 
-AnimationPlayState
-AnimationPlayer::PlayStateFromJS() const
-{
-  // FIXME: Once we introduce CSSTransitionPlayer, this should move to an
-  // override of PlayStateFromJS in CSSAnimationPlayer and CSSTransitionPlayer
-  // and we should skip it in the general case.
-  FlushStyle();
-
-  return PlayState();
-}
-
-void
-AnimationPlayer::PlayFromJS()
-{
-  // Flush style to ensure that any properties controlling animation state
-  // (e.g. animation-play-state) are fully updated before we proceed.
-  //
-  // Note that this might trigger PlayFromStyle()/PauseFromStyle() on this
-  // object.
-  //
-  // FIXME: Once we introduce CSSTransitionPlayer, this should move to an
-  // override of PlayFromJS in CSSAnimationPlayer and CSSTransitionPlayer and
-  // we should skip it in the general case.
-  FlushStyle();
-
-  Play(eUpdateStyle);
-}
-
-void
-AnimationPlayer::PauseFromJS()
-{
-  Pause(eUpdateStyle);
-}
-
 void
 AnimationPlayer::SetSource(Animation* aSource)
 {
@@ -225,55 +162,120 @@
 }
 
 void
-AnimationPlayer::FlushStyle() const
+AnimationPlayer::DoPlay()
 {
-  if (!mSource) {
+  // FIXME: When we implement finishing behavior (bug 1074630) we should
+  // not return early if mIsPaused is false since we may still need to seek.
+  // (However, we will need to pass a flag so that when we start playing due to
+  //  a change in animation-play-state we *don't* trigger finishing behavior.)
+  if (!mIsPaused) {
     return;
   }
+  mIsPaused = false;
 
-  Element* targetElement;
-  nsCSSPseudoElements::Type pseudoType;
-  mSource->GetTarget(targetElement, pseudoType);
-  if (!targetElement) {
+  Nullable<TimeDuration> timelineTime = mTimeline->GetCurrentTime();
+  if (timelineTime.IsNull()) {
+    // FIXME: We should just sit in the pending state in this case.
+    // We will introduce the pending state in Bug 927349.
     return;
   }
 
-  nsIDocument* doc = targetElement->GetComposedDoc();
+  // Update start time to an appropriate offset from the current timeline time
+  MOZ_ASSERT(!mHoldTime.IsNull(), "Hold time should not be null when paused");
+  mStartTime.SetValue(timelineTime.Value() - mHoldTime.Value());
+  mHoldTime.SetNull();
+}
+
+void
+AnimationPlayer::DoPause()
+{
+  if (mIsPaused) {
+    return;
+  }
+  mIsPaused = true;
+  mIsRunningOnCompositor = false;
+
+  // Bug 927349 - check for null result here and go to pending state
+  mHoldTime = GetCurrentTime();
+  mStartTime.SetNull();
+}
+
+void
+AnimationPlayer::FlushStyle() const
+{
+  nsIDocument* doc = GetRenderedDocument();
   if (doc) {
     doc->FlushPendingNotifications(Flush_Style);
   }
 }
 
 void
-AnimationPlayer::MaybePostRestyle() const
+AnimationPlayer::PostUpdate()
+{
+  AnimationPlayerCollection* collection = GetCollection();
+  if (collection) {
+    collection->NotifyPlayerUpdated();
+  }
+}
+
+StickyTimeDuration
+AnimationPlayer::SourceContentEnd() const
 {
   if (!mSource) {
-    return;
+    return StickyTimeDuration(0);
+  }
+
+  return mSource->Timing().mDelay
+         + mSource->GetComputedTiming().mActiveDuration;
+}
+
+nsIDocument*
+AnimationPlayer::GetRenderedDocument() const
+{
+  if (!mSource) {
+    return nullptr;
   }
 
   Element* targetElement;
   nsCSSPseudoElements::Type pseudoType;
   mSource->GetTarget(targetElement, pseudoType);
   if (!targetElement) {
-    return;
+    return nullptr;
   }
 
-  // FIXME: This is a bit heavy-handed but in bug 1073336 we hope to
-  // introduce a better means for players to update style.
-  nsLayoutUtils::PostRestyleEvent(targetElement,
-                                  eRestyle_Self,
-                                  nsChangeHint_AllReflowHints);
+  return targetElement->GetComposedDoc();
 }
 
-StickyTimeDuration
-AnimationPlayer::SourceContentEnd() const
+nsPresContext*
+AnimationPlayer::GetPresContext() const
 {
-  if (!mSource) {
-    return StickyTimeDuration(0);
+  nsIDocument* doc = GetRenderedDocument();
+  if (!doc) {
+    return nullptr;
+  }
+  nsIPresShell* shell = doc->GetShell();
+  if (!shell) {
+    return nullptr;
+  }
+  return shell->GetPresContext();
+}
+
+AnimationPlayerCollection*
+AnimationPlayer::GetCollection() const
+{
+  css::CommonAnimationManager* manager = GetAnimationManager();
+  if (!manager) {
+    return nullptr;
   }
+  MOZ_ASSERT(mSource, "A player with an animation manager must have a source");
 
-  return mSource->Timing().mDelay
-         + mSource->GetComputedTiming().mActiveDuration;
+  Element* targetElement;
+  nsCSSPseudoElements::Type targetPseudoType;
+  mSource->GetTarget(targetElement, targetPseudoType);
+  MOZ_ASSERT(targetElement,
+             "A player with an animation manager must have a target");
+
+  return manager->GetAnimationPlayers(targetElement, targetPseudoType, false);
 }
 
 } // namespace dom
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/AnimationPlayer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/AnimationPlayer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/AnimationPlayer.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/AnimationPlayer.h	2014-11-26 21:45:54.000000000 +0000
@@ -22,13 +22,18 @@
 
 struct JSContext;
 class nsCSSPropertySet;
+class nsIDocument;
+class nsPresContext;
 
 namespace mozilla {
+struct AnimationPlayerCollection;
 namespace css {
 class AnimValuesStyleRule;
+class CommonAnimationManager;
 } // namespace css
 
 class CSSAnimationPlayer;
+class CSSTransitionPlayer;
 
 namespace dom {
 
@@ -53,13 +58,7 @@
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
   virtual CSSAnimationPlayer* AsCSSAnimationPlayer() { return nullptr; }
-
-  // Temporary flags to control restyle behavior until bug 1073336
-  // provides a better solution.
-  enum UpdateFlags {
-    eNoUpdate,
-    eUpdateStyle
-  };
+  virtual CSSTransitionPlayer* AsCSSTransitionPlayer() { return nullptr; }
 
   // AnimationPlayer methods
   Animation* GetSource() const { return mSource; }
@@ -67,18 +66,21 @@
   Nullable<double> GetStartTime() const;
   Nullable<TimeDuration> GetCurrentTime() const;
   AnimationPlayState PlayState() const;
-  virtual void Play(UpdateFlags aUpdateFlags);
-  virtual void Pause(UpdateFlags aUpdateFlags);
+  virtual void Play();
+  virtual void Pause();
   bool IsRunningOnCompositor() const { return mIsRunningOnCompositor; }
 
   // Wrapper functions for AnimationPlayer DOM methods when called
   // from script. We often use the same methods internally and from
-  // script but when called from script we perform extra steps such
-  // as flushing style or converting the return type.
+  // 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> GetCurrentTimeAsDouble() const;
-  AnimationPlayState PlayStateFromJS() const;
-  void PlayFromJS();
-  void PauseFromJS();
+  virtual AnimationPlayState PlayStateFromJS() const { return PlayState(); }
+  virtual void PlayFromJS() { Play(); }
+  // PauseFromJS is currently only here for symmetry with PlayFromJS but
+  // in future we will likely have to flush style in
+  // CSSAnimationPlayer::PauseFromJS so we leave it for now.
+  void PauseFromJS() { Pause(); }
 
   void SetSource(Animation* aSource);
   void Tick();
@@ -120,10 +122,18 @@
   Nullable<TimeDuration> mStartTime; // Timeline timescale
 
 protected:
+  void DoPlay();
+  void DoPause();
+
   void FlushStyle() const;
-  void MaybePostRestyle() const;
+  void PostUpdate();
   StickyTimeDuration SourceContentEnd() const;
 
+  nsIDocument* GetRenderedDocument() const;
+  nsPresContext* GetPresContext() const;
+  virtual css::CommonAnimationManager* GetAnimationManager() const = 0;
+  AnimationPlayerCollection* GetCollection() const;
+
   nsRefPtr<AnimationTimeline> mTimeline;
   nsRefPtr<Animation> mSource;
   Nullable<TimeDuration> mHoldTime;  // Player timescale
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-effect-name.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-effect-name.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-effect-name.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-effect-name.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,45 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<style>
+@keyframes xyz {
+  to { left: 100px }
+}
+</style>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'xyz 100s';
+  assert_equals(div.getAnimationPlayers()[0].source.effect.name, 'xyz',
+                'Animation effect name matches keyframes rule name');
+  div.remove();
+}, 'Effect name makes keyframe rule');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'x\\yz 100s';
+  assert_equals(div.getAnimationPlayers()[0].source.effect.name, 'xyz',
+                'Escaped animation effect name matches keyframes rule name');
+  div.remove();
+}, 'Escaped animation name');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'x\\79 z 100s';
+  assert_equals(div.getAnimationPlayers()[0].source.effect.name, 'xyz',
+                'Hex-escaped animation effect name matches keyframes rule'
+                + ' name');
+  div.remove();
+}, 'Animation name with hex-escape');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-pausing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-pausing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-pausing.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-pausing.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,209 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<style>
+@keyframes anim { 
+  0% { margin-left: 0px }
+  100% { margin-left: 10000px }
+}
+</style>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+function waitForFrame() {
+  return new Promise(function(resolve, reject) {
+    window.requestAnimationFrame(resolve);
+  });
+}
+
+function getMarginLeft(cs) {
+  return parseFloat(cs.marginLeft);
+}
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s';
+
+  var player = div.getAnimationPlayers()[0];
+
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+  var previousAnimVal = getMarginLeft(cs);
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_true(getMarginLeft(cs) > previousAnimVal,
+                  'margin-left is initially increasing');
+      previousAnimVal = getMarginLeft(cs);
+
+      player.pause();
+    });
+    return waitForFrame();
+  }).then(function() {
+    t.step(function() {
+      assert_equals(getMarginLeft(cs), previousAnimVal,
+                    'margin-left does not increase after calling pause()');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'pause() a running animation');
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s paused';
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+
+  player.pause();
+  div.style.animationPlayState = 'running';
+  cs.animationPlayState; // Trigger style resolution
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_equals(cs.animationPlayState, 'running',
+                    'animation-play-state is running');
+      assert_equals(getMarginLeft(cs), 0,
+                    'Paused value of margin-left is zero');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'pause() overrides animation-play-state');
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s paused';
+
+  var player = div.getAnimationPlayers()[0];
+
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+
+  player.play();
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_true(getMarginLeft(cs) > 0,
+                  'Playing value of margin-left is greater than zero');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'play() overrides animation-play-state');
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s paused';
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+
+  player.play();
+  div.style.animationPlayState = 'running';
+  cs.animationPlayState; // Trigger style resolution
+
+  var previousAnimVal;
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_equals(cs.animationPlayState, 'running',
+                    'animation-play-state is running');
+      previousAnimVal = getMarginLeft(cs);
+      div.style.animationPlayState = 'paused';
+      cs.animationPlayState; // Trigger style resolution
+    });
+    return waitForFrame();
+  }).then(function() {
+    t.step(function() {
+      assert_equals(cs.animationPlayState, 'paused',
+                    'animation-play-state is paused');
+      assert_equals(getMarginLeft(cs), previousAnimVal,
+                    'Animated value of margin-left does not change when'
+                    + ' paused by style');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'play() is overridden by later setting "animation-play-state: paused"');
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s';
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+
+  // Set the specified style first. If implementations fail to
+  // apply the style changes first, they will ignore the redundant
+  // call to play() and fail to correctly override the pause style.
+  div.style.animationPlayState = 'paused';
+  player.play();
+  var previousAnimVal = getMarginLeft(cs);
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_equals(cs.animationPlayState, 'paused',
+                    'animation-play-state is paused');
+      assert_true(getMarginLeft(cs) > previousAnimVal,
+                  'Playing value of margin-left is increasing');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'play() flushes pending changes to animation-play-state first');
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s paused';
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+
+  // Unlike the previous test for play(), since calling pause() is sticky,
+  // we'll apply it even if the underlying style also says we're paused.
+  // 
+  // We would like to test that implementations flush styles before running
+  // pause() but actually there's no style we can currently set that will
+  // change the behavior of pause(). That may change in the future
+  // (e.g. if we introduce animation-timeline or animation-playback-rate etc.).
+  //
+  // For now this just serves as a sanity check that we do the same thing
+  // even if we set style before calling the API.
+  div.style.animationPlayState = 'running';
+  player.pause();
+  var previousAnimVal = getMarginLeft(cs);
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_equals(cs.animationPlayState, 'running',
+                    'animation-play-state is paused');
+      assert_equals(getMarginLeft(cs), previousAnimVal,
+                    'Paused value of margin-left does not change');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'pause() applies pending changes to animation-play-state first');
+// (Note that we can't actually test for this; see comment above, in test-body.)
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-player-playstate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-player-playstate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-player-playstate.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-player-playstate.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<style>
+@keyframes anim { }
+</style>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+test(function() {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s';
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(player.playState, 'running');
+}, 'Player returns correct playState when running');
+
+test(function() {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s paused';
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(player.playState, 'paused');
+}, 'Player returns correct playState when paused');
+
+test(function() {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s';
+
+  var player = div.getAnimationPlayers()[0];
+  player.pause();
+  assert_equals(player.playState, 'paused');
+}, 'Player.playState updates when paused by script');
+
+test(function() {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+  div.style.animation = 'anim 1000s paused';
+
+  var player = div.getAnimationPlayers()[0];
+  div.style.animationPlayState = 'running';
+  // This test also checks that calling playState flushes style
+  assert_equals(player.playState, 'running');
+}, 'Player.playState updates when resumed by setting style');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animations-dynamic-changes.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animations-dynamic-changes.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animations-dynamic-changes.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animations-dynamic-changes.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,150 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<style>
+@keyframes anim1 {
+  to { left: 100px }
+}
+@keyframes anim2 { }
+</style>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s';
+
+  var originalPlayer = div.getAnimationPlayers()[0];
+  var originalStartTime = originalPlayer.startTime;
+  var originalCurrentTime = originalPlayer.currentTime;
+
+  // Wait a moment so we can confirm the startTime doesn't change (and doesn't
+  // simply reflect the current time).
+  window.requestAnimationFrame(t.step_func(function() {
+    div.style.animationDuration = '200s';
+    var player = div.getAnimationPlayers()[0];
+    assert_equals(player, originalPlayer,
+                  'The same AnimationPlayer is returned after updating'
+                  + ' animation duration');
+    assert_equals(player.startTime, originalStartTime,
+                  'AnimationPlayers returned by getAnimationPlayers preserve'
+                  + ' their startTime even when they are updated');
+    // Sanity check
+    assert_not_equals(player.currentTime, originalCurrentTime,
+                      'AnimationPlayer.currentTime has updated in next'
+                      + ' requestAnimationFrame callback');
+    div.remove();
+    t.done();
+  }));
+}, 'AnimationPlayers preserve their startTime when changed');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s, anim1 100s';
+
+  // Store original state
+  var players = div.getAnimationPlayers();
+  var player1 = players[0];
+  var player2 = players[1];
+
+  // Update first in list
+  div.style.animationDuration = '200s, 100s';
+  players = div.getAnimationPlayers();
+  assert_equals(players[0], player1,
+                'First player is in same position after update');
+  assert_equals(players[1], player2,
+                'Second player is in same position after update');
+}, 'Updated AnimationPlayers maintain their order in the list');
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim1 200s, anim1 100s';
+
+  // Store original state
+  var players = div.getAnimationPlayers();
+  var player1 = players[0];
+  var player2 = players[1];
+
+  // Wait before continuing so we can compare start times
+  window.requestAnimationFrame(t.step_func(function() {
+    // Swap duration of first and second in list and prepend animation at the
+    // same time
+    div.style.animation = 'anim1 100s, anim1 100s, anim1 200s';
+    players = div.getAnimationPlayers();
+    assert_true(players[0] !== player1 && players[0] !== player2,
+                'New player is prepended to start of list');
+    assert_equals(players[1], player1,
+                  'First player is in second position after update');
+    assert_equals(players[2], player2,
+                  'Second player is in third position after update');
+    assert_equals(players[1].startTime, players[2].startTime,
+                  'Old players have the same start time');
+    assert_true(players[0].startTime > players[1].startTime,
+                'New player has later start time');
+    div.remove();
+    t.done();
+  }));
+}, 'Only the startTimes of existing animations are preserved');
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s, anim1 100s';
+  var secondPlayer = div.getAnimationPlayers()[1];
+
+  // Wait before continuing so we can compare start times
+  window.requestAnimationFrame(t.step_func(function() {
+    // Trim list of animations
+    div.style.animationName = 'anim1';
+    var players = div.getAnimationPlayers();
+    assert_equals(players.length, 1, 'List of players was trimmed');
+    assert_equals(players[0], secondPlayer,
+                  'Remaining player is the second one in the list');
+    assert_true(players[0].startTime < players[0].timeline.currentTime,
+                'Remaining player preserves startTime');
+    div.remove();
+    t.done();
+  }));
+}, 'Animations are removed from the start of the list while preserving'
+   + ' the state of existing players');
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s';
+  var firstAddedPlayer = div.getAnimationPlayers()[0];
+
+  // Wait and add second player
+  window.requestAnimationFrame(t.step_func(function() {
+    div.style.animation = 'anim1 100s, anim1 100s';
+    var secondAddedPlayer = div.getAnimationPlayers()[0];
+
+    // Wait again and add another player
+    window.requestAnimationFrame(t.step_func(function() {
+      div.style.animation = 'anim1 100s, anim2 100s, anim1 100s';
+      var players = div.getAnimationPlayers();
+      assert_not_equals(firstAddedPlayer, secondAddedPlayer,
+                        'New players are added to start of the list');
+      assert_equals(players[0], secondAddedPlayer,
+                    'Second player remains in same position after'
+                    + ' interleaving');
+      assert_equals(players[2], firstAddedPlayer,
+                    'First player remains in same position after'
+                    + ' interleaving');
+      assert_true(players[1].startTime > players[0].startTime,
+                  'Interleaved player starts later than existing players');
+      assert_true(players[0].startTime > players[2].startTime,
+                  'Original players retain their start time');
+      div.remove();
+      t.done();
+    }));
+  }));
+}, 'Player state is preserved when interleaving animations in list');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-target.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-target.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_animation-target.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_animation-target.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,27 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<style>
+@keyframes anim { }
+</style>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'anim 100s';
+  var players = div.getAnimationPlayers();
+  assert_equals(players[0].source.target, div,
+    'Animation.target is the animatable div');
+  div.remove();
+}, 'Returned CSS animations have the correct Animation.target');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_element-get-animation-players.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_element-get-animation-players.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-animations/test_element-get-animation-players.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-animations/test_element-get-animation-players.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,259 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<style>
+@keyframes anim1 {
+  to { left: 100px }
+}
+@keyframes anim2 {
+  to { top: 100px }
+}
+@keyframes multiPropAnim {
+  to { background: green, opacity: 0.5, left: 100px, top: 100px }
+}
+@keyframes empty { }
+</style>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+test(function() {
+  var div = addDiv();
+  assert_equals(div.getAnimationPlayers().length, 0,
+    'getAnimationPlayers returns an empty sequence for an element'
+    + ' with no animations');
+  div.remove();
+}, 'getAnimationPlayers for non-animated content');
+
+async_test(function(t) {
+  var div = addDiv();
+
+  // Add an animation
+  div.style.animation = 'anim1 100s';
+  var players = div.getAnimationPlayers();
+  assert_equals(players.length, 1,
+    'getAnimationPlayers returns a player running CSS Animations');
+  var startTime = players[0].startTime;
+  assert_true(startTime > 0 && startTime <= document.timeline.currentTime,
+    'CSS animation has a sensible start time');
+
+  // Wait a moment then add a second animation.
+  //
+  // We wait for the next frame so that we can test that the start times of
+  // the animations differ.
+  window.requestAnimationFrame(t.step_func(function() {
+    div.style.animation = 'anim1 100s, anim2 100s';
+    players = div.getAnimationPlayers();
+    assert_equals(players.length, 2,
+      'getAnimationPlayers returns one player for each value of'
+      + ' animation-name');
+    assert_true(players[0].startTime < players[1].startTime,
+      'Additional players for CSS animations start after the original'
+      + ' animation and appear later in the list');
+    div.remove();
+    t.done();
+  }));
+}, 'getAnimationPlayers for CSS Animations');
+
+test(function() {
+  var div = addDiv();
+
+  // Add an animation that targets multiple properties
+  div.style.animation = 'multiPropAnim 100s';
+  assert_equals(div.getAnimationPlayers().length, 1,
+    'getAnimationPlayers returns only one player for a CSS Animation'
+    + ' that targets multiple properties');
+  div.remove();
+}, 'getAnimationPlayers for multi-property animations');
+
+async_test(function(t) {
+  var div = addDiv();
+
+  // Add an animation
+  div.style.backgroundColor = 'red';
+  div.style.animation = 'anim1 100s';
+  window.getComputedStyle(div).backgroundColor;
+
+  // Wait a moment then add a transition
+  window.requestAnimationFrame(t.step_func(function() {
+    div.style.transition = 'all 100s';
+    div.style.backgroundColor = 'green';
+
+    var players = div.getAnimationPlayers();
+    assert_equals(players.length, 2,
+      'getAnimationPlayers returns players for both animations and '
+      + ' transitions that run simultaneously');
+    assert_true(players[0].startTime > players[1].startTime,
+      'players for transitions appear before animations even if they '
+      + ' start later');
+    div.remove();
+    t.done();
+  }));
+}, 'getAnimationPlayers for both CSS Animations and Transitions at once');
+
+async_test(function(t) {
+  var div = addDiv();
+
+  // Set up event listener
+  div.addEventListener('animationend', t.step_func(function() {
+    assert_equals(div.getAnimationPlayers().length, 0,
+      'getAnimationPlayers does not return players for finished '
+      + ' (and non-forwards-filling) CSS Animations');
+    div.remove();
+    t.done();
+  }));
+
+  // Add a very short animation
+  div.style.animation = 'anim1 0.01s';
+}, 'getAnimationPlayers for CSS Animations that have finished');
+
+async_test(function(t) {
+  var div = addDiv();
+
+  // Set up event listener
+  div.addEventListener('animationend', t.step_func(function() {
+    assert_equals(div.getAnimationPlayers().length, 1,
+      'getAnimationPlayers returns players for CSS Animations that have'
+      + ' finished but are filling forwards');
+    div.remove();
+    t.done();
+  }));
+
+  // Add a very short animation
+  div.style.animation = 'anim1 0.01s forwards';
+}, 'getAnimationPlayers for CSS Animations that have finished but are'
+   + ' forwards filling');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'none 100s';
+
+  var players = div.getAnimationPlayers();
+  assert_equals(players.length, 0,
+    'getAnimationPlayers returns an empty sequence for an element'
+    + ' with animation-name: none');
+
+  div.style.animation = 'none 100s, anim1 100s';
+  players = div.getAnimationPlayers();
+  assert_equals(players.length, 1,
+    'getAnimationPlayers returns players only for those CSS Animations whose'
+    + ' animation-name is not none');
+
+  div.remove();
+}, 'getAnimationPlayers for CSS Animations with animation-name: none');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'missing 100s';
+  var players = div.getAnimationPlayers();
+  assert_equals(players.length, 0,
+    'getAnimationPlayers returns an empty sequence for an element'
+    + ' with animation-name: missing');
+
+  div.style.animation = 'anim1 100s, missing 100s';
+  players = div.getAnimationPlayers();
+  assert_equals(players.length, 1,
+    'getAnimationPlayers returns players only for those CSS Animations whose'
+    + ' animation-name is found');
+
+  div.remove();
+}, 'getAnimationPlayers for CSS Animations with animation-name: missing');
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s, notyet 100s';
+  var players = div.getAnimationPlayers();
+  assert_equals(players.length, 1,
+    'getAnimationPlayers initally only returns players for CSS Animations whose'
+    + ' animation-name is found');
+
+  window.requestAnimationFrame(t.step_func(function() {
+    var keyframes = '@keyframes notyet { to { left: 100px; } }';
+    document.styleSheets[0].insertRule(keyframes, 0);
+    players = div.getAnimationPlayers();
+    assert_equals(players.length, 2,
+      'getAnimationPlayers includes player when @keyframes rule is added'
+      + ' later');
+    assert_true(players[0].startTime < players[1].startTime,
+      'Newly added player has a later start time');
+    document.styleSheets[0].deleteRule(0);
+    div.remove();
+    t.done();
+  }));
+}, 'getAnimationPlayers for CSS Animations where the @keyframes rule is added'
+   + ' later');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s, anim1 100s';
+  assert_equals(div.getAnimationPlayers().length, 2,
+    'getAnimationPlayers returns one player for each CSS animation-name'
+    + ' even if the names are duplicated');
+  div.remove();
+}, 'getAnimationPlayers for CSS Animations with duplicated animation-name');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'empty 100s';
+  assert_equals(div.getAnimationPlayers().length, 1,
+    'getAnimationPlayers returns players for CSS animations with an'
+    + ' empty keyframes rule');
+  div.remove();
+}, 'getAnimationPlayers for CSS Animations with empty keyframes rule');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s 100s';
+  var players = div.getAnimationPlayers();
+  assert_equals(players.length, 1,
+    'getAnimationPlayers returns animations for CSS animations whose'
+    + ' delay makes them start later');
+  assert_true(players[0].startTime <= document.timeline.currentTime,
+    'For CSS Animations in delay phase, the start time of the player is'
+    + ' not in the future');
+  div.remove();
+}, 'getAnimationPlayers for CSS animations in delay phase');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'anim1 0s 100s';
+  assert_equals(div.getAnimationPlayers().length, 1,
+    'getAnimationPlayers returns animations for CSS animations whose'
+    + ' duration is zero');
+  div.remove();
+}, 'getAnimationPlayers for zero-duration CSS Animations');
+
+test(function() {
+  var div = addDiv();
+  div.style.animation = 'anim1 100s';
+  var originalPlayer = div.getAnimationPlayers()[0];
+
+  // Update pause state (an AnimationPlayer change)
+  div.style.animationPlayState = 'paused';
+  var pausedPlayer = div.getAnimationPlayers()[0];
+  assert_equals(pausedPlayer.playState, 'paused',
+                'player\'s paused state is updated');
+  assert_equals(originalPlayer, pausedPlayer,
+                'getAnimationPlayers returns the same objects even when their'
+                + ' play state changes');
+
+  // Update duration (an Animation change)
+  div.style.animationDuration = '200s';
+  var extendedPlayer = div.getAnimationPlayers()[0];
+  // FIXME: Check extendedPlayer.source.timing.duration has changed once the
+  // API is available
+  assert_equals(originalPlayer, extendedPlayer,
+                'getAnimationPlayers returns the same objects even when their'
+                + ' duration changes');
+
+  div.remove();
+}, 'getAnimationPlayers returns objects with the same identity');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-effect-name.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-effect-name.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-effect-name.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-effect-name.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<style>
-@keyframes xyz {
-  to { left: 100px }
-}
-</style>
-<script>
-'use strict';
-
-function addDiv() {
-  var div = document.createElement('div');
-  document.body.appendChild(div);
-  return div;
-}
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'xyz 100s';
-  assert_equals(div.getAnimationPlayers()[0].source.effect.name, 'xyz',
-                'Animation effect name matches keyframes rule name');
-  div.remove();
-}, 'Effect name makes keyframe rule');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'x\\yz 100s';
-  assert_equals(div.getAnimationPlayers()[0].source.effect.name, 'xyz',
-                'Escaped animation effect name matches keyframes rule name');
-  div.remove();
-}, 'Escaped animation name');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'x\\79 z 100s';
-  assert_equals(div.getAnimationPlayers()[0].source.effect.name, 'xyz',
-                'Hex-escaped animation effect name matches keyframes rule'
-                + ' name');
-  div.remove();
-}, 'Animation name with hex-escape');
-
-test(function() {
-  var div = addDiv();
-
-  // Add a transition
-  div.style.left = '0px';
-  window.getComputedStyle(div).transitionProperty;
-  div.style.transition = 'all 100s';
-  div.style.left = '100px';
-
-  assert_equals(div.getAnimationPlayers()[0].source.effect.name, '',
-                'Animation effects for transitions have an empty name');
-  div.remove();
-}, 'Effect name for transitions');
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-pausing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-pausing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-pausing.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-pausing.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,253 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<style>
-@keyframes anim { 
-  0% { margin-left: 0px }
-  100% { margin-left: 10000px }
-}
-</style>
-<script>
-'use strict';
-
-function addDiv() {
-  var div = document.createElement('div');
-  document.body.appendChild(div);
-  return div;
-}
-
-function waitForFrame() {
-  return new Promise(function(resolve, reject) {
-    window.requestAnimationFrame(resolve);
-  });
-}
-
-function getMarginLeft(cs) {
-  return parseFloat(cs.marginLeft);
-}
-
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s';
-
-  var player = div.getAnimationPlayers()[0];
-
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-  var previousAnimVal = getMarginLeft(cs);
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_true(getMarginLeft(cs) > previousAnimVal,
-                  'margin-left is initially increasing');
-      previousAnimVal = getMarginLeft(cs);
-
-      player.pause();
-    });
-    return waitForFrame();
-  }).then(function() {
-    t.step(function() {
-      assert_equals(getMarginLeft(cs), previousAnimVal,
-                    'margin-left does not increase after calling pause()');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'pause() a running animation');
-
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s paused';
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-
-  player.pause();
-  div.style.animationPlayState = 'running';
-  cs.animationPlayState; // Trigger style resolution
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_equals(cs.animationPlayState, 'running',
-                    'animation-play-state is running');
-      assert_equals(getMarginLeft(cs), 0,
-                    'Paused value of margin-left is zero');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'pause() overrides animation-play-state');
-
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s paused';
-
-  var player = div.getAnimationPlayers()[0];
-
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-
-  player.play();
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_true(getMarginLeft(cs) > 0,
-                  'Playing value of margin-left is greater than zero');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'play() overrides animation-play-state');
-
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s paused';
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-
-  player.play();
-  div.style.animationPlayState = 'running';
-  cs.animationPlayState; // Trigger style resolution
-
-  var previousAnimVal;
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_equals(cs.animationPlayState, 'running',
-                    'animation-play-state is running');
-      previousAnimVal = getMarginLeft(cs);
-      div.style.animationPlayState = 'paused';
-      cs.animationPlayState; // Trigger style resolution
-    });
-    return waitForFrame();
-  }).then(function() {
-    t.step(function() {
-      assert_equals(cs.animationPlayState, 'paused',
-                    'animation-play-state is paused');
-      assert_equals(getMarginLeft(cs), previousAnimVal,
-                    'Animated value of margin-left does not change when'
-                    + ' paused by style');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'play() is overridden by later setting "animation-play-state: paused"');
-
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s';
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-
-  // Set the specified style first. If implementations fail to
-  // apply the style changes first, they will ignore the redundant
-  // call to play() and fail to correctly override the pause style.
-  div.style.animationPlayState = 'paused';
-  player.play();
-  var previousAnimVal = getMarginLeft(cs);
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_equals(cs.animationPlayState, 'paused',
-                    'animation-play-state is paused');
-      assert_true(getMarginLeft(cs) > previousAnimVal,
-                  'Playing value of margin-left is increasing');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'play() flushes pending changes to animation-play-state first');
-
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s paused';
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-
-  // Unlike the previous test for play(), since calling pause() is sticky,
-  // we'll apply it even if the underlying style also says we're paused.
-  // 
-  // We would like to test that implementations flush styles before running
-  // pause() but actually there's no style we can currently set that will
-  // change the behavior of pause(). That may change in the future
-  // (e.g. if we introduce animation-timeline or animation-playback-rate etc.).
-  //
-  // For now this just serves as a sanity check that we do the same thing
-  // even if we set style before calling the API.
-  div.style.animationPlayState = 'running';
-  player.pause();
-  var previousAnimVal = getMarginLeft(cs);
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_equals(cs.animationPlayState, 'running',
-                    'animation-play-state is paused');
-      assert_equals(getMarginLeft(cs), previousAnimVal,
-                    'Paused value of margin-left does not change');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'pause() applies pending changes to animation-play-state first');
-// (Note that we can't actually test for this; see comment above, in test-body.)
-
-/* Disabled until bug 1073336 lands */
-if (false) {
-async_test(function(t) {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-
-  div.style.marginLeft = '0px';
-  cs.marginLeft; // Flush style to set up transition start point
-  div.style.transition = 'margin-left 100s';
-  div.style.marginLeft = '10000px';
-  cs.marginLeft;
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(getMarginLeft(cs), 0,
-                'Initial value of margin-left is zero');
-  var previousAnimVal = getMarginLeft(cs);
-
-  waitForFrame().then(function() {
-    t.step(function() {
-      assert_true(getMarginLeft(cs) > previousAnimVal,
-                  'margin-left is initially increasing');
-      previousAnimVal = getMarginLeft(cs);
-      player.pause();
-    });
-    return waitForFrame();
-  }).then(function() {
-    t.step(function() {
-      assert_equals(getMarginLeft(cs), previousAnimVal,
-                    'margin-left does not increase after calling pause()');
-      previousAnimVal = getMarginLeft(cs);
-      player.play();
-    });
-    return waitForFrame();
-  }).then(function() {
-    t.step(function() {
-      assert_true(getMarginLeft(cs) > previousAnimVal,
-                  'margin-left increases after calling play()');
-    });
-    div.remove();
-    t.done();
-  });
-}, 'pause() and play() a transition');
-}
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-player-playstate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-player-playstate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-player-playstate.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-player-playstate.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<style>
-@keyframes anim { }
-</style>
-<script>
-'use strict';
-
-function addDiv() {
-  var div = document.createElement('div');
-  document.body.appendChild(div);
-  return div;
-}
-
-test(function() {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s';
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(player.playState, 'running');
-}, 'Player returns correct playState when running');
-
-test(function() {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s paused';
-
-  var player = div.getAnimationPlayers()[0];
-  assert_equals(player.playState, 'paused');
-}, 'Player returns correct playState when paused');
-
-test(function() {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s';
-
-  var player = div.getAnimationPlayers()[0];
-  player.pause();
-  assert_equals(player.playState, 'paused');
-}, 'Player.playState updates when paused by script');
-
-test(function() {
-  var div = addDiv();
-  var cs = window.getComputedStyle(div);
-  div.style.animation = 'anim 1000s paused';
-
-  var player = div.getAnimationPlayers()[0];
-  div.style.animationPlayState = 'running';
-  // This test also checks that calling playState flushes style
-  assert_equals(player.playState, 'running');
-}, 'Player.playState updates when resumed by setting style');
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animations-dynamic-changes.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animations-dynamic-changes.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animations-dynamic-changes.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animations-dynamic-changes.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<style>
-@keyframes anim1 {
-  to { left: 100px }
-}
-@keyframes anim2 { }
-</style>
-<script>
-'use strict';
-
-function addDiv() {
-  var div = document.createElement('div');
-  document.body.appendChild(div);
-  return div;
-}
-
-async_test(function(t) {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s';
-
-  var originalPlayer = div.getAnimationPlayers()[0];
-  var originalStartTime = originalPlayer.startTime;
-  var originalCurrentTime = originalPlayer.currentTime;
-
-  // Wait a moment so we can confirm the startTime doesn't change (and doesn't
-  // simply reflect the current time).
-  window.requestAnimationFrame(t.step_func(function() {
-    div.style.animationDuration = '200s';
-    var player = div.getAnimationPlayers()[0];
-    assert_equals(player, originalPlayer,
-                  'The same AnimationPlayer is returned after updating'
-                  + ' animation duration');
-    assert_equals(player.startTime, originalStartTime,
-                  'AnimationPlayers returned by getAnimationPlayers preserve'
-                  + ' their startTime even when they are updated');
-    // Sanity check
-    assert_not_equals(player.currentTime, originalCurrentTime,
-                      'AnimationPlayer.currentTime has updated in next'
-                      + ' requestAnimationFrame callback');
-    div.remove();
-    t.done();
-  }));
-}, 'AnimationPlayers preserve their startTime when changed');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s, anim1 100s';
-
-  // Store original state
-  var players = div.getAnimationPlayers();
-  var player1 = players[0];
-  var player2 = players[1];
-
-  // Update first in list
-  div.style.animationDuration = '200s, 100s';
-  players = div.getAnimationPlayers();
-  assert_equals(players[0], player1,
-                'First player is in same position after update');
-  assert_equals(players[1], player2,
-                'Second player is in same position after update');
-}, 'Updated AnimationPlayers maintain their order in the list');
-
-async_test(function(t) {
-  var div = addDiv();
-  div.style.animation = 'anim1 200s, anim1 100s';
-
-  // Store original state
-  var players = div.getAnimationPlayers();
-  var player1 = players[0];
-  var player2 = players[1];
-
-  // Wait before continuing so we can compare start times
-  window.requestAnimationFrame(t.step_func(function() {
-    // Swap duration of first and second in list and prepend animation at the
-    // same time
-    div.style.animation = 'anim1 100s, anim1 100s, anim1 200s';
-    players = div.getAnimationPlayers();
-    assert_true(players[0] !== player1 && players[0] !== player2,
-                'New player is prepended to start of list');
-    assert_equals(players[1], player1,
-                  'First player is in second position after update');
-    assert_equals(players[2], player2,
-                  'Second player is in third position after update');
-    assert_equals(players[1].startTime, players[2].startTime,
-                  'Old players have the same start time');
-    assert_true(players[0].startTime > players[1].startTime,
-                'New player has later start time');
-    div.remove();
-    t.done();
-  }));
-}, 'Only the startTimes of existing animations are preserved');
-
-async_test(function(t) {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s, anim1 100s';
-  var secondPlayer = div.getAnimationPlayers()[1];
-
-  // Wait before continuing so we can compare start times
-  window.requestAnimationFrame(t.step_func(function() {
-    // Trim list of animations
-    div.style.animationName = 'anim1';
-    var players = div.getAnimationPlayers();
-    assert_equals(players.length, 1, 'List of players was trimmed');
-    assert_equals(players[0], secondPlayer,
-                  'Remaining player is the second one in the list');
-    assert_true(players[0].startTime < players[0].timeline.currentTime,
-                'Remaining player preserves startTime');
-    div.remove();
-    t.done();
-  }));
-}, 'Animations are removed from the start of the list while preserving'
-   + ' the state of existing players');
-
-async_test(function(t) {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s';
-  var firstAddedPlayer = div.getAnimationPlayers()[0];
-
-  // Wait and add second player
-  window.requestAnimationFrame(t.step_func(function() {
-    div.style.animation = 'anim1 100s, anim1 100s';
-    var secondAddedPlayer = div.getAnimationPlayers()[0];
-
-    // Wait again and add another player
-    window.requestAnimationFrame(t.step_func(function() {
-      div.style.animation = 'anim1 100s, anim2 100s, anim1 100s';
-      var players = div.getAnimationPlayers();
-      assert_not_equals(firstAddedPlayer, secondAddedPlayer,
-                        'New players are added to start of the list');
-      assert_equals(players[0], secondAddedPlayer,
-                    'Second player remains in same position after'
-                    + ' interleaving');
-      assert_equals(players[2], firstAddedPlayer,
-                    'First player remains in same position after'
-                    + ' interleaving');
-      assert_true(players[1].startTime > players[0].startTime,
-                  'Interleaved player starts later than existing players');
-      assert_true(players[0].startTime > players[2].startTime,
-                  'Original players retain their start time');
-      div.remove();
-      t.done();
-    }));
-  }));
-}, 'Player state is preserved when interleaving animations in list');
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-target.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-target.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_animation-target.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_animation-target.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<style>
-@keyframes anim { }
-</style>
-<script>
-'use strict';
-
-function addDiv() {
-  var div = document.createElement('div');
-  document.body.appendChild(div);
-  return div;
-}
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'anim 100s';
-  var players = div.getAnimationPlayers();
-  assert_equals(players[0].source.target, div,
-    'Animation.target is the animatable div');
-  div.remove();
-}, 'Returned CSS animations have the correct Animation.target');
-
-test(function() {
-  var div = addDiv();
-
-  div.style.left = '0px';
-  window.getComputedStyle(div).transitionProperty;
-  div.style.transition = 'left 100s';
-  div.style.left = '100px';
-
-  var players = div.getAnimationPlayers();
-  assert_equals(players[0].source.target, div,
-    'Animation.target is the animatable div');
-  div.remove();
-}, 'Returned CSS transitions have the correct Animation.target');
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_element-get-animation-players.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_element-get-animation-players.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-integration/test_element-get-animation-players.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-integration/test_element-get-animation-players.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,344 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<style>
-@keyframes anim1 {
-  to { left: 100px }
-}
-@keyframes anim2 {
-  to { top: 100px }
-}
-@keyframes multiPropAnim {
-  to { background: green, opacity: 0.5, left: 100px, top: 100px }
-}
-@keyframes empty { }
-</style>
-<script>
-'use strict';
-
-function addDiv() {
-  var div = document.createElement('div');
-  document.body.appendChild(div);
-  return div;
-}
-
-test(function() {
-  var div = addDiv();
-  assert_equals(div.getAnimationPlayers().length, 0,
-    'getAnimationPlayers returns an empty sequence for an element'
-    + ' with no animations');
-  div.remove();
-}, 'getAnimationPlayers for non-animated content');
-
-async_test(function(t) {
-  var div = addDiv();
-
-  // Add an animation
-  div.style.animation = 'anim1 100s';
-  var players = div.getAnimationPlayers();
-  assert_equals(players.length, 1,
-    'getAnimationPlayers returns a player running CSS Animations');
-  var startTime = players[0].startTime;
-  assert_true(startTime > 0 && startTime <= document.timeline.currentTime,
-    'CSS animation has a sensible start time');
-
-  // Wait a moment then add a second animation.
-  //
-  // We wait for the next frame so that we can test that the start times of
-  // the animations differ.
-  window.requestAnimationFrame(t.step_func(function() {
-    div.style.animation = 'anim1 100s, anim2 100s';
-    players = div.getAnimationPlayers();
-    assert_equals(players.length, 2,
-      'getAnimationPlayers returns one player for each value of'
-      + ' animation-name');
-    assert_true(players[0].startTime < players[1].startTime,
-      'Additional players for CSS animations start after the original'
-      + ' animation and appear later in the list');
-    div.remove();
-    t.done();
-  }));
-}, 'getAnimationPlayers for CSS Animations');
-
-test(function() {
-  var div = addDiv();
-
-  // Add an animation that targets multiple properties
-  div.style.animation = 'multiPropAnim 100s';
-  assert_equals(div.getAnimationPlayers().length, 1,
-    'getAnimationPlayers returns only one player for a CSS Animation'
-    + ' that targets multiple properties');
-  div.remove();
-}, 'getAnimationPlayers for multi-property animations');
-
-async_test(function(t) {
-  var div = addDiv();
-
-  // Add a couple of transitions
-  div.style.left = '0px';
-  div.style.top = '0px';
-  window.getComputedStyle(div).transitionProperty;
-
-  div.style.transition = 'all 100s';
-  div.style.left = '100px';
-  div.style.top = '100px';
-
-  var players = div.getAnimationPlayers();
-  assert_equals(players.length, 2,
-    'getAnimationPlayers() returns one player per transitioning property');
-  var startTime = players[0].startTime;
-  assert_true(startTime > 0 && startTime <= document.timeline.currentTime,
-    'CSS transitions have sensible start times');
-  assert_equals(players[0].startTime, players[1].startTime,
-    'CSS transitions started together have the same start time');
-
-  // Wait a moment then add a third transition
-  window.requestAnimationFrame(t.step_func(function() {
-    div.style.backgroundColor = 'green';
-    players = div.getAnimationPlayers();
-    assert_equals(players.length, 3,
-      'getAnimationPlayers returns players for all running CSS Transitions');
-    assert_true(players[1].startTime < players[2].startTime,
-      'Player for additional CSS transition starts after the original'
-      + ' transitions and appears later in the list');
-    div.remove();
-    t.done();
-  }));
-}, 'getAnimationPlayers for CSS Transitions');
-
-async_test(function(t) {
-  var div = addDiv();
-
-  // Add an animation
-  div.style.backgroundColor = 'red';
-  div.style.animation = 'anim1 100s';
-  window.getComputedStyle(div).backgroundColor;
-
-  // Wait a moment then add a transition
-  window.requestAnimationFrame(t.step_func(function() {
-    div.style.transition = 'all 100s';
-    div.style.backgroundColor = 'green';
-
-    var players = div.getAnimationPlayers();
-    assert_equals(players.length, 2,
-      'getAnimationPlayers returns players for both animations and '
-      + ' transitions that run simultaneously');
-    assert_true(players[0].startTime > players[1].startTime,
-      'players for transitions appear before animations even if they '
-      + ' start later');
-    div.remove();
-    t.done();
-  }));
-}, 'getAnimationPlayers for both CSS Animations and Transitions at once');
-
-async_test(function(t) {
-  var div = addDiv();
-
-  // Set up event listener
-  div.addEventListener('animationend', t.step_func(function() {
-    assert_equals(div.getAnimationPlayers().length, 0,
-      'getAnimationPlayers does not return players for finished '
-      + ' (and non-forwards-filling) CSS Animations');
-    div.remove();
-    t.done();
-  }));
-
-  // Add a very short animation
-  div.style.animation = 'anim1 0.01s';
-}, 'getAnimationPlayers for CSS Animations that have finished');
-
-async_test(function(t) {
-  var div = addDiv();
-
-  // Set up event listener
-  div.addEventListener('animationend', t.step_func(function() {
-    assert_equals(div.getAnimationPlayers().length, 1,
-      'getAnimationPlayers returns players for CSS Animations that have'
-      + ' finished but are filling forwards');
-    div.remove();
-    t.done();
-  }));
-
-  // Add a very short animation
-  div.style.animation = 'anim1 0.01s forwards';
-}, 'getAnimationPlayers for CSS Animations that have finished but are'
-   + ' forwards filling');
-
-async_test(function(t) {
-  var div = addDiv();
-
-  // Set up event listener
-  div.addEventListener('transitionend', t.step_func(function() {
-    assert_equals(div.getAnimationPlayers().length, 0,
-      'getAnimationPlayers does not return finished CSS Transitions');
-    div.remove();
-    t.done();
-  }));
-
-  // Add a very short transition
-  div.style.left = '0px';
-  window.getComputedStyle(div).left;
-
-  div.style.transition = 'all 0.01s';
-  div.style.left = '100px';
-  window.getComputedStyle(div).left;
-}, 'getAnimationPlayers for CSS Transitions that have finished');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'none 100s';
-
-  var players = div.getAnimationPlayers();
-  assert_equals(players.length, 0,
-    'getAnimationPlayers returns an empty sequence for an element'
-    + ' with animation-name: none');
-
-  div.style.animation = 'none 100s, anim1 100s';
-  players = div.getAnimationPlayers();
-  assert_equals(players.length, 1,
-    'getAnimationPlayers returns players only for those CSS Animations whose'
-    + ' animation-name is not none');
-
-  div.remove();
-}, 'getAnimationPlayers for CSS Animations with animation-name: none');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'missing 100s';
-  var players = div.getAnimationPlayers();
-  assert_equals(players.length, 0,
-    'getAnimationPlayers returns an empty sequence for an element'
-    + ' with animation-name: missing');
-
-  div.style.animation = 'anim1 100s, missing 100s';
-  players = div.getAnimationPlayers();
-  assert_equals(players.length, 1,
-    'getAnimationPlayers returns players only for those CSS Animations whose'
-    + ' animation-name is found');
-
-  div.remove();
-}, 'getAnimationPlayers for CSS Animations with animation-name: missing');
-
-async_test(function(t) {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s, notyet 100s';
-  var players = div.getAnimationPlayers();
-  assert_equals(players.length, 1,
-    'getAnimationPlayers initally only returns players for CSS Animations whose'
-    + ' animation-name is found');
-
-  window.requestAnimationFrame(t.step_func(function() {
-    var keyframes = '@keyframes notyet { to { left: 100px; } }';
-    document.styleSheets[0].insertRule(keyframes, 0);
-    players = div.getAnimationPlayers();
-    assert_equals(players.length, 2,
-      'getAnimationPlayers includes player when @keyframes rule is added'
-      + ' later');
-    assert_true(players[0].startTime < players[1].startTime,
-      'Newly added player has a later start time');
-    document.styleSheets[0].deleteRule(0);
-    div.remove();
-    t.done();
-  }));
-}, 'getAnimationPlayers for CSS Animations where the @keyframes rule is added'
-   + ' later');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s, anim1 100s';
-  assert_equals(div.getAnimationPlayers().length, 2,
-    'getAnimationPlayers returns one player for each CSS animation-name'
-    + ' even if the names are duplicated');
-  div.remove();
-}, 'getAnimationPlayers for CSS Animations with duplicated animation-name');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'empty 100s';
-  assert_equals(div.getAnimationPlayers().length, 1,
-    'getAnimationPlayers returns players for CSS animations with an'
-    + ' empty keyframes rule');
-  div.remove();
-}, 'getAnimationPlayers for CSS Animations with empty keyframes rule');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s 100s';
-  var players = div.getAnimationPlayers();
-  assert_equals(players.length, 1,
-    'getAnimationPlayers returns animations for CSS animations whose'
-    + ' delay makes them start later');
-  assert_true(players[0].startTime <= document.timeline.currentTime,
-    'For CSS Animations in delay phase, the start time of the player is'
-    + ' not in the future');
-  div.remove();
-}, 'getAnimationPlayers for CSS animations in delay phase');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'anim1 0s 100s';
-  assert_equals(div.getAnimationPlayers().length, 1,
-    'getAnimationPlayers returns animations for CSS animations whose'
-    + ' duration is zero');
-  div.remove();
-}, 'getAnimationPlayers for zero-duration CSS Animations');
-
-test(function() {
-  var div = addDiv();
-
-  // Try to transition non-animatable property animation-duration
-  div.style.animationDuration = '10s';
-  window.getComputedStyle(div).animationDuration;
-
-  div.style.transition = 'all 100s';
-  div.style.animationDuration = '100s';
-
-  assert_equals(div.getAnimationPlayers().length, 0,
-    'getAnimationPlayers returns an empty sequence for a transition'
-    + ' of a non-animatable property');
-  div.remove();
-}, 'getAnimationPlayers for transition on non-animatable property');
-
-test(function() {
-  var div = addDiv();
-
-  div.style.setProperty('-vendor-unsupported', '0px', '');
-  window.getComputedStyle(div).transitionProperty;
-  div.style.transition = 'all 100s';
-  div.style.setProperty('-vendor-unsupported', '100px', '');
-
-  assert_equals(div.getAnimationPlayers().length, 0,
-    'getAnimationPlayers returns an empty sequence for a transition'
-    + ' of an unsupported property');
-  div.remove();
-}, 'getAnimationPlayers for transition on unsupported property');
-
-test(function() {
-  var div = addDiv();
-  div.style.animation = 'anim1 100s';
-  var originalPlayer = div.getAnimationPlayers()[0];
-
-  // Update pause state (an AnimationPlayer change)
-  div.style.animationPlayState = 'paused';
-  var pausedPlayer = div.getAnimationPlayers()[0];
-  assert_equals(pausedPlayer.playState, 'paused',
-                'player\'s paused state is updated');
-  assert_equals(originalPlayer, pausedPlayer,
-                'getAnimationPlayers returns the same objects even when their'
-                + ' play state changes');
-
-  // Update duration (an Animation change)
-  div.style.animationDuration = '200s';
-  var extendedPlayer = div.getAnimationPlayers()[0];
-  // FIXME: Check extendedPlayer.source.timing.duration has changed once the
-  // API is available
-  assert_equals(originalPlayer, extendedPlayer,
-                'getAnimationPlayers returns the same objects even when their'
-                + ' duration changes');
-
-  div.remove();
-}, 'getAnimationPlayers returns objects with the same identity');
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_animation-effect-name.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_animation-effect-name.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_animation-effect-name.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_animation-effect-name.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+
+  // Add a transition
+  div.style.left = '0px';
+  window.getComputedStyle(div).transitionProperty;
+  div.style.transition = 'all 100s';
+  div.style.left = '100px';
+
+  assert_equals(div.getAnimationPlayers()[0].source.effect.name, '',
+                'Animation effects for transitions have an empty name');
+  div.remove();
+}, 'Effect name for transitions');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_animation-pausing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_animation-pausing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_animation-pausing.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_animation-pausing.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,66 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+function waitForFrame() {
+  return new Promise(function(resolve, reject) {
+    window.requestAnimationFrame(resolve);
+  });
+}
+
+function getMarginLeft(cs) {
+  return parseFloat(cs.marginLeft);
+}
+
+async_test(function(t) {
+  var div = addDiv();
+  var cs = window.getComputedStyle(div);
+
+  div.style.marginLeft = '0px';
+  cs.marginLeft; // Flush style to set up transition start point
+  div.style.transition = 'margin-left 100s';
+  div.style.marginLeft = '10000px';
+  cs.marginLeft;
+
+  var player = div.getAnimationPlayers()[0];
+  assert_equals(getMarginLeft(cs), 0,
+                'Initial value of margin-left is zero');
+  var previousAnimVal = getMarginLeft(cs);
+
+  waitForFrame().then(function() {
+    t.step(function() {
+      assert_true(getMarginLeft(cs) > previousAnimVal,
+                  'margin-left is initially increasing');
+      previousAnimVal = getMarginLeft(cs);
+      player.pause();
+    });
+    return waitForFrame();
+  }).then(function() {
+    t.step(function() {
+      assert_equals(getMarginLeft(cs), previousAnimVal,
+                    'margin-left does not increase after calling pause()');
+      previousAnimVal = getMarginLeft(cs);
+      player.play();
+    });
+    return waitForFrame();
+  }).then(function() {
+    t.step(function() {
+      assert_true(getMarginLeft(cs) > previousAnimVal,
+                  'margin-left increases after calling play()');
+    });
+    div.remove();
+    t.done();
+  });
+}, 'pause() and play() a transition');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_animation-target.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_animation-target.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_animation-target.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_animation-target.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+test(function() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+
+  div.style.left = '0px';
+  window.getComputedStyle(div).transitionProperty;
+  div.style.transition = 'left 100s';
+  div.style.left = '100px';
+
+  var players = div.getAnimationPlayers();
+  assert_equals(players[0].source.target, div,
+    'Animation.target is the animatable div');
+  div.remove();
+}, 'Returned CSS transitions have the correct Animation.target');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_element-get-animation-players.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_element-get-animation-players.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/css-transitions/test_element-get-animation-players.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/css-transitions/test_element-get-animation-players.html	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,100 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+function addDiv() {
+  var div = document.createElement('div');
+  document.body.appendChild(div);
+  return div;
+}
+
+async_test(function(t) {
+  var div = addDiv();
+
+  // Add a couple of transitions
+  div.style.left = '0px';
+  div.style.top = '0px';
+  window.getComputedStyle(div).transitionProperty;
+
+  div.style.transition = 'all 100s';
+  div.style.left = '100px';
+  div.style.top = '100px';
+
+  var players = div.getAnimationPlayers();
+  assert_equals(players.length, 2,
+    'getAnimationPlayers() returns one player per transitioning property');
+  var startTime = players[0].startTime;
+  assert_true(startTime > 0 && startTime <= document.timeline.currentTime,
+    'CSS transitions have sensible start times');
+  assert_equals(players[0].startTime, players[1].startTime,
+    'CSS transitions started together have the same start time');
+
+  // Wait a moment then add a third transition
+  window.requestAnimationFrame(t.step_func(function() {
+    div.style.backgroundColor = 'green';
+    players = div.getAnimationPlayers();
+    assert_equals(players.length, 3,
+      'getAnimationPlayers returns players for all running CSS Transitions');
+    assert_true(players[1].startTime < players[2].startTime,
+      'Player for additional CSS transition starts after the original'
+      + ' transitions and appears later in the list');
+    div.remove();
+    t.done();
+  }));
+}, 'getAnimationPlayers for CSS Transitions');
+
+async_test(function(t) {
+  var div = addDiv();
+
+  // Set up event listener
+  div.addEventListener('transitionend', t.step_func(function() {
+    assert_equals(div.getAnimationPlayers().length, 0,
+      'getAnimationPlayers does not return finished CSS Transitions');
+    div.remove();
+    t.done();
+  }));
+
+  // Add a very short transition
+  div.style.left = '0px';
+  window.getComputedStyle(div).left;
+
+  div.style.transition = 'all 0.01s';
+  div.style.left = '100px';
+  window.getComputedStyle(div).left;
+}, 'getAnimationPlayers for CSS Transitions that have finished');
+
+test(function() {
+  var div = addDiv();
+
+  // Try to transition non-animatable property animation-duration
+  div.style.animationDuration = '10s';
+  window.getComputedStyle(div).animationDuration;
+
+  div.style.transition = 'all 100s';
+  div.style.animationDuration = '100s';
+
+  assert_equals(div.getAnimationPlayers().length, 0,
+    'getAnimationPlayers returns an empty sequence for a transition'
+    + ' of a non-animatable property');
+  div.remove();
+}, 'getAnimationPlayers for transition on non-animatable property');
+
+test(function() {
+  var div = addDiv();
+
+  div.style.setProperty('-vendor-unsupported', '0px', '');
+  window.getComputedStyle(div).transitionProperty;
+  div.style.transition = 'all 100s';
+  div.style.setProperty('-vendor-unsupported', '100px', '');
+
+  assert_equals(div.getAnimationPlayers().length, 0,
+    'getAnimationPlayers returns an empty sequence for a transition'
+    + ' of an unsupported property');
+  div.remove();
+}, 'getAnimationPlayers for transition on unsupported property');
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/animation/test/mochitest.ini	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/animation/test/mochitest.ini	2014-11-26 21:45:54.000000000 +0000
@@ -1,9 +1,14 @@
 [animation-timeline/test_animation-timeline.html]
 skip-if = buildapp == 'mulet'
-[css-integration/test_element-get-animation-players.html]
+[css-animations/test_animations-dynamic-changes.html]
+[css-animations/test_animation-effect-name.html]
+[css-animations/test_animation-pausing.html]
+[css-animations/test_animation-player-playstate.html]
+[css-animations/test_animation-target.html]
+[css-animations/test_element-get-animation-players.html]
+skip-if = buildapp == 'mulet'
+[css-transitions/test_animation-effect-name.html]
+[css-transitions/test_animation-pausing.html]
+[css-transitions/test_animation-target.html]
+[css-transitions/test_element-get-animation-players.html]
 skip-if = buildapp == 'mulet'
-[css-integration/test_animations-dynamic-changes.html]
-[css-integration/test_animation-effect-name.html]
-[css-integration/test_animation-pausing.html]
-[css-integration/test_animation-player-playstate.html]
-[css-integration/test_animation-target.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/tests/file_packaged_app.sjs thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/tests/file_packaged_app.sjs
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/tests/file_packaged_app.sjs	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/tests/file_packaged_app.sjs	2014-11-26 21:45:54.000000000 +0000
@@ -30,6 +30,10 @@
   var alreadyDeferred = Number(getState("alreadyDeferred"));
   var role = query.role || "";
 
+  var failPackageDownloadOnce = "failPackageDownloadOnce" in query;
+  var failOnce = "failOnce" in query;
+  var alreadyFailed = Number(getState("alreadyFailed"));
+
   if (allowCancel && getPackage && !alreadyDeferred) {
     // Only do this for the actual package delivery.
     response.processAsync();
@@ -37,6 +41,15 @@
     setState("alreadyDeferred", "1");
   }
 
+  if (failOnce && !alreadyFailed) {
+    setState("alreadyFailed", "1");
+    // We need to simulate a network error... let's just try closing the connection
+    // without any output
+    response.seizePower();
+    response.finish();
+    return;
+  }
+
   response.setHeader("Access-Control-Allow-Origin", "*", false);
 
   // If this is a version update, update state, prepare the manifest,
@@ -49,8 +62,9 @@
 
     setState("packageName", packageName);
     var packagePath = "/" + gBasePath + "file_packaged_app.sjs?" +
-                      (allowCancel?"allowCancel&": "") + "getPackage=" +
-                      packageName;
+                      (allowCancel ? "allowCancel&" : "") +
+                      (failPackageDownloadOnce ? "failOnce&" : "") +
+                      "getPackage=" + packageName;
     setState("packagePath", packagePath);
 
     if (version == packageVersion) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/tests/test_packaged_app_common.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/tests/test_packaged_app_common.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/tests/test_packaged_app_common.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/tests/test_packaged_app_common.js	2014-11-26 21:45:55.000000000 +0000
@@ -57,17 +57,22 @@
     finish();
   }
 
-  function setAppVersion(aVersion, aCb, aDontUpdatePackage, aAllowCancel, aRole) {
+  function setAppVersion(aVersion, aCb, aDontUpdatePackage, aAllowCancel, aRole, aFailOnce) {
     var xhr = new XMLHttpRequest();
     var dontUpdate = "";
     var allowCancel = "";
+    var failOnce = "";
     if (aDontUpdatePackage) {
       dontUpdate = "&dontUpdatePackage=1";
     }
     if (aAllowCancel) {
       allowCancel= "&allowCancel=1";
     }
-    var url = gSJS + "?setVersion=" + aVersion + dontUpdate + allowCancel;
+    if (aFailOnce) {
+      failOnce = "&failPackageDownloadOnce=1";
+    }
+    var url = gSJS + "?setVersion=" + aVersion + dontUpdate + allowCancel +
+                failOnce;
     if (aRole) {
       url += "&role=" + aRole;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/tests/test_packaged_app_update.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/tests/test_packaged_app_update.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/tests/test_packaged_app_update.html	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/tests/test_packaged_app_update.html	2014-11-26 21:45:55.000000000 +0000
@@ -72,12 +72,13 @@
                                    expected, true, false, aCb);
 }
 
-function updateApp(aExpectedReady, aPreviousVersion, aNextVersion) {
+function updateApp(aExpectedReady, aPreviousVersion, aNextVersion, aFailOnError) {
   var lApp = PackagedTestHelper.gApp;
 
   var ondownloadappliedhandler =
     checkLastAppState.bind(PackagedTestHelper, miniManifestURL, false, false,
-                           aNextVersion, PackagedTestHelper.next);
+                           aNextVersion,
+                           setTimeout.bind(undefined, PackagedTestHelper.next, 500));
 
   var ondownloadsuccesshandler =
     checkLastAppState.bind(undefined, miniManifestURL,
@@ -86,8 +87,15 @@
       navigator.mozApps.mgmt.applyDownload(lApp);
   });
 
+  var ondownloaderrorhandler = aFailOnError ?
+    function() {
+      ok(false, "We should not get an error but got " +
+         lApp.downloadError.name);
+      PackagedTestHelper.finish();
+    } : null;
+
   checkForUpdate(true, ondownloadsuccesshandler, ondownloadappliedhandler,
-                 null, true);
+                 ondownloaderrorhandler, true);
 
 }
 
@@ -238,12 +246,58 @@
   },
   function() {
     info("== TEST == Update packaged app - same package");
-    updateApp(false, 3, 3);
+    updateApp(false, 3, 3, true);
   },
   function() {
     info("== TEST == Check for Update after getting the same package");
     checkForUpdate(false);
   },
+
+  function() {
+    PackagedTestHelper.setAppVersion(5, PackagedTestHelper.next,
+                                     /* aDontUpdatePackage */ false,
+                                     /* aAllowCancel */ false,
+                                     /* aRole */ undefined,
+                                     /* aFailOnce */ true);
+
+  },
+  function() {
+    info("== TEST == Update packaged app - fail the update once");
+
+    var downloadSuccess = function() {
+      ok(false, "We got an unexpected downloadsuccess or downloadapplied");
+      PackagedTestHelper.finish();
+    };
+    var downloadError = function() {
+      info("We got an expected download error: " +
+           PackagedTestHelper.gApp.downloadError.name);
+      PackagedTestHelper.next();
+    };
+    checkForUpdate(true, downloadSuccess, downloadSuccess, downloadError,
+                   /* aLaunchDownload */ true);
+  },
+  function() {
+    info("=== TEST == Update packaged app - apply the update after failing");
+    var lApp = PackagedTestHelper.gApp;
+    lApp.ondownloadsuccess = function() {
+      info("Download succeeded, applying it");
+      navigator.mozApps.mgmt.applyDownload(lApp);
+    };
+    lApp.ondownloadapplied = function() {
+      info("Download successfuly applied");
+      PackagedTestHelper.next();
+    };
+    lApp.ondownloaderror = function() {
+      ok(false, "Got an unexpected error: " + lApp.downloaderror.name);
+      PackagedTestHelper.finish();
+    };
+    lApp.download();
+  },
+  function() {
+    info("== TEST == Check for Update applying a previously failed package");
+    checkForUpdate(false);
+  },
+
   function() {
     PackagedTestHelper.setAppVersion(1, PackagedTestHelper.next);
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/Webapps.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/Webapps.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/apps/Webapps.jsm	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/apps/Webapps.jsm	2014-11-26 21:45:54.000000000 +0000
@@ -3263,7 +3263,7 @@
       // can proceed to access the app. We also throw an error to alert
       // the caller that the package wasn't downloaded.
       this._sendAppliedEvent(aOldApp);
-      throw new Error("PACKAGE_UNCHANGED");
+      throw "PACKAGE_UNCHANGED";
     }
 
     let newManifest = yield this._openAndReadPackage(zipFile, aOldApp, aNewApp,
@@ -3922,6 +3922,13 @@
       return;
     }
 
+    // If the error that got us here was that the package hasn't changed,
+    // since we already sent a success and an applied, let's not confuse
+    // the clients...
+    if (aError == "PACKAGE_UNCHANGED") {
+      return;
+    }
+
     let download = AppDownloadManager.get(aNewApp.manifestURL);
     aOldApp.downloading = false;
 
@@ -3933,7 +3940,9 @@
                                     : aIsUpdate ? "installed"
                                                 : "pending";
 
-    if (aOldApp.staged) {
+    // Erase the .staged properties only if there's no download available
+    // anymore.
+    if (!aOldApp.downloadAvailable && aOldApp.staged) {
       delete aOldApp.staged;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Console.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Console.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Console.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Console.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -805,6 +805,31 @@
   return NS_OK;
 }
 
+class ConsoleTimelineMarker : public nsDocShell::TimelineMarker
+{
+public:
+  ConsoleTimelineMarker(nsDocShell* aDocShell,
+                        TracingMetadata aMetaData,
+                        const nsAString& aCause)
+    : nsDocShell::TimelineMarker(aDocShell, "ConsoleTime", aMetaData, aCause)
+  {
+  }
+
+  virtual bool Equals(const nsDocShell::TimelineMarker* aOther)
+  {
+    if (!nsDocShell::TimelineMarker::Equals(aOther)) {
+      return false;
+    }
+    // Console markers must have matching causes as well.
+    return GetCause() == aOther->GetCause();
+  }
+
+  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker)
+  {
+    aMarker.mCauseName.Construct(GetCause());
+  }
+};
+
 // Queue a call to a console method. See the CALL_DELAY constant.
 void
 Console::Method(JSContext* aCx, MethodName aMethodName,
@@ -925,7 +950,6 @@
       callData->mMonotonicTimer = performance->Now();
 
       // 'time' and 'timeEnd' are displayed in the devtools timeline if active.
-      // Marked as "ConsoleTime:ARG1".
       bool isTimelineRecording = false;
       nsDocShell* docShell = static_cast<nsDocShell*>(mWindow->GetDocShell());
       if (docShell) {
@@ -938,10 +962,11 @@
         if (jsString) {
           nsAutoJSString key;
           if (key.init(aCx, jsString)) {
-            nsCString str("ConsoleTime:");
-            AppendUTF16toUTF8(key, str);
-            docShell->AddProfileTimelineMarker(str.get(),
-              aMethodName == MethodTime ? TRACING_INTERVAL_START : TRACING_INTERVAL_END);
+            mozilla::UniquePtr<nsDocShell::TimelineMarker> marker =
+              MakeUnique<ConsoleTimelineMarker>(docShell,
+                                                aMethodName == MethodTime ? TRACING_INTERVAL_START : TRACING_INTERVAL_END,
+                                                key);
+            docShell->AddProfileTimelineMarker(marker);
           }
         }
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Element.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Element.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Element.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Element.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -25,6 +25,7 @@
 #include "nsIDOMDocument.h"
 #include "nsIContentIterator.h"
 #include "nsFocusManager.h"
+#include "nsFrameManager.h"
 #include "nsILinkHandler.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIURL.h"
@@ -137,6 +138,7 @@
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "mozilla/dom/ElementBinding.h"
+#include "mozilla/dom/VRDevice.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -976,6 +978,7 @@
     nsIPresShell* shell = doc->GetShell();
     if (shell) {
       shell->DestroyFramesFor(this, &destroyedFramesFor);
+      MOZ_ASSERT(!shell->FrameManager()->GetDisplayContentsStyleFor(this));
     }
   }
   MOZ_ASSERT(!GetPrimaryFrame());
@@ -1469,7 +1472,17 @@
                NODE_NEEDS_FRAME | NODE_DESCENDANTS_NEED_FRAMES |
                // And the restyle bits
                ELEMENT_ALL_RESTYLE_FLAGS);
-  } else if (!IsInShadowTree()) {
+  } else if (IsInShadowTree()) {
+    // We're not in a document, but we did get inserted into a shadow tree.
+    // Since we won't have any restyle data in the document's restyle trackers,
+    // don't let us get inserted with restyle bits set incorrectly.
+    //
+    // Also clear all the other flags that are cleared above when we do get
+    // inserted into a document.
+    UnsetFlags(NODE_FORCE_XBL_BINDINGS |
+               NODE_NEEDS_FRAME | NODE_DESCENDANTS_NEED_FRAMES |
+               ELEMENT_ALL_RESTYLE_FLAGS);
+  } else {
     // If we're not in the doc and not in a shadow tree,
     // update our subtree pointer.
     SetSubtreeRootPointer(aParent->SubtreeRoot());
@@ -3061,7 +3074,7 @@
 }
 
 void
-Element::MozRequestFullScreen()
+Element::MozRequestFullScreen(const RequestFullscreenOptions& aOptions)
 {
   // Only grant full-screen requests if this is called from inside a trusted
   // event handler (i.e. inside an event handler for a user initiated event).
@@ -3085,7 +3098,12 @@
     return;
   }
 
-  OwnerDoc()->AsyncRequestFullScreen(this);
+  FullScreenOptions opts;
+  if (aOptions.mVrDisplay) {
+    opts.mVRHMDDevice = aOptions.mVrDisplay->GetHMD();
+  }
+
+  OwnerDoc()->AsyncRequestFullScreen(this, opts);
 
   return;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Element.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Element.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Element.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Element.h	2014-11-26 21:45:55.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/WindowBinding.h"
+#include "mozilla/dom/ElementBinding.h"
 #include "Units.h"
 
 class nsIDOMEventListener;
@@ -724,7 +725,7 @@
       nsIPresShell::SetCapturingContent(nullptr, 0);
     }
   }
-  void MozRequestFullScreen();
+  void MozRequestFullScreen(const RequestFullscreenOptions& aOptions);
   void MozRequestPointerLock();
   Attr* GetAttributeNode(const nsAString& aName);
   already_AddRefed<Attr> SetAttributeNode(Attr& aNewAttr,
@@ -1768,7 +1769,7 @@
 }                                                                             \
 NS_IMETHOD MozRequestFullScreen(void) MOZ_FINAL                               \
 {                                                                             \
-  Element::MozRequestFullScreen();                                            \
+  Element::MozRequestFullScreen(mozilla::dom::RequestFullscreenOptions());    \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD MozRequestPointerLock(void) MOZ_FINAL                              \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/EventSource.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/EventSource.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/EventSource.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/EventSource.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -62,7 +62,6 @@
   mGoingToDispatchAllMessages(false),
   mWithCredentials(false),
   mWaitingForOnStopRequest(false),
-  mInterrupted(false),
   mLastConvertionResult(NS_OK),
   mReadyState(CONNECTING),
   mScriptLine(0),
@@ -341,21 +340,14 @@
   nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  bool requestSucceeded;
-  rv = httpChannel->GetRequestSucceeded(&requestSucceeded);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString contentType;
-  rv = httpChannel->GetContentType(contentType);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   nsresult status;
-  aRequest->GetStatus(&status);
+  rv = aRequest->GetStatus(&status);
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  if (NS_FAILED(status) || !requestSucceeded ||
-      !contentType.EqualsLiteral(TEXT_EVENT_STREAM)) {
-    DispatchFailConnection();
-    return NS_ERROR_NOT_AVAILABLE;
+  if (NS_FAILED(status)) {
+    // EventSource::OnStopRequest will evaluate if it shall either reestablish
+    // or fail the connection
+    return NS_ERROR_ABORT;
   }
 
   uint32_t httpStatus;
@@ -363,7 +355,15 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (httpStatus != 200) {
-    mInterrupted = true;
+    DispatchFailConnection();
+    return NS_ERROR_ABORT;
+  }
+
+  nsAutoCString contentType;
+  rv = httpChannel->GetContentType(contentType);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!contentType.EqualsLiteral(TEXT_EVENT_STREAM)) {
     DispatchFailConnection();
     return NS_ERROR_ABORT;
   }
@@ -454,19 +454,27 @@
     return NS_ERROR_ABORT;
   }
 
-  if (NS_FAILED(aStatusCode)) {
+  // "Network errors that prevents the connection from being established in the
+  //  first place (e.g. DNS errors), must cause the user agent to asynchronously
+  //  reestablish the connection.
+  //
+  //  (...) the cancelation of the fetch algorithm by the user agent (e.g. in
+  //  response to window.stop() or the user canceling the network connection
+  //  manually) must cause the user agent to fail the connection.
+
+  if (NS_FAILED(aStatusCode) &&
+      aStatusCode != NS_ERROR_CONNECTION_REFUSED &&
+      aStatusCode != NS_ERROR_NET_TIMEOUT &&
+      aStatusCode != NS_ERROR_NET_RESET &&
+      aStatusCode != NS_ERROR_NET_INTERRUPT &&
+      aStatusCode != NS_ERROR_PROXY_CONNECTION_REFUSED &&
+      aStatusCode != NS_ERROR_DNS_LOOKUP_QUEUE_FULL) {
     DispatchFailConnection();
-    return aStatusCode;
+    return NS_ERROR_ABORT;
   }
 
-  nsresult rv;
-  nsresult healthOfRequestResult = CheckHealthOfRequestCallback(aRequest);
-  if (NS_SUCCEEDED(healthOfRequestResult) &&
-      mLastConvertionResult == NS_PARTIAL_MORE_INPUT) {
-    // we had an incomplete UTF8 char at the end of the stream
-    rv = ParseCharacter(REPLACEMENT_CHAR);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
+  nsresult rv = CheckHealthOfRequestCallback(aRequest);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   ClearFields();
 
@@ -477,7 +485,7 @@
   rv = NS_DispatchToMainThread(event);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return healthOfRequestResult;
+  return NS_OK;
 }
 
 /**
@@ -692,6 +700,17 @@
   return NS_OK;
 }
 
+net::ReferrerPolicy
+EventSource::GetReferrerPolicy()
+{
+  nsresult rv;
+  nsIScriptContext* sc = GetContextForEventHandlers(&rv);
+  NS_ENSURE_SUCCESS(rv, mozilla::net::RP_Default);
+
+  nsCOMPtr<nsIDocument> doc = nsContentUtils::GetDocumentFromScriptContext(sc);
+  return doc ? doc->GetReferrerPolicy() : mozilla::net::RP_Default;
+}
+
 nsresult
 EventSource::SetupHttpChannel()
 {
@@ -712,7 +731,7 @@
   nsCOMPtr<nsIURI> codebase;
   nsresult rv = GetBaseURI(getter_AddRefs(codebase));
   if (NS_SUCCEEDED(rv)) {
-    rv = mHttpChannel->SetReferrer(codebase);
+    rv = mHttpChannel->SetReferrerWithPolicy(codebase, this->GetReferrerPolicy());
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
@@ -869,11 +888,6 @@
     return;
   }
 
-  if (mReadyState != OPEN) {
-    NS_WARNING("Unexpected mReadyState!!!");
-    return;
-  }
-
   nsresult rv = ResetConnection();
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to reset the connection!!!");
@@ -994,7 +1008,7 @@
   NS_ConvertUTF8toUTF16 specUTF16(targetSpec);
   const char16_t *formatStrings[] = { specUTF16.get() };
 
-  if (mReadyState == CONNECTING && !mInterrupted) {
+  if (mReadyState == CONNECTING) {
     rv = PrintErrorOnConsole("chrome://global/locale/appstrings.properties",
                              MOZ_UTF16("connectionFailure"),
                              formatStrings, ArrayLength(formatStrings));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/EventSource.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/EventSource.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/EventSource.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/EventSource.h	2014-11-26 21:45:55.000000000 +0000
@@ -109,6 +109,8 @@
 
   nsresult GetBaseURI(nsIURI **aBaseURI);
 
+  net::ReferrerPolicy GetReferrerPolicy();
+
   nsresult SetupHttpChannel();
   nsresult InitChannelAndRequestEventSource();
   nsresult ResetConnection();
@@ -221,7 +223,6 @@
   bool mGoingToDispatchAllMessages;
   bool mWithCredentials;
   bool mWaitingForOnStopRequest;
-  bool mInterrupted;
 
   // used while reading the input streams
   nsCOMPtr<nsIUnicodeDecoder> mUnicodeDecoder;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Navigator.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Navigator.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Navigator.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Navigator.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -40,6 +40,7 @@
 #include "mozilla/dom/Telephony.h"
 #include "mozilla/dom/Voicemail.h"
 #include "mozilla/dom/TVManager.h"
+#include "mozilla/dom/VRDevice.h"
 #include "mozilla/Hal.h"
 #include "nsISiteSpecificUserAgent.h"
 #include "mozilla/ClearOnShutdown.h"
@@ -1722,6 +1723,32 @@
 }
 #endif
 
+already_AddRefed<Promise>
+Navigator::GetVRDevices(ErrorResult& aRv)
+{
+  if (!mWindow || !mWindow->GetDocShell()) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIGlobalObject> go = do_QueryInterface(mWindow);
+  nsRefPtr<Promise> p = Promise::Create(go, aRv);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  nsGlobalWindow* win = static_cast<nsGlobalWindow*>(mWindow.get());
+
+  nsTArray<nsRefPtr<VRDevice>> vrDevs;
+  if (!win->GetVRDevices(vrDevs)) {
+    p->MaybeReject(NS_ERROR_FAILURE);
+  } else {
+    p->MaybeResolve(vrDevs);
+  }
+
+  return p.forget();
+}
+
 //*****************************************************************************
 //    Navigator::nsIMozNavigatorNetwork
 //*****************************************************************************
@@ -2533,5 +2560,43 @@
   return siteSpecificUA->GetUserAgentForURIAndWindow(aURI, aWindow, aUserAgent);
 }
 
+#ifdef MOZ_EME
+already_AddRefed<Promise>
+Navigator::RequestMediaKeySystemAccess(const nsAString& aKeySystem,
+                                       const Optional<Sequence<MediaKeySystemOptions>>& aOptions,
+                                       ErrorResult& aRv)
+{
+  nsCOMPtr<nsIGlobalObject> go = do_QueryInterface(mWindow);
+  nsRefPtr<Promise> p = Promise::Create(go, aRv);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  if (aKeySystem.IsEmpty() ||
+      (aOptions.WasPassed() && aOptions.Value().IsEmpty())) {
+    p->MaybeReject(NS_ERROR_DOM_INVALID_ACCESS_ERR);
+    return p.forget();
+  }
+
+  if (!MediaKeySystemAccess::IsKeySystemSupported(aKeySystem)) {
+    p->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return p.forget();
+  }
+
+  // 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));
+    p->MaybeResolve(access);
+    return p.forget();
+  }
+
+  p->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+
+  return p.forget();
+}
+#endif
+
 } // namespace dom
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Navigator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Navigator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/Navigator.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/Navigator.h	2014-11-26 21:45:55.000000000 +0000
@@ -18,6 +18,9 @@
 #include "nsInterfaceHashtable.h"
 #include "nsString.h"
 #include "nsTArray.h"
+#ifdef MOZ_EME
+#include "mozilla/dom/MediaKeySystemAccess.h"
+#endif
 
 class nsPluginArray;
 class nsMimeTypeArray;
@@ -243,6 +246,7 @@
 #ifdef MOZ_GAMEPAD
   void GetGamepads(nsTArray<nsRefPtr<Gamepad> >& aGamepads, ErrorResult& aRv);
 #endif // MOZ_GAMEPAD
+  already_AddRefed<Promise> GetVRDevices(ErrorResult& aRv);
 #ifdef MOZ_B2G_FM
   FMRadio* GetMozFMRadio(ErrorResult& aRv);
 #endif
@@ -316,6 +320,13 @@
 
   virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
 
+#ifdef MOZ_EME
+  already_AddRefed<Promise>
+  RequestMediaKeySystemAccess(const nsAString& aKeySystem,
+                              const Optional<Sequence<MediaKeySystemOptions>>& aOptions,
+                              ErrorResult& aRv);
+#endif
+
 private:
   virtual ~Navigator();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentAreaDragDrop.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentAreaDragDrop.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentAreaDragDrop.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentAreaDragDrop.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -158,7 +158,10 @@
 
   persist->SetPersistFlags(nsIWebBrowserPersist::PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION);
 
-  return persist->SavePrivacyAwareURI(sourceURI, nullptr, nullptr, nullptr, nullptr,
+  // referrer policy can be anything since the referrer is nullptr
+  return persist->SavePrivacyAwareURI(sourceURI, nullptr, nullptr,
+                                      mozilla::net::RP_Default,
+                                      nullptr, nullptr,
                                       inDestFile, isPrivate);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentSink.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentSink.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentSink.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentSink.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -736,7 +736,7 @@
   // We don't support CORS for processing instructions
   bool isAlternate;
   rv = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, aAlternate,
-                                 CORS_NONE,
+                                 CORS_NONE, mDocument->GetReferrerPolicy(),
                                  mRunsToCompletion ? nullptr : this, &isAlternate);
   NS_ENSURE_SUCCESS(rv, rv);
   
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentUtils.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentUtils.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -2985,6 +2985,7 @@
 nsresult
 nsContentUtils::LoadImage(nsIURI* aURI, nsIDocument* aLoadingDocument,
                           nsIPrincipal* aLoadingPrincipal, nsIURI* aReferrer,
+                          net::ReferrerPolicy aReferrerPolicy,
                           imgINotificationObserver* aObserver, int32_t aLoadFlags,
                           const nsAString& initiatorType,
                           imgRequestProxy** aRequest,
@@ -3016,6 +3017,7 @@
   return imgLoader->LoadImage(aURI,                 /* uri to load */
                               documentURI,          /* initialDocumentURI */
                               aReferrer,            /* referrer */
+                              aReferrerPolicy,      /* referrer policy */
                               aLoadingPrincipal,    /* loading principal */
                               loadGroup,            /* loadgroup */
                               aObserver,            /* imgINotificationObserver */
@@ -5749,6 +5751,23 @@
 {
   NS_PRECONDITION(aURI, "missing uri");
 
+  // For Blob URI we have to return the origin of page using its principal.
+  nsCOMPtr<nsIURIWithPrincipal> uriWithPrincipal = do_QueryInterface(aURI);
+  if (uriWithPrincipal) {
+    nsCOMPtr<nsIPrincipal> principal;
+    uriWithPrincipal->GetPrincipal(getter_AddRefs(principal));
+
+    if (principal) {
+      nsCOMPtr<nsIURI> uri;
+      nsresult rv = principal->GetURI(getter_AddRefs(uri));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      if (uri && uri != aURI) {
+        return GetASCIIOrigin(uri, aOrigin);
+      }
+    }
+  }
+
   aOrigin.Truncate();
 
   nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
@@ -5807,6 +5826,23 @@
 {
   NS_PRECONDITION(aURI, "missing uri");
 
+  // For Blob URI we have to return the origin of page using its principal.
+  nsCOMPtr<nsIURIWithPrincipal> uriWithPrincipal = do_QueryInterface(aURI);
+  if (uriWithPrincipal) {
+    nsCOMPtr<nsIPrincipal> principal;
+    uriWithPrincipal->GetPrincipal(getter_AddRefs(principal));
+
+    if (principal) {
+      nsCOMPtr<nsIURI> uri;
+      nsresult rv = principal->GetURI(getter_AddRefs(uri));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      if (uri && uri != aURI) {
+        return GetUTFOrigin(uri, aOrigin);
+      }
+    }
+  }
+
   aOrigin.Truncate();
 
   nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsContentUtils.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsContentUtils.h	2014-11-26 21:45:55.000000000 +0000
@@ -30,6 +30,7 @@
 #include "mozilla/dom/AutocompleteInfoBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/net/ReferrerPolicy.h"
 #include "nsIContentPolicy.h"
 
 #if defined(XP_WIN)
@@ -619,6 +620,8 @@
    * @param aLoadingDocument the document we belong to
    * @param aLoadingPrincipal the principal doing the load
    * @param aReferrer the referrer URI
+   * @param aReferrerPolicy the referrer-sending policy to use on channel
+   *         creation
    * @param aObserver the observer for the image load
    * @param aLoadFlags the load flags to use.  See nsIRequest
    * @param [aContentPolicyType=nsIContentPolicy::TYPE_IMAGE] (Optional)
@@ -629,6 +632,7 @@
                             nsIDocument* aLoadingDocument,
                             nsIPrincipal* aLoadingPrincipal,
                             nsIURI* aReferrer,
+                            mozilla::net::ReferrerPolicy aReferrerPolicy,
                             imgINotificationObserver* aObserver,
                             int32_t aLoadFlags,
                             const nsAString& initiatorType,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsCrossSiteListenerProxy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsCrossSiteListenerProxy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsCrossSiteListenerProxy.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsCrossSiteListenerProxy.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -1127,15 +1127,14 @@
                                loadFlags);
   }
   else {
-    rv = NS_NewChannelInternal(getter_AddRefs(preflightChannel),
-                               uri,
-                               nullptr, // aRequestingNode,
-                               nsContentUtils::GetSystemPrincipal(),
-                               nsILoadInfo::SEC_NORMAL,
-                               nsIContentPolicy::TYPE_OTHER,
-                               loadGroup,
-                               nullptr,   // aCallbacks
-                               loadFlags);
+    rv = NS_NewChannel(getter_AddRefs(preflightChannel),
+                       uri,
+                       nsContentUtils::GetSystemPrincipal(),
+                       nsILoadInfo::SEC_NORMAL,
+                       nsIContentPolicy::TYPE_OTHER,
+                       loadGroup,
+                       nullptr,   // aCallbacks
+                       loadFlags);
   }
   NS_ENSURE_SUCCESS(rv, rv);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDocument.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDocument.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDocument.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDocument.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -190,6 +190,7 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/HTMLBodyElement.h"
 #include "mozilla/dom/HTMLInputElement.h"
+#include "mozilla/dom/MediaQueryList.h"
 #include "mozilla/dom/NodeFilterBinding.h"
 #include "mozilla/dom/OwningNonNull.h"
 #include "mozilla/dom/TabChild.h"
@@ -1539,6 +1540,8 @@
 // ==================================================================
 nsIDocument::nsIDocument()
   : nsINode(nullNodeInfo),
+    mReferrerPolicySet(false),
+    mReferrerPolicy(mozilla::net::RP_Default),
     mCharacterSet(NS_LITERAL_CSTRING("ISO-8859-1")),
     mNodeInfoManager(nullptr),
     mCompatMode(eCompatibility_FullStandards),
@@ -1558,6 +1561,8 @@
     mDidFireDOMContentLoaded(true)
 {
   SetInDocument();
+
+  PR_INIT_CLIST(&mDOMMediaQueryLists);  
 }
 
 // NOTE! nsDocument::operator new() zeroes out all members, so don't
@@ -1603,6 +1608,9 @@
 
 nsIDocument::~nsIDocument()
 {
+  NS_ABORT_IF_FALSE(PR_CLIST_IS_EMPTY(&mDOMMediaQueryLists),
+                    "must not have media query lists left");
+
   if (mNodeInfoManager) {
     mNodeInfoManager->DropDocumentReference();
   }
@@ -2016,6 +2024,18 @@
   for (uint32_t i = 0; i < tmp->mHostObjectURIs.Length(); ++i) {
     nsHostObjectProtocolHandler::Traverse(tmp->mHostObjectURIs[i], cb);
   }
+
+  // We own only the items in mDOMMediaQueryLists that have listeners;
+  // this reference is managed by their AddListener and RemoveListener
+  // methods.
+  for (PRCList *l = PR_LIST_HEAD(&tmp->mDOMMediaQueryLists);
+       l != &tmp->mDOMMediaQueryLists; l = PR_NEXT_LINK(l)) {
+    MediaQueryList *mql = static_cast<MediaQueryList*>(l);
+    if (mql->HasListeners()) {
+      NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mDOMMediaQueryLists item");
+      cb.NoteXPCOMChild(mql);
+    }
+  }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsDocument)
@@ -2118,6 +2138,17 @@
     nsHostObjectProtocolHandler::RemoveDataEntry(tmp->mHostObjectURIs[i]);
   }
 
+  // We own only the items in mDOMMediaQueryLists that have listeners;
+  // this reference is managed by their AddListener and RemoveListener
+  // methods.
+  for (PRCList *l = PR_LIST_HEAD(&tmp->mDOMMediaQueryLists);
+       l != &tmp->mDOMMediaQueryLists; ) {
+    PRCList *next = PR_NEXT_LINK(l);
+    MediaQueryList *mql = static_cast<MediaQueryList*>(l);
+    mql->RemoveAllListeners();
+    l = next;
+  }
+
   tmp->mInUnlinkOrDeletion = false;
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
@@ -3701,6 +3732,20 @@
       aHeaderField ==  nsGkAtoms::viewport_user_scalable) {
     mViewportType = Unknown;
   }
+
+  // Referrer policy spec says to ignore any empty referrer policies.
+  if (aHeaderField == nsGkAtoms::referrer && !aData.IsEmpty()) {
+    ReferrerPolicy policy = mozilla::net::ReferrerPolicyFromString(aData);
+
+    // Referrer policy spec (section 6.1) says that once the referrer policy
+    // is set, any future attempts to change it result in No-Referrer.
+    if (!mReferrerPolicySet) {
+      mReferrerPolicy = policy;
+      mReferrerPolicySet = true;
+    } else if (mReferrerPolicy != policy) {
+      mReferrerPolicy = mozilla::net::RP_No_Referrer;
+    }
+  }
 }
 
 void
@@ -6012,127 +6057,147 @@
     rv.Throw(NS_ERROR_UNEXPECTED);
     return;
   }
-  JS::Rooted<JSObject*> global(aCx, sgo->GetGlobalJSObject());
-
-  JSAutoCompartment ac(aCx, global);
-
-  JS::Handle<JSObject*> htmlProto(
-    HTMLElementBinding::GetProtoObjectHandle(aCx, global));
-  if (!htmlProto) {
-    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return;
-  }
 
+  JS::Rooted<JSObject*> global(aCx, sgo->GetGlobalJSObject());
+  nsCOMPtr<nsIAtom> nameAtom;;
   int32_t namespaceID = kNameSpaceID_XHTML;
   JS::Rooted<JSObject*> protoObject(aCx);
-  if (!aOptions.mPrototype) {
-    protoObject = JS_NewObject(aCx, nullptr, htmlProto, JS::NullPtr());
-    if (!protoObject) {
-      rv.Throw(NS_ERROR_UNEXPECTED);
-      return;
-    }
-  } else {
-    // If a prototype is provided, we must check to ensure that it is from the
-    // same browsing context as us.
-    protoObject = aOptions.mPrototype;
-    if (JS_GetGlobalForObject(aCx, protoObject) != global) {
-      rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-      return;
-    }
+  {
+    JSAutoCompartment ac(aCx, global);
 
-    // If PROTOTYPE is already an interface prototype object for any interface
-    // object or PROTOTYPE has a non-configurable property named constructor,
-    // throw a NotSupportedError and stop.
-    const js::Class* clasp = js::GetObjectClass(protoObject);
-    if (IsDOMIfaceAndProtoClass(clasp)) {
-      rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    JS::Handle<JSObject*> htmlProto(
+      HTMLElementBinding::GetProtoObjectHandle(aCx, global));
+    if (!htmlProto) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
       return;
     }
 
-    JS::Rooted<JSPropertyDescriptor> descRoot(aCx);
-    JS::MutableHandle<JSPropertyDescriptor> desc(&descRoot);
-    if (!JS_GetPropertyDescriptor(aCx, protoObject, "constructor", desc)) {
-      rv.Throw(NS_ERROR_UNEXPECTED);
-      return;
-    }
+    if (!aOptions.mPrototype) {
+      protoObject = JS_NewObject(aCx, nullptr, htmlProto, JS::NullPtr());
+      if (!protoObject) {
+        rv.Throw(NS_ERROR_UNEXPECTED);
+        return;
+      }
+    } else {
+      protoObject = aOptions.mPrototype;
 
-    // Check if non-configurable
-    if (desc.isPermanent()) {
-      rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-      return;
-    }
+      // We are already operating on the document's (/global's) compartment. Let's
+      // get a view of the passed in proto from this compartment.
+      if (!JS_WrapObject(aCx, &protoObject)) {
+        rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+        return;
+      }
 
-    JS::Handle<JSObject*> svgProto(
-      SVGElementBinding::GetProtoObjectHandle(aCx, global));
-    if (!svgProto) {
-      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
-      return;
-    }
+      // We also need an unwrapped version of it for various checks.
+      JS::Rooted<JSObject*> protoObjectUnwrapped(aCx,
+        js::CheckedUnwrap(protoObject));
+      if (!protoObjectUnwrapped) {
+        // If the documents compartment does not have same origin access
+        // to the compartment of the proto we should just throw.
+        rv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+        return;
+      }
 
-    JS::Rooted<JSObject*> protoProto(aCx, protoObject);
+      // If PROTOTYPE is already an interface prototype object for any interface
+      // object or PROTOTYPE has a non-configurable property named constructor,
+      // throw a NotSupportedError and stop.
+      const js::Class* clasp = js::GetObjectClass(protoObjectUnwrapped);
+      if (IsDOMIfaceAndProtoClass(clasp)) {
+        rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+        return;
+      }
 
-    // If PROTOTYPE's interface inherits from SVGElement, set NAMESPACE to SVG
-    // Namespace.
-    while (protoProto) {
-      if (protoProto == htmlProto) {
-        break;
+      JS::Rooted<JSPropertyDescriptor> descRoot(aCx);
+      JS::MutableHandle<JSPropertyDescriptor> desc(&descRoot);
+      // This check will go through a wrapper, but as we checked above
+      // it should be transparent or an xray. This should be fine for now,
+      // until the spec is sorted out.
+      if (!JS_GetPropertyDescriptor(aCx, protoObject, "constructor", desc)) {
+        rv.Throw(NS_ERROR_UNEXPECTED);
+        return;
       }
 
-      if (protoProto == svgProto) {
-        namespaceID = kNameSpaceID_SVG;
-        break;
+      // Check if non-configurable
+      if (desc.isPermanent()) {
+        rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+        return;
       }
 
-      if (!JS_GetPrototype(aCx, protoProto, &protoProto)) {
-        rv.Throw(NS_ERROR_UNEXPECTED);
+      JS::Handle<JSObject*> svgProto(
+        SVGElementBinding::GetProtoObjectHandle(aCx, global));
+      if (!svgProto) {
+        rv.Throw(NS_ERROR_OUT_OF_MEMORY);
         return;
       }
+
+      JS::Rooted<JSObject*> protoProto(aCx, protoObject);
+
+      // If PROTOTYPE's interface inherits from SVGElement, set NAMESPACE to SVG
+      // Namespace.
+      while (protoProto) {
+        if (protoProto == htmlProto) {
+          break;
+        }
+
+        if (protoProto == svgProto) {
+          namespaceID = kNameSpaceID_SVG;
+          break;
+        }
+
+        if (!JS_GetPrototype(aCx, protoProto, &protoProto)) {
+          rv.Throw(NS_ERROR_UNEXPECTED);
+          return;
+        }
+      }
     }
-  }
 
-  // If name was provided and not null...
-  nsCOMPtr<nsIAtom> nameAtom;
-  if (!lcName.IsEmpty()) {
-    // Let BASE be the element interface for NAME and NAMESPACE.
-    bool known = false;
-    nameAtom = do_GetAtom(lcName);
-    if (namespaceID == kNameSpaceID_XHTML) {
-      nsIParserService* ps = nsContentUtils::GetParserService();
-      if (!ps) {
-        rv.Throw(NS_ERROR_UNEXPECTED);
-        return;
+    // If name was provided and not null...
+    if (!lcName.IsEmpty()) {
+      // Let BASE be the element interface for NAME and NAMESPACE.
+      bool known = false;
+      nameAtom = do_GetAtom(lcName);
+      if (namespaceID == kNameSpaceID_XHTML) {
+        nsIParserService* ps = nsContentUtils::GetParserService();
+        if (!ps) {
+          rv.Throw(NS_ERROR_UNEXPECTED);
+          return;
+        }
+
+        known =
+          ps->HTMLCaseSensitiveAtomTagToId(nameAtom) != eHTMLTag_userdefined;
+      } else {
+        known = SVGElementFactory::Exists(nameAtom);
       }
 
-      known =
-        ps->HTMLCaseSensitiveAtomTagToId(nameAtom) != eHTMLTag_userdefined;
+      // If BASE does not exist or is an interface for a custom element, set ERROR
+      // to InvalidName and stop.
+      // If BASE exists, then it cannot be an interface for a custom element.
+      if (!known) {
+        rv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
+        return;
+      }
     } else {
-      known = SVGElementFactory::Exists(nameAtom);
-    }
+      // If NAMESPACE is SVG Namespace, set ERROR to InvalidName and stop.
+      if (namespaceID == kNameSpaceID_SVG) {
+        rv.Throw(NS_ERROR_UNEXPECTED);
+        return;
+      }
 
-    // If BASE does not exist or is an interface for a custom element, set ERROR
-    // to InvalidName and stop.
-    // If BASE exists, then it cannot be an interface for a custom element.
-    if (!known) {
-      rv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
-      return;
-    }
-  } else {
-    // If NAMESPACE is SVG Namespace, set ERROR to InvalidName and stop.
-    if (namespaceID == kNameSpaceID_SVG) {
-      rv.Throw(NS_ERROR_UNEXPECTED);
-      return;
+      nameAtom = typeAtom;
     }
+  } // Leaving the document's compartment for the LifecycleCallbacks init
 
-    nameAtom = typeAtom;
-  }
-
+  // Note: We call the init from the caller compartment here
   nsAutoPtr<LifecycleCallbacks> callbacksHolder(new LifecycleCallbacks());
   JS::RootedValue rootedv(aCx, JS::ObjectValue(*protoObject));
-  if (!callbacksHolder->Init(aCx, rootedv)) {
+  if (!JS_WrapValue(aCx, &rootedv) || !callbacksHolder->Init(aCx, rootedv)) {
     rv.Throw(NS_ERROR_FAILURE);
     return;
   }
 
+  // Entering the global's compartment again
+  JSAutoCompartment ac(aCx, global);
+
   // Associate the definition with the custom element.
   CustomElementHashKey key(namespaceID, typeAtom);
   LifecycleCallbacks* callbacks = callbacksHolder.forget();
@@ -7103,6 +7168,17 @@
   }
 }
 
+already_AddRefed<MediaQueryList>
+nsIDocument::MatchMedia(const nsAString& aMediaQueryList)
+{
+  nsRefPtr<MediaQueryList> result = new MediaQueryList(this, aMediaQueryList);
+
+  // Insert the new item at the end of the linked list.
+  PR_INSERT_BEFORE(result, &mDOMMediaQueryLists);
+
+  return result.forget();
+}
+
 void
 nsDocument::FlushSkinBindings()
 {
@@ -7682,6 +7758,13 @@
   CSSToScreenScale defaultScale = layoutDeviceScale
                                 * LayoutDeviceToScreenScale(1.0);
 
+  if (!Preferences::GetBool("dom.meta-viewport.enabled", false)) {
+    return nsViewportInfo(aDisplaySize,
+                          defaultScale,
+                          /*allowZoom*/ false,
+                          /*allowDoubleTapZoom*/ true);
+  }
+
   // In cases where the width of the CSS viewport is less than or equal to the width
   // of the display (i.e. width <= device-width) then we disable double-tap-to-zoom
   // behaviour. See bug 941995 for details.
@@ -9465,7 +9548,8 @@
 }
 
 void
-nsDocument::MaybePreLoadImage(nsIURI* uri, const nsAString &aCrossOriginAttr)
+nsDocument::MaybePreLoadImage(nsIURI* uri, const nsAString &aCrossOriginAttr,
+                              ReferrerPolicy aReferrerPolicy)
 {
   // Early exit if the img is already present in the img-cache
   // which indicates that the "real" load has already started and
@@ -9499,6 +9583,7 @@
                               this,
                               NodePrincipal(),
                               mDocumentURI, // uri of document used as referrer
+                              aReferrerPolicy,
                               nullptr,       // no observer
                               loadFlags,
                               NS_LITERAL_STRING("img"),
@@ -9508,7 +9593,22 @@
   // the "real" load occurs. Unpinned in DispatchContentLoadedEvents and
   // unlink
   if (NS_SUCCEEDED(rv)) {
-    mPreloadingImages.AppendObject(request);
+    mPreloadingImages.Put(uri, request.forget());
+  }
+}
+
+void
+nsDocument::ForgetImagePreload(nsIURI* aURI)
+{
+  // Checking count is faster than hashing the URI in the common
+  // case of empty table.
+  if (mPreloadingImages.Count() != 0) {
+    nsCOMPtr<imgIRequest> req;
+    mPreloadingImages.Remove(aURI, getter_AddRefs(req));
+    if (req) {
+      // Make sure to cancel the request so imagelib knows it's gone.
+      req->CancelAndForgetObserver(NS_BINDING_ABORTED);
+    }
   }
 }
 
@@ -9554,7 +9654,8 @@
 
 void
 nsDocument::PreloadStyle(nsIURI* uri, const nsAString& charset,
-                         const nsAString& aCrossOriginAttr)
+                         const nsAString& aCrossOriginAttr,
+                         const ReferrerPolicy aReferrerPolicy)
 {
   // The CSSLoader will retain this object after we return.
   nsCOMPtr<nsICSSLoaderObserver> obs = new StubCSSLoaderObserver();
@@ -9563,7 +9664,8 @@
   CSSLoader()->LoadSheet(uri, NodePrincipal(),
                          NS_LossyConvertUTF16toASCII(charset),
                          obs,
-                         Element::StringToCORSMode(aCrossOriginAttr));
+                         Element::StringToCORSMode(aCrossOriginAttr),
+                         aReferrerPolicy);
 }
 
 nsresult
@@ -10650,13 +10752,13 @@
 // Element::UnbindFromTree().
 class nsSetWindowFullScreen : public nsRunnable {
 public:
-  nsSetWindowFullScreen(nsIDocument* aDoc, bool aValue)
-    : mDoc(aDoc), mValue(aValue) {}
+  nsSetWindowFullScreen(nsIDocument* aDoc, bool aValue, gfx::VRHMDInfo* aHMD = nullptr)
+    : mDoc(aDoc), mValue(aValue), mHMD(aHMD) {}
 
   NS_IMETHOD Run()
   {
     if (mDoc->GetWindow()) {
-      mDoc->GetWindow()->SetFullScreenInternal(mValue, false);
+      mDoc->GetWindow()->SetFullScreenInternal(mValue, false, mHMD);
     }
     return NS_OK;
   }
@@ -10664,6 +10766,7 @@
 private:
   nsCOMPtr<nsIDocument> mDoc;
   bool mValue;
+  nsRefPtr<gfx::VRHMDInfo> mHMD;
 };
 
 static nsIDocument*
@@ -10683,7 +10786,7 @@
 }
 
 static void
-SetWindowFullScreen(nsIDocument* aDoc, bool aValue)
+SetWindowFullScreen(nsIDocument* aDoc, bool aValue, gfx::VRHMDInfo *aVRHMD = nullptr)
 {
   // Maintain list of fullscreen root documents.
   nsCOMPtr<nsIDocument> root = GetFullscreenRootDocument(aDoc);
@@ -10693,7 +10796,7 @@
     FullscreenRoots::Remove(root);
   }
   if (!nsContentUtils::IsFullscreenApiContentOnly()) {
-    nsContentUtils::AddScriptRunner(new nsSetWindowFullScreen(aDoc, aValue));
+    nsContentUtils::AddScriptRunner(new nsSetWindowFullScreen(aDoc, aValue, aVRHMD));
   }
 }
 
@@ -11013,12 +11116,13 @@
 class nsCallRequestFullScreen : public nsRunnable
 {
 public:
-  explicit nsCallRequestFullScreen(Element* aElement)
+  explicit nsCallRequestFullScreen(Element* aElement, FullScreenOptions& aOptions)
     : mElement(aElement),
       mDoc(aElement->OwnerDoc()),
       mWasCallerChrome(nsContentUtils::IsCallerChrome()),
       mHadRequestPending(static_cast<nsDocument*>(mDoc.get())->
-                           mAsyncFullscreenPending)
+                         mAsyncFullscreenPending),
+      mOptions(aOptions)
   {
     static_cast<nsDocument*>(mDoc.get())->
       mAsyncFullscreenPending = true;
@@ -11030,6 +11134,7 @@
       mAsyncFullscreenPending = mHadRequestPending;
     nsDocument* doc = static_cast<nsDocument*>(mDoc.get());
     doc->RequestFullScreen(mElement,
+                           mOptions,
                            mWasCallerChrome,
                            /* aNotifyOnOriginChange */ true);
     return NS_OK;
@@ -11039,10 +11144,12 @@
   nsCOMPtr<nsIDocument> mDoc;
   bool mWasCallerChrome;
   bool mHadRequestPending;
+  FullScreenOptions mOptions;
 };
 
 void
-nsDocument::AsyncRequestFullScreen(Element* aElement)
+nsDocument::AsyncRequestFullScreen(Element* aElement,
+                                   FullScreenOptions& aOptions)
 {
   NS_ASSERTION(aElement,
     "Must pass non-null element to nsDocument::AsyncRequestFullScreen");
@@ -11050,7 +11157,7 @@
     return;
   }
   // Request full-screen asynchronously.
-  nsCOMPtr<nsIRunnable> event(new nsCallRequestFullScreen(aElement));
+  nsCOMPtr<nsIRunnable> event(new nsCallRequestFullScreen(aElement, aOptions));
   NS_DispatchToCurrentThread(event);
 }
 
@@ -11118,6 +11225,9 @@
     Element* top = FullScreenStackTop();
     NS_ASSERTION(top, "Should have a top when full-screen stack isn't empty");
     if (top) {
+      // Remove any VR state properties
+      top->DeleteProperty(nsGkAtoms::vr_state);
+
       EventStateManager::SetFullScreenState(top, false);
     }
     mFullScreenStack.Clear();
@@ -11154,8 +11264,12 @@
     return;
   }
 
-  // Remove styles from existing top element.
   Element* top = FullScreenStackTop();
+
+  // Remove any VR state properties
+  top->DeleteProperty(nsGkAtoms::vr_state);
+
+  // Remove styles from existing top element.
   EventStateManager::SetFullScreenState(top, false);
 
   // Remove top element. Note the remaining top element in the stack
@@ -11243,7 +11357,9 @@
   // If the frame element is already the fullscreen element in this document,
   // this has no effect.
   nsCOMPtr<nsIContent> content(do_QueryInterface(aFrameElement));
+  FullScreenOptions opts;
   RequestFullScreen(content->AsElement(),
+                    opts,
                     /* aWasCallerChrome */ false,
                     /* aNotifyOnOriginChange */ false);
 
@@ -11269,8 +11385,17 @@
   return NS_OK;
 }
 
+static void
+ReleaseHMDInfoRef(void *, nsIAtom*, void *aPropertyValue, void *)
+{
+  if (aPropertyValue) {
+    static_cast<gfx::VRHMDInfo*>(aPropertyValue)->Release();
+  }
+}
+
 void
 nsDocument::RequestFullScreen(Element* aElement,
+                              FullScreenOptions& aOptions,
                               bool aWasCallerChrome,
                               bool aNotifyOnOriginChange)
 {
@@ -11359,6 +11484,14 @@
     UnlockPointer();
   }
 
+  // Process options -- in this case, just HMD
+  if (aOptions.mVRHMDDevice) {
+    nsRefPtr<gfx::VRHMDInfo> hmdRef = aOptions.mVRHMDDevice;
+    aElement->SetProperty(nsGkAtoms::vr_state, hmdRef.forget().take(),
+                          ReleaseHMDInfoRef,
+                          true);
+  }
+
   // Set the full-screen element. This sets the full-screen style on the
   // element, and the full-screen-ancestor styles on ancestors of the element
   // in this document.
@@ -11463,7 +11596,7 @@
   // modes. Also note that nsGlobalWindow::SetFullScreen() (which
   // SetWindowFullScreen() calls) proxies to the root window in its hierarchy,
   // and does not operate on the a per-nsIDOMWindow basis.
-  SetWindowFullScreen(this, true);
+  SetWindowFullScreen(this, true, aOptions.mVRHMDDevice);
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDocument.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDocument.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDocument.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDocument.h	2014-11-26 21:45:55.000000000 +0000
@@ -120,6 +120,7 @@
 {
 public:
   typedef mozilla::dom::Element Element;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
 
   explicit nsIdentifierMapEntry(const nsAString& aKey) :
     nsStringHashKey(&aKey), mNameContentList(nullptr)
@@ -1091,10 +1092,13 @@
   void MaybeEndOutermostXBLUpdate();
 
   virtual void MaybePreLoadImage(nsIURI* uri,
-                                 const nsAString &aCrossOriginAttr) MOZ_OVERRIDE;
+                                 const nsAString &aCrossOriginAttr,
+                                 ReferrerPolicy aReferrerPolicy) MOZ_OVERRIDE;
+  virtual void ForgetImagePreload(nsIURI* aURI) MOZ_OVERRIDE;
 
   virtual void PreloadStyle(nsIURI* uri, const nsAString& charset,
-                            const nsAString& aCrossOriginAttr) MOZ_OVERRIDE;
+                            const nsAString& aCrossOriginAttr,
+                            ReferrerPolicy aReferrerPolicy) MOZ_OVERRIDE;
 
   virtual nsresult LoadChromeSheetSync(nsIURI* uri, bool isAgentSheet,
                                        mozilla::CSSStyleSheet** sheet) MOZ_OVERRIDE;
@@ -1143,7 +1147,8 @@
   virtual Element* FindImageMap(const nsAString& aNormalizedMapName) MOZ_OVERRIDE;
 
   virtual Element* GetFullScreenElement() MOZ_OVERRIDE;
-  virtual void AsyncRequestFullScreen(Element* aElement) MOZ_OVERRIDE;
+  virtual void AsyncRequestFullScreen(Element* aElement,
+                                      mozilla::dom::FullScreenOptions& aOptions) MOZ_OVERRIDE;
   virtual void RestorePreviousFullScreenState() MOZ_OVERRIDE;
   virtual bool IsFullscreenLeaf() MOZ_OVERRIDE;
   virtual bool IsFullScreenDoc() MOZ_OVERRIDE;
@@ -1194,6 +1199,7 @@
   // need to send the notification with the origin of the document which
   // originally requested fullscreen, not *this* document's origin.
   void RequestFullScreen(Element* aElement,
+                         mozilla::dom::FullScreenOptions& aOptions,
                          bool aWasCallerChrome,
                          bool aNotifyOnOriginChange);
 
@@ -1737,8 +1743,11 @@
 
   nsExternalResourceMap mExternalResourceMap;
 
-  // All images in process of being preloaded
-  nsCOMArray<imgIRequest> mPreloadingImages;
+  // All images in process of being preloaded.  This is a hashtable so
+  // we can remove them as the real image loads start; that way we
+  // make sure to not keep the image load going when no one cares
+  // about it anymore.
+  nsRefPtrHashtable<nsURIHashKey, imgIRequest> mPreloadingImages;
 
   nsRefPtr<mozilla::dom::DOMImplementation> mDOMImplementation;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDOMClassInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDOMClassInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDOMClassInfo.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDOMClassInfo.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -108,7 +108,6 @@
 #include "FMRadio.h"
 #endif
 
-#include "nsIDOMGlobalObjectConstructor.h"
 #include "nsDebug.h"
 
 #include "mozilla/dom/BindingUtils.h"
@@ -1351,65 +1350,6 @@
     return rv;
   }
 
-  nsCOMPtr<nsIDOMGlobalObjectConstructor> constructor(do_QueryInterface(native));
-  if (constructor) {
-    // Initialize object using the current inner window, but only if
-    // the caller can access it.
-    nsCOMPtr<nsPIDOMWindow> owner = do_QueryReferent(aWeakOwner);
-    nsPIDOMWindow* outerWindow = owner ? owner->GetOuterWindow() : nullptr;
-    nsPIDOMWindow* currentInner =
-      outerWindow ? outerWindow->GetCurrentInnerWindow() : nullptr;
-    if (!currentInner ||
-        (owner != currentInner &&
-         !nsContentUtils::CanCallerAccess(currentInner))) {
-      return NS_ERROR_DOM_SECURITY_ERR;
-    }
-
-    nsCOMPtr<nsIXPConnectWrappedJS> wrappedJS = do_QueryInterface(native);
-
-    JS::Rooted<JSObject*> thisObject(cx, wrappedJS->GetJSObject());
-    if (!thisObject) {
-      return NS_ERROR_UNEXPECTED;
-    }
-
-    JSAutoCompartment ac(cx, thisObject);
-
-    JS::Rooted<JS::Value> funval(cx);
-    if (!JS_GetProperty(cx, thisObject, "constructor", &funval) ||
-        !funval.isObject()) {
-      return NS_ERROR_UNEXPECTED;
-    }
-
-    // Check if the object is even callable.
-    NS_ENSURE_STATE(JS::IsCallable(&funval.toObject()));
-    {
-      // wrap parameters in the target compartment
-      // we also pass in the calling window as the first argument
-      unsigned argc = args.length() + 1;
-      JS::AutoValueVector argv(cx);
-      if (!argv.resize(argc)) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-
-      nsCOMPtr<nsIDOMWindow> currentWin(do_GetInterface(currentInner));
-      rv = WrapNative(cx, currentWin, &NS_GET_IID(nsIDOMWindow),
-                      true, argv[0]);
-
-      for (size_t i = 1; i < argc; ++i) {
-        argv[i].set(args[i - 1]);
-        if (!JS_WrapValue(cx, argv[i]))
-          return NS_ERROR_FAILURE;
-      }
-
-      JS::Rooted<JS::Value> frval(cx);
-      bool ret = JS_CallFunctionValue(cx, thisObject, funval, argv, &frval);
-
-      if (!ret) {
-        return NS_ERROR_FAILURE;
-      }
-    }
-  }
-
   js::AssertSameCompartment(cx, obj);
   return WrapNative(cx, native, true, args.rval());
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDOMWindowUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDOMWindowUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsDOMWindowUtils.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsDOMWindowUtils.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -415,8 +415,6 @@
                                                   float aTopMargin,
                                                   float aRightMargin,
                                                   float aBottomMargin,
-                                                  uint32_t aAlignmentX,
-                                                  uint32_t aAlignmentY,
                                                   nsIDOMElement* aElement,
                                                   uint32_t aPriority)
 {
@@ -451,7 +449,7 @@
                                   aLeftMargin);
 
   nsLayoutUtils::SetDisplayPortMargins(content, presShell, displayportMargins,
-                                       aAlignmentX, aAlignmentY, aPriority);
+                                       aPriority);
 
   return NS_OK;
 }
@@ -868,7 +866,7 @@
   event.height = aHeight;
   event.tiltX = aTiltX;
   event.tiltY = aTiltY;
-  event.isPrimary = aIsPrimary;
+  event.isPrimary = (nsIDOMMouseEvent::MOZ_SOURCE_MOUSE == aInputSourceArg) ? true : aIsPrimary;
   event.clickCount = aClickCount;
   event.time = PR_IntervalNow();
   event.mFlags.mIsSynthesizedForTests = aOptionalArgCount >= 10 ? aIsSynthesized : true;
@@ -2068,7 +2066,7 @@
     return NS_OK;
   }
 
-  *aFullZoom = presContext->DeviceContext()->GetPixelScale();
+  *aFullZoom = presContext->DeviceContext()->GetFullZoom();
 
   return NS_OK;
 }
@@ -2130,7 +2128,15 @@
   if (aType.EqualsLiteral("compositionstart")) {
     msg = NS_COMPOSITION_START;
   } else if (aType.EqualsLiteral("compositionend")) {
-    msg = NS_COMPOSITION_END;
+    // Now we don't support manually dispatching composition end with this
+    // API.  A compositionend is dispatched when this is called with
+    // compositioncommitasis or compositioncommit automatically.  For backward
+    // compatibility, this shouldn't return error in this case.
+    NS_WARNING("Don't call nsIDOMWindowUtils.sendCompositionEvent() for "
+               "compositionend.  Instead, use it with compositioncommitasis or "
+               "compositioncommit.  Then, compositionend will be automatically "
+               "dispatched.");
+    return NS_OK;
   } else if (aType.EqualsLiteral("compositionupdate")) {
     // Now we don't support manually dispatching composition update with this
     // API.  A compositionupdate is dispatched when a DOM text event modifies
@@ -2140,13 +2146,17 @@
                "compositionupdate since it's ignored and the event is "
                "fired automatically when it's necessary");
     return NS_OK;
+  } else if (aType.EqualsLiteral("compositioncommitasis")) {
+    msg = NS_COMPOSITION_COMMIT_AS_IS;
+  } else if (aType.EqualsLiteral("compositioncommit")) {
+    msg = NS_COMPOSITION_COMMIT;
   } else {
     return NS_ERROR_FAILURE;
   }
 
   WidgetCompositionEvent compositionEvent(true, msg, widget);
   InitEvent(compositionEvent);
-  if (msg != NS_COMPOSITION_START) {
+  if (msg != NS_COMPOSITION_START && msg != NS_COMPOSITION_COMMIT_AS_IS) {
     compositionEvent.mData = aData;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsFrameLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsFrameLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsFrameLoader.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsFrameLoader.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -432,6 +432,8 @@
     }
   }
 
+  loadInfo->SetReferrerPolicy(mOwnerContent->OwnerDoc()->GetReferrerPolicy());
+
   // Default flags:
   int32_t flags = nsIWebNavigation::LOAD_FLAGS_NONE;
 
@@ -2103,7 +2105,7 @@
   nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
   ScrollingBehavior scrollingBehavior = DEFAULT_SCROLLING;
 
-  if (Preferences::GetBool("dom.browser_frames.useAsyncPanZoom", false) ||
+  if (Preferences::GetBool("layers.async-pan-zoom.enabled", false) ||
       mOwnerContent->AttrValueIs(kNameSpaceID_None,
                                  nsGkAtoms::mozasyncpanzoom,
                                  nsGkAtoms::_true,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsFrameMessageManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsFrameMessageManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsFrameMessageManager.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsFrameMessageManager.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -976,6 +976,7 @@
       nsIGlobalObject* nativeGlobal =
         xpc::NativeGlobal(js::GetGlobalForObjectCrossCompartment(wrappedJS->GetJSObject()));
       AutoEntryScript aes(nativeGlobal);
+      aes.TakeOwnershipOfErrorReporting();
       JSContext* cx = aes.cx();
       JS::Rooted<JSObject*> object(cx, wrappedJS->GetJSObject());
 
@@ -1017,23 +1018,31 @@
                             aMessage.Length()));
       NS_ENSURE_TRUE(jsMessage, NS_ERROR_OUT_OF_MEMORY);
       JS::Rooted<JS::Value> syncv(cx, JS::BooleanValue(aIsSync));
-      JS_DefineProperty(cx, param, "target", targetv, JSPROP_ENUMERATE);
-      JS_DefineProperty(cx, param, "name", jsMessage, JSPROP_ENUMERATE);
-      JS_DefineProperty(cx, param, "sync", syncv, JSPROP_ENUMERATE);
-      JS_DefineProperty(cx, param, "json", json, JSPROP_ENUMERATE); // deprecated
-      JS_DefineProperty(cx, param, "data", json, JSPROP_ENUMERATE);
-      JS_DefineProperty(cx, param, "objects", cpowsv, JSPROP_ENUMERATE);
+      bool ok = JS_DefineProperty(cx, param, "target", targetv, JSPROP_ENUMERATE) &&
+                JS_DefineProperty(cx, param, "name", jsMessage, JSPROP_ENUMERATE) &&
+                JS_DefineProperty(cx, param, "sync", syncv, JSPROP_ENUMERATE) &&
+                JS_DefineProperty(cx, param, "json", json, JSPROP_ENUMERATE) && // deprecated
+                JS_DefineProperty(cx, param, "data", json, JSPROP_ENUMERATE) &&
+                JS_DefineProperty(cx, param, "objects", cpowsv, JSPROP_ENUMERATE);
+      NS_ENSURE_TRUE(ok, NS_ERROR_UNEXPECTED);
 
       // message.principal == null
       if (!aPrincipal) {
-        JS_DefineProperty(cx, param, "principal", JS::UndefinedHandleValue, JSPROP_ENUMERATE);
+        bool ok = JS_DefineProperty(cx, param, "principal",
+                                    JS::UndefinedHandleValue, JSPROP_ENUMERATE);
+        NS_ENSURE_TRUE(ok, NS_ERROR_UNEXPECTED);
       }
 
       // message.principal = the principal
       else {
         JS::Rooted<JS::Value> principalValue(cx);
-        rv = nsContentUtils::WrapNative(cx, aPrincipal, &NS_GET_IID(nsIPrincipal), &principalValue);
-        JS_DefineProperty(cx, param, "principal", principalValue, JSPROP_ENUMERATE);
+        nsresult rv = nsContentUtils::WrapNative(cx, aPrincipal,
+                                                 &NS_GET_IID(nsIPrincipal),
+                                                 &principalValue);
+        NS_ENSURE_SUCCESS(rv, rv);
+        bool ok = JS_DefineProperty(cx, param, "principal", principalValue,
+                                    JSPROP_ENUMERATE);
+        NS_ENSURE_TRUE(ok, NS_ERROR_UNEXPECTED);
       }
 
       JS::Rooted<JS::Value> thisValue(cx, JS::UndefinedValue());
@@ -1057,8 +1066,9 @@
       } else {
         // If the listener is a JS object which has receiveMessage function:
         if (!JS_GetProperty(cx, object, "receiveMessage", &funval) ||
-            !funval.isObject())
+            !funval.isObject()) {
           return NS_ERROR_UNEXPECTED;
+        }
 
         // Check if the object is even callable.
         NS_ENSURE_STATE(JS::IsCallable(&funval.toObject()));
@@ -1076,15 +1086,14 @@
           return NS_ERROR_UNEXPECTED;
         }
 
-        if (!JS_CallFunctionValue(cx, thisObject, funval, JS::HandleValueArray(argv), &rval)) {
-          nsJSUtils::ReportPendingException(cx);
+        if (!JS_CallFunctionValue(cx, thisObject, funval,
+                                  JS::HandleValueArray(argv), &rval)) {
           continue;
         }
         if (aJSONRetVal) {
           nsString json;
           if (!JS_Stringify(cx, &rval, JS::NullPtr(), JS::NullHandleValue,
                            JSONCreator, &json)) {
-            nsJSUtils::ReportPendingException(cx);
             continue;
           }
           aJSONRetVal->AppendElement(json);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGkAtomList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGkAtomList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGkAtomList.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGkAtomList.h	2014-11-26 21:45:55.000000000 +0000
@@ -582,6 +582,7 @@
 GK_ATOM(menuseparator, "menuseparator")
 GK_ATOM(message, "message")
 GK_ATOM(meta, "meta")
+GK_ATOM(referrer, "referrer")
 GK_ATOM(meter, "meter")
 GK_ATOM(method, "method")
 GK_ATOM(microdataProperties, "microdataProperties")
@@ -2324,3 +2325,5 @@
 GK_ATOM(onmark, "onmark")
 GK_ATOM(onboundary, "onboundary")
 #endif
+
+GK_ATOM(vr_state, "vr-state")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGlobalWindowCommands.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGlobalWindowCommands.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGlobalWindowCommands.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGlobalWindowCommands.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -83,6 +83,24 @@
 const char * const sSelectTopString = "cmd_selectTop";
 const char * const sSelectBottomString = "cmd_selectBottom";
 
+// Physical-direction movement and selection commands
+const char * const sMoveLeftString = "cmd_moveLeft";
+const char * const sMoveRightString = "cmd_moveRight";
+const char * const sMoveUpString = "cmd_moveUp";
+const char * const sMoveDownString = "cmd_moveDown";
+const char * const sMoveLeft2String = "cmd_moveLeft2";
+const char * const sMoveRight2String = "cmd_moveRight2";
+const char * const sMoveUp2String = "cmd_moveUp2";
+const char * const sMoveDown2String = "cmd_moveDown2";
+
+const char * const sSelectLeftString = "cmd_selectLeft";
+const char * const sSelectRightString = "cmd_selectRight";
+const char * const sSelectUpString = "cmd_selectUp";
+const char * const sSelectDownString = "cmd_selectDown";
+const char * const sSelectLeft2String = "cmd_selectLeft2";
+const char * const sSelectRight2String = "cmd_selectRight2";
+const char * const sSelectUp2String = "cmd_selectUp2";
+const char * const sSelectDown2String = "cmd_selectDown2";
 
 #if 0
 #pragma mark -
@@ -116,6 +134,16 @@
   // no member variables, please, we're stateless!
 };
 
+// this class implements physical-movement versions of the above
+class nsPhysicalSelectMoveScrollCommand : public nsSelectionCommandsBase
+{
+public:
+
+  NS_IMETHOD DoCommand(const char * aCommandName, nsISupports *aCommandContext);
+
+  // no member variables, please, we're stateless!
+};
+
 // this class implements other selection commands
 class nsSelectCommand : public nsSelectionCommandsBase
 {
@@ -126,6 +154,16 @@
   // no member variables, please, we're stateless!
 };
 
+// this class implements physical-movement versions of selection commands
+class nsPhysicalSelectCommand : public nsSelectionCommandsBase
+{
+public:
+
+  NS_IMETHOD DoCommand(const char * aCommandName, nsISupports *aCommandContext);
+
+  // no member variables, please, we're stateless!
+};
+
 #if 0
 #pragma mark -
 #endif
@@ -194,6 +232,39 @@
 #pragma mark -
 #endif
 
+// Helpers for nsSelectMoveScrollCommand and nsPhysicalSelectMoveScrollCommand
+static void
+AdjustFocusAfterCaretMove(nsPIDOMWindow* aWindow)
+{
+  // adjust the focus to the new caret position
+  nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    nsCOMPtr<nsIDOMElement> result;
+    fm->MoveFocus(aWindow, nullptr, nsIFocusManager::MOVEFOCUS_CARET,
+                  nsIFocusManager::FLAG_NOSCROLL, getter_AddRefs(result));
+  }
+}
+
+static bool
+IsCaretOnInWindow(nsPIDOMWindow* aWindow, nsISelectionController* aSelCont)
+{
+  // We allow the caret to be moved with arrow keys on any window for which
+  // the caret is enabled. In particular, this includes caret-browsing mode
+  // in non-chrome documents.
+  bool caretOn = false;
+  aSelCont->GetCaretEnabled(&caretOn);
+  if (!caretOn) {
+    caretOn = Preferences::GetBool("accessibility.browsewithcaret");
+    if (caretOn) {
+      nsCOMPtr<nsIDocShell> docShell = aWindow->GetDocShell();
+      if (docShell && docShell->ItemType() == nsIDocShellTreeItem::typeChrome) {
+        caretOn = false;
+      }
+    }
+  }
+  return caretOn;
+}
+
 static const struct BrowseCommand {
   const char *reverse, *forward;
   nsresult (NS_STDCALL nsISelectionController::*scroll)(bool);
@@ -235,85 +306,158 @@
   GetSelectionControllerFromWindow(piWindow, getter_AddRefs(selCont));
   NS_ENSURE_TRUE(selCont, NS_ERROR_NOT_INITIALIZED);       
 
-  // We allow the caret to be moved with arrow keys on any window for which
-  // the caret is enabled. In particular, this includes caret-browsing mode
-  // in non-chrome documents.
-  bool caretOn = false;
-  selCont->GetCaretEnabled(&caretOn);
-  if (!caretOn) {
-    caretOn = Preferences::GetBool("accessibility.browsewithcaret");
-    if (caretOn) {
-      nsCOMPtr<nsIDocShell> docShell = piWindow->GetDocShell();
-      if (docShell && docShell->ItemType() == nsIDocShellTreeItem::typeChrome) {
-        caretOn = false;
-      }
-    }
-  }
+  bool caretOn = IsCaretOnInWindow(piWindow, selCont);
 
   for (size_t i = 0; i < ArrayLength(browseCommands); i++) {
     bool forward = !strcmp(aCommandName, browseCommands[i].forward);
     if (forward || !strcmp(aCommandName, browseCommands[i].reverse)) {
       if (caretOn && browseCommands[i].move &&
           NS_SUCCEEDED((selCont->*(browseCommands[i].move))(forward, false))) {
-        // adjust the focus to the new caret position
-        nsIFocusManager* fm = nsFocusManager::GetFocusManager();
-        if (fm) {
-          nsCOMPtr<nsIDOMElement> result;
-          fm->MoveFocus(piWindow, nullptr, nsIFocusManager::MOVEFOCUS_CARET,
-                        nsIFocusManager::FLAG_NOSCROLL,
-                        getter_AddRefs(result));
-        }
+        AdjustFocusAfterCaretMove(piWindow);
         return NS_OK;
       }
       return (selCont->*(browseCommands[i].scroll))(forward);
     }
   }
+
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+// XXX It's not clear to me yet how we should handle the "scroll" option
+// for these commands; for now, I'm mapping them back to ScrollCharacter,
+// ScrollLine, etc., as if for horizontal-mode content, but this may need
+// to be reconsidered once we have more experience with vertical content.
+static const struct PhysicalBrowseCommand {
+  const char *command;
+  int16_t direction, amount;
+  nsresult (NS_STDCALL nsISelectionController::*scroll)(bool);
+} physicalBrowseCommands[] = {
+ { sMoveLeftString, nsISelectionController::MOVE_LEFT, 0,
+   &nsISelectionController::ScrollCharacter },
+ { sMoveRightString, nsISelectionController::MOVE_RIGHT, 0,
+   &nsISelectionController::ScrollCharacter },
+ { sMoveUpString, nsISelectionController::MOVE_UP, 0,
+   &nsISelectionController::ScrollLine },
+ { sMoveDownString, nsISelectionController::MOVE_DOWN, 0,
+   &nsISelectionController::ScrollLine },
+ { sMoveLeft2String, nsISelectionController::MOVE_LEFT, 1,
+   &nsISelectionController::ScrollCharacter },
+ { sMoveRight2String, nsISelectionController::MOVE_RIGHT, 1,
+   &nsISelectionController::ScrollCharacter },
+ { sMoveUp2String, nsISelectionController::MOVE_UP, 1,
+   &nsISelectionController::CompleteScroll },
+ { sMoveDown2String, nsISelectionController::MOVE_DOWN, 1,
+   &nsISelectionController::CompleteScroll },
+};
+
+nsresult
+nsPhysicalSelectMoveScrollCommand::DoCommand(const char *aCommandName,
+                                             nsISupports *aCommandContext)
+{
+  nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(aCommandContext));
+  nsCOMPtr<nsISelectionController> selCont;
+  GetSelectionControllerFromWindow(piWindow, getter_AddRefs(selCont));
+  NS_ENSURE_TRUE(selCont, NS_ERROR_NOT_INITIALIZED);       
+
+  bool caretOn = IsCaretOnInWindow(piWindow, selCont);
+
+  for (size_t i = 0; i < ArrayLength(physicalBrowseCommands); i++) {
+    const PhysicalBrowseCommand& cmd = physicalBrowseCommands[i];
+    if (!strcmp(aCommandName, cmd.command)) {
+      int16_t dir = cmd.direction;
+      if (caretOn &&
+          NS_SUCCEEDED(selCont->PhysicalMove(dir, cmd.amount, false))) {
+        AdjustFocusAfterCaretMove(piWindow);
+        return NS_OK;
+      }
+
+      bool forward = (dir == nsISelectionController::MOVE_RIGHT ||
+                      dir == nsISelectionController::MOVE_DOWN);
+      return (selCont->*(cmd.scroll))(forward);
+    }
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
 
 #if 0
 #pragma mark -
 #endif
 
+static const struct SelectCommand {
+  const char *reverse, *forward;
+  nsresult (NS_STDCALL nsISelectionController::*select)(bool, bool);
+} selectCommands[] = {
+ { sSelectCharPreviousString, sSelectCharNextString,
+   &nsISelectionController::CharacterMove },
+ { sSelectWordPreviousString, sSelectWordNextString,
+   &nsISelectionController::WordMove },
+ { sSelectBeginLineString, sSelectEndLineString,
+   &nsISelectionController::IntraLineMove },
+ { sSelectLinePreviousString, sSelectLineNextString,
+   &nsISelectionController::LineMove },
+ { sSelectPageUpString, sSelectPageDownString,
+   &nsISelectionController::PageMove },
+ { sSelectTopString, sSelectBottomString,
+   &nsISelectionController::CompleteMove }
+};
+
 nsresult
-nsSelectCommand::DoCommand(const char *aCommandName, nsISupports *aCommandContext)
+nsSelectCommand::DoCommand(const char *aCommandName,
+                           nsISupports *aCommandContext)
 {
   nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(aCommandContext));
   nsCOMPtr<nsISelectionController> selCont;
   GetSelectionControllerFromWindow(piWindow, getter_AddRefs(selCont));
   NS_ENSURE_TRUE(selCont, NS_ERROR_NOT_INITIALIZED);       
 
-  nsresult rv = NS_ERROR_NOT_IMPLEMENTED;
-
   // These commands are so the browser can use caret navigation key bindings -
   // Helps with accessibility - aaronl@netscape.com
-  if (!nsCRT::strcmp(aCommandName, sSelectCharPreviousString))
-    rv = selCont->CharacterMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectCharNextString))
-    rv = selCont->CharacterMove(true, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectWordPreviousString))
-    rv = selCont->WordMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectWordNextString))
-    rv = selCont->WordMove(true, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectBeginLineString))
-    rv = selCont->IntraLineMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectEndLineString))
-    rv = selCont->IntraLineMove(true, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectLinePreviousString))
-    rv = selCont->LineMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectLineNextString))
-    rv = selCont->LineMove(true, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectPageUpString))
-    rv = selCont->PageMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectPageDownString))
-    rv = selCont->PageMove(true, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectTopString))
-    rv = selCont->CompleteMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName, sSelectBottomString))
-    rv = selCont->CompleteMove(true, true);
+  for (size_t i = 0; i < ArrayLength(selectCommands); i++) {
+    bool forward = !strcmp(aCommandName, selectCommands[i].forward);
+    if (forward || !strcmp(aCommandName, selectCommands[i].reverse)) {
+      return (selCont->*(selectCommands[i].select))(forward, true);
+    }
+  }
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+#if 0
+#pragma mark -
+#endif
+
+static const struct PhysicalSelectCommand {
+  const char *command;
+  int16_t direction, amount;
+} physicalSelectCommands[] = {
+ { sSelectLeftString, nsISelectionController::MOVE_LEFT, 0 },
+ { sSelectRightString, nsISelectionController::MOVE_RIGHT, 0 },
+ { sSelectUpString, nsISelectionController::MOVE_UP, 0 },
+ { sSelectDownString, nsISelectionController::MOVE_DOWN, 0 },
+ { sSelectLeft2String, nsISelectionController::MOVE_LEFT, 1 },
+ { sSelectRight2String, nsISelectionController::MOVE_RIGHT, 1 },
+ { sSelectUp2String, nsISelectionController::MOVE_UP, 1 },
+ { sSelectDown2String, nsISelectionController::MOVE_DOWN, 1 }
+};
+
+nsresult
+nsPhysicalSelectCommand::DoCommand(const char *aCommandName,
+                                   nsISupports *aCommandContext)
+{
+  nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(aCommandContext));
+  nsCOMPtr<nsISelectionController> selCont;
+  GetSelectionControllerFromWindow(piWindow, getter_AddRefs(selCont));
+  NS_ENSURE_TRUE(selCont, NS_ERROR_NOT_INITIALIZED);       
 
-  return rv;
+  for (size_t i = 0; i < ArrayLength(physicalSelectCommands); i++) {
+    if (!strcmp(aCommandName, physicalSelectCommands[i].command)) {
+      return selCont->PhysicalMove(physicalSelectCommands[i].direction,
+                                   physicalSelectCommands[i].amount,
+                                   true);
+    }
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 #if 0
@@ -868,6 +1012,15 @@
   NS_REGISTER_NEXT_COMMAND(nsSelectMoveScrollCommand, sCharPreviousString);
   NS_REGISTER_LAST_COMMAND(nsSelectMoveScrollCommand, sCharNextString);
 
+  NS_REGISTER_FIRST_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveLeftString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveRightString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveUpString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveDownString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveLeft2String);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveRight2String);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveUp2String);
+  NS_REGISTER_LAST_COMMAND(nsPhysicalSelectMoveScrollCommand, sMoveDown2String);
+
   NS_REGISTER_FIRST_COMMAND(nsSelectCommand, sSelectCharPreviousString);
   NS_REGISTER_NEXT_COMMAND(nsSelectCommand, sSelectCharNextString);
   NS_REGISTER_NEXT_COMMAND(nsSelectCommand, sSelectWordPreviousString);
@@ -881,6 +1034,15 @@
   NS_REGISTER_NEXT_COMMAND(nsSelectCommand, sSelectTopString);
   NS_REGISTER_LAST_COMMAND(nsSelectCommand, sSelectBottomString);
 
+  NS_REGISTER_FIRST_COMMAND(nsPhysicalSelectCommand, sSelectLeftString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectCommand, sSelectRightString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectCommand, sSelectUpString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectCommand, sSelectDownString);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectCommand, sSelectLeft2String);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectCommand, sSelectRight2String);
+  NS_REGISTER_NEXT_COMMAND(nsPhysicalSelectCommand, sSelectUp2String);
+  NS_REGISTER_LAST_COMMAND(nsPhysicalSelectCommand, sSelectDown2String);
+
   NS_REGISTER_ONE_COMMAND(nsClipboardCommand, "cmd_cut");
   NS_REGISTER_ONE_COMMAND(nsClipboardCommand, "cmd_copy");
   NS_REGISTER_ONE_COMMAND(nsClipboardCommand, "cmd_paste");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGlobalWindow.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGlobalWindow.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGlobalWindow.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGlobalWindow.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -190,10 +190,13 @@
 #include "mozilla/dom/GamepadService.h"
 #endif
 
+#include "mozilla/dom/VRDevice.h"
+
 #include "nsRefreshDriver.h"
 
 #include "mozilla/dom/SelectionChangeEvent.h"
 
+#include "mozilla/AddonPathService.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "nsLocation.h"
@@ -620,8 +623,6 @@
   virtual bool delete_(JSContext *cx, JS::Handle<JSObject*> proxy,
                        JS::Handle<jsid> id,
                        bool *bp) const MOZ_OVERRIDE;
-  virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> proxy,
-                         JS::AutoIdVector &props) const MOZ_OVERRIDE;
   virtual bool preventExtensions(JSContext *cx,
                                  JS::Handle<JSObject*> proxy,
                                  bool *succeeded) const MOZ_OVERRIDE;
@@ -649,9 +650,11 @@
                       JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
   virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> proxy,
                                             JS::AutoIdVector &props) const MOZ_OVERRIDE;
+  virtual bool getEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> proxy,
+                                         JS::AutoIdVector &props) const MOZ_OVERRIDE;
   virtual bool iterate(JSContext *cx, JS::Handle<JSObject*> proxy,
                        unsigned flags,
-                       JS::MutableHandle<JS::Value> vp) const MOZ_OVERRIDE;
+                       JS::MutableHandle<JSObject*> objp) const MOZ_OVERRIDE;
   virtual const char *className(JSContext *cx,
                                 JS::Handle<JSObject*> wrapper) const MOZ_OVERRIDE;
 
@@ -830,22 +833,6 @@
 }
 
 bool
-nsOuterWindowProxy::enumerate(JSContext *cx, JS::Handle<JSObject*> proxy,
-                              JS::AutoIdVector &props) const
-{
-  // Just our indexed stuff followed by our "normal" own property names.
-  if (!AppendIndexedPropertyNames(cx, proxy, props)) {
-    return false;
-  }
-
-  JS::AutoIdVector innerProps(cx);
-  if (!js::Wrapper::enumerate(cx, proxy, innerProps)) {
-    return false;
-  }
-  return js::AppendUnique(cx, props, innerProps);
-}
-
-bool
 nsOuterWindowProxy::preventExtensions(JSContext *cx,
                                       JS::Handle<JSObject*> proxy,
                                       bool *succeeded) const
@@ -943,12 +930,28 @@
 }
 
 bool
+nsOuterWindowProxy::getEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> proxy,
+                                              JS::AutoIdVector &props) const
+{
+  // Just our indexed stuff followed by our "normal" own property names.
+  if (!AppendIndexedPropertyNames(cx, proxy, props)) {
+    return false;
+  }
+
+  JS::AutoIdVector innerProps(cx);
+  if (!js::Wrapper::getEnumerablePropertyKeys(cx, proxy, innerProps)) {
+    return false;
+  }
+  return js::AppendUnique(cx, props, innerProps);
+}
+
+bool
 nsOuterWindowProxy::iterate(JSContext *cx, JS::Handle<JSObject*> proxy,
-                            unsigned flags, JS::MutableHandle<JS::Value> vp) const
+                            unsigned flags, JS::MutableHandle<JSObject*> objp) const
 {
   // BaseProxyHandler::iterate seems to do what we want here: fall
   // back on the property names returned from keys() and enumerate().
-  return js::BaseProxyHandler::iterate(cx, proxy, flags, vp);
+  return js::BaseProxyHandler::iterate(cx, proxy, flags, objp);
 }
 
 bool
@@ -1133,7 +1136,8 @@
     mCleanedUp(false),
     mDialogAbuseCount(0),
     mAreDialogsEnabled(true),
-    mCanSkipCCGeneration(0)
+    mCanSkipCCGeneration(0),
+    mVRDevicesInitialized(false)
 {
   nsLayoutStatics::AddRef();
 
@@ -1770,6 +1774,8 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGamepads)
 #endif
 
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVRDevices)
+
   // Traverse stuff from nsPIDOMWindow
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mChromeEventHandler)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParentTarget)
@@ -1831,6 +1837,8 @@
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mGamepads)
 #endif
 
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mVRDevices)
+
   // Unlink stuff from nsPIDOMWindow
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mChromeEventHandler)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mParentTarget)
@@ -2269,6 +2277,14 @@
     top = aNewInner->GetTop();
   }
   JS::CompartmentOptions options;
+
+  // Sometimes add-ons load their own XUL windows, either as separate top-level
+  // windows or inside a browser element. In such cases we want to tag the
+  // window's compartment with the add-on ID. See bug 1092156.
+  if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
+    options.setAddonId(MapURIToAddonID(aURI));
+  }
+
   if (top) {
     if (top->GetGlobalJSObject()) {
       options.setSameZoneAs(top->GetGlobalJSObject());
@@ -2412,9 +2428,10 @@
 
   bool thisChrome = IsChromeWindow();
 
-  // Check if we're near the stack limit before we get anywhere near the
-  // transplanting code. We use a conservative check since we'll use a little
-  // more space before we actually hit the critical "can't fail" path.
+  // Check if we're anywhere near the stack limit before we reach the
+  // transplanting code, since it has no good way to handle errors. This uses
+  // the untrusted script limit, which is not strictly necessary since no
+  // actual script should run.
   JS_CHECK_RECURSION_CONSERVATIVE(cx, return NS_ERROR_FAILURE);
 
   nsCOMPtr<WindowStateHolder> wsh = do_QueryInterface(aState);
@@ -5346,26 +5363,11 @@
   FORWARD_TO_OUTER_OR_THROW(MatchMedia, (aMediaQueryList, aError), aError,
                             nullptr);
 
-  // We need this now to ensure that we have a non-null |presContext|
-  // when we ought to.
-  // This is similar to EnsureSizeUpToDate, but only flushes frames.
-  nsGlobalWindow *parent = static_cast<nsGlobalWindow*>(GetPrivateParent());
-  if (parent) {
-    parent->FlushPendingNotifications(Flush_Frames);
-  }
-
-  if (!mDocShell) {
-    return nullptr;
-  }
-
-  nsRefPtr<nsPresContext> presContext;
-  mDocShell->GetPresContext(getter_AddRefs(presContext));
-
-  if (!presContext) {
+  if (!mDoc) {
     return nullptr;
   }
 
-  return presContext->MatchMedia(aMediaQueryList);
+  return mDoc->MatchMedia(aMediaQueryList);
 }
 
 NS_IMETHODIMP
@@ -5928,7 +5930,7 @@
 }
 
 nsresult
-nsGlobalWindow::SetFullScreenInternal(bool aFullScreen, bool aRequireTrust)
+nsGlobalWindow::SetFullScreenInternal(bool aFullScreen, bool aRequireTrust, gfx::VRHMDInfo* aHMD)
 {
   MOZ_ASSERT(IsOuterWindow());
 
@@ -5950,7 +5952,7 @@
   if (!window)
     return NS_ERROR_FAILURE;
   if (rootItem != mDocShell)
-    return window->SetFullScreenInternal(aFullScreen, aRequireTrust);
+    return window->SetFullScreenInternal(aFullScreen, aRequireTrust, aHMD);
 
   // make sure we don't try to set full screen on a non-chrome window,
   // which might happen in embedding world
@@ -5985,8 +5987,13 @@
   // want the content to fill the entire client area of the emulator window.
   if (!Preferences::GetBool("full-screen-api.ignore-widgets", false)) {
     nsCOMPtr<nsIWidget> widget = GetMainWidget();
-    if (widget)
-      widget->MakeFullScreen(aFullScreen);
+    if (widget) {
+      nsCOMPtr<nsIScreen> screen;
+      if (aHMD) {
+        screen = aHMD->GetScreen();
+      }
+      widget->MakeFullScreen(aFullScreen, screen);
+    }
   }
 
   if (!mFullScreen) {
@@ -6375,7 +6382,7 @@
 }
 
 already_AddRefed<Promise>
-nsGlobalWindow::Fetch(const RequestOrScalarValueString& aInput,
+nsGlobalWindow::Fetch(const RequestOrUSVString& aInput,
                       const RequestInit& aInit, ErrorResult& aRv)
 {
   return FetchRequest(this, aInput, aInit, aRv);
@@ -7783,46 +7790,15 @@
   return rv.ErrorCode();
 }
 
-JSObject* nsGlobalWindow::CallerGlobal()
-{
-  JSContext *cx = nsContentUtils::GetCurrentJSContext();
-  if (!cx) {
-    NS_ERROR("Please don't call this method from C++!");
-
-    return nullptr;
-  }
-
-  // If somebody does sameOriginIframeWindow.postMessage(...), they probably
-  // expect the .source attribute of the resulting message event to be |window|
-  // rather than |sameOriginIframeWindow|, even though the transparent wrapper
-  // semantics of same-origin access will cause us to be in the iframe's
-  // compartment at the time of the call. This means that we want the incumbent
-  // global here, rather than the global of the current compartment.
-  //
-  // There are various edge cases in which the incumbent global and the current
-  // global would not be same-origin. They include:
-  // * A privileged caller (System Principal or Expanded Principal) manipulating
-  //   less-privileged content via Xray Waivers.
-  // * An unprivileged caller invoking a cross-origin function that was exposed
-  //   to it by privileged code (i.e. Sandbox.importFunction).
-  //
-  // In these cases, we probably don't want the privileged global appearing in the
-  // .source attribute. So we fall back to the compartment global there.
-  JS::Rooted<JSObject*> incumbentGlobal(cx, &IncumbentJSGlobal());
-  JS::Rooted<JSObject*> compartmentGlobal(cx, JS::CurrentGlobalOrNull(cx));
-  nsIPrincipal* incumbentPrin = nsContentUtils::ObjectPrincipal(incumbentGlobal);
-  nsIPrincipal* compartmentPrin = nsContentUtils::ObjectPrincipal(compartmentGlobal);
-  return incumbentPrin->EqualsConsideringDomain(compartmentPrin) ? incumbentGlobal
-                                                                 : compartmentGlobal;
-}
-
-
 nsGlobalWindow*
 nsGlobalWindow::CallerInnerWindow()
 {
   JSContext *cx = nsContentUtils::GetCurrentJSContext();
   NS_ENSURE_TRUE(cx, nullptr);
-  JS::Rooted<JSObject*> scope(cx, CallerGlobal());
+  nsIGlobalObject* global = GetIncumbentGlobal();
+  NS_ENSURE_TRUE(global, nullptr);
+  JS::Rooted<JSObject*> scope(cx, global->GetGlobalJSObject());
+  NS_ENSURE_TRUE(scope, nullptr);
 
   // When Jetpack runs content scripts inside a sandbox, it uses
   // sandboxPrototype to make them appear as though they're running in the
@@ -7830,7 +7806,7 @@
   // the |source| of the received message to be the window set as the
   // sandboxPrototype. This used to work incidentally for unrelated reasons, but
   // now we need to do some special handling to support it.
-  {
+  if (xpc::IsSandbox(scope)) {
     JSAutoCompartment ac(cx, scope);
     JS::Rooted<JSObject*> scopeProto(cx);
     bool ok = JS_GetPrototype(cx, scope, &scopeProto);
@@ -7838,26 +7814,14 @@
     if (scopeProto && xpc::IsSandboxPrototypeProxy(scopeProto) &&
         (scopeProto = js::CheckedUnwrap(scopeProto, /* stopAtOuter = */ false)))
     {
-      scope = scopeProto;
+      global = xpc::NativeGlobal(scopeProto);
+      NS_ENSURE_TRUE(global, nullptr);
     }
   }
-  JSAutoCompartment ac(cx, scope);
 
-  // We don't use xpc::WindowOrNull here because we want to be able to tell
-  // apart the cases of "scope is not an nsISupports at all" and "scope is an
-  // nsISupports that's not a window". It's not clear whether that's desirable,
-  // see bug 984467.
-  nsISupports* native =
-    nsContentUtils::XPConnect()->GetNativeOfWrapper(cx, scope);
-  if (!native)
-    return nullptr;
-
-  // The calling window must be holding a reference, so we can just return a
-  // raw pointer here and let the QI's addref be balanced by the nsCOMPtr
-  // destructor's release.
-  nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(native);
-  if (!win)
-    return GetCurrentInnerWindowInternal();
+  // The calling window must be holding a reference, so we can return a weak
+  // pointer.
+  nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(global);
   return static_cast<nsGlobalWindow*>(win.get());
 }
 
@@ -8258,10 +8222,9 @@
   else {
     // In case the global is not a window, it can be a sandbox, and the sandbox's
     // principal can be used for the security check.
-    JSObject *global = CallerGlobal();
+    nsIGlobalObject* global = GetIncumbentGlobal();
     NS_ASSERTION(global, "Why is there no global object?");
-    JSCompartment *compartment = js::GetObjectCompartment(global);
-    callerPrin = xpc::GetCompartmentPrincipal(compartment);
+    callerPrin = global->PrincipalOrNull();
   }
   if (!callerPrin) {
     return;
@@ -12023,6 +11986,9 @@
     // inner window that's calling window.setTimeout().
 
     forwardTo = CallerInnerWindow();
+    if (!forwardTo && nsContentUtils::IsCallerChrome()) {
+      forwardTo = currentInner;
+    }
     if (!forwardTo) {
       aError.Throw(NS_ERROR_NOT_AVAILABLE);
       return nullptr;
@@ -12241,14 +12207,15 @@
 
   if (IsOuterWindow()) {
     nsGlobalWindow* callerInner = CallerInnerWindow();
-    NS_ENSURE_TRUE(callerInner, NS_ERROR_NOT_AVAILABLE);
+    NS_ENSURE_TRUE(callerInner || nsContentUtils::IsCallerChrome(), NS_ERROR_NOT_AVAILABLE);
 
     // If the caller and the callee share the same outer window,
     // forward to the callee inner. Else, we forward to the current
     // inner (e.g. someone is calling setTimeout() on a reference to
     // some other window).
 
-    if (callerInner->GetOuterWindow() == this &&
+    if (callerInner &&
+        callerInner->GetOuterWindow() == this &&
         callerInner->IsInnerWindow()) {
       return callerInner->SetTimeoutOrInterval(aIsInterval, aReturn);
     }
@@ -13461,7 +13428,26 @@
     mGamepads.EnumerateRead(EnumGamepadsForSync, nullptr);
   }
 }
-#endif
+#endif // MOZ_GAMEPAD
+
+bool
+nsGlobalWindow::GetVRDevices(nsTArray<nsRefPtr<mozilla::dom::VRDevice>>& aDevices)
+{
+  FORWARD_TO_INNER(GetVRDevices, (aDevices), false);
+
+  if (!mVRDevicesInitialized) {
+    bool ok = mozilla::dom::VRDevice::CreateAllKnownVRDevices(ToSupports(this), mVRDevices);
+    if (!ok) {
+      mVRDevices.Clear();
+      return false;
+    }
+  }
+
+  mVRDevicesInitialized = true;
+  aDevices = mVRDevices;
+  return true;
+}
+
 // nsGlobalChromeWindow implementation
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsGlobalChromeWindow)
@@ -14132,8 +14118,12 @@
 nsGlobalWindow::ClearDocumentDependentSlots(JSContext* aCx)
 {
   MOZ_ASSERT(IsInnerWindow());
-  WindowBinding::ClearCachedDocumentValue(aCx, this);
-  WindowBinding::ClearCachedPerformanceValue(aCx, this);
+
+  // If JSAPI OOMs here, there is basically nothing we can do to recover safely.
+  if (!WindowBinding::ClearCachedDocumentValue(aCx, this) ||
+      !WindowBinding::ClearCachedPerformanceValue(aCx, this)) {
+    MOZ_CRASH("Unhandlable OOM while clearing document dependent slots.");
+  }
 }
 
 /* static */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGlobalWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGlobalWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsGlobalWindow.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsGlobalWindow.h	2014-11-26 21:45:55.000000000 +0000
@@ -104,13 +104,14 @@
 class External;
 class Function;
 class Gamepad;
+class VRDevice;
 class MediaQueryList;
 class MozSelfSupport;
 class Navigator;
 class OwningExternalOrWindowProxy;
 class Promise;
 struct RequestInit;
-class RequestOrScalarValueString;
+class RequestOrUSVString;
 class Selection;
 class SpeechSynthesis;
 class WakeLock;
@@ -118,6 +119,9 @@
 class IDBFactory;
 } // namespace indexedDB
 } // namespace dom
+namespace gfx {
+class VRHMDInfo;
+} // namespace gfx
 } // namespace mozilla
 
 extern nsresult
@@ -464,7 +468,8 @@
   virtual void RefreshCompartmentPrincipal();
 
   // Outer windows only.
-  virtual nsresult SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust);
+  virtual nsresult SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust,
+                                         mozilla::gfx::VRHMDInfo *aHMD = nullptr);
   bool FullScreen() const;
 
   // Inner windows only.
@@ -734,6 +739,8 @@
   void EnableGamepadUpdates();
   void DisableGamepadUpdates();
 
+  // Get the VR devices for this window, initializing if necessary
+  bool GetVRDevices(nsTArray<nsRefPtr<mozilla::dom::VRDevice>>& aDevices);
 
 #define EVENT(name_, id_, type_, struct_)                                     \
   mozilla::dom::EventHandlerNonNull* GetOn##name_()                           \
@@ -857,7 +864,7 @@
   void Alert(mozilla::ErrorResult& aError);
   void Alert(const nsAString& aMessage, mozilla::ErrorResult& aError);
   bool Confirm(const nsAString& aMessage, mozilla::ErrorResult& aError);
-  already_AddRefed<mozilla::dom::Promise> Fetch(const mozilla::dom::RequestOrScalarValueString& aInput,
+  already_AddRefed<mozilla::dom::Promise> Fetch(const mozilla::dom::RequestOrUSVString& aInput,
                                                 const mozilla::dom::RequestInit& aInit,
                                                 mozilla::ErrorResult& aRv);
   void Prompt(const nsAString& aMessage, const nsAString& aInitial,
@@ -1092,7 +1099,6 @@
   }
 
   void FreeInnerObjects();
-  JSObject *CallerGlobal();
   nsGlobalWindow *CallerInnerWindow();
 
   // Only to be called on an inner window.
@@ -1631,6 +1637,13 @@
   // This is the CC generation the last time we called CanSkip.
   uint32_t mCanSkipCCGeneration;
 
+  // Did VR get initialized for this window?
+  bool                                       mVRDevicesInitialized;
+  // The VRDevies for this window
+  nsTArray<nsRefPtr<mozilla::dom::VRDevice>> mVRDevices;
+  // Any attached HMD when fullscreen
+  nsRefPtr<mozilla::gfx::VRHMDInfo>          mVRHMDInfo;
+
   friend class nsDOMScriptableHelper;
   friend class nsDOMWindowUtils;
   friend class PostMessageEvent;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsIDocument.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsIDocument.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsIDocument.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsIDocument.h	2014-11-26 21:45:55.000000000 +0000
@@ -19,12 +19,15 @@
 #include "nsPIDOMWindow.h"               // for use in inline functions
 #include "nsPropertyTable.h"             // for member
 #include "nsTHashtable.h"                // for member
+#include "mozilla/net/ReferrerPolicy.h"  // for member
 #include "nsWeakReference.h"
 #include "mozilla/dom/DocumentBinding.h"
 #include "mozilla/WeakPtr.h"
 #include "Units.h"
 #include "nsExpirationTracker.h"
 #include "nsClassHashtable.h"
+#include "prclist.h"
+#include "gfxVR.h"
 
 class imgIRequest;
 class nsAString;
@@ -113,6 +116,7 @@
 class HTMLBodyElement;
 struct LifecycleCallbackArgs;
 class Link;
+class MediaQueryList;
 class GlobalObject;
 class NodeFilter;
 class NodeIterator;
@@ -132,12 +136,18 @@
 
 template<typename, typename> class CallbackObjectHolder;
 typedef CallbackObjectHolder<NodeFilter, nsIDOMNodeFilter> NodeFilterHolder;
+
+struct FullScreenOptions {
+  FullScreenOptions() { }
+  nsRefPtr<gfx::VRHMDInfo> mVRHMDDevice;
+};
+
 } // namespace dom
 } // namespace mozilla
 
 #define NS_IDOCUMENT_IID \
-{ 0x1f343423, 0x957c, 0x4da3, \
-  { 0xaa, 0xa3, 0x07, 0x37, 0x54, 0x3e, 0x79, 0x2a } }
+{ 0xf63d2f6e, 0xd1c1, 0x49b9, \
+ { 0x88, 0x26, 0xd5, 0x9e, 0x5d, 0x72, 0x2a, 0x42 } }
 
 // Enum for requesting a particular type of document when creating a doc
 enum DocumentFlavor {
@@ -161,6 +171,7 @@
 NS_GetContentList(nsINode* aRootNode,
                   int32_t aMatchNameSpaceId,
                   const nsAString& aTagname);
+
 //----------------------------------------------------------------------
 
 // Document interface.  This is implemented by all document objects in
@@ -169,6 +180,7 @@
 {
   typedef mozilla::dom::GlobalObject GlobalObject;
 public:
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
   typedef mozilla::dom::Element Element;
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_IID)
@@ -272,6 +284,15 @@
   virtual void SetChromeXHRDocBaseURI(nsIURI* aURI) = 0;
 
   /**
+   * Return the referrer policy of the document. Return "default" if there's no
+   * valid meta referrer tag found in the document.
+   */
+  ReferrerPolicy GetReferrerPolicy() const
+  {
+    return mReferrerPolicy;
+  }
+
+  /**
    * Set the principal responsible for this document.
    */
   virtual void SetPrincipal(nsIPrincipal *aPrincipal) = 0;
@@ -1051,7 +1072,8 @@
    * the <iframe> or <browser> that contains this document is also mode
    * fullscreen. This happens recursively in all ancestor documents.
    */
-  virtual void AsyncRequestFullScreen(Element* aElement) = 0;
+  virtual void AsyncRequestFullScreen(Element* aElement,
+                                      mozilla::dom::FullScreenOptions& aOptions) = 0;
 
   /**
    * Called when a frame in a child process has entered fullscreen or when a
@@ -1515,6 +1537,17 @@
                     mozilla::ErrorResult& aRv) = 0;
 
   /**
+   * Support for window.matchMedia()
+   */
+
+  already_AddRefed<mozilla::dom::MediaQueryList>
+    MatchMedia(const nsAString& aMediaQueryList);
+
+  const PRCList* MediaQueryLists() const {
+    return &mDOMMediaQueryLists;
+  }
+
+  /**
    * Get the compatibility mode for this document
    */
   nsCompatibility GetCompatibilityMode() const {
@@ -1886,7 +1919,14 @@
    * be a void string if the attr is not present.
    */
   virtual void MaybePreLoadImage(nsIURI* uri,
-                                 const nsAString& aCrossOriginAttr) = 0;
+                                 const nsAString& aCrossOriginAttr,
+                                 ReferrerPolicy aReferrerPolicy) = 0;
+
+  /**
+   * Called by images to forget an image preload when they start doing
+   * the real load.
+   */
+  virtual void ForgetImagePreload(nsIURI* aURI) = 0;
 
   /**
    * Called by nsParser to preload style sheets.  Can also be merged into the
@@ -1894,7 +1934,8 @@
    * should be a void string if the attr is not present.
    */
   virtual void PreloadStyle(nsIURI* aURI, const nsAString& aCharset,
-                            const nsAString& aCrossOriginAttr) = 0;
+                            const nsAString& aCrossOriginAttr,
+                            ReferrerPolicy aReferrerPolicy) = 0;
 
   /**
    * Called by the chrome registry to load style sheets.  Can be put
@@ -2468,6 +2509,9 @@
 
   nsWeakPtr mDocumentLoadGroup;
 
+  bool mReferrerPolicySet;
+  ReferrerPolicy mReferrerPolicy;
+
   mozilla::WeakPtr<nsDocShell> mDocumentContainer;
 
   nsCString mCharacterSet;
@@ -2761,6 +2805,9 @@
 
   uint32_t mBlockDOMContentLoaded;
   bool mDidFireDOMContentLoaded:1;
+
+  // Our live MediaQueryLists
+  PRCList mDOMMediaQueryLists;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocument, NS_IDOCUMENT_IID)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsImageLoadingContent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsImageLoadingContent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsImageLoadingContent.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsImageLoadingContent.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -182,7 +182,7 @@
     }
     nsresult status =
         reqStatus & imgIRequest::STATUS_ERROR ? NS_ERROR_FAILURE : NS_OK;
-    return OnStopRequest(aRequest, status);
+    return OnLoadComplete(aRequest, status);
   }
 
   if (aType == imgINotificationObserver::DECODE_COMPLETE) {
@@ -205,8 +205,7 @@
 }
 
 nsresult
-nsImageLoadingContent::OnStopRequest(imgIRequest* aRequest,
-                                     nsresult aStatus)
+nsImageLoadingContent::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus)
 {
   uint32_t oldStatus;
   aRequest->GetImageStatus(&oldStatus);
@@ -362,14 +361,51 @@
   return NS_OK;
 }
 
+static void
+ReplayImageStatus(imgIRequest* aRequest, imgINotificationObserver* aObserver)
+{
+  if (!aRequest) {
+    return;
+  }
+
+  uint32_t status = 0;
+  nsresult rv = aRequest->GetImageStatus(&status);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  if (status & imgIRequest::STATUS_SIZE_AVAILABLE) {
+    aObserver->Notify(aRequest, imgINotificationObserver::SIZE_AVAILABLE, nullptr);
+  }
+  if (status & imgIRequest::STATUS_FRAME_COMPLETE) {
+    aObserver->Notify(aRequest, imgINotificationObserver::FRAME_COMPLETE, nullptr);
+  }
+  if (status & imgIRequest::STATUS_HAS_TRANSPARENCY) {
+    aObserver->Notify(aRequest, imgINotificationObserver::HAS_TRANSPARENCY, nullptr);
+  }
+  if (status & imgIRequest::STATUS_IS_ANIMATED) {
+    aObserver->Notify(aRequest, imgINotificationObserver::IS_ANIMATED, nullptr);
+  }
+  if (status & imgIRequest::STATUS_DECODE_COMPLETE) {
+    aObserver->Notify(aRequest, imgINotificationObserver::DECODE_COMPLETE, nullptr);
+  }
+  if (status & imgIRequest::STATUS_LOAD_COMPLETE) {
+    aObserver->Notify(aRequest, imgINotificationObserver::LOAD_COMPLETE, nullptr);
+  }
+}
+
 NS_IMETHODIMP
 nsImageLoadingContent::AddObserver(imgINotificationObserver* aObserver)
 {
   NS_ENSURE_ARG_POINTER(aObserver);
 
   if (!mObserverList.mObserver) {
-    mObserverList.mObserver = aObserver;
     // Don't touch the linking of the list!
+    mObserverList.mObserver = aObserver;
+
+    ReplayImageStatus(mCurrentRequest, aObserver);
+    ReplayImageStatus(mPendingRequest, aObserver);
+
     return NS_OK;
   }
 
@@ -385,6 +421,9 @@
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
+  ReplayImageStatus(mCurrentRequest, aObserver);
+  ReplayImageStatus(mPendingRequest, aObserver);
+
   return NS_OK;
 }
 
@@ -888,11 +927,17 @@
   rv = nsContentUtils::LoadImage(aNewURI, aDocument,
                                  aDocument->NodePrincipal(),
                                  aDocument->GetDocumentURI(),
+                                 aDocument->GetReferrerPolicy(),
                                  this, loadFlags,
                                  content->LocalName(),
                                  getter_AddRefs(req),
                                  policyType);
 
+  // Tell the document to forget about the image preload, if any, for
+  // this URI, now that we might have another imgRequestProxy for it.
+  // That way if we get canceled later the image load won't continue.
+  aDocument->ForgetImagePreload(aNewURI);
+
   if (NS_SUCCEEDED(rv)) {
     TrackImage(req);
     ResetAnimationIfNeeded();
@@ -1007,8 +1052,8 @@
 nsImageLoadingContent::UpdateImageState(bool aNotify)
 {
   if (mStateChangerDepth > 0) {
-    // Ignore this call; we'll update our state when the outermost state
-    // changer is destroyed. Need this to work around the fact that some libpr0n
+    // Ignore this call; we'll update our state when the outermost state changer
+    // is destroyed. Need this to work around the fact that some ImageLib
     // stuff is actually sync and hence we can get OnStopDecode called while
     // we're still under LoadImage, and OnStopDecode doesn't know anything about
     // aNotify.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsImageLoadingContent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsImageLoadingContent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsImageLoadingContent.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsImageLoadingContent.h	2014-11-26 21:45:55.000000000 +0000
@@ -209,7 +209,7 @@
                   nsIContent* aBindingParent, bool aCompileEventHandlers);
   void UnbindFromTree(bool aDeep, bool aNullParent);
 
-  nsresult OnStopRequest(imgIRequest* aRequest, nsresult aStatus);
+  nsresult OnLoadComplete(imgIRequest* aRequest, nsresult aStatus);
   void OnUnlockedDraw();
   nsresult OnImageIsAnimated(imgIRequest *aRequest);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsINode.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsINode.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsINode.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsINode.h	2014-11-26 21:45:55.000000000 +0000
@@ -1984,6 +1984,11 @@
     aLocalName = nsINode::LocalName(); \
     return NS_OK; \
   } \
+  NS_IMETHOD UnusedPlaceholder(bool* aResult) __VA_ARGS__ \
+  { \
+    *aResult = false; \
+    return NS_OK; \
+  } \
   NS_IMETHOD GetDOMBaseURI(nsAString& aBaseURI) __VA_ARGS__ \
   { \
     nsINode::GetBaseURI(aBaseURI); \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsISelectionController.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsISelectionController.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsISelectionController.idl	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsISelectionController.idl	2014-11-26 21:45:55.000000000 +0000
@@ -16,7 +16,7 @@
 interface nsISelection;
 interface nsISelectionDisplay;
 
-[scriptable, uuid(b1ff7faa-8097-431d-b7f1-b0615e3cd596)]
+[scriptable, uuid(7835DE46-DB36-4BB7-8684-1049A0C13049)]
 interface nsISelectionController : nsISelectionDisplay
 {
    const short SELECTION_NONE=0;
@@ -143,6 +143,26 @@
    */
     void characterMove(in boolean forward, in boolean extend);
 
+   /** PhysicalMove will move the selection one "unit" in a given direction
+   *  within the document.
+   *  this will also have the effect of collapsing the selection if the aExtend = PR_FALSE
+   *  the "point" of selection that is extended is considered the "focus" point. 
+   *  or the last point adjusted by the selection.
+   *  @param aDirection 
+   *  @param aAmount    character/line; word/lineBoundary
+   *  @param aExtend    should it collapse the selection of extend it?
+   */
+    void physicalMove(in short direction, in short amount, in boolean extend);
+
+   /**
+    * nsFrameSelection::PhysicalMove depends on the ordering of these values;
+    * do not change without checking there!
+    */
+   const short MOVE_LEFT = 0;
+   const short MOVE_RIGHT = 1;
+   const short MOVE_UP = 2;
+   const short MOVE_DOWN = 3;
+
    /**
     * CharacterExtendForDelete will extend the selection one character cell
     * forward in the document.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSEnvironment.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSEnvironment.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSEnvironment.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSEnvironment.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -2412,14 +2412,6 @@
 }
 
 void
-nsJSContext::ReportPendingException()
-{
-  if (mIsInitialized) {
-    nsJSUtils::ReportPendingException(mContext);
-  }
-}
-
-void
 nsJSContext::SetWindowProxy(JS::Handle<JSObject*> aWindowProxy)
 {
   mWindowProxy = aWindowProxy;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSEnvironment.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSEnvironment.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSEnvironment.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSEnvironment.h	2014-11-26 21:45:55.000000000 +0000
@@ -146,11 +146,6 @@
 
   nsresult AddSupportsPrimitiveTojsvals(nsISupports *aArg, JS::Value *aArgv);
 
-  // Report the pending exception on our mContext, if any.  This
-  // function will set aside the frame chain on mContext before
-  // reporting.
-  void ReportPendingException();
-
 private:
   void DestroyJSContext();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSUtils.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSUtils.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -169,14 +169,13 @@
                           JS::Handle<JSObject*> aEvaluationGlobal,
                           JS::CompileOptions& aCompileOptions,
                           const EvaluateOptions& aEvaluateOptions,
-                          JS::MutableHandle<JS::Value> aRetValue,
-                          void **aOffThreadToken)
+                          JS::MutableHandle<JS::Value> aRetValue)
 {
   const nsPromiseFlatString& flatScript = PromiseFlatString(aScript);
   JS::SourceBufferHolder srcBuf(flatScript.get(), aScript.Length(),
                                 JS::SourceBufferHolder::NoOwnership);
   return EvaluateString(aCx, srcBuf, aEvaluationGlobal, aCompileOptions,
-                        aEvaluateOptions, aRetValue, aOffThreadToken);
+                        aEvaluateOptions, aRetValue, nullptr);
 }
 
 nsresult
@@ -193,22 +192,24 @@
 
   MOZ_ASSERT_IF(aCompileOptions.versionSet,
                 aCompileOptions.version != JSVERSION_UNKNOWN);
-  MOZ_ASSERT_IF(aEvaluateOptions.coerceToString, aEvaluateOptions.needResult);
-  MOZ_ASSERT_IF(!aEvaluateOptions.reportUncaught, aEvaluateOptions.needResult);
+  MOZ_ASSERT_IF(aEvaluateOptions.coerceToString, !aCompileOptions.noScriptRval);
+  MOZ_ASSERT_IF(!aEvaluateOptions.reportUncaught, !aCompileOptions.noScriptRval);
+  // Note that the above assert means that if aCompileOptions.noScriptRval then
+  // also aEvaluateOptions.reportUncaught.
   MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
   MOZ_ASSERT(aSrcBuf.get());
   MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(aEvaluationGlobal) ==
              aEvaluationGlobal);
+  MOZ_ASSERT_IF(aOffThreadToken, aCompileOptions.noScriptRval);
 
   // Unfortunately, the JS engine actually compiles scripts with a return value
   // in a different, less efficient way.  Furthermore, it can't JIT them in many
   // cases.  So we need to be explicitly told whether the caller cares about the
   // return value.  Callers can do this by calling the other overload of
-  // EvaluateString() which calls this function with aEvaluateOptions.needResult
-  // set to false.
+  // EvaluateString() which calls this function with
+  // aCompileOptions.noScriptRval set to true.
   aRetValue.setUndefined();
 
-  nsAutoMicroTask mt;
   nsresult rv = NS_OK;
 
   nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
@@ -247,20 +248,12 @@
         script(aCx, JS::FinishOffThreadScript(aCx, JS_GetRuntime(aCx), *aOffThreadToken));
       *aOffThreadToken = nullptr; // Mark the token as having been finished.
       if (script) {
-        if (aEvaluateOptions.needResult) {
-          ok = JS_ExecuteScript(aCx, scopeChain, script, aRetValue);
-        } else {
-          ok = JS_ExecuteScript(aCx, scopeChain, script);
-        }
+        ok = JS_ExecuteScript(aCx, scopeChain, script);
       } else {
         ok = false;
       }
     } else if (ok) {
-      if (aEvaluateOptions.needResult) {
-        ok = JS::Evaluate(aCx, scopeChain, aCompileOptions, aSrcBuf, aRetValue);
-      } else {
-        ok = JS::Evaluate(aCx, scopeChain, aCompileOptions, aSrcBuf);
-      }
+      ok = JS::Evaluate(aCx, scopeChain, aCompileOptions, aSrcBuf, aRetValue);
     }
 
     if (ok && aEvaluateOptions.coerceToString && !aRetValue.isUndefined()) {
@@ -274,7 +267,7 @@
   if (!ok) {
     if (aEvaluateOptions.reportUncaught) {
       ReportPendingException(aCx);
-      if (aEvaluateOptions.needResult) {
+      if (!aCompileOptions.noScriptRval) {
         aRetValue.setUndefined();
       }
     } else {
@@ -282,36 +275,44 @@
                                       : NS_ERROR_OUT_OF_MEMORY;
       JS::Rooted<JS::Value> exn(aCx);
       JS_GetPendingException(aCx, &exn);
-      if (aEvaluateOptions.needResult) {
-        aRetValue.set(exn);
-      }
+      MOZ_ASSERT(!aCompileOptions.noScriptRval); // we asserted this on entry
+      aRetValue.set(exn);
       JS_ClearPendingException(aCx);
     }
   }
 
   // Wrap the return value into whatever compartment aCx was in.
-  if (aEvaluateOptions.needResult) {
-    JS::Rooted<JS::Value> v(aCx, aRetValue);
-    if (!JS_WrapValue(aCx, &v)) {
+  if (!aCompileOptions.noScriptRval) {
+    if (!JS_WrapValue(aCx, aRetValue)) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    aRetValue.set(v);
   }
   return rv;
 }
 
 nsresult
 nsJSUtils::EvaluateString(JSContext* aCx,
-                          const nsAString& aScript,
+                          JS::SourceBufferHolder& aSrcBuf,
                           JS::Handle<JSObject*> aEvaluationGlobal,
                           JS::CompileOptions& aCompileOptions,
-                          void **aOffThreadToken)
+                          const EvaluateOptions& aEvaluateOptions,
+                          JS::MutableHandle<JS::Value> aRetValue)
+{
+  return EvaluateString(aCx, aSrcBuf, aEvaluationGlobal, aCompileOptions,
+                        aEvaluateOptions, aRetValue, nullptr);
+}
+
+nsresult
+nsJSUtils::EvaluateString(JSContext* aCx,
+                          const nsAString& aScript,
+                          JS::Handle<JSObject*> aEvaluationGlobal,
+                          JS::CompileOptions& aCompileOptions)
 {
   EvaluateOptions options(aCx);
-  options.setNeedResult(false);
+  aCompileOptions.setNoScriptRval(true);
   JS::RootedValue unused(aCx);
   return EvaluateString(aCx, aScript, aEvaluationGlobal, aCompileOptions,
-                        options, &unused, aOffThreadToken);
+                        options, &unused);
 }
 
 nsresult
@@ -322,7 +323,7 @@
                           void **aOffThreadToken)
 {
   EvaluateOptions options(aCx);
-  options.setNeedResult(false);
+  aCompileOptions.setNoScriptRval(true);
   JS::RootedValue unused(aCx);
   return EvaluateString(aCx, aSrcBuf, aEvaluationGlobal, aCompileOptions,
                         options, &unused, aOffThreadToken);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsJSUtils.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsJSUtils.h	2014-11-26 21:45:55.000000000 +0000
@@ -68,13 +68,11 @@
   struct MOZ_STACK_CLASS EvaluateOptions {
     bool coerceToString;
     bool reportUncaught;
-    bool needResult;
     JS::AutoObjectVector scopeChain;
 
     explicit EvaluateOptions(JSContext* cx)
       : coerceToString(false)
       , reportUncaught(true)
-      , needResult(true)
       , scopeChain(cx)
     {}
 
@@ -87,11 +85,6 @@
       reportUncaught = aReport;
       return *this;
     }
-
-    EvaluateOptions& setNeedResult(bool aNeedResult) {
-      needResult = aNeedResult;
-      return *this;
-    }
   };
 
   // aEvaluationGlobal is the global to evaluate in.  The return value
@@ -102,35 +95,41 @@
                                  JS::Handle<JSObject*> aEvaluationGlobal,
                                  JS::CompileOptions &aCompileOptions,
                                  const EvaluateOptions& aEvaluateOptions,
-                                 JS::MutableHandle<JS::Value> aRetValue,
-                                 void **aOffThreadToken = nullptr);
+                                 JS::MutableHandle<JS::Value> aRetValue);
 
   static nsresult EvaluateString(JSContext* aCx,
                                  JS::SourceBufferHolder& aSrcBuf,
                                  JS::Handle<JSObject*> aEvaluationGlobal,
                                  JS::CompileOptions &aCompileOptions,
                                  const EvaluateOptions& aEvaluateOptions,
-                                 JS::MutableHandle<JS::Value> aRetValue,
-                                 void **aOffThreadToken = nullptr);
+                                 JS::MutableHandle<JS::Value> aRetValue);
 
 
   static nsresult EvaluateString(JSContext* aCx,
                                  const nsAString& aScript,
                                  JS::Handle<JSObject*> aEvaluationGlobal,
-                                 JS::CompileOptions &aCompileOptions,
-                                 void **aOffThreadToken = nullptr);
+                                 JS::CompileOptions &aCompileOptions);
 
   static nsresult EvaluateString(JSContext* aCx,
                                  JS::SourceBufferHolder& aSrcBuf,
                                  JS::Handle<JSObject*> aEvaluationGlobal,
                                  JS::CompileOptions &aCompileOptions,
-                                 void **aOffThreadToken = nullptr);
+                                 void **aOffThreadToken);
 
   // Returns false if an exception got thrown on aCx.  Passing a null
   // aElement is allowed; that wil produce an empty aScopeChain.
   static bool GetScopeChainForElement(JSContext* aCx,
                                       mozilla::dom::Element* aElement,
                                       JS::AutoObjectVector& aScopeChain);
+private:
+  // Implementation for our EvaluateString bits
+  static nsresult EvaluateString(JSContext* aCx,
+                                 JS::SourceBufferHolder& aSrcBuf,
+                                 JS::Handle<JSObject*> aEvaluationGlobal,
+                                 JS::CompileOptions& aCompileOptions,
+                                 const EvaluateOptions& aEvaluateOptions,
+                                 JS::MutableHandle<JS::Value> aRetValue,
+                                 void **aOffThreadToken);
 };
 
 class MOZ_STACK_CLASS AutoDontReportUncaught {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsLocation.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsLocation.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsLocation.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsLocation.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -114,6 +114,7 @@
 
   nsCOMPtr<nsISupports> owner;
   nsCOMPtr<nsIURI> sourceURI;
+  net::ReferrerPolicy referrerPolicy = net::RP_Default;
 
   if (JSContext *cx = nsContentUtils::GetCurrentJSContext()) {
     // No cx means that there's no JS running, or at least no JS that
@@ -149,6 +150,7 @@
       docCurrentURI = doc->GetDocumentURI();
       rv = doc->NodePrincipal()->GetURI(getter_AddRefs(principalURI));
       NS_ENSURE_SUCCESS(rv, rv);
+      referrerPolicy = doc->GetReferrerPolicy();
     }
 
     bool urisEqual = false;
@@ -186,6 +188,7 @@
 
   if (sourceURI) {
     loadInfo->SetReferrer(sourceURI);
+    loadInfo->SetReferrerPolicy(referrerPolicy);
   }
 
   loadInfo.swap(*aLoadInfo);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsNodeInfoManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsNodeInfoManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsNodeInfoManager.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsNodeInfoManager.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -28,6 +28,7 @@
 #include "nsHashKeys.h"
 #include "nsCCUncollectableMarker.h"
 #include "nsNameSpaceManager.h"
+#include "nsDocument.h"
 
 using namespace mozilla;
 using mozilla::dom::NodeInfo;
@@ -153,11 +154,6 @@
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsNodeInfoManager)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsNodeInfoManager)
-  if (tmp->mDocument &&
-      nsCCUncollectableMarker::InGeneration(cb,
-                                            tmp->mDocument->GetMarkedCCGeneration())) {
-    return NS_SUCCESS_INTERRUPTED_TRAVERSE;
-  }
   if (tmp->mNonDocumentNodeInfos) {
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mDocument)
   }
@@ -167,6 +163,24 @@
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsNodeInfoManager, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsNodeInfoManager, Release)
 
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(nsNodeInfoManager)
+  if (tmp->mDocument) {
+    return NS_CYCLE_COLLECTION_PARTICIPANT(nsDocument)->CanSkip(tmp->mDocument, aRemovingAllowed);
+  }
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_END
+
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_BEGIN(nsNodeInfoManager)
+  if (tmp->mDocument) {
+    return NS_CYCLE_COLLECTION_PARTICIPANT(nsDocument)->CanSkipInCC(tmp->mDocument);
+  }
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_END
+
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(nsNodeInfoManager)
+  if (tmp->mDocument) {
+    return NS_CYCLE_COLLECTION_PARTICIPANT(nsDocument)->CanSkipThis(tmp->mDocument);
+  }
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
+
 nsresult
 nsNodeInfoManager::Init(nsIDocument *aDocument)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsNodeInfoManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsNodeInfoManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsNodeInfoManager.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsNodeInfoManager.h	2014-11-26 21:45:55.000000000 +0000
@@ -40,7 +40,7 @@
 public:
   nsNodeInfoManager();
 
-  NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(nsNodeInfoManager)
+  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_NATIVE_CLASS(nsNodeInfoManager)
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(nsNodeInfoManager)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsObjectLoadingContent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsObjectLoadingContent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsObjectLoadingContent.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsObjectLoadingContent.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -78,6 +78,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/PluginCrashedEvent.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/Telemetry.h"
@@ -326,55 +327,21 @@
     return NS_OK;
   }
 
-  ErrorResult rv;
-  nsRefPtr<Event> event =
-    doc->CreateEvent(NS_LITERAL_STRING("customevent"), rv);
-  nsCOMPtr<nsIDOMCustomEvent> customEvent(do_QueryObject(event));
-  if (!customEvent) {
-    NS_WARNING("Couldn't QI event for PluginCrashed event!");
-    return NS_OK;
-  }
+  PluginCrashedEventInit init;
+  init.mPluginDumpID = mPluginDumpID;
+  init.mBrowserDumpID = mBrowserDumpID;
+  init.mPluginName = mPluginName;
+  init.mPluginFilename = mPluginFilename;
+  init.mSubmittedCrashReport = mSubmittedCrashReport;
+  init.mBubbles = true;
+  init.mCancelable = true;
+
+  nsRefPtr<PluginCrashedEvent> event =
+    PluginCrashedEvent::Constructor(doc, NS_LITERAL_STRING("PluginCrashed"), init);
 
-  nsCOMPtr<nsIWritableVariant> variant;
-  variant = do_CreateInstance("@mozilla.org/variant;1");
-  if (!variant) {
-    NS_WARNING("Couldn't create detail variant for PluginCrashed event!");
-    return NS_OK;
-  }
-  customEvent->InitCustomEvent(NS_LITERAL_STRING("PluginCrashed"),
-                               true, true, variant);
   event->SetTrusted(true);
   event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true;
 
-  nsCOMPtr<nsIWritablePropertyBag2> propBag;
-  propBag = do_CreateInstance("@mozilla.org/hash-property-bag;1");
-  if (!propBag) {
-    NS_WARNING("Couldn't create a property bag for PluginCrashed event!");
-    return NS_OK;
-  }
-
-  // add a "pluginDumpID" property to this event
-  propBag->SetPropertyAsAString(NS_LITERAL_STRING("pluginDumpID"),
-                                mPluginDumpID);
-
-  // add a "browserDumpID" property to this event
-  propBag->SetPropertyAsAString(NS_LITERAL_STRING("browserDumpID"),
-                                mBrowserDumpID);
-
-  // add a "pluginName" property to this event
-  propBag->SetPropertyAsAString(NS_LITERAL_STRING("pluginName"),
-                                mPluginName);
-
-  // add a "pluginFilename" property to this event
-  propBag->SetPropertyAsAString(NS_LITERAL_STRING("pluginFilename"),
-                                mPluginFilename);
-
-  // add a "submittedCrashReport" property to this event
-  propBag->SetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"),
-                             mSubmittedCrashReport);
-
-  variant->SetAsISupports(propBag);
-
   EventDispatcher::DispatchDOMEvent(mContent, nullptr, event, nullptr, nullptr);
   return NS_OK;
 }
@@ -2510,7 +2477,8 @@
   // Referrer
   nsCOMPtr<nsIHttpChannel> httpChan(do_QueryInterface(chan));
   if (httpChan) {
-    httpChan->SetReferrer(doc->GetDocumentURI());
+    httpChan->SetReferrerWithPolicy(doc->GetDocumentURI(),
+                                    doc->GetReferrerPolicy());
 
     // Set the initiator type
     nsCOMPtr<nsITimedChannel> timedChannel(do_QueryInterface(httpChan));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsPIDOMWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsPIDOMWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsPIDOMWindow.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsPIDOMWindow.h	2014-11-26 21:45:55.000000000 +0000
@@ -38,6 +38,9 @@
 class AudioContext;
 class Element;
 }
+namespace gfx {
+class VRHMDInfo;
+}
 }
 
 // Popup control state enum. The values in this enum must go from most
@@ -60,8 +63,8 @@
 };
 
 #define NS_PIDOMWINDOW_IID \
-{ 0x71412748, 0x6368, 0x4332, \
-  { 0x82, 0x66, 0xff, 0xaa, 0x19, 0xda, 0x09, 0x7c } }
+{ 0x19fb3019, 0x7b5d, 0x4235, \
+  { 0xa9, 0x59, 0xa2, 0x31, 0xa2, 0xe7, 0x94, 0x79 } }
 
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
@@ -460,9 +463,13 @@
    * otherwise exits fullscreen. If aRequireTrust is true, this method only
    * changes window state in a context trusted for write.
    *
+   * If aHMD is not null, the window is made full screen on the given VR HMD
+   * device instead of its currrent display.
+   *
    * Outer windows only.
    */
-  virtual nsresult SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust) = 0;
+  virtual nsresult SetFullScreenInternal(bool aIsFullScreen, bool aRequireTrust,
+                                         mozilla::gfx::VRHMDInfo *aHMD = nullptr) = 0;
 
   /**
    * Call this to check whether some node (this window, its document,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsScriptLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsScriptLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsScriptLoader.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsScriptLoader.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -83,7 +83,8 @@
       mScriptTextLength(0),
       mJSVersion(aVersion),
       mLineNo(1),
-      mCORSMode(aCORSMode)
+      mCORSMode(aCORSMode),
+      mReferrerPolicy(mozilla::net::RP_Default)
   {
   }
 
@@ -116,6 +117,7 @@
   nsAutoCString mURL;   // Keep the URI's filename alive during off thread parsing.
   int32_t mLineNo;
   const CORSMode mCORSMode;
+  mozilla::net::ReferrerPolicy mReferrerPolicy;
 };
 
 // The nsScriptLoadRequest is passed as the context to necko, and thus
@@ -340,7 +342,8 @@
     httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
                                   NS_LITERAL_CSTRING("*/*"),
                                   false);
-    httpChannel->SetReferrer(mDocument->GetDocumentURI());
+    httpChannel->SetReferrerWithPolicy(mDocument->GetDocumentURI(),
+                                       aRequest->mReferrerPolicy);
   }
 
   nsCOMPtr<nsILoadContext> loadContext(do_QueryInterface(docshell));
@@ -594,6 +597,9 @@
                              &nsIScriptElement::FireErrorEvent));
       return false;
     }
+
+    // Double-check that the preload matches what we're asked to load now.
+    mozilla::net::ReferrerPolicy ourRefPolicy = mDocument->GetReferrerPolicy();
     CORSMode ourCORSMode = aElement->GetCORSMode();
     nsTArray<PreloadInfo>::index_type i =
       mPreloads.IndexOf(scriptURI.get(), 0, PreloadURIComparator());
@@ -610,7 +616,8 @@
       nsAutoString elementCharset;
       aElement->GetScriptCharset(elementCharset);
       if (elementCharset.Equals(preloadCharset) &&
-          ourCORSMode == request->mCORSMode) {
+          ourCORSMode == request->mCORSMode &&
+          ourRefPolicy == request->mReferrerPolicy) {
         rv = CheckContentPolicy(mDocument, aElement, request->mURI, type);
         NS_ENSURE_SUCCESS(rv, false);
       } else {
@@ -625,6 +632,7 @@
       request->mURI = scriptURI;
       request->mIsInline = false;
       request->mLoading = true;
+      request->mReferrerPolicy = ourRefPolicy;
 
       // set aScriptFromHead to false so we don't treat non preloaded scripts as
       // blockers for full page load. See bug 792438.
@@ -1040,6 +1048,9 @@
   aOptions->setFileAndLine(aRequest->mURL.get(), aRequest->mLineNo);
   aOptions->setVersion(JSVersion(aRequest->mJSVersion));
   aOptions->setCompileAndGo(JS_IsGlobalObject(aScopeChain));
+  // We only need the setNoScriptRval bit when compiling off-thread here, since
+  // otherwise nsJSUtils::EvaluateString will set it up for us.
+  aOptions->setNoScriptRval(true);
   if (aRequest->mHasSourceMapURL) {
     aOptions->setSourceMapURL(aRequest->mSourceMapURL.get());
   }
@@ -1556,7 +1567,8 @@
 nsScriptLoader::PreloadURI(nsIURI *aURI, const nsAString &aCharset,
                            const nsAString &aType,
                            const nsAString &aCrossOrigin,
-                           bool aScriptFromHead)
+                           bool aScriptFromHead,
+                           const mozilla::net::ReferrerPolicy aReferrerPolicy)
 {
   // Check to see if scripts has been turned off.
   if (!mEnabled || !mDocument->IsScriptEnabled()) {
@@ -1569,6 +1581,8 @@
   request->mURI = aURI;
   request->mIsInline = false;
   request->mLoading = true;
+  request->mReferrerPolicy = aReferrerPolicy;
+
   nsresult rv = StartLoad(request, aType, aScriptFromHead);
   if (NS_FAILED(rv)) {
     return;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsScriptLoader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsScriptLoader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsScriptLoader.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsScriptLoader.h	2014-11-26 21:45:55.000000000 +0000
@@ -17,6 +17,7 @@
 #include "nsAutoPtr.h"
 #include "nsIDocument.h"
 #include "nsIStreamLoader.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class nsScriptLoadRequest;
 class nsIURI;
@@ -240,7 +241,8 @@
   virtual void PreloadURI(nsIURI *aURI, const nsAString &aCharset,
                           const nsAString &aType,
                           const nsAString &aCrossOrigin,
-                          bool aScriptFromHead);
+                          bool aScriptFromHead,
+                          const mozilla::net::ReferrerPolicy aReferrerPolicy);
 
   /**
    * Process a request that was deferred so that the script could be compiled
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsStyleLinkElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsStyleLinkElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsStyleLinkElement.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsStyleLinkElement.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -426,7 +426,8 @@
     NS_ENSURE_TRUE(clonedURI, NS_ERROR_OUT_OF_MEMORY);
     rv = doc->CSSLoader()->
       LoadStyleLink(thisContent, clonedURI, title, media, isAlternate,
-                    GetCORSMode(), aObserver, &isAlternate);
+                    GetCORSMode(), doc->GetReferrerPolicy(),
+                    aObserver, &isAlternate);
     if (NS_FAILED(rv)) {
       // Don't propagate LoadStyleLink() errors further than this, since some
       // consumers (e.g. nsXMLContentSink) will completely abort on innocuous
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsSyncLoadService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsSyncLoadService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsSyncLoadService.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsSyncLoadService.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -26,6 +26,8 @@
 #include "nsCrossSiteListenerProxy.h"
 #include <algorithm>
 
+using mozilla::net::ReferrerPolicy;
+
 /**
  * This class manages loading a single XML document
  */
@@ -42,6 +44,7 @@
 
     nsresult LoadDocument(nsIChannel* aChannel, nsIPrincipal *aLoaderPrincipal,
                           bool aChannelIsSync, bool aForceToXML,
+                          ReferrerPolicy aReferrerPolicy,
                           nsIDOMDocument** aResult);
 
     NS_FORWARD_NSISTREAMLISTENER(mListener->)
@@ -130,6 +133,7 @@
                            nsIPrincipal *aLoaderPrincipal,
                            bool aChannelIsSync,
                            bool aForceToXML,
+                           ReferrerPolicy aReferrerPolicy,
                            nsIDOMDocument **aResult)
 {
     NS_ENSURE_ARG_POINTER(aResult);
@@ -144,11 +148,11 @@
     mChannel = aChannel;
     nsCOMPtr<nsIHttpChannel> http = do_QueryInterface(mChannel);
     if (http) {
-        http->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),     
+        http->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
                                NS_LITERAL_CSTRING("text/xml,application/xml,application/xhtml+xml,*/*;q=0.1"),
                                false);
         if (loaderUri) {
-            http->SetReferrer(loaderUri);
+            http->SetReferrerWithPolicy(loaderUri, aReferrerPolicy);
         }
     }
 
@@ -307,6 +311,7 @@
 nsresult
 nsSyncLoadService::LoadDocument(nsIURI *aURI, nsIPrincipal *aLoaderPrincipal,
                                 nsILoadGroup *aLoadGroup, bool aForceToXML,
+                                ReferrerPolicy aReferrerPolicy,
                                 nsIDOMDocument** aResult)
 {
     nsCOMPtr<nsIChannel> channel;
@@ -330,7 +335,7 @@
 
     nsRefPtr<nsSyncLoader> loader = new nsSyncLoader();
     return loader->LoadDocument(channel, aLoaderPrincipal, isSync,
-                                aForceToXML, aResult);
+                                aForceToXML, aReferrerPolicy, aResult);
 
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsSyncLoadService.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsSyncLoadService.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsSyncLoadService.h	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsSyncLoadService.h	2014-11-26 21:45:55.000000000 +0000
@@ -11,6 +11,7 @@
 #define nsSyncLoadService_h__
 
 #include "nscore.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class nsIInputStream;
 class nsILoadGroup;
@@ -33,10 +34,12 @@
      * @param aLoadGroup The loadgroup to use for loading the document.
      * @param aForceToXML Whether to parse the document as XML, regardless of
      *                    content type.
+     * @param referrerPolicy Referrer policy.
      * @param aResult [out] The document loaded from the URI.
      */
     static nsresult LoadDocument(nsIURI *aURI, nsIPrincipal *aLoaderPrincipal,
                                  nsILoadGroup *aLoadGroup, bool aForceToXML,
+                                 mozilla::net::ReferrerPolicy aReferrerPolicy,
                                  nsIDOMDocument** aResult);
 
     /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsTreeSanitizer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsTreeSanitizer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsTreeSanitizer.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsTreeSanitizer.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -1095,7 +1095,7 @@
   // -moz-binding is blacklisted.
   bool didSanitize = false;
   // Create a sheet to hold the parsed CSS
-  nsRefPtr<CSSStyleSheet> sheet = new CSSStyleSheet(CORS_NONE);
+  nsRefPtr<CSSStyleSheet> sheet = new CSSStyleSheet(CORS_NONE, aDocument->GetReferrerPolicy());
   sheet->SetURIs(aDocument->GetDocumentURI(), nullptr, aBaseURI);
   sheet->SetPrincipal(aDocument->NodePrincipal());
   // Create the CSS parser, and parse the CSS text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsXMLHttpRequest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsXMLHttpRequest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/nsXMLHttpRequest.cpp	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/nsXMLHttpRequest.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -2722,9 +2722,12 @@
 
       nsCOMPtr<nsIURI> docCurURI;
       nsCOMPtr<nsIURI> docOrigURI;
+      net::ReferrerPolicy referrerPolicy = net::RP_Default;
+
       if (doc) {
         docCurURI = doc->GetDocumentURI();
         docOrigURI = doc->GetOriginalURI();
+        referrerPolicy = doc->GetReferrerPolicy();
       }
 
       nsCOMPtr<nsIURI> referrerURI;
@@ -2740,7 +2743,7 @@
       if (!referrerURI)
         referrerURI = principalURI;
 
-      httpChannel->SetReferrer(referrerURI);
+      httpChannel->SetReferrerWithPolicy(referrerURI, referrerPolicy);
     }
 
     // Some extensions override the http protocol handler and provide their own
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/ScriptSettings.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/ScriptSettings.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/ScriptSettings.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/ScriptSettings.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -12,6 +12,7 @@
 #include "xpcprivate.h" // For AutoCxPusher guts
 #include "xpcpublic.h"
 #include "nsIGlobalObject.h"
+#include "nsIDocShell.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptContext.h"
 #include "nsContentUtils.h"
@@ -70,8 +71,26 @@
     ScriptSettingsStackEntry *entry = EntryPoint();
     return entry ? entry->mGlobalObject : nullptr;
   }
+
 };
 
+static unsigned long gRunToCompletionListeners = 0;
+
+void
+UseEntryScriptProfiling()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  ++gRunToCompletionListeners;
+}
+
+void
+UnuseEntryScriptProfiling()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(gRunToCompletionListeners > 0);
+  --gRunToCompletionListeners;
+}
+
 void
 InitScriptSettings()
 {
@@ -122,10 +141,44 @@
   ScriptSettingsStack::Pop(this);
 }
 
+// If the entry or incumbent global ends up being something that the subject
+// principal doesn't subsume, we don't want to use it. This never happens on
+// the web, but can happen with asymmetric privilege relationships (i.e.
+// nsExpandedPrincipal and System Principal).
+//
+// The most correct thing to use instead would be the topmost global on the
+// callstack whose principal is subsumed by the subject principal. But that's
+// hard to compute, so we just substitute the global of the current
+// compartment. In practice, this is fine.
+//
+// Note that in particular things like:
+//
+// |SpecialPowers.wrap(crossOriginWindow).eval(open())|
+//
+// trigger this case. Although both the entry global and the current global
+// have normal principals, the use of Gecko-specific System-Principaled JS
+// puts the code from two different origins on the callstack at once, which
+// doesn't happen normally on the web.
+static nsIGlobalObject*
+ClampToSubject(nsIGlobalObject* aGlobalOrNull)
+{
+  if (!aGlobalOrNull || !NS_IsMainThread()) {
+    return aGlobalOrNull;
+  }
+
+  nsIPrincipal* globalPrin = aGlobalOrNull->PrincipalOrNull();
+  NS_ENSURE_TRUE(globalPrin, GetCurrentGlobal());
+  if (!nsContentUtils::SubjectPrincipal()->SubsumesConsideringDomain(globalPrin)) {
+    return GetCurrentGlobal();
+  }
+
+  return aGlobalOrNull;
+}
+
 nsIGlobalObject*
 GetEntryGlobal()
 {
-  return ScriptSettingsStack::EntryGlobal();
+  return ClampToSubject(ScriptSettingsStack::EntryGlobal());
 }
 
 nsIDocument*
@@ -163,12 +216,12 @@
   // there's nothing on the JS stack, which will cause us to check the
   // incumbent script stack below.
   if (JSObject *global = JS::GetScriptedCallerGlobal(cx)) {
-    return xpc::NativeGlobal(global);
+    return ClampToSubject(xpc::NativeGlobal(global));
   }
 
   // Ok, nothing from the JS engine. Let's use whatever's on the
   // explicit stack.
-  return ScriptSettingsStack::IncumbentGlobal();
+  return ClampToSubject(ScriptSettingsStack::IncumbentGlobal());
 }
 
 nsIGlobalObject*
@@ -463,14 +516,38 @@
               aCx ? aCx : FindJSContext(aGlobalObject))
   , ScriptSettingsStackEntry(aGlobalObject, /* aCandidate = */ true)
   , mWebIDLCallerPrincipal(nullptr)
+  , mDocShellForJSRunToCompletion(nullptr)
+  , mIsMainThread(aIsMainThread)
 {
   MOZ_ASSERT(aGlobalObject);
   MOZ_ASSERT_IF(!aCx, aIsMainThread); // cx is mandatory off-main-thread.
   MOZ_ASSERT_IF(aCx && aIsMainThread, aCx == FindJSContext(aGlobalObject));
+  if (aIsMainThread) {
+    nsContentUtils::EnterMicroTask();
+  }
+
+  if (aIsMainThread && gRunToCompletionListeners > 0) {
+    nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobalObject);
+    if (window) {
+        mDocShellForJSRunToCompletion = window->GetDocShell();
+    }
+  }
+
+  if (mDocShellForJSRunToCompletion) {
+    mDocShellForJSRunToCompletion->NotifyJSRunToCompletionStart();
+  }
 }
 
 AutoEntryScript::~AutoEntryScript()
 {
+  if (mDocShellForJSRunToCompletion) {
+    mDocShellForJSRunToCompletion->NotifyJSRunToCompletionStop();
+  }
+
+  if (mIsMainThread) {
+    nsContentUtils::LeaveMicroTask();
+  }
+
   // GC when we pop a script entry point. This is a useful heuristic that helps
   // us out on certain (flawed) benchmarks like sunspider, because it lets us
   // avoid GCing during the timing loop.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/ScriptSettings.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/ScriptSettings.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/ScriptSettings.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/ScriptSettings.h	2014-11-26 21:45:55.000000000 +0000
@@ -21,6 +21,7 @@
 class nsGlobalWindow;
 class nsIScriptContext;
 class nsIDocument;
+class nsIDocShell;
 
 namespace mozilla {
 namespace dom {
@@ -63,6 +64,16 @@
 void InitScriptSettings();
 void DestroyScriptSettings();
 
+/*
+ * Static helpers in ScriptSettings which track the number of listeners
+ * of Javascript RunToCompletion events.  These should be used by the code in
+ * nsDocShell::SetRecordProfileTimelineMarkers to indicate to script
+ * settings that script run-to-completion needs to be monitored.
+ * SHOULD BE CALLED ONLY BY MAIN THREAD.
+ */
+void UseEntryScriptProfiling();
+void UnuseEntryScriptProfiling();
+
 // To implement a web-compatible browser, it is often necessary to obtain the
 // global object that is "associated" with the currently-running code. This
 // process is made more complicated by the fact that, historically, different
@@ -331,6 +342,10 @@
   // can't go away until then either.
   nsIPrincipal* mWebIDLCallerPrincipal;
   friend nsIPrincipal* GetWebIDLCallerPrincipal();
+
+  nsIDocShell* mDocShellForJSRunToCompletion;
+
+  bool mIsMainThread;
 };
 
 /*
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/SiteSpecificUserAgent.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/SiteSpecificUserAgent.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/SiteSpecificUserAgent.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/SiteSpecificUserAgent.js	2014-11-26 21:45:55.000000000 +0000
@@ -47,7 +47,7 @@
     }
 
     let data = { uri: aURI };
-    let result = cpmm.sendSyncMessage("Useragent:GetOverride", data)[0] || HTTP_PROTO_HANDLER.userAgent;
+    let result = cpmm.sendRpcMessage("Useragent:GetOverride", data)[0] || HTTP_PROTO_HANDLER.userAgent;
 
     if (this.userAgentCache.size >= MAX_CACHE_SIZE) {
       this.userAgentCache.clear();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/bug704320_counter.sjs thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/bug704320_counter.sjs
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/bug704320_counter.sjs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/bug704320_counter.sjs	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,94 @@
+// Handle counting loads for bug 704320.
+
+const SHARED_KEY="bug704320_counter";
+const DEFAULT_STATE = {'css': {'count': 0, 'referrers': []},
+                       'img': {'count': 0, 'referrers': []},
+                       'js':  {'count': 0, 'referrers': []}};
+const TYPE_MAP = {'css': 'text/css',
+                  'js':  'application/javascript',
+                  'img': 'image/png',
+                  'html': 'text/html'};
+
+// Writes an image to the response
+function WriteOutImage(response)
+{
+  var file = Components.classes["@mozilla.org/file/directory_service;1"]
+             .getService(Components.interfaces.nsIProperties)
+             .get("CurWorkD", Components.interfaces.nsIFile);
+
+  file.append("tests");
+  file.append("image");
+  file.append("test");
+  file.append("mochitest");
+  file.append('blue.png');
+
+  var fileStream = Components.classes['@mozilla.org/network/file-input-stream;1']
+                   .createInstance(Components.interfaces.nsIFileInputStream);
+  fileStream.init(file, 1, 0, false);
+  response.bodyOutputStream.writeFrom(fileStream, fileStream.available());
+}
+
+function handleRequest(request, response)
+{
+  var query = {};
+  request.queryString.split('&').forEach(function (val) {
+    var [name, value] = val.split('=');
+    query[name] = unescape(value);
+  });
+
+  var referrerLevel = "none";
+  if (request.hasHeader('Referer')) {
+    let referrer = request.getHeader('Referer');
+    if (referrer.indexOf("bug704320") > 0) {
+      referrerLevel = "full";
+    } else if (referrer == "http://mochi.test:8888") {
+      referrerLevel = "origin";
+    }
+  }
+
+  var state = getSharedState(SHARED_KEY);
+  if (state === '') {
+    state = DEFAULT_STATE;
+  } else {
+    state = JSON.parse(state);
+  }
+
+  response.setStatusLine(request.httpVersion, 200, "OK");
+
+
+  //avoid confusing cache behaviors
+  response.setHeader("Cache-Control", "no-cache", false);
+
+  if ("reset" in query) {
+    //reset server state
+    setSharedState(SHARED_KEY, JSON.stringify(DEFAULT_STATE));
+    //serve any CSS that we want to use.
+    response.write("");
+    return;
+  }
+
+  if ("results" in query) {
+    response.setHeader("Content-Type", "text/javascript", false);
+    response.write(JSON.stringify(state));
+    return;
+  }
+
+  if ('type' in query) {
+    state[query.type].count++;
+    response.setHeader("Content-Type", TYPE_MAP[query.type], false);
+    if (state[query.type].referrers.indexOf(referrerLevel) < 0) {
+      state[query.type].referrers.push(referrerLevel);
+    }
+
+    if (query.type == 'img') {
+      WriteOutImage(response);
+    }
+  }
+
+  if ('content' in query) {
+    response.write(unescape(query['content']));
+  }
+
+  setSharedState(SHARED_KEY, JSON.stringify(state));
+  return;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/bug704320.sjs thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/bug704320.sjs
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/bug704320.sjs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/bug704320.sjs	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,269 @@
+var BASE_URL = 'example.com/tests/dom/base/test/bug704320.sjs';
+
+function createTestUrl(schemeFrom, schemeTo, policy, action, type) {
+  return schemeTo + '://' + BASE_URL + '?' +
+         'action=' + action + '&' +
+         'scheme=' + schemeFrom + '-to-' + schemeTo + '&' +
+         'policy=' + policy + '&' +
+         'type=' + type;
+}
+
+function create2ndLevelIframeUrl(schemeFrom, schemeTo, policy, type) {
+  return schemeFrom + '://' + BASE_URL + '?' +
+         'action=create-2nd-level-iframe&' +
+         'scheme-from=' + schemeFrom + '&' +
+         'scheme-to=' + schemeTo + '&' +
+         'policy=' + policy + '&' +
+         'type=' + type;
+}
+
+// Creates the following test cases for the specified scheme and referrer
+// policy combination:
+//   <link>
+//   @import
+//   font-face
+//   bg-url
+//   <script>
+//   <img>
+//   <iframe>
+//   <audio>
+//   <video>
+//   <object type="bogus"> 
+//   <object type="image/svg+xml">
+//   <a>
+//   <a ping>
+//   <form>
+//   window.location
+//   window.open
+//   XMLHttpRequest
+//   EventSource
+//   TODO: XSLT?
+//
+// This returns a page that loads all of the above resources and contains a
+// script that clicks a link after all resources are (hopefully)
+// loaded. The click triggers a redirection to file_bug704320_redirect.html,
+// which in turn notifies the main window that it's time to check the test
+// results.
+function createTest(schemeFrom, schemeTo, policy) {
+  var _createTestUrl = createTestUrl.bind(
+      null, schemeFrom, schemeTo, policy, 'test');
+
+  var _create2ndLevelIframeUrl = create2ndLevelIframeUrl.bind(
+      null, schemeFrom, schemeTo, policy);
+
+  return '<!DOCTYPE HTML>\n\
+         <html>\n\
+         <head>\n\
+           <meta name="referrer" content="' + policy + '">\n\
+           <link rel="stylesheet" type="text/css" href="' + _createTestUrl('stylesheet') + '">\n\
+           <style type="text/css">\n\
+             @import "' + _createTestUrl('import-css') + '";\n\
+             @font-face {\n\
+               font-family: "Fake Serif Bold";\n\
+               src: url("' + _createTestUrl('font-face') + '");\n\
+             }\n\
+             body {\n\
+               font-family: "Fake Serif Bold", serif;\n\
+               background: url("' + _createTestUrl('bg-url') + '");\n\
+             }\n\
+           </style>\n\
+         </head>\n\
+         <body>\n\
+           <script src="' + _createTestUrl('script') + '"></script>\n\
+           <img src="' + _createTestUrl('img') + '"></img>\n\
+           <iframe src="' + _createTestUrl('iframe') + '"></iframe>\n\
+           <audio src="' + _createTestUrl('audio') + '"></audio>\n\
+           <video src="' + _createTestUrl('video') + '"></video>\n\
+           <object type="bogus" data="' + _createTestUrl('object') + '"></object>\n\
+           <object type="image/svg+xml" data="' + _createTestUrl('object-svg') + '"></object>\n\
+           <a id="link" href="' + _createTestUrl('link') + '" ping="' + _createTestUrl('link-ping') + '"></a>\n\
+           <iframe src="' + _create2ndLevelIframeUrl('form') + '"></iframe>\n\
+           <iframe src="' + _create2ndLevelIframeUrl('window.location') + '"></iframe>\n\
+           <script>\n\
+             (function() {\n\
+               var x = new XMLHttpRequest();\n\
+               x.open("GET", "' + _createTestUrl('xmlhttprequest') + '");\n\
+               x.send();\n\
+             })();\n\
+             (function() {\n\
+               var eventSource = new EventSource("' + _createTestUrl('eventsource') + '");\n\
+             })();' +
+
+             // LOAD EVENT (most of the tests)
+             // fires when the resources for the page are loaded
+             'var _isLoaded = false;\n\
+             window.addEventListener("load", function() {\n\
+               this._isLoaded = true;\n\
+               this.checkForFinish();\n\
+             }.bind(window), false);' +
+
+             // WINDOW.OPEN test
+             // listen for incoming status from window.open, close the window
+             // and check if we're done.
+             'var _openedWindowLoaded = false;\n\
+             window.addEventListener("message", function(message) {\n\
+               if (message.data == "window.open") {\n\
+                 this._openedWindowLoaded = true;\n\
+                 this.win.close();\n\
+                 this.checkForFinish();\n\
+               }\n\
+             }.bind(window), false);\n\
+             var win = window.open("' + _createTestUrl('window.open') + '", "");' +
+
+             // called by the two things that must complete: window.open page
+             // and the window load event.  When both are complete, this
+             // "finishes" the iframe subtest by clicking the link.
+             'function checkForFinish() {\n\
+               if (window._isLoaded && window._openedWindowLoaded) {\n\
+                 document.getElementById("link").click();\n\
+               }\n\
+             }\n\
+           </script>\n\
+         </body>\n\
+         </html>';
+}
+
+function createIframedFormTest(schemeFrom, schemeTo, policy) {
+  var actionUrl = schemeTo + '://' + BASE_URL;
+
+  return '<!DOCTYPE HTML>\n\
+         <html>\n\
+         <head>\n\
+           <meta name="referrer" content="' + policy + '">\n\
+         </head>\n\
+         <body>\n\
+           <form id="form" action="' + actionUrl + '">\n\
+             <input type="hidden" name="action" value="test">\n\
+             <input type="hidden" name="scheme" value="' + schemeFrom + '-to-' + schemeTo + '">\n\
+             <input type="hidden" name="policy" value="' + policy + '">\n\
+             <input type="hidden" name="type" value="form">\n\
+           </form>\n\
+           <script>\n\
+             document.getElementById("form").submit();\n\
+           </script>\n\
+         </body>\n\
+         </html>';
+}
+
+function createIframedWindowLocationTest(schemeFrom, schemeTo, policy) {
+  var url = createTestUrl(
+      schemeFrom, schemeTo, policy, 'test', 'window.location');
+
+  return '<!DOCTYPE HTML>\n\
+         <html>\n\
+         <head>\n\
+           <meta name="referrer" content="' + policy + '">\n\
+         </head>\n\
+         <body>\n\
+           <script>\n\
+            window.location = "' + url + '";\n\
+           </script>\n\
+         </body>\n\
+         </html>';
+}
+
+function createPolicyTest(refpol) {
+  return '<!DOCTYPE HTML>\n\
+          <html>\n\
+          <head>\n\
+            <meta name="referrer" content="' + refpol + '">\n\
+            <script type="text/javascript" src="/tests/dom/base/test/file_bug704320_preload_common.js"></script>\n\
+          </head>\n\
+          <body>\n\
+            <img src="/tests/dom/base/test/bug704320_counter.sjs?type=img"\n\
+                    onload="incrementLoad2(\'img\', 2);">\n\
+            <img src="http://example.com/tests/dom/base/test/bug704320_counter.sjs?type=img"\n\
+                    onload="incrementLoad2(\'img\', 2);">\n\
+          </body>\n\
+          </html>';
+}
+
+function handleRequest(request, response) {
+  var sharedKey = 'bug704320.sjs';
+  var params = request.queryString.split('&');
+  var action = params[0].split('=')[1];
+
+  if (action === 'create-1st-level-iframe') {
+    // ?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=origin
+    var schemeFrom = params[1].split('=')[1];
+    var schemeTo = params[2].split('=')[1];
+    var policy = params[3].split('=')[1];
+
+    response.setHeader('Content-Type', 'text/html; charset=utf-8', false);
+    response.setHeader('Cache-Control', 'no-cache', false);
+    response.write(createTest(schemeFrom, schemeTo, policy));
+  }
+  else if (action === 'create-2nd-level-iframe') {
+    // ?action=create-2nd-level-iframe&scheme-from=http&scheme-to=https&policy=origin&type=form"
+    var schemeFrom = params[1].split('=')[1];
+    var schemeTo = params[2].split('=')[1];
+    var policy = params[3].split('=')[1];
+    var type = params[4].split('=')[1];
+
+    response.setHeader('Content-Type', 'text/html; charset=utf-8', false);
+    response.setHeader('Cache-Control', 'no-cache', false);
+
+    if (type === 'form') {
+      response.write(createIframedFormTest(schemeFrom, schemeTo, policy));
+    } else if (type === 'window.location') {
+      response.write(createIframedWindowLocationTest(
+            schemeFrom, schemeTo, policy));
+    }
+  }
+  else if (action === 'test') {
+    // ?action=test&scheme=http-to-https&policy=origin&type=img
+    var scheme = params[1].split('=')[1];
+    var policy = params[2].split('=')[1];
+    var type = params[3].split('=')[1];
+    var result = getSharedState(sharedKey);
+
+    if (result === '') {
+      result = {};
+    } else {
+      result = JSON.parse(result);
+    }
+
+    if (!result[type]) {
+      result[type] = {};
+    }
+
+    if (!result[type][scheme]) {
+      result[type][scheme] = {};
+    }
+
+    if (request.hasHeader('Referer')) {
+      result[type][scheme][policy] = request.getHeader('Referer');
+    } else {
+      result[type][scheme][policy] = '';
+    }
+
+    setSharedState(sharedKey, JSON.stringify(result));
+
+    if (type === 'link') {
+      var loc = 'https://example.com/tests/dom/base/test/file_bug704320_redirect.html';
+      response.setStatusLine('1.1', 302, 'Found');
+      response.setHeader('Location', loc, false);
+    }
+
+    if (type === 'window.open') {
+      response.setHeader('Cache-Control', 'no-cache', false);
+      response.setHeader('Content-Type', 'text/html', false);
+      response.write('<html><body><script>'
+                   + 'window.opener.postMessage("window.open", "*");'
+                   + '</script></body></html>');
+    }
+  }
+  else if (action === 'get-test-results') {
+    // ?action=get-result
+    response.setHeader('Cache-Control', 'no-cache', false);
+    response.setHeader('Content-Type', 'text/plain', false);
+    response.write(getSharedState(sharedKey));
+  }
+  else if (action === 'generate-policy-test') {
+    // ?action=generate-policy-test&policy=b64-encoded-string
+    response.setHeader('Cache-Control', 'no-cache', false);
+    response.setHeader('Content-Type', 'text/html', false);
+    var refpol = unescape(params[1].split('=')[1]);
+    response.write(createPolicyTest(refpol));
+  }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/chrome.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/chrome.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/chrome.ini	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/chrome.ini	2014-11-26 21:45:55.000000000 +0000
@@ -33,6 +33,7 @@
 [test_bug549682.xul]
 [test_bug571390.xul]
 [test_bug574596.html]
+[test_bug1098074_throw_from_ReceiveMessage.xul]
 skip-if = buildapp == 'mulet'
 [test_bug599295.html]
 [test_bug616841.xul]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/cpows_child.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/cpows_child.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/cpows_child.js	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/cpows_child.js	2014-11-26 21:45:55.000000000 +0000
@@ -17,6 +17,7 @@
     }
     compartment_test();
     regexp_test();
+    postmessage_test();
     sync_test();
     async_test();
     rpc_test();
@@ -179,6 +180,11 @@
   sendSyncMessage("cpows:regexp_test", {}, { regexp: /myRegExp/g });
 }
 
+function postmessage_test()
+{
+  sendSyncMessage("cpows:postmessage_test", {}, { win: content.window });
+}
+
 function sync_test()
 {
   dump('beginning cpow sync test\n');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/cpows_parent.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/cpows_parent.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/cpows_parent.xul	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/cpows_parent.xul	2014-11-26 21:45:55.000000000 +0000
@@ -66,6 +66,7 @@
       ok(obj.a === 3, "constructor call");
       ok(document.title === "Hello, Kitty", "document node");
       is(typeof document.cookie, "string", "can get document.cookie");
+      is(typeof document.defaultView.navigator.userAgent, "string", "can get navigator.userAgent");
 
       data.i = 6;
       data.b = false;
@@ -269,6 +270,12 @@
       is(regexp.toString(), shell.toString(), ".compile works right");
     }
 
+    function recvPostMessageTest(message) {
+      let win = message.objects.win;
+      win.postMessage('nookery', '*');
+      ok(true, "Didn't crash invoking postMessage over CPOW");
+    }
+
     let savedWilldieObj;
     let wontDie = {f:2, __exposedProps__: {"f": "r"}};
     function recvLifetimeTest1(message) {
@@ -326,6 +333,7 @@
       }
       mm.addMessageListener("cpows:compartment_test", recvCompartmentTest);
       mm.addMessageListener("cpows:regexp_test", recvRegExpTest);
+      mm.addMessageListener("cpows:postmessage_test", recvPostMessageTest);
       mm.addMessageListener("cpows:lifetime_test_1", recvLifetimeTest1);
       mm.addMessageListener("cpows:lifetime_test_2", recvLifetimeTest2);
       mm.loadFrameScript("chrome://mochitests/content/chrome/dom/base/test/chrome/cpows_child.js", true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/test_bug1098074_throw_from_ReceiveMessage.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/test_bug1098074_throw_from_ReceiveMessage.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/chrome/test_bug1098074_throw_from_ReceiveMessage.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/chrome/test_bug1098074_throw_from_ReceiveMessage.xul	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,50 @@
+<?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=1098074
+-->
+<window title="Mozilla Bug 1098074"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    onload="start();">
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+  /** Test for Bug 1098074 **/
+  SimpleTest.waitForExplicitFinish();
+  SimpleTest.expectUncaughtException();
+
+  // Tell the test to expect exactly one console error with the given parameters,
+  // with SimpleTest.finish as a continuation function.
+  SimpleTest.monitorConsole(SimpleTest.finish, [{errorMessage: new RegExp('acopia')}]);
+
+  var Cc = Components.classes;
+  var Ci = Components.interfaces;
+  var globalMM = Cc["@mozilla.org/globalmessagemanager;1"]
+                   .getService(Ci.nsIMessageListenerManager);
+  globalMM.addMessageListener("flimfniffle", function onMessage(msg) {
+    globalMM.removeMessageListener("flimfniffle", onMessage);
+    is(msg.data, "teufeltor", "correct message");
+
+    // Cleanup the monitor after we throw.
+    SimpleTest.executeSoon(SimpleTest.endMonitorConsole);
+
+    throw "acopia";
+  });
+
+  function start() {
+    globalMM.loadFrameScript("data:,sendAsyncMessage('flimfniffle', 'teufeltor')", true);
+  }
+
+  ]]>
+  </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=1098074"
+     target="_blank">Mozilla Bug 1098074</a>
+  </body>
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/csp/file_form-action.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/csp/file_form-action.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/csp/file_form-action.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/csp/file_form-action.html	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 529697 - Test mapping of form submission to form-action</title>
+</head>
+<body>
+  <form action="submit-form">
+    <input id="submitButton" type="submit" value="Submit form">
+  </form>
+  <script type="text/javascript">
+  var submitButton = document.getElementById('submitButton');
+  submitButton.click();
+  </script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/csp/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/csp/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/csp/mochitest.ini	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/csp/mochitest.ini	2014-11-26 21:45:55.000000000 +0000
@@ -100,6 +100,7 @@
   file_multi_policy_injection_bypass.html^headers^
   file_multi_policy_injection_bypass_2.html
   file_multi_policy_injection_bypass_2.html^headers^
+  file_form-action.html
 
 [test_base-uri.html]
 [test_connect-src.html]
@@ -124,6 +125,8 @@
 [test_policyuri_regression_from_multipolicy.html]
 [test_nonce_source.html]
 [test_CSP_bug941404.html]
+[test_form-action.html]
+skip-if = e10s || buildapp == 'b2g' # http-on-opening-request observers are not available in child processes
 [test_hash_source.html]
 skip-if = e10s || buildapp == 'b2g' # can't compute hashes in child process (bug 958702)
 [test_self_none_as_hostname_confusion.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/csp/test_form-action.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/csp/test_form-action.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/csp/test_form-action.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/csp/test_form-action.html	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 529697 - Test mapping of form submission to form-action</title>
+  <!-- Including SimpleTest.js so we can use waitForExplicitFinish !-->
+  <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="visibility: hidden">
+    <iframe style="width:100%;" id="testframe"></iframe>
+  </div>
+
+<script class="testbody" type="text/javascript">
+
+/*
+ * Description of the test:
+ *   We load a page with a given CSP and verify that form submissions are correctly
+ *   evaluated through the "form-action" directive.
+ */
+
+SimpleTest.waitForExplicitFinish();
+
+var tests = [
+  {
+    page   : "file_form-action.html",
+    result : "allowed",
+    policy : "form-action 'self'"
+  },
+  {
+    page   : "file_form-action.html",
+    result : "blocked",
+    policy : "form-action 'none'"
+  }
+];
+
+// initializing to -1 so we start at index 0 when we start the test
+var counter = -1;
+
+function checkResult(aResult) {
+  is(aResult, tests[counter].result, "should be " + tests[counter].result + " in test " + counter + "!");
+  loadNextTest();
+}
+
+// We use the examiner to identify requests that hit the wire and requests
+// that are blocked by CSP and bubble up the result to the including iframe
+// document (parent).
+function examiner() {
+  SpecialPowers.addObserver(this, "csp-on-violate-policy", false);
+  SpecialPowers.addObserver(this, "specialpowers-http-notify-request", false);
+}
+examiner.prototype  = {
+  observe: function(subject, topic, data) {
+   if (topic === "specialpowers-http-notify-request") {
+      // making sure we do not bubble a result for something other
+      // then the request in question.
+      if (!data.contains("submit-form")) {
+        return;
+      }
+      checkResult("allowed");
+    }
+
+    if (topic === "csp-on-violate-policy") {
+      // making sure we do not bubble a result for something other
+      // then the request in question.
+      var asciiSpec = SpecialPowers.getPrivilegedProps(
+                        SpecialPowers.do_QueryInterface(subject, "nsIURI"),
+                        "asciiSpec");
+      if (!asciiSpec.contains("submit-form")) {
+        return;
+      }
+      checkResult("blocked");
+    }
+  },
+  remove: function() {
+    SpecialPowers.removeObserver(this, "csp-on-violate-policy");
+    SpecialPowers.removeObserver(this, "specialpowers-http-notify-request");
+  }
+}
+window.FormActionExaminer = new examiner();
+
+function loadNextTest() {
+  counter++;
+  if (counter == tests.length) {
+    window.FormActionExaminer.remove();
+    SimpleTest.finish();
+    return;
+  }
+
+  var src = "file_csp_testserver.sjs";
+  // append the file that should be served
+  src += "?file=" + escape("tests/dom/base/test/csp/" + tests[counter].page);
+  // append the CSP that should be used to serve the file
+  src += "&csp=" + escape(tests[counter].policy);
+
+  document.getElementById("testframe").src = src;
+}
+
+// start running the tests
+loadNextTest();
+
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_preload_common.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_preload_common.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_preload_common.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_preload_common.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,34 @@
+// Common code for the iframes used by bug704320_preload.
+
+var loadCount = 0;
+
+// Called by the various onload handlers to indicate that a resource has
+// been fully loaded.  We require three loads to complete (img, script,
+// link) for this test.
+function incrementLoad(tag) {
+  loadCount++;
+  if (loadCount == 3) {
+    window.parent.postMessage("childLoadComplete", window.location.origin);
+  } else if (loadCount > 3) {
+    document.write("<h1>Too Many Load Events!</h1>");
+    window.parent.postMessage("childOverload", window.location.origin);
+  }
+}
+
+// This is same as incrementLoad, but the caller passes in the loadCount.
+function incrementLoad2(tag, expectedLoadCount) {
+  loadCount++;
+  if (loadCount == expectedLoadCount) {
+    window.parent.postMessage("childLoadComplete", window.location.origin);
+  } else if (loadCount > expectedLoadCount) {
+    document.write("<h1>Too Many Load Events!</h1>");
+    window.parent.postMessage("childOverload", window.location.origin);
+  }
+}
+
+// in case something fails to load, cause the test to fail.
+function postfail(msg) {
+  window.parent.postMessage("fail-" + msg, window.location.origin);
+}
+
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_preload_noreuse.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_preload_noreuse.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_preload_noreuse.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_preload_noreuse.html	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+This is a spot check for whether the speculative parser reuses style, script or image loads after the referrer policy has changed.
+https://bugzilla.mozilla.org/show_bug.cgi?id=704320
+-->
+<head>
+  <meta charset="utf-8">
+  <script type="text/javascript" src="file_bug704320_preload_common.js"></script>
+
+  <script type="text/javascript">
+    // mess with parser speculation's choice of referrer policy
+    document.write("<meta name='referrer' content='origin'>");
+  </script>
+
+  <!-- preload happens with full referrer, but real load should happen with origin -->
+  <script src="/tests/dom/base/test/bug704320_counter.sjs?type=js"
+          onload="incrementLoad('script');"></script>
+
+  <!-- preload happens with full referrer, but real load should happen with origin -->
+  <link rel="stylesheet"
+        href="/tests/dom/base/test/bug704320_counter.sjs?type=css"
+        onload="incrementLoad('link');"/>
+
+</head>
+<body>
+
+  <!-- preload happens with full referrer, but real load should happen with origin -->
+<img src="/tests/dom/base/test/bug704320_counter.sjs?type=img"
+     onload="incrementLoad('img');"
+     onerror="postfail('image load caused an error in noreuse test');"/>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_preload_reuse.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_preload_reuse.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_preload_reuse.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_preload_reuse.html	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+This is a spot check for whether the speculative parser reuses style, script or image loads after the referrer policy has changed.
+https://bugzilla.mozilla.org/show_bug.cgi?id=704320
+-->
+<head>
+  <meta charset="utf-8">
+  <meta name="referrer" content="origin">
+  <script type="text/javascript" src="file_bug704320_preload_common.js"></script>
+  <script language="javascript" type="text/javascript">
+    // mess with parser speculation -- the loads here MAY be reused because the
+    // referrer policy did not change.
+    document.write("<meta name='referrer' content='origin'>");
+  </script>
+
+  <script src="http://example.com/tests/dom/base/test/bug704320_counter.sjs?type=js"
+          onload="incrementLoad('script');"></script>
+
+  <link rel="stylesheet"
+        href="http://example.com/tests/dom/base/test/bug704320_counter.sjs?type=css"
+        onload="incrementLoad('link');"/>
+
+</head>
+<body>
+
+<img src="http://example.com/tests/dom/base/test/bug704320_counter.sjs?type=img"
+     onload="incrementLoad('img');"
+     onerror="postfail('image load caused an error in reuse test');"/>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_redirect.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_redirect.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/file_bug704320_redirect.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/file_bug704320_redirect.html	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script>
+    parent.postMessage('', 'http://mochi.test:8888');
+  </script>
+</head>
+<body>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/mochitest.ini	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/mochitest.ini	2014-11-26 21:45:55.000000000 +0000
@@ -52,6 +52,8 @@
   bug696301-script-1.js
   bug696301-script-1.js^headers^
   bug696301-script-2.js
+  bug704320.sjs
+  bug704320_counter.sjs
   bug819051.sjs
   copypaste.js
   delayedServerEvents.sjs
@@ -138,6 +140,10 @@
   file_bug687859-http.js^headers^
   file_bug687859-inherit.js
   file_bug692434.xml
+  file_bug704320_preload_common.js
+  file_bug704320_preload_reuse.html
+  file_bug704320_preload_noreuse.html
+  file_bug704320_redirect.html
   file_bug707142_baseline.json
   file_bug707142_bom.json
   file_bug707142_utf-16.json
@@ -593,6 +599,10 @@
 [test_bug698381.html]
 [test_bug698384.html]
 [test_bug704063.html]
+[test_bug704320.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g (Needs multiple window.open support) android(times out, bug 1100609) e10s(randomly fails, bug 1100362)
+[test_bug704320_policyset.html]
+[test_bug704320_preload.html]
 [test_bug707142.html]
 [test_bug708620.html]
 [test_bug711047.html]
@@ -674,12 +684,19 @@
 [test_ipc_messagemanager_blob.html]
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 936226
 [test_meta_viewport0.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_meta_viewport1.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_meta_viewport2.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_meta_viewport3.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_meta_viewport4.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_meta_viewport5.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_meta_viewport6.html]
+skip-if = buildapp != 'b2g'     # meta-viewport tag support is only on b2g
 [test_mozfiledataurl.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
 [test_mozMatchesSelector.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug338583.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug338583.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug338583.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug338583.html	2014-11-26 21:45:55.000000000 +0000
@@ -353,13 +353,13 @@
 
   function fnMessageListenerTest3h(e) {
     fnMessageListenerTest3h.msg_ok = (fnMessageListenerTest3h.msg_ok && e.data == "ok");
-    fnMessageListenerTest3h.id_ok = (fnMessageListenerTest3h.msg_ok && e.lastEventId == "");
+    fnMessageListenerTest3h.id_ok = (fnMessageListenerTest3h.id_ok && e.lastEventId == "");
   }
 
   function doTest3_h(test_id) {
     gEventSourceObj3_h = new EventSource("badMessageEvent2.eventsource");
 
-    gEventSourceObj3_h.addEventListener('message event', fnMessageListenerTest3h, true);
+    gEventSourceObj3_h.addEventListener('message', fnMessageListenerTest3h, true);
     fnMessageListenerTest3h.msg_ok = true;
     fnMessageListenerTest3h.id_ok = true;
 
@@ -375,7 +375,7 @@
       }
       gEventSourceObj3_h.close();
       setTestHasFinished(test_id);
-    }, parseInt(3000*stress_factor));
+    }, parseInt(6000*stress_factor));
   }
 
 // in order to test (4)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug704320.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug704320.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug704320.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug704320.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,232 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=704320
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 704320</title>
+  <script type="application/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=704320">Mozilla Bug 704320</a>
+<p id="display"></p>
+<pre id="content">
+</pre>
+<pre id="test">
+</pre>
+
+<script type="application/javascript">
+
+
+var testIframeUrls = [
+  // HTTP to HTTP
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=no-referrer-when-downgrade',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=no-referrer',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=unsafe-url',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=origin',
+  // HTTP to HTTPS
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=no-referrer-when-downgrade',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=no-referrer',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=unsafe-url',
+  'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=origin',
+  // HTTPS to HTTP
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=no-referrer-when-downgrade',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=no-referrer',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=unsafe-url',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=origin',
+  // HTTPS to HTTPS
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=no-referrer-when-downgrade',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=no-referrer',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=unsafe-url',
+  'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=origin'
+];
+
+var expectedResults = {
+  // From docshell/base/nsDocShell.cpp:
+  //   "If the document containing the hyperlink being audited was not retrieved
+  //    over an encrypted connection and its address does not have the same
+  //    origin as "ping URL", send a referrer."
+  'link-ping': {
+    // Same-origin
+    'http-to-http': {
+      'no-referrer': '',
+      'unsafe-url': '',
+      'origin': '',
+      'no-referrer-when-downgrade': ''
+    },
+    'http-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=unsafe-url',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=no-referrer-when-downgrade'
+    },
+    // Encrypted and not same-origin
+    'https-to-http': {
+      'no-referrer': '',
+      'unsafe-url': '',
+      'origin': '',
+      'no-referrer-when-downgrade': ''
+    },
+    // Encrypted
+    'https-to-https': {
+      'no-referrer': '',
+      'unsafe-url': '',
+      'origin': '',
+      'no-referrer-when-downgrade': ''
+    }
+  },
+  // form is tested in a 2nd level iframe.
+  'form': {
+    'http-to-http': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=unsafe-url&type=form',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=no-referrer-when-downgrade&type=form'
+    },
+    'http-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=https&policy=unsafe-url&type=form',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=https&policy=no-referrer-when-downgrade&type=form'
+    },
+    'https-to-http': {
+      'no-referrer': '',
+      'unsafe-url': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=http&policy=unsafe-url&type=form',
+      'origin': 'https://example.com',
+      'no-referrer-when-downgrade': ''
+    },
+    'https-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=unsafe-url&type=form',
+      'origin': 'https://example.com',
+      'no-referrer-when-downgrade': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=no-referrer-when-downgrade&type=form'
+    }
+  },
+  // window.location is tested in a 2nd level iframe.
+  'window.location': {
+    'http-to-http': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=unsafe-url&type=window.location',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=http&policy=no-referrer-when-downgrade&type=window.location'
+    },
+    'http-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=https&policy=unsafe-url&type=window.location',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=http&scheme-to=https&policy=no-referrer-when-downgrade&type=window.location'
+    },
+    'https-to-http': {
+      'no-referrer': '',
+      'unsafe-url': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=http&policy=unsafe-url&type=window.location',
+      'origin': 'https://example.com',
+      'no-referrer-when-downgrade': ''
+    },
+    'https-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=unsafe-url&type=window.location',
+      'origin': 'https://example.com',
+      'no-referrer-when-downgrade': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-2nd-level-iframe&scheme-from=https&scheme-to=https&policy=no-referrer-when-downgrade&type=window.location'
+    }
+  },
+  'default': {
+    'http-to-http': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=unsafe-url',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=http&policy=no-referrer-when-downgrade'
+    },
+    'http-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=unsafe-url',
+      'origin': 'http://example.com',
+      'no-referrer-when-downgrade': 'http://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=http&scheme-to=https&policy=no-referrer-when-downgrade'
+    },
+    'https-to-http': {
+      'no-referrer': '',
+      'unsafe-url': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=http&policy=unsafe-url',
+      'origin': 'https://example.com',
+      'no-referrer-when-downgrade': ''
+    },
+    'https-to-https': {
+      'no-referrer': '',
+      'unsafe-url': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=unsafe-url',
+      'origin': 'https://example.com',
+      'no-referrer-when-downgrade': 'https://example.com/tests/dom/base/test/bug704320.sjs?action=create-1st-level-iframe&scheme-from=https&scheme-to=https&policy=no-referrer-when-downgrade'
+    }
+  }
+};
+
+function runit() {
+  var url = 'bug704320.sjs?action=get-test-results';
+  var xhr = new XMLHttpRequest();
+
+  xhr.open('GET', url);
+  xhr.onreadystatechange = function() {
+    //dump("\n\n >>>>>>>>>>> XHR ReadyState change \n" + url + "\n\n\n\n");
+    if (this.readyState == 4) {
+      document.getElementById('content').textContent +=
+          JSON.stringify(JSON.parse(this.response), null, 4);
+
+      //dump("\n\n >>>>>>>>>>> GOT RESPONSE: \n" + this.response + "\n\n\n\n");
+      var response = JSON.parse(this.response);
+
+      for (type in response) {
+        for (scheme in response[type]) {
+          for (policy in response[type][scheme]) {
+            var expectedResult = expectedResults[type] === undefined ?
+              expectedResults['default'][scheme][policy] :
+              expectedResults[type][scheme][policy];
+
+            is(response[type][scheme][policy], expectedResult,
+               type + ' ' + scheme + ' ' + policy);
+          }
+        }
+      }
+
+      SimpleTest.finish();
+    }
+  };
+  xhr.send();
+}
+
+// BEGIN
+// Currently triggers assertions on e10s due to bug 820466.  If you try to run
+// this on e10s, you'll get some ssl-related assertions and should add this line:
+// SimpleTest.expectAssertions(0,15);
+// But this test is disabled on e10s for unexpected failures.  See bug 1100362.
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({
+    'set': [['security.mixed_content.block_active_content',   false],
+            ['security.mixed_content.block_display_content',  false],
+            ['browser.send_pings',                            true],
+            ['browser.send_pings.max_per_link',               1],
+            ['browser.send_pings.require_same_host',          false]]
+    },
+    function() {
+      var testContainer = document.getElementById('test');
+
+      testIframeUrls.forEach(function(url) {
+        var iframe = document.createElement('iframe');
+        iframe.setAttribute('class', 'test');
+        iframe.src = url;
+        testContainer.appendChild(iframe);
+      });
+
+      var numFrames = testIframeUrls.length;
+      var numFramesReady = 0;
+
+      window.addEventListener('message', function(event) {
+        ++numFramesReady;
+        if (numFramesReady >= numFrames) {
+          runit();
+        }
+      }, false);
+    });
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug704320_policyset.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug704320_policyset.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug704320_policyset.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug704320_policyset.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+This checks if the right policies are applied from a given string (including whitespace, invalid policy strings, etc).  It doesn't do a complete check for all load types; that's done in another test.
+https://bugzilla.mozilla.org/show_bug.cgi?id=704320
+-->
+
+<head>
+  <meta charset="utf-8">
+  <title>Test policies for Bug 704320</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;version=1.7">
+
+SimpleTest.waitForExplicitFinish();
+var advance = function() { tests.next(); };
+
+/**
+ * Listen for notifications from the child.
+ * These are sent in case of error, or when the loads we await have completed.
+ */
+window.addEventListener("message", function(event) {
+    if (event.data == "childLoadComplete") {
+      // all loads happen, continue the test.
+      advance();
+    } else if (event.data == "childOverload") {
+      // too many loads happened in a test frame, abort.
+      ok(false, "Too many load handlers called in test.");
+      SimpleTest.finish();
+    } else if (event.data.indexOf("fail-") == 0) {
+      // something else failed in the test frame, abort.
+      ok(false, "Child failed the test with error " + event.data.substr(5));
+      SimpleTest.finish();
+    }});
+
+/**
+ * This is the main test routine -- serialized by use of a generator.
+ * It resets the counter, then performs two tests in sequence using
+ * the same iframe.
+ */
+var tests = (function() {
+  var iframe = document.getElementById("testframe");
+  const sjs = "/tests/dom/base/test/bug704320.sjs?action=generate-policy-test";
+
+
+  // basic calibration check
+  // reset the counter
+  yield resetCounter();
+
+  // load the first test frame
+  // it will call back into this function via postMessage when it finishes loading.
+  // and continue beyond the yield.
+  yield iframe.src = sjs + "&policy=" + escape('default');
+
+  // check the first test (two images, no referrers)
+  yield checkResults("default", ["full"]);
+
+  // check invalid policy
+  // According to the spec section 6.4, if there is a policy token
+  // and it is not one of the expected tokens, "No Referrer"
+  // should be the policy used.
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape('invalid-policy');
+  yield checkResults("invalid", ["none"]);
+
+  // whitespace checks.
+  // according to the spec section 4.1, the content attribute's value
+  // is fed to the token policy algorithm after stripping leading and
+  // trailing whitespace.
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape('default   ');
+  yield checkResults("trailing whitespace", ["full"]);
+
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape(' origin\f');
+  yield checkResults("trailing form feed", ["origin"]);
+
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape('\f origin');
+  yield checkResults("leading form feed", ["origin"]);
+
+  // origin when cross-origin (trimming whitespace)
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape(' origin-when-crossorigin');
+  yield checkResults("origin-when-crossorigin", ["origin", "full"]);
+
+  // according to the spec section 4.1:
+  // "If the meta element lacks a content attribute, or if that attribute’s
+  //  value is the empty string, then abort these steps."
+  // This means empty or missing content attribute means to ignore the meta
+  // tag and use default policy.
+  // Whitespace here is space, tab, LF, FF and CR.
+  // http://www.w3.org/html/wg/drafts/html/CR/infrastructure.html#space-character
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape(' \t  ');
+  yield checkResults("basic whitespace only policy", ["full"]);
+
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape(' \f\r\n\t  ');
+  yield checkResults("whitespace only policy", ["full"]);
+
+  // and double-check that no-referrer works.
+  yield resetCounter();
+  yield iframe.src = sjs + "&policy=" + escape('no-referrer');
+  yield checkResults("no-referrer", ["none"]);
+
+  // complete.  Be sure to yield so we don't call this twice.
+  yield SimpleTest.finish();
+})();
+
+// Helper functions below.
+
+
+/**
+ * helper to perform an XHR.
+ * Used by resetCounter() and checkResults().
+ */
+function doXHR(url, onSuccess, onFail) {
+  var xhr = new XMLHttpRequest();
+  xhr.onload = function () {
+    if (xhr.status == 200) {
+      onSuccess(xhr);
+    } else {
+      onFail(xhr);
+    }
+  };
+  xhr.open('GET', url, true);
+  xhr.send(null);
+}
+
+/**
+ * This triggers state-resetting on the counter server.
+ */
+function resetCounter() {
+  doXHR('/tests/dom/base/test/bug704320_counter.sjs?reset',
+        advance,
+        function(xhr) {
+          ok(false, "Need to be able to reset the request counter");
+          SimpleTest.finish();
+        });
+}
+
+/**
+ * Grabs the results via XHR and passes to checker.
+ */
+function checkResults(testname, expected) {
+  doXHR('/tests/dom/base/test/bug704320_counter.sjs?results',
+        function(xhr) {
+          var results = JSON.parse(xhr.responseText);
+          info(xhr.responseText);
+
+          ok('img' in results,
+              testname + " test: some image loads required in results object.");
+          is(results['img'].count, 2,
+            testname + " Test: Expected 2 loads for image requests.");
+
+          expected.forEach(function (ref) {
+            ok(results['img'].referrers.indexOf(ref) >= 0,
+                testname + " Test: Expected " + ref + " referrer policy in test, results were " + 
+                JSON.stringify(results['img'].referrers) +".");
+            });
+          advance();
+        },
+        function(xhr) {
+          ok(false, "Can't get results from the counter server.");
+          SimpleTest.finish();
+        });
+}
+
+</script>
+</head>
+
+<body onload="tests.next();">
+  <iframe id="testframe"></iframe>
+
+</body>
+</html>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug704320_preload.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug704320_preload.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_bug704320_preload.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_bug704320_preload.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,189 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+This is a spot check for whether the speculative parser reuses style, script or image loads after the referrer policy has changed.
+https://bugzilla.mozilla.org/show_bug.cgi?id=704320
+-->
+
+<head>
+  <meta charset="utf-8">
+  <title>Test preloads for Bug 704320</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;version=1.7">
+
+SimpleTest.waitForExplicitFinish();
+var advance = function() { tests.next(); };
+
+/**
+ * Listen for notifications from the child.
+ * These are sent in case of error, or when the loads we await have completed.
+ */
+window.addEventListener("message", function(event) {
+    if (event.data == "childLoadComplete") {
+      // all three loads happen, continue the test.
+      advance();
+    } else if (event.data == "childOverload") {
+      // too many loads happened in a test frame, abort.
+      ok(false, "Too many load handlers called in test.");
+      SimpleTest.finish();
+    } else if (event.data.indexOf("fail-") == 0) {
+      // something else failed in the test frame, abort.
+      ok(false, "Child failed the test with error " + event.data.substr(5));
+      SimpleTest.finish();
+    }});
+
+/**
+ * This is the main test routine -- serialized by use of a generator.
+ * It resets the counter, then performs two tests in sequence using
+ * the same iframe.
+ */
+var tests = (function() {
+  var iframe = document.getElementById("testframe");
+
+  // reset the counter
+  yield resetCounter();
+
+  // load the first test frame
+  // it will call back into this function via postMessage when it finishes loading.
+  // and continue beyond the yield.
+  yield iframe.src = 'file_bug704320_preload_noreuse.html';
+
+  // check the first test
+  yield checkResults(finalizePreloadNoreuse);
+
+  // reset the counter
+  yield resetCounter();
+
+  // load the second test frame
+  // it will call back into this function via postMessage when it finishes loading.
+  // and continue beyond the yield.
+  yield iframe.src = 'file_bug704320_preload_reuse.html';
+
+  // check the second test
+  yield checkResults(finalizePreloadReuse);
+
+  // complete.  Be sure to yield so we don't call this twice.
+  yield SimpleTest.finish();
+})();
+
+// Helper functions below.
+
+/**
+ * This checks the first test: a test where the preloads should not
+ * be reused.  * we expect two requests for each image, script, js request
+ * since the referrer policy changed after speculative loads were started.
+ * Problem is that the "origin"/revised loads won't necessarily happen,
+ * so we test for one or two loads (both are OK) and make the 'origin'
+ * referrer optional.
+ */
+function finalizePreloadNoreuse(results) {
+  console.log("<br/><pre>" + JSON.stringify(results) + "</pre>");
+  var expected = {'css': {'count': 2, 'referrers': ['full', 'origin']},
+                  'img': {'count': 2, 'referrers': ['full', 'origin']},
+                  'js':  {'count': 2, 'referrers': ['full', 'origin']}};
+
+  for (var x in expected) {
+    ok(x in results, "some " + x + " loads required in results object.");
+
+    ok(results[x].count == 1 || results[x].count == 2,
+       "Expected 1-2  loads for " + x + " requests.");
+
+    // the 'full' preload is optional, but required if count > 1
+    if (results[x].count > 1) {
+      ok(results[x].referrers.indexOf('full') >= 0,
+         "More than one load for " + x + ", so expected an 'full' referrer preload.")
+    }
+
+    // 'origin' (final load) is required
+    ok(results[x].referrers.indexOf('origin') >= 0,
+       "One load for " + x + " should have had 'origin' referrer.");
+
+    // no other values should be in the referrers.
+    is(results[x].referrers.indexOf('none'), -1,
+       "No loads for " + x + " should have a missing referrer.");
+  }
+
+  advance();
+}
+
+/**
+ * This checks the second test: a test where preloads SHOULD be reused.
+ * We expect one request for each image, script, js request since
+ * the referrer policy does not change after speculative loads.
+ */
+function finalizePreloadReuse(results) {
+  var expected = {'css': {'count': 1, 'referrers': ['origin']},
+                  'img': {'count': 1, 'referrers': ['origin']},
+                  'js':  {'count': 1, 'referrers': ['origin']}};
+
+  for (var x in expected) {
+    ok(x in results, "some " + x + " loads required in results object.");
+
+    is(results[x].count, expected[x].count,
+       "Expected " + expected[x].count + " loads for " + x + " requests.");
+
+    // 'origin' is required
+    ok(results[x].referrers.indexOf('origin') >= 0,
+       "One load for " + x + " should have had 'origin' referrer.");
+
+    // no other values should be in the referrers.
+    is(results[x].referrers.indexOf('none'), -1,
+       "No loads for " + x + " should have a missing referrer.");
+    is(results[x].referrers.indexOf('full'), -1,
+       "No loads for " + x + " should have an 'full' referrer.")
+  }
+
+  advance();
+}
+
+/**
+ * helper to perform an XHR.
+ * Used by resetCounter() and checkResults().
+ */
+function doXHR(url, onSuccess, onFail) {
+  var xhr = new XMLHttpRequest();
+  xhr.onload = function () {
+    if (xhr.status == 200) {
+      onSuccess(xhr);
+    } else {
+      onFail(xhr);
+    }
+  };
+  xhr.open('GET', url, true);
+  xhr.send(null);
+}
+
+/**
+ * This triggers state-resetting on the counter server.
+ */
+function resetCounter() {
+  doXHR('/tests/dom/base/test/bug704320_counter.sjs?reset',
+        advance,
+        function(xhr) {
+          ok(false, "Need to be able to reset the request counter");
+        });
+}
+
+/**
+ * Grabs the results via XHR and passes to checker.
+ */
+function checkResults(checker) {
+  doXHR('/tests/dom/base/test/bug704320_counter.sjs?results',
+        function(xhr) {
+          checker(JSON.parse(xhr.responseText));
+        },
+        function(xhr) {
+          ok(false, "Can't get results from the counter server.");
+        });
+}
+
+</script>
+</head>
+
+<body onload="tests.next();">
+  <iframe id="testframe"></iframe>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_url.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_url.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/test/test_url.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/test/test_url.html	2014-11-26 21:45:56.000000000 +0000
@@ -327,5 +327,14 @@
     var u = new URL(url);
     ok(u.origin, 'http://mochi.test:8888', "The URL generated from a blob URI has an origin");
   </script>
+
+  <script>
+    var blob = new Blob(['a']);
+    var url = URL.createObjectURL(blob);
+
+    var a = document.createElement('A');
+    a.href = url;
+    ok(a.origin, 'http://mochi.test:8888', "The 'a' element has the correct origin");
+  </script>
 </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/URL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/URL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/URL.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/URL.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -239,17 +239,6 @@
 void
 URL::GetOrigin(nsString& aOrigin, ErrorResult& aRv) const
 {
-  nsCOMPtr<nsIURIWithPrincipal> uriWithPrincipal = do_QueryInterface(mURI);
-  if (uriWithPrincipal) {
-    nsCOMPtr<nsIPrincipal> principal;
-    uriWithPrincipal->GetPrincipal(getter_AddRefs(principal));
-
-    if (principal) {
-      nsContentUtils::GetUTFOrigin(principal, aOrigin);
-      return;
-    }
-  }
-
   nsContentUtils::GetUTFOrigin(mURI, aOrigin);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/WebSocket.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/WebSocket.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/base/WebSocket.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/base/WebSocket.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -1470,7 +1470,9 @@
   mOriginDocument = nullptr;
 
   nsCOMPtr<nsILoadInfo> loadInfo =
-    new LoadInfo(mPrincipal,
+    new LoadInfo(doc ?
+                   doc->NodePrincipal() : mPrincipal.get(),
+                 mPrincipal,
                  doc,
                  nsILoadInfo::SEC_NORMAL,
                  nsIContentPolicy::TYPE_WEBSOCKET);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/Bindings.conf thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/Bindings.conf
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/Bindings.conf	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/Bindings.conf	2014-11-26 21:45:56.000000000 +0000
@@ -1272,6 +1272,14 @@
     'wrapperCache': False,
 }],
 
+'VRFieldOfViewReadOnly': {
+    'concrete': False
+},
+
+'VRDevice': {
+    'concrete': False
+},
+
 'VTTCue': {
     'nativeType': 'mozilla::dom::TextTrackCue'
 },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/BindingUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/BindingUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/BindingUtils.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/BindingUtils.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -459,7 +459,7 @@
     }
 
     if (!JS_DefineProperty(cx, constructor, "length", ctorNargs,
-                           JSPROP_READONLY | JSPROP_PERMANENT)) {
+                           JSPROP_READONLY)) {
       return nullptr;
     }
 
@@ -1698,9 +1698,10 @@
 {
   js::AssertSameCompartment(aCx, aObjArg);
 
-  // Check if we're near the stack limit before we get anywhere near the
-  // transplanting code. We use a conservative check since we'll use a little
-  // more space before we actually hit the critical "can't fail" path.
+  // Check if we're anywhere near the stack limit before we reach the
+  // transplanting code, since it has no good way to handle errors. This uses
+  // the untrusted script limit, which is not strictly necessary since no
+  // actual script should run.
   JS_CHECK_RECURSION_CONSERVATIVE(aCx, return NS_ERROR_FAILURE);
 
   JS::Rooted<JSObject*> aObj(aCx, aObjArg);
@@ -2088,7 +2089,9 @@
     nsresult rv;
     nsCOMPtr<nsISupports> implISupports = do_CreateInstance(aContractId, &rv);
     if (!implISupports) {
-      NS_WARNING("Failed to get JS implementation for contract");
+      nsPrintfCString msg("Failed to get JS implementation for contract \"%s\"",
+                          aContractId);
+      NS_WARNING(msg.get());
       aRv.Throw(rv);
       return;
     }
@@ -2141,7 +2144,7 @@
 
 
 template<typename T> static void
-NormalizeScalarValueStringInternal(JSContext* aCx, T& aString)
+NormalizeUSVStringInternal(JSContext* aCx, T& aString)
 {
   char16_t* start = aString.BeginWriting();
   // Must use const here because we can't pass char** to UTF16CharEnumerator as
@@ -2158,15 +2161,15 @@
 }
 
 void
-NormalizeScalarValueString(JSContext* aCx, nsAString& aString)
+NormalizeUSVString(JSContext* aCx, nsAString& aString)
 {
-  NormalizeScalarValueStringInternal(aCx, aString);
+  NormalizeUSVStringInternal(aCx, aString);
 }
 
 void
-NormalizeScalarValueString(JSContext* aCx, binding_detail::FakeString& aString)
+NormalizeUSVString(JSContext* aCx, binding_detail::FakeString& aString)
 {
-  NormalizeScalarValueStringInternal(aCx, aString);
+  NormalizeUSVStringInternal(aCx, aString);
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/BindingUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/BindingUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/BindingUtils.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/BindingUtils.h	2014-11-26 21:45:56.000000000 +0000
@@ -1923,10 +1923,10 @@
 }
 
 void
-NormalizeScalarValueString(JSContext* aCx, nsAString& aString);
+NormalizeUSVString(JSContext* aCx, nsAString& aString);
 
 void
-NormalizeScalarValueString(JSContext* aCx, binding_detail::FakeString& aString);
+NormalizeUSVString(JSContext* aCx, binding_detail::FakeString& aString);
 
 template<typename T>
 inline bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/CallbackObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/CallbackObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/CallbackObject.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/CallbackObject.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -57,10 +57,6 @@
   , mExceptionHandling(aExceptionHandling)
   , mIsMainThread(NS_IsMainThread())
 {
-  if (mIsMainThread) {
-    nsContentUtils::EnterMicroTask();
-  }
-
   // Compute the caller's subject principal (if necessary) early, before we
   // do anything that might perturb the relevant state.
   nsIPrincipal* webIDLCallerPrincipal = nullptr;
@@ -274,12 +270,6 @@
 
   mAutoIncumbentScript.reset();
   mAutoEntryScript.reset();
-
-  // It is important that this is the last thing we do, after leaving the
-  // compartment and undoing all our entry/incumbent script changes
-  if (mIsMainThread) {
-    nsContentUtils::LeaveMicroTask();
-  }
 }
 
 already_AddRefed<nsISupports>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/Codegen.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/Codegen.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/Codegen.py	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/Codegen.py	2014-11-26 21:45:56.000000000 +0000
@@ -3012,26 +3012,26 @@
         if not iface.isExposedInWindow():
             exposedInWindowCheck = dedent(
                 """
-                if (NS_IsMainThread()) {
-                  return false;
-                }
+                MOZ_ASSERT(!NS_IsMainThread(), "Why did we even get called?");
                 """)
             body.append(CGGeneric(exposedInWindowCheck))
 
-        if iface.isExposedInAnyWorker() and iface.isExposedOnlyInSomeWorkers():
+        if iface.isExposedInSomeButNotAllWorkers():
             workerGlobals = sorted(iface.getWorkerExposureSet())
             workerCondition = CGList((CGGeneric('strcmp(name, "%s")' % workerGlobal)
                                       for workerGlobal in workerGlobals), " && ")
             exposedInWorkerCheck = fill(
                 """
-                if (!NS_IsMainThread()) {
-                  const char* name = js::GetObjectClass(aObj)->name;
-                  if (${workerCondition}) {
-                    return false;
-                  }
+                const char* name = js::GetObjectClass(aObj)->name;
+                if (${workerCondition}) {
+                  return false;
                 }
                 """, workerCondition=workerCondition.define())
-            body.append(CGGeneric(exposedInWorkerCheck))
+            exposedInWorkerCheck = CGGeneric(exposedInWorkerCheck)
+            if iface.isExposedInWindow():
+                exposedInWorkerCheck = CGIfWrapper(exposedInWorkerCheck,
+                                                   "!NS_IsMainThread()")
+            body.append(exposedInWorkerCheck)
 
         pref = iface.getExtendedAttribute("Pref")
         if pref:
@@ -3474,7 +3474,6 @@
                 JSAutoCompartment ac(aCx, obj);
                 if (!get_${name}(aCx, obj, aObject, args)) {
                   js::SetReservedSlot(obj, ${slotIndex}, oldValue);
-                  nsJSUtils::ReportPendingException(aCx);
                   return false;
                 }
                 return true;
@@ -4838,7 +4837,7 @@
                                         declArgs=declArgs,
                                         holderArgs=holderArgs)
 
-    if type.isDOMString() or type.isScalarValueString():
+    if type.isDOMString() or type.isUSVString():
         assert not isEnforceRange and not isClamp
 
         treatAs = {
@@ -4857,8 +4856,8 @@
 
         def getConversionCode(varName):
             normalizeCode = ""
-            if type.isScalarValueString():
-                normalizeCode = "NormalizeScalarValueString(cx, %s);\n" % varName
+            if type.isUSVString():
+                normalizeCode = "NormalizeUSVString(cx, %s);\n" % varName
 
             conversionCode = (
                 "if (!ConvertJSValueToString(cx, ${val}, %s, %s, %s)) {\n"
@@ -5798,7 +5797,7 @@
         wrappingCode += wrapAndSetPtr(wrap, failed)
         return (wrappingCode, False)
 
-    if type.isDOMString() or type.isScalarValueString():
+    if type.isDOMString() or type.isUSVString():
         if type.nullable():
             return (wrapAndSetPtr("xpc::StringToJsval(cx, %s, ${jsvalHandle})" % result), False)
         else:
@@ -6078,7 +6077,7 @@
         if returnType.nullable():
             result = CGTemplatedType("Nullable", result)
         return result, None, None, None, None
-    if returnType.isDOMString() or returnType.isScalarValueString():
+    if returnType.isDOMString() or returnType.isUSVString():
         if isMember:
             return CGGeneric("nsString"), "ref", None, None, None
         return CGGeneric("DOMString"), "ref", None, None, None
@@ -8489,7 +8488,7 @@
         typeName = CGGeneric(type.name)
         return CGWrapper(typeName, post=" const &")
 
-    if type.isDOMString() or type.isScalarValueString():
+    if type.isDOMString() or type.isUSVString():
         return CGGeneric("const nsAString&")
 
     if type.isByteString():
@@ -11883,6 +11882,7 @@
     def definition_body(self):
         descriptors = self.config.getDescriptors(hasInterfaceObject=True,
                                                  isExposedInSystemGlobals=True,
+                                                 workers=False,
                                                  register=True,
                                                  skipGen=False)
 
@@ -11958,6 +11958,7 @@
         for desc in self.config.getDescriptors(hasInterfaceObject=True,
                                                isExternal=False,
                                                workers=False,
+                                               isExposedInWindow=True,
                                                register=True):
             lines.append("REGISTER_PROTO(%s, %s);\n" % (desc.name, getCheck(desc)))
             lines.extend("REGISTER_CONSTRUCTOR(%s, %s, %s);\n" % (n.identifier.name, desc.name, getCheck(desc))
@@ -12226,10 +12227,6 @@
                                                    workers=True)) != 0
         bindingHeaders["WorkerPrivate.h"] = hasWorkerStuff
 
-        def descriptorHasThreadChecks(desc):
-            return ((not desc.workers and not desc.interface.isExposedInWindow()) or
-                    (desc.interface.isExposedInAnyWorker() and desc.interface.isExposedOnlyInSomeWorkers()))
-
         hasThreadChecks = hasWorkerStuff or any(d.hasThreadChecks() for d in descriptors)
         bindingHeaders["nsThreadUtils.h"] = hasThreadChecks
 
@@ -12471,7 +12468,7 @@
             return (result.define(),
                     "%s(%s)" % (result.define(), defaultReturnArg),
                     "return ${declName};\n")
-        if type.isDOMString() or type.isScalarValueString():
+        if type.isDOMString() or type.isUSVString():
             if isMember:
                 # No need for a third element in the isMember case
                 return "nsString", None, None
@@ -12591,7 +12588,7 @@
     def getArgs(self, returnType, argList):
         args = [self.getArg(arg) for arg in argList]
         # Now the outparams
-        if returnType.isDOMString() or returnType.isScalarValueString():
+        if returnType.isDOMString() or returnType.isUSVString():
             args.append(Argument("nsString&", "aRetVal"))
         elif returnType.isByteString():
             args.append(Argument("nsCString&", "aRetVal"))
@@ -12718,7 +12715,7 @@
             # Unroll for the name, in case we're nullable.
             return type.unroll().name, True, True
 
-        if type.isDOMString() or type.isScalarValueString():
+        if type.isDOMString() or type.isUSVString():
             if isMember:
                 declType = "nsString"
             else:
@@ -14400,6 +14397,7 @@
         defineIncludes = [CGHeaders.getDeclarationFilename(desc.interface)
                           for desc in config.getDescriptors(hasInterfaceObject=True,
                                                             workers=False,
+                                                            isExposedInWindow=True,
                                                             register=True)]
         defineIncludes.append('nsScriptNameSpaceManager.h')
         defineIncludes.extend([CGHeaders.getDeclarationFilename(desc.interface)
@@ -14590,7 +14588,7 @@
         memberName = CGDictionary.makeMemberName(self.member.identifier.name)
         if (type.isPrimitive() and type.tag() in builtinNames) or type.isEnum() or type.isGeckoInterface():
             return "return " + memberName + ";\n"
-        if type.isDOMString() or type.isByteString() or type.isScalarValueString():
+        if type.isDOMString() or type.isByteString() or type.isUSVString():
             return "aRetVal = " + memberName + ";\n"
         if type.isSpiderMonkeyInterface() or type.isObject():
             return fill(
@@ -14983,7 +14981,7 @@
             nativeType = CGGeneric(type.unroll().inner.identifier.name)
             if type.nullable():
                 nativeType = CGTemplatedType("Nullable", nativeType)
-        elif type.isDOMString() or type.isScalarValueString():
+        elif type.isDOMString() or type.isUSVString():
             nativeType = CGGeneric("nsString")
         elif type.isByteString():
             nativeType = CGGeneric("nsCString")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/Configuration.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/Configuration.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/Configuration.py	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/Configuration.py	2014-11-26 21:45:56.000000000 +0000
@@ -210,6 +210,9 @@
             elif key == 'isExposedInSystemGlobals':
                 getter = lambda x: (not x.interface.isExternal() and
                                     x.interface.isExposedInSystemGlobals())
+            elif key == 'isExposedInWindow':
+                getter = lambda x: (not x.interface.isExternal() and
+                                    x.interface.isExposedInWindow())
             else:
                 # Have to watch out: just closing over "key" is not enough,
                 # since we're about to mutate its value
@@ -654,12 +657,13 @@
                 in self.interface.members))
 
     def hasThreadChecks(self):
-        return ((not self.workers and not self.interface.isExposedInWindow()) or
-                (self.interface.isExposedInAnyWorker() and
-                 self.interface.isExposedOnlyInSomeWorkers()))
+        return ((self.isExposedConditionally() and
+                 not self.interface.isExposedInWindow()) or
+                self.interface.isExposedInSomeButNotAllWorkers())
 
     def isExposedConditionally(self):
-        return self.interface.isExposedConditionally() or self.hasThreadChecks()
+        return (self.interface.isExposedConditionally() or
+                self.interface.isExposedInSomeButNotAllWorkers())
 
     def needsXrayResolveHooks(self):
         """
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/DOMJSProxyHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/DOMJSProxyHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/DOMJSProxyHandler.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/DOMJSProxyHandler.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -268,18 +268,6 @@
 }
 
 bool
-BaseDOMProxyHandler::enumerate(JSContext* cx, JS::Handle<JSObject*> proxy,
-                               AutoIdVector& props) const
-{
-  JS::Rooted<JSObject*> proto(cx);
-  if (!JS_GetPrototype(cx, proxy, &proto))  {
-    return false;
-  }
-  return getOwnEnumerablePropertyKeys(cx, proxy, props) &&
-         (!proto || js::GetPropertyKeys(cx, proto, 0, &props));
-}
-
-bool
 BaseDOMProxyHandler::watch(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
                            JS::Handle<JSObject*> callable) const
 {
@@ -309,6 +297,19 @@
 }
 
 bool
+BaseDOMProxyHandler::getEnumerablePropertyKeys(JSContext* cx,
+                                               JS::Handle<JSObject*> proxy,
+                                               AutoIdVector& props) const
+{
+  JS::Rooted<JSObject*> proto(cx);
+  if (!JS_GetPrototype(cx, proxy, &proto))  {
+    return false;
+  }
+  return getOwnEnumerablePropertyKeys(cx, proxy, props) &&
+         (!proto || js::GetPropertyKeys(cx, proto, 0, &props));
+}
+
+bool
 DOMProxyHandler::has(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id, bool* bp) const
 {
   if (!hasOwn(cx, proxy, id, bp)) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/DOMJSProxyHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/DOMJSProxyHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/DOMJSProxyHandler.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/DOMJSProxyHandler.h	2014-11-26 21:45:56.000000000 +0000
@@ -57,8 +57,6 @@
                                 JS::MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
   virtual bool ownPropertyKeys(JSContext* cx, JS::Handle<JSObject*> proxy,
                                JS::AutoIdVector &props) const MOZ_OVERRIDE;
-  bool enumerate(JSContext* cx, JS::Handle<JSObject*> proxy,
-                 JS::AutoIdVector& props) const MOZ_OVERRIDE;
 
   bool getPropertyDescriptor(JSContext* cx, JS::Handle<JSObject*> proxy,
                              JS::Handle<jsid> id,
@@ -71,6 +69,8 @@
   // unnecessary work during enumeration.
   virtual bool getOwnEnumerablePropertyKeys(JSContext* cx, JS::Handle<JSObject*> proxy,
                                             JS::AutoIdVector &props) const MOZ_OVERRIDE;
+  bool getEnumerablePropertyKeys(JSContext* cx, JS::Handle<JSObject*> proxy,
+                                 JS::AutoIdVector& props) const MOZ_OVERRIDE;
 
   bool watch(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id,
              JS::Handle<JSObject*> callable) const MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_distinguishability.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_distinguishability.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_distinguishability.py	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_distinguishability.py	2014-11-26 21:45:56.000000000 +0000
@@ -160,7 +160,7 @@
                  "optional Dict2", "sequence<long>", "sequence<short>",
                  "MozMap<object>", "MozMap<Dict>", "MozMap<long>",
                  "long[]", "short[]", "Date", "Date?", "any",
-                 "ScalarValueString" ]
+                 "USVString" ]
     # When we can parse Date and RegExp, we need to add them here.
 
     # Try to categorize things a bit to keep list lengths down
@@ -171,7 +171,7 @@
     primitives = numerics + booleans
     nonNumerics = allBut(argTypes, numerics)
     nonBooleans = allBut(argTypes, booleans)
-    strings = [ "DOMString", "ByteString", "Enum", "Enum2", "ScalarValueString" ]
+    strings = [ "DOMString", "ByteString", "Enum", "Enum2", "USVString" ]
     nonStrings = allBut(argTypes, strings)
     nonObjects = primitives + strings
     objects = allBut(argTypes, nonObjects )
@@ -206,7 +206,7 @@
     setDistinguishable("boolean?", allBut(nonBooleans, nullables))
     setDistinguishable("DOMString", nonStrings)
     setDistinguishable("ByteString", nonStrings)
-    setDistinguishable("ScalarValueString", nonStrings)
+    setDistinguishable("USVString", nonStrings)
     setDistinguishable("Enum", nonStrings)
     setDistinguishable("Enum2", nonStrings)
     setDistinguishable("Interface", notRelatedInterfaces)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_scalarvaluestring.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_scalarvaluestring.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_scalarvaluestring.py	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_scalarvaluestring.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-import WebIDL
-
-def WebIDLTest(parser, harness):
-    parser.parse("""
-        interface TestScalarValueString {
-          attribute ScalarValueString svs;
-        };
-    """)
-
-    results = parser.finish();
-
-    harness.check(len(results), 1, "Should be one production")
-    harness.ok(isinstance(results[0], WebIDL.IDLInterface),
-               "Should be an IDLInterface")
-    iface = results[0]
-    harness.check(iface.identifier.QName(), "::TestScalarValueString",
-                  "Interface has the right QName")
-    harness.check(iface.identifier.name, "TestScalarValueString",
-                  "Interface has the right name")
-    harness.check(iface.parent, None, "Interface has no parent")
-
-    members = iface.members
-    harness.check(len(members), 1, "Should be one member")
-
-    attr = members[0]
-    harness.ok(isinstance(attr, WebIDL.IDLAttribute), "Should be an IDLAttribute")
-    harness.check(attr.identifier.QName(), "::TestScalarValueString::svs",
-                  "Attr has correct QName")
-    harness.check(attr.identifier.name, "svs", "Attr has correct name")
-    harness.check(str(attr.type), "ScalarValueString",
-                  "Attr type is the correct name")
-    harness.ok(attr.type.isScalarValueString(), "Should be ScalarValueString type")
-    harness.ok(attr.type.isString(), "Should be String collective type")
-    harness.ok(not attr.type.isDOMString(), "Should be not be DOMString type")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_union.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_union.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_union.py	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_union.py	2014-11-26 21:45:56.000000000 +0000
@@ -63,7 +63,7 @@
              "octet",
              "DOMString",
              "ByteString",
-             "ScalarValueString",
+             "USVString",
              #"sequence<float>",
              "object",
              "ArrayBuffer",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_usvstring.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_usvstring.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/tests/test_usvstring.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/tests/test_usvstring.py	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,36 @@
+# -*- coding: UTF-8 -*-
+
+import WebIDL
+
+def WebIDLTest(parser, harness):
+    parser.parse("""
+        interface TestUSVString {
+          attribute USVString svs;
+        };
+    """)
+
+    results = parser.finish();
+
+    harness.check(len(results), 1, "Should be one production")
+    harness.ok(isinstance(results[0], WebIDL.IDLInterface),
+               "Should be an IDLInterface")
+    iface = results[0]
+    harness.check(iface.identifier.QName(), "::TestUSVString",
+                  "Interface has the right QName")
+    harness.check(iface.identifier.name, "TestUSVString",
+                  "Interface has the right name")
+    harness.check(iface.parent, None, "Interface has no parent")
+
+    members = iface.members
+    harness.check(len(members), 1, "Should be one member")
+
+    attr = members[0]
+    harness.ok(isinstance(attr, WebIDL.IDLAttribute), "Should be an IDLAttribute")
+    harness.check(attr.identifier.QName(), "::TestUSVString::svs",
+                  "Attr has correct QName")
+    harness.check(attr.identifier.name, "svs", "Attr has correct name")
+    harness.check(str(attr.type), "USVString",
+                  "Attr type is the correct name")
+    harness.ok(attr.type.isUSVString(), "Should be USVString type")
+    harness.ok(attr.type.isString(), "Should be String collective type")
+    harness.ok(not attr.type.isDOMString(), "Should be not be DOMString type")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/WebIDL.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/WebIDL.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/parser/WebIDL.py	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/parser/WebIDL.py	2014-11-26 21:45:56.000000000 +0000
@@ -1072,8 +1072,15 @@
     def isExposedInSystemGlobals(self):
         return 'BackstagePass' in self.exposureSet
 
-    def isExposedOnlyInSomeWorkers(self):
-        assert self.isExposedInAnyWorker()
+    def isExposedInSomeButNotAllWorkers(self):
+        """
+        Returns true if the Exposed extended attribute for this interface
+        exposes it in some worker globals but not others.  The return value does
+        not depend on whether the interface is exposed in Window or System
+        globals.
+        """
+        if not self.isExposedInAnyWorker():
+            return False
         workerScopes = self.parentScope.globalNameMapping["Worker"]
         return len(workerScopes.difference(self.exposureSet)) > 0
 
@@ -1565,7 +1572,7 @@
         'any',
         'domstring',
         'bytestring',
-        'scalarvaluestring',
+        'usvstring',
         'object',
         'date',
         'void',
@@ -1618,7 +1625,7 @@
     def isDOMString(self):
         return False
 
-    def isScalarValueString(self):
+    def isUSVString(self):
         return False
 
     def isVoid(self):
@@ -1804,8 +1811,8 @@
     def isDOMString(self):
         return self.inner.isDOMString()
 
-    def isScalarValueString(self):
-        return self.inner.isScalarValueString()
+    def isUSVString(self):
+        return self.inner.isUSVString()
 
     def isFloat(self):
         return self.inner.isFloat()
@@ -1932,7 +1939,7 @@
     def isDOMString(self):
         return False
 
-    def isScalarValueString(self):
+    def isUSVString(self):
         return False
 
     def isVoid(self):
@@ -2206,7 +2213,7 @@
     def isDOMString(self):
         return False
 
-    def isScalarValueString(self):
+    def isUSVString(self):
         return False
 
     def isVoid(self):
@@ -2304,8 +2311,8 @@
     def isDOMString(self):
         return self.inner.isDOMString()
 
-    def isScalarValueString(self):
-        return self.inner.isScalarValueString()
+    def isUSVString(self):
+        return self.inner.isUSVString()
 
     def isVoid(self):
         return self.inner.isVoid()
@@ -2405,7 +2412,7 @@
     def isDOMString(self):
         return False
 
-    def isScalarValueString(self):
+    def isUSVString(self):
         return False
 
     def isVoid(self):
@@ -2559,7 +2566,7 @@
         'any',
         'domstring',
         'bytestring',
-        'scalarvaluestring',
+        'usvstring',
         'object',
         'date',
         'void',
@@ -2594,7 +2601,7 @@
             Types.any: IDLType.Tags.any,
             Types.domstring: IDLType.Tags.domstring,
             Types.bytestring: IDLType.Tags.bytestring,
-            Types.scalarvaluestring: IDLType.Tags.scalarvaluestring,
+            Types.usvstring: IDLType.Tags.usvstring,
             Types.object: IDLType.Tags.object,
             Types.date: IDLType.Tags.date,
             Types.void: IDLType.Tags.void,
@@ -2628,7 +2635,7 @@
     def isString(self):
         return self._typeTag == IDLBuiltinType.Types.domstring or \
                self._typeTag == IDLBuiltinType.Types.bytestring or \
-               self._typeTag == IDLBuiltinType.Types.scalarvaluestring
+               self._typeTag == IDLBuiltinType.Types.usvstring
 
     def isByteString(self):
         return self._typeTag == IDLBuiltinType.Types.bytestring
@@ -2636,8 +2643,8 @@
     def isDOMString(self):
         return self._typeTag == IDLBuiltinType.Types.domstring
 
-    def isScalarValueString(self):
-        return self._typeTag == IDLBuiltinType.Types.scalarvaluestring
+    def isUSVString(self):
+        return self._typeTag == IDLBuiltinType.Types.usvstring
 
     def isInteger(self):
         return self._typeTag <= IDLBuiltinType.Types.unsigned_long_long
@@ -2791,9 +2798,9 @@
       IDLBuiltinType.Types.bytestring:
           IDLBuiltinType(BuiltinLocation("<builtin type>"), "ByteString",
                          IDLBuiltinType.Types.bytestring),
-      IDLBuiltinType.Types.scalarvaluestring:
-          IDLBuiltinType(BuiltinLocation("<builtin type>"), "ScalarValueString",
-                         IDLBuiltinType.Types.scalarvaluestring),
+      IDLBuiltinType.Types.usvstring:
+          IDLBuiltinType(BuiltinLocation("<builtin type>"), "USVString",
+                         IDLBuiltinType.Types.usvstring),
       IDLBuiltinType.Types.object:
           IDLBuiltinType(BuiltinLocation("<builtin type>"), "Object",
                          IDLBuiltinType.Types.object),
@@ -2928,10 +2935,10 @@
                 raise WebIDLError("Trying to convert unrestricted value %s to non-unrestricted"
                                   % self.value, [location]);
             return self
-        elif self.type.isString() and type.isScalarValueString():
-            # Allow ScalarValueStrings to use default value just like
+        elif self.type.isString() and type.isUSVString():
+            # Allow USVStrings to use default value just like
             # DOMString.  No coercion is required in this case as Codegen.py
-            # treats ScalarValueString just like DOMString, but with an
+            # treats USVString just like DOMString, but with an
             # extra normalization step.
             assert self.type.isDOMString()
             return self
@@ -4161,7 +4168,7 @@
         "Date": "DATE",
         "DOMString": "DOMSTRING",
         "ByteString": "BYTESTRING",
-        "ScalarValueString": "SCALARVALUESTRING",
+        "USVString": "USVSTRING",
         "any": "ANY",
         "boolean": "BOOLEAN",
         "byte": "BYTE",
@@ -5125,7 +5132,7 @@
                   | DATE
                   | DOMSTRING
                   | BYTESTRING
-                  | SCALARVALUESTRING
+                  | USVSTRING
                   | ANY
                   | ATTRIBUTE
                   | BOOLEAN
@@ -5398,11 +5405,11 @@
         """
         p[0] = IDLBuiltinType.Types.bytestring
 
-    def p_PrimitiveOrStringTypeScalarValueString(self, p):
+    def p_PrimitiveOrStringTypeUSVString(self, p):
         """
-            PrimitiveOrStringType : SCALARVALUESTRING
+            PrimitiveOrStringType : USVSTRING
         """
-        p[0] = IDLBuiltinType.Types.scalarvaluestring
+        p[0] = IDLBuiltinType.Types.usvstring
 
     def p_UnsignedIntegerTypeUnsigned(self, p):
         """
@@ -5695,6 +5702,7 @@
     # Builtin IDL defined by WebIDL
     _builtins = """
         typedef unsigned long long DOMTimeStamp;
+        typedef (ArrayBufferView or ArrayBuffer) BufferSource;
     """
 
 def main():
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/mochitest.ini	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/mochitest.ini	2014-11-26 21:45:56.000000000 +0000
@@ -44,7 +44,7 @@
 [test_queryInterface.html]
 [test_returnUnion.html]
 skip-if = debug == false
-[test_scalarvaluestring.html]
+[test_usvstring.html]
 skip-if = debug == false
 [test_sequence_wrapping.html]
 [test_setWithNamedGetterNoNamedSetter.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestBindingHeader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestBindingHeader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestBindingHeader.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestBindingHeader.h	2014-11-26 21:45:56.000000000 +0000
@@ -480,15 +480,15 @@
   void PassOptionalNullableByteString(const Optional<nsCString>&);
   void PassVariadicByteString(const Sequence<nsCString>&);
 
-  // ScalarValueString types
-  void PassSVS(const nsAString&);
-  void PassNullableSVS(const nsAString&);
-  void PassOptionalSVS(const Optional<nsAString>&);
-  void PassOptionalSVSWithDefaultValue(const nsAString&);
-  void PassOptionalNullableSVS(const Optional<nsAString>&);
-  void PassOptionalNullableSVSWithDefaultValue(const nsAString&);
-  void PassVariadicSVS(const Sequence<nsString>&);
-  void ReceiveSVS(DOMString&);
+  // USVString types
+  void PassUSVS(const nsAString&);
+  void PassNullableUSVS(const nsAString&);
+  void PassOptionalUSVS(const Optional<nsAString>&);
+  void PassOptionalUSVSWithDefaultValue(const nsAString&);
+  void PassOptionalNullableUSVS(const Optional<nsAString>&);
+  void PassOptionalNullableUSVSWithDefaultValue(const nsAString&);
+  void PassVariadicUSVS(const Sequence<nsString>&);
+  void ReceiveUSVS(DOMString&);
 
   // Enumerated types
   void PassEnum(TestEnum);
@@ -613,7 +613,7 @@
   void PassUnionWithMozMap(const StringMozMapOrString&);
   void PassUnionWithMozMapAndSequence(const StringMozMapOrStringSequence&);
   void PassUnionWithSequenceAndMozMap(const StringSequenceOrStringMozMap&);
-  void PassUnionWithSVS(const ScalarValueStringOrLong&);
+  void PassUnionWithUSVS(const USVStringOrLong&);
 #endif
   void PassNullableUnion(JSContext*, const Nullable<ObjectOrLong>&);
   void PassOptionalUnion(JSContext*, const Optional<ObjectOrLong>&);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestCodeGen.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestCodeGen.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestCodeGen.webidl	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestCodeGen.webidl	2014-11-26 21:45:56.000000000 +0000
@@ -460,15 +460,15 @@
   void passOptionalNullableByteString(optional ByteString? arg);
   void passVariadicByteString(ByteString... arg);
 
-  // ScalarValueString types
-  void passSVS(ScalarValueString arg);
-  void passNullableSVS(ScalarValueString? arg);
-  void passOptionalSVS(optional ScalarValueString arg);
-  void passOptionalSVSWithDefaultValue(optional ScalarValueString arg = "abc");
-  void passOptionalNullableSVS(optional ScalarValueString? arg);
-  void passOptionalNullableSVSWithDefaultValue(optional ScalarValueString? arg = null);
-  void passVariadicSVS(ScalarValueString... arg);
-  ScalarValueString receiveSVS();
+  // USVString types
+  void passUSVS(USVString arg);
+  void passNullableUSVS(USVString? arg);
+  void passOptionalUSVS(optional USVString arg);
+  void passOptionalUSVSWithDefaultValue(optional USVString arg = "abc");
+  void passOptionalNullableUSVS(optional USVString? arg);
+  void passOptionalNullableUSVSWithDefaultValue(optional USVString? arg = null);
+  void passVariadicUSVS(USVString... arg);
+  USVString receiveUSVS();
 
   // Enumerated types
   void passEnum(TestEnum arg);
@@ -578,7 +578,7 @@
   void passUnionWithMozMap((MozMap<DOMString> or DOMString) arg);
   void passUnionWithMozMapAndSequence((MozMap<DOMString> or sequence<DOMString>) arg);
   void passUnionWithSequenceAndMozMap((sequence<DOMString> or MozMap<DOMString>) arg);
-  void passUnionWithSVS((ScalarValueString or long) arg);
+  void passUnionWithUSVS((USVString or long) arg);
 #endif
   void passUnionWithNullable((object? or long) arg);
   void passNullableUnion((object or long)? arg);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestExampleGen.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestExampleGen.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestExampleGen.webidl	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestExampleGen.webidl	2014-11-26 21:45:56.000000000 +0000
@@ -327,15 +327,15 @@
   void passVariadicByteString(ByteString... arg);
   void passUnionByteString((ByteString or long) arg);
 
-  // ScalarValueString types
-  void passSVS(ScalarValueString arg);
-  void passNullableSVS(ScalarValueString? arg);
-  void passOptionalSVS(optional ScalarValueString arg);
-  void passOptionalSVSWithDefaultValue(optional ScalarValueString arg = "abc");
-  void passOptionalNullableSVS(optional ScalarValueString? arg);
-  void passOptionalNullableSVSWithDefaultValue(optional ScalarValueString? arg = null);
-  void passVariadicSVS(ScalarValueString... arg);
-  ScalarValueString receiveSVS();
+  // USVString types
+  void passSVS(USVString arg);
+  void passNullableSVS(USVString? arg);
+  void passOptionalSVS(optional USVString arg);
+  void passOptionalSVSWithDefaultValue(optional USVString arg = "abc");
+  void passOptionalNullableSVS(optional USVString? arg);
+  void passOptionalNullableSVSWithDefaultValue(optional USVString? arg = null);
+  void passVariadicSVS(USVString... arg);
+  USVString receiveSVS();
 
   // Enumerated types
   void passEnum(TestEnum arg);
@@ -443,7 +443,7 @@
   void passUnionWithMozMap((MozMap<DOMString> or DOMString) arg);
   void passUnionWithMozMapAndSequence((MozMap<DOMString> or sequence<DOMString>) arg);
   void passUnionWithSequenceAndMozMap((sequence<DOMString> or MozMap<DOMString>) arg);
-  void passUnionWithSVS((ScalarValueString or long) arg);
+  void passUnionWithSVS((USVString or long) arg);
 #endif
   void passUnionWithNullable((object? or long) arg);
   void passNullableUnion((object or long)? arg);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/test_exception_messages.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/test_exception_messages.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/test_exception_messages.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/test_exception_messages.html	2014-11-26 21:45:56.000000000 +0000
@@ -44,8 +44,8 @@
       [ 'document.createTreeWalker(document, 0xFFFFFFFF, { acceptNode: 5 }).nextNode()',
         "Property 'acceptNode' is not callable.",
         "non-callable callback interface operation property" ],
-      [ '(new TextEncoder).encode("", new RegExp())',
-        "Argument 2 of TextEncoder.encode can't be converted to a dictionary.",
+      [ '(new TextDecoder).decode(new Uint8Array(), new RegExp())',
+        "Argument 2 of TextDecoder.decode can't be converted to a dictionary.",
         "regexp passed for a dictionary" ],
       [ 'URL.createObjectURL(null, null)',
         "Argument 1 is not valid for any of the 2-argument overloads of URL.createObjectURL.",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestJSImplGen.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestJSImplGen.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/TestJSImplGen.webidl	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/TestJSImplGen.webidl	2014-11-26 21:45:56.000000000 +0000
@@ -339,15 +339,15 @@
   void passVariadicByteString(ByteString... arg);
   void PassUnionByteString((ByteString or long) arg);
 
-  // ScalarValueString types
-  void passSVS(ScalarValueString arg);
-  void passNullableSVS(ScalarValueString? arg);
-  void passOptionalSVS(optional ScalarValueString arg);
-  void passOptionalSVSWithDefaultValue(optional ScalarValueString arg = "abc");
-  void passOptionalNullableSVS(optional ScalarValueString? arg);
-  void passOptionalNullableSVSWithDefaultValue(optional ScalarValueString? arg = null);
-  void passVariadicSVS(ScalarValueString... arg);
-  ScalarValueString receiveSVS();
+  // USVString types
+  void passSVS(USVString arg);
+  void passNullableSVS(USVString? arg);
+  void passOptionalSVS(optional USVString arg);
+  void passOptionalSVSWithDefaultValue(optional USVString arg = "abc");
+  void passOptionalNullableSVS(optional USVString? arg);
+  void passOptionalNullableSVSWithDefaultValue(optional USVString? arg = null);
+  void passVariadicSVS(USVString... arg);
+  USVString receiveSVS();
 
   // Enumerated types
   void passEnum(MyTestEnum arg);
@@ -456,7 +456,7 @@
   void passUnionWithMozMap((MozMap<DOMString> or DOMString) arg);
   void passUnionWithMozMapAndSequence((MozMap<DOMString> or sequence<DOMString>) arg);
   void passUnionWithSequenceAndMozMap((sequence<DOMString> or MozMap<DOMString>) arg);
-  void passUnionWithSVS((ScalarValueString or long) arg);
+  void passUnionWithSVS((USVString or long) arg);
 #endif
   void passUnionWithNullable((object? or long) arg);
   void passNullableUnion((object or long)? arg);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/test_scalarvaluestring.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/test_scalarvaluestring.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/test_scalarvaluestring.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/test_scalarvaluestring.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!-- Any copyright is dedicated to the Public Domain.
-   - http://creativecommons.org/publicdomain/zero/1.0/ -->
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test ScalarValueString</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<script class="testbody" type="application/javascript">
-SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({set: [['dom.expose_test_interfaces', true]]}, function() {
-  var testInterfaceJS = new TestInterfaceJS();
-  ok(testInterfaceJS, "got a TestInterfaceJS object");
-  // For expected values, see algorithm definition here:
-  //  http://heycam.github.io/webidl/#dfn-obtain-unicode
-  var testList = [
-    { string:   "foo",
-      expected: "foo" },
-    { string:   "This is U+2070E: \ud841\udf0e",
-      expected: "This is U+2070E: \ud841\udf0e" },
-    { string:   "Missing low surrogate: \ud841",
-      expected: "Missing low surrogate: \ufffd" },
-    { string:   "Missing low surrogate with trailer: \ud841!!",
-      expected: "Missing low surrogate with trailer: \ufffd!!" },
-    { string:   "Missing high surrogate: \udf0e",
-      expected: "Missing high surrogate: \ufffd" },
-    { string:   "Missing high surrogate with trailer: \udf0e!!",
-      expected: "Missing high surrogate with trailer: \ufffd!!" },
-    { string:   "U+2070E after malformed: \udf0e\ud841\udf0e",
-      expected: "U+2070E after malformed: \ufffd\ud841\udf0e" }
-  ];
-  testList.forEach(function(test) {
-    is(testInterfaceJS.convertSVS(test.string), test.expected, "Convert '" + test.string + "'");
-  });
-  SimpleTest.finish();
-});
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/test_usvstring.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/test_usvstring.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/test/test_usvstring.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/test/test_usvstring.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,41 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test USVString</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<script class="testbody" type="application/javascript">
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({set: [['dom.expose_test_interfaces', true]]}, function() {
+  var testInterfaceJS = new TestInterfaceJS();
+  ok(testInterfaceJS, "got a TestInterfaceJS object");
+  // For expected values, see algorithm definition here:
+  //  http://heycam.github.io/webidl/#dfn-obtain-unicode
+  var testList = [
+    { string:   "foo",
+      expected: "foo" },
+    { string:   "This is U+2070E: \ud841\udf0e",
+      expected: "This is U+2070E: \ud841\udf0e" },
+    { string:   "Missing low surrogate: \ud841",
+      expected: "Missing low surrogate: \ufffd" },
+    { string:   "Missing low surrogate with trailer: \ud841!!",
+      expected: "Missing low surrogate with trailer: \ufffd!!" },
+    { string:   "Missing high surrogate: \udf0e",
+      expected: "Missing high surrogate: \ufffd" },
+    { string:   "Missing high surrogate with trailer: \udf0e!!",
+      expected: "Missing high surrogate with trailer: \ufffd!!" },
+    { string:   "U+2070E after malformed: \udf0e\ud841\udf0e",
+      expected: "U+2070E after malformed: \ufffd\ud841\udf0e" }
+  ];
+  testList.forEach(function(test) {
+    is(testInterfaceJS.convertSVS(test.string), test.expected, "Convert '" + test.string + "'");
+  });
+  SimpleTest.finish();
+});
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/ToJSValue.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/ToJSValue.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/ToJSValue.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/ToJSValue.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -66,10 +66,10 @@
           JS::MutableHandle<JS::Value> aValue)
 {
   MOZ_ASSERT(aArgument.Failed());
-  ThrowMethodFailedWithDetails(aCx, aArgument, "", "");
-  if (!JS_GetPendingException(aCx, aValue)) {
-    return false;
-  }
+  DebugOnly<bool> throwResult = ThrowMethodFailedWithDetails(aCx, aArgument, "", "");
+  MOZ_ASSERT(!throwResult);
+  DebugOnly<bool> getPendingResult = JS_GetPendingException(aCx, aValue);
+  MOZ_ASSERT(getPendingResult);
   JS_ClearPendingException(aCx);
   return true;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/ToJSValue.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/ToJSValue.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bindings/ToJSValue.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bindings/ToJSValue.h	2014-11-26 21:45:56.000000000 +0000
@@ -138,11 +138,10 @@
   return MaybeWrapValue(aCx, aValue);
 }
 
-// Accept objects that inherit from nsWrapperCache and nsISupports (e.g. most
+// Accept objects that inherit from nsWrapperCache (e.g. most
 // DOM objects).
 template <class T>
-typename EnableIf<IsBaseOf<nsWrapperCache, T>::value &&
-                  IsBaseOf<nsISupports, T>::value, bool>::Type
+typename EnableIf<IsBaseOf<nsWrapperCache, T>::value, bool>::Type
 ToJSValue(JSContext* aCx,
           T& aArgument,
           JS::MutableHandle<JS::Value> aValue)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,1240 @@
+/* -*- 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 "BluetoothDaemonHandsfreeInterface.h"
+#include "BluetoothDaemonSetupInterface.h"
+#include "mozilla/unused.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Handsfree module
+//
+
+BluetoothHandsfreeNotificationHandler*
+  BluetoothDaemonHandsfreeModule::sNotificationHandler;
+
+void
+BluetoothDaemonHandsfreeModule::SetNotificationHandler(
+  BluetoothHandsfreeNotificationHandler* aNotificationHandler)
+{
+  sNotificationHandler = aNotificationHandler;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::Send(BluetoothDaemonPDU* aPDU,
+                                     BluetoothHandsfreeResultHandler* aRes)
+{
+  aRes->AddRef(); // Keep reference for response
+  return Send(aPDU, static_cast<void*>(aRes));
+}
+
+void
+BluetoothDaemonHandsfreeModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
+                                          BluetoothDaemonPDU& aPDU, void* aUserData)
+{
+  static void (BluetoothDaemonHandsfreeModule::* const HandleOp[])(
+    const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
+    INIT_ARRAY_AT(0, &BluetoothDaemonHandsfreeModule::HandleRsp),
+    INIT_ARRAY_AT(1, &BluetoothDaemonHandsfreeModule::HandleNtf),
+  };
+
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  // Negate twice to map bit to 0/1
+  unsigned long isNtf = !!(aHeader.mOpcode & 0x80);
+
+  (this->*(HandleOp[isNtf]))(aHeader, aPDU, aUserData);
+}
+
+// Commands
+//
+
+nsresult
+BluetoothDaemonHandsfreeModule::ConnectCmd(
+  const nsAString& aRemoteAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CONNECT,
+                           6)); // Address
+
+  nsresult rv = PackPDU(
+    PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::DisconnectCmd(
+  const nsAString& aRemoteAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DISCONNECT,
+                           6)); // Address
+
+  nsresult rv = PackPDU(
+    PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::ConnectAudioCmd(
+  const nsAString& aRemoteAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CONNECT_AUDIO,
+                           6)); // Address
+
+  nsresult rv = PackPDU(
+    PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::DisconnectAudioCmd(
+  const nsAString& aRemoteAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DISCONNECT_AUDIO,
+                           6)); // Address
+
+  nsresult rv = PackPDU(
+    PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::StartVoiceRecognitionCmd(
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_START_VOICE_RECOGNITION,
+                           0)); // No payload
+
+  nsresult rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::StopVoiceRecognitionCmd(
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_STOP_VOICE_RECOGNITION,
+                           0)); // No payload
+
+  nsresult rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::VolumeControlCmd(
+  BluetoothHandsfreeVolumeType aType, int aVolume,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_VOLUME_CONTROL,
+                           1 + // Volume type
+                           1)); // Volume
+
+  nsresult rv = PackPDU(aType, PackConversion<int, uint8_t>(aVolume), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::DeviceStatusNotificationCmd(
+  BluetoothHandsfreeNetworkState aNtkState,
+  BluetoothHandsfreeServiceType aSvcType, int aSignal, int aBattChg,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DEVICE_STATUS_NOTIFICATION,
+                           1 + // Network state
+                           1 + // Service type
+                           1 + // Signal strength
+                           1)); // Battery level
+
+  nsresult rv = PackPDU(aNtkState, aSvcType,
+                        PackConversion<int, uint8_t>(aSignal),
+                        PackConversion<int, uint8_t>(aBattChg), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::CopsResponseCmd(
+  const char* aCops, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_COPS_RESPONSE,
+                           0)); // Dynamically allocated
+
+  nsresult rv = PackPDU(PackCString0(nsDependentCString(aCops)), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::CindResponseCmd(
+  int aSvc, int aNumActive, int aNumHeld,
+  BluetoothHandsfreeCallState aCallSetupState,
+  int aSignal, int aRoam, int aBattChg,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CIND_RESPONSE,
+                           1 + // Service
+                           1 + // # Active
+                           1 + // # Held
+                           1 + // Call state
+                           1 + // Signal strength
+                           1 + // Roaming
+                           1)); // Battery level
+
+  nsresult rv = PackPDU(PackConversion<int, uint8_t>(aSvc),
+                        PackConversion<int, uint8_t>(aNumActive),
+                        PackConversion<int, uint8_t>(aNumHeld),
+                        aCallSetupState,
+                        PackConversion<int, uint8_t>(aSignal),
+                        PackConversion<int, uint8_t>(aRoam),
+                        PackConversion<int, uint8_t>(aBattChg), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::FormattedAtResponseCmd(
+  const char* aRsp, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_FORMATTED_AT_RESPONSE,
+                           0)); // Dynamically allocated
+
+  nsresult rv = PackPDU(PackCString0(nsDependentCString(aRsp)), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::AtResponseCmd(
+  BluetoothHandsfreeAtResponse aResponseCode, int aErrorCode,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_AT_RESPONSE,
+                           1 + // AT Response code
+                           1)); // Error code
+
+  nsresult rv = PackPDU(aResponseCode,
+                        PackConversion<int, uint8_t>(aErrorCode), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::ClccResponseCmd(
+  int aIndex,
+  BluetoothHandsfreeCallDirection aDir, BluetoothHandsfreeCallState aState,
+  BluetoothHandsfreeCallMode aMode, BluetoothHandsfreeCallMptyType aMpty,
+  const nsAString& aNumber, BluetoothHandsfreeCallAddressType aType,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  NS_ConvertUTF16toUTF8 number(aNumber);
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLCC_RESPONSE,
+                           1 + // Call index
+                           1 + // Call direction
+                           1 + // Call state
+                           1 + // Call mode
+                           1 + // Call MPTY
+                           1 + // Address type
+                           number.Length() + 1)); // Number string + \0
+
+  nsresult rv = PackPDU(PackConversion<int, uint8_t>(aIndex),
+                        aDir, aState, aMode, aMpty, aType,
+                        PackCString0(number), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonHandsfreeModule::PhoneStateChangeCmd(
+  int aNumActive, int aNumHeld, BluetoothHandsfreeCallState aCallSetupState,
+  const nsAString& aNumber, BluetoothHandsfreeCallAddressType aType,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  NS_ConvertUTF16toUTF8 number(aNumber);
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(
+    new BluetoothDaemonPDU(SERVICE_ID, OPCODE_PHONE_STATE_CHANGE,
+                           1 + // # Active
+                           1 + // # Held
+                           1 + // Call state
+                           1 + // Address type
+                           number.Length() + 1)); // Number string + \0
+
+  nsresult rv = PackPDU(PackConversion<int, uint8_t>(aNumActive),
+                        PackConversion<int, uint8_t>(aNumHeld),
+                        aCallSetupState, aType,
+                        PackCString0(NS_ConvertUTF16toUTF8(aNumber)), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return NS_OK;
+}
+
+// Responses
+//
+
+void
+BluetoothDaemonHandsfreeModule::ErrorRsp(
+  const BluetoothDaemonPDUHeader& aHeader,
+  BluetoothDaemonPDU& aPDU, BluetoothHandsfreeResultHandler* aRes)
+{
+  ErrorRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::OnError, UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::ConnectRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::Connect, UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::DisconnectRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::Disconnect, UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::ConnectAudioRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::ConnectAudio,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::DisconnectAudioRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::DisconnectAudio,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::StartVoiceRecognitionRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::StartVoiceRecognition,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::StopVoiceRecognitionRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::StopVoiceRecognition,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::VolumeControlRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::VolumeControl,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::DeviceStatusNotificationRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::DeviceStatusNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::CopsResponseRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::CopsResponse,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::CindResponseRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::CindResponse,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::FormattedAtResponseRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::FormattedAtResponse,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::AtResponseRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::AtResponse,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::ClccResponseRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::ClccResponse,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::PhoneStateChangeRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  ResultRunnable::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::PhoneStateChange,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::HandleRsp(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  void* aUserData)
+{
+  static void (BluetoothDaemonHandsfreeModule::* const HandleRsp[])(
+    const BluetoothDaemonPDUHeader&,
+    BluetoothDaemonPDU&,
+    BluetoothHandsfreeResultHandler*) = {
+    INIT_ARRAY_AT(OPCODE_ERROR,
+      &BluetoothDaemonHandsfreeModule::ErrorRsp),
+    INIT_ARRAY_AT(OPCODE_CONNECT,
+      &BluetoothDaemonHandsfreeModule::ConnectRsp),
+    INIT_ARRAY_AT(OPCODE_DISCONNECT,
+      &BluetoothDaemonHandsfreeModule::DisconnectRsp),
+    INIT_ARRAY_AT(OPCODE_CONNECT_AUDIO,
+      &BluetoothDaemonHandsfreeModule::ConnectAudioRsp),
+    INIT_ARRAY_AT(OPCODE_DISCONNECT_AUDIO,
+      &BluetoothDaemonHandsfreeModule::DisconnectAudioRsp),
+    INIT_ARRAY_AT(OPCODE_START_VOICE_RECOGNITION,
+      &BluetoothDaemonHandsfreeModule::StartVoiceRecognitionRsp),
+    INIT_ARRAY_AT(OPCODE_STOP_VOICE_RECOGNITION,
+      &BluetoothDaemonHandsfreeModule::StopVoiceRecognitionRsp),
+    INIT_ARRAY_AT(OPCODE_VOLUME_CONTROL,
+      &BluetoothDaemonHandsfreeModule::VolumeControlRsp),
+    INIT_ARRAY_AT(OPCODE_DEVICE_STATUS_NOTIFICATION,
+      &BluetoothDaemonHandsfreeModule::DeviceStatusNotificationRsp),
+    INIT_ARRAY_AT(OPCODE_COPS_RESPONSE,
+      &BluetoothDaemonHandsfreeModule::CopsResponseRsp),
+    INIT_ARRAY_AT(OPCODE_CIND_RESPONSE,
+      &BluetoothDaemonHandsfreeModule::CindResponseRsp),
+    INIT_ARRAY_AT(OPCODE_FORMATTED_AT_RESPONSE,
+      &BluetoothDaemonHandsfreeModule::FormattedAtResponseRsp),
+    INIT_ARRAY_AT(OPCODE_AT_RESPONSE,
+      &BluetoothDaemonHandsfreeModule::AtResponseRsp),
+    INIT_ARRAY_AT(OPCODE_CLCC_RESPONSE,
+      &BluetoothDaemonHandsfreeModule::ClccResponseRsp),
+    INIT_ARRAY_AT(OPCODE_PHONE_STATE_CHANGE,
+      &BluetoothDaemonHandsfreeModule::PhoneStateChangeRsp)
+  };
+
+  MOZ_ASSERT(!NS_IsMainThread()); // I/O thread
+
+  if (NS_WARN_IF(!(aHeader.mOpcode < MOZ_ARRAY_LENGTH(HandleRsp))) ||
+      NS_WARN_IF(!HandleRsp[aHeader.mOpcode])) {
+    return;
+  }
+
+  nsRefPtr<BluetoothHandsfreeResultHandler> res =
+    already_AddRefed<BluetoothHandsfreeResultHandler>(
+      static_cast<BluetoothHandsfreeResultHandler*>(aUserData));
+
+  if (!res) {
+    return; // Return early if no result handler has been set for response
+  }
+
+  (this->*(HandleRsp[aHeader.mOpcode]))(aHeader, aPDU, res);
+}
+
+// Notifications
+//
+
+// Returns the current notification handler to a notification runnable
+class BluetoothDaemonHandsfreeModule::NotificationHandlerWrapper MOZ_FINAL
+{
+public:
+  typedef BluetoothHandsfreeNotificationHandler ObjectType;
+
+  static ObjectType* GetInstance()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    return sNotificationHandler;
+  }
+};
+
+// Init operator class for ConnectionStateNotification
+class BluetoothDaemonHandsfreeModule::ConnectionStateInitOp MOZ_FINAL
+  : private PDUInitOp
+{
+public:
+  ConnectionStateInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+  { }
+
+  nsresult
+  operator () (BluetoothHandsfreeConnectionState& aArg1,
+               nsString& aArg2) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    /* Read state */
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    /* Read address */
+    rv = UnpackPDU(
+      pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg2));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+void
+BluetoothDaemonHandsfreeModule::ConnectionStateNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  ConnectionStateNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::ConnectionStateNotification,
+    ConnectionStateInitOp(aPDU));
+}
+
+// Init operator class for AudioStateNotification
+class BluetoothDaemonHandsfreeModule::AudioStateInitOp MOZ_FINAL
+  : private PDUInitOp
+{
+public:
+  AudioStateInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+  { }
+
+  nsresult
+  operator () (BluetoothHandsfreeAudioState& aArg1,
+               nsString& aArg2) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    /* Read state */
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    /* Read address */
+    rv = UnpackPDU(
+      pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg2));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+void
+BluetoothDaemonHandsfreeModule::AudioStateNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  AudioStateNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::AudioStateNotification,
+    AudioStateInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::VoiceRecognitionNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  VoiceRecognitionNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::VoiceRecognitionNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::AnswerCallNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  AnswerCallNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::AnswerCallNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::HangupCallNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  HangupCallNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::HangupCallNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+// Init operator class for VolumeNotification
+class BluetoothDaemonHandsfreeModule::VolumeInitOp MOZ_FINAL
+  : private PDUInitOp
+{
+public:
+  VolumeInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+  { }
+
+  nsresult
+  operator () (BluetoothHandsfreeVolumeType& aArg1, int& aArg2) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    /* Read volume type */
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    /* Read volume */
+    rv = UnpackPDU(pdu, UnpackConversion<uint8_t, int>(aArg2));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+void
+BluetoothDaemonHandsfreeModule::VolumeNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  VolumeNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::VolumeNotification,
+    VolumeInitOp(aPDU));
+}
+
+// Init operator class for DialCallNotification
+class BluetoothDaemonHandsfreeModule::DialCallInitOp MOZ_FINAL
+  : private PDUInitOp
+{
+public:
+  DialCallInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+  { }
+
+  nsresult
+  operator () (nsString& aArg1) const
+  {
+    /* Read number */
+    nsresult rv = UnpackPDU(GetPDU(), UnpackString0(aArg1));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+void
+BluetoothDaemonHandsfreeModule::DialCallNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  DialCallNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::DialCallNotification,
+    DialCallInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::DtmfNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  DtmfNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::DtmfNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::NRECNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  NRECNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::NRECNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::CallHoldNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  CallHoldNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::CallHoldNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::CnumNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  CnumNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::CnumNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::CindNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  CindNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::CindNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::CopsNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  CopsNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::CopsNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::ClccNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  ClccNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::ClccNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+// Init operator class for UnknownAtNotification
+class BluetoothDaemonHandsfreeModule::UnknownAtInitOp MOZ_FINAL
+  : private PDUInitOp
+{
+public:
+  UnknownAtInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+  { }
+
+  nsresult
+  operator () (nsCString& aArg1) const
+  {
+    /* Read string */
+    nsresult rv = UnpackPDU(GetPDU(), UnpackCString0(aArg1));
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+void
+BluetoothDaemonHandsfreeModule::UnknownAtNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  UnknownAtNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::UnknownAtNotification,
+    UnknownAtInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::KeyPressedNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
+{
+  KeyPressedNotification::Dispatch(
+    &BluetoothHandsfreeNotificationHandler::KeyPressedNotification,
+    UnpackPDUInitOp(aPDU));
+}
+
+void
+BluetoothDaemonHandsfreeModule::HandleNtf(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  void* aUserData)
+{
+  static void (BluetoothDaemonHandsfreeModule::* const HandleNtf[])(
+    const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
+    INIT_ARRAY_AT(0, &BluetoothDaemonHandsfreeModule::ConnectionStateNtf),
+    INIT_ARRAY_AT(1, &BluetoothDaemonHandsfreeModule::AudioStateNtf),
+    INIT_ARRAY_AT(2, &BluetoothDaemonHandsfreeModule::VoiceRecognitionNtf),
+    INIT_ARRAY_AT(3, &BluetoothDaemonHandsfreeModule::AnswerCallNtf),
+    INIT_ARRAY_AT(4, &BluetoothDaemonHandsfreeModule::HangupCallNtf),
+    INIT_ARRAY_AT(5, &BluetoothDaemonHandsfreeModule::VolumeNtf),
+    INIT_ARRAY_AT(6, &BluetoothDaemonHandsfreeModule::DialCallNtf),
+    INIT_ARRAY_AT(7, &BluetoothDaemonHandsfreeModule::DtmfNtf),
+    INIT_ARRAY_AT(8, &BluetoothDaemonHandsfreeModule::NRECNtf),
+    INIT_ARRAY_AT(9, &BluetoothDaemonHandsfreeModule::CallHoldNtf),
+    INIT_ARRAY_AT(10, &BluetoothDaemonHandsfreeModule::CnumNtf),
+    INIT_ARRAY_AT(11, &BluetoothDaemonHandsfreeModule::CindNtf),
+    INIT_ARRAY_AT(12, &BluetoothDaemonHandsfreeModule::CopsNtf),
+    INIT_ARRAY_AT(13, &BluetoothDaemonHandsfreeModule::ClccNtf),
+    INIT_ARRAY_AT(14, &BluetoothDaemonHandsfreeModule::UnknownAtNtf),
+    INIT_ARRAY_AT(15, &BluetoothDaemonHandsfreeModule::KeyPressedNtf)
+  };
+
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  uint8_t index = aHeader.mOpcode - 0x81;
+
+  if (NS_WARN_IF(!(index < MOZ_ARRAY_LENGTH(HandleNtf))) ||
+      NS_WARN_IF(!HandleNtf[index])) {
+    return;
+  }
+
+  (this->*(HandleNtf[index]))(aHeader, aPDU);
+}
+
+//
+// Handsfree interface
+//
+
+BluetoothDaemonHandsfreeInterface::BluetoothDaemonHandsfreeInterface(
+  BluetoothDaemonHandsfreeModule* aModule)
+  : mModule(aModule)
+{ }
+
+BluetoothDaemonHandsfreeInterface::~BluetoothDaemonHandsfreeInterface()
+{ }
+
+class BluetoothDaemonHandsfreeInterface::InitResultHandler MOZ_FINAL
+  : public BluetoothSetupResultHandler
+{
+public:
+  InitResultHandler(BluetoothHandsfreeResultHandler* aRes)
+    : mRes(aRes)
+  {
+    MOZ_ASSERT(mRes);
+  }
+
+  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    mRes->OnError(aStatus);
+  }
+
+  void RegisterModule() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    mRes->Init();
+  }
+
+private:
+  nsRefPtr<BluetoothHandsfreeResultHandler> mRes;
+};
+
+void
+BluetoothDaemonHandsfreeInterface::Init(
+  BluetoothHandsfreeNotificationHandler* aNotificationHandler,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  // Set notification handler _before_ registering the module. It could
+  // happen that we receive notifications, before the result handler runs.
+  mModule->SetNotificationHandler(aNotificationHandler);
+
+  InitResultHandler* res;
+
+  if (aRes) {
+    res = new InitResultHandler(aRes);
+  } else {
+    // We don't need a result handler if the caller is not interested.
+    res = nullptr;
+  }
+
+  nsresult rv = mModule->RegisterModule(
+    BluetoothDaemonHandsfreeModule::SERVICE_ID, MODE_NARROWBAND_SPEECH, res);
+
+  if (NS_FAILED(rv) && aRes) {
+    DispatchError(aRes, STATUS_FAIL);
+  }
+}
+
+class BluetoothDaemonHandsfreeInterface::CleanupResultHandler MOZ_FINAL
+  : public BluetoothSetupResultHandler
+{
+public:
+  CleanupResultHandler(BluetoothDaemonHandsfreeModule* aModule,
+                       BluetoothHandsfreeResultHandler* aRes)
+    : mModule(aModule)
+    , mRes(aRes)
+  {
+    MOZ_ASSERT(mModule);
+  }
+
+  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    if (mRes) {
+      mRes->OnError(aStatus);
+    }
+  }
+
+  void UnregisterModule() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    // Clear notification handler _after_ module has been
+    // unregistered. While unregistering the module, we might
+    // still receive notifications.
+    mModule->SetNotificationHandler(nullptr);
+
+    if (mRes) {
+      mRes->Cleanup();
+    }
+  }
+
+private:
+  BluetoothDaemonHandsfreeModule* mModule;
+  nsRefPtr<BluetoothHandsfreeResultHandler> mRes;
+};
+
+void
+BluetoothDaemonHandsfreeInterface::Cleanup(
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  mModule->UnregisterModule(BluetoothDaemonHandsfreeModule::SERVICE_ID,
+                            new CleanupResultHandler(mModule, aRes));
+}
+
+/* Connect / Disconnect */
+
+void
+BluetoothDaemonHandsfreeInterface::Connect(
+  const nsAString& aBdAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->ConnectCmd(aBdAddr, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::Disconnect(
+  const nsAString& aBdAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->DisconnectCmd(aBdAddr, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::ConnectAudio(
+  const nsAString& aBdAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->ConnectAudioCmd(aBdAddr, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::DisconnectAudio(
+  const nsAString& aBdAddr, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->DisconnectAudioCmd(aBdAddr, aRes);
+}
+
+/* Voice Recognition */
+
+void
+BluetoothDaemonHandsfreeInterface::StartVoiceRecognition(
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->StartVoiceRecognitionCmd(aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::StopVoiceRecognition(
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->StopVoiceRecognitionCmd(aRes);
+}
+
+/* Volume */
+
+void
+BluetoothDaemonHandsfreeInterface::VolumeControl(
+  BluetoothHandsfreeVolumeType aType, int aVolume,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->VolumeControlCmd(aType, aVolume, aRes);
+}
+
+/* Device status */
+
+void
+BluetoothDaemonHandsfreeInterface::DeviceStatusNotification(
+  BluetoothHandsfreeNetworkState aNtkState,
+  BluetoothHandsfreeServiceType aSvcType, int aSignal, int aBattChg,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->DeviceStatusNotificationCmd(aNtkState, aSvcType, aSignal,
+                                       aBattChg, aRes);
+}
+
+/* Responses */
+
+void
+BluetoothDaemonHandsfreeInterface::CopsResponse(
+  const char* aCops, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->CopsResponseCmd(aCops, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::CindResponse(
+  int aSvc, int aNumActive, int aNumHeld,
+  BluetoothHandsfreeCallState aCallSetupState,
+  int aSignal, int aRoam, int aBattChg,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->CindResponseCmd(aSvc, aNumActive, aNumHeld, aCallSetupState,
+                           aSignal, aRoam, aBattChg, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::FormattedAtResponse(
+  const char* aRsp, BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->FormattedAtResponseCmd(aRsp, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::AtResponse(
+  BluetoothHandsfreeAtResponse aResponseCode, int aErrorCode,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->AtResponseCmd(aResponseCode, aErrorCode, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::ClccResponse(
+  int aIndex, BluetoothHandsfreeCallDirection aDir,
+  BluetoothHandsfreeCallState aState,
+  BluetoothHandsfreeCallMode aMode,
+  BluetoothHandsfreeCallMptyType aMpty,
+  const nsAString& aNumber,
+  BluetoothHandsfreeCallAddressType aType,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->ClccResponseCmd(aIndex, aDir, aState, aMode, aMpty, aNumber,
+                           aType, aRes);
+}
+
+/* Phone State */
+
+void
+BluetoothDaemonHandsfreeInterface::PhoneStateChange(
+  int aNumActive, int aNumHeld,
+  BluetoothHandsfreeCallState aCallSetupState,
+  const nsAString& aNumber,
+  BluetoothHandsfreeCallAddressType aType,
+  BluetoothHandsfreeResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->PhoneStateChangeCmd(aNumActive, aNumHeld, aCallSetupState, aNumber,
+                               aType, aRes);
+}
+
+void
+BluetoothDaemonHandsfreeInterface::DispatchError(
+  BluetoothHandsfreeResultHandler* aRes, BluetoothStatus aStatus)
+{
+  BluetoothResultRunnable1<BluetoothHandsfreeResultHandler, void,
+                           BluetoothStatus, BluetoothStatus>::Dispatch(
+    aRes, &BluetoothHandsfreeResultHandler::OnError,
+    ConstantInitOp1<BluetoothStatus>(aStatus));
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,412 @@
+/* -*- 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/. */
+
+#ifndef mozilla_dom_bluetooth_bluetoothdaemonhandsfreeinterface_h
+#define mozilla_dom_bluetooth_bluetoothdaemonhandsfreeinterface_h
+
+#include "BluetoothDaemonHelpers.h"
+#include "BluetoothInterface.h"
+#include "BluetoothInterfaceHelpers.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothSetupResultHandler;
+
+class BluetoothDaemonHandsfreeModule
+{
+public:
+  enum {
+    SERVICE_ID = 0x05
+  };
+
+  enum {
+    OPCODE_ERROR = 0x00,
+    OPCODE_CONNECT = 0x01,
+    OPCODE_DISCONNECT = 0x02,
+    OPCODE_CONNECT_AUDIO = 0x03,
+    OPCODE_DISCONNECT_AUDIO = 0x04,
+    OPCODE_START_VOICE_RECOGNITION = 0x05,
+    OPCODE_STOP_VOICE_RECOGNITION =0x06,
+    OPCODE_VOLUME_CONTROL = 0x07,
+    OPCODE_DEVICE_STATUS_NOTIFICATION = 0x08,
+    OPCODE_COPS_RESPONSE = 0x09,
+    OPCODE_CIND_RESPONSE = 0x0a,
+    OPCODE_FORMATTED_AT_RESPONSE = 0x0b,
+    OPCODE_AT_RESPONSE = 0x0c,
+    OPCODE_CLCC_RESPONSE = 0x0d,
+    OPCODE_PHONE_STATE_CHANGE = 0x0e
+  };
+
+  virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
+
+  virtual nsresult RegisterModule(uint8_t aId, uint8_t aMode,
+                                  BluetoothSetupResultHandler* aRes) = 0;
+
+  virtual nsresult UnregisterModule(uint8_t aId,
+                                    BluetoothSetupResultHandler* aRes) = 0;
+
+  void SetNotificationHandler(
+    BluetoothHandsfreeNotificationHandler* aNotificationHandler);
+
+  //
+  // Commands
+  //
+
+  nsresult ConnectCmd(const nsAString& aBdAddr,
+                      BluetoothHandsfreeResultHandler* aRes);
+  nsresult DisconnectCmd(const nsAString& aBdAddr,
+                         BluetoothHandsfreeResultHandler* aRes);
+  nsresult ConnectAudioCmd(const nsAString& aBdAddr,
+                           BluetoothHandsfreeResultHandler* aRes);
+  nsresult DisconnectAudioCmd(const nsAString& aBdAddr,
+                              BluetoothHandsfreeResultHandler* aRes);
+
+  /* Voice Recognition */
+
+  nsresult StartVoiceRecognitionCmd(BluetoothHandsfreeResultHandler* aRes);
+  nsresult StopVoiceRecognitionCmd(BluetoothHandsfreeResultHandler* aRes);
+
+  /* Volume */
+
+  nsresult VolumeControlCmd(BluetoothHandsfreeVolumeType aType, int aVolume,
+                            BluetoothHandsfreeResultHandler* aRes);
+
+  /* Device status */
+
+  nsresult DeviceStatusNotificationCmd(
+    BluetoothHandsfreeNetworkState aNtkState,
+    BluetoothHandsfreeServiceType aSvcType,
+    int aSignal, int aBattChg,
+    BluetoothHandsfreeResultHandler* aRes);
+
+  /* Responses */
+
+  nsresult CopsResponseCmd(const char* aCops,
+                           BluetoothHandsfreeResultHandler* aRes);
+  nsresult CindResponseCmd(int aSvc, int aNumActive, int aNumHeld,
+                           BluetoothHandsfreeCallState aCallSetupState,
+                           int aSignal, int aRoam, int aBattChg,
+                           BluetoothHandsfreeResultHandler* aRes);
+  nsresult FormattedAtResponseCmd(const char* aRsp,
+                                  BluetoothHandsfreeResultHandler* aRes);
+  nsresult AtResponseCmd(BluetoothHandsfreeAtResponse aResponseCode,
+                         int aErrorCode,
+                         BluetoothHandsfreeResultHandler* aRes);
+  nsresult ClccResponseCmd(int aIndex, BluetoothHandsfreeCallDirection aDir,
+                           BluetoothHandsfreeCallState aState,
+                           BluetoothHandsfreeCallMode aMode,
+                           BluetoothHandsfreeCallMptyType aMpty,
+                           const nsAString& aNumber,
+                           BluetoothHandsfreeCallAddressType aType,
+                           BluetoothHandsfreeResultHandler* aRes);
+
+  /* Phone State */
+
+  nsresult PhoneStateChangeCmd(int aNumActive, int aNumHeld,
+                               BluetoothHandsfreeCallState aCallSetupState,
+                               const nsAString& aNumber,
+                               BluetoothHandsfreeCallAddressType aType,
+                               BluetoothHandsfreeResultHandler* aRes);
+
+protected:
+  nsresult Send(BluetoothDaemonPDU* aPDU,
+                BluetoothHandsfreeResultHandler* aRes);
+
+  void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU, void* aUserData);
+
+  //
+  // Responses
+  //
+
+  typedef BluetoothResultRunnable0<BluetoothHandsfreeResultHandler, void>
+    ResultRunnable;
+
+  typedef BluetoothResultRunnable1<BluetoothHandsfreeResultHandler, void,
+                                   BluetoothStatus, BluetoothStatus>
+    ErrorRunnable;
+
+  void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
+                BluetoothDaemonPDU& aPDU,
+                BluetoothHandsfreeResultHandler* aRes);
+
+  void ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
+                  BluetoothDaemonPDU& aPDU,
+                  BluetoothHandsfreeResultHandler* aRes);
+
+  void DisconnectRsp(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU,
+                     BluetoothHandsfreeResultHandler* aRes);
+
+  void ConnectAudioRsp(const BluetoothDaemonPDUHeader& aHeader,
+                       BluetoothDaemonPDU& aPDU,
+                       BluetoothHandsfreeResultHandler* aRes);
+
+  void DisconnectAudioRsp(const BluetoothDaemonPDUHeader& aHeader,
+                          BluetoothDaemonPDU& aPDU,
+                          BluetoothHandsfreeResultHandler* aRes);
+
+  void StartVoiceRecognitionRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                BluetoothDaemonPDU& aPDU,
+                                BluetoothHandsfreeResultHandler* aRes);
+
+  void StopVoiceRecognitionRsp(const BluetoothDaemonPDUHeader& aHeader,
+                               BluetoothDaemonPDU& aPDU,
+                               BluetoothHandsfreeResultHandler* aRes);
+
+  void VolumeControlRsp(const BluetoothDaemonPDUHeader& aHeader,
+                        BluetoothDaemonPDU& aPDU,
+                        BluetoothHandsfreeResultHandler* aRes);
+
+  void DeviceStatusNotificationRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                   BluetoothDaemonPDU& aPDU,
+                                   BluetoothHandsfreeResultHandler* aRes);
+
+  void CopsResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
+                       BluetoothDaemonPDU& aPDU,
+                       BluetoothHandsfreeResultHandler* aRes);
+
+  void CindResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
+                       BluetoothDaemonPDU& aPDU,
+                       BluetoothHandsfreeResultHandler* aRes);
+
+  void FormattedAtResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
+                              BluetoothDaemonPDU& aPDU,
+                              BluetoothHandsfreeResultHandler* aRes);
+
+  void AtResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU,
+                     BluetoothHandsfreeResultHandler* aRes);
+
+  void ClccResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
+                       BluetoothDaemonPDU& aPDU,
+                       BluetoothHandsfreeResultHandler* aRes);
+
+  void PhoneStateChangeRsp(const BluetoothDaemonPDUHeader& aHeader,
+                           BluetoothDaemonPDU& aPDU,
+                           BluetoothHandsfreeResultHandler* aRes);
+
+  void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU,
+                 void* aUserData);
+
+  //
+  // Notifications
+  //
+
+  class NotificationHandlerWrapper;
+
+  typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void,
+                                         BluetoothHandsfreeConnectionState,
+                                         nsString,
+                                         BluetoothHandsfreeConnectionState,
+                                         const nsAString&>
+    ConnectionStateNotification;
+
+  typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void,
+                                         BluetoothHandsfreeAudioState,
+                                         nsString,
+                                         BluetoothHandsfreeAudioState,
+                                         const nsAString&>
+    AudioStateNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+    BluetoothHandsfreeVoiceRecognitionState>
+    VoiceRecognitionNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    AnswerCallNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    HangupCallNotification;
+
+  typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void,
+                                         BluetoothHandsfreeVolumeType, int>
+    VolumeNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         nsString, const nsAString&>
+    DialCallNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         char>
+    DtmfNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         BluetoothHandsfreeNRECState>
+    NRECNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         BluetoothHandsfreeCallHoldType>
+    CallHoldNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    CnumNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    CindNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    CopsNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    ClccNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         nsCString, const nsACString&>
+    UnknownAtNotification;
+
+  typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void>
+    KeyPressedNotification;
+
+  class AudioStateInitOp;
+  class ConnectionStateInitOp;
+  class DialCallInitOp;
+  class VolumeInitOp;
+  class UnknownAtInitOp;
+
+  void ConnectionStateNtf(const BluetoothDaemonPDUHeader& aHeader,
+                          BluetoothDaemonPDU& aPDU);
+
+  void AudioStateNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU);
+
+  void VoiceRecognitionNtf(const BluetoothDaemonPDUHeader& aHeader,
+                           BluetoothDaemonPDU& aPDU);
+
+  void AnswerCallNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU);
+
+  void HangupCallNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU);
+
+  void VolumeNtf(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU);
+
+  void DialCallNtf(const BluetoothDaemonPDUHeader& aHeader,
+                   BluetoothDaemonPDU& aPDU);
+
+  void DtmfNtf(const BluetoothDaemonPDUHeader& aHeader,
+               BluetoothDaemonPDU& aPDU);
+
+  void NRECNtf(const BluetoothDaemonPDUHeader& aHeader,
+               BluetoothDaemonPDU& aPDU);
+
+  void CallHoldNtf(const BluetoothDaemonPDUHeader& aHeader,
+                   BluetoothDaemonPDU& aPDU);
+
+  void CnumNtf(const BluetoothDaemonPDUHeader& aHeader,
+               BluetoothDaemonPDU& aPDU);
+
+  void CindNtf(const BluetoothDaemonPDUHeader& aHeader,
+               BluetoothDaemonPDU& aPDU);
+
+  void CopsNtf(const BluetoothDaemonPDUHeader& aHeader,
+               BluetoothDaemonPDU& aPDU);
+
+  void ClccNtf(const BluetoothDaemonPDUHeader& aHeader,
+               BluetoothDaemonPDU& aPDU);
+
+  void UnknownAtNtf(const BluetoothDaemonPDUHeader& aHeader,
+                    BluetoothDaemonPDU& aPDU);
+
+  void KeyPressedNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU);
+
+  void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU,
+                 void* aUserData);
+
+  static BluetoothHandsfreeNotificationHandler* sNotificationHandler;
+};
+
+class BluetoothDaemonHandsfreeInterface MOZ_FINAL
+  : public BluetoothHandsfreeInterface
+{
+  class CleanupResultHandler;
+  class InitResultHandler;
+
+  enum {
+    MODE_HEADSET = 0x00,
+    MODE_NARROWBAND_SPEECH = 0x01,
+    MODE_NARRAWBAND_WIDEBAND_SPEECH = 0x02
+  };
+
+public:
+  BluetoothDaemonHandsfreeInterface(BluetoothDaemonHandsfreeModule* aModule);
+  ~BluetoothDaemonHandsfreeInterface();
+
+  void Init(
+    BluetoothHandsfreeNotificationHandler* aNotificationHandler,
+    BluetoothHandsfreeResultHandler* aRes);
+  void Cleanup(BluetoothHandsfreeResultHandler* aRes);
+
+  /* Connect / Disconnect */
+
+  void Connect(const nsAString& aBdAddr,
+               BluetoothHandsfreeResultHandler* aRes);
+  void Disconnect(const nsAString& aBdAddr,
+                  BluetoothHandsfreeResultHandler* aRes);
+  void ConnectAudio(const nsAString& aBdAddr,
+                    BluetoothHandsfreeResultHandler* aRes);
+  void DisconnectAudio(const nsAString& aBdAddr,
+                       BluetoothHandsfreeResultHandler* aRes);
+
+  /* Voice Recognition */
+
+  void StartVoiceRecognition(BluetoothHandsfreeResultHandler* aRes);
+  void StopVoiceRecognition(BluetoothHandsfreeResultHandler* aRes);
+
+  /* Volume */
+
+  void VolumeControl(BluetoothHandsfreeVolumeType aType, int aVolume,
+                     BluetoothHandsfreeResultHandler* aRes);
+
+  /* Device status */
+
+  void DeviceStatusNotification(BluetoothHandsfreeNetworkState aNtkState,
+                                BluetoothHandsfreeServiceType aSvcType,
+                                int aSignal, int aBattChg,
+                                BluetoothHandsfreeResultHandler* aRes);
+
+  /* Responses */
+
+  void CopsResponse(const char* aCops,
+                    BluetoothHandsfreeResultHandler* aRes);
+  void CindResponse(int aSvc, int aNumActive, int aNumHeld,
+                    BluetoothHandsfreeCallState aCallSetupState,
+                    int aSignal, int aRoam, int aBattChg,
+                    BluetoothHandsfreeResultHandler* aRes);
+  void FormattedAtResponse(const char* aRsp,
+                           BluetoothHandsfreeResultHandler* aRes);
+  void AtResponse(BluetoothHandsfreeAtResponse aResponseCode, int aErrorCode,
+                  BluetoothHandsfreeResultHandler* aRes);
+  void ClccResponse(int aIndex, BluetoothHandsfreeCallDirection aDir,
+                    BluetoothHandsfreeCallState aState,
+                    BluetoothHandsfreeCallMode aMode,
+                    BluetoothHandsfreeCallMptyType aMpty,
+                    const nsAString& aNumber,
+                    BluetoothHandsfreeCallAddressType aType,
+                    BluetoothHandsfreeResultHandler* aRes);
+
+  /* Phone State */
+
+  void PhoneStateChange(int aNumActive, int aNumHeld,
+                        BluetoothHandsfreeCallState aCallSetupState,
+                        const nsAString& aNumber,
+                        BluetoothHandsfreeCallAddressType aType,
+                        BluetoothHandsfreeResultHandler* aRes);
+
+private:
+  void DispatchError(BluetoothHandsfreeResultHandler* aRes,
+                     BluetoothStatus aStatus);
+
+  BluetoothDaemonHandsfreeModule* mModule;
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -46,6 +46,18 @@
 }
 
 nsresult
+Convert(int aIn, uint8_t& aOut)
+{
+  if (NS_WARN_IF(aIn < std::numeric_limits<uint8_t>::min()) ||
+      NS_WARN_IF(aIn > std::numeric_limits<uint8_t>::max())) {
+    aOut = 0; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = static_cast<uint8_t>(aIn);
+  return NS_OK;
+}
+
+nsresult
 Convert(int aIn, int16_t& aOut)
 {
   if (NS_WARN_IF(aIn < std::numeric_limits<int16_t>::min()) ||
@@ -72,6 +84,20 @@
 }
 
 nsresult
+Convert(uint8_t aIn, char& aOut)
+{
+  aOut = static_cast<char>(aIn);
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, int& aOut)
+{
+  aOut = static_cast<int>(aIn);
+  return NS_OK;
+}
+
+nsresult
 Convert(uint8_t aIn, BluetoothAclState& aOut)
 {
   static const BluetoothAclState sAclState[] = {
@@ -101,6 +127,97 @@
 }
 
 nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeAudioState& aOut)
+{
+  static const BluetoothHandsfreeAudioState sAudioState[] = {
+    CONVERT(0x00, HFP_AUDIO_STATE_DISCONNECTED),
+    CONVERT(0x01, HFP_AUDIO_STATE_CONNECTING),
+    CONVERT(0x02, HFP_AUDIO_STATE_CONNECTED),
+    CONVERT(0x03, HFP_AUDIO_STATE_DISCONNECTING)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sAudioState))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sAudioState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeCallHoldType& aOut)
+{
+  static const BluetoothHandsfreeCallHoldType sCallHoldType[] = {
+    CONVERT(0x00, HFP_CALL_HOLD_RELEASEHELD),
+    CONVERT(0x01, HFP_CALL_HOLD_RELEASEACTIVE_ACCEPTHELD),
+    CONVERT(0x02, HFP_CALL_HOLD_HOLDACTIVE_ACCEPTHELD),
+    CONVERT(0x03, HFP_CALL_HOLD_ADDHELDTOCONF)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sCallHoldType))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sCallHoldType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeConnectionState& aOut)
+{
+  static const BluetoothHandsfreeConnectionState sConnectionState[] = {
+    CONVERT(0x00, HFP_CONNECTION_STATE_DISCONNECTED),
+    CONVERT(0x01, HFP_CONNECTION_STATE_CONNECTING),
+    CONVERT(0x02, HFP_CONNECTION_STATE_CONNECTED),
+    CONVERT(0x03, HFP_CONNECTION_STATE_SLC_CONNECTED),
+    CONVERT(0x04, HFP_CONNECTION_STATE_DISCONNECTING)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sConnectionState))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sConnectionState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeNRECState& aOut)
+{
+  static const BluetoothHandsfreeNRECState sNRECState[] = {
+    CONVERT(0x00, HFP_NREC_STOPPED),
+    CONVERT(0x01, HFP_NREC_STARTED)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sNRECState))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sNRECState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeVoiceRecognitionState& aOut)
+{
+  static const BluetoothHandsfreeVoiceRecognitionState sState[] = {
+    CONVERT(0x00, HFP_VOICE_RECOGNITION_STOPPED),
+    CONVERT(0x01, HFP_VOICE_RECOGNITION_STOPPED)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sState))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeVolumeType& aOut)
+{
+  static const BluetoothHandsfreeVolumeType sVolumeType[] = {
+    CONVERT(0x00, HFP_VOLUME_TYPE_SPEAKER),
+    CONVERT(0x01, HFP_VOLUME_TYPE_MICROPHONE)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sVolumeType))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sVolumeType[aIn];
+  return NS_OK;
+}
+
+nsresult
 Convert(int32_t aIn, BluetoothDeviceType& aOut)
 {
   static const BluetoothDeviceType sDeviceType[] = {
@@ -374,6 +491,147 @@
 }
 
 nsresult
+Convert(BluetoothHandsfreeAtResponse aIn, uint8_t& aOut)
+{
+  static const uint8_t sAtResponse[] = {
+    CONVERT(HFP_AT_RESPONSE_ERROR, 0x00),
+    CONVERT(HFP_AT_RESPONSE_OK, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sAtResponse))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sAtResponse[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeCallAddressType aIn, uint8_t& aOut)
+{
+  static const uint8_t sCallAddressType[] = {
+    CONVERT(HFP_CALL_ADDRESS_TYPE_UNKNOWN, 0x81),
+    CONVERT(HFP_CALL_ADDRESS_TYPE_INTERNATIONAL, 0x91)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sCallAddressType))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sCallAddressType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeCallDirection aIn, uint8_t& aOut)
+{
+  static const uint8_t sCallDirection[] = {
+    CONVERT(HFP_CALL_DIRECTION_OUTGOING, 0x00),
+    CONVERT(HFP_CALL_DIRECTION_INCOMING, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sCallDirection))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sCallDirection[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeCallState aIn, uint8_t& aOut)
+{
+  static const uint8_t sCallState[] = {
+    CONVERT(HFP_CALL_STATE_ACTIVE, 0x00),
+    CONVERT(HFP_CALL_STATE_HELD, 0x01),
+    CONVERT(HFP_CALL_STATE_DIALING, 0x02),
+    CONVERT(HFP_CALL_STATE_ALERTING, 0x03),
+    CONVERT(HFP_CALL_STATE_INCOMING, 0x04),
+    CONVERT(HFP_CALL_STATE_WAITING, 0x05),
+    CONVERT(HFP_CALL_STATE_IDLE, 0x06)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sCallState))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sCallState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeCallMode aIn, uint8_t& aOut)
+{
+  static const uint8_t sCallMode[] = {
+    CONVERT(HFP_CALL_MODE_VOICE, 0x00),
+    CONVERT(HFP_CALL_MODE_DATA, 0x01),
+    CONVERT(HFP_CALL_MODE_FAX, 0x02)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sCallMode))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sCallMode[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeCallMptyType aIn, uint8_t& aOut)
+{
+  static const uint8_t sCallMptyType[] = {
+    CONVERT(HFP_CALL_MPTY_TYPE_SINGLE, 0x00),
+    CONVERT(HFP_CALL_MPTY_TYPE_MULTI, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sCallMptyType))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sCallMptyType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeNetworkState aIn, uint8_t& aOut)
+{
+  static const uint8_t sNetworkState[] = {
+    CONVERT(HFP_NETWORK_STATE_NOT_AVAILABLE, 0x00),
+    CONVERT(HFP_NETWORK_STATE_AVAILABLE, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sNetworkState))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sNetworkState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeServiceType aIn, uint8_t& aOut)
+{
+  static const uint8_t sServiceType[] = {
+    CONVERT(HFP_SERVICE_TYPE_HOME, 0x00),
+    CONVERT(HFP_SERVICE_TYPE_ROAMING, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sServiceType))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sServiceType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothHandsfreeVolumeType aIn, uint8_t& aOut)
+{
+  static const uint8_t sVolumeType[] = {
+    CONVERT(HFP_VOLUME_TYPE_SPEAKER, 0x00),
+    CONVERT(HFP_VOLUME_TYPE_MICROPHONE, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sVolumeType))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sVolumeType[aIn];
+  return NS_OK;
+}
+
+nsresult
 Convert(BluetoothPropertyType aIn, uint8_t& aOut)
 {
   static const uint8_t sPropertyType[] = {
@@ -523,6 +781,69 @@
 }
 
 nsresult
+PackPDU(const BluetoothHandsfreeAtResponse& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeAtResponse, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallAddressType& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeCallAddressType, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallDirection& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeCallDirection, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallMode& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeCallMode, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallMptyType& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeCallMptyType, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallState& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeCallState, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeNetworkState& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeNetworkState, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeServiceType& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeServiceType, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothHandsfreeVolumeType& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackConversion<BluetoothHandsfreeVolumeType, uint8_t>(aIn), aPDU);
+}
+
+nsresult
 PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU)
 {
   nsresult rv = PackPDU(
@@ -608,6 +929,12 @@
 }
 
 nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, char& aOut)
+{
+  return UnpackPDU(aPDU, UnpackConversion<uint8_t, char>(aOut));
+}
+
+nsresult
 UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAclState& aOut)
 {
   return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothAclState>(aOut));
@@ -627,6 +954,50 @@
 }
 
 nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeAudioState& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeAudioState>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeCallHoldType& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeCallHoldType>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeConnectionState& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeConnectionState>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeNRECState& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeNRECState>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU,
+          BluetoothHandsfreeVoiceRecognitionState& aOut)
+{
+  return UnpackPDU(
+    aPDU,
+    UnpackConversion<uint8_t, BluetoothHandsfreeVoiceRecognitionState>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeVolumeType& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeVolumeType>(aOut));
+}
+
+nsresult
 UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothProperty& aOut)
 {
   nsresult rv = UnpackPDU(aPDU, aOut.mType);
@@ -769,4 +1140,64 @@
   return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothStatus>(aOut));
 }
 
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, nsDependentCString& aOut)
+{
+  // We get a pointer to the first character in the PDU, a length
+  // of 1 ensures we consume the \0 byte. With 'str' pointing to
+  // the string in the PDU, we can copy the actual bytes.
+
+  const char* str = reinterpret_cast<const char*>(aPDU.Consume(1));
+  if (NS_WARN_IF(!str)) {
+    return NS_ERROR_ILLEGAL_VALUE; // end of PDU
+  }
+
+  const char* end = static_cast<char*>(memchr(str, '\0', aPDU.GetSize()));
+  if (NS_WARN_IF(!end)) {
+    return NS_ERROR_ILLEGAL_VALUE; // no string terminator
+  }
+
+  ptrdiff_t len = end - str;
+
+  const uint8_t* rest = aPDU.Consume(len);
+  if (NS_WARN_IF(!rest)) {
+    // We couldn't consume bytes that should have been there.
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  aOut.Rebind(str, len);
+
+  return NS_OK;
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackCString0& aOut)
+{
+  nsDependentCString cstring;
+
+  nsresult rv = UnpackPDU(aPDU, cstring);
+  if (NS_FAILED(rv)) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  aOut.mString->AssignASCII(cstring.get(), cstring.Length());
+
+  return NS_OK;
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackString0& aOut)
+{
+  nsDependentCString cstring;
+
+  nsresult rv = UnpackPDU(aPDU, cstring);
+  if (NS_FAILED(rv)) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  *aOut.mString = NS_ConvertUTF8toUTF16(cstring);
+
+  return NS_OK;
+}
+
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h	2014-11-26 21:45:56.000000000 +0000
@@ -104,15 +104,42 @@
 Convert(bool aIn, BluetoothScanMode& aOut);
 
 nsresult
+Convert(int aIn, uint8_t& aOut);
+
+nsresult
 Convert(int aIn, int16_t& aOut);
 
 nsresult
 Convert(uint8_t aIn, bool& aOut);
 
 nsresult
+Convert(uint8_t aIn, char& aOut);
+
+nsresult
+Convert(uint8_t aIn, int& aOut);
+
+nsresult
 Convert(uint8_t aIn, BluetoothAclState& aOut);
 
 nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeAudioState& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeCallHoldType& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeConnectionState& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeNRECState& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeVoiceRecognitionState& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothHandsfreeVolumeType& aOut);
+
+nsresult
 Convert(uint8_t aIn, BluetoothBondState& aOut);
 
 nsresult
@@ -158,6 +185,33 @@
 Convert(const BluetoothAddress& aIn, nsAString& aOut);
 
 nsresult
+Convert(BluetoothHandsfreeAtResponse aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeCallAddressType aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeCallDirection aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeCallState aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeCallMode aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeCallMptyType aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeNetworkState aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeServiceType aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothHandsfreeVolumeType aIn, uint8_t& aOut);
+
+nsresult
 Convert(BluetoothPropertyType aIn, uint8_t& aOut);
 
 nsresult
@@ -216,6 +270,33 @@
 PackPDU(const BluetoothDaemonPDUHeader& aIn, BluetoothDaemonPDU& aPDU);
 
 nsresult
+PackPDU(const BluetoothHandsfreeAtResponse& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallAddressType& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallDirection& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallMode& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallMptyType& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeCallState& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeNetworkState& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeServiceType& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothHandsfreeVolumeType& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
 PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU);
 
 nsresult
@@ -302,6 +383,29 @@
   return aPDU.Write(aIn.mData, aIn.mLength);
 }
 
+/* |PackCString0| is a helper for packing 0-terminated C string,
+ * including the \0 character. Pass an instance of this structure
+ * as the first argument to |PackPDU| to pack a string.
+ */
+struct PackCString0
+{
+  PackCString0(const nsCString& aString)
+  : mString(aString)
+  { }
+
+  const nsCString& mString;
+};
+
+/* This implementation of |PackPDU| packs a 0-terminated C string.
+ */
+inline nsresult
+PackPDU(const PackCString0& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(
+    PackArray<uint8_t>(reinterpret_cast<const uint8_t*>(aIn.mString.get()),
+                       aIn.mString.Length() + 1), aPDU);
+}
+
 template <typename T1, typename T2>
 inline nsresult
 PackPDU(const T1& aIn1, const T2& aIn2, BluetoothDaemonPDU& aPDU)
@@ -375,6 +479,41 @@
   return PackPDU(aIn5, aPDU);
 }
 
+template <typename T1, typename T2, typename T3,
+          typename T4, typename T5, typename T6,
+          typename T7>
+inline nsresult
+PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
+        const T4& aIn4, const T5& aIn5, const T6& aIn6,
+        const T7& aIn7, BluetoothDaemonPDU& aPDU)
+{
+  nsresult rv = PackPDU(aIn1, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn2, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn3, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn4, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn5, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn6, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return PackPDU(aIn7, aPDU);
+}
+
 //
 // Unpacking
 //
@@ -413,6 +552,9 @@
 UnpackPDU(BluetoothDaemonPDU& aPDU, bool& aOut);
 
 nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, char& aOut);
+
+nsresult
 UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAclState& aOut);
 
 inline nsresult
@@ -442,6 +584,25 @@
 UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothDeviceType& aOut);
 
 nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeAudioState& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeCallHoldType& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeConnectionState& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeNRECState& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU,
+          BluetoothHandsfreeVoiceRecognitionState& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeVolumeType& aOut);
+
+nsresult
 UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteInfo& aOut);
 
 inline nsresult
@@ -474,6 +635,9 @@
   return aPDU.Read(aOut.mUuid, sizeof(aOut.mUuid));
 }
 
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, nsDependentCString& aOut);
+
 /* |UnpackConversion| is a helper for convering unpacked values. Pass
  * an instance of this structure to |UnpackPDU| to read a value from
  * the PDU in the input type and convert it to the output type.
@@ -565,6 +729,44 @@
   return NS_OK;
 }
 
+/* |UnpackCString0| is a helper for unpacking 0-terminated C string,
+ * including the \0 character. Pass an instance of this structure
+ * as the first argument to |UnpackPDU| to unpack a string.
+ */
+struct UnpackCString0
+{
+  UnpackCString0(nsCString& aString)
+    : mString(&aString)
+  { }
+
+  nsCString* mString; // non-null by construction
+};
+
+/* This implementation of |UnpackPDU| unpacks a 0-terminated C string.
+ */
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackCString0& aOut);
+
+/* |UnpackString0| is a helper for unpacking 0-terminated C string,
+ * including the \0 character. Pass an instance of this structure
+ * as the first argument to |UnpackPDU| to unpack a C string and convert
+ * it to wide-character encoding.
+ */
+struct UnpackString0
+{
+  UnpackString0(nsString& aString)
+    : mString(&aString)
+  { }
+
+  nsString* mString; // non-null by construction
+};
+
+/* This implementation of |UnpackPDU| unpacks a 0-terminated C string
+ * and converts it to wide-character encoding.
+ */
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackString0& aOut);
+
 //
 // Init operators
 //
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "BluetoothDaemonInterface.h"
+#include "BluetoothDaemonHandsfreeInterface.h"
 #include "BluetoothDaemonHelpers.h"
 #include "BluetoothDaemonSetupInterface.h"
 #include "BluetoothDaemonSocketInterface.h"
@@ -15,10 +16,6 @@
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-template<class T>
-struct interface_traits
-{ };
-
 //
 // Protocol initialization and setup
 //
@@ -1363,10 +1360,17 @@
   , public BluetoothDaemonSetupModule
   , public BluetoothDaemonCoreModule
   , public BluetoothDaemonSocketModule
+  , public BluetoothDaemonHandsfreeModule
 {
 public:
   BluetoothDaemonProtocol(BluetoothDaemonConnection* aConnection);
 
+  nsresult RegisterModule(uint8_t aId, uint8_t aMode,
+                          BluetoothSetupResultHandler* aRes) MOZ_OVERRIDE;
+
+  nsresult UnregisterModule(uint8_t aId,
+                            BluetoothSetupResultHandler* aRes) MOZ_OVERRIDE;
+
   // Outgoing PDUs
   //
 
@@ -1388,6 +1392,8 @@
                      BluetoothDaemonPDU& aPDU, void* aUserData);
   void HandleSocketSvc(const BluetoothDaemonPDUHeader& aHeader,
                        BluetoothDaemonPDU& aPDU, void* aUserData);
+  void HandleHandsfreeSvc(const BluetoothDaemonPDUHeader& aHeader,
+                          BluetoothDaemonPDU& aPDU, void* aUserData);
 
   BluetoothDaemonConnection* mConnection;
   nsTArray<void*> mUserDataQ;
@@ -1401,6 +1407,20 @@
 }
 
 nsresult
+BluetoothDaemonProtocol::RegisterModule(uint8_t aId, uint8_t aMode,
+                                        BluetoothSetupResultHandler* aRes)
+{
+  return BluetoothDaemonSetupModule::RegisterModuleCmd(aId, aMode, aRes);
+}
+
+nsresult
+BluetoothDaemonProtocol::UnregisterModule(uint8_t aId,
+                                          BluetoothSetupResultHandler* aRes)
+{
+  return BluetoothDaemonSetupModule::UnregisterModuleCmd(aId, aRes);
+}
+
+nsresult
 BluetoothDaemonProtocol::Send(BluetoothDaemonPDU* aPDU, void* aUserData)
 {
   MOZ_ASSERT(aPDU);
@@ -1435,13 +1455,25 @@
 }
 
 void
+BluetoothDaemonProtocol::HandleHandsfreeSvc(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  void* aUserData)
+{
+  BluetoothDaemonHandsfreeModule::HandleSvc(aHeader, aPDU, aUserData);
+}
+
+void
 BluetoothDaemonProtocol::Handle(BluetoothDaemonPDU& aPDU)
 {
   static void (BluetoothDaemonProtocol::* const HandleSvc[])(
     const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
     INIT_ARRAY_AT(0x00, &BluetoothDaemonProtocol::HandleSetupSvc),
     INIT_ARRAY_AT(0x01, &BluetoothDaemonProtocol::HandleCoreSvc),
-    INIT_ARRAY_AT(0x02, &BluetoothDaemonProtocol::HandleSocketSvc)
+    INIT_ARRAY_AT(0x02, &BluetoothDaemonProtocol::HandleSocketSvc),
+    INIT_ARRAY_AT(0x03, nullptr), // HID host
+    INIT_ARRAY_AT(0x04, nullptr), // PAN
+    INIT_ARRAY_AT(BluetoothDaemonHandsfreeModule::SERVICE_ID,
+      &BluetoothDaemonProtocol::HandleHandsfreeSvc)
   };
 
   BluetoothDaemonPDUHeader header;
@@ -2009,7 +2041,13 @@
 BluetoothHandsfreeInterface*
 BluetoothDaemonInterface::GetBluetoothHandsfreeInterface()
 {
-  return nullptr;
+  if (mHandsfreeInterface) {
+    return mHandsfreeInterface;
+  }
+
+  mHandsfreeInterface = new BluetoothDaemonHandsfreeInterface(mProtocol);
+
+  return mHandsfreeInterface;
 }
 
 BluetoothA2dpInterface*
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h	2014-11-26 21:45:56.000000000 +0000
@@ -12,6 +12,7 @@
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothDaemonChannel;
+class BluetoothDaemonHandsfreeInterface;
 class BluetoothDaemonProtocol;
 class BluetoothDaemonSocketInterface;
 
@@ -125,6 +126,7 @@
   nsTArray<nsRefPtr<BluetoothResultHandler> > mResultHandlerQ;
 
   nsAutoPtr<BluetoothDaemonSocketInterface> mSocketInterface;
+  nsAutoPtr<BluetoothDaemonHandsfreeInterface> mHandsfreeInterface;
 };
 
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -64,126 +64,10 @@
 static uint32_t sAdapterDiscoverableTimeout(0);
 
 /**
- *  Classes only used in this file
- */
-
-class SetupAfterEnabledTask MOZ_FINAL : public nsRunnable
-{
-public:
-  class SetAdapterPropertyResultHandler MOZ_FINAL
-  : public BluetoothResultHandler
-  {
-  public:
-    void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
-    {
-      BT_LOGR("Fail to set: BT_SCAN_MODE_CONNECTABLE");
-    }
-  };
-
-  NS_IMETHOD
-  Run()
-  {
-    MOZ_ASSERT(NS_IsMainThread());
-
-    // Bluetooth just enabled, clear profile controllers and runnable arrays.
-    sControllerArray.Clear();
-    sBondingRunnableArray.Clear();
-    sGetDeviceRunnableArray.Clear();
-    sSetPropertyRunnableArray.Clear();
-    sUnbondingRunnableArray.Clear();
-
-    // Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., It should
-    // be connectable and non-discoverable.
-    NS_ENSURE_TRUE(sBtInterface, NS_ERROR_FAILURE);
-    sBtInterface->SetAdapterProperty(
-      BluetoothNamedValue(NS_ConvertUTF8toUTF16("Discoverable"), false),
-      new SetAdapterPropertyResultHandler());
-
-    // Try to fire event 'AdapterAdded' to fit the original behaviour when
-    // we used BlueZ as backend.
-    BluetoothService* bs = BluetoothService::Get();
-    NS_ENSURE_TRUE(bs, NS_ERROR_FAILURE);
-
-    bs->AdapterAddedReceived();
-    bs->TryFiringAdapterAdded();
-
-    // Trigger BluetoothOppManager to listen
-    BluetoothOppManager* opp = BluetoothOppManager::Get();
-    if (!opp || !opp->Listen()) {
-      BT_LOGR("Fail to start BluetoothOppManager listening");
-    }
-
-    return NS_OK;
-  }
-};
-
-/* |ProfileDeinitResultHandler| collect the results of all profile
- * result handlers and calls |Proceed| after all results handlers
- * have been run.
- */
-class ProfileDeinitResultHandler MOZ_FINAL
-: public BluetoothProfileResultHandler
-{
-public:
-  ProfileDeinitResultHandler(unsigned char aNumProfiles)
-  : mNumProfiles(aNumProfiles)
-  {
-    MOZ_ASSERT(mNumProfiles);
-  }
-
-  void Deinit() MOZ_OVERRIDE
-  {
-    if (!(--mNumProfiles)) {
-      Proceed();
-    }
-  }
-
-  void OnError(nsresult aResult) MOZ_OVERRIDE
-  {
-    if (!(--mNumProfiles)) {
-      Proceed();
-    }
-  }
-
-private:
-  void Proceed() const
-  {
-    sBtInterface->Cleanup(nullptr);
-  }
-
-  unsigned char mNumProfiles;
-};
-
-class CleanupTask MOZ_FINAL : public nsRunnable
-{
-public:
-  NS_IMETHOD
-  Run()
-  {
-    static void (* const sDeinitManager[])(BluetoothProfileResultHandler*) = {
-      BluetoothHfpManager::DeinitHfpInterface,
-      BluetoothA2dpManager::DeinitA2dpInterface
-    };
-
-    MOZ_ASSERT(NS_IsMainThread());
-
-    // Cleanup bluetooth interfaces after BT state becomes BT_STATE_OFF.
-    nsRefPtr<ProfileDeinitResultHandler> res =
-      new ProfileDeinitResultHandler(MOZ_ARRAY_LENGTH(sDeinitManager));
-
-    for (size_t i = 0; i < MOZ_ARRAY_LENGTH(sDeinitManager); ++i) {
-      sDeinitManager[i](res);
-    }
-
-    return NS_OK;
-  }
-};
-
-/**
  *  Static callback functions
  */
-static void
-ClassToIcon(uint32_t aClass, nsAString& aRetIcon)
+void
+BluetoothServiceBluedroid::ClassToIcon(uint32_t aClass, nsAString& aRetIcon)
 {
   switch ((aClass & 0x1f00) >> 8) {
     case 0x01:
@@ -273,8 +157,9 @@
   }
 }
 
-static ControlPlayStatus
-PlayStatusStringToControlPlayStatus(const nsAString& aPlayStatus)
+ControlPlayStatus
+BluetoothServiceBluedroid::PlayStatusStringToControlPlayStatus(
+  const nsAString& aPlayStatus)
 {
   ControlPlayStatus playStatus = ControlPlayStatus::PLAYSTATUS_UNKNOWN;
   if (aPlayStatus.EqualsLiteral("STOPPED")) {
@@ -297,8 +182,8 @@
 /**
  *  Static functions
  */
-static bool
-EnsureBluetoothHalLoad()
+bool
+BluetoothServiceBluedroid::EnsureBluetoothHalLoad()
 {
   sBtInterface = BluetoothInterface::GetInstance();
   NS_ENSURE_TRUE(sBtInterface, false);
@@ -306,7 +191,8 @@
   return true;
 }
 
-class EnableResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::EnableResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@@ -315,10 +201,7 @@
 
     BT_LOGR("BluetoothInterface::Enable failed: %d", aStatus);
 
-    nsRefPtr<nsRunnable> runnable = new BluetoothService::ToggleBtAck(false);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(false);
   }
 };
 
@@ -326,7 +209,7 @@
  * result handlers and calls |Proceed| after all results handlers
  * have been run.
  */
-class ProfileInitResultHandler MOZ_FINAL
+class BluetoothServiceBluedroid::ProfileInitResultHandler MOZ_FINAL
 : public BluetoothProfileResultHandler
 {
 public:
@@ -359,7 +242,8 @@
   unsigned char mNumProfiles;
 };
 
-class InitResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::InitResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   void Init() MOZ_OVERRIDE
@@ -390,15 +274,12 @@
 
     sBtInterface = nullptr;
 
-    nsRefPtr<nsRunnable> runnable = new BluetoothService::ToggleBtAck(false);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(false);
   }
 };
 
-static nsresult
-StartGonkBluetooth()
+nsresult
+BluetoothServiceBluedroid::StartGonkBluetooth()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -409,10 +290,7 @@
 
   if (bs->IsEnabled()) {
     // Keep current enable status
-    nsRefPtr<nsRunnable> runnable = new BluetoothService::ToggleBtAck(true);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(true);
     return NS_OK;
   }
 
@@ -422,7 +300,8 @@
   return NS_OK;
 }
 
-class DisableResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::DisableResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
@@ -431,15 +310,12 @@
 
     BT_LOGR("BluetoothInterface::Disable failed: %d", aStatus);
 
-    nsRefPtr<nsRunnable> runnable = new BluetoothService::ToggleBtAck(true);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(true);
   }
 };
 
-static nsresult
-StopGonkBluetooth()
+nsresult
+BluetoothServiceBluedroid::StopGonkBluetooth()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -450,10 +326,7 @@
 
   if (!bs->IsEnabled()) {
     // Keep current enable status
-    nsRefPtr<nsRunnable> runnable = new BluetoothService::ToggleBtAck(false);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(false);
     return NS_OK;
   }
 
@@ -513,11 +386,7 @@
 
   nsresult ret = StartGonkBluetooth();
   if (NS_FAILED(ret)) {
-    nsRefPtr<nsRunnable> runnable =
-      new BluetoothService::ToggleBtAck(false);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(false);
     BT_LOGR("Error");
   }
 
@@ -531,11 +400,7 @@
 
   nsresult ret = StopGonkBluetooth();
   if (NS_FAILED(ret)) {
-    nsRefPtr<nsRunnable> runnable =
-      new BluetoothService::ToggleBtAck(true);
-    if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-      BT_WARNING("Failed to dispatch to main thread!");
-    }
+    BluetoothService::AcknowledgeToggleBt(true);
     BT_LOGR("Error");
   }
 
@@ -575,8 +440,8 @@
   return NS_OK;
 }
 
-class GetRemoteDevicePropertiesResultHandler MOZ_FINAL
-: public BluetoothResultHandler
+class BluetoothServiceBluedroid::GetRemoteDevicePropertiesResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   GetRemoteDevicePropertiesResultHandler(const nsAString& aDeviceAddress)
@@ -677,7 +542,8 @@
   return NS_OK;
 }
 
-class StartDiscoveryResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::StartDiscoveryResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   StartDiscoveryResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -712,7 +578,8 @@
   return NS_OK;
 }
 
-class CancelDiscoveryResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::CancelDiscoveryResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   CancelDiscoveryResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -747,7 +614,8 @@
   return NS_OK;
 }
 
-class SetAdapterPropertyResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::SetAdapterPropertyResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   SetAdapterPropertyResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -796,7 +664,8 @@
   return true;
 }
 
-class CreateBondResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::CreateBondResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   CreateBondResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -830,7 +699,8 @@
   return NS_OK;
 }
 
-class RemoveBondResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::RemoveBondResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   RemoveBondResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -863,7 +733,8 @@
   return NS_OK;
 }
 
-class PinReplyResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::PinReplyResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   PinReplyResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -907,7 +778,8 @@
   return true;
 }
 
-class SspReplyResultHandler MOZ_FINAL : public BluetoothResultHandler
+class BluetoothServiceBluedroid::SspReplyResultHandler MOZ_FINAL
+  : public BluetoothResultHandler
 {
 public:
   SspReplyResultHandler(BluetoothReplyRunnable* aRunnable)
@@ -1230,6 +1102,54 @@
 // Bluetooth notifications
 //
 
+/* |ProfileDeinitResultHandler| collect the results of all profile
+ * result handlers and calls |Proceed| after all results handlers
+ * have been run.
+ */
+class BluetoothServiceBluedroid::ProfileDeinitResultHandler MOZ_FINAL
+: public BluetoothProfileResultHandler
+{
+public:
+  ProfileDeinitResultHandler(unsigned char aNumProfiles)
+  : mNumProfiles(aNumProfiles)
+  {
+    MOZ_ASSERT(mNumProfiles);
+  }
+
+  void Deinit() MOZ_OVERRIDE
+  {
+    if (!(--mNumProfiles)) {
+      Proceed();
+    }
+  }
+
+  void OnError(nsresult aResult) MOZ_OVERRIDE
+  {
+    if (!(--mNumProfiles)) {
+      Proceed();
+    }
+  }
+
+private:
+  void Proceed() const
+  {
+    sBtInterface->Cleanup(nullptr);
+  }
+
+  unsigned char mNumProfiles;
+};
+
+class BluetoothServiceBluedroid::SetAdapterPropertyDiscoverableResultHandler
+  MOZ_FINAL
+  : public BluetoothResultHandler
+{
+public:
+  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    BT_LOGR("Fail to set: BT_SCAN_MODE_CONNECTABLE");
+  }
+};
+
 void
 BluetoothServiceBluedroid::AdapterStateChangedNotification(bool aState)
 {
@@ -1239,23 +1159,51 @@
 
   bool isBtEnabled = (aState == true);
 
-  if (!isBtEnabled &&
-      NS_FAILED(NS_DispatchToMainThread(new CleanupTask()))) {
-    BT_WARNING("Failed to dispatch to main thread!");
-    return;
-  }
+  if (!isBtEnabled) {
+    static void (* const sDeinitManager[])(BluetoothProfileResultHandler*) = {
+      BluetoothHfpManager::DeinitHfpInterface,
+      BluetoothA2dpManager::DeinitA2dpInterface
+    };
 
-  nsRefPtr<nsRunnable> runnable =
-    new BluetoothService::ToggleBtAck(isBtEnabled);
-  if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
-    BT_WARNING("Failed to dispatch to main thread!");
-    return;
+    // Cleanup bluetooth interfaces after BT state becomes BT_STATE_OFF.
+    nsRefPtr<ProfileDeinitResultHandler> res =
+      new ProfileDeinitResultHandler(MOZ_ARRAY_LENGTH(sDeinitManager));
+
+    for (size_t i = 0; i < MOZ_ARRAY_LENGTH(sDeinitManager); ++i) {
+      sDeinitManager[i](res);
+    }
   }
 
-  if (isBtEnabled &&
-      NS_FAILED(NS_DispatchToMainThread(new SetupAfterEnabledTask()))) {
-    BT_WARNING("Failed to dispatch to main thread!");
-    return;
+  BluetoothService::AcknowledgeToggleBt(isBtEnabled);
+
+  if (isBtEnabled) {
+    // Bluetooth just enabled, clear profile controllers and runnable arrays.
+    sControllerArray.Clear();
+    sBondingRunnableArray.Clear();
+    sGetDeviceRunnableArray.Clear();
+    sSetPropertyRunnableArray.Clear();
+    sUnbondingRunnableArray.Clear();
+
+    // Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., It should
+    // be connectable and non-discoverable.
+    NS_ENSURE_TRUE_VOID(sBtInterface);
+    sBtInterface->SetAdapterProperty(
+      BluetoothNamedValue(NS_ConvertUTF8toUTF16("Discoverable"), false),
+      new SetAdapterPropertyDiscoverableResultHandler());
+
+    // Try to fire event 'AdapterAdded' to fit the original behaviour when
+    // we used BlueZ as backend.
+    BluetoothService* bs = BluetoothService::Get();
+    NS_ENSURE_TRUE_VOID(bs);
+
+    bs->AdapterAddedReceived();
+    bs->TryFiringAdapterAdded();
+
+    // Trigger BluetoothOppManager to listen
+    BluetoothOppManager* opp = BluetoothOppManager::Get();
+    if (!opp || !opp->Listen()) {
+      BT_LOGR("Fail to start BluetoothOppManager listening");
+    }
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h	2014-11-26 21:45:56.000000000 +0000
@@ -16,6 +16,21 @@
 class BluetoothServiceBluedroid : public BluetoothService
                                 , public BluetoothNotificationHandler
 {
+  class CancelDiscoveryResultHandler;
+  class CreateBondResultHandler;
+  class DisableResultHandler;
+  class EnableResultHandler;
+  class GetRemoteDevicePropertiesResultHandler;
+  class InitResultHandler;
+  class PinReplyResultHandler;
+  class ProfileDeinitResultHandler;
+  class ProfileInitResultHandler;
+  class RemoveBondResultHandler;
+  class SetAdapterPropertyDiscoverableResultHandler;
+  class SetAdapterPropertyResultHandler;
+  class SspReplyResultHandler;
+  class StartDiscoveryResultHandler;
+
 public:
   BluetoothServiceBluedroid();
   ~BluetoothServiceBluedroid();
@@ -196,6 +211,16 @@
                                        uint8_t aLen) MOZ_OVERRIDE;
   virtual void LeTestModeNotification(BluetoothStatus aStatus,
                                       uint16_t aNumPackets) MOZ_OVERRIDE;
+
+protected:
+  static nsresult StartGonkBluetooth();
+  static nsresult StopGonkBluetooth();
+  static bool EnsureBluetoothHalLoad();
+
+  static void ClassToIcon(uint32_t aClass, nsAString& aRetIcon);
+
+  static ControlPlayStatus PlayStatusStringToControlPlayStatus(
+    const nsAString& aPlayStatus);
 };
 
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/BluetoothService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/BluetoothService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/BluetoothService.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/BluetoothService.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -146,41 +146,7 @@
 NS_METHOD
 BluetoothService::ToggleBtAck::Run()
 {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // This is requested in Bug 836516. With settings this property, WLAN
-  // firmware could be aware of Bluetooth has been turned on/off, so that the
-  // mecahnism of handling coexistence of WIFI and Bluetooth could be started.
-  //
-  // In the future, we may have our own way instead of setting a system
-  // property to let firmware developers be able to sense that Bluetooth has
-  // been toggled.
-#if defined(MOZ_WIDGET_GONK)
-  if (property_set(PROP_BLUETOOTH_ENABLED, mEnabled ? "true" : "false") != 0) {
-    BT_WARNING("Failed to set bluetooth enabled property");
-  }
-#endif
-
-  NS_ENSURE_TRUE(sBluetoothService, NS_OK);
-
-  if (sInShutdown) {
-    sBluetoothService = nullptr;
-    return NS_OK;
-  }
-
-  // Update mEnabled of BluetoothService object since
-  // StartInternal/StopInternal have been already done.
-  sBluetoothService->SetEnabled(mEnabled);
-  sToggleInProgress = false;
-
-  nsAutoString signalName;
-  signalName = mEnabled ? NS_LITERAL_STRING("Enabled")
-                        : NS_LITERAL_STRING("Disabled");
-  BluetoothSignal signal(signalName, NS_LITERAL_STRING(KEY_MANAGER), true);
-  sBluetoothService->DistributeSignal(signal);
-
-  // Event 'AdapterAdded' has to be fired after firing 'Enabled'
-  sBluetoothService->TryFiringAdapterAdded();
+  BluetoothService::AcknowledgeToggleBt(mEnabled);
 
   return NS_OK;
 }
@@ -803,3 +769,53 @@
   systemMessenger->BroadcastMessage(type, value,
                                     JS::UndefinedHandleValue);
 }
+
+void
+BluetoothService::AcknowledgeToggleBt(bool aEnabled)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+#if defined(MOZ_WIDGET_GONK)
+  // This is requested in Bug 836516. With settings this property, WLAN
+  // firmware could be aware of Bluetooth has been turned on/off, so that
+  // the mechanism of handling coexistence of WIFI and Bluetooth could be
+  // started.
+  //
+  // In the future, we may have our own way instead of setting a system
+  // property to let firmware developers be able to sense that Bluetooth
+  // has been toggled.
+  if (property_set(PROP_BLUETOOTH_ENABLED, aEnabled ? "true" : "false") != 0) {
+    BT_WARNING("Failed to set bluetooth enabled property");
+  }
+#endif
+
+  if (sInShutdown) {
+    sBluetoothService = nullptr;
+    return;
+  }
+
+  NS_ENSURE_TRUE_VOID(sBluetoothService);
+
+  sBluetoothService->CompleteToggleBt(aEnabled);
+}
+
+void
+BluetoothService::CompleteToggleBt(bool aEnabled)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Update |mEnabled| of |BluetoothService| object since
+  // |StartInternal| and |StopInternal| have been already
+  // done.
+  SetEnabled(aEnabled);
+  sToggleInProgress = false;
+
+  nsAutoString signalName;
+  signalName = aEnabled ? NS_LITERAL_STRING("Enabled")
+                        : NS_LITERAL_STRING("Disabled");
+  BluetoothSignal signal(signalName, NS_LITERAL_STRING(KEY_MANAGER), true);
+  DistributeSignal(signal);
+
+  // Event 'AdapterAdded' has to be fired after firing 'Enabled'
+  TryFiringAdapterAdded();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/BluetoothService.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/BluetoothService.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/BluetoothService.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/BluetoothService.h	2014-11-26 21:45:56.000000000 +0000
@@ -313,6 +313,8 @@
   bool
   IsToggling() const;
 
+  static void AcknowledgeToggleBt(bool aEnabled);
+
   /**
    * Below 2 function/variable are used for ensuring event 'AdapterAdded' will
    * be fired after event 'Enabled'.
@@ -393,6 +395,8 @@
   static BluetoothService*
   Create();
 
+  void CompleteToggleBt(bool aEnabled);
+
   typedef nsClassHashtable<nsStringHashKey, BluetoothSignalObserverList >
   BluetoothSignalObserverTable;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth/moz.build	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth/moz.build	2014-11-26 21:45:56.000000000 +0000
@@ -48,6 +48,7 @@
                 'bluedroid/BluetoothA2dpHALInterface.cpp',
                 'bluedroid/BluetoothA2dpManager.cpp',
                 'bluedroid/BluetoothAvrcpHALInterface.cpp',
+                'bluedroid/BluetoothDaemonHandsfreeInterface.cpp',
                 'bluedroid/BluetoothDaemonHelpers.cpp',
                 'bluedroid/BluetoothDaemonInterface.cpp',
                 'bluedroid/BluetoothDaemonSetupInterface.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,756 @@
+/* -*- 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 "BluetoothDaemonHelpers.h"
+#include <limits>
+
+#define MAX_UUID_SIZE 16
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Conversion
+//
+
+nsresult
+Convert(bool aIn, uint8_t& aOut)
+{
+  static const bool sValue[] = {
+    CONVERT(false, 0x00),
+    CONVERT(true, 0x01)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sValue))) {
+    aOut = 0;
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sValue[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(bool aIn, BluetoothScanMode& aOut)
+{
+  static const BluetoothScanMode sScanMode[] = {
+    CONVERT(false, SCAN_MODE_CONNECTABLE),
+    CONVERT(true, SCAN_MODE_CONNECTABLE_DISCOVERABLE)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sScanMode))) {
+    aOut = SCAN_MODE_NONE; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sScanMode[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(int aIn, int16_t& aOut)
+{
+  if (NS_WARN_IF(aIn < std::numeric_limits<int16_t>::min()) ||
+      NS_WARN_IF(aIn > std::numeric_limits<int16_t>::max())) {
+    aOut = 0; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = static_cast<int16_t>(aIn);
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, bool& aOut)
+{
+  static const bool sBool[] = {
+    CONVERT(0x00, false),
+    CONVERT(0x01, true)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sBool))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sBool[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothAclState& aOut)
+{
+  static const BluetoothAclState sAclState[] = {
+    CONVERT(0x00, ACL_STATE_CONNECTED),
+    CONVERT(0x01, ACL_STATE_DISCONNECTED),
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sAclState))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sAclState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothBondState& aOut)
+{
+  static const BluetoothBondState sBondState[] = {
+    CONVERT(0x00, BOND_STATE_NONE),
+    CONVERT(0x01, BOND_STATE_BONDING),
+    CONVERT(0x02, BOND_STATE_BONDED)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sBondState))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sBondState[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(int32_t aIn, BluetoothTypeOfDevice& aOut)
+{
+  static const BluetoothTypeOfDevice sTypeOfDevice[] = {
+    CONVERT(0x00, static_cast<BluetoothTypeOfDevice>(0)), // invalid, required by gcc
+    CONVERT(0x01, TYPE_OF_DEVICE_BREDR),
+    CONVERT(0x02, TYPE_OF_DEVICE_BLE),
+    CONVERT(0x03, TYPE_OF_DEVICE_DUAL)
+  };
+  if (NS_WARN_IF(!aIn) ||
+      NS_WARN_IF(static_cast<size_t>(aIn) >= MOZ_ARRAY_LENGTH(sTypeOfDevice))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sTypeOfDevice[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothPropertyType& aOut)
+{
+  static const BluetoothPropertyType sPropertyType[] = {
+    CONVERT(0x00, static_cast<BluetoothPropertyType>(0)), // invalid, required by gcc
+    CONVERT(0x01, PROPERTY_BDNAME),
+    CONVERT(0x02, PROPERTY_BDADDR),
+    CONVERT(0x03, PROPERTY_UUIDS),
+    CONVERT(0x04, PROPERTY_CLASS_OF_DEVICE),
+    CONVERT(0x05, PROPERTY_TYPE_OF_DEVICE),
+    CONVERT(0x06, PROPERTY_SERVICE_RECORD),
+    CONVERT(0x07, PROPERTY_ADAPTER_SCAN_MODE),
+    CONVERT(0x08, PROPERTY_ADAPTER_BONDED_DEVICES),
+    CONVERT(0x09, PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
+    CONVERT(0x0a, PROPERTY_REMOTE_FRIENDLY_NAME),
+    CONVERT(0x0b, PROPERTY_REMOTE_RSSI),
+    CONVERT(0x0c, PROPERTY_REMOTE_VERSION_INFO)
+  };
+  if (aIn == 0xff) {
+    /* This case is handled separately to not populate
+     * |sPropertyType| with empty entries. */
+    aOut = PROPERTY_REMOTE_DEVICE_TIMESTAMP;
+    return NS_OK;
+  }
+  if (NS_WARN_IF(!aIn) ||
+      NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sPropertyType))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sPropertyType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothSocketType aIn, uint8_t& aOut)
+{
+  static const uint8_t sSocketType[] = {
+    CONVERT(0, 0), // silences compiler warning
+    CONVERT(BluetoothSocketType::RFCOMM, 0x01),
+    CONVERT(BluetoothSocketType::SCO, 0x02),
+    CONVERT(BluetoothSocketType::L2CAP, 0x03)
+    // EL2CAP not supported
+  };
+  if (NS_WARN_IF(aIn == BluetoothSocketType::EL2CAP) ||
+      NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sSocketType)) ||
+      NS_WARN_IF(!sSocketType[aIn])) {
+    aOut = 0; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sSocketType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(int32_t aIn, BluetoothScanMode& aOut)
+{
+  static const BluetoothScanMode sScanMode[] = {
+    CONVERT(0x00, SCAN_MODE_NONE),
+    CONVERT(0x01, SCAN_MODE_CONNECTABLE),
+    CONVERT(0x02, SCAN_MODE_CONNECTABLE_DISCOVERABLE)
+  };
+  if (NS_WARN_IF(aIn < 0) ||
+      NS_WARN_IF(static_cast<size_t>(aIn) >= MOZ_ARRAY_LENGTH(sScanMode))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sScanMode[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothSspVariant& aOut)
+{
+  static const BluetoothSspVariant sSspVariant[] = {
+    CONVERT(0x00, SSP_VARIANT_PASSKEY_CONFIRMATION),
+    CONVERT(0x01, SSP_VARIANT_PASSKEY_ENTRY),
+    CONVERT(0x02, SSP_VARIANT_CONSENT),
+    CONVERT(0x03, SSP_VARIANT_PASSKEY_NOTIFICATION)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sSspVariant))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sSspVariant[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint8_t aIn, BluetoothStatus& aOut)
+{
+  static const BluetoothStatus sStatus[] = {
+    CONVERT(0x00, STATUS_SUCCESS),
+    CONVERT(0x01, STATUS_FAIL),
+    CONVERT(0x02, STATUS_NOT_READY),
+    CONVERT(0x03, STATUS_NOMEM),
+    CONVERT(0x04, STATUS_BUSY),
+    CONVERT(0x05, STATUS_DONE),
+    CONVERT(0x06, STATUS_UNSUPPORTED),
+    CONVERT(0x07, STATUS_PARM_INVALID),
+    CONVERT(0x08, STATUS_UNHANDLED),
+    CONVERT(0x09, STATUS_AUTH_FAILURE),
+    CONVERT(0x0a, STATUS_RMT_DEV_DOWN)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sStatus))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sStatus[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(uint32_t aIn, int& aOut)
+{
+  aOut = static_cast<int>(aIn);
+  return NS_OK;
+}
+
+nsresult
+Convert(size_t aIn, uint16_t& aOut)
+{
+  if (NS_WARN_IF(aIn >= (1ul << 16))) {
+    aOut = 0; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = static_cast<uint16_t>(aIn);
+  return NS_OK;
+}
+
+nsresult
+Convert(const nsAString& aIn, BluetoothAddress& aOut)
+{
+  NS_ConvertUTF16toUTF8 bdAddressUTF8(aIn);
+  const char* str = bdAddressUTF8.get();
+
+  for (size_t i = 0; i < MOZ_ARRAY_LENGTH(aOut.mAddr); ++i, ++str) {
+    aOut.mAddr[i] =
+      static_cast<uint8_t>(strtoul(str, const_cast<char**>(&str), 16));
+  }
+
+  return NS_OK;
+}
+
+nsresult
+Convert(const nsAString& aIn, BluetoothPinCode& aOut)
+{
+  if (NS_WARN_IF(aIn.Length() > MOZ_ARRAY_LENGTH(aOut.mPinCode))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  NS_ConvertUTF16toUTF8 pinCodeUTF8(aIn);
+  const char* str = pinCodeUTF8.get();
+
+  nsAString::size_type i;
+
+  // Fill pin into aOut
+  for (i = 0; i < aIn.Length(); ++i, ++str) {
+    aOut.mPinCode[i] = static_cast<uint8_t>(*str);
+  }
+
+  // Clear remaining bytes in aOut
+  size_t ntrailing = (MOZ_ARRAY_LENGTH(aOut.mPinCode) - aIn.Length()) *
+                     sizeof(aOut.mPinCode[0]);
+  memset(aOut.mPinCode + aIn.Length(), 0, ntrailing);
+
+  aOut.mLength = aIn.Length();
+
+  return NS_OK;
+}
+
+nsresult
+Convert(const nsAString& aIn, BluetoothPropertyType& aOut)
+{
+  if (aIn.EqualsLiteral("Name")) {
+    aOut = PROPERTY_BDNAME;
+  } else if (aIn.EqualsLiteral("Discoverable")) {
+    aOut = PROPERTY_ADAPTER_SCAN_MODE;
+  } else if (aIn.EqualsLiteral("DiscoverableTimeout")) {
+    aOut = PROPERTY_ADAPTER_DISCOVERY_TIMEOUT;
+  } else {
+    BT_LOGR("Invalid property name: %s", NS_ConvertUTF16toUTF8(aIn).get());
+    aOut = static_cast<BluetoothPropertyType>(0); // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  return NS_OK;
+}
+
+nsresult
+Convert(const nsAString& aIn, BluetoothServiceName& aOut)
+{
+  NS_ConvertUTF16toUTF8 serviceNameUTF8(aIn);
+  const char* str = serviceNameUTF8.get();
+  size_t len = strlen(str);
+
+  if (NS_WARN_IF(len > sizeof(aOut.mName))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  memcpy(aOut.mName, str, len);
+  memset(aOut.mName + len, 0, sizeof(aOut.mName) - len);
+
+  return NS_OK;
+}
+
+nsresult
+Convert(const nsAString& aIn, BluetoothSspVariant& aOut)
+{
+  if (aIn.EqualsLiteral("PasskeyConfirmation")) {
+    aOut = SSP_VARIANT_PASSKEY_CONFIRMATION;
+  } else if (aIn.EqualsLiteral("PasskeyEntry")) {
+    aOut = SSP_VARIANT_PASSKEY_ENTRY;
+  } else if (aIn.EqualsLiteral("Consent")) {
+    aOut = SSP_VARIANT_CONSENT;
+  } else if (aIn.EqualsLiteral("PasskeyNotification")) {
+    aOut = SSP_VARIANT_PASSKEY_NOTIFICATION;
+  } else {
+    BT_LOGR("Invalid SSP variant name: %s", NS_ConvertUTF16toUTF8(aIn).get());
+    aOut = SSP_VARIANT_PASSKEY_CONFIRMATION; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothAclState aIn, bool& aOut)
+{
+  static const bool sBool[] = {
+    CONVERT(ACL_STATE_CONNECTED, true),
+    CONVERT(ACL_STATE_DISCONNECTED, false)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sBool))) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sBool[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(const BluetoothAddress& aIn, nsAString& aOut)
+{
+  char str[BLUETOOTH_ADDRESS_LENGTH + 1];
+
+  int res = snprintf(str, sizeof(str), "%02x:%02x:%02x:%02x:%02x:%02x",
+                     static_cast<int>(aIn.mAddr[0]),
+                     static_cast<int>(aIn.mAddr[1]),
+                     static_cast<int>(aIn.mAddr[2]),
+                     static_cast<int>(aIn.mAddr[3]),
+                     static_cast<int>(aIn.mAddr[4]),
+                     static_cast<int>(aIn.mAddr[5]));
+  if (NS_WARN_IF(res < 0)) {
+    return NS_ERROR_ILLEGAL_VALUE;
+  } else if (NS_WARN_IF((size_t)res >= sizeof(str))) {
+    return NS_ERROR_OUT_OF_MEMORY; /* string buffer too small */
+  }
+
+  aOut = NS_ConvertUTF8toUTF16(str);
+
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothPropertyType aIn, uint8_t& aOut)
+{
+  static const uint8_t sPropertyType[] = {
+    CONVERT(PROPERTY_UNKNOWN, 0x00),
+    CONVERT(PROPERTY_BDNAME, 0x01),
+    CONVERT(PROPERTY_BDADDR, 0x02),
+    CONVERT(PROPERTY_UUIDS, 0x03),
+    CONVERT(PROPERTY_CLASS_OF_DEVICE, 0x04),
+    CONVERT(PROPERTY_TYPE_OF_DEVICE, 0x05),
+    CONVERT(PROPERTY_SERVICE_RECORD, 0x06),
+    CONVERT(PROPERTY_ADAPTER_SCAN_MODE, 0x07),
+    CONVERT(PROPERTY_ADAPTER_BONDED_DEVICES, 0x08),
+    CONVERT(PROPERTY_ADAPTER_DISCOVERY_TIMEOUT, 0x09),
+    CONVERT(PROPERTY_REMOTE_FRIENDLY_NAME, 0x0a),
+    CONVERT(PROPERTY_REMOTE_RSSI, 0x0b),
+    CONVERT(PROPERTY_REMOTE_VERSION_INFO, 0x0c),
+    CONVERT(PROPERTY_REMOTE_DEVICE_TIMESTAMP, 0xff)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sPropertyType))) {
+    aOut = 0x00; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sPropertyType[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(const BluetoothRemoteName& aIn, nsAString& aOut)
+{
+  // We construct an nsCString here because the string
+  // returned from the PDU is not 0-terminated.
+  aOut = NS_ConvertUTF8toUTF16(
+    nsCString(reinterpret_cast<const char*>(aIn.mName), sizeof(aIn.mName)));
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothScanMode aIn, int32_t& aOut)
+{
+  static const int32_t sScanMode[] = {
+    CONVERT(SCAN_MODE_NONE, 0x00),
+    CONVERT(SCAN_MODE_CONNECTABLE, 0x01),
+    CONVERT(SCAN_MODE_CONNECTABLE_DISCOVERABLE, 0x02)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sScanMode))) {
+    aOut = 0; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sScanMode[aIn];
+  return NS_OK;
+}
+
+nsresult
+Convert(BluetoothSspVariant aIn, uint8_t& aOut)
+{
+  static const uint8_t sValue[] = {
+    CONVERT(SSP_VARIANT_PASSKEY_CONFIRMATION, 0x00),
+    CONVERT(SSP_VARIANT_PASSKEY_ENTRY, 0x01),
+    CONVERT(SSP_VARIANT_CONSENT, 0x02),
+    CONVERT(SSP_VARIANT_PASSKEY_NOTIFICATION, 0x03)
+  };
+  if (NS_WARN_IF(aIn >= MOZ_ARRAY_LENGTH(sValue))) {
+    aOut = 0; // silences compiler warning
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  aOut = sValue[aIn];
+  return NS_OK;
+}
+
+/* |ConvertArray| is a helper for converting arrays. Pass an
+ * instance of this structure as the first argument to |Convert|
+ * to convert an array. The output type has to support the array
+ * subscript operator.
+ */
+template <typename T>
+struct ConvertArray
+{
+  ConvertArray(const T* aData, unsigned long aLength)
+  : mData(aData)
+  , mLength(aLength)
+  { }
+
+  const T* mData;
+  unsigned long mLength;
+};
+
+/* This implementation of |Convert| converts the elements of an
+ * array one-by-one. The result data structures must have enough
+ * memory allocated.
+ */
+template<typename Tin, typename Tout>
+inline nsresult
+Convert(const ConvertArray<Tin>& aIn, Tout& aOut)
+{
+  for (unsigned long i = 0; i < aIn.mLength; ++i) {
+    nsresult rv = Convert(aIn.mData[i], aOut[i]);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+  return NS_OK;
+}
+
+//
+// Packing
+//
+
+nsresult
+PackPDU(bool aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackConversion<bool, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothAddress& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackArray<uint8_t>(aIn.mAddr, sizeof(aIn.mAddr)), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothConfigurationParameter& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(aIn.mType, aIn.mLength,
+                 PackArray<uint8_t>(aIn.mValue.get(), aIn.mLength), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothDaemonPDUHeader& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(aIn.mService, aIn.mOpcode, aIn.mLength, aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU)
+{
+  nsresult rv = PackPDU(
+    PackConversion<nsString, BluetoothPropertyType>(aIn.name()), aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  if (aIn.value().type() == BluetoothValue::Tuint32_t) {
+    // Set discoverable timeout
+    rv = PackPDU(static_cast<uint16_t>(sizeof(uint32_t)),
+                 aIn.value().get_uint32_t(), aPDU);
+  } else if (aIn.value().type() == BluetoothValue::TnsString) {
+    // Set name
+    const nsCString value =
+      NS_ConvertUTF16toUTF8(aIn.value().get_nsString());
+
+    rv = PackPDU(PackConversion<size_t, uint16_t>(value.Length()),
+                 PackArray<uint8_t>(
+                   reinterpret_cast<const uint8_t*>(value.get()),
+                   value.Length()),
+                 aPDU);
+  } else if (aIn.value().type() == BluetoothValue::Tbool) {
+    // Set scan mode
+    bool value = aIn.value().get_bool();
+
+    rv = PackPDU(static_cast<uint16_t>(sizeof(int32_t)),
+                 PackConversion<bool, BluetoothScanMode>(value), aPDU);
+  } else {
+    BT_LOGR("Invalid property value type");
+    rv = NS_ERROR_ILLEGAL_VALUE;
+  }
+  return rv;
+}
+
+nsresult
+PackPDU(const BluetoothPinCode& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(aIn.mLength,
+                 PackArray<uint8_t>(aIn.mPinCode, sizeof(aIn.mPinCode)),
+                 aPDU);
+}
+
+nsresult
+PackPDU(BluetoothPropertyType aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackConversion<BluetoothPropertyType, uint8_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(BluetoothSspVariant aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackConversion<BluetoothSspVariant, uint8_t>(aIn),
+                 aPDU);
+}
+
+nsresult
+PackPDU(BluetoothScanMode aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackConversion<BluetoothScanMode, int32_t>(aIn), aPDU);
+}
+
+nsresult
+PackPDU(const BluetoothServiceName& aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackArray<uint8_t>(aIn.mName, sizeof(aIn.mName)), aPDU);
+}
+
+nsresult
+PackPDU(BluetoothSocketType aIn, BluetoothDaemonPDU& aPDU)
+{
+  return PackPDU(PackConversion<BluetoothSocketType, uint8_t>(aIn), aPDU);
+}
+
+//
+// Unpacking
+//
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, bool& aOut)
+{
+  return UnpackPDU(aPDU, UnpackConversion<uint8_t, bool>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAclState& aOut)
+{
+  return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothAclState>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothBondState& aOut)
+{
+  return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothBondState>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothTypeOfDevice& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<int32_t, BluetoothTypeOfDevice>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothProperty& aOut)
+{
+  nsresult rv = UnpackPDU(aPDU, aOut.mType);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  uint16_t len;
+  rv = UnpackPDU(aPDU, len);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  switch (aOut.mType) {
+    case PROPERTY_BDNAME:
+      /* fall through */
+    case PROPERTY_REMOTE_FRIENDLY_NAME: {
+        const uint8_t* data = aPDU.Consume(len);
+        if (NS_WARN_IF(!data)) {
+          return NS_ERROR_ILLEGAL_VALUE;
+        }
+        // We construct an nsCString here because the string
+        // returned from the PDU is not 0-terminated.
+        aOut.mString = NS_ConvertUTF8toUTF16(
+          nsCString(reinterpret_cast<const char*>(data), len));
+      }
+      break;
+    case PROPERTY_BDADDR:
+      rv = UnpackPDU<BluetoothAddress>(
+        aPDU, UnpackConversion<BluetoothAddress, nsAString>(aOut.mString));
+      break;
+    case PROPERTY_UUIDS: {
+        size_t numUuids = len / MAX_UUID_SIZE;
+        aOut.mUuidArray.SetLength(numUuids);
+        rv = UnpackPDU(aPDU, aOut.mUuidArray);
+      }
+      break;
+    case PROPERTY_CLASS_OF_DEVICE:
+      /* fall through */
+    case PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:
+      rv = UnpackPDU(aPDU, aOut.mUint32);
+      break;
+    case PROPERTY_TYPE_OF_DEVICE:
+      rv = UnpackPDU(aPDU, aOut.mTypeOfDevice);
+      break;
+    case PROPERTY_SERVICE_RECORD:
+      rv = UnpackPDU(aPDU, aOut.mServiceRecord);
+      break;
+    case PROPERTY_ADAPTER_SCAN_MODE:
+      rv = UnpackPDU(aPDU, aOut.mScanMode);
+      break;
+    case PROPERTY_ADAPTER_BONDED_DEVICES: {
+        /* unpack addresses */
+        size_t numAddresses = len / BLUETOOTH_ADDRESS_BYTES;
+        nsAutoArrayPtr<BluetoothAddress> addresses;
+        UnpackArray<BluetoothAddress> addressArray(addresses, numAddresses);
+        rv = UnpackPDU(aPDU, addressArray);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
+        /* convert addresses to strings */
+        aOut.mStringArray.SetLength(numAddresses);
+        ConvertArray<BluetoothAddress> convertArray(addressArray.mData,
+                                                    addressArray.mLength);
+        rv = Convert(convertArray, aOut.mStringArray);
+      }
+      break;
+    case PROPERTY_REMOTE_RSSI: {
+        int8_t rssi;
+        rv = UnpackPDU(aPDU, rssi);
+        aOut.mInt32 = rssi;
+      }
+      break;
+    case PROPERTY_REMOTE_VERSION_INFO:
+      rv = UnpackPDU(aPDU, aOut.mRemoteInfo);
+      break;
+    case PROPERTY_REMOTE_DEVICE_TIMESTAMP:
+      /* nothing to do */
+      break;
+    default:
+      break;
+  }
+  return rv;
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothPropertyType& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothPropertyType>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteInfo& aOut)
+{
+  nsresult rv = UnpackPDU(aPDU,
+                          UnpackConversion<uint32_t, int>(aOut.mVerMajor));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = UnpackPDU(aPDU, UnpackConversion<uint32_t, int>(aOut.mVerMinor));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return UnpackPDU(aPDU, UnpackConversion<uint32_t, int>(aOut.mManufacturer));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothScanMode& aOut)
+{
+  return UnpackPDU(aPDU, UnpackConversion<int32_t, BluetoothScanMode>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothServiceRecord& aOut)
+{
+  /* unpack UUID */
+  nsresult rv = UnpackPDU(aPDU, aOut.mUuid);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  /* unpack channel */
+  rv = UnpackPDU(aPDU, aOut.mChannel);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  /* unpack name */
+  return aPDU.Read(aOut.mName, sizeof(aOut.mName));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothSspVariant& aOut)
+{
+  return UnpackPDU(
+    aPDU, UnpackConversion<uint8_t, BluetoothSspVariant>(aOut));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothStatus& aOut)
+{
+  return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothStatus>(aOut));
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonHelpers.h	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,706 @@
+/* -*- 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/. */
+
+#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonhelpers_h__
+#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonhelpers_h__
+
+#include "BluetoothCommon.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/dom/bluetooth/BluetoothTypes.h"
+#include "mozilla/ipc/BluetoothDaemonConnection.h"
+#include "nsThreadUtils.h"
+
+using namespace mozilla::ipc;
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Helper structures
+//
+
+enum BluetoothAclState {
+  ACL_STATE_CONNECTED,
+  ACL_STATE_DISCONNECTED
+};
+
+struct BluetoothAddress {
+  uint8_t mAddr[6];
+};
+
+struct BluetoothConfigurationParameter {
+  uint8_t mType;
+  uint16_t mLength;
+  nsAutoArrayPtr<uint8_t> mValue;
+};
+
+struct BluetoothDaemonPDUHeader {
+  BluetoothDaemonPDUHeader()
+  : mService(0x00)
+  , mOpcode(0x00)
+  , mLength(0x00)
+  { }
+
+  BluetoothDaemonPDUHeader(uint8_t aService, uint8_t aOpcode, uint8_t aLength)
+  : mService(aService)
+  , mOpcode(aOpcode)
+  , mLength(aLength)
+  { }
+
+  uint8_t mService;
+  uint8_t mOpcode;
+  uint16_t mLength;
+};
+
+struct BluetoothPinCode {
+  uint8_t mPinCode[16];
+  uint8_t mLength;
+};
+
+struct BluetoothRemoteName {
+  uint8_t mName[249];
+};
+
+struct BluetoothServiceName {
+  uint8_t mName[256];
+};
+
+//
+// Conversion
+//
+// PDUs can only store primitive data types, such as integers or
+// strings. Gecko often uses more complex data types, such as
+// enumerators or structures. Conversion functions convert between
+// primitive data and internal Gecko's data types during a PDU's
+// packing and unpacking.
+//
+
+nsresult
+Convert(bool aIn, uint8_t& aOut);
+
+nsresult
+Convert(bool aIn, BluetoothScanMode& aOut);
+
+nsresult
+Convert(int aIn, int16_t& aOut);
+
+nsresult
+Convert(uint8_t aIn, bool& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothAclState& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothBondState& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothTypeOfDevice& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothPropertyType& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothScanMode& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothSspVariant& aOut);
+
+nsresult
+Convert(uint8_t aIn, BluetoothStatus& aOut);
+
+nsresult
+Convert(uint32_t aIn, int& aOut);
+
+nsresult
+Convert(size_t aIn, uint16_t& aOut);
+
+nsresult
+Convert(const nsAString& aIn, BluetoothAddress& aOut);
+
+nsresult
+Convert(const nsAString& aIn, BluetoothPinCode& aOut);
+
+nsresult
+Convert(const nsAString& aIn, BluetoothPropertyType& aOut);
+
+nsresult
+Convert(const nsAString& aIn, BluetoothServiceName& aOut);
+
+nsresult
+Convert(const nsAString& aIn, BluetoothSspVariant& aOut);
+
+nsresult
+Convert(BluetoothAclState aIn, bool& aOut);
+
+nsresult
+Convert(const BluetoothAddress& aIn, nsAString& aOut);
+
+nsresult
+Convert(BluetoothPropertyType aIn, uint8_t& aOut);
+
+nsresult
+Convert(const BluetoothRemoteName& aIn, nsAString& aOut);
+
+nsresult
+Convert(BluetoothScanMode aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothSocketType aIn, uint8_t& aOut);
+
+nsresult
+Convert(BluetoothSspVariant aIn, uint8_t& aOut);
+
+//
+// Packing
+//
+
+nsresult
+PackPDU(bool aIn, BluetoothDaemonPDU& aPDU);
+
+inline nsresult
+PackPDU(uint8_t aIn, BluetoothDaemonPDU& aPDU)
+{
+  return aPDU.Write(aIn);
+}
+
+inline nsresult
+PackPDU(uint16_t aIn, BluetoothDaemonPDU& aPDU)
+{
+  return aPDU.Write(aIn);
+}
+
+inline nsresult
+PackPDU(int32_t aIn, BluetoothDaemonPDU& aPDU)
+{
+  return aPDU.Write(aIn);
+}
+
+inline nsresult
+PackPDU(uint32_t aIn, BluetoothDaemonPDU& aPDU)
+{
+  return aPDU.Write(aIn);
+}
+
+nsresult
+PackPDU(const BluetoothAddress& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothConfigurationParameter& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothDaemonPDUHeader& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothPinCode& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(BluetoothPropertyType aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(const BluetoothServiceName& aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(BluetoothSocketType aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(BluetoothSspVariant aIn, BluetoothDaemonPDU& aPDU);
+
+nsresult
+PackPDU(BluetoothScanMode aIn, BluetoothDaemonPDU& aPDU);
+
+/* |PackConversion| is a helper for packing converted values. Pass
+ * an instance of this structure to |PackPDU| to convert a value from
+ * the input type to the output type and and write it to the PDU.
+ */
+template<typename Tin, typename Tout>
+struct PackConversion {
+  PackConversion(const Tin& aIn)
+  : mIn(aIn)
+  { }
+
+  const Tin& mIn;
+};
+
+template<typename Tin, typename Tout>
+inline nsresult
+PackPDU(const PackConversion<Tin, Tout>& aIn, BluetoothDaemonPDU& aPDU)
+{
+  Tout out;
+
+  nsresult rv = Convert(aIn.mIn, out);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return PackPDU(out, aPDU);
+}
+
+/* |PackArray| is a helper for packing arrays. Pass an instance
+ * of this structure as the first argument to |PackPDU| to pack
+ * an array. The array's maximum default length is 255 elements.
+ */
+template <typename T>
+struct PackArray
+{
+  PackArray(const T* aData, size_t aLength)
+  : mData(aData)
+  , mLength(aLength)
+  { }
+
+  const T* mData;
+  size_t mLength;
+};
+
+/* This implementation of |PackPDU| packs the length of an array
+ * and the elements of the array one-by-one.
+ */
+template<typename T>
+inline nsresult
+PackPDU(const PackArray<T>& aIn, BluetoothDaemonPDU& aPDU)
+{
+  for (size_t i = 0; i < aIn.mLength; ++i) {
+    nsresult rv = PackPDU(aIn.mData[i], aPDU);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+  return NS_OK;
+}
+
+template<>
+inline nsresult
+PackPDU<uint8_t>(const PackArray<uint8_t>& aIn, BluetoothDaemonPDU& aPDU)
+{
+  /* Write raw bytes in one pass */
+  return aPDU.Write(aIn.mData, aIn.mLength);
+}
+
+template <typename T1, typename T2>
+inline nsresult
+PackPDU(const T1& aIn1, const T2& aIn2, BluetoothDaemonPDU& aPDU)
+{
+  nsresult rv = PackPDU(aIn1, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return PackPDU(aIn2, aPDU);
+}
+
+template <typename T1, typename T2, typename T3>
+inline nsresult
+PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
+        BluetoothDaemonPDU& aPDU)
+{
+  nsresult rv = PackPDU(aIn1, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn2, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return PackPDU(aIn3, aPDU);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+inline nsresult
+PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3, const T4& aIn4,
+        BluetoothDaemonPDU& aPDU)
+{
+  nsresult rv = PackPDU(aIn1, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn2, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn3, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return PackPDU(aIn4, aPDU);
+}
+
+template <typename T1, typename T2, typename T3,
+          typename T4, typename T5>
+inline nsresult
+PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
+        const T4& aIn4, const T5& aIn5,
+        BluetoothDaemonPDU& aPDU)
+{
+  nsresult rv = PackPDU(aIn1, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn2, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn3, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = PackPDU(aIn4, aPDU);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return PackPDU(aIn5, aPDU);
+}
+
+//
+// Unpacking
+//
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, int8_t& aOut)
+{
+  return aPDU.Read(aOut);
+}
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, uint8_t& aOut)
+{
+  return aPDU.Read(aOut);
+}
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, uint16_t& aOut)
+{
+  return aPDU.Read(aOut);
+}
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, int32_t& aOut)
+{
+  return aPDU.Read(aOut);
+}
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, uint32_t& aOut)
+{
+  return aPDU.Read(aOut);
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, bool& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAclState& aOut);
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAddress& aOut)
+{
+  return aPDU.Read(aOut.mAddr, sizeof(aOut.mAddr));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothBondState& aOut);
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothDaemonPDUHeader& aOut)
+{
+  nsresult rv = UnpackPDU(aPDU, aOut.mService);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = UnpackPDU(aPDU, aOut.mOpcode);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return UnpackPDU(aPDU, aOut.mLength);
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothTypeOfDevice& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteInfo& aOut);
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteName& aOut)
+{
+  return aPDU.Read(aOut.mName, sizeof(aOut.mName));
+}
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothProperty& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothPropertyType& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothScanMode& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothServiceRecord& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothSspVariant& aOut);
+
+nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothStatus& aOut);
+
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothUuid& aOut)
+{
+  return aPDU.Read(aOut.mUuid, sizeof(aOut.mUuid));
+}
+
+/* |UnpackConversion| is a helper for convering unpacked values. Pass
+ * an instance of this structure to |UnpackPDU| to read a value from
+ * the PDU in the input type and convert it to the output type.
+ */
+template<typename Tin, typename Tout>
+struct UnpackConversion {
+  UnpackConversion(Tout& aOut)
+  : mOut(aOut)
+  { }
+
+  Tout& mOut;
+};
+
+template<typename Tin, typename Tout>
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackConversion<Tin, Tout>& aOut)
+{
+  Tin in;
+  nsresult rv = UnpackPDU(aPDU, in);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  return Convert(in, aOut.mOut);
+}
+
+/* |UnpackArray| is a helper for unpacking arrays. Pass an instance
+ * of this structure as the second argument to |UnpackPDU| to unpack
+ * an array.
+ */
+template <typename T>
+struct UnpackArray
+{
+  UnpackArray(T* aData, size_t aLength)
+  : mData(aData)
+  , mLength(aLength)
+  { }
+
+  UnpackArray(nsAutoArrayPtr<T>& aData, size_t aLength)
+  : mData(nullptr)
+  , mLength(aLength)
+  {
+    aData = new T[mLength];
+    mData = aData.get();
+  }
+
+  UnpackArray(nsAutoArrayPtr<T>& aData, size_t aSize, size_t aElemSize)
+  : mData(nullptr)
+  , mLength(aSize / aElemSize)
+  {
+    aData = new T[mLength];
+    mData = aData.get();
+  }
+
+  T* mData;
+  size_t mLength;
+};
+
+template<typename T>
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackArray<T>& aOut)
+{
+  for (size_t i = 0; i < aOut.mLength; ++i) {
+    nsresult rv = UnpackPDU(aPDU, aOut.mData[i]);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+  return NS_OK;
+}
+
+template<>
+inline nsresult
+UnpackPDU<uint8_t>(BluetoothDaemonPDU& aPDU, const UnpackArray<uint8_t>& aOut)
+{
+  /* Read raw bytes in one pass */
+  return aPDU.Read(aOut.mData, aOut.mLength);
+}
+
+template<typename T>
+inline nsresult
+UnpackPDU(BluetoothDaemonPDU& aPDU, nsTArray<T>& aOut)
+{
+  for (typename nsTArray<T>::size_type i = 0; i < aOut.Length(); ++i) {
+    nsresult rv = UnpackPDU(aPDU, aOut[i]);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+  return NS_OK;
+}
+
+//
+// Init operators
+//
+
+// |PDUInitOP| provides functionality for init operators that unpack PDUs.
+class PDUInitOp
+{
+protected:
+  PDUInitOp(BluetoothDaemonPDU& aPDU)
+  : mPDU(&aPDU)
+  { }
+
+  BluetoothDaemonPDU& GetPDU() const
+  {
+    return *mPDU; // cannot be nullptr
+  }
+
+  void WarnAboutTrailingData() const
+  {
+    size_t size = mPDU->GetSize();
+
+    if (MOZ_LIKELY(!size)) {
+      return;
+    }
+
+    uint8_t service, opcode;
+    uint16_t payloadSize;
+    mPDU->GetHeader(service, opcode, payloadSize);
+
+    BT_LOGR("Unpacked PDU of type (%x,%x) still contains %zu Bytes of data.",
+            service, opcode, size);
+  }
+
+private:
+  BluetoothDaemonPDU* mPDU; // Hold pointer to allow for constant instances
+};
+
+// |UnpackPDUInitOp| is a general-purpose init operator for all variants
+// of |BluetoothResultRunnable| and |BluetoothNotificationRunnable|. The
+// call operators of |UnpackPDUInitOp| unpack a PDU into the supplied
+// arguments.
+class UnpackPDUInitOp MOZ_FINAL : private PDUInitOp
+{
+public:
+  UnpackPDUInitOp(BluetoothDaemonPDU& aPDU)
+  : PDUInitOp(aPDU)
+  { }
+
+  nsresult operator () () const
+  {
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+
+  template<typename T1>
+  nsresult operator () (T1& aArg1) const
+  {
+    nsresult rv = UnpackPDU(GetPDU(), aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+
+  template<typename T1, typename T2>
+  nsresult operator () (T1& aArg1, T2& aArg2) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg2);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+
+  template<typename T1, typename T2, typename T3>
+  nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg2);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg3);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+
+  template<typename T1, typename T2, typename T3, typename T4>
+  nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3, T4& aArg4) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg2);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg3);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg4);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+
+  template<typename T1, typename T2, typename T3, typename T4, typename T5>
+  nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3, T4& aArg4,
+                        T5& aArg5) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    nsresult rv = UnpackPDU(pdu, aArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg2);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg3);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg4);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = UnpackPDU(pdu, aArg5);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,2134 @@
+/* -*- 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 "BluetoothDaemonInterface.h"
+#include "BluetoothDaemonHelpers.h"
+#include "BluetoothDaemonSetupInterface.h"
+#include "BluetoothDaemonSocketInterface.h"
+#include "BluetoothInterfaceHelpers.h"
+#include "mozilla/unused.h"
+
+using namespace mozilla::ipc;
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Protocol initialization and setup
+//
+
+class BluetoothDaemonSetupModule
+{
+public:
+  enum {
+    SERVICE_ID = 0x00
+  };
+
+  enum {
+    OPCODE_ERROR = 0x00,
+    OPCODE_REGISTER_MODULE = 0x01,
+    OPCODE_UNREGISTER_MODULE = 0x02,
+    OPCODE_CONFIGURATION = 0x03
+  };
+
+  virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
+
+  // Commands
+  //
+
+  nsresult RegisterModuleCmd(uint8_t aId, uint8_t aMode,
+                             BluetoothSetupResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_REGISTER_MODULE, 0));
+
+    nsresult rv = PackPDU(aId, aMode, *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult UnregisterModuleCmd(uint8_t aId,
+                               BluetoothSetupResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_UNREGISTER_MODULE, 0));
+
+    nsresult rv = PackPDU(aId, *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult ConfigurationCmd(const BluetoothConfigurationParameter* aParam,
+                            uint8_t aLen, BluetoothSetupResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CONFIGURATION, 0));
+
+    nsresult rv = PackPDU(
+      aLen, PackArray<BluetoothConfigurationParameter>(aParam, aLen), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+protected:
+
+  // Called to handle PDUs with Service field equal to 0x00, which
+  // contains internal operations for setup and configuration.
+  void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU, void* aUserData)
+  {
+    static void (BluetoothDaemonSetupModule::* const HandleRsp[])(
+      const BluetoothDaemonPDUHeader&,
+      BluetoothDaemonPDU&,
+      BluetoothSetupResultHandler*) = {
+      INIT_ARRAY_AT(OPCODE_ERROR,
+        &BluetoothDaemonSetupModule::ErrorRsp),
+      INIT_ARRAY_AT(OPCODE_REGISTER_MODULE,
+        &BluetoothDaemonSetupModule::RegisterModuleRsp),
+      INIT_ARRAY_AT(OPCODE_UNREGISTER_MODULE,
+        &BluetoothDaemonSetupModule::UnregisterModuleRsp),
+      INIT_ARRAY_AT(OPCODE_CONFIGURATION,
+        &BluetoothDaemonSetupModule::ConfigurationRsp)
+    };
+
+    if (NS_WARN_IF(aHeader.mOpcode >= MOZ_ARRAY_LENGTH(HandleRsp)) ||
+        NS_WARN_IF(!HandleRsp[aHeader.mOpcode])) {
+      return;
+    }
+
+    nsRefPtr<BluetoothSetupResultHandler> res =
+      already_AddRefed<BluetoothSetupResultHandler>(
+        static_cast<BluetoothSetupResultHandler*>(aUserData));
+
+    if (!res) {
+      return; // Return early if no result handler has been set
+    }
+
+    (this->*(HandleRsp[aHeader.mOpcode]))(aHeader, aPDU, res);
+  }
+
+  nsresult Send(BluetoothDaemonPDU* aPDU, BluetoothSetupResultHandler* aRes)
+  {
+    aRes->AddRef(); // Keep reference for response
+    return Send(aPDU, static_cast<void*>(aRes));
+  }
+
+private:
+
+  // Responses
+  //
+
+  typedef
+    BluetoothResultRunnable0<BluetoothSetupResultHandler, void>
+    ResultRunnable;
+
+  typedef
+    BluetoothResultRunnable1<BluetoothSetupResultHandler, void,
+                             BluetoothStatus, BluetoothStatus>
+    ErrorRunnable;
+
+  void
+  ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
+           BluetoothDaemonPDU& aPDU,
+           BluetoothSetupResultHandler* aRes)
+  {
+    ErrorRunnable::Dispatch(
+      aRes, &BluetoothSetupResultHandler::OnError, UnpackPDUInitOp(aPDU));
+  }
+
+  void
+  RegisterModuleRsp(const BluetoothDaemonPDUHeader& aHeader,
+                    BluetoothDaemonPDU& aPDU,
+                    BluetoothSetupResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothSetupResultHandler::RegisterModule,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void
+  UnregisterModuleRsp(const BluetoothDaemonPDUHeader& aHeader,
+                      BluetoothDaemonPDU& aPDU,
+                      BluetoothSetupResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothSetupResultHandler::UnregisterModule,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void
+  ConfigurationRsp(const BluetoothDaemonPDUHeader& aHeader,
+                   BluetoothDaemonPDU& aPDU,
+                   BluetoothSetupResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothSetupResultHandler::Configuration,
+      UnpackPDUInitOp(aPDU));
+  }
+};
+
+//
+// Core module
+//
+
+static BluetoothNotificationHandler* sNotificationHandler;
+
+class BluetoothDaemonCoreModule
+{
+public:
+  enum {
+    SERVICE_ID = 0x01
+  };
+
+  enum {
+    OPCODE_ERROR = 0x00,
+    OPCODE_ENABLE = 0x01,
+    OPCODE_DISABLE = 0x02,
+    OPCODE_GET_ADAPTER_PROPERTIES = 0x03,
+    OPCODE_GET_ADAPTER_PROPERTY = 0x04,
+    OPCODE_SET_ADAPTER_PROPERTY = 0x05,
+    OPCODE_GET_REMOTE_DEVICE_PROPERTIES = 0x06,
+    OPCODE_GET_REMOTE_DEVICE_PROPERTY = 0x07,
+    OPCODE_SET_REMOTE_DEVICE_PROPERTY = 0x08,
+    OPCODE_GET_REMOTE_SERVICE_RECORD = 0x09,
+    OPCODE_GET_REMOTE_SERVICES = 0x0a,
+    OPCODE_START_DISCOVERY = 0x0b,
+    OPCODE_CANCEL_DISCOVERY = 0x0c,
+    OPCODE_CREATE_BOND = 0x0d,
+    OPCODE_REMOVE_BOND = 0x0e,
+    OPCODE_CANCEL_BOND = 0x0f,
+    OPCODE_PIN_REPLY = 0x10,
+    OPCODE_SSP_REPLY = 0x11,
+    OPCODE_DUT_MODE_CONFIGURE = 0x12,
+    OPCODE_DUT_MODE_SEND = 0x13,
+    OPCODE_LE_TEST_MODE = 0x14,
+    OPCODE_ADAPTER_STATE_CHANGED_NTF = 0x81,
+    OPCODE_ADAPTER_PROPERTIES_CHANGED_NTF = 0x82,
+    OPCODE_REMOTE_DEVICE_PROPERTIES_NTF = 0x83,
+    OPCODE_DEVICE_FOUND_NTF = 0x84,
+    OPCODE_DISCOVERY_STATE_CHANGED_NTF = 0x85,
+    OPCODE_PIN_REQUEST_NTF = 0x86,
+    OPCODE_SSP_REQUEST_NTF = 0x87,
+    OPCODE_BOND_STATE_CHANGED_NTF = 0x88,
+    OPCODE_ACL_STATE_CHANGED_NTF = 0x89,
+    OPCODE_DUT_MODE_RECEIVE_NTF = 0x8a,
+    OPCODE_LE_TEST_MODE_NTF = 0x8b
+  };
+
+  virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
+
+  nsresult EnableCmd(BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_ENABLE, 0));
+
+    nsresult rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult DisableCmd(BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DISABLE, 0));
+
+    nsresult rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult GetAdapterPropertiesCmd(BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_ADAPTER_PROPERTIES, 0));
+
+    nsresult rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult GetAdapterPropertyCmd(const nsAString& aName,
+                                 BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_ADAPTER_PROPERTY, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<const nsAString, BluetoothPropertyType>(aName), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult SetAdapterPropertyCmd(const BluetoothNamedValue& aProperty,
+                                 BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_SET_ADAPTER_PROPERTY, 0));
+
+    nsresult rv = PackPDU(aProperty, *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult GetRemoteDevicePropertiesCmd(const nsAString& aRemoteAddr,
+                                        BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_REMOTE_DEVICE_PROPERTIES,
+                             0));
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult GetRemoteDevicePropertyCmd(const nsAString& aRemoteAddr,
+                                      const nsAString& aName,
+                                      BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_REMOTE_DEVICE_PROPERTY,
+                             0));
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aRemoteAddr),
+      PackConversion<nsAString, BluetoothPropertyType>(aName), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult SetRemoteDevicePropertyCmd(const nsAString& aRemoteAddr,
+                                      const BluetoothNamedValue& aProperty,
+                                      BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_SET_REMOTE_DEVICE_PROPERTY,
+                             0));
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aRemoteAddr),
+      aProperty, *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult GetRemoteServiceRecordCmd(const nsAString& aRemoteAddr,
+                                     const uint8_t aUuid[16],
+                                     BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_REMOTE_SERVICE_RECORD,
+                             0));
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aRemoteAddr),
+      PackArray<uint8_t>(aUuid, 16), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult GetRemoteServicesCmd(const nsAString& aRemoteAddr,
+                                BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_REMOTE_SERVICES, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult StartDiscoveryCmd(BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_START_DISCOVERY, 0));
+
+    nsresult rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult CancelDiscoveryCmd(BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CANCEL_DISCOVERY, 0));
+
+    nsresult rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult CreateBondCmd(const nsAString& aBdAddr,
+                         BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CREATE_BOND, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aBdAddr), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult RemoveBondCmd(const nsAString& aBdAddr,
+                         BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_REMOVE_BOND, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aBdAddr), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult CancelBondCmd(const nsAString& aBdAddr,
+                         BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CANCEL_BOND, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aBdAddr), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult PinReplyCmd(const nsAString& aBdAddr, bool aAccept,
+                       const nsAString& aPinCode,
+                       BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_PIN_REPLY, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aBdAddr),
+      aAccept,
+      PackConversion<nsAString, BluetoothPinCode>(aPinCode), *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult SspReplyCmd(const nsAString& aBdAddr, const nsAString& aVariant,
+                       bool aAccept, uint32_t aPasskey,
+                       BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_SSP_REPLY, 0));
+
+    nsresult rv = PackPDU(
+      PackConversion<nsAString, BluetoothAddress>(aBdAddr),
+      PackConversion<nsAString, BluetoothSspVariant>(aVariant),
+      aAccept, aPasskey, *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult DutModeConfigureCmd(bool aEnable, BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DUT_MODE_CONFIGURE, 0));
+
+    nsresult rv = PackPDU(aEnable, *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult DutModeSendCmd(uint16_t aOpcode, uint8_t* aBuf, uint8_t aLen,
+                          BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DUT_MODE_SEND, 0));
+
+    nsresult rv = PackPDU(aOpcode, aLen, PackArray<uint8_t>(aBuf, aLen),
+                          *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+  nsresult LeTestModeCmd(uint16_t aOpcode, uint8_t* aBuf, uint8_t aLen,
+                         BluetoothResultHandler* aRes)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    nsAutoPtr<BluetoothDaemonPDU> pdu(
+      new BluetoothDaemonPDU(SERVICE_ID, OPCODE_LE_TEST_MODE, 0));
+
+    nsresult rv = PackPDU(aOpcode, aLen, PackArray<uint8_t>(aBuf, aLen),
+                          *pdu);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    rv = Send(pdu, aRes);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    unused << pdu.forget();
+    return rv;
+  }
+
+protected:
+
+  void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU, void* aUserData)
+  {
+    static void (BluetoothDaemonCoreModule::* const HandleOp[])(
+      const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
+      INIT_ARRAY_AT(0, &BluetoothDaemonCoreModule::HandleRsp),
+      INIT_ARRAY_AT(1, &BluetoothDaemonCoreModule::HandleNtf),
+    };
+
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    /* test notification bit; negating twice maps to 0 or 1 */
+    unsigned int isNtf = !!(aHeader.mOpcode & 0x80);
+
+    (this->*(HandleOp[isNtf]))(aHeader, aPDU, aUserData);
+  }
+
+  nsresult Send(BluetoothDaemonPDU* aPDU, BluetoothResultHandler* aRes)
+  {
+    aRes->AddRef(); // Keep reference for response
+    return Send(aPDU, static_cast<void*>(aRes));
+  }
+
+private:
+
+  // Responses
+  //
+
+  typedef BluetoothResultRunnable0<BluetoothResultHandler, void>
+    ResultRunnable;
+
+  typedef BluetoothResultRunnable1<BluetoothResultHandler, void,
+                                   BluetoothStatus, BluetoothStatus>
+    ErrorRunnable;
+
+  void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
+                BluetoothDaemonPDU& aPDU,
+                BluetoothResultHandler* aRes)
+  {
+    ErrorRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::OnError, UnpackPDUInitOp(aPDU));
+  }
+
+  void EnableRsp(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU,
+                 BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::Enable, UnpackPDUInitOp(aPDU));
+  }
+
+  void DisableRsp(const BluetoothDaemonPDUHeader& aHeader,
+                  BluetoothDaemonPDU& aPDU,
+                  BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::Disable, UnpackPDUInitOp(aPDU));
+  }
+
+  void GetAdapterPropertiesRsp(const BluetoothDaemonPDUHeader& aHeader,
+                               BluetoothDaemonPDU& aPDU,
+                               BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::GetAdapterProperties,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void GetAdapterPropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
+                             BluetoothDaemonPDU& aPDU,
+                             BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::GetAdapterProperty,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void SetAdapterPropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
+                             BluetoothDaemonPDU& aPDU,
+                             BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::SetAdapterProperty,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void GetRemoteDevicePropertiesRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                    BluetoothDaemonPDU& aPDU,
+                                    BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::GetRemoteDeviceProperties,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void
+  GetRemoteDevicePropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
+                             BluetoothDaemonPDU& aPDU,
+                             BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::GetRemoteDeviceProperty,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void SetRemoteDevicePropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                  BluetoothDaemonPDU& aPDU,
+                                  BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::SetRemoteDeviceProperty,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void GetRemoteServiceRecordRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                 BluetoothDaemonPDU& aPDU,
+                                 BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::GetRemoteServiceRecord,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void GetRemoteServicesRsp(const BluetoothDaemonPDUHeader& aHeader,
+                            BluetoothDaemonPDU& aPDU,
+                            BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::GetRemoteServices,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void StartDiscoveryRsp(const BluetoothDaemonPDUHeader& aHeader,
+                         BluetoothDaemonPDU& aPDU,
+                         BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::StartDiscovery,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void CancelDiscoveryRsp(const BluetoothDaemonPDUHeader& aHeader,
+                          BluetoothDaemonPDU& aPDU,
+                          BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::CancelDiscovery,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void CreateBondRsp(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU,
+                     BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::CreateBond,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void RemoveBondRsp(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU,
+                     BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::RemoveBond,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void CancelBondRsp(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU,
+                     BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::CancelBond,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void PinReplyRsp(const BluetoothDaemonPDUHeader& aHeader,
+                   BluetoothDaemonPDU& aPDU,
+                   BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::PinReply,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void SspReplyRsp(const BluetoothDaemonPDUHeader& aHeader,
+                   BluetoothDaemonPDU& aPDU,
+                   BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::SspReply,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void DutModeConfigureRsp(const BluetoothDaemonPDUHeader& aHeader,
+                           BluetoothDaemonPDU& aPDU,
+                           BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::DutModeConfigure,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void DutModeSendRsp(const BluetoothDaemonPDUHeader& aHeader,
+                      BluetoothDaemonPDU& aPDU,
+                      BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::DutModeSend,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void LeTestModeRsp(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU,
+                     BluetoothResultHandler* aRes)
+  {
+    ResultRunnable::Dispatch(
+      aRes, &BluetoothResultHandler::LeTestMode,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU, void* aUserData)
+  {
+    static void (BluetoothDaemonCoreModule::* const HandleRsp[])(
+      const BluetoothDaemonPDUHeader&,
+      BluetoothDaemonPDU&,
+      BluetoothResultHandler*) = {
+      INIT_ARRAY_AT(OPCODE_ERROR,
+        &BluetoothDaemonCoreModule::ErrorRsp),
+      INIT_ARRAY_AT(OPCODE_ENABLE,
+        &BluetoothDaemonCoreModule::EnableRsp),
+      INIT_ARRAY_AT(OPCODE_DISABLE,
+        &BluetoothDaemonCoreModule::DisableRsp),
+      INIT_ARRAY_AT(OPCODE_GET_ADAPTER_PROPERTIES,
+        &BluetoothDaemonCoreModule::GetAdapterPropertiesRsp),
+      INIT_ARRAY_AT(OPCODE_GET_ADAPTER_PROPERTY,
+        &BluetoothDaemonCoreModule::GetAdapterPropertyRsp),
+      INIT_ARRAY_AT(OPCODE_SET_ADAPTER_PROPERTY,
+        &BluetoothDaemonCoreModule::SetAdapterPropertyRsp),
+      INIT_ARRAY_AT(OPCODE_GET_REMOTE_DEVICE_PROPERTIES,
+        &BluetoothDaemonCoreModule::GetRemoteDevicePropertiesRsp),
+      INIT_ARRAY_AT(OPCODE_GET_REMOTE_DEVICE_PROPERTY,
+        &BluetoothDaemonCoreModule::GetRemoteDevicePropertyRsp),
+      INIT_ARRAY_AT(OPCODE_SET_REMOTE_DEVICE_PROPERTY,
+        &BluetoothDaemonCoreModule::SetRemoteDevicePropertyRsp),
+      INIT_ARRAY_AT(OPCODE_GET_REMOTE_SERVICE_RECORD,
+        &BluetoothDaemonCoreModule::GetRemoteServiceRecordRsp),
+      INIT_ARRAY_AT(OPCODE_GET_REMOTE_SERVICES,
+        &BluetoothDaemonCoreModule::GetRemoteServicesRsp),
+      INIT_ARRAY_AT(OPCODE_START_DISCOVERY,
+        &BluetoothDaemonCoreModule::StartDiscoveryRsp),
+      INIT_ARRAY_AT(OPCODE_CANCEL_DISCOVERY,
+        &BluetoothDaemonCoreModule::CancelDiscoveryRsp),
+      INIT_ARRAY_AT(OPCODE_CREATE_BOND,
+        &BluetoothDaemonCoreModule::CreateBondRsp),
+      INIT_ARRAY_AT(OPCODE_REMOVE_BOND,
+        &BluetoothDaemonCoreModule::RemoveBondRsp),
+      INIT_ARRAY_AT(OPCODE_CANCEL_BOND,
+        &BluetoothDaemonCoreModule::CancelBondRsp),
+      INIT_ARRAY_AT(OPCODE_PIN_REPLY,
+        &BluetoothDaemonCoreModule::PinReplyRsp),
+      INIT_ARRAY_AT(OPCODE_SSP_REPLY,
+        &BluetoothDaemonCoreModule::SspReplyRsp),
+      INIT_ARRAY_AT(OPCODE_DUT_MODE_CONFIGURE,
+        &BluetoothDaemonCoreModule::DutModeConfigureRsp),
+      INIT_ARRAY_AT(OPCODE_DUT_MODE_SEND,
+        &BluetoothDaemonCoreModule::DutModeSendRsp),
+      INIT_ARRAY_AT(OPCODE_LE_TEST_MODE,
+        &BluetoothDaemonCoreModule::LeTestModeRsp),
+    };
+
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    if (NS_WARN_IF(!(aHeader.mOpcode < MOZ_ARRAY_LENGTH(HandleRsp))) ||
+        NS_WARN_IF(!HandleRsp[aHeader.mOpcode])) {
+      return;
+    }
+
+    nsRefPtr<BluetoothResultHandler> res =
+      already_AddRefed<BluetoothResultHandler>(
+        static_cast<BluetoothResultHandler*>(aUserData));
+
+    if (!res) {
+      return; // Return early if no result handler has been set for response
+    }
+
+    (this->*(HandleRsp[aHeader.mOpcode]))(aHeader, aPDU, res);
+  }
+
+  // Notifications
+  //
+
+  class NotificationHandlerWrapper
+  {
+  public:
+    typedef BluetoothNotificationHandler ObjectType;
+
+    static ObjectType* GetInstance()
+    {
+      MOZ_ASSERT(NS_IsMainThread());
+
+      return sNotificationHandler;
+    }
+  };
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         bool>
+    AdapterStateChangedNotification;
+
+  typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void,
+                                         BluetoothStatus, int,
+                                         nsAutoArrayPtr<BluetoothProperty>,
+                                         BluetoothStatus, int,
+                                         const BluetoothProperty*>
+    AdapterPropertiesNotification;
+
+  typedef BluetoothNotificationRunnable4<NotificationHandlerWrapper, void,
+                                         BluetoothStatus, nsString, int,
+                                         nsAutoArrayPtr<BluetoothProperty>,
+                                         BluetoothStatus, const nsAString&,
+                                         int, const BluetoothProperty*>
+    RemoteDevicePropertiesNotification;
+
+  typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void,
+                                         int,
+                                         nsAutoArrayPtr<BluetoothProperty>,
+                                         int, const BluetoothProperty*>
+    DeviceFoundNotification;
+
+  typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void,
+                                         bool>
+    DiscoveryStateChangedNotification;
+
+  typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void,
+                                         nsString, nsString, uint32_t,
+                                         const nsAString&, const nsAString&>
+    PinRequestNotification;
+
+  typedef BluetoothNotificationRunnable5<NotificationHandlerWrapper, void,
+                                         nsString, nsString, uint32_t,
+                                         BluetoothSspVariant, uint32_t,
+                                         const nsAString&, const nsAString&>
+    SspRequestNotification;
+
+  typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void,
+                                         BluetoothStatus, nsString,
+                                         BluetoothBondState,
+                                         BluetoothStatus, const nsAString&>
+    BondStateChangedNotification;
+
+  typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void,
+                                         BluetoothStatus, nsString, bool,
+                                         BluetoothStatus, const nsAString&>
+    AclStateChangedNotification;
+
+  typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void,
+                                         uint16_t, nsAutoArrayPtr<uint8_t>,
+                                         uint8_t, uint16_t, const uint8_t*>
+    DutModeRecvNotification;
+
+  typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void,
+                                         BluetoothStatus, uint16_t>
+    LeTestModeNotification;
+
+  void AdapterStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
+                              BluetoothDaemonPDU& aPDU)
+  {
+    AdapterStateChangedNotification::Dispatch(
+      &BluetoothNotificationHandler::AdapterStateChangedNotification,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  // Init operator class for AdapterPropertiesNotification
+  class AdapterPropertiesInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    AdapterPropertiesInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (BluetoothStatus& aArg1, int& aArg2,
+                 nsAutoArrayPtr<BluetoothProperty>& aArg3) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read status */
+      nsresult rv = UnpackPDU(pdu, aArg1);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read number of properties */
+      uint8_t numProperties;
+      rv = UnpackPDU(pdu, numProperties);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      aArg2 = numProperties;
+
+      /* Read properties array */
+      UnpackArray<BluetoothProperty> properties(aArg3, aArg2);
+      rv = UnpackPDU(pdu, properties);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void AdapterPropertiesNtf(const BluetoothDaemonPDUHeader& aHeader,
+                            BluetoothDaemonPDU& aPDU)
+  {
+    AdapterPropertiesNotification::Dispatch(
+      &BluetoothNotificationHandler::AdapterPropertiesNotification,
+      AdapterPropertiesInitOp(aPDU));
+  }
+
+  // Init operator class for RemoteDevicePropertiesNotification
+  class RemoteDevicePropertiesInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    RemoteDevicePropertiesInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (BluetoothStatus& aArg1, nsString& aArg2, int& aArg3,
+                 nsAutoArrayPtr<BluetoothProperty>& aArg4) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read status */
+      nsresult rv = UnpackPDU(pdu, aArg1);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read address */
+      rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg2));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read number of properties */
+      uint8_t numProperties;
+      rv = UnpackPDU(pdu, numProperties);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      aArg3 = numProperties;
+
+      /* Read properties array */
+      UnpackArray<BluetoothProperty> properties(aArg4, aArg3);
+      rv = UnpackPDU(pdu, properties);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void RemoteDevicePropertiesNtf(const BluetoothDaemonPDUHeader& aHeader,
+                                 BluetoothDaemonPDU& aPDU)
+  {
+    RemoteDevicePropertiesNotification::Dispatch(
+      &BluetoothNotificationHandler::RemoteDevicePropertiesNotification,
+      RemoteDevicePropertiesInitOp(aPDU));
+  }
+
+  // Init operator class for DeviceFoundNotification
+  class DeviceFoundInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    DeviceFoundInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (int& aArg1, nsAutoArrayPtr<BluetoothProperty>& aArg2) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read number of properties */
+      uint8_t numProperties;
+      nsresult rv = UnpackPDU(pdu, numProperties);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      aArg1 = numProperties;
+
+      /* Read properties array */
+      UnpackArray<BluetoothProperty> properties(aArg2, aArg1);
+      rv = UnpackPDU(pdu, properties);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void DeviceFoundNtf(const BluetoothDaemonPDUHeader& aHeader,
+                      BluetoothDaemonPDU& aPDU)
+  {
+    DeviceFoundNotification::Dispatch(
+      &BluetoothNotificationHandler::DeviceFoundNotification,
+      DeviceFoundInitOp(aPDU));
+  }
+
+  void DiscoveryStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
+                                BluetoothDaemonPDU& aPDU)
+  {
+    DiscoveryStateChangedNotification::Dispatch(
+      &BluetoothNotificationHandler::DiscoveryStateChangedNotification,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  // Init operator class for PinRequestNotification
+  class PinRequestInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    PinRequestInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (nsString& aArg1, nsString& aArg2, uint32_t& aArg3) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read remote address */
+      nsresult rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg1));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read remote name */
+      rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothRemoteName, nsAString>(aArg2));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read CoD */
+      rv = UnpackPDU(pdu, aArg3);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void PinRequestNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU)
+  {
+    PinRequestNotification::Dispatch(
+      &BluetoothNotificationHandler::PinRequestNotification,
+      PinRequestInitOp(aPDU));
+  }
+
+  // Init operator class for SspRequestNotification
+  class SspRequestInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    SspRequestInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (nsString& aArg1, nsString& aArg2, uint32_t& aArg3,
+                 BluetoothSspVariant aArg4, uint32_t& aArg5) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read remote address */
+      nsresult rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg1));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read remote name */
+      rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothRemoteName, nsAString>(aArg2));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read CoD */
+      rv = UnpackPDU(pdu, aArg3);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read pairing variant */
+      rv = UnpackPDU(pdu, aArg4);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read passkey */
+      rv = UnpackPDU(pdu, aArg5);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void SspRequestNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU)
+  {
+    SspRequestNotification::Dispatch(
+      &BluetoothNotificationHandler::SspRequestNotification,
+      SspRequestInitOp(aPDU));
+  }
+
+  // Init operator class for BondStateChangedNotification
+  class BondStateChangedInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    BondStateChangedInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (BluetoothStatus& aArg1, nsString& aArg2,
+                 BluetoothBondState& aArg3) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read status */
+      nsresult rv = UnpackPDU(pdu, aArg1);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read remote address */
+      rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg2));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read bond state */
+      rv = UnpackPDU(pdu, aArg3);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void BondStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
+                           BluetoothDaemonPDU& aPDU)
+  {
+    BondStateChangedNotification::Dispatch(
+      &BluetoothNotificationHandler::BondStateChangedNotification,
+      BondStateChangedInitOp(aPDU));
+  }
+
+  // Init operator class for AclStateChangedNotification
+  class AclStateChangedInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    AclStateChangedInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (BluetoothStatus& aArg1, nsString& aArg2, bool& aArg3) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read status */
+      nsresult rv = UnpackPDU(pdu, aArg1);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read remote address */
+      rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothAddress, nsAString>(aArg2));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read ACL state */
+      rv = UnpackPDU(
+        pdu, UnpackConversion<BluetoothAclState, bool>(aArg3));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void AclStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
+                          BluetoothDaemonPDU& aPDU)
+  {
+    AclStateChangedNotification::Dispatch(
+      &BluetoothNotificationHandler::AclStateChangedNotification,
+      AclStateChangedInitOp(aPDU));
+  }
+
+  // Init operator class for DutModeRecvNotification
+  class DutModeRecvInitOp MOZ_FINAL : private PDUInitOp
+  {
+  public:
+    DutModeRecvInitOp(BluetoothDaemonPDU& aPDU)
+    : PDUInitOp(aPDU)
+    { }
+
+    nsresult
+    operator () (uint16_t& aArg1, nsAutoArrayPtr<uint8_t>& aArg2,
+                 uint8_t& aArg3) const
+    {
+      BluetoothDaemonPDU& pdu = GetPDU();
+
+      /* Read opcode */
+      nsresult rv = UnpackPDU(pdu, aArg1);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read length */
+      rv = UnpackPDU(pdu, aArg3);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+
+      /* Read data */
+      rv = UnpackPDU(pdu, UnpackArray<uint8_t>(aArg2, aArg3));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
+      WarnAboutTrailingData();
+      return NS_OK;
+    }
+  };
+
+  void DutModeRecvNtf(const BluetoothDaemonPDUHeader& aHeader,
+                      BluetoothDaemonPDU& aPDU)
+  {
+    DutModeRecvNotification::Dispatch(
+      &BluetoothNotificationHandler::DutModeRecvNotification,
+      DutModeRecvInitOp(aPDU));
+  }
+
+  void LeTestModeNtf(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU)
+  {
+    LeTestModeNotification::Dispatch(
+      &BluetoothNotificationHandler::LeTestModeNotification,
+      UnpackPDUInitOp(aPDU));
+  }
+
+  void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU, void* aUserData)
+  {
+    static void (BluetoothDaemonCoreModule::* const HandleNtf[])(
+      const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
+      INIT_ARRAY_AT(0, &BluetoothDaemonCoreModule::AdapterStateChangedNtf),
+      INIT_ARRAY_AT(1, &BluetoothDaemonCoreModule::AdapterPropertiesNtf),
+      INIT_ARRAY_AT(2, &BluetoothDaemonCoreModule::RemoteDevicePropertiesNtf),
+      INIT_ARRAY_AT(3, &BluetoothDaemonCoreModule::DeviceFoundNtf),
+      INIT_ARRAY_AT(4, &BluetoothDaemonCoreModule::DiscoveryStateChangedNtf),
+      INIT_ARRAY_AT(5, &BluetoothDaemonCoreModule::PinRequestNtf),
+      INIT_ARRAY_AT(6, &BluetoothDaemonCoreModule::SspRequestNtf),
+      INIT_ARRAY_AT(7, &BluetoothDaemonCoreModule::BondStateChangedNtf),
+      INIT_ARRAY_AT(8, &BluetoothDaemonCoreModule::AclStateChangedNtf),
+      INIT_ARRAY_AT(9, &BluetoothDaemonCoreModule::DutModeRecvNtf),
+      INIT_ARRAY_AT(10, &BluetoothDaemonCoreModule::LeTestModeNtf)
+    };
+
+    MOZ_ASSERT(!NS_IsMainThread());
+
+    uint8_t index = aHeader.mOpcode - 0x81;
+
+    if (NS_WARN_IF(!(index < MOZ_ARRAY_LENGTH(HandleNtf))) ||
+        NS_WARN_IF(!HandleNtf[index])) {
+      return;
+    }
+
+    (this->*(HandleNtf[index]))(aHeader, aPDU);
+  }
+
+};
+
+//
+// Protocol handling
+//
+
+class BluetoothDaemonProtocol MOZ_FINAL
+  : public BluetoothDaemonPDUConsumer
+  , public BluetoothDaemonSetupModule
+  , public BluetoothDaemonCoreModule
+  , public BluetoothDaemonSocketModule
+{
+public:
+  BluetoothDaemonProtocol(BluetoothDaemonConnection* aConnection);
+
+  // Outgoing PDUs
+  //
+
+  nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) MOZ_OVERRIDE;
+
+  void StoreUserData(const BluetoothDaemonPDU& aPDU) MOZ_OVERRIDE;
+
+  // Incoming PUDs
+  //
+
+  void Handle(BluetoothDaemonPDU& aPDU) MOZ_OVERRIDE;
+
+  void* FetchUserData(const BluetoothDaemonPDUHeader& aHeader);
+
+private:
+  void HandleSetupSvc(const BluetoothDaemonPDUHeader& aHeader,
+                      BluetoothDaemonPDU& aPDU, void* aUserData);
+  void HandleCoreSvc(const BluetoothDaemonPDUHeader& aHeader,
+                     BluetoothDaemonPDU& aPDU, void* aUserData);
+  void HandleSocketSvc(const BluetoothDaemonPDUHeader& aHeader,
+                       BluetoothDaemonPDU& aPDU, void* aUserData);
+
+  BluetoothDaemonConnection* mConnection;
+  nsTArray<void*> mUserDataQ;
+};
+
+BluetoothDaemonProtocol::BluetoothDaemonProtocol(
+  BluetoothDaemonConnection* aConnection)
+  : mConnection(aConnection)
+{
+  MOZ_ASSERT(mConnection);
+}
+
+nsresult
+BluetoothDaemonProtocol::Send(BluetoothDaemonPDU* aPDU, void* aUserData)
+{
+  MOZ_ASSERT(aPDU);
+
+  aPDU->SetUserData(aUserData);
+  aPDU->UpdateHeader();
+  return mConnection->Send(aPDU); // Forward PDU to command channel
+}
+
+void
+BluetoothDaemonProtocol::HandleSetupSvc(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  void* aUserData)
+{
+  BluetoothDaemonSetupModule::HandleSvc(aHeader, aPDU, aUserData);
+}
+
+void
+BluetoothDaemonProtocol::HandleCoreSvc(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  void* aUserData)
+{
+  BluetoothDaemonCoreModule::HandleSvc(aHeader, aPDU, aUserData);
+}
+
+void
+BluetoothDaemonProtocol::HandleSocketSvc(
+  const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
+  void* aUserData)
+{
+  BluetoothDaemonSocketModule::HandleSvc(aHeader, aPDU, aUserData);
+}
+
+void
+BluetoothDaemonProtocol::Handle(BluetoothDaemonPDU& aPDU)
+{
+  static void (BluetoothDaemonProtocol::* const HandleSvc[])(
+    const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
+    INIT_ARRAY_AT(BluetoothDaemonSetupModule::SERVICE_ID,
+      &BluetoothDaemonProtocol::HandleSetupSvc),
+    INIT_ARRAY_AT(BluetoothDaemonCoreModule::SERVICE_ID,
+      &BluetoothDaemonProtocol::HandleCoreSvc),
+    INIT_ARRAY_AT(BluetoothDaemonSocketModule::SERVICE_ID,
+      &BluetoothDaemonProtocol::HandleSocketSvc)
+  };
+
+  BluetoothDaemonPDUHeader header;
+
+  if (NS_FAILED(UnpackPDU(aPDU, header)) ||
+      NS_WARN_IF(!(header.mService < MOZ_ARRAY_LENGTH(HandleSvc))) ||
+      NS_WARN_IF(!(HandleSvc[header.mService]))) {
+    return;
+  }
+
+  (this->*(HandleSvc[header.mService]))(header, aPDU, FetchUserData(header));
+}
+
+void
+BluetoothDaemonProtocol::StoreUserData(const BluetoothDaemonPDU& aPDU)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  mUserDataQ.AppendElement(aPDU.GetUserData());
+}
+
+void*
+BluetoothDaemonProtocol::FetchUserData(const BluetoothDaemonPDUHeader& aHeader)
+{
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  if (aHeader.mOpcode & 0x80) {
+    return nullptr; // Ignore notifications
+  }
+
+  void* userData = mUserDataQ.ElementAt(0);
+  mUserDataQ.RemoveElementAt(0);
+
+  return userData;
+}
+
+//
+// Channels
+//
+
+class BluetoothDaemonChannel MOZ_FINAL : public BluetoothDaemonConnection
+{
+public:
+  BluetoothDaemonChannel(BluetoothDaemonInterface::Channel aChannel);
+
+  nsresult ConnectSocket(BluetoothDaemonInterface* aInterface,
+                         BluetoothDaemonPDUConsumer* aConsumer);
+
+  // Connection state
+  //
+
+  void OnConnectSuccess() MOZ_OVERRIDE;
+  void OnConnectError() MOZ_OVERRIDE;
+  void OnDisconnect() MOZ_OVERRIDE;
+
+private:
+  BluetoothDaemonInterface* mInterface;
+  BluetoothDaemonInterface::Channel mChannel;
+};
+
+BluetoothDaemonChannel::BluetoothDaemonChannel(
+  BluetoothDaemonInterface::Channel aChannel)
+: mInterface(nullptr)
+, mChannel(aChannel)
+{ }
+
+nsresult
+BluetoothDaemonChannel::ConnectSocket(BluetoothDaemonInterface* aInterface,
+                                      BluetoothDaemonPDUConsumer* aConsumer)
+{
+  MOZ_ASSERT(aInterface);
+
+  mInterface = aInterface;
+
+  return BluetoothDaemonConnection::ConnectSocket(aConsumer);
+}
+
+void
+BluetoothDaemonChannel::OnConnectSuccess()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mInterface);
+
+  mInterface->OnConnectSuccess(mChannel);
+}
+
+void
+BluetoothDaemonChannel::OnConnectError()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mInterface);
+
+  mInterface->OnConnectError(mChannel);
+  mInterface = nullptr;
+}
+
+void
+BluetoothDaemonChannel::OnDisconnect()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(mInterface);
+
+  mInterface->OnDisconnect(mChannel);
+  mInterface = nullptr;
+}
+
+//
+// Interface
+//
+
+/* returns the container structure of a variable; _t is the container's
+ * type, _v the name of the variable, and _m is _v's field within _t
+ */
+#define container(_t, _v, _m) \
+  ( (_t*)( ((const unsigned char*)(_v)) - offsetof(_t, _m) ) )
+
+BluetoothDaemonInterface*
+BluetoothDaemonInterface::GetInstance()
+{
+  static BluetoothDaemonInterface* sBluetoothInterface;
+
+  if (sBluetoothInterface) {
+    return sBluetoothInterface;
+  }
+
+  // Only create channel objects here. The connection will be
+  // established by |BluetoothDaemonInterface::Init|.
+
+  BluetoothDaemonChannel* cmdChannel =
+    new BluetoothDaemonChannel(BluetoothDaemonInterface::CMD_CHANNEL);
+
+  BluetoothDaemonChannel* ntfChannel =
+    new BluetoothDaemonChannel(BluetoothDaemonInterface::NTF_CHANNEL);
+
+  // Create a new interface object with the channels and a
+  // protocol handler.
+
+  sBluetoothInterface =
+    new BluetoothDaemonInterface(cmdChannel,
+                                 ntfChannel,
+                                 new BluetoothDaemonProtocol(cmdChannel));
+
+  return sBluetoothInterface;
+}
+
+BluetoothDaemonInterface::BluetoothDaemonInterface(
+  BluetoothDaemonChannel* aCmdChannel,
+  BluetoothDaemonChannel* aNtfChannel,
+  BluetoothDaemonProtocol* aProtocol)
+: mCmdChannel(aCmdChannel)
+, mNtfChannel(aNtfChannel)
+, mProtocol(aProtocol)
+{
+  MOZ_ASSERT(mCmdChannel);
+  MOZ_ASSERT(mNtfChannel);
+  MOZ_ASSERT(mProtocol);
+}
+
+BluetoothDaemonInterface::~BluetoothDaemonInterface()
+{ }
+
+class BluetoothDaemonInterface::InitResultHandler MOZ_FINAL
+  : public BluetoothSetupResultHandler
+{
+public:
+  InitResultHandler(BluetoothDaemonInterface* aInterface,
+                    BluetoothResultHandler* aRes)
+    : mInterface(aInterface)
+    , mRes(aRes)
+    , mRegisteredSocketModule(false)
+  {
+    MOZ_ASSERT(mInterface);
+  }
+
+  // We need to call methods from the |BluetoothResultHandler|. Since
+  // we're already on the main thread and returned from Init, we don't
+  // need to dispatch a new runnable.
+
+  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    if (mRes) {
+      mRes->OnError(aStatus);
+    }
+  }
+
+  void RegisterModule() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(mInterface->mProtocol);
+
+    if (!mRegisteredSocketModule) {
+      mRegisteredSocketModule = true;
+      // Init, step 4: Register Socket module
+      mInterface->mProtocol->RegisterModuleCmd(
+        BluetoothDaemonSocketModule::SERVICE_ID, 0x00, this);
+    } else if (mRes) {
+      // Init, step 5: Signal success to caller
+      mRes->Init();
+    }
+  }
+
+private:
+  BluetoothDaemonInterface* mInterface;
+  nsRefPtr<BluetoothResultHandler> mRes;
+  bool mRegisteredSocketModule;
+};
+
+void
+BluetoothDaemonInterface::OnConnectSuccess(enum Channel aChannel)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mResultHandlerQ.IsEmpty());
+
+  switch (aChannel) {
+    case CMD_CHANNEL:
+      // Init, step 2: Connect notification channel...
+      if (mNtfChannel->GetConnectionStatus() != SOCKET_CONNECTED) {
+        nsresult rv = mNtfChannel->ConnectSocket(this, mProtocol);
+        if (NS_FAILED(rv)) {
+          OnConnectError(NTF_CHANNEL);
+        }
+      } else {
+        // ...or go to step 3 if channel is already connected.
+        OnConnectSuccess(NTF_CHANNEL);
+      }
+      break;
+
+    case NTF_CHANNEL: {
+        nsRefPtr<BluetoothResultHandler> res = mResultHandlerQ.ElementAt(0);
+        mResultHandlerQ.RemoveElementAt(0);
+
+        // Init, step 3: Register Core module
+        nsresult rv = mProtocol->RegisterModuleCmd(
+          BluetoothDaemonCoreModule::SERVICE_ID, 0x00,
+          new InitResultHandler(this, res));
+        if (NS_FAILED(rv) && res) {
+          DispatchError(res, STATUS_FAIL);
+        }
+      }
+      break;
+  }
+}
+
+void
+BluetoothDaemonInterface::OnConnectError(enum Channel aChannel)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mResultHandlerQ.IsEmpty());
+
+  switch (aChannel) {
+    case NTF_CHANNEL:
+      // Close command channel
+      mCmdChannel->CloseSocket();
+      /* fall through for cleanup and error signalling */
+    case CMD_CHANNEL: {
+        // Signal error to caller
+        nsRefPtr<BluetoothResultHandler> res = mResultHandlerQ.ElementAt(0);
+        mResultHandlerQ.RemoveElementAt(0);
+
+        if (res) {
+          DispatchError(res, STATUS_FAIL);
+        }
+      }
+      break;
+  }
+}
+
+void
+BluetoothDaemonInterface::OnDisconnect(enum Channel aChannel)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mResultHandlerQ.IsEmpty());
+
+  switch (aChannel) {
+    case NTF_CHANNEL:
+      // Cleanup, step 4: Close command channel
+      mCmdChannel->CloseSocket();
+      break;
+    case CMD_CHANNEL: {
+        nsRefPtr<BluetoothResultHandler> res = mResultHandlerQ.ElementAt(0);
+        mResultHandlerQ.RemoveElementAt(0);
+
+        // Cleanup, step 5: Signal success to caller
+        if (res) {
+          res->Cleanup();
+        }
+      }
+      break;
+  }
+}
+
+void
+BluetoothDaemonInterface::Init(
+  BluetoothNotificationHandler* aNotificationHandler,
+  BluetoothResultHandler* aRes)
+{
+  sNotificationHandler = aNotificationHandler;
+
+  mResultHandlerQ.AppendElement(aRes);
+
+  // Init, step 1: Connect command channel...
+  if (mCmdChannel->GetConnectionStatus() != SOCKET_CONNECTED) {
+    nsresult rv = mCmdChannel->ConnectSocket(this, mProtocol);
+    if (NS_FAILED(rv)) {
+      OnConnectError(CMD_CHANNEL);
+    }
+  } else {
+    // ...or go to step 2 if channel is already connected.
+    OnConnectSuccess(CMD_CHANNEL);
+  }
+}
+
+class BluetoothDaemonInterface::CleanupResultHandler MOZ_FINAL
+  : public BluetoothSetupResultHandler
+{
+public:
+  CleanupResultHandler(BluetoothDaemonInterface* aInterface)
+    : mInterface(aInterface)
+    , mUnregisteredCoreModule(false)
+  {
+    MOZ_ASSERT(mInterface);
+  }
+
+  void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    Proceed();
+  }
+
+  void UnregisterModule() MOZ_OVERRIDE
+  {
+    Proceed();
+  }
+
+private:
+  void Proceed()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(mInterface->mProtocol);
+
+    if (!mUnregisteredCoreModule) {
+      mUnregisteredCoreModule = true;
+      // Cleanup, step 2: Unregister Core module
+      mInterface->mProtocol->UnregisterModuleCmd(
+        BluetoothDaemonCoreModule::SERVICE_ID, this);
+    } else {
+      // Cleanup, step 3: Close notification channel
+      mInterface->mNtfChannel->CloseSocket();
+    }
+  }
+
+  BluetoothDaemonInterface* mInterface;
+  bool mUnregisteredCoreModule;
+};
+
+void
+BluetoothDaemonInterface::Cleanup(BluetoothResultHandler* aRes)
+{
+  sNotificationHandler = nullptr;
+
+  mResultHandlerQ.AppendElement(aRes);
+
+  // Cleanup, step 1: Unregister Socket module
+  mProtocol->UnregisterModuleCmd(
+    BluetoothDaemonSocketModule::SERVICE_ID, new CleanupResultHandler(this));
+}
+
+void
+BluetoothDaemonInterface::Enable(BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>(mProtocol)->EnableCmd(aRes);
+}
+
+void
+BluetoothDaemonInterface::Disable(BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>(mProtocol)->DisableCmd(aRes);
+}
+
+/* Adapter Properties */
+
+void
+BluetoothDaemonInterface::GetAdapterProperties(BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->GetAdapterPropertiesCmd(aRes);
+}
+
+void
+BluetoothDaemonInterface::GetAdapterProperty(const nsAString& aName,
+                                             BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->GetAdapterPropertyCmd(aName, aRes);
+}
+
+void
+BluetoothDaemonInterface::SetAdapterProperty(
+  const BluetoothNamedValue& aProperty, BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->SetAdapterPropertyCmd(aProperty, aRes);
+}
+
+/* Remote Device Properties */
+
+void
+BluetoothDaemonInterface::GetRemoteDeviceProperties(
+  const nsAString& aRemoteAddr, BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->GetRemoteDevicePropertiesCmd(aRemoteAddr, aRes);
+}
+
+void
+BluetoothDaemonInterface::GetRemoteDeviceProperty(
+  const nsAString& aRemoteAddr, const nsAString& aName,
+  BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->GetRemoteDevicePropertyCmd(aRemoteAddr, aName, aRes);
+}
+
+void
+BluetoothDaemonInterface::SetRemoteDeviceProperty(
+  const nsAString& aRemoteAddr, const BluetoothNamedValue& aProperty,
+  BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->SetRemoteDevicePropertyCmd(aRemoteAddr, aProperty, aRes);
+}
+
+/* Remote Services */
+
+void
+BluetoothDaemonInterface::GetRemoteServiceRecord(const nsAString& aRemoteAddr,
+                                                 const uint8_t aUuid[16],
+                                                 BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>(
+    mProtocol)->GetRemoteServiceRecordCmd(aRemoteAddr, aUuid, aRes);
+}
+
+void
+BluetoothDaemonInterface::GetRemoteServices(const nsAString& aRemoteAddr,
+                                            BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>(
+    mProtocol)->GetRemoteServicesCmd(aRemoteAddr, aRes);
+}
+
+/* Discovery */
+
+void
+BluetoothDaemonInterface::StartDiscovery(BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>(mProtocol)->StartDiscoveryCmd(aRes);
+}
+
+void
+BluetoothDaemonInterface::CancelDiscovery(BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->CancelDiscoveryCmd(aRes);
+}
+
+/* Bonds */
+
+void
+BluetoothDaemonInterface::CreateBond(const nsAString& aBdAddr,
+                                     BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->CreateBondCmd(aBdAddr, aRes);
+}
+
+void
+BluetoothDaemonInterface::RemoveBond(const nsAString& aBdAddr,
+                                     BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->RemoveBondCmd(aBdAddr, aRes);
+}
+
+void
+BluetoothDaemonInterface::CancelBond(const nsAString& aBdAddr,
+                                     BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->CancelBondCmd(aBdAddr, aRes);
+}
+
+/* Authentication */
+
+void
+BluetoothDaemonInterface::PinReply(const nsAString& aBdAddr, bool aAccept,
+                                   const nsAString& aPinCode,
+                                   BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->PinReplyCmd(aBdAddr, aAccept, aPinCode, aRes);
+}
+
+void
+BluetoothDaemonInterface::SspReply(const nsAString& aBdAddr,
+                                   const nsAString& aVariant,
+                                   bool aAccept, uint32_t aPasskey,
+                                   BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->SspReplyCmd(aBdAddr, aVariant, aAccept, aPasskey, aRes);
+}
+
+/* DUT Mode */
+
+void
+BluetoothDaemonInterface::DutModeConfigure(bool aEnable,
+                                           BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->DutModeConfigureCmd(aEnable, aRes);
+}
+
+void
+BluetoothDaemonInterface::DutModeSend(uint16_t aOpcode, uint8_t* aBuf,
+                                      uint8_t aLen,
+                                      BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->DutModeSendCmd(aOpcode, aBuf, aLen, aRes);
+}
+
+/* LE Mode */
+
+void
+BluetoothDaemonInterface::LeTestMode(uint16_t aOpcode, uint8_t* aBuf,
+                                     uint8_t aLen,
+                                     BluetoothResultHandler* aRes)
+{
+  static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->LeTestModeCmd(aOpcode, aBuf, aLen, aRes);
+}
+
+void
+BluetoothDaemonInterface::DispatchError(BluetoothResultHandler* aRes,
+                                        BluetoothStatus aStatus)
+{
+  BluetoothResultRunnable1<
+    BluetoothResultHandler, void, BluetoothStatus, BluetoothStatus>::Dispatch(
+    aRes, &BluetoothResultHandler::OnError,
+    ConstantInitOp1<BluetoothStatus>(aStatus));
+}
+
+// Profile Interfaces
+//
+
+BluetoothSocketInterface*
+BluetoothDaemonInterface::GetBluetoothSocketInterface()
+{
+  if (mSocketInterface) {
+    return mSocketInterface;
+  }
+
+  mSocketInterface = new BluetoothDaemonSocketInterface(mProtocol);
+
+  return mSocketInterface;
+}
+
+BluetoothHandsfreeInterface*
+BluetoothDaemonInterface::GetBluetoothHandsfreeInterface()
+{
+  return nullptr;
+}
+
+BluetoothA2dpInterface*
+BluetoothDaemonInterface::GetBluetoothA2dpInterface()
+{
+  return nullptr;
+}
+
+BluetoothAvrcpInterface*
+BluetoothDaemonInterface::GetBluetoothAvrcpInterface()
+{
+  return nullptr;
+}
+
+BluetoothGattInterface*
+BluetoothDaemonInterface::GetBluetoothGattInterface()
+{
+  return nullptr;
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonInterface.h	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,133 @@
+/* -*- 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/. */
+
+#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemoninterface_h__
+#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemoninterface_h__
+
+#include "BluetoothInterface.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothDaemonChannel;
+class BluetoothDaemonProtocol;
+class BluetoothDaemonSocketInterface;
+
+class BluetoothDaemonInterface MOZ_FINAL : public BluetoothInterface
+{
+public:
+  class CleanupResultHandler;
+  class InitResultHandler;
+
+  friend class BluetoothDaemonChannel;
+  friend class CleanupResultHandler;
+  friend class InitResultHandler;
+
+  static BluetoothDaemonInterface* GetInstance();
+
+  void Init(BluetoothNotificationHandler* aNotificationHandler,
+            BluetoothResultHandler* aRes);
+  void Cleanup(BluetoothResultHandler* aRes);
+
+  void Enable(BluetoothResultHandler* aRes);
+  void Disable(BluetoothResultHandler* aRes);
+
+  /* Adapter Properties */
+
+  void GetAdapterProperties(BluetoothResultHandler* aRes);
+  void GetAdapterProperty(const nsAString& aName,
+                          BluetoothResultHandler* aRes);
+  void SetAdapterProperty(const BluetoothNamedValue& aProperty,
+                          BluetoothResultHandler* aRes);
+
+  /* Remote Device Properties */
+
+  void GetRemoteDeviceProperties(const nsAString& aRemoteAddr,
+                                 BluetoothResultHandler* aRes);
+  void GetRemoteDeviceProperty(const nsAString& aRemoteAddr,
+                               const nsAString& aName,
+                               BluetoothResultHandler* aRes);
+  void SetRemoteDeviceProperty(const nsAString& aRemoteAddr,
+                               const BluetoothNamedValue& aProperty,
+                               BluetoothResultHandler* aRes);
+
+  /* Remote Services */
+
+  void GetRemoteServiceRecord(const nsAString& aRemoteAddr,
+                              const uint8_t aUuid[16],
+                              BluetoothResultHandler* aRes);
+  void GetRemoteServices(const nsAString& aRemoteAddr,
+                         BluetoothResultHandler* aRes);
+
+  /* Discovery */
+
+  void StartDiscovery(BluetoothResultHandler* aRes);
+  void CancelDiscovery(BluetoothResultHandler* aRes);
+
+  /* Bonds */
+
+  void CreateBond(const nsAString& aBdAddr, BluetoothResultHandler* aRes);
+  void RemoveBond(const nsAString& aBdAddr, BluetoothResultHandler* aRes);
+  void CancelBond(const nsAString& aBdAddr, BluetoothResultHandler* aRes);
+
+  /* Authentication */
+
+  void PinReply(const nsAString& aBdAddr, bool aAccept,
+                const nsAString& aPinCode,
+                BluetoothResultHandler* aRes);
+
+  void SspReply(const nsAString& aBdAddr, const nsAString& aVariant,
+                bool aAccept, uint32_t aPasskey,
+                BluetoothResultHandler* aRes);
+
+  /* DUT Mode */
+
+  void DutModeConfigure(bool aEnable, BluetoothResultHandler* aRes);
+  void DutModeSend(uint16_t aOpcode, uint8_t* aBuf, uint8_t aLen,
+                   BluetoothResultHandler* aRes);
+
+  /* LE Mode */
+
+  void LeTestMode(uint16_t aOpcode, uint8_t* aBuf, uint8_t aLen,
+                  BluetoothResultHandler* aRes);
+
+  /* Profile Interfaces */
+
+  BluetoothSocketInterface* GetBluetoothSocketInterface() MOZ_OVERRIDE;
+  BluetoothHandsfreeInterface* GetBluetoothHandsfreeInterface() MOZ_OVERRIDE;
+  BluetoothA2dpInterface* GetBluetoothA2dpInterface() MOZ_OVERRIDE;
+  BluetoothAvrcpInterface* GetBluetoothAvrcpInterface() MOZ_OVERRIDE;
+  BluetoothGattInterface* GetBluetoothGattInterface() MOZ_OVERRIDE;
+
+protected:
+  enum Channel {
+    CMD_CHANNEL,
+    NTF_CHANNEL
+  };
+
+  BluetoothDaemonInterface(BluetoothDaemonChannel* aCmdChannel,
+                           BluetoothDaemonChannel* aNtfChannel,
+                           BluetoothDaemonProtocol* aProtocol);
+  ~BluetoothDaemonInterface();
+
+  void OnConnectSuccess(enum Channel aChannel);
+  void OnConnectError(enum Channel aChannel);
+  void OnDisconnect(enum Channel aChannel);
+
+private:
+  void DispatchError(BluetoothResultHandler* aRes, BluetoothStatus aStatus);
+
+  nsAutoPtr<BluetoothDaemonChannel> mCmdChannel;
+  nsAutoPtr<BluetoothDaemonChannel> mNtfChannel;
+  nsAutoPtr<BluetoothDaemonProtocol> mProtocol;
+
+  nsTArray<nsRefPtr<BluetoothResultHandler> > mResultHandlerQ;
+
+  nsAutoPtr<BluetoothDaemonSocketInterface> mSocketInterface;
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,32 @@
+/* -*- 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 "BluetoothDaemonSetupInterface.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+BluetoothSetupResultHandler::~BluetoothSetupResultHandler()
+{ }
+
+void
+BluetoothSetupResultHandler::OnError(BluetoothStatus aStatus)
+{
+  BT_WARNING("Received error code %d", (int)aStatus);
+}
+
+void
+BluetoothSetupResultHandler::RegisterModule()
+{ }
+
+void
+BluetoothSetupResultHandler::UnregisterModule()
+{ }
+
+void
+BluetoothSetupResultHandler::Configuration()
+{ }
+
+END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSetupInterface.h	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,29 @@
+/* -*- 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/. */
+
+#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsetupinterface_h__
+#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsetupinterface_h__
+
+#include "BluetoothCommon.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothSetupResultHandler
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothSetupResultHandler)
+
+  virtual ~BluetoothSetupResultHandler();
+
+  virtual void OnError(BluetoothStatus aStatus);
+  virtual void RegisterModule();
+  virtual void UnregisterModule();
+  virtual void Configuration();
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,352 @@
+/* -*- 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 "BluetoothDaemonSocketInterface.h"
+#include "BluetoothSocketMessageWatcher.h"
+#include "nsXULAppAPI.h"
+#include "mozilla/unused.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Socket module
+//
+
+// Commands
+//
+
+nsresult
+BluetoothDaemonSocketModule::ListenCmd(BluetoothSocketType aType,
+                                       const nsAString& aServiceName,
+                                       const uint8_t aServiceUuid[16],
+                                       int aChannel, bool aEncrypt,
+                                       bool aAuth,
+                                       BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(
+    SERVICE_ID, OPCODE_LISTEN, 0));
+
+  nsresult rv = PackPDU(
+    aType,
+    PackConversion<nsAString, BluetoothServiceName>(aServiceName),
+    PackArray<uint8_t>(aServiceUuid, 16),
+    PackConversion<int, uint16_t>(aChannel),
+    SocketFlags(aEncrypt, aAuth), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return rv;
+}
+
+nsresult
+BluetoothDaemonSocketModule::ConnectCmd(const nsAString& aBdAddr,
+                                        BluetoothSocketType aType,
+                                        const uint8_t aUuid[16],
+                                        int aChannel, bool aEncrypt,
+                                        bool aAuth,
+                                        BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(
+      SERVICE_ID, OPCODE_CONNECT, 0));
+
+  nsresult rv = PackPDU(
+    PackConversion<nsAString, BluetoothAddress>(aBdAddr),
+    aType,
+    PackArray<uint8_t>(aUuid, 16),
+    PackConversion<int, int16_t>(aChannel),
+    SocketFlags(aEncrypt, aAuth), *pdu);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  rv = Send(pdu, aRes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  unused << pdu.forget();
+  return rv;
+}
+
+/* |DeleteTask| deletes a class instance on the I/O thread
+ */
+template <typename T>
+class DeleteTask MOZ_FINAL : public Task
+{
+public:
+  DeleteTask(T* aPtr)
+  : mPtr(aPtr)
+  { }
+
+  void Run() MOZ_OVERRIDE
+  {
+    mPtr = nullptr;
+  }
+
+private:
+  nsAutoPtr<T> mPtr;
+};
+
+/* |AcceptWatcher| specializes SocketMessageWatcher for Accept
+ * operations by reading the socket messages from Bluedroid and
+ * forwarding the received client socket to the resource handler.
+ * The first message is received immediately. When there's a new
+ * connection, Bluedroid sends the 2nd message with the socket
+ * info and socket file descriptor.
+ */
+class BluetoothDaemonSocketModule::AcceptWatcher MOZ_FINAL
+  : public SocketMessageWatcher
+{
+public:
+  AcceptWatcher(int aFd, BluetoothSocketResultHandler* aRes)
+  : SocketMessageWatcher(aFd, aRes)
+  { }
+
+  void Proceed(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    if (aStatus == STATUS_SUCCESS) {
+      IntStringIntResultRunnable::Dispatch(
+        GetResultHandler(), &BluetoothSocketResultHandler::Accept,
+        ConstantInitOp3<int, nsString, int>(GetClientFd(), GetBdAddress(),
+                                            GetConnectionStatus()));
+    } else {
+      ErrorRunnable::Dispatch(GetResultHandler(),
+                              &BluetoothSocketResultHandler::OnError,
+                              ConstantInitOp1<BluetoothStatus>(aStatus));
+    }
+
+    MessageLoopForIO::current()->PostTask(
+      FROM_HERE, new DeleteTask<AcceptWatcher>(this));
+  }
+};
+
+nsresult
+BluetoothDaemonSocketModule::AcceptCmd(int aFd,
+                                       BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  /* receive Bluedroid's socket-setup messages and client fd */
+  Task* t = new SocketMessageWatcherTask(new AcceptWatcher(aFd, aRes));
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, t);
+
+  return NS_OK;
+}
+
+nsresult
+BluetoothDaemonSocketModule::CloseCmd(BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  /* stop the watcher corresponding to |aRes| */
+  Task* t = new DeleteSocketMessageWatcherTask(aRes);
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, t);
+
+  return NS_OK;
+}
+
+void
+BluetoothDaemonSocketModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
+                                       BluetoothDaemonPDU& aPDU,
+                                       void* aUserData)
+{
+  static void (BluetoothDaemonSocketModule::* const HandleRsp[])(
+    const BluetoothDaemonPDUHeader&,
+    BluetoothDaemonPDU&,
+    BluetoothSocketResultHandler*) = {
+    INIT_ARRAY_AT(OPCODE_ERROR, &BluetoothDaemonSocketModule::ErrorRsp),
+    INIT_ARRAY_AT(OPCODE_LISTEN, &BluetoothDaemonSocketModule::ListenRsp),
+    INIT_ARRAY_AT(OPCODE_CONNECT, &BluetoothDaemonSocketModule::ConnectRsp),
+  };
+
+  if (NS_WARN_IF(MOZ_ARRAY_LENGTH(HandleRsp) <= aHeader.mOpcode) ||
+      NS_WARN_IF(!HandleRsp[aHeader.mOpcode])) {
+    return;
+  }
+
+  nsRefPtr<BluetoothSocketResultHandler> res =
+    already_AddRefed<BluetoothSocketResultHandler>(
+      static_cast<BluetoothSocketResultHandler*>(aUserData));
+
+  if (!res) {
+    return; // Return early if no result handler has been set
+  }
+
+  (this->*(HandleRsp[aHeader.mOpcode]))(aHeader, aPDU, res);
+}
+
+nsresult
+BluetoothDaemonSocketModule::Send(BluetoothDaemonPDU* aPDU,
+                                  BluetoothSocketResultHandler* aRes)
+{
+  aRes->AddRef(); // Keep reference for response
+  return Send(aPDU, static_cast<void*>(aRes));
+}
+
+uint8_t
+BluetoothDaemonSocketModule::SocketFlags(bool aEncrypt, bool aAuth)
+{
+  return (0x01 * aEncrypt) | (0x02 * aAuth);
+}
+
+// Responses
+//
+
+void
+BluetoothDaemonSocketModule::ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                      BluetoothDaemonPDU& aPDU,
+                                      BluetoothSocketResultHandler* aRes)
+{
+  ErrorRunnable::Dispatch(
+    aRes, &BluetoothSocketResultHandler::OnError, UnpackPDUInitOp(aPDU));
+}
+
+class BluetoothDaemonSocketModule::ListenInitOp MOZ_FINAL : private PDUInitOp
+{
+public:
+  ListenInitOp(BluetoothDaemonPDU& aPDU)
+  : PDUInitOp(aPDU)
+  { }
+
+  nsresult
+  operator () (int& aArg1) const
+  {
+    BluetoothDaemonPDU& pdu = GetPDU();
+
+    aArg1 = pdu.AcquireFd();
+
+    if (NS_WARN_IF(aArg1 < 0)) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    WarnAboutTrailingData();
+    return NS_OK;
+  }
+};
+
+void
+BluetoothDaemonSocketModule::ListenRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                       BluetoothDaemonPDU& aPDU,
+                                       BluetoothSocketResultHandler* aRes)
+{
+  IntResultRunnable::Dispatch(
+    aRes, &BluetoothSocketResultHandler::Listen, ListenInitOp(aPDU));
+}
+
+/* |ConnectWatcher| specializes SocketMessageWatcher for
+ * connect operations by reading the socket messages from
+ * Bluedroid and forwarding the connected socket to the
+ * resource handler.
+ */
+class BluetoothDaemonSocketModule::ConnectWatcher MOZ_FINAL
+  : public SocketMessageWatcher
+{
+public:
+  ConnectWatcher(int aFd, BluetoothSocketResultHandler* aRes)
+  : SocketMessageWatcher(aFd, aRes)
+  { }
+
+  void Proceed(BluetoothStatus aStatus) MOZ_OVERRIDE
+  {
+    if (aStatus == STATUS_SUCCESS) {
+      IntStringIntResultRunnable::Dispatch(
+        GetResultHandler(), &BluetoothSocketResultHandler::Connect,
+        ConstantInitOp3<int, nsString, int>(GetFd(), GetBdAddress(),
+                                            GetConnectionStatus()));
+    } else {
+      ErrorRunnable::Dispatch(GetResultHandler(),
+                              &BluetoothSocketResultHandler::OnError,
+                              ConstantInitOp1<BluetoothStatus>(aStatus));
+    }
+
+    MessageLoopForIO::current()->PostTask(
+      FROM_HERE, new DeleteTask<ConnectWatcher>(this));
+  }
+};
+
+void
+BluetoothDaemonSocketModule::ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
+                                        BluetoothDaemonPDU& aPDU,
+                                        BluetoothSocketResultHandler* aRes)
+{
+  /* the file descriptor is attached in the PDU's ancillary data */
+  int fd = aPDU.AcquireFd();
+  if (fd < 0) {
+    ErrorRunnable::Dispatch(aRes, &BluetoothSocketResultHandler::OnError,
+                            ConstantInitOp1<BluetoothStatus>(STATUS_FAIL));
+    return;
+  }
+
+  /* receive Bluedroid's socket-setup messages */
+  Task* t = new SocketMessageWatcherTask(new ConnectWatcher(fd, aRes));
+  XRE_GetIOMessageLoop()->PostTask(FROM_HERE, t);
+}
+
+//
+// Socket interface
+//
+
+BluetoothDaemonSocketInterface::BluetoothDaemonSocketInterface(
+  BluetoothDaemonSocketModule* aModule)
+: mModule(aModule)
+{
+  MOZ_ASSERT(mModule);
+}
+
+BluetoothDaemonSocketInterface::~BluetoothDaemonSocketInterface()
+{ }
+
+void
+BluetoothDaemonSocketInterface::Listen(BluetoothSocketType aType,
+                                       const nsAString& aServiceName,
+                                       const uint8_t aServiceUuid[16],
+                                       int aChannel, bool aEncrypt,
+                                       bool aAuth,
+                                       BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->ListenCmd(aType, aServiceName, aServiceUuid, aChannel,
+                     aEncrypt, aAuth, aRes);
+}
+
+void
+BluetoothDaemonSocketInterface::Connect(const nsAString& aBdAddr,
+                                        BluetoothSocketType aType,
+                                        const uint8_t aUuid[16],
+                                        int aChannel, bool aEncrypt,
+                                        bool aAuth,
+                                        BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->ConnectCmd(aBdAddr, aType, aUuid, aChannel, aEncrypt, aAuth, aRes);
+}
+
+void
+BluetoothDaemonSocketInterface::Accept(int aFd,
+                                    BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->AcceptCmd(aFd, aRes);
+}
+
+void
+BluetoothDaemonSocketInterface::Close(BluetoothSocketResultHandler* aRes)
+{
+  MOZ_ASSERT(mModule);
+
+  mModule->CloseCmd(aRes);
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/bluedroid/BluetoothDaemonSocketInterface.h	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,129 @@
+/* -*- 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/. */
+
+#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsocketinterface_h__
+#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsocketinterface_h__
+
+#include "BluetoothDaemonHelpers.h"
+#include "BluetoothInterface.h"
+#include "BluetoothInterfaceHelpers.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+using namespace mozilla::ipc;
+
+class BlutoothDaemonInterface;
+
+class BluetoothDaemonSocketModule
+{
+public:
+  enum {
+    SERVICE_ID = 0x02
+  };
+
+  enum {
+    OPCODE_ERROR = 0x00,
+    OPCODE_LISTEN = 0x01,
+    OPCODE_CONNECT = 0x02
+  };
+
+  virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
+
+  // Commands
+  //
+
+  nsresult ListenCmd(BluetoothSocketType aType,
+                     const nsAString& aServiceName,
+                     const uint8_t aServiceUuid[16],
+                     int aChannel, bool aEncrypt, bool aAuth,
+                     BluetoothSocketResultHandler* aRes);
+
+  nsresult ConnectCmd(const nsAString& aBdAddr,
+                      BluetoothSocketType aType,
+                      const uint8_t aUuid[16],
+                      int aChannel, bool aEncrypt, bool aAuth,
+                      BluetoothSocketResultHandler* aRes);
+
+  nsresult AcceptCmd(int aFd, BluetoothSocketResultHandler* aRes);
+
+  nsresult CloseCmd(BluetoothSocketResultHandler* aRes);
+
+protected:
+
+  void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU, void* aUserData);
+
+  nsresult Send(BluetoothDaemonPDU* aPDU, BluetoothSocketResultHandler* aRes);
+
+private:
+  class AcceptWatcher;
+  class ConnectWatcher;
+  class ListenInitOp;
+
+  uint8_t SocketFlags(bool aEncrypt, bool aAuth);
+
+  // Responses
+  //
+
+  typedef BluetoothResultRunnable0<BluetoothSocketResultHandler, void>
+    ResultRunnable;
+
+  typedef BluetoothResultRunnable1<BluetoothSocketResultHandler, void,
+                                   int, int>
+    IntResultRunnable;
+
+  typedef BluetoothResultRunnable1<BluetoothSocketResultHandler, void,
+                                   BluetoothStatus, BluetoothStatus>
+    ErrorRunnable;
+
+  typedef BluetoothResultRunnable3<BluetoothSocketResultHandler, void,
+                                   int, nsString, int,
+                                   int, const nsAString_internal&, int>
+    IntStringIntResultRunnable;
+
+  void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
+                BluetoothDaemonPDU& aPDU,
+                BluetoothSocketResultHandler* aRes);
+
+  void ListenRsp(const BluetoothDaemonPDUHeader& aHeader,
+                 BluetoothDaemonPDU& aPDU,
+                 BluetoothSocketResultHandler* aRes);
+
+  void ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
+                  BluetoothDaemonPDU& aPDU,
+                  BluetoothSocketResultHandler* aRes);
+};
+
+class BluetoothDaemonSocketInterface MOZ_FINAL
+  : public BluetoothSocketInterface
+{
+public:
+  BluetoothDaemonSocketInterface(BluetoothDaemonSocketModule* aModule);
+  ~BluetoothDaemonSocketInterface();
+
+  void Listen(BluetoothSocketType aType,
+              const nsAString& aServiceName,
+              const uint8_t aServiceUuid[16],
+              int aChannel, bool aEncrypt, bool aAuth,
+              BluetoothSocketResultHandler* aRes);
+
+  void Connect(const nsAString& aBdAddr,
+               BluetoothSocketType aType,
+               const uint8_t aUuid[16],
+               int aChannel, bool aEncrypt, bool aAuth,
+               BluetoothSocketResultHandler* aRes);
+
+  void Accept(int aFd, BluetoothSocketResultHandler* aRes);
+
+  void Close(BluetoothSocketResultHandler* aRes);
+
+private:
+  BluetoothDaemonSocketModule* mModule;
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothCommon.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothCommon.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothCommon.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothCommon.h	2014-11-26 21:45:56.000000000 +0000
@@ -18,14 +18,17 @@
 
 #if MOZ_IS_GCC && MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
 /* use designated array initializers if supported */
-#define CONVERT(in_, out_) \
+#define INIT_ARRAY_AT(in_, out_) \
   [in_] = out_
 #else
 /* otherwise init array element by position */
-#define CONVERT(in_, out_) \
+#define INIT_ARRAY_AT(in_, out_) \
   out_
 #endif
 
+#define CONVERT(in_, out_) \
+  INIT_ARRAY_AT(in_, out_)
+
 #undef BT_LOG
 #if defined(MOZ_WIDGET_GONK)
 #include <android/log.h>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothInterface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothInterface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothInterface.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothInterface.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -8,6 +8,9 @@
 #ifdef MOZ_B2G_BT_BLUEDROID
 #include "BluetoothHALInterface.h"
 #endif
+#ifdef MOZ_B2G_BT_DAEMON
+#include "BluetoothDaemonInterface.h"
+#endif
 
 BEGIN_BLUETOOTH_NAMESPACE
 
@@ -124,15 +127,19 @@
 BluetoothInterface::GetInstance()
 {
   /* Here's where we decide which implementation to use. Currently
-   * there is only Bluedroid, but others are possible. Having multiple
-   * interfaces built-in and selecting the correct one at runtime could
-   * also be an option.
+   * there is only Bluedroid and the Bluetooth daemon, but others are
+   * possible. Having multiple interfaces built-in and selecting the
+   * correct one at runtime could also be an option.
    */
 #ifdef MOZ_B2G_BT_BLUEDROID
   return BluetoothHALInterface::GetInstance();
 #else
+#ifdef MOZ_B2G_BT_DAEMON
+  return BluetoothDaemonInterface::GetInstance();
+#else
   return nullptr;
 #endif
+#endif
 }
 
 BluetoothInterface::BluetoothInterface()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothInterfaceHelpers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothInterfaceHelpers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothInterfaceHelpers.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothInterfaceHelpers.h	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,759 @@
+/* -*- 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/. */
+
+#ifndef mozilla_dom_bluetooth_bluetoothinterfacehelpers_h
+#define mozilla_dom_bluetooth_bluetoothinterfacehelpers_h
+
+#include "BluetoothCommon.h"
+#include "nsThreadUtils.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Result handling
+//
+// The classes of type |BluetoothResultRunnable[0..3]| transfer
+// a result handler from the I/O thread to the main thread for
+// execution. Call the methods |Create| and |Dispatch| to create or
+// create-and-dispatch a result runnable.
+//
+// You need to specify the called method. The |Create| and |Dispatch|
+// methods of |BluetoothResultRunnable[1..3]| receive an extra argument
+// for initializing the result's arguments. During creation, the result
+// runnable calls the supplied class's call operator with the result's
+// argument. This is where initialization and conversion from backend-
+// specific types is performed.
+//
+
+template <typename Obj, typename Res>
+class BluetoothResultRunnable0 : public nsRunnable
+{
+public:
+  typedef BluetoothResultRunnable0<Obj, Res> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Obj* aObj, Res (Obj::*aMethod)(), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aObj, aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Obj* aObj, Res (Obj::*aMethod)(), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aObj, aMethod, aInitOp);
+    if (!runnable) {
+      BT_LOGR("BluetoothResultRunnable0::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_LOGR("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    ((*mObj).*mMethod)();
+    return NS_OK;
+  }
+
+private:
+  BluetoothResultRunnable0(Obj* aObj, Res (Obj::*aMethod)())
+  : mObj(aObj)
+  , mMethod(aMethod)
+  {
+    MOZ_ASSERT(mObj);
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    return aInitOp();
+  }
+
+  nsRefPtr<Obj> mObj;
+  void (Obj::*mMethod)();
+};
+
+template <typename Obj, typename Res, typename Tin1, typename Arg1>
+class BluetoothResultRunnable1 : public nsRunnable
+{
+public:
+  typedef BluetoothResultRunnable1<Obj, Res, Tin1, Arg1> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Obj* aObj, Res (Obj::*aMethod)(Arg1), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aObj, aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Obj* aObj, Res (Obj::*aMethod)(Arg1), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aObj, aMethod, aInitOp);
+    if (!runnable) {
+      BT_LOGR("BluetoothResultRunnable1::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_LOGR("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    ((*mObj).*mMethod)(mArg1);
+    return NS_OK;
+  }
+
+private:
+  BluetoothResultRunnable1(Obj* aObj, Res (Obj::*aMethod)(Arg1))
+  : mObj(aObj)
+  , mMethod(aMethod)
+  {
+    MOZ_ASSERT(mObj);
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    return aInitOp(mArg1);
+  }
+
+  nsRefPtr<Obj> mObj;
+  Res (Obj::*mMethod)(Arg1);
+  Tin1 mArg1;
+};
+
+template <typename Obj, typename Res,
+          typename Tin1, typename Tin2, typename Tin3,
+          typename Arg1, typename Arg2, typename Arg3>
+class BluetoothResultRunnable3 : public nsRunnable
+{
+public:
+  typedef BluetoothResultRunnable3<Obj, Res,
+                                   Tin1, Tin2, Tin3,
+                                   Arg1, Arg2, Arg3> SelfType;
+
+  template<typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Obj* aObj, Res (Obj::*aMethod)(Arg1, Arg2, Arg3),
+         const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aObj, aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template<typename InitOp>
+  static void
+  Dispatch(Obj* aObj, Res (Obj::*aMethod)(Arg1, Arg2, Arg3),
+           const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aObj, aMethod, aInitOp);
+    if (!runnable) {
+      BT_LOGR("BluetoothResultRunnable3::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    ((*mObj).*mMethod)(mArg1, mArg2, mArg3);
+    return NS_OK;
+  }
+
+private:
+  BluetoothResultRunnable3(Obj* aObj, Res (Obj::*aMethod)(Arg1, Arg2, Arg3))
+  : mObj(aObj)
+  , mMethod(aMethod)
+  {
+    MOZ_ASSERT(mObj);
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    return aInitOp(mArg1, mArg2, mArg3);
+  }
+
+  nsRefPtr<Obj> mObj;
+  Res (Obj::*mMethod)(Arg1, Arg2, Arg3);
+  Tin1 mArg1;
+  Tin2 mArg2;
+  Tin3 mArg3;
+};
+
+//
+// Notification handling
+//
+// The classes of type |BluetoothNotificationRunnable[0..5]| transfer
+// a notification from the I/O thread to a notification handler on the
+// main thread. Call the methods |Create| and |Dispatch| to create or
+// create-and-dispatch a notification runnable.
+//
+// Like with result runnables, you need to specify the called method.
+// And like with result runnables, the |Create| and |Dispatch| methods
+// of |BluetoothNotificationRunnable[1..5]| receive an extra argument
+// for initializing the notification's arguments. During creation, the
+// notification runnable calls the class's call operator with the
+// notification's argument. This is where initialization and conversion
+// from backend-specific types is performed.
+//
+
+template <typename ObjectWrapper, typename Res>
+class BluetoothNotificationRunnable0 : public nsRunnable
+{
+public:
+  typedef typename ObjectWrapper::ObjectType  ObjectType;
+  typedef BluetoothNotificationRunnable0<ObjectWrapper, Res> SelfType;
+
+  template<typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Res (ObjectType::*aMethod)(), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template<typename InitOp>
+  static void
+  Dispatch(Res (ObjectType::*aMethod)(), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aMethod, aInitOp);
+    if (!runnable) {
+      BT_WARNING("BluetoothNotificationRunnable0::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    ObjectType* obj = ObjectWrapper::GetInstance();
+    if (!obj) {
+      BT_WARNING("Notification handler not initialized");
+    } else {
+      ((*obj).*mMethod)();
+    }
+    return NS_OK;
+  }
+
+private:
+  BluetoothNotificationRunnable0(Res (ObjectType::*aMethod)())
+  : mMethod(aMethod)
+  {
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    return aInitOp();
+  }
+
+  Res (ObjectType::*mMethod)();
+};
+
+template <typename ObjectWrapper, typename Res,
+          typename Tin1, typename Arg1=Tin1>
+class BluetoothNotificationRunnable1 : public nsRunnable
+{
+public:
+  typedef typename ObjectWrapper::ObjectType  ObjectType;
+  typedef BluetoothNotificationRunnable1<ObjectWrapper, Res,
+                                         Tin1, Arg1> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Res (ObjectType::*aMethod)(Arg1), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Res (ObjectType::*aMethod)(Arg1), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aMethod, aInitOp);
+
+    if (!runnable) {
+      BT_WARNING("BluetoothNotificationRunnable1::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    ObjectType* obj = ObjectWrapper::GetInstance();
+    if (!obj) {
+      BT_WARNING("Notification handler not initialized");
+    } else {
+      ((*obj).*mMethod)(mArg1);
+    }
+    return NS_OK;
+  }
+
+private:
+  BluetoothNotificationRunnable1(Res (ObjectType::*aMethod)(Arg1))
+  : mMethod(aMethod)
+  {
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    nsresult rv = aInitOp(mArg1);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    return NS_OK;
+  }
+
+  Res (ObjectType::*mMethod)(Arg1);
+  Tin1 mArg1;
+};
+
+template <typename ObjectWrapper, typename Res,
+          typename Tin1, typename Tin2,
+          typename Arg1=Tin1, typename Arg2=Tin2>
+class BluetoothNotificationRunnable2 : public nsRunnable
+{
+public:
+  typedef typename ObjectWrapper::ObjectType  ObjectType;
+  typedef BluetoothNotificationRunnable2<ObjectWrapper, Res,
+                                         Tin1, Tin2,
+                                         Arg1, Arg2> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Res (ObjectType::*aMethod)(Arg1, Arg2), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Res (ObjectType::*aMethod)(Arg1, Arg2), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aMethod, aInitOp);
+    if (!runnable) {
+      BT_WARNING("BluetoothNotificationRunnable2::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    ObjectType* obj = ObjectWrapper::GetInstance();
+    if (!obj) {
+      BT_WARNING("Notification handler not initialized");
+    } else {
+      ((*obj).*mMethod)(mArg1, mArg2);
+    }
+    return NS_OK;
+  }
+
+private:
+  BluetoothNotificationRunnable2(
+    Res (ObjectType::*aMethod)(Arg1, Arg2))
+  : mMethod(aMethod)
+  {
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    nsresult rv = aInitOp(mArg1, mArg2);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    return NS_OK;
+  }
+
+  Res (ObjectType::*mMethod)(Arg1, Arg2);
+  Tin1 mArg1;
+  Tin2 mArg2;
+};
+
+template <typename ObjectWrapper, typename Res,
+          typename Tin1, typename Tin2, typename Tin3,
+          typename Arg1=Tin1, typename Arg2=Tin2, typename Arg3=Tin3>
+class BluetoothNotificationRunnable3 : public nsRunnable
+{
+public:
+  typedef typename ObjectWrapper::ObjectType  ObjectType;
+  typedef BluetoothNotificationRunnable3<ObjectWrapper, Res,
+                                             Tin1, Tin2, Tin3,
+                                             Arg1, Arg2, Arg3> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType>
+  Create(Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3), const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3),
+           const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aMethod, aInitOp);
+    if (!runnable) {
+      BT_WARNING("BluetoothNotificationRunnable3::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    ObjectType* obj = ObjectWrapper::GetInstance();
+    if (!obj) {
+      BT_WARNING("Notification handler not initialized");
+    } else {
+      ((*obj).*mMethod)(mArg1, mArg2, mArg3);
+    }
+    return NS_OK;
+  }
+
+private:
+  BluetoothNotificationRunnable3(
+    Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3))
+  : mMethod(aMethod)
+  {
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    nsresult rv = aInitOp(mArg1, mArg2, mArg3);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    return NS_OK;
+  }
+
+  Res (ObjectType::*mMethod)(Arg1, Arg2, Arg3);
+  Tin1 mArg1;
+  Tin2 mArg2;
+  Tin3 mArg3;
+};
+
+template <typename ObjectWrapper, typename Res,
+          typename Tin1, typename Tin2, typename Tin3, typename Tin4,
+          typename Arg1=Tin1, typename Arg2=Tin2,
+          typename Arg3=Tin3, typename Arg4=Tin4>
+class BluetoothNotificationRunnable4 : public nsRunnable
+{
+public:
+  typedef typename ObjectWrapper::ObjectType  ObjectType;
+  typedef BluetoothNotificationRunnable4<ObjectWrapper, Res,
+    Tin1, Tin2, Tin3, Tin4, Arg1, Arg2, Arg3, Arg4> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType> Create(
+    Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3, Arg4),
+    const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3, Arg4),
+           const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aMethod, aInitOp);
+    if (!runnable) {
+      BT_WARNING("BluetoothNotificationRunnable4::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    ObjectType* obj = ObjectWrapper::GetInstance();
+    if (!obj) {
+      BT_WARNING("Notification handler not initialized");
+    } else {
+      ((*obj).*mMethod)(mArg1, mArg2, mArg3, mArg4);
+    }
+    return NS_OK;
+  }
+
+private:
+  BluetoothNotificationRunnable4(
+    Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3, Arg4))
+  : mMethod(aMethod)
+  {
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    nsresult rv = aInitOp(mArg1, mArg2, mArg3, mArg4);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    return NS_OK;
+  }
+
+  Res (ObjectType::*mMethod)(Arg1, Arg2, Arg3, Arg4);
+  Tin1 mArg1;
+  Tin2 mArg2;
+  Tin3 mArg3;
+  Tin4 mArg4;
+};
+
+template <typename ObjectWrapper, typename Res,
+          typename Tin1, typename Tin2, typename Tin3,
+          typename Tin4, typename Tin5,
+          typename Arg1=Tin1, typename Arg2=Tin2, typename Arg3=Tin3,
+          typename Arg4=Tin4, typename Arg5=Tin5>
+class BluetoothNotificationRunnable5 : public nsRunnable
+{
+public:
+  typedef typename ObjectWrapper::ObjectType  ObjectType;
+  typedef BluetoothNotificationRunnable5<ObjectWrapper, Res,
+    Tin1, Tin2, Tin3, Tin4, Tin5, Arg1, Arg2, Arg3, Arg4, Arg5> SelfType;
+
+  template <typename InitOp>
+  static already_AddRefed<SelfType> Create(
+    Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3, Arg4, Arg5),
+    const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable(new SelfType(aMethod));
+    if (NS_FAILED(runnable->Init(aInitOp))) {
+      return nullptr;
+    }
+    return runnable.forget();
+  }
+
+  template <typename InitOp>
+  static void
+  Dispatch(Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3, Arg4, Arg5),
+           const InitOp& aInitOp)
+  {
+    nsRefPtr<SelfType> runnable = Create(aMethod, aInitOp);
+    if (!runnable) {
+      BT_WARNING("BluetoothNotificationRunnable5::Create failed");
+      return;
+    }
+    nsresult rv = NS_DispatchToMainThread(runnable);
+    if (NS_FAILED(rv)) {
+      BT_WARNING("NS_DispatchToMainThread failed: %X", rv);
+    }
+  }
+
+  NS_METHOD
+  Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    ObjectType* obj = ObjectWrapper::GetInstance();
+    if (!obj) {
+      BT_WARNING("Notification handler not initialized");
+    } else {
+      ((*obj).*mMethod)(mArg1, mArg2, mArg3, mArg4, mArg5);
+    }
+    return NS_OK;
+  }
+
+private:
+  BluetoothNotificationRunnable5(
+    Res (ObjectType::*aMethod)(Arg1, Arg2, Arg3, Arg4, Arg5))
+  : mMethod(aMethod)
+  {
+    MOZ_ASSERT(mMethod);
+  }
+
+  template<typename InitOp>
+  nsresult
+  Init(const InitOp& aInitOp)
+  {
+    nsresult rv = aInitOp(mArg1, mArg2, mArg3, mArg4, mArg5);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    return NS_OK;
+  }
+
+  Res (ObjectType::*mMethod)(Arg1, Arg2, Arg3, Arg4, Arg5);
+  Tin1 mArg1;
+  Tin2 mArg2;
+  Tin3 mArg3;
+  Tin4 mArg4;
+  Tin5 mArg5;
+};
+
+//
+// Init operators
+//
+// Below are general-purpose init operators for Bluetooth. The classes
+// of type |ConstantInitOp[1..3]| initialize results or notifications
+// with constant values.
+//
+
+template <typename T1>
+class ConstantInitOp1 MOZ_FINAL
+{
+public:
+  ConstantInitOp1(const T1& aArg1)
+  : mArg1(aArg1)
+  { }
+
+  nsresult operator () (T1& aArg1) const
+  {
+    aArg1 = mArg1;
+
+    return NS_OK;
+  }
+
+private:
+  const T1& mArg1;
+};
+
+template <typename T1, typename T2>
+class ConstantInitOp2 MOZ_FINAL
+{
+public:
+  ConstantInitOp2(const T1& aArg1, const T2& aArg2)
+  : mArg1(aArg1)
+  , mArg2(aArg2)
+  { }
+
+  nsresult operator () (T1& aArg1, T2& aArg2) const
+  {
+    aArg1 = mArg1;
+    aArg2 = mArg2;
+
+    return NS_OK;
+  }
+
+private:
+  const T1& mArg1;
+  const T2& mArg2;
+};
+
+template <typename T1, typename T2, typename T3>
+class ConstantInitOp3 MOZ_FINAL
+{
+public:
+  ConstantInitOp3(const T1& aArg1, const T2& aArg2, const T3& aArg3)
+  : mArg1(aArg1)
+  , mArg2(aArg2)
+  , mArg3(aArg3)
+  { }
+
+  nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3) const
+  {
+    aArg1 = mArg1;
+    aArg2 = mArg2;
+    aArg3 = mArg3;
+
+    return NS_OK;
+  }
+
+private:
+  const T1& mArg1;
+  const T2& mArg2;
+  const T3& mArg3;
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/BluetoothService.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/BluetoothService.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -52,6 +52,13 @@
 /**
  * B2G bluedroid:
  *   MOZ_B2G_BT and MOZ_B2G_BT_BLUEDROID are both defined;
+ *   MOZ_B2G_BLUEZ or MOZ_B2G_DAEMON are not defined.
+ */
+#include "BluetoothServiceBluedroid.h"
+#elif defined(MOZ_B2G_BT_DAEMON)
+/**
+ * B2G Bluetooth daemon:
+ *   MOZ_B2G_BT, MOZ_B2G_BLUEDROID and MOZ_B2G_BT_DAEMON are defined;
  *   MOZ_B2G_BLUEZ is not defined.
  */
 #include "BluetoothServiceBluedroid.h"
@@ -228,6 +235,8 @@
   return new BluetoothDBusService();
 #elif defined(MOZ_B2G_BT_BLUEDROID)
   return new BluetoothServiceBluedroid();
+#elif defined(MOZ_B2G_BT_DAEMON)
+  return new BluetoothServiceBluedroid();
 #endif
 #elif defined(MOZ_BLUETOOTH_DBUS)
   return new BluetoothDBusService();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/bluetooth2/moz.build	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/bluetooth2/moz.build	2014-11-26 21:45:56.000000000 +0000
@@ -51,6 +51,10 @@
                 'bluedroid/BluetoothA2dpHALInterface.cpp',
                 'bluedroid/BluetoothA2dpManager.cpp',
                 'bluedroid/BluetoothAvrcpHALInterface.cpp',
+                'bluedroid/BluetoothDaemonHelpers.cpp',
+                'bluedroid/BluetoothDaemonInterface.cpp',
+                'bluedroid/BluetoothDaemonSetupInterface.cpp',
+                'bluedroid/BluetoothDaemonSocketInterface.cpp',
                 'bluedroid/BluetoothGattHALInterface.cpp',
                 'bluedroid/BluetoothGattManager.cpp',
                 'bluedroid/BluetoothHALHelpers.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraControlImpl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraControlImpl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraControlImpl.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraControlImpl.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -22,6 +22,7 @@
   , mCameraId(aCameraId)
   , mPreviewState(CameraControlListener::kPreviewStopped)
   , mHardwareState(CameraControlListener::kHardwareClosed)
+  , mHardwareStateChangeReason(NS_OK)
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
 
@@ -71,7 +72,8 @@
 }
 
 void
-CameraControlImpl::OnHardwareStateChange(CameraControlListener::HardwareState aNewState)
+CameraControlImpl::OnHardwareStateChange(CameraControlListener::HardwareState aNewState,
+                                         nsresult aReason)
 {
   // This callback can run on threads other than the Main Thread and
   //  the Camera Thread. On Gonk, it may be called from the camera's
@@ -84,20 +86,22 @@
   }
 
 #ifdef PR_LOGGING
-  const char* state[] = { "open", "closed", "failed" };
+  const char* state[] = { "closed", "open", "failed" };
   MOZ_ASSERT(aNewState >= 0);
   if (static_cast<unsigned int>(aNewState) < sizeof(state) / sizeof(state[0])) {
-    DOM_CAMERA_LOGI("New hardware state is '%s'\n", state[aNewState]);
+    DOM_CAMERA_LOGI("New hardware state is '%s' (reason=0x%x)\n",
+      state[aNewState], aReason);
   } else {
     DOM_CAMERA_LOGE("OnHardwareStateChange: got invalid HardwareState value %d\n", aNewState);
   }
 #endif
 
   mHardwareState = aNewState;
+  mHardwareStateChangeReason = aReason;
 
   for (uint32_t i = 0; i < mListeners.Length(); ++i) {
     CameraControlListener* l = mListeners[i];
-    l->OnHardwareStateChange(mHardwareState);
+    l->OnHardwareStateChange(mHardwareState, mHardwareStateChangeReason);
   }
 }
 
@@ -183,19 +187,6 @@
 }
 
 void
-CameraControlImpl::OnClosed()
-{
-  // This callback can run on threads other than the Main Thread and
-  //  the Camera Thread.
-  RwLockAutoEnterRead lock(mListenerLock);
-
-  for (uint32_t i = 0; i < mListeners.Length(); ++i) {
-    CameraControlListener* l = mListeners[i];
-    l->OnHardwareStateChange(CameraControlListener::kHardwareClosed);
-  }
-}
-
-void
 CameraControlImpl::OnRecorderStateChange(CameraControlListener::RecorderState aState,
                                          int32_t aStatus, int32_t aTrackNumber)
 {
@@ -706,7 +697,7 @@
 
   // Update the newly-added listener's state
   l->OnConfigurationChange(mCurrentConfiguration);
-  l->OnHardwareStateChange(mHardwareState);
+  l->OnHardwareStateChange(mHardwareState, mHardwareStateChangeReason);
   l->OnPreviewStateChange(mPreviewState);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraControlImpl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraControlImpl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraControlImpl.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraControlImpl.h	2014-11-26 21:45:56.000000000 +0000
@@ -53,7 +53,6 @@
 
   // Event handlers called directly from outside this class.
   void OnShutter();
-  void OnClosed();
   void OnUserError(CameraControlListener::UserContext aContext, nsresult aError);
   void OnSystemError(CameraControlListener::SystemContext aContext, nsresult aError);
   void OnAutoFocusMoving(bool aIsMoving);
@@ -69,7 +68,8 @@
   void OnRecorderStateChange(CameraControlListener::RecorderState aState,
                              int32_t aStatus = -1, int32_t aTrackNumber = -1);
   void OnPreviewStateChange(CameraControlListener::PreviewState aState);
-  void OnHardwareStateChange(CameraControlListener::HardwareState aState);
+  void OnHardwareStateChange(CameraControlListener::HardwareState aState,
+                             nsresult aReason);
   void OnConfigurationChange();
 
   // When we create a new CameraThread, we keep a static reference to it so
@@ -134,6 +134,7 @@
 
   CameraControlListener::PreviewState   mPreviewState;
   CameraControlListener::HardwareState  mHardwareState;
+  nsresult                              mHardwareStateChangeReason;
 
 private:
   CameraControlImpl(const CameraControlImpl&) MOZ_DELETE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraControlListener.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraControlListener.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraControlListener.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraControlListener.h	2014-11-26 21:45:56.000000000 +0000
@@ -38,7 +38,14 @@
     kHardwareOpen,
     kHardwareOpenFailed
   };
-  virtual void OnHardwareStateChange(HardwareState aState) { }
+  // aReason:
+  //    NS_OK : state change was expected and normal;
+  //    NS_ERROR_FAILURE : one or more system-level components failed and
+  //                       the camera was closed;
+  //    NS_ERROR_NOT_AVAILABLE : the hardware is in use by another process
+  //                             and cannot be acquired, or another process
+  //                             was given access to the camera hardware.
+  virtual void OnHardwareStateChange(HardwareState aState, nsresult aReason) { }
 
   enum PreviewState
   {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraPreviewMediaStream.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraPreviewMediaStream.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/CameraPreviewMediaStream.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/CameraPreviewMediaStream.h	2014-11-26 21:45:56.000000000 +0000
@@ -16,7 +16,7 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FakeMediaStreamGraph)
 public:
   FakeMediaStreamGraph()
-    : MediaStreamGraph()
+    : MediaStreamGraph(16000)
   {
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControl.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControl.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -37,6 +37,7 @@
 #include "mozilla/dom/CameraFacesDetectedEvent.h"
 #include "mozilla/dom/CameraFacesDetectedEventBinding.h"
 #include "mozilla/dom/CameraStateChangeEvent.h"
+#include "mozilla/dom/CameraClosedEvent.h"
 #include "mozilla/dom/BlobEvent.h"
 #include "DOMCameraDetectedFace.h"
 #include "mozilla/dom/BindingUtils.h"
@@ -1214,7 +1215,8 @@
 
 // Camera Control event handlers--must only be called from the Main Thread!
 void
-nsDOMCameraControl::OnHardwareStateChange(CameraControlListener::HardwareState aState)
+nsDOMCameraControl::OnHardwareStateChange(CameraControlListener::HardwareState aState,
+                                          nsresult aReason)
 {
   MOZ_ASSERT(NS_IsMainThread());
   ErrorResult ignored;
@@ -1222,6 +1224,7 @@
   switch (aState) {
     case CameraControlListener::kHardwareOpen:
       DOM_CAMERA_LOGI("DOM OnHardwareStateChange: open\n");
+      MOZ_ASSERT(aReason == NS_OK);
       {
         // The hardware is open, so we can return a camera to JS, even if
         // the preview hasn't started yet.
@@ -1245,29 +1248,53 @@
       DOM_CAMERA_LOGI("DOM OnHardwareStateChange: closed\n");
       {
         nsRefPtr<Promise> promise = mReleasePromise.forget();
-        if (promise || mReleaseOnSuccessCb) {
-          // If we have this event handler, this was a solicited hardware close.
-          if (promise) {
-            promise->MaybeResolve(JS::UndefinedHandleValue);
-          }
-          nsRefPtr<CameraReleaseCallback> cb = mReleaseOnSuccessCb.forget();
-          mReleaseOnErrorCb = nullptr;
-          if (cb) {
-            cb->Call(ignored);
-          }
-        } else {
-          // If not, something else closed the hardware.
-          nsRefPtr<CameraClosedCallback> cb = mOnClosedCb;
-          if (cb) {
-            cb->Call(ignored);
-          }
+        if (promise) {
+          promise->MaybeResolve(JS::UndefinedHandleValue);
+        }
+
+        nsRefPtr<CameraReleaseCallback> rcb = mReleaseOnSuccessCb.forget();
+        mReleaseOnErrorCb = nullptr;
+        if (rcb) {
+          ErrorResult ignored;
+          rcb->Call(ignored);
         }
-        DispatchTrustedEvent(NS_LITERAL_STRING("close"));
+
+        CameraClosedEventInit eventInit;
+        switch (aReason) {
+          case NS_OK:
+            eventInit.mReason = NS_LITERAL_STRING("HardwareReleased");
+            break;
+
+          case NS_ERROR_FAILURE:
+            eventInit.mReason = NS_LITERAL_STRING("SystemFailure");
+            break;
+
+          case NS_ERROR_NOT_AVAILABLE:
+            eventInit.mReason = NS_LITERAL_STRING("NotAvailable");
+            break;
+
+          default:
+            DOM_CAMERA_LOGE("Unhandled hardware close reason, 0x%x\n", aReason);
+            MOZ_ASSERT_UNREACHABLE("Unanticipated reason for hardware close");
+            eventInit.mReason = NS_LITERAL_STRING("SystemFailure");
+            break;
+        }
+
+        nsRefPtr<CameraClosedCallback> cb = mOnClosedCb;
+        if (cb) {
+          cb->Call(eventInit.mReason, ignored);
+        }
+        nsRefPtr<CameraClosedEvent> event =
+          CameraClosedEvent::Constructor(this,
+                                         NS_LITERAL_STRING("close"),
+                                         eventInit);
+        DispatchTrustedEvent(event);
       }
       break;
 
     case CameraControlListener::kHardwareOpenFailed:
       DOM_CAMERA_LOGI("DOM OnHardwareStateChange: open failed\n");
+      MOZ_ASSERT(aReason == NS_ERROR_NOT_AVAILABLE);
       OnUserError(DOMCameraControlListener::kInStartCamera, NS_ERROR_NOT_AVAILABLE);
       break;
 
@@ -1566,8 +1593,24 @@
 
     case CameraControlListener::kInStopCamera:
       promise = mReleasePromise.forget();
-      mReleaseOnSuccessCb = nullptr;
       errorCb = mReleaseOnErrorCb.forget();
+      if (aError == NS_ERROR_NOT_INITIALIZED) {
+        // This value indicates that the hardware is already closed; which for
+        // kInStopCamera, is not actually an error.
+        if (promise) {
+          promise->MaybeResolve(JS::UndefinedHandleValue);
+        }
+
+        nsRefPtr<CameraReleaseCallback> cb = mReleaseOnSuccessCb.forget();
+        mReleaseOnErrorCb = nullptr;
+        if (cb) {
+          ErrorResult ignored;
+          cb->Call(ignored);
+        }
+
+        return;
+      }
+      mReleaseOnSuccessCb = nullptr;
       break;
 
     case CameraControlListener::kInSetConfiguration:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControl.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControl.h	2014-11-26 21:45:56.000000000 +0000
@@ -187,7 +187,7 @@
   void OnTakePictureComplete(nsIDOMBlob* aPicture);
   void OnFacesDetected(const nsTArray<ICameraControl::Face>& aFaces);
 
-  void OnHardwareStateChange(DOMCameraControlListener::HardwareState aState);
+  void OnHardwareStateChange(DOMCameraControlListener::HardwareState aState, nsresult aReason);
   void OnPreviewStateChange(DOMCameraControlListener::PreviewState aState);
   void OnRecorderStateChange(CameraControlListener::RecorderState aState, int32_t aStatus, int32_t aTrackNum);
   void OnConfigurationChange(DOMCameraConfiguration* aConfiguration);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControlListener.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControlListener.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControlListener.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControlListener.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -64,28 +64,31 @@
 
 // Specific callback handlers
 void
-DOMCameraControlListener::OnHardwareStateChange(HardwareState aState)
+DOMCameraControlListener::OnHardwareStateChange(HardwareState aState,
+                                                nsresult aReason)
 {
   class Callback : public DOMCallback
   {
   public:
     Callback(nsMainThreadPtrHandle<nsDOMCameraControl> aDOMCameraControl,
-             HardwareState aState)
+             HardwareState aState, nsresult aReason)
       : DOMCallback(aDOMCameraControl)
       , mState(aState)
+      , mReason(aReason)
     { }
 
     void
     RunCallback(nsDOMCameraControl* aDOMCameraControl) MOZ_OVERRIDE
     {
-      aDOMCameraControl->OnHardwareStateChange(mState);
+      aDOMCameraControl->OnHardwareStateChange(mState, mReason);
     }
 
   protected:
     HardwareState mState;
+    nsresult mReason;
   };
 
-  NS_DispatchToMainThread(new Callback(mDOMCameraControl, aState));
+  NS_DispatchToMainThread(new Callback(mDOMCameraControl, aState, aReason));
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControlListener.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControlListener.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/DOMCameraControlListener.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/DOMCameraControlListener.h	2014-11-26 21:45:56.000000000 +0000
@@ -23,7 +23,7 @@
   virtual void OnFacesDetected(const nsTArray<ICameraControl::Face>& aFaces) MOZ_OVERRIDE;
   virtual void OnTakePictureComplete(uint8_t* aData, uint32_t aLength, const nsAString& aMimeType) MOZ_OVERRIDE;
 
-  virtual void OnHardwareStateChange(HardwareState aState) MOZ_OVERRIDE;
+  virtual void OnHardwareStateChange(HardwareState aState, nsresult aReason) MOZ_OVERRIDE;
   virtual void OnPreviewStateChange(PreviewState aState) MOZ_OVERRIDE;
   virtual void OnRecorderStateChange(RecorderState aState, int32_t aStatus, int32_t aTrackNum) MOZ_OVERRIDE;
   virtual void OnConfigurationChange(const CameraListenerConfiguration& aConfiguration) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraControl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraControl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraControl.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraControl.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -88,7 +88,8 @@
 
   nsresult rv = StartInternal(aInitialConfig);
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    OnHardwareStateChange(CameraControlListener::kHardwareOpenFailed);
+    OnHardwareStateChange(CameraControlListener::kHardwareOpenFailed,
+                          NS_ERROR_NOT_AVAILABLE);
   }
   return rv;
 }
@@ -129,12 +130,12 @@
     rv = SetConfigurationInternal(*aInitialConfig);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       // The initial configuration failed, close up the hardware
-      StopImpl();
+      StopInternal();
       return rv;
     }
   }
 
-  OnHardwareStateChange(CameraControlListener::kHardwareOpen);
+  OnHardwareStateChange(CameraControlListener::kHardwareOpen, NS_OK);
   if (aInitialConfig) {
     return StartPreviewImpl();
   }
@@ -314,21 +315,113 @@
 }
 
 nsresult
+nsGonkCameraControl::MaybeAdjustVideoSize()
+{
+  MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
+  MOZ_ASSERT(mSeparateVideoAndPreviewSizesSupported);
+
+  const Size& preview = mCurrentConfiguration.mPreviewSize;
+
+  // Some camera drivers will ignore our preview size if it's larger
+  // than the currently set video recording size, so in picture mode, we
+  // give preview size priority, and bump up the video size just in case.
+  // This is done on a best-effort basis.
+
+  if (preview.width <= mLastRecorderSize.width &&
+      preview.height <= mLastRecorderSize.height) {
+    DOM_CAMERA_LOGI("Video size %ux%u is suitable for preview size %ux%u\n",
+      mLastRecorderSize.width, mLastRecorderSize.height,
+      preview.width, preview.height);
+    return NS_OK;
+  }
+
+  nsTArray<Size> sizes;
+  nsresult rv = Get(CAMERA_PARAM_SUPPORTED_VIDEOSIZES, sizes);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  const uint32_t previewArea = preview.width * preview.height;
+  uint32_t bestDelta = UINT32_MAX;
+  bool foundBest = false;
+  SizeIndex best;
+
+  for (SizeIndex i = 0; i < sizes.Length(); ++i) {
+    const Size& s = sizes[i];
+    if (s.width < preview.width || s.height < preview.height) {
+      continue;
+    }
+
+    const uint32_t area = s.width * s.height;
+    const uint32_t delta = area - previewArea;
+    if (delta < bestDelta) {
+      bestDelta = delta;
+      best = i;
+      foundBest = true;
+    }
+  }
+
+  if (!foundBest) {
+    // If no candidate was found, the driver will be fine with a video size
+    // smaller than the chosen preview size.
+    DOM_CAMERA_LOGI("No video size candidate for preview size %ux%u (0x%x)\n",
+      preview.width, preview.height, rv);
+    return NS_OK;
+  }
+
+  DOM_CAMERA_LOGI("Adjusting video size upwards to %ux%u\n",
+    sizes[best].width, sizes[best].height);
+  rv = Set(CAMERA_PARAM_VIDEOSIZE, sizes[best]);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGW("Failed to adjust video size for preview size %ux%u (0x%x)\n",
+      preview.width, preview.height, rv);
+    return rv;
+  }
+
+  mLastRecorderSize = preview;
+  return NS_OK;
+}
+
+nsresult
 nsGonkCameraControl::SetPictureConfiguration(const Configuration& aConfig)
 {
   DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
+  MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
 
-  nsresult rv = SetPreviewSize(aConfig.mPreviewSize);
+  nsTArray<Size> sizes;
+  nsresult rv = Get(CAMERA_PARAM_SUPPORTED_PREVIEWSIZES, sizes);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
+  Size preview;
+  rv = GetSupportedSize(aConfig.mPreviewSize, sizes, preview);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGE(
+      "Failed to find a supported preview size, requested size %ux%u (0x%x)",
+      aConfig.mPreviewSize.width, aConfig.mPreviewSize.height, rv);
+    return rv;
+  }
+
+  rv = Set(CAMERA_PARAM_PREVIEWSIZE, preview);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGE("Failed to set supported preview size %ux%u (0x%x)",
+                    preview.width, preview.height, rv);
+    return rv;
+  }
+
+  mCurrentConfiguration.mPreviewSize = preview;
+
+  if (mSeparateVideoAndPreviewSizesSupported) {
+    MaybeAdjustVideoSize();
+  }
+
   mParams.Get(CAMERA_PARAM_PREVIEWFRAMERATE, mPreviewFps);
 
   DOM_CAMERA_LOGI("picture mode preview: wanted %ux%u, got %ux%u (%u fps)\n",
-    aConfig.mPreviewSize.width, aConfig.mPreviewSize.height,
-    mCurrentConfiguration.mPreviewSize.width, mCurrentConfiguration.mPreviewSize.height,
-    mPreviewFps);
+                  aConfig.mPreviewSize.width, aConfig.mPreviewSize.height,
+                  preview.width, preview.height,
+                  mPreviewFps);
 
   return NS_OK;
 }
@@ -695,11 +788,10 @@
     int area = supportedSizes[i].width * supportedSizes[i].height;
     int delta = abs(area - targetArea);
 
-    if (area != 0
-      && delta < smallestDelta
-      && supportedSizes[i].width * mLastPictureSize.height /
-         supportedSizes[i].height == mLastPictureSize.width
-    ) {
+    if (area != 0 &&
+        delta < smallestDelta &&
+        supportedSizes[i].width * mLastPictureSize.height ==
+          mLastPictureSize.width * supportedSizes[i].height) {
       smallestDelta = delta;
       smallestDeltaIndex = i;
     }
@@ -1062,7 +1154,9 @@
   ReentrantMonitorAutoEnter mon(mRecorderMonitor);
 
   // nothing to do if we have no mRecorder
-  NS_ENSURE_TRUE(mRecorder, NS_OK);
+  if (!mRecorder) {
+    return NS_OK;
+  }
 
   mRecorder->stop();
   mRecorder = nullptr;
@@ -1250,70 +1344,8 @@
 }
 
 nsresult
-nsGonkCameraControl::SetPreviewSize(const Size& aSize)
-{
-  MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
-
-  nsTArray<Size> previewSizes;
-  nsresult rv = Get(CAMERA_PARAM_SUPPORTED_PREVIEWSIZES, previewSizes);
-  if (NS_FAILED(rv)) {
-    DOM_CAMERA_LOGE("Camera failed to return any preview sizes (0x%x)\n", rv);
-    return rv;
-  }
-
-  Size best;
-  rv = GetSupportedSize(aSize, previewSizes, best);
-  if (NS_FAILED(rv)) {
-    DOM_CAMERA_LOGE("Failed to find a supported preview size, requested size %dx%d",
-        aSize.width, aSize.height);
-    return rv;
-  }
-
-  if (mSeparateVideoAndPreviewSizesSupported) {
-    // Some camera drivers will ignore our preview size if it's larger
-    // than the currently set video recording size, so we need to set
-    // the video size here as well, just in case.
-    if (best.width > mLastRecorderSize.width || best.height > mLastRecorderSize.height) {
-      SetVideoSize(best);
-    }
-  } else {
-    mLastRecorderSize = best;
-  }
-  mCurrentConfiguration.mPreviewSize = best;
-  return Set(CAMERA_PARAM_PREVIEWSIZE, best);
-}
-
-nsresult
-nsGonkCameraControl::SetVideoSize(const Size& aSize)
-{
-  MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
-
-  if (!mSeparateVideoAndPreviewSizesSupported) {
-    DOM_CAMERA_LOGE("Camera does not support setting separate video size\n");
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-  
-  nsTArray<Size> videoSizes;
-  nsresult rv = Get(CAMERA_PARAM_SUPPORTED_VIDEOSIZES, videoSizes);
-  if (NS_FAILED(rv)) {
-    DOM_CAMERA_LOGE("Camera failed to return any video sizes (0x%x)\n", rv);
-    return rv;
-  }
-
-  Size best;
-  rv = GetSupportedSize(aSize, videoSizes, best);
-  if (NS_FAILED(rv)) {
-    DOM_CAMERA_LOGE("Failed to find a supported video size, requested size %dx%d",
-        aSize.width, aSize.height);
-    return rv;
-  }
-  mLastRecorderSize = best;
-  return Set(CAMERA_PARAM_VIDEOSIZE, best);
-}
-
-nsresult
 nsGonkCameraControl::GetSupportedSize(const Size& aSize,
-                                      const nsTArray<Size>& supportedSizes,
+                                      const nsTArray<Size>& aSupportedSizes,
                                       Size& best)
 {
   nsresult rv = NS_ERROR_INVALID_ARG;
@@ -1323,24 +1355,25 @@
 
   if (!aSize.width && !aSize.height) {
     // no size specified, take the first supported size
-    best = supportedSizes[0];
+    best = aSupportedSizes[0];
     return NS_OK;
   } else if (aSize.width && aSize.height) {
     // both height and width specified, find the supported size closest to
     // the requested size, looking for an exact match first
-    for (nsTArray<Size>::index_type i = 0; i < supportedSizes.Length(); i++) {
-      Size size = supportedSizes[i];
+    for (SizeIndex i = 0; i < aSupportedSizes.Length(); ++i) {
+      Size size = aSupportedSizes[i];
       if (size.width == aSize.width && size.height == aSize.height) {
         best = size;
         return NS_OK;
       }
     }
 
-    // no exact matches--look for a match closest in area
-    uint32_t targetArea = aSize.width * aSize.height;
-    for (nsTArray<Size>::index_type i = 0; i < supportedSizes.Length(); i++) {
-      Size size = supportedSizes[i];
-      uint32_t delta = abs((long int)(size.width * size.height - targetArea));
+    // no exact match on dimensions--look for a match closest in area
+    const uint32_t targetArea = aSize.width * aSize.height;
+    for (SizeIndex i = 0; i < aSupportedSizes.Length(); i++) {
+      Size size = aSupportedSizes[i];
+      uint32_t delta =
+        abs(static_cast<long int>(size.width * size.height - targetArea));
       if (delta < minSizeDelta) {
         minSizeDelta = delta;
         best = size;
@@ -1349,9 +1382,9 @@
     }
   } else if (!aSize.width) {
     // width not specified, find closest height match
-    for (nsTArray<Size>::index_type i = 0; i < supportedSizes.Length(); i++) {
-      Size size = supportedSizes[i];
-      delta = abs((long int)(size.height - aSize.height));
+    for (SizeIndex i = 0; i < aSupportedSizes.Length(); i++) {
+      Size size = aSupportedSizes[i];
+      delta = abs(static_cast<long int>(size.height - aSize.height));
       if (delta < minSizeDelta) {
         minSizeDelta = delta;
         best = size;
@@ -1360,9 +1393,9 @@
     }
   } else if (!aSize.height) {
     // height not specified, find closest width match
-    for (nsTArray<Size>::index_type i = 0; i < supportedSizes.Length(); i++) {
-      Size size = supportedSizes[i];
-      delta = abs((long int)(size.width - aSize.width));
+    for (SizeIndex i = 0; i < aSupportedSizes.Length(); i++) {
+      Size size = aSupportedSizes[i];
+      delta = abs(static_cast<long int>(size.width - aSize.width));
       if (delta < minSizeDelta) {
         minSizeDelta = delta;
         best = size;
@@ -1370,10 +1403,148 @@
       }
     }
   }
+
   return rv;
 }
 
 nsresult
+nsGonkCameraControl::SetVideoAndPreviewSize(const Size& aPreviewSize, const Size& aVideoSize)
+{
+  MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
+  MOZ_ASSERT(mSeparateVideoAndPreviewSizesSupported);
+
+  DOM_CAMERA_LOGI("Setting video size to %ux%u, preview size to %ux%u\n",
+                  aVideoSize.width, aVideoSize.height,
+                  aPreviewSize.width, aPreviewSize.height);
+
+  Size oldSize;
+  nsresult rv = Get(CAMERA_PARAM_PREVIEWSIZE, oldSize);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  rv = Set(CAMERA_PARAM_PREVIEWSIZE, aPreviewSize);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+  rv = Set(CAMERA_PARAM_VIDEOSIZE, aVideoSize);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    Set(CAMERA_PARAM_VIDEOSIZE, oldSize); // error, try to restore the original preview size
+    return rv;
+  }
+
+  mCurrentConfiguration.mPreviewSize = aPreviewSize;
+  mLastRecorderSize = aVideoSize;
+
+  return NS_OK;
+}
+
+nsresult
+nsGonkCameraControl::SelectVideoAndPreviewSize(const Configuration& aConfig, const Size& aVideoSize)
+{
+  MOZ_ASSERT(NS_GetCurrentThread() == mCameraThread);
+  MOZ_ASSERT(mSeparateVideoAndPreviewSizesSupported);
+
+  nsTArray<Size> sizes;
+
+  nsresult rv = Get(CAMERA_PARAM_SUPPORTED_VIDEOSIZES, sizes);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  Size video;
+  rv = GetSupportedSize(aVideoSize, sizes, video);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGE("Failed to find a supported video size, requested size %ux%u",
+                    aVideoSize.width, aVideoSize.height);
+    return rv;
+  }
+
+  rv = Get(CAMERA_PARAM_SUPPORTED_PREVIEWSIZES, sizes);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  Size preview;
+  rv = GetSupportedSize(aConfig.mPreviewSize, sizes, preview);
+  if (NS_FAILED(rv)) {
+    DOM_CAMERA_LOGE("Failed to find a supported preview size, requested size %ux%u",
+                    aConfig.mPreviewSize.width, aConfig.mPreviewSize.height);
+    return rv;
+  }
+
+  Size preferred;
+  rv = Get(CAMERA_PARAM_PREFERRED_PREVIEWSIZE_FOR_VIDEO, preferred);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // If the requested preview size has the same aspect ratio as the
+  // requested video size, *and* is the same size or smaller than
+  // the preferred video size, then we're done.
+  const uint32_t preferredArea = preferred.width * preferred.height;
+  if (video.width * aConfig.mPreviewSize.height == aConfig.mPreviewSize.width * video.height &&
+      preview.width * preview.height <= preferredArea) {
+    // We're done: set the video and preview sizes and return...
+    return SetVideoAndPreviewSize(preview, video);
+  }
+
+  // Otherwise, if the requested preview size is larger than the preferred
+  // size, or there is an aspect ratio mismatch, then we need to set the
+  // preview size to the closest size smaller than the preferred size,
+  // preferably with the same aspect ratio as the requested video size.
+
+  SizeIndex bestSizeMatch = 0; // initializers to keep warnings away
+  SizeIndex bestSizeMatchWithAspectRatio = 0;
+  bool foundSizeMatch = false;
+  bool foundSizeMatchWithAspectRatio = false;
+
+  uint32_t bestAreaDelta = UINT32_MAX;
+  uint32_t bestAreaDeltaWithAspect = UINT32_MAX;
+
+  for (SizeIndex i = 0; i < sizes.Length(); ++i) {
+    const Size& s = sizes[i];
+    const uint32_t area = s.width * s.height;
+    if (area > preferredArea) {
+      continue;
+    }
+
+    const uint32_t delta = preferredArea - area;
+    if (s.width * video.height == video.width * s.height) {
+      if (delta == 0) {
+        // exact match, including aspect ratio--we can stop now
+        bestSizeMatchWithAspectRatio = i;
+        foundSizeMatchWithAspectRatio = true;
+        break;
+      } else if (delta < bestAreaDeltaWithAspect) {
+        // aspect ratio match
+        bestAreaDeltaWithAspect = delta;
+        bestSizeMatchWithAspectRatio = i;
+        foundSizeMatchWithAspectRatio = true;
+      }
+    } else if (delta < bestAreaDelta) {
+      bestAreaDelta = delta;
+      bestSizeMatch = i;
+      foundSizeMatch = true;
+    }
+  }
+
+  if (foundSizeMatchWithAspectRatio) {
+    preview = sizes[bestSizeMatchWithAspectRatio];
+  } else if (foundSizeMatch) {
+    DOM_CAMERA_LOGW("Unable to match a preview size with aspect ratio of video size %ux%u\n",
+      video.width, video.height);
+    preview = sizes[bestSizeMatch];
+  } else {
+    DOM_CAMERA_LOGE("Unable to find a preview size for video size %ux%u\n",
+      video.width, video.height);
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  return SetVideoAndPreviewSize(preview, video);
+}
+
+nsresult
 nsGonkCameraControl::SetVideoConfiguration(const Configuration& aConfig)
 {
   DOM_CAMERA_LOGT("%s:%d\n", __func__, __LINE__);
@@ -1392,12 +1563,11 @@
     return NS_ERROR_INVALID_ARG;
   }
 
-  mCurrentConfiguration.mRecorderProfile = aConfig.mRecorderProfile;
   const RecorderProfile::Video& video(profile->GetVideo());
   const Size& size = video.GetSize();
-  int fps = video.GetFramesPerSecond();
-  if (fps <= 0 || size.width <= 0 || size.height <= 0) {
-    DOM_CAMERA_LOGE("Can't configure video with fps=%d, width=%d, height=%d\n",
+  const uint32_t fps = video.GetFramesPerSecond();
+  if (fps == 0 || fps > INT_MAX || size.width == 0 || size.height == 0) {
+    DOM_CAMERA_LOGE("Can't configure video with fps=%u, width=%u, height=%u\n",
       fps, size.width, size.height);
     return NS_ERROR_FAILURE;
   }
@@ -1410,32 +1580,26 @@
 
     if (mSeparateVideoAndPreviewSizesSupported) {
       // The camera supports two video streams: a low(er) resolution preview
-      // stream and and a potentially high(er) resolution stream for encoding. 
-      rv = SetVideoSize(size);
-      if (NS_FAILED(rv)) {
-        DOM_CAMERA_LOGE("Failed to set video mode video size (0x%x)\n", rv);
-        return rv;
-      }
-
-      // The video size must be set first, before the preview size, because
-      // some platforms have a dependency between the two.
-      rv = SetPreviewSize(aConfig.mPreviewSize);
+      // stream and and a potentially high(er) resolution stream for encoding.
+      rv = SelectVideoAndPreviewSize(aConfig, size);
       if (NS_FAILED(rv)) {
-        DOM_CAMERA_LOGE("Failed to set video mode preview size (0x%x)\n", rv);
+        DOM_CAMERA_LOGE("Failed to set video and preview sizes (0x%x)\n", rv);
         return rv;
       }
     } else {
       // The camera only supports a single video stream: in this case, we set
       // the preview size to be the desired video recording size, and ignore
       // the specified preview size.
-      rv = SetPreviewSize(size);
+      rv = Set(CAMERA_PARAM_PREVIEWSIZE, size);
       if (NS_FAILED(rv)) {
         DOM_CAMERA_LOGE("Failed to set video mode preview size (0x%x)\n", rv);
         return rv;
       }
+
+      mCurrentConfiguration.mPreviewSize = size;
     }
 
-    rv = Set(CAMERA_PARAM_PREVIEWFRAMERATE, fps);
+    rv = Set(CAMERA_PARAM_PREVIEWFRAMERATE, static_cast<int>(fps));
     if (NS_FAILED(rv)) {
       DOM_CAMERA_LOGE("Failed to set video mode frame rate (0x%x)\n", rv);
       return rv;
@@ -1665,7 +1829,7 @@
 }
 
 nsresult
-nsGonkCameraControl::StopImpl()
+nsGonkCameraControl::StopInternal()
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
 
@@ -1673,7 +1837,7 @@
   StopRecordingImpl();
 
   // stop the preview
-  StopPreviewImpl();
+  nsresult rv = StopPreviewImpl();
 
   // release the hardware handle
   if (mCameraHw.get()){
@@ -1681,8 +1845,22 @@
      mCameraHw.clear();
   }
 
-  OnHardwareStateChange(CameraControlListener::kHardwareClosed);
-  return NS_OK;
+  return rv;
+}
+
+nsresult
+nsGonkCameraControl::StopImpl()
+{
+  DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
+
+  nsresult rv = StopInternal();
+  if (rv != NS_ERROR_NOT_INITIALIZED) {
+    rv = NS_OK;
+  }
+  if (NS_SUCCEEDED(rv)) {
+    OnHardwareStateChange(CameraControlListener::kHardwareClosed, NS_OK);
+  }
+  return rv;
 }
 
 nsresult
@@ -1785,8 +1963,8 @@
                                    nsresult aError)
 {
   if (aWhere == CameraControlListener::kSystemService) {
-    OnPreviewStateChange(CameraControlListener::kPreviewStopped);
-    OnHardwareStateChange(CameraControlListener::kHardwareClosed);
+    StopInternal();
+    OnHardwareStateChange(CameraControlListener::kHardwareClosed, NS_ERROR_FAILURE);
   }
 
   CameraControlImpl::OnSystemError(aWhere, aError);
@@ -1844,12 +2022,6 @@
 }
 
 void
-OnClosed(nsGonkCameraControl* gc)
-{
-  gc->OnClosed();
-}
-
-void
 OnSystemError(nsGonkCameraControl* gc,
               CameraControlListener::SystemContext aWhere,
               int32_t aArg1, int32_t aArg2)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraControl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraControl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraControl.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraControl.h	2014-11-26 21:45:56.000000000 +0000
@@ -98,6 +98,8 @@
   using CameraControlImpl::OnConfigurationChange;
   using CameraControlImpl::OnUserError;
 
+  typedef nsTArray<Size>::index_type SizeIndex;
+
   virtual void BeginBatchParameterSet() MOZ_OVERRIDE;
   virtual void EndBatchParameterSet() MOZ_OVERRIDE;
 
@@ -107,6 +109,7 @@
   nsresult SetPictureConfiguration(const Configuration& aConfig);
   nsresult SetVideoConfiguration(const Configuration& aConfig);
   nsresult StartInternal(const Configuration* aInitialConfig);
+  nsresult StopInternal();
 
   template<class T> nsresult SetAndPush(uint32_t aKey, const T& aValue);
 
@@ -130,8 +133,9 @@
   nsresult SetupRecording(int aFd, int aRotation, uint64_t aMaxFileSizeBytes,
                           uint64_t aMaxVideoLengthMs);
   nsresult SetupRecordingFlash(bool aAutoEnableLowLightTorch);
-  nsresult SetPreviewSize(const Size& aSize);
-  nsresult SetVideoSize(const Size& aSize);
+  nsresult SelectVideoAndPreviewSize(const Configuration& aConfig, const Size& aVideoSize);
+  nsresult SetVideoAndPreviewSize(const Size& aPreviewSize, const Size& aVideoSize);
+  nsresult MaybeAdjustVideoSize();
   nsresult PausePreview();
   nsresult GetSupportedSize(const Size& aSize, const nsTArray<Size>& supportedSizes, Size& best);
 
@@ -195,7 +199,6 @@
 void OnFacesDetected(nsGonkCameraControl* gc, camera_frame_metadata_t* aMetaData);
 void OnNewPreviewFrame(nsGonkCameraControl* gc, layers::TextureClient* aBuffer);
 void OnShutter(nsGonkCameraControl* gc);
-void OnClosed(nsGonkCameraControl* gc);
 void OnSystemError(nsGonkCameraControl* gc,
                    CameraControlListener::SystemContext aWhere,
                    int32_t aArg1, int32_t aArg2);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraHwMgr.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraHwMgr.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraHwMgr.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraHwMgr.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -268,18 +268,6 @@
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, (void*)this);
   mCamera.clear();
   mNativeWindow.clear();
-
-  if (mClosing) {
-    return;
-  }
-
-  /**
-   * Trigger the OnClosed event; the upper layers can't do anything
-   * with the hardware layer once they receive this event.
-   */
-  if (mTarget) {
-    OnClosed(mTarget);
-  }
 }
 
 int
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraParameters.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraParameters.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/GonkCameraParameters.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/GonkCameraParameters.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -117,6 +117,8 @@
       return KEY_RECORDING_HINT;
     case CAMERA_PARAM_PICTURE_QUALITY:
       return KEY_JPEG_QUALITY;
+    case CAMERA_PARAM_PREFERRED_PREVIEWSIZE_FOR_VIDEO:
+      return KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO;
 
     case CAMERA_PARAM_SUPPORTED_PREVIEWSIZES:
       return KEY_SUPPORTED_PREVIEW_SIZES;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/ICameraControl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/ICameraControl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/ICameraControl.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/ICameraControl.h	2014-11-26 21:45:56.000000000 +0000
@@ -54,6 +54,7 @@
   CAMERA_PARAM_LUMINANCE,
   CAMERA_PARAM_SCENEMODE_HDR_RETURNNORMALPICTURE,
   CAMERA_PARAM_RECORDINGHINT,
+  CAMERA_PARAM_PREFERRED_PREVIEWSIZE_FOR_VIDEO,
 
   // supported features
   CAMERA_PARAM_SUPPORTED_PREVIEWSIZES,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/callback/test_bug1099390.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/callback/test_bug1099390.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/callback/test_bug1099390.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/callback/test_bug1099390.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for bug 1099390</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="camera_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<video id="viewfinder" width="200" height="200" autoplay></video>
+<img src="#" alt="This image is going to load" id="testimage"/>
+<script class="testbody" type="text/javascript;version=1.7">
+
+var whichCamera = navigator.mozCameras.getListOfCameras()[0];
+var config = {
+  mode: 'picture',
+  recorderProfile: 'cif',
+  previewSize: {
+    width: 352,
+    height: 288
+  }
+};
+
+function onError(e) {
+  ok(false, "Error " + e);
+}
+
+var Camera = {
+  _cameraObj: null,
+
+  get viewfinder() {
+    return document.getElementById('viewfinder');
+  },
+
+  release: function release() {
+    viewfinder.mozSrcObject = null;
+    if (Camera._cameraObj) {
+      Camera._cameraObj.release();
+      Camera._cameraObj = null;
+    }
+  },
+
+  test: function test(cam) {
+    var gotCloseEvent = false;
+    var gotReleaseCallback = false;
+
+    function gotAll() {
+      var all = gotCloseEvent && gotReleaseCallback;
+      if (all) {
+        info("Got all expected notifications");
+      }
+      return all;
+    };
+
+    cam.onClosed = function(reason) {
+      cam.onClosed = null;
+      ok(!gotCloseEvent, "gotCloseEvent was " + gotCloseEvent);
+      ok(reason === "HardwareReleased", "onClosed reason is: " + reason);
+      gotCloseEvent = true;
+      if (gotAll()) {
+        SimpleTest.finish();
+      }
+    };
+
+    var onSuccess = function() {
+      ok(!gotReleaseCallback, "gotReleaseCallback was " + gotReleaseCallback);
+      gotReleaseCallback = true;
+      if (gotAll()) {
+        SimpleTest.finish();
+      }
+    };
+
+    cam.release(onSuccess, onError);
+  }, // test()
+
+  start: function start() {
+    function onSuccess(cam) {
+      Camera._cameraObj = cam;
+      Camera.viewfinder.mozSrcObject = cam;
+      Camera.viewfinder.play();
+
+      var onPreviewStateChange = function(e) {
+        if (e.newState === 'started') {
+          cam.removeEventListener('previewstatechange', onPreviewStateChange);
+          Camera.test(cam);
+        }
+      }; // onPreviewStateChange
+      cam.addEventListener('previewstatechange', onPreviewStateChange);
+    }; // onSuccess()
+
+    navigator.mozCameras.getCamera(whichCamera, config, onSuccess, onError);
+  }, // start()
+}
+
+SimpleTest.waitForExplicitFinish();
+
+window.addEventListener('beforeunload', function() {
+  Camera.release();
+});
+
+Camera.start();
+
+</script>
+</body>
+
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/callback/test_camera_hardware_init_failure.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/callback/test_camera_hardware_init_failure.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/callback/test_camera_hardware_init_failure.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/callback/test_camera_hardware_init_failure.html	2014-11-26 21:45:57.000000000 +0000
@@ -65,11 +65,64 @@
       info("Running test: init-success");
       navigator.mozCameras.getCamera(whichCamera, initialConfig, onSuccess, onError)
     }
-  }
+  },
+  /* Test for bug 1099390 to make sure events related to the underlying
+     platform failing are generated and handled properly. */
+  {
+    name: "post-init-system-failure",
+    key: "post-init-system-failure",
+    func: function(test) {
+      var gotReleaseCallback = false;
+      var gotCloseCallback = false;
+
+      function gotAll() {
+        var all = gotReleaseCallback && gotCloseCallback;
+        if (all) {
+          info("Got all expected notifications");
+        }
+        return all;
+      }
+
+      function onSuccess(camera, config) {
+        camera.onClosed = function(reason) {
+          camera.onClosed = null;
+          ok(reason === "SystemFailure", "reason is: " + reason);
+          ok(!gotCloseCallback, "gotCloseCallback was " + gotCloseCallback);
+          gotCloseCallback = true;
+          if (gotAll()) {
+            test.next();
+          }
+
+          camera.release(
+            function success() {
+              ok(true, "Got release() success callback");
+              ok(!gotReleaseCallback, "gotReleaseCallback was " + gotReleaseCallback);
+              gotReleaseCallback = true;
+              if (gotAll()) {
+                test.next();
+              }
+            },
+            function error(e) {
+              ok(false, "Unexpected release() onError callback: " + e);
+              test.next();
+            }
+          ); // release()
+        } // onClosed
+      } // onSuccess
+
+      function onError(error) {
+        ok(false, "onError called incorrectly: " + error);
+        test.next();
+      }
+
+      info("Running test: post-init-system-failure");
+      navigator.mozCameras.getCamera(whichCamera, initialConfig, onSuccess, onError);
+    }
+  },
 ];
 
 var testGenerator = function() {
-  for (var i = 0; i < tests.length; ++i ) {
+  for (var i = 0; i < tests.length; ++i) {
     yield tests[i];
   }
 }();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/mochitest.ini	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/mochitest.ini	2014-11-26 21:45:57.000000000 +0000
@@ -10,6 +10,7 @@
 [callback/test_camera_hardware_face_detection.html]
 [callback/test_camera_hardware_auto_focus_moving_cb.html]
 [callback/test_bug1022766.html]
+[callback/test_bug1099390.html]
 [test_camera.html]
 [test_camera_2.html]
 [test_camera_3.html]
@@ -21,3 +22,4 @@
 [test_camera_hardware_auto_focus_moving_cb.html]
 [test_bug1022766.html]
 [test_bug1037322.html]
+[test_bug1099390.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/test_bug1099390.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/test_bug1099390.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/test_bug1099390.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/test_bug1099390.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,108 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for bug 1099390</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="camera_common.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<video id="viewfinder" width="200" height="200" autoplay></video>
+<img src="#" alt="This image is going to load" id="testimage"/>
+<script class="testbody" type="text/javascript;version=1.7">
+
+var whichCamera = navigator.mozCameras.getListOfCameras()[0];
+var config = {
+  mode: 'picture',
+  recorderProfile: 'cif',
+  previewSize: {
+    width: 352,
+    height: 288
+  }
+};
+
+function onError(e) {
+  ok(false, "Error " + e);
+}
+
+var Camera = {
+  _cameraObj: null,
+
+  get viewfinder() {
+    return document.getElementById('viewfinder');
+  },
+
+  release: function release() {
+    viewfinder.mozSrcObject = null;
+    if (Camera._cameraObj) {
+      Camera._cameraObj.release();
+      Camera._cameraObj = null;
+    }
+  },
+
+  test: function test(cam) {
+    var gotCloseEvent = false;
+    var gotReleasePromise = false;
+
+    function gotAll() {
+      var all = gotCloseEvent && gotReleasePromise;
+      if (all) {
+        info("Got all expected notifications");
+      }
+      return all;
+    };
+
+    var onClosed = function(e) {
+      cam.removeEventListener('close', onClosed);
+      ok(!gotCloseEvent, "gotCloseEvent was " + gotCloseEvent);
+      ok(e.reason === "HardwareReleased", "'close' event reason is: " + e.reason);
+      gotCloseEvent = true;
+      if (gotAll()) {
+        SimpleTest.finish();
+      }
+    };
+
+    cam.addEventListener('close', onClosed);
+
+    var onResolve = function() {
+      ok(!gotReleasePromise, "gotReleasePromise was " + gotReleasePromise);
+      gotReleasePromise = true;
+      if (gotAll()) {
+        SimpleTest.finish();
+      }
+    };
+
+    cam.release().then(onResolve, onError);
+  }, // test()
+
+  start: function start() {
+    function onSuccess(d) {
+      Camera._cameraObj = d.camera;
+      var cam = d.camera;
+
+      var onPreviewStateChange = function(e) {
+        if (e.newState === 'started') {
+          cam.removeEventListener('previewstatechange', onPreviewStateChange);
+          Camera.test(cam);
+        }
+      }; // onPreviewStateChange
+      cam.addEventListener('previewstatechange', onPreviewStateChange);
+    }; // onSuccess()
+
+    navigator.mozCameras.getCamera(whichCamera, config).then(onSuccess, onError);
+  }, // start()
+}
+
+SimpleTest.waitForExplicitFinish();
+
+window.addEventListener('beforeunload', function() {
+  Camera.release();
+});
+
+Camera.start();
+
+</script>
+</body>
+
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/test_camera_hardware_init_failure.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/test_camera_hardware_init_failure.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/test/test_camera_hardware_init_failure.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/test/test_camera_hardware_init_failure.html	2014-11-26 21:45:57.000000000 +0000
@@ -55,8 +55,7 @@
     func: function(test) {
       function onSuccess(d) {
         ok(true, "onSuccess called correctly");
-        d.camera.release();
-        test.next();
+        d.camera.release().then(test.next);
       }
       function onError(error) {
         ok(false, "onError called incorrectly: " + error);
@@ -65,11 +64,66 @@
       info("Running test: init-success");
       navigator.mozCameras.getCamera(whichCamera, initialConfig).then(onSuccess, onError)
     }
-  }
+  },
+  /* Test for bug 1099390 to make sure events related to the underlying
+     platform failing are generated and handled properly. */
+  {
+    name: "post-init-system-failure",
+    key: "post-init-system-failure",
+    func: function(test) {
+      var gotReleasePromise = false;
+      var gotCloseEvent = false;
+
+      function gotAll() {
+        var all = gotReleasePromise && gotCloseEvent;
+        if (all) {
+          info("Got all expected notifications");
+        }
+        return all;
+      }
+
+      function onSuccess(d) {
+        var onClosedEvent = function(e) {
+          d.camera.removeEventListener('close', onClosedEvent);
+
+          ok(e.reason === "SystemFailure", "reason is: " + e.reason);
+          ok(!gotCloseEvent, "gotCloseEvent was " + gotCloseEvent);
+          gotCloseEvent = true;
+          if (gotAll()) {
+            test.next();
+          }
+
+          d.camera.release().then(
+            function resolve(e) {
+              ok(true, "release() promise resolved");
+              ok(!gotReleasePromise, "gotReleasePromise was " + gotReleasePromise);
+              gotReleasePromise = true;
+              if (gotAll()) {
+                test.next();
+              }
+            },
+            function reject(e) {
+              ok(false, "release() promise unexpected rejected: " + e);
+            }
+          );
+        };
+
+        d.camera.addEventListener('close', onClosedEvent);
+      }
+
+      function onError(error) {
+        ok(false, "onError called incorrectly: " + error);
+        test.next();
+      }
+
+      info("Running test: post-init-system-failure");
+      navigator.mozCameras.getCamera(whichCamera, initialConfig).then(onSuccess, onError)
+    }
+  },
 ];
 
 var testGenerator = function() {
-  for (var i = 0; i < tests.length; ++i ) {
+  for (var i = 0; i < tests.length; ++i) {
     yield tests[i];
   }
 }();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/TestGonkCameraHardware.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/TestGonkCameraHardware.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/TestGonkCameraHardware.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/TestGonkCameraHardware.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -39,12 +39,45 @@
   DOM_CAMERA_LOGA("^===== Destroyed TestGonkCameraHardware =====^\n");
 }
 
+void
+TestGonkCameraHardware::InjectFakeSystemFailure()
+{
+  DOM_CAMERA_LOGA("====== Fake Camera Hardware Failure ======\n");
+  // The values '100' and '0' below seem to be what the AOSP layer
+  // throws back when the mediaserver process fails.
+  OnSystemError(mTarget, CameraControlListener::kSystemService, 100, 0);
+}
+
 nsresult
 TestGonkCameraHardware::Init()
 {
+  class DeferredSystemFailure : public nsRunnable
+  {
+  public:
+    DeferredSystemFailure(TestGonkCameraHardware* aCameraHw)
+      : mCameraHw(aCameraHw)
+    { }
+
+    NS_IMETHODIMP
+    Run()
+    {
+      mCameraHw->InjectFakeSystemFailure();
+      return NS_OK;
+    }
+
+  protected:
+    android::sp<TestGonkCameraHardware> mCameraHw;
+  };
+
   if (IsTestCase("init-failure")) {
     return NS_ERROR_NOT_INITIALIZED;
   }
+  if (IsTestCase("post-init-system-failure")) {
+    nsCOMPtr<nsIThread> me = NS_GetCurrentThread();
+    if (me) {
+      me->Dispatch(new DeferredSystemFailure(this), NS_DISPATCH_NORMAL);
+    }
+  }
 
   return GonkCameraHardware::Init();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/TestGonkCameraHardware.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/TestGonkCameraHardware.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/camera/TestGonkCameraHardware.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/camera/TestGonkCameraHardware.h	2014-11-26 21:45:56.000000000 +0000
@@ -62,6 +62,7 @@
   int TestCaseError(int aDefaultError);
 
   int StartAutoFocusMoving(bool aIsMoving);
+  void InjectFakeSystemFailure();
 
 private:
   TestGonkCameraHardware(const TestGonkCameraHardware&) MOZ_DELETE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/CanvasRenderingContext2D.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/CanvasRenderingContext2D.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/CanvasRenderingContext2D.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/CanvasRenderingContext2D.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -89,6 +89,7 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"
 #include "nsCCUncollectableMarker.h"
@@ -691,6 +692,106 @@
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(CanvasPattern, mContext)
 
+class CanvasDrawObserver
+{
+public:
+  CanvasDrawObserver(CanvasRenderingContext2D* aCanvasContext);
+
+  // Only enumerate draw calls that could affect the heuristic
+  enum DrawCallType {
+    PutImageData,
+    GetImageData,
+    DrawImage
+  };
+
+  // This is the one that we call on relevant draw calls and count
+  // GPU vs. CPU preferrable calls...
+  void DidDrawCall(DrawCallType aType);
+
+  // When this returns true, the observer is done making the decisions.
+  // Right now, we expect to get rid of the observer after the FrameEnd
+  // returns true, though the decision could eventually change if the
+  // function calls shift.  If we change to monitor the functions called
+  // and make decisions to change more than once, we would probably want
+  // FrameEnd to reset the timer and counters as it returns true.
+  bool FrameEnd();
+
+private:
+  // These values will be picked up from preferences:
+  int32_t mMinFramesBeforeDecision;
+  float mMinSecondsBeforeDecision;
+  int32_t mMinCallsBeforeDecision;
+
+  CanvasRenderingContext2D* mCanvasContext;
+  int32_t mSoftwarePreferredCalls;
+  int32_t mGPUPreferredCalls;
+  int32_t mFramesRendered;
+  TimeStamp mCreationTime;
+};
+
+// We are not checking for the validity of the preference values.  For example,
+// negative values will have an effect of a quick exit, so no harm done.
+CanvasDrawObserver::CanvasDrawObserver(CanvasRenderingContext2D* aCanvasContext)
+ : mMinFramesBeforeDecision(gfxPrefs::CanvasAutoAccelerateMinFrames())
+ , mMinSecondsBeforeDecision(gfxPrefs::CanvasAutoAccelerateMinSeconds())
+ , mMinCallsBeforeDecision(gfxPrefs::CanvasAutoAccelerateMinCalls())
+ , mCanvasContext(aCanvasContext)
+ , mSoftwarePreferredCalls(0)
+ , mGPUPreferredCalls(0)
+ , mFramesRendered(0)
+ , mCreationTime(TimeStamp::NowLoRes())
+{}
+
+void
+CanvasDrawObserver::DidDrawCall(DrawCallType aType)
+{
+  switch (aType) {
+    case PutImageData:
+    case GetImageData:
+      if (mGPUPreferredCalls == 0 && mSoftwarePreferredCalls == 0) {
+        mCreationTime = TimeStamp::NowLoRes();
+      }
+      mSoftwarePreferredCalls++;
+      break;
+    case DrawImage:
+      if (mGPUPreferredCalls == 0 && mSoftwarePreferredCalls == 0) {
+        mCreationTime = TimeStamp::NowLoRes();
+      }
+      mGPUPreferredCalls++;
+      break;
+  }
+}
+
+// If we return true, the observer is done making the decisions...
+bool
+CanvasDrawObserver::FrameEnd()
+{
+  mFramesRendered++;
+
+  // We log the first mMinFramesBeforeDecision frames of any
+  // canvas object then make a call to determine whether it should
+  // be GPU or CPU backed
+  if ((mFramesRendered >= mMinFramesBeforeDecision) ||
+      ((TimeStamp::NowLoRes() - mCreationTime).ToSeconds()) > mMinSecondsBeforeDecision) {
+
+    // If we don't have enough data, don't bother changing...
+    if (mGPUPreferredCalls > mMinCallsBeforeDecision ||
+        mSoftwarePreferredCalls > mMinCallsBeforeDecision) {
+      if (mGPUPreferredCalls >= mSoftwarePreferredCalls) {
+        mCanvasContext->SwitchRenderingMode(CanvasRenderingContext2D::RenderingMode::OpenGLBackendMode);
+      } else {
+        mCanvasContext->SwitchRenderingMode(CanvasRenderingContext2D::RenderingMode::SoftwareBackendMode);
+      }
+    }
+
+    // If we ever redesign this class to constantly monitor the functions
+    // and keep making decisions, we would probably want to reset the counters
+    // and the timers here...
+    return true;
+  }
+  return false;
+}
+
 class CanvasRenderingContext2DUserData : public LayerUserData {
 public:
   explicit CanvasRenderingContext2DUserData(CanvasRenderingContext2D *aContext)
@@ -724,6 +825,12 @@
       static_cast<CanvasRenderingContext2DUserData*>(aData);
     if (self->mContext) {
       self->mContext->MarkContextClean();
+      if (self->mContext->mDrawObserver) {
+        if (self->mContext->mDrawObserver->FrameEnd()) {
+          // Note that this call deletes and nulls out mDrawObserver:
+          self->mContext->RemoveDrawObserver();
+        }
+      }
     }
   }
   bool IsForContext(CanvasRenderingContext2D *aContext)
@@ -828,6 +935,7 @@
   , mZero(false), mOpaque(false)
   , mResetLayer(true)
   , mIPC(false)
+  , mDrawObserver(nullptr)
   , mIsEntireFrameInvalid(false)
   , mPredictManyRedrawCalls(false), mPathTransformWillUpdate(false)
   , mInvalidateCount(0)
@@ -839,10 +947,14 @@
     mRenderingMode = RenderingMode::SoftwareBackendMode;
   }
 
+  if (gfxPlatform::GetPlatform()->HaveChoiceOfHWAndSWCanvas()) {
+    mDrawObserver = new CanvasDrawObserver(this);
+  }
 }
 
 CanvasRenderingContext2D::~CanvasRenderingContext2D()
 {
+  RemoveDrawObserver();
   RemovePostRefreshObserver();
   Reset();
   // Drop references from all CanvasRenderingContext2DUserData to this context
@@ -1443,6 +1555,10 @@
   if (Preferences::GetBool("gfx.canvas.willReadFrequently.enable", false)) {
     // Use software when there is going to be a lot of readback
     if (attributes.mWillReadFrequently) {
+
+      // We want to lock into software, so remove the observer that
+      // may potentially change that...
+      RemoveDrawObserver();
       mRenderingMode = RenderingMode::SoftwareBackendMode;
     }
   }
@@ -1619,6 +1735,12 @@
   mTarget->SetTransform(matrix);
 }
 
+void
+CanvasRenderingContext2D::ResetTransform(ErrorResult& error)
+{
+  SetTransform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0, error);
+}
+
 static void
 MatrixToJSObject(JSContext* cx, const Matrix& matrix,
                  JS::MutableHandle<JSObject*> result, ErrorResult& error)
@@ -3131,7 +3253,7 @@
     mFontgrp->UpdateUserFonts(); // ensure user font generation is current
     // adjust flags for current direction run
     uint32_t flags = mTextRunFlags;
-    if (direction & 1) {
+    if (direction == NSBIDI_RTL) {
       flags |= gfxTextRunFactory::TEXT_IS_RTL;
     } else {
       flags &= ~gfxTextRunFactory::TEXT_IS_RTL;
@@ -3578,8 +3700,13 @@
     MOZ_CRASH("unexpected TextBaseline");
   }
 
-  if (processor.mTextRun->IsVertical()) {
-    if (processor.mTextRun->UseCenterBaseline()) {
+  // We can't query the textRun directly, as it may not have been created yet;
+  // so instead we check the flags that will be used to initialize it.
+  uint16_t runOrientation =
+    (processor.mTextRunFlags & gfxTextRunFactory::TEXT_ORIENT_MASK);
+  if (runOrientation != gfxTextRunFactory::TEXT_ORIENT_HORIZONTAL) {
+    if (runOrientation == gfxTextRunFactory::TEXT_ORIENT_VERTICAL_MIXED ||
+        runOrientation == gfxTextRunFactory::TEXT_ORIENT_VERTICAL_UPRIGHT) {
       // Adjust to account for mTextRun being shaped using center baseline
       // rather than alphabetic.
       baselineAnchor -= (fontMetrics.emAscent - fontMetrics.emDescent) * .5f;
@@ -4009,6 +4136,10 @@
                                     uint8_t optional_argc,
                                     ErrorResult& error)
 {
+  if (mDrawObserver) {
+    mDrawObserver->DidDrawCall(CanvasDrawObserver::DrawCallType::DrawImage);
+  }
+
   MOZ_ASSERT(optional_argc == 0 || optional_argc == 2 || optional_argc == 6);
 
   RefPtr<SourceSurface> srcSurf;
@@ -4628,6 +4759,10 @@
                                        double aSy, double aSw,
                                        double aSh, ErrorResult& error)
 {
+  if (mDrawObserver) {
+    mDrawObserver->DidDrawCall(CanvasDrawObserver::DrawCallType::GetImageData);
+  }
+
   EnsureTarget();
   if (!IsTargetValid()) {
     error.Throw(NS_ERROR_FAILURE);
@@ -4708,6 +4843,10 @@
                                             uint32_t aHeight,
                                             JSObject** aRetval)
 {
+  if (mDrawObserver) {
+    mDrawObserver->DidDrawCall(CanvasDrawObserver::DrawCallType::GetImageData);
+  }
+
   MOZ_ASSERT(aWidth && aHeight);
 
   CheckedInt<uint32_t> len = CheckedInt<uint32_t>(aWidth) * aHeight * 4;
@@ -4887,6 +5026,10 @@
                                                 bool hasDirtyRect, int32_t dirtyX, int32_t dirtyY,
                                                 int32_t dirtyWidth, int32_t dirtyHeight)
 {
+  if (mDrawObserver) {
+    mDrawObserver->DidDrawCall(CanvasDrawObserver::DrawCallType::PutImageData);
+  }
+
   if (w == 0 || h == 0) {
     return NS_ERROR_DOM_INVALID_STATE_ERR;
   }
@@ -5066,6 +5209,15 @@
     return (uint32_t)(uintptr_t)mTarget->GetNativeSurface(NativeSurfaceType::OPENGL_TEXTURE);
 }
 
+void CanvasRenderingContext2D::RemoveDrawObserver()
+{
+  if (mDrawObserver) {
+    delete mDrawObserver;
+    mDrawObserver = nullptr;
+  }
+}
+
+
 already_AddRefed<CanvasLayer>
 CanvasRenderingContext2D::GetCanvasLayer(nsDisplayListBuilder* aBuilder,
                                          CanvasLayer *aOldLayer,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/CanvasRenderingContext2D.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/CanvasRenderingContext2D.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/CanvasRenderingContext2D.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/CanvasRenderingContext2D.h	2014-11-26 21:45:57.000000000 +0000
@@ -114,6 +114,7 @@
 
 struct CanvasBidiProcessor;
 class CanvasRenderingContext2DUserData;
+class CanvasDrawObserver;
 
 /**
  ** CanvasRenderingContext2D
@@ -147,6 +148,7 @@
                  double dy, mozilla::ErrorResult& error);
   void SetTransform(double m11, double m12, double m21, double m22, double dx,
                     double dy, mozilla::ErrorResult& error);
+  void ResetTransform(mozilla::ErrorResult& error);
 
   double GlobalAlpha()
   {
@@ -775,6 +777,12 @@
 
   uint32_t SkiaGLTex() const;
 
+  // This observes our draw calls at the beginning of the canvas
+  // lifetime and switches to software or GPU mode depending on
+  // what it thinks is best
+  CanvasDrawObserver* mDrawObserver;
+  void RemoveDrawObserver();
+
   /**
     * Flag to avoid duplicate calls to InvalidateFrame. Set to true whenever
     * Redraw is called, reset to false when Render is called.
@@ -1089,6 +1097,7 @@
   }
 
   friend struct CanvasBidiProcessor;
+  friend class CanvasDrawObserver;
 };
 
 MOZ_FINISH_NESTED_ENUM_CLASS(CanvasRenderingContext2D::CanvasMultiGetterType)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/crashtests/1099143-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/crashtests/1099143-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/crashtests/1099143-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/crashtests/1099143-1.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,5 @@
+<script>
+  var canvas = document.createElement("canvas");
+  var context = canvas.getContext("2d");
+  context.fillText("", 0, 0);
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/crashtests/crashtests.list	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/crashtests/crashtests.list	2014-11-26 21:45:57.000000000 +0000
@@ -21,3 +21,4 @@
 load 896047-2.html
 load 916128-1.html
 load 934939-1.html
+load 1099143-1.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/moz.build	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/moz.build	2014-11-26 21:45:57.000000000 +0000
@@ -55,7 +55,6 @@
     'WebGLActiveInfo.cpp',
     'WebGLBuffer.cpp',
     'WebGLContext.cpp',
-    'WebGLContextAsyncQueries.cpp',
     'WebGLContextBuffers.cpp',
     'WebGLContextDraw.cpp',
     'WebGLContextExtensions.cpp',
@@ -64,6 +63,7 @@
     'WebGLContextLossHandler.cpp',
     'WebGLContextReporter.cpp',
     'WebGLContextState.cpp',
+    'WebGLContextUnchecked.cpp',
     'WebGLContextUtils.cpp',
     'WebGLContextValidate.cpp',
     'WebGLContextVertexArray.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/test_canvas.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/test_canvas.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/test_canvas.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/test_canvas.html	2014-11-26 21:45:57.000000000 +0000
@@ -19182,6 +19182,7 @@
 
 
 }
+
 </script>
 
 <!-- [[[ test_2d.transformation.transform.multiply.html ]]] -->
@@ -19558,6 +19559,9 @@
 if (ctx.setTransform) {
     ok(ctx.setTransform(1, 0, 0, 1, 0, 0) === undefined, "ctx.setTransform(1, 0, 0, 1, 0, 0) === undefined");
 }
+if (ctx.resetTransform) {
+    ok(ctx.resetTransform() === undefined, "ctx.resetTransform() === undefined");
+}
 ok(ctx.clearRect(0, 0, 0, 0) === undefined, "ctx.clearRect(0, 0, 0, 0) === undefined");
 ok(ctx.fillRect(0, 0, 0, 0) === undefined, "ctx.fillRect(0, 0, 0, 0) === undefined");
 ok(ctx.strokeRect(0, 0, 0, 0) === undefined, "ctx.strokeRect(0, 0, 0, 0) === undefined");
@@ -21552,6 +21556,31 @@
 }
 </script>
 
+<p>Canvas test: 2d.transformation.transform.identity</p>
+<!-- Testing: resetTransform() changes to the identity matrix -->
+<canvas id="c689" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_reset_transform() {
+
+var canvas = document.getElementById('c689');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.setTransform(0.1, 0.0, 0.0, 0.1, 80.0, 30.0);
+ctx.resetTransform();
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+
+</script>
+
 <script>
 
 function asyncTestsDone() {
@@ -24845,6 +24874,11 @@
   ok(false, "unexpected exception thrown in: test_opaque");
  }
  try {
+  test_2d_transformation_reset_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_reset_transform");
+ }
+ try {
   // run this test last since it replaces the getContext method
   test_type_replace();
  } catch (e) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-conformance/conformance/extensions/oes-texture-float.html	2014-11-26 21:45:57.000000000 +0000
@@ -156,14 +156,16 @@
     gl.bindFramebuffer(gl.FRAMEBUFFER, fbo);
     gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, texture, 0);
     gl.bindTexture(gl.TEXTURE_2D, null);
-    shouldBe("gl.checkFramebufferStatus(gl.FRAMEBUFFER)", "gl.FRAMEBUFFER_COMPLETE");
-    // While strictly speaking it is probably legal for a WebGL implementation to support
-    // floating-point textures but not as attachments to framebuffer objects, any such
-    // implementation is so poor that it arguably should not advertise support for the
-    // OES_texture_float extension. For this reason the conformance test requires that the
-    // framebuffer is complete here.
-    if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE)
+
+    // Enabling OES_texture_float will either implicitly enable the entirety of
+    // WEBGL_color_buffer_float, or it will not enable any of it. If it is not
+    // enabled, we'll get an FB_INCOMPLETE_ATTACHMENT here.
+    if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) != gl.FRAMEBUFFER_COMPLETE) {
+        shouldBe("gl.checkFramebufferStatus(gl.FRAMEBUFFER)", "gl.FRAMEBUFFER_INCOMPLETE_ATTACHMENT");
         return;
+    }
+
+    shouldBe("gl.checkFramebufferStatus(gl.FRAMEBUFFER)", "gl.FRAMEBUFFER_COMPLETE");
 
     var renderProgram =
         wtu.setupProgram(gl,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-conformance/mochi-single.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-conformance/mochi-single.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-conformance/mochi-single.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-conformance/mochi-single.html	2014-11-26 21:45:57.000000000 +0000
@@ -99,7 +99,6 @@
       break;
 
     case DriverInfo.OS.LINUX:
-      failSet['conformance/extensions/oes-texture-float.html'] = true;
       failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
       failSet['conformance/misc/type-conversion-test.html'] = true;
       failSet['conformance/textures/texture-mips.html'] = true;
@@ -107,8 +106,6 @@
       break;
 
     case DriverInfo.OS.ANDROID:
-      failSet['conformance/extensions/oes-texture-float.html'] = true;
-
       if (DriverInfo.getOSVersion() >= OS_VERSION_ANDROID_ICS) {
         // Android 4.0 slaves.
         failSet['conformance/extensions/oes-vertex-array-object.html'] = true;
@@ -129,6 +126,7 @@
         failSet['conformance/textures/texture-size-cube-maps.html'] = true;
       } else {
         // Android 2.3 slaves.
+        failSet['conformance/extensions/oes-texture-float.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
         failSet['conformance/misc/object-deletion-behaviour.html'] = true;
         failSet['conformance/textures/tex-image-and-sub-image-2d-with-video.html'] = true;
@@ -139,7 +137,6 @@
 
     case DriverInfo.OS.B2G:
       failSet['conformance/context/context-attributes-alpha-depth-stencil-antialias.html'] = true;
-      failSet['conformance/extensions/oes-texture-float.html'] = true;
       failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
       failSet['conformance/glsl/reserved/_webgl_function.vert.html'] = true;
       failSet['conformance/glsl/reserved/webgl_function.vert.html'] = true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/_webgl-conformance.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/_webgl-conformance.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/_webgl-conformance.ini	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/_webgl-conformance.ini	2014-11-26 21:45:57.000000000 +0000
@@ -767,7 +767,7 @@
 [webgl-conformance/_wrappers/test_conformance__textures__texture-formats-test.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-mips.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-npot-video.html]
-skip-if = os == 'win'
+skip-if = os == 'win' || buildapp == 'mulet' # Mulet - bug 1089453 (crashes in libLLVM-3.0.so)
 [webgl-conformance/_wrappers/test_conformance__textures__texture-npot.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-size.html]
 skip-if = os == 'android'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-mochitest/test_implicit_color_buffer_float.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-mochitest/test_implicit_color_buffer_float.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-mochitest/test_implicit_color_buffer_float.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-mochitest/test_implicit_color_buffer_float.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,199 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset='utf-8'>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+</head>
+<body>
+<script>
+
+var RGBA32F_EXT = 0x8814;
+var RGBA16F_EXT = 0x881A; // Yep, it's really 4 and A.
+var HALF_FLOAT_OES = 0x8D61;
+
+function IsFormatValidForRB(gl, format) {
+    ok(!gl.getError(), 'Should have no errors here.');
+
+    var rb = gl.createRenderbuffer();
+    gl.bindRenderbuffer(gl.RENDERBUFFER, rb);
+    gl.renderbufferStorage(gl.RENDERBUFFER, format, 4, 4);
+
+    var error = gl.getError();
+    if (error == gl.INVALID_ENUM)
+        return false;
+
+    ok(error == gl.NO_ERROR, 'Error should be INVALID_ENUM or NO_ERROR.');
+    return error == gl.NO_ERROR;
+}
+
+function IsFormatValidForTex(gl, format, type) {
+    ok(!gl.getError(), 'Should have no errors here.');
+
+    var tex = gl.createTexture();
+    gl.bindTexture(gl.TEXTURE_2D, tex);
+    gl.texImage2D(gl.TEXTURE_2D, 0, format, 4, 4, 0, format, type, null);
+
+    var error = gl.getError();
+    if (error == gl.INVALID_ENUM)
+        return false;
+
+    ok(error == gl.NO_ERROR, 'Error should be INVALID_ENUM or NO_ERROR.');
+    return error == gl.NO_ERROR;
+}
+
+function IsFormatValidForTexFB(gl, format, type) {
+    ok(!gl.getError(), 'Should have no errors here.');
+
+    var tex = gl.createTexture();
+    gl.bindTexture(gl.TEXTURE_2D, tex);
+    gl.texImage2D(gl.TEXTURE_2D, 0, format, 4, 4, 0, format, type, null);
+
+    var error = gl.getError();
+    if (error == gl.INVALID_ENUM)
+        return false;
+
+    ok(error == gl.NO_ERROR, 'Error should be INVALID_ENUM or NO_ERROR.');
+
+    var fb = gl.createFramebuffer();
+    gl.bindFramebuffer(gl.FRAMEBUFFER, fb);
+    gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D,
+                            tex, 0);
+    error = gl.getError();
+    ok(error == gl.NO_ERROR, 'Error should be NO_ERROR.');
+
+    var status = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+    return status == gl.FRAMEBUFFER_COMPLETE;
+}
+
+function IsFormatValidForTexFBRead(gl, texFormat, texType, readType) {
+    ok(!gl.getError(), 'Should have no errors here.');
+
+    var tex = gl.createTexture();
+    gl.bindTexture(gl.TEXTURE_2D, tex);
+    gl.texImage2D(gl.TEXTURE_2D, 0, texFormat, 4, 4, 0, texFormat, texType,
+                  null);
+
+    var error = gl.getError();
+    if (error == gl.INVALID_ENUM)
+        return false;
+
+    ok(error == gl.NO_ERROR, 'Error should be INVALID_ENUM or NO_ERROR.');
+
+    var fb = gl.createFramebuffer();
+    gl.bindFramebuffer(gl.FRAMEBUFFER, fb);
+    gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D,
+                            tex, 0);
+    error = gl.getError();
+    ok(error == gl.NO_ERROR, 'Error should be NO_ERROR.');
+
+    var status = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+    if (status != gl.FRAMEBUFFER_COMPLETE)
+        return false;
+
+    var data;
+    switch (readType) {
+    case gl.UNSIGNED_BYTE:
+        data = new Uint8Array(4);
+        break;
+    case HALF_FLOAT_OES:
+        data = new Uint16Array(4);
+        break;
+    case gl.FLOAT:
+        data = new Float32Array(4);
+        break;
+    default:
+        throw 'Bad `readType`.';
+    }
+    gl.readPixels(0, 0, 1, 1, gl.RGBA, readType, data);
+
+    error = gl.getError();
+    return error == gl.NO_ERROR;
+}
+
+function TestColorBufferExt(gl, rbFormat, texFormat, texType, readType)
+{
+    var isTexFBValid = IsFormatValidForTexFB(gl, texFormat, texType);
+    var isTexFBReadValid = IsFormatValidForTexFBRead(gl, texFormat, texType,
+                                                     readType);
+    var isRBValid = IsFormatValidForRB(gl, rbFormat);
+
+    var validSubsetCount = isTexFBValid + isTexFBReadValid + isRBValid;
+
+    if (validSubsetCount) {
+        ok(isTexFBValid, 'If active, texture-fbs should work.');
+        ok(isTexFBReadValid, 'If active, reading texture-fbs should work.');
+        ok(isRBValid, 'If active, renderbuffers should work.');
+    }
+
+    return validSubsetCount == 3;
+}
+
+function TestImpliedExtension(gl, baseExtName, impliedExtName, rbFormat,
+                              texFormat, texType, readType)
+{
+    ok(true, '========');
+    ok(true, 'Testing if ' + baseExtName + ' implies ' + impliedExtName + '.');
+    ok(true, '--------');
+
+    var baseExt = gl.getExtension(baseExtName);
+    if (!baseExt) {
+        ok(!baseExt, 'Ext \'' + baseExtName + '\' can be unsupported.');
+        return;
+    }
+
+    var isTexValid = IsFormatValidForTex(gl, texFormat, texType);
+    ok(isTexValid, baseExtName + ' should allow float textures.');
+    if (!isTexValid)
+        return;
+
+    var isImplicitlyActive = TestColorBufferExt(gl, rbFormat, texFormat,
+                                                texType, readType);
+
+    if (isImplicitlyActive) {
+        ok(true, 'Activating ' + baseExtName + ' has implicitly activated ' +
+           impliedExtName + '.');
+
+        var impliedExt = gl.getExtension(impliedExtName);
+        ok(impliedExt, 'If ' + impliedExtName + ' is supported implicitly, it' +
+           ' must be supported explicitly as well.');
+        return;
+    }
+
+    ok(true, 'Activating ' + baseExtName + ' has not implicitly activated ' +
+       impliedExtName + '.');
+    ok(true, '--------');
+
+    var impliedExt = gl.getExtension(impliedExtName);
+    if (!impliedExt) {
+        ok(true, impliedExtName + ' can be unsupported.');
+        return;
+    }
+    ok(true, 'Explicit activation of ' + impliedExtName + ' successful.');
+
+    var isFunctional = TestColorBufferExt(gl, rbFormat, texFormat, texType,
+                                          readType);
+    ok(isFunctional, impliedExtName + ' should be fully functional.');
+}
+
+(function() {
+    var canvas = document.createElement('canvas');
+    var gl = canvas.getContext('experimental-webgl');
+    if (!gl) {
+        ok(!gl, 'WebGL can be unsupported.');
+        return;
+    }
+
+    TestImpliedExtension(gl, 'OES_texture_float', 'WEBGL_color_buffer_float',
+                         RGBA32F_EXT, gl.RGBA, gl.FLOAT, gl.FLOAT);
+    TestImpliedExtension(gl, 'OES_texture_half_float',
+                         'EXT_color_buffer_half_float', RGBA16F_EXT, gl.RGBA,
+                         HALF_FLOAT_OES, gl.FLOAT);
+    ok(true, '========');
+    ok(true, 'TEST COMPLETE');
+})();
+
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_request_mismatch.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,35 +1,90 @@
 <!DOCTYPE HTML>
-<title>WebGL test: Mismatched 'webgl' and 'experimental-webgl' context requests</title>
+<html>
+<head>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
+</head>
 <body>
-<canvas id="c1"></canvas>
-<canvas id="c2"></canvas>
-<canvas id="c3"></canvas>
-<canvas id="c4"></canvas>
 <script>
 
-function testContextRetrieval(canvasId, creationId, requestId) {
-  var canvas = document.getElementById(canvasId);
-  ok(canvas, 'Invalid `canvasId`: ' + canvasId);
-
-  var createdGL = canvas.getContext(creationId);
-  if (!createdGL)
-    return; // No WebGL on this machine?
-
-  var requestedGL = canvas.getContext(requestId);
-  if (creationId == requestId) {
-    ok(requestedGL, 'Request for \'' + requestId + '\' on from \'' + creationId + '\' should succeed.');
-    ok(requestedGL == createdGL, 'Request for \'' + requestId + '\' on from \'' + creationId + '\' should match.');
-  } else {
-    ok(!requestedGL, 'Request for \'' + requestId + '\' on from \'' + creationId + '\' should fail.');
-  }
-}
-
-testContextRetrieval('c1', 'experimental-webgl', 'webgl');
-testContextRetrieval('c2', 'webgl', 'experimental-webgl');
-testContextRetrieval('c3', 'experimental-webgl', 'experimental-webgl');
-testContextRetrieval('c4', 'webgl', 'webgl');
+WEBGL_TYPES = {};
+WEBGL_TYPES['experimental-webgl'] = true;
+WEBGL_TYPES['webgl'] = true;
 
-</script>
+function AreBothIn(a, b, set) {
+    return (a in set) && (b in set);
+}
+
+function IsAlias(typeA, typeB) {
+    if (typeA == typeB)
+        return true;
+
+    if (AreBothIn(typeA, typeB, WEBGL_TYPES))
+        return true;
+
+    return false;
+}
+
+function TestContextRetrieval(creationType, requestType, functionalTypeSet) {
+    var canvas = document.createElement('canvas');
+    var createdGL = canvas.getContext(creationType);
+
+    var didCreationSucceed = (createdGL != null);
+    if (creationType in functionalTypeSet) {
+        ok(createdGL, 'Context creation should succeed for type \'' +
+                      creationType + '\'');
+    } else {
+        ok(!createdGL, 'Context creation should fail for type \'' +
+                       creationType + '\'');
+        return;
+    }
+
+    var requestedGL = canvas.getContext(requestType);
+
+    if (requestType in functionalTypeSet &&
+        IsAlias(creationType, requestType))
+    {
+        ok(requestedGL, 'Request for \'' + requestType + '\' from \'' +
+                        creationType + '\' should succeed.');
+        ok(requestedGL == createdGL, 'Request for \'' + requestType +
+                                     '\' from \'' + creationType +
+                                     '\' should match.');
+    } else {
+        ok(!requestedGL, 'Request for \'' + requestType + '\' from \'' +
+                         creationType + '\' should fail.');
+    }
+}
+
+function IsWebGLFunctional() {
+    var canvas = document.createElement('canvas');
+    return canvas.getContext('experimental-webgl') != null;
+}
 
+function IsWebGLConformant() {
+    var canvas = document.createElement('canvas');
+    return canvas.getContext('webgl') != null;
+}
+
+var typeList = ['2d', 'experimental-webgl', 'webgl'];
+var functionalTypeSet = {};
+functionalTypeSet['2d'] = true;
+
+if (IsWebGLFunctional())
+    functionalTypeSet['experimental-webgl'] = true;
+
+if (IsWebGLConformant())
+    functionalTypeSet['webgl'] = true;
+
+for (var i in typeList) {
+    var creationType = typeList[i];
+
+    for (var j in typeList) {
+        var requestType = typeList[j];
+
+        TestContextRetrieval(creationType, requestType, functionalTypeSet);
+    }
+}
+
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/test/webgl-mochitest.ini	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/test/webgl-mochitest.ini	2014-11-26 21:45:57.000000000 +0000
@@ -12,7 +12,8 @@
 [webgl-mochitest/test_fb_param.html]
 [webgl-mochitest/test_fb_param_crash.html]
 [webgl-mochitest/test_hidden_alpha.html]
-fail-if = (os == 'b2g')
+skip-if = (os == 'b2g') || buildapp == 'mulet' # Mulet - bug 1093639 (crashes in libLLVM-3.0.so)
+[webgl-mochitest/test_implicit_color_buffer_float.html]
 [webgl-mochitest/test_highp_fs.html]
 [webgl-mochitest/test_no_arr_points.html]
 skip-if = android_version == '10' #Android 2.3 aws only; bug 1030942
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL1Context.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL1Context.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL1Context.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL1Context.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -4,47 +4,48 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebGL1Context.h"
-#include "mozilla/dom/WebGLRenderingContextBinding.h"
 
+#include "mozilla/dom/WebGLRenderingContextBinding.h"
 #include "mozilla/Telemetry.h"
 
-using namespace mozilla;
+namespace mozilla {
 
-// -----------------------------------------------------------------------------
-// CONSTRUCTOR & DESTRUCTOR
+/*static*/ WebGL1Context*
+WebGL1Context::Create()
+{
+    return new WebGL1Context();
+}
 
 WebGL1Context::WebGL1Context()
     : WebGLContext()
 {
-
 }
 
 WebGL1Context::~WebGL1Context()
 {
-
 }
 
-
-// -----------------------------------------------------------------------------
-// IMPLEMENT nsWrapperCache
+////////////////////////////////////////
+// nsWrapperCache
 
 JSObject*
-WebGL1Context::WrapObject(JSContext *cx)
+WebGL1Context::WrapObject(JSContext* cx)
 {
     return dom::WebGLRenderingContextBinding::Wrap(cx, this);
 }
 
+} // namespace mozilla
 
-// -----------------------------------------------------------------------------
-// INSTANCING nsIDOMWebGLRenderingContext
+////////////////////////////////////////
+// nsIDOMWebGLRenderingContext
 
 nsresult
-NS_NewCanvasRenderingContextWebGL(nsIDOMWebGLRenderingContext** aResult)
+NS_NewCanvasRenderingContextWebGL(nsIDOMWebGLRenderingContext** out_result)
 {
-    Telemetry::Accumulate(Telemetry::CANVAS_WEBGL_USED, 1);
-    nsIDOMWebGLRenderingContext* ctx = new WebGL1Context();
+    mozilla::Telemetry::Accumulate(mozilla::Telemetry::CANVAS_WEBGL_USED, 1);
 
-    NS_ADDREF(*aResult = ctx);
+    nsIDOMWebGLRenderingContext* ctx = mozilla::WebGL1Context::Create();
+
+    NS_ADDREF(*out_result = ctx);
     return NS_OK;
 }
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL1Context.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL1Context.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL1Context.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL1Context.h	2014-11-26 21:45:57.000000000 +0000
@@ -3,8 +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/. */
 
-#ifndef WEBGL1CONTEXT_H_
-#define WEBGL1CONTEXT_H_
+#ifndef WEBGL_1_CONTEXT_H_
+#define WEBGL_1_CONTEXT_H_
 
 #include "WebGLContext.h"
 
@@ -13,34 +13,23 @@
 class WebGL1Context
     : public WebGLContext
 {
-// -----------------------------------------------------------------------------
-// PUBLIC
 public:
+    static WebGL1Context* Create();
 
-    // -------------------------------------------------------------------------
-    // CONSTRUCTOR & DESTRUCTOR
-
+private:
     WebGL1Context();
-    virtual ~WebGL1Context();
-
 
-    // -------------------------------------------------------------------------
-    // IMPLEMENT WebGLContext
+public:
+    virtual ~WebGL1Context();
 
-    virtual bool IsWebGL2() const MOZ_OVERRIDE
-    {
+    virtual bool IsWebGL2() const MOZ_OVERRIDE {
         return false;
     }
 
-
-    // -------------------------------------------------------------------------
-    // IMPLEMENT nsWrapperCache
-
-    virtual JSObject* WrapObject(JSContext *cx) MOZ_OVERRIDE;
-
-
+    // nsWrapperCache
+    virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
 };
 
 } // namespace mozilla
 
-#endif
+#endif // WEBGL_1_CONTEXT_H_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2Context.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2Context.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2Context.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2Context.h	2014-11-26 21:45:57.000000000 +0000
@@ -164,17 +164,19 @@
 
     bool ValidateClearBuffer(const char* info, GLenum buffer, GLint drawbuffer, size_t elemCount);
 
+
     // -------------------------------------------------------------------------
     // Query Objects - WebGL2ContextQueries.cpp
-    // TODO(djg): Implemented in WebGLContext
-    /* already_AddRefed<WebGLQuery> CreateQuery();
+
+    already_AddRefed<WebGLQuery> CreateQuery();
     void DeleteQuery(WebGLQuery* query);
     bool IsQuery(WebGLQuery* query);
     void BeginQuery(GLenum target, WebGLQuery* query);
     void EndQuery(GLenum target);
-    JS::Value GetQuery(JSContext*, GLenum target, GLenum pname); */
+    already_AddRefed<WebGLQuery> GetQuery(GLenum target, GLenum pname);
     void GetQueryParameter(JSContext*, WebGLQuery* query, GLenum pname, JS::MutableHandleValue retval);
 
+
     // -------------------------------------------------------------------------
     // Sampler Objects - WebGL2ContextSamplers.cpp
 
@@ -204,6 +206,7 @@
 
     // -------------------------------------------------------------------------
     // Transform Feedback - WebGL2ContextTransformFeedback.cpp
+
     already_AddRefed<WebGLTransformFeedback> CreateTransformFeedback();
     void DeleteTransformFeedback(WebGLTransformFeedback* tf);
     bool IsTransformFeedback(WebGLTransformFeedback* tf);
@@ -245,7 +248,6 @@
 */
 
 private:
-
     WebGL2Context();
 
     bool ValidateSizedInternalFormat(GLenum internalFormat, const char* info);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2ContextQueries.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2ContextQueries.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2ContextQueries.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2ContextQueries.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -5,24 +5,349 @@
 
 #include "WebGL2Context.h"
 #include "GLContext.h"
+#include "WebGLQuery.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
+/*
+ * We fake ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE with
+ * SAMPLES_PASSED on desktop.
+ *
+ * OpenGL ES 3.0 spec 4.1.6
+ *  If the target of the query is ANY_SAMPLES_PASSED_CONSERVATIVE, an
+ *  implementation may choose to use a less precise version of the test which
+ *  can additionally set the samples-boolean state to TRUE in some other
+ *  implementation-dependent cases.
+ */
+
+static const char*
+GetQueryTargetEnumString(GLenum target)
+{
+    switch (target)
+    {
+        case LOCAL_GL_ANY_SAMPLES_PASSED:
+            return "ANY_SAMPLES_PASSED";
+        case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+            return "ANY_SAMPLES_PASSED_CONSERVATIVE";
+        case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+            return "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN";
+        default:
+            break;
+    }
+
+    MOZ_ASSERT(false, "Unknown query `target`.");
+    return "UNKNOWN_QUERY_TARGET";
+}
+
+static inline GLenum
+SimulateOcclusionQueryTarget(const gl::GLContext* gl, GLenum target)
+{
+    MOZ_ASSERT(target == LOCAL_GL_ANY_SAMPLES_PASSED ||
+               target == LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
+               "unknown occlusion query target");
+
+    if (gl->IsSupported(gl::GLFeature::occlusion_query_boolean)) {
+        return target;
+    } else if (gl->IsSupported(gl::GLFeature::occlusion_query2)) {
+        return LOCAL_GL_ANY_SAMPLES_PASSED;
+    }
+
+    return LOCAL_GL_SAMPLES_PASSED;
+}
+
+WebGLQueryRefPtr*
+WebGLContext::GetQueryTargetSlot(GLenum target)
+{
+    switch (target) {
+        case LOCAL_GL_ANY_SAMPLES_PASSED:
+        case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
+            return &mActiveOcclusionQuery;
+
+        case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+            return &mActiveTransformFeedbackQuery;
+    }
+
+    return nullptr;
+}
+
+
 // -------------------------------------------------------------------------
 // Query Objects
-// TODO(djg): Implemented in WebGLContext
 
-/*
-    already_AddRefed<WebGLQuery> CreateQuery();
-    void DeleteQuery(WebGLQuery* query);
-    bool IsQuery(WebGLQuery* query);
-    void BeginQuery(GLenum target, WebGLQuery* query);
-    void EndQuery(GLenum target);
-    JS::Value GetQuery(JSContext*, GLenum target, GLenum pname);
-*/
+already_AddRefed<WebGLQuery>
+WebGL2Context::CreateQuery()
+{
+    if (IsContextLost())
+        return nullptr;
+
+    if (mActiveOcclusionQuery && !gl->IsGLES()) {
+        /* http://www.opengl.org/registry/specs/ARB/occlusion_query.txt
+         *
+         * Calling either GenQueriesARB or DeleteQueriesARB while any query of
+         * any target is active causes an INVALID_OPERATION error to be
+         * generated.
+         */
+        GenerateWarning("createQuery: the WebGL 2 prototype might generate "
+                        "INVALID_OPERATION when creating a query object while "
+                        "one other is active.");
+        /*
+         * We *need* to lock webgl2 to GL>=3.0 on desktop, but we don't have a
+         * good mechanism to do this yet. See bug 898404.
+         */
+    }
+
+    nsRefPtr<WebGLQuery> globj = new WebGLQuery(this);
+
+    return globj.forget();
+}
+
+void
+WebGL2Context::DeleteQuery(WebGLQuery* query)
+{
+    if (IsContextLost())
+        return;
+
+    if (!query)
+        return;
+
+    if (query->IsDeleted())
+        return;
+
+    if (query->IsActive())
+        EndQuery(query->mType);
+
+    if (mActiveOcclusionQuery && !gl->IsGLES()) {
+        /* http://www.opengl.org/registry/specs/ARB/occlusion_query.txt
+         *
+         * Calling either GenQueriesARB or DeleteQueriesARB while any query of
+         * any target is active causes an INVALID_OPERATION error to be
+         * generated.
+         */
+        GenerateWarning("deleteQuery: the WebGL 2 prototype might generate "
+                        "INVALID_OPERATION when deleting a query object while "
+                        "one other is active.");
+    }
+
+    query->RequestDelete();
+}
+
+bool
+WebGL2Context::IsQuery(WebGLQuery* query)
+{
+    if (IsContextLost())
+        return false;
+
+    if (!query)
+        return false;
+
+    return (ValidateObjectAllowDeleted("isQuery", query) &&
+            !query->IsDeleted() &&
+            query->HasEverBeenActive());
+}
+
+void
+WebGL2Context::BeginQuery(GLenum target, WebGLQuery* query)
+{
+    if (IsContextLost())
+        return;
+
+    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target);
+    if (!targetSlot) {
+        ErrorInvalidEnum("beginQuery: unknown query target");
+        return;
+    }
+
+    if (!query) {
+        /* SPECS BeginQuery.1
+         * http://www.khronos.org/registry/gles/extensions/EXT/EXT_occlusion_query_boolean.txt
+         * BeginQueryEXT sets the active query object name for the query type given
+         * by <target> to <id>. If BeginQueryEXT is called with an <id> of zero, if
+         * the active query object name for <target> is non-zero (for the targets
+         * ANY_SAMPLES_PASSED_EXT and ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, if the
+         * active query for either target is non-zero), if <id> is the name of an
+         * existing query object whose type does not match <target>, or if <id> is the
+         * active query object name for any query type, the error INVALID_OPERATION is
+         * generated.
+         */
+        ErrorInvalidOperation("beginQuery: query should not be null");
+        return;
+    }
+
+    if (query->IsDeleted()) {
+        /* http://www.khronos.org/registry/gles/extensions/EXT/EXT_occlusion_query_boolean.txt
+         * BeginQueryEXT fails and an INVALID_OPERATION error is generated if <id>
+         * is not a name returned from a previous call to GenQueriesEXT, or if such
+         * a name has since been deleted with DeleteQueriesEXT.
+         */
+        ErrorInvalidOperation("beginQuery: query has been deleted");
+        return;
+    }
+
+    if (query->HasEverBeenActive() &&
+        query->mType != target)
+    {
+        /*
+         * See SPECS BeginQuery.1
+         */
+        ErrorInvalidOperation("beginQuery: target doesn't match with the query type");
+        return;
+    }
+
+    if (*targetSlot) {
+        /*
+         * See SPECS BeginQuery.1
+         */
+        ErrorInvalidOperation("beginQuery: an other query already active");
+        return;
+    }
+
+    if (!query->HasEverBeenActive()) {
+        query->mType = target;
+    }
+
+    MakeContextCurrent();
+
+    if (target == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) {
+        gl->fBeginQuery(LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, query->mGLName);
+    } else {
+        gl->fBeginQuery(SimulateOcclusionQueryTarget(gl, target), query->mGLName);
+    }
+
+    *targetSlot = query;
+}
+
+void
+WebGL2Context::EndQuery(GLenum target)
+{
+    if (IsContextLost())
+        return;
+
+    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target);
+    if (!targetSlot) {
+        ErrorInvalidEnum("endQuery: unknown query target");
+        return;
+    }
+
+    if (!*targetSlot || target != (*targetSlot)->mType) {
+        /* http://www.khronos.org/registry/gles/extensions/EXT/EXT_occlusion_query_boolean.txt
+         * marks the end of the sequence of commands to be tracked for the query type
+         * given by <target>. The active query object for <target> is updated to
+         * indicate that query results are not available, and the active query object
+         * name for <target> is reset to zero. When the commands issued prior to
+         * EndQueryEXT have completed and a final query result is available, the
+         * query object active when EndQueryEXT is called is updated by the GL. The
+         * query object is updated to indicate that the query results are available
+         * and to contain the query result. If the active query object name for
+         * <target> is zero when EndQueryEXT is called, the error INVALID_OPERATION
+         * is generated.
+         */
+        ErrorInvalidOperation("endQuery: There is no active query of type %s.",
+                              GetQueryTargetEnumString(target));
+        return;
+    }
+
+    MakeContextCurrent();
+
+    if (target == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) {
+        gl->fEndQuery(LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
+    } else {
+        gl->fEndQuery(SimulateOcclusionQueryTarget(gl, target));
+    }
+
+    *targetSlot = nullptr;
+}
+
+already_AddRefed<WebGLQuery>
+WebGL2Context::GetQuery(GLenum target, GLenum pname)
+{
+    if (IsContextLost())
+        return nullptr;
+
+    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target);
+    if (!targetSlot) {
+        ErrorInvalidEnum("getQuery: unknown query target");
+        return nullptr;
+    }
+
+    if (pname != LOCAL_GL_CURRENT_QUERY) {
+        /* OpenGL ES 3.0 spec 6.1.7
+         *  pname must be CURRENT_QUERY.
+         */
+        ErrorInvalidEnum("getQuery: pname must be CURRENT_QUERY");
+        return nullptr;
+    }
+
+    nsRefPtr<WebGLQuery> tmp = targetSlot->get();
+    return tmp.forget();
+}
+
 void
 WebGL2Context::GetQueryParameter(JSContext*, WebGLQuery* query, GLenum pname, JS::MutableHandleValue retval)
 {
-    MOZ_CRASH("Not Implemented");
+    retval.set(JS::NullValue());
+
+    if (IsContextLost())
+        return;
+
+    if (!query) {
+        /* OpenGL ES 3.0 spec 6.1.7 (spec getQueryObject 1)
+         *  If id is not the name of a query object, or if the query object named by id is
+         *  currently active, then an INVALID_OPERATION error is generated. pname must be
+         *  QUERY_RESULT or QUERY_RESULT_AVAILABLE.
+         */
+        ErrorInvalidOperation("getQueryObject: query should not be null");
+        return;
+    }
+
+    if (query->IsDeleted()) {
+        // See (spec getQueryObject 1)
+        ErrorInvalidOperation("getQueryObject: query has been deleted");
+        return;
+    }
+
+    if (query->IsActive()) {
+        // See (spec getQueryObject 1)
+        ErrorInvalidOperation("getQueryObject: query is active");
+        return;
+    }
+
+    if (!query->HasEverBeenActive()) {
+        /* See (spec getQueryObject 1)
+         *  If this instance of WebGLQuery has never been active before, that mean that
+         *  query->mGLName is not a query object yet.
+         */
+        ErrorInvalidOperation("getQueryObject: query has never been active");
+        return;
+    }
+
+    MakeContextCurrent();
+    GLuint returned = 0;
+    switch (pname) {
+    case LOCAL_GL_QUERY_RESULT_AVAILABLE:
+        gl->fGetQueryObjectuiv(query->mGLName, LOCAL_GL_QUERY_RESULT_AVAILABLE, &returned);
+        retval.set(JS::BooleanValue(returned != 0));
+        return;
+
+    case LOCAL_GL_QUERY_RESULT:
+        gl->fGetQueryObjectuiv(query->mGLName, LOCAL_GL_QUERY_RESULT, &returned);
+
+        if (query->mType == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) {
+            retval.set(JS::NumberValue(returned));
+            return;
+        }
+
+        /*
+         * test (returned != 0) is important because ARB_occlusion_query on desktop drivers
+         * return the number of samples drawed when the OpenGL ES extension
+         * ARB_occlusion_query_boolean return only a boolean if a sample has been drawed.
+         */
+        retval.set(JS::BooleanValue(returned != 0));
+        return;
+
+    default:
+        break;
+    }
+
+    ErrorInvalidEnum("getQueryObject: pname must be QUERY_RESULT{_AVAILABLE}");
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2ContextSamplers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2ContextSamplers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2ContextSamplers.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2ContextSamplers.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebGL2Context.h"
+#include "WebGLSampler.h"
 #include "GLContext.h"
 
 using namespace mozilla;
@@ -12,67 +13,206 @@
 already_AddRefed<WebGLSampler>
 WebGL2Context::CreateSampler()
 {
-    MOZ_CRASH("Not Implemented.");
-    return nullptr;
+    if (IsContextLost())
+        return nullptr;
+
+    GLuint sampler;
+    MakeContextCurrent();
+    gl->fGenSamplers(1, &sampler);
+
+    nsRefPtr<WebGLSampler> globj = new WebGLSampler(this, sampler);
+    return globj.forget();
 }
 
 void
 WebGL2Context::DeleteSampler(WebGLSampler* sampler)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!ValidateObjectAllowDeletedOrNull("deleteSampler", sampler))
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return;
+
+    sampler->RequestDelete();
 }
 
 bool
 WebGL2Context::IsSampler(WebGLSampler* sampler)
 {
-    MOZ_CRASH("Not Implemented.");
-    return false;
+    if (IsContextLost())
+        return false;
+
+    if (!sampler)
+        return false;
+
+    if (!ValidateObjectAllowDeleted("isSampler", sampler))
+        return false;
+
+    if (sampler->IsDeleted())
+        return false;
+
+    return !sampler->HasEverBeenBound();
 }
 
 void
 WebGL2Context::BindSampler(GLuint unit, WebGLSampler* sampler)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!ValidateObjectAllowDeletedOrNull("bindSampler", sampler))
+        return;
+
+    if (GLint(unit) >= mGLMaxTextureUnits)
+        return ErrorInvalidValue("bindSampler: unit must be < %d", mGLMaxTextureUnits);
+
+    if (sampler && sampler->IsDeleted())
+        return ErrorInvalidOperation("bindSampler: binding deleted sampler");
+
+    WebGLContextUnchecked::BindSampler(unit, sampler);
 }
 
 void
 WebGL2Context::SamplerParameteri(WebGLSampler* sampler, GLenum pname, GLint param)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("samplerParameteri: invalid sampler");
+
+    if (!ValidateSamplerParameterParams(pname, WebGLIntOrFloat(param), "samplerParameteri"))
+        return;
+
+    WebGLContextUnchecked::SamplerParameteri(sampler, pname, param);
 }
 
 void
 WebGL2Context::SamplerParameteriv(WebGLSampler* sampler, GLenum pname, const dom::Int32Array& param)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("samplerParameteriv: invalid sampler");
+
+    param.ComputeLengthAndData();
+    if (param.Length() < 1)
+        return /* TODO(djg): Error message */;
+
+    /* TODO(djg): All of these calls in ES3 only take 1 param */
+    if (!ValidateSamplerParameterParams(pname, WebGLIntOrFloat(param.Data()[0]), "samplerParameteriv"))
+        return;
+
+    WebGLContextUnchecked::SamplerParameteriv(sampler, pname, param.Data());
 }
 
 void
 WebGL2Context::SamplerParameteriv(WebGLSampler* sampler, GLenum pname, const dom::Sequence<GLint>& param)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("samplerParameteriv: invalid sampler");
+
+    if (param.Length() < 1)
+        return /* TODO(djg): Error message */;
+
+    /* TODO(djg): All of these calls in ES3 only take 1 param */
+    if (!ValidateSamplerParameterParams(pname, WebGLIntOrFloat(param[0]), "samplerParameteriv"))
+        return;
+
+    WebGLContextUnchecked::SamplerParameteriv(sampler, pname, param.Elements());
 }
 
 void
 WebGL2Context::SamplerParameterf(WebGLSampler* sampler, GLenum pname, GLfloat param)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("samplerParameterf: invalid sampler");
+
+    if (!ValidateSamplerParameterParams(pname, WebGLIntOrFloat(param), "samplerParameterf"))
+        return;
+
+    WebGLContextUnchecked::SamplerParameterf(sampler, pname, param);
 }
 
 void
 WebGL2Context::SamplerParameterfv(WebGLSampler* sampler, GLenum pname, const dom::Float32Array& param)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("samplerParameterfv: invalid sampler");
+
+    param.ComputeLengthAndData();
+    if (param.Length() < 1)
+        return /* TODO(djg): Error message */;
+
+    /* TODO(djg): All of these calls in ES3 only take 1 param */
+    if (!ValidateSamplerParameterParams(pname, WebGLIntOrFloat(param.Data()[0]), "samplerParameterfv"))
+        return;
+
+    WebGLContextUnchecked::SamplerParameterfv(sampler, pname, param.Data());
 }
 
 void
 WebGL2Context::SamplerParameterfv(WebGLSampler* sampler, GLenum pname, const dom::Sequence<GLfloat>& param)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("samplerParameterfv: invalid sampler");
+
+    if (param.Length() < 1)
+        return /* TODO(djg): Error message */;
+
+    /* TODO(djg): All of these calls in ES3 only take 1 param */
+    if (!ValidateSamplerParameterParams(pname, WebGLIntOrFloat(param[0]), "samplerParameterfv"))
+        return;
+
+    WebGLContextUnchecked::SamplerParameterfv(sampler, pname, param.Elements());
 }
 
 void
 WebGL2Context::GetSamplerParameter(JSContext*, WebGLSampler* sampler, GLenum pname, JS::MutableHandleValue retval)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    if (!sampler || sampler->IsDeleted())
+        return ErrorInvalidOperation("getSamplerParameter: invalid sampler");
+
+    if (!ValidateSamplerParameterName(pname, "getSamplerParameter"))
+        return;
+
+    retval.set(JS::NullValue());
+
+    switch (pname) {
+    case LOCAL_GL_TEXTURE_MIN_FILTER:
+    case LOCAL_GL_TEXTURE_MAG_FILTER:
+    case LOCAL_GL_TEXTURE_WRAP_S:
+    case LOCAL_GL_TEXTURE_WRAP_T:
+    case LOCAL_GL_TEXTURE_WRAP_R:
+    case LOCAL_GL_TEXTURE_COMPARE_MODE:
+    case LOCAL_GL_TEXTURE_COMPARE_FUNC:
+        retval.set(JS::Int32Value(
+            WebGLContextUnchecked::GetSamplerParameteriv(sampler, pname)));
+        return;
+
+    case LOCAL_GL_TEXTURE_MIN_LOD:
+    case LOCAL_GL_TEXTURE_MAX_LOD:
+        retval.set(JS::Float32Value(
+            WebGLContextUnchecked::GetSamplerParameterfv(sampler, pname)));
+        return;
+    }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2ContextTextures.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2ContextTextures.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGL2ContextTextures.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGL2ContextTextures.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -73,15 +73,12 @@
         return true;
     }
 
-    if (IsCompressedTextureFormat(internalformat)) {
+    if (IsCompressedTextureFormat(internalformat))
         return true;
-    }
 
-    const char* name = EnumName(internalformat);
-    if (name && name[0] != '[')
-        ErrorInvalidEnum("%s: invalid internal format %s", info, name);
-    else
-        ErrorInvalidEnum("%s: invalid internal format 0x%04X", info, internalformat);
+    nsCString name;
+    EnumName(internalformat, &name);
+    ErrorInvalidEnum("%s: invalid internal format %s", info, name.get());
 
     return false;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLBindableName.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLBindableName.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLBindableName.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLBindableName.h	2014-11-26 21:45:57.000000000 +0000
@@ -14,20 +14,16 @@
 
 namespace mozilla {
 
-/** Represents a GL name that can be bound to a target.
+/** Represents a binding to a GL binding point
  */
 template<typename T>
-class WebGLBindableName
+class WebGLBindable
 {
 public:
+    WebGLBindable() : mTarget(LOCAL_GL_NONE) { }
+    bool HasEverBeenBound() const { return mTarget != LOCAL_GL_NONE; }
 
-    WebGLBindableName()
-        : mGLName(0)
-        , mTarget(LOCAL_GL_NONE)
-    { }
-
-    void BindTo(T target)
-    {
+    void BindTo(T target) {
         MOZ_ASSERT(target != LOCAL_GL_NONE, "Can't bind to GL_NONE.");
         MOZ_ASSERT(!HasEverBeenBound() || mTarget == target, "Rebinding is illegal.");
 
@@ -37,22 +33,38 @@
             OnTargetChanged();
     }
 
-    bool HasEverBeenBound() const { return mTarget != LOCAL_GL_NONE; }
-    GLuint GLName() const { return mGLName; }
     T Target() const {
         MOZ_ASSERT(HasEverBeenBound());
         return mTarget;
     }
 
 protected:
-
     //! Called after mTarget has been changed by BindTo(target).
     virtual void OnTargetChanged() {}
 
-    GLuint mGLName;
     T mTarget;
 };
 
+
+/** Represents a GL name that can be bound to a target.
+ */
+template<typename T>
+class WebGLBindableName
+    : public WebGLBindable<T>
+{
+public:
+
+    WebGLBindableName(GLuint name)
+        : WebGLBindable<T>()
+        , mGLName(name)
+    { }
+    GLuint GLName() const { return mGLName; }
+
+protected:
+    const GLuint mGLName;
+};
+
+
 } // namespace mozilla
 
 #endif // !WEBGLBINDABLENAME_H_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLBuffer.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLBuffer.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -12,13 +12,11 @@
 
 using namespace mozilla;
 
-WebGLBuffer::WebGLBuffer(WebGLContext *context)
-    : WebGLBindableName<BufferBinding>()
+WebGLBuffer::WebGLBuffer(WebGLContext* context, GLuint buf)
+    : WebGLBindableName<BufferBinding>(buf)
     , WebGLContextBoundObject(context)
     , mByteLength(0)
 {
-    mContext->MakeContextCurrent();
-    mContext->gl->fGenBuffers(1, &mGLName);
     mContext->mBuffers.insertBack(this);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLBuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLBuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLBuffer.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLBuffer.h	2014-11-26 21:45:57.000000000 +0000
@@ -27,7 +27,7 @@
     , public WebGLContextBoundObject
 {
 public:
-    explicit WebGLBuffer(WebGLContext* aContext);
+    explicit WebGLBuffer(WebGLContext* context, GLuint buf);
 
     void Delete();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextAsyncQueries.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextAsyncQueries.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextAsyncQueries.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextAsyncQueries.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,351 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "WebGLContext.h"
-#include "WebGLQuery.h"
-#include "GLContext.h"
-
-using namespace mozilla;
-
-/*
- * We fake ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE with
- * SAMPLES_PASSED on desktop.
- *
- * OpenGL ES 3.0 spec 4.1.6
- *  If the target of the query is ANY_SAMPLES_PASSED_CONSERVATIVE, an implementation
- *  may choose to use a less precise version of the test which can additionally set
- *  the samples-boolean state to TRUE in some other implementation-dependent cases.
- */
-
-static const char*
-GetQueryTargetEnumString(GLenum target)
-{
-    switch (target)
-    {
-        case LOCAL_GL_ANY_SAMPLES_PASSED:
-            return "ANY_SAMPLES_PASSED";
-        case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
-            return "ANY_SAMPLES_PASSED_CONSERVATIVE";
-        case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
-            return "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN";
-        default:
-            break;
-    }
-
-    MOZ_ASSERT(false, "Unknown query `target`.");
-    return "UNKNOWN_QUERY_TARGET";
-}
-
-static inline GLenum
-SimulateOcclusionQueryTarget(const gl::GLContext* gl, GLenum target)
-{
-    MOZ_ASSERT(target == LOCAL_GL_ANY_SAMPLES_PASSED ||
-               target == LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
-               "unknown occlusion query target");
-
-    if (gl->IsSupported(gl::GLFeature::occlusion_query_boolean)) {
-        return target;
-    } else if (gl->IsSupported(gl::GLFeature::occlusion_query2)) {
-        return LOCAL_GL_ANY_SAMPLES_PASSED;
-    }
-
-    return LOCAL_GL_SAMPLES_PASSED;
-}
-
-already_AddRefed<WebGLQuery>
-WebGLContext::CreateQuery()
-{
-    if (IsContextLost())
-        return nullptr;
-
-    if (mActiveOcclusionQuery && !gl->IsGLES()) {
-        /* http://www.opengl.org/registry/specs/ARB/occlusion_query.txt
-         * Calling either GenQueriesARB or DeleteQueriesARB while any query of
-         * any target is active causes an INVALID_OPERATION error to be
-         * generated.
-         */
-        GenerateWarning("createQuery: the WebGL 2 prototype might generate INVALID_OPERATION"
-                        "when creating a query object while one other is active.");
-        /*
-         * We *need* to lock webgl2 to GL>=3.0 on desktop, but we don't have a good
-         * mechanism to do this yet. See bug 898404.
-         */
-    }
-
-    nsRefPtr<WebGLQuery> globj = new WebGLQuery(this);
-
-    return globj.forget();
-}
-
-void
-WebGLContext::DeleteQuery(WebGLQuery *query)
-{
-    if (IsContextLost())
-        return;
-
-    if (!query)
-        return;
-
-    if (query->IsDeleted())
-        return;
-
-    if (query->IsActive()) {
-        EndQuery(query->mType);
-    }
-
-    if (mActiveOcclusionQuery && !gl->IsGLES()) {
-        /* http://www.opengl.org/registry/specs/ARB/occlusion_query.txt
-         * Calling either GenQueriesARB or DeleteQueriesARB while any query of
-         * any target is active causes an INVALID_OPERATION error to be
-         * generated.
-         */
-        GenerateWarning("deleteQuery: the WebGL 2 prototype might generate INVALID_OPERATION"
-                        "when deleting a query object while one other is active.");
-    }
-
-    query->RequestDelete();
-}
-
-void
-WebGLContext::BeginQuery(GLenum target, WebGLQuery *query)
-{
-    if (IsContextLost())
-        return;
-
-    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target, "beginQuery");
-    if (!targetSlot) {
-        return;
-    }
-
-    if (!query) {
-        /* SPECS BeginQuery.1
-         * http://www.khronos.org/registry/gles/extensions/EXT/EXT_occlusion_query_boolean.txt
-         * BeginQueryEXT sets the active query object name for the query type given
-         * by <target> to <id>. If BeginQueryEXT is called with an <id> of zero, if
-         * the active query object name for <target> is non-zero (for the targets
-         * ANY_SAMPLES_PASSED_EXT and ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, if the
-         * active query for either target is non-zero), if <id> is the name of an
-         * existing query object whose type does not match <target>, or if <id> is the
-         * active query object name for any query type, the error INVALID_OPERATION is
-         * generated.
-         */
-        ErrorInvalidOperation("beginQuery: query should not be null");
-        return;
-    }
-
-    if (query->IsDeleted()) {
-        /* http://www.khronos.org/registry/gles/extensions/EXT/EXT_occlusion_query_boolean.txt
-         * BeginQueryEXT fails and an INVALID_OPERATION error is generated if <id>
-         * is not a name returned from a previous call to GenQueriesEXT, or if such
-         * a name has since been deleted with DeleteQueriesEXT.
-         */
-        ErrorInvalidOperation("beginQuery: query has been deleted");
-        return;
-    }
-
-    if (query->HasEverBeenActive() &&
-        query->mType != target)
-    {
-        /*
-         * See SPECS BeginQuery.1
-         */
-        ErrorInvalidOperation("beginQuery: target doesn't match with the query type");
-        return;
-    }
-
-    if (*targetSlot) {
-        /*
-         * See SPECS BeginQuery.1
-         */
-        ErrorInvalidOperation("beginQuery: an other query already active");
-        return;
-    }
-
-    if (!query->HasEverBeenActive()) {
-        query->mType = target;
-    }
-
-    MakeContextCurrent();
-
-    if (target == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) {
-        gl->fBeginQuery(LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, query->mGLName);
-    } else {
-        gl->fBeginQuery(SimulateOcclusionQueryTarget(gl, target), query->mGLName);
-    }
-
-    *targetSlot = query;
-}
-
-void
-WebGLContext::EndQuery(GLenum target)
-{
-    if (IsContextLost())
-        return;
-
-    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target, "endQuery");
-    if (!targetSlot) {
-        return;
-    }
-
-    if (!*targetSlot ||
-        target != (*targetSlot)->mType)
-    {
-        /* http://www.khronos.org/registry/gles/extensions/EXT/EXT_occlusion_query_boolean.txt
-         * marks the end of the sequence of commands to be tracked for the query type
-         * given by <target>. The active query object for <target> is updated to
-         * indicate that query results are not available, and the active query object
-         * name for <target> is reset to zero. When the commands issued prior to
-         * EndQueryEXT have completed and a final query result is available, the
-         * query object active when EndQueryEXT is called is updated by the GL. The
-         * query object is updated to indicate that the query results are available
-         * and to contain the query result. If the active query object name for
-         * <target> is zero when EndQueryEXT is called, the error INVALID_OPERATION
-         * is generated.
-         */
-        ErrorInvalidOperation("endQuery: There is no active query of type %s.",
-                              GetQueryTargetEnumString(target));
-        return;
-    }
-
-    MakeContextCurrent();
-
-    if (target == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) {
-        gl->fEndQuery(LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
-    } else {
-        gl->fEndQuery(SimulateOcclusionQueryTarget(gl, target));
-    }
-
-    *targetSlot = nullptr;
-}
-
-bool
-WebGLContext::IsQuery(WebGLQuery *query)
-{
-    if (IsContextLost())
-        return false;
-
-    if (!query)
-        return false;
-
-    return ValidateObjectAllowDeleted("isQuery", query) &&
-           !query->IsDeleted() &&
-           query->HasEverBeenActive();
-}
-
-already_AddRefed<WebGLQuery>
-WebGLContext::GetQuery(GLenum target, GLenum pname)
-{
-    if (IsContextLost())
-        return nullptr;
-
-    WebGLRefPtr<WebGLQuery>* targetSlot = GetQueryTargetSlot(target, "getQuery");
-    if (!targetSlot) {
-        return nullptr;
-    }
-
-    if (pname != LOCAL_GL_CURRENT_QUERY) {
-        /* OpenGL ES 3.0 spec 6.1.7
-         *  pname must be CURRENT_QUERY.
-         */
-        ErrorInvalidEnum("getQuery: pname must be CURRENT_QUERY");
-        return nullptr;
-    }
-
-    nsRefPtr<WebGLQuery> tmp = targetSlot->get();
-    return tmp.forget();
-}
-
-JS::Value
-WebGLContext::GetQueryObject(JSContext* cx, WebGLQuery *query, GLenum pname)
-{
-    if (IsContextLost())
-        return JS::NullValue();
-
-    if (!query) {
-        /* OpenGL ES 3.0 spec 6.1.7 (spec getQueryObject 1)
-         *  If id is not the name of a query object, or if the query object named by id is
-         *  currently active, then an INVALID_OPERATION error is generated. pname must be
-         *  QUERY_RESULT or QUERY_RESULT_AVAILABLE.
-         */
-        ErrorInvalidOperation("getQueryObject: query should not be null");
-        return JS::NullValue();
-    }
-
-    if (query->IsDeleted()) {
-        // See (spec getQueryObject 1)
-        ErrorInvalidOperation("getQueryObject: query has been deleted");
-        return JS::NullValue();
-    }
-
-    if (query->IsActive()) {
-        // See (spec getQueryObject 1)
-        ErrorInvalidOperation("getQueryObject: query is active");
-        return JS::NullValue();
-    }
-
-    if (!query->HasEverBeenActive()) {
-        /* See (spec getQueryObject 1)
-         *  If this instance of WebGLQuery has never been active before, that mean that
-         *  query->mGLName is not a query object yet.
-         */
-        ErrorInvalidOperation("getQueryObject: query has never been active");
-        return JS::NullValue();
-    }
-
-    switch (pname)
-    {
-        case LOCAL_GL_QUERY_RESULT_AVAILABLE:
-        {
-            GLuint returned = 0;
-
-            MakeContextCurrent();
-            gl->fGetQueryObjectuiv(query->mGLName, LOCAL_GL_QUERY_RESULT_AVAILABLE, &returned);
-
-            return JS::BooleanValue(returned != 0);
-        }
-
-        case LOCAL_GL_QUERY_RESULT:
-        {
-            GLuint returned = 0;
-
-            MakeContextCurrent();
-            gl->fGetQueryObjectuiv(query->mGLName, LOCAL_GL_QUERY_RESULT, &returned);
-
-            if (query->mType == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) {
-                return JS::NumberValue(uint32_t(returned));
-            }
-
-            /*
-             * test (returned != 0) is important because ARB_occlusion_query on desktop drivers
-             * return the number of samples drawed when the OpenGL ES extension
-             * ARB_occlusion_query_boolean return only a boolean if a sample has been drawed.
-             */
-            return JS::BooleanValue(returned != 0);
-        }
-
-        default:
-            break;
-    }
-
-    ErrorInvalidEnum("getQueryObject: pname must be QUERY_RESULT{_AVAILABLE}");
-    return JS::NullValue();
-}
-
-WebGLRefPtr<WebGLQuery>*
-WebGLContext::GetQueryTargetSlot(GLenum target, const char* infos)
-{
-    switch (target) {
-        case LOCAL_GL_ANY_SAMPLES_PASSED:
-        case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
-            return &mActiveOcclusionQuery;
-        case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
-            return &mActiveTransformFeedbackQuery;
-    }
-
-    ErrorInvalidEnum("%s: unknown query target", infos);
-    return nullptr;
-}
-
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextBuffers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextBuffers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextBuffers.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextBuffers.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -361,7 +361,11 @@
     if (IsContextLost())
         return nullptr;
 
-    nsRefPtr<WebGLBuffer> globj = new WebGLBuffer(this);
+    GLuint buf = 0;
+    MakeContextCurrent();
+    gl->fGenBuffers(1, &buf);
+
+    nsRefPtr<WebGLBuffer> globj = new WebGLBuffer(this, buf);
     return globj.forget();
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContext.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContext.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -7,15 +7,16 @@
 
 #include "WebGLContextLossHandler.h"
 #include "WebGL1Context.h"
-#include "WebGLObjectModel.h"
-#include "WebGLExtensions.h"
-#include "WebGLContextUtils.h"
 #include "WebGLBuffer.h"
-#include "WebGLVertexAttribData.h"
-#include "WebGLMemoryTracker.h"
+#include "WebGLContextUtils.h"
+#include "WebGLExtensions.h"
 #include "WebGLFramebuffer.h"
-#include "WebGLVertexArray.h"
+#include "WebGLMemoryTracker.h"
+#include "WebGLObjectModel.h"
 #include "WebGLQuery.h"
+#include "WebGLSampler.h"
+#include "WebGLVertexArray.h"
+#include "WebGLVertexAttribData.h"
 
 #include "GLBlitHelper.h"
 #include "AccessCheck.h"
@@ -226,7 +227,7 @@
 }
 
 WebGLContext::WebGLContext()
-    : gl(nullptr)
+    : WebGLContextUnchecked(nullptr)
     , mNeedsFakeNoAlpha(false)
 {
     mGeneration = 0;
@@ -371,6 +372,8 @@
         mPrograms.getLast()->DeleteOnce();
     while (!mQueries.isEmpty())
         mQueries.getLast()->DeleteOnce();
+    while (!mSamplers.isEmpty())
+        mSamplers.getLast()->DeleteOnce();
 
     mBlackOpaqueTexture2D = nullptr;
     mBlackOpaqueTextureCubeMap = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextExtensions.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextExtensions.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextExtensions.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextExtensions.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -186,6 +186,19 @@
     return name.Equals(other, nsCaseInsensitiveCStringComparator());
 }
 
+WebGLExtensionBase*
+WebGLContext::EnableSupportedExtension(JSContext* js, WebGLExtensionID ext)
+{
+    if (!IsExtensionEnabled(ext)) {
+        if (!IsExtensionSupported(js, ext))
+            return nullptr;
+
+        EnableExtension(ext);
+    }
+
+    return mExtensions[ext];
+}
+
 void
 WebGLContext::GetExtension(JSContext *cx, const nsAString& aName,
                            JS::MutableHandle<JSObject*> aRetval,
@@ -201,8 +214,7 @@
     WebGLExtensionID ext = WebGLExtensionID::Unknown;
 
     // step 1: figure what extension is wanted
-    for (size_t i = 0; i < size_t(WebGLExtensionID::Max); i++)
-    {
+    for (size_t i = 0; i < size_t(WebGLExtensionID::Max); i++) {
         WebGLExtensionID extension = WebGLExtensionID(i);
 
         if (CompareWebGLExtensionName(name, GetExtensionString(extension))) {
@@ -211,8 +223,7 @@
         }
     }
 
-    if (ext == WebGLExtensionID::Unknown)
-    {
+    if (ext == WebGLExtensionID::Unknown) {
         /**
          * We keep backward compatibility for these deprecated vendor-prefixed
          * alias. Do not add new ones anymore. Hide it behind the
@@ -254,11 +265,27 @@
     }
 
     // step 3: if the extension hadn't been previously been created, create it now, thus enabling it
-    if (!IsExtensionEnabled(ext)) {
-        EnableExtension(ext);
+    WebGLExtensionBase* extObj = EnableSupportedExtension(cx, ext);
+    if (!extObj) {
+        aRetval.set(nullptr);
+        return;
+    }
+
+    // Step 4: Enable any implied extensions.
+    switch (ext) {
+    case WebGLExtensionID::OES_texture_float:
+        EnableSupportedExtension(cx, WebGLExtensionID::WEBGL_color_buffer_float);
+        break;
+
+    case WebGLExtensionID::OES_texture_half_float:
+        EnableSupportedExtension(cx, WebGLExtensionID::EXT_color_buffer_half_float);
+        break;
+
+    default:
+        break;
     }
 
-    aRetval.set(WebGLObjectAsJSObject(cx, mExtensions[ext].get(), rv));
+    aRetval.set(WebGLObjectAsJSObject(cx, extObj, rv));
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextGL.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextGL.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -1372,7 +1372,12 @@
 {
     if (IsContextLost())
         return nullptr;
-    nsRefPtr<WebGLTexture> globj = new WebGLTexture(this);
+
+    GLuint tex = 0;
+    MakeContextCurrent();
+    gl->fGenTextures(1, &tex);
+
+    nsRefPtr<WebGLTexture> globj = new WebGLTexture(this, tex);
     return globj.forget();
 }
 
@@ -1439,24 +1444,31 @@
 
     MakeContextCurrent();
 
+    GLint i = 0;
+
+    if (IsWebGL2()) {
+        switch (pname) {
+        case LOCAL_GL_ACTIVE_UNIFORM_BLOCKS:
+        case LOCAL_GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH:
+            gl->fGetProgramiv(progname, pname, &i);
+            return JS::Int32Value(i);
+        }
+    }
+
     switch (pname) {
         case LOCAL_GL_ATTACHED_SHADERS:
         case LOCAL_GL_ACTIVE_UNIFORMS:
         case LOCAL_GL_ACTIVE_ATTRIBUTES:
-        {
-            GLint i = 0;
             gl->fGetProgramiv(progname, pname, &i);
             return JS::Int32Value(i);
-        }
+
         case LOCAL_GL_DELETE_STATUS:
             return JS::BooleanValue(prog->IsDeleteRequested());
+
         case LOCAL_GL_LINK_STATUS:
-        {
             return JS::BooleanValue(prog->LinkStatus());
-        }
+
         case LOCAL_GL_VALIDATE_STATUS:
-        {
-            GLint i = 0;
 #ifdef XP_MACOSX
             // See comment in ValidateProgram below.
             if (gl->WorkAroundDriverBugs())
@@ -1467,8 +1479,6 @@
             gl->fGetProgramiv(progname, pname, &i);
 #endif
             return JS::BooleanValue(bool(i));
-        }
-            break;
 
         default:
             ErrorInvalidEnumInfo("getProgramParameter: parameter", pname);
@@ -3098,7 +3108,12 @@
 {
     if (IsContextLost())
         return nullptr;
-    nsRefPtr<WebGLFramebuffer> globj = new WebGLFramebuffer(this);
+
+    GLuint fbo = 0;
+    MakeContextCurrent();
+    gl->fGenFramebuffers(1, &fbo);
+
+    nsRefPtr<WebGLFramebuffer> globj = new WebGLFramebuffer(this, fbo);
     return globj.forget();
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContext.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContext.h	2014-11-26 21:45:57.000000000 +0000
@@ -15,6 +15,7 @@
 
 #include "GLDefs.h"
 #include "WebGLActiveInfo.h"
+#include "WebGLContextUnchecked.h"
 #include "WebGLObjectModel.h"
 #include "WebGLRenderbuffer.h"
 #include "WebGLTexture.h"
@@ -71,16 +72,17 @@
 class WebGLActiveInfo;
 class WebGLExtensionBase;
 class WebGLBuffer;
-struct WebGLVertexAttribData;
 class WebGLShader;
 class WebGLProgram;
 class WebGLQuery;
 class WebGLUniformLocation;
 class WebGLFramebuffer;
 class WebGLRenderbuffer;
+class WebGLSampler;
 class WebGLShaderPrecisionFormat;
 class WebGLTexture;
 class WebGLVertexArray;
+struct WebGLVertexAttribData;
 
 namespace dom {
 class ImageData;
@@ -94,6 +96,8 @@
 class SourceSurface;
 }
 
+typedef WebGLRefPtr<WebGLQuery> WebGLQueryRefPtr;
+
 WebGLTexelFormat GetWebGLTexelFormat(TexInternalFormat format);
 
 void AssertUintParamCorrect(gl::GLContext* gl, GLenum pname, GLuint shadow);
@@ -127,10 +131,29 @@
 // From WebGLContextUtils
 TexTarget TexImageTargetToTexTarget(TexImageTarget texImageTarget);
 
+class WebGLIntOrFloat {
+    enum {
+        Int,
+        Float
+    } mType;
+    union {
+        GLint i;
+        GLfloat f;
+    } mValue;
+
+public:
+    explicit WebGLIntOrFloat(GLint i) : mType(Int) { mValue.i = i; }
+    explicit WebGLIntOrFloat(GLfloat f) : mType(Float) { mValue.f = f; }
+
+    GLint AsInt() const { return (mType == Int) ? mValue.i : NS_lroundf(mValue.f); }
+    GLfloat AsFloat() const { return (mType == Float) ? mValue.f : GLfloat(mValue.i); }
+};
+
 class WebGLContext :
     public nsIDOMWebGLRenderingContext,
     public nsICanvasRenderingContextInternal,
     public nsSupportsWeakReference,
+    public WebGLContextUnchecked,
     public WebGLRectangleObject,
     public nsWrapperCache,
     public SupportsWeakPtr<WebGLContext>
@@ -220,7 +243,11 @@
      * This version is like gl::GLenumToStr but with out the GL_ prefix to
      * keep consistency with how errors are reported from WebGL.
      */
-    static const char *EnumName(GLenum glenum);
+
+    // Returns nullptr if glenum is unknown.
+    static const char* EnumName(GLenum glenum);
+    // Returns hex formatted version of glenum if glenum is unknown.
+    static void EnumName(GLenum glenum, nsACString* out_name);
 
     bool IsCompressedTextureFormat(GLenum format);
     bool IsTextureFormatCompressed(TexInternalFormat format);
@@ -324,7 +351,7 @@
     void ClearDepth(GLclampf v);
     void ClearStencil(GLint v);
     void ColorMask(WebGLboolean r, WebGLboolean g, WebGLboolean b, WebGLboolean a);
-    void CompileShader(WebGLShader *shader);
+    void CompileShader(WebGLShader* shader);
     void CompressedTexImage2D(GLenum target, GLint level,
                               GLenum internalformat, GLsizei width,
                               GLsizei height, GLint border,
@@ -797,30 +824,6 @@
     void RestoreContext();
 
 // -----------------------------------------------------------------------------
-// Asynchronous Queries (WebGLContextAsyncQueries.cpp)
-public:
-    already_AddRefed<WebGLQuery> CreateQuery();
-    void DeleteQuery(WebGLQuery *query);
-    void BeginQuery(GLenum target, WebGLQuery *query);
-    void EndQuery(GLenum target);
-    bool IsQuery(WebGLQuery *query);
-    already_AddRefed<WebGLQuery> GetQuery(GLenum target, GLenum pname);
-    JS::Value GetQueryObject(JSContext* cx, WebGLQuery *query, GLenum pname);
-    void GetQueryObject(JSContext* cx, WebGLQuery *query, GLenum pname,
-                        JS::MutableHandle<JS::Value> retval) {
-        retval.set(GetQueryObject(cx, query, pname));
-    }
-
-private:
-    // ANY_SAMPLES_PASSED(_CONSERVATIVE) slot
-    WebGLRefPtr<WebGLQuery> mActiveOcclusionQuery;
-
-    // LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN slot
-    WebGLRefPtr<WebGLQuery> mActiveTransformFeedbackQuery;
-
-    WebGLRefPtr<WebGLQuery>* GetQueryTargetSlot(GLenum target, const char* infos);
-
-// -----------------------------------------------------------------------------
 // Buffer Objects (WebGLContextBuffers.cpp)
 public:
     void BindBuffer(GLenum target, WebGLBuffer* buf);
@@ -854,6 +857,14 @@
     bool ValidateBufferUsageEnum(GLenum target, const char* infos);
 
 // -----------------------------------------------------------------------------
+// Queries (WebGL2ContextQueries.cpp)
+protected:
+    WebGLQueryRefPtr* GetQueryTargetSlot(GLenum target);
+
+    WebGLQueryRefPtr mActiveOcclusionQuery;
+    WebGLQueryRefPtr mActiveTransformFeedbackQuery;
+
+// -----------------------------------------------------------------------------
 // State and State Requests (WebGLContextState.cpp)
 public:
     void Disable(GLenum cap);
@@ -1005,8 +1016,6 @@
         return ((x + y - 1) / y) * y;
     }
 
-    nsRefPtr<gl::GLContext> gl;
-
     CheckedUint32 mGeneration;
 
     WebGLContextOptions mOptions;
@@ -1060,6 +1069,9 @@
         return mGLMaxVertexAttribs;
     }
 
+
+    bool IsFormatValidForFB(GLenum sizedFormat) const;
+
 protected:
     // Represents current status of the context with respect to context loss.
     // That is, whether the context is lost, and what part of the context loss
@@ -1092,6 +1104,10 @@
     // enable an extension. the extension should not be enabled before.
     void EnableExtension(WebGLExtensionID ext);
 
+    // Enable an extension if it's supported. Return the extension on success.
+    WebGLExtensionBase* EnableSupportedExtension(JSContext* js,
+                                                 WebGLExtensionID ext);
+
     // returns true if the extension has been enabled by calling getExtension.
     bool IsExtensionEnabled(WebGLExtensionID ext) const;
 
@@ -1138,6 +1154,10 @@
     bool ValidateCopyTexImage(GLenum internalformat,
                               WebGLTexImageFunc func,
                               WebGLTexDimensions dims);
+
+    bool ValidateSamplerParameterName(GLenum pname, const char* info);
+    bool ValidateSamplerParameterParams(GLenum pname, const WebGLIntOrFloat& param, const char* info);
+
     bool ValidateTexImage(TexImageTarget texImageTarget,
                           GLint level, GLenum internalFormat,
                           GLint xoffset, GLint yoffset, GLint zoffset,
@@ -1325,6 +1345,9 @@
     LinkedList<WebGLFramebuffer> mFramebuffers;
     LinkedList<WebGLVertexArray> mVertexArrays;
 
+    // TODO(djg): Does this need a rethink? Should it be WebGL2Context?
+    LinkedList<WebGLSampler> mSamplers;
+
     WebGLRefPtr<WebGLVertexArray> mDefaultVertexArray;
 
     // PixelStore parameters
@@ -1440,6 +1463,7 @@
     friend class WebGLProgram;
     friend class WebGLQuery;
     friend class WebGLBuffer;
+    friend class WebGLSampler;
     friend class WebGLShader;
     friend class WebGLUniformLocation;
     friend class WebGLVertexArray;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextUnchecked.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextUnchecked.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextUnchecked.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextUnchecked.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=4 et sw=4 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 "WebGLContextUnchecked.h"
+
+#include "GLContext.h"
+#include "WebGLSampler.h"
+
+namespace mozilla {
+
+WebGLContextUnchecked::WebGLContextUnchecked(gl::GLContext* gl)
+    : gl(gl)
+{ }
+
+
+// -----------------------------------------------------------------------------
+// Sampler Objects
+
+void
+WebGLContextUnchecked::BindSampler(GLuint unit, WebGLSampler* sampler)
+{
+    gl->MakeCurrent();
+    gl->fBindSampler(unit, sampler ? sampler->GLName() : 0);
+    if (sampler)
+        sampler->BindTo(LOCAL_GL_SAMPLER_BINDING);
+}
+
+GLint
+WebGLContextUnchecked::GetSamplerParameteriv(WebGLSampler* sampler,
+                                             GLenum pname)
+{
+    MOZ_ASSERT(sampler, "Did you validate?");
+
+    GLint param = 0;
+    gl->MakeCurrent();
+    gl->fGetSamplerParameteriv(sampler->GLName(), pname, &param);
+
+    return param;
+}
+
+GLfloat
+WebGLContextUnchecked::GetSamplerParameterfv(WebGLSampler* sampler,
+                                             GLenum pname)
+{
+    MOZ_ASSERT(sampler, "Did you validate?");
+
+    GLfloat param = 0.0f;
+    gl->MakeCurrent();
+    gl->fGetSamplerParameterfv(sampler->GLName(), pname, &param);
+    return param;
+}
+
+void
+WebGLContextUnchecked::SamplerParameteri(WebGLSampler* sampler,
+                                         GLenum pname,
+                                         GLint param)
+{
+    MOZ_ASSERT(sampler, "Did you validate?");
+    gl->MakeCurrent();
+    gl->fSamplerParameteri(sampler->GLName(), pname, param);
+}
+
+void
+WebGLContextUnchecked::SamplerParameteriv(WebGLSampler* sampler,
+                                          GLenum pname,
+                                          const GLint* param)
+{
+    MOZ_ASSERT(sampler, "Did you validate?");
+    gl->MakeCurrent();
+    gl->fSamplerParameteriv(sampler->GLName(), pname, param);
+}
+
+void
+WebGLContextUnchecked::SamplerParameterf(WebGLSampler* sampler,
+                                         GLenum pname,
+                                         GLfloat param)
+{
+    MOZ_ASSERT(sampler, "Did you validate?");
+    gl->MakeCurrent();
+    gl->fSamplerParameterf(sampler->GLName(), pname, param);
+}
+
+void
+WebGLContextUnchecked::SamplerParameterfv(WebGLSampler* sampler,
+                                          GLenum pname,
+                                          const GLfloat* param)
+{
+    MOZ_ASSERT(sampler, "Did you validate?");
+    gl->MakeCurrent();
+    gl->fSamplerParameterfv(sampler->GLName(), pname, param);
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextUnchecked.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextUnchecked.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextUnchecked.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextUnchecked.h	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=4 et sw=4 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 WEBGLCONTEXTUNCHECKED_H
+#define WEBGLCONTEXTUNCHECKED_H
+
+#include "GLDefs.h"
+#include "WebGLTypes.h"
+#include "nsAutoPtr.h"
+#include "nsTArray.h"
+
+namespace mozilla {
+
+class WebGLSampler;
+namespace gl {
+    class GLContext;
+}
+
+class WebGLContextUnchecked
+{
+public:
+    explicit WebGLContextUnchecked(gl::GLContext* gl);
+
+    // -------------------------------------------------------------------------
+    // Sampler Objects
+    void BindSampler(GLuint unit, WebGLSampler* sampler);
+
+    GLint   GetSamplerParameteriv(WebGLSampler* sampler, GLenum pname);
+    GLfloat GetSamplerParameterfv(WebGLSampler* sampler, GLenum pname);
+
+    void SamplerParameteri(WebGLSampler* sampler, GLenum pname, GLint param);
+    void SamplerParameteriv(WebGLSampler* sampler, GLenum pname, const GLint* param);
+    void SamplerParameterf(WebGLSampler* sampler, GLenum pname, GLfloat param);
+    void SamplerParameterfv(WebGLSampler* sampler, GLenum pname, const GLfloat* param);
+
+protected: // data
+    nsRefPtr<gl::GLContext> gl;
+};
+
+} // namespace mozilla
+
+#endif // !WEBGLCONTEXTUNCHECKED_H
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextUtils.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextUtils.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIDOMEvent.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIVariant.h"
+#include "nsPrintfCString.h"
 #include "nsServiceManagerUtils.h"
 #include "prprf.h"
 #include "WebGLBuffer.h"
@@ -505,7 +506,10 @@
 void
 WebGLContext::ErrorInvalidEnumInfo(const char *info, GLenum enumvalue)
 {
-    return ErrorInvalidEnum("%s: invalid enum value 0x%x", info, enumvalue);
+    nsCString name;
+    EnumName(enumvalue, &name);
+
+    return ErrorInvalidEnum("%s: invalid enum value %s", info, name.get());
 }
 
 void
@@ -574,6 +578,7 @@
     }
 }
 
+// This version is 'fallible' and will return NULL if glenum is not recognized.
 const char*
 WebGLContext::EnumName(GLenum glenum)
 {
@@ -625,10 +630,289 @@
         XX(UNSIGNED_SHORT_4_4_4_4);
         XX(UNSIGNED_SHORT_5_5_5_1);
         XX(UNSIGNED_SHORT_5_6_5);
+        XX(READ_BUFFER);
+        XX(UNPACK_ROW_LENGTH);
+        XX(UNPACK_SKIP_ROWS);
+        XX(UNPACK_SKIP_PIXELS);
+        XX(PACK_ROW_LENGTH);
+        XX(PACK_SKIP_ROWS);
+        XX(PACK_SKIP_PIXELS);
+        XX(COLOR);
+        XX(DEPTH);
+        XX(STENCIL);
+        XX(RED);
+        XX(RGB8);
+        XX(RGBA8);
+        XX(RGB10_A2);
+        XX(TEXTURE_BINDING_3D);
+        XX(UNPACK_SKIP_IMAGES);
+        XX(UNPACK_IMAGE_HEIGHT);
+        XX(TEXTURE_WRAP_R);
+        XX(MAX_3D_TEXTURE_SIZE);
+        XX(UNSIGNED_INT_2_10_10_10_REV);
+        XX(MAX_ELEMENTS_VERTICES);
+        XX(MAX_ELEMENTS_INDICES);
+        XX(TEXTURE_MIN_LOD);
+        XX(TEXTURE_MAX_LOD);
+        XX(TEXTURE_BASE_LEVEL);
+        XX(TEXTURE_MAX_LEVEL);
+        XX(MIN);
+        XX(MAX);
+        XX(DEPTH_COMPONENT24);
+        XX(MAX_TEXTURE_LOD_BIAS);
+        XX(TEXTURE_COMPARE_MODE);
+        XX(TEXTURE_COMPARE_FUNC);
+        XX(CURRENT_QUERY);
+        XX(QUERY_RESULT);
+        XX(QUERY_RESULT_AVAILABLE);
+        XX(STREAM_READ);
+        XX(STREAM_COPY);
+        XX(STATIC_READ);
+        XX(STATIC_COPY);
+        XX(DYNAMIC_READ);
+        XX(DYNAMIC_COPY);
+        XX(MAX_DRAW_BUFFERS);
+        XX(DRAW_BUFFER0);
+        XX(DRAW_BUFFER1);
+        XX(DRAW_BUFFER2);
+        XX(DRAW_BUFFER3);
+        XX(DRAW_BUFFER4);
+        XX(DRAW_BUFFER5);
+        XX(DRAW_BUFFER6);
+        XX(DRAW_BUFFER7);
+        XX(DRAW_BUFFER8);
+        XX(DRAW_BUFFER9);
+        XX(DRAW_BUFFER10);
+        XX(DRAW_BUFFER11);
+        XX(DRAW_BUFFER12);
+        XX(DRAW_BUFFER13);
+        XX(DRAW_BUFFER14);
+        XX(DRAW_BUFFER15);
+        XX(MAX_FRAGMENT_UNIFORM_COMPONENTS);
+        XX(MAX_VERTEX_UNIFORM_COMPONENTS);
+        XX(SAMPLER_3D);
+        XX(SAMPLER_2D_SHADOW);
+        XX(FRAGMENT_SHADER_DERIVATIVE_HINT);
+        XX(PIXEL_PACK_BUFFER);
+        XX(PIXEL_UNPACK_BUFFER);
+        XX(PIXEL_PACK_BUFFER_BINDING);
+        XX(PIXEL_UNPACK_BUFFER_BINDING);
+        XX(FLOAT_MAT2x3);
+        XX(FLOAT_MAT2x4);
+        XX(FLOAT_MAT3x2);
+        XX(FLOAT_MAT3x4);
+        XX(FLOAT_MAT4x2);
+        XX(FLOAT_MAT4x3);
+        XX(SRGB8);
+        XX(SRGB8_ALPHA8);
+        XX(COMPARE_REF_TO_TEXTURE);
+        XX(VERTEX_ATTRIB_ARRAY_INTEGER);
+        XX(MAX_ARRAY_TEXTURE_LAYERS);
+        XX(MIN_PROGRAM_TEXEL_OFFSET);
+        XX(MAX_PROGRAM_TEXEL_OFFSET);
+        XX(MAX_VARYING_COMPONENTS);
+        XX(TEXTURE_2D_ARRAY);
+        XX(TEXTURE_BINDING_2D_ARRAY);
+        XX(R11F_G11F_B10F);
+        XX(UNSIGNED_INT_10F_11F_11F_REV);
+        XX(RGB9_E5);
+        XX(UNSIGNED_INT_5_9_9_9_REV);
+        XX(TRANSFORM_FEEDBACK_BUFFER_MODE);
+        XX(MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS);
+        XX(TRANSFORM_FEEDBACK_VARYINGS);
+        XX(TRANSFORM_FEEDBACK_BUFFER_START);
+        XX(TRANSFORM_FEEDBACK_BUFFER_SIZE);
+        XX(TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN);
+        XX(RASTERIZER_DISCARD);
+        XX(MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS);
+        XX(MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS);
+        XX(INTERLEAVED_ATTRIBS);
+        XX(SEPARATE_ATTRIBS);
+        XX(TRANSFORM_FEEDBACK_BUFFER);
+        XX(TRANSFORM_FEEDBACK_BUFFER_BINDING);
+        XX(RGBA32UI);
+        XX(RGB32UI);
+        XX(RGBA16UI);
+        XX(RGB16UI);
+        XX(RGBA8UI);
+        XX(RGB8UI);
+        XX(RGBA32I);
+        XX(RGB32I);
+        XX(RGBA16I);
+        XX(RGB16I);
+        XX(RGBA8I);
+        XX(RGB8I);
+        XX(RED_INTEGER);
+        XX(RGB_INTEGER);
+        XX(RGBA_INTEGER);
+        XX(SAMPLER_2D_ARRAY);
+        XX(SAMPLER_2D_ARRAY_SHADOW);
+        XX(SAMPLER_CUBE_SHADOW);
+        XX(UNSIGNED_INT_VEC2);
+        XX(UNSIGNED_INT_VEC3);
+        XX(UNSIGNED_INT_VEC4);
+        XX(INT_SAMPLER_2D);
+        XX(INT_SAMPLER_3D);
+        XX(INT_SAMPLER_CUBE);
+        XX(INT_SAMPLER_2D_ARRAY);
+        XX(UNSIGNED_INT_SAMPLER_2D);
+        XX(UNSIGNED_INT_SAMPLER_3D);
+        XX(UNSIGNED_INT_SAMPLER_CUBE);
+        XX(UNSIGNED_INT_SAMPLER_2D_ARRAY);
+        XX(DEPTH_COMPONENT32F);
+        XX(DEPTH32F_STENCIL8);
+        XX(FLOAT_32_UNSIGNED_INT_24_8_REV);
+        XX(FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING);
+        XX(FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE);
+        XX(FRAMEBUFFER_ATTACHMENT_RED_SIZE);
+        XX(FRAMEBUFFER_ATTACHMENT_GREEN_SIZE);
+        XX(FRAMEBUFFER_ATTACHMENT_BLUE_SIZE);
+        XX(FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE);
+        XX(FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE);
+        XX(FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE);
+        XX(FRAMEBUFFER_DEFAULT);
+        XX(DEPTH_STENCIL_ATTACHMENT);
+        XX(UNSIGNED_NORMALIZED);
+        XX(DRAW_FRAMEBUFFER_BINDING);
+        XX(READ_FRAMEBUFFER);
+        XX(DRAW_FRAMEBUFFER);
+        XX(READ_FRAMEBUFFER_BINDING);
+        XX(RENDERBUFFER_SAMPLES);
+        XX(FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER);
+        XX(MAX_COLOR_ATTACHMENTS);
+        XX(COLOR_ATTACHMENT1);
+        XX(COLOR_ATTACHMENT2);
+        XX(COLOR_ATTACHMENT3);
+        XX(COLOR_ATTACHMENT4);
+        XX(COLOR_ATTACHMENT5);
+        XX(COLOR_ATTACHMENT6);
+        XX(COLOR_ATTACHMENT7);
+        XX(COLOR_ATTACHMENT8);
+        XX(COLOR_ATTACHMENT9);
+        XX(COLOR_ATTACHMENT10);
+        XX(COLOR_ATTACHMENT11);
+        XX(COLOR_ATTACHMENT12);
+        XX(COLOR_ATTACHMENT13);
+        XX(COLOR_ATTACHMENT14);
+        XX(COLOR_ATTACHMENT15);
+        XX(FRAMEBUFFER_INCOMPLETE_MULTISAMPLE);
+        XX(MAX_SAMPLES);
+        XX(RG);
+        XX(RG_INTEGER);
+        XX(R8);
+        XX(RG8);
+        XX(R16F);
+        XX(R32F);
+        XX(RG16F);
+        XX(RG32F);
+        XX(R8I);
+        XX(R8UI);
+        XX(R16I);
+        XX(R16UI);
+        XX(R32I);
+        XX(R32UI);
+        XX(RG8I);
+        XX(RG8UI);
+        XX(RG16I);
+        XX(RG16UI);
+        XX(RG32I);
+        XX(RG32UI);
+        XX(VERTEX_ARRAY_BINDING);
+        XX(R8_SNORM);
+        XX(RG8_SNORM);
+        XX(RGB8_SNORM);
+        XX(RGBA8_SNORM);
+        XX(SIGNED_NORMALIZED);
+        XX(PRIMITIVE_RESTART_FIXED_INDEX);
+        XX(COPY_READ_BUFFER);
+        XX(COPY_WRITE_BUFFER);
+        XX(UNIFORM_BUFFER);
+        XX(UNIFORM_BUFFER_BINDING);
+        XX(UNIFORM_BUFFER_START);
+        XX(UNIFORM_BUFFER_SIZE);
+        XX(MAX_VERTEX_UNIFORM_BLOCKS);
+        XX(MAX_FRAGMENT_UNIFORM_BLOCKS);
+        XX(MAX_COMBINED_UNIFORM_BLOCKS);
+        XX(MAX_UNIFORM_BUFFER_BINDINGS);
+        XX(MAX_UNIFORM_BLOCK_SIZE);
+        XX(MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS);
+        XX(MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS);
+        XX(UNIFORM_BUFFER_OFFSET_ALIGNMENT);
+        XX(ACTIVE_UNIFORM_BLOCKS);
+        XX(UNIFORM_TYPE);
+        XX(UNIFORM_SIZE);
+        XX(UNIFORM_BLOCK_INDEX);
+        XX(UNIFORM_OFFSET);
+        XX(UNIFORM_ARRAY_STRIDE);
+        XX(UNIFORM_MATRIX_STRIDE);
+        XX(UNIFORM_IS_ROW_MAJOR);
+        XX(UNIFORM_BLOCK_BINDING);
+        XX(UNIFORM_BLOCK_DATA_SIZE);
+        XX(UNIFORM_BLOCK_ACTIVE_UNIFORMS);
+        XX(UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES);
+        XX(UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER);
+        XX(UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER);
+        XX(MAX_VERTEX_OUTPUT_COMPONENTS);
+        XX(MAX_FRAGMENT_INPUT_COMPONENTS);
+        XX(MAX_SERVER_WAIT_TIMEOUT);
+        XX(OBJECT_TYPE);
+        XX(SYNC_CONDITION);
+        XX(SYNC_STATUS);
+        XX(SYNC_FLAGS);
+        XX(SYNC_FENCE);
+        XX(SYNC_GPU_COMMANDS_COMPLETE);
+        XX(UNSIGNALED);
+        XX(SIGNALED);
+        XX(ALREADY_SIGNALED);
+        XX(TIMEOUT_EXPIRED);
+        XX(CONDITION_SATISFIED);
+        XX(WAIT_FAILED);
+        XX(VERTEX_ATTRIB_ARRAY_DIVISOR);
+        XX(ANY_SAMPLES_PASSED);
+        XX(ANY_SAMPLES_PASSED_CONSERVATIVE);
+        XX(SAMPLER_BINDING);
+        XX(RGB10_A2UI);
+        XX(TEXTURE_SWIZZLE_R);
+        XX(TEXTURE_SWIZZLE_G);
+        XX(TEXTURE_SWIZZLE_B);
+        XX(TEXTURE_SWIZZLE_A);
+        XX(GREEN);
+        XX(BLUE);
+        XX(INT_2_10_10_10_REV);
+        XX(TRANSFORM_FEEDBACK);
+        XX(TRANSFORM_FEEDBACK_PAUSED);
+        XX(TRANSFORM_FEEDBACK_ACTIVE);
+        XX(TRANSFORM_FEEDBACK_BINDING);
+        XX(COMPRESSED_R11_EAC);
+        XX(COMPRESSED_SIGNED_R11_EAC);
+        XX(COMPRESSED_RG11_EAC);
+        XX(COMPRESSED_SIGNED_RG11_EAC);
+        XX(COMPRESSED_RGB8_ETC2);
+        XX(COMPRESSED_SRGB8_ETC2);
+        XX(COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2);
+        XX(COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2);
+        XX(COMPRESSED_RGBA8_ETC2_EAC);
+        XX(COMPRESSED_SRGB8_ALPHA8_ETC2_EAC);
+        XX(TEXTURE_IMMUTABLE_FORMAT);
+        XX(MAX_ELEMENT_INDEX);
+        XX(NUM_SAMPLE_COUNTS);
+        XX(TEXTURE_IMMUTABLE_LEVELS);
 #undef XX
     }
 
-    return "[Unknown enum name]";
+    return nullptr;
+}
+
+void
+WebGLContext::EnumName(GLenum glenum, nsACString* out_name)
+{
+    const char* name = EnumName(glenum);
+    if (name) {
+        *out_name = nsDependentCString(name);
+    } else {
+        nsPrintfCString enumAsHex("<enum 0x%04x>", glenum);
+        *out_name = enumAsHex;
+    }
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextValidate.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextValidate.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLContextValidate.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLContextValidate.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -379,6 +379,118 @@
 }
 
 /**
+ * Return true if pname is valid for GetSamplerParameter calls.
+ */
+bool
+WebGLContext::ValidateSamplerParameterName(GLenum pname, const char* info)
+{
+    switch (pname) {
+    case LOCAL_GL_TEXTURE_MIN_FILTER:
+    case LOCAL_GL_TEXTURE_MAG_FILTER:
+    case LOCAL_GL_TEXTURE_WRAP_S:
+    case LOCAL_GL_TEXTURE_WRAP_T:
+    case LOCAL_GL_TEXTURE_WRAP_R:
+    case LOCAL_GL_TEXTURE_MIN_LOD:
+    case LOCAL_GL_TEXTURE_MAX_LOD:
+    case LOCAL_GL_TEXTURE_COMPARE_MODE:
+    case LOCAL_GL_TEXTURE_COMPARE_FUNC:
+        return true;
+
+    default:
+        ErrorInvalidEnum("%s: invalid pname: %s", info, EnumName(pname));
+        return false;
+    }
+}
+
+/**
+ * Return true if pname and param are valid combination for SamplerParameter calls.
+ */
+bool
+WebGLContext::ValidateSamplerParameterParams(GLenum pname, const WebGLIntOrFloat& param, const char* info)
+{
+    const GLenum p = param.AsInt();
+
+    switch (pname) {
+    case LOCAL_GL_TEXTURE_MIN_FILTER:
+        switch (p) {
+        case LOCAL_GL_NEAREST:
+        case LOCAL_GL_LINEAR:
+        case LOCAL_GL_NEAREST_MIPMAP_NEAREST:
+        case LOCAL_GL_NEAREST_MIPMAP_LINEAR:
+        case LOCAL_GL_LINEAR_MIPMAP_NEAREST:
+        case LOCAL_GL_LINEAR_MIPMAP_LINEAR:
+            return true;
+
+        default:
+            ErrorInvalidEnum("%s: invalid param: %s", info, EnumName(p));
+            return false;
+        }
+
+    case LOCAL_GL_TEXTURE_MAG_FILTER:
+        switch (p) {
+        case LOCAL_GL_NEAREST:
+        case LOCAL_GL_LINEAR:
+            return true;
+
+        default:
+            ErrorInvalidEnum("%s: invalid param: %s", info, EnumName(p));
+            return false;
+        }
+
+    case LOCAL_GL_TEXTURE_WRAP_S:
+    case LOCAL_GL_TEXTURE_WRAP_T:
+    case LOCAL_GL_TEXTURE_WRAP_R:
+        switch (p) {
+        case LOCAL_GL_CLAMP_TO_EDGE:
+        case LOCAL_GL_REPEAT:
+        case LOCAL_GL_MIRRORED_REPEAT:
+            return true;
+
+        default:
+            ErrorInvalidEnum("%s: invalid param: %s", info, EnumName(p));
+            return false;
+        }
+
+    case LOCAL_GL_TEXTURE_MIN_LOD:
+    case LOCAL_GL_TEXTURE_MAX_LOD:
+        return true;
+
+    case LOCAL_GL_TEXTURE_COMPARE_MODE:
+        switch (param.AsInt()) {
+        case LOCAL_GL_NONE:
+        case LOCAL_GL_COMPARE_REF_TO_TEXTURE:
+            return true;
+
+        default:
+            ErrorInvalidEnum("%s: invalid param: %s", info, EnumName(p));
+            return false;
+        }
+
+    case LOCAL_GL_TEXTURE_COMPARE_FUNC:
+        switch (p) {
+        case LOCAL_GL_LEQUAL:
+        case LOCAL_GL_GEQUAL:
+        case LOCAL_GL_LESS:
+        case LOCAL_GL_GREATER:
+        case LOCAL_GL_EQUAL:
+        case LOCAL_GL_NOTEQUAL:
+        case LOCAL_GL_ALWAYS:
+        case LOCAL_GL_NEVER:
+            return true;
+
+        default:
+            ErrorInvalidEnum("%s: invalid param: %s", info, EnumName(p));
+            return false;
+        }
+
+    default:
+        ErrorInvalidEnum("%s: invalid pname: %s", info, EnumName(pname));
+        return false;
+    }
+}
+
+
+/**
  * Return true if format is a valid texture image format for source,
  * taking into account enabled WebGL extensions.
  */
@@ -1529,7 +1641,7 @@
 
     mMinCapability = Preferences::GetBool("webgl.min_capability_mode", false);
     mDisableExtensions = Preferences::GetBool("webgl.disable-extensions", false);
-    mLoseContextOnMemoryPressure = Preferences::GetBool("webgl.lose-context-on-memory-preasure", false);
+    mLoseContextOnMemoryPressure = Preferences::GetBool("webgl.lose-context-on-memory-pressure", false);
     mCanLoseContextInForeground = Preferences::GetBool("webgl.can-lose-context-in-foreground", true);
     mRestoreWhenVisible = Preferences::GetBool("webgl.restore-context-when-visible", true);
 
@@ -1718,8 +1830,7 @@
 #ifdef XP_MACOSX
     if (gl->WorkAroundDriverBugs() &&
         gl->Vendor() == gl::GLVendor::ATI &&
-        nsCocoaFeatures::OSXVersionMajor() == 10 &&
-        nsCocoaFeatures::OSXVersionMinor() < 9)
+        !nsCocoaFeatures::IsAtLeastVersion(10,9))
     {
         // The Mac ATI driver, in all known OSX version up to and including 10.8,
         // renders points sprites upside-down. Apple bug 11778921
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLExtensionColorBufferFloat.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLExtensionColorBufferFloat.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLExtensionColorBufferFloat.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLExtensionColorBufferFloat.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -23,8 +23,13 @@
 bool
 WebGLExtensionColorBufferFloat::IsSupported(const WebGLContext* context)
 {
-    return context->GL()->IsSupported(gl::GLFeature::renderbuffer_color_float) &&
-           context->GL()->IsSupported(gl::GLFeature::frag_color_float);
+    gl::GLContext* gl = context->GL();
+
+    // ANGLE supports this, but doesn't have a way to advertize its support,
+    // since it's compliant with WEBGL_color_buffer_float's clamping, but not
+    // EXT_color_buffer_float.
+    return gl->IsSupported(gl::GLFeature::renderbuffer_color_float) ||
+           gl->IsANGLE();
 }
 
 IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionColorBufferFloat)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -23,8 +23,10 @@
 bool
 WebGLExtensionColorBufferHalfFloat::IsSupported(const WebGLContext* context)
 {
-    return context->GL()->IsSupported(gl::GLFeature::renderbuffer_color_half_float) &&
-           context->GL()->IsSupported(gl::GLFeature::frag_color_float);
+    gl::GLContext* gl = context->GL();
+
+    // ANGLE doesn't support ReadPixels from a RGBA16F with RGBA/FLOAT.
+    return gl->IsSupported(gl::GLFeature::renderbuffer_color_half_float);
 }
 
 IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionColorBufferHalfFloat)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLFramebuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLFramebuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLFramebuffer.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLFramebuffer.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -26,16 +26,14 @@
     return dom::WebGLFramebufferBinding::Wrap(cx, this);
 }
 
-WebGLFramebuffer::WebGLFramebuffer(WebGLContext* context)
-    : WebGLBindableName<FBTarget>()
+WebGLFramebuffer::WebGLFramebuffer(WebGLContext* context, GLuint fbo)
+    : WebGLBindableName<FBTarget>(fbo)
     , WebGLContextBoundObject(context)
     , mStatus(0)
     , mDepthAttachment(LOCAL_GL_DEPTH_ATTACHMENT)
     , mStencilAttachment(LOCAL_GL_STENCIL_ATTACHMENT)
     , mDepthStencilAttachment(LOCAL_GL_DEPTH_STENCIL_ATTACHMENT)
 {
-    mContext->MakeContextCurrent();
-    mContext->gl->fGenFramebuffers(1, &mGLName);
     mContext->mFramebuffers.insertBack(this);
 
     mColorAttachments.SetLength(1);
@@ -286,6 +284,36 @@
 }
 
 bool
+WebGLContext::IsFormatValidForFB(GLenum sizedFormat) const
+{
+    switch (sizedFormat) {
+    case LOCAL_GL_ALPHA8:
+    case LOCAL_GL_LUMINANCE8:
+    case LOCAL_GL_LUMINANCE8_ALPHA8:
+    case LOCAL_GL_RGB8:
+    case LOCAL_GL_RGBA8:
+    case LOCAL_GL_RGB565:
+    case LOCAL_GL_RGB5_A1:
+    case LOCAL_GL_RGBA4:
+        return true;
+
+    case LOCAL_GL_SRGB8:
+    case LOCAL_GL_SRGB8_ALPHA8_EXT:
+        return IsExtensionEnabled(WebGLExtensionID::EXT_sRGB);
+
+    case LOCAL_GL_RGB32F:
+    case LOCAL_GL_RGBA32F:
+        return IsExtensionEnabled(WebGLExtensionID::WEBGL_color_buffer_float);
+
+    case LOCAL_GL_RGB16F:
+    case LOCAL_GL_RGBA16F:
+        return IsExtensionEnabled(WebGLExtensionID::EXT_color_buffer_half_float);
+    }
+
+    return false;
+}
+
+bool
 WebGLFramebuffer::Attachment::IsComplete() const
 {
     if (!HasImage())
@@ -303,23 +331,24 @@
         MOZ_ASSERT(Texture()->HasImageInfoAt(mTexImageTarget, mTexImageLevel));
         const WebGLTexture::ImageInfo& imageInfo =
             Texture()->ImageInfoAt(mTexImageTarget, mTexImageLevel);
-        GLenum internalformat = imageInfo.EffectiveInternalFormat().get();
+        GLenum sizedFormat = imageInfo.EffectiveInternalFormat().get();
 
         if (mAttachmentPoint == LOCAL_GL_DEPTH_ATTACHMENT)
-            return IsValidFBOTextureDepthFormat(internalformat);
+            return IsValidFBOTextureDepthFormat(sizedFormat);
 
         if (mAttachmentPoint == LOCAL_GL_STENCIL_ATTACHMENT)
             return false; // Textures can't have the correct format for stencil buffers
 
         if (mAttachmentPoint == LOCAL_GL_DEPTH_STENCIL_ATTACHMENT) {
-            return IsValidFBOTextureDepthStencilFormat(internalformat);
+            return IsValidFBOTextureDepthStencilFormat(sizedFormat);
         }
 
         if (mAttachmentPoint >= LOCAL_GL_COLOR_ATTACHMENT0 &&
             mAttachmentPoint <= FBAttachment(LOCAL_GL_COLOR_ATTACHMENT0 - 1 +
                                              WebGLContext::kMaxColorAttachments))
         {
-            return IsValidFBOTextureColorFormat(internalformat);
+            WebGLContext* webgl = Texture()->Context();
+            return webgl->IsFormatValidForFB(sizedFormat);
         }
         MOZ_ASSERT(false, "Invalid WebGL attachment point?");
         return false;
@@ -341,7 +370,8 @@
             mAttachmentPoint <= FBAttachment(LOCAL_GL_COLOR_ATTACHMENT0 - 1 +
                                              WebGLContext::kMaxColorAttachments))
         {
-            return IsValidFBORenderbufferColorFormat(internalFormat);
+            WebGLContext* webgl = Renderbuffer()->Context();
+            return webgl->IsFormatValidForFB(internalFormat);
         }
         MOZ_ASSERT(false, "Invalid WebGL attachment point?");
         return false;
@@ -375,7 +405,7 @@
     MOZ_ASSERT(HasImage());
 
     if (Texture()) {
-        MOZ_ASSERT(gl == Texture()->Context()->gl);
+        MOZ_ASSERT(gl == Texture()->Context()->GL());
 
         const GLenum imageTarget = ImageTarget().get();
         const GLint mipLevel = MipLevel();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLFramebuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLFramebuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLFramebuffer.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLFramebuffer.h	2014-11-26 21:45:57.000000000 +0000
@@ -34,7 +34,7 @@
 public:
     MOZ_DECLARE_REFCOUNTED_TYPENAME(WebGLFramebuffer)
 
-    explicit WebGLFramebuffer(WebGLContext* context);
+    explicit WebGLFramebuffer(WebGLContext* context, GLuint fbo);
 
     struct Attachment
     {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLQuery.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLQuery.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLQuery.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLQuery.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -3,16 +3,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "WebGLContext.h"
-#include "GLContext.h"
 #include "WebGLQuery.h"
+
+#include "GLContext.h"
+#include "WebGLContext.h"
 #include "mozilla/dom/WebGL2RenderingContextBinding.h"
 #include "nsContentUtils.h"
 
 using namespace mozilla;
 
 JSObject*
-WebGLQuery::WrapObject(JSContext *cx) {
+WebGLQuery::WrapObject(JSContext* cx)
+{
     return dom::WebGLQueryBinding::Wrap(cx, this);
 }
 
@@ -27,15 +29,18 @@
     mContext->gl->fGenQueries(1, &mGLName);
 }
 
-void WebGLQuery::Delete() {
+void
+WebGLQuery::Delete()
+{
     mContext->MakeContextCurrent();
     mContext->gl->fDeleteQueries(1, &mGLName);
     LinkedListElement<WebGLQuery>::removeFrom(mContext->mQueries);
 }
 
-bool WebGLQuery::IsActive() const
+bool
+WebGLQuery::IsActive() const
 {
-    WebGLRefPtr<WebGLQuery>* targetSlot = mContext->GetQueryTargetSlot(mType, "WebGLQuery::IsActive()");
+    WebGLRefPtr<WebGLQuery>* targetSlot = mContext->GetQueryTargetSlot(mType);
 
     MOZ_ASSERT(targetSlot, "unknown query object's type");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLQuery.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLQuery.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLQuery.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLQuery.h	2014-11-26 21:45:57.000000000 +0000
@@ -73,7 +73,7 @@
 
     // -------------------------------------------------------------------------
     // FRIENDSHIPS
-    friend class WebGLContext;
+    friend class WebGL2Context;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLRenderbuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLRenderbuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLRenderbuffer.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLRenderbuffer.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -42,8 +42,8 @@
     return dom::WebGLRenderbufferBinding::Wrap(cx, this);
 }
 
-WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext *context)
-    : WebGLBindableName<RBTarget>()
+WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext* context)
+    : WebGLBindable<RBTarget>()
     , WebGLContextBoundObject(context)
     , mPrimaryRB(0)
     , mSecondaryRB(0)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLRenderbuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLRenderbuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLRenderbuffer.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLRenderbuffer.h	2014-11-26 21:45:57.000000000 +0000
@@ -18,7 +18,7 @@
 
 class WebGLRenderbuffer MOZ_FINAL
     : public nsWrapperCache
-    , public WebGLBindableName<RBTarget>
+    , public WebGLBindable<RBTarget>
     , public WebGLRefCountedObject<WebGLRenderbuffer>
     , public LinkedListElement<WebGLRenderbuffer>
     , public WebGLRectangleObject
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLSampler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLSampler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLSampler.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLSampler.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -12,32 +12,36 @@
 
 using namespace mozilla;
 
-WebGLSampler::WebGLSampler(WebGLContext* context)
-    : WebGLContextBoundObject(context)
+WebGLSampler::WebGLSampler(WebGLContext* context, GLuint sampler)
+    : WebGLBindableName<GLenum>(sampler),
+      WebGLContextBoundObject(context)
 {
-    MOZ_CRASH("Not Implemented.");
+    mContext->mSamplers.insertBack(this);
 }
 
 WebGLSampler::~WebGLSampler()
-{}
+{
+    DeleteOnce();
+}
 
 void
 WebGLSampler::Delete()
 {
-    MOZ_CRASH("Not Implemented.");
+    mContext->MakeContextCurrent();
+    mContext->gl->fDeleteSamplers(1, &mGLName);
+
+    removeFrom(mContext->mSamplers);
 }
 
 WebGLContext*
 WebGLSampler::GetParentObject() const
 {
-    MOZ_CRASH("Not Implemented.");
-    return nullptr;
+    return Context();
 }
 
 JSObject*
 WebGLSampler::WrapObject(JSContext* cx)
 {
-    MOZ_CRASH("Not Implemented.");
     return dom::WebGLSamplerBinding::Wrap(cx, this);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLSampler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLSampler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLSampler.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLSampler.h	2014-11-26 21:45:57.000000000 +0000
@@ -3,8 +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/. */
 
-#ifndef WEBGL2SAMPLER_H_
-#define WEBGL2SAMPLER_H_
+#ifndef WEBGLSAMPLER_H_
+#define WEBGLSAMPLER_H_
 
 #include "WebGLBindableName.h"
 #include "WebGLObjectModel.h"
@@ -16,8 +16,8 @@
 namespace mozilla {
 
 class WebGLSampler MOZ_FINAL
-    : public WebGLBindableName<GLenum>
-    , public nsWrapperCache
+    : public nsWrapperCache
+    , public WebGLBindableName<GLenum>
     , public WebGLRefCountedObject<WebGLSampler>
     , public LinkedListElement<WebGLSampler>
     , public WebGLContextBoundObject
@@ -26,13 +26,15 @@
 
 public:
 
-    explicit WebGLSampler(WebGLContext* aContext);
+    explicit WebGLSampler(WebGLContext* aContext, GLuint sampler);
 
     void Delete();
     WebGLContext* GetParentObject() const;
 
     virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE;
 
+private:
+
     NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLSampler)
     NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(WebGLSampler)
 
@@ -43,4 +45,4 @@
 
 } // namespace mozilla
 
-#endif // !WEBGL2SAMPLER_H_
+#endif // !WEBGLSAMPLER_H_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTexture.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTexture.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTexture.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTexture.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -19,12 +19,12 @@
 using namespace mozilla;
 
 JSObject*
-WebGLTexture::WrapObject(JSContext *cx) {
+WebGLTexture::WrapObject(JSContext* cx) {
     return dom::WebGLTextureBinding::Wrap(cx, this);
 }
 
-WebGLTexture::WebGLTexture(WebGLContext *context)
-    : WebGLBindableName<TexTarget>()
+WebGLTexture::WebGLTexture(WebGLContext* context, GLuint tex)
+    : WebGLBindableName<TexTarget>(tex)
     , WebGLContextBoundObject(context)
     , mMinFilter(LOCAL_GL_NEAREST_MIPMAP_LINEAR)
     , mMagFilter(LOCAL_GL_LINEAR)
@@ -38,8 +38,6 @@
     , mMaxMipmapLevel(1000)
     , mFakeBlackStatus(WebGLTextureFakeBlackStatus::IncompleteTexture)
 {
-    mContext->MakeContextCurrent();
-    mContext->gl->fGenTextures(1, &mGLName);
     mContext->mTextures.insertBack(this);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTexture.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTexture.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTexture.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTexture.h	2014-11-26 21:45:57.000000000 +0000
@@ -38,7 +38,7 @@
     , public WebGLFramebufferAttachable
 {
 public:
-    explicit WebGLTexture(WebGLContext* aContext);
+    explicit WebGLTexture(WebGLContext* aContext, GLuint tex);
 
     void Delete();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTransformFeedback.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTransformFeedback.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTransformFeedback.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTransformFeedback.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -13,7 +13,8 @@
 using namespace mozilla;
 
 WebGLTransformFeedback::WebGLTransformFeedback(WebGLContext* context)
-    : WebGLContextBoundObject(context)
+    : WebGLBindableName<GLenum>(0)
+    , WebGLContextBoundObject(context)
 {
     MOZ_CRASH("Not Implemented.");
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTransformFeedback.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTransformFeedback.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLTransformFeedback.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLTransformFeedback.h	2014-11-26 21:45:57.000000000 +0000
@@ -16,8 +16,8 @@
 namespace mozilla {
 
 class WebGLTransformFeedback MOZ_FINAL
-    : public WebGLBindableName<GLenum>
-    , public nsWrapperCache
+    : public nsWrapperCache
+    , public WebGLBindableName<GLenum>
     , public WebGLRefCountedObject<WebGLTransformFeedback>
     , public LinkedListElement<WebGLTransformFeedback>
     , public WebGLContextBoundObject
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLUniformInfo.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLUniformInfo.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLUniformInfo.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLUniformInfo.h	2014-11-26 21:45:57.000000000 +0000
@@ -21,27 +21,53 @@
 
     int ElementSize() const {
         switch (type) {
-            case LOCAL_GL_INT:
             case LOCAL_GL_FLOAT:
+            case LOCAL_GL_INT:
+            case LOCAL_GL_UNSIGNED_INT:
             case LOCAL_GL_BOOL:
             case LOCAL_GL_SAMPLER_2D:
+            case LOCAL_GL_SAMPLER_3D:
             case LOCAL_GL_SAMPLER_CUBE:
+            case LOCAL_GL_SAMPLER_2D_SHADOW:
+            case LOCAL_GL_SAMPLER_2D_ARRAY:
+            case LOCAL_GL_SAMPLER_2D_ARRAY_SHADOW:
+            case LOCAL_GL_SAMPLER_CUBE_SHADOW:
+            case LOCAL_GL_INT_SAMPLER_2D:
+            case LOCAL_GL_INT_SAMPLER_3D:
+            case LOCAL_GL_INT_SAMPLER_CUBE:
+            case LOCAL_GL_INT_SAMPLER_2D_ARRAY:
+            case LOCAL_GL_UNSIGNED_INT_SAMPLER_2D:
+            case LOCAL_GL_UNSIGNED_INT_SAMPLER_3D:
+            case LOCAL_GL_UNSIGNED_INT_SAMPLER_CUBE:
+            case LOCAL_GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
                 return 1;
-            case LOCAL_GL_INT_VEC2:
             case LOCAL_GL_FLOAT_VEC2:
+            case LOCAL_GL_INT_VEC2:
+            case LOCAL_GL_UNSIGNED_INT_VEC2:
             case LOCAL_GL_BOOL_VEC2:
                 return 2;
-            case LOCAL_GL_INT_VEC3:
             case LOCAL_GL_FLOAT_VEC3:
+            case LOCAL_GL_INT_VEC3:
+            case LOCAL_GL_UNSIGNED_INT_VEC3:
             case LOCAL_GL_BOOL_VEC3:
                 return 3;
-            case LOCAL_GL_INT_VEC4:
             case LOCAL_GL_FLOAT_VEC4:
+            case LOCAL_GL_INT_VEC4:
+            case LOCAL_GL_UNSIGNED_INT_VEC4:
             case LOCAL_GL_BOOL_VEC4:
             case LOCAL_GL_FLOAT_MAT2:
                 return 4;
+            case LOCAL_GL_FLOAT_MAT2x3:
+            case LOCAL_GL_FLOAT_MAT3x2:
+                return 6;
+            case LOCAL_GL_FLOAT_MAT2x4:
+            case LOCAL_GL_FLOAT_MAT4x2:
+                return 8;
             case LOCAL_GL_FLOAT_MAT3:
                 return 9;
+            case LOCAL_GL_FLOAT_MAT3x4:
+            case LOCAL_GL_FLOAT_MAT4x3:
+                return 12;
             case LOCAL_GL_FLOAT_MAT4:
                 return 16;
             default:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLVertexArray.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLVertexArray.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLVertexArray.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLVertexArray.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -20,8 +20,9 @@
 }
 
 WebGLVertexArray::WebGLVertexArray(WebGLContext* context)
-    : WebGLBindableName<VAOBinding>()
+    : WebGLBindable<VAOBinding>()
     , WebGLContextBoundObject(context)
+    , mGLName(0)
 {
     context->mVertexArrays.insertBack(this);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLVertexArray.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLVertexArray.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/canvas/WebGLVertexArray.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/canvas/WebGLVertexArray.h	2014-11-26 21:45:57.000000000 +0000
@@ -22,7 +22,7 @@
 
 class WebGLVertexArray
     : public nsWrapperCache
-    , public WebGLBindableName<VAOBinding>
+    , public WebGLBindable<VAOBinding>
     , public WebGLRefCountedObject<WebGLVertexArray>
     , public LinkedListElement<WebGLVertexArray>
     , public WebGLContextBoundObject
@@ -61,6 +61,8 @@
     // -------------------------------------------------------------------------
     // MEMBER FUNCTIONS
 
+    GLuint GLName() const { return mGLName; }
+
     void EnsureAttrib(GLuint index);
     bool HasAttrib(GLuint index) {
         return index < mAttribs.Length();
@@ -82,6 +84,7 @@
     // -------------------------------------------------------------------------
     // MEMBERS
 
+    GLuint mGLName;
     nsTArray<WebGLVertexAttribData> mAttribs;
     WebGLRefPtr<WebGLBuffer> mElementArrayBuffer;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/CellBroadcastMessage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/CellBroadcastMessage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/CellBroadcastMessage.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/CellBroadcastMessage.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -83,12 +83,14 @@
                                                        aEtwsPopup)
                            : nullptr)
 {
-  if (aGsmGeographicalScope < nsICellBroadcastService::GSM_GEOGRAPHICAL_SCOPE_INVALID) {
+  if (aGsmGeographicalScope <
+      static_cast<uint32_t>(CellBroadcastGsmGeographicalScope::EndGuard_)) {
     mGsmGeographicalScope.SetValue(
       ToWebidlEnum<CellBroadcastGsmGeographicalScope>(aGsmGeographicalScope));
   }
 
-  if (aMessageClass < nsICellBroadcastService::GSM_MESSAGE_CLASS_INVALID) {
+  if (aMessageClass <
+      static_cast<uint32_t>(CellBroadcastMessageClass::EndGuard_)) {
     mMessageClass.SetValue(
       ToWebidlEnum<CellBroadcastMessageClass>(aMessageClass));
   }
@@ -134,7 +136,8 @@
   , mEmergencyUserAlert(aEmergencyUserAlert)
   , mPopup(aPopup)
 {
-  if (aWarningType < nsICellBroadcastService::GSM_ETWS_WARNING_INVALID) {
+  if (aWarningType <
+      static_cast<uint32_t>(CellBroadcastEtwsWarningType::EndGuard_)) {
     mWarningType.SetValue(
       ToWebidlEnum<CellBroadcastEtwsWarningType>(aWarningType));
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/gonk/CellBroadcastService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/gonk/CellBroadcastService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/gonk/CellBroadcastService.js	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/gonk/CellBroadcastService.js	2014-11-26 21:45:57.000000000 +0000
@@ -20,9 +20,9 @@
 const kSettingsCellBroadcastDisabled = "ril.cellbroadcast.disabled";
 const kSettingsCellBroadcastSearchList = "ril.cellbroadcast.searchlist";
 
-XPCOMUtils.defineLazyServiceGetter(this, "gSystemMessenger",
-                                   "@mozilla.org/system-message-internal;1",
-                                   "nsISystemMessagesInternal");
+XPCOMUtils.defineLazyServiceGetter(this, "gCellbroadcastMessenger",
+                                   "@mozilla.org/ril/system-messenger-helper;1",
+                                   "nsICellbroadcastMessenger");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gSettingsService",
                                    "@mozilla.org/settingsService;1",
@@ -112,24 +112,6 @@
     } catch (e) {}
   },
 
-  _convertCbGsmGeographicalScope: function(aGeographicalScope) {
-    return (aGeographicalScope >= Ci.nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_INVALID)
-      ? null
-      : RIL.CB_GSM_GEOGRAPHICAL_SCOPE_NAMES[aGeographicalScope];
-  },
-
-  _convertCbMessageClass: function(aMessageClass) {
-    return (aMessageClass >= Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS)
-      ? null
-      : RIL.GECKO_SMS_MESSAGE_CLASSES[aMessageClass];
-  },
-
-  _convertCbEtwsWarningType: function(aWarningType) {
-    return (aWarningType >= Ci.nsICellBroadcastService.GSM_ETWS_WARNING_INVALID)
-      ? null
-      : RIL.CB_ETWS_WARNING_TYPE_NAMES[aWarningType];
-  },
-
   _retrieveSettingValueByClient: function(aClientId, aSettings) {
     return Array.isArray(aSettings) ? aSettings[aClientId] : aSettings;
   },
@@ -236,38 +218,19 @@
                                   aEtwsEmergencyUserAlert,
                                   aEtwsPopup) {
     // Broadcast CBS System message
-    // Align the same layout to MozCellBroadcastMessage
-    let systemMessage = {
-      serviceId: aServiceId,
-      gsmGeographicalScope: this._convertCbGsmGeographicalScope(aGsmGeographicalScope),
-      messageCode: aMessageCode,
-      messageId: aMessageId,
-      language: aLanguage,
-      body: aBody,
-      messageClass: this._convertCbMessageClass(aMessageClass),
-      timestamp: aTimestamp,
-      cdmaServiceCategory: null,
-      etws: null
-    };
-
-    if (aHasEtwsInfo) {
-      systemMessage.etws = {
-        warningType: this._convertCbEtwsWarningType(aEtwsWarningType),
-        emergencyUserAlert: aEtwsEmergencyUserAlert,
-        popup: aEtwsPopup
-      };
-    }
-
-    if (aCdmaServiceCategory !=
-        Ci.nsICellBroadcastService.CDMA_SERVICE_CATEGORY_INVALID) {
-      systemMessage.cdmaServiceCategory = aCdmaServiceCategory;
-    }
-
-    if (DEBUG) {
-      debug("CBS system message to be broadcasted: " + JSON.stringify(systemMessage));
-    }
-
-    gSystemMessenger.broadcastMessage("cellbroadcast-received", systemMessage);
+    gCellbroadcastMessenger.notifyCbMessageReceived(aServiceId,
+                                                    aGsmGeographicalScope,
+                                                    aMessageCode,
+                                                    aMessageId,
+                                                    aLanguage,
+                                                    aBody,
+                                                    aMessageClass,
+                                                    aTimestamp,
+                                                    aCdmaServiceCategory,
+                                                    aHasEtwsInfo,
+                                                    aEtwsWarningType,
+                                                    aEtwsEmergencyUserAlert,
+                                                    aEtwsPopup);
 
     // Notify received message to registered listener
     for (let listener of this._listeners) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/interfaces/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/interfaces/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/interfaces/moz.build	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/interfaces/moz.build	2014-11-26 21:45:57.000000000 +0000
@@ -10,6 +10,7 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
+        'nsICellbroadcastMessenger.idl',
         'nsIGonkCellBroadcastService.idl',
     ]
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/interfaces/nsICellbroadcastMessenger.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/interfaces/nsICellbroadcastMessenger.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/interfaces/nsICellbroadcastMessenger.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/interfaces/nsICellbroadcastMessenger.idl	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,55 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "domstubs.idl"
+#include "nsISupports.idl"
+
+[scriptable, uuid(47764f4a-5b3f-11e4-a2ec-4b99529b9288)]
+interface nsICellbroadcastMessenger : nsISupports
+{
+  /**
+   * To broadcast 'cellbroadcast-received' system message.
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aGsmGeographicalScope
+   *        @See nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_*.
+   * @param aMessageCode
+   *        The Message Code differentiates between messages from the same
+   *        source and type (e.g., with the same Message Identifier).
+   * @param aMessageId
+   *        Source and type of the message which is coded in binary.
+   * @param aLanguage
+   *        ISO-639-1 language code for this message. Null if unspecified.
+   * @param aBody
+   *        Text message carried by the message.
+   * @param aMessageClass
+   *        @See nsICellBroadcastService.GSM_MESSAGE_CLASS_*.
+   * @param aTimestamp
+   *        System time stamp at receival.
+   * @param aCdmaServiceCategory
+   *        CDMA Service Category.
+   * @param aHasEtwsInfo
+   *        True if ETWS Info is included in this message.
+   * @param aEtwsWarningType
+   *        @See nsICellBroadcastService.GSM_ETWS_WARNING_*.
+   * @param aEtwsEmergencyUserAlert
+   *        True if Emergency user alert indication is set.
+   * @param aEtwsPopup
+   *        True if Message popup indication is set.
+   */
+  void notifyCbMessageReceived(in unsigned long aServiceId,
+                               in unsigned long aGsmGeographicalScope,
+                               in unsigned short aMessageCode,
+                               in unsigned short aMessageId,
+                               in DOMString aLanguage,
+                               in DOMString aBody,
+                               in unsigned long aMessageClass,
+                               in DOMTimeStamp aTimestamp,
+                               in unsigned long aCdmaServiceCategory,
+                               in boolean aHasEtwsInfo,
+                               in unsigned long aEtwsWarningType,
+                               in boolean aEtwsEmergencyUserAlert,
+                               in boolean aEtwsPopup);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/interfaces/nsICellBroadcastService.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/interfaces/nsICellBroadcastService.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/cellbroadcast/interfaces/nsICellBroadcastService.idl	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/cellbroadcast/interfaces/nsICellBroadcastService.idl	2014-11-26 21:45:57.000000000 +0000
@@ -36,7 +36,7 @@
 /**
  * XPCOM component that provides the cell broadcast information.
  */
-[scriptable, uuid(eed283f6-44a8-11e4-b364-afb894b7a283)]
+[scriptable, uuid(906cda5a-6b18-11e4-973b-5ff3fc075b6b)]
 interface nsICellBroadcastService : nsISupports
 {
   /**
@@ -47,11 +47,13 @@
   const unsigned short GSM_GEOGRAPHICAL_SCOPE_PLMN           = 1;
   const unsigned short GSM_GEOGRAPHICAL_SCOPE_LOCATION_AREA  = 2;
   const unsigned short GSM_GEOGRAPHICAL_SCOPE_CELL           = 3;
-  const unsigned short GSM_GEOGRAPHICAL_SCOPE_INVALID        = 4;
+  const unsigned short GSM_GEOGRAPHICAL_SCOPE_INVALID        = 0xFFFF;
 
   /**
    * Constant definitions of predefined GSM Message Class
    * See 3GPP TS 23.038 clause 5 CBS Data Coding Scheme
+   *
+   * Set to GSM_MESSAGE_CLASS_NORMAL if no message class is specified.
    */
   const unsigned short GSM_MESSAGE_CLASS_0       = 0;
   const unsigned short GSM_MESSAGE_CLASS_1       = 1;
@@ -60,7 +62,6 @@
   const unsigned short GSM_MESSAGE_CLASS_USER_1  = 4;
   const unsigned short GSM_MESSAGE_CLASS_USER_2  = 5;
   const unsigned short GSM_MESSAGE_CLASS_NORMAL  = 6;
-  const unsigned short GSM_MESSAGE_CLASS_INVALID = 7;
 
   /**
    * Constant definitions of predefined GSM ETWS Warning Types
@@ -71,7 +72,7 @@
   const unsigned short GSM_ETWS_WARNING_EARTHQUAKE_TSUNAMI = 2;
   const unsigned short GSM_ETWS_WARNING_TEST               = 3;
   const unsigned short GSM_ETWS_WARNING_OTHER              = 4;
-  const unsigned short GSM_ETWS_WARNING_INVALID            = 5;
+  const unsigned short GSM_ETWS_WARNING_INVALID            = 0xFFFF;
 
   /**
    * Attribute CdmaServiceCategory is only valid in CDMA network.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextDecoder.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextDecoder.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -1,10 +1,13 @@
+/* -*- 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 "mozilla/dom/TextDecoder.h"
 #include "mozilla/dom/EncodingUtils.h"
+#include "mozilla/dom/UnionTypes.h"
 #include "nsContentUtils.h"
+#include <stdint.h>
 
 namespace mozilla {
 namespace dom {
@@ -94,6 +97,40 @@
 }
 
 void
+TextDecoder::Decode(const Optional<ArrayBufferViewOrArrayBuffer>& aBuffer,
+                    const TextDecodeOptions& aOptions,
+                    nsAString& aOutDecodedString,
+                    ErrorResult& aRv)
+{
+  if (!aBuffer.WasPassed()) {
+    Decode(nullptr, 0, aOptions.mStream, aOutDecodedString, aRv);
+    return;
+  }
+  const ArrayBufferViewOrArrayBuffer& buf = aBuffer.Value();
+  uint8_t* data;
+  uint32_t length;
+  if (buf.IsArrayBufferView()) {
+    buf.GetAsArrayBufferView().ComputeLengthAndData();
+    data = buf.GetAsArrayBufferView().Data();
+    length = buf.GetAsArrayBufferView().Length();
+  } else {
+    MOZ_ASSERT(buf.IsArrayBuffer());
+    buf.GetAsArrayBuffer().ComputeLengthAndData();
+    data = buf.GetAsArrayBuffer().Data();
+    length = buf.GetAsArrayBuffer().Length();
+  }
+  // The other Decode signature takes a signed int, because that's
+  // what nsIUnicodeDecoder::Convert takes as the length.  Throw if
+  // our length is too big.
+  if (length > INT32_MAX) {
+    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+  Decode(reinterpret_cast<char*>(data), length, aOptions.mStream,
+         aOutDecodedString, aRv);
+}
+
+void
 TextDecoder::GetEncoding(nsAString& aEncoding)
 {
   CopyASCIItoUTF16(mEncoding, aEncoding);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextDecoder.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextDecoder.h	2014-11-26 21:45:58.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- 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/. */
@@ -16,6 +17,8 @@
 
 namespace dom {
 
+class ArrayBufferViewOrArrayBuffer;
+
 class TextDecoder MOZ_FINAL
   : public NonRefcountedDOMObject
 {
@@ -98,18 +101,13 @@
               const bool aStream, nsAString& aOutDecodedString,
               ErrorResult& aRv);
 
-  void Decode(nsAString& aOutDecodedString,
-              ErrorResult& aRv) {
-    Decode(nullptr, 0, false, aOutDecodedString, aRv);
-  }
-
-  void Decode(const ArrayBufferView& aView,
+  void Decode(const Optional<ArrayBufferViewOrArrayBuffer>& aBuffer,
               const TextDecodeOptions& aOptions,
               nsAString& aOutDecodedString,
-              ErrorResult& aRv) {
-    aView.ComputeLengthAndData();
-    Decode(reinterpret_cast<char*>(aView.Data()), aView.Length(),
-           aOptions.mStream, aOutDecodedString, aRv);
+              ErrorResult& aRv);
+
+  bool Fatal() const {
+    return mFatal;
   }
 
 private:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextEncoder.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextEncoder.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- 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/. */
@@ -38,8 +39,7 @@
 TextEncoder::Encode(JSContext* aCx,
                     JS::Handle<JSObject*> aObj,
                     const nsAString& aString,
-                    const bool aStream,
-		    JS::MutableHandle<JSObject*> aRetval,
+                    JS::MutableHandle<JSObject*> aRetval,
                     ErrorResult& aRv)
 {
   // Run the steps of the encoding algorithm.
@@ -63,14 +63,11 @@
   int32_t dstLen = maxLen;
   rv = mEncoder->Convert(data, &srcLen, buf, &dstLen);
 
-  // If the internal streaming flag is not set, then reset
-  // the encoding algorithm state to the default values for encoding.
-  if (!aStream) {
-    int32_t finishLen = maxLen - dstLen;
-    rv = mEncoder->Finish(buf + dstLen, &finishLen);
-    if (NS_SUCCEEDED(rv)) {
-      dstLen += finishLen;
-    }
+  // Now reset the encoding algorithm state to the default values for encoding.
+  int32_t finishLen = maxLen - dstLen;
+  rv = mEncoder->Finish(buf + dstLen, &finishLen);
+  if (NS_SUCCEEDED(rv)) {
+    dstLen += finishLen;
   }
 
   JSObject* outView = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/encoding/TextEncoder.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/encoding/TextEncoder.h	2014-11-26 21:45:58.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- 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/. */
@@ -46,15 +47,6 @@
     return TextEncoderBinding::Wrap(aCx, this, aTookOwnership);
   }
 
-  void Encode(JSContext* aCx,
-	      JS::Handle<JSObject*> aObj,
-	      const nsAString& aString,
-	      const TextEncodeOptions& aOptions,
-	      JS::MutableHandle<JSObject*> aRetval,
-	      ErrorResult& aRv) {
-    TextEncoder::Encode(aCx, aObj, aString, aOptions.mStream, aRetval, aRv);
-  }
-
 protected:
 
   /**
@@ -82,20 +74,14 @@
    * @param aCx        Javascript context.
    * @param aObj       the wrapper of the TextEncoder
    * @param aString    utf-16 code units to be encoded.
-   * @param aOptions   Streaming option. Initialised by default to false.
-   *                   If the streaming option is false, then the encoding
-   *                   algorithm state will get reset. If set to true then
-   *                   the previous encoding is reused/continued.
    * @return JSObject* The Uint8Array wrapped in a JS object.  Returned via
    *                   the aRetval out param.
    */
   void Encode(JSContext* aCx,
-	      JS::Handle<JSObject*> aObj,
-	      const nsAString& aString,
-	      const bool aStream,
-	      JS::MutableHandle<JSObject*> aRetval,
-	      ErrorResult& aRv);
-
+              JS::Handle<JSObject*> aObj,
+              const nsAString& aString,
+              JS::MutableHandle<JSObject*> aRetval,
+              ErrorResult& aRv);
 private:
   nsCString mEncoding;
   nsCOMPtr<nsIUnicodeEncoder> mEncoder;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/ContentEventHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/ContentEventHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/ContentEventHandler.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/ContentEventHandler.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -604,6 +604,23 @@
     LINE_BREAK_TYPE_NATIVE : LINE_BREAK_TYPE_XP;
 }
 
+// Similar to nsFrameSelection::GetFrameForNodeOffset,
+// but this is more flexible for OnQueryTextRect to use
+static nsresult GetFrameForTextRect(nsINode* aNode,
+                                    int32_t aNodeOffset,
+                                    bool aHint,
+                                    nsIFrame** aReturnFrame)
+{
+  NS_ENSURE_TRUE(aNode && aNode->IsNodeOfType(nsINode::eCONTENT),
+                 NS_ERROR_UNEXPECTED);
+  nsIContent* content = static_cast<nsIContent*>(aNode);
+  nsIFrame* frame = content->GetPrimaryFrame();
+  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
+  int32_t childNodeOffset = 0;
+  return frame->GetChildFrameContainingOffset(aNodeOffset, aHint,
+                                              &childNodeOffset, aReturnFrame);
+}
+
 nsresult
 ContentEventHandler::OnQuerySelectedText(WidgetQueryContentEvent* aEvent)
 {
@@ -646,6 +663,14 @@
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
+  nsIFrame* frame = nullptr;
+  rv = GetFrameForTextRect(focusNode, focusOffset, true, &frame);
+  if (NS_SUCCEEDED(rv) && frame) {
+    aEvent->mReply.mWritingMode = frame->GetWritingMode();
+  } else {
+    aEvent->mReply.mWritingMode = WritingMode();
+  }
+
   aEvent->mSucceeded = true;
   return NS_OK;
 }
@@ -697,23 +722,6 @@
   return node;
 }
 
-// Similar to nsFrameSelection::GetFrameForNodeOffset,
-// but this is more flexible for OnQueryTextRect to use
-static nsresult GetFrameForTextRect(nsINode* aNode,
-                                    int32_t aNodeOffset,
-                                    bool aHint,
-                                    nsIFrame** aReturnFrame)
-{
-  NS_ENSURE_TRUE(aNode && aNode->IsNodeOfType(nsINode::eCONTENT),
-                 NS_ERROR_UNEXPECTED);
-  nsIContent* content = static_cast<nsIContent*>(aNode);
-  nsIFrame* frame = content->GetPrimaryFrame();
-  NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
-  int32_t childNodeOffset = 0;
-  return frame->GetChildFrameContainingOffset(aNodeOffset, aHint,
-                                              &childNodeOffset, aReturnFrame);
-}
-
 nsresult
 ContentEventHandler::OnQueryTextRect(WidgetQueryContentEvent* aEvent)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/Event.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/Event.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/Event.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/Event.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -886,7 +886,8 @@
 
   LayoutDeviceIntPoint offset = aPoint +
     LayoutDeviceIntPoint::FromUntyped(guiEvent->widget->WidgetToScreenOffset());
-  nscoord factor = aPresContext->DeviceContext()->UnscaledAppUnitsPerDevPixel();
+  nscoord factor =
+    aPresContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
   return nsIntPoint(nsPresContext::AppUnitsToIntCSSPixels(offset.x * factor),
                     nsPresContext::AppUnitsToIntCSSPixels(offset.y * factor));
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/EventDispatcher.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/EventDispatcher.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/EventDispatcher.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/EventDispatcher.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -32,6 +32,12 @@
 #include "mozilla/TouchEvents.h"
 #include "mozilla/unused.h"
 
+#ifdef MOZ_TASK_TRACER
+#include "GeckoTaskTracer.h"
+#include "mozilla/dom/Element.h"
+using namespace mozilla::tasktracer;
+#endif
+
 namespace mozilla {
 
 using namespace dom;
@@ -407,6 +413,27 @@
   NS_ENSURE_TRUE(aEvent->message || !aDOMEvent || aTargets,
                  NS_ERROR_DOM_INVALID_STATE_ERR);
 
+#ifdef MOZ_TASK_TRACER
+  {
+    if (aDOMEvent) {
+      nsAutoString eventType;
+      aDOMEvent->GetType(eventType);
+
+      nsCOMPtr<Element> element = do_QueryInterface(aTarget);
+      nsAutoString elementId;
+      nsAutoString elementTagName;
+      if (element) {
+        element->GetId(elementId);
+        element->GetTagName(elementTagName);
+      }
+      AddLabel("Event [%s] dispatched at target [id:%s tag:%s]",
+               NS_ConvertUTF16toUTF8(eventType).get(),
+               NS_ConvertUTF16toUTF8(elementId).get(),
+               NS_ConvertUTF16toUTF8(elementTagName).get());
+    }
+  }
+#endif
+
   nsCOMPtr<EventTarget> target = do_QueryInterface(aTarget);
 
   bool retargeted = false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/EventListenerManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/EventListenerManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/EventListenerManager.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/EventListenerManager.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -1012,6 +1012,26 @@
   return docShell;
 }
 
+class EventTimelineMarker : public nsDocShell::TimelineMarker
+{
+public:
+  EventTimelineMarker(nsDocShell* aDocShell, TracingMetadata aMetaData,
+                      uint16_t aPhase, const nsAString& aCause)
+    : nsDocShell::TimelineMarker(aDocShell, "DOMEvent", aMetaData, aCause)
+    , mPhase(aPhase)
+  {
+  }
+
+  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker)
+  {
+    aMarker.mType.Construct(GetCause());
+    aMarker.mEventPhase.Construct(mPhase);
+  }
+
+private:
+  uint16_t mPhase;
+};
+
 /**
 * Causes a check for event listeners and processing by them if they exist.
 * @param an event listener
@@ -1066,13 +1086,24 @@
           // Maybe add a marker to the docshell's timeline, but only
           // bother with all the logic if some docshell is recording.
           nsCOMPtr<nsIDocShell> docShell;
+          bool isTimelineRecording = false;
           if (mIsMainThreadELM &&
               nsDocShell::gProfileTimelineRecordingsCount > 0 &&
               listener->mListenerType != Listener::eNativeListener) {
             docShell = GetDocShellForTarget();
             if (docShell) {
+              docShell->GetRecordProfileTimelineMarkers(&isTimelineRecording);
+            }
+            if (isTimelineRecording) {
               nsDocShell* ds = static_cast<nsDocShell*>(docShell.get());
-              ds->AddProfileTimelineMarker("DOMEvent", TRACING_INTERVAL_START);
+              nsAutoString typeStr;
+              (*aDOMEvent)->GetType(typeStr);
+              uint16_t phase;
+              (*aDOMEvent)->GetEventPhase(&phase);
+              mozilla::UniquePtr<nsDocShell::TimelineMarker> marker =
+                MakeUnique<EventTimelineMarker>(ds, TRACING_INTERVAL_START,
+                                                phase, typeStr);
+              ds->AddProfileTimelineMarker(marker);
             }
           }
 
@@ -1081,7 +1112,7 @@
             aEvent->mFlags.mExceptionHasBeenRisen = true;
           }
 
-          if (docShell) {
+          if (isTimelineRecording) {
             nsDocShell* ds = static_cast<nsDocShell*>(docShell.get());
             ds->AddProfileTimelineMarker("DOMEvent", TRACING_INTERVAL_END);
           }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/EventStateManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/EventStateManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/EventStateManager.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/EventStateManager.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -819,6 +819,8 @@
     // through to compositionend handling
   case NS_COMPOSITION_END:
   case NS_COMPOSITION_CHANGE:
+  case NS_COMPOSITION_COMMIT_AS_IS:
+  case NS_COMPOSITION_COMMIT:
     {
       WidgetCompositionEvent* compositionEvent = aEvent->AsCompositionEvent();
       if (IsTargetCrossProcess(compositionEvent)) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/IMEStateManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/IMEStateManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/IMEStateManager.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/IMEStateManager.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -143,6 +143,8 @@
       return "NS_COMPOSITION_UPDATE";
     case NS_COMPOSITION_CHANGE:
       return "NS_COMPOSITION_CHANGE";
+    case NS_COMPOSITION_COMMIT_AS_IS:
+      return "NS_COMPOSITION_COMMIT_AS_IS";
     default:
       return "unacceptable event message";
   }
@@ -943,7 +945,7 @@
   //       destroy the TextComposition with synthesized compositionend event.
   if ((!aIsSynthesized ||
        composition->WasNativeCompositionEndEventDiscarded()) &&
-      aCompositionEvent->message == NS_COMPOSITION_END) {
+      aCompositionEvent->CausesDOMCompositionEndEvent()) {
     TextCompositionArray::index_type i =
       sTextCompositions->IndexOf(aCompositionEvent->widget);
     if (i != TextCompositionArray::NoIndex) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/bug1096146_embedded.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/bug1096146_embedded.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/bug1096146_embedded.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/bug1096146_embedded.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Embedded iframe</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="">
+  <p id="display"></p>
+  <h1>Top</h1>
+  <input id="input" style="display: block;">
+  <pre id="test">
+  <div id="content" style="height: 2000px;"></div>
+  <h1>Bottom</h1>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/mochitest.ini	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/mochitest.ini	2014-11-26 21:45:58.000000000 +0000
@@ -176,3 +176,6 @@
   bug989198_embedded.html
   bug989198_helper.js
 skip-if = buildapp == 'b2g' || e10s
+[test_bug1096146.html]
+support-files =
+  bug1096146_embedded.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/test_all_synthetic_events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/test_all_synthetic_events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/test_all_synthetic_events.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/test_all_synthetic_events.html	2014-11-26 21:45:58.000000000 +0000
@@ -80,6 +80,10 @@
                                                           return new CallGroupErrorEvent(aName, aProps);
                                                        },
                                              },
+  CameraClosedEvent:                        { create: function (aName, aProps) {
+                                                          return new CameraClosedEvent(aName, aProps);
+                                                       },
+                                             },
   CameraConfigurationEvent:                  { create: function (aName, aProps) {
                                                           return new CameraConfigurationEvent(aName, aProps);
                                                        },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/test_bug1096146.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/test_bug1096146.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/test/test_bug1096146.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/test/test_bug1096146.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,170 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1096146
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1096146</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 onload="runTests();">
+<a target="_blank"
+   href="https://bugzilla.mozilla.org/show_bug.cgi?id=1096146">Mozilla Bug 1096146</a>
+<div id="content" style="display: none;">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+const kKeydownEvent = 0x1;
+const kScrollEvent  = 0x2;
+
+var gCurrentTest = 0;
+var kTests = [
+  {
+    description: "no preventDefault at 'mozbrowserbeforekeydown'",
+    expectedEvents: kKeydownEvent | kScrollEvent,
+    resultEvents: 0x0,
+    doPreventDefault: false
+  },
+  {
+    description: "do preventDefault at 'mozbrowserbeforekeydown'",
+    expectedEvents: 0x0,
+    resultEvents: 0x0,
+    doPreventDefault: true
+  }
+]
+
+function frameScript()
+{
+  function handler(e) {
+    sendSyncMessage("forwardevent", { type: e.type });
+  }
+  addEventListener('keydown', handler);
+  addEventListener('scroll', handler);
+}
+
+function testDefaultAction()
+{
+  synthesizeKey('VK_END', {}, document.getElementById("embedded").contentWindow);
+  setTimeout(function () {
+    is(kTests[gCurrentTest].expectedEvents,
+       kTests[gCurrentTest].resultEvents,
+       "verify result");
+    runTests();
+  }, 500);
+}
+
+function prepareTest()
+{
+  var handler;
+  if (kTests[gCurrentTest].doPreventDefault) {
+    handler = preventDefaultHandler;
+  } else {
+    handler = noPreventDefaultHandler;
+  }
+  window.addEventListener("mozbrowserbeforekeydown", handler);
+
+  var iframe = document.createElement("iframe");
+  iframe.id = "embedded";
+  iframe.src = "bug1096146_embedded.html";
+  iframe.setAttribute("remote", "false");
+  SpecialPowers.wrap(iframe).mozbrowser = true;
+
+  iframe.addEventListener("mozbrowserloadend", function onloadend() {
+    iframe.removeEventListener("mozbrowserloadend", onloadend);
+    iframe.focus();
+    var mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
+    mm.addMessageListener("forwardevent", function(msg) {
+      var value = 0;
+      switch(msg.json.type) {
+        case "scroll":
+          value = kScrollEvent;
+          break;
+        case "keydown":
+          value = kKeydownEvent;
+          break;
+        default:
+          ok(false, "unexpected event");
+      }
+
+      kTests[gCurrentTest].resultEvents =
+        kTests[gCurrentTest].resultEvents | value;
+    });
+    mm.loadFrameScript("data:,(" + frameScript.toString() + ")();", false);
+    runTests();
+    return;
+  });
+
+  document.body.appendChild(iframe);
+}
+
+function preventDefaultHandler(evt)
+{
+  ok(true, "receive " + evt.type + " and do preventDefault.");
+  evt.preventDefault();
+}
+
+function noPreventDefaultHandler(evt)
+{
+  ok(true, "receive " + evt.type + ".");
+}
+
+function teardownHandler()
+{
+  var handler;
+  if (kTests[gCurrentTest].doPreventDefault) {
+    handler = preventDefaultHandler;
+  } else {
+    handler = noPreventDefaultHandler;
+  }
+  window.removeEventListener("mozbrowserbeforekeydown", handler);
+
+  runTests();
+}
+
+var tests = [
+  function addPermissions() {
+    SpecialPowers.pushPermissions(
+      [{ type: "before-after-keyboard-event", allow: true, context: document },
+       { type: "browser", allow: true, context: document }],
+      runTests);
+  },
+  function addPreferences() {
+    SpecialPowers.pushPrefEnv(
+      { "set": [["dom.beforeAfterKeyboardEvent.enabled", true],
+                ["dom.mozBrowserFramesEnabled", true],
+                ["dom.ipc.tabs.disabled", false]] },
+      runTests);
+  },
+
+  prepareTest,
+  testDefaultAction,
+  teardownHandler,
+
+  function() {
+    gCurrentTest++;
+    runTests();
+  },
+  prepareTest,
+  testDefaultAction,
+  teardownHandler
+];
+
+function runTests()
+{
+  if (!tests.length) {
+    SimpleTest.finish();
+    return;
+  }
+
+  var test = tests.shift();
+  test();
+}
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/TextComposition.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/TextComposition.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/TextComposition.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/TextComposition.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -62,31 +62,54 @@
 }
 
 bool
+TextComposition::IsValidStateForComposition(nsIWidget* aWidget) const
+{
+  return !Destroyed() && aWidget && !aWidget->Destroyed() &&
+         mPresContext->GetPresShell() &&
+         !mPresContext->GetPresShell()->IsDestroying();
+}
+
+bool
 TextComposition::MaybeDispatchCompositionUpdate(
                    const WidgetCompositionEvent* aCompositionEvent)
 {
-  if (Destroyed()) {
+  if (!IsValidStateForComposition(aCompositionEvent->widget)) {
     return false;
   }
 
   if (mLastData == aCompositionEvent->mData) {
     return true;
   }
+  CloneAndDispatchAs(aCompositionEvent, NS_COMPOSITION_UPDATE);
+  return IsValidStateForComposition(aCompositionEvent->widget);
+}
 
-  WidgetCompositionEvent compositionUpdate(aCompositionEvent->mFlags.mIsTrusted,
-                                           NS_COMPOSITION_UPDATE,
-                                           aCompositionEvent->widget);
-  compositionUpdate.time = aCompositionEvent->time;
-  compositionUpdate.timeStamp = aCompositionEvent->timeStamp;
-  compositionUpdate.mData = aCompositionEvent->mData;
-  compositionUpdate.mFlags.mIsSynthesizedForTests =
+BaseEventFlags
+TextComposition::CloneAndDispatchAs(
+                   const WidgetCompositionEvent* aCompositionEvent,
+                   uint32_t aMessage,
+                   nsEventStatus* aStatus,
+                   EventDispatchingCallback* aCallBack)
+{
+  MOZ_ASSERT(IsValidStateForComposition(aCompositionEvent->widget),
+             "Should be called only when it's safe to dispatch an event");
+
+  WidgetCompositionEvent compositionEvent(aCompositionEvent->mFlags.mIsTrusted,
+                                          aMessage, aCompositionEvent->widget);
+  compositionEvent.time = aCompositionEvent->time;
+  compositionEvent.timeStamp = aCompositionEvent->timeStamp;
+  compositionEvent.mData = aCompositionEvent->mData;
+  compositionEvent.mFlags.mIsSynthesizedForTests =
     aCompositionEvent->mFlags.mIsSynthesizedForTests;
 
-  nsEventStatus status = nsEventStatus_eConsumeNoDefault;
-  mLastData = compositionUpdate.mData;
+  nsEventStatus dummyStatus = nsEventStatus_eConsumeNoDefault;
+  nsEventStatus* status = aStatus ? aStatus : &dummyStatus;
+  if (aMessage == NS_COMPOSITION_UPDATE) {
+    mLastData = compositionEvent.mData;
+  }
   EventDispatcher::Dispatch(mNode, mPresContext,
-                            &compositionUpdate, nullptr, &status, nullptr);
-  return !Destroyed();
+                            &compositionEvent, nullptr, status, aCallBack);
+  return compositionEvent.mFlags;
 }
 
 void
@@ -103,7 +126,7 @@
   //     runnable event?  However, even if we do so, it might make native IME
   //     confused due to async modification.  Especially when native IME is
   //     TSF.
-  if (aCompositionEvent->message != NS_COMPOSITION_END) {
+  if (!aCompositionEvent->CausesDOMCompositionEndEvent()) {
     return;
   }
 
@@ -117,7 +140,27 @@
                    EventDispatchingCallback* aCallBack,
                    bool aIsSynthesized)
 {
-  if (Destroyed()) {
+  if (aCompositionEvent->message == NS_COMPOSITION_COMMIT_AS_IS) {
+    NS_ASSERTION(!aCompositionEvent->mRanges,
+                 "mRanges of NS_COMPOSITION_COMMIT_AS_IS should be null");
+    aCompositionEvent->mRanges = nullptr;
+    NS_ASSERTION(aCompositionEvent->mData.IsEmpty(),
+                 "mData of NS_COMPOSITION_COMMIT_AS_IS should be empty string");
+    if (mLastData == IDEOGRAPHIC_SPACE) {
+      // If the last data is an ideographic space (FullWidth space), it must be
+      // a placeholder character of some Chinese IME.  So, committing with
+      // this data must not be expected by users.  Let's use empty string.
+      aCompositionEvent->mData.Truncate();
+    } else {
+      aCompositionEvent->mData = mLastData;
+    }
+  } else if (aCompositionEvent->message == NS_COMPOSITION_COMMIT) {
+    NS_ASSERTION(!aCompositionEvent->mRanges,
+                 "mRanges of NS_COMPOSITION_COMMIT should be null");
+    aCompositionEvent->mRanges = nullptr;
+  }
+
+  if (!IsValidStateForComposition(aCompositionEvent->widget)) {
     *aStatus = nsEventStatus_eConsumeNoDefault;
     return;
   }
@@ -149,6 +192,8 @@
     switch (aCompositionEvent->message) {
       case NS_COMPOSITION_END:
       case NS_COMPOSITION_CHANGE:
+      case NS_COMPOSITION_COMMIT_AS_IS:
+      case NS_COMPOSITION_COMMIT:
         committingData = &aCompositionEvent->mData;
         break;
       default:
@@ -166,32 +211,62 @@
     }
   }
 
-  if (aCompositionEvent->message == NS_COMPOSITION_CHANGE) {
+  bool dispatchEvent = true;
+  bool dispatchDOMTextEvent = aCompositionEvent->CausesDOMTextEvent();
+
+  // When mIsComposing is false but the committing string is different from
+  // the last data (E.g., previous NS_COMPOSITION_CHANGE event made the
+  // composition string empty or didn't have clause information), we don't
+  // need to dispatch redundant DOM text event.
+  if (dispatchDOMTextEvent &&
+      aCompositionEvent->message != NS_COMPOSITION_CHANGE &&
+      !mIsComposing && mLastData == aCompositionEvent->mData) {
+    dispatchEvent = dispatchDOMTextEvent = false;
+  }
+
+  if (dispatchDOMTextEvent) {
     if (!MaybeDispatchCompositionUpdate(aCompositionEvent)) {
       return;
     }
   }
 
-  EventDispatcher::Dispatch(mNode, mPresContext,
-                            aCompositionEvent, nullptr, aStatus, aCallBack);
+  if (dispatchEvent) {
+    // If the composition event should cause a DOM text event, we should
+    // overwrite the event message as NS_COMPOSITION_CHANGE because due to
+    // the limitation of mapping between event messages and DOM event types,
+    // we cannot map multiple event messages to a DOM event type.
+    if (dispatchDOMTextEvent &&
+        aCompositionEvent->message != NS_COMPOSITION_CHANGE) {
+      aCompositionEvent->mFlags =
+        CloneAndDispatchAs(aCompositionEvent, NS_COMPOSITION_CHANGE,
+                           aStatus, aCallBack);
+    } else {
+      EventDispatcher::Dispatch(mNode, mPresContext,
+                                aCompositionEvent, nullptr, aStatus, aCallBack);
+    }
+  } else {
+    *aStatus = nsEventStatus_eConsumeNoDefault;
+  }
 
-  if (NS_WARN_IF(Destroyed())) {
+  if (!IsValidStateForComposition(aCompositionEvent->widget)) {
     return;
   }
 
   // Emulate editor behavior of compositionchange event (DOM text event) handler
   // if no editor handles composition events.
-  if (aCompositionEvent->message == NS_COMPOSITION_CHANGE && !HasEditor()) {
+  if (dispatchDOMTextEvent && !HasEditor()) {
     EditorWillHandleCompositionChangeEvent(aCompositionEvent);
     EditorDidHandleCompositionChangeEvent();
   }
 
-#ifdef DEBUG
-  else if (aCompositionEvent->message == NS_COMPOSITION_END) {
+  if (aCompositionEvent->CausesDOMCompositionEndEvent()) {
+    // Dispatch a compositionend event if it's necessary.
+    if (aCompositionEvent->message != NS_COMPOSITION_END) {
+      CloneAndDispatchAs(aCompositionEvent, NS_COMPOSITION_END);
+    }
     MOZ_ASSERT(!mIsComposing, "Why is the editor still composing?");
     MOZ_ASSERT(!HasEditor(), "Why does the editor still keep to hold this?");
   }
-#endif // #ifdef DEBUG
 
   // Notify composition update to widget if possible
   NotityUpdateComposition(aCompositionEvent);
@@ -221,7 +296,7 @@
       mCompositionStartOffset = 0;
     }
     mCompositionTargetOffset = mCompositionStartOffset;
-  } else if (aCompositionEvent->message == NS_COMPOSITION_CHANGE) {
+  } else if (aCompositionEvent->CausesDOMTextEvent()) {
     mCompositionTargetOffset =
       mCompositionStartOffset + aCompositionEvent->TargetClauseOffset();
   } else {
@@ -284,30 +359,16 @@
       //      dispatch the event.
       nsCOMPtr<nsIWidget> widget(aWidget);
       nsAutoString commitData(aDiscard ? EmptyString() : lastData);
-      bool changingData = lastData != commitData;
-
-      WidgetCompositionEvent changeEvent(true, NS_COMPOSITION_CHANGE, widget);
-      changeEvent.mData = commitData;
-      changeEvent.mFlags.mIsSynthesizedForTests = true;
-
-      MaybeDispatchCompositionUpdate(&changeEvent);
-
-      // If changing the data or committing string isn't empty, we need to
-      // dispatch compositionchange event for setting the composition string
-      // without IME selection.
-      if (!Destroyed() && !widget->Destroyed() &&
-          (changingData || !commitData.IsEmpty())) {
-        nsEventStatus status = nsEventStatus_eIgnore;
-        widget->DispatchEvent(&changeEvent, status);
-      }
-
-      if (!Destroyed() && !widget->Destroyed()) {
-        nsEventStatus status = nsEventStatus_eIgnore;
-        WidgetCompositionEvent endEvent(true, NS_COMPOSITION_END, widget);
-        endEvent.mData = commitData;
-        endEvent.mFlags.mIsSynthesizedForTests = true;
-        widget->DispatchEvent(&endEvent, status);
+      bool isChanging = commitData != mLastData;
+      uint32_t message =
+        isChanging ? NS_COMPOSITION_COMMIT : NS_COMPOSITION_COMMIT_AS_IS;
+      WidgetCompositionEvent commitEvent(true, message, widget);
+      if (commitEvent.message == NS_COMPOSITION_COMMIT) {
+        commitEvent.mData = commitData;
       }
+      commitEvent.mFlags.mIsSynthesizedForTests = true;
+      nsEventStatus status = nsEventStatus_eIgnore;
+      widget->DispatchEvent(&commitEvent, status);
     }
   }
 
@@ -320,15 +381,12 @@
 
   // Otherwise, synthesize the commit in content.
   nsAutoString data(aDiscard ? EmptyString() : lastData);
-  // If the last composition string and new data are different, we need to
-  // dispatch compositionchange event for removing IME selection.  However, if
-  // the commit string is empty string and it's not changed from the last data,
-  // we don't need to dispatch compositionchange event.
-  if (lastData != data || !data.IsEmpty()) {
-    DispatchCompositionEventRunnable(NS_COMPOSITION_CHANGE, data, true);
+  if (data == mLastData) {
+    DispatchCompositionEventRunnable(NS_COMPOSITION_COMMIT_AS_IS, EmptyString(),
+                                     true);
+  } else {
+    DispatchCompositionEventRunnable(NS_COMPOSITION_COMMIT, data, true);
   }
-  DispatchCompositionEventRunnable(NS_COMPOSITION_END, data, true);
-
   return NS_OK;
 }
 
@@ -411,22 +469,17 @@
 NS_IMETHODIMP
 TextComposition::CompositionEventDispatcher::Run()
 {
-  nsRefPtr<nsPresContext> presContext = mTextComposition->mPresContext;
-  if (!presContext || !presContext->GetPresShell() ||
-      presContext->GetPresShell()->IsDestroying()) {
-    return NS_OK; // cannot dispatch any events anymore
-  }
-
   // The widget can be different from the widget which has dispatched
   // composition events because GetWidget() returns a widget which is proper
   // for calling NotifyIME().  However, this must no be problem since both
   // widget should share native IME context.  Therefore, even if an event
   // handler uses the widget for requesting IME to commit or cancel, it works.
   nsCOMPtr<nsIWidget> widget(mTextComposition->GetWidget());
-  if (NS_WARN_IF(!widget)) {
+  if (!mTextComposition->IsValidStateForComposition(widget)) {
     return NS_OK; // cannot dispatch any events anymore
   }
 
+  nsRefPtr<nsPresContext> presContext = mTextComposition->mPresContext;
   nsEventStatus status = nsEventStatus_eIgnore;
   switch (mEventMessage) {
     case NS_COMPOSITION_START: {
@@ -444,10 +497,13 @@
                                                 mIsSynthesizedEvent);
       break;
     }
-    case NS_COMPOSITION_END:
-    case NS_COMPOSITION_CHANGE: {
+    case NS_COMPOSITION_CHANGE:
+    case NS_COMPOSITION_COMMIT_AS_IS:
+    case NS_COMPOSITION_COMMIT: {
       WidgetCompositionEvent compEvent(true, mEventMessage, widget);
-      compEvent.mData = mData;
+      if (mEventMessage != NS_COMPOSITION_COMMIT_AS_IS) {
+        compEvent.mData = mData;
+      }
       compEvent.mFlags.mIsSynthesizedForTests =
         mTextComposition->IsSynthesizedForTests();
       IMEStateManager::DispatchCompositionEvent(mEventTarget, presContext,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/TextComposition.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/TextComposition.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/TextComposition.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/TextComposition.h	2014-11-26 21:45:58.000000000 +0000
@@ -250,6 +250,14 @@
   void EditorDidHandleCompositionChangeEvent();
 
   /**
+   * IsValidStateForComposition() returns true if it's safe to dispatch an event
+   * to the DOM tree.  Otherwise, false.
+   * WARNING: This doesn't check script blocker state.  It should be checked
+   *          before dispatching the first event.
+   */
+  bool IsValidStateForComposition(nsIWidget* aWidget) const;
+
+  /**
    * DispatchCompositionEvent() dispatches the aCompositionEvent to the mContent
    * synchronously. The caller must ensure that it's safe to dispatch the event.
    */
@@ -268,6 +276,18 @@
          const WidgetCompositionEvent* aCompositionEvent);
 
   /**
+   * CloneAndDispatchAs() dispatches a composition event which is
+   * duplicateed from aCompositionEvent and set the aMessage.
+   *
+   * @return Returns BaseEventFlags which is the result of dispatched event.
+   */
+  BaseEventFlags CloneAndDispatchAs(
+                   const WidgetCompositionEvent* aCompositionEvent,
+                   uint32_t aMessage,
+                   nsEventStatus* aStatus = nullptr,
+                   EventDispatchingCallback* aCallBack = nullptr);
+
+  /**
    * If IME has already dispatched compositionend event but it was discarded
    * by PresShell due to not safe to dispatch, this returns true.
    */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/UIEvent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/UIEvent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/events/UIEvent.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/events/UIEvent.h	2014-11-26 21:45:58.000000000 +0000
@@ -60,7 +60,7 @@
     LayoutDeviceIntPoint offset = aEvent->refPoint +
       LayoutDeviceIntPoint::FromUntyped(event->widget->WidgetToScreenOffset());
     nscoord factor =
-      aPresContext->DeviceContext()->UnscaledAppUnitsPerDevPixel();
+      aPresContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
     return nsIntPoint(nsPresContext::AppUnitsToIntCSSPixels(offset.x * factor),
                       nsPresContext::AppUnitsToIntCSSPixels(offset.y * factor));
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Fetch.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Fetch.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Fetch.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Fetch.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -112,7 +112,7 @@
 };
 
 already_AddRefed<Promise>
-FetchRequest(nsIGlobalObject* aGlobal, const RequestOrScalarValueString& aInput,
+FetchRequest(nsIGlobalObject* aGlobal, const RequestOrUSVString& aInput,
              const RequestInit& aInit, ErrorResult& aRv)
 {
   nsRefPtr<Promise> p = Promise::Create(aGlobal, aRv);
@@ -316,7 +316,7 @@
 }
 
 nsresult
-ExtractFromScalarValueString(const nsString& aStr,
+ExtractFromUSVString(const nsString& aStr,
                              nsIInputStream** aStream,
                              nsCString& aContentType)
 {
@@ -365,7 +365,7 @@
 }
 
 nsresult
-ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
+ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
                           nsIInputStream** aStream,
                           nsCString& aContentType)
 {
@@ -380,10 +380,10 @@
   } else if (aBodyInit.IsBlob()) {
     const File& blob = aBodyInit.GetAsBlob();
     return ExtractFromBlob(blob, aStream, aContentType);
-  } else if (aBodyInit.IsScalarValueString()) {
+  } else if (aBodyInit.IsUSVString()) {
     nsAutoString str;
-    str.Assign(aBodyInit.GetAsScalarValueString());
-    return ExtractFromScalarValueString(str, aStream, aContentType);
+    str.Assign(aBodyInit.GetAsUSVString());
+    return ExtractFromUSVString(str, aStream, aContentType);
   } else if (aBodyInit.IsURLSearchParams()) {
     URLSearchParams& params = aBodyInit.GetAsURLSearchParams();
     return ExtractFromURLSearchParams(params, aStream, aContentType);
@@ -394,7 +394,7 @@
 }
 
 nsresult
-ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
+ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
                           nsIInputStream** aStream,
                           nsCString& aContentType)
 {
@@ -409,10 +409,10 @@
   } else if (aBodyInit.IsBlob()) {
     const File& blob = aBodyInit.GetAsBlob();
     return ExtractFromBlob(blob, aStream, aContentType);
-  } else if (aBodyInit.IsScalarValueString()) {
+  } else if (aBodyInit.IsUSVString()) {
     nsAutoString str;
-    str.Assign(aBodyInit.GetAsScalarValueString());
-    return ExtractFromScalarValueString(str, aStream, aContentType);
+    str.Assign(aBodyInit.GetAsUSVString());
+    return ExtractFromUSVString(str, aStream, aContentType);
   } else if (aBodyInit.IsURLSearchParams()) {
     URLSearchParams& params = aBodyInit.GetAsURLSearchParams();
     return ExtractFromURLSearchParams(params, aStream, aContentType);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Fetch.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Fetch.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Fetch.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Fetch.h	2014-11-26 21:45:58.000000000 +0000
@@ -18,18 +18,18 @@
 namespace mozilla {
 namespace dom {
 
-class ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams;
+class ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams;
 class InternalRequest;
-class OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams;
+class OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams;
 class Promise;
-class RequestOrScalarValueString;
+class RequestOrUSVString;
 
 namespace workers {
 class WorkerPrivate;
 } // namespace workers
 
 already_AddRefed<Promise>
-FetchRequest(nsIGlobalObject* aGlobal, const RequestOrScalarValueString& aInput,
+FetchRequest(nsIGlobalObject* aGlobal, const RequestOrUSVString& aInput,
              const RequestInit& aInit, ErrorResult& aRv);
 
 nsresult
@@ -41,7 +41,7 @@
  * Stores content type in out param aContentType.
  */
 nsresult
-ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
+ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
                           nsIInputStream** aStream,
                           nsCString& aContentType);
 
@@ -49,7 +49,7 @@
  * Non-owning version.
  */
 nsresult
-ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
+ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
                           nsIInputStream** aStream,
                           nsCString& aContentType);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Request.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Request.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Request.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Request.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -49,7 +49,7 @@
 
 /*static*/ already_AddRefed<Request>
 Request::Constructor(const GlobalObject& aGlobal,
-                     const RequestOrScalarValueString& aInput,
+                     const RequestOrUSVString& aInput,
                      const RequestInit& aInit, ErrorResult& aRv)
 {
   nsRefPtr<InternalRequest> request;
@@ -76,9 +76,9 @@
 
   RequestMode fallbackMode = RequestMode::EndGuard_;
   RequestCredentials fallbackCredentials = RequestCredentials::EndGuard_;
-  if (aInput.IsScalarValueString()) {
+  if (aInput.IsUSVString()) {
     nsString input;
-    input.Assign(aInput.GetAsScalarValueString());
+    input.Assign(aInput.GetAsUSVString());
 
     nsString requestURL;
     if (NS_IsMainThread()) {
@@ -191,7 +191,7 @@
   }
 
   if (aInit.mBody.WasPassed()) {
-    const OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& bodyInit = aInit.mBody.Value();
+    const OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& bodyInit = aInit.mBody.Value();
     nsCOMPtr<nsIInputStream> stream;
     nsCString contentType;
     aRv = ExtractByteStreamFromBody(bodyInit,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Request.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Request.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Request.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Request.h	2014-11-26 21:45:58.000000000 +0000
@@ -23,7 +23,7 @@
 class Headers;
 class InternalHeaders;
 class Promise;
-class RequestOrScalarValueString;
+class RequestOrUSVString;
 
 class Request MOZ_FINAL : public nsISupports
                         , public nsWrapperCache
@@ -89,7 +89,7 @@
   GetBody(nsIInputStream** aStream) { return mRequest->GetBody(aStream); }
 
   static already_AddRefed<Request>
-  Constructor(const GlobalObject& aGlobal, const RequestOrScalarValueString& aInput,
+  Constructor(const GlobalObject& aGlobal, const RequestOrUSVString& aInput,
               const RequestInit& aInit, ErrorResult& rv);
 
   nsIGlobalObject* GetParentObject() const
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Response.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Response.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Response.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Response.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -56,14 +56,14 @@
 {
   ErrorResult result;
   ResponseInit init;
-  Optional<ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams> body;
+  Optional<ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams> body;
   nsRefPtr<Response> r = Response::Constructor(aGlobal, body, init, result);
   return r.forget();
 }
 
 /*static*/ already_AddRefed<Response>
 Response::Constructor(const GlobalObject& aGlobal,
-                      const Optional<ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams>& aBody,
+                      const Optional<ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams>& aBody,
                       const ResponseInit& aInit, ErrorResult& aRv)
 {
   if (aInit.mStatus < 200 || aInit.mStatus > 599) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Response.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Response.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fetch/Response.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fetch/Response.h	2014-11-26 21:45:58.000000000 +0000
@@ -19,7 +19,7 @@
 namespace mozilla {
 namespace dom {
 
-class ArrayBufferOrArrayBufferViewOrScalarValueStringOrURLSearchParams;
+class ArrayBufferOrArrayBufferViewOrUSVStringOrURLSearchParams;
 class Headers;
 class InternalHeaders;
 class Promise;
@@ -87,7 +87,7 @@
 
   static already_AddRefed<Response>
   Constructor(const GlobalObject& aGlobal,
-              const Optional<ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams>& aBody,
+              const Optional<ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams>& aBody,
               const ResponseInit& aInit, ErrorResult& rv);
 
   nsIGlobalObject* GetParentObject() const
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fmradio/FMRadioService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fmradio/FMRadioService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/fmradio/FMRadioService.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/fmradio/FMRadioService.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIAudioManager.h"
 #include "AudioManager.h"
 #include "nsDOMClassInfo.h"
+#include "mozilla/LazyIdleThread.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/FMRadioChild.h"
 #include "mozilla/dom/ScriptSettings.h"
@@ -19,6 +20,8 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/SettingChangeNotificationBinding.h"
 
+#define TUNE_THREAD_TIMEOUT_MS  5000
+
 #define BAND_87500_108000_kHz 1
 #define BAND_76000_108000_kHz 2
 #define BAND_76000_90000_kHz  3
@@ -161,9 +164,10 @@
 
     FMRadioService* fmRadioService = FMRadioService::Singleton();
     if (!fmRadioService->mTuneThread) {
-      // SeekRunnable and SetFrequencyRunnable run on this thread.
-      // These call ioctls that can stall the main thread, so we run them here.
-      NS_NewNamedThread("FM Tuning", getter_AddRefs(fmRadioService->mTuneThread));
+      // SeekRunnable and SetFrequencyRunnable run on this thread. These
+      // call ioctls that can stall the main thread, so we run them here.
+      fmRadioService->mTuneThread = new LazyIdleThread(
+        TUNE_THREAD_TIMEOUT_MS, NS_LITERAL_CSTRING("FM Tuning"));
     }
 
     return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLCanvasElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLCanvasElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLCanvasElement.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLCanvasElement.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -34,6 +34,7 @@
 #include "nsNetUtil.h"
 #include "nsStreamUtils.h"
 #include "ActiveLayerTracker.h"
+#include "WebGL1Context.h"
 #include "WebGL2Context.h"
 
 using namespace mozilla::layers;
@@ -648,71 +649,71 @@
   return NS_OK;
 }
 
-nsresult
-HTMLCanvasElement::GetContextHelper(const nsAString& aContextId,
-                                    nsICanvasRenderingContextInternal **aContext)
+static bool
+GetCanvasContextType(const nsAString& str, CanvasContextType* const out_type)
 {
-  NS_ENSURE_ARG(aContext);
-
-  if (aContextId.EqualsLiteral("2d")) {
-    Telemetry::Accumulate(Telemetry::CANVAS_2D_USED, 1);
-    nsRefPtr<CanvasRenderingContext2D> ctx =
-      new CanvasRenderingContext2D();
+  if (str.EqualsLiteral("2d")) {
+    *out_type = CanvasContextType::Canvas2D;
+    return true;
+  }
 
-    ctx->SetCanvasElement(this);
-    ctx.forget(aContext);
-    return NS_OK;
+  if (str.EqualsLiteral("experimental-webgl")) {
+    *out_type = CanvasContextType::WebGL1;
+    return true;
   }
 
-  if (WebGL2Context::IsSupported() &&
-      aContextId.EqualsLiteral("experimental-webgl2"))
-  {
-    Telemetry::Accumulate(Telemetry::CANVAS_WEBGL_USED, 1);
-    nsRefPtr<WebGL2Context> ctx = WebGL2Context::Create();
+#ifdef MOZ_WEBGL_CONFORMANT
+  if (str.EqualsLiteral("webgl")) {
+    /* WebGL 1.0, $2.1 "Context Creation":
+     *   If the user agent supports both the webgl and experimental-webgl
+     *   canvas context types, they shall be treated as aliases.
+     */
+    *out_type = CanvasContextType::WebGL1;
+    return true;
+  }
+#endif
 
-    if (ctx == nullptr) {
-      return NS_ERROR_NOT_IMPLEMENTED;
+  if (WebGL2Context::IsSupported()) {
+    if (str.EqualsLiteral("experimental-webgl2")) {
+      *out_type = CanvasContextType::WebGL2;
+      return true;
     }
-
-    ctx->SetCanvasElement(this);
-    ctx.forget(aContext);
-    return NS_OK;
   }
 
-  NS_ConvertUTF16toUTF8 ctxId(aContextId);
+  return false;
+}
 
-  // check that ctxId is clamped to A-Za-z0-9_-
-  for (uint32_t i = 0; i < ctxId.Length(); i++) {
-    if ((ctxId[i] < 'A' || ctxId[i] > 'Z') &&
-        (ctxId[i] < 'a' || ctxId[i] > 'z') &&
-        (ctxId[i] < '0' || ctxId[i] > '9') &&
-        (ctxId[i] != '-') &&
-        (ctxId[i] != '_'))
-    {
-      // XXX ERRMSG we need to report an error to developers here! (bug 329026)
-      return NS_OK;
-    }
-  }
+static already_AddRefed<nsICanvasRenderingContextInternal>
+CreateContextForCanvas(CanvasContextType contextType, HTMLCanvasElement* canvas)
+{
+  nsRefPtr<nsICanvasRenderingContextInternal> ret;
+
+  switch (contextType) {
+  case CanvasContextType::Canvas2D:
+    Telemetry::Accumulate(Telemetry::CANVAS_2D_USED, 1);
+    ret = new CanvasRenderingContext2D();
+    break;
 
-  nsCString ctxString("@mozilla.org/content/canvas-rendering-context;1?id=");
-  ctxString.Append(ctxId);
+  case CanvasContextType::WebGL1:
+    Telemetry::Accumulate(Telemetry::CANVAS_WEBGL_USED, 1);
 
-  nsresult rv;
-  nsCOMPtr<nsICanvasRenderingContextInternal> ctx =
-    do_CreateInstance(ctxString.get(), &rv);
-  if (rv == NS_ERROR_OUT_OF_MEMORY) {
-    *aContext = nullptr;
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  if (NS_FAILED(rv)) {
-    *aContext = nullptr;
-    // XXX ERRMSG we need to report an error to developers here! (bug 329026)
-    return NS_OK;
+    ret = WebGL1Context::Create();
+    if (!ret)
+      return nullptr;
+    break;
+
+  case CanvasContextType::WebGL2:
+    Telemetry::Accumulate(Telemetry::CANVAS_WEBGL_USED, 1);
+
+    ret = WebGL2Context::Create();
+    if (!ret)
+      return nullptr;
+    break;
   }
+  MOZ_ASSERT(ret);
 
-  ctx->SetCanvasElement(this);
-  ctx.forget(aContext);
-  return NS_OK;
+  ret->SetCanvasElement(canvas);
+  return ret.forget();
 }
 
 nsresult
@@ -720,65 +721,49 @@
                               nsISupports** aContext)
 {
   ErrorResult rv;
-  *aContext =
-    GetContext(nullptr, aContextId, JS::NullHandleValue, rv).take();
+  *aContext = GetContext(nullptr, aContextId, JS::NullHandleValue, rv).take();
   return rv.ErrorCode();
 }
 
-static bool
-IsContextIdWebGL(const nsAString& str)
-{
-  return str.EqualsLiteral("webgl") ||
-         str.EqualsLiteral("experimental-webgl");
-}
-
 already_AddRefed<nsISupports>
 HTMLCanvasElement::GetContext(JSContext* aCx,
                               const nsAString& aContextId,
                               JS::Handle<JS::Value> aContextOptions,
                               ErrorResult& rv)
 {
-  if (mCurrentContextId.IsEmpty()) {
-    rv = GetContextHelper(aContextId, getter_AddRefs(mCurrentContext));
-    if (rv.Failed() || !mCurrentContext) {
+  CanvasContextType contextType;
+  if (!GetCanvasContextType(aContextId, &contextType))
+    return nullptr;
+
+  if (!mCurrentContext) {
+    // This canvas doesn't have a context yet.
+
+    nsRefPtr<nsICanvasRenderingContextInternal> context;
+    context = CreateContextForCanvas(contextType, this);
+    if (!context)
       return nullptr;
-    }
 
     // Ensure that the context participates in CC.  Note that returning a
     // CC participant from QI doesn't addref.
-    nsXPCOMCycleCollectionParticipant *cp = nullptr;
-    CallQueryInterface(mCurrentContext, &cp);
+    nsXPCOMCycleCollectionParticipant* cp = nullptr;
+    CallQueryInterface(context, &cp);
     if (!cp) {
-      mCurrentContext = nullptr;
       rv.Throw(NS_ERROR_FAILURE);
       return nullptr;
     }
 
+    mCurrentContext = context.forget();
+    mCurrentContextType = contextType;
+
     rv = UpdateContext(aCx, aContextOptions);
     if (rv.Failed()) {
       rv = NS_OK; // See bug 645792
       return nullptr;
     }
-    mCurrentContextId.Assign(aContextId);
-  }
-
-  if (!mCurrentContextId.Equals(aContextId)) {
-    if (IsContextIdWebGL(aContextId) &&
-        IsContextIdWebGL(mCurrentContextId))
-    {
-      // Warn when we get a request for a webgl context with an id that differs
-      // from the id it was created with.
-      nsCString creationId = NS_LossyConvertUTF16toASCII(mCurrentContextId);
-      nsCString requestId = NS_LossyConvertUTF16toASCII(aContextId);
-      JS_ReportWarning(aCx, "WebGL: Retrieving a WebGL context from a canvas "
-                            "via a request id ('%s') different from the id used "
-                            "to create the context ('%s') is not allowed.",
-                            requestId.get(),
-                            creationId.get());
-    }
-    
-    //XXX eventually allow for more than one active context on a given canvas
-    return nullptr;
+  } else {
+    // We already have a context of some type.
+    if (contextType != mCurrentContextType)
+      return nullptr;
   }
 
   nsCOMPtr<nsICanvasRenderingContextInternal> context = mCurrentContext;
@@ -798,22 +783,28 @@
   if (!aContextId.EqualsLiteral("2d"))
     return NS_ERROR_INVALID_ARG;
 
-  if (mCurrentContextId.IsEmpty()) {
-    nsresult rv = GetContextHelper(aContextId, getter_AddRefs(mCurrentContext));
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!mCurrentContext) {
+  CanvasContextType contextType = CanvasContextType::Canvas2D;
+
+  if (!mCurrentContext) {
+    // This canvas doesn't have a context yet.
+
+    nsRefPtr<nsICanvasRenderingContextInternal> context;
+    context = CreateContextForCanvas(contextType, this);
+    if (!context) {
+      *aContext = nullptr;
       return NS_OK;
     }
 
+    mCurrentContext = context;
     mCurrentContext->SetIsIPC(true);
+    mCurrentContextType = contextType;
 
-    rv = UpdateContext(nullptr, JS::NullHandleValue);
+    nsresult rv = UpdateContext(nullptr, JS::NullHandleValue);
     NS_ENSURE_SUCCESS(rv, rv);
-
-    mCurrentContextId.Assign(aContextId);
-  } else if (!mCurrentContextId.Equals(aContextId)) {
-    //XXX eventually allow for more than one active context on a given canvas
-    return NS_ERROR_INVALID_ARG;
+  } else {
+    // We already have a context of some type.
+    if (contextType != mCurrentContextType)
+      return NS_ERROR_INVALID_ARG;
   }
 
   NS_ADDREF (*aContext = mCurrentContext);
@@ -831,21 +822,18 @@
   nsresult rv = mCurrentContext->SetIsOpaque(HasAttr(kNameSpaceID_None, nsGkAtoms::moz_opaque));
   if (NS_FAILED(rv)) {
     mCurrentContext = nullptr;
-    mCurrentContextId.Truncate();
     return rv;
   }
 
   rv = mCurrentContext->SetContextOptions(aCx, aNewContextOptions);
   if (NS_FAILED(rv)) {
     mCurrentContext = nullptr;
-    mCurrentContextId.Truncate();
     return rv;
   }
 
   rv = mCurrentContext->SetDimensions(sz.width, sz.height);
   if (NS_FAILED(rv)) {
     mCurrentContext = nullptr;
-    mCurrentContextId.Truncate();
     return rv;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLCanvasElement.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLCanvasElement.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLCanvasElement.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLCanvasElement.h	2014-11-26 21:45:58.000000000 +0000
@@ -7,6 +7,7 @@
 #define mozilla_dom_HTMLCanvasElement_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/TypedEnum.h"
 #include "nsIDOMHTMLCanvasElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
@@ -35,6 +36,12 @@
 class HTMLCanvasPrintState;
 class PrintCallback;
 
+MOZ_BEGIN_ENUM_CLASS(CanvasContextType, uint8_t)
+  Canvas2D,
+  WebGL1,
+  WebGL2
+MOZ_END_ENUM_CLASS(CanvasContextType)
+
 class HTMLCanvasElement MOZ_FINAL : public nsGenericHTMLElement,
                                     public nsIDOMHTMLCanvasElement
 {
@@ -229,11 +236,9 @@
   nsresult MozGetAsFileImpl(const nsAString& aName,
                             const nsAString& aType,
                             nsIDOMFile** aResult);
-  nsresult GetContextHelper(const nsAString& aContextId,
-                            nsICanvasRenderingContextInternal **aContext);
   void CallPrintCallback();
 
-  nsString mCurrentContextId;
+  CanvasContextType mCurrentContextType;
   nsRefPtr<HTMLCanvasElement> mOriginalCanvas;
   nsRefPtr<PrintCallback> mPrintCallback;
   nsCOMPtr<nsICanvasRenderingContextInternal> mCurrentContext;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLFormElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLFormElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLFormElement.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLFormElement.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -61,6 +61,8 @@
 #include "nsIDOMHTMLButtonElement.h"
 #include "nsSandboxFlags.h"
 
+#include "nsIContentSecurityPolicy.h"
+
 // images
 #include "mozilla/dom/HTMLImageElement.h"
 
@@ -1625,6 +1627,19 @@
                               nsIScriptSecurityManager::STANDARD);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // Check if CSP allows this form-action
+  nsCOMPtr<nsIContentSecurityPolicy> csp;
+  rv = NodePrincipal()->GetCsp(getter_AddRefs(csp));
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (csp) {
+    bool permitsFormAction = true;
+    rv = csp->PermitsFormAction(actionURL, &permitsFormAction);
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (!permitsFormAction) {
+      rv = NS_ERROR_CSP_FORM_ACTION_VIOLATION;
+    }
+  }
+
   //
   // Assign to the output
   //
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLInputElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLInputElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLInputElement.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLInputElement.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -1032,11 +1032,12 @@
   nsCOMPtr<nsIContentPrefCallback2> prefCallback = 
     new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback);
 
+#ifdef MOZ_B2G
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    // FIXME (bug 949666): Run this code in the parent process.
     prefCallback->HandleCompletion(nsIContentPrefCallback2::COMPLETE_ERROR);
     return NS_OK;
   }
+#endif
 
   // Attempt to get the CPS, if it's not present we'll fallback to use the Desktop folder
   nsCOMPtr<nsIContentPrefService2> contentPrefService =
@@ -1062,10 +1063,11 @@
     return NS_OK;
   }
 
+#ifdef MOZ_B2G
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    // FIXME (bug 949666): Run this code in the parent process.
     return NS_OK;
   }
+#endif
 
   nsCOMPtr<nsIURI> docURI = aDoc->GetDocumentURI();
   NS_PRECONDITION(docURI, "docURI is null");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLMediaElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLMediaElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLMediaElement.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLMediaElement.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -3719,7 +3719,8 @@
                              EmptyCString(), false);
 
   // Set the Referer header
-  aChannel->SetReferrer(OwnerDoc()->GetDocumentURI());
+  aChannel->SetReferrerWithPolicy(OwnerDoc()->GetDocumentURI(),
+                                  OwnerDoc()->GetReferrerPolicy());
 }
 
 void HTMLMediaElement::FireTimeUpdate(bool aPeriodic)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLMetaElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLMetaElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/HTMLMetaElement.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/HTMLMetaElement.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -77,7 +77,21 @@
     nsAutoString content;
     rv = GetContent(content);
     NS_ENSURE_SUCCESS(rv, rv);
-    nsContentUtils::ProcessViewportInfo(aDocument, content);  
+    nsContentUtils::ProcessViewportInfo(aDocument, content);
+  }
+  if (aDocument &&
+      AttrValueIs(kNameSpaceID_None, nsGkAtoms::name, nsGkAtoms::referrer, eIgnoreCase)) {
+    nsAutoString content;
+    rv = GetContent(content);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // Referrer Policy spec requires a <meta name="referrer" tag to be in the
+    // <head> element.
+    Element* headElt = aDocument->GetHeadElement();
+    if (headElt && nsContentUtils::ContentIsDescendantOf(this, headElt)) {
+      content = nsContentUtils::TrimWhitespace<nsContentUtils::IsHTMLWhitespace>(content);
+      aDocument->SetHeaderData(nsGkAtoms::referrer, content);
+    }
   }
   CreateAndDispatchEvent(aDocument, NS_LITERAL_STRING("DOMMetaAdded"));
   return rv;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/ImageDocument.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/ImageDocument.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/ImageDocument.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/ImageDocument.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -459,20 +459,14 @@
   if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
     nsCOMPtr<imgIContainer> image;
     aRequest->GetImage(getter_AddRefs(image));
-    return OnStartContainer(aRequest, image);
+    return OnSizeAvailable(aRequest, image);
   }
 
-  // Do these two off a script runner because decode complete notifications often
-  // come during painting and these will trigger invalidation.
-  if (aType == imgINotificationObserver::DECODE_COMPLETE) {
+  // Run this using a script runner because HAS_TRANSPARENCY notifications can
+  // come during painting and this will trigger invalidation.
+  if (aType == imgINotificationObserver::HAS_TRANSPARENCY) {
     nsCOMPtr<nsIRunnable> runnable =
-      NS_NewRunnableMethod(this, &ImageDocument::AddDecodedClass);
-    nsContentUtils::AddScriptRunner(runnable);
-  }
-
-  if (aType == imgINotificationObserver::DISCARD) {
-    nsCOMPtr<nsIRunnable> runnable =
-      NS_NewRunnableMethod(this, &ImageDocument::RemoveDecodedClass);
+      NS_NewRunnableMethod(this, &ImageDocument::OnHasTransparency);
     nsContentUtils::AddScriptRunner(runnable);
   }
 
@@ -481,29 +475,14 @@
     aRequest->GetImageStatus(&reqStatus);
     nsresult status =
         reqStatus & imgIRequest::STATUS_ERROR ? NS_ERROR_FAILURE : NS_OK;
-    return OnStopRequest(aRequest, status);
+    return OnLoadComplete(aRequest, status);
   }
 
   return NS_OK;
 }
 
 void
-ImageDocument::AddDecodedClass()
-{
-  if (!mImageContent || nsContentUtils::IsChildOfSameType(this)) {
-    return;
-  }
-
-  nsDOMTokenList* classList = mImageContent->AsElement()->ClassList();
-  mozilla::ErrorResult rv;
-  // Update the background-color of the image only after the
-  // image has been decoded to prevent flashes of just the
-  // background-color.
-  classList->Add(NS_LITERAL_STRING("decoded"), rv);
-}
-
-void
-ImageDocument::RemoveDecodedClass()
+ImageDocument::OnHasTransparency()
 {
   if (!mImageContent || nsContentUtils::IsChildOfSameType(this)) {
     return;
@@ -511,8 +490,7 @@
 
   nsDOMTokenList* classList = mImageContent->AsElement()->ClassList();
   mozilla::ErrorResult rv;
-  // Remove any decoded-related styling when the image is unloaded.
-  classList->Remove(NS_LITERAL_STRING("decoded"), rv);
+  classList->Add(NS_LITERAL_STRING("transparent"), rv);
 }
 
 void
@@ -535,7 +513,7 @@
 }
 
 nsresult
-ImageDocument::OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage)
+ImageDocument::OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage)
 {
   // Styles have not yet been applied, so we don't know the final size. For now,
   // default to the image's intrinsic size.
@@ -551,8 +529,7 @@
 }
 
 nsresult
-ImageDocument::OnStopRequest(imgIRequest *aRequest,
-                             nsresult aStatus)
+ImageDocument::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus)
 {
   UpdateTitleAndCharset();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/ImageDocument.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/ImageDocument.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/ImageDocument.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/ImageDocument.h	2014-11-26 21:45:58.000000000 +0000
@@ -51,9 +51,6 @@
 
   void DefaultCheckOverflowing() { CheckOverflowing(mResizeImageByDefault); }
 
-  void AddDecodedClass();
-  void RemoveDecodedClass();
-
   // WebIDL API
   virtual JSObject* WrapNode(JSContext* aCx)
     MOZ_OVERRIDE;
@@ -107,8 +104,9 @@
   };
   void SetModeClass(eModeClasses mode);
 
-  nsresult OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage);
-  nsresult OnStopRequest(imgIRequest *aRequest, nsresult aStatus);
+  nsresult OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage);
+  nsresult OnLoadComplete(imgIRequest* aRequest, nsresult aStatus);
+  void OnHasTransparency();
 
   nsCOMPtr<nsIContent>          mImageContent;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/nsTextEditorState.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/nsTextEditorState.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/nsTextEditorState.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/nsTextEditorState.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -227,6 +227,7 @@
   NS_IMETHOD GetCaretEnabled(bool *_retval);
   NS_IMETHOD GetCaretVisible(bool *_retval);
   NS_IMETHOD SetCaretVisibilityDuringSelection(bool aVisibility);
+  NS_IMETHOD PhysicalMove(int16_t aDirection, int16_t aAmount, bool aExtend) MOZ_OVERRIDE;
   NS_IMETHOD CharacterMove(bool aForward, bool aExtend);
   NS_IMETHOD CharacterExtendForDelete();
   NS_IMETHOD CharacterExtendForBackspace();
@@ -446,6 +447,15 @@
 }
 
 NS_IMETHODIMP
+nsTextInputSelectionImpl::PhysicalMove(int16_t aDirection, int16_t aAmount,
+                                       bool aExtend)
+{
+  if (mFrameSelection)
+    return mFrameSelection->PhysicalMove(aDirection, aAmount, aExtend);
+  return NS_ERROR_NULL_POINTER;
+}
+
+NS_IMETHODIMP
 nsTextInputSelectionImpl::CharacterMove(bool aForward, bool aExtend)
 {
   if (mFrameSelection)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/test/forms/test_input_color_picker_popup.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/test/forms/test_input_color_picker_popup.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/test/forms/test_input_color_picker_popup.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/test/forms/test_input_color_picker_popup.html	2014-11-26 21:45:58.000000000 +0000
@@ -9,6 +9,7 @@
   <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"/>
+  <style> body { font-family: serif } </style>
   <script type="application/javascript;version=1.8">
 
   /** Test the behaviour of the <input type='color'> when clicking on it from
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/test/forms/test_input_color_picker_update.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/test/forms/test_input_color_picker_update.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/html/test/forms/test_input_color_picker_update.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/html/test/forms/test_input_color_picker_update.html	2014-11-26 21:45:58.000000000 +0000
@@ -9,6 +9,7 @@
   <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"/>
+  <style> body { font-family: serif } </style>
   <script type="application/javascript;version=1.8">
 
   /** Test that update() modifies the element value such as done() when it is
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/gonk/StkProactiveCmdFactory.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/gonk/StkProactiveCmdFactory.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/gonk/StkProactiveCmdFactory.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/gonk/StkProactiveCmdFactory.jsm	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,1073 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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");
+
+let RIL = {};
+Cu.import("resource://gre/modules/ril_consts.js", RIL);
+
+/**
+ * Helper Utilities to convert JS Objects to IDL Objects.
+ */
+
+/**
+ * To map { timeUnit, timeInterval } into StkDuration.
+ */
+function mapDurationToStkDuration(aDuration) {
+  return (aDuration)
+    ? new StkDuration(aDuration.timeUnit, aDuration.timeInterval)
+    : null;
+}
+
+/**
+ * To map { iconSelfExplanatory, icons } into StkIconInfo.
+ */
+function mapIconInfoToStkIconInfo(aIconInfo) {
+  let mapIconToStkIcon = function(aIcon) {
+    return new StkIcon(aIcon.width, aIcon.height,
+                       aIcon.codingScheme, aIcon.pixels);
+  };
+
+  return (aIconInfo &&
+          aIconInfo.icons !== undefined &&
+          aIconInfo.iconSelfExplanatory !== undefined)
+    ? new StkIconInfo(aIconInfo.iconSelfExplanatory,
+                      aIconInfo.icons.map(mapIconToStkIcon))
+    : null;
+}
+
+/**
+ * Helper Utilities to append the STK attributes to System Message.
+ */
+
+function appendDuration(aTarget, aStkDuration) {
+  aTarget.timeUnit = aStkDuration.timeUnit;
+  aTarget.timeInterval = aStkDuration.timeInterval;
+}
+
+function appendIconInfo(aTarget, aStkIconInfo) {
+  aTarget.iconSelfExplanatory = aStkIconInfo.iconSelfExplanatory;
+  aTarget.icons = aStkIconInfo.getIcons().map(function(aStkIcon) {
+    return {
+      width: aStkIcon.width,
+      height: aStkIcon.height,
+      codingScheme: RIL.ICC_IMG_CODING_SCHEME_TO_GECKO[aStkIcon.codingScheme],
+      pixels: aStkIcon.getPixels()
+    };
+  });
+}
+
+/**
+ * The implementation of the data types used in variant types of
+ * StkProactiveCommand.
+ */
+
+function StkDuration(aTimeUnit, aTimeInterval) {
+  this.timeUnit = aTimeUnit;
+  this.timeInterval = aTimeInterval;
+}
+StkDuration.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkDuration]),
+
+  // nsIStkDuration
+  timeUnit: 0,
+  timeInterval: 0
+};
+
+function StkIcon(aWidth, aHeight, aCodingScheme, aPixels) {
+  this.width = aWidth;
+  this.height = aHeight;
+  this.codingScheme = this.IMG_CODING_SCHEME[aCodingScheme];
+  this.pixels = aPixels.slice();
+}
+StkIcon.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkIcon]),
+
+  // Cache pixels for getPixels()
+  pixels: null,
+
+  // Scheme mapping.
+  IMG_CODING_SCHEME: {
+    "basic": Ci.nsIStkIcon.CODING_SCHEME_BASIC,
+    "color": Ci.nsIStkIcon.CODING_SCHEME_COLOR,
+    "color-transparency": Ci.nsIStkIcon.CODING_SCHEME_COLOR_TRANSPARENCY
+  },
+
+  // StkIcon
+  width: 0,
+  height: 0,
+  codingScheme: 0,
+  getPixels: function(aCount) {
+    if (!this.pixels) {
+      if (aCount) {
+        aCount.value = 0;
+      }
+      return null;
+    }
+
+    if (aCount) {
+      aCount.value = this.pixels.length;
+    }
+
+    return this.pixels.slice();
+  }
+};
+
+function StkIconInfo(aIconSelfExplanatory, aStkIcons) {
+  this.iconSelfExplanatory = aIconSelfExplanatory;
+  this.icons = aStkIcons;
+}
+StkIconInfo.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkIconInfo]),
+
+  // Cache the list of StkIcon(s) for getIcons()
+  icons: null,
+
+  // nsIStkIconInfo
+  iconSelfExplanatory: false,
+
+  getIcons: function(aCount) {
+    if (!this.icons) {
+      if (aCount) {
+        aCount.value = 0;
+      }
+      return null;
+    }
+
+    if (aCount) {
+      aCount.value = this.icons.length;
+    }
+
+    return this.icons.slice();
+  }
+};
+
+function StkItem(aIdentifier, aText, aStkIconInfo) {
+  this.identifier = aIdentifier;
+  if (aText) {
+    this.text = aText;
+  }
+  this.iconInfo = aStkIconInfo;
+}
+StkItem.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkItem]),
+
+  // nsIStkItem
+  identifier: 0,
+  text: null,
+  iconInfo: null
+};
+
+function StkTimer(aTimerId, aTimerValue, aTimerAction) {
+  this.timerId = aTimerId;
+  if (aTimerValue !== undefined &&
+      aTimerValue !== null) {
+    this.timerValue = aTimerValue;
+  }
+  this.timerAction = aTimerAction;
+}
+StkTimer.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkTimer]),
+
+  // nsIStkTimer
+  timerId: 0,
+  timerValue: Ci.nsIStkTimer.TIMER_VALUE_INVALID,
+  timerAction: 0
+};
+
+/**
+ * The implementation of nsIStkProactiveCommand Set and STK System Message Set.
+ */
+function StkProactiveCommand(aCommandDetails) {
+  this.commandNumber = aCommandDetails.commandNumber;
+  this.typeOfCommand = aCommandDetails.typeOfCommand;
+  this.commandQualifier = aCommandDetails.commandQualifier;
+}
+StkProactiveCommand.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd]),
+
+  // nsIStkProactiveCmd
+  commandNumber: 0,
+  typeOfCommand: 0,
+  commandQualifier: 0
+};
+
+function StkCommandMessage(aStkProactiveCmd) {
+  this.commandNumber = aStkProactiveCmd.commandNumber;
+  this.typeOfCommand = aStkProactiveCmd.typeOfCommand;
+  this.commandQualifier = aStkProactiveCmd.commandQualifier;
+}
+StkCommandMessage.prototype = {
+  commandNumber: 0,
+  typeOfCommand: 0,
+  commandQualifier: 0,
+  options: null
+};
+
+function StkPollIntervalCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  this.duration = mapDurationToStkDuration(aCommandDetails.options);
+}
+StkPollIntervalCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkPollIntervalCmd])
+  },
+
+  // nsIStkPollIntervalCmd
+  duration: { value: null, writable: true }
+});
+
+function StkPollIntervalMessage(aStkPollIntervalCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkPollIntervalCmd);
+
+  this.options = {};
+  appendDuration(this.options, aStkPollIntervalCmd.duration);
+}
+StkPollIntervalMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkProvideLocalInfoCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  this.localInfoType = aCommandDetails.options.localInfoType;
+}
+StkProvideLocalInfoCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkProvideLocalInfoCmd])
+  },
+
+  // nsIStkPollIntervalCmd
+  localInfoType: { value: 0x00, writable: true }
+});
+
+function StkProvideLocalInfoMessage(aStkProvideLocalInfoCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkProvideLocalInfoCmd);
+
+  this.options = {
+    localInfoType: aStkProvideLocalInfoCmd.localInfoType
+  };
+}
+StkProvideLocalInfoMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkSetupEventListCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+  let eventList = aCommandDetails.options.eventList;
+  if (eventList) {
+    this.eventList = eventList.slice();
+  }
+}
+StkSetupEventListCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkSetupEventListCmd])
+  },
+
+  // Cache eventList for getEventList()
+  eventList: { value: null, writable: true },
+
+  // nsIStkSetupEventListCmd
+  getEventList: {
+    value: function(aCount) {
+      if (!this.eventList) {
+        if (aCount) {
+          aCount.value = 0;
+        }
+        return null;
+      }
+
+      if (aCount) {
+        aCount.value = this.eventList.length;
+      }
+
+      return this.eventList.slice();
+    }
+  }
+});
+
+function StkSetupEventListMessage(aStkSetupEventListCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkSetupEventListCmd);
+
+  this.options = {
+    eventList: null
+  };
+
+  let eventList = aStkSetupEventListCmd.getEventList();
+
+  if (eventList && eventList.length > 0) {
+    this.options.eventList = eventList;
+  }
+}
+StkSetupEventListMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkMenuCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  if (options.title) {
+    this.title = options.title;
+  }
+
+  this.items = options.items.map(function(aItem) {
+    // For |SET-UP MENU|, the 1st item in |aItems| could be null as an
+    // indication to the ME to remove the existing menu from the menu
+    // system in the ME.
+    return (aItem) ? new StkItem(aItem.identifier,
+                                 aItem.text,
+                                 mapIconInfoToStkIconInfo(aItem))
+                   : null;
+  });
+
+  if (options.nextActionList) {
+    this.nextActionList = options.nextActionList.slice();
+  }
+
+  this.iconInfo = mapIconInfoToStkIconInfo(options);
+
+  this.isHelpAvailable = !!(options.isHelpAvailable);
+}
+StkMenuCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkMenuCmd])
+  },
+
+  // Cache items for getItems()
+  items: { value: null, writable: true },
+
+  // Cache items for getNextActionList()
+  nextActionList: { value: null, writable: true },
+
+  // nsIStkMenuCmd
+  title: { value: null, writable: true },
+
+  getItems: {
+    value: function(aCount) {
+      if (!this.items) {
+        if (aCount) {
+          aCount.value = 0;
+        }
+        return null;
+      }
+
+      if (aCount) {
+        aCount.value = this.items.length;
+      }
+
+      return this.items.slice();
+    }
+  },
+
+  getNextActionList: {
+    value: function(aCount) {
+      if (!this.nextActionList) {
+        if (aCount) {
+          aCount.value = 0;
+        }
+        return null;
+      }
+
+      if (aCount) {
+        aCount.value = this.nextActionList.length;
+      }
+
+      return this.nextActionList.slice();
+    }
+  },
+
+  iconInfo: { value: null, writable: true },
+  isHelpAvailable: { value: false, writable: true }
+});
+
+function StkMenuMessage(aStkMenuCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkMenuCmd);
+
+  this.options = {
+    items: aStkMenuCmd.getItems().map(function(aStkItem) {
+      if (!aStkItem) {
+        return null;
+      }
+
+      let item = {
+        identifier: aStkItem.identifier,
+        text: aStkItem.text
+      };
+
+      if (aStkItem.iconInfo) {
+        appendIconInfo(item, aStkItem.iconInfo);
+      }
+
+      return item;
+    }),
+    isHelpAvailable: aStkMenuCmd.isHelpAvailable
+  };
+
+  if (aStkMenuCmd.title) {
+    this.options.title = aStkMenuCmd.title;
+  }
+
+  let nextActionList = aStkMenuCmd.getNextActionList();
+  if (nextActionList && nextActionList.length > 0) {
+    this.options.nextActionList = nextActionList;
+  }
+
+  if (aStkMenuCmd.iconInfo) {
+    appendIconInfo(this.options, aStkMenuCmd.iconInfo);
+  }
+}
+StkMenuMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkSetUpMenuCmd(aCommandDetails) {
+  // Call |StkMenuCmd| constructor.
+  StkMenuCmd.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  this.presentationType = options.presentationType;
+}
+StkSetUpMenuCmd.prototype = Object.create(StkMenuCmd.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkMenuCmd,
+                                  Ci.nsIStkSetUpMenuCmd])
+  },
+
+  // nsIStkSetUpMenuCmd
+  presentationType: { value: 0, writable: true }
+});
+
+function StkSetUpMenuMessage(aStkSetUpMenuCmd) {
+  // Call |StkMenuMessage| constructor.
+  StkMenuMessage.call(this, aStkSetUpMenuCmd);
+
+  this.options.presentationType = aStkSetUpMenuCmd.presentationType;
+}
+StkSetUpMenuMessage.prototype = Object.create(StkMenuMessage.prototype);
+
+function StkSelectItemCmd(aCommandDetails) {
+  // Call |StkMenuCmd| constructor.
+  StkMenuCmd.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  if (options.defaultItem !== undefined &&
+      options.defaultItem !== null) {
+    this.defaultItem = options.defaultItem;
+  }
+}
+StkSelectItemCmd.prototype = Object.create(StkMenuCmd.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkMenuCmd,
+                                  Ci.nsIStkSelectItemCmd])
+  },
+
+  // nsIStkSelectItemCmd
+  defaultItem: {
+    value: Ci.nsIStkSelectItemCmd.DEFAULT_ITEM_INVALID,
+    writable: true
+  }
+});
+
+function StkSelectItemMessage(aStkSelectItemCmd) {
+  // Call |StkMenuMessage| constructor.
+  StkMenuMessage.call(this, aStkSelectItemCmd);
+
+  if (aStkSelectItemCmd.defaultItem !== Ci.nsIStkSelectItemCmd.DEFAULT_ITEM_INVALID) {
+    this.options.defaultItem = aStkSelectItemCmd.defaultItem;
+  }
+}
+StkSelectItemMessage.prototype = Object.create(StkMenuMessage.prototype);
+
+function StkTextMessageCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  if (options.text) {
+    this.text = options.text;
+  }
+
+  this.iconInfo = mapIconInfoToStkIconInfo(options);
+}
+StkTextMessageCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkTextMessageCmd])
+  },
+
+  // nsIStkTextMessageCmd
+  text: { value: null, writable: true },
+  iconInfo: { value: null, writable: true }
+});
+
+function StkTextMessage(aStkTextMessageCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkTextMessageCmd);
+
+  this.options = {};
+
+  if (aStkTextMessageCmd.text) {
+    this.options.text = aStkTextMessageCmd.text;
+  }
+
+  if (aStkTextMessageCmd.iconInfo) {
+    appendIconInfo(this.options, aStkTextMessageCmd.iconInfo);
+  }
+}
+StkTextMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkDisplayTextCmd(aCommandDetails) {
+  // Call |StkTextMessageCmd| constructor.
+  StkTextMessageCmd.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  this.duration = mapDurationToStkDuration(options.duration);
+
+  this.isHighPriority = !!(options.isHighPriority);
+  this.userClear = !!(options.userClear);
+  this.responseNeeded = !!(options.responseNeeded);
+}
+StkDisplayTextCmd.prototype = Object.create(StkTextMessageCmd.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkTextMessageCmd,
+                                  Ci.nsIStkDisplayTextCmd])
+  },
+
+  // nsIStkDisplayTextCmd
+  duration: { value: null, writable: true },
+  isHighPriority: { value: false, writable: true },
+  userClear: { value: false, writable: true },
+  responseNeeded: { value: false, writable: true }
+});
+
+function StkDisplayTextMessage(aStkDisplayTextCmd) {
+  // Call |StkTextMessage| constructor.
+  StkTextMessage.call(this, aStkDisplayTextCmd);
+
+  this.options.isHighPriority = aStkDisplayTextCmd.isHighPriority;
+  this.options.userClear = aStkDisplayTextCmd.userClear;
+  this.options.responseNeeded = aStkDisplayTextCmd.responseNeeded;
+
+  if (aStkDisplayTextCmd.duration) {
+    this.options.duration = {};
+    appendDuration(this.options.duration, aStkDisplayTextCmd.duration);
+  }
+}
+StkDisplayTextMessage.prototype = Object.create(StkTextMessage.prototype);
+
+function StkInputCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  if (options.text) {
+    this.text = options.text;
+  }
+
+  this.duration = mapDurationToStkDuration(options.duration);
+
+  if (options.defaultText) {
+    this.defaultText = options.defaultText;
+  }
+
+  this.isAlphabet = !!(options.isAlphabet);
+  this.isUCS2 = !!(options.isUCS2);
+  this.isHelpAvailable = !!(options.isHelpAvailable);
+
+  this.iconInfo = mapIconInfoToStkIconInfo(options);
+}
+StkInputCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkInputCmd])
+  },
+
+  // nsIStkInputCmd
+  text: { value: null, writable: true },
+  duration: { value: null, writable: true },
+  minLength: { value: 1, writable: true },
+  maxLength: { value: 1, writable: true },
+  defaultText: { value: null, writable: true },
+  isAlphabet: { value: false, writable: true },
+  isUCS2: { value: false, writable: true },
+  isHelpAvailable: { value: false, writable: true },
+  iconInfo: { value: null, writable: true }
+});
+
+function StkInputMessage(aStkInputCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkInputCmd);
+
+  this.options = {
+    text: aStkInputCmd.text,
+    minLength: aStkInputCmd.minLength,
+    maxLength: aStkInputCmd.maxLength,
+    isAlphabet: aStkInputCmd.isAlphabet,
+    isUCS2: aStkInputCmd.isUCS2,
+    isHelpAvailable: aStkInputCmd.isHelpAvailable,
+  };
+
+  if (aStkInputCmd.duration) {
+    this.options.duration = {};
+    appendDuration(this.options.duration, aStkInputCmd.duration);
+  }
+
+  if (aStkInputCmd.defaultText) {
+    this.options.defaultText = aStkInputCmd.defaultText;
+  }
+
+  if (aStkInputCmd.iconInfo) {
+    appendIconInfo(this.options, aStkInputCmd.iconInfo);
+  }
+}
+StkInputMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkInputKeyCmd(aCommandDetails) {
+  // Call |StkInputCmd| constructor.
+  StkInputCmd.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  // Note: For STK_CMD_INKEY,
+  // this.minLength = this.maxLength = 1;
+
+  this.isYesNoRequested = !!(options.isYesNoRequested);
+}
+StkInputKeyCmd.prototype = Object.create(StkInputCmd.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkInputCmd,
+                                  Ci.nsIStkInputKeyCmd])
+  },
+
+  // nsIStkInputKeyCmd
+  isYesNoRequested: { value: false, writable: true }
+});
+
+function StkInputKeyMessage(aStkInputKeyCmd) {
+  // Call |StkInputMessage| constructor.
+  StkInputMessage.call(this, aStkInputKeyCmd);
+
+  this.options.isYesNoRequested = aStkInputKeyCmd.isYesNoRequested;
+}
+StkInputKeyMessage.prototype = Object.create(StkInputMessage.prototype);
+
+function StkInputTextCmd(aCommandDetails) {
+  // Call |StkInputCmd| constructor.
+  StkInputCmd.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  this.minLength = options.minLength;
+  this.maxLength = options.maxLength;
+
+  this.hideInput = !!(options.hideInput);
+  this.isPacked = !!(options.isPacked);
+}
+StkInputTextCmd.prototype = Object.create(StkInputCmd.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkInputCmd,
+                                  Ci.nsIStkInputTextCmd])
+  },
+
+  // nsIStkInputTextCmd
+  hideInput: { value: false, writable: true },
+  isPacked: { value: false, writable: true }
+});
+
+function StkInputTextMessage(aStkInputTextCmd) {
+  // Call |StkInputMessage| constructor.
+  StkInputMessage.call(this, aStkInputTextCmd);
+
+  this.options.hideInput = aStkInputTextCmd.hideInput;
+  this.options.isPacked = aStkInputTextCmd.isPacked;
+}
+StkInputTextMessage.prototype = Object.create(StkInputMessage.prototype);
+
+function StkSetUpCallCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  let confirmMessage = options.confirmMessage;
+  let callMessage = options.callMessage;
+
+  this.address = options.address;
+
+  if(confirmMessage) {
+    if (confirmMessage.text) {
+      this.confirmText = confirmMessage.text;
+    }
+    this.confirmIconInfo = mapIconInfoToStkIconInfo(confirmMessage);
+  }
+
+  if(callMessage) {
+    if (callMessage.text) {
+      this.callText = callMessage.text;
+    }
+    this.callIconInfo = mapIconInfoToStkIconInfo(callMessage);
+  }
+
+  this.duration = mapDurationToStkDuration(options.duration);
+}
+StkSetUpCallCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkSetUpCallCmd])
+  },
+
+  // nsIStkSetUpCallCmd
+  address: { value: null, writable: true },
+  confirmText: { value: null, writable: true },
+  confirmIconInfo: { value: null, writable: true },
+  callText: { value: null, writable: true },
+  callIconInfo: { value: null, writable: true },
+  duration: { value: null, writable: true }
+});
+
+function StkSetUpCallMessage(aStkSetUpCallCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkSetUpCallCmd);
+
+  this.options = {
+    address: aStkSetUpCallCmd.address
+  };
+
+  if (aStkSetUpCallCmd.confirmText || aStkSetUpCallCmd.confirmIconInfo) {
+    let confirmMessage = {};
+    if (aStkSetUpCallCmd.confirmText) {
+      confirmMessage.text = aStkSetUpCallCmd.confirmText;
+    }
+    if (aStkSetUpCallCmd.confirmIconInfo) {
+      appendIconInfo(confirmMessage, aStkSetUpCallCmd.confirmIconInfo);
+    }
+    this.options.confirmMessage = confirmMessage;
+  }
+
+  if (aStkSetUpCallCmd.callText || aStkSetUpCallCmd.callIconInfo) {
+    let callMessage = {};
+    if (aStkSetUpCallCmd.callText) {
+      callMessage.text = aStkSetUpCallCmd.callText;
+    }
+    if (aStkSetUpCallCmd.callIconInfo) {
+      appendIconInfo(callMessage, aStkSetUpCallCmd.callIconInfo);
+    }
+    this.options.callMessage = callMessage;
+  }
+
+  if (aStkSetUpCallCmd.duration) {
+    this.options.duration = {};
+    appendDuration(this.options.duration, aStkSetUpCallCmd.duration);
+  }
+}
+StkSetUpCallMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkBrowserSettingCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  this.url = options.url;
+
+  this.mode = options.mode;
+
+  let confirmMessage = options.confirmMessage;
+
+  if(confirmMessage) {
+    if (confirmMessage.text) {
+      this.confirmText = confirmMessage.text;
+    }
+    this.confirmIconInfo = mapIconInfoToStkIconInfo(confirmMessage);
+  }
+}
+StkBrowserSettingCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkBrowserSettingCmd])
+  },
+
+  // nsIStkBrowserSettingCmd
+  url: { value: null, writable: true },
+  mode: { value: 0, writable: true },
+  confirmText: { value: null, writable: true },
+  confirmIconInfo: { value: null, writable: true }
+});
+
+function StkBrowserSettingMessage(aStkBrowserSettingCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkBrowserSettingCmd);
+
+  this.options = {
+    url: aStkBrowserSettingCmd.url,
+    mode: aStkBrowserSettingCmd.mode
+  };
+
+  if (aStkBrowserSettingCmd.confirmText || aStkBrowserSettingCmd.confirmIconInfo) {
+    let confirmMessage = {};
+    if (aStkBrowserSettingCmd.confirmText) {
+      confirmMessage.text = aStkBrowserSettingCmd.confirmText;
+    }
+    if (aStkBrowserSettingCmd.confirmIconInfo) {
+      appendIconInfo(confirmMessage, aStkBrowserSettingCmd.confirmIconInfo);
+    }
+    this.options.confirmMessage = confirmMessage;
+  }
+}
+StkBrowserSettingMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkPlayToneCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  if(options.text) {
+    this.text = options.text;
+  }
+
+  if (options.tone !== undefined &&
+      options.tone !== null) {
+    this.tone = options.tone;
+  }
+
+  if (options.isVibrate) {
+    this.isVibrate = true;
+  }
+
+  this.duration = mapDurationToStkDuration(options.duration);
+
+  this.iconInfo = mapIconInfoToStkIconInfo(options);
+}
+StkPlayToneCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkPlayToneCmd])
+  },
+
+  // nsIStkPlayToneCmd
+  text: { value: null, writable: true },
+  tone: { value: Ci.nsIStkPlayToneCmd.TONE_TYPE_INVALID, writable: true },
+  duration: { value: null, writable: true },
+  isVibrate: { value: false, writable: true },
+  iconInfo: { value: null, writable: true }
+});
+
+function StkPlayToneMessage(aStkPlayToneCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkPlayToneCmd);
+
+  this.options = {
+    isVibrate: aStkPlayToneCmd.isVibrate
+  };
+
+  if (aStkPlayToneCmd.text) {
+    this.options.text = aStkPlayToneCmd.text;
+  }
+
+  if (aStkPlayToneCmd.tone != Ci.nsIStkPlayToneCmd.TONE_TYPE_INVALID) {
+    this.options.tone = aStkPlayToneCmd.tone;
+  }
+
+  if (aStkPlayToneCmd.duration) {
+    this.options.duration = {};
+    appendDuration(this.options.duration, aStkPlayToneCmd.duration);
+  }
+
+  if (aStkPlayToneCmd.iconInfo) {
+    appendIconInfo(this.options, aStkPlayToneCmd.iconInfo);
+  }
+}
+StkPlayToneMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+function StkTimerManagementCmd(aCommandDetails) {
+  // Call |StkProactiveCommand| constructor.
+  StkProactiveCommand.call(this, aCommandDetails);
+
+  let options = aCommandDetails.options;
+
+  this.timerInfo = new StkTimer(options.timerId,
+                                options.timerValue,
+                                options.timerAction);
+
+}
+StkTimerManagementCmd.prototype = Object.create(StkProactiveCommand.prototype, {
+  QueryInterface: {
+    value: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                  Ci.nsIStkTimerManagementCmd])
+  },
+
+  // nsIStkTimerManagementCmd
+  timerInfo: { value: null, writable: true }
+});
+
+function StkTimerMessage(aStkTimerManagementCmd) {
+  // Call |StkCommandMessage| constructor.
+  StkCommandMessage.call(this, aStkTimerManagementCmd);
+
+  let timerInfo = aStkTimerManagementCmd.timerInfo;
+
+  this.options = {
+    timerId: timerInfo.timerId,
+    timerAction: timerInfo.timerAction
+  };
+
+  if (timerInfo.timerValue !== Ci.nsIStkTimer.TIMER_VALUE_INVALID) {
+    this.options.timerValue = timerInfo.timerValue;
+  }
+}
+StkTimerMessage.prototype = Object.create(StkCommandMessage.prototype);
+
+/**
+ * Command Prototype Mappings.
+ */
+let CmdPrototypes = {};
+CmdPrototypes[RIL.STK_CMD_REFRESH] = StkProactiveCommand;
+CmdPrototypes[RIL.STK_CMD_POLL_INTERVAL] = StkPollIntervalCmd;
+CmdPrototypes[RIL.STK_CMD_POLL_OFF] = StkProactiveCommand;
+CmdPrototypes[RIL.STK_CMD_PROVIDE_LOCAL_INFO] = StkProvideLocalInfoCmd;
+CmdPrototypes[RIL.STK_CMD_SET_UP_EVENT_LIST] = StkSetupEventListCmd;
+CmdPrototypes[RIL.STK_CMD_SET_UP_MENU] = StkSetUpMenuCmd;
+CmdPrototypes[RIL.STK_CMD_SELECT_ITEM] = StkSelectItemCmd;
+CmdPrototypes[RIL.STK_CMD_DISPLAY_TEXT] = StkDisplayTextCmd;
+CmdPrototypes[RIL.STK_CMD_SET_UP_IDLE_MODE_TEXT] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_SEND_SS] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_SEND_USSD] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_SEND_SMS] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_SEND_DTMF] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_GET_INKEY] = StkInputKeyCmd;
+CmdPrototypes[RIL.STK_CMD_GET_INPUT] = StkInputTextCmd;
+CmdPrototypes[RIL.STK_CMD_SET_UP_CALL] = StkSetUpCallCmd;
+CmdPrototypes[RIL.STK_CMD_LAUNCH_BROWSER] = StkBrowserSettingCmd;
+CmdPrototypes[RIL.STK_CMD_PLAY_TONE] = StkPlayToneCmd;
+CmdPrototypes[RIL.STK_CMD_TIMER_MANAGEMENT] = StkTimerManagementCmd;
+CmdPrototypes[RIL.STK_CMD_OPEN_CHANNEL] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_CLOSE_CHANNEL] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_SEND_DATA] = StkTextMessageCmd;
+CmdPrototypes[RIL.STK_CMD_RECEIVE_DATA] = StkTextMessageCmd;
+
+/**
+ * Message Prototype Mappings.
+ */
+let MsgPrototypes = {};
+MsgPrototypes[RIL.STK_CMD_REFRESH] = StkCommandMessage;
+MsgPrototypes[RIL.STK_CMD_POLL_INTERVAL] = StkPollIntervalMessage;
+MsgPrototypes[RIL.STK_CMD_POLL_OFF] = StkCommandMessage;
+MsgPrototypes[RIL.STK_CMD_PROVIDE_LOCAL_INFO] = StkProvideLocalInfoMessage;
+MsgPrototypes[RIL.STK_CMD_SET_UP_EVENT_LIST] = StkSetupEventListMessage;
+MsgPrototypes[RIL.STK_CMD_SET_UP_MENU] = StkSetUpMenuMessage;
+MsgPrototypes[RIL.STK_CMD_SELECT_ITEM] = StkSelectItemMessage;
+MsgPrototypes[RIL.STK_CMD_DISPLAY_TEXT] = StkDisplayTextMessage;
+MsgPrototypes[RIL.STK_CMD_SET_UP_IDLE_MODE_TEXT] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_SEND_SS] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_SEND_USSD] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_SEND_SMS] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_SEND_DTMF] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_GET_INKEY] = StkInputKeyMessage;
+MsgPrototypes[RIL.STK_CMD_GET_INPUT] = StkInputTextMessage;
+MsgPrototypes[RIL.STK_CMD_SET_UP_CALL] = StkSetUpCallMessage;
+MsgPrototypes[RIL.STK_CMD_LAUNCH_BROWSER] = StkBrowserSettingMessage;
+MsgPrototypes[RIL.STK_CMD_PLAY_TONE] = StkPlayToneMessage;
+MsgPrototypes[RIL.STK_CMD_TIMER_MANAGEMENT] = StkTimerMessage;
+MsgPrototypes[RIL.STK_CMD_OPEN_CHANNEL] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_CLOSE_CHANNEL] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_SEND_DATA] = StkTextMessage;
+MsgPrototypes[RIL.STK_CMD_RECEIVE_DATA] = StkTextMessage;
+
+/**
+ * QueryInterface Mappings.
+ */
+let QueriedIFs = {};
+QueriedIFs[RIL.STK_CMD_REFRESH] = Ci.nsIStkProactiveCmd;
+QueriedIFs[RIL.STK_CMD_POLL_INTERVAL] = Ci.nsIStkPollIntervalCmd;
+QueriedIFs[RIL.STK_CMD_POLL_OFF] = Ci.nsIStkProactiveCmd;
+QueriedIFs[RIL.STK_CMD_PROVIDE_LOCAL_INFO] = Ci.nsIStkProvideLocalInfoCmd;
+QueriedIFs[RIL.STK_CMD_SET_UP_EVENT_LIST] = Ci.nsIStkSetupEventListCmd;
+QueriedIFs[RIL.STK_CMD_SET_UP_MENU] = Ci.nsIStkSetUpMenuCmd;
+QueriedIFs[RIL.STK_CMD_SELECT_ITEM] = Ci.nsIStkSelectItemCmd;
+QueriedIFs[RIL.STK_CMD_DISPLAY_TEXT] = Ci.nsIStkDisplayTextCmd;
+QueriedIFs[RIL.STK_CMD_SET_UP_IDLE_MODE_TEXT] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_SEND_SS] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_SEND_USSD] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_SEND_SMS] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_SEND_DTMF] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_GET_INKEY] = Ci.nsIStkInputKeyCmd;
+QueriedIFs[RIL.STK_CMD_GET_INPUT] = Ci.nsIStkInputTextCmd;
+QueriedIFs[RIL.STK_CMD_SET_UP_CALL] = Ci.nsIStkSetUpCallCmd;
+QueriedIFs[RIL.STK_CMD_LAUNCH_BROWSER] = Ci.nsIStkBrowserSettingCmd;
+QueriedIFs[RIL.STK_CMD_PLAY_TONE] = Ci.nsIStkPlayToneCmd;
+QueriedIFs[RIL.STK_CMD_TIMER_MANAGEMENT] = Ci.nsIStkTimerManagementCmd;
+QueriedIFs[RIL.STK_CMD_OPEN_CHANNEL] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_CLOSE_CHANNEL] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_SEND_DATA] = Ci.nsIStkTextMessageCmd;
+QueriedIFs[RIL.STK_CMD_RECEIVE_DATA] = Ci.nsIStkTextMessageCmd;
+
+/**
+ * StkProactiveCmdFactory
+ */
+this.StkProactiveCmdFactory = {
+  /**
+   * @param  aCommandDetails
+   *         The CommandDetails decoded from ril_worker.js.
+   * @return a nsIStkProactiveCmd instance.
+   */
+  createCommand: function(aCommandDetails) {
+    let cmdType = CmdPrototypes[aCommandDetails.typeOfCommand];
+
+    if (typeof cmdType != "function") {
+      throw new Error("Unknown Command Type: " + aCommandDetails.typeOfCommand);
+    }
+
+    return new cmdType(aCommandDetails);
+  },
+
+  /**
+   * @param  nsIStkProactiveCmd instance.
+   * @return a Javascript object with the same structure to MozStkCommandEvent.
+   */
+  createCommandMessage: function(aStkProactiveCmd) {
+    let cmd = null;
+
+    let msgType = MsgPrototypes[aStkProactiveCmd.typeOfCommand];
+
+    if (typeof msgType != "function") {
+      throw new Error("Unknown Command Type: " + aStkProactiveCmd.typeOfCommand);
+    }
+
+    // convert aStkProactiveCmd to it's concrete interface before creating
+    // system message.
+    try {
+      cmd = aStkProactiveCmd.QueryInterface(QueriedIFs[aStkProactiveCmd.typeOfCommand]);
+    } catch (e) {
+      throw new Error("Failed to convert command into concrete class: " + e);
+    }
+
+    return new msgType(cmd);
+  },
+};
+
+this.EXPORTED_SYMBOLS = [
+  'StkProactiveCmdFactory'
+];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/interfaces/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/interfaces/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/interfaces/moz.build	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/interfaces/moz.build	2014-11-26 21:45:59.000000000 +0000
@@ -9,4 +9,9 @@
     'nsIIccProvider.idl',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
+    XPIDL_SOURCES += [
+        'nsIIccMessenger.idl',
+    ]
+
 XPIDL_MODULE = 'dom_icc'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/interfaces/nsIIccMessenger.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/interfaces/nsIIccMessenger.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/interfaces/nsIIccMessenger.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/interfaces/nsIIccMessenger.idl	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,667 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(1510cf0c-5db6-11e4-9869-6bf419e26642)]
+interface nsIStkDuration : nsISupports
+{
+  /**
+   * The value of Time units defined in 12.8 Duration of TS 11.14.
+   */
+  readonly attribute unsigned short timeUnit;
+
+  /**
+   * The length of time required, expressed in timeUnit.
+   *
+   * Note: the range is from 1 unit to 255 units.
+   */
+  readonly attribute unsigned short timeInterval;
+};
+
+[scriptable, uuid(c7b6e57a-696d-11e4-bcaa-bfe8386e75a9)]
+interface nsIStkIcon : nsISupports
+{
+  /**
+   * The color coding schemes defined in 4.6.1.1 of TS 31.102.
+   */
+  const unsigned short CODING_SCHEME_BASIC              = 0x11;
+  const unsigned short CODING_SCHEME_COLOR              = 0x21;
+  const unsigned short CODING_SCHEME_COLOR_TRANSPARENCY = 0x22;
+
+  /**
+   * Width of the icon.
+   */
+  readonly attribute unsigned long width;
+
+  /**
+   * Height of the icon.
+   */
+  readonly attribute unsigned long height;
+
+  /**
+   * Image coding scheme of the icon.
+   * One of CODING_SCHEME_*.
+   */
+  readonly attribute unsigned short codingScheme;
+
+  /**
+   * Array of pixels. Each pixel represents a color in the RGBA format made up
+   * of four bytes, that is, the Red sample in the highest 8 bits, followed by
+   * the Green sample, Blue sample and the Alpha sample in the lowest 8 bits.
+   *
+   * @param aCount
+   *        The number of pixels.
+   *
+   * @returns a copy of the array of pixels.
+   */
+  void getPixels([optional] out unsigned long aCount,
+                 [array, size_is(aCount), retval] out unsigned long aPixels);
+};
+
+[scriptable, uuid(4a6d173e-5e8b-11e4-9d78-071bb3d6ba8f)]
+interface nsIStkIconInfo : nsISupports
+{
+  /**
+   * Indicates how the icon is to be used.
+   *
+   * @see TS 11.14, clause 12.31, Icon Identifier.
+   *
+   * true: icon replaces the text string.
+   * false: icon shall be displayed together with the text string.
+   */
+  readonly attribute boolean iconSelfExplanatory;
+
+  /**
+   * Icon(s) that replaces or accompanies the text string.
+   *
+   * @see TS 11.14, clause 12.31, Icon Identifier.
+   *
+   * Array of icons, basically of a same image, that may differ in size,
+   * resolution or coding scheme. The first icon should be the default one.
+   *
+   * @param aCount
+   *        The number of icons.
+   *
+   * @returns a copy of the list of icons.
+   */
+  void getIcons([optional] out unsigned long aCount,
+                [array, size_is(aCount), retval] out nsIStkIcon aIcons);
+};
+
+[scriptable, uuid(ea95d25c-5e84-11e4-bd96-07285c50c1f2)]
+interface nsIStkItem : nsISupports
+{
+  /**
+   * Identifier of item.
+   *
+   * The identifier is a single byte between '01' and 'FF'. Each item shall
+   * have a unique identifier within an Item list.
+   */
+  readonly attribute unsigned short identifier;
+
+  /**
+   * Text string of item.
+   */
+  readonly attribute DOMString text;
+
+  /**
+   * (Optional)
+   * Icon info of item.
+   */
+  readonly attribute nsIStkIconInfo iconInfo;
+};
+
+[scriptable, uuid(222651f0-6976-11e4-accf-736a9c6e7d19)]
+interface nsIStkTimer : nsISupports
+{
+  /**
+   * Identifier of a timer.
+   */
+  readonly attribute unsigned short timerId;
+
+  const unsigned long TIMER_VALUE_INVALID = 0xFFFFFFFF;
+
+  /**
+   * Length of time during which the timer has to run.
+   *
+   * The possible duration of a timer is between 1 s and 24 h.
+   * The resolution of a timer is 1 second.
+   *
+   * Note: In TS 11.14, clause 6.6.21 TIMER MANAGEMENT,
+   *       "
+   *        The SIM shall supply this data object only when a timer has to
+   *        be started.
+   *       "
+   *       Hence, set to TIMER_VALUE_INVALID when |timerAction| is not equal to
+   *       TIMER_ACTION_START.
+   */
+  readonly attribute unsigned long timerValue;
+
+  /*
+   * Times actions defined in TS 11.14, clause 12.6,
+   * Command Qualifier, TIMER MANAGEMENT
+   */
+  const unsigned short TIMER_ACTION_START             = 0x00;
+  const unsigned short TIMER_ACTION_DEACTIVATE        = 0x01;
+  const unsigned short TIMER_ACTION_GET_CURRENT_VALUE = 0x02;
+
+  /**
+   * The action requested from UICC.
+   * It shall be one of TIMER_ACTION_*.
+   */
+  readonly attribute unsigned short timerAction;
+};
+
+/**
+ * The base class of all STK Proactive Commands.
+ *
+ * This interface is to be applied by the commands that provide info no more than:
+ * |commandNumber|, |typeOfCommand|, |commandQualifier|.
+ *
+ * The commands in this category are:
+ * - STK_CMD_REFRESH
+ * - STK_CMD_POLL_OFF
+ */
+[scriptable, uuid(f47f25b2-5d84-11e4-8637-7f59ea6da82f)]
+interface nsIStkProactiveCmd : nsISupports
+{
+  /**
+   * The number of command issued by ICC. And it is assigned
+   * by ICC may take any hexadecimal value betweean '01' and 'FE'.
+   *
+   * @see TS 11.14, clause 6.5.1
+   */
+  readonly attribute unsigned short commandNumber;
+
+  /**
+   * The value of |Type of Command| defined in TS 11.14, clause 13.4
+   */
+  readonly attribute unsigned short typeOfCommand;
+
+  /**
+   * Qualifiers specific to the command.
+   */
+  readonly attribute unsigned short commandQualifier;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_POLL_INTERVAL.
+ */
+[scriptable, uuid(0a27c090-5dbc-11e4-92eb-ebc26db3db29)]
+interface nsIStkPollIntervalCmd : nsIStkProactiveCmd
+{
+  /**
+   * The maximum interval between two STATUS commands related to
+   * Proactive Polling.
+   *
+   * Note: Mandatory for STK_CMD_POLL_INTERVAL.
+   *
+   * @See TS 11.14, clause 6.6.6 POLL INTERVAL
+   */
+  readonly attribute nsIStkDuration duration;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_PROVIDE_LOCAL_INFO.
+ */
+[scriptable, uuid(89a304ce-5dc6-11e4-8dce-23723fb242b4)]
+interface nsIStkProvideLocalInfoCmd : nsIStkProactiveCmd
+{
+  /**
+   * Values defined in TS 11.14, clause 12.6, Command Qualifier,
+   * PROVIDE LOCAL INFORMATION
+   */
+  readonly attribute unsigned short localInfoType;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_SET_UP_EVENT_LIST.
+ */
+[scriptable, uuid(5f796dec-5e6a-11e4-aaf3-bb675cb36df5)]
+interface nsIStkSetupEventListCmd : nsIStkProactiveCmd
+{
+  /**
+   * (Optional)
+   * Get the list of events.
+   * Each event could be one of values defined in TS 11.14, clause 8.25, Event list.
+   *
+   * Note: It could be null as an indication to the terminal to remove the
+   *       existing list of events in the terminal.
+   *
+   * @param aCount
+   *        The number of events.
+   *
+   * @returns a copy of the list of events.
+   */
+  void getEventList([optional] out unsigned long aCount,
+                    [array, size_is(aCount), retval] out unsigned short aEventList);
+};
+
+/**
+ * The base interface of nsIStkSetUpMenuCmd and nsIStkSelectItemCmd.
+ */
+[scriptable, uuid(298bf414-6a1f-11e4-9045-3b3fd28e7f6a)]
+interface nsIStkMenuCmd : nsIStkProactiveCmd
+{
+  /**
+   * (Optional for STK_CMD_SELECT_ITEM)
+   * Title of the menu.
+   */
+  readonly attribute DOMString title;
+
+  /**
+   * Get the list of menu items.
+   *
+   * Note: The minimal number of items is 1.
+   *       See TS 11.14, clause 6.6.7 SET-UP MENU and 6.6.8 SELECT ITEM.
+   *
+   * @param aCount
+   *        The number of items.
+   *
+   * @returns a copy of the list of menu items.
+   *          For |SET-UP MENU|, the 1st item in |aItems| could be null as an
+   *          indication to the ME to remove the existing menu from the menu
+   *          system in the ME.
+   */
+  void getItems([optional] out unsigned long aCount,
+                [array, size_is(aCount), retval] out nsIStkItem aItems);
+
+  /**
+   * (Optional)
+   * Get the list of Next Action Indicators.
+   *
+   * Each element should be the value of |Next Action Indicator| in TS 11.14,
+   * clause 13.4.
+   *
+   * @see TS 11.14, clause 12.24, Items Next Action Indicator.
+   *
+   * @param aCount
+   *        The number of indicators.
+   *
+   * @returns a copy of the list of Next Action Indicators.
+   */
+  void getNextActionList([optional] out unsigned long aCount,
+                         [array, size_is(aCount), retval] out unsigned short aActions);
+
+  /**
+   * (Optional)
+   * Icon info of the menu.
+   */
+  readonly attribute nsIStkIconInfo iconInfo;
+
+  /**
+   * Help information available or not.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, SET UP MENU, bit 8.
+   *
+   * true: help information available.
+   * false: no help information available.
+   *
+   */
+  readonly attribute boolean isHelpAvailable;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_SET_UP_MENU.
+ */
+[scriptable, uuid(d3ddb1f0-631c-11e4-aac3-4beb03196b7b)]
+interface nsIStkSetUpMenuCmd : nsIStkMenuCmd
+{
+  /**
+   * Presentation type, one of PRESENTATION_TYPE_*.
+   *
+   * @See TS 11.14, clause 12.6, Command Qualifier: Select Item
+   */
+  const short PRESENTATION_TYPE_NOT_SPECIFIED = 0x00;
+  const short PRESENTATION_TYPE_DATA_VALUES = 0x01;
+  const short PRESENTATION_TYPE_NAVIGATION_OPTIONS = 0x03;
+
+  readonly attribute unsigned short presentationType;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_SELECT_ITEM.
+ */
+[scriptable, uuid(816dc186-631b-11e4-864f-b37f7b54a1b8)]
+interface nsIStkSelectItemCmd : nsIStkMenuCmd
+{
+  const unsigned short DEFAULT_ITEM_INVALID = 0xFFFF;
+
+  /**
+   * (Optional)
+   * Default item identifier of the menu.
+   *
+   * Set to DEFAULT_ITEM_INVALID if null.
+   */
+  readonly attribute unsigned short defaultItem;
+};
+
+/**
+ * This interface is to be applied by
+ * - STK_CMD_SET_UP_IDLE_MODE_TEXT
+ * - STK_CMD_SEND_{SS|USSD|SMS|DTMF}
+ * - STK_CMD_OPEN_CHANNEL
+ * - STK_CMD_CLOSE_CHANNEL
+ * - STK_CMD_SEND_DATA
+ * - STK_CMD_RECEIVE_DATA
+ */
+[scriptable, uuid(61c42b3c-6324-11e4-959e-7fb2dc9a3f0d)]
+interface nsIStkTextMessageCmd : nsIStkProactiveCmd
+{
+  /**
+   * Text String.
+   */
+  readonly attribute DOMString text;
+
+  /**
+   * (Optional)
+   * Icon to be displayed.
+   */
+  readonly attribute nsIStkIconInfo iconInfo;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_DISPLAY_TEXT.
+ */
+[scriptable, uuid(66a83f0a-6322-11e4-a773-9382de87a74a)]
+interface nsIStkDisplayTextCmd : nsIStkTextMessageCmd
+{
+  /**
+   * (Optional)
+   * The length of time for which the ME shall display the dialog.
+   */
+  readonly attribute nsIStkDuration duration;
+
+  /**
+   * Indicate this text message is high priority or normal priority.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, Display Text, bit 1.
+   *
+   * true: high priority
+   * false: normal priority
+   */
+  readonly attribute boolean isHighPriority;
+
+  /**
+   * Need to wait for user to clear message or not.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, Display Text, bit 8.
+   *
+   * true: Wait for user to clear message.
+   * false: clear message after a delay.
+   */
+  readonly attribute boolean userClear;
+
+  /**
+   * Need to response immediately or not.
+   *
+   * @see TS 11.14, clause 12.43, Immediate response.
+   *
+   * true: The terminal shall send response immediately.
+   * false: otherwise.
+   */
+  readonly attribute boolean responseNeeded;
+};
+
+/**
+ * The base interface of nsIStkInputKeyCmd, nsIStkInputTextCmd.
+ */
+[scriptable, uuid(ed16a67e-6022-11e4-a8fd-c34fe6e6bb11)]
+interface nsIStkInputCmd : nsIStkProactiveCmd
+{
+  /**
+   * Text for the ME to display in conjunction with asking the user to respond.
+   */
+  readonly attribute DOMString text;
+
+  /**
+   * (Optional)
+   * The length of time for which the ME shall display the dialog.
+   */
+  readonly attribute nsIStkDuration duration;
+
+  /**
+   * Minimum length of response.
+   * Set to 1 for STK_CMD_GET_INKEY.
+   */
+  readonly attribute unsigned short minLength;
+
+  /**
+   * Maximum length of response.
+   * Set to 1 for STK_CMD_GET_INKEY.
+   */
+  readonly attribute unsigned short maxLength;
+
+  /**
+   * (Optional)
+   * Text for the ME to display, corresponds to a default text string offered
+   * by the ICC.
+   */
+  readonly attribute DOMString defaultText;
+
+  /**
+   * Input format.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, GET INPUT/GET INKEY, bit 1.
+   *
+   * true: Alphabet set.
+   * false: Digits only.
+   */
+  readonly attribute boolean isAlphabet;
+
+  /**
+   * Alphabet encoding.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, GET INPUT/GET INKEY, bit 2.
+   *
+   * true: UCS2 alphabet.
+   * false: default SMS alphabet.
+   */
+  readonly attribute boolean isUCS2;
+
+  /**
+   * Help information available or not.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, GET INPUT/GET INKEY, bit 8.
+   *
+   * true: help information available.
+   * false: no help information available.
+   */
+  readonly attribute boolean isHelpAvailable;
+
+  /**
+   * (Optional)
+   * Icon to be displayed.
+   */
+  readonly attribute nsIStkIconInfo iconInfo;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_GET_INKEY.
+ */
+[scriptable, uuid(27a4078a-6025-11e4-a9ab-bf39252bfaf1)]
+interface nsIStkInputKeyCmd : nsIStkInputCmd
+{
+  /**
+   * Yes/No response is requested.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, GET INKEY, bit 3.
+   *
+   * true: Yes/No response is requested, and character sets
+   *       (Alphabet set and UCS2) are disabled.
+   * false: Character sets (Alphabet set and UCS2) are enabled.
+   */
+  readonly attribute boolean isYesNoRequested;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_GET_INPUT.
+ */
+[scriptable, uuid(f3c33ae8-60d4-11e4-9da8-4ff4cb8566c3)]
+interface nsIStkInputTextCmd : nsIStkInputCmd
+{
+  /**
+   * Visibility of input.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, GET INPUT, bit 3.
+   *
+   * true: User input shall not be revealed in any way.
+   * false: ME may echo user input on the display.
+   */
+  readonly attribute boolean hideInput;
+
+  /**
+   * User input in packed or unpacked format.
+   *
+   * @see TS 11.14, clause 12.6, Command Qualifier, GET INPUT, bit 4.
+   *
+   * true: User input to be in SMS packed format.
+   * false: User input to be in unpacked format.
+   */
+  readonly attribute boolean isPacked;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_SET_UP_CALL.
+ */
+[scriptable, uuid(6abbf688-6956-11e4-a9d3-4b07f063ef21)]
+interface nsIStkSetUpCallCmd : nsIStkProactiveCmd
+{
+  /**
+   * The Dialling number.
+   */
+  readonly attribute DOMString address;
+
+  /**
+   * (Optional)
+   * The text message used in user confirmation phase.
+   */
+  readonly attribute DOMString confirmText;
+
+  /**
+   * (Optional)
+   * Icon to be displayed in user confirmation phase.
+   */
+  readonly attribute nsIStkIconInfo confirmIconInfo;
+
+  /**
+   * (Optional)
+   * The text message used in call set up phase.
+   */
+  readonly attribute DOMString callText;
+
+  /**
+   * (Optional)
+   * Icon to be displayed in call set up phase.
+   */
+  readonly attribute nsIStkIconInfo callIconInfo;
+
+  /**
+   * (Optional)
+   * The maximum duration for the redial mechanism.
+   * The time elapsed since the first call set-up attempt has exceeded the duration
+   * requested by the UICC, the redial mechanism is terminated.
+   */
+  readonly attribute nsIStkDuration duration;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_LAUNCH_BROWSER.
+ */
+[scriptable, uuid(b9bca548-695b-11e4-8c1f-cfb850f421ab)]
+interface nsIStkBrowserSettingCmd : nsIStkProactiveCmd
+{
+  /**
+   * The URL to be opened by browser.
+   */
+  readonly attribute DOMString url;
+
+  /**
+   * Browser launch mode.
+   * @See TS 11.14, clause 12.6, Command Qualifier, LAUNCH BROWSER.
+   */
+  readonly attribute unsigned short mode;
+
+  /**
+   * (Optional)
+   * Confirm message to launch browser.
+   */
+  readonly attribute DOMString confirmText;
+
+  /**
+   * (Optional)
+   * Icon to be displayed in user confirmation phase.
+   */
+  readonly attribute nsIStkIconInfo confirmIconInfo;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_PLAY_TONE.
+ */
+[scriptable, uuid(f49dd148-60ee-11e4-af46-6b938538de51)]
+interface nsIStkPlayToneCmd : nsIStkProactiveCmd
+{
+  const unsigned short TONE_TYPE_INVALID = 0xFFFF;
+
+  /**
+   * (Optional)
+   * Text String.
+   */
+  readonly attribute DOMString text;
+
+  /**
+   * (Optional)
+   * One of the tone value coded in TS 11.14, clause 12.16, Tone.
+   *
+   * Set to TONE_TYPE_INVALID if null.
+   */
+  readonly attribute unsigned short tone;
+
+  /**
+   * (Optional)
+   * The length of time for which the ME shall generate the tone.
+   */
+  readonly attribute nsIStkDuration duration;
+
+  /**
+   * Need to vibrate or not.
+   * true: vibrate alert, if available, with the tone.
+   * false: use of vibrate alert is up to the ME.
+   */
+  readonly attribute boolean isVibrate;
+
+  /**
+   * (Optional)
+   * Icon to be displayed.
+   */
+  readonly attribute nsIStkIconInfo iconInfo;
+};
+
+/**
+ * This interface is to be applied by STK_CMD_TIMER_MANAGEMENT.
+ */
+[scriptable, uuid(e421b122-60f3-11e4-b8d7-bfe75825a796)]
+interface nsIStkTimerManagementCmd : nsIStkProactiveCmd
+{
+  /**
+   * Timer Information.
+   */
+  readonly attribute nsIStkTimer timerInfo;
+};
+
+[scriptable, uuid(000696fe-5d85-11e4-8da2-2fdf3880276b)]
+interface nsIIccMessenger : nsISupports
+{
+  /**
+   * To broadcast 'icc-stkcommand' system message
+   *
+   * @param aIccId
+   *        Integrated Circuit Card Identifier.
+   * @param aCommand
+   *        An instance of nsIStkProactiveCmd or its sub-class.
+   */
+  void notifyStkProactiveCommand(in DOMString aIccId,
+                                 in nsIStkProactiveCmd aCommand);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/moz.build	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/moz.build	2014-11-26 21:45:59.000000000 +0000
@@ -22,6 +22,11 @@
     'IccManager.cpp',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
+    EXTRA_JS_MODULES += [
+        'gonk/StkProactiveCmdFactory.jsm',
+    ]
+
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/tests/marionette/stk_helper.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/tests/marionette/stk_helper.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/tests/marionette/stk_helper.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/tests/marionette/stk_helper.js	2014-11-26 21:45:59.000000000 +0000
@@ -92,6 +92,14 @@
   }
 }
 
+function isStkText(stkText, expectedStkText, message) {
+  is(stkText.text, expectedStkText.text, message);
+  if (expectedStkText.icons) {
+    is(stkText.iconSelfExplanatory, expectedStkText.iconSelfExplanatory, message);
+    isIcons(stkText.icons, expectedStkText.icons, message);
+  }
+}
+
 let pendingEmulatorCmdCount = 0;
 function sendStkPduToEmulator(command, func, expect) {
   ++pendingEmulatorCmdCount;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/tests/marionette/test_stk_launch_browser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/tests/marionette/test_stk_launch_browser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/tests/marionette/test_stk_launch_browser.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/tests/marionette/test_stk_launch_browser.js	2014-11-26 21:45:59.000000000 +0000
@@ -8,16 +8,8 @@
   is(command.typeOfCommand, iccManager.STK_CMD_LAUNCH_BROWSER, expect.name);
   is(command.commandQualifier, expect.commandQualifier, expect.name);
   is(command.options.url, expect.url, expect.name);
-  if (command.options.confirmMessage) {
-    is(command.options.confirmMessage, expect.text, expect.name);
-  }
-
-  let icons = command.options.icons;
-  if (icons) {
-    isIcons(icons, expect.icons, expect.name);
-
-    let iconSelfExplanatory = command.options.iconSelfExplanatory;
-    is(iconSelfExplanatory, expect.iconSelfExplanatory, expect.name);
+  if (expect.confirmMessage) {
+    isStkText(command.options.confirmMessage, expect.confirmMessage, expect.name);
   }
 
   runNextTest();
@@ -29,233 +21,247 @@
    expect: {name: "launch_browser_cmd_1",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL"}},
+            confirmMessage: { text: "Default URL" }}},
   {command: "d01f8103011500820281823112687474703a2f2f7878782e7979792e7a7a7a0500",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_2",
             commandQualifier: 0x00,
             url: "http://xxx.yyy.zzz",
-            text: ""}},
+            confirmMessage: { text: "" }}},
   {command: "d00e8103011500820281823001003100",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_3",
             commandQualifier: 0x00,
-            url: "",
-            text: ""}},
-  {command: "d02081030115008202818231003201030d10046162632e6465662e6768692e6a6b6c",
+            url: ""}},
+  {command: "d0208103011500820281823100320103" +
+            "0d10046162632e6465662e6768692e6a6b6c", // "0D" String TLV is useless for Launch Browser.
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_4",
             commandQualifier: 0x00,
-            url: "",
-            text: ""}},
+            url: ""}},
   {command: "d0188103011502820281823100050b44656661756c742055524c",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_5",
             commandQualifier: 0x02,
             url: "",
-            text: "Default URL"}},
+            confirmMessage: { text: "Default URL" }}},
   {command: "d0188103011503820281823100050b44656661756c742055524c",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_6",
             commandQualifier: 0x03,
             url: "",
-            text: "Default URL"}},
+            confirmMessage: { text: "Default URL"}}},
   {command: "d00b8103011500820281823100",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_7",
             commandQualifier: 0x00,
-            url: "",
-            text: ""}},
+            url: ""}},
   {command: "d0268103011502820281823100051980041704140420041004120421042204120423041904220415",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_8",
             commandQualifier: 0x02,
             url: "",
-            text: "ЗДР�ВСТВУЙТЕ"}},
+            confirmMessage: { text: "ЗДР�ВСТВУЙТЕ" }}},
   {command: "d021810301150282028182310005104e6f742073656c66206578706c616e2e1e020101",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_9",
             commandQualifier: 0x02,
             url: "",
-            text: "Not self explan.",
-            iconSelfExplanatory: false,
-            icons: [basicIcon]}},
+            confirmMessage: { text: "Not self explan.",
+                              iconSelfExplanatory: false,
+                              icons : [basicIcon] }
+            }},
   {command: "d01d8103011502820281823100050c53656c66206578706c616e2e1e020001",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_10",
             commandQualifier: 0x02,
             url: "",
-            text: "Self explan.",
-            iconSelfExplanatory: true,
-            icons: [basicIcon]}},
+            confirmMessage: { text: "Self explan.",
+                              iconSelfExplanatory: true,
+                              icons : [basicIcon] }
+            }},
   {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_11",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2032",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_12",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d01b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_13",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2032",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_14",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d02b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_15",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2032",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_16",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d04b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_17",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2032d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_18",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2033",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_19",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 3"}},
+            confirmMessage: { text: "Default URL 3" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d08b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_20",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2032d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_21",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2033",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_22",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 3"}},
+            confirmMessage: { text: "Default URL 3" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d10b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_23",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2032d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_24",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2033",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_25",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 3"}},
+            confirmMessage: { text: "Default URL 3" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d20b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_26",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2032d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_27",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2033",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_28",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 3"}},
+            confirmMessage: { text: "Default URL 3" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d40b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_29",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2032d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_30",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2033",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_31",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 3"}},
+            confirmMessage: { text: "Default URL 3" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d80b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_32",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d0208103011500820281823100050d44656661756c742055524c2032d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_33",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2033",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_34",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 3"}},
+            confirmMessage: { text: "Default URL 3" }}},
    {command: "d0208103011500820281823100050d44656661756c742055524c2031d004000d00b4",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_35",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 1"}},
+            confirmMessage: { text: "Default URL 1" }}},
   {command: "d01a8103011500820281823100050d44656661756c742055524c2032",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_36",
             commandQualifier: 0x00,
             url: "",
-            text: "Default URL 2"}},
+            confirmMessage: { text: "Default URL 2" }}},
    {command: "d01281030115028202818231000505804f60597d",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_37",
             commandQualifier: 0x02,
             url: "",
-            text: "你好"}},
+            confirmMessage: { text: "你好" }}},
   {command: "d010810301150282028182310005038030eb",
    func: testLaunchBrowser,
    expect: {name: "launch_browser_cmd_38",
             commandQualifier: 0x02,
             url: "",
-            text: "�"}}
+            confirmMessage: { text: "�" }}},
+  {command: "d01281030115008202818230010031001e020001",
+   func: testLaunchBrowser,
+   expect: {name: "launch_browser_cmd_39",
+            commandQualifier: 0x00,
+            url: "",
+            confirmMessage: { iconSelfExplanatory: true,
+                              icons: [basicIcon] }}},
+  {command: "d01281030115008202818230010031001e020003",
+   func: testLaunchBrowser,
+   expect: {name: "launch_browser_cmd_40",
+            commandQualifier: 0x00,
+            url: "",
+            confirmMessage: { iconSelfExplanatory: true,
+                              icons: [colorIcon] }}},
 ];
 
 runNextTest();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/tests/marionette/test_stk_setup_call.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/tests/marionette/test_stk_setup_call.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/icc/tests/marionette/test_stk_setup_call.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/icc/tests/marionette/test_stk_setup_call.js	2014-11-26 21:45:59.000000000 +0000
@@ -7,9 +7,14 @@
   log("STK CMD " + JSON.stringify(command));
   is(command.typeOfCommand, iccManager.STK_CMD_SET_UP_CALL, expect.name);
   is(command.commandQualifier, expect.commandQualifier, expect.name);
-  is(command.options.confirmMessage, expect.confirmMessage, expect.name);
   is(command.options.address, expect.address, expect.name);
-  is(command.options.callMessage, expect.callMessage, expect.name);
+
+  if (expect.confirmMessage) {
+    isStkText(command.options.confirmMessage, expect.confirmMessage, expect.name);
+  }
+  if (expect.callMessage) {
+    isStkText(command.options.callMessage, expect.callMessage, expect.name);
+  }
 
   let duration = command.options.duration;
   if (duration) {
@@ -17,14 +22,6 @@
     is(duration.timeInterval, expect.duration.timeInterval, expect.name);
   }
 
-  let icons = command.options.icons;
-  if (icons) {
-    isIcons(icons, expect.icons, expect.name);
-
-    let iconSelfExplanatory = command.options.iconSelfExplanatory;
-    is(iconSelfExplanatory, expect.iconSelfExplanatory, expect.name);
-  }
-
   runNextTest();
 }
 
@@ -33,25 +30,25 @@
    func: testSetupCall,
    expect: {name: "setup_call_cmd_1",
             commandQualifier: 0x00,
-            confirmMessage: "Not busy",
+            confirmMessage: { text: "Not busy" },
             address: "+012340123456,1,2"}},
   {command: "d01d81030110028202818385074f6e20686f6c648609911032042143651c2c",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_2",
             commandQualifier: 0x02,
-            confirmMessage: "On hold",
+            confirmMessage: { text: "On hold" },
             address: "+012340123456,1,2"}},
   {command: "d020810301100482028183850a446973636f6e6e6563748609911032042143651c2c",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_3",
             commandQualifier: 0x04,
-            confirmMessage: "Disconnect",
+            confirmMessage: { text: "Disconnect" },
             address: "+012340123456,1,2"}},
   {command: "d02b81030110008202818385114361706162696c69747920636f6e6669678609911032042143651c2c870201a0",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_4",
             commandQualifier: 0x00,
-            confirmMessage: "Capability config",
+            confirmMessage: { text: "Capability config" },
             address: "+012340123456,1,2"}},
   {command: "d01c81030110018202818386119110325476981032547698103254769810",
    func: testSetupCall,
@@ -62,19 +59,19 @@
    func: testSetupCall,
    expect: {name: "setup_call_cmd_6",
             commandQualifier: 0x01,
-            confirmMessage: "Three types are defined: - set up a call, but only if not currently busy on another call; - set up a call, putting all other calls (if any) on hold; - set up a call, disconnecting all other calls (if any) first. For each of these types, ",
+            confirmMessage: { text: "Three types are defined: - set up a call, but only if not currently busy on another call; - set up a call, putting all other calls (if any) on hold; - set up a call, disconnecting all other calls (if any) first. For each of these types, " },
             address: "+01"}},
   {command: "d02b810301100082028183850c43616c6c65642070617274798609911032042143651c2c880780509595959595",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_7",
             commandQualifier: 0x00,
-            confirmMessage: "Called party",
+            confirmMessage: { text: "Called party" },
             address: "+012340123456,1,2"}},
   {command: "d02281030110018202818385084475726174696f6e8609911032042143651c2c8402010a",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_8",
             commandQualifier: 0x01,
-            confirmMessage: "Duration",
+            confirmMessage: { text: "Duration" },
             address: "+012340123456,1,2",
             duration: {timeUnit: iccManager.STK_TIME_UNIT_SECOND,
                        timeInterval: 0x0A}}},
@@ -82,279 +79,298 @@
    func: testSetupCall,
    expect: {name: "setup_call_cmd_9",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION",
-            callMessage: "CALL",
+            confirmMessage: { text: "CONFIRMATION" },
+            callMessage: { text: "CALL" },
             address: "+012340123456,1,2"}},
   {command: "d03081030110008202818385165365742075702063616c6c2049636f6e20332e312e318609911032042143651c2c9e020101",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_10",
             commandQualifier: 0x00,
-            confirmMessage: "Set up call Icon 3.1.1",
-            address: "+012340123456,1,2",
-            iconSelfExplanatory: false,
-            icons: [basicIcon]}},
+            confirmMessage: { text: "Set up call Icon 3.1.1",
+                              iconSelfExplanatory: false,
+                              icons: [basicIcon] },
+            address: "+012340123456,1,2"}},
   {command: "d03081030110008202818385165365742075702063616c6c2049636f6e20332e322e318609911032042143651c2c9e020001",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_11",
             commandQualifier: 0x00,
-            confirmMessage: "Set up call Icon 3.2.1",
-            address: "+012340123456,1,2",
-            iconSelfExplanatory: true,
-            icons: [basicIcon]}},
+            confirmMessage: { text: "Set up call Icon 3.2.1",
+                              iconSelfExplanatory: true,
+                              icons: [basicIcon] },
+            address: "+012340123456,1,2"}},
   {command: "d03081030110008202818385165365742075702063616c6c2049636f6e20332e332e318609911032042143651c2c9e020103",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_12",
             commandQualifier: 0x00,
-            confirmMessage: "Set up call Icon 3.3.1",
-            address: "+012340123456,1,2",
-            iconSelfExplanatory: false,
-            icons: [colorIcon]}},
+            confirmMessage: { text: "Set up call Icon 3.3.1",
+                              iconSelfExplanatory: false,
+                              icons: [colorIcon] },
+            address: "+012340123456,1,2"}},
   {command: "d04c81030110008202818385165365742075702063616c6c2049636f6e20332e342e318609911032042143651c2c9e02000185165365742075702063616c6c2049636f6e20332e342e329e020001",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_13",
             commandQualifier: 0x00,
-            confirmMessage: "Set up call Icon 3.4.1",
-            callMessage: "Set up call Icon 3.4.2",
-            address: "+012340123456,1,2",
-            iconSelfExplanatory: true,
-            icons: [basicIcon]}},
+            confirmMessage: { text: "Set up call Icon 3.4.1",
+                              iconSelfExplanatory: true,
+                              icons: [basicIcon] },
+            callMessage: { text: "Set up call Icon 3.4.2" },
+            address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_14",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_15",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e01b4d004000601b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_16",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_17",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e02b4d004000602b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_18",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_19",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e04b4d004000604b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_20",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_21",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20338609911032042143651c2c850643414c4c2033",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_22",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 3",
-            callMessage: "CALL 3",
+            confirmMessage: { text: "CONFIRMATION 3" },
+            callMessage: { text: "CALL 3" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e08b4d004000608b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_23",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_24",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20338609911032042143651c2c850643414c4c2033",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_25",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 3",
-            callMessage: "CALL 3",
+            confirmMessage: { text: "CONFIRMATION 3" },
+            callMessage: { text: "CALL 3" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e10b4d004000610b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_26",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_27",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20338609911032042143651c2c850643414c4c2033",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_28",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 3",
-            callMessage: "CALL 3",
+            confirmMessage: { text: "CONFIRMATION 3" },
+            callMessage: { text: "CALL 3" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e20b4d004000620b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_29",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_30",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20338609911032042143651c2c850643414c4c2033",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_31",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 3",
-            callMessage: "CALL 3",
+            confirmMessage: { text: "CONFIRMATION 3" },
+            callMessage: { text: "CALL 3" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e40b4d004000640b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_32",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_33",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20338609911032042143651c2c850643414c4c2033",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_34",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 3",
-            callMessage: "CALL 3",
+            confirmMessage: { text: "CONFIRMATION 3" },
+            callMessage: { text: "CALL 3" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e80b4d004000680b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_35",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032d004000e00b4d004000600b4",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_36",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20338609911032042143651c2c850643414c4c2033",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_37",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 3",
-            callMessage: "CALL 3",
+            confirmMessage: { text: "CONFIRMATION 3" },
+            callMessage: { text: "CALL 3" },
             address: "+012340123456,1,2"}},
   {command: "d038810301100082028183850e434f4e4649524d4154494f4e20318609911032042143651c2c850643414c4c2031d004000e00b4d0040006004b",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_38",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 1",
-            callMessage: "CALL 1",
+            confirmMessage: { text: "CONFIRMATION 1" },
+            callMessage: { text: "CALL 1" },
             address: "+012340123456,1,2"}},
   {command: "d02c810301100082028183850e434f4e4649524d4154494f4e20328609911032042143651c2c850643414c4c2032",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_39",
             commandQualifier: 0x00,
-            confirmMessage: "CONFIRMATION 2",
-            callMessage: "CALL 2",
+            confirmMessage: { text: "CONFIRMATION 2" },
+            callMessage: { text: "CALL 2" },
             address: "+012340123456,1,2"}},
   {command: "d02d810301100082028183851980041704140420041004120421042204120423041904220415860791103204214365",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_40",
             commandQualifier: 0x00,
-            confirmMessage: "ЗДР�ВСТВУЙТЕ",
+            confirmMessage: { text: "ЗДР�ВСТВУЙТЕ" },
             address: "+012340123456"}},
   {command: "d04c810301100082028183851b800417041404200410041204210422041204230419042204150031860791103204214365851b800417041404200410041204210422041204230419042204150032",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_41",
             commandQualifier: 0x00,
-            confirmMessage: "ЗДР�ВСТВУЙТЕ1",
-            callMessage: "ЗДР�ВСТВУЙТЕ2",
+            confirmMessage: { text: "ЗДР�ВСТВУЙТЕ1" },
+            callMessage: { text: "ЗДР�ВСТВУЙТЕ2" },
             address: "+012340123456"}},
   {command: "d0198103011000820281838505804e0d5fd9860791103204214365",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_42",
             commandQualifier: 0x00,
-            confirmMessage: "不忙",
+            confirmMessage: { text: "不忙" },
             address: "+012340123456"}},
   {command: "d022810301100082028183850580786e5b9a860791103204214365850780625375358bdd",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_43",
             commandQualifier: 0x00,
-            confirmMessage: "确定",
-            callMessage: "打电话",
+            confirmMessage: { text: "确定" },
+            callMessage: { text: "打电话" },
             address: "+012340123456"}},
   {command: "d01781030110008202818385038030eb860791103204214365",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_44",
             commandQualifier: 0x00,
-            confirmMessage: "�",
+            confirmMessage: { text: "�" },
             address: "+012340123456"}},
   {command: "d02081030110008202818385058030eb003186079110320421436585058030eb0032",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_45",
             commandQualifier: 0x00,
-            confirmMessage: "�1",
-            callMessage:"�2",
+            confirmMessage: { text: "�1" },
+            callMessage: { text: "�2" },
             address: "+012340123456"}},
   {command: "d029810301100482028182050a446973636f6e6e6563748609811032042143651c2c05074d657373616765",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_46",
             commandQualifier: 0x04,
-            confirmMessage: "Disconnect",
+            confirmMessage: { text: "Disconnect" },
             address: "012340123456,1,2",
-            callMessage: "Message"}},
+            callMessage: { text: "Message"}}},
   {command: "d02281030110008202818385084E6F7420627573798609911032042143651C2C8402010A",
    func: testSetupCall,
    expect: {name: "setup_call_cmd_47",
             commandQualifier: 0x00,
-             confirmMessage: "Not busy",
-             address: "+012340123456,1,2",
+            confirmMessage: { text: "Not busy" },
+            address: "+012340123456,1,2",
             duration: {timeUnit: iccManager.STK_TIME_UNIT_SECOND,
                        timeInterval: 0x0A}}},
-
+  {command: "d04c81030110008202818385165365742075702063616c6c2049636f6e20332e352e318609911032042143651c2c9e02000185165365742075702063616c6c2049636f6e20332e352e329e020103",
+   func: testSetupCall,
+   expect: {name: "setup_call_cmd_48",
+            commandQualifier: 0x00,
+            confirmMessage: { text: "Set up call Icon 3.5.1",
+                              iconSelfExplanatory: true,
+                              icons: [basicIcon] },
+            callMessage: { text: "Set up call Icon 3.5.2",
+                           iconSelfExplanatory: false,
+                           icons: [colorIcon] },
+            address: "+012340123456,1,2"}},
+  {command: "d01c8103011000820281838609911032042143651c2c9e0200019e020103",
+   func: testSetupCall,
+   expect: {name: "setup_call_cmd_49",
+            commandQualifier: 0x00,
+            confirmMessage: { iconSelfExplanatory: true,
+                              icons: [basicIcon] },
+            callMessage: { iconSelfExplanatory: false,
+                           icons: [colorIcon] },
+            address: "+012340123456,1,2"}},
 ];
 
 runNextTest();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/identity/nsDOMIdentity.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/identity/nsDOMIdentity.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/identity/nsDOMIdentity.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/identity/nsDOMIdentity.js	2014-11-26 21:45:59.000000000 +0000
@@ -101,11 +101,16 @@
     // September, 2012. Both names will continue to work for the time being,
     // but code should be changed to use loggedInUser instead.
     checkRenamed(aOptions, "loggedInEmail", "loggedInUser");
+
+    // Bad IPC or IDL converts null and undefined to "null" and "undefined".
+    // We can't assign to aOptions, which complicates the workaround.
     message["loggedInUser"] = aOptions["loggedInUser"];
+    if (message.loggedInUser == "null" || message.loggedInUser == "undefined") {
+      message.loggedInUser = null;
+    }
 
-    let emailType = typeof(aOptions["loggedInUser"]);
-    if (aOptions["loggedInUser"] && aOptions["loggedInUser"] !== "undefined") {
-      if (emailType !== "string") {
+    if (message.loggedInUser) {
+      if (typeof(message.loggedInUser) !== "string") {
         throw new Error("loggedInUser must be a String or null");
       }
 
@@ -115,8 +120,6 @@
           || aOptions["loggedInUser"].length > MAX_STRING_LENGTH) {
         throw new Error("loggedInUser is not valid");
       }
-      // Set loggedInUser in this block that "undefined" doesn't get through.
-      message.loggedInUser = aOptions.loggedInUser;
     }
     this._log("loggedInUser: " + message.loggedInUser);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/imptests/editing/implementation.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/imptests/editing/implementation.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/imptests/editing/implementation.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/imptests/editing/implementation.js	2014-11-26 21:45:59.000000000 +0000
@@ -1973,9 +1973,9 @@
 	&& (node.style.length == 1
 	|| (node.style.length == 4
 		&& "MozTextBlink" in node.style
-		&& "MozTextDecorationColor" in node.style
-		&& "MozTextDecorationLine" in node.style
-		&& "MozTextDecorationStyle" in node.style)
+		&& "textDecorationColor" in node.style
+		&& "textDecorationLine" in node.style
+		&& "textDecorationStyle" in node.style)
 	)
 	&& (node.style.textDecoration == "line-through"
 	|| node.style.textDecoration == "underline"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/imptests/idlharness.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/imptests/idlharness.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/imptests/idlharness.js	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/imptests/idlharness.js	2014-11-26 21:45:59.000000000 +0000
@@ -1150,15 +1150,15 @@
 
     if (!this.is_callback()) {
         test(function() {
-            // This function tests WebIDL as of 2013-08-25.
-            // http://dev.w3.org/2006/webapi/WebIDL/#es-interface-call
+            // This function tests WebIDL as of 2014-10-25.
+            // https://heycam.github.io/webidl/#es-interface-call
 
             assert_own_property(window, this.name,
                                 "window does not have own property " + format_value(this.name));
 
             // "Interface objects for non-callback interfaces MUST have a
             // property named “length” with attributes { [[Writable]]: false,
-            // [[Enumerable]]: false, [[Configurable]]: false } whose value is
+            // [[Enumerable]]: false, [[Configurable]]: true } whose value is
             // a Number."
             assert_own_property(window[this.name], "length");
             var desc = Object.getOwnPropertyDescriptor(window[this.name], "length");
@@ -1166,7 +1166,7 @@
             assert_false("set" in desc, this.name + ".length has setter");
             assert_false(desc.writable, this.name + ".length is writable");
             assert_false(desc.enumerable, this.name + ".length is enumerable");
-            assert_false(desc.configurable, this.name + ".length is configurable");
+            assert_true(desc.configurable, this.name + ".length is not configurable");
 
             var constructors = this.extAttrs
                 .filter(function(attr) { return attr.name == "Constructor"; });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/ActorsChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/ActorsChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/ActorsChild.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/ActorsChild.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -551,59 +551,6 @@
 }
 
 void
-DispatchSuccessEvent(ResultHelper* aResultHelper,
-                     nsIDOMEvent* aEvent = nullptr)
-{
-  MOZ_ASSERT(aResultHelper);
-
-  PROFILER_LABEL("IndexedDB",
-                 "DispatchSuccessEvent",
-                 js::ProfileEntry::Category::STORAGE);
-
-  nsRefPtr<IDBRequest> request = aResultHelper->Request();
-  MOZ_ASSERT(request);
-  request->AssertIsOnOwningThread();
-
-  nsRefPtr<IDBTransaction> transaction = aResultHelper->Transaction();
-
-  nsCOMPtr<nsIDOMEvent> successEvent;
-  if (!aEvent) {
-    successEvent = CreateGenericEvent(request,
-                                      nsDependentString(kSuccessEventType),
-                                      eDoesNotBubble,
-                                      eNotCancelable);
-    if (NS_WARN_IF(!successEvent)) {
-      return;
-    }
-
-    aEvent = successEvent;
-  }
-
-  request->SetResultCallback(aResultHelper);
-
-  MOZ_ASSERT(aEvent);
-  MOZ_ASSERT_IF(transaction, transaction->IsOpen());
-
-  bool dummy;
-  nsresult rv = request->DispatchEvent(aEvent, &dummy);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return;
-  }
-
-  MOZ_ASSERT_IF(transaction,
-                transaction->IsOpen() || transaction->IsAborted());
-
-  WidgetEvent* internalEvent = aEvent->GetInternalNSEvent();
-  MOZ_ASSERT(internalEvent);
-
-  if (transaction &&
-      transaction->IsOpen() &&
-      internalEvent->mFlags.mExceptionHasBeenRisen) {
-    transaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);
-  }
-}
-
-void
 DispatchErrorEvent(IDBRequest* aRequest,
                    nsresult aErrorCode,
                    IDBTransaction* aTransaction = nullptr,
@@ -662,6 +609,64 @@
   }
 }
 
+void
+DispatchSuccessEvent(ResultHelper* aResultHelper,
+                     nsIDOMEvent* aEvent = nullptr)
+{
+  MOZ_ASSERT(aResultHelper);
+
+  PROFILER_LABEL("IndexedDB",
+                 "DispatchSuccessEvent",
+                 js::ProfileEntry::Category::STORAGE);
+
+  nsRefPtr<IDBRequest> request = aResultHelper->Request();
+  MOZ_ASSERT(request);
+  request->AssertIsOnOwningThread();
+
+  nsRefPtr<IDBTransaction> transaction = aResultHelper->Transaction();
+
+  if (transaction && transaction->IsAborted()) {
+    DispatchErrorEvent(request, transaction->AbortCode(), transaction);
+    return;
+  }
+
+  nsCOMPtr<nsIDOMEvent> successEvent;
+  if (!aEvent) {
+    successEvent = CreateGenericEvent(request,
+                                      nsDependentString(kSuccessEventType),
+                                      eDoesNotBubble,
+                                      eNotCancelable);
+    if (NS_WARN_IF(!successEvent)) {
+      return;
+    }
+
+    aEvent = successEvent;
+  }
+
+  request->SetResultCallback(aResultHelper);
+
+  MOZ_ASSERT(aEvent);
+  MOZ_ASSERT_IF(transaction, transaction->IsOpen());
+
+  bool dummy;
+  nsresult rv = request->DispatchEvent(aEvent, &dummy);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  MOZ_ASSERT_IF(transaction,
+                transaction->IsOpen() || transaction->IsAborted());
+
+  WidgetEvent* internalEvent = aEvent->GetInternalNSEvent();
+  MOZ_ASSERT(internalEvent);
+
+  if (transaction &&
+      transaction->IsOpen() &&
+      internalEvent->mFlags.mExceptionHasBeenRisen) {
+    transaction->Abort(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);
+  }
+}
+
 } // anonymous namespace
 
 /*******************************************************************************
@@ -1240,8 +1245,14 @@
 
   auto actor = static_cast<BackgroundVersionChangeTransactionChild*>(aActor);
 
+  nsRefPtr<IDBOpenDBRequest> request = mOpenRequestActor->GetOpenDBRequest();
+  MOZ_ASSERT(request);
+
   nsRefPtr<IDBTransaction> transaction =
-    IDBTransaction::CreateVersionChange(mDatabase, actor, aNextObjectStoreId,
+    IDBTransaction::CreateVersionChange(mDatabase,
+                                        actor,
+                                        request,
+                                        aNextObjectStoreId,
                                         aNextIndexId);
   if (NS_WARN_IF(!transaction)) {
     return false;
@@ -1253,9 +1264,6 @@
 
   mDatabase->EnterSetVersionTransaction(aRequestedVersion);
 
-  nsRefPtr<IDBOpenDBRequest> request = mOpenRequestActor->GetOpenDBRequest();
-  MOZ_ASSERT(request);
-
   request->SetTransaction(transaction);
 
   nsCOMPtr<nsIDOMEvent> upgradeNeededEvent =
@@ -1316,7 +1324,7 @@
     if (shouldAbortAndClose) {
       // Invalidate() doesn't close the database in the parent, so we have
       // to call Close() and AbortTransactions() manually.
-      mDatabase->AbortTransactions();
+      mDatabase->AbortTransactions(/* aShouldWarn */ false);
       mDatabase->Close();
       return true;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/ActorsParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/ActorsParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/ActorsParent.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/ActorsParent.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -2198,7 +2198,13 @@
     // refcount function. This behavior changes with enabled recursive triggers,
     // so the statement fires the delete trigger first and then the insert
     // trigger.
-    "PRAGMA recursive_triggers = ON;";
+    "PRAGMA recursive_triggers = ON;"
+    // We don't need SQLite's table locks because we manage transaction ordering
+    // ourselves and we know we will never allow a write transaction to modify
+    // an object store that a read transaction is in the process of using.
+    "PRAGMA read_uncommitted = TRUE;"
+    // No more PRAGMAs.
+    ;
 
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(query));
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -5341,6 +5347,13 @@
   void
   CloseOnOwningThread();
 
+  void
+  AssertInvalidatedOnMainThread() const
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(mInvalidatedOnMainThread);
+  }
+
   NS_DECL_THREADSAFE_ISUPPORTS
 
 private:
@@ -9508,7 +9521,9 @@
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aStorage);
   MOZ_ASSERT(aStorage->GetClient() == this);
-  MOZ_ASSERT(aStorage->IsClosed());
+
+  static_cast<DatabaseOfflineStorage*>(aStorage)->
+    AssertInvalidatedOnMainThread();
 
   // Nothing to do here, calling DatabaseOfflineStorage::Close() should have
   // aborted any transactions already.
@@ -9903,8 +9918,6 @@
   nsCOMPtr<nsIEventTarget> owningThread = mOwningThread;
   MOZ_ASSERT(owningThread);
 
-  CloseOnMainThread();
-
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(owningThread->Dispatch(runnable,
                                                       NS_DISPATCH_NORMAL)));
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBDatabase.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBDatabase.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBDatabase.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBDatabase.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -39,9 +39,12 @@
 #include "mozilla/ipc/InputStreamParams.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "nsCOMPtr.h"
+#include "nsContentUtils.h"
+#include "nsIConsoleService.h"
 #include "nsIDocument.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
+#include "nsIScriptError.h"
 #include "nsISupportsPrimitives.h"
 #include "nsThreadUtils.h"
 #include "ProfilerHelpers.h"
@@ -314,7 +317,7 @@
   AssertIsOnOwningThread();
 
   InvalidateMutableFiles();
-  AbortTransactions();
+  AbortTransactions(/* aShouldWarn */ true);
 
   CloseInternal();
 }
@@ -751,7 +754,7 @@
 }
 
 void
-IDBDatabase::AbortTransactions()
+IDBDatabase::AbortTransactions(bool aShouldWarn)
 {
   AssertIsOnOwningThread();
 
@@ -759,27 +762,31 @@
   {
   public:
     static void
-    AbortTransactions(nsTHashtable<nsPtrHashKey<IDBTransaction>>& aTable)
+    AbortTransactions(nsTHashtable<nsPtrHashKey<IDBTransaction>>& aTable,
+                      nsTArray<nsRefPtr<IDBTransaction>>& aAbortedTransactions)
     {
       const uint32_t count = aTable.Count();
       if (!count) {
         return;
       }
 
-      nsTArray<nsRefPtr<IDBTransaction>> transactions;
+      nsAutoTArray<nsRefPtr<IDBTransaction>, 20> transactions;
       transactions.SetCapacity(count);
 
       aTable.EnumerateEntries(Collect, &transactions);
 
       MOZ_ASSERT(transactions.Length() == count);
 
-      IDB_REPORT_INTERNAL_ERR();
-
       for (uint32_t index = 0; index < count; index++) {
-        nsRefPtr<IDBTransaction> transaction = transactions[index].forget();
+        nsRefPtr<IDBTransaction> transaction = Move(transactions[index]);
         MOZ_ASSERT(transaction);
 
         transaction->Abort(NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
+
+        // We only care about warning for write transactions.
+        if (transaction->GetMode() != IDBTransaction::READ_ONLY) {
+          aAbortedTransactions.AppendElement(Move(transaction));
+        }
       }
     }
 
@@ -798,7 +805,25 @@
     }
   };
 
-  Helper::AbortTransactions(mTransactions);
+  nsAutoTArray<nsRefPtr<IDBTransaction>, 5> abortedTransactions;
+  Helper::AbortTransactions(mTransactions, abortedTransactions);
+
+  if (aShouldWarn && !abortedTransactions.IsEmpty()) {
+    static const char kWarningMessage[] = "IndexedDBTransactionAbortNavigation";
+
+    for (uint32_t count = abortedTransactions.Length(), index = 0;
+         index < count;
+         index++) {
+      nsRefPtr<IDBTransaction>& transaction = abortedTransactions[index];
+      MOZ_ASSERT(transaction);
+
+      nsString filename;
+      uint32_t lineNo;
+      transaction->GetCallerLocation(filename, &lineNo);
+
+      LogWarning(kWarningMessage, filename, lineNo);
+    }
+  }
 }
 
 PBackgroundIDBDatabaseFileChild*
@@ -1155,6 +1180,65 @@
   }
 }
 
+void
+IDBDatabase::LogWarning(const char* aMessageName,
+                        const nsAString& aFilename,
+                        uint32_t aLineNumber)
+{
+  AssertIsOnOwningThread();
+  MOZ_ASSERT(aMessageName);
+
+  // For now this is main-thread only.
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsXPIDLString localizedMessage;
+  if (NS_WARN_IF(NS_FAILED(
+    nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES,
+                                       aMessageName,
+                                       localizedMessage)))) {
+    return;
+  }
+
+  nsAutoCString category;
+  if (mFactory->IsChrome()) {
+    category.AssignLiteral("chrome ");
+  } else {
+    category.AssignLiteral("content ");
+  }
+  category.AppendLiteral("javascript");
+
+  nsCOMPtr<nsIConsoleService> consoleService =
+    do_GetService(NS_CONSOLESERVICE_CONTRACTID);
+  MOZ_ASSERT(consoleService);
+
+  nsCOMPtr<nsIScriptError> scriptError =
+    do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
+  MOZ_ASSERT(consoleService);
+
+  if (mFactory->GetParentObject()) {
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      scriptError->InitWithWindowID(localizedMessage,
+                                    aFilename,
+                                    /* aSourceLine */ EmptyString(),
+                                    aLineNumber,
+                                    /* aColumnNumber */ 0,
+                                    nsIScriptError::warningFlag,
+                                    category,
+                                    mFactory->InnerWindowID())));
+  } else {
+    MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+      scriptError->Init(localizedMessage,
+                        aFilename,
+                        /* aSourceLine */ EmptyString(),
+                        aLineNumber,
+                        /* aColumnNumber */ 0,
+                        nsIScriptError::warningFlag,
+                        category.get())));
+  }
+
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(consoleService->LogMessage(scriptError)));
+}
+
 NS_IMPL_ADDREF_INHERITED(IDBDatabase, IDBWrapperCache)
 NS_IMPL_RELEASE_INHERITED(IDBDatabase, IDBWrapperCache)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBDatabase.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBDatabase.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBDatabase.h	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBDatabase.h	2014-11-26 21:45:59.000000000 +0000
@@ -171,7 +171,7 @@
   UnregisterTransaction(IDBTransaction* aTransaction);
 
   void
-  AbortTransactions();
+  AbortTransactions(bool aShouldWarn);
 
   PBackgroundIDBDatabaseFileChild*
   GetOrCreateFileActorForBlob(File* aBlob);
@@ -299,6 +299,11 @@
 
   void
   InvalidateMutableFiles();
+
+  void
+  LogWarning(const char* aMessageName,
+             const nsAString& aFilename,
+             uint32_t aLineNumber);
 };
 
 } // namespace indexedDB
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBFactory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBFactory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBFactory.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBFactory.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -29,7 +29,7 @@
 #include "ActorsChild.h"
 
 #ifdef DEBUG
-#include "nsContentUtils.h" // For IsCallerChrome assertions.
+#include "nsContentUtils.h" // For assertions.
 #endif
 
 namespace mozilla {
@@ -110,6 +110,7 @@
 IDBFactory::IDBFactory()
   : mOwningObject(nullptr)
   , mBackgroundActor(nullptr)
+  , mInnerWindowID(0)
   , mBackgroundActorFailed(false)
   , mPrivateBrowsingMode(false)
 {
@@ -183,6 +184,7 @@
   factory->mPrincipalInfo = Move(principalInfo);
   factory->mWindow = aWindow;
   factory->mTabChild = TabChild::GetFrom(aWindow);
+  factory->mInnerWindowID = aWindow->WindowID();
   factory->mPrivateBrowsingMode = privateBrowsingMode;
 
   factory.forget(aFactory);
@@ -285,6 +287,15 @@
 
 #endif // DEBUG
 
+bool
+IDBFactory::IsChrome() const
+{
+  AssertIsOnOwningThread();
+  MOZ_ASSERT(mPrincipalInfo);
+
+  return mPrincipalInfo->type() == PrincipalInfo::TSystemPrincipalInfo;
+}
+
 void
 IDBFactory::SetBackgroundActor(BackgroundFactoryChild* aBackgroundActor)
 {
@@ -524,19 +535,20 @@
   nsRefPtr<IDBOpenDBRequest> request;
 
   if (mWindow) {
-    if (NS_WARN_IF(!autoJS.Init(mWindow))) {
+    AutoJSContext cx;
+    if (NS_WARN_IF(!autoJS.Init(mWindow, cx))) {
       IDB_REPORT_INTERNAL_ERR();
       aRv.Throw(NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
       return nullptr;
     }
 
-    JS::Rooted<JSObject*> scriptOwner(autoJS.cx(),
+    JS::Rooted<JSObject*> scriptOwner(cx,
       static_cast<nsGlobalWindow*>(mWindow.get())->FastGetGlobalJSObject());
     MOZ_ASSERT(scriptOwner);
 
     request = IDBOpenDBRequest::CreateForWindow(this, mWindow, scriptOwner);
   } else {
-    autoJS.Init();
+    autoJS.Init(mOwningObject.get());
     JS::Rooted<JSObject*> scriptOwner(autoJS.cx(), mOwningObject);
 
     request = IDBOpenDBRequest::CreateForJS(this, scriptOwner);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBFactory.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBFactory.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBFactory.h	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBFactory.h	2014-11-26 21:45:59.000000000 +0000
@@ -73,6 +73,8 @@
   PRThread* mOwningThread;
 #endif
 
+  uint64_t mInnerWindowID;
+
   bool mBackgroundActorFailed;
   bool mPrivateBrowsingMode;
 
@@ -130,6 +132,17 @@
     return mPrincipalInfo;
   }
 
+  uint64_t
+  InnerWindowID() const
+  {
+    AssertIsOnOwningThread();
+
+    return mInnerWindowID;
+  }
+
+  bool
+  IsChrome() const;
+
   already_AddRefed<IDBOpenDBRequest>
   Open(const nsAString& aName,
        uint64_t aVersion,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBRequest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBRequest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBRequest.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBRequest.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -99,12 +99,11 @@
   aDatabase->AssertIsOnOwningThread();
 
   nsRefPtr<IDBRequest> request = new IDBRequest(aDatabase);
+  CaptureCaller(request->mFilename, &request->mLineNo);
 
   request->mTransaction = aTransaction;
   request->SetScriptOwner(aDatabase->GetScriptOwner());
 
-  request->CaptureCaller();
-
   return request.forget();
 }
 
@@ -140,6 +139,26 @@
   return request.forget();
 }
 
+// static
+void
+IDBRequest::CaptureCaller(nsAString& aFilename, uint32_t* aLineNo)
+{
+  MOZ_ASSERT(aFilename.IsEmpty());
+  MOZ_ASSERT(aLineNo);
+
+  ThreadsafeAutoJSContext cx;
+
+  const char* filename = nullptr;
+  uint32_t lineNo = 0;
+  if (!nsJSUtils::GetCallingLocation(cx, &filename, &lineNo)) {
+    *aLineNo = 0;
+    return;
+  }
+
+  aFilename.Assign(NS_ConvertUTF8toUTF16(filename));
+  *aLineNo = lineNo;
+}
+
 void
 IDBRequest::GetSource(
              Nullable<OwningIDBObjectStoreOrIDBIndexOrIDBCursor>& aSource) const
@@ -227,25 +246,13 @@
 #endif // DEBUG
 
 void
-IDBRequest::CaptureCaller()
+IDBRequest::GetCallerLocation(nsAString& aFilename, uint32_t* aLineNo) const
 {
-  AutoJSContext cx;
-
-  const char* filename = nullptr;
-  uint32_t lineNo = 0;
-  if (!nsJSUtils::GetCallingLocation(cx, &filename, &lineNo)) {
-    return;
-  }
-
-  mFilename.Assign(NS_ConvertUTF8toUTF16(filename));
-  mLineNo = lineNo;
-}
+  AssertIsOnOwningThread();
+  MOZ_ASSERT(aLineNo);
 
-void
-IDBRequest::FillScriptErrorEvent(ErrorEventInit& aEventInit) const
-{
-  aEventInit.mLineno = mLineNo;
-  aEventInit.mFilename = mFilename;
+  aFilename = mFilename;
+  *aLineNo = mLineNo;
 }
 
 IDBRequestReadyState
@@ -301,7 +308,6 @@
 
   // See if our window is still valid.
   if (NS_WARN_IF(NS_FAILED(CheckInnerWindowCorrectness()))) {
-    IDB_REPORT_INTERNAL_ERR();
     SetError(NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
     return;
   }
@@ -424,7 +430,7 @@
   MOZ_ASSERT(aScriptOwner);
 
   nsRefPtr<IDBOpenDBRequest> request = new IDBOpenDBRequest(aFactory, aOwner);
-  request->CaptureCaller();
+  CaptureCaller(request->mFilename, &request->mLineNo);
 
   request->SetScriptOwner(aScriptOwner);
 
@@ -441,7 +447,7 @@
   MOZ_ASSERT(aScriptOwner);
 
   nsRefPtr<IDBOpenDBRequest> request = new IDBOpenDBRequest(aFactory, nullptr);
-  request->CaptureCaller();
+  CaptureCaller(request->mFilename, &request->mLineNo);
 
   request->SetScriptOwner(aScriptOwner);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBRequest.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBRequest.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBRequest.h	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBRequest.h	2014-11-26 21:45:59.000000000 +0000
@@ -81,6 +81,9 @@
          IDBDatabase* aDatabase,
          IDBTransaction* aTransaction);
 
+  static void
+  CaptureCaller(nsAString& aFilename, uint32_t* aLineNo);
+
   // nsIDOMEventTarget
   virtual nsresult
   PreHandleEvent(EventChainPreVisitor& aVisitor) MOZ_OVERRIDE;
@@ -114,7 +117,7 @@
   GetError(ErrorResult& aRv);
 
   void
-  FillScriptErrorEvent(ErrorEventInit& aEventInit) const;
+  GetCallerLocation(nsAString& aFilename, uint32_t* aLineNo) const;
 
   bool
   IsPending() const
@@ -189,9 +192,6 @@
 
   void
   ConstructResult();
-
-  void
-  CaptureCaller();
 };
 
 class NS_NO_VTABLE IDBRequest::ResultCallback
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBTransaction.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBTransaction.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBTransaction.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBTransaction.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -48,6 +48,7 @@
   , mNextIndexId(0)
   , mAbortCode(NS_OK)
   , mPendingRequestCount(0)
+  , mLineNo(0)
   , mReadyState(IDBTransaction::INITIAL)
   , mMode(aMode)
   , mCreating(false)
@@ -127,12 +128,14 @@
 IDBTransaction::CreateVersionChange(
                                 IDBDatabase* aDatabase,
                                 BackgroundVersionChangeTransactionChild* aActor,
+                                IDBOpenDBRequest* aOpenRequest,
                                 int64_t aNextObjectStoreId,
                                 int64_t aNextIndexId)
 {
   MOZ_ASSERT(aDatabase);
   aDatabase->AssertIsOnOwningThread();
   MOZ_ASSERT(aActor);
+  MOZ_ASSERT(aOpenRequest);
   MOZ_ASSERT(aNextObjectStoreId > 0);
   MOZ_ASSERT(aNextIndexId > 0);
 
@@ -140,6 +143,8 @@
 
   nsRefPtr<IDBTransaction> transaction =
     new IDBTransaction(aDatabase, emptyObjectStoreNames, VERSION_CHANGE);
+  aOpenRequest->GetCallerLocation(transaction->mFilename,
+                                  &transaction->mLineNo);
 
   transaction->SetScriptOwner(aDatabase->GetScriptOwner());
   transaction->mBackgroundActor.mVersionChangeBackgroundActor = aActor;
@@ -175,6 +180,7 @@
 
   nsRefPtr<IDBTransaction> transaction =
     new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
+  IDBRequest::CaptureCaller(transaction->mFilename, &transaction->mLineNo);
 
   transaction->SetScriptOwner(aDatabase->GetScriptOwner());
 
@@ -391,6 +397,16 @@
   return false;
 }
 
+void
+IDBTransaction::GetCallerLocation(nsAString& aFilename, uint32_t* aLineNo) const
+{
+  AssertIsOnOwningThread();
+  MOZ_ASSERT(aLineNo);
+
+  aFilename = mFilename;
+  *aLineNo = mLineNo;
+}
+
 already_AddRefed<IDBObjectStore>
 IDBTransaction::CreateObjectStore(const ObjectStoreSpec& aSpec)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBTransaction.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBTransaction.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IDBTransaction.h	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IDBTransaction.h	2014-11-26 21:45:59.000000000 +0000
@@ -37,6 +37,7 @@
 class BackgroundVersionChangeTransactionChild;
 class IDBDatabase;
 class IDBObjectStore;
+class IDBOpenDBRequest;
 class IDBRequest;
 class IndexMetadata;
 class ObjectStoreSpec;
@@ -94,6 +95,9 @@
   nsresult mAbortCode;
   uint32_t mPendingRequestCount;
 
+  nsString mFilename;
+  uint32_t mLineNo;
+
   ReadyState mReadyState;
   Mode mMode;
 
@@ -109,6 +113,7 @@
   static already_AddRefed<IDBTransaction>
   CreateVersionChange(IDBDatabase* aDatabase,
                       BackgroundVersionChangeTransactionChild* aActor,
+                      IDBOpenDBRequest* aOpenRequest,
                       int64_t aNextObjectStoreId,
                       int64_t aNextIndexId);
 
@@ -184,6 +189,16 @@
     return NS_FAILED(mAbortCode);
   }
 
+  nsresult
+  AbortCode() const
+  {
+    AssertIsOnOwningThread();
+    return mAbortCode;
+  }
+
+  void
+  GetCallerLocation(nsAString& aFilename, uint32_t* aLineNo) const;
+
   // 'Get' prefix is to avoid name collisions with the enum
   Mode
   GetMode() const
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IndexedDatabaseManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IndexedDatabaseManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/IndexedDatabaseManager.cpp	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/IndexedDatabaseManager.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -366,7 +366,7 @@
 
   ThreadsafeAutoJSContext cx;
   RootedDictionary<ErrorEventInit> init(cx);
-  request->FillScriptErrorEvent(init);
+  request->GetCallerLocation(init.mFilename, &init.mLineno);
 
   init.mMessage = errorName;
   init.mCancelable = true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/mochitest.ini	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/mochitest.ini	2014-11-26 21:45:59.000000000 +0000
@@ -78,6 +78,8 @@
   unit/test_setVersion_events.js
   unit/test_setVersion_exclusion.js
   unit/test_success_events_after_abort.js
+  unit/test_table_locks.js
+  unit/test_table_rollback.js
   unit/test_temporary_storage.js
   unit/test_traffic_jam.js
   unit/test_transaction_abort.js
@@ -339,6 +341,10 @@
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_success_events_after_abort.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
+[test_table_locks.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
+[test_table_rollback.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_third_party.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_traffic_jam.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/test_table_locks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/test_table_locks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/test_table_locks.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/test_table_locks.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,18 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <title>IndexedDB Test</title>
+
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <script type="text/javascript;version=1.7" src="unit/test_table_locks.js"></script>
+  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+</head>
+
+<body onload="runTest();"></body>
+
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/test_table_rollback.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/test_table_rollback.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/test_table_rollback.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/test_table_rollback.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,19 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+  <title>Indexed Database Test</title>
+
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+  <script type="text/javascript;version=1.7" src="unit/test_table_rollback.js"></script>
+  <script type="text/javascript;version=1.7" src="helpers.js"></script>
+
+</head>
+
+<body onload="runTest();"></body>
+
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/unit/test_table_locks.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/unit/test_table_locks.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/unit/test_table_locks.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/unit/test_table_locks.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,116 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+const dbName = ("window" in this) ? window.location.pathname : "test";
+const dbVersion = 1;
+const objName1 = "o1";
+const objName2 = "o2";
+const idxName1 = "i1";
+const idxName2 = "i2";
+const idxKeyPathProp = "idx";
+const objDataProp = "data";
+const objData = "1234567890";
+const objDataCount = 5;
+const loopCount = 100;
+
+let testGenerator = testSteps();
+
+function testSteps()
+{
+  let req = indexedDB.open(dbName, dbVersion);
+  req.onerror = errorHandler;
+  req.onupgradeneeded = grabEventAndContinueHandler;
+  req.onsuccess = grabEventAndContinueHandler;
+
+  let event = yield undefined;
+
+  is(event.type, "upgradeneeded", "Got upgradeneeded event");
+
+  let db = event.target.result;
+
+  let objectStore1 = db.createObjectStore(objName1);
+  objectStore1.createIndex(idxName1, idxKeyPathProp);
+
+  let objectStore2 = db.createObjectStore(objName2);
+  objectStore2.createIndex(idxName2, idxKeyPathProp);
+
+  for (let i = 0; i < objDataCount; i++) {
+    var data = { };
+    data[objDataProp] = objData;
+    data[idxKeyPathProp] = objDataCount - i - 1;
+
+    objectStore1.add(data, i);
+    objectStore2.add(data, i);
+  }
+
+  event = yield undefined;
+
+  is(event.type, "success", "Got success event");
+
+  doReadOnlyTransaction(db, 0, loopCount);
+  doReadWriteTransaction(db, 0, loopCount);
+
+  // Wait for readonly and readwrite transaction loops to complete.
+  yield undefined;
+  yield undefined;
+
+  finishTest();
+  yield undefined;
+}
+
+function doReadOnlyTransaction(db, key, remaining)
+{
+  if (!remaining) {
+    info("Finished all readonly transactions");
+    continueToNextStep();
+    return;
+  }
+
+  info("Starting readonly transaction for key " + key + ", " + remaining +
+       " loops left");
+
+  let objectStore = db.transaction(objName1, "readonly").objectStore(objName1);
+  let index = objectStore.index(idxName1);
+
+  index.openKeyCursor(key, "prev").onsuccess = function(event) {
+    let cursor = event.target.result;
+    ok(cursor, "Got readonly cursor");
+
+    objectStore.get(cursor.primaryKey).onsuccess = function(event) {
+      if (++key == objDataCount) {
+        key = 0;
+      }
+      doReadOnlyTransaction(db, key, remaining - 1);
+    }
+  };
+}
+
+function doReadWriteTransaction(db, key, remaining)
+{
+  if (!remaining) {
+    info("Finished all readwrite transactions");
+    continueToNextStep();
+    return;
+  }
+
+  info("Starting readwrite transaction for key " + key + ", " + remaining +
+       " loops left");
+
+  let objectStore = db.transaction(objName2, "readwrite").objectStore(objName2);
+  objectStore.openCursor(key).onsuccess = function(event) {
+    let cursor = event.target.result;
+    ok(cursor, "Got readwrite cursor");
+
+    let value = cursor.value;
+    value[idxKeyPathProp]++;
+
+    cursor.update(value).onsuccess = function(event) {
+      if (++key == objDataCount) {
+        key = 0;
+      }
+      doReadWriteTransaction(db, key, remaining - 1);
+    }
+  };
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/unit/test_table_rollback.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/unit/test_table_rollback.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/unit/test_table_rollback.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/unit/test_table_rollback.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,115 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+let testGenerator = testSteps();
+
+function testSteps()
+{
+  const dbName = ("window" in this) ? window.location.pathname : "test";
+  const objName1 = "foo";
+  const objName2 = "bar";
+  const data1 = "1234567890";
+  const data2 = "0987654321";
+  const dataCount = 500;
+
+  let request = indexedDB.open(dbName, 1);
+  request.onerror = errorHandler;
+  request.onupgradeneeded = grabEventAndContinueHandler;
+
+  let event = yield undefined;
+
+  is(event.type, "upgradeneeded", "Got upgradeneeded");
+
+  request.onupgradeneeded = errorHandler;
+  request.onsuccess = grabEventAndContinueHandler;
+
+  let db = request.result;
+
+  let objectStore1 = db.createObjectStore(objName1, { autoIncrement: true });
+  let objectStore2 = db.createObjectStore(objName2, { autoIncrement: true });
+
+  info("Created object stores, adding data");
+
+  for (let i = 0; i < dataCount; i++) {
+    objectStore1.add(data1);
+    objectStore2.add(data2);
+  }
+
+  info("Done adding data");
+
+  event = yield undefined;
+
+  is(event.type, "success", "Got success");
+
+  let readResult = null;
+  let readError = null;
+  let writeAborted = false;
+
+  info("Creating readwrite transaction");
+
+  objectStore1 = db.transaction(objName1, "readwrite").objectStore(objName1);
+  objectStore1.openCursor().onsuccess = grabEventAndContinueHandler;
+
+  event = yield undefined;
+
+  let cursor = event.target.result;
+  is(cursor.value, data1, "Got correct data for readwrite transaction");
+
+  info("Modifying object store on readwrite transaction");
+
+  cursor.update(data2);
+  cursor.continue();
+
+  event = yield undefined;
+
+  info("Done modifying object store on readwrite transaction, creating " +
+       "readonly transaction");
+
+  objectStore2 = db.transaction(objName2, "readonly").objectStore(objName2);
+  request = objectStore2.getAll();
+  request.onsuccess = function(event) {
+    readResult = event.target.result;
+    is(readResult.length,
+       dataCount,
+       "Got correct number of results on readonly transaction");
+    for (let i = 0; i < readResult.length; i++) {
+      is(readResult[i], data2, "Got correct data for readonly transaction");
+    }
+    if (writeAborted) {
+      continueToNextStep();
+    }
+  };
+  request.onerror = function(event) {
+    readResult = null;
+    readError = event.target.error;
+
+    ok(false, "Got read error: " + readError.name);
+    event.preventDefault();
+
+    if (writeAborted) {
+      continueToNextStep();
+    }
+  }
+
+  cursor = event.target.result;
+  is(cursor.value, data1, "Got correct data for readwrite transaction");
+
+  info("Aborting readwrite transaction");
+
+  cursor.source.transaction.abort();
+  writeAborted = true;
+
+  if (!readError && !readResult) {
+    info("Waiting for readonly transaction to complete");
+    yield undefined;
+  }
+
+  ok(readResult, "Got result from readonly transaction");
+  is(readError, null, "No read error");
+  is(writeAborted, true, "Aborted readwrite transaction");
+
+  finishTest();
+  yield undefined;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/unit/xpcshell-shared.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/unit/xpcshell-shared.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/indexedDB/test/unit/xpcshell-shared.ini	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/indexedDB/test/unit/xpcshell-shared.ini	2014-11-26 21:46:00.000000000 +0000
@@ -64,6 +64,8 @@
 [test_setVersion_events.js]
 [test_setVersion_exclusion.js]
 [test_success_events_after_abort.js]
+[test_table_locks.js]
+[test_table_rollback.js]
 [test_traffic_jam.js]
 [test_transaction_abort.js]
 [test_transaction_abort_hang.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/inputmethod/forms.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/inputmethod/forms.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/inputmethod/forms.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/inputmethod/forms.js	2014-11-26 21:46:00.000000000 +0000
@@ -1277,14 +1277,7 @@
     if (!this._isStarted) {
       return;
     }
-    // Update the composing text.
-    let compositionString = domWindowUtils.createCompositionStringSynthesizer();
-    compositionString.setString(text);
-    // Set the cursor position to |text.length| so that the text will be
-    // committed before the cursor position.
-    compositionString.setCaret(text.length, 0);
-    compositionString.dispatchEvent();
-    domWindowUtils.sendCompositionEvent('compositionend', text, '');
+    domWindowUtils.sendCompositionEvent('compositioncommit', text, '');
     this._isStarted = false;
   },
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/base/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/base/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/base/moz.build	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/base/moz.build	2014-11-26 21:46:00.000000000 +0000
@@ -17,7 +17,6 @@
     'nsIDOMClientRectList.idl',
     'nsIDOMConstructor.idl',
     'nsIDOMCrypto.idl',
-    'nsIDOMGlobalObjectConstructor.idl',
     'nsIDOMGlobalPropertyInitializer.idl',
     'nsIDOMHistory.idl',
     'nsIDOMJSWindow.idl',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/base/nsIDOMGlobalObjectConstructor.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/base/nsIDOMGlobalObjectConstructor.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/base/nsIDOMGlobalObjectConstructor.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/base/nsIDOMGlobalObjectConstructor.idl	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/. */
-
-#include "domstubs.idl"
-
-[scriptable, uuid(cb439c73-0129-4289-a349-c5216e6b912a)]
-interface nsIDOMGlobalObjectConstructor : nsISupports
-{
-  /*
-   * JS use only
-   *
-   * The constructor() method will be called with any parameters passed
-   * to the object constructor.
-   * If the JS implementation returns a value, it will be ignored.
-   */
-  void constructor();
-};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl	2014-11-26 21:46:00.000000000 +0000
@@ -51,7 +51,7 @@
 interface nsIJSRAIIHelper;
 interface nsIContentPermissionRequest;
 
-[scriptable, uuid(e293355b-ae7f-4ef7-9237-452bcf3e9e6b)]
+[scriptable, uuid(9621eb05-b498-4e87-a012-95d817987624)]
 interface nsIDOMWindowUtils : nsISupports {
 
   /**
@@ -188,8 +188,6 @@
                                        in float aTopMargin,
                                        in float aRightMargin,
                                        in float aBottomMargin,
-                                       in uint32_t aAlignmentX,
-                                       in uint32_t aAlignmentY,
                                        in nsIDOMElement aElement,
                                        in uint32_t aPriority);
 
@@ -1038,11 +1036,13 @@
    * Cannot be accessed from unprivileged context (not content-accessible)
    * Will throw a DOM security error if called without chrome privileges.
    *
-   * @param aType     The event type: "compositionstart", "compositionend" or
-   *                  "compositionupdate".
+   * @param aType     The event type: "compositionstart",
+   *                  "compositioncommitasis", or "compositioncommit".
    * @param aData     The data property value.  Note that this isn't applied
    *                  for compositionstart event because its value is the
-   *                  selected text which is automatically computed.
+   *                  selected text which is automatically computed. And also
+   *                  this isn't applied for compositioncommitasis because
+   *                  the last data will be set automatically.
    * @param aLocale   The locale property value.
    */
   void sendCompositionEvent(in AString aType,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMAttr.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMAttr.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMAttr.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMAttr.idl	2014-11-26 21:46:00.000000000 +0000
@@ -14,7 +14,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[builtinclass, uuid(7d0582bd-09a7-430e-969b-054abbea19fe)]
+[builtinclass, uuid(7db491e8-a3a3-4432-ad67-e6c33e24ac6d)]
 interface nsIDOMAttr : nsIDOMNode
 {
   readonly attribute DOMString            name;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMCDATASection.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMCDATASection.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMCDATASection.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMCDATASection.idl	2014-11-26 21:46:00.000000000 +0000
@@ -15,7 +15,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[uuid(4ac42d40-69b7-4506-b730-c41ec74b74bd)]
+[uuid(e14ef131-34cc-40c8-9c99-a403c001184a)]
 interface nsIDOMCDATASection : nsIDOMText
 {
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMCharacterData.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMCharacterData.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMCharacterData.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMCharacterData.idl	2014-11-26 21:46:00.000000000 +0000
@@ -13,7 +13,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[uuid(844b8e7e-6d37-4fa1-8196-86e3afdfa0ca)]
+[uuid(4109a2d2-e7af-445d-bb72-c7c9b875f35e)]
 interface nsIDOMCharacterData : nsIDOMNode
 {
            attribute DOMString            data;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMComment.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMComment.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMComment.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMComment.idl	2014-11-26 21:46:00.000000000 +0000
@@ -14,7 +14,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[uuid(c1a1d2ea-e106-4ee8-806d-2633468e8098)]
+[uuid(e7866ff8-b7fc-494f-87c0-fb017d8a4d30)]
 interface nsIDOMComment : nsIDOMCharacterData
 {
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMDocumentFragment.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMDocumentFragment.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMDocumentFragment.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMDocumentFragment.idl	2014-11-26 21:46:00.000000000 +0000
@@ -14,7 +14,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[builtinclass, uuid(24b34c61-7326-42d4-87ec-5d3b5c0b1b26)]
+[builtinclass, uuid(48eb8d72-95bb-402e-a8fc-f2b187abcbdb)]
 interface nsIDOMDocumentFragment : nsIDOMNode
 {
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMDocument.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMDocument.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMDocument.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMDocument.idl	2014-11-26 21:46:00.000000000 +0000
@@ -32,7 +32,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[uuid(08c6400b-0b6d-4ce6-b88d-e7a15a9c7c03)]
+[uuid(35dc5030-dc83-4291-88a2-0906c549788e)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMDocumentType.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMDocumentType.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMDocumentType.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMDocumentType.idl	2014-11-26 21:46:00.000000000 +0000
@@ -15,7 +15,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[uuid(23c1f549-d40b-49b8-992e-2a1136afa13f)]
+[uuid(cd7467b9-0f26-4787-a359-66e80ba8db92)]
 interface nsIDOMDocumentType : nsIDOMNode
 {
   readonly attribute  DOMString            name;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMElement.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMElement.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMElement.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMElement.idl	2014-11-26 21:46:00.000000000 +0000
@@ -15,7 +15,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
  */
 
-[uuid(59eb63f9-c8c0-41d2-bf73-739de43b17f9)]
+[uuid(6289999b-1008-4269-b42a-413ec5a9d3f4)]
 interface nsIDOMElement : nsIDOMNode
 {
   readonly attribute DOMString        tagName;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMNode.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMNode.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMNode.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMNode.idl	2014-11-26 21:46:00.000000000 +0000
@@ -16,7 +16,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[uuid(238222a9-7aa5-4804-9f86-484853ce4b15)]
+[uuid(cc35b412-009b-46a3-9be0-76448f12548d)]
 interface nsIDOMNode : nsISupports
 {
   const unsigned short      ELEMENT_NODE       = 1;
@@ -69,6 +69,9 @@
   // Introduced in DOM Level 2:
   readonly attribute DOMString        localName;
 
+  // For vtable compatibility (see bug 1078674)
+  [noscript] bool           unusedPlaceholder();
+
   // Introduced in DOM Level 3:
   // This uses a binaryname to avoid warnings due to name collision with
   // nsINode::GetBaseURI
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMProcessingInstruction.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMProcessingInstruction.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMProcessingInstruction.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMProcessingInstruction.idl	2014-11-26 21:46:00.000000000 +0000
@@ -15,7 +15,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[uuid(d0163f44-8f5b-4234-b3aa-43cab64e2039)]
+[uuid(5a139df7-04d0-438d-bd18-d8122564258f)]
 interface nsIDOMProcessingInstruction : nsIDOMCharacterData
 {
   readonly attribute DOMString        target;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMText.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMText.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMText.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMText.idl	2014-11-26 21:46:00.000000000 +0000
@@ -13,7 +13,7 @@
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[uuid(775bbd26-1581-4e54-b82c-5d9dc5a3363b)]
+[uuid(67273994-6aff-4091-9de9-b788a249f783)]
 interface nsIDOMText : nsIDOMCharacterData
 {
   nsIDOMText                      splitText(in unsigned long offset)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMXMLDocument.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMXMLDocument.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/core/nsIDOMXMLDocument.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/core/nsIDOMXMLDocument.idl	2014-11-26 21:46:00.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[uuid(1d54e44a-2012-4567-805d-bd5455fc6421)]
+[uuid(867379ce-165b-4b8c-8582-299b38096aa8)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/html/nsIDOMHTMLDocument.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/html/nsIDOMHTMLDocument.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/html/nsIDOMHTMLDocument.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/html/nsIDOMHTMLDocument.idl	2014-11-26 21:46:00.000000000 +0000
@@ -13,7 +13,7 @@
  */
 interface nsISelection;
 
-[uuid(abf369fb-a8b2-4fba-95f5-9e4a896e40a8)]
+[uuid(bd2a0a46-17e4-46ea-9e5d-6a97cf5e3b28)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
            attribute DOMString            domain;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/html/nsIDOMHTMLElement.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/html/nsIDOMHTMLElement.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/html/nsIDOMHTMLElement.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/html/nsIDOMHTMLElement.idl	2014-11-26 21:46:00.000000000 +0000
@@ -19,7 +19,7 @@
  * with changes from the work-in-progress WHATWG HTML specification:
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
-[uuid(8c9472c2-785a-40b6-ad47-4d98e64562bd)]
+[uuid(b0c42392-d0e7-4f6a-beb5-a698ce648945)]
 interface nsIDOMHTMLElement : nsIDOMElement
 {
   // metadata attributes
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/security/nsIContentSecurityPolicy.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/security/nsIContentSecurityPolicy.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/security/nsIContentSecurityPolicy.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/security/nsIContentSecurityPolicy.idl	2014-11-26 21:46:00.000000000 +0000
@@ -207,6 +207,15 @@
   boolean permitsBaseURI(in nsIURI aURI);
 
   /**
+   * Whether this policy allows submitting HTML forms to a given URI.
+   *
+   * @return
+   *    Whether or not the provided URI is allowed to be used as a
+   *    form's action URI.
+   */
+  boolean permitsFormAction(in nsIURI aURI);
+
+  /**
    * Delegate method called by the service when sub-elements of the protected
    * document are being loaded.  Given a bit of information about the request,
    * decides whether or not the policy is satisfied.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/svg/nsIDOMSVGElement.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/svg/nsIDOMSVGElement.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/svg/nsIDOMSVGElement.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/svg/nsIDOMSVGElement.idl	2014-11-26 21:46:00.000000000 +0000
@@ -9,7 +9,7 @@
 interface nsIDOMCSSValue;
 
 
-[uuid(6618074e-0c77-4fec-8870-a6f79aa79b07)]
+[uuid(c63517c5-8bab-4cd1-8694-bccafc32a195)]
 interface nsIDOMSVGElement : nsIDOMElement
 {
             // raises DOMException on setting
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/xul/nsIDOMXULDocument.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/xul/nsIDOMXULDocument.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/xul/nsIDOMXULDocument.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/xul/nsIDOMXULDocument.idl	2014-11-26 21:46:00.000000000 +0000
@@ -10,7 +10,7 @@
 interface nsIObserver;
 interface nsIBoxObject;
 
-[uuid(6f932360-ae43-4fa7-9200-66f64e05a356)]
+[uuid(5d876ab0-5525-4f38-bc3b-f1190e3e3b90)]
 interface nsIDOMXULDocument : nsIDOMDocument
 {
   attribute nsIDOMNode                          popupNode;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/xul/nsIDOMXULElement.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/xul/nsIDOMXULElement.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/interfaces/xul/nsIDOMXULElement.idl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/interfaces/xul/nsIDOMXULElement.idl	2014-11-26 21:46:00.000000000 +0000
@@ -12,7 +12,7 @@
 interface nsIBoxObject;
 
 
-[uuid(ef62515d-3160-4463-abd7-fc9b7385ecef)]
+[uuid(75435ab3-6863-42a1-ade3-025393d9e80e)]
 interface nsIDOMXULElement : nsIDOMElement
 {
   // Layout properties
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentChild.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentChild.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -16,6 +16,7 @@
 
 #include "BlobChild.h"
 #include "CrashReporterChild.h"
+#include "GeckoProfiler.h"
 #include "TabChild.h"
 
 #include "mozilla/Attributes.h"
@@ -23,6 +24,7 @@
 #include "mozilla/a11y/DocAccessibleChild.h"
 #endif
 #include "mozilla/Preferences.h"
+#include "mozilla/docshell/OfflineCacheUpdateChild.h"
 #include "mozilla/dom/ContentBridgeChild.h"
 #include "mozilla/dom/ContentBridgeParent.h"
 #include "mozilla/dom/DOMStorageIPC.h"
@@ -50,7 +52,10 @@
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxTarget.h"
 #include "nsDirectoryServiceDefs.h"
-#elif defined(XP_LINUX) || defined(XP_MACOSX)
+#elif defined(XP_LINUX)
+#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
+#elif defined(XP_MACOSX)
 #include "mozilla/Sandbox.h"
 #endif
 #endif
@@ -1130,10 +1135,10 @@
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 19
     // For B2G >= KitKat, sandboxing is mandatory; this has already
     // been enforced by ContentParent::StartUp().
-    MOZ_ASSERT(ContentProcessSandboxStatus() != kSandboxingWouldFail);
+    MOZ_ASSERT(SandboxInfo::Get().CanSandboxContent());
 #else
     // Otherwise, sandboxing is best-effort.
-    if (ContentProcessSandboxStatus() == kSandboxingWouldFail) {
+    if (!SandboxInfo::Get().CanSandboxContent()) {
         return true;
     }
 #endif
@@ -2258,6 +2263,25 @@
     return true;
 }
 
+POfflineCacheUpdateChild*
+ContentChild::AllocPOfflineCacheUpdateChild(const URIParams& manifestURI,
+                                            const URIParams& documentURI,
+                                            const bool& stickDocument,
+                                            const TabId& aTabId)
+{
+    NS_RUNTIMEABORT("unused");
+    return nullptr;
+}
+
+bool
+ContentChild::DeallocPOfflineCacheUpdateChild(POfflineCacheUpdateChild* actor)
+{
+    OfflineCacheUpdateChild* offlineCacheUpdate =
+        static_cast<OfflineCacheUpdateChild*>(actor);
+    NS_RELEASE(offlineCacheUpdate);
+    return true;
+}
+
 #ifdef MOZ_NUWA_PROCESS
 class CallNuwaSpawn : public nsRunnable
 {
@@ -2364,6 +2388,48 @@
     }
     return true;
 }
+
+bool
+ContentChild::RecvStartProfiler(const uint32_t& aEntries,
+                                const double& aInterval,
+                                const nsTArray<nsCString>& aFeatures,
+                                const nsTArray<nsCString>& aThreadNameFilters)
+{
+    nsTArray<const char*> featureArray;
+    for (size_t i = 0; i < aFeatures.Length(); ++i) {
+        featureArray.AppendElement(aFeatures[i].get());
+    }
+
+    nsTArray<const char*> threadNameFilterArray;
+    for (size_t i = 0; i < aThreadNameFilters.Length(); ++i) {
+        threadNameFilterArray.AppendElement(aThreadNameFilters[i].get());
+    }
+
+    profiler_start(aEntries, aInterval, featureArray.Elements(), featureArray.Length(),
+                   threadNameFilterArray.Elements(), threadNameFilterArray.Length());
+
+    return true;
+}
+
+bool
+ContentChild::RecvStopProfiler()
+{
+    profiler_stop();
+    return true;
+}
+
+bool
+ContentChild::AnswerGetProfile(nsCString* aProfile)
+{
+    char* profile = profiler_get_profile();
+    if (profile) {
+        *aProfile = nsCString(profile, strlen(profile));
+        free(profile);
+    } else {
+        *aProfile = EmptyCString();
+    }
+    return true;
+}
 
 PBrowserOrId
 ContentChild::GetBrowserOrId(TabChild* aTabChild)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentChild.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentChild.h	2014-11-26 21:46:00.000000000 +0000
@@ -358,6 +358,13 @@
 
     virtual bool RecvOnAppThemeChanged() MOZ_OVERRIDE;
 
+    virtual bool RecvStartProfiler(const uint32_t& aEntries,
+                                   const double& aInterval,
+                                   const nsTArray<nsCString>& aFeatures,
+                                   const nsTArray<nsCString>& aThreadNameFilters) MOZ_OVERRIDE;
+    virtual bool RecvStopProfiler() MOZ_OVERRIDE;
+    virtual bool AnswerGetProfile(nsCString* aProfile) MOZ_OVERRIDE;
+
 #ifdef ANDROID
     gfxIntSize GetScreenSize() { return mScreenSize; }
 #endif
@@ -404,6 +411,14 @@
     PBrowserOrId
     GetBrowserOrId(TabChild* aTabChild);
 
+    virtual POfflineCacheUpdateChild* AllocPOfflineCacheUpdateChild(
+            const URIParams& manifestURI,
+            const URIParams& documentURI,
+            const bool& stickDocument,
+            const TabId& aTabId) MOZ_OVERRIDE;
+    virtual bool
+    DeallocPOfflineCacheUpdateChild(POfflineCacheUpdateChild* offlineCacheUpdate) MOZ_OVERRIDE;
+
 private:
     virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentParent.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentParent.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -35,6 +35,7 @@
 #include "nsAccessibilityService.h"
 #endif
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/docshell/OfflineCacheUpdateParent.h"
 #include "mozilla/dom/DataStoreService.h"
 #include "mozilla/dom/DOMStorageIPC.h"
 #include "mozilla/dom/Element.h"
@@ -84,6 +85,7 @@
 #include "nsChromeRegistryChrome.h"
 #include "nsConsoleMessage.h"
 #include "nsConsoleService.h"
+#include "nsContentUtils.h"
 #include "nsDebugImpl.h"
 #include "nsFrameMessageManager.h"
 #include "nsGeolocationSettings.h"
@@ -192,13 +194,18 @@
 
 
 #if defined(MOZ_CONTENT_SANDBOX) && defined(XP_LINUX)
-#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
 #endif
 
 #ifdef MOZ_TOOLKIT_SEARCH
 #include "nsIBrowserSearchService.h"
 #endif
 
+#ifdef MOZ_ENABLE_PROFILER_SPS
+#include "nsIProfiler.h"
+#include "nsIProfileSaveEvent.h"
+#endif
+
 static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
 static const char* sClipboardTextFlavors[] = { kUnicodeMime };
 
@@ -588,6 +595,11 @@
     "a11y-init-or-shutdown",
 #endif
     "app-theme-changed",
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    "profiler-started",
+    "profiler-stopped",
+    "profiler-subprocess",
+#endif
 };
 
 /* static */ already_AddRefed<ContentParent>
@@ -687,7 +699,7 @@
 #if defined(MOZ_CONTENT_SANDBOX) && defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 19
     // Require sandboxing on B2G >= KitKat.  This condition must stay
     // in sync with ContentChild::RecvSetProcessSandbox.
-    if (ContentProcessSandboxStatus() == kSandboxingWouldFail) {
+    if (!SandboxInfo::Get().CanSandboxContent()) {
         // MOZ_CRASH strings are only for debug builds; make sure the
         // message is clear on non-debug builds as well:
         printf_stderr("Sandboxing support is required on this platform.  "
@@ -1022,6 +1034,7 @@
             }
             nsRefPtr<TabParent> tp(new TabParent(constructorSender, tabId,
                                                  aContext, chromeFlags));
+            tp->SetInitedByParent();
             tp->SetOwnerElement(aFrameElement);
 
             PBrowserParent* browser = constructorSender->SendPBrowserConstructor(
@@ -1133,6 +1146,7 @@
     uint32_t chromeFlags = 0;
 
     nsRefPtr<TabParent> tp = new TabParent(parent, tabId, aContext, chromeFlags);
+    tp->SetInitedByParent();
     tp->SetOwnerElement(aFrameElement);
     PBrowserParent* browser = parent->SendPBrowserConstructor(
         // DeallocPBrowserParent() releases this ref.
@@ -1487,6 +1501,14 @@
         }
     }
 
+    const InfallibleTArray<POfflineCacheUpdateParent*>& ocuParents =
+        ManagedPOfflineCacheUpdateParent();
+    for (uint32_t i = 0; i < ocuParents.Length(); ++i) {
+        nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> ocuParent =
+            static_cast<mozilla::docshell::OfflineCacheUpdateParent*>(ocuParents[i]);
+        ocuParent->StopSendingMessagesToChild();
+    }
+
     // NB: must MarkAsDead() here so that this isn't accidentally
     // returned from Get*() while in the midst of shutdown.
     MarkAsDead();
@@ -1924,6 +1946,13 @@
     // PID along with the warning.
     nsDebugImpl::SetMultiprocessMode("Parent");
 
+#if defined(XP_WIN) && !defined(MOZ_B2G)
+    // Request Windows message deferral behavior on our side of the PContent
+    // channel. Generally only applies to the situation where we get caught in
+    // a deadlock with the plugin process when sending CPOWs.
+    GetIPCChannel()->SetChannelFlags(MessageChannel::REQUIRE_DEFERRED_MESSAGE_PROTECTION);
+#endif
+
     NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
     ChildPrivileges privs = aIsNuwaProcess
         ? base::PRIVILEGES_INHERIT
@@ -2776,6 +2805,31 @@
     else if (!strcmp(aTopic, "app-theme-changed")) {
         unused << SendOnAppThemeChanged();
     }
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    else if (!strcmp(aTopic, "profiler-started")) {
+        nsCOMPtr<nsIProfilerStartParams> params(do_QueryInterface(aSubject));
+        uint32_t entries;
+        double interval;
+        params->GetEntries(&entries);
+        params->GetInterval(&interval);
+        const nsTArray<nsCString>& features = params->GetFeatures();
+        const nsTArray<nsCString>& threadFilterNames = params->GetThreadFilterNames();
+        unused << SendStartProfiler(entries, interval, features, threadFilterNames);
+    }
+    else if (!strcmp(aTopic, "profiler-stopped")) {
+        unused << SendStopProfiler();
+    }
+    else if (!strcmp(aTopic, "profiler-subprocess")) {
+        nsCOMPtr<nsIProfileSaveEvent> pse = do_QueryInterface(aSubject);
+        if (pse) {
+            nsCString result;
+            unused << CallGetProfile(&result);
+            if (!result.IsEmpty()) {
+                pse->AddSubProfile(result.get());
+            }
+        }
+    }
+#endif
     return NS_OK;
 }
 
@@ -4317,6 +4371,62 @@
         GetTabContextByContentProcess(this->ChildID()));
 }
 
+mozilla::docshell::POfflineCacheUpdateParent*
+ContentParent::AllocPOfflineCacheUpdateParent(const URIParams& aManifestURI,
+                                              const URIParams& aDocumentURI,
+                                              const bool& aStickDocument,
+                                              const TabId& aTabId)
+{
+    TabContext tabContext;
+    if (!ContentProcessManager::GetSingleton()->
+        GetTabContextByProcessAndTabId(this->ChildID(), aTabId, &tabContext)) {
+        return nullptr;
+    }
+    nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
+        new mozilla::docshell::OfflineCacheUpdateParent(
+            tabContext.OwnOrContainingAppId(),
+            tabContext.IsBrowserElement());
+    // Use this reference as the IPDL reference.
+    return update.forget().take();
+}
+
+bool
+ContentParent::RecvPOfflineCacheUpdateConstructor(POfflineCacheUpdateParent* aActor,
+                                                  const URIParams& aManifestURI,
+                                                  const URIParams& aDocumentURI,
+                                                  const bool& aStickDocument,
+                                                  const TabId& aTabId)
+{
+    MOZ_ASSERT(aActor);
+
+    nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
+        static_cast<mozilla::docshell::OfflineCacheUpdateParent*>(aActor);
+
+    nsresult rv = update->Schedule(aManifestURI, aDocumentURI, aStickDocument);
+    if (NS_FAILED(rv) && IsAlive()) {
+        // Inform the child of failure.
+        unused << update->SendFinish(false, false);
+    }
+
+    return true;
+}
+
+bool
+ContentParent::DeallocPOfflineCacheUpdateParent(POfflineCacheUpdateParent* aActor)
+{
+    // Reclaim the IPDL reference.
+    nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
+        dont_AddRef(static_cast<mozilla::docshell::OfflineCacheUpdateParent*>(aActor));
+    return true;
+}
+
+bool
+ContentParent::RecvSetOfflinePermission(const Principal& aPrincipal)
+{
+    nsIPrincipal* principal = aPrincipal;
+    nsContentUtils::MaybeAllowOfflineAppByDefault(principal, nullptr);
+    return true;
+}
 
 } // namespace dom
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentParent.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentParent.h	2014-11-26 21:46:00.000000000 +0000
@@ -311,6 +311,23 @@
     virtual bool RecvDeallocateTabId(const TabId& aTabId) MOZ_OVERRIDE;
 
     nsTArray<TabContext> GetManagedTabContext();
+
+    virtual POfflineCacheUpdateParent*
+    AllocPOfflineCacheUpdateParent(const URIParams& aManifestURI,
+                                   const URIParams& aDocumentURI,
+                                   const bool& aStickDocument,
+                                   const TabId& aTabId) MOZ_OVERRIDE;
+    virtual bool
+    RecvPOfflineCacheUpdateConstructor(POfflineCacheUpdateParent* aActor,
+                                       const URIParams& aManifestURI,
+                                       const URIParams& aDocumentURI,
+                                       const bool& stickDocument,
+                                       const TabId& aTabId) MOZ_OVERRIDE;
+    virtual bool
+    DeallocPOfflineCacheUpdateParent(POfflineCacheUpdateParent* aActor) MOZ_OVERRIDE;
+
+    virtual bool RecvSetOfflinePermission(const IPC::Principal& principal) MOZ_OVERRIDE;
+
 protected:
     void OnChannelConnected(int32_t pid) MOZ_OVERRIDE;
     virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentProcessManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentProcessManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentProcessManager.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentProcessManager.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -207,25 +207,29 @@
   }
 }
 
-nsTArray<uint64_t>
-ContentProcessManager::GetAppIdsByContentProcess(const ContentParentId& aChildCpId)
+bool
+ContentProcessManager::GetTabContextByProcessAndTabId(const ContentParentId& aChildCpId,
+                                                      const TabId& aChildTabId,
+                                                      /*out*/ TabContext* aTabContext)
 {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aTabContext);
 
-  nsTArray<uint64_t> appIdArray;
   auto iter = mContentParentMap.find(aChildCpId);
   if (NS_WARN_IF(iter == mContentParentMap.end())) {
     ASSERT_UNLESS_FUZZING();
-    return Move(appIdArray);
+    return false;
   }
 
-  for (auto remoteFrameIter = iter->second.mRemoteFrames.begin();
-       remoteFrameIter != iter->second.mRemoteFrames.end();
-       ++remoteFrameIter) {
-    appIdArray.AppendElement(remoteFrameIter->second.mContext.OwnOrContainingAppId());
+  auto remoteFrameIter = iter->second.mRemoteFrames.find(aChildTabId);
+  if (NS_WARN_IF(remoteFrameIter == iter->second.mRemoteFrames.end())) {
+    ASSERT_UNLESS_FUZZING();
+    return false;
   }
 
-  return Move(appIdArray);
+  *aTabContext = remoteFrameIter->second.mContext;
+
+  return true;
 }
 
 nsTArray<TabContext>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentProcessManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentProcessManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ContentProcessManager.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ContentProcessManager.h	2014-11-26 21:46:00.000000000 +0000
@@ -88,11 +88,12 @@
                        const TabId& aChildTabId);
 
   /**
-   * Get all app ids which are inside the given content process.
-   * XXX Currently not used. Plan to be used for bug 1020186.
+   * Get the TabContext by the given content process and tab id.
    */
-  nsTArray<uint64_t>
-  GetAppIdsByContentProcess(const ContentParentId& aChildCpId);
+  bool
+  GetTabContextByProcessAndTabId(const ContentParentId& aChildCpId,
+                                 const TabId& aChildTabId,
+                                 /*out*/ TabContext* aTabContext);
 
   /**
    * Get all TabContext which are inside the given content process.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/FilePickerParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/FilePickerParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/FilePickerParent.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/FilePickerParent.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -202,7 +202,8 @@
                            const nsString& aDefaultFile,
                            const nsString& aDefaultExtension,
                            const InfallibleTArray<nsString>& aFilters,
-                           const InfallibleTArray<nsString>& aFilterNames)
+                           const InfallibleTArray<nsString>& aFilterNames,
+                           const nsString& aDisplayDirectory)
 {
   if (!CreateFilePicker()) {
     unused << Send__delete__(this, void_t(), nsIFilePicker::returnCancel);
@@ -219,6 +220,14 @@
   mFilePicker->SetDefaultExtension(aDefaultExtension);
   mFilePicker->SetFilterIndex(aSelectedType);
 
+  if (!aDisplayDirectory.IsEmpty()) {
+    nsCOMPtr<nsIFile> localFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
+    if (localFile) {
+      localFile->InitWithPath(aDisplayDirectory);
+      mFilePicker->SetDisplayDirectory(localFile);
+    }
+  }
+
   mCallback = new FilePickerShownCallback(this);
 
   mFilePicker->Open(mCallback);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/FilePickerParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/FilePickerParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/FilePickerParent.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/FilePickerParent.h	2014-11-26 21:46:00.000000000 +0000
@@ -36,7 +36,8 @@
                         const nsString& aDefaultFile,
                         const nsString& aDefaultExtension,
                         const InfallibleTArray<nsString>& aFilters,
-                        const InfallibleTArray<nsString>& aFilterNames) MOZ_OVERRIDE;
+                        const InfallibleTArray<nsString>& aFilterNames,
+                        const nsString& aDisplayDirectory) MOZ_OVERRIDE;
 
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/PBrowser.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/PBrowser.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/PBrowser.ipdl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/PBrowser.ipdl	2014-11-26 21:46:00.000000000 +0000
@@ -14,7 +14,6 @@
 include protocol PFilePicker;
 include protocol PIndexedDBPermissionRequest;
 include protocol PRenderFrame;
-include protocol POfflineCacheUpdate;
 include protocol PPluginWidget;
 include DOMTypes;
 include JavaScriptTypes;
@@ -80,13 +79,18 @@
     manages PFilePicker;
     manages PIndexedDBPermissionRequest;
     manages PRenderFrame;
-    manages POfflineCacheUpdate;
     manages PPluginWidget;
 
 both:
     AsyncMessage(nsString aMessage, ClonedMessageData aData, CpowEntry[] aCpows,
                  Principal aPrincipal);
 
+    /**
+     * Create a layout frame (encapsulating a remote layer tree) for
+     * the page that is currently loaded in the <browser>.
+     */
+    PRenderFrame();
+
 parent:
     /*
      * Creates a new remoted nsIWidget connection for windowed plugins
@@ -320,47 +324,6 @@
     PIndexedDBPermissionRequest(Principal principal);
 
     /**
-     * Create a layout frame (encapsulating a remote layer tree) for
-     * the page that is currently loaded in the <browser>.
-     */
-    sync PRenderFrame()
-        returns (ScrollingBehavior scrolling,
-                 TextureFactoryIdentifier textureFactoryIdentifier, uint64_t layersId,
-                 bool success);
-
-    /** 
-     * Starts an offline application cache update.
-     * @param manifestURI
-     *   URI of the manifest to fetch, the application cache group ID
-     * @param documentURI
-     *   URI of the document that referred the manifest
-     * @param stickDocument
-     *   True if the update was initiated by a document load that referred
-     *   a manifest.
-     *   False if the update was initiated by applicationCache.update() call.
-     *
-     *   Tells the update to carry the documentURI to a potential separate 
-     *   update of implicit (master) items.
-     *
-     *   Why this argument? If the document was not found in an offline cache 
-     *   before load and refers a manifest and this manifest itself has not 
-     *   been changed since the last fetch, we will not do the application 
-     *   cache group update. But we must cache the document (identified by the
-     *   documentURI). This argument will ensure that a previously uncached 
-     *   document will get cached and that we don't re-cache a document that 
-     *   has already been cached (stickDocument=false).
-     */
-    POfflineCacheUpdate(URIParams manifestURI, URIParams documentURI,
-                        bool stickDocument);
-
-    /**
-     * Sets "offline-app" permission for the principal.  Called when we hit
-     * a web app with the manifest attribute in <html> and
-     * offline-apps.allow_by_default is set to true.
-     */
-    SetOfflinePermission(Principal principal);
-
-    /**
      * window.open from inside <iframe mozbrowser> is special.  When the child
      * process calls window.open, it creates a new PBrowser (in its own
      * process), then calls BrowserFrameOpenWindow on it.
@@ -391,6 +354,13 @@
     ContentReceivedTouch(ScrollableLayerGuid aGuid, uint64_t aInputBlockId, bool aPreventDefault);
 
     /**
+     * Notifies the APZ code of the results of the gecko hit-test for a
+     * particular input block. Each target corresponds to one touch point in the
+     * touch event.
+     */
+    SetTargetAPZC(uint64_t aInputBlockId, ScrollableLayerGuid[] aTargets);
+
+    /**
      * Updates the zoom constraints for a scrollable frame in this tab.
      * The zoom controller code lives on the parent side and so this allows it to
      * have up-to-date zoom constraints.
@@ -425,6 +395,11 @@
      */
     async RemotePaintIsReady();
 
+    sync GetRenderFrameInfo(PRenderFrame aRenderFrame)
+        returns (ScrollingBehavior scrolling,
+                 TextureFactoryIdentifier textureFactoryIdentifier,
+                 uint64_t layersId);
+
 child:
     /**
      * Notify the remote browser that it has been Show()n on this
@@ -435,7 +410,11 @@
      * content processes always render to a virtual <0, 0> top-left
      * point.
      */
-    Show(nsIntSize size);
+    Show(nsIntSize size,
+         ScrollingBehavior scrolling,
+         TextureFactoryIdentifier textureFactoryIdentifier,
+         uint64_t layersId,
+         nullable PRenderFrame renderFrame);
 
     LoadURL(nsCString uri);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/PContent.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/PContent.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/PContent.ipdl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/PContent.ipdl	2014-11-26 21:46:00.000000000 +0000
@@ -27,6 +27,7 @@
 include protocol PNecko;
 include protocol PPluginModule;
 include protocol PPrinting;
+include protocol POfflineCacheUpdate;
 include protocol PScreenManager;
 include protocol PSharedBufferManager;
 include protocol PSms;
@@ -356,6 +357,7 @@
     manages PMemoryReportRequest;
     manages PMobileConnection;
     manages PNecko;
+    manages POfflineCacheUpdate;
     manages PPrinting;
     manages PScreenManager;
     manages PSms;
@@ -507,6 +509,15 @@
      */
     OnAppThemeChanged();
 
+    /**
+     * Control the Gecko Profiler in the child process.
+     */
+    async StartProfiler(uint32_t aEntries, double aInterval, nsCString[] aFeatures,
+                        nsCString[] aThreadNameFilters);
+    async StopProfiler();
+    intr GetProfile()
+      returns (nsCString aProfile);
+
 parent:
     /**
      * Tell the parent process a new accessible document has been created.
@@ -787,6 +798,40 @@
         returns (TabId tabId);
     async DeallocateTabId(TabId tabId);
 
+    /**
+     * Starts an offline application cache update.
+     * @param manifestURI
+     *   URI of the manifest to fetch, the application cache group ID
+     * @param documentURI
+     *   URI of the document that referred the manifest
+     * @param stickDocument
+     *   True if the update was initiated by a document load that referred
+     *   a manifest.
+     *   False if the update was initiated by applicationCache.update() call.
+     *
+     *   Tells the update to carry the documentURI to a potential separate
+     *   update of implicit (master) items.
+     *
+     *   Why this argument? If the document was not found in an offline cache
+     *   before load and refers a manifest and this manifest itself has not
+     *   been changed since the last fetch, we will not do the application
+     *   cache group update. But we must cache the document (identified by the
+     *   documentURI). This argument will ensure that a previously uncached
+     *   document will get cached and that we don't re-cache a document that
+     *   has already been cached (stickDocument=false).
+     * @param tabId
+     *   To identify which tab owns the app.
+     */
+    POfflineCacheUpdate(URIParams manifestURI, URIParams documentURI,
+                        bool stickDocument, TabId tabId);
+
+    /**
+     * Sets "offline-app" permission for the principal.  Called when we hit
+     * a web app with the manifest attribute in <html> and
+     * offline-apps.allow_by_default is set to true.
+     */
+    SetOfflinePermission(Principal principal);
+
 both:
      AsyncMessage(nsString aMessage, ClonedMessageData aData,
                   CpowEntry[] aCpows, Principal aPrincipal);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/PFilePicker.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/PFilePicker.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/PFilePicker.ipdl	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/PFilePicker.ipdl	2014-11-26 21:46:00.000000000 +0000
@@ -29,7 +29,8 @@
 
 parent:
     Open(int16_t selectedType, bool addToRecentDocs, nsString defaultFile,
-         nsString defaultExtension, nsString[] filters, nsString[] filterNames);
+         nsString defaultExtension, nsString[] filters, nsString[] filterNames,
+         nsString displayDirectory);
 
 child:
     __delete__(MaybeInputFiles files, int16_t result);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ScreenManagerParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ScreenManagerParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/ScreenManagerParent.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/ScreenManagerParent.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -121,6 +121,11 @@
                                           bool* aSuccess)
 {
   *aSuccess = false;
+#ifdef MOZ_VALGRIND
+  // Zero this so that Valgrind doesn't complain when we send it to another
+  // process.
+  memset(aRetVal, 0, sizeof(ScreenDetails));
+#endif
 
   // Find the mWidget associated with the tabparent, and then return
   // the nsIScreen it's on.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabChild.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabChild.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -15,7 +15,6 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/IntentionalCrash.h"
-#include "mozilla/docshell/OfflineCacheUpdateChild.h"
 #include "mozilla/dom/indexedDB/PIndexedDBPermissionRequestChild.h"
 #include "mozilla/plugins/PluginWidgetChild.h"
 #include "mozilla/ipc/DocumentRendererChild.h"
@@ -49,10 +48,12 @@
 #include "nsIDocumentInlines.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIDOMChromeWindow.h"
+#include "nsIDOMDocument.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMWindowUtils.h"
 #include "nsIDocShell.h"
+#include "nsIFrame.h"
 #include "nsIURI.h"
 #include "nsIURIFixup.h"
 #include "nsCDefaultURIFixup.h"
@@ -750,6 +751,39 @@
     }
 };
 
+class TabChild::DelayedDeleteRunnable MOZ_FINAL
+  : public nsRunnable
+{
+    nsRefPtr<TabChild> mTabChild;
+
+public:
+    DelayedDeleteRunnable(TabChild* aTabChild)
+      : mTabChild(aTabChild)
+    {
+        MOZ_ASSERT(NS_IsMainThread());
+        MOZ_ASSERT(aTabChild);
+    }
+
+private:
+    ~DelayedDeleteRunnable()
+    {
+        MOZ_ASSERT(NS_IsMainThread());
+        MOZ_ASSERT(!mTabChild);
+    }
+
+    NS_IMETHOD
+    Run()
+    {
+        MOZ_ASSERT(NS_IsMainThread());
+        MOZ_ASSERT(mTabChild);
+
+        unused << PBrowserChild::Send__delete__(mTabChild);
+
+        mTabChild = nullptr;
+        return NS_OK;
+    }
+};
+
 StaticRefPtr<TabChild> sPreallocatedTab;
 
 /*static*/
@@ -1511,9 +1545,22 @@
     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.
+    PRenderFrameChild::Send__delete__(renderFrame);
+    renderFrame = nullptr;
+  }
+
   // Unfortunately we don't get a window unless we've shown the frame.  That's
   // pretty bogus; see bug 763602.
-  newChild->DoFakeShow();
+  newChild->DoFakeShow(scrolling, textureFactoryIdentifier, layersId, renderFrame);
 
   nsCOMPtr<nsIDOMWindow> win = do_GetInterface(newChild->WebNavigation());
   win.forget(aReturn);
@@ -1828,9 +1875,12 @@
 }
 
 void
-TabChild::DoFakeShow()
+TabChild::DoFakeShow(const ScrollingBehavior& aScrolling,
+                     const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+                     const uint64_t& aLayersId,
+                     PRenderFrameChild* aRenderFrame)
 {
-  RecvShow(nsIntSize(0, 0));
+  RecvShow(nsIntSize(0, 0), aScrolling, aTextureFactoryIdentifier, aLayersId, aRenderFrame);
   mDidFakeShow = true;
 }
 
@@ -1893,8 +1943,13 @@
 #endif
 
 bool
-TabChild::RecvShow(const nsIntSize& size)
+TabChild::RecvShow(const nsIntSize& aSize,
+                   const ScrollingBehavior& aScrolling,
+                   const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+                   const uint64_t& aLayersId,
+                   PRenderFrameChild* aRenderFrame)
 {
+    MOZ_ASSERT((!mDidFakeShow && aRenderFrame) || (mDidFakeShow && !aRenderFrame));
 
     if (mDidFakeShow) {
         return true;
@@ -1906,7 +1961,7 @@
         return false;
     }
 
-    if (!InitRenderingState()) {
+    if (!InitRenderingState(aScrolling, 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
@@ -2341,6 +2396,137 @@
   mTapHoldTimer = nullptr;
 }
 
+static nsIScrollableFrame*
+GetScrollableAncestorFrame(nsIFrame* aTarget)
+{
+  if (!aTarget) {
+    return nullptr;
+  }
+  uint32_t flags = nsLayoutUtils::SCROLLABLE_ALWAYS_MATCH_ROOT
+                 | nsLayoutUtils::SCROLLABLE_ONLY_ASYNC_SCROLLABLE;
+  return nsLayoutUtils::GetNearestScrollableFrame(aTarget, flags);
+}
+
+static dom::Element*
+GetDisplayportElementFor(nsIScrollableFrame* aScrollableFrame)
+{
+  if (!aScrollableFrame) {
+    return nullptr;
+  }
+  nsIFrame* scrolledFrame = aScrollableFrame->GetScrolledFrame();
+  if (!scrolledFrame) {
+    return nullptr;
+  }
+  // |scrolledFrame| should at this point be the root content frame of the
+  // nearest ancestor scrollable frame. The element corresponding to this
+  // frame should be the one with the displayport set on it, so find that
+  // element and return it.
+  nsIContent* content = scrolledFrame->GetContent();
+  MOZ_ASSERT(content->IsElement()); // roc says this must be true
+  return content->AsElement();
+}
+
+class DisplayportSetListener : public nsAPostRefreshObserver {
+public:
+  DisplayportSetListener(TabChild* aTabChild,
+                         nsIPresShell* aPresShell,
+                         const uint64_t& aInputBlockId,
+                         const nsTArray<ScrollableLayerGuid>& aTargets)
+    : mTabChild(aTabChild)
+    , mPresShell(aPresShell)
+    , mInputBlockId(aInputBlockId)
+    , mTargets(aTargets)
+  {
+  }
+
+  virtual ~DisplayportSetListener()
+  {
+  }
+
+  void DidRefresh() MOZ_OVERRIDE {
+    if (!mTabChild) {
+      MOZ_ASSERT_UNREACHABLE("Post-refresh observer fired again after failed attempt at unregistering it");
+      return;
+    }
+
+    TABC_LOG("Got refresh, sending target APZCs for input block %" PRIu64 "\n", mInputBlockId);
+    mTabChild->SendSetTargetAPZC(mInputBlockId, mTargets);
+
+    if (!mPresShell->RemovePostRefreshObserver(this)) {
+      MOZ_ASSERT_UNREACHABLE("Unable to unregister post-refresh observer! Leaking it instead of leaving garbage registered");
+      // Graceful handling, just in case...
+      mTabChild = nullptr;
+      mPresShell = nullptr;
+      return;
+    }
+
+    delete this;
+  }
+
+private:
+  nsRefPtr<TabChild> mTabChild;
+  nsRefPtr<nsIPresShell> mPresShell;
+  uint64_t mInputBlockId;
+  nsTArray<ScrollableLayerGuid> mTargets;
+};
+
+void
+TabChild::SendSetTargetAPZCNotification(const WidgetTouchEvent& aEvent,
+                                        const ScrollableLayerGuid& aGuid,
+                                        const uint64_t& aInputBlockId)
+{
+  nsCOMPtr<nsIDocument> document(GetDocument());
+  nsIPresShell* shell = document->GetShell();
+  if (!shell) {
+    return;
+  }
+  nsIFrame* rootFrame = shell->GetRootFrame();
+  if (!rootFrame) {
+    return;
+  }
+
+  bool waitForRefresh = false;
+  nsTArray<ScrollableLayerGuid> targets;
+  for (size_t i = 0; i < aEvent.touches.Length(); i++) {
+    ScrollableLayerGuid guid(aGuid.mLayersId, 0, FrameMetrics::NULL_SCROLL_ID);
+    nsPoint touchPoint = nsLayoutUtils::GetEventCoordinatesRelativeTo(
+      WebWidget(), aEvent.touches[i]->mRefPoint, rootFrame);
+    nsIFrame* target = nsLayoutUtils::GetFrameForPoint(rootFrame, touchPoint,
+      nsLayoutUtils::IGNORE_ROOT_SCROLL_FRAME);
+    nsIScrollableFrame* scrollAncestor = GetScrollableAncestorFrame(target);
+    nsCOMPtr<dom::Element> dpElement = GetDisplayportElementFor(scrollAncestor);
+
+    nsAutoString dpElementDesc;
+    if (dpElement) {
+      dpElement->Describe(dpElementDesc);
+    }
+    TABC_LOG("For input block %" PRIu64 " found scrollable element %p (%s)\n",
+        aInputBlockId, dpElement.get(),
+        NS_LossyConvertUTF16toASCII(dpElementDesc).get());
+
+    bool guidIsValid = APZCCallbackHelper::GetOrCreateScrollIdentifiers(
+      dpElement, &(guid.mPresShellId), &(guid.mScrollId));
+    targets.AppendElement(guid);
+
+    if (guidIsValid && !nsLayoutUtils::GetDisplayPort(dpElement, nullptr)) {
+      TABC_LOG("%p didn't have a displayport, so setting one...\n", dpElement.get());
+      waitForRefresh |= nsLayoutUtils::CalculateAndSetDisplayPortMargins(
+        scrollAncestor, nsLayoutUtils::RepaintMode::Repaint);
+    }
+  }
+  if (waitForRefresh) {
+    TABC_LOG("At least one target got a new displayport, need to wait for refresh\n");
+    waitForRefresh = shell->AddPostRefreshObserver(
+      new DisplayportSetListener(this, shell, aInputBlockId, targets));
+  }
+  if (!waitForRefresh) {
+    TABC_LOG("Sending target APZCs for input block %" PRIu64 "\n", aInputBlockId);
+    SendSetTargetAPZC(aInputBlockId, targets);
+  } else {
+    TABC_LOG("Successfully registered post-refresh observer\n");
+  }
+}
+
 bool
 TabChild::RecvRealTouchEvent(const WidgetTouchEvent& aEvent,
                              const ScrollableLayerGuid& aGuid,
@@ -2348,12 +2534,17 @@
 {
   TABC_LOG("Receiving touch event of type %d\n", aEvent.message);
 
-  WidgetTouchEvent localEvent(aEvent);
-  localEvent.widget = mWidget;
-  for (size_t i = 0; i < localEvent.touches.Length(); i++) {
+  for (size_t i = 0; i < aEvent.touches.Length(); i++) {
     aEvent.touches[i]->mRefPoint = APZCCallbackHelper::ApplyCallbackTransform(aEvent.touches[i]->mRefPoint, aGuid, mWidget->GetDefaultScale());
   }
 
+  if (aEvent.message == NS_TOUCH_START && IsAsyncPanZoomEnabled()) {
+    SendSetTargetAPZCNotification(aEvent, aGuid, aInputBlockId);
+  }
+
+  WidgetTouchEvent localEvent(aEvent);
+  localEvent.widget = mWidget;
+  // Dispatch event to content (potentially a long-running operation)
   nsEventStatus status = DispatchWidgetEvent(localEvent);
 
   if (!IsAsyncPanZoomEnabled()) {
@@ -2637,23 +2828,6 @@
   return true;
 }
 
-POfflineCacheUpdateChild*
-TabChild::AllocPOfflineCacheUpdateChild(const URIParams& manifestURI,
-                                        const URIParams& documentURI,
-                                        const bool& stickDocument)
-{
-  NS_RUNTIMEABORT("unused");
-  return nullptr;
-}
-
-bool
-TabChild::DeallocPOfflineCacheUpdateChild(POfflineCacheUpdateChild* actor)
-{
-  OfflineCacheUpdateChild* offlineCacheUpdate = static_cast<OfflineCacheUpdateChild*>(actor);
-  NS_RELEASE(offlineCacheUpdate);
-  return true;
-}
-
 bool
 TabChild::RecvLoadRemoteScript(const nsString& aURL, const bool& aRunInGlobalScope)
 {
@@ -2744,7 +2918,12 @@
   // XXX what other code in ~TabChild() should we be running here?
   DestroyWindow();
 
-  return Send__delete__(this);
+  // Bounce through the event loop once to allow any delayed teardown runnables
+  // that were just generated to have a chance to run.
+  nsCOMPtr<nsIRunnable> deleteRunnable = new DelayedDeleteRunnable(this);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToCurrentThread(deleteRunnable)));
+
+  return true;
 }
 
 bool
@@ -2765,10 +2944,7 @@
 }
 
 PRenderFrameChild*
-TabChild::AllocPRenderFrameChild(ScrollingBehavior* aScrolling,
-                                 TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                 uint64_t* aLayersId,
-                                 bool* aSuccess)
+TabChild::AllocPRenderFrameChild()
 {
     return new RenderFrameChild();
 }
@@ -2821,43 +2997,40 @@
 }
 
 bool
-TabChild::InitRenderingState()
+TabChild::InitRenderingState(const ScrollingBehavior& aScrolling,
+                             const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+                             const uint64_t& aLayersId,
+                             PRenderFrameChild* aRenderFrame)
 {
     static_cast<PuppetWidget*>(mWidget.get())->InitIMEState();
 
-    uint64_t id;
-    bool success;
-    RenderFrameChild* remoteFrame =
-        static_cast<RenderFrameChild*>(SendPRenderFrameConstructor(
-                                         &mScrolling,
-                                         &mTextureFactoryIdentifier, &id,
-                                         &success));
+    RenderFrameChild* remoteFrame = static_cast<RenderFrameChild*>(aRenderFrame);
     if (!remoteFrame) {
         NS_WARNING("failed to construct RenderFrame");
         return false;
     }
-    if (!success) {
-        NS_WARNING("failed to construct RenderFrame");
-        PRenderFrameChild::Send__delete__(remoteFrame);
-        return false;
-    }
 
-    MOZ_ASSERT(id != 0);
+    MOZ_ASSERT(aLayersId != 0);
+    mScrolling = aScrolling;
+    mTextureFactoryIdentifier = aTextureFactoryIdentifier;
 
     // Pushing layers transactions directly to a separate
     // compositor context.
     PCompositorChild* compositorChild = CompositorChild::Get();
     if (!compositorChild) {
       NS_WARNING("failed to get CompositorChild instance");
+      PRenderFrameChild::Send__delete__(remoteFrame);
       return false;
     }
     nsTArray<LayersBackend> backends;
     backends.AppendElement(mTextureFactoryIdentifier.mParentBackend);
+    bool success;
     PLayerTransactionChild* shadowManager =
         compositorChild->SendPLayerTransactionConstructor(backends,
-                                                          id, &mTextureFactoryIdentifier, &success);
+                                                          aLayersId, &mTextureFactoryIdentifier, &success);
     if (!success) {
       NS_WARNING("failed to properly allocate layer transaction");
+      PRenderFrameChild::Send__delete__(remoteFrame);
       return false;
     }
 
@@ -2877,13 +3050,13 @@
     ImageBridgeChild::IdentifyCompositorTextureHost(mTextureFactoryIdentifier);
 
     mRemoteFrame = remoteFrame;
-    if (id != 0) {
+    if (aLayersId != 0) {
       if (!sTabChildren) {
         sTabChildren = new TabChildMap;
       }
-      MOZ_ASSERT(!sTabChildren->Get(id));
-      sTabChildren->Put(id, this);
-      mLayersId = id;
+      MOZ_ASSERT(!sTabChildren->Get(aLayersId));
+      sTabChildren->Put(aLayersId, this);
+      mLayersId = aLayersId;
     }
 
     nsCOMPtr<nsIObserverService> observerService =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabChild.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabChild.h	2014-11-26 21:46:00.000000000 +0000
@@ -316,7 +316,11 @@
     virtual bool RecvCacheFileDescriptor(const nsString& aPath,
                                          const FileDescriptor& aFileDescriptor)
                                          MOZ_OVERRIDE;
-    virtual bool RecvShow(const nsIntSize& size) MOZ_OVERRIDE;
+    virtual bool RecvShow(const nsIntSize& aSize,
+                          const ScrollingBehavior& aScrolling,
+                          const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+                          const uint64_t& aLayersId,
+                          PRenderFrameChild* aRenderFrame) MOZ_OVERRIDE;
     virtual bool RecvUpdateDimensions(const nsIntRect& rect,
                                       const nsIntSize& size,
                                       const ScreenOrientation& orientation) MOZ_OVERRIDE;
@@ -409,13 +413,6 @@
                                        PIndexedDBPermissionRequestChild* aActor)
                                        MOZ_OVERRIDE;
 
-    virtual POfflineCacheUpdateChild* AllocPOfflineCacheUpdateChild(
-            const URIParams& manifestURI,
-            const URIParams& documentURI,
-            const bool& stickDocument) MOZ_OVERRIDE;
-    virtual bool
-    DeallocPOfflineCacheUpdateChild(POfflineCacheUpdateChild* offlineCacheUpdate) MOZ_OVERRIDE;
-
     virtual nsIWebNavigation* WebNavigation() MOZ_OVERRIDE { return mWebNav; }
     virtual nsIWidget* WebWidget() MOZ_OVERRIDE { return mWidget; }
 
@@ -498,10 +495,7 @@
 protected:
     virtual ~TabChild();
 
-    virtual PRenderFrameChild* AllocPRenderFrameChild(ScrollingBehavior* aScrolling,
-                                                      TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                                      uint64_t* aLayersId,
-                                                      bool* aSuccess) MOZ_OVERRIDE;
+    virtual PRenderFrameChild* AllocPRenderFrameChild() MOZ_OVERRIDE;
     virtual bool DeallocPRenderFrameChild(PRenderFrameChild* aFrame) MOZ_OVERRIDE;
     virtual bool RecvDestroy() MOZ_OVERRIDE;
     virtual bool RecvSetUpdateHitRegion(const bool& aEnabled) MOZ_OVERRIDE;
@@ -543,12 +537,18 @@
 
     enum FrameScriptLoading { DONT_LOAD_SCRIPTS, DEFAULT_LOAD_SCRIPTS };
     bool InitTabChildGlobal(FrameScriptLoading aScriptLoading = DEFAULT_LOAD_SCRIPTS);
-    bool InitRenderingState();
+    bool InitRenderingState(const ScrollingBehavior& aScrolling,
+                            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();
+    void DoFakeShow(const ScrollingBehavior& aScrolling,
+                    const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+                    const uint64_t& aLayersId,
+                    PRenderFrameChild* aRenderFrame);
 
     // These methods are used for tracking synthetic mouse events
     // dispatched for compatibility.  On each touch event, we
@@ -573,6 +573,10 @@
     void SendPendingTouchPreventedResponse(bool aPreventDefault,
                                            const ScrollableLayerGuid& aGuid);
 
+    void SendSetTargetAPZCNotification(const WidgetTouchEvent& aEvent,
+                                       const mozilla::layers::ScrollableLayerGuid& aGuid,
+                                       const uint64_t& aInputBlockId);
+
     void SetTabId(const TabId& aTabId)
     {
       MOZ_ASSERT(mUniqueId == 0);
@@ -583,6 +587,7 @@
 
     class CachedFileDescriptorInfo;
     class CachedFileDescriptorCallbackRunnable;
+    class DelayedDeleteRunnable;
 
     TextureFactoryIdentifier mTextureFactoryIdentifier;
     nsCOMPtr<nsIWebNavigation> mWebNav;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabParent.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabParent.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -11,7 +11,6 @@
 #include "AppProcessChecker.h"
 #include "mozIApplication.h"
 #include "mozilla/BrowserElementParent.h"
-#include "mozilla/docshell/OfflineCacheUpdateParent.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/PContentPermissionRequestParent.h"
 #include "mozilla/dom/indexedDB/ActorsParent.h"
@@ -249,6 +248,7 @@
   , mAppPackageFileDescriptorSent(false)
   , mSendOfflineStatus(true)
   , mChromeFlags(aChromeFlags)
+  , mInitedByParent(false)
   , mTabId(aTabId)
 {
   MOZ_ASSERT(aManager);
@@ -302,14 +302,6 @@
   // destroy itself and send back __delete__().
   unused << SendDestroy();
 
-  const InfallibleTArray<POfflineCacheUpdateParent*>& ocuParents =
-    ManagedPOfflineCacheUpdateParent();
-  for (uint32_t i = 0; i < ocuParents.Length(); ++i) {
-    nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> ocuParent =
-      static_cast<mozilla::docshell::OfflineCacheUpdateParent*>(ocuParents[i]);
-    ocuParent->StopSendingMessagesToChild();
-  }
-
   if (RenderFrameParent* frame = GetRenderFrame()) {
     frame->Destroy();
   }
@@ -582,9 +574,33 @@
     // sigh
     mShown = true;
     mDimensions = size;
-    if (!mIsDestroyed) {
-      unused << SendShow(size);
+    if (mIsDestroyed) {
+        return;
     }
+
+    ScrollingBehavior scrolling = UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
+    TextureFactoryIdentifier textureFactoryIdentifier;
+    uint64_t layersId = 0;
+    bool success = false;
+    RenderFrameParent* renderFrame = nullptr;
+    // If TabParent is initialized by parent side then the RenderFrame must also
+    // be created here. If TabParent is initialized by child side,
+    // child side will create RenderFrame.
+    MOZ_ASSERT(!GetRenderFrame());
+    if (IsInitedByParent()) {
+        nsRefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
+        if (frameLoader) {
+          renderFrame =
+              new RenderFrameParent(frameLoader,
+                                    scrolling,
+                                    &textureFactoryIdentifier,
+                                    &layersId,
+                                    &success);
+          MOZ_ASSERT(success);
+          unused << SendPRenderFrameConstructor(renderFrame);
+        }
+    }
+    unused << SendShow(size, scrolling, textureFactoryIdentifier, layersId, renderFrame);
 }
 
 void
@@ -1622,11 +1638,11 @@
     return false;
   }
 
-  if (event.message == NS_COMPOSITION_CHANGE) {
+  if (event.CausesDOMTextEvent()) {
     return SendCompositionChangeEvent(event);
   }
 
-  mIMEComposing = event.message != NS_COMPOSITION_END;
+  mIMEComposing = !event.CausesDOMCompositionEndEvent();
   mIMECompositionStart = std::min(mIMESelectionAnchor, mIMESelectionFocus);
   if (mIMECompositionEnding)
     return true;
@@ -1657,6 +1673,7 @@
   }
   mIMESelectionAnchor = mIMESelectionFocus =
       mIMECompositionStart + event.mData.Length();
+  mIMEComposing = !event.CausesDOMCompositionEndEvent();
 
   event.mSeqno = ++mIMESeqno;
   return PBrowserParent::SendCompositionEvent(event);
@@ -1920,18 +1937,26 @@
 }
 
 PRenderFrameParent*
-TabParent::AllocPRenderFrameParent(ScrollingBehavior* aScrolling,
-                                   TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                   uint64_t* aLayersId, bool* aSuccess)
+TabParent::AllocPRenderFrameParent()
 {
   MOZ_ASSERT(ManagedPRenderFrameParent().IsEmpty());
-
   nsRefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
-  *aScrolling = UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
-  return new RenderFrameParent(frameLoader,
-                               *aScrolling,
-                               aTextureFactoryIdentifier, aLayersId,
-                               aSuccess);
+  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);
+    MOZ_ASSERT(success);
+    return renderFrame;
+  } else {
+    return nullptr;
+  }
 }
 
 bool
@@ -1941,53 +1966,16 @@
   return true;
 }
 
-mozilla::docshell::POfflineCacheUpdateParent*
-TabParent::AllocPOfflineCacheUpdateParent(const URIParams& aManifestURI,
-                                          const URIParams& aDocumentURI,
-                                          const bool& aStickDocument)
-{
-  nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
-    new mozilla::docshell::OfflineCacheUpdateParent(OwnOrContainingAppId(),
-                                                    IsBrowserElement());
-  // Use this reference as the IPDL reference.
-  return update.forget().take();
-}
-
-bool
-TabParent::RecvPOfflineCacheUpdateConstructor(POfflineCacheUpdateParent* aActor,
-                                              const URIParams& aManifestURI,
-                                              const URIParams& aDocumentURI,
-                                              const bool& aStickDocument)
-{
-  MOZ_ASSERT(aActor);
-
-  nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
-    static_cast<mozilla::docshell::OfflineCacheUpdateParent*>(aActor);
-
-  nsresult rv = update->Schedule(aManifestURI, aDocumentURI, aStickDocument);
-  if (NS_FAILED(rv) && !IsDestroyed()) {
-    // Inform the child of failure.
-    unused << update->SendFinish(false, false);
-  }
-
-  return true;
-}
-
 bool
-TabParent::DeallocPOfflineCacheUpdateParent(POfflineCacheUpdateParent* aActor)
-{
-  // Reclaim the IPDL reference.
-  nsRefPtr<mozilla::docshell::OfflineCacheUpdateParent> update =
-    dont_AddRef(
-      static_cast<mozilla::docshell::OfflineCacheUpdateParent*>(aActor));
-  return true;
-}
-
-bool
-TabParent::RecvSetOfflinePermission(const IPC::Principal& aPrincipal)
-{
-  nsIPrincipal* principal = aPrincipal;
-  nsContentUtils::MaybeAllowOfflineAppByDefault(principal, nullptr);
+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;
 }
 
@@ -2081,16 +2069,6 @@
 }
 
 bool
-TabParent::RecvPRenderFrameConstructor(PRenderFrameParent* aActor,
-                                       ScrollingBehavior* aScrolling,
-                                       TextureFactoryIdentifier* aFactoryIdentifier,
-                                       uint64_t* aLayersId,
-                                       bool* aSuccess)
-{
-  return true;
-}
-
-bool
 TabParent::RecvZoomToRect(const uint32_t& aPresShellId,
                           const ViewID& aViewId,
                           const CSSRect& aRect)
@@ -2123,6 +2101,16 @@
   }
   return true;
 }
+
+bool
+TabParent::RecvSetTargetAPZC(const uint64_t& aInputBlockId,
+                             const nsTArray<ScrollableLayerGuid>& aTargets)
+{
+  if (RenderFrameParent* rfp = GetRenderFrame()) {
+    rfp->SetTargetAPZC(aInputBlockId, aTargets);
+  }
+  return true;
+}
 
 already_AddRefed<nsILoadContext>
 TabParent::GetLoadContext()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/ipc/TabParent.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/ipc/TabParent.h	2014-11-26 21:46:00.000000000 +0000
@@ -128,11 +128,6 @@
     virtual bool RecvEvent(const RemoteDOMEvent& aEvent) MOZ_OVERRIDE;
     virtual bool RecvReplyKeyEvent(const WidgetKeyboardEvent& event);
     virtual bool RecvDispatchAfterKeyboardEvent(const WidgetKeyboardEvent& event);
-    virtual bool RecvPRenderFrameConstructor(PRenderFrameParent* aActor,
-                                             ScrollingBehavior* aScrolling,
-                                             TextureFactoryIdentifier* aFactoryIdentifier,
-                                             uint64_t* aLayersId,
-                                             bool* aSuccess) MOZ_OVERRIDE;
     virtual bool RecvBrowserFrameOpenWindow(PBrowserParent* aOpener,
                                             const nsString& aURL,
                                             const nsString& aName,
@@ -213,6 +208,8 @@
     virtual bool RecvContentReceivedTouch(const ScrollableLayerGuid& aGuid,
                                           const uint64_t& aInputBlockId,
                                           const bool& aPreventDefault) MOZ_OVERRIDE;
+    virtual bool RecvSetTargetAPZC(const uint64_t& aInputBlockId,
+                                   const nsTArray<ScrollableLayerGuid>& aTargets) MOZ_OVERRIDE;
 
     virtual PColorPickerParent*
     AllocPColorPickerParent(const nsString& aTitle, const nsString& aInitialColor) MOZ_OVERRIDE;
@@ -303,20 +300,6 @@
                                       PIndexedDBPermissionRequestParent* aActor)
                                       MOZ_OVERRIDE;
 
-    virtual POfflineCacheUpdateParent*
-    AllocPOfflineCacheUpdateParent(const URIParams& aManifestURI,
-                                   const URIParams& aDocumentURI,
-                                   const bool& aStickDocument) MOZ_OVERRIDE;
-    virtual bool
-    RecvPOfflineCacheUpdateConstructor(POfflineCacheUpdateParent* aActor,
-                                       const URIParams& aManifestURI,
-                                       const URIParams& aDocumentURI,
-                                       const bool& stickDocument) MOZ_OVERRIDE;
-    virtual bool
-    DeallocPOfflineCacheUpdateParent(POfflineCacheUpdateParent* aActor) MOZ_OVERRIDE;
-
-    virtual bool RecvSetOfflinePermission(const IPC::Principal& principal) MOZ_OVERRIDE;
-
     bool GetGlobalJSObject(JSContext* cx, JSObject** globalp);
 
     NS_DECL_ISUPPORTS
@@ -355,6 +338,9 @@
     virtual PPluginWidgetParent* AllocPPluginWidgetParent() MOZ_OVERRIDE;
     virtual bool DeallocPPluginWidgetParent(PPluginWidgetParent* aActor) MOZ_OVERRIDE;
 
+    void SetInitedByParent() { mInitedByParent = true; }
+    bool IsInitedByParent() const { return mInitedByParent; }
+
 protected:
     bool ReceiveMessage(const nsString& aMessage,
                         bool aSync,
@@ -376,14 +362,16 @@
 
     bool AllowContentIME();
 
-    virtual PRenderFrameParent* AllocPRenderFrameParent(ScrollingBehavior* aScrolling,
-                                                        TextureFactoryIdentifier* aTextureFactoryIdentifier,
-                                                        uint64_t* aLayersId,
-                                                        bool* aSuccess) MOZ_OVERRIDE;
+    virtual PRenderFrameParent* AllocPRenderFrameParent() MOZ_OVERRIDE;
     virtual bool DeallocPRenderFrameParent(PRenderFrameParent* aFrame) MOZ_OVERRIDE;
 
     virtual bool RecvRemotePaintIsReady() MOZ_OVERRIDE;
 
+    virtual bool RecvGetRenderFrameInfo(PRenderFrameParent* aRenderFrame,
+                                        ScrollingBehavior* aScrolling,
+                                        TextureFactoryIdentifier* aTextureFactoryIdentifier,
+                                        uint64_t* aLayersId) MOZ_OVERRIDE;
+
     bool SendCompositionChangeEvent(mozilla::WidgetCompositionEvent& event);
 
     // IME
@@ -459,6 +447,10 @@
 
     uint32_t mChromeFlags;
 
+    // When true, the TabParent is initialized without child side's request.
+    // When false, the TabParent is initialized by window.open() from child side.
+    bool mInitedByParent;
+
     nsCOMPtr<nsILoadContext> mLoadContext;
 
     TabId mTabId;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/jsurl/nsJSProtocolHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/jsurl/nsJSProtocolHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/jsurl/nsJSProtocolHandler.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/jsurl/nsJSProtocolHandler.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -157,7 +157,7 @@
         nsCOMPtr<nsILoadInfo> loadInfo;
         aChannel->GetLoadInfo(getter_AddRefs(loadInfo));
         if (loadInfo && loadInfo->GetForceInheritPrincipal()) {
-            principal = loadInfo->LoadingPrincipal();
+            principal = loadInfo->TriggeringPrincipal();
         } else {
             // No execution without a principal!
             NS_ASSERTION(!owner, "Non-principal owner?");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/locales/en-US/chrome/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/locales/en-US/chrome/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/locales/en-US/chrome/appstrings.properties	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/locales/en-US/chrome/appstrings.properties	2014-11-26 21:46:00.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspFrameAncestorBlocked=This page has a content security policy that prevents it from being embedded in this way.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/locales/en-US/chrome/dom/dom.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/locales/en-US/chrome/dom/dom.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/locales/en-US/chrome/dom/dom.properties	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/locales/en-US/chrome/dom/dom.properties	2014-11-26 21:46:00.000000000 +0000
@@ -209,3 +209,5 @@
 KeyNameDeadKeysWarning=KeyboardEvent.key values starting with "Dead" are obsolete and will be merged into just "Dead". For more help https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key
 ImportXULIntoContentWarning=Importing XUL nodes into a content document is deprecated. This functionality may be removed soon.
 XMLDocumentLoadPrincipalMismatch=Use of document.load forbidden on Documents that come from other Windows. Only the Window in which a Document was created is allowed to call .load on that Document. Preferably, use XMLHttpRequest instead.
+# LOCALIZATION NOTE: Do not translate "IndexedDB".
+IndexedDBTransactionAbortNavigation=An IndexedDB transaction that was not yet complete has been aborted due to page navigation.
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/locales/en-US/chrome/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/locales/en-US/chrome/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/locales/en-US/chrome/netError.dtd	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/locales/en-US/chrome/netError.dtd	2014-11-26 21:46:00.000000000 +0000
@@ -87,8 +87,8 @@
 <p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>The browser prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
+<!ENTITY cspBlocked.title "Blocked by Content Security Policy">
+<!ENTITY cspBlocked.longDesc "<p>The browser prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentError.title "Corrupted Content Error">
 <!ENTITY corruptedContentError.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/android/AndroidMediaReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/android/AndroidMediaReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/android/AndroidMediaReader.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/android/AndroidMediaReader.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -144,8 +144,9 @@
         int64_t durationUs;
         mPlugin->GetDuration(mPlugin, &durationUs);
         durationUs = std::max<int64_t>(durationUs - mLastVideoFrame->mTime, 0);
-        mVideoQueue.Push(VideoData::ShallowCopyUpdateDuration(mLastVideoFrame,
-                                                              durationUs));
+        nsRefPtr<VideoData> data = VideoData::ShallowCopyUpdateDuration(mLastVideoFrame,
+                                                                        durationUs);
+        mVideoQueue.Push(data);
         mLastVideoFrame = nullptr;
       }
       return false;
@@ -172,7 +173,7 @@
     int64_t pos = mDecoder->GetResource()->Tell();
     IntRect picture = ToIntRect(mPicture);
 
-    nsAutoPtr<VideoData> v;
+    nsRefPtr<VideoData> v;
     if (currentImage) {
       gfx::IntSize frameSize = currentImage->GetSize();
       if (frameSize.width != mInitialFrame.width ||
@@ -273,9 +274,8 @@
       continue;
     }
 
-    mVideoQueue.Push(mLastVideoFrame.forget());
-
     // Buffer the current frame we just decoded.
+    mVideoQueue.Push(mLastVideoFrame);
     mLastVideoFrame = v;
 
     break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/android/AndroidMediaReader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/android/AndroidMediaReader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/android/AndroidMediaReader.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/android/AndroidMediaReader.h	2014-11-26 21:46:00.000000000 +0000
@@ -39,7 +39,7 @@
   nsIntSize mInitialFrame;
   int64_t mVideoSeekTimeUs;
   int64_t mAudioSeekTimeUs;
-  nsAutoPtr<VideoData> mLastVideoFrame;
+  nsRefPtr<VideoData> mLastVideoFrame;
 public:
   AndroidMediaReader(AbstractMediaDecoder* aDecoder,
                      const nsACString& aContentType);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/AudioSegment.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/AudioSegment.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/AudioSegment.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/AudioSegment.h	2014-11-26 21:46:00.000000000 +0000
@@ -84,7 +84,7 @@
   typedef mozilla::AudioSampleFormat SampleFormat;
 
   // Generic methods
-  void SliceTo(TrackTicks aStart, TrackTicks aEnd)
+  void SliceTo(StreamTime aStart, StreamTime aEnd)
   {
     MOZ_ASSERT(aStart >= 0 && aStart < aEnd && aEnd <= mDuration,
                "Slice out of bounds");
@@ -97,7 +97,7 @@
     }
     mDuration = aEnd - aStart;
   }
-  TrackTicks GetDuration() const { return mDuration; }
+  StreamTime GetDuration() const { return mDuration; }
   bool CanCombineWithFollowing(const AudioChunk& aOther) const
   {
     if (aOther.mBuffer != mBuffer) {
@@ -121,7 +121,7 @@
     return true;
   }
   bool IsNull() const { return mBuffer == nullptr; }
-  void SetNull(TrackTicks aDuration)
+  void SetNull(StreamTime aDuration)
   {
     mBuffer = nullptr;
     mChannelData.Clear();
@@ -154,7 +154,7 @@
     return amount;
   }
 
-  TrackTicks mDuration; // in frames within the buffer
+  StreamTime mDuration; // in frames within the buffer
   nsRefPtr<ThreadSharedObject> mBuffer; // the buffer object whose lifetime is managed; null means data is all zeroes
   nsTArray<const void*> mChannelData; // one pointer per channel; empty if and only if mBuffer is null
   float mVolume; // volume multiplier to apply (1.0f if mBuffer is nonnull)
@@ -289,8 +289,9 @@
     return 0;
   }
 
-  bool IsNull() {
-    for (ChunkIterator ci(*this); !ci.IsEnded(); ci.Next()) {
+  bool IsNull() const {
+    for (ChunkIterator ci(*const_cast<AudioSegment*>(this)); !ci.IsEnded();
+         ci.Next()) {
       if (!ci->IsNull()) {
         return false;
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/AudioSink.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/AudioSink.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/AudioSink.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/AudioSink.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -316,7 +316,7 @@
 {
   AssertOnAudioThread();
   NS_ASSERTION(!mAudioStream->IsPaused(), "Don't play when paused");
-  nsAutoPtr<AudioData> audio(AudioQueue().PopFront());
+  nsRefPtr<AudioData> audio(AudioQueue().PopFront());
 
   SINK_LOG_V("playing %u frames of audio at time %lld",
              audio->mFrames, audio->mTime);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/DecoderTraits.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/DecoderTraits.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/DecoderTraits.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/DecoderTraits.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -335,8 +335,9 @@
 #ifdef MOZ_OMX_DECODER
   return false;
 #else
+  bool haveAAC, haveMP3, haveH264;
   return Preferences::GetBool("media.fragmented-mp4.exposed", false) &&
-         MP4Decoder::CanHandleMediaType(aType, aCodecs);
+         MP4Decoder::CanHandleMediaType(aType, aCodecs, haveAAC, haveH264, haveMP3);
 #endif
 }
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/DOMMediaStream.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/DOMMediaStream.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/DOMMediaStream.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/DOMMediaStream.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -33,7 +33,7 @@
   class TrackChange : public nsRunnable {
   public:
     TrackChange(StreamListener* aListener,
-                TrackID aID, TrackTicks aTrackOffset,
+                TrackID aID, StreamTime aTrackOffset,
                 uint32_t aEvents, MediaSegment::Type aType)
       : mListener(aListener), mID(aID), mEvents(aEvents), mType(aType)
     {
@@ -85,8 +85,7 @@
    * aQueuedMedia can be null if there is no output.
    */
   virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                        TrackRate aTrackRate,
-                                        TrackTicks aTrackOffset,
+                                        StreamTime aTrackOffset,
                                         uint32_t aTrackEvents,
                                         const MediaSegment& aQueuedMedia) MOZ_OVERRIDE
   {
@@ -94,7 +93,7 @@
       nsRefPtr<TrackChange> runnable =
         new TrackChange(this, aID, aTrackOffset, aTrackEvents,
                         aQueuedMedia.GetType());
-      NS_DispatchToMainThread(runnable);
+      aGraph->DispatchToMainThreadAfterStreamStateUpdate(runnable.forget());
     }
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeys.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeys.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeys.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeys.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -114,111 +114,6 @@
   return promise.forget();
 }
 
-static bool
-HaveGMPFor(const nsCString& aKeySystem,
-           const nsCString& aAPI,
-           const nsCString& aTag = EmptyCString())
-{
-  nsCOMPtr<mozIGeckoMediaPluginService> mps =
-    do_GetService("@mozilla.org/gecko-media-plugin-service;1");
-  if (NS_WARN_IF(!mps)) {
-    return false;
-  }
-
-  nsTArray<nsCString> tags;
-  tags.AppendElement(aKeySystem);
-  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(mps->HasPluginForAPI(aAPI,
-                                     &tags,
-                                     &hasPlugin))) {
-    return false;
-  }
-  return hasPlugin;
-}
-
-static bool
-IsPlayableMP4Type(const nsAString& aContentType)
-{
-#ifdef MOZ_FMP4
-  nsContentTypeParser parser(aContentType);
-  nsAutoString mimeType;
-  nsresult rv = parser.GetType(mimeType);
-  if (NS_FAILED(rv)) {
-    return false;
-  }
-  nsAutoString codecs;
-  parser.GetParameter("codecs", codecs);
-
-  NS_ConvertUTF16toUTF8 mimeTypeUTF8(mimeType);
-  return MP4Decoder::CanHandleMediaType(mimeTypeUTF8, codecs);
-#else
-  return false;
-#endif
-}
-
-bool
-MediaKeys::IsTypeSupported(const nsAString& aKeySystem,
-                           const Optional<nsAString>& aInitDataType,
-                           const Optional<nsAString>& aContentType)
-{
-  if (aKeySystem.EqualsLiteral("org.w3.clearkey") &&
-      (!aInitDataType.WasPassed() || aInitDataType.Value().EqualsLiteral("cenc")) &&
-      (!aContentType.WasPassed() || IsPlayableMP4Type(aContentType.Value())) &&
-      HaveGMPFor(NS_LITERAL_CSTRING("org.w3.clearkey"),
-                 NS_LITERAL_CSTRING("eme-decrypt"))) {
-    return true;
-  }
-
-#ifdef XP_WIN
-  // Note: Adobe Access's GMP uses WMF to decode, so anything our MP4Reader
-  // thinks it can play on Windows, the Access GMP should be able to play.
-  if (aKeySystem.EqualsLiteral("com.adobe.access") &&
-      Preferences::GetBool("media.eme.adobe-access.enabled", false) &&
-      IsVistaOrLater() && // Win Vista and later only.
-      (!aInitDataType.WasPassed() || aInitDataType.Value().EqualsLiteral("cenc")) &&
-      (!aContentType.WasPassed() || IsPlayableMP4Type(aContentType.Value())) &&
-      HaveGMPFor(NS_LITERAL_CSTRING("com.adobe.access"),
-                 NS_LITERAL_CSTRING("eme-decrypt")) &&
-      HaveGMPFor(NS_LITERAL_CSTRING("com.adobe.access"),
-                 NS_LITERAL_CSTRING("decode-video"),
-                 NS_LITERAL_CSTRING("h264")) &&
-      HaveGMPFor(NS_LITERAL_CSTRING("com.adobe.access"),
-                 NS_LITERAL_CSTRING("decode-audio"),
-                 NS_LITERAL_CSTRING("aac"))) {
-      return true;
-  }
-#endif
-
-  return false;
-}
-
-/* static */
-IsTypeSupportedResult
-MediaKeys::IsTypeSupported(const GlobalObject& aGlobal,
-                           const nsAString& aKeySystem,
-                           const Optional<nsAString>& aInitDataType,
-                           const Optional<nsAString>& aContentType,
-                           const Optional<nsAString>& aCapability)
-{
-  // TODO: Should really get spec changed to this is async, so we can wait
-  //       for user to consent to running plugin.
-  bool supported = IsTypeSupported(aKeySystem, aInitDataType, aContentType);
-
-  EME_LOG("MediaKeys::IsTypeSupported keySystem='%s' initDataType='%s' contentType='%s' supported=%d",
-          NS_ConvertUTF16toUTF8(aKeySystem).get(),
-          (aInitDataType.WasPassed() ? NS_ConvertUTF16toUTF8(aInitDataType.Value()).get() : ""),
-          (aContentType.WasPassed() ? NS_ConvertUTF16toUTF8(aContentType.Value()).get() : ""),
-          supported);
-
-  return supported ? IsTypeSupportedResult::Probably
-                   : IsTypeSupportedResult::_empty;
-}
-
 already_AddRefed<Promise>
 MediaKeys::MakePromise(ErrorResult& aRv)
 {
@@ -303,24 +198,6 @@
   }
 }
 
-/* static */
-already_AddRefed<Promise>
-MediaKeys::Create(const GlobalObject& aGlobal,
-                  const nsAString& aKeySystem,
-                  ErrorResult& aRv)
-{
-  // CDMProxy keeps MediaKeys alive until it resolves the promise and thus
-  // returns the MediaKeys object to JS.
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aGlobal.GetAsSupports());
-  if (!window || !window->GetExtantDoc()) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return nullptr;
-  }
-
-  nsRefPtr<MediaKeys> keys = new MediaKeys(window, aKeySystem);
-  return keys->Init(aRv);
-}
-
 already_AddRefed<Promise>
 MediaKeys::Init(ErrorResult& aRv)
 {
@@ -329,11 +206,6 @@
     return nullptr;
   }
 
-  if (!IsTypeSupported(mKeySystem)) {
-    promise->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return promise.forget();
-  }
-
   mProxy = new CDMProxy(this, mKeySystem);
 
   // Determine principal (at creation time) of the MediaKeys object.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeys.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeys.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeys.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeys.h	2014-11-26 21:46:00.000000000 +0000
@@ -53,6 +53,8 @@
 
   MediaKeys(nsPIDOMWindow* aParentWindow, const nsAString& aKeySystem);
 
+  already_AddRefed<Promise> Init(ErrorResult& aRv);
+
   nsPIDOMWindow* GetParentObject() const;
 
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
@@ -70,19 +72,6 @@
   already_AddRefed<Promise> SetServerCertificate(const ArrayBufferViewOrArrayBuffer& aServerCertificate,
                                                  ErrorResult& aRv);
 
-  // JavaScript: MediaKeys.create()
-  static
-  already_AddRefed<Promise> Create(const GlobalObject& aGlobal,
-                                   const nsAString& aKeySystem,
-                                   ErrorResult& aRv);
-
-  // JavaScript: MediaKeys.IsTypeSupported()
-  static IsTypeSupportedResult IsTypeSupported(const GlobalObject& aGlobal,
-                                               const nsAString& aKeySystem,
-                                               const Optional<nsAString>& aInitDataType,
-                                               const Optional<nsAString>& aContentType,
-                                               const Optional<nsAString>& aCapability);
-
   already_AddRefed<MediaKeySession> GetSession(const nsAString& aSessionId);
 
   // Called once a Create() operation succeeds.
@@ -128,12 +117,7 @@
 
 private:
 
-  static bool IsTypeSupported(const nsAString& aKeySystem,
-                              const Optional<nsAString>& aInitDataType = Optional<nsAString>(),
-                              const Optional<nsAString>& aContentType = Optional<nsAString>());
-
   bool IsInPrivateBrowsing();
-  already_AddRefed<Promise> Init(ErrorResult& aRv);
 
   // Removes promise from mPromises, and returns it.
   already_AddRefed<Promise> RetrievePromise(PromiseId aId);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeySystemAccess.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeySystemAccess.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeySystemAccess.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeySystemAccess.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,212 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/MediaKeySystemAccess.h"
+#include "mozilla/dom/MediaKeySystemAccessBinding.h"
+#include "mozilla/Preferences.h"
+#include "nsContentTypeParser.h"
+#ifdef MOZ_FMP4
+#include "MP4Decoder.h"
+#endif
+#ifdef XP_WIN
+#include "mozilla/WindowsVersion.h"
+#endif
+#include "nsContentCID.h"
+#include "nsServiceManagerUtils.h"
+#include "mozIGeckoMediaPluginService.h"
+#include "VideoUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MediaKeySystemAccess,
+                                      mParent)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(MediaKeySystemAccess)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(MediaKeySystemAccess)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaKeySystemAccess)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+MediaKeySystemAccess::MediaKeySystemAccess(nsPIDOMWindow* aParent,
+                                           const nsAString& aKeySystem)
+  : mParent(aParent)
+  , mKeySystem(aKeySystem)
+{
+}
+
+MediaKeySystemAccess::~MediaKeySystemAccess()
+{
+}
+
+JSObject*
+MediaKeySystemAccess::WrapObject(JSContext* aCx)
+{
+  return MediaKeySystemAccessBinding::Wrap(aCx, this);
+}
+
+nsPIDOMWindow*
+MediaKeySystemAccess::GetParentObject() const
+{
+  return mParent;
+}
+
+void
+MediaKeySystemAccess::GetKeySystem(nsString& aRetVal) const
+{
+  aRetVal = mKeySystem;
+}
+
+already_AddRefed<Promise>
+MediaKeySystemAccess::CreateMediaKeys(ErrorResult& aRv)
+{
+  nsRefPtr<MediaKeys> keys(new MediaKeys(mParent, mKeySystem));
+  return keys->Init(aRv);
+}
+
+static bool
+HaveGMPFor(mozIGeckoMediaPluginService* aGMPService,
+           const nsCString& aKeySystem,
+           const nsCString& aAPI,
+           const nsCString& aTag = EmptyCString())
+{
+  nsTArray<nsCString> tags;
+  tags.AppendElement(aKeySystem);
+  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,
+                                             &hasPlugin))) {
+    return false;
+  }
+  return hasPlugin;
+}
+
+/* static */
+bool
+MediaKeySystemAccess::IsKeySystemSupported(const nsAString& aKeySystem)
+{
+  nsCOMPtr<mozIGeckoMediaPluginService> mps =
+    do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  if (NS_WARN_IF(!mps)) {
+    return false;
+  }
+
+  if (aKeySystem.EqualsLiteral("org.w3.clearkey") &&
+      HaveGMPFor(mps,
+                 NS_LITERAL_CSTRING("org.w3.clearkey"),
+                 NS_LITERAL_CSTRING("eme-decrypt"))) {
+    return true;
+  }
+
+#ifdef XP_WIN
+  if (aKeySystem.EqualsLiteral("com.adobe.access") &&
+      Preferences::GetBool("media.eme.adobe-access.enabled", false) &&
+      IsVistaOrLater() && // Win Vista and later only.
+      HaveGMPFor(mps,
+                 NS_LITERAL_CSTRING("com.adobe.access"),
+                 NS_LITERAL_CSTRING("eme-decrypt"))) {
+      return true;
+  }
+#endif
+
+  return false;
+}
+
+static bool
+IsPlayableWithGMP(mozIGeckoMediaPluginService* aGMPS,
+                  const nsAString& aKeySystem,
+                  const nsAString& aContentType)
+{
+#ifdef MOZ_FMP4
+  nsContentTypeParser parser(aContentType);
+  nsAutoString mimeType;
+  nsresult rv = parser.GetType(mimeType);
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  if (!mimeType.EqualsLiteral("audio/mp4") &&
+      !mimeType.EqualsLiteral("audio/x-m4a") &&
+      !mimeType.EqualsLiteral("video/mp4")) {
+    return false;
+  }
+
+  nsAutoString codecs;
+  parser.GetParameter("codecs", codecs);
+
+  NS_ConvertUTF16toUTF8 mimeTypeUTF8(mimeType);
+  bool hasAAC = false;
+  bool hasH264 = false;
+  bool hasMP3 = false;
+  if (!MP4Decoder::CanHandleMediaType(mimeTypeUTF8,
+                                      codecs,
+                                      hasAAC,
+                                      hasH264,
+                                      hasMP3) ||
+      hasMP3) {
+    return false;
+  }
+  return (!hasAAC || !HaveGMPFor(aGMPS,
+                                 NS_ConvertUTF16toUTF8(aKeySystem),
+                                 NS_LITERAL_CSTRING("eme-decrypt"),
+                                 NS_LITERAL_CSTRING("aac"))) &&
+         (!hasH264 || !HaveGMPFor(aGMPS,
+                                  NS_ConvertUTF16toUTF8(aKeySystem),
+                                  NS_LITERAL_CSTRING("eme-decrypt"),
+                                  NS_LITERAL_CSTRING("h264")));
+#else
+  return false;
+#endif
+}
+
+/* static */
+bool
+MediaKeySystemAccess::IsSupported(const nsAString& aKeySystem,
+                                  const Sequence<MediaKeySystemOptions>& aOptions)
+{
+  nsCOMPtr<mozIGeckoMediaPluginService> mps =
+    do_GetService("@mozilla.org/gecko-media-plugin-service;1");
+  if (NS_WARN_IF(!mps)) {
+    return false;
+  }
+
+  for (size_t i = 0; i < aOptions.Length(); i++) {
+    const MediaKeySystemOptions& options = aOptions[i];
+    if (!options.mInitDataType.EqualsLiteral("cenc")) {
+      continue;
+    }
+    if (!options.mAudioCapability.IsEmpty() ||
+        !options.mVideoCapability.IsEmpty()) {
+      // Don't support any capabilites until we know we have a CDM with
+      // capabilities...
+      continue;
+    }
+    if (!options.mAudioType.IsEmpty() &&
+        !IsPlayableWithGMP(mps, aKeySystem, options.mAudioType)) {
+      continue;
+    }
+    if (!options.mVideoType.IsEmpty() &&
+        !IsPlayableWithGMP(mps, aKeySystem, options.mVideoType)) {
+      continue;
+    }
+
+    // Our sandbox provides an origin specific unique identifier, and the
+    // ability to persist data. We don't yet have a way to turn those off
+    // and on for specific GMPs/CDMs, so we don't check the uniqueidentifier
+    // and stateful attributes here.
+
+    return true;
+  }
+  return false;
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeySystemAccess.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeySystemAccess.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/MediaKeySystemAccess.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/MediaKeySystemAccess.h	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_MediaKeySystemAccess_h
+#define mozilla_dom_MediaKeySystemAccess_h
+
+#include "mozilla/Attributes.h"
+#include "mozilla/ErrorResult.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsWrapperCache.h"
+
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/MediaKeySystemAccessBinding.h"
+#include "js/TypeDecls.h"
+
+namespace mozilla {
+namespace dom {
+
+class MediaKeySystemAccess MOZ_FINAL : public nsISupports,
+                                       public nsWrapperCache
+{
+public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MediaKeySystemAccess)
+
+public:
+  explicit MediaKeySystemAccess(nsPIDOMWindow* aParent,
+                                const nsAString& aKeySystem);
+
+protected:
+  ~MediaKeySystemAccess();
+
+public:
+  nsPIDOMWindow* GetParentObject() const;
+
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+  void GetKeySystem(nsString& aRetVal) const;
+
+  already_AddRefed<Promise> CreateMediaKeys(ErrorResult& aRv);
+
+  static bool IsKeySystemSupported(const nsAString& aKeySystem);
+
+  static bool IsSupported(const nsAString& aKeySystem,
+                          const Sequence<MediaKeySystemOptions>& aOptions);
+
+private:
+  nsCOMPtr<nsPIDOMWindow> mParent;
+  const nsString mKeySystem;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_MediaKeySystemAccess_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/eme/moz.build	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/eme/moz.build	2014-11-26 21:46:00.000000000 +0000
@@ -10,6 +10,7 @@
     'MediaKeyMessageEvent.h',
     'MediaKeys.h',
     'MediaKeySession.h',
+    'MediaKeySystemAccess.h',
 ]
 
 EXPORTS.mozilla += [
@@ -29,6 +30,7 @@
     'MediaKeyMessageEvent.cpp',
     'MediaKeys.cpp',
     'MediaKeySession.cpp',
+    'MediaKeySystemAccess.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/MediaEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/MediaEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/MediaEncoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/MediaEncoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -46,20 +46,19 @@
 void
 MediaEncoder::NotifyQueuedTrackChanges(MediaStreamGraph* aGraph,
                                        TrackID aID,
-                                       TrackRate aTrackRate,
-                                       TrackTicks aTrackOffset,
+                                       StreamTime aTrackOffset,
                                        uint32_t aTrackEvents,
                                        const MediaSegment& aQueuedMedia)
 {
   // Process the incoming raw track data from MediaStreamGraph, called on the
   // thread of MediaStreamGraph.
   if (mAudioEncoder && aQueuedMedia.GetType() == MediaSegment::AUDIO) {
-    mAudioEncoder->NotifyQueuedTrackChanges(aGraph, aID, aTrackRate,
+    mAudioEncoder->NotifyQueuedTrackChanges(aGraph, aID,
                                             aTrackOffset, aTrackEvents,
                                             aQueuedMedia);
 
   } else if (mVideoEncoder && aQueuedMedia.GetType() == MediaSegment::VIDEO) {
-      mVideoEncoder->NotifyQueuedTrackChanges(aGraph, aID, aTrackRate,
+      mVideoEncoder->NotifyQueuedTrackChanges(aGraph, aID,
                                               aTrackOffset, aTrackEvents,
                                               aQueuedMedia);
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/MediaEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/MediaEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/MediaEncoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/MediaEncoder.h	2014-11-26 21:46:00.000000000 +0000
@@ -80,8 +80,7 @@
    * track data in form of MediaSegment.
    */
   virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                        TrackRate aTrackRate,
-                                        TrackTicks aTrackOffset,
+                                        StreamTime aTrackOffset,
                                         uint32_t aTrackEvents,
                                         const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/TrackEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/TrackEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/TrackEncoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/TrackEncoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -53,8 +53,7 @@
 void
 AudioTrackEncoder::NotifyQueuedTrackChanges(MediaStreamGraph* aGraph,
                                             TrackID aID,
-                                            TrackRate aTrackRate,
-                                            TrackTicks aTrackOffset,
+                                            StreamTime aTrackOffset,
                                             uint32_t aTrackEvents,
                                             const MediaSegment& aQueuedMedia)
 {
@@ -77,7 +76,7 @@
       // The number of channels is determined by the first non-null chunk, and
       // thus the audio encoder is initialized at this time.
       if (!chunk.IsNull()) {
-        nsresult rv = Init(chunk.mChannelData.Length(), aTrackRate);
+        nsresult rv = Init(chunk.mChannelData.Length(), aGraph->GraphRate());
         if (NS_FAILED(rv)) {
           LOG("[AudioTrackEncoder]: Fail to initialize the encoder!");
           NotifyCancel();
@@ -182,8 +181,7 @@
 void
 VideoTrackEncoder::NotifyQueuedTrackChanges(MediaStreamGraph* aGraph,
                                             TrackID aID,
-                                            TrackRate aTrackRate,
-                                            TrackTicks aTrackOffset,
+                                            StreamTime aTrackOffset,
                                             uint32_t aTrackEvents,
                                             const MediaSegment& aQueuedMedia)
 {
@@ -207,7 +205,7 @@
         gfxIntSize intrinsicSize = chunk.mFrame.GetIntrinsicSize();
         nsresult rv = Init(imgsize.width, imgsize.height,
                            intrinsicSize.width, intrinsicSize.height,
-                           aTrackRate);
+                           aGraph->GraphRate());
         if (NS_FAILED(rv)) {
           LOG("[VideoTrackEncoder]: Fail to initialize the encoder!");
           NotifyCancel();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/TrackEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/TrackEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/TrackEncoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/TrackEncoder.h	2014-11-26 21:46:00.000000000 +0000
@@ -39,8 +39,7 @@
    * change from MediaStreamGraph. Called on the MediaStreamGraph thread.
    */
   virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                        TrackRate aTrackRate,
-                                        TrackTicks aTrackOffset,
+                                        StreamTime aTrackOffset,
                                         uint32_t aTrackEvents,
                                         const MediaSegment& aQueuedMedia) = 0;
 
@@ -146,11 +145,10 @@
     , mSamplingRate(0)
   {}
 
-  void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                TrackRate aTrackRate,
-                                TrackTicks aTrackOffset,
-                                uint32_t aTrackEvents,
-                                const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
+  virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
+                                        StreamTime aTrackOffset,
+                                        uint32_t aTrackEvents,
+                                        const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
 
   /**
    * Interleaves the track data and stores the result into aOutput. Might need
@@ -237,14 +235,13 @@
   {}
 
   /**
-   * Notified by the same callbcak of MediaEncoder when it has received a track
+   * Notified by the same callback of MediaEncoder when it has received a track
    * change from MediaStreamGraph. Called on the MediaStreamGraph thread.
    */
-  void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                TrackRate aTrackRate,
-                                TrackTicks aTrackOffset,
-                                uint32_t aTrackEvents,
-                                const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
+  virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
+                                        StreamTime aTrackOffset,
+                                        uint32_t aTrackEvents,
+                                        const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
   /**
   * Measure size of mRawSegment
   */
@@ -300,10 +297,10 @@
   TrackRate mTrackRate;
 
   /**
-   * The total duration of frames in encoded video in TrackTicks, kept track of
+   * The total duration of frames in encoded video in StreamTime, kept track of
    * in subclasses.
    */
-  TrackTicks mTotalFrameDuration;
+  StreamTime mTotalFrameDuration;
 
   /**
    * The last unique frame we've sent to track encoder, kept track of in
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/VP8TrackEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/VP8TrackEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/VP8TrackEncoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/VP8TrackEncoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -363,7 +363,7 @@
  */
 VP8TrackEncoder::EncodeOperation
 VP8TrackEncoder::GetNextEncodeOperation(TimeDuration aTimeElapsed,
-                                        TrackTicks aProcessedDuration)
+                                        StreamTime aProcessedDuration)
 {
   int64_t durationInUsec =
     FramesToUsecs(aProcessedDuration + mEncodedFrameDuration,
@@ -381,20 +381,20 @@
   }
 }
 
-TrackTicks
-VP8TrackEncoder::CalculateRemainingTicks(TrackTicks aDurationCopied,
-                                         TrackTicks aEncodedDuration)
+StreamTime
+VP8TrackEncoder::CalculateRemainingTicks(StreamTime aDurationCopied,
+                                         StreamTime aEncodedDuration)
 {
   return mRemainingTicks + aEncodedDuration - aDurationCopied;
 }
 
 // Try to extend the encodedDuration as long as possible if the target frame
 // has a long duration.
-TrackTicks
-VP8TrackEncoder::CalculateEncodedDuration(TrackTicks aDurationCopied)
+StreamTime
+VP8TrackEncoder::CalculateEncodedDuration(StreamTime aDurationCopied)
 {
-  TrackTicks temp64 = aDurationCopied;
-  TrackTicks encodedDuration = mEncodedFrameDuration;
+  StreamTime temp64 = aDurationCopied;
+  StreamTime encodedDuration = mEncodedFrameDuration;
   temp64 -= mRemainingTicks;
   while (temp64 > mEncodedFrameDuration) {
     temp64 -= mEncodedFrameDuration;
@@ -470,8 +470,8 @@
   }
 
   VideoSegment::ChunkIterator iter(mSourceSegment);
-  TrackTicks durationCopied = 0;
-  TrackTicks totalProcessedDuration = 0;
+  StreamTime durationCopied = 0;
+  StreamTime totalProcessedDuration = 0;
   TimeStamp timebase = TimeStamp::Now();
   EncodeOperation nextEncodeOperation = ENCODE_NORMAL_FRAME;
 
@@ -486,7 +486,7 @@
     if (durationCopied >= mRemainingTicks) {
       VP8LOG("nextEncodeOperation is %d\n",nextEncodeOperation);
       // Calculate encodedDuration for this target frame.
-      TrackTicks encodedDuration = CalculateEncodedDuration(durationCopied);
+      StreamTime encodedDuration = CalculateEncodedDuration(durationCopied);
 
       // Encode frame.
       if (nextEncodeOperation != SKIP_FRAME) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/VP8TrackEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/VP8TrackEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/encoder/VP8TrackEncoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/encoder/VP8TrackEncoder.h	2014-11-26 21:46:00.000000000 +0000
@@ -43,15 +43,15 @@
 
 private:
   // Calculate the target frame's encoded duration.
-  TrackTicks CalculateEncodedDuration(TrackTicks aDurationCopied);
+  StreamTime CalculateEncodedDuration(StreamTime aDurationCopied);
 
   // Calculate the mRemainingTicks for next target frame.
-  TrackTicks CalculateRemainingTicks(TrackTicks aDurationCopied,
-                                     TrackTicks aEncodedDuration);
+  StreamTime CalculateRemainingTicks(StreamTime aDurationCopied,
+                                     StreamTime aEncodedDuration);
 
   // Get the EncodeOperation for next target frame.
   EncodeOperation GetNextEncodeOperation(TimeDuration aTimeElapsed,
-                                         TrackTicks aProcessedDuration);
+                                         StreamTime aProcessedDuration);
 
   // Get the encoded data from encoder to aData.
   nsresult GetEncodedPartitions(EncodedFrameContainer& aData);
@@ -62,11 +62,11 @@
   // Output frame rate.
   uint32_t mEncodedFrameRate;
   // Duration for the output frame, reciprocal to mEncodedFrameRate.
-  TrackTicks mEncodedFrameDuration;
+  StreamTime mEncodedFrameDuration;
   // Encoded timestamp.
-  TrackTicks mEncodedTimestamp;
+  StreamTime mEncodedTimestamp;
   // Duration to the next encode frame.
-  TrackTicks mRemainingTicks;
+  StreamTime mRemainingTicks;
 
   // Muted frame, we only create it once.
   nsRefPtr<layers::Image> mMuteFrame;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -3,18 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AndroidDecoderModule.h"
-#include "PlatformDecoderModule.h"
-#include "GeneratedJNIWrappers.h"
-#include "GeneratedSDKWrappers.h"
 #include "AndroidBridge.h"
-#include "MediaTaskQueue.h"
-#include "SharedThreadPool.h"
-#include "TexturePoolOGL.h"
 #include "GLImages.h"
 
 #include "MediaData.h"
 
-#include "mp4_demuxer/Adts.h"
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/DecoderData.h"
 
@@ -26,7 +19,7 @@
 
 using namespace mozilla;
 using namespace mozilla::gl;
-using namespace mozilla::widget::android;
+using namespace mozilla::widget::android::sdk;
 
 namespace mozilla {
 
@@ -36,10 +29,7 @@
     return nullptr;
   }
 
-  nsAutoString mimeType;
-  mimeType.AssignASCII(aMimeType);
-
-  jobject decoder = MediaCodec::CreateDecoderByType(mimeType);
+  jobject decoder = MediaCodec::CreateDecoderByType(nsCString(aMimeType));
 
   return new MediaCodec(decoder, aEnv);
 }
@@ -59,7 +49,7 @@
   nsresult Init() MOZ_OVERRIDE {
     mSurfaceTexture = AndroidSurfaceTexture::Create();
     if (!mSurfaceTexture) {
-      printf_stderr("Failed to create SurfaceTexture for video decode\n");
+      NS_WARNING("Failed to create SurfaceTexture for video decode\n");
       return NS_ERROR_FAILURE;
     }
 
@@ -67,7 +57,7 @@
   }
 
   virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE {
-    mp4_demuxer::AnnexB::ConvertSample(aSample, mConfig.annex_b);
+    mp4_demuxer::AnnexB::ConvertSample(aSample);
     return MediaCodecDataDecoder::Input(aSample);
   }
 
@@ -89,21 +79,22 @@
     layers::SurfaceTextureImage* typedImg = static_cast<layers::SurfaceTextureImage*>(img.get());
     typedImg->SetData(data);
 
-    mCallback->Output(VideoData::CreateFromImage(videoInfo, mImageContainer, aInfo->getOffset(),
-                                                 aInfo->getPresentationTimeUs(),
-                                                 aDuration,
-                                                 img, isSync,
-                                                 aInfo->getPresentationTimeUs(),
-                                                 gfx::IntRect(0, 0,
-                                                   mConfig.display_width,
-                                                   mConfig.display_height)));
+    nsRefPtr<VideoData> v = VideoData::CreateFromImage(videoInfo, mImageContainer, aInfo->getOffset(),
+                                                       aInfo->getPresentationTimeUs(),
+                                                       aDuration,
+                                                       img, isSync,
+                                                       aInfo->getPresentationTimeUs(),
+                                                       gfx::IntRect(0, 0,
+                                                         mConfig.display_width,
+                                                         mConfig.display_height));
+    mCallback->Output(v);
     return NS_OK;
   }
 
 protected:
   layers::ImageContainer* mImageContainer;
   const mp4_demuxer::VideoDecoderConfig& mConfig;
-  nsRefPtr<AndroidSurfaceTexture> mSurfaceTexture;
+  RefPtr<AndroidSurfaceTexture> mSurfaceTexture;
 };
 
 class AudioDataDecoder : public MediaCodecDataDecoder {
@@ -113,41 +104,23 @@
   {
   }
 
-  virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE {
-    if (!strcmp(mMimeType, "audio/mp4a-latm")) {
-      uint32_t numChannels = mFormat->GetInteger(NS_LITERAL_STRING("channel-count"));
-      uint32_t sampleRate = mFormat->GetInteger(NS_LITERAL_STRING("sample-rate"));
-      uint8_t frequencyIndex =
-          mp4_demuxer::Adts::GetFrequencyIndex(sampleRate);
-      uint32_t aacProfile = mFormat->GetInteger(NS_LITERAL_STRING("aac-profile"));
-      bool rv = mp4_demuxer::Adts::ConvertSample(numChannels,
-                                                 frequencyIndex,
-                                                 aacProfile,
-                                                 aSample);
-      if (!rv) {
-        printf_stderr("Failed to prepend ADTS header\n");
-        return NS_ERROR_FAILURE;
-      }
-    }
-    return MediaCodecDataDecoder::Input(aSample);
-  }
-
   nsresult Output(BufferInfo* aInfo, void* aBuffer, MediaFormat* aFormat, Microseconds aDuration) {
     // The output on Android is always 16-bit signed
 
-    uint32_t numChannels = aFormat->GetInteger(NS_LITERAL_STRING("channel-count"));
-    uint32_t sampleRate = aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"));
+    uint32_t numChannels = aFormat->GetInteger(NS_LITERAL_CSTRING("channel-count"));
+    uint32_t sampleRate = aFormat->GetInteger(NS_LITERAL_CSTRING("sample-rate"));
     uint32_t numFrames = (aInfo->getSize() / numChannels) / 2;
 
     AudioDataValue* audio = new AudioDataValue[aInfo->getSize()];
     PodCopy(audio, static_cast<AudioDataValue*>(aBuffer), aInfo->getSize());
 
-    mCallback->Output(new AudioData(aInfo->getOffset(), aInfo->getPresentationTimeUs(),
-                                    aDuration,
-                                    numFrames,
-                                    audio,
-                                    numChannels,
-                                    sampleRate));
+    nsRefPtr<AudioData> data = new AudioData(aInfo->getOffset(), aInfo->getPresentationTimeUs(),
+                                             aDuration,
+                                             numFrames,
+                                             audio,
+                                             numChannels,
+                                             sampleRate);
+    mCallback->Output(data);
     return NS_OK;
   }
 };
@@ -162,17 +135,14 @@
 }
 
 already_AddRefed<MediaDataDecoder>
-AndroidDecoderModule::CreateH264Decoder(
+AndroidDecoderModule::CreateVideoDecoder(
                                 const mp4_demuxer::VideoDecoderConfig& aConfig,
                                 layers::LayersBackend aLayersBackend,
                                 layers::ImageContainer* aImageContainer,
                                 MediaTaskQueue* aVideoTaskQueue,
                                 MediaDataDecoderCallback* aCallback)
 {
-  nsAutoString mimeType;
-  mimeType.AssignASCII(aConfig.mime_type);
-
-  jobject jFormat = MediaFormat::CreateVideoFormat(mimeType,
+  jobject jFormat = MediaFormat::CreateVideoFormat(nsCString(aConfig.mime_type),
                                                    aConfig.display_width,
                                                    aConfig.display_height);
 
@@ -199,10 +169,7 @@
 {
   MOZ_ASSERT(aConfig.bits_per_sample == 16, "We only handle 16-bit audio!");
 
-  nsAutoString mimeType;
-  mimeType.AssignASCII(aConfig.mime_type);
-
-  jobject jFormat = MediaFormat::CreateAudioFormat(mimeType,
+  jobject jFormat = MediaFormat::CreateAudioFormat(nsCString(aConfig.mime_type),
                                                    aConfig.samples_per_second,
                                                    aConfig.channel_count);
 
@@ -216,23 +183,18 @@
 
   JNIEnv* env = GetJNIForThread();
 
-  if (!format->GetByteBuffer(NS_LITERAL_STRING("csd-0"))) {
+  if (!format->GetByteBuffer(NS_LITERAL_CSTRING("csd-0"))) {
     uint8_t* csd0 = new uint8_t[2];
 
     csd0[0] = aConfig.audio_specific_config[0];
     csd0[1] = aConfig.audio_specific_config[1];
 
     jobject buffer = env->NewDirectByteBuffer(csd0, 2);
-    format->SetByteBuffer(NS_LITERAL_STRING("csd-0"), buffer);
+    format->SetByteBuffer(NS_LITERAL_CSTRING("csd-0"), buffer);
 
     env->DeleteLocalRef(buffer);
   }
 
-  if (mimeType.EqualsLiteral("audio/mp4a-latm")) {
-    format->SetInteger(NS_LITERAL_STRING("is-adts"), 1);
-    format->SetInteger(NS_LITERAL_STRING("aac-profile"), aConfig.aac_profile);
-  }
-
   nsRefPtr<MediaDataDecoder> decoder =
     new AudioDataDecoder(aConfig.mime_type, format, aCallback);
 
@@ -257,6 +219,7 @@
   , mInputBuffers(nullptr)
   , mOutputBuffers(nullptr)
   , mMonitor("MediaCodecDataDecoder::mMonitor")
+  , mFlushing(false)
   , mDraining(false)
   , mStopping(false)
 {
@@ -294,15 +257,26 @@
     return NS_ERROR_FAILURE;
   }
 
-  if (!mDecoder->Configure(mFormat->wrappedObject(), aSurface, nullptr, 0)) {
-    mCallback->Error();
-    return NS_ERROR_FAILURE;
+  nsresult res;
+  mDecoder->Configure(mFormat->wrappedObject(), aSurface, nullptr, 0, &res);
+  if (NS_FAILED(res)) {
+    return res;
   }
 
-  mDecoder->Start();
+  mDecoder->Start(&res);
+  if (NS_FAILED(res)) {
+    return res;
+  }
 
-  ResetInputBuffers();
-  ResetOutputBuffers();
+  res = ResetInputBuffers();
+  if (NS_FAILED(res)) {
+    return res;
+  }
+
+  res = ResetOutputBuffers();
+  if (NS_FAILED(res)) {
+    return res;
+  }
 
   NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread),
                     NS_NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop));
@@ -313,19 +287,30 @@
 // This is in usec, so that's 10ms
 #define DECODER_TIMEOUT 10000
 
+#define HANDLE_DECODER_ERROR() \
+  if (NS_FAILED(res)) { \
+    NS_WARNING("exiting decoder loop due to exception"); \
+    mCallback->Error(); \
+    break; \
+  }
+
 void MediaCodecDataDecoder::DecoderLoop()
 {
   bool outputDone = false;
 
+  bool draining = false;
+  bool waitingEOF = false;
+
   JNIEnv* env = GetJNIForThread();
   mp4_demuxer::MP4Sample* sample = nullptr;
 
   nsAutoPtr<MediaFormat> outputFormat;
+  nsresult res;
 
   for (;;) {
     {
       MonitorAutoLock lock(mMonitor);
-      while (!mStopping && !mDraining && mQueue.empty()) {
+      while (!mStopping && !mDraining && !mFlushing && mQueue.empty()) {
         if (mQueue.empty()) {
           // We could be waiting here forever if we don't signal that we need more input
           mCallback->InputExhausted();
@@ -338,23 +323,41 @@
         break;
       }
 
-      if (mDraining) {
+      if (mFlushing) {
         mDecoder->Flush();
         ClearQueue();
-        mDraining =  false;
+        mFlushing =  false;
         lock.Notify();
         continue;
       }
 
+      if (mDraining && !sample && !waitingEOF) {
+        draining = true;
+      }
+
       // We're not stopping or draining, so try to get a sample
       if (!mQueue.empty()) {
         sample = mQueue.front();
       }
     }
 
+    if (draining && !waitingEOF) {
+      MOZ_ASSERT(!sample, "Shouldn't have a sample when pushing EOF frame");
+
+      int inputIndex = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &res);
+      HANDLE_DECODER_ERROR();
+
+      if (inputIndex >= 0) {
+        mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0, MediaCodec::getBUFFER_FLAG_END_OF_STREAM(), &res);
+        waitingEOF = true;
+      }
+    }
+
     if (sample) {
       // We have a sample, try to feed it to the decoder
-      int inputIndex = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT);
+      int inputIndex = mDecoder->DequeueInputBuffer(DECODER_TIMEOUT, &res);
+      HANDLE_DECODER_ERROR();
+
       if (inputIndex >= 0) {
         jobject buffer = env->GetObjectArrayElement(mInputBuffers, inputIndex);
         void* directBuffer = env->GetDirectBufferAddress(buffer);
@@ -369,7 +372,9 @@
 
         PodCopy((uint8_t*)directBuffer, sample->data, sample->size);
 
-        mDecoder->QueueInputBuffer(inputIndex, 0, sample->size, sample->composition_timestamp, 0);
+        mDecoder->QueueInputBuffer(inputIndex, 0, sample->size, sample->composition_timestamp, 0, &res);
+        HANDLE_DECODER_ERROR();
+
         mDurations.push(sample->duration);
 
         delete sample;
@@ -383,21 +388,43 @@
     if (!outputDone) {
       BufferInfo bufferInfo;
 
-      int outputStatus = mDecoder->DequeueOutputBuffer(bufferInfo.wrappedObject(), DECODER_TIMEOUT);
+      int outputStatus = mDecoder->DequeueOutputBuffer(bufferInfo.wrappedObject(), DECODER_TIMEOUT, &res);
+      HANDLE_DECODER_ERROR();
+
       if (outputStatus == MediaCodec::getINFO_TRY_AGAIN_LATER()) {
         // We might want to call mCallback->InputExhausted() here, but there seems to be
         // some possible bad interactions here with the threading
       } else if (outputStatus == MediaCodec::getINFO_OUTPUT_BUFFERS_CHANGED()) {
-        ResetOutputBuffers();
+        res = ResetOutputBuffers();
+        HANDLE_DECODER_ERROR();
       } else if (outputStatus == MediaCodec::getINFO_OUTPUT_FORMAT_CHANGED()) {
         outputFormat = new MediaFormat(mDecoder->GetOutputFormat(), GetJNIForThread());
       } else if (outputStatus < 0) {
-        printf_stderr("unknown error from decoder! %d\n", outputStatus);
+        NS_WARNING("unknown error from decoder!");
         mCallback->Error();
+
+        // Don't break here just in case it's recoverable. If it's not, others stuff will fail later and
+        // we'll bail out.
       } else {
         // We have a valid buffer index >= 0 here
         if (bufferInfo.getFlags() & MediaCodec::getBUFFER_FLAG_END_OF_STREAM()) {
+          if (draining) {
+            draining = false;
+            waitingEOF = false;
+
+            mMonitor.Lock();
+            mDraining = false;
+            mMonitor.Notify();
+            mMonitor.Unlock();
+
+            mCallback->DrainComplete();
+          }
+
+          mDecoder->ReleaseOutputBuffer(outputStatus, false);
           outputDone = true;
+
+          // We only queue empty EOF frames, so we're done for now
+          continue;
         }
 
         MOZ_ASSERT(!mDurations.empty(), "Should have had a duration queued");
@@ -454,7 +481,7 @@
   return NS_OK;
 }
 
-void MediaCodecDataDecoder::ResetInputBuffers()
+nsresult MediaCodecDataDecoder::ResetInputBuffers()
 {
   JNIEnv* env = GetJNIForThread();
 
@@ -462,10 +489,16 @@
     env->DeleteGlobalRef(mInputBuffers);
   }
 
-  mInputBuffers = (jobjectArray) env->NewGlobalRef(mDecoder->GetInputBuffers());
+  nsresult res;
+  mInputBuffers = (jobjectArray) env->NewGlobalRef(mDecoder->GetInputBuffers(&res));
+  if (NS_FAILED(res)) {
+    return res;
+  }
+
+  return NS_OK;
 }
 
-void MediaCodecDataDecoder::ResetOutputBuffers()
+nsresult MediaCodecDataDecoder::ResetOutputBuffers()
 {
   JNIEnv* env = GetJNIForThread();
 
@@ -473,24 +506,36 @@
     env->DeleteGlobalRef(mOutputBuffers);
   }
 
-  mOutputBuffers = (jobjectArray) env->NewGlobalRef(mDecoder->GetOutputBuffers());
+  nsresult res;
+  mOutputBuffers = (jobjectArray) env->NewGlobalRef(mDecoder->GetOutputBuffers(&res));
+  if (NS_FAILED(res)) {
+    return res;
+  }
+
+  return NS_OK;
 }
 
 nsresult MediaCodecDataDecoder::Flush() {
-  Drain();
+  MonitorAutoLock lock(mMonitor);
+  mFlushing = true;
+  lock.Notify();
+
+  while (mFlushing) {
+    lock.Wait();
+  }
+
   return NS_OK;
 }
 
 nsresult MediaCodecDataDecoder::Drain() {
   MonitorAutoLock lock(mMonitor);
+  if (mDraining) {
+    return NS_OK;
+  }
+
   mDraining = true;
   lock.Notify();
 
-  while (mDraining) {
-    lock.Wait();
-  }
-
-  mCallback->DrainComplete();
   return NS_OK;
 }
 
@@ -515,6 +560,7 @@
 
   mDecoder->Stop();
   mDecoder->Release();
+
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h	2014-11-26 21:46:00.000000000 +0000
@@ -6,10 +6,9 @@
 #define AndroidDecoderModule_h_
 
 #include "PlatformDecoderModule.h"
-#include "AndroidJavaWrappers.h"
 #include "AndroidSurfaceTexture.h"
 
-#include "GeneratedSDKWrappers.h"
+#include "MediaCodec.h"
 #include "mozilla/Monitor.h"
 
 #include <queue>
@@ -20,11 +19,13 @@
 
 namespace widget {
 namespace android {
+namespace sdk {
   class MediaCodec;
   class MediaFormat;
   class ByteBuffer;
 }
 }
+}
 
 class MediaCodecDataDecoder;
 
@@ -33,11 +34,11 @@
   virtual nsresult Shutdown() MOZ_OVERRIDE;
 
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                    layers::LayersBackend aLayersBackend,
-                    layers::ImageContainer* aImageContainer,
-                    MediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     MediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
 
   virtual already_AddRefed<MediaDataDecoder>
   CreateAudioDecoder(const mp4_demuxer::AudioDecoderConfig& aConfig,
@@ -56,7 +57,7 @@
 
   MediaCodecDataDecoder(MediaData::Type aType,
                         const char* aMimeType,
-                        mozilla::widget::android::MediaFormat* aFormat,
+                        mozilla::widget::android::sdk::MediaFormat* aFormat,
                         MediaDataDecoderCallback* aCallback);
 
   virtual ~MediaCodecDataDecoder();
@@ -73,11 +74,11 @@
   MediaData::Type mType;
 
   nsAutoPtr<char> mMimeType;
-  nsAutoPtr<mozilla::widget::android::MediaFormat> mFormat;
+  nsAutoPtr<mozilla::widget::android::sdk::MediaFormat> mFormat;
 
   MediaDataDecoderCallback* mCallback;
 
-  nsAutoPtr<mozilla::widget::android::MediaCodec> mDecoder;
+  nsAutoPtr<mozilla::widget::android::sdk::MediaCodec> mDecoder;
 
   jobjectArray mInputBuffers;
   jobjectArray mOutputBuffers;
@@ -86,6 +87,7 @@
 
   // Only these members are protected by mMonitor.
   Monitor mMonitor;
+  bool mFlushing;
   bool mDraining;
   bool mStopping;
 
@@ -94,11 +96,11 @@
 
   virtual nsresult InitDecoder(jobject aSurface = nullptr);
 
-  virtual nsresult Output(mozilla::widget::android::BufferInfo* aInfo, void* aBuffer, mozilla::widget::android::MediaFormat* aFormat, Microseconds aDuration) { return NS_OK; }
-  virtual nsresult PostOutput(mozilla::widget::android::BufferInfo* aInfo, mozilla::widget::android::MediaFormat* aFormat, Microseconds aDuration) { return NS_OK; }
+  virtual nsresult Output(mozilla::widget::android::sdk::BufferInfo* aInfo, void* aBuffer, mozilla::widget::android::sdk::MediaFormat* aFormat, Microseconds aDuration) { return NS_OK; }
+  virtual nsresult PostOutput(mozilla::widget::android::sdk::BufferInfo* aInfo, mozilla::widget::android::sdk::MediaFormat* aFormat, Microseconds aDuration) { return NS_OK; }
 
-  void ResetInputBuffers();
-  void ResetOutputBuffers();
+  nsresult ResetInputBuffers();
+  nsresult ResetOutputBuffers();
 
   void DecoderLoop();
   virtual void ClearQueue();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleATDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleATDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleATDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleATDecoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -4,14 +4,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/. */
 
-#include <AudioToolbox/AudioToolbox.h>
 #include "AppleUtils.h"
 #include "MP4Reader.h"
 #include "MP4Decoder.h"
-#include "mozilla/RefPtr.h"
-#include "mp4_demuxer/Adts.h"
 #include "mp4_demuxer/DecoderData.h"
-#include "nsIThread.h"
 #include "AppleATDecoder.h"
 #include "prlog.h"
 
@@ -31,12 +27,6 @@
   , mTaskQueue(aAudioTaskQueue)
   , mCallback(aCallback)
   , mConverter(nullptr)
-  , mStream(nullptr)
-  , mCurrentAudioTimestamp(-1)
-  , mNextAudioTimestamp(-1)
-  , mSamplePosition(0)
-  , mSizeDecoded(0)
-  , mLastError(noErr)
 {
   MOZ_COUNT_CTOR(AppleATDecoder);
   LOG("Creating Apple AudioToolbox decoder");
@@ -46,12 +36,12 @@
       mConfig.channel_count,
       mConfig.bits_per_sample);
 
-  if (!strcmp(aConfig.mime_type, "audio/mpeg")) {
-    mFileType = kAudioFileMP3Type;
-  } else if (!strcmp(aConfig.mime_type, "audio/mp4a-latm")) {
-    mFileType = kAudioFileAAC_ADTSType;
+  if (!strcmp(mConfig.mime_type, "audio/mpeg")) {
+    mFormatID = kAudioFormatMPEGLayer3;
+  } else if (!strcmp(mConfig.mime_type, "audio/mp4a-latm")) {
+    mFormatID = kAudioFormatMPEG4AAC;
   } else {
-    mFileType = 0;
+    mFormatID = 0;
   }
 }
 
@@ -59,48 +49,44 @@
 {
   MOZ_COUNT_DTOR(AppleATDecoder);
   MOZ_ASSERT(!mConverter);
-  MOZ_ASSERT(!mStream);
-}
-
-static void
-_MetadataCallback(void* aDecoder,
-                  AudioFileStreamID aStream,
-                  AudioFileStreamPropertyID aProperty,
-                  UInt32* aFlags)
-{
-  LOG("AppleATDecoder metadata callback");
-  AppleATDecoder* decoder = static_cast<AppleATDecoder*>(aDecoder);
-  decoder->MetadataCallback(aStream, aProperty, aFlags);
-}
-
-static void
-_SampleCallback(void* aDecoder,
-                UInt32 aNumBytes,
-                UInt32 aNumPackets,
-                const void* aData,
-                AudioStreamPacketDescription* aPackets)
-{
-  LOG("AppleATDecoder sample callback %u bytes %u packets",
-      aNumBytes, aNumPackets);
-  AppleATDecoder* decoder = static_cast<AppleATDecoder*>(aDecoder);
-  decoder->SampleCallback(aNumBytes, aNumPackets, aData, aPackets);
 }
 
 nsresult
 AppleATDecoder::Init()
 {
-  if (!mFileType) {
+  if (!mFormatID) {
     NS_ERROR("Non recognised format");
     return NS_ERROR_FAILURE;
   }
   LOG("Initializing Apple AudioToolbox decoder");
-  OSStatus rv = AudioFileStreamOpen(this,
-                                    _MetadataCallback,
-                                    _SampleCallback,
-                                    mFileType,
-                                    &mStream);
+  AudioStreamBasicDescription inputFormat;
+  PodZero(&inputFormat);
+
+  if (NS_FAILED(GetInputAudioDescription(inputFormat))) {
+    return NS_ERROR_FAILURE;
+  }
+  // Fill in the output format manually.
+  PodZero(&mOutputFormat);
+  mOutputFormat.mFormatID = kAudioFormatLinearPCM;
+  mOutputFormat.mSampleRate = inputFormat.mSampleRate;
+  mOutputFormat.mChannelsPerFrame = inputFormat.mChannelsPerFrame;
+#if defined(MOZ_SAMPLE_TYPE_FLOAT32)
+  mOutputFormat.mBitsPerChannel = 32;
+  mOutputFormat.mFormatFlags =
+    kLinearPCMFormatFlagIsFloat |
+    0;
+#else
+# error Unknown audio sample type
+#endif
+  // Set up the decoder so it gives us one sample per frame
+  mOutputFormat.mFramesPerPacket = 1;
+  mOutputFormat.mBytesPerPacket = mOutputFormat.mBytesPerFrame
+        = mOutputFormat.mChannelsPerFrame * mOutputFormat.mBitsPerChannel / 8;
+
+  OSStatus rv = AudioConverterNew(&inputFormat, &mOutputFormat, &mConverter);
   if (rv) {
-    NS_ERROR("Couldn't open AudioFileStream");
+    LOG("Error %d constructing AudioConverter", rv);
+    mConverter = nullptr;
     return NS_ERROR_FAILURE;
   }
 
@@ -137,9 +123,6 @@
     LOG("Error %d resetting AudioConverter", rv);
     return NS_ERROR_FAILURE;
   }
-  // Notify our task queue of the coming input discontinuity.
-  mTaskQueue->Dispatch(
-      NS_NewRunnableMethod(this, &AppleATDecoder::SignalFlush));
   return NS_OK;
 }
 
@@ -156,45 +139,25 @@
 AppleATDecoder::Shutdown()
 {
   LOG("Shutdown: Apple AudioToolbox AAC decoder");
-  OSStatus rv1 = AudioConverterDispose(mConverter);
-  if (rv1) {
-    LOG("error %d disposing of AudioConverter", rv1);
-  } else {
-    mConverter = nullptr;
-  }
-
-  OSStatus rv2 = AudioFileStreamClose(mStream);
-  if (rv2) {
-    LOG("error %d closing AudioFileStream", rv2);
-  } else {
-    mStream = nullptr;
-  }
-
-  return (rv1 && rv2) ? NS_OK : NS_ERROR_FAILURE;
-}
-
-void
-AppleATDecoder::MetadataCallback(AudioFileStreamID aFileStream,
-                                 AudioFileStreamPropertyID aPropertyID,
-                                 UInt32* aFlags)
-{
-  if (aPropertyID == kAudioFileStreamProperty_ReadyToProducePackets) {
-    SetupDecoder();
+  OSStatus rv = AudioConverterDispose(mConverter);
+  if (rv) {
+    LOG("error %d disposing of AudioConverter", rv);
+    return NS_ERROR_FAILURE;
   }
+  mConverter = nullptr;
+  return NS_OK;
 }
 
 struct PassthroughUserData {
-  AppleATDecoder* mDecoder;
-  UInt32 mNumPackets;
+  UInt32 mChannels;
   UInt32 mDataSize;
   const void* mData;
-  AudioStreamPacketDescription* mPacketDesc;
-  bool mDone;
+  AudioStreamPacketDescription mPacket;
 };
 
 // Error value we pass through the decoder to signal that nothing
-// has gone wrong during decoding, but more data is needed.
-const uint32_t kNeedMoreData = 'MOAR';
+// has gone wrong during decoding and we're done processing the packet.
+const uint32_t kNoMoreDataErr = 'MOAR';
 
 static OSStatus
 _PassthroughInputDataCallback(AudioConverterRef aAudioConverter,
@@ -204,51 +167,49 @@
                               void* aUserData)
 {
   PassthroughUserData* userData = (PassthroughUserData*)aUserData;
-  if (userData->mDone) {
-    // We make sure this callback is run _once_, with all the data we received
-    // from |AudioFileStreamParseBytes|. When we return an error, the decoder
-    // simply passes the return value on to the calling method,
-    // |SampleCallback|; and flushes all of the audio frames it had
-    // buffered. It does not change the decoder's state.
-    LOG("requested too much data; returning\n");
+  if (!userData->mDataSize) {
     *aNumDataPackets = 0;
-    return kNeedMoreData;
+    return kNoMoreDataErr;
   }
 
-  userData->mDone = true;
-
   LOG("AudioConverter wants %u packets of audio data\n", *aNumDataPackets);
 
-  *aNumDataPackets = userData->mNumPackets;
-  *aPacketDesc = userData->mPacketDesc;
+  if (aPacketDesc) {
+    userData->mPacket.mStartOffset = 0;
+    userData->mPacket.mVariableFramesInPacket = 0;
+    userData->mPacket.mDataByteSize = userData->mDataSize;
+    *aPacketDesc = &userData->mPacket;
+  }
 
-  aData->mBuffers[0].mNumberChannels = userData->mDecoder->mConfig.channel_count;
+  aData->mBuffers[0].mNumberChannels = userData->mChannels;
   aData->mBuffers[0].mDataByteSize = userData->mDataSize;
   aData->mBuffers[0].mData = const_cast<void*>(userData->mData);
 
+  // No more data to provide following this run.
+  userData->mDataSize = 0;
+
   return noErr;
 }
 
 void
-AppleATDecoder::SampleCallback(uint32_t aNumBytes,
-                               uint32_t aNumPackets,
-                               const void* aData,
-                               AudioStreamPacketDescription* aPackets)
+AppleATDecoder::SubmitSample(nsAutoPtr<mp4_demuxer::MP4Sample> aSample)
 {
+  // Array containing the queued decoded audio frames, about to be output.
+  nsTArray<AudioDataValue> outputData;
+  UInt32 channels = mOutputFormat.mChannelsPerFrame;
   // Pick a multiple of the frame size close to a power of two
   // for efficient allocation.
   const uint32_t MAX_AUDIO_FRAMES = 128;
-  const uint32_t maxDecodedSamples = MAX_AUDIO_FRAMES * mConfig.channel_count;
+  const uint32_t maxDecodedSamples = MAX_AUDIO_FRAMES * channels;
 
   // Descriptions for _decompressed_ audio packets. ignored.
   nsAutoArrayPtr<AudioStreamPacketDescription>
-      packets(new AudioStreamPacketDescription[MAX_AUDIO_FRAMES]);
+    packets(new AudioStreamPacketDescription[MAX_AUDIO_FRAMES]);
 
   // This API insists on having packets spoon-fed to it from a callback.
-  // This structure exists only to pass our state and the result of the
-  // parser on to the callback above.
+  // This structure exists only to pass our state.
   PassthroughUserData userData =
-      { this, aNumPackets, aNumBytes, aData, aPackets, false };
+    { channels, (UInt32)aSample->size, aSample->data };
 
   // Decompressed audio buffer
   nsAutoArrayPtr<AudioDataValue> decoded(new AudioDataValue[maxDecodedSamples]);
@@ -256,7 +217,7 @@
   do {
     AudioBufferList decBuffer;
     decBuffer.mNumberBuffers = 1;
-    decBuffer.mBuffers[0].mNumberChannels = mOutputFormat.mChannelsPerFrame;
+    decBuffer.mBuffers[0].mNumberChannels = channels;
     decBuffer.mBuffers[0].mDataByteSize =
       maxDecodedSamples * sizeof(AudioDataValue);
     decBuffer.mBuffers[0].mData = decoded.get();
@@ -272,155 +233,48 @@
                                                   &decBuffer,
                                                   packets.get());
 
-    if (rv && rv != kNeedMoreData) {
+    if (rv && rv != kNoMoreDataErr) {
       LOG("Error decoding audio stream: %d\n", rv);
-      mLastError = rv;
-      break;
+      mCallback->Error();
+      return;
     }
 
-    mOutputData.AppendElements(decoded.get(),
-                               numFrames * mConfig.channel_count);
+    if (numFrames) {
+      outputData.AppendElements(decoded.get(), numFrames * channels);
+      LOG("%d frames decoded", numFrames);
+    }
 
-    if (rv == kNeedMoreData) {
-      // No error; we just need more data.
-      LOG("FillComplexBuffer out of data\n");
+    if (rv == kNoMoreDataErr) {
+      LOG("done processing compressed packet");
       break;
     }
-    LOG("%d frames decoded", numFrames);
   } while (true);
 
-  mSizeDecoded += aNumBytes;
-}
-
-void
-AppleATDecoder::SetupDecoder()
-{
-  LOG("Setting up Apple AudioToolbox decoder.");
-
-  AudioStreamBasicDescription inputFormat;
-  nsresult rv = AppleUtils::GetRichestDecodableFormat(mStream, inputFormat);
-  if (NS_FAILED(rv)) {
-    mCallback->Error();
-    return;
-  }
-
-  // Fill in the output format manually.
-  PodZero(&mOutputFormat);
-  mOutputFormat.mFormatID = kAudioFormatLinearPCM;
-  mOutputFormat.mSampleRate = inputFormat.mSampleRate;
-  mOutputFormat.mChannelsPerFrame = inputFormat.mChannelsPerFrame;
-#if defined(MOZ_SAMPLE_TYPE_FLOAT32)
-  mOutputFormat.mBitsPerChannel = 32;
-  mOutputFormat.mFormatFlags =
-    kLinearPCMFormatFlagIsFloat |
-    0;
-#else
-# error Unknown audio sample type
-#endif
-  // Set up the decoder so it gives us one sample per frame
-  mOutputFormat.mFramesPerPacket = 1;
-  mOutputFormat.mBytesPerPacket = mOutputFormat.mBytesPerFrame
-        = mOutputFormat.mChannelsPerFrame * mOutputFormat.mBitsPerChannel / 8;
-
-  OSStatus status =
-    AudioConverterNew(&inputFormat, &mOutputFormat, &mConverter);
-  if (status) {
-    LOG("Error %d constructing AudioConverter", rv);
-    mConverter = nullptr;
-    mCallback->Error();
-  }
-}
-
-void
-AppleATDecoder::SubmitSample(nsAutoPtr<mp4_demuxer::MP4Sample> aSample)
-{
-  // Prepend ADTS header to AAC audio.
-  if (!strcmp(mConfig.mime_type, "audio/mp4a-latm")) {
-    bool rv = mp4_demuxer::Adts::ConvertSample(mConfig.channel_count,
-                                               mConfig.frequency_index,
-                                               mConfig.aac_profile,
-                                               aSample);
-    if (!rv) {
-      NS_ERROR("Failed to apply ADTS header");
-      mCallback->Error();
-      return;
-    }
-  }
-
-  const Microseconds fuzz = 5;
-  CheckedInt<Microseconds> upperFuzz = mNextAudioTimestamp + fuzz;
-  CheckedInt<Microseconds> lowerFuzz = mNextAudioTimestamp - fuzz;
-  bool discontinuity =
-    !mNextAudioTimestamp.isValid() || mNextAudioTimestamp.value() < 0 ||
-    !upperFuzz.isValid() || lowerFuzz.value() < 0 ||
-    upperFuzz.value() < aSample->composition_timestamp ||
-    lowerFuzz.value() > aSample->composition_timestamp;
-
-  if (discontinuity) {
-    LOG("Discontinuity detected, expected %lld got %lld\n",
-        mNextAudioTimestamp.value(), aSample->composition_timestamp);
-    mCurrentAudioTimestamp = aSample->composition_timestamp;
-    mSamplePosition = aSample->byte_offset;
-  }
-
-  uint32_t flags = discontinuity ? kAudioFileStreamParseFlag_Discontinuity : 0;
-
-  OSStatus rv = AudioFileStreamParseBytes(mStream,
-                                          aSample->size,
-                                          aSample->data,
-                                          flags);
-
-  if (!mOutputData.IsEmpty()) {
+  if (!outputData.IsEmpty()) {
+    size_t numFrames = outputData.Length() / channels;
     int rate = mOutputFormat.mSampleRate;
-    int channels = mOutputFormat.mChannelsPerFrame;
-    size_t numFrames = mOutputData.Length() / channels;
     CheckedInt<Microseconds> duration = FramesToUsecs(numFrames, rate);
     if (!duration.isValid()) {
-      NS_ERROR("Invalid count of accumulated audio samples");
+      NS_WARNING("Invalid count of accumulated audio samples");
       mCallback->Error();
       return;
     }
 
     LOG("pushed audio at time %lfs; duration %lfs\n",
-        (double)mCurrentAudioTimestamp.value() / USECS_PER_S,
+        (double)aSample->composition_timestamp / USECS_PER_S,
         (double)duration.value() / USECS_PER_S);
 
     nsAutoArrayPtr<AudioDataValue>
-      data(new AudioDataValue[mOutputData.Length()]);
-    PodCopy(data.get(), &mOutputData[0], mOutputData.Length());
-    mOutputData.Clear();
-    AudioData* audio = new AudioData(mSamplePosition,
-                                     mCurrentAudioTimestamp.value(),
-                                     duration.value(),
-                                     numFrames,
-                                     data.forget(),
-                                     channels,
-                                     rate);
+      data(new AudioDataValue[outputData.Length()]);
+    PodCopy(data.get(), &outputData[0], outputData.Length());
+    nsRefPtr<AudioData> audio = new AudioData(aSample->byte_offset,
+                                              aSample->composition_timestamp,
+                                              duration.value(),
+                                              numFrames,
+                                              data.forget(),
+                                              channels,
+                                              rate);
     mCallback->Output(audio);
-    mCurrentAudioTimestamp += duration.value();
-    if (!mCurrentAudioTimestamp.isValid()) {
-      NS_ERROR("Invalid count of accumulated audio samples");
-      mCallback->Error();
-      return;
-    }
-    mSamplePosition += mSizeDecoded;
-    mSizeDecoded = 0;
-  }
-
-  // This is the timestamp of the next sample we should be receiving
-  mNextAudioTimestamp =
-    CheckedInt<Microseconds>(aSample->composition_timestamp) + aSample->duration;
-
-  if (rv != noErr) {
-    LOG("Error %d parsing audio data", rv);
-    mCallback->Error();
-    return;
-  }
-  if (mLastError != noErr) {
-    LOG("Error %d during decoding", mLastError);
-    mCallback->Error();
-    mLastError = noErr;
-    return;
   }
 
   if (mTaskQueue->IsEmpty()) {
@@ -428,12 +282,77 @@
   }
 }
 
-void
-AppleATDecoder::SignalFlush()
+nsresult
+AppleATDecoder::GetInputAudioDescription(AudioStreamBasicDescription& aDesc)
 {
-  mOutputData.Clear();
-  mNextAudioTimestamp = -1;
-  mSizeDecoded = 0;
+  // Request the properties from CoreAudio using the codec magic cookie
+  AudioFormatInfo formatInfo;
+  PodZero(&formatInfo.mASBD);
+  formatInfo.mASBD.mFormatID = mFormatID;
+  if (mFormatID == kAudioFormatMPEG4AAC) {
+    formatInfo.mASBD.mFormatFlags = mConfig.extended_profile;
+  }
+  formatInfo.mMagicCookieSize = mConfig.extra_data.length();
+  formatInfo.mMagicCookie = mConfig.extra_data.begin();
+
+  UInt32 formatListSize;
+  // Attempt to retrieve the default format using
+  // kAudioFormatProperty_FormatInfo method.
+  // This method only retrieves the FramesPerPacket information required
+  // by the decoder, which depends on the codec type and profile.
+  aDesc.mFormatID = mFormatID;
+  aDesc.mChannelsPerFrame = mConfig.channel_count;
+  aDesc.mSampleRate = mConfig.samples_per_second;
+  UInt32 inputFormatSize = sizeof(aDesc);
+  OSStatus rv = AudioFormatGetProperty(kAudioFormatProperty_FormatInfo,
+                                       0,
+                                       NULL,
+                                       &inputFormatSize,
+                                       &aDesc);
+  if (NS_WARN_IF(rv)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // If any of the methods below fail, we will return the default format as
+  // created using kAudioFormatProperty_FormatInfo above.
+  rv = AudioFormatGetPropertyInfo(kAudioFormatProperty_FormatList,
+                                  sizeof(formatInfo),
+                                  &formatInfo,
+                                  &formatListSize);
+  if (rv || (formatListSize % sizeof(AudioFormatListItem))) {
+    return NS_OK;
+  }
+  size_t listCount = formatListSize / sizeof(AudioFormatListItem);
+  nsAutoArrayPtr<AudioFormatListItem> formatList(
+    new AudioFormatListItem[listCount]);
+
+  rv = AudioFormatGetProperty(kAudioFormatProperty_FormatList,
+                              sizeof(formatInfo),
+                              &formatInfo,
+                              &formatListSize,
+                              formatList);
+  if (rv) {
+    return NS_OK;
+  }
+  LOG("found %u available audio stream(s)",
+      formatListSize / sizeof(AudioFormatListItem));
+  // Get the index number of the first playable format.
+  // This index number will be for the highest quality layer the platform
+  // is capable of playing.
+  UInt32 itemIndex;
+  UInt32 indexSize = sizeof(itemIndex);
+  rv = AudioFormatGetProperty(kAudioFormatProperty_FirstPlayableFormatFromList,
+                              formatListSize,
+                              formatList,
+                              &indexSize,
+                              &itemIndex);
+  if (rv) {
+    return NS_OK;
+  }
+
+  aDesc = formatList[itemIndex].mASBD;
+
+  return NS_OK;
 }
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleATDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleATDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleATDecoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleATDecoder.h	2014-11-26 21:46:00.000000000 +0000
@@ -31,16 +31,6 @@
   virtual nsresult Drain() MOZ_OVERRIDE;
   virtual nsresult Shutdown() MOZ_OVERRIDE;
 
-
-  // Internal callbacks for the platform C api. Don't call externally.
-  void MetadataCallback(AudioFileStreamID aFileStream,
-                        AudioFileStreamPropertyID aPropertyID,
-                        UInt32* aFlags);
-  void SampleCallback(uint32_t aNumBytes,
-                      uint32_t aNumPackets,
-                      const void* aData,
-                      AudioStreamPacketDescription* aPackets);
-
   // Callbacks also need access to the config.
   const mp4_demuxer::AudioDecoderConfig& mConfig;
 
@@ -48,25 +38,11 @@
   RefPtr<MediaTaskQueue> mTaskQueue;
   MediaDataDecoderCallback* mCallback;
   AudioConverterRef mConverter;
-  AudioFileStreamID mStream;
-  // Timestamp of the next audio frame going to be output by the decoder.
-  CheckedInt<Microseconds> mCurrentAudioTimestamp;
-  // Estimated timestamp of the next compressed audio packet to be supplied by
-  // the MP4 demuxer.
-  CheckedInt<Microseconds> mNextAudioTimestamp;
-  int64_t mSamplePosition;
-  // Compressed data size that has been processed by the decoder since the last
-  // output.
-  int64_t mSizeDecoded;
   AudioStreamBasicDescription mOutputFormat;
-  AudioFileTypeID mFileType;
-  // Array containing the queued decoded audio frames, about to be output.
-  nsTArray<AudioDataValue> mOutputData;
-  OSStatus mLastError;
+  UInt32 mFormatID;
 
-  void SetupDecoder();
   void SubmitSample(nsAutoPtr<mp4_demuxer::MP4Sample> aSample);
-  void SignalFlush();
+  nsresult GetInputAudioDescription(AudioStreamBasicDescription& aDesc);
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -144,11 +144,11 @@
 }
 
 already_AddRefed<MediaDataDecoder>
-AppleDecoderModule::CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                                      layers::LayersBackend aLayersBackend,
-                                      layers::ImageContainer* aImageContainer,
-                                      MediaTaskQueue* aVideoTaskQueue,
-                                      MediaDataDecoderCallback* aCallback)
+AppleDecoderModule::CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                                       layers::LayersBackend aLayersBackend,
+                                       layers::ImageContainer* aImageContainer,
+                                       MediaTaskQueue* aVideoTaskQueue,
+                                       MediaDataDecoderCallback* aCallback)
 {
   nsRefPtr<MediaDataDecoder> decoder;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleDecoderModule.h	2014-11-26 21:46:00.000000000 +0000
@@ -26,11 +26,11 @@
 
   // Decode thread.
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                    layers::LayersBackend aLayersBackend,
-                    layers::ImageContainer* aImageContainer,
-                    MediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     MediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
 
   // Decode thread.
   virtual already_AddRefed<MediaDataDecoder>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleUtils.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleUtils.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -29,28 +29,6 @@
 
 namespace mozilla {
 
-nsresult
-AppleUtils::GetProperty(AudioFileStreamID aAudioFileStream,
-                        AudioFileStreamPropertyID aPropertyID,
-                        void* aData)
-{
-  UInt32 size;
-  Boolean writeable;
-  OSStatus rv = AudioFileStreamGetPropertyInfo(aAudioFileStream, aPropertyID,
-                                               &size, &writeable);
-
-  if (rv) {
-    WARN("Couldn't get property " PROPERTY_ID_FORMAT "\n",
-         PROPERTY_ID_PRINT(aPropertyID));
-    return NS_ERROR_FAILURE;
-  }
-
-  rv = AudioFileStreamGetProperty(aAudioFileStream, aPropertyID,
-                                  &size, aData);
-
-  return NS_OK;
-}
-
 void
 AppleUtils::SetCFDict(CFMutableDictionaryRef dict,
                       const char* key,
@@ -86,52 +64,4 @@
   CFDictionarySetValue(dict, keyRef, value ? kCFBooleanTrue : kCFBooleanFalse);
 }
 
-nsresult
-AppleUtils::GetRichestDecodableFormat(AudioFileStreamID aAudioFileStream,
-                                      AudioStreamBasicDescription& aFormat)
-{
-  // Fill in the default format description from the stream.
-  nsresult rv = GetProperty(aAudioFileStream,
-                            kAudioFileStreamProperty_DataFormat, &aFormat);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  UInt32 propertySize;
-  OSStatus status = AudioFileStreamGetPropertyInfo(
-    aAudioFileStream, kAudioFileStreamProperty_FormatList, &propertySize, NULL);
-  if (NS_WARN_IF(status)) {
-    // Return the default format description.
-    return NS_OK;
-  }
-
-  MOZ_ASSERT(propertySize % sizeof(AudioFormatListItem) == 0);
-  uint32_t sizeList = propertySize / sizeof(AudioFormatListItem);
-  nsAutoArrayPtr<AudioFormatListItem> formatListPtr(
-    new AudioFormatListItem[sizeList]);
-
-  rv = GetProperty(aAudioFileStream, kAudioFileStreamProperty_FormatList,
-                   formatListPtr);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    // Return the default format description.
-    return NS_OK;
-  }
-
-  // Get the index number of the first playable format.
-  // This index number will be for the highest quality layer the platform
-  // is capable of playing.
-  UInt32 itemIndex;
-  UInt32 indexSize = sizeof(itemIndex);
-  status =
-    AudioFormatGetProperty(kAudioFormatProperty_FirstPlayableFormatFromList,
-                           propertySize, formatListPtr, &indexSize, &itemIndex);
-  if (NS_WARN_IF(status)) {
-    // Return the default format description.
-    return NS_OK;
-  }
-  aFormat = formatListPtr[itemIndex].mASBD;
-
-  return NS_OK;
-}
-
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleUtils.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleUtils.h	2014-11-26 21:46:00.000000000 +0000
@@ -14,11 +14,6 @@
 namespace mozilla {
 
 struct AppleUtils {
-  // Helper to retrieve properties from AudioFileStream objects.
-  static nsresult GetProperty(AudioFileStreamID aAudioFileStream,
-                              AudioFileStreamPropertyID aPropertyID,
-                              void* aData);
-
   // Helper to set a string, string pair on a CFMutableDictionaryRef.
   static void SetCFDict(CFMutableDictionaryRef dict,
                         const char* key,
@@ -31,12 +26,6 @@
   static void SetCFDict(CFMutableDictionaryRef dict,
                         const char* key,
                         bool value);
-
-  // Helper to retrieve the best audio format available in the given
-  // audio stream.
-  // The basic format will be returned by default should an error occur.
-  static nsresult GetRichestDecodableFormat(
-    AudioFileStreamID aAudioFileStream, AudioStreamBasicDescription& aFormat);
 };
 
 // Wrapper class to call CFRelease on reference types
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleVDADecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleVDADecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleVDADecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleVDADecoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -44,8 +44,8 @@
   MOZ_COUNT_CTOR(AppleVDADecoder);
   // TODO: Verify aConfig.mime_type.
   LOG("Creating AppleVDADecoder for %dx%d h.264 video",
-      mConfig.display_width,
-      mConfig.display_height
+      mConfig.image_width,
+      mConfig.image_height
      );
 }
 
@@ -214,7 +214,7 @@
 AppleVDADecoder::ClearReorderedFrames()
 {
   while (!mReorderQueue.IsEmpty()) {
-    delete mReorderQueue.Pop();
+    mReorderQueue.Pop();
   }
 }
 
@@ -237,7 +237,7 @@
   nsRefPtr<MacIOSurface> macSurface = new MacIOSurface(surface);
   // Bounds.
   VideoInfo info;
-  info.mDisplay = nsIntSize(macSurface->GetWidth(), macSurface->GetHeight());
+  info.mDisplay = nsIntSize(mConfig.display_width, mConfig.display_height);
   info.mHasVideo = true;
   gfx::IntRect visible = gfx::IntRect(0,
                                       0,
@@ -250,7 +250,7 @@
     static_cast<layers::MacIOSurfaceImage*>(image.get());
   videoImage->SetSurface(macSurface);
 
-  nsAutoPtr<VideoData> data;
+  nsRefPtr<VideoData> data;
   data = VideoData::CreateFromImage(info,
                                     mImageContainer,
                                     aFrameRef->byte_offset,
@@ -268,10 +268,10 @@
 
   // Frames come out in DTS order but we need to output them
   // in composition order.
-  mReorderQueue.Push(data.forget());
+  mReorderQueue.Push(data);
   // Assume a frame with a PTS <= current DTS is ready.
   while (mReorderQueue.Length() > 0) {
-    VideoData* readyData = mReorderQueue.Pop();
+    nsRefPtr<VideoData> readyData = mReorderQueue.Pop();
     if (readyData->mTime <= aFrameRef->decode_timestamp) {
       LOG("returning queued frame with pts %lld", readyData->mTime);
       mCallback->Output(readyData);
@@ -411,11 +411,11 @@
   AutoCFRelease<CFNumberRef> avc_width  =
     CFNumberCreate(kCFAllocatorDefault,
                    kCFNumberSInt32Type,
-                   &mConfig.display_width);
+                   &mConfig.image_width);
   AutoCFRelease<CFNumberRef> avc_height =
     CFNumberCreate(kCFAllocatorDefault,
                    kCFNumberSInt32Type,
-                   &mConfig.display_height);
+                   &mConfig.image_height);
   AutoCFRelease<CFNumberRef> avc_format =
     CFNumberCreate(kCFAllocatorDefault,
                    kCFNumberSInt32Type,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -44,8 +44,8 @@
   MOZ_COUNT_CTOR(AppleVTDecoder);
   // TODO: Verify aConfig.mime_type.
   LOG("Creating AppleVTDecoder for %dx%d h.264 video",
-      mConfig.display_width,
-      mConfig.display_height
+      mConfig.image_width,
+      mConfig.image_height
      );
 }
 
@@ -275,8 +275,8 @@
 
   rv = CMVideoFormatDescriptionCreate(kCFAllocatorDefault,
                                       kCMVideoCodecType_H264,
-                                      mConfig.display_width,
-                                      mConfig.display_height,
+                                      mConfig.image_width,
+                                      mConfig.image_height,
                                       extensions,
                                       &mFormat);
   if (rv != noErr) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/ReorderQueue.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/ReorderQueue.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/apple/ReorderQueue.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/apple/ReorderQueue.h	2014-11-26 21:46:00.000000000 +0000
@@ -22,7 +22,7 @@
   }
 };
 
-typedef nsTPriorityQueue<VideoData*, ReorderQueueComparator> ReorderQueue;
+typedef nsTPriorityQueue<nsRefPtr<VideoData>, ReorderQueueComparator> ReorderQueue;
 
 } // namespace mozilla
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/BlankDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/BlankDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/BlankDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/BlankDecoderModule.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -51,9 +51,10 @@
     }
     NS_IMETHOD Run() MOZ_OVERRIDE
     {
-      mCallback->Output(mCreator->Create(mSample->composition_timestamp,
-                                         mSample->duration,
-                                         mSample->byte_offset));
+      nsRefPtr<MediaData> data = mCreator->Create(mSample->composition_timestamp,
+                                                  mSample->duration,
+                                                  mSample->byte_offset);
+      mCallback->Output(data);
       return NS_OK;
     }
   private:
@@ -84,7 +85,6 @@
 
 private:
   nsAutoPtr<BlankMediaDataCreator> mCreator;
-  nsAutoPtr<MediaData> mOutput;
   RefPtr<MediaTaskQueue> mTaskQueue;
   MediaDataDecoderCallback* mCallback;
 };
@@ -102,9 +102,8 @@
     mPicture = gfx::IntRect(0, 0, mFrameWidth, mFrameHeight);
   }
 
-  MediaData* Create(Microseconds aDTS,
-                    Microseconds aDuration,
-                    int64_t aOffsetInStream)
+  already_AddRefed<MediaData>
+  Create(Microseconds aDTS, Microseconds aDuration, int64_t aOffsetInStream)
   {
     // Create a fake YUV buffer in a 420 format. That is, an 8bpp Y plane,
     // with a U and V plane that are half the size of the Y plane, i.e 8 bit,
@@ -214,11 +213,11 @@
 
   // Decode thread.
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                    layers::LayersBackend aLayersBackend,
-                    layers::ImageContainer* aImageContainer,
-                    MediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE {
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     MediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE {
     BlankVideoDataCreator* creator = new BlankVideoDataCreator(
       aConfig.display_width, aConfig.display_height, aImageContainer);
     nsRefPtr<MediaDataDecoder> decoder =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEAudioDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEAudioDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEAudioDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEAudioDecoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -175,20 +175,20 @@
     return;
   }
 
-  nsAutoPtr<AudioData> audio(new AudioData(mStreamOffset,
-                                           timestamp.value(),
-                                           duration.value(),
-                                           numFrames,
-                                           audioData.forget(),
-                                           aChannels,
-                                           aRate));
+  nsRefPtr<AudioData> audio(new AudioData(mStreamOffset,
+                                          timestamp.value(),
+                                          duration.value(),
+                                          numFrames,
+                                          audioData.forget(),
+                                          aChannels,
+                                          aRate));
 
   #ifdef LOG_SAMPLE_DECODE
   LOG("Decoded audio sample! timestamp=%lld duration=%lld currentLength=%u",
       timestamp, duration, currentLength);
   #endif
 
-  mCallback->Output(audio.forget());
+  mCallback->Output(audio);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEDecoderModule.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -194,11 +194,11 @@
 }
 
 already_AddRefed<MediaDataDecoder>
-EMEDecoderModule::CreateH264Decoder(const VideoDecoderConfig& aConfig,
-                                    layers::LayersBackend aLayersBackend,
-                                    layers::ImageContainer* aImageContainer,
-                                    MediaTaskQueue* aVideoTaskQueue,
-                                    MediaDataDecoderCallback* aCallback)
+EMEDecoderModule::CreateVideoDecoder(const VideoDecoderConfig& aConfig,
+                                     layers::LayersBackend aLayersBackend,
+                                     layers::ImageContainer* aImageContainer,
+                                     MediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
 {
   if (mCDMDecodesVideo && aConfig.crypto.valid) {
     nsRefPtr<MediaDataDecoder> decoder(new EMEH264Decoder(mProxy,
@@ -210,11 +210,11 @@
     return decoder.forget();
   }
 
-  nsRefPtr<MediaDataDecoder> decoder(mPDM->CreateH264Decoder(aConfig,
-                                                             aLayersBackend,
-                                                             aImageContainer,
-                                                             aVideoTaskQueue,
-                                                             aCallback));
+  nsRefPtr<MediaDataDecoder> decoder(mPDM->CreateVideoDecoder(aConfig,
+                                                              aLayersBackend,
+                                                              aImageContainer,
+                                                              aVideoTaskQueue,
+                                                              aCallback));
   if (!decoder) {
     return nullptr;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEDecoderModule.h	2014-11-26 21:46:00.000000000 +0000
@@ -34,7 +34,7 @@
 
   // Decode thread.
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
                     layers::LayersBackend aLayersBackend,
                     layers::ImageContainer* aImageContainer,
                     MediaTaskQueue* aVideoTaskQueue,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEH264Decoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEH264Decoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/eme/EMEH264Decoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/eme/EMEH264Decoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -157,15 +157,15 @@
   b.mPlanes[2].mSkip = 0;
 
   gfx::IntRect pictureRegion(0, 0, width, height);
-  VideoData *v = VideoData::Create(mVideoInfo,
-                                   mImageContainer,
-                                   mLastStreamOffset,
-                                   aDecodedFrame->Timestamp(),
-                                   aDecodedFrame->Duration(),
-                                   b,
-                                   false,
-                                   -1,
-                                   pictureRegion);
+  nsRefPtr<VideoData> v = VideoData::Create(mVideoInfo,
+                                            mImageContainer,
+                                            mLastStreamOffset,
+                                            aDecodedFrame->Timestamp(),
+                                            aDecodedFrame->Duration(),
+                                            b,
+                                            false,
+                                            -1,
+                                            pictureRegion);
   aDecodedFrame->Destroy();
   mCallback->Output(v);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -22,7 +22,6 @@
   const mp4_demuxer::AudioDecoderConfig& aConfig)
   : FFmpegDataDecoder(aTaskQueue, GetCodecId(aConfig.mime_type))
   , mCallback(aCallback)
-  , mConfig(aConfig)
 {
   MOZ_COUNT_CTOR(FFmpegAudioDecoder);
   mExtraData.append(aConfig.audio_specific_config.begin(),
@@ -93,7 +92,6 @@
   aSample->Pad(FF_INPUT_BUFFER_PADDING_SIZE);
   packet.data = aSample->data;
   packet.size = aSample->size;
-  packet.pos = aSample->byte_offset;
 
   if (!PrepareFrame()) {
     NS_WARNING("FFmpeg audio decoder failed to allocate frame.");
@@ -101,30 +99,49 @@
     return;
   }
 
-  int decoded;
-  int bytesConsumed =
-    avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
+  int64_t samplePosition = aSample->byte_offset;
+  Microseconds pts = aSample->composition_timestamp;
 
-  if (bytesConsumed < 0 || !decoded) {
-    NS_WARNING("FFmpeg audio decoder error.");
-    mCallback->Error();
-    return;
-  }
-
-  NS_ASSERTION(bytesConsumed == (int)aSample->size,
-               "Only one audio packet should be received at a time.");
-
-  uint32_t numChannels = mCodecContext->channels;
-  uint32_t samplingRate = mCodecContext->sample_rate;
-
-  nsAutoArrayPtr<AudioDataValue> audio(
-    CopyAndPackAudio(mFrame, numChannels, mFrame->nb_samples));
+  while (packet.size > 0) {
+    int decoded;
+    int bytesConsumed =
+      avcodec_decode_audio4(mCodecContext, mFrame, &decoded, &packet);
+
+    if (bytesConsumed < 0) {
+      NS_WARNING("FFmpeg audio decoder error.");
+      mCallback->Error();
+      return;
+    }
 
-  nsAutoPtr<AudioData> data(
-    new AudioData(packet.pos, aSample->composition_timestamp, aSample->duration,
-                  mFrame->nb_samples, audio.forget(), numChannels, samplingRate));
+    if (decoded) {
+      uint32_t numChannels = mCodecContext->channels;
+      uint32_t samplingRate = mCodecContext->sample_rate;
+
+      nsAutoArrayPtr<AudioDataValue> audio(
+        CopyAndPackAudio(mFrame, numChannels, mFrame->nb_samples));
+
+      CheckedInt<Microseconds> duration =
+        FramesToUsecs(mFrame->nb_samples, samplingRate);
+      if (!duration.isValid()) {
+        NS_WARNING("Invalid count of accumulated audio samples");
+        mCallback->Error();
+        return;
+      }
 
-  mCallback->Output(data.forget());
+      nsRefPtr<AudioData> data = new AudioData(samplePosition,
+                                               pts,
+                                               duration.value(),
+                                               mFrame->nb_samples,
+                                               audio.forget(),
+                                               numChannels,
+                                               samplingRate);
+      mCallback->Output(data);
+      pts += duration.value();
+    }
+    packet.data += bytesConsumed;
+    packet.size -= bytesConsumed;
+    samplePosition += bytesConsumed;
+  }
 
   if (mTaskQueue->IsEmpty()) {
     mCallback->InputExhausted();
@@ -143,8 +160,9 @@
 nsresult
 FFmpegAudioDecoder<LIBAV_VER>::Drain()
 {
+  mTaskQueue->AwaitIdle();
   mCallback->DrainComplete();
-  return NS_OK;
+  return Flush();
 }
 
 AVCodecID
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h	2014-11-26 21:46:00.000000000 +0000
@@ -35,7 +35,6 @@
   void DecodePacket(mp4_demuxer::MP4Sample* aSample);
 
   MediaDataDecoderCallback* mCallback;
-  const mp4_demuxer::AudioDecoderConfig& mConfig;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h	2014-11-26 21:46:00.000000000 +0000
@@ -26,11 +26,11 @@
   virtual nsresult Shutdown() MOZ_OVERRIDE { return NS_OK; }
 
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                    layers::LayersBackend aLayersBackend,
-                    layers::ImageContainer* aImageContainer,
-                    MediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     MediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE
   {
     nsRefPtr<MediaDataDecoder> decoder =
       new FFmpegH264Decoder<V>(aVideoTaskQueue, aCallback, aConfig,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -103,15 +103,15 @@
     b.mPlanes[2].mWidth = (mFrame->width + 1) >> 1;
     b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
 
-    VideoData *v = VideoData::Create(info,
-                                     mImageContainer,
-                                     aSample->byte_offset,
-                                     mFrame->pkt_pts,
-                                     aSample->duration,
-                                     b,
-                                     aSample->is_sync_point,
-                                     -1,
-                                     gfx::IntRect(0, 0, mCodecContext->width, mCodecContext->height));
+    nsRefPtr<VideoData> v = VideoData::Create(info,
+                                              mImageContainer,
+                                              aSample->byte_offset,
+                                              mFrame->pkt_pts,
+                                              aSample->duration,
+                                              b,
+                                              aSample->is_sync_point,
+                                              -1,
+                                              gfx::IntRect(0, 0, mCodecContext->width, mCodecContext->height));
     if (!v) {
       NS_WARNING("image allocation error.");
       mCallback->Error();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -32,6 +32,7 @@
 };
 
 static const AvFormatLib sLibs[] = {
+  { "libavformat.so.56", FFmpegDecoderModule<55>::Create, 55 },
   { "libavformat.so.55", FFmpegDecoderModule<55>::Create, 55 },
   { "libavformat.so.54", FFmpegDecoderModule<54>::Create, 54 },
   { "libavformat.so.53", FFmpegDecoderModule<53>::Create, 53 },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -129,20 +129,21 @@
   if (!duration.isValid()) {
     return NS_ERROR_UNEXPECTED;
   }
-  *v = new AudioData(aStreamOffset,
-                     timeUs,
-                     duration.value(),
-                     frames,
-                     buffer.forget(),
-                     mAudioChannels,
-                     mAudioRate);
+  nsRefPtr<AudioData> audioData = new AudioData(aStreamOffset,
+                                                timeUs,
+                                                duration.value(),
+                                                frames,
+                                                buffer.forget(),
+                                                mAudioChannels,
+                                                mAudioRate);
   ReleaseAudioBuffer();
+  audioData.forget(v);
   return NS_OK;
 }
 
 nsresult
 GonkAudioDecoderManager::Output(int64_t aStreamOffset,
-                                nsAutoPtr<MediaData>& aOutData)
+                                nsRefPtr<MediaData>& aOutData)
 {
   aOutData = nullptr;
   status_t err;
@@ -151,8 +152,8 @@
   switch (err) {
     case OK:
     {
-      AudioData* data = nullptr;
-      nsresult rv = CreateAudioData(aStreamOffset, &data);
+      nsRefPtr<AudioData> data;
+      nsresult rv = CreateAudioData(aStreamOffset, getter_AddRefs(data));
       if (rv == NS_ERROR_NOT_AVAILABLE) {
         // Decoder outputs an empty video buffer, try again
         return NS_ERROR_NOT_AVAILABLE;
@@ -176,8 +177,8 @@
     case android::ERROR_END_OF_STREAM:
     {
       ALOG("Got EOS frame!");
-      AudioData* data = nullptr;
-      nsresult rv = CreateAudioData(aStreamOffset, &data);
+      nsRefPtr<AudioData> data;
+      nsresult rv = CreateAudioData(aStreamOffset, getter_AddRefs(data));
       if (rv == NS_ERROR_NOT_AVAILABLE) {
         // For EOS, no need to do any thing.
         return NS_ERROR_ABORT;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h	2014-11-26 21:46:01.000000000 +0000
@@ -31,7 +31,7 @@
   virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE;
 
   virtual nsresult Output(int64_t aStreamOffset,
-                          nsAutoPtr<MediaData>& aOutput) MOZ_OVERRIDE;
+                          nsRefPtr<MediaData>& aOutput) MOZ_OVERRIDE;
 private:
 
   nsresult CreateAudioData(int64_t aStreamOffset,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -35,11 +35,11 @@
 }
 
 already_AddRefed<MediaDataDecoder>
-GonkDecoderModule::CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                                    mozilla::layers::LayersBackend aLayersBackend,
-                                    mozilla::layers::ImageContainer* aImageContainer,
-                                    MediaTaskQueue* aVideoTaskQueue,
-                                    MediaDataDecoderCallback* aCallback)
+GonkDecoderModule::CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                                     mozilla::layers::LayersBackend aLayersBackend,
+                                     mozilla::layers::ImageContainer* aImageContainer,
+                                     MediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
 {
   nsRefPtr<MediaDataDecoder> decoder =
   new GonkMediaDataDecoder(new GonkVideoDecoderManager(aImageContainer,aConfig),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkDecoderModule.h	2014-11-26 21:46:01.000000000 +0000
@@ -21,11 +21,11 @@
 
   // Decode thread.
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                    mozilla::layers::LayersBackend aLayersBackend,
-                    mozilla::layers::ImageContainer* aImageContainer,
-                    MediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                     mozilla::layers::LayersBackend aLayersBackend,
+                     mozilla::layers::ImageContainer* aImageContainer,
+                     MediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
 
   // Decode thread.
   virtual already_AddRefed<MediaDataDecoder>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -32,6 +32,7 @@
   , mCallback(aCallback)
   , mManager(aManager)
   , mSignaledEOS(false)
+  , mDrainComplete(false)
 {
   MOZ_COUNT_CTOR(GonkMediaDataDecoder);
 }
@@ -45,6 +46,7 @@
 GonkMediaDataDecoder::Init()
 {
   mDecoder = mManager->Init(mCallback);
+  mDrainComplete = false;
   return mDecoder.get() ? NS_OK : NS_ERROR_UNEXPECTED;
 }
 
@@ -87,12 +89,12 @@
 void
 GonkMediaDataDecoder::ProcessOutput()
 {
-  nsAutoPtr<MediaData> output;
+  nsRefPtr<MediaData> output;
   nsresult rv;
-  while (true) {
+  while (true && !mDrainComplete) {
     rv = mManager->Output(mLastStreamOffset, output);
     if (rv == NS_OK) {
-      mCallback->Output(output.forget());
+      mCallback->Output(output);
       continue;
     } else if (rv == NS_ERROR_NOT_AVAILABLE && mSignaledEOS) {
       // Try to get more frames before getting EOS frame
@@ -112,11 +114,12 @@
     ALOG("Failed to output data");
     // GonkDecoderManangers report NS_ERROR_ABORT when EOS is reached.
     if (rv == NS_ERROR_ABORT) {
-      if (output.get() != nullptr) {
-        mCallback->Output(output.forget());
+      if (output) {
+        mCallback->Output(output);
       }
       mCallback->DrainComplete();
       mSignaledEOS = false;
+      mDrainComplete = true;
       return;
     }
     mCallback->Error();
@@ -159,12 +162,13 @@
 
 bool
 GonkMediaDataDecoder::IsDormantNeeded() {
-  return mDecoder->IsDormantNeeded();
+
+  return mDecoder.get() ? true : false;
 }
 
 void
 GonkMediaDataDecoder::ReleaseMediaResources() {
-  mDecoder->ReleaseMediaResources();
+  mManager->ReleaseMediaResources();
 }
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.h	2014-11-26 21:46:01.000000000 +0000
@@ -32,8 +32,9 @@
   // MP4Reader.
   virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) = 0;
   virtual nsresult Output(int64_t aStreamOffset,
-                          nsAutoPtr<MediaData>& aOutput) = 0;
+                          nsRefPtr<MediaData>& aOutput) = 0;
 
+  virtual void ReleaseMediaResources() {};
 };
 
 // Samples are decoded using the GonkDecoder (MediaCodec)
@@ -92,6 +93,8 @@
   int64_t mLastStreamOffset;
   // Set it ture when there is no input data
   bool mSignaledEOS;
+  // Set if there is no more output data from decoder
+  bool mDrainComplete;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -53,7 +53,6 @@
                            mozilla::layers::ImageContainer* aImageContainer,
 		           const mp4_demuxer::VideoDecoderConfig& aConfig)
   : mImageContainer(aImageContainer)
-  , mConfig(aConfig)
   , mReaderCallback(nullptr)
   , mColorConverterBufferSize(0)
   , mNativeWindow(nullptr)
@@ -126,6 +125,7 @@
 GonkVideoDecoderManager::CreateVideoData(int64_t aStreamOffset, VideoData **v)
 {
   *v = nullptr;
+  nsRefPtr<VideoData> data;
   int64_t timeUs;
   int32_t keyFrame;
 
@@ -174,16 +174,15 @@
     grallocClient->SetMediaBuffer(mVideoBuffer);
     textureClient->SetRecycleCallback(GonkVideoDecoderManager::RecycleCallback, this);
 
-    *v = VideoData::Create(mInfo.mVideo,
-                          mImageContainer,
-                          aStreamOffset,
-                          timeUs,
-                          1, // We don't know the duration.
-                          textureClient,
-                          keyFrame,
-                          -1,
-                          picture);
-
+    data = VideoData::Create(mInfo.mVideo,
+                             mImageContainer,
+                             aStreamOffset,
+                             timeUs,
+                             1, // We don't know the duration.
+                             textureClient,
+                             keyFrame,
+                             -1,
+                             picture);
   } else {
     if (!mVideoBuffer->data()) {
       ALOG("No data in Video Buffer!");
@@ -242,7 +241,7 @@
     b.mPlanes[2].mOffset = 0;
     b.mPlanes[2].mSkip = 0;
 
-    *v = VideoData::Create(
+    data = VideoData::Create(
         mInfo.mVideo,
         mImageContainer,
         pos,
@@ -254,6 +253,8 @@
         picture);
     ReleaseVideoBuffer();
   }
+
+  data.forget(v);
   return NS_OK;
 }
 
@@ -303,7 +304,7 @@
 // Blocks until decoded sample is produced by the deoder.
 nsresult
 GonkVideoDecoderManager::Output(int64_t aStreamOffset,
-                                nsAutoPtr<MediaData>& aOutData)
+                                nsRefPtr<MediaData>& aOutData)
 {
   aOutData = nullptr;
   status_t err;
@@ -316,8 +317,8 @@
   switch (err) {
     case OK:
     {
-      VideoData* data = nullptr;
-      nsresult rv = CreateVideoData(aStreamOffset, &data);
+      nsRefPtr<VideoData> data;
+      nsresult rv = CreateVideoData(aStreamOffset, getter_AddRefs(data));
       if (rv == NS_ERROR_NOT_AVAILABLE) {
 	// Decoder outputs a empty video buffer, try again
         return NS_ERROR_NOT_AVAILABLE;
@@ -329,15 +330,20 @@
       return NS_OK;
     }
     case android::INFO_FORMAT_CHANGED:
-    case android::INFO_OUTPUT_BUFFERS_CHANGED:
     {
       // If the format changed, update our cached info.
       ALOG("Decoder format changed");
       if (!SetVideoFormat()) {
         return NS_ERROR_UNEXPECTED;
       }
-      else
+      return Output(aStreamOffset, aOutData);
+    }
+    case android::INFO_OUTPUT_BUFFERS_CHANGED:
+    {
+      if (mDecoder->UpdateOutputBuffers()) {
         return Output(aStreamOffset, aOutData);
+      }
+      return NS_ERROR_FAILURE;
     }
     case -EAGAIN:
     {
@@ -346,8 +352,8 @@
     case android::ERROR_END_OF_STREAM:
     {
       ALOG("Got the EOS frame!");
-      VideoData* data = nullptr;
-      nsresult rv = CreateVideoData(aStreamOffset, &data);
+      nsRefPtr<VideoData> data;
+      nsresult rv = CreateVideoData(aStreamOffset, getter_AddRefs(data));
       if (rv == NS_ERROR_NOT_AVAILABLE) {
 	// For EOS, no need to do any thing.
         return NS_ERROR_ABORT;
@@ -391,7 +397,7 @@
   status_t rv;
   if (aSample != nullptr) {
     // We must prepare samples in AVC Annex B.
-    mp4_demuxer::AnnexB::ConvertSample(aSample, mConfig.annex_b);
+    mp4_demuxer::AnnexB::ConvertSample(aSample);
     // Forward sample data to the decoder.
 
     const uint8_t* data = reinterpret_cast<const uint8_t*>(aSample->data);
@@ -420,7 +426,6 @@
   }
   status_t err = mDecoder->configure(format, surface, nullptr, 0);
   mDecoder->Prepare();
-  SetVideoFormat();
 
   if (mHandler != nullptr) {
     // post kNotifyCodecReserved to Looper thread.
@@ -450,6 +455,7 @@
     {
       // Our decode may have acquired the hardware resource that it needs
       // to start. Notify the state machine to resume loading metadata.
+      ALOG("CodecReserved!");
       mReaderCallback->NotifyResourcesStatusChanged();
       break;
     }
@@ -462,7 +468,7 @@
 
     case kNotifyPostReleaseBuffer:
     {
-      ReleaseAllPendingVideoBuffersLocked();
+      ReleaseAllPendingVideoBuffers();
       break;
     }
 
@@ -557,7 +563,7 @@
 
 }
 
-void GonkVideoDecoderManager::ReleaseAllPendingVideoBuffersLocked()
+void GonkVideoDecoderManager::ReleaseAllPendingVideoBuffers()
 {
   Vector<android::MediaBuffer*> releasingVideoBuffers;
   {
@@ -579,4 +585,9 @@
   releasingVideoBuffers.clear();
 }
 
+void GonkVideoDecoderManager::ReleaseMediaResources() {
+  ALOG("ReleseMediaResources");
+  ReleaseAllPendingVideoBuffers();
+  mDecoder->ReleaseMediaResources();
+}
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/gonk/GonkVideoDecoderManager.h	2014-11-26 21:46:01.000000000 +0000
@@ -48,9 +48,12 @@
   virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE;
 
   virtual nsresult Output(int64_t aStreamOffset,
-                          nsAutoPtr<MediaData>& aOutput) MOZ_OVERRIDE;
+                          nsRefPtr<MediaData>& aOutput) MOZ_OVERRIDE;
+
+  virtual void ReleaseMediaResources();
 
   static void RecycleCallback(TextureClient* aClient, void* aClosure);
+
 private:
   struct FrameInfo
   {
@@ -112,10 +115,9 @@
   void codecCanceled();
   void onMessageReceived(const sp<AMessage> &aMessage);
 
-  void ReleaseAllPendingVideoBuffersLocked();
+  void ReleaseAllPendingVideoBuffers();
   void PostReleaseVideoBuffer(android::MediaBuffer *aBuffer);
 
-  const mp4_demuxer::VideoDecoderConfig& mConfig;
   uint32_t mVideoWidth;
   uint32_t mVideoHeight;
   uint32_t mDisplayWidth;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/moz.build	2014-11-26 21:46:01.000000000 +0000
@@ -8,12 +8,14 @@
     'MP4Decoder.h',
     'MP4Reader.h',
     'PlatformDecoderModule.h',
+    'SharedDecoderManager.h',
 ]
 
 UNIFIED_SOURCES += [
     'BlankDecoderModule.cpp',
     'MP4Decoder.cpp',
     'PlatformDecoderModule.cpp',
+    'SharedDecoderManager.cpp',
 ]
 
 SOURCES += [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Decoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Decoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Decoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Decoder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -54,14 +54,25 @@
 #endif
 
 static bool
-IsSupportedAudioCodec(const nsAString& aCodec)
+IsSupportedAudioCodec(const nsAString& aCodec,
+                      bool& aOutContainsAAC,
+                      bool& aOutContainsMP3)
 {
-  // AAC-LC, HE-AAC or MP3 in M4A.
-  return aCodec.EqualsASCII("mp4a.40.2") ||
+  // AAC-LC or HE-AAC in M4A.
+  aOutContainsAAC = aCodec.EqualsASCII("mp4a.40.2") ||
+                    aCodec.EqualsASCII("mp4a.40.5");
+  if (aOutContainsAAC) {
+    return true;
+  }
 #ifndef MOZ_GONK_MEDIACODEC // B2G doesn't support MP3 in MP4 yet.
-         aCodec.EqualsASCII("mp3") ||
+  aOutContainsMP3 = aCodec.EqualsASCII("mp3");
+  if (aOutContainsMP3) {
+    return true;
+  }
+#else
+  aOutContainsMP3 = false;
 #endif
-         aCodec.EqualsASCII("mp4a.40.5");
+  return false;
 }
 
 static bool
@@ -92,14 +103,20 @@
 /* static */
 bool
 MP4Decoder::CanHandleMediaType(const nsACString& aType,
-                               const nsAString& aCodecs)
+                               const nsAString& aCodecs,
+                               bool& aOutContainsAAC,
+                               bool& aOutContainsH264,
+                               bool& aOutContainsMP3)
 {
   if (!IsEnabled()) {
     return false;
   }
 
   if (aType.EqualsASCII("audio/mp4") || aType.EqualsASCII("audio/x-m4a")) {
-    return aCodecs.IsEmpty() || IsSupportedAudioCodec(aCodecs);
+    return aCodecs.IsEmpty() ||
+           IsSupportedAudioCodec(aCodecs,
+                                 aOutContainsAAC,
+                                 aOutContainsMP3);
   }
 
   if (!aType.EqualsASCII("video/mp4")) {
@@ -113,7 +130,13 @@
   while (tokenizer.hasMoreTokens()) {
     const nsSubstring& token = tokenizer.nextToken();
     expectMoreTokens = tokenizer.separatorAfterCurrentToken();
-    if (IsSupportedAudioCodec(token) || IsSupportedH264Codec(token)) {
+    if (IsSupportedAudioCodec(token,
+                              aOutContainsAAC,
+                              aOutContainsMP3)) {
+      continue;
+    }
+    if (IsSupportedH264Codec(token)) {
+      aOutContainsH264 = true;
       continue;
     }
     return false;
@@ -122,8 +145,8 @@
     // Last codec name was empty
     return false;
   }
-  return true;
 
+  return true;
 }
 
 static bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Decoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Decoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Decoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Decoder.h	2014-11-26 21:46:00.000000000 +0000
@@ -30,9 +30,13 @@
 
   // Returns true if aMIMEType is a type that we think we can render with the
   // a MP4 platform decoder backend. If aCodecs is non emtpy, it is filled
-  // with a comma-delimited list of codecs to check support for.
+  // with a comma-delimited list of codecs to check support for. Notes in
+  // out params wether the codecs string contains AAC or H.264.
   static bool CanHandleMediaType(const nsACString& aMIMEType,
-                                 const nsAString& aCodecs = EmptyString());
+                                 const nsAString& aCodecs,
+                                 bool& aOutContainsAAC,
+                                 bool& aOutContainsH264,
+                                 bool& aOutContainsMP3);
 
   // Returns true if the MP4 backend is preffed on, and we're running on a
   // platform that is likely to have decoders for the contained formats.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Reader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Reader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Reader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Reader.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -14,6 +14,7 @@
 #include "SharedThreadPool.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/TimeRanges.h"
+#include "SharedDecoderManager.h"
 
 #ifdef MOZ_EME
 #include "mozilla/CDMProxy.h"
@@ -32,8 +33,10 @@
   return log;
 }
 #define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#define VLOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG+1, (__VA_ARGS__))
 #else
 #define LOG(...)
+#define VLOG(...)
 #endif
 
 using namespace mp4_demuxer;
@@ -133,14 +136,14 @@
 
 MP4Reader::~MP4Reader()
 {
-  MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
   MOZ_COUNT_DTOR(MP4Reader);
-  Shutdown();
 }
 
 void
 MP4Reader::Shutdown()
 {
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
+
   if (mAudio.mDecoder) {
     Flush(kAudio);
     mAudio.mDecoder->Shutdown();
@@ -205,12 +208,10 @@
 
   InitLayersBackendType();
 
-  mAudio.mTaskQueue = new MediaTaskQueue(
-    SharedThreadPool::Get(NS_LITERAL_CSTRING("MP4 Audio Decode")));
+  mAudio.mTaskQueue = new MediaTaskQueue(GetMediaDecodeThreadPool());
   NS_ENSURE_TRUE(mAudio.mTaskQueue, NS_ERROR_FAILURE);
 
-  mVideo.mTaskQueue = new MediaTaskQueue(
-    SharedThreadPool::Get(NS_LITERAL_CSTRING("MP4 Video Decode")));
+  mVideo.mTaskQueue = new MediaTaskQueue(GetMediaDecodeThreadPool());
   NS_ENSURE_TRUE(mVideo.mTaskQueue, NS_ERROR_FAILURE);
 
   static bool sSetupPrefCache = false;
@@ -310,6 +311,14 @@
          mPlatform->SupportsAudioMimeType(aMimeType);
 }
 
+bool
+MP4Reader::IsSupportedVideoMimeType(const char* aMimeType)
+{
+  return (!strcmp(aMimeType, "video/mp4") ||
+          !strcmp(aMimeType, "video/avc")) &&
+         mPlatform->SupportsVideoMimeType(aMimeType);
+}
+
 nsresult
 MP4Reader::ReadMetadata(MediaInfo* aInfo,
                         MetadataTags** aTags)
@@ -412,14 +421,26 @@
 
   if (HasVideo()) {
     const VideoDecoderConfig& video = mDemuxer->VideoConfig();
+    if (mInfo.mVideo.mHasVideo && !IsSupportedVideoMimeType(video.mime_type)) {
+      return NS_ERROR_FAILURE;
+    }
     mInfo.mVideo.mDisplay =
       nsIntSize(video.display_width, video.display_height);
-    mVideo.mCallback = new  DecoderCallback(this, kVideo);
-    mVideo.mDecoder = mPlatform->CreateH264Decoder(video,
-                                                   mLayersBackendType,
-                                                   mDecoder->GetImageContainer(),
-                                                   mVideo.mTaskQueue,
-                                                   mVideo.mCallback);
+    mVideo.mCallback = new DecoderCallback(this, kVideo);
+    if (mSharedDecoderManager) {
+      mVideo.mDecoder =
+        mSharedDecoderManager->CreateVideoDecoder(video,
+                                                  mLayersBackendType,
+                                                  mDecoder->GetImageContainer(),
+                                                  mVideo.mTaskQueue,
+                                                  mVideo.mCallback);
+    } else {
+      mVideo.mDecoder = mPlatform->CreateVideoDecoder(video,
+                                                      mLayersBackendType,
+                                                      mDecoder->GetImageContainer(),
+                                                      mVideo.mTaskQueue,
+                                                      mVideo.mCallback);
+    }
     NS_ENSURE_TRUE(mVideo.mDecoder != nullptr, NS_ERROR_FAILURE);
     nsresult rv = mVideo.mDecoder->Init();
     NS_ENSURE_SUCCESS(rv, rv);
@@ -473,10 +494,174 @@
   return (aTrack == kAudio) ? mAudio : mVideo;
 }
 
-MediaDataDecoder*
-MP4Reader::Decoder(TrackType aTrack)
+void
+MP4Reader::RequestVideoData(bool aSkipToNextKeyframe,
+                            int64_t aTimeThreshold)
 {
-  return GetDecoderData(aTrack).mDecoder;
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
+  VLOG("RequestVideoData skip=%d time=%lld", aSkipToNextKeyframe, aTimeThreshold);
+
+  // Record number of frames decoded and parsed. Automatically update the
+  // stats counters using the AutoNotifyDecoded stack-based class.
+  uint32_t parsed = 0, decoded = 0;
+  AbstractMediaDecoder::AutoNotifyDecoded autoNotify(mDecoder, parsed, decoded);
+
+  MOZ_ASSERT(HasVideo() && mPlatform && mVideo.mDecoder);
+
+  if (aSkipToNextKeyframe) {
+    if (!SkipVideoDemuxToNextKeyFrame(aTimeThreshold, parsed) ||
+        NS_FAILED(mVideo.mDecoder->Flush())) {
+      NS_WARNING("Failed to skip/flush video when skipping-to-next-keyframe.");
+    }
+  }
+
+  auto& decoder = GetDecoderData(kVideo);
+  MonitorAutoLock lock(decoder.mMonitor);
+  decoder.mOutputRequested = true;
+  ScheduleUpdate(kVideo);
+
+  // Report the number of "decoded" frames as the difference in the
+  // mNumSamplesOutput field since the last time we were called.
+  uint64_t delta = mVideo.mNumSamplesOutput - mLastReportedNumDecodedFrames;
+  decoded = static_cast<uint32_t>(delta);
+  mLastReportedNumDecodedFrames = mVideo.mNumSamplesOutput;
+}
+
+void
+MP4Reader::RequestAudioData()
+{
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
+  VLOG("RequestAudioData");
+  auto& decoder = GetDecoderData(kAudio);
+  MonitorAutoLock lock(decoder.mMonitor);
+  decoder.mOutputRequested = true;
+  ScheduleUpdate(kAudio);
+}
+
+void
+MP4Reader::ScheduleUpdate(TrackType aTrack)
+{
+  auto& decoder = GetDecoderData(aTrack);
+  decoder.mMonitor.AssertCurrentThreadOwns();
+  if (decoder.mUpdateScheduled) {
+    return;
+  }
+  VLOG("SchedulingUpdate(%s)", TrackTypeToStr(aTrack));
+  decoder.mUpdateScheduled = true;
+  RefPtr<nsIRunnable> task(
+    NS_NewRunnableMethodWithArg<TrackType>(this, &MP4Reader::Update, aTrack));
+  GetTaskQueue()->Dispatch(task.forget());
+}
+
+bool
+MP4Reader::NeedInput(DecoderData& aDecoder)
+{
+  aDecoder.mMonitor.AssertCurrentThreadOwns();
+  // We try to keep a few more compressed samples input than decoded samples
+  // have been output, provided the state machine has requested we send it a
+  // decoded sample. To account for H.264 streams which may require a longer
+  // run of input than we input, decoders fire an "input exhausted" callback,
+  // which overrides our "few more samples" threshold.
+  return
+    !aDecoder.mError &&
+    !aDecoder.mEOS &&
+    aDecoder.mOutputRequested &&
+    aDecoder.mOutput.IsEmpty() &&
+    (aDecoder.mInputExhausted ||
+     aDecoder.mNumSamplesInput - aDecoder.mNumSamplesOutput < aDecoder.mDecodeAhead);
+}
+
+void
+MP4Reader::Update(TrackType aTrack)
+{
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
+
+  bool needInput = false;
+  bool needOutput = false;
+  bool eos = false;
+  auto& decoder = GetDecoderData(aTrack);
+  nsRefPtr<MediaData> output;
+  {
+    MonitorAutoLock lock(decoder.mMonitor);
+    decoder.mUpdateScheduled = false;
+    if (NeedInput(decoder)) {
+      needInput = true;
+      decoder.mInputExhausted = false;
+      decoder.mNumSamplesInput++;
+    }
+    needOutput = decoder.mOutputRequested;
+    if (needOutput && !decoder.mOutput.IsEmpty()) {
+      output = decoder.mOutput[0];
+      decoder.mOutput.RemoveElementAt(0);
+    }
+    eos = decoder.mEOS;
+  }
+  VLOG("Update(%s) ni=%d no=%d iex=%d or=%d fl=%d",
+       TrackTypeToStr(aTrack),
+       needInput,
+       needOutput,
+       decoder.mInputExhausted,
+       decoder.mOutputRequested,
+       decoder.mIsFlushing);
+
+  if (needInput) {
+    MP4Sample* sample = PopSample(aTrack);
+    if (sample) {
+      decoder.mDecoder->Input(sample);
+    } else {
+      {
+        MonitorAutoLock lock(decoder.mMonitor);
+        MOZ_ASSERT(!decoder.mEOS);
+        eos = decoder.mEOS = true;
+      }
+      decoder.mDecoder->Drain();
+    }
+  }
+  if (needOutput) {
+    if (output) {
+      ReturnOutput(output, aTrack);
+    } else if (eos) {
+      ReturnEOS(aTrack);
+    }
+  }
+}
+
+void
+MP4Reader::ReturnOutput(MediaData* aData, TrackType aTrack)
+{
+  auto& decoder = GetDecoderData(aTrack);
+  {
+    MonitorAutoLock lock(decoder.mMonitor);
+    MOZ_ASSERT(decoder.mOutputRequested);
+    decoder.mOutputRequested = false;
+    if (decoder.mDiscontinuity) {
+      decoder.mDiscontinuity = false;
+      aData->mDiscontinuity = true;
+    }
+  }
+
+  if (aTrack == kAudio) {
+    AudioData* audioData = static_cast<AudioData*>(aData);
+
+    if (audioData->mChannels != mInfo.mAudio.mChannels ||
+        audioData->mRate != mInfo.mAudio.mRate) {
+      LOG("MP4Reader::ReturnOutput change of sampling rate:%d->%d",
+          mInfo.mAudio.mRate, audioData->mRate);
+      mInfo.mAudio.mRate = audioData->mRate;
+      mInfo.mAudio.mChannels = audioData->mChannels;
+    }
+
+    GetCallback()->OnAudioDecoded(audioData);
+  } else if (aTrack == kVideo) {
+    GetCallback()->OnVideoDecoded(static_cast<VideoData*>(aData));
+  }
+}
+
+void
+MP4Reader::ReturnEOS(TrackType aTrack)
+{
+  GetCallback()->OnNotDecoded(aTrack == kAudio ? MediaData::AUDIO_DATA : MediaData::VIDEO_DATA,
+                              RequestSampleCallback::END_OF_STREAM);
 }
 
 MP4Sample*
@@ -497,108 +682,12 @@
   }
 }
 
-// How async decoding works:
-//
-// When MP4Reader::Decode() is called:
-// * Lock the DecoderData. We assume the state machine wants
-//   output from the decoder (in future, we'll assume decoder wants input
-//   when the output MediaQueue isn't "full").
-// * Cache the value of mNumSamplesOutput, as prevFramesOutput.
-// * While we've not output data (mNumSamplesOutput != prevNumFramesOutput)
-//   and while we still require input, we demux and input data in the reader.
-//   We assume we require input if
-//   ((mNumSamplesInput - mNumSamplesOutput) < sDecodeAheadMargin) or
-//   mInputExhausted is true. Before we send input, we reset mInputExhausted
-//   and increment mNumFrameInput, and drop the lock on DecoderData.
-// * Once we no longer require input, we wait on the DecoderData
-//   lock for output, or for the input exhausted callback. If we receive the
-//   input exhausted callback, we go back and input more data.
-// * When our output callback is called, we take the DecoderData lock and
-//   increment mNumSamplesOutput. We notify the DecoderData lock. This will
-//   awaken the Decode thread, and unblock it, and it will return.
-bool
-MP4Reader::Decode(TrackType aTrack)
-{
-  DecoderData& data = GetDecoderData(aTrack);
-  MOZ_ASSERT(data.mDecoder);
-
-  data.mMonitor.Lock();
-  uint64_t prevNumFramesOutput = data.mNumSamplesOutput;
-  while (prevNumFramesOutput == data.mNumSamplesOutput) {
-    data.mMonitor.AssertCurrentThreadOwns();
-    if (data.mError) {
-      // Decode error!
-      data.mMonitor.Unlock();
-      return false;
-    }
-    // Send input to the decoder, if we need to. We assume the decoder
-    // needs input if it's told us it's out of input, or we're beneath the
-    // "low water mark" for the amount of input we've sent it vs the amount
-    // out output we've received. We always try to keep the decoder busy if
-    // possible, so we try to maintain at least a few input samples ahead,
-    // if we need output.
-    while (prevNumFramesOutput == data.mNumSamplesOutput &&
-           (data.mInputExhausted ||
-           (data.mNumSamplesInput - data.mNumSamplesOutput) < data.mDecodeAhead) &&
-           !data.mEOS) {
-      data.mMonitor.AssertCurrentThreadOwns();
-      data.mMonitor.Unlock();
-      nsAutoPtr<MP4Sample> compressed(PopSample(aTrack));
-      if (!compressed) {
-        // EOS, or error. Send the decoder a signal to drain.
-        LOG("MP4Reader: EOS or error - no samples available");
-        LOG("Draining %s", TrackTypeToStr(aTrack));
-        data.mMonitor.Lock();
-        MOZ_ASSERT(!data.mEOS);
-        data.mEOS = true;
-        MOZ_ASSERT(!data.mDrainComplete);
-        data.mDrainComplete = false;
-        data.mMonitor.Unlock();
-        data.mDecoder->Drain();
-      } else {
-#ifdef LOG_SAMPLE_DECODE
-        LOG("PopSample %s time=%lld dur=%lld", TrackTypeToStr(aTrack),
-            compressed->composition_timestamp, compressed->duration);
-#endif
-        data.mMonitor.Lock();
-        data.mDrainComplete = false;
-        data.mInputExhausted = false;
-        data.mNumSamplesInput++;
-        data.mMonitor.Unlock();
-
-        if (NS_FAILED(data.mDecoder->Input(compressed))) {
-          return false;
-        }
-        // If Input() failed, we let the auto pointer delete |compressed|.
-        // Otherwise, we assume the decoder will delete it when it's finished
-        // with it.
-        compressed.forget();
-      }
-      data.mMonitor.Lock();
-    }
-    data.mMonitor.AssertCurrentThreadOwns();
-    while (!data.mError &&
-           prevNumFramesOutput == data.mNumSamplesOutput &&
-           (!data.mInputExhausted || data.mEOS) &&
-           !data.mDrainComplete) {
-      data.mMonitor.Wait();
-    }
-    if (data.mError ||
-        (data.mEOS && data.mDrainComplete)) {
-      break;
-    }
-  }
-  data.mMonitor.AssertCurrentThreadOwns();
-  bool rv = !(data.mDrainComplete || data.mError);
-  data.mMonitor.Unlock();
-  return rv;
-}
-
 nsresult
 MP4Reader::ResetDecode()
 {
-  Flush(kAudio);
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
   Flush(kVideo);
+  Flush(kAudio);
   return MediaDecoderReader::ResetDecode();
 }
 
@@ -606,7 +695,7 @@
 MP4Reader::Output(TrackType aTrack, MediaData* aSample)
 {
 #ifdef LOG_SAMPLE_DECODE
-  LOG("Decoded %s sample time=%lld dur=%lld",
+  VLOG("Decoded %s sample time=%lld dur=%lld",
       TrackTypeToStr(aTrack), aSample->mTime, aSample->mDuration);
 #endif
 
@@ -616,41 +705,20 @@
     return;
   }
 
-  DecoderData& data = GetDecoderData(aTrack);
+  auto& decoder = GetDecoderData(aTrack);
   // Don't accept output while we're flushing.
-  MonitorAutoLock mon(data.mMonitor);
-  if (data.mIsFlushing) {
-    delete aSample;
+  MonitorAutoLock mon(decoder.mMonitor);
+  if (decoder.mIsFlushing) {
     LOG("MP4Reader produced output while flushing, discarding.");
     mon.NotifyAll();
     return;
   }
 
-  switch (aTrack) {
-    case kAudio: {
-      MOZ_ASSERT(aSample->mType == MediaData::AUDIO_DATA);
-      AudioData* audioData = static_cast<AudioData*>(aSample);
-      AudioQueue().Push(audioData);
-      if (audioData->mChannels != mInfo.mAudio.mChannels ||
-          audioData->mRate != mInfo.mAudio.mRate) {
-        LOG("MP4Reader::Output change of sampling rate:%d->%d",
-            mInfo.mAudio.mRate, audioData->mRate);
-        mInfo.mAudio.mRate = audioData->mRate;
-        mInfo.mAudio.mChannels = audioData->mChannels;
-      }
-      break;
-    }
-    case kVideo: {
-      MOZ_ASSERT(aSample->mType == MediaData::VIDEO_DATA);
-      VideoQueue().Push(static_cast<VideoData*>(aSample));
-      break;
-    }
-    default:
-      break;
+  decoder.mOutput.AppendElement(aSample);
+  decoder.mNumSamplesOutput++;
+  if (NeedInput(decoder) || decoder.mOutputRequested) {
+    ScheduleUpdate(aTrack);
   }
-
-  data.mNumSamplesOutput++;
-  mon.NotifyAll();
 }
 
 void
@@ -668,28 +736,26 @@
   DecoderData& data = GetDecoderData(aTrack);
   MonitorAutoLock mon(data.mMonitor);
   data.mInputExhausted = true;
-  mon.NotifyAll();
+  ScheduleUpdate(aTrack);
 }
 
 void
 MP4Reader::Error(TrackType aTrack)
 {
   DecoderData& data = GetDecoderData(aTrack);
-  MonitorAutoLock mon(data.mMonitor);
-  data.mError = true;
-  mon.NotifyAll();
-}
-
-bool
-MP4Reader::DecodeAudioData()
-{
-  MOZ_ASSERT(HasAudio() && mPlatform && mAudio.mDecoder);
-  return Decode(kAudio);
+  {
+    MonitorAutoLock mon(data.mMonitor);
+    data.mError = true;
+  }
+  GetCallback()->OnNotDecoded(aTrack == kVideo ? MediaData::VIDEO_DATA : MediaData::AUDIO_DATA,
+                              RequestSampleCallback::DECODE_ERROR);
 }
 
 void
 MP4Reader::Flush(TrackType aTrack)
 {
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
+  VLOG("Flush(%s) BEGIN", TrackTypeToStr(aTrack));
   DecoderData& data = GetDecoderData(aTrack);
   if (!data.mDecoder) {
     return;
@@ -707,12 +773,28 @@
   {
     MonitorAutoLock mon(data.mMonitor);
     data.mIsFlushing = false;
+    data.mOutput.Clear();
+    data.mNumSamplesInput = 0;
+    data.mNumSamplesOutput = 0;
+    data.mInputExhausted = false;
+    if (data.mOutputRequested) {
+      GetCallback()->OnNotDecoded(aTrack == kVideo ? MediaData::VIDEO_DATA : MediaData::AUDIO_DATA,
+                                  RequestSampleCallback::CANCELED);
+    }
+    data.mOutputRequested = false;
+    data.mDiscontinuity = true;
+  }
+  if (aTrack == kVideo) {
+    mQueuedVideoSample = nullptr;
   }
+  VLOG("Flush(%s) END", TrackTypeToStr(aTrack));
 }
 
 bool
 MP4Reader::SkipVideoDemuxToNextKeyFrame(int64_t aTimeThreshold, uint32_t& parsed)
 {
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
+
   MOZ_ASSERT(mVideo.mDecoder);
 
   Flush(kVideo);
@@ -722,6 +804,12 @@
     nsAutoPtr<MP4Sample> compressed(PopSample(kVideo));
     if (!compressed) {
       // EOS, or error. Let the state machine know.
+      GetCallback()->OnNotDecoded(MediaData::VIDEO_DATA,
+                                  RequestSampleCallback::END_OF_STREAM);
+      {
+        MonitorAutoLock mon(mVideo.mMonitor);
+        mVideo.mEOS = true;
+      }
       return false;
     }
     parsed++;
@@ -736,47 +824,16 @@
   return true;
 }
 
-bool
-MP4Reader::DecodeVideoFrame(bool &aKeyframeSkip,
-                            int64_t aTimeThreshold)
-{
-  // Record number of frames decoded and parsed. Automatically update the
-  // stats counters using the AutoNotifyDecoded stack-based class.
-  uint32_t parsed = 0, decoded = 0;
-  AbstractMediaDecoder::AutoNotifyDecoded autoNotify(mDecoder, parsed, decoded);
-
-  MOZ_ASSERT(HasVideo() && mPlatform && mVideo.mDecoder);
-
-  if (aKeyframeSkip) {
-    bool ok = SkipVideoDemuxToNextKeyFrame(aTimeThreshold, parsed);
-    if (!ok) {
-      NS_WARNING("Failed to skip demux up to next keyframe");
-      return false;
-    }
-    aKeyframeSkip = false;
-    nsresult rv = mVideo.mDecoder->Flush();
-    NS_ENSURE_SUCCESS(rv, false);
-  }
-
-  bool rv = Decode(kVideo);
-  {
-    // Report the number of "decoded" frames as the difference in the
-    // mNumSamplesOutput field since the last time we were called.
-    MonitorAutoLock mon(mVideo.mMonitor);
-    uint64_t delta = mVideo.mNumSamplesOutput - mLastReportedNumDecodedFrames;
-    decoded = static_cast<uint32_t>(delta);
-    mLastReportedNumDecodedFrames = mVideo.mNumSamplesOutput;
-  }
-  return rv;
-}
-
 void
 MP4Reader::Seek(int64_t aTime,
                 int64_t aStartTime,
                 int64_t aEndTime,
                 int64_t aCurrentTime)
 {
+  LOG("MP4Reader::Seek(%lld)", aTime);
+  MOZ_ASSERT(GetTaskQueue()->IsCurrentThreadIn());
   if (!mDecoder->GetResource()->IsTransportSeekable() || !mDemuxer->CanSeek()) {
+    VLOG("Seek() END (Unseekable)");
     GetCallback()->OnSeekCompleted(NS_ERROR_FAILURE);
     return;
   }
@@ -790,7 +847,7 @@
     mDemuxer->SeekAudio(
       mQueuedVideoSample ? mQueuedVideoSample->composition_timestamp : aTime);
   }
-
+  LOG("MP4Reader::Seek(%lld) exit", aTime);
   GetCallback()->OnSeekCompleted(NS_OK);
 }
 
@@ -884,4 +941,21 @@
 #endif
 }
 
+void
+MP4Reader::SetIdle()
+{
+  if (mSharedDecoderManager && mVideo.mDecoder) {
+    mSharedDecoderManager->SetIdle(mVideo.mDecoder);
+    NotifyResourcesStatusChanged();
+  }
+}
+
+void
+MP4Reader::SetSharedDecoderManager(SharedDecoderManager* aManager)
+{
+#ifdef MOZ_GONK_MEDIACODEC
+  mSharedDecoderManager = aManager;
+#endif
+}
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Reader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Reader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/MP4Reader.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/MP4Reader.h	2014-11-26 21:46:00.000000000 +0000
@@ -28,6 +28,8 @@
 
 class MP4Reader : public MediaDecoderReader
 {
+  typedef mp4_demuxer::TrackType TrackType;
+
 public:
   explicit MP4Reader(AbstractMediaDecoder* aDecoder);
 
@@ -35,10 +37,11 @@
 
   virtual nsresult Init(MediaDecoderReader* aCloneDonor) MOZ_OVERRIDE;
 
-  virtual bool DecodeAudioData() MOZ_OVERRIDE;
-  virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
+  virtual void RequestVideoData(bool aSkipToNextKeyframe,
                                 int64_t aTimeThreshold) MOZ_OVERRIDE;
 
+  virtual void RequestAudioData() MOZ_OVERRIDE;
+
   virtual bool HasAudio() MOZ_OVERRIDE;
   virtual bool HasVideo() MOZ_OVERRIDE;
 
@@ -62,9 +65,12 @@
   virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) MOZ_OVERRIDE;
 
   // For Media Resource Management
+  virtual void SetIdle() MOZ_OVERRIDE;
   virtual bool IsWaitingMediaResources() MOZ_OVERRIDE;
   virtual bool IsDormantNeeded() MOZ_OVERRIDE;
   virtual void ReleaseMediaResources() MOZ_OVERRIDE;
+  virtual void SetSharedDecoderManager(SharedDecoderManager* aManager)
+    MOZ_OVERRIDE;
 
   virtual nsresult ResetDecode() MOZ_OVERRIDE;
 
@@ -72,6 +78,17 @@
 
 private:
 
+  void ReturnEOS(TrackType aTrack);
+  void ReturnOutput(MediaData* aData, TrackType aTrack);
+
+  // Sends input to decoder for aTrack, and output to the state machine,
+  // if necessary.
+  void Update(TrackType aTrack);
+
+  // Enqueues a task to call Update(aTrack) on the decoder task queue.
+  // Lock for corresponding track must be held.
+  void ScheduleUpdate(TrackType aTrack);
+
   void ExtractCryptoInitData(nsTArray<uint8_t>& aInitData);
 
   // Initializes mLayersBackendType if possible.
@@ -83,14 +100,16 @@
 
   bool SkipVideoDemuxToNextKeyFrame(int64_t aTimeThreshold, uint32_t& parsed);
 
+  // DecoderCallback proxies the MediaDataDecoderCallback calls to these
+  // functions.
   void Output(mp4_demuxer::TrackType aType, MediaData* aSample);
   void InputExhausted(mp4_demuxer::TrackType aTrack);
   void Error(mp4_demuxer::TrackType aTrack);
-  bool Decode(mp4_demuxer::TrackType aTrack);
   void Flush(mp4_demuxer::TrackType aTrack);
   void DrainComplete(mp4_demuxer::TrackType aTrack);
   void UpdateIndex();
   bool IsSupportedAudioMimeType(const char* aMimeType);
+  bool IsSupportedVideoMimeType(const char* aMimeType);
   void NotifyResourcesStatusChanged();
   bool IsWaitingOnCodecResource();
   virtual bool IsWaitingOnCDMResource() MOZ_OVERRIDE;
@@ -141,7 +160,10 @@
       , mError(false)
       , mIsFlushing(false)
       , mDrainComplete(false)
+      , mOutputRequested(false)
+      , mUpdateScheduled(false)
       , mEOS(false)
+      , mDiscontinuity(false)
     {
     }
 
@@ -152,6 +174,10 @@
     nsRefPtr<MediaTaskQueue> mTaskQueue;
     // Callback that receives output and error notifications from the decoder.
     nsAutoPtr<DecoderCallback> mCallback;
+    // Decoded samples returned my mDecoder awaiting being returned to
+    // state machine upon request.
+    nsTArray<nsRefPtr<MediaData> > mOutput;
+
     // Monitor that protects all non-threadsafe state; the primitives
     // that follow.
     Monitor mMonitor;
@@ -164,7 +190,10 @@
     bool mError;
     bool mIsFlushing;
     bool mDrainComplete;
+    bool mOutputRequested;
+    bool mUpdateScheduled;
     bool mEOS;
+    bool mDiscontinuity;
   };
   DecoderData mAudio;
   DecoderData mVideo;
@@ -172,6 +201,10 @@
   // decoder.
   nsAutoPtr<mp4_demuxer::MP4Sample> mQueuedVideoSample;
 
+  // Returns true when the decoder for this track needs input.
+  // aDecoder.mMonitor must be locked.
+  bool NeedInput(DecoderData& aDecoder);
+
   // The last number of decoded output frames that we've reported to
   // MediaDecoder::NotifyDecoded(). We diff the number of output video
   // frames every time that DecodeVideoData() is called, and report the
@@ -179,7 +212,6 @@
   uint64_t mLastReportedNumDecodedFrames;
 
   DecoderData& GetDecoderData(mp4_demuxer::TrackType aTrack);
-  MediaDataDecoder* Decoder(mp4_demuxer::TrackType aTrack);
 
   layers::LayersBackend mLayersBackendType;
 
@@ -193,6 +225,7 @@
 
   bool mIndexReady;
   Monitor mIndexMonitor;
+  nsRefPtr<SharedDecoderManager> mSharedDecoderManager;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/PlatformDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/PlatformDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/PlatformDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/PlatformDecoderModule.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -182,4 +182,10 @@
   return !strcmp(aMimeType, "audio/mp4a-latm");
 }
 
+bool
+PlatformDecoderModule::SupportsVideoMimeType(const char* aMimeType)
+{
+  return !strcmp(aMimeType, "video/mp4") || !strcmp(aMimeType, "video/avc");
+}
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/PlatformDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/PlatformDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/PlatformDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/PlatformDecoderModule.h	2014-11-26 21:46:00.000000000 +0000
@@ -97,7 +97,7 @@
   // It is safe to store a reference to aConfig.
   // This is called on the decode task queue.
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
                     layers::LayersBackend aLayersBackend,
                     layers::ImageContainer* aImageContainer,
                     MediaTaskQueue* aVideoTaskQueue,
@@ -122,6 +122,7 @@
   // If more audio codec is to be supported, SupportsAudioMimeType will have
   // to be extended
   virtual bool SupportsAudioMimeType(const char* aMimeType);
+  virtual bool SupportsVideoMimeType(const char* aMimeType);
 
   virtual ~PlatformDecoderModule() {}
 
@@ -141,8 +142,7 @@
 public:
   virtual ~MediaDataDecoderCallback() {}
 
-  // Called by MediaDataDecoder when a sample has been decoded. Callee is
-  // responsibile for deleting aData.
+  // Called by MediaDataDecoder when a sample has been decoded.
   virtual void Output(MediaData* aData) = 0;
 
   // Denotes an error in the decoding process. The reader will stop calling
@@ -165,8 +165,9 @@
 // media data that the decoder accepts as valid input and produces as
 // output is determined when the MediaDataDecoder is created.
 //
-// All functions must be threadsafe, and be able to be called on an
-// arbitrary thread.
+// All functions are only called on the decode task queue. Don't block
+// inside these functions, unless it's explicitly noted that you should
+// (like in Flush() and Drain()).
 //
 // Decoding is done asynchronously. Any async work can be done on the
 // MediaTaskQueue passed into the PlatformDecoderModules's Create*Decoder()
@@ -230,8 +231,8 @@
   virtual bool IsDormantNeeded() {
     return false;
   };
-  virtual void ReleaseMediaResources() {};
-  virtual void ReleaseDecoder() {};
+  virtual void ReleaseMediaResources() {}
+  virtual void ReleaseDecoder() {}
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/SharedDecoderManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/SharedDecoderManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/SharedDecoderManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/SharedDecoderManager.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,207 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "SharedDecoderManager.h"
+#include "mp4_demuxer/DecoderData.h"
+
+namespace mozilla {
+
+class SharedDecoderCallback : public MediaDataDecoderCallback
+{
+public:
+  SharedDecoderCallback(SharedDecoderManager* aManager) : mManager(aManager) {}
+
+  virtual void Output(MediaData* aData) MOZ_OVERRIDE
+  {
+    if (mManager->mActiveCallback) {
+      mManager->mActiveCallback->Output(aData);
+    }
+  }
+  virtual void Error() MOZ_OVERRIDE
+  {
+    if (mManager->mActiveCallback) {
+      mManager->mActiveCallback->Error();
+    }
+  }
+  virtual void InputExhausted() MOZ_OVERRIDE
+  {
+    if (mManager->mActiveCallback) {
+      mManager->mActiveCallback->InputExhausted();
+    }
+  }
+  virtual void DrainComplete() MOZ_OVERRIDE
+  {
+    if (mManager->mActiveCallback) {
+      mManager->DrainComplete();
+    }
+  }
+  virtual void NotifyResourcesStatusChanged() MOZ_OVERRIDE
+  {
+    if (mManager->mActiveCallback) {
+      mManager->mActiveCallback->NotifyResourcesStatusChanged();
+    }
+  }
+  virtual void ReleaseMediaResources() MOZ_OVERRIDE
+  {
+    if (mManager->mActiveCallback) {
+      mManager->mActiveCallback->ReleaseMediaResources();
+    }
+  }
+
+  SharedDecoderManager* mManager;
+};
+
+SharedDecoderManager::SharedDecoderManager()
+  : mActiveProxy(nullptr)
+  , mActiveCallback(nullptr)
+  , mWaitForInternalDrain(false)
+  , mMonitor("SharedDecoderProxy")
+{
+  mCallback = new SharedDecoderCallback(this);
+}
+
+SharedDecoderManager::~SharedDecoderManager() {}
+
+already_AddRefed<MediaDataDecoder>
+SharedDecoderManager::CreateVideoDecoder(
+  const mp4_demuxer::VideoDecoderConfig& aConfig,
+  layers::LayersBackend aLayersBackend, layers::ImageContainer* aImageContainer,
+  MediaTaskQueue* aVideoTaskQueue, MediaDataDecoderCallback* aCallback)
+{
+  if (!mDecoder) {
+    nsAutoPtr<PlatformDecoderModule> platform(PlatformDecoderModule::Create());
+    mDecoder = platform->CreateVideoDecoder(
+      aConfig, aLayersBackend, aImageContainer, aVideoTaskQueue, mCallback);
+    if (!mDecoder) {
+      return nullptr;
+    }
+    nsresult rv = mDecoder->Init();
+    NS_ENSURE_SUCCESS(rv, nullptr);
+  }
+
+  nsRefPtr<SharedDecoderProxy> proxy(new SharedDecoderProxy(this, aCallback));
+  return proxy.forget();
+}
+
+void
+SharedDecoderManager::Select(SharedDecoderProxy* aProxy)
+{
+  if (mActiveProxy == aProxy) {
+    return;
+  }
+  SetIdle(mActiveProxy);
+
+  mActiveProxy = aProxy;
+  mActiveCallback = aProxy->mCallback;
+}
+
+void
+SharedDecoderManager::SetIdle(MediaDataDecoder* aProxy)
+{
+  if (aProxy && mActiveProxy == aProxy) {
+    mWaitForInternalDrain = true;
+    mActiveProxy->Drain();
+    MonitorAutoLock mon(mMonitor);
+    while (mWaitForInternalDrain) {
+      mon.Wait();
+    }
+    mActiveProxy->Flush();
+    mActiveProxy = nullptr;
+  }
+}
+
+void
+SharedDecoderManager::DrainComplete()
+{
+  if (mWaitForInternalDrain) {
+    MonitorAutoLock mon(mMonitor);
+    mWaitForInternalDrain = false;
+    mon.NotifyAll();
+  } else {
+    mActiveCallback->DrainComplete();
+  }
+}
+
+SharedDecoderProxy::SharedDecoderProxy(
+  SharedDecoderManager* aManager, MediaDataDecoderCallback* aCallback)
+  : mManager(aManager), mCallback(aCallback)
+{
+}
+
+SharedDecoderProxy::~SharedDecoderProxy() { Shutdown(); }
+
+nsresult
+SharedDecoderProxy::Init()
+{
+  return NS_OK;
+}
+
+nsresult
+SharedDecoderProxy::Input(mp4_demuxer::MP4Sample* aSample)
+{
+  if (mManager->mActiveProxy != this) {
+    mManager->Select(this);
+  }
+  return mManager->mDecoder->Input(aSample);
+  return NS_OK;
+}
+
+nsresult
+SharedDecoderProxy::Flush()
+{
+  if (mManager->mActiveProxy == this) {
+    return mManager->mDecoder->Flush();
+  }
+  return NS_OK;
+}
+
+nsresult
+SharedDecoderProxy::Drain()
+{
+  if (mManager->mActiveProxy == this) {
+    return mManager->mDecoder->Drain();
+  }
+  return NS_OK;
+}
+
+nsresult
+SharedDecoderProxy::Shutdown()
+{
+  mManager->SetIdle(this);
+  return NS_OK;
+}
+
+bool
+SharedDecoderProxy::IsWaitingMediaResources()
+{
+  if (mManager->mActiveProxy == this) {
+    return mManager->mDecoder->IsWaitingMediaResources();
+  }
+  return mManager->mActiveProxy != nullptr;
+}
+
+bool
+SharedDecoderProxy::IsDormantNeeded()
+{
+  return mManager->mDecoder->IsDormantNeeded();
+}
+
+void
+SharedDecoderProxy::ReleaseMediaResources()
+{
+  if (mManager->mActiveProxy == this) {
+    mManager->mDecoder->ReleaseMediaResources();
+  }
+}
+
+void
+SharedDecoderProxy::ReleaseDecoder()
+{
+  if (mManager->mActiveProxy == this) {
+    mManager->mDecoder->ReleaseMediaResources();
+  }
+}
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/SharedDecoderManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/SharedDecoderManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/SharedDecoderManager.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/SharedDecoderManager.h	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef SHARED_DECODER_MANAGER_H_
+#define SHARED_DECODER_MANAGER_H_
+
+#include "PlatformDecoderModule.h"
+#include "mozilla/Monitor.h"
+
+namespace mozilla
+{
+
+class MediaDataDecoder;
+class SharedDecoderProxy;
+class SharedDecoderCallback;
+
+class SharedDecoderManager
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SharedDecoderManager)
+
+  SharedDecoderManager();
+
+  already_AddRefed<MediaDataDecoder> CreateVideoDecoder(
+    const mp4_demuxer::VideoDecoderConfig& aConfig,
+    layers::LayersBackend aLayersBackend,
+    layers::ImageContainer* aImageContainer, MediaTaskQueue* aVideoTaskQueue,
+    MediaDataDecoderCallback* aCallback);
+
+  void SetReader(MediaDecoderReader* aReader);
+  void Select(SharedDecoderProxy* aProxy);
+  void SetIdle(MediaDataDecoder* aProxy);
+
+  friend class SharedDecoderProxy;
+  friend class SharedDecoderCallback;
+
+private:
+  virtual ~SharedDecoderManager();
+  void DrainComplete();
+
+  nsRefPtr<MediaDataDecoder> mDecoder;
+  SharedDecoderProxy* mActiveProxy;
+  MediaDataDecoderCallback* mActiveCallback;
+  nsAutoPtr<MediaDataDecoderCallback> mCallback;
+  bool mWaitForInternalDrain;
+  Monitor mMonitor;
+};
+
+class SharedDecoderProxy : public MediaDataDecoder
+{
+public:
+  SharedDecoderProxy(SharedDecoderManager* aManager,
+                     MediaDataDecoderCallback* aCallback);
+  virtual ~SharedDecoderProxy();
+
+  virtual nsresult Init() MOZ_OVERRIDE;
+  virtual nsresult Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE;
+  virtual nsresult Flush() MOZ_OVERRIDE;
+  virtual nsresult Drain() MOZ_OVERRIDE;
+  virtual nsresult Shutdown() MOZ_OVERRIDE;
+  virtual bool IsWaitingMediaResources() MOZ_OVERRIDE;
+  virtual bool IsDormantNeeded() MOZ_OVERRIDE;
+  virtual void ReleaseMediaResources() MOZ_OVERRIDE;
+  virtual void ReleaseDecoder() MOZ_OVERRIDE;
+
+  friend class SharedDecoderManager;
+
+private:
+  nsRefPtr<SharedDecoderManager> mManager;
+  MediaDataDecoderCallback* mCallback;
+};
+}
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -192,7 +192,7 @@
 
 HRESULT
 WMFAudioMFTManager::Output(int64_t aStreamOffset,
-                           nsAutoPtr<MediaData>& aOutData)
+                           nsRefPtr<MediaData>& aOutData)
 {
   aOutData = nullptr;
   RefPtr<IMFSample> sample;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFAudioMFTManager.h	2014-11-26 21:46:01.000000000 +0000
@@ -28,7 +28,7 @@
   // presumably they're the preroll samples, and we strip them. We may return
   // a null aOutput in this case.
   virtual HRESULT Output(int64_t aStreamOffset,
-                         nsAutoPtr<MediaData>& aOutput) MOZ_OVERRIDE;
+                         nsRefPtr<MediaData>& aOutput) MOZ_OVERRIDE;
 
   virtual void Shutdown() MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -59,16 +59,15 @@
 {
   DebugOnly<HRESULT> hr = wmf::MFShutdown();
   NS_ASSERTION(SUCCEEDED(hr), "MFShutdown failed");
-
   return NS_OK;
 }
 
 already_AddRefed<MediaDataDecoder>
-WMFDecoderModule::CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                                    layers::LayersBackend aLayersBackend,
-                                    layers::ImageContainer* aImageContainer,
-                                    MediaTaskQueue* aVideoTaskQueue,
-                                    MediaDataDecoderCallback* aCallback)
+WMFDecoderModule::CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                                     layers::LayersBackend aLayersBackend,
+                                     layers::ImageContainer* aImageContainer,
+                                     MediaTaskQueue* aVideoTaskQueue,
+                                     MediaDataDecoderCallback* aCallback)
 {
   nsRefPtr<MediaDataDecoder> decoder =
     new WMFMediaDataDecoder(new WMFVideoMFTManager(aConfig,
@@ -93,6 +92,15 @@
 }
 
 bool
+WMFDecoderModule::SupportsVideoMimeType(const char* aMimeType)
+{
+  return !strcmp(aMimeType, "video/mp4") ||
+         !strcmp(aMimeType, "video/avc") ||
+         !strcmp(aMimeType, "video/webm; codecs=vp8") ||
+         !strcmp(aMimeType, "video/webm; codecs=vp9");
+}
+
+bool
 WMFDecoderModule::SupportsAudioMimeType(const char* aMimeType)
 {
   return !strcmp(aMimeType, "audio/mp4a-latm") ||
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFDecoderModule.h	2014-11-26 21:46:01.000000000 +0000
@@ -23,17 +23,18 @@
   virtual nsresult Shutdown() MOZ_OVERRIDE;
 
   virtual already_AddRefed<MediaDataDecoder>
-  CreateH264Decoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
-                    layers::LayersBackend aLayersBackend,
-                    layers::ImageContainer* aImageContainer,
-                    MediaTaskQueue* aVideoTaskQueue,
-                    MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
+  CreateVideoDecoder(const mp4_demuxer::VideoDecoderConfig& aConfig,
+                     layers::LayersBackend aLayersBackend,
+                     layers::ImageContainer* aImageContainer,
+                     MediaTaskQueue* aVideoTaskQueue,
+                     MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
 
   virtual already_AddRefed<MediaDataDecoder>
   CreateAudioDecoder(const mp4_demuxer::AudioDecoderConfig& aConfig,
                      MediaTaskQueue* aAudioTaskQueue,
                      MediaDataDecoderCallback* aCallback) MOZ_OVERRIDE;
 
+  bool SupportsVideoMimeType(const char* aMimeType) MOZ_OVERRIDE;
   bool SupportsAudioMimeType(const char* aMimeType) MOZ_OVERRIDE;
 
   // Called on main thread.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -90,11 +90,11 @@
 void
 WMFMediaDataDecoder::ProcessOutput()
 {
-  nsAutoPtr<MediaData> output;
+  nsRefPtr<MediaData> output;
   HRESULT hr = S_OK;
   while (SUCCEEDED(hr = mMFTManager->Output(mLastStreamOffset, output)) &&
          output) {
-    mCallback->Output(output.forget());
+    mCallback->Output(output);
   }
   if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
     if (mTaskQueue->IsEmpty()) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFMediaDataDecoder.h	2014-11-26 21:46:01.000000000 +0000
@@ -42,7 +42,7 @@
   // than MF_E_TRANSFORM_NEED_MORE_INPUT, an error will be reported to the
   // MP4Reader.
   virtual HRESULT Output(int64_t aStreamOffset,
-                         nsAutoPtr<MediaData>& aOutput) = 0;
+                         nsRefPtr<MediaData>& aOutput) = 0;
 
   // Destroys all resources.
   virtual void Shutdown() = 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -30,6 +30,38 @@
 using mozilla::layers::LayerManager;
 using mozilla::layers::LayersBackend;
 
+const GUID MFVideoFormat_VP80 =
+{
+  0x30385056,
+  0x0000,
+  0x0010,
+  {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
+};
+
+const GUID MFVideoFormat_VP90 =
+{
+  0x30395056,
+  0x0000,
+  0x0010,
+  {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
+};
+
+const CLSID CLSID_WebmMfVp8Dec =
+{
+  0x451e3cb7,
+  0x2622,
+  0x4ba5,
+  {0x8e, 0x1d, 0x44, 0xb3, 0xc4, 0x1d, 0x09, 0x24}
+};
+
+const CLSID CLSID_WebmMfVp9Dec =
+{
+  0x7ab4bd2,
+  0x1979,
+  0x4fcd,
+  {0xa6, 0x97, 0xdf, 0x9a, 0xd1, 0x5b, 0x34, 0xfe}
+};
+
 namespace mozilla {
 
 WMFVideoMFTManager::WMFVideoMFTManager(
@@ -40,7 +72,6 @@
   : mVideoStride(0)
   , mVideoWidth(0)
   , mVideoHeight(0)
-  , mConfig(aConfig)
   , mImageContainer(aImageContainer)
   , mDXVAEnabled(aDXVAEnabled)
   , mLayersBackend(aLayersBackend)
@@ -49,6 +80,18 @@
   NS_ASSERTION(!NS_IsMainThread(), "Should not be on main thread.");
   MOZ_ASSERT(mImageContainer);
   MOZ_COUNT_CTOR(WMFVideoMFTManager);
+
+  // Need additional checks/params to check vp8/vp9
+  if (!strcmp(aConfig.mime_type, "video/mp4") ||
+      !strcmp(aConfig.mime_type, "video/avc")) {
+    mStreamType = H264;
+  } else if (!strcmp(aConfig.mime_type, "video/webm; codecs=vp8")) {
+    mStreamType = VP8;
+  } else if (!strcmp(aConfig.mime_type, "video/webm; codecs=vp9")) {
+    mStreamType = VP9;
+  } else {
+    mStreamType = Unknown;
+  }
 }
 
 WMFVideoMFTManager::~WMFVideoMFTManager()
@@ -58,6 +101,30 @@
   DeleteOnMainThread(mDXVA2Manager);
 }
 
+const GUID&
+WMFVideoMFTManager::GetMFTGUID()
+{
+  MOZ_ASSERT(mStreamType != Unknown);
+  switch (mStreamType) {
+    case H264: return CLSID_CMSH264DecoderMFT;
+    case VP8: return CLSID_WebmMfVp8Dec;
+    case VP9: return CLSID_WebmMfVp9Dec;
+    default: return GUID_NULL;
+  };
+}
+
+const GUID&
+WMFVideoMFTManager::GetMediaSubtypeGUID()
+{
+  MOZ_ASSERT(mStreamType != Unknown);
+  switch (mStreamType) {
+    case H264: return MFVideoFormat_H264;
+    case VP8: return MFVideoFormat_VP80;
+    case VP9: return MFVideoFormat_VP90;
+    default: return GUID_NULL;
+  };
+}
+
 class CreateDXVAManagerEvent : public nsRunnable {
 public:
   NS_IMETHOD Run() {
@@ -96,7 +163,7 @@
 
   RefPtr<MFTDecoder> decoder(new MFTDecoder());
 
-  HRESULT hr = decoder->Create(CLSID_CMSH264DecoderMFT);
+  HRESULT hr = decoder->Create(GetMFTGUID());
   NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
 
   if (useDxva) {
@@ -127,7 +194,7 @@
   hr = type->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video);
   NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
 
-  hr = type->SetGUID(MF_MT_SUBTYPE, MFVideoFormat_H264);
+  hr = type->SetGUID(MF_MT_SUBTYPE, GetMediaSubtypeGUID());
   NS_ENSURE_TRUE(SUCCEEDED(hr), nullptr);
 
   hr = type->SetUINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_MixedInterlaceOrProgressive);
@@ -146,8 +213,10 @@
 HRESULT
 WMFVideoMFTManager::Input(mp4_demuxer::MP4Sample* aSample)
 {
-  // We must prepare samples in AVC Annex B.
-  mp4_demuxer::AnnexB::ConvertSample(aSample, mConfig.annex_b);
+  if (mStreamType != VP8 && mStreamType != VP9) {
+    // We must prepare samples in AVC Annex B.
+    mp4_demuxer::AnnexB::ConvertSample(aSample);
+  }
   // Forward sample data to the decoder.
   const uint8_t* data = reinterpret_cast<const uint8_t*>(aSample->data);
   uint32_t length = aSample->size;
@@ -290,23 +359,22 @@
 
   Microseconds pts = GetSampleTime(aSample);
   Microseconds duration = GetSampleDuration(aSample);
-  VideoData *v = VideoData::Create(mVideoInfo,
-                                   mImageContainer,
-                                   aStreamOffset,
-                                   pts,
-                                   duration,
-                                   b,
-                                   false,
-                                   -1,
-                                   ToIntRect(mPictureRegion));
+  nsRefPtr<VideoData> v = VideoData::Create(mVideoInfo,
+                                            mImageContainer,
+                                            aStreamOffset,
+                                            pts,
+                                            duration,
+                                            b,
+                                            false,
+                                            -1,
+                                            ToIntRect(mPictureRegion));
   if (twoDBuffer) {
     twoDBuffer->Unlock2D();
   } else {
     buffer->Unlock();
   }
 
-  *aOutVideoData = v;
-
+  v.forget(aOutVideoData);
   return S_OK;
 }
 
@@ -333,18 +401,18 @@
 
   Microseconds pts = GetSampleTime(aSample);
   Microseconds duration = GetSampleDuration(aSample);
-  VideoData *v = VideoData::CreateFromImage(mVideoInfo,
-                                            mImageContainer,
-                                            aStreamOffset,
-                                            pts,
-                                            duration,
-                                            image.forget(),
-                                            false,
-                                            -1,
-                                            ToIntRect(mPictureRegion));
+  nsRefPtr<VideoData> v = VideoData::CreateFromImage(mVideoInfo,
+                                                     mImageContainer,
+                                                     aStreamOffset,
+                                                     pts,
+                                                     duration,
+                                                     image.forget(),
+                                                     false,
+                                                     -1,
+                                                     ToIntRect(mPictureRegion));
 
   NS_ENSURE_TRUE(v, E_FAIL);
-  *aOutVideoData = v;
+  v.forget(aOutVideoData);
 
   return S_OK;
 }
@@ -352,7 +420,7 @@
 // Blocks until decoded sample is produced by the deoder.
 HRESULT
 WMFVideoMFTManager::Output(int64_t aStreamOffset,
-                           nsAutoPtr<MediaData>& aOutData)
+                           nsRefPtr<MediaData>& aOutData)
 {
   RefPtr<IMFSample> sample;
   HRESULT hr;
@@ -383,11 +451,11 @@
     return E_FAIL;
   }
 
-  VideoData* frame = nullptr;
+  nsRefPtr<VideoData> frame;
   if (mUseHwAccel) {
-    hr = CreateD3DVideoFrame(sample, aStreamOffset, &frame);
+    hr = CreateD3DVideoFrame(sample, aStreamOffset, getter_AddRefs(frame));
   } else {
-    hr = CreateBasicVideoFrame(sample, aStreamOffset, &frame);
+    hr = CreateBasicVideoFrame(sample, aStreamOffset, getter_AddRefs(frame));
   }
   // Frame should be non null only when we succeeded.
   MOZ_ASSERT((frame != nullptr) == SUCCEEDED(hr));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.h	2014-11-26 21:46:01.000000000 +0000
@@ -31,7 +31,7 @@
   virtual HRESULT Input(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE;
 
   virtual HRESULT Output(int64_t aStreamOffset,
-                         nsAutoPtr<MediaData>& aOutput) MOZ_OVERRIDE;
+                         nsRefPtr<MediaData>& aOutput) MOZ_OVERRIDE;
 
   virtual void Shutdown() MOZ_OVERRIDE;
 
@@ -56,8 +56,6 @@
   uint32_t mVideoHeight;
   nsIntRect mPictureRegion;
 
-  const mp4_demuxer::VideoDecoderConfig& mConfig;
-
   RefPtr<MFTDecoder> mDecoder;
   RefPtr<layers::ImageContainer> mImageContainer;
   nsAutoPtr<DXVA2Manager> mDXVA2Manager;
@@ -67,6 +65,18 @@
   const bool mDXVAEnabled;
   const layers::LayersBackend mLayersBackend;
   bool mUseHwAccel;
+
+  enum StreamType {
+    Unknown,
+    H264,
+    VP8,
+    VP9
+  };
+
+  StreamType mStreamType;
+
+  const GUID& GetMFTGUID();
+  const GUID& GetMediaSubtypeGUID();
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-audio-codec.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-audio-codec.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-audio-codec.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-audio-codec.h	2014-11-26 21:46:01.000000000 +0000
@@ -37,7 +37,7 @@
   // AAC AudioSpecificConfig.
   // These are null/0 if not externally negotiated
   const uint8_t* mExtraData;
-  size_t         mExtraDataLen;
+  uint32_t       mExtraDataLen;
 };
 
 #endif // GMP_AUDIO_CODEC_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-decryption.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-decryption.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-decryption.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-decryption.h	2014-11-26 21:46:01.000000000 +0000
@@ -39,6 +39,8 @@
   virtual const uint16_t* ClearBytes() const = 0;
 
   virtual const uint32_t* CipherBytes() const = 0;
+
+  virtual ~GMPEncryptedBufferMetadata() {}
 };
 
 class GMPBuffer {
@@ -177,27 +179,20 @@
 
   // Returns decrypted buffer to Gecko, or reports failure.
   virtual void Decrypted(GMPBuffer* aBuffer, GMPErr aResult) = 0;
+
+  virtual ~GMPDecryptorCallback() {}
 };
 
 // Host interface, passed to GetAPIFunc(), with "decrypt".
 class GMPDecryptorHost {
 public:
-
-  // Returns an origin specific string uniquely identifying the device.
-  // The node id contains a random component, and is consistent between
-  // plugin instantiations, unless the user clears it.
-  // Different origins have different node ids.
-  // The node id pointer returned here remains valid for the until shutdown
-  // begins.
-  // *aOutNodeId is null terminated.
-  virtual void GetNodeId(const char** aOutNodeId,
-                         uint32_t* aOutNodeIdLength) = 0;
-
   virtual void GetSandboxVoucher(const uint8_t** aVoucher,
-                                 uint8_t* aVoucherLength) = 0;
+                                 uint32_t* aVoucherLength) = 0;
 
   virtual void GetPluginVoucher(const uint8_t** aVoucher,
-                                uint8_t* aVoucherLength) = 0;
+                                uint32_t* aVoucherLength) = 0;
+
+  virtual ~GMPDecryptorHost() {}
 };
 
 enum GMPSessionType {
@@ -276,6 +271,7 @@
   // Do not call the GMPDecryptorCallback's functions after this is called.
   virtual void DecryptingComplete() = 0;
 
+  virtual ~GMPDecryptor() {}
 };
 
 #endif // GMP_DECRYPTION_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-entrypoints.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-entrypoints.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-entrypoints.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-entrypoints.h	2014-11-26 21:46:01.000000000 +0000
@@ -63,4 +63,10 @@
 // - Called on main thread.
 typedef void   (*GMPShutdownFunc)(void);
 
+// GMPSetNodeId
+// - Optional, not required to be implemented. Only useful for EME plugins.
+// - Called after GMPInit to set the device-bound origin-specific node id
+//   that this GMP instance is running under.
+typedef void   (*GMPSetNodeIdFunc)(const char* aNodeId, uint32_t aLength);
+
 #endif // GMP_ENTRYPOINTS_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-errors.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-errors.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-errors.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-errors.h	2014-11-26 21:46:01.000000000 +0000
@@ -45,6 +45,8 @@
   GMPEncodeErr = 8,
   GMPNoKeyErr = 9,
   GMPCryptoErr = 10,
+  GMPEndOfEnumeration = 11,
+  GMPInvalidArgErr = 12,
   GMPLastErr // Placeholder, must be last. This enum's values must remain consecutive!
 } GMPErr;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-platform.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-platform.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-platform.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-platform.h	2014-11-26 21:46:01.000000000 +0000
@@ -82,6 +82,22 @@
 typedef GMPErr (*GMPSetTimerOnMainThreadPtr)(GMPTask* aTask, int64_t aTimeoutMS);
 typedef GMPErr (*GMPGetCurrentTimePtr)(GMPTimestamp* aOutTime);
 
+typedef void (*RecvGMPRecordIteratorPtr)(GMPRecordIterator* aRecordIterator,
+                                         void* aUserArg,
+                                         GMPErr aStatus);
+
+// Creates a GMPCreateRecordIterator to enumerate the records in storage.
+// When the iterator is ready, the function at aRecvIteratorFunc
+// is called with the GMPRecordIterator as an argument. If the operation
+// fails, RecvGMPRecordIteratorPtr is called with a failure aStatus code.
+// The list that the iterator is covering is fixed when
+// GMPCreateRecordIterator is called, it is *not* updated when changes are
+// made to storage.
+// Iterator begins pointing at first record.
+// aUserArg is passed to the aRecvIteratorFunc upon completion.
+typedef GMPErr (*GMPCreateRecordIteratorPtr)(RecvGMPRecordIteratorPtr aRecvIteratorFunc,
+                                             void* aUserArg);
+
 struct GMPPlatformAPI {
   // Increment the version when things change. Can only add to the struct,
   // do not change what already exists. Pointers to functions may be NULL
@@ -96,6 +112,7 @@
   GMPCreateRecordPtr createrecord;
   GMPSetTimerOnMainThreadPtr settimer;
   GMPGetCurrentTimePtr getcurrenttime;
+  GMPCreateRecordIteratorPtr getrecordenumerator;
 };
 
 #endif // GMP_PLATFORM_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-storage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-storage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/gmp-api/gmp-storage.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/gmp-api/gmp-storage.h	2014-11-26 21:46:01.000000000 +0000
@@ -110,4 +110,31 @@
   virtual ~GMPRecordClient() {}
 };
 
+// Iterates over the records that are available. Note: this list maintains
+// a snapshot of the records that were present when the iterator was created.
+// Create by calling the GMPCreateRecordIteratorPtr function on the
+// GMPPlatformAPI struct.
+// Iteration is in alphabetical order.
+class GMPRecordIterator {
+public:
+  // Retrieve the name for the current record.
+  // Returns GMPNoErr if successful, or GMPEndOfEnumeration if iteration has
+  // reached the end.
+  virtual GMPErr GetName(const char ** aOutName, uint32_t * aOutNameLength) = 0;
+
+  // Advance iteration to the next record.
+  // Returns GMPNoErr if successful, or GMPEndOfEnumeration if iteration has
+  // reached the end.
+  virtual GMPErr NextRecord() = 0;
+
+  // Signals to the GMP host that the GMP is finished with the
+  // GMPRecordIterator. GMPs must call this to release memory held by
+  // the GMPRecordIterator. Do not access the GMPRecordIterator pointer
+  // after calling this!
+  // Memory retrieved by GetName is *not* valid after calling Close()!
+  virtual void Close() = 0;
+
+  virtual ~GMPRecordIterator() {}
+};
+
 #endif // GMP_STORAGE_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPChild.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPChild.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPChild.h"
+#include "GMPProcessChild.h"
+#include "GMPLoader.h"
 #include "GMPVideoDecoderChild.h"
 #include "GMPVideoEncoderChild.h"
 #include "GMPAudioDecoderChild.h"
@@ -17,38 +19,28 @@
 #include "GMPPlatform.h"
 #include "mozilla/dom/CrashReporterChild.h"
 #ifdef XP_WIN
-#include <fstream>
 #include "nsCRT.h"
 #endif
+#include <fstream>
 
 using mozilla::dom::CrashReporterChild;
 
+static const int MAX_PLUGIN_VOUCHER_LENGTH = 500000;
+
 #ifdef XP_WIN
 #include <stdlib.h> // for _exit()
 #else
 #include <unistd.h> // for _exit()
 #endif
 
+#if defined(MOZ_GMP_SANDBOX)
 #if defined(XP_WIN)
-// In order to provide EME plugins with a "device binding" capability,
-// in the parent we generate and store some random bytes as salt for every
-// (origin, urlBarOrigin) pair that uses EME. We store these bytes so
-// that every time we revisit the same origin we get the same salt.
-// We send this salt to the child on startup. The child collects some
-// device specific data and munges that with the salt to create the
-// "node id" that we expose to EME plugins. It then overwrites the device
-// specific data, and activates the sandbox.
-#define HASH_NODE_ID_WITH_DEVICE_ID 1
-#include "rlz/lib/machine_id.h"
-#include "rlz/lib/string_utils.h"
-#include "mozilla/SHA1.h"
-#endif
-
-#if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxTarget.h"
-#elif defined (MOZ_GMP_SANDBOX)
-#if defined(XP_LINUX) || defined(XP_MACOSX)
+#elif defined (XP_LINUX)
+#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
+#elif defined(XP_MACOSX)
 #include "mozilla/Sandbox.h"
 #endif
 #endif
@@ -58,9 +50,8 @@
 
 GMPChild::GMPChild()
   : mAsyncShutdown(nullptr)
-  , mLib(nullptr)
-  , mGetAPIFunc(nullptr)
   , mGMPMessageLoop(MessageLoop::current())
+  , mGMPLoader(nullptr)
 {
   nsDebugImpl::SetMultiprocessMode("GMP");
 }
@@ -283,53 +274,20 @@
 bool
 GMPChild::RecvSetNodeId(const nsCString& aNodeId)
 {
-#ifdef HASH_NODE_ID_WITH_DEVICE_ID
-  if (!aNodeId.IsEmpty() && !aNodeId.EqualsLiteral("null")) {
-    string16 deviceId;
-    int volumeId;
-    if (!rlz_lib::GetRawMachineId(&deviceId, &volumeId)) {
-      return false;
-    }
-
-    // TODO: Switch to SHA256.
-    mozilla::SHA1Sum hash;
-    hash.update(deviceId.c_str(), deviceId.size() * sizeof(string16::value_type));
-    hash.update(aNodeId.get(), aNodeId.Length());
-    hash.update(&volumeId, sizeof(int));
-    uint8_t digest[mozilla::SHA1Sum::kHashSize];
-    hash.finish(digest);
-    if (!rlz_lib::BytesToString(digest, mozilla::SHA1Sum::kHashSize, &mNodeId)) {
-      return false;
-    }
-
-    // Overwrite device id as it could potentially identify the user, so
-    // there's no chance a GMP can read it and use it for identity tracking.
-    volumeId = 0;
-    memset(&deviceId.front(), '*', sizeof(string16::value_type) * deviceId.size());
-    deviceId = L"";
-  } else {
-    mNodeId = "null";
-  }
-#else
+  // Store the per origin salt for the node id. Note: we do this in a
+  // separate message than RecvStartPlugin() so that the string is not
+  // sitting in a string on the IPC code's call stack.
   mNodeId = std::string(aNodeId.BeginReading(), aNodeId.EndReading());
-#endif
   return true;
 }
 
-bool
-GMPChild::RecvStartPlugin()
+GMPErr
+GMPChild::GetAPI(const char* aAPIName, void* aHostAPI, void** aPluginAPI)
 {
-#ifdef XP_WIN
-  PreLoadLibraries(mPluginPath);
-#endif
-
-#if defined(MOZ_SANDBOX) && defined(XP_WIN)
-  mozilla::SandboxTarget::Instance()->StartSandbox();
-#elif defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
-  StartMacSandbox();
-#endif
-
-  return LoadPluginLibrary(mPluginPath);
+  if (!mGMPLoader) {
+    return GMPGenericErr;
+  }
+  return mGMPLoader->GetAPI(aAPIName, aHostAPI, aPluginAPI);
 }
 
 #ifdef XP_WIN
@@ -356,7 +314,11 @@
   infoFile->GetPath(path);
 
   std::ifstream stream;
+#ifdef _MSC_VER
   stream.open(path.get());
+#else
+  stream.open(NS_ConvertUTF16toUTF8(path).get());
+#endif
   if (!stream.good()) {
     NS_WARNING("Failure opening info file for required DLLs");
     return false;
@@ -392,64 +354,82 @@
 }
 #endif
 
+#if defined(MOZ_GMP_SANDBOX)
+
+#if defined(XP_MACOSX)
+class MacOSXSandboxStarter : public SandboxStarter {
+public:
+  MacOSXSandboxStarter(GMPChild* aGMPChild)
+    : mGMPChild(aGMPChild)
+  {}
+  virtual void Start(const char* aLibPath) MOZ_OVERRIDE {
+    mGMPChild->StartMacSandbox();
+  }
+private:
+  GMPChild* mGMPChild;
+};
+#endif
+
+#endif // MOZ_GMP_SANDBOX
+
 bool
-GMPChild::LoadPluginLibrary(const std::string& aPluginPath)
+GMPChild::GetLibPath(nsACString& aOutLibPath)
 {
 #if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
-  nsAutoCString nativePath;
-  nativePath.Assign(mPluginBinaryPath);
-
-  mLib = PR_LoadLibrary(nativePath.get());
+  nsAutoCString pluginDirectoryPath, pluginFilePath;
+  if (!GetPluginPaths(mPluginPath, pluginDirectoryPath, pluginFilePath)) {
+    MOZ_CRASH("Error scanning plugin path");
+  }
+  aOutLibPath.Assign(pluginFilePath);
+  return true;
 #else
   nsCOMPtr<nsIFile> libFile;
-  if (!GetPluginFile(aPluginPath, libFile)) {
+  if (!GetPluginFile(mPluginPath, libFile)) {
     return false;
   }
-#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
-  nsAutoCString nativePath;
-  libFile->GetNativePath(nativePath);
-
-  // Enable sandboxing here -- we know the plugin file's path, but
-  // this process's execution hasn't been affected by its content yet.
-  if (mozilla::MediaPluginSandboxStatus() != mozilla::kSandboxingWouldFail) {
-    mozilla::SetMediaPluginSandbox(nativePath.get());
-  } else {
-    printf_stderr("GMPChild::LoadPluginLibrary: Loading media plugin %s unsandboxed.\n",
-                  nativePath.get());
-  }
-#endif // XP_LINUX && MOZ_GMP_SANDBOX
-
-  libFile->Load(&mLib);
-#endif // XP_MACOSX && MOZ_GMP_SANDBOX
+  return NS_SUCCEEDED(libFile->GetNativePath(aOutLibPath));
+#endif
+}
 
-  if (!mLib) {
-    NS_WARNING("Failed to link Gecko Media Plugin library.");
-    return false;
-  }
+bool
+GMPChild::RecvStartPlugin()
+{
+#if defined(XP_WIN)
+  PreLoadLibraries(mPluginPath);
+#endif
+  PreLoadPluginVoucher(mPluginPath);
 
-  GMPInitFunc initFunc = reinterpret_cast<GMPInitFunc>(PR_FindFunctionSymbol(mLib, "GMPInit"));
-  if (!initFunc) {
-    NS_WARNING("Failed to link Gecko Media Plugin Init function.");
+  nsCString libPath;
+  if (!GetLibPath(libPath)) {
     return false;
   }
 
   auto platformAPI = new GMPPlatformAPI();
   InitPlatformAPI(*platformAPI, this);
 
-  if (initFunc(platformAPI) != GMPNoErr) {
-    NS_WARNING("Gecko Media Plugin failed to initialize.");
+  mGMPLoader = GMPProcessChild::GetGMPLoader();
+  if (!mGMPLoader) {
+    NS_WARNING("Failed to get GMPLoader");
     return false;
   }
 
-  mGetAPIFunc = reinterpret_cast<GMPGetAPIFunc>(PR_FindFunctionSymbol(mLib, "GMPGetAPI"));
-  if (!mGetAPIFunc) {
-    NS_WARNING("Failed to link Gecko Media Plugin GetAPI function.");
+#if defined(MOZ_GMP_SANDBOX) && defined(XP_MACOSX)
+  nsAutoPtr<SandboxStarter> starter(new MacOSXSandboxStarter(this));
+  mGMPLoader->SetStartSandboxStarter(starter);
+#endif
+
+  if (!mGMPLoader->Load(libPath.get(),
+                        libPath.Length(),
+                        &mNodeId[0],
+                        mNodeId.size(),
+                        platformAPI)) {
+    NS_WARNING("Failed to load GMP");
     return false;
   }
 
   void* sh = nullptr;
   GMPAsyncShutdownHost* host = static_cast<GMPAsyncShutdownHost*>(this);
-  GMPErr err = mGetAPIFunc("async-shutdown", host, &sh);
+  GMPErr err = GetAPI("async-shutdown", host, &sh);
   if (err == GMPNoErr && sh) {
     mAsyncShutdown = reinterpret_cast<GMPAsyncShutdown*>(sh);
     SendAsyncShutdownRequired();
@@ -467,13 +447,9 @@
 void
 GMPChild::ActorDestroy(ActorDestroyReason aWhy)
 {
-  if (mLib) {
-    GMPShutdownFunc shutdownFunc = reinterpret_cast<GMPShutdownFunc>(PR_FindFunctionSymbol(mLib, "GMPShutdown"));
-    if (shutdownFunc) {
-      shutdownFunc();
-    }
+  if (mGMPLoader) {
+    mGMPLoader->Shutdown();
   }
-
   if (AbnormalShutdown == aWhy) {
     NS_WARNING("Abnormal shutdown of GMP process!");
     _exit(0);
@@ -547,7 +523,7 @@
 PGMPDecryptorChild*
 GMPChild::AllocPGMPDecryptorChild()
 {
-  GMPDecryptorChild* actor = new GMPDecryptorChild(this, mNodeId);
+  GMPDecryptorChild* actor = new GMPDecryptorChild(this, mPluginVoucher);
   actor->AddRef();
   return actor;
 }
@@ -565,7 +541,7 @@
   auto vdc = static_cast<GMPAudioDecoderChild*>(aActor);
 
   void* vd = nullptr;
-  GMPErr err = mGetAPIFunc("decode-audio", &vdc->Host(), &vd);
+  GMPErr err = GetAPI("decode-audio", &vdc->Host(), &vd);
   if (err != GMPNoErr || !vd) {
     return false;
   }
@@ -594,7 +570,7 @@
   auto vdc = static_cast<GMPVideoDecoderChild*>(aActor);
 
   void* vd = nullptr;
-  GMPErr err = mGetAPIFunc("decode-video", &vdc->Host(), &vd);
+  GMPErr err = GetAPI("decode-video", &vdc->Host(), &vd);
   if (err != GMPNoErr || !vd) {
     NS_WARNING("GMPGetAPI call failed trying to construct decoder.");
     return false;
@@ -611,7 +587,7 @@
   auto vec = static_cast<GMPVideoEncoderChild*>(aActor);
 
   void* ve = nullptr;
-  GMPErr err = mGetAPIFunc("encode-video", &vec->Host(), &ve);
+  GMPErr err = GetAPI("encode-video", &vec->Host(), &ve);
   if (err != GMPNoErr || !ve) {
     NS_WARNING("GMPGetAPI call failed trying to construct encoder.");
     return false;
@@ -629,7 +605,7 @@
   GMPDecryptorHost* host = static_cast<GMPDecryptorHost*>(child);
 
   void* session = nullptr;
-  GMPErr err = mGetAPIFunc("eme-decrypt", host, &session);
+  GMPErr err = GetAPI("eme-decrypt", host, &session);
   if (err != GMPNoErr || !session) {
     return false;
   }
@@ -718,5 +694,56 @@
   SendAsyncShutdownComplete();
 }
 
+static bool
+GetPluginVoucherFile(const std::string& aPluginPath,
+                     nsCOMPtr<nsIFile>& aOutVoucherFile)
+{
+  nsAutoString baseName;
+#if defined(XP_MACOSX)
+  nsCOMPtr<nsIFile> libDir;
+  GetFileBase(aPluginPath, aOutVoucherFile, libDir, baseName);
+#else
+  GetFileBase(aPluginPath, aOutVoucherFile, baseName);
+#endif
+  nsAutoString infoFileName = baseName + NS_LITERAL_STRING(".voucher");
+  aOutVoucherFile->AppendRelativePath(infoFileName);
+  return true;
+}
+
+bool
+GMPChild::PreLoadPluginVoucher(const std::string& aPluginPath)
+{
+  nsCOMPtr<nsIFile> voucherFile;
+  GetPluginVoucherFile(aPluginPath, voucherFile);
+
+  nsString path;
+  voucherFile->GetPath(path);
+
+  std::ifstream stream;
+  stream.open(NS_ConvertUTF16toUTF8(path).get(), std::ios::binary);
+  if (!stream.good()) {
+    return false;
+  }
+
+  std::streampos start = stream.tellg();
+  stream.seekg (0, std::ios::end);
+  std::streampos end = stream.tellg();
+  stream.seekg (0, std::ios::beg);
+  auto length = end - start;
+  if (length > MAX_PLUGIN_VOUCHER_LENGTH) {
+    NS_WARNING("Plugin voucher file too big!");
+    return false;
+  }
+
+  mPluginVoucher.SetLength(length);
+  stream.read((char*)mPluginVoucher.Elements(), length);
+  if (!stream) {
+    NS_WARNING("Failed to read plugin voucher file!");
+    return false;
+  }
+
+  return true;
+}
+
 } // namespace gmp
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPChild.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPChild.h	2014-11-26 21:46:01.000000000 +0000
@@ -10,6 +10,7 @@
 #include "GMPSharedMemManager.h"
 #include "GMPTimerChild.h"
 #include "GMPStorageChild.h"
+#include "GMPLoader.h"
 #include "gmp-async-shutdown.h"
 #include "gmp-entrypoints.h"
 #include "prlink.h"
@@ -29,7 +30,6 @@
             base::ProcessHandle aParentProcessHandle,
             MessageLoop* aIOLoop,
             IPC::Channel* aChannel);
-  bool LoadPluginLibrary(const std::string& aPluginPath);
 #ifdef XP_WIN
   bool PreLoadLibraries(const std::string& aPluginPath);
 #endif
@@ -45,12 +45,16 @@
   // GMPAsyncShutdownHost
   void ShutdownComplete() MOZ_OVERRIDE;
 
-private:
-
 #if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
   void StartMacSandbox();
 #endif
 
+private:
+
+  bool PreLoadPluginVoucher(const std::string& aPluginPath);
+
+  bool GetLibPath(nsACString& aOutLibPath);
+
   virtual bool RecvSetNodeId(const nsCString& aNodeId) MOZ_OVERRIDE;
   virtual bool RecvStartPlugin() MOZ_OVERRIDE;
 
@@ -85,18 +89,20 @@
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
   virtual void ProcessingError(Result aWhat) MOZ_OVERRIDE;
 
+  GMPErr GetAPI(const char* aAPIName, void* aHostAPI, void** aPluginAPI);
+
   GMPAsyncShutdown* mAsyncShutdown;
   nsRefPtr<GMPTimerChild> mTimerChild;
   nsRefPtr<GMPStorageChild> mStorage;
 
-  PRLibrary* mLib;
-  GMPGetAPIFunc mGetAPIFunc;
   MessageLoop* mGMPMessageLoop;
   std::string mPluginPath;
 #if defined(XP_MACOSX) && defined(MOZ_GMP_SANDBOX)
   nsCString mPluginBinaryPath;
 #endif
   std::string mNodeId;
+  GMPLoader* mGMPLoader;
+  nsTArray<uint8_t> mPluginVoucher;
 };
 
 } // namespace gmp
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPDecryptorChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPDecryptorChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPDecryptorChild.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPDecryptorChild.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -26,10 +26,11 @@
 namespace mozilla {
 namespace gmp {
 
-GMPDecryptorChild::GMPDecryptorChild(GMPChild* aPlugin, const std::string& aNodeId)
+GMPDecryptorChild::GMPDecryptorChild(GMPChild* aPlugin,
+                                     const nsTArray<uint8_t>& aPluginVoucher)
   : mSession(nullptr)
   , mPlugin(aPlugin)
-  , mNodeId(aNodeId)
+  , mPluginVoucher(aPluginVoucher)
 {
   MOZ_ASSERT(mPlugin);
 }
@@ -174,17 +175,12 @@
 }
 
 void
-GMPDecryptorChild::GetNodeId(const char** aOutNodeId,
-                             uint32_t* aOutNodeIdLength)
-{
-  *aOutNodeId = mNodeId.c_str();
-  *aOutNodeIdLength = mNodeId.size();
-}
-
-void
 GMPDecryptorChild::GetSandboxVoucher(const uint8_t** aVoucher,
-                                     uint8_t* aVoucherLength)
+                                     uint32_t* aVoucherLength)
 {
+  if (!aVoucher || !aVoucherLength) {
+    return;
+  }
   const char* voucher = "placeholder_sandbox_voucher.";
   *aVoucher = (uint8_t*)voucher;
   *aVoucherLength = strlen(voucher);
@@ -192,11 +188,13 @@
 
 void
 GMPDecryptorChild::GetPluginVoucher(const uint8_t** aVoucher,
-                                    uint8_t* aVoucherLength)
+                                    uint32_t* aVoucherLength)
 {
-  const char* voucher = "placeholder_plugin_voucher.";
-  *aVoucher = (uint8_t*)voucher;
-  *aVoucherLength = strlen(voucher);
+  if (!aVoucher || !aVoucherLength) {
+    return;
+  }
+  *aVoucher = mPluginVoucher.Elements();
+  *aVoucherLength = mPluginVoucher.Length();
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPDecryptorChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPDecryptorChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPDecryptorChild.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPDecryptorChild.h	2014-11-26 21:46:01.000000000 +0000
@@ -24,7 +24,8 @@
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GMPDecryptorChild);
 
-  explicit GMPDecryptorChild(GMPChild* aPlugin, const std::string& aNodeId);
+  explicit GMPDecryptorChild(GMPChild* aPlugin,
+                             const nsTArray<uint8_t>& aPluginVoucher);
 
   void Init(GMPDecryptor* aSession);
 
@@ -77,14 +78,11 @@
   virtual void Decrypted(GMPBuffer* aBuffer, GMPErr aResult) MOZ_OVERRIDE;
 
   // GMPDecryptorHost
-  virtual void GetNodeId(const char** aOutNodeId,
-                         uint32_t* aOutNodeIdLength) MOZ_OVERRIDE;
-
   virtual void GetSandboxVoucher(const uint8_t** aVoucher,
-                                 uint8_t* aVoucherLength) MOZ_OVERRIDE;
+                                 uint32_t* aVoucherLength) MOZ_OVERRIDE;
 
   virtual void GetPluginVoucher(const uint8_t** aVoucher,
-                                uint8_t* aVoucherLength) MOZ_OVERRIDE;
+                                uint32_t* aVoucherLength) MOZ_OVERRIDE;
 private:
   ~GMPDecryptorChild();
 
@@ -124,7 +122,8 @@
   GMPDecryptor* mSession;
   GMPChild* mPlugin;
 
-  const std::string mNodeId;
+  // Reference to the voucher owned by the GMPChild.
+  const nsTArray<uint8_t>& mPluginVoucher;
 };
 
 } // namespace gmp
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPLoader.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPLoader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: sw=4 ts=4 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/. */
+
+#include "GMPLoader.h"
+#include <stdio.h>
+#include "mozilla/Attributes.h"
+#include "mozilla/NullPtr.h"
+#include "gmp-entrypoints.h"
+#include "prlink.h"
+
+#include <string>
+
+#if defined(XP_WIN) && defined(MOZ_SANDBOX)
+#include "mozilla/sandboxTarget.h"
+#include "windows.h"
+#include <intrin.h>
+#include <assert.h>
+#endif
+
+#if defined(HASH_NODE_ID_WITH_DEVICE_ID)
+// In order to provide EME plugins with a "device binding" capability,
+// in the parent we generate and store some random bytes as salt for every
+// (origin, urlBarOrigin) pair that uses EME. We store these bytes so
+// that every time we revisit the same origin we get the same salt.
+// We send this salt to the child on startup. The child collects some
+// device specific data and munges that with the salt to create the
+// "node id" that we expose to EME plugins. It then overwrites the device
+// specific data, and activates the sandbox.
+#include "rlz/lib/machine_id.h"
+#include "rlz/lib/string_utils.h"
+#include "sha256.h"
+#endif
+
+namespace mozilla {
+namespace gmp {
+
+class GMPLoaderImpl : public GMPLoader {
+public:
+  explicit GMPLoaderImpl(SandboxStarter* aStarter)
+    : mSandboxStarter(aStarter)
+  {}
+  virtual ~GMPLoaderImpl() {}
+
+  virtual bool Load(const char* aLibPath,
+                    uint32_t aLibPathLen,
+                    char* aOriginSalt,
+                    uint32_t aOriginSaltLen,
+                    const GMPPlatformAPI* aPlatformAPI) MOZ_OVERRIDE;
+
+  virtual GMPErr GetAPI(const char* aAPIName,
+                        void* aHostAPI,
+                        void** aPluginAPI) MOZ_OVERRIDE;
+
+  virtual void Shutdown() MOZ_OVERRIDE;
+
+#ifdef SANDBOX_NOT_STATICALLY_LINKED_INTO_PLUGIN_CONTAINER
+  virtual void SetStartSandboxStarter(SandboxStarter* aStarter) MOZ_OVERRIDE {
+    mSandboxStarter = aStarter;
+  }
+#endif
+
+private:
+  PRLibrary* mLib;
+  GMPGetAPIFunc mGetAPIFunc;
+  SandboxStarter* mSandboxStarter;
+};
+
+GMPLoader* CreateGMPLoader(SandboxStarter* aStarter) {
+  return static_cast<GMPLoader*>(new GMPLoaderImpl(aStarter));
+}
+
+#if defined(XP_WIN) && defined(HASH_NODE_ID_WITH_DEVICE_ID)
+MOZ_NEVER_INLINE
+static bool
+GetStackAfterCurrentFrame(uint8_t** aOutTop, uint8_t** aOutBottom)
+{
+  // "Top" of the free space on the stack is directly after the memory
+  // holding our return address.
+  uint8_t* top = (uint8_t*)_AddressOfReturnAddress();
+
+  // Look down the stack until we find the guard page...
+  MEMORY_BASIC_INFORMATION memInfo = {0};
+  uint8_t* bottom = top;
+  while (1) {
+    if (!VirtualQuery(bottom, &memInfo, sizeof(memInfo))) {
+      return false;
+    }
+    if ((memInfo.Protect & PAGE_GUARD) == PAGE_GUARD) {
+      bottom = (uint8_t*)memInfo.BaseAddress + memInfo.RegionSize;
+#ifdef DEBUG
+      if (!VirtualQuery(bottom, &memInfo, sizeof(memInfo))) {
+        return false;
+      }
+      assert(!(memInfo.Protect & PAGE_GUARD)); // Should have found boundary.
+#endif
+      break;
+    } else if (memInfo.State != MEM_COMMIT ||
+               (memInfo.AllocationProtect & PAGE_READWRITE) != PAGE_READWRITE) {
+      return false;
+    }
+    bottom = (uint8_t*)memInfo.BaseAddress - 1;
+  }
+  *aOutTop = top;
+  *aOutBottom = bottom;
+  return true;
+}
+#endif
+
+bool
+GMPLoaderImpl::Load(const char* aLibPath,
+                    uint32_t aLibPathLen,
+                    char* aOriginSalt,
+                    uint32_t aOriginSaltLen,
+                    const GMPPlatformAPI* aPlatformAPI)
+{
+  std::string nodeId;
+#ifdef HASH_NODE_ID_WITH_DEVICE_ID
+  if (aOriginSaltLen > 0) {
+    string16 deviceId;
+    int volumeId;
+    if (!rlz_lib::GetRawMachineId(&deviceId, &volumeId)) {
+      return false;
+    }
+
+    SHA256Context ctx;
+    SHA256_Begin(&ctx);
+    SHA256_Update(&ctx, (const uint8_t*)aOriginSalt, aOriginSaltLen);
+    SHA256_Update(&ctx, (const uint8_t*)deviceId.c_str(), deviceId.size() * sizeof(string16::value_type));
+    SHA256_Update(&ctx, (const uint8_t*)&volumeId, sizeof(int));
+    uint8_t digest[SHA256_LENGTH] = {0};
+    unsigned int digestLen = 0;
+    SHA256_End(&ctx, digest, &digestLen, SHA256_LENGTH);
+
+    // Overwrite all data involved in calculation as it could potentially
+    // identify the user, so there's no chance a GMP can read it and use
+    // it for identity tracking.
+    memset(&ctx, 0, sizeof(ctx));
+    memset(aOriginSalt, 0, aOriginSaltLen);
+    volumeId = 0;
+    memset(&deviceId[0], '*', sizeof(string16::value_type) * deviceId.size());
+    deviceId = L"";
+
+    if (!rlz_lib::BytesToString(digest, SHA256_LENGTH, &nodeId)) {
+      return false;
+    }
+    // We've successfully bound the origin salt to node id.
+    // rlz_lib::GetRawMachineId and/or the system functions it
+    // called could have left user identifiable data on the stack,
+    // so carefully zero the stack down to the guard page.
+    uint8_t* top;
+    uint8_t* bottom;
+    if (!GetStackAfterCurrentFrame(&top, &bottom)) {
+      return false;
+    }
+    assert(top >= bottom);
+    SecureZeroMemory(bottom, (top - bottom));
+  } else
+#endif
+  {
+    nodeId = std::string(aOriginSalt, aOriginSalt + aOriginSaltLen);
+  }
+
+#if defined(MOZ_GMP_SANDBOX)
+  // Start the sandbox now that we've generated the device bound node id.
+  // This must happen after the node id is bound to the device id, as
+  // generating the device id requires privileges.
+  if (mSandboxStarter) {
+    mSandboxStarter->Start(aLibPath);
+  }
+#endif
+
+  // Load the GMP.
+  PRLibSpec libSpec;
+  libSpec.value.pathname = aLibPath;
+  libSpec.type = PR_LibSpec_Pathname;
+  mLib = PR_LoadLibraryWithFlags(libSpec, 0);
+  if (!mLib) {
+    return false;
+  }
+
+  GMPInitFunc initFunc = reinterpret_cast<GMPInitFunc>(PR_FindFunctionSymbol(mLib, "GMPInit"));
+  if (!initFunc) {
+    return false;
+  }
+
+  if (initFunc(aPlatformAPI) != GMPNoErr) {
+    return false;
+  }
+
+  GMPSetNodeIdFunc setNodeIdFunc = reinterpret_cast<GMPSetNodeIdFunc>(PR_FindFunctionSymbol(mLib, "GMPSetNodeId"));
+  if (setNodeIdFunc) {
+    setNodeIdFunc(nodeId.c_str(), nodeId.size());
+  }
+
+  mGetAPIFunc = reinterpret_cast<GMPGetAPIFunc>(PR_FindFunctionSymbol(mLib, "GMPGetAPI"));
+  if (!mGetAPIFunc) {
+    return false;
+  }
+
+  return true;
+}
+
+GMPErr
+GMPLoaderImpl::GetAPI(const char* aAPIName,
+                      void* aHostAPI,
+                      void** aPluginAPI)
+{
+  return mGetAPIFunc ? mGetAPIFunc(aAPIName, aHostAPI, aPluginAPI)
+                     : GMPGenericErr;
+}
+
+void
+GMPLoaderImpl::Shutdown()
+{
+  if (mLib) {
+    GMPShutdownFunc shutdownFunc = reinterpret_cast<GMPShutdownFunc>(PR_FindFunctionSymbol(mLib, "GMPShutdown"));
+    if (shutdownFunc) {
+      shutdownFunc();
+    }
+    PR_UnloadLibrary(mLib);
+    mLib = nullptr;
+  }
+}
+
+} // namespace gmp
+} // namespace mozilla
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPLoader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPLoader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPLoader.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPLoader.h	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: sw=4 ts=4 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 GMP_LOADER_H__
+#define GMP_LOADER_H__
+
+#include <stdint.h>
+#include "gmp-entrypoints.h"
+
+namespace mozilla {
+namespace gmp {
+
+class SandboxStarter {
+public:
+  virtual ~SandboxStarter() {}
+  virtual void Start(const char* aLibPath) = 0;
+};
+
+#if defined(XP_MACOSX)
+#define SANDBOX_NOT_STATICALLY_LINKED_INTO_PLUGIN_CONTAINER 1
+#endif
+
+// Encapsulates generating the device-bound node id, activating the sandbox,
+// loading the GMP, and passing the node id to the GMP (in that order).
+//
+// In Desktop Gecko, the implementation of this lives in plugin-container,
+// and is passed into XUL code from on startup. The GMP IPC child protocol actor
+// uses this interface to load and retrieve interfaces from the GMPs.
+//
+// In Desktop Gecko the implementation lives in the plugin-container so that
+// it can be covered by DRM vendor's voucher.
+//
+// On Android the GMPLoader implementation lives in libxul (because for the time
+// being GMPLoader relies upon NSPR, which we can't use in plugin-container
+// on Android).
+//
+// There is exactly one GMPLoader per GMP child process, and only one GMP
+// per child process (so the GMPLoader only loads one GMP).
+class GMPLoader {
+public:
+  virtual ~GMPLoader() {}
+
+  // Calculates the device-bound node id, then activates the sandbox,
+  // then loads the GMP library and (if applicable) passes the bound node id
+  // to the GMP.
+  virtual bool Load(const char* aLibPath,
+                    uint32_t aLibPathLen,
+                    char* aOriginSalt,
+                    uint32_t aOriginSaltLen,
+                    const GMPPlatformAPI* aPlatformAPI) = 0;
+
+  // Retrieves an interface pointer from the GMP.
+  virtual GMPErr GetAPI(const char* aAPIName, void* aHostAPI, void** aPluginAPI) = 0;
+
+  // Calls the GMPShutdown function exported by the GMP lib, and unloads the
+  // plugin library.
+  virtual void Shutdown() = 0;
+
+#ifdef SANDBOX_NOT_STATICALLY_LINKED_INTO_PLUGIN_CONTAINER
+  // Encapsulates starting the sandbox on Linux and MacOSX.
+  // TODO: Remove this, and put sandbox in plugin-container on all platforms.
+  virtual void SetStartSandboxStarter(SandboxStarter* aStarter) = 0;
+#endif
+};
+
+// On Desktop, this function resides in plugin-container.
+// On Mobile, this function resides in XUL.
+GMPLoader* CreateGMPLoader(SandboxStarter* aStarter);
+
+} // namespace gmp
+} // namespace mozilla
+
+#endif // GMP_LOADER_H__
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPParent.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPParent.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -19,7 +19,7 @@
 #include "GMPTimerParent.h"
 #include "runnable_utils.h"
 #if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
-#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
 #endif
 
 #include "mozilla/dom/CrashReporterParent.h"
@@ -963,7 +963,7 @@
 
 #if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
     if (cap->mAPIName.EqualsLiteral("eme-decrypt") &&
-        mozilla::MediaPluginSandboxStatus() == mozilla::kSandboxingWouldFail) {
+        !mozilla::SandboxInfo::Get().CanSandboxMedia()) {
       printf_stderr("GMPParent::ReadGMPMetaData: Plugin \"%s\" is an EME CDM"
                     " but this system can't sandbox it; not loading.\n",
                     mDisplayName.get());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPPlatform.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPPlatform.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPPlatform.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPPlatform.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -158,8 +158,10 @@
              GMPRecord** aOutRecord,
              GMPRecordClient* aClient)
 {
+  MOZ_ASSERT(IsOnChildMainThread());
+
   if (sMainLoop != MessageLoop::current()) {
-    NS_WARNING("GMP called CreateRecord() on non-main thread!");
+    MOZ_ASSERT(false, "GMP called CreateRecord() on non-main thread!");
     return GMPGenericErr;
   }
   if (aRecordNameSize > GMP_MAX_RECORD_NAME_SIZE) {
@@ -194,6 +196,25 @@
   return GMPNoErr;
 }
 
+GMPErr
+CreateRecordIterator(RecvGMPRecordIteratorPtr aRecvIteratorFunc,
+                     void* aUserArg)
+{
+  if (sMainLoop != MessageLoop::current()) {
+    MOZ_ASSERT(false, "GMP called CreateRecord() on non-main thread!");
+    return GMPGenericErr;
+  }
+  if (!aRecvIteratorFunc) {
+    return GMPInvalidArgErr;
+  }
+  GMPStorageChild* storage = sChild->GetGMPStorage();
+  if (!storage) {
+    return GMPGenericErr;
+  }
+  MOZ_ASSERT(storage);
+  return storage->EnumerateRecords(aRecvIteratorFunc, aUserArg);
+}
+
 void
 InitPlatformAPI(GMPPlatformAPI& aPlatformAPI, GMPChild* aChild)
 {
@@ -212,6 +233,7 @@
   aPlatformAPI.createrecord = &CreateRecord;
   aPlatformAPI.settimer = &SetTimerOnMainThread;
   aPlatformAPI.getcurrenttime = &GetClock;
+  aPlatformAPI.getrecordenumerator = &CreateRecordIterator;
 }
 
 GMPThreadImpl::GMPThreadImpl()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPProcessChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPProcessChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPProcessChild.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPProcessChild.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -59,5 +59,21 @@
   BackgroundHangMonitor::Shutdown();
 }
 
+GMPLoader* GMPProcessChild::mLoader = nullptr;
+
+/* static */
+void
+GMPProcessChild::SetGMPLoader(GMPLoader* aLoader)
+{
+  mLoader = aLoader;
+}
+
+/* static */
+GMPLoader*
+GMPProcessChild::GetGMPLoader()
+{
+  return mLoader;
+}
+
 } // namespace gmp
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPProcessChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPProcessChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPProcessChild.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPProcessChild.h	2014-11-26 21:46:01.000000000 +0000
@@ -12,6 +12,8 @@
 namespace mozilla {
 namespace gmp {
 
+class GMPLoader;
+
 class GMPProcessChild MOZ_FINAL : public mozilla::ipc::ProcessChild {
 protected:
   typedef mozilla::ipc::ProcessChild ProcessChild;
@@ -23,9 +25,15 @@
   virtual bool Init() MOZ_OVERRIDE;
   virtual void CleanUp() MOZ_OVERRIDE;
 
+  // Set/get the GMPLoader singleton for this child process.
+  // Note: The GMPLoader is not deleted by this object, the caller of
+  // SetGMPLoader() must manage the GMPLoader's lifecycle.
+  static void SetGMPLoader(GMPLoader* aHost);
+  static GMPLoader* GetGMPLoader();
+
 private:
   GMPChild mPlugin;
-
+  static GMPLoader* mLoader;
   DISALLOW_COPY_AND_ASSIGN(GMPProcessChild);
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPService.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPService.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -25,7 +25,7 @@
 #include "runnable_utils.h"
 #include "VideoUtils.h"
 #if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
-#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
 #endif
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
@@ -479,7 +479,7 @@
                                          GMPDecryptorProxy** aDecryptor)
 {
 #if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
-  if (mozilla::MediaPluginSandboxStatus() == kSandboxingWouldFail) {
+  if (!SandboxInfo::Get().CanSandboxMedia()) {
     NS_WARNING("GeckoMediaPluginService::GetGMPDecryptor: "
                "EME decryption not available without sandboxing support.");
     return NS_ERROR_NOT_AVAILABLE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageChild.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageChild.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -268,6 +268,82 @@
   return true;
 }
 
+GMPErr
+GMPStorageChild::EnumerateRecords(RecvGMPRecordIteratorPtr aRecvIteratorFunc,
+                                  void* aUserArg)
+{
+  if (mPlugin->GMPMessageLoop() != MessageLoop::current()) {
+    MOZ_ASSERT(false, "GMP used GMPStorage on non-main thread.");
+    return GMPGenericErr;
+  }
+  if (mShutdown) {
+    NS_WARNING("GMPStorage used after it's been shutdown!");
+    return GMPClosedErr;
+  }
+  if (!SendGetRecordNames()) {
+    return GMPGenericErr;
+  }
+  MOZ_ASSERT(aRecvIteratorFunc);
+  mPendingRecordIterators.push(RecordIteratorContext(aRecvIteratorFunc, aUserArg));
+  return GMPNoErr;
+}
+
+class GMPRecordIteratorImpl : public GMPRecordIterator {
+public:
+  GMPRecordIteratorImpl(const InfallibleTArray<nsCString>& aRecordNames)
+    : mRecordNames(aRecordNames)
+    , mIndex(0)
+  {
+    mRecordNames.Sort();
+  }
+
+  virtual GMPErr GetName(const char** aOutName, uint32_t* aOutNameLength) MOZ_OVERRIDE {
+    if (!aOutName || !aOutNameLength) {
+      return GMPInvalidArgErr;
+    }
+    if (mIndex == mRecordNames.Length()) {
+      return GMPEndOfEnumeration;
+    }
+    *aOutName = mRecordNames[mIndex].get();
+    *aOutNameLength = mRecordNames[mIndex].Length();
+    return GMPNoErr;
+  }
+
+  virtual GMPErr NextRecord() MOZ_OVERRIDE {
+    if (mIndex < mRecordNames.Length()) {
+      mIndex++;
+    }
+    return (mIndex < mRecordNames.Length()) ? GMPNoErr
+                                            : GMPEndOfEnumeration;
+  }
+
+  virtual void Close() MOZ_OVERRIDE {
+    delete this;
+  }
+
+private:
+  nsTArray<nsCString> mRecordNames;
+  size_t mIndex;
+};
+
+bool
+GMPStorageChild::RecvRecordNames(const InfallibleTArray<nsCString>& aRecordNames,
+                                 const GMPErr& aStatus)
+{
+  if (mShutdown || mPendingRecordIterators.empty()) {
+    return true;
+  }
+  RecordIteratorContext ctx = mPendingRecordIterators.front();
+  mPendingRecordIterators.pop();
+
+  if (GMP_FAILED(aStatus)) {
+    ctx.mFunc(nullptr, ctx.mUserArg, aStatus);
+  } else {
+    ctx.mFunc(new GMPRecordIteratorImpl(aRecordNames), ctx.mUserArg, GMPNoErr);
+  }
+  return true;
+}
+
 bool
 GMPStorageChild::RecvShutdown()
 {
@@ -275,6 +351,9 @@
   // parent. We don't delete any objects here, as that may invalidate
   // GMPRecord pointers held by the GMP.
   mShutdown = true;
+  while (!mPendingRecordIterators.empty()) {
+    mPendingRecordIterators.pop();
+  }
   return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageChild.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageChild.h	2014-11-26 21:46:01.000000000 +0000
@@ -10,6 +10,9 @@
 #include "gmp-storage.h"
 #include "nsTHashtable.h"
 #include "nsRefPtrHashtable.h"
+#include "gmp-platform.h"
+
+#include <queue>
 
 namespace mozilla {
 namespace gmp {
@@ -70,6 +73,9 @@
 
   GMPErr Close(GMPRecordImpl* aRecord);
 
+  GMPErr EnumerateRecords(RecvGMPRecordIteratorPtr aRecvIteratorFunc,
+                          void* aUserArg);
+
 protected:
   ~GMPStorageChild() {}
 
@@ -81,11 +87,25 @@
                                 const InfallibleTArray<uint8_t>& aBytes) MOZ_OVERRIDE;
   virtual bool RecvWriteComplete(const nsCString& aRecordName,
                                  const GMPErr& aStatus) MOZ_OVERRIDE;
+  virtual bool RecvRecordNames(const InfallibleTArray<nsCString>& aRecordNames,
+                               const GMPErr& aStatus) MOZ_OVERRIDE;
   virtual bool RecvShutdown() MOZ_OVERRIDE;
 
 private:
   nsRefPtrHashtable<nsCStringHashKey, GMPRecordImpl> mRecords;
   GMPChild* mPlugin;
+
+  struct RecordIteratorContext {
+    explicit RecordIteratorContext(RecvGMPRecordIteratorPtr aFunc,
+                                   void* aUserArg)
+      : mFunc(aFunc)
+      , mUserArg(aUserArg)
+    {}
+    RecvGMPRecordIteratorPtr mFunc;
+    void* mUserArg;
+  };
+
+  std::queue<RecordIteratorContext> mPendingRecordIterators;
   bool mShutdown;
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageParent.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageParent.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -18,6 +18,8 @@
 #include "mozIGeckoMediaPluginService.h"
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
+#include "mozilla/Base64.h"
+#include "nsISimpleEnumerator.h"
 
 namespace mozilla {
 
@@ -104,9 +106,17 @@
     return rv;
   }
 
-  nsAutoString recordNameHash;
-  recordNameHash.AppendInt(HashString(aRecordName.get()));
-  f->Append(recordNameHash);
+  nsAutoCString recordNameBase64;
+  rv = Base64Encode(aRecordName, recordNameBase64);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  // Base64 can encode to a '/' character, which will mess with file paths,
+  // so we need to replace that here with something that won't mess with paths.
+  recordNameBase64.ReplaceChar('/', '-');
+
+  f->AppendNative(recordNameBase64);
 
   auto mode = PR_RDWR | PR_CREATE_FILE;
   if (aMode == Truncate) {
@@ -193,6 +203,54 @@
     return (bytesWritten == (int32_t)aBytes.Length()) ? GMPNoErr : GMPGenericErr;
   }
 
+  virtual GMPErr GetRecordNames(nsTArray<nsCString>& aOutRecordNames) MOZ_OVERRIDE
+  {
+    nsCOMPtr<nsIFile> storageDir;
+    nsresult rv = GetGMPStorageDir(getter_AddRefs(storageDir), mNodeId);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return GMPGenericErr;
+    }
+
+    nsCOMPtr<nsISimpleEnumerator> iter;
+    rv = storageDir->GetDirectoryEntries(getter_AddRefs(iter));
+    if (NS_FAILED(rv)) {
+      return GMPGenericErr;
+    }
+
+    bool hasMore;
+    while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) {
+      nsCOMPtr<nsISupports> supports;
+      rv = iter->GetNext(getter_AddRefs(supports));
+      if (NS_FAILED(rv)) {
+        continue;
+      }
+      nsCOMPtr<nsIFile> dirEntry(do_QueryInterface(supports, &rv));
+      if (NS_FAILED(rv)) {
+        continue;
+      }
+
+      nsAutoCString leafName;
+      rv = dirEntry->GetNativeLeafName(leafName);
+      if (NS_FAILED(rv)) {
+        continue;
+      }
+
+      // The record's file name is the Base64 encode of the record name,
+      // with '/' characters replaced with '-' characters. Base64 decode
+      // to extract the file name.
+      leafName.ReplaceChar('-', '/');
+      nsAutoCString recordName;
+      rv = Base64Decode(leafName, recordName);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        continue;
+      }
+
+      aOutRecordNames.AppendElement(recordName);
+    }
+
+    return GMPNoErr;
+  }
+
   virtual void Close(const nsCString& aRecordName) MOZ_OVERRIDE
   {
     PRFileDesc* fd = mFiles.Get(aRecordName);
@@ -255,6 +313,12 @@
     return GMPNoErr;
   }
 
+  virtual GMPErr GetRecordNames(nsTArray<nsCString>& aOutRecordNames) MOZ_OVERRIDE
+  {
+    mRecords.EnumerateRead(EnumRecordNames, &aOutRecordNames);
+    return GMPNoErr;
+  }
+
   virtual void Close(const nsCString& aRecordName) MOZ_OVERRIDE
   {
     Record* record = nullptr;
@@ -277,6 +341,16 @@
     bool mIsOpen;
   };
 
+  static PLDHashOperator
+  EnumRecordNames(const nsACString& aKey,
+                  Record* aRecord,
+                  void* aUserArg)
+  {
+    nsTArray<nsCString>* names = reinterpret_cast<nsTArray<nsCString>*>(aUserArg);
+    names->AppendElement(aKey);
+    return PL_DHASH_NEXT;
+  }
+
   nsClassHashtable<nsCStringHashKey, Record> mRecords;
 };
 
@@ -388,6 +462,22 @@
 
   return true;
 }
+
+bool
+GMPStorageParent::RecvGetRecordNames()
+{
+  LOGD(("%s::%s: %p", __CLASS__, __FUNCTION__, this));
+
+  if (mShutdown) {
+    return true;
+  }
+
+  nsTArray<nsCString> recordNames;
+  GMPErr status = mStorage->GetRecordNames(recordNames);
+  unused << SendRecordNames(recordNames, status);
+
+  return true;
+}
 
 bool
 GMPStorageParent::RecvClose(const nsCString& aRecordName)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/GMPStorageParent.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/GMPStorageParent.h	2014-11-26 21:46:01.000000000 +0000
@@ -25,6 +25,7 @@
                       nsTArray<uint8_t>& aOutBytes) = 0;
   virtual GMPErr Write(const nsCString& aRecordName,
                        const nsTArray<uint8_t>& aBytes) = 0;
+  virtual GMPErr GetRecordNames(nsTArray<nsCString>& aOutRecordNames) = 0;
   virtual void Close(const nsCString& aRecordName) = 0;
 };
 
@@ -42,6 +43,7 @@
   virtual bool RecvRead(const nsCString& aRecordName) MOZ_OVERRIDE;
   virtual bool RecvWrite(const nsCString& aRecordName,
                          const InfallibleTArray<uint8_t>& aBytes) MOZ_OVERRIDE;
+  virtual bool RecvGetRecordNames() MOZ_OVERRIDE;
   virtual bool RecvClose(const nsCString& aRecordName) MOZ_OVERRIDE;
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/moz.build	2014-11-26 21:46:01.000000000 +0000
@@ -39,6 +39,7 @@
     'GMPDecryptorParent.h',
     'GMPDecryptorProxy.h',
     'GMPEncryptedBufferDataImpl.h',
+    'GMPLoader.h',
     'GMPMessageUtils.h',
     'GMPParent.h',
     'GMPPlatform.h',
@@ -62,6 +63,13 @@
     'GMPVideoPlaneImpl.h',
 ]
 
+# We link GMPLoader into xul on B2G/Fennec as its code does not need to be
+# covered by a DRM vendor's voucher.
+if CONFIG['OS_TARGET'] == 'Android':
+    SOURCES += [
+      'GMPLoader.cpp',
+    ]
+
 UNIFIED_SOURCES += [
     'GMPAudioDecoderChild.cpp',
     'GMPAudioDecoderParent.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/PGMPStorage.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/PGMPStorage.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/PGMPStorage.ipdl	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/PGMPStorage.ipdl	2014-11-26 21:46:01.000000000 +0000
@@ -19,6 +19,7 @@
   OpenComplete(nsCString aRecordName, GMPErr aStatus);
   ReadComplete(nsCString aRecordName, GMPErr aStatus, uint8_t[] aBytes);
   WriteComplete(nsCString aRecordName, GMPErr aStatus);
+  RecordNames(nsCString[] aRecordNames, GMPErr aStatus);
   Shutdown();
 
 parent:
@@ -26,6 +27,7 @@
   Read(nsCString aRecordName);
   Write(nsCString aRecordName, uint8_t[] aBytes);
   Close(nsCString aRecordName);
+  GetRecordNames();
   __delete__();
 
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/rlz/base/memory/scoped_ptr.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/rlz/base/memory/scoped_ptr.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/rlz/base/memory/scoped_ptr.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/rlz/base/memory/scoped_ptr.h	2014-11-26 21:46:01.000000000 +0000
@@ -18,7 +18,7 @@
   scoped_array(T* t) : nsAutoArrayPtr<T>(t) {}
   void reset(T* t) {
     scoped_array<T> other(t);
-    operator=(other);
+    this->operator=(other);
   }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/rlz/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/rlz/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/rlz/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/rlz/moz.build	2014-11-26 21:46:01.000000000 +0000
@@ -7,14 +7,15 @@
 # Note: build rlz in its own moz.build, so it doesn't pickup any of
 # Chromium IPC's headers used in the moz.build of the parent file.
 
+Library('rlz')
+FORCE_STATIC_LIB = True
+USE_STATIC_LIBS = True
+
 UNIFIED_SOURCES += [
     'lib/string_utils.cc',
     'win/lib/machine_id_win.cc',
 ]
 
-FINAL_LIBRARY = 'xul'
-FAIL_ON_WARNINGS = True
-
 LOCAL_INCLUDES += [
     '..',
 ]
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/rlz/win/lib/machine_id_win.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/rlz/win/lib/machine_id_win.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp/rlz/win/lib/machine_id_win.cc	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp/rlz/win/lib/machine_id_win.cc	2014-11-26 21:46:01.000000000 +0000
@@ -3,7 +3,7 @@
 // found in the COPYING file.
 
 #include <windows.h>
-#include <Sddl.h>  // For ConvertSidToStringSidW.
+#include <sddl.h>  // For ConvertSidToStringSidW.
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/fake.voucher thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/fake.voucher
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/fake.voucher	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/fake.voucher	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1 @@
+gmp-fake placeholder voucher
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-fake.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-fake.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-fake.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-fake.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -402,7 +402,7 @@
       *aPluginApi = new FakeVideoEncoder (static_cast<GMPVideoHost*> (aHostAPI));
       return GMPNoErr;
     } else if (!strcmp (aApiName, "eme-decrypt")) {
-      *aPluginApi = new FakeDecryptor();
+      *aPluginApi = new FakeDecryptor(static_cast<GMPDecryptorHost*> (aHostAPI));
       return GMPNoErr;
     } else if (!strcmp (aApiName, "async-shutdown")) {
       *aPluginApi = new TestAsyncShutdown(static_cast<GMPAsyncShutdownHost*> (aHostAPI));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -34,8 +34,9 @@
   }
 }
 
-FakeDecryptor::FakeDecryptor()
+FakeDecryptor::FakeDecryptor(GMPDecryptorHost* aHost)
   : mCallback(nullptr)
+  , mHost(aHost)
 {
   MOZ_ASSERT(!sInstance);
   sInstance = this;
@@ -284,6 +285,45 @@
   string mRecordId;
 };
 
+static void
+RecvGMPRecordIterator(GMPRecordIterator* aRecordIterator,
+                      void* aUserArg,
+                      GMPErr aStatus)
+{
+  FakeDecryptor* decryptor = reinterpret_cast<FakeDecryptor*>(aUserArg);
+  decryptor->ProcessRecordNames(aRecordIterator, aStatus);
+}
+
+void
+FakeDecryptor::ProcessRecordNames(GMPRecordIterator* aRecordIterator,
+                                  GMPErr aStatus)
+{
+  if (sInstance != this) {
+    FakeDecryptor::Message("Error aUserArg was not passed through GetRecordIterator");
+    return;
+  }
+  if (GMP_FAILED(aStatus)) {
+    FakeDecryptor::Message("Error GetRecordIterator failed");
+    return;
+  }
+  std::string response("record-names ");
+  bool first = true;
+  const char* name = nullptr;
+  uint32_t len = 0;
+  while (GMP_SUCCEEDED(aRecordIterator->GetName(&name, &len))) {
+    std::string s(name, name+len);
+    if (!first) {
+      response += ",";
+    } else {
+      first = false;
+    }
+    response += s;
+    aRecordIterator->NextRecord();
+  }
+  aRecordIterator->Close();
+  FakeDecryptor::Message(response);
+}
+
 enum ShutdownMode {
   ShutdownNormal,
   ShutdownTimeout,
@@ -328,6 +368,14 @@
     ReadRecord("shutdown-token", new ReportReadRecordContinuation("shutdown-token"));
   } else if (task == "test-op-apis") {
     mozilla::gmptest::TestOuputProtectionAPIs();
+  } else if (task == "retrieve-plugin-voucher") {
+    const uint8_t* rawVoucher = nullptr;
+    uint32_t length = 0;
+    mHost->GetPluginVoucher(&rawVoucher, &length);
+    std::string voucher((const char*)rawVoucher, (const char*)(rawVoucher + length));
+    Message("retrieved plugin-voucher: " + voucher);
+  } else if (task == "retrieve-record-names") {
+    GMPEnumRecordNames(&RecvGMPRecordIterator, this);
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-decryptor.h	2014-11-26 21:46:01.000000000 +0000
@@ -14,7 +14,7 @@
 class FakeDecryptor : public GMPDecryptor {
 public:
 
-  FakeDecryptor();
+  FakeDecryptor(GMPDecryptorHost* aHost);
 
   virtual void Init(GMPDecryptorCallback* aCallback) MOZ_OVERRIDE {
     mCallback = aCallback;
@@ -68,6 +68,9 @@
 
   static void Message(const std::string& aMessage);
 
+  void ProcessRecordNames(GMPRecordIterator* aRecordIterator,
+                          GMPErr aStatus);
+
 private:
 
   virtual ~FakeDecryptor() {}
@@ -76,6 +79,7 @@
   void TestStorage();
 
   GMPDecryptorCallback* mCallback;
+  GMPDecryptorHost* mHost;
 };
 
 class TestAsyncShutdown : public GMPAsyncShutdown {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-storage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-storage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-storage.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-storage.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -193,3 +193,10 @@
   }
   return client->Init(record, aContinuation);
 }
+
+GMPErr
+GMPEnumRecordNames(RecvGMPRecordIteratorPtr aRecvIteratorFunc,
+                   void* aUserArg)
+{
+  return g_platform_api->getrecordenumerator(aRecvIteratorFunc, aUserArg);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-storage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-storage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/gmp-test-storage.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/gmp-test-storage.h	2014-11-26 21:46:01.000000000 +0000
@@ -52,6 +52,10 @@
 
 GMPErr
 GMPOpenRecord(const std::string& aRecordName,
-           OpenContinuation* aContinuation);
+              OpenContinuation* aContinuation);
+
+GMPErr
+GMPEnumRecordNames(RecvGMPRecordIteratorPtr aRecvIteratorFunc,
+                   void* aUserArg);
 
 #endif // TEST_GMP_STORAGE_H__
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/Makefile.in	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/Makefile.in	2014-11-26 21:46:01.000000000 +0000
@@ -7,6 +7,7 @@
 FAKE_GMP_PLUGIN_DEST = $(DEPTH)/dist/bin/gmp-fake/1.0
 FAKE_GMP_PLUGIN_FILES = \
   $(SHARED_LIBRARY) \
-  $(srcdir)/fake.info
+  $(srcdir)/fake.info \
+  $(srcdir)/fake.voucher
 
 include $(topsrcdir)/config/rules.mk
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gmp-plugin/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gmp-plugin/moz.build	2014-11-26 21:46:01.000000000 +0000
@@ -22,3 +22,5 @@
 NO_VISIBILITY_FLAGS = True
 # Don't use STL wrappers; this isn't Gecko code
 DISABLE_STL_WRAPPING = True
+
+FAIL_ON_WARNINGS = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gstreamer/GStreamerReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gstreamer/GStreamerReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gstreamer/GStreamerReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gstreamer/GStreamerReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -775,11 +775,11 @@
   }
 
   int64_t offset = mDecoder->GetResource()->Tell(); // Estimate location in media.
-  VideoData* video = VideoData::CreateFromImage(mInfo.mVideo,
-                                                mDecoder->GetImageContainer(),
-                                                offset, timestamp, duration,
-                                                static_cast<Image*>(image.get()),
-                                                isKeyframe, -1, mPicture);
+  nsRefPtr<VideoData> video = VideoData::CreateFromImage(mInfo.mVideo,
+                                                         mDecoder->GetImageContainer(),
+                                                         offset, timestamp, duration,
+                                                         static_cast<Image*>(image.get()),
+                                                         isKeyframe, -1, mPicture);
   mVideoQueue.Push(video);
 
   gst_buffer_unref(buffer);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestGMPCrossOrigin.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -571,6 +571,76 @@
   }
 #endif
 
+  void TestPluginVoucher() {
+    CreateDecryptor(NS_LITERAL_STRING("example17.com"),
+                    NS_LITERAL_STRING("example18.com"),
+                    false);
+    Expect(NS_LITERAL_CSTRING("retrieved plugin-voucher: gmp-fake placeholder voucher"),
+           NS_NewRunnableMethod(this, &GMPStorageTest::SetFinished));
+    Update(NS_LITERAL_CSTRING("retrieve-plugin-voucher"));
+  }
+
+  void TestGetRecordNamesInMemoryStorage() {
+    TestGetRecordNames(true);
+  }
+
+  nsCString mRecordNames;
+
+  void AppendIntPadded(nsACString& aString, uint32_t aInt) {
+    if (aInt > 0 && aInt < 10) {
+      aString.AppendLiteral("0");
+    }
+    aString.AppendInt(aInt);
+  }
+
+  void TestGetRecordNames(bool aPrivateBrowsing) {
+    CreateDecryptor(NS_LITERAL_STRING("foo.com"),
+                    NS_LITERAL_STRING("bar.com"),
+                    aPrivateBrowsing);
+
+    // Create a number of records of different names.
+    const uint32_t num = 100;
+    for (uint32_t i = 0; i < num; i++) {
+      nsAutoCString response;
+      response.AppendLiteral("stored data");
+      AppendIntPadded(response, i);
+      response.AppendLiteral(" test-data");
+      AppendIntPadded(response, i);
+
+      if (i != 0) {
+        mRecordNames.AppendLiteral(",");
+      }
+      mRecordNames.AppendLiteral("data");
+      AppendIntPadded(mRecordNames, i);
+
+      nsAutoCString update;
+      update.AppendLiteral("store data");
+      AppendIntPadded(update, i);
+      update.AppendLiteral(" test-data");
+      AppendIntPadded(update, i);
+
+      nsIRunnable* continuation = nullptr;
+      if (i + 1 == num) {
+        continuation =
+          NS_NewRunnableMethod(this, &GMPStorageTest::TestGetRecordNames_QueryNames);
+      }
+      Expect(response, continuation);
+      Update(update);
+    }
+  }
+
+  void TestGetRecordNames_QueryNames() {
+    nsCString response("record-names ");
+    response.Append(mRecordNames);
+    Expect(response,
+           NS_NewRunnableMethod(this, &GMPStorageTest::SetFinished));
+    Update(NS_LITERAL_CSTRING("retrieve-record-names"));
+  }
+
+  void GetRecordNamesPersistentStorage() {
+    TestGetRecordNames(false);
+  }
+
   void Expect(const nsCString& aMessage, nsIRunnable* aContinuation) {
     mExpected.AppendElement(ExpectedMessage(aMessage, aContinuation));
   }
@@ -726,6 +796,11 @@
   runner->DoTest(&GMPStorageTest::TestAsyncShutdownStorage);
 }
 
+TEST(GeckoMediaPlugins, GMPPluginVoucher) {
+  nsRefPtr<GMPStorageTest> runner = new GMPStorageTest();
+  runner->DoTest(&GMPStorageTest::TestPluginVoucher);
+}
+
 #if defined(XP_WIN)
 TEST(GeckoMediaPlugins, GMPOutputProtection) {
   // Output Protection is not available pre-Vista.
@@ -737,3 +812,13 @@
   runner->DoTest(&GMPStorageTest::TestOutputProtection);
 }
 #endif
+
+TEST(GeckoMediaPlugins, GMPStorageGetRecordNamesInMemoryStorage) {
+  nsRefPtr<GMPStorageTest> runner = new GMPStorageTest();
+  runner->DoTest(&GMPStorageTest::TestGetRecordNamesInMemoryStorage);
+}
+
+TEST(GeckoMediaPlugins, GMPStorageGetRecordNamesPersistentStorage) {
+  nsRefPtr<GMPStorageTest> runner = new GMPStorageTest();
+  runner->DoTest(&GMPStorageTest::GetRecordNamesPersistentStorage);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestMP4Reader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestMP4Reader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestMP4Reader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestMP4Reader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -36,6 +36,8 @@
     decoder->SetResource(resource);
 
     reader->Init(nullptr);
+    reader->SetTaskQueue(
+      new MediaTaskQueue(SharedThreadPool::Get(NS_LITERAL_CSTRING("TestMP4Reader"))));
     {
       // This needs to be done before invoking GetBuffered. This is normally
       // done by MediaDecoderStateMachine.
@@ -55,6 +57,10 @@
 private:
   virtual ~TestBinding()
   {
+    reader->GetTaskQueue()->Dispatch(NS_NewRunnableMethod(reader,
+                                                          &MP4Reader::Shutdown));
+    reader->GetTaskQueue()->Shutdown();
+
     decoder = nullptr;
     resource = nullptr;
     reader = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestVideoSegment.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestVideoSegment.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestVideoSegment.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestVideoSegment.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -19,7 +19,7 @@
 
   VideoSegment segment;
   segment.AppendFrame(testImage.forget(),
-                      mozilla::TrackTicks(90000),
+                      mozilla::StreamTime(90000),
                       mozilla::gfx::IntSize(640, 480),
                       true);
 
@@ -37,7 +37,7 @@
 
   VideoSegment segment;
   segment.AppendFrame(testImage.forget(),
-                      mozilla::TrackTicks(90000),
+                      mozilla::StreamTime(90000),
                       mozilla::gfx::IntSize(640, 480));
 
   VideoSegment::ChunkIterator iter(segment);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestVideoTrackEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestVideoTrackEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestVideoTrackEncoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestVideoTrackEncoder.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -268,11 +268,11 @@
   for (nsTArray<nsRefPtr<Image>>::size_type i = 0; i < images.Length(); i++)
   {
     nsRefPtr<Image> image = images[i];
-    segment.AppendFrame(image.forget(), mozilla::TrackTicks(90000), generator.GetSize());
+    segment.AppendFrame(image.forget(), mozilla::StreamTime(90000), generator.GetSize());
   }
 
   // track change notification.
-  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, 0, 0, segment);
+  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, 0, segment);
 
   // Pull Encoded Data back from encoder.
   EncodedFrameContainer container;
@@ -290,7 +290,7 @@
 
   // track end notification.
   VideoSegment segment;
-  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, 0, MediaStreamListener::TRACK_EVENT_ENDED, segment);
+  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, MediaStreamListener::TRACK_EVENT_ENDED, segment);
 
   // Pull Encoded Data back from encoder. Since we have sent
   // EOS to encoder, encoder.GetEncodedTrack should return
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestVorbisTrackEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestVorbisTrackEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/gtest/TestVorbisTrackEncoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/gtest/TestVorbisTrackEncoder.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -189,7 +189,7 @@
   segment.AppendFrames(samples.forget(), channelData, 44100);
 
   // Track change notification.
-  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, 0, 0, segment);
+  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, 0, segment);
 
   // Pull Encoded data back from encoder and verify encoded samples.
   EncodedFrameContainer container;
@@ -216,7 +216,7 @@
 
   // Track end notification.
   AudioSegment segment;
-  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0, 0,
+  encoder.NotifyQueuedTrackChanges(nullptr, 0, 0,
                                    MediaStreamListener::TRACK_EVENT_ENDED,
                                    segment);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/imagecapture/CaptureTask.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/imagecapture/CaptureTask.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/imagecapture/CaptureTask.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/imagecapture/CaptureTask.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -84,8 +84,7 @@
 
 void
 CaptureTask::NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                      TrackRate aTrackRate,
-                                      TrackTicks aTrackOffset,
+                                      StreamTime aTrackOffset,
                                       uint32_t aTrackEvents,
                                       const MediaSegment& aQueuedMedia)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/imagecapture/CaptureTask.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/imagecapture/CaptureTask.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/imagecapture/CaptureTask.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/imagecapture/CaptureTask.h	2014-11-26 21:46:01.000000000 +0000
@@ -33,8 +33,7 @@
 public:
   // MediaStreamListener methods.
   virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                        TrackRate aTrackRate,
-                                        TrackTicks aTrackOffset,
+                                        StreamTime aTrackOffset,
                                         uint32_t aTrackEvents,
                                         const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaCache.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaCache.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaCache.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaCache.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -1669,6 +1669,7 @@
       std::min<int64_t>((aOldOffset + BLOCK_SIZE - 1)/BLOCK_SIZE,
              aStream->mBlocks.Length());
     while (blockIndex < endIndex) {
+      MOZ_ASSERT(endIndex > 0);
       int32_t cacheBlockIndex = aStream->mBlocks[endIndex - 1];
       if (cacheBlockIndex >= 0) {
         BlockOwner* bo = GetBlockOwner(cacheBlockIndex, aStream);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaData.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaData.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaData.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaData.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -88,7 +88,6 @@
     mDuplicate(true),
     mKeyframe(false)
 {
-  MOZ_COUNT_CTOR(VideoData);
   NS_ASSERTION(mDuration >= 0, "Frame must have non-negative duration.");
 }
 
@@ -104,13 +103,11 @@
     mDuplicate(false),
     mKeyframe(aKeyframe)
 {
-  MOZ_COUNT_CTOR(VideoData);
   NS_ASSERTION(mDuration >= 0, "Frame must have non-negative duration.");
 }
 
 VideoData::~VideoData()
 {
-  MOZ_COUNT_DTOR(VideoData);
 }
 
 size_t
@@ -130,48 +127,51 @@
 }
 
 /* static */
-VideoData* VideoData::ShallowCopyUpdateDuration(VideoData* aOther,
-                                                int64_t aDuration)
-{
-  VideoData* v = new VideoData(aOther->mOffset,
-                               aOther->mTime,
-                               aDuration,
-                               aOther->mKeyframe,
-                               aOther->mTimecode,
-                               aOther->mDisplay);
+already_AddRefed<VideoData>
+VideoData::ShallowCopyUpdateDuration(VideoData* aOther,
+                                     int64_t aDuration)
+{
+  nsRefPtr<VideoData> v = new VideoData(aOther->mOffset,
+                                        aOther->mTime,
+                                        aDuration,
+                                        aOther->mKeyframe,
+                                        aOther->mTimecode,
+                                        aOther->mDisplay);
   v->mImage = aOther->mImage;
-  return v;
+  return v.forget();
 }
 
 /* static */
-VideoData* VideoData::ShallowCopyUpdateTimestamp(VideoData* aOther,
-                                                 int64_t aTimestamp)
+already_AddRefed<VideoData>
+VideoData::ShallowCopyUpdateTimestamp(VideoData* aOther,
+                                      int64_t aTimestamp)
 {
   NS_ENSURE_TRUE(aOther, nullptr);
-  VideoData* v = new VideoData(aOther->mOffset,
-                               aTimestamp,
-                               aOther->GetEndTime() - aTimestamp,
-                               aOther->mKeyframe,
-                               aOther->mTimecode,
-                               aOther->mDisplay);
+  nsRefPtr<VideoData> v = new VideoData(aOther->mOffset,
+                                        aTimestamp,
+                                        aOther->GetEndTime() - aTimestamp,
+                                        aOther->mKeyframe,
+                                        aOther->mTimecode,
+                                        aOther->mDisplay);
   v->mImage = aOther->mImage;
-  return v;
+  return v.forget();
 }
 
 /* static */
-VideoData* VideoData::ShallowCopyUpdateTimestampAndDuration(VideoData* aOther,
-                                                            int64_t aTimestamp,
-                                                            int64_t aDuration)
+already_AddRefed<VideoData>
+VideoData::ShallowCopyUpdateTimestampAndDuration(VideoData* aOther,
+                                                 int64_t aTimestamp,
+                                                 int64_t aDuration)
 {
   NS_ENSURE_TRUE(aOther, nullptr);
-  VideoData* v = new VideoData(aOther->mOffset,
-                               aTimestamp,
-                               aDuration,
-                               aOther->mKeyframe,
-                               aOther->mTimecode,
-                               aOther->mDisplay);
+  nsRefPtr<VideoData> v = new VideoData(aOther->mOffset,
+                                        aTimestamp,
+                                        aDuration,
+                                        aOther->mKeyframe,
+                                        aOther->mTimecode,
+                                        aOther->mDisplay);
   v->mImage = aOther->mImage;
-  return v;
+  return v.forget();
 }
 
 /* static */
@@ -213,26 +213,27 @@
 }
 
 /* static */
-VideoData* VideoData::Create(VideoInfo& aInfo,
-                             ImageContainer* aContainer,
-                             Image* aImage,
-                             int64_t aOffset,
-                             int64_t aTime,
-                             int64_t aDuration,
-                             const YCbCrBuffer& aBuffer,
-                             bool aKeyframe,
-                             int64_t aTimecode,
-                             const IntRect& aPicture)
+already_AddRefed<VideoData>
+VideoData::Create(VideoInfo& aInfo,
+                  ImageContainer* aContainer,
+                  Image* aImage,
+                  int64_t aOffset,
+                  int64_t aTime,
+                  int64_t aDuration,
+                  const YCbCrBuffer& aBuffer,
+                  bool aKeyframe,
+                  int64_t aTimecode,
+                  const IntRect& aPicture)
 {
   if (!aImage && !aContainer) {
     // Create a dummy VideoData with no image. This gives us something to
     // send to media streams if necessary.
-    nsAutoPtr<VideoData> v(new VideoData(aOffset,
-                                         aTime,
-                                         aDuration,
-                                         aKeyframe,
-                                         aTimecode,
-                                         aInfo.mDisplay.ToIntSize()));
+    nsRefPtr<VideoData> v(new VideoData(aOffset,
+                                        aTime,
+                                        aDuration,
+                                        aKeyframe,
+                                        aTimecode,
+                                        aInfo.mDisplay.ToIntSize()));
     return v.forget();
   }
 
@@ -269,12 +270,12 @@
     return nullptr;
   }
 
-  nsAutoPtr<VideoData> v(new VideoData(aOffset,
-                                       aTime,
-                                       aDuration,
-                                       aKeyframe,
-                                       aTimecode,
-                                       aInfo.mDisplay.ToIntSize()));
+  nsRefPtr<VideoData> v(new VideoData(aOffset,
+                                      aTime,
+                                      aDuration,
+                                      aKeyframe,
+                                      aTimecode,
+                                      aInfo.mDisplay.ToIntSize()));
 #ifdef MOZ_WIDGET_GONK
   const YCbCrBuffer::Plane &Y = aBuffer.mPlanes[0];
   const YCbCrBuffer::Plane &Cb = aBuffer.mPlanes[1];
@@ -328,77 +329,81 @@
 }
 
 /* static */
-VideoData* VideoData::Create(VideoInfo& aInfo,
-                             ImageContainer* aContainer,
-                             int64_t aOffset,
-                             int64_t aTime,
-                             int64_t aDuration,
-                             const YCbCrBuffer& aBuffer,
-                             bool aKeyframe,
-                             int64_t aTimecode,
-                             const IntRect& aPicture)
+already_AddRefed<VideoData>
+VideoData::Create(VideoInfo& aInfo,
+                  ImageContainer* aContainer,
+                  int64_t aOffset,
+                  int64_t aTime,
+                  int64_t aDuration,
+                  const YCbCrBuffer& aBuffer,
+                  bool aKeyframe,
+                  int64_t aTimecode,
+                  const IntRect& aPicture)
 {
   return Create(aInfo, aContainer, nullptr, aOffset, aTime, aDuration, aBuffer,
                 aKeyframe, aTimecode, aPicture);
 }
 
 /* static */
-VideoData* VideoData::Create(VideoInfo& aInfo,
-                             Image* aImage,
-                             int64_t aOffset,
-                             int64_t aTime,
-                             int64_t aDuration,
-                             const YCbCrBuffer& aBuffer,
-                             bool aKeyframe,
-                             int64_t aTimecode,
-                             const IntRect& aPicture)
+already_AddRefed<VideoData>
+VideoData::Create(VideoInfo& aInfo,
+                  Image* aImage,
+                  int64_t aOffset,
+                  int64_t aTime,
+                  int64_t aDuration,
+                  const YCbCrBuffer& aBuffer,
+                  bool aKeyframe,
+                  int64_t aTimecode,
+                  const IntRect& aPicture)
 {
   return Create(aInfo, nullptr, aImage, aOffset, aTime, aDuration, aBuffer,
                 aKeyframe, aTimecode, aPicture);
 }
 
 /* static */
-VideoData* VideoData::CreateFromImage(VideoInfo& aInfo,
-                                      ImageContainer* aContainer,
-                                      int64_t aOffset,
-                                      int64_t aTime,
-                                      int64_t aDuration,
-                                      const nsRefPtr<Image>& aImage,
-                                      bool aKeyframe,
-                                      int64_t aTimecode,
-                                      const IntRect& aPicture)
-{
-  nsAutoPtr<VideoData> v(new VideoData(aOffset,
-                                       aTime,
-                                       aDuration,
-                                       aKeyframe,
-                                       aTimecode,
-                                       aInfo.mDisplay.ToIntSize()));
+already_AddRefed<VideoData>
+VideoData::CreateFromImage(VideoInfo& aInfo,
+                           ImageContainer* aContainer,
+                           int64_t aOffset,
+                           int64_t aTime,
+                           int64_t aDuration,
+                           const nsRefPtr<Image>& aImage,
+                           bool aKeyframe,
+                           int64_t aTimecode,
+                           const IntRect& aPicture)
+{
+  nsRefPtr<VideoData> v(new VideoData(aOffset,
+                                      aTime,
+                                      aDuration,
+                                      aKeyframe,
+                                      aTimecode,
+                                      aInfo.mDisplay.ToIntSize()));
   v->mImage = aImage;
   return v.forget();
 }
 
 #ifdef MOZ_OMX_DECODER
 /* static */
-VideoData* VideoData::Create(VideoInfo& aInfo,
-                             ImageContainer* aContainer,
-                             int64_t aOffset,
-                             int64_t aTime,
-                             int64_t aDuration,
-                             mozilla::layers::TextureClient* aBuffer,
-                             bool aKeyframe,
-                             int64_t aTimecode,
-                             const IntRect& aPicture)
+already_AddRefed<VideoData>
+VideoData::Create(VideoInfo& aInfo,
+                  ImageContainer* aContainer,
+                  int64_t aOffset,
+                  int64_t aTime,
+                  int64_t aDuration,
+                  mozilla::layers::TextureClient* aBuffer,
+                  bool aKeyframe,
+                  int64_t aTimecode,
+                  const IntRect& aPicture)
 {
   if (!aContainer) {
     // Create a dummy VideoData with no image. This gives us something to
     // send to media streams if necessary.
-    nsAutoPtr<VideoData> v(new VideoData(aOffset,
-                                         aTime,
-                                         aDuration,
-                                         aKeyframe,
-                                         aTimecode,
-                                         aInfo.mDisplay.ToIntSize()));
+    nsRefPtr<VideoData> v(new VideoData(aOffset,
+                                        aTime,
+                                        aDuration,
+                                        aKeyframe,
+                                        aTimecode,
+                                        aInfo.mDisplay.ToIntSize()));
     return v.forget();
   }
 
@@ -420,12 +425,12 @@
     return nullptr;
   }
 
-  nsAutoPtr<VideoData> v(new VideoData(aOffset,
-                                       aTime,
-                                       aDuration,
-                                       aKeyframe,
-                                       aTimecode,
-                                       aInfo.mDisplay.ToIntSize()));
+  nsRefPtr<VideoData> v(new VideoData(aOffset,
+                                      aTime,
+                                      aDuration,
+                                      aKeyframe,
+                                      aTimecode,
+                                      aInfo.mDisplay.ToIntSize()));
 
   v->mImage = aContainer->CreateImage(ImageFormat::GRALLOC_PLANAR_YCBCR);
   if (!v->mImage) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDataDecodedListener.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDataDecodedListener.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDataDecodedListener.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDataDecodedListener.h	2014-11-26 21:46:00.000000000 +0000
@@ -34,23 +34,21 @@
 
   virtual void OnAudioDecoded(AudioData* aSample) MOZ_OVERRIDE {
     MonitorAutoLock lock(mMonitor);
-    nsAutoPtr<AudioData> sample(aSample);
     if (!mTarget || !mTaskQueue) {
       // We've been shutdown, abort.
       return;
     }
-    RefPtr<nsIRunnable> task(new DeliverAudioTask(sample.forget(), mTarget));
+    RefPtr<nsIRunnable> task(new DeliverAudioTask(aSample, mTarget));
     mTaskQueue->Dispatch(task);
   }
 
   virtual void OnVideoDecoded(VideoData* aSample) MOZ_OVERRIDE {
     MonitorAutoLock lock(mMonitor);
-    nsAutoPtr<VideoData> sample(aSample);
     if (!mTarget || !mTaskQueue) {
       // We've been shutdown, abort.
       return;
     }
-    RefPtr<nsIRunnable> task(new DeliverVideoTask(sample.forget(), mTarget));
+    RefPtr<nsIRunnable> task(new DeliverVideoTask(aSample, mTarget));
     mTaskQueue->Dispatch(task);
   }
 
@@ -101,11 +99,11 @@
     }
   public:
     NS_METHOD Run() {
-      mTarget->OnAudioDecoded(mSample.forget());
+      mTarget->OnAudioDecoded(mSample);
       return NS_OK;
     }
   private:
-    nsAutoPtr<AudioData> mSample;
+    nsRefPtr<AudioData> mSample;
     RefPtr<Target> mTarget;
   };
 
@@ -124,11 +122,11 @@
     }
   public:
     NS_METHOD Run() {
-      mTarget->OnVideoDecoded(mSample.forget());
+      mTarget->OnVideoDecoded(mSample);
       return NS_OK;
     }
   private:
-    nsAutoPtr<VideoData> mSample;
+    nsRefPtr<VideoData> mSample;
     RefPtr<Target> mTarget;
   };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaData.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaData.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaData.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaData.h	2014-11-26 21:46:00.000000000 +0000
@@ -24,6 +24,8 @@
 class MediaData {
 public:
 
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaData)
+
   enum Type {
     AUDIO_DATA = 0,
     VIDEO_DATA
@@ -40,8 +42,6 @@
     , mDiscontinuity(false)
   {}
 
-  virtual ~MediaData() {}
-
   // Type of contained data.
   const Type mType;
 
@@ -60,6 +60,9 @@
 
   int64_t GetEndTime() const { return mTime + mDuration; }
 
+protected:
+  virtual ~MediaData() {}
+
 };
 
 // Holds chunk a decoded audio frames.
@@ -77,15 +80,7 @@
     , mFrames(aFrames)
     , mChannels(aChannels)
     , mRate(aRate)
-    , mAudioData(aData)
-  {
-    MOZ_COUNT_CTOR(AudioData);
-  }
-
-  ~AudioData()
-  {
-    MOZ_COUNT_DTOR(AudioData);
-  }
+    , mAudioData(aData) {}
 
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
 
@@ -100,6 +95,9 @@
   nsRefPtr<SharedBuffer> mAudioBuffer;
   // mFrames frames, each with mChannels values
   nsAutoArrayPtr<AudioDataValue> mAudioData;
+
+protected:
+  ~AudioData() {}
 };
 
 namespace layers {
@@ -143,58 +141,58 @@
   // Returns nsnull if an error occurs. This may indicate that memory couldn't
   // be allocated to create the VideoData object, or it may indicate some
   // problem with the input data (e.g. negative stride).
-  static VideoData* Create(VideoInfo& aInfo,
-                           ImageContainer* aContainer,
-                           Image* aImage,
-                           int64_t aOffset,
-                           int64_t aTime,
-                           int64_t aDuration,
-                           const YCbCrBuffer &aBuffer,
-                           bool aKeyframe,
-                           int64_t aTimecode,
-                           const IntRect& aPicture);
+  static already_AddRefed<VideoData> Create(VideoInfo& aInfo,
+                                            ImageContainer* aContainer,
+                                            Image* aImage,
+                                            int64_t aOffset,
+                                            int64_t aTime,
+                                            int64_t aDuration,
+                                            const YCbCrBuffer &aBuffer,
+                                            bool aKeyframe,
+                                            int64_t aTimecode,
+                                            const IntRect& aPicture);
 
   // Variant that always makes a copy of aBuffer
-  static VideoData* Create(VideoInfo& aInfo,
-                           ImageContainer* aContainer,
-                           int64_t aOffset,
-                           int64_t aTime,
-                           int64_t aDuration,
-                           const YCbCrBuffer &aBuffer,
-                           bool aKeyframe,
-                           int64_t aTimecode,
-                           const IntRect& aPicture);
+  static already_AddRefed<VideoData> Create(VideoInfo& aInfo,
+                                            ImageContainer* aContainer,
+                                            int64_t aOffset,
+                                            int64_t aTime,
+                                            int64_t aDuration,
+                                            const YCbCrBuffer &aBuffer,
+                                            bool aKeyframe,
+                                            int64_t aTimecode,
+                                            const IntRect& aPicture);
 
   // Variant to create a VideoData instance given an existing aImage
-  static VideoData* Create(VideoInfo& aInfo,
-                           Image* aImage,
-                           int64_t aOffset,
-                           int64_t aTime,
-                           int64_t aDuration,
-                           const YCbCrBuffer &aBuffer,
-                           bool aKeyframe,
-                           int64_t aTimecode,
-                           const IntRect& aPicture);
-
-  static VideoData* Create(VideoInfo& aInfo,
-                           ImageContainer* aContainer,
-                           int64_t aOffset,
-                           int64_t aTime,
-                           int64_t aDuration,
-                           layers::TextureClient* aBuffer,
-                           bool aKeyframe,
-                           int64_t aTimecode,
-                           const IntRect& aPicture);
-
-  static VideoData* CreateFromImage(VideoInfo& aInfo,
-                                    ImageContainer* aContainer,
-                                    int64_t aOffset,
-                                    int64_t aTime,
-                                    int64_t aDuration,
-                                    const nsRefPtr<Image>& aImage,
-                                    bool aKeyframe,
-                                    int64_t aTimecode,
-                                    const IntRect& aPicture);
+  static already_AddRefed<VideoData> Create(VideoInfo& aInfo,
+                                            Image* aImage,
+                                            int64_t aOffset,
+                                            int64_t aTime,
+                                            int64_t aDuration,
+                                            const YCbCrBuffer &aBuffer,
+                                            bool aKeyframe,
+                                            int64_t aTimecode,
+                                            const IntRect& aPicture);
+
+  static already_AddRefed<VideoData> Create(VideoInfo& aInfo,
+                                             ImageContainer* aContainer,
+                                             int64_t aOffset,
+                                             int64_t aTime,
+                                             int64_t aDuration,
+                                             layers::TextureClient* aBuffer,
+                                             bool aKeyframe,
+                                             int64_t aTimecode,
+                                             const IntRect& aPicture);
+
+  static already_AddRefed<VideoData> CreateFromImage(VideoInfo& aInfo,
+                                                     ImageContainer* aContainer,
+                                                     int64_t aOffset,
+                                                     int64_t aTime,
+                                                     int64_t aDuration,
+                                                     const nsRefPtr<Image>& aImage,
+                                                     bool aKeyframe,
+                                                     int64_t aTimecode,
+                                                     const IntRect& aPicture);
 
   // Creates a new VideoData identical to aOther, but with a different
   // specified duration. All data from aOther is copied into the new
@@ -203,21 +201,21 @@
   // in reader backends that can't determine the duration of a VideoData
   // until the next frame is decoded, i.e. it's a way to change the const
   // duration field on a VideoData.
-  static VideoData* ShallowCopyUpdateDuration(VideoData* aOther,
-                                              int64_t aDuration);
+  static already_AddRefed<VideoData> ShallowCopyUpdateDuration(VideoData* aOther,
+                                                               int64_t aDuration);
 
   // Creates a new VideoData identical to aOther, but with a different
   // specified timestamp. All data from aOther is copied into the new
   // VideoData, as ShallowCopyUpdateDuration() does.
-  static VideoData* ShallowCopyUpdateTimestamp(VideoData* aOther,
-                                               int64_t aTimestamp);
+  static already_AddRefed<VideoData> ShallowCopyUpdateTimestamp(VideoData* aOther,
+                                                                int64_t aTimestamp);
 
   // Creates a new VideoData identical to aOther, but with a different
   // specified timestamp and duration. All data from aOther is copied
   // into the new VideoData, as ShallowCopyUpdateDuration() does.
-  static VideoData* ShallowCopyUpdateTimestampAndDuration(VideoData* aOther,
-                                                          int64_t aTimestamp,
-                                                          int64_t aDuration);
+  static already_AddRefed<VideoData>
+  ShallowCopyUpdateTimestampAndDuration(VideoData* aOther, int64_t aTimestamp,
+                                        int64_t aDuration);
 
   // Initialize PlanarYCbCrImage. Only When aCopyData is true,
   // video data is copied to PlanarYCbCrImage.
@@ -230,16 +228,15 @@
   // Constructs a duplicate VideoData object. This intrinsically tells the
   // player that it does not need to update the displayed frame when this
   // frame is played; this frame is identical to the previous.
-  static VideoData* CreateDuplicate(int64_t aOffset,
-                                    int64_t aTime,
-                                    int64_t aDuration,
-                                    int64_t aTimecode)
+  static already_AddRefed<VideoData> CreateDuplicate(int64_t aOffset,
+                                                     int64_t aTime,
+                                                     int64_t aDuration,
+                                                     int64_t aTimecode)
   {
-    return new VideoData(aOffset, aTime, aDuration, aTimecode);
+    nsRefPtr<VideoData> rv = new VideoData(aOffset, aTime, aDuration, aTimecode);
+    return rv.forget();
   }
 
-  ~VideoData();
-
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
 
   // Dimensions at which to display the video frame. The picture region
@@ -259,7 +256,6 @@
   const bool mDuplicate;
   const bool mKeyframe;
 
-public:
   VideoData(int64_t aOffset,
             int64_t aTime,
             int64_t aDuration,
@@ -272,6 +268,8 @@
             int64_t aTimecode,
             IntSize aDisplay);
 
+protected:
+  ~VideoData();
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderReader.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderReader.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -194,7 +194,7 @@
     }
   }
   if (VideoQueue().GetSize() > 0) {
-    VideoData* v = VideoQueue().PopFront();
+    nsRefPtr<VideoData> v = VideoQueue().PopFront();
     if (v && mVideoDiscontinuity) {
       v->mDiscontinuity = true;
       mVideoDiscontinuity = false;
@@ -226,7 +226,7 @@
     }
   }
   if (AudioQueue().GetSize() > 0) {
-    AudioData* a = AudioQueue().PopFront();
+    nsRefPtr<AudioData> a = AudioQueue().PopFront();
     if (mAudioDiscontinuity) {
       a->mDiscontinuity = true;
       mAudioDiscontinuity = false;
@@ -308,7 +308,7 @@
 }
 
 nsresult
-AudioDecodeRendezvous::Await(nsAutoPtr<AudioData>& aSample)
+AudioDecodeRendezvous::Await(nsRefPtr<AudioData>& aSample)
 {
   MonitorAutoLock mon(mMonitor);
   while (!mHaveResult) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderReader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderReader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderReader.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderReader.h	2014-11-26 21:46:00.000000000 +0000
@@ -20,6 +20,7 @@
 
 class RequestSampleCallback;
 class MediaDecoderReader;
+class SharedDecoderManager;
 
 // Encapsulates the decoding and reading of media data. Reading can either
 // synchronous and done on the calling "decode" thread, or asynchronous and
@@ -47,6 +48,7 @@
   // Release media resources they should be released in dormant state
   // The reader can be made usable again by calling ReadMetadata().
   virtual void ReleaseMediaResources() {};
+  virtual void SetSharedDecoderManager(SharedDecoderManager* aManager) {}
   // Breaks reference-counted cycles. Called during shutdown.
   // WARNING: If you override this, you must call the base implementation
   // in your override.
@@ -276,7 +278,8 @@
   enum NotDecodedReason {
     END_OF_STREAM,
     DECODE_ERROR,
-    WAITING_FOR_DATA
+    WAITING_FOR_DATA,
+    CANCELED
   };
 
   // Receives the result of a RequestAudioData() call.
@@ -320,7 +323,7 @@
 
   // Returns failure on error, or NS_OK.
   // If *aSample is null, EOS has been reached.
-  nsresult Await(nsAutoPtr<AudioData>& aSample);
+  nsresult Await(nsRefPtr<AudioData>& aSample);
 
   // Interrupts a call to Wait().
   void Cancel();
@@ -328,7 +331,7 @@
 private:
   Monitor mMonitor;
   nsresult mStatus;
-  nsAutoPtr<AudioData> mSample;
+  nsRefPtr<AudioData> mSample;
   bool mHaveResult;
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderStateMachine.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderStateMachine.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderStateMachine.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderStateMachine.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -186,6 +186,7 @@
   mCurrentFrameTime(0),
   mAudioStartTime(-1),
   mAudioEndTime(-1),
+  mDecodedAudioEndTime(-1),
   mVideoFrameEndTime(-1),
   mVolume(1.0),
   mPlaybackRate(1.0),
@@ -341,18 +342,22 @@
   aOutput->ApplyVolume(mVolume);
 }
 
-static void WriteVideoToMediaStream(layers::Image* aImage,
-                                    int64_t aDuration,
+static void WriteVideoToMediaStream(MediaStream* aStream,
+                                    layers::Image* aImage,
+                                    int64_t aEndMicroseconds,
+                                    int64_t aStartMicroseconds,
                                     const IntSize& aIntrinsicSize,
                                     VideoSegment* aOutput)
 {
   nsRefPtr<layers::Image> image = aImage;
-  aOutput->AppendFrame(image.forget(), aDuration, aIntrinsicSize);
+  StreamTime duration =
+      aStream->MicrosecondsToStreamTimeRoundDown(aEndMicroseconds) -
+      aStream->MicrosecondsToStreamTimeRoundDown(aStartMicroseconds);
+  aOutput->AppendFrame(image.forget(), duration, aIntrinsicSize);
 }
 
 static const TrackID TRACK_AUDIO = 1;
 static const TrackID TRACK_VIDEO = 2;
-static const TrackRate RATE_VIDEO = USECS_PER_S;
 
 void MediaDecoderStateMachine::SendStreamData()
 {
@@ -389,13 +394,13 @@
     if (!stream->mStreamInitialized) {
       if (mInfo.HasAudio()) {
         AudioSegment* audio = new AudioSegment();
-        mediaStream->AddTrack(TRACK_AUDIO, mInfo.mAudio.mRate, 0, audio);
+        mediaStream->AddAudioTrack(TRACK_AUDIO, mInfo.mAudio.mRate, 0, audio);
         stream->mStream->DispatchWhenNotEnoughBuffered(TRACK_AUDIO,
             GetStateMachineThread(), GetWakeDecoderRunnable());
       }
       if (mInfo.HasVideo()) {
         VideoSegment* video = new VideoSegment();
-        mediaStream->AddTrack(TRACK_VIDEO, RATE_VIDEO, 0, video);
+        mediaStream->AddTrack(TRACK_VIDEO, 0, video);
         stream->mStream->DispatchWhenNotEnoughBuffered(TRACK_VIDEO,
             GetStateMachineThread(), GetWakeDecoderRunnable());
       }
@@ -403,7 +408,7 @@
     }
 
     if (mInfo.HasAudio()) {
-      nsAutoTArray<AudioData*,10> audio;
+      nsAutoTArray<nsRefPtr<AudioData>,10> audio;
       // It's OK to hold references to the AudioData because while audio
       // is captured, only the decoder thread pops from the queue (see below).
       AudioQueue().GetElementsAfter(stream->mLastAudioPacketTime, &audio);
@@ -425,7 +430,7 @@
     }
 
     if (mInfo.HasVideo()) {
-      nsAutoTArray<VideoData*,10> video;
+      nsAutoTArray<nsRefPtr<VideoData>,10> video;
       // It's OK to hold references to the VideoData only the decoder thread
       // pops from the queue.
       VideoQueue().GetElementsAfter(stream->mNextVideoTime, &video);
@@ -437,16 +442,16 @@
                       mediaStream, v->mTime - stream->mNextVideoTime);
           // Write last video frame to catch up. mLastVideoImage can be null here
           // which is fine, it just means there's no video.
-          WriteVideoToMediaStream(stream->mLastVideoImage,
-            v->mTime - stream->mNextVideoTime, stream->mLastVideoImageDisplaySize,
+          WriteVideoToMediaStream(mediaStream, stream->mLastVideoImage,
+            v->mTime, stream->mNextVideoTime, stream->mLastVideoImageDisplaySize,
               &output);
           stream->mNextVideoTime = v->mTime;
         }
         if (stream->mNextVideoTime < v->GetEndTime()) {
           VERBOSE_LOG("writing video frame %lldus to MediaStream %p for %lldus",
                       v->mTime, mediaStream, v->GetEndTime() - stream->mNextVideoTime);
-          WriteVideoToMediaStream(v->mImage,
-              v->GetEndTime() - stream->mNextVideoTime, v->mDisplay,
+          WriteVideoToMediaStream(mediaStream, v->mImage,
+              v->GetEndTime(), stream->mNextVideoTime, v->mDisplay,
               &output);
           stream->mNextVideoTime = v->GetEndTime();
           stream->mLastVideoImage = v->mImage;
@@ -464,7 +469,8 @@
         stream->mHaveSentFinishVideo = true;
       }
       endPosition = std::max(endPosition,
-          mediaStream->TicksToTimeRoundDown(RATE_VIDEO, stream->mNextVideoTime - stream->mInitialTime));
+          mediaStream->MicrosecondsToStreamTimeRoundDown(
+              stream->mNextVideoTime - stream->mInitialTime));
     }
 
     if (!stream->mHaveSentFinish) {
@@ -490,7 +496,7 @@
       if (!a || a->GetEndTime() >= minLastAudioPacketTime)
         break;
       OnAudioEndTimeUpdate(std::max(mAudioEndTime, a->GetEndTime()));
-      delete AudioQueue().PopFront();
+      nsRefPtr<AudioData> releaseMe = AudioQueue().PopFront();
     }
 
     if (finished) {
@@ -627,6 +633,11 @@
 MediaDecoderStateMachine::NeedToDecodeAudio()
 {
   AssertCurrentThreadInMonitor();
+  SAMPLE_LOG("NeedToDecodeAudio() isDec=%d decToTar=%d minPrl=%d seek=%d enufAud=%d",
+             IsAudioDecoding(), mDecodeToSeekTarget, mMinimizePreroll,
+             mState == DECODER_STATE_SEEKING,
+             HaveEnoughDecodedAudio(mAmpleAudioThresholdUsecs * mPlaybackRate));
+
   return IsAudioDecoding() &&
          ((mState == DECODER_STATE_SEEKING && mDecodeToSeekTarget) ||
           (!mMinimizePreroll &&
@@ -691,9 +702,10 @@
 MediaDecoderStateMachine::OnAudioDecoded(AudioData* aAudioSample)
 {
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-  nsAutoPtr<AudioData> audio(aAudioSample);
+  nsRefPtr<AudioData> audio(aAudioSample);
   MOZ_ASSERT(audio);
   mAudioRequestPending = false;
+  mDecodedAudioEndTime = audio->GetEndTime();
 
   SAMPLE_LOG("OnAudioDecoded [%lld,%lld] disc=%d",
              (audio ? audio->mTime : -1),
@@ -702,7 +714,7 @@
 
   switch (mState) {
     case DECODER_STATE_DECODING_FIRSTFRAME: {
-      Push(audio.forget());
+      Push(audio);
       MaybeFinishDecodeFirstFrame();
       return;
     }
@@ -710,7 +722,7 @@
     case DECODER_STATE_BUFFERING:
     case DECODER_STATE_DECODING: {
       // In buffering and decoding state, we simply enqueue samples.
-      Push(audio.forget());
+      Push(audio);
       return;
     }
 
@@ -738,11 +750,11 @@
         }
         if (mCurrentSeekTarget.mType == SeekTarget::PrevSyncPoint) {
           // Non-precise seek; we can stop the seek at the first sample.
-          AudioQueue().Push(audio.forget());
+          AudioQueue().Push(audio);
         } else {
           // We're doing an accurate seek. We must discard
           // MediaData up to the one containing exact seek target.
-          if (NS_FAILED(DropAudioUpToSeekTarget(audio.forget()))) {
+          if (NS_FAILED(DropAudioUpToSeekTarget(audio))) {
             DecodeError();
             return;
           }
@@ -828,6 +840,11 @@
     return;
   }
 
+  if (aReason == RequestSampleCallback::CANCELED) {
+    DispatchDecodeTasksIfNeeded();
+    return;
+  }
+
   // This is an EOS. Finish off the queue, and then handle things based on our
   // state.
   MOZ_ASSERT(aReason == RequestSampleCallback::END_OF_STREAM);
@@ -837,7 +854,8 @@
     // insert it into the queue so that we have something to display.
     // We make sure to do this before invoking VideoQueue().Finish()
     // below.
-    VideoQueue().Push(mFirstVideoFrameAfterSeek.forget());
+    VideoQueue().Push(mFirstVideoFrameAfterSeek);
+    mFirstVideoFrameAfterSeek = nullptr;
   }
   isAudio ? AudioQueue().Finish() : VideoQueue().Finish();
   switch (mState) {
@@ -901,7 +919,7 @@
 MediaDecoderStateMachine::OnVideoDecoded(VideoData* aVideoSample)
 {
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-  nsAutoPtr<VideoData> video(aVideoSample);
+  nsRefPtr<VideoData> video(aVideoSample);
   mVideoRequestPending = false;
 
   SAMPLE_LOG("OnVideoDecoded [%lld,%lld] disc=%d",
@@ -911,14 +929,14 @@
 
   switch (mState) {
     case DECODER_STATE_DECODING_FIRSTFRAME: {
-      Push(video.forget());
+      Push(video);
       MaybeFinishDecodeFirstFrame();
       return;
     }
 
     case DECODER_STATE_BUFFERING:
     case DECODER_STATE_DECODING: {
-      Push(video.forget());
+      Push(video);
       // If the requested video sample was slow to arrive, increase the
       // amount of audio we buffer to ensure that we don't run out of audio.
       // TODO: Detect when we're truly async, and don't do this if so, as
@@ -962,11 +980,11 @@
         }
         if (mCurrentSeekTarget.mType == SeekTarget::PrevSyncPoint) {
           // Non-precise seek; we can stop the seek at the first sample.
-          VideoQueue().Push(video.forget());
+          VideoQueue().Push(video);
         } else {
           // We're doing an accurate seek. We still need to discard
           // MediaData up to the one containing exact seek target.
-          if (NS_FAILED(DropVideoUpToSeekTarget(video.forget()))) {
+          if (NS_FAILED(DropVideoUpToSeekTarget(video))) {
             DecodeError();
             return;
           }
@@ -1477,6 +1495,7 @@
   mVideoFrameEndTime = -1;
   mAudioStartTime = -1;
   mAudioEndTime = -1;
+  mDecodedAudioEndTime = -1;
   mAudioCompleted = false;
   AudioQueue().Reset();
   VideoQueue().Reset();
@@ -1716,6 +1735,11 @@
                   !needToDecodeVideo &&
                   !IsPlaying();
 
+  SAMPLE_LOG("DispatchDecodeTasksIfNeeded needAudio=%d dispAudio=%d needVideo=%d dispVid=%d needIdle=%d",
+             needToDecodeAudio, mAudioRequestPending,
+             needToDecodeVideo, mVideoRequestPending,
+             needIdle);
+
   if (needToDecodeAudio) {
     EnsureAudioDecodeTaskQueued();
   }
@@ -1723,10 +1747,6 @@
     EnsureVideoDecodeTaskQueued();
   }
 
-  SAMPLE_LOG("DispatchDecodeTasksIfNeeded needAudio=%d dispAudio=%d needVideo=%d dispVid=%d needIdle=%d",
-             needToDecodeAudio, mAudioRequestPending,
-             needToDecodeVideo, mVideoRequestPending,
-             needIdle);
 
   if (needIdle) {
     RefPtr<nsIRunnable> event = NS_NewRunnableMethod(
@@ -1930,7 +1950,10 @@
   }
   int64_t endOfDecodedAudioData = INT64_MAX;
   if (HasAudio() && !AudioQueue().AtEndOfStream()) {
-    endOfDecodedAudioData = AudioQueue().Peek() ? AudioQueue().Peek()->GetEndTime() : GetAudioClock();
+    // mDecodedAudioEndTime could be -1 when no audio samples are decoded.
+    // But that is fine since we consider ourself as low in decoded data when
+    // we don't have any decoded audio samples at all.
+    endOfDecodedAudioData = mDecodedAudioEndTime;
   }
   int64_t endOfDecodedData = std::min(endOfDecodedVideoData, endOfDecodedAudioData);
 
@@ -2245,9 +2268,10 @@
     return;
   }
 
+  mDecodeToSeekTarget = false;
+
   if (!currentTimeChanged) {
     DECODER_LOG("Seek !currentTimeChanged...");
-    mDecodeToSeekTarget = false;
     nsresult rv = mDecodeTaskQueue->Dispatch(
       NS_NewRunnableMethod(this, &MediaDecoderStateMachine::SeekCompleted));
     if (NS_FAILED(rv)) {
@@ -2381,6 +2405,13 @@
   // Try to decode another frame to detect if we're at the end...
   DECODER_LOG("Seek completed, mCurrentFrameTime=%lld", mCurrentFrameTime);
 
+  mCurrentSeekTarget = SeekTarget();
+
+  // Reset quick buffering status. This ensures that if we began the
+  // seek while quick-buffering, we won't bypass quick buffering mode
+  // if we need to buffer after the seek.
+  mQuickBuffering = false;
+
   // Prevent changes in playback position before 'seeked' is fired for we
   // expect currentTime equals seek target in 'seeked' callback.
   mScheduler->FreezeScheduling();
@@ -2389,11 +2420,6 @@
     NS_DispatchToMainThread(stopEvent, NS_DISPATCH_SYNC);
   }
 
-  // Reset quick buffering status. This ensures that if we began the
-  // seek while quick-buffering, we won't bypass quick buffering mode
-  // if we need to buffer after the seek.
-  mQuickBuffering = false;
-
   ScheduleStateMachine();
   mScheduler->ThawScheduling();
 }
@@ -2795,7 +2821,7 @@
   // the time remaining until it's time to display the next frame.
   int64_t remainingTime = AUDIO_DURATION_USECS;
   NS_ASSERTION(clock_time >= mStartTime, "Should have positive clock time.");
-  nsAutoPtr<VideoData> currentFrame;
+  nsRefPtr<VideoData> currentFrame;
   if (VideoQueue().GetSize() > 0) {
     VideoData* frame = VideoQueue().PeekFront();
 #ifdef PR_LOGGING
@@ -2810,7 +2836,7 @@
       }
 #endif
       currentFrame = frame;
-      VideoQueue().PopFront();
+      nsRefPtr<VideoData> releaseMe = VideoQueue().PopFront();
       // Notify the decode thread that the video queue's buffers may have
       // free'd up space for more frames.
       mDecoder->GetReentrantMonitor().NotifyAll();
@@ -2836,7 +2862,7 @@
       mDecoder->IsExpectingMoreData()) {
     if (JustExitedQuickBuffering() || HasLowUndecodedData()) {
       if (currentFrame) {
-        VideoQueue().PushFront(currentFrame.forget());
+        VideoQueue().PushFront(currentFrame);
       }
       StartBuffering();
       // Don't go straight back to the state machine loop since that might
@@ -2906,7 +2932,7 @@
 nsresult
 MediaDecoderStateMachine::DropVideoUpToSeekTarget(VideoData* aSample)
 {
-  nsAutoPtr<VideoData> video(aSample);
+  nsRefPtr<VideoData> video(aSample);
   MOZ_ASSERT(video);
   DECODER_LOG("DropVideoUpToSeekTarget() frame [%lld, %lld] dup=%d",
               video->mTime, video->GetEndTime(), video->mDuplicate);
@@ -2921,7 +2947,7 @@
   if (video->mDuplicate &&
       mFirstVideoFrameAfterSeek &&
       !mFirstVideoFrameAfterSeek->mDuplicate) {
-    VideoData* temp =
+    nsRefPtr<VideoData> temp =
       VideoData::ShallowCopyUpdateTimestampAndDuration(mFirstVideoFrameAfterSeek,
                                                        video->mTime,
                                                        video->mDuration);
@@ -2939,7 +2965,7 @@
       // The seek target lies inside this frame's time slice. Adjust the frame's
       // start time to match the seek target. We do this by replacing the
       // first frame with a shallow copy which has the new timestamp.
-      VideoData* temp = VideoData::ShallowCopyUpdateTimestamp(video, target);
+      nsRefPtr<VideoData> temp = VideoData::ShallowCopyUpdateTimestamp(video, target);
       video = temp;
     }
     mFirstVideoFrameAfterSeek = nullptr;
@@ -2947,16 +2973,16 @@
     DECODER_LOG("DropVideoUpToSeekTarget() found video frame [%lld, %lld] containing target=%lld",
                 video->mTime, video->GetEndTime(), target);
 
-    VideoQueue().PushFront(video.forget());
-
+    VideoQueue().PushFront(video);
   }
+
   return NS_OK;
 }
 
 nsresult
 MediaDecoderStateMachine::DropAudioUpToSeekTarget(AudioData* aSample)
 {
-  nsAutoPtr<AudioData> audio(aSample);
+  nsRefPtr<AudioData> audio(aSample);
   MOZ_ASSERT(audio &&
              mCurrentSeekTarget.IsValid() &&
              mCurrentSeekTarget.mType == SeekTarget::Accurate);
@@ -2982,7 +3008,7 @@
     // silence to cover the gap. Typically this happens in poorly muxed
     // files.
     DECODER_WARN("Audio not synced after seek, maybe a poorly muxed file?");
-    AudioQueue().Push(audio.forget());
+    AudioQueue().Push(audio);
     return NS_OK;
   }
 
@@ -3011,14 +3037,14 @@
   if (!duration.isValid()) {
     return NS_ERROR_FAILURE;
   }
-  nsAutoPtr<AudioData> data(new AudioData(audio->mOffset,
-                                          mCurrentSeekTarget.mTime,
-                                          duration.value(),
-                                          frames,
-                                          audioData.forget(),
-                                          channels,
-                                          audio->mRate));
-  AudioQueue().PushFront(data.forget());
+  nsRefPtr<AudioData> data(new AudioData(audio->mOffset,
+                                         mCurrentSeekTarget.mTime,
+                                         duration.value(),
+                                         frames,
+                                         audioData.forget(),
+                                         channels,
+                                         audio->mRate));
+  AudioQueue().PushFront(data);
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderStateMachine.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderStateMachine.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaDecoderStateMachine.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaDecoderStateMachine.h	2014-11-26 21:46:00.000000000 +0000
@@ -818,6 +818,10 @@
   // audio stream, unless another frame is pushed to the hardware.
   int64_t mAudioEndTime;
 
+  // The end time of the last decoded audio frame. This signifies the end of
+  // decoded audio data. Used to check if we are low in decoded data.
+  int64_t mDecodedAudioEndTime;
+
   // The presentation end time of the last video frame which has been displayed
   // in microseconds. Accessed from the state machine thread.
   int64_t mVideoFrameEndTime;
@@ -877,7 +881,7 @@
   // This is so that if we hit end of stream while we're decoding to reach
   // the seek target, we will still have a frame that we can display as the
   // last frame in the media.
-  nsAutoPtr<VideoData> mFirstVideoFrameAfterSeek;
+  nsRefPtr<VideoData> mFirstVideoFrameAfterSeek;
 
   // When we start decoding (either for the first time, or after a pause)
   // we may be low on decoded data. We don't want our "low data" logic to
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaManager.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaManager.h	2014-11-26 21:46:00.000000000 +0000
@@ -239,8 +239,8 @@
   nsRefPtr<MediaEngineSource> mAudioSource; // threadsafe refcnt
   nsRefPtr<MediaEngineSource> mVideoSource; // threadsafe refcnt
   nsRefPtr<SourceMediaStream> mStream; // threadsafe refcnt
-  TrackTicks mLastEndTimeAudio;
-  TrackTicks mLastEndTimeVideo;
+  StreamTime mLastEndTimeAudio;
+  StreamTime mLastEndTimeVideo;
   bool mFinished;
 
   // Accessed from MainThread and MSG thread
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaQueue.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaQueue.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaQueue.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaQueue.h	2014-11-26 21:46:00.000000000 +0000
@@ -18,7 +18,7 @@
 template <class T>
 class MediaQueueDeallocator : public nsDequeFunctor {
   virtual void* operator() (void* aObject) {
-    delete static_cast<T*>(aObject);
+    nsRefPtr<T> releaseMe = dont_AddRef(static_cast<T*>(aObject));
     return nullptr;
   }
 };
@@ -44,22 +44,24 @@
   inline void Push(T* aItem) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     MOZ_ASSERT(aItem);
+    NS_ADDREF(aItem);
     nsDeque::Push(aItem);
   }
 
   inline void PushFront(T* aItem) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     MOZ_ASSERT(aItem);
+    NS_ADDREF(aItem);
     nsDeque::PushFront(aItem);
   }
 
-  inline T* PopFront() {
+  inline already_AddRefed<T> PopFront() {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-    T* rv = static_cast<T*>(nsDeque::PopFront());
+    nsRefPtr<T> rv = dont_AddRef(static_cast<T*>(nsDeque::PopFront()));
     if (rv) {
       NotifyPopListeners();
     }
-    return rv;
+    return rv.forget();
   }
 
   inline T* Peek() {
@@ -80,8 +82,7 @@
   void Reset() {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     while (GetSize() > 0) {
-      T* x = PopFront();
-      delete x;
+      nsRefPtr<T> x = PopFront();
     }
     mEndOfStream = false;
   }
@@ -123,7 +124,7 @@
 
   // Extracts elements from the queue into aResult, in order.
   // Elements whose start time is before aTime are ignored.
-  void GetElementsAfter(int64_t aTime, nsTArray<T*>* aResult) {
+  void GetElementsAfter(int64_t aTime, nsTArray<nsRefPtr<T>>* aResult) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     if (!GetSize())
       return;
@@ -136,7 +137,8 @@
     // Elements less than i have a end time before aTime. It's also possible
     // that the element at i has a end time before aTime, but that's OK.
     for (; i < GetSize(); ++i) {
-      aResult->AppendElement(static_cast<T*>(ObjectAt(i)));
+      nsRefPtr<T> elem = static_cast<T*>(ObjectAt(i));
+      aResult->AppendElement(elem);
     }
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaRecorder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaRecorder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaRecorder.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaRecorder.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -179,9 +179,6 @@
         return NS_OK;
       }
 
-      if (mSession->IsEncoderError()) {
-        recorder->NotifyError(NS_ERROR_UNEXPECTED);
-      }
       nsresult rv = recorder->CreateAndDispatchBlobEvent(mSession->GetEncodedData());
       if (NS_FAILED(rv)) {
         recorder->NotifyError(rv);
@@ -194,6 +191,34 @@
     nsRefPtr<Session> mSession;
   };
 
+  // Notify encoder error, run in main thread task. (Bug 1095381)
+  class EncoderErrorNotifierRunnable : public nsRunnable
+  {
+  public:
+    explicit EncoderErrorNotifierRunnable(Session* aSession)
+      : mSession(aSession)
+    { }
+
+    NS_IMETHODIMP Run()
+    {
+      LOG(PR_LOG_DEBUG, ("Session.ErrorNotifyRunnable s=(%p)", mSession.get()));
+      MOZ_ASSERT(NS_IsMainThread());
+
+      nsRefPtr<MediaRecorder> recorder = mSession->mRecorder;
+      if (!recorder) {
+        return NS_OK;
+      }
+
+      if (mSession->IsEncoderError()) {
+        recorder->NotifyError(NS_ERROR_UNEXPECTED);
+      }
+      return NS_OK;
+    }
+
+  private:
+    nsRefPtr<Session> mSession;
+  };
+
   // Fire start event and set mimeType, run in main thread task.
   class DispatchStartEventRunnable : public nsRunnable
   {
@@ -336,6 +361,7 @@
     nsRefPtr<Session> mSession;
   };
 
+  friend class EncoderErrorNotifierRunnable;
   friend class PushBlobRunnable;
   friend class ExtractRunnable;
   friend class DestroyRunnable;
@@ -399,7 +425,8 @@
     LOG(PR_LOG_DEBUG, ("Session.RequestData"));
     MOZ_ASSERT(NS_IsMainThread());
 
-    if (NS_FAILED(NS_DispatchToMainThread(new PushBlobRunnable(this)))) {
+    if (NS_FAILED(NS_DispatchToMainThread(new EncoderErrorNotifierRunnable(this))) ||
+        NS_FAILED(NS_DispatchToMainThread(new PushBlobRunnable(this)))) {
       MOZ_ASSERT(false, "RequestData NS_DispatchToMainThread failed");
       return NS_ERROR_FAILURE;
     }
@@ -480,6 +507,9 @@
       pushBlob = true;
     }
     if (pushBlob || aForceFlush) {
+      if (NS_FAILED(NS_DispatchToMainThread(new EncoderErrorNotifierRunnable(this)))) {
+        MOZ_ASSERT(false, "NS_DispatchToMainThread EncoderErrorNotifierRunnable failed");
+      }
       if (NS_FAILED(NS_DispatchToMainThread(new PushBlobRunnable(this)))) {
         MOZ_ASSERT(false, "NS_DispatchToMainThread PushBlobRunnable failed");
       } else {
@@ -576,6 +606,9 @@
     }
 
     CleanupStreams();
+    if (NS_FAILED(NS_DispatchToMainThread(new EncoderErrorNotifierRunnable(this)))) {
+      MOZ_ASSERT(false, "NS_DispatchToMainThread EncoderErrorNotifierRunnable failed");
+    }
     if (NS_FAILED(NS_DispatchToMainThread(new PushBlobRunnable(this)))) {
       MOZ_ASSERT(false, "NS_DispatchToMainThread PushBlobRunnable failed");
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaSegment.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaSegment.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaSegment.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaSegment.h	2014-11-26 21:46:00.000000000 +0000
@@ -28,23 +28,31 @@
  * A number of ticks at a rate determined by some underlying track (e.g.
  * audio sample rate). We want to make sure that multiplying TrackTicks by
  * a TrackRate doesn't overflow, so we set its max accordingly.
+ * StreamTime should be used instead when we're working with MediaStreamGraph's
+ * rate, but TrackTicks can be used outside MediaStreams when we have data
+ * at a different rate.
  */
 typedef int64_t TrackTicks;
 const int64_t TRACK_TICKS_MAX = INT64_MAX >> TRACK_RATE_MAX_BITS;
 
 /**
  * We represent media times in 64-bit audio frame counts or ticks.
- * All audio tracks in a MediaStreamGraph have the same sample rate and all
- * streams in the graph measure time using ticks at the same audio rate.
+ * All tracks in a MediaStreamGraph have the same rate.
  */
 typedef int64_t MediaTime;
 const int64_t MEDIA_TIME_MAX = TRACK_TICKS_MAX;
 
 /**
+ * Media time relative to the start of a StreamBuffer.
+ */
+typedef MediaTime StreamTime;
+const StreamTime STREAM_TIME_MAX = MEDIA_TIME_MAX;
+
+/**
  * A MediaSegment is a chunk of media data sequential in time. Different
  * types of data have different subclasses of MediaSegment, all inheriting
  * from MediaSegmentBase.
- * All MediaSegment data is timed using TrackTicks. The actual tick rate
+ * All MediaSegment data is timed using StreamTime. The actual tick rate
  * is defined on a per-track basis. For some track types, this can be
  * a fixed constant for all tracks of that type (e.g. 1MHz for video).
  *
@@ -68,7 +76,7 @@
   /**
    * Gets the total duration of the segment.
    */
-  TrackTicks GetDuration() const { return mDuration; }
+  StreamTime GetDuration() const { return mDuration; }
   Type GetType() const { return mType; }
 
   /**
@@ -83,23 +91,23 @@
    * Append a slice of aSource to this segment.
    */
   virtual void AppendSlice(const MediaSegment& aSource,
-                           TrackTicks aStart, TrackTicks aEnd) = 0;
+                           StreamTime aStart, StreamTime aEnd) = 0;
   /**
    * Replace all contents up to aDuration with null data.
    */
-  virtual void ForgetUpTo(TrackTicks aDuration) = 0;
+  virtual void ForgetUpTo(StreamTime aDuration) = 0;
   /**
    * Forget all data buffered after a given point
    */
-  virtual void FlushAfter(TrackTicks aNewEnd) = 0;
+  virtual void FlushAfter(StreamTime aNewEnd) = 0;
   /**
    * Insert aDuration of null data at the start of the segment.
    */
-  virtual void InsertNullDataAtStart(TrackTicks aDuration) = 0;
+  virtual void InsertNullDataAtStart(StreamTime aDuration) = 0;
   /**
    * Insert aDuration of null data at the end of the segment.
    */
-  virtual void AppendNullData(TrackTicks aDuration) = 0;
+  virtual void AppendNullData(StreamTime aDuration) = 0;
   /**
    * Replace contents with disabled data of the same duration
    */
@@ -125,7 +133,7 @@
     MOZ_COUNT_CTOR(MediaSegment);
   }
 
-  TrackTicks mDuration; // total of mDurations of all chunks
+  StreamTime mDuration; // total of mDurations of all chunks
   Type mType;
 };
 
@@ -149,12 +157,12 @@
     AppendFromInternal(aSource);
   }
   virtual void AppendSlice(const MediaSegment& aSource,
-                           TrackTicks aStart, TrackTicks aEnd)
+                           StreamTime aStart, StreamTime aEnd)
   {
     NS_ASSERTION(aSource.GetType() == C::StaticType(), "Wrong type");
     AppendSliceInternal(static_cast<const C&>(aSource), aStart, aEnd);
   }
-  void AppendSlice(const C& aOther, TrackTicks aStart, TrackTicks aEnd)
+  void AppendSlice(const C& aOther, StreamTime aStart, StreamTime aEnd)
   {
     AppendSliceInternal(aOther, aStart, aEnd);
   }
@@ -162,13 +170,13 @@
    * Replace the first aDuration ticks with null media data, because the data
    * will not be required again.
    */
-  virtual void ForgetUpTo(TrackTicks aDuration)
+  virtual void ForgetUpTo(StreamTime aDuration)
   {
     if (mChunks.IsEmpty() || aDuration <= 0) {
       return;
     }
     if (mChunks[0].IsNull()) {
-      TrackTicks extraToForget = std::min(aDuration, mDuration) - mChunks[0].GetDuration();
+      StreamTime extraToForget = std::min(aDuration, mDuration) - mChunks[0].GetDuration();
       if (extraToForget > 0) {
         RemoveLeading(extraToForget, 1);
         mChunks[0].mDuration += extraToForget;
@@ -180,14 +188,14 @@
     mChunks.InsertElementAt(0)->SetNull(aDuration);
     mDuration += aDuration;
   }
-  virtual void FlushAfter(TrackTicks aNewEnd)
+  virtual void FlushAfter(StreamTime aNewEnd)
   {
     if (mChunks.IsEmpty()) {
       return;
     }
 
     if (mChunks[0].IsNull()) {
-      TrackTicks extraToKeep = aNewEnd - mChunks[0].GetDuration();
+      StreamTime extraToKeep = aNewEnd - mChunks[0].GetDuration();
       if (extraToKeep < 0) {
         // reduce the size of the Null, get rid of everthing else
         mChunks[0].SetNull(aNewEnd);
@@ -203,7 +211,7 @@
     }
     mDuration = aNewEnd;
   }
-  virtual void InsertNullDataAtStart(TrackTicks aDuration)
+  virtual void InsertNullDataAtStart(StreamTime aDuration)
   {
     if (aDuration <= 0) {
       return;
@@ -218,7 +226,7 @@
 #endif
     mDuration += aDuration;
   }
-  virtual void AppendNullData(TrackTicks aDuration)
+  virtual void AppendNullData(StreamTime aDuration)
   {
     if (aDuration <= 0) {
       return;
@@ -235,7 +243,7 @@
     if (GetType() != AUDIO) {
       MOZ_CRASH("Disabling unknown segment type");
     }
-    TrackTicks duration = GetDuration();
+    StreamTime duration = GetDuration();
     Clear();
     AppendNullData(duration);
   }
@@ -258,7 +266,7 @@
     uint32_t mIndex;
   };
 
-  void RemoveLeading(TrackTicks aDuration)
+  void RemoveLeading(StreamTime aDuration)
   {
     RemoveLeading(aDuration, 0);
   }
@@ -303,17 +311,17 @@
   }
 
   void AppendSliceInternal(const MediaSegmentBase<C, Chunk>& aSource,
-                           TrackTicks aStart, TrackTicks aEnd)
+                           StreamTime aStart, StreamTime aEnd)
   {
     MOZ_ASSERT(aStart <= aEnd, "Endpoints inverted");
     NS_WARN_IF_FALSE(aStart >= 0 && aEnd <= aSource.mDuration, "Slice out of range");
     mDuration += aEnd - aStart;
-    TrackTicks offset = 0;
+    StreamTime offset = 0;
     for (uint32_t i = 0; i < aSource.mChunks.Length() && offset < aEnd; ++i) {
       const Chunk& c = aSource.mChunks[i];
-      TrackTicks start = std::max(aStart, offset);
-      TrackTicks nextOffset = offset + c.GetDuration();
-      TrackTicks end = std::min(aEnd, nextOffset);
+      StreamTime start = std::max(aStart, offset);
+      StreamTime nextOffset = offset + c.GetDuration();
+      StreamTime end = std::min(aEnd, nextOffset);
       if (start < end) {
         mChunks.AppendElement(c)->SliceTo(start - offset, end - offset);
       }
@@ -321,7 +329,7 @@
     }
   }
 
-  Chunk* AppendChunk(TrackTicks aDuration)
+  Chunk* AppendChunk(StreamTime aDuration)
   {
     MOZ_ASSERT(aDuration >= 0);
     Chunk* c = mChunks.AppendElement();
@@ -330,15 +338,15 @@
     return c;
   }
 
-  Chunk* FindChunkContaining(TrackTicks aOffset, TrackTicks* aStart = nullptr)
+  Chunk* FindChunkContaining(StreamTime aOffset, StreamTime* aStart = nullptr)
   {
     if (aOffset < 0) {
       return nullptr;
     }
-    TrackTicks offset = 0;
+    StreamTime offset = 0;
     for (uint32_t i = 0; i < mChunks.Length(); ++i) {
       Chunk& c = mChunks[i];
-      TrackTicks nextOffset = offset + c.GetDuration();
+      StreamTime nextOffset = offset + c.GetDuration();
       if (aOffset < nextOffset) {
         if (aStart) {
           *aStart = offset;
@@ -358,10 +366,10 @@
     return &mChunks[mChunks.Length() - 1];
   }
 
-  void RemoveLeading(TrackTicks aDuration, uint32_t aStartIndex)
+  void RemoveLeading(StreamTime aDuration, uint32_t aStartIndex)
   {
     NS_ASSERTION(aDuration >= 0, "Can't remove negative duration");
-    TrackTicks t = aDuration;
+    StreamTime t = aDuration;
     uint32_t chunksToRemove = 0;
     for (uint32_t i = aStartIndex; i < mChunks.Length() && t > 0; ++i) {
       Chunk* c = &mChunks[i];
@@ -377,10 +385,10 @@
     mDuration -= aDuration - t;
   }
 
-  void RemoveTrailing(TrackTicks aKeep, uint32_t aStartIndex)
+  void RemoveTrailing(StreamTime aKeep, uint32_t aStartIndex)
   {
     NS_ASSERTION(aKeep >= 0, "Can't keep negative duration");
-    TrackTicks t = aKeep;
+    StreamTime t = aKeep;
     uint32_t i;
     for (i = aStartIndex; i < mChunks.Length(); ++i) {
       Chunk* c = &mChunks[i];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/MediaSource.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/MediaSource.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/MediaSource.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/MediaSource.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -418,14 +418,10 @@
 MediaSource::DurationChange(double aOldDuration, double aNewDuration)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MSE_DEBUG("MediaSource(%p)::DurationChange(aNewDuration=%f)", this, aNewDuration);
+  MSE_DEBUG("MediaSource(%p)::DurationChange(aOldDuration=%f, aNewDuration=%f)", this, aOldDuration, aNewDuration);
 
   if (aNewDuration < aOldDuration) {
-    ErrorResult rv;
-    mSourceBuffers->Remove(aNewDuration, aOldDuration, rv);
-    if (rv.Failed()) {
-      return;
-    }
+    mSourceBuffers->RangeRemoval(aNewDuration, aOldDuration);
   }
   // TODO: If partial audio frames/text cues exist, clamp duration based on mSourceBuffers.
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/MediaSourceReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/MediaSourceReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/MediaSourceReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/MediaSourceReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -16,6 +16,7 @@
 #include "TrackBuffer.h"
 
 #ifdef MOZ_FMP4
+#include "SharedDecoderManager.h"
 #include "MP4Decoder.h"
 #include "MP4Reader.h"
 #endif
@@ -62,6 +63,9 @@
   , mAudioIsSeeking(false)
   , mVideoIsSeeking(false)
   , mHasEssentialTrackBuffers(false)
+#ifdef MOZ_FMP4
+  , mSharedDecoderManager(new SharedDecoderManager())
+#endif
 {
 }
 
@@ -113,7 +117,6 @@
     if (aSample->mTime < mTimeThreshold) {
       MSE_DEBUG("MediaSourceReader(%p)::OnAudioDecoded mTime=%lld < mTimeThreshold=%lld",
                 this, aSample->mTime, mTimeThreshold);
-      delete aSample;
       mAudioReader->RequestAudioData();
       return;
     }
@@ -158,7 +161,6 @@
     if (aSample->mTime < mTimeThreshold) {
       MSE_DEBUG("MediaSourceReader(%p)::OnVideoDecoded mTime=%lld < mTimeThreshold=%lld",
                 this, aSample->mTime, mTimeThreshold);
-      delete aSample;
       mVideoReader->RequestVideoData(false, 0);
       return;
     }
@@ -371,6 +373,9 @@
     new MediaDataDecodedListener<MediaSourceReader>(this, GetTaskQueue());
   reader->SetCallback(callback);
   reader->SetTaskQueue(GetTaskQueue());
+#ifdef MOZ_FMP4
+  reader->SetSharedDecoderManager(mSharedDecoderManager);
+#endif
   reader->Init(nullptr);
 
   MSE_DEBUG("MediaSourceReader(%p)::CreateSubDecoder subdecoder %p subreader %p",
@@ -640,6 +645,29 @@
 }
 
 void
+MediaSourceReader::ReadUpdatedMetadata(MediaInfo* aInfo)
+{
+  if (mAudioTrack) {
+    MOZ_ASSERT(mAudioTrack->IsReady());
+    mAudioReader = mAudioTrack->Decoders()[0]->GetReader();
+
+    const MediaInfo& info = mAudioReader->GetMediaInfo();
+    MOZ_ASSERT(info.HasAudio());
+    mInfo.mAudio = info.mAudio;
+  }
+
+  if (mVideoTrack) {
+    MOZ_ASSERT(mVideoTrack->IsReady());
+    mVideoReader = mVideoTrack->Decoders()[0]->GetReader();
+
+    const MediaInfo& info = mVideoReader->GetMediaInfo();
+    MOZ_ASSERT(info.HasVideo());
+    mInfo.mVideo = info.mVideo;
+  }
+  *aInfo = mInfo;
+}
+
+void
 MediaSourceReader::Ended()
 {
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/MediaSourceReader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/MediaSourceReader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/MediaSourceReader.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/MediaSourceReader.h	2014-11-26 21:46:01.000000000 +0000
@@ -84,6 +84,7 @@
   bool IsMediaSeekable() { return true; }
 
   nsresult ReadMetadata(MediaInfo* aInfo, MetadataTags** aTags) MOZ_OVERRIDE;
+  void ReadUpdatedMetadata(MediaInfo* aInfo) MOZ_OVERRIDE;
   void Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime,
             int64_t aCurrentTime) MOZ_OVERRIDE;
 
@@ -175,6 +176,9 @@
   bool mVideoIsSeeking;
 
   bool mHasEssentialTrackBuffers;
+#ifdef MOZ_FMP4
+  nsRefPtr<SharedDecoderManager> mSharedDecoderManager;
+#endif
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBuffer.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBuffer.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -188,10 +188,19 @@
     aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);
     return;
   }
-  if (mUpdating || mMediaSource->ReadyState() != MediaSourceReadyState::Open) {
+  if (mUpdating) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
+  if (mMediaSource->ReadyState() == MediaSourceReadyState::Ended) {
+    mMediaSource->SetReadyState(MediaSourceReadyState::Open);
+  }
+  RangeRemoval(aStart, aEnd);
+}
+
+void
+SourceBuffer::RangeRemoval(double aStart, double aEnd)
+{
   StartUpdating();
   /// TODO: Run coded frame removal algorithm.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBuffer.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBuffer.h	2014-11-26 21:46:01.000000000 +0000
@@ -108,6 +108,9 @@
   double GetBufferedStart();
   double GetBufferedEnd();
 
+  // Runs the range removal algorithm as defined by the MSE spec.
+  void RangeRemoval(double aStart, double aEnd);
+
 #if defined(DEBUG)
   void Dump(const char* aPath);
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBufferList.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBufferList.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBufferList.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBufferList.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -108,15 +108,12 @@
 }
 
 void
-SourceBufferList::Remove(double aStart, double aEnd, ErrorResult& aRv)
+SourceBufferList::RangeRemoval(double aStart, double aEnd)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MSE_DEBUG("SourceBufferList(%p)::Remove(aStart=%f, aEnd=%f", this, aStart, aEnd);
+  MSE_DEBUG("SourceBufferList(%p)::RangeRemoval(aStart=%f, aEnd=%f", this, aStart, aEnd);
   for (uint32_t i = 0; i < mSourceBuffers.Length(); ++i) {
-    mSourceBuffers[i]->Remove(aStart, aEnd, aRv);
-    if (aRv.Failed()) {
-      return;
-    }
+    mSourceBuffers[i]->RangeRemoval(aStart, aEnd);
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBufferList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBufferList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/SourceBufferList.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/SourceBufferList.h	2014-11-26 21:46:01.000000000 +0000
@@ -66,9 +66,8 @@
   // Returns true if updating is true on any SourceBuffers in the list.
   bool AnyUpdating();
 
-  // Calls Remove(aStart, aEnd) on each SourceBuffer in the list.  Aborts on
-  // first error, with result returned in aRv.
-  void Remove(double aStart, double aEnd, ErrorResult& aRv);
+  // Runs the range removal steps from the MSE specification on each SourceBuffer.
+  void RangeRemoval(double aStart, double aEnd);
 
   // Mark all SourceBuffers input buffers as ended.
   void Ended();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/mochitest.ini	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/mochitest.ini	2014-11-26 21:46:01.000000000 +0000
@@ -9,6 +9,8 @@
 [test_MediaSource_disabled.html]
 [test_BufferedSeek.html]
 [test_BufferingWait.html]
+[test_EndOfStream.html]
+skip-if = (toolkit == 'android' || buildapp == 'mulet') #timeout android/mulet only bug 1101187
 [test_FrameSelection.html]
 [test_HaveMetadataUnbufferedSeek.html]
 [test_LoadedMetadataFired.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_BufferedSeek.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_BufferedSeek.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_BufferedSeek.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_BufferedSeek.html	2014-11-26 21:46:01.000000000 +0000
@@ -12,6 +12,8 @@
 
 SimpleTest.waitForExplicitFinish();
 
+var updateCount = 0;
+
 runWithMSE(function (ms, v) {
   ms.addEventListener("sourceopen", function () {
     var sb = ms.addSourceBuffer("video/webm");
@@ -19,7 +21,13 @@
     fetchWithXHR("seek.webm", function (arrayBuffer) {
       sb.appendBuffer(new Uint8Array(arrayBuffer));
       sb.addEventListener("updateend", function () {
-        ms.endOfStream()
+        updateCount++;
+        /* Ensure that we endOfStream on the first update event only as endOfStream can
+           raise more if the duration of the last buffered range and the intial duration
+           differ. See bug 1065207 */
+        if (updateCount == 1) {
+          ms.endOfStream();
+        };
       });
     });
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_EndOfStream.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_EndOfStream.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_EndOfStream.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_EndOfStream.html	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>MSE: endOfStream call after an appendBuffer</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="mediasource.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();
+
+runWithMSE(function () {
+  var ms = new MediaSource();
+
+  var v = document.createElement("video");
+  v.src = URL.createObjectURL(ms);
+  document.body.appendChild(v);
+
+  ms.addEventListener("sourceopen", function () {
+    var sb = ms.addSourceBuffer("video/webm");
+
+    fetchWithXHR("seek.webm", function (arrayBuffer) {
+      sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 88966));
+      var count = 0;
+      sb.addEventListener("updateend", function () {
+        ++count;
+        if (count == 1) {
+          setTimeout(function() {
+                       var fail = false;
+                       try {
+                         ms.endOfStream();
+                       } catch (e) {
+                         fail = true;
+                       }
+                       ok(!fail, "MediaSource.endOfStream succeeded");
+                       SimpleTest.finish();
+                     }, 0);
+        }
+      });
+    });
+  });
+});
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_FrameSelection.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_FrameSelection.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_FrameSelection.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_FrameSelection.html	2014-11-26 21:46:01.000000000 +0000
@@ -12,6 +12,8 @@
 
 SimpleTest.waitForExplicitFinish();
 
+var updateCount = 0;
+
 runWithMSE(function (ms, v) {
   ms.addEventListener("sourceopen", function () {
     var sb = ms.addSourceBuffer("video/webm");
@@ -34,13 +36,13 @@
       fetchWithXHR("seek_lowres.webm", function (arrayBuffer) {
         // Append initialization segment.
         sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 438));
-        var first = true;
         sb.addEventListener("updateend", function () {
-          if (first) {
+          updateCount++;
+          if (updateCount == 1) {
             // Append media segment covering range [2, 4].
             sb.appendBuffer(new Uint8Array(arrayBuffer, 51003));
-            first = false;
-          } else {
+          }
+          else if (updateCount == 2) {
             ms.endOfStream();
             target = targets.shift();
             v.currentTime = target.currentTime;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_MediaSource.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_MediaSource.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_MediaSource.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_MediaSource.html	2014-11-26 21:46:01.000000000 +0000
@@ -57,7 +57,12 @@
     sb.addEventListener("update", function () {
       is(sb.updating, false, "SourceBuffer.updating is expected value in update event");
       updateCount++;
-      ms.endOfStream();
+      /* Ensure that we endOfStream on the first update event only as endOfStream can
+         raise more if the duration of the last buffered range and the intial duration
+         differ. See bug 1065207 */
+      if (updateCount == 1) {
+        ms.endOfStream();
+      }
     });
 
     sb.addEventListener("updatestart", function () {
@@ -84,9 +89,10 @@
     // XXX: Duration should be exactly 4.0, see bug 1065207.
     ok(Math.abs(v.duration - 4) <= 0.002, "Video has correct duration");
     ok(Math.abs(v.currentTime - 4) <= 0.002, "Video has played to end");
-    is(updateCount, 1, "update event received");
-    is(updateendCount, 1, "updateend event received");
-    is(updatestartCount, 1, "updatestart event received");
+    // XXX: 2 update events can be received dueto duration differences, see bug 1065207.
+    ok(updateCount == 1 || updateCount == 2, "update event received");
+    ok(updateendCount == 1 || updateendCount == 2, "updateend event received");
+    ok(updatestartCount == 1 || updatestartCount == 2, "updatestart event received");
     is(loadedmetadataCount, 1, "loadedmetadata event received");
     v.parentNode.removeChild(v);
     SimpleTest.finish();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStream.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStream.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStream.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStream.html	2014-11-26 21:46:01.000000000 +0000
@@ -12,6 +12,8 @@
 
 SimpleTest.waitForExplicitFinish();
 
+var updateCount = 0;
+
 runWithMSE(function (ms, v) {
   ms.addEventListener("sourceopen", function () {
     var sb = ms.addSourceBuffer("video/webm");
@@ -19,7 +21,13 @@
     fetchWithXHR("seek.webm", function (arrayBuffer) {
       sb.appendBuffer(new Uint8Array(arrayBuffer));
       sb.addEventListener("updateend", function () {
-        ms.endOfStream()
+        updateCount++;
+        /* Ensure that we endOfStream on the first update event only as endOfStream can
+           raise more if the duration of the last buffered range and the intial duration
+           differ. See bug 1065207 */
+        if (updateCount == 1) {
+          ms.endOfStream();
+        };
       });
     });
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html	2014-11-26 21:46:01.000000000 +0000
@@ -24,7 +24,7 @@
         if (updateCount == 1) {
           sb.appendBuffer(new Uint8Array(arrayBuffer, 25223));
         }
-        else {
+        else if (updateCount == 2) {
           ms.endOfStream();
         }
       });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SplitAppendDelay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SplitAppendDelay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SplitAppendDelay.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SplitAppendDelay.html	2014-11-26 21:46:01.000000000 +0000
@@ -12,20 +12,22 @@
 
 SimpleTest.waitForExplicitFinish();
 
+var updateCount = 0;
+
 runWithMSE(function (ms, v) {
   ms.addEventListener("sourceopen", function () {
     var sb = ms.addSourceBuffer("video/webm");
 
     fetchWithXHR("seek.webm", function (arrayBuffer) {
       sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 318));
-      var first = true;
       sb.addEventListener("updateend", function () {
-        if (first) {
+        updateCount++;
+        if (updateCount == 1) {
           window.setTimeout(function () {
             sb.appendBuffer(new Uint8Array(arrayBuffer, 318));
-            first = false;
           }, 1000);
-        } else {
+        }
+        else if (updateCount == 2) {
           ms.endOfStream();
         }
       });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SplitAppend.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SplitAppend.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_SplitAppend.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_SplitAppend.html	2014-11-26 21:46:01.000000000 +0000
@@ -12,18 +12,20 @@
 
 SimpleTest.waitForExplicitFinish();
 
+var updateCount = 0;
+
 runWithMSE(function (ms, v) {
   ms.addEventListener("sourceopen", function () {
     var sb = ms.addSourceBuffer("video/webm");
 
     fetchWithXHR("seek.webm", function (arrayBuffer) {
       sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 318));
-      var first = true;
       sb.addEventListener("updateend", function () {
-        if (first) {
+        updateCount++;
+        if (updateCount == 1) {
           sb.appendBuffer(new Uint8Array(arrayBuffer, 318));
-          first = false;
-        } else {
+        }
+        else if (updateCount == 2) {
           ms.endOfStream();
         }
       });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_WaitingOnMissingData.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_WaitingOnMissingData.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/test/test_WaitingOnMissingData.html	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/test/test_WaitingOnMissingData.html	2014-11-26 21:46:01.000000000 +0000
@@ -61,7 +61,7 @@
   });
   v.addEventListener("ended", function () {
     ok(Math.abs(v.duration - 4) < 0.1, "Video has correct duration. This fuzz factor is due to bug 1065207");
-    is(v.currentTime, v.duration, "Video has correct current time: " + v.currentTime);
+    ok(Math.abs(v.currentTime - 4) < 0.1, "Video has correct currentTime. See bug 1101062");
     ok(gotWaiting, "Received waiting event and playback continued after data added");
     SimpleTest.finish();
   });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/TrackBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/TrackBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/TrackBuffer.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/TrackBuffer.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -38,7 +38,6 @@
   : mParentDecoder(aParentDecoder)
   , mType(aType)
   , mLastStartTimestamp(0)
-  , mLastEndTimestamp(0)
 {
   MOZ_COUNT_CTOR(TrackBuffer);
   mParser = ContainerParser::CreateForMIMEType(aType);
@@ -134,9 +133,10 @@
   int64_t start, end;
   if (mParser->ParseStartAndEndTimestamps(aData, aLength, start, end)) {
     if (mParser->IsMediaSegmentPresent(aData, aLength) &&
-        !mParser->TimestampsFuzzyEqual(start, mLastEndTimestamp)) {
+        mLastEndTimestamp &&
+        !mParser->TimestampsFuzzyEqual(start, mLastEndTimestamp.value())) {
       MSE_DEBUG("TrackBuffer(%p)::AppendData: Data last=[%lld, %lld] overlaps [%lld, %lld]",
-                this, mLastStartTimestamp, mLastEndTimestamp, start, end);
+                this, mLastStartTimestamp, mLastEndTimestamp.value(), start, end);
 
       // This data is earlier in the timeline than data we have already
       // processed, so we must create a new decoder to handle the decoding.
@@ -147,10 +147,12 @@
       const nsTArray<uint8_t>& initData = mParser->InitData();
       AppendDataToCurrentResource(initData.Elements(), initData.Length());
       mLastStartTimestamp = start;
+    } else {
+      MSE_DEBUG("TrackBuffer(%p)::AppendData: Segment last=[%lld, %lld] [%lld, %lld]",
+                this, mLastStartTimestamp, mLastEndTimestamp ? mLastEndTimestamp.value() : 0, start, end);
     }
-    mLastEndTimestamp = end;
-    MSE_DEBUG("TrackBuffer(%p)::AppendData: Segment last=[%lld, %lld] [%lld, %lld]",
-              this, mLastStartTimestamp, mLastEndTimestamp, start, end);
+    mLastEndTimestamp.reset();
+    mLastEndTimestamp.emplace(end);
   }
 
   if (!AppendDataToCurrentResource(aData, aLength)) {
@@ -264,7 +266,7 @@
   mDecoders.AppendElement(decoder);
 
   mLastStartTimestamp = 0;
-  mLastEndTimestamp = 0;
+  mLastEndTimestamp.reset();
 
   decoder->SetTaskQueue(mTaskQueue);
   return decoder.forget();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/TrackBuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/TrackBuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/mediasource/TrackBuffer.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/mediasource/TrackBuffer.h	2014-11-26 21:46:01.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/mozalloc.h"
+#include "mozilla/Maybe.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nscore.h"
@@ -147,7 +148,7 @@
   // The last start and end timestamps added to the TrackBuffer via
   // AppendData.  Accessed on the main thread only.
   int64_t mLastStartTimestamp;
-  int64_t mLastEndTimestamp;
+  Maybe<int64_t> mLastEndTimestamp;
 
   // Set when the first decoder used by this TrackBuffer is initialized.
   // Protected by mParentDecoder's monitor.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaStreamGraph.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaStreamGraph.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaStreamGraph.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaStreamGraph.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -65,7 +65,7 @@
 /**
  * The singleton graph instance.
  */
-static MediaStreamGraphImpl* gGraph;
+static nsDataHashtable<nsUint32HashKey, MediaStreamGraphImpl*> gGraphs;
 
 MediaStreamGraphImpl::~MediaStreamGraphImpl()
 {
@@ -195,18 +195,18 @@
       aStream->ApplyTrackDisabling(data->mID, data->mData);
       for (uint32_t j = 0; j < aStream->mListeners.Length(); ++j) {
         MediaStreamListener* l = aStream->mListeners[j];
-        TrackTicks offset = (data->mCommands & SourceMediaStream::TRACK_CREATE)
+        StreamTime offset = (data->mCommands & SourceMediaStream::TRACK_CREATE)
             ? data->mStart : aStream->mBuffer.FindTrack(data->mID)->GetSegment()->GetDuration();
-        l->NotifyQueuedTrackChanges(this, data->mID, data->mOutputRate,
+        l->NotifyQueuedTrackChanges(this, data->mID,
                                     offset, data->mCommands, *data->mData);
       }
       if (data->mCommands & SourceMediaStream::TRACK_CREATE) {
         MediaSegment* segment = data->mData.forget();
-        STREAM_LOG(PR_LOG_DEBUG, ("SourceMediaStream %p creating track %d, rate %d, start %lld, initial end %lld",
-                                  aStream, data->mID, data->mOutputRate, int64_t(data->mStart),
+        STREAM_LOG(PR_LOG_DEBUG, ("SourceMediaStream %p creating track %d, start %lld, initial end %lld",
+                                  aStream, data->mID, int64_t(data->mStart),
                                   int64_t(segment->GetDuration())));
 
-        aStream->mBuffer.AddTrack(data->mID, data->mOutputRate, data->mStart, segment);
+        aStream->mBuffer.AddTrack(data->mID, data->mStart, segment);
         // The track has taken ownership of data->mData, so let's replace
         // data->mData with an empty clone.
         data->mData = segment->CreateEmptyClone();
@@ -262,7 +262,7 @@
       // Note that track->IsEnded() must be false, otherwise we would have
       // removed the track from mUpdateTracks already.
       NS_ASSERTION(!track->IsEnded(), "What is this track doing here?");
-      data->mHaveEnough = track->GetEndTimeRoundDown() >= desiredEnd;
+      data->mHaveEnough = track->GetEnd() >= desiredEnd;
       if (!data->mHaveEnough) {
         runnables.MoveElementsFrom(data->mDispatchWhenNotEnough);
       }
@@ -950,19 +950,19 @@
   }
 }
 
-TrackTicks
+StreamTime
 MediaStreamGraphImpl::PlayAudio(MediaStream* aStream,
                                 GraphTime aFrom, GraphTime aTo)
 {
   MOZ_ASSERT(mRealtime, "Should only attempt to play audio in realtime mode");
 
-  TrackTicks ticksWritten = 0;
+  StreamTime ticksWritten = 0;
   // We compute the number of needed ticks by converting a difference of graph
   // time rather than by substracting two converted stream time to ensure that
   // the rounding between {Graph,Stream}Time and track ticks is not dependant
   // on the absolute value of the {Graph,Stream}Time, and so that number of
   // ticks to play is the same for each cycle.
-  TrackTicks ticksNeeded = TimeToTicksRoundDown(mSampleRate, aTo) - TimeToTicksRoundDown(mSampleRate, aFrom);
+  StreamTime ticksNeeded = aTo - aFrom;
 
   if (aStream->mAudioOutputStreams.IsEmpty()) {
     return 0;
@@ -978,13 +978,12 @@
     StreamBuffer::Track* track = aStream->mBuffer.FindTrack(audioOutput.mTrackID);
     AudioSegment* audio = track->Get<AudioSegment>();
     AudioSegment output;
-    MOZ_ASSERT(track->GetRate() == mSampleRate);
 
     // offset and audioOutput.mLastTickWritten can differ by at most one sample,
     // because of the rounding issue. We track that to ensure we don't skip a
     // sample. One sample may be played twice, but this should not happen
     // again during an unblocked sequence of track samples.
-    TrackTicks offset = track->TimeToTicksRoundDown(GraphTimeToStreamTime(aStream, aFrom));
+    StreamTime offset = GraphTimeToStreamTime(aStream, aFrom);
     if (audioOutput.mLastTickWritten &&
         audioOutput.mLastTickWritten != offset) {
       // If there is a global underrun of the MSG, this property won't hold, and
@@ -1007,11 +1006,11 @@
 
       // Check how many ticks of sound we can provide if we are blocked some
       // time in the middle of this cycle.
-      TrackTicks toWrite = 0;
+      StreamTime toWrite = 0;
       if (end >= aTo) {
         toWrite = ticksNeeded;
       } else {
-        toWrite = TimeToTicksRoundDown(mSampleRate, end - t);
+        toWrite = end - t;
       }
       ticksNeeded -= toWrite;
 
@@ -1022,8 +1021,8 @@
                                     aStream, toWrite, MediaTimeToSeconds(t), MediaTimeToSeconds(end),
                                     offset, offset + toWrite));
       } else {
-        TrackTicks endTicksNeeded = offset + toWrite;
-        TrackTicks endTicksAvailable = audio->GetDuration();
+        StreamTime endTicksNeeded = offset + toWrite;
+        StreamTime endTicksAvailable = audio->GetDuration();
         STREAM_LOG(PR_LOG_DEBUG+1, ("MediaStream %p writing %ld samples for %f to %f (samples %ld to %ld)\n",
                                      aStream, toWrite, MediaTimeToSeconds(t), MediaTimeToSeconds(end),
                                      offset, endTicksNeeded));
@@ -1094,19 +1093,17 @@
   MOZ_ASSERT(framePosition >= aStream->mBufferStartTime, "frame position before buffer?");
   StreamTime frameBufferTime = GraphTimeToStreamTime(aStream, framePosition);
 
-  TrackTicks start;
+  StreamTime start;
   const VideoFrame* frame = nullptr;
-  StreamBuffer::Track* track;
   for (StreamBuffer::TrackIter tracks(aStream->GetStreamBuffer(), MediaSegment::VIDEO);
        !tracks.IsEnded(); tracks.Next()) {
     VideoSegment* segment = tracks->Get<VideoSegment>();
-    TrackTicks thisStart;
+    StreamTime thisStart;
     const VideoFrame* thisFrame =
-      segment->GetFrameAt(tracks->TimeToTicksRoundDown(frameBufferTime), &thisStart);
+        segment->GetFrameAt(frameBufferTime, &thisStart);
     if (thisFrame && thisFrame->GetImage()) {
       start = thisStart;
       frame = thisFrame;
-      track = tracks.get();
     }
   }
   if (!frame || *frame == aStream->mLastPlayedVideoFrame)
@@ -1116,7 +1113,7 @@
                               aStream, frame->GetImage(), frame->GetIntrinsicSize().width,
                               frame->GetIntrinsicSize().height));
   GraphTime startTime = StreamTimeToGraphTime(aStream,
-      track->TicksToTimeRoundDown(start), INCLUDE_TRAILING_BLOCKED_INTERVAL);
+      start, INCLUDE_TRAILING_BLOCKED_INTERVAL);
   TimeStamp targetTime = CurrentDriver()->GetCurrentTimeStamp() +
       TimeDuration::FromMilliseconds(double(startTime - IterationEnd()));
   for (uint32_t i = 0; i < aStream->mVideoOutputs.Length(); ++i) {
@@ -1139,7 +1136,7 @@
 
     nsCOMPtr<nsIRunnable> event =
       NS_NewRunnableMethod(output, &VideoFrameContainer::Invalidate);
-    NS_DispatchToMainThread(event);
+    DispatchToMainThreadAfterStreamStateUpdate(event.forget());
   }
   if (!aStream->mNotifiedFinished) {
     aStream->mLastPlayedVideoFrame = *frame;
@@ -1196,19 +1193,13 @@
   }
 }
 
-/**
- * Returns smallest value of t such that
- * TimeToTicksRoundUp(aSampleRate, t) is a multiple of WEBAUDIO_BLOCK_SIZE
- * and floor(TimeToTicksRoundUp(aSampleRate, t)/WEBAUDIO_BLOCK_SIZE) >
- * floor(TimeToTicksRoundUp(aSampleRate, aTime)/WEBAUDIO_BLOCK_SIZE).
- */
 GraphTime
 MediaStreamGraphImpl::RoundUpToNextAudioBlock(GraphTime aTime)
 {
-  TrackTicks ticks = aTime;
+  StreamTime ticks = aTime;
   uint64_t block = ticks >> WEBAUDIO_BLOCK_SIZE_BITS;
   uint64_t nextBlock = block + 1;
-  TrackTicks nextTicks = nextBlock << WEBAUDIO_BLOCK_SIZE_BITS;
+  StreamTime nextTicks = nextBlock << WEBAUDIO_BLOCK_SIZE_BITS;
   return nextTicks;
 }
 
@@ -1306,7 +1297,7 @@
   bool doneAllProducing = false;
   // This is the number of frame that are written to the AudioStreams, for
   // this cycle.
-  TrackTicks ticksPlayed = 0;
+  StreamTime ticksPlayed = 0;
 
   mMixer.StartMixing();
 
@@ -1345,7 +1336,7 @@
     if (mRealtime) {
       CreateOrDestroyAudioStreams(aFrom, stream);
       if (CurrentDriver()->AsAudioCallbackDriver()) {
-        TrackTicks ticksPlayedForThisStream = PlayAudio(stream, aFrom, aTo);
+        StreamTime ticksPlayedForThisStream = PlayAudio(stream, aFrom, aTo);
         if (!ticksPlayed) {
           ticksPlayed = ticksPlayedForThisStream;
         } else {
@@ -1636,9 +1627,10 @@
         NS_DispatchToMainThread(event);
 
         LIFECYCLE_LOG("Disconnecting MediaStreamGraph %p", this);
-        if (this == gGraph) {
+        MediaStreamGraphImpl* graph;
+        if (gGraphs.Get(mAudioChannel, &graph) && graph == this) {
           // null out gGraph if that's the graph being shut down
-          gGraph = nullptr;
+          gGraphs.Remove(mAudioChannel);
         }
       }
     } else {
@@ -1789,9 +1781,12 @@
     delete aMessage;
     if (IsEmpty() &&
         mLifecycleState >= LIFECYCLE_WAITING_FOR_STREAM_DESTRUCTION) {
-      if (gGraph == this) {
-        gGraph = nullptr;
+
+      MediaStreamGraphImpl* graph;
+      if (gGraphs.Get(mAudioChannel, &graph) && graph == this) {
+        gGraphs.Remove(mAudioChannel);
       }
+
       Destroy();
     }
     return;
@@ -1928,19 +1923,18 @@
 }
 
 StreamBuffer::Track*
-MediaStream::EnsureTrack(TrackID aTrackId, TrackRate aSampleRate)
+MediaStream::EnsureTrack(TrackID aTrackId)
 {
   StreamBuffer::Track* track = mBuffer.FindTrack(aTrackId);
   if (!track) {
     nsAutoPtr<MediaSegment> segment(new AudioSegment());
     for (uint32_t j = 0; j < mListeners.Length(); ++j) {
       MediaStreamListener* l = mListeners[j];
-      l->NotifyQueuedTrackChanges(Graph(), aTrackId,
-                                  GraphImpl()->AudioSampleRate(), 0,
+      l->NotifyQueuedTrackChanges(Graph(), aTrackId, 0,
                                   MediaStreamListener::TRACK_EVENT_CREATED,
                                   *segment);
     }
-    track = &mBuffer.AddTrack(aTrackId, aSampleRate, 0, segment.forget());
+    track = &mBuffer.AddTrack(aTrackId, 0, segment.forget());
   }
   return track;
 }
@@ -2276,22 +2270,19 @@
 }
 
 void
-SourceMediaStream::AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart,
-                            MediaSegment* aSegment)
+SourceMediaStream::AddTrackInternal(TrackID aID, TrackRate aRate, StreamTime aStart,
+                                    MediaSegment* aSegment)
 {
   MutexAutoLock lock(mMutex);
   TrackData* data = mUpdateTracks.AppendElement();
   data->mID = aID;
   data->mInputRate = aRate;
-  // We resample all audio input tracks to the sample rate of the audio mixer.
-  data->mOutputRate = aSegment->GetType() == MediaSegment::AUDIO ?
-                      GraphImpl()->AudioSampleRate() : aRate;
   data->mStart = aStart;
   data->mCommands = TRACK_CREATE;
   data->mData = aSegment;
   data->mHaveEnough = false;
-  if (auto graph = GraphImpl()) {
-    graph->EnsureNextIteration();
+  if (GraphImpl()) {
+    GraphImpl()->EnsureNextIteration();
   }
 }
 
@@ -2299,7 +2290,7 @@
 SourceMediaStream::ResampleAudioToGraphSampleRate(TrackData* aTrackData, MediaSegment* aSegment)
 {
   if (aSegment->GetType() != MediaSegment::AUDIO ||
-      aTrackData->mInputRate == GraphImpl()->AudioSampleRate()) {
+      aTrackData->mInputRate == GraphImpl()->GraphRate()) {
     return;
   }
   AudioSegment* segment = static_cast<AudioSegment*>(aSegment);
@@ -2312,7 +2303,7 @@
     } else {
       SpeexResamplerState* state = speex_resampler_init(channels,
                                                         aTrackData->mInputRate,
-                                                        GraphImpl()->AudioSampleRate(),
+                                                        GraphImpl()->GraphRate(),
                                                         SPEEX_RESAMPLER_QUALITY_DEFAULT,
                                                         nullptr);
       if (!state) {
@@ -2324,7 +2315,7 @@
 #endif
     }
   }
-  segment->ResampleChunks(aTrackData->mResampler, aTrackData->mInputRate, GraphImpl()->AudioSampleRate());
+  segment->ResampleChunks(aTrackData->mResampler, aTrackData->mInputRate, GraphImpl()->GraphRate());
 }
 
 bool
@@ -2370,8 +2361,8 @@
 
   for (uint32_t j = 0; j < mDirectListeners.Length(); ++j) {
     MediaStreamDirectListener* l = mDirectListeners[j];
-    TrackTicks offset = 0; // FIX! need a separate TrackTicks.... or the end of the internal buffer
-    l->NotifyRealtimeData(static_cast<MediaStreamGraph*>(GraphImpl()), aTrack->mID, aTrack->mOutputRate,
+    StreamTime offset = 0; // FIX! need a separate StreamTime.... or the end of the internal buffer
+    l->NotifyRealtimeData(static_cast<MediaStreamGraph*>(GraphImpl()), aTrack->mID,
                           offset, aTrack->mCommands, *aSegment);
   }
 }
@@ -2514,7 +2505,7 @@
   // we will call NotifyEvent() to let GetUserMedia know
 }
 
-TrackTicks
+StreamTime
 SourceMediaStream::GetBufferedTicks(TrackID aID)
 {
   StreamBuffer::Track* track  = mBuffer.FindTrack(aID);
@@ -2522,8 +2513,7 @@
     MediaSegment* segment = track->GetSegment();
     if (segment) {
       return segment->GetDuration() -
-        track->TimeToTicksRoundDown(
-          GraphTimeToStreamTime(GraphImpl()->CurrentDriver()->StateComputedTime()));
+          GraphTimeToStreamTime(GraphImpl()->CurrentDriver()->StateComputedTime());
     }
   }
   return 0;
@@ -2713,14 +2703,14 @@
                                            TrackRate aSampleRate,
                                            DOMMediaStream::TrackTypeHints aHint= DOMMediaStream::HINT_CONTENTS_UNKNOWN,
                                            dom::AudioChannel aChannel)
-  : mProcessingGraphUpdateIndex(0)
+  : MediaStreamGraph(aSampleRate)
+  , mProcessingGraphUpdateIndex(0)
   , mPortCount(0)
   , mNeedAnotherIteration(false)
   , mGraphDriverAsleep(false)
   , mMonitor("MediaStreamGraphImpl")
   , mLifecycleState(LIFECYCLE_THREAD_NOT_STARTED)
   , mEndTime(GRAPH_TIME_MAX)
-  , mSampleRate(aSampleRate)
   , mForceShutDown(false)
   , mPostedRunInStableStateEvent(false)
   , mFlushSourcesNow(false)
@@ -2741,6 +2731,7 @@
 #ifdef DEBUG
   , mCanRunMessagesSynchronously(false)
 #endif
+  , mAudioChannel(static_cast<uint32_t>(aChannel))
 {
 #ifdef PR_LOGGING
   if (!gMediaStreamGraphLog) {
@@ -2779,15 +2770,26 @@
 
 static bool gShutdownObserverRegistered = false;
 
+namespace {
+
+PLDHashOperator
+ForceShutdownEnumerator(const uint32_t& /* aAudioChannel */,
+                        MediaStreamGraphImpl* aGraph,
+                        void* /* aUnused */)
+{
+  aGraph->ForceShutDown();
+  return PL_DHASH_NEXT;
+}
+
+} // anonymous namespace
+
 NS_IMETHODIMP
 MediaStreamGraphShutdownObserver::Observe(nsISupports *aSubject,
                                           const char *aTopic,
                                           const char16_t *aData)
 {
   if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
-    if (gGraph) {
-      gGraph->ForceShutDown();
-    }
+    gGraphs.EnumerateRead(ForceShutdownEnumerator, nullptr);
     nsContentUtils::UnregisterShutdownObserver(this);
     gShutdownObserverRegistered = false;
   }
@@ -2799,7 +2801,10 @@
 {
   NS_ASSERTION(NS_IsMainThread(), "Main thread only");
 
-  if (!gGraph) {
+  uint32_t channel = static_cast<uint32_t>(aChannel);
+  MediaStreamGraphImpl* graph = nullptr;
+
+  if (!gGraphs.Get(channel, &graph)) {
     if (!gShutdownObserverRegistered) {
       gShutdownObserverRegistered = true;
       nsContentUtils::RegisterShutdownObserver(new MediaStreamGraphShutdownObserver());
@@ -2807,12 +2812,13 @@
 
     CubebUtils::InitPreferredSampleRate();
 
-    gGraph = new MediaStreamGraphImpl(true, CubebUtils::PreferredSampleRate(), aHint, aChannel);
+    graph = new MediaStreamGraphImpl(true, CubebUtils::PreferredSampleRate(), aHint, aChannel);
+    gGraphs.Put(channel, graph);
 
-    STREAM_LOG(PR_LOG_DEBUG, ("Starting up MediaStreamGraph %p", gGraph));
+    STREAM_LOG(PR_LOG_DEBUG, ("Starting up MediaStreamGraph %p", graph));
   }
 
-  return gGraph;
+  return graph;
 }
 
 MediaStreamGraph*
@@ -2839,7 +2845,7 @@
 
   if (!graph->mNonRealtimeProcessing) {
     // Start the graph, but don't produce anything
-    graph->StartNonRealtimeProcessing(1, 0);
+    graph->StartNonRealtimeProcessing(0);
   }
   graph->ForceShutDown();
 }
@@ -2995,11 +3001,14 @@
 bool
 MediaStreamGraph::IsNonRealtime() const
 {
-  return this != gGraph;
+  const MediaStreamGraphImpl* impl = static_cast<const MediaStreamGraphImpl*>(this);
+  MediaStreamGraphImpl* graph;
+
+  return !gGraphs.Get(impl->AudioChannel(), &graph) || graph != impl;
 }
 
 void
-MediaStreamGraph::StartNonRealtimeProcessing(TrackRate aRate, uint32_t aTicksToProcess)
+MediaStreamGraph::StartNonRealtimeProcessing(uint32_t aTicksToProcess)
 {
   NS_ASSERTION(NS_IsMainThread(), "main thread only");
 
@@ -3009,8 +3018,7 @@
   if (graph->mNonRealtimeProcessing)
     return;
 
-  graph->mEndTime = graph->IterationEnd() +
-    RateConvertTicksRoundUp(graph->GraphRate(), aRate, aTicksToProcess);
+  graph->mEndTime = graph->IterationEnd() + aTicksToProcess;
   graph->mNonRealtimeProcessing = true;
   graph->EnsureRunInStableState();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaStreamGraph.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaStreamGraph.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaStreamGraph.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaStreamGraph.h	2014-11-26 21:46:00.000000000 +0000
@@ -174,8 +174,7 @@
    * at aTrackOffset (relative to the start of the stream).
    */
   virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                        TrackRate aTrackRate,
-                                        TrackTicks aTrackOffset,
+                                        StreamTime aTrackOffset,
                                         uint32_t aTrackEvents,
                                         const MediaSegment& aQueuedMedia) {}
 };
@@ -198,8 +197,7 @@
    * Note that NotifyQueuedTrackChanges() calls will also still occur.
    */
   virtual void NotifyRealtimeData(MediaStreamGraph* aGraph, TrackID aID,
-                                  TrackRate aTrackRate,
-                                  TrackTicks aTrackOffset,
+                                  StreamTime aTrackOffset,
                                   uint32_t aTrackEvents,
                                   const MediaSegment& aMedia) {}
 };
@@ -489,20 +487,22 @@
 
   double StreamTimeToSeconds(StreamTime aTime)
   {
-    return TrackTicksToSeconds(mBuffer.GraphRate(), aTime);
+    NS_ASSERTION(0 <= aTime && aTime <= STREAM_TIME_MAX, "Bad time");
+    return static_cast<double>(aTime)/mBuffer.GraphRate();
   }
   int64_t StreamTimeToMicroseconds(StreamTime aTime)
   {
-    return TimeToTicksRoundDown(1000000, aTime);
+    NS_ASSERTION(0 <= aTime && aTime <= STREAM_TIME_MAX, "Bad time");
+    return (aTime*1000000)/mBuffer.GraphRate();
   }
+  StreamTime MicrosecondsToStreamTimeRoundDown(int64_t aMicroseconds) {
+    return (aMicroseconds*mBuffer.GraphRate())/1000000;
+  }
+
   TrackTicks TimeToTicksRoundUp(TrackRate aRate, StreamTime aTime)
   {
     return RateConvertTicksRoundUp(aRate, mBuffer.GraphRate(), aTime);
   }
-  TrackTicks TimeToTicksRoundDown(TrackRate aRate, StreamTime aTime)
-  {
-    return RateConvertTicksRoundDown(aRate, mBuffer.GraphRate(), aTime);
-  }
   StreamTime TicksToTimeRoundDown(TrackRate aRate, TrackTicks aTicks)
   {
     return RateConvertTicksRoundDown(mBuffer.GraphRate(), aRate, aTicks);
@@ -534,7 +534,7 @@
 
   bool HasCurrentData() { return mHasCurrentData; }
 
-  StreamBuffer::Track* EnsureTrack(TrackID aTrack, TrackRate aSampleRate);
+  StreamBuffer::Track* EnsureTrack(TrackID aTrack);
 
   void ApplyTrackDisabling(TrackID aTrackID, MediaSegment* aSegment, MediaSegment* aRawSegment = nullptr);
 
@@ -620,7 +620,7 @@
     // blocking.
     MediaTime mBlockedAudioTime;
     // Last tick written to the audio output.
-    TrackTicks mLastTickWritten;
+    StreamTime mLastTickWritten;
     TrackID mTrackID;
   };
   nsTArray<AudioOutputStream> mAudioOutputStreams;
@@ -724,8 +724,19 @@
    * AdvanceKnownTracksTime). Takes ownership of aSegment. aSegment should
    * contain data starting after aStart.
    */
-  void AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart,
-                MediaSegment* aSegment);
+  void AddTrack(TrackID aID, StreamTime aStart, MediaSegment* aSegment)
+  {
+    AddTrackInternal(aID, GraphRate(), aStart, aSegment);
+  }
+
+  /**
+   * Like AddTrack, but resamples audio from aRate to the graph rate.
+   */
+  void AddAudioTrack(TrackID aID, TrackRate aRate, StreamTime aStart,
+                     AudioSegment* aSegment)
+  {
+    AddTrackInternal(aID, aRate, aStart, aSegment);
+  }
 
   /**
    * Append media data to a track. Ownership of aSegment remains with the caller,
@@ -791,7 +802,7 @@
    * any "extra" buffering, but NotifyQueued TrackChanges() on a TrackUnion
    * will be buffered.
    */
-  TrackTicks GetBufferedTicks(TrackID aID);
+  StreamTime GetBufferedTicks(TrackID aID);
 
   void RegisterForAudioMixing();
 
@@ -821,16 +832,13 @@
     TrackID mID;
     // Sample rate of the input data.
     TrackRate mInputRate;
-    // Sample rate of the output data, always equal to the sample rate of the
-    // graph.
-    TrackRate mOutputRate;
     // Resampler if the rate of the input track does not match the
     // MediaStreamGraph's.
     nsAutoRef<SpeexResamplerState> mResampler;
 #ifdef DEBUG
     int mResamplerChannelCount;
 #endif
-    TrackTicks mStart;
+    StreamTime mStart;
     // Each time the track updates are flushed to the media graph thread,
     // this is cleared.
     uint32_t mCommands;
@@ -845,6 +853,9 @@
 
   void ResampleAudioToGraphSampleRate(TrackData* aTrackData, MediaSegment* aSegment);
 
+  void AddTrackInternal(TrackID aID, TrackRate aRate,
+                        StreamTime aStart, MediaSegment* aSegment);
+
   TrackData* FindDataForTrack(TrackID aID)
   {
     mMutex.AssertCurrentThreadOwns();
@@ -1180,7 +1191,7 @@
   /**
    * Start processing non-realtime for a specific number of ticks.
    */
-  void StartNonRealtimeProcessing(TrackRate aRate, uint32_t aTicksToProcess);
+  void StartNonRealtimeProcessing(uint32_t aTicksToProcess);
 
   /**
    * Media graph thread only.
@@ -1194,9 +1205,15 @@
     *mPendingUpdateRunnables.AppendElement() = aRunnable;
   }
 
+  /**
+   * Returns graph sample rate in Hz.
+   */
+  TrackRate GraphRate() const { return mSampleRate; }
+
 protected:
-  MediaStreamGraph()
+  MediaStreamGraph(TrackRate aSampleRate)
     : mNextGraphUpdateIndex(1)
+    , mSampleRate(aSampleRate)
   {
     MOZ_COUNT_CTOR(MediaStreamGraph);
   }
@@ -1212,6 +1229,13 @@
   // The number of updates we have sent to the media graph thread + 1.
   // We start this at 1 just to ensure that 0 is usable as a special value.
   int64_t mNextGraphUpdateIndex;
+
+  /**
+   * Sample rate at which this graph runs. For real time graphs, this is
+   * the rate of the audio mixer. For offline graphs, this is the rate specified
+   * at construction.
+   */
+  TrackRate mSampleRate;
 };
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaStreamGraphImpl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaStreamGraphImpl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/MediaStreamGraphImpl.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/MediaStreamGraphImpl.h	2014-11-26 21:46:00.000000000 +0000
@@ -285,10 +285,8 @@
                            GraphTime aTime, GraphTime aEndBlockingDecisions,
                            GraphTime* aEnd);
   /**
-   * Returns smallest value of t such that
-   * TimeToTicksRoundUp(aSampleRate, t) is a multiple of WEBAUDIO_BLOCK_SIZE
-   * and floor(TimeToTicksRoundUp(aSampleRate, t)/WEBAUDIO_BLOCK_SIZE) >
-   * floor(TimeToTicksRoundUp(aSampleRate, aTime)/WEBAUDIO_BLOCK_SIZE).
+   * Returns smallest value of t such that t is a multiple of
+   * WEBAUDIO_BLOCK_SIZE and t > aTime.
    */
   GraphTime RoundUpToNextAudioBlock(GraphTime aTime);
   /**
@@ -352,7 +350,7 @@
    * Queue audio (mix of stream audio and silence for blocked intervals)
    * to the audio output stream. Returns the number of frames played.
    */
-  TrackTicks PlayAudio(MediaStream* aStream, GraphTime aFrom, GraphTime aTo);
+  StreamTime PlayAudio(MediaStream* aStream, GraphTime aFrom, GraphTime aTo);
   /**
    * Set the correct current video frame for stream aStream.
    */
@@ -398,29 +396,25 @@
     mStreamOrderDirty = true;
   }
 
-  TrackRate AudioSampleRate() const { return mSampleRate; }
-  TrackRate GraphRate() const { return mSampleRate; }
   // Always stereo for now.
   uint32_t AudioChannelCount() { return 2; }
 
   double MediaTimeToSeconds(GraphTime aTime)
   {
-    return TrackTicksToSeconds(GraphRate(), aTime);
+    NS_ASSERTION(0 <= aTime && aTime <= STREAM_TIME_MAX, "Bad time");
+    return static_cast<double>(aTime)/GraphRate();
   }
   GraphTime SecondsToMediaTime(double aS)
   {
-    return SecondsToTicksRoundDown(GraphRate(), aS);
+    NS_ASSERTION(0 <= aS && aS <= TRACK_TICKS_MAX/TRACK_RATE_MAX,
+                 "Bad seconds");
+    return GraphRate() * aS;
   }
   GraphTime MillisecondsToMediaTime(int32_t aMS)
   {
     return RateConvertTicksRoundDown(GraphRate(), 1000, aMS);
   }
 
-  TrackTicks TimeToTicksRoundDown(TrackRate aRate, StreamTime aTime)
-  {
-    return RateConvertTicksRoundDown(aRate, GraphRate(), aTime);
-  }
-
   /**
    * Signal to the graph that the thread has paused indefinitly,
    * or resumed.
@@ -595,12 +589,6 @@
   GraphTime mEndTime;
 
   /**
-   * Sample rate at which this graph runs. For real time graphs, this is
-   * the rate of the audio mixer. For offline graphs, this is the rate specified
-   * at construction.
-   */
-  TrackRate mSampleRate;
-  /**
    * True when we need to do a forced shutdown during application shutdown.
    */
   bool mForceShutDown;
@@ -661,6 +649,8 @@
   nsRefPtr<AudioOutputObserver> mFarendObserverRef;
 #endif
 
+  uint32_t AudioChannel() const { return mAudioChannel; }
+
 private:
   virtual ~MediaStreamGraphImpl();
 
@@ -694,6 +684,9 @@
   bool mCanRunMessagesSynchronously;
 #endif
 
+  // We use uint32_t instead AudioChannel because this is just used as key for
+  // the hashtable gGraphs.
+  uint32_t mAudioChannel;
 };
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/ogg/OggReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/ogg/OggReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/ogg/OggReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/ogg/OggReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -881,10 +881,10 @@
   }
 
   if (ret == TH_DUPFRAME) {
-    VideoData* v = VideoData::CreateDuplicate(mDecoder->GetResource()->Tell(),
-                                              time,
-                                              endTime - time,
-                                              aPacket->granulepos);
+    nsRefPtr<VideoData> v = VideoData::CreateDuplicate(mDecoder->GetResource()->Tell(),
+                                                       time,
+                                                       endTime - time,
+                                                       aPacket->granulepos);
     mVideoQueue.Push(v);
   } else if (ret == 0) {
     th_ycbcr_buffer buffer;
@@ -900,15 +900,15 @@
       b.mPlanes[i].mOffset = b.mPlanes[i].mSkip = 0;
     }
 
-    VideoData *v = VideoData::Create(mInfo.mVideo,
-                                     mDecoder->GetImageContainer(),
-                                     mDecoder->GetResource()->Tell(),
-                                     time,
-                                     endTime - time,
-                                     b,
-                                     isKeyframe,
-                                     aPacket->granulepos,
-                                     ToIntRect(mPicture));
+    nsRefPtr<VideoData> v = VideoData::Create(mInfo.mVideo,
+                                              mDecoder->GetImageContainer(),
+                                              mDecoder->GetResource()->Tell(),
+                                              time,
+                                              endTime - time,
+                                              b,
+                                              isKeyframe,
+                                              aPacket->granulepos,
+                                              ToIntRect(mPicture));
     if (!v) {
       // There may be other reasons for this error, but for
       // simplicity just assume the worst case: out of memory.
@@ -1540,7 +1540,7 @@
     // keyframe.
     VideoData* v;
     while ((v = mVideoQueue.PeekFront()) && !v->mKeyframe) {
-      delete mVideoQueue.PopFront();
+      nsRefPtr<VideoData> releaseMe = mVideoQueue.PopFront();
     }
     if (mVideoQueue.GetSize() == 0) {
       // We didn't find a keyframe in the frames already here, so decode
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecProxy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecProxy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecProxy.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecProxy.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -110,10 +110,6 @@
 MediaCodecProxy::~MediaCodecProxy()
 {
   releaseCodec();
-
-  // Complete all pending Binder ipc transactions
-  IPCThreadState::self()->flushCommands();
-
   cancelResource();
 }
 
@@ -181,6 +177,7 @@
 
     // Release MediaCodec
     if (mCodec != nullptr) {
+      status_t err = mCodec->stop();
       mCodec->release();
       mCodec = nullptr;
     }
@@ -190,6 +187,10 @@
     // this value come from stagefright's AwesomePlayer.
     usleep(1000);
   }
+
+  // Complete all pending Binder ipc transactions
+  IPCThreadState::self()->flushCommands();
+
 }
 
 bool
@@ -504,6 +505,21 @@
   return true;
 }
 
+bool MediaCodecProxy::UpdateOutputBuffers()
+{
+  if (mCodec == nullptr) {
+    ALOG("MediaCodec has not been inited from input!");
+    return false;
+  }
+
+  status_t err = getOutputBuffers(&mOutputBuffers);
+  if (err != OK){
+    ALOG("Couldn't update output buffers from MediaCodec");
+    return false;
+  }
+  return true;
+}
+
 status_t MediaCodecProxy::Input(const uint8_t* aData, uint32_t aDataSize,
                                 int64_t aTimestampUsecs, uint64_t aflags)
 {
@@ -540,7 +556,6 @@
 
 status_t MediaCodecProxy::Output(MediaBuffer** aBuffer, int64_t aTimeoutUs)
 {
-
   if (mCodec == nullptr) {
     ALOG("MediaCodec has not been inited from output!");
     return NO_INIT;
@@ -583,6 +598,8 @@
 
 bool MediaCodecProxy::IsWaitingResources()
 {
+  // Write Lock for mCodec
+  RWLock::AutoWLock awl(mCodecLock);
   return mCodec == nullptr;
 }
 
@@ -593,11 +610,8 @@
 
 void MediaCodecProxy::ReleaseMediaResources()
 {
-  if (mCodec.get()) {
-    mCodec->stop();
-    mCodec->release();
-    mCodec.clear();
-  }
+  releaseCodec();
+  cancelResource();
 }
 
 void MediaCodecProxy::ReleaseMediaBuffer(MediaBuffer* aBuffer) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecProxy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecProxy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecProxy.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecProxy.h	2014-11-26 21:46:01.000000000 +0000
@@ -132,6 +132,8 @@
   bool IsWaitingResources();
   bool IsDormantNeeded();
   void ReleaseMediaResources();
+  // This updates mOutputBuffer when receiving INFO_OUTPUT_BUFFERS_CHANGED event.
+  bool UpdateOutputBuffers();
 
   void ReleaseMediaBuffer(MediaBuffer* abuffer);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -282,10 +282,6 @@
 MediaCodecReader::ProcessCachedDataTask::Run()
 {
   mReader->ProcessCachedData(mOffset, nullptr);
-  nsRefPtr<ReferenceKeeperRunnable<MediaCodecReader>> runnable(
-      new ReferenceKeeperRunnable<MediaCodecReader>(mReader));
-  mReader = nullptr;
-  NS_DispatchToMainThread(runnable.get());
 }
 
 MediaCodecReader::MediaCodecReader(AbstractMediaDecoder* aDecoder)
@@ -305,7 +301,6 @@
 
 MediaCodecReader::~MediaCodecReader()
 {
-  MOZ_ASSERT(NS_IsMainThread(), "Should be on main thread.");
 }
 
 nsresult
@@ -482,7 +477,7 @@
 {
   bool result = DecodeAudioDataSync();
   if (AudioQueue().GetSize() > 0) {
-    AudioData* a = AudioQueue().PopFront();
+    nsRefPtr<AudioData> a = AudioQueue().PopFront();
     if (a) {
       if (mAudioTrack.mDiscontinuity) {
         a->mDiscontinuity = true;
@@ -502,7 +497,7 @@
 {
   bool result = DecodeVideoFrameSync(aTimeThreshold);
   if (VideoQueue().GetSize() > 0) {
-    VideoData* v = VideoQueue().PopFront();
+    nsRefPtr<VideoData> v = VideoQueue().PopFront();
     if (v) {
       if (mVideoTrack.mDiscontinuity) {
         v->mDiscontinuity = true;
@@ -883,7 +878,7 @@
   }
 
   bool result = false;
-  VideoData *v = nullptr;
+  nsRefPtr<VideoData> v;
   RefPtr<TextureClient> textureClient;
   sp<GraphicBuffer> graphicBuffer;
   if (bufferInfo.mBuffer != nullptr) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecReader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecReader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaCodecReader.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaCodecReader.h	2014-11-26 21:46:01.000000000 +0000
@@ -338,37 +338,6 @@
   };
   friend class ProcessCachedDataTask;
 
-  // This class is used to keep one reference count of T in it. And this class
-  // can make sure the stored reference count will be released on the dispatched
-  // thread. By using this class properly (ex. passing the pointer into this
-  // runnable first, then releasing the original pointer held by ourselves, and
-  // then dispatching this runnable onto the desired thread), we can avoid
-  // running the destructor of the referenced object on any other threads
-  // unexpectedly before this runnable has been executed.
-  template<class T>
-  class ReferenceKeeperRunnable : public nsRunnable
-  {
-  public:
-    ReferenceKeeperRunnable(nsRefPtr<T> aPointer)
-      : mPointer(aPointer)
-    {
-    }
-
-    NS_IMETHOD Run() MOZ_OVERRIDE
-    {
-      mPointer = nullptr;
-      return NS_OK;
-    }
-
-  private:
-    // Forbidden
-    ReferenceKeeperRunnable() MOZ_DELETE;
-    ReferenceKeeperRunnable(const ReferenceKeeperRunnable &rhs) MOZ_DELETE;
-    const ReferenceKeeperRunnable &operator=(const ReferenceKeeperRunnable &rhs) MOZ_DELETE;
-
-    nsRefPtr<T> mPointer;
-  };
-
   // Forbidden
   MediaCodecReader() MOZ_DELETE;
   const MediaCodecReader& operator=(const MediaCodecReader& rhs) MOZ_DELETE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaOmxReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaOmxReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/MediaOmxReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/MediaOmxReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -420,7 +420,7 @@
     // This is the approximate byte position in the stream.
     int64_t pos = mDecoder->GetResource()->Tell();
 
-    VideoData *v;
+    nsRefPtr<VideoData> v;
     if (!frame.mGraphicBuffer) {
 
       VideoData::YCbCrBuffer b;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/OmxDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/OmxDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/OmxDecoder.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/OmxDecoder.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -582,20 +582,24 @@
       }
       // If there is no next Keyframe, jump to the previous key frame.
       if (err == ERROR_END_OF_STREAM && seekMode == MediaSource::ReadOptions::SEEK_NEXT_SYNC) {
-         seekMode = MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC;
-	 findNextBuffer = true;
-	 {
-	   Mutex::Autolock autoLock(mSeekLock);
-	   mIsVideoSeeking = true;
-	 }
-	 continue;
+        seekMode = MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC;
+        findNextBuffer = true;
+        {
+          Mutex::Autolock autoLock(mSeekLock);
+          mIsVideoSeeking = true;
+        }
+        continue;
       } else if (err != OK) {
-	ALOG("Unexpected error when seeking to %lld", aTimeUs);
+        ALOG("Unexpected error when seeking to %lld", aTimeUs);
         break;
       }
       if (mVideoBuffer->range_length() == 0) {
         ReleaseVideoBuffer();
-	findNextBuffer = true;
+        findNextBuffer = true;
+        {
+          Mutex::Autolock autoLock(mSeekLock);
+          mIsVideoSeeking = true;
+        }
       }
     }
     aDoSeek = false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/RtspMediaCodecReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/RtspMediaCodecReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/omx/RtspMediaCodecReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/omx/RtspMediaCodecReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -93,9 +93,13 @@
 RtspMediaCodecReader::ReadMetadata(MediaInfo* aInfo,
                                    MetadataTags** aTags)
 {
+  mRtspResource->DisablePlayoutDelay();
+  EnsureActive();
   nsresult rv = MediaCodecReader::ReadMetadata(aInfo, aTags);
+  SetIdle();
+
   if (rv == NS_OK && !IsWaitingMediaResources()) {
-    EnsureActive();
+    mRtspResource->EnablePlayoutDelay();
   }
 
   return rv;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/PeerConnection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/PeerConnection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/PeerConnection.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/PeerConnection.js	2014-11-26 21:46:00.000000000 +0000
@@ -1302,8 +1302,7 @@
   onStateChange: function(state) {
     switch (state) {
       case "SignalingState":
-        this._dompc.callCB(this._dompc.onsignalingstatechange,
-                           this._dompc.signalingState);
+        this.dispatchEvent(new this._win.Event("signalingstatechange"));
         break;
 
       case "IceConnectionState":
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/raw/RawReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/raw/RawReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/raw/RawReader.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/raw/RawReader.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -215,15 +215,15 @@
   b.mPlanes[2].mWidth = mMetadata.frameWidth / 2;
   b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
 
-  VideoData *v = VideoData::Create(mInfo.mVideo,
-                                   mDecoder->GetImageContainer(),
-                                   -1,
-                                   currentFrameTime,
-                                   (USECS_PER_S / mFrameRate),
-                                   b,
-                                   1, // In raw video every frame is a keyframe
-                                   -1,
-                                   ToIntRect(mPicture));
+  nsRefPtr<VideoData> v = VideoData::Create(mInfo.mVideo,
+                                            mDecoder->GetImageContainer(),
+                                            -1,
+                                            currentFrameTime,
+                                            (USECS_PER_S / mFrameRate),
+                                            b,
+                                            1, // In raw video every frame is a keyframe
+                                            -1,
+                                            ToIntRect(mPicture));
   if (!v)
     return false;
 
@@ -278,12 +278,8 @@
       }
     }
 
-    nsAutoPtr<VideoData> video(mVideoQueue.PeekFront());
-    if (video && video->GetEndTime() < aTime) {
-      mVideoQueue.PopFront();
-      video = nullptr;
-    } else {
-      video.forget();
+    if (mVideoQueue.PeekFront() && mVideoQueue.PeekFront()->GetEndTime() < aTime) {
+      nsRefPtr<VideoData> releaseMe = mVideoQueue.PopFront();
     }
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/StreamBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/StreamBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/StreamBuffer.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/StreamBuffer.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -27,7 +27,7 @@
       STREAM_LOG(PR_LOG_ALWAYS, ("Track[%d] %d: ended", i, track->GetID()));
     } else {
       STREAM_LOG(PR_LOG_ALWAYS, ("Track[%d] %d: %lld", i, track->GetID(),
-                                 track->GetEndTimeRoundDown()));
+                                 track->GetEnd()));
     }
   }
 }
@@ -40,7 +40,7 @@
   for (uint32_t i = 0; i < mTracks.Length(); ++i) {
     Track* track = mTracks[i];
     if (!track->IsEnded()) {
-      t = std::min(t, track->GetEndTimeRoundDown());
+      t = std::min(t, track->GetEnd());
     }
   }
   return t;
@@ -59,7 +59,7 @@
     if (!track->IsEnded()) {
       return STREAM_TIME_MAX;
     }
-    t = std::max(t, track->GetEndTimeRoundDown());
+    t = std::max(t, track->GetEnd());
   }
   return t;
 }
@@ -91,12 +91,12 @@
 
   for (uint32_t i = 0; i < mTracks.Length(); ++i) {
     Track* track = mTracks[i];
-    if (track->IsEnded() && track->GetEndTimeRoundDown() <= aTime) {
+    if (track->IsEnded() && track->GetEnd() <= aTime) {
       mTracks.RemoveElementAt(i);
       --i;
       continue;
     }
-    TrackTicks forgetTo = std::min(track->GetEnd() - 1, track->TimeToTicksRoundDown(aTime));
+    StreamTime forgetTo = std::min(track->GetEnd() - 1, aTime);
     track->ForgetUpTo(forgetTo);
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/StreamBuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/StreamBuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/StreamBuffer.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/StreamBuffer.h	2014-11-26 21:46:00.000000000 +0000
@@ -12,12 +12,6 @@
 namespace mozilla {
 
 /**
- * Media time relative to the start of a StreamBuffer.
- */
-typedef MediaTime StreamTime;
-const StreamTime STREAM_TIME_MAX = MEDIA_TIME_MAX;
-
-/**
  * Unique ID for track within a StreamBuffer. Tracks from different
  * StreamBuffers may have the same ID; this matters when appending StreamBuffers,
  * since tracks with the same ID are matched. Only IDs greater than 0 are allowed.
@@ -44,20 +38,6 @@
   return (aTicks * aOutRate + aInRate - 1) / aInRate;
 }
 
-inline TrackTicks SecondsToTicksRoundDown(TrackRate aRate, double aSeconds)
-{
-  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
-  NS_ASSERTION(0 <= aSeconds && aSeconds <= TRACK_TICKS_MAX/TRACK_RATE_MAX,
-               "Bad seconds");
-  return aSeconds * aRate;
-}
-inline double TrackTicksToSeconds(TrackRate aRate, TrackTicks aTicks)
-{
-  NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Bad rate");
-  NS_ASSERTION(0 <= aTicks && aTicks <= TRACK_TICKS_MAX, "Bad ticks");
-  return static_cast<double>(aTicks)/aRate;
-}
-
 /**
  * This object contains the decoded data for a stream's tracks.
  * A StreamBuffer can be appended to. Logically a StreamBuffer only gets longer,
@@ -80,22 +60,19 @@
    * the same track across StreamBuffers. A StreamBuffer should never have
    * two tracks with the same ID (even if they don't overlap in time).
    * TODO Tracks can also be enabled and disabled over time.
-   * TODO Add TimeVarying<TrackTicks,bool> mEnabled.
+   * TODO Add TimeVarying<StreamTime,bool> mEnabled.
    * Takes ownership of aSegment.
    */
   class Track {
-    Track(TrackID aID, TrackRate aRate, TrackTicks aStart, MediaSegment* aSegment, TrackRate aGraphRate)
+    Track(TrackID aID, StreamTime aStart, MediaSegment* aSegment)
       : mStart(aStart),
         mSegment(aSegment),
-        mRate(aRate),
-        mGraphRate(aGraphRate),
         mID(aID),
         mEnded(false)
     {
       MOZ_COUNT_CTOR(Track);
 
       NS_ASSERTION(aID > TRACK_NONE, "Bad track ID");
-      NS_ASSERTION(0 < aRate && aRate <= TRACK_RATE_MAX, "Invalid rate");
       NS_ASSERTION(0 <= aStart && aStart <= aSegment->GetDuration(), "Bad start position");
     }
   public:
@@ -111,27 +88,10 @@
       return nullptr;
     }
     MediaSegment* GetSegment() const { return mSegment; }
-    TrackRate GetRate() const { return mRate; }
     TrackID GetID() const { return mID; }
     bool IsEnded() const { return mEnded; }
-    TrackTicks GetStart() const { return mStart; }
-    TrackTicks GetEnd() const { return mSegment->GetDuration(); }
-    StreamTime GetEndTimeRoundDown() const
-    {
-      return TicksToTimeRoundDown(mSegment->GetDuration());
-    }
-    StreamTime GetStartTimeRoundDown() const
-    {
-      return TicksToTimeRoundDown(mStart);
-    }
-    TrackTicks TimeToTicksRoundDown(StreamTime aTime) const
-    {
-      return RateConvertTicksRoundDown(mRate, mGraphRate, aTime);
-    }
-    StreamTime TicksToTimeRoundDown(TrackTicks aTicks) const
-    {
-      return RateConvertTicksRoundDown(mGraphRate, mRate, aTicks);
-    }
+    StreamTime GetStart() const { return mStart; }
+    StreamTime GetEnd() const { return mSegment->GetDuration(); }
     MediaSegment::Type GetType() const { return mSegment->GetType(); }
 
     void SetEnded() { mEnded = true; }
@@ -141,7 +101,6 @@
       NS_ASSERTION(aTrack->mID == mID, "IDs must match");
       NS_ASSERTION(aTrack->mStart == 0, "Source track must start at zero");
       NS_ASSERTION(aTrack->mSegment->GetType() == GetType(), "Track types must match");
-      NS_ASSERTION(aTrack->mRate == mRate, "Track rates must match");
 
       mSegment->AppendFrom(aTrack->mSegment);
       mEnded = aTrack->mEnded;
@@ -150,11 +109,11 @@
     {
       return mSegment.forget();
     }
-    void ForgetUpTo(TrackTicks aTime)
+    void ForgetUpTo(StreamTime aTime)
     {
       mSegment->ForgetUpTo(aTime);
     }
-    void FlushAfter(TrackTicks aNewEnd)
+    void FlushAfter(StreamTime aNewEnd)
     {
       // Forget everything after a given endpoint
       // a specified amount
@@ -174,12 +133,10 @@
     friend class StreamBuffer;
 
     // Start offset is in ticks at rate mRate
-    TrackTicks mStart;
+    StreamTime mStart;
     // The segment data starts at the start of the owning StreamBuffer, i.e.,
     // there's mStart silence/no video at the beginning.
     nsAutoPtr<MediaSegment> mSegment;
-    TrackRate mRate; // track rate in ticks per second
-    TrackRate mGraphRate; // graph rate in StreamTime per second
     // Unique ID
     TrackID mID;
     // True when the track ends with the data in mSegment
@@ -243,11 +200,11 @@
    * holding a Track reference.
    * aSegment must have aStart worth of null data.
    */
-  Track& AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart, MediaSegment* aSegment)
+  Track& AddTrack(TrackID aID, StreamTime aStart, MediaSegment* aSegment)
   {
     NS_ASSERTION(!FindTrack(aID), "Track with this ID already exists");
 
-    Track* track = new Track(aID, aRate, aStart, aSegment, GraphRate());
+    Track* track = new Track(aID, aStart, aSegment);
     mTracks.InsertElementSorted(track, CompareTracksByID());
 
     if (mTracksKnownTime == STREAM_TIME_MAX) {
@@ -255,8 +212,7 @@
       // http://mxr.mozilla.org/mozilla-central/source/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp?rev=96b197deb91e&mark=1292-1297#1292
       NS_WARNING("Adding track to StreamBuffer that should have no more tracks");
     } else {
-      NS_ASSERTION(track->TimeToTicksRoundDown(mTracksKnownTime) <= aStart,
-                   "Start time too early");
+      NS_ASSERTION(mTracksKnownTime <= aStart, "Start time too early");
     }
     return *track;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/eme.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/eme.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/eme.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/eme.js	2014-11-26 21:46:01.000000000 +0000
@@ -121,6 +121,15 @@
     var curFragment = 0;
 
     function addNextFragment() {
+      /* We can get another updateevent as a result of calling ms.endOfStream() if
+         the highest end time of our source buffers is different from that of the
+         media source duration. Due to bug 1065207 this can happen because of
+         inaccuracies in the frame duration calculations. Check if we are already
+         "ended" and ignore the update event */
+      if (ms.readyState == "ended") {
+        return;
+      }
+
       if (curFragment >= test.fragments.length) {
         Log(token, "addNextFragment() end of stream");
         ms.endOfStream();
@@ -192,23 +201,37 @@
 
   v.addEventListener("encrypted", function(ev) {
     Log(token, "got encrypted event");
-    MediaKeys.create(KEYSYSTEM_TYPE).then(function(mediaKeys) {
-      Log(token, "created MediaKeys object ok");
-      mediaKeys.sessions = [];
-      return v.setMediaKeys(mediaKeys);
-    }, bail("failed to create MediaKeys object")).then(function() {
-      Log(token, "set MediaKeys on <video> element ok");
-
-      var session = v.mediaKeys.createSession(test.sessionType);
-      if (params && params.onsessioncreated) {
-        params.onsessioncreated(session);
+    var options = [
+      {
+        initDataType: ev.initDataType,
+        videoType: test.type,
       }
-      session.addEventListener("message", UpdateSessionFunc(test, token));
-      session.generateRequest(ev.initDataType, ev.initData).then(function() {
-      }, bail(token + " Failed to initialise MediaKeySession"));
-
-    }, onSetKeysFail);
+    ];
+    navigator.requestMediaKeySystemAccess(KEYSYSTEM_TYPE, options)
+      .then(function(keySystemAccess) {
+        return keySystemAccess.createMediaKeys();
+      }, bail(token + " Failed to request key system access."))
+      
+      .then(function(mediaKeys) {
+        Log(token, "created MediaKeys object ok");
+        mediaKeys.sessions = [];
+        return v.setMediaKeys(mediaKeys);
+      }, bail("failed to create MediaKeys object"))
+      
+      .then(function() {
+        Log(token, "set MediaKeys on <video> element ok");
+
+        var session = v.mediaKeys.createSession(test.sessionType);
+        if (params && params.onsessioncreated) {
+          params.onsessioncreated(session);
+        }
+        session.addEventListener("message", UpdateSessionFunc(test, token));
+        return session.generateRequest(ev.initDataType, ev.initData);
+      }, onSetKeysFail)
+      
+      .then(function() {
+        Log(token, "generated request");
+      }, bail(token + " Failed to request key system access2."));
   });
-
   return v;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/mochitest.ini	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/mochitest.ini	2014-11-26 21:46:01.000000000 +0000
@@ -364,6 +364,8 @@
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
 [test_eme_playback.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
+[test_eme_requestKeySystemAccess.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
 [test_eme_stream_capture_blocked.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
 [test_empty_resource.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/test_eme_playback.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/test_eme_playback.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/test_eme_playback.html	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/test_eme_playback.html	2014-11-26 21:46:01.000000000 +0000
@@ -51,8 +51,6 @@
   var gotPlaying = false;
 
   v.addEventListener("encrypted", function(ev) {
-    ok(MediaKeys.isTypeSupported(KEYSYSTEM_TYPE, ev.initDataType, test.type),
-       TimeStamp(token) + " MediaKeys should support this keysystem");
     gotEncrypted = true;
   });
 
@@ -88,23 +86,7 @@
   LoadTest(test, v, token).then(function(){v.play();}, bail(token + " failed to load"));
 }
 
-function testIsTypeSupported()
-{
-  var t = MediaKeys.isTypeSupported;
-  const clearkey = "org.w3.clearkey";
-  ok(!t("bogus", "bogon", "video/bogus"), "Invalid type.");
-  ok(t(clearkey), "ClearKey supported.");
-  ok(!t(clearkey, "bogus"), "ClearKey bogus initDataType not supported.");
-  ok(t(clearkey, "cenc"), "ClearKey/cenc should be supported.");
-  ok(!t(clearkey, "cenc", "bogus"), "ClearKey/cenc bogus content type should be supported.");
-  ok(t(clearkey, "cenc", 'video/mp4'), "ClearKey/cenc video/mp4 supported.");
-  ok(t(clearkey, "cenc", 'video/mp4; codecs="avc1.4d4015,mp4a.40.2"'), "ClearKey/cenc H.264/AAC supported.");
-  ok(t(clearkey, "cenc", 'audio/mp4'), "ClearKey/cenc audio/mp4 supported.");
-  ok(t(clearkey, "cenc", 'audio/mp4; codecs="mp4a.40.2"'), "ClearKey/cenc AAC LC supported.");
-}
-
 function beginTest() {
-  testIsTypeSupported();
   manager.runTests(gEMETests, startTest);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,293 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test Encrypted Media Extensions</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+  <script type="text/javascript" src="eme.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+function Test(test) {
+  var name = "'" + test.name + "'";
+  return new Promise(function(resolve, reject) {
+    var p;
+    if (test.options) {
+      p = navigator.requestMediaKeySystemAccess(test.keySystem, test.options);
+    } else {
+      p = navigator.requestMediaKeySystemAccess(test.keySystem);
+    }
+    p.then(
+      function(keySystemAccess) {
+        ok(test.shouldPass, name + " passed and was expected to " + (test.shouldPass ? "pass" : "fail"));
+        resolve();
+      },
+      function(ex) {
+        if (test.shouldPass) {
+          info(name + " failed: " + ex);
+        }
+        ok(!test.shouldPass, name + " failed and was expected to " + (test.shouldPass ? "pass" : "fail"));
+        resolve();
+      });
+  });
+}
+
+const CLEARKEY_ID = 'org.w3.clearkey';
+
+var tests = [
+  {
+    name: 'Empty keySystem string',
+    keySystem: '',
+    options: [ ],
+    shouldPass: false,
+  },
+  {
+    name: 'Empty options specified',
+    keySystem: CLEARKEY_ID,
+    options: [ ],
+    shouldPass: false,
+  },
+  {
+    name: 'Undefined options',
+    keySystem: CLEARKEY_ID,
+    shouldPass: true,
+  },
+  {
+    name: 'Basic MP4 cenc',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'Invalid keysystem failure',
+    keySystem: 'bogusKeySystem',
+    options: [],
+    shouldPass: false,
+  },
+  {
+    name: 'Invalid initDataType',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'bogus',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'Invalid videoType',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/bogus',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'Invalid statefulness',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4',
+        stateful: 'bogus',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'Invalid uniqueidentifier',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4',
+        uniqueidentifier: 'bogus',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'Audio capabilities not supported by CLEARKEY_ID',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4',
+        audioCapability: 'bogus',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'Video capabilities not supported by CLEARKEY_ID',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4',
+        videoCapability: 'bogus',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'Invalid option followed by valid',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        bogus: 'bogon',
+      },
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'MP4 audio container',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        audioType: 'audio/mp4',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'MP4 audio container with AAC-LC',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        audioType: 'audio/mp4; codecs="mp4a.40.2"',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'MP4 audio container with invalid codecs',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        audioType: 'audio/mp4; codecs="bogus"',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'MP4 audio container with mp3 is unsupported',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        audioType: 'audio/mp4; codecs="mp3"',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'MP4 video container with mp3 and h264 is unsupported',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4; codecs="avc1.42E01E,mp3"',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'MP4 video container with constrained baseline h.264',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        audioType: 'video/mp4; codecs="avc1.42E01E"',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'MP4 video container with invalid codecs',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4; codecs="bogus"',
+      }
+    ],
+    shouldPass: false,
+  },
+  {
+    name: 'MP4 video container with constrained baseline h.264 and AAC-LC',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4; codecs="avc1.42E01E,mp4a.40.2"',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'MP4 audio and video type both specified',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'cenc',
+        videoType: 'video/mp4; codecs="avc1.42E01E"',
+        audioType: 'audio/mp4; codecs="mp4a.40.2"',
+      }
+    ],
+    shouldPass: true,
+  },
+  {
+    name: 'WebM CLEARKEY_ID not supported',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        initDataType: 'webm',
+        videoType: 'video/webm',
+      }
+    ],
+    shouldPass: false,
+  },
+];
+
+function beginTest() {
+  Promise.all(tests.map(Test)).then(function() { SimpleTest.finish(); });
+}
+
+var prefs = [
+  [ "media.mediasource.enabled", true ],
+  [ "media.mediasource.mp4.enabled", true ],
+];
+
+if (/Linux/.test(navigator.userAgent) ||
+    !document.createElement('video').canPlayType("video/mp4")) {
+  // XXX remove once we have mp4 PlatformDecoderModules on all platforms.
+  prefs.push([ "media.fragmented-mp4.exposed", true ]);
+  prefs.push([ "media.fragmented-mp4.use-blank-decoder", true ]);
+}
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/pc.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/pc.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/pc.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/pc.js	2014-11-26 21:46:02.000000000 +0000
@@ -613,16 +613,16 @@
     }
   }
 
-  function signalingstatechangeLocalClose(state) {
-    info("'onsignalingstatechange' event '" + state + "' received");
-    is(state, "closed", "onsignalingstatechange event is closed");
+  function signalingstatechangeLocalClose(e) {
+    info("'signalingstatechange' event received");
+    is(e.target.signalingState, "closed", "signalingState is closed");
     self.waitingForLocal = false;
     verifyClosed();
   }
 
-  function signalingstatechangeRemoteClose(state) {
-    info("'onsignalingstatechange' event '" + state + "' received");
-    is(state, "closed", "onsignalingstatechange event is closed");
+  function signalingstatechangeRemoteClose(e) {
+    info("'signalingstatechange' event received");
+    is(e.target.signalingState, "closed", "signalingState is closed");
     self.waitingForRemote = false;
     verifyClosed();
   }
@@ -678,6 +678,17 @@
 };
 
 /**
+ * Set a timeout for the over all PeerConnectionTest
+ * @param {long] ms the number of milliseconds to allow for the test
+ */
+PeerConnectionTest.prototype.setTimeout = function(ms) {
+  this._timeout = setTimeout(function() {
+    ok(false, "PeerConnectionTest timed out");
+    this.teardown();
+  }.bind(this), ms);
+};
+
+/**
  * Creates an answer for the specified peer connection instance
  * and automatically handles the failure case.
  *
@@ -744,9 +755,10 @@
     }
   }
 
-  peer.onsignalingstatechange = function (state) {
-    info(peer + ": 'onsignalingstatechange' event '" + state + "' received");
-    if(stateExpected === state && eventFired == false) {
+  peer.onsignalingstatechange = function (e) {
+    info(peer + ": 'signalingstatechange' event received");
+    var state = e.target.signalingState;
+    if(stateExpected === state && !eventFired) {
       eventFired = true;
       peer.setLocalDescStableEventDate = new Date();
       check_next_test();
@@ -812,9 +824,10 @@
     }
   }
 
-  peer.onsignalingstatechange = function (state) {
-    info(peer + ": 'onsignalingstatechange' event '" + state + "' received");
-    if(stateExpected === state && eventFired == false) {
+  peer.onsignalingstatechange = function(e) {
+    info(peer + ": 'signalingstatechange' event received");
+    var state = e.target.signalingState;
+    if(stateExpected === state && !eventFired) {
       eventFired = true;
       peer.setRemoteDescStableEventDate = new Date();
       check_next_test();
@@ -1534,6 +1547,9 @@
   this.onAddStreamFired = false;
   this.addStreamCallbacks = {};
 
+  this._local_ice_candidates = [];
+  this._remote_ice_candidates = [];
+  this._ice_candidates_to_add = [];
   this.holdIceCandidates = true;
   this.endOfTrickleIce = false;
   this.localRequiresTrickleIce = false;
@@ -1618,7 +1634,6 @@
    * failure will be raised if an event of this type is caught.
    *
    * @param {Object} aEvent
-   *        Event data which includes the newly created data channel
    */
   this._pc.onsignalingstatechange = function (anEvent) {
     info(self + ": 'onsignalingstatechange' event fired");
@@ -1930,7 +1945,7 @@
   logSignalingState: function PCW_logSignalingState() {
     var self = this;
 
-    function _logSignalingState(state) {
+    function _logSignalingState(e) {
       var newstate = self._pc.signalingState;
       var oldstate = self.signalingStateLog[self.signalingStateLog.length - 1]
       if (Object.keys(signalingStateTransitions).indexOf(oldstate) != -1) {
@@ -1956,7 +1971,7 @@
     var self = this;
 
     self._remote_ice_candidates.push(candidate);
-    if (self.signalingstate === 'closed') {
+    if (self.signalingState === 'closed') {
       info("Received ICE candidate for closed PeerConnection - discarding");
       return;
     }
@@ -2121,9 +2136,6 @@
   setupIceCandidateHandler : function
     PCW_setupIceCandidateHandler(test, candidateHandler, endHandler) {
     var self = this;
-    self._local_ice_candidates = [];
-    self._remote_ice_candidates = [];
-    self._ice_candidates_to_add = [];
 
     candidateHandler = candidateHandler || test.iceCandidateHandler.bind(test);
     endHandler = endHandler || test.signalEndOfTrickleIce.bind(test);
@@ -2582,6 +2594,48 @@
     }
   },
 
+  /**
+   * Compares the Ice server configured for this PeerConnectionWrapper
+   * with the ICE candidates received in the RTCP stats.
+   *
+   * @param {object} stats
+   *        The stats to be verified for relayed vs. direct connection.
+   */
+  checkStatsIceConnectionType : function PCW_checkStatsIceConnectionType(stats)
+  {
+    var lId;
+    var rId;
+    Object.keys(stats).forEach(function(name) {
+      if ((stats[name].type === "candidatepair") &&
+          (stats[name].selected)) {
+        lId = stats[name].localCandidateId;
+        rId = stats[name].remoteCandidateId;
+      }
+    });
+    info("checkStatsIceConnectionType verifying: local=" +
+         JSON.stringify(stats[lId]) + " remote=" + JSON.stringify(stats[rId]));
+    if ((typeof stats[lId] === 'undefined') ||
+        (typeof stats[rId] === 'undefined')) {
+      info("checkStatsIceConnectionType failed to find candidatepair IDs");
+      return;
+    }
+    var lType = stats[lId].candidateType;
+    var rType = stats[rId].candidateType;
+    var lIp = stats[lId].ipAddress;
+    var rIp = stats[rId].ipAddress;
+    if ((this.configuration) && (typeof this.configuration.iceServers !== 'undefined')) {
+      info("Ice Server configured");
+      // Note: the IP comparising is a workaround for bug 1097333
+      //       And this will fail if a TURN server address is a DNS name!
+      var serverIp = this.configuration.iceServers[0].url.split(':')[1];
+      ok((lType === "relayed" || rType === "relayed") ||
+         (lIp === serverIp || rIp === serverIp), "One peer uses a relay");
+    } else {
+      info("P2P configured");
+      ok(((lType !== "relayed") && (rType !== "relayed")), "Pure peer to peer call without a relay");
+    }
+  },
+
   /**
    * Property-matching function for finding a certain stat in passed-in stats
    *
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/templates.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/templates.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/templates.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/templates.js	2014-11-26 21:46:02.000000000 +0000
@@ -24,6 +24,17 @@
     dump("ERROR: SDP answer: " + test._remote_answer.sdp.replace(/[\r]/g, ''));
   }
 
+  if ((test.pcLocal) && (typeof test.pcLocal._local_ice_candidates !== 'undefined')) {
+    dump("pcLocal._local_ice_candidates: " + JSON.stringify(test.pcLocal._local_ice_candidates) + "\n");
+    dump("pcLocal._remote_ice_candidates: " + JSON.stringify(test.pcLocal._remote_ice_candidates) + "\n");
+    dump("pcLocal._ice_candidates_to_add: " + JSON.stringify(test.pcLocal._ice_candidates_to_add) + "\n");
+  }
+  if ((test.pcRemote) && (typeof test.pcRemote._local_ice_candidates !== 'undefined')) {
+    dump("pcRemote._local_ice_candidates: " + JSON.stringify(test.pcRemote._local_ice_candidates) + "\n");
+    dump("pcRemote._remote_ice_candidates: " + JSON.stringify(test.pcRemote._remote_ice_candidates) + "\n");
+    dump("pcRemote._ice_candidates_to_add: " + JSON.stringify(test.pcRemote._ice_candidates_to_add) + "\n");
+  }
+
   if ((test.pcLocal) && (typeof test.pcLocal.iceConnectionLog !== 'undefined')) {
     dump("pcLocal ICE connection state log: " + test.pcLocal.iceConnectionLog + "\n");
   }
@@ -56,6 +67,7 @@
     'PC_SETUP_SIGNALING_CLIENT',
     function (test) {
       if (test.steeplechase) {
+        test.setTimeout(30000);
         test.setupSignalingClient();
         test.registerSignalingCallback("ice_candidate", function (message) {
           var pc = test.pcRemote ? test.pcRemote : test.pcLocal;
@@ -491,6 +503,24 @@
         test.next();
       });
     }
+  ],
+  [
+    'PC_LOCAL_CHECK_ICE_CONNECTION_TYPE',
+    function (test) {
+      test.pcLocal.getStats(null, function(stats) {
+        test.pcLocal.checkStatsIceConnectionType(stats);
+        test.next();
+      });
+    }
+  ],
+  [
+    'PC_REMOTE_CHECK_ICE_CONNECTION_TYPE',
+    function (test) {
+      test.pcRemote.getStats(null, function(stats) {
+        test.pcRemote.checkStatsIceConnectionType(stats);
+        test.next();
+      });
+    }
   ],
   [
     'PC_LOCAL_CHECK_GETSTATS_AUDIOTRACK_OUTBOUND',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/test_peerConnection_bug827843.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/test_peerConnection_bug827843.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/test_peerConnection_bug827843.html	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/test_peerConnection_bug827843.html	2014-11-26 21:46:02.000000000 +0000
@@ -24,8 +24,9 @@
         var exception = null;
 
         // handle the event which the close() triggers
-        test.pcLocal.onsignalingstatechange = function (state) {
-          is(state, "closed", "Received expected onsignalingstatechange event 'closed'");
+        test.pcLocal.onsignalingstatechange = function (e) {
+          is(e.target.signalingState, "closed",
+             "Received expected onsignalingstatechange event on 'closed'");
         }
 
         test.pcLocal.close();
@@ -39,8 +40,9 @@
         exception = null;
 
         // handle the event which the close() triggers
-        test.pcRemote.onsignalingstatechange = function (state) {
-          is(state, "closed", "Received expected onsignalingstatechange event 'closed'");
+        test.pcRemote.onsignalingstatechange = function (e) {
+          is(e.target.signalingState, "closed",
+             "Received expected onsignalingstatechange event on 'closed'");
         }
 
         test.pcRemote.close();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/test_peerConnection_close.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/test_peerConnection_close.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/test_peerConnection_close.html	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/test_peerConnection_close.html	2014-11-26 21:46:02.000000000 +0000
@@ -16,7 +16,6 @@
 
   runNetworkTest(function () {
     var pc = new mozRTCPeerConnection();
-    var signalStateChanged = false;
     var exception = null;
     var eTimeout = null;
 
@@ -25,12 +24,15 @@
     is(pc.iceConnectionState, "new", "Initial iceConnectionState is 'new'");
     is(pc.iceGatheringState, "new", "Initial iceGatheringState is 'new'");
 
-    pc.onsignalingstatechange = function(aEvent) {
+    var finish;
+    var finished = new Promise(function(resolve) {
+      finish = resolve;
+    });
+
+    pc.onsignalingstatechange = function(e) {
       clearTimeout(eTimeout);
-      signalStateChanged = true;
-      is(aEvent, "closed", "onsignalingstatechange event is 'closed'");
-      is(pc.signalingState, "closed", "Event callback signalingState is 'closed'");
-      is(pc.iceConnectionState, "closed", "Event callback iceConnectionState is 'closed'");
+      is(pc.signalingState, "closed", "signalingState is 'closed'");
+      is(pc.iceConnectionState, "closed", "iceConnectionState is 'closed'");
 
       try {
         pc.close();
@@ -82,23 +84,13 @@
         pc.setIdentityProvider("Invalid Provider")},
         "setIdentityProvider() on closed PC raised expected exception");
 
-      // in case we are ending the test from within here
-      if(pc !== null) {
-        pc = null;
-        networkTestFinished();
-      }
+      finish();
     }
 
-    // This is only a shortcut to prevent a mochitest timeout in case the
-    // event does not fire
+    // This prevents a mochitest timeout in case the event does not fire
     eTimeout = setTimeout(function() {
-      ok(signalStateChanged, "Failed to receive expected onsignalingstatechange event in 60s");
-
-      // in case we are ending the test in this timeout
-      if (pc !== null) {
-        pc = null;
-        networkTestFinished();
-      }
+      ok(false, "Failed to receive expected onsignalingstatechange event in 60s");
+      finish();
     }, 60000);
 
     try {
@@ -107,20 +99,10 @@
       exception = e;
     }
     is(exception, null, "closing the connection raises no exception");
-    if (pc !== null) {
-      is(pc.signalingState, "closed", "Final signalingState is 'closed'");
-      is(pc.iceConnectionState, "closed", "Final iceConnectionState is 'closed'");
-    }
-
-    if (signalStateChanged) {
-      clearTimeout(eTimeout);
-      // in case we are ending the test outside the even handler
-      if (pc !== null) {
-        pc = null;
-        networkTestFinished();
-      }
-    }
+    is(pc.signalingState, "closed", "Final signalingState is 'closed'");
+    is(pc.iceConnectionState, "closed", "Final iceConnectionState is 'closed'");
 
+    finished.then(networkTestFinished);
   });
 </script>
 </pre>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/turnConfig.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/turnConfig.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/tests/mochitest/turnConfig.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/tests/mochitest/turnConfig.js	2014-11-26 21:46:02.000000000 +0000
@@ -3,6 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* An example of how to specify two TURN server configs:
+ *
+ * Note: If turn URL uses FQDN rather then an IP address the TURN relay
+ *       verification step in checkStatsIceConnectionType might fail.
+ *
  * var turnServers = {
  *   local: { iceServers: [{"username":"mozilla","credential":"mozilla","url":"turn:10.0.0.1"}] },
  *   remote: { iceServers: [{"username":"firefox","credential":"firefox","url":"turn:10.0.0.2"}] }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/TrackUnionStream.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/TrackUnionStream.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/TrackUnionStream.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/TrackUnionStream.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -81,8 +81,8 @@
       mappedTracksFinished.AppendElement(true);
       mappedTracksWithMatchingInputTracks.AppendElement(false);
     }
-    bool allFinished = true;
-    bool allHaveCurrentData = true;
+    bool allFinished = !mInputs.IsEmpty();
+    bool allHaveCurrentData = !mInputs.IsEmpty();
     for (uint32_t i = 0; i < mInputs.Length(); ++i) {
       MediaStream* stream = mInputs[i]->GetSource();
       if (!stream->IsFinishedOnGraphThread()) {
@@ -188,23 +188,22 @@
       id = ++maxTrackID;
     }
 
-    TrackRate rate = aTrack->GetRate();
     // Round up the track start time so the track, if anything, starts a
     // little later than the true time. This means we'll have enough
     // samples in our input stream to go just beyond the destination time.
-    TrackTicks outputStart = TimeToTicksRoundUp(rate, GraphTimeToStreamTime(aFrom));
+    StreamTime outputStart = GraphTimeToStreamTime(aFrom);
 
     nsAutoPtr<MediaSegment> segment;
     segment = aTrack->GetSegment()->CreateEmptyClone();
     for (uint32_t j = 0; j < mListeners.Length(); ++j) {
       MediaStreamListener* l = mListeners[j];
-      l->NotifyQueuedTrackChanges(Graph(), id, rate, outputStart,
+      l->NotifyQueuedTrackChanges(Graph(), id, outputStart,
                                   MediaStreamListener::TRACK_EVENT_CREATED,
                                   *segment);
     }
     segment->AppendNullData(outputStart);
     StreamBuffer::Track* track =
-      &mBuffer.AddTrack(id, rate, outputStart, segment.forget());
+      &mBuffer.AddTrack(id, outputStart, segment.forget());
     STREAM_LOG(PR_LOG_DEBUG, ("TrackUnionStream %p adding track %d for input stream %p track %d, start ticks %lld",
                               this, id, aPort->GetSource(), aTrack->GetID(),
                               (long long)outputStart));
@@ -227,11 +226,10 @@
       return;
     for (uint32_t j = 0; j < mListeners.Length(); ++j) {
       MediaStreamListener* l = mListeners[j];
-      TrackTicks offset = outputTrack->GetSegment()->GetDuration();
+      StreamTime offset = outputTrack->GetSegment()->GetDuration();
       nsAutoPtr<MediaSegment> segment;
       segment = outputTrack->GetSegment()->CreateEmptyClone();
-      l->NotifyQueuedTrackChanges(Graph(), outputTrack->GetID(),
-                                  outputTrack->GetRate(), offset,
+      l->NotifyQueuedTrackChanges(Graph(), outputTrack->GetID(), offset,
                                   MediaStreamListener::TRACK_EVENT_ENDED,
                                   *segment);
     }
@@ -246,7 +244,6 @@
     StreamBuffer::Track* outputTrack = mBuffer.FindTrack(map->mOutputTrackID);
     MOZ_ASSERT(outputTrack && !outputTrack->IsEnded(), "Can't copy to ended track");
 
-    TrackRate rate = outputTrack->GetRate();
     MediaSegment* segment = map->mSegment;
     MediaStream* source = map->mInputPort->GetSource();
 
@@ -256,26 +253,21 @@
       MediaInputPort::InputInterval interval = map->mInputPort->GetNextInputInterval(t);
       interval.mEnd = std::min(interval.mEnd, aTo);
       StreamTime inputEnd = source->GraphTimeToStreamTime(interval.mEnd);
-      TrackTicks inputTrackEndPoint = aInputTrack->GetEnd();
+      StreamTime inputTrackEndPoint = STREAM_TIME_MAX;
 
       if (aInputTrack->IsEnded() &&
-          aInputTrack->GetEndTimeRoundDown() <= inputEnd) {
+          aInputTrack->GetEnd() <= inputEnd) {
+        inputTrackEndPoint = aInputTrack->GetEnd();
         *aOutputTrackFinished = true;
       }
 
       if (interval.mStart >= interval.mEnd) {
         break;
       }
+      StreamTime ticks = interval.mEnd - interval.mStart;
       next = interval.mEnd;
 
-      // Ticks >= startTicks and < endTicks are in the interval
-      StreamTime outputEnd = GraphTimeToStreamTime(interval.mEnd);
-      TrackTicks startTicks = outputTrack->GetEnd();
-      StreamTime outputStart = GraphTimeToStreamTime(interval.mStart);
-      MOZ_ASSERT(startTicks == TimeToTicksRoundUp(rate, outputStart), "Samples missing");
-      TrackTicks endTicks = TimeToTicksRoundUp(rate, outputEnd);
-      TrackTicks ticks = endTicks - startTicks;
-      StreamTime inputStart = source->GraphTimeToStreamTime(interval.mStart);
+      StreamTime outputStart = outputTrack->GetEnd();
 
       if (interval.mInputIsBlocked) {
         // Maybe the input track ended?
@@ -283,101 +275,18 @@
         STREAM_LOG(PR_LOG_DEBUG+1, ("TrackUnionStream %p appending %lld ticks of null data to track %d",
                    this, (long long)ticks, outputTrack->GetID()));
       } else {
-        // Figuring out which samples to use from the input stream is tricky
-        // because its start time and our start time may differ by a fraction
-        // of a tick. Assuming the input track hasn't ended, we have to ensure
-        // that 'ticks' samples are gathered, even though a tick boundary may
-        // occur between outputStart and outputEnd but not between inputStart
-        // and inputEnd.
-        // These are the properties we need to ensure:
-        // 1) Exactly 'ticks' ticks of output are produced, i.e.
-        // inputEndTicks - inputStartTicks = ticks.
-        // 2) inputEndTicks <= aInputTrack->GetSegment()->GetDuration().
-        // 3) In any sequence of intervals where neither stream is blocked,
-        // the content of the input track we use is a contiguous sequence of
-        // ticks with no gaps or overlaps.
-        if (map->mEndOfLastInputIntervalInInputStream != inputStart ||
-            map->mEndOfLastInputIntervalInOutputStream != outputStart) {
-          // Start of a new series of intervals where neither stream is blocked.
-          map->mEndOfConsumedInputTicks = TimeToTicksRoundDown(rate, inputStart) - 1;
-        }
-        TrackTicks inputStartTicks = map->mEndOfConsumedInputTicks;
-        TrackTicks inputEndTicks = inputStartTicks + ticks;
-        map->mEndOfConsumedInputTicks = inputEndTicks;
-        map->mEndOfLastInputIntervalInInputStream = inputEnd;
-        map->mEndOfLastInputIntervalInOutputStream = outputEnd;
-
-        if (GraphImpl()->mFlushSourcesNow) {
-          TrackTicks flushto = inputEndTicks;
-          STREAM_LOG(PR_LOG_DEBUG, ("TrackUnionStream %p flushing after %lld of %lld ticks of input data from track %d for track %d",
-              this, flushto, aInputTrack->GetSegment()->GetDuration(), aInputTrack->GetID(), outputTrack->GetID()));
-          aInputTrack->FlushAfter(flushto);
-          MOZ_ASSERT(inputTrackEndPoint >= aInputTrack->GetEnd());
-        }
-        // Now we prove that the above properties hold:
-        // Property #1: trivial by construction.
-        // Property #3: trivial by construction. Between every two
-        // intervals where both streams are not blocked, the above if condition
-        // is false and mEndOfConsumedInputTicks advances exactly to match
-        // the ticks that were consumed.
-        // Property #2:
-        // Let originalOutputStart be the value of outputStart and originalInputStart
-        // be the value of inputStart when the body of the "if" block was last
-        // executed.
-        // Let allTicks be the sum of the values of 'ticks' computed since then.
-        // The interval [originalInputStart/rate, inputEnd/rate) is the
-        // same length as the interval [originalOutputStart/rate, outputEnd/rate),
-        // so the latter interval can have at most one more integer in it. Thus
-        // TimeToTicksRoundUp(rate, outputEnd) - TimeToTicksRoundUp(rate, originalOutputStart)
-        //   <= TimeToTicksRoundDown(rate, inputEnd) - TimeToTicksRoundDown(rate, originalInputStart) + 1
-        // Then
-        // inputEndTicks = TimeToTicksRoundDown(rate, originalInputStart) - 1 + allTicks
-        //   = TimeToTicksRoundDown(rate, originalInputStart) - 1 + TimeToTicksRoundUp(rate, outputEnd) - TimeToTicksRoundUp(rate, originalOutputStart)
-        //   <= TimeToTicksRoundDown(rate, originalInputStart) - 1 + TimeToTicksRoundDown(rate, inputEnd) - TimeToTicksRoundDown(rate, originalInputStart) + 1
-        //   = TimeToTicksRoundDown(rate, inputEnd)
-        //   <= inputEnd/rate
-        // (now using the fact that inputEnd <= track->GetEndTimeRoundDown() for a non-ended track)
-        //   <= TicksToTimeRoundDown(rate, aInputTrack->GetSegment()->GetDuration())/rate
-        //   <= rate*aInputTrack->GetSegment()->GetDuration()/rate
-        //   = aInputTrack->GetSegment()->GetDuration()
-        // as required.
-        // Note that while the above proof appears to be generally right, if we are suffering
-        // from a lot of underrun, then in rare cases inputStartTicks >> inputTrackEndPoint.
-        // As such, we still need to verify the sanity of property #2 and use null data as
-        // appropriate.
-
-        if (inputStartTicks < 0) {
-          // Data before the start of the track is just null.
-          // We have to add a small amount of delay to ensure that there is
-          // always a sample available if we see an interval that contains a
-          // tick boundary on the output stream's timeline but does not contain
-          // a tick boundary on the input stream's timeline. 1 tick delay is
-          // necessary and sufficient.
-          segment->AppendNullData(-inputStartTicks);
-          inputStartTicks = 0;
-        }
-        if (inputEndTicks > inputStartTicks) {
-          if (inputEndTicks <= inputTrackEndPoint) {
-            segment->AppendSlice(*aInputTrack->GetSegment(), inputStartTicks, inputEndTicks);
-            STREAM_LOG(PR_LOG_DEBUG+1, ("TrackUnionStream %p appending %lld ticks of input data to track %d",
-                       this, ticks, outputTrack->GetID()));
-          } else {
-            if (inputStartTicks < inputTrackEndPoint) {
-              segment->AppendSlice(*aInputTrack->GetSegment(), inputStartTicks, inputTrackEndPoint);
-              ticks -= inputTrackEndPoint - inputStartTicks;
-            }
-            segment->AppendNullData(ticks);
-            STREAM_LOG(PR_LOG_DEBUG+1, ("TrackUnionStream %p appending %lld ticks of input data and %lld of null data to track %d",
-                       this, inputTrackEndPoint - inputStartTicks, ticks, outputTrack->GetID()));
-          }
-        }
+        MOZ_ASSERT(outputTrack->GetEnd() == GraphTimeToStreamTime(interval.mStart),
+                   "Samples missing");
+        StreamTime inputStart = source->GraphTimeToStreamTime(interval.mStart);
+        segment->AppendSlice(*aInputTrack->GetSegment(),
+                             std::min(inputTrackEndPoint, inputStart),
+                             std::min(inputTrackEndPoint, inputEnd));
       }
       ApplyTrackDisabling(outputTrack->GetID(), segment);
       for (uint32_t j = 0; j < mListeners.Length(); ++j) {
         MediaStreamListener* l = mListeners[j];
         l->NotifyQueuedTrackChanges(Graph(), outputTrack->GetID(),
-                                    outputTrack->GetRate(), startTicks, 0,
-                                    *segment);
+                                    outputStart, 0, *segment);
       }
       outputTrack->GetSegment()->AppendFrom(segment);
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/TrackUnionStream.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/TrackUnionStream.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/TrackUnionStream.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/TrackUnionStream.h	2014-11-26 21:46:00.000000000 +0000
@@ -38,7 +38,7 @@
   struct TrackMapEntry {
     // mEndOfConsumedInputTicks is the end of the input ticks that we've consumed.
     // 0 if we haven't consumed any yet.
-    TrackTicks mEndOfConsumedInputTicks;
+    StreamTime mEndOfConsumedInputTicks;
     // mEndOfLastInputIntervalInInputStream is the timestamp for the end of the
     // previous interval which was unblocked for both the input and output
     // stream, in the input stream's timeline, or -1 if there wasn't one.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/VideoSegment.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/VideoSegment.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/VideoSegment.cpp	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/VideoSegment.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -92,7 +92,7 @@
 
 void
 VideoSegment::AppendFrame(already_AddRefed<Image>&& aImage,
-                          TrackTicks aDuration,
+                          StreamTime aDuration,
                           const IntSize& aIntrinsicSize,
                           bool aForceBlack)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/VideoSegment.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/VideoSegment.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/VideoSegment.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/VideoSegment.h	2014-11-26 21:46:00.000000000 +0000
@@ -59,19 +59,19 @@
 struct VideoChunk {
   VideoChunk();
   ~VideoChunk();
-  void SliceTo(TrackTicks aStart, TrackTicks aEnd)
+  void SliceTo(StreamTime aStart, StreamTime aEnd)
   {
     NS_ASSERTION(aStart >= 0 && aStart < aEnd && aEnd <= mDuration,
                  "Slice out of bounds");
     mDuration = aEnd - aStart;
   }
-  TrackTicks GetDuration() const { return mDuration; }
+  StreamTime GetDuration() const { return mDuration; }
   bool CanCombineWithFollowing(const VideoChunk& aOther) const
   {
     return aOther.mFrame == mFrame;
   }
   bool IsNull() const { return !mFrame.GetImage(); }
-  void SetNull(TrackTicks aDuration)
+  void SetNull(StreamTime aDuration)
   {
     mDuration = aDuration;
     mFrame.SetNull();
@@ -86,7 +86,7 @@
     return 0;
   }
 
-  TrackTicks mDuration;
+  StreamTime mDuration;
   VideoFrame mFrame;
   mozilla::TimeStamp mTimeStamp;
 };
@@ -100,10 +100,10 @@
   ~VideoSegment();
 
   void AppendFrame(already_AddRefed<Image>&& aImage,
-                   TrackTicks aDuration,
+                   StreamTime aDuration,
                    const IntSize& aIntrinsicSize,
                    bool aForceBlack = false);
-  const VideoFrame* GetFrameAt(TrackTicks aOffset, TrackTicks* aStart = nullptr)
+  const VideoFrame* GetFrameAt(StreamTime aOffset, StreamTime* aStart = nullptr)
   {
     VideoChunk* c = FindChunkContaining(aOffset, aStart);
     if (!c) {
@@ -111,7 +111,7 @@
     }
     return &c->mFrame;
   }
-  const VideoFrame* GetLastFrame(TrackTicks* aStart = nullptr)
+  const VideoFrame* GetLastFrame(StreamTime* aStart = nullptr)
   {
     VideoChunk* c = GetLastChunk();
     if (!c) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioBufferSourceNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioBufferSourceNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioBufferSourceNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioBufferSourceNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -56,7 +56,7 @@
                                        AudioDestinationNode* aDestination) :
     AudioNodeEngine(aNode),
     mStart(0.0), mBeginProcessing(0),
-    mStop(TRACK_TICKS_MAX),
+    mStop(STREAM_TIME_MAX),
     mResampler(nullptr), mRemainingResamplerTail(0),
     mBufferEnd(0),
     mLoopStart(0), mLoopEnd(0),
@@ -91,7 +91,7 @@
       NS_ERROR("Bad AudioBufferSourceNodeEngine TimelineParameter");
     }
   }
-  virtual void SetStreamTimeParameter(uint32_t aIndex, TrackTicks aParam)
+  virtual void SetStreamTimeParameter(uint32_t aIndex, StreamTime aParam)
   {
     switch (aIndex) {
     case AudioBufferSourceNode::STOP: mStop = aParam; break;
@@ -140,7 +140,7 @@
 
   bool BegunResampling()
   {
-    return mBeginProcessing == -TRACK_TICKS_MAX;
+    return mBeginProcessing == -STREAM_TIME_MAX;
   }
 
   void UpdateResampler(int32_t aOutRate, uint32_t aChannels)
@@ -233,7 +233,7 @@
                                          AudioChunk* aOutput,
                                          uint32_t aChannels,
                                          uint32_t* aOffsetWithinBlock,
-                                         TrackTicks* aCurrentPosition,
+                                         StreamTime* aCurrentPosition,
                                          int32_t aBufferMax) {
     // TODO: adjust for mStop (see bug 913854 comment 9).
     uint32_t availableInOutputBuffer =
@@ -268,7 +268,7 @@
         }
         speex_resampler_set_skip_frac_num(resampler, skipFracNum);
 
-        mBeginProcessing = -TRACK_TICKS_MAX;
+        mBeginProcessing = -STREAM_TIME_MAX;
       }
       inputLimit = std::min(inputLimit, availableInInputBuffer);
 
@@ -334,12 +334,12 @@
   void FillWithZeroes(AudioChunk* aOutput,
                       uint32_t aChannels,
                       uint32_t* aOffsetWithinBlock,
-                      TrackTicks* aCurrentPosition,
-                      TrackTicks aMaxPos)
+                      StreamTime* aCurrentPosition,
+                      StreamTime aMaxPos)
   {
     MOZ_ASSERT(*aCurrentPosition < aMaxPos);
     uint32_t numFrames =
-      std::min<TrackTicks>(WEBAUDIO_BLOCK_SIZE - *aOffsetWithinBlock,
+      std::min<StreamTime>(WEBAUDIO_BLOCK_SIZE - *aOffsetWithinBlock,
                            aMaxPos - *aCurrentPosition);
     if (numFrames == WEBAUDIO_BLOCK_SIZE) {
       aOutput->SetNull(numFrames);
@@ -366,12 +366,12 @@
                       AudioChunk* aOutput,
                       uint32_t aChannels,
                       uint32_t* aOffsetWithinBlock,
-                      TrackTicks* aCurrentPosition,
+                      StreamTime* aCurrentPosition,
                       int32_t aBufferMax)
   {
     MOZ_ASSERT(*aCurrentPosition < mStop);
     uint32_t numFrames =
-      std::min(std::min<TrackTicks>(WEBAUDIO_BLOCK_SIZE - *aOffsetWithinBlock,
+      std::min(std::min<StreamTime>(WEBAUDIO_BLOCK_SIZE - *aOffsetWithinBlock,
                                     aBufferMax - mBufferPosition),
                mStop - *aCurrentPosition);
     if (numFrames == WEBAUDIO_BLOCK_SIZE && !mResampler) {
@@ -445,11 +445,11 @@
     UpdateSampleRateIfNeeded(channels);
 
     uint32_t written = 0;
-    TrackTicks streamPosition = aStream->GetCurrentPosition();
+    StreamTime streamPosition = aStream->GetCurrentPosition();
     while (written < WEBAUDIO_BLOCK_SIZE) {
-      if (mStop != TRACK_TICKS_MAX &&
+      if (mStop != STREAM_TIME_MAX &&
           streamPosition >= mStop) {
-        FillWithZeroes(aOutput, channels, &written, &streamPosition, TRACK_TICKS_MAX);
+        FillWithZeroes(aOutput, channels, &written, &streamPosition, STREAM_TIME_MAX);
         continue;
       }
       if (streamPosition < mBeginProcessing) {
@@ -469,7 +469,7 @@
         if (mBufferPosition < mBufferEnd || mRemainingResamplerTail) {
           CopyFromBuffer(aStream, aOutput, channels, &written, &streamPosition, mBufferEnd);
         } else {
-          FillWithZeroes(aOutput, channels, &written, &streamPosition, TRACK_TICKS_MAX);
+          FillWithZeroes(aOutput, channels, &written, &streamPosition, STREAM_TIME_MAX);
         }
       }
     }
@@ -510,10 +510,10 @@
   double mStart; // including the fractional position between ticks
   // Low pass filter effects from the resampler mean that samples before the
   // start time are influenced by resampling the buffer.  mBeginProcessing
-  // includes the extent of this filter.  The special value of -TRACK_TICKS_MAX
+  // includes the extent of this filter.  The special value of -STREAM_TIME_MAX
   // indicates that the resampler has begun processing.
-  TrackTicks mBeginProcessing;
-  TrackTicks mStop;
+  StreamTime mBeginProcessing;
+  StreamTime mStop;
   nsRefPtr<ThreadSharedFloatArrayBufferList> mBuffer;
   SpeexResamplerState* mResampler;
   // mRemainingResamplerTail, like mBufferPosition, and
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioContext.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioContext.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -36,6 +36,7 @@
 #include "OscillatorNode.h"
 #include "nsNetUtil.h"
 #include "AudioStream.h"
+#include "mozilla/dom/Promise.h"
 
 namespace mozilla {
 namespace dom {
@@ -438,16 +439,24 @@
   return mListener;
 }
 
-void
+already_AddRefed<Promise>
 AudioContext::DecodeAudioData(const ArrayBuffer& aBuffer,
-                              DecodeSuccessCallback& aSuccessCallback,
+                              const Optional<OwningNonNull<DecodeSuccessCallback> >& aSuccessCallback,
                               const Optional<OwningNonNull<DecodeErrorCallback> >& aFailureCallback)
 {
+  ErrorResult rv;
+  nsCOMPtr<nsIGlobalObject> parentObject = do_QueryInterface(GetParentObject());
+  nsRefPtr<Promise> promise;
   AutoJSAPI jsapi;
   jsapi.Init();
   JSContext* cx = jsapi.cx();
   JSAutoCompartment ac(cx, aBuffer.Obj());
 
+  promise = Promise::Create(parentObject, rv);
+  if (rv.Failed()) {
+    return nullptr;
+  }
+
   aBuffer.ComputeLengthAndData();
 
   // Neuter the array buffer
@@ -462,15 +471,21 @@
   NS_SniffContent(NS_DATA_SNIFFER_CATEGORY, nullptr, data, length, contentType);
 
   nsRefPtr<DecodeErrorCallback> failureCallback;
+  nsRefPtr<DecodeSuccessCallback> successCallback;
   if (aFailureCallback.WasPassed()) {
     failureCallback = &aFailureCallback.Value();
   }
+  if (aSuccessCallback.WasPassed()) {
+    successCallback = &aSuccessCallback.Value();
+  }
   nsRefPtr<WebAudioDecodeJob> job(
     new WebAudioDecodeJob(contentType, this,
-                          &aSuccessCallback, failureCallback));
+                          promise, successCallback, failureCallback));
   mDecoder.AsyncDecodeMedia(contentType.get(), data, length, *job);
   // Transfer the ownership to mDecodeJobs
   mDecodeJobs.AppendElement(job.forget());
+
+  return promise.forget();
 }
 
 void
@@ -654,12 +669,6 @@
   return mDestination->MozAudioChannelType();
 }
 
-void
-AudioContext::SetMozAudioChannelType(AudioChannel aValue, ErrorResult& aRv)
-{
-  mDestination->SetMozAudioChannelType(aValue, aRv);
-}
-
 AudioChannel
 AudioContext::TestAudioChannelInAudioNodeStream()
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioContext.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioContext.h	2014-11-26 21:46:02.000000000 +0000
@@ -61,6 +61,7 @@
 class ScriptProcessorNode;
 class WaveShaperNode;
 class PeriodicWave;
+class Promise;
 
 class AudioContext MOZ_FINAL : public DOMEventTargetHelper,
                                public nsIMemoryReporter
@@ -184,9 +185,10 @@
   CreatePeriodicWave(const Float32Array& aRealData, const Float32Array& aImagData,
                      ErrorResult& aRv);
 
-  void DecodeAudioData(const ArrayBuffer& aBuffer,
-                       DecodeSuccessCallback& aSuccessCallback,
-                       const Optional<OwningNonNull<DecodeErrorCallback> >& aFailureCallback);
+  already_AddRefed<Promise>
+  DecodeAudioData(const ArrayBuffer& aBuffer,
+                  const Optional<OwningNonNull<DecodeSuccessCallback> >& aSuccessCallback,
+                  const Optional<OwningNonNull<DecodeErrorCallback> >& aFailureCallback);
 
   // OfflineAudioContext methods
   void StartRendering(ErrorResult& aRv);
@@ -222,7 +224,6 @@
   JSObject* GetGlobalJSObject() const;
 
   AudioChannel MozAudioChannelType() const;
-  void SetMozAudioChannelType(AudioChannel aValue, ErrorResult& aRv);
 
   AudioChannel TestAudioChannelInAudioNodeStream();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioDestinationNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioDestinationNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioDestinationNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioDestinationNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -466,7 +466,7 @@
 AudioDestinationNode::StartRendering()
 {
   mOfflineRenderingRef.Take(this);
-  mStream->Graph()->StartNonRealtimeProcessing(TrackRate(Context()->SampleRate()), mFramesToProduce);
+  mStream->Graph()->StartNonRealtimeProcessing(mFramesToProduce);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeEngine.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeEngine.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeEngine.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeEngine.h	2014-11-26 21:46:02.000000000 +0000
@@ -241,7 +241,7 @@
 
   virtual dom::DelayNodeEngine* AsDelayNodeEngine() { return nullptr; }
 
-  virtual void SetStreamTimeParameter(uint32_t aIndex, TrackTicks aParam)
+  virtual void SetStreamTimeParameter(uint32_t aIndex, StreamTime aParam)
   {
     NS_ERROR("Invalid SetStreamTimeParameter index");
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -14,7 +14,6 @@
 
 AudioNodeExternalInputStream::AudioNodeExternalInputStream(AudioNodeEngine* aEngine, TrackRate aSampleRate)
   : AudioNodeStream(aEngine, MediaStreamGraph::INTERNAL_STREAM, aSampleRate)
-  , mCurrentOutputPosition(0)
 {
   MOZ_COUNT_CTOR(AudioNodeExternalInputStream);
 }
@@ -24,294 +23,83 @@
   MOZ_COUNT_DTOR(AudioNodeExternalInputStream);
 }
 
-AudioNodeExternalInputStream::TrackMapEntry::~TrackMapEntry()
-{
-  if (mResampler) {
-    speex_resampler_destroy(mResampler);
-  }
-}
-
-size_t
-AudioNodeExternalInputStream::GetTrackMapEntry(const StreamBuffer::Track& aTrack,
-                                               GraphTime aFrom)
+/**
+ * Copies the data in aInput to aOffsetInBlock within aBlock.
+ * aBlock must have been allocated with AllocateInputBlock and have a channel
+ * count that's a superset of the channels in aInput.
+ */
+static void
+CopyChunkToBlock(const AudioChunk& aInput, AudioChunk *aBlock,
+                 uint32_t aOffsetInBlock)
 {
-  AudioSegment* segment = aTrack.Get<AudioSegment>();
-
-  // Check the map for an existing entry corresponding to the input track.
-  for (size_t i = 0; i < mTrackMap.Length(); ++i) {
-    TrackMapEntry* map = &mTrackMap[i];
-    if (map->mTrackID == aTrack.GetID()) {
-      return i;
+  uint32_t blockChannels = aBlock->ChannelCount();
+  nsAutoTArray<const void*,2> channels;
+  if (aInput.IsNull()) {
+    channels.SetLength(blockChannels);
+    PodZero(channels.Elements(), blockChannels);
+  } else {
+    channels.SetLength(aInput.ChannelCount());
+    PodCopy(channels.Elements(), aInput.mChannelData.Elements(), channels.Length());
+    if (channels.Length() != blockChannels) {
+      // We only need to upmix here because aBlock's channel count has been
+      // chosen to be a superset of the channel count of every chunk.
+      AudioChannelsUpMix(&channels, blockChannels, nullptr);
     }
   }
 
-  // Determine channel count by finding the first entry with non-silent data.
-  AudioSegment::ChunkIterator ci(*segment);
-  while (!ci.IsEnded() && ci->IsNull()) {
-    ci.Next();
-  }
-  if (ci.IsEnded()) {
-    // The track is entirely silence so far, we can ignore it for now.
-    return nsTArray<TrackMapEntry>::NoIndex;
-  }
-
-  // Create a speex resampler with the same sample rate and number of channels
-  // as the track.
-  SpeexResamplerState* resampler = nullptr;
-  size_t channelCount = std::min((*ci).mChannelData.Length(),
-                                   WebAudioUtils::MaxChannelCount);
-  if (aTrack.GetRate() != mSampleRate) {
-    resampler = speex_resampler_init(channelCount,
-      aTrack.GetRate(), mSampleRate, SPEEX_RESAMPLER_QUALITY_DEFAULT, nullptr);
-    speex_resampler_skip_zeros(resampler);
-  }
-
-  TrackMapEntry* map = mTrackMap.AppendElement();
-  map->mEndOfConsumedInputTicks = 0;
-  map->mEndOfLastInputIntervalInInputStream = -1;
-  map->mEndOfLastInputIntervalInOutputStream = -1;
-  map->mSamplesPassedToResampler =
-    TimeToTicksRoundUp(aTrack.GetRate(), GraphTimeToStreamTime(aFrom));
-  map->mResampler = resampler;
-  map->mResamplerChannelCount = channelCount;
-  map->mTrackID = aTrack.GetID();
-  return mTrackMap.Length() - 1;
-}
-
-static const uint32_t SPEEX_RESAMPLER_PROCESS_MAX_OUTPUT = 1000;
-
-template <typename T> static void
-ResampleChannelBuffer(SpeexResamplerState* aResampler, uint32_t aChannel,
-                      const T* aInput, uint32_t aInputDuration,
-                      nsTArray<float>* aOutput)
-{
-  if (!aResampler) {
-    float* out = aOutput->AppendElements(aInputDuration);
-    for (uint32_t i = 0; i < aInputDuration; ++i) {
-      out[i] = AudioSampleToFloat(aInput[i]);
-    }
-    return;
-  }
-
-  uint32_t processed = 0;
-  while (processed < aInputDuration) {
-    uint32_t prevLength = aOutput->Length();
-    float* output = aOutput->AppendElements(SPEEX_RESAMPLER_PROCESS_MAX_OUTPUT);
-    uint32_t in = aInputDuration - processed;
-    uint32_t out = aOutput->Length() - prevLength;
-    WebAudioUtils::SpeexResamplerProcess(aResampler, aChannel,
-                                         aInput + processed, &in,
-                                         output, &out);
-    processed += in;
-    aOutput->SetLength(prevLength + out);
-  }
-}
-
-void
-AudioNodeExternalInputStream::TrackMapEntry::ResampleChannels(const nsTArray<const void*>& aBuffers,
-                                                              uint32_t aInputDuration,
-                                                              AudioSampleFormat aFormat,
-                                                              float aVolume)
-{
-  NS_ASSERTION(aBuffers.Length() == mResamplerChannelCount,
-               "Channel count must be correct here");
-
-  nsAutoTArray<nsTArray<float>,2> resampledBuffers;
-  resampledBuffers.SetLength(aBuffers.Length());
-  nsTArray<float> samplesAdjustedForVolume;
-  nsAutoTArray<const float*,2> bufferPtrs;
-  bufferPtrs.SetLength(aBuffers.Length());
-
-  for (uint32_t i = 0; i < aBuffers.Length(); ++i) {
-    AudioSampleFormat format = aFormat;
-    const void* buffer = aBuffers[i];
-
-    if (aVolume != 1.0f) {
-      format = AUDIO_FORMAT_FLOAT32;
-      samplesAdjustedForVolume.SetLength(aInputDuration);
-      switch (aFormat) {
+  uint32_t duration = aInput.GetDuration();
+  for (uint32_t c = 0; c < blockChannels; ++c) {
+    float* outputData =
+      static_cast<float*>(const_cast<void*>(aBlock->mChannelData[c])) + aOffsetInBlock;
+    if (channels[c]) {
+      switch (aInput.mBufferFormat) {
       case AUDIO_FORMAT_FLOAT32:
-        ConvertAudioSamplesWithScale(static_cast<const float*>(buffer),
-                                     samplesAdjustedForVolume.Elements(),
-                                     aInputDuration, aVolume);
+        ConvertAudioSamplesWithScale(
+            static_cast<const float*>(channels[c]), outputData, duration,
+            aInput.mVolume);
         break;
       case AUDIO_FORMAT_S16:
-        ConvertAudioSamplesWithScale(static_cast<const int16_t*>(buffer),
-                                     samplesAdjustedForVolume.Elements(),
-                                     aInputDuration, aVolume);
+        ConvertAudioSamplesWithScale(
+            static_cast<const int16_t*>(channels[c]), outputData, duration,
+            aInput.mVolume);
         break;
       default:
-        MOZ_ASSERT(false);
-        return;
-      }
-      buffer = samplesAdjustedForVolume.Elements();
-    }
-
-    switch (format) {
-    case AUDIO_FORMAT_FLOAT32:
-      ResampleChannelBuffer(mResampler, i,
-                            static_cast<const float*>(buffer),
-                            aInputDuration, &resampledBuffers[i]);
-      break;
-    case AUDIO_FORMAT_S16:
-      ResampleChannelBuffer(mResampler, i,
-                            static_cast<const int16_t*>(buffer),
-                            aInputDuration, &resampledBuffers[i]);
-      break;
-    default:
-      MOZ_ASSERT(false);
-      return;
-    }
-    bufferPtrs[i] = resampledBuffers[i].Elements();
-    NS_ASSERTION(i == 0 ||
-                 resampledBuffers[i].Length() == resampledBuffers[0].Length(),
-                 "Resampler made different decisions for different channels!");
-  }
-
-  uint32_t length = resampledBuffers[0].Length();
-  nsRefPtr<ThreadSharedObject> buf = new SharedChannelArrayBuffer<float>(&resampledBuffers);
-  mResampledData.AppendFrames(buf.forget(), bufferPtrs, length);
-}
-
-void
-AudioNodeExternalInputStream::TrackMapEntry::ResampleInputData(AudioSegment* aSegment)
-{
-  AudioSegment::ChunkIterator ci(*aSegment);
-  while (!ci.IsEnded()) {
-    const AudioChunk& chunk = *ci;
-    nsAutoTArray<const void*,2> channels;
-    if (chunk.GetDuration() > UINT32_MAX) {
-      // This will cause us to OOM or overflow below. So let's just bail.
-      NS_ERROR("Chunk duration out of bounds");
-      return;
-    }
-    uint32_t duration = uint32_t(chunk.GetDuration());
-
-    if (chunk.IsNull()) {
-      nsAutoTArray<AudioDataValue,1024> silence;
-      silence.SetLength(duration);
-      PodZero(silence.Elements(), silence.Length());
-      channels.SetLength(mResamplerChannelCount);
-      for (uint32_t i = 0; i < channels.Length(); ++i) {
-        channels[i] = silence.Elements();
+        NS_ERROR("Unhandled format");
       }
-      ResampleChannels(channels, duration, AUDIO_OUTPUT_FORMAT, 0.0f);
-    } else if (chunk.mChannelData.Length() == mResamplerChannelCount) {
-      // Common case, since mResamplerChannelCount is set to the first chunk's
-      // number of channels.
-      channels.AppendElements(chunk.mChannelData);
-      ResampleChannels(channels, duration, chunk.mBufferFormat, chunk.mVolume);
     } else {
-      // Uncommon case. Since downmixing requires channels to be floats,
-      // convert everything to floats now.
-      uint32_t upChannels = GetAudioChannelsSuperset(chunk.mChannelData.Length(), mResamplerChannelCount);
-      nsTArray<float> buffer;
-      if (chunk.mBufferFormat == AUDIO_FORMAT_FLOAT32) {
-        channels.AppendElements(chunk.mChannelData);
-      } else {
-        NS_ASSERTION(chunk.mBufferFormat == AUDIO_FORMAT_S16, "Unknown format");
-        if (duration > UINT32_MAX/chunk.mChannelData.Length()) {
-          NS_ERROR("Chunk duration out of bounds");
-          return;
-        }
-        buffer.SetLength(chunk.mChannelData.Length()*duration);
-        for (uint32_t i = 0; i < chunk.mChannelData.Length(); ++i) {
-          const int16_t* samples = static_cast<const int16_t*>(chunk.mChannelData[i]);
-          float* converted = &buffer[i*duration];
-          for (uint32_t j = 0; j < duration; ++j) {
-            converted[j] = AudioSampleToFloat(samples[j]);
-          }
-          channels.AppendElement(converted);
-        }
-      }
-      nsTArray<float> zeroes;
-      if (channels.Length() < upChannels) {
-        zeroes.SetLength(duration);
-        PodZero(zeroes.Elements(), zeroes.Length());
-        AudioChannelsUpMix(&channels, upChannels, zeroes.Elements());
-      }
-      if (channels.Length() == mResamplerChannelCount) {
-        ResampleChannels(channels, duration, AUDIO_FORMAT_FLOAT32, chunk.mVolume);
-      } else {
-        nsTArray<float> output;
-        if (duration > UINT32_MAX/mResamplerChannelCount) {
-          NS_ERROR("Chunk duration out of bounds");
-          return;
-        }
-        output.SetLength(duration*mResamplerChannelCount);
-        nsAutoTArray<float*,2> outputPtrs;
-        nsAutoTArray<const void*,2> outputPtrsConst;
-        for (uint32_t i = 0; i < mResamplerChannelCount; ++i) {
-          outputPtrs.AppendElement(output.Elements() + i*duration);
-          outputPtrsConst.AppendElement(outputPtrs[i]);
-        }
-        AudioChannelsDownMix(channels, outputPtrs.Elements(), outputPtrs.Length(), duration);
-        ResampleChannels(outputPtrsConst, duration, AUDIO_FORMAT_FLOAT32, chunk.mVolume);
-      }
+      PodZero(outputData, duration);
     }
-    ci.Next();
   }
 }
 
 /**
- * Copies the data in aInput to aOffsetInBlock within aBlock. All samples must
- * be float. Both chunks must have the same number of channels (or else
- * aInput is null). aBlock must have been allocated with AllocateInputBlock.
+ * Converts the data in aSegment to a single chunk aBlock. aSegment must have
+ * duration WEBAUDIO_BLOCK_SIZE. aFallbackChannelCount is a superset of the
+ * channels in every chunk of aSegment. aBlock must be float format or null.
  */
-static void
-CopyChunkToBlock(const AudioChunk& aInput, AudioChunk *aBlock, uint32_t aOffsetInBlock)
-{
-  uint32_t d = aInput.GetDuration();
-  for (uint32_t i = 0; i < aBlock->mChannelData.Length(); ++i) {
-    float* out = static_cast<float*>(const_cast<void*>(aBlock->mChannelData[i])) +
-      aOffsetInBlock;
-    if (aInput.IsNull()) {
-      PodZero(out, d);
-    } else {
-      const float* in = static_cast<const float*>(aInput.mChannelData[i]);
-      ConvertAudioSamplesWithScale(in, out, d, aInput.mVolume);
-    }
-  }
-}
-
-/**
- * Converts the data in aSegment to a single chunk aChunk. Every chunk in
- * aSegment must have the same number of channels (or be null). aSegment must have
- * duration WEBAUDIO_BLOCK_SIZE. Every chunk in aSegment must be in float format.
- */
-static void
-ConvertSegmentToAudioBlock(AudioSegment* aSegment, AudioChunk* aBlock)
+static void ConvertSegmentToAudioBlock(AudioSegment* aSegment,
+                                       AudioChunk* aBlock,
+                                       int32_t aFallbackChannelCount)
 {
   NS_ASSERTION(aSegment->GetDuration() == WEBAUDIO_BLOCK_SIZE, "Bad segment duration");
 
   {
     AudioSegment::ChunkIterator ci(*aSegment);
-    NS_ASSERTION(!ci.IsEnded(), "Segment must have at least one chunk");
-    AudioChunk& firstChunk = *ci;
-    ci.Next();
-    if (ci.IsEnded()) {
-      *aBlock = firstChunk;
-      return;
-    }
-
-    while (ci->IsNull() && !ci.IsEnded()) {
-      ci.Next();
-    }
-    if (ci.IsEnded()) {
-      // All null.
-      aBlock->SetNull(WEBAUDIO_BLOCK_SIZE);
+    NS_ASSERTION(!ci.IsEnded(), "Should be at least one chunk!");
+    if (ci->GetDuration() == WEBAUDIO_BLOCK_SIZE &&
+        (ci->IsNull() || ci->mBufferFormat == AUDIO_FORMAT_FLOAT32)) {
+      // Return this chunk directly to avoid copying data.
+      *aBlock = *ci;
       return;
     }
-
-    AllocateAudioBlock(ci->mChannelData.Length(), aBlock);
   }
 
-  AudioSegment::ChunkIterator ci(*aSegment);
+  AllocateAudioBlock(aFallbackChannelCount, aBlock);
+
   uint32_t duration = 0;
-  while (!ci.IsEnded()) {
+  for (AudioSegment::ChunkIterator ci(*aSegment); !ci.IsEnded(); ci.Next()) {
     CopyChunkToBlock(*ci, aBlock, duration);
     duration += ci->GetDuration();
-    ci.Next();
   }
 }
 
@@ -334,29 +122,18 @@
 
   MediaStream* source = mInputs[0]->GetSource();
   nsAutoTArray<AudioSegment,1> audioSegments;
-  nsAutoTArray<bool,1> trackMapEntriesUsed;
   uint32_t inputChannels = 0;
   for (StreamBuffer::TrackIter tracks(source->mBuffer, MediaSegment::AUDIO);
        !tracks.IsEnded(); tracks.Next()) {
     const StreamBuffer::Track& inputTrack = *tracks;
-    // Create a TrackMapEntry if necessary.
-    size_t trackMapIndex = GetTrackMapEntry(inputTrack, aFrom);
-    // Maybe there's nothing in this track yet. If so, ignore it. (While the
-    // track is only playing silence, we may not be able to determine the
-    // correct number of channels to start resampling.)
-    if (trackMapIndex == nsTArray<TrackMapEntry>::NoIndex) {
+    const AudioSegment& inputSegment =
+        *static_cast<AudioSegment*>(inputTrack.GetSegment());
+    if (inputSegment.IsNull()) {
       continue;
     }
 
-    while (trackMapEntriesUsed.Length() <= trackMapIndex) {
-      trackMapEntriesUsed.AppendElement(false);
-    }
-    trackMapEntriesUsed[trackMapIndex] = true;
-
-    TrackMapEntry* trackMap = &mTrackMap[trackMapIndex];
-    AudioSegment segment;
+    AudioSegment& segment = *audioSegments.AppendElement();
     GraphTime next;
-    TrackRate inputTrackRate = inputTrack.GetRate();
     for (GraphTime t = aFrom; t < aTo; t = next) {
       MediaInputPort::InputInterval interval = mInputs[0]->GetNextInputInterval(t);
       interval.mEnd = std::min(interval.mEnd, aTo);
@@ -364,67 +141,28 @@
         break;
       next = interval.mEnd;
 
-      // Ticks >= startTicks and < endTicks are in the interval
-      StreamTime outputEnd = GraphTimeToStreamTime(interval.mEnd);
-      TrackTicks startTicks = trackMap->mSamplesPassedToResampler + segment.GetDuration();
       StreamTime outputStart = GraphTimeToStreamTime(interval.mStart);
-      NS_ASSERTION(startTicks == TimeToTicksRoundUp(inputTrackRate, outputStart),
-                   "Samples missing");
-      TrackTicks endTicks = TimeToTicksRoundUp(inputTrackRate, outputEnd);
-      TrackTicks ticks = endTicks - startTicks;
+      StreamTime outputEnd = GraphTimeToStreamTime(interval.mEnd);
+      StreamTime ticks = outputEnd - outputStart;
 
       if (interval.mInputIsBlocked) {
         segment.AppendNullData(ticks);
       } else {
-        // See comments in TrackUnionStream::CopyTrackData
-        StreamTime inputStart = source->GraphTimeToStreamTime(interval.mStart);
-        StreamTime inputEnd = source->GraphTimeToStreamTime(interval.mEnd);
-        TrackTicks inputTrackEndPoint =
-            inputTrack.IsEnded() ? inputTrack.GetEnd() : TRACK_TICKS_MAX;
-
-        if (trackMap->mEndOfLastInputIntervalInInputStream != inputStart ||
-            trackMap->mEndOfLastInputIntervalInOutputStream != outputStart) {
-          // Start of a new series of intervals where neither stream is blocked.
-          trackMap->mEndOfConsumedInputTicks = TimeToTicksRoundDown(inputTrackRate, inputStart) - 1;
-        }
-        TrackTicks inputStartTicks = trackMap->mEndOfConsumedInputTicks;
-        TrackTicks inputEndTicks = inputStartTicks + ticks;
-        trackMap->mEndOfConsumedInputTicks = inputEndTicks;
-        trackMap->mEndOfLastInputIntervalInInputStream = inputEnd;
-        trackMap->mEndOfLastInputIntervalInOutputStream = outputEnd;
-
-        if (inputStartTicks < 0) {
-          // Data before the start of the track is just null.
-          segment.AppendNullData(-inputStartTicks);
-          inputStartTicks = 0;
-        }
-        if (inputEndTicks > inputStartTicks) {
-          segment.AppendSlice(*inputTrack.GetSegment(),
-                              std::min(inputTrackEndPoint, inputStartTicks),
-                              std::min(inputTrackEndPoint, inputEndTicks));
-        }
+        StreamTime inputStart =
+          std::min(inputSegment.GetDuration(),
+                   source->GraphTimeToStreamTime(interval.mStart));
+        StreamTime inputEnd =
+          std::min(inputSegment.GetDuration(),
+                   source->GraphTimeToStreamTime(interval.mEnd));
+
+        segment.AppendSlice(inputSegment, inputStart, inputEnd);
         // Pad if we're looking past the end of the track
-        segment.AppendNullData(ticks - segment.GetDuration());
+        segment.AppendNullData(ticks - (inputEnd - inputStart));
       }
     }
 
-    trackMap->mSamplesPassedToResampler += segment.GetDuration();
-    trackMap->ResampleInputData(&segment);
-
-    if (trackMap->mResampledData.GetDuration() < mCurrentOutputPosition + WEBAUDIO_BLOCK_SIZE) {
-      // We don't have enough data. Delay it.
-      trackMap->mResampledData.InsertNullDataAtStart(
-        mCurrentOutputPosition + WEBAUDIO_BLOCK_SIZE - trackMap->mResampledData.GetDuration());
-    }
-    audioSegments.AppendElement()->AppendSlice(trackMap->mResampledData,
-      mCurrentOutputPosition, mCurrentOutputPosition + WEBAUDIO_BLOCK_SIZE);
-    trackMap->mResampledData.ForgetUpTo(mCurrentOutputPosition + WEBAUDIO_BLOCK_SIZE);
-    inputChannels = GetAudioChannelsSuperset(inputChannels, trackMap->mResamplerChannelCount);
-  }
-
-  for (int32_t i = mTrackMap.Length() - 1; i >= 0; --i) {
-    if (i >= int32_t(trackMapEntriesUsed.Length()) || !trackMapEntriesUsed[i]) {
-      mTrackMap.RemoveElementAt(i);
+    for (AudioSegment::ChunkIterator iter(segment); !iter.IsEnded(); iter.Next()) {
+      inputChannels = GetAudioChannelsSuperset(inputChannels, iter->ChannelCount());
     }
   }
 
@@ -433,7 +171,7 @@
     nsAutoTArray<float,GUESS_AUDIO_CHANNELS*WEBAUDIO_BLOCK_SIZE> downmixBuffer;
     for (uint32_t i = 0; i < audioSegments.Length(); ++i) {
       AudioChunk tmpChunk;
-      ConvertSegmentToAudioBlock(&audioSegments[i], &tmpChunk);
+      ConvertSegmentToAudioBlock(&audioSegments[i], &tmpChunk, inputChannels);
       if (!tmpChunk.IsNull()) {
         if (accumulateIndex == 0) {
           AllocateAudioBlock(inputChannels, &mLastChunks[0]);
@@ -446,7 +184,6 @@
   if (accumulateIndex == 0) {
     mLastChunks[0].SetNull(WEBAUDIO_BLOCK_SIZE);
   }
-  mCurrentOutputPosition += WEBAUDIO_BLOCK_SIZE;
 
   // Using AudioNodeStream's AdvanceOutputSegment to push the media stream graph along with null data.
   AdvanceOutputSegment();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeExternalInputStream.h	2014-11-26 21:46:02.000000000 +0000
@@ -10,16 +10,13 @@
 #include "AudioNodeStream.h"
 #include "mozilla/Atomics.h"
 
-// Forward declaration for mResamplerMap
-typedef struct SpeexResamplerState_ SpeexResamplerState;
-
 namespace mozilla {
 
 /**
  * This is a MediaStream implementation that acts for a Web Audio node but
  * unlike other AudioNodeStreams, supports any kind of MediaStream as an
- * input --- handling any number of audio tracks, resampling them from whatever
- * sample rate they're using, and handling blocking of the input MediaStream.
+ * input --- handling any number of audio tracks and handling blocking of
+ * the input MediaStream.
  */
 class AudioNodeExternalInputStream : public AudioNodeStream {
 public:
@@ -31,73 +28,6 @@
   virtual void ProcessInput(GraphTime aFrom, GraphTime aTo, uint32_t aFlags) MOZ_OVERRIDE;
 
 private:
-  // For storing pointers and data about input tracks, like the last TrackTick which
-  // was read, and the associated speex resampler.
-  struct TrackMapEntry {
-    ~TrackMapEntry();
-
-    /**
-     * Resamples data from all chunks in aIterator and following, using mResampler,
-     * adding the results to mResampledData.
-     */
-    void ResampleInputData(AudioSegment* aSegment);
-    /**
-     * Resamples a set of channel buffers using mResampler, adding the results
-     * to mResampledData.
-     */
-    void ResampleChannels(const nsTArray<const void*>& aBuffers,
-                          uint32_t aInputDuration,
-                          AudioSampleFormat aFormat,
-                          float aVolume);
-
-    // mEndOfConsumedInputTicks is the end of the input ticks that we've consumed.
-    // 0 if we haven't consumed any yet.
-    TrackTicks mEndOfConsumedInputTicks;
-    // mEndOfLastInputIntervalInInputStream is the timestamp for the end of the
-    // previous interval which was unblocked for both the input and output
-    // stream, in the input stream's timeline, or -1 if there wasn't one.
-    StreamTime mEndOfLastInputIntervalInInputStream;
-    // mEndOfLastInputIntervalInOutputStream is the timestamp for the end of the
-    // previous interval which was unblocked for both the input and output
-    // stream, in the output stream's timeline, or -1 if there wasn't one.
-    StreamTime mEndOfLastInputIntervalInOutputStream;
-    /**
-     * Number of samples passed to the resampler so far.
-     */
-    TrackTicks mSamplesPassedToResampler;
-    /**
-     * Resampler being applied to this track.
-     */
-    SpeexResamplerState* mResampler;
-    /**
-     * The track data that has been resampled to the rate of the
-     * AudioNodeExternalInputStream. All data in these chunks is in floats (or null),
-     * and has the number of channels given in mResamplerChannelCount.
-     * mResampledData starts at zero in the stream's output track (so generally
-     * it will consist of null data followed by actual data).
-     */
-    AudioSegment mResampledData;
-    /**
-     * Number of channels used to create mResampler.
-     */
-    uint32_t mResamplerChannelCount;
-    /**
-     * The ID for the track of the input stream this entry is for.
-     */
-    TrackID mTrackID;
-  };
-
-  nsTArray<TrackMapEntry> mTrackMap;
-  // Amount of track data produced so far. A multiple of WEBAUDIO_BLOCK_SIZE.
-  TrackTicks mCurrentOutputPosition;
-
-  /**
-   * Creates a TrackMapEntry for the track, if needed. Returns the index
-   * of the TrackMapEntry or NoIndex if no entry is needed yet.
-   */
-  size_t GetTrackMapEntry(const StreamBuffer::Track& aTrack,
-                          GraphTime aFrom);
-
   /**
    * Determines if this is enabled or not.  Disabled nodes produce silence.
    * This node becomes disabled if the document principal does not subsume the
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeStream.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeStream.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeStream.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeStream.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -98,7 +98,7 @@
 AudioNodeStream::SetStreamTimeParameterImpl(uint32_t aIndex, MediaStream* aRelativeToStream,
                                             double aStreamTime)
 {
-  TrackTicks ticks = TicksFromDestinationTime(aRelativeToStream, aStreamTime);
+  StreamTime ticks = TicksFromDestinationTime(aRelativeToStream, aStreamTime);
   mEngine->SetStreamTimeParameter(aIndex, ticks);
 }
 
@@ -445,7 +445,7 @@
 AudioNodeStream::ProcessInput(GraphTime aFrom, GraphTime aTo, uint32_t aFlags)
 {
   if (!mFinished) {
-    EnsureTrack(AUDIO_TRACK, mSampleRate);
+    EnsureTrack(AUDIO_TRACK);
   }
   // No more tracks will be coming
   mBuffer.AdvanceKnownTracksTime(STREAM_TIME_MAX);
@@ -537,7 +537,7 @@
 void
 AudioNodeStream::AdvanceOutputSegment()
 {
-  StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK, mSampleRate);
+  StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK);
   AudioSegment* segment = track->Get<AudioSegment>();
 
   if (mKind == MediaStreamGraph::EXTERNAL_STREAM) {
@@ -552,16 +552,15 @@
     AudioSegment tmpSegment;
     tmpSegment.AppendAndConsumeChunk(&copyChunk);
     l->NotifyQueuedTrackChanges(Graph(), AUDIO_TRACK,
-                                mSampleRate, segment->GetDuration(), 0,
-                                tmpSegment);
+                                segment->GetDuration(), 0, tmpSegment);
   }
 }
 
-TrackTicks
+StreamTime
 AudioNodeStream::GetCurrentPosition()
 {
   NS_ASSERTION(!mFinished, "Don't create another track after finishing");
-  return EnsureTrack(AUDIO_TRACK, mSampleRate)->Get<AudioSegment>()->GetDuration();
+  return EnsureTrack(AUDIO_TRACK)->Get<AudioSegment>()->GetDuration();
 }
 
 void
@@ -571,7 +570,7 @@
     return;
   }
 
-  StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK, mSampleRate);
+  StreamBuffer::Track* track = EnsureTrack(AUDIO_TRACK);
   track->SetEnded();
   FinishOnGraphThread();
 
@@ -579,7 +578,6 @@
     MediaStreamListener* l = mListeners[j];
     AudioSegment emptySegment;
     l->NotifyQueuedTrackChanges(Graph(), AUDIO_TRACK,
-                                mSampleRate,
                                 track->GetSegment()->GetDuration(),
                                 MediaStreamListener::TRACK_EVENT_ENDED, emptySegment);
   }
@@ -607,7 +605,7 @@
   return thisFractionalTicks;
 }
 
-TrackTicks
+StreamTime
 AudioNodeStream::TicksFromDestinationTime(MediaStream* aDestination,
                                           double aSeconds)
 {
@@ -617,17 +615,16 @@
   double thisSeconds =
     FractionalTicksFromDestinationTime(destination, aSeconds);
   // Round to nearest
-  TrackTicks ticks = thisSeconds + 0.5;
+  StreamTime ticks = thisSeconds + 0.5;
   return ticks;
 }
 
 double
 AudioNodeStream::DestinationTimeFromTicks(AudioNodeStream* aDestination,
-                                          TrackTicks aPosition)
+                                          StreamTime aPosition)
 {
   MOZ_ASSERT(SampleRate() == aDestination->SampleRate());
-  StreamTime sourceTime = TicksToTimeRoundDown(SampleRate(), aPosition);
-  GraphTime graphTime = StreamTimeToGraphTime(sourceTime);
+  GraphTime graphTime = StreamTimeToGraphTime(aPosition);
   StreamTime destinationTime = aDestination->GraphTimeToStreamTimeOptimistic(graphTime);
   return StreamTimeToSeconds(destinationTime);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeStream.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeStream.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/AudioNodeStream.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/AudioNodeStream.h	2014-11-26 21:46:02.000000000 +0000
@@ -113,7 +113,7 @@
    * the output.  This is used only for DelayNodeEngine in a feedback loop.
    */
   void ProduceOutputBeforeInput(GraphTime aFrom);
-  TrackTicks GetCurrentPosition();
+  StreamTime GetCurrentPosition();
   bool IsAudioParamStream() const
   {
     return mAudioParamStream;
@@ -145,17 +145,17 @@
   double FractionalTicksFromDestinationTime(AudioNodeStream* aDestination,
                                             double aSeconds);
   /**
-   * Convert a time in seconds on the destination stream to nearest TrackTicks
+   * Convert a time in seconds on the destination stream to StreamTime
    * on this stream.
    */
-  TrackTicks TicksFromDestinationTime(MediaStream* aDestination,
+  StreamTime TicksFromDestinationTime(MediaStream* aDestination,
                                       double aSeconds);
   /**
    * Get the destination stream time in seconds corresponding to a position on
    * this stream.
    */
   double DestinationTimeFromTicks(AudioNodeStream* aDestination,
-                                  TrackTicks aPosition);
+                                  StreamTime aPosition);
 
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/BiquadFilterNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/BiquadFilterNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/BiquadFilterNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/BiquadFilterNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -185,7 +185,7 @@
     uint32_t numberOfChannels = mBiquads.Length();
     AllocateAudioBlock(numberOfChannels, aOutput);
 
-    TrackTicks pos = aStream->GetCurrentPosition();
+    StreamTime pos = aStream->GetCurrentPosition();
 
     double freq = mFrequency.GetValueAtTime(pos);
     double q = mQ.GetValueAtTime(pos);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/DelayBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/DelayBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/DelayBuffer.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/DelayBuffer.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -247,9 +247,7 @@
                    "Smoothing is making feedback delay too small.");
 
   mLastReadChunk = aNewReadChunk;
-  // Missing assignment operator is bug 976927
-  mUpmixChannels.ReplaceElementsAt(0, mUpmixChannels.Length(),
-                                   mChunks[aNewReadChunk].mChannelData);
+  mUpmixChannels = mChunks[aNewReadChunk].mChannelData;
   MOZ_ASSERT(mUpmixChannels.Length() <= aChannelCount);
   if (mUpmixChannels.Length() < aChannelCount) {
     if (aChannelInterpretation == ChannelInterpretation::Speakers) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/DelayNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/DelayNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/DelayNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/DelayNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -136,7 +136,7 @@
       // Compute the delay values for the duration of the input AudioChunk
       // If this DelayNode is in a cycle, make sure the delay value is at least
       // one block.
-      TrackTicks tick = mSource->GetCurrentPosition();
+      StreamTime tick = mSource->GetCurrentPosition();
       double computedDelay[WEBAUDIO_BLOCK_SIZE];
       for (size_t counter = 0; counter < WEBAUDIO_BLOCK_SIZE; ++counter) {
         double delayAtTick = mDelay.GetValueAtTime(tick, counter) * sampleRate;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/DynamicsCompressorNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/DynamicsCompressorNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/DynamicsCompressorNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/DynamicsCompressorNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -111,7 +111,7 @@
                                                     aInput.mChannelData.Length());
     }
 
-    TrackTicks pos = aStream->GetCurrentPosition();
+    StreamTime pos = aStream->GetCurrentPosition();
     mCompressor->setParameterValue(DynamicsCompressor::ParamThreshold,
                                    mThreshold.GetValueAtTime(pos));
     mCompressor->setParameterValue(DynamicsCompressor::ParamKnee,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/GainNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/GainNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/GainNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/GainNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -87,7 +87,7 @@
       // XXX we need to add a method to AudioEventTimeline to compute this buffer directly.
       float computedGain[WEBAUDIO_BLOCK_SIZE];
       for (size_t counter = 0; counter < WEBAUDIO_BLOCK_SIZE; ++counter) {
-        TrackTicks tick = aStream->GetCurrentPosition();
+        StreamTime tick = aStream->GetCurrentPosition();
         computedGain[counter] = mGain.GetValueAtTime(tick, counter) * aInput.mVolume;
       }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/MediaBufferDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/MediaBufferDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/MediaBufferDecoder.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/MediaBufferDecoder.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -21,6 +21,7 @@
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"
 #include "WebAudioUtils.h"
+#include "mozilla/dom/Promise.h"
 #ifdef XP_WIN
 #include "ThreadPoolCOMListener.h"
 #endif
@@ -261,7 +262,7 @@
   mDecoderReader->SetCallback(barrier);
   while (1) {
     mDecoderReader->RequestAudioData();
-    nsAutoPtr<AudioData> audio;
+    nsRefPtr<AudioData> audio;
     if (NS_FAILED(barrier->Await(audio))) {
       ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
       return;
@@ -270,7 +271,7 @@
       // End of stream.
       break;
     }
-    audioQueue.Push(audio.forget());
+    audioQueue.Push(audio);
   }
   mDecoderReader->Shutdown();
   mDecoderReader->BreakCycles();
@@ -324,7 +325,7 @@
     return;
   }
 
-  nsAutoPtr<AudioData> audioData;
+  nsRefPtr<AudioData> audioData;
   while ((audioData = audioQueue.PopFront())) {
     audioData->EnsureAudioBuffer(); // could lead to a copy :(
     AudioDataValue* bufferData = static_cast<AudioDataValue*>
@@ -512,16 +513,17 @@
 
 WebAudioDecodeJob::WebAudioDecodeJob(const nsACString& aContentType,
                                      AudioContext* aContext,
+                                     Promise* aPromise,
                                      DecodeSuccessCallback* aSuccessCallback,
                                      DecodeErrorCallback* aFailureCallback)
   : mContentType(aContentType)
   , mWriteIndex(0)
   , mContext(aContext)
+  , mPromise(aPromise)
   , mSuccessCallback(aSuccessCallback)
   , mFailureCallback(aFailureCallback)
 {
   MOZ_ASSERT(aContext);
-  MOZ_ASSERT(aSuccessCallback);
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_COUNT_CTOR(WebAudioDecodeJob);
 }
@@ -541,7 +543,10 @@
   // Ignore errors in calling the callback, since there is not much that we can
   // do about it here.
   ErrorResult rv;
-  mSuccessCallback->Call(*mOutput, rv);
+  if (mSuccessCallback) {
+    mSuccessCallback->Call(*mOutput, rv);
+  }
+  mPromise->MaybeResolve(mOutput);
 
   mContext->RemoveFromDecodeQueue(this);
 }
@@ -589,6 +594,8 @@
     mFailureCallback->Call(rv);
   }
 
+  mPromise->MaybeReject(NS_ERROR_DOM_ENCODING_NOT_SUPPORTED_ERR);
+
   mContext->RemoveFromDecodeQueue(this);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/MediaBufferDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/MediaBufferDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/MediaBufferDecoder.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/MediaBufferDecoder.h	2014-11-26 21:46:02.000000000 +0000
@@ -22,6 +22,7 @@
 class AudioContext;
 class DecodeErrorCallback;
 class DecodeSuccessCallback;
+class Promise;
 }
 
 struct WebAudioDecodeJob MOZ_FINAL
@@ -30,6 +31,7 @@
   // The callbacks are only necessary for asynchronous operation.
   WebAudioDecodeJob(const nsACString& aContentType,
                     dom::AudioContext* aContext,
+                    dom::Promise* aPromise,
                     dom::DecodeSuccessCallback* aSuccessCallback = nullptr,
                     dom::DecodeErrorCallback* aFailureCallback = nullptr);
 
@@ -58,6 +60,7 @@
   nsCString mContentType;
   uint32_t mWriteIndex;
   nsRefPtr<dom::AudioContext> mContext;
+  nsRefPtr<dom::Promise> mPromise;
   nsRefPtr<dom::DecodeSuccessCallback> mSuccessCallback;
   nsRefPtr<dom::DecodeErrorCallback> mFailureCallback; // can be null
   nsRefPtr<dom::AudioBuffer> mOutput;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -42,8 +42,7 @@
                             bool* aFinished) MOZ_OVERRIDE
   {
     *aOutput = aInput;
-    StreamBuffer::Track* track = mOutputStream->EnsureTrack(MEDIA_STREAM_DEST_TRACK_ID,
-                                                            aStream->SampleRate());
+    StreamBuffer::Track* track = mOutputStream->EnsureTrack(MEDIA_STREAM_DEST_TRACK_ID);
     AudioSegment* segment = track->Get<AudioSegment>();
     segment->AppendAndConsumeChunk(aOutput);
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/OscillatorNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/OscillatorNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/OscillatorNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/OscillatorNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -65,7 +65,7 @@
     , mSource(nullptr)
     , mDestination(static_cast<AudioNodeStream*> (aDestination->Stream()))
     , mStart(-1)
-    , mStop(TRACK_TICKS_MAX)
+    , mStop(STREAM_TIME_MAX)
     // Keep the default values in sync with OscillatorNode::OscillatorNode.
     , mFrequency(440.f)
     , mDetune(0.f)
@@ -116,7 +116,7 @@
     }
   }
 
-  virtual void SetStreamTimeParameter(uint32_t aIndex, TrackTicks aParam)
+  virtual void SetStreamTimeParameter(uint32_t aIndex, StreamTime aParam)
   {
     switch (aIndex) {
     case START: mStart = aParam; break;
@@ -207,7 +207,7 @@
     return mType == OscillatorType::Square || mType == OscillatorType::Triangle;
   }
 
-  void UpdateParametersIfNeeded(TrackTicks ticks, size_t count)
+  void UpdateParametersIfNeeded(StreamTime ticks, size_t count)
   {
     double frequency, detune;
 
@@ -249,11 +249,11 @@
     mAmplitudeAtZero = mNumberOfHarmonics / mSignalPeriod;
   }
 
-  void FillBounds(float* output, TrackTicks ticks,
+  void FillBounds(float* output, StreamTime ticks,
                   uint32_t& start, uint32_t& end)
   {
     MOZ_ASSERT(output);
-    static_assert(TrackTicks(WEBAUDIO_BLOCK_SIZE) < UINT_MAX,
+    static_assert(StreamTime(WEBAUDIO_BLOCK_SIZE) < UINT_MAX,
         "WEBAUDIO_BLOCK_SIZE overflows interator bounds.");
     start = 0;
     if (ticks < mStart) {
@@ -304,7 +304,7 @@
     return blit;
   }
 
-  void ComputeSine(float * aOutput, TrackTicks ticks, uint32_t aStart, uint32_t aEnd)
+  void ComputeSine(float * aOutput, StreamTime ticks, uint32_t aStart, uint32_t aEnd)
   {
     for (uint32_t i = aStart; i < aEnd; ++i) {
       UpdateParametersIfNeeded(ticks, i);
@@ -315,7 +315,7 @@
     }
   }
 
-  void ComputeSquare(float * aOutput, TrackTicks ticks, uint32_t aStart, uint32_t aEnd)
+  void ComputeSquare(float * aOutput, StreamTime ticks, uint32_t aStart, uint32_t aEnd)
   {
     for (uint32_t i = aStart; i < aEnd; ++i) {
       UpdateParametersIfNeeded(ticks, i);
@@ -329,7 +329,7 @@
     }
   }
 
-  void ComputeSawtooth(float * aOutput, TrackTicks ticks, uint32_t aStart, uint32_t aEnd)
+  void ComputeSawtooth(float * aOutput, StreamTime ticks, uint32_t aStart, uint32_t aEnd)
   {
     float dcoffset;
     for (uint32_t i = aStart; i < aEnd; ++i) {
@@ -346,7 +346,7 @@
     }
   }
 
-  void ComputeTriangle(float * aOutput, TrackTicks ticks, uint32_t aStart, uint32_t aEnd)
+  void ComputeTriangle(float * aOutput, StreamTime ticks, uint32_t aStart, uint32_t aEnd)
   {
     for (uint32_t i = aStart; i < aEnd; ++i) {
       UpdateParametersIfNeeded(ticks, i);
@@ -366,7 +366,7 @@
   }
 
   void ComputeCustom(float* aOutput,
-                     TrackTicks ticks,
+                     StreamTime ticks,
                      uint32_t aStart,
                      uint32_t aEnd)
   {
@@ -426,7 +426,7 @@
   {
     MOZ_ASSERT(mSource == aStream, "Invalid source stream");
 
-    TrackTicks ticks = aStream->GetCurrentPosition();
+    StreamTime ticks = aStream->GetCurrentPosition();
     if (mStart == -1) {
       ComputeSilence(aOutput);
       return;
@@ -503,8 +503,8 @@
   DCBlocker mDCBlocker;
   AudioNodeStream* mSource;
   AudioNodeStream* mDestination;
-  TrackTicks mStart;
-  TrackTicks mStop;
+  StreamTime mStart;
+  StreamTime mStop;
   AudioParamTimeline mFrequency;
   AudioParamTimeline mDetune;
   OscillatorType mType;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/ScriptProcessorNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/ScriptProcessorNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/ScriptProcessorNode.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/ScriptProcessorNode.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -100,7 +100,7 @@
 public:
   explicit SharedBuffers(float aSampleRate)
     : mOutputQueue("SharedBuffers::outputQueue")
-    , mDelaySoFar(TRACK_TICKS_MAX)
+    , mDelaySoFar(STREAM_TIME_MAX)
     , mSampleRate(aSampleRate)
     , mLatency(0.0)
     , mDroppingBuffers(false)
@@ -184,14 +184,14 @@
     {
       MutexAutoLock lock(mOutputQueue.Lock());
       if (mOutputQueue.ReadyToConsume() > 0) {
-        if (mDelaySoFar == TRACK_TICKS_MAX) {
+        if (mDelaySoFar == STREAM_TIME_MAX) {
           mDelaySoFar = 0;
         }
         buffer = mOutputQueue.Consume();
       } else {
         // If we're out of buffers to consume, just output silence
         buffer.SetNull(WEBAUDIO_BLOCK_SIZE);
-        if (mDelaySoFar != TRACK_TICKS_MAX) {
+        if (mDelaySoFar != STREAM_TIME_MAX) {
           // Remember the delay that we just hit
           mDelaySoFar += WEBAUDIO_BLOCK_SIZE;
         }
@@ -201,16 +201,16 @@
     return buffer;
   }
 
-  TrackTicks DelaySoFar() const
+  StreamTime DelaySoFar() const
   {
     MOZ_ASSERT(!NS_IsMainThread());
-    return mDelaySoFar == TRACK_TICKS_MAX ? 0 : mDelaySoFar;
+    return mDelaySoFar == STREAM_TIME_MAX ? 0 : mDelaySoFar;
   }
 
   void Reset()
   {
     MOZ_ASSERT(!NS_IsMainThread());
-    mDelaySoFar = TRACK_TICKS_MAX;
+    mDelaySoFar = STREAM_TIME_MAX;
     mLatency = 0.0f;
     {
       MutexAutoLock lock(mOutputQueue.Lock());
@@ -223,8 +223,8 @@
   OutputQueue mOutputQueue;
   // How much delay we've seen so far.  This measures the amount of delay
   // caused by the main thread lagging behind in producing output buffers.
-  // TRACK_TICKS_MAX means that we have not received our first buffer yet.
-  TrackTicks mDelaySoFar;
+  // STREAM_TIME_MAX means that we have not received our first buffer yet.
+  StreamTime mDelaySoFar;
   // The samplerate of the context.
   float mSampleRate;
   // This is the latency caused by the buffering. If this grows too high, we
@@ -352,7 +352,7 @@
     MOZ_ASSERT(!NS_IsMainThread());
 
     // we now have a full input buffer ready to be sent to the main thread.
-    TrackTicks playbackTick = mSource->GetCurrentPosition();
+    StreamTime playbackTick = mSource->GetCurrentPosition();
     // Add the duration of the current sample
     playbackTick += WEBAUDIO_BLOCK_SIZE;
     // Add the delay caused by the main thread
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/mochitest.ini	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/mochitest.ini	2014-11-26 21:46:02.000000000 +0000
@@ -87,6 +87,7 @@
 [test_convolverNodeWithGain.html]
 [test_currentTime.html]
 [test_decodeMultichannel.html]
+[test_decodeAudioDataPromise.html]
 [test_delayNode.html]
 [test_delayNodeAtMax.html]
 [test_delayNodeChannelChanges.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_decodeAudioDataPromise.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_decodeAudioDataPromise.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_decodeAudioDataPromise.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_decodeAudioDataPromise.html	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test the decodeAudioData API with Promise</title>
+
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script src="webaudio.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+
+var finished = 0;
+
+function finish() {
+  if (++finished == 2) {
+    SimpleTest.finish();
+  }
+}
+
+var ac = new AudioContext();
+// Test that a the promise is rejected with an invalid source buffer.
+expectNoException(function() {
+  var p = ac.decodeAudioData(" ");
+  ok(p instanceof Promise, "AudioContext.decodeAudioData should return a Promise");
+  p.then(function(data) {
+    ok(false, "Promise should not resolve with an invalid source buffer.");
+    finish();
+  }).catch(function(e) {
+    ok(true, "Promise should be rejected with an invalid source buffer.");
+    ok(e.name == "TypeError", "The error should be TypeError");
+    finish();
+  })
+});
+
+// Test that a the promise is resolved with a valid source buffer.
+var xhr = new XMLHttpRequest();
+xhr.open("GET", "ting-44.1k-1ch.ogg", true);
+xhr.responseType = "arraybuffer";
+xhr.onload = function() {
+  var p = ac.decodeAudioData(xhr.response);
+  ok(p instanceof Promise, "AudioContext.decodeAudioData should return a Promise");
+  p.then(function(data) {
+    ok(data instanceof AudioBuffer, "Promise should resolve, passing an AudioBuffer");
+    ok(true, "Promise should resolve with a valid source buffer.");
+    finish();
+  }).catch(function() {
+    ok(false, "Promise should not be rejected with a valid source buffer.");
+    finish();
+  });
+};
+xhr.send();
+});
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_mediaDecoding.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_mediaDecoding.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_mediaDecoding.html	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_mediaDecoding.html	2014-11-26 21:46:02.000000000 +0000
@@ -359,30 +359,6 @@
   }
 }
 
-// Run some simple tests first
-function callbackShouldNeverRun() {
-  ok(false, "callback should not fire");
-}
-(function() {
-  var cx = new AudioContext();
-  expectTypeError(function() {
-    cx.decodeAudioData(null, callbackShouldNeverRun, callbackShouldNeverRun);
-  });
-  expectTypeError(function() {
-    cx.decodeAudioData(undefined, callbackShouldNeverRun, callbackShouldNeverRun);
-  });
-  expectTypeError(function() {
-    cx.decodeAudioData(123, callbackShouldNeverRun, callbackShouldNeverRun);
-  });
-  expectTypeError(function() {
-    cx.decodeAudioData("buffer", callbackShouldNeverRun, callbackShouldNeverRun);
-  });
-  expectTypeError(function() {
-    cx.decodeAudioData(new Uint8Array(100), callbackShouldNeverRun, callbackShouldNeverRun);
-  });
-})();
-
-// Now, let's get real!
 loadNextTest();
 
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html	2014-11-26 21:46:02.000000000 +0000
@@ -11,11 +11,11 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-function createBuffer(context, delay) {
+function createBuffer(context) {
   var buffer = context.createBuffer(2, 2048, context.sampleRate);
-  for (var i = 0; i < 2048 - delay; ++i) {
-    buffer.getChannelData(0)[i + delay] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
-    buffer.getChannelData(1)[i + delay] = -buffer.getChannelData(0)[i + delay];
+  for (var i = 0; i < 2048; ++i) {
+    buffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
+    buffer.getChannelData(1)[i] = -buffer.getChannelData(0)[i];
   }
   return buffer;
 }
@@ -26,7 +26,7 @@
   createGraph: function(context) {
     var sourceGraph = new AudioContext();
     var source = sourceGraph.createBufferSource();
-    source.buffer = createBuffer(context, 0);
+    source.buffer = createBuffer(context);
     var dest = sourceGraph.createMediaStreamDestination();
     source.connect(dest);
     source.start(0);
@@ -38,7 +38,7 @@
     return mediaStreamSource;
   },
   createExpectedBuffers: function(context) {
-    return createBuffer(context, 1);
+    return createBuffer(context);
   },
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_mozaudiochannel.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_mozaudiochannel.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webaudio/test/test_mozaudiochannel.html	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webaudio/test/test_mozaudiochannel.html	2014-11-26 21:46:02.000000000 +0000
@@ -18,27 +18,23 @@
   // Default
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
-  // random wrong channel
-  ac.mozAudioChannelType = "foo";
-  is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
-
   // Unpermitted channels
-  ac.mozAudioChannelType = "content";
+  ac = new AudioContext("content");
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
-  ac.mozAudioChannelType = "notification";
+  ac = new AudioContext("notification");
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
-  ac.mozAudioChannelType = "alarm";
+  ac = new AudioContext("alarm");
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
-  ac.mozAudioChannelType = "telephony";
+  ac = new AudioContext("telephony");
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
-  ac.mozAudioChannelType = "ringer";
+  ac = new AudioContext("ringer");
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
-  ac.mozAudioChannelType = "publicnotification";
+  ac = new AudioContext("publicnotification");
   is(ac.mozAudioChannelType, "normal", "Default ac channel == 'normal'");
 
   runTest();
@@ -56,7 +52,7 @@
   SpecialPowers.pushPermissions(
     [{ "type": "audio-channel-" + aChannel, "allow": true, "context": document }],
     function() {
-      ac.mozAudioChannelType = aChannel;
+      var ac = new AudioContext(aChannel);
       is(ac.mozAudioChannelType, aChannel, "Default ac channel == '" + aChannel + "'");
 
       var channel = SpecialPowers.wrap(ac).testAudioChannelInAudioNodeStream();
@@ -147,6 +143,7 @@
 
 SpecialPowers.pushPrefEnv({"set": [["media.useAudioChannelService", true ]]}, runTest);
 SimpleTest.waitForExplicitFinish();
+SimpleTest.requestLongerTimeout(5);
 
 </script>
 </pre>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/IntelWebMVideoDecoder.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,464 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "IntelWebMVideoDecoder.h"
+
+#include "gfx2DGlue.h"
+#include "Layers.h"
+#include "MediaResource.h"
+#include "MediaTaskQueue.h"
+#include "mozilla/dom/HTMLMediaElement.h"
+#include "nsError.h"
+#include "SharedThreadPool.h"
+#include "WebMReader.h"
+#include "VorbisUtils.h"
+#include "nestegg/nestegg.h"
+
+#define VPX_DONT_DEFINE_STDINT_TYPES
+#include "vpx/vp8dx.h"
+#include "vpx/vpx_decoder.h"
+
+#undef LOG
+#ifdef PR_LOGGING
+PRLogModuleInfo* GetDemuxerLog();
+#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+#else
+#define LOG(...)
+#endif
+
+using namespace mp4_demuxer;
+
+namespace mozilla {
+
+using layers::Image;
+using layers::LayerManager;
+using layers::LayersBackend;
+
+class VP8Sample : public MP4Sample
+{
+public:
+  VP8Sample(int64_t aTimestamp,
+            int64_t aDuration,
+            int64_t aByteOffset,
+            uint8_t* aData,
+            size_t aSize,
+            bool aSyncPoint)
+  {
+    decode_timestamp = -1;
+    composition_timestamp = aTimestamp;
+    duration = aDuration;
+    byte_offset = aByteOffset;
+    is_sync_point = aSyncPoint;
+
+    data =  new uint8_t[aSize];
+    size = aSize;
+    memmove(data, aData, size);
+  }
+
+  ~VP8Sample()
+  {
+    delete data;
+  }
+};
+
+IntelWebMVideoDecoder::IntelWebMVideoDecoder(WebMReader* aReader)
+  : WebMVideoDecoder()
+  , mReader(aReader)
+  , mMonitor("IntelWebMVideoDecoder")
+  , mNumSamplesInput(0)
+  , mNumSamplesOutput(0)
+  , mDecodeAhead(2)
+  , mInputExhausted(false)
+  , mDrainComplete(false)
+  , mError(false)
+  , mEOS(false)
+  , mIsFlushing(false)
+{
+  MOZ_COUNT_CTOR(IntelWebMVideoDecoder);
+}
+
+IntelWebMVideoDecoder::~IntelWebMVideoDecoder()
+{
+  MOZ_COUNT_DTOR(IntelWebMVideoDecoder);
+  Shutdown();
+}
+
+void
+IntelWebMVideoDecoder::Shutdown()
+{
+  if (mMediaDataDecoder) {
+    Flush();
+    mMediaDataDecoder->Shutdown();
+    mMediaDataDecoder = nullptr;
+  }
+
+  mTaskQueue = nullptr;
+
+  mQueuedVideoSample = nullptr;
+  mReader = nullptr;
+}
+
+/* static */
+WebMVideoDecoder*
+IntelWebMVideoDecoder::Create(WebMReader* aReader)
+{
+  nsAutoPtr<IntelWebMVideoDecoder> decoder(new IntelWebMVideoDecoder(aReader));
+
+  decoder->mTaskQueue = aReader->GetTaskQueue();
+  NS_ENSURE_TRUE(decoder->mTaskQueue, nullptr);
+
+  return decoder.forget();
+}
+
+bool
+IntelWebMVideoDecoder::IsSupportedVideoMimeType(const char* aMimeType)
+{
+  return (!strcmp(aMimeType, "video/webm; codecs=vp8") ||
+          !strcmp(aMimeType, "video/webm; codecs=vp9")) &&
+         mPlatform->SupportsVideoMimeType(aMimeType);
+}
+
+nsresult
+IntelWebMVideoDecoder::Init(unsigned int aWidth, unsigned int aHeight)
+{
+  mPlatform = PlatformDecoderModule::Create();
+  if (!mPlatform) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mDecoderConfig = new VideoDecoderConfig();
+  mDecoderConfig->duration = 0;
+  mDecoderConfig->display_width = aWidth;
+  mDecoderConfig->display_height = aHeight;
+
+  switch (mReader->GetVideoCodec()) {
+  case NESTEGG_CODEC_VP8:
+    mDecoderConfig->mime_type = "video/webm; codecs=vp8";
+    break;
+  case NESTEGG_CODEC_VP9:
+    mDecoderConfig->mime_type = "video/webm; codecs=vp9";
+    break;
+  default:
+    return NS_ERROR_FAILURE;
+  }
+
+  const VideoDecoderConfig& video = *mDecoderConfig;
+  if (!IsSupportedVideoMimeType(video.mime_type)) {
+    return NS_ERROR_FAILURE;
+  }
+  mMediaDataDecoder = mPlatform->CreateVideoDecoder(video,
+                                                    mReader->GetLayersBackendType(),
+                                                    mReader->GetDecoder()->GetImageContainer(),
+                                                    mTaskQueue,
+                                                    this);
+  if (!mMediaDataDecoder) {
+    return NS_ERROR_FAILURE;
+  }
+  nsresult rv = mMediaDataDecoder->Init();
+  NS_ENSURE_SUCCESS(rv, rv);
+  return NS_OK;
+}
+
+bool
+IntelWebMVideoDecoder::Demux(nsAutoPtr<VP8Sample>& aSample, bool* aEOS)
+{
+  nsAutoRef<NesteggPacketHolder> holder(mReader->NextPacket(WebMReader::VIDEO));
+  if (!holder) {
+    return false;
+  }
+
+  nestegg_packet* packet = holder->mPacket;
+  unsigned int track = 0;
+  int r = nestegg_packet_track(packet, &track);
+  if (r == -1) {
+    return false;
+  }
+
+  unsigned int count = 0;
+  r = nestegg_packet_count(packet, &count);
+  if (r == -1) {
+    return false;
+  }
+
+  uint64_t tstamp = 0;
+  r = nestegg_packet_tstamp(packet, &tstamp);
+  if (r == -1) {
+    return false;
+  }
+
+  // The end time of this frame is the start time of the next frame.  Fetch
+  // the timestamp of the next packet for this track.  If we've reached the
+  // end of the resource, use the file's duration as the end time of this
+  // video frame.
+  uint64_t next_tstamp = 0;
+  nsAutoRef<NesteggPacketHolder> next_holder(mReader->NextPacket(WebMReader::VIDEO));
+  if (next_holder) {
+    r = nestegg_packet_tstamp(next_holder->mPacket, &next_tstamp);
+    if (r == -1) {
+      return false;
+    }
+    mReader->PushVideoPacket(next_holder.disown());
+  } else {
+    next_tstamp = tstamp;
+    next_tstamp += tstamp - mReader->GetLastVideoFrameTime();
+  }
+  mReader->SetLastVideoFrameTime(tstamp);
+
+  int64_t tstamp_usecs = tstamp / NS_PER_USEC;
+  for (uint32_t i = 0; i < count; ++i) {
+    unsigned char* data;
+    size_t length;
+    r = nestegg_packet_data(packet, i, &data, &length);
+    if (r == -1) {
+      return false;
+    }
+
+    vpx_codec_stream_info_t si;
+    memset(&si, 0, sizeof(si));
+    si.sz = sizeof(si);
+    if (mReader->GetVideoCodec() == NESTEGG_CODEC_VP8) {
+      vpx_codec_peek_stream_info(vpx_codec_vp8_dx(), data, length, &si);
+    } else if (mReader->GetVideoCodec() == NESTEGG_CODEC_VP9) {
+      vpx_codec_peek_stream_info(vpx_codec_vp9_dx(), data, length, &si);
+    }
+
+    MOZ_ASSERT(mPlatform && mMediaDataDecoder);
+
+    aSample = new VP8Sample(tstamp_usecs,
+                            (next_tstamp/NS_PER_USEC) - tstamp_usecs,
+                            0,
+                            data,
+                            length,
+                            si.is_kf);
+  }
+
+  return true;
+}
+
+bool
+IntelWebMVideoDecoder::Decode()
+{
+  MOZ_ASSERT(mMediaDataDecoder);
+
+  mMonitor.Lock();
+  uint64_t prevNumFramesOutput = mNumSamplesOutput;
+  while (prevNumFramesOutput == mNumSamplesOutput) {
+    mMonitor.AssertCurrentThreadOwns();
+    if (mError) {
+      // Decode error!
+      mMonitor.Unlock();
+      return false;
+    }
+    while (prevNumFramesOutput == mNumSamplesOutput &&
+           (mInputExhausted ||
+            (mNumSamplesInput - mNumSamplesOutput) < mDecodeAhead) &&
+           !mEOS) {
+      mMonitor.AssertCurrentThreadOwns();
+      mMonitor.Unlock();
+      nsAutoPtr<VP8Sample> compressed(PopSample());
+      if (!compressed) {
+        // EOS, or error. Let the state machine know there are no more
+        // frames coming.
+        LOG("Draining Video");
+        mMonitor.Lock();
+        MOZ_ASSERT(!mEOS);
+        mEOS = true;
+        MOZ_ASSERT(!mDrainComplete);
+        mDrainComplete = false;
+        mMonitor.Unlock();
+        mMediaDataDecoder->Drain();
+      } else {
+#ifdef LOG_SAMPLE_DECODE
+        LOG("PopSample %s time=%lld dur=%lld", TrackTypeToStr(aTrack),
+            compressed->composition_timestamp, compressed->duration);
+#endif
+        mMonitor.Lock();
+        mDrainComplete = false;
+        mInputExhausted = false;
+        mNumSamplesInput++;
+        mMonitor.Unlock();
+        if (NS_FAILED(mMediaDataDecoder->Input(compressed))) {
+          return false;
+        }
+        // If Input() failed, we let the auto pointer delete |compressed|.
+        // Otherwise, we assume the decoder will delete it when it's finished
+        // with it.
+        compressed.forget();
+      }
+      mMonitor.Lock();
+    }
+    mMonitor.AssertCurrentThreadOwns();
+    while (!mError &&
+           prevNumFramesOutput == mNumSamplesOutput &&
+           (!mInputExhausted || mEOS) &&
+           !mDrainComplete) {
+      mMonitor.Wait();
+    }
+    if (mError ||
+        (mEOS && mDrainComplete)) {
+      break;
+    }
+
+  }
+  mMonitor.AssertCurrentThreadOwns();
+  bool rv = !(mEOS || mError);
+  mMonitor.Unlock();
+  return rv;
+}
+
+bool
+IntelWebMVideoDecoder::SkipVideoDemuxToNextKeyFrame(int64_t aTimeThreshold, uint32_t& aParsed)
+{
+  MOZ_ASSERT(mReader->GetDecoder());
+
+  Flush();
+
+  // Loop until we reach the next keyframe after the threshold.
+  while (true) {
+    nsAutoPtr<VP8Sample> compressed(PopSample());
+    if (!compressed) {
+      // EOS, or error. Let the state machine know.
+      return false;
+    }
+    aParsed++;
+    if (!compressed->is_sync_point ||
+        compressed->composition_timestamp < aTimeThreshold) {
+      continue;
+    }
+    mQueuedVideoSample = compressed;
+    break;
+  }
+
+  return true;
+}
+
+bool
+IntelWebMVideoDecoder::DecodeVideoFrame(bool& aKeyframeSkip,
+                                        int64_t aTimeThreshold)
+{
+  uint32_t parsed = 0, decoded = 0;
+  AbstractMediaDecoder::AutoNotifyDecoded autoNotify(mReader->GetDecoder(), parsed, decoded);
+
+  MOZ_ASSERT(mPlatform && mReader->GetDecoder());
+
+  if (aKeyframeSkip) {
+    bool ok = SkipVideoDemuxToNextKeyFrame(aTimeThreshold, parsed);
+    if (!ok) {
+      NS_WARNING("Failed to skip demux up to next keyframe");
+      return false;
+    }
+    aKeyframeSkip = false;
+    nsresult rv = mMediaDataDecoder->Flush();
+    NS_ENSURE_SUCCESS(rv, false);
+  }
+
+  NS_ASSERTION(mReader->GetDecoder()->OnDecodeThread(), "Should be on decode thread.");
+  bool rv = Decode();
+  {
+    // Report the number of "decoded" frames as the difference in the
+    // mNumSamplesOutput field since the last time we were called.
+    MonitorAutoLock mon(mMonitor);
+    uint64_t delta = mNumSamplesOutput - mLastReportedNumDecodedFrames;
+    decoded = static_cast<uint32_t>(delta);
+    mLastReportedNumDecodedFrames = mNumSamplesOutput;
+  }
+  return rv;
+}
+
+VP8Sample*
+IntelWebMVideoDecoder::PopSample()
+{
+  VP8Sample* sample = nullptr;
+  if (mQueuedVideoSample) {
+    return mQueuedVideoSample.forget();
+  }
+  while (mSampleQueue.empty()) {
+    nsAutoPtr<VP8Sample> sample;
+    bool eos = false;
+    bool ok = Demux(sample, &eos);
+    if (!ok || eos) {
+      MOZ_ASSERT(!sample);
+      return nullptr;
+    }
+    MOZ_ASSERT(sample);
+    mSampleQueue.push_back(sample.forget());
+  }
+
+  MOZ_ASSERT(!mSampleQueue.empty());
+  sample = mSampleQueue.front();
+  mSampleQueue.pop_front();
+  return sample;
+}
+
+void
+IntelWebMVideoDecoder::Output(MediaData* aSample)
+{
+#ifdef LOG_SAMPLE_DECODE
+  LOG("Decoded video sample time=%lld dur=%lld",
+      aSample->mTime, aSample->mDuration);
+#endif
+
+  // Don't accept output while we're flushing.
+  MonitorAutoLock mon(mMonitor);
+  if (mIsFlushing) {
+    mon.NotifyAll();
+    return;
+  }
+
+  MOZ_ASSERT(aSample->mType == MediaData::VIDEO_DATA);
+  mReader->VideoQueue().Push(static_cast<VideoData*>(aSample));
+
+  mNumSamplesOutput++;
+  mon.NotifyAll();
+}
+
+void
+IntelWebMVideoDecoder::DrainComplete()
+{
+  MonitorAutoLock mon(mMonitor);
+  mDrainComplete = true;
+  mon.NotifyAll();
+}
+
+void
+IntelWebMVideoDecoder::InputExhausted()
+{
+  MonitorAutoLock mon(mMonitor);
+  mInputExhausted = true;
+  mon.NotifyAll();
+}
+
+void
+IntelWebMVideoDecoder::Error()
+{
+  MonitorAutoLock mon(mMonitor);
+  mError = true;
+  mon.NotifyAll();
+}
+
+nsresult
+IntelWebMVideoDecoder::Flush()
+{
+  if (!mReader->GetDecoder()) {
+    return NS_ERROR_FAILURE;
+  }
+  // Purge the current decoder's state.
+  // Set a flag so that we ignore all output while we call
+  // MediaDataDecoder::Flush().
+  {
+    MonitorAutoLock mon(mMonitor);
+    mIsFlushing = true;
+    mDrainComplete = false;
+    mEOS = false;
+  }
+  mMediaDataDecoder->Flush();
+  {
+    MonitorAutoLock mon(mMonitor);
+    mIsFlushing = false;
+  }
+  return NS_OK;
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/IntelWebMVideoDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/IntelWebMVideoDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/IntelWebMVideoDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/IntelWebMVideoDecoder.h	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#if !defined(IntelWebMVideoDecoder_h_)
+#define IntelWebMVideoDecoder_h_
+
+#include <stdint.h>
+
+#include "WebMReader.h"
+#include "nsAutoPtr.h"
+#include "PlatformDecoderModule.h"
+#include "mozilla/Monitor.h"
+
+#include "mp4_demuxer/mp4_demuxer.h"
+#include "mp4_demuxer/DecoderData.h"
+
+class MediaTaskQueue;
+
+namespace mozilla {
+
+class VP8Sample;
+
+typedef std::deque<VP8Sample*> VP8SampleQueue;
+
+class IntelWebMVideoDecoder : public WebMVideoDecoder, public MediaDataDecoderCallback
+{
+public:
+  static WebMVideoDecoder* Create(WebMReader* aReader);
+  virtual nsresult Init(unsigned int aWidth, unsigned int aHeight) MOZ_OVERRIDE;
+  virtual nsresult Flush() MOZ_OVERRIDE;
+  virtual void Shutdown() MOZ_OVERRIDE;
+
+  virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
+                                int64_t aTimeThreshold) MOZ_OVERRIDE;
+
+  virtual void Output(MediaData* aSample) MOZ_OVERRIDE;
+
+  virtual void DrainComplete() MOZ_OVERRIDE;
+
+  virtual void InputExhausted() MOZ_OVERRIDE;
+  virtual void Error() MOZ_OVERRIDE;
+
+  IntelWebMVideoDecoder(WebMReader* aReader);
+  ~IntelWebMVideoDecoder();
+
+private:
+  void InitLayersBackendType();
+
+  bool Decode();
+
+  bool Demux(nsAutoPtr<VP8Sample>& aSample, bool* aEOS);
+
+  bool SkipVideoDemuxToNextKeyFrame(int64_t aTimeThreshold, uint32_t& parsed);
+
+  bool IsSupportedVideoMimeType(const char* aMimeType);
+
+  VP8Sample* PopSample();
+
+  nsRefPtr<WebMReader> mReader;
+  nsAutoPtr<PlatformDecoderModule> mPlatform;
+  nsRefPtr<MediaDataDecoder> mMediaDataDecoder;
+
+  // TaskQueue on which decoder can choose to decode.
+  // Only non-null up until the decoder is created.
+  nsRefPtr<MediaTaskQueue> mTaskQueue;
+
+  // Monitor that protects all non-threadsafe state; the primitives
+  // that follow.
+  Monitor mMonitor;
+  nsAutoPtr<mp4_demuxer::VideoDecoderConfig> mDecoderConfig;
+
+  VP8SampleQueue mSampleQueue;
+  nsAutoPtr<VP8Sample> mQueuedVideoSample;
+  uint64_t mNumSamplesInput;
+  uint64_t mNumSamplesOutput;
+  uint64_t mLastReportedNumDecodedFrames;
+  uint32_t mDecodeAhead;
+
+  // Whether this stream exists in the media.
+  bool mInputExhausted;
+  bool mDrainComplete;
+  bool mError;
+  bool mEOS;
+  bool mIsFlushing;
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/moz.build	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/moz.build	2014-11-26 21:46:02.000000000 +0000
@@ -5,17 +5,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS += [
+    'IntelWebMVideoDecoder.h',
+    'SoftwareWebMVideoDecoder.h',
     'WebMBufferedParser.h',
     'WebMDecoder.h',
     'WebMReader.h',
 ]
 
 UNIFIED_SOURCES += [
+    'SoftwareWebMVideoDecoder.cpp',
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMReader.cpp',
 ]
 
+if CONFIG['MOZ_FMP4']:
+    UNIFIED_SOURCES += ['IntelWebMVideoDecoder.cpp']
+
 if CONFIG['MOZ_WEBM_ENCODER']:
     EXPORTS += ['WebMWriter.h']
     UNIFIED_SOURCES += ['EbmlComposer.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,236 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "SoftwareWebMVideoDecoder.h"
+#include "AbstractMediaDecoder.h"
+#include "gfx2DGlue.h"
+#include "MediaDecoderStateMachine.h"
+#include "MediaResource.h"
+#include "mozilla/dom/TimeRanges.h"
+#include "nsError.h"
+#include "OggReader.h"
+#include "VorbisUtils.h"
+#include "WebMBufferedParser.h"
+#include "WebMReader.h"
+
+#include <algorithm>
+
+#define VPX_DONT_DEFINE_STDINT_TYPES
+#include "vpx/vp8dx.h"
+#include "vpx/vpx_decoder.h"
+
+static const unsigned NS_PER_USEC = 1000;
+static const unsigned NS_PER_S = 1e9;
+
+namespace mozilla {
+
+using namespace gfx;
+using namespace layers;
+
+SoftwareWebMVideoDecoder::SoftwareWebMVideoDecoder(WebMReader* aReader)
+  : WebMVideoDecoder(),
+    mReader(aReader)
+{
+  MOZ_COUNT_CTOR(SoftwareWebMVideoDecoder);
+  memset(&mVPX, 0, sizeof(vpx_codec_ctx_t));
+}
+
+SoftwareWebMVideoDecoder::~SoftwareWebMVideoDecoder()
+{
+  MOZ_COUNT_DTOR(SoftwareWebMVideoDecoder);
+}
+
+void
+SoftwareWebMVideoDecoder::Shutdown()
+{
+  vpx_codec_destroy(&mVPX);
+  mReader = nullptr;
+}
+
+/* static */
+WebMVideoDecoder*
+SoftwareWebMVideoDecoder::Create(WebMReader* aReader)
+{
+  return new SoftwareWebMVideoDecoder(aReader);
+}
+
+nsresult
+SoftwareWebMVideoDecoder::Init(unsigned int aWidth, unsigned int aHeight)
+{
+  vpx_codec_iface_t* dx = nullptr;
+  switch(mReader->GetVideoCodec()) {
+    case NESTEGG_CODEC_VP8:
+      dx = vpx_codec_vp8_dx();
+      break;
+    case NESTEGG_CODEC_VP9:
+      dx = vpx_codec_vp9_dx();
+      break;
+  }
+  if (!dx || vpx_codec_dec_init(&mVPX, dx, nullptr, 0)) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+bool
+SoftwareWebMVideoDecoder::DecodeVideoFrame(bool &aKeyframeSkip,
+                                           int64_t aTimeThreshold)
+{
+  NS_ASSERTION(mReader->GetDecoder()->OnDecodeThread(),
+               "Should be on decode thread.");
+
+  // Record number of frames decoded and parsed. Automatically update the
+  // stats counters using the AutoNotifyDecoded stack-based class.
+  uint32_t parsed = 0, decoded = 0;
+  AbstractMediaDecoder::AutoNotifyDecoded autoNotify(mReader->GetDecoder(),
+                                                     parsed, decoded);
+
+  nsAutoRef<NesteggPacketHolder> holder(mReader->NextPacket(WebMReader::VIDEO));
+  if (!holder) {
+    return false;
+  }
+
+  nestegg_packet* packet = holder->mPacket;
+  unsigned int track = 0;
+  int r = nestegg_packet_track(packet, &track);
+  if (r == -1) {
+    return false;
+  }
+
+  unsigned int count = 0;
+  r = nestegg_packet_count(packet, &count);
+  if (r == -1) {
+    return false;
+  }
+
+  uint64_t tstamp = 0;
+  r = nestegg_packet_tstamp(packet, &tstamp);
+  if (r == -1) {
+    return false;
+  }
+
+  // The end time of this frame is the start time of the next frame.  Fetch
+  // the timestamp of the next packet for this track.  If we've reached the
+  // end of the resource, use the file's duration as the end time of this
+  // video frame.
+  uint64_t next_tstamp = 0;
+  nsAutoRef<NesteggPacketHolder> next_holder(mReader->NextPacket(WebMReader::VIDEO));
+  if (next_holder) {
+    r = nestegg_packet_tstamp(next_holder->mPacket, &next_tstamp);
+    if (r == -1) {
+      return false;
+    }
+    mReader->PushVideoPacket(next_holder.disown());
+  } else {
+    next_tstamp = tstamp;
+    next_tstamp += tstamp - mReader->GetLastVideoFrameTime();
+  }
+  mReader->SetLastVideoFrameTime(tstamp);
+
+  int64_t tstamp_usecs = tstamp / NS_PER_USEC;
+  for (uint32_t i = 0; i < count; ++i) {
+    unsigned char* data;
+    size_t length;
+    r = nestegg_packet_data(packet, i, &data, &length);
+    if (r == -1) {
+      return false;
+    }
+
+    vpx_codec_stream_info_t si;
+    memset(&si, 0, sizeof(si));
+    si.sz = sizeof(si);
+    if (mReader->GetVideoCodec() == NESTEGG_CODEC_VP8) {
+      vpx_codec_peek_stream_info(vpx_codec_vp8_dx(), data, length, &si);
+    } else if (mReader->GetVideoCodec() == NESTEGG_CODEC_VP9) {
+      vpx_codec_peek_stream_info(vpx_codec_vp9_dx(), data, length, &si);
+    }
+    if (aKeyframeSkip && (!si.is_kf || tstamp_usecs < aTimeThreshold)) {
+      // Skipping to next keyframe...
+      parsed++; // Assume 1 frame per chunk.
+      continue;
+    }
+
+    if (aKeyframeSkip && si.is_kf) {
+      aKeyframeSkip = false;
+    }
+
+    if (vpx_codec_decode(&mVPX, data, length, nullptr, 0)) {
+      return false;
+    }
+
+    // If the timestamp of the video frame is less than
+    // the time threshold required then it is not added
+    // to the video queue and won't be displayed.
+    if (tstamp_usecs < aTimeThreshold) {
+      parsed++; // Assume 1 frame per chunk.
+      continue;
+    }
+
+    vpx_codec_iter_t  iter = nullptr;
+    vpx_image_t      *img;
+
+    while ((img = vpx_codec_get_frame(&mVPX, &iter))) {
+      NS_ASSERTION(img->fmt == VPX_IMG_FMT_I420, "WebM image format not I420");
+
+      // Chroma shifts are rounded down as per the decoding examples in the SDK
+      VideoData::YCbCrBuffer b;
+      b.mPlanes[0].mData = img->planes[0];
+      b.mPlanes[0].mStride = img->stride[0];
+      b.mPlanes[0].mHeight = img->d_h;
+      b.mPlanes[0].mWidth = img->d_w;
+      b.mPlanes[0].mOffset = b.mPlanes[0].mSkip = 0;
+
+      b.mPlanes[1].mData = img->planes[1];
+      b.mPlanes[1].mStride = img->stride[1];
+      b.mPlanes[1].mHeight = (img->d_h + 1) >> img->y_chroma_shift;
+      b.mPlanes[1].mWidth = (img->d_w + 1) >> img->x_chroma_shift;
+      b.mPlanes[1].mOffset = b.mPlanes[1].mSkip = 0;
+
+      b.mPlanes[2].mData = img->planes[2];
+      b.mPlanes[2].mStride = img->stride[2];
+      b.mPlanes[2].mHeight = (img->d_h + 1) >> img->y_chroma_shift;
+      b.mPlanes[2].mWidth = (img->d_w + 1) >> img->x_chroma_shift;
+      b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
+
+      nsIntRect pictureRect = mReader->GetPicture();
+      IntRect picture = ToIntRect(pictureRect);
+      nsIntSize initFrame = mReader->GetInitialFrame();
+      if (img->d_w != static_cast<uint32_t>(initFrame.width) ||
+          img->d_h != static_cast<uint32_t>(initFrame.height)) {
+        // Frame size is different from what the container reports. This is
+        // legal in WebM, and we will preserve the ratio of the crop rectangle
+        // as it was reported relative to the picture size reported by the
+        // container.
+        picture.x = (pictureRect.x * img->d_w) / initFrame.width;
+        picture.y = (pictureRect.y * img->d_h) / initFrame.height;
+        picture.width = (img->d_w * pictureRect.width) / initFrame.width;
+        picture.height = (img->d_h * pictureRect.height) / initFrame.height;
+      }
+
+      VideoInfo videoInfo = mReader->GetMediaInfo().mVideo;
+      nsRefPtr<VideoData> v = VideoData::Create(videoInfo,
+                                                mReader->GetDecoder()->GetImageContainer(),
+                                                holder->mOffset,
+                                                tstamp_usecs,
+                                                (next_tstamp / NS_PER_USEC) - tstamp_usecs,
+                                                b,
+                                                si.is_kf,
+                                                -1,
+                                                picture);
+      if (!v) {
+        return false;
+      }
+      parsed++;
+      decoded++;
+      NS_ASSERTION(decoded <= parsed,
+        "Expect only 1 frame per chunk per packet in WebM...");
+      mReader->VideoQueue().Push(v);
+    }
+  }
+
+  return true;
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/SoftwareWebMVideoDecoder.h	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#if !defined(SoftwareWebMVideoDecoder_h_)
+#define SoftwareWebMVideoDecoder_h_
+
+#include <stdint.h>
+
+#include "WebMReader.h"
+
+namespace mozilla {
+
+class SoftwareWebMVideoDecoder : public WebMVideoDecoder
+{
+public:
+  static WebMVideoDecoder* Create(WebMReader* aReader);
+
+  virtual nsresult Init(unsigned int aWidth, unsigned int aHeight) MOZ_OVERRIDE;
+
+  virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
+                                int64_t aTimeThreshold) MOZ_OVERRIDE;
+
+  virtual void Shutdown() MOZ_OVERRIDE;
+
+  SoftwareWebMVideoDecoder(WebMReader* aReader);
+  ~SoftwareWebMVideoDecoder();
+
+private:
+  nsRefPtr<WebMReader> mReader;
+
+  // VPx decoder state
+  vpx_codec_ctx_t mVPX;
+};
+
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/WebMReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/WebMReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/WebMReader.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/WebMReader.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -7,11 +7,15 @@
 #include "MediaDecoderStateMachine.h"
 #include "AbstractMediaDecoder.h"
 #include "MediaResource.h"
+#include "SoftwareWebMVideoDecoder.h"
 #include "WebMReader.h"
 #include "WebMBufferedParser.h"
 #include "mozilla/dom/TimeRanges.h"
 #include "VorbisUtils.h"
 #include "gfx2DGlue.h"
+#include "Layers.h"
+#include "mozilla/Preferences.h"
+#include "SharedThreadPool.h"
 
 #include <algorithm>
 
@@ -21,19 +25,17 @@
 
 #include "OggReader.h"
 
-using mozilla::NesteggPacketHolder;
-
-template <>
-class nsAutoRefTraits<NesteggPacketHolder> :
-  public nsPointerRefTraits<NesteggPacketHolder>
-{
-public:
-  static void Release(NesteggPacketHolder* aHolder) { delete aHolder; }
-};
+// IntelWebMVideoDecoder uses the WMF backend, which is Windows Vista+ only.
+#if defined(MOZ_FMP4) && defined(MOZ_WMF)
+#include "IntelWebMVideoDecoder.h"
+#define MOZ_PDM_VPX 1
+#endif
 
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
+#undef LOG
+
 #ifdef PR_LOGGING
 #include "prprf.h"
 #define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg)
@@ -55,9 +57,6 @@
 extern PRLogModuleInfo* gMediaDecoderLog;
 PRLogModuleInfo* gNesteggLog;
 
-static const unsigned NS_PER_USEC = 1000;
-static const double NS_PER_S = 1e9;
-
 // Functions for reading and seeking using MediaResource required for
 // nestegg_io. The 'user data' passed to these functions is the
 // decoder from which the media resource is obtained.
@@ -148,9 +147,9 @@
 #endif
 }
 
-ogg_packet
-InitOggPacket(const unsigned char* aData, size_t aLength, bool aBOS, bool aEOS,
-              int64_t aGranulepos, int64_t aPacketNo)
+ogg_packet InitOggPacket(const unsigned char* aData, size_t aLength,
+                         bool aBOS, bool aEOS,
+                         int64_t aGranulepos, int64_t aPacketNo)
 {
   ogg_packet packet;
   packet.packet = const_cast<unsigned char*>(aData);
@@ -162,6 +161,10 @@
   return packet;
 }
 
+#if defined(MOZ_PDM_VPX)
+static bool sIsIntelDecoderEnabled = false;
+#endif
+
 WebMReader::WebMReader(AbstractMediaDecoder* aDecoder)
   : MediaDecoderReader(aDecoder)
   , mContext(nullptr)
@@ -178,6 +181,7 @@
   , mLastVideoFrameTime(0)
   , mAudioCodec(-1)
   , mVideoCodec(-1)
+  , mLayersBackendType(layers::LayersBackend::LAYERS_NONE)
   , mHasVideo(false)
   , mHasAudio(false)
 #ifdef MOZ_OPUS
@@ -192,43 +196,66 @@
 #endif
   // Zero these member vars to avoid crashes in VP8 destroy and Vorbis clear
   // functions when destructor is called before |Init|.
-  memset(&mVPX, 0, sizeof(vpx_codec_ctx_t));
   memset(&mVorbisBlock, 0, sizeof(vorbis_block));
   memset(&mVorbisDsp, 0, sizeof(vorbis_dsp_state));
   memset(&mVorbisInfo, 0, sizeof(vorbis_info));
   memset(&mVorbisComment, 0, sizeof(vorbis_comment));
+
+#if defined(MOZ_PDM_VPX)
+  sIsIntelDecoderEnabled = Preferences::GetBool("media.webm.intel_decoder.enabled", false);
+#endif
 }
 
 WebMReader::~WebMReader()
 {
   Cleanup();
-
   mVideoPackets.Reset();
   mAudioPackets.Reset();
-
-  vpx_codec_destroy(&mVPX);
-
   vorbis_block_clear(&mVorbisBlock);
   vorbis_dsp_clear(&mVorbisDsp);
   vorbis_info_clear(&mVorbisInfo);
   vorbis_comment_clear(&mVorbisComment);
-
   if (mOpusDecoder) {
     opus_multistream_decoder_destroy(mOpusDecoder);
     mOpusDecoder = nullptr;
   }
-
+  MOZ_ASSERT(!mVideoDecoder);
   MOZ_COUNT_DTOR(WebMReader);
 }
 
-nsresult WebMReader::Init(MediaDecoderReader* aCloneDonor)
+void WebMReader::Shutdown()
 {
+#if defined(MOZ_PDM_VPX)
+  if (mTaskQueue) {
+    mTaskQueue->Shutdown();
+  }
+#endif
 
+  if (mVideoDecoder) {
+    mVideoDecoder->Shutdown();
+    mVideoDecoder = nullptr;
+  }
+}
+
+nsresult WebMReader::Init(MediaDecoderReader* aCloneDonor)
+{
   vorbis_info_init(&mVorbisInfo);
   vorbis_comment_init(&mVorbisComment);
   memset(&mVorbisDsp, 0, sizeof(vorbis_dsp_state));
   memset(&mVorbisBlock, 0, sizeof(vorbis_block));
 
+#if defined(MOZ_PDM_VPX)
+  if (sIsIntelDecoderEnabled) {
+    PlatformDecoderModule::Init();
+
+    InitLayersBackendType();
+
+    mTaskQueue = new MediaTaskQueue(
+      SharedThreadPool::Get(NS_LITERAL_CSTRING("IntelVP8 Video Decode")));
+    NS_ENSURE_TRUE(mTaskQueue, NS_ERROR_FAILURE);
+  }
+#endif
+
   if (aCloneDonor) {
     mBufferedState = static_cast<WebMReader*>(aCloneDonor)->mBufferedState;
   } else {
@@ -238,6 +265,31 @@
   return NS_OK;
 }
 
+void WebMReader::InitLayersBackendType()
+{
+  if (!IsVideoContentType(GetDecoder()->GetResource()->GetContentType())) {
+    // Not playing video, we don't care about the layers backend type.
+    return;
+  }
+  // Extract the layer manager backend type so that platform decoders
+  // can determine whether it's worthwhile using hardware accelerated
+  // video decoding.
+  MediaDecoderOwner* owner = mDecoder->GetOwner();
+  if (!owner) {
+    NS_WARNING("WebMReader without a decoder owner, can't get HWAccel");
+    return;
+  }
+
+  dom::HTMLMediaElement* element = owner->GetMediaElement();
+  NS_ENSURE_TRUE_VOID(element);
+
+  nsRefPtr<LayerManager> layerManager =
+    nsContentUtils::LayerManagerForDocument(element->OwnerDoc());
+  NS_ENSURE_TRUE_VOID(layerManager);
+
+  mLayersBackendType = layerManager->GetCompositorBackendType();
+}
+
 nsresult WebMReader::ResetDecode()
 {
   mAudioFrames = 0;
@@ -315,7 +367,8 @@
       return NS_ERROR_FAILURE;
     }
     int type = nestegg_track_type(mContext, track);
-    if (!mHasVideo && type == NESTEGG_TRACK_VIDEO) {
+    if (!mHasVideo && type == NESTEGG_TRACK_VIDEO &&
+        mDecoder->GetImageContainer()) {
       nestegg_video_params params;
       r = nestegg_track_video_params(mContext, track, &params);
       if (r == -1) {
@@ -323,14 +376,28 @@
         return NS_ERROR_FAILURE;
       }
 
-      vpx_codec_iface_t* dx = nullptr;
       mVideoCodec = nestegg_track_codec_id(mContext, track);
-      if (mVideoCodec == NESTEGG_CODEC_VP8) {
-        dx = vpx_codec_vp8_dx();
-      } else if (mVideoCodec == NESTEGG_CODEC_VP9) {
-        dx = vpx_codec_vp9_dx();
+
+#if defined(MOZ_PDM_VPX)
+      if (sIsIntelDecoderEnabled) {
+        mVideoDecoder = IntelWebMVideoDecoder::Create(this);
+        if (mVideoDecoder &&
+            NS_FAILED(mVideoDecoder->Init(params.display_width, params.display_height))) {
+          mVideoDecoder = nullptr;
+        }
+      }
+#endif
+
+      // If there's no decoder yet (e.g. HW decoder not available), use the software decoder.
+      if (!mVideoDecoder) {
+        mVideoDecoder = SoftwareWebMVideoDecoder::Create(this);
+        if (mVideoDecoder &&
+            NS_FAILED(mVideoDecoder->Init(params.display_width, params.display_height))) {
+          mVideoDecoder = nullptr;
+        }
       }
-      if (!dx || vpx_codec_dec_init(&mVPX, dx, nullptr, 0)) {
+
+      if (!mVideoDecoder) {
         Cleanup();
         return NS_ERROR_FAILURE;
       }
@@ -348,8 +415,7 @@
       if (pictureRect.width <= 0 ||
           pictureRect.height <= 0 ||
           pictureRect.x < 0 ||
-          pictureRect.y < 0)
-      {
+          pictureRect.y < 0) {
         pictureRect.x = 0;
         pictureRect.y = 0;
         pictureRect.width = params.width;
@@ -390,8 +456,7 @@
         mInfo.mVideo.mStereoMode = StereoMode::RIGHT_LEFT;
         break;
       }
-    }
-    else if (!mHasAudio && type == NESTEGG_TRACK_AUDIO) {
+    } else if (!mHasAudio && type == NESTEGG_TRACK_AUDIO) {
       nestegg_audio_params params;
       r = nestegg_track_audio_params(mContext, track, &params);
       if (r == -1) {
@@ -888,161 +953,12 @@
   return DecodeAudioPacket(holder->mPacket, holder->mOffset);
 }
 
-bool WebMReader::DecodeVideoFrame(bool &aKeyframeSkip,
-                                      int64_t aTimeThreshold)
+bool WebMReader::DecodeVideoFrame(bool &aKeyframeSkip, int64_t aTimeThreshold)
 {
-  NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
-  // Record number of frames decoded and parsed. Automatically update the
-  // stats counters using the AutoNotifyDecoded stack-based class.
-  uint32_t parsed = 0, decoded = 0;
-  AbstractMediaDecoder::AutoNotifyDecoded autoNotify(mDecoder, parsed, decoded);
-
-  nsAutoRef<NesteggPacketHolder> holder(NextPacket(VIDEO));
-  if (!holder) {
-    return false;
-  }
-
-  nestegg_packet* packet = holder->mPacket;
-  unsigned int track = 0;
-  int r = nestegg_packet_track(packet, &track);
-  if (r == -1) {
-    return false;
-  }
-
-  unsigned int count = 0;
-  r = nestegg_packet_count(packet, &count);
-  if (r == -1) {
-    return false;
-  }
-
-  uint64_t tstamp = 0;
-  r = nestegg_packet_tstamp(packet, &tstamp);
-  if (r == -1) {
-    return false;
-  }
-
-  // The end time of this frame is the start time of the next frame.  Fetch
-  // the timestamp of the next packet for this track.  If we've reached the
-  // end of the resource, use the file's duration as the end time of this
-  // video frame.
-  uint64_t next_tstamp = 0;
-  nsAutoRef<NesteggPacketHolder> next_holder(NextPacket(VIDEO));
-  if (next_holder) {
-    r = nestegg_packet_tstamp(next_holder->mPacket, &next_tstamp);
-    if (r == -1) {
-      return false;
-    }
-    PushVideoPacket(next_holder.disown());
-  } else {
-    next_tstamp = tstamp;
-    next_tstamp += tstamp - mLastVideoFrameTime;
-  }
-  mLastVideoFrameTime = tstamp;
-
-  int64_t tstamp_usecs = tstamp / NS_PER_USEC;
-  for (uint32_t i = 0; i < count; ++i) {
-    unsigned char* data;
-    size_t length;
-    r = nestegg_packet_data(packet, i, &data, &length);
-    if (r == -1) {
-      return false;
-    }
-
-    vpx_codec_stream_info_t si;
-    memset(&si, 0, sizeof(si));
-    si.sz = sizeof(si);
-    if (mVideoCodec == NESTEGG_CODEC_VP8) {
-      vpx_codec_peek_stream_info(vpx_codec_vp8_dx(), data, length, &si);
-    } else if (mVideoCodec == NESTEGG_CODEC_VP9) {
-      vpx_codec_peek_stream_info(vpx_codec_vp9_dx(), data, length, &si);
-    }
-    if (aKeyframeSkip && (!si.is_kf || tstamp_usecs < aTimeThreshold)) {
-      // Skipping to next keyframe...
-      parsed++; // Assume 1 frame per chunk.
-      continue;
-    }
-
-    if (aKeyframeSkip && si.is_kf) {
-      aKeyframeSkip = false;
-    }
-
-    if (vpx_codec_decode(&mVPX, data, length, nullptr, 0)) {
-      return false;
-    }
-
-    // If the timestamp of the video frame is less than
-    // the time threshold required then it is not added
-    // to the video queue and won't be displayed.
-    if (tstamp_usecs < aTimeThreshold) {
-      parsed++; // Assume 1 frame per chunk.
-      continue;
-    }
-
-    vpx_codec_iter_t  iter = nullptr;
-    vpx_image_t      *img;
-
-    while ((img = vpx_codec_get_frame(&mVPX, &iter))) {
-      NS_ASSERTION(img->fmt == VPX_IMG_FMT_I420, "WebM image format not I420");
-
-      // Chroma shifts are rounded down as per the decoding examples in the SDK
-      VideoData::YCbCrBuffer b;
-      b.mPlanes[0].mData = img->planes[0];
-      b.mPlanes[0].mStride = img->stride[0];
-      b.mPlanes[0].mHeight = img->d_h;
-      b.mPlanes[0].mWidth = img->d_w;
-      b.mPlanes[0].mOffset = b.mPlanes[0].mSkip = 0;
-
-      b.mPlanes[1].mData = img->planes[1];
-      b.mPlanes[1].mStride = img->stride[1];
-      b.mPlanes[1].mHeight = (img->d_h + 1) >> img->y_chroma_shift;
-      b.mPlanes[1].mWidth = (img->d_w + 1) >> img->x_chroma_shift;
-      b.mPlanes[1].mOffset = b.mPlanes[1].mSkip = 0;
-
-      b.mPlanes[2].mData = img->planes[2];
-      b.mPlanes[2].mStride = img->stride[2];
-      b.mPlanes[2].mHeight = (img->d_h + 1) >> img->y_chroma_shift;
-      b.mPlanes[2].mWidth = (img->d_w + 1) >> img->x_chroma_shift;
-      b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
-
-      IntRect picture = ToIntRect(mPicture);
-      if (img->d_w != static_cast<uint32_t>(mInitialFrame.width) ||
-          img->d_h != static_cast<uint32_t>(mInitialFrame.height)) {
-        // Frame size is different from what the container reports. This is
-        // legal in WebM, and we will preserve the ratio of the crop rectangle
-        // as it was reported relative to the picture size reported by the
-        // container.
-        picture.x = (mPicture.x * img->d_w) / mInitialFrame.width;
-        picture.y = (mPicture.y * img->d_h) / mInitialFrame.height;
-        picture.width = (img->d_w * mPicture.width) / mInitialFrame.width;
-        picture.height = (img->d_h * mPicture.height) / mInitialFrame.height;
-      }
-
-      VideoData *v = VideoData::Create(mInfo.mVideo,
-                                       mDecoder->GetImageContainer(),
-                                       holder->mOffset,
-                                       tstamp_usecs,
-                                       (next_tstamp / NS_PER_USEC)-tstamp_usecs,
-                                       b,
-                                       si.is_kf,
-                                       -1,
-                                       picture);
-      if (!v) {
-        return false;
-      }
-      parsed++;
-      decoded++;
-      NS_ASSERTION(decoded <= parsed,
-        "Expect only 1 frame per chunk per packet in WebM...");
-      VideoQueue().Push(v);
-    }
-  }
-
-  return true;
+  return mVideoDecoder->DecodeVideoFrame(aKeyframeSkip, aTimeThreshold);
 }
 
-void
-WebMReader::PushVideoPacket(NesteggPacketHolder* aItem)
+void WebMReader::PushVideoPacket(NesteggPacketHolder* aItem)
 {
     mVideoPackets.PushFront(aItem);
 }
@@ -1057,6 +973,10 @@
 nsresult WebMReader::SeekInternal(int64_t aTarget, int64_t aStartTime)
 {
   NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
+  if (mVideoDecoder) {
+    nsresult rv = mVideoDecoder->Flush();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   LOG(PR_LOG_DEBUG, ("Reader [%p] for Decoder [%p]: About to seek to %fs",
                      this, mDecoder, double(aTarget) / USECS_PER_S));
@@ -1163,4 +1083,29 @@
   return offset;
 }
 
+int WebMReader::GetVideoCodec()
+{
+  return mVideoCodec;
+}
+
+nsIntRect WebMReader::GetPicture()
+{
+  return mPicture;
+}
+
+nsIntSize WebMReader::GetInitialFrame()
+{
+  return mInitialFrame;
+}
+
+uint64_t WebMReader::GetLastVideoFrameTime()
+{
+  return mLastVideoFrameTime;
+}
+
+void WebMReader::SetLastVideoFrameTime(uint64_t aFrameTime)
+{
+  mLastVideoFrameTime = aFrameTime;
+}
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/WebMReader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/WebMReader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webm/WebMReader.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webm/WebMReader.h	2014-11-26 21:46:02.000000000 +0000
@@ -16,6 +16,8 @@
 #define VPX_DONT_DEFINE_STDINT_TYPES
 #include "vpx/vpx_codec.h"
 
+#include "mozilla/layers/LayersTypes.h"
+
 #ifdef MOZ_TREMOR
 #include "tremor/ivorbiscodec.h"
 #else
@@ -26,10 +28,6 @@
 #include "OpusParser.h"
 #endif
 
-namespace mozilla {
-
-class WebMBufferedState;
-
 // Holds a nestegg_packet, and its file offset. This is needed so we
 // know the offset in the file we've played up to, in order to calculate
 // whether it's likely we can play through to the end without needing
@@ -55,6 +53,18 @@
   NesteggPacketHolder& operator= (NesteggPacketHolder const& aOther);
 };
 
+template <>
+class nsAutoRefTraits<NesteggPacketHolder> : public nsPointerRefTraits<NesteggPacketHolder>
+{
+public:
+  static void Release(NesteggPacketHolder* aHolder) { delete aHolder; }
+};
+
+namespace mozilla {
+class WebMBufferedState;
+static const unsigned NS_PER_USEC = 1000;
+static const double NS_PER_S = 1e9;
+
 // Thread and type safe wrapper around nsDeque.
 class PacketQueueDeallocator : public nsDequeFunctor {
   virtual void* operator() (void* aObject) {
@@ -101,6 +111,21 @@
   }
 };
 
+class WebMReader;
+
+// Class to handle various video decode paths
+class WebMVideoDecoder
+{
+public:
+  virtual nsresult Init(unsigned int aWidth = 0, unsigned int aHeight = 0) = 0;
+  virtual nsresult Flush() { return NS_OK; }
+  virtual void Shutdown() = 0;
+  virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
+                                int64_t aTimeThreshold) = 0;
+  WebMVideoDecoder() {}
+  virtual ~WebMVideoDecoder() {}
+};
+
 class WebMReader : public MediaDecoderReader
 {
 public:
@@ -110,15 +135,13 @@
   ~WebMReader();
 
 public:
+  virtual void Shutdown() MOZ_OVERRIDE;
   virtual nsresult Init(MediaDecoderReader* aCloneDonor);
   virtual nsresult ResetDecode();
   virtual bool DecodeAudioData();
 
-  // If the Theora granulepos has not been captured, it may read several packets
-  // until one with a granulepos has been captured, to ensure that all packets
-  // read have valid time info.
   virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
-                                  int64_t aTimeThreshold);
+                                int64_t aTimeThreshold);
 
   virtual bool HasAudio()
   {
@@ -143,7 +166,6 @@
 
   virtual bool IsMediaSeekable() MOZ_OVERRIDE;
 
-protected:
   // Value passed to NextPacket to determine if we are reading a video or an
   // audio packet.
   enum TrackType {
@@ -159,6 +181,15 @@
   // Pushes a packet to the front of the video packet queue.
   virtual void PushVideoPacket(NesteggPacketHolder* aItem);
 
+  int GetVideoCodec();
+  nsIntRect GetPicture();
+  nsIntSize GetInitialFrame();
+  uint64_t GetLastVideoFrameTime();
+  void SetLastVideoFrameTime(uint64_t aFrameTime);
+  layers::LayersBackend GetLayersBackendType() { return mLayersBackendType; }
+  MediaTaskQueue* GetTaskQueue() { return mTaskQueue; }
+
+protected:
 #ifdef MOZ_OPUS
   // Setup opus decoder
   bool InitOpusDecoder();
@@ -186,13 +217,16 @@
 
   virtual nsresult SeekInternal(int64_t aTime, int64_t aStartTime);
 
+  // Initializes mLayersBackendType if possible.
+  void InitLayersBackendType();
+
 private:
   // libnestegg context for webm container. Access on state machine thread
   // or decoder thread only.
   nestegg* mContext;
 
-  // VP8 decoder state
-  vpx_codec_ctx_t mVPX;
+  // The video decoder
+  nsAutoPtr<WebMVideoDecoder> mVideoDecoder;
 
   // Vorbis decoder state
   vorbis_info mVorbisInfo;
@@ -247,6 +281,9 @@
   // Codec ID of video track
   int mVideoCodec;
 
+  layers::LayersBackend mLayersBackendType;
+  nsRefPtr<MediaTaskQueue> mTaskQueue;
+
   // Booleans to indicate if we have audio and/or video data
   bool mHasVideo;
   bool mHasAudio;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -52,7 +52,7 @@
 bool MediaEngineCameraVideoSource::AppendToTrack(SourceMediaStream* aSource,
                                                  layers::Image* aImage,
                                                  TrackID aID,
-                                                 TrackTicks delta)
+                                                 StreamTime delta)
 {
   MOZ_ASSERT(aSource);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h	2014-11-26 21:46:02.000000000 +0000
@@ -65,7 +65,7 @@
   virtual bool AppendToTrack(SourceMediaStream* aSource,
                              layers::Image* aImage,
                              TrackID aID,
-                             TrackTicks delta);
+                             StreamTime delta);
 
   static bool IsWithin(int32_t n, const dom::ConstrainLongRange& aRange);
   static bool IsWithin(double n, const dom::ConstrainDoubleRange& aRange);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineDefault.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineDefault.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineDefault.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineDefault.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -26,7 +26,6 @@
 #include "YuvStamper.h"
 #endif
 
-#define VIDEO_RATE USECS_PER_S
 #define AUDIO_RATE 16000
 #define AUDIO_FRAME_LENGTH ((AUDIO_RATE * MediaEngine::DEFAULT_AUDIO_TIMER_MS) / 1000)
 namespace mozilla {
@@ -134,7 +133,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  aStream->AddTrack(aID, VIDEO_RATE, 0, new VideoSegment());
+  aStream->AddTrack(aID, 0, new VideoSegment());
   aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   // Remember TrackID so we can end it later
@@ -230,7 +229,7 @@
                                           SourceMediaStream *aSource,
                                           TrackID aID,
                                           StreamTime aDesiredTime,
-                                          TrackTicks &aLastEndTime)
+                                          StreamTime &aLastEndTime)
 {
   // AddTrack takes ownership of segment
   VideoSegment segment;
@@ -241,8 +240,7 @@
 
   // Note: we're not giving up mImage here
   nsRefPtr<layers::Image> image = mImage;
-  TrackTicks target = aSource->TimeToTicksRoundUp(USECS_PER_S, aDesiredTime);
-  TrackTicks delta = target - aLastEndTime;
+  StreamTime delta = aDesiredTime - aLastEndTime;
 
   if (delta > 0) {
     // nullptr images are allowed
@@ -251,7 +249,7 @@
     // This can fail if either a) we haven't added the track yet, or b)
     // we've removed or finished the track.
     if (aSource->AppendToTrack(aID, &segment)) {
-      aLastEndTime = target;
+      aLastEndTime = aDesiredTime;
     }
   }
 }
@@ -371,7 +369,7 @@
 
   // AddTrack will take ownership of segment
   AudioSegment* segment = new AudioSegment();
-  mSource->AddTrack(aID, AUDIO_RATE, 0, segment);
+  mSource->AddAudioTrack(aID, AUDIO_RATE, 0, segment);
 
   // We aren't going to add any more tracks
   mSource->AdvanceKnownTracksTime(STREAM_TIME_MAX);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineDefault.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineDefault.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineDefault.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineDefault.h	2014-11-26 21:46:02.000000000 +0000
@@ -54,7 +54,7 @@
                           SourceMediaStream *aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks &aLastEndTime);
+                          StreamTime &aLastEndTime);
   virtual bool SatisfiesConstraintSets(
       const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets)
   {
@@ -123,7 +123,7 @@
                           SourceMediaStream *aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks &aLastEndTime) {}
+                          StreamTime &aLastEndTime) {}
 
   virtual bool IsFake() {
     return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -42,7 +42,7 @@
                                        SourceMediaStream* aSource,
                                        TrackID aID,
                                        StreamTime aDesiredTime,
-                                       TrackTicks& aLastEndTime)
+                                       StreamTime& aLastEndTime)
 {
   VideoSegment segment;
 
@@ -53,10 +53,9 @@
 
   // Note: we're not giving up mImage here
   nsRefPtr<layers::Image> image = mImage;
-  TrackTicks target = aSource->TimeToTicksRoundUp(USECS_PER_S, aDesiredTime);
-  TrackTicks delta = target - aLastEndTime;
-  LOGFRAME(("NotifyPull, desired = %ld, target = %ld, delta = %ld %s", (int64_t) aDesiredTime,
-            (int64_t) target, (int64_t) delta, image ? "" : "<null>"));
+  StreamTime delta = aDesiredTime - aLastEndTime;
+  LOGFRAME(("NotifyPull, desired = %ld, delta = %ld %s", (int64_t) aDesiredTime,
+            (int64_t) delta, image ? "" : "<null>"));
 
   // Bug 846188 We may want to limit incoming frames to the requested frame rate
   // mFps - if you want 30FPS, and the camera gives you 60FPS, this could
@@ -75,7 +74,7 @@
     // This can fail if either a) we haven't added the track yet, or b)
     // we've removed or finished the track.
     if (aSource->AppendToTrack(aID, &(segment))) {
-      aLastEndTime = target;
+      aLastEndTime = aDesiredTime;
     }
   }
 }
@@ -146,7 +145,7 @@
 
   mSources.AppendElement(aStream);
 
-  aStream->AddTrack(aID, USECS_PER_S, 0, new VideoSegment());
+  aStream->AddTrack(aID, 0, new VideoSegment());
   aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   ReentrantMonitorAutoEnter sync(mCallbackMonitor);
@@ -342,7 +341,8 @@
 }
 
 void
-MediaEngineGonkVideoSource::OnHardwareStateChange(HardwareState aState)
+MediaEngineGonkVideoSource::OnHardwareStateChange(HardwareState aState,
+                                                  nsresult aReason)
 {
   ReentrantMonitorAutoEnter sync(mCallbackMonitor);
   if (aState == CameraControlListener::kHardwareClosed) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h	2014-11-26 21:46:02.000000000 +0000
@@ -45,8 +45,8 @@
 
   MediaEngineGonkVideoSource(int aIndex)
     : MediaEngineCameraVideoSource(aIndex, "GonkCamera.Monitor")
-    , mCameraControl(nullptr)
     , mCallbackMonitor("GonkCamera.CallbackMonitor")
+    , mCameraControl(nullptr)
     , mRotation(0)
     , mBackCamera(false)
     , mOrientationChanged(true) // Correct the orientation at first time takePhoto.
@@ -63,18 +63,18 @@
                           SourceMediaStream* aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks& aLastEndTime) MOZ_OVERRIDE;
+                          StreamTime &aLastEndTime) MOZ_OVERRIDE;
   virtual bool SatisfiesConstraintSets(
       const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets)
   {
     return true;
   }
 
-  void OnHardwareStateChange(HardwareState aState);
+  void OnHardwareStateChange(HardwareState aState, nsresult aReason) MOZ_OVERRIDE;
   void GetRotation();
-  bool OnNewPreviewFrame(layers::Image* aImage, uint32_t aWidth, uint32_t aHeight);
-  void OnUserError(UserContext aContext, nsresult aError);
-  void OnTakePictureComplete(uint8_t* aData, uint32_t aLength, const nsAString& aMimeType);
+  bool OnNewPreviewFrame(layers::Image* aImage, uint32_t aWidth, uint32_t aHeight) MOZ_OVERRIDE;
+  void OnUserError(UserContext aContext, nsresult aError) MOZ_OVERRIDE;
+  void OnTakePictureComplete(uint8_t* aData, uint32_t aLength, const nsAString& aMimeType) MOZ_OVERRIDE;
 
   void AllocImpl();
   void DeallocImpl();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngine.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngine.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngine.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngine.h	2014-11-26 21:46:02.000000000 +0000
@@ -117,7 +117,7 @@
                           SourceMediaStream *aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks &aLastEndTime) = 0;
+                          StreamTime &aLastEndTime) = 0;
 
   /* Stop the device and release the corresponding MediaStream */
   virtual nsresult Stop(SourceMediaStream *aSource, TrackID aID) = 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -175,7 +175,7 @@
 }
 
 nsresult
-MediaEngineTabVideoSource::Start(mozilla::SourceMediaStream* aStream, mozilla::TrackID aID)
+MediaEngineTabVideoSource::Start(SourceMediaStream* aStream, TrackID aID)
 {
   nsCOMPtr<nsIRunnable> runnable;
   if (!mWindow)
@@ -183,23 +183,24 @@
   else
     runnable = new StartRunnable(this);
   NS_DispatchToMainThread(runnable);
-  aStream->AddTrack(aID, USECS_PER_S, 0, new VideoSegment());
+  aStream->AddTrack(aID, 0, new VideoSegment());
   aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   return NS_OK;
 }
 
 void
-MediaEngineTabVideoSource::
-NotifyPull(MediaStreamGraph*, SourceMediaStream* aSource, mozilla::TrackID aID, mozilla::StreamTime aDesiredTime, mozilla::TrackTicks& aLastEndTime)
+MediaEngineTabVideoSource::NotifyPull(MediaStreamGraph*,
+                                      SourceMediaStream* aSource,
+                                      TrackID aID, StreamTime aDesiredTime,
+                                      StreamTime& aLastEndTime)
 {
   VideoSegment segment;
   MonitorAutoLock mon(mMonitor);
 
   // Note: we're not giving up mImage here
   nsRefPtr<layers::CairoImage> image = mImage;
-  TrackTicks target = aSource->TimeToTicksRoundUp(USECS_PER_S, aDesiredTime);
-  TrackTicks delta = target - aLastEndTime;
+  StreamTime delta = aDesiredTime - aLastEndTime;
   if (delta > 0) {
     // nullptr images are allowed
     gfx::IntSize size = image ? image->GetSize() : IntSize(0, 0);
@@ -207,7 +208,7 @@
     // This can fail if either a) we haven't added the track yet, or b)
     // we've removed or finished the track.
     if (aSource->AppendToTrack(aID, &(segment))) {
-      aLastEndTime = target;
+      aLastEndTime = aDesiredTime;
     }
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h	2014-11-26 21:46:02.000000000 +0000
@@ -25,7 +25,7 @@
     virtual nsresult Deallocate();
     virtual nsresult Start(mozilla::SourceMediaStream*, mozilla::TrackID);
     virtual void SetDirectListeners(bool aHasDirectListeners) {};
-    virtual void NotifyPull(mozilla::MediaStreamGraph*, mozilla::SourceMediaStream*, mozilla::TrackID, mozilla::StreamTime, mozilla::TrackTicks&);
+    virtual void NotifyPull(mozilla::MediaStreamGraph*, mozilla::SourceMediaStream*, mozilla::TrackID, mozilla::StreamTime, mozilla::StreamTime&);
     virtual nsresult Stop(mozilla::SourceMediaStream*, mozilla::TrackID);
     virtual nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t);
     virtual bool IsFake();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -317,7 +317,7 @@
   }
 
   AudioSegment* segment = new AudioSegment();
-  aStream->AddTrack(aID, SAMPLE_FREQUENCY, 0, segment);
+  aStream->AddAudioTrack(aID, SAMPLE_FREQUENCY, 0, segment);
   aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
   // XXX Make this based on the pref.
   aStream->RegisterForAudioMixing();
@@ -397,14 +397,14 @@
                                          SourceMediaStream *aSource,
                                          TrackID aID,
                                          StreamTime aDesiredTime,
-                                         TrackTicks &aLastEndTime)
+                                         StreamTime &aLastEndTime)
 {
   // Ignore - we push audio data
 #ifdef DEBUG
-  TrackTicks target = aSource->TimeToTicksRoundUp(SAMPLE_FREQUENCY, aDesiredTime);
-  TrackTicks delta = target - aLastEndTime;
-  LOG_FRAMES(("Audio: NotifyPull: aDesiredTime %ld, target %ld, delta %ld",(int64_t) aDesiredTime, (int64_t) target, (int64_t) delta));
-  aLastEndTime = target;
+  StreamTime delta = aDesiredTime - aLastEndTime;
+  LOG(("Audio: NotifyPull: aDesiredTime %ld, delta %ld",(int64_t) aDesiredTime,
+       (int64_t) delta));
+  aLastEndTime = aDesiredTime;
 #endif
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineWebRTC.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineWebRTC.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineWebRTC.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineWebRTC.h	2014-11-26 21:46:02.000000000 +0000
@@ -98,7 +98,7 @@
                           SourceMediaStream* aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks& aLastEndTime);
+                          StreamTime &aLastEndTime);
 
   virtual const MediaSourceType GetMediaSource() {
     return mMediaSource;
@@ -181,7 +181,7 @@
                           SourceMediaStream* aSource,
                           TrackID aId,
                           StreamTime aDesiredTime,
-                          TrackTicks& aLastEndTime);
+                          StreamTime &aLastEndTime);
 
   virtual bool IsFake() {
     return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -125,7 +125,7 @@
                                          SourceMediaStream* aSource,
                                          TrackID aID,
                                          StreamTime aDesiredTime,
-                                         TrackTicks &aLastEndTime)
+                                         StreamTime &aLastEndTime)
 {
   VideoSegment segment;
 
@@ -134,10 +134,9 @@
   // So mState could be kReleased here.  We really don't care about the state,
   // though.
 
-  TrackTicks target = aSource->TimeToTicksRoundUp(USECS_PER_S, aDesiredTime);
-  TrackTicks delta = target - aLastEndTime;
-  LOGFRAME(("NotifyPull, desired = %ld, target = %ld, delta = %ld %s", (int64_t) aDesiredTime,
-            (int64_t) target, (int64_t) delta, mImage ? "" : "<null>"));
+  StreamTime delta = aDesiredTime - aLastEndTime;
+  LOGFRAME(("NotifyPull, desired = %ld, delta = %ld %s", (int64_t) aDesiredTime,
+            (int64_t) delta, mImage.get() ? "" : "<null>"));
 
   // Bug 846188 We may want to limit incoming frames to the requested frame rate
   // mFps - if you want 30FPS, and the camera gives you 60FPS, this could
@@ -152,7 +151,7 @@
   if (delta > 0) {
     // nullptr images are allowed
     if (AppendToTrack(aSource, mImage, aID, delta)) {
-      aLastEndTime = target;
+      aLastEndTime = aDesiredTime;
     }
   }
 }
@@ -398,7 +397,7 @@
 
   mSources.AppendElement(aStream);
 
-  aStream->AddTrack(aID, USECS_PER_S, 0, new VideoSegment());
+  aStream->AddTrack(aID, 0, new VideoSegment());
   aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   if (mState == kStarted) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -31,8 +31,7 @@
 void
 SpeechStreamListener::NotifyQueuedTrackChanges(MediaStreamGraph* aGraph,
                                                TrackID aID,
-                                               TrackRate aTrackRate,
-                                               TrackTicks aTrackOffset,
+                                               StreamTime aTrackOffset,
                                                uint32_t aTrackEvents,
                                                const MediaSegment& aQueuedMedia)
 {
@@ -50,7 +49,8 @@
     if (iterator->IsNull()) {
       nsTArray<int16_t> nullData;
       PodZero(nullData.AppendElements(duration), duration);
-      ConvertAndDispatchAudioChunk(duration, iterator->mVolume, nullData.Elements(), aTrackRate);
+      ConvertAndDispatchAudioChunk(duration, iterator->mVolume,
+                                   nullData.Elements(), aGraph->GraphRate());
     } else {
       AudioSampleFormat format = iterator->mBufferFormat;
 
@@ -59,11 +59,11 @@
       if (format == AUDIO_FORMAT_S16) {
         ConvertAndDispatchAudioChunk(duration,iterator->mVolume,
                                      static_cast<const int16_t*>(iterator->mChannelData[0]),
-                                     aTrackRate);
+                                     aGraph->GraphRate());
       } else if (format == AUDIO_FORMAT_FLOAT32) {
         ConvertAndDispatchAudioChunk(duration,iterator->mVolume,
                                      static_cast<const float*>(iterator->mChannelData[0]),
-                                     aTrackRate);
+                                     aGraph->GraphRate());
       }
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webspeech/recognition/SpeechStreamListener.h	2014-11-26 21:46:02.000000000 +0000
@@ -24,14 +24,13 @@
   explicit SpeechStreamListener(SpeechRecognition* aRecognition);
   ~SpeechStreamListener();
 
-  void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
-                                TrackRate aTrackRate,
-                                TrackTicks aTrackOffset,
-                                uint32_t aTrackEvents,
-                                const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
+  virtual void NotifyQueuedTrackChanges(MediaStreamGraph* aGraph, TrackID aID,
+                                        StreamTime aTrackOffset,
+                                        uint32_t aTrackEvents,
+                                        const MediaSegment& aQueuedMedia) MOZ_OVERRIDE;
 
-  void NotifyEvent(MediaStreamGraph* aGraph,
-                   MediaStreamListener::MediaStreamGraphEvent event) MOZ_OVERRIDE;
+  virtual void NotifyEvent(MediaStreamGraph* aGraph,
+                           MediaStreamListener::MediaStreamGraphEvent event) MOZ_OVERRIDE;
 
 private:
   template<typename SampleFormatType>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webspeech/synth/nsSpeechTask.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webspeech/synth/nsSpeechTask.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/webspeech/synth/nsSpeechTask.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/webspeech/synth/nsSpeechTask.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -155,7 +155,7 @@
   mChannels = aChannels;
 
   AudioSegment* segment = new AudioSegment();
-  mStream->AddTrack(1, aRate, 0, segment);
+  mStream->AddAudioTrack(1, aRate, 0, segment);
   mStream->AddAudioOutput(this);
   mStream->SetAudioOutputVolume(this, mVolume);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/wmf/WMFReader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/wmf/WMFReader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/media/wmf/WMFReader.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/media/wmf/WMFReader.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -736,23 +736,22 @@
   b.mPlanes[2].mOffset = 0;
   b.mPlanes[2].mSkip = 0;
 
-  VideoData *v = VideoData::Create(mInfo.mVideo,
-                                   mDecoder->GetImageContainer(),
-                                   aOffsetBytes,
-                                   aTimestampUsecs,
-                                   aDurationUsecs,
-                                   b,
-                                   false,
-                                   -1,
-                                   ToIntRect(mPictureRegion));
+  nsRefPtr<VideoData> v = VideoData::Create(mInfo.mVideo,
+                                            mDecoder->GetImageContainer(),
+                                            aOffsetBytes,
+                                            aTimestampUsecs,
+                                            aDurationUsecs,
+                                            b,
+                                            false,
+                                            -1,
+                                            ToIntRect(mPictureRegion));
   if (twoDBuffer) {
     twoDBuffer->Unlock2D();
   } else {
     buffer->Unlock();
   }
 
-  *aOutVideoData = v;
-
+  v.forget(aOutVideoData);
   return S_OK;
 }
 
@@ -779,18 +778,18 @@
   NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
   NS_ENSURE_TRUE(image, E_FAIL);
 
-  VideoData *v = VideoData::CreateFromImage(mInfo.mVideo,
-                                            mDecoder->GetImageContainer(),
-                                            aOffsetBytes,
-                                            aTimestampUsecs,
-                                            aDurationUsecs,
-                                            image.forget(),
-                                            false,
-                                            -1,
-                                            ToIntRect(mPictureRegion));
+  nsRefPtr<VideoData> v = VideoData::CreateFromImage(mInfo.mVideo,
+                                                     mDecoder->GetImageContainer(),
+                                                     aOffsetBytes,
+                                                     aTimestampUsecs,
+                                                     aDurationUsecs,
+                                                     image.forget(),
+                                                     false,
+                                                     -1,
+                                                     ToIntRect(mPictureRegion));
 
   NS_ENSURE_TRUE(v, E_FAIL);
-  *aOutVideoData = v;
+  v.forget(aOutVideoData);
 
   return S_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/Assertions.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/Assertions.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/Assertions.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/Assertions.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -57,5 +57,17 @@
 
 #undef ASSERT_MOBILE_ROAMING_MODE_EQUALITY
 
+#define ASSERT_MOBILE_NETWORK_TYPE_EQUALITY(webidlState, xpidlState) \
+  static_assert(static_cast<int32_t>(MobileNetworkType::webidlState) == nsIMobileConnection::xpidlState, \
+                "MobileNetworkType::" #webidlState " should equal to nsIMobileConnection::" #xpidlState)
+
+ASSERT_MOBILE_NETWORK_TYPE_EQUALITY(Gsm, MOBILE_NETWORK_TYPE_GSM);
+ASSERT_MOBILE_NETWORK_TYPE_EQUALITY(Wcdma, MOBILE_NETWORK_TYPE_WCDMA);
+ASSERT_MOBILE_NETWORK_TYPE_EQUALITY(Cdma, MOBILE_NETWORK_TYPE_CDMA);
+ASSERT_MOBILE_NETWORK_TYPE_EQUALITY(Evdo, MOBILE_NETWORK_TYPE_EVDO);
+ASSERT_MOBILE_NETWORK_TYPE_EQUALITY(Lte, MOBILE_NETWORK_TYPE_LTE);
+
+#undef ASSERT_MOBILE_NETWORK_TYPE_EQUALITY
+
 } // namespace dom
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js	2014-11-26 21:46:02.000000000 +0000
@@ -50,9 +50,9 @@
 const INT32_MAX = 2147483647;
 const UNKNOWN_RSSI = 99;
 
-XPCOMUtils.defineLazyServiceGetter(this, "gSystemMessenger",
-                                   "@mozilla.org/system-message-internal;1",
-                                   "nsISystemMessagesInternal");
+XPCOMUtils.defineLazyServiceGetter(this, "gMobileConnectionMessenger",
+                                   "@mozilla.org/ril/system-messenger-helper;1",
+                                   "nsIMobileConnectionMessenger");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gNetworkManager",
                                    "@mozilla.org/network/manager;1",
@@ -398,6 +398,7 @@
         RIL.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT.split(",");
     }
 
+    let enumNetworkTypes = [];
     for (let type of supportedNetworkTypes) {
       // If the value in system property is not valid, use the default one which
       // is defined in ril_consts.js.
@@ -405,15 +406,18 @@
         if (DEBUG) {
           this._debug("Unknown network type: " + type);
         }
-        supportedNetworkTypes =
-          RIL.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT.split(",");
+        RIL.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT.split(",").forEach(aType => {
+          enumNetworkTypes.push(RIL.GECKO_SUPPORTED_NETWORK_TYPES.indexOf(aType));
+        });
         break;
       }
+      enumNetworkTypes.push(RIL.GECKO_SUPPORTED_NETWORK_TYPES.indexOf(type));
     }
     if (DEBUG) {
-      this._debug("Supported Network Types: " + supportedNetworkTypes);
+      this._debug("Supported Network Types: " + enumNetworkTypes);
     }
-    return supportedNetworkTypes;
+
+    return enumNetworkTypes;
   },
 
   /**
@@ -1149,11 +1153,6 @@
     } catch (e) {}
   },
 
-  _broadcastCdmaInfoRecordSystemMessage: function(aMessage) {
-    // TODO: Bug 1072808, Broadcast System Message with proxy.
-    gSystemMessenger.broadcastMessage("cdma-info-rec-received", aMessage);
-  },
-
   /**
    * nsIMobileConnectionService interface.
    */
@@ -1197,6 +1196,8 @@
             aMessage + " (sessionEnded : " + aSessionEnded + ")");
     }
 
+    gMobileConnectionMessenger.notifyUssdReceived(aClientId, aMessage, aSessionEnded);
+
     this.getItemByServiceId(aClientId)
         .deliverListenerEvent("notifyUssdReceived", [aMessage, aSessionEnded]);
   },
@@ -1364,108 +1365,56 @@
   },
 
   notifyCdmaInfoRecDisplay: function(aClientId, aDisplay) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      display: aDisplay
-    });
+    gMobileConnectionMessenger.notifyCdmaInfoRecDisplay(aClientId, aDisplay);
   },
 
   notifyCdmaInfoRecCalledPartyNumber: function(aClientId, aType, aPlan, aNumber,
                                                aPi, aSi) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      calledNumber: {
-        type: aType,
-        plan: aPlan,
-        number: aNumber,
-        pi: aPi,
-        si: aSi
-      }
-    });
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecCalledPartyNumber(aClientId, aType, aPlan, aNumber,
+                                          aPi, aSi);
   },
 
   notifyCdmaInfoRecCallingPartyNumber: function(aClientId, aType, aPlan, aNumber,
                                                 aPi, aSi) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      callingNumber: {
-        type: aType,
-        plan: aPlan,
-        number: aNumber,
-        pi: aPi,
-        si: aSi
-      }
-    });
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecCallingPartyNumber(aClientId, aType, aPlan, aNumber,
+                                           aPi, aSi);
   },
 
   notifyCdmaInfoRecConnectedPartyNumber: function(aClientId, aType, aPlan, aNumber,
                                                   aPi, aSi) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      connectedNumber: {
-        type: aType,
-        plan: aPlan,
-        number: aNumber,
-        pi: aPi,
-        si: aSi
-      }
-    });
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecConnectedPartyNumber(aClientId, aType, aPlan, aNumber,
+                                             aPi, aSi);
   },
 
   notifyCdmaInfoRecSignal: function(aClientId, aType, aAlertPitch, aSignal){
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      signal: {
-        type: aType,
-        alertPitch: aAlertPitch,
-        signal: aSignal
-      }
-    });
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecSignal(aClientId, aType, aAlertPitch, aSignal);
   },
 
   notifyCdmaInfoRecRedirectingNumber: function(aClientId, aType, aPlan, aNumber,
                                                aPi, aSi, aReason) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      redirect: {
-        type: aType,
-        plan: aPlan,
-        number: aNumber,
-        pi: aPi,
-        si: aSi,
-        reason: aReason
-      }
-    });
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecRedirectingNumber(aClientId, aType, aPlan, aNumber,
+                                          aPi, aSi, aReason);
   },
 
   notifyCdmaInfoRecLineControl: function(aClientId, aPolarityIncluded, aToggle,
                                          aReverse, aPowerDenial) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      lineControl: {
-        polarityIncluded: aPolarityIncluded,
-        toggle: aToggle,
-        reverse: aReverse,
-        powerDenial: aPowerDenial
-      }
-    });
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecLineControl(aClientId, aPolarityIncluded, aToggle,
+                                    aReverse, aPowerDenial);
   },
 
   notifyCdmaInfoRecClir: function(aClientId, aCause) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      clirCause: aCause
-    });
+    gMobileConnectionMessenger.notifyCdmaInfoRecClir(aClientId, aCause);
   },
 
-  notifyCdmaInfoRecAudioControl: function(aClientId, aUplink, aDownLink) {
-    this._broadcastCdmaInfoRecordSystemMessage({
-      clientId: aClientId,
-      audioControl: {
-        upLink: aUplink,
-        downLink: aDownLink
-      }
-    });
+  notifyCdmaInfoRecAudioControl: function(aClientId, aUpLink, aDownLink) {
+    gMobileConnectionMessenger
+      .notifyCdmaInfoRecAudioControl(aClientId, aUpLink, aDownLink);
   },
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/gonk/nsIMobileConnectionMessenger.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/gonk/nsIMobileConnectionMessenger.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/gonk/nsIMobileConnectionMessenger.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/gonk/nsIMobileConnectionMessenger.idl	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,213 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(fd2fa95c-5b54-11e4-bc6b-6f3bffb681cd)]
+interface nsIMobileConnectionMessenger : nsISupports
+{
+  /**
+   * 'ussd-received' system message
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aMessage
+   *        USSD Message to be displayed.
+   * @param aSessionEnded
+   *        True if USSD session is ended.
+   */
+  void notifyUssdReceived(in unsigned long aServiceId,
+                          in DOMString aMessage,
+                          in boolean aSessionEnded);
+
+  /**
+   * 'cdma-info-rec-received' system message with Display Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aDisplay
+   *        The text to be displayed.
+   */
+  void notifyCdmaInfoRecDisplay(in unsigned long aServiceId,
+                                in DOMString aDisplay);
+
+  /**
+   * 'cdma-info-rec-received' system message with Called Party Number Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aTtype
+   *        The type of number. (3-bit binary)
+   *        See Table 2.7.1.3.2.4-2 in 3GPP2 C.S0005-F.
+   * @param aPlan
+   *        The numbering plan. (4-bit binary)
+   *        See Table 2.7.1.3.2.4-3 in 3GPP2 C.S0005-F.
+   * @param aNumber
+   *        The string presentation of the number.
+   * @param aPi (2-bit binary)
+   *        The Presentation indicator of the number.
+   *        See Table 2.7.4.4-1 in 3GPP2 C.S0005-F.
+   * @param aSi (2-bit binary)
+   *        The Screening Indicator of the number.
+   *        See Table 2.7.4.4-2 in 3GPP2 C.S0005-F.
+   */
+  void notifyCdmaInfoRecCalledPartyNumber(in unsigned long aServiceId,
+                                          in unsigned short aType,
+                                          in unsigned short aPlan,
+                                          in DOMString aNumber,
+                                          in unsigned short aPi,
+                                          in unsigned short aSi);
+
+  /**
+   * 'cdma-info-rec-received' system message with Calling Party Number Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aTtype
+   *        The type of number. (3-bit binary)
+   *        See Table 2.7.1.3.2.4-2 in 3GPP2 C.S0005-F.
+   * @param aPlan
+   *        The numbering plan. (4-bit binary)
+   *        See Table 2.7.1.3.2.4-3 in 3GPP2 C.S0005-F.
+   * @param aNumber
+   *        The string presentation of the number.
+   * @param aPi (2-bit binary)
+   *        The Presentation indicator of the number.
+   *        See Table 2.7.4.4-1 in 3GPP2 C.S0005-F.
+   * @param aSi (2-bit binary)
+   *        The Screening Indicator of the number.
+   *        See Table 2.7.4.4-2 in 3GPP2 C.S0005-F.
+   */
+  void notifyCdmaInfoRecCallingPartyNumber(in unsigned long aServiceId,
+                                           in unsigned short aType,
+                                           in unsigned short aPlan,
+                                           in DOMString aNumber,
+                                           in unsigned short aPi,
+                                           in unsigned short aSi);
+
+  /**
+   * 'cdma-info-rec-received' system message with Connected Party Number Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aTtype
+   *        The type of number. (3-bit binary)
+   *        See Table 2.7.1.3.2.4-2 in 3GPP2 C.S0005-F.
+   * @param aPlan
+   *        The numbering plan. (4-bit binary)
+   *        See Table 2.7.1.3.2.4-3 in 3GPP2 C.S0005-F.
+   * @param aNumber
+   *        The string presentation of the number.
+   * @param aPi (2-bit binary)
+   *        The Presentation indicator of the number.
+   *        See Table 2.7.4.4-1 in 3GPP2 C.S0005-F.
+   * @param aSi (2-bit binary)
+   *        The Screening Indicator of the number.
+   *        See Table 2.7.4.4-2 in 3GPP2 C.S0005-F.
+   */
+  void notifyCdmaInfoRecConnectedPartyNumber(in unsigned long aServiceId,
+                                             in unsigned short aType,
+                                             in unsigned short aPlan,
+                                             in DOMString aNumber,
+                                             in unsigned short aPi,
+                                             in unsigned short aSi);
+
+  /**
+   * 'cdma-info-rec-received' system message with Signal Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aType
+   *        The signal type. (2-bit binary)
+   *        See Table 3.7.5.5-1 in 3GPP2 C.S0005-F.
+   * @param aAlertPitch
+   *        The pitch of the alerting signal. (2-bit binary)
+   *        See Table 3.7.5.5-2 in 3GPP2 C.S0005-F.
+   * @param aSignal
+   *        The signal code. (6-bit binary)
+   *        See Table 3.7.5.5-3, 3.7.5.5-4, 3.7.5.5-5 in 3GPP2 C.S0005-F.
+   */
+  void notifyCdmaInfoRecSignal(in unsigned long aServiceId,
+                               in unsigned short aType,
+                               in unsigned short aAlertPitch,
+                               in unsigned short aSignal);
+
+  /**
+   * 'cdma-info-rec-received' system message with Redirecting Number Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aTtype
+   *        The type of number. (3-bit binary)
+   *        See Table 2.7.1.3.2.4-2 in 3GPP2 C.S0005-F.
+   * @param aPlan
+   *        The numbering plan. (4-bit binary)
+   *        See Table 2.7.1.3.2.4-3 in 3GPP2 C.S0005-F.
+   * @param aNumber
+   *        The string presentation of the number.
+   * @param aPi (2-bit binary)
+   *        The Presentation indicator of the number.
+   *        See Table 2.7.4.4-1 in 3GPP2 C.S0005-F.
+   * @param aSi (2-bit binary)
+   *        The Screening Indicator of the number.
+   *        See Table 2.7.4.4-2 in 3GPP2 C.S0005-F.
+   * @param aReason (4-bit binary)
+   *        The redirection reason.
+   *        See Table 3.7.5.11-1 in 3GPP2 C.S0005-F.
+   */
+  void notifyCdmaInfoRecRedirectingNumber(in unsigned long aServiceId,
+                                          in unsigned short aType,
+                                          in unsigned short aPlan,
+                                          in DOMString aNumber,
+                                          in unsigned short aPi,
+                                          in unsigned short aSi,
+                                          in unsigned short aReason);
+
+  /**
+   * 'cdma-info-rec-received' system message with Line Control Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aPolarityIncluded (1-bit)
+   *        Polarity parameter included.
+   * @param aToggle (1-bit)
+   *        Toggle mode.
+   * @param aReverse (1-bit)
+   *        Reverse polarity.
+   * @param aPowerDenial (8-bit)
+   *        Power denial timeout.
+   */
+  void notifyCdmaInfoRecLineControl(in unsigned long aServiceId,
+                                    in unsigned short aPolarityIncluded,
+                                    in unsigned short aToggle,
+                                    in unsigned short aReverse,
+                                    in unsigned short aPowerDenial);
+
+  /**
+   * 'cdma-info-rec-received' system message with CLIR Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aCause
+   *        Reason code. (8-bit binary)
+   *        See Table A 1.1-1 in T53.
+   *
+   * See 'ANNEX 1 Country-Specific Record Type for Japan' in T53.
+   * http://www.arib.or.jp/english/html/overview/doc/T53v6_5_pdf/5_ANNEX_v6_5.pdf
+   */
+  void notifyCdmaInfoRecClir(in unsigned long aServiceId,
+                             in unsigned short aCause);
+
+  /**
+   * 'cdma-info-rec-received' system message with Audio Control Info
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aUpLink
+   * @param aDownLink
+   */
+  void notifyCdmaInfoRecAudioControl(in unsigned long aServiceId,
+                                     in short aUpLink,
+                                     in short aDownLink);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/interfaces/nsIMobileConnectionService.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/interfaces/nsIMobileConnectionService.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/interfaces/nsIMobileConnectionService.idl	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/interfaces/nsIMobileConnectionService.idl	2014-11-26 21:46:02.000000000 +0000
@@ -235,7 +235,7 @@
 NS_CreateMobileConnectionService();
 %}
 
-[scriptable, uuid(5250a0ba-19a2-4e5b-a5ee-1e69ba2897a9)]
+[scriptable, uuid(99e43353-5fc4-497e-88a2-5fa6862ee64c)]
 interface nsIMobileConnection : nsISupports
 {
   /*
@@ -335,6 +335,15 @@
   const long CDMA_ROAMING_PREFERENCE_AFFILIATED = 1;
   const long CDMA_ROAMING_PREFERENCE_ANY        = 2;
 
+  /**
+   * Supported network type.
+   */
+  const long MOBILE_NETWORK_TYPE_GSM   = 0;
+  const long MOBILE_NETWORK_TYPE_WCDMA = 1;
+  const long MOBILE_NETWORK_TYPE_CDMA  = 2;
+  const long MOBILE_NETWORK_TYPE_EVDO  = 3;
+  const long MOBILE_NETWORK_TYPE_LTE   = 4;
+
   readonly attribute unsigned long serviceId;
 
   /**
@@ -386,10 +395,9 @@
   /**
    * The network types supported by this radio.
    *
-   * @return an array of DOMString
-   *         Possible values: 'gsm', 'wcdma', 'cdma', 'evdo', 'lte'.
+   * @return an array of nsIMobileConnection.MOBILE_NETWORK_TYPE_* values.
    */
-  void getSupportedNetworkTypes([array, size_is(length)] out wstring types,
+  void getSupportedNetworkTypes([array, size_is(length)] out long types,
                                 [retval] out unsigned long length);
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -113,7 +113,7 @@
 }
 
 NS_IMETHODIMP
-MobileConnectionChild::GetSupportedNetworkTypes(char16_t*** aTypes,
+MobileConnectionChild::GetSupportedNetworkTypes(int32_t** aTypes,
                                                 uint32_t* aLength)
 {
   NS_ENSURE_ARG(aTypes);
@@ -121,11 +121,11 @@
 
   *aLength = mSupportedNetworkTypes.Length();
   *aTypes =
-    static_cast<char16_t**>(nsMemory::Alloc((*aLength) * sizeof(char16_t*)));
+    static_cast<int32_t*>(nsMemory::Alloc((*aLength) * sizeof(int32_t)));
   NS_ENSURE_TRUE(*aTypes, NS_ERROR_OUT_OF_MEMORY);
 
   for (uint32_t i = 0; i < *aLength; i++) {
-    (*aTypes)[i] = ToNewUnicode(mSupportedNetworkTypes[i]);
+    (*aTypes)[i] = mSupportedNetworkTypes[i];
   }
 
   return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionChild.h	2014-11-26 21:46:02.000000000 +0000
@@ -117,7 +117,7 @@
   nsString mLastNetwork;
   nsString mLastHomeNetwork;
   int32_t mNetworkSelectionMode;
-  nsTArray<nsString> mSupportedNetworkTypes;
+  nsTArray<int32_t> mSupportedNetworkTypes;
 };
 
 /******************************************************************************
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -131,7 +131,7 @@
                                  nsString* aIccId,
                                  int32_t* aNetworkSelectionMode,
                                  int32_t* aRadioState,
-                                 nsTArray<nsString>* aSupportedNetworkTypes)
+                                 nsTArray<int32_t>* aSupportedNetworkTypes)
 {
   NS_ENSURE_TRUE(mMobileConnection, false);
 
@@ -143,18 +143,17 @@
   NS_ENSURE_SUCCESS(mMobileConnection->GetNetworkSelectionMode(aNetworkSelectionMode), false);
   NS_ENSURE_SUCCESS(mMobileConnection->GetRadioState(aRadioState), false);
 
-  char16_t** types = nullptr;
+  int32_t* types = nullptr;
   uint32_t length = 0;
 
   nsresult rv = mMobileConnection->GetSupportedNetworkTypes(&types, &length);
   NS_ENSURE_SUCCESS(rv, false);
 
   for (uint32_t i = 0; i < length; ++i) {
-    nsDependentString type(types[i]);
-    aSupportedNetworkTypes->AppendElement(type);
+    aSupportedNetworkTypes->AppendElement(types[i]);
   }
 
-  NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(length, types);
+  nsMemory::Free(types);
 
   return true;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.h	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/MobileConnectionParent.h	2014-11-26 21:46:02.000000000 +0000
@@ -52,7 +52,7 @@
   RecvInit(nsMobileConnectionInfo* aVoice, nsMobileConnectionInfo* aData,
            nsString* aLastKnownNetwork, nsString* aLastKnownHomeNetwork,
            nsString* aIccId, int32_t* aNetworkSelectionMode,
-           int32_t* aRadioState, nsTArray<nsString>* aSupportedNetworkTypes) MOZ_OVERRIDE;
+           int32_t* aRadioState, nsTArray<int32_t>* aSupportedNetworkTypes) MOZ_OVERRIDE;
 
 private:
   nsCOMPtr<nsIMobileConnection> mMobileConnection;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/PMobileConnection.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/PMobileConnection.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/ipc/PMobileConnection.ipdl	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/ipc/PMobileConnection.ipdl	2014-11-26 21:46:02.000000000 +0000
@@ -51,7 +51,7 @@
     returns (nsMobileConnectionInfo aVoice, nsMobileConnectionInfo aData,
              nsString aLastKnownNetwork, nsString aLastKnownHomeNetwork,
              nsString aIccId, int32_t aNetworkSelectionMode,
-             int32_t aRadioState, nsString[] aSupportedNetworkTypes);
+             int32_t aRadioState, int32_t[] aSupportedNetworkTypes);
 };
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/MobileConnection.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/MobileConnection.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/MobileConnection.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/MobileConnection.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -378,23 +378,20 @@
     return;
   }
 
-  char16_t** types = nullptr;
+  int32_t* types = nullptr;
   uint32_t length = 0;
 
   nsresult rv = mMobileConnection->GetSupportedNetworkTypes(&types, &length);
   NS_ENSURE_SUCCESS_VOID(rv);
 
   for (uint32_t i = 0; i < length; ++i) {
-    nsDependentString rawType(types[i]);
-    Nullable<MobileNetworkType> type = Nullable<MobileNetworkType>();
-    CONVERT_STRING_TO_NULLABLE_ENUM(rawType, MobileNetworkType, type);
-
-    if (!type.IsNull()) {
-      aTypes.AppendElement(type.Value());
-    }
+    int32_t type = types[i];
+
+    MOZ_ASSERT(type < static_cast<int32_t>(MobileNetworkType::EndGuard_));
+    aTypes.AppendElement(static_cast<MobileNetworkType>(type));
   }
 
-  NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(length, types);
+  nsMemory::Free(types);
 }
 
 already_AddRefed<DOMRequest>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobileconnection/moz.build	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobileconnection/moz.build	2014-11-26 21:46:02.000000000 +0000
@@ -62,6 +62,7 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'gonk/nsIGonkMobileConnectionService.idl',
+        'gonk/nsIMobileConnectionMessenger.idl',
     ]
     EXTRA_COMPONENTS += [
         'gonk/MobileConnectionService.js',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/gonk/MmsService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/gonk/MmsService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/gonk/MmsService.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/gonk/MmsService.js	2014-11-26 21:46:02.000000000 +0000
@@ -225,9 +225,11 @@
   mmsPort:  -1,
 
   setApnSetting: function(network) {
-    this.mmsc = network.mmsc;
     // Workaround an xpconnect issue with undefined string objects. See bug 808220.
-    this.mmsProxy = (network === "undefined") ? undefined : network.mmsProxy;
+    this.mmsc =
+      (network.mmsc === "undefined") ? undefined : network.mmsc;
+    this.mmsProxy =
+      (network.mmsProxy === "undefined") ? undefined : network.mmsProxy;
     this.mmsPort = network.mmsPort;
   },
 
@@ -303,7 +305,7 @@
       this.hostsToRoute = [];
       this.networkInterface = null;
 
-      this.radioInterface.deactivateDataCallByType("mms");
+      this.radioInterface.deactivateDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS);
     };
 
     let promises =
@@ -439,7 +441,7 @@
 
       // Bug 1059110: Ensure all the initialization are done before setup data call.
       if (DEBUG) debug("acquire: buffer the MMS request and setup the MMS data call.");
-      this.radioInterface.setupDataCallByType("mms");
+      this.radioInterface.setupDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS);
 
       return false;
     }
@@ -1213,12 +1215,6 @@
   msg.headers["x-mms-message-class"] = "personal";
   msg.headers["x-mms-expiry"] = 7 * 24 * 60 * 60;
   msg.headers["x-mms-priority"] = 129;
-  try {
-    msg.headers["x-mms-read-report"] =
-      Services.prefs.getBoolPref("dom.mms.requestReadReport");
-  } catch (e) {
-    msg.headers["x-mms-read-report"] = true;
-  }
   msg.headers["x-mms-delivery-report"] = requestDeliveryReport;
 
   if (!gMmsTransactionHelper.checkMaxValuesParameters(msg)) {
@@ -2186,6 +2182,12 @@
     } catch (e) {
       aMessage["deliveryStatusRequested"] = false;
     }
+    try {
+      headers["x-mms-read-report"] =
+        Services.prefs.getBoolPref("dom.mms.requestReadReport");
+    } catch (e) {
+      headers["x-mms-read-report"] = false;
+    }
 
     if (DEBUG) debug("createSavableFromParams: aMessage: " +
                      JSON.stringify(aMessage));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/interfaces/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/interfaces/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/interfaces/moz.build	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/interfaces/moz.build	2014-11-26 21:46:02.000000000 +0000
@@ -21,6 +21,7 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsIRilMobileMessageDatabaseService.idl',
+        'nsISmsMessenger.idl',
     ]
 
 XPIDL_MODULE = 'dom_mobilemessage'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/interfaces/nsISmsMessenger.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/interfaces/nsISmsMessenger.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/interfaces/nsISmsMessenger.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/interfaces/nsISmsMessenger.idl	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,69 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "domstubs.idl"
+#include "nsISupports.idl"
+
+[scriptable, uuid(f77ad4d4-68a9-11e4-920f-0b26b7a5e713)]
+interface nsISmsMessenger : nsISupports
+{
+  /* 'sms-received' system message */
+  const unsigned short NOTIFICATION_TYPE_RECEIVED = 0;
+  /* 'sms-sent' system message */
+  const unsigned short NOTIFICATION_TYPE_SENT = 1;
+  /* 'sms-delivery-success' system message */
+  const unsigned short NOTIFICATION_TYPE_DELIVERY_SUCCESS = 2;
+
+  /**
+   * To broadcast 'sms-received', 'sms-delivery-success', 'sms-sent' system message
+   *
+   * Note: Except aNotificationType, all parameters are the attributes of the
+   * nsIDOMMozSmsMessage generated by nsIMobileMessageService.createSmsMessage().
+   *
+   * @param aNotificationType
+   *        A predefined constant of nsISmsMessenger.NOTIFICATION_TYPE_*.
+   * @param aId
+   *        The unique identity of this message.
+   * @param aThreadId
+   *        The unique identity of the thread this message belongs to.
+   * @param aIccId
+   *        Integrated Circuit Card Identifier. null if ICC is not available.
+   * @param aDelivery
+   *        A predefined constant of nsISmsService.DELIVERY_TYPE_*.
+   * @param aDeliveryStatus
+   *        A predefined constant of nsISmsService.DELIVERY_STATUS_TYPE_*.
+   * @param aSender
+   *        Sender address. null if not available.
+   * @param aReceiver
+   *        Receiver address. null if not available.
+   * @param aBody
+   *        Text message body. null if not available.
+   * @param aMessageClass
+   *        A predefined constant of nsISmsService.MESSAGE_CLASS_TYPE_*.
+   * @param aTimestamp
+   *        The device system time when creating or saving this message.
+   * @param aSentTimestamp
+   *        The SMSC timestamp of the incoming message.
+   *        0 if not available.
+   * @param aDeliveryTimestamp
+   *        The delivery timestamp to the remote party of the sent message.
+   *        0 if not available.
+   * @param aRead
+   *        True if the message was read.
+   */
+  void notifySms(in unsigned short aNotificationType,
+                 in long aId,
+                 in unsigned long long aThreadId,
+                 in DOMString aIccId,
+                 in unsigned long aDelivery,
+                 in unsigned long aDeliveryStatus,
+                 in DOMString aSender,
+                 in DOMString aReceiver,
+                 in DOMString aBody,
+                 in unsigned long aMessageClass,
+                 in DOMTimeStamp aTimestamp,
+                 in DOMTimeStamp aSentTimestamp,
+                 in DOMTimeStamp aDeliveryTimestamp,
+                 in boolean aRead);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/interfaces/nsISmsService.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/interfaces/nsISmsService.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/mobilemessage/interfaces/nsISmsService.idl	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/mobilemessage/interfaces/nsISmsService.idl	2014-11-26 21:46:02.000000000 +0000
@@ -12,9 +12,35 @@
 #define SMS_SERVICE_CONTRACTID "@mozilla.org/sms/smsservice;1"
 %}
 
-[scriptable, builtinclass, uuid(cb7d7b60-01f1-4241-a0ae-2ff035c3fbe5)]
+[scriptable, builtinclass, uuid(8f86d068-698e-11e4-9470-8f75a088b84a)]
 interface nsISmsService : nsISupports
 {
+  /**
+   * Constant definitions of predefined GSM Message Class
+   * See 3GPP TS 23.038 clause 4 SMS Data Coding Scheme
+   */
+  const unsigned short MESSAGE_CLASS_TYPE_CLASS_0 = 0;
+  const unsigned short MESSAGE_CLASS_TYPE_CLASS_1 = 1;
+  const unsigned short MESSAGE_CLASS_TYPE_CLASS_2 = 2;
+  const unsigned short MESSAGE_CLASS_TYPE_CLASS_3 = 3;
+  const unsigned short MESSAGE_CLASS_TYPE_NORMAL  = 6;
+
+  /**
+   * Constant definitions of SMS Delivery
+   */
+  const unsigned short DELIVERY_TYPE_RECEIVED = 0;
+  const unsigned short DELIVERY_TYPE_SENDING  = 1;
+  const unsigned short DELIVERY_TYPE_SENT     = 2;
+  const unsigned short DELIVERY_TYPE_ERROR    = 3;
+
+  /**
+   * Constant definitions of SMS Delivery Status
+   */
+  const unsigned short DELIVERY_STATUS_TYPE_NOT_APPLICABLE = 0;
+  const unsigned short DELIVERY_STATUS_TYPE_SUCCESS        = 1;
+  const unsigned short DELIVERY_STATUS_TYPE_PENDING        = 2;
+  const unsigned short DELIVERY_STATUS_TYPE_ERROR          = 3;
+
   readonly attribute unsigned long smsDefaultServiceId;
 
   void getSegmentInfoForText(in DOMString text,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/moz.build	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/moz.build	2014-11-26 21:46:02.000000000 +0000
@@ -105,6 +105,7 @@
     'xul',
     'resourcestats',
     'manifest',
+    'vr',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/nfc_consts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/nfc_consts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/nfc_consts.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/nfc_consts.js	2014-11-26 21:46:02.000000000 +0000
@@ -19,8 +19,8 @@
 this.DEBUG_ALL = false;
 
 // Set individually to debug specific layers
-this.DEBUG_CONTENT_HELPER = false || DEBUG_ALL;
-this.DEBUG_NFC = false || DEBUG_ALL;
+this.DEBUG_CONTENT_HELPER = DEBUG_ALL || false;
+this.DEBUG_NFC = DEBUG_ALL || false;
 
 // Gecko specific error codes
 this.NFC_GECKO_SUCCESS = 0;
@@ -37,11 +37,9 @@
 this.NFC_ERROR_MSG[this.NFC_GECKO_ERROR_SEND_FILE_FAILED] = "NfcSendFileFailed";
 this.NFC_ERROR_MSG[this.NFC_GECKO_ERROR_BAD_SESSION_TOKEN] = "NfcBadSessionToken";
 
-// NFC powerlevels must match config PDUs.
-this.NFC_POWER_LEVEL_UNKNOWN        = -1;
-this.NFC_POWER_LEVEL_DISABLED       = 0;
-this.NFC_POWER_LEVEL_LOW            = 1;
-this.NFC_POWER_LEVEL_ENABLED        = 2;
+this.NFC_RF_STATE_IDLE = "idle";
+this.NFC_RF_STATE_LISTEN = "listen";
+this.NFC_RF_STATE_DISCOVERY = "discovery";
 
 this.TOPIC_MOZSETTINGS_CHANGED      = "mozsettings-changed";
 this.TOPIC_XPCOM_SHUTDOWN           = "xpcom-shutdown";
@@ -53,6 +51,7 @@
 this.TAG_EVENT_FOUND = 0x03;
 this.TAG_EVENT_LOST  = 0x04;
 this.PEER_EVENT_FOUND = 0x05;
+this.RF_EVENT_STATE_CHANGE = 0x06;
 
 // Allow this file to be imported via Components.utils.import().
 this.EXPORTED_SYMBOLS = Object.keys(this);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcGonkMessage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcGonkMessage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcGonkMessage.h	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcGonkMessage.h	2014-11-26 21:46:02.000000000 +0000
@@ -8,20 +8,21 @@
 namespace mozilla {
 
 #define NFCD_MAJOR_VERSION 1
-#define NFCD_MINOR_VERSION 15
+#define NFCD_MINOR_VERSION 17
 
 enum NfcRequest {
-  PowerReq = 0,
+  ChangeRFStateReq = 0,
   ConnectReq,
   CloseReq,
   ReadNDEFReq,
   WriteNDEFReq,
   MakeReadOnlyReq,
+  FormatReq,
 };
 
 enum NfcResponse {
   GeneralRsp = 1000,
-  PowerRsp,
+  ChangeRFStateRsp,
   ReadNDEFRsp,
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/Nfc.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/Nfc.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/Nfc.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/Nfc.js	2014-11-26 21:46:02.000000000 +0000
@@ -40,7 +40,7 @@
 
 let debug;
 function updateDebug() {
-  if (DEBUG) {
+  if (DEBUG || NFC.DEBUG_NFC) {
     debug = function (s) {
       dump("-*- Nfc: " + s + "\n");
     };
@@ -59,7 +59,8 @@
 ];
 
 const NFC_IPC_MSG_NAMES = [
-  "NFC:CheckSessionToken"
+  "NFC:CheckSessionToken",
+  "NFC:QueryInfo"
 ];
 
 const NFC_IPC_READ_PERM_MSG_NAMES = [
@@ -71,6 +72,7 @@
 const NFC_IPC_WRITE_PERM_MSG_NAMES = [
   "NFC:WriteNDEF",
   "NFC:MakeReadOnly",
+  "NFC:Format",
   "NFC:SendFile",
   "NFC:RegisterPeerReadyTarget",
   "NFC:UnregisterPeerReadyTarget"
@@ -80,9 +82,7 @@
   "NFC:CheckP2PRegistration",
   "NFC:NotifyUserAcceptedP2P",
   "NFC:NotifySendFileStatus",
-  "NFC:StartPoll",
-  "NFC:StopPoll",
-  "NFC:PowerOff"
+  "NFC:ChangeRFState"
 ];
 
 XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
@@ -109,10 +109,12 @@
     init: function init(nfc) {
       this.nfc = nfc;
 
-      let lock = gSettingsService.createLock();
-      lock.get(NFC.SETTING_NFC_DEBUG, this.nfc);
+      if (!NFC.DEBUG_NFC) {
+        let lock = gSettingsService.createLock();
+        lock.get(NFC.SETTING_NFC_DEBUG, this.nfc);
+        Services.obs.addObserver(this, NFC.TOPIC_MOZSETTINGS_CHANGED, false);
+      }
 
-      Services.obs.addObserver(this, NFC.TOPIC_MOZSETTINGS_CHANGED, false);
       Services.obs.addObserver(this, NFC.TOPIC_XPCOM_SHUTDOWN, false);
       this._registerMessageListeners();
     },
@@ -267,6 +269,13 @@
       }
     },
 
+    onRFStateChange: function onRFStateChange(rfState) {
+      for (let target of this.eventListeners) {
+        this.notifyDOMEvent(target, { event: NFC.RF_EVENT_STATE_CHANGE,
+                                      rfState: rfState});
+      }
+    },
+
     /**
      * nsIMessageListener interface methods.
      */
@@ -452,7 +461,7 @@
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsINfcGonkEventListener]),
 
-  powerLevel: NFC.NFC_POWER_LEVEL_UNKNOWN,
+  rfState: null,
 
   nfcService: null,
 
@@ -555,17 +564,19 @@
      case "HCIEventTransactionNotification":
         this.notifyHCIEventTransaction(message);
         break;
-     case "PowerResponse":
+     case "ChangeRFStateResponse":
+        this.sendNfcResponse(message);
+
         if (!message.errorMsg) {
-          this.powerLevel = message.powerLevel;
+          this.rfState = message.rfState;
+          gMessageManager.onRFStateChange(this.rfState);
         }
-
-        this.sendNfcResponse(message);
         break;
       case "ConnectResponse": // Fall through.
       case "CloseResponse":
       case "ReadNDEFResponse":
       case "MakeReadOnlyResponse":
+      case "FormatResponse":
       case "WriteNDEFResponse":
         this.sendNfcResponse(message);
         break;
@@ -598,33 +609,24 @@
    * Process a message from the gMessageManager.
    */
   receiveMessage: function receiveMessage(message) {
-    let isPowerAPI = message.name == "NFC:StartPoll" ||
-                     message.name == "NFC:StopPoll"  ||
-                     message.name == "NFC:PowerOff";
-
-    if (!isPowerAPI) {
-      if (this.powerLevel != NFC.NFC_POWER_LEVEL_ENABLED) {
-        debug("NFC is not enabled. current powerLevel:" + this.powerLevel);
-        this.sendNfcErrorResponse(message, NFC.NFC_GECKO_ERROR_NOT_ENABLED);
-        return null;
-      }
+    let isRFAPI = message.name == "NFC:ChangeRFState";
+    let isSendFile = message.name == "NFC:SendFile";
+    let isInfoAPI = message.name == "NFC:QueryInfo";
+
+    if (!isRFAPI && !isInfoAPI && (this.rfState != NFC.NFC_RF_STATE_DISCOVERY)) {
+      debug("NFC is not enabled. current rfState:" + this.rfState);
+      this.sendNfcErrorResponse(message, NFC.NFC_GECKO_ERROR_NOT_ENABLED);
+      return null;
+    }
 
+    if (!isRFAPI && !isSendFile && !isInfoAPI) {
       // Update the current sessionId before sending to the NFC service.
       message.data.sessionId = SessionHelper.getId(message.data.sessionToken);
     }
 
     switch (message.name) {
-      case "NFC:StartPoll":
-        message.data.powerLevel = NFC.NFC_POWER_LEVEL_ENABLED;
-        this.sendToNfcService("power", message.data);
-        break;
-      case "NFC:StopPoll":
-        message.data.powerLevel = NFC.NFC_POWER_LEVEL_LOW;
-        this.sendToNfcService("power", message.data);
-        break;
-      case "NFC:PowerOff":
-        message.data.powerLevel = NFC.NFC_POWER_LEVEL_DISABLED;
-        this.sendToNfcService("power", message.data);
+      case "NFC:ChangeRFState":
+        this.sendToNfcService("changeRFState", message.data);
         break;
       case "NFC:ReadNDEF":
         this.sendToNfcService("readNDEF", message.data);
@@ -636,6 +638,9 @@
       case "NFC:MakeReadOnly":
         this.sendToNfcService("makeReadOnly", message.data);
         break;
+      case "NFC:Format":
+        this.sendToNfcService("format", message.data);
+        break;
       case "NFC:Connect":
         this.sendToNfcService("connect", message.data);
         break;
@@ -653,6 +658,8 @@
         gSystemMessenger.broadcastMessage("nfc-manager-send-file",
                                            message.data);
         break;
+      case "NFC:QueryInfo":
+        return {rfState: this.rfState};
       default:
         debug("UnSupported : Message Name " + message.name);
         return null;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcMessageHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcMessageHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcMessageHandler.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcMessageHandler.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -16,17 +16,19 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
-static const char* kPowerRequest = "power";
+static const char* kChangeRFStateRequest = "changeRFState";
 static const char* kReadNDEFRequest = "readNDEF";
 static const char* kWriteNDEFRequest = "writeNDEF";
 static const char* kMakeReadOnlyRequest = "makeReadOnly";
+static const char* kFormatRequest = "format";
 static const char* kConnectRequest = "connect";
 static const char* kCloseRequest = "close";
 
-static const char* kPowerResponse = "PowerResponse";
+static const char* kChangeRFStateResponse = "ChangeRFStateResponse";
 static const char* kReadNDEFResponse = "ReadNDEFResponse";
 static const char* kWriteNDEFResponse = "WriteNDEFResponse";
 static const char* kMakeReadOnlyResponse = "MakeReadOnlyResponse";
+static const char* kFormatResponse = "FormatResponse";
 static const char* kConnectResponse = "ConnectResponse";
 static const char* kCloseResponse = "CloseResponse";
 
@@ -42,8 +44,8 @@
   bool result;
   const char* type = NS_ConvertUTF16toUTF8(aOptions.mType).get();
 
-  if (!strcmp(type, kPowerRequest)) {
-    result = PowerRequest(aParcel, aOptions);
+  if (!strcmp(type, kChangeRFStateRequest)) {
+    result = ChangeRFStateRequest(aParcel, aOptions);
   } else if (!strcmp(type, kReadNDEFRequest)) {
     result = ReadNDEFRequest(aParcel, aOptions);
   } else if (!strcmp(type, kWriteNDEFRequest)) {
@@ -52,6 +54,9 @@
   } else if (!strcmp(type, kMakeReadOnlyRequest)) {
     result = MakeReadOnlyRequest(aParcel, aOptions);
     mPendingReqQueue.AppendElement(NfcRequest::MakeReadOnlyReq);
+  } else if (!strcmp(type, kFormatRequest)) {
+    result = FormatRequest(aParcel, aOptions);
+    mPendingReqQueue.AppendElement(NfcRequest::FormatReq);
   } else if (!strcmp(type, kConnectRequest)) {
     result = ConnectRequest(aParcel, aOptions);
     mPendingReqQueue.AppendElement(NfcRequest::ConnectReq);
@@ -76,8 +81,8 @@
     case NfcResponse::GeneralRsp:
       result = GeneralResponse(aParcel, aOptions);
       break;
-    case NfcResponse::PowerRsp:
-      result = PowerResponse(aParcel, aOptions);
+    case NfcResponse::ChangeRFStateRsp:
+      result = ChangeRFStateResponse(aParcel, aOptions);
       break;
     case NfcResponse::ReadNDEFRsp:
       result = ReadNDEFResponse(aParcel, aOptions);
@@ -117,6 +122,9 @@
     case NfcRequest::MakeReadOnlyReq:
       type = kMakeReadOnlyResponse;
       break;
+    case NfcRequest::FormatReq:
+      type = kFormatResponse;
+      break;
     case NfcRequest::ConnectReq:
       type = kConnectResponse;
       break;
@@ -139,27 +147,24 @@
 }
 
 bool
-NfcMessageHandler::PowerRequest(Parcel& aParcel, const CommandOptions& aOptions)
+NfcMessageHandler::ChangeRFStateRequest(Parcel& aParcel, const CommandOptions& aOptions)
 {
-  aParcel.writeInt32(NfcRequest::PowerReq);
-  aParcel.writeInt32(aOptions.mPowerLevel);
+  aParcel.writeInt32(NfcRequest::ChangeRFStateReq);
+  aParcel.writeInt32(aOptions.mRfState);
   mRequestIdQueue.AppendElement(aOptions.mRequestId);
-  mPowerLevelQueue.AppendElement(aOptions.mPowerLevel);
   return true;
 }
 
 bool
-NfcMessageHandler::PowerResponse(const Parcel& aParcel, EventOptions& aOptions)
+NfcMessageHandler::ChangeRFStateResponse(const Parcel& aParcel, EventOptions& aOptions)
 {
-  aOptions.mType = NS_ConvertUTF8toUTF16(kPowerResponse);
+  aOptions.mType = NS_ConvertUTF8toUTF16(kChangeRFStateResponse);
   aOptions.mErrorCode = aParcel.readInt32();
   NS_ENSURE_TRUE(!mRequestIdQueue.IsEmpty(), false);
   aOptions.mRequestId = mRequestIdQueue[0];
   mRequestIdQueue.RemoveElementAt(0);
 
-  NS_ENSURE_TRUE(!mPowerLevelQueue.IsEmpty(), false);
-  aOptions.mPowerLevel = mPowerLevelQueue[0];
-  mPowerLevelQueue.RemoveElementAt(0);
+  aOptions.mRfState = aParcel.readInt32();
   return true;
 }
 
@@ -208,6 +213,15 @@
   aParcel.writeInt32(aOptions.mSessionId);
   mRequestIdQueue.AppendElement(aOptions.mRequestId);
   return true;
+}
+
+bool
+NfcMessageHandler::FormatRequest(Parcel& aParcel, const CommandOptions& aOptions)
+{
+  aParcel.writeInt32(NfcRequest::FormatReq);
+  aParcel.writeInt32(aOptions.mSessionId);
+  mRequestIdQueue.AppendElement(aOptions.mRequestId);
+  return true;
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcMessageHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcMessageHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcMessageHandler.h	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcMessageHandler.h	2014-11-26 21:46:02.000000000 +0000
@@ -25,12 +25,13 @@
 
 private:
   bool GeneralResponse(const android::Parcel& aParcel, EventOptions& aOptions);
-  bool PowerRequest(android::Parcel& aParcel, const CommandOptions& options);
-  bool PowerResponse(const android::Parcel& aParcel, EventOptions& aOptions);
+  bool ChangeRFStateRequest(android::Parcel& aParcel, const CommandOptions& options);
+  bool ChangeRFStateResponse(const android::Parcel& aParcel, EventOptions& aOptions);
   bool ReadNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
   bool ReadNDEFResponse(const android::Parcel& aParcel, EventOptions& aOptions);
   bool WriteNDEFRequest(android::Parcel& aParcel, const CommandOptions& options);
   bool MakeReadOnlyRequest(android::Parcel& aParcel, const CommandOptions& options);
+  bool FormatRequest(android::Parcel& aParcel, const CommandOptions& options);
   bool ConnectRequest(android::Parcel& aParcel, const CommandOptions& options);
   bool CloseRequest(android::Parcel& aParcel, const CommandOptions& options);
 
@@ -45,7 +46,6 @@
 private:
   nsTArray<int32_t> mPendingReqQueue;
   nsTArray<nsString> mRequestIdQueue;
-  nsTArray<int32_t> mPowerLevelQueue;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcOptions.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcOptions.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcOptions.h	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcOptions.h	2014-11-26 21:46:02.000000000 +0000
@@ -25,16 +25,16 @@
 #define COPY_FIELD(prop) prop = aOther.prop;
 
 #define COPY_OPT_FIELD(prop, defaultValue)            \
-  if (aOther.prop.WasPassed()) {                      \
-    prop = aOther.prop.Value();                       \
-  } else {                                            \
-    prop = defaultValue;                              \
-  }
+  prop = aOther.prop.WasPassed() ? aOther.prop.Value() : defaultValue;
 
     COPY_FIELD(mType)
     COPY_FIELD(mRequestId)
     COPY_OPT_FIELD(mSessionId, 0)
-    COPY_OPT_FIELD(mPowerLevel, 0)
+
+    mRfState = aOther.mRfState.WasPassed() ?
+                 static_cast<int32_t>(aOther.mRfState.Value()) :
+                 0;
+
     COPY_OPT_FIELD(mTechType, 0)
     COPY_OPT_FIELD(mIsP2P, false)
 
@@ -76,7 +76,7 @@
   nsString mType;
   int32_t mSessionId;
   nsString mRequestId;
-  int32_t mPowerLevel;
+  int32_t mRfState;
   int32_t mTechType;
   bool mIsP2P;
   nsTArray<NDEFRecordStruct> mRecords;
@@ -87,7 +87,7 @@
   EventOptions()
     : mType(EmptyString()), mStatus(-1), mErrorCode(-1), mSessionId(-1), mRequestId(EmptyString()),
       mMajorVersion(-1), mMinorVersion(-1),
-      mTagType(-1), mMaxNDEFSize(-1), mIsReadOnly(-1), mIsFormatable(-1), mPowerLevel(-1),
+      mTagType(-1), mMaxNDEFSize(-1), mIsReadOnly(-1), mIsFormatable(-1), mRfState(-1),
       mOriginType(-1), mOriginIndex(-1)
   {}
 
@@ -104,7 +104,7 @@
   int32_t mMaxNDEFSize;
   int32_t mIsReadOnly;
   int32_t mIsFormatable;
-  int32_t mPowerLevel;
+  int32_t mRfState;
 
   int32_t mOriginType;
   int32_t mOriginIndex;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/gonk/NfcService.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/gonk/NfcService.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -104,7 +104,13 @@
     COPY_OPT_FIELD(mSessionId, -1)
     COPY_OPT_FIELD(mMajorVersion, -1)
     COPY_OPT_FIELD(mMinorVersion, -1)
-    COPY_OPT_FIELD(mPowerLevel, -1)
+
+    if (mEvent.mRfState != -1) {
+      event.mRfState.Construct();
+      RFState rfState = static_cast<RFState>(mEvent.mRfState);
+      MOZ_ASSERT(rfState < RFState::EndGuard_);
+      event.mRfState.Value() = rfState;
+    }
 
     if (mEvent.mErrorCode != -1) {
       event.mErrorMsg.Construct();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/NfcContentHelper.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/NfcContentHelper.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/NfcContentHelper.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/NfcContentHelper.js	2014-11-26 21:46:02.000000000 +0000
@@ -37,7 +37,7 @@
 
 let debug;
 function updateDebug() {
-  if (DEBUG) {
+  if (DEBUG || NFC.DEBUG_CONTENT_HELPER) {
     debug = function (s) {
       dump("-*- NfcContentHelper: " + s + "\n");
     };
@@ -54,12 +54,13 @@
   "NFC:ReadNDEFResponse",
   "NFC:WriteNDEFResponse",
   "NFC:MakeReadOnlyResponse",
+  "NFC:FormatResponse",
   "NFC:ConnectResponse",
   "NFC:CloseResponse",
   "NFC:CheckP2PRegistrationResponse",
   "NFC:DOMEvent",
   "NFC:NotifySendFileStatusResponse",
-  "NFC:PowerResponse"
+  "NFC:ChangeRFStateResponse"
 ];
 
 XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
@@ -88,6 +89,7 @@
 
   _window: null,
   _requestMap: null,
+  _rfState: null,
   eventListener: null,
 
   init: function init(aWindow) {
@@ -98,7 +100,7 @@
     this._window = aWindow;
     this.initDOMRequestHelper(this._window, NFC_IPC_MSG_NAMES);
 
-    if (this._window.navigator.mozSettings) {
+    if (!NFC.DEBUG_CONTENT_HELPER && this._window.navigator.mozSettings) {
       let lock = this._window.navigator.mozSettings.createLock();
       var nfcDebug = lock.get(NFC.SETTING_NFC_DEBUG);
       nfcDebug.onsuccess = function _nfcDebug() {
@@ -106,6 +108,13 @@
         updateDebug();
       };
     }
+
+    let info = cpmm.sendSyncMessage("NFC:QueryInfo")[0];
+    this._rfState = info.rfState;
+  },
+
+  queryRFState: function queryRFState() {
+    return this._rfState;
   },
 
   encodeNDEFRecords: function encodeNDEFRecords(records) {
@@ -138,22 +147,19 @@
   },
 
   // NFCTag interface
-  readNDEF: function readNDEF(sessionToken) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  readNDEF: function readNDEF(sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     cpmm.sendAsyncMessage("NFC:ReadNDEF", {
       requestId: requestId,
       sessionToken: sessionToken
     });
-    return request;
   },
 
-  writeNDEF: function writeNDEF(records, sessionToken) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  writeNDEF: function writeNDEF(records, sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     let encodedRecords = this.encodeNDEFRecords(records);
     cpmm.sendAsyncMessage("NFC:WriteNDEF", {
@@ -161,57 +167,58 @@
       sessionToken: sessionToken,
       records: encodedRecords
     });
-    return request;
   },
 
-  makeReadOnlyNDEF: function makeReadOnlyNDEF(sessionToken) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  makeReadOnly: function makeReadOnly(sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     cpmm.sendAsyncMessage("NFC:MakeReadOnly", {
       requestId: requestId,
       sessionToken: sessionToken
     });
-    return request;
   },
 
-  connect: function connect(techType, sessionToken) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  format: function format(sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
+
+    cpmm.sendAsyncMessage("NFC:Format", {
+      requestId: requestId,
+      sessionToken: sessionToken
+    });
+  },
+
+  connect: function connect(techType, sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     cpmm.sendAsyncMessage("NFC:Connect", {
       requestId: requestId,
       sessionToken: sessionToken,
       techType: techType
     });
-    return request;
   },
 
-  close: function close(sessionToken) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  close: function close(sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     cpmm.sendAsyncMessage("NFC:Close", {
       requestId: requestId,
       sessionToken: sessionToken
     });
-    return request;
   },
 
-  sendFile: function sendFile(data, sessionToken) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  sendFile: function sendFile(data, sessionToken, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     cpmm.sendAsyncMessage("NFC:SendFile", {
       requestId: requestId,
       sessionToken: sessionToken,
       blob: data.blob
     });
-    return request;
   },
 
   notifySendFileStatus: function notifySendFileStatus(status, requestId) {
@@ -234,16 +241,14 @@
     cpmm.sendAsyncMessage("NFC:UnregisterPeerReadyTarget", { appId: appId });
   },
 
-  checkP2PRegistration: function checkP2PRegistration(appId) {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
+  checkP2PRegistration: function checkP2PRegistration(appId, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
 
     cpmm.sendAsyncMessage("NFC:CheckP2PRegistration", {
       appId: appId,
       requestId: requestId
     });
-    return request;
   },
 
   notifyUserAcceptedP2P: function notifyUserAcceptedP2P(appId) {
@@ -252,34 +257,13 @@
     });
   },
 
-  startPoll: function startPoll() {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
-
-    cpmm.sendAsyncMessage("NFC:StartPoll",
-                          {requestId: requestId});
-    return request;
-  },
-
-  stopPoll: function stopPoll() {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
-
-    cpmm.sendAsyncMessage("NFC:StopPoll",
-                          {requestId: requestId});
-    return request;
-  },
-
-  powerOff: function powerOff() {
-    let request = Services.DOMRequest.createRequest(this._window);
-    let requestId = btoa(this.getRequestId(request));
-    this._requestMap[requestId] = this._window;
-
-    cpmm.sendAsyncMessage("NFC:PowerOff",
-                          {requestId: requestId});
-    return request;
+  changeRFState: function changeRFState(rfState, callback) {
+    let requestId = callback.getCallbackId();
+    this._requestMap[requestId] = callback;
+
+    cpmm.sendAsyncMessage("NFC:ChangeRFState",
+                          {requestId: requestId,
+                           rfState: rfState});
   },
 
   // nsIObserver
@@ -300,31 +284,6 @@
   },
 
   // nsIMessageListener
-
-  fireRequestSuccess: function fireRequestSuccess(requestId, result) {
-    let request = this.takeRequest(requestId);
-    if (!request) {
-      debug("not firing success for id: " + requestId);
-      return;
-    }
-
-    debug("fire request success, id: " + requestId);
-    Services.DOMRequest.fireSuccess(request, result);
-  },
-
-  fireRequestError: function fireRequestError(requestId, errorMsg) {
-    let request = this.takeRequest(requestId);
-    if (!request) {
-      debug("not firing error for id: " + requestId +
-            ", errormsg: " + errorMsg);
-      return;
-    }
-
-    debug("fire request error, id: " + requestId +
-          ", errormsg: " + errorMsg);
-    Services.DOMRequest.fireError(request, errorMsg);
-  },
-
   receiveMessage: function receiveMessage(message) {
     DEBUG && debug("Message received: " + JSON.stringify(message));
     let result = message.json;
@@ -340,13 +299,10 @@
       case "NFC:CloseResponse":
       case "NFC:WriteNDEFResponse":
       case "NFC:MakeReadOnlyResponse":
+      case "NFC:FormatResponse":
       case "NFC:NotifySendFileStatusResponse":
-      case "NFC:PowerResponse":
-        if (result.errorMsg) {
-          this.fireRequestError(atob(result.requestId), result.errorMsg);
-        } else {
-          this.fireRequestSuccess(atob(result.requestId), result);
-        }
+      case "NFC:ChangeRFStateResponse":
+        this.handleGeneralResponse(result);
         break;
       case "NFC:DOMEvent":
         switch (result.event) {
@@ -371,6 +327,10 @@
           case NFC.TAG_EVENT_LOST:
             this.eventListener.notifyTagLost(result.sessionToken);
             break;
+          case NFC.RF_EVENT_STATE_CHANGE:
+            this._rfState = result.rfState;
+            this.eventListener.notifyRFStateChange(this._rfState);
+            break;
         }
         break;
     }
@@ -385,37 +345,60 @@
     }
   },
 
+  handleGeneralResponse: function handleReadNDEFResponse(result) {
+    let requestId = result.requestId;
+    let callback = this._requestMap[requestId];
+    if (!callback) {
+      debug("not firing message " + result.type + " for id: " + requestId);
+      return;
+    }
+    delete this._requestMap[requestId];
+
+    if (result.errorMsg) {
+      callback.notifyError(result.errorMsg);
+    } else {
+      callback.notifySuccess();
+    }
+  },
+
   handleReadNDEFResponse: function handleReadNDEFResponse(result) {
-    let requester = this._requestMap[result.requestId];
-    if (!requester) {
-      debug("Response Invalid requestId=" + result.requestId);
+    let requestId = result.requestId;
+    let callback = this._requestMap[requestId];
+    if (!callback) {
+      debug("not firing message handleReadNDEFResponse for id: " + requestId);
       return;
     }
-    delete this._requestMap[result.requestId];
+    delete this._requestMap[requestId];
 
     if (result.errorMsg) {
-      this.fireRequestError(atob(result.requestId), result.errorMsg);
+      callback.notifyError(result.errorMsg);
       return;
     }
 
-    let requestId = atob(result.requestId);
     let ndefMsg = [];
     let records = result.records;
     for (let i = 0; i < records.length; i++) {
       let record = records[i];
-      ndefMsg.push(new requester.MozNDEFRecord({tnf: record.tnf,
-                                                type: record.type,
-                                                id: record.id,
-                                                payload: record.payload}));
+      ndefMsg.push(new this._window.MozNDEFRecord({tnf: record.tnf,
+                                                   type: record.type,
+                                                   id: record.id,
+                                                   payload: record.payload}));
     }
-    this.fireRequestSuccess(requestId, ndefMsg);
+    callback.notifySuccessWithNDEFRecords(ndefMsg);
   },
 
   handleCheckP2PRegistrationResponse: function handleCheckP2PRegistrationResponse(result) {
+    let requestId = result.requestId;
+    let callback = this._requestMap[requestId];
+    if (!callback) {
+      debug("not firing message handleCheckP2PRegistrationResponse for id: " + requestId);
+      return;
+    }
+    delete this._requestMap[requestId];
+
     // Privilaged status API. Always fire success to avoid using exposed props.
     // The receiver must check the boolean mapped status code to handle.
-    let requestId = atob(result.requestId);
-    this.fireRequestSuccess(requestId, !result.errorMsg);
+    callback.notifySuccessWithBoolean(!result.errorMsg);
   },
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/nsINfcContentHelper.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/nsINfcContentHelper.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/nsINfcContentHelper.idl	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/nsINfcContentHelper.idl	2014-11-26 21:46:02.000000000 +0000
@@ -3,9 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
-#include "nsIDOMDOMRequest.idl"
 
 interface nsIVariant;
+interface nsIDOMWindow;
 
 [scriptable, uuid(9b43bdda-52f4-4712-b28c-ad7cba736e14)]
 interface nsINfcTagEvent : nsISupports
@@ -22,7 +22,7 @@
   readonly attribute boolean isFormatable;
 };
 
-[scriptable, uuid(42c7a85f-59ae-4bde-b961-e1f1436476c3)]
+[scriptable, uuid(fcbd98d6-3d04-4657-bd64-1164e311b399)]
 interface nsINfcEventListener : nsISupports
 {
   /**
@@ -63,24 +63,121 @@
    *        SessionToken received from parent process
    */
   void notifyPeerLost(in DOMString sessionToken);
+
+  /**
+   * Callback function used to notify RF state change.
+   *
+   * @param rfState
+   *        RF state received from parent process
+   */
+  void notifyRFStateChange(in DOMString rfState);
 };
 
-[scriptable, uuid(632cd911-06bf-410b-a91e-8afa4e200e3b)]
-interface nsINfcContentHelper : nsISupports
+[scriptable, uuid(a8ef3590-d853-4766-b54a-a4547da4dde4)]
+interface nsINfcRequestCallback : nsISupports
 {
-  const long NFC_EVENT_PEER_READY = 0x01;
-  const long NFC_EVENT_PEER_LOST  = 0x02;
+  DOMString getCallbackId();
 
+  void notifySuccess();
+
+  void notifySuccessWithBoolean(in boolean result);
+
+  void notifySuccessWithNDEFRecords(in nsIVariant records);
+
+  void notifyError(in DOMString errorMsg);
+};
+
+[scriptable, uuid(bcf214de-885b-43e6-9e53-9b7d880e1633)]
+interface nsINfcContentHelper : nsISupports
+{
   void init(in nsIDOMWindow window);
 
   boolean checkSessionToken(in DOMString sessionToken, in boolean isP2P);
 
-  nsIDOMDOMRequest readNDEF(in DOMString sessionToken);
-  nsIDOMDOMRequest writeNDEF(in nsIVariant records, in DOMString sessionToken);
-  nsIDOMDOMRequest makeReadOnly(in DOMString sessionToken);
+  /**
+   * Read current NDEF data on the tag.
+   *
+   * @param sessionToken
+   *        Current token
+   *
+   * @param callback
+   *        Called when request is finished
+   */
+  void readNDEF(in DOMString sessionToken,
+                in nsINfcRequestCallback callback);
+
+  /**
+   * Write NDEF data to a peer device or a tag.
+   *
+   * @param records
+   *        NDEF records to be written
+   *
+   * @param sessionToken
+   *        Current token
+   *
+   * @param callback
+   *        Called when request is finished
+   */
+  void writeNDEF(in nsIVariant records,
+                 in DOMString sessionToken,
+                 in nsINfcRequestCallback callback);
 
-  nsIDOMDOMRequest connect(in unsigned long techType, in DOMString sessionToken);
-  nsIDOMDOMRequest close(in DOMString sessionToken);
+  /**
+   * Make a tag read-only
+   *
+   * @param sessionToken
+   *        Current token
+   *
+   * @param callback
+   *        Called when request is finished
+   */
+  void makeReadOnly(in DOMString sessionToken,
+                    in nsINfcRequestCallback callback);
+
+  /**
+   * Format a tag as NDEF
+   *
+   * @param sessionToken
+   *        Current token
+   *
+   * @param callback
+   *        Called when request is finished
+   */
+  void format(in DOMString sessionToken,
+              in nsINfcRequestCallback callback);
+
+  /**
+   * Enable I/O operations to the tag
+   *
+   * @param techType
+   *        Interface to a technology in a Tag
+   *
+   * @param sessionToken
+   *        Current token
+   *
+   * @param callback
+   *        Called when request is finished
+   */
+  void connect(in unsigned long techType,
+               in DOMString sessionToken,
+               in nsINfcRequestCallback callback);
+
+  /**
+   * Disable I/O operations to the tag
+   *
+   * @param sessionToken
+   *        Current token
+   *
+   * @param callback
+   *        Called when request is finished
+   */
+  void close(in DOMString sessionToken,
+             in nsINfcRequestCallback callback);
+
+  /**
+   * Get current RF state.
+   */
+  DOMString queryRFState();
 
   /**
    * Initiate send file operation.
@@ -93,11 +190,12 @@
    * @param sessionToken
    *        Current token
    *
-   * Returns DOMRequest, if initiation of send file operation is successful
-   * then 'onsuccess' is called else 'onerror'
+   * @param callback
+   *        Called when request is finished
    */
-  nsIDOMDOMRequest sendFile(in jsval blob,
-                            in DOMString sessionToken);
+  void sendFile(in jsval blob,
+                in DOMString sessionToken,
+                in nsINfcRequestCallback callback);
 
   /**
    * Add the event listener.
@@ -129,9 +227,11 @@
    * @param appId
    *        Application ID to be updated with parent process
    *
-   * Returns DOMRequest, if appId is registered then 'onsuccess' is called else 'onerror'
+   * @param callback
+   *        Called when request is finished
    */
-  nsIDOMDOMRequest checkP2PRegistration(in unsigned long appId);
+  void checkP2PRegistration(in unsigned long appId,
+                            in nsINfcRequestCallback callback);
 
   /**
    * Notify the parent process that user has accepted to share nfc message on P2P UI
@@ -154,17 +254,13 @@
                             in DOMString requestId);
 
   /**
-   * Power on the NFC hardware and start polling for NFC tags or devices.
-   */
-  nsIDOMDOMRequest startPoll();
-
-  /**
-   * Stop polling for NFC tags or devices. i.e. enter low power mode.
-   */
-  nsIDOMDOMRequest stopPoll();
-
-  /**
-   * Power off the NFC hardware.
+   * Change RF state.
+   *
+   * @param rfState. Possible values are 'idle', 'listen' and 'discovery'.
+   *
+   * @param callback
+   *        Called when request is finished
    */
-  nsIDOMDOMRequest powerOff();
+  void changeRFState(in DOMString rfState,
+                     in nsINfcRequestCallback callback);
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/nsNfc.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/nsNfc.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/nsNfc.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/nsNfc.js	2014-11-26 21:46:02.000000000 +0000
@@ -17,12 +17,78 @@
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this,
                                    "appsService",
                                    "@mozilla.org/AppsService;1",
                                    "nsIAppsService");
 
+function NfcCallback(aWindow) {
+  this.initDOMRequestHelper(aWindow, null);
+  this._createPromise();
+}
+NfcCallback.prototype = {
+  __proto__: DOMRequestIpcHelper.prototype,
+
+  promise: null,
+  _requestId: null,
+
+  _createPromise: function _createPromise() {
+    this.promise = this.createPromise((aResolve, aReject) => {
+      this._requestId = btoa(this.getPromiseResolverId({
+        resolve: aResolve,
+        reject: aReject
+      }));
+    });
+  },
+
+  getCallbackId: function getCallbackId() {
+    return this._requestId;
+  },
+
+  notifySuccess: function notifySuccess() {
+    let resolver = this.takePromiseResolver(atob(this._requestId));
+    if (!resolver) {
+      debug("can not find promise resolver for id: " + this._requestId);
+      return;
+    }
+    resolver.resolve();
+  },
+
+  notifySuccessWithBoolean: function notifySuccessWithBoolean(aResult) {
+    let resolver = this.takePromiseResolver(atob(this._requestId));
+    if (!resolver) {
+      debug("can not find promise resolver for id: " + this._requestId);
+      return;
+    }
+    resolver.resolve(aResult);
+  },
+
+  notifySuccessWithNDEFRecords: function notifySuccessWithNDEFRecords(aRecords) {
+    let resolver = this.takePromiseResolver(atob(this._requestId));
+    if (!resolver) {
+      debug("can not find promise resolver for id: " + this._requestId);
+      return;
+    }
+    resolver.resolve(aRecords);
+  },
+
+  notifyError: function notifyError(aErrorMsg) {
+    let resolver = this.takePromiseResolver(atob(this._requestId));
+    if (!resolver) {
+      debug("can not find promise resolver for id: " + this._requestId +
+           ", errormsg: " + aErrorMsg);
+      return;
+    }
+    resolver.reject(aErrorMsg);
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
+                                         Ci.nsIObserver,
+                                         Ci.nsINfcRequestCallback]),
+};
+
 /**
  * Implementation of NFCTag.
  *
@@ -64,7 +130,9 @@
       throw new this._window.DOMError("InvalidStateError", "NFCTag object is invalid");
     }
 
-    return this._nfcContentHelper.readNDEF(this.session);
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.readNDEF(this.session, callback);
+    return callback.promise;
   },
 
   writeNDEF: function writeNDEF(records) {
@@ -85,7 +153,9 @@
       throw new this._window.DOMError("NotSupportedError", "Exceed max NDEF size");
     }
 
-    return this._nfcContentHelper.writeNDEF(records, this.session);
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.writeNDEF(records, this.session, callback);
+    return callback.promise;
   },
 
   makeReadOnly: function makeReadOnly() {
@@ -98,7 +168,24 @@
                                       "NFCTag object cannot be made read-only");
     }
 
-    return this._nfcContentHelper.makeReadOnly(this.session);
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.makeReadOnly(this.session, callback);
+    return callback.promise;
+  },
+
+  format: function format() {
+    if (this.isLost) {
+      throw new this._window.DOMError("InvalidStateError", "NFCTag object is invalid");
+    }
+
+    if (!this.isFormatable) {
+      throw new this._window.DOMError("InvalidAccessError",
+                                      "NFCTag object is not formatable");
+    }
+
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.format(this.session, callback);
+    return callback.promise;
   },
 
   classID: Components.ID("{4e1e2e90-3137-11e3-aa6e-0800200c9a66}"),
@@ -133,7 +220,9 @@
     }
 
     // Just forward sendNDEF to writeNDEF
-    return this._nfcContentHelper.writeNDEF(records, this.session);
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.writeNDEF(records, this.session, callback);
+    return callback.promise;
   },
 
   sendFile: function sendFile(blob) {
@@ -144,8 +233,11 @@
     let data = {
       "blob": blob
     };
-    return this._nfcContentHelper.sendFile(Cu.cloneInto(data, this._window),
-                                           this.session);
+
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.sendFile(Cu.cloneInto(data, this._window),
+                                    this.session, callback);
+    return callback.promise;
   },
 
   classID: Components.ID("{c1b2bcf0-35eb-11e3-aa6e-0800200c9a66}"),
@@ -166,13 +258,24 @@
     debug("No NFC support.")
   }
 
+  this.eventService = Cc["@mozilla.org/eventlistenerservice;1"]
+                        .getService(Ci.nsIEventListenerService);
   this._nfcContentHelper.addEventListener(this);
 }
 MozNFCImpl.prototype = {
   _nfcContentHelper: null,
   _window: null,
+  _rfState: null,
   nfcPeer: null,
   nfcTag: null,
+  eventService: null,
+
+  // Should be mapped to the RFState defined in WebIDL.
+  rfState: {
+    IDLE: "idle",
+    LISTEN: "listen",
+    DISCOVERY: "discovery"
+  },
 
   init: function init(aWindow) {
     debug("MozNFCImpl init called");
@@ -185,6 +288,7 @@
 
     if (this._nfcContentHelper) {
       this._nfcContentHelper.init(aWindow);
+      this._rfState = this._nfcContentHelper.queryRFState();
     }
   },
 
@@ -194,7 +298,10 @@
   checkP2PRegistration: function checkP2PRegistration(manifestUrl) {
     // Get the AppID and pass it to ContentHelper
     let appID = appsService.getAppLocalIdByManifestURL(manifestUrl);
-    return this._nfcContentHelper.checkP2PRegistration(appID);
+
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.checkP2PRegistration(appID, callback);
+    return callback.promise;
   },
 
   notifyUserAcceptedP2P: function notifyUserAcceptedP2P(manifestUrl) {
@@ -208,15 +315,21 @@
   },
 
   startPoll: function startPoll() {
-    return this._nfcContentHelper.startPoll();
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.changeRFState(this.rfState.DISCOVERY, callback);
+    return callback.promise;
   },
 
   stopPoll: function stopPoll() {
-    return this._nfcContentHelper.stopPoll();
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.changeRFState(this.rfState.LISTEN, callback);
+    return callback.promise;
   },
 
   powerOff: function powerOff() {
-    return this._nfcContentHelper.powerOff();
+    let callback = new NfcCallback(this._window);
+    this._nfcContentHelper.changeRFState(this.rfState.IDLE, callback);
+    return callback.promise;
   },
 
   _createNFCPeer: function _createNFCPeer(sessionToken) {
@@ -230,7 +343,7 @@
     }
 
     if (!this.nfcPeer || this.nfcPeer.session != sessionToken) {
-      this.nfcPeer = this._createNFCPeer();
+      this.nfcPeer = this._createNFCPeer(sessionToken);
     }
 
     return this.nfcPeer;
@@ -271,10 +384,18 @@
       return;
     }
 
+    if (!this.eventService.hasListenersFor(this.__DOM_IMPL__, "tagfound")) {
+      debug("ontagfound is not registered.");
+      return;
+    }
+
     if (!this.checkPermissions(["nfc-read", "nfc-write"])) {
       return;
     }
 
+    this.eventService.addSystemEventListener(this._window, "visibilitychange",
+      this, /* useCapture */false);
+
     let tagImpl = new MozNFCTagImpl(this._window, sessionToken, event);
     let tag = this._window.MozNFCTag._create(this._window, tagImpl);
     this.nfcTag = tag;
@@ -309,11 +430,20 @@
       return;
     }
 
-    if (this.nfcTag && (this.nfcTag.session == sessionToken)) {
-      this.nfcTag.isLost = true;
-      this.nfcTag = null;
+    if (!this.nfcTag) {
+      debug("No NFCTag object existing.");
+      return;
+    }
+
+    // Remove system event listener only when tag and peer are both lost.
+    if (!this.nfcPeer) {
+      this.eventService.removeSystemEventListener(this._window, "visibilitychange",
+        this, /* useCapture */false);
     }
 
+    this.nfcTag.isLost = true;
+    this.nfcTag = null;
+
     debug("fire ontaglost " + sessionToken);
     let event = new this._window.Event("taglost");
     this.__DOM_IMPL__.dispatchEvent(event);
@@ -325,11 +455,19 @@
       return;
     }
 
+    if (!isPeerReady &&
+        !this.eventService.hasListenersFor(this.__DOM_IMPL__, "peerfound")) {
+      debug("onpeerfound is not registered.");
+      return;
+    }
+
     if (!this.checkPermissions(["nfc-write"])) {
       return;
     }
 
-    this.session = sessionToken;
+    this.eventService.addSystemEventListener(this._window, "visibilitychange",
+      this, /* useCapture */false);
+
     this.nfcPeer = this._createNFCPeer(sessionToken);
     let eventData = { "peer": this.nfcPeer };
     let type = (isPeerReady) ? "peerready" : "peerfound";
@@ -349,23 +487,45 @@
       return;
     }
 
-    if (sessionToken != this.session) {
-      dump("Unpaired session for notifyPeerLost." + sessionToken);
+    if (!this.nfcPeer) {
+      debug("No NFCPeer object existing.");
       return;
     }
 
-    if (this.nfcPeer && (this.nfcPeer.session == sessionToken)) {
-      this.nfcPeer.isLost = true;
-      this.nfcPeer = null;
+    // Remove system event listener only when tag and peer are both lost.
+    if (!this.nfcTag) {
+      this.eventService.removeSystemEventListener(this._window, "visibilitychange",
+        this, /* useCapture */false);
     }
 
-    this.session = null;
+    this.nfcPeer.isLost = true;
+    this.nfcPeer = null;
 
     debug("fire onpeerlost");
     let event = new this._window.Event("peerlost");
     this.__DOM_IMPL__.dispatchEvent(event);
   },
 
+  handleEvent: function handleEvent (event) {
+    if (!this._window.document.hidden) {
+      return;
+    }
+
+    if (this.nfcTag) {
+      debug("handleEvent notifyTagLost");
+      this.notifyTagLost(this.nfcTag.session);
+    }
+
+    if (this.nfcPeer) {
+      debug("handleEvent notifyPeerLost");
+      this.notifyPeerLost(this.nfcPeer.session);
+    }
+  },
+
+  notifyRFStateChange: function notifyRFStateChange(rfState) {
+    this._rfState = rfState;
+  },
+
   checkPermissions: function checkPermissions(perms) {
     let principal = this._window.document.nodePrincipal;
     for (let perm of perms) {
@@ -389,8 +549,49 @@
   contractID: "@mozilla.org/navigatorNfc;1",
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
                                          Ci.nsIDOMGlobalPropertyInitializer,
-                                         Ci.nsINfcEventListener]),
+                                         Ci.nsINfcEventListener,
+                                         Ci.nsIDOMEventListener]),
+};
+
+function NFCSendFileWrapper() {
+}
+NFCSendFileWrapper.prototype = {
+  // nsISystemMessagesWrapper implementation.
+  wrapMessage: function wrapMessage(aMessage, aWindow) {
+    let peerImpl = new MozNFCPeerImpl(aWindow, aMessage.sessionToken);
+    let peer = aWindow.MozNFCPeer._create(aWindow, peerImpl);
+
+    delete aMessage.sessionToken;
+    aMessage = Cu.cloneInto(aMessage, aWindow);
+    aMessage.peer = peer;
+    return aMessage;
+  },
+
+  classDescription: "NFCSendFileWrapper",
+  classID: Components.ID("{c5063a5c-8cb9-41d2-baf5-56062a2e30e9}"),
+  contractID: "@mozilla.org/dom/system-messages/wrapper/nfc-manager-send-file;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISystemMessagesWrapper])
+};
+
+function NFCTechDiscoveredWrapper() {
+}
+NFCTechDiscoveredWrapper.prototype = {
+  // nsISystemMessagesWrapper implementation.
+  wrapMessage: function wrapMessage(aMessage, aWindow) {
+    aMessage = Cu.cloneInto(aMessage, aWindow);
+    if (aMessage.techList.indexOf("P2P") != -1) {
+      let peerImpl = new MozNFCPeerImpl(aWindow, aMessage.sessionToken);
+      let peer = aWindow.MozNFCPeer._create(aWindow, peerImpl);
+      aMessage.peer = peer;
+    }
+    return aMessage;
+  },
+
+  classDescription: "NFCTechDiscoveredWrapper",
+  classID: Components.ID("{2e7f9285-3c72-4e1f-b985-141a00a23a75}"),
+  contractID: "@mozilla.org/dom/system-messages/wrapper/nfc-manager-tech-discovered;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISystemMessagesWrapper])
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MozNFCTagImpl,
-  MozNFCPeerImpl, MozNFCImpl]);
+  MozNFCPeerImpl, MozNFCImpl, NFCSendFileWrapper, NFCTechDiscoveredWrapper]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/nsNfc.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/nsNfc.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/nsNfc.manifest	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/nsNfc.manifest	2014-11-26 21:46:02.000000000 +0000
@@ -6,3 +6,9 @@
 
 component {c1b2bcf0-35eb-11e3-aa6e-0800200c9a66} nsNfc.js
 contract @mozilla.org/nfc/NFCPeer;1 {c1b2bcf0-35eb-11e3-aa6e-0800200c9a66}
+
+component {c5063a5c-8cb9-41d2-baf5-56062a2e30e9} nsNfc.js
+contract @mozilla.org/dom/system-messages/wrapper/nfc-manager-send-file;1 {c5063a5c-8cb9-41d2-baf5-56062a2e30e9}
+
+component {2e7f9285-3c72-4e1f-b985-141a00a23a75} nsNfc.js
+contract @mozilla.org/dom/system-messages/wrapper/nfc-manager-tech-discovered;1 {2e7f9285-3c72-4e1f-b985-141a00a23a75}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/head.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/head.js	2014-11-26 21:46:02.000000000 +0000
@@ -194,22 +194,20 @@
 function toggleNFC(enabled) {
   let deferred = Promise.defer();
 
-  let req;
+  let promise;
   if (enabled) {
-    req = nfc.startPoll();
+    promise = nfc.startPoll();
   } else {
-    req = nfc.powerOff();
+    promise = nfc.powerOff();
   }
 
-  req.onsuccess = function() {
+  promise.then(() => {
     deferred.resolve();
-  };
-
-  req.onerror = function() {
+  }).catch(() => {
     ok(false, 'operation failed, error ' + req.error.name);
     deferred.reject();
     finish();
-  };
+  });
 
   return deferred.promise;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_checkP2PRegistration.js	2014-11-26 21:46:02.000000000 +0000
@@ -111,16 +111,14 @@
 function fireCheckP2PReg(manifestUrl) {
   let deferred = Promise.defer();
 
-  let request = nfc.checkP2PRegistration(manifestUrl);
-  request.onsuccess = function() {
+  let promise = nfc.checkP2PRegistration(manifestUrl);
+  promise.then(() => {
     ok(true, 'checkP2PRegistration allways results in success');
     deferred.resolve(request.result);
-  };
-
-  request.onerror = function() {
+  }).catch(() => {
     ok(false, 'see NfcContentHelper.handleCheckP2PRegistrationResponse');
     deferred.reject();
-  };
+  });
 
   return deferred.promise;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_enabled.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_enabled.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_enabled.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_enabled.js	2014-11-26 21:46:02.000000000 +0000
@@ -6,41 +6,38 @@
 
 function testEnableNFC() {
   log('Running \'testEnableNFC\'');
-  let req = nfc.startPoll();
-  req.onsuccess = function () {
+  let promise = nfc.startPoll();
+  promise.then(() => {
     ok(true);
     runNextTest();
-  };
-  req.onerror = function () {
+  }).catch(() => {
     ok(false, "startPoll failed");
     runNextTest();
-  };
+  });
 }
 
 function testDisableNFC() {
   log('Running \'testDisableNFC\'');
-  let req = nfc.powerOff();
-  req.onsuccess = function () {
+  let promise = nfc.powerOff();
+  promise.then(() => {
     ok(true);
     runNextTest();
-  };
-  req.onerror = function () {
+  }).catch(() => {
     ok(false, "powerOff failed");
     runNextTest();
-  };
+  });
 }
 
 function testStopPollNFC() {
   log('Running \'testStopPollNFC\'');
-  let req = nfc.stopPoll();
-  req.onsuccess = function () {
+  let promise = nfc.stopPoll();
+  promise.then(() => {
     ok(true);
     runNextTest();
-  };
-  req.onerror = function () {
+  }).catch(() => {
     ok(false, "stopPoll failed");
     runNextTest();
-  };
+  });
 }
 
 let tests = [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_peer.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_peer.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_peer.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_peer.js	2014-11-26 21:46:02.000000000 +0000
@@ -44,20 +44,18 @@
 
   nfc.onpeerready = peerReadyCb;
 
-  let request = nfc.checkP2PRegistration(INCORRECT_MANIFEST_URL);
-  request.onsuccess = function (evt) {
+  let promise = nfc.checkP2PRegistration(INCORRECT_MANIFEST_URL);
+  promise.then(evt => {
     is(request.result, false, "check for P2P registration result");
 
     nfc.onpeerready = null;
     NCI.deactivate().then(() => toggleNFC(false)).then(runNextTest);
-  }
-
-  request.onerror = function () {
+  }).catch(() => {
     ok(false, "checkP2PRegistration failed.");
 
     nfc.onpeerready = null;
     NCI.deactivate().then(() => toggleNFC(false)).then(runNextTest);
-  }
+  });
 }
 
 function testPeerReady() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js	2014-11-26 21:46:02.000000000 +0000
@@ -13,8 +13,8 @@
   let ndef = [new MozNDEFRecord({tnf: tnf, type: type, payload: payload})];
 
   let peer = window.navigator.mozNfc.getNFCPeer(sessionToken);
-  let req = peer.sendNDEF(ndef);
-  req.onsuccess = function() {
+  let promise = peer.sendNDEF(ndef);
+  promise.then(() => {
     log("Successfully sent NDEF message");
 
     let cmd = "nfc snep put -1 -1"; /* read last SNEP PUT from emulator */
@@ -24,11 +24,10 @@
       NDEF.compare(ndef, NDEF.parseString(result.pop()));
       toggleNFC(false).then(runNextTest);
     });
-  };
-  req.onerror = function() {
+  }).catch(() => {
     ok(false, "Failed to send NDEF message, error \'" + this.error + "\'");
     toggleNFC(false).then(runNextTest);
-  };
+  });
 }
 
 function handleTechnologyDiscoveredRE0(msg) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsJSNPRuntime.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsJSNPRuntime.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsJSNPRuntime.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsJSNPRuntime.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -1274,8 +1274,7 @@
     }
   }
 
-  if (!npobj->_class->removeProperty(npobj, identifier))
-    *succeeded = false;
+  *succeeded = npobj->_class->removeProperty(npobj, identifier);
 
   return ReportExceptionIfPending(cx);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -952,7 +952,7 @@
   mContentTexture->Release(aTextureInfo);
 }
 
-AndroidSurfaceTexture* nsNPAPIPluginInstance::CreateSurfaceTexture()
+TemporaryRef<AndroidSurfaceTexture> nsNPAPIPluginInstance::CreateSurfaceTexture()
 {
   if (!EnsureGLContext())
     return nullptr;
@@ -961,14 +961,15 @@
   if (!texture)
     return nullptr;
 
-  AndroidSurfaceTexture* surface = AndroidSurfaceTexture::Create(TexturePoolOGL::GetGLContext(),
-                                                                 texture);
-  if (!surface)
+  RefPtr<AndroidSurfaceTexture> surface = AndroidSurfaceTexture::Create(TexturePoolOGL::GetGLContext(),
+                                                                        texture);
+  if (!surface) {
     return nullptr;
+  }
 
   nsCOMPtr<nsIRunnable> frameCallback = NS_NewRunnableMethod(this, &nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable);
   surface->SetFrameAvailableCallback(frameCallback);
-  return surface;
+  return surface.forget();
 }
 
 void nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable()
@@ -1009,9 +1010,10 @@
 
 void* nsNPAPIPluginInstance::AcquireVideoWindow()
 {
-  AndroidSurfaceTexture* surface = CreateSurfaceTexture();
-  if (!surface)
+  RefPtr<AndroidSurfaceTexture> surface = CreateSurfaceTexture();
+  if (!surface) {
     return nullptr;
+  }
 
   VideoInfo* info = new VideoInfo(surface);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h	2014-11-26 21:46:03.000000000 +0000
@@ -207,7 +207,7 @@
       mSurfaceTexture = nullptr;
     }
 
-    nsRefPtr<mozilla::gl::AndroidSurfaceTexture> mSurfaceTexture;
+    mozilla::RefPtr<mozilla::gl::AndroidSurfaceTexture> mSurfaceTexture;
     gfxRect mDimensions;
   };
 
@@ -328,8 +328,8 @@
   bool mFullScreen;
   bool mInverted;
 
-  nsRefPtr<SharedPluginTexture> mContentTexture;
-  nsRefPtr<mozilla::gl::AndroidSurfaceTexture> mContentSurface;
+  mozilla::RefPtr<SharedPluginTexture> mContentTexture;
+  mozilla::RefPtr<mozilla::gl::AndroidSurfaceTexture> mContentSurface;
 #endif
 
   enum {
@@ -378,7 +378,7 @@
 
 #ifdef MOZ_WIDGET_ANDROID
   void EnsureSharedTexture();
-  mozilla::gl::AndroidSurfaceTexture* CreateSurfaceTexture();
+  mozilla::TemporaryRef<mozilla::gl::AndroidSurfaceTexture> CreateSurfaceTexture();
 
   std::map<void*, VideoInfo*> mVideos;
   bool mOnScreen;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsPluginHost.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsPluginHost.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsPluginHost.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsPluginHost.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -3070,23 +3070,35 @@
   if (NS_FAILED(rv))
     return rv;
 
-  if (!principal) {
-    principal = do_CreateInstance("@mozilla.org/nullprincipal;1", &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
   // @arg loadgroup:
   // do not add this internal plugin's channel on the
   // load group otherwise this channel could be canceled
   // form |nsDocShell::OnLinkClickSync| bug 166613
   nsCOMPtr<nsIChannel> channel;
-  rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                             url,
-                             doc,
-                             principal,
-                             nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
-                             nsIContentPolicy::TYPE_OBJECT_SUBREQUEST,
-                             nullptr,  // aLoadGroup 
-                             listenerPeer);
+  nsCOMPtr<nsINode> requestingNode(do_QueryInterface(element));
+  if (requestingNode) {
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       url,
+                       requestingNode,
+                       nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
+                       nsIContentPolicy::TYPE_OBJECT_SUBREQUEST,
+                       nullptr,  // aLoadGroup
+                       listenerPeer);
+  }
+  else {
+    // in this else branch we really don't know where the load is coming
+    // from and in fact should use something better than just using
+    // a nullPrincipal as the loadingPrincipal.
+    principal = do_CreateInstance("@mozilla.org/nullprincipal;1", &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       url,
+                       principal,
+                       nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
+                       nsIContentPolicy::TYPE_OBJECT_SUBREQUEST,
+                       nullptr,  // aLoadGroup
+                       listenerPeer);
+  }
 
   if (NS_FAILED(rv))
     return rv;
@@ -3110,6 +3122,7 @@
       // errors about malformed requests if we include it in POSTs. See
       // bug 724465.
       nsCOMPtr<nsIURI> referer;
+      net::ReferrerPolicy referrerPolicy = net::RP_Default;
 
       nsCOMPtr<nsIObjectLoadingContent> olc = do_QueryInterface(element);
       if (olc)
@@ -3121,9 +3134,10 @@
           return NS_ERROR_FAILURE;
         }
         referer = doc->GetDocumentURI();
+        referrerPolicy = doc->GetReferrerPolicy();
       }
 
-      rv = httpChannel->SetReferrer(referer);
+      rv = httpChannel->SetReferrerWithPolicy(referer, referrerPolicy);
       NS_ENSURE_SUCCESS(rv,rv);
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -2820,7 +2820,7 @@
   nsIPresShell* presShell = nsContentUtils::FindPresShellForDocument(mContent->OwnerDoc());
   if (presShell) {
     scaleFactor = double(nsPresContext::AppUnitsPerCSSPixel())/
-      presShell->GetPresContext()->DeviceContext()->UnscaledAppUnitsPerDevPixel();
+      presShell->GetPresContext()->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
   }
 #endif
   *result = scaleFactor;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsPluginStreamListenerPeer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsPluginStreamListenerPeer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/base/nsPluginStreamListenerPeer.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/base/nsPluginStreamListenerPeer.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsPluginStreamListenerPeer.h"
+#include "nsIDOMElement.h"
 #include "nsIStreamConverterService.h"
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
@@ -640,8 +641,11 @@
   nsresult rv = NS_OK;
 
   nsRefPtr<nsPluginInstanceOwner> owner = mPluginInstance->GetOwner();
+  nsCOMPtr<nsIDOMElement> element;
   nsCOMPtr<nsIDocument> doc;
   if (owner) {
+    rv = owner->GetDOMElement(getter_AddRefs(element));
+    NS_ENSURE_SUCCESS(rv, rv);
     rv = owner->GetDocument(getter_AddRefs(doc));
     NS_ENSURE_SUCCESS(rv, rv);
   }
@@ -649,22 +653,33 @@
   nsCOMPtr<nsIInterfaceRequestor> callbacks = do_QueryReferent(mWeakPtrChannelCallbacks);
   nsCOMPtr<nsILoadGroup> loadGroup = do_QueryReferent(mWeakPtrChannelLoadGroup);
 
-  nsCOMPtr<nsIPrincipal> principal = doc ? doc->NodePrincipal() : nullptr;
-  if (!principal) {
-    principal = do_CreateInstance("@mozilla.org/nullprincipal;1", &rv);
+  nsCOMPtr<nsIChannel> channel;
+  nsCOMPtr<nsINode> requestingNode(do_QueryInterface(element));
+  if (requestingNode) {
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       mURL,
+                       requestingNode,
+                       nsILoadInfo::SEC_NORMAL,
+                       nsIContentPolicy::TYPE_OTHER,
+                       loadGroup,
+                       callbacks);
+  }
+  else {
+    // in this else branch we really don't know where the load is coming
+    // from and in fact should use something better than just using
+    // a nullPrincipal as the loadingPrincipal.
+    nsCOMPtr<nsIPrincipal> principal =
+      do_CreateInstance("@mozilla.org/nullprincipal;1", &rv);
     NS_ENSURE_SUCCESS(rv, rv);
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       mURL,
+                       principal,
+                       nsILoadInfo::SEC_NORMAL,
+                       nsIContentPolicy::TYPE_OTHER,
+                       loadGroup,
+                       callbacks);
   }
 
-  nsCOMPtr<nsIChannel> channel;
-  rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                             mURL,
-                             doc,
-                             principal,
-                             nsILoadInfo::SEC_NORMAL,
-                             nsIContentPolicy::TYPE_OTHER,
-                             loadGroup,
-                             callbacks);
-
   if (NS_FAILED(rv))
     return rv;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/moz.build	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/moz.build	2014-11-26 21:46:03.000000000 +0000
@@ -70,8 +70,9 @@
     GENERATED_SOURCES += [
         'moc_NestedLoopTimer.cpp',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'NestedLoopTimer.cpp',
+        'PluginHelperQt.cpp',
     ]
 
 UNIFIED_SOURCES += [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginHelperQt.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginHelperQt.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginHelperQt.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginHelperQt.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 3; 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 "PluginHelperQt.h"
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEventLoop>
+
+static const int kMaxtimeToProcessEvents = 30;
+
+bool
+PluginHelperQt::AnswerProcessSomeEvents()
+{
+    QCoreApplication::processEvents(QEventLoop::AllEvents, kMaxtimeToProcessEvents);
+    return true;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginHelperQt.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginHelperQt.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginHelperQt.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginHelperQt.h	2014-11-26 21:46:03.000000000 +0000
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 3; 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 PluginHelperQt_h_
+#define PluginHelperQt_h_
+
+class PluginHelperQt
+{
+public:
+  static bool AnswerProcessSomeEvents();
+};
+
+#endif // PluginHelperQt_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleChild.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleChild.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -821,10 +821,7 @@
 const char*
 PluginModuleChild::GetUserAgent()
 {
-    if (mUserAgent.IsVoid() && !CallNPN_UserAgent(&mUserAgent))
-        return nullptr;
-
-    return NullableStringGet(mUserAgent);
+    return NullableStringGet(Settings().userAgent());
 }
 
 //-----------------------------------------------------------------------------
@@ -1120,18 +1117,21 @@
 #endif
             return NPERR_GENERIC_ERROR;
 
-        case NPNVjavascriptEnabledBool: // Intentional fall-through
-        case NPNVasdEnabledBool: // Intentional fall-through
-        case NPNVisOfflineBool: // Intentional fall-through
-        case NPNVSupportsXEmbedBool: // Intentional fall-through
-        case NPNVSupportsWindowless: { // Intentional fall-through
-            NPError result;
-            bool value;
-            PluginModuleChild::GetChrome()->
-                CallNPN_GetValue_WithBoolReturn(aVariable, &result, &value);
-            *(NPBool*)aValue = value ? true : false;
-            return result;
-        }
+        case NPNVjavascriptEnabledBool:
+            *(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().javascriptEnabled();
+            return NPERR_NO_ERROR;
+        case NPNVasdEnabledBool:
+            *(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().asdEnabled();
+            return NPERR_NO_ERROR;
+        case NPNVisOfflineBool:
+            *(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().isOffline();
+            return NPERR_NO_ERROR;
+        case NPNVSupportsXEmbedBool:
+            *(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().supportsXembed();
+            return NPERR_NO_ERROR;
+        case NPNVSupportsWindowless:
+            *(NPBool*)aValue = PluginModuleChild::GetChrome()->Settings().supportsWindowless();
+            return NPERR_NO_ERROR;
 #if defined(MOZ_WIDGET_GTK)
         case NPNVxDisplay: {
             if (aNPP) {
@@ -1835,6 +1835,13 @@
 //-----------------------------------------------------------------------------
 
 bool
+PluginModuleChild::RecvSettingChanged(const PluginSettings& aSettings)
+{
+    mCachedSettings = aSettings;
+    return true;
+}
+
+bool
 PluginModuleChild::AnswerNP_GetEntryPoints(NPError* _retval)
 {
     PLUGIN_LOG_DEBUG_METHOD;
@@ -1852,12 +1859,14 @@
 }
 
 bool
-PluginModuleChild::AnswerNP_Initialize(NPError* _retval)
+PluginModuleChild::AnswerNP_Initialize(const PluginSettings& aSettings, NPError* _retval)
 {
     PLUGIN_LOG_DEBUG_METHOD;
     AssertPluginThread();
     MOZ_ASSERT(mIsChrome);
 
+    mCachedSettings = aSettings;
+
 #ifdef OS_WIN
     SetEventHooks();
 #endif
@@ -2361,7 +2370,37 @@
 #endif
 
 bool
-PluginModuleChild::AnswerGeckoGetProfile(nsCString* aProfile) {
+PluginModuleChild::RecvStartProfiler(const uint32_t& aEntries,
+                                     const double& aInterval,
+                                     const nsTArray<nsCString>& aFeatures,
+                                     const nsTArray<nsCString>& aThreadNameFilters)
+{
+    nsTArray<const char*> featureArray;
+    for (size_t i = 0; i < aFeatures.Length(); ++i) {
+        featureArray.AppendElement(aFeatures[i].get());
+    }
+
+    nsTArray<const char*> threadNameFilterArray;
+    for (size_t i = 0; i < aThreadNameFilters.Length(); ++i) {
+        threadNameFilterArray.AppendElement(aThreadNameFilters[i].get());
+    }
+
+    profiler_start(aEntries, aInterval, featureArray.Elements(), featureArray.Length(),
+                   threadNameFilterArray.Elements(), threadNameFilterArray.Length());
+
+    return true;
+}
+
+bool
+PluginModuleChild::RecvStopProfiler()
+{
+    profiler_stop();
+    return true;
+}
+
+bool
+PluginModuleChild::AnswerGetProfile(nsCString* aProfile)
+{
     char* profile = profiler_get_profile();
     if (profile != nullptr) {
         *aProfile = nsCString(profile, strlen(profile));
@@ -2371,4 +2410,3 @@
     }
     return true;
 }
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleChild.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleChild.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleChild.h	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleChild.h	2014-11-26 21:46:03.000000000 +0000
@@ -72,9 +72,11 @@
 
     virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;
 
+    virtual bool RecvSettingChanged(const PluginSettings& aSettings) MOZ_OVERRIDE;
+
     // Implement the PPluginModuleChild interface
     virtual bool AnswerNP_GetEntryPoints(NPError* rv) MOZ_OVERRIDE;
-    virtual bool AnswerNP_Initialize(NPError* rv) MOZ_OVERRIDE;
+    virtual bool AnswerNP_Initialize(const PluginSettings& aSettings, NPError* rv) MOZ_OVERRIDE;
 
     virtual PPluginModuleChild*
     AllocPPluginModuleChild(mozilla::ipc::Transport* aTransport,
@@ -140,8 +142,12 @@
     virtual bool
     RecvProcessNativeEventsInInterruptCall() MOZ_OVERRIDE;
 
-    virtual bool
-    AnswerGeckoGetProfile(nsCString* aProfile) MOZ_OVERRIDE;
+    virtual bool RecvStartProfiler(const uint32_t& aEntries,
+                                   const double& aInterval,
+                                   const nsTArray<nsCString>& aFeatures,
+                                   const nsTArray<nsCString>& aThreadNameFilters) MOZ_OVERRIDE;
+    virtual bool RecvStopProfiler() MOZ_OVERRIDE;
+    virtual bool AnswerGetProfile(nsCString* aProfile) MOZ_OVERRIDE;
 
 public:
     PluginModuleChild(bool aIsChrome);
@@ -226,9 +232,7 @@
     }
 
     bool GetNativeCursorsSupported() {
-        bool supported = false;
-        SendGetNativeCursorsSupported(&supported);
-        return supported;
+        return Settings().nativeCursorsSupported();
     }
 #endif
 
@@ -278,6 +282,8 @@
 
     int GetQuirks() { return mQuirks; }
 
+    const PluginSettings& Settings() const { return mCachedSettings; }
+
 private:
     void AddQuirk(PluginQuirks quirk) {
       if (mQuirks == QUIRKS_NOT_INITIALIZED)
@@ -318,6 +324,8 @@
 
     NPPluginFuncs mFunctions;
 
+    PluginSettings mCachedSettings;
+
 #if defined(MOZ_WIDGET_GTK)
     // If a plugin spins a nested glib event loop in response to a
     // synchronous IPC message from the browser, the loop might break
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleParent.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleParent.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -5,10 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef MOZ_WIDGET_QT
-// Must be included first to avoid conflicts.
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEventLoop>
-#include "NestedLoopTimer.h"
+#include "PluginHelperQt.h"
 #endif
 
 #include "mozilla/plugins/PluginModuleParent.h"
@@ -40,6 +37,7 @@
 #endif
 
 #ifdef MOZ_ENABLE_PROFILER_SPS
+#include "nsIProfiler.h"
 #include "nsIProfileSaveEvent.h"
 #endif
 
@@ -99,29 +97,82 @@
     return PPluginModule::Bridge(aContentParent, chromeParent);
 }
 
-PluginModuleContentParent* PluginModuleContentParent::sSavedModuleParent;
+// A linked list used to fetch newly created PluginModuleContentParent instances
+// for LoadModule. Each pending LoadModule call owns an element in this list.
+// The element's mModule field is filled in when the new
+// PluginModuleContentParent arrives from chrome.
+struct MOZ_STACK_CLASS SavedPluginModule
+{
+    SavedPluginModule() : mModule(nullptr), mNext(sSavedModuleStack)
+    {
+        sSavedModuleStack = this;
+    }
+    ~SavedPluginModule()
+    {
+        MOZ_ASSERT(sSavedModuleStack == this);
+        sSavedModuleStack = mNext;
+    }
+
+    PluginModuleContentParent* GetModule() { return mModule; }
+
+    // LoadModule can be on the stack multiple times since the intr message it
+    // sends will dispatch arbitrary incoming messages from the chrome process,
+    // which can include new HTTP data. This makes it somewhat tricky to match
+    // up the object created in PluginModuleContentParent::Create with the
+    // LoadModule call that asked for it.
+    //
+    // Each invocation of LoadModule pushes a new SavedPluginModule object on
+    // the sSavedModuleStack stack, with the most recent invocation at the
+    // front. LoadModule messages are always processed by the chrome process in
+    // order, and PluginModuleContentParent allocation messages will also be
+    // received in order. Therefore, we need to match up the first received
+    // PluginModuleContentParent creation message with the first sent LoadModule
+    // call. This call will be the last one in the list that doesn't already
+    // have a module attached to it.
+    static void SaveModule(PluginModuleContentParent* module)
+    {
+        SavedPluginModule* saved = sSavedModuleStack;
+        SavedPluginModule* prev = nullptr;
+        while (saved && !saved->mModule) {
+            prev = saved;
+            saved = saved->mNext;
+        }
+        MOZ_ASSERT(prev);
+        MOZ_ASSERT(!prev->mModule);
+        prev->mModule = module;
+    }
+
+private:
+    PluginModuleContentParent* mModule;
+    SavedPluginModule* mNext;
+
+    static SavedPluginModule* sSavedModuleStack;
+};
+
+SavedPluginModule* SavedPluginModule::sSavedModuleStack;
 
 /* static */ PluginLibrary*
 PluginModuleContentParent::LoadModule(uint32_t aPluginId)
 {
-    MOZ_ASSERT(!sSavedModuleParent);
+    SavedPluginModule saved;
+
     MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Content);
 
     /*
      * We send a LoadPlugin message to the chrome process using an intr
-     * message. Before it sends its response, it sends a message to create
-     * PluginModuleParent instance. That message is handled by
-     * PluginModuleContentParent::Create, which saves the instance in
-     * sSavedModuleParent. We fetch it from there after LoadPlugin finishes.
+     * message. Before it sends its response, it sends a message to create a
+     * PluginModuleContentParent instance. That message is handled by
+     * PluginModuleContentParent::Create. See SavedPluginModule for details
+     * about how we match up the result of PluginModuleContentParent::Create
+     * with the LoadModule call that requested it.
      */
     dom::ContentChild* cp = dom::ContentChild::GetSingleton();
     if (!cp->CallLoadPlugin(aPluginId)) {
         return nullptr;
     }
 
-    PluginModuleContentParent* parent = sSavedModuleParent;
+    PluginModuleContentParent* parent = saved.GetModule();
     MOZ_ASSERT(parent);
-    sSavedModuleParent = nullptr;
 
     return parent;
 }
@@ -137,8 +188,7 @@
         return nullptr;
     }
 
-    MOZ_ASSERT(!sSavedModuleParent);
-    sSavedModuleParent = parent;
+    SavedPluginModule::SaveModule(parent);
 
     DebugOnly<bool> ok = parent->Open(aTransport, handle, XRE_GetIOMessageLoop(),
                                       mozilla::ipc::ParentSide);
@@ -252,6 +302,8 @@
     Preferences::RegisterCallback(TimeoutChanged, kHangUIMinDisplayPref, this);
 #endif
 
+    RegisterSettingsCallbacks();
+
 #ifdef MOZ_ENABLE_PROFILER_SPS
     InitPluginProfiling();
 #endif
@@ -289,6 +341,8 @@
         UnregisterInjectorCallback(mFlashProcess2);
 #endif
 
+    UnregisterSettingsCallbacks();
+
     Preferences::UnregisterCallback(TimeoutChanged, kChildTimeoutPref, this);
     Preferences::UnregisterCallback(TimeoutChanged, kParentTimeoutPref, this);
 #ifdef XP_WIN
@@ -903,6 +957,9 @@
 #endif
     }
 
+    // We can't broadcast settings changes anymore.
+    UnregisterSettingsCallbacks();
+
     PluginModuleParent::ActorDestroy(why);
 }
 
@@ -1156,13 +1213,6 @@
   i->NPP_URLRedirectNotify(url, status, notifyData);
 }
 
-bool
-PluginModuleParent::AnswerNPN_UserAgent(nsCString* userAgent)
-{
-    *userAgent = NullableString(mNPNIface->uagent(nullptr));
-    return true;
-}
-
 PluginInstanceParent*
 PluginModuleParent::InstCast(NPP instance)
 {
@@ -1262,6 +1312,107 @@
     return i->EndUpdateBackground(aCtx, aRect);
 }
 
+class OfflineObserver MOZ_FINAL : public nsIObserver
+{
+public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIOBSERVER
+
+    explicit OfflineObserver(PluginModuleChromeParent* pmp)
+      : mPmp(pmp)
+    {}
+
+private:
+    ~OfflineObserver() {}
+    PluginModuleChromeParent* mPmp;
+};
+
+NS_IMPL_ISUPPORTS(OfflineObserver, nsIObserver)
+
+NS_IMETHODIMP
+OfflineObserver::Observe(nsISupports *aSubject,
+                         const char *aTopic,
+                         const char16_t *aData)
+{
+    MOZ_ASSERT(!strcmp(aTopic, "ipc:network:set-offline"));
+    mPmp->CachedSettingChanged();
+    return NS_OK;
+}
+
+static const char* kSettingsPrefs[] =
+    {"javascript.enabled",
+     "dom.ipc.plugins.nativeCursorSupport"};
+
+void
+PluginModuleChromeParent::RegisterSettingsCallbacks()
+{
+    for (size_t i = 0; i < ArrayLength(kSettingsPrefs); i++) {
+        Preferences::RegisterCallback(CachedSettingChanged, kSettingsPrefs[i], this);
+    }
+
+    nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
+    if (observerService) {
+        mOfflineObserver = new OfflineObserver(this);
+        observerService->AddObserver(mOfflineObserver, "ipc:network:set-offline", false);
+    }
+}
+
+void
+PluginModuleChromeParent::UnregisterSettingsCallbacks()
+{
+    for (size_t i = 0; i < ArrayLength(kSettingsPrefs); i++) {
+        Preferences::UnregisterCallback(CachedSettingChanged, kSettingsPrefs[i], this);
+    }
+
+    nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
+    if (observerService) {
+        observerService->RemoveObserver(mOfflineObserver, "ipc:network:set-offline");
+        mOfflineObserver = nullptr;
+    }
+}
+
+bool
+PluginModuleParent::GetSetting(NPNVariable aVariable)
+{
+    NPBool boolVal = false;
+    mozilla::plugins::parent::_getvalue(nullptr, aVariable, &boolVal);
+    return boolVal;
+}
+
+void
+PluginModuleParent::GetSettings(PluginSettings* aSettings)
+{
+    aSettings->javascriptEnabled() = GetSetting(NPNVjavascriptEnabledBool);
+    aSettings->asdEnabled() = GetSetting(NPNVasdEnabledBool);
+    aSettings->isOffline() = GetSetting(NPNVisOfflineBool);
+    aSettings->supportsXembed() = GetSetting(NPNVSupportsXEmbedBool);
+    aSettings->supportsWindowless() = GetSetting(NPNVSupportsWindowless);
+    aSettings->userAgent() = NullableString(mNPNIface->uagent(nullptr));
+
+#if defined(XP_MACOSX)
+    aSettings->nativeCursorsSupported() =
+      Preferences::GetBool("dom.ipc.plugins.nativeCursorSupport", false);
+#else
+    // Need to initialize this to satisfy IPDL.
+    aSettings->nativeCursorsSupported() = false;
+#endif
+}
+
+void
+PluginModuleChromeParent::CachedSettingChanged()
+{
+    PluginSettings settings;
+    GetSettings(&settings);
+    unused << SendSettingChanged(settings);
+}
+
+/* static */ void
+PluginModuleChromeParent::CachedSettingChanged(const char* aPref, void* aModule)
+{
+    PluginModuleChromeParent *module = static_cast<PluginModuleChromeParent*>(aModule);
+    module->CachedSettingChanged();
+}
+
 #if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK)
 nsresult
 PluginModuleParent::NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs, NPError* error)
@@ -1277,7 +1428,9 @@
 
     *error = NPERR_NO_ERROR;
     if (IsChrome()) {
-        if (!CallNP_Initialize(error)) {
+        PluginSettings settings;
+        GetSettings(&settings);
+        if (!CallNP_Initialize(settings, error)) {
             Close();
             return NS_ERROR_FAILURE;
         }
@@ -1315,7 +1468,9 @@
     if (NS_FAILED(rv))
         return rv;
 
-    if (!CallNP_Initialize(error)) {
+    PluginSettings settings;
+    GetSettings(&settings);
+    if (!CallNP_Initialize(settings, error)) {
         Close();
         return NS_ERROR_FAILURE;
     }
@@ -1539,25 +1694,12 @@
 }
 #endif // #if defined(XP_MACOSX)
 
-bool
-PluginModuleParent::AnswerNPN_GetValue_WithBoolReturn(const NPNVariable& aVariable,
-                                                      NPError* aError,
-                                                      bool* aBoolVal)
-{
-    NPBool boolVal = false;
-    *aError = mozilla::plugins::parent::_getvalue(nullptr, aVariable, &boolVal);
-    *aBoolVal = boolVal ? true : false;
-    return true;
-}
-
 #if defined(MOZ_WIDGET_QT)
-static const int kMaxtimeToProcessEvents = 30;
 bool
 PluginModuleParent::AnswerProcessSomeEvents()
 {
     PLUGIN_LOG_DEBUG(("Spinning mini nested loop ..."));
-    QCoreApplication::processEvents(QEventLoop::AllEvents, kMaxtimeToProcessEvents);
-
+    PluginHelperQt::AnswerProcessSomeEvents();
     PLUGIN_LOG_DEBUG(("... quitting mini nested loop"));
 
     return true;
@@ -1750,21 +1892,6 @@
 }
 
 bool
-PluginModuleParent::RecvGetNativeCursorsSupported(bool* supported)
-{
-    PLUGIN_LOG_DEBUG(("%s", FULLFUNCTION));
-#if defined(XP_MACOSX)
-    *supported =
-      Preferences::GetBool("dom.ipc.plugins.nativeCursorSupport", false);
-    return true;
-#else
-    NS_NOTREACHED(
-        "PluginInstanceParent::RecvGetNativeCursorSupportLevel not implemented!");
-    return false;
-#endif
-}
-
-bool
 PluginModuleParent::RecvNPN_SetException(const nsCString& aMessage)
 {
     PLUGIN_LOG_DEBUG(("%s", FULLFUNCTION));
@@ -1889,13 +2016,26 @@
                                 const char *aTopic,
                                 const char16_t *aData)
 {
-    nsCOMPtr<nsIProfileSaveEvent> pse = do_QueryInterface(aSubject);
-    if (pse) {
-      nsCString result;
-      bool success = mPmp->CallGeckoGetProfile(&result);
-      if (success && !result.IsEmpty()) {
-          pse->AddSubProfile(result.get());
-      }
+    if (!strcmp(aTopic, "profiler-started")) {
+        nsCOMPtr<nsIProfilerStartParams> params(do_QueryInterface(aSubject));
+        uint32_t entries;
+        double interval;
+        params->GetEntries(&entries);
+        params->GetInterval(&interval);
+        const nsTArray<nsCString>& features = params->GetFeatures();
+        const nsTArray<nsCString>& threadFilterNames = params->GetThreadFilterNames();
+        unused << mPmp->SendStartProfiler(entries, interval, features, threadFilterNames);
+    } else if (!strcmp(aTopic, "profiler-stopped")) {
+        unused << mPmp->SendStopProfiler();
+    } else if (!strcmp(aTopic, "profiler-subprocess")) {
+        nsCOMPtr<nsIProfileSaveEvent> pse = do_QueryInterface(aSubject);
+        if (pse) {
+            nsCString result;
+            bool success = mPmp->CallGetProfile(&result);
+            if (success && !result.IsEmpty()) {
+                pse->AddSubProfile(result.get());
+            }
+        }
     }
     return NS_OK;
 }
@@ -1906,6 +2046,8 @@
     nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
     if (observerService) {
         mProfilerObserver = new PluginProfilerObserver(this);
+        observerService->AddObserver(mProfilerObserver, "profiler-started", false);
+        observerService->AddObserver(mProfilerObserver, "profiler-stopped", false);
         observerService->AddObserver(mProfilerObserver, "profiler-subprocess", false);
     }
 }
@@ -1915,6 +2057,8 @@
 {
     nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
     if (observerService) {
+        observerService->RemoveObserver(mProfilerObserver, "profiler-started");
+        observerService->RemoveObserver(mProfilerObserver, "profiler-stopped");
         observerService->RemoveObserver(mProfilerObserver, "profiler-subprocess");
     }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PluginModuleParent.h	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PluginModuleParent.h	2014-11-26 21:46:03.000000000 +0000
@@ -115,14 +115,6 @@
     virtual bool
     RecvBackUpXResources(const FileDescriptor& aXSocketFd) MOZ_OVERRIDE;
 
-    virtual bool
-    AnswerNPN_UserAgent(nsCString* userAgent) MOZ_OVERRIDE;
-
-    virtual bool
-    AnswerNPN_GetValue_WithBoolReturn(const NPNVariable& aVariable,
-                                      NPError* aError,
-                                      bool* aBoolVal) MOZ_OVERRIDE;
-
     virtual bool AnswerProcessSomeEvents() MOZ_OVERRIDE;
 
     virtual bool
@@ -155,9 +147,6 @@
     RecvPopCursor() MOZ_OVERRIDE;
 
     virtual bool
-    RecvGetNativeCursorsSupported(bool* supported) MOZ_OVERRIDE;
-
-    virtual bool
     RecvNPN_SetException(const nsCString& aMessage) MOZ_OVERRIDE;
 
     virtual bool
@@ -242,6 +231,9 @@
 protected:
     void NotifyPluginCrashed();
 
+    bool GetSetting(NPNVariable aVariable);
+    void GetSettings(PluginSettings* aSettings);
+
     bool mIsChrome;
     bool mShutdown;
     bool mClearSiteDataSupported;
@@ -282,8 +274,6 @@
 #ifdef MOZ_CRASHREPORTER_INJECTOR
     void OnCrash(DWORD processID) MOZ_OVERRIDE {}
 #endif
-
-    static PluginModuleContentParent* sSavedModuleParent;
 };
 
 class PluginModuleChromeParent
@@ -312,6 +302,8 @@
     OnHangUIContinue();
 #endif // XP_WIN
 
+    void CachedSettingChanged();
+
 private:
     virtual void
     EnteredCxxStack() MOZ_OVERRIDE;
@@ -360,8 +352,13 @@
     void ShutdownPluginProfiling();
 #endif
 
+    void RegisterSettingsCallbacks();
+    void UnregisterSettingsCallbacks();
+
     virtual bool RecvNotifyContentModuleDestroyed() MOZ_OVERRIDE;
 
+    static void CachedSettingChanged(const char* aPref, void* aModule);
+
     PluginProcessParent* mSubprocess;
     uint32_t mPluginId;
 
@@ -422,6 +419,8 @@
     DWORD mFlashProcess1;
     DWORD mFlashProcess2;
 #endif
+
+    nsCOMPtr<nsIObserver> mOfflineObserver;
 };
 
 } // namespace plugins
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PPluginModule.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PPluginModule.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/ipc/PPluginModule.ipdl	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/ipc/PPluginModule.ipdl	2014-11-26 21:46:03.000000000 +0000
@@ -17,6 +17,21 @@
 namespace mozilla {
 namespace plugins {
 
+struct PluginSettings
+{
+  // These settings correspond to NPNVariable. They are fetched from
+  // mozilla::plugins::parent::_getvalue.
+  bool javascriptEnabled;
+  bool asdEnabled;
+  bool isOffline;
+  bool supportsXembed;
+  bool supportsWindowless;
+
+  // These settings come from elsewhere.
+  nsCString userAgent;
+  bool nativeCursorsSupported;
+};
+
 intr protocol PPluginModule
 {
   bridges PContent, PPluginModule;
@@ -34,7 +49,7 @@
   intr NP_GetEntryPoints()
     returns (NPError rv);
 
-  intr NP_Initialize()
+  intr NP_Initialize(PluginSettings settings)
     returns (NPError rv);
 
   intr PPluginInstance(nsCString aMimeType,
@@ -66,9 +81,17 @@
   intr PCrashReporter()
     returns (NativeThreadId tid, uint32_t processType);
 
-  intr GeckoGetProfile()
+  /**
+   * Control the Gecko Profiler in the plugin process.
+   */
+  async StartProfiler(uint32_t aEntries, double aInterval, nsCString[] aFeatures,
+                      nsCString[] aThreadNameFilters);
+  async StopProfiler();
+  intr GetProfile()
     returns (nsCString aProfile);
 
+  async SettingChanged(PluginSettings settings);
+
 parent:
   /**
    * This message is only used on X11 platforms.
@@ -83,13 +106,6 @@
    */
   async BackUpXResources(FileDescriptor aXSocketFd);
 
-  intr NPN_UserAgent()
-    returns (nsCString userAgent);
-
-  intr NPN_GetValue_WithBoolReturn(NPNVariable aVariable)
-    returns (NPError aError,
-             bool aBoolVal);
-
   // Wake up and process a few native events.  Periodically called by
   // Gtk-specific code upon detecting that the plugin process has
   // entered a nested event loop.  If the browser doesn't process
@@ -108,7 +124,6 @@
   async ShowCursor(bool show);
   async PushCursor(NSCursorInfo cursorInfo);
   async PopCursor();
-  sync GetNativeCursorsSupported() returns (bool supported);
 
   sync NPN_SetException(nsCString message);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/hang_test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/hang_test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/hang_test.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/hang_test.js	2014-11-26 21:46:03.000000000 +0000
@@ -92,20 +92,19 @@
   var pluginElement = document.getElementById("plugin1");
   is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
 
-  ok(aEvent instanceof Ci.nsIDOMCustomEvent,
+  ok(aEvent instanceof PluginCrashedEvent,
      "plugin crashed event has the right interface");
 
-  var propBag = aEvent.detail.QueryInterface(Ci.nsIPropertyBag2);
-  var pluginDumpID = propBag.getPropertyAsAString("pluginDumpID");
-  isnot(pluginDumpID, "", "got a non-empty dump ID");
-  var pluginName = propBag.getPropertyAsAString("pluginName");
-  is(pluginName, "Test Plug-in", "got correct plugin name");
-  var pluginFilename = propBag.getPropertyAsAString("pluginFilename");
-  isnot(pluginFilename, "", "got a non-empty filename");
-  var didReport = propBag.getPropertyAsBool("submittedCrashReport");
+  is(typeof aEvent.pluginDumpID, "string", "pluginDumpID is correct type");
+  isnot(aEvent.pluginDumpID, "", "got a non-empty dump ID");
+  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
+  is(aEvent.pluginName, "Test Plug-in", "got correct plugin name");
+  is(typeof aEvent.pluginFilename, "string", "pluginFilename is correct type");
+  isnot(aEvent.pluginFilename, "", "got a non-empty filename");
   // The app itself may or may not have decided to submit the report, so
   // allow either true or false here.
-  ok((didReport == true || didReport == false), "event said crash report was submitted");
+  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
+  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
 
   var os = Cc["@mozilla.org/observer-service;1"].
            getService(Ci.nsIObserverService);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/test_crash_notify_no_report.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/test_crash_notify_no_report.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/test_crash_notify_no_report.xul	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/test_crash_notify_no_report.xul	2014-11-26 21:46:03.000000000 +0000
@@ -69,15 +69,15 @@
   var pluginElement = document.getElementById("plugin1");
   is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
 
-  ok(aEvent instanceof Components.interfaces.nsIDOMCustomEvent,
+  ok(aEvent instanceof PluginCrashedEvent,
      "plugin crashed event has the right interface");
-  var propBag = aEvent.detail.QueryInterface(Components.interfaces.nsIPropertyBag2);
-  var pluginName = propBag.getPropertyAsAString("pluginName");
-  is(pluginName, "Test Plug-in");
-  var didReport = propBag.getPropertyAsBool("submittedCrashReport");
+
+  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
+  is(aEvent.pluginName, "Test Plug-in");
   // The app itself may or may not have decided to submit the report, so
   // allow either true or false here.
-  ok((didReport == true || didReport == false), "event said crash report was submitted");
+  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
+  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
 
   var os = Components.classes["@mozilla.org/observer-service;1"].
            getService(Components.interfaces.nsIObserverService);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/test_crash_notify.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/test_crash_notify.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/test_crash_notify.xul	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/test_crash_notify.xul	2014-11-26 21:46:03.000000000 +0000
@@ -66,20 +66,19 @@
   var pluginElement = document.getElementById("plugin1");
   is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
 
-  ok(aEvent instanceof Components.interfaces.nsIDOMCustomEvent,
+  ok(aEvent instanceof PluginCrashedEvent,
      "plugin crashed event has the right interface");
 
-  var propBag = aEvent.detail.QueryInterface(Components.interfaces.nsIPropertyBag2);
-  var pluginDumpID = propBag.getPropertyAsAString("pluginDumpID");
-  isnot(pluginDumpID, "", "got a non-empty dump ID");
-  var pluginName = propBag.getPropertyAsAString("pluginName");
-  is(pluginName, "Test Plug-in", "got correct plugin name");
-  var pluginFilename = propBag.getPropertyAsAString("pluginFilename");
-  isnot(pluginFilename, "", "got a non-empty filename");
-  var didReport = propBag.getPropertyAsBool("submittedCrashReport");
+  is(typeof aEvent.pluginDumpID, "string", "pluginDumpID is correct type");
+  isnot(aEvent.pluginDumpID, "", "got a non-empty dump ID");
+  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
+  is(aEvent.pluginName, "Test Plug-in", "got correct plugin name");
+  is(typeof aEvent.pluginFilename, "string", "pluginFilename is correct type");
+  isnot(aEvent.pluginFilename, "", "got a non-empty filename");
   // The app itself may or may not have decided to submit the report, so
   // allow either true or false here.
-  ok((didReport == true || didReport == false), "event said crash report was submitted");
+  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
+  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
 
   var os = Components.classes["@mozilla.org/observer-service;1"].
            getService(Components.interfaces.nsIObserverService);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/test_hangui.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/test_hangui.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/plugins/test/mochitest/test_hangui.xul	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/plugins/test/mochitest/test_hangui.xul	2014-11-26 21:46:03.000000000 +0000
@@ -117,20 +117,20 @@
 
   is(p, aEvent.target, "Plugin crashed event target is plugin element");
 
-  ok(aEvent instanceof Components.interfaces.nsIDOMCustomEvent,
+  ok(aEvent instanceof PluginCrashedEvent,
      "plugin crashed event has the right interface");
 
-  var propBag = aEvent.detail.QueryInterface(Components.interfaces.nsIPropertyBag2);
-  var pluginDumpID = propBag.getPropertyAsAString("pluginDumpID");
-  isnot(pluginDumpID, "", "got a non-empty dump ID");
-  var pluginName = propBag.getPropertyAsAString("pluginName");
-  is(pluginName, "Test Plug-in", "got correct plugin name");
-  var pluginFilename = propBag.getPropertyAsAString("pluginFilename");
-  isnot(pluginFilename, "", "got a non-empty filename");
-  var didReport = propBag.getPropertyAsBool("submittedCrashReport");
+  is(typeof aEvent.pluginDumpID, "string", "pluginDumpID is correct type");
+  isnot(aEvent.pluginDumpID, "", "got a non-empty dump ID");
+  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
+  is(aEvent.pluginName, "Test Plug-in", "got correct plugin name");
+  is(typeof aEvent.pluginFilename, "string", "pluginFilename is correct type");
+  isnot(aEvent.pluginFilename, "", "got a non-empty filename");
   // The app itself may or may not have decided to submit the report, so
   // allow either true or false here.
-  ok((didReport == true || didReport == false), "event said crash report was submitted");
+  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
+  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
+
   os.removeObserver(testObserver, "plugin-crashed");
   --obsCount;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/Promise.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/Promise.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/Promise.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/Promise.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/Promise.h"
 
 #include "jsfriendapi.h"
+#include "js/Debug.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/DOMError.h"
 #include "mozilla/dom/OwningNonNull.h"
@@ -324,8 +325,8 @@
   }
   JSContext* cx = jsapi.cx();
 
-  JS::Rooted<JS::Value> ignored(cx);
-  if (!WrapNewBindingObject(cx, this, &ignored)) {
+  JS::Rooted<JS::Value> wrapper(cx);
+  if (!WrapNewBindingObject(cx, this, &wrapper)) {
     JS_ClearPendingException(cx);
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return;
@@ -339,6 +340,9 @@
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return;
   }
+
+  JS::RootedObject obj(cx, &wrapper.toObject());
+  JS::dbg::onNewPromise(cx, obj);
 }
 
 void
@@ -1113,19 +1117,19 @@
 }
 
 void
-Promise::MaybeSettle(JS::Handle<JS::Value> aValue,
-                     PromiseState aState)
+Promise::Settle(JS::Handle<JS::Value> aValue, PromiseState aState)
 {
-  // Promise.all() or Promise.race() implementations will repeatedly call
-  // Resolve/RejectInternal rather than using the Maybe... forms. Stop SetState
-  // from asserting.
-  if (mState != Pending) {
-    return;
-  }
-
+  mSettlementTimestamp = TimeStamp::Now();
   SetResult(aValue);
   SetState(aState);
-  mSettlementTimestamp = TimeStamp::Now();
+
+  AutoJSAPI jsapi;
+  jsapi.Init();
+  JSContext* cx = jsapi.cx();
+  JS::RootedObject wrapper(cx, GetWrapper());
+  MOZ_ASSERT(wrapper); // We preserved it
+  JSAutoCompartment ac(cx, wrapper);
+  JS::dbg::onPromiseSettled(cx, wrapper);
 
   // If the Promise was rejected, and there is no reject handler already setup,
   // watch for thread shutdown.
@@ -1150,6 +1154,20 @@
 }
 
 void
+Promise::MaybeSettle(JS::Handle<JS::Value> aValue,
+                     PromiseState aState)
+{
+  // Promise.all() or Promise.race() implementations will repeatedly call
+  // Resolve/RejectInternal rather than using the Maybe... forms. Stop SetState
+  // from asserting.
+  if (mState != Pending) {
+    return;
+  }
+
+  Settle(aValue, aState);
+}
+
+void
 Promise::EnqueueCallbackTasks()
 {
   nsTArray<nsRefPtr<PromiseCallback>> callbacks;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/Promise.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/Promise.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/Promise.h	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/Promise.h	2014-11-26 21:46:03.000000000 +0000
@@ -225,8 +225,8 @@
   // appended by then(), catch() or done().
   void EnqueueCallbackTasks();
 
-  void MaybeSettle(JS::Handle<JS::Value> aValue,
-                   Promise::PromiseState aState);
+  void Settle(JS::Handle<JS::Value> aValue, Promise::PromiseState aState);
+  void MaybeSettle(JS::Handle<JS::Value> aValue, Promise::PromiseState aState);
 
   void AppendCallbacks(PromiseCallback* aResolveCallback,
                        PromiseCallback* aRejectCallback);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/chrome.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/chrome.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/chrome.ini	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/chrome.ini	2014-11-26 21:46:03.000000000 +0000
@@ -1,3 +1,6 @@
 [DEFAULT]
 
 [test_dependentPromises.html]
+[test_on_new_promise.html]
+[test_on_promise_settled.html]
+[test_on_promise_settled_duplicates.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/test_on_new_promise.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/test_on_new_promise.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/test_on_new_promise.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/test_on_new_promise.html	2014-11-26 21:46:03.000000000 +0000
@@ -0,0 +1,45 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<!--
+Bug 1083210 - Sanity test for interaction between DOM promises and
+Debugger.prototype.onNewPromise.
+-->
+
+<html>
+<head>
+  <title>Test for interaction with SpiderMonkey's Debugger.prototype.onNewPromise</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>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+  is(Object.prototype.toString.call(new Promise(function () {})),
+     "[object Promise]",
+     "We should have the native DOM promise implementation.");
+
+  var Cu = Components.utils;
+  Cu.import("resource://gre/modules/jsdebugger.jsm");
+  var dbgGlobal = new Cu.Sandbox(document.nodePrincipal);
+  addDebuggerToGlobal(dbgGlobal);
+  var dbg = new dbgGlobal.Debugger(this);
+
+  var wrappedPromise;
+  dbg.onNewPromise = function (wp) { wrappedPromise = wp; };
+
+  var promise = new Promise(function () {});
+  debugger;
+  ok(wrappedPromise);
+  is(wrappedPromise.unsafeDereference(), promise);
+  </script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/test_on_promise_settled_duplicates.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/test_on_promise_settled_duplicates.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/test_on_promise_settled_duplicates.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/test_on_promise_settled_duplicates.html	2014-11-26 21:46:03.000000000 +0000
@@ -0,0 +1,59 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<!--
+Bug 1084065 - Test that Debugger.prototype.onPromiseResolved doesn't get dupes.
+-->
+
+<html>
+<head>
+  <title>Test for interaction with SpiderMonkey's Debugger.prototype.onNewPromise</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>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+  SimpleTest.waitForExplicitFinish();
+
+  is(Object.prototype.toString.call(new Promise(function () {})),
+     "[object Promise]",
+     "We should have the native DOM promise implementation.");
+
+  var Cu = Components.utils;
+  Cu.import("resource://gre/modules/jsdebugger.jsm");
+  var dbgGlobal = new Cu.Sandbox(document.nodePrincipal);
+  addDebuggerToGlobal(dbgGlobal);
+  var dbg = new dbgGlobal.Debugger(this);
+
+  var seen = new Set();
+  dbg.onPromiseSettled = function (wp) {
+    is(seen.has(wp), false);
+    seen.add(wp);
+  };
+
+  var promise = new Promise(function (fulfill, reject) {
+    fulfill(1);
+    fulfill(2);
+    fulfill(3);
+  });
+
+  promise
+    .then(function () {
+      dbg.onPromiseSettled = undefined;
+    })
+    .then(null, function (e) {
+      ok(false, "Got an unexpected error: " + e);
+    })
+    .then(SimpleTest.finish);
+  </script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/test_on_promise_settled.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/test_on_promise_settled.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/promise/tests/test_on_promise_settled.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/promise/tests/test_on_promise_settled.html	2014-11-26 21:46:03.000000000 +0000
@@ -0,0 +1,54 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<!--
+Bug 1084065 - Sanity test for interaction between DOM promises and
+Debugger.prototype.onPromiseResolved.
+-->
+
+<html>
+<head>
+  <title>Test for interaction with SpiderMonkey's Debugger.prototype.onNewPromise</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>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+  SimpleTest.waitForExplicitFinish();
+
+  is(Object.prototype.toString.call(new Promise(function () {})),
+     "[object Promise]",
+     "We should have the native DOM promise implementation.");
+
+  var Cu = Components.utils;
+  Cu.import("resource://gre/modules/jsdebugger.jsm");
+  var dbgGlobal = new Cu.Sandbox(document.nodePrincipal);
+  addDebuggerToGlobal(dbgGlobal);
+  var dbg = new dbgGlobal.Debugger(this);
+
+  var wrappedPromise;
+  dbg.onPromiseSettled = function (wp) { wrappedPromise = wp; };
+
+  var promise = Promise.resolve();
+  promise
+    .then(function () {
+      ok(wrappedPromise);
+      is(wrappedPromise.unsafeDereference(), promise);
+      dbg.onPromiseSettled = undefined;
+    })
+    .then(null, function (e) {
+      ok(false, "Got an unexpected error: " + e);
+    })
+    .then(SimpleTest.finish);
+  </script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/security/nsCSPContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/security/nsCSPContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/security/nsCSPContext.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/security/nsCSPContext.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -1102,7 +1102,7 @@
         *outPermitsBaseURI = false;
       }
       nsAutoString violatedDirective;
-      mPolicies[i]->getDirectiveStringForBaseURI(violatedDirective);
+      mPolicies[i]->getDirectiveAsString(CSP_BASE_URI, violatedDirective);
       this->AsyncReportViolation(aURI,
                                  nullptr,       /* originalURI in case of redirect */
                                  violatedDirective,
@@ -1124,6 +1124,48 @@
   }
 #endif
 
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCSPContext::PermitsFormAction(nsIURI* aURI, bool* outPermitsFormAction)
+{
+  // Can't perform check without aURI
+  if (!aURI) {
+    return NS_ERROR_FAILURE;
+  }
+
+  *outPermitsFormAction = true;
+
+  for (uint32_t i = 0; i < mPolicies.Length(); i++) {
+    if (!mPolicies[i]->permitsFormAction(aURI)) {
+      // policy is violated, report to caller if not report-only
+      if (!mPolicies[i]->getReportOnlyFlag()) {
+        *outPermitsFormAction = false;
+      }
+      nsAutoString violatedDirective;
+      mPolicies[i]->getDirectiveAsString(CSP_FORM_ACTION, violatedDirective);
+      this->AsyncReportViolation(aURI,
+                                 mSelfURI,
+                                 violatedDirective,
+                                 i,             /* policy index        */
+                                 EmptyString(), /* no observer subject */
+                                 EmptyString(), /* no source file      */
+                                 EmptyString(), /* no script sample    */
+                                 0);            /* no line number      */
+    }
+  }
+
+#ifdef PR_LOGGING
+  {
+    nsAutoCString spec;
+    aURI->GetSpec(spec);
+    CSPCONTEXTLOG(("nsCSPContext::PermitsFormAction, aUri: %s, isAllowed: %s",
+                  spec.get(),
+                  *outPermitsFormAction ? "allow" : "deny"));
+  }
+#endif
+
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/security/nsCSPUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/security/nsCSPUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/security/nsCSPUtils.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/security/nsCSPUtils.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -873,6 +873,30 @@
 }
 
 bool
+nsCSPPolicy::permitsFormAction(nsIURI* aUri) const
+{
+#ifdef PR_LOGGING
+  {
+    nsAutoCString spec;
+    aUri->GetSpec(spec);
+    CSPUTILSLOG(("nsCSPPolicy::permitsFormAction, aUri: %s", spec.get()));
+  }
+#endif
+
+  // Try to find a form-action directive
+  for (uint32_t i = 0; i < mDirectives.Length(); i++) {
+    if (mDirectives[i]->equals(CSP_FORM_ACTION)) {
+      return mDirectives[i]->permits(aUri);
+    }
+  }
+
+  // form-action is only enforced if explicitly defined in the
+  // policy - do *not* consult default-src, see:
+  // http://www.w3.org/TR/CSP2/#directive-default-src
+  return true;
+}
+
+bool
 nsCSPPolicy::allows(nsContentPolicyType aContentType,
                     enum CSPKeyword aKeyword,
                     const nsAString& aHashOrNonce) const
@@ -975,10 +999,10 @@
 }
 
 void
-nsCSPPolicy::getDirectiveStringForBaseURI(nsAString& outDirective) const
+nsCSPPolicy::getDirectiveAsString(enum CSPDirective aDir, nsAString& outDirective) const
 {
   for (uint32_t i = 0; i < mDirectives.Length(); i++) {
-    if (mDirectives[i]->equals(CSP_BASE_URI)) {
+    if (mDirectives[i]->equals(aDir)) {
       mDirectives[i]->toString(outDirective);
       return;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/security/nsCSPUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/security/nsCSPUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/security/nsCSPUtils.h	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/security/nsCSPUtils.h	2014-11-26 21:46:03.000000000 +0000
@@ -72,6 +72,7 @@
   CSP_FRAME_ANCESTORS,
   CSP_REFLECTED_XSS,
   CSP_BASE_URI,
+  CSP_FORM_ACTION,
   // CSP_LAST_DIRECTIVE_VALUE always needs to be the last element in the enum
   // because we use it to calculate the size for the char* array.
   CSP_LAST_DIRECTIVE_VALUE
@@ -90,7 +91,8 @@
   "report-uri",      // CSP_REPORT_URI
   "frame-ancestors", // CSP_FRAME_ANCESTORS
   "reflected-xss",   // CSP_REFLECTED_XSS
-  "base-uri"         // CSP_BASE_URI
+  "base-uri",        // CSP_BASE_URI
+  "form-action"      // CSP_FORM_ACTION
 };
 
 inline const char* CSP_EnumToDirective(enum CSPDirective aDir)
@@ -333,6 +335,7 @@
                  bool aWasRedirected,
                  nsAString& outViolatedDirective) const;
     bool permitsBaseURI(nsIURI* aUri) const;
+    bool permitsFormAction(nsIURI* aUri) const;
     bool allows(nsContentPolicyType aContentType,
                 enum CSPKeyword aKeyword,
                 const nsAString& aHashOrNonce) const;
@@ -356,7 +359,7 @@
     void getDirectiveStringForContentType(nsContentPolicyType aContentType,
                                           nsAString& outDirective) const;
 
-    void getDirectiveStringForBaseURI(nsAString& outDirective) const;
+    void getDirectiveAsString(enum CSPDirective aDir, nsAString& outDirective) const;
 
     inline uint32_t getNumDirectives() const
       { return mDirectives.Length(); }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/svg/nsSVGPolyElement.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/svg/nsSVGPolyElement.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/svg/nsSVGPolyElement.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/svg/nsSVGPolyElement.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -119,3 +119,38 @@
   aMarks->LastElement().angle = prevAngle;
   aMarks->LastElement().type = nsSVGMark::eEnd;
 }
+
+bool
+nsSVGPolyElement::GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
+                                    const Matrix& aTransform)
+{
+  const SVGPointList &points = mPoints.GetAnimValue();
+
+  if (!points.Length()) {
+    // Rendering of the element is disabled
+    aBounds->SetEmpty();
+    return true;
+  }
+
+  if (aStrokeWidth > 0) {
+    // We don't handle stroke-miterlimit etc. yet
+    return false;
+  }
+
+  if (aTransform.IsRectilinear()) {
+    // We can avoid transforming each point and just transform the result.
+    // Important for large point lists.
+    Rect bounds(points[0], Size());
+    for (uint32_t i = 1; i < points.Length(); ++i) {
+      bounds.ExpandToEnclose(points[i]);
+    }
+    *aBounds = aTransform.TransformBounds(bounds);
+  } else {
+    *aBounds = Rect(aTransform * points[0], Size());
+    for (uint32_t i = 1; i < points.Length(); ++i) {
+      aBounds->ExpandToEnclose(aTransform * points[i]);
+    }
+  }
+  return true;
+}
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/svg/nsSVGPolyElement.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/svg/nsSVGPolyElement.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/svg/nsSVGPolyElement.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/svg/nsSVGPolyElement.h	2014-11-26 21:46:03.000000000 +0000
@@ -45,6 +45,8 @@
   virtual bool AttributeDefinesGeometry(const nsIAtom *aName) MOZ_OVERRIDE;
   virtual bool IsMarkable() MOZ_OVERRIDE { return true; }
   virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) MOZ_OVERRIDE;
+  virtual bool GetGeometryBounds(Rect* aBounds, Float aStrokeWidth,
+                                 const Matrix& aTransform) MOZ_OVERRIDE;
 
   // WebIDL
   already_AddRefed<mozilla::DOMSVGPointList> Points();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/AudioManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/AudioManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/AudioManager.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/AudioManager.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -15,6 +15,7 @@
 
 #include <android/log.h>
 #include <cutils/properties.h>
+#include <binder/IServiceManager.h>
 
 #include "AudioChannelService.h"
 #include "AudioManager.h"
@@ -59,6 +60,7 @@
 #define HEADPHONES_STATUS_CHANGED     "headphones-status-changed"
 #define MOZ_SETTINGS_CHANGE_ID        "mozsettings-changed"
 #define AUDIO_CHANNEL_PROCESS_CHANGED "audio-channel-process-changed"
+#define AUDIO_POLICY_SERVICE_NAME     "media.audio_policy"
 
 static void BinderDeadCallback(status_t aErr);
 static void InternalSetAudioRoutes(SwitchState aState);
@@ -94,6 +96,19 @@
     nsCOMPtr<nsIAudioManager> amService = do_GetService(NS_AUDIOMANAGER_CONTRACTID);
     NS_ENSURE_TRUE(amService, NS_OK);
     AudioManager *am = static_cast<AudioManager *>(amService.get());
+
+    int attempt;
+    for (attempt = 0; attempt < 50; attempt++) {
+      if (defaultServiceManager()->checkService(String16(AUDIO_POLICY_SERVICE_NAME)) != 0) {
+        break;
+      }
+
+      LOG("AudioPolicyService is dead! attempt=%d", attempt);
+      usleep(1000 * 200);
+    }
+
+    MOZ_RELEASE_ASSERT(attempt < 50);
+
     for (int loop = 0; loop < AUDIO_STREAM_CNT; loop++) {
       AudioSystem::initStreamVolume(static_cast<audio_stream_type_t>(loop), 0,
                                    sMaxStreamVolumeTbl[loop]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/AutoMounter.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/AutoMounter.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/AutoMounter.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/AutoMounter.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -78,6 +78,7 @@
 #define ICS_SYS_MTP_DIRECTORY "/sys/devices/virtual/android_usb/android0/f_mtp"
 #define ICS_SYS_USB_STATE     "/sys/devices/virtual/android_usb/android0/state"
 
+#undef USE_DEBUG    // MozMtpDatabase.h also defines USE_DEBUG
 #define USE_DEBUG 0
 
 #undef LOG
@@ -715,7 +716,15 @@
     DBG("UpdateState: USB functions: '%s'", functionsStr);
 
     bool  usbConfigured = IsUsbConfigured();
-    umsAvail = (access(ICS_SYS_UMS_DIRECTORY, F_OK) == 0);
+
+    // On the Nexus 4/5, it advertises that the UMS usb function is available,
+    // but we have a further requirement that mass_storage be in the
+    // persist.sys.usb.config property.
+    char persistSysUsbConfig[PROPERTY_VALUE_MAX];
+    property_get(PERSIST_SYS_USB_CONFIG, persistSysUsbConfig, "");
+    if (IsUsbFunctionEnabled(persistSysUsbConfig, USB_FUNC_UMS)) {
+      umsAvail = (access(ICS_SYS_UMS_DIRECTORY, F_OK) == 0);
+    }
     if (umsAvail) {
       umsConfigured = usbConfigured && strstr(functionsStr, USB_FUNC_UMS) != nullptr;
       umsEnabled = (mMode == AUTOMOUNTER_ENABLE_UMS) ||
@@ -1230,68 +1239,9 @@
 static StaticRefPtr<UsbCableObserver> sUsbCableObserver;
 static StaticRefPtr<AutoMounterSetting> sAutoMounterSetting;
 
-static void
-InitVolumeConfig()
-{
-  // This function uses /system/etc/volume.cfg to add additional volumes
-  // to the Volume Manager.
-  //
-  // This is useful on devices like the Nexus 4, which have no physical sd card
-  // or dedicated partition.
-  //
-  // The format of the volume.cfg file is as follows:
-  // create volume-name mount-point
-  // Blank lines and lines starting with the hash character "#" will be ignored.
-
-  nsCOMPtr<nsIVolumeService> vs = do_GetService(NS_VOLUMESERVICE_CONTRACTID);
-  NS_ENSURE_TRUE_VOID(vs);
-
-  ScopedCloseFile fp;
-  int n = 0;
-  char line[255];
-  char *command, *vol_name_cstr, *mount_point_cstr, *save_ptr;
-  const char *filename = "/system/etc/volume.cfg";
-  if (!(fp = fopen(filename, "r"))) {
-    LOG("Unable to open volume configuration file '%s' - ignoring", filename);
-    return;
-  }
-  while(fgets(line, sizeof(line), fp)) {
-    const char *delim = " \t\n";
-    n++;
-
-    if (line[0] == '#')
-      continue;
-    if (!(command = strtok_r(line, delim, &save_ptr))) {
-      // Blank line - ignore
-      continue;
-    }
-    if (!strcmp(command, "create")) {
-      if (!(vol_name_cstr = strtok_r(nullptr, delim, &save_ptr))) {
-        ERR("No vol_name in %s line %d",  filename, n);
-        continue;
-      }
-      if (!(mount_point_cstr = strtok_r(nullptr, delim, &save_ptr))) {
-        ERR("No mount point for volume '%s'. %s line %d", vol_name_cstr, filename, n);
-        continue;
-      }
-      nsString  mount_point = NS_ConvertUTF8toUTF16(mount_point_cstr);
-      nsString vol_name = NS_ConvertUTF8toUTF16(vol_name_cstr);
-      nsresult rv;
-      rv = vs->CreateFakeVolume(vol_name, mount_point);
-      NS_ENSURE_SUCCESS_VOID(rv);
-      rv = vs->SetFakeVolumeState(vol_name, nsIVolume::STATE_MOUNTED);
-      NS_ENSURE_SUCCESS_VOID(rv);
-    }
-    else {
-      ERR("Unrecognized command: '%s'", command);
-    }
-  }
-}
-
 void
 InitAutoMounter()
 {
-  InitVolumeConfig();
   InitVolumeManager();
   sAutoMounterSetting = new AutoMounterSetting();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/GonkGPSGeolocationProvider.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/GonkGPSGeolocationProvider.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/GonkGPSGeolocationProvider.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/GonkGPSGeolocationProvider.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -345,7 +345,8 @@
   }
 
   int32_t state;
-  mRadioInterface->GetDataCallStateByType(NS_LITERAL_STRING("supl"), &state);
+  mRadioInterface->GetDataCallStateByType(
+    nsINetworkInterface::NETWORK_TYPE_MOBILE_SUPL, &state);
   return state;
 }
 
@@ -436,7 +437,7 @@
     // We just get supl APN and make AGPS data connection state updated.
     RequestSettingValue("ril.supl.apn");
   } else {
-    mRadioInterface->SetupDataCallByType(NS_LITERAL_STRING("supl"));
+    mRadioInterface->SetupDataCallByType(nsINetworkInterface::NETWORK_TYPE_MOBILE_SUPL);
   }
 }
 
@@ -449,7 +450,7 @@
     return;
   }
 
-  mRadioInterface->DeactivateDataCallByType(NS_LITERAL_STRING("supl"));
+  mRadioInterface->DeactivateDataCallByType(nsINetworkInterface::NETWORK_TYPE_MOBILE_SUPL);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/moz.build	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/moz.build	2014-11-26 21:46:04.000000000 +0000
@@ -90,10 +90,13 @@
         'RadioInterfaceLayer.js',
         'RadioInterfaceLayer.manifest',
         'RILContentHelper.js',
+        'RILSystemMessengerHelper.js',
+        'RILSystemMessengerHelper.manifest',
     ]
     EXTRA_JS_MODULES += [
         'ril_consts.js',
         'ril_worker.js',
+        'RILSystemMessenger.jsm',
     ]
 
 FAIL_ON_WARNINGS = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/MozMtpDatabase.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/MozMtpDatabase.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/MozMtpDatabase.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/MozMtpDatabase.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -545,6 +545,9 @@
   // This is called on the IOThread from MozMtpStorage::StorageAvailable
   MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
 
+  MTP_DBG("StorageID: 0x%08x aPath: '%s' aName: '%s'",
+          aStorageID, aPath, aName);
+
   PRFileInfo  fileInfo;
   if (PR_GetFileInfo(aPath, &fileInfo) != PR_SUCCESS) {
     MTP_ERR("'%s' doesn't exist", aPath);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/MozMtpStorage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/MozMtpStorage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/MozMtpStorage.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/MozMtpStorage.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -63,14 +63,18 @@
           aVolume->NameStr(), mStorageID, aVolume->StateStr(),
           aVolume->IsSharingEnabled());
 
+  // vol->IsSharingEnabled really only applies to UMS volumes. We assume that
+  // that as long as MTP is enabled, then all volumes will be shared. The UI
+  // currently doesn't give us anything more granular than on/off.
+
   if (mMtpStorage) {
-    if (volState != nsIVolume::STATE_MOUNTED || !aVolume->IsSharingEnabled()) {
+    if (volState != nsIVolume::STATE_MOUNTED) {
       // The volume is no longer accessible. We need to remove this storage
       // from the MTP server
       StorageUnavailable();
     }
   } else {
-    if (volState == nsIVolume::STATE_MOUNTED && aVolume->IsSharingEnabled()) {
+    if (volState == nsIVolume::STATE_MOUNTED) {
       // The volume is accessible. Tell the MTP server.
       StorageAvailable();
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/NetworkManager.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/NetworkManager.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/NetworkManager.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/NetworkManager.js	2014-11-26 21:46:04.000000000 +0000
@@ -888,7 +888,7 @@
     let data = connection && connection.data;
     if (data && data.state === "registered") {
       this.dunRetryTimes = 0;
-      ril.setupDataCallByType("dun");
+      ril.setupDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_DUN);
       this.dunConnectTimer.cancel();
       this.dunConnectTimer.
         initWithCallback(this.onDunConnectTimerTimeout.bind(this),
@@ -931,7 +931,7 @@
 
       if (dun && (dun.state == Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED)) {
         this.mRil.getRadioInterface(this._dataDefaultServiceId)
-          .deactivateDataCallByType("dun");
+          .deactivateDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_DUN);
       }
       return;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsIRadioInterfaceLayer.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsIRadioInterfaceLayer.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsIRadioInterfaceLayer.idl	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsIRadioInterfaceLayer.idl	2014-11-26 21:46:04.000000000 +0000
@@ -40,17 +40,21 @@
   boolean handleResponse(in jsval response);
 };
 
-[scriptable, uuid(622e8809-1a89-45f7-9b35-7e49b5aaa69f)]
+[scriptable, uuid(dc874da3-5f74-49d4-8e1c-a58ed9a1c0ef)]
 interface nsIRadioInterface : nsISupports
 {
   readonly attribute nsIRilContext rilContext;
 
   /**
    * PDP APIs
+   *
+   * @param networkType
+   *        Mobile network type, that is, nsINetworkInterface.NETWORK_TYPE_MOBILE
+   *        or one of the nsINetworkInterface.NETWORK_TYPE_MOBILE_* values.
    */
-  void setupDataCallByType(in DOMString apntype);
-  void deactivateDataCallByType(in DOMString apntype);
-  long getDataCallStateByType(in DOMString apntype);
+  void setupDataCallByType(in long networkType);
+  void deactivateDataCallByType(in long networkType);
+  long getDataCallStateByType(in long networkType);
 
   void updateRILNetworkInterface();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolume.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolume.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolume.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolume.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -54,7 +54,7 @@
     mState(aVolume->State()),
     mMountGeneration(aVolume->MountGeneration()),
     mMountLocked(aVolume->IsMountLocked()),
-    mIsFake(false),
+    mIsFake(!aVolume->CanBeShared()),
     mIsMediaPresent(aVolume->MediaPresent()),
     mIsSharing(aVolume->IsSharing()),
     mIsFormatting(aVolume->IsFormatting()),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolumeMountLock.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolumeMountLock.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolumeMountLock.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolumeMountLock.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsString.h"
 #include "nsXULAppAPI.h"
 
+#undef VOLUME_MANAGER_LOG_TAG
 #define VOLUME_MANAGER_LOG_TAG  "nsVolumeMountLock"
 #include "VolumeManagerLog.h"
 #include "nsServiceManagerUtils.h"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolumeStat.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolumeStat.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolumeStat.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolumeStat.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -17,10 +17,6 @@
   }
 }
 
-nsVolumeStat::~nsVolumeStat()
-{
-}
-
 /* readonly attribute long long totalBytes; */
 NS_IMETHODIMP nsVolumeStat::GetTotalBytes(int64_t* aTotalBytes)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolumeStat.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolumeStat.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/nsVolumeStat.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/nsVolumeStat.h	2014-11-26 21:46:04.000000000 +0000
@@ -21,8 +21,6 @@
   nsVolumeStat(const nsAString& aPath);
 
 private:
-  ~nsVolumeStat();
-
   struct statfs mStat;
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/OpenFileFinder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/OpenFileFinder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/OpenFileFinder.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/OpenFileFinder.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#undef USE_DEBUG
 #define USE_DEBUG 0
 
 #undef LOG
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RadioInterfaceLayer.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RadioInterfaceLayer.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RadioInterfaceLayer.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RadioInterfaceLayer.js	2014-11-26 21:46:04.000000000 +0000
@@ -87,6 +87,16 @@
 const SMS_HANDLED_WAKELOCK_TIMEOUT = 5000;
 const HW_DEFAULT_CLIENT_ID = 0;
 
+const INT32_MAX = 2147483647;
+
+const NETWORK_TYPE_UNKNOWN     = Ci.nsINetworkInterface.NETWORK_TYPE_UNKNOWN;
+const NETWORK_TYPE_WIFI        = Ci.nsINetworkInterface.NETWORK_TYPE_WIFI;
+const NETWORK_TYPE_MOBILE      = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE;
+const NETWORK_TYPE_MOBILE_MMS  = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS;
+const NETWORK_TYPE_MOBILE_SUPL = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_SUPL;
+const NETWORK_TYPE_MOBILE_IMS  = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_IMS;
+const NETWORK_TYPE_MOBILE_DUN  = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN;
+
 const RIL_IPC_ICCMANAGER_MSG_NAMES = [
   "RIL:GetRilContext",
   "RIL:SendStkResponse",
@@ -177,6 +187,20 @@
                                    "@mozilla.org/cellbroadcast/gonkservice;1",
                                    "nsIGonkCellBroadcastService");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gSmsMessenger",
+                                   "@mozilla.org/ril/system-messenger-helper;1",
+                                   "nsISmsMessenger");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gIccMessenger",
+                                   "@mozilla.org/ril/system-messenger-helper;1",
+                                   "nsIIccMessenger");
+
+XPCOMUtils.defineLazyGetter(this, "gStkCmdFactory", function() {
+  let stk = {};
+  Cu.import("resource://gre/modules/StkProactiveCmdFactory.jsm", stk);
+  return stk.StkProactiveCmdFactory;
+});
+
 XPCOMUtils.defineLazyGetter(this, "WAP", function() {
   let wap = {};
   Cu.import("resource://gre/modules/WapPushManager.js", wap);
@@ -776,13 +800,12 @@
         oldSettings.enabled = false;
       }
 
-      if (oldConnHandler.anyDataConnected()) {
+      if (oldConnHandler.deactivateDataCalls()) {
         this._pendingDataCallRequest = applyPendingDataSettings;
         if (DEBUG) {
           this.debug("_handleDataClientIdChange: existing data call(s) active" +
                      ", wait for them to get disconnected.");
         }
-        oldConnHandler.deactivateDataCalls();
         return;
       }
 
@@ -1007,17 +1030,17 @@
   _convertApnType: function(apnType) {
     switch(apnType) {
       case "default":
-        return Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE;
+        return NETWORK_TYPE_MOBILE;
       case "mms":
-        return Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS;
+        return NETWORK_TYPE_MOBILE_MMS;
       case "supl":
-        return Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_SUPL;
+        return NETWORK_TYPE_MOBILE_SUPL;
       case "ims":
-        return Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_IMS;
+        return NETWORK_TYPE_MOBILE_IMS;
       case "dun":
-        return Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN;
+        return NETWORK_TYPE_MOBILE_DUN;
       default:
-        return Ci.nsINetworkInterface.NETWORK_TYPE_UNKNOWN;
+        return NETWORK_TYPE_UNKNOWN;
      }
   },
 
@@ -1093,7 +1116,7 @@
       for (let i = 0; i < inputApnSetting.types.length; i++) {
         let apnType = inputApnSetting.types[i];
         let networkType = this._convertApnType(apnType);
-        if (networkType === Ci.nsINetworkInterface.NETWORK_TYPE_UNKNOWN) {
+        if (networkType === NETWORK_TYPE_UNKNOWN) {
           if (DEBUG) this.debug("Invalid apn type: " + apnType);
           continue;
         }
@@ -1120,7 +1143,7 @@
                                                          inputApnSetting,
                                                          dataCall);
           gNetworkManager.registerNetworkInterface(networkInterface);
-          this.dataNetworkInterfaces.set(apnType, networkInterface);
+          this.dataNetworkInterfaces.set(networkType, networkInterface);
         } catch (e) {
           if (DEBUG) {
             this.debug("Error setting up RILNetworkInterface for type " +
@@ -1145,18 +1168,6 @@
     return true;
   },
 
-  /**
-   * Check if there is any activated data connection.
-   */
-  anyDataConnected: function() {
-    for (let i = 0; i < this._dataCalls.length; i++) {
-      if (this._dataCalls[i].state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
-        return true;
-      }
-    }
-    return false;
-  },
-
   updateApnSettings: function(newApnSettings) {
     if (!newApnSettings) {
       return;
@@ -1185,7 +1196,7 @@
   },
 
   updateRILNetworkInterface: function() {
-    let networkInterface = this.dataNetworkInterfaces.get("default");
+    let networkInterface = this.dataNetworkInterfaces.get(NETWORK_TYPE_MOBILE);
     if (!networkInterface) {
       if (DEBUG) {
         this.debug("No network interface for default data.");
@@ -1234,7 +1245,7 @@
     }
     let wifi_active = false;
     if (gNetworkManager.active &&
-        gNetworkManager.active.type == Ci.nsINetworkInterface.NETWORK_TYPE_WIFI) {
+        gNetworkManager.active.type == NETWORK_TYPE_WIFI) {
       wifi_active = true;
     }
 
@@ -1294,22 +1305,45 @@
     networkInterface.connect();
   },
 
-  getDataCallStateByType: function(apnType) {
-    let networkInterface = this.dataNetworkInterfaces.get(apnType);
+  _isMobileNetworkType: function(networkType) {
+    if (networkType === NETWORK_TYPE_MOBILE ||
+        networkType === NETWORK_TYPE_MOBILE_MMS ||
+        networkType === NETWORK_TYPE_MOBILE_SUPL ||
+        networkType === NETWORK_TYPE_MOBILE_IMS ||
+        networkType === NETWORK_TYPE_MOBILE_DUN) {
+      return true;
+    }
+
+    return false;
+  },
+
+  getDataCallStateByType: function(networkType) {
+    if (!this._isMobileNetworkType(networkType)) {
+      if (DEBUG) this.debug(networkType + " is not a mobile network type!");
+      throw Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    let networkInterface = this.dataNetworkInterfaces.get(networkType);
     if (!networkInterface) {
       return RIL.GECKO_NETWORK_STATE_UNKNOWN;
     }
     return networkInterface.state;
   },
 
-  setupDataCallByType: function(apnType) {
+  setupDataCallByType: function(networkType) {
     if (DEBUG) {
-      this.debug("setupDataCallByType: " + apnType);
+      this.debug("setupDataCallByType: " + networkType);
+    }
+
+    if (!this._isMobileNetworkType(networkType)) {
+      if (DEBUG) this.debug(networkType + " is not a mobile network type!");
+      throw Cr.NS_ERROR_INVALID_ARG;
     }
-    let networkInterface = this.dataNetworkInterfaces.get(apnType);
+
+    let networkInterface = this.dataNetworkInterfaces.get(networkType);
     if (!networkInterface) {
       if (DEBUG) {
-        this.debug("No network interface for type: " + apnType);
+        this.debug("No network interface for type: " + networkType);
       }
       return;
     }
@@ -1317,14 +1351,20 @@
     networkInterface.connect();
   },
 
-  deactivateDataCallByType: function(apnType) {
+  deactivateDataCallByType: function(networkType) {
     if (DEBUG) {
-      this.debug("deactivateDataCallByType: " + apnType);
+      this.debug("deactivateDataCallByType: " + networkType);
+    }
+
+    if (!this._isMobileNetworkType(networkType)) {
+      if (DEBUG) this.debug(networkType + " is not a mobile network type!");
+      throw Cr.NS_ERROR_INVALID_ARG;
     }
-    let networkInterface = this.dataNetworkInterfaces.get(apnType);
+
+    let networkInterface = this.dataNetworkInterfaces.get(networkType);
     if (!networkInterface) {
       if (DEBUG) {
-        this.debug("No network interface for type: " + apnType);
+        this.debug("No network interface for type: " + networkType);
       }
       return;
     }
@@ -1335,9 +1375,11 @@
   deactivateDataCalls: function() {
     let dataDisconnecting = false;
     this.dataNetworkInterfaces.forEach(function(networkInterface) {
-      if (networkInterface.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
+      if (networkInterface.enabled) {
+        if (networkInterface.state == RIL.GECKO_NETWORK_STATE_CONNECTED) {
+          dataDisconnecting = true;
+        }
         networkInterface.disconnect();
-        dataDisconnecting = true;
       }
     });
 
@@ -1346,6 +1388,8 @@
     if (gRadioEnabledController.isDeactivatingDataCalls() && !dataDisconnecting) {
       gRadioEnabledController.finishDeactivatingDataCalls(this.clientId);
     }
+
+    return dataDisconnecting;
   },
 
   /**
@@ -1353,7 +1397,7 @@
    */
   handleDataCallError: function(message) {
     // Notify data call error only for data APN
-    let networkInterface = this.dataNetworkInterfaces.get("default");
+    let networkInterface = this.dataNetworkInterfaces.get(NETWORK_TYPE_MOBILE);
     if (networkInterface && networkInterface.enabled) {
       let dataCall = networkInterface.dataCall;
       // If there is a cid, compare cid; otherwise it is probably an error on
@@ -2141,6 +2185,42 @@
                                      0, options);
   },
 
+  _convertSmsMessageClass: function(aMessageClass) {
+    let index = RIL.GECKO_SMS_MESSAGE_CLASSES.indexOf(aMessageClass);
+
+    if (index < 0) {
+      throw new Error("Invalid MessageClass: " + aMessageClass);
+    }
+
+    return index;
+  },
+
+  _convertSmsDelivery: function(aDelivery) {
+    let index = [DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED,
+                 DOM_MOBILE_MESSAGE_DELIVERY_SENDING,
+                 DOM_MOBILE_MESSAGE_DELIVERY_SENT,
+                 DOM_MOBILE_MESSAGE_DELIVERY_ERROR].indexOf(aDelivery);
+
+    if (index < 0) {
+      throw new Error("Invalid Delivery: " + aDelivery);
+    }
+
+    return index;
+  },
+
+  _convertSmsDeliveryStatus: function(aDeliveryStatus) {
+    let index = [RIL.GECKO_SMS_DELIVERY_STATUS_NOT_APPLICABLE,
+                 RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
+                 RIL.GECKO_SMS_DELIVERY_STATUS_PENDING,
+                 RIL.GECKO_SMS_DELIVERY_STATUS_ERROR].indexOf(aDeliveryStatus);
+
+    if (index < 0) {
+      throw new Error("Invalid DeliveryStatus: " + aDeliveryStatus);
+    }
+
+    return index;
+  },
+
   /**
    * A helper to broadcast the system message to launch registered apps
    * like Costcontrol, Notification and Message app... etc.
@@ -2150,28 +2230,35 @@
    * @param aDomMessage
    *        The nsIDOMMozSmsMessage object.
    */
-  broadcastSmsSystemMessage: function(aName, aDomMessage) {
-    if (DEBUG) this.debug("Broadcasting the SMS system message: " + aName);
+  broadcastSmsSystemMessage: function(aNotificationType, aDomMessage) {
+    if (DEBUG) this.debug("Broadcasting the SMS system message: " + aNotificationType);
 
     // Sadly we cannot directly broadcast the aDomMessage object
     // because the system message mechamism will rewrap the object
     // based on the content window, which needs to know the properties.
-    gSystemMessenger.broadcastMessage(aName, {
-      iccId:             aDomMessage.iccId,
-      type:              aDomMessage.type,
-      id:                aDomMessage.id,
-      threadId:          aDomMessage.threadId,
-      delivery:          aDomMessage.delivery,
-      deliveryStatus:    aDomMessage.deliveryStatus,
-      sender:            aDomMessage.sender,
-      receiver:          aDomMessage.receiver,
-      body:              aDomMessage.body,
-      messageClass:      aDomMessage.messageClass,
-      timestamp:         aDomMessage.timestamp,
-      sentTimestamp:     aDomMessage.sentTimestamp,
-      deliveryTimestamp: aDomMessage.deliveryTimestamp,
-      read:              aDomMessage.read
-    });
+    try {
+      gSmsMessenger.notifySms(aNotificationType,
+                              aDomMessage.id,
+                              aDomMessage.threadId,
+                              aDomMessage.iccId,
+                              this._convertSmsDelivery(
+                                aDomMessage.delivery),
+                              this._convertSmsDeliveryStatus(
+                                aDomMessage.deliveryStatus),
+                              aDomMessage.sender,
+                              aDomMessage.receiver,
+                              aDomMessage.body,
+                              this._convertSmsMessageClass(
+                                aDomMessage.messageClass),
+                              aDomMessage.timestamp,
+                              aDomMessage.sentTimestamp,
+                              aDomMessage.deliveryTimestamp,
+                              aDomMessage.read);
+    } catch (e) {
+      if (DEBUG) {
+        this.debug("Failed to broadcastSmsSystemMessage: " + e);
+      }
+    }
   },
 
   // The following attributes/functions are used for acquiring/releasing the
@@ -2516,7 +2603,8 @@
         return;
       }
 
-      this.broadcastSmsSystemMessage(kSmsReceivedObserverTopic, domMessage);
+      this.broadcastSmsSystemMessage(
+        Ci.nsISmsMessenger.NOTIFICATION_TYPE_RECEIVED, domMessage);
       Services.obs.notifyObservers(domMessage, kSmsReceivedObserverTopic, null);
     }.bind(this);
 
@@ -2732,9 +2820,9 @@
     if (DEBUG) this.debug("handleStkProactiveCommand " + JSON.stringify(message));
     let iccId = this.rilContext.iccInfo && this.rilContext.iccInfo.iccid;
     if (iccId) {
-      gSystemMessenger.broadcastMessage("icc-stkcommand",
-                                        {iccId: iccId,
-                                         command: message});
+      gIccMessenger
+        .notifyStkProactiveCommand(iccId,
+                                   gStkCmdFactory.createCommand(message));
     }
     gMessageManager.sendIccMessage("RIL:StkCommand", this.clientId, message);
   },
@@ -2749,7 +2837,7 @@
     let index = RIL.GECKO_SMS_MESSAGE_CLASSES.indexOf(aMessageClass);
     return (index != -1)
       ? index
-      : Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_INVALID;
+      : Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_NORMAL;
   },
 
   _convertCbEtwsWarningType: function(aWarningType) {
@@ -2900,8 +2988,8 @@
         }
 
         // SNTP can only update when we have mobile or Wifi connections.
-        if (network.type != Ci.nsINetworkInterface.NETWORK_TYPE_WIFI &&
-            network.type != Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE) {
+        if (network.type != NETWORK_TYPE_WIFI &&
+            network.type != NETWORK_TYPE_MOBILE) {
           return;
         }
 
@@ -3633,7 +3721,8 @@
 
             // Broadcasting a "sms-delivery-success" system message to open apps.
             if (topic == kSmsDeliverySuccessObserverTopic) {
-              this.broadcastSmsSystemMessage(topic, domMessage);
+              this.broadcastSmsSystemMessage(
+                Ci.nsISmsMessenger.NOTIFICATION_TYPE_DELIVERY_SUCCESS, domMessage);
             }
 
             // Notifying observers the delivery status is updated.
@@ -3681,7 +3770,8 @@
             context.sms = domMessage;
           }
 
-          this.broadcastSmsSystemMessage(kSmsSentObserverTopic, domMessage);
+          this.broadcastSmsSystemMessage(
+            Ci.nsISmsMessenger.NOTIFICATION_TYPE_SENT, domMessage);
           context.request.notifyMessageSent(domMessage);
           Services.obs.notifyObservers(domMessage, kSmsSentObserverTopic, null);
         }).bind(this));
@@ -3728,22 +3818,22 @@
 
   // TODO: Bug 928861 - B2G NetworkManager: Provide a more generic function
   //                    for connecting
-  setupDataCallByType: function(apntype) {
+  setupDataCallByType: function(networkType) {
     let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-    connHandler.setupDataCallByType(apntype);
+    connHandler.setupDataCallByType(networkType);
   },
 
   // TODO: Bug 928861 - B2G NetworkManager: Provide a more generic function
   //                    for connecting
-  deactivateDataCallByType: function(apntype) {
+  deactivateDataCallByType: function(networkType) {
     let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-    connHandler.deactivateDataCallByType(apntype);
+    connHandler.deactivateDataCallByType(networkType);
   },
 
   // TODO: Bug 904514 - [meta] NetworkManager enhancement
-  getDataCallStateByType: function(apntype) {
+  getDataCallStateByType: function(networkType) {
     let connHandler = gDataConnectionManager.getConnectionHandler(this.clientId);
-    return connHandler.getDataCallStateByType(apntype);
+    return connHandler.getDataCallStateByType(networkType);
   },
 
   sendWorkerMessage: function(rilMessageType, message, callback) {
@@ -3812,9 +3902,26 @@
   chappap: null,
 
   dataCallError: function(message) {
-    if (DEBUG) this.debug("Data call error on APN: " + message.apn);
+    if (DEBUG) {
+      this.debug("Data call error on APN " + message.apn + ": " +
+                 message.errorMsg + " (" + message.status + "), retry time: " +
+                 message.suggestedRetryTime);
+    }
     this.state = RIL.GECKO_NETWORK_STATE_DISCONNECTED;
-    this.retry();
+
+    if (this.requestedNetworkIfaces.length === 0) {
+      if (DEBUG) this.debug("This DataCall is not requested anymore.");
+      return;
+    }
+
+    // For suggestedRetryTime, the value of INT32_MAX(0x7fffffff) means no retry.
+    if (message.suggestedRetryTime === INT32_MAX ||
+        this.isPermanentFail(message.status, message.errorMsg)) {
+      if (DEBUG) this.debug("Data call error: no retry needed.");
+      return;
+    }
+
+    this.retry(message.suggestedRetryTime);
   },
 
   dataCallStateChanged: function(datacall) {
@@ -3832,6 +3939,7 @@
     switch (datacall.state) {
       case RIL.GECKO_NETWORK_STATE_CONNECTED:
         if (this.state == RIL.GECKO_NETWORK_STATE_CONNECTING) {
+          this.apnRetryCounter = 0;
           this.linkInfo.cid = datacall.cid;
 
           if (this.requestedNetworkIfaces.length === 0) {
@@ -3919,6 +4027,29 @@
     return this.state == RIL.GECKO_NETWORK_STATE_CONNECTED;
   },
 
+  isPermanentFail: function(dataFailCause, errorMsg) {
+    // Check ril.h for 'no retry' data call fail causes.
+    if (errorMsg === RIL.GECKO_ERROR_RADIO_NOT_AVAILABLE ||
+        errorMsg === RIL.GECKO_ERROR_INVALID_PARAMETER ||
+        dataFailCause === RIL.DATACALL_FAIL_OPERATOR_BARRED ||
+        dataFailCause === RIL.DATACALL_FAIL_MISSING_UKNOWN_APN ||
+        dataFailCause === RIL.DATACALL_FAIL_UNKNOWN_PDP_ADDRESS_TYPE ||
+        dataFailCause === RIL.DATACALL_FAIL_USER_AUTHENTICATION ||
+        dataFailCause === RIL.DATACALL_FAIL_ACTIVATION_REJECT_GGSN ||
+        dataFailCause === RIL.DATACALL_FAIL_SERVICE_OPTION_NOT_SUPPORTED ||
+        dataFailCause === RIL.DATACALL_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED ||
+        dataFailCause === RIL.DATACALL_FAIL_NSAPI_IN_USE ||
+        dataFailCause === RIL.DATACALL_FAIL_ONLY_IPV4_ALLOWED ||
+        dataFailCause === RIL.DATACALL_FAIL_ONLY_IPV6_ALLOWED ||
+        dataFailCause === RIL.DATACALL_FAIL_PROTOCOL_ERRORS ||
+        dataFailCause === RIL.DATACALL_FAIL_RADIO_POWER_OFF ||
+        dataFailCause === RIL.DATACALL_FAIL_TETHERED_CALL_ACTIVE) {
+      return true;
+    }
+
+    return false;
+  },
+
   inRequestedTypes: function(type) {
     for (let i = 0; i < this.requestedNetworkIfaces.length; i++) {
       if (this.requestedNetworkIfaces[i].type == type) {
@@ -4045,7 +4176,7 @@
     this.state = RIL.GECKO_NETWORK_STATE_CONNECTING;
   },
 
-  retry: function() {
+  retry: function(suggestedRetryTime) {
     let apnRetryTimer;
 
     // We will retry the connection in increasing times
@@ -4057,9 +4188,14 @@
       return;
     }
 
-    apnRetryTimer = this.NETWORK_APNRETRY_FACTOR *
-                    (this.apnRetryCounter * this.apnRetryCounter) +
-                    this.NETWORK_APNRETRY_ORIGIN;
+    // If there is a valid suggestedRetryTime, override the retry timer.
+    if (suggestedRetryTime !== undefined && suggestedRetryTime >= 0) {
+      apnRetryTimer = suggestedRetryTime / 1000;
+    } else {
+      apnRetryTimer = this.NETWORK_APNRETRY_FACTOR *
+                      (this.apnRetryCounter * this.apnRetryCounter) +
+                      this.NETWORK_APNRETRY_ORIGIN;
+    }
     this.apnRetryCounter++;
     if (DEBUG) {
       this.debug("Data call - APN Connection Retry Timer (secs-counter): " +
@@ -4232,7 +4368,7 @@
   },
 
   get mmsc() {
-    if (this.type != Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) {
+    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
       if (DEBUG) this.debug("Error! Only MMS network can get MMSC.");
       throw Cr.NS_ERROR_UNEXPECTED;
     }
@@ -4250,7 +4386,7 @@
   },
 
   get mmsProxy() {
-    if (this.type != Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) {
+    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
       if (DEBUG) this.debug("Error! Only MMS network can get MMS proxy.");
       throw Cr.NS_ERROR_UNEXPECTED;
     }
@@ -4268,7 +4404,7 @@
   },
 
   get mmsPort() {
-    if (this.type != Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) {
+    if (this.type != NETWORK_TYPE_MOBILE_MMS) {
       if (DEBUG) this.debug("Error! Only MMS network can get MMS port.");
       throw Cr.NS_ERROR_UNEXPECTED;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/ril_consts.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/ril_consts.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/ril_consts.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/ril_consts.js	2014-11-26 21:46:04.000000000 +0000
@@ -427,6 +427,7 @@
 ];
 
 this.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT = "gsm,wcdma";
+// Index-item pair must be in sync with nsIMobileConnection.MOBILE_NETWORK_TYPE_*
 this.GECKO_SUPPORTED_NETWORK_TYPES = [
   "gsm",
   "wcdma",
@@ -1063,6 +1064,11 @@
 this.STK_TIMER_DEACTIVATE = 0x01;
 this.STK_TMIER_GET_CURRENT_VALUE = 0x02;
 
+// Browser Launch Mode.
+this.STK_BROWSER_MODE_LAUNCH_IF_NOT_ALREADY_LAUNCHED = 0x00;
+this.STK_BROWSER_MODE_USING_EXISTING_BROWSER         = 0x02;
+this.STK_BROWSER_MODE_USING_NEW_BROWSER              = 0x03;
+
 // Browser Termination Cause.
 this.STK_BROWSER_TERMINATION_CAUSE_USER = 0x00;
 this.STK_BROWSER_TERMINATION_CAUSE_ERROR = 0x01;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RILSystemMessengerHelper.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RILSystemMessengerHelper.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RILSystemMessengerHelper.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RILSystemMessengerHelper.js	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,161 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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");
+
+let RSM = {};
+Cu.import("resource://gre/modules/RILSystemMessenger.jsm", RSM);
+
+const RILSYSTEMMESSENGERHELPER_CONTRACTID =
+  "@mozilla.org/ril/system-messenger-helper;1";
+const RILSYSTEMMESSENGERHELPER_CID =
+  Components.ID("{19d9a4ea-580d-11e4-8f6c-37ababfaaea9}");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gSystemMessenger",
+                                   "@mozilla.org/system-message-internal;1",
+                                   "nsISystemMessagesInternal");
+
+let DEBUG = false;
+function debug(s) {
+  dump("-@- RILSystemMessenger: " + s + "\n");
+};
+
+// Read debug setting from pref.
+try {
+  let debugPref = Services.prefs.getBoolPref("ril.debugging.enabled");
+  DEBUG = DEBUG || debugPref;
+} catch (e) {}
+
+/**
+ * RILSystemMessengerHelper
+ */
+function RILSystemMessengerHelper() {
+  this.messenger = new RSM.RILSystemMessenger();
+  this.messenger.broadcastMessage = (aType, aMessage) => {
+    if (DEBUG) {
+      debug("broadcastMessage: aType: " + aType +
+            ", aMessage: "+ JSON.stringify(aMessage));
+    }
+
+    gSystemMessenger.broadcastMessage(aType, aMessage);
+  };
+}
+RILSystemMessengerHelper.prototype = {
+
+  classID: RILSYSTEMMESSENGERHELPER_CID,
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsITelephonyMessenger,
+                                         Ci.nsISmsMessenger,
+                                         Ci.nsICellbroadcastMessenger,
+                                         Ci.nsIMobileConnectionMessenger,
+                                         Ci.nsIIccMessenger]),
+
+  /**
+   * RILSystemMessenger instance.
+   */
+  messenger: null,
+
+  /**
+   * nsITelephonyMessenger API
+   */
+  notifyNewCall: function() {
+    this.messenger.notifyNewCall();
+  },
+
+  notifyCallEnded: function(aServiceId, aNumber, aCdmaWaitingNumber, aEmergency,
+                            aDuration, aOutgoing, aHangUpLocal) {
+    this.messenger.notifyCallEnded(aServiceId, aNumber, aCdmaWaitingNumber, aEmergency,
+                                   aDuration, aOutgoing, aHangUpLocal);
+  },
+
+  /**
+   * nsISmsMessenger API
+   */
+  notifySms: function(aNotificationType, aId, aThreadId, aIccId, aDelivery,
+                      aDeliveryStatus, aSender, aReceiver, aBody, aMessageClass,
+                      aTimestamp, aSentTimestamp, aDeliveryTimestamp, aRead) {
+    this.messenger.notifySms(aNotificationType, aId, aThreadId, aIccId, aDelivery,
+                             aDeliveryStatus, aSender, aReceiver, aBody, aMessageClass,
+                             aTimestamp, aSentTimestamp, aDeliveryTimestamp, aRead);
+  },
+
+  /**
+   * nsICellbroadcastMessenger API
+   */
+  notifyCbMessageReceived: function(aServiceId, aGsmGeographicalScope, aMessageCode,
+                                    aMessageId, aLanguage, aBody, aMessageClass,
+                                    aTimestamp, aCdmaServiceCategory, aHasEtwsInfo,
+                                    aEtwsWarningType, aEtwsEmergencyUserAlert, aEtwsPopup) {
+    this.messenger.notifyCbMessageReceived(aServiceId, aGsmGeographicalScope, aMessageCode,
+                                           aMessageId, aLanguage, aBody, aMessageClass,
+                                           aTimestamp, aCdmaServiceCategory, aHasEtwsInfo,
+                                           aEtwsWarningType, aEtwsEmergencyUserAlert, aEtwsPopup);
+  },
+
+  /**
+   * nsIMobileConnectionMessenger API
+   */
+  notifyUssdReceived: function(aServiceId, aMessage, aSessionEnded) {
+    this.messenger.notifyUssdReceived(aServiceId, aMessage, aSessionEnded);
+  },
+
+  notifyCdmaInfoRecDisplay: function(aServiceId, aDisplay) {
+    this.messenger.notifyCdmaInfoRecDisplay(aServiceId, aDisplay);
+  },
+
+  notifyCdmaInfoRecCalledPartyNumber: function(aServiceId, aType, aPlan,
+                                               aNumber, aPi, aSi) {
+    this.messenger.notifyCdmaInfoRecCalledPartyNumber(aServiceId, aType, aPlan,
+                                                      aNumber, aPi, aSi);
+  },
+
+  notifyCdmaInfoRecCallingPartyNumber: function(aServiceId, aType, aPlan,
+                                                aNumber, aPi, aSi) {
+    this.messenger.notifyCdmaInfoRecCallingPartyNumber(aServiceId, aType, aPlan,
+                                                       aNumber, aPi, aSi);
+  },
+
+  notifyCdmaInfoRecConnectedPartyNumber: function(aServiceId, aType, aPlan,
+                                                  aNumber, aPi, aSi) {
+    this.messenger.notifyCdmaInfoRecConnectedPartyNumber(aServiceId, aType, aPlan,
+                                                         aNumber, aPi, aSi);
+  },
+
+  notifyCdmaInfoRecSignal: function(aServiceId, aType, aAlertPitch, aSignal) {
+    this.messenger.notifyCdmaInfoRecSignal(aServiceId, aType, aAlertPitch, aSignal);
+  },
+
+  notifyCdmaInfoRecRedirectingNumber: function(aServiceId, aType, aPlan,
+                                               aNumber, aPi, aSi, aReason) {
+    this.messenger.notifyCdmaInfoRecRedirectingNumber(aServiceId, aType, aPlan,
+                                                      aNumber, aPi, aSi, aReason);
+  },
+
+  notifyCdmaInfoRecLineControl: function(aServiceId, aPolarityIncluded,
+                                         aToggle, aReverse, aPowerDenial) {
+    this.messenger.notifyCdmaInfoRecLineControl(aServiceId, aPolarityIncluded,
+                                                aToggle, aReverse, aPowerDenial);
+  },
+
+  notifyCdmaInfoRecClir: function(aServiceId, aCause) {
+    this.messenger.notifyCdmaInfoRecClir(aServiceId, aCause);
+  },
+
+  notifyCdmaInfoRecAudioControl: function(aServiceId, aUpLink, aDownLink) {
+    this.messenger.notifyCdmaInfoRecAudioControl(aServiceId, aUpLink, aDownLink);
+  },
+
+  /**
+   * nsIIccMessenger API
+   */
+  notifyStkProactiveCommand: function(aIccId, aCommand) {
+    this.messenger.notifyStkProactiveCommand(aIccId, aCommand);
+  }
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([RILSystemMessengerHelper]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RILSystemMessengerHelper.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RILSystemMessengerHelper.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RILSystemMessengerHelper.manifest	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RILSystemMessengerHelper.manifest	2014-11-26 21:46: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/.
+
+component {19d9a4ea-580d-11e4-8f6c-37ababfaaea9} RILSystemMessengerHelper.js
+contract @mozilla.org/ril/system-messenger-helper;1 {19d9a4ea-580d-11e4-8f6c-37ababfaaea9}
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RILSystemMessenger.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RILSystemMessenger.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/RILSystemMessenger.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/RILSystemMessenger.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,326 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.defineLazyGetter(this, "RIL", function () {
+  let obj = {};
+  Cu.import("resource://gre/modules/ril_consts.js", obj);
+  return obj;
+});
+
+XPCOMUtils.defineLazyGetter(this, "gStkCmdFactory", function() {
+  let stk = {};
+  Cu.import("resource://gre/modules/StkProactiveCmdFactory.jsm", stk);
+  return stk.StkProactiveCmdFactory;
+});
+
+/**
+ * RILSystemMessenger
+ */
+this.RILSystemMessenger = function() {};
+RILSystemMessenger.prototype = {
+
+  /**
+   * Hook of Broadcast function
+   *
+   * @param aType
+   *        The type of the message to be sent.
+   * @param aMessage
+   *        The message object to be broadcasted.
+   */
+  broadcastMessage: function(aType, aMessage) {
+    // Function stub to be replaced by the owner of this messenger.
+  },
+
+  /**
+   * Wrapper to send "telephony-new-call" system message.
+   */
+  notifyNewCall: function() {
+    this.broadcastMessage("telephony-new-call", {});
+  },
+
+  /**
+   * Wrapper to send "telephony-call-ended" system message.
+   */
+  notifyCallEnded: function(aServiceId, aNumber, aCdmaWaitingNumber, aEmergency,
+                            aDuration, aOutgoing, aHangUpLocal) {
+    let data = {
+      serviceId: aServiceId,
+      number: aNumber,
+      emergency: aEmergency,
+      duration: aDuration,
+      direction: aOutgoing ? "outgoing" : "incoming",
+      hangUpLocal: aHangUpLocal
+    };
+
+    if (aCdmaWaitingNumber != null) {
+      data.secondNumber = aCdmaWaitingNumber;
+    }
+
+    this.broadcastMessage("telephony-call-ended", data);
+  },
+
+  _convertSmsMessageClass: function(aMessageClass) {
+    return RIL.GECKO_SMS_MESSAGE_CLASSES[aMessageClass] || null;
+  },
+
+  _convertSmsDelivery: function(aDelivery) {
+    return ["received", "sending", "sent", "error"][aDelivery] || null;
+  },
+
+  _convertSmsDeliveryStatus: function(aDeliveryStatus) {
+    return [
+      RIL.GECKO_SMS_DELIVERY_STATUS_NOT_APPLICABLE,
+      RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
+      RIL.GECKO_SMS_DELIVERY_STATUS_PENDING,
+      RIL.GECKO_SMS_DELIVERY_STATUS_ERROR
+    ][aDeliveryStatus] || null;
+  },
+
+  /**
+   * Wrapper to send 'sms-received', 'sms-delivery-success', 'sms-sent' system message.
+   */
+  notifySms: function(aNotificationType, aId, aThreadId, aIccId, aDelivery,
+                      aDeliveryStatus, aSender, aReceiver, aBody, aMessageClass,
+                      aTimestamp, aSentTimestamp, aDeliveryTimestamp, aRead) {
+    let msgType =
+      ["sms-received", "sms-sent", "sms-delivery-success"][aNotificationType];
+
+    if (!msgType) {
+      throw new Error("Invalid Notification Type: " + aNotificationType);
+    }
+
+    this.broadcastMessage(msgType, {
+      iccId:             aIccId,
+      type:              "sms",
+      id:                aId,
+      threadId:          aThreadId,
+      delivery:          this._convertSmsDelivery(aDelivery),
+      deliveryStatus:    this._convertSmsDeliveryStatus(aDeliveryStatus),
+      sender:            aSender,
+      receiver:          aReceiver,
+      body:              aBody,
+      messageClass:      this._convertSmsMessageClass(aMessageClass),
+      timestamp:         aTimestamp,
+      sentTimestamp:     aSentTimestamp,
+      deliveryTimestamp: aDeliveryTimestamp,
+      read:              aRead
+    });
+  },
+
+  _convertCbGsmGeographicalScope: function(aGeographicalScope) {
+    return RIL.CB_GSM_GEOGRAPHICAL_SCOPE_NAMES[aGeographicalScope] || null;
+  },
+
+  _convertCbMessageClass: function(aMessageClass) {
+    return RIL.GECKO_SMS_MESSAGE_CLASSES[aMessageClass] || null;
+  },
+
+  _convertCbEtwsWarningType: function(aWarningType) {
+    return RIL.CB_ETWS_WARNING_TYPE_NAMES[aWarningType] || null;
+  },
+
+  /**
+   * Wrapper to send 'cellbroadcast-received' system message.
+   */
+  notifyCbMessageReceived: function(aServiceId, aGsmGeographicalScope, aMessageCode,
+                                    aMessageId, aLanguage, aBody, aMessageClass,
+                                    aTimestamp, aCdmaServiceCategory, aHasEtwsInfo,
+                                    aEtwsWarningType, aEtwsEmergencyUserAlert, aEtwsPopup) {
+    // Align the same layout to MozCellBroadcastMessage
+    let data = {
+      serviceId: aServiceId,
+      gsmGeographicalScope: this._convertCbGsmGeographicalScope(aGsmGeographicalScope),
+      messageCode: aMessageCode,
+      messageId: aMessageId,
+      language: aLanguage,
+      body: aBody,
+      messageClass: this._convertCbMessageClass(aMessageClass),
+      timestamp: aTimestamp,
+      cdmaServiceCategory: null,
+      etws: null
+    };
+
+    if (aHasEtwsInfo) {
+      data.etws = {
+        warningType: this._convertCbEtwsWarningType(aEtwsWarningType),
+        emergencyUserAlert: aEtwsEmergencyUserAlert,
+        popup: aEtwsPopup
+      };
+    }
+
+    if (aCdmaServiceCategory !=
+        Ci.nsICellBroadcastService.CDMA_SERVICE_CATEGORY_INVALID) {
+      data.cdmaServiceCategory = aCdmaServiceCategory;
+    }
+
+    this.broadcastMessage("cellbroadcast-received", data);
+  },
+
+  /**
+   * Wrapper to send 'ussd-received' system message.
+   */
+  notifyUssdReceived: function(aServiceId, aMessage, aSessionEnded) {
+    this.broadcastMessage("ussd-received", {
+      serviceId: aServiceId,
+      message: aMessage,
+      sessionEnded: aSessionEnded
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Display Info.
+   */
+  notifyCdmaInfoRecDisplay: function(aServiceId, aDisplay) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      display: aDisplay
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Called Party
+   * Number Info.
+   */
+  notifyCdmaInfoRecCalledPartyNumber: function(aServiceId, aType, aPlan,
+                                               aNumber, aPi, aSi) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      calledNumber: {
+        type: aType,
+        plan: aPlan,
+        number: aNumber,
+        pi: aPi,
+        si: aSi
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Calling Party
+   * Number Info.
+   */
+  notifyCdmaInfoRecCallingPartyNumber: function(aServiceId, aType, aPlan,
+                                                aNumber, aPi, aSi) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      callingNumber: {
+        type: aType,
+        plan: aPlan,
+        number: aNumber,
+        pi: aPi,
+        si: aSi
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Connected Party
+   * Number Info.
+   */
+  notifyCdmaInfoRecConnectedPartyNumber: function(aServiceId, aType, aPlan,
+                                                  aNumber, aPi, aSi) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      connectedNumber: {
+        type: aType,
+        plan: aPlan,
+        number: aNumber,
+        pi: aPi,
+        si: aSi
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Signal Info.
+   */
+  notifyCdmaInfoRecSignal: function(aServiceId, aType, aAlertPitch, aSignal) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      signal: {
+        type: aType,
+        alertPitch: aAlertPitch,
+        signal: aSignal
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Redirecting
+   * Number Info.
+   */
+  notifyCdmaInfoRecRedirectingNumber: function(aServiceId, aType, aPlan,
+                                               aNumber, aPi, aSi, aReason) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      redirect: {
+        type: aType,
+        plan: aPlan,
+        number: aNumber,
+        pi: aPi,
+        si: aSi,
+        reason: aReason
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Line Control Info.
+   */
+  notifyCdmaInfoRecLineControl: function(aServiceId, aPolarityIncluded,
+                                         aToggle, aReverse, aPowerDenial) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      lineControl: {
+        polarityIncluded: aPolarityIncluded,
+        toggle: aToggle,
+        reverse: aReverse,
+        powerDenial: aPowerDenial
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with CLIR Info.
+   */
+  notifyCdmaInfoRecClir: function(aServiceId, aCause) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      clirCause: aCause
+    });
+  },
+
+  /**
+   * Wrapper to send 'cdma-info-rec-received' system message with Audio Control Info.
+   */
+  notifyCdmaInfoRecAudioControl: function(aServiceId, aUpLink, aDownLink) {
+    this.broadcastMessage("cdma-info-rec-received", {
+      clientId: aServiceId,
+      audioControl: {
+        upLink: aUpLink,
+        downLink: aDownLink
+      }
+    });
+  },
+
+  /**
+   * Wrapper to send 'icc-stkcommand' system message with Audio Control Info.
+   */
+  notifyStkProactiveCommand: function(aIccId, aCommand) {
+    this.broadcastMessage("icc-stkcommand", {
+      iccId: aIccId,
+      command: gStkCmdFactory.createCommandMessage(aCommand)
+    });
+  }
+};
+
+this.EXPORTED_SYMBOLS = [
+  'RILSystemMessenger'
+];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/ril_worker.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/ril_worker.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/ril_worker.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/ril_worker.js	2014-11-26 21:46:04.000000000 +0000
@@ -3935,8 +3935,25 @@
   /**
    * Helpers for processing call state changes.
    */
-  _processClassifiedCalls: function(removedCalls, remainedCalls, addedCalls,
-                                    failCause) {
+  _processCalls: function(newCalls, failCause) {
+    // Let's get the failCause first if there are removed calls. Otherwise, we
+    // need to trigger another async request when removing call and it cause
+    // the order of callDisconnected and conferenceCallStateChanged
+    // unpredictable.
+    if (failCause === undefined) {
+      for each (let currentCall in this.currentCalls) {
+        if (!newCalls[currentCall.callIndex] && !currentCall.hangUpLocal) {
+          this.getFailCauseCode((function(newCalls, failCause) {
+            this._processCalls(newCalls, failCause);
+          }).bind(this, newCalls));
+          return;
+        }
+      }
+    }
+
+    let [removedCalls, remainedCalls, addedCalls] =
+      this._classifyCalls(newCalls);
+
     // Handle removed calls.
     // Only remove it from the map here. Notify callDisconnected later.
     for (let call of removedCalls) {
@@ -4019,22 +4036,6 @@
     }
   },
 
-  _processCalls: function(newCalls) {
-    let [removed, remained, added] = this._classifyCalls(newCalls);
-
-    // Let's get the failCause first if there are removed calls. Otherwise, we
-    // need to trigger another async request when removing call and it cause
-    // the order of callDisconnected and conferenceCallStateChanged
-    // unpredictable.
-    if (removed.length) {
-      this.getFailCauseCode((function(removed, remained, added, failCause) {
-        this._processClassifiedCalls(removed, remained, added, failCause);
-      }).bind(this, removed, remained, added));
-    } else {
-      this._processClassifiedCalls(removed, remained, added);
-    }
-  },
-
   _detectAudioState: function() {
     let callNum = Object.keys(this.currentCalls).length;
     if (!callNum) {
@@ -4140,6 +4141,10 @@
     // can be removed if is the same as the current one.
     for each (let newDataCall in datacalls) {
       if (newDataCall.status != DATACALL_FAIL_NONE) {
+        if (newDataCallOptions) {
+          newDataCallOptions.status = newDataCall.status;
+          newDataCallOptions.suggestedRetryTime = newDataCall.suggestedRetryTime;
+        }
         this._sendDataCallError(newDataCallOptions || newDataCall,
                                 newDataCall.status);
       }
@@ -5270,13 +5275,13 @@
       return;
     }
 
-    cmdDetails.rilMessageType = "stkcommand";
-    cmdDetails.options =
-      this.context.StkCommandParamsFactory.createParam(cmdDetails, ctlvs);
-
-    if (!cmdDetails.options || !cmdDetails.options.pending) {
+    this.context.StkCommandParamsFactory.createParam(cmdDetails,
+                                                     ctlvs,
+                                                     (aResult) => {
+      cmdDetails.options = aResult;
+      cmdDetails.rilMessageType = "stkcommand";
       this.sendChromeMessage(cmdDetails);
-    }
+    });
   },
 
   /**
@@ -5389,10 +5394,6 @@
   if (length) {
     calls_length = Buf.readInt32();
   }
-  if (!calls_length) {
-    this._processCalls(null);
-    return;
-  }
 
   let calls = {};
   for (let i = 0; i < calls_length; i++) {
@@ -5466,10 +5467,6 @@
   options.success = options.rilRequestError === 0;
   options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
   this.sendChromeMessage(options);
-
-  if (options.success) {
-    this.getCurrentCalls();
-  }
 };
 RilObject.prototype[REQUEST_HANGUP_WAITING_OR_BACKGROUND] = function REQUEST_HANGUP_WAITING_OR_BACKGROUND(length, options) {
   RilObject.prototype[REQUEST_HANGUP].call(this, length, options);
@@ -5478,11 +5475,6 @@
   RilObject.prototype[REQUEST_HANGUP].call(this, length, options);
 };
 RilObject.prototype[REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE] = function REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE(length, options) {
-  if (options.rilRequestError) {
-    return;
-  }
-
-  this.getCurrentCalls();
 };
 RilObject.prototype[REQUEST_CONFERENCE] = function REQUEST_CONFERENCE(length, options) {
   options.success = (options.rilRequestError === 0);
@@ -10549,42 +10541,48 @@
 StkCommandParamsFactoryObject.prototype = {
   context: null,
 
-  createParam: function(cmdDetails, ctlvs) {
+  createParam: function(cmdDetails, ctlvs, onComplete) {
     let method = this[cmdDetails.typeOfCommand];
     if (typeof method != "function") {
       if (DEBUG) {
         this.context.debug("Unknown proactive command " +
                            cmdDetails.typeOfCommand.toString(16));
       }
-      return null;
+      return;
     }
-    return method.call(this, cmdDetails, ctlvs);
+    method.call(this, cmdDetails, ctlvs, onComplete);
   },
 
-  loadIconIfNecessary: function(cmdDetails, ctlvs, ret) {
-    let ctlv =
-      this.context.StkProactiveCmdHelper
-                  .searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-    if (!ctlv || !this.context.ICCUtilsHelper.isICCServiceAvailable("IMG")) {
-      return ret;
+  loadIcons: function(iconIdCtlvs, callback) {
+    if (!iconIdCtlvs ||
+        !this.context.ICCUtilsHelper.isICCServiceAvailable("IMG")) {
+      callback(null);
+      return;
     }
 
-    let iconId = ctlv.value;
-    ret.iconSelfExplanatory = iconId.qualifier == 0 ? true : false;
-
     let onerror = (function() {
-      this.context.RIL.sendChromeMessage(cmdDetails);
+      callback(null);
     }).bind(this);
 
-    let onsuccess = (function(result) {
-      ret.icons = result[0];
-      this.context.RIL.sendChromeMessage(cmdDetails);
+    let onsuccess = (function(aIcons) {
+      callback(aIcons);
     }).bind(this);
 
-    ret.pending = true;
-    this.context.IconLoader.loadIcons([iconId.identifier], onsuccess, onerror);
+    this.context.IconLoader.loadIcons(iconIdCtlvs.map(aCtlv => aCtlv.value.identifier),
+                                      onsuccess,
+                                      onerror);
+  },
 
-    return ret;
+  appendIconIfNecessary: function(iconIdCtlvs, result, onComplete) {
+    this.loadIcons(iconIdCtlvs, (aIcons) => {
+      if (aIcons) {
+        result.icons = aIcons[0];
+        result.iconSelfExplanatory =
+          iconIdCtlvs[0].value.qualifier == 0 ? true : false;
+      }
+
+      onComplete(result);
+    });
   },
 
   /**
@@ -10595,7 +10593,7 @@
    * @param ctlvs
    *        The all TLVs in this proactive command.
    */
-  processRefresh: function(cmdDetails, ctlvs) {
+  processRefresh: function(cmdDetails, ctlvs, onComplete) {
     let refreshType = cmdDetails.commandQualifier;
     switch (refreshType) {
       case STK_REFRESH_FILE_CHANGE:
@@ -10611,7 +10609,8 @@
         }
         break;
     }
-    return null;
+
+    onComplete(null);
   },
 
   /**
@@ -10622,7 +10621,7 @@
    * @param ctlvs
    *        The all TLVs in this proactive command.
    */
-  processPollInterval: function(cmdDetails, ctlvs) {
+  processPollInterval: function(cmdDetails, ctlvs, onComplete) {
     let ctlv = this.context.StkProactiveCmdHelper.searchForTag(
         COMPREHENSIONTLV_TAG_DURATION, ctlvs);
     if (!ctlv) {
@@ -10632,7 +10631,7 @@
       throw new Error("Stk Poll Interval: Required value missing : Duration");
     }
 
-    return ctlv.value;
+    onComplete(ctlv.value);
   },
 
   /**
@@ -10643,8 +10642,8 @@
    * @param ctlvs
    *        The all TLVs in this proactive command.
    */
-  processPollOff: function(cmdDetails, ctlvs) {
-    return null;
+  processPollOff: function(cmdDetails, ctlvs, onComplete) {
+    onComplete(null);
   },
 
   /**
@@ -10655,7 +10654,7 @@
    * @param ctlvs
    *        The all TLVs in this proactive command.
    */
-  processSetUpEventList: function(cmdDetails, ctlvs) {
+  processSetUpEventList: function(cmdDetails, ctlvs, onComplete) {
     let ctlv = this.context.StkProactiveCmdHelper.searchForTag(
         COMPREHENSIONTLV_TAG_EVENT_LIST, ctlvs);
     if (!ctlv) {
@@ -10665,7 +10664,7 @@
       throw new Error("Stk Event List: Required value missing : Event List");
     }
 
-    return ctlv.value || {eventList: null};
+    onComplete(ctlv.value || { eventList: null });
   },
 
   /**
@@ -10676,31 +10675,34 @@
    * @param ctlvs
    *        The all TLVs in this proactive command.
    */
-  processSelectItem: function(cmdDetails, ctlvs) {
+  processSelectItem: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let menu = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_ALPHA_ID,
+      COMPREHENSIONTLV_TAG_ITEM,
+      COMPREHENSIONTLV_TAG_ITEM_ID,
+      COMPREHENSIONTLV_TAG_NEXT_ACTION_IND,
+      COMPREHENSIONTLV_TAG_ICON_ID,
+      COMPREHENSIONTLV_TAG_ICON_ID_LIST
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
     if (ctlv) {
       menu.title = ctlv.value.identifier;
     }
 
-    menu.items = [];
-    for (let i = 0; i < ctlvs.length; i++) {
-      let ctlv = ctlvs[i];
-      if (ctlv.tag == COMPREHENSIONTLV_TAG_ITEM) {
-        menu.items.push(ctlv.value);
-      }
-    }
-
-    if (menu.items.length === 0) {
+    let menuCtlvs = selectedCtlvs[COMPREHENSIONTLV_TAG_ITEM];
+    if (!menuCtlvs) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
         resultCode: STK_RESULT_REQUIRED_VALUES_MISSING});
       throw new Error("Stk Menu: Required value missing : items");
     }
+    menu.items = menuCtlvs.map(aCtlv => aCtlv.value);
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_ITEM_ID, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ITEM_ID);
     if (ctlv) {
       menu.defaultItem = ctlv.value.identifier - 1;
     }
@@ -10713,61 +10715,61 @@
       menu.isHelpAvailable = true;
     }
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_NEXT_ACTION_IND, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_NEXT_ACTION_IND);
     if (ctlv) {
       menu.nextActionList = ctlv.value;
     }
 
-    let iconId;
-    let ids = [];
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-    if (ctlv) {
-      iconId = ctlv.value;
-      menu.iconSelfExplanatory = iconId.qualifier == 0 ? true : false;
-      ids[0] = iconId.identifier;
+    let iconIdCtlvs = null;
+    let menuIconCtlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ICON_ID);
+    if (menuIconCtlv) {
+      iconIdCtlvs = [menuIconCtlv];
     }
 
-    let iconIdList;
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID_LIST, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ICON_ID_LIST);
     if (ctlv) {
-      iconIdList = ctlv.value;
-      ids = ids.concat(iconIdList.identifiers);
-    }
-
-    if (!ids.length ||
-        !this.context.ICCUtilsHelper.isICCServiceAvailable("IMG")) {
-      return menu;
+      if (!iconIdCtlvs) {
+        iconIdCtlvs = [];
+      };
+      let iconIdList = ctlv.value;
+      iconIdCtlvs = iconIdCtlvs.concat(iconIdList.identifiers.map((aId) => {
+        return {
+          value: { qualifier: iconIdList.qualifier, identifier: aId }
+        };
+      }));
     }
 
-    let onerror = (function() {
-      this.context.RIL.sendChromeMessage(cmdDetails);
-    }).bind(this);
-
-    let onsuccess = (function(result) {
-      if (iconId) {
-        menu.icons = result.shift();
-      }
+    this.loadIcons(iconIdCtlvs, (aIcons) => {
+      if (aIcons) {
+        if (menuIconCtlv) {
+          menu.iconSelfExplanatory =
+            (iconIdCtlvs.shift().value.qualifier == 0) ? true: false;
+          menu.icons = aIcons.shift();
+        }
 
-      let iconSelfExplanatory = iconIdList.qualifier == 0 ? true : false;
-      for (let i = 0; i < result.length; i++) {
-        menu.items[i].icons = result[i];
-        menu.items[i].iconSelfExplanatory = iconSelfExplanatory;
+        for (let i = 0; i < aIcons.length; i++) {
+          menu.items[i].icons = aIcons[i];
+          menu.items[i].iconSelfExplanatory =
+            (iconIdCtlvs[i].value.qualifier == 0) ? true: false;
+        }
       }
 
-      this.context.RIL.sendChromeMessage(cmdDetails);
-    }).bind(this);
-
-    menu.pending = true;
-    this.context.IconLoader.loadIcons(ids, onsuccess, onerror);
-
-    return menu;
+      onComplete(menu);
+    });
   },
 
-  processDisplayText: function(cmdDetails, ctlvs) {
+  processDisplayText: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let textMsg = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_TEXT_STRING, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_TEXT_STRING,
+      COMPREHENSIONTLV_TAG_IMMEDIATE_RESPONSE,
+      COMPREHENSIONTLV_TAG_DURATION,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TEXT_STRING);
     if (!ctlv) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
@@ -10776,12 +10778,12 @@
     }
     textMsg.text = ctlv.value.textString;
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_IMMEDIATE_RESPONSE, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_IMMEDIATE_RESPONSE);
     if (ctlv) {
       textMsg.responseNeeded = true;
     }
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_DURATION, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_DURATION);
     if (ctlv) {
       textMsg.duration = ctlv.value;
     }
@@ -10796,15 +10798,21 @@
       textMsg.userClear = true;
     }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, textMsg);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               textMsg,
+                               onComplete);
   },
 
-  processSetUpIdleModeText: function(cmdDetails, ctlvs) {
+  processSetUpIdleModeText: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let textMsg = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(
-      COMPREHENSIONTLV_TAG_TEXT_STRING, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_TEXT_STRING,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TEXT_STRING);
     if (!ctlv) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
@@ -10813,14 +10821,22 @@
     }
     textMsg.text = ctlv.value.textString;
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, textMsg);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               textMsg,
+                               onComplete);
   },
 
-  processGetInkey: function(cmdDetails, ctlvs) {
+  processGetInkey: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let input = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_TEXT_STRING, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_TEXT_STRING,
+      COMPREHENSIONTLV_TAG_DURATION,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TEXT_STRING);
     if (!ctlv) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
@@ -10830,8 +10846,7 @@
     input.text = ctlv.value.textString;
 
     // duration
-    ctlv = StkProactiveCmdHelper.searchForTag(
-        COMPREHENSIONTLV_TAG_DURATION, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_DURATION);
     if (ctlv) {
       input.duration = ctlv.value;
     }
@@ -10860,14 +10875,23 @@
       input.isHelpAvailable = true;
     }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, input);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               input,
+                               onComplete);
   },
 
-  processGetInput: function(cmdDetails, ctlvs) {
+  processGetInput: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let input = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_TEXT_STRING, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_TEXT_STRING,
+      COMPREHENSIONTLV_TAG_RESPONSE_LENGTH,
+      COMPREHENSIONTLV_TAG_DEFAULT_TEXT,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TEXT_STRING);
     if (!ctlv) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
@@ -10876,13 +10900,13 @@
     }
     input.text = ctlv.value.textString;
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_RESPONSE_LENGTH, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_RESPONSE_LENGTH);
     if (ctlv) {
       input.minLength = ctlv.value.minLength;
       input.maxLength = ctlv.value.maxLength;
     }
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_DEFAULT_TEXT, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_DEFAULT_TEXT);
     if (ctlv) {
       input.defaultText = ctlv.value.textString;
     }
@@ -10912,60 +10936,102 @@
       input.isHelpAvailable = true;
     }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, input);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               input,
+                               onComplete);
   },
 
-  processEventNotify: function(cmdDetails, ctlvs) {
+  processEventNotify: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let textMsg = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(
-      COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_ALPHA_ID,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
     if (ctlv) {
       textMsg.text = ctlv.value.identifier;
     }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, textMsg);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               textMsg,
+                               onComplete);
   },
 
-  processSetupCall: function(cmdDetails, ctlvs) {
+  processSetupCall: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let call = {};
-    let iter = Iterator(ctlvs);
+    let confirmMessage = {};
+    let callMessage = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
-    if (ctlv) {
-      call.confirmMessage = ctlv.value.identifier;
-    }
-
-    ctlv = StkProactiveCmdHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
-    if (ctlv) {
-      call.callMessage = ctlv.value.identifier;
-    }
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_ADDRESS,
+      COMPREHENSIONTLV_TAG_ALPHA_ID,
+      COMPREHENSIONTLV_TAG_ICON_ID,
+      COMPREHENSIONTLV_TAG_DURATION
+    ]);
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_ADDRESS, ctlvs);
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ADDRESS);
     if (!ctlv) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
         resultCode: STK_RESULT_REQUIRED_VALUES_MISSING});
-      throw new Error("Stk Set Up Call: Required value missing : Adress");
+      throw new Error("Stk Set Up Call: Required value missing : Address");
     }
     call.address = ctlv.value.number;
 
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
+    if (ctlv) {
+      confirmMessage.text = ctlv.value.identifier;
+      call.confirmMessage = confirmMessage;
+    }
+
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
+    if (ctlv) {
+      callMessage.text = ctlv.value.identifier;
+      call.callMessage = callMessage;
+    }
+
     // see 3GPP TS 31.111 section 6.4.13
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_DURATION, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_DURATION);
     if (ctlv) {
       call.duration = ctlv.value;
     }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, call);
+    let iconIdCtlvs = selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null;
+    this.loadIcons(iconIdCtlvs, (aIcons) => {
+      if (aIcons) {
+        confirmMessage.icons = aIcons[0];
+        confirmMessage.iconSelfExplanatory =
+          (iconIdCtlvs[0].value.qualifier == 0) ? true: false;
+        call.confirmMessage = confirmMessage;
+
+        if (aIcons.length > 1) {
+          callMessage.icons = aIcons[1];
+          callMessage.iconSelfExplanatory =
+            (iconIdCtlvs[1].value.qualifier == 0) ? true: false;
+          call.callMessage = callMessage;
+        }
+      }
+
+      onComplete(call);
+    });
   },
 
-  processLaunchBrowser: function(cmdDetails, ctlvs) {
+  processLaunchBrowser: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let browser = {};
+    let confirmMessage = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_URL, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_URL,
+      COMPREHENSIONTLV_TAG_ALPHA_ID,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_URL);
     if (!ctlv) {
       this.context.RIL.sendStkTerminalResponse({
         command: cmdDetails,
@@ -10974,33 +11040,49 @@
     }
     browser.url = ctlv.value.url;
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
+    browser.mode = cmdDetails.commandQualifier & 0x03;
+
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
     if (ctlv) {
-      browser.confirmMessage = ctlv.value.identifier;
+      confirmMessage.text = ctlv.value.identifier;
+      browser.confirmMessage = confirmMessage;
     }
 
-    browser.mode = cmdDetails.commandQualifier & 0x03;
+    let iconIdCtlvs = selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null;
+    this.loadIcons(iconIdCtlvs, (aIcons) => {
+       if (aIcons) {
+         confirmMessage.icons = aIcons[0];
+         confirmMessage.iconSelfExplanatory =
+           (iconIdCtlvs[0].value.qualifier == 0) ? true: false;
+         browser.confirmMessage = confirmMessage;
+       }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, browser);
+       onComplete(browser);
+    });
   },
 
-  processPlayTone: function(cmdDetails, ctlvs) {
+  processPlayTone: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let playTone = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(
-      COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_ALPHA_ID,
+      COMPREHENSIONTLV_TAG_TONE,
+      COMPREHENSIONTLV_TAG_DURATION,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
     if (ctlv) {
       playTone.text = ctlv.value.identifier;
     }
 
-    ctlv = StkProactiveCmdHelper.searchForTag(COMPREHENSIONTLV_TAG_TONE, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TONE);
     if (ctlv) {
       playTone.tone = ctlv.value.tone;
     }
 
-    ctlv = StkProactiveCmdHelper.searchForTag(
-        COMPREHENSIONTLV_TAG_DURATION, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_DURATION);
     if (ctlv) {
       playTone.duration = ctlv.value;
     }
@@ -11008,7 +11090,9 @@
     // vibrate is only defined in TS 102.223
     playTone.isVibrate = (cmdDetails.commandQualifier & 0x01) !== 0x00;
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, playTone);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               playTone,
+                               onComplete);
   },
 
   /**
@@ -11019,32 +11103,36 @@
    * @param ctlvs
    *        The all TLVs in this proactive command.
    */
-  processProvideLocalInfo: function(cmdDetails, ctlvs) {
+  processProvideLocalInfo: function(cmdDetails, ctlvs, onComplete) {
     let provideLocalInfo = {
       localInfoType: cmdDetails.commandQualifier
     };
-    return provideLocalInfo;
+
+    onComplete(provideLocalInfo);
   },
 
-  processTimerManagement: function(cmdDetails, ctlvs) {
+  processTimerManagement: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let timer = {
       timerAction: cmdDetails.commandQualifier
     };
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(
-        COMPREHENSIONTLV_TAG_TIMER_IDENTIFIER, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_TIMER_IDENTIFIER,
+      COMPREHENSIONTLV_TAG_TIMER_VALUE
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TIMER_IDENTIFIER);
     if (ctlv) {
       timer.timerId = ctlv.value.timerId;
     }
 
-    ctlv = StkProactiveCmdHelper.searchForTag(
-        COMPREHENSIONTLV_TAG_TIMER_VALUE, ctlvs);
+    ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_TIMER_VALUE);
     if (ctlv) {
       timer.timerValue = ctlv.value.timerValue;
     }
 
-    return timer;
+    onComplete(timer);
   },
 
    /**
@@ -11055,87 +11143,93 @@
     * @param ctlvs
     *        The all TLVs in this proactive command.
     */
-  processBipMessage: function(cmdDetails, ctlvs) {
+  processBipMessage: function(cmdDetails, ctlvs, onComplete) {
     let StkProactiveCmdHelper = this.context.StkProactiveCmdHelper;
     let bipMsg = {};
 
-    let ctlv = StkProactiveCmdHelper.searchForTag(
-      COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
+    let selectedCtlvs = StkProactiveCmdHelper.searchForSelectedTags(ctlvs, [
+      COMPREHENSIONTLV_TAG_ALPHA_ID,
+      COMPREHENSIONTLV_TAG_ICON_ID
+    ]);
+
+    let ctlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
     if (ctlv) {
       bipMsg.text = ctlv.value.identifier;
     }
 
-    return this.loadIconIfNecessary(cmdDetails, ctlvs, bipMsg);
+    this.appendIconIfNecessary(selectedCtlvs[COMPREHENSIONTLV_TAG_ICON_ID] || null,
+                               bipMsg,
+                               onComplete);
   }
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_REFRESH] = function STK_CMD_REFRESH(cmdDetails, ctlvs) {
-  return this.processRefresh(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_REFRESH] = function STK_CMD_REFRESH(cmdDetails, ctlvs, onComplete) {
+  return this.processRefresh(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_POLL_INTERVAL] = function STK_CMD_POLL_INTERVAL(cmdDetails, ctlvs) {
-  return this.processPollInterval(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_POLL_INTERVAL] = function STK_CMD_POLL_INTERVAL(cmdDetails, ctlvs, onComplete) {
+  return this.processPollInterval(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_POLL_OFF] = function STK_CMD_POLL_OFF(cmdDetails, ctlvs) {
-  return this.processPollOff(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_POLL_OFF] = function STK_CMD_POLL_OFF(cmdDetails, ctlvs, onComplete) {
+  return this.processPollOff(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_PROVIDE_LOCAL_INFO] = function STK_CMD_PROVIDE_LOCAL_INFO(cmdDetails, ctlvs) {
-  return this.processProvideLocalInfo(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_PROVIDE_LOCAL_INFO] = function STK_CMD_PROVIDE_LOCAL_INFO(cmdDetails, ctlvs, onComplete) {
+  return this.processProvideLocalInfo(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_EVENT_LIST] = function STK_CMD_SET_UP_EVENT_LIST(cmdDetails, ctlvs) {
-  return this.processSetUpEventList(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_EVENT_LIST] = function STK_CMD_SET_UP_EVENT_LIST(cmdDetails, ctlvs, onComplete) {
+  return this.processSetUpEventList(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_MENU] = function STK_CMD_SET_UP_MENU(cmdDetails, ctlvs) {
-  return this.processSelectItem(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_MENU] = function STK_CMD_SET_UP_MENU(cmdDetails, ctlvs, onComplete) {
+  return this.processSelectItem(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SELECT_ITEM] = function STK_CMD_SELECT_ITEM(cmdDetails, ctlvs) {
-  return this.processSelectItem(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SELECT_ITEM] = function STK_CMD_SELECT_ITEM(cmdDetails, ctlvs, onComplete) {
+  return this.processSelectItem(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_DISPLAY_TEXT] = function STK_CMD_DISPLAY_TEXT(cmdDetails, ctlvs) {
-  return this.processDisplayText(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_DISPLAY_TEXT] = function STK_CMD_DISPLAY_TEXT(cmdDetails, ctlvs, onComplete) {
+  return this.processDisplayText(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_IDLE_MODE_TEXT] = function STK_CMD_SET_UP_IDLE_MODE_TEXT(cmdDetails, ctlvs) {
-  return this.processSetUpIdleModeText(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_IDLE_MODE_TEXT] = function STK_CMD_SET_UP_IDLE_MODE_TEXT(cmdDetails, ctlvs, onComplete) {
+  return this.processSetUpIdleModeText(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_GET_INKEY] = function STK_CMD_GET_INKEY(cmdDetails, ctlvs) {
-  return this.processGetInkey(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_GET_INKEY] = function STK_CMD_GET_INKEY(cmdDetails, ctlvs, onComplete) {
+  return this.processGetInkey(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_GET_INPUT] = function STK_CMD_GET_INPUT(cmdDetails, ctlvs) {
-  return this.processGetInput(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_GET_INPUT] = function STK_CMD_GET_INPUT(cmdDetails, ctlvs, onComplete) {
+  return this.processGetInput(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_SS] = function STK_CMD_SEND_SS(cmdDetails, ctlvs) {
-  return this.processEventNotify(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_SS] = function STK_CMD_SEND_SS(cmdDetails, ctlvs, onComplete) {
+  return this.processEventNotify(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_USSD] = function STK_CMD_SEND_USSD(cmdDetails, ctlvs) {
-  return this.processEventNotify(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_USSD] = function STK_CMD_SEND_USSD(cmdDetails, ctlvs, onComplete) {
+  return this.processEventNotify(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_SMS] = function STK_CMD_SEND_SMS(cmdDetails, ctlvs) {
-  return this.processEventNotify(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_SMS] = function STK_CMD_SEND_SMS(cmdDetails, ctlvs, onComplete) {
+  return this.processEventNotify(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_DTMF] = function STK_CMD_SEND_DTMF(cmdDetails, ctlvs) {
-  return this.processEventNotify(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_DTMF] = function STK_CMD_SEND_DTMF(cmdDetails, ctlvs, onComplete) {
+  return this.processEventNotify(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_CALL] = function STK_CMD_SET_UP_CALL(cmdDetails, ctlvs) {
-  return this.processSetupCall(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SET_UP_CALL] = function STK_CMD_SET_UP_CALL(cmdDetails, ctlvs, onComplete) {
+  return this.processSetupCall(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_LAUNCH_BROWSER] = function STK_CMD_LAUNCH_BROWSER(cmdDetails, ctlvs) {
-  return this.processLaunchBrowser(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_LAUNCH_BROWSER] = function STK_CMD_LAUNCH_BROWSER(cmdDetails, ctlvs, onComplete) {
+  return this.processLaunchBrowser(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_PLAY_TONE] = function STK_CMD_PLAY_TONE(cmdDetails, ctlvs) {
-  return this.processPlayTone(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_PLAY_TONE] = function STK_CMD_PLAY_TONE(cmdDetails, ctlvs, onComplete) {
+  return this.processPlayTone(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_TIMER_MANAGEMENT] = function STK_CMD_TIMER_MANAGEMENT(cmdDetails, ctlvs) {
-  return this.processTimerManagement(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_TIMER_MANAGEMENT] = function STK_CMD_TIMER_MANAGEMENT(cmdDetails, ctlvs, onComplete) {
+  return this.processTimerManagement(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_OPEN_CHANNEL] = function STK_CMD_OPEN_CHANNEL(cmdDetails, ctlvs) {
-  return this.processBipMessage(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_OPEN_CHANNEL] = function STK_CMD_OPEN_CHANNEL(cmdDetails, ctlvs, onComplete) {
+  return this.processBipMessage(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_CLOSE_CHANNEL] = function STK_CMD_CLOSE_CHANNEL(cmdDetails, ctlvs) {
-  return this.processBipMessage(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_CLOSE_CHANNEL] = function STK_CMD_CLOSE_CHANNEL(cmdDetails, ctlvs, onComplete) {
+  return this.processBipMessage(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_RECEIVE_DATA] = function STK_CMD_RECEIVE_DATA(cmdDetails, ctlvs) {
-  return this.processBipMessage(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_RECEIVE_DATA] = function STK_CMD_RECEIVE_DATA(cmdDetails, ctlvs, onComplete) {
+  return this.processBipMessage(cmdDetails, ctlvs, onComplete);
 };
-StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_DATA] = function STK_CMD_SEND_DATA(cmdDetails, ctlvs) {
-  return this.processBipMessage(cmdDetails, ctlvs);
+StkCommandParamsFactoryObject.prototype[STK_CMD_SEND_DATA] = function STK_CMD_SEND_DATA(cmdDetails, ctlvs, onComplete) {
+  return this.processBipMessage(cmdDetails, ctlvs, onComplete);
 };
 
 function StkProactiveCmdHelperObject(aContext) {
@@ -11540,10 +11634,6 @@
 
   searchForTag: function(tag, ctlvs) {
     let iter = Iterator(ctlvs);
-    return this.searchForNextTag(tag, iter);
-  },
-
-  searchForNextTag: function(tag, iter) {
     for (let [index, ctlv] in iter) {
       if ((ctlv.tag & ~COMPREHENSIONTLV_FLAG_CR) == tag) {
         return ctlv;
@@ -11551,6 +11641,28 @@
     }
     return null;
   },
+
+  searchForSelectedTags: function(ctlvs, tags) {
+    let ret = {
+      // Handy utility to de-queue the 1st ctlv of the specified tag.
+      retrieve: function(aTag) {
+        return (this[aTag]) ? this[aTag].shift() : null;
+      }
+    };
+
+    ctlvs.forEach((aCtlv) => {
+      tags.forEach((aTag) => {
+        if ((aCtlv.tag & ~COMPREHENSIONTLV_FLAG_CR) == aTag) {
+          if (!ret[aTag]) {
+            ret[aTag] = [];
+          }
+          ret[aTag].push(aCtlv);
+        }
+      });
+    });
+
+    return ret;
+  },
 };
 StkProactiveCmdHelperObject.prototype[COMPREHENSIONTLV_TAG_COMMAND_DETAILS] = function COMPREHENSIONTLV_TAG_COMMAND_DETAILS(length) {
   return this.retrieveCommandDetails(length);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/head.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/head.js	2014-11-26 21:46:04.000000000 +0000
@@ -9,6 +9,20 @@
 const TOPIC_CONNECTION_STATE_CHANGED = "network-connection-state-changed";
 const TOPIC_NETWORK_ACTIVE_CHANGED = "network-active-changed";
 
+const NETWORK_TYPE_MOBILE = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE;
+const NETWORK_TYPE_MOBILE_MMS = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS;
+const NETWORK_TYPE_MOBILE_SUPL = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_SUPL;
+const NETWORK_TYPE_MOBILE_IMS = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_IMS;
+const NETWORK_TYPE_MOBILE_DUN = Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN;
+
+const networkTypes = [
+  NETWORK_TYPE_MOBILE,
+  NETWORK_TYPE_MOBILE_MMS,
+  NETWORK_TYPE_MOBILE_SUPL,
+  NETWORK_TYPE_MOBILE_IMS,
+  NETWORK_TYPE_MOBILE_DUN
+];
+
 let Promise = Cu.import("resource://gre/modules/Promise.jsm").Promise;
 
 let ril = Cc["@mozilla.org/ril;1"].getService(Ci.nsIRadioInterfaceLayer);
@@ -107,14 +121,6 @@
   return deferred.promise;
 }
 
-let mobileTypeMapping = {
-  "default": Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE,
-  "mms": Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS,
-  "supl": Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_SUPL,
-  "ims": Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_IMS,
-  "dun": Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_DUN
-};
-
 /**
  * Set the default data connection enabling state, wait for
  * "network-connection-state-changed" event and verify state.
@@ -132,8 +138,8 @@
     .then(function(aSubject) {
       ok(aSubject instanceof Ci.nsIRilNetworkInterface,
          "subject should be an instance of nsIRILNetworkInterface");
-      is(aSubject.type, Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE,
-         "subject.type should be " + Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE);
+      is(aSubject.type, NETWORK_TYPE_MOBILE,
+         "subject.type should be " + NETWORK_TYPE_MOBILE);
       is(aSubject.state,
          aEnabled ? Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED
                   : Ci.nsINetworkInterface.NETWORK_STATE_DISCONNECTED,
@@ -150,26 +156,25 @@
  *
  * Fulfill params: (none)
  *
- * @param aType
- *        The string of the type of data connection to setup.
+ * @param aNetworkType
+ *        The mobile network type to setup.
  *
  * @return A deferred promise.
  */
-function setupDataCallAndWait(aType) {
-  log("setupDataCallAndWait: " + aType);
+function setupDataCallAndWait(aNetworkType) {
+  log("setupDataCallAndWait: " + aNetworkType);
 
   let promises = [];
   promises.push(waitForObserverEvent(TOPIC_CONNECTION_STATE_CHANGED)
     .then(function(aSubject) {
-      let networkType = mobileTypeMapping[aType];
       ok(aSubject instanceof Ci.nsIRilNetworkInterface,
          "subject should be an instance of nsIRILNetworkInterface");
-      is(aSubject.type, networkType,
-         "subject.type should be " + networkType);
+      is(aSubject.type, aNetworkType,
+         "subject.type should be " + aNetworkType);
       is(aSubject.state, Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED,
          "subject.state should be CONNECTED");
     }));
-  promises.push(radioInterface.setupDataCallByType(aType));
+  promises.push(radioInterface.setupDataCallByType(aNetworkType));
 
   return Promise.all(promises);
 }
@@ -180,26 +185,25 @@
  *
  * Fulfill params: (none)
  *
- * @param aType
- *        The string of the type of data connection to deactivate.
+ * @param aNetworkType
+ *        The mobile network type to deactivate.
  *
  * @return A deferred promise.
  */
-function deactivateDataCallAndWait(aType) {
-  log("deactivateDataCallAndWait: " + aType);
+function deactivateDataCallAndWait(aNetworkType) {
+  log("deactivateDataCallAndWait: " + aNetworkType);
 
   let promises = [];
   promises.push(waitForObserverEvent(TOPIC_CONNECTION_STATE_CHANGED)
     .then(function(aSubject) {
-      let networkType = mobileTypeMapping[aType];
       ok(aSubject instanceof Ci.nsIRilNetworkInterface,
          "subject should be an instance of nsIRILNetworkInterface");
-      is(aSubject.type, networkType,
-         "subject.type should be " + networkType);
+      is(aSubject.type, aNetworkType,
+         "subject.type should be " + aNetworkType);
       is(aSubject.state, Ci.nsINetworkInterface.NETWORK_STATE_DISCONNECTED,
          "subject.state should be DISCONNECTED");
     }));
-  promises.push(radioInterface.deactivateDataCallByType(aType));
+  promises.push(radioInterface.deactivateDataCallByType(aNetworkType));
 
   return Promise.all(promises);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/test_data_connection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/test_data_connection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/test_data_connection.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/test_data_connection.js	2014-11-26 21:46:04.000000000 +0000
@@ -53,10 +53,10 @@
       currentApn = value;
     })
     .then(setEmulatorAPN)
-    .then(() => doTestNonDefaultDataConnection("mms"))
-    .then(() => doTestNonDefaultDataConnection("supl"))
-    .then(() => doTestNonDefaultDataConnection("ims"))
-    .then(() => doTestNonDefaultDataConnection("dun"))
+    .then(() => doTestNonDefaultDataConnection(NETWORK_TYPE_MOBILE_MMS))
+    .then(() => doTestNonDefaultDataConnection(NETWORK_TYPE_MOBILE_SUPL))
+    .then(() => doTestNonDefaultDataConnection(NETWORK_TYPE_MOBILE_IMS))
+    .then(() => doTestNonDefaultDataConnection(NETWORK_TYPE_MOBILE_DUN))
     // Restore APN settings
     .then(() => setSettings(SETTINGS_KEY_DATA_APN_SETTINGS, currentApn));
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/test_multiple_data_connection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/test_multiple_data_connection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/test_multiple_data_connection.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/test_multiple_data_connection.js	2014-11-26 21:46:04.000000000 +0000
@@ -44,10 +44,9 @@
   log("= testSetupConcurrentDataCalls =");
 
   let promise = Promise.resolve();
-  let types = Object.keys(mobileTypeMapping);
   // Skip default mobile type.
   for (let i = 1; i < MAX_DATA_CONTEXTS; i++) {
-    let type = types[i];
+    let type = networkTypes[i];
     promise = promise.then(() => setupDataCallAndWait(type));
   }
   return promise;
@@ -57,10 +56,9 @@
   log("= testDeactivateConcurrentDataCalls =");
 
   let promise = Promise.resolve();
-  let types = Object.keys(mobileTypeMapping);
   // Skip default mobile type.
   for (let i = 1; i < MAX_DATA_CONTEXTS; i++) {
-    let type = types[i];
+    let type = networkTypes[i];
     promise = promise.then(() => deactivateDataCallAndWait(type));
   }
   return promise;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/test_network_active_changed.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/test_network_active_changed.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/marionette/test_network_active_changed.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/marionette/test_network_active_changed.js	2014-11-26 21:46:04.000000000 +0000
@@ -33,7 +33,7 @@
          "subject should be an instance of nsINetworkInterface");
       ok(subject instanceof Ci.nsIRilNetworkInterface,
          "subject should be an instance of nsIRILNetworkInterface");
-      is(subject.type, Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE,
+      is(subject.type, NETWORK_TYPE_MOBILE,
          "subject.type should be NETWORK_TYPE_MOBILE");
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/test_ril_system_messenger.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/test_ril_system_messenger.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/test_ril_system_messenger.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/test_ril_system_messenger.js	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,1111 @@
+/* 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");
+
+let RIL = {};
+Cu.import("resource://gre/modules/ril_consts.js", RIL);
+
+XPCOMUtils.defineLazyGetter(this, "gStkCmdFactory", function() {
+  let stk = {};
+  Cu.import("resource://gre/modules/StkProactiveCmdFactory.jsm", stk);
+  return stk.StkProactiveCmdFactory;
+});
+
+/**
+ * Name space for RILSystemMessenger.jsm. Only initialized after first call to
+ * newRILSystemMessenger.
+ */
+let RSM;
+
+let gReceivedMsgType = null;
+let gReceivedMessage = null;
+
+/**
+ * Create a new RILSystemMessenger instance.
+ *
+ * @return a RILSystemMessenger instance.
+ */
+function newRILSystemMessenger() {
+  if (!RSM) {
+    RSM = Cu.import("resource://gre/modules/RILSystemMessenger.jsm", {});
+    equal(typeof RSM.RILSystemMessenger, "function", "RSM.RILSystemMessenger");
+  }
+
+  let rsm = new RSM.RILSystemMessenger();
+  rsm.broadcastMessage = (aType, aMessage) => {
+    gReceivedMsgType = aType;
+    gReceivedMessage = aMessage;
+  };
+
+  return rsm;
+}
+
+function equal_received_system_message(aType, aMessage) {
+  equal(aType, gReceivedMsgType);
+  deepEqual(aMessage, gReceivedMessage);
+  gReceivedMsgType = null;
+  gReceivedMessage = null;
+}
+
+/**
+ * Verify that each nsIXxxMessenger could be retrieved.
+ */
+function run_test() {
+  let telephonyMessenger = Cc["@mozilla.org/ril/system-messenger-helper;1"]
+                           .getService(Ci.nsITelephonyMessenger);
+
+  let smsMessenger = Cc["@mozilla.org/ril/system-messenger-helper;1"]
+                     .getService(Ci.nsISmsMessenger);
+
+  let cellbroadcastMessenger = Cc["@mozilla.org/ril/system-messenger-helper;1"]
+                               .getService(Ci.nsICellbroadcastMessenger);
+
+  let mobileConnectionMessenger = Cc["@mozilla.org/ril/system-messenger-helper;1"]
+                                  .getService(Ci.nsIMobileConnectionMessenger);
+
+  let iccMessenger = Cc["@mozilla.org/ril/system-messenger-helper;1"]
+                     .getService(Ci.nsIIccMessenger);
+
+  ok(telephonyMessenger !== null, "Get TelephonyMessenger.");
+  ok(smsMessenger != null, "Get SmsMessenger.");
+  ok(cellbroadcastMessenger != null, "Get CellbroadcastMessenger.");
+  ok(mobileConnectionMessenger != null, "Get MobileConnectionMessenger.");
+  ok(iccMessenger != null, "Get IccMessenger.");
+
+  run_next_test();
+}
+
+/**
+ * Verify RILSystemMessenger.notifyNewCall()
+ */
+add_test(function test_telephony_messenger_notify_new_call() {
+  let messenger = newRILSystemMessenger();
+
+  messenger.notifyNewCall();
+  equal_received_system_message("telephony-new-call", {});
+
+  run_next_test();
+});
+
+/**
+ * Verify RILSystemMessenger.notifyCallEnded()
+ */
+add_test(function test_telephony_messenger_notify_call_ended() {
+  let messenger = newRILSystemMessenger();
+
+  messenger.notifyCallEnded(1,
+                            "+0987654321",
+                            null,
+                            true,
+                            500,
+                            false,
+                            true);
+
+  equal_received_system_message("telephony-call-ended", {
+    serviceId: 1,
+    number: "+0987654321",
+    emergency: true,
+    duration: 500,
+    direction: "incoming",
+    hangUpLocal: true
+  });
+
+  // Verify 'optional' parameter of secondNumber.
+  messenger.notifyCallEnded(1,
+                            "+0987654321",
+                            "+1234567890",
+                            true,
+                            500,
+                            true,
+                            false);
+
+  equal_received_system_message("telephony-call-ended", {
+    serviceId: 1,
+    number: "+0987654321",
+    emergency: true,
+    duration: 500,
+    direction: "outgoing",
+    hangUpLocal: false,
+    secondNumber: "+1234567890"
+  });
+
+  run_next_test();
+});
+
+/**
+ * Verify RILSystemMessenger.notifySms()
+ */
+add_test(function test_sms_messenger_notify_sms() {
+  let messenger = newRILSystemMessenger();
+  let timestamp = Date.now();
+  let sentTimestamp = timestamp + 100;
+  let deliveryTimestamp = sentTimestamp + 100;
+
+  // Verify 'sms-received' system message.
+  messenger.notifySms(Ci.nsISmsMessenger.NOTIFICATION_TYPE_RECEIVED,
+                      1,
+                      2,
+                      "99887766554433221100",
+                      Ci.nsISmsService.DELIVERY_TYPE_RECEIVED,
+                      Ci.nsISmsService.DELIVERY_STATUS_TYPE_SUCCESS,
+                      "+0987654321",
+                      null,
+                      "Incoming message",
+                      Ci.nsISmsService.MESSAGE_CLASS_TYPE_CLASS_2,
+                      timestamp,
+                      sentTimestamp,
+                      0,
+                      false);
+
+  equal_received_system_message("sms-received", {
+      iccId:             "99887766554433221100",
+      type:              "sms",
+      id:                1,
+      threadId:          2,
+      delivery:          "received",
+      deliveryStatus:    "success",
+      sender:            "+0987654321",
+      receiver:          null,
+      body:              "Incoming message",
+      messageClass:      "class-2",
+      timestamp:         timestamp,
+      sentTimestamp:     sentTimestamp,
+      deliveryTimestamp: 0,
+      read:              false
+    });
+
+  // Verify 'sms-sent' system message.
+  messenger.notifySms(Ci.nsISmsMessenger.NOTIFICATION_TYPE_SENT,
+                      3,
+                      4,
+                      "99887766554433221100",
+                      Ci.nsISmsService.DELIVERY_TYPE_SENT,
+                      Ci.nsISmsService.DELIVERY_STATUS_TYPE_PENDING,
+                      null,
+                      "+0987654321",
+                      "Outgoing message",
+                      Ci.nsISmsService.MESSAGE_CLASS_TYPE_NORMAL,
+                      timestamp,
+                      0,
+                      0,
+                      true);
+
+  equal_received_system_message("sms-sent", {
+      iccId:             "99887766554433221100",
+      type:              "sms",
+      id:                3,
+      threadId:          4,
+      delivery:          "sent",
+      deliveryStatus:    "pending",
+      sender:            null,
+      receiver:          "+0987654321",
+      body:              "Outgoing message",
+      messageClass:      "normal",
+      timestamp:         timestamp,
+      sentTimestamp:     0,
+      deliveryTimestamp: 0,
+      read:              true
+    });
+
+  // Verify 'sms-delivery-success' system message.
+  messenger.notifySms(Ci.nsISmsMessenger.NOTIFICATION_TYPE_DELIVERY_SUCCESS,
+                      5,
+                      6,
+                      "99887766554433221100",
+                      Ci.nsISmsService.DELIVERY_TYPE_SENT,
+                      Ci.nsISmsService.DELIVERY_STATUS_TYPE_SUCCESS,
+                      null,
+                      "+0987654321",
+                      "Outgoing message",
+                      Ci.nsISmsService.MESSAGE_CLASS_TYPE_NORMAL,
+                      timestamp,
+                      0,
+                      deliveryTimestamp,
+                      true);
+
+  equal_received_system_message("sms-delivery-success", {
+      iccId:             "99887766554433221100",
+      type:              "sms",
+      id:                5,
+      threadId:          6,
+      delivery:          "sent",
+      deliveryStatus:    "success",
+      sender:            null,
+      receiver:          "+0987654321",
+      body:              "Outgoing message",
+      messageClass:      "normal",
+      timestamp:         timestamp,
+      sentTimestamp:     0,
+      deliveryTimestamp: deliveryTimestamp,
+      read:              true
+    });
+
+  // Verify the protection of invalid nsISmsMessenger.NOTIFICATION_TYPEs.
+  try {
+    messenger.notifySms(3,
+                        1,
+                        2,
+                        "99887766554433221100",
+                        Ci.nsISmsService.DELIVERY_TYPE_RECEIVED,
+                        Ci.nsISmsService.DELIVERY_STATUS_TYPE_SUCCESS,
+                        "+0987654321",
+                        null,
+                        "Incoming message",
+                        Ci.nsISmsService.MESSAGE_CLASS_TYPE_NORMAL,
+                        timestamp,
+                        sentTimestamp,
+                        0,
+                        false);
+    ok(false, "Failed to verify the protection of invalid nsISmsMessenger.NOTIFICATION_TYPE!");
+  } catch (e) {}
+
+  run_next_test();
+});
+
+/**
+ * Verify RILSystemMessenger.notifyCbMessageReceived()
+ */
+add_test(function test_cellbroadcast_messenger_notify_cb_message_received() {
+  let messenger = newRILSystemMessenger();
+  let timestamp = Date.now();
+
+  // Verify ETWS
+  messenger.notifyCbMessageReceived(0,
+                                    Ci.nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_CELL_IMMEDIATE,
+                                    256,
+                                    4352,
+                                    null,
+                                    null,
+                                    Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_NORMAL,
+                                    timestamp,
+                                    Ci.nsICellBroadcastService.CDMA_SERVICE_CATEGORY_INVALID,
+                                    true,
+                                    Ci.nsICellBroadcastService.GSM_ETWS_WARNING_EARTHQUAKE,
+                                    false,
+                                    true);
+  equal_received_system_message("cellbroadcast-received", {
+      serviceId: 0,
+      gsmGeographicalScope: "cell-immediate",
+      messageCode: 256,
+      messageId: 4352,
+      language: null,
+      body: null,
+      messageClass: "normal",
+      timestamp: timestamp,
+      cdmaServiceCategory: null,
+      etws: {
+        warningType: "earthquake",
+        emergencyUserAlert: false,
+        popup: true
+      }
+  });
+
+  // Verify Normal CB Message
+  messenger.notifyCbMessageReceived(1,
+                                    Ci.nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_PLMN,
+                                    0,
+                                    50,
+                                    "en",
+                                    "The quick brown fox jumps over the lazy dog",
+                                    Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_NORMAL,
+                                    timestamp,
+                                    Ci.nsICellBroadcastService.CDMA_SERVICE_CATEGORY_INVALID,
+                                    false,
+                                    Ci.nsICellBroadcastService.GSM_ETWS_WARNING_INVALID,
+                                    false,
+                                    false);
+  equal_received_system_message("cellbroadcast-received", {
+      serviceId: 1,
+      gsmGeographicalScope: "plmn",
+      messageCode: 0,
+      messageId: 50,
+      language: "en",
+      body: "The quick brown fox jumps over the lazy dog",
+      messageClass: "normal",
+      timestamp: timestamp,
+      cdmaServiceCategory: null,
+      etws: null
+  });
+
+  // Verify CB Message with ETWS Info
+  messenger.notifyCbMessageReceived(0,
+                                    Ci.nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_LOCATION_AREA,
+                                    0,
+                                    4354,
+                                    "en",
+                                    "Earthquake & Tsunami Warning!",
+                                    Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_0,
+                                    timestamp,
+                                    Ci.nsICellBroadcastService.CDMA_SERVICE_CATEGORY_INVALID,
+                                    true,
+                                    Ci.nsICellBroadcastService.GSM_ETWS_WARNING_EARTHQUAKE_TSUNAMI,
+                                    true,
+                                    false);
+  equal_received_system_message("cellbroadcast-received", {
+      serviceId: 0,
+      gsmGeographicalScope: "location-area",
+      messageCode: 0,
+      messageId: 4354,
+      language: "en",
+      body: "Earthquake & Tsunami Warning!",
+      messageClass: "class-0",
+      timestamp: timestamp,
+      cdmaServiceCategory: null,
+      etws: {
+        warningType: "earthquake-tsunami",
+        emergencyUserAlert: true,
+        popup: false
+      }
+  });
+
+  // Verify CDMA CB Message
+  messenger.notifyCbMessageReceived(0,
+                                    Ci.nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_INVALID,
+                                    0,
+                                    0,
+                                    null,
+                                    "CDMA CB Message",
+                                    Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_NORMAL,
+                                    timestamp,
+                                    512,
+                                    false,
+                                    Ci.nsICellBroadcastService.GSM_ETWS_WARNING_INVALID,
+                                    false,
+                                    false);
+  equal_received_system_message("cellbroadcast-received", {
+      serviceId: 0,
+      gsmGeographicalScope: null,
+      messageCode: 0,
+      messageId: 0,
+      language: null,
+      body: "CDMA CB Message",
+      messageClass: "normal",
+      timestamp: timestamp,
+      cdmaServiceCategory: 512,
+      etws: null
+  });
+
+  run_next_test();
+});
+
+/**
+ * Verify RILSystemMessenger.notifyUssdReceived()
+ */
+add_test(function test_mobileconnection_notify_ussd_received() {
+  let messenger = newRILSystemMessenger();
+
+  messenger.notifyUssdReceived(0, "USSD Message", false);
+
+  equal_received_system_message("ussd-received", {
+    serviceId: 0,
+    message: "USSD Message",
+    sessionEnded: false
+  });
+
+  messenger.notifyUssdReceived(1, "USSD Message", true);
+
+  equal_received_system_message("ussd-received", {
+    serviceId: 1,
+    message: "USSD Message",
+    sessionEnded: true
+  });
+
+  run_next_test();
+});
+
+/**
+ * Verify RILSystemMessenger.notifyCdmaInfoRecXXX()
+ */
+add_test(function test_mobileconnection_notify_cdma_info() {
+  let messenger = newRILSystemMessenger();
+
+  messenger.notifyCdmaInfoRecDisplay(0, "CDMA Display Info");
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 0,
+    display: "CDMA Display Info"
+  });
+
+  messenger.notifyCdmaInfoRecCalledPartyNumber(1, 1, 2, "+0987654321", 3, 4);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 1,
+    calledNumber: {
+      type: 1,
+      plan: 2,
+      number: "+0987654321",
+      pi: 3,
+      si: 4
+    }
+  });
+
+  messenger.notifyCdmaInfoRecCallingPartyNumber(0, 5, 6, "+1234567890", 7, 8);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 0,
+    callingNumber: {
+      type: 5,
+      plan: 6,
+      number: "+1234567890",
+      pi: 7,
+      si: 8
+    }
+  });
+
+  messenger.notifyCdmaInfoRecConnectedPartyNumber(1, 4, 3, "+56473839201", 2, 1);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 1,
+    connectedNumber: {
+      type: 4,
+      plan: 3,
+      number: "+56473839201",
+      pi: 2,
+      si: 1
+    }
+  });
+
+  messenger.notifyCdmaInfoRecSignal(0, 1, 2, 3);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 0,
+      signal: {
+        type: 1,
+        alertPitch: 2,
+        signal: 3
+      }
+  });
+
+  messenger.notifyCdmaInfoRecRedirectingNumber(1, 8, 7, "+1029384756", 6, 5, 4);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 1,
+    redirect: {
+      type: 8,
+      plan: 7,
+      number: "+1029384756",
+      pi: 6,
+      si: 5,
+      reason: 4
+    }
+  });
+
+  messenger.notifyCdmaInfoRecLineControl(0, 1, 0, 1, 255);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 0,
+    lineControl: {
+      polarityIncluded: 1,
+      toggle: 0,
+      reverse: 1,
+      powerDenial: 255
+    }
+  });
+
+  messenger.notifyCdmaInfoRecClir(1, 256);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 1,
+    clirCause: 256
+  });
+
+  messenger.notifyCdmaInfoRecAudioControl(0, 255, -1);
+
+  equal_received_system_message("cdma-info-rec-received", {
+    clientId: 0,
+    audioControl: {
+      upLink: 255,
+      downLink: -1
+    }
+  });
+
+  run_next_test();
+});
+
+/**
+ * Verify Error Handling of StkProactiveCmdFactory.createCommand()
+ */
+add_test(function test_icc_stk_cmd_factory_create_command_error() {
+  let messenger = newRILSystemMessenger();
+
+  // Verify the protection of invalid typeOfCommand.
+  try {
+    gStkCmdFactory.createCommand({
+      commandNumber: 0,
+      typeOfCommand: RIL.STK_CMD_MORE_TIME, // Invalid TypeOfCommand
+      commandQualifier: 0x00
+    });
+
+    ok(false, "Failed to verify the protection of createCommand()!");
+  } catch (e) {
+    equal(e.message, "Unknown Command Type: " + RIL.STK_CMD_MORE_TIME);
+  }
+
+  run_next_test();
+});
+
+/**
+ * Verify Error Handling of StkProactiveCmdFactory.createCommandMessage()
+ */
+add_test(function test_icc_stk_cmd_factory_create_system_msg_invalid_cmd_type() {
+  let messenger = newRILSystemMessenger();
+  let iccId = "99887766554433221100";
+
+  // Verify the protection of invalid typeOfCommand.
+  try {
+    gStkCmdFactory.createCommandMessage({
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd]),
+
+      // nsIStkProactiveCmd
+      commandNumber: 0,
+      typeOfCommand: RIL.STK_CMD_MORE_TIME, // Invalid TypeOfCommand
+      commandQualifier: 0
+    });
+
+    ok(false, "Failed to identify invalid typeOfCommand!");
+  } catch (e) {
+    equal(e.message, "Unknown Command Type: " + RIL.STK_CMD_MORE_TIME);
+  }
+
+  run_next_test();
+});
+
+/**
+ * Verify Error Handling of StkProactiveCmdFactory.createCommandMessage()
+ */
+add_test(function test_icc_stk_cmd_factory_create_system_msg_incorrect_cmd_type() {
+  let messenger = newRILSystemMessenger();
+  let iccId = "99887766554433221100";
+
+  // Verify the protection of invalid typeOfCommand.
+  try {
+    gStkCmdFactory.createCommandMessage({
+      QueryInterface: XPCOMUtils.generateQI([Ci.nsIStkProactiveCmd,
+                                             Ci.nsIStkProvideLocalInfoCmd]),
+
+      // nsIStkProactiveCmd
+      commandNumber: 0,
+      typeOfCommand: RIL.STK_CMD_POLL_INTERVAL, // Incorrect typeOfCommand
+      commandQualifier: 0,
+      // nsIStkProvideLocalInfoCmd
+      localInfoType: 0x00,
+    });
+
+    ok(false, "Failed to identify incorrect typeOfCommand!");
+  } catch (e) {
+    ok(e.message.indexOf("Failed to convert command into concrete class: ") !== -1);
+  }
+
+  run_next_test();
+});
+
+/**
+ * Verify RILSystemMessenger.notifyStkProactiveCommand()
+ */
+add_test(function test_icc_notify_stk_proactive_command() {
+  let messenger = newRILSystemMessenger();
+  let iccId = "99887766554433221100";
+  let WHT = 0xFFFFFFFF;
+  let BLK = 0x000000FF;
+  let RED = 0xFF0000FF;
+  let GRN = 0x00FF00FF;
+  let BLU = 0x0000FFFF;
+  let TSP = 0;
+  // Basic Image, see Anex B.1 in TS 31.102.
+  let basicIcon = {
+    width: 8,
+    height: 8,
+    codingScheme: "basic",
+    pixels: [WHT, WHT, WHT, WHT, WHT, WHT, WHT, WHT,
+             BLK, BLK, BLK, BLK, BLK, BLK, WHT, WHT,
+             WHT, BLK, WHT, BLK, BLK, WHT, BLK, WHT,
+             WHT, BLK, BLK, WHT, WHT, BLK, BLK, WHT,
+             WHT, BLK, BLK, WHT, WHT, BLK, BLK, WHT,
+             WHT, BLK, WHT, BLK, BLK, WHT, BLK, WHT,
+             WHT, WHT, BLK, BLK, BLK, BLK, WHT, WHT,
+             WHT, WHT, WHT, WHT, WHT, WHT, WHT, WHT]
+  };
+  // Color Image, see Anex B.2 in TS 31.102.
+  let colorIcon = {
+    width: 8,
+    height: 8,
+    codingScheme: "color",
+    pixels: [BLU, BLU, BLU, BLU, BLU, BLU, BLU, BLU,
+             BLU, RED, RED, RED, RED, RED, RED, BLU,
+             BLU, RED, GRN, GRN, GRN, RED, RED, BLU,
+             BLU, RED, RED, GRN, GRN, RED, RED, BLU,
+             BLU, RED, RED, GRN, GRN, RED, RED, BLU,
+             BLU, RED, RED, GRN, GRN, GRN, RED, BLU,
+             BLU, RED, RED, RED, RED, RED, RED, BLU,
+             BLU, BLU, BLU, BLU, BLU, BLU, BLU, BLU]
+  };
+  // Color Image with Transparency, see Anex B.2 in TS 31.102.
+  let colorTransparencyIcon = {
+    width: 8,
+    height: 8,
+    codingScheme: "color-transparency",
+    pixels: [TSP, TSP, TSP, TSP, TSP, TSP, TSP, TSP,
+             TSP, RED, RED, RED, RED, RED, RED, TSP,
+             TSP, RED, GRN, GRN, GRN, RED, RED, TSP,
+             TSP, RED, RED, GRN, GRN, RED, RED, TSP,
+             TSP, RED, RED, GRN, GRN, RED, RED, TSP,
+             TSP, RED, RED, GRN, GRN, GRN, RED, TSP,
+             TSP, RED, RED, RED, RED, RED, RED, TSP,
+             TSP, TSP, TSP, TSP, TSP, TSP, TSP, TSP]
+  };
+
+  let cmdCount = 0;
+
+  // Test Messages:
+  let messages = [
+    // STK_CMD_REFRESH
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_REFRESH,
+      commandQualifier: 0x04 // UICC Reset
+    },
+    // STK_CMD_POLL_INTERVAL
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_POLL_INTERVAL,
+      commandQualifier: 0x00, // RFU
+      options: {
+        timeUnit: RIL.STK_TIME_UNIT_TENTH_SECOND,
+        timeInterval: 0x05
+      }
+    },
+    // STK_CMD_POLL_OFF
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_POLL_OFF,
+      commandQualifier: 0x00, // RFU
+    },
+    // STK_CMD_PROVIDE_LOCAL_INFO
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_PROVIDE_LOCAL_INFO,
+      commandQualifier: 0x01, // IMEI of the terminal
+      options: {
+        localInfoType: 0x01 // IMEI of the terminal
+      }
+    },
+    // STK_CMD_SET_UP_EVENT_LIST with eventList
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_EVENT_LIST,
+      commandQualifier: 0x00, // RFU
+      options: {
+        eventList: [ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+                     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                     0x18, 0x19, 0x1A, 0x1B, 0x1C ]
+      }
+    },
+    // STK_CMD_SET_UP_EVENT_LIST without eventList
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_EVENT_LIST,
+      commandQualifier: 0x00, // RFU
+      options: {
+        eventList: null
+      }
+    },
+    // STK_CMD_SET_UP_MENU with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_MENU,
+      commandQualifier: 0x80, // bit 8: 1 = help information available
+      options: {
+        title: "Toolkit Menu 1",
+        items: [
+          { identifier: 0x01, text: "Menu Item 1" },
+          { identifier: 0x02, text: "Menu Item 2" },
+          { identifier: 0x03, text: "Menu Item 3" }
+        ],
+        presentationType: RIL.STK_PRESENTATION_TYPE_NOT_SPECIFIED,
+        isHelpAvailable: true
+      }
+    },
+    // STK_CMD_SET_UP_MENU with optional properties including:
+    // iconInfo for this menu, iconInfo for each item and nextActionList.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_MENU,
+      commandQualifier: 0x00, // bit 8: 0 = help information is not available
+      options: {
+        title: "Toolkit Menu 2",
+        items: [
+          { identifier: 0x01,
+            text: "Menu Item 1",
+            iconSelfExplanatory: true,
+            icons: [basicIcon]
+          },
+          { identifier: 0x02,
+            text: "Menu Item 2",
+            iconSelfExplanatory: false,
+            icons: [basicIcon, colorIcon]
+          },
+          { identifier: 0x03,
+            text: "Menu Item 3",
+            iconSelfExplanatory: true,
+            icons: [basicIcon, colorIcon, colorTransparencyIcon]
+          },
+        ],
+        nextActionList: [
+          RIL.STK_NEXT_ACTION_END_PROACTIVE_SESSION,
+          RIL.STK_NEXT_ACTION_NULL,
+          RIL.STK_NEXT_ACTION_NULL,
+          RIL.STK_NEXT_ACTION_NULL
+        ],
+        iconSelfExplanatory: false,
+        icons: [basicIcon, colorIcon, colorTransparencyIcon],
+        presentationType: RIL.STK_PRESENTATION_TYPE_NOT_SPECIFIED,
+        isHelpAvailable: false
+      }
+    },
+    // STK_CMD_SELECT_ITEM with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SELECT_ITEM,
+      commandQualifier: RIL.STK_PRESENTATION_TYPE_NOT_SPECIFIED,
+      options: {
+        items: [
+          { identifier: 0x01, text: "Menu Item 1" },
+          { identifier: 0x02, text: "Menu Item 2" },
+          { identifier: 0x03, text: "Menu Item 3" }
+        ],
+        isHelpAvailable: false
+      }
+    },
+    // STK_CMD_SELECT_ITEM with optional properties including:
+    // title, iconInfo for this menu, iconInfo for each item and nextActionList.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SELECT_ITEM,
+      commandQualifier: RIL.STK_PRESENTATION_TYPE_NAVIGATION_OPTIONS,
+      options: {
+        title: "Selected Toolkit Menu",
+        items: [
+          { identifier: 0x01,
+            text: "Menu Item 1",
+            iconSelfExplanatory: true,
+            icons: [basicIcon]
+          },
+          { identifier: 0x02,
+            text: "Menu Item 2",
+            iconSelfExplanatory: false,
+            icons: [basicIcon, colorIcon]
+          },
+          { identifier: 0x03,
+            text: "Menu Item 3",
+            iconSelfExplanatory: true,
+            icons: [basicIcon, colorIcon, colorTransparencyIcon]
+          },
+        ],
+        nextActionList: [
+          RIL.STK_NEXT_ACTION_END_PROACTIVE_SESSION,
+          RIL.STK_NEXT_ACTION_NULL,
+          RIL.STK_NEXT_ACTION_NULL,
+          RIL.STK_NEXT_ACTION_NULL
+        ],
+        defaultItem: 0x02,
+        iconSelfExplanatory: false,
+        icons: [basicIcon, colorIcon, colorTransparencyIcon],
+        isHelpAvailable: false
+      }
+    },
+    // STK_CMD_DISPLAY_TEXT with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_DISPLAY_TEXT,
+      commandQualifier: 0x01, // bit 1: High Priority
+      options: {
+        text: "Display Text 1",
+        isHighPriority: true,
+        userClear: false,
+        responseNeeded: false
+      }
+    },
+    // STK_CMD_DISPLAY_TEXT with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_DISPLAY_TEXT,
+      commandQualifier: 0x80, // bit 8: User Clear
+      options: {
+        text: "Display Text 2",
+        isHighPriority: false,
+        userClear: true,
+        responseNeeded: true,
+        duration: {
+          timeUnit: RIL.STK_TIME_UNIT_TENTH_SECOND,
+          timeInterval: 0x05
+        },
+        iconSelfExplanatory: true,
+        icons: [basicIcon]
+      }
+    },
+    // STK_CMD_SET_UP_IDLE_MODE_TEXT
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_IDLE_MODE_TEXT,
+      commandQualifier: 0x00, // RFU
+      options: {
+        text: "Setup Idle Mode Text"
+      }
+    },
+    // STK_CMD_SEND_SS
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SEND_SS,
+      commandQualifier: 0x00, // RFU
+      options: {
+        text: "Send SS",
+        iconSelfExplanatory: true,
+        icons: [colorIcon]
+      }
+    },
+    // STK_CMD_SEND_USSD
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SEND_USSD,
+      commandQualifier: 0x00, // RFU
+      options: {
+        text: "Send USSD"
+      }
+    },
+    // STK_CMD_SEND_SMS
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SEND_SMS,
+      commandQualifier: 0x00, // RFU
+      options: {
+        text: "Send SMS",
+        iconSelfExplanatory: false,
+        icons: [colorTransparencyIcon]
+      }
+    },
+    // STK_CMD_SEND_DTMF
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SEND_DTMF,
+      commandQualifier: 0x00, // RFU
+      options: {
+        text: "Send DTMF",
+        iconSelfExplanatory: true,
+        icons: [basicIcon]
+      }
+    },
+    // STK_CMD_GET_INKEY
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_GET_INKEY,
+      commandQualifier: 0x84, // bit 3: isYesNoRequested, bit 8: isHelpAvailable
+      options: {
+        text: "Get Input Key",
+        minLength: 1,
+        maxLength: 1,
+        duration: {
+          timeUnit: RIL.STK_TIME_UNIT_SECOND,
+          timeInterval: 0x0A
+        },
+        isAlphabet: false,
+        isUCS2: false,
+        isYesNoRequested: true,
+        isHelpAvailable: true,
+        iconSelfExplanatory: false,
+        icons: [colorIcon]
+      }
+    },
+    // STK_CMD_GET_INPUT
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_GET_INPUT,
+      commandQualifier: 0x0F, // bit 1-4: isAlphabet, isUCS2, hideInput, isPacked
+      options: {
+        text: "Get Input Text",
+        minLength: 1,
+        maxLength: 255,
+        defaultText: "Default Input Text",
+        isAlphabet: true,
+        isUCS2: true,
+        hideInput: true,
+        isPacked: true,
+        isHelpAvailable: false,
+        iconSelfExplanatory: true,
+        icons: [basicIcon]
+      }
+    },
+    // STK_CMD_SET_UP_CALL with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_CALL,
+      commandQualifier: 0x00, // RFU
+      options: {
+        address: "+0987654321"
+      }
+    },
+    // STK_CMD_SET_UP_CALL with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SET_UP_CALL,
+      commandQualifier: 0x00, // RFU
+      options: {
+        address: "+0987654321",
+        confirmMessage: {
+          text: "Confirm Message",
+          iconSelfExplanatory: false,
+          icons: [colorIcon]
+        },
+        callMessage: {
+          text: "Call Message",
+          iconSelfExplanatory: true,
+          icons: [basicIcon]
+        },
+        duration: {
+          timeUnit: RIL.STK_TIME_UNIT_SECOND,
+          timeInterval: 0x0A
+        }
+      }
+    },
+    // STK_CMD_LAUNCH_BROWSER with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_LAUNCH_BROWSER,
+      commandQualifier: RIL.STK_BROWSER_MODE_USING_NEW_BROWSER,
+      options: {
+        url: "http://www.mozilla.org",
+        mode: RIL.STK_BROWSER_MODE_USING_NEW_BROWSER
+      }
+    },
+    // STK_CMD_LAUNCH_BROWSER with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_LAUNCH_BROWSER,
+      commandQualifier: RIL.STK_BROWSER_MODE_USING_NEW_BROWSER,
+      options: {
+        url: "http://www.mozilla.org",
+        mode: RIL.STK_BROWSER_MODE_USING_NEW_BROWSER,
+        confirmMessage: {
+          text: "Confirm Message for Launch Browser",
+          iconSelfExplanatory: false,
+          icons: [colorTransparencyIcon]
+        }
+      }
+    },
+    // STK_CMD_PLAY_TONE with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_PLAY_TONE,
+      commandQualifier: 0x01, // isVibrate
+      options: {
+        isVibrate: true
+      }
+    },
+    // STK_CMD_PLAY_TONE with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_PLAY_TONE,
+      commandQualifier: 0x00, // isVibrate = false
+      options: {
+        text: "Play Tone",
+        tone: RIL.STK_TONE_TYPE_CONGESTION,
+        isVibrate: false,
+        duration: {
+          timeUnit: RIL.STK_TIME_UNIT_SECOND,
+          timeInterval: 0x0A
+        },
+        iconSelfExplanatory: true,
+        icons: [basicIcon]
+      }
+    },
+    // STK_CMD_TIMER_MANAGEMENT with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_TIMER_MANAGEMENT,
+      commandQualifier: RIL.STK_TIMER_DEACTIVATE,
+      options: {
+        timerId: 0x08,
+        timerAction: RIL.STK_TIMER_DEACTIVATE
+      }
+    },
+    // STK_CMD_TIMER_MANAGEMENT with optional properties.
+    {
+      commandNumber: ++cmdCount,
+        typeOfCommand: RIL.STK_CMD_TIMER_MANAGEMENT,
+        commandQualifier: RIL.STK_TIMER_START,
+        options: {
+          timerId: 0x01,
+          timerValue: (12 * 60 * 60) + (30 * 60) + (30), // 12:30:30
+          timerAction: RIL.STK_TIMER_START
+        }
+    },
+    // STK_CMD_OPEN_CHANNEL with mandatory properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_OPEN_CHANNEL,
+      commandQualifier: 0x00,  //RFU
+      options: {
+      }
+    },
+    // STK_CMD_OPEN_CHANNEL with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_OPEN_CHANNEL,
+      commandQualifier: 0x00,  //RFU
+      options: {
+        text: "Open Channel",
+        iconSelfExplanatory: false,
+        icons: [colorIcon]
+      }
+    },
+    // STK_CMD_CLOSE_CHANNEL with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_CLOSE_CHANNEL,
+      commandQualifier: 0x00,  //RFU
+      options: {
+        text: "Close Channel",
+        iconSelfExplanatory: true,
+        icons: [colorTransparencyIcon]
+      }
+    },
+    // STK_CMD_SEND_DATA with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_SEND_DATA,
+      commandQualifier: 0x00,  //RFU
+      options: {
+        iconSelfExplanatory: false,
+        icons: [basicIcon]
+      }
+    },
+    // STK_CMD_RECEIVE_DATA with optional properties.
+    {
+      commandNumber: ++cmdCount,
+      typeOfCommand: RIL.STK_CMD_RECEIVE_DATA,
+      commandQualifier: 0x00,  //RFU
+      options: {
+        text: "Receive Data"
+      }
+    },
+    null // Termination condition to run_next_test()
+  ];
+
+  messages.forEach(function(aMessage) {
+    if (!aMessage) {
+      run_next_test();
+      return;
+    }
+
+    messenger.notifyStkProactiveCommand(iccId,
+                                        gStkCmdFactory.createCommand(aMessage));
+
+    equal_received_system_message("icc-stkcommand", {
+      iccId: iccId,
+      command: aMessage
+    });
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js	2014-11-26 21:46:04.000000000 +0000
@@ -72,7 +72,7 @@
     do_check_eq(postedMessage.callIndex, resultCallIndex);
 
     // Clear all existed calls.
-    context.RIL._processCalls(null);
+    context.RIL._processCalls({});
   }
 
   testNotification(oneCall, SUPP_SVC_NOTIFICATION_CODE2_PUT_ON_HOLD, null,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js	2014-11-26 21:46:04.000000000 +0000
@@ -403,10 +403,53 @@
 });
 
 // Test Proactive commands.
+
+function test_stk_proactive_command(aOptions) {
+  let worker = newUint8Worker();
+  let context = worker.ContextPool._contexts[0];
+  let pduHelper = context.GsmPDUHelper;
+  let berHelper = context.BerTlvHelper;
+  let stkHelper = context.StkProactiveCmdHelper;
+  let stkFactory = context.StkCommandParamsFactory;
+
+  let testPdu = aOptions.pdu;
+  let testTypeOfCommand = aOptions.typeOfCommand;
+  let testIcons = aOptions.icons;
+  let testFunc = aOptions.testFunc;
+
+  if (testIcons) {
+    let ril = context.RIL;
+    ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                              0x00, 0x30]; //IMG: 39
+    ril.appType = CARD_APPTYPE_SIM;
+
+    // skip asynchornous process in IconLoader.loadIcons().
+    let iconLoader = context.IconLoader;
+    iconLoader.loadIcons = (recordNumbers, onsuccess, onerror) => {
+      onsuccess(testIcons);
+    };
+  }
+
+  for(let i = 0 ; i < testPdu.length; i++) {
+    pduHelper.writeHexOctet(testPdu[i]);
+  }
+
+  let berTlv = berHelper.decode(testPdu.length);
+  let ctlvs = berTlv.value;
+  let ctlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
+  let cmdDetails = ctlv.value;
+  do_check_eq(cmdDetails.typeOfCommand, testTypeOfCommand);
+
+  stkFactory.createParam(cmdDetails, ctlvs, (aResult) => {
+    cmdDetails.options = aResult;
+    testFunc(context, cmdDetails, ctlvs);
+  });
+}
+
 /**
- * Verify Proactive command helper : searchForNextTag
+ * Verify Proactive command helper : searchForSelectedTags
  */
-add_test(function test_stk_proactive_command_search_next_tag() {
+add_test(function test_stk_proactive_command_search_for_selected_tags() {
   let worker = newUint8Worker();
   let context = worker.ContextPool._contexts[0];
   let pduHelper = context.GsmPDUHelper;
@@ -427,20 +470,21 @@
   }
 
   let berTlv = berHelper.decode(tag_test.length);
-  let iter = Iterator(berTlv.value);
-  let tlv = stkHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
+  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");
 
-  tlv = stkHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
+  tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
   do_check_eq(tlv.value.identifier, "alpha id 2");
 
-  tlv = stkHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
+  tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
   do_check_eq(tlv.value.identifier, "alpha id 3");
 
-  tlv = stkHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
+  tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
   do_check_eq(tlv.value.identifier, "alpha id 4");
 
-  tlv = stkHelper.searchForNextTag(COMPREHENSIONTLV_TAG_ALPHA_ID, iter);
+  tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
   do_check_eq(tlv.value.identifier, "alpha id 5");
 
   run_next_test();
@@ -450,32 +494,22 @@
  * Verify Proactive Command : Refresh
  */
 add_test(function test_stk_proactive_command_refresh() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-
-  let refresh_1 = [
-    0xD0,
-    0x10,
-    0x81, 0x03, 0x01, 0x01, 0x01,
-    0x82, 0x02, 0x81, 0x82,
-    0x92, 0x05, 0x01, 0x3F, 0x00, 0x2F, 0xE2];
-
-  for (let i = 0; i < refresh_1.length; i++) {
-    pduHelper.writeHexOctet(refresh_1[i]);
-  }
-
-  let berTlv = berHelper.decode(refresh_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, 0x01);
-  do_check_eq(tlv.value.commandQualifier, 0x01);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_FILE_LIST, ctlvs);
-  do_check_eq(tlv.value.fileList, "3F002FE2");
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x10,
+      0x81, 0x03, 0x01, 0x01, 0x01,
+      0x82, 0x02, 0x81, 0x82,
+      0x92, 0x05, 0x01, 0x3F, 0x00, 0x2F, 0xE2
+    ],
+    typeOfCommand: STK_CMD_REFRESH,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let stkHelper = context.StkProactiveCmdHelper;
+      let ctlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_FILE_LIST, ctlvs);
+      do_check_eq(ctlv.value.fileList, "3F002FE2");
+    }
+  });
 
   run_next_test();
 });
@@ -484,50 +518,30 @@
  * Verify Proactive Command : Play Tone
  */
 add_test(function test_stk_proactive_command_play_tone() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-  let ril = context.RIL;
-  ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x10];
-  ril.appType = CARD_APPTYPE_SIM;
-
-  let tone_1 = [
-    0xD0,
-    0x1F,
-    0x81, 0x03, 0x01, 0x20, 0x00,
-    0x82, 0x02, 0x81, 0x03,
-    0x85, 0x09, 0x44, 0x69, 0x61, 0x6C, 0x20, 0x54, 0x6F, 0x6E, 0x65,
-    0x8E, 0x01, 0x01,
-    0x84, 0x02, 0x01, 0x05,
-    0x9E, 0x02, 0x00, 0x01];
-
-  for (let i = 0; i < tone_1.length; i++) {
-    pduHelper.writeHexOctet(tone_1[i]);
-  }
-
-  let berTlv = berHelper.decode(tone_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, 0x20);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
-  do_check_eq(tlv.value.identifier, "Dial Tone");
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_TONE, ctlvs);
-  do_check_eq(tlv.value.tone, STK_TONE_TYPE_DIAL_TONE);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_DURATION, ctlvs);
-  do_check_eq(tlv.value.timeUnit, STK_TIME_UNIT_SECOND);
-  do_check_eq(tlv.value.timeInterval, 5);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifier, 0x01);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x1F,
+      0x81, 0x03, 0x01, 0x20, 0x00,
+      0x82, 0x02, 0x81, 0x03,
+      0x85, 0x09, 0x44, 0x69, 0x61, 0x6C, 0x20, 0x54, 0x6F, 0x6E, 0x65,
+      0x8E, 0x01, 0x01,
+      0x84, 0x02, 0x01, 0x05,
+      0x9E, 0x02, 0x00, 0x01
+    ],
+    typeOfCommand: STK_CMD_PLAY_TONE,
+    icons: [1],
+    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);
+    }
+  });
 
   run_next_test();
 });
@@ -536,33 +550,23 @@
  * Verify Proactive Command : Poll Interval
  */
 add_test(function test_stk_proactive_command_poll_interval() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-
-  let poll_1 = [
-    0xD0,
-    0x0D,
-    0x81, 0x03, 0x01, 0x03, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x84, 0x02, 0x01, 0x14];
-
-  for (let i = 0; i < poll_1.length; i++) {
-    pduHelper.writeHexOctet(poll_1[i]);
-  }
-
-  let berTlv = berHelper.decode(poll_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, 0x03);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_DURATION, ctlvs);
-  do_check_eq(tlv.value.timeUnit, STK_TIME_UNIT_SECOND);
-  do_check_eq(tlv.value.timeInterval, 0x14);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x0D,
+      0x81, 0x03, 0x01, 0x03, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x84, 0x02, 0x01, 0x14
+    ],
+    typeOfCommand: STK_CMD_POLL_INTERVAL,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let interval = cmdDetails.options;
+
+      do_check_eq(interval.timeUnit, STK_TIME_UNIT_SECOND);
+      do_check_eq(interval.timeInterval, 0x14);
+    }
+  });
 
   run_next_test();
 });
@@ -570,40 +574,28 @@
 /**
  * Verify Proactive Command: Display Text
  */
-add_test(function test_read_septets_to_string() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-  let ril = context.RIL;
-  ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x10];
-  ril.appType = CARD_APPTYPE_SIM;
-
-  let display_text_1 = [
-    0xd0,
-    0x2c,
-    0x81, 0x03, 0x01, 0x21, 0x80,
-    0x82, 0x02, 0x81, 0x02,
-    0x0d, 0x1d, 0x00, 0xd3, 0x30, 0x9b, 0xfc, 0x06, 0xc9, 0x5c, 0x30, 0x1a,
-    0xa8, 0xe8, 0x02, 0x59, 0xc3, 0xec, 0x34, 0xb9, 0xac, 0x07, 0xc9, 0x60,
-    0x2f, 0x58, 0xed, 0x15, 0x9b, 0xb9, 0x40,
-    0x9e, 0x02, 0x00, 0x01
-  ];
-
-  for (let i = 0; i < display_text_1.length; i++) {
-    pduHelper.writeHexOctet(display_text_1[i]);
-  }
-
-  let berTlv = berHelper.decode(display_text_1.length);
-  let ctlvs = berTlv.value;
-  let tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_TEXT_STRING, ctlvs);
-  do_check_eq(tlv.value.textString, "Saldo 2.04 E. Validez 20/05/13. ");
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifier, 0x01);
+add_test(function test_stk_proactive_command_display_text() {
+  test_stk_proactive_command({
+    pdu: [
+      0xd0,
+      0x2c,
+      0x81, 0x03, 0x01, 0x21, 0x80,
+      0x82, 0x02, 0x81, 0x02,
+      0x0d, 0x1d, 0x00, 0xd3, 0x30, 0x9b, 0xfc, 0x06, 0xc9, 0x5c, 0x30, 0x1a,
+      0xa8, 0xe8, 0x02, 0x59, 0xc3, 0xec, 0x34, 0xb9, 0xac, 0x07, 0xc9, 0x60,
+      0x2f, 0x58, 0xed, 0x15, 0x9b, 0xb9, 0x40,
+      0x9e, 0x02, 0x00, 0x01
+    ],
+    typeOfCommand: STK_CMD_DISPLAY_TEXT,
+    icons: [1],
+    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);
+    }
+  });
 
   run_next_test();
 });
@@ -612,35 +604,26 @@
  * Verify Proactive Command: Set Up Event List.
  */
 add_test(function test_stk_proactive_command_event_list() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-
-  let event_1 = [
-    0xD0,
-    0x0F,
-    0x81, 0x03, 0x01, 0x05, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x99, 0x04, 0x00, 0x01, 0x02, 0x03];
-
-  for (let i = 0; i < event_1.length; i++) {
-    pduHelper.writeHexOctet(event_1[i]);
-  }
-
-  let berTlv = berHelper.decode(event_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, 0x05);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_EVENT_LIST, ctlvs);
-  do_check_eq(Array.isArray(tlv.value.eventList), true);
-  for (let i = 0; i < tlv.value.eventList.length; i++) {
-    do_check_eq(tlv.value.eventList[i], i);
-  }
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x0F,
+      0x81, 0x03, 0x01, 0x05, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x99, 0x04, 0x00, 0x01, 0x02, 0x03
+    ],
+    typeOfCommand: STK_CMD_SET_UP_EVENT_LIST,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let event = cmdDetails.options;
+
+      do_check_eq(Array.isArray(event.eventList), true);
+
+      for (let i = 0; i < event.eventList.length; i++) {
+        do_check_eq(event.eventList[i], i);
+      }
+    }
+  });
 
   run_next_test();
 });
@@ -649,76 +632,57 @@
  * Verify Proactive Command : Get Input
  */
 add_test(function test_stk_proactive_command_get_input() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-  let stkCmdHelper = context.StkCommandParamsFactory;
-  let ril = context.RIL;
-  ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x10];
-  ril.appType = CARD_APPTYPE_SIM;
-
-  let get_input_1 = [
-    0xD0,
-    0x22,
-    0x81, 0x03, 0x01, 0x23, 0x8F,
-    0x82, 0x02, 0x81, 0x82,
-    0x8D, 0x05, 0x04, 0x54, 0x65, 0x78, 0x74,
-    0x91, 0x02, 0x01, 0x10,
-    0x17, 0x08, 0x04, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74,
-    0x9E, 0x02, 0x00, 0x01];
-
-  for (let i = 0; i < get_input_1.length; i++) {
-    pduHelper.writeHexOctet(get_input_1[i]);
-  }
-
-  let berTlv = berHelper.decode(get_input_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_GET_INPUT);
-
-  let input = stkCmdHelper.createParam(tlv.value, ctlvs);
-  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");
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifier, 0x01);
-
-  let get_input_2 = [
-    0xD0,
-    0x11,
-    0x81, 0x03, 0x01, 0x23, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x8D, 0x00,
-    0x91, 0x02, 0x01, 0x10,
-    0x17, 0x00];
-
-  for (let i = 0; i < get_input_2.length; i++) {
-    pduHelper.writeHexOctet(get_input_2[i]);
-  }
-
-  berTlv = berHelper.decode(get_input_2.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_GET_INPUT);
-
-  input = stkCmdHelper.createParam(tlv.value, ctlvs);
-  do_check_eq(input.text, null);
-  do_check_eq(input.minLength, 0x01);
-  do_check_eq(input.maxLength, 0x10);
-  do_check_eq(input.defaultText, null);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x22,
+      0x81, 0x03, 0x01, 0x23, 0x8F,
+      0x82, 0x02, 0x81, 0x82,
+      0x8D, 0x05, 0x04, 0x54, 0x65, 0x78, 0x74,
+      0x91, 0x02, 0x01, 0x10,
+      0x17, 0x08, 0x04, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74,
+      0x9E, 0x02, 0x00, 0x01
+    ],
+    typeOfCommand: STK_CMD_GET_INPUT,
+    icons: [1],
+    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);
+    }
+  });
+
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x11,
+      0x81, 0x03, 0x01, 0x23, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x8D, 0x00,
+      0x91, 0x02, 0x01, 0x10,
+      0x17, 0x00
+    ],
+    typeOfCommand: STK_CMD_GET_INPUT,
+    icons: null,
+    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);
+    }
+  });
 
   run_next_test();
 });
@@ -757,101 +721,79 @@
  * Verify Proactive Command : Select Item
  */
 add_test(function test_stk_proactive_command_select_item() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-  let stkFactory = context.StkCommandParamsFactory;
-  let ril = context.RIL;
-  ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x10];
-  ril.appType = CARD_APPTYPE_SIM;
-
-  let select_item_1 = [
-    0xD0,
-    0x3C,
-    0x81, 0x03, 0x01, 0x24, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
-    0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
-    0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
-    0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
-    0x18, 0x03, 0x10, 0x15, 0x20,
-    0x90, 0x01, 0x01,
-    0x9E, 0x02, 0x00, 0x01,
-    0x9F, 0x03, 0x00, 0x01, 0x02
-  ];
-
-  for(let i = 0 ; i < select_item_1.length; i++) {
-    pduHelper.writeHexOctet(select_item_1[i]);
-  }
-
-  let berTlv = berHelper.decode(select_item_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_SELECT_ITEM);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  let menu = stkFactory.createParam(tlv.value, ctlvs);
-  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_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);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifier, 0x01);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID_LIST, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifiers[0], 0x01);
-  do_check_eq(tlv.value.identifiers[1], 0x02);
-
-  let select_item_2 = [
-    0xD0,
-    0x33,
-    0x81, 0x03, 0x01, 0x24, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
-    0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
-    0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
-    0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
-    0x18, 0x03, 0x00, 0x15, 0x81,
-    0x90, 0x01, 0x03
-  ];
-
-  for(let i = 0 ; i < select_item_2.length; i++) {
-    pduHelper.writeHexOctet(select_item_2[i]);
-  }
-
-  berTlv = berHelper.decode(select_item_2.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_SELECT_ITEM);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  menu = stkFactory.createParam(tlv.value, ctlvs);
-  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);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x3D,
+      0x81, 0x03, 0x01, 0x24, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
+      0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
+      0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
+      0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
+      0x18, 0x03, 0x10, 0x15, 0x20,
+      0x90, 0x01, 0x01,
+      0x9E, 0x02, 0x00, 0x01,
+      0x9F, 0x04, 0x00, 0x01, 0x02, 0x03
+    ],
+    typeOfCommand: STK_CMD_SELECT_ITEM,
+    icons: [1, 1, 2, 3],
+    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);
+    }
+  });
+
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x33,
+      0x81, 0x03, 0x01, 0x24, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
+      0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
+      0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
+      0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
+      0x18, 0x03, 0x00, 0x15, 0x81,
+      0x90, 0x01, 0x03
+    ],
+    typeOfCommand: STK_CMD_SELECT_ITEM,
+    icons: null,
+    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);
+    }
+  });
 
   run_next_test();
 });
@@ -860,97 +802,75 @@
  * Verify Proactive Command : Set Up Menu
  */
 add_test(function test_stk_proactive_command_set_up_menu() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-  let stkFactory = context.StkCommandParamsFactory;
-  let ril = context.RIL;
-  ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x10];
-  ril.appType = CARD_APPTYPE_SIM;
-
-  let set_up_menu_1 = [
-    0xD0,
-    0x39,
-    0x81, 0x03, 0x01, 0x25, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
-    0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
-    0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
-    0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
-    0x18, 0x03, 0x10, 0x15, 0x20,
-    0x9E, 0x02, 0x00, 0x01,
-    0x9F, 0x03, 0x00, 0x01, 0x02
-  ];
-
-  for(let i = 0 ; i < set_up_menu_1.length; i++) {
-    pduHelper.writeHexOctet(set_up_menu_1[i]);
-  }
-
-  let berTlv = berHelper.decode(set_up_menu_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_SET_UP_MENU);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  let menu = stkFactory.createParam(tlv.value, ctlvs);
-  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_CMD_SET_UP_CALL);
-  do_check_eq(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
-  do_check_eq(menu.nextActionList[2], STK_CMD_PLAY_TONE);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifier, 0x01);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID_LIST, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifiers[0], 0x01);
-  do_check_eq(tlv.value.identifiers[1], 0x02);
-
-  let set_up_menu_2 = [
-    0xD0,
-    0x30,
-    0x81, 0x03, 0x01, 0x25, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
-    0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
-    0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
-    0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
-    0x18, 0x03, 0x81, 0x00, 0x00
-  ];
-
-  for(let i = 0 ; i < set_up_menu_2.length; i++) {
-    pduHelper.writeHexOctet(set_up_menu_2[i]);
-  }
-
-  berTlv = berHelper.decode(set_up_menu_2.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_SET_UP_MENU);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  menu = stkFactory.createParam(tlv.value, ctlvs);
-  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);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x3A,
+      0x81, 0x03, 0x01, 0x25, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
+      0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
+      0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
+      0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
+      0x18, 0x03, 0x10, 0x15, 0x20,
+      0x9E, 0x02, 0x00, 0x01,
+      0x9F, 0x04, 0x00, 0x01, 0x02, 0x03
+    ],
+    typeOfCommand: STK_CMD_SET_UP_MENU,
+    icons: [1, 1, 2, 3],
+    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);
+    }
+  });
+
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x30,
+      0x81, 0x03, 0x01, 0x25, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x05, 0x54, 0x69, 0x74, 0x6C, 0x65,
+      0x8F, 0x07, 0x01, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x31,
+      0x8F, 0x07, 0x02, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x32,
+      0x8F, 0x07, 0x03, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x33,
+      0x18, 0x03, 0x81, 0x00, 0x00
+    ],
+    typeOfCommand: STK_CMD_SET_UP_MENU,
+    icons: null,
+    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);
+    }
+  });
 
   run_next_test();
 });
@@ -959,45 +879,32 @@
  * Verify Proactive Command : Set Up Call
  */
 add_test(function test_stk_proactive_command_set_up_call() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-  let cmdFactory = context.StkCommandParamsFactory;
-  let ril = context.RIL;
-  ril.iccInfoPrivate.sst = [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x10];
-  ril.appType = CARD_APPTYPE_SIM;
-
-  let set_up_call_1 = [
-    0xD0,
-    0x2d,
-    0x81, 0x03, 0x01, 0x10, 0x04,
-    0x82, 0x02, 0x81, 0x82,
-    0x05, 0x0A, 0x44, 0x69, 0x73, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74,
-    0x86, 0x09, 0x81, 0x10, 0x32, 0x04, 0x21, 0x43, 0x65, 0x1C, 0x2C,
-    0x05, 0x07, 0x4D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-    0x9E, 0x02, 0x00, 0x01];
-
-  for (let i = 0 ; i < set_up_call_1.length; i++) {
-    pduHelper.writeHexOctet(set_up_call_1[i]);
-  }
-
-  let berTlv = berHelper.decode(set_up_call_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_SET_UP_CALL);
-
-  let setupCall = cmdFactory.createParam(tlv.value, ctlvs);
-  do_check_eq(setupCall.address, "012340123456,1,2");
-  do_check_eq(setupCall.confirmMessage, "Disconnect");
-  do_check_eq(setupCall.callMessage, "Message");
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ICON_ID, ctlvs);
-  do_check_eq(tlv.value.qualifier, 0x00);
-  do_check_eq(tlv.value.identifier, 0x01);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x31,
+      0x81, 0x03, 0x01, 0x10, 0x04,
+      0x82, 0x02, 0x81, 0x82,
+      0x05, 0x0A, 0x44, 0x69, 0x73, 0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74,
+      0x86, 0x09, 0x81, 0x10, 0x32, 0x04, 0x21, 0x43, 0x65, 0x1C, 0x2C,
+      0x05, 0x07, 0x4D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+      0x9E, 0x02, 0x00, 0x01,
+      0x9E, 0x02, 0x01, 0x02
+    ],
+    typeOfCommand: STK_CMD_SET_UP_CALL,
+    icons: [1, 2],
+    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);
+    }
+  });
 
   run_next_test();
 });
@@ -1006,61 +913,48 @@
  * Verify Proactive Command : Timer Management
  */
 add_test(function test_stk_proactive_command_timer_management() {
-  let worker = newUint8Worker();
-  let context = worker.ContextPool._contexts[0];
-  let pduHelper = context.GsmPDUHelper;
-  let berHelper = context.BerTlvHelper;
-  let stkHelper = context.StkProactiveCmdHelper;
-
-  // Timer Management - Start
-  let timer_management_1 = [
-    0xD0,
-    0x11,
-    0x81, 0x03, 0x01, 0x27, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0xA4, 0x01, 0x01,
-    0xA5, 0x03, 0x10, 0x20, 0x30
-  ];
-
-  for(let i = 0 ; i < timer_management_1.length; i++) {
-    pduHelper.writeHexOctet(timer_management_1[i]);
-  }
-
-  let berTlv = berHelper.decode(timer_management_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_TIMER_MANAGEMENT);
-  do_check_eq(tlv.value.commandQualifier, STK_TIMER_START);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_TIMER_IDENTIFIER, ctlvs);
-  do_check_eq(tlv.value.timerId, 0x01);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_TIMER_VALUE, ctlvs);
-  do_check_eq(tlv.value.timerValue, (0x01 * 60 * 60) + (0x02 * 60) + 0x03);
+    // Timer Management - Start
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x11,
+      0x81, 0x03, 0x01, 0x27, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0xA4, 0x01, 0x01,
+      0xA5, 0x03, 0x10, 0x20, 0x30
+    ],
+    typeOfCommand: STK_CMD_TIMER_MANAGEMENT,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      do_check_eq(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);
+    }
+  });
 
   // Timer Management - Deactivate
-  let timer_management_2 = [
-    0xD0,
-    0x0C,
-    0x81, 0x03, 0x01, 0x27, 0x01,
-    0x82, 0x02, 0x81, 0x82,
-    0xA4, 0x01, 0x01
-  ];
-
-  for(let i = 0 ; i < timer_management_2.length; i++) {
-    pduHelper.writeHexOctet(timer_management_2[i]);
-  }
-
-  berTlv = berHelper.decode(timer_management_2.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_TIMER_MANAGEMENT);
-  do_check_eq(tlv.value.commandQualifier, STK_TIMER_DEACTIVATE);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_TIMER_IDENTIFIER, ctlvs);
-  do_check_eq(tlv.value.timerId, 0x01);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x0C,
+      0x81, 0x03, 0x01, 0x27, 0x01,
+      0x82, 0x02, 0x81, 0x82,
+      0xA4, 0x01, 0x01
+    ],
+    typeOfCommand: STK_CMD_TIMER_MANAGEMENT,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      do_check_eq(cmdDetails.commandQualifier, STK_TIMER_DEACTIVATE);
+
+      let timer = cmdDetails.options;
+
+      do_check_eq(timer.timerId, 0x01);
+      do_check_true(timer.timerValue === undefined);
+    }
+  });
 
   run_next_test();
 });
@@ -1074,42 +968,43 @@
   let pduHelper = context.GsmPDUHelper;
   let berHelper = context.BerTlvHelper;
   let stkHelper = context.StkProactiveCmdHelper;
+  let stkCmdHelper = context.StkCommandParamsFactory;
 
   // Verify IMEI
-  let local_info_1 = [
-    0xD0,
-    0x09,
-    0x81, 0x03, 0x01, 0x26, 0x01,
-    0x82, 0x02, 0x81, 0x82];
-
-  for (let i = 0; i < local_info_1.length; i++) {
-    pduHelper.writeHexOctet(local_info_1[i]);
-  }
-
-  let berTlv = berHelper.decode(local_info_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_PROVIDE_LOCAL_INFO);
-  do_check_eq(tlv.value.commandQualifier, STK_LOCAL_INFO_IMEI);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x09,
+      0x81, 0x03, 0x01, 0x26, 0x01,
+      0x82, 0x02, 0x81, 0x82
+    ],
+    typeOfCommand: STK_CMD_PROVIDE_LOCAL_INFO,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      do_check_eq(cmdDetails.commandQualifier, STK_LOCAL_INFO_IMEI);
+
+      let provideLocalInfo = cmdDetails.options;
+      do_check_eq(provideLocalInfo.localInfoType, STK_LOCAL_INFO_IMEI);
+    }
+  });
 
   // Verify Date and Time Zone
-  let local_info_2 = [
-    0xD0,
-    0x09,
-    0x81, 0x03, 0x01, 0x26, 0x03,
-    0x82, 0x02, 0x81, 0x82];
-
-  for (let i = 0; i < local_info_2.length; i++) {
-    pduHelper.writeHexOctet(local_info_2[i]);
-  }
-
-  berTlv = berHelper.decode(local_info_2.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_PROVIDE_LOCAL_INFO);
-  do_check_eq(tlv.value.commandQualifier, STK_LOCAL_INFO_DATE_TIME_ZONE);
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x09,
+      0x81, 0x03, 0x01, 0x26, 0x03,
+      0x82, 0x02, 0x81, 0x82
+    ],
+    typeOfCommand: STK_CMD_PROVIDE_LOCAL_INFO,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      do_check_eq(cmdDetails.commandQualifier, STK_LOCAL_INFO_DATE_TIME_ZONE);
+
+      let provideLocalInfo = cmdDetails.options;
+      do_check_eq(provideLocalInfo.localInfoType, STK_LOCAL_INFO_DATE_TIME_ZONE);
+    }
+  });
 
   run_next_test();
 });
@@ -1123,98 +1018,79 @@
   let pduHelper = context.GsmPDUHelper;
   let berHelper = context.BerTlvHelper;
   let stkHelper = context.StkProactiveCmdHelper;
+  let stkCmdHelper = context.StkCommandParamsFactory;
 
   // Open Channel
-  let open_channel = [
-    0xD0,
-    0x0F,
-    0x81, 0x03, 0x01, 0x40, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x04, 0x4F, 0x70, 0x65, 0x6E //alpha id: "Open"
-  ];
-
-  for (let i = 0; i < open_channel.length; i++) {
-    pduHelper.writeHexOctet(open_channel[i]);
-  }
-
-  let berTlv = berHelper.decode(open_channel.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_OPEN_CHANNEL);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
-  do_check_eq(tlv.value.identifier, "Open");
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x0F,
+      0x81, 0x03, 0x01, 0x40, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x04, 0x4F, 0x70, 0x65, 0x6E //alpha id: "Open"
+    ],
+    typeOfCommand: STK_CMD_OPEN_CHANNEL,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let bipMsg = cmdDetails.options;
+
+      do_check_eq(bipMsg.text, "Open");
+    }
+  });
 
   // Close Channel
-  let close_channel = [
-    0xD0,
-    0x10,
-    0x81, 0x03, 0x01, 0x41, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x05, 0x43, 0x6C, 0x6F, 0x73, 0x65 //alpha id: "Close"
-  ];
-
-  for (let i = 0; i < close_channel.length; i++) {
-    pduHelper.writeHexOctet(close_channel[i]);
-  }
-
-  berTlv = berHelper.decode(close_channel.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_CLOSE_CHANNEL);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
-  do_check_eq(tlv.value.identifier, "Close");
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x10,
+      0x81, 0x03, 0x01, 0x41, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x05, 0x43, 0x6C, 0x6F, 0x73, 0x65 //alpha id: "Close"
+    ],
+    typeOfCommand: STK_CMD_CLOSE_CHANNEL,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let bipMsg = cmdDetails.options;
+
+      do_check_eq(bipMsg.text, "Close");
+    }
+  });
 
   // Receive Data
-  let receive_data = [
-    0XD0,
-    0X12,
-    0x81, 0x03, 0x01, 0x42, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x07, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65 //alpha id: "Receive"
-  ];
-
-  for (let i = 0; i < receive_data.length; i++) {
-    pduHelper.writeHexOctet(receive_data[i]);
-  }
-
-  berTlv = berHelper.decode(receive_data.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_RECEIVE_DATA);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
-  do_check_eq(tlv.value.identifier, "Receive");
+  test_stk_proactive_command({
+    pdu: [
+      0XD0,
+      0X12,
+      0x81, 0x03, 0x01, 0x42, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x07, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65 //alpha id: "Receive"
+    ],
+    typeOfCommand: STK_CMD_RECEIVE_DATA,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let bipMsg = cmdDetails.options;
+
+      do_check_eq(bipMsg.text, "Receive");
+    }
+  });
 
   // Send Data
-  let send_data = [
-    0xD0,
-    0x0F,
-    0x81, 0x03, 0x01, 0x43, 0x00,
-    0x82, 0x02, 0x81, 0x82,
-    0x85, 0x04, 0x53, 0x65, 0x6E, 0x64 //alpha id: "Send"
-  ];
-
-  for (let i = 0; i < send_data.length; i++) {
-    pduHelper.writeHexOctet(send_data[i]);
-  }
-
-  berTlv = berHelper.decode(send_data.length);
-  ctlvs = berTlv.value;
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_SEND_DATA);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
-
-  tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_ALPHA_ID, ctlvs);
-  do_check_eq(tlv.value.identifier, "Send");
+  test_stk_proactive_command({
+    pdu: [
+      0xD0,
+      0x0F,
+      0x81, 0x03, 0x01, 0x43, 0x00,
+      0x82, 0x02, 0x81, 0x82,
+      0x85, 0x04, 0x53, 0x65, 0x6E, 0x64 //alpha id: "Send"
+    ],
+    typeOfCommand: STK_CMD_SEND_DATA,
+    icons: null,
+    testFunc: (context, cmdDetails, ctlvs) => {
+      let bipMsg = cmdDetails.options;
+
+      do_check_eq(bipMsg.text, "Send");
+    }
+  });
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/tests/xpcshell.ini	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/tests/xpcshell.ini	2014-11-26 21:46:04.000000000 +0000
@@ -37,3 +37,6 @@
 [test_ril_worker_stk.js]
 [test_ril_worker_barring_password.js]
 [test_ril_worker_cdma_info_rec.js]
+[test_ril_system_messenger.js]
+# header_helpers.js is not needed for test_ril_system_messenger.js
+head =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/TimeZoneSettingObserver.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/TimeZoneSettingObserver.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/TimeZoneSettingObserver.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/TimeZoneSettingObserver.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -26,6 +26,7 @@
 #include "mozilla/dom/SettingChangeNotificationBinding.h"
 
 #undef LOG
+#undef ERR
 #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Time Zone Setting" , ## args)
 #define ERR(args...)  __android_log_print(ANDROID_LOG_ERROR, "Time Zone Setting" , ## args)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/Volume.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/Volume.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/Volume.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/Volume.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -87,6 +87,38 @@
 }
 
 void
+Volume::Dump(const char* aLabel) const
+{
+  LOG("%s: Volume: %s (%d) is %s and %s @ %s gen %d locked %d",
+      aLabel,
+      NameStr(),
+      Id(),
+      StateStr(),
+      MediaPresent() ? "inserted" : "missing",
+      MountPoint().get(),
+      MountGeneration(),
+      (int)IsMountLocked());
+  LOG("%s:   Sharing %s Mounting %s Formating %s Unmounting %s",
+      aLabel,
+      CanBeShared() ? (IsSharingEnabled() ? (IsSharing() ? "en-y" : "en-n")
+                                          : "dis")
+                    : "x",
+      IsMountRequested() ? "req" : "n",
+      IsFormatRequested() ? (IsFormatting() ? "req-y" : "req-n")
+                          : (IsFormatting() ? "y" : "n"),
+      IsUnmountRequested() ? (IsUnmounting() ? "req-y" : "req-n")
+                           : (IsUnmounting() ? "y" : "n"));
+}
+
+void Volume::SetFakeVolume(const nsACString& aMountPoint)
+{
+  this->mMountLocked = false;
+  this->mCanBeShared = false;
+  this->mMountPoint = aMountPoint;
+  SetState(nsIVolume::STATE_MOUNTED);
+}
+
+void
 Volume::SetIsSharing(bool aIsSharing)
 {
   if (aIsSharing == mIsSharing) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/Volume.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/Volume.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/Volume.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/Volume.h	2014-11-26 21:46:04.000000000 +0000
@@ -54,6 +54,8 @@
   const nsCString& Name() const { return mName; }
   const char* NameStr() const   { return mName.get(); }
 
+  void Dump(const char* aLabel) const;
+
   // The mount point is the name of the directory where the volume is mounted.
   // (i.e. path that leads to the files stored on the volume).
   const nsCString& MountPoint() const { return mMountPoint; }
@@ -74,6 +76,8 @@
   bool IsFormatting() const           { return mIsFormatting; }
   bool IsUnmounting() const           { return mIsUnmounting; }
 
+  void SetFakeVolume(const nsACString& aMountPoint);
+
   void SetSharingEnabled(bool aSharingEnabled);
   void SetFormatRequested(bool aFormatRequested);
   void SetMountRequested(bool aMountRequested);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/VolumeManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/VolumeManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/VolumeManager.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/VolumeManager.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -44,6 +44,23 @@
 }
 
 //static
+void
+VolumeManager::Dump(const char* aLabel)
+{
+  if (!sVolumeManager) {
+    LOG("%s: sVolumeManager == null", aLabel);
+    return;
+  }
+
+  VolumeArray::size_type  numVolumes = NumVolumes();
+  VolumeArray::index_type volIndex;
+  for (volIndex = 0; volIndex < numVolumes; volIndex++) {
+    RefPtr<Volume> vol = GetVolume(volIndex);
+    vol->Dump(aLabel);
+  }
+}
+
+//static
 size_t
 VolumeManager::NumVolumes()
 {
@@ -138,6 +155,61 @@
   return vol;
 }
 
+//static
+void VolumeManager::InitConfig()
+{
+  MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop());
+
+  // This function uses /system/etc/volume.cfg to add additional volumes
+  // to the Volume Manager.
+  //
+  // This is useful on devices like the Nexus 4, which have no physical sd card
+  // or dedicated partition.
+  //
+  // The format of the volume.cfg file is as follows:
+  // create volume-name mount-point
+  // Blank lines and lines starting with the hash character "#" will be ignored.
+
+  ScopedCloseFile fp;
+  int n = 0;
+  char line[255];
+  char *command, *volNamePtr, *mountPointPtr, *save_ptr;
+  const char *filename = "/system/etc/volume.cfg";
+  if (!(fp = fopen(filename, "r"))) {
+    LOG("Unable to open volume configuration file '%s' - ignoring", filename);
+    return;
+  }
+  while(fgets(line, sizeof(line), fp)) {
+    const char *delim = " \t\n";
+    n++;
+
+    if (line[0] == '#')
+      continue;
+    if (!(command = strtok_r(line, delim, &save_ptr))) {
+      // Blank line - ignore
+      continue;
+    }
+    if (!strcmp(command, "create")) {
+      if (!(volNamePtr = strtok_r(nullptr, delim, &save_ptr))) {
+        ERR("No vol_name in %s line %d",  filename, n);
+        continue;
+      }
+      if (!(mountPointPtr = strtok_r(nullptr, delim, &save_ptr))) {
+        ERR("No mount point for volume '%s'. %s line %d", volNamePtr, filename, n);
+        continue;
+      }
+      nsCString mountPoint(mountPointPtr);
+      nsCString volName(volNamePtr);
+
+      RefPtr<Volume> vol = FindAddVolumeByName(volName);
+      vol->SetFakeVolume(mountPoint);
+    }
+    else {
+      ERR("Unrecognized command: '%s'", command);
+    }
+  }
+}
+
 class VolumeListCallback : public VolumeResponseCallback
 {
   virtual void ResponseReceived(const VolumeCommand* aCommand)
@@ -158,8 +230,11 @@
       }
 
       case ::ResponseCode::CommandOkay: {
-        // We've received the list of volumes. Tell anybody who
-        // is listening that we're open for business.
+        // We've received the list of volumes. Now read the Volume.cfg
+        // file to perform customizations, and then tell everybody
+        // that we're ready for business.
+        VolumeManager::InitConfig();
+        VolumeManager::Dump("READY");
         VolumeManager::SetState(VolumeManager::VOLUMES_READY);
         break;
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/VolumeManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/VolumeManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/VolumeManager.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/VolumeManager.h	2014-11-26 21:46:04.000000000 +0000
@@ -122,11 +122,13 @@
   //-----------------------------------------------------------------------
 
   static void Start();
+  static void Dump(const char* aLabel);
 
   static VolumeArray::size_type NumVolumes();
   static TemporaryRef<Volume> GetVolume(VolumeArray::index_type aIndex);
   static TemporaryRef<Volume> FindVolumeByName(const nsCSubstring& aName);
   static TemporaryRef<Volume> FindAddVolumeByName(const nsCSubstring& aName);
+  static void InitConfig();
 
   static void       PostCommand(VolumeCommand* aCommand);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/VolumeServiceTest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/VolumeServiceTest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/gonk/VolumeServiceTest.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/gonk/VolumeServiceTest.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include "mozilla/Services.h"
 
+#undef VOLUME_MANAGER_LOG_TAG
 #define VOLUME_MANAGER_LOG_TAG  "VolumeServiceTest"
 #include "VolumeManagerLog.h"
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/OSFileConstants.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/OSFileConstants.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/system/OSFileConstants.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/system/OSFileConstants.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -480,6 +480,17 @@
   INT_CONSTANT(SEEK_END),
   INT_CONSTANT(SEEK_SET),
 
+ // fcntl command values
+#if defined(XP_UNIX)
+  INT_CONSTANT(F_GETLK),
+  INT_CONSTANT(F_SETLK),
+  INT_CONSTANT(F_SETLKW),
+
+ // flock type values
+  INT_CONSTANT(F_RDLCK),
+  INT_CONSTANT(F_WRLCK),
+  INT_CONSTANT(F_UNLCK),
+#endif // defined(XP_UNIX)
   // copyfile
 #if defined(COPYFILE_DATA)
   INT_CONSTANT(COPYFILE_DATA),
@@ -586,6 +597,15 @@
   // Size
   { "OSFILE_SIZEOF_DIRENT", INT_TO_JSVAL(sizeof (dirent)) },
 
+  // Defining |flock|.
+#if defined(XP_UNIX)
+  { "OSFILE_SIZEOF_FLOCK", INT_TO_JSVAL(sizeof (struct flock)) },
+  { "OSFILE_OFFSETOF_FLOCK_L_START", INT_TO_JSVAL(offsetof (struct flock, l_start)) },
+  { "OSFILE_OFFSETOF_FLOCK_L_LEN", INT_TO_JSVAL(offsetof (struct flock, l_len)) },
+  { "OSFILE_OFFSETOF_FLOCK_L_PID", INT_TO_JSVAL(offsetof (struct flock, l_pid)) },
+  { "OSFILE_OFFSETOF_FLOCK_L_TYPE", INT_TO_JSVAL(offsetof (struct flock, l_type)) },
+  { "OSFILE_OFFSETOF_FLOCK_L_WHENCE", INT_TO_JSVAL(offsetof (struct flock, l_whence)) },
+#endif // defined(XP_UNIX)
   // Offset of field |d_name|.
   { "OSFILE_OFFSETOF_DIRENT_D_NAME", INT_TO_JSVAL(offsetof (struct dirent, d_name)) },
   // An upper bound to the length of field |d_name| of struct |dirent|.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/gonk/TelephonyAudioService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/gonk/TelephonyAudioService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/gonk/TelephonyAudioService.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/gonk/TelephonyAudioService.js	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,151 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+const nsIAudioManager = Ci.nsIAudioManager;
+const nsITelephonyAudioService = Ci.nsITelephonyAudioService;
+
+const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
+const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
+
+const AUDIO_STATE_NAME = [
+  "PHONE_STATE_NORMAL",
+  "PHONE_STATE_RINGTONE",
+  "PHONE_STATE_IN_CALL"
+];
+
+let DEBUG;
+function debug(s) {
+  dump("TelephonyAudioService: " + s + "\n");
+}
+
+XPCOMUtils.defineLazyGetter(this, "RIL", function () {
+  let obj = {};
+  Cu.import("resource://gre/modules/ril_consts.js", obj);
+  return obj;
+});
+
+XPCOMUtils.defineLazyGetter(this, "gAudioManager", function getAudioManager() {
+  try {
+    return Cc["@mozilla.org/telephony/audiomanager;1"]
+             .getService(nsIAudioManager);
+  } catch (ex) {
+    //TODO on the phone this should not fall back as silently.
+
+    // Fake nsIAudioManager implementation so that we can run the telephony
+    // code in a non-Gonk build.
+    if (DEBUG) debug("Using fake audio manager.");
+    return {
+      microphoneMuted: false,
+      masterVolume: 1.0,
+      masterMuted: false,
+      phoneState: nsIAudioManager.PHONE_STATE_CURRENT,
+      _forceForUse: {},
+
+      setForceForUse: function(usage, force) {
+        this._forceForUse[usage] = force;
+      },
+
+      getForceForUse: function(usage) {
+        return this._forceForUse[usage] || nsIAudioManager.FORCE_NONE;
+      }
+    };
+  }
+});
+
+function TelephonyAudioService() {
+  this._updateDebugFlag();
+  Services.prefs.addObserver(kPrefRilDebuggingEnabled, this, false);
+}
+TelephonyAudioService.prototype = {
+  classDescription: "TelephonyAudioService",
+  classID: Components.ID("{c8605499-cfec-4cb5-a082-5f1f56d42adf}"),
+  contractID: "@mozilla.org/telephony/audio-service;1",
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsITelephonyAudioService,
+                                         Ci.nsIObserver]),
+
+  _updateDebugFlag: function() {
+    try {
+      DEBUG = RIL.DEBUG_RIL ||
+              Services.prefs.getBoolPref(kPrefRilDebuggingEnabled);
+    } catch (e) {}
+  },
+
+  /**
+   * nsITelephonyAudioService interface.
+   */
+
+  get microphoneMuted() {
+    return gAudioManager.microphoneMuted;
+  },
+
+  set microphoneMuted(aMuted) {
+    if (aMuted == this.microphoneMuted) {
+      return;
+    }
+    gAudioManager.microphoneMuted = aMuted;
+  },
+
+  get speakerEnabled() {
+    let force = gAudioManager.getForceForUse(nsIAudioManager.USE_COMMUNICATION);
+    return (force == nsIAudioManager.FORCE_SPEAKER);
+  },
+
+  set speakerEnabled(aEnabled) {
+    if (aEnabled == this.speakerEnabled) {
+      return;
+    }
+    let force = aEnabled ? nsIAudioManager.FORCE_SPEAKER :
+                           nsIAudioManager.FORCE_NONE;
+    gAudioManager.setForceForUse(nsIAudioManager.USE_COMMUNICATION, force);
+  },
+
+  setPhoneState: function(aState) {
+    switch (aState) {
+      case nsITelephonyAudioService.PHONE_STATE_NORMAL:
+        gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_NORMAL;
+        break;
+      case nsITelephonyAudioService.PHONE_STATE_RINGTONE:
+        gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_RINGTONE;
+        break;
+      case nsITelephonyAudioService.PHONE_STATE_IN_CALL:
+        gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_IN_CALL;
+        if (this.speakerEnabled) {
+          gAudioManager.setForceForUse(nsIAudioManager.USE_COMMUNICATION,
+                                       nsIAudioManager.FORCE_SPEAKER);
+        }
+        break;
+      default:
+        throw new Error("Unknown audioPhoneState: " + aState);
+    }
+
+    if (DEBUG) {
+      debug("Put audio system into " + AUDIO_STATE_NAME[aState] + ": " +
+            aState + ", result is: " + gAudioManager.phoneState);
+    }
+  },
+
+  /**
+   * nsIObserver interface.
+   */
+
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case NS_PREFBRANCH_PREFCHANGE_TOPIC_ID:
+        if (aData === kPrefRilDebuggingEnabled) {
+          this._updateDebugFlag();
+        }
+        break;
+    }
+  }
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelephonyAudioService]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/gonk/TelephonyAudioService.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/gonk/TelephonyAudioService.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/gonk/TelephonyAudioService.manifest	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/gonk/TelephonyAudioService.manifest	2014-11-26 21:46: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/.
+
+component {c8605499-cfec-4cb5-a082-5f1f56d42adf} TelephonyAudioService.js
+contract @mozilla.org/telephony/audio-service;1 {c8605499-cfec-4cb5-a082-5f1f56d42adf}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/gonk/TelephonyService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/gonk/TelephonyService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/gonk/TelephonyService.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/gonk/TelephonyService.js	2014-11-26 21:46:04.000000000 +0000
@@ -33,7 +33,7 @@
 const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
 const kPrefDefaultServiceId = "dom.telephony.defaultServiceId";
 
-const nsIAudioManager = Ci.nsIAudioManager;
+const nsITelephonyAudioService = Ci.nsITelephonyAudioService;
 const nsITelephonyService = Ci.nsITelephonyService;
 
 const CALL_WAKELOCK_TIMEOUT = 5000;
@@ -45,12 +45,6 @@
 const DIAL_ERROR_OTHER_CONNECTION_IN_USE = "OtherConnectionInUse";
 const DIAL_ERROR_BAD_NUMBER = RIL.GECKO_CALL_ERROR_BAD_NUMBER;
 
-const AUDIO_STATE_NAME = [
-  "PHONE_STATE_NORMAL",
-  "PHONE_STATE_RINGTONE",
-  "PHONE_STATE_IN_CALL"
-];
-
 const DEFAULT_EMERGENCY_NUMBERS = ["112", "911"];
 
 // MMI match groups
@@ -68,34 +62,6 @@
   dump("TelephonyService: " + s + "\n");
 }
 
-XPCOMUtils.defineLazyGetter(this, "gAudioManager", function getAudioManager() {
-  try {
-    return Cc["@mozilla.org/telephony/audiomanager;1"]
-             .getService(nsIAudioManager);
-  } catch (ex) {
-    //TODO on the phone this should not fall back as silently.
-
-    // Fake nsIAudioManager implementation so that we can run the telephony
-    // code in a non-Gonk build.
-    if (DEBUG) debug("Using fake audio manager.");
-    return {
-      microphoneMuted: false,
-      masterVolume: 1.0,
-      masterMuted: false,
-      phoneState: nsIAudioManager.PHONE_STATE_CURRENT,
-      _forceForUse: {},
-
-      setForceForUse: function(usage, force) {
-        this._forceForUse[usage] = force;
-      },
-
-      getForceForUse: function(usage) {
-        return this._forceForUse[usage] || nsIAudioManager.FORCE_NONE;
-      }
-    };
-  }
-});
-
 XPCOMUtils.defineLazyServiceGetter(this, "gRadioInterfaceLayer",
                                    "@mozilla.org/ril;1",
                                    "nsIRadioInterfaceLayer");
@@ -104,9 +70,13 @@
                                    "@mozilla.org/power/powermanagerservice;1",
                                    "nsIPowerManagerService");
 
-XPCOMUtils.defineLazyServiceGetter(this, "gSystemMessenger",
-                                   "@mozilla.org/system-message-internal;1",
-                                   "nsISystemMessagesInternal");
+XPCOMUtils.defineLazyServiceGetter(this, "gTelephonyMessenger",
+                                   "@mozilla.org/ril/system-messenger-helper;1",
+                                   "nsITelephonyMessenger");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gAudioService",
+                                   "@mozilla.org/telephony/audio-service;1",
+                                   "nsITelephonyAudioService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gGonkMobileConnectionService",
                                    "@mozilla.org/mobileconnection/mobileconnectionservice;1",
@@ -279,26 +249,15 @@
   _updateAudioState: function(aAudioState) {
     switch (aAudioState) {
       case RIL.AUDIO_STATE_NO_CALL:
-        gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_NORMAL;
+        gAudioService.setPhoneState(nsITelephonyAudioService.PHONE_STATE_NORMAL);
         break;
-
       case RIL.AUDIO_STATE_INCOMING:
-        gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_RINGTONE;
+        gAudioService.setPhoneState(nsITelephonyAudioService.PHONE_STATE_RINGTONE);
         break;
-
       case RIL.AUDIO_STATE_IN_CALL:
-        gAudioManager.phoneState = nsIAudioManager.PHONE_STATE_IN_CALL;
-        if (this.speakerEnabled) {
-          gAudioManager.setForceForUse(nsIAudioManager.USE_COMMUNICATION,
-                                       nsIAudioManager.FORCE_SPEAKER);
-        }
+        gAudioService.setPhoneState(nsITelephonyAudioService.PHONE_STATE_IN_CALL);
         break;
     }
-
-    if (DEBUG) {
-      debug("Put audio system into " + AUDIO_STATE_NAME[aAudioState] + ": " +
-            aAudioState + ", result is: " + gAudioManager.phoneState);
-    }
   },
 
   _convertRILCallState: function(aState) {
@@ -1090,28 +1049,19 @@
   },
 
   get microphoneMuted() {
-    return gAudioManager.microphoneMuted;
+    return gAudioService.microphoneMuted;
   },
 
   set microphoneMuted(aMuted) {
-    if (aMuted == this.microphoneMuted) {
-      return;
-    }
-    gAudioManager.microphoneMuted = aMuted;
+    gAudioService.microphoneMuted = aMuted;
   },
 
   get speakerEnabled() {
-    let force = gAudioManager.getForceForUse(nsIAudioManager.USE_COMMUNICATION);
-    return (force == nsIAudioManager.FORCE_SPEAKER);
+    return gAudioService.speakerEnabled;
   },
 
   set speakerEnabled(aEnabled) {
-    if (aEnabled == this.speakerEnabled) {
-      return;
-    }
-    let force = aEnabled ? nsIAudioManager.FORCE_SPEAKER :
-                           nsIAudioManager.FORCE_NONE;
-    gAudioManager.setForceForUse(nsIAudioManager.USE_COMMUNICATION, force);
+    gAudioService.speakerEnabled = aEnabled;
   },
 
   /**
@@ -1140,21 +1090,17 @@
     aCall.isEmergency = this._isEmergencyNumber(aCall.number);
     let duration = ("started" in aCall && typeof aCall.started == "number") ?
       new Date().getTime() - aCall.started : 0;
-    let data = {
-      number: aCall.number,
-      serviceId: aClientId,
-      emergency: aCall.isEmergency,
-      duration: duration,
-      direction: aCall.isOutgoing ? "outgoing" : "incoming",
-      hangUpLocal: aCall.hangUpLocal
-    };
 
-    if (this._cdmaCallWaitingNumber != null) {
-      data.secondNumber = this._cdmaCallWaitingNumber;
-      this._cdmaCallWaitingNumber = null;
-    }
+    gTelephonyMessenger.notifyCallEnded(aClientId,
+                                        aCall.number,
+                                        this._cdmaCallWaitingNumber,
+                                        aCall.isEmergency,
+                                        duration,
+                                        aCall.isOutgoing,
+                                        aCall.hangUpLocal);
 
-    gSystemMessenger.broadcastMessage("telephony-call-ended", data);
+    // Clear cache of this._cdmaCallWaitingNumber after call disconnected.
+    this._cdmaCallWaitingNumber = null;
 
     let manualConfStateChange = false;
     let childId = this._currentCalls[aClientId][aCall.callIndex].childId;
@@ -1219,7 +1165,7 @@
     // the sleep mode when the RIL handles the incoming call.
     this._acquireCallRingWakeLock();
 
-    gSystemMessenger.broadcastMessage("telephony-new-call", {});
+    gTelephonyMessenger.notifyNewCall();
   },
 
   /**
@@ -1234,7 +1180,7 @@
     }
 
     if (aCall.state == nsITelephonyService.CALL_STATE_DIALING) {
-      gSystemMessenger.broadcastMessage("telephony-new-call", {});
+      gTelephonyMessenger.notifyNewCall();
     }
 
     aCall.clientId = aClientId;
@@ -1326,14 +1272,6 @@
             aMessage + " (sessionEnded : " + aSessionEnded + ")");
     }
 
-    let info = {
-      serviceId: aClientId,
-      message: aMessage,
-      sessionEnded: aSessionEnded
-    };
-
-    gSystemMessenger.broadcastMessage("ussd-received", info);
-
     gGonkMobileConnectionService.notifyUssdReceived(aClientId, aMessage,
                                                     aSessionEnded);
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/moz.build	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/moz.build	2014-11-26 21:46:04.000000000 +0000
@@ -53,8 +53,12 @@
     XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
     XPIDL_SOURCES += [
         'nsIGonkTelephonyService.idl',
+        'nsITelephonyAudioService.idl',
+        'nsITelephonyMessenger.idl',
     ]
     EXTRA_COMPONENTS += [
+        'gonk/TelephonyAudioService.js',
+        'gonk/TelephonyAudioService.manifest',
         'gonk/TelephonyService.js',
         'gonk/TelephonyService.manifest',
     ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/nsITelephonyAudioService.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/nsITelephonyAudioService.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/nsITelephonyAudioService.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/nsITelephonyAudioService.idl	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(a452c565-fbac-4056-a8f4-feee9b33aa6e)]
+interface nsITelephonyAudioService : nsISupports
+{
+  const long PHONE_STATE_NORMAL   = 0;
+  const long PHONE_STATE_RINGTONE = 1;
+  const long PHONE_STATE_IN_CALL  = 2;
+
+  /**
+   * Microphone muted?
+   */
+  attribute boolean microphoneMuted;
+
+  /**
+   * Speaker enabled?
+   */
+  attribute boolean speakerEnabled;
+
+  /**
+   * Set the phone's audio mode.
+   *
+   * @param state
+   *        One of the nsITelephonyAudioService::PHONE_STATE_* values.
+   */
+  void setPhoneState(in long state);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/nsITelephonyMessenger.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/nsITelephonyMessenger.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/nsITelephonyMessenger.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/nsITelephonyMessenger.idl	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,40 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(998a48b2-5b54-11e4-833e-6b17c1427d49)]
+interface nsITelephonyMessenger : nsISupports
+{
+  /**
+   * To broadcast 'telephony-new-call' system message
+   */
+  void notifyNewCall();
+
+  /**
+   * To broadcast 'telephony-call-ended' system message
+   *
+   * @param aServiceId
+   *        The ID of Service where this info is notified from.
+   * @param aNumber
+   *        The phone number of the call to be ended.
+   * @param aCdmaWaitingNumber
+   *        The CDMA call waiting number to be ended if available.
+   * @param aEmergency
+   *        true if it's a emergency number.
+   * @param aDuration
+   *        The duration of this call.
+   * @param aOutgoing
+   *        true if it's an outgoing call.
+   * @param aHangUpLocal
+   *        true if this call was hung up by the user.
+   */
+  void notifyCallEnded(in unsigned long aServiceId,
+                       in DOMString aNumber,
+                       in DOMString aCdmaWaitingNumber,
+                       in boolean aEmergency,
+                       in unsigned long aDuration,
+                       in boolean aOutgoing,
+                       in boolean aHangUpLocal);
+};
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/test/marionette/manifest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/test/marionette/manifest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/test/marionette/manifest.ini	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/test/marionette/manifest.ini	2014-11-26 21:46:04.000000000 +0000
@@ -19,6 +19,7 @@
 [test_incoming_hold_resume.js]
 [test_outgoing_hold_resume.js]
 [test_incoming_already_connected.js]
+disabled = Bug 1098193
 [test_incoming_answer_remote_hangup.js]
 [test_incoming_connecting_hangup.js]
 [test_incoming_connecting_remote_hangup.js]
@@ -50,20 +51,31 @@
 [test_audiomanager_phonestate.js]
 [test_outgoing_answer_radio_off.js]
 [test_conference_two_calls.js]
+disabled = Bug 1098193
 [test_conference_add_error.js]
+disabled = Bug 1098193
 [test_conference_remove_error.js]
+disabled = Bug 1098193
 [test_conference_two_hangup_all.js]
+disabled = Bug 1098193
 [test_conference_two_hangup_one.js]
+disabled = Bug 1098193
 [test_conference_two_hold_resume.js]
+disabled = Bug 1098193
 [test_conference_two_remove_one.js]
+disabled = Bug 1098193
 [test_conference_three_hangup_one.js]
+disabled = Bug 1098193
 [test_conference_three_remove_one.js]
+disabled = Bug 1098193
 [test_conference_add_twice_error.js]
+disabled = Bug 1098193
 [test_outgoing_when_two_calls_on_line.js]
 [test_call_presentation.js]
 [test_temporary_clir.js]
 [test_outgoing_error_state.js]
 [test_outgoing_auto_hold.js]
+disabled = Bug 1098193
 [test_mmi.js]
 [test_mmi_change_pin.js]
 [test_mmi_call_forwarding.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/test/marionette/test_emergency_label.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/test/marionette/test_emergency_label.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/telephony/test/marionette/test_emergency_label.js	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/telephony/test/marionette/test_emergency_label.js	2014-11-26 21:46:04.000000000 +0000
@@ -9,6 +9,12 @@
 function setEccListProperty(list) {
   log("Set property ril.ecclist: " + list);
 
+  // We should wrap empty |list| by ''. Otherwise, the entire command will be
+  // "setprop ril.ecclist" which causus the command error.
+  if (!list) {
+    list = "''";
+  }
+
   let deferred = Promise.defer();
   try {
     emulator.runShellCmd(["setprop","ril.ecclist", list]).then(function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/tests/mochitest/bugs/test_bug346659.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/tests/mochitest/bugs/test_bug346659.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/tests/mochitest/bugs/test_bug346659.html	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/tests/mochitest/bugs/test_bug346659.html	2014-11-26 21:46:04.000000000 +0000
@@ -21,7 +21,7 @@
 // do the tests in two batches, because otherwise the popup blocker kills off
 // our test because it opens too many windows.
 var numTestsSet1 = 6;
-var numTestsSet2 = 4;
+var numTestsSet2 = 2;
 var numTestsSet3 = 2;
 var complete = 0;
 SimpleTest.waitForExplicitFinish();
@@ -173,9 +173,7 @@
 function startSecondBatch() {
   var baseurl = window.location.href.replace(/mochi\.test:8888/, "example.com");
   wins[7] = window.open(r(baseurl, 'bug346659-opener.html?{"load":7}'));
-  wins[8] = window.open(r(baseurl, 'bug346659-opener.html?{"write":8}'));
   wins[9] = window.open(r(baseurl, 'bug346659-parent.html?{"load":9}'));
-  wins[10] = window.open(r(baseurl, 'bug346659-parent.html?{"write":10}'));
 }
 
 function startThirdBatch() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/tests/mochitest/general/test_interfaces.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/tests/mochitest/general/test_interfaces.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/tests/mochitest/general/test_interfaces.html	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/tests/mochitest/general/test_interfaces.html	2014-11-26 21:46:06.000000000 +0000
@@ -206,6 +206,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "CameraCapabilities", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "CameraClosedEvent", b2g: true},
+// IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "CameraConfigurationEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "CameraControl", b2g: true},
@@ -442,6 +444,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "History",
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "HMDVRDevice", pref: "dom.vr.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLAllCollection",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLAnchorElement",
@@ -662,6 +666,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MediaKeySession", pref: "media.eme.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "MediaKeySystemAccess", pref: "media.eme.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MediaKeyMessageEvent", pref: "media.eme.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MediaList",
@@ -878,6 +884,8 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "PopupBoxObject", xbl: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "PositionSensorVRDevice", pref: "dom.vr.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "ProcessingInstruction",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ProgressEvent",
@@ -1290,6 +1298,14 @@
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "VideoStreamTrack",
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "VRDevice", pref: "dom.vr.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "VRPositionState", pref: "dom.vr.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "VRFieldOfView", pref: "dom.vr.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "VRFieldOfViewReadOnly", pref: "dom.vr.enabled"},
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "VTTCue",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "VTTRegion", pref: "media.webvtt.regions.enabled"},
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/vr/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/vr/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/vr/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/vr/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,22 @@
+# -*- 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/.
+
+EXPORTS.mozilla.dom += [
+    'VRDevice.h',
+    ]
+
+UNIFIED_SOURCES = [
+    'VRDevice.cpp',
+    ]
+
+FAIL_ON_WARNINGS = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+LOCAL_INCLUDES += [
+    '/dom/base'
+]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/vr/VRDevice.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/vr/VRDevice.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/vr/VRDevice.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/vr/VRDevice.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,322 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "nsWrapperCache.h"
+
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/VRDeviceBinding.h"
+#include "mozilla/dom/ElementBinding.h"
+#include "mozilla/dom/VRDevice.h"
+#include "gfxVR.h"
+#include "nsIFrame.h"
+
+using namespace mozilla::gfx;
+
+namespace mozilla {
+namespace dom {
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(VRFieldOfView, mParent)
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(VRFieldOfView, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(VRFieldOfView, Release)
+
+already_AddRefed<VRFieldOfView>
+VRFieldOfView::Constructor(const GlobalObject& aGlobal, const VRFieldOfViewInit& aParams,
+                           ErrorResult& aRV)
+{
+  nsRefPtr<VRFieldOfView> obj =
+    new VRFieldOfView(aGlobal.GetAsSupports(),
+                      aParams.mUpDegrees, aParams.mRightDegrees,
+                      aParams.mDownDegrees, aParams.mLeftDegrees);
+  return obj.forget();
+}
+
+already_AddRefed<VRFieldOfView>
+VRFieldOfView::Constructor(const GlobalObject& aGlobal,
+                           double aUpDegrees, double aRightDegrees,
+                           double aDownDegrees, double aLeftDegrees,
+                           ErrorResult& aRV)
+{
+  nsRefPtr<VRFieldOfView> obj =
+    new VRFieldOfView(aGlobal.GetAsSupports(),
+                      aUpDegrees, aRightDegrees,
+                      aDownDegrees, aLeftDegrees);
+  return obj.forget();
+}
+
+JSObject*
+VRFieldOfView::WrapObject(JSContext* aCx)
+{
+  return VRFieldOfViewBinding::Wrap(aCx, this);
+}
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(VRPositionState, mParent)
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(VRPositionState, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(VRPositionState, Release)
+
+VRPositionState::VRPositionState(nsISupports* aParent, const gfx::VRHMDSensorState& aState)
+  : mParent(aParent)
+  , mVRState(aState)
+{
+  mTimeStamp = aState.timestamp;
+
+  if (aState.flags & gfx::VRHMDInfo::State_Position) {
+    mPosition = new DOMPoint(mParent, aState.position[0], aState.position[1], aState.position[2], 0.0);
+  }
+
+  if (aState.flags & gfx::VRHMDInfo::State_Orientation) {
+    mOrientation = new DOMPoint(mParent, aState.orientation[0], aState.orientation[1], aState.orientation[2], aState.orientation[3]);
+  }
+}
+
+DOMPoint*
+VRPositionState::GetLinearVelocity()
+{
+  if (!mLinearVelocity) {
+    mLinearVelocity = new DOMPoint(mParent, mVRState.linearVelocity[0], mVRState.linearVelocity[1], mVRState.linearVelocity[2], 0.0);
+  }
+  return mLinearVelocity;
+}
+
+DOMPoint*
+VRPositionState::GetLinearAcceleration()
+{
+  if (!mLinearAcceleration) {
+    mLinearAcceleration = new DOMPoint(mParent, mVRState.linearAcceleration[0], mVRState.linearAcceleration[1], mVRState.linearAcceleration[2], 0.0);
+  }
+  return mLinearAcceleration;
+}
+
+DOMPoint*
+VRPositionState::GetAngularVelocity()
+{
+  if (!mAngularVelocity) {
+    mAngularVelocity = new DOMPoint(mParent, mVRState.angularVelocity[0], mVRState.angularVelocity[1], mVRState.angularVelocity[2], 0.0);
+  }
+  return mAngularVelocity;
+}
+
+DOMPoint*
+VRPositionState::GetAngularAcceleration()
+{
+  if (!mAngularAcceleration) {
+    mAngularAcceleration = new DOMPoint(mParent, mVRState.angularAcceleration[0], mVRState.angularAcceleration[1], mVRState.angularAcceleration[2], 0.0);
+  }
+  return mAngularAcceleration;
+}
+
+JSObject*
+VRPositionState::WrapObject(JSContext* aCx)
+{
+  return VRPositionStateBinding::Wrap(aCx, this);
+}
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(VRDevice)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(VRDevice)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VRDevice)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(VRDevice, mParent)
+
+/* virtual */ JSObject*
+HMDVRDevice::WrapObject(JSContext* aCx)
+{
+  return HMDVRDeviceBinding::Wrap(aCx, this);
+}
+
+/* virtual */ JSObject*
+PositionSensorVRDevice::WrapObject(JSContext* aCx)
+{
+  return PositionSensorVRDeviceBinding::Wrap(aCx, this);
+}
+
+static void
+ReleaseHMDInfoRef(void *, nsIAtom*, void *aPropertyValue, void *)
+{
+  if (aPropertyValue) {
+    static_cast<VRHMDInfo*>(aPropertyValue)->Release();
+  }
+}
+
+void
+HMDVRDevice::XxxToggleElementVR(Element& aElement)
+{
+  VRHMDInfo* hmdPtr = static_cast<VRHMDInfo*>(aElement.GetProperty(nsGkAtoms::vr_state));
+  if (hmdPtr) {
+    aElement.DeleteProperty(nsGkAtoms::vr_state);
+    return;
+  }
+
+  nsRefPtr<VRHMDInfo> hmdRef = mHMD;
+  aElement.SetProperty(nsGkAtoms::vr_state, hmdRef.forget().take(),
+                       ReleaseHMDInfoRef,
+                       true);
+}
+
+namespace {
+
+gfx::VRHMDInfo::Eye
+EyeToEye(const VREye& aEye)
+{
+  return aEye == VREye::Left ? gfx::VRHMDInfo::Eye_Left : gfx::VRHMDInfo::Eye_Right;
+}
+
+class HMDInfoVRDevice : public HMDVRDevice
+{
+public:
+  HMDInfoVRDevice(nsISupports* aParent, gfx::VRHMDInfo* aHMD)
+    : HMDVRDevice(aParent, aHMD)
+  {
+    // XXX TODO use real names/IDs
+    mHWID.AppendPrintf("HMDInfo-0x%llx", aHMD);
+    mDeviceId.AssignLiteral("somedevid");
+    mDeviceName.AssignLiteral("HMD Device");
+
+    mValid = true;
+  }
+
+  virtual ~HMDInfoVRDevice() { }
+
+  /* If a field of view that is set to all 0's is passed in,
+   * the recommended field of view for that eye is used.
+   */
+  virtual void SetFieldOfView(const VRFieldOfViewInit& aLeftFOV,
+                              const VRFieldOfViewInit& aRightFOV,
+                              double zNear, double zFar) MOZ_OVERRIDE
+  {
+    gfx::VRFieldOfView left = gfx::VRFieldOfView(aLeftFOV.mUpDegrees, aLeftFOV.mRightDegrees,
+                                                 aLeftFOV.mDownDegrees, aLeftFOV.mLeftDegrees);
+    gfx::VRFieldOfView right = gfx::VRFieldOfView(aRightFOV.mUpDegrees, aRightFOV.mRightDegrees,
+                                                  aRightFOV.mDownDegrees, aRightFOV.mLeftDegrees);
+
+    if (left.IsZero())
+      left = mHMD->GetRecommendedEyeFOV(VRHMDInfo::Eye_Left);
+    if (right.IsZero())
+      right = mHMD->GetRecommendedEyeFOV(VRHMDInfo::Eye_Right);
+
+    mHMD->SetFOV(left, right, zNear, zFar);
+  }
+
+  virtual already_AddRefed<DOMPoint> GetEyeTranslation(VREye aEye) MOZ_OVERRIDE
+  {
+    gfx::Point3D p = mHMD->GetEyeTranslation(EyeToEye(aEye));
+
+    nsRefPtr<DOMPoint> obj = new DOMPoint(mParent, p.x, p.y, p.z, 0.0);
+    return obj.forget();
+  }
+
+  virtual already_AddRefed<VRFieldOfView> GetCurrentEyeFieldOfView(VREye aEye) MOZ_OVERRIDE
+  {
+    return CopyFieldOfView(mHMD->GetEyeFOV(EyeToEye(aEye)));
+  }
+
+  virtual already_AddRefed<VRFieldOfView> GetRecommendedEyeFieldOfView(VREye aEye) MOZ_OVERRIDE
+  {
+    return CopyFieldOfView(mHMD->GetRecommendedEyeFOV(EyeToEye(aEye)));
+  }
+
+  virtual already_AddRefed<VRFieldOfView> GetMaximumEyeFieldOfView(VREye aEye) MOZ_OVERRIDE
+  {
+    return CopyFieldOfView(mHMD->GetMaximumEyeFOV(EyeToEye(aEye)));
+  }
+
+  virtual already_AddRefed<DOMRect> GetRecommendedEyeRenderRect(VREye aEye) MOZ_OVERRIDE
+  {
+    const IntSize& a(mHMD->SuggestedEyeResolution());
+    nsRefPtr<DOMRect> obj =
+      new DOMRect(mParent,
+                  (aEye == VREye::Left) ? 0 : a.width, 0,
+                  a.width, a.height);
+    return obj.forget();
+  }
+
+protected:
+  already_AddRefed<VRFieldOfView>
+  CopyFieldOfView(const gfx::VRFieldOfView& aSrc)
+  {
+    nsRefPtr<VRFieldOfView> obj =
+      new VRFieldOfView(mParent, aSrc.upDegrees, aSrc.rightDegrees,
+                        aSrc.downDegrees, aSrc.leftDegrees);
+    return obj.forget();
+  }
+};
+
+class HMDPositionVRDevice : public PositionSensorVRDevice
+{
+public:
+  HMDPositionVRDevice(nsISupports* aParent, gfx::VRHMDInfo* aHMD)
+    : PositionSensorVRDevice(aParent)
+    , mHMD(aHMD)
+    , mTracking(false)
+  {
+    // XXX TODO use real names/IDs
+    mHWID.AppendPrintf("HMDInfo-0x%llx", aHMD);
+    mDeviceId.AssignLiteral("somedevid");
+    mDeviceName.AssignLiteral("HMD Position Device");
+
+    mValid = true;
+  }
+
+  ~HMDPositionVRDevice()
+  {
+    if (mTracking) {
+      mHMD->StopSensorTracking();
+    }
+  }
+
+  virtual already_AddRefed<VRPositionState> GetState(double timeOffset) MOZ_OVERRIDE
+  {
+    if (!mTracking) {
+      mHMD->StartSensorTracking();
+      mTracking = true;
+    }
+
+    gfx::VRHMDSensorState state = mHMD->GetSensorState(timeOffset);
+    nsRefPtr<VRPositionState> obj = new VRPositionState(mParent, state);
+
+    return obj.forget();
+  }
+
+  virtual void ZeroSensor() MOZ_OVERRIDE
+  {
+    mHMD->ZeroSensor();
+  }
+
+protected:
+  nsRefPtr<gfx::VRHMDInfo> mHMD;
+  bool mTracking;
+};
+
+} // namespace
+
+bool
+VRDevice::CreateAllKnownVRDevices(nsISupports *aParent, nsTArray<nsRefPtr<VRDevice>>& aDevices)
+{
+  if (!gfx::VRHMDManagerOculus::Init()) {
+    NS_WARNING("Failed to initialize Oculus HMD Manager");
+    return false;
+  }
+
+  nsTArray<nsRefPtr<gfx::VRHMDInfo>> hmds;
+  gfx::VRHMDManagerOculus::GetOculusHMDs(hmds);
+
+  for (size_t i = 0; i < hmds.Length(); ++i) {
+    uint32_t sensorBits = hmds[i]->GetSupportedSensorStateBits();
+    aDevices.AppendElement(new HMDInfoVRDevice(aParent, hmds[i]));
+
+    if (sensorBits &
+        (gfx::VRHMDInfo::State_Position | gfx::VRHMDInfo::State_Orientation))
+    {
+      aDevices.AppendElement(new HMDPositionVRDevice(aParent, hmds[i]));
+    }
+  }
+
+  return true;
+}
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/vr/VRDevice.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/vr/VRDevice.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/vr/VRDevice.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/vr/VRDevice.h	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,235 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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_VRDevice_h_
+#define mozilla_dom_VRDevice_h_
+
+#include <stdint.h>
+
+#include "mozilla/ErrorResult.h"
+#include "mozilla/dom/TypedArray.h"
+#include "mozilla/dom/VRDeviceBinding.h"
+#include "mozilla/dom/DOMPoint.h"
+#include "mozilla/dom/DOMRect.h"
+
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nsWrapperCache.h"
+
+#include "gfxVR.h"
+
+namespace mozilla {
+namespace dom {
+
+class Element;
+
+class VRFieldOfViewReadOnly : public nsWrapperCache
+{
+public:
+  VRFieldOfViewReadOnly(nsISupports* aParent,
+                        double aUpDegrees, double aRightDegrees,
+                        double aDownDegrees, double aLeftDegrees)
+    : mParent(aParent)
+    , mUpDegrees(aUpDegrees)
+    , mRightDegrees(aRightDegrees)
+    , mDownDegrees(aDownDegrees)
+    , mLeftDegrees(aLeftDegrees)
+  {
+  }
+
+  double UpDegrees() const { return mUpDegrees; }
+  double RightDegrees() const { return mRightDegrees; }
+  double DownDegrees() const { return mDownDegrees; }
+  double LeftDegrees() const { return mLeftDegrees; }
+
+protected:
+  nsCOMPtr<nsISupports> mParent;
+  double mUpDegrees;
+  double mRightDegrees;
+  double mDownDegrees;
+  double mLeftDegrees;
+};
+
+class VRFieldOfView MOZ_FINAL : public VRFieldOfViewReadOnly
+{
+  ~VRFieldOfView() {}
+public:
+  explicit VRFieldOfView(nsISupports* aParent,
+                         double aUpDegrees = 0.0, double aRightDegrees = 0.0,
+                         double aDownDegrees = 0.0, double aLeftDegrees = 0.0)
+    : VRFieldOfViewReadOnly(aParent, aUpDegrees, aRightDegrees, aDownDegrees, aLeftDegrees)
+  {}
+
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(VRFieldOfView)
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(VRFieldOfView)
+
+  static already_AddRefed<VRFieldOfView>
+  Constructor(const GlobalObject& aGlobal, const VRFieldOfViewInit& aParams,
+              ErrorResult& aRv);
+
+  static already_AddRefed<VRFieldOfView>
+  Constructor(const GlobalObject& aGlobal,
+              double aUpDegrees, double aRightDegrees,
+              double aDownDegrees, double aLeftDegrees,
+              ErrorResult& aRv);
+
+  nsISupports* GetParentObject() const { return mParent; }
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+  void SetUpDegrees(double aVal) { mUpDegrees = aVal; }
+  void SetRightDegrees(double aVal) { mRightDegrees = aVal; }
+  void SetDownDegrees(double aVal) { mDownDegrees = aVal; }
+  void SetLeftDegrees(double aVal) { mLeftDegrees = aVal; }
+};
+
+class VRPositionState MOZ_FINAL : public nsWrapperCache
+{
+  ~VRPositionState() {}
+public:
+  explicit VRPositionState(nsISupports* aParent, const gfx::VRHMDSensorState& aState);
+
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(VRPositionState)
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(VRPositionState)
+
+  double TimeStamp() const { return mTimeStamp; }
+
+  bool HasPosition() const { return mPosition != nullptr; }
+  DOMPoint* GetPosition() const { return mPosition; }
+
+  bool HasOrientation() const { return mOrientation != nullptr; }
+  DOMPoint* GetOrientation() const { return mOrientation; }
+
+  // these are created lazily
+  DOMPoint* GetLinearVelocity();
+  DOMPoint* GetLinearAcceleration();
+  DOMPoint* GetAngularVelocity();
+  DOMPoint* GetAngularAcceleration();
+
+  nsISupports* GetParentObject() const { return mParent; }
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+protected:
+  nsCOMPtr<nsISupports> mParent;
+
+  double mTimeStamp;
+  gfx::VRHMDSensorState mVRState;
+
+  nsRefPtr<DOMPoint> mPosition;
+  nsRefPtr<DOMPoint> mLinearVelocity;
+  nsRefPtr<DOMPoint> mLinearAcceleration;
+
+  nsRefPtr<DOMPoint> mOrientation;
+  nsRefPtr<DOMPoint> mAngularVelocity;
+  nsRefPtr<DOMPoint> mAngularAcceleration;
+};
+
+class VRDevice : public nsISupports,
+                 public nsWrapperCache
+{
+public:
+  // create new VRDevice objects for all known underlying gfx::vr devices
+  static bool CreateAllKnownVRDevices(nsISupports *aParent, nsTArray<nsRefPtr<VRDevice>>& aDevices);
+
+public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(VRDevice)
+
+  void GetHardwareUnitId(nsAString& aHWID) const { aHWID = mHWID; }
+  void GetDeviceId(nsAString& aDeviceId) const { aDeviceId = mDeviceId; }
+  void GetDeviceName(nsAString& aDeviceName) const { aDeviceName = mDeviceName; }
+
+  bool IsValid() { return mValid; }
+
+  virtual void Shutdown() { }
+
+  nsISupports* GetParentObject() const
+  {
+    return mParent;
+  }
+
+  enum VRDeviceType {
+    HMD,
+    PositionSensor
+  };
+
+  VRDeviceType GetType() const { return mType; }
+
+protected:
+  VRDevice(nsISupports* aParent, VRDeviceType aType)
+    : mParent(aParent)
+    , mType(aType)
+    , mValid(false)
+  {
+    mHWID.AssignLiteral("uknown");
+    mDeviceId.AssignLiteral("unknown");
+    mDeviceName.AssignLiteral("unknown");
+  }
+
+  virtual ~VRDevice() {
+    Shutdown();
+  }
+
+  nsCOMPtr<nsISupports> mParent;
+  nsString mHWID;
+  nsString mDeviceId;
+  nsString mDeviceName;
+
+  VRDeviceType mType;
+
+  bool mValid;
+};
+
+class HMDVRDevice : public VRDevice
+{
+public:
+  virtual already_AddRefed<DOMPoint> GetEyeTranslation(VREye aEye) = 0;
+
+  virtual void SetFieldOfView(const VRFieldOfViewInit& aLeftFOV,
+                              const VRFieldOfViewInit& aRightFOV,
+                              double zNear, double zFar) = 0;
+  virtual already_AddRefed<VRFieldOfView> GetCurrentEyeFieldOfView(VREye aEye) = 0;
+  virtual already_AddRefed<VRFieldOfView> GetRecommendedEyeFieldOfView(VREye aEye) = 0;
+  virtual already_AddRefed<VRFieldOfView> GetMaximumEyeFieldOfView(VREye aEye) = 0;
+  virtual already_AddRefed<DOMRect> GetRecommendedEyeRenderRect(VREye aEye) = 0;
+
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+  void XxxToggleElementVR(Element& aElement);
+
+  gfx::VRHMDInfo *GetHMD() { return mHMD.get(); }
+
+protected:
+  HMDVRDevice(nsISupports* aParent, gfx::VRHMDInfo* aHMD)
+    : VRDevice(aParent, VRDevice::HMD)
+    , mHMD(aHMD)
+  { }
+
+  virtual ~HMDVRDevice() { }
+
+  nsRefPtr<gfx::VRHMDInfo> mHMD;
+};
+
+class PositionSensorVRDevice : public VRDevice
+{
+public:
+  virtual already_AddRefed<VRPositionState> GetState(double timeOffset) = 0;
+
+  virtual void ZeroSensor() = 0;
+
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+protected:
+  PositionSensorVRDevice(nsISupports* aParent)
+    : VRDevice(aParent, VRDevice::PositionSensor)
+  { }
+
+  virtual ~PositionSensorVRDevice() { }
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/AudioContext.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/AudioContext.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/AudioContext.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/AudioContext.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -25,9 +25,9 @@
     [NewObject, Throws]
     AudioBuffer createBuffer(unsigned long numberOfChannels, unsigned long length, float sampleRate);
 
-    void decodeAudioData(ArrayBuffer audioData,
-                         DecodeSuccessCallback successCallback,
-                         optional DecodeErrorCallback errorCallback);
+    Promise<AudioBuffer> decodeAudioData(ArrayBuffer audioData,
+                                         optional DecodeSuccessCallback successCallback,
+                                         optional DecodeErrorCallback errorCallback);
 
     // AudioNode creation
     [NewObject]
@@ -78,8 +78,8 @@
 // Mozilla extensions
 partial interface AudioContext {
   // Read AudioChannel.webidl for more information about this attribute.
-  [Pref="media.useAudioChannelService", SetterThrows]
-  attribute AudioChannel mozAudioChannelType;
+  [Pref="media.useAudioChannelService"]
+  readonly attribute AudioChannel mozAudioChannelType;
 
   // These 2 events are dispatched when the AudioContext object is muted by
   // the AudioChannelService. It's call 'interrupt' because when this event is
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/CameraClosedEvent.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/CameraClosedEvent.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/CameraClosedEvent.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/CameraClosedEvent.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,16 @@
+/* -*- 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/. */
+
+[Func="Navigator::HasCameraSupport",
+ Constructor(DOMString type, optional CameraClosedEventInit eventInitDict)]
+interface CameraClosedEvent : Event
+{
+  readonly attribute DOMString reason;
+};
+
+dictionary CameraClosedEventInit : EventInit
+{
+  DOMString reason = "HardwareReleased";
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/CameraControl.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/CameraControl.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/CameraControl.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/CameraControl.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -116,7 +116,7 @@
 callback CameraTakePictureCallback = void (Blob picture);
 callback CameraStartRecordingCallback = void ();
 callback CameraShutterCallback = void ();
-callback CameraClosedCallback = void ();
+callback CameraClosedCallback = void (DOMString reason);
 callback CameraReleaseCallback = void ();
 callback CameraRecorderStateChange = void (DOMString newState);
 callback CameraPreviewStateChange = void (DOMString newState);
@@ -241,16 +241,27 @@
      contains no event-specific data. */
   attribute EventHandler onshutter;
 
-  /* the function to call when the camera hardware is closed
-     by the underlying framework, e.g. when another app makes a more
-     recent call to get the camera. */
+  /* the function to call when the camera hardware is closed; this may
+     be due to a system failure, another process taking over the camera,
+     or a call to release().
+
+     The 'reason' will be one of the following string values:
+       - SystemFailure    : the camera subsystem failed and was closed;
+       - HardwareReleased : a call to release() was successful;
+       - NotAvailable     : the camera hardware is in use by another process.
+  */
   attribute CameraClosedCallback? onClosed;
 
-  /* the event dispatched when the camera hardware is closed
-     by the underlying framework, e.g. when another app makes a more
-     recent call to get the camera.
-
-     contains no event-specific data. */
+  /* the event dispatched when the camera hardware is closed; this may
+     be due to a system failure, another process taking over the camera,
+     or a call to release().
+
+     The event has a 'reason' attribute that will be one of the following
+     string values:
+       - SystemFailure    : the camera subsystem failed and was closed;
+       - HardwareReleased : a call to release() was successful;
+       - NotAvailable     : the camera hardware is in use by another process.
+  */
   attribute EventHandler onclose;
 
   /* the function to call when the recorder changes state, either because
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/CanvasRenderingContext2D.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/CanvasRenderingContext2D.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/CanvasRenderingContext2D.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/CanvasRenderingContext2D.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -47,7 +47,8 @@
   void transform(double a, double b, double c, double d, double e, double f);
   [Throws, LenientFloat]
   void setTransform(double a, double b, double c, double d, double e, double f);
-// NOT IMPLEMENTED  void resetTransform();
+  [Throws]
+  void resetTransform();
 
   // compositing
            attribute unrestricted double globalAlpha; // (default 1.0)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Element.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Element.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Element.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Element.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -124,9 +124,11 @@
    * Requests that this element be made the full-screen element, as per the DOM
    * full-screen api.
    *
+   * The fsOptions parameter is non-standard.
+   *
    * @see <https://wiki.mozilla.org/index.php?title=Gecko:FullScreenAPI>
    */
-  void mozRequestFullScreen();
+  void mozRequestFullScreen(optional RequestFullscreenOptions fsOptions);
 
   /**
    * Requests that this element be made the pointer-locked element, as per the DOM
@@ -235,3 +237,10 @@
 Element implements ParentNode;
 Element implements Animatable;
 Element implements GeometryUtils;
+
+// non-standard: allows passing options to Element.requestFullScreen
+dictionary RequestFullscreenOptions {
+  // Which HMDVRDevice to go full screen on; also enables VR rendering.
+  // If null, normal fullscreen is entered.
+  HMDVRDevice? vrDisplay = null;
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Fetch.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Fetch.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Fetch.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Fetch.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -9,8 +9,8 @@
 
 typedef object JSON;
 // FIXME(nsm): Bug 739173: FormData is not available in workers.
-// typedef (ArrayBuffer or ArrayBufferView or Blob or FormData or ScalarValueString or URLSearchParams) BodyInit;
-typedef (ArrayBuffer or ArrayBufferView or Blob or ScalarValueString or URLSearchParams) BodyInit;
+// typedef (ArrayBuffer or ArrayBufferView or Blob or FormData or USVString or URLSearchParams) BodyInit;
+typedef (ArrayBuffer or ArrayBufferView or Blob or USVString or URLSearchParams) BodyInit;
 
 [NoInterfaceObject, Exposed=(Window,Worker)]
 interface Body {
@@ -24,7 +24,7 @@
   [Throws]
   Promise<JSON> json();
   [Throws]
-  Promise<ScalarValueString> text();
+  Promise<USVString> text();
 };
 
 [NoInterfaceObject, Exposed=(Window,Worker)]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/File.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/File.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/File.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/File.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -7,12 +7,12 @@
 interface nsIFile;
 
 [Constructor(sequence<(ArrayBuffer or ArrayBufferView or Blob or DOMString)> fileBits,
-             ScalarValueString fileName, optional FilePropertyBag options),
+             USVString fileName, optional FilePropertyBag options),
 
  // These constructors are just for chrome callers:
  Constructor(Blob fileBits, optional ChromeFilePropertyBag options),
  Constructor(nsIFile fileBits, optional ChromeFilePropertyBag options),
- Constructor(ScalarValueString fileBits, optional ChromeFilePropertyBag options),
+ Constructor(USVString fileBits, optional ChromeFilePropertyBag options),
 
  Exposed=(Window,Worker)]
 interface File : Blob {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MediaKeys.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MediaKeys.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MediaKeys.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MediaKeys.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -22,9 +22,4 @@
 
   [NewObject, Throws]
   Promise<void> setServerCertificate((ArrayBufferView or ArrayBuffer) serverCertificate);
-
-  [Throws,NewObject]
-  static Promise<MediaKeys> create(DOMString keySystem);
-  static IsTypeSupportedResult isTypeSupported(DOMString keySystem, optional DOMString initDataType, optional DOMString contentType, optional DOMString capability);
-
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MediaKeySystemAccess.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MediaKeySystemAccess.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MediaKeySystemAccess.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MediaKeySystemAccess.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,34 @@
+/* -*- 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
+ * https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html
+ *
+ * Copyright © 2014 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
+ * W3C liability, trademark and document use rules apply.
+ */
+
+enum MediaKeysRequirement {
+  "required",
+  "optional",
+  "disallowed"
+};
+
+dictionary MediaKeySystemOptions {
+  DOMString            initDataType = "";
+  DOMString            audioType = "";
+  DOMString            audioCapability = "";
+  DOMString            videoType = "";
+  DOMString            videoCapability = "";
+  MediaKeysRequirement uniqueidentifier = "optional";
+  MediaKeysRequirement stateful = "optional";
+};
+
+[Pref="media.eme.enabled"]
+interface MediaKeySystemAccess {
+  readonly    attribute DOMString keySystem;
+  [NewObject, Throws]
+  Promise<MediaKeys> createMediaKeys();
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/moz.build	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -528,6 +528,7 @@
     'VideoStreamTrack.webidl',
     'VideoTrack.webidl',
     'VideoTrackList.webidl',
+    'VRDevice.webidl',
     'VTTCue.webidl',
     'VTTRegion.webidl',
     'WaveShaperNode.webidl',
@@ -680,6 +681,7 @@
     'BlobEvent.webidl',
     'CallEvent.webidl',
     'CallGroupErrorEvent.webidl',
+    'CameraClosedEvent.webidl',
     'CameraConfigurationEvent.webidl',
     'CameraFacesDetectedEvent.webidl',
     'CameraStateChangeEvent.webidl',
@@ -715,6 +717,7 @@
     'MozStkCommandEvent.webidl',
     'MozVoicemailEvent.webidl',
     'PageTransitionEvent.webidl',
+    'PluginCrashedEvent.webidl',
     'PopStateEvent.webidl',
     'PopupBlockedEvent.webidl',
     'ProgressEvent.webidl',
@@ -799,4 +802,5 @@
         'MediaKeyMessageEvent.webidl',
         'MediaKeys.webidl',
         'MediaKeySession.webidl',
+        'MediaKeySystemAccess.webidl',
     ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozNFCPeer.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozNFCPeer.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozNFCPeer.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozNFCPeer.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -10,10 +10,17 @@
 
 [JSImplementation="@mozilla.org/nfc/NFCPeer;1", AvailableIn="CertifiedApps"]
 interface MozNFCPeer {
+  /**
+   * Send NDEF data to peer device.
+   */
   [Throws]
-  DOMRequest sendNDEF(sequence<MozNDEFRecord> records);
+  Promise<void> sendNDEF(sequence<MozNDEFRecord> records);
+
+  /**
+   * Send file to peer device.
+   */
   [Throws]
-  DOMRequest sendFile(Blob blob);
+  Promise<void> sendFile(Blob blob);
 };
 
 // Mozilla Only
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozNFCTag.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozNFCTag.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozNFCTag.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozNFCTag.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -66,14 +66,29 @@
    */
   readonly attribute boolean? canBeMadeReadOnly;
 
+  /**
+   * Read current NDEF data on the tag.
+   */
+  [Throws]
+  Promise<sequence<MozNDEFRecord>> readNDEF();
+
+  /**
+   * Write NDEF data to the tag.
+   */
   [Throws]
-  DOMRequest readNDEF();
+  Promise<void> writeNDEF(sequence<MozNDEFRecord> records);
 
+  /**
+   * Make a tag read-only.
+   */
   [Throws]
-  DOMRequest writeNDEF(sequence<MozNDEFRecord> records);
+  Promise<void> makeReadOnly();
 
+  /**
+   * Format a tag as NDEF.
+   */
   [Throws]
-  DOMRequest makeReadOnly();
+  Promise<void> format();
 };
 
 // Mozilla Only
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozNFC.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozNFC.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozNFC.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozNFC.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -42,7 +42,7 @@
    * otherwise error
    */
   [CheckPermissions="nfc-manager"]
-  DOMRequest checkP2PRegistration(DOMString manifestUrl);
+  Promise<boolean> checkP2PRegistration(DOMString manifestUrl);
 
   /**
    * Notify that user has accepted to share nfc message on P2P UI
@@ -60,19 +60,19 @@
    * Power on the NFC hardware and start polling for NFC tags or devices.
    */
   [CheckPermissions="nfc-manager"]
-  DOMRequest startPoll();
+  Promise<void> startPoll();
 
   /**
    * Stop polling for NFC tags or devices. i.e. enter low power mode.
    */
   [CheckPermissions="nfc-manager"]
-  DOMRequest stopPoll();
+  Promise<void> stopPoll();
 
   /**
    * Power off the NFC hardware.
    */
   [CheckPermissions="nfc-manager"]
-  DOMRequest powerOff();
+  Promise<void> powerOff();
 };
 
 [JSImplementation="@mozilla.org/navigatorNfc;1",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozStkCommandEvent.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozStkCommandEvent.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/MozStkCommandEvent.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/MozStkCommandEvent.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -280,7 +280,7 @@
   boolean isHelpAvailable;
 };
 
-dictionary MozStkBrowserSetting : MozStkIconContainer
+dictionary MozStkBrowserSetting
 {
   /**
    * Confirm message to launch browser.
@@ -300,7 +300,7 @@
   unsigned short mode;
 };
 
-dictionary MozStkSetUpCall : MozStkIconContainer
+dictionary MozStkSetUpCall
 {
   /**
    * The Dialling number.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Navigator.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Navigator.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Navigator.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Navigator.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -322,6 +322,11 @@
 };
 #endif // MOZ_GAMEPAD
 
+partial interface Navigator {
+  [Throws, Pref="dom.vr.enabled"]
+  Promise<sequence<VRDevice>> getVRDevices();
+};
+
 #ifdef MOZ_B2G_BT
 partial interface Navigator {
   [Throws, CheckPermissions="bluetooth"]
@@ -397,3 +402,12 @@
   [Pref="dom.tv.enabled", CheckPermissions="tv", Func="Navigator::HasTVSupport"]
   readonly attribute TVManager? tv;
 };
+
+#ifdef MOZ_EME
+partial interface Navigator {
+  [Pref="media.eme.enabled", Throws, NewObject]
+  Promise<MediaKeySystemAccess>
+  requestMediaKeySystemAccess(DOMString keySystem,
+                              optional sequence<MediaKeySystemOptions> supportedConfigurations);
+};
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/NfcOptions.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/NfcOptions.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/NfcOptions.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/NfcOptions.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -2,6 +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/. */
 
+enum RFState {
+  "idle",
+  "listen",
+  "discovery"
+};
+
 dictionary NfcCommandOptions
 {
   DOMString type = "";
@@ -9,7 +15,7 @@
   long sessionId;
   DOMString requestId = "";
 
-  long powerLevel;
+  RFState rfState;
 
   long techType;
 
@@ -37,7 +43,7 @@
   boolean isReadOnly;
   boolean isFormatable;
 
-  long powerLevel;
+  RFState rfState;
 
   // HCI Event Transaction fields
   DOMString origin;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/PluginCrashedEvent.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/PluginCrashedEvent.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/PluginCrashedEvent.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/PluginCrashedEvent.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,26 @@
+/* -*- 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/.
+ */
+
+[Constructor(DOMString type, optional PluginCrashedEventInit eventInitDict), ChromeOnly]
+interface PluginCrashedEvent : Event
+{
+  readonly attribute DOMString pluginDumpID;
+  readonly attribute DOMString pluginName;
+  readonly attribute DOMString? browserDumpID;
+  readonly attribute DOMString? pluginFilename;
+  readonly attribute boolean submittedCrashReport;
+  readonly attribute boolean gmpPlugin;
+};
+
+dictionary PluginCrashedEventInit : EventInit
+{
+  DOMString pluginDumpID = "";
+  DOMString pluginName = "";
+  DOMString? browserDumpID = null;
+  DOMString? pluginFilename = null;
+  boolean submittedCrashReport = false;
+  boolean gmpPlugin = false;
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/ProfileTimelineMarker.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/ProfileTimelineMarker.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/ProfileTimelineMarker.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/ProfileTimelineMarker.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -8,4 +8,9 @@
   DOMString name = "";
   DOMHighResTimeStamp start = 0;
   DOMHighResTimeStamp end = 0;
+  /* For ConsoleTime markers.  */
+  DOMString causeName;
+  /* For DOMEvent markers.  */
+  DOMString type;
+  unsigned short eventPhase;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Request.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Request.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Request.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Request.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -7,14 +7,14 @@
  * https://fetch.spec.whatwg.org/#request-class
  */
 
-typedef (Request or ScalarValueString) RequestInfo;
+typedef (Request or USVString) RequestInfo;
 
 [Constructor(RequestInfo input, optional RequestInit init),
  Exposed=(Window,Worker),
  Func="mozilla::dom::Headers::PrefEnabled"]
 interface Request {
   readonly attribute ByteString method;
-  readonly attribute ScalarValueString url;
+  readonly attribute USVString url;
   readonly attribute Headers headers;
 
   readonly attribute DOMString referrer;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Response.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Response.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/Response.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/Response.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -12,11 +12,11 @@
  Func="mozilla::dom::Headers::PrefEnabled"]
 interface Response {
   static Response error();
-  static Response redirect(ScalarValueString url, optional unsigned short status = 302);
+  static Response redirect(USVString url, optional unsigned short status = 302);
 
   readonly attribute ResponseType type;
 
-  readonly attribute ScalarValueString url;
+  readonly attribute USVString url;
   readonly attribute unsigned short status;
   readonly attribute ByteString statusText;
   readonly attribute Headers headers;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/ServiceWorkerContainer.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/ServiceWorkerContainer.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/ServiceWorkerContainer.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/ServiceWorkerContainer.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -20,11 +20,11 @@
   readonly attribute Promise<ServiceWorkerRegistration> ready;
 
   [Throws]
-  Promise<ServiceWorkerRegistration> register(ScalarValueString scriptURL,
+  Promise<ServiceWorkerRegistration> register(USVString scriptURL,
                                               optional RegistrationOptionList options);
 
   [Throws]
-  Promise<ServiceWorkerRegistration> getRegistration(optional ScalarValueString documentURL = "");
+  Promise<ServiceWorkerRegistration> getRegistration(optional USVString documentURL = "");
 
   [Throws]
    Promise<sequence<ServiceWorkerRegistration>> getRegistrations();
@@ -47,5 +47,5 @@
 };
 
 dictionary RegistrationOptionList {
-  ScalarValueString scope = "/";
+  USVString scope = "/";
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/ServiceWorkerRegistration.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/ServiceWorkerRegistration.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/ServiceWorkerRegistration.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/ServiceWorkerRegistration.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -15,7 +15,7 @@
   [Unforgeable] readonly attribute ServiceWorker? waiting;
   [Unforgeable] readonly attribute ServiceWorker? active;
 
-  readonly attribute ScalarValueString scope;
+  readonly attribute USVString scope;
 
   [Throws]
   Promise<boolean> unregister();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/TestInterfaceJS.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/TestInterfaceJS.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/TestInterfaceJS.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/TestInterfaceJS.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -31,7 +31,7 @@
   // For testing bug 968335.
   DOMString getCallerPrincipal();
 
-  DOMString convertSVS(ScalarValueString svs);
+  DOMString convertSVS(USVString svs);
 
   (TestInterfaceJS or long) pingPongUnion((TestInterfaceJS or long) something);
   (DOMString or TestInterfaceJS?) pingPongUnionContainingNull((TestInterfaceJS? or DOMString) something);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/TextDecoder.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/TextDecoder.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/TextDecoder.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/TextDecoder.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -15,10 +15,10 @@
 interface TextDecoder {
   [Constant]
   readonly attribute DOMString encoding;
+  [Constant]
+  readonly attribute boolean fatal;
   [Throws]
-  DOMString decode();
-  [Throws]
-  DOMString decode(ArrayBufferView input, optional TextDecodeOptions options);
+  USVString decode(optional BufferSource input, optional TextDecodeOptions options);
 };
 
 dictionary TextDecoderOptions {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/TextEncoder.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/TextEncoder.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/TextEncoder.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/TextEncoder.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -15,11 +15,6 @@
 interface TextEncoder {
   [Constant]
   readonly attribute DOMString encoding;
-  [Throws]
-  Uint8Array encode(optional DOMString input = "", optional TextEncodeOptions options);
+  [Throws, NewObject]
+  Uint8Array encode(optional USVString input = "");
 };
-
-dictionary TextEncodeOptions {
-  boolean stream = false;
-};
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/URLSearchParams.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/URLSearchParams.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/URLSearchParams.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/URLSearchParams.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -13,16 +13,16 @@
  * http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
  */
 
-[Constructor(optional ScalarValueString init = ""),
+[Constructor(optional USVString init = ""),
  Constructor(URLSearchParams init),
- Exposed=(Window,Worker)]
+ Exposed=(Window,Worker,System)]
 interface URLSearchParams {
-  void append(ScalarValueString name, ScalarValueString value);
-  void delete(ScalarValueString name);
-  ScalarValueString? get(ScalarValueString name);
-  sequence<ScalarValueString> getAll(ScalarValueString name);
-  boolean has(ScalarValueString name);
-  void set(ScalarValueString name, ScalarValueString value);
-  // iterable<ScalarValueString, ScalarValueString>; - Bug 1085284
+  void append(USVString name, USVString value);
+  void delete(USVString name);
+  USVString? get(USVString name);
+  sequence<USVString> getAll(USVString name);
+  boolean has(USVString name);
+  void set(USVString name, USVString value);
+  // iterable<USVString, USVString>; - Bug 1085284
   stringifier;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/URLUtilsReadOnly.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/URLUtilsReadOnly.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/URLUtilsReadOnly.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/URLUtilsReadOnly.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -17,14 +17,14 @@
  Exposed=(Window, Worker)]
 interface URLUtilsReadOnly {
   stringifier;
-  readonly attribute ScalarValueString href;
+  readonly attribute USVString href;
 
-  readonly attribute ScalarValueString protocol;
-  readonly attribute ScalarValueString host;
-  readonly attribute ScalarValueString hostname;
-  readonly attribute ScalarValueString port;
-  readonly attribute ScalarValueString pathname;
-  readonly attribute ScalarValueString search;
-  readonly attribute ScalarValueString hash;
-  readonly attribute ScalarValueString origin;
+  readonly attribute USVString protocol;
+  readonly attribute USVString host;
+  readonly attribute USVString hostname;
+  readonly attribute USVString port;
+  readonly attribute USVString pathname;
+  readonly attribute USVString search;
+  readonly attribute USVString hash;
+  readonly attribute USVString origin;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/URLUtils.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/URLUtils.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/URLUtils.webidl	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/URLUtils.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -17,31 +17,31 @@
  Exposed=(Window, Worker)]
 interface URLUtils {
   // Bug 824857: no support for stringifier attributes yet.
-  //  stringifier attribute ScalarValueString href;
+  //  stringifier attribute USVString href;
   [Throws, CrossOriginWritable=Location]
-           attribute ScalarValueString href;
+           attribute USVString href;
   [Throws]
-  readonly attribute ScalarValueString origin;
+  readonly attribute USVString origin;
 
   [Throws]
-           attribute ScalarValueString protocol;
+           attribute USVString protocol;
   [Throws]
-           attribute ScalarValueString username;
+           attribute USVString username;
   [Throws]
-           attribute ScalarValueString password;
+           attribute USVString password;
   [Throws]
-           attribute ScalarValueString host;
+           attribute USVString host;
   [Throws]
-           attribute ScalarValueString hostname;
+           attribute USVString hostname;
   [Throws]
-           attribute ScalarValueString port;
+           attribute USVString port;
   [Throws]
-           attribute ScalarValueString pathname;
+           attribute USVString pathname;
   [Throws]
-           attribute ScalarValueString search;
+           attribute USVString search;
 
   [Throws]
-           attribute ScalarValueString hash;
+           attribute USVString hash;
 
   // Bug 824857 should remove this.
   [Throws]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/VRDevice.webidl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/VRDevice.webidl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/webidl/VRDevice.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/webidl/VRDevice.webidl	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,128 @@
+/* -*- 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/. */
+
+enum VREye {
+  "left",
+  "right"
+};
+
+[Pref="dom.vr.enabled",
+ HeaderFile="mozilla/dom/VRDevice.h"]
+interface VRFieldOfViewReadOnly {
+  readonly attribute double upDegrees;
+  readonly attribute double rightDegrees;
+  readonly attribute double downDegrees;
+  readonly attribute double leftDegrees;
+};
+
+[Pref="dom.vr.enabled",
+ HeaderFile="mozilla/dom/VRDevice.h",
+ Constructor(optional VRFieldOfViewInit fov),
+ Constructor(double upDegrees, double rightDegrees, double downDegrees, double leftDegrees)]
+interface VRFieldOfView : VRFieldOfViewReadOnly {
+  inherit attribute double upDegrees;
+  inherit attribute double rightDegrees;
+  inherit attribute double downDegrees;
+  inherit attribute double leftDegrees;
+};
+
+dictionary VRFieldOfViewInit {
+  double upDegrees = 0.0;
+  double rightDegrees = 0.0;
+  double downDegrees = 0.0;
+  double leftDegrees = 0.0;
+};
+
+[Pref="dom.vr.enabled",
+ HeaderFile="mozilla/dom/VRDevice.h"]
+interface VRPositionState {
+  readonly attribute double timeStamp;
+
+  readonly attribute boolean hasPosition;
+  readonly attribute DOMPoint? position;
+  readonly attribute DOMPoint? linearVelocity;
+  readonly attribute DOMPoint? linearAcceleration;
+
+  readonly attribute boolean hasOrientation;
+  // XXX should be DOMQuaternion as soon as we add that
+  readonly attribute DOMPoint? orientation;
+  readonly attribute DOMPoint? angularVelocity;
+  readonly attribute DOMPoint? angularAcceleration;
+};
+
+[Pref="dom.vr.enabled"]
+interface VRDevice {
+  /**
+   * An identifier for the distinct hardware unit that this
+   * VR Device is a part of.  All VRDevice/Sensors that come
+   * from the same hardware will have the same hardwareId
+   */
+  [Pure] readonly attribute DOMString hardwareUnitId;
+
+  /**
+   * An identifier for this distinct sensor/device on a physical
+   * hardware device.  This shouldn't change across browser
+   * restrats, allowing configuration data to be saved based on it.
+   */
+  [Pure] readonly attribute DOMString deviceId;
+
+  /**
+   * a device name, a user-readable name identifying it
+   */
+  [Pure] readonly attribute DOMString deviceName;
+};
+
+[Pref="dom.vr.enabled",
+ HeaderFile="mozilla/dom/VRDevice.h"]
+interface HMDVRDevice : VRDevice {
+  /* The translation that should be applied to the view matrix for rendering each eye */
+  DOMPoint getEyeTranslation(VREye whichEye);
+
+  // the FOV that the HMD was configured with
+  VRFieldOfView getCurrentEyeFieldOfView(VREye whichEye);
+
+  // the recommended FOV, per eye.
+  VRFieldOfView getRecommendedEyeFieldOfView(VREye whichEye);
+
+  // the maximum FOV, per eye.  Above this, rendering will look broken.
+  VRFieldOfView getMaximumEyeFieldOfView(VREye whichEye);
+
+  // Set a field of view.  If either of the fields of view is null,
+  // or if their values are all zeros, then the recommended field of view
+  // for that eye will be used.
+  void setFieldOfView(optional VRFieldOfViewInit leftFOV,
+                      optional VRFieldOfViewInit rightFOV,
+                      optional double zNear = 0.01,
+                      optional double zFar = 10000.0);
+
+  // return a recommended rect for this eye.  Only useful for Canvas rendering,
+  // the x/y coordinates will be the location in the canvas where this eye should
+  // begin, and the width/height are the dimensions.  Any canvas in the appropriate
+  // ratio will work.
+  DOMRect getRecommendedEyeRenderRect(VREye whichEye);
+
+  // hack for testing
+  void xxxToggleElementVR(Element element);
+};
+
+[Pref="dom.vr.enabled" ,
+ HeaderFile="mozilla/dom/VRDevice.h"]
+interface PositionSensorVRDevice : VRDevice {
+  /*
+   * Return a VRPositionState dictionary containing the state of this position sensor,
+   * at an optional past time or predicted for a future time if timeOffset is != 0.
+   *
+   * The VRPositionState will contain the position, orientation, and velocity
+   * and acceleration of each of these properties.  Use "hasPosition" and "hasOrientation"
+   * to check if the associated members are valid; if these are false, those members
+   * will be null.
+   */
+  VRPositionState getState(optional double timeOffset = 0.0);
+
+  /* Zero this sensor, treating its current position and orientation
+   * as the "origin/zero" values.
+   */
+  void zeroSensor();
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/wifi/WifiProxyService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/wifi/WifiProxyService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/wifi/WifiProxyService.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/wifi/WifiProxyService.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -71,7 +71,7 @@
 #ifdef MOZ_TASK_TRACER
       // Make wifi initialization events to be the source events of TaskTracer,
       // and originate the rest correlation tasks from here.
-      AutoSourceEvent taskTracerEvent(SourceEventType::WIFI);
+      AutoSourceEvent taskTracerEvent(SourceEventType::Wifi);
       AddLabel("%s %s", mInterface.get(), NS_ConvertUTF16toUTF8(event).get());
 #endif
       nsCOMPtr<nsIRunnable> runnable = new WifiEventDispatcher(event, mInterface);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/ScriptLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/ScriptLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/ScriptLoader.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/ScriptLoader.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -758,7 +758,8 @@
     loadInfo.mScriptTextBuf = nullptr;
     loadInfo.mScriptTextLength = 0;
 
-    if (!JS::Evaluate(aCx, global, options, srcBuf)) {
+    JS::Rooted<JS::Value> unused(aCx);
+    if (!JS::Evaluate(aCx, global, options, srcBuf, &unused)) {
       return true;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/test/bug1063538_worker.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/test/bug1063538_worker.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/test/bug1063538_worker.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/test/bug1063538_worker.js	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,18 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+var gJar = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_big.txt";
+var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
+
+xhr.onprogress = function(e) {
+  xhr.abort();
+  postMessage({type: 'finish' });
+  self.close();
+};
+
+onmessage = function(e) {
+  xhr.open("GET", gJar, true);
+  xhr.send();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/test/mochitest.ini	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/test/mochitest.ini	2014-11-26 21:46:06.000000000 +0000
@@ -9,6 +9,7 @@
   bug1020226_worker.js
   bug1020226_frame.html
   bug998474_worker.js
+  bug1063538_worker.js
   clearTimeouts_worker.js
   closeOnGC_server.sjs
   closeOnGC_worker.js
@@ -106,6 +107,7 @@
 [test_bug1020226.html]
 [test_bug1036484.html]
 [test_bug998474.html]
+[test_bug1063538.html]
 [test_chromeWorker.html]
 [test_clearTimeouts.html]
 [test_close.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/test/test_bug1063538.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/test/test_bug1063538.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/test/test_bug1063538.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/test/test_bug1063538.html	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,47 @@
+<!--
+2   Any copyright is dedicated to the Public Domain.
+3   http://creativecommons.org/publicdomain/zero/1.0/
+4 -->
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1063538
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1063538</title>
+  <script type="application/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=1063538">Mozilla Bug 1063538</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+function runTest() {
+  var worker = new Worker("bug1063538_worker.js");
+
+  worker.onmessage = function(e) {
+    if (e.data.type == 'finish') {
+      ok(true, "Testing done.\n");
+      SimpleTest.finish();
+    }
+  };
+
+  worker.postMessage(true);
+}
+
+SimpleTest.waitForExplicitFinish();
+
+addLoadEvent(function() {
+  SpecialPowers.pushPermissions([{'type': 'systemXHR', 'allow': true, 'context': document}], runTest);
+});
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/WorkerPrivate.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/WorkerPrivate.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/WorkerPrivate.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/WorkerPrivate.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -5631,8 +5631,10 @@
       options.setFileAndLine(info->mFilename.get(), info->mLineNumber)
              .setNoScriptRval(true);
 
+      JS::Rooted<JS::Value> unused(aCx);
       if ((expression.IsEmpty() ||
-           !JS::Evaluate(aCx, global, options, expression.get(), expression.Length())) &&
+           !JS::Evaluate(aCx, global, options,
+                         expression.get(), expression.Length(), &unused)) &&
           !JS_ReportPendingException(aCx)) {
         retval = false;
         break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/WorkerScope.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/WorkerScope.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/WorkerScope.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/WorkerScope.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -304,7 +304,7 @@
 }
 
 already_AddRefed<Promise>
-WorkerGlobalScope::Fetch(const RequestOrScalarValueString& aInput,
+WorkerGlobalScope::Fetch(const RequestOrUSVString& aInput,
                          const RequestInit& aInit, ErrorResult& aRv)
 {
   return FetchRequest(this, aInput, aInit, aRv);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/WorkerScope.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/WorkerScope.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/WorkerScope.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/WorkerScope.h	2014-11-26 21:46:06.000000000 +0000
@@ -17,7 +17,7 @@
 class Console;
 class Function;
 class Promise;
-class RequestOrScalarValueString;
+class RequestOrUSVString;
 
 } // namespace dom
 } // namespace mozilla
@@ -126,7 +126,7 @@
   Performance* GetPerformance();
 
   already_AddRefed<Promise>
-  Fetch(const RequestOrScalarValueString& aInput, const RequestInit& aInit, ErrorResult& aRv);
+  Fetch(const RequestOrUSVString& aInput, const RequestInit& aInit, ErrorResult& aRv);
 };
 
 class DedicatedWorkerGlobalScope MOZ_FINAL : public WorkerGlobalScope
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/XMLHttpRequest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/XMLHttpRequest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/workers/XMLHttpRequest.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/workers/XMLHttpRequest.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -1770,10 +1770,6 @@
 
     mProxy->mSeenLoadStart = false;
   }
-
-  if (mRooted) {
-    Unpin();
-  }
 }
 
 void
@@ -2317,8 +2313,10 @@
   // can detect OPENED really easily but we can't detect HEADERS_RECEIVED in a
   // non-racy way until the XHR state machine actually runs on this thread
   // (bug 671047). For now we're going to let this work only if the Send()
-  // method has not been called.
-  if (!mProxy || SendInProgress()) {
+  // method has not been called, unless the send has been aborted.
+  if (!mProxy || (SendInProgress() &&
+                  (mProxy->mSeenLoadStart ||
+                   mStateData.mReadyState > nsIXMLHttpRequest::OPENED))) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
@@ -2342,7 +2340,9 @@
     return;
   }
 
-  if (!mProxy || SendInProgress()) {
+  if (!mProxy || (SendInProgress() &&
+                  (mProxy->mSeenLoadStart ||
+                   mStateData.mReadyState > nsIXMLHttpRequest::OPENED))) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/browser-base.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/browser-base.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/browser-base.inc	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/browser-base.inc	2014-11-26 21:46:06.000000000 +0000
@@ -1,10 +1,10 @@
       <handler event="keypress" key=" " modifiers="shift" command="cmd_scrollPageUp" />
       <handler event="keypress" key=" " command="cmd_scrollPageDown" />
 
-      <handler event="keypress" keycode="VK_UP" command="cmd_linePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" command="cmd_lineNext" />
-      <handler event="keypress" keycode="VK_LEFT" command="cmd_charPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" command="cmd_charNext" />
+      <handler event="keypress" keycode="VK_UP" command="cmd_moveUp" />
+      <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown" />
+      <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft" />
+      <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight" />
 
       <handler event="keypress" key="x" command="cmd_cut" modifiers="accel"/>
       <handler event="keypress" key="c" command="cmd_copy" modifiers="accel"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/editor-base.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/editor-base.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/editor-base.inc	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/editor-base.inc	2014-11-26 21:46:06.000000000 +0000
@@ -1,14 +1,16 @@
       <handler event="keypress" key=" " modifiers="shift" command="cmd_scrollPageUp" />
       <handler event="keypress" key=" " command="cmd_scrollPageDown" />
 
-      <handler event="keypress" keycode="VK_LEFT" command="cmd_charPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" command="cmd_charNext"/>
-      <handler event="keypress" keycode="VK_LEFT" command="cmd_selectCharPrevious" modifiers="shift"/>
-      <handler event="keypress" keycode="VK_RIGHT" command="cmd_selectCharNext" modifiers="shift"/>
-      <handler event="keypress" keycode="VK_UP" command="cmd_linePrevious"/>
-      <handler event="keypress" keycode="VK_DOWN" command="cmd_lineNext"/>
-      <handler event="keypress" keycode="VK_UP" command="cmd_selectLinePrevious" modifiers="shift"/>
-      <handler event="keypress" keycode="VK_DOWN" command="cmd_selectLineNext" modifiers="shift"/>
+      <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft"/>
+      <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight"/>
+
+      <handler event="keypress" keycode="VK_UP" command="cmd_moveUp"/>
+      <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown"/>
+
       <handler event="keypress" key="z" command="cmd_undo" modifiers="accel"/>
       <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
       <handler event="keypress" key="x" command="cmd_cut" modifiers="accel"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/input-fields-base.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/input-fields-base.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/input-fields-base.inc	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/input-fields-base.inc	2014-11-26 21:46:06.000000000 +0000
@@ -1,14 +1,17 @@
-    <handler event="keypress" keycode="VK_LEFT" command="cmd_charPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" command="cmd_charNext"/>
-    <handler event="keypress" keycode="VK_LEFT" modifiers="shift"
-        command="cmd_selectCharPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift"
-        command="cmd_selectCharNext"/>
+    <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft"/>
+    <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight"/>
+    <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft"/>
+    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight"/>
+
+    <handler event="keypress" keycode="VK_UP" command="cmd_moveUp"/>
+    <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown"/>
+    <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp"/>
+    <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown"/>
 
     <!-- Cut/copy/paste/undo -->
     <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
     <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
     <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
-    <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
     <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
+    <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" />
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/mac/platformHTMLBindings.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/mac/platformHTMLBindings.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/mac/platformHTMLBindings.xml	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/mac/platformHTMLBindings.xml	2014-11-26 21:46:06.000000000 +0000
@@ -38,16 +38,22 @@
       <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 
       <handler event="keypress" keycode="VK_END"  command="cmd_scrollBottom" /> 
 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_wordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_wordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt,shift" command="cmd_selectWordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectWordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
-      <handler event="keypress" keycode="VK_UP" modifiers="accel" command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_moveLeft2" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_moveRight2" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="alt,shift" command="cmd_selectLeft2" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectRight2" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="accel" command="cmd_moveLeft3"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_moveRight3"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="alt" command="cmd_moveUp2" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_moveDown2" />
+      <handler event="keypress" keycode="VK_UP" modifiers="alt,shift" command="cmd_selectUp2" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt,shift" command="cmd_selectDown2" />
+      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
+      <handler event="keypress" keycode="VK_UP" modifiers="accel" command="cmd_moveUp3"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveDown3"/>
     </handlers>
   </binding>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/textareas-base.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/textareas-base.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/textareas-base.inc	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/textareas-base.inc	2014-11-26 21:46:06.000000000 +0000
@@ -1,19 +1,16 @@
-    <handler event="keypress" keycode="VK_LEFT" command="cmd_charPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" command="cmd_charNext"/>
-    <handler event="keypress" keycode="VK_LEFT" modifiers="shift"
-        command="cmd_selectCharPrevious"/>
-    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift"
-        command="cmd_selectCharNext"/>
-    <handler event="keypress" keycode="VK_UP" command="cmd_linePrevious"/>
-    <handler event="keypress" keycode="VK_DOWN" command="cmd_lineNext"/>
-    <handler event="keypress" keycode="VK_UP" modifiers="shift"
-        command="cmd_selectLinePrevious"/>
-    <handler event="keypress" keycode="VK_DOWN" modifiers="shift"
-        command="cmd_selectLineNext"/>
+    <handler event="keypress" keycode="VK_LEFT" command="cmd_moveLeft"/>
+    <handler event="keypress" keycode="VK_RIGHT" command="cmd_moveRight"/>
+    <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft"/>
+    <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight"/>
+
+    <handler event="keypress" keycode="VK_UP" command="cmd_moveUp"/>
+    <handler event="keypress" keycode="VK_DOWN" command="cmd_moveDown"/>
+    <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp"/>
+    <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown"/>
 
     <!-- Cut/copy/paste/undo -->
     <handler event="keypress" key="c" modifiers="accel" command="cmd_copy"/>
     <handler event="keypress" key="x" modifiers="accel" command="cmd_cut"/>
     <handler event="keypress" key="v" modifiers="accel" command="cmd_paste"/>
     <handler event="keypress" key="z" modifiers="accel" command="cmd_undo"/>
-    <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
+    <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" />
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/unix/platformHTMLBindings.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/unix/platformHTMLBindings.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/unix/platformHTMLBindings.xml	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/unix/platformHTMLBindings.xml	2014-11-26 21:46:06.000000000 +0000
@@ -45,21 +45,27 @@
       <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy" /> 
       <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
       <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
       <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
       <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
       <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" /> 
       <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" /> 
 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectWordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectWordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectLeft2" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectRight2" />
+
+      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
+      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2" />
+      <handler event="keypress" keycode="VK_UP" modifiers="control,shift" command="cmd_selectUp2" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control,shift" command="cmd_selectDown2" />
+
       <handler event="keypress" key="a" modifiers="alt" command="cmd_selectAll"/>
     </handlers>
   </binding>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/win/platformHTMLBindings.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/win/platformHTMLBindings.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/builtin/win/platformHTMLBindings.xml	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/builtin/win/platformHTMLBindings.xml	2014-11-26 21:46:06.000000000 +0000
@@ -11,84 +11,77 @@
   <binding id="inputFields" bindToUntrustedContent="true">
     <handlers>
 #include ../input-fields-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
       <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
       <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
       <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine"/>
       <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control"
-        command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control"
-        command="cmd_selectBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control"
-        command="cmd_moveTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="control"
-        command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control"
-        command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control"
-        command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control"
-        command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control"
-        command="cmd_selectWordNext"/>
-      <handler event="keypress" key="y" modifiers="accel"
-        command="cmd_redo"/>
-
-      <handler event="keypress" keycode="VK_DELETE" modifiers="shift"
-        command="cmd_cutOrDelete"/>
-      <handler event="keypress" keycode="VK_DELETE" modifiers="control"
-        command="cmd_deleteWordForward"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="control"
-        command="cmd_copy"/>
-      <handler event="keypress" keycode="VK_INSERT" modifiers="shift"
-        command="cmd_paste"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt"
-        command="cmd_undo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift"
-        command="cmd_redo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control"
-        command="cmd_deleteWordBackward"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
+
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectLeft2"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectRight2"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift,control" command="cmd_selectUp2"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,control" command="cmd_selectDown2"/>
+
+      <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
+      <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
+      <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
+      <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
+
+      <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_undo"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift" command="cmd_redo"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
+
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
+      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
     </handlers>
   </binding>
 
   <binding id="textAreas" bindToUntrustedContent="true">
     <handlers>
 #include ../textareas-base.inc
-      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
-      <handler event="keypress" keycode="VK_HOME" 
-        command="cmd_beginLine"/>
-      <handler event="keypress" keycode="VK_END" 
-        command="cmd_endLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" 
-        command="cmd_selectBeginLine"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift"
-        command="cmd_selectEndLine"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control"
-        command="cmd_selectTop"/>
-      <handler event="keypress" keycode="VK_END" modifiers="shift,control"
-        command="cmd_selectBottom"/>
-      <handler event="keypress" keycode="VK_HOME" modifiers="control"
-        command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
       <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectWordNext"/>
+
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,control" command="cmd_selectLeft2"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,control" command="cmd_selectRight2"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift,control" command="cmd_selectUp2"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,control" command="cmd_selectDown2"/>
+
       <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_movePageUp"/>
       <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_movePageDown"/>
       <handler event="keypress" keycode="VK_PAGE_UP" modifiers="shift" command="cmd_selectPageUp"/>
       <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="shift" command="cmd_selectPageDown"/>
-      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
 
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_cutOrDelete"/>
       <handler event="keypress" keycode="VK_DELETE" modifiers="control" command="cmd_deleteWordForward"/>
       <handler event="keypress" keycode="VK_INSERT" modifiers="control" command="cmd_copy"/>
       <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
+
       <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_undo"/>
       <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift" command="cmd_redo"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control"
-        command="cmd_deleteWordBackward"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
+
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
+      <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
      </handlers>
   </binding>
 
@@ -110,16 +103,22 @@
       <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop" />
       <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom" />
 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_wordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_wordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectWordPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectWordNext" />
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control" command="cmd_moveLeft2" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control" command="cmd_moveRight2" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="control,shift" command="cmd_selectLeft2" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="control,shift" command="cmd_selectRight2" />
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectLeft" />
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectRight" />
+
+      <handler event="keypress" keycode="VK_UP" modifiers="control" command="cmd_moveUp2" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control" command="cmd_moveDown2" />
+      <handler event="keypress" keycode="VK_UP" modifiers="control,shift" command="cmd_selectUp2" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control,shift" command="cmd_selectDown2" />
+      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectUp" />
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectDown" />
+
       <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
       <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
-      <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
-      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
       <handler event="keypress" key="y" modifiers="accel" command="cmd_redo"/>
     </handlers>
   </binding>
@@ -134,16 +133,22 @@
       <handler event="keypress" keycode="VK_INSERT" modifiers="shift" command="cmd_paste"/>
       <handler event="keypress" keycode="VK_BACK" modifiers="alt" command="cmd_undo"/>
       <handler event="keypress" keycode="VK_BACK" modifiers="alt,shift" command="cmd_redo"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="accel" command="cmd_wordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_wordNext"/>
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,accel" command="cmd_selectWordPrevious"/>
-      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,accel" command="cmd_selectWordNext"/>
+
+      <handler event="keypress" keycode="VK_LEFT" modifiers="accel" command="cmd_moveLeft2"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_moveRight2"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,accel" command="cmd_selectLeft2"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,accel" command="cmd_selectRight2"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="accel" command="cmd_moveUp2"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveDown2"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="shift,accel" command="cmd_selectUp2"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift,accel" command="cmd_selectDown2"/>
+
       <handler event="keypress" keycode="VK_HOME" modifiers="shift,control" command="cmd_selectTop"/>
       <handler event="keypress" keycode="VK_END" modifiers="shift,control" command="cmd_selectBottom"/>
       <handler event="keypress" keycode="VK_HOME" modifiers="control" command="cmd_moveTop"/>
       <handler event="keypress" keycode="VK_END" modifiers="control" command="cmd_moveBottom"/>
-      <handler event="keypress" keycode="VK_BACK" modifiers="control"
-        command="cmd_deleteWordBackward"/>
+      <handler event="keypress" keycode="VK_BACK" modifiers="control" command="cmd_deleteWordBackward"/>
 
       <handler event="keypress" keycode="VK_HOME" command="cmd_beginLine"/>
       <handler event="keypress" keycode="VK_END" command="cmd_endLine"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsBindingManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsBindingManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsBindingManager.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsBindingManager.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -884,6 +884,19 @@
   // Try to find insertion points for all the new kids.
   XBLChildrenElement* point = nullptr;
   nsIContent* parent = aContainer;
+
+  // Handle appending of default content.
+  if (parent && parent->IsActiveChildrenElement()) {
+    XBLChildrenElement* childrenEl = static_cast<XBLChildrenElement*>(parent);
+    if (childrenEl->HasInsertedChildren()) {
+      // Appending default content that isn't being used. Ignore.
+      return;
+    }
+
+    childrenEl->MaybeSetupDefaultContent();
+    parent = childrenEl->GetParent();
+  }
+
   bool first = true;
   do {
     nsXBLBinding* binding = GetBindingWithContent(parent);
@@ -957,6 +970,18 @@
 
   XBLChildrenElement* point = nullptr;
   nsIContent* parent = aContainer;
+
+  // Handle appending of default content.
+  if (parent && parent->IsActiveChildrenElement()) {
+    XBLChildrenElement* childrenEl = static_cast<XBLChildrenElement*>(parent);
+    if (childrenEl->HasInsertedChildren()) {
+      // Removing default content that isn't being used. Ignore.
+      return;
+    }
+
+    parent = childrenEl->GetParent();
+  }
+
   do {
     nsXBLBinding* binding = GetBindingWithContent(parent);
     if (!binding) {
@@ -1075,6 +1100,19 @@
 
   XBLChildrenElement* point = nullptr;
   nsIContent* parent = aContainer;
+
+  // Handle insertion of default content.
+  if (parent && parent->IsActiveChildrenElement()) {
+    XBLChildrenElement* childrenEl = static_cast<XBLChildrenElement*>(parent);
+    if (childrenEl->HasInsertedChildren()) {
+      // Inserting default content that isn't being used. Ignore.
+      return;
+    }
+
+    childrenEl->MaybeSetupDefaultContent();
+    parent = childrenEl->GetParent();
+  }
+
   while (parent) {
     nsXBLBinding* binding = GetBindingWithContent(parent);
     if (!binding) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLProtoImplField.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLProtoImplField.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLProtoImplField.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLProtoImplField.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -392,8 +392,6 @@
     return NS_OK;
   }
 
-  nsAutoMicroTask mt;
-
   nsAutoCString uriSpec;
   aBindingDocURI->GetSpec(uriSpec);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLProtoImplMethod.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLProtoImplMethod.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLProtoImplMethod.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLProtoImplMethod.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -292,11 +292,10 @@
     return NS_OK;
   }
 
-  nsAutoMicroTask mt;
-
   // We are going to run script via JS::Call, so we need a script entry point,
   // but as this is XBL related it does not appear in the HTML spec.
   dom::AutoEntryScript aes(global);
+  aes.TakeOwnershipOfErrorReporting();
   JSContext* cx = aes.cx();
 
   JS::Rooted<JSObject*> globalObject(cx, global->GetGlobalJSObject());
@@ -326,20 +325,12 @@
   bool scriptAllowed = nsContentUtils::GetSecurityManager()->
                          ScriptAllowed(js::GetGlobalForObjectCrossCompartment(method));
 
-  bool ok = true;
   if (scriptAllowed) {
     JS::Rooted<JS::Value> retval(cx);
     JS::Rooted<JS::Value> methodVal(cx, JS::ObjectValue(*method));
-    ok = ::JS::Call(cx, scopeChain[0], methodVal, JS::HandleValueArray::empty(), &retval);
-  }
-
-  if (!ok) {
-    // If a constructor or destructor threw an exception, it doesn't stop
-    // anything else.  We just report it.  Note that we need to set aside the
-    // frame chain here, since the constructor invocation is not related to
-    // whatever is on the stack right now, really.
-    nsJSUtils::ReportPendingException(cx);
-    return NS_ERROR_FAILURE;
+    // No need to check the return here as AutoEntryScript has taken ownership
+    // of error reporting.
+    ::JS::Call(cx, scopeChain[0], methodVal, JS::HandleValueArray::empty(), &retval);
   }
 
   return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLResourceLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLResourceLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLResourceLoader.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLResourceLoader.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -120,7 +120,8 @@
       // Passing nullptr for pretty much everything -- cause we don't care!
       // XXX: initialDocumentURI is nullptr! 
       nsRefPtr<imgRequestProxy> req;
-      nsContentUtils::LoadImage(url, doc, docPrincipal, docURL, nullptr,
+      nsContentUtils::LoadImage(url, doc, docPrincipal, docURL,
+                                doc->GetReferrerPolicy(), nullptr,
                                 nsIRequest::LOAD_BACKGROUND, EmptyString(),
                                 getter_AddRefs(req));
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/nsXBLService.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/nsXBLService.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -136,17 +136,20 @@
     // notification of its parent.  (We can know about both if the
     // binding loads were triggered from the DOM rather than frame
     // construction.)  So we have to check both whether the element
-    // has a primary frame and whether it's in the undisplayed map
+    // has a primary frame and whether it's in the frame manager maps
     // before sending a ContentInserted notification, or bad things
     // will happen.
     MOZ_ASSERT(shell == doc->GetShell());
     if (shell) {
       nsIFrame* childFrame = mBoundElement->GetPrimaryFrame();
       if (!childFrame) {
-        // Check to see if it's in the undisplayed content map.
-        nsStyleContext* sc =
-          shell->FrameManager()->GetUndisplayedContent(mBoundElement);
-
+        // Check to see if it's in the undisplayed content map...
+        nsFrameManager* fm = shell->FrameManager();
+        nsStyleContext* sc = fm->GetUndisplayedContent(mBoundElement);
+        if (!sc) {
+          // or in the display:contents map.
+          sc = fm->GetDisplayContentsStyleFor(mBoundElement);
+        }
         if (!sc) {
           shell->CreateFramesFor(destroyedFramesFor);
         }
@@ -1073,18 +1076,27 @@
   // FetchBindingDocument().  LoadInfo will end up with no principal or node in those cases,
   // so we use systemPrincipal.  This achieves the same result of bypassing security checks,
   // but it gives the wrong information to potential future consumers of loadInfo.
-  nsCOMPtr<nsIPrincipal> requestingPrincipal = aOriginPrincipal ? aOriginPrincipal
-                                                                : nsContentUtils::GetSystemPrincipal();
   nsCOMPtr<nsIChannel> channel;
-  // Note that we are calling NS_NewChannelInternal here with both a node and a principal.
-  // This is because the principal and node could be different.
-  rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                             aDocumentURI,
-                             aBoundDocument,
-                             requestingPrincipal,
-                             nsILoadInfo::SEC_NORMAL,
-                             nsIContentPolicy::TYPE_OTHER,
-                             loadGroup);
+
+  if (aOriginPrincipal) {
+    // if there is an originPrincipal we should also have aBoundDocument
+    NS_ASSERTION(aBoundDocument, "can not create a channel without aBoundDocument");
+    rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(channel),
+                                              aDocumentURI,
+                                              aBoundDocument,
+                                              aOriginPrincipal,
+                                              nsILoadInfo::SEC_NORMAL,
+                                              nsIContentPolicy::TYPE_OTHER,
+                                              loadGroup);
+  }
+  else {
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       aDocumentURI,
+                       nsContentUtils::GetSystemPrincipal(),
+                       nsILoadInfo::SEC_NORMAL,
+                       nsIContentPolicy::TYPE_OTHER,
+                       loadGroup);
+  }
 
   NS_ENSURE_SUCCESS(rv, rv);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/test/mochitest.ini	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/test/mochitest.ini	2014-11-26 21:46:06.000000000 +0000
@@ -42,3 +42,4 @@
 [test_bug946815.html]
 skip-if = toolkit != "gonk"
 [test_bug1086996.xhtml]
+[test_bug1098628_throw_from_construct.xhtml]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/test/test_bug1086996.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/test/test_bug1086996.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/test/test_bug1086996.xhtml	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/test/test_bug1086996.xhtml	2014-11-26 21:46:06.000000000 +0000
@@ -34,7 +34,6 @@
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1086996">Mozilla Bug 1086996</a>
-<div id="boundContent" style="-moz-binding: url(#mainBinding)"></div>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
@@ -56,5 +55,8 @@
 ]]>
 </script>
 </pre>
+<!-- This div needs to come after the <script> so we don't run the binding ctor
+     before the <script> has been parsed -->
+<div id="boundContent" style="-moz-binding: url(#mainBinding)"></div>
 </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/test/test_bug1098628_throw_from_construct.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/test/test_bug1098628_throw_from_construct.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/test/test_bug1098628_throw_from_construct.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/test/test_bug1098628_throw_from_construct.xhtml	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,41 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1098628
+-->
+<head>
+  <title>Test for Bug 1098628</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <bindings xmlns="http://www.mozilla.org/xbl">
+    <binding id="test">
+      <implementation>
+        <constructor><![CDATA[
+          throw "flimfniffle";
+        ]]></constructor>
+      </implementation>
+    </binding>
+  </bindings>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1098628">Mozilla Bug 1098628</a>
+<p id="display" style="-moz-binding: url(#test)"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+<![CDATA[
+
+/** Test for Bug 1098628 **/
+SimpleTest.waitForExplicitFinish();
+SimpleTest.expectUncaughtException();
+SimpleTest.monitorConsole(SimpleTest.finish, [{errorMessage: new RegExp('flimfniffle')}]);
+addLoadEvent(function() {
+  SimpleTest.executeSoon(SimpleTest.endMonitorConsole);
+});
+]]>
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/XBLChildrenElement.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/XBLChildrenElement.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xbl/XBLChildrenElement.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xbl/XBLChildrenElement.h	2014-11-26 21:46:06.000000000 +0000
@@ -55,12 +55,20 @@
   {
     mInsertedChildren.AppendElement(aChild);
     aChild->SetXBLInsertionParent(GetParent());
+
+    // Appending an inserted child causes the inserted
+    // children to be projected instead of default content.
+    MaybeRemoveDefaultContent();
   }
 
   void InsertInsertedChildAt(nsIContent* aChild, uint32_t aIndex)
   {
     mInsertedChildren.InsertElementAt(aIndex, aChild);
     aChild->SetXBLInsertionParent(GetParent());
+
+    // Inserting an inserted child causes the inserted
+    // children to be projected instead of default content.
+    MaybeRemoveDefaultContent();
   }
 
   void RemoveInsertedChild(nsIContent* aChild)
@@ -70,6 +78,10 @@
     //NS_ASSERTION(mInsertedChildren.Contains(aChild),
     //             "Removing child that's not there");
     mInsertedChildren.RemoveElement(aChild);
+
+    // After removing the inserted child, default content
+    // may be projected into this insertion point.
+    MaybeSetupDefaultContent();
   }
 
   void ClearInsertedChildren()
@@ -78,6 +90,10 @@
       mInsertedChildren[c]->SetXBLInsertionParent(nullptr);
     }
     mInsertedChildren.Clear();
+
+    // After clearing inserted children, default content
+    // will be projected into this insertion point.
+    MaybeSetupDefaultContent();
   }
 
   void MaybeSetupDefaultContent()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xml/nsXMLPrettyPrinter.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xml/nsXMLPrettyPrinter.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xml/nsXMLPrettyPrinter.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xml/nsXMLPrettyPrinter.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -102,7 +102,7 @@
 
     nsCOMPtr<nsIDOMDocument> xslDocument;
     rv = nsSyncLoadService::LoadDocument(xslUri, nsContentUtils::GetSystemPrincipal(),
-                                         nullptr, true,
+                                         nullptr, true, mozilla::net::RP_Default,
                                          getter_AddRefs(xslDocument));
     NS_ENSURE_SUCCESS(rv, rv);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xml/txXMLParser.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xml/txXMLParser.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xml/txXMLParser.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xml/txXMLParser.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -36,7 +36,9 @@
     nsAutoSyncOperation sync(loaderDocument);
     rv = nsSyncLoadService::LoadDocument(documentURI,
                                          loaderDocument->NodePrincipal(),
-                                         loadGroup, true, &theDocument);
+                                         loadGroup, true,
+                                         loaderDocument->GetReferrerPolicy(),
+                                         &theDocument);
 
     if (NS_FAILED(rv)) {
         aErrMsg.AppendLiteral("Document load of ");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -42,6 +42,7 @@
 
 using namespace mozilla;
 using mozilla::dom::EncodingUtils;
+using mozilla::net::ReferrerPolicy;
 
 static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
 
@@ -374,7 +375,8 @@
     NS_INLINE_DECL_REFCOUNTING(txCompileObserver)
 
     nsresult startLoad(nsIURI* aUri, txStylesheetCompiler* aCompiler,
-                       nsIPrincipal* aSourcePrincipal);
+                       nsIPrincipal* aSourcePrincipal,
+                       ReferrerPolicy aReferrerPolicy);
 
 private:
     nsRefPtr<txMozillaXSLTProcessor> mProcessor;
@@ -399,6 +401,7 @@
 nsresult
 txCompileObserver::loadURI(const nsAString& aUri,
                            const nsAString& aReferrerUri,
+                           ReferrerPolicy aReferrerPolicy,
                            txStylesheetCompiler* aCompiler)
 {
     if (mProcessor->IsLoadDisabled()) {
@@ -424,7 +427,7 @@
     rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_STYLESHEET,
                                    uri,
                                    referrerPrincipal,
-                                   nullptr,
+                                   mLoaderDocument,
                                    NS_LITERAL_CSTRING("application/xml"),
                                    nullptr,
                                    &shouldLoad);
@@ -433,7 +436,7 @@
         return NS_ERROR_DOM_BAD_URI;
     }
 
-    return startLoad(uri, aCompiler, referrerPrincipal);
+    return startLoad(uri, aCompiler, referrerPrincipal, aReferrerPolicy);
 }
 
 void
@@ -452,7 +455,8 @@
 
 nsresult
 txCompileObserver::startLoad(nsIURI* aUri, txStylesheetCompiler* aCompiler,
-                             nsIPrincipal* aReferrerPrincipal)
+                             nsIPrincipal* aReferrerPrincipal,
+                             ReferrerPolicy aReferrerPolicy)
 {
     nsCOMPtr<nsILoadGroup> loadGroup = mLoaderDocument->GetDocumentLoadGroup();
     if (!loadGroup) {
@@ -460,12 +464,14 @@
     }
 
     nsCOMPtr<nsIChannel> channel;
-    nsresult rv = NS_NewChannel(getter_AddRefs(channel),
-                                aUri,
-                                aReferrerPrincipal,
-                                nsILoadInfo::SEC_NORMAL,
-                                nsIContentPolicy::TYPE_STYLESHEET,
-                                loadGroup);
+    nsresult rv = NS_NewChannelWithTriggeringPrincipal(
+                    getter_AddRefs(channel),
+                    aUri,
+                    mLoaderDocument,
+                    aReferrerPrincipal, // triggeringPrincipal
+                    nsILoadInfo::SEC_NORMAL,
+                    nsIContentPolicy::TYPE_XSLT,
+                    loadGroup);
 
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -480,7 +486,7 @@
         nsCOMPtr<nsIURI> referrerURI;
         aReferrerPrincipal->GetURI(getter_AddRefs(referrerURI));
         if (referrerURI) {
-            httpChannel->SetReferrer(referrerURI);
+            httpChannel->SetReferrerWithPolicy(referrerURI, aReferrerPolicy);
         }
     }
 
@@ -507,7 +513,7 @@
 
 nsresult
 TX_LoadSheet(nsIURI* aUri, txMozillaXSLTProcessor* aProcessor,
-             nsIDocument* aLoaderDocument)
+             nsIDocument* aLoaderDocument, ReferrerPolicy aReferrerPolicy)
 {
     nsIPrincipal* principal = aLoaderDocument->NodePrincipal();
 
@@ -521,7 +527,7 @@
         NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_STYLESHEET,
                                   aUri,
                                   principal,
-                                  aProcessor->GetSourceContentModel(),
+                                  aLoaderDocument,
                                   NS_LITERAL_CSTRING("application/xml"),
                                   nullptr,
                                   &shouldLoad);
@@ -535,10 +541,11 @@
     NS_ENSURE_TRUE(observer, NS_ERROR_OUT_OF_MEMORY);
 
     nsRefPtr<txStylesheetCompiler> compiler =
-        new txStylesheetCompiler(NS_ConvertUTF8toUTF16(spec), observer);
+        new txStylesheetCompiler(NS_ConvertUTF8toUTF16(spec), aReferrerPolicy,
+                                 observer);
     NS_ENSURE_TRUE(compiler, NS_ERROR_OUT_OF_MEMORY);
 
-    return observer->startLoad(aUri, compiler, principal);
+    return observer->startLoad(aUri, compiler, principal, aReferrerPolicy);
 }
 
 /**
@@ -636,6 +643,7 @@
 nsresult
 txSyncCompileObserver::loadURI(const nsAString& aUri,
                                const nsAString& aReferrerUri,
+                               ReferrerPolicy aReferrerPolicy,
                                txStylesheetCompiler* aCompiler)
 {
     if (mProcessor->IsLoadDisabled()) {
@@ -680,7 +688,8 @@
     nsAutoSyncOperation sync(source ? source->OwnerDoc() : nullptr);
     nsCOMPtr<nsIDOMDocument> document;
     rv = nsSyncLoadService::LoadDocument(uri, referrerPrincipal, nullptr,
-                                         false, getter_AddRefs(document));
+                                         false, aReferrerPolicy,
+                                         getter_AddRefs(document));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIDocument> doc = do_QueryInterface(document);
@@ -740,7 +749,7 @@
     NS_ENSURE_TRUE(obs, NS_ERROR_OUT_OF_MEMORY);
 
     nsRefPtr<txStylesheetCompiler> compiler =
-        new txStylesheetCompiler(stylesheetURI, obs);
+        new txStylesheetCompiler(stylesheetURI, doc->GetReferrerPolicy(), obs);
     NS_ENSURE_TRUE(compiler, NS_ERROR_OUT_OF_MEMORY);
 
     compiler->setBaseURI(baseURI);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -1040,7 +1040,12 @@
 txMozillaXSLTProcessor::LoadStyleSheet(nsIURI* aUri,
                                        nsIDocument* aLoaderDocument)
 {
-    nsresult rv = TX_LoadSheet(aUri, this, aLoaderDocument);
+    mozilla::net::ReferrerPolicy refpol = mozilla::net::RP_Default;
+    if (mStylesheetDocument) {
+        refpol = mStylesheetDocument->GetReferrerPolicy();
+    }
+
+    nsresult rv = TX_LoadSheet(aUri, this, aLoaderDocument, refpol);
     if (NS_FAILED(rv) && mObserver) {
         // This is most likely a network or security error, just
         // use the uri as context.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txMozillaXSLTProcessor.h	2014-11-26 21:46:07.000000000 +0000
@@ -17,6 +17,7 @@
 #include "nsWrapperCache.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class nsINode;
 class nsIDOMNode;
@@ -185,7 +186,8 @@
 };
 
 extern nsresult TX_LoadSheet(nsIURI* aUri, txMozillaXSLTProcessor* aProcessor,
-                             nsIDocument* aLoaderDocument);
+                             nsIDocument* aLoaderDocument,
+                             mozilla::net::ReferrerPolicy aReferrerPolicy);
 
 extern nsresult TX_CompileStylesheet(nsINode* aNode,
                                      txMozillaXSLTProcessor* aProcessor,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txStylesheetCompiler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txStylesheetCompiler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txStylesheetCompiler.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txStylesheetCompiler.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -24,21 +24,25 @@
 #include "nsTArray.h"
 
 using namespace mozilla;
+using mozilla::net::ReferrerPolicy;
 
 txStylesheetCompiler::txStylesheetCompiler(const nsAString& aStylesheetURI,
+                                           ReferrerPolicy aReferrerPolicy,
                                            txACompileObserver* aObserver)
     : txStylesheetCompilerState(aObserver)
 {
-    mStatus = init(aStylesheetURI, nullptr, nullptr);
+    mStatus = init(aStylesheetURI, aReferrerPolicy, nullptr, nullptr);
 }
 
 txStylesheetCompiler::txStylesheetCompiler(const nsAString& aStylesheetURI,
                                            txStylesheet* aStylesheet,
                                            txListIterator* aInsertPosition,
+                                           ReferrerPolicy aReferrerPolicy,
                                            txACompileObserver* aObserver)
     : txStylesheetCompilerState(aObserver)
 {
-    mStatus = init(aStylesheetURI, aStylesheet, aInsertPosition);
+    mStatus = init(aStylesheetURI, aReferrerPolicy, aStylesheet,
+                   aInsertPosition);
 }
 
 void
@@ -415,6 +419,7 @@
 nsresult
 txStylesheetCompiler::loadURI(const nsAString& aUri,
                               const nsAString& aReferrerUri,
+                              ReferrerPolicy aReferrerPolicy,
                               txStylesheetCompiler* aCompiler)
 {
     PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
@@ -424,8 +429,9 @@
     if (mStylesheetURI.Equals(aUri)) {
         return NS_ERROR_XSLT_LOAD_RECURSION;
     }
-    return mObserver ? mObserver->loadURI(aUri, aReferrerUri, aCompiler) :
-                       NS_ERROR_FAILURE;
+    return mObserver ?
+        mObserver->loadURI(aUri, aReferrerUri, aReferrerPolicy, aCompiler) :
+        NS_ERROR_FAILURE;
 }
 
 void
@@ -536,12 +542,14 @@
 
 nsresult
 txStylesheetCompilerState::init(const nsAString& aStylesheetURI,
+                                ReferrerPolicy aReferrerPolicy,
                                 txStylesheet* aStylesheet,
                                 txListIterator* aInsertPosition)
 {
     NS_ASSERTION(!aStylesheet || aInsertPosition,
                  "must provide insertposition if loading subsheet");
     mStylesheetURI = aStylesheetURI;
+    mReferrerPolicy = aReferrerPolicy;
     // Check for fragment identifier of an embedded stylesheet.
     int32_t fragment = aStylesheetURI.FindChar('#') + 1;
     if (fragment > 0) {
@@ -765,7 +773,7 @@
 
     nsRefPtr<txStylesheetCompiler> compiler =
         new txStylesheetCompiler(aURI, mStylesheet, &mToplevelIterator,
-                                 observer);
+                                 mReferrerPolicy, observer);
     NS_ENSURE_TRUE(compiler, NS_ERROR_OUT_OF_MEMORY);
 
     // step forward before calling the observer in case of syncronous loading
@@ -775,7 +783,7 @@
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    rv = mObserver->loadURI(aURI, mStylesheetURI, compiler);
+    rv = mObserver->loadURI(aURI, mStylesheetURI, mReferrerPolicy, compiler);
     if (NS_FAILED(rv)) {
         mChildCompilerList.RemoveElement(compiler);
     }
@@ -801,14 +809,16 @@
     txACompileObserver* observer = static_cast<txStylesheetCompiler*>(this);
 
     nsRefPtr<txStylesheetCompiler> compiler =
-        new txStylesheetCompiler(aURI, mStylesheet, &iter, observer);
+        new txStylesheetCompiler(aURI, mStylesheet, &iter, mReferrerPolicy,
+                                 observer);
     NS_ENSURE_TRUE(compiler, NS_ERROR_OUT_OF_MEMORY);
 
     if (mChildCompilerList.AppendElement(compiler) == nullptr) {
         return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    nsresult rv = mObserver->loadURI(aURI, mStylesheetURI, compiler);
+    nsresult rv = mObserver->loadURI(aURI, mStylesheetURI, mReferrerPolicy,
+                                     compiler);
     if (NS_FAILED(rv)) {
         mChildCompilerList.RemoveElement(compiler);
     }
@@ -1070,7 +1080,8 @@
 TX_XSLTFunctionAvailable(nsIAtom* aName, int32_t aNameSpaceID)
 {
     nsRefPtr<txStylesheetCompiler> compiler =
-        new txStylesheetCompiler(EmptyString(), nullptr);
+        new txStylesheetCompiler(EmptyString(),
+                                 mozilla::net::RP_Default, nullptr);
     NS_ENSURE_TRUE(compiler, false);
 
     nsAutoPtr<FunctionCall> fnCall;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txStylesheetCompiler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txStylesheetCompiler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xslt/xslt/txStylesheetCompiler.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xslt/xslt/txStylesheetCompiler.h	2014-11-26 21:46:07.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsAutoPtr.h"
 #include "txStylesheet.h"
 #include "nsTArray.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 extern bool
 TX_XSLTFunctionAvailable(nsIAtom* aName, int32_t aNameSpaceID);
@@ -50,6 +51,7 @@
 
     virtual nsresult loadURI(const nsAString& aUri,
                              const nsAString& aReferrerUri,
+                             mozilla::net::ReferrerPolicy aReferrerPolicy,
                              txStylesheetCompiler* aCompiler) = 0;
     virtual void onDoneCompiling(txStylesheetCompiler* aCompiler,
                                  nsresult aResult,
@@ -59,6 +61,7 @@
 
 #define TX_DECL_ACOMPILEOBSERVER \
   nsresult loadURI(const nsAString& aUri, const nsAString& aReferrerUri, \
+                   mozilla::net::ReferrerPolicy aReferrerPolicy, \
                    txStylesheetCompiler* aCompiler); \
   void onDoneCompiling(txStylesheetCompiler* aCompiler, nsresult aResult, \
                        const char16_t *aErrorText = nullptr, \
@@ -70,8 +73,9 @@
     explicit txStylesheetCompilerState(txACompileObserver* aObserver);
     ~txStylesheetCompilerState();
     
-    nsresult init(const nsAString& aStylesheetURI, txStylesheet* aStylesheet,
-                  txListIterator* aInsertPosition);
+    nsresult init(const nsAString& aStylesheetURI,
+                  mozilla::net::ReferrerPolicy aReferrerPolicy,
+                  txStylesheet* aStylesheet, txListIterator* aInsertPosition);
 
     // Embedded stylesheets state
     bool handleEmbeddedSheet()
@@ -171,6 +175,7 @@
     txInstruction** mNextInstrPtr;
     txListIterator mToplevelIterator;
     nsTArray<txInstruction**> mGotoTargetPointers;
+    mozilla::net::ReferrerPolicy mReferrerPolicy;
 };
 
 struct txStylesheetAttr
@@ -189,10 +194,12 @@
     friend bool TX_XSLTFunctionAvailable(nsIAtom* aName,
                                            int32_t aNameSpaceID);
     txStylesheetCompiler(const nsAString& aStylesheetURI,
+                         mozilla::net::ReferrerPolicy  aReferrerPolicy,
                          txACompileObserver* aObserver);
     txStylesheetCompiler(const nsAString& aStylesheetURI,
                          txStylesheet* aStylesheet,
                          txListIterator* aInsertPosition,
+                         mozilla::net::ReferrerPolicy aReferrerPolicy,
                          txACompileObserver* aObserver);
 
     void setBaseURI(const nsString& aBaseURI);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xul/XULDocument.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xul/XULDocument.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/dom/xul/XULDocument.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/dom/xul/XULDocument.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -3573,9 +3573,7 @@
     JS::HandleScript scriptObject = aScript->GetScriptObject();
     NS_ENSURE_TRUE(scriptObject, NS_ERROR_UNEXPECTED);
 
-    // Execute the precompiled script with the given version
-    nsAutoMicroTask mt;
-
+    // Execute the precompiled script with the given version.
     // We're about to run script via JS::CloneAndExecuteScript, so we need an
     // AutoEntryScript. This is Gecko specific and not in any spec.
     AutoEntryScript aes(mScriptGlobalObject);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsEditorCommands.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsEditorCommands.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsEditorCommands.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsEditorCommands.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -5,6 +5,7 @@
 
 
 #include "mozFlushType.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
@@ -683,6 +684,70 @@
   return NS_OK;
 }
 
+static const struct ScrollCommand {
+  const char *reverseScroll;
+  const char *forwardScroll;
+  nsresult (NS_STDCALL nsISelectionController::*scroll)(bool);
+} scrollCommands[] = {
+  { "cmd_scrollTop", "cmd_scrollBottom",
+    &nsISelectionController::CompleteScroll },
+  { "cmd_scrollPageUp", "cmd_scrollPageDown",
+    &nsISelectionController::ScrollPage },
+  { "cmd_scrollLineUp", "cmd_scrollLineDown",
+    &nsISelectionController::ScrollLine }
+};
+
+static const struct MoveCommand {
+  const char *reverseMove;
+  const char *forwardMove;
+  const char *reverseSelect;
+  const char *forwardSelect;
+  nsresult (NS_STDCALL nsISelectionController::*move)(bool, bool);
+} moveCommands[] = {
+  { "cmd_charPrevious", "cmd_charNext",
+    "cmd_selectCharPrevious", "cmd_selectCharNext",
+    &nsISelectionController::CharacterMove },
+  { "cmd_linePrevious", "cmd_lineNext",
+    "cmd_selectLinePrevious", "cmd_selectLineNext",
+    &nsISelectionController::LineMove },
+  { "cmd_wordPrevious", "cmd_wordNext",
+    "cmd_selectWordPrevious", "cmd_selectWordNext",
+    &nsISelectionController::WordMove },
+  { "cmd_beginLine", "cmd_endLine",
+    "cmd_selectBeginLine", "cmd_selectEndLine",
+    &nsISelectionController::IntraLineMove },
+  { "cmd_movePageUp", "cmd_movePageDown",
+    "cmd_selectPageUp", "cmd_selectPageDown",
+    &nsISelectionController::PageMove },
+  { "cmd_moveTop", "cmd_moveBottom",
+    "cmd_selectTop", "cmd_selectBottom",
+    &nsISelectionController::CompleteMove }
+};
+
+static const struct PhysicalCommand {
+  const char *move;
+  const char *select;
+  int16_t direction;
+  int16_t amount;
+} physicalCommands[] = {
+  { "cmd_moveLeft", "cmd_selectLeft",
+    nsISelectionController::MOVE_LEFT, 0 },
+  { "cmd_moveRight", "cmd_selectRight",
+    nsISelectionController::MOVE_RIGHT, 0 },
+  { "cmd_moveUp", "cmd_selectUp",
+    nsISelectionController::MOVE_UP, 0 },
+  { "cmd_moveDown", "cmd_selectDown",
+    nsISelectionController::MOVE_DOWN, 0 },
+  { "cmd_moveLeft2", "cmd_selectLeft2",
+    nsISelectionController::MOVE_LEFT, 1 },
+  { "cmd_moveRight2", "cmd_selectRight2",
+    nsISelectionController::MOVE_RIGHT, 1 },
+  { "cmd_moveUp2", "cmd_selectUp2",
+    nsISelectionController::MOVE_UP, 1 },
+  { "cmd_moveDown2", "cmd_selectDown2",
+    nsISelectionController::MOVE_DOWN, 1 }
+};
+
 NS_IMETHODIMP
 nsSelectionMoveCommands::DoCommand(const char *aCommandName,
                                    nsISupports *aCommandRefCon)
@@ -704,84 +769,40 @@
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(selCont, NS_ERROR_FAILURE);
 
-  // complete scroll commands
-  if (!nsCRT::strcmp(aCommandName,"cmd_scrollTop"))
-    return selCont->CompleteScroll(false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_scrollBottom"))
-    return selCont->CompleteScroll(true);
-
-  // complete move commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_moveTop"))
-    return selCont->CompleteMove(false, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_moveBottom"))
-    return selCont->CompleteMove(true, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectTop"))
-    return selCont->CompleteMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectBottom"))
-    return selCont->CompleteMove(true, true);
-
-  // line move commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_lineNext"))
-    return selCont->LineMove(true, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_linePrevious"))
-    return selCont->LineMove(false, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectLineNext"))
-    return selCont->LineMove(true, true);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectLinePrevious"))
-    return selCont->LineMove(false, true);
-
-  // character move commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_charPrevious"))
-    return selCont->CharacterMove(false, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_charNext"))
-    return selCont->CharacterMove(true, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectCharPrevious"))
-    return selCont->CharacterMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectCharNext"))
-    return selCont->CharacterMove(true, true);
-
-  // intra line move commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_beginLine"))
-    return selCont->IntraLineMove(false, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_endLine"))
-    return selCont->IntraLineMove(true, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectBeginLine"))
-    return selCont->IntraLineMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectEndLine"))
-    return selCont->IntraLineMove(true, true);
-  
-  // word move commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_wordPrevious"))
-    return selCont->WordMove(false, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_wordNext"))
-    return selCont->WordMove(true, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectWordPrevious"))
-    return selCont->WordMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectWordNext"))
-    return selCont->WordMove(true, true);
-  
-  // scroll page commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_scrollPageUp"))
-    return selCont->ScrollPage(false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_scrollPageDown"))
-    return selCont->ScrollPage(true);
-  
-  // scroll line commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_scrollLineUp"))
-    return selCont->ScrollLine(false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_scrollLineDown"))
-    return selCont->ScrollLine(true);
-  
-  // page move commands
-  else if (!nsCRT::strcmp(aCommandName,"cmd_movePageUp"))
-    return selCont->PageMove(false, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_movePageDown"))
-    return selCont->PageMove(true, false);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectPageUp"))
-    return selCont->PageMove(false, true);
-  else if (!nsCRT::strcmp(aCommandName,"cmd_selectPageDown"))
-    return selCont->PageMove(true, true);
-    
+  // scroll commands
+  for (size_t i = 0; i < mozilla::ArrayLength(scrollCommands); i++) {
+    const ScrollCommand& cmd = scrollCommands[i];
+    if (!nsCRT::strcmp(aCommandName, cmd.reverseScroll)) {
+      return (selCont->*(cmd.scroll))(false);
+    } else if (!nsCRT::strcmp(aCommandName, cmd.forwardScroll)) {
+      return (selCont->*(cmd.scroll))(true);
+    }
+  }
+
+  // caret movement/selection commands
+  for (size_t i = 0; i < mozilla::ArrayLength(moveCommands); i++) {
+    const MoveCommand& cmd = moveCommands[i];
+    if (!nsCRT::strcmp(aCommandName, cmd.reverseMove)) {
+      return (selCont->*(cmd.move))(false, false);
+    } else if (!nsCRT::strcmp(aCommandName, cmd.forwardMove)) {
+      return (selCont->*(cmd.move))(true, false);
+    } else if (!nsCRT::strcmp(aCommandName, cmd.reverseSelect)) {
+      return (selCont->*(cmd.move))(false, true);
+    } else if (!nsCRT::strcmp(aCommandName, cmd.forwardSelect)) {
+      return (selCont->*(cmd.move))(true, true);
+    }
+  }
+
+  // physical-direction movement/selection
+  for (size_t i = 0; i < mozilla::ArrayLength(physicalCommands); i++) {
+    const PhysicalCommand& cmd = physicalCommands[i];
+    if (!nsCRT::strcmp(aCommandName, cmd.move)) {
+      return selCont->PhysicalMove(cmd.direction, cmd.amount, false);
+    } else if (!nsCRT::strcmp(aCommandName, cmd.select)) {
+      return selCont->PhysicalMove(cmd.direction, cmd.amount, true);
+    }
+  }
+
   return NS_ERROR_FAILURE;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsEditorController.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsEditorController.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsEditorController.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsEditorController.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -110,7 +110,23 @@
   NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_movePageUp");
   NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_movePageDown");
   NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectPageUp");
-  NS_REGISTER_LAST_COMMAND(nsSelectionMoveCommands, "cmd_selectPageDown");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectPageDown");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveLeft");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveRight");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveUp");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveDown");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveLeft2");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveRight2");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveUp2");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_moveDown2");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectLeft");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectRight");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectUp");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectDown");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectLeft2");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectRight2");
+  NS_REGISTER_NEXT_COMMAND(nsSelectionMoveCommands, "cmd_selectUp2");
+  NS_REGISTER_LAST_COMMAND(nsSelectionMoveCommands, "cmd_selectDown2");
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsEditor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsEditor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsEditor.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsEditor.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -1764,7 +1764,7 @@
     // Note that we don't need to check mDispatchInputEvent here.  We need
     // to check it only when the editor requests to dispatch the input event.
 
-    if (!mTarget->IsInDoc()) {
+    if (!mTarget->IsInComposedDoc()) {
       return NS_OK;
     }
 
@@ -4915,6 +4915,7 @@
     case NS_COMPOSITION_END:
     case NS_COMPOSITION_UPDATE:
     case NS_COMPOSITION_CHANGE:
+    case NS_COMPOSITION_COMMIT_AS_IS:
       // Don't allow composition events whose internal event are not
       // WidgetCompositionEvent.
       widgetGUIEvent = aEvent->GetInternalNSEvent()->AsCompositionEvent();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsTextEditRulesBidi.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsTextEditRulesBidi.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/nsTextEditRulesBidi.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/nsTextEditRulesBidi.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -45,8 +45,8 @@
   nsCOMPtr<nsIContent> content = do_QueryInterface(aSelNode);
   NS_ENSURE_TRUE(content, NS_ERROR_NULL_POINTER);
 
-  uint8_t levelBefore;
-  uint8_t levelAfter;
+  nsBidiLevel levelBefore;
+  nsBidiLevel levelAfter;
   nsRefPtr<nsFrameSelection> frameSelection =
     static_cast<Selection*>(aSelection)->GetFrameSelection();
   NS_ENSURE_TRUE(frameSelection, NS_ERROR_NULL_POINTER);
@@ -57,9 +57,9 @@
   levelBefore = levels.mLevelBefore;
   levelAfter = levels.mLevelAfter;
 
-  uint8_t currentCaretLevel = frameSelection->GetCaretBidiLevel();
+  nsBidiLevel currentCaretLevel = frameSelection->GetCaretBidiLevel();
 
-  uint8_t levelOfDeletion;
+  nsBidiLevel levelOfDeletion;
   levelOfDeletion =
     (nsIEditor::eNext==aAction || nsIEditor::eNextWord==aAction) ?
     levelAfter : levelBefore;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/browserscope/lib/richtext2/currentStatus.js	2014-11-26 21:46:07.000000000 +0000
@@ -498,12 +498,6 @@
     "S-Proposed-SM:m.b.c_CHAR-5_SR-dM": true,
     "S-Proposed-SM:m.b.c_CHAR-5_SR-body": true,
     "S-Proposed-SM:m.b.c_CHAR-5_SR-div": true,
-    "S-Proposed-SM:m.f.c_Pdir:rtl-1_SC-1-dM": true,
-    "S-Proposed-SM:m.f.c_Pdir:rtl-1_SC-1-body": true,
-    "S-Proposed-SM:m.f.c_Pdir:rtl-1_SC-1-div": true,
-    "S-Proposed-SM:m.b.c_Pdir:rtl-1_SC-1-dM": true,
-    "S-Proposed-SM:m.b.c_Pdir:rtl-1_SC-1-body": true,
-    "S-Proposed-SM:m.b.c_Pdir:rtl-1_SC-1-div": true,
     "S-Proposed-SM:m.f.w_TEXT-jp_SC-1-dM": true,
     "S-Proposed-SM:m.f.w_TEXT-jp_SC-1-body": true,
     "S-Proposed-SM:m.f.w_TEXT-jp_SC-1-div": true,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_bug1026397.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_bug1026397.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_bug1026397.html	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_bug1026397.html	2014-11-26 21:46:07.000000000 +0000
@@ -60,17 +60,7 @@
     is(input.value, aExpectedValueDuringComposition,
        "The value of input whose maxlength is " + maxLengthStr + " should be "
          + aExpectedValueDuringComposition + " during composition" + aAdditionalExplanation);
-    synthesizeCompositionChange(
-      { "composition":
-        { "string": aInsertString,
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": aInsertString.length, "length": 0 }
-      });
-    synthesizeComposition({ type: "compositionend" });
+    synthesizeComposition({ type: "compositioncommitasis" });
     is(input.value, aExpectedValueAfterCompositionEnd,
        "The value of input whose maxlength is " + maxLengthStr + " should be "
          + aExpectedValueAfterCompositionEnd + " after compositionend" + aAdditionalExplanation);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_bug697842.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_bug697842.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_bug697842.html	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_bug697842.html	2014-11-26 21:46:07.000000000 +0000
@@ -90,19 +90,7 @@
         "caret": { "start": 2, "length": 0 }
       });
 
-    // commit
-    synthesizeCompositionChange(
-      { "composition":
-        { "string": composingString,
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 2, "length": 0 }
-      });
-
-    synthesizeComposition({ type: "compositionend", data: composingString });
+    synthesizeComposition({ type: "compositioncommitasis" });
 
     is(editor.innerHTML, composingString,
        "editor has unexpected result");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_bug795785.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_bug795785.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_bug795785.html	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_bug795785.html	2014-11-26 21:46:07.000000000 +0000
@@ -134,11 +134,7 @@
     hitEventLoop(function () {
       isnot(aElement.scrollTop, 0,
             aElementDescription + " was not scrolled by composition");
-      synthesizeCompositionChange({
-        composition: { string: "", clauses: [ { length: 0, attr: 0 } ] },
-        caret: { start: 0, length: 0 }
-      });
-      synthesizeComposition({ type: "compositionend", data: "" });
+      synthesizeComposition({ type: "compositioncommit", data: "" });
       hitEventLoop(function () {
         is(aElement.scrollTop, 0,
            aElementDescription + " was not scrolled back to the top by canceling composition");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_contenteditable_text_input_handling.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_contenteditable_text_input_handling.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/libeditor/tests/test_contenteditable_text_input_handling.html	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/libeditor/tests/test_contenteditable_text_input_handling.html	2014-11-26 21:46:07.000000000 +0000
@@ -257,16 +257,7 @@
     is(querySelectedText.text, "",
        "query selected text event returns wrong selected text" + when);
     // commit composition
-    synthesizeCompositionChange(
-      { "composition":
-        { "string": "\u3089",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 1, "length": 0 }
-      });
+    synthesizeComposition({ type: "compositioncommitasis" });
     queryText = synthesizeQueryTextContent(0, 100);
     ok(queryText, "query text event result is null after commit" + when);
     if (!queryText) {
@@ -294,8 +285,6 @@
     is(querySelectedText.text, "",
        "query selected text event returns wrong selected text after commit" +
          when);
-    // end composition
-    synthesizeComposition({ type: "compositionend", data: "\u3089" });
 
     checkValue(staticContent, "\u3089");
     checkValue(inputInStatic, "\u3089");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/reftests/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/reftests/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/editor/reftests/reftest.list	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/editor/reftests/reftest.list	2014-11-26 21:46:07.000000000 +0000
@@ -98,12 +98,12 @@
 == 388980-1.html 388980-1-ref.html
 needs-focus == spellcheck-superscript-1.html spellcheck-superscript-1-ref.html
 skip-if(B2G) fails-if(Android) needs-focus != spellcheck-superscript-2.html spellcheck-superscript-2-ref.html # bug 783658
-needs-focus == 824080-1.html 824080-1-ref.html
+needs-focus pref(selectioncaret.enabled,false) == 824080-1.html 824080-1-ref.html
 needs-focus == 824080-2.html 824080-2-ref.html
-needs-focus test-pref(selectioncaret.enabled,false) == 824080-3.html 824080-3-ref.html
+needs-focus pref(selectioncaret.enabled,false) == 824080-3.html 824080-3-ref.html
 needs-focus != 824080-2.html 824080-3.html
-needs-focus == 824080-4.html 824080-4-ref.html
-needs-focus test-pref(selectioncaret.enabled,false) == 824080-5.html 824080-5-ref.html
+needs-focus pref(selectioncaret.enabled,false) == 824080-4.html 824080-4-ref.html
+needs-focus pref(selectioncaret.enabled,false) == 824080-5.html 824080-5-ref.html
 needs-focus != 824080-4.html 824080-5.html
 needs-focus == 824080-6.html 824080-6-ref.html
 needs-focus pref(selectioncaret.enabled,false) == 824080-7.html 824080-7-ref.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/android/geckoview_example/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/android/geckoview_example/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/android/geckoview_example/Makefile.in	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/android/geckoview_example/Makefile.in	2014-11-26 21:46:07.000000000 +0000
@@ -25,7 +25,7 @@
 	binaries \
 	$(NULL)
 
-ANDROID=$(ANDROID_SDK)/../../tools/android
+ANDROID=$(ANDROID_TOOLS)/android
 
 TARGET="android-$(ANDROID_TARGET_SDK)"
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/browser/nsContextMenuInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/browser/nsContextMenuInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/browser/nsContextMenuInfo.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/browser/nsContextMenuInfo.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -294,7 +294,8 @@
           nsRefPtr<imgLoader> il = imgLoader::GetInstance();
           NS_ENSURE_TRUE(il, NS_ERROR_FAILURE);
 
-          return il->LoadImage(bgUri, nullptr, nullptr, principal, nullptr,
+          return il->LoadImage(bgUri, nullptr, nullptr,
+                               doc->GetReferrerPolicy(), principal, nullptr,
                                nullptr, nullptr, nsIRequest::LOAD_NORMAL,
                                nullptr, nsIContentPolicy::TYPE_IMAGE,
                                EmptyString(), aRequest);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/browser/nsWebBrowser.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/browser/nsWebBrowser.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/browser/nsWebBrowser.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/browser/nsWebBrowser.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -10,6 +10,9 @@
 #include "nsGfxCIID.h"
 #include "nsWidgetsCID.h"
 
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
+
 //Interfaces Needed
 #include "nsReadableUtils.h"
 #include "nsIComponentManager.h"
@@ -51,6 +54,7 @@
 #include "nsXULAppAPI.h"
 
 using namespace mozilla;
+using namespace mozilla::gfx;
 using namespace mozilla::layers;
 
 static NS_DEFINE_CID(kChildCID, NS_CHILD_CID);
@@ -947,20 +951,25 @@
     return NS_OK;
 }
 
-/* void saveURI (in nsIURI aURI, in nsIURI aReferrer,
+/* void saveURI (in nsIURI aURI, in nsIURI aReferrer, in unsigned long aReferrerPolicy
    in nsISupports aCacheKey, in nsIInputStream aPostData, in wstring aExtraHeaders,
    in nsISupports aFile, in nsILoadContext aPrivacyContext); */
 NS_IMETHODIMP nsWebBrowser::SaveURI(
-    nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer, nsIInputStream *aPostData,
-    const char *aExtraHeaders, nsISupports *aFile, nsILoadContext* aPrivacyContext)
+    nsIURI *aURI, nsISupports *aCacheKey,
+    nsIURI *aReferrer, uint32_t aReferrerPolicy,
+    nsIInputStream *aPostData, const char *aExtraHeaders,
+    nsISupports *aFile, nsILoadContext* aPrivacyContext)
 {
-    return SavePrivacyAwareURI(aURI, aCacheKey, aReferrer, aPostData, aExtraHeaders,
+    return SavePrivacyAwareURI(aURI, aCacheKey, aReferrer, aReferrerPolicy,
+                               aPostData, aExtraHeaders,
                                aFile, aPrivacyContext && aPrivacyContext->UsePrivateBrowsing());
 }
 
 NS_IMETHODIMP nsWebBrowser::SavePrivacyAwareURI(
-    nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer, nsIInputStream *aPostData,
-    const char *aExtraHeaders, nsISupports *aFile, bool aIsPrivate)
+    nsIURI *aURI, nsISupports *aCacheKey,
+    nsIURI *aReferrer, uint32_t aReferrerPolicy,
+    nsIInputStream *aPostData, const char *aExtraHeaders,
+    nsISupports *aFile, bool aIsPrivate)
 {
     if (mPersist)
     {
@@ -998,8 +1007,9 @@
     mPersist->SetProgressListener(this);
     mPersist->SetPersistFlags(mPersistFlags);
     mPersist->GetCurrentState(&mPersistCurrentState);
-    rv = mPersist->SavePrivacyAwareURI(uri, aCacheKey, aReferrer, aPostData,
-                                       aExtraHeaders, aFile, aIsPrivate);
+
+    rv = mPersist->SavePrivacyAwareURI(uri, aCacheKey, aReferrer, aReferrerPolicy,
+                                       aPostData, aExtraHeaders, aFile, aIsPrivate);
     if (NS_FAILED(rv))
     {
         mPersist = nullptr;
@@ -1644,12 +1654,13 @@
                             const nsIntRegion& aRegionToInvalidate,
                             void* aCallbackData)
 {
-  nscolor* color = static_cast<nscolor*>(aCallbackData);
-  aContext->NewPath();
-  aContext->SetColor(gfxRGBA(*color));
+  DrawTarget& aDrawTarget = *aContext->GetDrawTarget();
+
+  ColorPattern color(ToDeviceColor(*static_cast<nscolor*>(aCallbackData)));
   nsIntRect dirtyRect = aRegionToDraw.GetBounds();
-  aContext->Rectangle(gfxRect(dirtyRect.x, dirtyRect.y, dirtyRect.width, dirtyRect.height));
-  aContext->Fill();  
+  aDrawTarget.FillRect(Rect(dirtyRect.x, dirtyRect.y,
+                            dirtyRect.width, dirtyRect.height),
+                       color);
 }
 
 void nsWebBrowser::WindowRaised(nsIWidget* aWidget)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl	2014-11-26 21:46:08.000000000 +0000
@@ -123,6 +123,10 @@
    *                   nsIWebPageDescriptor.
    * @param aReferrer  The referrer URI to pass with an HTTP request or
    *                   <CODE>nullptr</CODE>.
+   * @param aReferrerPolicy  The referrer policy for when and what to send via
+   *                   HTTP Referer header.  Ignored if aReferrer is
+   *                   <CODE>nullptr</CODE>.  Taken from REFERRER_POLICY
+   *                   constants in nsIHttpChannel.
    * @param aPostData  Post data to pass with an HTTP request or
    *                   <CODE>nullptr</CODE>.
    * @param aExtraHeaders Additional headers to supply with an HTTP request
@@ -143,7 +147,8 @@
    * @throws NS_ERROR_INVALID_ARG One or more arguments was invalid.
    */
   void saveURI(in nsIURI aURI, in nsISupports aCacheKey,
-      in nsIURI aReferrer, in nsIInputStream aPostData,
+      in nsIURI aReferrer, in unsigned long aReferrerPolicy,
+      in nsIInputStream aPostData,
       in string aExtraHeaders, in nsISupports aFile,
       in nsILoadContext aPrivacyContext);
 
@@ -154,7 +159,8 @@
    * @see saveURI for all other parameter descriptions
    */
   void savePrivacyAwareURI(in nsIURI aURI, in nsISupports aCacheKey,
-      in nsIURI aReferrer, in nsIInputStream aPostData,
+      in nsIURI aReferrer, in unsigned long aReferrerPolicy,
+      in nsIInputStream aPostData,
       in string aExtraHeaders, in nsISupports aFile,
       in boolean aIsPrivate);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -332,14 +332,21 @@
    in nsIInputStream aPostData, in wstring aExtraHeaders,
    in nsISupports aFile, in nsILoadContext aPrivayContext); */
 NS_IMETHODIMP nsWebBrowserPersist::SaveURI(
-    nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer, nsIInputStream *aPostData, const char *aExtraHeaders, nsISupports *aFile, nsILoadContext* aPrivacyContext)
+    nsIURI *aURI, nsISupports *aCacheKey,
+    nsIURI *aReferrer, uint32_t aReferrerPolicy,
+    nsIInputStream *aPostData, const char *aExtraHeaders,
+    nsISupports *aFile, nsILoadContext* aPrivacyContext)
 {
-    return SavePrivacyAwareURI(aURI, aCacheKey, aReferrer, aPostData, aExtraHeaders, aFile,
+    return SavePrivacyAwareURI(aURI, aCacheKey, aReferrer, aReferrerPolicy,
+                               aPostData, aExtraHeaders, aFile,
                                aPrivacyContext && aPrivacyContext->UsePrivateBrowsing());
 }
 
 NS_IMETHODIMP nsWebBrowserPersist::SavePrivacyAwareURI(
-    nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer, nsIInputStream *aPostData, const char *aExtraHeaders, nsISupports *aFile, bool aIsPrivate)
+    nsIURI *aURI, nsISupports *aCacheKey,
+    nsIURI *aReferrer, uint32_t aReferrerPolicy,
+    nsIInputStream *aPostData, const char *aExtraHeaders, 
+    nsISupports *aFile, bool aIsPrivate)
 {
     NS_ENSURE_TRUE(mFirstAndOnlyUse, NS_ERROR_FAILURE);
     mFirstAndOnlyUse = false; // Stop people from reusing this object!
@@ -351,7 +358,8 @@
 
     // SaveURI doesn't like broken uris.
     mPersistFlags |= PERSIST_FLAGS_FAIL_ON_BROKEN_LINKS;
-    rv = SaveURIInternal(aURI, aCacheKey, aReferrer, aPostData, aExtraHeaders, fileAsURI, false, aIsPrivate);
+    rv = SaveURIInternal(aURI, aCacheKey, aReferrer, aReferrerPolicy,
+                         aPostData, aExtraHeaders, fileAsURI, false, aIsPrivate);
     return NS_FAILED(rv) ? rv : NS_OK;
 }
 
@@ -1148,8 +1156,9 @@
 
 nsresult nsWebBrowserPersist::SaveURIInternal(
     nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer,
-    nsIInputStream *aPostData, const char *aExtraHeaders,
-    nsIURI *aFile, bool aCalcFileExt, bool aIsPrivate)
+    uint32_t aReferrerPolicy, nsIInputStream *aPostData,
+    const char *aExtraHeaders, nsIURI *aFile,
+    bool aCalcFileExt, bool aIsPrivate)
 {
     NS_ENSURE_ARG_POINTER(aURI);
     NS_ENSURE_ARG_POINTER(aFile);
@@ -1246,7 +1255,7 @@
         // Referrer
         if (aReferrer)
         {
-            httpChannel->SetReferrer(aReferrer);
+            httpChannel->SetReferrerWithPolicy(aReferrer, aReferrerPolicy);
         }
 
         // Post data
@@ -2472,8 +2481,9 @@
     rv = pthis->AppendPathToURI(fileAsURI, aData->mFilename);
     NS_ENSURE_SUCCESS(rv, PL_DHASH_STOP);
 
-    rv = pthis->SaveURIInternal(uri, nullptr, nullptr, nullptr, nullptr, fileAsURI, true,
-                                pthis->mIsPrivate);
+    // The Referrer Policy doesn't matter here since the referrer is nullptr.
+    rv = pthis->SaveURIInternal(uri, nullptr, nullptr, mozilla::net::RP_Default,
+                                nullptr, nullptr, fileAsURI, true, pthis->mIsPrivate);
     // if SaveURIInternal fails, then it will have called EndDownload,
     // which means that |aData| is no longer valid memory.  we MUST bail.
     NS_ENSURE_SUCCESS(rv, PL_DHASH_STOP);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/webbrowserpersist/nsWebBrowserPersist.h	2014-11-26 21:46:08.000000000 +0000
@@ -65,7 +65,8 @@
         nsIDOMNode *aNodeIn, bool *aSerializeCloneKids, nsIDOMNode **aNodeOut);
     nsresult SaveURIInternal(
         nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer,
-        nsIInputStream *aPostData, const char *aExtraHeaders, nsIURI *aFile,
+        uint32_t aReferrerPolicy, nsIInputStream *aPostData,
+        const char *aExtraHeaders, nsIURI *aFile,
         bool aCalcFileExt, bool aIsPrivate);
     nsresult SaveChannelInternal(
         nsIChannel *aChannel, nsIURI *aFile, bool aCalcFileExt);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/windowwatcher/nsWindowWatcher.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/windowwatcher/nsWindowWatcher.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/embedding/components/windowwatcher/nsWindowWatcher.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/embedding/components/windowwatcher/nsWindowWatcher.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -908,6 +908,7 @@
       if (doc) {
         // Set the referrer
         loadInfo->SetReferrer(doc->GetDocumentURI());
+        loadInfo->SetReferrerPolicy(doc->GetReferrerPolicy());
       }
     }
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/2D.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/2D.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/2D.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/2D.h	2014-11-26 21:46:08.000000000 +0000
@@ -1003,6 +1003,7 @@
 
   virtual bool IsDualDrawTarget() const { return false; }
   virtual bool IsTiledDrawTarget() const { return false; }
+  virtual bool SupportsRegionClipping() const { return true; }
 
   void AddUserData(UserDataKey *key, void *userData, void (*destroy)(void*)) {
     mUserData.Add(key, userData, destroy);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/BaseRect.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/BaseRect.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/BaseRect.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/BaseRect.h	2014-11-26 21:46:08.000000000 +0000
@@ -177,6 +177,23 @@
     *static_cast<Sub*>(this) = aRect1.UnionEdges(aRect2);
   }
 
+  // Expands the rect to include the point
+  void ExpandToEnclose(const Point& aPoint)
+  {
+    if (aPoint.x < x) {
+      width = XMost() - aPoint.x;
+      x = aPoint.x;
+    } else if (aPoint.x > XMost()) {
+      width = aPoint.x - x;
+    }
+    if (aPoint.y < y) {
+      height = YMost() - aPoint.y;
+      y = aPoint.y;
+    } else if (aPoint.y > YMost()) {
+      height = aPoint.y - y;
+    }
+  }
+
   void SetRect(T aX, T aY, T aWidth, T aHeight)
   {
     x = aX; y = aY; width = aWidth; height = aHeight;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetCairo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetCairo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetCairo.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetCairo.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -1480,8 +1480,9 @@
 
   if (!cairo_surface_status(similar)) {
     RefPtr<DrawTargetCairo> target = new DrawTargetCairo();
-    target->InitAlreadyReferenced(similar, aSize);
-    return target.forget();
+    if (target->InitAlreadyReferenced(similar, aSize)) {
+      return target.forget();
+    }
   }
 
   gfxCriticalError() << "Failed to create similar cairo surface! Size: " << aSize << " Status: " << cairo_surface_status(similar);
@@ -1537,8 +1538,11 @@
   // operations in graphics memory.
   if (aSigma == 0.0F) {
     RefPtr<DrawTargetCairo> target = new DrawTargetCairo();
-    target->InitAlreadyReferenced(similar, aSize);
-    return target.forget();
+    if (target->InitAlreadyReferenced(similar, aSize)) {
+      return target.forget();
+    } else {
+      return nullptr;
+    }
   }
 
   cairo_surface_t* blursurf = cairo_image_surface_create(CAIRO_FORMAT_A8,
@@ -1560,8 +1564,10 @@
   cairo_surface_destroy(similar);
 
   RefPtr<DrawTargetCairo> target = new DrawTargetCairo();
-  target->InitAlreadyReferenced(tee, aSize);
-  return target.forget();
+  if (target->InitAlreadyReferenced(tee, aSize)) {
+    return target.forget();
+  }
+  return nullptr;
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D1.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D1.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D1.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D1.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -191,6 +191,11 @@
   Matrix mat;
   RefPtr<ID2D1Image> image = GetImageForSurface(aSurface, mat, ExtendMode::CLAMP);
 
+  if (!image) {
+    gfxWarning() << "Couldn't get image for surface.";
+    return;
+  }
+
   if (!mat.IsIdentity()) {
     gfxDebug() << *this << ": At this point complex partial uploads are not supported for Shadow surfaces.";
     return;
@@ -264,12 +269,19 @@
                             Point aOffset,
                             const DrawOptions &aOptions)
 {
-  PrepareForDrawing(aOptions.mCompositionOp, aSource);
+  MarkChanged();
 
   RefPtr<ID2D1Bitmap> bitmap;
 
   RefPtr<ID2D1Image> image = GetImageForSurface(aMask, ExtendMode::CLAMP);
 
+  if (!image) {
+    gfxWarning() << "Failed to get image for surface.";
+    return;
+  }
+
+  PrepareForDrawing(aOptions.mCompositionOp, aSource);
+
   // FillOpacityMask only works if the antialias mode is MODE_ALIASED
   mDC->SetAntialiasMode(D2D1_ANTIALIAS_MODE_ALIASED);
 
@@ -305,6 +317,11 @@
   Matrix mat;
   RefPtr<ID2D1Image> image = GetImageForSurface(aSurface, mat, ExtendMode::CLAMP);
 
+  if (!image) {
+    gfxWarning() << "Couldn't get image for surface.";
+    return;
+  }
+
   if (!mat.IsIdentity()) {
     gfxDebug() << *this << ": At this point complex partial uploads are not supported for CopySurface.";
     return;
@@ -799,17 +816,22 @@
   props.pixelFormat = D2DPixelFormat(aFormat);
   props.colorContext = nullptr;
   props.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET;
-  mDC->CreateBitmap(D2DIntSize(aSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mBitmap));
+  hr = mDC->CreateBitmap(D2DIntSize(aSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mBitmap));
 
   if (FAILED(hr)) {
-    gfxWarning() << *this << ": Error " << hexa(hr) << " failed to create new CommandList.";
+    gfxCriticalError() << *this << ": Error " << hexa(hr) << " failed to create new Bitmap. Size: " << aSize;
     return false;
   }
 
   props.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED;
   props.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM;
 
-  mDC->CreateBitmap(D2DIntSize(aSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mTempBitmap));
+  hr = mDC->CreateBitmap(D2DIntSize(aSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mTempBitmap));
+
+  if (FAILED(hr)) {
+    gfxCriticalError() << *this << ": Error " << hexa(hr) << " failed to create new TempBitmap. Size: " << aSize;
+    return false;
+  }
 
   mDC->SetTarget(mBitmap);
 
@@ -851,6 +873,16 @@
 }
 
 void
+DrawTargetD2D1::CleanupD2D()
+{
+  if (mFactory) {
+    RadialGradientEffectD2D1::Unregister(mFactory);
+    mFactory->Release();
+    mFactory = nullptr;
+  }
+}
+
+void
 DrawTargetD2D1::MarkChanged()
 {
   if (mSnapshot) {
@@ -1246,6 +1278,11 @@
 
     RefPtr<ID2D1ImageBrush> imageBrush;
     RefPtr<ID2D1Image> image = GetImageForSurface(pat->mSurface, mat, pat->mExtendMode, !pat->mSamplingRect.IsEmpty() ? &pat->mSamplingRect : nullptr);
+
+    if (!image) {
+      return CreateTransparentBlackBrush();
+    }
+
     mDC->CreateImageBrush(image,
                           D2D1::ImageBrushProperties(samplingBounds,
                                                      D2DExtend(pat->mExtendMode),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D1.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D1.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D1.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D1.h	2014-11-26 21:46:08.000000000 +0000
@@ -122,6 +122,8 @@
 
   virtual TemporaryRef<FilterNode> CreateFilter(FilterType aType);
 
+  virtual bool SupportsRegionClipping() const { return false; }
+
   virtual void *GetNativeSurface(NativeSurfaceType aType) { return nullptr; }
 
   bool Init(const IntSize &aSize, SurfaceFormat aFormat);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -77,8 +77,6 @@
     HRESULT hr = mDT->mDevice->CreateTexture2D(&desc, nullptr, byRef(tmpTexture));
     if (FAILED(hr)) {
       gfxCriticalError() << "[D2D] CreateTexture2D failure " << size << " Code: " << hexa(hr);
-      // Crash debug builds but try to recover in release builds.
-      MOZ_ASSERT(false);
       return;
     }
     mDT->mDevice->CopyResource(tmpTexture, mDT->mTexture);
@@ -94,8 +92,6 @@
 
     if (FAILED(hr)) {
       gfxCriticalError() << "[D2D] CreateSharedBitmap failure " << size << " Code: " << hexa(hr);
-      // Crash debug builds but try to recover in release builds.
-      MOZ_ASSERT(false);
       return;
     }
 
@@ -1386,7 +1382,7 @@
   mFormat = aFormat;
 
   if (!mTexture) {
-    gfxDebug() << "No valid texture for Direct2D draw target initialization.";
+    gfxCriticalError() << "No valid texture for Direct2D draw target initialization.";
     return false;
   }
 
@@ -2375,7 +2371,8 @@
       RefPtr<DrawTargetD2D> dt = new DrawTargetD2D();
       if (!dt->Init(samplingRect.Size(),
                     source->GetFormat())) {
-        MOZ_ASSERT("Invalid sampling rect size!");
+        // FIXME: Uncomment assertion, bug 1068195
+        // MOZ_ASSERT(false, "Invalid sampling rect size!");
         return nullptr;
       }
 
@@ -2420,7 +2417,9 @@
 
         bitmap = CreatePartialBitmapForSurface(dataSurf, mTransform, mSize, pat->mExtendMode, mat, mRT, &sourceRect);
         if (!bitmap) {
-          return nullptr;
+          RefPtr<ID2D1SolidColorBrush> colBrush;
+          mRT->CreateSolidColorBrush(D2D1::ColorF(0, 0), byRef(colBrush));
+          return colBrush.forget();
         }
       }
       break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetD2D.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetD2D.h	2014-11-26 21:46:08.000000000 +0000
@@ -131,6 +131,8 @@
 
   virtual TemporaryRef<FilterNode> CreateFilter(FilterType aType);
 
+  virtual bool SupportsRegionClipping() const { return false; }
+
   virtual void *GetNativeSurface(NativeSurfaceType aType);
 
   bool Init(const IntSize &aSize, SurfaceFormat aFormat);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetSkia.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetSkia.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/DrawTargetSkia.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/DrawTargetSkia.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -843,7 +843,7 @@
                                        alphaType);
   bitmap.setInfo(info, aStride);
   bitmap.setPixels(aData);
-  mCanvas.adopt(new SkCanvas(new SkBitmapDevice(bitmap)));
+  mCanvas.adopt(new SkCanvas(bitmap));
 
   mSize = aSize;
   mFormat = aFormat;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/Factory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/Factory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/Factory.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/Factory.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -156,8 +156,31 @@
 namespace mozilla {
 namespace gfx {
 
-// XXX - Need to define an API to set this.
-GFX2D_API int sGfxLogLevel = LOG_DEBUG;
+// These values we initialize with should match those in
+// PreferenceAccess::RegisterAll method.
+int32_t PreferenceAccess::sGfxLogLevel = LOG_DEFAULT;
+
+PreferenceAccess* PreferenceAccess::sAccess = nullptr;
+PreferenceAccess::~PreferenceAccess()
+{
+}
+
+// Just a placeholder, the derived class will set the variable to default
+// if the preference doesn't exist.
+void PreferenceAccess::LivePref(const char* aName, int32_t* aVar, int32_t aDef)
+{
+  *aVar = aDef;
+}
+
+// This will be called with the derived class, so we will want to register
+// the callbacks with it.
+void PreferenceAccess::SetAccess(PreferenceAccess* aAccess) {
+  sAccess = aAccess;
+  if (sAccess) {
+    RegisterAll();
+  }
+}
+
 
 #ifdef WIN32
 ID3D10Device1 *Factory::mD3D10Device;
@@ -242,6 +265,7 @@
 Factory::CreateDrawTarget(BackendType aBackend, const IntSize &aSize, SurfaceFormat aFormat)
 {
   if (!CheckSurfaceSize(aSize)) {
+    gfxCriticalError() << "Failed to allocate a surface due to invalid size " << aSize;
     return nullptr;
   }
 
@@ -313,7 +337,7 @@
 
   if (!retVal) {
     // Failed
-    gfxDebug() << "Failed to create DrawTarget, Type: " << int(aBackend) << " Size: " << aSize;
+    gfxCriticalError() << "Failed to create DrawTarget, Type: " << int(aBackend) << " Size: " << aSize;
   }
   
   return retVal.forget();
@@ -332,7 +356,9 @@
                                  int32_t aStride, 
                                  SurfaceFormat aFormat)
 {
+  MOZ_ASSERT(aData);
   if (!CheckSurfaceSize(aSize)) {
+    gfxCriticalError() << "Failed to allocate a surface due to invalid size " << aSize;
     return nullptr;
   }
 
@@ -468,6 +494,8 @@
 TemporaryRef<DrawTarget>
 Factory::CreateDualDrawTarget(DrawTarget *targetA, DrawTarget *targetB)
 {
+  MOZ_ASSERT(targetA && targetB);
+
   RefPtr<DrawTarget> newTarget =
     new DrawTargetDual(targetA, targetB);
 
@@ -485,6 +513,8 @@
 TemporaryRef<DrawTarget>
 Factory::CreateDrawTargetForD3D10Texture(ID3D10Texture2D *aTexture, SurfaceFormat aFormat)
 {
+  MOZ_ASSERT(aTexture);
+
   RefPtr<DrawTargetD2D> newTarget;
 
   newTarget = new DrawTargetD2D();
@@ -509,6 +539,7 @@
                                               ID3D10Texture2D *aTextureB,
                                               SurfaceFormat aFormat)
 {
+  MOZ_ASSERT(aTextureA && aTextureB);
   RefPtr<DrawTargetD2D> newTargetA;
   RefPtr<DrawTargetD2D> newTargetB;
 
@@ -562,6 +593,8 @@
 TemporaryRef<DrawTarget>
 Factory::CreateDrawTargetForD3D11Texture(ID3D11Texture2D *aTexture, SurfaceFormat aFormat)
 {
+  MOZ_ASSERT(aTexture);
+
   RefPtr<DrawTargetD2D1> newTarget;
 
   newTarget = new DrawTargetD2D1();
@@ -586,6 +619,11 @@
 {
   mD3D11Device = aDevice;
 
+  if (mD2D1Device) {
+    mD2D1Device->Release();
+    mD2D1Device = nullptr;
+  }
+
   RefPtr<ID2D1Factory1> factory = D2DFactory1();
 
   RefPtr<IDXGIDevice> device;
@@ -633,6 +671,13 @@
 void
 Factory::D2DCleanup()
 {
+#ifdef USE_D2D1_1
+  if (mD2D1Device) {
+    mD2D1Device->Release();
+    mD2D1Device = nullptr;
+  }
+  DrawTargetD2D1::CleanupD2D();
+#endif
   DrawTargetD2D::CleanupD2D();
 }
 
@@ -721,6 +766,7 @@
                                          const IntSize &aSize,
                                          SurfaceFormat aFormat)
 {
+  MOZ_ASSERT(aData);
   if (aSize.width <= 0 || aSize.height <= 0) {
     return nullptr;
   }
@@ -740,7 +786,7 @@
                                  bool aZero)
 {
   if (!CheckSurfaceSize(aSize)) {
-    gfxWarning() << "CreateDataSourceSurface failed with bad size";
+    gfxCriticalError() << "Failed to allocate a surface due to invalid size " << aSize;
     return nullptr;
   }
 
@@ -760,7 +806,7 @@
                                            bool aZero)
 {
   if (aStride < aSize.width * BytesPerPixel(aFormat)) {
-    gfxWarning() << "CreateDataSourceSurfaceWithStride failed with bad stride";
+    gfxCriticalError() << "CreateDataSourceSurfaceWithStride failed with bad stride";
     return nullptr;
   }
 
@@ -769,7 +815,7 @@
     return newSurf.forget();
   }
 
-  gfxWarning() << "CreateDataSourceSurfaceWithStride failed to initialize";
+  gfxCriticalError() << "CreateDataSourceSurfaceWithStride failed to initialize";
   return nullptr;
 }
 
@@ -795,13 +841,14 @@
 
 // static
 void
-CriticalLogger::OutputMessage(const std::string &aString, int aLevel)
+CriticalLogger::OutputMessage(const std::string &aString,
+                              int aLevel, bool aNoNewline)
 {
   if (Factory::GetLogForwarder()) {
     Factory::GetLogForwarder()->Log(aString);
   }
 
-  BasicLogger::OutputMessage(aString, aLevel);
+  BasicLogger::OutputMessage(aString, aLevel, aNoNewline);
 }
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/gfx2d.vcxproj thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/gfx2d.vcxproj
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/gfx2d.vcxproj	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/gfx2d.vcxproj	2014-11-26 21:46:08.000000000 +0000
@@ -62,7 +62,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>USE_SSE2;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_SSE2;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);GFX_LOG_WARNING</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/HelpersD2D.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/HelpersD2D.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/HelpersD2D.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/HelpersD2D.h	2014-11-26 21:46:08.000000000 +0000
@@ -396,7 +396,7 @@
   run->isSideways = FALSE;
 }
 
-static TemporaryRef<ID2D1Geometry>
+static inline TemporaryRef<ID2D1Geometry>
 ConvertRectToGeometry(const D2D1_RECT_F& aRect)
 {
   RefPtr<ID2D1RectangleGeometry> rectGeom;
@@ -404,7 +404,7 @@
   return rectGeom.forget();
 }
 
-static TemporaryRef<ID2D1Geometry>
+static inline TemporaryRef<ID2D1Geometry>
 GetTransformedGeometry(ID2D1Geometry *aGeometry, const D2D1_MATRIX_3X2_F &aTransform)
 {
   RefPtr<ID2D1PathGeometry> tmpGeometry;
@@ -417,7 +417,7 @@
   return tmpGeometry.forget();
 }
 
-static TemporaryRef<ID2D1Geometry>
+static inline TemporaryRef<ID2D1Geometry>
 IntersectGeometry(ID2D1Geometry *aGeometryA, ID2D1Geometry *aGeometryB)
 {
   RefPtr<ID2D1PathGeometry> pathGeom;
@@ -430,7 +430,7 @@
   return pathGeom.forget();
 }
 
-static TemporaryRef<ID2D1StrokeStyle>
+static inline TemporaryRef<ID2D1StrokeStyle>
 CreateStrokeStyleForOptions(const StrokeOptions &aStrokeOptions)
 {
   RefPtr<ID2D1StrokeStyle> style;
@@ -510,7 +510,7 @@
 // This creates a (partially) uploaded bitmap for a DataSourceSurface. It
 // uploads the minimum requirement and possibly downscales. It adjusts the
 // input Matrix to compensate.
-static TemporaryRef<ID2D1Bitmap>
+static inline TemporaryRef<ID2D1Bitmap>
 CreatePartialBitmapForSurface(DataSourceSurface *aSurface, const Matrix &aDestinationTransform,
                               const IntSize &aDestinationSize, ExtendMode aExtendMode,
                               Matrix &aSourceTransform, ID2D1RenderTarget *aRT,
@@ -629,14 +629,18 @@
     scaler.ScaleForSize(scaleSize);
 
     IntSize newSize = scaler.GetSize();
+
+    if (newSize.IsEmpty()) {
+      return nullptr;
+    }
     
     aRT->CreateBitmap(D2D1::SizeU(newSize.width, newSize.height),
                       scaler.GetScaledData(), scaler.GetStride(),
                       D2D1::BitmapProperties(D2DPixelFormat(aSurface->GetFormat())),
                       byRef(bitmap));
 
-    aSourceTransform.PreScale(Float(size.width / newSize.width),
-                              Float(size.height / newSize.height));
+    aSourceTransform.PreScale(Float(size.width) / newSize.width,
+                              Float(size.height) / newSize.height);
     return bitmap.forget();
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/Logging.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/Logging.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/Logging.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/Logging.h	2014-11-26 21:46:08.000000000 +0000
@@ -40,51 +40,136 @@
 namespace mozilla {
 namespace gfx {
 
-const int LOG_DEBUG = 1;
+// Attempting to be consistent with prlog values, but that isn't critical
+// (and note that 5 has a special meaning - see the description
+// with sGfxLogLevel)
+const int LOG_CRITICAL = 1;
 const int LOG_WARNING = 2;
-const int LOG_CRITICAL = 3;
+const int LOG_DEBUG = 3;
+const int LOG_DEBUG_PRLOG = 4;
+const int LOG_EVERYTHING = 5; // This needs to be the highest value
+
+#if defined(DEBUG)
+const int LOG_DEFAULT = LOG_EVERYTHING;
+#else
+const int LOG_DEFAULT = LOG_CRITICAL;
+#endif
 
 #if defined(PR_LOGGING)
 
 inline PRLogModuleLevel PRLogLevelForLevel(int aLevel) {
   switch (aLevel) {
-  case LOG_DEBUG:
-    return PR_LOG_DEBUG;
+  case LOG_CRITICAL:
+    return PR_LOG_ERROR;
   case LOG_WARNING:
     return PR_LOG_WARNING;
+  case LOG_DEBUG:
+    return PR_LOG_DEBUG;
+  case LOG_DEBUG_PRLOG:
+    return PR_LOG_DEBUG;
+  case LOG_EVERYTHING:
+    return PR_LOG_ALWAYS;
   }
   return PR_LOG_DEBUG;
 }
 
 #endif
 
-extern GFX2D_API int sGfxLogLevel;
+class PreferenceAccess
+{
+public:
+  virtual ~PreferenceAccess();
+
+  // This should connect the variable aVar to be updated whenever a preference
+  // aName is modified.  aDefault would be used if the preference is undefined,
+  // so that we always get the valid value for aVar.
+  virtual void LivePref(const char* aName, int32_t* aVar, int32_t aDefault);
+
+public:
+  static void SetAccess(PreferenceAccess* aAccess);
+
+public:
+  // For each preference that needs to be accessed in Moz2D, add a variable
+  // to hold it, as well as the call to LivePref in the RegisterAll() method
+  // below.
+
+  // Used to choose the level of logging we get.  The higher the number,
+  // the more logging we get.  Value of zero will give you no logging,
+  // 1 just errors, 2 adds warnings and 3 adds logging/debug.  4 is used to
+  // selectively enable logging on the configurations that
+  // support prlog (on other systems, 3 and 4 are the same.)  For prlog,
+  // in addition to setting the value to 4, you will need to set an
+  // environment variable NSPR_LOG_MODULES to gfx:4. See prlog.h for details.
+  static int32_t sGfxLogLevel;
+
+private:
+  static void RegisterAll() {
+    // The default values (last parameter) should match the initialization
+    // values in Factory.cpp, otherwise the standalone Moz2D will get different
+    // defaults.
+    sAccess->LivePref("gfx.logging.level", &sGfxLogLevel, LOG_DEFAULT);
+  }
+  static PreferenceAccess* sAccess;
+};
 
 struct BasicLogger
 {
-  static void OutputMessage(const std::string &aString, int aLevel) {
+  // For efficiency, this method exists and copies the logic of the
+  // OutputMessage below.  If making any changes here, also make it
+  // in the appropriate places in that method.
+  static bool ShouldOutputMessage(int aLevel) {
+    if (PreferenceAccess::sGfxLogLevel >= aLevel) {
 #if defined(WIN32) && !defined(PR_LOGGING)
-    if (aLevel >= sGfxLogLevel) {
-      ::OutputDebugStringA(aString.c_str());
-    }
-#elif defined(PR_LOGGING) && !(defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID))
-    if (PR_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) {
-      PR_LogPrint(aString.c_str());
-    }
-#else
-    if (aLevel >= sGfxLogLevel) {
-#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
-      printf_stderr("%s", aString.c_str());
+      return true;
+#elif defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+      return true;
+#elif defined(PR_LOGGING)
+      if (PR_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) {
+        return true;
+      } else if ((PreferenceAccess::sGfxLogLevel >= LOG_DEBUG_PRLOG) ||
+                 (aLevel < LOG_DEBUG)) {
+        return true;
+      }
 #else
-      printf("%s", aString.c_str());
+      return true;
 #endif
     }
+    return false;
+  }
+
+  static void OutputMessage(const std::string &aString,
+                            int aLevel,
+                            bool aNoNewline) {
+    // This behavior (the higher the preference, the more we log)
+    // is consistent with what prlog does in general.  Note that if prlog
+    // is in the build, but disabled, we will printf if the preferences
+    // requires us to log something (see sGfxLogLevel for the special
+    // treatment of LOG_DEBUG and LOG_DEBUG_PRLOG)
+    //
+    // If making any logic changes to this method, you should probably
+    // make the corresponding change in the ShouldOutputMessage method
+    // above.
+    if (PreferenceAccess::sGfxLogLevel >= aLevel) {
+#if defined(WIN32) && !defined(PR_LOGGING)
+      ::OutputDebugStringA((aNoNewline ? aString : aString+"\n").c_str());
+#elif defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+      printf_stderr("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
+#elif defined(PR_LOGGING)
+      if (PR_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) {
+        PR_LogPrint("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
+      } else if ((PreferenceAccess::sGfxLogLevel >= LOG_DEBUG_PRLOG) ||
+                 (aLevel < LOG_DEBUG)) {
+        printf("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
+      }
+#else
+      printf("%s%s", aString.c_str(), aNoNewline ? "" : "\n");
 #endif
+    }
   }
 };
 
 struct CriticalLogger {
-  static void OutputMessage(const std::string &aString, int aLevel);
+  static void OutputMessage(const std::string &aString, int aLevel, bool aNoNewline);
 };
 
 // Implement this interface and init the Factory with an instance to
@@ -106,7 +191,8 @@
 };
 
 MOZ_BEGIN_ENUM_CLASS(LogOptions, int)
-  NoNewline = 0x01
+  NoNewline = 0x01,
+  AutoPrefix = 0x02
 MOZ_END_ENUM_CLASS(LogOptions)
 
 template<typename T>
@@ -121,58 +207,238 @@
 class Log
 {
 public:
-  explicit Log(LogOptions aOptions = LogOptions(0)) : mOptions(aOptions) {}
+  explicit Log(int aOptions = (int)LogOptions::AutoPrefix)
+    : mOptions(aOptions)
+    , mLogIt(BasicLogger::ShouldOutputMessage(L))
+  {
+    if (mLogIt && AutoPrefix()) {
+      mMessage << "[GFX" << L << "]: ";
+    }
+  }
   ~Log() {
     Flush();
   }
 
   void Flush() {
-    if (!(int(mOptions) & int(LogOptions::NoNewline))) {
-      mMessage << '\n';
-    }
+    if (MOZ_LIKELY(!LogIt())) return;
+
     std::string str = mMessage.str();
     if (!str.empty()) {
       WriteLog(str);
     }
-    mMessage.str("");
+    if (AutoPrefix()) {
+      mMessage.str("[GFX");
+      mMessage << L << "]: ";
+    } else {
+      mMessage.str("");
+    }
     mMessage.clear();
   }
 
-  Log &operator <<(char aChar) { mMessage << aChar; return *this; }
-  Log &operator <<(const std::string &aLogText) { mMessage << aLogText; return *this; }
-  Log &operator <<(const char aStr[]) { mMessage << static_cast<const char*>(aStr); return *this; }
-  Log &operator <<(bool aBool) { mMessage << (aBool ? "true" : "false"); return *this; }
-  Log &operator <<(int aInt) { mMessage << aInt; return *this; }
-  Log &operator <<(unsigned int aInt) { mMessage << aInt; return *this; }
-  Log &operator <<(long aLong) { mMessage << aLong; return *this; }
-  Log &operator <<(unsigned long aLong) { mMessage << aLong; return *this; }
-  Log &operator <<(long long aLong) { mMessage << aLong; return *this; }
-  Log &operator <<(unsigned long long aLong) { mMessage << aLong; return *this; }
-  Log &operator <<(Float aFloat) { mMessage << aFloat; return *this; }
-  Log &operator <<(double aDouble) { mMessage << aDouble; return *this; }
+  Log &operator <<(char aChar) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aChar;
+    }
+    return *this;
+  }
+  Log &operator <<(const std::string &aLogText) { 
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aLogText;
+    }
+    return *this;
+  }
+  Log &operator <<(const char aStr[]) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << static_cast<const char*>(aStr);
+    }
+    return *this;
+  }
+  Log &operator <<(bool aBool) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << (aBool ? "true" : "false");
+    }
+    return *this;
+  }
+  Log &operator <<(int aInt) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aInt;
+    }
+    return *this;
+  }
+  Log &operator <<(unsigned int aInt) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aInt;
+    }
+    return *this;
+  }
+  Log &operator <<(long aLong) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aLong;
+    }
+    return *this;
+  }
+  Log &operator <<(unsigned long aLong) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aLong;
+    }
+    return *this;
+  }
+  Log &operator <<(long long aLong) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aLong;
+    }
+    return *this;
+  }
+  Log &operator <<(unsigned long long aLong) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aLong;
+    }
+    return *this;
+  }
+  Log &operator <<(Float aFloat) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aFloat;
+    }
+    return *this;
+  }
+  Log &operator <<(double aDouble) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << aDouble;
+    }
+    return *this;
+  }
   template <typename T, typename Sub, typename Coord>
-  Log &operator <<(const BasePoint<T, Sub, Coord>& aPoint)
-    { mMessage << "Point" << aPoint; return *this; }
+  Log &operator <<(const BasePoint<T, Sub, Coord>& aPoint) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << "Point" << aPoint;
+    }
+    return *this;
+  }
   template <typename T, typename Sub>
-  Log &operator <<(const BaseSize<T, Sub>& aSize)
-    { mMessage << "Size(" << aSize.width << "," << aSize.height << ")"; return *this; }
+  Log &operator <<(const BaseSize<T, Sub>& aSize) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << "Size(" << aSize.width << "," << aSize.height << ")";
+    }
+    return *this;
+  }
   template <typename T, typename Sub, typename Point, typename SizeT, typename Margin>
-  Log &operator <<(const BaseRect<T, Sub, Point, SizeT, Margin>& aRect)
-    { mMessage << "Rect" << aRect; return *this; }
-  Log &operator<<(const Matrix& aMatrix)
-    { mMessage << "Matrix(" << aMatrix._11 << " " << aMatrix._12 << " ; " << aMatrix._21 << " " << aMatrix._22 << " ; " << aMatrix._31 << " " << aMatrix._32 << ")"; return *this; }
+  Log &operator <<(const BaseRect<T, Sub, Point, SizeT, Margin>& aRect) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << "Rect" << aRect;
+    }
+    return *this;
+  }
+  Log &operator<<(const Matrix& aMatrix) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << "Matrix(" << aMatrix._11 << " " << aMatrix._12 << " ; " << aMatrix._21 << " " << aMatrix._22 << " ; " << aMatrix._31 << " " << aMatrix._32 << ")";
+    }
+    return *this;
+  }
   template<typename T>
-  Log &operator<<(Hexa<T> aHex)
-    { mMessage << "0x" << std::hex << aHex.mVal << std::dec; return *this; }
+  Log &operator<<(Hexa<T> aHex) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      mMessage << "0x" << std::hex << aHex.mVal << std::dec;
+    }
+    return *this;
+  }
 
-private:
+  Log& operator<<(SurfaceFormat aFormat) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      switch(aFormat) {
+        case SurfaceFormat::B8G8R8A8:
+          mMessage << "SurfaceFormat::B8G8R8A8";
+          break;
+        case SurfaceFormat::B8G8R8X8:
+          mMessage << "SurfaceFormat::B8G8R8X8";
+          break;
+        case SurfaceFormat::R8G8B8A8:
+          mMessage << "SurfaceFormat::R8G8B8A8";
+          break;
+        case SurfaceFormat::R8G8B8X8:
+          mMessage << "SurfaceFormat::R8G8B8X8";
+          break;
+        case SurfaceFormat::R5G6B5:
+          mMessage << "SurfaceFormat::R5G6B5";
+          break;
+        case SurfaceFormat::A8:
+          mMessage << "SurfaceFormat::A8";
+          break;
+        case SurfaceFormat::YUV:
+          mMessage << "SurfaceFormat::YUV";
+          break;
+        case SurfaceFormat::UNKNOWN:
+          mMessage << "SurfaceFormat::UNKNOWN";
+          break;
+        default:
+          mMessage << "Invalid SurfaceFormat (" << (int)aFormat << ")";
+          break;
+      }
+    }
+    return *this;
+  }
+
+  Log& operator<<(SurfaceType aType) {
+    if (MOZ_UNLIKELY(LogIt())) {
+      switch(aType) {
+        case SurfaceType::DATA:
+          mMessage << "SurfaceType::DATA";
+          break;
+        case SurfaceType::D2D1_BITMAP:
+          mMessage << "SurfaceType::D2D1_BITMAP";
+          break;
+        case SurfaceType::D2D1_DRAWTARGET:
+          mMessage << "SurfaceType::D2D1_DRAWTARGET";
+          break;
+        case SurfaceType::CAIRO:
+          mMessage << "SurfaceType::CAIRO";
+          break;
+        case SurfaceType::CAIRO_IMAGE:
+          mMessage << "SurfaceType::CAIRO_IMAGE";
+          break;
+        case SurfaceType::COREGRAPHICS_IMAGE:
+          mMessage << "SurfaceType::COREGRAPHICS_IMAGE";
+          break;
+        case SurfaceType::COREGRAPHICS_CGCONTEXT:
+          mMessage << "SurfaceType::COREGRAPHICS_CGCONTEXT";
+          break;
+        case SurfaceType::SKIA:
+          mMessage << "SurfaceType::SKIA";
+          break;
+        case SurfaceType::DUAL_DT:
+          mMessage << "SurfaceType::DUAL_DT";
+          break;
+        case SurfaceType::D2D1_1_IMAGE:
+          mMessage << "SurfaceType::D2D1_1_IMAGE";
+          break;
+        case SurfaceType::RECORDING:
+          mMessage << "SurfaceType::RECORDING";
+          break;
+        case SurfaceType::TILED:
+          mMessage << "SurfaceType::TILED";
+          break;
+        default:
+          mMessage << "Invalid SurfaceType (" << (int)aType << ")";
+          break;
+      }
+    }
+    return *this;
+  }
 
+  inline bool LogIt() const { return mLogIt; }
+  inline bool NoNewline() const { return mOptions & int(LogOptions::NoNewline); }
+  inline bool AutoPrefix() const { return mOptions & int(LogOptions::AutoPrefix); }
+
+
+private:
   void WriteLog(const std::string &aString) {
-    Logger::OutputMessage(aString, L);
+    if (MOZ_UNLIKELY(LogIt())) {
+      Logger::OutputMessage(aString, L, NoNewline());
+    }
   }
 
   std::stringstream mMessage;
-  LogOptions mOptions;
+  int mOptions;
+  bool mLogIt;
 };
 
 typedef Log<LOG_DEBUG> DebugLog;
@@ -180,18 +446,18 @@
 typedef Log<LOG_CRITICAL, CriticalLogger> CriticalLog;
 
 #ifdef GFX_LOG_DEBUG
-#define gfxDebug DebugLog
+#define gfxDebug mozilla::gfx::DebugLog
 #else
-#define gfxDebug if (1) ; else NoLog
+#define gfxDebug if (1) ; else mozilla::gfx::NoLog
 #endif
 #ifdef GFX_LOG_WARNING
-#define gfxWarning WarningLog
+#define gfxWarning mozilla::gfx::WarningLog
 #else
-#define gfxWarning if (1) ; else NoLog
+#define gfxWarning if (1) ; else mozilla::gfx::NoLog
 #endif
 
 // This log goes into crash reports, use with care.
-#define gfxCriticalError CriticalLog
+#define gfxCriticalError mozilla::gfx::CriticalLog
 
 // See nsDebug.h and the NS_WARN_IF macro
 
@@ -218,7 +484,7 @@
 {
 public:
   explicit TreeLog(const std::string& aPrefix = "")
-        : mLog(LogOptions::NoNewline),
+        : mLog(int(LogOptions::NoNewline)),
           mPrefix(aPrefix),
           mDepth(0),
           mStartOfLine(true),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/Matrix.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/Matrix.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/Matrix.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/Matrix.h	2014-11-26 21:46:08.000000000 +0000
@@ -377,6 +377,11 @@
     , _41(a41), _42(a42), _43(a43), _44(a44)
   {}
 
+  Matrix4x4(const Matrix4x4& aOther)
+  {
+    memcpy(this, &aOther, sizeof(*this));
+  }
+
   Float _11, _12, _13, _14;
   Float _21, _22, _23, _24;
   Float _31, _32, _33, _34;
@@ -541,6 +546,11 @@
                        aX,   aY,   aZ, 1.0f);
   }
 
+  static Matrix4x4 Translation(const Point3D& aP)
+  {
+    return Translation(aP.x, aP.y, aP.z);
+  }
+
   /**
    * Apply a translation to this matrix.
    *
@@ -570,6 +580,10 @@
     return *this;
   }
 
+  Matrix4x4 &PreTranslate(const Point3D& aPoint) {
+    return PreTranslate(aPoint.x, aPoint.y, aPoint.z);
+  }
+
   /**
    * Similar to PreTranslate, but the translation is applied -after- this
    * matrix's existing transformation instead of before it.
@@ -600,6 +614,10 @@
     return *this;
   }
 
+  Matrix4x4 &PostTranslate(const Point3D& aPoint) {
+    return PostTranslate(aPoint.x, aPoint.y, aPoint.z);
+  }
+
   static Matrix4x4 Scaling(Float aScaleX, Float aScaleY, float aScaleZ)
   {
     return Matrix4x4(aScaleX, 0.0f, 0.0f, 0.0f,
@@ -672,6 +690,19 @@
 
     return *this;
   }
+
+  Matrix4x4& Transpose() {
+    std::swap(_12, _21);
+    std::swap(_13, _31);
+    std::swap(_14, _41);
+
+    std::swap(_23, _32);
+    std::swap(_24, _42);
+
+    std::swap(_34, _43);
+
+    return *this;
+  }
 
   bool operator==(const Matrix4x4& o) const
   {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/moz.build	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/moz.build	2014-11-26 21:46:08.000000000 +0000
@@ -89,17 +89,21 @@
     if CONFIG['_MSC_VER'] != '1400':
         SOURCES += [
             'BlurSSE2.cpp',
-            'convolverSSE2.cpp',
             'FilterProcessingSSE2.cpp',
             'ImageScalingSSE2.cpp',
         ]
+        if CONFIG['MOZ_ENABLE_SKIA']:
+            SOURCES += [
+                'convolverSSE2.cpp',
+            ]
         DEFINES['USE_SSE2'] = True
         # The file uses SSE2 intrinsics, so it needs special compile flags on some
         # compilers.
         SOURCES['BlurSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
         SOURCES['FilterProcessingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
         SOURCES['ImageScalingSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-        SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+        if CONFIG['MOZ_ENABLE_SKIA']:
+            SOURCES['convolverSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 
 UNIFIED_SOURCES += [
     'Blur.cpp',
@@ -157,6 +161,13 @@
     DEFINES['GFX_LOG_DEBUG'] = True
     DEFINES['GFX_LOG_WARNING'] = True
 
+# Define the GFX_LOG_WARNING in release builds (available, but controlled by a
+# preference), though we may want to consider only doing it in the nightly
+# build, if the size of gfxWarning() code ends up making a difference.
+# See bug 1074952.
+# if CONFIG['NIGHTLY_BUILD']:
+DEFINES['GFX_LOG_WARNING'] = True
+
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/RadialGradientEffectD2D1.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/RadialGradientEffectD2D1.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/RadialGradientEffectD2D1.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/RadialGradientEffectD2D1.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -284,6 +284,12 @@
   return hr;
 }
 
+void
+RadialGradientEffectD2D1::Unregister(ID2D1Factory1 *aFactory)
+{
+  aFactory->UnregisterEffect(CLSID_RadialGradientEffect);
+}
+
 HRESULT __stdcall
 RadialGradientEffectD2D1::CreateEffect(IUnknown **aEffectImpl)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/RadialGradientEffectD2D1.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/RadialGradientEffectD2D1.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/2d/RadialGradientEffectD2D1.h	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/2d/RadialGradientEffectD2D1.h	2014-11-26 21:46:08.000000000 +0000
@@ -72,6 +72,7 @@
   IFACEMETHODIMP SetDrawInfo(ID2D1DrawInfo *pDrawInfo);
 
   static HRESULT Register(ID2D1Factory1* aFactory);
+  static void Unregister(ID2D1Factory1* aFactory);
   static HRESULT __stdcall CreateEffect(IUnknown** aEffectImpl);
 
   HRESULT SetStopCollection(IUnknown *aStopCollection);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/doc/AsyncPanZoom.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/doc/AsyncPanZoom.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/doc/AsyncPanZoom.md	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/doc/AsyncPanZoom.md	2014-11-26 21:46:09.000000000 +0000
@@ -189,18 +189,19 @@
 </li>
 <li value="3">
 Using the first event in the input block, the APZCTreeManager does a hit-test to see which APZC it hits.
+This hit-test uses the event regions populated on the layers, which may be larger than the true hit area of the layer.
 If no APZC is hit, the events are discarded and we jump to step 6.
-Otherwise, the input block is tagged with the APZC and put into a global APZ input queue.
+Otherwise, the input block is tagged with the hit APZC as a tentative target and put into a global APZ input queue.
 </li>
 <li value="4">
  <ol>
   <li value="i">
-   If the input events are not touch events, or if the APZC is for content without touch listeners, any available events in the input block are processed.
+   If the input events landed outside the dispatch-to-content event region for the layer, any available events in the input block are processed.
    These may trigger behaviours like scrolling or tap gestures.
   </li>
   <li value="ii">
-   If the input events are touch events and the APZC is for content with touch listeners, the events are left in the queue and a 300ms timeout is initiated.
-   If the timeout expires before step 9 is completed, the APZ assumes the input block was not cancelled and processes them as part of step 10.
+   If the input events landed inside the dispatch-to-content event region for the layer, the events are left in the queue and a 300ms timeout is initiated.
+   If the timeout expires before step 9 is completed, the APZ assumes the input block was not cancelled and the tentative target is correct, and processes them as part of step 10.
   </li>
  </ol>
 </li>
@@ -214,26 +215,31 @@
 <li value="7">
 Gecko performs its own usual hit-testing and event dispatching for the event.
 As part of this, it records whether any touch listeners cancelled the input block by calling preventDefault().
+It also activates inactive scrollframes that were hit by the input events.
 </li>
 <li value="8">
-The call stack unwinds back to the widget code, which sends a notification to the APZ code by calling APZCTreeManager::ContentReceivedTouch on the input thread.
-This happens only once per input block.
+The call stack unwinds back to the widget code, which sends two notifications to the APZ code on the input thread.
+The first notification is via APZCTreeManager::ContentReceivedTouch, and informs the APZ whether the input block was cancelled.
+The second notification is via APZCTreeManager::SetTargetAPZC, and informs the APZ the results of the Gecko hit-test during event dispatch.
+Note that Gecko may report that the input event did not hit any scrollable frame at all.
+These notifications happen only once per input block.
 </li>
 <li value="9">
  <ol>
   <li value="i">
-   If the events were processed as part of step 4(i), the call to ContentReceivedTouch is ignored and step 10 is skipped.
+   If the events were processed as part of step 4(i), the notifications from step 8 are ignored and step 10 is skipped.
   </li>
   <li value="ii">
-   If events were queued as part of step 4(ii), and steps 5-8 take less than 300ms, the ContentReceivedTouch call marks the input block ready for processing.
+   If events were queued as part of step 4(ii), and steps 5-8 take less than 300ms, the arrival of both notifications from step 8 will mark the input block ready for processing.
   </li>
   <li value="iii">
-   If events were queued as part of step 4(ii), but steps 5-8 take longer than 300ms, the ContentReceivedTouch will be ignored and step 10 will already have happened.
+   If events were queued as part of step 4(ii), but steps 5-8 take longer than 300ms, the notifications from step 8 will be ignored and step 10 will already have happened.
   </li>
  </ol>
 </li>
 <li value="10">
-If events were queued as part of step 4(ii) they are now either processed (if the input block was not cancelled, or if the timeout expired) or dropped (if it was cancelled).
+If events were queued as part of step 4(ii) they are now either processed (if the input block was not cancelled and Gecko detected a scrollframe under the input event, or if the timeout expired) or dropped (all other cases).
+Note that the APZC that processes the events may be different at this step than the tentative target from step 3, depending on the SetTargetAPZC notification.
 Processing the events may trigger behaviours like scrolling or tap gestures.
 </li>
 </ol>
@@ -245,7 +251,10 @@
 </li>
 <li>
  In step 6, the widget code determines the content element at the point under the input element, and notifies the APZ code of the allowed touch-action behaviours.
- This is done via a call to APZCTreeManager::SetAllowedTouchBehavior on the input thread.
+ This notification is sent via a call to APZCTreeManager::SetAllowedTouchBehavior on the input thread.
+</li>
+<li>
+ In step 9(ii), the input block will only be marked ready for processing once all three notifications arrive.
 </li>
 </ul>
 
@@ -269,14 +278,18 @@
 Active scrollframes are the ones that do have their contents put on a separate layer (or set of layers), and inactive ones do not.
 
 Consider a page with a scrollframe that is initially inactive.
-When layout generates the layers for this page, it inserts a "scrollinfo" layer into the layer tree to let the APZ know that there is potentially scrollable content there.
-The scrollinfo layer is an empty ContainerLayer, which does not require much extra memory.
-The composition bounds of this scrollinfo layer are used on the compositor for hit-testing, and a "placeholder" APZC is created for this scrollframe.
-When the user starts interacting with that content, the hit-test in the APZ code finds the placeholder APZC and starts routing it the events as usual.
-The APZC eventually sends a repaint request to the main thread, and that repaint request sets a displayport on the scrollframe.
-Setting the displayport activates the scrollframe and causes it to get pushed onto a separate layer (or set of layers).
-
-This model imples that when the user initially attempts to scroll an inactive scrollframe, it will not initially scroll visually.
-(This is because although the APZC is tracking the events and updating scroll position, there is no layer to which it can apply the async scroll offset.)
-Only after the round-trip to the gecko thread is complete is there a layer for async scrolling to actually occur.
-At that point the scrollframe will visually "jump" to the correct scroll offset.
+When layout generates the layers for this page, the content of the scrollframe will be flattened into some other PaintedLayer (call it P).
+The layout code also adds the area (or bounding region in case of weird shapes) of the scrollframe to the dispatch-to-content region of P.
+
+When the user starts interacting with that content, the hit-test in the APZ code finds the dispatch-to-content region of P.
+The input block therefore has a tentative target of P when it goes into step 4(ii) in the flow above.
+When gecko processes the input event, it must detect the inactive scrollframe and activate it, as part of step 7.
+Finally, the widget code sends the SetTargetAPZC notification in step 8 to notify the APZ that the input block should really apply to this new layer.
+The issue here is that the layer transaction containing the new layer must reach the compositor and APZ before the SetTargetAPZC notification.
+If this does not occur within the 300ms timeout, the APZ code will be unable to update the tentative target, and will continue to use P for that input block.
+Input blocks that start after the layer transaction will get correctly routed to the new layer as there will now be a layer and APZC instance for the active scrollframe.
+
+This model implies that when the user initially attempts to scroll an inactive scrollframe, it may end up scrolling an ancestor scrollframe.
+(This is because in the absence of the SetTargetAPZC notification, the input events will get applied to the closest ancestor scrollframe's APZC.)
+Only after the round-trip to the gecko thread is complete is there a layer for async scrolling to actually occur on the scrollframe itself.
+At that point the scrollframe will start receiving new input blocks and will scroll normally.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/AndroidSurfaceTexture.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/AndroidSurfaceTexture.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/AndroidSurfaceTexture.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/AndroidSurfaceTexture.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -15,10 +15,12 @@
 #include "nsThreadUtils.h"
 #include "mozilla/gfx/Matrix.h"
 #include "GeneratedJNIWrappers.h"
+#include "SurfaceTexture.h"
 #include "GLContext.h"
 
 using namespace mozilla;
 using namespace mozilla::widget::android;
+using namespace mozilla::widget::android::sdk;
 
 namespace mozilla {
 namespace gl {
@@ -39,192 +41,26 @@
   return AndroidBridge::Bridge()->GetAPIVersion() >= 14; /* ICS */
 }
 
-static class JNIFunctions {
-public:
-
-  JNIFunctions() : mInitialized(false)
-  {
-  }
-
-  bool EnsureInitialized()
-  {
-    if (mInitialized) {
-      return true;
-    }
-
-    if (!IsSTSupported()) {
-      return false;
-    }
-
-    JNIEnv* env = GetJNIForThread();
-
-    AutoLocalJNIFrame jniFrame(env);
-
-    jSurfaceTextureClass = (jclass)env->NewGlobalRef(env->FindClass("android/graphics/SurfaceTexture"));
-    jSurfaceTexture_Ctor = env->GetMethodID(jSurfaceTextureClass, "<init>", "(I)V");
-    jSurfaceTexture_updateTexImage = env->GetMethodID(jSurfaceTextureClass, "updateTexImage", "()V");
-    jSurfaceTexture_getTransformMatrix = env->GetMethodID(jSurfaceTextureClass, "getTransformMatrix", "([F)V");
-    jSurfaceTexture_setDefaultBufferSize = env->GetMethodID(jSurfaceTextureClass, "setDefaultBufferSize", "(II)V");
-
-    if (IsDetachSupported()) {
-      jSurfaceTexture_attachToGLContext = env->GetMethodID(jSurfaceTextureClass, "attachToGLContext", "(I)V");
-      jSurfaceTexture_detachFromGLContext = env->GetMethodID(jSurfaceTextureClass, "detachFromGLContext", "()V");
-    } else {
-      jSurfaceTexture_attachToGLContext = jSurfaceTexture_detachFromGLContext = 0;
-    }
-
-    jSurfaceClass = (jclass)env->NewGlobalRef(env->FindClass("android/view/Surface"));
-    jSurface_Ctor = env->GetMethodID(jSurfaceClass, "<init>", "(Landroid/graphics/SurfaceTexture;)V");
-
-    mInitialized = true;
-    return true;
-  }
-
-  jobject CreateSurfaceTexture(GLuint aTexture)
-  {
-    if (!EnsureInitialized())
-      return nullptr;
-
-    JNIEnv* env = GetJNIForThread();
-
-    AutoLocalJNIFrame jniFrame(env);
-
-    return env->NewGlobalRef(env->NewObject(jSurfaceTextureClass, jSurfaceTexture_Ctor, (int) aTexture));
-  }
-
-  jobject CreateSurface(jobject aSurfaceTexture)
-  {
-    if (!EnsureInitialized())
-      return nullptr;
-
-    JNIEnv* env = GetJNIForThread();
-    AutoLocalJNIFrame jniFrame(env);
-    return env->NewGlobalRef(env->NewObject(jSurfaceClass, jSurface_Ctor, aSurfaceTexture));
-  }
-
-  void ReleaseSurfaceTexture(jobject aSurfaceTexture)
-  {
-    JNIEnv* env = GetJNIForThread();
-
-    env->DeleteGlobalRef(aSurfaceTexture);
-  }
-
-  void UpdateTexImage(jobject aSurfaceTexture)
-  {
-    JNIEnv* env = GetJNIForThread();
-
-    AutoLocalJNIFrame jniFrame(env);
-    env->CallVoidMethod(aSurfaceTexture, jSurfaceTexture_updateTexImage);
-  }
-
-  bool GetTransformMatrix(jobject aSurfaceTexture, gfx::Matrix4x4& aMatrix)
-  {
-    JNIEnv* env = GetJNIForThread();
-
-    AutoLocalJNIFrame jniFrame(env);
-
-    jfloatArray jarray = env->NewFloatArray(16);
-    env->CallVoidMethod(aSurfaceTexture, jSurfaceTexture_getTransformMatrix, jarray);
-
-    jfloat* array = env->GetFloatArrayElements(jarray, nullptr);
-
-    aMatrix._11 = array[0];
-    aMatrix._12 = array[1];
-    aMatrix._13 = array[2];
-    aMatrix._14 = array[3];
-
-    aMatrix._21 = array[4];
-    aMatrix._22 = array[5];
-    aMatrix._23 = array[6];
-    aMatrix._24 = array[7];
-
-    aMatrix._31 = array[8];
-    aMatrix._32 = array[9];
-    aMatrix._33 = array[10];
-    aMatrix._34 = array[11];
-
-    aMatrix._41 = array[12];
-    aMatrix._42 = array[13];
-    aMatrix._43 = array[14];
-    aMatrix._44 = array[15];
-
-    env->ReleaseFloatArrayElements(jarray, array, 0);
-
-    return false;
-  }
-
-  void SetDefaultBufferSize(jobject aSurfaceTexture, int32_t width, int32_t height)
-  {
-    JNIEnv* env = GetJNIForThread();
-
-    AutoLocalJNIFrame jniFrame(env);
-    env->CallVoidMethod(aSurfaceTexture, jSurfaceTexture_setDefaultBufferSize, width, height);
-  }
-
-  void AttachToGLContext(jobject aSurfaceTexture, int32_t texName)
-  {
-    MOZ_ASSERT(jSurfaceTexture_attachToGLContext);
-
-    JNIEnv* env = GetJNIForThread();
-
-    env->CallVoidMethod(aSurfaceTexture, jSurfaceTexture_attachToGLContext, texName);
-    if (env->ExceptionCheck()) {
-      env->ExceptionDescribe();
-      env->ExceptionClear();
-    }
-  }
-
-  void DetachFromGLContext(jobject aSurfaceTexture)
-  {
-    MOZ_ASSERT(jSurfaceTexture_detachFromGLContext);
-
-    JNIEnv* env = GetJNIForThread();
-
-    env->CallVoidMethod(aSurfaceTexture, jSurfaceTexture_detachFromGLContext);
-    if (env->ExceptionCheck()) {
-      env->ExceptionDescribe();
-      env->ExceptionClear();
-    }
-  }
-
-private:
-  bool mInitialized;
-
-  jclass jSurfaceTextureClass;
-  jmethodID jSurfaceTexture_Ctor;
-  jmethodID jSurfaceTexture_updateTexImage;
-  jmethodID jSurfaceTexture_getTransformMatrix;
-  jmethodID jSurfaceTexture_setDefaultBufferSize;
-
-  jmethodID jSurfaceTexture_attachToGLContext;
-  jmethodID jSurfaceTexture_detachFromGLContext;
-
-  jclass jSurfaceClass;
-  jmethodID jSurface_Ctor;
-
-} sJNIFunctions;
-
-AndroidSurfaceTexture*
+TemporaryRef<AndroidSurfaceTexture>
 AndroidSurfaceTexture::Create()
 {
   return Create(nullptr, 0);
 }
 
-AndroidSurfaceTexture*
+TemporaryRef<AndroidSurfaceTexture>
 AndroidSurfaceTexture::Create(GLContext* aContext, GLuint aTexture)
 {
   if (!IsSTSupported()) {
     return nullptr;
   }
 
-  AndroidSurfaceTexture* st = new AndroidSurfaceTexture();
+  RefPtr<AndroidSurfaceTexture> st = new AndroidSurfaceTexture();
   if (!st->Init(aContext, aTexture)) {
     printf_stderr("Failed to initialize AndroidSurfaceTexture");
-    delete st;
     st = nullptr;
   }
 
-  return st;
+  return st.forget();
 }
 
 AndroidSurfaceTexture*
@@ -239,30 +75,25 @@
   return it->second;
 }
 
-bool
-AndroidSurfaceTexture::Check()
-{
-  return sJNIFunctions.EnsureInitialized();
-}
 
-bool
+nsresult
 AndroidSurfaceTexture::Attach(GLContext* aContext, PRIntervalTime aTimeout)
 {
   MonitorAutoLock lock(mMonitor);
 
   if (mAttachedContext == aContext) {
     NS_WARNING("Tried to attach same GLContext to AndroidSurfaceTexture");
-    return true;
+    return NS_OK;
   }
 
   if (!IsDetachSupported()) {
-    return false;
+    return NS_ERROR_NOT_AVAILABLE;
   }
 
   while (mAttachedContext) {
     // Wait until it's detached (or we time out)
     if (NS_FAILED(lock.Wait(aTimeout))) {
-      return false;
+      return NS_ERROR_NOT_AVAILABLE;
     }
   }
 
@@ -272,29 +103,29 @@
   mAttachedContext->MakeCurrent();
   aContext->fGenTextures(1, &mTexture);
 
-  sJNIFunctions.AttachToGLContext(mSurfaceTexture, mTexture);
-  return true;
+  nsresult res;
+  mSurfaceTexture->AttachToGLContext(mTexture, &res);
+  return res;
 }
 
-bool
+nsresult
 AndroidSurfaceTexture::Detach()
 {
   MonitorAutoLock lock(mMonitor);
 
   if (!IsDetachSupported() ||
       !mAttachedContext || !mAttachedContext->IsOwningThreadCurrent()) {
-    return false;
+    return NS_ERROR_FAILURE;
   }
 
   mAttachedContext->MakeCurrent();
 
-  // This call takes care of deleting the texture
-  sJNIFunctions.DetachFromGLContext(mSurfaceTexture);
+  mSurfaceTexture->DetachFromGLContext();
 
   mTexture = 0;
   mAttachedContext = nullptr;
   lock.NotifyAll();
-  return true;
+  return NS_OK;
 }
 
 bool
@@ -305,28 +136,26 @@
     return false;
   }
 
-  if (!sJNIFunctions.EnsureInitialized())
-    return false;
-
-  JNIEnv* env = GetJNIForThread();
-
-  mSurfaceTexture = sJNIFunctions.CreateSurfaceTexture(aTexture);
-  if (!mSurfaceTexture) {
+  nsresult res;
+  mSurfaceTexture = new SurfaceTexture(aTexture, &res);
+  if (NS_FAILED(res)) {
     return false;
   }
 
   if (!aTexture) {
-    sJNIFunctions.DetachFromGLContext(mSurfaceTexture);
+    mSurfaceTexture->DetachFromGLContext();
   }
 
   mAttachedContext = aContext;
 
-  mSurface = sJNIFunctions.CreateSurface(mSurfaceTexture);
-  if (!mSurface) {
+  mSurface = new Surface(mSurfaceTexture->wrappedObject(), &res);
+  if (NS_FAILED(res)) {
     return false;
   }
 
-  mNativeWindow = AndroidNativeWindow::CreateFromSurface(env, mSurface);
+  mNativeWindow = AndroidNativeWindow::CreateFromSurface(GetJNIForThread(),
+                                                         mSurface->wrappedObject());
+  MOZ_ASSERT(mNativeWindow, "Failed to create native window from surface");
 
   mID = ++sNextID;
   sInstances.insert(std::pair<int, AndroidSurfaceTexture*>(mID, this));
@@ -349,40 +178,60 @@
 
   mFrameAvailableCallback = nullptr;
 
-  JNIEnv* env = GetJNIForThread();
-
   if (mSurfaceTexture) {
-    GeckoAppShell::UnregisterSurfaceTextureFrameListener(mSurfaceTexture);
-
-    env->DeleteGlobalRef(mSurfaceTexture);
+    GeckoAppShell::UnregisterSurfaceTextureFrameListener(mSurfaceTexture->wrappedObject());
     mSurfaceTexture = nullptr;
   }
-
-  if (mSurface) {
-    env->DeleteGlobalRef(mSurface);
-    mSurface = nullptr;
-  }
 }
 
 void
 AndroidSurfaceTexture::UpdateTexImage()
 {
-  sJNIFunctions.UpdateTexImage(mSurfaceTexture);
+  mSurfaceTexture->UpdateTexImage();
 }
 
-bool
+void
 AndroidSurfaceTexture::GetTransformMatrix(gfx::Matrix4x4& aMatrix)
 {
-  return sJNIFunctions.GetTransformMatrix(mSurfaceTexture, aMatrix);
+  JNIEnv* env = GetJNIForThread();
+
+  AutoLocalJNIFrame jniFrame(env);
+
+  jfloatArray jarray = env->NewFloatArray(16);
+  mSurfaceTexture->GetTransformMatrix(jarray);
+
+  jfloat* array = env->GetFloatArrayElements(jarray, nullptr);
+
+  aMatrix._11 = array[0];
+  aMatrix._12 = array[1];
+  aMatrix._13 = array[2];
+  aMatrix._14 = array[3];
+
+  aMatrix._21 = array[4];
+  aMatrix._22 = array[5];
+  aMatrix._23 = array[6];
+  aMatrix._24 = array[7];
+
+  aMatrix._31 = array[8];
+  aMatrix._32 = array[9];
+  aMatrix._33 = array[10];
+  aMatrix._34 = array[11];
+
+  aMatrix._41 = array[12];
+  aMatrix._42 = array[13];
+  aMatrix._43 = array[14];
+  aMatrix._44 = array[15];
+
+  env->ReleaseFloatArrayElements(jarray, array, 0);
 }
 
 void
 AndroidSurfaceTexture::SetFrameAvailableCallback(nsIRunnable* aRunnable)
 {
   if (aRunnable) {
-    GeckoAppShell::RegisterSurfaceTextureFrameListener(mSurfaceTexture, mID);
+    GeckoAppShell::RegisterSurfaceTextureFrameListener(mSurfaceTexture->wrappedObject(), mID);
   } else {
-     GeckoAppShell::UnregisterSurfaceTextureFrameListener(mSurfaceTexture);
+     GeckoAppShell::UnregisterSurfaceTextureFrameListener(mSurfaceTexture->wrappedObject());
   }
 
   mFrameAvailableCallback = aRunnable;
@@ -391,7 +240,7 @@
 void
 AndroidSurfaceTexture::SetDefaultSize(mozilla::gfx::IntSize size)
 {
-  sJNIFunctions.SetDefaultBufferSize(mSurfaceTexture, size.width, size.height);
+  mSurfaceTexture->SetDefaultBufferSize(size.width, size.height);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/AndroidSurfaceTexture.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/AndroidSurfaceTexture.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/AndroidSurfaceTexture.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/AndroidSurfaceTexture.h	2014-11-26 21:46:09.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Monitor.h"
 
+#include "SurfaceTexture.h"
 #include "AndroidNativeWindow.h"
 
 class gfxASurface;
@@ -42,30 +43,26 @@
 
   // The SurfaceTexture is created in an attached state. This method requires
   // Android Ice Cream Sandwich.
-  static AndroidSurfaceTexture* Create(GLContext* aGLContext, GLuint aTexture);
+  static TemporaryRef<AndroidSurfaceTexture> Create(GLContext* aGLContext, GLuint aTexture);
 
   // Here the SurfaceTexture will be created in a detached state. You must call
   // Attach() with the GLContext you wish to composite with. It must be done
   // on the thread where that GLContext is current. This method requires
   // Android Jelly Bean.
-  static AndroidSurfaceTexture* Create();
+  static TemporaryRef<AndroidSurfaceTexture> Create();
 
   static AndroidSurfaceTexture* Find(int id);
 
-  // Returns with reasonable certainty whether or not we'll
-  // be able to create and use a SurfaceTexture
-  static bool Check();
-
   // If we are on Jelly Bean, the SurfaceTexture can be detached and reattached
   // to allow consumption from different GLContexts. It is recommended to only
   // attach while you are consuming in order to allow this.
   //
   // Only one GLContext may be attached at any given time. If another is already
   // attached, we try to wait for it to become detached.
-  bool Attach(GLContext* aContext, PRIntervalTime aTiemout = PR_INTERVAL_NO_TIMEOUT);
+  nsresult Attach(GLContext* aContext, PRIntervalTime aTiemout = PR_INTERVAL_NO_TIMEOUT);
 
   // This is a noop on ICS, and will always fail
-  bool Detach();
+  nsresult Detach();
 
   GLContext* GetAttachedContext() { return mAttachedContext; }
 
@@ -76,7 +73,7 @@
   // This attaches the updated data to the TEXTURE_EXTERNAL target
   void UpdateTexImage();
 
-  bool GetTransformMatrix(mozilla::gfx::Matrix4x4& aMatrix);
+  void GetTransformMatrix(mozilla::gfx::Matrix4x4& aMatrix);
   int ID() { return mID; }
 
   void SetDefaultSize(mozilla::gfx::IntSize size);
@@ -90,7 +87,7 @@
   void NotifyFrameAvailable();
 
   GLuint Texture() { return mTexture; }
-  jobject JavaSurface() { return mSurface; }
+  jobject JavaSurface() { return mSurface->wrappedObject(); }
 private:
   AndroidSurfaceTexture();
   ~AndroidSurfaceTexture();
@@ -98,8 +95,8 @@
   bool Init(GLContext* aContext, GLuint aTexture);
 
   GLuint mTexture;
-  jobject mSurfaceTexture;
-  jobject mSurface;
+  nsAutoPtr<mozilla::widget::android::sdk::SurfaceTexture> mSurfaceTexture;
+  nsAutoPtr<mozilla::widget::android::sdk::Surface> mSurface;
 
   Monitor mMonitor;
   GLContext* mAttachedContext;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLBlitHelper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLBlitHelper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLBlitHelper.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLBlitHelper.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -728,7 +728,7 @@
     ScopedBindTextureUnit boundTU(mGL, LOCAL_GL_TEXTURE0);
     mGL->fClear(LOCAL_GL_COLOR_BUFFER_BIT);
 
-    if (!surfaceTexture->Attach(mGL)) {
+    if (NS_FAILED(surfaceTexture->Attach(mGL))) {
         return false;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLBlitTextureImageHelper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLBlitTextureImageHelper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLBlitTextureImageHelper.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLBlitTextureImageHelper.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=8 sts=4 et sw=4 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 "GLBlitTextureImageHelper.h"
-#include "GLUploadHelpers.h"
-#include "DecomposeIntoNoRepeatTriangles.h"
-#include "GLContext.h"
-#include "ScopedGLHelpers.h"
-#include "nsRect.h"
-#include "gfx2DGlue.h"
-#include "gfxUtils.h"
-
-namespace mozilla {
-namespace gl {
-
-GLBlitTextureImageHelper::GLBlitTextureImageHelper(GLContext* gl)
-    : mGL(gl)
-    , mBlitProgram(0)
-    , mBlitFramebuffer(0)
-
-{
-}
-
-GLBlitTextureImageHelper::~GLBlitTextureImageHelper()
-{
-    // Likely used by OGL Layers.
-    mGL->fDeleteProgram(mBlitProgram);
-    mGL->fDeleteFramebuffers(1, &mBlitFramebuffer);
-}
-
-void
-GLBlitTextureImageHelper::BlitTextureImage(TextureImage *aSrc, const nsIntRect& aSrcRect,
-                                           TextureImage *aDst, const nsIntRect& aDstRect)
-{
-    NS_ASSERTION(!aSrc->InUpdate(), "Source texture is in update!");
-    NS_ASSERTION(!aDst->InUpdate(), "Destination texture is in update!");
-
-    if (!aSrc || !aDst || aSrcRect.IsEmpty() || aDstRect.IsEmpty())
-        return;
-
-    int savedFb = 0;
-    mGL->fGetIntegerv(LOCAL_GL_FRAMEBUFFER_BINDING, &savedFb);
-
-    ScopedGLState scopedScissorTestState(mGL, LOCAL_GL_SCISSOR_TEST, false);
-    ScopedGLState scopedBlendState(mGL, LOCAL_GL_BLEND, false);
-
-    // 2.0 means scale up by two
-    float blitScaleX = float(aDstRect.width) / float(aSrcRect.width);
-    float blitScaleY = float(aDstRect.height) / float(aSrcRect.height);
-
-    // We start iterating over all destination tiles
-    aDst->BeginBigImageIteration();
-    do {
-        // calculate portion of the tile that is going to be painted to
-        nsIntRect dstSubRect;
-        nsIntRect dstTextureRect = ThebesIntRect(aDst->GetTileRect());
-        dstSubRect.IntersectRect(aDstRect, dstTextureRect);
-
-        // this tile is not part of the destination rectangle aDstRect
-        if (dstSubRect.IsEmpty())
-            continue;
-
-        // (*) transform the rect of this tile into the rectangle defined by aSrcRect...
-        nsIntRect dstInSrcRect(dstSubRect);
-        dstInSrcRect.MoveBy(-aDstRect.TopLeft());
-        // ...which might be of different size, hence scale accordingly
-        dstInSrcRect.ScaleRoundOut(1.0f / blitScaleX, 1.0f / blitScaleY);
-        dstInSrcRect.MoveBy(aSrcRect.TopLeft());
-
-        SetBlitFramebufferForDestTexture(aDst->GetTextureID());
-        UseBlitProgram();
-
-        aSrc->BeginBigImageIteration();
-        // now iterate over all tiles in the source Image...
-        do {
-            // calculate portion of the source tile that is in the source rect
-            nsIntRect srcSubRect;
-            nsIntRect srcTextureRect = ThebesIntRect(aSrc->GetTileRect());
-            srcSubRect.IntersectRect(aSrcRect, srcTextureRect);
-
-            // this tile is not part of the source rect
-            if (srcSubRect.IsEmpty()) {
-                continue;
-            }
-            // calculate intersection of source rect with destination rect
-            srcSubRect.IntersectRect(srcSubRect, dstInSrcRect);
-            // this tile does not overlap the current destination tile
-            if (srcSubRect.IsEmpty()) {
-                continue;
-            }
-            // We now have the intersection of
-            //     the current source tile
-            // and the desired source rectangle
-            // and the destination tile
-            // and the desired destination rectange
-            // in destination space.
-            // We need to transform this back into destination space, inverting the transform from (*)
-            nsIntRect srcSubInDstRect(srcSubRect);
-            srcSubInDstRect.MoveBy(-aSrcRect.TopLeft());
-            srcSubInDstRect.ScaleRoundOut(blitScaleX, blitScaleY);
-            srcSubInDstRect.MoveBy(aDstRect.TopLeft());
-
-            // we transform these rectangles to be relative to the current src and dst tiles, respectively
-            nsIntSize srcSize = srcTextureRect.Size();
-            nsIntSize dstSize = dstTextureRect.Size();
-            srcSubRect.MoveBy(-srcTextureRect.x, -srcTextureRect.y);
-            srcSubInDstRect.MoveBy(-dstTextureRect.x, -dstTextureRect.y);
-
-            float dx0 = 2.0f * float(srcSubInDstRect.x) / float(dstSize.width) - 1.0f;
-            float dy0 = 2.0f * float(srcSubInDstRect.y) / float(dstSize.height) - 1.0f;
-            float dx1 = 2.0f * float(srcSubInDstRect.x + srcSubInDstRect.width) / float(dstSize.width) - 1.0f;
-            float dy1 = 2.0f * float(srcSubInDstRect.y + srcSubInDstRect.height) / float(dstSize.height) - 1.0f;
-            ScopedViewportRect autoViewportRect(mGL, 0, 0, dstSize.width, dstSize.height);
-
-            RectTriangles rects;
-
-            nsIntSize realTexSize = srcSize;
-            if (!CanUploadNonPowerOfTwo(mGL)) {
-                realTexSize = nsIntSize(gfx::NextPowerOfTwo(srcSize.width),
-                                        gfx::NextPowerOfTwo(srcSize.height));
-            }
-
-            if (aSrc->GetWrapMode() == LOCAL_GL_REPEAT) {
-                rects.addRect(/* dest rectangle */
-                        dx0, dy0, dx1, dy1,
-                        /* tex coords */
-                        srcSubRect.x / float(realTexSize.width),
-                        srcSubRect.y / float(realTexSize.height),
-                        srcSubRect.XMost() / float(realTexSize.width),
-                        srcSubRect.YMost() / float(realTexSize.height));
-            } else {
-                DecomposeIntoNoRepeatTriangles(srcSubRect, realTexSize, rects);
-
-                // now put the coords into the d[xy]0 .. d[xy]1 coordinate space
-                // from the 0..1 that it comes out of decompose
-                InfallibleTArray<RectTriangles::coord>& coords = rects.vertCoords();
-
-                for (unsigned int i = 0; i < coords.Length(); ++i) {
-                    coords[i].x = (coords[i].x * (dx1 - dx0)) + dx0;
-                    coords[i].y = (coords[i].y * (dy1 - dy0)) + dy0;
-                }
-            }
-
-            ScopedBindTextureUnit autoTexUnit(mGL, LOCAL_GL_TEXTURE0);
-            ScopedBindTexture autoTex(mGL, aSrc->GetTextureID());
-            ScopedVertexAttribPointer autoAttrib0(mGL, 0, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0, 0, rects.vertCoords().Elements());
-            ScopedVertexAttribPointer autoAttrib1(mGL, 1, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0, 0, rects.texCoords().Elements());
-
-            mGL->fDrawArrays(LOCAL_GL_TRIANGLES, 0, rects.elements());
-
-        } while (aSrc->NextTile());
-    } while (aDst->NextTile());
-
-    // unbind the previous texture from the framebuffer
-    SetBlitFramebufferForDestTexture(0);
-
-    mGL->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, savedFb);
-}
-
-void
-GLBlitTextureImageHelper::SetBlitFramebufferForDestTexture(GLuint aTexture)
-{
-    if (!mBlitFramebuffer) {
-        mGL->fGenFramebuffers(1, &mBlitFramebuffer);
-    }
-
-    mGL->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, mBlitFramebuffer);
-    mGL->fFramebufferTexture2D(LOCAL_GL_FRAMEBUFFER,
-                               LOCAL_GL_COLOR_ATTACHMENT0,
-                               LOCAL_GL_TEXTURE_2D,
-                               aTexture,
-                               0);
-
-    GLenum result = mGL->fCheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER);
-    if (aTexture && (result != LOCAL_GL_FRAMEBUFFER_COMPLETE)) {
-        nsAutoCString msg;
-        msg.AppendLiteral("Framebuffer not complete -- error 0x");
-        msg.AppendInt(result, 16);
-        // Note: if you are hitting this, it is likely that
-        // your texture is not texture complete -- that is, you
-        // allocated a texture name, but didn't actually define its
-        // size via a call to TexImage2D.
-        NS_RUNTIMEABORT(msg.get());
-    }
-}
-
-void
-GLBlitTextureImageHelper::UseBlitProgram()
-{
-    if (mBlitProgram) {
-        mGL->fUseProgram(mBlitProgram);
-        return;
-    }
-
-    mBlitProgram = mGL->fCreateProgram();
-
-    GLuint shaders[2];
-    shaders[0] = mGL->fCreateShader(LOCAL_GL_VERTEX_SHADER);
-    shaders[1] = mGL->fCreateShader(LOCAL_GL_FRAGMENT_SHADER);
-
-    const char *blitVSSrc =
-        "attribute vec2 aVertex;"
-        "attribute vec2 aTexCoord;"
-        "varying vec2 vTexCoord;"
-        "void main() {"
-        "  vTexCoord = aTexCoord;"
-        "  gl_Position = vec4(aVertex, 0.0, 1.0);"
-        "}";
-    const char *blitFSSrc = "#ifdef GL_ES\nprecision mediump float;\n#endif\n"
-        "uniform sampler2D uSrcTexture;"
-        "varying vec2 vTexCoord;"
-        "void main() {"
-        "  gl_FragColor = texture2D(uSrcTexture, vTexCoord);"
-        "}";
-
-    mGL->fShaderSource(shaders[0], 1, (const GLchar**) &blitVSSrc, nullptr);
-    mGL->fShaderSource(shaders[1], 1, (const GLchar**) &blitFSSrc, nullptr);
-
-    for (int i = 0; i < 2; ++i) {
-        GLint success, len = 0;
-
-        mGL->fCompileShader(shaders[i]);
-        mGL->fGetShaderiv(shaders[i], LOCAL_GL_COMPILE_STATUS, &success);
-        NS_ASSERTION(success, "Shader compilation failed!");
-
-        if (!success) {
-            nsAutoCString log;
-            mGL->fGetShaderiv(shaders[i], LOCAL_GL_INFO_LOG_LENGTH, (GLint*) &len);
-            log.SetCapacity(len);
-            mGL->fGetShaderInfoLog(shaders[i], len, (GLint*) &len, (char*) log.BeginWriting());
-            log.SetLength(len);
-
-            printf_stderr("Shader %d compilation failed:\n%s\n", i, log.get());
-            return;
-        }
-
-        mGL->fAttachShader(mBlitProgram, shaders[i]);
-        mGL->fDeleteShader(shaders[i]);
-    }
-
-    mGL->fBindAttribLocation(mBlitProgram, 0, "aVertex");
-    mGL->fBindAttribLocation(mBlitProgram, 1, "aTexCoord");
-
-    mGL->fLinkProgram(mBlitProgram);
-
-    GLint success, len = 0;
-    mGL->fGetProgramiv(mBlitProgram, LOCAL_GL_LINK_STATUS, &success);
-    NS_ASSERTION(success, "Shader linking failed!");
-
-    if (!success) {
-        nsAutoCString log;
-        mGL->fGetProgramiv(mBlitProgram, LOCAL_GL_INFO_LOG_LENGTH, (GLint*) &len);
-        log.SetCapacity(len);
-        mGL->fGetProgramInfoLog(mBlitProgram, len, (GLint*) &len, (char*) log.BeginWriting());
-        log.SetLength(len);
-
-        printf_stderr("Program linking failed:\n%s\n", log.get());
-        return;
-    }
-
-    mGL->fUseProgram(mBlitProgram);
-    mGL->fUniform1i(mGL->fGetUniformLocation(mBlitProgram, "uSrcTexture"), 0);
-}
-
-}
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLBlitTextureImageHelper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLBlitTextureImageHelper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLBlitTextureImageHelper.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLBlitTextureImageHelper.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=8 sts=4 et sw=4 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 GLBLITTEXTUREIMAGEHELPER_H_
-#define GLBLITTEXTUREIMAGEHELPER_H_
-
-#include "mozilla/Attributes.h"
-#include "GLContextTypes.h"
-#include "GLConsts.h"
-
-struct nsIntRect;
-
-namespace mozilla {
-namespace gl {
-
-class GLContext;
-class TextureImage;
-
-class GLBlitTextureImageHelper MOZ_FINAL
-{
-    // The GLContext is the sole owner of the GLBlitTextureImageHelper.
-    GLContext* mGL;
-
-    // lazy-initialized things
-    GLuint mBlitProgram, mBlitFramebuffer;
-    void UseBlitProgram();
-    void SetBlitFramebufferForDestTexture(GLuint aTexture);
-
-public:
-
-    explicit GLBlitTextureImageHelper(GLContext *gl);
-    ~GLBlitTextureImageHelper();
-
-    /**
-     * Copy a rectangle from one TextureImage into another.  The
-     * source and destination are given in integer coordinates, and
-     * will be converted to texture coordinates.
-     *
-     * For the source texture, the wrap modes DO apply -- it's valid
-     * to use REPEAT or PAD and expect appropriate behaviour if the source
-     * rectangle extends beyond its bounds.
-     *
-     * For the destination texture, the wrap modes DO NOT apply -- the
-     * destination will be clipped by the bounds of the texture.
-     *
-     * Note: calling this function will cause the following OpenGL state
-     * to be changed:
-     *
-     *   - current program
-     *   - framebuffer binding
-     *   - viewport
-     *   - blend state (will be enabled at end)
-     *   - scissor state (will be enabled at end)
-     *   - vertex attrib 0 and 1 (pointer and enable state [enable state will be disabled at exit])
-     *   - array buffer binding (will be 0)
-     *   - active texture (will be 0)
-     *   - texture 0 binding
-     */
-    void BlitTextureImage(TextureImage *aSrc, const nsIntRect& aSrcRect,
-                          TextureImage *aDst, const nsIntRect& aDstRect);
-};
-
-}
-}
-
-#endif // GLBLITTEXTUREIMAGEHELPER_H_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContext.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContext.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include "GLContext.h"
 #include "GLBlitHelper.h"
-#include "GLBlitTextureImageHelper.h"
 #include "GLReadTexImageHelper.h"
 
 #include "gfxCrashReporterUtils.h"
@@ -505,11 +504,11 @@
         uint32_t version = 0;
         ParseGLVersion(this, &version);
 
-#ifdef MOZ_GL_DEBUG
-        printf_stderr("OpenGL version detected: %u\n", version);
-        printf_stderr("OpenGL vendor: %s\n", fGetString(LOCAL_GL_VENDOR));
-        printf_stderr("OpenGL renderer: %s\n", fGetString(LOCAL_GL_RENDERER));
-#endif
+        if (ShouldSpew()) {
+            printf_stderr("OpenGL version detected: %u\n", version);
+            printf_stderr("OpenGL vendor: %s\n", fGetString(LOCAL_GL_VENDOR));
+            printf_stderr("OpenGL renderer: %s\n", fGetString(LOCAL_GL_RENDERER));
+        }
 
         if (version >= mVersion) {
             mVersion = version;
@@ -640,10 +639,8 @@
 #endif
 
     if (mInitialized) {
-#ifdef MOZ_GL_DEBUG
-        static bool firstRun = true;
-        if (firstRun && DebugMode()) {
-            const char *vendors[size_t(GLVendor::Other)] = {
+        if (ShouldSpew()) {
+            const char* vendors[size_t(GLVendor::Other)] = {
                 "Intel",
                 "NVIDIA",
                 "ATI",
@@ -658,8 +655,6 @@
                 printf_stderr("OpenGL vendor ('%s') unrecognized\n", glVendorString);
             }
         }
-        firstRun = false;
-#endif
 
         InitExtensions();
         InitFeatures();
@@ -688,11 +683,12 @@
             }
 
 #ifdef XP_MACOSX
-            // The Mac Nvidia driver, for versions up to and including 10.8, don't seem
-            // to properly support this.  See 814839
+            // The Mac Nvidia driver, for versions up to and including 10.8,
+            // don't seem to properly support this.  See 814839
             // this has been fixed in Mac OS X 10.9. See 907946
+            // and it also works in 10.8.3 and higher.  See 1094338.
             if (Vendor() == gl::GLVendor::NVIDIA &&
-                !nsCocoaFeatures::OnMavericksOrLater())
+                !nsCocoaFeatures::IsAtLeastVersion(10,8,3))
             {
                 MarkUnsupported(GLFeature::depth_texture);
             }
@@ -1602,14 +1598,8 @@
     if (!extensions)
         return;
 
-#ifdef MOZ_GL_DEBUG
-    static bool firstRun = true;
-#else
-    // Non-DEBUG, so never spew.
-    const bool firstRun = false;
-#endif
-
-    InitializeExtensionsBitSet(mAvailableExtensions, extensions, sExtensionNames, firstRun && DebugMode());
+    InitializeExtensionsBitSet(mAvailableExtensions, extensions,
+                               sExtensionNames);
 
     if (WorkAroundDriverBugs() &&
         Vendor() == GLVendor::Qualcomm) {
@@ -1652,10 +1642,6 @@
         MarkExtensionUnsupported(EXT_texture_compression_s3tc);
     }
 #endif
-
-#ifdef MOZ_GL_DEBUG
-    firstRun = false;
-#endif
 }
 
 void
@@ -2090,7 +2076,6 @@
         DestroyScreenBuffer();
 
         mBlitHelper = nullptr;
-        mBlitTextureImageHelper = nullptr;
         mReadTexImageHelper = nullptr;
 
         mTexGarbageBin->GLContextTeardown();
@@ -2293,7 +2278,7 @@
 void
 GLContext::ReportOutstandingNames()
 {
-    if (!DebugMode())
+    if (!ShouldSpew())
         return;
 
     printf_stderr("== GLContext %p Outstanding ==\n", this);
@@ -2309,7 +2294,6 @@
 
 #endif /* DEBUG */
 
-
 void
 GLContext::GuaranteeResolve()
 {
@@ -2413,16 +2397,6 @@
     return mBlitHelper.get();
 }
 
-GLBlitTextureImageHelper*
-GLContext::BlitTextureImageHelper()
-{
-    if (!mBlitTextureImageHelper) {
-        mBlitTextureImageHelper = MakeUnique<GLBlitTextureImageHelper>(this);
-    }
-
-    return mBlitTextureImageHelper.get();
-}
-
 GLReadTexImageHelper*
 GLContext::ReadTexImageHelper()
 {
@@ -2467,5 +2441,12 @@
     return true;
 }
 
+/*static*/ bool
+GLContext::ShouldSpew()
+{
+    static bool spew = PR_GetEnv("MOZ_GL_SPEW");
+    return spew;
+}
+
 } /* namespace gl */
 } /* namespace mozilla */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContextFeatures.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContextFeatures.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContextFeatures.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContextFeatures.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -16,21 +16,44 @@
 
 const size_t kMAX_EXTENSION_GROUP_SIZE = 5;
 
+MOZ_BEGIN_ENUM_CLASS(GLVersion, uint32_t)
+    NONE  = 0,   // Feature is not supported natively by GL
+    GL1_2 = 120,
+    GL1_3 = 130,
+    GL2   = 200,
+    GL2_1 = 210,
+    GL3   = 300,
+    GL3_1 = 310,
+    GL3_2 = 320,
+    GL3_3 = 330,
+    GL4   = 400,
+    GL4_1 = 410,
+    GL4_2 = 420,
+    GL4_3 = 430,
+MOZ_END_ENUM_CLASS(GLVersion)
+
+MOZ_BEGIN_ENUM_CLASS(GLESVersion, uint32_t)
+    NONE  = 0,   // Feature is not support natively by GL ES
+    ES2   = 200,
+    ES3   = 300,
+    ES3_1 = 310,
+MOZ_END_ENUM_CLASS(GLESVersion)
+
 // ARB_ES2_compatibility is natively supported in OpenGL 4.1.
-static const unsigned int kGLCoreVersionForES2Compat = 410;
+static const GLVersion kGLCoreVersionForES2Compat = GLVersion::GL4_1;
 
 // ARB_ES3_compatibility is natively supported in OpenGL 4.3.
-static const unsigned int kGLCoreVersionForES3Compat = 430;
+static const GLVersion kGLCoreVersionForES3Compat = GLVersion::GL4_3;
 
 struct FeatureInfo
 {
     const char* mName;
 
     /* The (desktop) OpenGL version that provides this feature */
-    unsigned int mOpenGLVersion;
+    GLVersion mOpenGLVersion;
 
     /* The OpenGL ES version that provides this feature */
-    unsigned int mOpenGLESVersion;
+    GLESVersion mOpenGLESVersion;
 
     /* If there is an ARB extension, and its function symbols are
      * not decorated with an ARB suffix, then its extension ID should go
@@ -51,8 +74,8 @@
 static const FeatureInfo sFeatureInfoArr[] = {
     {
         "bind_buffer_offset",
-        0,   // OpenGL version
-        0,   // OpenGL ES version
+        GLVersion::NONE,
+        GLESVersion::NONE,
         GLContext::Extension_None,
         {
 
@@ -63,8 +86,8 @@
     },
     {
         "blend_minmax",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_blend_minmax,
@@ -73,8 +96,8 @@
     },
     {
         "clear_buffers",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::Extensions_End
@@ -82,8 +105,8 @@
     },
     {
         "copy_buffer",
-        310, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_1,
+        GLESVersion::ES3,
         GLContext::ARB_copy_buffer,
         {
             GLContext::Extensions_End
@@ -91,8 +114,8 @@
     },
     {
         "depth_texture",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_depth_texture,
@@ -104,8 +127,8 @@
     },
     {
         "draw_buffers",
-        200, // OpenGL version
-        0, // Only enable when we have the extension on ES, bug 1056947
+        GLVersion::GL2,
+        GLESVersion::NONE,
         GLContext::Extension_None,
         {
             GLContext::ARB_draw_buffers,
@@ -115,8 +138,8 @@
     },
     {
         "draw_instanced",
-        310, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_1,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_draw_instanced,
@@ -128,8 +151,8 @@
     },
     {
         "draw_range_elements",
-        120, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL1_2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_draw_range_elements,
@@ -138,8 +161,8 @@
     },
     {
         "element_index_uint",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::OES_element_index_uint,
@@ -149,7 +172,7 @@
     {
         "ES2_compatibility",
         kGLCoreVersionForES2Compat,
-        200, // OpenGL ES version
+        GLESVersion::ES2, // OpenGL ES version
         GLContext::ARB_ES2_compatibility, // no suffix on ARB extension
         {
             GLContext::Extensions_End
@@ -158,7 +181,7 @@
     {
         "ES3_compatibility",
         kGLCoreVersionForES3Compat,
-        300, // OpenGL ES version
+        GLESVersion::ES3, // OpenGL ES version
         GLContext::ARB_ES3_compatibility, // no suffix on ARB extension
         {
             GLContext::Extensions_End
@@ -167,8 +190,8 @@
     {
         // Removes clamping for float color outputs from frag shaders.
         "frag_color_float",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_color_buffer_float,
@@ -179,8 +202,8 @@
     },
     {
         "frag_depth",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_frag_depth,
@@ -189,8 +212,8 @@
     },
     {
         "framebuffer_blit",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_framebuffer_blit,
@@ -200,8 +223,8 @@
     },
     {
         "framebuffer_multisample",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_framebuffer_multisample,
@@ -211,8 +234,8 @@
     },
     {
         "framebuffer_object",
-        300, // OpenGL version
-        200, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES2,
         GLContext::ARB_framebuffer_object,
         {
             GLContext::EXT_framebuffer_object,
@@ -221,8 +244,8 @@
     },
     {
         "get_integer_indexed",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_draw_buffers2,
@@ -231,8 +254,8 @@
     },
     {
         "get_integer64_indexed",
-        320, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::Extensions_End
@@ -240,8 +263,8 @@
     },
     {
         "get_query_object_iv",
-        200, // OpenGL version
-        0,   // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::NONE,
         GLContext::Extension_None,
         {
             GLContext::Extensions_End
@@ -253,8 +276,8 @@
     },
     {
         "gpu_shader4",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_gpu_shader4,
@@ -263,8 +286,8 @@
     },
     {
         "instanced_arrays",
-        330, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_instanced_arrays,
@@ -275,8 +298,8 @@
     },
     {
         "instanced_non_arrays",
-        330, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_instanced_arrays,
@@ -290,8 +313,8 @@
     },
     {
         "invalidate_framebuffer",
-        430, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL4_3,
+        GLESVersion::ES3,
         GLContext::ARB_invalidate_subdata,
         {
             GLContext::Extensions_End
@@ -299,8 +322,8 @@
     },
     {
         "map_buffer_range",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::ARB_map_buffer_range,
         {
             GLContext::Extensions_End
@@ -308,8 +331,8 @@
     },
     {
         "occlusion_query",
-        200, // OpenGL version
-        0,   // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::NONE,
         GLContext::Extension_None,
         {
             GLContext::Extensions_End
@@ -319,7 +342,7 @@
     {
         "occlusion_query_boolean",
         kGLCoreVersionForES3Compat,
-        300, // OpenGL ES version
+        GLESVersion::ES3,
         GLContext::ARB_ES3_compatibility,
         {
             GLContext::EXT_occlusion_query_boolean,
@@ -334,8 +357,8 @@
     },
     {
         "occlusion_query2",
-        330, // = min(330, kGLCoreVersionForES3Compat),
-        300, // OpenGL ES version
+        GLVersion::GL3_3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_occlusion_query2,
@@ -351,8 +374,8 @@
     },
     {
         "packed_depth_stencil",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_packed_depth_stencil,
@@ -362,8 +385,8 @@
     },
     {
         "query_objects",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_occlusion_query_boolean,
@@ -377,8 +400,8 @@
     },
     {
         "renderbuffer_float",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_texture_float,
@@ -388,8 +411,8 @@
     },
     {
         "renderbuffer_half_float",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_texture_float,
@@ -399,8 +422,8 @@
     },
     {
         "robustness",
-        0,   // OpenGL version
-        0,   // OpenGL ES version
+        GLVersion::NONE,
+        GLESVersion::NONE,
         GLContext::Extension_None,
         {
             GLContext::ARB_robustness,
@@ -410,8 +433,8 @@
     },
     {
         "sRGB",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_sRGB,
@@ -420,8 +443,8 @@
     },
     {
         "sampler_objects",
-        330, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_3,
+        GLESVersion::ES3,
         GLContext::ARB_sampler_objects,
         {
             GLContext::Extensions_End
@@ -429,8 +452,8 @@
     },
     {
         "standard_derivatives",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::OES_standard_derivatives,
@@ -439,8 +462,8 @@
     },
     {
         "texture_3D",
-        120, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL1_2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_texture3D,
@@ -450,8 +473,8 @@
     },
     {
         "texture_3D_compressed",
-        130, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL1_3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_texture_compression,
@@ -461,8 +484,8 @@
     },
     {
         "texture_3D_copy",
-        120, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL1_2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::EXT_copy_texture,
@@ -472,8 +495,8 @@
     },
     {
         "texture_float",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_texture_float,
@@ -483,8 +506,8 @@
     },
     {
         "texture_float_linear",
-        310, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_1,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_texture_float,
@@ -494,8 +517,8 @@
     },
     {
         "texture_half_float",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_half_float_pixel,
@@ -514,8 +537,8 @@
     },
     {
         "texture_half_float_linear",
-        310, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_1,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_half_float_pixel,
@@ -527,8 +550,8 @@
     },
     {
         "texture_non_power_of_two",
-        200, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::ARB_texture_non_power_of_two,
@@ -538,8 +561,8 @@
     },
     {
         "texture_storage",
-        420, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL4_2,
+        GLESVersion::ES3,
         GLContext::ARB_texture_storage,
         {
             /*
@@ -552,8 +575,8 @@
     },
     {
         "transform_feedback2",
-        400, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL4,
+        GLESVersion::ES3,
         GLContext::ARB_transform_feedback2,
         {
             GLContext::NV_transform_feedback2,
@@ -562,8 +585,8 @@
     },
     {
         "uniform_buffer_object",
-        310, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3_1,
+        GLESVersion::ES3,
         GLContext::ARB_uniform_buffer_object,
         {
             GLContext::Extensions_End
@@ -571,8 +594,8 @@
     },
     {
         "uniform_matrix_nonsquare",
-        210, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL2_1,
+        GLESVersion::ES3,
         GLContext::Extension_None,
         {
             GLContext::Extensions_End
@@ -580,8 +603,8 @@
     },
     {
         "vertex_array_object",
-        300, // OpenGL version
-        300, // OpenGL ES version
+        GLVersion::GL3,
+        GLESVersion::ES3,
         GLContext::ARB_vertex_array_object, // ARB extension
         {
             GLContext::OES_vertex_array_object,
@@ -612,10 +635,10 @@
     const FeatureInfo& featureInfo = GetFeatureInfo(feature);
 
     if (profile == ContextProfile::OpenGLES) {
-        return featureInfo.mOpenGLESVersion;
+        return (uint32_t) featureInfo.mOpenGLESVersion;
     }
 
-    return featureInfo.mOpenGLVersion;
+    return (uint32_t) featureInfo.mOpenGLVersion;
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContext.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContext.h	2014-11-26 21:46:09.000000000 +0000
@@ -465,15 +465,15 @@
         mAvailableExtensions[aKnownExtension] = 1;
     }
 
-
 public:
-
     template<size_t N>
-    static void InitializeExtensionsBitSet(std::bitset<N>& extensionsBitset, const char* extStr, const char** extList, bool verbose = false)
+    static void InitializeExtensionsBitSet(std::bitset<N>& extensionsBitset,
+                                           const char* extStr,
+                                           const char** extList)
     {
         char* exts = ::strdup(extStr);
 
-        if (verbose)
+        if (ShouldSpew())
             printf_stderr("Extensions: %s\n", exts);
 
         char* cur = exts;
@@ -488,7 +488,7 @@
 
             for (int i = 0; extList[i]; ++i) {
                 if (PL_strcasecmp(cur, extList[i]) == 0) {
-                    if (verbose)
+                    if (ShouldSpew())
                         printf_stderr("Found extension %s\n", cur);
                     extensionsBitset[i] = true;
                 }
@@ -500,11 +500,9 @@
         free(exts);
     }
 
-
 protected:
     std::bitset<Extensions_Max> mAvailableExtensions;
 
-
 // -----------------------------------------------------------------------------
 // Feature queries
 /*
@@ -3418,7 +3416,6 @@
 #endif
 
     UniquePtr<GLBlitHelper> mBlitHelper;
-    UniquePtr<GLBlitTextureImageHelper> mBlitTextureImageHelper;
     UniquePtr<GLReadTexImageHelper> mReadTexImageHelper;
 
 public:
@@ -3699,6 +3696,7 @@
 
 public:
     void FlushIfHeavyGLCallsSinceLastFlush();
+    static bool ShouldSpew();
 };
 
 bool DoesStringMatch(const char* aString, const char *aWantedString);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContextProviderEGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContextProviderEGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLContextProviderEGL.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLContextProviderEGL.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -805,7 +805,7 @@
 
     // We absolutely don't care, so just pick the first one.
     config = configs[0];
-    if (GLContext::DebugMode())
+    if (GLContext::ShouldSpew())
         sEGLLibrary.DumpEGLConfig(config);
 
     gfxIntSize pbSize(size);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLLibraryEGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLLibraryEGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/GLLibraryEGL.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/GLLibraryEGL.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -123,7 +123,7 @@
 
 #ifdef MOZ_B2G
     if (!sCurrentContext.init())
-	    MOZ_CRASH("Tls init failed");
+      MOZ_CRASH("Tls init failed");
 #endif
 
 #ifdef XP_WIN
@@ -409,22 +409,8 @@
         return;
     }
 
-    bool debugMode = false;
-#ifdef DEBUG
-    if (PR_GetEnv("MOZ_GL_DEBUG"))
-        debugMode = true;
-
-    static bool firstRun = true;
-#else
-    // Non-DEBUG, so never spew.
-    const bool firstRun = false;
-#endif
-
-    GLContext::InitializeExtensionsBitSet(mAvailableExtensions, extensions, sEGLExtensionNames, firstRun && debugMode);
-
-#ifdef DEBUG
-    firstRun = false;
-#endif
+    GLContext::InitializeExtensionsBitSet(mAvailableExtensions, extensions,
+                                          sEGLExtensionNames);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/gl/moz.build	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/gl/moz.build	2014-11-26 21:46:09.000000000 +0000
@@ -33,7 +33,6 @@
     'ForceDiscreteGPUHelperCGL.h',
     'GfxTexturesReporter.h',
     'GLBlitHelper.h',
-    'GLBlitTextureImageHelper.h',
     'GLConsts.h',
     'GLContext.h',
     'GLContextEGL.h',
@@ -122,7 +121,6 @@
     'EGLUtils.cpp',
     'GfxTexturesReporter.cpp',
     'GLBlitHelper.cpp',
-    'GLBlitTextureImageHelper.cpp',
     'GLContext.cpp',
     'GLContextFeatures.cpp',
     'GLContextTypes.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ipc/GfxMessageUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ipc/GfxMessageUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ipc/GfxMessageUtils.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ipc/GfxMessageUtils.h	2014-11-26 21:46:09.000000000 +0000
@@ -394,10 +394,10 @@
   }
 };
 
-template<>
-struct ParamTraits<mozilla::gfx::IntSize>
+template<typename T>
+struct ParamTraits<mozilla::gfx::IntSizeTyped<T> >
 {
-  typedef mozilla::gfx::IntSize paramType;
+  typedef mozilla::gfx::IntSizeTyped<T> paramType;
 
   static void Write(Message* msg, const paramType& param)
   {
@@ -756,6 +756,7 @@
     WriteParam(aMsg, aParam.mBackgroundColor);
     WriteParam(aMsg, aParam.mDoSmoothScroll);
     WriteParam(aMsg, aParam.mSmoothScrollOffset);
+    WriteParam(aMsg, aParam.GetLineScrollAmount());
     WriteParam(aMsg, aParam.GetContentDescription());
   }
 
@@ -797,6 +798,7 @@
             ReadParam(aMsg, aIter, &aResult->mBackgroundColor) &&
             ReadParam(aMsg, aIter, &aResult->mDoSmoothScroll) &&
             ReadParam(aMsg, aIter, &aResult->mSmoothScrollOffset) &&
+            ReadParam(aMsg, aIter, &aResult->mLineScrollAmount) &&
             ReadContentDescription(aMsg, aIter, aResult));
   }
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/APZCTreeManager.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -59,6 +59,7 @@
   // State that is updated as we perform the tree build
   nsTArray< nsRefPtr<AsyncPanZoomController> > mApzcsToDestroy;
   std::map<ScrollableLayerGuid, AsyncPanZoomController*> mApzcMap;
+  nsTArray<EventRegions> mEventRegions;
 };
 
 /*static*/ const ScreenMargin
@@ -74,7 +75,7 @@
 APZCTreeManager::APZCTreeManager()
     : mInputQueue(new InputQueue()),
       mTreeLock("APZCTreeLock"),
-      mInOverscrolledApzc(false),
+      mHitResultForInputBlock(NoApzcHit),
       mRetainedTouchIdentifier(-1),
       mTouchCount(0),
       mApzcTreeLog("apzctree")
@@ -178,6 +179,7 @@
                                 Matrix4x4(), nullptr, nullptr, nsIntRegion());
     mApzcTreeLog << "[end]\n";
   }
+  MOZ_ASSERT(state.mEventRegions.Length() == 0);
 
   for (size_t i = 0; i < state.mApzcsToDestroy.Length(); i++) {
     APZCTM_LOG("Destroying APZC at %p\n", state.mApzcsToDestroy[i].get());
@@ -214,11 +216,8 @@
   // Not sure what rounding option is the most correct here, but if we ever
   // figure it out we can change this. For now I'm rounding in to minimize
   // the chances of getting a complex region.
-  ParentLayerIntRect roundedVisible = RoundedIn(visible);
   nsIntRegion unobscured;
-  unobscured.Sub(nsIntRect(roundedVisible.x, roundedVisible.y,
-                           roundedVisible.width, roundedVisible.height),
-                 aObscured);
+  unobscured.Sub(ParentLayerIntRect::ToUntyped(RoundedIn(visible)), aObscured);
   return unobscured;
 }
 
@@ -326,8 +325,11 @@
     apzc->NotifyLayersUpdated(aMetrics,
         aState.mIsFirstPaint && (aLayersId == aState.mOriginatingLayersId));
 
-    nsIntRegion unobscured = ComputeTouchSensitiveRegion(state->mController, aMetrics, aObscured);
-    apzc->SetLayerHitTestData(unobscured, aAncestorTransform);
+    nsIntRegion unobscured;
+    if (!gfxPrefs::LayoutEventRegionsEnabled()) {
+      unobscured = ComputeTouchSensitiveRegion(state->mController, aMetrics, aObscured);
+    }
+    apzc->SetLayerHitTestData(EventRegions(unobscured), aAncestorTransform);
     APZCTM_LOG("Setting region %s as visible region for APZC %p\n",
         Stringify(unobscured).c_str(), apzc);
 
@@ -390,9 +392,11 @@
     // async transform and so we basically assume the same amount of C is always visible
     // on top of B. Fixing this doesn't appear to be very easy so I'm leaving it for
     // now in the hopes that we won't run into this problem a lot.
-    nsIntRegion unobscured = ComputeTouchSensitiveRegion(state->mController, aMetrics, aObscured);
-    apzc->AddHitTestRegion(unobscured);
-    APZCTM_LOG("Adding region %s to visible region of APZC %p\n", Stringify(unobscured).c_str(), apzc);
+    if (!gfxPrefs::LayoutEventRegionsEnabled()) {
+      nsIntRegion unobscured = ComputeTouchSensitiveRegion(state->mController, aMetrics, aObscured);
+      apzc->AddHitTestRegions(EventRegions(unobscured));
+      APZCTM_LOG("Adding region %s to visible region of APZC %p\n", Stringify(unobscured).c_str(), apzc);
+    }
   }
 
   return apzc;
@@ -460,6 +464,16 @@
     next = apzc->GetFirstChild();
   }
 
+  // In our recursive downward traversal, track event regions for layers once
+  // we encounter an APZC. Push a new empty region on the mEventRegions stack
+  // which will accumulate the hit area of descendants of aLayer. In general,
+  // the mEventRegions stack is used to accumulate event regions from descendant
+  // layers because the event regions for a layer don't include those of its
+  // children.
+  if (gfxPrefs::LayoutEventRegionsEnabled() && (apzc || aState.mEventRegions.Length() > 0)) {
+    aState.mEventRegions.AppendElement(EventRegions());
+  }
+
   for (LayerMetricsWrapper child = aLayer.GetLastChild(); child; child = child.GetPrevSibling()) {
     gfx::TreeAutoIndent indent(mApzcTreeLog);
     next = UpdatePanZoomControllerTree(aState, child, childLayersId,
@@ -468,7 +482,12 @@
 
     // Each layer obscures its previous siblings, so we augment the obscured
     // region as we loop backwards through the children.
-    nsIntRegion childRegion = child.GetVisibleRegion();
+    nsIntRegion childRegion;
+    if (gfxPrefs::LayoutEventRegionsEnabled()) {
+      childRegion = child.GetEventRegions().mHitRegion;
+    } else {
+      childRegion = child.GetVisibleRegion();
+    }
     childRegion.Transform(gfx::To3DMatrix(child.GetTransform()));
     if (child.GetClipRect()) {
       childRegion.AndWith(*child.GetClipRect());
@@ -477,6 +496,77 @@
     obscured.OrWith(childRegion);
   }
 
+  if (gfxPrefs::LayoutEventRegionsEnabled() && aState.mEventRegions.Length() > 0) {
+    // At this point in the code, aState.mEventRegions.LastElement() contains
+    // the accumulated regions of the non-APZC descendants of |aLayer|. This
+    // happened in the loop above while we iterated through the descendants of
+    // |aLayer|. Note that it only includes the non-APZC descendants, because
+    // if a layer has an APZC, we simply store the regions from that subtree on
+    // that APZC and don't propagate them upwards in the tree. Because of the
+    // way we do hit-testing (where the deepest matching APZC is used) it should
+    // still be ok if we did propagate those regions upwards and included them
+    // in all the ancestor APZCs.
+    //
+    // Also at this point in the code the |obscured| region includes the hit
+    // regions of children of |aLayer| as well as the hit regions of |aLayer|'s
+    // younger uncles (i.e. the next-sibling chain of |aLayer|'s parent).
+    // When we compute the unobscured regions below, we subtract off the
+    // |obscured| region, but it would also be ok to do this before the above
+    // loop. At that point |obscured| would only have the uncles' hit regions
+    // and not the children. The reason this is ok is again because of the way
+    // we do hit-testing (where the deepest APZC is used) it doesn't matter if
+    // we count the children as obscuring the parent or not.
+
+    EventRegions unobscured;
+    unobscured.Sub(aLayer.GetEventRegions(), obscured);
+    APZCTM_LOG("Picking up unobscured hit region %s from layer %p\n", Stringify(unobscured).c_str(), aLayer.GetLayer());
+
+    // Take the hit region of the |aLayer|'s subtree (which has already been
+    // transformed into the coordinate space of |aLayer|) and...
+    EventRegions subtreeEventRegions = aState.mEventRegions.LastElement();
+    aState.mEventRegions.RemoveElementAt(aState.mEventRegions.Length() - 1);
+    // ... combine it with the hit region for this layer, and then ...
+    subtreeEventRegions.OrWith(unobscured);
+    // ... transform it up to the parent layer's coordinate space.
+    subtreeEventRegions.Transform(To3DMatrix(aLayer.GetTransform()));
+    if (aLayer.GetClipRect()) {
+      subtreeEventRegions.AndWith(*aLayer.GetClipRect());
+    }
+
+    APZCTM_LOG("After processing layer %p the subtree hit region is %s\n", aLayer.GetLayer(), Stringify(subtreeEventRegions).c_str());
+
+    // If we have an APZC at this level, intersect the subtree hit region with
+    // the touch-sensitive region and add it to the APZ's hit test regions.
+    if (apzc) {
+      APZCTM_LOG("Adding region %s to visible region of APZC %p\n", Stringify(subtreeEventRegions).c_str(), apzc);
+      const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(aLayersId);
+      MOZ_ASSERT(state);
+      MOZ_ASSERT(state->mController.get());
+      CSSRect touchSensitiveRegion;
+      if (state->mController->GetTouchSensitiveRegion(&touchSensitiveRegion)) {
+        // Here we assume 'touchSensitiveRegion' is in the CSS pixels of the
+        // parent frame. To convert it to ParentLayer pixels, we therefore need
+        // the cumulative resolution of the parent frame. We approximate this as
+        // the quotient of our cumulative resolution and our pres shell
+        // resolution; this approximation may not be accurate in the presence of
+        // a css-driven resolution.
+        LayoutDeviceToParentLayerScale parentCumulativeResolution =
+            aLayer.Metrics().mCumulativeResolution
+            / ParentLayerToLayerScale(aLayer.Metrics().mPresShellResolution);
+        subtreeEventRegions.AndWith(ParentLayerIntRect::ToUntyped(
+            RoundedIn(touchSensitiveRegion
+                    * aLayer.Metrics().mDevPixelsPerCSSPixel
+                    * parentCumulativeResolution)));
+      }
+      apzc->AddHitTestRegions(subtreeEventRegions);
+    } else {
+      // If we don't have an APZC at this level, carry the subtree hit region
+      // up to the parent.
+      MOZ_ASSERT(aState.mEventRegions.Length() > 0);
+      aState.mEventRegions.LastElement().OrWith(subtreeEventRegions);
+    }
+  }
+
   // Return the APZC that should be the sibling of other APZCs as we continue
   // moving towards the first child at this depth in the layer tree.
   // If this layer doesn't have an APZC, we promote any APZCs in the subtree
@@ -502,23 +592,50 @@
   }
   nsEventStatus result = nsEventStatus_eIgnore;
   Matrix4x4 transformToApzc;
-  bool inOverscrolledApzc = false;
+  HitTestResult hitResult = NoApzcHit;
   switch (aEvent.mInputType) {
     case MULTITOUCH_INPUT: {
       MultiTouchInput& touchInput = aEvent.AsMultiTouchInput();
       result = ProcessTouchInput(touchInput, aOutTargetGuid, aOutInputBlockId);
       break;
+    } case SCROLLWHEEL_INPUT: {
+      ScrollWheelInput& wheelInput = aEvent.AsScrollWheelInput();
+      nsRefPtr<AsyncPanZoomController> apzc = GetTargetAPZC(wheelInput.mOrigin,
+                                                            &hitResult);
+      if (apzc) {
+        MOZ_ASSERT(hitResult == ApzcHitRegion || hitResult == ApzcContentRegion);
+
+        transformToApzc = GetScreenToApzcTransform(apzc);
+        wheelInput.mLocalOrigin =
+          TransformTo<ParentLayerPixel>(transformToApzc, wheelInput.mOrigin);
+
+        result = mInputQueue->ReceiveInputEvent(
+          apzc,
+          /* aTargetConfirmed = */ hitResult,
+          wheelInput, aOutInputBlockId);
+
+        // Update the out-parameters so they are what the caller expects.
+        apzc->GetGuid(aOutTargetGuid);
+        Matrix4x4 transformToGecko = transformToApzc * GetApzcToGeckoTransform(apzc);
+        wheelInput.mOrigin =
+          TransformTo<ScreenPixel>(transformToGecko, wheelInput.mLocalOrigin);
+      }
+      break;
     } case PANGESTURE_INPUT: {
       PanGestureInput& panInput = aEvent.AsPanGestureInput();
       nsRefPtr<AsyncPanZoomController> apzc = GetTargetAPZC(panInput.mPanStartPoint,
-                                                            &inOverscrolledApzc);
+                                                            &hitResult);
       if (apzc) {
+        MOZ_ASSERT(hitResult == ApzcHitRegion || hitResult == ApzcContentRegion);
         transformToApzc = GetScreenToApzcTransform(apzc);
         panInput.mLocalPanStartPoint = TransformTo<ParentLayerPixel>(
             transformToApzc, panInput.mPanStartPoint);
         panInput.mLocalPanDisplacement = TransformVector<ParentLayerPixel>(
             transformToApzc, panInput.mPanDisplacement, panInput.mPanStartPoint);
-        result = mInputQueue->ReceiveInputEvent(apzc, panInput, aOutInputBlockId);
+        result = mInputQueue->ReceiveInputEvent(
+            apzc,
+            /* aTargetConfirmed = */ hitResult == ApzcHitRegion,
+            panInput, aOutInputBlockId);
 
         // Update the out-parameters so they are what the caller expects.
         apzc->GetGuid(aOutTargetGuid);
@@ -532,12 +649,16 @@
     } case PINCHGESTURE_INPUT: {  // note: no one currently sends these
       PinchGestureInput& pinchInput = aEvent.AsPinchGestureInput();
       nsRefPtr<AsyncPanZoomController> apzc = GetTargetAPZC(pinchInput.mFocusPoint,
-                                                            &inOverscrolledApzc);
+                                                            &hitResult);
       if (apzc) {
+        MOZ_ASSERT(hitResult == ApzcHitRegion || hitResult == ApzcContentRegion);
         transformToApzc = GetScreenToApzcTransform(apzc);
         pinchInput.mLocalFocusPoint = TransformTo<ParentLayerPixel>(
             transformToApzc, pinchInput.mFocusPoint);
-        result = mInputQueue->ReceiveInputEvent(apzc, pinchInput, aOutInputBlockId);
+        result = mInputQueue->ReceiveInputEvent(
+            apzc,
+            /* aTargetConfirmed = */ hitResult == ApzcHitRegion,
+            pinchInput, aOutInputBlockId);
 
         // Update the out-parameters so they are what the caller expects.
         apzc->GetGuid(aOutTargetGuid);
@@ -549,12 +670,16 @@
     } case TAPGESTURE_INPUT: {  // note: no one currently sends these
       TapGestureInput& tapInput = aEvent.AsTapGestureInput();
       nsRefPtr<AsyncPanZoomController> apzc = GetTargetAPZC(tapInput.mPoint,
-                                                            &inOverscrolledApzc);
+                                                            &hitResult);
       if (apzc) {
+        MOZ_ASSERT(hitResult == ApzcHitRegion || hitResult == ApzcContentRegion);
         transformToApzc = GetScreenToApzcTransform(apzc);
         tapInput.mLocalPoint = TransformTo<ParentLayerPixel>(
             transformToApzc, tapInput.mPoint);
-        result = mInputQueue->ReceiveInputEvent(apzc, tapInput, aOutInputBlockId);
+        result = mInputQueue->ReceiveInputEvent(
+            apzc,
+            /* aTargetConfirmed = */ hitResult == ApzcHitRegion,
+            tapInput, aOutInputBlockId);
 
         // Update the out-parameters so they are what the caller expects.
         apzc->GetGuid(aOutTargetGuid);
@@ -564,7 +689,7 @@
       break;
     }
   }
-  if (inOverscrolledApzc) {
+  if (hitResult == OverscrolledApzc) {
     result = nsEventStatus_eConsumeNoDefault;
   }
   return result;
@@ -572,7 +697,7 @@
 
 already_AddRefed<AsyncPanZoomController>
 APZCTreeManager::GetTouchInputBlockAPZC(const MultiTouchInput& aEvent,
-                                        bool* aOutInOverscrolledApzc)
+                                        HitTestResult* aOutHitResult)
 {
   nsRefPtr<AsyncPanZoomController> apzc;
   if (aEvent.mTouches.Length() == 0) {
@@ -593,14 +718,10 @@
     }
   }
 
-  apzc = GetTargetAPZC(aEvent.mTouches[0].mScreenPoint, aOutInOverscrolledApzc);
+  apzc = GetTargetAPZC(aEvent.mTouches[0].mScreenPoint, aOutHitResult);
   for (size_t i = 1; i < aEvent.mTouches.Length(); i++) {
-    nsRefPtr<AsyncPanZoomController> apzc2 = GetTargetAPZC(aEvent.mTouches[i].mScreenPoint, aOutInOverscrolledApzc);
-    apzc = CommonAncestor(apzc.get(), apzc2.get());
-    APZCTM_LOG("Using APZC %p as the common ancestor\n", apzc.get());
-    // For now, we only ever want to do pinching on the root APZC for a given layers id. So
-    // when we find the common ancestor of multiple points, also walk up to the root APZC.
-    apzc = RootAPZCForLayersId(apzc);
+    nsRefPtr<AsyncPanZoomController> apzc2 = GetTargetAPZC(aEvent.mTouches[i].mScreenPoint, aOutHitResult);
+    apzc = GetMultitouchTarget(apzc, apzc2);
     APZCTM_LOG("Using APZC %p as the root APZC for multi-touch\n", apzc.get());
   }
 
@@ -627,15 +748,21 @@
     // NS_TOUCH_START event contains all active touches of the current
     // session thus resetting mTouchCount.
     mTouchCount = aInput.mTouches.Length();
-    mInOverscrolledApzc = false;
-    nsRefPtr<AsyncPanZoomController> apzc = GetTouchInputBlockAPZC(aInput, &mInOverscrolledApzc);
+    mHitResultForInputBlock = NoApzcHit;
+    nsRefPtr<AsyncPanZoomController> apzc = GetTouchInputBlockAPZC(aInput, &mHitResultForInputBlock);
+    // XXX the following check assumes mHitResultForInputBlock == ApzcHitRegion
+    // (and that mApzcForInputBlock was the confirmed target of the previous
+    // input block). Eventually it would be better to move this into InputQueue
+    // and have it auto-generated when we start processing events in a new
+    // event block.
     if (apzc != mApzcForInputBlock) {
       // If we're moving to a different APZC as our input target, then send a cancel event
       // to the old one so that it clears its internal state. Otherwise it could get left
       // in the middle of a panning touch block (for example) and not clean up properly.
       if (mApzcForInputBlock) {
         MultiTouchInput cancel(MultiTouchInput::MULTITOUCH_CANCEL, 0, TimeStamp::Now(), 0);
-        mInputQueue->ReceiveInputEvent(mApzcForInputBlock, cancel, nullptr);
+        mInputQueue->ReceiveInputEvent(mApzcForInputBlock,
+            /* aTargetConfirmed = */ true, cancel, nullptr);
       }
       mApzcForInputBlock = apzc;
     }
@@ -675,6 +802,8 @@
 
   nsEventStatus result = nsEventStatus_eIgnore;
   if (mApzcForInputBlock) {
+    MOZ_ASSERT(mHitResultForInputBlock == ApzcHitRegion || mHitResultForInputBlock == ApzcContentRegion);
+
     mApzcForInputBlock->GetGuid(aOutTargetGuid);
     // For computing the input for the APZC, used the cached transform.
     // This ensures that the sequence of touch points an APZC sees in an
@@ -685,7 +814,9 @@
       touchData.mLocalScreenPoint = TransformTo<ParentLayerPixel>(
           transformToApzc, ScreenPoint(touchData.mScreenPoint));
     }
-    result = mInputQueue->ReceiveInputEvent(mApzcForInputBlock, aInput, aOutInputBlockId);
+    result = mInputQueue->ReceiveInputEvent(mApzcForInputBlock,
+        /* aTargetConfirmed = */ mHitResultForInputBlock == ApzcHitRegion,
+        aInput, aOutInputBlockId);
 
     // For computing the event to pass back to Gecko, use the up-to-date transforms.
     // This ensures that transformToApzc and transformToGecko are in sync
@@ -699,7 +830,7 @@
           outTransform, touchData.mScreenPoint);
     }
   }
-  if (mInOverscrolledApzc) {
+  if (mHitResultForInputBlock == OverscrolledApzc) {
     result = nsEventStatus_eConsumeNoDefault;
   }
 
@@ -719,7 +850,7 @@
   // don't keep dangling references and leak things.
   if (mTouchCount == 0) {
     mApzcForInputBlock = nullptr;
-    mInOverscrolledApzc = false;
+    mHitResultForInputBlock = NoApzcHit;
     mRetainedTouchIdentifier = -1;
   }
 
@@ -750,17 +881,18 @@
 
   // Transform the refPoint.
   // If the event hits an overscrolled APZC, instruct the caller to ignore it.
-  bool inOverscrolledApzc = false;
+  HitTestResult hitResult = NoApzcHit;
   nsRefPtr<AsyncPanZoomController> apzc = GetTargetAPZC(ScreenPoint(aEvent.refPoint.x, aEvent.refPoint.y),
-                                                        &inOverscrolledApzc);
+                                                        &hitResult);
   if (apzc) {
+    MOZ_ASSERT(hitResult == ApzcHitRegion || hitResult == ApzcContentRegion);
     apzc->GetGuid(aOutTargetGuid);
     Matrix4x4 transformToApzc = GetScreenToApzcTransform(apzc);
     Matrix4x4 transformToGecko = GetApzcToGeckoTransform(apzc);
     Matrix4x4 outTransform = transformToApzc * transformToGecko;
     aEvent.refPoint = TransformTo<LayoutDevicePixel>(outTransform, aEvent.refPoint);
   }
-  if (inOverscrolledApzc) {
+  if (hitResult == OverscrolledApzc) {
     result = nsEventStatus_eConsumeNoDefault;
   }
   return result;
@@ -823,6 +955,21 @@
 }
 
 void
+APZCTreeManager::SetTargetAPZC(uint64_t aInputBlockId,
+                               const nsTArray<ScrollableLayerGuid>& aTargets)
+{
+  nsRefPtr<AsyncPanZoomController> target = nullptr;
+  if (aTargets.Length() > 0) {
+    target = GetTargetAPZC(aTargets[0]);
+  }
+  for (size_t i = 1; i < aTargets.Length(); i++) {
+    nsRefPtr<AsyncPanZoomController> apzc2 = GetTargetAPZC(aTargets[i]);
+    target = GetMultitouchTarget(target, apzc2);
+  }
+  mInputQueue->SetConfirmedTargetApzc(aInputBlockId, target);
+}
+
+void
 APZCTreeManager::UpdateZoomConstraints(const ScrollableLayerGuid& aGuid,
                                        const ZoomConstraints& aConstraints)
 {
@@ -1037,24 +1184,24 @@
 }
 
 already_AddRefed<AsyncPanZoomController>
-APZCTreeManager::GetTargetAPZC(const ScreenPoint& aPoint, bool* aOutInOverscrolledApzc)
+APZCTreeManager::GetTargetAPZC(const ScreenPoint& aPoint, HitTestResult* aOutHitResult)
 {
   MonitorAutoLock lock(mTreeLock);
   nsRefPtr<AsyncPanZoomController> target;
   // The root may have siblings, so check those too
-  bool inOverscrolledApzc = false;
+  HitTestResult hitResult = NoApzcHit;
   for (AsyncPanZoomController* apzc = mRootApzc; apzc; apzc = apzc->GetPrevSibling()) {
-    target = GetAPZCAtPoint(apzc, aPoint.ToUnknownPoint(), &inOverscrolledApzc);
+    target = GetAPZCAtPoint(apzc, aPoint.ToUnknownPoint(), &hitResult);
     // If we hit an overscrolled APZC, 'target' will be nullptr but it's still
     // a hit so we don't search further siblings.
-    if (target || inOverscrolledApzc) {
+    if (target || (hitResult == OverscrolledApzc)) {
       break;
     }
   }
   // If we are in an overscrolled APZC, we should be returning nullptr.
-  MOZ_ASSERT(!(target && inOverscrolledApzc));
-  if (aOutInOverscrolledApzc) {
-    *aOutInOverscrolledApzc = inOverscrolledApzc;
+  MOZ_ASSERT(!(target && (hitResult == OverscrolledApzc)));
+  if (aOutHitResult) {
+    *aOutHitResult = hitResult;
   }
   return target.forget();
 }
@@ -1175,7 +1322,7 @@
 AsyncPanZoomController*
 APZCTreeManager::GetAPZCAtPoint(AsyncPanZoomController* aApzc,
                                 const Point& aHitTestPoint,
-                                bool* aOutInOverscrolledApzc)
+                                HitTestResult* aOutHitResult)
 {
   mTreeLock.AssertCurrentThreadOwns();
 
@@ -1213,8 +1360,8 @@
   // APZCs front-to-back on the screen.
   if (hitTestPointForChildLayers.HasPositiveWCoord()) {
     for (AsyncPanZoomController* child = aApzc->GetLastChild(); child; child = child->GetPrevSibling()) {
-      AsyncPanZoomController* match = GetAPZCAtPoint(child, hitTestPointForChildLayers.As2DPoint(), aOutInOverscrolledApzc);
-      if (*aOutInOverscrolledApzc) {
+      AsyncPanZoomController* match = GetAPZCAtPoint(child, hitTestPointForChildLayers.As2DPoint(), aOutHitResult);
+      if (*aOutHitResult == OverscrolledApzc) {
         // We matched an overscrolled APZC, abort.
         return nullptr;
       }
@@ -1224,18 +1371,22 @@
       }
     }
   }
-  if (!result && hitTestPointForThisLayer.HasPositiveWCoord() &&
-      aApzc->VisibleRegionContains(ParentLayerPoint::FromUnknownPoint(hitTestPointForThisLayer.As2DPoint()))) {
-    APZCTM_LOG("Successfully matched untransformed point %f %f to visible region for APZC %p\n",
-             hitTestPointForThisLayer.x, hitTestPointForThisLayer.y, aApzc);
-    result = aApzc;
+  if (!result && hitTestPointForThisLayer.HasPositiveWCoord()) {
+    ParentLayerPoint point = ParentLayerPoint::FromUnknownPoint(hitTestPointForThisLayer.As2DPoint());
+    if (aApzc->HitRegionContains(point)) {
+      APZCTM_LOG("Successfully matched untransformed point %f %f to visible region for APZC %p\n",
+                 hitTestPointForThisLayer.x, hitTestPointForThisLayer.y, aApzc);
+      result = aApzc;
+      // If event regions are disabled, *aOutHitResult will be ApzcHitRegion
+      *aOutHitResult = (aApzc->DispatchToContentRegionContains(point) ? ApzcContentRegion : ApzcHitRegion);
+    }
   }
 
   // If we are overscrolled, and the point matches us or one of our children,
   // the result is inside an overscrolled APZC, inform our caller of this
   // (callers typically ignore events targeted at overscrolled APZCs).
   if (result && aApzc->IsOverscrolled()) {
-    *aOutInOverscrolledApzc = true;
+    *aOutHitResult = OverscrolledApzc;
     result = nullptr;
   }
 
@@ -1408,7 +1559,17 @@
 }
 
 already_AddRefed<AsyncPanZoomController>
-APZCTreeManager::CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2)
+APZCTreeManager::GetMultitouchTarget(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2) const
+{
+  nsRefPtr<AsyncPanZoomController> apzc = CommonAncestor(aApzc1, aApzc2);
+  // For now, we only ever want to do pinching on the root APZC for a given layers id. So
+  // when we find the common ancestor of multiple points, also walk up to the root APZC.
+  apzc = RootAPZCForLayersId(apzc);
+  return apzc.forget();
+}
+
+already_AddRefed<AsyncPanZoomController>
+APZCTreeManager::CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2) const
 {
   MonitorAutoLock lock(mTreeLock);
   nsRefPtr<AsyncPanZoomController> ancestor;
@@ -1454,7 +1615,7 @@
 }
 
 already_AddRefed<AsyncPanZoomController>
-APZCTreeManager::RootAPZCForLayersId(AsyncPanZoomController* aApzc)
+APZCTreeManager::RootAPZCForLayersId(AsyncPanZoomController* aApzc) const
 {
   MonitorAutoLock lock(mTreeLock);
   nsRefPtr<AsyncPanZoomController> apzc = aApzc;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/APZCTreeManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/APZCTreeManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/APZCTreeManager.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/APZCTreeManager.h	2014-11-26 21:46:10.000000000 +0000
@@ -214,6 +214,20 @@
                             bool aPreventDefault);
 
   /**
+   * When the event regions code is enabled, this function should be invoked to
+   * to confirm the target of the input block. This is only needed in cases
+   * where the initial input event of the block hit a dispatch-to-content region
+   * but is safe to call for all input blocks. This function should always be
+   * invoked on the controller thread.
+   * The different elements in the array of targets correspond to the targets
+   * for the different touch points. In the case where the touch point has no
+   * target, or the target is not a scrollable frame, the target's |mScrollId|
+   * should be set to FrameMetrics::NULL_SCROLL_ID.
+   */
+  void SetTargetAPZC(uint64_t aInputBlockId,
+                     const nsTArray<ScrollableLayerGuid>& aTargets);
+
+  /**
    * Updates any zoom constraints contained in the <meta name="viewport"> tag.
    */
   void UpdateZoomConstraints(const ScrollableLayerGuid& aGuid,
@@ -373,9 +387,16 @@
      about it going away. These are public for testing code and generally should not be
      used by other production code.
   */
+  enum HitTestResult {
+    NoApzcHit,
+    ApzcHitRegion,
+    ApzcContentRegion,
+    OverscrolledApzc,
+  };
+
   already_AddRefed<AsyncPanZoomController> GetTargetAPZC(const ScrollableLayerGuid& aGuid);
   already_AddRefed<AsyncPanZoomController> GetTargetAPZC(const ScreenPoint& aPoint,
-                                                         bool* aOutInOverscrolledApzc);
+                                                         HitTestResult* aOutHitResult);
   gfx::Matrix4x4 GetScreenToApzcTransform(const AsyncPanZoomController *aApzc) const;
   gfx::Matrix4x4 GetApzcToGeckoTransform(const AsyncPanZoomController *aApzc) const;
 private:
@@ -384,11 +405,12 @@
   AsyncPanZoomController* FindTargetAPZC(AsyncPanZoomController* aApzc, const ScrollableLayerGuid& aGuid);
   AsyncPanZoomController* GetAPZCAtPoint(AsyncPanZoomController* aApzc,
                                          const gfx::Point& aHitTestPoint,
-                                         bool* aOutInOverscrolledApzc);
-  already_AddRefed<AsyncPanZoomController> CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2);
-  already_AddRefed<AsyncPanZoomController> RootAPZCForLayersId(AsyncPanZoomController* aApzc);
+                                         HitTestResult* aOutHitResult);
+  already_AddRefed<AsyncPanZoomController> GetMultitouchTarget(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2) const;
+  already_AddRefed<AsyncPanZoomController> CommonAncestor(AsyncPanZoomController* aApzc1, AsyncPanZoomController* aApzc2) const;
+  already_AddRefed<AsyncPanZoomController> RootAPZCForLayersId(AsyncPanZoomController* aApzc) const;
   already_AddRefed<AsyncPanZoomController> GetTouchInputBlockAPZC(const MultiTouchInput& aEvent,
-                                                                  bool* aOutInOverscrolledApzc);
+                                                                  HitTestResult* aOutHitResult);
   nsEventStatus ProcessTouchInput(MultiTouchInput& aInput,
                                   ScrollableLayerGuid* aOutTargetGuid,
                                   uint64_t* aOutInputBlockId);
@@ -450,10 +472,10 @@
    * input delivery thread, and so does not require locking.
    */
   nsRefPtr<AsyncPanZoomController> mApzcForInputBlock;
-  /* Whether the current input event block is being ignored because the touch-start
-   * was inside an overscrolled APZC.
+  /* The hit result for the current input event block; this should always be in
+   * sync with mApzcForInputBlock.
    */
-  bool mInOverscrolledApzc;
+  HitTestResult mHitResultForInputBlock;
   /* Sometimes we want to ignore all touches except one. In such cases, this
    * is set to the identifier of the touch we are not ignoring; in other cases,
    * this is set to -1.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -533,21 +533,9 @@
    * frame. Returns true if the fling animation should be advanced by one frame,
    * or false if there is no fling or the fling has ended.
    */
-  virtual bool Sample(FrameMetrics& aFrameMetrics,
-                      const TimeDuration& aDelta) MOZ_OVERRIDE
+  virtual bool DoSample(FrameMetrics& aFrameMetrics,
+                        const TimeDuration& aDelta) MOZ_OVERRIDE
   {
-    // If the fling is handed off to our APZC from a child, on the first call to
-    // Sample() aDelta might be negative because it's computed as the sample time
-    // from SampleContentTransformForFrame() minus our APZC's mLastSampleTime
-    // which is the time the child handed off the fling from its call to
-    // SampleContentTransformForFrame() with the same sample time. If we allow
-    // the negative aDelta to be processed, it will yield a displacement in the
-    // direction opposite to the fling, which can cause us to overscroll and
-    // hand off the fling to _our_ parent, which effectively kills the fling.
-    if (aDelta.ToMilliseconds() <= 0) {
-      return true;
-    }
-
     float friction = gfxPrefs::APZFlingFriction();
     float threshold = gfxPrefs::APZFlingStoppedThreshold();
 
@@ -655,8 +643,8 @@
     , mEndZoom(aEndZoom)
   {}
 
-  virtual bool Sample(FrameMetrics& aFrameMetrics,
-                      const TimeDuration& aDelta) MOZ_OVERRIDE
+  virtual bool DoSample(FrameMetrics& aFrameMetrics,
+                        const TimeDuration& aDelta) MOZ_OVERRIDE
   {
     mDuration += aDelta;
     double animPosition = mDuration / mTotalDuration;
@@ -712,8 +700,8 @@
     mApzc.mY.SetVelocity(aVelocity.y);
   }
 
-  virtual bool Sample(FrameMetrics& aFrameMetrics,
-                      const TimeDuration& aDelta) MOZ_OVERRIDE
+  virtual bool DoSample(FrameMetrics& aFrameMetrics,
+                        const TimeDuration& aDelta) MOZ_OVERRIDE
   {
     // Can't inline these variables due to short-circuit evaluation.
     bool continueX = mApzc.mX.SampleOverscrollAnimation(aDelta);
@@ -747,12 +735,7 @@
    * frame. Returns true if the smooth scroll should be advanced by one frame,
    * or false if the smooth scroll has ended.
    */
-  bool Sample(FrameMetrics& aFrameMetrics, const TimeDuration& aDelta) {
-
-    if (aDelta.ToMilliseconds() <= 0) {
-      return true;
-    }
-
+  bool DoSample(FrameMetrics& aFrameMetrics, const TimeDuration& aDelta) {
     if (mXAxisModel.IsFinished() && mYAxisModel.IsFinished()) {
       return false;
     }
@@ -1087,6 +1070,11 @@
     }
     break;
   }
+  case SCROLLWHEEL_INPUT: {
+    const ScrollWheelInput& scrollInput = aEvent.AsScrollWheelInput();
+    rv = OnScrollWheel(scrollInput);
+    break;
+  }
   default: return HandleGestureEvent(aEvent);
   }
 
@@ -1470,6 +1458,72 @@
   return false;
 }
 
+nsEventStatus AsyncPanZoomController::OnScrollWheel(const ScrollWheelInput& aEvent)
+{
+  double deltaX = aEvent.mDeltaX;
+  double deltaY = aEvent.mDeltaY;
+  switch (aEvent.mDeltaType) {
+    case ScrollWheelInput::SCROLLDELTA_LINE: {
+      LayoutDeviceIntSize scrollAmount = mFrameMetrics.GetLineScrollAmount();
+      deltaX *= scrollAmount.width;
+      deltaY *= scrollAmount.height;
+      break;
+    }
+    default:
+      MOZ_ASSERT_UNREACHABLE("unexpected scroll delta type");
+      return nsEventStatus_eConsumeNoDefault;
+  }
+
+  switch (aEvent.mScrollMode) {
+    case ScrollWheelInput::SCROLLMODE_INSTANT: {
+      // Decompose into pan events for simplicity.
+      PanGestureInput start(PanGestureInput::PANGESTURE_START, aEvent.mTime, aEvent.mTimeStamp,
+                            aEvent.mOrigin, ScreenPoint(0, 0), aEvent.modifiers);
+      start.mLocalPanStartPoint = aEvent.mLocalOrigin;
+      OnPanBegin(start);
+
+      // Pan gestures use natural directions which are inverted from scroll
+      // wheel and touchpad scroll gestures, so we invert x/y here. Since the
+      // zoom includes any device : css pixel zoom, we convert to CSS pixels
+      // before applying the zoom.
+      LayoutDevicePoint devicePixelDelta(-deltaX, -deltaY);
+      ParentLayerPoint delta = (devicePixelDelta / mFrameMetrics.mDevPixelsPerCSSPixel) *
+                               mFrameMetrics.GetZoom();
+
+      PanGestureInput move(PanGestureInput::PANGESTURE_PAN, aEvent.mTime, aEvent.mTimeStamp,
+                           aEvent.mOrigin,
+                           ToScreenCoordinates(delta, aEvent.mLocalOrigin),
+                           aEvent.modifiers);
+      move.mLocalPanStartPoint = aEvent.mLocalOrigin;
+      move.mLocalPanDisplacement = delta;
+      OnPan(move, false);
+
+      PanGestureInput end(PanGestureInput::PANGESTURE_END, aEvent.mTime, aEvent.mTimeStamp,
+                            aEvent.mOrigin, ScreenPoint(0, 0), aEvent.modifiers);
+      end.mLocalPanStartPoint = aEvent.mLocalOrigin;
+      OnPanEnd(start);
+      break;
+    }
+
+    case ScrollWheelInput::SCROLLMODE_SMOOTH: {
+      CSSPoint delta = LayoutDevicePoint(deltaX, deltaY) / mFrameMetrics.mDevPixelsPerCSSPixel;
+
+      // If we're already in a smooth scroll animation, don't cancel it. This
+      // lets us preserve the existing scrolling velocity.
+      if (mState != SMOOTH_SCROLL) {
+        CancelAnimation();
+        mFrameMetrics.SetSmoothScrollOffset(mFrameMetrics.GetScrollOffset() + delta);
+      } else {
+        mFrameMetrics.SetSmoothScrollOffset(mFrameMetrics.GetSmoothScrollOffset() + delta);
+      }
+      StartSmoothScroll();
+      break;
+    }
+  }
+
+  return nsEventStatus_eConsumeNoDefault;
+}
+
 nsEventStatus AsyncPanZoomController::OnPanMayBegin(const PanGestureInput& aEvent) {
   APZC_LOG("%p got a pan-maybegin in state %d\n", this, mState);
 
@@ -1502,7 +1556,7 @@
     CancelAnimation();
   }
 
-  mPanGestureState = MakeUnique<InputBlockState>(this);
+  mPanGestureState = MakeUnique<InputBlockState>(this, true);
 
   mX.StartTouch(aEvent.mLocalPanStartPoint.x, aEvent.mTime);
   mY.StartTouch(aEvent.mLocalPanStartPoint.y, aEvent.mTime);
@@ -1580,7 +1634,7 @@
     CancelAnimation();
   }
 
-  mPanGestureState = MakeUnique<InputBlockState>(this);
+  mPanGestureState = MakeUnique<InputBlockState>(this, true);
 
   return nsEventStatus_eConsumeNoDefault;
 }
@@ -2011,7 +2065,7 @@
                                                             true /* handoff */))) {
     // No one wanted the fling, so we "take it" ourselves by entering an
     // overscroll animation starting with the fling's velocity.
-    if (IsPannable()) {
+    if (IsPannable() && gfxPrefs::APZOverscrollEnabled()) {
       StartOverscrollAnimation(aVelocity);
     }
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/AsyncPanZoomController.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/AsyncPanZoomController.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/AsyncPanZoomController.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/AsyncPanZoomController.h	2014-11-26 21:46:10.000000000 +0000
@@ -20,6 +20,7 @@
 #include "InputData.h"
 #include "Axis.h"
 #include "InputQueue.h"
+#include "LayersTypes.h"
 #include "TaskThrottler.h"
 #include "mozilla/gfx/Matrix.h"
 #include "nsRegion.h"
@@ -414,6 +415,11 @@
   nsEventStatus OnPanMomentumEnd(const PanGestureInput& aEvent);
 
   /**
+   * Helper methods for handling scroll wheel events.
+   */
+  nsEventStatus OnScrollWheel(const ScrollWheelInput& aEvent);
+
+  /**
    * Helper methods for long press gestures.
    */
   nsEventStatus OnLongPress(const TapGestureInput& aEvent);
@@ -997,22 +1003,27 @@
    * hit-testing to see which APZC instance should handle touch events.
    */
 public:
-  void SetLayerHitTestData(const nsIntRegion& aRegion, const Matrix4x4& aTransformToLayer) {
-    mVisibleRegion = aRegion;
+  void SetLayerHitTestData(const EventRegions& aRegions, const Matrix4x4& aTransformToLayer) {
+    mEventRegions = aRegions;
     mAncestorTransform = aTransformToLayer;
   }
 
-  void AddHitTestRegion(const nsIntRegion& aRegion) {
-    mVisibleRegion.OrWith(aRegion);
+  void AddHitTestRegions(const EventRegions& aRegions) {
+    mEventRegions.OrWith(aRegions);
   }
 
   Matrix4x4 GetAncestorTransform() const {
     return mAncestorTransform;
   }
 
-  bool VisibleRegionContains(const ParentLayerPoint& aPoint) const {
+  bool HitRegionContains(const ParentLayerPoint& aPoint) const {
+    ParentLayerIntPoint point = RoundedToInt(aPoint);
+    return mEventRegions.mHitRegion.Contains(point.x, point.y);
+  }
+
+  bool DispatchToContentRegionContains(const ParentLayerPoint& aPoint) const {
     ParentLayerIntPoint point = RoundedToInt(aPoint);
-    return mVisibleRegion.Contains(point.x, point.y);
+    return mEventRegions.mDispatchToContentHitRegion.Contains(point.x, point.y);
   }
 
   bool IsOverscrolled() const {
@@ -1020,11 +1031,11 @@
   }
 
 private:
-  /* This is the union of the visible regions of the layers that this APZC
-   * corresponds to, in the screen pixels of those layers. (This is the same
-   * coordinate system in which this APZC receives events in
+  /* This is the union of the hit regions of the layers that this APZC
+   * corresponds to, in the local screen pixels of those layers. (This is the
+   * same coordinate system in which this APZC receives events in
    * ReceiveInputEvent()). */
-  nsIntRegion mVisibleRegion;
+  EventRegions mEventRegions;
   /* This is the cumulative CSS transform for all the layers from (and including)
    * the parent APZC down to (but excluding) this one. */
   Matrix4x4 mAncestorTransform;
@@ -1119,8 +1130,20 @@
     : mRepaintInterval(aRepaintInterval)
   { }
 
-  virtual bool Sample(FrameMetrics& aFrameMetrics,
-                      const TimeDuration& aDelta) = 0;
+  virtual bool DoSample(FrameMetrics& aFrameMetrics,
+                        const TimeDuration& aDelta) = 0;
+
+  bool Sample(FrameMetrics& aFrameMetrics,
+              const TimeDuration& aDelta) {
+    // In some situations, particularly when handoff is involved, it's possible
+    // for |aDelta| to be negative on the first call to sample. Ignore such a
+    // sample here, to avoid each derived class having to deal with this case.
+    if (aDelta.ToMilliseconds() <= 0) {
+      return true;
+    }
+
+    return DoSample(aFrameMetrics, aDelta);
+  }
 
   /**
    * Get the deferred tasks in |mDeferredTasks|. See |mDeferredTasks|
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputBlockState.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputBlockState.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputBlockState.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputBlockState.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -18,8 +18,10 @@
 
 static uint64_t sBlockCounter = InputBlockState::NO_BLOCK_ID + 1;
 
-InputBlockState::InputBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc)
+InputBlockState::InputBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc,
+                                 bool aTargetConfirmed)
   : mTargetApzc(aTargetApzc)
+  , mTargetConfirmed(aTargetConfirmed)
   , mBlockId(sBlockCounter++)
 {
   // We should never be constructed with a nullptr target.
@@ -27,6 +29,30 @@
   mOverscrollHandoffChain = mTargetApzc->BuildOverscrollHandoffChain();
 }
 
+bool
+InputBlockState::SetConfirmedTargetApzc(const nsRefPtr<AsyncPanZoomController>& aTargetApzc)
+{
+  if (mTargetConfirmed) {
+    return false;
+  }
+  mTargetConfirmed = true;
+
+  if (mTargetApzc == aTargetApzc) {
+    // The confirmed target is the same as the tentative one, so we're done.
+    return true;
+  }
+
+  // Log enabled by default for now, we will put it in a TBS_LOG eventually
+  // once this code is more baked
+  printf_stderr("%p replacing unconfirmed target %p with real target %p\n",
+      this, mTargetApzc.get(), aTargetApzc.get());
+
+  // note that aTargetApzc MAY be null here.
+  mTargetApzc = aTargetApzc;
+  mOverscrollHandoffChain = (mTargetApzc ? mTargetApzc->BuildOverscrollHandoffChain() : nullptr);
+  return true;
+}
+
 const nsRefPtr<AsyncPanZoomController>&
 InputBlockState::GetTargetApzc() const
 {
@@ -45,8 +71,15 @@
   return mBlockId;
 }
 
-TouchBlockState::TouchBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc)
-  : InputBlockState(aTargetApzc)
+bool
+InputBlockState::IsTargetConfirmed() const
+{
+  return mTargetConfirmed;
+}
+
+TouchBlockState::TouchBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc,
+                                 bool aTargetConfirmed)
+  : InputBlockState(aTargetApzc, aTargetConfirmed)
   , mAllowedTouchBehaviorSet(false)
   , mPreventDefault(false)
   , mContentResponded(false)
@@ -110,6 +143,9 @@
 bool
 TouchBlockState::IsReadyForHandling() const
 {
+  if (!IsTargetConfirmed()) {
+    return false;
+  }
   // TODO: for long-tap blocks we probably don't need the touch behaviour?
   if (gfxPrefs::TouchActionEnabled() && !mAllowedTouchBehaviorSet) {
     return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputBlockState.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputBlockState.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputBlockState.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputBlockState.h	2014-11-26 21:46:10.000000000 +0000
@@ -26,14 +26,20 @@
 public:
   static const uint64_t NO_BLOCK_ID = 0;
 
-  explicit InputBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc);
+  explicit InputBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc,
+                           bool aTargetConfirmed);
 
+  bool SetConfirmedTargetApzc(const nsRefPtr<AsyncPanZoomController>& aTargetApzc);
   const nsRefPtr<AsyncPanZoomController>& GetTargetApzc() const;
   const nsRefPtr<const OverscrollHandoffChain>& GetOverscrollHandoffChain() const;
   uint64_t GetBlockId() const;
+
+protected:
+  bool IsTargetConfirmed() const;
 private:
   nsRefPtr<AsyncPanZoomController> mTargetApzc;
   nsRefPtr<const OverscrollHandoffChain> mOverscrollHandoffChain;
+  bool mTargetConfirmed;
   const uint64_t mBlockId;
 };
 
@@ -73,7 +79,8 @@
 public:
   typedef uint32_t TouchBehaviorFlags;
 
-  explicit TouchBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc);
+  explicit TouchBlockState(const nsRefPtr<AsyncPanZoomController>& aTargetApzc,
+                           bool aTargetConfirmed);
 
   /**
    * Record whether or not content cancelled this block of events.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputQueue.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputQueue.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputQueue.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputQueue.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "AsyncPanZoomController.h"
 #include "gfxPrefs.h"
 #include "InputBlockState.h"
+#include "LayersLogging.h"
 #include "OverscrollHandoffState.h"
 
 #define INPQ_LOG(...)
@@ -26,18 +27,23 @@
 }
 
 nsEventStatus
-InputQueue::ReceiveInputEvent(const nsRefPtr<AsyncPanZoomController>& aTarget, const InputData& aEvent, uint64_t* aOutInputBlockId) {
+InputQueue::ReceiveInputEvent(const nsRefPtr<AsyncPanZoomController>& aTarget,
+                              bool aTargetConfirmed,
+                              const InputData& aEvent,
+                              uint64_t* aOutInputBlockId) {
   AsyncPanZoomController::AssertOnControllerThread();
 
   if (aEvent.mInputType != MULTITOUCH_INPUT) {
     // The return value for non-touch input is only used by tests, so just pass
     // through the return value for now. This can be changed later if needed.
+    // TODO (bug 1098430): we will eventually need to have smarter handling for
+    // non-touch events as well.
     return aTarget->HandleInputEvent(aEvent);
   }
 
   TouchBlockState* block = nullptr;
   if (aEvent.AsMultiTouchInput().mType == MultiTouchInput::MULTITOUCH_START) {
-    block = StartNewTouchBlock(aTarget, false);
+    block = StartNewTouchBlock(aTarget, aTargetConfirmed, false);
     INPQ_LOG("started new touch block %p for target %p\n", block, aTarget.get());
 
     // We want to cancel animations here as soon as possible (i.e. without waiting for
@@ -47,6 +53,9 @@
     // being processed) we only do this animation-cancellation if there are no older
     // touch blocks still in the queue.
     if (block == CurrentTouchBlock()) {
+      // XXX using the chain from |block| here may be wrong in cases where the
+      // target isn't confirmed and the real target turns out to be something
+      // else. For now assume this is rare enough that it's not an issue.
       if (block->GetOverscrollHandoffChain()->HasFastMovingApzc()) {
         // If we're already in a fast fling, then we want the touch event to stop the fling
         // and to disallow the touch event from being used as part of a fling.
@@ -55,10 +64,16 @@
       block->GetOverscrollHandoffChain()->CancelAnimations();
     }
 
-    if (aTarget->NeedToWaitForContent()) {
-      // Content may intercept the touch events and prevent-default them. So we schedule
-      // a timeout to give content time to do that.
-      ScheduleContentResponseTimeout(aTarget, block->GetBlockId());
+    bool waitForMainThread = !aTargetConfirmed;
+    if (!gfxPrefs::LayoutEventRegionsEnabled()) {
+      waitForMainThread |= aTarget->NeedToWaitForContent();
+    }
+    if (waitForMainThread) {
+      // We either don't know for sure if aTarget is the right APZC, or we may
+      // need to wait to give content the opportunity to prevent-default the
+      // touch events. Either way we schedule a timeout so the main thread stuff
+      // can run.
+      ScheduleMainThreadTimeout(aTarget, block->GetBlockId());
     } else {
       // Content won't prevent-default this, so we can just pretend like we scheduled
       // a timeout and it expired. Note that we will still receive a ContentReceivedTouch
@@ -81,17 +96,27 @@
     *aOutInputBlockId = block->GetBlockId();
   }
 
-  nsEventStatus result = aTarget->ArePointerEventsConsumable(block, aEvent.AsMultiTouchInput().mTouches.Length())
-      ? nsEventStatus_eConsumeDoDefault
-      : nsEventStatus_eIgnore;
+  // Note that the |aTarget| the APZCTM sent us may contradict the confirmed
+  // target set on the block. In this case the confirmed target (which may be
+  // null) should take priority. This is equivalent to just always using the
+  // target (confirmed or not) from the block.
+  nsRefPtr<AsyncPanZoomController> target = block->GetTargetApzc();
+
+  nsEventStatus result = nsEventStatus_eIgnore;
+  // XXX calling ArePointerEventsConsumable on |target| may be wrong here if
+  // the target isn't confirmed and the real target turns out to be something
+  // else. For now assume this is rare enough that it's not an issue.
+  if (target && target->ArePointerEventsConsumable(block, aEvent.AsMultiTouchInput().mTouches.Length())) {
+    result = nsEventStatus_eConsumeDoDefault;
+  }
 
   if (block == CurrentTouchBlock() && block->IsReadyForHandling()) {
-    INPQ_LOG("current touch block is ready with preventdefault %d\n",
-        block->IsDefaultPrevented());
-    if (block->IsDefaultPrevented()) {
+    INPQ_LOG("current touch block is ready with target %p preventdefault %d\n",
+        target.get(), block->IsDefaultPrevented());
+    if (!target || block->IsDefaultPrevented()) {
       return result;
     }
-    aTarget->HandleInputEvent(aEvent);
+    target->HandleInputEvent(aEvent);
     return result;
   }
 
@@ -103,17 +128,21 @@
 uint64_t
 InputQueue::InjectNewTouchBlock(AsyncPanZoomController* aTarget)
 {
-  TouchBlockState* block = StartNewTouchBlock(aTarget, true);
+  TouchBlockState* block = StartNewTouchBlock(aTarget,
+    /* aTargetConfirmed = */ true,
+    /* aCopyAllowedTouchBehaviorFromCurrent = */ true);
   INPQ_LOG("%p injecting new touch block with id %" PRIu64 " and target %p\n",
     this, block->GetBlockId(), aTarget);
-  ScheduleContentResponseTimeout(aTarget, block->GetBlockId());
+  ScheduleMainThreadTimeout(aTarget, block->GetBlockId());
   return block->GetBlockId();
 }
 
 TouchBlockState*
-InputQueue::StartNewTouchBlock(const nsRefPtr<AsyncPanZoomController>& aTarget, bool aCopyAllowedTouchBehaviorFromCurrent)
+InputQueue::StartNewTouchBlock(const nsRefPtr<AsyncPanZoomController>& aTarget,
+                               bool aTargetConfirmed,
+                               bool aCopyAllowedTouchBehaviorFromCurrent)
 {
-  TouchBlockState* newBlock = new TouchBlockState(aTarget);
+  TouchBlockState* newBlock = new TouchBlockState(aTarget, aTargetConfirmed);
   if (gfxPrefs::TouchActionEnabled() && aCopyAllowedTouchBehaviorFromCurrent) {
     newBlock->CopyAllowedTouchBehaviorsFrom(*CurrentTouchBlock());
   }
@@ -150,22 +179,26 @@
 }
 
 void
-InputQueue::ScheduleContentResponseTimeout(const nsRefPtr<AsyncPanZoomController>& aTarget, uint64_t aInputBlockId) {
-  INPQ_LOG("scheduling content response timeout for target %p\n", aTarget.get());
+InputQueue::ScheduleMainThreadTimeout(const nsRefPtr<AsyncPanZoomController>& aTarget, uint64_t aInputBlockId) {
+  INPQ_LOG("scheduling main thread timeout for target %p\n", aTarget.get());
   aTarget->PostDelayedTask(
-    NewRunnableMethod(this, &InputQueue::ContentResponseTimeout, aInputBlockId),
+    NewRunnableMethod(this, &InputQueue::MainThreadTimeout, aInputBlockId),
     gfxPrefs::APZContentResponseTimeout());
 }
 
 void
-InputQueue::ContentResponseTimeout(const uint64_t& aInputBlockId) {
+InputQueue::MainThreadTimeout(const uint64_t& aInputBlockId) {
   AsyncPanZoomController::AssertOnControllerThread();
 
-  INPQ_LOG("got a content response timeout; block=%" PRIu64 "\n", aInputBlockId);
+  INPQ_LOG("got a main thread timeout; block=%" PRIu64 "\n", aInputBlockId);
   bool success = false;
   for (size_t i = 0; i < mTouchBlockQueue.Length(); i++) {
     if (mTouchBlockQueue[i]->GetBlockId() == aInputBlockId) {
+      // time out the touch-listener response and also confirm the existing
+      // target apzc in the case where the main thread doesn't get back to us
+      // fast enough.
       success = mTouchBlockQueue[i]->TimeoutContentResponse();
+      success |= mTouchBlockQueue[i]->SetConfirmedTargetApzc(mTouchBlockQueue[i]->GetTargetApzc());
       break;
     }
   }
@@ -192,6 +225,26 @@
 }
 
 void
+InputQueue::SetConfirmedTargetApzc(uint64_t aInputBlockId, const nsRefPtr<AsyncPanZoomController>& aTargetApzc) {
+  AsyncPanZoomController::AssertOnControllerThread();
+
+  INPQ_LOG("got a target apzc; block=%" PRIu64 " guid=%s\n",
+    aInputBlockId, aTargetApzc ? Stringify(aTargetApzc->GetGuid()).c_str() : "");
+  bool success = false;
+  for (size_t i = 0; i < mTouchBlockQueue.Length(); i++) {
+    if (mTouchBlockQueue[i]->GetBlockId() == aInputBlockId) {
+      success = mTouchBlockQueue[i]->SetConfirmedTargetApzc(aTargetApzc);
+      break;
+    }
+  }
+  if (success) {
+    ProcessPendingInputBlocks();
+  } else {
+    NS_WARNING("INPQ received useless SetConfirmedTargetApzc");
+  }
+}
+
+void
 InputQueue::SetAllowedTouchBehavior(uint64_t aInputBlockId, const nsTArray<TouchBehaviorFlags>& aBehaviors) {
   AsyncPanZoomController::AssertOnControllerThread();
 
@@ -224,7 +277,11 @@
         curBlock, curBlock->IsDefaultPrevented(),
         curBlock->GetTargetApzc().get());
     nsRefPtr<AsyncPanZoomController> target = curBlock->GetTargetApzc();
-    if (curBlock->IsDefaultPrevented()) {
+    // target may be null here if the initial target was unconfirmed and then
+    // we later got a confirmed null target. in that case drop the events.
+    if (!target) {
+      curBlock->DropEvents();
+    } else if (curBlock->IsDefaultPrevented()) {
       curBlock->DropEvents();
       target->ResetInputState();
     } else {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputQueue.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputQueue.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/src/InputQueue.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/src/InputQueue.h	2014-11-26 21:46:10.000000000 +0000
@@ -41,7 +41,10 @@
    * See the documentation on APZCTreeManager::ReceiveInputEvent for info on
    * return values from this function, including |aOutInputBlockId|.
    */
-  nsEventStatus ReceiveInputEvent(const nsRefPtr<AsyncPanZoomController>& aTarget, const InputData& aEvent, uint64_t* aOutInputBlockId);
+  nsEventStatus ReceiveInputEvent(const nsRefPtr<AsyncPanZoomController>& aTarget,
+                                  bool aTargetConfirmed,
+                                  const InputData& aEvent,
+                                  uint64_t* aOutInputBlockId);
   /**
    * This function should be invoked to notify the InputQueue when web content
    * decides whether or not it wants to cancel a block of events. The block
@@ -49,6 +52,14 @@
    */
   void ContentReceivedTouch(uint64_t aInputBlockId, bool aPreventDefault);
   /**
+   * This function should be invoked to notify the InputQueue once the target
+   * APZC to handle an input block has been confirmed. In practice this should
+   * generally be decidable upon receipt of the input event, but in some cases
+   * we may need to query the layout engine to know for sure. The input block
+   * this applies to should be specified via the |aInputBlockId| parameter.
+   */
+  void SetConfirmedTargetApzc(uint64_t aInputBlockId, const nsRefPtr<AsyncPanZoomController>& aTargetApzc);
+  /**
    * This function should be invoked to notify the InputQueue of the touch-
    * action properties for the different touch points in an input block. The
    * input block this applies to should be specified by the |aInputBlockId|
@@ -76,9 +87,11 @@
 
 private:
   ~InputQueue();
-  TouchBlockState* StartNewTouchBlock(const nsRefPtr<AsyncPanZoomController>& aTarget, bool aCopyAllowedTouchBehaviorFromCurrent);
-  void ScheduleContentResponseTimeout(const nsRefPtr<AsyncPanZoomController>& aTarget, uint64_t aInputBlockId);
-  void ContentResponseTimeout(const uint64_t& aInputBlockId);
+  TouchBlockState* StartNewTouchBlock(const nsRefPtr<AsyncPanZoomController>& aTarget,
+                                      bool aTargetConfirmed,
+                                      bool aCopyAllowedTouchBehaviorFromCurrent);
+  void ScheduleMainThreadTimeout(const nsRefPtr<AsyncPanZoomController>& aTarget, uint64_t aInputBlockId);
+  void MainThreadTimeout(const uint64_t& aInputBlockId);
   void ProcessPendingInputBlocks();
 
 private:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/testutil/APZTestData.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/testutil/APZTestData.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/testutil/APZTestData.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/testutil/APZTestData.h	2014-11-26 21:46:10.000000000 +0000
@@ -42,10 +42,9 @@
   friend struct APZTestDataToJSConverter;
 public:
   void StartNewPaint(SequenceNumber aSequenceNumber) {
+    // We should never get more than one paint with the same sequence number.
+    MOZ_ASSERT(mPaints.find(aSequenceNumber) == mPaints.end());
     mPaints.insert(DataStore::value_type(aSequenceNumber, Bucket()));
-    // TODO(botond): MOZ_ASSERT() that we didn't already have a paint with this
-    // sequence number once we get rid ofAPZCTreeManager::UpdatePanZoomControllerTree()
-    // calls for repeat transactions (bug 1007728).
   }
   void LogTestDataForPaint(SequenceNumber aSequenceNumber,
                            ViewID aScrollId,
@@ -93,10 +92,9 @@
     }
     Bucket& bucket = bucketIterator->second;
     ScrollFrameData& scrollFrameData = bucket[aScrollId];  // create if doesn't exist
+    MOZ_ASSERT(scrollFrameData.find(aKey) == scrollFrameData.end()
+            || scrollFrameData[aKey] == aValue);
     scrollFrameData.insert(ScrollFrameData::value_type(aKey, aValue));
-    // TODO(botond): MOZ_ASSERT() that we don't already have this key once we
-    // get rid of APZCTreeManager::UpdatePanZoomControllerTree() calls for
-    // repeat transactions (bug 1007728).
   }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -5,7 +5,6 @@
 
 #include "APZCCallbackHelper.h"
 #include "gfxPlatform.h" // For gfxPlatform::UseTiling
-#include "gfxPrefs.h"    // For gfxPrefs::LayersTileWidth/Height
 #include "nsIScrollableFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsIDOMElement.h"
@@ -158,16 +157,11 @@
         return;
     }
 
-    gfx::IntSize alignment = gfxPlatform::GetPlatform()->UseTiling()
-        ? gfx::IntSize(gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight()) :
-          gfx::IntSize(0, 0);
     ScreenMargin margins = aMetrics.GetDisplayPortMargins();
     aUtils->SetDisplayPortMarginsForElement(margins.left,
                                             margins.top,
                                             margins.right,
                                             margins.bottom,
-                                            alignment.width,
-                                            alignment.height,
                                             element, 0);
     CSSRect baseCSS = aMetrics.CalculateCompositedRectInCssPixels();
     nsRect base(baseCSS.x * nsPresContext::AppUnitsPerCSSPixel(),
@@ -207,16 +201,11 @@
         } else {
             RecenterDisplayPort(aMetrics);
         }
-        gfx::IntSize alignment = gfxPlatform::GetPlatform()->UseTiling()
-            ? gfx::IntSize(gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight()) :
-              gfx::IntSize(0, 0);
         ScreenMargin margins = aMetrics.GetDisplayPortMargins();
         utils->SetDisplayPortMarginsForElement(margins.left,
                                                margins.top,
                                                margins.right,
                                                margins.bottom,
-                                               alignment.width,
-                                               alignment.height,
                                                element, 0);
         CSSRect baseCSS = aMetrics.CalculateCompositedRectInCssPixels();
         nsRect base(baseCSS.x * nsPresContext::AppUnitsPerCSSPixel(),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/basic/BasicCompositor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/basic/BasicCompositor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/basic/BasicCompositor.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/basic/BasicCompositor.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -17,8 +17,8 @@
 #include <algorithm>
 #include "ImageContainer.h"
 #include "gfxPrefs.h"
-#define PIXMAN_DONT_DEFINE_STDINT
-#include "pixman.h"                     // for pixman_f_transform, etc
+#include "skia/SkCanvas.h"              // for SkCanvas
+#include "skia/SkBitmapDevice.h"        // for SkBitmapDevice
 
 namespace mozilla {
 using namespace mozilla::gfx;
@@ -76,6 +76,15 @@
   MOZ_COUNT_DTOR(BasicCompositor);
 }
 
+void
+BasicCompositingRenderTarget::BindRenderTarget()
+{
+  if (mClearOnBind) {
+    mDrawTarget->ClearRect(Rect(0, 0, mSize.width, mSize.height));
+    mClearOnBind = false;
+  }
+}
+
 void BasicCompositor::Destroy()
 {
   mWidget->CleanupRemoteDrawing();
@@ -159,75 +168,62 @@
                    mode, aMask, aMaskTransform, &matrix);
 }
 
-static pixman_transform
-Matrix3DToPixman(const gfx3DMatrix& aMatrix)
+static SkMatrix
+Matrix3DToSkia(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;
+  SkMatrix transform;
+  transform.setAll(aMatrix._11,
+                   aMatrix._21,
+                   aMatrix._41,
+                   aMatrix._12,
+                   aMatrix._22,
+                   aMatrix._42,
+                   aMatrix._14,
+                   aMatrix._24,
+                   aMatrix._44);
 
-  pixman_transform result;
-  pixman_transform_from_pixman_f_transform(&result, &transform);
-
-  return result;
+  return transform;
 }
 
 static void
-PixmanTransform(DataSourceSurface* aDest,
-                DataSourceSurface* aSource,
-                const gfx3DMatrix& aTransform,
-                const Point& aDestOffset)
+SkiaTransform(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);
+  if (aTransform.IsSingular()) {
     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);
+  IntSize destSize = aDest->GetSize();
+  SkImageInfo destInfo = SkImageInfo::Make(destSize.width,
+                                           destSize.height,
+                                           kBGRA_8888_SkColorType,
+                                           kPremul_SkAlphaType);
+  SkBitmap destBitmap;
+  destBitmap.setInfo(destInfo, aDest->Stride());
+  destBitmap.setPixels((uint32_t*)aDest->GetData());
+  SkCanvas destCanvas(destBitmap);
 
-  pixman_image_unref(dest);
-  pixman_image_unref(src);
+  IntSize srcSize = aSource->GetSize();
+  SkImageInfo srcInfo = SkImageInfo::Make(srcSize.width,
+                                          srcSize.height,
+                                          kBGRA_8888_SkColorType,
+                                          kPremul_SkAlphaType);
+  SkBitmap src;
+  src.setInfo(srcInfo, aSource->Stride());
+  src.setPixels((uint32_t*)aSource->GetData());
+
+  gfx3DMatrix transform = aTransform;
+  transform.TranslatePost(Point3D(-aDestOffset.x, -aDestOffset.y, 0));
+  destCanvas.setMatrix(Matrix3DToSkia(transform));
+
+  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);
 }
 
 static inline IntRect
@@ -368,12 +364,12 @@
     RefPtr<SourceSurface> snapshot = dest->Snapshot();
     RefPtr<DataSourceSurface> source = snapshot->GetDataSurface();
     RefPtr<DataSourceSurface> temp =
-      Factory::CreateDataSourceSurface(RoundOut(transformBounds).Size(), SurfaceFormat::B8G8R8A8);
+      Factory::CreateDataSourceSurface(RoundOut(transformBounds).Size(), SurfaceFormat::B8G8R8A8, true);
     if (NS_WARN_IF(!temp)) {
       return;
     }
 
-    PixmanTransform(temp, source, new3DTransform, transformBounds.TopLeft());
+    SkiaTransform(temp, source, new3DTransform, transformBounds.TopLeft());
 
     transformBounds.MoveTo(0, 0);
     buffer->DrawSurface(temp, transformBounds, transformBounds);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/basic/BasicCompositor.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/basic/BasicCompositor.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/basic/BasicCompositor.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/basic/BasicCompositor.h	2014-11-26 21:46:10.000000000 +0000
@@ -27,6 +27,8 @@
 
   virtual gfx::IntSize GetSize() const MOZ_OVERRIDE { return mSize; }
 
+  void BindRenderTarget();
+
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE
   {
     return mDrawTarget ? mDrawTarget->GetFormat()
@@ -73,6 +75,7 @@
   virtual void SetRenderTarget(CompositingRenderTarget *aSource) MOZ_OVERRIDE
   {
     mRenderTarget = static_cast<BasicCompositingRenderTarget*>(aSource);
+    mRenderTarget->BindRenderTarget();
   }
   virtual CompositingRenderTarget* GetCurrentRenderTarget() const MOZ_OVERRIDE
   {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/basic/BasicLayerManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/basic/BasicLayerManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/basic/BasicLayerManager.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/basic/BasicLayerManager.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -46,9 +46,8 @@
 #include "nsRect.h"                     // for nsIntRect
 #include "nsRegion.h"                   // for nsIntRegion, etc
 #include "nsTArray.h"                   // for nsAutoTArray
-#define PIXMAN_DONT_DEFINE_STDINT
-#include "pixman.h"                     // for pixman_f_transform, etc
-
+#include "skia/SkCanvas.h"              // for SkCanvas
+#include "skia/SkBitmapDevice.h"        // for SkBitmapDevice
 class nsIWidget;
 
 namespace mozilla {
@@ -528,13 +527,10 @@
 
     PaintLayer(mTarget, mRoot, aCallback, aCallbackData);
     if (!mRegionToClear.IsEmpty()) {
-      AutoSetOperator op(mTarget, gfxContext::OPERATOR_CLEAR);
       nsIntRegionRectIterator iter(mRegionToClear);
       const nsIntRect *r;
       while ((r = iter.Next())) {
-        mTarget->NewPath();
-        mTarget->Rectangle(gfxRect(r->x, r->y, r->width, r->height));
-        mTarget->Fill();
+        mTarget->GetDrawTarget()->ClearRect(Rect(r->x, r->y, r->width, r->height));
       }
     }
     if (mWidget) {
@@ -605,75 +601,62 @@
   mRoot = aLayer;
 }
 
-static pixman_transform
-BasicLayerManager_Matrix3DToPixman(const gfx3DMatrix& aMatrix)
+static SkMatrix
+BasicLayerManager_Matrix3DToSkia(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;
+  SkMatrix transform;
+  transform.setAll(aMatrix._11,
+                   aMatrix._21,
+                   aMatrix._41,
+                   aMatrix._12,
+                   aMatrix._22,
+                   aMatrix._42,
+                   aMatrix._14,
+                   aMatrix._24,
+                   aMatrix._44);
 
-  pixman_transform result;
-  pixman_transform_from_pixman_f_transform(&result, &transform);
-
-  return result;
+  return transform;
 }
 
 static void
-PixmanTransform(const gfxImageSurface* aDest,
-                RefPtr<DataSourceSurface> aSrc,
-                const gfx3DMatrix& aTransform,
-                gfxPoint aDestOffset)
+SkiaTransform(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);
+  if (aTransform.IsSingular()) {
     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);
+  IntSize destSize = ToIntSize(aDest->GetSize());
+  SkImageInfo destInfo = SkImageInfo::Make(destSize.width,
+                                           destSize.height,
+                                           kBGRA_8888_SkColorType,
+                                           kPremul_SkAlphaType);
+  SkBitmap destBitmap;
+  destBitmap.setInfo(destInfo, aDest->Stride());
+  destBitmap.setPixels((uint32_t*)aDest->Data());
+  SkCanvas destCanvas(destBitmap);
 
-  pixman_image_unref(dest);
-  pixman_image_unref(src);
+  IntSize srcSize = aSrc->GetSize();
+  SkImageInfo srcInfo = SkImageInfo::Make(srcSize.width,
+                                          srcSize.height,
+                                          kBGRA_8888_SkColorType,
+                                          kPremul_SkAlphaType);
+  SkBitmap src;
+  src.setInfo(srcInfo, aSrc->Stride());
+  src.setPixels((uint32_t*)aSrc->GetData());
+
+  gfx3DMatrix transform = aTransform;
+  transform.TranslatePost(Point3D(-aDestOffset.x, -aDestOffset.y, 0));
+  destCanvas.setMatrix(BasicLayerManager_Matrix3DToSkia(transform));
+
+  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);
 }
 
 /**
@@ -716,7 +699,7 @@
   gfx3DMatrix translation = gfx3DMatrix::Translation(aBounds.x, aBounds.y, 0);
 
   // Transform the content and offset it such that the content begins at the origin.
-  PixmanTransform(destImage, aSource->GetDataSurface(), translation * aTransform, offset);
+  SkiaTransform(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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ClientImageLayer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ClientImageLayer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ClientImageLayer.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ClientImageLayer.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -101,33 +101,22 @@
     }
 
     if (mContainer->IsAsync()) {
-      mImageClientTypeContainer = CompositableType::BUFFER_BRIDGE;
-      return mImageClientTypeContainer;
-    }
-
-    // Since D3D11 TextureClient doesn't have an internal buffer, modifying the
-    // front buffer directly may break the transactional property of layer updates.
-    if (ClientManager()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D11) {
-      mImageClientTypeContainer = CompositableType::BUFFER_IMAGE_BUFFERED;
+      mImageClientTypeContainer = CompositableType::IMAGE_BRIDGE;
       return mImageClientTypeContainer;
     }
 
     AutoLockImage autoLock(mContainer);
 
 #ifdef MOZ_WIDGET_GONK
-    // gralloc buffer needs CompositableType::BUFFER_IMAGE_BUFFERED to prevent
-    // the buffer's usage conflict.
     if (autoLock.GetImage()->GetFormat() == ImageFormat::OVERLAY_IMAGE) {
       mImageClientTypeContainer = CompositableType::IMAGE_OVERLAY;
       return mImageClientTypeContainer;
     }
-
-    mImageClientTypeContainer = autoLock.GetImage() ?
-                                  CompositableType::BUFFER_IMAGE_BUFFERED : CompositableType::BUFFER_UNKNOWN;
-#else
-    mImageClientTypeContainer = autoLock.GetImage() ?
-                                  CompositableType::BUFFER_IMAGE_SINGLE : CompositableType::BUFFER_UNKNOWN;
 #endif
+
+  	mImageClientTypeContainer = autoLock.GetImage()
+							  ? CompositableType::IMAGE
+							  : CompositableType::BUFFER_UNKNOWN;
     return mImageClientTypeContainer;
   }
 
@@ -163,7 +152,7 @@
     mImageClient = ImageClient::CreateImageClient(type,
                                                   ClientManager()->AsShadowForwarder(),
                                                   flags);
-    if (type == CompositableType::BUFFER_BRIDGE) {
+    if (type == CompositableType::IMAGE_BRIDGE) {
       static_cast<ImageClientBridge*>(mImageClient.get())->SetLayer(this);
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ClientLayerManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ClientLayerManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ClientLayerManager.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ClientLayerManager.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -662,8 +662,8 @@
   }
 
   mTexturePools.AppendElement(
-      new TextureClientPool(aFormat, IntSize(gfxPrefs::LayersTileWidth(),
-                                             gfxPrefs::LayersTileHeight()),
+      new TextureClientPool(aFormat, IntSize(gfxPlatform::GetPlatform()->GetTileWidth(),
+                                             gfxPlatform::GetPlatform()->GetTileHeight()),
                             gfxPrefs::LayersTileMaxPoolSize(),
                             gfxPrefs::LayersTileShrinkPoolTimeout(),
                             mForwarder));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -350,7 +350,9 @@
     // we always have valid content or transparent pixels to sample from.
     nsIntRect bounds = neededRegion.GetBounds();
     nsIntRect wholeTiles = bounds;
-    wholeTiles.Inflate(nsIntSize(gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight()));
+    wholeTiles.Inflate(nsIntSize(
+      gfxPlatform::GetPlatform()->GetTileWidth(),
+      gfxPlatform::GetPlatform()->GetTileHeight()));
     nsIntRect padded = bounds;
     padded.Inflate(1);
     padded.IntersectRect(padded, wholeTiles);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ImageClient.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ImageClient.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ImageClient.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ImageClient.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -49,13 +49,9 @@
   RefPtr<ImageClient> result = nullptr;
   switch (aCompositableHostType) {
   case CompositableType::IMAGE:
-  case CompositableType::BUFFER_IMAGE_SINGLE:
     result = new ImageClientSingle(aForwarder, aFlags, CompositableType::IMAGE);
     break;
-  case CompositableType::BUFFER_IMAGE_BUFFERED:
-    result = new ImageClientBuffered(aForwarder, aFlags, CompositableType::IMAGE);
-    break;
-  case CompositableType::BUFFER_BRIDGE:
+  case CompositableType::IMAGE_BRIDGE:
     result = new ImageClientBridge(aForwarder, aFlags);
     break;
   case CompositableType::BUFFER_UNKNOWN:
@@ -116,13 +112,6 @@
 {
 }
 
-ImageClientBuffered::ImageClientBuffered(CompositableForwarder* aFwd,
-                                         TextureFlags aFlags,
-                                         CompositableType aType)
-  : ImageClientSingle(aFwd, aFlags, aType)
-{
-}
-
 TextureInfo ImageClientSingle::GetTextureInfo() const
 {
   return TextureInfo(CompositableType::IMAGE);
@@ -148,34 +137,10 @@
   }
 }
 
-void
-ImageClientBuffered::FlushAllImages(bool aExceptFront,
-                                    AsyncTransactionTracker* aAsyncTransactionTracker)
-{
-  if (!aExceptFront && mFrontBuffer) {
-    RemoveTexture(mFrontBuffer);
-    mFrontBuffer = nullptr;
-  }
-  if (mBackBuffer) {
-    RemoveTextureWithTracker(mBackBuffer, aAsyncTransactionTracker);
-    mBackBuffer = nullptr;
-  }
-}
-
-bool
-ImageClientSingle::UpdateImage(ImageContainer* aContainer,
-                               uint32_t aContentFlags)
-{
-  bool isSwapped = false;
-  return UpdateImageInternal(aContainer, aContentFlags, &isSwapped);
-}
-
 bool
-ImageClientSingle::UpdateImageInternal(ImageContainer* aContainer,
-                                       uint32_t aContentFlags, bool* aIsSwapped)
+ImageClientSingle::UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags)
 {
   AutoLockImage autoLock(aContainer);
-  *aIsSwapped = false;
 
   Image *image = autoLock.GetImage();
   if (!image) {
@@ -186,187 +151,102 @@
     return true;
   }
 
-  AutoRemoveTexture autoRemoveTexture(this);
+  RefPtr<TextureClient> texture = image->AsSharedImage()
+                                ? image->AsSharedImage()->GetTextureClient(this)
+                                : nullptr;
 
-  if (image->AsSharedImage() && image->AsSharedImage()->GetTextureClient(this)) {
-    // fast path: no need to allocate and/or copy image data
-    RefPtr<TextureClient> texture = image->AsSharedImage()->GetTextureClient(this);
-    if (texture != mFrontBuffer) {
-      autoRemoveTexture.mTexture = mFrontBuffer;
-    }
-    mFrontBuffer = texture;
-    if (!AddTextureClient(texture)) {
-      mFrontBuffer = nullptr;
-      return false;
-    }
-    GetForwarder()->UpdatedTexture(this, texture, nullptr);
-    GetForwarder()->UseTexture(this, texture);
-  } else if (image->GetFormat() == ImageFormat::PLANAR_YCBCR) {
-    PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image);
-    const PlanarYCbCrData* data = ycbcr->GetData();
-    if (!data) {
-      return false;
-    }
-
-    if (mFrontBuffer && mFrontBuffer->IsImmutable()) {
-      autoRemoveTexture.mTexture = mFrontBuffer;
-      mFrontBuffer = nullptr;
-    }
+  AutoRemoveTexture autoRemoveTexture(this);
+  if (texture != mFrontBuffer) {
+    autoRemoveTexture.mTexture = mFrontBuffer;
+    mFrontBuffer = nullptr;
+  }
 
-    bool bufferCreated = false;
-    if (!mFrontBuffer) {
-      gfx::IntSize ySize(data->mYSize.width, data->mYSize.height);
-      gfx::IntSize cbCrSize(data->mCbCrSize.width, data->mCbCrSize.height);
-      mFrontBuffer = TextureClient::CreateForYCbCr(GetForwarder(),
-                                                   ySize, cbCrSize, data->mStereoMode,
-                                                   TextureFlags::DEFAULT|mTextureFlags);
-      if (!mFrontBuffer) {
+  if (!texture) {
+    // Slow path, we should not be hitting it very often and if we do it means
+    // we are using an Image class that is not backed by textureClient and we
+    // should fix it.
+    if (image->GetFormat() == ImageFormat::PLANAR_YCBCR) {
+      PlanarYCbCrImage* ycbcr = static_cast<PlanarYCbCrImage*>(image);
+      const PlanarYCbCrData* data = ycbcr->GetData();
+      if (!data) {
         return false;
       }
-      bufferCreated = true;
-    }
-
-    if (!mFrontBuffer->Lock(OpenMode::OPEN_WRITE_ONLY)) {
-      mFrontBuffer = nullptr;
-      return false;
-    }
-    bool status = mFrontBuffer->AsTextureClientYCbCr()->UpdateYCbCr(*data);
-    mFrontBuffer->Unlock();
-
-    if (bufferCreated) {
-      if (!AddTextureClient(mFrontBuffer)) {
-        mFrontBuffer = nullptr;
+      texture = TextureClient::CreateForYCbCr(GetForwarder(),
+        data->mYSize, data->mCbCrSize, data->mStereoMode,
+        TextureFlags::DEFAULT | mTextureFlags
+      );
+      if (!texture || !texture->Lock(OpenMode::OPEN_WRITE_ONLY)) {
         return false;
       }
-    }
-
-    if (status) {
-      GetForwarder()->UpdatedTexture(this, mFrontBuffer, nullptr);
-      GetForwarder()->UseTexture(this, mFrontBuffer);
-    } else {
-      MOZ_ASSERT(false);
-      return false;
-    }
+      bool status = texture->AsTextureClientYCbCr()->UpdateYCbCr(*data);
+      MOZ_ASSERT(status);
 
-  } else if (image->GetFormat() == ImageFormat::SURFACE_TEXTURE ||
-             image->GetFormat() == ImageFormat::EGLIMAGE)
-  {
-    gfx::IntSize size = gfx::IntSize(image->GetSize().width, image->GetSize().height);
-
-    if (mFrontBuffer) {
-      autoRemoveTexture.mTexture = mFrontBuffer;
-      mFrontBuffer = nullptr;
-    }
+      texture->Unlock();
+      if (!status) {
+        return false;
+      }
 
-    RefPtr<TextureClient> buffer;
+    } else if (image->GetFormat() == ImageFormat::SURFACE_TEXTURE ||
+               image->GetFormat() == ImageFormat::EGLIMAGE) {
+      gfx::IntSize size = image->GetSize();
+
+      if (image->GetFormat() == ImageFormat::EGLIMAGE) {
+        EGLImageImage* typedImage = static_cast<EGLImageImage*>(image);
+        const EGLImageImage::Data* data = typedImage->GetData();
 
-    if (image->GetFormat() == ImageFormat::EGLIMAGE) {
-      EGLImageImage* typedImage = static_cast<EGLImageImage*>(image);
-      const EGLImageImage::Data* data = typedImage->GetData();
-
-      buffer = new EGLImageTextureClient(mTextureFlags,
-                                         data->mImage,
-                                         size,
-                                         data->mInverted);
+        texture = new EGLImageTextureClient(mTextureFlags, data->mImage,
+                                           size, data->mInverted);
 #ifdef MOZ_WIDGET_ANDROID
-    } else if (image->GetFormat() == ImageFormat::SURFACE_TEXTURE) {
-      SurfaceTextureImage* typedImage = static_cast<SurfaceTextureImage*>(image);
-      const SurfaceTextureImage::Data* data = typedImage->GetData();
-
-      buffer = new SurfaceTextureClient(mTextureFlags,
-                                        data->mSurfTex,
-                                        size,
-                                        data->mInverted);
+      } else if (image->GetFormat() == ImageFormat::SURFACE_TEXTURE) {
+        SurfaceTextureImage* typedImage = static_cast<SurfaceTextureImage*>(image);
+        const SurfaceTextureImage::Data* data = typedImage->GetData();
+        texture = new SurfaceTextureClient(mTextureFlags, data->mSurfTex,
+                                          size, data->mInverted);
 #endif
+      } else {
+        MOZ_ASSERT(false, "Bad ImageFormat.");
+      }
     } else {
-      MOZ_ASSERT(false, "Bad ImageFormat.");
-    }
-
-    mFrontBuffer = buffer;
-    if (!AddTextureClient(mFrontBuffer)) {
-      mFrontBuffer = nullptr;
-      return false;
-    }
-
-    GetForwarder()->UseTexture(this, mFrontBuffer);
-
-  } else {
-    RefPtr<gfx::SourceSurface> surface = image->GetAsSourceSurface();
-    MOZ_ASSERT(surface);
-
-    gfx::IntSize size = image->GetSize();
-
-    if (mFrontBuffer &&
-        (mFrontBuffer->IsImmutable() || mFrontBuffer->GetSize() != size)) {
-      autoRemoveTexture.mTexture = mFrontBuffer;
-      mFrontBuffer = nullptr;
-    }
-
-    bool bufferCreated = false;
-    if (!mFrontBuffer) {
-      mFrontBuffer = CreateTextureClientForDrawing(surface->GetFormat(), size,
-                                                   gfx::BackendType::NONE, mTextureFlags);
-      if (!mFrontBuffer) {
+      RefPtr<gfx::SourceSurface> surface = image->GetAsSourceSurface();
+      MOZ_ASSERT(surface);
+      texture = CreateTextureClientForDrawing(surface->GetFormat(), image->GetSize(),
+                                              gfx::BackendType::NONE, mTextureFlags);
+      if (!texture) {
         return false;
       }
-      MOZ_ASSERT(mFrontBuffer->CanExposeDrawTarget());
-      bufferCreated = true;
-    }
-
-    if (!mFrontBuffer->Lock(OpenMode::OPEN_WRITE_ONLY)) {
-      mFrontBuffer = nullptr;
-      return false;
-    }
-
-    {
-      // We must not keep a reference to the DrawTarget after it has been unlocked.
-      DrawTarget* dt = mFrontBuffer->BorrowDrawTarget();
-      MOZ_ASSERT(surface.get());
-      dt->CopySurface(surface, IntRect(IntPoint(), surface->GetSize()), IntPoint());
-    }
 
-    mFrontBuffer->Unlock();
+      MOZ_ASSERT(texture->CanExposeDrawTarget());
 
-    if (bufferCreated) {
-      if (!AddTextureClient(mFrontBuffer)) {
-        mFrontBuffer = nullptr;
+      if (!texture->Lock(OpenMode::OPEN_WRITE_ONLY)) {
         return false;
       }
-    }
 
-    GetForwarder()->UpdatedTexture(this, mFrontBuffer, nullptr);
-    GetForwarder()->UseTexture(this, mFrontBuffer);
+      {
+        // We must not keep a reference to the DrawTarget after it has been unlocked.
+        DrawTarget* dt = texture->BorrowDrawTarget();
+        MOZ_ASSERT(surface.get());
+        dt->CopySurface(surface, IntRect(IntPoint(), surface->GetSize()), IntPoint());
+      }
+
+      texture->Unlock();
+    }
+  }
+  if (!texture || !AddTextureClient(texture)) {
+    return false;
   }
 
+  mFrontBuffer = texture;
+  GetForwarder()->UpdatedTexture(this, texture, nullptr);
+  GetForwarder()->UseTexture(this, texture);
+
   UpdatePictureRect(image->GetPictureRect());
 
   mLastPaintedImageSerial = image->GetSerial();
   aContainer->NotifyPaintedImage(image);
-  *aIsSwapped = true;
   return true;
 }
 
 bool
-ImageClientBuffered::UpdateImage(ImageContainer* aContainer,
-                                 uint32_t aContentFlags)
-{
-  RefPtr<TextureClient> temp = mFrontBuffer;
-  mFrontBuffer = mBackBuffer;
-  mBackBuffer = temp;
-
-  bool isSwapped = false;
-  bool ret = ImageClientSingle::UpdateImageInternal(aContainer, aContentFlags, &isSwapped);
-
-  if (!isSwapped) {
-    // If buffer swap did not happen at Host side, swap back the buffers.
-    RefPtr<TextureClient> temp = mFrontBuffer;
-    mFrontBuffer = mBackBuffer;
-    mBackBuffer = temp;
-  }
-  return ret;
-}
-
-bool
 ImageClientSingle::AddTextureClient(TextureClient* aTexture)
 {
   MOZ_ASSERT((mTextureFlags & aTexture->GetFlags()) == mTextureFlags);
@@ -379,13 +259,6 @@
   mFrontBuffer = nullptr;
 }
 
-void
-ImageClientBuffered::OnDetach()
-{
-  mFrontBuffer = nullptr;
-  mBackBuffer = nullptr;
-}
-
 ImageClient::ImageClient(CompositableForwarder* aFwd, TextureFlags aFlags,
                          CompositableType aType)
 : CompositableClient(aFwd, aFlags)
@@ -406,7 +279,7 @@
 
 ImageClientBridge::ImageClientBridge(CompositableForwarder* aFwd,
                                      TextureFlags aFlags)
-: ImageClient(aFwd, aFlags, CompositableType::BUFFER_BRIDGE)
+: ImageClient(aFwd, aFlags, CompositableType::IMAGE_BRIDGE)
 , mAsyncContainerID(0)
 , mLayer(nullptr)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ImageClient.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ImageClient.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/ImageClient.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/ImageClient.h	2014-11-26 21:46:10.000000000 +0000
@@ -115,34 +115,10 @@
                               AsyncTransactionTracker* aAsyncTransactionTracker) MOZ_OVERRIDE;
 
 protected:
-  virtual bool UpdateImageInternal(ImageContainer* aContainer, uint32_t aContentFlags, bool* aIsSwapped);
-
-protected:
   RefPtr<TextureClient> mFrontBuffer;
 };
 
 /**
- * An image client which uses two texture clients.
- */
-class ImageClientBuffered : public ImageClientSingle
-{
-public:
-  ImageClientBuffered(CompositableForwarder* aFwd,
-                      TextureFlags aFlags,
-                      CompositableType aType);
-
-  virtual bool UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags);
-
-  virtual void OnDetach() MOZ_OVERRIDE;
-
-  virtual void FlushAllImages(bool aExceptFront,
-                              AsyncTransactionTracker* aAsyncTransactionTracker) MOZ_OVERRIDE;
-
-protected:
-  RefPtr<TextureClient> mBackBuffer;
-};
-
-/**
  * Image class to be used for async image uploads using the image bridge
  * protocol.
  * We store the ImageBridge id in the TextureClientIdentifier.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/TextureClient.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/TextureClient.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/TextureClient.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/TextureClient.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -711,7 +711,7 @@
 {
   MOZ_ASSERT(IsValid());
   MOZ_ASSERT(mFormat != gfx::SurfaceFormat::YUV, "This textureClient cannot use YCbCr data");
-  MOZ_ASSERT(aSize.width * aSize.height);
+  MOZ_ASSERT(aSize.width > 0 && aSize.height > 0);
 
   int bufSize
     = ImageDataSerializer::ComputeMinBufferSize(aSize, mFormat);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/TextureClientPool.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/TextureClientPool.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/client/TextureClientPool.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/client/TextureClientPool.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -32,6 +32,9 @@
   , mSurfaceAllocator(aAllocator)
 {
   mTimer = do_CreateInstance("@mozilla.org/timer;1");
+  if (aFormat == gfx::SurfaceFormat::UNKNOWN) {
+    gfxWarning() << "Creating texture pool for SurfaceFormat::UNKNOWN format";
+  }
 }
 
 TextureClientPool::~TextureClientPool()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/AsyncCompositionManager.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -267,7 +267,10 @@
                                                    const Matrix4x4& aCurrentTransformForRoot,
                                                    const LayerMargin& aFixedLayerMargins)
 {
+  // If aLayer == aTransformedSubtreeRoot, then treat aLayer as fixed relative
+  // to the ancestor scrollable layer rather than relative to itself.
   bool isRootFixed = aLayer->GetIsFixedPosition() &&
+    aLayer != aTransformedSubtreeRoot &&
     !aLayer->GetParent()->GetIsFixedPosition();
   bool isStickyForSubtree = aLayer->GetIsStickyPosition() &&
     aLayer->GetStickyScrollContainerId() == aTransformScrollId;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/CanvasLayerComposite.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/CanvasLayerComposite.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/CanvasLayerComposite.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/CanvasLayerComposite.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "nsPoint.h"                    // for nsIntPoint
 #include "nsString.h"                   // for nsAutoCString
+#include "gfxVR.h"
 
 namespace mozilla {
 namespace layers {
@@ -45,8 +46,6 @@
 CanvasLayerComposite::SetCompositableHost(CompositableHost* aHost)
 {
   switch (aHost->GetType()) {
-    case CompositableType::BUFFER_IMAGE_SINGLE:
-    case CompositableType::BUFFER_IMAGE_BUFFERED:
     case CompositableType::IMAGE:
       mImageHost = aHost;
       return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/CompositableHost.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/CompositableHost.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/CompositableHost.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/CompositableHost.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -178,7 +178,7 @@
 {
   RefPtr<CompositableHost> result;
   switch (aTextureInfo.mCompositableType) {
-  case CompositableType::BUFFER_BRIDGE:
+  case CompositableType::IMAGE_BRIDGE:
     NS_ERROR("Cannot create an image bridge compositable this way");
     break;
   case CompositableType::BUFFER_CONTENT_INC:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/CompositableHost.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/CompositableHost.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/CompositableHost.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/CompositableHost.h	2014-11-26 21:46:10.000000000 +0000
@@ -152,6 +152,12 @@
     MOZ_ASSERT(false, "Should have been overridden");
   }
 
+  virtual gfx::IntSize GetImageSize() const
+  {
+    MOZ_ASSERT(false, "Should have been overridden");
+    return gfx::IntSize();
+  }
+
   /**
    * Adds a mask effect using this texture as the mask, if possible.
    * @return true if the effect was added, false otherwise.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContainerLayerComposite.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -91,6 +91,15 @@
                                           maxWidth);
 }
 
+template<class ContainerT>
+static gfx::IntRect ContainerVisibleRect(ContainerT* aContainer)
+{
+  nsIntRect visibleRect = aContainer->GetEffectiveVisibleRegion().GetBounds();
+  gfx::IntRect surfaceRect = gfx::IntRect(visibleRect.x, visibleRect.y,
+                                          visibleRect.width, visibleRect.height);
+  return surfaceRect;
+}
+
 static void PrintUniformityInfo(Layer* aLayer)
 {
 #ifdef MOZ_ENABLE_PROFILER_SPS
@@ -124,6 +133,105 @@
   RenderTargetIntRect mClipRect;
 };
 
+
+template<class ContainerT> void
+ContainerRenderVR(ContainerT* aContainer,
+                  LayerManagerComposite* aManager,
+                  const nsIntRect& aClipRect,
+                  gfx::VRHMDInfo* aHMD)
+{
+  RefPtr<CompositingRenderTarget> surface;
+
+  Compositor* compositor = aManager->GetCompositor();
+
+  RefPtr<CompositingRenderTarget> previousTarget = compositor->GetCurrentRenderTarget();
+
+  nsIntRect visibleRect = aContainer->GetEffectiveVisibleRegion().GetBounds();
+
+  float opacity = aContainer->GetEffectiveOpacity();
+
+  gfx::IntRect surfaceRect = gfx::IntRect(visibleRect.x, visibleRect.y,
+                                          visibleRect.width, visibleRect.height);
+  // we're about to create a framebuffer backed by textures to use as an intermediate
+  // surface. What to do if its size (as given by framebufferRect) would exceed the
+  // maximum texture size supported by the GL? The present code chooses the compromise
+  // of just clamping the framebuffer's size to the max supported size.
+  // This gives us a lower resolution rendering of the intermediate surface (children layers).
+  // See bug 827170 for a discussion.
+  int32_t maxTextureSize = compositor->GetMaxTextureSize();
+  surfaceRect.width = std::min(maxTextureSize, surfaceRect.width);
+  surfaceRect.height = std::min(maxTextureSize, surfaceRect.height);
+
+  // use NONE here, because we draw black to clear below
+  surface = compositor->CreateRenderTarget(surfaceRect, INIT_MODE_NONE);
+  if (!surface) {
+    return;
+  }
+
+  compositor->SetRenderTarget(surface);
+
+  nsAutoTArray<Layer*, 12> children;
+  aContainer->SortChildrenBy3DZOrder(children);
+
+  /**
+   * Render this container's contents.
+   */
+  nsIntRect surfaceClipRect(0, 0, surfaceRect.width, surfaceRect.height);
+  RenderTargetIntRect rtClipRect(0, 0, surfaceRect.width, surfaceRect.height);
+  for (uint32_t i = 0; i < children.Length(); i++) {
+    LayerComposite* layerToRender = static_cast<LayerComposite*>(children.ElementAt(i)->ImplData());
+    Layer* layer = layerToRender->GetLayer();
+
+    if (layer->GetEffectiveVisibleRegion().IsEmpty() &&
+        !layer->AsContainerLayer()) {
+      continue;
+    }
+
+    RenderTargetIntRect clipRect = layer->CalculateScissorRect(rtClipRect);
+    if (clipRect.IsEmpty()) {
+      continue;
+    }
+
+    layerToRender->Prepare(rtClipRect);
+    layerToRender->RenderLayer(surfaceClipRect);
+  }
+
+  // Unbind the current surface and rebind the previous one.
+#ifdef MOZ_DUMP_PAINTING
+  if (gfxUtils::sDumpPainting) {
+    RefPtr<gfx::DataSourceSurface> surf = surface->Dump(aManager->GetCompositor());
+    if (surf) {
+      WriteSnapshotToDumpFile(aContainer, surf);
+    }
+  }
+#endif
+
+  compositor->SetRenderTarget(previousTarget);
+
+  gfx::Rect rect(visibleRect.x, visibleRect.y, visibleRect.width, visibleRect.height);
+  gfx::Rect clipRect(aClipRect.x, aClipRect.y, aClipRect.width, aClipRect.height);
+
+  // The VR geometry may not cover the entire area; we need to fill with a solid color
+  // first.
+  // XXX should DrawQuad handle this on its own?  Is there a time where we wouldn't want
+  // to do this? (e.g. something like Cardboard would not require distortion so will fill
+  // the entire rect)
+  EffectChain solidEffect(aContainer);
+  solidEffect.mPrimaryEffect = new EffectSolidColor(Color(0.0, 0.0, 0.0, 1.0));
+  aManager->GetCompositor()->DrawQuad(rect, clipRect, solidEffect, opacity,
+                                      aContainer->GetEffectiveTransform());
+
+  // draw the temporary surface with VR distortion to the original destination
+  EffectChain vrEffect(aContainer);
+  vrEffect.mPrimaryEffect = new EffectVRDistortion(aHMD, surface);
+
+  // XXX we shouldn't use visibleRect here -- the VR distortion needs to know the
+  // full rect, not just the visible one.  Luckily, right now, VR distortion is only
+  // rendered when the element is fullscreen, so the visibleRect will be right anyway.
+  aManager->GetCompositor()->DrawQuad(rect, clipRect, vrEffect, opacity,
+                                      aContainer->GetEffectiveTransform());
+}
+
 /* all of the prepared data that we need in RenderLayer() */
 struct PreparedData
 {
@@ -141,6 +249,15 @@
   aContainer->mPrepared = MakeUnique<PreparedData>();
   aContainer->mPrepared->mNeedsSurfaceCopy = false;
 
+  gfx::VRHMDInfo *hmdInfo = aContainer->GetVRHMDInfo();
+  if (hmdInfo && hmdInfo->GetConfiguration().IsValid()) {
+    // we're not going to do anything here; instead, we'll do it all in ContainerRender.
+    // XXX fix this; we can win with the same optimizations.  Specifically, we
+    // want to render thebes layers only once and then composite the intermeidate surfaces
+    // with different transforms twice.
+    return;
+  }
+
   /**
    * Determine which layers to draw.
    */
@@ -179,16 +296,33 @@
   // DefaultComputeSupportsComponentAlphaChildren can mutate aContainer so call it unconditionally
   aContainer->DefaultComputeSupportsComponentAlphaChildren(&surfaceCopyNeeded);
   if (aContainer->UseIntermediateSurface()) {
-    MOZ_PERFORMANCE_WARNING("gfx", "[%p] Container layer requires intermediate surface\n", aContainer);
     if (!surfaceCopyNeeded) {
-      // If we don't need a copy we can render to the intermediate now to avoid
-      // unecessary render target switching. This brings a big perf boost on mobile gpus.
-      RefPtr<CompositingRenderTarget> surface = CreateTemporaryTarget(aContainer, aManager);
-      RenderIntermediate(aContainer, aManager, RenderTargetPixel::ToUntyped(aClipRect), surface);
+      RefPtr<CompositingRenderTarget> surface = nullptr;
+
+      RefPtr<CompositingRenderTarget>& lastSurf = aContainer->mLastIntermediateSurface;
+      gfx::IntRect surfaceRect = ContainerVisibleRect(aContainer);
+      if (lastSurf && !aContainer->mChildrenChanged && lastSurf->GetRect().IsEqualEdges(surfaceRect)) {
+        surface = lastSurf;
+      }
+
+      if (!surface) {
+        // If we don't need a copy we can render to the intermediate now to avoid
+        // unecessary render target switching. This brings a big perf boost on mobile gpus.
+        surface = CreateOrRecycleTarget(aContainer, aManager);
+
+        MOZ_PERFORMANCE_WARNING("gfx", "[%p] Container layer requires intermediate surface rendering\n", aContainer);
+        RenderIntermediate(aContainer, aManager, RenderTargetPixel::ToUntyped(aClipRect), surface);
+        aContainer->SetChildrenChanged(false);
+      }
+
       aContainer->mPrepared->mTmpTarget = surface;
     } else {
+      MOZ_PERFORMANCE_WARNING("gfx", "[%p] Container layer requires intermediate surface copy\n", aContainer);
       aContainer->mPrepared->mNeedsSurfaceCopy = true;
+      aContainer->mLastIntermediateSurface = nullptr;
     }
+  } else {
+    aContainer->mLastIntermediateSurface = nullptr;
   }
 }
 
@@ -266,20 +400,30 @@
 }
 
 template<class ContainerT> RefPtr<CompositingRenderTarget>
-CreateTemporaryTarget(ContainerT* aContainer,
+CreateOrRecycleTarget(ContainerT* aContainer,
                       LayerManagerComposite* aManager)
 {
   Compositor* compositor = aManager->GetCompositor();
-  nsIntRect visibleRect = aContainer->GetEffectiveVisibleRegion().GetBounds();
   SurfaceInitMode mode = INIT_MODE_CLEAR;
-  gfx::IntRect surfaceRect = gfx::IntRect(visibleRect.x, visibleRect.y,
-                                          visibleRect.width, visibleRect.height);
+  gfx::IntRect surfaceRect = ContainerVisibleRect(aContainer);
   if (aContainer->GetEffectiveVisibleRegion().GetNumRects() == 1 &&
       (aContainer->GetContentFlags() & Layer::CONTENT_OPAQUE))
   {
     mode = INIT_MODE_NONE;
   }
-  return compositor->CreateRenderTarget(surfaceRect, mode);
+
+  RefPtr<CompositingRenderTarget>& lastSurf = aContainer->mLastIntermediateSurface;
+  if (lastSurf && lastSurf->GetRect().IsEqualEdges(surfaceRect)) {
+    if (mode == INIT_MODE_CLEAR) {
+      lastSurf->ClearOnBind();
+    }
+
+    return lastSurf;
+  } else {
+    lastSurf = compositor->CreateRenderTarget(surfaceRect, mode);
+
+    return lastSurf;
+  }
 }
 
 template<class ContainerT> RefPtr<CompositingRenderTarget>
@@ -330,6 +474,14 @@
                  const nsIntRect& aClipRect)
 {
   MOZ_ASSERT(aContainer->mPrepared);
+
+  gfx::VRHMDInfo *hmdInfo = aContainer->GetVRHMDInfo();
+  if (hmdInfo && hmdInfo->GetConfiguration().IsValid()) {
+    ContainerRenderVR(aContainer, aManager, aClipRect, hmdInfo);
+    aContainer->mPrepared = nullptr;
+    return;
+  }
+
   if (aContainer->UseIntermediateSurface()) {
     RefPtr<CompositingRenderTarget> surface;
 
@@ -462,6 +614,8 @@
 void
 ContainerLayerComposite::CleanupResources()
 {
+  mLastIntermediateSurface = nullptr;
+
   for (Layer* l = GetFirstChild(); l; l = l->GetNextSibling()) {
     LayerComposite* layerToCleanup = static_cast<LayerComposite*>(l->ImplData());
     layerToCleanup->CleanupResources();
@@ -512,7 +666,9 @@
 void
 RefLayerComposite::CleanupResources()
 {
+  mLastIntermediateSurface = nullptr;
 }
 
 } /* layers */
 } /* mozilla */
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContainerLayerComposite.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContainerLayerComposite.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContainerLayerComposite.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContainerLayerComposite.h	2014-11-26 21:46:10.000000000 +0000
@@ -48,7 +48,7 @@
                                              const RenderTargetIntRect& aClipRect);
   template<class ContainerT>
   friend RefPtr<CompositingRenderTarget>
-  CreateTemporaryTarget(ContainerT* aContainer,
+  CreateOrRecycleTarget(ContainerT* aContainer,
                         LayerManagerComposite* aManager,
                         const RenderTargetIntRect& aClipRect);
 
@@ -94,6 +94,8 @@
 
   virtual const char* Name() const MOZ_OVERRIDE { return "ContainerLayerComposite"; }
   UniquePtr<PreparedData> mPrepared;
+
+  RefPtr<CompositingRenderTarget> mLastIntermediateSurface;
 };
 
 class RefLayerComposite : public RefLayer,
@@ -158,6 +160,7 @@
 
   virtual const char* Name() const MOZ_OVERRIDE { return "RefLayerComposite"; }
   UniquePtr<PreparedData> mPrepared;
+  RefPtr<CompositingRenderTarget> mLastIntermediateSurface;
 };
 
 } /* layers */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContentHost.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContentHost.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContentHost.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContentHost.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -215,9 +215,6 @@
 void
 ContentHostTexture::UseTextureHost(TextureHost* aTexture)
 {
-  if (mTextureHost && mTextureHost != aTexture) {
-    mTextureHost->UnbindTextureSource();
-  }
   ContentHostBase::UseTextureHost(aTexture);
   mTextureHost = aTexture;
   mTextureHostOnWhite = nullptr;
@@ -231,12 +228,6 @@
 ContentHostTexture::UseComponentAlphaTextures(TextureHost* aTextureOnBlack,
                                               TextureHost* aTextureOnWhite)
 {
-  if (mTextureHost && mTextureHost != aTextureOnBlack) {
-    mTextureHost->UnbindTextureSource();
-  }
-  if (mTextureHostOnWhite && mTextureHostOnWhite != aTextureOnWhite) {
-    mTextureHostOnWhite->UnbindTextureSource();
-  }
   ContentHostBase::UseComponentAlphaTextures(aTextureOnBlack, aTextureOnWhite);
   mTextureHost = aTextureOnBlack;
   mTextureHostOnWhite = aTextureOnWhite;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContentHost.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContentHost.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ContentHost.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ContentHost.h	2014-11-26 21:46:10.000000000 +0000
@@ -173,8 +173,8 @@
   virtual TemporaryRef<TexturedEffect> GenEffect(const gfx::Filter& aFilter) MOZ_OVERRIDE;
 
 protected:
-  RefPtr<TextureHost> mTextureHost;
-  RefPtr<TextureHost> mTextureHostOnWhite;
+  CompositableTextureHostRef mTextureHost;
+  CompositableTextureHostRef mTextureHostOnWhite;
   CompositableTextureSourceRef mTextureSource;
   CompositableTextureSourceRef mTextureSourceOnWhite;
   bool mLocked;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ImageHost.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ImageHost.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ImageHost.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ImageHost.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -29,24 +29,17 @@
 
 ImageHost::ImageHost(const TextureInfo& aTextureInfo)
   : CompositableHost(aTextureInfo)
-  , mFrontBuffer(nullptr)
   , mHasPictureRect(false)
   , mLocked(false)
 {}
 
 ImageHost::~ImageHost()
 {
-  if (mFrontBuffer) {
-    mFrontBuffer->UnbindTextureSource();
-  }
 }
 
 void
 ImageHost::UseTextureHost(TextureHost* aTexture)
 {
-  if (mFrontBuffer && mFrontBuffer != aTexture) {
-    mFrontBuffer->UnbindTextureSource();
-  }
   CompositableHost::UseTextureHost(aTexture);
   mFrontBuffer = aTexture;
   if (mFrontBuffer) {
@@ -276,6 +269,20 @@
   mLocked = false;
 }
 
+IntSize
+ImageHost::GetImageSize() const
+{
+  if (mHasPictureRect) {
+    return IntSize(mPictureRect.width, mPictureRect.height);
+  }
+
+  if (mFrontBuffer) {
+    return mFrontBuffer->GetSize();
+  }
+
+  return IntSize();
+}
+
 TemporaryRef<TexturedEffect>
 ImageHost::GenEffect(const gfx::Filter& aFilter)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ImageHost.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ImageHost.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ImageHost.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ImageHost.h	2014-11-26 21:46:10.000000000 +0000
@@ -66,6 +66,8 @@
     mHasPictureRect = true;
   }
 
+  gfx::IntSize GetImageSize() const;
+
   virtual LayerRenderState GetRenderState() MOZ_OVERRIDE;
 
   virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
@@ -86,7 +88,7 @@
 
 protected:
 
-  RefPtr<TextureHost> mFrontBuffer;
+  CompositableTextureHostRef mFrontBuffer;
   CompositableTextureSourceRef mTextureSource;
   nsIntRect mPictureRect;
   bool mHasPictureRect;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ImageLayerComposite.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ImageLayerComposite.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/ImageLayerComposite.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/ImageLayerComposite.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -51,8 +51,6 @@
 ImageLayerComposite::SetCompositableHost(CompositableHost* aHost)
 {
   switch (aHost->GetType()) {
-    case CompositableType::BUFFER_IMAGE_SINGLE:
-    case CompositableType::BUFFER_IMAGE_BUFFERED:
     case CompositableType::IMAGE:
     case CompositableType::IMAGE_OVERLAY:
       mImageHost = aHost;
@@ -121,9 +119,8 @@
   // Snap image edges to pixel boundaries
   gfxRect sourceRect(0, 0, 0, 0);
   if (mImageHost &&
-      mImageHost->IsAttached() &&
-      mImageHost->GetAsTextureHost()) {
-    IntSize size = mImageHost->GetAsTextureHost()->GetSize();
+      mImageHost->IsAttached()) {
+    IntSize size = mImageHost->GetImageSize();
     sourceRect.SizeTo(size.width, size.height);
     if (mScaleMode != ScaleMode::SCALE_NONE &&
         sourceRect.width != 0.0 && sourceRect.height != 0.0) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/LayerManagerComposite.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/LayerManagerComposite.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/LayerManagerComposite.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/LayerManagerComposite.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -166,10 +166,7 @@
   
   mIsCompositorReady = true;
 
-  if (Compositor::GetBackend() == LayersBackend::LAYERS_OPENGL ||
-      Compositor::GetBackend() == LayersBackend::LAYERS_BASIC) {
-    mClonedLayerTreeProperties = LayerProperties::CloneFrom(GetRoot());
-  }
+  mClonedLayerTreeProperties = LayerProperties::CloneFrom(GetRoot());
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/TextureHost.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/TextureHost.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/TextureHost.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/TextureHost.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -289,6 +289,7 @@
 TextureHost::TextureHost(TextureFlags aFlags)
     : mActor(nullptr)
     , mFlags(aFlags)
+    , mCompositableCount(0)
 {}
 
 TextureHost::~TextureHost()
@@ -348,6 +349,22 @@
 , mNeedsFullUpdate(false)
 {}
 
+void
+BufferTextureHost::InitSize()
+{
+  if (mFormat == gfx::SurfaceFormat::YUV) {
+    YCbCrImageDataDeserializer yuvDeserializer(GetBuffer(), GetBufferSize());
+    if (yuvDeserializer.IsValid()) {
+      mSize = yuvDeserializer.GetYSize();
+    }
+  } else if (mFormat != gfx::SurfaceFormat::UNKNOWN) {
+    ImageDataDeserializer deserializer(GetBuffer(), GetBufferSize());
+    if (deserializer.IsValid()) {
+      mSize = deserializer.GetSize();
+    }
+  }
+}
+
 BufferTextureHost::~BufferTextureHost()
 {}
 
@@ -597,6 +614,7 @@
 , mDeallocator(aDeallocator)
 {
   MOZ_COUNT_CTOR(ShmemTextureHost);
+  InitSize();
 }
 
 ShmemTextureHost::~ShmemTextureHost()
@@ -649,6 +667,7 @@
 , mBuffer(aBuffer)
 {
   MOZ_COUNT_CTOR(MemoryTextureHost);
+  InitSize();
 }
 
 MemoryTextureHost::~MemoryTextureHost()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/TextureHost.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/TextureHost.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/composite/TextureHost.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/composite/TextureHost.h	2014-11-26 21:46:10.000000000 +0000
@@ -169,20 +169,21 @@
  * equivalent of a RefPtr<TextureSource>, that calls AddCompositableRef and
  * ReleaseCompositableRef in addition to the usual AddRef and Release.
  */
-class CompositableTextureSourceRef {
+template<typename T>
+class CompositableTextureRef {
 public:
-  CompositableTextureSourceRef() {}
+  CompositableTextureRef() {}
 
-  ~CompositableTextureSourceRef()
+  ~CompositableTextureRef()
   {
     if (mRef) {
       mRef->ReleaseCompositableRef();
     }
   }
 
-  CompositableTextureSourceRef& operator=(const TemporaryRef<TextureSource>& aOther)
+  CompositableTextureRef& operator=(const TemporaryRef<T>& aOther)
   {
-    RefPtr<TextureSource> temp = aOther;
+    RefPtr<T> temp = aOther;
     if (temp) {
       temp->AddCompositableRef();
     }
@@ -193,7 +194,7 @@
     return *this;
   }
 
-  CompositableTextureSourceRef& operator=(TextureSource* aOther)
+  CompositableTextureRef& operator=(T* aOther)
   {
     if (aOther) {
       aOther->AddCompositableRef();
@@ -205,15 +206,18 @@
     return *this;
   }
 
-  TextureSource* get() const { return mRef; }
-  operator TextureSource*() const { return mRef; }
-  TextureSource* operator->() const { return mRef; }
-  TextureSource& operator*() const { return *mRef; }
+  T* get() const { return mRef; }
+  operator T*() const { return mRef; }
+  T* operator->() const { return mRef; }
+  T& operator*() const { return *mRef; }
 
 private:
-  RefPtr<TextureSource> mRef;
+  RefPtr<T> mRef;
 };
 
+typedef CompositableTextureRef<TextureSource> CompositableTextureSourceRef;
+typedef CompositableTextureRef<TextureHost> CompositableTextureHostRef;
+
 /**
  * Interface for TextureSources that can be updated from a DataSourceSurface.
  *
@@ -505,11 +509,25 @@
    */
   virtual TextureHostOGL* AsHostOGL() { return nullptr; }
 
+  void AddCompositableRef() { ++mCompositableCount; }
+
+  void ReleaseCompositableRef()
+  {
+    --mCompositableCount;
+    MOZ_ASSERT(mCompositableCount >= 0);
+    if (mCompositableCount == 0) {
+      UnbindTextureSource();
+    }
+  }
+
+  int NumCompositableRefs() const { return mCompositableCount; }
+
 protected:
   void RecycleTexture(TextureFlags aFlags);
 
   PTextureParent* mActor;
   TextureFlags mFlags;
+  int mCompositableCount;
 
   friend class TextureParent;
 };
@@ -570,6 +588,8 @@
   bool Upload(nsIntRegion *aRegion = nullptr);
   bool MaybeUpload(nsIntRegion *aRegion = nullptr);
 
+  void InitSize();
+
   RefPtr<Compositor> mCompositor;
   RefPtr<DataTextureSource> mFirstSource;
   nsIntRegion mMaybeUpdatedRegion;
@@ -735,7 +755,8 @@
 public:
 
   explicit CompositingRenderTarget(const gfx::IntPoint& aOrigin)
-    : mOrigin(aOrigin)
+    : mClearOnBind(false)
+    , mOrigin(aOrigin)
   {}
   virtual ~CompositingRenderTarget() {}
 
@@ -743,7 +764,19 @@
   virtual TemporaryRef<gfx::DataSourceSurface> Dump(Compositor* aCompositor) { return nullptr; }
 #endif
 
+  /**
+   * Perform a clear when recycling a non opaque surface.
+   * The clear is deferred to when the render target is bound.
+   */
+  void ClearOnBind() {
+    mClearOnBind = true;
+  }
+
   const gfx::IntPoint& GetOrigin() { return mOrigin; }
+  gfx::IntRect GetRect() { return gfx::IntRect(GetOrigin(), GetSize()); }
+
+protected:
+  bool mClearOnBind;
 
 private:
   gfx::IntPoint mOrigin;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/CompositorTypes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/CompositorTypes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/CompositorTypes.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/CompositorTypes.h	2014-11-26 21:46:09.000000000 +0000
@@ -150,6 +150,7 @@
   COMPONENT_ALPHA,
   SOLID_COLOR,
   RENDER_TARGET,
+  VR_DISTORTION,
   MAX  //sentinel for the count of all effect types
 MOZ_END_ENUM_CLASS(EffectTypes)
 
@@ -159,17 +160,15 @@
 MOZ_BEGIN_ENUM_CLASS(CompositableType, uint8_t)
   BUFFER_UNKNOWN,
   // the deprecated compositable types
-  BUFFER_IMAGE_SINGLE,    // image/canvas with a single texture, single buffered
-  BUFFER_IMAGE_BUFFERED,  // canvas, double buffered
-  BUFFER_BRIDGE,          // image bridge protocol
   BUFFER_CONTENT_INC,     // painted layer interface, only sends incremental
                           // updates to a texture on the compositor side.
   // somewhere in the middle
   BUFFER_TILED,           // tiled painted layer
   BUFFER_SIMPLE_TILED,
   // the new compositable types
-  IMAGE,     // image with single buffering
-  IMAGE_OVERLAY, // image without buffer
+  IMAGE,           // image with single buffering
+  IMAGE_OVERLAY,   // image without buffer
+  IMAGE_BRIDGE,    // ImageBridge protocol
   CONTENT_SINGLE,  // painted layer interface, single buffering
   CONTENT_DOUBLE,  // painted layer interface, double buffering
   BUFFER_COUNT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/d3d11/CompositorD3D11.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -494,9 +494,8 @@
   MOZ_ASSERT(aRenderTarget);
   CompositingRenderTargetD3D11* newRT =
     static_cast<CompositingRenderTargetD3D11*>(aRenderTarget);
-  ID3D11RenderTargetView* view = newRT->mRTView;
   mCurrentRT = newRT;
-  mContext->OMSetRenderTargets(1, &view, nullptr);
+  mCurrentRT->BindRenderTarget(mContext);
   PrepareViewport(newRT->GetSize());
 }
 
@@ -935,7 +934,7 @@
 
   if ((swapDesc.BufferDesc.Width == mSize.width &&
        swapDesc.BufferDesc.Height == mSize.height) ||
-      mSize.width == 0 || mSize.height == 0) {
+      mSize.width <= 0 || mSize.height <= 0) {
     return;
   }
 
@@ -1071,13 +1070,13 @@
 {
   ID3D11SamplerState *sampler;
   switch (aFilter) {
-  default:
+    case Filter::POINT:
+    sampler = mAttachments->mPointSamplerState;
+    break;
   case Filter::LINEAR:
+  default:
     sampler = mAttachments->mLinearSamplerState;
     break;
-  case Filter::POINT:
-    sampler = mAttachments->mPointSamplerState;
-    break;
   }
 
   mContext->PSSetSamplers(0, 1, &sampler);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/d3d11/TextureD3D11.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/d3d11/TextureD3D11.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/d3d11/TextureD3D11.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/d3d11/TextureD3D11.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -288,7 +288,7 @@
     HRESULT hr = device->CreateTexture2D(&desc, nullptr, byRef(tex));
 
     if (FAILED(hr)) {
-      gfx::gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << gfx::hexa(hr);
+      gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << gfx::hexa(hr);
       return;
     }
 
@@ -375,7 +375,7 @@
   }
 
   if (FAILED(hr)) {
-    gfx::gfxCriticalError() << "[D3D11] CreateTexture2D failure " << aSize << " Code: " << gfx::hexa(hr);
+    gfxCriticalError() << "[D3D11] CreateTexture2D failure " << aSize << " Code: " << gfx::hexa(hr);
     return false;
   }
 
@@ -655,6 +655,18 @@
   }
 }
 
+void
+CompositingRenderTargetD3D11::BindRenderTarget(ID3D11DeviceContext* aContext)
+{
+  if (mClearOnBind) {
+    FLOAT clear[] = { 0, 0, 0, 0 };
+    aContext->ClearRenderTargetView(mRTView, clear);
+    mClearOnBind = false;
+  }
+  ID3D11RenderTargetView* view = mRTView;
+  aContext->OMSetRenderTargets(1, &view, nullptr);
+}
+
 IntSize
 CompositingRenderTargetD3D11::GetSize() const
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/d3d11/TextureD3D11.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/d3d11/TextureD3D11.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/d3d11/TextureD3D11.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/d3d11/TextureD3D11.h	2014-11-26 21:46:10.000000000 +0000
@@ -218,6 +218,8 @@
 
   virtual TextureSourceD3D11* AsSourceD3D11() MOZ_OVERRIDE { return this; }
 
+  void BindRenderTarget(ID3D11DeviceContext* aContext);
+
   virtual gfx::IntSize GetSize() const MOZ_OVERRIDE;
 
   void SetSize(const gfx::IntSize& aSize) { mSize = aSize; }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Effects.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Effects.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Effects.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Effects.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -69,3 +69,10 @@
   AppendToString(aStream, mColorMatrix, " [matrix=", "]");
 }
 
+void
+EffectVRDistortion::PrintInfo(std::stringstream& aStream, const char* aPrefix)
+{
+  aStream << aPrefix;
+  aStream << nsPrintfCString("EffectVRDistortion (0x%p) [hmd=%p] [render-target=%p] [texture=%p]",
+                             this, mHMD.get(), mRenderTarget.get(), mTexture).get();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Effects.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Effects.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Effects.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Effects.h	2014-11-26 21:46:09.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/mozalloc.h"           // for operator delete, etc
 #include "nscore.h"                     // for nsACString
 #include "mozilla/EnumeratedArray.h"
+#include "gfxVR.h"
 
 namespace mozilla {
 namespace layers {
@@ -96,6 +97,36 @@
   gfx::Matrix4x4 mMaskTransform;
 };
 
+struct EffectVRDistortion : public Effect
+{
+  EffectVRDistortion(gfx::VRHMDInfo* aHMD,
+                     CompositingRenderTarget* aRenderTarget)
+    : Effect(EffectTypes::VR_DISTORTION)
+    , mHMD(aHMD)
+    , mRenderTarget(aRenderTarget)
+    , mTexture(aRenderTarget)
+  {}
+
+  EffectVRDistortion(gfx::VRHMDInfo* aHMD,
+                     TextureSource* aTexture)
+    : Effect(EffectTypes::VR_DISTORTION)
+    , mHMD(aHMD)
+    , mRenderTarget(nullptr)
+    , mTexture(aTexture)
+  {}
+
+  virtual const char* Name() { return "EffectVRDistortion"; }
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
+
+  nsRefPtr<gfx::VRHMDInfo> mHMD;
+  RefPtr<CompositingRenderTarget> mRenderTarget;
+  TextureSource* mTexture;
+
+  // The viewport for each eye in the source and
+  // destination textures.
+  gfx::IntRect mViewports[2];
+};
+
 struct EffectBlendMode : public Effect
 {
   explicit EffectBlendMode(gfx::CompositionOp aBlendMode)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/FrameMetrics.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/FrameMetrics.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/FrameMetrics.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/FrameMetrics.h	2014-11-26 21:46:09.000000000 +0000
@@ -20,7 +20,6 @@
 } // namespace IPC
 
 namespace mozilla {
-
 namespace layers {
 
 /**
@@ -66,6 +65,7 @@
     , mViewport(0, 0, 0, 0)
     , mExtraResolution(1)
     , mBackgroundColor(0, 0, 0, 0)
+    , mLineScrollAmount(0, 0)
   {
   }
 
@@ -96,7 +96,8 @@
            mUpdateScrollOffset == aOther.mUpdateScrollOffset &&
            mExtraResolution == aOther.mExtraResolution &&
            mBackgroundColor == aOther.mBackgroundColor &&
-           mDoSmoothScroll == aOther.mDoSmoothScroll;
+           mDoSmoothScroll == aOther.mDoSmoothScroll &&
+           mLineScrollAmount == aOther.mLineScrollAmount;
   }
   bool operator!=(const FrameMetrics& aOther) const
   {
@@ -515,6 +516,16 @@
     mMayHaveTouchListeners = aMayHaveTouchListeners;
   }
 
+  const LayoutDeviceIntSize& GetLineScrollAmount() const
+  {
+    return mLineScrollAmount;
+  }
+
+  void SetLineScrollAmount(const LayoutDeviceIntSize& size)
+  {
+    mLineScrollAmount = size;
+  }
+
 private:
   // New fields from now on should be made private and old fields should
   // be refactored to be private.
@@ -606,6 +617,9 @@
   // This is empty unless this is a scrollable layer and the
   // apz.printtree pref is turned on.
   nsCString mContentDescription;
+
+  // The value of GetLineScrollAmount(), for scroll frames.
+  LayoutDeviceIntSize mLineScrollAmount;
 };
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ImageContainer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ImageContainer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ImageContainer.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ImageContainer.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -137,7 +137,7 @@
   if (flag == ENABLE_ASYNC && ImageBridgeChild::IsCreated()) {
     // the refcount of this ImageClient is 1. we don't use a RefPtr here because the refcount
     // of this class must be done on the ImageBridge thread.
-    mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(CompositableType::BUFFER_IMAGE_SINGLE).drop();
+    mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(CompositableType::IMAGE).drop();
     MOZ_ASSERT(mImageClient);
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -207,13 +207,11 @@
       MOZ_ASSERT(tex.get());
       compositable->UseTextureHost(tex);
 
-      if (IsAsync()) {
+      if (IsAsync() && compositable->GetLayer()) {
         ScheduleComposition(op);
         // Async layer updates don't trigger invalidation, manually tell the layer
         // that its content have changed.
-        if (compositable->GetLayer()) {
-          compositable->GetLayer()->SetInvalidRectToVisibleRegion();
-        }
+        compositable->GetLayer()->SetInvalidRectToVisibleRegion();
       }
       break;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorBench.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorBench.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorBench.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorBench.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -81,7 +81,7 @@
     float opacity = 1.f;
 
     gfx::Matrix transform2d;
-    transform2d = transform2d.Rotate(SimplePseudoRandom(i, 4) * 70.f);
+    transform2d = transform2d.PreRotate(SimplePseudoRandom(i, 4) * 70.f);
 
     gfx::Matrix4x4 transform = gfx::Matrix4x4::From2D(transform2d);
 
@@ -241,7 +241,7 @@
   }
 
   TemporaryRef<Effect> CreateEffect(size_t i) {
-    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT);
+    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT, true);
     return effect;
   }
 };
@@ -285,7 +285,7 @@
   }
 
   virtual TemporaryRef<Effect> CreateEffect(size_t i) {
-    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT);
+    RefPtr<TexturedEffect> effect = CreateTexturedEffect(SurfaceFormat::B8G8R8A8, mTexture, Filter::POINT, true);
     return effect;
   }
 };
@@ -405,7 +405,7 @@
       aCompositor->BeginFrame(
         nsIntRect(screenRect.x, screenRect.y,
                   screenRect.width, screenRect.height),
-        nullptr, gfx::Matrix(), aScreenRect);
+        nullptr, aScreenRect, nullptr, nullptr);
 
       test->DrawFrame(aCompositor, aScreenRect, j);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorChild.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorChild.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -89,8 +89,17 @@
     NS_RUNTIMEABORT("Couldn't Open() Compositor channel.");
     return nullptr;
   }
+
+  // We release this ref in ActorDestroy().
+  sCompositor = child.forget().take();
+
+  int32_t width;
+  int32_t height;
+  sCompositor->SendGetTileSize(&width, &height);
+  gfxPlatform::GetPlatform()->SetTileSize(width, height);
+
   // We release this ref in ActorDestroy().
-  return sCompositor = child.forget().take();
+  return sCompositor;
 }
 
 /*static*/ CompositorChild*
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorParent.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorParent.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -386,6 +386,8 @@
   if (gfxPrefs::VsyncAlignedCompositor()) {
     mCompositorVsyncObserver = new CompositorVsyncObserver(this);
   }
+
+  gfxPlatform::GetPlatform()->ComputeTileSize();
 }
 
 bool
@@ -522,6 +524,14 @@
 }
 
 bool
+CompositorParent::RecvGetTileSize(int32_t* aWidth, int32_t* aHeight)
+{
+  *aWidth = gfxPlatform::GetPlatform()->GetTileWidth();
+  *aHeight = gfxPlatform::GetPlatform()->GetTileHeight();
+  return true;
+}
+
+bool
 CompositorParent::RecvNotifyRegionInvalidated(const nsIntRegion& aRegion)
 {
   if (mLayerManager) {
@@ -1320,7 +1330,7 @@
 /*static */ void
 CompositorParent::PostInsertVsyncProfilerMarker(TimeStamp aVsyncTimestamp)
 {
-  if (profiler_is_active()) {
+  if (profiler_is_active() && sCompositorThreadHolder) {
     CompositorLoop()->PostTask(FROM_HERE,
       NewRunnableFunction(InsertVsyncProfilerMarker, aVsyncTimestamp));
   }
@@ -1348,6 +1358,7 @@
     , mNotifyAfterRemotePaint(false)
   {
     MOZ_ASSERT(NS_IsMainThread());
+    gfxPlatform::GetPlatform()->ComputeTileSize();
   }
 
   // IToplevelProtocol::CloneToplevel()
@@ -1373,6 +1384,13 @@
   virtual bool RecvNotifyRegionInvalidated(const nsIntRegion& aRegion) { return true; }
   virtual bool RecvStartFrameTimeRecording(const int32_t& aBufferSize, uint32_t* aOutStartIndex) MOZ_OVERRIDE { return true; }
   virtual bool RecvStopFrameTimeRecording(const uint32_t& aStartIndex, InfallibleTArray<float>* intervals) MOZ_OVERRIDE  { return true; }
+  virtual bool RecvGetTileSize(int32_t* aWidth, int32_t* aHeight) MOZ_OVERRIDE
+  {
+    *aWidth = gfxPlatform::GetPlatform()->GetTileWidth();
+    *aHeight = gfxPlatform::GetPlatform()->GetTileHeight();
+    return true;
+  }
+
 
   /**
    * Tells this CompositorParent to send a message when the compositor has received the transaction.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/CompositorParent.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/CompositorParent.h	2014-11-26 21:46:10.000000000 +0000
@@ -151,6 +151,8 @@
                                 const nsIntRect& aRect) MOZ_OVERRIDE;
   virtual bool RecvFlushRendering() MOZ_OVERRIDE;
 
+  virtual bool RecvGetTileSize(int32_t* aWidth, int32_t* aHeight) MOZ_OVERRIDE;
+
   virtual bool RecvNotifyRegionInvalidated(const nsIntRegion& aRegion) MOZ_OVERRIDE;
   virtual bool RecvStartFrameTimeRecording(const int32_t& aBufferSize, uint32_t* aOutStartIndex) MOZ_OVERRIDE;
   virtual bool RecvStopFrameTimeRecording(const uint32_t& aStartIndex, InfallibleTArray<float>* intervals) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/LayersMessages.ipdlh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/LayersMessages.ipdlh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/LayersMessages.ipdlh	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/LayersMessages.ipdlh	2014-11-26 21:46:10.000000000 +0000
@@ -227,6 +227,10 @@
   float preYScale;
   float inheritedXScale;
   float inheritedYScale;
+  // This is a bare pointer; LayerTransactionParent::RecvUpdate prevents this
+  // from being used when !IsSameProcess(), but we should make this truly
+  // cross process at some point by passing the HMDConfig
+  uint64_t hmdInfo;
 };
 struct ColorLayerAttributes     { LayerColor color; nsIntRect bounds; };
 struct CanvasLayerAttributes    { GraphicsFilterType filter; nsIntRect bounds; };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/LayerTransactionParent.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -48,6 +48,10 @@
 using mozilla::layout::RenderFrameParent;
 
 namespace mozilla {
+namespace gfx {
+class VRHMDInfo;
+}
+
 namespace layers {
 
 class PGrallocBufferParent;
@@ -378,6 +382,15 @@
           specific.get_ContainerLayerAttributes();
         containerLayer->SetPreScale(attrs.preXScale(), attrs.preYScale());
         containerLayer->SetInheritedScale(attrs.inheritedXScale(), attrs.inheritedYScale());
+
+        if (attrs.hmdInfo()) {
+          if (!IsSameProcess()) {
+            NS_WARNING("VR layers currently not supported with cross-process compositing");
+            return false;
+          }
+          containerLayer->SetVRHMDInfo(reinterpret_cast<mozilla::gfx::VRHMDInfo*>(attrs.hmdInfo()));
+        }
+
         break;
       }
       case Specific::TColorLayerAttributes: {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/PCompositor.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/PCompositor.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/PCompositor.ipdl	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/PCompositor.ipdl	2014-11-26 21:46:10.000000000 +0000
@@ -88,6 +88,10 @@
   // block until they are completed.
   sync FlushRendering();
 
+  // Get the size of the tiles. This number should not change at runtime.
+  sync GetTileSize()
+    returns (int32_t tileWidth, int32_t tileHeight);
+
   sync StartFrameTimeRecording(int32_t bufferSize)
     returns (uint32_t startIndex);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/ShadowLayers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/ShadowLayers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ipc/ShadowLayers.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ipc/ShadowLayers.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -610,6 +610,14 @@
       common.stickyScrollContainerId() = mutant->GetStickyScrollContainerId();
       common.stickyScrollRangeOuter() = mutant->GetStickyScrollRangeOuter();
       common.stickyScrollRangeInner() = mutant->GetStickyScrollRangeInner();
+    } else {
+#ifdef MOZ_VALGRIND
+      // Initialize these so that Valgrind doesn't complain when we send them
+      // to another process.
+      common.stickyScrollContainerId() = 0;
+      common.stickyScrollRangeOuter() = LayerRect();
+      common.stickyScrollRangeInner() = LayerRect();
+#endif
     }
     common.scrollbarTargetContainerId() = mutant->GetScrollbarTargetContainerId();
     common.scrollbarDirection() = mutant->GetScrollbarDirection();
@@ -634,7 +642,7 @@
 
   AutoInfallibleTArray<Edit, 10> cset;
   size_t nCsets = mTxn->mCset.size() + mTxn->mPaints.size();
-  NS_ABORT_IF_FALSE(nCsets > 0 || mWindowOverlayChanged, "should have bailed by now");
+  NS_ABORT_IF_FALSE(nCsets > 0 || mWindowOverlayChanged || mTxn->RotationChanged(), "should have bailed by now");
 
   cset.SetCapacity(nCsets);
   if (!mTxn->mCset.empty()) {
@@ -730,13 +738,13 @@
 bool
 ShadowLayerForwarder::IPCOpen() const
 {
-  return mShadowManager->IPCOpen();
+  return HasShadowManager() && mShadowManager->IPCOpen();
 }
 
 bool
 ShadowLayerForwarder::IsSameProcess() const
 {
-  if (!mShadowManager->IPCOpen()) {
+  if (!HasShadowManager() || !mShadowManager->IPCOpen()) {
     return false;
   }
   return mShadowManager->OtherProcess() == kInvalidProcessHandle;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerMetricsWrapper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerMetricsWrapper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerMetricsWrapper.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerMetricsWrapper.h	2014-11-26 21:46:09.000000000 +0000
@@ -299,6 +299,16 @@
     return gfx::Matrix4x4();
   }
 
+  EventRegions GetEventRegions() const
+  {
+    MOZ_ASSERT(IsValid());
+
+    if (AtBottomLayer()) {
+      return mLayer->GetEventRegions();
+    }
+    return EventRegions();
+  }
+
   RefLayer* AsRefLayer() const
   {
     MOZ_ASSERT(IsValid());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerScope.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerScope.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerScope.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerScope.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Endian.h"
 #include "TexturePoolOGL.h"
 #include "mozilla/layers/CompositorOGL.h"
+#include "mozilla/layers/CompositorParent.h"
 #include "mozilla/layers/LayerManagerComposite.h"
 #include "mozilla/layers/TextureHostOGL.h"
 
@@ -333,7 +334,7 @@
     static void CreateServerSocket()
     {
         // Create Web Server Socket (which has to be on the main thread)
-        NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
+        MOZ_ASSERT(NS_IsMainThread(), "Wrong thread!");
         if (!sWebSocketManager) {
             sWebSocketManager = new LayerScopeWebSocketManager();
         }
@@ -651,6 +652,16 @@
 
 NS_IMPL_ISUPPORTS(DebugDataSender, nsIRunnable);
 
+
+class CreateServerSocketRunnable : public nsRunnable
+{
+public:
+    NS_IMETHOD Run() {
+        WebSocketHelper::CreateServerSocket();
+        return NS_OK;
+    }
+};
+
 /*
  * LayerScope SendXXX Structure
  * 1. SendLayer
@@ -915,15 +926,19 @@
         return;
     }
 
-    // Note: The server socket has to be created on the main thread
-    WebSocketHelper::CreateServerSocket();
-}
-
-void
-LayerScope::DeInit()
-{
-    // Destroy Web Server Socket
-    WebSocketHelper::DestroyServerSocket();
+    if (NS_IsMainThread()) {
+        WebSocketHelper::CreateServerSocket();
+    } else {
+        // Dispatch creation to main thread, and make sure we
+        // dispatch this only once after booting
+        static bool dispatched = false;
+        if (dispatched) {
+            return;
+        }
+        DebugOnly<nsresult> rv = NS_DispatchToMainThread(new CreateServerSocketRunnable());
+        MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to dispatch WebSocket Creation to main thread");
+        dispatched = true;
+    }
 }
 
 void
@@ -965,7 +980,14 @@
 bool
 LayerScope::CheckSendable()
 {
+    // Only compositor threads check LayerScope status
+    MOZ_ASSERT(CompositorParent::IsInCompositorThread());
+
+    if (!gfxPrefs::LayerScopeEnabled()) {
+        return false;
+    }
     if (!WebSocketHelper::GetSocketManager()) {
+        Init();
         return false;
     }
     if (!WebSocketHelper::GetSocketManager()->IsConnected()) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerScope.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerScope.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerScope.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerScope.h	2014-11-26 21:46:09.000000000 +0000
@@ -24,8 +24,6 @@
 
 class LayerScope {
 public:
-    static void Init();
-    static void DeInit();
     static void SendEffectChain(gl::GLContext* aGLContext,
                                 const EffectChain& aEffectChain,
                                 int aWidth,
@@ -36,6 +34,9 @@
     static void SendLayerDump(UniquePtr<layerscope::Packet> aPacket);
     static bool CheckSendable();
     static void CleanLayer();
+
+private:
+    static void Init();
 };
 
 // Perform BeginFrame and EndFrame automatically
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Layers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Layers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Layers.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Layers.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -806,7 +806,15 @@
     bool maskIs2D = mMaskLayer->GetTransform().CanDraw2D();
     NS_ASSERTION(maskIs2D, "How did we end up with a 3D transform here?!");
 #endif
-    mMaskLayer->mEffectiveTransform = mMaskLayer->GetTransform() * mMaskLayer->mEffectiveTransform;
+    // Use our shadow transform and base transform to compute a delta for the
+    // mask layer's effective transform, as though it was also transformed by
+    // the APZ.
+    //
+    // Note: This will fail if the base transform is degenerate. Currently, this
+    //       is not expected for OMTA transformed layers.
+    mMaskLayer->mEffectiveTransform = mMaskLayer->GetTransform() *
+      GetTransform().Inverse() * GetLocalTransform() *
+      mMaskLayer->mEffectiveTransform;
   }
 }
 
@@ -830,7 +838,8 @@
     mInheritedYScale(1.0f),
     mUseIntermediateSurface(false),
     mSupportsComponentAlphaChildren(false),
-    mMayHaveReadbackChild(false)
+    mMayHaveReadbackChild(false),
+    mChildrenChanged(false)
 {
   mContentFlags = 0; // Clear NO_TEXT, NO_TEXT_OVER_TRANSPARENT
 }
@@ -985,7 +994,8 @@
 ContainerLayer::FillSpecificAttributes(SpecificLayerAttributes& aAttrs)
 {
   aAttrs = ContainerLayerAttributes(mPreXScale, mPreYScale,
-                                    mInheritedXScale, mInheritedYScale);
+                                    mInheritedXScale, mInheritedYScale,
+                                    reinterpret_cast<uint64_t>(mHMDInfo.get()));
 }
 
 bool
@@ -1476,11 +1486,8 @@
   } else {
     aStream << " [not visible]";
   }
-  if (!mEventRegions.mHitRegion.IsEmpty()) {
-    AppendToString(aStream, mEventRegions.mHitRegion, " [hitregion=", "]");
-  }
-  if (!mEventRegions.mDispatchToContentHitRegion.IsEmpty()) {
-    AppendToString(aStream, mEventRegions.mDispatchToContentHitRegion, " [dispatchtocontentregion=", "]");
+  if (!mEventRegions.IsEmpty()) {
+    AppendToString(aStream, mEventRegions, " ", "");
   }
   if (1.0 != mOpacity) {
     aStream << nsPrintfCString(" [opacity=%g]", mOpacity).get();
@@ -1652,6 +1659,9 @@
   if (1.0 != mPreXScale || 1.0 != mPreYScale) {
     aStream << nsPrintfCString(" [preScale=%g, %g]", mPreXScale, mPreYScale).get();
   }
+  if (mHMDInfo) {
+    aStream << nsPrintfCString(" [hmd=%p]", mHMDInfo.get()).get();
+  }
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Layers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Layers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/Layers.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/Layers.h	2014-11-26 21:46:10.000000000 +0000
@@ -45,6 +45,7 @@
 #include "nscore.h"                     // for nsACString, nsAString
 #include "prlog.h"                      // for PRLogModuleInfo
 #include "gfx2DGlue.h"
+#include "gfxVR.h"
 
 class gfxContext;
 
@@ -1889,6 +1890,16 @@
    */
   static bool HasOpaqueAncestorLayer(Layer* aLayer);
 
+  void SetChildrenChanged(bool aVal) {
+    mChildrenChanged = aVal;
+  }
+
+  /**
+   * VR
+   */
+  void SetVRHMDInfo(gfx::VRHMDInfo* aHMD) { mHMDInfo = aHMD; }
+  gfx::VRHMDInfo* GetVRHMDInfo() { return mHMDInfo; }
+
 protected:
   friend class ReadbackProcessor;
 
@@ -1931,6 +1942,10 @@
   bool mUseIntermediateSurface;
   bool mSupportsComponentAlphaChildren;
   bool mMayHaveReadbackChild;
+  // This is updated by ComputeDifferences. This will be true if we need to invalidate
+  // the intermediate surface.
+  bool mChildrenChanged;
+  nsRefPtr<gfx::VRHMDInfo> mHMDInfo;
 };
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayersLogging.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayersLogging.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayersLogging.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayersLogging.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -108,6 +108,23 @@
 }
 
 void
+AppendToString(std::stringstream& aStream, const nsRegion& r,
+               const char* pfx, const char* sfx)
+{
+  aStream << pfx;
+
+  nsRegionRectIterator it(r);
+  aStream << "< ";
+  while (const nsRect* sr = it.Next()) {
+    AppendToString(aStream, *sr);
+    aStream << "; ";
+  }
+  aStream << ">";
+
+  aStream << sfx;
+}
+
+void
 AppendToString(std::stringstream& aStream, const nsIntRegion& r,
                const char* pfx, const char* sfx)
 {
@@ -125,6 +142,20 @@
 }
 
 void
+AppendToString(std::stringstream& aStream, const EventRegions& e,
+               const char* pfx, const char* sfx)
+{
+  aStream << pfx << "{";
+  if (!e.mHitRegion.IsEmpty()) {
+    AppendToString(aStream, e.mHitRegion, " hitregion=", "");
+  }
+  if (!e.mDispatchToContentHitRegion.IsEmpty()) {
+    AppendToString(aStream, e.mDispatchToContentHitRegion, " dispatchtocontentregion=", "");
+  }
+  aStream << "}" << sfx;
+}
+
+void
 AppendToString(std::stringstream& aStream, const nsIntSize& sz,
                const char* pfx, const char* sfx)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayersLogging.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayersLogging.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayersLogging.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayersLogging.h	2014-11-26 21:46:10.000000000 +0000
@@ -13,7 +13,7 @@
 #include "mozilla/layers/CompositorTypes.h"  // for TextureFlags
 #include "nsAString.h"
 #include "nsPrintfCString.h"            // for nsPrintfCString
-#include "nsRegion.h"                   // for nsIntRegion
+#include "nsRegion.h"                   // for nsRegion, nsIntRegion
 #include "nscore.h"                     // for nsACString, etc
 
 struct gfxRGBA;
@@ -94,10 +94,18 @@
 }
 
 void
+AppendToString(std::stringstream& aStream, const nsRegion& r,
+               const char* pfx="", const char* sfx="");
+
+void
 AppendToString(std::stringstream& aStream, const nsIntRegion& r,
                const char* pfx="", const char* sfx="");
 
 void
+AppendToString(std::stringstream& aStream, const EventRegions& e,
+               const char* pfx="", const char* sfx="");
+
+void
 AppendToString(std::stringstream& aStream, const nsIntSize& sz,
                const char* pfx="", const char* sfx="");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayersTypes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayersTypes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayersTypes.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayersTypes.h	2014-11-26 21:46:10.000000000 +0000
@@ -162,6 +162,15 @@
   nsIntRegion mHitRegion;
   nsIntRegion mDispatchToContentHitRegion;
 
+  EventRegions()
+  {
+  }
+
+  explicit EventRegions(nsIntRegion aHitRegion)
+    : mHitRegion(aHitRegion)
+  {
+  }
+
   bool operator==(const EventRegions& aRegions) const
   {
     return mHitRegion == aRegions.mHitRegion &&
@@ -172,6 +181,36 @@
     return !(*this == aRegions);
   }
 
+  void OrWith(const EventRegions& aOther)
+  {
+    mHitRegion.OrWith(aOther.mHitRegion);
+    mDispatchToContentHitRegion.OrWith(aOther.mDispatchToContentHitRegion);
+  }
+
+  void AndWith(const nsIntRegion& aRegion)
+  {
+    mHitRegion.AndWith(aRegion);
+    mDispatchToContentHitRegion.AndWith(aRegion);
+  }
+
+  void Sub(const EventRegions& aMinuend, const nsIntRegion& aSubtrahend)
+  {
+    mHitRegion.Sub(aMinuend.mHitRegion, aSubtrahend);
+    mDispatchToContentHitRegion.Sub(aMinuend.mDispatchToContentHitRegion, aSubtrahend);
+  }
+
+  void Transform(const gfx3DMatrix& aTransform)
+  {
+    mHitRegion.Transform(aTransform);
+    mDispatchToContentHitRegion.Transform(aTransform);
+  }
+
+  bool IsEmpty() const
+  {
+    return mHitRegion.IsEmpty()
+        && mDispatchToContentHitRegion.IsEmpty();
+  }
+
   nsCString ToString() const
   {
     nsCString result = mHitRegion.ToString();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerTreeInvalidation.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerTreeInvalidation.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/LayerTreeInvalidation.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/LayerTreeInvalidation.cpp	2014-11-26 21:46:09.000000000 +0000
@@ -151,13 +151,7 @@
       result = OldTransformedBounds();
       AddRegion(result, NewTransformedBounds());
 
-      // If we don't have to generate invalidations separately for child
-      // layers then we can just stop here since we've already invalidated the entire
-      // old and new bounds.
-      if (!aCallback) {
-        ClearInvalidations(mLayer);
-        return result;
-      }
+      // We can't bail out early because we need to update mChildrenChanged.
     }
 
     AddRegion(result, ComputeChangeInternal(aCallback, aGeometryChanged));
@@ -227,19 +221,16 @@
     ContainerLayer* container = mLayer->AsContainerLayer();
     nsIntRegion result;
 
+    bool childrenChanged = false;
+
     if (mPreXScale != container->GetPreXScale() ||
         mPreYScale != container->GetPreYScale()) {
       aGeometryChanged = true;
       result = OldTransformedBounds();
       AddRegion(result, NewTransformedBounds());
+      childrenChanged = true;
 
-      // If we don't have to generate invalidations separately for child
-      // layers then we can just stop here since we've already invalidated the entire
-      // old and new bounds.
-      if (!aCallback) {
-        ClearInvalidations(mLayer);
-        return result;
-      }
+      // Can't bail out early, we need to update the child container layers
     }
 
     // A low frame rate is especially visible to users when scrolling, so we
@@ -270,13 +261,18 @@
             // encounter them in the new list):
             for (uint32_t j = i; j < childsOldIndex; ++j) {
               AddRegion(result, mChildren[j]->OldTransformedBounds());
+              childrenChanged |= true;
             }
-            // Invalidate any regions of the child that have changed: 
-            AddRegion(result, mChildren[childsOldIndex]->ComputeChange(aCallback, aGeometryChanged));
+            // Invalidate any regions of the child that have changed:
+            nsIntRegion region = mChildren[childsOldIndex]->ComputeChange(aCallback, aGeometryChanged);
             i = childsOldIndex + 1;
+            if (!region.IsEmpty()) {
+              AddRegion(result, region);
+              childrenChanged |= true;
+            }
           } else {
             // We've already seen this child in mChildren (which means it must
-            // have been reordered) and invalidated its old area. We need to 
+            // have been reordered) and invalidated its old area. We need to
             // invalidate its new area too:
             invalidateChildsCurrentArea = true;
           }
@@ -297,10 +293,12 @@
           ClearInvalidations(child);
         }
       }
+      childrenChanged |= invalidateChildsCurrentArea;
     }
 
     // Process remaining removed children.
     while (i < mChildren.Length()) {
+      childrenChanged |= true;
       AddRegion(result, mChildren[i]->OldTransformedBounds());
       i++;
     }
@@ -309,7 +307,12 @@
       aCallback(container, result);
     }
 
+    if (childrenChanged) {
+      container->SetChildrenChanged(true);
+    }
+
     result.Transform(gfx::To3DMatrix(mLayer->GetLocalTransform()));
+
     return result;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/moz.build	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/moz.build	2014-11-26 21:46:10.000000000 +0000
@@ -313,6 +313,7 @@
     'LayerSorter.cpp',
     'opengl/CompositingRenderTargetOGL.cpp',
     'opengl/CompositorOGL.cpp',
+    'opengl/GLBlitTextureImageHelper.cpp',
     'opengl/OGLShaderProgram.cpp',
     'opengl/TextureClientOGL.cpp',
     'opengl/TextureHostOGL.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/CompositingRenderTargetOGL.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -16,6 +16,7 @@
 
 CompositingRenderTargetOGL::~CompositingRenderTargetOGL()
 {
+  mGL->MakeCurrent();
   mGL->fDeleteTextures(1, &mTextureHandle);
   mGL->fDeleteFramebuffers(1, &mFBO);
 }
@@ -58,6 +59,13 @@
 
     mCompositor->PrepareViewport(mInitParams.mSize);
   }
+
+  if (mClearOnBind) {
+    mGL->fScissor(0, 0, mInitParams.mSize.width, mInitParams.mSize.height);
+    mGL->fClearColor(0.0, 0.0, 0.0, 0.0);
+    mGL->fClear(LOCAL_GL_COLOR_BUFFER_BIT);
+    mClearOnBind = false;
+  }
 }
 
 #ifdef MOZ_DUMP_PAINTING
@@ -99,6 +107,7 @@
   if (mInitParams.mInit == INIT_MODE_CLEAR) {
     mGL->fClearColor(0.0, 0.0, 0.0, 0.0);
     mGL->fClear(LOCAL_GL_COLOR_BUFFER_BIT);
+    mClearOnBind = false;
   }
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/CompositorOGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/CompositorOGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/CompositorOGL.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/CompositorOGL.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -39,6 +39,7 @@
 #include "nsString.h"                   // for nsString, nsAutoCString, etc
 #include "ScopedGLHelpers.h"
 #include "GLReadTexImageHelper.h"
+#include "GLBlitTextureImageHelper.h"
 #include "TiledLayerBuffer.h"           // for TiledLayerComposer
 #include "HeapCopyOfStackArray.h"
 
@@ -86,6 +87,7 @@
   , mFrameInProgress(false)
   , mDestroyed(false)
   , mHeight(0)
+  , mCurrentProgram(nullptr)
 {
   MOZ_COUNT_CTOR(CompositorOGL);
   SetBackend(LayersBackend::LAYERS_OPENGL);
@@ -174,6 +176,9 @@
   }
 
   mGLContext->MakeCurrent();
+
+  mBlitTextureImageHelper = nullptr;
+
   mContextStateTracker.DestroyOGL(mGLContext);
 
   // On the main thread the Widget will be destroyed soon and calling MakeCurrent
@@ -811,6 +816,23 @@
   return shader;
 }
 
+void
+CompositorOGL::ActivateProgram(ShaderProgramOGL* aProg)
+{
+  if (mCurrentProgram != aProg) {
+    gl()->fUseProgram(aProg->GetProgram());
+    mCurrentProgram = aProg;
+  }
+}
+
+void
+CompositorOGL::ResetProgram()
+{
+  mCurrentProgram = nullptr;
+}
+
+
+
 static bool SetBlendMode(GLContext* aGL, gfx::CompositionOp aBlendMode, bool aIsPremultiplied = true)
 {
   if (aBlendMode == gfx::CompositionOp::OP_OVER && aIsPremultiplied) {
@@ -953,7 +975,7 @@
   ShaderConfigOGL config = GetShaderConfigFor(aEffectChain.mPrimaryEffect, maskType, blendMode, colorMatrix);
   config.SetOpacity(aOpacity != 1.f);
   ShaderProgramOGL *program = GetShaderProgramFor(config);
-  program->Activate();
+  ActivateProgram(program);
   program->SetProjectionMatrix(mProjMatrix);
   program->SetLayerTransform(aTransform);
 
@@ -1383,7 +1405,7 @@
 CompositorOGL::CreateDataTextureSource(TextureFlags aFlags)
 {
   RefPtr<DataTextureSource> result =
-    new TextureImageTextureSourceOGL(mGLContext, aFlags);
+    new TextureImageTextureSourceOGL(this, aFlags);
   return result;
 }
 
@@ -1439,6 +1461,18 @@
   mGLContext->fDrawArrays(LOCAL_GL_TRIANGLES, 0, 6 * aQuads);
 }
 
+GLBlitTextureImageHelper*
+CompositorOGL::BlitTextureImageHelper()
+{
+    if (!mBlitTextureImageHelper) {
+        mBlitTextureImageHelper = MakeUnique<GLBlitTextureImageHelper>(this);
+    }
+
+    return mBlitTextureImageHelper.get();
+}
+
+
+
 GLuint
 CompositorOGL::GetTemporaryTexture(GLenum aTarget, GLenum aUnit)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/CompositorOGL.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/CompositorOGL.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/CompositorOGL.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/CompositorOGL.h	2014-11-26 21:46:10.000000000 +0000
@@ -54,7 +54,7 @@
 class TextureSource;
 struct Effect;
 struct EffectChain;
-
+class GLBlitTextureImageHelper;
 /**
  * Interface for pools of temporary gl textures for the compositor.
  * The textures are fully owned by the pool, so the latter is responsible
@@ -255,10 +255,17 @@
   virtual nsIWidget* GetWidget() const MOZ_OVERRIDE { return mWidget; }
 
   GLContext* gl() const { return mGLContext; }
+  /**
+   * Clear the program state. This must be called
+   * before operating on the GLContext directly. */
+  void ResetProgram();
+
   gfx::SurfaceFormat GetFBOFormat() const {
     return gfx::SurfaceFormat::R8G8B8A8;
   }
 
+  GLBlitTextureImageHelper* BlitTextureImageHelper();
+
   /**
    * The compositor provides with temporary textures for use with direct
    * textruing like gralloc texture.
@@ -280,6 +287,7 @@
   nsIWidget *mWidget;
   nsIntSize mWidgetSize;
   nsRefPtr<GLContext> mGLContext;
+  UniquePtr<GLBlitTextureImageHelper> mBlitTextureImageHelper;
   gfx::Matrix4x4 mProjMatrix;
 
   /** The size of the surface we are rendering to */
@@ -367,6 +375,7 @@
                                       const gfx::Rect& aTexCoordRect,
                                       TextureSource *aTexture);
 
+  void ActivateProgram(ShaderProgramOGL *aProg);
   void CleanupResources();
 
   /**
@@ -399,6 +408,7 @@
   GLint mHeight;
 
   FenceHandle mReleaseFenceHandle;
+  ShaderProgramOGL *mCurrentProgram;
 };
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -0,0 +1,281 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=4 et sw=4 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 "GLBlitTextureImageHelper.h"
+#include "GLUploadHelpers.h"
+#include "DecomposeIntoNoRepeatTriangles.h"
+#include "GLContext.h"
+#include "GLTextureImage.h"
+#include "ScopedGLHelpers.h"
+#include "nsRect.h"
+#include "gfx2DGlue.h"
+#include "gfxUtils.h"
+#include "CompositorOGL.h"
+
+using namespace mozilla::gl;
+
+namespace mozilla {
+namespace layers {
+
+GLBlitTextureImageHelper::GLBlitTextureImageHelper(CompositorOGL* aCompositor)
+    : mCompositor(aCompositor)
+    , mBlitProgram(0)
+    , mBlitFramebuffer(0)
+
+{
+}
+
+GLBlitTextureImageHelper::~GLBlitTextureImageHelper()
+{
+    GLContext *gl = mCompositor->gl();
+    // Likely used by OGL Layers.
+    gl->fDeleteProgram(mBlitProgram);
+    gl->fDeleteFramebuffers(1, &mBlitFramebuffer);
+}
+
+void
+GLBlitTextureImageHelper::BlitTextureImage(TextureImage *aSrc, const nsIntRect& aSrcRect,
+                                           TextureImage *aDst, const nsIntRect& aDstRect)
+{
+    GLContext *gl = mCompositor->gl();
+    NS_ASSERTION(!aSrc->InUpdate(), "Source texture is in update!");
+    NS_ASSERTION(!aDst->InUpdate(), "Destination texture is in update!");
+
+    if (!aSrc || !aDst || aSrcRect.IsEmpty() || aDstRect.IsEmpty())
+        return;
+
+    int savedFb = 0;
+    gl->fGetIntegerv(LOCAL_GL_FRAMEBUFFER_BINDING, &savedFb);
+
+    ScopedGLState scopedScissorTestState(gl, LOCAL_GL_SCISSOR_TEST, false);
+    ScopedGLState scopedBlendState(gl, LOCAL_GL_BLEND, false);
+
+    // 2.0 means scale up by two
+    float blitScaleX = float(aDstRect.width) / float(aSrcRect.width);
+    float blitScaleY = float(aDstRect.height) / float(aSrcRect.height);
+
+    // We start iterating over all destination tiles
+    aDst->BeginBigImageIteration();
+    do {
+        // calculate portion of the tile that is going to be painted to
+        nsIntRect dstSubRect;
+        nsIntRect dstTextureRect = ThebesIntRect(aDst->GetTileRect());
+        dstSubRect.IntersectRect(aDstRect, dstTextureRect);
+
+        // this tile is not part of the destination rectangle aDstRect
+        if (dstSubRect.IsEmpty())
+            continue;
+
+        // (*) transform the rect of this tile into the rectangle defined by aSrcRect...
+        nsIntRect dstInSrcRect(dstSubRect);
+        dstInSrcRect.MoveBy(-aDstRect.TopLeft());
+        // ...which might be of different size, hence scale accordingly
+        dstInSrcRect.ScaleRoundOut(1.0f / blitScaleX, 1.0f / blitScaleY);
+        dstInSrcRect.MoveBy(aSrcRect.TopLeft());
+
+        SetBlitFramebufferForDestTexture(aDst->GetTextureID());
+        UseBlitProgram();
+
+        aSrc->BeginBigImageIteration();
+        // now iterate over all tiles in the source Image...
+        do {
+            // calculate portion of the source tile that is in the source rect
+            nsIntRect srcSubRect;
+            nsIntRect srcTextureRect = ThebesIntRect(aSrc->GetTileRect());
+            srcSubRect.IntersectRect(aSrcRect, srcTextureRect);
+
+            // this tile is not part of the source rect
+            if (srcSubRect.IsEmpty()) {
+                continue;
+            }
+            // calculate intersection of source rect with destination rect
+            srcSubRect.IntersectRect(srcSubRect, dstInSrcRect);
+            // this tile does not overlap the current destination tile
+            if (srcSubRect.IsEmpty()) {
+                continue;
+            }
+            // We now have the intersection of
+            //     the current source tile
+            // and the desired source rectangle
+            // and the destination tile
+            // and the desired destination rectange
+            // in destination space.
+            // We need to transform this back into destination space, inverting the transform from (*)
+            nsIntRect srcSubInDstRect(srcSubRect);
+            srcSubInDstRect.MoveBy(-aSrcRect.TopLeft());
+            srcSubInDstRect.ScaleRoundOut(blitScaleX, blitScaleY);
+            srcSubInDstRect.MoveBy(aDstRect.TopLeft());
+
+            // we transform these rectangles to be relative to the current src and dst tiles, respectively
+            nsIntSize srcSize = srcTextureRect.Size();
+            nsIntSize dstSize = dstTextureRect.Size();
+            srcSubRect.MoveBy(-srcTextureRect.x, -srcTextureRect.y);
+            srcSubInDstRect.MoveBy(-dstTextureRect.x, -dstTextureRect.y);
+
+            float dx0 = 2.0f * float(srcSubInDstRect.x) / float(dstSize.width) - 1.0f;
+            float dy0 = 2.0f * float(srcSubInDstRect.y) / float(dstSize.height) - 1.0f;
+            float dx1 = 2.0f * float(srcSubInDstRect.x + srcSubInDstRect.width) / float(dstSize.width) - 1.0f;
+            float dy1 = 2.0f * float(srcSubInDstRect.y + srcSubInDstRect.height) / float(dstSize.height) - 1.0f;
+            ScopedViewportRect autoViewportRect(gl, 0, 0, dstSize.width, dstSize.height);
+
+            RectTriangles rects;
+
+            nsIntSize realTexSize = srcSize;
+            if (!CanUploadNonPowerOfTwo(gl)) {
+                realTexSize = nsIntSize(gfx::NextPowerOfTwo(srcSize.width),
+                                        gfx::NextPowerOfTwo(srcSize.height));
+            }
+
+            if (aSrc->GetWrapMode() == LOCAL_GL_REPEAT) {
+                rects.addRect(/* dest rectangle */
+                        dx0, dy0, dx1, dy1,
+                        /* tex coords */
+                        srcSubRect.x / float(realTexSize.width),
+                        srcSubRect.y / float(realTexSize.height),
+                        srcSubRect.XMost() / float(realTexSize.width),
+                        srcSubRect.YMost() / float(realTexSize.height));
+            } else {
+                DecomposeIntoNoRepeatTriangles(srcSubRect, realTexSize, rects);
+
+                // now put the coords into the d[xy]0 .. d[xy]1 coordinate space
+                // from the 0..1 that it comes out of decompose
+                InfallibleTArray<RectTriangles::coord>& coords = rects.vertCoords();
+
+                for (unsigned int i = 0; i < coords.Length(); ++i) {
+                    coords[i].x = (coords[i].x * (dx1 - dx0)) + dx0;
+                    coords[i].y = (coords[i].y * (dy1 - dy0)) + dy0;
+                }
+            }
+
+            ScopedBindTextureUnit autoTexUnit(gl, LOCAL_GL_TEXTURE0);
+            ScopedBindTexture autoTex(gl, aSrc->GetTextureID());
+            ScopedVertexAttribPointer autoAttrib0(gl, 0, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0, 0, rects.vertCoords().Elements());
+            ScopedVertexAttribPointer autoAttrib1(gl, 1, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, 0, 0, rects.texCoords().Elements());
+
+            gl->fDrawArrays(LOCAL_GL_TRIANGLES, 0, rects.elements());
+
+        } while (aSrc->NextTile());
+    } while (aDst->NextTile());
+
+    // unbind the previous texture from the framebuffer
+    SetBlitFramebufferForDestTexture(0);
+
+    gl->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, savedFb);
+}
+
+void
+GLBlitTextureImageHelper::SetBlitFramebufferForDestTexture(GLuint aTexture)
+{
+    GLContext *gl = mCompositor->gl();
+    if (!mBlitFramebuffer) {
+        gl->fGenFramebuffers(1, &mBlitFramebuffer);
+    }
+
+    gl->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, mBlitFramebuffer);
+    gl->fFramebufferTexture2D(LOCAL_GL_FRAMEBUFFER,
+                               LOCAL_GL_COLOR_ATTACHMENT0,
+                               LOCAL_GL_TEXTURE_2D,
+                               aTexture,
+                               0);
+
+    GLenum result = gl->fCheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER);
+    if (aTexture && (result != LOCAL_GL_FRAMEBUFFER_COMPLETE)) {
+        nsAutoCString msg;
+        msg.AppendLiteral("Framebuffer not complete -- error 0x");
+        msg.AppendInt(result, 16);
+        // Note: if you are hitting this, it is likely that
+        // your texture is not texture complete -- that is, you
+        // allocated a texture name, but didn't actually define its
+        // size via a call to TexImage2D.
+        NS_RUNTIMEABORT(msg.get());
+    }
+}
+
+void
+GLBlitTextureImageHelper::UseBlitProgram()
+{
+    // XXX: GLBlitTextureImageHelper doesn't use ShaderProgramOGL
+    // so we need to Reset the program
+    mCompositor->ResetProgram();
+
+    GLContext *gl = mCompositor->gl();
+    if (mBlitProgram) {
+        gl->fUseProgram(mBlitProgram);
+        return;
+    }
+
+    mBlitProgram = gl->fCreateProgram();
+
+    GLuint shaders[2];
+    shaders[0] = gl->fCreateShader(LOCAL_GL_VERTEX_SHADER);
+    shaders[1] = gl->fCreateShader(LOCAL_GL_FRAGMENT_SHADER);
+
+    const char *blitVSSrc =
+        "attribute vec2 aVertex;"
+        "attribute vec2 aTexCoord;"
+        "varying vec2 vTexCoord;"
+        "void main() {"
+        "  vTexCoord = aTexCoord;"
+        "  gl_Position = vec4(aVertex, 0.0, 1.0);"
+        "}";
+    const char *blitFSSrc = "#ifdef GL_ES\nprecision mediump float;\n#endif\n"
+        "uniform sampler2D uSrcTexture;"
+        "varying vec2 vTexCoord;"
+        "void main() {"
+        "  gl_FragColor = texture2D(uSrcTexture, vTexCoord);"
+        "}";
+
+    gl->fShaderSource(shaders[0], 1, (const GLchar**) &blitVSSrc, nullptr);
+    gl->fShaderSource(shaders[1], 1, (const GLchar**) &blitFSSrc, nullptr);
+
+    for (int i = 0; i < 2; ++i) {
+        GLint success, len = 0;
+
+        gl->fCompileShader(shaders[i]);
+        gl->fGetShaderiv(shaders[i], LOCAL_GL_COMPILE_STATUS, &success);
+        NS_ASSERTION(success, "Shader compilation failed!");
+
+        if (!success) {
+            nsAutoCString log;
+            gl->fGetShaderiv(shaders[i], LOCAL_GL_INFO_LOG_LENGTH, (GLint*) &len);
+            log.SetCapacity(len);
+            gl->fGetShaderInfoLog(shaders[i], len, (GLint*) &len, (char*) log.BeginWriting());
+            log.SetLength(len);
+
+            printf_stderr("Shader %d compilation failed:\n%s\n", i, log.get());
+            return;
+        }
+
+        gl->fAttachShader(mBlitProgram, shaders[i]);
+        gl->fDeleteShader(shaders[i]);
+    }
+
+    gl->fBindAttribLocation(mBlitProgram, 0, "aVertex");
+    gl->fBindAttribLocation(mBlitProgram, 1, "aTexCoord");
+
+    gl->fLinkProgram(mBlitProgram);
+
+    GLint success, len = 0;
+    gl->fGetProgramiv(mBlitProgram, LOCAL_GL_LINK_STATUS, &success);
+    NS_ASSERTION(success, "Shader linking failed!");
+
+    if (!success) {
+        nsAutoCString log;
+        gl->fGetProgramiv(mBlitProgram, LOCAL_GL_INFO_LOG_LENGTH, (GLint*) &len);
+        log.SetCapacity(len);
+        gl->fGetProgramInfoLog(mBlitProgram, len, (GLint*) &len, (char*) log.BeginWriting());
+        log.SetLength(len);
+
+        printf_stderr("Program linking failed:\n%s\n", log.get());
+        return;
+    }
+
+    gl->fUseProgram(mBlitProgram);
+    gl->fUniform1i(gl->fGetUniformLocation(mBlitProgram, "uSrcTexture"), 0);
+}
+
+}
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLBlitTextureImageHelper.h	2014-11-26 21:46:10.000000000 +0000
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=4 et sw=4 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 GLBLITTEXTUREIMAGEHELPER_H_
+#define GLBLITTEXTUREIMAGEHELPER_H_
+
+#include "mozilla/Attributes.h"
+#include "GLContextTypes.h"
+#include "GLConsts.h"
+
+struct nsIntRect;
+
+namespace mozilla {
+namespace gl {
+    class GLContext;
+    class TextureImage;
+}
+namespace layers {
+
+class CompositorOGL;
+
+class GLBlitTextureImageHelper MOZ_FINAL
+{
+    // The GLContext is the sole owner of the GLBlitTextureImageHelper.
+    CompositorOGL* mCompositor;
+
+    // lazy-initialized things
+    GLuint mBlitProgram, mBlitFramebuffer;
+    void UseBlitProgram();
+    void SetBlitFramebufferForDestTexture(GLuint aTexture);
+
+public:
+
+    explicit GLBlitTextureImageHelper(CompositorOGL *gl);
+    ~GLBlitTextureImageHelper();
+
+    /**
+     * Copy a rectangle from one TextureImage into another.  The
+     * source and destination are given in integer coordinates, and
+     * will be converted to texture coordinates.
+     *
+     * For the source texture, the wrap modes DO apply -- it's valid
+     * to use REPEAT or PAD and expect appropriate behaviour if the source
+     * rectangle extends beyond its bounds.
+     *
+     * For the destination texture, the wrap modes DO NOT apply -- the
+     * destination will be clipped by the bounds of the texture.
+     *
+     * Note: calling this function will cause the following OpenGL state
+     * to be changed:
+     *
+     *   - current program
+     *   - framebuffer binding
+     *   - viewport
+     *   - blend state (will be enabled at end)
+     *   - scissor state (will be enabled at end)
+     *   - vertex attrib 0 and 1 (pointer and enable state [enable state will be disabled at exit])
+     *   - array buffer binding (will be 0)
+     *   - active texture (will be 0)
+     *   - texture 0 binding
+     */
+    void BlitTextureImage(gl::TextureImage *aSrc, const nsIntRect& aSrcRect,
+                          gl::TextureImage *aDst, const nsIntRect& aDstRect);
+};
+
+}
+}
+
+#endif // GLBLITTEXTUREIMAGEHELPER_H_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLManager.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLManager.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -32,6 +32,11 @@
     return mImpl->gl();
   }
 
+  virtual void ActivateProgram(ShaderProgramOGL *aProg) MOZ_OVERRIDE
+  {
+    mImpl->ActivateProgram(aProg);
+  }
+
   virtual ShaderProgramOGL* GetProgram(GLenum aTarget, gfx::SurfaceFormat aFormat) MOZ_OVERRIDE
   {
     ShaderConfigOGL config = ShaderConfigFromTargetAndFormat(aTarget, aFormat);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/GLManager.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/GLManager.h	2014-11-26 21:46:10.000000000 +0000
@@ -32,6 +32,7 @@
 
   virtual gl::GLContext* gl() const = 0;
   virtual ShaderProgramOGL* GetProgram(GLenum aTarget, gfx::SurfaceFormat aFormat) = 0;
+  virtual void ActivateProgram(ShaderProgramOGL* aPrg) = 0;
   virtual const gfx::Matrix4x4& GetProjMatrix() const = 0;
   virtual void BindAndDrawQuad(ShaderProgramOGL *aProg, const gfx::Rect& aLayerRect,
                                const gfx::Rect& aTextureRect) = 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/OGLShaderProgram.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/OGLShaderProgram.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/OGLShaderProgram.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/OGLShaderProgram.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -540,17 +540,16 @@
   return true;
 }
 
-void
-ShaderProgramOGL::Activate()
+GLuint
+ShaderProgramOGL::GetProgram()
 {
   if (mProgramState == STATE_NEW) {
     if (!Initialize()) {
       NS_WARNING("Shader could not be initialised");
-      return;
     }
   }
-  NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
-  mGL->fUseProgram(mProgram);
+  MOZ_ASSERT(HasInitialized(), "Attempting to get a program that's not been initialized!");
+  return mProgram;
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/OGLShaderProgram.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/OGLShaderProgram.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/OGLShaderProgram.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/OGLShaderProgram.h	2014-11-26 21:46:10.000000000 +0000
@@ -257,7 +257,7 @@
   do {                                                                  \
     GLuint currentProgram;                                              \
     mGL->GetUIntegerv(LOCAL_GL_CURRENT_PROGRAM, &currentProgram);       \
-    NS_ASSERTION(currentProgram == mProgram,                            \
+    MOZ_ASSERT(currentProgram == mProgram,                              \
                  "SetUniform with wrong program active!");              \
   } while (0)
 #else
@@ -283,7 +283,7 @@
     return mProgramState == STATE_OK;
   }
 
-  void Activate();
+  GLuint GetProgram();
 
   bool Initialize();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/TextureHostOGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/TextureHostOGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/TextureHostOGL.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/TextureHostOGL.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -209,8 +209,9 @@
                                      nsIntRegion* aDestRegion,
                                      gfx::IntPoint* aSrcOffset)
 {
-  MOZ_ASSERT(mGL);
-  if (!mGL) {
+  GLContext *gl = mCompositor->gl();
+  MOZ_ASSERT(gl);
+  if (!gl) {
     NS_WARNING("trying to update TextureImageTextureSourceOGL without a GLContext");
     return false;
   }
@@ -222,7 +223,7 @@
       mTexImage->GetContentType() != gfx::ContentForFormat(aSurface->GetFormat())) {
     if (mFlags & TextureFlags::DISALLOW_BIGIMAGE) {
       GLint maxTextureSize;
-      mGL->fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &maxTextureSize);
+      gl->fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &maxTextureSize);
       if (size.width > maxTextureSize || size.height > maxTextureSize) {
         NS_WARNING("Texture exceeds maximum texture size, refusing upload");
         return false;
@@ -230,7 +231,7 @@
       // Explicitly use CreateBasicTextureImage instead of CreateTextureImage,
       // because CreateTextureImage might still choose to create a tiled
       // texture image.
-      mTexImage = CreateBasicTextureImage(mGL, size,
+      mTexImage = CreateBasicTextureImage(gl, size,
                                           gfx::ContentForFormat(aSurface->GetFormat()),
                                           LOCAL_GL_CLAMP_TO_EDGE,
                                           FlagsToGLFlags(mFlags),
@@ -240,7 +241,7 @@
       // require the size of the destination surface to be different from
       // the size of aSurface.
       // See bug 893300 (tracks the implementation of ContentHost for new textures).
-      mTexImage = CreateTextureImage(mGL,
+      mTexImage = CreateTextureImage(gl,
                                      size,
                                      gfx::ContentForFormat(aSurface->GetFormat()),
                                      LOCAL_GL_CLAMP_TO_EDGE,
@@ -275,7 +276,7 @@
   if (!mTexImage ||
       mTexImage->GetSize() != aSize.ToIntSize() ||
       mTexImage->GetContentType() != aContentType) {
-    mTexImage = CreateTextureImage(mGL,
+    mTexImage = CreateTextureImage(mCompositor->gl(),
                                    aSize.ToIntSize(),
                                    aContentType,
                                    LOCAL_GL_CLAMP_TO_EDGE,
@@ -294,7 +295,7 @@
     aDest->AsSourceOGL()->AsTextureImageTextureSource();
   MOZ_ASSERT(dest, "Incompatible destination type!");
 
-  mGL->BlitTextureImageHelper()->BlitTextureImage(mTexImage, aSourceRect,
+  mCompositor->BlitTextureImageHelper()->BlitTextureImage(mTexImage, aSourceRect,
                                                   dest->mTexImage, aDestRect);
   dest->mTexImage->MarkValid();
 }
@@ -304,9 +305,9 @@
 {
   CompositorOGL* glCompositor = static_cast<CompositorOGL*>(aCompositor);
 
-  if (!glCompositor || (mGL != glCompositor->gl())) {
+  if (!glCompositor || (mCompositor != glCompositor)) {
     DeallocateDeviceData();
-    mGL = glCompositor ? glCompositor->gl() : nullptr;
+    mCompositor = glCompositor;
   }
 }
 
@@ -344,7 +345,7 @@
   MOZ_ASSERT(mTexImage,
     "Trying to bind a TextureSource that does not have an underlying GL texture.");
   mTexImage->BindTexture(aTextureUnit);
-  SetFilter(mGL, aFilter);
+  SetFilter(mCompositor->gl(), aFilter);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -534,9 +535,7 @@
                                               mSize);
   }
 
-  mSurfTex->Attach(gl());
-
-  return true;
+  return NS_SUCCEEDED(mSurfTex->Attach(gl()));
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/TextureHostOGL.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/TextureHostOGL.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/opengl/TextureHostOGL.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/opengl/TextureHostOGL.h	2014-11-26 21:46:10.000000000 +0000
@@ -189,9 +189,9 @@
                                              , public BigImageIterator
 {
 public:
-  explicit TextureImageTextureSourceOGL(gl::GLContext* aGL,
+  explicit TextureImageTextureSourceOGL(CompositorOGL *aCompositor,
                                         TextureFlags aFlags = TextureFlags::DEFAULT)
-    : mGL(aGL)
+    : mCompositor(aCompositor)
     , mFlags(aFlags)
     , mIterating(false)
   {}
@@ -265,7 +265,7 @@
 
 protected:
   nsRefPtr<gl::TextureImage> mTexImage;
-  gl::GLContext* mGL;
+  RefPtr<CompositorOGL> mCompositor;
   TextureFlags mFlags;
   bool mIterating;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ReadbackProcessor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ReadbackProcessor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/ReadbackProcessor.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/ReadbackProcessor.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -9,7 +9,9 @@
 #include "ReadbackLayer.h"              // for ReadbackLayer, ReadbackSink
 #include "gfxColor.h"                   // for gfxRGBA
 #include "gfxContext.h"                 // for gfxContext
+#include "gfxUtils.h"
 #include "gfxRect.h"                    // for gfxRect
+#include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/BasePoint.h"      // for BasePoint
 #include "mozilla/gfx/BaseRect.h"       // for BaseRect
 #include "nsAutoPtr.h"                  // for nsRefPtr, nsAutoPtr
@@ -19,6 +21,8 @@
 #include "nsRegion.h"                   // for nsIntRegion
 #include "nsSize.h"                     // for nsIntSize
 
+using namespace mozilla::gfx;
+
 namespace mozilla {
 namespace layers {
 
@@ -111,10 +115,10 @@
           aLayer->mSink->BeginUpdate(aLayer->GetRect(),
                                      aLayer->AllocateSequenceNumber());
       if (ctx) {
-        ctx->SetColor(aLayer->mBackgroundColor);
+        ColorPattern color(ToDeviceColor(aLayer->mBackgroundColor));
         nsIntSize size = aLayer->GetSize();
-        ctx->Rectangle(gfxRect(0, 0, size.width, size.height));
-        ctx->Fill();
+        ctx->GetDrawTarget()->FillRect(Rect(0, 0, size.width, size.height),
+                                       color);
         aLayer->mSink->EndUpdate(ctx, aLayer->GetRect());
       }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/RotatedBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/RotatedBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/RotatedBuffer.cpp	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/RotatedBuffer.cpp	2014-11-26 21:46:10.000000000 +0000
@@ -627,6 +627,9 @@
             destBufferRect = ComputeBufferRect(neededRegion.GetBounds());
             CreateBuffer(result.mContentType, destBufferRect, bufferFlags,
                          &destDTBuffer, &destDTBufferOnWhite);
+            MOZ_ASSERT(destDTBuffer, "Failed to allocate a texture");
+            MOZ_ASSERT(destDTBufferOnWhite || !(bufferFlags & BUFFER_COMPONENT_ALPHA),
+                       "Failed to allocate the texture on white");
             if (!destDTBuffer) {
               return result;
             }
@@ -647,6 +650,9 @@
     // The buffer's not big enough, so allocate a new one
     CreateBuffer(result.mContentType, destBufferRect, bufferFlags,
                  &destDTBuffer, &destDTBufferOnWhite);
+    MOZ_ASSERT(destDTBuffer, "Failed to allocate a texture");
+    MOZ_ASSERT(destDTBufferOnWhite || !(bufferFlags & BUFFER_COMPONENT_ALPHA),
+               "Failed to allocate the texture on white");
     if (!destDTBuffer) {
       return result;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/TiledLayerBuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/TiledLayerBuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/layers/TiledLayerBuffer.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/layers/TiledLayerBuffer.h	2014-11-26 21:46:10.000000000 +0000
@@ -11,7 +11,7 @@
 
 #include <stdint.h>                     // for uint16_t, uint32_t
 #include <sys/types.h>                  // for int32_t
-#include "gfxPrefs.h"                   // for gfxPrefs::LayersTileWidth/Height
+#include "gfxPlatform.h"                // for GetTileWidth/GetTileHeight
 #include "nsDebug.h"                    // for NS_ABORT_IF_FALSE
 #include "nsPoint.h"                    // for nsIntPoint
 #include "nsRect.h"                     // for nsIntRect
@@ -94,7 +94,7 @@
     : mRetainedWidth(0)
     , mRetainedHeight(0)
     , mResolution(1)
-    , mTileSize(gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight())
+    , mTileSize(gfxPlatform::GetPlatform()->GetTileWidth(), gfxPlatform::GetPlatform()->GetTileHeight())
   {}
 
   ~TiledLayerBuffer() {}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/include/opentype-sanitiser.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/include/opentype-sanitiser.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/include/opentype-sanitiser.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/include/opentype-sanitiser.h	2014-11-26 21:46:10.000000000 +0000
@@ -215,7 +215,7 @@
 class OTS_API OTSContext {
   public:
     OTSContext() {}
-    ~OTSContext() {}
+    virtual ~OTSContext() {}
 
     // Process a given OpenType file and write out a sanitised version
     //   output: a pointer to an object implementing the OTSStream interface. The
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/ots-brotli-path.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/ots-brotli-path.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/ots-brotli-path.patch	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/ots-brotli-path.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-diff --git a/gfx/ots/src/woff2.cc b/gfx/ots/src/woff2.cc
---- a/gfx/ots/src/woff2.cc
-+++ b/gfx/ots/src/woff2.cc
-@@ -6,17 +6,17 @@
- // Condensed file format.
- 
- #include <cassert>
- #include <cstdlib>
- #include <vector>
- 
- #include <zlib.h>
- 
--#include "third_party/brotli/src/brotli/dec/decode.h"
-+#include "decode.h"
- 
- #include "opentype-sanitiser.h"
- #include "ots-memory-stream.h"
- #include "ots.h"
- #include "woff2.h"
- 
- namespace {
- 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/ots-visibility.patch thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/ots-visibility.patch
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/ots-visibility.patch	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/ots-visibility.patch	2014-11-26 21:46:10.000000000 +0000
@@ -50,7 +50,7 @@
 +class OTS_API OTSContext {
    public:
      OTSContext() {}
-     ~OTSContext() {}
+     virtual ~OTSContext() {}
  
      // Process a given OpenType file and write out a sanitised version
      //   output: a pointer to an object implementing the OTSStream interface. The
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/README.mozilla thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/README.mozilla
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/README.mozilla	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/README.mozilla	2014-11-26 21:46:10.000000000 +0000
@@ -2,7 +2,7 @@
 
 Our reference repository is https://github.com/khaledhosny/ots/.
 
-Current revision: c24a839b1c66c4de09e58fabaacb82bf3bd692a4
+Current revision: 7091a232a10a741591ff25158c98ca3f0c319cf9
 
 Upstream files included: LICENSE, src/, include/
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gasp.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gasp.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gasp.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gasp.cc	2014-11-26 21:46:10.000000000 +0000
@@ -11,10 +11,10 @@
 
 #define DROP_THIS_TABLE(...) \
   do { \
-    delete file->gasp; \
-    file->gasp = 0; \
     OTS_FAILURE_MSG_(file, TABLE_NAME ": " __VA_ARGS__); \
     OTS_FAILURE_MSG("Table discarded"); \
+    delete file->gasp; \
+    file->gasp = 0; \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gdef.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gdef.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gdef.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gdef.cc	2014-11-26 21:46:10.000000000 +0000
@@ -231,9 +231,9 @@
 
 #define DROP_THIS_TABLE(msg_) \
   do { \
+    OTS_FAILURE_MSG(msg_ ", table discarded"); \
     file->gdef->data = 0; \
     file->gdef->length = 0; \
-    OTS_FAILURE_MSG(msg_ ", table discarded"); \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gpos.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gpos.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gpos.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gpos.cc	2014-11-26 21:46:10.000000000 +0000
@@ -677,9 +677,9 @@
 
 #define DROP_THIS_TABLE(msg_) \
   do { \
+    OTS_FAILURE_MSG(msg_ ", table discarded"); \
     file->gpos->data = 0; \
     file->gpos->length = 0; \
-    OTS_FAILURE_MSG(msg_ ", table discarded"); \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gsub.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gsub.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/gsub.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/gsub.cc	2014-11-26 21:46:10.000000000 +0000
@@ -530,9 +530,9 @@
 
 #define DROP_THIS_TABLE(msg_) \
   do { \
+    OTS_FAILURE_MSG(msg_ ", table discarded"); \
     file->gsub->data = 0; \
     file->gsub->length = 0; \
-    OTS_FAILURE_MSG(msg_ ", table discarded"); \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/hdmx.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/hdmx.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/hdmx.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/hdmx.cc	2014-11-26 21:46:10.000000000 +0000
@@ -13,10 +13,10 @@
 
 #define DROP_THIS_TABLE(...) \
   do { \
-    delete file->hdmx; \
-    file->hdmx = 0; \
     OTS_FAILURE_MSG_(file, TABLE_NAME ": " __VA_ARGS__); \
     OTS_FAILURE_MSG("Table discarded"); \
+    delete file->hdmx; \
+    file->hdmx = 0; \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/kern.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/kern.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/kern.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/kern.cc	2014-11-26 21:46:10.000000000 +0000
@@ -11,9 +11,9 @@
 
 #define DROP_THIS_TABLE(msg_) \
   do { \
+    OTS_FAILURE_MSG(msg_ ", table discarded"); \
     delete file->kern; \
     file->kern = 0; \
-    OTS_FAILURE_MSG(msg_ ", table discarded"); \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/ltsh.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/ltsh.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/ltsh.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/ltsh.cc	2014-11-26 21:46:10.000000000 +0000
@@ -13,10 +13,10 @@
 
 #define DROP_THIS_TABLE(...) \
   do { \
-    delete file->ltsh; \
-    file->ltsh = 0; \
     OTS_FAILURE_MSG_(file, TABLE_NAME ": " __VA_ARGS__); \
     OTS_FAILURE_MSG("Table discarded"); \
+    delete file->ltsh; \
+    file->ltsh = 0; \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/math.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/math.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/math.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/math.cc	2014-11-26 21:46:10.000000000 +0000
@@ -518,9 +518,9 @@
 
 #define DROP_THIS_TABLE(msg_) \
   do { \
+    OTS_FAILURE_MSG(msg_ ", table discarded"); \
     file->math->data = 0; \
     file->math->length = 0; \
-    OTS_FAILURE_MSG(msg_ ", table discarded"); \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/ots.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/ots.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/ots.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/ots.cc	2014-11-26 21:46:10.000000000 +0000
@@ -409,7 +409,7 @@
   }
 
   std::vector<uint8_t> decompressed_buffer(decompressed_size);
-  if (!ots::ConvertWOFF2ToTTF(&decompressed_buffer[0], decompressed_size,
+  if (!ots::ConvertWOFF2ToTTF(header, &decompressed_buffer[0], decompressed_size,
                               data, length)) {
     return OTS_FAILURE();
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/vdmx.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/vdmx.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/vdmx.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/vdmx.cc	2014-11-26 21:46:10.000000000 +0000
@@ -11,10 +11,10 @@
 
 #define DROP_THIS_TABLE(...) \
   do { \
-    delete file->vdmx; \
-    file->vdmx = 0; \
     OTS_FAILURE_MSG_(file, TABLE_NAME ": " __VA_ARGS__); \
     OTS_FAILURE_MSG("Table discarded"); \
+    delete file->vdmx; \
+    file->vdmx = 0; \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/vorg.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/vorg.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/vorg.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/vorg.cc	2014-11-26 21:46:10.000000000 +0000
@@ -13,10 +13,10 @@
 
 #define DROP_THIS_TABLE(...) \
   do { \
-    delete file->vorg; \
-    file->vorg = 0; \
     OTS_FAILURE_MSG_(file, TABLE_NAME ": " __VA_ARGS__); \
     OTS_FAILURE_MSG("Table discarded"); \
+    delete file->vorg; \
+    file->vorg = 0; \
   } while (0)
 
 namespace ots {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/woff2.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/woff2.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/woff2.cc	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/woff2.cc	2014-11-26 21:46:10.000000000 +0000
@@ -9,8 +9,6 @@
 #include <cstdlib>
 #include <vector>
 
-#include <zlib.h>
-
 #include "decode.h"
 
 #include "opentype-sanitiser.h"
@@ -18,6 +16,8 @@
 #include "ots.h"
 #include "woff2.h"
 
+#define TABLE_NAME "WOFF2"
+
 namespace {
 
 // simple glyph flags
@@ -46,15 +46,8 @@
 // Note that the byte order is big-endian, not the same as ots.cc
 #define TAG(a, b, c, d) ((a << 24) | (b << 16) | (c << 8) | d)
 
-const unsigned int kWoff2FlagsContinueStream = 1 << 4;
 const unsigned int kWoff2FlagsTransform = 1 << 5;
 
-// Compression type values common to both short and long formats
-const uint32_t kCompressionTypeMask = 0xf;
-const uint32_t kCompressionTypeNone = 0;
-const uint32_t kCompressionTypeGzip = 1;
-const uint32_t kCompressionTypeBrotli = 2;
-
 const uint32_t kKnownTags[] = {
   TAG('c', 'm', 'a', 'p'),  // 0
   TAG('h', 'e', 'a', 'd'),  // 1
@@ -130,8 +123,6 @@
 struct Table {
   uint32_t tag;
   uint32_t flags;
-  uint32_t src_offset;
-  uint32_t src_length;
 
   uint32_t transform_length;
 
@@ -141,8 +132,6 @@
   Table()
       : tag(0),
         flags(0),
-        src_offset(0),
-        src_length(0),
         transform_length(0),
         dst_offset(0),
         dst_length(0) {}
@@ -775,71 +764,57 @@
 }
 
 bool Woff2Uncompress(uint8_t* dst_buf, size_t dst_size,
-    const uint8_t* src_buf, size_t src_size, uint32_t compression_type) {
-  if (compression_type == kCompressionTypeGzip) {
-    uLongf uncompressed_length = dst_size;
-    int r = uncompress(reinterpret_cast<Bytef *>(dst_buf), &uncompressed_length,
-        src_buf, src_size);
-    if (r != Z_OK || uncompressed_length != dst_size) {
-      return OTS_FAILURE();
-    }
-    return true;
-  } else if (compression_type == kCompressionTypeBrotli) {
-    size_t uncompressed_size = dst_size;
-    int ok = BrotliDecompressBuffer(src_size, src_buf,
-                                    &uncompressed_size, dst_buf);
-    if (!ok || uncompressed_size != dst_size) {
-      return OTS_FAILURE();
-    }
-    return true;
+    const uint8_t* src_buf, size_t src_size) {
+  size_t uncompressed_size = dst_size;
+  int ok = BrotliDecompressBuffer(src_size, src_buf,
+                                  &uncompressed_size, dst_buf);
+  if (!ok || uncompressed_size != dst_size) {
+    return OTS_FAILURE();
   }
-  // Unknown compression type
-  return OTS_FAILURE();
+  return true;
 }
 
-bool ReadShortDirectory(ots::Buffer* file, std::vector<Table>* tables,
+bool ReadShortDirectory(ots::OpenTypeFile* file,
+    ots::Buffer* buffer, std::vector<Table>* tables,
     size_t num_tables) {
   for (size_t i = 0; i < num_tables; ++i) {
     Table* table = &tables->at(i);
     uint8_t flag_byte;
-    if (!file->ReadU8(&flag_byte)) {
-      return OTS_FAILURE();
+    if (!buffer->ReadU8(&flag_byte)) {
+      return OTS_FAILURE_MSG("Failed to read the flags of table directory entry %d", i);
     }
     uint32_t tag;
     if ((flag_byte & 0x3f) == 0x3f) {
-      if (!file->ReadU32(&tag)) {
-        return OTS_FAILURE();
+      if (!buffer->ReadU32(&tag)) {
+        return OTS_FAILURE_MSG("Failed to read the tag of table directory entry %d", i);
       }
     } else {
       tag = kKnownTags[flag_byte & 0x3f];
     }
     // Bits 6 and 7 are reserved and must be 0.
     if ((flag_byte & 0xc0) != 0) {
-      return OTS_FAILURE();
-    }
-    uint32_t flags = kCompressionTypeBrotli;
-    if (i > 0) {
-      flags |= kWoff2FlagsContinueStream;
+      return OTS_FAILURE_MSG("Bits 6 and 7 are not 0 for table directory entry %d", i);
     }
+    uint32_t flags = 0;
     // Always transform the glyf and loca tables
     if (tag == TAG('g', 'l', 'y', 'f') ||
         tag == TAG('l', 'o', 'c', 'a')) {
       flags |= kWoff2FlagsTransform;
     }
     uint32_t dst_length;
-    if (!ReadBase128(file, &dst_length)) {
-      return OTS_FAILURE();
+    if (!ReadBase128(buffer, &dst_length)) {
+      return OTS_FAILURE_MSG("Failed to read \"origLength\" for table %4.4s", (char*)&tag);
     }
     uint32_t transform_length = dst_length;
     if ((flags & kWoff2FlagsTransform) != 0) {
-      if (!ReadBase128(file, &transform_length)) {
-        return OTS_FAILURE();
+      if (!ReadBase128(buffer, &transform_length)) {
+        return OTS_FAILURE_MSG("Failed to read \"transformLength\" for table %4.4s", (char*)&tag);
       }
     }
     // Disallow huge numbers (> 1GB) for sanity.
     if (transform_length > 1024 * 1024 * 1024 ||
         dst_length > 1024 * 1024 * 1024) {
-      return OTS_FAILURE();
+      return OTS_FAILURE_MSG("\"origLength\" or \"transformLength\" > 1GB");
     }
     table->tag = tag;
     table->flags = flags;
@@ -864,82 +839,72 @@
   return total_length;
 }
 
-bool ConvertWOFF2ToTTF(uint8_t* result, size_t result_length,
+bool ConvertWOFF2ToTTF(ots::OpenTypeFile* file,
+                       uint8_t* result, size_t result_length,
                        const uint8_t* data, size_t length) {
   static const uint32_t kWoff2Signature = 0x774f4632;  // "wOF2"
-  ots::Buffer file(data, length);
+  ots::Buffer buffer(data, length);
 
   uint32_t signature;
   uint32_t flavor = 0;
-  if (!file.ReadU32(&signature) || signature != kWoff2Signature ||
-      !file.ReadU32(&flavor)) {
-    return OTS_FAILURE();
+  if (!buffer.ReadU32(&signature) || signature != kWoff2Signature ||
+      !buffer.ReadU32(&flavor)) {
+    return OTS_FAILURE_MSG("Failed to read \"signature\" or \"flavor\", or not WOFF2 signature");
   }
 
   if (!IsValidVersionTag(ntohl(flavor))) {
-    return OTS_FAILURE();
+    return OTS_FAILURE_MSG("Invalid \"flavor\"");
   }
 
   uint32_t reported_length;
-  if (!file.ReadU32(&reported_length) || length != reported_length) {
-    return OTS_FAILURE();
+  if (!buffer.ReadU32(&reported_length) || length != reported_length) {
+    return OTS_FAILURE_MSG("Failed to read \"length\" or it does not match the actual file size");
   }
   uint16_t num_tables;
-  if (!file.ReadU16(&num_tables) || !num_tables) {
-    return OTS_FAILURE();
+  if (!buffer.ReadU16(&num_tables) || !num_tables) {
+    return OTS_FAILURE_MSG("Failed to read \"numTables\"");
   }
   // We don't care about these fields of the header:
   //   uint16_t reserved
   //   uint32_t total_sfnt_size
-  if (!file.Skip(6)) {
-    return OTS_FAILURE();
+  if (!buffer.Skip(6)) {
+    return OTS_FAILURE_MSG("Failed to read \"reserve\" or \"totalSfntSize\"");
   }
   uint32_t compressed_length;
-  if (!file.ReadU32(&compressed_length)) {
+  if (!buffer.ReadU32(&compressed_length)) {
+    return OTS_FAILURE_MSG("Failed to read \"totalCompressedSize\"");
+  }
+  if (compressed_length > std::numeric_limits<uint32_t>::max()) {
     return OTS_FAILURE();
   }
+
   // We don't care about these fields of the header:
   //   uint16_t major_version, minor_version
   //   uint32_t meta_offset, meta_length, meta_orig_length
   //   uint32_t priv_offset, priv_length
-  if (!file.Skip(24)) {
+  if (!buffer.Skip(24)) {
     return OTS_FAILURE();
   }
   std::vector<Table> tables(num_tables);
-  if (!ReadShortDirectory(&file, &tables, num_tables)) {
+  if (!ReadShortDirectory(file, &buffer, &tables, num_tables)) {
+    return OTS_FAILURE_MSG("Failed to read table directory");
+  }
+  uint64_t compressed_offset = buffer.offset();
+  if (compressed_offset > std::numeric_limits<uint32_t>::max()) {
     return OTS_FAILURE();
   }
-  uint64_t src_offset = file.offset();
   uint64_t dst_offset = kSfntHeaderSize +
       kSfntEntrySize * static_cast<uint64_t>(num_tables);
-  uint64_t uncompressed_sum = 0;
   for (uint16_t i = 0; i < num_tables; ++i) {
     Table* table = &tables.at(i);
-    table->src_offset = static_cast<uint32_t>(src_offset);
-    table->src_length = (i == 0 ? compressed_length : 0);
-    src_offset += table->src_length;
-    if (src_offset > std::numeric_limits<uint32_t>::max()) {
-      return OTS_FAILURE();
-    }
-    src_offset = ots::Round4(src_offset);
     table->dst_offset = static_cast<uint32_t>(dst_offset);
     dst_offset += table->dst_length;
     if (dst_offset > std::numeric_limits<uint32_t>::max()) {
       return OTS_FAILURE();
     }
     dst_offset = ots::Round4(dst_offset);
-    if ((table->flags & kCompressionTypeMask) != kCompressionTypeNone) {
-      uncompressed_sum += table->src_length;
-      if (uncompressed_sum > std::numeric_limits<uint32_t>::max()) {
-        return OTS_FAILURE();
-      }
-    }
   }
-  // Enforce same 30M limit on uncompressed tables as OTS
-  if (uncompressed_sum > 30 * 1024 * 1024) {
-    return OTS_FAILURE();
-  }
-  if (src_offset > length || dst_offset > result_length) {
+  if (ots::Round4(compressed_offset + compressed_length) > length || dst_offset > result_length) {
     return OTS_FAILURE();
   }
 
@@ -968,50 +933,32 @@
     offset = StoreU32(result, offset, table->dst_length);
   }
   std::vector<uint8_t> uncompressed_buf;
-  bool continue_valid = false;
   const uint8_t* transform_buf = NULL;
+  uint64_t total_size = 0;
+
+  for (uint16_t i = 0; i < num_tables; ++i) {
+    total_size += tables.at(i).transform_length;
+    if (total_size > std::numeric_limits<uint32_t>::max()) {
+      return OTS_FAILURE();
+    }
+  }
+  // Enforce same 30M limit on uncompressed tables as OTS
+  if (total_size > 30 * 1024 * 1024) {
+    return OTS_FAILURE();
+  }
+  const size_t total_size_size_t = static_cast<size_t>(total_size);
+  uncompressed_buf.resize(total_size_size_t);
+  const uint8_t* src_buf = data + compressed_offset;
+  if (!Woff2Uncompress(&uncompressed_buf[0], total_size_size_t,
+      src_buf, compressed_length)) {
+    return OTS_FAILURE();
+  }
+  transform_buf = &uncompressed_buf[0];
+
   for (uint16_t i = 0; i < num_tables; ++i) {
     const Table* table = &tables.at(i);
     uint32_t flags = table->flags;
-    const uint8_t* src_buf = data + table->src_offset;
-    uint32_t compression_type = flags & kCompressionTypeMask;
     size_t transform_length = table->transform_length;
-    if ((flags & kWoff2FlagsContinueStream) != 0) {
-      if (!continue_valid) {
-        return OTS_FAILURE();
-      }
-    } else if (compression_type == kCompressionTypeNone) {
-      if (transform_length != table->src_length) {
-        return OTS_FAILURE();
-      }
-      transform_buf = src_buf;
-      continue_valid = false;
-    } else if ((flags & kWoff2FlagsContinueStream) == 0) {
-      uint64_t total_size = transform_length;
-      for (uint16_t j = i + 1; j < num_tables; ++j) {
-        if ((tables.at(j).flags & kWoff2FlagsContinueStream) == 0) {
-          break;
-        }
-        total_size += tables.at(j).transform_length;
-        if (total_size > std::numeric_limits<uint32_t>::max()) {
-          return OTS_FAILURE();
-        }
-      }
-      // Enforce same 30M limit on uncompressed tables as OTS
-      if (total_size > 30 * 1024 * 1024) {
-        return OTS_FAILURE();
-      }
-      const size_t total_size_size_t = static_cast<size_t>(total_size);
-      uncompressed_buf.resize(total_size_size_t);
-      if (!Woff2Uncompress(&uncompressed_buf[0], total_size_size_t,
-          src_buf, compressed_length, compression_type)) {
-        return OTS_FAILURE();
-      }
-      transform_buf = &uncompressed_buf[0];
-      continue_valid = true;
-    } else {
-      return OTS_FAILURE();
-    }
 
     if ((flags & kWoff2FlagsTransform) == 0) {
       if (transform_length != table->dst_length) {
@@ -1029,11 +976,10 @@
         return OTS_FAILURE();
       }
     }
-    if (continue_valid) {
-      transform_buf += transform_length;
-      if (transform_buf > &uncompressed_buf[0] + uncompressed_buf.size()) {
-        return OTS_FAILURE();
-      }
+
+    transform_buf += transform_length;
+    if (transform_buf > &uncompressed_buf[0] + uncompressed_buf.size()) {
+      return OTS_FAILURE();
     }
   }
 
@@ -1041,3 +987,5 @@
 }
 
 }  // namespace ots
+
+#undef TABLE_NAME
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/woff2.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/woff2.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/src/woff2.h	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/src/woff2.h	2014-11-26 21:46:10.000000000 +0000
@@ -13,7 +13,7 @@
 // Decompresses the font into the target buffer. The result_length should
 // be the same as determined by ComputeFinalSize(). Returns true on successful
 // decompression.
-bool ConvertWOFF2ToTTF(uint8_t *result, size_t result_length,
+bool ConvertWOFF2ToTTF(OpenTypeFile *file, uint8_t *result, size_t result_length,
                        const uint8_t *data, size_t length);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/sync.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/sync.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/ots/sync.sh	2014-11-14 09:37:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/ots/sync.sh	2014-11-26 21:46:10.000000000 +0000
@@ -26,6 +26,3 @@
 
 echo "Applying ots-visibility.patch..."
 patch -p3 < ots-visibility.patch
-
-echo "Applying ots-brotli-path.patch..."
-patch -p3 < ots-brotli-path.patch
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/src/nsDeviceContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/src/nsDeviceContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/src/nsDeviceContext.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/src/nsDeviceContext.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -244,9 +244,9 @@
 
 nsDeviceContext::nsDeviceContext()
     : mWidth(0), mHeight(0), mDepth(0),
-      mAppUnitsPerDevPixel(-1), mAppUnitsPerDevNotScaledPixel(-1),
+      mAppUnitsPerDevPixel(-1), mAppUnitsPerDevPixelAtUnitFullZoom(-1),
       mAppUnitsPerPhysicalInch(-1),
-      mPixelScale(1.0f), mPrintingScale(1.0f),
+      mFullZoom(1.0f), mPrintingScale(1.0f),
       mFontCache(nullptr)
 {
     MOZ_ASSERT(NS_IsMainThread(), "nsDeviceContext created off main thread");
@@ -333,7 +333,7 @@
             break;
         }
 
-        mAppUnitsPerDevNotScaledPixel =
+        mAppUnitsPerDevPixelAtUnitFullZoom =
             NS_lround((AppUnitsPerCSSPixel() * 96) / dpi);
     } else {
         // A value of -1 means use the maximum of 96 and the system DPI.
@@ -358,14 +358,14 @@
                                                : CSSToLayoutDeviceScale(1.0);
         double devPixelsPerCSSPixel = scale.scale;
 
-        mAppUnitsPerDevNotScaledPixel =
+        mAppUnitsPerDevPixelAtUnitFullZoom =
             std::max(1, NS_lround(AppUnitsPerCSSPixel() / devPixelsPerCSSPixel));
     }
 
     NS_ASSERTION(dpi != -1.0, "no dpi set");
 
-    mAppUnitsPerPhysicalInch = NS_lround(dpi * mAppUnitsPerDevNotScaledPixel);
-    UpdateScaledAppUnits();
+    mAppUnitsPerPhysicalInch = NS_lround(dpi * mAppUnitsPerDevPixelAtUnitFullZoom);
+    UpdateAppUnitsForFullZoom();
 }
 
 nsresult
@@ -722,33 +722,33 @@
 }
 
 bool nsDeviceContext::CheckDPIChange() {
-    int32_t oldDevPixels = mAppUnitsPerDevNotScaledPixel;
+    int32_t oldDevPixels = mAppUnitsPerDevPixelAtUnitFullZoom;
     int32_t oldInches = mAppUnitsPerPhysicalInch;
 
     SetDPI();
 
-    return oldDevPixels != mAppUnitsPerDevNotScaledPixel ||
+    return oldDevPixels != mAppUnitsPerDevPixelAtUnitFullZoom ||
         oldInches != mAppUnitsPerPhysicalInch;
 }
 
 bool
-nsDeviceContext::SetPixelScale(float aScale)
+nsDeviceContext::SetFullZoom(float aScale)
 {
     if (aScale <= 0) {
-        NS_NOTREACHED("Invalid pixel scale value");
+        NS_NOTREACHED("Invalid full zoom value");
         return false;
     }
     int32_t oldAppUnitsPerDevPixel = mAppUnitsPerDevPixel;
-    mPixelScale = aScale;
-    UpdateScaledAppUnits();
+    mFullZoom = aScale;
+    UpdateAppUnitsForFullZoom();
     return oldAppUnitsPerDevPixel != mAppUnitsPerDevPixel;
 }
 
 void
-nsDeviceContext::UpdateScaledAppUnits()
+nsDeviceContext::UpdateAppUnitsForFullZoom()
 {
     mAppUnitsPerDevPixel =
-        std::max(1, NSToIntRound(float(mAppUnitsPerDevNotScaledPixel) / mPixelScale));
-    // adjust mPixelScale to reflect appunit rounding
-    mPixelScale = float(mAppUnitsPerDevNotScaledPixel) / mAppUnitsPerDevPixel;
+        std::max(1, NSToIntRound(float(mAppUnitsPerDevPixelAtUnitFullZoom) / mFullZoom));
+    // adjust mFullZoom to reflect appunit rounding
+    mFullZoom = float(mAppUnitsPerDevPixelAtUnitFullZoom) / mAppUnitsPerDevPixel;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/src/nsDeviceContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/src/nsDeviceContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/src/nsDeviceContext.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/src/nsDeviceContext.h	2014-11-26 21:45:46.000000000 +0000
@@ -103,11 +103,11 @@
     static int32_t AppUnitsPerCSSInch() { return mozilla::AppUnitsPerCSSInch(); }
 
     /**
-     * Get the unscaled ratio of app units to dev pixels; useful if something
-     * needs to be converted from to unscaled pixels
+     * Get the ratio of app units to dev pixels that would be used at unit
+     * (100%) full zoom.
      */
-    int32_t UnscaledAppUnitsPerDevPixel() const
-    { return mAppUnitsPerDevNotScaledPixel; }
+    int32_t AppUnitsPerDevPixelAtUnitFullZoom() const
+    { return mAppUnitsPerDevPixelAtUnitFullZoom; }
 
     /**
      * Get the nsFontMetrics that describe the properties of
@@ -234,16 +234,16 @@
     bool CheckDPIChange();
 
     /**
-     * Set the pixel scaling factor: all lengths are multiplied by this factor
+     * Set the full zoom factor: all lengths are multiplied by this factor
      * when we convert them to device pixels. Returns whether the ratio of
-     * app units to dev pixels changed because of the scale factor.
+     * app units to dev pixels changed because of the zoom factor.
      */
-    bool SetPixelScale(float aScale);
+    bool SetFullZoom(float aScale);
 
     /**
-     * Returns the pixel scaling factor (page zoom factor) applied.
+     * Returns the page full zoom factor applied.
      */
-    float GetPixelScale() const { return mPixelScale; }
+    float GetFullZoom() const { return mFullZoom; }
 
     /**
      * True if this device context was created for printing.
@@ -259,15 +259,15 @@
     void ComputeFullAreaUsingScreen(nsRect *outRect);
     void FindScreen(nsIScreen **outScreen);
     void CalcPrintingSize();
-    void UpdateScaledAppUnits();
+    void UpdateAppUnitsForFullZoom();
 
     nscoord  mWidth;
     nscoord  mHeight;
     uint32_t mDepth;
     int32_t  mAppUnitsPerDevPixel;
-    int32_t  mAppUnitsPerDevNotScaledPixel;
+    int32_t  mAppUnitsPerDevPixelAtUnitFullZoom;
     int32_t  mAppUnitsPerPhysicalInch;
-    float    mPixelScale;
+    float    mFullZoom;
     float    mPrintingScale;
 
     nsFontCache*                   mFontCache;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/crashtests/428633.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/crashtests/428633.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/crashtests/428633.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/crashtests/428633.html	2014-11-26 21:45:46.000000000 +0000
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+<head></head>
+<body>A&#x101747;AAAAAAA&#x4f47;AAAAA&#xe33;AAAAAA</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/crashtests/crashtests.list	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/crashtests/crashtests.list	2014-11-26 21:45:46.000000000 +0000
@@ -65,6 +65,7 @@
 load 421813-1.html
 load 423110-1.xhtml
 load 423270-1.html
+load 428633.html
 load 429899-1.html
 load 441360.html
 load 445711.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/gtest/TestAsyncPanZoomController.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/gtest/TestAsyncPanZoomController.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/gtest/TestAsyncPanZoomController.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/gtest/TestAsyncPanZoomController.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -143,7 +143,7 @@
   }
 
   nsEventStatus ReceiveInputEvent(const InputData& aEvent, uint64_t* aOutInputBlockId) {
-    return GetInputQueue()->ReceiveInputEvent(this, aEvent, aOutInputBlockId);
+    return GetInputQueue()->ReceiveInputEvent(this, true, aEvent, aOutInputBlockId);
   }
 
   void ContentReceivedTouch(uint64_t aInputBlockId, bool aPreventDefault) {
@@ -325,9 +325,10 @@
 
 template<class InputReceiver> static void
 Tap(const nsRefPtr<InputReceiver>& aTarget, int aX, int aY, int& aTime, int aTapLength,
-    nsEventStatus (*aOutEventStatuses)[2] = nullptr)
+    nsEventStatus (*aOutEventStatuses)[2] = nullptr,
+    uint64_t* aOutInputBlockId = nullptr)
 {
-  nsEventStatus status = TouchDown(aTarget, aX, aY, aTime);
+  nsEventStatus status = TouchDown(aTarget, aX, aY, aTime, aOutInputBlockId);
   if (aOutEventStatuses) {
     (*aOutEventStatuses)[0] = status;
   }
@@ -1666,6 +1667,12 @@
     aLayer->SetFrameMetrics(metrics);
   }
 
+  void SetScrollHandoff(Layer* aChild, Layer* aParent) {
+    FrameMetrics metrics = aChild->GetFrameMetrics(0);
+    metrics.SetScrollParentId(aParent->GetFrameMetrics(0).GetScrollId());
+    aChild->SetFrameMetrics(metrics);
+  }
+
   static TestAsyncPanZoomController* ApzcOf(Layer* aLayer) {
     EXPECT_EQ(1u, aLayer->GetFrameMetricsCount());
     return (TestAsyncPanZoomController*)aLayer->GetAsyncPanZoomController(0);
@@ -2129,12 +2136,6 @@
   UniquePtr<ScopedLayerTreeRegistration> registration;
   TestAsyncPanZoomController* rootApzc;
 
-  void SetScrollHandoff(Layer* aChild, Layer* aParent) {
-    FrameMetrics metrics = aChild->GetFrameMetrics(0);
-    metrics.SetScrollParentId(aParent->GetFrameMetrics(0).GetScrollId());
-    aChild->SetFrameMetrics(metrics);
-  }
-
   void CreateOverscrollHandoffLayerTree1() {
     const char* layerTreeSyntax = "c(c)";
     nsIntRegion layerVisibleRegion[] = {
@@ -2385,6 +2386,126 @@
   childApzc->AssertStateIsReset();
 }
 
+class APZEventRegionsTester : public APZCTreeManagerTester {
+protected:
+  UniquePtr<ScopedLayerTreeRegistration> registration;
+  TestAsyncPanZoomController* rootApzc;
+
+  void CreateEventRegionsLayerTree1() {
+    const char* layerTreeSyntax = "c(tt)";
+    root = CreateLayerTree(layerTreeSyntax, nullptr, nullptr, lm, layers);
+    SetScrollableFrameMetrics(root, FrameMetrics::START_SCROLL_ID);
+    SetScrollableFrameMetrics(layers[1], FrameMetrics::START_SCROLL_ID + 1);
+    SetScrollableFrameMetrics(layers[2], FrameMetrics::START_SCROLL_ID + 2);
+    SetScrollHandoff(layers[1], root);
+    SetScrollHandoff(layers[2], root);
+
+    // Set up the event regions over a 200x200 area. The root layer has the
+    // whole 200x200 as the hit region; layers[1] has the left half and
+    // layers[2] has the bottom half. The bottom-left 100x100 area is also
+    // in the d-t-c region for both layers[1] and layers[2] (but layers[2] is
+    // on top so it gets the events by default if the main thread doesn't
+    // respond).
+    EventRegions regions(nsIntRegion(nsIntRect(0, 0, 200, 200)));
+    root->SetEventRegions(regions);
+    regions.mDispatchToContentHitRegion = nsIntRegion(nsIntRect(0, 100, 100, 100));
+    regions.mHitRegion = nsIntRegion(nsIntRect(0, 0, 100, 200));
+    layers[1]->SetEventRegions(regions);
+    regions.mHitRegion = nsIntRegion(nsIntRect(0, 100, 200, 100));
+    layers[2]->SetEventRegions(regions);
+
+    registration = MakeUnique<ScopedLayerTreeRegistration>(0, root, mcc);
+    manager->UpdatePanZoomControllerTree(nullptr, root, false, 0, 0);
+    rootApzc = ApzcOf(root);
+  }
+
+  void CreateEventRegionsLayerTree2() {
+    const char* layerTreeSyntax = "c(t)";
+    root = CreateLayerTree(layerTreeSyntax, nullptr, nullptr, lm, layers);
+    SetScrollableFrameMetrics(root, FrameMetrics::START_SCROLL_ID);
+
+    // Set up the event regions so that the child thebes layer is positioned far
+    // away from the scrolling container layer.
+    EventRegions regions(nsIntRegion(nsIntRect(0, 0, 100, 100)));
+    root->SetEventRegions(regions);
+    regions.mHitRegion = nsIntRegion(nsIntRect(0, 150, 100, 100));
+    layers[1]->SetEventRegions(regions);
+
+    registration = MakeUnique<ScopedLayerTreeRegistration>(0, root, mcc);
+    manager->UpdatePanZoomControllerTree(nullptr, root, false, 0, 0);
+    rootApzc = ApzcOf(root);
+  }
+};
+
+TEST_F(APZEventRegionsTester, HitRegionImmediateResponse) {
+  SCOPED_GFX_PREF(LayoutEventRegionsEnabled, bool, true);
+
+  CreateEventRegionsLayerTree1();
+
+  TestAsyncPanZoomController* root = ApzcOf(layers[0]);
+  TestAsyncPanZoomController* left = ApzcOf(layers[1]);
+  TestAsyncPanZoomController* bottom = ApzcOf(layers[2]);
+
+  MockFunction<void(std::string checkPointName)> check;
+  {
+    InSequence s;
+    EXPECT_CALL(*mcc, HandleSingleTap(_, _, left->GetGuid())).Times(1);
+    EXPECT_CALL(check, Call("Tapped on left"));
+    EXPECT_CALL(*mcc, HandleSingleTap(_, _, bottom->GetGuid())).Times(1);
+    EXPECT_CALL(check, Call("Tapped on bottom"));
+    EXPECT_CALL(*mcc, HandleSingleTap(_, _, root->GetGuid())).Times(1);
+    EXPECT_CALL(check, Call("Tapped on root"));
+    EXPECT_CALL(check, Call("Tap pending on d-t-c region"));
+    EXPECT_CALL(*mcc, HandleSingleTap(_, _, bottom->GetGuid())).Times(1);
+    EXPECT_CALL(check, Call("Tapped on bottom again"));
+    EXPECT_CALL(*mcc, HandleSingleTap(_, _, left->GetGuid())).Times(1);
+    EXPECT_CALL(check, Call("Tapped on left this time"));
+  }
+
+  int time = 0;
+  // Tap in the exposed hit regions of each of the layers once and ensure
+  // the clicks are dispatched right away
+  Tap(manager, 10, 10, time, 100);
+  mcc->RunThroughDelayedTasks();    // this runs the tap event
+  check.Call("Tapped on left");
+  Tap(manager, 110, 110, time, 100);
+  mcc->RunThroughDelayedTasks();    // this runs the tap event
+  check.Call("Tapped on bottom");
+  Tap(manager, 110, 10, time, 100);
+  mcc->RunThroughDelayedTasks();    // this runs the tap event
+  check.Call("Tapped on root");
+
+  // Now tap on the dispatch-to-content region where the layers overlap
+  Tap(manager, 10, 110, time, 100);
+  mcc->RunThroughDelayedTasks();    // this runs the main-thread timeout
+  check.Call("Tap pending on d-t-c region");
+  mcc->RunThroughDelayedTasks();    // this runs the tap event
+  check.Call("Tapped on bottom again");
+
+  // Now let's do that again, but simulate a main-thread response
+  uint64_t inputBlockId = 0;
+  Tap(manager, 10, 110, time, 100, nullptr, &inputBlockId);
+  nsTArray<ScrollableLayerGuid> targets;
+  targets.AppendElement(left->GetGuid());
+  manager->SetTargetAPZC(inputBlockId, targets);
+  while (mcc->RunThroughDelayedTasks());    // this runs the tap event
+  check.Call("Tapped on left this time");
+}
+
+TEST_F(APZEventRegionsTester, HitRegionAccumulatesChildren) {
+  SCOPED_GFX_PREF(LayoutEventRegionsEnabled, bool, true);
+
+  CreateEventRegionsLayerTree2();
+
+  int time = 0;
+  // Tap in the area of the child layer that's not directly included in the
+  // parent layer's hit region. Verify that it comes out of the APZC's
+  // content controller, which indicates the input events got routed correctly
+  // to the APZC.
+  EXPECT_CALL(*mcc, HandleSingleTap(_, _, rootApzc->GetGuid())).Times(1);
+  Tap(manager, 10, 160, time, 100);
+  mcc->RunThroughDelayedTasks();    // this runs the tap event
+}
 
 class TaskRunMetrics {
 public:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/gtest/TestTiledLayerBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/gtest/TestTiledLayerBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/gtest/TestTiledLayerBuffer.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/gtest/TestTiledLayerBuffer.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -58,10 +58,14 @@
 };
 
 TEST(TiledLayerBuffer, TileConstructor) {
+  gfxPlatform::GetPlatform()->ComputeTileSize();
+
   TestTiledLayerBuffer buffer;
 }
 
 TEST(TiledLayerBuffer, TileStart) {
+  gfxPlatform::GetPlatform()->ComputeTileSize();
+
   TestTiledLayerBuffer buffer;
 
   ASSERT_EQ(buffer.RoundDownToTileEdge(10, 256), 0);
@@ -69,6 +73,8 @@
 }
 
 TEST(TiledLayerBuffer, EmptyUpdate) {
+  gfxPlatform::GetPlatform()->ComputeTileSize();
+
   TestTiledLayerBuffer buffer;
 
   nsIntRegion validRegion(nsIntRect(0, 0, 10, 10));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/reftest/1086723.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/reftest/1086723.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/reftest/1086723.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/reftest/1086723.html	2014-11-26 21:45:46.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html reftest-async-scroll reftest-async-scroll-x="0" reftest-async-scroll-y="2000">
+<head>
+  <meta charset="utf-8">
+  <title>Testcase for bug 1086723</title>
+  <style type="text/css">
+    .test_div {
+      position: fixed;
+      overflow: hidden;
+      background: blue;
+      width: 50%;
+      height: 50%;
+      border-radius: 0px 50% 50% 0px;
+    }
+    .filler {
+      height: 5000px;
+    }
+    body,html {
+      overflow: hidden;
+    }
+  </style>
+</head>
+<body>
+  <div class="test_div"></div>
+  <div class="filler"></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/reftest/1086723-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/reftest/1086723-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/reftest/1086723-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/reftest/1086723-ref.html	2014-11-26 21:45:46.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Testcase for bug 1086723</title>
+  <style type="text/css">
+    .test_div {
+      position: fixed;
+      overflow: hidden;
+      background: blue;
+      width: 50%;
+      height: 50%;
+      border-radius: 0px 50% 50% 0px;
+    }
+    .filler {
+      height: 5000px;
+    }
+    body,html {
+      overflow: hidden;
+    }
+  </style>
+</head>
+<body>
+  <div class="test_div"></div>
+  <div class="filler"></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/reftest/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/reftest/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/tests/reftest/reftest.list	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/tests/reftest/reftest.list	2014-11-26 21:45:46.000000000 +0000
@@ -2,3 +2,4 @@
 == 468496-1.html 468496-1-ref.html
 fuzzy-if(winWidget,175,443) == 611498-1.html 611498-ref.html
 skip-if(B2G) fuzzy-if(Android&&AndroidVersion>=15,8,1000) == 709477-1.html 709477-1-ref.html # bug 773482
+skip-if(!asyncPanZoom) == 1086723.html 1086723-ref.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxAndroidPlatform.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxAndroidPlatform.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxAndroidPlatform.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxAndroidPlatform.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -407,12 +407,16 @@
 bool
 gfxAndroidPlatform::UseAcceleratedSkiaCanvas()
 {
+    return HaveChoiceOfHWAndSWCanvas() && gfxPlatform::UseAcceleratedSkiaCanvas();
+}
+
+bool gfxAndroidPlatform::HaveChoiceOfHWAndSWCanvas()
+{
 #ifdef MOZ_WIDGET_ANDROID
     if (AndroidBridge::Bridge()->GetAPIVersion() < 11) {
         // It's slower than software due to not having a compositing fast path
         return false;
     }
 #endif
-
-    return gfxPlatform::UseAcceleratedSkiaCanvas();
+    return gfxPlatform::HaveChoiceOfHWAndSWCanvas();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxAndroidPlatform.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxAndroidPlatform.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxAndroidPlatform.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxAndroidPlatform.h	2014-11-26 21:45:46.000000000 +0000
@@ -87,6 +87,7 @@
       return true;
     }
 
+    virtual bool HaveChoiceOfHWAndSWCanvas() MOZ_OVERRIDE;
     virtual bool UseAcceleratedSkiaCanvas() MOZ_OVERRIDE;
 
 #ifdef MOZ_WIDGET_GONK
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxContext.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxContext.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -265,20 +265,6 @@
 }
 
 void
-gfxContext::CurveTo(const gfxPoint& pt1, const gfxPoint& pt2, const gfxPoint& pt3)
-{
-  EnsurePathBuilder();
-  mPathBuilder->BezierTo(ToPoint(pt1), ToPoint(pt2), ToPoint(pt3));
-}
-
-void
-gfxContext::QuadraticCurveTo(const gfxPoint& pt1, const gfxPoint& pt2)
-{
-  EnsurePathBuilder();
-  mPathBuilder->QuadraticBezierTo(ToPoint(pt1), ToPoint(pt2));
-}
-
-void
 gfxContext::Line(const gfxPoint& start, const gfxPoint& end)
 {
   EnsurePathBuilder();
@@ -554,11 +540,6 @@
 void
 gfxContext::SetOperator(GraphicsOperator op)
 {
-  if (op == OPERATOR_CLEAR) {
-    CurrentState().opIsClear = true;
-    return;
-  }
-  CurrentState().opIsClear = false;
   CurrentState().op = CompositionOpForOp(op);
 }
 
@@ -678,6 +659,15 @@
 {
 }
 
+void
+gfxContext::PopClip()
+{
+  MOZ_ASSERT(CurrentState().pushedClips.Length() > 0);
+
+  CurrentState().pushedClips.RemoveElementAt(CurrentState().pushedClips.Length() - 1);
+  mDT->PopClip();
+}
+
 gfxRect
 gfxContext::GetClipExtents()
 {
@@ -865,7 +855,7 @@
   AzureState &state = CurrentState();
 
   if (state.sourceSurface && !state.sourceSurfCairo &&
-      !state.patternTransformChanged && !state.opIsClear)
+      !state.patternTransformChanged)
   {
     // This is the case where a PopGroupToSource has been done and this
     // paint is executed without changing the transform or the source.
@@ -888,12 +878,8 @@
   mat.Invert();
   Rect paintRect = mat.TransformBounds(Rect(Point(0, 0), Size(mDT->GetSize())));
 
-  if (state.opIsClear) {
-    mDT->ClearRect(paintRect);
-  } else {
-    mDT->FillRect(paintRect, PatternFromState(this),
-                  DrawOptions(Float(alpha), GetOp()));
-  }
+  mDT->FillRect(paintRect, PatternFromState(this),
+                DrawOptions(Float(alpha), GetOp()));
 }
 
 // groups
@@ -1152,9 +1138,7 @@
   if (mPathIsRect) {
     MOZ_ASSERT(!mTransformChanged);
 
-    if (state.opIsClear) {
-      mDT->ClearRect(mRect);
-    } else if (op == CompositionOp::OP_SOURCE) {
+    if (op == CompositionOp::OP_SOURCE) {
       // Emulate cairo operator source which is bound by mask!
       mDT->ClearRect(mRect);
       mDT->FillRect(mRect, aPattern, DrawOptions(aOpacity));
@@ -1163,9 +1147,6 @@
     }
   } else {
     EnsurePath();
-
-    NS_ASSERTION(!state.opIsClear, "We shouldn't be clearing complex paths!");
-
     mDT->Fill(mPath, aPattern, DrawOptions(aOpacity, op, state.aaMode));
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxContext.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxContext.h	2014-11-26 21:45:46.000000000 +0000
@@ -156,16 +156,6 @@
      */
     void LineTo(const gfxPoint& pt);
 
-    /**
-     * Draws a cubic BĂ©zier curve with control points pt1, pt2 and pt3.
-     */
-    void CurveTo(const gfxPoint& pt1, const gfxPoint& pt2, const gfxPoint& pt3);
-
-    /**
-     * Draws a quadratic BĂ©zier curve with control points pt1, pt2 and pt3.
-     */
-    void QuadraticCurveTo(const gfxPoint& pt1, const gfxPoint& pt2);
-
     // path helpers
     /**
      * Draws a line from start to end.
@@ -408,7 +398,6 @@
 
     // define enum for operators (clear, src, dst, etc)
     enum GraphicsOperator {
-        OPERATOR_CLEAR,
         OPERATOR_SOURCE,
 
         OPERATOR_OVER,
@@ -478,6 +467,8 @@
     void Clip(const gfxRect& rect); // will clip to a rect
     void Clip(Path* aPath);
 
+    void PopClip();
+
     /**
      * This will ensure that the surface actually has its clip set.
      * Useful if you are doing native drawing.
@@ -565,7 +556,6 @@
   struct AzureState {
     AzureState()
       : op(mozilla::gfx::CompositionOp::OP_OVER)
-      , opIsClear(false)
       , color(0, 0, 0, 1.0f)
       , clipWasReset(false)
       , fillRule(mozilla::gfx::FillRule::FILL_WINDING)
@@ -574,7 +564,6 @@
     {}
 
     mozilla::gfx::CompositionOp op;
-    bool opIsClear;
     Color color;
     nsRefPtr<gfxPattern> pattern;
     nsRefPtr<gfxASurface> sourceSurfCairo;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDrawable.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDrawable.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDrawable.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDrawable.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -89,10 +89,8 @@
     Rect fillRect = ToRect(aFillRect);
     DrawTarget* dt = aContext->GetDrawTarget();
 
-    if (aContext->CurrentOperator() == gfxContext::OPERATOR_CLEAR) {
-        dt->ClearRect(fillRect);
-    } else if (aContext->CurrentOperator() == gfxContext::OPERATOR_SOURCE &&
-               aOpacity == 1.0) {
+    if (aContext->CurrentOperator() == gfxContext::OPERATOR_SOURCE &&
+        aOpacity == 1.0) {
         // Emulate cairo operator source which is bound by mask!
         dt->ClearRect(fillRect);
         dt->FillRect(fillRect, pattern);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDWriteCommon.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDWriteCommon.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDWriteCommon.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDWriteCommon.h	2014-11-26 21:45:46.000000000 +0000
@@ -20,7 +20,7 @@
 #include <windows.h>
 #include <dwrite.h>
 
-static DWRITE_FONT_STRETCH
+static inline DWRITE_FONT_STRETCH
 DWriteFontStretchFromStretch(int16_t aStretch) 
 {
     switch (aStretch) {
@@ -47,7 +47,7 @@
     }
 }
 
-static int16_t
+static inline int16_t
 FontStretchFromDWriteStretch(DWRITE_FONT_STRETCH aStretch) 
 {
     switch (aStretch) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDWriteFonts.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDWriteFonts.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDWriteFonts.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDWriteFonts.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -469,7 +469,7 @@
 }
 
 bool
-gfxDWriteFont::IsValid()
+gfxDWriteFont::IsValid() const
 {
     return mFontFace != nullptr;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDWriteFonts.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDWriteFonts.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxDWriteFonts.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxDWriteFonts.h	2014-11-26 21:45:46.000000000 +0000
@@ -28,17 +28,19 @@
                   AntialiasOption = kAntialiasDefault);
     ~gfxDWriteFont();
 
-    virtual gfxFont* CopyWithAntialiasOption(AntialiasOption anAAOption);
+    virtual gfxFont*
+    CopyWithAntialiasOption(AntialiasOption anAAOption) MOZ_OVERRIDE;
 
-    virtual uint32_t GetSpaceGlyph();
+    virtual uint32_t GetSpaceGlyph() MOZ_OVERRIDE;
 
-    virtual bool SetupCairoFont(gfxContext *aContext);
+    virtual bool SetupCairoFont(gfxContext *aContext) MOZ_OVERRIDE;
 
-    virtual bool AllowSubpixelAA() { return mAllowManualShowGlyphs; }
+    virtual bool AllowSubpixelAA() MOZ_OVERRIDE
+    { return mAllowManualShowGlyphs; }
 
-    virtual bool IsValid();
+    bool IsValid() const;
 
-    gfxFloat GetAdjustedSize() {
+    virtual gfxFloat GetAdjustedSize() const MOZ_OVERRIDE {
         return mAdjustedSize;
     }
 
@@ -50,14 +52,15 @@
                                BoundingBoxType aBoundingBoxType,
                                gfxContext *aContextForTightBoundingBox,
                                Spacing *aSpacing,
-                               uint16_t aOrientation);
+                               uint16_t aOrientation) MOZ_OVERRIDE;
 
-    virtual bool ProvidesGlyphWidths() const;
+    virtual bool ProvidesGlyphWidths() const MOZ_OVERRIDE;
 
-    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget, uint16_t aGID);
+    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget,
+                                  uint16_t aGID) MOZ_OVERRIDE;
 
     virtual mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
-        GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) MOZ_OVERRIDE;
+    GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) MOZ_OVERRIDE;
 
     virtual void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                                         FontCacheSizes* aSizes) const;
@@ -66,12 +69,13 @@
 
     virtual FontType GetType() const { return FONT_TYPE_DWRITE; }
 
-    virtual mozilla::TemporaryRef<mozilla::gfx::ScaledFont> GetScaledFont(mozilla::gfx::DrawTarget *aTarget);
+    virtual mozilla::TemporaryRef<mozilla::gfx::ScaledFont>
+    GetScaledFont(mozilla::gfx::DrawTarget *aTarget) MOZ_OVERRIDE;
 
-    virtual cairo_scaled_font_t *GetCairoScaledFont();
+    virtual cairo_scaled_font_t *GetCairoScaledFont() MOZ_OVERRIDE;
 
 protected:
-    virtual const Metrics& GetHorizontalMetrics();
+    virtual const Metrics& GetHorizontalMetrics() MOZ_OVERRIDE;
 
     bool GetFakeMetricsForArialBlack(DWRITE_FONT_METRICS *aFontMetrics);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxFT2FontBase.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxFT2FontBase.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxFT2FontBase.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxFT2FontBase.h	2014-11-26 21:45:46.000000000 +0000
@@ -21,21 +21,23 @@
     uint32_t GetGlyph(uint32_t aCharCode);
     void GetGlyphExtents(uint32_t aGlyph,
                          cairo_text_extents_t* aExtents);
-    virtual uint32_t GetSpaceGlyph();
-    virtual bool ProvidesGetGlyph() const { return true; }
-    virtual uint32_t GetGlyph(uint32_t unicode, uint32_t variation_selector);
-    virtual bool ProvidesGlyphWidths() const { return true; }
-    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget, uint16_t aGID);
+    virtual uint32_t GetSpaceGlyph() MOZ_OVERRIDE;
+    virtual bool ProvidesGetGlyph() const MOZ_OVERRIDE { return true; }
+    virtual uint32_t GetGlyph(uint32_t unicode,
+                              uint32_t variation_selector) MOZ_OVERRIDE;
+    virtual bool ProvidesGlyphWidths() const MOZ_OVERRIDE { return true; }
+    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget,
+                                  uint16_t aGID) MOZ_OVERRIDE;
 
     cairo_scaled_font_t *CairoScaledFont() { return mScaledFont; };
-    virtual bool SetupCairoFont(gfxContext *aContext);
+    virtual bool SetupCairoFont(gfxContext *aContext) MOZ_OVERRIDE;
 
-    virtual FontType GetType() const { return FONT_TYPE_FT2; }
+    virtual FontType GetType() const MOZ_OVERRIDE { return FONT_TYPE_FT2; }
 
     mozilla::gfx::FontOptions* GetFontOptions() { return &mFontOptions; }
 
 protected:
-    virtual const Metrics& GetHorizontalMetrics();
+    virtual const Metrics& GetHorizontalMetrics() MOZ_OVERRIDE;
 
     uint32_t mSpaceGlyph;
     bool mHasMetrics;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxFT2Fonts.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxFT2Fonts.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxFT2Fonts.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxFT2Fonts.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -174,52 +174,6 @@
 {
 }
 
-/**
- * Look up the font in the gfxFont cache. If we don't find it, create one.
- * In either case, add a ref, append it to the aFonts array, and return it ---
- * except for OOM in which case we do nothing and return null.
- */
-already_AddRefed<gfxFT2Font>
-gfxFT2Font::GetOrMakeFont(const nsAString& aName, const gfxFontStyle *aStyle,
-                          bool aNeedsBold)
-{
-#ifdef ANDROID
-    FT2FontEntry *fe = static_cast<FT2FontEntry*>
-        (gfxPlatformFontList::PlatformFontList()->
-            FindFontForFamily(aName, aStyle, aNeedsBold));
-#else
-    FT2FontEntry *fe = static_cast<FT2FontEntry*>
-        (gfxToolkitPlatform::GetPlatform()->FindFontEntry(aName, *aStyle));
-#endif
-    if (!fe) {
-        NS_WARNING("Failed to find font entry for font!");
-        return nullptr;
-    }
-
-    nsRefPtr<gfxFT2Font> font = GetOrMakeFont(fe, aStyle, aNeedsBold);
-    return font.forget();
-}
-
-already_AddRefed<gfxFT2Font>
-gfxFT2Font::GetOrMakeFont(FT2FontEntry *aFontEntry, const gfxFontStyle *aStyle,
-                          bool aNeedsBold)
-{
-    nsRefPtr<gfxFont> font = gfxFontCache::GetCache()->Lookup(aFontEntry, aStyle);
-    if (!font) {
-        cairo_scaled_font_t *scaledFont = aFontEntry->CreateScaledFont(aStyle);
-        if (!scaledFont) {
-            return nullptr;
-        }
-        font = new gfxFT2Font(scaledFont, aFontEntry, aStyle, aNeedsBold);
-        cairo_scaled_font_destroy(scaledFont);
-        if (!font) {
-            return nullptr;
-        }
-        gfxFontCache::GetCache()->AddNew(font);
-    }
-    return font.forget().downcast<gfxFT2Font>();
-}
-
 void
 gfxFT2Font::FillGlyphDataForChar(uint32_t ch, CachedGlyphData *gd)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxFT2Fonts.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxFT2Fonts.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxFT2Fonts.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxFT2Fonts.h	2014-11-26 21:45:46.000000000 +0000
@@ -27,14 +27,6 @@
 
     FT2FontEntry *GetFontEntry();
 
-    static already_AddRefed<gfxFT2Font>
-    GetOrMakeFont(const nsAString& aName, const gfxFontStyle *aStyle,
-                  bool aNeedsBold = false);
-
-    static already_AddRefed<gfxFT2Font>
-    GetOrMakeFont(FT2FontEntry *aFontEntry, const gfxFontStyle *aStyle,
-                  bool aNeedsBold = false);
-
     struct CachedGlyphData {
         CachedGlyphData()
             : glyphIndex(0xffffffffU) { }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxGDIFont.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxGDIFont.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxGDIFont.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxGDIFont.h	2014-11-26 21:45:46.000000000 +0000
@@ -28,15 +28,21 @@
 
     HFONT GetHFONT() { if (!mMetrics) Initialize(); return mFont; }
 
-    gfxFloat GetAdjustedSize() { if (!mMetrics) Initialize(); return mAdjustedSize; }
+    virtual gfxFloat GetAdjustedSize()
+    {
+        if (!mMetrics) {
+            Initialize();
+        }
+        return mAdjustedSize;
+    }
 
     cairo_font_face_t   *CairoFontFace() { return mFontFace; }
     cairo_scaled_font_t *CairoScaledFont() { return mScaledFont; }
 
     /* overrides for the pure virtual methods in gfxFont */
-    virtual uint32_t GetSpaceGlyph();
+    virtual uint32_t GetSpaceGlyph() MOZ_OVERRIDE;
 
-    virtual bool SetupCairoFont(gfxContext *aContext);
+    virtual bool SetupCairoFont(gfxContext *aContext) MOZ_OVERRIDE;
 
     /* override Measure to add padding for antialiasing */
     virtual RunMetrics Measure(gfxTextRun *aTextRun,
@@ -44,33 +50,36 @@
                                BoundingBoxType aBoundingBoxType,
                                gfxContext *aContextForTightBoundingBox,
                                Spacing *aSpacing,
-                               uint16_t aOrientation);
+                               uint16_t aOrientation) MOZ_OVERRIDE;
 
     /* required for MathML to suppress effects of ClearType "padding" */
-    virtual gfxFont* CopyWithAntialiasOption(AntialiasOption anAAOption);
+    virtual gfxFont*
+    CopyWithAntialiasOption(AntialiasOption anAAOption) MOZ_OVERRIDE;
 
     // If the font has a cmap table, we handle it purely with harfbuzz;
     // but if not (e.g. .fon fonts), we'll use a GDI callback to get glyphs.
-    virtual bool ProvidesGetGlyph() const {
+    virtual bool ProvidesGetGlyph() const MOZ_OVERRIDE {
         return !mFontEntry->HasCmapTable();
     }
 
-    virtual uint32_t GetGlyph(uint32_t aUnicode, uint32_t aVarSelector);
+    virtual uint32_t GetGlyph(uint32_t aUnicode,
+                              uint32_t aVarSelector) MOZ_OVERRIDE;
 
-    virtual bool ProvidesGlyphWidths() const { return true; }
+    virtual bool ProvidesGlyphWidths() const MOZ_OVERRIDE { return true; }
 
     // get hinted glyph width in pixels as 16.16 fixed-point value
-    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget, uint16_t aGID);
+    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget,
+                                  uint16_t aGID) MOZ_OVERRIDE;
 
     virtual void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                                         FontCacheSizes* aSizes) const;
     virtual void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                                         FontCacheSizes* aSizes) const;
 
-    virtual FontType GetType() const { return FONT_TYPE_GDI; }
+    virtual FontType GetType() const MOZ_OVERRIDE { return FONT_TYPE_GDI; }
 
 protected:
-    virtual const Metrics& GetHorizontalMetrics();
+    virtual const Metrics& GetHorizontalMetrics() MOZ_OVERRIDE;
 
     /* override to ensure the cairo font is set up properly */
     virtual bool ShapeText(gfxContext     *aContext,
@@ -79,7 +88,7 @@
                            uint32_t        aLength,
                            int32_t         aScript,
                            bool            aVertical,
-                           gfxShapedText  *aShapedText);
+                           gfxShapedText  *aShapedText) MOZ_OVERRIDE;
 
     void Initialize(); // creates metrics and Cairo fonts
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxMacFont.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxMacFont.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxMacFont.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxMacFont.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -25,6 +25,7 @@
                        bool aNeedsBold)
     : gfxFont(aFontEntry, aFontStyle),
       mCGFont(nullptr),
+      mCTFont(nullptr),
       mFontFace(nullptr)
 {
     mApplySyntheticBold = aNeedsBold;
@@ -110,6 +111,9 @@
 
 gfxMacFont::~gfxMacFont()
 {
+    if (mCTFont) {
+        ::CFRelease(mCTFont);
+    }
     if (mScaledFont) {
         cairo_scaled_font_destroy(mScaledFont);
     }
@@ -362,6 +366,24 @@
     return 0;
 }
 
+int32_t
+gfxMacFont::GetGlyphWidth(DrawTarget& aDrawTarget, uint16_t aGID)
+{
+    if (!mCTFont) {
+        mCTFont = ::CTFontCreateWithGraphicsFont(mCGFont, mAdjustedSize,
+                                                 nullptr, nullptr);
+        if (!mCTFont) { // shouldn't happen, but let's be safe
+            NS_WARNING("failed to create CTFontRef to measure glyph width");
+            return 0;
+        }
+    }
+
+    CGSize advance;
+    ::CTFontGetAdvancesForGlyphs(mCTFont, kCTFontDefaultOrientation, &aGID,
+                                 &advance, 1);
+    return advance.width * 0x10000;
+}
+
 // Try to initialize font metrics via platform APIs (CG/CT),
 // and set mIsValid = TRUE on success.
 // We ONLY call this for local (platform) fonts that are not sfnt format;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxMacFont.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxMacFont.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxMacFont.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxMacFont.h	2014-11-26 21:45:46.000000000 +0000
@@ -24,20 +24,32 @@
     CGFontRef GetCGFontRef() const { return mCGFont; }
 
     /* overrides for the pure virtual methods in gfxFont */
-    virtual uint32_t GetSpaceGlyph() {
+    virtual uint32_t GetSpaceGlyph() MOZ_OVERRIDE {
         return mSpaceGlyph;
     }
 
-    virtual bool SetupCairoFont(gfxContext *aContext);
+    virtual bool SetupCairoFont(gfxContext *aContext) MOZ_OVERRIDE;
 
     /* override Measure to add padding for antialiasing */
     virtual RunMetrics Measure(gfxTextRun *aTextRun,
                                uint32_t aStart, uint32_t aEnd,
                                BoundingBoxType aBoundingBoxType,
                                gfxContext *aContextForTightBoundingBox,
-                               Spacing *aSpacing, uint16_t aOrientation);
+                               Spacing *aSpacing,
+                               uint16_t aOrientation) MOZ_OVERRIDE;
 
-    virtual mozilla::TemporaryRef<mozilla::gfx::ScaledFont> GetScaledFont(mozilla::gfx::DrawTarget *aTarget);
+    // We need to provide hinted (non-linear) glyph widths if using a font
+    // with embedded color bitmaps (Apple Color Emoji), as Core Text renders
+    // the glyphs with non-linear scaling at small pixel sizes.
+    virtual bool ProvidesGlyphWidths() const MOZ_OVERRIDE {
+        return mFontEntry->HasFontTable(TRUETYPE_TAG('s','b','i','x'));
+    }
+
+    virtual int32_t GetGlyphWidth(DrawTarget& aDrawTarget,
+                                  uint16_t aGID) MOZ_OVERRIDE;
+
+    virtual mozilla::TemporaryRef<mozilla::gfx::ScaledFont>
+    GetScaledFont(mozilla::gfx::DrawTarget *aTarget) MOZ_OVERRIDE;
 
     virtual mozilla::TemporaryRef<mozilla::gfx::GlyphRenderingOptions>
       GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) MOZ_OVERRIDE;
@@ -47,10 +59,10 @@
     virtual void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                                         FontCacheSizes* aSizes) const;
 
-    virtual FontType GetType() const { return FONT_TYPE_MAC; }
+    virtual FontType GetType() const MOZ_OVERRIDE { return FONT_TYPE_MAC; }
 
 protected:
-    virtual const Metrics& GetHorizontalMetrics() {
+    virtual const Metrics& GetHorizontalMetrics() MOZ_OVERRIDE {
         return mMetrics;
     }
 
@@ -61,7 +73,7 @@
                            uint32_t        aLength,
                            int32_t         aScript,
                            bool            aVertical,
-                           gfxShapedText  *aShapedText);
+                           gfxShapedText  *aShapedText) MOZ_OVERRIDE;
 
     void InitMetrics();
     void InitMetricsFromPlatform();
@@ -75,6 +87,10 @@
     // MacOSFontEntry, it is not retained or released by gfxMacFont
     CGFontRef             mCGFont;
 
+    // a Core Text font reference, created only if we're using CT to measure
+    // glyph widths; otherwise null.
+    CTFontRef             mCTFont;
+
     cairo_font_face_t    *mFontFace;
 
     nsAutoPtr<gfxFontShaper> mCoreTextShaper;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatform.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatform.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatform.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatform.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -11,10 +11,12 @@
 #include "mozilla/layers/ISurfaceAllocator.h"     // for GfxMemoryImageReporter
 
 #include "prlog.h"
+#include "prprf.h"
 
 #include "gfxPlatform.h"
 #include "gfxPrefs.h"
 #include "gfxTextRun.h"
+#include "gfxVR.h"
 
 #ifdef XP_WIN
 #include <process.h>
@@ -78,6 +80,10 @@
 #include "TexturePoolOGL.h"
 #endif
 
+#ifdef MOZ_WIDGET_GONK
+#include "mozilla/layers/GrallocTextureHost.h"
+#endif
+
 #include "mozilla/Hal.h"
 #ifdef USE_SKIA
 #include "skia/SkGraphics.h"
@@ -148,21 +154,99 @@
     NS_DECL_NSIOBSERVER
 };
 
+/// This override of the LogForwarder, initially used for the critical graphics
+/// errors, is sending the log to the crash annotations as well, but only
+/// if the capacity set with the method below is >= 2.  We always retain the
+/// very first critical message, and the latest capacity-1 messages are
+/// rotated through. Note that we don't expect the total number of times
+/// this gets called to be large - it is meant for critical errors only.
+
 class CrashStatsLogForwarder: public mozilla::gfx::LogForwarder
 {
 public:
-    virtual void Log(const std::string& aString) MOZ_OVERRIDE {
-        if (!NS_IsMainThread()) {
-            return;
-        }
+  CrashStatsLogForwarder(const char* aKey);
+  virtual void Log(const std::string& aString) MOZ_OVERRIDE;
+
+  void SetCircularBufferSize(uint32_t aCapacity);
+
+private:
+  // Helpers for the Log()
+  bool UpdateStringsVector(const std::string& aString);
+  void UpdateCrashReport();
+
+private:
+  std::vector<std::pair<int32_t,std::string> > mBuffer;
+  nsCString mCrashCriticalKey;
+  uint32_t mMaxCapacity;
+  int32_t mIndex;
+};
+
+CrashStatsLogForwarder::CrashStatsLogForwarder(const char* aKey)
+  : mBuffer()
+  , mCrashCriticalKey(aKey)
+  , mMaxCapacity(0)
+  , mIndex(-1)
+{
+}
+
+void CrashStatsLogForwarder::SetCircularBufferSize(uint32_t aCapacity)
+{
+  mMaxCapacity = aCapacity;
+  mBuffer.reserve(static_cast<size_t>(aCapacity));
+}
+
+bool
+CrashStatsLogForwarder::UpdateStringsVector(const std::string& aString)
+{
+  // We want at least the first one and the last one.  Otherwise, no point.
+  if (mMaxCapacity < 2) {
+    return false;
+  }
+
+  mIndex += 1;
+  MOZ_ASSERT(mIndex >= 0);
+
+  // index will count 0, 1, 2, ..., max-1, 1, 2, ..., max-1, 1, 2, ...
+  int32_t index = mIndex ? (mIndex-1) % (mMaxCapacity-1) + 1 : 0;
+  MOZ_ASSERT(index >= 0 && index < (int32_t)mMaxCapacity);
+  MOZ_ASSERT(index <= mIndex && index <= (int32_t)mBuffer.size());
+
+  // Checking for index >= mBuffer.size(), rather than index == mBuffer.size()
+  // just out of paranoia, but we know index <= mBuffer.size().
+  std::pair<int32_t,std::string> newEntry(mIndex,aString);
+  if (index >= static_cast<int32_t>(mBuffer.size())) {
+    mBuffer.push_back(newEntry);
+  } else {
+    mBuffer[index] = newEntry;
+  }
+  return true;
+}
+
+void CrashStatsLogForwarder::UpdateCrashReport()
+{
+  std::stringstream message;
+  for(std::vector<std::pair<int32_t, std::string> >::iterator it = mBuffer.begin(); it != mBuffer.end(); ++it) {
+    message << "|[" << (*it).first << "]" << (*it).second;
+  }
+
 #ifdef MOZ_CRASHREPORTER
-        nsCString reportString(aString.c_str());
-        CrashReporter::AppendAppNotesToCrashReport(reportString);
+  nsCString reportString(message.str().c_str());
+  nsresult annotated = CrashReporter::AnnotateCrashReport(mCrashCriticalKey, reportString);
 #else
-        printf("GFX ERROR: %s", aString.c_str());
+  nsresult annotated = NS_ERROR_NOT_IMPLEMENTED;
 #endif
-    }
-};
+  if (annotated != NS_OK) {
+    printf("Crash Annotation %s: %s",
+           mCrashCriticalKey.get(), message.str().c_str());
+  }
+}
+  
+void CrashStatsLogForwarder::Log(const std::string& aString)
+{
+  if (UpdateStringsVector(aString)) {
+    UpdateCrashReport();
+  }
+}
 
 NS_IMPL_ISUPPORTS(SRGBOverrideObserver, nsIObserver, nsISupportsWeakReference)
 
@@ -282,7 +366,9 @@
 };
 
 gfxPlatform::gfxPlatform()
-  : mAzureCanvasBackendCollector(MOZ_THIS_IN_INITIALIZER_LIST(),
+  : mTileWidth(-1)
+  , mTileHeight(-1)
+  , mAzureCanvasBackendCollector(MOZ_THIS_IN_INITIALIZER_LIST(),
                                  &gfxPlatform::GetAzureBackendInfo)
 {
     mAllowDownloadableFonts = UNINITIALIZED_VALUE;
@@ -301,6 +387,10 @@
     InitBackendPrefs(canvasMask, BackendType::CAIRO,
                      contentMask, BackendType::CAIRO);
     mTotalSystemMemory = mozilla::hal::GetTotalSystemMemory();
+
+    // give ovr_Initialize a chance to be called very early on; we don't
+    // care if it succeeds or not
+    VRHMDManagerOculus::PlatformInit();
 }
 
 gfxPlatform*
@@ -352,11 +442,14 @@
     }
     gEverInitialized = true;
 
-    mozilla::gfx::Factory::SetLogForwarder(new CrashStatsLogForwarder);
+    CrashStatsLogForwarder* logForwarder = new CrashStatsLogForwarder("GraphicsCriticalError");
+    mozilla::gfx::Factory::SetLogForwarder(logForwarder);
 
     // Initialize the preferences by creating the singleton.
     gfxPrefs::GetSingleton();
 
+    logForwarder->SetCircularBufferSize(gfxPrefs::GfxLoggingCrashLength());
+
     gGfxPlatformPrefsLock = new Mutex("gfxPlatform::gGfxPlatformPrefsLock");
 
     /* Initialize the GfxInfo service.
@@ -454,6 +547,10 @@
     }
 
     RegisterStrongMemoryReporter(new GfxMemoryImageReporter());
+
+    if (gfxPrefs::HardwareVsyncEnabled() && gfxPrefs::VsyncAlignedCompositor()) {
+      gPlatform->InitHardwareVsync();
+    }
 }
 
 static bool sLayersIPCIsUp = false;
@@ -520,6 +617,9 @@
     mozilla::gl::GLContextProviderEGL::Shutdown();
 #endif
 
+    // This is a bit iffy - we're assuming that we were the ones that set the
+    // log forwarder in the Factory, so that it's our responsibility to 
+    // delete it.
     delete mozilla::gfx::Factory::GetLogForwarder();
     mozilla::gfx::Factory::SetLogForwarder(nullptr);
 
@@ -582,6 +682,9 @@
     mScreenReferenceSurface = nullptr;
     mScreenReferenceDrawTarget = nullptr;
 
+    // Clean up any VR stuff
+    VRHMDManagerOculus::Destroy();
+
     // The cairo folks think we should only clean up in debug builds,
     // but we're generally in the habit of trying to shut down as
     // cleanly as possible even in production code, so call this
@@ -857,6 +960,65 @@
   return scaledFont;
 }
 
+int
+gfxPlatform::GetTileWidth()
+{
+  MOZ_ASSERT(mTileWidth != -1);
+  return mTileWidth;
+}
+
+int
+gfxPlatform::GetTileHeight()
+{
+  MOZ_ASSERT(mTileHeight != -1);
+  return mTileHeight;
+}
+
+void
+gfxPlatform::SetTileSize(int aWidth, int aHeight)
+{
+  // Don't allow changing the tile size after we've set it.
+  // Right now the code assumes that the tile size doesn't change.
+  MOZ_ASSERT((mTileWidth == -1 && mTileHeight == -1) ||
+    (mTileWidth == aWidth && mTileHeight == aHeight));
+
+  mTileWidth = aWidth;
+  mTileHeight = aHeight;
+}
+
+void
+gfxPlatform::ComputeTileSize()
+{
+  // The tile size should be picked in the parent processes
+  // and sent to the child processes over IPDL GetTileSize.
+  if (XRE_GetProcessType() != GeckoProcessType_Default) {
+    NS_RUNTIMEABORT("wrong process.");
+  }
+
+  int32_t w = gfxPrefs::LayersTileWidth();
+  int32_t h = gfxPrefs::LayersTileHeight();
+
+  // TODO We may want to take the screen size into consideration here.
+  if (gfxPrefs::LayersTilesAdjust()) {
+#ifdef MOZ_WIDGET_GONK
+    int32_t format = android::PIXEL_FORMAT_RGBA_8888;
+    android::sp<android::GraphicBuffer> alloc =
+      new android::GraphicBuffer(gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight(),
+                                 format,
+                                 android::GraphicBuffer::USAGE_SW_READ_OFTEN |
+                                 android::GraphicBuffer::USAGE_SW_WRITE_OFTEN |
+                                 android::GraphicBuffer::USAGE_HW_TEXTURE);
+
+    if (alloc.get()) {
+      w = alloc->getStride(); // We want the tiles to be gralloc stride aligned.
+      // No need to adjust the height here.
+    }
+#endif
+  }
+
+  SetTileSize(w, h);
+}
+
 bool
 gfxPlatform::SupportsAzureContentForDrawTarget(DrawTarget* aTarget)
 {
@@ -874,6 +1036,11 @@
          mPreferredCanvasBackend == BackendType::SKIA;
 }
 
+bool gfxPlatform::HaveChoiceOfHWAndSWCanvas()
+{
+  return mPreferredCanvasBackend == BackendType::SKIA;
+}
+
 void
 gfxPlatform::InitializeSkiaCacheLimits()
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatform.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatform.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatform.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatform.h	2014-11-26 21:45:46.000000000 +0000
@@ -260,6 +260,14 @@
       return BackendTypeBit(aType) & mContentBackendBitmask;
     }
 
+    /// This function lets us know if the current preferences/platform
+    /// combination allows for both accelerated and not accelerated canvas
+    /// implementations.  If it does, and other relevant preferences are
+    /// asking for it, we will examine the commands in the first few seconds
+    /// of the canvas usage, and potentially change to accelerated or
+    /// non-accelerated canvas.
+    virtual bool HaveChoiceOfHWAndSWCanvas();
+
     virtual bool UseAcceleratedSkiaCanvas();
     virtual void InitializeSkiaCacheLimits();
 
@@ -298,6 +306,16 @@
                                  const nsACString& aGenericFamily,
                                  nsTArray<nsString>& aListOfFonts);
 
+    int GetTileWidth();
+    int GetTileHeight();
+    void SetTileSize(int aWidth, int aHeight);
+    /**
+     * Calling this function will compute and set the ideal tile size for the
+     * platform. This should only be called in the parent process; child processes
+     * should be updated via SetTileSize to match the value computed in the parent.
+     */
+    void ComputeTileSize();
+
     /**
      * Rebuilds the any cached system font lists
      */
@@ -569,10 +587,15 @@
     gfxPlatform();
     virtual ~gfxPlatform();
 
-    void AppendCJKPrefLangs(eFontPrefLang aPrefLangs[], uint32_t &aLen, 
+    void AppendCJKPrefLangs(eFontPrefLang aPrefLangs[], uint32_t &aLen,
                             eFontPrefLang aCharLang, eFontPrefLang aPageLang);
 
     /**
+     * Initialized hardware vsync based on each platform.
+     */
+    virtual void InitHardwareVsync() {}
+
+    /**
      * Helper method, creates a draw target for a specific Azure backend.
      * Used by CreateOffscreenDrawTarget.
      */
@@ -666,6 +689,9 @@
     // Bitmask of backend types we can use to render content
     uint32_t mContentBackendBitmask;
 
+    int mTileWidth;
+    int mTileHeight;
+
     mozilla::widget::GfxInfoCollector<gfxPlatform> mAzureCanvasBackendCollector;
 
     mozilla::RefPtr<mozilla::gfx::DrawEventRecorder> mRecorder;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatformMac.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatformMac.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatformMac.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatformMac.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -17,11 +17,13 @@
 
 #include "nsTArray.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/VsyncDispatcher.h"
 #include "qcms.h"
 #include "gfx2DGlue.h"
 #include "gfxPrefs.h"
 
 #include <dlfcn.h>
+#include <CoreVideo/CoreVideo.h>
 
 #include "nsCocoaFeatures.h"
 
@@ -373,14 +375,14 @@
 gfxPlatformMac::ReadAntiAliasingThreshold()
 {
     uint32_t threshold = 0;  // default == no threshold
-    
+
     // first read prefs flag to determine whether to use the setting or not
     bool useAntiAliasingThreshold = Preferences::GetBool("gfx.use_text_smoothing_setting", false);
 
     // if the pref setting is disabled, return 0 which effectively disables this feature
     if (!useAntiAliasingThreshold)
         return threshold;
-        
+
     // value set via Appearance pref panel, "Turn off text smoothing for font sizes xxx and smaller"
     CFNumberRef prefValue = (CFNumberRef)CFPreferencesCopyAppValue(CFSTR("AppleAntiAliasingThreshold"), kCFPreferencesCurrentApplication);
 
@@ -419,6 +421,91 @@
   return nsCocoaFeatures::OnLionOrLater() && gfxPlatform::UseProgressivePaint();
 }
 
+// This is the renderer output callback function, called on the vsync thread
+static CVReturn VsyncCallback(CVDisplayLinkRef aDisplayLink,
+                              const CVTimeStamp* aNow,
+                              const CVTimeStamp* aOutputTime,
+                              CVOptionFlags aFlagsIn,
+                              CVOptionFlags* aFlagsOut,
+                              void* aDisplayLinkContext)
+{
+  mozilla::VsyncSource* vsyncSource = (mozilla::VsyncSource*) aDisplayLinkContext;
+  if (vsyncSource->IsVsyncEnabled()) {
+    // Now refers to "Now" as in when this callback is called or when the current frame
+    // is displayed. aOutputTime is when the next frame should be displayed.
+    // Now is VERY VERY noisy, aOutputTime is in the future though.
+    int64_t timestamp = aOutputTime->hostTime;
+    mozilla::TimeStamp vsyncTime = mozilla::TimeStamp::FromSystemTime(timestamp);
+    mozilla::VsyncDispatcher::GetInstance()->NotifyVsync(vsyncTime);
+    return kCVReturnSuccess;
+  } else {
+    return kCVReturnDisplayLinkNotRunning;
+  }
+}
+
+class OSXVsyncSource MOZ_FINAL : public mozilla::VsyncSource
+{
+public:
+  OSXVsyncSource()
+  {
+    EnableVsync();
+  }
+
+  virtual void EnableVsync() MOZ_OVERRIDE
+  {
+    // Create a display link capable of being used with all active displays
+    // TODO: See if we need to create an active DisplayLink for each monitor in multi-monitor
+    // situations. According to the docs, it is compatible with all displays running on the computer
+    // But if we have different monitors at different display rates, we may hit issues.
+    if (CVDisplayLinkCreateWithActiveCGDisplays(&mDisplayLink) != kCVReturnSuccess) {
+      NS_WARNING("Could not create a display link, returning");
+      return;
+    }
+
+    // Set the renderer output callback function
+    if (CVDisplayLinkSetOutputCallback(mDisplayLink, &VsyncCallback, this) != kCVReturnSuccess) {
+      NS_WARNING("Could not set displaylink output callback");
+      return;
+    }
+
+    // Activate the display link
+    if (CVDisplayLinkStart(mDisplayLink) != kCVReturnSuccess) {
+      NS_WARNING("Could not activate the display link");
+      mDisplayLink = nullptr;
+    }
+  }
+
+  virtual void DisableVsync() MOZ_OVERRIDE
+  {
+    // Release the display link
+    if (mDisplayLink) {
+      CVDisplayLinkRelease(mDisplayLink);
+      mDisplayLink = nullptr;
+    }
+  }
+
+  virtual bool IsVsyncEnabled() MOZ_OVERRIDE
+  {
+    return mDisplayLink != nullptr;
+  }
+
+private:
+  virtual ~OSXVsyncSource()
+  {
+    DisableVsync();
+  }
+
+  // Manages the display link render thread
+  CVDisplayLinkRef   mDisplayLink;
+}; // OSXVsyncSource
+
+void
+gfxPlatformMac::InitHardwareVsync()
+{
+  nsRefPtr<VsyncSource> osxVsyncSource = new OSXVsyncSource();
+  mozilla::VsyncDispatcher::GetInstance()->SetVsyncSource(osxVsyncSource);
+}
+
 void
 gfxPlatformMac::GetPlatformCMSOutputProfile(void* &mem, size_t &size)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatformMac.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatformMac.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPlatformMac.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPlatformMac.h	2014-11-26 21:45:46.000000000 +0000
@@ -72,6 +72,7 @@
 
     virtual bool UseTiling() MOZ_OVERRIDE;
     virtual bool UseProgressivePaint() MOZ_OVERRIDE;
+    virtual void InitHardwareVsync() MOZ_OVERRIDE;
 
     // lower threshold on font anti-aliasing
     uint32_t GetAntiAliasingThreshold() { return mFontAntiAliasingThreshold; }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPrefs.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPrefs.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPrefs.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPrefs.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -7,12 +7,31 @@
 
 #include "mozilla/Preferences.h"
 #include "MainThreadUtils.h"
+#include "mozilla/gfx/Logging.h"
 
 using namespace mozilla;
 
 gfxPrefs* gfxPrefs::sInstance = nullptr;
 bool gfxPrefs::sInstanceHasBeenDestroyed = false;
 
+class PreferenceAccessImpl : public mozilla::gfx::PreferenceAccess
+{
+public:
+  virtual ~PreferenceAccessImpl();
+  virtual void LivePref(const char* aName, int32_t* aVar, int32_t aDefault) MOZ_OVERRIDE;
+};
+
+PreferenceAccessImpl::~PreferenceAccessImpl()
+{
+}
+
+void PreferenceAccessImpl::LivePref(const char* aName,
+                                    int32_t* aVar,
+                                    int32_t aDefault)
+{
+  Preferences::AddIntVarCache(aVar, aName, aDefault);
+}
+
 void
 gfxPrefs::DestroySingleton()
 {
@@ -33,11 +52,19 @@
 gfxPrefs::gfxPrefs()
 {
   gfxPrefs::AssertMainThread();
+  mMoz2DPrefAccess = new PreferenceAccessImpl;
+  mozilla::gfx::PreferenceAccess::SetAccess(mMoz2DPrefAccess);
 }
 
 gfxPrefs::~gfxPrefs()
 {
   gfxPrefs::AssertMainThread();
+
+  // gfxPrefs is a singleton, we can reset this to null once
+  // it goes away.
+  mozilla::gfx::PreferenceAccess::SetAccess(nullptr);
+  delete mMoz2DPrefAccess;
+  mMoz2DPrefAccess = nullptr;
 }
 
 void gfxPrefs::AssertMainThread()
@@ -112,3 +139,4 @@
 {
   Preferences::SetFloat(aPref, aValue);
 }
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPrefs.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPrefs.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxPrefs.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxPrefs.h	2014-11-26 21:45:46.000000000 +0000
@@ -68,10 +68,15 @@
 static Type Get##Name##PrefDefault() { return Default; }                      \
 PrefTemplate<UpdatePolicy::Update, Type, Get##Name##PrefDefault, Get##Name##PrefName> mPref##Name
 
+class PreferenceAccessImpl;
 class gfxPrefs;
 class gfxPrefs MOZ_FINAL
 {
 private:
+  /// See Logging.h.  This lets Moz2D access preference values it owns.
+  PreferenceAccessImpl* mMoz2DPrefAccess;
+
+private:
   // Enums for the update policy.
   MOZ_BEGIN_NESTED_ENUM_CLASS(UpdatePolicy)
     Skip, // Set the value to default, skip any Preferences calls
@@ -185,6 +190,9 @@
 #if defined(ANDROID)
   DECL_GFX_PREF(Once, "gfx.apitrace.enabled",                  UseApitrace, bool, false);
 #endif
+  DECL_GFX_PREF(Live, "gfx.canvas.auto_accelerate.min_frames", CanvasAutoAccelerateMinFrames, int32_t, 30);
+  DECL_GFX_PREF(Live, "gfx.canvas.auto_accelerate.min_seconds", CanvasAutoAccelerateMinSeconds, float, 5.0f);
+  DECL_GFX_PREF(Live, "gfx.canvas.auto_accelerate.min_calls",  CanvasAutoAccelerateMinCalls, int32_t, 4);
   DECL_GFX_PREF(Live, "gfx.canvas.azure.accelerated",          CanvasAzureAccelerated, bool, false);
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.dynamic-cache",       CanvasSkiaGLDynamicCache, bool, false);
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.cache-size",          CanvasSkiaGLCacheSize, int32_t, 96);
@@ -201,6 +209,8 @@
   DECL_GFX_PREF(Live, "gfx.gralloc.fence-with-readpixels",     GrallocFenceWithReadPixels, bool, false);
   DECL_GFX_PREF(Live, "gfx.layerscope.enabled",                LayerScopeEnabled, bool, false);
   DECL_GFX_PREF(Live, "gfx.layerscope.port",                   LayerScopePort, int32_t, 23456);
+  // Note that        "gfx.logging.level" is defined in Logging.h
+  DECL_GFX_PREF(Once, "gfx.logging.crash.length",              GfxLoggingCrashLength, uint32_t, 6);
   DECL_GFX_PREF(Live, "gfx.perf-warnings.enabled",             PerfWarnings, bool, false);
   DECL_GFX_PREF(Once, "gfx.work-around-driver-bugs",           WorkAroundDriverBugs, bool, true);
 
@@ -213,8 +223,8 @@
   // These times should be in milliseconds
   DECL_GFX_PREF(Once, "gfx.touch.resample.max-predict",        TouchResampleMaxPredict, int32_t, 8);
   DECL_GFX_PREF(Once, "gfx.touch.resample.vsync-adjust",       TouchVsyncSampleAdjust, int32_t, 5);
-  DECL_GFX_PREF(Once, "gfx.touch.resample.min-resample",       TouchResampleMinTime, int32_t, 2);
   DECL_GFX_PREF(Once, "gfx.touch.resample.delay-threshold",    TouchResampleVsyncDelayThreshold, int32_t, 20);
+  DECL_GFX_PREF(Once, "gfx.touch.resample.old-touch-threshold",TouchResampleOldTouchThreshold, int32_t, 17);
 
   DECL_GFX_PREF(Live, "gl.msaa-level",                         MSAALevel, uint32_t, 2);
 
@@ -277,6 +287,7 @@
   // they are often the same size as the screen, especially for width.
   DECL_GFX_PREF(Once, "layers.tile-width",                     LayersTileWidth, int32_t, 256);
   DECL_GFX_PREF(Once, "layers.tile-height",                    LayersTileHeight, int32_t, 256);
+  DECL_GFX_PREF(Once, "layers.tiles.adjust",                   LayersTilesAdjust, bool, true);
   DECL_GFX_PREF(Once, "layers.tile-max-pool-size",             LayersTileMaxPoolSize, uint32_t, (uint32_t)50);
   DECL_GFX_PREF(Once, "layers.tile-shrink-pool-timeout",       LayersTileShrinkPoolTimeout, uint32_t, (uint32_t)1000);
   DECL_GFX_PREF(Once, "layers.overzealous-gralloc-unlocking",  OverzealousGrallocUnlocking, bool, false);
@@ -315,6 +326,9 @@
   DECL_GFX_PREF(Once, "webgl.angle.force-d3d11",               WebGLANGLEForceD3D11, bool, false);
 
   DECL_GFX_PREF(Once, "layers.stereo-video.enabled",           StereoVideoEnabled, bool, false);
+
+  DECL_GFX_PREF(Once, "dom.vr.enabled",                        VREnabled, bool, false);
+  DECL_GFX_PREF(Once, "dom.vr.add-test-devices",               VRAddTestDevices, int32_t, 1);
 public:
   // Manage the singleton:
   static gfxPrefs& GetSingleton()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxQtPlatform.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxQtPlatform.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxQtPlatform.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxQtPlatform.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -7,7 +7,6 @@
 #include <QWindow>
 #ifdef MOZ_X11
 #include <qpa/qplatformnativeinterface.h>
-#include <qpa/qplatformintegration.h>
 #endif
 #include <QGuiApplication>
 #include <QScreen>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxTextRun.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxTextRun.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxTextRun.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxTextRun.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -1973,7 +1973,7 @@
 
     uint16_t orientation = aFlags & TEXT_ORIENT_MASK;
     if (orientation == TEXT_ORIENT_VERTICAL_MIXED) {
-        orientation = TEXT_ORIENT_VERTICAL_UPRIGHT;
+        orientation = TEXT_ORIENT_VERTICAL_SIDEWAYS_RIGHT;
     }
 
     gfxFont *font = GetFirstValidFont();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxUserFontSet.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxUserFontSet.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxUserFontSet.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxUserFontSet.h	2014-11-26 21:45:46.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIPrincipal.h"
 #include "nsIScriptError.h"
 #include "nsURIHashKey.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class nsFontFaceLoader;
 
@@ -52,6 +53,7 @@
     nsString               mLocalName;     // full font name if local
     nsCOMPtr<nsIURI>       mURI;           // uri if url
     nsCOMPtr<nsIURI>       mReferrer;      // referrer url if url
+    mozilla::net::ReferrerPolicy mReferrerPolicy;
     nsCOMPtr<nsIPrincipal> mOriginPrincipal; // principal if url
 
     nsRefPtr<gfxFontFaceBufferSource> mBuffer;
@@ -73,6 +75,7 @@
                    NS_SUCCEEDED(a.mURI->Equals(b.mURI, &equals)) && equals &&
                    NS_SUCCEEDED(a.mReferrer->Equals(b.mReferrer, &equals)) &&
                      equals &&
+                   a.mReferrerPolicy == b.mReferrerPolicy &&
                    a.mOriginPrincipal->Equals(b.mOriginPrincipal);
         }
         case gfxFontFaceSrc::eSourceType_Buffer:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxUtils.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxUtils.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -682,22 +682,20 @@
 }
 
 static void
-PathFromRegionInternal(gfxContext* aContext, const nsIntRegion& aRegion,
-                       bool aSnap)
+PathFromRegionInternal(gfxContext* aContext, const nsIntRegion& aRegion)
 {
   aContext->NewPath();
   nsIntRegionRectIterator iter(aRegion);
   const nsIntRect* r;
   while ((r = iter.Next()) != nullptr) {
-    aContext->Rectangle(gfxRect(r->x, r->y, r->width, r->height), aSnap);
+    aContext->Rectangle(gfxRect(r->x, r->y, r->width, r->height));
   }
 }
 
 static void
-ClipToRegionInternal(gfxContext* aContext, const nsIntRegion& aRegion,
-                     bool aSnap)
+ClipToRegionInternal(gfxContext* aContext, const nsIntRegion& aRegion)
 {
-  PathFromRegionInternal(aContext, aRegion, aSnap);
+  PathFromRegionInternal(aContext, aRegion);
   aContext->Clip();
 }
 
@@ -735,7 +733,7 @@
 /*static*/ void
 gfxUtils::ClipToRegion(gfxContext* aContext, const nsIntRegion& aRegion)
 {
-  ClipToRegionInternal(aContext, aRegion, false);
+  ClipToRegionInternal(aContext, aRegion);
 }
 
 /*static*/ void
@@ -744,12 +742,6 @@
   ClipToRegionInternal(aTarget, aRegion);
 }
 
-/*static*/ void
-gfxUtils::ClipToRegionSnapped(gfxContext* aContext, const nsIntRegion& aRegion)
-{
-  ClipToRegionInternal(aContext, aRegion, true);
-}
-
 /*static*/ gfxFloat
 gfxUtils::ClampToScaleFactor(gfxFloat aVal)
 {
@@ -796,13 +788,7 @@
 /*static*/ void
 gfxUtils::PathFromRegion(gfxContext* aContext, const nsIntRegion& aRegion)
 {
-  PathFromRegionInternal(aContext, aRegion, false);
-}
-
-/*static*/ void
-gfxUtils::PathFromRegionSnapped(gfxContext* aContext, const nsIntRegion& aRegion)
-{
-  PathFromRegionInternal(aContext, aRegion, true);
+  PathFromRegionInternal(aContext, aRegion);
 }
 
 gfxMatrix
@@ -1213,6 +1199,9 @@
                                bufSize - imgSize,
                                &numReadThisTime)) == NS_OK && numReadThisTime > 0)
   {
+    // Update the length of the vector without overwriting the new data.
+    imgData.growByUninitialized(numReadThisTime);
+
     imgSize += numReadThisTime;
     if (imgSize == bufSize) {
       // need a bigger buffer, just double
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxUtils.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxUtils.h	2014-11-26 21:45:46.000000000 +0000
@@ -96,20 +96,10 @@
     static void ClipToRegion(mozilla::gfx::DrawTarget* aTarget, const nsIntRegion& aRegion);
 
     /**
-     * Clip aContext to the region aRegion, snapping the rectangles.
-     */
-    static void ClipToRegionSnapped(gfxContext* aContext, const nsIntRegion& aRegion);
-
-    /**
      * Create a path consisting of rectangles in |aRegion|.
      */
     static void PathFromRegion(gfxContext* aContext, const nsIntRegion& aRegion);
 
-    /**
-     * Create a path consisting of rectangles in |aRegion|, snapping the rectangles.
-     */
-    static void PathFromRegionSnapped(gfxContext* aContext, const nsIntRegion& aRegion);
-
     /*
      * Convert image format to depth value
      */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxVR.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxVR.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxVR.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxVR.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -0,0 +1,645 @@
+/* -*- Mode: C++; tab-width: 20; 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 <math.h>
+
+#include "prlink.h"
+#include "prmem.h"
+#include "prenv.h"
+#include "gfxPrefs.h"
+#include "gfxVR.h"
+
+#include "ovr_capi_dynamic.h"
+
+#include "nsServiceManagerUtils.h"
+#include "nsIScreenManager.h"
+
+#ifdef XP_WIN
+#include "gfxWindowsPlatform.h" // for gfxWindowsPlatform::GetDPIScale
+#endif
+
+#ifndef M_PI
+# define M_PI 3.14159265358979323846
+#endif
+
+namespace {
+
+#ifdef OVR_CAPI_LIMITED_MOZILLA
+static pfn_ovr_Initialize ovr_Initialize = nullptr;
+static pfn_ovr_Shutdown ovr_Shutdown = nullptr;
+static pfn_ovrHmd_Detect ovrHmd_Detect = nullptr;
+static pfn_ovrHmd_Create ovrHmd_Create = nullptr;
+static pfn_ovrHmd_Destroy ovrHmd_Destroy = nullptr;
+static pfn_ovrHmd_CreateDebug ovrHmd_CreateDebug = nullptr;
+static pfn_ovrHmd_GetLastError ovrHmd_GetLastError = nullptr;
+static pfn_ovrHmd_AttachToWindow ovrHmd_AttachToWindow = nullptr;
+static pfn_ovrHmd_GetEnabledCaps ovrHmd_GetEnabledCaps = nullptr;
+static pfn_ovrHmd_SetEnabledCaps ovrHmd_SetEnabledCaps = nullptr;
+static pfn_ovrHmd_ConfigureTracking ovrHmd_ConfigureTracking = nullptr;
+static pfn_ovrHmd_RecenterPose ovrHmd_RecenterPose = nullptr;
+static pfn_ovrHmd_GetTrackingState ovrHmd_GetTrackingState = nullptr;
+static pfn_ovrHmd_GetFovTextureSize ovrHmd_GetFovTextureSize = nullptr;
+static pfn_ovrHmd_GetRenderDesc ovrHmd_GetRenderDesc = nullptr;
+static pfn_ovrHmd_CreateDistortionMesh ovrHmd_CreateDistortionMesh = nullptr;
+static pfn_ovrHmd_DestroyDistortionMesh ovrHmd_DestroyDistortionMesh = nullptr;
+static pfn_ovrHmd_GetRenderScaleAndOffset ovrHmd_GetRenderScaleAndOffset = nullptr;
+static pfn_ovrHmd_GetFrameTiming ovrHmd_GetFrameTiming = nullptr;
+static pfn_ovrHmd_BeginFrameTiming ovrHmd_BeginFrameTiming = nullptr;
+static pfn_ovrHmd_EndFrameTiming ovrHmd_EndFrameTiming = nullptr;
+static pfn_ovrHmd_ResetFrameTiming ovrHmd_ResetFrameTiming = nullptr;
+static pfn_ovrHmd_GetEyePoses ovrHmd_GetEyePoses = nullptr;
+static pfn_ovrHmd_GetHmdPosePerEye ovrHmd_GetHmdPosePerEye = nullptr;
+static pfn_ovrHmd_GetEyeTimewarpMatrices ovrHmd_GetEyeTimewarpMatrices = nullptr;
+static pfn_ovrMatrix4f_Projection ovrMatrix4f_Projection = nullptr;
+static pfn_ovrMatrix4f_OrthoSubProjection ovrMatrix4f_OrthoSubProjection = nullptr;
+static pfn_ovr_GetTimeInSeconds ovr_GetTimeInSeconds = nullptr;
+
+#if defined(XP_WIN)
+# ifdef HAVE_64BIT_BUILD
+#  define OVR_LIB_NAME "libovr64.dll"
+# else
+#  define OVR_LIB_NAME "libovr.dll"
+# endif
+#elif defined(XP_MACOSX)
+# define OVR_LIB_NAME "libovr.dylib"
+#else
+# define OVR_LIB_NAME 0
+#endif
+
+static bool
+InitializeOculusCAPI()
+{
+  static PRLibrary *ovrlib = nullptr;
+
+  if (!ovrlib) {
+    const char *libName = OVR_LIB_NAME;
+
+    if (PR_GetEnv("OVR_LIB_NAME")) {
+      libName = PR_GetEnv("OVR_LIB_NAME");
+    }
+
+    if (!libName) {
+      printf_stderr("Don't know how to find Oculus VR library; missing OVR_LIB_NAME\n");
+      return false;
+    }
+
+    ovrlib = PR_LoadLibrary(libName);
+
+    if (!ovrlib) {
+      // Not found? Try harder. Needed mainly on OSX/etc. where
+      // the binary location is not in the search path.
+      const char *xulName = "libxul.so";
+#if defined(XP_MACOSX)
+      xulName = "XUL";
+#endif
+
+      char *xulpath = PR_GetLibraryFilePathname(xulName, (PRFuncPtr) &InitializeOculusCAPI);
+      if (xulpath) {
+        char *xuldir = strrchr(xulpath, '/');
+        if (xuldir) {
+          *xuldir = 0;
+          xuldir = xulpath;
+
+          char *ovrpath = PR_GetLibraryName(xuldir, libName);
+          ovrlib = PR_LoadLibrary(ovrpath);
+          PR_Free(ovrpath);
+        }
+        PR_Free(xulpath);
+      }
+    }
+
+    if (!ovrlib) {
+      printf_stderr("Failed to load Oculus VR library, tried '%s'\n", libName);
+      return false;
+    }
+  }
+
+  // was it already initialized?
+  if (ovr_Initialize)
+    return true;
+
+#define REQUIRE_FUNCTION(_x) do { \
+    *(void **)&_x = (void *) PR_FindSymbol(ovrlib, #_x);                \
+    if (!_x) { printf_stderr(#_x " symbol missing\n"); goto fail; }       \
+  } while (0)
+
+  REQUIRE_FUNCTION(ovr_Initialize);
+  REQUIRE_FUNCTION(ovr_Shutdown);
+  REQUIRE_FUNCTION(ovrHmd_Detect);
+  REQUIRE_FUNCTION(ovrHmd_Create);
+  REQUIRE_FUNCTION(ovrHmd_Destroy);
+  REQUIRE_FUNCTION(ovrHmd_CreateDebug);
+  REQUIRE_FUNCTION(ovrHmd_GetLastError);
+  REQUIRE_FUNCTION(ovrHmd_AttachToWindow);
+  REQUIRE_FUNCTION(ovrHmd_GetEnabledCaps);
+  REQUIRE_FUNCTION(ovrHmd_SetEnabledCaps);
+  REQUIRE_FUNCTION(ovrHmd_ConfigureTracking);
+  REQUIRE_FUNCTION(ovrHmd_RecenterPose);
+  REQUIRE_FUNCTION(ovrHmd_GetTrackingState);
+
+  REQUIRE_FUNCTION(ovrHmd_GetFovTextureSize);
+  REQUIRE_FUNCTION(ovrHmd_GetRenderDesc);
+  REQUIRE_FUNCTION(ovrHmd_CreateDistortionMesh);
+  REQUIRE_FUNCTION(ovrHmd_DestroyDistortionMesh);
+  REQUIRE_FUNCTION(ovrHmd_GetRenderScaleAndOffset);
+  REQUIRE_FUNCTION(ovrHmd_GetFrameTiming);
+  REQUIRE_FUNCTION(ovrHmd_BeginFrameTiming);
+  REQUIRE_FUNCTION(ovrHmd_EndFrameTiming);
+  REQUIRE_FUNCTION(ovrHmd_ResetFrameTiming);
+  REQUIRE_FUNCTION(ovrHmd_GetEyePoses);
+  REQUIRE_FUNCTION(ovrHmd_GetHmdPosePerEye);
+  REQUIRE_FUNCTION(ovrHmd_GetEyeTimewarpMatrices);
+  REQUIRE_FUNCTION(ovrMatrix4f_Projection);
+  REQUIRE_FUNCTION(ovrMatrix4f_OrthoSubProjection);
+  REQUIRE_FUNCTION(ovr_GetTimeInSeconds);
+
+#undef REQUIRE_FUNCTION
+
+  return true;
+
+ fail:
+  ovr_Initialize = nullptr;
+  return false;
+}
+
+#else
+// we're statically linked; it's available
+static bool InitializeOculusCAPI()
+{
+  return true;
+}
+#endif
+
+} // anonymous namespace
+
+using namespace mozilla::gfx;
+
+// Dummy nsIScreen implementation, for when we just need to specify a size
+class FakeScreen : public nsIScreen
+{
+public:
+  FakeScreen(const IntRect& aScreenRect)
+    : mScreenRect(aScreenRect)
+  { }
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD GetRect(int32_t *l, int32_t *t, int32_t *w, int32_t *h) {
+    *l = mScreenRect.x;
+    *t = mScreenRect.y;
+    *w = mScreenRect.width;
+    *h = mScreenRect.height;
+    return NS_OK;
+  }
+  NS_IMETHOD GetAvailRect(int32_t *l, int32_t *t, int32_t *w, int32_t *h) {
+    return GetRect(l, t, w, h);
+  }
+  NS_IMETHOD GetRectDisplayPix(int32_t *l, int32_t *t, int32_t *w, int32_t *h) {
+    return GetRect(l, t, w, h);
+  }
+  NS_IMETHOD GetAvailRectDisplayPix(int32_t *l, int32_t *t, int32_t *w, int32_t *h) {
+    return GetAvailRect(l, t, w, h);
+  }
+
+  NS_IMETHOD GetId(uint32_t* aId) { *aId = (uint32_t)-1; return NS_OK; }
+  NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth) { *aPixelDepth = 24; return NS_OK; }
+  NS_IMETHOD GetColorDepth(int32_t* aColorDepth) { *aColorDepth = 24; return NS_OK; }
+
+  NS_IMETHOD LockMinimumBrightness(uint32_t aBrightness) { return NS_ERROR_NOT_AVAILABLE; }
+  NS_IMETHOD UnlockMinimumBrightness(uint32_t aBrightness) { return NS_ERROR_NOT_AVAILABLE; }
+  NS_IMETHOD GetRotation(uint32_t* aRotation) {
+    *aRotation = nsIScreen::ROTATION_0_DEG;
+    return NS_OK;
+  }
+  NS_IMETHOD SetRotation(uint32_t aRotation) { return NS_ERROR_NOT_AVAILABLE; }
+  NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor) {
+    *aContentsScaleFactor = 1.0;
+    return NS_OK;
+  }
+
+protected:
+  virtual ~FakeScreen() {}
+
+  IntRect mScreenRect;
+};
+
+NS_IMPL_ISUPPORTS(FakeScreen, nsIScreen)
+
+class HMDInfoOculus : public VRHMDInfo {
+  friend class VRHMDManagerOculusImpl;
+public:
+  HMDInfoOculus(ovrHmd aHMD);
+
+  bool SetFOV(const VRFieldOfView& aFOVLeft, const VRFieldOfView& aFOVRight,
+              double zNear, double zFar) MOZ_OVERRIDE;
+
+  bool StartSensorTracking() MOZ_OVERRIDE;
+  VRHMDSensorState GetSensorState(double timeOffset) MOZ_OVERRIDE;
+  void StopSensorTracking() MOZ_OVERRIDE;
+  void ZeroSensor() MOZ_OVERRIDE;
+
+  void FillDistortionConstants(uint32_t whichEye,
+                               const IntSize& textureSize, const IntRect& eyeViewport,
+                               const Size& destViewport, const Rect& destRect,
+                               VRDistortionConstants& values) MOZ_OVERRIDE;
+
+  void Destroy();
+
+protected:
+  virtual ~HMDInfoOculus() {
+      Destroy();
+      MOZ_COUNT_DTOR_INHERITED(HMDInfoOculus, VRHMDInfo);
+  }
+
+  ovrHmd mHMD;
+  ovrFovPort mFOVPort[2];
+  uint32_t mStartCount;
+};
+
+static ovrFovPort
+ToFovPort(const VRFieldOfView& aFOV)
+{
+  ovrFovPort fovPort;
+  fovPort.LeftTan = tan(aFOV.leftDegrees * M_PI / 180.0);
+  fovPort.RightTan = tan(aFOV.rightDegrees * M_PI / 180.0);
+  fovPort.UpTan = tan(aFOV.upDegrees * M_PI / 180.0);
+  fovPort.DownTan = tan(aFOV.downDegrees * M_PI / 180.0);
+  return fovPort;
+}
+
+static VRFieldOfView
+FromFovPort(const ovrFovPort& aFOV)
+{
+  VRFieldOfView fovInfo;
+  fovInfo.leftDegrees = atan(aFOV.LeftTan) * 180.0 / M_PI;
+  fovInfo.rightDegrees = atan(aFOV.RightTan) * 180.0 / M_PI;
+  fovInfo.upDegrees = atan(aFOV.UpTan) * 180.0 / M_PI;
+  fovInfo.downDegrees = atan(aFOV.DownTan) * 180.0 / M_PI;
+  return fovInfo;
+}
+
+HMDInfoOculus::HMDInfoOculus(ovrHmd aHMD)
+  : VRHMDInfo(VRHMDType::Oculus)
+  , mHMD(aHMD)
+  , mStartCount(0)
+{
+  MOZ_COUNT_CTOR_INHERITED(HMDInfoOculus, VRHMDInfo);
+
+  mSupportedSensorBits = 0;
+  if (mHMD->TrackingCaps & ovrTrackingCap_Orientation)
+    mSupportedSensorBits |= State_Orientation;
+  if (mHMD->TrackingCaps & ovrTrackingCap_Position)
+    mSupportedSensorBits |= State_Position;
+
+  mRecommendedEyeFOV[Eye_Left] = FromFovPort(mHMD->DefaultEyeFov[ovrEye_Left]);
+  mRecommendedEyeFOV[Eye_Right] = FromFovPort(mHMD->DefaultEyeFov[ovrEye_Right]);
+
+  mMaximumEyeFOV[Eye_Left] = FromFovPort(mHMD->MaxEyeFov[ovrEye_Left]);
+  mMaximumEyeFOV[Eye_Right] = FromFovPort(mHMD->MaxEyeFov[ovrEye_Right]);
+
+  SetFOV(mRecommendedEyeFOV[Eye_Left], mRecommendedEyeFOV[Eye_Right], 0.01, 10000.0);
+
+  nsCOMPtr<nsIScreenManager> screenmgr = do_GetService("@mozilla.org/gfx/screenmanager;1");
+  if (screenmgr) {
+    screenmgr->ScreenForRect(mHMD->WindowsPos.x, mHMD->WindowsPos.y,
+                             mHMD->Resolution.w, mHMD->Resolution.h,
+                             getter_AddRefs(mScreen));
+  }
+}
+
+void
+HMDInfoOculus::Destroy()
+{
+  if (mHMD) {
+    ovrHmd_Destroy(mHMD);
+    mHMD = nullptr;
+  }
+}
+
+bool
+HMDInfoOculus::SetFOV(const VRFieldOfView& aFOVLeft, const VRFieldOfView& aFOVRight,
+                      double zNear, double zFar)
+{
+  float pixelsPerDisplayPixel = 1.0;
+  ovrSizei texSize[2];
+
+  uint32_t caps = ovrDistortionCap_Chromatic | ovrDistortionCap_Vignette; // XXX TODO add TimeWarp
+
+  // get eye parameters and create the mesh
+  for (uint32_t eye = 0; eye < NumEyes; eye++) {
+    mEyeFOV[eye] = eye == 0 ? aFOVLeft : aFOVRight;
+    mFOVPort[eye] = ToFovPort(mEyeFOV[eye]);
+
+    ovrEyeRenderDesc renderDesc = ovrHmd_GetRenderDesc(mHMD, (ovrEyeType) eye, mFOVPort[eye]);
+
+    // these values are negated so that content can add the adjustment to its camera position,
+    // instead of subtracting
+    mEyeTranslation[eye] = Point3D(-renderDesc.ViewAdjust.x, -renderDesc.ViewAdjust.y, -renderDesc.ViewAdjust.z);
+
+    // note that we are using a right-handed coordinate system here, to match CSS
+    ovrMatrix4f projMatrix = ovrMatrix4f_Projection(mFOVPort[eye], zNear, zFar, true);
+
+    // XXX this is gross, we really need better methods on Matrix4x4
+    memcpy(&mEyeProjectionMatrix[eye], projMatrix.M, sizeof(ovrMatrix4f));
+    mEyeProjectionMatrix[eye].Transpose();
+
+    texSize[eye] = ovrHmd_GetFovTextureSize(mHMD, (ovrEyeType) eye, mFOVPort[eye], pixelsPerDisplayPixel);
+
+    ovrDistortionMesh mesh;
+    bool ok = ovrHmd_CreateDistortionMesh(mHMD, (ovrEyeType) eye, mFOVPort[eye], caps, &mesh);
+    if (!ok)
+      return false;
+
+    mDistortionMesh[eye].mVertices.SetLength(mesh.VertexCount);
+    mDistortionMesh[eye].mIndices.SetLength(mesh.IndexCount);
+
+    ovrDistortionVertex *srcv = mesh.pVertexData;
+    VRDistortionVertex *destv = mDistortionMesh[eye].mVertices.Elements();
+    memset(destv, 0, mesh.VertexCount * sizeof(VRDistortionVertex));
+    for (uint32_t i = 0; i < mesh.VertexCount; ++i) {
+      destv[i].pos[0] = srcv[i].ScreenPosNDC.x;
+      destv[i].pos[1] = srcv[i].ScreenPosNDC.y;
+
+      destv[i].texR[0] = srcv[i].TanEyeAnglesR.x;
+      destv[i].texR[1] = srcv[i].TanEyeAnglesR.y;
+      destv[i].texG[0] = srcv[i].TanEyeAnglesG.x;
+      destv[i].texG[1] = srcv[i].TanEyeAnglesG.y;
+      destv[i].texB[0] = srcv[i].TanEyeAnglesB.x;
+      destv[i].texB[1] = srcv[i].TanEyeAnglesB.y;
+
+      destv[i].genericAttribs[0] = srcv[i].VignetteFactor;
+      destv[i].genericAttribs[1] = srcv[i].TimeWarpFactor;
+    }
+
+    memcpy(mDistortionMesh[eye].mIndices.Elements(), mesh.pIndexData, mesh.IndexCount * sizeof(uint16_t));
+    ovrHmd_DestroyDistortionMesh(&mesh);
+  }
+
+  // take the max of both for eye resolution
+  mEyeResolution.width = std::max(texSize[Eye_Left].w, texSize[Eye_Right].w);
+  mEyeResolution.height = std::max(texSize[Eye_Left].h, texSize[Eye_Right].h);
+
+  mConfiguration.hmdType = mType;
+  mConfiguration.value = 0;
+  mConfiguration.fov[0] = aFOVLeft;
+  mConfiguration.fov[1] = aFOVRight;
+
+  return true;
+  //* need to call this during rendering each frame I think? */
+  //ovrHmd_GetRenderScaleAndOffset(fovPort, texSize, renderViewport, uvScaleOffsetOut);
+}
+
+void
+HMDInfoOculus::FillDistortionConstants(uint32_t whichEye,
+                                       const IntSize& textureSize,
+                                       const IntRect& eyeViewport,
+                                       const Size& destViewport,
+                                       const Rect& destRect,
+                                       VRDistortionConstants& values)
+{
+  ovrSizei texSize = { textureSize.width, textureSize.height };
+  ovrRecti eyePort = { { eyeViewport.x, eyeViewport.y }, { eyeViewport.width, eyeViewport.height } };
+  ovrVector2f scaleOut[2];
+
+  ovrHmd_GetRenderScaleAndOffset(mFOVPort[whichEye], texSize, eyePort, scaleOut);
+
+  values.eyeToSourceScaleAndOffset[0] = scaleOut[0].x;
+  values.eyeToSourceScaleAndOffset[1] = scaleOut[0].y;
+  values.eyeToSourceScaleAndOffset[2] = scaleOut[1].x;
+  values.eyeToSourceScaleAndOffset[3] = scaleOut[1].y;
+
+  // These values are in clip space [-1..1] range, but we're providing
+  // scaling in the 0..2 space for sanity.
+
+  // this is the destRect in clip space
+  float x0 = destRect.x / destViewport.width * 2.0 - 1.0;
+  float x1 = (destRect.x + destRect.width) / destViewport.width * 2.0 - 1.0;
+
+  float y0 = destRect.y / destViewport.height * 2.0 - 1.0;
+  float y1 = (destRect.y + destRect.height) / destViewport.height * 2.0 - 1.0;
+
+  // offset
+  values.destinationScaleAndOffset[0] = (x0+x1) / 2.0;
+  values.destinationScaleAndOffset[1] = (y0+y1) / 2.0;
+  // scale
+  values.destinationScaleAndOffset[2] = destRect.width / destViewport.width;
+  values.destinationScaleAndOffset[3] = destRect.height / destViewport.height;
+}
+
+bool
+HMDInfoOculus::StartSensorTracking()
+{
+  if (mStartCount == 0) {
+    bool ok = ovrHmd_ConfigureTracking(mHMD, ovrTrackingCap_Orientation | ovrTrackingCap_Position, 0);
+    if (!ok)
+      return false;
+  }
+
+  mStartCount++;
+  return true;
+}
+
+void
+HMDInfoOculus::StopSensorTracking()
+{
+  if (--mStartCount == 0) {
+    ovrHmd_ConfigureTracking(mHMD, 0, 0);
+  }
+}
+
+void
+HMDInfoOculus::ZeroSensor()
+{
+  ovrHmd_RecenterPose(mHMD);
+}
+
+VRHMDSensorState
+HMDInfoOculus::GetSensorState(double timeOffset)
+{
+  VRHMDSensorState result;
+  result.Clear();
+
+  // XXX this is the wrong time base for timeOffset; we need to figure out how to synchronize
+  // the Oculus time base and the browser one.
+  ovrTrackingState state = ovrHmd_GetTrackingState(mHMD, ovr_GetTimeInSeconds() + timeOffset);
+  ovrPoseStatef& pose(state.HeadPose);
+
+  result.timestamp = pose.TimeInSeconds;
+
+  if (state.StatusFlags & ovrStatus_OrientationTracked) {
+    result.flags |= State_Orientation;
+
+    result.orientation[0] = pose.ThePose.Orientation.x;
+    result.orientation[1] = pose.ThePose.Orientation.y;
+    result.orientation[2] = pose.ThePose.Orientation.z;
+    result.orientation[3] = pose.ThePose.Orientation.w;
+    
+    result.angularVelocity[0] = pose.AngularVelocity.x;
+    result.angularVelocity[1] = pose.AngularVelocity.y;
+    result.angularVelocity[2] = pose.AngularVelocity.z;
+
+    result.angularAcceleration[0] = pose.AngularAcceleration.x;
+    result.angularAcceleration[1] = pose.AngularAcceleration.y;
+    result.angularAcceleration[2] = pose.AngularAcceleration.z;
+  }
+
+  if (state.StatusFlags & ovrStatus_PositionTracked) {
+    result.flags |= State_Position;
+
+    result.position[0] = pose.ThePose.Position.x;
+    result.position[1] = pose.ThePose.Position.y;
+    result.position[2] = pose.ThePose.Position.z;
+    
+    result.linearVelocity[0] = pose.LinearVelocity.x;
+    result.linearVelocity[1] = pose.LinearVelocity.y;
+    result.linearVelocity[2] = pose.LinearVelocity.z;
+
+    result.linearAcceleration[0] = pose.LinearAcceleration.x;
+    result.linearAcceleration[1] = pose.LinearAcceleration.y;
+    result.linearAcceleration[2] = pose.LinearAcceleration.z;
+  }
+
+  return result;
+}
+
+namespace mozilla {
+namespace gfx {
+
+class VRHMDManagerOculusImpl {
+public:
+  VRHMDManagerOculusImpl() : mOculusInitialized(false), mOculusPlatformInitialized(false)
+  { }
+
+  bool PlatformInit();
+  bool Init();
+  void Destroy();
+  void GetOculusHMDs(nsTArray<nsRefPtr<VRHMDInfo> >& aHMDResult);
+protected:
+  nsTArray<nsRefPtr<HMDInfoOculus>> mOculusHMDs;
+  bool mOculusInitialized;
+  bool mOculusPlatformInitialized;
+};
+
+} // namespace gfx
+} // namespace mozilla
+
+VRHMDManagerOculusImpl *VRHMDManagerOculus::mImpl = nullptr;
+
+// These just forward to the Impl class, to have a non-static container for various
+// objects.
+
+bool
+VRHMDManagerOculus::PlatformInit()
+{
+  if (!mImpl) {
+    mImpl = new VRHMDManagerOculusImpl;
+  }
+  return mImpl->PlatformInit();
+}
+
+bool
+VRHMDManagerOculus::Init()
+{
+  if (!mImpl) {
+    mImpl = new VRHMDManagerOculusImpl;
+  }
+  return mImpl->Init();
+}
+
+void
+VRHMDManagerOculus::GetOculusHMDs(nsTArray<nsRefPtr<VRHMDInfo>>& aHMDResult)
+{
+  if (!mImpl) {
+    mImpl = new VRHMDManagerOculusImpl;
+  }
+  mImpl->GetOculusHMDs(aHMDResult);
+}
+
+void
+VRHMDManagerOculus::Destroy()
+{
+  if (!mImpl)
+    return;
+  mImpl->Destroy();
+  delete mImpl;
+  mImpl = nullptr;
+}
+
+bool
+VRHMDManagerOculusImpl::PlatformInit()
+{
+  if (mOculusPlatformInitialized)
+    return true;
+
+  if (!gfxPrefs::VREnabled())
+    return false;
+
+  if (!InitializeOculusCAPI())
+    return false;
+
+  bool ok = ovr_Initialize();
+
+  if (!ok)
+    return false;
+
+  mOculusPlatformInitialized = true;
+  return true;
+}
+
+bool
+VRHMDManagerOculusImpl::Init()
+{
+  if (mOculusInitialized)
+    return true;
+
+  if (!PlatformInit())
+    return false;
+
+  int count = ovrHmd_Detect();
+
+  for (int i = 0; i < count; ++i) {
+    ovrHmd hmd = ovrHmd_Create(i);
+    nsRefPtr<HMDInfoOculus> oc = new HMDInfoOculus(hmd);
+    mOculusHMDs.AppendElement(oc);
+  }
+
+  // VRAddTestDevices == 1: add test device only if no real devices present
+  // VRAddTestDevices == 2: add test device always
+  if ((count == 0 && gfxPrefs::VRAddTestDevices() == 1) ||
+      (gfxPrefs::VRAddTestDevices() == 2))
+  {
+    ovrHmd hmd = ovrHmd_CreateDebug(ovrHmd_DK2);
+    nsRefPtr<HMDInfoOculus> oc = new HMDInfoOculus(hmd);
+    mOculusHMDs.AppendElement(oc);
+  }
+
+  mOculusInitialized = true;
+  return true;
+}
+
+void
+VRHMDManagerOculusImpl::Destroy()
+{
+  if (!mOculusInitialized)
+    return;
+
+  for (size_t i = 0; i < mOculusHMDs.Length(); ++i) {
+    mOculusHMDs[i]->Destroy();
+  }
+
+  mOculusHMDs.Clear();
+
+  ovr_Shutdown();
+  mOculusInitialized = false;
+}
+
+void
+VRHMDManagerOculusImpl::GetOculusHMDs(nsTArray<nsRefPtr<VRHMDInfo>>& aHMDResult)
+{
+  Init();
+  for (size_t i = 0; i < mOculusHMDs.Length(); ++i) {
+    aHMDResult.AppendElement(mOculusHMDs[i]);
+  }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxVR.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxVR.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxVR.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxVR.h	2014-11-26 21:45:46.000000000 +0000
@@ -0,0 +1,217 @@
+/* -*- Mode: C++; tab-width: 20; 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 GFX_VR_H
+#define GFX_VR_H
+
+#include "nsTArray.h"
+#include "nsIScreen.h"
+#include "nsCOMPtr.h"
+#include "nsRefPtr.h"
+
+#include "mozilla/gfx/2D.h"
+#include "mozilla/EnumeratedArray.h"
+
+namespace mozilla {
+namespace gfx {
+
+MOZ_BEGIN_ENUM_CLASS(VRHMDType, uint16_t)
+  Oculus,
+  NumHMDTypes
+MOZ_END_ENUM_CLASS(VRHMDType)
+
+struct VRFieldOfView {
+  static VRFieldOfView FromCSSPerspectiveInfo(double aPerspectiveDistance,
+                                              const Point& aPerspectiveOrigin,
+                                              const Point& aTransformOrigin,
+                                              const Rect& aContentRectangle)
+  {
+    /**/
+    return VRFieldOfView();
+  }
+
+  VRFieldOfView() {}
+  VRFieldOfView(double up, double right, double down, double left)
+    : upDegrees(up), rightDegrees(right), downDegrees(down), leftDegrees(left)
+  {}
+
+  bool operator==(const VRFieldOfView& other) const {
+    return other.upDegrees == upDegrees &&
+           other.downDegrees == downDegrees &&
+           other.rightDegrees == rightDegrees &&
+           other.leftDegrees == leftDegrees;
+  }
+
+  bool operator!=(const VRFieldOfView& other) const {
+    return !(*this == other);
+  }
+
+  bool IsZero() const {
+    return upDegrees == 0.0 ||
+      rightDegrees == 0.0 ||
+      downDegrees == 0.0 ||
+      leftDegrees == 0.0;
+  }
+
+  double upDegrees;
+  double rightDegrees;
+  double downDegrees;
+  double leftDegrees;
+};
+
+// 12 floats per vertex. Position, tex coordinates
+// for each channel, and 4 generic attributes
+struct VRDistortionConstants {
+  float eyeToSourceScaleAndOffset[4];
+  float destinationScaleAndOffset[4];
+};
+
+struct VRDistortionVertex {
+  float pos[2];
+  float texR[2];
+  float texG[2];
+  float texB[2];
+  float genericAttribs[4];
+};
+
+struct VRDistortionMesh {
+  nsTArray<VRDistortionVertex> mVertices;
+  nsTArray<uint16_t> mIndices;
+};
+
+struct VRHMDSensorState {
+  double timestamp;
+  uint32_t flags;
+  float orientation[4];
+  float position[3];
+  float angularVelocity[3];
+  float angularAcceleration[3];
+  float linearVelocity[3];
+  float linearAcceleration[3];
+
+  void Clear() {
+    memset(this, 0, sizeof(VRHMDSensorState));
+  }
+};
+
+/* A pure data struct that can be used to see if
+ * the configuration of one HMDInfo matches another; for rendering purposes,
+ * really asking "can the rendering details of this one be used for the other"
+ */
+struct VRHMDConfiguration {
+  VRHMDConfiguration() : hmdType(VRHMDType::NumHMDTypes) {}
+
+  bool operator==(const VRHMDConfiguration& other) const {
+    return hmdType == other.hmdType &&
+      value == other.value &&
+      fov[0] == other.fov[0] &&
+      fov[1] == other.fov[1];
+  }
+
+  bool operator!=(const VRHMDConfiguration& other) const {
+    return hmdType != other.hmdType ||
+      value != other.value ||
+      fov[0] != other.fov[0] ||
+      fov[1] != other.fov[1];
+  }
+
+  bool IsValid() const {
+    return hmdType != VRHMDType::NumHMDTypes;
+  }
+
+  VRHMDType hmdType;
+  uint32_t value;
+  VRFieldOfView fov[2];
+};
+
+class VRHMDInfo {
+public:
+  enum Eye {
+    Eye_Left,
+    Eye_Right,
+    NumEyes
+  };
+
+  enum StateValidFlags {
+    State_Position = 1 << 1,
+    State_Orientation = 1 << 2
+  };
+
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VRHMDInfo)
+
+  VRHMDType GetType() const { return mType; }
+
+  virtual const VRFieldOfView& GetRecommendedEyeFOV(uint32_t whichEye) { return mRecommendedEyeFOV[whichEye]; }
+  virtual const VRFieldOfView& GetMaximumEyeFOV(uint32_t whichEye) { return mMaximumEyeFOV[whichEye]; }
+
+  const VRHMDConfiguration& GetConfiguration() const { return mConfiguration; }
+
+  /* set the FOV for this HMD unit; this triggers a computation of all the remaining bits.  Returns false if it fails */
+  virtual bool SetFOV(const VRFieldOfView& aFOVLeft, const VRFieldOfView& aFOVRight,
+                      double zNear, double zFar) = 0;
+  const VRFieldOfView& GetEyeFOV(uint32_t whichEye)  { return mEyeFOV[whichEye]; }
+
+  /* Suggested resolution for rendering a single eye.
+   * Assumption is that left/right rendering will be 2x of this size.
+   * XXX fix this for vertical displays
+   */
+  const IntSize& SuggestedEyeResolution() const { return mEyeResolution; }
+  const Point3D& GetEyeTranslation(uint32_t whichEye) const { return mEyeTranslation[whichEye]; }
+  const Matrix4x4& GetEyeProjectionMatrix(uint32_t whichEye) const { return mEyeProjectionMatrix[whichEye]; }
+
+  virtual uint32_t GetSupportedSensorStateBits() { return mSupportedSensorBits; }
+  virtual bool StartSensorTracking() = 0;
+  virtual VRHMDSensorState GetSensorState(double timeOffset = 0.0) = 0;
+  virtual void StopSensorTracking() = 0;
+
+  virtual void ZeroSensor() = 0;
+
+  virtual void FillDistortionConstants(uint32_t whichEye,
+                                       const IntSize& textureSize, // the full size of the texture
+                                       const IntRect& eyeViewport, // the viewport within the texture for the current eye
+                                       const Size& destViewport,   // the size of the destination viewport
+                                       const Rect& destRect,       // the rectangle within the dest viewport that this should be rendered
+                                       VRDistortionConstants& values) = 0;
+
+  virtual const VRDistortionMesh& GetDistortionMesh(uint32_t whichEye) const { return mDistortionMesh[whichEye]; }
+
+  // The nsIScreen that represents this device
+  virtual nsIScreen* GetScreen() { return mScreen; }
+
+protected:
+  VRHMDInfo(VRHMDType aType) : mType(aType) { MOZ_COUNT_CTOR(VRHMDInfo); }
+  virtual ~VRHMDInfo() { MOZ_COUNT_DTOR(VRHMDInfo); }
+
+  VRHMDType mType;
+  VRHMDConfiguration mConfiguration;
+
+  VRFieldOfView mEyeFOV[NumEyes];
+  IntSize mEyeResolution;
+  Point3D mEyeTranslation[NumEyes];
+  Matrix4x4 mEyeProjectionMatrix[NumEyes];
+  VRDistortionMesh mDistortionMesh[NumEyes];
+  uint32_t mSupportedSensorBits;
+
+  VRFieldOfView mRecommendedEyeFOV[NumEyes];
+  VRFieldOfView mMaximumEyeFOV[NumEyes];
+
+  nsCOMPtr<nsIScreen> mScreen;
+};
+
+class VRHMDManagerOculusImpl;
+class VRHMDManagerOculus {
+  static VRHMDManagerOculusImpl *mImpl;
+public:
+  static bool PlatformInit();
+  static bool Init();
+  static void Destroy();
+  static void GetOculusHMDs(nsTArray<nsRefPtr<VRHMDInfo> >& aHMDResult);
+};
+
+} // namespace gfx
+} // namespace mozilla
+
+#endif /* GFX_VR_H */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxWindowsPlatform.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxWindowsPlatform.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/gfxWindowsPlatform.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/gfxWindowsPlatform.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -87,16 +87,18 @@
   if (aDrawTarget.GetBackendType() == BackendType::CAIRO) {
     cairo_surface_t *surf = (cairo_surface_t*)
         aDrawTarget.GetNativeSurface(NativeSurfaceType::CAIRO_SURFACE);
-    cairo_surface_type_t surfaceType = cairo_surface_get_type(surf);
-    if (surfaceType == CAIRO_SURFACE_TYPE_WIN32 ||
-        surfaceType == CAIRO_SURFACE_TYPE_WIN32_PRINTING) {
-      mDC = cairo_win32_surface_get_dc(surf);
-      mNeedsRelease = false;
-      SaveDC(mDC);
-      cairo_t* ctx = (cairo_t*)
-          aDrawTarget.GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT);
-      cairo_scaled_font_t* scaled = cairo_get_scaled_font(ctx);
-      cairo_win32_scaled_font_select_font(scaled, mDC);
+    if (surf) {
+      cairo_surface_type_t surfaceType = cairo_surface_get_type(surf);
+      if (surfaceType == CAIRO_SURFACE_TYPE_WIN32 ||
+          surfaceType == CAIRO_SURFACE_TYPE_WIN32_PRINTING) {
+        mDC = cairo_win32_surface_get_dc(surf);
+        mNeedsRelease = false;
+        SaveDC(mDC);
+        cairo_t* ctx = (cairo_t*)
+            aDrawTarget.GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT);
+        cairo_scaled_font_t* scaled = cairo_get_scaled_font(ctx);
+        cairo_win32_scaled_font_select_font(scaled, mDC);
+      }
     }
     if (!mDC) {
       mDC = GetDC(nullptr);
@@ -407,6 +409,11 @@
                 d2dBlocked = true;
             }
         }
+        if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS, &status))) {
+            if (status != nsIGfxInfo::FEATURE_STATUS_OK) {
+                d2dBlocked = true;
+            }
+        }
     }
 
     // These will only be evaluated once, and any subsequent changes to
@@ -429,7 +436,7 @@
         DoesD3D11DeviceWork(device)) {
 
         VerifyD2DDevice(d2dForceEnabled);
-        if (mD2DDevice) {
+        if (mD2DDevice && GetD3D11Device()) {
             mRenderMode = RENDER_DIRECT2D;
             mUseDirectWrite = true;
         }
@@ -1686,14 +1693,24 @@
     return;
   }
 
-  HRESULT hr;
-
-  hr = d3d11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
-                         D3D11_CREATE_DEVICE_BGRA_SUPPORT,
-                         featureLevels.Elements(), featureLevels.Length(),
-                         D3D11_SDK_VERSION, byRef(mD3D11Device), nullptr, nullptr);
+  HRESULT hr = E_INVALIDARG;
+  __try {
+    hr = d3d11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+                           // Use
+                           // D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS
+                           // to prevent bug 1092260. IE 11 also uses this flag.
+                           D3D11_CREATE_DEVICE_BGRA_SUPPORT |
+                           D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
+                           featureLevels.Elements(), featureLevels.Length(),
+                           D3D11_SDK_VERSION, byRef(mD3D11Device),
+                           nullptr, nullptr);
+  } __except (EXCEPTION_EXECUTE_HANDLER) {
+    mD3D11Device = nullptr;
+    return;
+  }
 
   if (FAILED(hr)) {
+    mD3D11Device = nullptr;
     return;
   }
 
@@ -1701,10 +1718,17 @@
 
 #ifdef USE_D2D1_1
   if (Factory::SupportsD2D1()) {
-    hr = d3d11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
-                           D3D11_CREATE_DEVICE_BGRA_SUPPORT,
-                           featureLevels.Elements(), featureLevels.Length(),
-                           D3D11_SDK_VERSION, byRef(mD3D11ContentDevice), nullptr, nullptr);
+    hr = E_INVALIDARG;
+    __try {
+      hr = d3d11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+                             D3D11_CREATE_DEVICE_BGRA_SUPPORT,
+                             featureLevels.Elements(), featureLevels.Length(),
+                             D3D11_SDK_VERSION, byRef(mD3D11ContentDevice),
+                             nullptr, nullptr);
+    } __except(EXCEPTION_EXECUTE_HANDLER) {
+      mD3D11Device = nullptr;
+      return;
+    }
 
     if (FAILED(hr)) {
       mD3D11Device = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/moz.build	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/moz.build	2014-11-26 21:45:46.000000000 +0000
@@ -49,6 +49,7 @@
     'gfxTypes.h',
     'gfxUserFontSet.h',
     'gfxUtils.h',
+    'gfxVR.h',
     'GraphicsFilter.h',
     'RoundedRect.h',
 ]
@@ -243,6 +244,7 @@
     'gfxTextRun.cpp',
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
+    'gfxVR.cpp',
     'nsUnicodeRange.cpp',
 ]
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/ovr_capi_dynamic.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/ovr_capi_dynamic.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/gfx/thebes/ovr_capi_dynamic.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/gfx/thebes/ovr_capi_dynamic.h	2014-11-26 21:45:46.000000000 +0000
@@ -0,0 +1,228 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* This file contains just the needed struct definitions for
+ * interacting with the Oculus VR C API, without needing to #include
+ * OVR_CAPI.h directly.  Note that it uses the same type names as the
+ * CAPI, and cannot be #included at the same time as OVR_CAPI.h.  It
+ * does not include the entire C API, just want's needed.
+ */
+
+#ifdef OVR_CAPI_h
+#warning OVR_CAPI.h included before ovr_capi_dynamic.h, skpping this
+#define mozilla_ovr_capi_dynamic_h_
+#endif
+
+#ifndef mozilla_ovr_capi_dynamic_h_
+#define mozilla_ovr_capi_dynamic_h_
+
+#define OVR_CAPI_LIMITED_MOZILLA 1
+
+#ifdef __cplusplus 
+extern "C" {
+#endif
+
+typedef char ovrBool;
+typedef struct { int x, y; } ovrVector2i;
+typedef struct { int w, h; } ovrSizei;
+typedef struct { ovrVector2i Pos; ovrSizei Size; } ovrRecti;
+typedef struct { float x, y, z, w; } ovrQuatf;
+typedef struct { float x, y; } ovrVector2f;
+typedef struct { float x, y, z; } ovrVector3f;
+typedef struct { float M[4][4]; } ovrMatrix4f;
+
+typedef struct {
+  ovrQuatf Orientation;
+  ovrVector3f Position;
+} ovrPosef;
+
+typedef struct {
+  ovrPosef ThePose;
+  ovrVector3f AngularVelocity;
+  ovrVector3f LinearVelocity;
+  ovrVector3f AngularAcceleration;
+  ovrVector3f LinearAcceleration;
+  double TimeInSeconds;
+} ovrPoseStatef;
+
+typedef struct {
+  float UpTan;
+  float DownTan;
+  float LeftTan;
+  float RightTan;
+} ovrFovPort;
+
+typedef enum {
+  ovrHmd_None             = 0,    
+  ovrHmd_DK1              = 3,
+  ovrHmd_DKHD             = 4,
+  ovrHmd_DK2              = 6,
+  ovrHmd_Other
+} ovrHmdType;
+
+typedef enum {
+  ovrHmdCap_Present           = 0x0001,
+  ovrHmdCap_Available         = 0x0002,
+  ovrHmdCap_Captured          = 0x0004,
+  ovrHmdCap_ExtendDesktop     = 0x0008,
+  ovrHmdCap_DisplayOff        = 0x0040,
+  ovrHmdCap_LowPersistence    = 0x0080,
+  ovrHmdCap_DynamicPrediction = 0x0200,
+  ovrHmdCap_NoVSync           = 0x1000,
+  ovrHmdCap_NoMirrorToWindow  = 0x2000
+} ovrHmdCapBits;
+
+typedef enum
+{
+  ovrTrackingCap_Orientation      = 0x0010,
+  ovrTrackingCap_MagYawCorrection = 0x0020,
+  ovrTrackingCap_Position         = 0x0040,
+  ovrTrackingCap_Idle             = 0x0100
+} ovrTrackingCaps;
+
+typedef enum {
+  ovrDistortionCap_Chromatic = 0x01,
+  ovrDistortionCap_TimeWarp  = 0x02,
+  ovrDistortionCap_Vignette  = 0x08,
+  ovrDistortionCap_NoRestore = 0x10,
+  ovrDistortionCap_FlipInput = 0x20,
+  ovrDistortionCap_SRGB      = 0x40,
+  ovrDistortionCap_Overdrive = 0x80,
+  ovrDistortionCap_ProfileNoTimewarpSpinWaits = 0x10000
+} ovrDistortionCaps;
+
+typedef enum {
+  ovrEye_Left  = 0,
+  ovrEye_Right = 1,
+  ovrEye_Count = 2
+} ovrEyeType;
+
+typedef struct ovrHmdDesc_ {
+  void* Handle;
+  ovrHmdType  Type;
+  const char* ProductName;    
+  const char* Manufacturer;
+  short VendorId;
+  short ProductId;
+  char SerialNumber[24];
+  short FirmwareMajor;
+  short FirmwareMinor;
+  float CameraFrustumHFovInRadians;
+  float CameraFrustumVFovInRadians;
+  float CameraFrustumNearZInMeters;
+  float CameraFrustumFarZInMeters;
+
+  unsigned int HmdCaps;
+  unsigned int TrackingCaps;
+  unsigned int DistortionCaps;
+
+  ovrFovPort  DefaultEyeFov[ovrEye_Count];
+  ovrFovPort  MaxEyeFov[ovrEye_Count];
+  ovrEyeType  EyeRenderOrder[ovrEye_Count];
+
+  ovrSizei    Resolution;
+  ovrVector2i WindowsPos;
+
+  const char* DisplayDeviceName;
+  int         DisplayId;
+} ovrHmdDesc;
+
+typedef const ovrHmdDesc* ovrHmd;
+
+typedef enum {
+  ovrStatus_OrientationTracked    = 0x0001,
+  ovrStatus_PositionTracked       = 0x0002,
+  ovrStatus_CameraPoseTracked     = 0x0004,
+  ovrStatus_PositionConnected     = 0x0020,
+  ovrStatus_HmdConnected          = 0x0080
+} ovrStatusBits;
+
+typedef struct ovrSensorData_ {
+  ovrVector3f    Accelerometer;
+  ovrVector3f    Gyro;
+  ovrVector3f    Magnetometer;
+  float          Temperature;
+  float          TimeInSeconds;
+} ovrSensorData;
+
+
+typedef struct ovrTrackingState_ {
+  ovrPoseStatef HeadPose;
+  ovrPosef CameraPose;
+  ovrPosef LeveledCameraPose;
+  ovrSensorData RawSensorData;
+  unsigned int StatusFlags;
+  double LastVisionProcessingTime;
+  double LastVisionFrameLatency;
+  uint32_t LastCameraFrameCounter;
+} ovrTrackingState;
+
+typedef struct ovrFrameTiming_ {
+  float DeltaSeconds;
+  double ThisFrameSeconds;
+  double TimewarpPointSeconds;
+  double NextFrameSeconds;
+  double ScanoutMidpointSeconds;
+  double EyeScanoutSeconds[2];    
+} ovrFrameTiming;
+
+typedef struct ovrEyeRenderDesc_ {
+  ovrEyeType  Eye;        
+  ovrFovPort  Fov;
+  ovrRecti DistortedViewport;
+  ovrVector2f PixelsPerTanAngleAtCenter;
+  ovrVector3f ViewAdjust;
+} ovrEyeRenderDesc;
+
+typedef struct ovrDistortionVertex_ {
+  ovrVector2f ScreenPosNDC;
+  float       TimeWarpFactor;
+  float       VignetteFactor;
+  ovrVector2f TanEyeAnglesR;
+  ovrVector2f TanEyeAnglesG;
+  ovrVector2f TanEyeAnglesB;    
+} ovrDistortionVertex;
+
+typedef struct ovrDistortionMesh_ {
+  ovrDistortionVertex* pVertexData;
+  unsigned short*      pIndexData;
+  unsigned int         VertexCount;
+  unsigned int         IndexCount;
+} ovrDistortionMesh;
+
+typedef ovrBool (*pfn_ovr_Initialize)();
+typedef void (*pfn_ovr_Shutdown)();
+typedef int (*pfn_ovrHmd_Detect)();
+typedef ovrHmd (*pfn_ovrHmd_Create)(int index);
+typedef void (*pfn_ovrHmd_Destroy)(ovrHmd hmd);
+typedef ovrHmd (*pfn_ovrHmd_CreateDebug)(ovrHmdType type);
+typedef const char* (*pfn_ovrHmd_GetLastError)(ovrHmd hmd);
+typedef ovrBool (*pfn_ovrHmd_AttachToWindow)(ovrHmd hmd, void* window, const ovrRecti* destMirrorRect, const ovrRecti* sourceRenderTargetRect);
+typedef unsigned int (*pfn_ovrHmd_GetEnabledCaps)(ovrHmd hmd);
+typedef void (*pfn_ovrHmd_SetEnabledCaps)(ovrHmd hmd, unsigned int hmdCaps);
+typedef ovrBool (*pfn_ovrHmd_ConfigureTracking)(ovrHmd hmd, unsigned int supportedTrackingCaps, unsigned int requiredTrackingCaps); 
+typedef void (*pfn_ovrHmd_RecenterPose)(ovrHmd hmd);
+typedef ovrTrackingState (*pfn_ovrHmd_GetTrackingState)(ovrHmd hmd, double absTime);
+typedef ovrSizei (*pfn_ovrHmd_GetFovTextureSize)(ovrHmd hmd, ovrEyeType eye, ovrFovPort fov, float pixelsPerDisplayPixel);
+typedef ovrEyeRenderDesc (*pfn_ovrHmd_GetRenderDesc)(ovrHmd hmd, ovrEyeType eyeType, ovrFovPort fov);
+typedef ovrBool (*pfn_ovrHmd_CreateDistortionMesh)(ovrHmd hmd, ovrEyeType eyeType, ovrFovPort fov, unsigned int distortionCaps, ovrDistortionMesh *meshData);
+typedef void (*pfn_ovrHmd_DestroyDistortionMesh)(ovrDistortionMesh* meshData);
+typedef void (*pfn_ovrHmd_GetRenderScaleAndOffset)(ovrFovPort fov, ovrSizei textureSize, ovrRecti renderViewport, ovrVector2f uvScaleOffsetOut[2]);
+typedef ovrFrameTiming (*pfn_ovrHmd_GetFrameTiming)(ovrHmd hmd, unsigned int frameIndex);
+typedef ovrFrameTiming (*pfn_ovrHmd_BeginFrameTiming)(ovrHmd hmd, unsigned int frameIndex);
+typedef void (*pfn_ovrHmd_EndFrameTiming)(ovrHmd hmd);
+typedef void (*pfn_ovrHmd_ResetFrameTiming)(ovrHmd hmd, unsigned int frameIndex, bool vsync);
+typedef void (*pfn_ovrHmd_GetEyePoses)(ovrHmd hmd, unsigned int frameIndex, ovrVector3f hmdToEyeViewOffset[2], ovrPosef outEyePoses[2], ovrTrackingState* outHmdTrackingState);
+typedef ovrPosef (*pfn_ovrHmd_GetHmdPosePerEye)(ovrHmd hmd, ovrEyeType eye);
+typedef void (*pfn_ovrHmd_GetEyeTimewarpMatrices)(ovrHmd hmd, ovrEyeType eye, ovrPosef renderPose, ovrMatrix4f twmOut[2]);
+typedef ovrMatrix4f (*pfn_ovrMatrix4f_Projection) (ovrFovPort fov, float znear, float zfar, ovrBool rightHanded );
+typedef ovrMatrix4f (*pfn_ovrMatrix4f_OrthoSubProjection) (ovrFovPort fov, ovrVector2f orthoScale, float orthoDistance, float eyeViewAdjustX);
+typedef double (*pfn_ovr_GetTimeInSeconds)();
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* mozilla_ovr_capi_dynamic_h_ */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/EXIF.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/EXIF.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/EXIF.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/EXIF.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -43,21 +43,25 @@
 EXIFData
 EXIFParser::ParseEXIF(const uint8_t* aData, const uint32_t aLength)
 {
-  if (!Initialize(aData, aLength))
+  if (!Initialize(aData, aLength)) {
     return EXIFData();
+  }
 
-  if (!ParseEXIFHeader())
+  if (!ParseEXIFHeader()) {
     return EXIFData();
+  }
 
   uint32_t offsetIFD;
-  if (!ParseTIFFHeader(offsetIFD))
+  if (!ParseTIFFHeader(offsetIFD)) {
     return EXIFData();
+  }
 
   JumpTo(offsetIFD);
 
   Orientation orientation;
-  if (!ParseIFD0(orientation))
+  if (!ParseIFD0(orientation)) {
     return EXIFData();
+  }
 
   // We only care about orientation at this point, so we don't bother with the
   // other IFDs. If we got this far we're done.
@@ -80,18 +84,20 @@
 EXIFParser::ParseTIFFHeader(uint32_t& aIFD0OffsetOut)
 {
   // Determine byte order.
-  if (MatchString("MM\0*", 4))
+  if (MatchString("MM\0*", 4)) {
     mByteOrder = ByteOrder::BigEndian;
-  else if (MatchString("II*\0", 4))
+  } else if (MatchString("II*\0", 4)) {
     mByteOrder = ByteOrder::LittleEndian;
-  else
+  } else {
     return false;
+  }
 
   // Determine offset of the 0th IFD. (It shouldn't be greater than 64k, which
   // is the maximum size of the entry APP1 segment.)
   uint32_t ifd0Offset;
-  if (!ReadUInt32(ifd0Offset) || ifd0Offset > 64 * 1024)
+  if (!ReadUInt32(ifd0Offset) || ifd0Offset > 64 * 1024) {
     return false;
+  }
 
   // The IFD offset is relative to the beginning of the TIFF header, which
   // begins after the EXIF header, so we need to increase the offset
@@ -107,14 +113,16 @@
 EXIFParser::ParseIFD0(Orientation& aOrientationOut)
 {
   uint16_t entryCount;
-  if (!ReadUInt16(entryCount))
+  if (!ReadUInt16(entryCount)) {
     return false;
+  }
 
   for (uint16_t entry = 0 ; entry < entryCount ; ++entry) {
     // Read the fields of the entry.
     uint16_t tag;
-    if (!ReadUInt16(tag))
+    if (!ReadUInt16(tag)) {
       return false;
+    }
 
     // Right now, we only care about orientation, so we immediately skip to the
     // next entry if we find anything else.
@@ -124,16 +132,19 @@
     }
 
     uint16_t type;
-    if (!ReadUInt16(type))
+    if (!ReadUInt16(type)) {
       return false;
+    }
 
     uint32_t count;
-    if (!ReadUInt32(count))
+    if (!ReadUInt32(count)) {
       return false;
+    }
 
     // We should have an orientation value here; go ahead and parse it.
-    if (!ParseOrientation(type, count, aOrientationOut))
+    if (!ParseOrientation(type, count, aOrientationOut)) {
       return false;
+    }
 
     // Since the orientation is all we care about, we're done.
     return true;
@@ -149,12 +160,14 @@
 EXIFParser::ParseOrientation(uint16_t aType, uint32_t aCount, Orientation& aOut)
 {
   // Sanity check the type and count.
-  if (aType != ShortType || aCount != 1)
+  if (aType != ShortType || aCount != 1) {
     return false;
+  }
 
   uint16_t value;
-  if (!ReadUInt16(value))
+  if (!ReadUInt16(value)) {
     return false;
+  }
 
   switch (value) {
     case 1: aOut = Orientation(Angle::D0,   Flip::Unflipped);  break;
@@ -177,12 +190,14 @@
 bool
 EXIFParser::Initialize(const uint8_t* aData, const uint32_t aLength)
 {
-  if (aData == nullptr)
+  if (aData == nullptr) {
     return false;
+  }
 
   // An APP1 segment larger than 64k violates the JPEG standard.
-  if (aLength > 64 * 1024)
+  if (aLength > 64 * 1024) {
     return false;
+  }
 
   mStart = mCurrent = aData;
   mLength = mRemainingLength = aLength;
@@ -217,12 +232,14 @@
 bool
 EXIFParser::MatchString(const char* aString, const uint32_t aLength)
 {
-  if (mRemainingLength < aLength)
+  if (mRemainingLength < aLength) {
     return false;
+  }
 
   for (uint32_t i = 0 ; i < aLength ; ++i) {
-    if (mCurrent[i] != aString[i])
+    if (mCurrent[i] != aString[i]) {
       return false;
+    }
   }
 
   Advance(aLength);
@@ -232,9 +249,10 @@
 bool
 EXIFParser::MatchUInt16(const uint16_t aValue)
 {
-  if (mRemainingLength < 2)
+  if (mRemainingLength < 2) {
     return false;
-  
+  }
+
   bool matched;
   switch (mByteOrder) {
     case ByteOrder::LittleEndian:
@@ -248,8 +266,9 @@
       matched = false;
   }
 
-  if (matched)
+  if (matched) {
     Advance(2);
+  }
 
   return matched;
 }
@@ -257,9 +276,10 @@
 bool
 EXIFParser::ReadUInt16(uint16_t& aValue)
 {
-  if (mRemainingLength < 2)
+  if (mRemainingLength < 2) {
     return false;
-  
+  }
+
   bool matched = true;
   switch (mByteOrder) {
     case ByteOrder::LittleEndian:
@@ -273,8 +293,9 @@
       matched = false;
   }
 
-  if (matched)
+  if (matched) {
     Advance(2);
+  }
 
   return matched;
 }
@@ -282,9 +303,10 @@
 bool
 EXIFParser::ReadUInt32(uint32_t& aValue)
 {
-  if (mRemainingLength < 4)
+  if (mRemainingLength < 4) {
     return false;
-  
+  }
+
   bool matched = true;
   switch (mByteOrder) {
     case ByteOrder::LittleEndian:
@@ -298,8 +320,9 @@
       matched = false;
   }
 
-  if (matched)
+  if (matched) {
     Advance(4);
+  }
 
   return matched;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/EXIF.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/EXIF.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/EXIF.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/EXIF.h	2014-11-26 21:45:47.000000000 +0000
@@ -3,8 +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/. */
 
-#ifndef MOZILLA_IMAGELIB_EXIF_H_
-#define MOZILLA_IMAGELIB_EXIF_H_
+#ifndef MOZILLA_IMAGELIB_EXIF_H
+#define MOZILLA_IMAGELIB_EXIF_H
 
 #include <stdint.h>
 #include "mozilla/TypedEnum.h"
@@ -70,7 +70,7 @@
   ByteOrder      mByteOrder;
 };
 
-}
-}
+} // namespace image
+} // namespace mozilla
 
-#endif
+#endif // MOZILLA_IMAGELIB_EXIF_H
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/GIF2.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/GIF2.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/GIF2.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/GIF2.h	2014-11-26 21:45:47.000000000 +0000
@@ -2,25 +2,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/. */
-#ifndef _GIF_H_
-#define _GIF_H_
+
+#ifndef GIF2_H
+#define GIF2_H
 
 #define MAX_LZW_BITS          12
-#define MAX_BITS            4097 /* 2^MAX_LZW_BITS+1 */
+#define MAX_BITS            4097 // 2^MAX_LZW_BITS+1
 #define MAX_COLORS           256
 #define MIN_HOLD_SIZE        256
 
-enum { GIF_TRAILER                     = 0x3B }; //';'
-enum { GIF_IMAGE_SEPARATOR             = 0x2C }; //','
-enum { GIF_EXTENSION_INTRODUCER        = 0x21 }; //'!'
+enum { GIF_TRAILER                     = 0x3B }; // ';'
+enum { GIF_IMAGE_SEPARATOR             = 0x2C }; // ','
+enum { GIF_EXTENSION_INTRODUCER        = 0x21 }; // '!'
 enum { GIF_GRAPHIC_CONTROL_LABEL       = 0xF9 };
 enum { GIF_COMMENT_LABEL               = 0xFE };
 enum { GIF_PLAIN_TEXT_LABEL            = 0x01 };
 enum { GIF_APPLICATION_EXTENSION_LABEL = 0xFF };
 
-/* gif2.h  
-   The interface for the GIF87/89a decoder. 
-*/
+// gif2.h
+// The interface for the GIF87/89a decoder.
+
 // List of possible parsing states
 typedef enum {
     gif_type,
@@ -47,61 +48,63 @@
     gif_consume_comment
 } gstate;
 
-/* A GIF decoder's state */
+// A GIF decoder's state
 typedef struct gif_struct {
-    /* Parsing state machine */
-    gstate state;                   /* Curent decoder master state */
-    uint32_t bytes_to_consume;      /* Number of bytes to accumulate */
-    uint32_t bytes_in_hold;         /* bytes accumulated so far*/
+    // Parsing state machine
+    gstate state;               // Current decoder master state
+    uint32_t bytes_to_consume;  // Number of bytes to accumulate
+    uint32_t bytes_in_hold;     // bytes accumulated so far
 
-    /* LZW decoder state machine */
-    uint8_t *stackp;              /* Current stack pointer */
+    // LZW decoder state machine
+    uint8_t* stackp;            // Current stack pointer
     int datasize;
     int codesize;
     int codemask;
-    int avail;                  /* Index of next available slot in dictionary */
+    int avail;                  // Index of next available slot in dictionary
     int oldcode;
     uint8_t firstchar;
-    int count;                  /* Remaining # bytes in sub-block */
-    int bits;                   /* Number of unread bits in "datum" */
-    int32_t datum;              /* 32-bit input buffer */
-
-    /* Output state machine */
-    int ipass;                  /* Interlace pass; Ranges 1-4 if interlaced. */
-    unsigned rows_remaining;        /* Rows remaining to be output */
-    unsigned irow;                  /* Current output row, starting at zero */
-    uint8_t *rowp;                 /* Current output pointer */
+    int count;                  // Remaining # bytes in sub-block
+    int bits;                   // Number of unread bits in "datum"
+    int32_t datum;              // 32-bit input buffer
+
+    // Output state machine
+    int ipass;                  // Interlace pass; Ranges 1-4 if interlaced.
+    unsigned rows_remaining;    // Rows remaining to be output
+    unsigned irow;              // Current output row, starting at zero
+    uint8_t* rowp;              // Current output pointer
 
-    /* Parameters for image frame currently being decoded*/
-    unsigned x_offset, y_offset;    /* With respect to "screen" origin */
+    // Parameters for image frame currently being decoded
+    unsigned x_offset, y_offset; // With respect to "screen" origin
     unsigned height, width;
-    int tpixel;                 /* Index of transparent pixel */
-    int32_t disposal_method;    /* Restore to background, leave in place, etc.*/
-    uint32_t *local_colormap;   /* Per-image colormap */
-    int local_colormap_size;    /* Size of local colormap array. */
-    uint32_t delay_time;        /* Display time, in milliseconds,
-                                   for this image in a multi-image GIF */
-
-    /* Global (multi-image) state */
-    int version;                /* Either 89 for GIF89 or 87 for GIF87 */
-    unsigned screen_width;       /* Logical screen width & height */
+    int tpixel;                 // Index of transparent pixel
+    int32_t disposal_method;    // Restore to background, leave in place, etc.
+    uint32_t* local_colormap;   // Per-image colormap
+    int local_colormap_size;    // Size of local colormap array.
+    uint32_t delay_time;        // Display time, in milliseconds,
+                                // for this image in a multi-image GIF
+
+    // Global (multi-image) state
+    int version;                // Either 89 for GIF89 or 87 for GIF87
+    unsigned screen_width;      // Logical screen width & height
     unsigned screen_height;
-    uint32_t global_colormap_depth;  /* Depth of global colormap array. */
-    int images_decoded;         /* Counts images for multi-part GIFs */
-    int loop_count;             /* Netscape specific extension block to control
-                                   the number of animation loops a GIF renders. */
-
-    bool progressive_display;    /* If TRUE, do Haeberli interlace hack */
-    bool interlaced;             /* TRUE, if scanlines arrive interlaced order */
-    bool is_transparent;         /* TRUE, if tpixel is valid */
-
-    uint16_t  prefix[MAX_BITS];          /* LZW decoding tables */
-    uint8_t*  hold;                      /* Accumulation buffer */
-    uint32_t  global_colormap[MAX_COLORS];   /* Default colormap if local not supplied */
-    uint8_t   suffix[MAX_BITS];          /* LZW decoding tables */
-    uint8_t   stack[MAX_BITS];           /* Base of LZW decoder stack */
+    uint32_t global_colormap_depth; // Depth of global colormap array
+    int images_decoded;         // Counts images for multi-part GIFs
+    int loop_count;             // Netscape specific extension block to control
+                                // the number of animation loops a GIF
+                                // renders.
+
+    bool progressive_display;   // If TRUE, do Haeberli interlace hack
+    bool interlaced;            // TRUE, if scanlines arrive interlaced order
+    bool is_transparent;        // TRUE, if tpixel is valid
+
+    uint16_t  prefix[MAX_BITS];            // LZW decoding tables
+    uint8_t*  hold;                        // Accumulation buffer
+    uint32_t  global_colormap[MAX_COLORS]; // Default colormap if local not
+                                           //   supplied
+    uint8_t   suffix[MAX_BITS];            // LZW decoding tables
+    uint8_t   stack[MAX_BITS];             // Base of LZW decoder stack
 
 } gif_struct;
 
-#endif
+#endif // GIF2_H
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/iccjpeg.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/iccjpeg.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/iccjpeg.c	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/iccjpeg.c	2014-11-26 21:45:47.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * iccprofile.c
+ * iccjpeg.c
  *
  * This file provides code to read and write International Color Consortium
  * (ICC) device profiles embedded in JFIF JPEG image files.  The ICC has
@@ -22,7 +22,7 @@
  */
 
 #include "iccjpeg.h"
-#include <stdlib.h>			/* define malloc() */
+#include <stdlib.h>  /* define malloc() */
 
 
 /*
@@ -30,17 +30,17 @@
  * (64K), we need provisions to split it into multiple markers.  The format
  * defined by the ICC specifies one or more APP2 markers containing the
  * following data:
- *	Identifying string	ASCII "ICC_PROFILE\0"  (12 bytes)
- *	Marker sequence number	1 for first APP2, 2 for next, etc (1 byte)
- *	Number of markers	Total number of APP2's used (1 byte)
- *      Profile data		(remainder of APP2 data)
+ *      Identifying string      ASCII "ICC_PROFILE\0"  (12 bytes)
+ *      Marker sequence number  1 for first APP2, 2 for next, etc (1 byte)
+ *      Number of markers       Total number of APP2's used (1 byte)
+ *      Profile data            (remainder of APP2 data)
  * Decoders should use the marker sequence numbers to reassemble the profile,
  * rather than assuming that the APP2 markers appear in the correct sequence.
  */
 
-#define ICC_MARKER  (JPEG_APP0 + 2)	/* JPEG marker code for ICC */
-#define ICC_OVERHEAD_LEN  14		/* size of non-profile data in APP2 */
-#define MAX_BYTES_IN_MARKER  65533	/* maximum data len of a JPEG marker */
+#define ICC_MARKER  (JPEG_APP0 + 2)      /* JPEG marker code for ICC */
+#define ICC_OVERHEAD_LEN  14             /* size of non-profile data in APP2 */
+#define MAX_BYTES_IN_MARKER  65533       /* maximum data len of a JPEG marker */
 #define MAX_DATA_BYTES_IN_MARKER  (MAX_BYTES_IN_MARKER - ICC_OVERHEAD_LEN)
 
 /*
@@ -102,20 +102,20 @@
 
 boolean
 read_icc_profile (j_decompress_ptr cinfo,
-		  JOCTET **icc_data_ptr,
-		  unsigned int *icc_data_len)
+  JOCTET** icc_data_ptr,
+  unsigned int* icc_data_len)
 {
   jpeg_saved_marker_ptr marker;
   int num_markers = 0;
   int seq_no;
-  JOCTET *icc_data;
+  JOCTET* icc_data;
   unsigned int total_length;
-#define MAX_SEQ_NO  255		/* sufficient since marker numbers are bytes */
-  char marker_present[MAX_SEQ_NO+1];	  /* 1 if marker found */
+#define MAX_SEQ_NO  255        /* sufficient since marker numbers are bytes */
+  char marker_present[MAX_SEQ_NO+1];      /* 1 if marker found */
   unsigned int data_length[MAX_SEQ_NO+1]; /* size of profile data in marker */
   unsigned int data_offset[MAX_SEQ_NO+1]; /* offset for data in marker */
 
-  *icc_data_ptr = NULL;		/* avoid confusion if FALSE return */
+  *icc_data_ptr = NULL;                   /* avoid confusion if FALSE return */
   *icc_data_len = 0;
 
   /* This first pass over the saved markers discovers whether there are
@@ -127,22 +127,26 @@
 
   for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
     if (marker_is_icc(marker)) {
-      if (num_markers == 0)
-	num_markers = GETJOCTET(marker->data[13]);
-      else if (num_markers != GETJOCTET(marker->data[13]))
-	return FALSE;		/* inconsistent num_markers fields */
+      if (num_markers == 0) {
+        num_markers = GETJOCTET(marker->data[13]);
+      } else if (num_markers != GETJOCTET(marker->data[13])) {
+        return FALSE;  /* inconsistent num_markers fields */
+      }
       seq_no = GETJOCTET(marker->data[12]);
-      if (seq_no <= 0 || seq_no > num_markers)
-	return FALSE;		/* bogus sequence number */
-      if (marker_present[seq_no])
-	return FALSE;		/* duplicate sequence numbers */
+      if (seq_no <= 0 || seq_no > num_markers) {
+        return FALSE;   /* bogus sequence number */
+      }
+      if (marker_present[seq_no]) {
+        return FALSE;   /* duplicate sequence numbers */
+      }
       marker_present[seq_no] = 1;
       data_length[seq_no] = marker->data_length - ICC_OVERHEAD_LEN;
     }
   }
 
-  if (num_markers == 0)
+  if (num_markers == 0) {
     return FALSE;
+  }
 
   /* Check for missing markers, count total space needed,
    * compute offset of each marker's part of the data.
@@ -150,32 +154,35 @@
 
   total_length = 0;
   for (seq_no = 1; seq_no <= num_markers; seq_no++) {
-    if (marker_present[seq_no] == 0)
-      return FALSE;		/* missing sequence number */
+    if (marker_present[seq_no] == 0) {
+      return FALSE;  /* missing sequence number */
+    }
     data_offset[seq_no] = total_length;
     total_length += data_length[seq_no];
   }
 
-  if (total_length <= 0)
-    return FALSE;		/* found only empty markers? */
+  if (total_length <= 0) {
+    return FALSE;  /* found only empty markers? */
+  }
 
   /* Allocate space for assembled data */
-  icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET));
-  if (icc_data == NULL)
-    return FALSE;		/* oops, out of memory */
+  icc_data = (JOCTET*) malloc(total_length * sizeof(JOCTET));
+  if (icc_data == NULL) {
+    return FALSE;   /* oops, out of memory */
+  }
 
   /* and fill it in */
   for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
     if (marker_is_icc(marker)) {
-      JOCTET FAR *src_ptr;
-      JOCTET *dst_ptr;
+      JOCTET FAR* src_ptr;
+      JOCTET* dst_ptr;
       unsigned int length;
       seq_no = GETJOCTET(marker->data[12]);
       dst_ptr = icc_data + data_offset[seq_no];
       src_ptr = marker->data + ICC_OVERHEAD_LEN;
       length = data_length[seq_no];
       while (length--) {
-	*dst_ptr++ = *src_ptr++;
+        *dst_ptr++ = *src_ptr++;
       }
     }
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/iccjpeg.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/iccjpeg.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/iccjpeg.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/iccjpeg.h	2014-11-26 21:45:47.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * iccprofile.h
+ * iccjpeg.h
  *
  * This file provides code to read and write International Color Consortium
  * (ICC) device profiles embedded in JFIF JPEG image files.  The ICC has
@@ -20,7 +20,10 @@
  * for details.
  */
 
-#include <stdio.h>		/* needed to define "FILE", "NULL" */
+#ifndef ICCJPEG_H
+#define ICCJPEG_H
+
+#include <stdio.h>  /* needed to define "FILE", "NULL" */
 #include "jpeglib.h"
 
 /*
@@ -59,5 +62,6 @@
  */
 
 extern boolean read_icc_profile JPP((j_decompress_ptr cinfo,
-				     JOCTET **icc_data_ptr,
-				     unsigned int *icc_data_len));
+                                     JOCTET** icc_data_ptr,
+                                     unsigned int* icc_data_len));
+#endif // ICCJPEG_H
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/android/nsIconChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/android/nsIconChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/android/nsIconChannel.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/android/nsIconChannel.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -22,10 +22,12 @@
 using mozilla::dom::ContentChild;
 
 static nsresult
-GetIconForExtension(const nsACString& aFileExt, uint32_t aIconSize, uint8_t * const aBuf)
+GetIconForExtension(const nsACString& aFileExt, uint32_t aIconSize,
+                    uint8_t* const aBuf)
 {
-    if (!AndroidBridge::Bridge())
+    if (!AndroidBridge::Bridge()) {
         return NS_ERROR_FAILURE;
+    }
 
     AndroidBridge::Bridge()->GetIconForExtension(aFileExt, aIconSize, aBuf);
 
@@ -33,7 +35,8 @@
 }
 
 static nsresult
-CallRemoteGetIconForExtension(const nsACString& aFileExt, uint32_t aIconSize, uint8_t * const aBuf)
+CallRemoteGetIconForExtension(const nsACString& aFileExt, uint32_t aIconSize,
+                              uint8_t* const aBuf)
 {
   NS_ENSURE_TRUE(aBuf != nullptr, NS_ERROR_NULL_POINTER);
 
@@ -41,12 +44,15 @@
   InfallibleTArray<uint8_t> bits;
   uint32_t bufSize = aIconSize * aIconSize * 4;
 
-  if (!ContentChild::GetSingleton()->SendGetIconForExtension(PromiseFlatCString(aFileExt), aIconSize, &bits))
+  if (!ContentChild::GetSingleton()->SendGetIconForExtension(
+                     PromiseFlatCString(aFileExt), aIconSize, &bits)) {
     return NS_ERROR_FAILURE;
+  }
 
   NS_ASSERTION(bits.Length() == bufSize, "Pixels array is incomplete");
-  if (bits.Length() != bufSize)
+  if (bits.Length() != bufSize) {
     return NS_ERROR_FAILURE;
+  }
 
   memcpy(aBuf, bits.Elements(), bufSize);
 
@@ -54,7 +60,8 @@
 }
 
 static nsresult
-moz_icon_to_channel(nsIURI *aURI, const nsACString& aFileExt, uint32_t aIconSize, nsIChannel **aChannel)
+moz_icon_to_channel(nsIURI* aURI, const nsACString& aFileExt,
+                    uint32_t aIconSize, nsIChannel** aChannel)
 {
   NS_ENSURE_TRUE(aIconSize < 256 && aIconSize > 0, NS_ERROR_UNEXPECTED);
 
@@ -65,22 +72,23 @@
   // then the ARGB pixel values with pre-multiplied Alpha
   const int channels = 4;
   long int buf_size = 2 + channels * height * width;
-  uint8_t * const buf = (uint8_t*)NS_Alloc(buf_size);
+  uint8_t* const buf = (uint8_t*)NS_Alloc(buf_size);
   NS_ENSURE_TRUE(buf, NS_ERROR_OUT_OF_MEMORY);
-  uint8_t * out = buf;
+  uint8_t* out = buf;
 
   *(out++) = width;
   *(out++) = height;
 
   nsresult rv;
-  if (XRE_GetProcessType() == GeckoProcessType_Default)
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
     rv = GetIconForExtension(aFileExt, aIconSize, out);
-  else
+  } else {
     rv = CallRemoteGetIconForExtension(aFileExt, aIconSize, out);
+  }
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Encode the RGBA data
-  const uint8_t * in = out;
+  const uint8_t* in = out;
   for (int y = 0; y < height; ++y) {
     for (int x = 0; x < width; ++x) {
       uint8_t r = *(in++);
@@ -131,5 +139,6 @@
   nsAutoCString iconFileExt;
   iconURI->GetFileExtension(iconFileExt);
 
-  return moz_icon_to_channel(iconURI, iconFileExt, desiredImageSize, getter_AddRefs(mRealChannel));
+  return moz_icon_to_channel(iconURI, iconFileExt, desiredImageSize,
+                             getter_AddRefs(mRealChannel));
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/android/nsIconChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/android/nsIconChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/android/nsIconChannel.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/android/nsIconChannel.h	2014-11-26 21:45:47.000000000 +0000
@@ -24,7 +24,7 @@
     NS_FORWARD_NSIREQUEST(mRealChannel->)
     NS_FORWARD_NSICHANNEL(mRealChannel->)
 
-    nsIconChannel() {}
+    nsIconChannel() { }
 
     /**
      * Called by nsIconProtocolHandler after it creates this channel.
@@ -34,7 +34,7 @@
     nsresult Init(nsIURI* aURI);
 
   private:
-    ~nsIconChannel() {}
+    ~nsIconChannel() { }
 
     /**
      * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -44,17 +44,26 @@
                   nsIChannel)
 
 #ifdef MOZ_ENABLE_GNOMEUI
-// These let us have a soft dependency on libgnomeui rather than a hard one. These are just basically the prototypes
-// of the functions in the libraries.
-typedef char* (*_GnomeIconLookup_fn)(GtkIconTheme *icon_theme, GnomeThumbnailFactory *thumbnail_factory,
-                                     const char *file_uri, const char *custom_icon, GnomeVFSFileInfo *file_info,
-                                     const char *mime_type, GnomeIconLookupFlags flags, GnomeIconLookupResultFlags *result);
+// These let us have a soft dependency on libgnomeui rather than a hard one.
+// These are just basically the prototypes of the functions in the libraries.
+typedef char* (*_GnomeIconLookup_fn)(GtkIconTheme* icon_theme,
+                                     GnomeThumbnailFactory* thumbnail_factory,
+                                     const char* file_uri,
+                                     const char* custom_icon,
+                                     GnomeVFSFileInfo* file_info,
+                                     const char* mime_type,
+                                     GnomeIconLookupFlags flags,
+                                     GnomeIconLookupResultFlags* result);
 typedef GnomeIconTheme* (*_GnomeIconThemeNew_fn)(void);
-typedef int (*_GnomeInit_fn)(const char *app_id, const char *app_version, int argc, char **argv, const struct poptOption *options,
-                             int flags, poptContext *return_ctx);
+typedef int (*_GnomeInit_fn)(const char* app_id, const char* app_version,
+                             int argc, char** argv,
+                             const struct poptOption* options,
+                             int flags, poptContext* return_ctx);
 typedef GnomeProgram* (*_GnomeProgramGet_fn)(void);
-typedef GnomeVFSResult (*_GnomeVFSGetFileInfo_fn)(const gchar *text_uri, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options);
-typedef void (*_GnomeVFSFileInfoClear_fn)(GnomeVFSFileInfo *info);
+typedef GnomeVFSResult (*_GnomeVFSGetFileInfo_fn)(const gchar* text_uri,
+                        GnomeVFSFileInfo* info,
+                        GnomeVFSFileInfoOptions options);
+typedef void (*_GnomeVFSFileInfoClear_fn)(GnomeVFSFileInfo* info);
 
 static PRLibrary* gLibGnomeUI = nullptr;
 static PRLibrary* gLibGnome = nullptr;
@@ -70,8 +79,8 @@
 #endif //MOZ_ENABLE_GNOMEUI
 
 static nsresult
-moz_gdk_pixbuf_to_channel(GdkPixbuf* aPixbuf, nsIURI *aURI,
-                          nsIChannel **aChannel)
+moz_gdk_pixbuf_to_channel(GdkPixbuf* aPixbuf, nsIURI* aURI,
+                          nsIChannel** aChannel)
 {
   int width = gdk_pixbuf_get_width(aPixbuf);
   int height = gdk_pixbuf_get_height(aPixbuf);
@@ -84,18 +93,18 @@
 
   const int n_channels = 4;
   gsize buf_size = 2 + n_channels * height * width;
-  uint8_t * const buf = (uint8_t*)NS_Alloc(buf_size);
+  uint8_t* const buf = (uint8_t*)NS_Alloc(buf_size);
   NS_ENSURE_TRUE(buf, NS_ERROR_OUT_OF_MEMORY);
-  uint8_t *out = buf;
+  uint8_t* out = buf;
 
   *(out++) = width;
   *(out++) = height;
 
-  const guchar * const pixels = gdk_pixbuf_get_pixels(aPixbuf);
+  const guchar* const pixels = gdk_pixbuf_get_pixels(aPixbuf);
   int rowextra = gdk_pixbuf_get_rowstride(aPixbuf) - width * n_channels;
 
   // encode the RGB data and the A data
-  const guchar * in = pixels;
+  const guchar* in = pixels;
   for (int y = 0; y < height; ++y, in += rowextra) {
     for (int x = 0; x < width; ++x) {
       uint8_t r = *(in++);
@@ -151,10 +160,10 @@
                                   NS_LITERAL_CSTRING(IMAGE_ICON_MS));
 }
 
-static GtkWidget *gProtoWindow = nullptr;
-static GtkWidget *gStockImageWidget = nullptr;
+static GtkWidget* gProtoWindow = nullptr;
+static GtkWidget* gStockImageWidget = nullptr;
 #ifdef MOZ_ENABLE_GNOMEUI
-static GnomeIconTheme *gIconTheme = nullptr;
+static GnomeIconTheme* gIconTheme = nullptr;
 #endif //MOZ_ENABLE_GNOMEUI
 
 static void
@@ -178,16 +187,24 @@
 static nsresult
 ensure_libgnomeui()
 {
-  // Attempt to get the libgnomeui symbol references. We do it this way so that stock icons from Init()
-  // don't get held back by InitWithGnome()'s libgnomeui dependency.
+  // Attempt to get the libgnomeui symbol references. We do it this way
+  // so that stock icons from Init() don't get held back by InitWithGnome()'s
+  // libgnomeui dependency.
   if (!gTriedToLoadGnomeLibs) {
     gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so.0");
-    if (!gLibGnomeUI)
+    if (!gLibGnomeUI) {
       return NS_ERROR_NOT_AVAILABLE;
+    }
 
-    _gnome_init = (_GnomeInit_fn)PR_FindFunctionSymbol(gLibGnomeUI, "gnome_init_with_popt_table");
-    _gnome_icon_theme_new = (_GnomeIconThemeNew_fn)PR_FindFunctionSymbol(gLibGnomeUI, "gnome_icon_theme_new");
-    _gnome_icon_lookup = (_GnomeIconLookup_fn)PR_FindFunctionSymbol(gLibGnomeUI, "gnome_icon_lookup");
+    _gnome_init =
+      (_GnomeInit_fn)PR_FindFunctionSymbol(gLibGnomeUI,
+                                           "gnome_init_with_popt_table");
+    _gnome_icon_theme_new =
+      (_GnomeIconThemeNew_fn)PR_FindFunctionSymbol(gLibGnomeUI,
+                                                   "gnome_icon_theme_new");
+    _gnome_icon_lookup =
+      (_GnomeIconLookup_fn)PR_FindFunctionSymbol(gLibGnomeUI,
+                                                 "gnome_icon_lookup");
 
     if (!_gnome_init || !_gnome_icon_theme_new || !_gnome_icon_lookup) {
       PR_UnloadLibrary(gLibGnomeUI);
@@ -196,8 +213,9 @@
     }
   }
 
-  if (!gLibGnomeUI)
+  if (!gLibGnomeUI) {
     return NS_ERROR_NOT_AVAILABLE;
+  }
 
   return NS_OK;
 }
@@ -207,10 +225,13 @@
 {
   if (!gTriedToLoadGnomeLibs) {
     gLibGnome = PR_LoadLibrary("libgnome-2.so.0");
-    if (!gLibGnome)
+    if (!gLibGnome) {
       return NS_ERROR_NOT_AVAILABLE;
+    }
 
-    _gnome_program_get = (_GnomeProgramGet_fn)PR_FindFunctionSymbol(gLibGnome, "gnome_program_get");
+    _gnome_program_get =
+      (_GnomeProgramGet_fn)PR_FindFunctionSymbol(gLibGnome,
+                                                 "gnome_program_get");
     if (!_gnome_program_get) {
       PR_UnloadLibrary(gLibGnome);
       gLibGnome = nullptr;
@@ -218,8 +239,9 @@
     }
   }
 
-  if (!gLibGnome)
+  if (!gLibGnome) {
     return NS_ERROR_NOT_AVAILABLE;
+  }
 
   return NS_OK;
 }
@@ -229,11 +251,17 @@
 {
   if (!gTriedToLoadGnomeLibs) {
     gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so.0");
-    if (!gLibGnomeVFS)
+    if (!gLibGnomeVFS) {
       return NS_ERROR_NOT_AVAILABLE;
+    }
 
-    _gnome_vfs_get_file_info = (_GnomeVFSGetFileInfo_fn)PR_FindFunctionSymbol(gLibGnomeVFS, "gnome_vfs_get_file_info");
-    _gnome_vfs_file_info_clear = (_GnomeVFSFileInfoClear_fn)PR_FindFunctionSymbol(gLibGnomeVFS, "gnome_vfs_file_info_clear");
+    _gnome_vfs_get_file_info =
+      (_GnomeVFSGetFileInfo_fn)PR_FindFunctionSymbol(gLibGnomeVFS,
+                                                     "gnome_vfs_get_file_info");
+    _gnome_vfs_file_info_clear =
+        (_GnomeVFSFileInfoClear_fn)PR_FindFunctionSymbol(gLibGnomeVFS,
+                                                         "gnome_vfs_file_"
+                                                         "info_clear");
     if (!_gnome_vfs_get_file_info || !_gnome_vfs_file_info_clear) {
       PR_UnloadLibrary(gLibGnomeVFS);
       gLibGnomeVFS = nullptr;
@@ -241,40 +269,47 @@
     }
   }
 
-  if (!gLibGnomeVFS)
+  if (!gLibGnomeVFS) {
     return NS_ERROR_NOT_AVAILABLE;
+  }
 
   return NS_OK;
 }
 #endif //MOZ_ENABLE_GNOMEUI
 
 static GtkIconSize
-moz_gtk_icon_size(const char *name)
+moz_gtk_icon_size(const char* name)
 {
-  if (strcmp(name, "button") == 0)
+  if (strcmp(name, "button") == 0) {
     return GTK_ICON_SIZE_BUTTON;
+  }
 
-  if (strcmp(name, "menu") == 0)
+  if (strcmp(name, "menu") == 0) {
     return GTK_ICON_SIZE_MENU;
+  }
 
-  if (strcmp(name, "toolbar") == 0)
+  if (strcmp(name, "toolbar") == 0) {
     return GTK_ICON_SIZE_LARGE_TOOLBAR;
+  }
 
-  if (strcmp(name, "toolbarsmall") == 0)
+  if (strcmp(name, "toolbarsmall") == 0) {
     return GTK_ICON_SIZE_SMALL_TOOLBAR;
+  }
 
-  if (strcmp(name, "dnd") == 0)
+  if (strcmp(name, "dnd") == 0) {
     return GTK_ICON_SIZE_DND;
+  }
 
-  if (strcmp(name, "dialog") == 0)
+  if (strcmp(name, "dialog") == 0) {
     return GTK_ICON_SIZE_DIALOG;
+  }
 
   return GTK_ICON_SIZE_MENU;
 }
 
 #if defined(MOZ_ENABLE_GNOMEUI) || defined(MOZ_ENABLE_GIO)
 static int32_t
-GetIconSize(nsIMozIconURI *aIconURI)
+GetIconSize(nsIMozIconURI* aIconURI)
 {
   nsAutoCString iconSizeString;
 
@@ -283,7 +318,7 @@
     uint32_t size;
     mozilla::DebugOnly<nsresult> rv = aIconURI->GetImageSize(&size);
     NS_ASSERTION(NS_SUCCEEDED(rv), "GetImageSize failed");
-    return size; 
+    return size;
   } else {
     int size;
 
@@ -295,18 +330,19 @@
 
 /* Scale icon buffer to preferred size */
 static nsresult
-ScaleIconBuf(GdkPixbuf **aBuf, int32_t iconSize)
+ScaleIconBuf(GdkPixbuf** aBuf, int32_t iconSize)
 {
   // Scale buffer only if width or height differ from preferred size
   if (gdk_pixbuf_get_width(*aBuf)  != iconSize &&
       gdk_pixbuf_get_height(*aBuf) != iconSize) {
-    GdkPixbuf *scaled = gdk_pixbuf_scale_simple(*aBuf, iconSize, iconSize,
+    GdkPixbuf* scaled = gdk_pixbuf_scale_simple(*aBuf, iconSize, iconSize,
                                                 GDK_INTERP_BILINEAR);
     // replace original buffer by scaled
     g_object_unref(*aBuf);
     *aBuf = scaled;
-    if (!scaled)
+    if (!scaled) {
       return NS_ERROR_OUT_OF_MEMORY;
+    }
   }
   return NS_OK;
 }
@@ -314,11 +350,12 @@
 
 #ifdef MOZ_ENABLE_GNOMEUI
 nsresult
-nsIconChannel::InitWithGnome(nsIMozIconURI *aIconURI)
+nsIconChannel::InitWithGnome(nsIMozIconURI* aIconURI)
 {
   nsresult rv;
 
-  if (NS_FAILED(ensure_libgnomeui()) || NS_FAILED(ensure_libgnome()) || NS_FAILED(ensure_libgnomevfs())) {
+  if (NS_FAILED(ensure_libgnomeui()) || NS_FAILED(ensure_libgnome()) ||
+      NS_FAILED(ensure_libgnomevfs())) {
     gTriedToLoadGnomeLibs = true;
     return NS_ERROR_NOT_AVAILABLE;
   }
@@ -329,7 +366,7 @@
     // Get the brandShortName from the string bundle to pass to GNOME
     // as the application name.  This may be used for things such as
     // the title of grouped windows in the panel.
-    nsCOMPtr<nsIStringBundleService> bundleService = 
+    nsCOMPtr<nsIStringBundleService> bundleService =
       do_GetService(NS_STRINGBUNDLE_CONTRACTID);
 
     NS_ASSERTION(bundleService, "String bundle service must be present!");
@@ -343,7 +380,8 @@
       bundle->GetStringFromName(MOZ_UTF16("brandShortName"),
                                 getter_Copies(appName));
     } else {
-      NS_WARNING("brand.properties not present, using default application name");
+      NS_WARNING(
+         "brand.properties not present, using default application name");
       appName.AssignLiteral(MOZ_UTF16("Gecko"));
     }
 
@@ -357,7 +395,8 @@
   aIconURI->GetContentType(type);
 
   GnomeVFSFileInfo fileInfo = {0};
-  fileInfo.refcount = 1; // In case some GnomeVFS function addrefs and releases it
+  fileInfo.refcount = 1; // In case some GnomeVFS function addrefs and
+                         // releases it
 
   nsAutoCString spec;
   nsCOMPtr<nsIURL> url;
@@ -368,11 +407,14 @@
     // network request
     bool isFile;
     if (NS_SUCCEEDED(url->SchemeIs("file", &isFile)) && isFile) {
-      _gnome_vfs_get_file_info(spec.get(), &fileInfo, GNOME_VFS_FILE_INFO_DEFAULT);
+      _gnome_vfs_get_file_info(spec.get(), &fileInfo,
+                               GNOME_VFS_FILE_INFO_DEFAULT);
     }
     else {
-      // The filename we get is UTF-8-compatible, which matches gnome expectations.
-      // See also: http://lists.gnome.org/archives/gnome-vfs-list/2004-March/msg00049.html
+      // The filename we get is UTF-8-compatible, which matches gnome
+      // expectations.
+      // See also:
+      // http://lists.gnome.org/archives/gnome-vfs-list/2004-March/msg00049.html
       // "Whenever we can detect the charset used for the URI type we try to
       //  convert it to/from utf8 automatically inside gnome-vfs."
       // I'll interpret that as "otherwise, this field is random junk".
@@ -412,24 +454,27 @@
                                   GNOME_ICON_LOOKUP_FLAGS_NONE, nullptr);
 
   _gnome_vfs_file_info_clear(&fileInfo);
-  if (!name)
+  if (!name) {
     return NS_ERROR_NOT_AVAILABLE;
-  
+  }
+
   // Get the default theme associated with the screen
   // Do NOT free.
-  GtkIconTheme *theme = gtk_icon_theme_get_default();
+  GtkIconTheme* theme = gtk_icon_theme_get_default();
   if (!theme) {
     g_free(name);
     return NS_ERROR_UNEXPECTED;
   }
 
-  GError *err = nullptr;
-  GdkPixbuf* buf = gtk_icon_theme_load_icon(theme, name, iconSize, (GtkIconLookupFlags)0, &err);
+  GError* err = nullptr;
+  GdkPixbuf* buf = gtk_icon_theme_load_icon(theme, name, iconSize,
+                                            (GtkIconLookupFlags)0, &err);
   g_free(name);
 
   if (!buf) {
-    if (err)
+    if (err) {
       g_error_free(err);
+    }
     return NS_ERROR_UNEXPECTED;
   }
 
@@ -445,7 +490,7 @@
 
 #ifdef MOZ_ENABLE_GIO
 nsresult
-nsIconChannel::InitWithGIO(nsIMozIconURI *aIconURI)
+nsIconChannel::InitWithGIO(nsIMozIconURI* aIconURI)
 {
   GIcon *icon = nullptr;
   nsCOMPtr<nsIURL> fileURI;
@@ -459,8 +504,8 @@
     nsAutoCString spec;
     fileURI->GetAsciiSpec(spec);
     if (NS_SUCCEEDED(fileURI->SchemeIs("file", &isFile)) && isFile) {
-      GFile *file = g_file_new_for_uri(spec.get());
-      GFileInfo *fileInfo = g_file_query_info(file,
+      GFile* file = g_file_new_for_uri(spec.get());
+      GFileInfo* fileInfo = g_file_query_info(file,
                                               G_FILE_ATTRIBUTE_STANDARD_ICON,
                                               G_FILE_QUERY_INFO_NONE,
                                               nullptr, nullptr);
@@ -468,13 +513,14 @@
       if (fileInfo) {
         // icon from g_content_type_get_icon doesn't need unref
         icon = g_file_info_get_icon(fileInfo);
-        if (icon)
+        if (icon) {
           g_object_ref(icon);
+        }
         g_object_unref(fileInfo);
       }
     }
   }
-  
+
   // Try to get icon by using MIME type
   if (!icon) {
     nsAutoCString type;
@@ -488,7 +534,7 @@
         ms->GetTypeFromExtension(fileExt, type);
       }
     }
-    char *ctype = nullptr; // character representation of content type
+    char* ctype = nullptr; // character representation of content type
     if (!type.IsEmpty()) {
       ctype = g_content_type_from_mime_type(type.get());
     }
@@ -499,8 +545,8 @@
   }
 
   // Get default icon theme
-  GtkIconTheme *iconTheme = gtk_icon_theme_get_default();  
-  GtkIconInfo *iconInfo = nullptr;
+  GtkIconTheme* iconTheme = gtk_icon_theme_get_default();
+  GtkIconInfo* iconInfo = nullptr;
   // Get icon size
   int32_t iconSize = GetIconSize(aIconURI);
 
@@ -511,7 +557,7 @@
                                               (GtkIconLookupFlags)0);
     g_object_unref(icon);
   }
-  
+
   if (!iconInfo) {
     // Mozilla's mimetype lookup failed. Try the "unknown" icon.
     iconInfo = gtk_icon_theme_lookup_icon(iconTheme,
@@ -521,14 +567,14 @@
       return NS_ERROR_NOT_AVAILABLE;
     }
   }
-  
+
   // Create a GdkPixbuf buffer containing icon and scale it
   GdkPixbuf* buf = gtk_icon_info_load_icon(iconInfo, nullptr);
   gtk_icon_info_free(iconInfo);
   if (!buf) {
     return NS_ERROR_UNEXPECTED;
   }
-  
+
   nsresult rv = ScaleIconBuf(&buf, iconSize);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -550,7 +596,7 @@
   if (stockIcon.IsEmpty()) {
 #ifdef MOZ_ENABLE_GNOMEUI
     return InitWithGnome(iconURI);
-#else 
+#else
 #ifdef MOZ_ENABLE_GIO
     return InitWithGIO(iconURI);
 #else
@@ -592,7 +638,7 @@
     // >= 2.22 will use a bidi lookup convention that most icon themes do not
     // yet follow.  Therefore, we first check to see if the theme supports the
     // old icon name as this will have bidi support (if found).
-    GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+    GtkIconTheme* icon_theme = gtk_icon_theme_get_default();
     // Micking what gtk_icon_set_render_icon does with sizes, though it's not
     // critical as icons will be scaled to suit size.  It just means we follow
     // the same pathes and so share caches.
@@ -603,7 +649,7 @@
       // GTK_ICON_LOOKUP_USE_BUILTIN instead of gtk_icon_theme_has_icon() so
       // we don't pick up fallback icons added by distributions for backward
       // compatibility.
-      GtkIconInfo *icon =
+      GtkIconInfo* icon =
         gtk_icon_theme_lookup_icon(icon_theme, stockIcon.get(),
                                    size, (GtkIconLookupFlags)0);
       if (icon) {
@@ -614,8 +660,8 @@
   }
 
   ensure_stock_image_widget();
-  GtkStyle *style = gtk_widget_get_style(gStockImageWidget);
-  GtkIconSet *icon_set = nullptr;
+  GtkStyle* style = gtk_widget_get_style(gStockImageWidget);
+  GtkIconSet* icon_set = nullptr;
   if (!useIconName) {
     icon_set = gtk_style_lookup_icon_set(style, stockID.get());
   }
@@ -628,14 +674,14 @@
     // render the icon, possibly with variations suitable for insensitive
     // states.
     icon_set = gtk_icon_set_new();
-    GtkIconSource *icon_source = gtk_icon_source_new();
-    
+    GtkIconSource* icon_source = gtk_icon_source_new();
+
     gtk_icon_source_set_icon_name(icon_source, stockIcon.get());
     gtk_icon_set_add_source(icon_set, icon_source);
     gtk_icon_source_free(icon_source);
   }
 
-  GdkPixbuf *icon =
+  GdkPixbuf* icon =
     gtk_icon_set_render_icon(icon_set, style, direction, state,
                              icon_size, gStockImageWidget, nullptr);
   if (useIconName) {
@@ -645,9 +691,10 @@
   // According to documentation, gtk_icon_set_render_icon() never returns
   // nullptr, but it does return nullptr when we have the problem reported
   // here: https://bugzilla.gnome.org/show_bug.cgi?id=629878#c13
-  if (!icon)
+  if (!icon) {
     return NS_ERROR_NOT_AVAILABLE;
-  
+  }
+
   nsresult rv = moz_gdk_pixbuf_to_channel(icon, iconURI,
                                           getter_AddRefs(mRealChannel));
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/gtk/nsIconChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/gtk/nsIconChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/gtk/nsIconChannel.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/gtk/nsIconChannel.h	2014-11-26 21:45:47.000000000 +0000
@@ -13,40 +13,33 @@
 #include "nsIIconURI.h"
 #include "nsCOMPtr.h"
 
-/**
- * This class is the gnome implementation of nsIconChannel. It basically asks
- * gtk/gnome for an icon, saves it as a tmp icon, and creates a new channel for
- * that file to which all calls will be proxied.
- */
-class nsIconChannel MOZ_FINAL : public nsIChannel {
+/// This class is the gnome implementation of nsIconChannel. It basically asks
+/// gtk/gnome for an icon, saves it as a tmp icon, and creates a new channel for
+/// that file to which all calls will be proxied.
+class nsIconChannel MOZ_FINAL : public nsIChannel
+{
   public:
     NS_DECL_ISUPPORTS
     NS_FORWARD_NSIREQUEST(mRealChannel->)
     NS_FORWARD_NSICHANNEL(mRealChannel->)
 
-    nsIconChannel() {}
+    nsIconChannel() { }
 
     static void Shutdown();
 
-    /**
-     * Called by nsIconProtocolHandler after it creates this channel.
-     * Must be called before calling any other function on this object.
-     * If this method fails, no other function must be called on this object.
-     */
+    /// Called by nsIconProtocolHandler after it creates this channel.
+    /// Must be called before calling any other function on this object.
+    /// If this method fails, no other function must be called on this object.
     nsresult Init(nsIURI* aURI);
   private:
-    ~nsIconChannel() {}
-    /**
-     * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
-     * Will always be non-null after a successful Init.
-     */
+    ~nsIconChannel() { }
+    /// The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
+    /// Will always be non-null after a successful Init.
     nsCOMPtr<nsIChannel> mRealChannel;
 
-    /**
-     * Called by Init if we need to use the gnomeui library.
-     */
-    nsresult InitWithGnome(nsIMozIconURI *aURI);
-    nsresult InitWithGIO(nsIMozIconURI *aIconURI);
+    /// Called by Init if we need to use the gnomeui library.
+    nsresult InitWithGnome(nsIMozIconURI* aURI);
+    nsresult InitWithGIO(nsIMozIconURI* aIconURI);
 };
 
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/mac/nsIconChannelCocoa.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/mac/nsIconChannelCocoa.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/mac/nsIconChannelCocoa.mm	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/mac/nsIconChannelCocoa.mm	2014-11-26 21:45:47.000000000 +0000
@@ -31,25 +31,26 @@
 {
 }
 
-nsIconChannel::~nsIconChannel() 
+nsIconChannel::~nsIconChannel()
 {
   if (mLoadInfo) {
     nsCOMPtr<nsIThread> mainThread;
     NS_GetMainThread(getter_AddRefs(mainThread));
 
-    nsILoadInfo *forgetableLoadInfo;
+    nsILoadInfo* forgetableLoadInfo;
     mLoadInfo.forget(&forgetableLoadInfo);
     NS_ProxyRelease(mainThread, forgetableLoadInfo, false);
   }
 }
 
-NS_IMPL_ISUPPORTS(nsIconChannel, 
-                  nsIChannel, 
+NS_IMPL_ISUPPORTS(nsIconChannel,
+                  nsIChannel,
                   nsIRequest,
-			       nsIRequestObserver,
-			       nsIStreamListener)
+                  nsIRequestObserver,
+                  nsIStreamListener)
 
-nsresult nsIconChannel::Init(nsIURI* uri)
+nsresult
+nsIconChannel::Init(nsIURI* uri)
 {
   NS_ASSERTION(uri, "no uri");
   mUrl = uri;
@@ -62,45 +63,57 @@
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
-NS_IMETHODIMP nsIconChannel::GetName(nsACString &result)
+NS_IMETHODIMP
+nsIconChannel::GetName(nsACString& result)
 {
   return mUrl->GetSpec(result);
 }
 
-NS_IMETHODIMP nsIconChannel::IsPending(bool *result)
+NS_IMETHODIMP
+nsIconChannel::IsPending(bool* result)
 {
   return mPump->IsPending(result);
 }
 
-NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
+NS_IMETHODIMP
+nsIconChannel::GetStatus(nsresult* status)
 {
   return mPump->GetStatus(status);
 }
 
-NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
+NS_IMETHODIMP
+nsIconChannel::Cancel(nsresult status)
 {
   return mPump->Cancel(status);
 }
 
-NS_IMETHODIMP nsIconChannel::Suspend(void)
+NS_IMETHODIMP
+nsIconChannel::Suspend(void)
 {
   return mPump->Suspend();
 }
 
-NS_IMETHODIMP nsIconChannel::Resume(void)
+NS_IMETHODIMP
+nsIconChannel::Resume(void)
 {
   return mPump->Resume();
 }
 
 // nsIRequestObserver methods
-NS_IMETHODIMP nsIconChannel::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
+NS_IMETHODIMP
+nsIconChannel::OnStartRequest(nsIRequest* aRequest,
+                                            nsISupports* aContext)
 {
-  if (mListener)
+  if (mListener) {
     return mListener->OnStartRequest(this, aContext);
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsresult aStatus)
+NS_IMETHODIMP
+nsIconChannel::OnStopRequest(nsIRequest* aRequest,
+                                           nsISupports* aContext,
+                                           nsresult aStatus)
 {
   if (mListener) {
     mListener->OnStopRequest(this, aContext, aStatus);
@@ -108,42 +121,48 @@
   }
 
   // Remove from load group
-  if (mLoadGroup)
+  if (mLoadGroup) {
     mLoadGroup->RemoveRequest(this, nullptr, aStatus);
+  }
 
   return NS_OK;
 }
 
 // nsIStreamListener methods
-NS_IMETHODIMP nsIconChannel::OnDataAvailable(nsIRequest* aRequest,
+NS_IMETHODIMP
+nsIconChannel::OnDataAvailable(nsIRequest* aRequest,
                                              nsISupports* aContext,
                                              nsIInputStream* aStream,
                                              uint64_t aOffset,
                                              uint32_t aCount)
 {
-  if (mListener)
+  if (mListener) {
     return mListener->OnDataAvailable(this, aContext, aStream, aOffset, aCount);
+  }
   return NS_OK;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIChannel methods:
 
-NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
+NS_IMETHODIMP
+nsIconChannel::GetOriginalURI(nsIURI** aURI)
 {
   *aURI = mOriginalURI;
   NS_ADDREF(*aURI);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
+NS_IMETHODIMP
+nsIconChannel::SetOriginalURI(nsIURI* aURI)
 {
   NS_ENSURE_ARG_POINTER(aURI);
   mOriginalURI = aURI;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
+NS_IMETHODIMP
+nsIconChannel::GetURI(nsIURI** aURI)
 {
   *aURI = mUrl;
   NS_IF_ADDREF(*aURI);
@@ -151,12 +170,16 @@
 }
 
 NS_IMETHODIMP
-nsIconChannel::Open(nsIInputStream **_retval)
+nsIconChannel::Open(nsIInputStream** _retval)
 {
   return MakeInputStream(_retval, false);
 }
 
-nsresult nsIconChannel::ExtractIconInfoFromUrl(nsIFile ** aLocalFile, uint32_t * aDesiredImageSize, nsACString &aContentType, nsACString &aFileExtension)
+nsresult
+nsIconChannel::ExtractIconInfoFromUrl(nsIFile** aLocalFile,
+                                               uint32_t* aDesiredImageSize,
+                                               nsACString& aContentType,
+                                               nsACString& aFileExtension)
 {
   nsresult rv = NS_OK;
   nsCOMPtr<nsIMozIconURI> iconURI (do_QueryInterface(mUrl, &rv));
@@ -165,7 +188,7 @@
   iconURI->GetImageSize(aDesiredImageSize);
   iconURI->GetContentType(aContentType);
   iconURI->GetFileExtension(aFileExtension);
-  
+
   nsCOMPtr<nsIURL> url;
   rv = iconURI->GetIconURL(getter_AddRefs(url));
   if (NS_FAILED(rv) || !url) return NS_OK;
@@ -176,17 +199,19 @@
   nsCOMPtr<nsIFile> file;
   rv = fileURL->GetFile(getter_AddRefs(file));
   if (NS_FAILED(rv) || !file) return NS_OK;
-  
+
   nsCOMPtr<nsILocalFileMac> localFileMac (do_QueryInterface(file, &rv));
   if (NS_FAILED(rv) || !localFileMac) return NS_OK;
-  
+
   *aLocalFile = file;
   NS_IF_ADDREF(*aLocalFile);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
+NS_IMETHODIMP
+nsIconChannel::AsyncOpen(nsIStreamListener* aListener,
+                                       nsISupports* ctxt)
 {
   nsCOMPtr<nsIInputStream> inStream;
   nsresult rv = MakeInputStream(getter_AddRefs(inStream), true);
@@ -195,20 +220,23 @@
   // Init our stream pump
   rv = mPump->Init(inStream, int64_t(-1), int64_t(-1), 0, 0, false);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   rv = mPump->AsyncRead(this, ctxt);
   if (NS_SUCCEEDED(rv)) {
     // Store our real listener
     mListener = aListener;
     // Add ourself to the load group, if available
-    if (mLoadGroup)
+    if (mLoadGroup) {
       mLoadGroup->AddRequest(this, nullptr);
+    }
   }
 
   return rv;
 }
 
-nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, bool nonBlocking)
+nsresult
+nsIconChannel::MakeInputStream(nsIInputStream** _retval,
+                                        bool aNonBlocking)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
@@ -216,7 +244,8 @@
   nsAutoCString fileExt;
   nsCOMPtr<nsIFile> fileloc; // file we want an icon for
   uint32_t desiredImageSize;
-  nsresult rv = ExtractIconInfoFromUrl(getter_AddRefs(fileloc), &desiredImageSize, contentType, fileExt);
+  nsresult rv = ExtractIconInfoFromUrl(getter_AddRefs(fileloc),
+                                       &desiredImageSize, contentType, fileExt);
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool fileExists = false;
@@ -235,7 +264,8 @@
 
     CFURLRef macURL;
     if (NS_SUCCEEDED(localFileMac->GetCFURL(&macURL))) {
-      iconImage = [[NSWorkspace sharedWorkspace] iconForFile:[(NSURL*)macURL path]];
+      iconImage = [[NSWorkspace sharedWorkspace]
+                   iconForFile:[(NSURL*)macURL path]];
       ::CFRelease(macURL);
     }
   }
@@ -247,24 +277,31 @@
   }
 
   // If we still don't have an icon, get the generic document icon.
-  if (!iconImage)
-    iconImage = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeUnknown];
+  if (!iconImage) {
+    iconImage = [[NSWorkspace sharedWorkspace]
+                 iconForFileType:NSFileTypeUnknown];
+  }
 
-  if (!iconImage)
+  if (!iconImage) {
     return NS_ERROR_FAILURE;
+  }
 
   // we have an icon now, size it
   NSRect desiredSizeRect = NSMakeRect(0, 0, desiredImageSize, desiredImageSize);
   [iconImage setSize:desiredSizeRect.size];
 
   [iconImage lockFocus];
-  NSBitmapImageRep* bitmapRep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect:desiredSizeRect] autorelease];
+  NSBitmapImageRep* bitmapRep = [[[NSBitmapImageRep alloc]
+                                  initWithFocusedViewRect:desiredSizeRect]
+                                  autorelease];
   [iconImage unlockFocus];
 
   // we expect the following things to be true about our bitmapRep
   NS_ENSURE_TRUE(![bitmapRep isPlanar] &&
-                 // Not necessarily: on a HiDPI-capable system, we'll get a 2x bitmap
-                 // (unsigned int)[bitmapRep bytesPerPlane] == desiredImageSize * desiredImageSize * 4 &&
+                 // Not necessarily: on a HiDPI-capable system, we'll get
+                 // a 2x bitmap
+                 // (unsigned int)[bitmapRep bytesPerPlane] ==
+                 //    desiredImageSize * desiredImageSize * 4 &&
                  [bitmapRep bitsPerPixel] == 32 &&
                  [bitmapRep samplesPerPixel] == 4 &&
                  [bitmapRep hasAlpha] == YES,
@@ -275,7 +312,8 @@
   NS_ENSURE_TRUE(actualImageSize < 256, NS_ERROR_UNEXPECTED);
 
   // now we can validate the amount of data
-  NS_ENSURE_TRUE((unsigned int)[bitmapRep bytesPerPlane] == actualImageSize * actualImageSize * 4,
+  NS_ENSURE_TRUE((unsigned int)[bitmapRep bytesPerPlane] ==
+                 actualImageSize * actualImageSize * 4,
                  NS_ERROR_UNEXPECTED);
 
   // rgba, pre-multiplied data
@@ -283,7 +321,8 @@
 
   // create our buffer
   int32_t bufferCapacity = 2 + [bitmapRep bytesPerPlane];
-  nsAutoTArray<uint8_t, 3 + 16 * 16 * 5> iconBuffer; // initial size is for 16x16
+  nsAutoTArray<uint8_t, 3 + 16 * 16 * 5> iconBuffer; // initial size is for
+                                                     // 16x16
   iconBuffer.SetLength(bufferCapacity);
 
   uint8_t* iconBufferPtr = iconBuffer.Elements();
@@ -324,13 +363,15 @@
   nsCOMPtr<nsIInputStream> inStream;
   nsCOMPtr<nsIOutputStream> outStream;
   rv = NS_NewPipe(getter_AddRefs(inStream), getter_AddRefs(outStream),
-                  bufferCapacity, bufferCapacity, nonBlocking);
+                  bufferCapacity, bufferCapacity, aNonBlocking);
 
   if (NS_SUCCEEDED(rv)) {
     uint32_t written;
-    rv = outStream->Write((char*)iconBuffer.Elements(), bufferCapacity, &written);
-    if (NS_SUCCEEDED(rv))
+    rv = outStream->Write((char*)iconBuffer.Elements(), bufferCapacity,
+                          &written);
+    if (NS_SUCCEEDED(rv)) {
       NS_IF_ADDREF(*_retval = inStream);
+    }
   }
 
   // Drop notification callbacks to prevent cycles.
@@ -341,38 +382,42 @@
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-NS_IMETHODIMP nsIconChannel::GetLoadFlags(uint32_t *aLoadAttributes)
+NS_IMETHODIMP
+nsIconChannel::GetLoadFlags(uint32_t* aLoadAttributes)
 {
   return mPump->GetLoadFlags(aLoadAttributes);
 }
 
-NS_IMETHODIMP nsIconChannel::SetLoadFlags(uint32_t aLoadAttributes)
+NS_IMETHODIMP
+nsIconChannel::SetLoadFlags(uint32_t aLoadAttributes)
 {
   return mPump->SetLoadFlags(aLoadAttributes);
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentType(nsACString &aContentType) 
+NS_IMETHODIMP
+nsIconChannel::GetContentType(nsACString& aContentType)
 {
   aContentType.AssignLiteral(IMAGE_ICON_MS);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsIconChannel::SetContentType(const nsACString &aContentType)
+nsIconChannel::SetContentType(const nsACString& aContentType)
 {
   //It doesn't make sense to set the content-type on this type
   // of channel...
   return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentCharset(nsACString &aContentCharset) 
+NS_IMETHODIMP
+nsIconChannel::GetContentCharset(nsACString& aContentCharset)
 {
   aContentCharset.AssignLiteral(IMAGE_ICON_MS);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsIconChannel::SetContentCharset(const nsACString &aContentCharset)
+nsIconChannel::SetContentCharset(const nsACString& aContentCharset)
 {
   //It doesn't make sense to set the content-type on this type
   // of channel...
@@ -380,7 +425,7 @@
 }
 
 NS_IMETHODIMP
-nsIconChannel::GetContentDisposition(uint32_t *aContentDisposition)
+nsIconChannel::GetContentDisposition(uint32_t* aContentDisposition)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
@@ -392,87 +437,103 @@
 }
 
 NS_IMETHODIMP
-nsIconChannel::GetContentDispositionFilename(nsAString &aContentDispositionFilename)
+nsIconChannel::
+  GetContentDispositionFilename(nsAString& aContentDispositionFilename)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
-nsIconChannel::SetContentDispositionFilename(const nsAString &aContentDispositionFilename)
+nsIconChannel::
+  SetContentDispositionFilename(const nsAString& aContentDispositionFilename)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
-nsIconChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader)
+nsIconChannel::
+  GetContentDispositionHeader(nsACString& aContentDispositionHeader)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)
+NS_IMETHODIMP
+nsIconChannel::GetContentLength(int64_t* aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)
+NS_IMETHODIMP
+nsIconChannel::SetContentLength(int64_t aContentLength)
 {
   NS_NOTREACHED("nsIconChannel::SetContentLength");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+NS_IMETHODIMP
+nsIconChannel::GetLoadGroup(nsILoadGroup** aLoadGroup)
 {
   *aLoadGroup = mLoadGroup;
   NS_IF_ADDREF(*aLoadGroup);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+NS_IMETHODIMP
+nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
 {
   mLoadGroup = aLoadGroup;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
+NS_IMETHODIMP
+nsIconChannel::GetOwner(nsISupports** aOwner)
 {
   *aOwner = mOwner.get();
   NS_IF_ADDREF(*aOwner);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
+NS_IMETHODIMP
+nsIconChannel::SetOwner(nsISupports* aOwner)
 {
   mOwner = aOwner;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetLoadInfo(nsILoadInfo* *aLoadInfo)
+NS_IMETHODIMP
+nsIconChannel::GetLoadInfo(nsILoadInfo** aLoadInfo)
 {
   NS_IF_ADDREF(*aLoadInfo = mLoadInfo);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetLoadInfo(nsILoadInfo* aLoadInfo)
+NS_IMETHODIMP
+nsIconChannel::SetLoadInfo(nsILoadInfo* aLoadInfo)
 {
   mLoadInfo = aLoadInfo;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+NS_IMETHODIMP
+nsIconChannel::
+  GetNotificationCallbacks(nsIInterfaceRequestor** aNotificationCallbacks)
 {
   *aNotificationCallbacks = mCallbacks.get();
   NS_IF_ADDREF(*aNotificationCallbacks);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+NS_IMETHODIMP
+nsIconChannel::
+  SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
 {
   mCallbacks = aNotificationCallbacks;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
+NS_IMETHODIMP
+nsIconChannel::GetSecurityInfo(nsISupports** aSecurityInfo)
 {
   *aSecurityInfo = nullptr;
   return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/mac/nsIconChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/mac/nsIconChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/mac/nsIconChannel.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/mac/nsIconChannel.h	2014-11-26 21:45:47.000000000 +0000
@@ -40,19 +40,21 @@
 
   nsCOMPtr<nsIURI> mUrl;
   nsCOMPtr<nsIURI> mOriginalURI;
-  int64_t          mContentLength;
+  int64_t mContentLength;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsISupports>  mOwner;
   nsCOMPtr<nsILoadInfo>  mLoadInfo;
-  
+
   nsCOMPtr<nsIInputStreamPump> mPump;
   nsCOMPtr<nsIStreamListener>  mListener;
-  
+
   nsresult MakeInputStream(nsIInputStream** _retval, bool nonBlocking);
-  
-  nsresult ExtractIconInfoFromUrl(nsIFile ** aLocalFile, uint32_t * aDesiredImageSize,
-                           nsACString &aContentType, nsACString &aFileExtension);
+
+  nsresult ExtractIconInfoFromUrl(nsIFile** aLocalFile,
+                                  uint32_t* aDesiredImageSize,
+                                  nsACString& aContentType,
+                                  nsACString& aFileExtension);
 };
 
 #endif /* nsIconChannel_h___ */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconModule.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconModule.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -12,10 +12,11 @@
 #include "nsIconChannel.h"
 
 // objects that just require generic constructors
-/******************************************************************************
- * Protocol CIDs
- */
-#define NS_ICONPROTOCOL_CID   { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } } 
+//*****************************************************************************
+// Protocol CIDs
+
+#define NS_ICONPROTOCOL_CID { 0xd0f9db12, 0x249c, 0x11d5, \
+                              { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } }
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconProtocolHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconProtocolHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconProtocolHandler.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconProtocolHandler.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -14,53 +14,60 @@
 #include "nsIServiceManager.h"
 #include "nsNetCID.h"
 
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 
-nsIconProtocolHandler::nsIconProtocolHandler() 
-{
-}
+nsIconProtocolHandler::nsIconProtocolHandler()
+{ }
+
+nsIconProtocolHandler::~nsIconProtocolHandler()
+{ }
 
-nsIconProtocolHandler::~nsIconProtocolHandler() 
-{}
+NS_IMPL_ISUPPORTS(nsIconProtocolHandler, nsIProtocolHandler,
+                  nsISupportsWeakReference)
 
-NS_IMPL_ISUPPORTS(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
 
-    
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 // nsIProtocolHandler methods:
 
-NS_IMETHODIMP nsIconProtocolHandler::GetScheme(nsACString &result) 
+NS_IMETHODIMP
+nsIconProtocolHandler::GetScheme(nsACString& result)
 {
   result = "moz-icon";
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconProtocolHandler::GetDefaultPort(int32_t *result) 
+NS_IMETHODIMP
+nsIconProtocolHandler::GetDefaultPort(int32_t* result)
 {
   *result = 0;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconProtocolHandler::AllowPort(int32_t port, const char *scheme, bool *_retval)
+NS_IMETHODIMP
+nsIconProtocolHandler::AllowPort(int32_t port,
+                                 const char* scheme,
+                                 bool* _retval)
 {
-    // don't override anything.  
+    // don't override anything.
     *_retval = false;
     return NS_OK;
 }
 
-NS_IMETHODIMP nsIconProtocolHandler::GetProtocolFlags(uint32_t *result)
+NS_IMETHODIMP
+nsIconProtocolHandler::GetProtocolFlags(uint32_t* result)
 {
   *result = URI_NORELATIVE | URI_NOAUTH | URI_IS_UI_RESOURCE |
             URI_IS_LOCAL_RESOURCE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconProtocolHandler::NewURI(const nsACString &aSpec,
-                                            const char *aOriginCharset, // ignored
-                                            nsIURI *aBaseURI,
-                                            nsIURI **result) 
+NS_IMETHODIMP
+nsIconProtocolHandler::NewURI(const nsACString& aSpec,
+                              const char* aOriginCharset, // ignored
+                              nsIURI* aBaseURI,
+                              nsIURI** result)
 {
-  
+
   nsCOMPtr<nsIURI> uri = new nsMozIconURI();
   if (!uri) return NS_ERROR_OUT_OF_MEMORY;
 
@@ -78,8 +85,9 @@
 {
   NS_ENSURE_ARG_POINTER(url);
   nsIconChannel* channel = new nsIconChannel;
-  if (!channel)
+  if (!channel) {
     return NS_ERROR_OUT_OF_MEMORY;
+  }
   NS_ADDREF(channel);
 
   nsresult rv = channel->Init(url);
@@ -92,7 +100,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
+NS_IMETHODIMP
+nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel** result)
 {
   return NewChannel2(url, nullptr, result);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconProtocolHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconProtocolHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconProtocolHandler.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconProtocolHandler.h	2014-11-26 21:45:47.000000000 +0000
@@ -9,7 +9,8 @@
 #include "nsWeakReference.h"
 #include "nsIProtocolHandler.h"
 
-class nsIconProtocolHandler : public nsIProtocolHandler, public nsSupportsWeakReference
+class nsIconProtocolHandler : public nsIProtocolHandler,
+                              public nsSupportsWeakReference
 {
 public:
     NS_DECL_ISUPPORTS
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconURI.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconURI.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconURI.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconURI.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -28,9 +28,11 @@
 
 // helper function for parsing out attributes like size, and contentType
 // from the icon url.
-static void extractAttributeValue(const char * searchString, const char * attributeName, nsCString& aResult);
- 
-static const char *kSizeStrings[] =
+static void extractAttributeValue(const char* aSearchString,
+                                  const char* aAttributeName,
+                                  nsCString& aResult);
+
+static const char* kSizeStrings[] =
 {
   "button",
   "toolbar",
@@ -40,24 +42,22 @@
   "dialog"
 };
 
-static const char *kStateStrings[] =
+static const char* kStateStrings[] =
 {
   "normal",
   "disabled"
 };
 
 ////////////////////////////////////////////////////////////////////////////////
- 
+
 nsMozIconURI::nsMozIconURI()
   : mSize(DEFAULT_IMAGE_SIZE),
     mIconSize(-1),
     mIconState(-1)
-{
-}
- 
+{ }
+
 nsMozIconURI::~nsMozIconURI()
-{
-}
+{ }
 
 NS_IMPL_ISUPPORTS(nsMozIconURI, nsIMozIconURI, nsIURI)
 
@@ -68,35 +68,27 @@
 // nsIURI methods:
 
 NS_IMETHODIMP
-nsMozIconURI::GetSpec(nsACString &aSpec)
+nsMozIconURI::GetSpec(nsACString& aSpec)
 {
   aSpec = MOZICON_SCHEME;
 
-  if (mIconURL)
-  {
+  if (mIconURL) {
     nsAutoCString fileIconSpec;
     nsresult rv = mIconURL->GetSpec(fileIconSpec);
     NS_ENSURE_SUCCESS(rv, rv);
     aSpec += fileIconSpec;
-  }
-  else if (!mStockIcon.IsEmpty())
-  {
+  } else if (!mStockIcon.IsEmpty()) {
     aSpec += "//stock/";
     aSpec += mStockIcon;
-  }
-  else
-  {
+  } else {
     aSpec += "//";
     aSpec += mFileName;
   }
 
   aSpec += "?size=";
-  if (mIconSize >= 0)
-  {
+  if (mIconSize >= 0) {
     aSpec += kSizeStrings[mIconSize];
-  }
-  else
-  {
+  } else {
     char buf[20];
     PR_snprintf(buf, sizeof(buf), "%d", mSize);
     aSpec.Append(buf);
@@ -107,61 +99,62 @@
     aSpec += kStateStrings[mIconState];
   }
 
-  if (!mContentType.IsEmpty())
-  {
+  if (!mContentType.IsEmpty()) {
     aSpec += "&contentType=";
     aSpec += mContentType.get();
   }
-  
+
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetSpecIgnoringRef(nsACString &result)
+nsMozIconURI::GetSpecIgnoringRef(nsACString& result)
 {
   return GetSpec(result);
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetHasRef(bool *result)
+nsMozIconURI::GetHasRef(bool* result)
 {
   *result = false;
   return NS_OK;
 }
 
-// takes a string like ?size=32&contentType=text/html and returns a new string 
+// takes a string like ?size=32&contentType=text/html and returns a new string
 // containing just the attribute value. i.e you could pass in this string with
 // an attribute name of 'size=', this will return 32
 // Assumption: attribute pairs in the string are separated by '&'.
-void extractAttributeValue(const char * searchString, const char * attributeName, nsCString& result)
+void
+extractAttributeValue(const char* aSearchString,
+                           const char* aAttributeName,
+                           nsCString& aResult)
 {
   //NS_ENSURE_ARG_POINTER(extractAttributeValue);
 
-  result.Truncate();
+  aResult.Truncate();
 
-  if (searchString && attributeName)
-  {
+  if (aSearchString && aAttributeName) {
     // search the string for attributeName
-    uint32_t attributeNameSize = strlen(attributeName);
-    const char * startOfAttribute = PL_strcasestr(searchString, attributeName);
+    uint32_t attributeNameSize = strlen(aAttributeName);
+    const char* startOfAttribute = PL_strcasestr(aSearchString, aAttributeName);
     if (startOfAttribute &&
-       ( *(startOfAttribute-1) == '?' || *(startOfAttribute-1) == '&') )
-    {
+       ( *(startOfAttribute-1) == '?' || *(startOfAttribute-1) == '&') ) {
       startOfAttribute += attributeNameSize; // skip over the attributeName
-      if (*startOfAttribute) // is there something after the attribute name
-      {
-        const char * endofAttribute = strchr(startOfAttribute, '&');
-        if (endofAttribute)
-          result.Assign(Substring(startOfAttribute, endofAttribute));
-        else
-          result.Assign(startOfAttribute);
+      // is there something after the attribute name
+      if (*startOfAttribute) {
+        const char* endofAttribute = strchr(startOfAttribute, '&');
+        if (endofAttribute) {
+          aResult.Assign(Substring(startOfAttribute, endofAttribute));
+        } else {
+          aResult.Assign(startOfAttribute);
+        }
       } // if we have a attribute value
     } // if we have a attribute name
   } // if we got non-null search string and attribute name values
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetSpec(const nsACString &aSpec)
+nsMozIconURI::SetSpec(const nsACString& aSpec)
 {
   // Reset everything to default values.
   mIconURL = nullptr;
@@ -173,42 +166,39 @@
   mIconState = -1;
 
   nsAutoCString iconSpec(aSpec);
-  if (!Substring(iconSpec, 0, MOZICON_SCHEME_LEN).EqualsLiteral(MOZICON_SCHEME))
+  if (!Substring(iconSpec, 0,
+                 MOZICON_SCHEME_LEN).EqualsLiteral(MOZICON_SCHEME)) {
     return NS_ERROR_MALFORMED_URI;
+  }
 
   int32_t questionMarkPos = iconSpec.Find("?");
-  if (questionMarkPos != -1 && static_cast<int32_t>(iconSpec.Length()) > (questionMarkPos + 1))
-  {
+  if (questionMarkPos != -1 &&
+      static_cast<int32_t>(iconSpec.Length()) > (questionMarkPos + 1)) {
     extractAttributeValue(iconSpec.get(), "contentType=", mContentType);
 
     nsAutoCString sizeString;
     extractAttributeValue(iconSpec.get(), "size=", sizeString);
-    if (!sizeString.IsEmpty())
-    {      
-      const char *sizeStr = sizeString.get();
-      for (uint32_t i = 0; i < ArrayLength(kSizeStrings); i++)
-      {
-        if (PL_strcasecmp(sizeStr, kSizeStrings[i]) == 0)
-        {
+    if (!sizeString.IsEmpty()) {
+      const char* sizeStr = sizeString.get();
+      for (uint32_t i = 0; i < ArrayLength(kSizeStrings); i++) {
+        if (PL_strcasecmp(sizeStr, kSizeStrings[i]) == 0) {
           mIconSize = i;
           break;
         }
       }
 
       int32_t sizeValue = atoi(sizeString.get());
-      if (sizeValue)
+      if (sizeValue) {
         mSize = sizeValue;
+      }
     }
 
     nsAutoCString stateString;
     extractAttributeValue(iconSpec.get(), "state=", stateString);
-    if (!stateString.IsEmpty())
-    {
-      const char *stateStr = stateString.get();
-      for (uint32_t i = 0; i < ArrayLength(kStateStrings); i++)
-      {
-        if (PL_strcasecmp(stateStr, kStateStrings[i]) == 0)
-        {
+    if (!stateString.IsEmpty()) {
+      const char* stateStr = stateString.get();
+      for (uint32_t i = 0; i < ArrayLength(kStateStrings); i++) {
+        if (PL_strcasecmp(stateStr, kStateStrings[i]) == 0) {
           mIconState = i;
           break;
         }
@@ -217,10 +207,12 @@
   }
 
   int32_t pathLength = iconSpec.Length() - MOZICON_SCHEME_LEN;
-  if (questionMarkPos != -1)
+  if (questionMarkPos != -1) {
     pathLength = questionMarkPos - MOZICON_SCHEME_LEN;
-  if (pathLength < 3)
+  }
+  if (pathLength < 3) {
     return NS_ERROR_MALFORMED_URI;
+  }
 
   nsAutoCString iconPath(Substring(iconSpec, MOZICON_SCHEME_LEN, pathLength));
 
@@ -229,20 +221,20 @@
   // (2) //<some dummy file with an extension>
   // (3) a valid URL
 
-  if (!strncmp("//stock/", iconPath.get(), 8))
-  {
+  if (!strncmp("//stock/", iconPath.get(), 8)) {
     mStockIcon.Assign(Substring(iconPath, 8));
     // An icon identifier must always be specified.
-    if (mStockIcon.IsEmpty())
+    if (mStockIcon.IsEmpty()) {
       return NS_ERROR_MALFORMED_URI;
+    }
     return NS_OK;
   }
 
-  if (StringBeginsWith(iconPath, NS_LITERAL_CSTRING("//")))
-  {
+  if (StringBeginsWith(iconPath, NS_LITERAL_CSTRING("//"))) {
     // Sanity check this supposed dummy file name.
-    if (iconPath.Length() > SANE_FILE_NAME_LEN)
+    if (iconPath.Length() > SANE_FILE_NAME_LEN) {
       return NS_ERROR_MALFORMED_URI;
+    }
     iconPath.Cut(0, 2);
     mFileName.Assign(iconPath);
   }
@@ -254,91 +246,92 @@
   nsCOMPtr<nsIURI> uri;
   ioService->NewURI(iconPath, nullptr, nullptr, getter_AddRefs(uri));
   mIconURL = do_QueryInterface(uri);
-  if (mIconURL)
+  if (mIconURL) {
     mFileName.Truncate();
-  else if (mFileName.IsEmpty())
+  } else if (mFileName.IsEmpty()) {
     return NS_ERROR_MALFORMED_URI;
+  }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetPrePath(nsACString &prePath)
+nsMozIconURI::GetPrePath(nsACString& prePath)
 {
   prePath = MOZICON_SCHEME;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetScheme(nsACString &aScheme)
+nsMozIconURI::GetScheme(nsACString& aScheme)
 {
   aScheme = "moz-icon";
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetScheme(const nsACString &aScheme)
+nsMozIconURI::SetScheme(const nsACString& aScheme)
 {
   // doesn't make sense to set the scheme of a moz-icon URL
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetUsername(nsACString &aUsername)
+nsMozIconURI::GetUsername(nsACString& aUsername)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetUsername(const nsACString &aUsername)
+nsMozIconURI::SetUsername(const nsACString& aUsername)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetPassword(nsACString &aPassword)
+nsMozIconURI::GetPassword(nsACString& aPassword)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetPassword(const nsACString &aPassword)
+nsMozIconURI::SetPassword(const nsACString& aPassword)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetUserPass(nsACString &aUserPass)
+nsMozIconURI::GetUserPass(nsACString& aUserPass)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetUserPass(const nsACString &aUserPass)
+nsMozIconURI::SetUserPass(const nsACString& aUserPass)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetHostPort(nsACString &aHostPort)
+nsMozIconURI::GetHostPort(nsACString& aHostPort)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetHostPort(const nsACString &aHostPort)
+nsMozIconURI::SetHostPort(const nsACString& aHostPort)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetHost(nsACString &aHost)
+nsMozIconURI::GetHost(nsACString& aHost)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetHost(const nsACString &aHost)
+nsMozIconURI::SetHost(const nsACString& aHost)
 {
   return NS_ERROR_FAILURE;
 }
@@ -348,7 +341,7 @@
 {
   return NS_ERROR_FAILURE;
 }
- 
+
 NS_IMETHODIMP
 nsMozIconURI::SetPort(int32_t aPort)
 {
@@ -356,33 +349,33 @@
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetPath(nsACString &aPath)
+nsMozIconURI::GetPath(nsACString& aPath)
 {
   aPath.Truncate();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetPath(const nsACString &aPath)
+nsMozIconURI::SetPath(const nsACString& aPath)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetRef(nsACString &aRef)
+nsMozIconURI::GetRef(nsACString& aRef)
 {
   aRef.Truncate();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetRef(const nsACString &aRef)
+nsMozIconURI::SetRef(const nsACString& aRef)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::Equals(nsIURI *other, bool *result)
+nsMozIconURI::Equals(nsIURI *other, bool* result)
 {
   NS_ENSURE_ARG_POINTER(other);
   NS_PRECONDITION(result, "null pointer");
@@ -392,15 +385,16 @@
 
   other->GetSpec(spec2);
   GetSpec(spec1);
-  if (!PL_strcasecmp(spec1.get(), spec2.get()))
+  if (!PL_strcasecmp(spec1.get(), spec2.get())) {
     *result = true;
-  else
+  } else {
     *result = false;
+  }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::EqualsExceptRef(nsIURI *other, bool *result)
+nsMozIconURI::EqualsExceptRef(nsIURI* other, bool* result)
 {
   // GetRef/SetRef not supported by nsMozIconURI, so
   // EqualsExceptRef() is the same as Equals().
@@ -408,31 +402,34 @@
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SchemeIs(const char *i_Scheme, bool *o_Equals)
+nsMozIconURI::SchemeIs(const char* aScheme, bool* aEquals)
 {
-  NS_ENSURE_ARG_POINTER(o_Equals);
-  if (!i_Scheme) return NS_ERROR_INVALID_ARG;
-  
-  *o_Equals = PL_strcasecmp("moz-icon", i_Scheme) ? false : true;
+  NS_ENSURE_ARG_POINTER(aEquals);
+  if (!aScheme) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  *aEquals = PL_strcasecmp("moz-icon", aScheme) ? false : true;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::Clone(nsIURI **result)
+nsMozIconURI::Clone(nsIURI** result)
 {
   nsCOMPtr<nsIURL> newIconURL;
-  if (mIconURL)
-  {
+  if (mIconURL) {
     nsCOMPtr<nsIURI> newURI;
     nsresult rv = mIconURL->Clone(getter_AddRefs(newURI));
-    if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
       return rv;
+    }
     newIconURL = do_QueryInterface(newURI, &rv);
-    if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
       return rv;
+    }
   }
 
-  nsMozIconURI *uri = new nsMozIconURI();
+  nsMozIconURI* uri = new nsMozIconURI();
   newIconURL.swap(uri->mIconURL);
   uri->mSize = mSize;
   uri->mContentType = mContentType;
@@ -446,7 +443,7 @@
 }
 
 NS_IMETHODIMP
-nsMozIconURI::CloneIgnoringRef(nsIURI **result)
+nsMozIconURI::CloneIgnoringRef(nsIURI** result)
 {
   // GetRef/SetRef not supported by nsMozIconURI, so
   // CloneIgnoringRef() is the same as Clone().
@@ -454,25 +451,25 @@
 }
 
 NS_IMETHODIMP
-nsMozIconURI::Resolve(const nsACString &relativePath, nsACString &result)
+nsMozIconURI::Resolve(const nsACString& relativePath, nsACString& result)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetAsciiSpec(nsACString &aSpecA)
+nsMozIconURI::GetAsciiSpec(nsACString& aSpecA)
 {
   return GetSpec(aSpecA);
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetAsciiHost(nsACString &aHostA)
+nsMozIconURI::GetAsciiHost(nsACString& aHostA)
 {
   return GetHost(aHostA);
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetOriginCharset(nsACString &result)
+nsMozIconURI::GetOriginCharset(nsACString& result)
 {
   result.Truncate();
   return NS_OK;
@@ -482,7 +479,7 @@
 // nsIIconUri methods:
 
 NS_IMETHODIMP
-nsMozIconURI::GetIconURL(nsIURL* * aFileUrl)
+nsMozIconURI::GetIconURL(nsIURL** aFileUrl)
 {
   *aFileUrl = mIconURL;
   NS_IF_ADDREF(*aFileUrl);
@@ -497,46 +494,45 @@
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetImageSize(uint32_t * aImageSize)  // measured by # of pixels in a row. defaults to 16.
+nsMozIconURI::GetImageSize(uint32_t * aImageSize)
+              // measured by # of pixels in a row. defaults to 16.
 {
   *aImageSize = mSize;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetImageSize(uint32_t aImageSize)  // measured by # of pixels in a row. defaults to 16.
+nsMozIconURI::SetImageSize(uint32_t aImageSize)
+              // measured by # of pixels in a row. defaults to 16.
 {
   mSize = aImageSize;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetContentType(nsACString &aContentType)
+nsMozIconURI::GetContentType(nsACString& aContentType)
 {
   aContentType = mContentType;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::SetContentType(const nsACString &aContentType) 
+nsMozIconURI::SetContentType(const nsACString& aContentType)
 {
   mContentType = aContentType;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetFileExtension(nsACString &aFileExtension)  
+nsMozIconURI::GetFileExtension(nsACString& aFileExtension)
 {
   // First, try to get the extension from mIconURL if we have one
-  if (mIconURL)
-  {
+  if (mIconURL) {
     nsAutoCString fileExt;
-    if (NS_SUCCEEDED(mIconURL->GetFileExtension(fileExt)))
-    {
-      if (!fileExt.IsEmpty())
-      {
-        // unfortunately, this code doesn't give us the required '.' in front of the extension
-        // so we have to do it ourselves..
+    if (NS_SUCCEEDED(mIconURL->GetFileExtension(fileExt))) {
+      if (!fileExt.IsEmpty()) {
+        // unfortunately, this code doesn't give us the required '.' in
+        // front of the extension so we have to do it ourselves.
         aFileExtension.Assign('.');
         aFileExtension.Append(fileExt);
       }
@@ -544,13 +540,13 @@
     return NS_OK;
   }
 
-  if (!mFileName.IsEmpty())
-  {
+  if (!mFileName.IsEmpty()) {
     // truncate the extension out of the file path...
-    const char * chFileName = mFileName.get(); // get the underlying buffer
-    const char * fileExt = strrchr(chFileName, '.');
-    if (!fileExt)
+    const char* chFileName = mFileName.get(); // get the underlying buffer
+    const char* fileExt = strrchr(chFileName, '.');
+    if (!fileExt) {
       return NS_OK;
+    }
     aFileExtension = fileExt;
   }
 
@@ -558,29 +554,31 @@
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetStockIcon(nsACString &aStockIcon)
+nsMozIconURI::GetStockIcon(nsACString& aStockIcon)
 {
   aStockIcon = mStockIcon;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetIconSize(nsACString &aSize)
+nsMozIconURI::GetIconSize(nsACString& aSize)
 {
-  if (mIconSize >= 0)
+  if (mIconSize >= 0) {
     aSize = kSizeStrings[mIconSize];
-  else
+  } else {
     aSize.Truncate();
+  }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetIconState(nsACString &aState)
+nsMozIconURI::GetIconState(nsACString& aState)
 {
-  if (mIconState >= 0)
+  if (mIconState >= 0) {
     aState = kStateStrings[mIconState];
-  else
+  } else {
     aState.Truncate();
+  }
   return NS_OK;
 }
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconURI.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconURI.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIconURI.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIconURI.h	2014-11-26 21:45:47.000000000 +0000
@@ -21,7 +21,7 @@
 
 class nsMozIconURI MOZ_FINAL : public nsIMozIconURI
 {
-public:    
+public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIURI
   NS_DECL_NSIMOZICONURI
@@ -32,12 +32,17 @@
 protected:
   virtual ~nsMozIconURI();
   nsCOMPtr<nsIURL> mIconURL; // a URL that we want the icon for
-  uint32_t mSize; // the # of pixels in a row that we want for this image. Typically 16, 32, 128, etc.
-  nsCString mContentType; // optional field explicitly specifying the content type
-  nsCString mFileName; // for if we don't have an actual file path, we're just given a filename with an extension
+  uint32_t mSize; // the # of pixels in a row that we want for this image.
+                  // Typically 16, 32, 128, etc.
+  nsCString mContentType; // optional field explicitly specifying the content
+                          // type
+  nsCString mFileName; // for if we don't have an actual file path, we're just
+                       // given a filename with an extension
   nsCString mStockIcon;
-  int32_t mIconSize;     // -1 if not specified, otherwise index into kSizeStrings
-  int32_t mIconState;    // -1 if not specified, otherwise index into kStateStrings
+  int32_t mIconSize;   // -1 if not specified, otherwise index into
+                       // kSizeStrings
+  int32_t mIconState;  // -1 if not specified, otherwise index into
+                       // kStateStrings
 };
 
 #endif // nsMozIconURI_h__
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIIconURI.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIIconURI.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/nsIIconURI.idl	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/nsIIconURI.idl	2014-11-26 21:45:47.000000000 +0000
@@ -14,21 +14,25 @@
    *
    * What *is* a moz-icon URI you ask?  Well, it has the following syntax:
    *
-   * moz-icon:[<valid-url> | //<file-with-extension> | //stock/<stock-icon>]? ['?'[<parameter-value-pairs>]]
+   * moz-icon:[<valid-url> | //<file-with-extension> | //stock/<stock-icon>]?
+   *            ['?'[<parameter-value-pairs>]]
    *
    * <valid-url> is a valid URL spec.
    *
    * <file-with-extension> is any filename with an extension, e.g. "dummy.html".
-   * If the file you want an icon for isn't known to exist, you can use this instead of a URL and just
-   * place a dummy file name with the extension or content type you want.
+   * If the file you want an icon for isn't known to exist, you can use this
+   * instead of a URL and just place a dummy file name with the extension or
+   * content type you want.
    *
    * <stock-icon> is the name of a platform-dependant stock icon.
    *
    * Legal parameter value pairs are listed below:
    *
    *   Parameter:   size
-   *   Values:      [<integer> | button | toolbar | toolbarsmall | menu | dialog]
-   *   Description: If integer, this is the desired size in square pixels of the icon
+   *   Values:      [<integer> | button | toolbar | toolbarsmall | menu |
+   *                 dialog]
+   *   Description: If integer, this is the desired size in square pixels of
+   *                the icon
    *                Else, use the OS default for the specified keyword context.
    *
    *   Parameter:   state
@@ -37,59 +41,31 @@
    *
    *   Parameter:   contentType
    *   Values:      <mime-type>
-   *   Description: The mime type we want an icon for. This is ignored by stock images.
+   *   Description: The mime type we want an icon for. This is ignored by
+   *                stock images.
    */
 
 [scriptable, uuid(da53adda-cbe3-41bc-a57d-fdd7a0ff448b)]
-interface nsIMozIconURI : nsIURI 
+interface nsIMozIconURI : nsIURI
 {
-  /**
-   * iconFile
-   *
-   * the file URL contained within this moz-icon url, or null.
-   */
+  /// iconFile: the file URL contained within this moz-icon url, or null.
   attribute nsIURL iconURL;
 
-  /**
-   * imageSize
-   *
-   * The image area in square pixels, defaulting to 16 if unspecified.
-   */
+  /// imageSize: The image area in square pixels, defaults to 16 if unspecified.
   attribute unsigned long imageSize;
 
-  /**
-   * stockIcon
-   *
-   * The stock icon name requested from the OS.
-   */
+  /// stockIcon: The stock icon name requested from the OS.
    readonly attribute ACString stockIcon;
 
-  /**
-   * iconSize
-   *
-   * The stock icon size requested from the OS.
-   */
+  /// iconSize: The stock icon size requested from the OS.
    readonly attribute ACString iconSize;
 
-  /**
-   * iconState
-   *
-   * The stock icon state requested from the OS.
-   */
+  /// iconState: The stock icon state requested from the OS.
    readonly attribute ACString iconState;
 
-  /**
-   * contentType
-   *
-   * A valid mime type, or the empty string.
-   */
-
+  /// contentType: A valid mime type, or the empty string.
   attribute ACString contentType;
 
-  /**
-   * fileExtension
-   *
-   * The file extension of the file which we are looking up.
-   */
+  /// fileExtension: The file extension of the file which we are looking up.
   readonly attribute ACString fileExtension;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/qt/gtkqticonsconverter.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/qt/gtkqticonsconverter.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/qt/gtkqticonsconverter.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/qt/gtkqticonsconverter.js	2014-11-26 21:45:47.000000000 +0000
@@ -6,28 +6,32 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 
-function GtkQtIconsConverter() { };
-GtkQtIconsConverter.prototype = {
+function GtkQtIconsConverter()
+{ };
+GtkQtIconsConverter.prototype =
+{
   classID:          Components.ID("{c0783c34-a831-40c6-8c03-98c9f74cca45}"),
-  QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIGtkQtIconsConverter]),
+  QueryInterface: XPCOMUtils.generateQI(
+                                [Components.interfaces.nsIGtkQtIconsConverter]),
   convert: function(icon) { return this._gtk_qt_icons_table[icon]; },
-  _gtk_qt_icons_table: {
+  _gtk_qt_icons_table:
+  {
     'about':
     0,
     'add':
     0,
     'apply':
-    44, /* QStyle::SP_DialogApplyButton */
+    44, // QStyle::SP_DialogApplyButton
     'cancel':
-    39, /* QStyle::SP_DialogCancelButton */
+    39, // QStyle::SP_DialogCancelButton
     'clear':
-    45, /* QStyle::SP_DialogResetButton  */
+    45, // QStyle::SP_DialogResetButton
     'color-picker':
     0,
     'copy':
     0,
     'close':
-    43, /* QStyle::SP_DialogCloseButton */
+    43, // QStyle::SP_DialogCloseButton
     'cut':
     0,
     'delete':
@@ -37,39 +41,39 @@
     'dialog-info':
     0,
     'dialog-question':
-    12, /* QStyle::SP_MessageBoxQuestion */
+    12, // QStyle::SP_MessageBoxQuestion
     'dialog-warning':
-    10, /* QStyle::SP_MessageBoxWarning */
+    10, // QStyle::SP_MessageBoxWarning
     'directory':
-    37, /* QStyle::SP_DirIcon */
+    37, // QStyle::SP_DirIcon
     'file':
-    24, /* QStyle::SP_FileIcon */
+    24, // QStyle::SP_FileIcon
     'find':
     0,
     'go-back-ltr':
-    53, /* QStyle::SP_ArrowBack */
+    53, // QStyle::SP_ArrowBack
     'go-back-rtl':
-    53, /* QStyle::SP_ArrowBack */
+    53, // QStyle::SP_ArrowBack
     'go-back':
-    53, /* QStyle::SP_ArrowBack */
+    53, // QStyle::SP_ArrowBack
     'go-forward-ltr':
-    54, /* QStyle::SP_ArrowForward */
+    54, // QStyle::SP_ArrowForward
     'go-forward-rtl':
-    54, /* QStyle::SP_ArrowForward */
+    54, // QStyle::SP_ArrowForward
     'go-forward':
-    54, /* QStyle::SP_ArrowForward */
+    54, // QStyle::SP_ArrowForward
     'go-up':
-    49, /* QStyle::SP_ArrowUp */
+    49, // QStyle::SP_ArrowUp
     'goto-first':
     0,
     'goto-last':
     0,
     'help':
-    7, /* QStyle::SP_TitleBarContextHelpButton */
+    7, // QStyle::SP_TitleBarContextHelpButton
     'home':
-    55, /* QStyle::SP_DirHomeIcon */
+    55, // QStyle::SP_DirHomeIcon
     'info':
-    9, /* QStyle::SP_MessageBoxInformation */
+    9, // QStyle::SP_MessageBoxInformation
     'jump-to':
     0,
     'media-pause':
@@ -77,13 +81,13 @@
     'media-play':
     0,
     'network':
-    20, /* QStyle::SP_DriveNetIcon */
+    20, // QStyle::SP_DriveNetIcon
     'no':
-    48, /* QStyle::SP_DialogNoButton */
+    48, // QStyle::SP_DialogNoButton
     'ok':
-    38, /* QStyle::SP_DialogOkButton */
+    38, // QStyle::SP_DialogOkButton
     'open':
-    21, /* QStyle::SP_DirOpenIcon */
+    21, // QStyle::SP_DirOpenIcon
     'orientation-landscape':
     0,
     'orientation-portrait':
@@ -91,7 +95,7 @@
     'paste':
     0,
     'preferences':
-    34, /* QStyle::SP_FileDialogContentsView */
+    34, // QStyle::SP_FileDialogContentsView
     'print-preview':
     0,
     'print':
@@ -103,27 +107,27 @@
     'redo':
     0,
     'refresh':
-    58, /* QStyle::SP_BrowserReload */
+    58, // QStyle::SP_BrowserReload
     'remove':
     0,
     'revert-to-saved':
     0,
     'save-as':
-    42, /* QStyle::SP_DialogSaveButton */
+    42, // QStyle::SP_DialogSaveButton
     'save':
-    42, /* QStyle::SP_DialogSaveButton */
+    42, // QStyle::SP_DialogSaveButton
     'select-all':
     0,
     'select-font':
     0,
     'stop':
-    59, /* QStyle::SP_BrowserStop */
+    59, // QStyle::SP_BrowserStop
     'undelete':
     0,
     'undo':
     0,
     'yes':
-    47, /* QStyle::SP_DialogYesButton */
+    47, // QStyle::SP_DialogYesButton
     'zoom-100':
     0,
     'zoom-in':
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/qt/nsIconChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/qt/nsIconChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/qt/nsIconChannel.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/qt/nsIconChannel.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -27,8 +27,8 @@
                   nsIChannel)
 
 static nsresult
-moz_qicon_to_channel(QImage *image, nsIURI *aURI,
-                     nsIChannel **aChannel)
+moz_qicon_to_channel(QImage* image, nsIURI* aURI,
+                     nsIChannel** aChannel)
 {
   NS_ENSURE_ARG_POINTER(image);
 
@@ -40,18 +40,18 @@
 
   const int n_channels = 4;
   long int buf_size = 2 + n_channels * height * width;
-  uint8_t * const buf = (uint8_t*)NS_Alloc(buf_size);
+  uint8_t* const buf = (uint8_t*)NS_Alloc(buf_size);
   NS_ENSURE_TRUE(buf, NS_ERROR_OUT_OF_MEMORY);
-  uint8_t *out = buf;
+  uint8_t* out = buf;
 
   *(out++) = width;
   *(out++) = height;
 
-  const uchar * const pixels = image->bits();
+  const uchar* const pixels = image->bits();
   int rowextra = image->bytesPerLine() - width * n_channels;
 
   // encode the RGB data and the A data
-  const uchar * in = pixels;
+  const uchar* in = pixels;
   for (int y = 0; y < height; ++y, in += rowextra) {
     for (int x = 0; x < width; ++x) {
       uint8_t r = *(in++);
@@ -117,10 +117,14 @@
   iconURI->GetIconState(iconStateString);
   bool disabled = iconStateString.EqualsLiteral("disabled");
 
-  // This is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=662299
-  // Try to find corresponding freedesktop icon and fallback to empty QIcon if failed.
-  QIcon icon = QIcon::fromTheme(QString(stockIcon.get()).replace("gtk-", "edit-"));
-  QPixmap pixmap = icon.pixmap(desiredImageSize, desiredImageSize, disabled ? QIcon::Disabled : QIcon::Normal);
+  // This is a workaround for
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=662299
+  // Try to find corresponding freedesktop icon and fallback to empty QIcon
+  // if failed.
+  QIcon icon = QIcon::fromTheme(QString(stockIcon.get()).replace("gtk-",
+                                                                 "edit-"));
+  QPixmap pixmap = icon.pixmap(desiredImageSize, desiredImageSize,
+                               disabled ? QIcon::Disabled : QIcon::Normal);
 
   QImage image = pixmap.toImage();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/qt/nsIconChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/qt/nsIconChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/qt/nsIconChannel.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/qt/nsIconChannel.h	2014-11-26 21:45:47.000000000 +0000
@@ -14,32 +14,26 @@
 #include "nsIIconURI.h"
 #include "nsCOMPtr.h"
 
-/**
- * This class is the gnome implementation of nsIconChannel. It basically asks
- * qt for an icon, and creates a new channel for
- * that file to which all calls will be proxied.
- */
+/// This class is the gnome implementation of nsIconChannel. It basically asks
+/// qt for an icon, and creates a new channel for
+/// that file to which all calls will be proxied.
 class nsIconChannel MOZ_FINAL : public nsIChannel {
   public:
     NS_DECL_ISUPPORTS
     NS_FORWARD_NSIREQUEST(mRealChannel->)
     NS_FORWARD_NSICHANNEL(mRealChannel->)
 
-    nsIconChannel() {};
+    nsIconChannel() { };
 
-    /**
-     * Called by nsIconProtocolHandler after it creates this channel.
-     * Must be called before calling any other function on this object.
-     * If this method fails, no other function must be called on this object.
-     */
+    /// Called by nsIconProtocolHandler after it creates this channel.
+    /// Must be called before calling any other function on this object.
+    /// If this method fails, no other function must be called on this object.
     nsresult Init(nsIURI* aURI);
   private:
-    ~nsIconChannel() {};
+    ~nsIconChannel() { };
 
-    /**
-     * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
-     * Will always be non-null after a successful Init.
-     */
+    /// The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
+    /// Will always be non-null after a successful Init.
     nsCOMPtr<nsIChannel> mRealChannel;
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/win/nsIconChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/win/nsIconChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/win/nsIconChannel.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/win/nsIconChannel.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -57,9 +57,11 @@
 };
 
 // Match stock icons with names
-static SHSTOCKICONID GetStockIconIDForName(const nsACString &aStockName)
+static SHSTOCKICONID
+GetStockIconIDForName(const nsACString& aStockName)
 {
-  return aStockName.EqualsLiteral("uac-shield") ? SIID_SHIELD : SIID_INVALID;
+  return aStockName.EqualsLiteral("uac-shield") ? SIID_SHIELD :
+                                                  SIID_INVALID;
 }
 
 // nsIconChannel methods
@@ -67,25 +69,26 @@
 {
 }
 
-nsIconChannel::~nsIconChannel() 
+nsIconChannel::~nsIconChannel()
 {
   if (mLoadInfo) {
     nsCOMPtr<nsIThread> mainThread;
     NS_GetMainThread(getter_AddRefs(mainThread));
 
-    nsILoadInfo *forgetableLoadInfo;
+    nsILoadInfo* forgetableLoadInfo;
     mLoadInfo.forget(&forgetableLoadInfo);
     NS_ProxyRelease(mainThread, forgetableLoadInfo, false);
   }
 }
 
-NS_IMPL_ISUPPORTS(nsIconChannel, 
-                  nsIChannel, 
+NS_IMPL_ISUPPORTS(nsIconChannel,
+                  nsIChannel,
                   nsIRequest,
                   nsIRequestObserver,
                   nsIStreamListener)
 
-nsresult nsIconChannel::Init(nsIURI* uri)
+nsresult
+nsIconChannel::Init(nsIURI* uri)
 {
   NS_ASSERTION(uri, "no uri");
   mUrl = uri;
@@ -98,54 +101,64 @@
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
 
-NS_IMETHODIMP nsIconChannel::GetName(nsACString &result)
+NS_IMETHODIMP
+nsIconChannel::GetName(nsACString& result)
 {
   return mUrl->GetSpec(result);
 }
 
-NS_IMETHODIMP nsIconChannel::IsPending(bool *result)
+NS_IMETHODIMP
+nsIconChannel::IsPending(bool* result)
 {
   return mPump->IsPending(result);
 }
 
-NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
+NS_IMETHODIMP
+nsIconChannel::GetStatus(nsresult* status)
 {
   return mPump->GetStatus(status);
 }
 
-NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
+NS_IMETHODIMP
+nsIconChannel::Cancel(nsresult status)
 {
   return mPump->Cancel(status);
 }
 
-NS_IMETHODIMP nsIconChannel::Suspend(void)
+NS_IMETHODIMP
+nsIconChannel::Suspend(void)
 {
   return mPump->Suspend();
 }
 
-NS_IMETHODIMP nsIconChannel::Resume(void)
+NS_IMETHODIMP
+nsIconChannel::Resume(void)
 {
   return mPump->Resume();
 }
-NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+NS_IMETHODIMP
+nsIconChannel::GetLoadGroup(nsILoadGroup** aLoadGroup)
 {
   *aLoadGroup = mLoadGroup;
   NS_IF_ADDREF(*aLoadGroup);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+NS_IMETHODIMP
+nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
 {
   mLoadGroup = aLoadGroup;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetLoadFlags(uint32_t *aLoadAttributes)
+NS_IMETHODIMP
+nsIconChannel::GetLoadFlags(uint32_t* aLoadAttributes)
 {
   return mPump->GetLoadFlags(aLoadAttributes);
 }
 
-NS_IMETHODIMP nsIconChannel::SetLoadFlags(uint32_t aLoadAttributes)
+NS_IMETHODIMP
+nsIconChannel::SetLoadFlags(uint32_t aLoadAttributes)
 {
   return mPump->SetLoadFlags(aLoadAttributes);
 }
@@ -153,21 +166,24 @@
 ////////////////////////////////////////////////////////////////////////////////
 // nsIChannel methods:
 
-NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
+NS_IMETHODIMP
+nsIconChannel::GetOriginalURI(nsIURI** aURI)
 {
   *aURI = mOriginalURI;
   NS_ADDREF(*aURI);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
+NS_IMETHODIMP
+nsIconChannel::SetOriginalURI(nsIURI* aURI)
 {
   NS_ENSURE_ARG_POINTER(aURI);
   mOriginalURI = aURI;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
+NS_IMETHODIMP
+nsIconChannel::GetURI(nsIURI** aURI)
 {
   *aURI = mUrl;
   NS_IF_ADDREF(*aURI);
@@ -175,12 +191,15 @@
 }
 
 NS_IMETHODIMP
-nsIconChannel::Open(nsIInputStream **_retval)
+nsIconChannel::Open(nsIInputStream** _retval)
 {
   return MakeInputStream(_retval, false);
 }
 
-nsresult nsIconChannel::ExtractIconInfoFromUrl(nsIFile ** aLocalFile, uint32_t * aDesiredImageSize, nsCString &aContentType, nsCString &aFileExtension)
+nsresult
+nsIconChannel::ExtractIconInfoFromUrl(nsIFile** aLocalFile,
+                        uint32_t* aDesiredImageSize, nsCString& aContentType,
+                        nsCString& aFileExtension)
 {
   nsresult rv = NS_OK;
   nsCOMPtr<nsIMozIconURI> iconURI (do_QueryInterface(mUrl, &rv));
@@ -204,51 +223,62 @@
   return file->Clone(aLocalFile);
 }
 
-NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
+NS_IMETHODIMP
+nsIconChannel::AsyncOpen(nsIStreamListener* aListener,
+                                       nsISupports* ctxt)
 {
   nsCOMPtr<nsIInputStream> inStream;
   nsresult rv = MakeInputStream(getter_AddRefs(inStream), true);
-  if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
     return rv;
+  }
 
   // Init our streampump
   rv = mPump->Init(inStream, int64_t(-1), int64_t(-1), 0, 0, false);
-  if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
     return rv;
+  }
 
   rv = mPump->AsyncRead(this, ctxt);
   if (NS_SUCCEEDED(rv)) {
     // Store our real listener
     mListener = aListener;
     // Add ourself to the load group, if available
-    if (mLoadGroup)
+    if (mLoadGroup) {
       mLoadGroup->AddRequest(this, nullptr);
+    }
   }
   return rv;
 }
 
-static DWORD GetSpecialFolderIcon(nsIFile* aFile, int aFolder, SHFILEINFOW* aSFI, UINT aInfoFlags)
+static DWORD
+GetSpecialFolderIcon(nsIFile* aFile, int aFolder,
+                                  SHFILEINFOW* aSFI, UINT aInfoFlags)
 {
   DWORD shellResult = 0;
 
-  if (!aFile)
+  if (!aFile) {
     return shellResult;
+  }
 
   wchar_t fileNativePath[MAX_PATH];
   nsAutoString fileNativePathStr;
   aFile->GetPath(fileNativePathStr);
-  ::GetShortPathNameW(fileNativePathStr.get(), fileNativePath, ArrayLength(fileNativePath));
+  ::GetShortPathNameW(fileNativePathStr.get(), fileNativePath,
+                      ArrayLength(fileNativePath));
 
   LPITEMIDLIST idList;
   HRESULT hr = ::SHGetSpecialFolderLocation(nullptr, aFolder, &idList);
   if (SUCCEEDED(hr)) {
     wchar_t specialNativePath[MAX_PATH];
     ::SHGetPathFromIDListW(idList, specialNativePath);
-    ::GetShortPathNameW(specialNativePath, specialNativePath, ArrayLength(specialNativePath));
-  
+    ::GetShortPathNameW(specialNativePath, specialNativePath,
+                        ArrayLength(specialNativePath));
+
     if (!wcsicmp(fileNativePath, specialNativePath)) {
       aInfoFlags |= (SHGFI_PIDL | SHGFI_SYSICONINDEX);
-      shellResult = ::SHGetFileInfoW((LPCWSTR)(LPCITEMIDLIST)idList, 0, aSFI,
+      shellResult = ::SHGetFileInfoW((LPCWSTR)(LPCITEMIDLIST)idList, 0,
+                                      aSFI,
                                      sizeof(*aSFI), aInfoFlags);
     }
   }
@@ -256,62 +286,64 @@
   return shellResult;
 }
 
-static UINT GetSizeInfoFlag(uint32_t aDesiredImageSize)
+static UINT
+GetSizeInfoFlag(uint32_t aDesiredImageSize)
 {
-  UINT infoFlag;
-  if (aDesiredImageSize > 16)
-    infoFlag = SHGFI_SHELLICONSIZE;
-  else
-    infoFlag = SHGFI_SMALLICON;
-
-  return infoFlag;
+  return
+    (UINT) (aDesiredImageSize > 16 ? SHGFI_SHELLICONSIZE : SHGFI_SMALLICON);
 }
 
-nsresult nsIconChannel::GetHIconFromFile(HICON *hIcon)
+nsresult
+nsIconChannel::GetHIconFromFile(HICON* hIcon)
 {
   nsXPIDLCString contentType;
   nsCString fileExt;
   nsCOMPtr<nsIFile> localFile; // file we want an icon for
   uint32_t desiredImageSize;
-  nsresult rv = ExtractIconInfoFromUrl(getter_AddRefs(localFile), &desiredImageSize, contentType, fileExt);
+  nsresult rv = ExtractIconInfoFromUrl(getter_AddRefs(localFile),
+                                       &desiredImageSize, contentType,
+                                       fileExt);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // if the file exists, we are going to use it's real attributes...otherwise we only want to use it for it's extension...
+  // if the file exists, we are going to use it's real attributes...
+  // otherwise we only want to use it for it's extension...
   SHFILEINFOW      sfi;
   UINT infoFlags = SHGFI_ICON;
-  
+
   bool fileExists = false;
- 
+
   nsAutoString filePath;
   CopyASCIItoUTF16(fileExt, filePath);
-  if (localFile)
-  {
+  if (localFile) {
     rv = localFile->Normalize();
     NS_ENSURE_SUCCESS(rv, rv);
 
     localFile->GetPath(filePath);
-    if (filePath.Length() < 2 || filePath[1] != ':')
+    if (filePath.Length() < 2 || filePath[1] != ':') {
       return NS_ERROR_MALFORMED_URI; // UNC
+    }
 
-    if (filePath.Last() == ':')
+    if (filePath.Last() == ':') {
       filePath.Append('\\');
-    else {
+    } else {
       localFile->Exists(&fileExists);
-      if (!fileExists)
+      if (!fileExists) {
        localFile->GetLeafName(filePath);
+      }
     }
   }
 
-  if (!fileExists)
+  if (!fileExists) {
    infoFlags |= SHGFI_USEFILEATTRIBUTES;
+  }
 
   infoFlags |= GetSizeInfoFlag(desiredImageSize);
 
-  // if we have a content type... then use it! but for existing files, we want
-  // to show their real icon.
-  if (!fileExists && !contentType.IsEmpty())
-  {
-    nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
+  // if we have a content type... then use it! but for existing files,
+  // we want to show their real icon.
+  if (!fileExists && !contentType.IsEmpty()) {
+    nsCOMPtr<nsIMIMEService> mimeService
+      (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsAutoCString defFileExt;
@@ -319,53 +351,63 @@
     // If the mime service does not know about this mime type, we show
     // the generic icon.
     // In any case, we need to insert a '.' before the extension.
-    filePath = NS_LITERAL_STRING(".") + NS_ConvertUTF8toUTF16(defFileExt);
+    filePath = NS_LITERAL_STRING(".") +
+               NS_ConvertUTF8toUTF16(defFileExt);
   }
 
   // Is this the "Desktop" folder?
-  DWORD shellResult = GetSpecialFolderIcon(localFile, CSIDL_DESKTOP, &sfi, infoFlags);
+  DWORD shellResult = GetSpecialFolderIcon(localFile, CSIDL_DESKTOP,
+                                           &sfi, infoFlags);
   if (!shellResult) {
     // Is this the "My Documents" folder?
-    shellResult = GetSpecialFolderIcon(localFile, CSIDL_PERSONAL, &sfi, infoFlags);
+    shellResult = GetSpecialFolderIcon(localFile, CSIDL_PERSONAL,
+                                       &sfi, infoFlags);
   }
 
-  // There are other "Special Folders" and Namespace entities that we are not 
-  // fetching icons for, see: 
-  // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/enums/csidl.asp
-  // If we ever need to get them, code to do so would be inserted here. 
+  // There are other "Special Folders" and Namespace entities that we
+  // are not fetching icons for, see:
+  // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/
+  //        shellcc/platform/shell/reference/enums/csidl.asp
+  // If we ever need to get them, code to do so would be inserted here.
 
   // Not a special folder, or something else failed above.
-  if (!shellResult)
+  if (!shellResult) {
     shellResult = ::SHGetFileInfoW(filePath.get(),
-                                   FILE_ATTRIBUTE_ARCHIVE, &sfi, sizeof(sfi), infoFlags);
+                                   FILE_ATTRIBUTE_ARCHIVE,
+                                   &sfi, sizeof(sfi), infoFlags);
+  }
 
-  if (shellResult && sfi.hIcon)
+  if (shellResult && sfi.hIcon) {
     *hIcon = sfi.hIcon;
-  else
+  } else {
     rv = NS_ERROR_NOT_AVAILABLE;
+  }
 
   return rv;
 }
 
-nsresult nsIconChannel::GetStockHIcon(nsIMozIconURI *aIconURI, HICON *hIcon)
+nsresult
+nsIconChannel::GetStockHIcon(nsIMozIconURI* aIconURI,
+                                      HICON* hIcon)
 {
   nsresult rv = NS_OK;
 
   // We can only do this on Vista or above
   HMODULE hShellDLL = ::LoadLibraryW(L"shell32.dll");
   decltype(SHGetStockIconInfo)* pSHGetStockIconInfo =
-    (decltype(SHGetStockIconInfo)*) ::GetProcAddress(hShellDLL, "SHGetStockIconInfo");
+    (decltype(SHGetStockIconInfo)*) ::GetProcAddress(hShellDLL,
+                                                    "SHGetStockIconInfo");
 
-  if (pSHGetStockIconInfo)
-  {
+  if (pSHGetStockIconInfo) {
     uint32_t desiredImageSize;
     aIconURI->GetImageSize(&desiredImageSize);
     nsAutoCString stockIcon;
     aIconURI->GetStockIcon(stockIcon);
 
     SHSTOCKICONID stockIconID = GetStockIconIDForName(stockIcon);
-    if (stockIconID == SIID_INVALID)
+    if (stockIconID == SIID_INVALID) {
       return NS_ERROR_NOT_AVAILABLE;
+    }
 
     UINT infoFlags = SHGSI_ICON;
     infoFlags |= GetSizeInfoFlag(desiredImageSize);
@@ -374,24 +416,25 @@
     sii.cbSize = sizeof(sii);
     HRESULT hr = pSHGetStockIconInfo(stockIconID, infoFlags, &sii);
 
-    if (SUCCEEDED(hr))
+    if (SUCCEEDED(hr)) {
       *hIcon = sii.hIcon;
-    else
+    } else {
       rv = NS_ERROR_FAILURE;
-  }
-  else
-  {
+    }
+  } else {
     rv = NS_ERROR_NOT_AVAILABLE;
   }
 
-  if (hShellDLL)
+  if (hShellDLL) {
     ::FreeLibrary(hShellDLL);
+  }
 
   return rv;
 }
 
 // Given a BITMAPINFOHEADER, returns the size of the color table.
-static int GetColorTableSize(BITMAPINFOHEADER* aHeader)
+static int
+GetColorTableSize(BITMAPINFOHEADER* aHeader)
 {
   int colorTableSize = -1;
 
@@ -404,24 +447,24 @@
     colorTableSize = 2 * sizeof(RGBQUAD);
     break;
   case 4:
-  case 8:
-  {
+  case 8: {
     // The maximum possible size for the color table is 2**bpp, so check for
     // that and fail if we're not in those bounds
     unsigned int maxEntries = 1 << (aHeader->biBitCount);
-    if (aHeader->biClrUsed > 0 && aHeader->biClrUsed <= maxEntries)
+    if (aHeader->biClrUsed > 0 && aHeader->biClrUsed <= maxEntries) {
       colorTableSize = aHeader->biClrUsed * sizeof(RGBQUAD);
-    else if (aHeader->biClrUsed == 0)
+    } else if (aHeader->biClrUsed == 0) {
       colorTableSize = maxEntries * sizeof(RGBQUAD);
+    }
     break;
   }
   case 16:
   case 32:
     // If we have BI_BITFIELDS compression, we would normally need 3 DWORDS for
-    // the bitfields mask which would be stored in the color table; However, 
+    // the bitfields mask which would be stored in the color table; However,
     // we instead force the bitmap to request data of type BI_RGB so the color
-    // table should be of size 0.  
-    // Setting aHeader->biCompression = BI_RGB forces the later call to 
+    // table should be of size 0.
+    // Setting aHeader->biCompression = BI_RGB forces the later call to
     // GetDIBits to return to us BI_RGB data.
     if (aHeader->biCompression == BI_BITFIELDS) {
       aHeader->biCompression = BI_RGB;
@@ -433,16 +476,17 @@
     break;
   }
 
-  if (colorTableSize < 0)
+  if (colorTableSize < 0) {
     NS_WARNING("Unable to figure out the color table size for this bitmap");
+  }
 
   return colorTableSize;
 }
 
 // Given a header and a size, creates a freshly allocated BITMAPINFO structure.
 // It is the caller's responsibility to null-check and delete the structure.
-static BITMAPINFO* CreateBitmapInfo(BITMAPINFOHEADER* aHeader,
-                                    size_t aColorTableSize)
+static BITMAPINFO*
+CreateBitmapInfo(BITMAPINFOHEADER* aHeader, size_t aColorTableSize)
 {
   BITMAPINFO* bmi = (BITMAPINFO*) ::operator new(sizeof(BITMAPINFOHEADER) +
                                                  aColorTableSize,
@@ -454,7 +498,8 @@
   return bmi;
 }
 
-nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, bool nonBlocking)
+nsresult
+nsIconChannel::MakeInputStream(nsIInputStream** _retval, bool aNonBlocking)
 {
   // Check whether the icon requested's a file icon or a stock icon
   nsresult rv = NS_ERROR_NOT_AVAILABLE;
@@ -467,26 +512,29 @@
 
   nsAutoCString stockIcon;
   iconURI->GetStockIcon(stockIcon);
-  if (!stockIcon.IsEmpty())
+  if (!stockIcon.IsEmpty()) {
     rv = GetStockHIcon(iconURI, &hIcon);
-  else
+  } else {
     rv = GetHIconFromFile(&hIcon);
+  }
 
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (hIcon)
-  {
-    // we got a handle to an icon. Now we want to get a bitmap for the icon using GetIconInfo....
+  if (hIcon) {
+    // we got a handle to an icon. Now we want to get a bitmap for the icon
+    // using GetIconInfo....
     ICONINFO iconInfo;
-    if (GetIconInfo(hIcon, &iconInfo))
-    {
+    if (GetIconInfo(hIcon, &iconInfo)) {
       // we got the bitmaps, first find out their size
-      HDC hDC = CreateCompatibleDC(nullptr); // get a device context for the screen.
+      HDC hDC = CreateCompatibleDC(nullptr); // get a device context for
+                                             // the screen.
       BITMAPINFOHEADER maskHeader  = {sizeof(BITMAPINFOHEADER)};
       BITMAPINFOHEADER colorHeader = {sizeof(BITMAPINFOHEADER)};
       int colorTableSize, maskTableSize;
-      if (GetDIBits(hDC, iconInfo.hbmMask,  0, 0, nullptr, (BITMAPINFO*)&maskHeader,  DIB_RGB_COLORS) &&
-          GetDIBits(hDC, iconInfo.hbmColor, 0, 0, nullptr, (BITMAPINFO*)&colorHeader, DIB_RGB_COLORS) &&
+      if (GetDIBits(hDC, iconInfo.hbmMask,  0, 0, nullptr,
+                    (BITMAPINFO*)&maskHeader,  DIB_RGB_COLORS) &&
+          GetDIBits(hDC, iconInfo.hbmColor, 0, 0, nullptr,
+                    (BITMAPINFO*)&colorHeader, DIB_RGB_COLORS) &&
           maskHeader.biHeight == colorHeader.biHeight &&
           maskHeader.biWidth  == colorHeader.biWidth  &&
           colorHeader.biBitCount > 8 &&
@@ -502,11 +550,11 @@
                             colorHeader.biSizeImage +
                             maskHeader.biSizeImage;
 
-        char *buffer = new char[iconSize];
-        if (!buffer)
+        char* buffer = new char[iconSize];
+        if (!buffer) {
           rv = NS_ERROR_OUT_OF_MEMORY;
-        else {
-          char *whereTo = buffer;
+        } else {
+          char* whereTo = buffer;
           int howMuch;
 
           // the data starts with an icon file header
@@ -545,8 +593,10 @@
           colorHeader.biSizeImage -= maskHeader.biSizeImage;
 
           // followed by the XOR bitmap data (colorHeader)
-          // (you'd expect the color table to come here, but it apparently doesn't)
-          BITMAPINFO* colorInfo = CreateBitmapInfo(&colorHeader, colorTableSize);
+          // (you'd expect the color table to come here, but it apparently
+          // doesn't)
+          BITMAPINFO* colorInfo = CreateBitmapInfo(&colorHeader,
+                                                   colorTableSize);
           if (colorInfo && GetDIBits(hDC, iconInfo.hbmColor, 0,
                                      colorHeader.biHeight, whereTo, colorInfo,
                                      DIB_RGB_COLORS)) {
@@ -560,8 +610,9 @@
               // Now, create a pipe and stuff our data into it
               nsCOMPtr<nsIInputStream> inStream;
               nsCOMPtr<nsIOutputStream> outStream;
-              rv = NS_NewPipe(getter_AddRefs(inStream), getter_AddRefs(outStream),
-                              iconSize, iconSize, nonBlocking);
+              rv = NS_NewPipe(getter_AddRefs(inStream),
+                              getter_AddRefs(outStream),
+                              iconSize, iconSize, aNonBlocking);
               if (NS_SUCCEEDED(rv)) {
                 uint32_t written;
                 rv = outStream->Write(buffer, iconSize, &written);
@@ -586,33 +637,35 @@
   } // if we got an hIcon
 
   // If we didn't make a stream, then fail.
-  if (!*_retval && NS_SUCCEEDED(rv))
+  if (!*_retval && NS_SUCCEEDED(rv)) {
     rv = NS_ERROR_NOT_AVAILABLE;
+  }
   return rv;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentType(nsACString &aContentType) 
+NS_IMETHODIMP
+nsIconChannel::GetContentType(nsACString& aContentType)
 {
   aContentType.AssignLiteral(IMAGE_ICO);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsIconChannel::SetContentType(const nsACString &aContentType)
+nsIconChannel::SetContentType(const nsACString& aContentType)
 {
   // It doesn't make sense to set the content-type on this type
   // of channel...
   return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentCharset(nsACString &aContentCharset) 
+NS_IMETHODIMP nsIconChannel::GetContentCharset(nsACString& aContentCharset)
 {
   aContentCharset.Truncate();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsIconChannel::SetContentCharset(const nsACString &aContentCharset)
+nsIconChannel::SetContentCharset(const nsACString& aContentCharset)
 {
   // It doesn't make sense to set the content-charset on this type
   // of channel...
@@ -620,7 +673,7 @@
 }
 
 NS_IMETHODIMP
-nsIconChannel::GetContentDisposition(uint32_t *aContentDisposition)
+nsIconChannel::GetContentDisposition(uint32_t* aContentDisposition)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
@@ -632,88 +685,107 @@
 }
 
 NS_IMETHODIMP
-nsIconChannel::GetContentDispositionFilename(nsAString &aContentDispositionFilename)
+nsIconChannel::
+  GetContentDispositionFilename(nsAString& aContentDispositionFilename)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
-nsIconChannel::SetContentDispositionFilename(const nsAString &aContentDispositionFilename)
+nsIconChannel::
+  SetContentDispositionFilename(const nsAString& aContentDispositionFilename)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
 NS_IMETHODIMP
-nsIconChannel::GetContentDispositionHeader(nsACString &aContentDispositionHeader)
+nsIconChannel::
+  GetContentDispositionHeader(nsACString& aContentDispositionHeader)
 {
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-NS_IMETHODIMP nsIconChannel::GetContentLength(int64_t *aContentLength)
+NS_IMETHODIMP
+nsIconChannel::GetContentLength(int64_t* aContentLength)
 {
   *aContentLength = mContentLength;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetContentLength(int64_t aContentLength)
+NS_IMETHODIMP
+nsIconChannel::SetContentLength(int64_t aContentLength)
 {
   NS_NOTREACHED("nsIconChannel::SetContentLength");
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
+NS_IMETHODIMP
+nsIconChannel::GetOwner(nsISupports** aOwner)
 {
   *aOwner = mOwner.get();
   NS_IF_ADDREF(*aOwner);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
+NS_IMETHODIMP
+nsIconChannel::SetOwner(nsISupports* aOwner)
 {
   mOwner = aOwner;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetLoadInfo(nsILoadInfo* *aLoadInfo)
+NS_IMETHODIMP
+nsIconChannel::GetLoadInfo(nsILoadInfo** aLoadInfo)
 {
   NS_IF_ADDREF(*aLoadInfo = mLoadInfo);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetLoadInfo(nsILoadInfo* aLoadInfo)
+NS_IMETHODIMP
+nsIconChannel::SetLoadInfo(nsILoadInfo* aLoadInfo)
 {
   mLoadInfo = aLoadInfo;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+NS_IMETHODIMP
+nsIconChannel::
+  GetNotificationCallbacks(nsIInterfaceRequestor** aNotificationCallbacks)
 {
   *aNotificationCallbacks = mCallbacks.get();
   NS_IF_ADDREF(*aNotificationCallbacks);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+NS_IMETHODIMP
+nsIconChannel::
+  SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
 {
   mCallbacks = aNotificationCallbacks;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
+NS_IMETHODIMP
+nsIconChannel::GetSecurityInfo(nsISupports** aSecurityInfo)
 {
   *aSecurityInfo = nullptr;
   return NS_OK;
 }
 
 // nsIRequestObserver methods
-NS_IMETHODIMP nsIconChannel::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
+NS_IMETHODIMP nsIconChannel::OnStartRequest(nsIRequest* aRequest,
+                                            nsISupports* aContext)
 {
-  if (mListener)
+  if (mListener) {
     return mListener->OnStartRequest(this, aContext);
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP nsIconChannel::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsresult aStatus)
+NS_IMETHODIMP
+nsIconChannel::OnStopRequest(nsIRequest* aRequest,
+                             nsISupports* aContext,
+                             nsresult aStatus)
 {
   if (mListener) {
     mListener->OnStopRequest(this, aContext, aStatus);
@@ -721,8 +793,9 @@
   }
 
   // Remove from load group
-  if (mLoadGroup)
+  if (mLoadGroup) {
     mLoadGroup->RemoveRequest(this, nullptr, aStatus);
+  }
 
   // Drop notification callbacks to prevent cycles.
   mCallbacks = nullptr;
@@ -731,13 +804,15 @@
 }
 
 // nsIStreamListener methods
-NS_IMETHODIMP nsIconChannel::OnDataAvailable(nsIRequest* aRequest,
-                                             nsISupports* aContext,
-                                             nsIInputStream* aStream,
-                                             uint64_t aOffset,
-                                             uint32_t aCount)
+NS_IMETHODIMP
+nsIconChannel::OnDataAvailable(nsIRequest* aRequest,
+                               nsISupports* aContext,
+                               nsIInputStream* aStream,
+                               uint64_t aOffset,
+                               uint32_t aCount)
 {
-  if (mListener)
+  if (mListener) {
     return mListener->OnDataAvailable(this, aContext, aStream, aOffset, aCount);
+  }
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/win/nsIconChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/win/nsIconChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/icon/win/nsIconChannel.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/icon/win/nsIconChannel.h	2014-11-26 21:45:47.000000000 +0000
@@ -46,19 +46,22 @@
   int64_t          mContentLength;
   nsCOMPtr<nsILoadGroup> mLoadGroup;
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
-  nsCOMPtr<nsISupports>  mOwner; 
+  nsCOMPtr<nsISupports>  mOwner;
   nsCOMPtr<nsILoadInfo>  mLoadInfo;
 
   nsCOMPtr<nsIInputStreamPump> mPump;
   nsCOMPtr<nsIStreamListener>  mListener;
 
-  nsresult ExtractIconInfoFromUrl(nsIFile ** aLocalFile, uint32_t * aDesiredImageSize, nsCString &aContentType, nsCString &aFileExtension);
-  nsresult GetHIconFromFile(HICON *hIcon);
+  nsresult ExtractIconInfoFromUrl(nsIFile** aLocalFile,
+                                  uint32_t* aDesiredImageSize,
+                                  nsCString& aContentType,
+                                  nsCString& aFileExtension);
+  nsresult GetHIconFromFile(HICON* hIcon);
   nsresult MakeInputStream(nsIInputStream** _retval, bool nonBlocking);
 
   // Functions specific to Vista and above
 protected:
-  nsresult GetStockHIcon(nsIMozIconURI *aIconURI, HICON *hIcon);
+  nsresult GetStockHIcon(nsIMozIconURI* aIconURI, HICON* hIcon);
 };
 
 #endif /* nsIconChannel_h___ */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsBMPDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsBMPDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsBMPDecoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsBMPDecoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -2,15 +2,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/. */
-/* I got the format description from http://www.daubnet.com/formats/BMP.html */
 
-/* This is a Cross-Platform BMP Decoder, which should work everywhere, including
- * Big-Endian machines like the PowerPC. */
+// I got the format description from http://www.daubnet.com/formats/BMP.html
+
+// This is a Cross-Platform BMP Decoder, which should work everywhere, including
+// Big-Endian machines like the PowerPC.
 
 #include <stdlib.h>
 
 #include "ImageLogging.h"
 #include "mozilla/Endian.h"
+#include "mozilla/Likely.h"
 #include "nsBMPDecoder.h"
 
 #include "nsIInputStream.h"
@@ -21,12 +23,13 @@
 namespace image {
 
 #ifdef PR_LOGGING
-static PRLogModuleInfo *
+static PRLogModuleInfo*
 GetBMPLog()
 {
-  static PRLogModuleInfo *sBMPLog;
-  if (!sBMPLog)
+  static PRLogModuleInfo* sBMPLog;
+  if (!sBMPLog) {
     sBMPLog = PR_NewLogModule("BMPDecoder");
+  }
   return sBMPLog;
 }
 #endif
@@ -35,7 +38,7 @@
 #define LINE(row) ((mBIH.height < 0) ? (-mBIH.height - (row)) : ((row) - 1))
 #define PIXEL_OFFSET(row, col) (LINE(row) * mBIH.width + col)
 
-nsBMPDecoder::nsBMPDecoder(RasterImage &aImage)
+nsBMPDecoder::nsBMPDecoder(RasterImage& aImage)
  : Decoder(aImage)
 {
   mColors = nullptr;
@@ -57,42 +60,42 @@
 }
 
 // Sets whether or not the BMP will use alpha data
-void 
-nsBMPDecoder::SetUseAlphaData(bool useAlphaData) 
+void
+nsBMPDecoder::SetUseAlphaData(bool useAlphaData)
 {
   mUseAlphaData = useAlphaData;
 }
 
 // Obtains the bits per pixel from the internal BIH header
-int32_t 
+int32_t
 nsBMPDecoder::GetBitsPerPixel() const
 {
   return mBIH.bpp;
 }
 
 // Obtains the width from the internal BIH header
-int32_t 
+int32_t
 nsBMPDecoder::GetWidth() const
 {
-  return mBIH.width; 
+  return mBIH.width;
 }
 
 // Obtains the abs-value of the height from the internal BIH header
-int32_t 
+int32_t
 nsBMPDecoder::GetHeight() const
 {
   return abs(mBIH.height);
 }
 
 // Obtains the internal output image buffer
-uint32_t* 
-nsBMPDecoder::GetImageData() 
+uint32_t*
+nsBMPDecoder::GetImageData()
 {
   return reinterpret_cast<uint32_t*>(mImageData);
 }
 
 // Obtains the size of the compressed image resource
-int32_t 
+int32_t
 nsBMPDecoder::GetCompressedImageSize() const
 {
   // For everything except BI_RGB the header field must be defined
@@ -103,6 +106,7 @@
   // mBIH.image_size isn't always filled for BI_RGB so calculate it manually
   // The pixel array size is calculated based on extra 4 byte boundary padding
   uint32_t rowSize = (mBIH.bpp * mBIH.width + 7) / 8; // + 7 to round up
+
   // Pad to DWORD Boundary
   if (rowSize % 4) {
     rowSize += (4 - (rowSize % 4));
@@ -116,8 +120,8 @@
 
 // Obtains whether or not a BMP file had alpha data in its 4th byte
 // for 32BPP bitmaps.  Only use after the bitmap has been processed.
-bool 
-nsBMPDecoder::HasAlphaData() const 
+bool
+nsBMPDecoder::HasAlphaData() const
 {
   return mHaveAlphaData;
 }
@@ -152,7 +156,8 @@
 // Actual Data Processing
 // ----------------------------------------
 
-static void calcBitmask(uint32_t aMask, uint8_t& aBegin, uint8_t& aLength)
+static void
+calcBitmask(uint32_t aMask, uint8_t& aBegin, uint8_t& aLength)
 {
     // find the rightmost 1
     uint8_t pos;
@@ -162,15 +167,15 @@
         if (!started && (aMask & (1 << pos))) {
             aBegin = pos;
             started = true;
-        }
-        else if (started && !(aMask & (1 << pos))) {
+        } else if (started && !(aMask & (1 << pos))) {
             aLength = pos - aBegin;
             break;
         }
     }
 }
 
-NS_METHOD nsBMPDecoder::CalcBitShift()
+NS_METHOD
+nsBMPDecoder::CalcBitShift()
 {
     uint8_t begin, length;
     // red
@@ -189,699 +194,754 @@
 }
 
 void
-nsBMPDecoder::WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy)
+nsBMPDecoder::WriteInternal(const char* aBuffer, uint32_t aCount,
+                            DecodeStrategy)
 {
-    NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
+  NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
 
-    // aCount=0 means EOF, mCurLine=0 means we're past end of image
-    if (!aCount || !mCurLine)
-        return;
+  // aCount=0 means EOF, mCurLine=0 means we're past end of image
+  if (!aCount || !mCurLine) {
+      return;
+  }
 
-    // This code assumes that mRawBuf == WIN_V3_INTERNAL_BIH_LENGTH
-    // and that sizeof(mRawBuf) >= BFH_INTERNAL_LENGTH
-    MOZ_ASSERT(sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH);
-    MOZ_ASSERT(sizeof(mRawBuf) >= BFH_INTERNAL_LENGTH);
-    MOZ_ASSERT(OS2_INTERNAL_BIH_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH);
-    // This code also assumes it's working with a byte array
-    MOZ_ASSERT(sizeof(mRawBuf[0]) == 1);
-
-    if (mPos < BFH_INTERNAL_LENGTH) { /* In BITMAPFILEHEADER */
-        // BFH_INTERNAL_LENGTH < sizeof(mRawBuf)
-        // mPos < BFH_INTERNAL_LENGTH
-        // BFH_INTERNAL_LENGTH - mPos < sizeof(mRawBuf)
-        // so toCopy <= BFH_INTERNAL_LENGTH
-        // so toCopy < sizeof(mRawBuf)
-        // so toCopy > 0 && toCopy <= BFH_INTERNAL_LENGTH
-        uint32_t toCopy = BFH_INTERNAL_LENGTH - mPos;
-        if (toCopy > aCount)
-            toCopy = aCount;
-
-        // mRawBuf is a byte array of size WIN_V3_INTERNAL_BIH_LENGTH (verified above)
-        // mPos is < BFH_INTERNAL_LENGTH
-        // BFH_INTERNAL_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH
-        // so mPos < sizeof(mRawBuf)
-        //
-        // Therefore this assert should hold
-        MOZ_ASSERT(mPos < sizeof(mRawBuf));
-
-        // toCopy <= BFH_INTERNAL_LENGTH
-        // mPos >= 0 && mPos < BFH_INTERNAL_LENGTH
-        // sizeof(mRawBuf) >= BFH_INTERNAL_LENGTH (verified above)
-        //
-        // Therefore this assert should hold
-        MOZ_ASSERT(mPos + toCopy <= sizeof(mRawBuf));
-
-        memcpy(mRawBuf + mPos, aBuffer, toCopy);
-        mPos += toCopy;
-        aCount -= toCopy;
-        aBuffer += toCopy;
-    }
-    if (mPos == BFH_INTERNAL_LENGTH) {
-        ProcessFileHeader();
-        if (mBFH.signature[0] != 'B' || mBFH.signature[1] != 'M') {
-            PostDataError();
-            return;
-        }
-        if (mBFH.bihsize == OS2_BIH_LENGTH)
-            mLOH = OS2_HEADER_LENGTH;
-    }
-    if (mPos >= BFH_INTERNAL_LENGTH && mPos < mLOH) { /* In BITMAPINFOHEADER */
-        // mLOH == WIN_V3_HEADER_LENGTH || mLOH == OS2_HEADER_LENGTH
-        // OS2_HEADER_LENGTH < WIN_V3_HEADER_LENGTH
-        // BFH_INTERNAL_LENGTH < OS2_HEADER_LENGTH
-        // BFH_INTERNAL_LENGTH < WIN_V3_HEADER_LENGTH
-        //
-        // So toCopy is in the range
-        //      1 to (WIN_V3_HEADER_LENGTH - BFH_INTERNAL_LENGTH)
-        // or   1 to (OS2_HEADER_LENGTH - BFH_INTERNAL_LENGTH)
-        //
-        // But WIN_V3_HEADER_LENGTH = BFH_INTERNAL_LENGTH + WIN_V3_INTERNAL_BIH_LENGTH
-        // and OS2_HEADER_LENGTH = BFH_INTERNAL_LENGTH + OS2_INTERNAL_BIH_LENGTH
-        //
-        // So toCopy is in the range
-        //
-        //      1 to WIN_V3_INTERNAL_BIH_LENGTH
-        // or   1 to OS2_INTERNAL_BIH_LENGTH
-        // and  OS2_INTERNAL_BIH_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH
-        //
-        // sizeof(mRawBuf) = WIN_V3_INTERNAL_BIH_LENGTH
-        // so toCopy <= sizeof(mRawBuf)
-        uint32_t toCopy = mLOH - mPos;
-        if (toCopy > aCount)
-            toCopy = aCount;
-
-        // mPos is in the range
-        //      BFH_INTERNAL_LENGTH to (WIN_V3_HEADER_LENGTH - 1)
-        //
-        // offset is then in the range (see toCopy comments for more details)
-        //      0 to (WIN_V3_INTERNAL_BIH_LENGTH - 1)
-        //
-        // sizeof(mRawBuf) is WIN_V3_INTERNAL_BIH_LENGTH so this
-        // offset stays within bounds and this assert should hold
-        const uint32_t offset = mPos - BFH_INTERNAL_LENGTH;
-        MOZ_ASSERT(offset < sizeof(mRawBuf));
-
-        // Two cases:
-        //      mPos = BFH_INTERNAL_LENGTH
-        //      mLOH = WIN_V3_HEADER_LENGTH
-        //
-        // offset = 0
-        // toCopy = WIN_V3_INTERNAL_BIH_LENGTH
-        //
-        //      This will be in the bounds of sizeof(mRawBuf)
-        //
-        // Second Case:
-        //      mPos = WIN_V3_HEADER_LENGTH - 1
-        //      mLOH = WIN_V3_HEADER_LENGTH
-        //
-        // offset = WIN_V3_INTERNAL_BIH_LENGTH - 1
-        // toCopy = 1
-        //
-        //      This will be in the bounds of sizeof(mRawBuf)
-        //
-        // As sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH (verified above)
-        // and WIN_V3_HEADER_LENGTH is the largest range of values. If mLOH
-        // was equal to OS2_HEADER_LENGTH then the ranges are smaller.
-        MOZ_ASSERT(offset + toCopy <= sizeof(mRawBuf));
-
-        memcpy(mRawBuf + offset, aBuffer, toCopy);
-        mPos += toCopy;
-        aCount -= toCopy;
-        aBuffer += toCopy;
-    }
+  // This code assumes that mRawBuf == WIN_V3_INTERNAL_BIH_LENGTH
+  // and that sizeof(mRawBuf) >= BFH_INTERNAL_LENGTH
+  MOZ_ASSERT(sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH);
+  MOZ_ASSERT(sizeof(mRawBuf) >= BFH_INTERNAL_LENGTH);
+  MOZ_ASSERT(OS2_INTERNAL_BIH_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH);
+
+  // This code also assumes it's working with a byte array
+  MOZ_ASSERT(sizeof(mRawBuf[0]) == 1);
+
+  if (mPos < BFH_INTERNAL_LENGTH) { /* In BITMAPFILEHEADER */
+      // BFH_INTERNAL_LENGTH < sizeof(mRawBuf)
+      // mPos < BFH_INTERNAL_LENGTH
+      // BFH_INTERNAL_LENGTH - mPos < sizeof(mRawBuf)
+      // so toCopy <= BFH_INTERNAL_LENGTH
+      // so toCopy < sizeof(mRawBuf)
+      // so toCopy > 0 && toCopy <= BFH_INTERNAL_LENGTH
+      uint32_t toCopy = BFH_INTERNAL_LENGTH - mPos;
+      if (toCopy > aCount) {
+          toCopy = aCount;
+      }
 
-    // At this point mPos should be >= mLOH unless aBuffer did not have enough
-    // data. In the latter case aCount should be 0.
-    MOZ_ASSERT(mPos >= mLOH || aCount == 0);
-
-    // HasSize is called to ensure that if at this point mPos == mLOH but
-    // we have no data left to process, the next time WriteInternal is called
-    // we won't enter this condition again.
-    if (mPos == mLOH && !HasSize()) {
-        ProcessInfoHeader();
-        PR_LOG(GetBMPLog(), PR_LOG_DEBUG, ("BMP is %lix%lix%lu. compression=%lu\n",
-               mBIH.width, mBIH.height, mBIH.bpp, mBIH.compression));
-        // Verify we support this bit depth
-        if (mBIH.bpp != 1 && mBIH.bpp != 4 && mBIH.bpp != 8 &&
-            mBIH.bpp != 16 && mBIH.bpp != 24 && mBIH.bpp != 32) {
+      // mRawBuf is a byte array of size WIN_V3_INTERNAL_BIH_LENGTH
+      // (verified above)
+      // mPos is < BFH_INTERNAL_LENGTH
+      // BFH_INTERNAL_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH
+      // so mPos < sizeof(mRawBuf)
+      //
+      // Therefore this assert should hold
+      MOZ_ASSERT(mPos < sizeof(mRawBuf));
+
+      // toCopy <= BFH_INTERNAL_LENGTH
+      // mPos >= 0 && mPos < BFH_INTERNAL_LENGTH
+      // sizeof(mRawBuf) >= BFH_INTERNAL_LENGTH (verified above)
+      //
+      // Therefore this assert should hold
+      MOZ_ASSERT(mPos + toCopy <= sizeof(mRawBuf));
+
+      memcpy(mRawBuf + mPos, aBuffer, toCopy);
+      mPos += toCopy;
+      aCount -= toCopy;
+      aBuffer += toCopy;
+  }
+  if (mPos == BFH_INTERNAL_LENGTH) {
+      ProcessFileHeader();
+      if (mBFH.signature[0] != 'B' || mBFH.signature[1] != 'M') {
           PostDataError();
           return;
-        }
+      }
+      if (mBFH.bihsize == OS2_BIH_LENGTH) {
+          mLOH = OS2_HEADER_LENGTH;
+      }
+  }
+  if (mPos >= BFH_INTERNAL_LENGTH && mPos < mLOH) { /* In BITMAPINFOHEADER */
+      // mLOH == WIN_V3_HEADER_LENGTH || mLOH == OS2_HEADER_LENGTH
+      // OS2_HEADER_LENGTH < WIN_V3_HEADER_LENGTH
+      // BFH_INTERNAL_LENGTH < OS2_HEADER_LENGTH
+      // BFH_INTERNAL_LENGTH < WIN_V3_HEADER_LENGTH
+      //
+      // So toCopy is in the range
+      //      1 to (WIN_V3_HEADER_LENGTH - BFH_INTERNAL_LENGTH)
+      // or   1 to (OS2_HEADER_LENGTH - BFH_INTERNAL_LENGTH)
+      //
+      // But WIN_V3_HEADER_LENGTH =
+      //     BFH_INTERNAL_LENGTH + WIN_V3_INTERNAL_BIH_LENGTH
+      // and OS2_HEADER_LENGTH = BFH_INTERNAL_LENGTH + OS2_INTERNAL_BIH_LENGTH
+      //
+      // So toCopy is in the range
+      //
+      //      1 to WIN_V3_INTERNAL_BIH_LENGTH
+      // or   1 to OS2_INTERNAL_BIH_LENGTH
+      // and  OS2_INTERNAL_BIH_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH
+      //
+      // sizeof(mRawBuf) = WIN_V3_INTERNAL_BIH_LENGTH
+      // so toCopy <= sizeof(mRawBuf)
+      uint32_t toCopy = mLOH - mPos;
+      if (toCopy > aCount) {
+          toCopy = aCount;
+      }
 
-        // BMPs with negative width are invalid
-        // Reject extremely wide images to keep the math sane
-        const int32_t k64KWidth = 0x0000FFFF;
-        if (mBIH.width < 0 || mBIH.width > k64KWidth) {
-            PostDataError();
-            return;
-        }
+      // mPos is in the range
+      //      BFH_INTERNAL_LENGTH to (WIN_V3_HEADER_LENGTH - 1)
+      //
+      // offset is then in the range (see toCopy comments for more details)
+      //      0 to (WIN_V3_INTERNAL_BIH_LENGTH - 1)
+      //
+      // sizeof(mRawBuf) is WIN_V3_INTERNAL_BIH_LENGTH so this
+      // offset stays within bounds and this assert should hold
+      const uint32_t offset = mPos - BFH_INTERNAL_LENGTH;
+      MOZ_ASSERT(offset < sizeof(mRawBuf));
+
+      // Two cases:
+      //      mPos = BFH_INTERNAL_LENGTH
+      //      mLOH = WIN_V3_HEADER_LENGTH
+      //
+      // offset = 0
+      // toCopy = WIN_V3_INTERNAL_BIH_LENGTH
+      //
+      //      This will be in the bounds of sizeof(mRawBuf)
+      //
+      // Second Case:
+      //      mPos = WIN_V3_HEADER_LENGTH - 1
+      //      mLOH = WIN_V3_HEADER_LENGTH
+      //
+      // offset = WIN_V3_INTERNAL_BIH_LENGTH - 1
+      // toCopy = 1
+      //
+      //      This will be in the bounds of sizeof(mRawBuf)
+      //
+      // As sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH (verified above)
+      // and WIN_V3_HEADER_LENGTH is the largest range of values. If mLOH
+      // was equal to OS2_HEADER_LENGTH then the ranges are smaller.
+      MOZ_ASSERT(offset + toCopy <= sizeof(mRawBuf));
+
+      memcpy(mRawBuf + offset, aBuffer, toCopy);
+      mPos += toCopy;
+      aCount -= toCopy;
+      aBuffer += toCopy;
+  }
 
-        if (mBIH.height == INT_MIN) {
-            PostDataError();
-            return;
-        }
+  // At this point mPos should be >= mLOH unless aBuffer did not have enough
+  // data. In the latter case aCount should be 0.
+  MOZ_ASSERT(mPos >= mLOH || aCount == 0);
+
+  // HasSize is called to ensure that if at this point mPos == mLOH but
+  // we have no data left to process, the next time WriteInternal is called
+  // we won't enter this condition again.
+  if (mPos == mLOH && !HasSize()) {
+      ProcessInfoHeader();
+      PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+             ("BMP is %lix%lix%lu. compression=%lu\n",
+             mBIH.width, mBIH.height, mBIH.bpp, mBIH.compression));
+      // Verify we support this bit depth
+      if (mBIH.bpp != 1 && mBIH.bpp != 4 && mBIH.bpp != 8 &&
+          mBIH.bpp != 16 && mBIH.bpp != 24 && mBIH.bpp != 32) {
+        PostDataError();
+        return;
+      }
 
-        uint32_t real_height = GetHeight();
+      // BMPs with negative width are invalid
+      // Reject extremely wide images to keep the math sane
+      const int32_t k64KWidth = 0x0000FFFF;
+      if (mBIH.width < 0 || mBIH.width > k64KWidth) {
+        PostDataError();
+        return;
+      }
 
-        // Post our size to the superclass
-        PostSize(mBIH.width, real_height);
-        if (HasError()) {
-          // Setting the size led to an error.
-          return;
-        }
+      if (mBIH.height == INT_MIN) {
+        PostDataError();
+        return;
+      }
 
-        // We have the size. If we're doing a size decode, we got what
-        // we came for.
-        if (IsSizeDecode())
-            return;
+      uint32_t real_height = GetHeight();
 
-        // We're doing a real decode.
-        mOldLine = mCurLine = real_height;
+      // Post our size to the superclass
+      PostSize(mBIH.width, real_height);
+      if (HasError()) {
+        // Setting the size led to an error.
+        return;
+      }
 
-        if (mBIH.bpp <= 8) {
-            mNumColors = 1 << mBIH.bpp;
-            if (mBIH.colors && mBIH.colors < mNumColors)
-                mNumColors = mBIH.colors;
-
-            // Always allocate 256 even though mNumColors might be smaller
-            mColors = new colorTable[256];
-            memset(mColors, 0, 256 * sizeof(colorTable));
-        }
-        else if (mBIH.compression != BI_BITFIELDS && mBIH.bpp == 16) {
-            // Use default 5-5-5 format
-            mBitFields.red   = 0x7C00;
-            mBitFields.green = 0x03E0;
-            mBitFields.blue  = 0x001F;
-            CalcBitShift();
-        }
+      // We have the size. If we're doing a size decode, we got what
+      // we came for.
+      if (IsSizeDecode()) {
+        return;
+      }
 
-        // Make sure we have a valid value for our supported compression modes
-        // before adding the frame
-        if (mBIH.compression != BI_RGB && mBIH.compression != BI_RLE8 && 
-            mBIH.compression != BI_RLE4 && mBIH.compression != BI_BITFIELDS) {
-          PostDataError();
-          return;
-        }
+      // We're doing a real decode.
+      mOldLine = mCurLine = real_height;
 
-        // If we have RLE4 or RLE8 or BI_ALPHABITFIELDS, then ensure we
-        // have valid BPP values before adding the frame
-        if (mBIH.compression == BI_RLE8 && mBIH.bpp != 8) {
-          PR_LOG(GetBMPLog(), PR_LOG_DEBUG, 
-                 ("BMP RLE8 compression only supports 8 bits per pixel\n"));
-          PostDataError();
-          return;
-        }
-        if (mBIH.compression == BI_RLE4 && mBIH.bpp != 4 && mBIH.bpp != 1) {
-          PR_LOG(GetBMPLog(), PR_LOG_DEBUG, 
-                 ("BMP RLE4 compression only supports 4 bits per pixel\n"));
-          PostDataError();
-          return;
-        }
-        if (mBIH.compression == BI_ALPHABITFIELDS && 
-            mBIH.bpp != 16 && mBIH.bpp != 32) {
-          PR_LOG(GetBMPLog(), PR_LOG_DEBUG, 
-                 ("BMP ALPHABITFIELDS only supports 16 or 32 bits per pixel\n"));
+      if (mBIH.bpp <= 8) {
+        mNumColors = 1 << mBIH.bpp;
+        if (mBIH.colors && mBIH.colors < mNumColors) {
+            mNumColors = mBIH.colors;
+        }
+
+        // Always allocate 256 even though mNumColors might be smaller
+        mColors = new colorTable[256];
+        memset(mColors, 0, 256 * sizeof(colorTable));
+      } else if (mBIH.compression != BI_BITFIELDS && mBIH.bpp == 16) {
+        // Use default 5-5-5 format
+        mBitFields.red   = 0x7C00;
+        mBitFields.green = 0x03E0;
+        mBitFields.blue  = 0x001F;
+        CalcBitShift();
+      }
+
+      // Make sure we have a valid value for our supported compression modes
+      // before adding the frame
+      if (mBIH.compression != BI_RGB && mBIH.compression != BI_RLE8 &&
+          mBIH.compression != BI_RLE4 && mBIH.compression != BI_BITFIELDS) {
+        PostDataError();
+        return;
+      }
+
+      // If we have RLE4 or RLE8 or BI_ALPHABITFIELDS, then ensure we
+      // have valid BPP values before adding the frame
+      if (mBIH.compression == BI_RLE8 && mBIH.bpp != 8) {
+        PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+               ("BMP RLE8 compression only supports 8 bits per pixel\n"));
+        PostDataError();
+        return;
+      }
+      if (mBIH.compression == BI_RLE4 && mBIH.bpp != 4 && mBIH.bpp != 1) {
+        PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+               ("BMP RLE4 compression only supports 4 bits per pixel\n"));
+        PostDataError();
+        return;
+      }
+      if (mBIH.compression == BI_ALPHABITFIELDS &&
+          mBIH.bpp != 16 && mBIH.bpp != 32) {
+        PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+               ("BMP ALPHABITFIELDS only supports 16 or 32 bits per pixel\n"
+                ));
+        PostDataError();
+        return;
+      }
+
+      if (mBIH.compression != BI_RLE8 && mBIH.compression != BI_RLE4 &&
+          mBIH.compression != BI_ALPHABITFIELDS) {
+        // mRow is not used for RLE encoded images
+        mRow = (uint8_t*)moz_malloc((mBIH.width * mBIH.bpp) / 8 + 4);
+        // + 4 because the line is padded to a 4 bit boundary, but
+        // I don't want to make exact calculations here, that's unnecessary.
+        // Also, it compensates rounding error.
+        if (!mRow) {
           PostDataError();
           return;
         }
+      }
+      if (!mImageData) {
+        PostDecoderError(NS_ERROR_FAILURE);
+        return;
+      }
 
-        if (mBIH.compression != BI_RLE8 && mBIH.compression != BI_RLE4 &&
-            mBIH.compression != BI_ALPHABITFIELDS) {
-            // mRow is not used for RLE encoded images
-            mRow = (uint8_t*)moz_malloc((mBIH.width * mBIH.bpp) / 8 + 4);
-            // + 4 because the line is padded to a 4 bit boundary, but I don't want
-            // to make exact calculations here, that's unnecessary.
-            // Also, it compensates rounding error.
-            if (!mRow) {
-              PostDataError();
-              return;
-            }
-        }
-        if (!mImageData) {
-            PostDecoderError(NS_ERROR_FAILURE);
-            return;
-        }
-
-        // Prepare for transparency
-        if ((mBIH.compression == BI_RLE8) || (mBIH.compression == BI_RLE4)) {
-            // Clear the image, as the RLE may jump over areas
-            memset(mImageData, 0, mImageDataLength);
-        }
-    }
+      // Prepare for transparency
+      if ((mBIH.compression == BI_RLE8) || (mBIH.compression == BI_RLE4)) {
+        // Clear the image, as the RLE may jump over areas
+        memset(mImageData, 0, mImageDataLength);
+      }
+  }
 
-    if (mColors && mPos >= mLOH) {
-      // OS/2 Bitmaps have no padding byte
-      uint8_t bytesPerColor = (mBFH.bihsize == OS2_BIH_LENGTH) ? 3 : 4;
-      if (mPos < (mLOH + mNumColors * bytesPerColor)) {
-        // Number of bytes already received
-        uint32_t colorBytes = mPos - mLOH; 
-        // Color which is currently received
-        uint8_t colorNum = colorBytes / bytesPerColor;
-        uint8_t at = colorBytes % bytesPerColor;
-        while (aCount && (mPos < (mLOH + mNumColors * bytesPerColor))) {
-            switch (at) {
-                case 0:
-                    mColors[colorNum].blue = *aBuffer;
-                    break;
-                case 1:
-                    mColors[colorNum].green = *aBuffer;
-                    break;
-                case 2:
-                    mColors[colorNum].red = *aBuffer;
-                    // If there is no padding byte, increment the color index
-                    // since we're done with the current color.
-                    if (bytesPerColor == 3)
-                      colorNum++;
-                    break;
-                case 3:
-                    // This is a padding byte only in Windows BMPs. Increment
-                    // the color index since we're done with the current color.
-                    colorNum++;
-                    break;
+  if (mColors && mPos >= mLOH) {
+    // OS/2 Bitmaps have no padding byte
+    uint8_t bytesPerColor = (mBFH.bihsize == OS2_BIH_LENGTH) ? 3 : 4;
+    if (mPos < (mLOH + mNumColors * bytesPerColor)) {
+      // Number of bytes already received
+      uint32_t colorBytes = mPos - mLOH;
+      // Color which is currently received
+      uint8_t colorNum = colorBytes / bytesPerColor;
+      uint8_t at = colorBytes % bytesPerColor;
+      while (aCount && (mPos < (mLOH + mNumColors * bytesPerColor))) {
+        switch (at) {
+          case 0:
+            mColors[colorNum].blue = *aBuffer;
+            break;
+          case 1:
+            mColors[colorNum].green = *aBuffer;
+            break;
+          case 2:
+            mColors[colorNum].red = *aBuffer;
+            // If there is no padding byte, increment the color index
+            // since we're done with the current color.
+            if (bytesPerColor == 3) {
+              colorNum++;
             }
-            mPos++; aBuffer++; aCount--;
-            at = (at + 1) % bytesPerColor;
+            break;
+          case 3:
+            // This is a padding byte only in Windows BMPs. Increment
+            // the color index since we're done with the current color.
+            colorNum++;
+            break;
         }
-      }
-    }
-    else if (aCount && mBIH.compression == BI_BITFIELDS && mPos < (WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH)) {
-        // If compression is used, this is a windows bitmap (compression can't be used with OS/2 bitmaps),
-        // hence we can use WIN_V3_HEADER_LENGTH instead of mLOH.
-        // (verified below)
-
-        // If aCount != 0 then mPos should be >= mLOH due to the if statements
-        // at the beginning of the function
-        MOZ_ASSERT(mPos >= mLOH);
-        MOZ_ASSERT(mLOH == WIN_V3_HEADER_LENGTH);
-
-        // mLOH == WIN_V3_HEADER_LENGTH (verified above)
-        // mPos >= mLOH (verified above)
-        // mPos < WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH
-        //
-        // So toCopy is in the range
-        //      0 to (BITFIELD_LENGTH - 1)
-        uint32_t toCopy = (WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH) - mPos;
-        if (toCopy > aCount)
-            toCopy = aCount;
-
-        // mPos >= WIN_V3_HEADER_LENGTH
-        // mPos < WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH
-        //
-        // offset is in the range
-        //      0 to (BITFIELD_LENGTH - 1)
-        //
-        // BITFIELD_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH
-        // and sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH (verified at top of function)
-        //
-        // Therefore this assert should hold
-        const uint32_t offset = mPos - WIN_V3_HEADER_LENGTH;
-        MOZ_ASSERT(offset < sizeof(mRawBuf));
-
-        // Two cases:
-        //      mPos = WIN_V3_HEADER_LENGTH
-        //
-        // offset = 0
-        // toCopy = BITFIELD_LENGTH
-        //
-        //      This will be in the bounds of sizeof(mRawBuf)
-        //
-        // Second case:
-        //
-        //      mPos = WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH - 1
-        //
-        // offset = BITFIELD_LENGTH - 1
-        // toCopy = 1
-        //
-        //      This will be in the bounds of sizeof(mRawBuf)
-        //
-        // As BITFIELD_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH and
-        // sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH
-        //
-        // Therefore this assert should hold
-        MOZ_ASSERT(offset + toCopy <= sizeof(mRawBuf));
-
-        memcpy(mRawBuf + offset, aBuffer, toCopy);
-        mPos += toCopy;
-        aBuffer += toCopy;
-        aCount -= toCopy;
-    }
-    if (mPos == WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH && 
-        mBIH.compression == BI_BITFIELDS) {
-        mBitFields.red = LittleEndian::readUint32(reinterpret_cast<uint32_t*>(mRawBuf));
-        mBitFields.green = LittleEndian::readUint32(reinterpret_cast<uint32_t*>(mRawBuf + 4));
-        mBitFields.blue = LittleEndian::readUint32(reinterpret_cast<uint32_t*>(mRawBuf + 8));
-        CalcBitShift();
-    }
-    while (aCount && (mPos < mBFH.dataoffset)) { // Skip whatever is between header and data
         mPos++; aBuffer++; aCount--;
+        at = (at + 1) % bytesPerColor;
+      }
     }
-    if (aCount && ++mPos >= mBFH.dataoffset) {
-        // Need to increment mPos, else we might get to mPos==mLOH again
-        // From now on, mPos is irrelevant
-        if (!mBIH.compression || mBIH.compression == BI_BITFIELDS) {
-            uint32_t rowSize = (mBIH.bpp * mBIH.width + 7) / 8; // + 7 to round up
-            if (rowSize % 4) {
-                rowSize += (4 - (rowSize % 4)); // Pad to DWORD Boundary
+  } else if (aCount && mBIH.compression == BI_BITFIELDS && mPos <
+         (WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH)) {
+    // If compression is used, this is a windows bitmap (compression
+    // can't be used with OS/2 bitmaps),
+    // hence we can use WIN_V3_HEADER_LENGTH instead of mLOH.
+    // (verified below)
+
+    // If aCount != 0 then mPos should be >= mLOH due to the if statements
+    // at the beginning of the function
+    MOZ_ASSERT(mPos >= mLOH);
+    MOZ_ASSERT(mLOH == WIN_V3_HEADER_LENGTH);
+
+    // mLOH == WIN_V3_HEADER_LENGTH (verified above)
+    // mPos >= mLOH (verified above)
+    // mPos < WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH
+    //
+    // So toCopy is in the range
+    //      0 to (BITFIELD_LENGTH - 1)
+    uint32_t toCopy = (WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH) - mPos;
+    if (toCopy > aCount) {
+      toCopy = aCount;
+    }
+
+    // mPos >= WIN_V3_HEADER_LENGTH
+    // mPos < WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH
+    //
+    // offset is in the range
+    //      0 to (BITFIELD_LENGTH - 1)
+    //
+    // BITFIELD_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH
+    // and sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH (verified at
+    // top of function)
+    //
+    // Therefore this assert should hold
+    const uint32_t offset = mPos - WIN_V3_HEADER_LENGTH;
+    MOZ_ASSERT(offset < sizeof(mRawBuf));
+
+    // Two cases:
+    //      mPos = WIN_V3_HEADER_LENGTH
+    //
+    // offset = 0
+    // toCopy = BITFIELD_LENGTH
+    //
+    //      This will be in the bounds of sizeof(mRawBuf)
+    //
+    // Second case:
+    //
+    //      mPos = WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH - 1
+    //
+    // offset = BITFIELD_LENGTH - 1
+    // toCopy = 1
+    //
+    //      This will be in the bounds of sizeof(mRawBuf)
+    //
+    // As BITFIELD_LENGTH < WIN_V3_INTERNAL_BIH_LENGTH and
+    // sizeof(mRawBuf) == WIN_V3_INTERNAL_BIH_LENGTH
+    //
+    // Therefore this assert should hold
+    MOZ_ASSERT(offset + toCopy <= sizeof(mRawBuf));
+
+    memcpy(mRawBuf + offset, aBuffer, toCopy);
+    mPos += toCopy;
+    aBuffer += toCopy;
+    aCount -= toCopy;
+  }
+  if (mPos == WIN_V3_HEADER_LENGTH + BITFIELD_LENGTH &&
+    mBIH.compression == BI_BITFIELDS) {
+    mBitFields.red = LittleEndian::readUint32(reinterpret_cast<uint32_t*>
+                                              (mRawBuf));
+    mBitFields.green = LittleEndian::readUint32(reinterpret_cast<uint32_t*>
+                                                (mRawBuf + 4));
+    mBitFields.blue = LittleEndian::readUint32(reinterpret_cast<uint32_t*>
+                                               (mRawBuf + 8));
+    CalcBitShift();
+  }
+  while (aCount && (mPos < mBFH.dataoffset)) { // Skip whatever is between
+                                               // header and data
+    mPos++; aBuffer++; aCount--;
+  }
+  if (aCount && ++mPos >= mBFH.dataoffset) {
+    // Need to increment mPos, else we might get to mPos==mLOH again
+    // From now on, mPos is irrelevant
+    if (!mBIH.compression || mBIH.compression == BI_BITFIELDS) {
+        uint32_t rowSize = (mBIH.bpp * mBIH.width + 7) / 8; // + 7 to
+                                                            // round up
+        if (rowSize % 4) {
+          rowSize += (4 - (rowSize % 4)); // Pad to DWORD Boundary
+        }
+        uint32_t toCopy;
+        do {
+          toCopy = rowSize - mRowBytes;
+          if (toCopy) {
+            if (toCopy > aCount) {
+              toCopy = aCount;
             }
-            uint32_t toCopy;
-            do {
-                toCopy = rowSize - mRowBytes;
-                if (toCopy) {
-                    if (toCopy > aCount)
-                        toCopy = aCount;
-                    memcpy(mRow + mRowBytes, aBuffer, toCopy);
-                    aCount -= toCopy;
-                    aBuffer += toCopy;
-                    mRowBytes += toCopy;
+            memcpy(mRow + mRowBytes, aBuffer, toCopy);
+            aCount -= toCopy;
+            aBuffer += toCopy;
+            mRowBytes += toCopy;
+        }
+        if (rowSize == mRowBytes) {
+          // Collected a whole row into mRow, process it
+          uint8_t* p = mRow;
+          uint32_t* d = reinterpret_cast<uint32_t*>(mImageData) +
+                        PIXEL_OFFSET(mCurLine, 0);
+          uint32_t lpos = mBIH.width;
+          switch (mBIH.bpp) {
+            case 1:
+              while (lpos > 0) {
+                int8_t bit;
+                uint8_t idx;
+                for (bit = 7; bit >= 0 && lpos > 0; bit--) {
+                  idx = (*p >> bit) & 1;
+                  SetPixel(d, idx, mColors);
+                  --lpos;
                 }
-                if (rowSize == mRowBytes) {
-                    // Collected a whole row into mRow, process it
-                    uint8_t* p = mRow;
-                    uint32_t* d = reinterpret_cast<uint32_t*>(mImageData) + PIXEL_OFFSET(mCurLine, 0);
-                    uint32_t lpos = mBIH.width;
-                    switch (mBIH.bpp) {
-                      case 1:
-                        while (lpos > 0) {
-                          int8_t bit;
-                          uint8_t idx;
-                          for (bit = 7; bit >= 0 && lpos > 0; bit--) {
-                              idx = (*p >> bit) & 1;
-                              SetPixel(d, idx, mColors);
-                              --lpos;
-                          }
-                          ++p;
-                        }
-                        break;
-                      case 4:
-                        while (lpos > 0) {
-                          Set4BitPixel(d, *p, lpos, mColors);
-                          ++p;
-                        }
-                        break;
-                      case 8:
-                        while (lpos > 0) {
-                          SetPixel(d, *p, mColors);
-                          --lpos;
-                          ++p;
-                        }
-                        break;
-                      case 16:
-                        while (lpos > 0) {
-                          uint16_t val = LittleEndian::readUint16(reinterpret_cast<uint16_t*>(p));
-                          SetPixel(d,
-                                  (val & mBitFields.red) >> mBitFields.redRightShift << mBitFields.redLeftShift,
-                                  (val & mBitFields.green) >> mBitFields.greenRightShift << mBitFields.greenLeftShift,
-                                  (val & mBitFields.blue) >> mBitFields.blueRightShift << mBitFields.blueLeftShift);
-                          --lpos;
-                          p+=2;
-                        }
-                        break;
-                      case 24:
-                        while (lpos > 0) {
-                          SetPixel(d, p[2], p[1], p[0]);
-                          p += 2;
-                          --lpos;
-                          ++p;
-                        }
-                        break;
-                      case 32:
-                        while (lpos > 0) {
-                          if (mUseAlphaData) {
-                            if (!mHaveAlphaData && p[3]) {
-                              // Non-zero alpha byte detected! Clear previous
-                              // pixels that we have already processed.
-                              // This works because we know that if we 
-                              // are reaching here then the alpha data in byte 
-                              // 4 has been right all along.  And we know it
-                              // has been set to 0 the whole time, so that 
-                              // means that everything is transparent so far.
-                              uint32_t* start = reinterpret_cast<uint32_t*>(mImageData) + GetWidth() * (mCurLine - 1);
-                              uint32_t heightDifference = GetHeight() - mCurLine + 1;
-                              uint32_t pixelCount = GetWidth() * heightDifference;
-
-                              memset(start, 0, pixelCount * sizeof(uint32_t));
-
-                              mHaveAlphaData = true;
-                            }
-                            SetPixel(d, p[2], p[1], p[0], mHaveAlphaData ? p[3] : 0xFF);
-                          } else {
-                            SetPixel(d, p[2], p[1], p[0]);
-                          }
-                          p += 4;
-                          --lpos;
-                        }
-                        break;
-                      default:
-                        NS_NOTREACHED("Unsupported color depth, but earlier check didn't catch it");
-                    }
-                    mCurLine --;
-                    if (mCurLine == 0) { // Finished last line
-                      break;
-                    }
-                    mRowBytes = 0;
-
+                ++p;
+              }
+              break;
+            case 4:
+              while (lpos > 0) {
+                Set4BitPixel(d, *p, lpos, mColors);
+                ++p;
+              }
+              break;
+            case 8:
+              while (lpos > 0) {
+                SetPixel(d, *p, mColors);
+                --lpos;
+                ++p;
+              }
+              break;
+            case 16:
+              while (lpos > 0) {
+                uint16_t val = LittleEndian::
+                               readUint16(reinterpret_cast<uint16_t*>(p));
+                SetPixel(d,
+                         (val & mBitFields.red) >>
+                         mBitFields.redRightShift <<
+                         mBitFields.redLeftShift,
+                         (val & mBitFields.green) >>
+                         mBitFields.greenRightShift <<
+                         mBitFields.greenLeftShift,
+                         (val & mBitFields.blue) >>
+                         mBitFields.blueRightShift <<
+                         mBitFields.blueLeftShift);
+                --lpos;
+                p+=2;
+              }
+              break;
+            case 24:
+              while (lpos > 0) {
+                SetPixel(d, p[2], p[1], p[0]);
+                p += 2;
+                --lpos;
+                ++p;
+              }
+              break;
+            case 32:
+              while (lpos > 0) {
+                if (mUseAlphaData) {
+                  if (!mHaveAlphaData && p[3]) {
+                    // Non-zero alpha byte detected! Clear previous
+                    // pixels that we have already processed.
+                    // This works because we know that if we
+                    // are reaching here then the alpha data in byte
+                    // 4 has been right all along.  And we know it
+                    // has been set to 0 the whole time, so that
+                    // means that everything is transparent so far.
+                    uint32_t* start = reinterpret_cast<uint32_t*>
+                                      (mImageData) + GetWidth() *
+                                      (mCurLine - 1);
+                    uint32_t heightDifference = GetHeight() -
+                                                mCurLine + 1;
+                    uint32_t pixelCount = GetWidth() *
+                                          heightDifference;
+
+                    memset(start, 0, pixelCount * sizeof(uint32_t));
+
+                    PostHasTransparency();
+                    mHaveAlphaData = true;
+                  }
+                  SetPixel(d, p[2], p[1], p[0], mHaveAlphaData ?  p[3] : 0xFF);
+                } else {
+                  SetPixel(d, p[2], p[1], p[0]);
                 }
-            } while (aCount > 0);
+                p += 4;
+                --lpos;
+              }
+              break;
+            default:
+              NS_NOTREACHED("Unsupported color depth,"
+                            " but earlier check didn't catch it");
+          }
+          mCurLine --;
+          if (mCurLine == 0) { // Finished last line
+            break;
+          }
+          mRowBytes = 0;
         }
-        else if ((mBIH.compression == BI_RLE8) || (mBIH.compression == BI_RLE4)) {
-            if (((mBIH.compression == BI_RLE8) && (mBIH.bpp != 8)) || 
-                ((mBIH.compression == BI_RLE4) && (mBIH.bpp != 4) && (mBIH.bpp != 1))) {
-              PR_LOG(GetBMPLog(), PR_LOG_DEBUG, ("BMP RLE8/RLE4 compression only supports 8/4 bits per pixel\n"));
-              PostDataError();
-              return;
-            }
+      } while (aCount > 0);
+    } else if ((mBIH.compression == BI_RLE8) ||
+             (mBIH.compression == BI_RLE4)) {
+      if (((mBIH.compression == BI_RLE8) && (mBIH.bpp != 8)) ||
+          ((mBIH.compression == BI_RLE4) && (mBIH.bpp != 4) &&
+           (mBIH.bpp != 1))) {
+        PR_LOG(GetBMPLog(), PR_LOG_DEBUG,
+               ("BMP RLE8/RLE4 compression only supports 8/4 bits per"
+               " pixel\n"));
+        PostDataError();
+        return;
+      }
 
-            while (aCount > 0) {
-                uint8_t byte;
+      while (aCount > 0) {
+        uint8_t byte;
 
-                switch(mState) {
-                    case eRLEStateInitial:
-                        mStateData = (uint8_t)*aBuffer++;
-                        aCount--;
-
-                        mState = eRLEStateNeedSecondEscapeByte;
-                        continue;
-
-                    case eRLEStateNeedSecondEscapeByte:
-                        byte = *aBuffer++;
-                        aCount--;
-                        if (mStateData != RLE_ESCAPE) { // encoded mode
-                            // Encoded mode consists of two bytes: 
-                            // the first byte (mStateData) specifies the
-                            // number of consecutive pixels to be drawn 
-                            // using the color index contained in
-                            // the second byte
-                            // Work around bitmaps that specify too many pixels
-                            mState = eRLEStateInitial;
-                            uint32_t pixelsNeeded = std::min<uint32_t>(mBIH.width - mCurPos, mStateData);
-                            if (pixelsNeeded) {
-                                uint32_t* d = reinterpret_cast<uint32_t*>(mImageData) + PIXEL_OFFSET(mCurLine, mCurPos);
-                                mCurPos += pixelsNeeded;
-                                if (mBIH.compression == BI_RLE8) {
-                                    do {
-                                        SetPixel(d, byte, mColors);
-                                        pixelsNeeded --;
-                                    } while (pixelsNeeded);
-                                } else {
-                                    do {
-                                        Set4BitPixel(d, byte, pixelsNeeded, mColors);
-                                    } while (pixelsNeeded);
-                                }
-                            }
-                            continue;
-                        }
-
-                        switch(byte) {
-                            case RLE_ESCAPE_EOL:
-                                // End of Line: Go to next row
-                                mCurLine --;
-                                mCurPos = 0;
-                                mState = eRLEStateInitial;
-                                break;
-
-                            case RLE_ESCAPE_EOF: // EndOfFile
-                                mCurPos = mCurLine = 0;
-                                break;
-
-                            case RLE_ESCAPE_DELTA:
-                                mState = eRLEStateNeedXDelta;
-                                continue;
-
-                            default : // absolute mode
-                                // Save the number of pixels to read
-                                mStateData = byte;
-                                if (mCurPos + mStateData > (uint32_t)mBIH.width) {
-                                    // We can work around bitmaps that specify one
-                                    // pixel too many, but only if their width is odd.
-                                    mStateData -= mBIH.width & 1;
-                                    if (mCurPos + mStateData > (uint32_t)mBIH.width) {
-                                        PostDataError();
-                                        return;
-                                    }
-                                }
-
-                                // See if we will need to skip a byte
-                                // to word align the pixel data
-                                // mStateData is a number of pixels
-                                // so allow for the RLE compression type
-                                // Pixels RLE8=1 RLE4=2
-                                //    1    Pad    Pad
-                                //    2    No     Pad
-                                //    3    Pad    No
-                                //    4    No     No
-                                if (((mStateData - 1) & mBIH.compression) != 0)
-                                    mState = eRLEStateAbsoluteMode;
-                                else
-                                    mState = eRLEStateAbsoluteModePadded;
-                                continue;
-                        }
-                        break;
-
-                    case eRLEStateNeedXDelta:
-                        // Handle the XDelta and proceed to get Y Delta
-                        byte = *aBuffer++;
-                        aCount--;
-                        mCurPos += byte;
-                        // Delta encoding makes it possible to skip pixels making
-                        // the image transparent.
-                        mUseAlphaData = mHaveAlphaData = true;
-                        if (mCurPos > mBIH.width)
-                            mCurPos = mBIH.width;
-
-                        mState = eRLEStateNeedYDelta;
-                        continue;
-
-                    case eRLEStateNeedYDelta:
-                        // Get the Y Delta and then "handle" the move
-                        byte = *aBuffer++;
-                        aCount--;
-                        mState = eRLEStateInitial;
-                        // Delta encoding makes it possible to skip pixels making
-                        // the image transparent.
-                        mUseAlphaData = mHaveAlphaData = true;
-                        mCurLine -= std::min<int32_t>(byte, mCurLine);
-                        break;
-
-                    case eRLEStateAbsoluteMode: // Absolute Mode
-                    case eRLEStateAbsoluteModePadded:
-                        if (mStateData) {
-                            // In absolute mode, the second byte (mStateData)
-                            // represents the number of pixels 
-                            // that follow, each of which contains 
-                            // the color index of a single pixel.
-                            uint32_t* d = reinterpret_cast<uint32_t*>(mImageData) + PIXEL_OFFSET(mCurLine, mCurPos);
-                            uint32_t* oldPos = d;
-                            if (mBIH.compression == BI_RLE8) {
-                                while (aCount > 0 && mStateData > 0) {
-                                    byte = *aBuffer++;
-                                    aCount--;
-                                    SetPixel(d, byte, mColors);
-                                    mStateData--;
-                                }
-                            } else {
-                                while (aCount > 0 && mStateData > 0) {
-                                    byte = *aBuffer++;
-                                    aCount--;
-                                    Set4BitPixel(d, byte, mStateData, mColors);
-                                }
-                            }
-                            mCurPos += d - oldPos;
-                        }
-
-                        if (mStateData == 0) {
-                            // In absolute mode, each run must 
-                            // be aligned on a word boundary
-
-                            if (mState == eRLEStateAbsoluteMode) { // Word Aligned
-                                mState = eRLEStateInitial;
-                            } else if (aCount > 0) {               // Not word Aligned
-                                // "next" byte is just a padding byte
-                                // so "move" past it and we can continue
-                                aBuffer++;
-                                aCount--;
-                                mState = eRLEStateInitial;
-                            }
-                        }
-                        // else state is still eRLEStateAbsoluteMode
-                        continue;
-
-                    default :
-                        NS_ABORT_IF_FALSE(0, "BMP RLE decompression: unknown state!");
-                        PostDecoderError(NS_ERROR_UNEXPECTED);
-                        return;
+        switch(mState) {
+          case eRLEStateInitial:
+            mStateData = (uint8_t)*aBuffer++;
+            aCount--;
+
+            mState = eRLEStateNeedSecondEscapeByte;
+            continue;
+
+          case eRLEStateNeedSecondEscapeByte:
+            byte = *aBuffer++;
+            aCount--;
+            if (mStateData != RLE_ESCAPE) { // encoded mode
+              // Encoded mode consists of two bytes:
+              // the first byte (mStateData) specifies the
+              // number of consecutive pixels to be drawn
+              // using the color index contained in
+              // the second byte
+              // Work around bitmaps that specify too many pixels
+              mState = eRLEStateInitial;
+              uint32_t pixelsNeeded = std::min<uint32_t>(mBIH.width - mCurPos,
+                                    mStateData);
+              if (pixelsNeeded) {
+                uint32_t* d = reinterpret_cast<uint32_t*>
+                              (mImageData) + PIXEL_OFFSET(mCurLine, mCurPos);
+                mCurPos += pixelsNeeded;
+                if (mBIH.compression == BI_RLE8) {
+                  do {
+                    SetPixel(d, byte, mColors);
+                    pixelsNeeded --;
+                  } while (pixelsNeeded);
+                } else {
+                    do {
+                      Set4BitPixel(d, byte, pixelsNeeded, mColors);
+                  } while (pixelsNeeded);
                 }
-                // Because of the use of the continue statement
-                // we only get here for eol, eof or y delta
-                if (mCurLine == 0) { // Finished last line
-                    break;
+              }
+              continue;
+            }
+
+            switch(byte) {
+              case RLE_ESCAPE_EOL:
+                // End of Line: Go to next row
+                mCurLine --;
+                mCurPos = 0;
+                mState = eRLEStateInitial;
+                break;
+
+              case RLE_ESCAPE_EOF: // EndOfFile
+                mCurPos = mCurLine = 0;
+                break;
+
+              case RLE_ESCAPE_DELTA:
+                mState = eRLEStateNeedXDelta;
+                continue;
+
+              default : // absolute mode
+                // Save the number of pixels to read
+                mStateData = byte;
+                if (mCurPos + mStateData > (uint32_t)mBIH.width) {
+                  // We can work around bitmaps that specify
+                  // one pixel too many, but only if their
+                  // width is odd.
+                  mStateData -= mBIH.width & 1;
+                  if (mCurPos + mStateData > (uint32_t)mBIH.width) {
+                      PostDataError();
+                      return;
+                  }
                 }
+
+              // See if we will need to skip a byte
+              // to word align the pixel data
+              // mStateData is a number of pixels
+              // so allow for the RLE compression type
+              // Pixels RLE8=1 RLE4=2
+              //    1    Pad    Pad
+              //    2    No     Pad
+              //    3    Pad    No
+              //    4    No     No
+              if (((mStateData - 1) & mBIH.compression) != 0) {
+                  mState = eRLEStateAbsoluteMode;
+              } else {
+                  mState = eRLEStateAbsoluteModePadded;
+              }
+              continue;
             }
-        }
-    }
+            break;
 
-    const uint32_t rows = mOldLine - mCurLine;
-    if (rows) {
+          case eRLEStateNeedXDelta:
+            // Handle the XDelta and proceed to get Y Delta
+            byte = *aBuffer++;
+            aCount--;
+            mCurPos += byte;
+            // Delta encoding makes it possible to skip pixels
+            // making the image transparent.
+            if (MOZ_UNLIKELY(!mHaveAlphaData)) {
+                PostHasTransparency();
+            }
+            mUseAlphaData = mHaveAlphaData = true;
+            if (mCurPos > mBIH.width) {
+                mCurPos = mBIH.width;
+            }
 
-        // Invalidate
-        nsIntRect r(0, mBIH.height < 0 ? -mBIH.height - mOldLine : mCurLine,
-                    mBIH.width, rows);
-        PostInvalidation(r);
+            mState = eRLEStateNeedYDelta;
+            continue;
+
+          case eRLEStateNeedYDelta:
+            // Get the Y Delta and then "handle" the move
+            byte = *aBuffer++;
+            aCount--;
+            mState = eRLEStateInitial;
+            // Delta encoding makes it possible to skip pixels
+            // making the image transparent.
+            if (MOZ_UNLIKELY(!mHaveAlphaData)) {
+                PostHasTransparency();
+            }
+            mUseAlphaData = mHaveAlphaData = true;
+            mCurLine -= std::min<int32_t>(byte, mCurLine);
+            break;
+
+          case eRLEStateAbsoluteMode: // Absolute Mode
+          case eRLEStateAbsoluteModePadded:
+            if (mStateData) {
+              // In absolute mode, the second byte (mStateData)
+              // represents the number of pixels
+              // that follow, each of which contains
+              // the color index of a single pixel.
+              uint32_t* d = reinterpret_cast<uint32_t*>
+                            (mImageData) +
+                            PIXEL_OFFSET(mCurLine, mCurPos);
+              uint32_t* oldPos = d;
+              if (mBIH.compression == BI_RLE8) {
+                  while (aCount > 0 && mStateData > 0) {
+                    byte = *aBuffer++;
+                    aCount--;
+                    SetPixel(d, byte, mColors);
+                    mStateData--;
+                  }
+              } else {
+                  while (aCount > 0 && mStateData > 0) {
+                    byte = *aBuffer++;
+                    aCount--;
+                    Set4BitPixel(d, byte, mStateData, mColors);
+                  }
+              }
+              mCurPos += d - oldPos;
+            }
+
+            if (mStateData == 0) {
+              // In absolute mode, each run must
+              // be aligned on a word boundary
+
+              if (mState == eRLEStateAbsoluteMode) {
+                // word aligned
+                mState = eRLEStateInitial;
+              } else if (aCount > 0) {
+                // not word aligned
+                // "next" byte is just a padding byte
+                // so "move" past it and we can continue
+                aBuffer++;
+                aCount--;
+                mState = eRLEStateInitial;
+              }
+            }
+            // else state is still eRLEStateAbsoluteMode
+            continue;
 
-        mOldLine = mCurLine;
+          default :
+            NS_ABORT_IF_FALSE(0,
+                           "BMP RLE decompression: unknown state!");
+            PostDecoderError(NS_ERROR_UNEXPECTED);
+            return;
+        }
+        // Because of the use of the continue statement
+        // we only get here for eol, eof or y delta
+        if (mCurLine == 0) {
+          // Finished last line
+          break;
+        }
+      }
     }
+  }
 
-    return;
+  const uint32_t rows = mOldLine - mCurLine;
+  if (rows) {
+    // Invalidate
+    nsIntRect r(0, mBIH.height < 0 ? -mBIH.height - mOldLine : mCurLine,
+                mBIH.width, rows);
+    PostInvalidation(r);
+
+    mOldLine = mCurLine;
+  }
+
+  return;
 }
 
-void nsBMPDecoder::ProcessFileHeader()
+void
+nsBMPDecoder::ProcessFileHeader()
 {
-    memset(&mBFH, 0, sizeof(mBFH));
-    memcpy(&mBFH.signature, mRawBuf, sizeof(mBFH.signature));
-    memcpy(&mBFH.filesize, mRawBuf + 2, sizeof(mBFH.filesize));
-    memcpy(&mBFH.reserved, mRawBuf + 6, sizeof(mBFH.reserved));
-    memcpy(&mBFH.dataoffset, mRawBuf + 10, sizeof(mBFH.dataoffset));
-    memcpy(&mBFH.bihsize, mRawBuf + 14, sizeof(mBFH.bihsize));
-
-    // Now correct the endianness of the header
-    mBFH.filesize = LittleEndian::readUint32(&mBFH.filesize);
-    mBFH.dataoffset = LittleEndian::readUint32(&mBFH.dataoffset);
-    mBFH.bihsize = LittleEndian::readUint32(&mBFH.bihsize);
+  memset(&mBFH, 0, sizeof(mBFH));
+  memcpy(&mBFH.signature, mRawBuf, sizeof(mBFH.signature));
+  memcpy(&mBFH.filesize, mRawBuf + 2, sizeof(mBFH.filesize));
+  memcpy(&mBFH.reserved, mRawBuf + 6, sizeof(mBFH.reserved));
+  memcpy(&mBFH.dataoffset, mRawBuf + 10, sizeof(mBFH.dataoffset));
+  memcpy(&mBFH.bihsize, mRawBuf + 14, sizeof(mBFH.bihsize));
+
+  // Now correct the endianness of the header
+  mBFH.filesize = LittleEndian::readUint32(&mBFH.filesize);
+  mBFH.dataoffset = LittleEndian::readUint32(&mBFH.dataoffset);
+  mBFH.bihsize = LittleEndian::readUint32(&mBFH.bihsize);
 }
 
-void nsBMPDecoder::ProcessInfoHeader()
+void
+nsBMPDecoder::ProcessInfoHeader()
 {
-    memset(&mBIH, 0, sizeof(mBIH));
-    if (mBFH.bihsize == 12) { // OS/2 Bitmap
-        memcpy(&mBIH.width, mRawBuf, 2);
-        memcpy(&mBIH.height, mRawBuf + 2, 2);
-        memcpy(&mBIH.planes, mRawBuf + 4, sizeof(mBIH.planes));
-        memcpy(&mBIH.bpp, mRawBuf + 6, sizeof(mBIH.bpp));
-    }
-    else {
-        memcpy(&mBIH.width, mRawBuf, sizeof(mBIH.width));
-        memcpy(&mBIH.height, mRawBuf + 4, sizeof(mBIH.height));
-        memcpy(&mBIH.planes, mRawBuf + 8, sizeof(mBIH.planes));
-        memcpy(&mBIH.bpp, mRawBuf + 10, sizeof(mBIH.bpp));
-        memcpy(&mBIH.compression, mRawBuf + 12, sizeof(mBIH.compression));
-        memcpy(&mBIH.image_size, mRawBuf + 16, sizeof(mBIH.image_size));
-        memcpy(&mBIH.xppm, mRawBuf + 20, sizeof(mBIH.xppm));
-        memcpy(&mBIH.yppm, mRawBuf + 24, sizeof(mBIH.yppm));
-        memcpy(&mBIH.colors, mRawBuf + 28, sizeof(mBIH.colors));
-        memcpy(&mBIH.important_colors, mRawBuf + 32, sizeof(mBIH.important_colors));
-    }
+  memset(&mBIH, 0, sizeof(mBIH));
+  if (mBFH.bihsize == 12) { // OS/2 Bitmap
+    memcpy(&mBIH.width, mRawBuf, 2);
+    memcpy(&mBIH.height, mRawBuf + 2, 2);
+    memcpy(&mBIH.planes, mRawBuf + 4, sizeof(mBIH.planes));
+    memcpy(&mBIH.bpp, mRawBuf + 6, sizeof(mBIH.bpp));
+  } else {
+    memcpy(&mBIH.width, mRawBuf, sizeof(mBIH.width));
+    memcpy(&mBIH.height, mRawBuf + 4, sizeof(mBIH.height));
+    memcpy(&mBIH.planes, mRawBuf + 8, sizeof(mBIH.planes));
+    memcpy(&mBIH.bpp, mRawBuf + 10, sizeof(mBIH.bpp));
+    memcpy(&mBIH.compression, mRawBuf + 12, sizeof(mBIH.compression));
+    memcpy(&mBIH.image_size, mRawBuf + 16, sizeof(mBIH.image_size));
+    memcpy(&mBIH.xppm, mRawBuf + 20, sizeof(mBIH.xppm));
+    memcpy(&mBIH.yppm, mRawBuf + 24, sizeof(mBIH.yppm));
+    memcpy(&mBIH.colors, mRawBuf + 28, sizeof(mBIH.colors));
+    memcpy(&mBIH.important_colors, mRawBuf + 32,
+           sizeof(mBIH.important_colors));
+  }
 
-    // Convert endianness
-    mBIH.width = LittleEndian::readUint32(&mBIH.width);
-    mBIH.height = LittleEndian::readUint32(&mBIH.height);
-    mBIH.planes = LittleEndian::readUint16(&mBIH.planes);
-    mBIH.bpp = LittleEndian::readUint16(&mBIH.bpp);
-
-    mBIH.compression = LittleEndian::readUint32(&mBIH.compression);
-    mBIH.image_size = LittleEndian::readUint32(&mBIH.image_size);
-    mBIH.xppm = LittleEndian::readUint32(&mBIH.xppm);
-    mBIH.yppm = LittleEndian::readUint32(&mBIH.yppm);
-    mBIH.colors = LittleEndian::readUint32(&mBIH.colors);
-    mBIH.important_colors = LittleEndian::readUint32(&mBIH.important_colors);
+  // Convert endianness
+  mBIH.width = LittleEndian::readUint32(&mBIH.width);
+  mBIH.height = LittleEndian::readUint32(&mBIH.height);
+  mBIH.planes = LittleEndian::readUint16(&mBIH.planes);
+  mBIH.bpp = LittleEndian::readUint16(&mBIH.bpp);
+
+  mBIH.compression = LittleEndian::readUint32(&mBIH.compression);
+  mBIH.image_size = LittleEndian::readUint32(&mBIH.image_size);
+  mBIH.xppm = LittleEndian::readUint32(&mBIH.xppm);
+  mBIH.yppm = LittleEndian::readUint32(&mBIH.yppm);
+  mBIH.colors = LittleEndian::readUint32(&mBIH.colors);
+  mBIH.important_colors = LittleEndian::readUint32(&mBIH.important_colors);
 }
 
 } // namespace image
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsBMPDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsBMPDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsBMPDecoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsBMPDecoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -4,117 +4,130 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#ifndef _nsBMPDecoder_h
-#define _nsBMPDecoder_h
+#ifndef nsBMPDecoder_h
+#define nsBMPDecoder_h
 
-#include "nsAutoPtr.h"
-#include "gfxColor.h"
-#include "Decoder.h"
 #include "BMPFileHeaders.h"
+#include "Decoder.h"
+#include "gfxColor.h"
+#include "nsAutoPtr.h"
 
 namespace mozilla {
 namespace image {
 
 class RasterImage;
 
-/**
- * Decoder for BMP-Files, as used by Windows and OS/2
- */
+/// Decoder for BMP-Files, as used by Windows and OS/2
+
 class nsBMPDecoder : public Decoder
 {
 public:
 
-    explicit nsBMPDecoder(RasterImage &aImage);
+    explicit nsBMPDecoder(RasterImage& aImage);
     ~nsBMPDecoder();
 
     // Specifies whether or not the BMP file will contain alpha data
     // If set to true and the BMP is 32BPP, the alpha data will be
-    // retrieved from the 4th byte of image data per pixel 
+    // retrieved from the 4th byte of image data per pixel
     void SetUseAlphaData(bool useAlphaData);
+
     // Obtains the bits per pixel from the internal BIH header
     int32_t GetBitsPerPixel() const;
+
     // Obtains the width from the internal BIH header
     int32_t GetWidth() const;
+
     // Obtains the abs-value of the height from the internal BIH header
     int32_t GetHeight() const;
+
     // Obtains the internal output image buffer
     uint32_t* GetImageData();
+
     // Obtains the size of the compressed image resource
     int32_t GetCompressedImageSize() const;
+
     // Obtains whether or not a BMP file had alpha data in its 4th byte
     // for 32BPP bitmaps.  Only use after the bitmap has been processed.
     bool HasAlphaData() const;
 
-    virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+    virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+                               DecodeStrategy aStrategy) MOZ_OVERRIDE;
     virtual void FinishInternal();
 
 private:
 
-    /** Calculates the red-, green- and blueshift in mBitFields using
-     * the bitmasks from mBitFields */
+    /// Calculates the red-, green- and blueshift in mBitFields using
+    /// the bitmasks from mBitFields
     NS_METHOD CalcBitShift();
 
-    uint32_t mPos; ///< Number of bytes read from aBuffer in WriteInternal()
+    uint32_t mPos; //< Number of bytes read from aBuffer in WriteInternal()
 
     BMPFILEHEADER mBFH;
     BITMAPV5HEADER mBIH;
-    char mRawBuf[WIN_V3_INTERNAL_BIH_LENGTH]; ///< If this is changed, WriteInternal() MUST be updated
+    char mRawBuf[WIN_V3_INTERNAL_BIH_LENGTH]; //< If this is changed,
+                                              // WriteInternal() MUST be updated
 
-    uint32_t mLOH; ///< Length of the header
+    uint32_t mLOH; //< Length of the header
 
-    uint32_t mNumColors; ///< The number of used colors, i.e. the number of entries in mColors
-    colorTable *mColors;
+    uint32_t mNumColors; //< The number of used colors, i.e. the number of
+                         // entries in mColors
+    colorTable* mColors;
 
     bitFields mBitFields;
 
-    uint8_t *mRow;      ///< Holds one raw line of the image
-    uint32_t mRowBytes; ///< How many bytes of the row were already received
-    int32_t mCurLine;   ///< Index of the line of the image that's currently being decoded: [height,1]
-    int32_t mOldLine;   ///< Previous index of the line 
-    int32_t mCurPos;    ///< Index in the current line of the image
-
-    ERLEState mState;   ///< Maintains the current state of the RLE decoding
-    uint32_t mStateData;///< Decoding information that is needed depending on mState
+    uint8_t* mRow;      //< Holds one raw line of the image
+    uint32_t mRowBytes; //< How many bytes of the row were already received
+    int32_t mCurLine;   //< Index of the line of the image that's currently
+                        // being decoded: [height,1]
+    int32_t mOldLine;   //< Previous index of the line
+    int32_t mCurPos;    //< Index in the current line of the image
+
+    ERLEState mState;   //< Maintains the current state of the RLE decoding
+    uint32_t mStateData;//< Decoding information that is needed depending
+                        // on mState
 
-    /** Set mBFH from the raw data in mRawBuf, converting from little-endian
-     * data to native data as necessary */
+    /// Set mBFH from the raw data in mRawBuf, converting from little-endian
+    /// data to native data as necessary
     void ProcessFileHeader();
-    /** Set mBIH from the raw data in mRawBuf, converting from little-endian
-     * data to native data as necessary */
+
+    /// Set mBIH from the raw data in mRawBuf, converting from little-endian
+    /// data to native data as necessary
     void ProcessInfoHeader();
 
     // Stores whether the image data may store alpha data, or if
-    // the alpha data is unspecified and filled with a padding byte of 0. 
+    // the alpha data is unspecified and filled with a padding byte of 0.
     // When a 32BPP bitmap is stored in an ICO or CUR file, its 4th byte
     // is used for alpha transparency.  When it is stored in a BMP, its
     // 4th byte is reserved and is always 0.
-    // Reference: 
+    // Reference:
     // http://en.wikipedia.org/wiki/ICO_(file_format)#cite_note-9
     // Bitmaps where the alpha bytes are all 0 should be fully visible.
     bool mUseAlphaData;
+
     // Whether the 4th byte alpha data was found to be non zero and hence used.
     bool mHaveAlphaData;
 };
 
-/** Sets the pixel data in aDecoded to the given values.
- * @param aDecoded pointer to pixel to be set, will be incremented to point to the next pixel.
- */
-static inline void SetPixel(uint32_t*& aDecoded, uint8_t aRed, uint8_t aGreen, uint8_t aBlue, uint8_t aAlpha = 0xFF)
+/// Sets the pixel data in aDecoded to the given values.
+/// @param aDecoded pointer to pixel to be set, will be incremented to point to
+/// the next pixel.
+static inline void SetPixel(uint32_t*& aDecoded, uint8_t aRed, uint8_t aGreen,
+                            uint8_t aBlue, uint8_t aAlpha = 0xFF)
 {
     *aDecoded++ = gfxPackedPixel(aAlpha, aRed, aGreen, aBlue);
 }
 
-static inline void SetPixel(uint32_t*& aDecoded, uint8_t idx, colorTable* aColors)
+static inline void SetPixel(uint32_t*& aDecoded, uint8_t idx, colorTable*
+                            aColors)
 {
     SetPixel(aDecoded, aColors[idx].red, aColors[idx].green, aColors[idx].blue);
 }
 
-/** Sets two (or one if aCount = 1) pixels
- * @param aDecoded where the data is stored. Will be moved 4 resp 8 bytes
- * depending on whether one or two pixels are written.
- * @param aData The values for the two pixels
- * @param aCount Current count. Is decremented by one or two.
- */
+/// Sets two (or one if aCount = 1) pixels
+/// @param aDecoded where the data is stored. Will be moved 4 resp 8 bytes
+/// depending on whether one or two pixels are written.
+/// @param aData The values for the two pixels
+/// @param aCount Current count. Is decremented by one or two.
 inline void Set4BitPixel(uint32_t*& aDecoded, uint8_t aData,
                          uint32_t& aCount, colorTable* aColors)
 {
@@ -130,6 +143,4 @@
 } // namespace image
 } // namespace mozilla
 
-
-#endif
-
+#endif // nsBMPDecoder_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsGIFDecoder2.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsGIFDecoder2.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsGIFDecoder2.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsGIFDecoder2.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -52,25 +52,23 @@
 namespace mozilla {
 namespace image {
 
-/*
- * GETN(n, s) requests at least 'n' bytes available from 'q', at start of state 's'
- *
- * Colormaps are directly copied in the resp. global_colormap or the local_colormap of the PAL image frame
- * So a fixed buffer in gif_struct is good enough.
- * This buffer is only needed to copy left-over data from one GifWrite call to the next
- */
+// GETN(n, s) requests at least 'n' bytes available from 'q', at start of state
+// 's'. Colormaps are directly copied in the resp. global_colormap or the
+// local_colormap of the PAL image frame So a fixed buffer in gif_struct is
+// good enough. This buffer is only needed to copy left-over data from one
+// GifWrite call to the next
 #define GETN(n,s)                      \
   PR_BEGIN_MACRO                       \
     mGIFStruct.bytes_to_consume = (n); \
     mGIFStruct.state = (s);            \
   PR_END_MACRO
 
-/* Get a 16-bit value stored in little-endian format */
+// Get a 16-bit value stored in little-endian format
 #define GETINT16(p)   ((p)[1]<<8|(p)[0])
 //////////////////////////////////////////////////////////////////////
 // GIF Decoder Implementation
 
-nsGIFDecoder2::nsGIFDecoder2(RasterImage &aImage)
+nsGIFDecoder2::nsGIFDecoder2(RasterImage& aImage)
   : Decoder(aImage)
   , mCurrentRow(-1)
   , mLastFlushedRow(-1)
@@ -105,8 +103,9 @@
 
   // If the GIF got cut off, handle it anyway
   if (!IsSizeDecode() && mGIFOpen) {
-    if (mCurrentFrameIndex == mGIFStruct.images_decoded)
+    if (mCurrentFrameIndex == mGIFStruct.images_decoded) {
       EndImageFrame();
+    }
     PostDecodeDone(mGIFStruct.loop_count - 1);
     mGIFOpen = false;
   }
@@ -118,7 +117,8 @@
 void
 nsGIFDecoder2::FlushImageData(uint32_t fromRow, uint32_t rows)
 {
-  nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow, mGIFStruct.width, rows);
+  nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow,
+              mGIFStruct.width, rows);
   PostInvalidation(r);
 }
 
@@ -127,16 +127,18 @@
 {
   switch (mCurrentPass - mLastFlushedPass) {
     case 0:  // same pass
-      if (mCurrentRow - mLastFlushedRow)
+      if (mCurrentRow - mLastFlushedRow) {
         FlushImageData(mLastFlushedRow + 1, mCurrentRow - mLastFlushedRow);
+      }
       break;
-  
+
     case 1:  // one pass on - need to handle bottom & top rects
       FlushImageData(0, mCurrentRow + 1);
-      FlushImageData(mLastFlushedRow + 1, mGIFStruct.height - (mLastFlushedRow + 1));
+      FlushImageData(mLastFlushedRow + 1,
+                     mGIFStruct.height - (mLastFlushedRow + 1));
       break;
 
-    default:   // more than one pass on - push the whole frame
+    default: // more than one pass on - push the whole frame
       FlushImageData(0, mGIFStruct.height);
   }
 }
@@ -146,10 +148,12 @@
 //******************************************************************************
 
 //******************************************************************************
-void nsGIFDecoder2::BeginGIF()
+void
+nsGIFDecoder2::BeginGIF()
 {
-  if (mGIFOpen)
+  if (mGIFOpen) {
     return;
+  }
 
   mGIFOpen = true;
 
@@ -157,15 +161,18 @@
 }
 
 //******************************************************************************
-void nsGIFDecoder2::BeginImageFrame(uint16_t aDepth)
+void
+nsGIFDecoder2::BeginImageFrame(uint16_t aDepth)
 {
+  MOZ_ASSERT(HasSize());
+
   gfx::SurfaceFormat format;
-  if (mGIFStruct.is_transparent)
+  if (mGIFStruct.is_transparent) {
     format = gfx::SurfaceFormat::B8G8R8A8;
-  else
+    PostHasTransparency();
+  } else {
     format = gfx::SurfaceFormat::B8G8R8X8;
-
-  MOZ_ASSERT(HasSize());
+  }
 
   // Use correct format, RGB for first frame, PAL for following frames
   // and include transparency to allow for optimization of opaque images
@@ -183,12 +190,18 @@
                                                         mGIFStruct.y_offset,
                                                         mGIFStruct.width,
                                                         mGIFStruct.height))) {
+
+      // We need padding on the first frame, which means that we don't draw into
+      // part of the image at all. Report that as transparency.
+      PostHasTransparency();
+
       // Regardless of depth of input, image is decoded into 24bit RGB
       NeedNewFrame(mGIFStruct.images_decoded, mGIFStruct.x_offset,
                    mGIFStruct.y_offset, mGIFStruct.width, mGIFStruct.height,
                    format);
     } else {
-      // Our preallocated frame matches up, with the possible exception of alpha.
+      // Our preallocated frame matches up, with the possible exception
+      // of alpha.
       if (format == gfx::SurfaceFormat::B8G8R8X8) {
         currentFrame->SetHasNoAlpha();
       }
@@ -200,11 +213,12 @@
 
 
 //******************************************************************************
-void nsGIFDecoder2::EndImageFrame()
+void
+nsGIFDecoder2::EndImageFrame()
 {
   FrameBlender::FrameAlpha alpha = FrameBlender::kFrameHasAlpha;
 
-  // First flush all pending image data 
+  // First flush all pending image data
   if (!mGIFStruct.images_decoded) {
     // Only need to flush first frame
     FlushImageData();
@@ -231,7 +245,9 @@
   if (mGIFStruct.rows_remaining != mGIFStruct.height) {
     if (mGIFStruct.rows_remaining && mGIFStruct.images_decoded) {
       // Clear the remaining rows (only needed for the animation frames)
-      uint8_t *rowp = mImageData + ((mGIFStruct.height - mGIFStruct.rows_remaining) * mGIFStruct.width);
+      uint8_t* rowp =
+        mImageData + ((mGIFStruct.height - mGIFStruct.rows_remaining) *
+                      mGIFStruct.width);
       memset(rowp, 0, mGIFStruct.rows_remaining * mGIFStruct.width);
     }
   }
@@ -259,58 +275,61 @@
 
 //******************************************************************************
 // Send the data to the display front-end.
-uint32_t nsGIFDecoder2::OutputRow()
+uint32_t
+nsGIFDecoder2::OutputRow()
 {
   int drow_start, drow_end;
   drow_start = drow_end = mGIFStruct.irow;
 
-  /* Protect against too much image data */
+  // Protect against too much image data
   if ((unsigned)drow_start >= mGIFStruct.height) {
     NS_WARNING("GIF2.cpp::OutputRow - too much image data");
     return 0;
   }
 
   if (!mGIFStruct.images_decoded) {
-    /*
-     * Haeberli-inspired hack for interlaced GIFs: Replicate lines while
-     * displaying to diminish the "venetian-blind" effect as the image is
-     * loaded. Adjust pixel vertical positions to avoid the appearance of the
-     * image crawling up the screen as successive passes are drawn.
-     */
-    if (mGIFStruct.progressive_display && mGIFStruct.interlaced && (mGIFStruct.ipass < 4)) {
-      /* ipass = 1,2,3 results in resp. row_dup = 7,3,1 and row_shift = 3,1,0 */
+    // Haeberli-inspired hack for interlaced GIFs: Replicate lines while
+    // displaying to diminish the "venetian-blind" effect as the image is
+    // loaded. Adjust pixel vertical positions to avoid the appearance of the
+    // image crawling up the screen as successive passes are drawn.
+    if (mGIFStruct.progressive_display && mGIFStruct.interlaced &&
+        (mGIFStruct.ipass < 4)) {
+      // ipass = 1,2,3 results in resp. row_dup = 7,3,1 and row_shift = 3,1,0
       const uint32_t row_dup = 15 >> mGIFStruct.ipass;
       const uint32_t row_shift = row_dup >> 1;
-  
+
       drow_start -= row_shift;
       drow_end = drow_start + row_dup;
-  
-      /* Extend if bottom edge isn't covered because of the shift upward. */
-      if (((mGIFStruct.height - 1) - drow_end) <= row_shift)
+
+      // Extend if bottom edge isn't covered because of the shift upward.
+      if (((mGIFStruct.height - 1) - drow_end) <= row_shift) {
         drow_end = mGIFStruct.height - 1;
-  
-      /* Clamp first and last rows to upper and lower edge of image. */
-      if (drow_start < 0)
+      }
+
+      // Clamp first and last rows to upper and lower edge of image.
+      if (drow_start < 0) {
         drow_start = 0;
-      if ((unsigned)drow_end >= mGIFStruct.height)
+      }
+      if ((unsigned)drow_end >= mGIFStruct.height) {
         drow_end = mGIFStruct.height - 1;
+      }
     }
 
     // Row to process
-    const uint32_t bpr = sizeof(uint32_t) * mGIFStruct.width; 
-    uint8_t *rowp = mImageData + (mGIFStruct.irow * bpr);
+    const uint32_t bpr = sizeof(uint32_t) * mGIFStruct.width;
+    uint8_t* rowp = mImageData + (mGIFStruct.irow * bpr);
 
     // Convert color indices to Cairo pixels
-    uint8_t *from = rowp + mGIFStruct.width;
-    uint32_t *to = ((uint32_t*)rowp) + mGIFStruct.width;
-    uint32_t *cmap = mColormap;
+    uint8_t* from = rowp + mGIFStruct.width;
+    uint32_t* to = ((uint32_t*)rowp) + mGIFStruct.width;
+    uint32_t* cmap = mColormap;
     for (uint32_t c = mGIFStruct.width; c > 0; c--) {
       *--to = cmap[*--from];
     }
-  
+
     // check for alpha (only for first frame)
     if (mGIFStruct.is_transparent && !mSawTransparency) {
-      const uint32_t *rgb = (uint32_t*)rowp;
+      const uint32_t* rgb = (uint32_t*)rowp;
       for (uint32_t i = mGIFStruct.width; i > 0; i--) {
         if (*rgb++ == 0) {
           mSawTransparency = true;
@@ -332,8 +351,9 @@
 
   mCurrentRow = drow_end;
   mCurrentPass = mGIFStruct.ipass;
-  if (mGIFStruct.ipass == 1)
+  if (mGIFStruct.ipass == 1) {
     mLastFlushedPass = mGIFStruct.ipass;   // interlaced starts at 1
+  }
 
   if (!mGIFStruct.interlaced) {
     mGIFStruct.irow++;
@@ -354,17 +374,17 @@
 }
 
 //******************************************************************************
-/* Perform Lempel-Ziv-Welch decoding */
+// Perform Lempel-Ziv-Welch decoding
 bool
-nsGIFDecoder2::DoLzw(const uint8_t *q)
+nsGIFDecoder2::DoLzw(const uint8_t* q)
 {
-  if (!mGIFStruct.rows_remaining)
+  if (!mGIFStruct.rows_remaining) {
     return true;
+  }
 
-  /* Copy all the decoder state variables into locals so the compiler
-   * won't worry about them being aliased.  The locals will be homed
-   * back into the GIF decoder structure when we exit.
-   */
+  // Copy all the decoder state variables into locals so the compiler
+  // won't worry about them being aliased.  The locals will be homed
+  // back into the GIF decoder structure when we exit.
   int avail       = mGIFStruct.avail;
   int bits        = mGIFStruct.bits;
   int codesize    = mGIFStruct.codesize;
@@ -374,16 +394,17 @@
   const int clear_code = ClearCode();
   uint8_t firstchar = mGIFStruct.firstchar;
   int32_t datum     = mGIFStruct.datum;
-  uint16_t *prefix  = mGIFStruct.prefix;
-  uint8_t *stackp   = mGIFStruct.stackp;
-  uint8_t *suffix   = mGIFStruct.suffix;
-  uint8_t *stack    = mGIFStruct.stack;
-  uint8_t *rowp     = mGIFStruct.rowp;
+  uint16_t* prefix  = mGIFStruct.prefix;
+  uint8_t* stackp   = mGIFStruct.stackp;
+  uint8_t* suffix   = mGIFStruct.suffix;
+  uint8_t* stack    = mGIFStruct.stack;
+  uint8_t* rowp     = mGIFStruct.rowp;
 
   uint32_t bpr = mGIFStruct.width;
-  if (!mGIFStruct.images_decoded) 
+  if (!mGIFStruct.images_decoded) {
     bpr *= sizeof(uint32_t);
-  uint8_t *rowend   = mImageData + (bpr * mGIFStruct.irow) + mGIFStruct.width;
+  }
+  uint8_t* rowend   = mImageData + (bpr * mGIFStruct.irow) + mGIFStruct.width;
 
 #define OUTPUT_ROW()                                        \
   PR_BEGIN_MACRO                                            \
@@ -393,21 +414,19 @@
     rowend = rowp + mGIFStruct.width;                       \
   PR_END_MACRO
 
-  for (const uint8_t* ch = q; count-- > 0; ch++)
-  {
-    /* Feed the next byte into the decoder's 32-bit input buffer. */
-    datum += ((int32_t) *ch) << bits;
+  for (const uint8_t* ch = q; count-- > 0; ch++) {
+    // Feed the next byte into the decoder's 32-bit input buffer.
+    datum += ((int32_t)* ch) << bits;
     bits += 8;
 
-    /* Check for underflow of decoder's 32-bit input buffer. */
-    while (bits >= codesize)
-    {
-      /* Get the leading variable-length symbol from the data stream */
+    // Check for underflow of decoder's 32-bit input buffer.
+    while (bits >= codesize) {
+      // Get the leading variable-length symbol from the data stream
       int code = datum & codemask;
       datum >>= codesize;
       bits -= codesize;
 
-      /* Reset the dictionary to its original state, if requested */
+      // Reset the dictionary to its original state, if requested
       if (code == clear_code) {
         codesize = mGIFStruct.datasize + 1;
         codemask = (1 << codesize) - 1;
@@ -416,18 +435,20 @@
         continue;
       }
 
-      /* Check for explicit end-of-stream code */
+      // Check for explicit end-of-stream code
       if (code == (clear_code + 1)) {
-        /* end-of-stream should only appear after all image data */
+        // end-of-stream should only appear after all image data
         return (mGIFStruct.rows_remaining == 0);
       }
 
       if (oldcode == -1) {
-        if (code >= MAX_BITS)
+        if (code >= MAX_BITS) {
           return false;
+        }
         *rowp++ = suffix[code] & mColorMask; // ensure index is within colormap
-        if (rowp == rowend)
+        if (rowp == rowend) {
           OUTPUT_ROW();
+        }
 
         firstchar = oldcode = code;
         continue;
@@ -438,34 +459,35 @@
         *stackp++ = firstchar;
         code = oldcode;
 
-        if (stackp >= stack + MAX_BITS)
+        if (stackp >= stack + MAX_BITS) {
           return false;
+        }
       }
 
-      while (code >= clear_code)
-      {
-        if ((code >= MAX_BITS) || (code == prefix[code]))
+      while (code >= clear_code) {
+        if ((code >= MAX_BITS) || (code == prefix[code])) {
           return false;
+        }
 
         *stackp++ = suffix[code];
         code = prefix[code];
 
-        if (stackp == stack + MAX_BITS)
+        if (stackp == stack + MAX_BITS) {
           return false;
+        }
       }
 
       *stackp++ = firstchar = suffix[code];
 
-      /* Define a new codeword in the dictionary. */
+      // Define a new codeword in the dictionary.
       if (avail < 4096) {
         prefix[avail] = oldcode;
         suffix[avail] = firstchar;
         avail++;
 
-        /* If we've used up all the codewords of a given length
-         * increase the length of codewords by one bit, but don't
-         * exceed the specified maximum codeword size of 12 bits.
-         */
+        // If we've used up all the codewords of a given length
+        // increase the length of codewords by one bit, but don't
+        // exceed the specified maximum codeword size of 12 bits.
         if (((avail & codemask) == 0) && (avail < 4096)) {
           codesize++;
           codemask += avail;
@@ -473,18 +495,19 @@
       }
       oldcode = incode;
 
-      /* Copy the decoded data out to the scanline buffer. */
+      // Copy the decoded data out to the scanline buffer.
       do {
         *rowp++ = *--stackp & mColorMask; // ensure index is within colormap
-        if (rowp == rowend)
+        if (rowp == rowend) {
           OUTPUT_ROW();
+        }
       } while (stackp > stack);
     }
   }
 
   END:
 
-  /* Home the local copies of the GIF decoder state variables */
+  // Home the local copies of the GIF decoder state variables
   mGIFStruct.avail = avail;
   mGIFStruct.bits = bits;
   mGIFStruct.codesize = codesize;
@@ -499,22 +522,22 @@
   return true;
 }
 
-/** 
- * Expand the colormap from RGB to Packed ARGB as needed by Cairo.
- * And apply any LCMS transformation.
- */
-static void ConvertColormap(uint32_t *aColormap, uint32_t aColors)
+/// Expand the colormap from RGB to Packed ARGB as needed by Cairo.
+/// And apply any LCMS transformation.
+static void
+ConvertColormap(uint32_t* aColormap, uint32_t aColors)
 {
   // Apply CMS transformation if enabled and available
   if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
-    qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
-    if (transform)
+    qcms_transform* transform = gfxPlatform::GetCMSRGBTransform();
+    if (transform) {
       qcms_transform_data(transform, aColormap, aColormap, aColors);
+    }
   }
   // Convert from the GIF's RGB format to the Cairo format.
   // Work from end to begin, because of the in-place expansion
-  uint8_t *from = ((uint8_t *)aColormap) + 3 * aColors;
-  uint32_t *to = aColormap + aColors;
+  uint8_t* from = ((uint8_t*)aColormap) + 3 * aColors;
+  uint32_t* to = aColormap + aColors;
 
   // Convert color entries to Cairo format
 
@@ -546,22 +569,25 @@
 }
 
 void
-nsGIFDecoder2::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy)
+nsGIFDecoder2::WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy)
 {
   NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
 
-  // These variables changed names, and renaming would make a much bigger patch :(
-  const uint8_t *buf = (const uint8_t *)aBuffer;
+  // These variables changed names; renaming would make a much bigger patch :(
+  const uint8_t* buf = (const uint8_t*)aBuffer;
   uint32_t len = aCount;
 
-  const uint8_t *q = buf;
+  const uint8_t* q = buf;
 
   // Add what we have sofar to the block
-  // If previous call to me left something in the hold first complete current block
-  // Or if we are filling the colormaps, first complete the colormap
-  uint8_t* p = (mGIFStruct.state == gif_global_colormap) ? (uint8_t*)mGIFStruct.global_colormap :
-               (mGIFStruct.state == gif_image_colormap) ? (uint8_t*)mColormap :
-               (mGIFStruct.bytes_in_hold) ? mGIFStruct.hold : nullptr;
+  // If previous call to me left something in the hold first complete current
+  // block, or if we are filling the colormaps, first complete the colormap
+  uint8_t* p =
+    (mGIFStruct.state ==
+      gif_global_colormap) ? (uint8_t*) mGIFStruct.global_colormap :
+        (mGIFStruct.state == gif_image_colormap) ? (uint8_t*) mColormap :
+          (mGIFStruct.bytes_in_hold) ? mGIFStruct.hold : nullptr;
 
   if (len == 0 && buf == nullptr) {
     // We've just gotten the frame we asked for. Time to use the data we
@@ -592,13 +618,13 @@
   //    to point to next buffer, 'len' is adjusted accordingly.
   //    So that next round in for loop, q gets pointed to the next buffer.
 
-  for (;len >= mGIFStruct.bytes_to_consume; q=buf, mGIFStruct.bytes_in_hold = 0) {
+  for (;len >= mGIFStruct.bytes_to_consume; q=buf, mGIFStruct.bytes_in_hold = 0)
+  {
     // Eat the current block from the buffer, q keeps pointed at current block
     buf += mGIFStruct.bytes_to_consume;
     len -= mGIFStruct.bytes_to_consume;
 
-    switch (mGIFStruct.state)
-    {
+    switch (mGIFStruct.state) {
     case gif_lzw:
       if (!DoLzw(q)) {
         mGIFStruct.state = gif_error;
@@ -607,17 +633,17 @@
       GETN(1, gif_sub_block);
       break;
 
-    case gif_lzw_start:
-    {
+    case gif_lzw_start: {
       // Make sure the transparent pixel is transparent in the colormap
       if (mGIFStruct.is_transparent) {
         // Save old value so we can restore it later
-        if (mColormap == mGIFStruct.global_colormap)
+        if (mColormap == mGIFStruct.global_colormap) {
             mOldColor = mColormap[mGIFStruct.tpixel];
+        }
         mColormap[mGIFStruct.tpixel] = 0;
       }
 
-      /* Initialize LZW parser/decoder */
+      // Initialize LZW parser/decoder
       mGIFStruct.datasize = *q;
       const int clear_code = ClearCode();
       if (mGIFStruct.datasize > MAX_LZW_BITS ||
@@ -632,7 +658,7 @@
       mGIFStruct.codemask = (1 << mGIFStruct.codesize) - 1;
       mGIFStruct.datum = mGIFStruct.bits = 0;
 
-      /* init the tables */
+      // init the tables
       for (int i = 0; i < clear_code; i++)
         mGIFStruct.suffix[i] = i;
 
@@ -642,7 +668,7 @@
     }
     break;
 
-    /* All GIF files begin with "GIF87a" or "GIF89a" */
+    // All GIF files begin with "GIF87a" or "GIF89a"
     case gif_type:
       if (!strncmp((char*)q, "GIF89a", 6)) {
         mGIFStruct.version = 89;
@@ -656,12 +682,11 @@
       break;
 
     case gif_global_header:
-      /* This is the height and width of the "screen" or
-       * frame into which images are rendered.  The
-       * individual images can be smaller than the
-       * screen size and located with an origin anywhere
-       * within the screen.
-       */
+      // This is the height and width of the "screen" or
+      // frame into which images are rendered.  The
+      // individual images can be smaller than the
+      // screen size and located with an origin anywhere
+      // within the screen.
 
       mGIFStruct.screen_width = GETINT16(q);
       mGIFStruct.screen_height = GETINT16(q + 2);
@@ -679,7 +704,7 @@
       //   Not used
       //   float aspect = (float)((q[6] + 15) / 64.0);
 
-      if (q[4] & 0x80) { /* global map */
+      if (q[4] & 0x80) { // global map
         // Get the global colormap
         const uint32_t size = (3 << mGIFStruct.global_colormap_depth);
         if (len < size) {
@@ -701,7 +726,8 @@
     case gif_global_colormap:
       // Everything is already copied into global_colormap
       // Convert into Cairo colors including CMS transformation
-      ConvertColormap(mGIFStruct.global_colormap, 1<<mGIFStruct.global_colormap_depth);
+      ConvertColormap(mGIFStruct.global_colormap,
+                      1<<mGIFStruct.global_colormap_depth);
       GETN(1, gif_image_start);
       break;
 
@@ -720,20 +746,19 @@
           break;
 
         default:
-          /* If we get anything other than GIF_IMAGE_SEPARATOR, 
-           * GIF_EXTENSION_INTRODUCER, or GIF_TRAILER, there is extraneous data
-           * between blocks. The GIF87a spec tells us to keep reading
-           * until we find an image separator, but GIF89a says such
-           * a file is corrupt. We follow GIF89a and bail out. */
+          // If we get anything other than GIF_IMAGE_SEPARATOR,
+          // GIF_EXTENSION_INTRODUCER, or GIF_TRAILER, there is extraneous data
+          // between blocks. The GIF87a spec tells us to keep reading
+          // until we find an image separator, but GIF89a says such
+          // a file is corrupt. We follow GIF89a and bail out.
           if (mGIFStruct.images_decoded > 0) {
-            /* The file is corrupt, but one or more images have
-             * been decoded correctly. In this case, we proceed
-             * as if the file were correctly terminated and set
-             * the state to gif_done, so the GIF will display.
-             */
+            // The file is corrupt, but one or more images have
+            // been decoded correctly. In this case, we proceed
+            // as if the file were correctly terminated and set
+            // the state to gif_done, so the GIF will display.
             mGIFStruct.state = gif_done;
           } else {
-            /* No images decoded, there is nothing to display. */
+            // No images decoded, there is nothing to display.
             mGIFStruct.state = gif_error;
           }
       }
@@ -744,20 +769,24 @@
       if (mGIFStruct.bytes_to_consume) {
         switch (*q) {
         case GIF_GRAPHIC_CONTROL_LABEL:
-          // The GIF spec mandates that the GIFControlExtension header block length is 4 bytes,
-          // and the parser for this block reads 4 bytes, so we must enforce that the buffer
-          // contains at least this many bytes. If the GIF specifies a different length, we
-          // allow that, so long as it's larger; the additional data will simply be ignored.
+          // The GIF spec mandates that the GIFControlExtension header block
+          // length is 4 bytes, and the parser for this block reads 4 bytes,
+          // so we must enforce that the buffer contains at least this many
+          // bytes. If the GIF specifies a different length, we allow that, so
+          // long as it's larger; the additional data will simply be ignored.
           mGIFStruct.state = gif_control_extension;
-          mGIFStruct.bytes_to_consume = std::max(mGIFStruct.bytes_to_consume, 4u);
+          mGIFStruct.bytes_to_consume =
+            std::max(mGIFStruct.bytes_to_consume, 4u);
           break;
 
-        // The GIF spec also specifies the lengths of the following two extensions' headers
-        // (as 12 and 11 bytes, respectively). Because we ignore the plain text extension entirely
-        // and sanity-check the actual length of the application extension header before reading it,
-        // we allow GIFs to deviate from these values in either direction. This is important for
-        // real-world compatibility, as GIFs in the wild exist with application extension headers
-        // that are both shorter and longer than 11 bytes.
+        // The GIF spec also specifies the lengths of the following two
+        // extensions' headers (as 12 and 11 bytes, respectively). Because
+        // we ignore the plain text extension entirely and sanity-check the
+        // actual length of the application extension header before reading it,
+        // we allow GIFs to deviate from these values in either direction. This
+        // is important for real-world compatibility, as GIFs in the wild exist
+        // with application extension headers that are both shorter and longer
+        // than 11 bytes.
         case GIF_APPLICATION_EXTENSION_LABEL:
           mGIFStruct.state = gif_application_extension;
           break;
@@ -779,10 +808,11 @@
       break;
 
     case gif_consume_block:
-      if (!*q)
+      if (!*q) {
         GETN(1, gif_image_start);
-      else
+      } else {
         GETN(*q, gif_skip_block);
+      }
       break;
 
     case gif_skip_block:
@@ -795,17 +825,31 @@
       mGIFStruct.disposal_method = ((*q) >> 2) & 0x7;
       // Some specs say 3rd bit (value 4), other specs say value 3
       // Let's choose 3 (the more popular)
-      if (mGIFStruct.disposal_method == 4)
+      if (mGIFStruct.disposal_method == 4) {
         mGIFStruct.disposal_method = 3;
+      }
+
+      {
+        int32_t method =
+          FrameBlender::FrameDisposalMethod(mGIFStruct.disposal_method);
+        if (method == FrameBlender::kDisposeClearAll ||
+            method == FrameBlender::kDisposeClear) {
+          // We may have to display the background under this image during
+          // animation playback, so we regard it as transparent.
+          PostHasTransparency();
+        }
+      }
+
       mGIFStruct.delay_time = GETINT16(q + 1) * 10;
       GETN(1, gif_consume_block);
       break;
 
     case gif_comment_extension:
-      if (*q)
+      if (*q) {
         GETN(*q, gif_consume_comment);
-      else
+      } else {
         GETN(1, gif_image_start);
+      }
       break;
 
     case gif_consume_comment:
@@ -813,7 +857,7 @@
       break;
 
     case gif_application_extension:
-      /* Check for netscape application extension */
+      // Check for netscape application extension
       if (mGIFStruct.bytes_to_consume == 11 &&
           (!strncmp((char*)q, "NETSCAPE2.0", 11) ||
            !strncmp((char*)q, "ANIMEXTS1.0", 11)))
@@ -822,30 +866,33 @@
         GETN(1, gif_consume_block);
       break;
 
-    /* Netscape-specific GIF extension: animation looping */
+    // Netscape-specific GIF extension: animation looping
     case gif_netscape_extension_block:
-      if (*q)
+      if (*q) {
         // We might need to consume 3 bytes in
         // gif_consume_netscape_extension, so make sure we have at least that.
         GETN(std::max(3, static_cast<int>(*q)), gif_consume_netscape_extension);
-      else
+      } else {
         GETN(1, gif_image_start);
+      }
       break;
 
-    /* Parse netscape-specific application extensions */
+    // Parse netscape-specific application extensions
     case gif_consume_netscape_extension:
       switch (q[0] & 7) {
         case 1:
-          /* Loop entire animation specified # of times.  Only read the
-             loop count during the first iteration. */
+          // Loop entire animation specified # of times.  Only read the
+          // loop count during the first iteration.
           mGIFStruct.loop_count = GETINT16(q + 1);
           GETN(1, gif_netscape_extension_block);
           break;
 
         case 2:
-          /* Wait for specified # of bytes to enter buffer */
+          // Wait for specified # of bytes to enter buffer
+
           // Don't do this, this extension doesn't exist (isn't used at all)
-          // and doesn't do anything, as our streaming/buffering takes care of it all...
+          // and doesn't do anything, as our streaming/buffering takes care
+          // of it all...
           // See: http://semmix.pl/color/exgraf/eeg24.htm
           GETN(1, gif_netscape_extension_block);
           break;
@@ -856,21 +903,19 @@
       }
       break;
 
-    case gif_image_header:
-    {
-      /* Get image offsets, with respect to the screen origin */
+    case gif_image_header: {
+      // Get image offsets, with respect to the screen origin
       mGIFStruct.x_offset = GETINT16(q);
       mGIFStruct.y_offset = GETINT16(q + 2);
 
-      /* Get image width and height. */
+      // Get image width and height.
       mGIFStruct.width  = GETINT16(q + 4);
       mGIFStruct.height = GETINT16(q + 6);
 
       if (!mGIFStruct.images_decoded) {
-        /* Work around broken GIF files where the logical screen
-         * size has weird width or height.  We assume that GIF87a
-         * files don't contain animations.
-         */
+        // Work around broken GIF files where the logical screen
+        // size has weird width or height.  We assume that GIF87a
+        // files don't contain animations.
         if ((mGIFStruct.screen_height < mGIFStruct.height) ||
             (mGIFStruct.screen_width < mGIFStruct.width) ||
             (mGIFStruct.version == 87)) {
@@ -878,7 +923,7 @@
           mGIFStruct.screen_width = mGIFStruct.width;
           mGIFStruct.x_offset = 0;
           mGIFStruct.y_offset = 0;
-        }    
+        }
         // Create the image container with the right size.
         BeginGIF();
         if (HasError()) {
@@ -888,12 +933,12 @@
         }
 
         // If we were doing a size decode, we're done
-        if (IsSizeDecode())
+        if (IsSizeDecode()) {
           return;
+        }
       }
 
-      /* Work around more broken GIF files that have zero image
-         width or height */
+      // Work around more broken GIF files that have zero image width or height
       if (!mGIFStruct.height || !mGIFStruct.width) {
         mGIFStruct.height = mGIFStruct.screen_height;
         mGIFStruct.width = mGIFStruct.screen_width;
@@ -903,27 +948,31 @@
         }
       }
 
-      /* Depth of colors is determined by colormap */
-      /* (q[8] & 0x80) indicates local colormap */
-      /* bits per pixel is (q[8]&0x07 + 1) when local colormap is set */
+      // Depth of colors is determined by colormap
+      // (q[8] & 0x80) indicates local colormap
+      // bits per pixel is (q[8]&0x07 + 1) when local colormap is set
       uint32_t depth = mGIFStruct.global_colormap_depth;
-      if (q[8] & 0x80)
+      if (q[8] & 0x80) {
         depth = (q[8]&0x07) + 1;
+      }
       uint32_t realDepth = depth;
       while (mGIFStruct.tpixel >= (1 << realDepth) && (realDepth < 8)) {
         realDepth++;
-      } 
+      }
       // Mask to limit the color values within the colormap
       mColorMask = 0xFF >> (8 - realDepth);
       BeginImageFrame(realDepth);
 
       if (NeedsNewFrame()) {
         // We now need a new frame from the decoder framework. We leave all our
-        // data in the buffer as if it wasn't consumed, copy to our hold and return
-        // to the decoder framework.
-        uint32_t size = len + mGIFStruct.bytes_to_consume + mGIFStruct.bytes_in_hold;
+        // data in the buffer as if it wasn't consumed, copy to our hold and
+        // return to the decoder framework.
+        uint32_t size =
+          len + mGIFStruct.bytes_to_consume + mGIFStruct.bytes_in_hold;
         if (size) {
-          if (SetHold(q, mGIFStruct.bytes_to_consume + mGIFStruct.bytes_in_hold, buf, len)) {
+          if (SetHold(q,
+                      mGIFStruct.bytes_to_consume + mGIFStruct.bytes_in_hold,
+                      buf, len)) {
             // Back into the decoder infrastructure so we can get called again.
             GETN(9, gif_image_header_continue);
             return;
@@ -935,8 +984,7 @@
       }
     }
 
-    case gif_image_header_continue:
-    {
+    case gif_image_header_continue: {
       // While decoders can reuse frames, we unconditionally increment
       // mGIFStruct.images_decoded when we're done with a frame, so we both can
       // and need to zero out the colormap and image data after every new frame.
@@ -946,9 +994,9 @@
       }
 
       if (!mGIFStruct.images_decoded) {
-        // Send a onetime invalidation for the first frame if it has a y-axis offset. 
-        // Otherwise, the area may never be refreshed and the placeholder will remain
-        // on the screen. (Bug 37589)
+        // Send a onetime invalidation for the first frame if it has a y-axis
+        // offset. Otherwise, the area may never be refreshed and the
+        // placeholder will remain on the screen. (Bug 37589)
         if (mGIFStruct.y_offset > 0) {
           nsIntRect r(0, 0, mGIFStruct.screen_width, mGIFStruct.y_offset);
           PostInvalidation(r);
@@ -963,27 +1011,27 @@
         mGIFStruct.ipass = 0;
       }
 
-      /* Only apply the Haeberli display hack on the first frame */
+      // Only apply the Haeberli display hack on the first frame
       mGIFStruct.progressive_display = (mGIFStruct.images_decoded == 0);
 
-      /* Clear state from last image */
+      // Clear state from last image
       mGIFStruct.irow = 0;
       mGIFStruct.rows_remaining = mGIFStruct.height;
       mGIFStruct.rowp = mImageData;
 
-      /* Depth of colors is determined by colormap */
-      /* (q[8] & 0x80) indicates local colormap */
-      /* bits per pixel is (q[8]&0x07 + 1) when local colormap is set */
+      // Depth of colors is determined by colormap
+      // (q[8] & 0x80) indicates local colormap
+      // bits per pixel is (q[8]&0x07 + 1) when local colormap is set
       uint32_t depth = mGIFStruct.global_colormap_depth;
-      if (q[8] & 0x80)
+      if (q[8] & 0x80) {
         depth = (q[8]&0x07) + 1;
+      }
       uint32_t realDepth = depth;
       while (mGIFStruct.tpixel >= (1 << realDepth) && (realDepth < 8)) {
         realDepth++;
       }
-
-      if (q[8] & 0x80) /* has a local colormap? */
-      {
+      // has a local colormap?
+      if (q[8] & 0x80) {
         mGIFStruct.local_colormap_size = 1 << depth;
         if (!mGIFStruct.images_decoded) {
           // First frame has local colormap, allocate space for it
@@ -1011,7 +1059,7 @@
         GETN(0, gif_image_colormap);
         break;
       } else {
-        /* Switch back to the global palette */
+        // Switch back to the global palette
         if (mGIFStruct.images_decoded) {
           // Copy global colormap into the palette of current frame
           memcpy(mColormap, mGIFStruct.global_colormap, mColormapSize);
@@ -1033,26 +1081,26 @@
     case gif_sub_block:
       mGIFStruct.count = *q;
       if (mGIFStruct.count) {
-        /* Still working on the same image: Process next LZW data block */
-        /* Make sure there are still rows left. If the GIF data */
-        /* is corrupt, we may not get an explicit terminator.   */
+        // Still working on the same image: Process next LZW data block
+        // Make sure there are still rows left. If the GIF data
+        // is corrupt, we may not get an explicit terminator.
         if (!mGIFStruct.rows_remaining) {
 #ifdef DONT_TOLERATE_BROKEN_GIFS
           mGIFStruct.state = gif_error;
           break;
 #else
-          /* This is an illegal GIF, but we remain tolerant. */
+          // This is an illegal GIF, but we remain tolerant.
           GETN(1, gif_sub_block);
 #endif
           if (mGIFStruct.count == GIF_TRAILER) {
-            /* Found a terminator anyway, so consider the image done */
+            // Found a terminator anyway, so consider the image done
             GETN(1, gif_done);
             break;
           }
         }
         GETN(mGIFStruct.count, gif_lzw);
       } else {
-        /* See if there are any more images in this sequence. */
+        // See if there are any more images in this sequence.
         EndImageFrame();
         GETN(1, gif_image_start);
       }
@@ -1082,14 +1130,16 @@
   // Copy the leftover into mGIFStruct.hold
   if (len) {
     // Add what we have sofar to the block
-    if (mGIFStruct.state != gif_global_colormap && mGIFStruct.state != gif_image_colormap) {
+    if (mGIFStruct.state != gif_global_colormap &&
+        mGIFStruct.state != gif_image_colormap) {
       if (!SetHold(buf, len)) {
         PostDataError();
         return;
       }
     } else {
-      uint8_t* p = (mGIFStruct.state == gif_global_colormap) ? (uint8_t*)mGIFStruct.global_colormap :
-                                                               (uint8_t*)mColormap;
+      uint8_t* p = (mGIFStruct.state == gif_global_colormap) ?
+                    (uint8_t*)mGIFStruct.global_colormap :
+                    (uint8_t*)mColormap;
       memcpy(p, buf, len);
       mGIFStruct.bytes_in_hold = len;
     }
@@ -1109,10 +1159,13 @@
 }
 
 bool
-nsGIFDecoder2::SetHold(const uint8_t* buf1, uint32_t count1, const uint8_t* buf2 /* = nullptr */, uint32_t count2 /* = 0 */)
+nsGIFDecoder2::SetHold(const uint8_t* buf1, uint32_t count1,
+                       const uint8_t* buf2 /* = nullptr */,
+                       uint32_t count2 /* = 0 */)
 {
   // We have to handle the case that buf currently points to hold
-  uint8_t* newHold = (uint8_t *) moz_malloc(std::max(uint32_t(MIN_HOLD_SIZE), count1 + count2));
+  uint8_t* newHold = (uint8_t*) moz_malloc(std::max(uint32_t(MIN_HOLD_SIZE),
+                                            count1 + count2));
   if (!newHold) {
     mGIFStruct.state = gif_error;
     return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsGIFDecoder2.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsGIFDecoder2.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsGIFDecoder2.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsGIFDecoder2.h	2014-11-26 21:45:47.000000000 +0000
@@ -4,13 +4,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/. */
 
-#ifndef _nsGIFDecoder2_h
-#define _nsGIFDecoder2_h
+#ifndef nsGIFDecoder2_h
+#define nsGIFDecoder2_h
 
-#include "nsCOMPtr.h"
 #include "Decoder.h"
 
 #include "GIF2.h"
+#include "nsCOMPtr.h"
 
 namespace mozilla {
 namespace image {
@@ -23,16 +23,17 @@
 {
 public:
 
-  explicit nsGIFDecoder2(RasterImage &aImage);
+  explicit nsGIFDecoder2(RasterImage& aImage);
   ~nsGIFDecoder2();
 
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy aStrategy) MOZ_OVERRIDE;
   virtual void FinishInternal();
   virtual Telemetry::ID SpeedHistogram();
 
 private:
-  /* These functions will be called when the decoder has a decoded row,
-   * frame size information, etc. */
+  // These functions will be called when the decoder has a decoded row,
+  // frame size information, etc.
 
   void      BeginGIF();
   void      BeginImageFrame(uint16_t aDepth);
@@ -40,9 +41,9 @@
   void      FlushImageData();
   void      FlushImageData(uint32_t fromRow, uint32_t rows);
 
-  nsresult  GifWrite(const uint8_t * buf, uint32_t numbytes);
+  nsresult  GifWrite(const uint8_t* buf, uint32_t numbytes);
   uint32_t  OutputRow();
-  bool      DoLzw(const uint8_t *q);
+  bool      DoLzw(const uint8_t* q);
   bool      SetHold(const uint8_t* buf, uint32_t count,
                     const uint8_t* buf2 = nullptr, uint32_t count2 = 0);
 
@@ -69,4 +70,4 @@
 } // namespace image
 } // namespace mozilla
 
-#endif
+#endif // nsGIFDecoder2_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsICODecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsICODecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsICODecoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsICODecoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -26,7 +26,7 @@
 // ----------------------------------------
 
 uint32_t
-nsICODecoder::CalcAlphaRowSize() 
+nsICODecoder::CalcAlphaRowSize()
 {
   // Calculate rowsize in DWORD's and then return in # of bytes
   uint32_t rowSize = (GetRealWidth() + 31) / 32; // + 31 to round up
@@ -35,7 +35,7 @@
 
 // Obtains the number of colors from the bits per pixel
 uint16_t
-nsICODecoder::GetNumColors() 
+nsICODecoder::GetNumColors()
 {
   uint16_t numColors = 0;
   if (mBPP <= 8) {
@@ -57,7 +57,7 @@
 }
 
 
-nsICODecoder::nsICODecoder(RasterImage &aImage)
+nsICODecoder::nsICODecoder(RasterImage& aImage)
  : Decoder(aImage)
 {
   mPos = mImageOffset = mCurrIcon = mNumIcons = mBPP = mRowBytes = 0;
@@ -83,16 +83,19 @@
   if (mContainedDecoder) {
     mContainedDecoder->FinishSharedDecoder();
     mDecodeDone = mContainedDecoder->GetDecodeDone();
+    mProgress |= mContainedDecoder->TakeProgress();
+    mInvalidRect.Union(mContainedDecoder->TakeInvalidRect());
   }
 }
 
 // Returns a buffer filled with the bitmap file header in little endian:
 // Signature 2 bytes 'BM'
-// FileSize	 4 bytes File size in bytes
-// reserved	 4 bytes unused (=0)
-// DataOffset	 4 bytes File offset to Raster Data
+// FileSize      4 bytes File size in bytes
+// reserved      4 bytes unused (=0)
+// DataOffset    4 bytes File offset to Raster Data
 // Returns true if successful
-bool nsICODecoder::FillBitmapFileHeaderBuffer(int8_t *bfh) 
+bool
+nsICODecoder::FillBitmapFileHeaderBuffer(int8_t* bfh)
 {
   memset(bfh, 0, 14);
   bfh[0] = 'B';
@@ -110,7 +113,7 @@
     dataOffset += 4 * numColors;
     fileSize = dataOffset + GetRealWidth() * GetRealHeight();
   } else {
-    fileSize = dataOffset + (mDirEntry.mBitCount * GetRealWidth() * 
+    fileSize = dataOffset + (mDirEntry.mBitCount * GetRealWidth() *
                              GetRealHeight()) / 8;
   }
 
@@ -125,7 +128,7 @@
 // that follows the actual bitmap.  The BMP shouldn't know about
 // this difference though.
 bool
-nsICODecoder::FixBitmapHeight(int8_t *bih) 
+nsICODecoder::FixBitmapHeight(int8_t* bih)
 {
   // Get the height from the BMP file information header
   int32_t height;
@@ -142,7 +145,7 @@
     return false;
   }
 
-  // We should always trust the height from the bitmap itself instead of 
+  // We should always trust the height from the bitmap itself instead of
   // the ICO height.  So fix the ICO height.
   if (height == 256) {
     mDirEntry.mHeight = 0;
@@ -159,7 +162,7 @@
 // We should always trust the contained resource for the width
 // information over our own information.
 bool
-nsICODecoder::FixBitmapWidth(int8_t *bih) 
+nsICODecoder::FixBitmapWidth(int8_t* bih)
 {
   // Get the width from the BMP file information header
   int32_t width;
@@ -169,7 +172,7 @@
     return false;
   }
 
-  // We should always trust the width  from the bitmap itself instead of 
+  // We should always trust the width  from the bitmap itself instead of
   // the ICO width.
   if (width == 256) {
     mDirEntry.mWidth = 0;
@@ -181,8 +184,8 @@
 
 // The BMP information header's bits per pixel should be trusted
 // more than what we have.  Usually the ICO's BPP is set to 0
-int32_t 
-nsICODecoder::ExtractBPPFromBitmap(int8_t *bih)
+int32_t
+nsICODecoder::ExtractBPPFromBitmap(int8_t* bih)
 {
   int32_t bitsPerPixel;
   memcpy(&bitsPerPixel, bih + 14, sizeof(bitsPerPixel));
@@ -190,8 +193,8 @@
   return bitsPerPixel;
 }
 
-int32_t 
-nsICODecoder::ExtractBIHSizeFromBitmap(int8_t *bih)
+int32_t
+nsICODecoder::ExtractBIHSizeFromBitmap(int8_t* bih)
 {
   int32_t headerSize;
   memcpy(&headerSize, bih, sizeof(headerSize));
@@ -200,7 +203,8 @@
 }
 
 void
-nsICODecoder::SetHotSpotIfCursor() {
+nsICODecoder::SetHotSpotIfCursor()
+{
   if (!mIsCursor) {
     return;
   }
@@ -209,7 +213,8 @@
 }
 
 void
-nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy)
+nsICODecoder::WriteInternal(const char* aBuffer, uint32_t aCount,
+                            DecodeStrategy aStrategy)
 {
   NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
 
@@ -232,14 +237,16 @@
   }
 
   if (mPos == ICONCOUNTOFFSET && aCount >= 2) {
-    mNumIcons = LittleEndian::readUint16(reinterpret_cast<const uint16_t*>(aBuffer));
+    mNumIcons =
+      LittleEndian::readUint16(reinterpret_cast<const uint16_t*>(aBuffer));
     aBuffer += 2;
     mPos += 2;
     aCount -= 2;
   }
 
-  if (mNumIcons == 0)
+  if (mNumIcons == 0) {
     return; // Nothing to do.
+  }
 
   uint16_t colorDepth = 0;
   nsIntSize prefSize = mImage.GetRequestedResolution();
@@ -254,11 +261,12 @@
   int32_t diff = INT_MIN;
 
   // Loop through each entry's dir entry
-  while (mCurrIcon < mNumIcons) { 
-    if (mPos >= DIRENTRYOFFSET + (mCurrIcon * sizeof(mDirEntryArray)) && 
+  while (mCurrIcon < mNumIcons) {
+    if (mPos >= DIRENTRYOFFSET + (mCurrIcon * sizeof(mDirEntryArray)) &&
         mPos < DIRENTRYOFFSET + ((mCurrIcon + 1) * sizeof(mDirEntryArray))) {
-      uint32_t toCopy = sizeof(mDirEntryArray) - 
-                        (mPos - DIRENTRYOFFSET - mCurrIcon * sizeof(mDirEntryArray));
+      uint32_t toCopy = sizeof(mDirEntryArray) -
+                        (mPos - DIRENTRYOFFSET - mCurrIcon *
+                         sizeof(mDirEntryArray));
       if (toCopy > aCount) {
         toCopy = aCount;
       }
@@ -267,11 +275,12 @@
       aCount -= toCopy;
       aBuffer += toCopy;
     }
-    if (aCount == 0)
+    if (aCount == 0) {
       return; // Need more data
+    }
 
     IconDirEntry e;
-    if (mPos == (DIRENTRYOFFSET + ICODIRENTRYSIZE) + 
+    if (mPos == (DIRENTRYOFFSET + ICODIRENTRYSIZE) +
                 (mCurrIcon * sizeof(mDirEntryArray))) {
       mCurrIcon++;
       ProcessDirEntry(e);
@@ -288,7 +297,7 @@
         mImageOffset = e.mImageOffset;
 
         // ensure mImageOffset is >= size of the direntry headers (bug #245631)
-        uint32_t minImageOffset = DIRENTRYOFFSET + 
+        uint32_t minImageOffset = DIRENTRYOFFSET +
                                   mNumIcons * sizeof(mDirEntryArray);
         if (mImageOffset < minImageOffset) {
           PostDataError();
@@ -304,8 +313,9 @@
   if (mPos < mImageOffset) {
     // Skip to (or at least towards) the desired image offset
     uint32_t toSkip = mImageOffset - mPos;
-    if (toSkip > aCount)
+    if (toSkip > aCount) {
       toSkip = aCount;
+    }
 
     mPos    += toSkip;
     aBuffer += toSkip;
@@ -315,9 +325,8 @@
   // If we are within the first PNGSIGNATURESIZE bytes of the image data,
   // then we have either a BMP or a PNG.  We use the first PNGSIGNATURESIZE
   // bytes to determine which one we have.
-  if (mCurrIcon == mNumIcons && mPos >= mImageOffset && 
-      mPos < mImageOffset + PNGSIGNATURESIZE)
-  {
+  if (mCurrIcon == mNumIcons && mPos >= mImageOffset &&
+      mPos < mImageOffset + PNGSIGNATURESIZE) {
     uint32_t toCopy = PNGSIGNATURESIZE - (mPos - mImageOffset);
     if (toCopy > aCount) {
       toCopy = aCount;
@@ -328,11 +337,10 @@
     aCount -= toCopy;
     aBuffer += toCopy;
 
-    mIsPNG = !memcmp(mSignature, nsPNGDecoder::pngSignatureBytes, 
+    mIsPNG = !memcmp(mSignature, nsPNGDecoder::pngSignatureBytes,
                      PNGSIGNATURESIZE);
     if (mIsPNG) {
       mContainedDecoder = new nsPNGDecoder(mImage);
-      mContainedDecoder->SetObserver(mObserver);
       mContainedDecoder->SetSizeDecode(IsSizeDecode());
       mContainedDecoder->InitSharedDecoder(mImageData, mImageDataLength,
                                            mColormap, mColormapSize,
@@ -367,10 +375,10 @@
     return;
   }
 
-  // We've processed all of the icon dir entries and are within the 
+  // We've processed all of the icon dir entries and are within the
   // bitmap info size
-  if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset && 
-      mPos >= mImageOffset + PNGSIGNATURESIZE && 
+  if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset &&
+      mPos >= mImageOffset + PNGSIGNATURESIZE &&
       mPos < mImageOffset + BITMAPINFOSIZE) {
 
     // As we were decoding, we did not know if we had a PNG signature or the
@@ -381,8 +389,9 @@
 
     // We've found the icon.
     uint32_t toCopy = sizeof(mBIHraw) - (mPos - mImageOffset);
-    if (toCopy > aCount)
+    if (toCopy > aCount) {
       toCopy = aCount;
+    }
 
     memcpy(mBIHraw + (mPos - mImageOffset), aBuffer, toCopy);
     mPos += toCopy;
@@ -394,36 +403,37 @@
   if (!mIsPNG && mPos == mImageOffset + BITMAPINFOSIZE) {
 
     // Make sure we have a sane value for the bitmap information header
-    int32_t bihSize = ExtractBIHSizeFromBitmap(reinterpret_cast<int8_t*>(mBIHraw));
+    int32_t bihSize = ExtractBIHSizeFromBitmap(reinterpret_cast<int8_t*>
+                                               (mBIHraw));
     if (bihSize != BITMAPINFOSIZE) {
       PostDataError();
       return;
     }
-    // We are extracting the BPP from the BIH header as it should be trusted 
+    // We are extracting the BPP from the BIH header as it should be trusted
     // over the one we have from the icon header
     mBPP = ExtractBPPFromBitmap(reinterpret_cast<int8_t*>(mBIHraw));
-    
+
     // Init the bitmap decoder which will do most of the work for us
     // It will do everything except the AND mask which isn't present in bitmaps
     // bmpDecoder is for local scope ease, it will be freed by mContainedDecoder
-    nsBMPDecoder *bmpDecoder = new nsBMPDecoder(mImage);
+    nsBMPDecoder* bmpDecoder = new nsBMPDecoder(mImage);
     mContainedDecoder = bmpDecoder;
     bmpDecoder->SetUseAlphaData(true);
-    mContainedDecoder->SetObserver(mObserver);
     mContainedDecoder->SetSizeDecode(IsSizeDecode());
     mContainedDecoder->InitSharedDecoder(mImageData, mImageDataLength,
                                          mColormap, mColormapSize,
                                          mCurrentFrame);
 
     // The ICO format when containing a BMP does not include the 14 byte
-    // bitmap file header. To use the code of the BMP decoder we need to 
+    // bitmap file header. To use the code of the BMP decoder we need to
     // generate this header ourselves and feed it to the BMP decoder.
     int8_t bfhBuffer[BMPFILEHEADERSIZE];
     if (!FillBitmapFileHeaderBuffer(bfhBuffer)) {
       PostDataError();
       return;
     }
-    if (!WriteToContainedDecoder((const char*)bfhBuffer, sizeof(bfhBuffer), aStrategy)) {
+    if (!WriteToContainedDecoder((const char*)bfhBuffer, sizeof(bfhBuffer),
+                                  aStrategy)) {
       return;
     }
 
@@ -453,8 +463,9 @@
 
     // We have the size. If we're doing a size decode, we got what
     // we came for.
-    if (IsSizeDecode())
+    if (IsSizeDecode()) {
       return;
+    }
 
     // Sometimes the ICO BPP header field is not filled out
     // so we should trust the contained resource over our own
@@ -478,8 +489,9 @@
     }
     // Feed the actual image data (not including headers) into the BMP decoder
     uint32_t bmpDataOffset = mDirEntry.mImageOffset + BITMAPINFOSIZE;
-    uint32_t bmpDataEnd = mDirEntry.mImageOffset + BITMAPINFOSIZE + 
-                          static_cast<nsBMPDecoder*>(mContainedDecoder.get())->GetCompressedImageSize() +
+    uint32_t bmpDataEnd = mDirEntry.mImageOffset + BITMAPINFOSIZE +
+                          static_cast<nsBMPDecoder*>(mContainedDecoder.get())->
+                            GetCompressedImageSize() +
                           4 * numColors;
 
     // If we are feeding in the core image data, but we have not yet
@@ -500,16 +512,18 @@
       aCount -= toFeed;
       aBuffer += toFeed;
     }
-  
+
     // If the bitmap is fully processed, treat any left over data as the ICO's
     // 'AND buffer mask' which appears after the bitmap resource.
     if (!mIsPNG && mPos >= bmpDataEnd) {
       // There may be an optional AND bit mask after the data.  This is
-      // only used if the alpha data is not already set. The alpha data 
+      // only used if the alpha data is not already set. The alpha data
       // is used for 32bpp bitmaps as per the comment in ICODecoder.h
       // The alpha mask should be checked in all other cases.
-      if (static_cast<nsBMPDecoder*>(mContainedDecoder.get())->GetBitsPerPixel() != 32 || 
-          !static_cast<nsBMPDecoder*>(mContainedDecoder.get())->HasAlphaData()) {
+      if (static_cast<nsBMPDecoder*>(mContainedDecoder.get())->
+            GetBitsPerPixel() != 32 ||
+          !static_cast<nsBMPDecoder*>(mContainedDecoder.get())->
+            HasAlphaData()) {
         uint32_t rowSize = ((GetRealWidth() + 31) / 32) * 4; // + 31 to round up
         if (mPos == bmpDataEnd) {
           mPos++;
@@ -529,6 +543,8 @@
           return;
         }
 
+        uint8_t sawTransparency = 0;
+
         while (mCurLine > 0 && aCount > 0) {
           uint32_t toCopy = std::min(rowSize - mRowBytes, aCount);
           if (toCopy) {
@@ -541,8 +557,9 @@
             mCurLine--;
             mRowBytes = 0;
 
-            uint32_t* imageData = 
-              static_cast<nsBMPDecoder*>(mContainedDecoder.get())->GetImageData();
+            uint32_t* imageData =
+              static_cast<nsBMPDecoder*>(mContainedDecoder.get())->
+                                           GetImageData();
             if (!imageData) {
               PostDataError();
               return;
@@ -553,6 +570,7 @@
             uint8_t* p_end = mRow + rowSize;
             while (p < p_end) {
               uint8_t idx = *p++;
+              sawTransparency |= idx;
               for (uint8_t bit = 0x80; bit && decoded<decoded_end; bit >>= 1) {
                 // Clear pixel completely for transparency.
                 if (idx & bit) {
@@ -563,15 +581,24 @@
             }
           }
         }
+
+        // If any bits are set in sawTransparency, then we know at least one
+        // pixel was transparent.
+        if (sawTransparency) {
+            PostHasTransparency();
+        }
       }
     }
   }
 }
 
 bool
-nsICODecoder::WriteToContainedDecoder(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy)
+nsICODecoder::WriteToContainedDecoder(const char* aBuffer, uint32_t aCount,
+                                      DecodeStrategy aStrategy)
 {
   mContainedDecoder->Write(aBuffer, aCount, aStrategy);
+  mProgress |= mContainedDecoder->TakeProgress();
+  mInvalidRect.Union(mContainedDecoder->TakeInvalidRect());
   if (mContainedDecoder->HasDataError()) {
     mDataError = mContainedDecoder->HasDataError();
   }
@@ -595,7 +622,7 @@
   aTarget.mBitCount = LittleEndian::readUint16(&aTarget.mBitCount);
   memcpy(&aTarget.mBytesInRes, mDirEntryArray + 8, sizeof(aTarget.mBytesInRes));
   aTarget.mBytesInRes = LittleEndian::readUint32(&aTarget.mBytesInRes);
-  memcpy(&aTarget.mImageOffset, mDirEntryArray + 12, 
+  memcpy(&aTarget.mImageOffset, mDirEntryArray + 12,
          sizeof(aTarget.mImageOffset));
   aTarget.mImageOffset = LittleEndian::readUint32(&aTarget.mImageOffset);
 }
@@ -616,6 +643,8 @@
   if (mContainedDecoder) {
     nsresult rv = mContainedDecoder->AllocateFrame();
     mCurrentFrame = mContainedDecoder->GetCurrentFrame();
+    mProgress |= mContainedDecoder->TakeProgress();
+    mInvalidRect.Union(mContainedDecoder->TakeInvalidRect());
     return rv;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsICODecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsICODecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsICODecoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsICODecoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#ifndef _nsICODecoder_h
-#define _nsICODecoder_h
+#ifndef nsICODecoder_h
+#define nsICODecoder_h
 
 #include "nsAutoPtr.h"
 #include "Decoder.h"
@@ -22,22 +22,23 @@
 {
 public:
 
-  explicit nsICODecoder(RasterImage &aImage);
+  explicit nsICODecoder(RasterImage& aImage);
   virtual ~nsICODecoder();
 
   // Obtains the width of the icon directory entry
   uint32_t GetRealWidth() const
   {
-    return mDirEntry.mWidth == 0 ? 256 : mDirEntry.mWidth; 
+    return mDirEntry.mWidth == 0 ? 256 : mDirEntry.mWidth;
   }
 
   // Obtains the height of the icon directory entry
   uint32_t GetRealHeight() const
   {
-    return mDirEntry.mHeight == 0 ? 256 : mDirEntry.mHeight; 
+    return mDirEntry.mHeight == 0 ? 256 : mDirEntry.mHeight;
   }
 
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy aStrategy) MOZ_OVERRIDE;
   virtual void FinishInternal();
   virtual bool NeedsNewFrame() const;
   virtual nsresult AllocateFrame();
@@ -45,7 +46,8 @@
 private:
   // Writes to the contained decoder and sets the appropriate errors
   // Returns true if there are no errors.
-  bool WriteToContainedDecoder(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  bool WriteToContainedDecoder(const char* aBuffer, uint32_t aCount,
+                               DecodeStrategy aStrategy);
 
   // Processes a single dir entry of the icon resource
   void ProcessDirEntry(IconDirEntry& aTarget);
@@ -75,16 +77,16 @@
   uint16_t mNumIcons; // Stores the number of icons in the ICO file
   uint16_t mCurrIcon; // Stores the current dir entry index we are processing
   uint32_t mImageOffset; // Stores the offset of the image data we want
-  uint8_t *mRow;      // Holds one raw line of the image
+  uint8_t* mRow;      // Holds one raw line of the image
   int32_t mCurLine;   // Line index of the image that's currently being decoded
   uint32_t mRowBytes; // How many bytes of the row were already received
-  int32_t mOldLine;   // Previous index of the line 
+  int32_t mOldLine;   // Previous index of the line
   nsRefPtr<Decoder> mContainedDecoder; // Contains either a BMP or PNG resource
 
   char mDirEntryArray[ICODIRENTRYSIZE]; // Holds the current dir entry buffer
   IconDirEntry mDirEntry; // Holds a decoded dir entry
   // Holds the potential bytes that can be a PNG signature
-  char mSignature[PNGSIGNATURESIZE]; 
+  char mSignature[PNGSIGNATURESIZE];
   // Holds the potential bytes for a bitmap information header
   char mBIHraw[40];
   // Stores whether or not the icon file we are processing has type 1 (icon)
@@ -96,4 +98,4 @@
 } // namespace image
 } // namespace mozilla
 
-#endif
+#endif // nsICODecoder_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsIconDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsIconDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsIconDecoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsIconDecoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -6,17 +6,16 @@
 
 #include "nsIconDecoder.h"
 #include "nsIInputStream.h"
-#include "RasterImage.h"
 #include "nspr.h"
 #include "nsRect.h"
-
 #include "nsError.h"
+#include "RasterImage.h"
 #include <algorithm>
 
 namespace mozilla {
 namespace image {
 
-nsIconDecoder::nsIconDecoder(RasterImage &aImage)
+nsIconDecoder::nsIconDecoder(RasterImage& aImage)
  : Decoder(aImage),
    mWidth(-1),
    mHeight(-1),
@@ -30,7 +29,8 @@
 { }
 
 void
-nsIconDecoder::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy)
+nsIconDecoder::WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy)
 {
   NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
 
@@ -59,6 +59,9 @@
 
         // Post our size to the superclass
         PostSize(mWidth, mHeight);
+
+        PostHasTransparency();
+
         if (HasError()) {
           // Setting the size led to an error.
           mState = iconStateFinished;
@@ -82,8 +85,7 @@
         mState = iconStateReadPixels;
         break;
 
-      case iconStateReadPixels:
-      {
+      case iconStateReadPixels: {
 
         // How many bytes are we reading?
         bytesToRead = std::min(aCount, mImageDataLength - mPixBytesRead);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsIconDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsIconDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsIconDecoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsIconDecoder.h	2014-11-26 21:45:47.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/. */
 
-#ifndef nsIconDecoder_h__
-#define nsIconDecoder_h__
+#ifndef nsIconDecoder_h
+#define nsIconDecoder_h
 
 #include "Decoder.h"
 
@@ -15,33 +15,34 @@
 namespace image {
 class RasterImage;
 
-//////////////////////////////////////////////////////////////////////////////////////////////
-// The icon decoder is a decoder specifically tailored for loading icons 
+////////////////////////////////////////////////////////////////////////////////
+// The icon decoder is a decoder specifically tailored for loading icons
 // from the OS. We've defined our own little format to represent these icons
-// and this decoder takes that format and converts it into 24-bit RGB with alpha channel
-// support. It was modeled a bit off the PPM decoder.
+// and this decoder takes that format and converts it into 24-bit RGB with
+// alpha channel support. It was modeled a bit off the PPM decoder.
 //
 // Assumptions about the decoder:
-// (1) We receive ALL of the data from the icon channel in one OnDataAvailable call. We don't
-//     support multiple ODA calls yet.
+// (1) We receive ALL of the data from the icon channel in one OnDataAvailable
+//     call. We don't support multiple ODA calls yet.
 // (2) the format of the incoming data is as follows:
-//     The first two bytes contain the width and the height of the icon. 
+//     The first two bytes contain the width and the height of the icon.
 //     The remaining bytes contain the icon data, 4 bytes per pixel, in
 //       ARGB order (platform endianness, A in highest bits, B in lowest
 //       bits), row-primary, top-to-bottom, left-to-right, with
 //       premultiplied alpha.
 //
 //
-//////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 
 class nsIconDecoder : public Decoder
 {
 public:
 
-  explicit nsIconDecoder(RasterImage &aImage);
+  explicit nsIconDecoder(RasterImage& aImage);
   virtual ~nsIconDecoder();
 
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy aStrategy) MOZ_OVERRIDE;
 
   uint8_t mWidth;
   uint8_t mHeight;
@@ -59,4 +60,4 @@
 } // namespace image
 } // namespace mozilla
 
-#endif // nsIconDecoder_h__
+#endif // nsIconDecoder_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsJPEGDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsJPEGDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsJPEGDecoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsJPEGDecoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -35,21 +35,23 @@
 namespace image {
 
 #if defined(PR_LOGGING)
-static PRLogModuleInfo *
+static PRLogModuleInfo*
 GetJPEGLog()
 {
-  static PRLogModuleInfo *sJPEGLog;
-  if (!sJPEGLog)
+  static PRLogModuleInfo* sJPEGLog;
+  if (!sJPEGLog) {
     sJPEGLog = PR_NewLogModule("JPEGDecoder");
+  }
   return sJPEGLog;
 }
 
-static PRLogModuleInfo *
+static PRLogModuleInfo*
 GetJPEGDecoderAccountingLog()
 {
-  static PRLogModuleInfo *sJPEGDecoderAccountingLog;
-  if (!sJPEGDecoderAccountingLog)
+  static PRLogModuleInfo* sJPEGDecoderAccountingLog;
+  if (!sJPEGDecoderAccountingLog) {
     sJPEGDecoderAccountingLog = PR_NewLogModule("JPEGDecoderAccounting");
+  }
   return sJPEGDecoderAccountingLog;
 }
 #else
@@ -58,7 +60,7 @@
 #endif
 
 static qcms_profile*
-GetICCProfile(struct jpeg_decompress_struct &info)
+GetICCProfile(struct jpeg_decompress_struct& info)
 {
   JOCTET* profilebuf;
   uint32_t profileLength;
@@ -78,11 +80,12 @@
 METHODDEF(void) term_source (j_decompress_ptr jd);
 METHODDEF(void) my_error_exit (j_common_ptr cinfo);
 
-/* Normal JFIF markers can't have more bytes than this. */
+// Normal JFIF markers can't have more bytes than this.
 #define MAX_JPEG_MARKER_LENGTH  (((uint32_t)1 << 16) - 1)
 
 
-nsJPEGDecoder::nsJPEGDecoder(RasterImage& aImage, Decoder::DecodeStyle aDecodeStyle)
+nsJPEGDecoder::nsJPEGDecoder(RasterImage& aImage,
+                             Decoder::DecodeStyle aDecodeStyle)
  : Decoder(aImage)
  , mDecodeStyle(aDecodeStyle)
 {
@@ -118,10 +121,12 @@
   jpeg_destroy_decompress(&mInfo);
 
   PR_FREEIF(mBackBuffer);
-  if (mTransform)
+  if (mTransform) {
     qcms_transform_release(mTransform);
-  if (mInProfile)
+  }
+  if (mInProfile) {
     qcms_profile_release(mInProfile);
+  }
 
   PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
          ("nsJPEGDecoder::~nsJPEGDecoder: Destroying JPEG decoder %p",
@@ -138,37 +143,37 @@
 nsJPEGDecoder::InitInternal()
 {
   mCMSMode = gfxPlatform::GetCMSMode();
-  if ((mDecodeFlags & DECODER_NO_COLORSPACE_CONVERSION) != 0)
+  if ((mDecodeFlags & DECODER_NO_COLORSPACE_CONVERSION) != 0) {
     mCMSMode = eCMSMode_Off;
+  }
 
-  /* We set up the normal JPEG error routines, then override error_exit. */
+  // We set up the normal JPEG error routines, then override error_exit.
   mInfo.err = jpeg_std_error(&mErr.pub);
-  /*   mInfo.err = jpeg_std_error(&mErr.pub); */
+  //   mInfo.err = jpeg_std_error(&mErr.pub);
   mErr.pub.error_exit = my_error_exit;
-  /* Establish the setjmp return context for my_error_exit to use. */
+  // Establish the setjmp return context for my_error_exit to use.
   if (setjmp(mErr.setjmp_buffer)) {
-    /* If we get here, the JPEG code has signaled an error.
-     * We need to clean up the JPEG object, close the input file, and return.
-     */
+    // If we get here, the JPEG code has signaled an error.
+    // We need to clean up the JPEG object, close the input file, and return.
     PostDecoderError(NS_ERROR_FAILURE);
     return;
   }
 
-  /* Step 1: allocate and initialize JPEG decompression object */
+  // Step 1: allocate and initialize JPEG decompression object
   jpeg_create_decompress(&mInfo);
-  /* Set the source manager */
+  // Set the source manager
   mInfo.src = &mSourceMgr;
 
-  /* Step 2: specify data source (eg, a file) */
+  // Step 2: specify data source (eg, a file)
 
-  /* Setup callback functions. */
+  // Setup callback functions.
   mSourceMgr.init_source = init_source;
   mSourceMgr.fill_input_buffer = fill_input_buffer;
   mSourceMgr.skip_input_data = skip_input_data;
   mSourceMgr.resync_to_restart = jpeg_resync_to_restart;
   mSourceMgr.term_source = term_source;
 
-  /* Record app markers for ICC data */
+  // Record app markers for ICC data
   for (uint32_t m = 0; m < 16; m++)
     jpeg_save_markers(&mInfo, JPEG_APP0 + m, 0xFFFF);
 }
@@ -176,48 +181,40 @@
 void
 nsJPEGDecoder::FinishInternal()
 {
-  /* If we're not in any sort of error case, flush the decoder.
-   *
-   * XXXbholley - It seems wrong that this should be necessary, but at the
-   * moment I'm just folding the contents of Flush() into Close() so that
-   * we can get rid of it.
-   *
-   * XXX(seth): It'd be great to get rid of this. For now, we treat this as a
-   * write to a synchronous decoder, which means that this must be called only
-   * on the main thread. (That's asserted in Decoder::Finish and
-   * Decoder::FinishSharedDecoder.)
-   */
+  // If we're not in any sort of error case, force our state to JPEG_DONE.
   if ((mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER) &&
       (mState != JPEG_ERROR) &&
-      !IsSizeDecode())
-    this->Write(nullptr, 0, DECODE_SYNC);
+      !IsSizeDecode()) {
+    mState = JPEG_DONE;
+  }
 }
 
 void
-nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount, DecodeStrategy)
+nsJPEGDecoder::WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy)
 {
-  mSegment = (const JOCTET *)aBuffer;
+  mSegment = (const JOCTET*)aBuffer;
   mSegmentLen = aCount;
 
   NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
 
-  /* Return here if there is a fatal error within libjpeg. */
+  // Return here if there is a fatal error within libjpeg.
   nsresult error_code;
   // This cast to nsresult makes sense because setjmp() returns whatever we
   // passed to longjmp(), which was actually an nsresult.
   if ((error_code = (nsresult)setjmp(mErr.setjmp_buffer)) != NS_OK) {
     if (error_code == NS_ERROR_FAILURE) {
       PostDataError();
-      /* Error due to corrupt stream - return NS_OK and consume silently
-         so that libpr0n doesn't throw away a partial image load */
+      // Error due to corrupt stream - return NS_OK and consume silently
+      // so that ImageLib doesn't throw away a partial image load
       mState = JPEG_SINK_NON_JPEG_TRAILER;
       PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (setjmp returned NS_ERROR_FAILURE)"));
       return;
     } else {
-      /* Error due to reasons external to the stream (probably out of
-         memory) - let libpr0n attempt to clean up, even though
-         mozilla is seconds away from falling flat on its face. */
+      // Error due to reasons external to the stream (probably out of
+      // memory) - let ImageLib attempt to clean up, even though
+      // mozilla is seconds away from falling flat on its face.
       PostDecoderError(error_code);
       mState = JPEG_ERROR;
       PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
@@ -230,112 +227,119 @@
          ("[this=%p] nsJPEGDecoder::Write -- processing JPEG data\n", this));
 
   switch (mState) {
-  case JPEG_HEADER:
-  {
-    LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- entering JPEG_HEADER case");
+    case JPEG_HEADER: {
+      LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- entering JPEG_HEADER"
+                " case");
 
-    /* Step 3: read file parameters with jpeg_read_header() */
-    if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED) {
-      PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-             ("} (JPEG_SUSPENDED)"));
-      return; /* I/O suspension */
-    }
+      // Step 3: read file parameters with jpeg_read_header()
+      if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED) {
+        PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+               ("} (JPEG_SUSPENDED)"));
+        return; // I/O suspension
+      }
 
-    int sampleSize = mImage.GetRequestedSampleSize();
-    if (sampleSize > 0) {
-      mInfo.scale_num = 1;
-      mInfo.scale_denom = sampleSize;
-    }
+      int sampleSize = mImage.GetRequestedSampleSize();
+      if (sampleSize > 0) {
+        mInfo.scale_num = 1;
+        mInfo.scale_denom = sampleSize;
+      }
 
-    /* Used to set up image size so arrays can be allocated */
-    jpeg_calc_output_dimensions(&mInfo);
+      // Used to set up image size so arrays can be allocated
+      jpeg_calc_output_dimensions(&mInfo);
 
-    // Post our size to the superclass
-    PostSize(mInfo.output_width, mInfo.output_height, ReadOrientationFromEXIF());
-    if (HasError()) {
-      // Setting the size led to an error.
-      mState = JPEG_ERROR;
-      return;
-    }
+      // Post our size to the superclass
+      PostSize(mInfo.output_width, mInfo.output_height,
+               ReadOrientationFromEXIF());
+      if (HasError()) {
+        // Setting the size led to an error.
+        mState = JPEG_ERROR;
+        return;
+      }
 
-    /* If we're doing a size decode, we're done. */
-    if (IsSizeDecode())
-      return;
+      // If we're doing a size decode, we're done.
+      if (IsSizeDecode()) {
+        return;
+      }
 
-    /* We're doing a full decode. */
-    if (mCMSMode != eCMSMode_Off &&
-        (mInProfile = GetICCProfile(mInfo)) != nullptr) {
-      uint32_t profileSpace = qcms_profile_get_color_space(mInProfile);
-      bool mismatch = false;
+      // We're doing a full decode.
+      if (mCMSMode != eCMSMode_Off &&
+          (mInProfile = GetICCProfile(mInfo)) != nullptr) {
+        uint32_t profileSpace = qcms_profile_get_color_space(mInProfile);
+        bool mismatch = false;
 
 #ifdef DEBUG_tor
       fprintf(stderr, "JPEG profileSpace: 0x%08X\n", profileSpace);
 #endif
       switch (mInfo.jpeg_color_space) {
-      case JCS_GRAYSCALE:
-        if (profileSpace == icSigRgbData)
-          mInfo.out_color_space = JCS_RGB;
-        else if (profileSpace != icSigGrayData)
-          mismatch = true;
-        break;
-      case JCS_RGB:
-        if (profileSpace != icSigRgbData)
-          mismatch =  true;
-        break;
-      case JCS_YCbCr:
-        if (profileSpace == icSigRgbData)
-          mInfo.out_color_space = JCS_RGB;
-        else
-	  // qcms doesn't support ycbcr
-          mismatch = true;
-        break;
-      case JCS_CMYK:
-      case JCS_YCCK:
-	  // qcms doesn't support cmyk
-          mismatch = true;
-        break;
-      default:
-        mState = JPEG_ERROR;
-        PostDataError();
-        PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-               ("} (unknown colorpsace (1))"));
-        return;
-      }
-
-      if (!mismatch) {
-        qcms_data_type type;
-        switch (mInfo.out_color_space) {
         case JCS_GRAYSCALE:
-          type = QCMS_DATA_GRAY_8;
+          if (profileSpace == icSigRgbData) {
+            mInfo.out_color_space = JCS_RGB;
+          } else if (profileSpace != icSigGrayData) {
+            mismatch = true;
+          }
           break;
         case JCS_RGB:
-          type = QCMS_DATA_RGB_8;
+          if (profileSpace != icSigRgbData) {
+            mismatch =  true;
+          }
+          break;
+        case JCS_YCbCr:
+          if (profileSpace == icSigRgbData) {
+            mInfo.out_color_space = JCS_RGB;
+          } else {
+            // qcms doesn't support ycbcr
+            mismatch = true;
+          }
+          break;
+        case JCS_CMYK:
+        case JCS_YCCK:
+            // qcms doesn't support cmyk
+            mismatch = true;
           break;
         default:
           mState = JPEG_ERROR;
           PostDataError();
           PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-                 ("} (unknown colorpsace (2))"));
+                 ("} (unknown colorpsace (1))"));
           return;
+      }
+
+      if (!mismatch) {
+        qcms_data_type type;
+        switch (mInfo.out_color_space) {
+          case JCS_GRAYSCALE:
+            type = QCMS_DATA_GRAY_8;
+            break;
+          case JCS_RGB:
+            type = QCMS_DATA_RGB_8;
+            break;
+          default:
+            mState = JPEG_ERROR;
+            PostDataError();
+            PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+                   ("} (unknown colorpsace (2))"));
+            return;
         }
 #if 0
-        /* We don't currently support CMYK profiles. The following
-         * code dealt with lcms types. Add something like this
-         * back when we gain support for CMYK.
-         */
-        /* Adobe Photoshop writes YCCK/CMYK files with inverted data */
-        if (mInfo.out_color_space == JCS_CMYK)
+        // We don't currently support CMYK profiles. The following
+        // code dealt with lcms types. Add something like this
+        // back when we gain support for CMYK.
+
+        // Adobe Photoshop writes YCCK/CMYK files with inverted data
+        if (mInfo.out_color_space == JCS_CMYK) {
           type |= FLAVOR_SH(mInfo.saw_Adobe_marker ? 1 : 0);
+        }
 #endif
 
         if (gfxPlatform::GetCMSOutputProfile()) {
 
-          /* Calculate rendering intent. */
+          // Calculate rendering intent.
           int intent = gfxPlatform::GetRenderingIntent();
-          if (intent == -1)
-              intent = qcms_profile_get_rendering_intent(mInProfile);
+          if (intent == -1) {
+            intent = qcms_profile_get_rendering_intent(mInProfile);
+          }
 
-          /* Create the color management transform. */
+          // Create the color management transform.
           mTransform = qcms_transform_create(mInProfile,
                                           type,
                                           gfxPlatform::GetCMSOutputProfile(),
@@ -351,38 +355,37 @@
 
     if (!mTransform) {
       switch (mInfo.jpeg_color_space) {
-      case JCS_GRAYSCALE:
-      case JCS_RGB:
-      case JCS_YCbCr:
-        // if we're not color managing we can decode directly to
-        // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
-        if (mCMSMode != eCMSMode_All) {
-            mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-            mInfo.out_color_components = 4;
-        } else {
-            mInfo.out_color_space = JCS_RGB;
-        }
-        break;
-      case JCS_CMYK:
-      case JCS_YCCK:
-        /* libjpeg can convert from YCCK to CMYK, but not to RGB */
-        mInfo.out_color_space = JCS_CMYK;
-        break;
-      default:
-        mState = JPEG_ERROR;
-        PostDataError();
-        PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-               ("} (unknown colorpsace (3))"));
-        return;
-        break;
+        case JCS_GRAYSCALE:
+        case JCS_RGB:
+        case JCS_YCbCr:
+          // if we're not color managing we can decode directly to
+          // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
+          if (mCMSMode != eCMSMode_All) {
+              mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
+              mInfo.out_color_components = 4;
+          } else {
+              mInfo.out_color_space = JCS_RGB;
+          }
+          break;
+        case JCS_CMYK:
+        case JCS_YCCK:
+          // libjpeg can convert from YCCK to CMYK, but not to RGB
+          mInfo.out_color_space = JCS_CMYK;
+          break;
+        default:
+          mState = JPEG_ERROR;
+          PostDataError();
+          PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
+                 ("} (unknown colorpsace (3))"));
+          return;
+          break;
       }
     }
 
-    /*
-     * Don't allocate a giant and superfluous memory buffer
-     * when not doing a progressive decode.
-     */
-    mInfo.buffered_image = mDecodeStyle == PROGRESSIVE && jpeg_has_multiple_scans(&mInfo);
+    // Don't allocate a giant and superfluous memory buffer
+    // when not doing a progressive decode.
+    mInfo.buffered_image = mDecodeStyle == PROGRESSIVE &&
+                           jpeg_has_multiple_scans(&mInfo);
 
     if (!mImageData) {
       mState = JPEG_ERROR;
@@ -393,64 +396,65 @@
     }
 
     PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-           ("        JPEGDecoderAccounting: nsJPEGDecoder::Write -- created image frame with %ux%u pixels",
+           ("        JPEGDecoderAccounting: nsJPEGDecoder::"
+            "Write -- created image frame with %ux%u pixels",
             mInfo.output_width, mInfo.output_height));
 
     mState = JPEG_START_DECOMPRESS;
   }
 
-  case JPEG_START_DECOMPRESS:
-  {
-    LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- entering JPEG_START_DECOMPRESS case");
-    /* Step 4: set parameters for decompression */
-
-    /* FIXME -- Should reset dct_method and dither mode
-     * for final pass of progressive JPEG
-     */
+  case JPEG_START_DECOMPRESS: {
+    LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- entering"
+                            " JPEG_START_DECOMPRESS case");
+    // Step 4: set parameters for decompression
+
+    // FIXME -- Should reset dct_method and dither mode
+    // for final pass of progressive JPEG
+
     mInfo.dct_method =  JDCT_ISLOW;
     mInfo.dither_mode = JDITHER_FS;
     mInfo.do_fancy_upsampling = TRUE;
     mInfo.enable_2pass_quant = FALSE;
     mInfo.do_block_smoothing = TRUE;
 
-    /* Step 5: Start decompressor */
+    // Step 5: Start decompressor
     if (jpeg_start_decompress(&mInfo) == FALSE) {
       PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (I/O suspension after jpeg_start_decompress())"));
-      return; /* I/O suspension */
+      return; // I/O suspension
     }
 
 
-    /* If this is a progressive JPEG ... */
-    mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
+    // If this is a progressive JPEG ...
+    mState = mInfo.buffered_image ?
+             JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
   }
 
-  case JPEG_DECOMPRESS_SEQUENTIAL:
-  {
-    if (mState == JPEG_DECOMPRESS_SEQUENTIAL)
-    {
-      LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- JPEG_DECOMPRESS_SEQUENTIAL case");
-      
+  case JPEG_DECOMPRESS_SEQUENTIAL: {
+    if (mState == JPEG_DECOMPRESS_SEQUENTIAL) {
+      LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- "
+                              "JPEG_DECOMPRESS_SEQUENTIAL case");
+
       bool suspend;
       OutputScanlines(&suspend);
-      
+
       if (suspend) {
         PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                ("} (I/O suspension after OutputScanlines() - SEQUENTIAL)"));
-        return; /* I/O suspension */
+        return; // I/O suspension
       }
-      
-      /* If we've completed image output ... */
-      NS_ASSERTION(mInfo.output_scanline == mInfo.output_height, "We didn't process all of the data!");
+
+      // If we've completed image output ...
+      NS_ASSERTION(mInfo.output_scanline == mInfo.output_height,
+                   "We didn't process all of the data!");
       mState = JPEG_DONE;
     }
   }
 
-  case JPEG_DECOMPRESS_PROGRESSIVE:
-  {
-    if (mState == JPEG_DECOMPRESS_PROGRESSIVE)
-    {
-      LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::Write -- JPEG_DECOMPRESS_PROGRESSIVE case");
+  case JPEG_DECOMPRESS_PROGRESSIVE: {
+    if (mState == JPEG_DECOMPRESS_PROGRESSIVE) {
+      LOG_SCOPE(GetJPEGLog(),
+                "nsJPEGDecoder::Write -- JPEG_DECOMPRESS_PROGRESSIVE case");
 
       int status;
       do {
@@ -462,9 +466,9 @@
         if (mInfo.output_scanline == 0) {
           int scan = mInfo.input_scan_number;
 
-          /* if we haven't displayed anything yet (output_scan_number==0)
-             and we have enough data for a complete scan, force output
-             of the last full scan */
+          // if we haven't displayed anything yet (output_scan_number==0)
+          // and we have enough data for a complete scan, force output
+          // of the last full scan
           if ((mInfo.output_scan_number == 0) &&
               (scan > 1) &&
               (status != JPEG_REACHED_EOI))
@@ -472,34 +476,36 @@
 
           if (!jpeg_start_output(&mInfo, scan)) {
             PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-                   ("} (I/O suspension after jpeg_start_output() - PROGRESSIVE)"));
-            return; /* I/O suspension */
+                   ("} (I/O suspension after jpeg_start_output() -"
+                    " PROGRESSIVE)"));
+            return; // I/O suspension
           }
         }
 
-        if (mInfo.output_scanline == 0xffffff)
+        if (mInfo.output_scanline == 0xffffff) {
           mInfo.output_scanline = 0;
+        }
 
         bool suspend;
         OutputScanlines(&suspend);
 
         if (suspend) {
           if (mInfo.output_scanline == 0) {
-            /* didn't manage to read any lines - flag so we don't call
-               jpeg_start_output() multiple times for the same scan */
+            // didn't manage to read any lines - flag so we don't call
+            // jpeg_start_output() multiple times for the same scan
             mInfo.output_scanline = 0xffffff;
           }
           PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
                  ("} (I/O suspension after OutputScanlines() - PROGRESSIVE)"));
-          return; /* I/O suspension */
+          return; // I/O suspension
         }
 
-        if (mInfo.output_scanline == mInfo.output_height)
-        {
+        if (mInfo.output_scanline == mInfo.output_height) {
           if (!jpeg_finish_output(&mInfo)) {
             PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
-                   ("} (I/O suspension after jpeg_finish_output() - PROGRESSIVE)"));
-            return; /* I/O suspension */
+                   ("} (I/O suspension after jpeg_finish_output() -"
+                    " PROGRESSIVE)"));
+            return; // I/O suspension
           }
 
           if (jpeg_input_complete(&mInfo) &&
@@ -514,31 +520,33 @@
     }
   }
 
-  case JPEG_DONE:
-  {
-    LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::ProcessData -- entering JPEG_DONE case");
+  case JPEG_DONE: {
+    LOG_SCOPE(GetJPEGLog(), "nsJPEGDecoder::ProcessData -- entering"
+                            " JPEG_DONE case");
 
-    /* Step 7: Finish decompression */
+    // Step 7: Finish decompression
 
     if (jpeg_finish_decompress(&mInfo) == FALSE) {
       PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
              ("} (I/O suspension after jpeg_finish_decompress() - DONE)"));
-      return; /* I/O suspension */
+      return; // I/O suspension
     }
 
     mState = JPEG_SINK_NON_JPEG_TRAILER;
 
-    /* we're done dude */
+    // we're done dude
     break;
   }
   case JPEG_SINK_NON_JPEG_TRAILER:
     PR_LOG(GetJPEGLog(), PR_LOG_DEBUG,
-           ("[this=%p] nsJPEGDecoder::ProcessData -- entering JPEG_SINK_NON_JPEG_TRAILER case\n", this));
+           ("[this=%p] nsJPEGDecoder::ProcessData -- entering"
+            " JPEG_SINK_NON_JPEG_TRAILER case\n", this));
 
     break;
 
   case JPEG_ERROR:
-    NS_ABORT_IF_FALSE(0, "Should always return immediately after error and not re-enter decoder");
+    NS_ABORT_IF_FALSE(0, "Should always return immediately after error and"
+                         " not re-enter decoder");
   }
 
   PR_LOG(GetJPEGDecoderAccountingLog(), PR_LOG_DEBUG,
@@ -553,13 +561,15 @@
 
   // Locate the APP1 marker, where EXIF data is stored, in the marker list.
   for (marker = mInfo.marker_list ; marker != nullptr ; marker = marker->next) {
-    if (marker->marker == JPEG_APP0 + 1) 
+    if (marker->marker == JPEG_APP0 + 1) {
       break;
+    }
   }
 
   // If we're at the end of the list, there's no EXIF data.
-  if (!marker)
+  if (!marker) {
     return Orientation();
+  }
 
   // Extract the orientation information.
   EXIFData exif = EXIFParser::Parse(marker->data,
@@ -582,40 +592,40 @@
   const uint32_t top = mInfo.output_scanline;
 
   while ((mInfo.output_scanline < mInfo.output_height)) {
-      /* Use the Cairo image buffer as scanline buffer */
-      uint32_t *imageRow = ((uint32_t*)mImageData) +
+      // Use the Cairo image buffer as scanline buffer
+      uint32_t* imageRow = ((uint32_t*)mImageData) +
                            (mInfo.output_scanline * mInfo.output_width);
 
       if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
-        /* Special case: scanline will be directly converted into packed ARGB */
+        // Special case: scanline will be directly converted into packed ARGB
         if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
-          *suspend = true; /* suspend */
+          *suspend = true; // suspend
           break;
         }
-        continue; /* all done for this row! */
+        continue; // all done for this row!
       }
 
       JSAMPROW sampleRow = (JSAMPROW)imageRow;
       if (mInfo.output_components == 3) {
-        /* Put the pixels at end of row to enable in-place expansion */
+        // Put the pixels at end of row to enable in-place expansion
         sampleRow += mInfo.output_width;
       }
 
-      /* Request one scanline.  Returns 0 or 1 scanlines. */    
+      // Request one scanline.  Returns 0 or 1 scanlines.
       if (jpeg_read_scanlines(&mInfo, &sampleRow, 1) != 1) {
-        *suspend = true; /* suspend */
+        *suspend = true; // suspend
         break;
       }
 
       if (mTransform) {
         JSAMPROW source = sampleRow;
         if (mInfo.out_color_space == JCS_GRAYSCALE) {
-          /* Convert from the 1byte grey pixels at begin of row 
-             to the 3byte RGB byte pixels at 'end' of row */
+          // Convert from the 1byte grey pixels at begin of row
+          // to the 3byte RGB byte pixels at 'end' of row
           sampleRow += mInfo.output_width;
         }
         qcms_transform_data(mTransform, source, sampleRow, mInfo.output_width);
-        /* Move 3byte RGB data to end of row */
+        // Move 3byte RGB data to end of row
         if (mInfo.out_color_space == JCS_CMYK) {
           memmove(sampleRow + mInfo.output_width,
                   sampleRow,
@@ -624,17 +634,20 @@
         }
       } else {
         if (mInfo.out_color_space == JCS_CMYK) {
-          /* Convert from CMYK to RGB */
-          /* We cannot convert directly to Cairo, as the CMSRGBTransform may wants to do a RGB transform... */
-          /* Would be better to have platform CMSenabled transformation from CMYK to (A)RGB... */
+          // Convert from CMYK to RGB
+          // We cannot convert directly to Cairo, as the CMSRGBTransform
+          // may wants to do a RGB transform...
+          // Would be better to have platform CMSenabled transformation
+          // from CMYK to (A)RGB...
           cmyk_convert_rgb((JSAMPROW)imageRow, mInfo.output_width);
           sampleRow += mInfo.output_width;
         }
         if (mCMSMode == eCMSMode_All) {
-          /* No embedded ICC profile - treat as sRGB */
-          qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
+          // No embedded ICC profile - treat as sRGB
+          qcms_transform* transform = gfxPlatform::GetCMSRGBTransform();
           if (transform) {
-            qcms_transform_data(transform, sampleRow, sampleRow, mInfo.output_width);
+            qcms_transform_data(transform, sampleRow, sampleRow,
+                                mInfo.output_width);
           }
         }
       }
@@ -644,7 +657,8 @@
 
       // copy as bytes until source pointer is 32-bit-aligned
       for (; (NS_PTR_TO_UINT32(sampleRow) & 0x3) && idx; --idx) {
-        *imageRow++ = gfxPackedPixel(0xFF, sampleRow[0], sampleRow[1], sampleRow[2]);
+        *imageRow++ = gfxPackedPixel(0xFF, sampleRow[0], sampleRow[1],
+                                     sampleRow[2]);
         sampleRow += 3;
       }
 
@@ -659,7 +673,8 @@
       // copy remaining pixel(s)
       while (idx--) {
         // 32-bit read of final pixel will exceed buffer, so read bytes
-        *imageRow++ = gfxPackedPixel(0xFF, sampleRow[0], sampleRow[1], sampleRow[2]);
+        *imageRow++ = gfxPackedPixel(0xFF, sampleRow[0], sampleRow[1],
+                                     sampleRow[2]);
         sampleRow += 3;
       }
   }
@@ -672,13 +687,13 @@
 }
 
 
-/* Override the standard error method in the IJG JPEG decoder code. */
+// Override the standard error method in the IJG JPEG decoder code.
 METHODDEF(void)
 my_error_exit (j_common_ptr cinfo)
 {
-  decoder_error_mgr *err = (decoder_error_mgr *) cinfo->err;
+  decoder_error_mgr* err = (decoder_error_mgr*) cinfo->err;
 
-  /* Convert error to a browser error code */
+  // Convert error to a browser error code
   nsresult error_code = err->pub.msg_code == JERR_OUT_OF_MEMORY
                       ? NS_ERROR_OUT_OF_MEMORY
                       : NS_ERROR_FAILURE;
@@ -686,19 +701,18 @@
 #ifdef DEBUG
   char buffer[JMSG_LENGTH_MAX];
 
-  /* Create the message */
+  // Create the message
   (*err->pub.format_message) (cinfo, buffer);
 
   fprintf(stderr, "JPEG decoding error:\n%s\n", buffer);
 #endif
 
-  /* Return control to the setjmp point.  We pass an nsresult masquerading as
-   * an int, which works because the setjmp() caller casts it back. */
+  // Return control to the setjmp point.  We pass an nsresult masquerading as
+  // an int, which works because the setjmp() caller casts it back.
   longjmp(err->setjmp_buffer, static_cast<int>(error_code));
 }
 
-/******************************************************************************/
-/*-----------------------------------------------------------------------------
+/*******************************************************************************
  * This is the callback routine from the IJG JPEG library used to supply new
  * data to the decompressor when its input buffer is exhausted.  It juggles
  * multiple buffers in an attempt to avoid unnecessary copying of input data.
@@ -725,15 +739,14 @@
  * Returns:
  *  TRUE if additional data is available, FALSE if no data present and
  *   the JPEG library should therefore suspend processing of input stream
- *---------------------------------------------------------------------------*/
+ ******************************************************************************/
 
 /******************************************************************************/
 /* data source manager method                                                 */
 /******************************************************************************/
 
-
 /******************************************************************************/
-/* data source manager method 
+/* data source manager method
         Initialize source.  This is called by jpeg_read_header() before any
         data is actually read.  May leave
         bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
@@ -758,21 +771,19 @@
 METHODDEF(void)
 skip_input_data (j_decompress_ptr jd, long num_bytes)
 {
-  struct jpeg_source_mgr *src = jd->src;
-  nsJPEGDecoder *decoder = (nsJPEGDecoder *)(jd->client_data);
+  struct jpeg_source_mgr* src = jd->src;
+  nsJPEGDecoder* decoder = (nsJPEGDecoder*)(jd->client_data);
 
   if (num_bytes > (long)src->bytes_in_buffer) {
-    /*
-     * Can't skip it all right now until we get more data from
-     * network stream. Set things up so that fill_input_buffer
-     * will skip remaining amount.
-     */
+    // Can't skip it all right now until we get more data from
+    // network stream. Set things up so that fill_input_buffer
+    // will skip remaining amount.
     decoder->mBytesToSkip = (size_t)num_bytes - src->bytes_in_buffer;
     src->next_input_byte += src->bytes_in_buffer;
     src->bytes_in_buffer = 0;
 
   } else {
-    /* Simple case. Just advance buffer pointer */
+    // Simple case. Just advance buffer pointer
 
     src->bytes_in_buffer -= (size_t)num_bytes;
     src->next_input_byte += num_bytes;
@@ -795,32 +806,33 @@
 METHODDEF(boolean)
 fill_input_buffer (j_decompress_ptr jd)
 {
-  struct jpeg_source_mgr *src = jd->src;
-  nsJPEGDecoder *decoder = (nsJPEGDecoder *)(jd->client_data);
+  struct jpeg_source_mgr* src = jd->src;
+  nsJPEGDecoder* decoder = (nsJPEGDecoder*)(jd->client_data);
 
   if (decoder->mReading) {
-    const JOCTET *new_buffer = decoder->mSegment;
+    const JOCTET* new_buffer = decoder->mSegment;
     uint32_t new_buflen = decoder->mSegmentLen;
-  
-    if (!new_buffer || new_buflen == 0)
-      return false; /* suspend */
+
+    if (!new_buffer || new_buflen == 0) {
+      return false; // suspend
+    }
 
     decoder->mSegmentLen = 0;
 
     if (decoder->mBytesToSkip) {
       if (decoder->mBytesToSkip < new_buflen) {
-        /* All done skipping bytes; Return what's left. */
+        // All done skipping bytes; Return what's left.
         new_buffer += decoder->mBytesToSkip;
         new_buflen -= decoder->mBytesToSkip;
         decoder->mBytesToSkip = 0;
       } else {
-        /* Still need to skip some more data in the future */
+        // Still need to skip some more data in the future
         decoder->mBytesToSkip -= (size_t)new_buflen;
-        return false; /* suspend */
+        return false; // suspend
       }
     }
 
-      decoder->mBackBufferUnreadLen = src->bytes_in_buffer;
+    decoder->mBackBufferUnreadLen = src->bytes_in_buffer;
 
     src->next_input_byte = new_buffer;
     src->bytes_in_buffer = (size_t)new_buflen;
@@ -830,25 +842,27 @@
   }
 
   if (src->next_input_byte != decoder->mSegment) {
-    /* Backtrack data has been permanently consumed. */
+    // Backtrack data has been permanently consumed.
     decoder->mBackBufferUnreadLen = 0;
     decoder->mBackBufferLen = 0;
   }
 
-  /* Save remainder of netlib buffer in backtrack buffer */
-  const uint32_t new_backtrack_buflen = src->bytes_in_buffer + decoder->mBackBufferLen;
- 
-  /* Make sure backtrack buffer is big enough to hold new data. */
+  // Save remainder of netlib buffer in backtrack buffer
+  const uint32_t new_backtrack_buflen = src->bytes_in_buffer +
+                                        decoder->mBackBufferLen;
+
+  // Make sure backtrack buffer is big enough to hold new data.
   if (decoder->mBackBufferSize < new_backtrack_buflen) {
-    /* Check for malformed MARKER segment lengths, before allocating space for it */
+    // Check for malformed MARKER segment lengths, before allocating space
+    // for it
     if (new_backtrack_buflen > MAX_JPEG_MARKER_LENGTH) {
       my_error_exit((j_common_ptr)(&decoder->mInfo));
     }
 
-    /* Round up to multiple of 256 bytes. */
+    // Round up to multiple of 256 bytes.
     const size_t roundup_buflen = ((new_backtrack_buflen + 255) >> 8) << 8;
-    JOCTET *buf = (JOCTET *)PR_REALLOC(decoder->mBackBuffer, roundup_buflen);
-    /* Check for OOM */
+    JOCTET* buf = (JOCTET*)PR_REALLOC(decoder->mBackBuffer, roundup_buflen);
+    // Check for OOM
     if (!buf) {
       decoder->mInfo.err->msg_code = JERR_OUT_OF_MEMORY;
       my_error_exit((j_common_ptr)(&decoder->mInfo));
@@ -857,13 +871,14 @@
     decoder->mBackBufferSize = roundup_buflen;
   }
 
-  /* Copy remainder of netlib segment into backtrack buffer. */
+  // Copy remainder of netlib segment into backtrack buffer.
   memmove(decoder->mBackBuffer + decoder->mBackBufferLen,
           src->next_input_byte,
           src->bytes_in_buffer);
 
-  /* Point to start of data to be rescanned. */
-  src->next_input_byte = decoder->mBackBuffer + decoder->mBackBufferLen - decoder->mBackBufferUnreadLen;
+  // Point to start of data to be rescanned.
+  src->next_input_byte = decoder->mBackBuffer + decoder->mBackBufferLen -
+                         decoder->mBackBufferUnreadLen;
   src->bytes_in_buffer += decoder->mBackBufferUnreadLen;
   decoder->mBackBufferLen = (size_t)new_backtrack_buflen;
   decoder->mReading = true;
@@ -875,13 +890,13 @@
 /* data source manager method */
 /*
  * Terminate source --- called by jpeg_finish_decompress() after all
- * data has been read to clean up JPEG source manager. NOT called by 
+ * data has been read to clean up JPEG source manager. NOT called by
  * jpeg_abort() or jpeg_destroy().
  */
 METHODDEF(void)
 term_source (j_decompress_ptr jd)
 {
-  nsJPEGDecoder *decoder = (nsJPEGDecoder *)(jd->client_data);
+  nsJPEGDecoder* decoder = (nsJPEGDecoder*)(jd->client_data);
 
   // This function shouldn't be called if we ran into an error we didn't
   // recover from.
@@ -896,16 +911,15 @@
 } // namespace mozilla
 
 
-/**************** Inverted CMYK -> RGB conversion **************/
-/*
- * Input is (Inverted) CMYK stored as 4 bytes per pixel.
- * Output is RGB stored as 3 bytes per pixel.
- * @param row Points to row buffer containing the CMYK bytes for each pixel in the row.
- * @param width Number of pixels in the row.
- */
+///*************** Inverted CMYK -> RGB conversion *************************
+/// Input is (Inverted) CMYK stored as 4 bytes per pixel.
+/// Output is RGB stored as 3 bytes per pixel.
+/// @param row Points to row buffer containing the CMYK bytes for each pixel
+/// in the row.
+/// @param width Number of pixels in the row.
 static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width)
 {
-  /* Work from end to front to shrink from 4 bytes per pixel to 3 */
+  // Work from end to front to shrink from 4 bytes per pixel to 3
   JSAMPROW in = row + width*4;
   JSAMPROW out = in;
 
@@ -930,7 +944,7 @@
     // R = 1 - C => 1 - (1 - iC*iK) => iC*iK
     // G = 1 - M => 1 - (1 - iM*iK) => iM*iK
     // B = 1 - Y => 1 - (1 - iY*iK) => iY*iK
-  
+
     // Convert from Inverted CMYK (0..255) to RGB (0..255)
     const uint32_t iC = in[0];
     const uint32_t iM = in[1];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsJPEGDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsJPEGDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsJPEGDecoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsJPEGDecoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -4,13 +4,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/. */
 
-#ifndef nsJPEGDecoder_h__
-#define nsJPEGDecoder_h__
+#ifndef nsJPEGDecoder_h
+#define nsJPEGDecoder_h
 
 #include "RasterImage.h"
-/* On Windows systems, RasterImage.h brings in 'windows.h', which defines INT32.
- * But the jpeg decoder has its own definition of INT32. To avoid build issues,
- * we need to undefine the version from 'windows.h'. */
+// On Windows systems, RasterImage.h brings in 'windows.h', which defines INT32.
+// But the jpeg decoder has its own definition of INT32. To avoid build issues,
+// we need to undefine the version from 'windows.h'.
 #undef INT32
 
 #include "Decoder.h"
@@ -31,19 +31,19 @@
 namespace image {
 
 typedef struct {
-    struct jpeg_error_mgr pub;  /* "public" fields for IJG library*/
-    jmp_buf setjmp_buffer;      /* For handling catastropic errors */
+    struct jpeg_error_mgr pub;  // "public" fields for IJG library
+    jmp_buf setjmp_buffer;      // For handling catastropic errors
 } decoder_error_mgr;
 
 typedef enum {
-    JPEG_HEADER,                          /* Reading JFIF headers */
+    JPEG_HEADER,                          // Reading JFIF headers
     JPEG_START_DECOMPRESS,
-    JPEG_DECOMPRESS_PROGRESSIVE,          /* Output progressive pixels */
-    JPEG_DECOMPRESS_SEQUENTIAL,           /* Output sequential pixels */
+    JPEG_DECOMPRESS_PROGRESSIVE,          // Output progressive pixels
+    JPEG_DECOMPRESS_SEQUENTIAL,           // Output sequential pixels
     JPEG_DONE,
-    JPEG_SINK_NON_JPEG_TRAILER,          /* Some image files have a */
-                                         /* non-JPEG trailer */
-    JPEG_ERROR    
+    JPEG_SINK_NON_JPEG_TRAILER,          // Some image files have a
+                                         // non-JPEG trailer
+    JPEG_ERROR
 } jstate;
 
 class RasterImage;
@@ -52,11 +52,12 @@
 class nsJPEGDecoder : public Decoder
 {
 public:
-  nsJPEGDecoder(RasterImage &aImage, Decoder::DecodeStyle aDecodeStyle);
+  nsJPEGDecoder(RasterImage& aImage, Decoder::DecodeStyle aDecodeStyle);
   virtual ~nsJPEGDecoder();
 
   virtual void InitInternal();
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy aStrategy) MOZ_OVERRIDE;
   virtual void FinishInternal();
 
   virtual Telemetry::ID SpeedHistogram();
@@ -74,19 +75,19 @@
 
   uint32_t mBytesToSkip;
 
-  const JOCTET *mSegment;   // The current segment we are decoding from
+  const JOCTET* mSegment;   // The current segment we are decoding from
   uint32_t mSegmentLen;     // amount of data in mSegment
 
-  JOCTET *mBackBuffer;
+  JOCTET* mBackBuffer;
   uint32_t mBackBufferLen; // Offset of end of active backtrack data
   uint32_t mBackBufferSize; // size in bytes what mBackBuffer was created with
   uint32_t mBackBufferUnreadLen; // amount of data currently in mBackBuffer
 
-  JOCTET  *mProfile;
+  JOCTET * mProfile;
   uint32_t mProfileLength;
 
-  qcms_profile *mInProfile;
-  qcms_transform *mTransform;
+  qcms_profile* mInProfile;
+  qcms_transform* mTransform;
 
   bool mReading;
 
@@ -98,4 +99,4 @@
 } // namespace image
 } // namespace mozilla
 
-#endif // nsJPEGDecoder_h__
+#endif // nsJPEGDecoder_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsPNGDecoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsPNGDecoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsPNGDecoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsPNGDecoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -22,21 +22,23 @@
 namespace image {
 
 #ifdef PR_LOGGING
-static PRLogModuleInfo *
+static PRLogModuleInfo*
 GetPNGLog()
 {
-  static PRLogModuleInfo *sPNGLog;
-  if (!sPNGLog)
+  static PRLogModuleInfo* sPNGLog;
+  if (!sPNGLog) {
     sPNGLog = PR_NewLogModule("PNGDecoder");
+  }
   return sPNGLog;
 }
 
-static PRLogModuleInfo *
+static PRLogModuleInfo*
 GetPNGDecoderAccountingLog()
 {
-  static PRLogModuleInfo *sPNGDecoderAccountingLog;
-  if (!sPNGDecoderAccountingLog)
+  static PRLogModuleInfo* sPNGDecoderAccountingLog;
+  if (!sPNGDecoderAccountingLog) {
     sPNGDecoderAccountingLog = PR_NewLogModule("PNGDecoderAccounting");
+  }
   return sPNGDecoderAccountingLog;
 }
 #endif
@@ -55,7 +57,7 @@
  : mDispose(FrameBlender::kDisposeKeep)
  , mBlend(FrameBlender::kBlendOver)
  , mTimeout(0)
-{}
+{ }
 
 #ifdef PNG_APNG_SUPPORTED
 nsPNGDecoder::AnimFrameInfo::AnimFrameInfo(png_structp aPNG, png_infop aInfo)
@@ -75,8 +77,9 @@
   if (delay_num == 0) {
     mTimeout = 0; // SetFrameTimeout() will set to a minimum
   } else {
-    if (delay_den == 0)
+    if (delay_den == 0) {
       delay_den = 100; // so says the APNG spec
+    }
 
     // Need to cast delay_num to float to have a proper division and
     // the result to int to avoid compiler warning
@@ -104,7 +107,7 @@
 const uint8_t
 nsPNGDecoder::pngSignatureBytes[] = { 137, 80, 78, 71, 13, 10, 26, 10 };
 
-nsPNGDecoder::nsPNGDecoder(RasterImage &aImage)
+nsPNGDecoder::nsPNGDecoder(RasterImage& aImage)
  : Decoder(aImage),
    mPNG(nullptr), mInfo(nullptr),
    mCMSLine(nullptr), interlacebuf(nullptr),
@@ -118,18 +121,22 @@
 
 nsPNGDecoder::~nsPNGDecoder()
 {
-  if (mPNG)
+  if (mPNG) {
     png_destroy_read_struct(&mPNG, mInfo ? &mInfo : nullptr, nullptr);
-  if (mCMSLine)
+  }
+  if (mCMSLine) {
     nsMemory::Free(mCMSLine);
-  if (interlacebuf)
+  }
+  if (interlacebuf) {
     nsMemory::Free(interlacebuf);
+  }
   if (mInProfile) {
     qcms_profile_release(mInProfile);
 
     // mTransform belongs to us only if mInProfile is non-null
-    if (mTransform)
+    if (mTransform) {
       qcms_transform_release(mTransform);
+    }
   }
 }
 
@@ -138,14 +145,27 @@
                                int32_t width, int32_t height,
                                gfx::SurfaceFormat format)
 {
+  MOZ_ASSERT(HasSize());
+
+  if (format == gfx::SurfaceFormat::B8G8R8A8) {
+    PostHasTransparency();
+  }
+
   // Our first full frame is automatically created by the image decoding
   // infrastructure. Just use it as long as it matches up.
-  MOZ_ASSERT(HasSize());
   nsIntRect neededRect(x_offset, y_offset, width, height);
   nsRefPtr<imgFrame> currentFrame = GetCurrentFrame();
-  if (mNumFrames != 0 || !currentFrame->GetRect().IsEqualEdges(neededRect)) {
+  if (!currentFrame->GetRect().IsEqualEdges(neededRect)) {
+    if (mNumFrames == 0) {
+      // We need padding on the first frame, which means that we don't draw into
+      // part of the image at all. Report that as transparency.
+      PostHasTransparency();
+    }
+
     NeedNewFrame(mNumFrames, x_offset, y_offset, width, height, format);
-  } else if (mNumFrames == 0) {
+  } else if (mNumFrames != 0) {
+    NeedNewFrame(mNumFrames, x_offset, y_offset, width, height, format);
+  } else {
     // Our preallocated frame matches up, with the possible exception of alpha.
     if (format == gfx::SurfaceFormat::B8G8R8X8) {
       currentFrame->SetHasNoAlpha();
@@ -164,23 +184,32 @@
 #ifdef PNG_APNG_SUPPORTED
   if (png_get_valid(mPNG, mInfo, PNG_INFO_acTL)) {
     mAnimInfo = AnimFrameInfo(mPNG, mInfo);
+
+    if (mAnimInfo.mDispose == FrameBlender::kDisposeClear) {
+      // We may have to display the background under this image during
+      // animation playback, so we regard it as transparent.
+      PostHasTransparency();
+    }
   }
 #endif
 }
 
 // set timeout and frame disposal method for the current frame
-void nsPNGDecoder::EndImageFrame()
+void
+nsPNGDecoder::EndImageFrame()
 {
-  if (mFrameIsHidden)
+  if (mFrameIsHidden) {
     return;
+  }
 
   mNumFrames++;
 
   FrameBlender::FrameAlpha alpha;
-  if (mFrameHasNoAlpha)
+  if (mFrameHasNoAlpha) {
     alpha = FrameBlender::kFrameOpaque;
-  else
+  } else {
     alpha = FrameBlender::kFrameHasAlpha;
+  }
 
 #ifdef PNG_APNG_SUPPORTED
   uint32_t numFrames = GetFrameCount();
@@ -204,8 +233,9 @@
   }
 
   mCMSMode = gfxPlatform::GetCMSMode();
-  if ((mDecodeFlags & DECODER_NO_COLORSPACE_CONVERSION) != 0)
+  if ((mDecodeFlags & DECODER_NO_COLORSPACE_CONVERSION) != 0) {
     mCMSMode = eCMSMode_Off;
+  }
   mDisablePremultipliedAlpha = (mDecodeFlags & DECODER_NO_PREMULTIPLY_ALPHA)
                                 != 0;
 
@@ -250,16 +280,18 @@
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
   // Ignore unused chunks
-  if (mCMSMode == eCMSMode_Off)
+  if (mCMSMode == eCMSMode_Off) {
     png_set_keep_unknown_chunks(mPNG, 1, color_chunks, 2);
+  }
 
   png_set_keep_unknown_chunks(mPNG, 1, unused_chunks,
                               (int)sizeof(unused_chunks)/5);
 #endif
 
 #ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-  if (mCMSMode != eCMSMode_Off)
+  if (mCMSMode != eCMSMode_Off) {
     png_set_chunk_malloc_max(mPNG, 4000000L);
+  }
 #endif
 
 #ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
@@ -288,7 +320,7 @@
 }
 
 void
-nsPNGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount,
+nsPNGDecoder::WriteInternal(const char* aBuffer, uint32_t aCount,
                             DecodeStrategy)
 {
   NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
@@ -297,12 +329,13 @@
   if (IsSizeDecode()) {
 
     // Are we done?
-    if (mHeaderBytesRead == BYTES_NEEDED_FOR_DIMENSIONS)
+    if (mHeaderBytesRead == BYTES_NEEDED_FOR_DIMENSIONS) {
       return;
+    }
 
     // Scan the header for the width and height bytes
     uint32_t pos = 0;
-    const uint8_t *bptr = (uint8_t *)aBuffer;
+    const uint8_t* bptr = (uint8_t*)aBuffer;
 
     while (pos < aCount && mHeaderBytesRead < BYTES_NEEDED_FOR_DIMENSIONS) {
       // Verify the signature bytes
@@ -338,25 +371,25 @@
       // Post our size to the superclass
       PostSize(width, height);
     }
-  }
 
   // Otherwise, we're doing a standard decode
-  else {
+  } else {
 
     // libpng uses setjmp/longjmp for error handling - set the buffer
     if (setjmp(png_jmpbuf(mPNG))) {
 
       // We might not really know what caused the error, but it makes more
       // sense to blame the data.
-      if (!HasError())
+      if (!HasError()) {
         PostDataError();
+      }
 
       png_destroy_read_struct(&mPNG, &mInfo, nullptr);
       return;
     }
 
     // Pass the data off to libpng
-    png_process_data(mPNG, mInfo, (unsigned char *)aBuffer, aCount);
+    png_process_data(mPNG, mInfo, (unsigned char*)aBuffer, aCount);
 
   }
 }
@@ -374,18 +407,17 @@
       png_set_gAMA(png_ptr, info_ptr, aGamma);
     }
     png_set_gamma(png_ptr, 2.2, aGamma);
-  }
-  else
+  } else {
     png_set_gamma(png_ptr, 2.2, 0.45455);
-
+  }
 }
 
 // Adapted from http://www.littlecms.com/pngchrm.c example code
-static qcms_profile *
+static qcms_profile*
 PNGGetColorProfile(png_structp png_ptr, png_infop info_ptr,
-                   int color_type, qcms_data_type *inType, uint32_t *intent)
+                   int color_type, qcms_data_type* inType, uint32_t* intent)
 {
-  qcms_profile *profile = nullptr;
+  qcms_profile* profile = nullptr;
   *intent = QCMS_INTENT_PERCEPTUAL; // Our default
 
   // First try to see if iCCP chunk is present
@@ -398,19 +430,21 @@
     png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
                  &profileData, &profileLen);
 
-    profile = qcms_profile_from_memory((char *)profileData, profileLen);
+    profile = qcms_profile_from_memory((char*)profileData, profileLen);
     if (profile) {
       uint32_t profileSpace = qcms_profile_get_color_space(profile);
 
       bool mismatch = false;
       if (color_type & PNG_COLOR_MASK_COLOR) {
-        if (profileSpace != icSigRgbData)
+        if (profileSpace != icSigRgbData) {
           mismatch = true;
+        }
       } else {
-        if (profileSpace == icSigRgbData)
+        if (profileSpace == icSigRgbData) {
           png_set_gray_to_rgb(png_ptr);
-        else if (profileSpace != icSigGrayData)
+        } else if (profileSpace != icSigGrayData) {
           mismatch = true;
+        }
       }
 
       if (mismatch) {
@@ -460,23 +494,26 @@
     profile = qcms_profile_create_rgb_with_gamma(whitePoint, primaries,
                                                  1.0/gammaOfFile);
 
-    if (profile)
+    if (profile) {
       png_set_gray_to_rgb(png_ptr);
+    }
   }
 
   if (profile) {
     uint32_t profileSpace = qcms_profile_get_color_space(profile);
     if (profileSpace == icSigGrayData) {
-      if (color_type & PNG_COLOR_MASK_ALPHA)
+      if (color_type & PNG_COLOR_MASK_ALPHA) {
         *inType = QCMS_DATA_GRAYA_8;
-      else
+      } else {
         *inType = QCMS_DATA_GRAY_8;
+      }
     } else {
       if (color_type & PNG_COLOR_MASK_ALPHA ||
-          png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+          png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
         *inType = QCMS_DATA_RGBA_8;
-      else
+      } else {
         *inType = QCMS_DATA_RGB_8;
+      }
     }
   }
 
@@ -494,7 +531,7 @@
   png_bytep trans = nullptr;
   int num_trans = 0;
 
-  nsPNGDecoder *decoder =
+  nsPNGDecoder* decoder =
                static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
 
   // Always decode to 24-bit RGB or 32-bit RGBA
@@ -502,8 +539,9 @@
                &interlace_type, &compression_type, &filter_type);
 
   // Are we too big?
-  if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
+  if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
     png_longjmp(decoder->mPNG, 1);
+  }
 
   // Post our size to the superclass
   decoder->PostSize(width, height);
@@ -512,11 +550,13 @@
     png_longjmp(decoder->mPNG, 1);
   }
 
-  if (color_type == PNG_COLOR_TYPE_PALETTE)
+  if (color_type == PNG_COLOR_TYPE_PALETTE) {
     png_set_expand(png_ptr);
+  }
 
-  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
     png_set_expand(png_ptr);
+  }
 
   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
     int sample_max = (1 << bit_depth);
@@ -527,21 +567,21 @@
     // channel or producing unexpected transparent pixels when using
     // libpng-1.2.19 through 1.2.26 (bug #428045)
     if ((color_type == PNG_COLOR_TYPE_GRAY &&
-       (int)trans_values->gray > sample_max) ||
-       (color_type == PNG_COLOR_TYPE_RGB &&
-       ((int)trans_values->red > sample_max ||
-       (int)trans_values->green > sample_max ||
-       (int)trans_values->blue > sample_max)))
-      {
-        // clear the tRNS valid flag and release tRNS memory
-        png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
-      }
-    else
+         (int)trans_values->gray > sample_max) ||
+         (color_type == PNG_COLOR_TYPE_RGB &&
+         ((int)trans_values->red > sample_max ||
+         (int)trans_values->green > sample_max ||
+         (int)trans_values->blue > sample_max))) {
+      // clear the tRNS valid flag and release tRNS memory
+      png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
+    } else {
       png_set_expand(png_ptr);
+    }
   }
 
-  if (bit_depth == 16)
+  if (bit_depth == 16) {
     png_set_scale_16(png_ptr);
+  }
 
   qcms_data_type inType = QCMS_DATA_RGBA_8;
   uint32_t intent = -1;
@@ -551,16 +591,18 @@
     decoder->mInProfile = PNGGetColorProfile(png_ptr, info_ptr,
                                              color_type, &inType, &pIntent);
     // If we're not mandating an intent, use the one from the image.
-    if (intent == uint32_t(-1))
+    if (intent == uint32_t(-1)) {
       intent = pIntent;
+    }
   }
   if (decoder->mInProfile && gfxPlatform::GetCMSOutputProfile()) {
     qcms_data_type outType;
 
-    if (color_type & PNG_COLOR_MASK_ALPHA || num_trans)
+    if (color_type & PNG_COLOR_MASK_ALPHA || num_trans) {
       outType = QCMS_DATA_RGBA_8;
-    else
+    } else {
       outType = QCMS_DATA_RGB_8;
+    }
 
     decoder->mTransform = qcms_transform_create(decoder->mInProfile,
                                            inType,
@@ -571,14 +613,16 @@
     png_set_gray_to_rgb(png_ptr);
 
     // only do gamma correction if CMS isn't entirely disabled
-    if (decoder->mCMSMode != eCMSMode_Off)
+    if (decoder->mCMSMode != eCMSMode_Off) {
       PNGDoGammaCorrection(png_ptr, info_ptr);
+    }
 
     if (decoder->mCMSMode == eCMSMode_All) {
-      if (color_type & PNG_COLOR_MASK_ALPHA || num_trans)
+      if (color_type & PNG_COLOR_MASK_ALPHA || num_trans) {
         decoder->mTransform = gfxPlatform::GetCMSRGBATransform();
-      else
+      } else {
         decoder->mTransform = gfxPlatform::GetCMSRGBTransform();
+      }
     }
   }
 
@@ -597,15 +641,17 @@
   // copy PNG info into imagelib structs (formerly png_set_dims()) //
   //---------------------------------------------------------------//
 
-  if (channels == 1 || channels == 3)
+  if (channels == 1 || channels == 3) {
     decoder->format = gfx::SurfaceFormat::B8G8R8X8;
-  else if (channels == 2 || channels == 4)
+  } else if (channels == 2 || channels == 4) {
     decoder->format = gfx::SurfaceFormat::B8G8R8A8;
+  }
 
 #ifdef PNG_APNG_SUPPORTED
-  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_acTL))
+  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_acTL)) {
     png_set_progressive_frame_fn(png_ptr, nsPNGDecoder::frame_info_callback,
                                  nullptr);
+  }
 
   if (png_get_first_frame_is_hidden(png_ptr, info_ptr)) {
     decoder->mFrameIsHidden = true;
@@ -620,15 +666,16 @@
       (channels <= 2 || interlace_type == PNG_INTERLACE_ADAM7)) {
     uint32_t bpp[] = { 0, 3, 4, 3, 4 };
     decoder->mCMSLine =
-      (uint8_t *)moz_malloc(bpp[channels] * width);
+      (uint8_t*)moz_malloc(bpp[channels] * width);
     if (!decoder->mCMSLine) {
       png_longjmp(decoder->mPNG, 5); // NS_ERROR_OUT_OF_MEMORY
     }
   }
 
   if (interlace_type == PNG_INTERLACE_ADAM7) {
-    if (height < INT32_MAX / (width * channels))
-      decoder->interlacebuf = (uint8_t *)moz_malloc(channels * width * height);
+    if (height < INT32_MAX / (width * channels)) {
+      decoder->interlacebuf = (uint8_t*)moz_malloc(channels * width * height);
+    }
     if (!decoder->interlacebuf) {
       png_longjmp(decoder->mPNG, 5); // NS_ERROR_OUT_OF_MEMORY
     }
@@ -672,15 +719,17 @@
    * to pass the current row, and the function will combine the
    * old row and the new row.
    */
-  nsPNGDecoder *decoder =
+  nsPNGDecoder* decoder =
                static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
 
   // skip this frame
-  if (decoder->mFrameIsHidden)
+  if (decoder->mFrameIsHidden) {
     return;
+  }
 
-  if (row_num >= (png_uint_32) decoder->mFrameRect.height)
+  if (row_num >= (png_uint_32) decoder->mFrameRect.height) {
     return;
+  }
 
   if (new_row) {
     int32_t width = decoder->mFrameRect.width;
@@ -693,7 +742,7 @@
     }
 
     uint32_t bpr = width * sizeof(uint32_t);
-    uint32_t *cptr32 = (uint32_t*)(decoder->mImageData + (row_num*bpr));
+    uint32_t* cptr32 = (uint32_t*)(decoder->mImageData + (row_num*bpr));
     bool rowHasNoAlpha = true;
 
     if (decoder->mTransform) {
@@ -709,12 +758,11 @@
         line = decoder->mCMSLine;
       } else {
         qcms_transform_data(decoder->mTransform, line, line, iwidth);
-       }
-     }
+      }
+    }
 
     switch (decoder->format) {
-      case gfx::SurfaceFormat::B8G8R8X8:
-      {
+      case gfx::SurfaceFormat::B8G8R8X8: {
         // counter for while() loops below
         uint32_t idx = iwidth;
 
@@ -740,21 +788,22 @@
         }
       }
       break;
-      case gfx::SurfaceFormat::B8G8R8A8:
-      {
+      case gfx::SurfaceFormat::B8G8R8A8: {
         if (!decoder->mDisablePremultipliedAlpha) {
           for (uint32_t x=width; x>0; --x) {
             *cptr32++ = gfxPackedPixel(line[3], line[0], line[1], line[2]);
-            if (line[3] != 0xff)
+            if (line[3] != 0xff) {
               rowHasNoAlpha = false;
+            }
             line += 4;
           }
         } else {
           for (uint32_t x=width; x>0; --x) {
             *cptr32++ = gfxPackedPixelNoPreMultiply(line[3], line[0], line[1],
                                                     line[2]);
-            if (line[3] != 0xff)
+            if (line[3] != 0xff) {
               rowHasNoAlpha = false;
+            }
             line += 4;
           }
         }
@@ -764,8 +813,9 @@
         png_longjmp(decoder->mPNG, 1);
     }
 
-    if (!rowHasNoAlpha)
+    if (!rowHasNoAlpha) {
       decoder->mFrameHasNoAlpha = false;
+    }
 
     if (decoder->mNumFrames <= 1) {
       // Only do incremental image display for the first frame
@@ -784,7 +834,7 @@
   png_uint_32 x_offset, y_offset;
   int32_t width, height;
 
-  nsPNGDecoder *decoder =
+  nsPNGDecoder* decoder =
                static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
 
   // old frame is done
@@ -823,7 +873,7 @@
    * marks the image as finished.
    */
 
-  nsPNGDecoder *decoder =
+  nsPNGDecoder* decoder =
                static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
 
   // We shouldn't get here if we've hit an error
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsPNGDecoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsPNGDecoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/decoders/nsPNGDecoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/decoders/nsPNGDecoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -24,11 +24,12 @@
 class nsPNGDecoder : public Decoder
 {
 public:
-  explicit nsPNGDecoder(RasterImage &aImage);
+  explicit nsPNGDecoder(RasterImage& aImage);
   virtual ~nsPNGDecoder();
 
   virtual void InitInternal();
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+                             DecodeStrategy aStrategy) MOZ_OVERRIDE;
   virtual Telemetry::ID SpeedHistogram();
 
   void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
@@ -71,10 +72,10 @@
   png_structp mPNG;
   png_infop mInfo;
   nsIntRect mFrameRect;
-  uint8_t *mCMSLine;
-  uint8_t *interlacebuf;
-  qcms_profile *mInProfile;
-  qcms_transform *mTransform;
+  uint8_t* mCMSLine;
+  uint8_t* interlacebuf;
+  qcms_profile* mInProfile;
+  qcms_transform* mTransform;
 
   gfx::SurfaceFormat format;
 
@@ -106,12 +107,9 @@
 
   // The number of frames we've finished.
   uint32_t mNumFrames;
-  
-  /*
-   * libpng callbacks
-   *
-   * We put these in the class so that they can access protected members.
-   */
+
+  // libpng callbacks
+  // We put these in the class so that they can access protected members.
   static void PNGAPI info_callback(png_structp png_ptr, png_infop info_ptr);
   static void PNGAPI row_callback(png_structp png_ptr, png_bytep new_row,
                                   png_uint_32 row_num, int pass);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/bmp/nsBMPEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/bmp/nsBMPEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/bmp/nsBMPEncoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/bmp/nsBMPEncoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -13,15 +13,16 @@
 
 using namespace mozilla;
 
-NS_IMPL_ISUPPORTS(nsBMPEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream)
+NS_IMPL_ISUPPORTS(nsBMPEncoder, imgIEncoder, nsIInputStream,
+                  nsIAsyncInputStream)
 
-nsBMPEncoder::nsBMPEncoder() : mImageBufferStart(nullptr), 
+nsBMPEncoder::nsBMPEncoder() : mImageBufferStart(nullptr),
                                mImageBufferCurr(0),
-                               mImageBufferSize(0), 
-                               mImageBufferReadPoint(0), 
+                               mImageBufferSize(0),
+                               mImageBufferReadPoint(0),
                                mFinished(false),
-                               mCallback(nullptr), 
-                               mCallbackTarget(nullptr), 
+                               mCallback(nullptr),
+                               mCallbackTarget(nullptr),
                                mNotifyThreshold(0)
 {
 }
@@ -39,14 +40,14 @@
 //
 // One output option is supported: bpp=<bpp_value>
 // bpp specifies the bits per pixel to use where bpp_value can be 24 or 32
-NS_IMETHODIMP nsBMPEncoder::InitFromData(const uint8_t* aData,
-                                         uint32_t aLength, // (unused,
-                                                           // req'd by JS)
-                                         uint32_t aWidth,
-                                         uint32_t aHeight,
-                                         uint32_t aStride,
-                                         uint32_t aInputFormat,
-                                         const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsBMPEncoder::InitFromData(const uint8_t* aData,
+                           uint32_t aLength, // (unused, req'd by JS)
+                           uint32_t aWidth,
+                           uint32_t aHeight,
+                           uint32_t aStride,
+                           uint32_t aInputFormat,
+                           const nsAString& aOutputOptions)
 {
   // validate input format
   if (aInputFormat != INPUT_FORMAT_RGB &&
@@ -58,7 +59,8 @@
   // Stride is the padded width of each row, so it better be longer
   if ((aInputFormat == INPUT_FORMAT_RGB &&
        aStride < aWidth * 3) ||
-      ((aInputFormat == INPUT_FORMAT_RGBA || aInputFormat == INPUT_FORMAT_HOSTARGB) &&
+      ((aInputFormat == INPUT_FORMAT_RGBA ||
+        aInputFormat == INPUT_FORMAT_HOSTARGB) &&
        aStride < aWidth * 4)) {
       NS_WARNING("Invalid stride for InitFromData");
       return NS_ERROR_INVALID_ARG;
@@ -101,10 +103,11 @@
 }
 
 // See ::InitFromData for other info.
-NS_IMETHODIMP nsBMPEncoder::StartImageEncode(uint32_t aWidth,
-                                             uint32_t aHeight,
-                                             uint32_t aInputFormat,
-                                             const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsBMPEncoder::StartImageEncode(uint32_t aWidth,
+                               uint32_t aHeight,
+                               uint32_t aInputFormat,
+                               const nsAString& aOutputOptions)
 {
   // can't initialize more than once
   if (mImageBufferStart || mImageBufferCurr) {
@@ -144,7 +147,8 @@
 
 // Returns the number of bytes in the image buffer used.
 // For a BMP file, this is all bytes in the buffer.
-NS_IMETHODIMP nsBMPEncoder::GetImageBufferUsed(uint32_t *aOutputSize)
+NS_IMETHODIMP
+nsBMPEncoder::GetImageBufferUsed(uint32_t* aOutputSize)
 {
   NS_ENSURE_ARG_POINTER(aOutputSize);
   *aOutputSize = mImageBufferSize;
@@ -152,21 +156,22 @@
 }
 
 // Returns a pointer to the start of the image buffer
-NS_IMETHODIMP nsBMPEncoder::GetImageBuffer(char **aOutputBuffer)
+NS_IMETHODIMP
+nsBMPEncoder::GetImageBuffer(char** aOutputBuffer)
 {
   NS_ENSURE_ARG_POINTER(aOutputBuffer);
   *aOutputBuffer = reinterpret_cast<char*>(mImageBufferStart);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsBMPEncoder::AddImageFrame(const uint8_t* aData,
-                                          uint32_t aLength, // (unused,
-                                                            // req'd by JS)
-                                          uint32_t aWidth,
-                                          uint32_t aHeight,
-                                          uint32_t aStride,
-                                          uint32_t aInputFormat,
-                                          const nsAString& aFrameOptions)
+NS_IMETHODIMP
+nsBMPEncoder::AddImageFrame(const uint8_t* aData,
+                            uint32_t aLength, // (unused, req'd by JS)
+                            uint32_t aWidth,
+                            uint32_t aHeight,
+                            uint32_t aStride,
+                            uint32_t aInputFormat,
+                            const nsAString& aFrameOptions)
 {
   // must be initialized
   if (!mImageBufferStart || !mImageBufferCurr) {
@@ -181,8 +186,8 @@
   }
 
   static fallible_t fallible = fallible_t();
-  nsAutoArrayPtr<uint8_t> row(new (fallible) 
-                              uint8_t[mBMPInfoHeader.width * 
+  nsAutoArrayPtr<uint8_t> row(new (fallible)
+                              uint8_t[mBMPInfoHeader.width *
                               BytesPerPixel(mBMPInfoHeader.bpp)]);
   if (!row) {
     return NS_ERROR_OUT_OF_MEMORY;
@@ -214,7 +219,7 @@
     for (int32_t y = 0; y < mBMPInfoHeader.height; y ++) {
       if (mBMPInfoHeader.bpp == 24) {
         EncodeImageDataRow24(&aData[y * aStride]);
-      } else { 
+      } else {
         EncodeImageDataRow32(&aData[y * aStride]);
       }
     }
@@ -227,7 +232,8 @@
 }
 
 
-NS_IMETHODIMP nsBMPEncoder::EndImageEncode()
+NS_IMETHODIMP
+nsBMPEncoder::EndImageEncode()
 {
   // must be initialized
   if (!mImageBufferStart || !mImageBufferCurr) {
@@ -258,7 +264,7 @@
   if (bpp) {
     *bpp = 24;
   }
-  
+
   // Parse the input string into a set of name/value pairs.
   // From a format like: name=value;bpp=<bpp_value>;name=value
   // to format: [0] = name=value, [1] = bpp=<bpp_value>, [2] = name=value
@@ -307,7 +313,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsBMPEncoder::Close()
+NS_IMETHODIMP
+nsBMPEncoder::Close()
 {
   if (mImageBufferStart) {
     moz_free(mImageBufferStart);
@@ -321,7 +328,8 @@
 }
 
 // Obtains the available bytes to read
-NS_IMETHODIMP nsBMPEncoder::Available(uint64_t *_retval)
+NS_IMETHODIMP
+nsBMPEncoder::Available(uint64_t* _retval)
 {
   if (!mImageBufferStart || !mImageBufferCurr) {
     return NS_BASE_STREAM_CLOSED;
@@ -332,16 +340,16 @@
 }
 
 // [noscript] Reads bytes which are available
-NS_IMETHODIMP nsBMPEncoder::Read(char * aBuf, uint32_t aCount,
-                                 uint32_t *_retval)
+NS_IMETHODIMP
+nsBMPEncoder::Read(char* aBuf, uint32_t aCount, uint32_t* _retval)
 {
   return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, _retval);
 }
 
 // [noscript] Reads segments
-NS_IMETHODIMP nsBMPEncoder::ReadSegments(nsWriteSegmentFun aWriter,
-                                         void *aClosure, uint32_t aCount,
-                                         uint32_t *_retval)
+NS_IMETHODIMP
+nsBMPEncoder::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
+                           uint32_t aCount, uint32_t* _retval)
 {
   uint32_t maxCount = GetCurrentImageBufferOffset() - mImageBufferReadPoint;
   if (maxCount == 0) {
@@ -353,7 +361,7 @@
     aCount = maxCount;
   }
   nsresult rv = aWriter(this, aClosure,
-                        reinterpret_cast<const char*>(mImageBufferStart + 
+                        reinterpret_cast<const char*>(mImageBufferStart +
                                                       mImageBufferReadPoint),
                         0, aCount, _retval);
   if (NS_SUCCEEDED(rv)) {
@@ -364,18 +372,18 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP 
-nsBMPEncoder::IsNonBlocking(bool *_retval)
+NS_IMETHODIMP
+nsBMPEncoder::IsNonBlocking(bool* _retval)
 {
   *_retval = true;
   return NS_OK;
 }
 
-NS_IMETHODIMP 
-nsBMPEncoder::AsyncWait(nsIInputStreamCallback *aCallback,
+NS_IMETHODIMP
+nsBMPEncoder::AsyncWait(nsIInputStreamCallback* aCallback,
                         uint32_t aFlags,
                         uint32_t aRequestedCount,
-                        nsIEventTarget *aTarget)
+                        nsIEventTarget* aTarget)
 {
   if (aFlags != 0) {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -395,7 +403,8 @@
   // We set the callback absolutely last, because NotifyListener uses it to
   // determine if someone needs to be notified.  If we don't set it last,
   // NotifyListener might try to fire off a notification to a null target
-  // which will generally cause non-threadsafe objects to be used off the main thread
+  // which will generally cause non-threadsafe objects to be used off the
+  // main thread
   mCallback = aCallback;
 
   // What we are being asked for may be present already
@@ -403,7 +412,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsBMPEncoder::CloseWithStatus(nsresult aStatus)
+NS_IMETHODIMP
+nsBMPEncoder::CloseWithStatus(nsresult aStatus)
 {
   return Close();
 }
@@ -422,7 +432,7 @@
   if (mBMPInfoHeader.bpp == 32) {
     for (uint32_t x = 0; x < aPixelWidth; x++) {
       const uint32_t& pixelIn = ((const uint32_t*)(aSrc))[x];
-      uint8_t *pixelOut = &aDest[x * bytes];
+      uint8_t* pixelOut = &aDest[x * bytes];
 
       pixelOut[0] = (pixelIn & 0x00ff0000) >> 16;
       pixelOut[1] = (pixelIn & 0x0000ff00) >>  8;
@@ -432,7 +442,7 @@
   } else {
     for (uint32_t x = 0; x < aPixelWidth; x++) {
       const uint32_t& pixelIn = ((const uint32_t*)(aSrc))[x];
-      uint8_t *pixelOut = &aDest[x * bytes];
+      uint8_t* pixelOut = &aDest[x * bytes];
 
       pixelOut[0] = (pixelIn & 0xff0000) >> 16;
       pixelOut[1] = (pixelIn & 0x00ff00) >>  8;
@@ -445,7 +455,7 @@
 nsBMPEncoder::NotifyListener()
 {
   if (mCallback &&
-      (GetCurrentImageBufferOffset() - mImageBufferReadPoint >= 
+      (GetCurrentImageBufferOffset() - mImageBufferReadPoint >=
        mNotifyThreshold || mFinished)) {
     nsCOMPtr<nsIInputStreamCallback> callback;
     if (mCallbackTarget) {
@@ -466,14 +476,14 @@
 }
 
 // Initializes the BMP file header mBMPFileHeader to the passed in values
-void 
+void
 nsBMPEncoder::InitFileHeader(Version aVersion, uint32_t aBPP, uint32_t aWidth,
                              uint32_t aHeight)
 {
   memset(&mBMPFileHeader, 0, sizeof(mBMPFileHeader));
   mBMPFileHeader.signature[0] = 'B';
   mBMPFileHeader.signature[1] = 'M';
-  
+
   if (aVersion == VERSION_3) {
     mBMPFileHeader.dataoffset = WIN_V3_HEADER_LENGTH;
   } else { // aVersion == 5
@@ -486,9 +496,8 @@
     mBMPFileHeader.dataoffset += 4 * numColors;
     mBMPFileHeader.filesize = mBMPFileHeader.dataoffset + aWidth * aHeight;
   } else {
-    mBMPFileHeader.filesize = mBMPFileHeader.dataoffset + (aWidth * 
-                              BytesPerPixel(aBPP) + PaddingBytes(aBPP, aWidth)) *
-                              aHeight;
+    mBMPFileHeader.filesize = mBMPFileHeader.dataoffset +
+      (aWidth * BytesPerPixel(aBPP) + PaddingBytes(aBPP, aWidth)) * aHeight;
   }
 
   mBMPFileHeader.reserved = 0;
@@ -505,7 +514,7 @@
     *pImageBufferCurr += sizeof value;
 
 // Initializes the bitmap info header mBMPInfoHeader to the passed in values
-void 
+void
 nsBMPEncoder::InitInfoHeader(Version aVersion, uint32_t aBPP, uint32_t aWidth,
                              uint32_t aHeight)
 {
@@ -520,8 +529,8 @@
   if (aBPP <= 8) {
     mBMPInfoHeader.image_size = aWidth * aHeight;
   } else {
-    mBMPInfoHeader.image_size = (aWidth * BytesPerPixel(aBPP) + 
-                                 PaddingBytes(aBPP, aWidth)) * aHeight;
+    mBMPInfoHeader.image_size =
+      (aWidth * BytesPerPixel(aBPP) + PaddingBytes(aBPP, aWidth)) * aHeight;
   }
   mBMPInfoHeader.xppm = 0;
   mBMPInfoHeader.yppm = 0;
@@ -551,9 +560,9 @@
 }
 
 // Encodes the BMP file header mBMPFileHeader
-void 
-nsBMPEncoder::EncodeFileHeader() 
-{  
+void
+nsBMPEncoder::EncodeFileHeader()
+{
   mozilla::image::BMPFILEHEADER littleEndianBFH = mBMPFileHeader;
   NativeEndian::swapToLittleEndianInPlace(&littleEndianBFH.filesize, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianBFH.reserved, 1);
@@ -568,7 +577,7 @@
 }
 
 // Encodes the BMP infor header mBMPInfoHeader
-void 
+void
 nsBMPEncoder::EncodeInfoHeader()
 {
   mozilla::image::BITMAPV5HEADER littleEndianmBIH = mBMPInfoHeader;
@@ -581,7 +590,8 @@
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.xppm, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.yppm, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.colors, 1);
-  NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.important_colors, 1);
+  NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.important_colors,
+                                          1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.red_mask, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.green_mask, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.blue_mask, 1);
@@ -602,7 +612,7 @@
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.intent, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.profile_offset, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmBIH.profile_size, 1);
-  
+
   if (mBMPFileHeader.bihsize == OS2_BIH_LENGTH) {
       uint16_t width = (uint16_t) littleEndianmBIH.width;
       ENCODE(&mImageBufferCurr, width);
@@ -651,8 +661,8 @@
 }
 
 // Sets a pixel in the image buffer that doesn't have alpha data
-static inline void 
-  SetPixel24(uint8_t*& imageBufferCurr, uint8_t aRed, uint8_t aGreen, 
+static inline void
+SetPixel24(uint8_t*& imageBufferCurr, uint8_t aRed, uint8_t aGreen,
   uint8_t aBlue)
 {
   *imageBufferCurr = aBlue;
@@ -661,8 +671,8 @@
 }
 
 // Sets a pixel in the image buffer with alpha data
-static inline void 
-SetPixel32(uint8_t*& imageBufferCurr, uint8_t aRed, uint8_t aGreen, 
+static inline void
+SetPixel32(uint8_t*& imageBufferCurr, uint8_t aRed, uint8_t aGreen,
            uint8_t aBlue, uint8_t aAlpha = 0xFF)
 {
   *imageBufferCurr = aBlue;
@@ -672,7 +682,7 @@
 }
 
 // Encodes a row of image data which does not have alpha data
-void 
+void
 nsBMPEncoder::EncodeImageDataRow24(const uint8_t* aData)
 {
   for (int32_t x = 0; x < mBMPInfoHeader.width; x++) {
@@ -680,25 +690,25 @@
     SetPixel24(mImageBufferCurr, aData[pos], aData[pos + 1], aData[pos + 2]);
     mImageBufferCurr += BytesPerPixel(mBMPInfoHeader.bpp);
   }
-  
-  for (uint32_t x = 0; x < PaddingBytes(mBMPInfoHeader.bpp, 
+
+  for (uint32_t x = 0; x < PaddingBytes(mBMPInfoHeader.bpp,
                                         mBMPInfoHeader.width); x++) {
     *mImageBufferCurr++ = 0;
   }
 }
 
 // Encodes a row of image data which does have alpha data
-void 
+void
 nsBMPEncoder::EncodeImageDataRow32(const uint8_t* aData)
 {
   for (int32_t x = 0; x < mBMPInfoHeader.width; x ++) {
     uint32_t pos = x * BytesPerPixel(mBMPInfoHeader.bpp);
-    SetPixel32(mImageBufferCurr, aData[pos], aData[pos + 1], 
+    SetPixel32(mImageBufferCurr, aData[pos], aData[pos + 1],
                aData[pos + 2], aData[pos + 3]);
     mImageBufferCurr += 4;
   }
 
-  for (uint32_t x = 0; x < PaddingBytes(mBMPInfoHeader.bpp, 
+  for (uint32_t x = 0; x < PaddingBytes(mBMPInfoHeader.bpp,
                                         mBMPInfoHeader.width); x ++) {
     *mImageBufferCurr++ = 0;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/bmp/nsBMPEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/bmp/nsBMPEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/bmp/nsBMPEncoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/bmp/nsBMPEncoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -35,7 +35,8 @@
 protected:
   ~nsBMPEncoder();
 
-  enum Version {
+  enum Version
+  {
       VERSION_3 = 3,
       VERSION_5 = 5
   };
@@ -70,7 +71,7 @@
     return static_cast<int32_t>(mImageBufferCurr - mImageBufferStart);
   }
 
-  // These headers will always contain endian independent stuff 
+  // These headers will always contain endian independent stuff
   // They store the BMP headers which will be encoded
   mozilla::image::BMPFILEHEADER mBMPFileHeader;
   mozilla::image::BITMAPV5HEADER mBMPInfoHeader;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/ico/nsICOEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/ico/nsICOEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/ico/nsICOEncoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/ico/nsICOEncoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -15,12 +15,13 @@
 using namespace mozilla;
 using namespace mozilla::image;
 
-NS_IMPL_ISUPPORTS(nsICOEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream)
+NS_IMPL_ISUPPORTS(nsICOEncoder, imgIEncoder, nsIInputStream,
+                  nsIAsyncInputStream)
 
 nsICOEncoder::nsICOEncoder() : mImageBufferStart(nullptr),
                                mImageBufferCurr(0),
-                               mImageBufferSize(0), 
-                               mImageBufferReadPoint(0), 
+                               mImageBufferSize(0),
+                               mImageBufferReadPoint(0),
                                mFinished(false),
                                mUsePNG(true),
                                mNotifyThreshold(0)
@@ -40,13 +41,14 @@
 // Two output options are supported: format=<png|bmp>;bpp=<bpp_value>
 // format specifies whether to use png or bitmap format
 // bpp specifies the bits per pixel to use where bpp_value can be 24 or 32
-NS_IMETHODIMP nsICOEncoder::InitFromData(const uint8_t* aData,
-                                         uint32_t aLength,
-                                         uint32_t aWidth,
-                                         uint32_t aHeight,
-                                         uint32_t aStride,
-                                         uint32_t aInputFormat,
-                                         const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsICOEncoder::InitFromData(const uint8_t* aData,
+                           uint32_t aLength,
+                           uint32_t aWidth,
+                           uint32_t aHeight,
+                           uint32_t aStride,
+                           uint32_t aInputFormat,
+                           const nsAString& aOutputOptions)
 {
   // validate input format
   if (aInputFormat != INPUT_FORMAT_RGB &&
@@ -58,8 +60,9 @@
   // Stride is the padded width of each row, so it better be longer
   if ((aInputFormat == INPUT_FORMAT_RGB &&
        aStride < aWidth * 3) ||
-      ((aInputFormat == INPUT_FORMAT_RGBA || aInputFormat == INPUT_FORMAT_HOSTARGB) &&
-       aStride < aWidth * 4)) {
+       ((aInputFormat == INPUT_FORMAT_RGBA ||
+         aInputFormat == INPUT_FORMAT_HOSTARGB) &&
+        aStride < aWidth * 4)) {
     NS_WARNING("Invalid stride for InitFromData");
     return NS_ERROR_INVALID_ARG;
   }
@@ -78,8 +81,8 @@
 
 // Returns the number of bytes in the image buffer used
 // For an ICO file, this is all bytes in the buffer.
-NS_IMETHODIMP 
-nsICOEncoder::GetImageBufferUsed(uint32_t *aOutputSize)
+NS_IMETHODIMP
+nsICOEncoder::GetImageBufferUsed(uint32_t* aOutputSize)
 {
   NS_ENSURE_ARG_POINTER(aOutputSize);
   *aOutputSize = mImageBufferSize;
@@ -87,21 +90,21 @@
 }
 
 // Returns a pointer to the start of the image buffer
-NS_IMETHODIMP 
-nsICOEncoder::GetImageBuffer(char **aOutputBuffer)
+NS_IMETHODIMP
+nsICOEncoder::GetImageBuffer(char** aOutputBuffer)
 {
   NS_ENSURE_ARG_POINTER(aOutputBuffer);
   *aOutputBuffer = reinterpret_cast<char*>(mImageBufferStart);
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsICOEncoder::AddImageFrame(const uint8_t* aData,
                             uint32_t aLength,
                             uint32_t aWidth,
                             uint32_t aHeight,
                             uint32_t aStride,
-                            uint32_t aInputFormat, 
+                            uint32_t aInputFormat,
                             const nsAString& aFrameOptions)
 {
   if (mUsePNG) {
@@ -115,7 +118,7 @@
 
     uint32_t PNGImageBufferSize;
     mContainedEncoder->GetImageBufferUsed(&PNGImageBufferSize);
-    mImageBufferSize = ICONFILEHEADERSIZE + ICODIRENTRYSIZE + 
+    mImageBufferSize = ICONFILEHEADERSIZE + ICODIRENTRYSIZE +
                        PNGImageBufferSize;
     mImageBufferStart = static_cast<uint8_t*>(moz_malloc(mImageBufferSize));
     if (!mImageBufferStart) {
@@ -127,7 +130,7 @@
     EncodeFileHeader();
     EncodeInfoHeader();
 
-    char *imageBuffer;
+    char* imageBuffer;
     rv = mContainedEncoder->GetImageBuffer(&imageBuffer);
     NS_ENSURE_SUCCESS(rv, rv);
     memcpy(mImageBufferCurr, imageBuffer, PNGImageBufferSize);
@@ -149,7 +152,7 @@
 
     uint32_t BMPImageBufferSize;
     mContainedEncoder->GetImageBufferUsed(&BMPImageBufferSize);
-    mImageBufferSize = ICONFILEHEADERSIZE + ICODIRENTRYSIZE + 
+    mImageBufferSize = ICONFILEHEADERSIZE + ICODIRENTRYSIZE +
                        BMPImageBufferSize + andMaskSize;
     mImageBufferStart = static_cast<uint8_t*>(moz_malloc(mImageBufferSize));
     if (!mImageBufferStart) {
@@ -166,10 +169,10 @@
     EncodeFileHeader();
     EncodeInfoHeader();
 
-    char *imageBuffer;
+    char* imageBuffer;
     rv = mContainedEncoder->GetImageBuffer(&imageBuffer);
     NS_ENSURE_SUCCESS(rv, rv);
-    memcpy(mImageBufferCurr, imageBuffer + BFH_LENGTH, 
+    memcpy(mImageBufferCurr, imageBuffer + BFH_LENGTH,
            BMPImageBufferSize - BFH_LENGTH);
     // We need to fix the BMP height to be *2 for the AND mask
     uint32_t fixedHeight = GetRealHeight() * 2;
@@ -181,7 +184,7 @@
     // Calculate rowsize in DWORD's
     uint32_t rowSize = ((GetRealWidth() + 31) / 32) * 4; // + 31 to round up
     int32_t currentLine = GetRealHeight();
-    
+
     // Write out the AND mask
     while (currentLine > 0) {
       currentLine--;
@@ -200,10 +203,11 @@
 }
 
 // See ::InitFromData for other info.
-NS_IMETHODIMP nsICOEncoder::StartImageEncode(uint32_t aWidth,
-                                             uint32_t aHeight,
-                                             uint32_t aInputFormat,
-                                             const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsICOEncoder::StartImageEncode(uint32_t aWidth,
+                               uint32_t aHeight,
+                               uint32_t aInputFormat,
+                               const nsAString& aOutputOptions)
 {
   // can't initialize more than once
   if (mImageBufferStart || mImageBufferCurr) {
@@ -232,13 +236,14 @@
 
   InitFileHeader();
   // The width and height are stored as 0 when we have a value of 256
-  InitInfoHeader(bpp, aWidth == 256 ? 0 : (uint8_t)aWidth, 
+  InitInfoHeader(bpp, aWidth == 256 ? 0 : (uint8_t)aWidth,
                  aHeight == 256 ? 0 : (uint8_t)aHeight);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP nsICOEncoder::EndImageEncode()
+NS_IMETHODIMP
+nsICOEncoder::EndImageEncode()
 {
   // must be initialized
   if (!mImageBufferStart || !mImageBufferCurr) {
@@ -259,8 +264,8 @@
 // Parses the encoder options and sets the bits per pixel to use and PNG or BMP
 // See InitFromData for a description of the parse options
 nsresult
-nsICOEncoder::ParseOptions(const nsAString& aOptions, uint32_t* bpp, 
-                           bool *usePNG)
+nsICOEncoder::ParseOptions(const nsAString& aOptions, uint32_t* bpp,
+                           bool* usePNG)
 {
   // If no parsing options just use the default of 24BPP and PNG yes
   if (aOptions.Length() == 0) {
@@ -293,11 +298,14 @@
     }
 
     // Parse the format portion of the string format=<png|bmp>;bpp=<bpp_value>
-    if (nameValuePair[0].Equals("format", nsCaseInsensitiveCStringComparator())) {
-      if (nameValuePair[1].Equals("png", nsCaseInsensitiveCStringComparator())) {
+    if (nameValuePair[0].Equals("format",
+                                nsCaseInsensitiveCStringComparator())) {
+      if (nameValuePair[1].Equals("png",
+                                  nsCaseInsensitiveCStringComparator())) {
         *usePNG = true;
       }
-      else if (nameValuePair[1].Equals("bmp", nsCaseInsensitiveCStringComparator())) {
+      else if (nameValuePair[1].Equals("bmp",
+                                       nsCaseInsensitiveCStringComparator())) {
         *usePNG = false;
       }
       else {
@@ -322,7 +330,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsICOEncoder::Close()
+NS_IMETHODIMP
+nsICOEncoder::Close()
 {
   if (mImageBufferStart) {
     moz_free(mImageBufferStart);
@@ -336,7 +345,8 @@
 }
 
 // Obtains the available bytes to read
-NS_IMETHODIMP nsICOEncoder::Available(uint64_t *_retval)
+NS_IMETHODIMP
+nsICOEncoder::Available(uint64_t *_retval)
 {
   if (!mImageBufferStart || !mImageBufferCurr) {
     return NS_BASE_STREAM_CLOSED;
@@ -347,16 +357,16 @@
 }
 
 // [noscript] Reads bytes which are available
-NS_IMETHODIMP nsICOEncoder::Read(char *aBuf, uint32_t aCount,
-                                 uint32_t *_retval)
+NS_IMETHODIMP
+nsICOEncoder::Read(char* aBuf, uint32_t aCount, uint32_t* _retval)
 {
   return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, _retval);
 }
 
 // [noscript] Reads segments
-NS_IMETHODIMP nsICOEncoder::ReadSegments(nsWriteSegmentFun aWriter,
-                                         void *aClosure, uint32_t aCount,
-                                         uint32_t *_retval)
+NS_IMETHODIMP
+nsICOEncoder::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
+                           uint32_t aCount, uint32_t* _retval)
 {
   uint32_t maxCount = GetCurrentImageBufferOffset() - mImageBufferReadPoint;
   if (maxCount == 0) {
@@ -369,7 +379,7 @@
   }
 
   nsresult rv = aWriter(this, aClosure,
-                        reinterpret_cast<const char*>(mImageBufferStart + 
+                        reinterpret_cast<const char*>(mImageBufferStart +
                                                       mImageBufferReadPoint),
                         0, aCount, _retval);
   if (NS_SUCCEEDED(rv)) {
@@ -380,18 +390,18 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP 
-nsICOEncoder::IsNonBlocking(bool *_retval)
+NS_IMETHODIMP
+nsICOEncoder::IsNonBlocking(bool* _retval)
 {
   *_retval = true;
   return NS_OK;
 }
 
-NS_IMETHODIMP 
-nsICOEncoder::AsyncWait(nsIInputStreamCallback *aCallback,
+NS_IMETHODIMP
+nsICOEncoder::AsyncWait(nsIInputStreamCallback* aCallback,
                         uint32_t aFlags,
                         uint32_t aRequestedCount,
-                        nsIEventTarget *aTarget)
+                        nsIEventTarget* aTarget)
 {
   if (aFlags != 0) {
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -411,7 +421,8 @@
   // We set the callback absolutely last, because NotifyListener uses it to
   // determine if someone needs to be notified.  If we don't set it last,
   // NotifyListener might try to fire off a notification to a null target
-  // which will generally cause non-threadsafe objects to be used off the main thread
+  // which will generally cause non-threadsafe objects to be used off the
+  // main thread
   mCallback = aCallback;
 
   // What we are being asked for may be present already
@@ -419,7 +430,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsICOEncoder::CloseWithStatus(nsresult aStatus)
+NS_IMETHODIMP
+nsICOEncoder::CloseWithStatus(nsresult aStatus)
 {
   return Close();
 }
@@ -428,8 +440,8 @@
 nsICOEncoder::NotifyListener()
 {
   if (mCallback &&
-      (GetCurrentImageBufferOffset() - mImageBufferReadPoint >= mNotifyThreshold ||
-       mFinished)) {
+      (GetCurrentImageBufferOffset() -
+         mImageBufferReadPoint >= mNotifyThreshold || mFinished)) {
     nsCOMPtr<nsIInputStreamCallback> callback;
     if (mCallbackTarget) {
       callback = NS_NewInputStreamReadyEvent(mCallback, mCallbackTarget);
@@ -449,7 +461,7 @@
 }
 
 // Initializes the icon file header mICOFileHeader
-void 
+void
 nsICOEncoder::InitFileHeader()
 {
   memset(&mICOFileHeader, 0, sizeof(mICOFileHeader));
@@ -459,7 +471,7 @@
 }
 
 // Initializes the icon directory info header mICODirEntry
-void 
+void
 nsICOEncoder::InitInfoHeader(uint32_t aBPP, uint8_t aWidth, uint8_t aHeight)
 {
   memset(&mICODirEntry, 0, sizeof(mICODirEntry));
@@ -474,27 +486,27 @@
 }
 
 // Encodes the icon file header mICOFileHeader
-void 
-nsICOEncoder::EncodeFileHeader() 
-{  
+void
+nsICOEncoder::EncodeFileHeader()
+{
   IconFileHeader littleEndianIFH = mICOFileHeader;
   NativeEndian::swapToLittleEndianInPlace(&littleEndianIFH.mReserved, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianIFH.mType, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianIFH.mCount, 1);
 
-  memcpy(mImageBufferCurr, &littleEndianIFH.mReserved, 
+  memcpy(mImageBufferCurr, &littleEndianIFH.mReserved,
          sizeof(littleEndianIFH.mReserved));
   mImageBufferCurr += sizeof(littleEndianIFH.mReserved);
-  memcpy(mImageBufferCurr, &littleEndianIFH.mType, 
+  memcpy(mImageBufferCurr, &littleEndianIFH.mType,
          sizeof(littleEndianIFH.mType));
   mImageBufferCurr += sizeof(littleEndianIFH.mType);
-  memcpy(mImageBufferCurr, &littleEndianIFH.mCount, 
+  memcpy(mImageBufferCurr, &littleEndianIFH.mCount,
          sizeof(littleEndianIFH.mCount));
   mImageBufferCurr += sizeof(littleEndianIFH.mCount);
 }
 
 // Encodes the icon directory info header mICODirEntry
-void 
+void
 nsICOEncoder::EncodeInfoHeader()
 {
   IconDirEntry littleEndianmIDE = mICODirEntry;
@@ -504,28 +516,28 @@
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmIDE.mBytesInRes, 1);
   NativeEndian::swapToLittleEndianInPlace(&littleEndianmIDE.mImageOffset, 1);
 
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mWidth, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mWidth,
          sizeof(littleEndianmIDE.mWidth));
   mImageBufferCurr += sizeof(littleEndianmIDE.mWidth);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mHeight, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mHeight,
          sizeof(littleEndianmIDE.mHeight));
   mImageBufferCurr += sizeof(littleEndianmIDE.mHeight);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mColorCount, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mColorCount,
          sizeof(littleEndianmIDE.mColorCount));
   mImageBufferCurr += sizeof(littleEndianmIDE.mColorCount);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mReserved, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mReserved,
          sizeof(littleEndianmIDE.mReserved));
   mImageBufferCurr += sizeof(littleEndianmIDE.mReserved);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mPlanes, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mPlanes,
          sizeof(littleEndianmIDE.mPlanes));
   mImageBufferCurr += sizeof(littleEndianmIDE.mPlanes);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mBitCount, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mBitCount,
          sizeof(littleEndianmIDE.mBitCount));
   mImageBufferCurr += sizeof(littleEndianmIDE.mBitCount);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mBytesInRes, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mBytesInRes,
          sizeof(littleEndianmIDE.mBytesInRes));
   mImageBufferCurr += sizeof(littleEndianmIDE.mBytesInRes);
-  memcpy(mImageBufferCurr, &littleEndianmIDE.mImageOffset, 
+  memcpy(mImageBufferCurr, &littleEndianmIDE.mImageOffset,
          sizeof(littleEndianmIDE.mImageOffset));
   mImageBufferCurr += sizeof(littleEndianmIDE.mImageOffset);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/ico/nsICOEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/ico/nsICOEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/ico/nsICOEncoder.h	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/ico/nsICOEncoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -35,24 +35,24 @@
   NS_DECL_NSIASYNCINPUTSTREAM
 
   nsICOEncoder();
-  
+
   // Obtains the width of the icon directory entry
   uint32_t GetRealWidth() const
   {
-    return mICODirEntry.mWidth == 0 ? 256 : mICODirEntry.mWidth; 
+    return mICODirEntry.mWidth == 0 ? 256 : mICODirEntry.mWidth;
   }
 
   // Obtains the height of the icon directory entry
   uint32_t GetRealHeight() const
   {
-    return mICODirEntry.mHeight == 0 ? 256 : mICODirEntry.mHeight; 
+    return mICODirEntry.mHeight == 0 ? 256 : mICODirEntry.mHeight;
   }
 
 protected:
   ~nsICOEncoder();
 
-  nsresult ParseOptions(const nsAString& aOptions, uint32_t* bpp, 
-                        bool *usePNG);
+  nsresult ParseOptions(const nsAString& aOptions, uint32_t* bpp,
+                        bool* usePNG);
   void NotifyListener();
 
   // Initializes the icon file header mICOFileHeader
@@ -87,7 +87,7 @@
   uint32_t mImageBufferSize;
   // Keeps track of the number of bytes in the image buffer which are read
   uint32_t mImageBufferReadPoint;
-  // Stores true if the image is done being encoded  
+  // Stores true if the image is done being encoded
   bool mFinished;
   // Stores true if the contained image is a PNG
   bool mUsePNG;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/jpeg/nsJPEGEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/jpeg/nsJPEGEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/jpeg/nsJPEGEncoder.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/jpeg/nsJPEGEncoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -14,7 +14,8 @@
 
 using namespace mozilla;
 
-NS_IMPL_ISUPPORTS(nsJPEGEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream)
+NS_IMPL_ISUPPORTS(nsJPEGEncoder, imgIEncoder, nsIInputStream,
+                  nsIAsyncInputStream)
 
 // used to pass error info through the JPEG library
 struct encoder_error_mgr {
@@ -22,12 +23,16 @@
   jmp_buf setjmp_buffer;
 };
 
-nsJPEGEncoder::nsJPEGEncoder() : mFinished(false),
-                                 mImageBuffer(nullptr), mImageBufferSize(0),
-                                 mImageBufferUsed(0), mImageBufferReadPoint(0),
-                                 mCallback(nullptr),
-                                 mCallbackTarget(nullptr), mNotifyThreshold(0),
-                                 mReentrantMonitor("nsJPEGEncoder.mReentrantMonitor")
+nsJPEGEncoder::nsJPEGEncoder()
+   : mFinished(false),
+     mImageBuffer(nullptr),
+     mImageBufferSize(0),
+     mImageBufferUsed(0),
+     mImageBufferReadPoint(0),
+     mCallback(nullptr),
+     mCallbackTarget(nullptr),
+     mNotifyThreshold(0),
+     mReentrantMonitor("nsJPEGEncoder.mReentrantMonitor")
 {
 }
 
@@ -47,13 +52,14 @@
 //
 //    Transparency is always discarded.
 
-NS_IMETHODIMP nsJPEGEncoder::InitFromData(const uint8_t* aData,
-                                          uint32_t aLength, // (unused, req'd by JS)
-                                          uint32_t aWidth,
-                                          uint32_t aHeight,
-                                          uint32_t aStride,
-                                          uint32_t aInputFormat,
-                                          const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsJPEGEncoder::InitFromData(const uint8_t* aData,
+                            uint32_t aLength, // (unused, req'd by JS)
+                            uint32_t aWidth,
+                            uint32_t aHeight,
+                            uint32_t aStride,
+                            uint32_t aInputFormat,
+                            const nsAString& aOutputOptions)
 {
   NS_ENSURE_ARG(aData);
 
@@ -67,15 +73,17 @@
   // people will not understand what stride means, so check it well)
   if ((aInputFormat == INPUT_FORMAT_RGB &&
        aStride < aWidth * 3) ||
-      ((aInputFormat == INPUT_FORMAT_RGBA || aInputFormat == INPUT_FORMAT_HOSTARGB) &&
+      ((aInputFormat == INPUT_FORMAT_RGBA ||
+        aInputFormat == INPUT_FORMAT_HOSTARGB) &&
        aStride < aWidth * 4)) {
     NS_WARNING("Invalid stride for InitFromData");
     return NS_ERROR_INVALID_ARG;
   }
 
   // can't initialize more than once
-  if (mImageBuffer != nullptr)
+  if (mImageBuffer != nullptr) {
     return NS_ERROR_ALREADY_INITIALIZED;
+  }
 
   // options: we only have one option so this is easy
   int quality = 92;
@@ -85,17 +93,20 @@
     if (aOutputOptions.Length() > qualityPrefix.Length()  &&
         StringBeginsWith(aOutputOptions, qualityPrefix)) {
       // have quality string
-      nsCString value = NS_ConvertUTF16toUTF8(Substring(aOutputOptions,
-                                                        qualityPrefix.Length()));
+      nsCString value =
+        NS_ConvertUTF16toUTF8(Substring(aOutputOptions,
+                                        qualityPrefix.Length()));
       int newquality = -1;
       if (PR_sscanf(value.get(), "%d", &newquality) == 1) {
         if (newquality >= 0 && newquality <= 100) {
           quality = newquality;
         } else {
-          NS_WARNING("Quality value out of range, should be 0-100, using default");
+          NS_WARNING("Quality value out of range, should be 0-100,"
+                     " using default");
         }
       } else {
-        NS_WARNING("Quality value invalid, should be integer 0-100, using default");
+        NS_WARNING("Quality value invalid, should be integer 0-100,"
+                   " using default");
       }
     }
     else {
@@ -173,23 +184,26 @@
   NotifyListener();
 
   // if output callback can't get enough memory, it will free our buffer
-  if (!mImageBuffer)
+  if (!mImageBuffer) {
     return NS_ERROR_OUT_OF_MEMORY;
+  }
 
   return NS_OK;
 }
 
 
-NS_IMETHODIMP nsJPEGEncoder::StartImageEncode(uint32_t aWidth,
-                                              uint32_t aHeight,
-                                              uint32_t aInputFormat,
-                                              const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsJPEGEncoder::StartImageEncode(uint32_t aWidth,
+                                uint32_t aHeight,
+                                uint32_t aInputFormat,
+                                const nsAString& aOutputOptions)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 // Returns the number of bytes in the image buffer used.
-NS_IMETHODIMP nsJPEGEncoder::GetImageBufferUsed(uint32_t *aOutputSize)
+NS_IMETHODIMP
+nsJPEGEncoder::GetImageBufferUsed(uint32_t* aOutputSize)
 {
   NS_ENSURE_ARG_POINTER(aOutputSize);
   *aOutputSize = mImageBufferUsed;
@@ -197,32 +211,36 @@
 }
 
 // Returns a pointer to the start of the image buffer
-NS_IMETHODIMP nsJPEGEncoder::GetImageBuffer(char **aOutputBuffer)
+NS_IMETHODIMP
+nsJPEGEncoder::GetImageBuffer(char** aOutputBuffer)
 {
   NS_ENSURE_ARG_POINTER(aOutputBuffer);
   *aOutputBuffer = reinterpret_cast<char*>(mImageBuffer);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsJPEGEncoder::AddImageFrame(const uint8_t* aData,
-                                           uint32_t aLength,
-                                           uint32_t aWidth,
-                                           uint32_t aHeight,
-                                           uint32_t aStride,
-                                           uint32_t aFrameFormat,
-                                           const nsAString& aFrameOptions)
+NS_IMETHODIMP
+nsJPEGEncoder::AddImageFrame(const uint8_t* aData,
+                             uint32_t aLength,
+                             uint32_t aWidth,
+                             uint32_t aHeight,
+                             uint32_t aStride,
+                             uint32_t aFrameFormat,
+                             const nsAString& aFrameOptions)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsJPEGEncoder::EndImageEncode()
+NS_IMETHODIMP
+nsJPEGEncoder::EndImageEncode()
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 
 /* void close (); */
-NS_IMETHODIMP nsJPEGEncoder::Close()
+NS_IMETHODIMP
+nsJPEGEncoder::Close()
 {
   if (mImageBuffer != nullptr) {
     moz_free(mImageBuffer);
@@ -235,24 +253,29 @@
 }
 
 /* unsigned long available (); */
-NS_IMETHODIMP nsJPEGEncoder::Available(uint64_t *_retval)
+NS_IMETHODIMP
+nsJPEGEncoder::Available(uint64_t* _retval)
 {
-  if (!mImageBuffer)
+  if (!mImageBuffer) {
     return NS_BASE_STREAM_CLOSED;
+  }
 
   *_retval = mImageBufferUsed - mImageBufferReadPoint;
   return NS_OK;
 }
 
 /* [noscript] unsigned long read (in charPtr aBuf, in unsigned long aCount); */
-NS_IMETHODIMP nsJPEGEncoder::Read(char * aBuf, uint32_t aCount,
-                                  uint32_t *_retval)
+NS_IMETHODIMP
+nsJPEGEncoder::Read(char* aBuf, uint32_t aCount, uint32_t* _retval)
 {
   return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, _retval);
 }
 
-/* [noscript] unsigned long readSegments (in nsWriteSegmentFun aWriter, in voidPtr aClosure, in unsigned long aCount); */
-NS_IMETHODIMP nsJPEGEncoder::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, uint32_t aCount, uint32_t *_retval)
+/* [noscript] unsigned long readSegments (in nsWriteSegmentFun aWriter, in
+   voidPtr aClosure, in unsigned long aCount); */
+NS_IMETHODIMP
+nsJPEGEncoder::ReadSegments(nsWriteSegmentFun aWriter,
+                            void* aClosure, uint32_t aCount, uint32_t* _retval)
 {
   // Avoid another thread reallocing the buffer underneath us
   ReentrantMonitorAutoEnter autoEnter(mReentrantMonitor);
@@ -263,10 +286,12 @@
     return mFinished ? NS_OK : NS_BASE_STREAM_WOULD_BLOCK;
   }
 
-  if (aCount > maxCount)
+  if (aCount > maxCount) {
     aCount = maxCount;
+  }
   nsresult rv = aWriter(this, aClosure,
-                        reinterpret_cast<const char*>(mImageBuffer+mImageBufferReadPoint),
+                        reinterpret_cast<const char*>
+                          (mImageBuffer+mImageBufferReadPoint),
                         0, aCount, _retval);
   if (NS_SUCCEEDED(rv)) {
     NS_ASSERTION(*_retval <= aCount, "bad write count");
@@ -278,33 +303,39 @@
 }
 
 /* boolean isNonBlocking (); */
-NS_IMETHODIMP nsJPEGEncoder::IsNonBlocking(bool *_retval)
+NS_IMETHODIMP
+nsJPEGEncoder::IsNonBlocking(bool* _retval)
 {
   *_retval = true;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsJPEGEncoder::AsyncWait(nsIInputStreamCallback *aCallback,
-                                       uint32_t aFlags,
-                                       uint32_t aRequestedCount,
-                                       nsIEventTarget *aTarget)
+NS_IMETHODIMP
+nsJPEGEncoder::AsyncWait(nsIInputStreamCallback* aCallback,
+                         uint32_t aFlags, uint32_t aRequestedCount,
+                         nsIEventTarget* aTarget)
 {
-  if (aFlags != 0)
+  if (aFlags != 0) {
     return NS_ERROR_NOT_IMPLEMENTED;
+  }
 
-  if (mCallback || mCallbackTarget)
+  if (mCallback || mCallbackTarget) {
     return NS_ERROR_UNEXPECTED;
+  }
 
   mCallbackTarget = aTarget;
   // 0 means "any number of bytes except 0"
   mNotifyThreshold = aRequestedCount;
-  if (!aRequestedCount)
-    mNotifyThreshold = 1024; // 1 KB seems good.  We don't want to notify incessantly
+  if (!aRequestedCount) {
+    mNotifyThreshold = 1024; // 1 KB seems good.  We don't want to
+                             // notify incessantly
+  }
 
   // We set the callback absolutely last, because NotifyListener uses it to
   // determine if someone needs to be notified.  If we don't set it last,
   // NotifyListener might try to fire off a notification to a null target
-  // which will generally cause non-threadsafe objects to be used off the main thread
+  // which will generally cause non-threadsafe objects to be used off the
+  // main thread
   mCallback = aCallback;
 
   // What we are being asked for may be present already
@@ -312,7 +343,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsJPEGEncoder::CloseWithStatus(nsresult aStatus)
+NS_IMETHODIMP
+nsJPEGEncoder::CloseWithStatus(nsresult aStatus)
 {
   return Close();
 }
@@ -331,7 +363,7 @@
 {
   for (uint32_t x = 0; x < aPixelWidth; x++) {
     const uint32_t& pixelIn = ((const uint32_t*)(aSrc))[x];
-    uint8_t *pixelOut = &aDest[x * 3];
+    uint8_t* pixelOut = &aDest[x * 3];
 
     pixelOut[0] = (pixelIn & 0xff0000) >> 16;
     pixelOut[1] = (pixelIn & 0x00ff00) >>  8;
@@ -369,7 +401,7 @@
 nsJPEGEncoder::initDestination(jpeg_compress_struct* cinfo)
 {
   nsJPEGEncoder* that = static_cast<nsJPEGEncoder*>(cinfo->client_data);
-  NS_ASSERTION(! that->mImageBuffer, "Image buffer already initialized");
+  NS_ASSERTION(!that->mImageBuffer, "Image buffer already initialized");
 
   that->mImageBufferSize = 8192;
   that->mImageBuffer = (uint8_t*)moz_malloc(that->mImageBufferSize);
@@ -408,7 +440,7 @@
 
   uint8_t* newBuf = (uint8_t*)moz_realloc(that->mImageBuffer,
                                           that->mImageBufferSize);
-  if (! newBuf) {
+  if (!newBuf) {
     // can't resize, just zero (this will keep us from writing more)
     moz_free(that->mImageBuffer);
     that->mImageBuffer = nullptr;
@@ -440,8 +472,9 @@
 nsJPEGEncoder::termDestination(jpeg_compress_struct* cinfo)
 {
   nsJPEGEncoder* that = static_cast<nsJPEGEncoder*>(cinfo->client_data);
-  if (! that->mImageBuffer)
+  if (!that->mImageBuffer) {
     return;
+  }
   that->mImageBufferUsed = cinfo->dest->next_output_byte - that->mImageBuffer;
   NS_ASSERTION(that->mImageBufferUsed < that->mImageBufferSize,
                "JPEG library busted, got a bad image buffer size");
@@ -458,7 +491,7 @@
 nsJPEGEncoder::errorExit(jpeg_common_struct* cinfo)
 {
   nsresult error_code;
-  encoder_error_mgr *err = (encoder_error_mgr *) cinfo->err;
+  encoder_error_mgr* err = (encoder_error_mgr*) cinfo->err;
 
   // Convert error to a browser error code
   switch (cinfo->err->msg_code) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/jpeg/nsJPEGEncoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/jpeg/nsJPEGEncoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/jpeg/nsJPEGEncoder.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/jpeg/nsJPEGEncoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -18,7 +18,8 @@
 }
 
 #define NS_JPEGENCODER_CID \
-{ /* ac2bb8fe-eeeb-4572-b40f-be03932b56e0 */         \
+{                                                    \
+  /* ac2bb8fe-eeeb-4572-b40f-be03932b56e0 */         \
      0xac2bb8fe,                                     \
      0xeeeb,                                         \
      0x4572,                                         \
@@ -46,7 +47,8 @@
 
   void ConvertHostARGBRow(const uint8_t* aSrc, uint8_t* aDest,
                           uint32_t aPixelWidth);
-  void ConvertRGBARow(const uint8_t* aSrc, uint8_t* aDest, uint32_t aPixelWidth);
+  void ConvertRGBARow(const uint8_t* aSrc, uint8_t* aDest,
+                      uint32_t aPixelWidth);
 
   static void initDestination(jpeg_compress_struct* cinfo);
   static boolean emptyOutputBuffer(jpeg_compress_struct* cinfo);
@@ -69,11 +71,9 @@
   nsCOMPtr<nsIEventTarget> mCallbackTarget;
   uint32_t mNotifyThreshold;
 
-  /*
-    nsJPEGEncoder is designed to allow one thread to pump data into it while another
-    reads from it.  We lock to ensure that the buffer remains append-only while
-    we read from it (that it is not realloced) and to ensure that only one thread
-    dispatches a callback for each call to AsyncWait.
-   */
+  // nsJPEGEncoder is designed to allow one thread to pump data into it while
+  // another reads from it.  We lock to ensure that the buffer remains
+  // append-only while we read from it (that it is not realloced) and to ensure
+  // that only one thread dispatches a callback for each call to AsyncWait.
   ReentrantMonitor mReentrantMonitor;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/png/nsPNGEncoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/png/nsPNGEncoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/encoders/png/nsPNGEncoder.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/encoders/png/nsPNGEncoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -13,12 +13,13 @@
 using namespace mozilla;
 
 #ifdef PR_LOGGING
-static PRLogModuleInfo *
+static PRLogModuleInfo*
 GetPNGEncoderLog()
 {
-  static PRLogModuleInfo *sPNGEncoderLog;
-  if (!sPNGEncoderLog)
+  static PRLogModuleInfo* sPNGEncoderLog;
+  if (!sPNGEncoderLog) {
     sPNGEncoderLog = PR_NewLogModule("PNGEncoder");
+  }
   return sPNGEncoderLog;
 }
 #endif
@@ -45,8 +46,9 @@
     mImageBuffer = nullptr;
   }
   // don't leak if EndImageEncode wasn't called
-  if (mPNG)
+  if (mPNG) {
     png_destroy_write_struct(&mPNG, &mPNGinfo);
+  }
 }
 
 // nsPNGEncoder::InitFromData
@@ -55,28 +57,30 @@
 //    output PNG will not have an alpha channel, even if the input does.
 //
 //    Based partially on gfx/cairo/cairo/src/cairo-png.c
-//    See also modules/libimg/png/libpng.txt
+//    See also media/libpng/libpng-manual.txt
 
-NS_IMETHODIMP nsPNGEncoder::InitFromData(const uint8_t* aData,
-                                         uint32_t aLength, // (unused,
-                                                           // req'd by JS)
-                                         uint32_t aWidth,
-                                         uint32_t aHeight,
-                                         uint32_t aStride,
-                                         uint32_t aInputFormat,
-                                         const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsPNGEncoder::InitFromData(const uint8_t* aData,
+                           uint32_t aLength, // (unused, req'd by JS)
+                           uint32_t aWidth,
+                           uint32_t aHeight,
+                           uint32_t aStride,
+                           uint32_t aInputFormat,
+                           const nsAString& aOutputOptions)
 {
   NS_ENSURE_ARG(aData);
   nsresult rv;
 
   rv = StartImageEncode(aWidth, aHeight, aInputFormat, aOutputOptions);
-  if (!NS_SUCCEEDED(rv))
+  if (!NS_SUCCEEDED(rv)) {
     return rv;
+  }
 
   rv = AddImageFrame(aData, aLength, aWidth, aHeight, aStride,
                      aInputFormat, aOutputOptions);
-  if (!NS_SUCCEEDED(rv))
+  if (!NS_SUCCEEDED(rv)) {
     return rv;
+  }
 
   rv = EndImageEncode();
 
@@ -88,18 +92,20 @@
 //
 //
 // See ::InitFromData for other info.
-NS_IMETHODIMP nsPNGEncoder::StartImageEncode(uint32_t aWidth,
-                                             uint32_t aHeight,
-                                             uint32_t aInputFormat,
-                                             const nsAString& aOutputOptions)
+NS_IMETHODIMP
+nsPNGEncoder::StartImageEncode(uint32_t aWidth,
+                               uint32_t aHeight,
+                               uint32_t aInputFormat,
+                               const nsAString& aOutputOptions)
 {
   bool useTransparency = true, skipFirstFrame = false;
   uint32_t numFrames = 1;
   uint32_t numPlays = 0; // For animations, 0 == forever
 
   // can't initialize more than once
-  if (mImageBuffer != nullptr)
+  if (mImageBuffer != nullptr) {
     return NS_ERROR_ALREADY_INITIALIZED;
+  }
 
   // validate input format
   if (aInputFormat != INPUT_FORMAT_RGB &&
@@ -111,12 +117,14 @@
   nsresult rv = ParseOptions(aOutputOptions, &useTransparency, &skipFirstFrame,
                              &numFrames, &numPlays, nullptr, nullptr,
                              nullptr, nullptr, nullptr);
-  if (rv != NS_OK)
+  if (rv != NS_OK) {
     return rv;
+  }
 
 #ifdef PNG_APNG_SUPPORTED
-  if (numFrames > 1)
+  if (numFrames > 1) {
     mIsAnimation = true;
+  }
 
 #endif
 
@@ -125,11 +133,12 @@
                                  nullptr,
                                  ErrorCallback,
                                  WarningCallback);
-  if (! mPNG)
+  if (!mPNG) {
     return NS_ERROR_OUT_OF_MEMORY;
+  }
 
   mPNGinfo = png_create_info_struct(mPNG);
-  if (! mPNGinfo) {
+  if (!mPNGinfo) {
     png_destroy_write_struct(&mPNG, nullptr);
     return NS_ERROR_FAILURE;
   }
@@ -184,7 +193,8 @@
 }
 
 // Returns the number of bytes in the image buffer used.
-NS_IMETHODIMP nsPNGEncoder::GetImageBufferUsed(uint32_t *aOutputSize)
+NS_IMETHODIMP
+nsPNGEncoder::GetImageBufferUsed(uint32_t* aOutputSize)
 {
   NS_ENSURE_ARG_POINTER(aOutputSize);
   *aOutputSize = mImageBufferUsed;
@@ -192,21 +202,22 @@
 }
 
 // Returns a pointer to the start of the image buffer
-NS_IMETHODIMP nsPNGEncoder::GetImageBuffer(char **aOutputBuffer)
+NS_IMETHODIMP
+nsPNGEncoder::GetImageBuffer(char** aOutputBuffer)
 {
   NS_ENSURE_ARG_POINTER(aOutputBuffer);
   *aOutputBuffer = reinterpret_cast<char*>(mImageBuffer);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPNGEncoder::AddImageFrame(const uint8_t* aData,
-                                          uint32_t aLength, // (unused,
-                                                            // req'd by JS)
-                                          uint32_t aWidth,
-                                          uint32_t aHeight,
-                                          uint32_t aStride,
-                                          uint32_t aInputFormat,
-                                          const nsAString& aFrameOptions)
+NS_IMETHODIMP
+nsPNGEncoder::AddImageFrame(const uint8_t* aData,
+                            uint32_t aLength, // (unused, req'd by JS)
+                            uint32_t aWidth,
+                            uint32_t aHeight,
+                            uint32_t aStride,
+                            uint32_t aInputFormat,
+                            const nsAString& aFrameOptions)
 {
   bool useTransparency= true;
   uint32_t delay_ms = 500;
@@ -220,12 +231,14 @@
   uint32_t x_offset = 0, y_offset = 0;
 
   // must be initialized
-  if (mImageBuffer == nullptr)
+  if (mImageBuffer == nullptr) {
     return NS_ERROR_NOT_INITIALIZED;
+  }
 
   // EndImageEncode was done, or some error occurred earlier
-  if (!mPNG)
+  if (!mPNG) {
     return NS_BASE_STREAM_CLOSED;
+  }
 
   // validate input format
   if (aInputFormat != INPUT_FORMAT_RGB &&
@@ -243,8 +256,9 @@
   nsresult rv = ParseOptions(aFrameOptions, &useTransparency, nullptr,
                              nullptr, nullptr, &dispose_op, &blend_op,
                              &delay_ms, &x_offset, &y_offset);
-  if (rv != NS_OK)
+  if (rv != NS_OK) {
     return rv;
+  }
 
 #ifdef PNG_APNG_SUPPORTED
   if (mIsAnimation) {
@@ -283,7 +297,7 @@
     }
     delete[] row;
 
-  } else if (aInputFormat == INPUT_FORMAT_RGBA && ! useTransparency) {
+  } else if (aInputFormat == INPUT_FORMAT_RGBA && !useTransparency) {
     // RBGA, but we need to strip the alpha
     uint8_t* row = new uint8_t[aWidth * 4];
     for (uint32_t y = 0; y < aHeight; y ++) {
@@ -314,16 +328,19 @@
 }
 
 
-NS_IMETHODIMP nsPNGEncoder::EndImageEncode()
+NS_IMETHODIMP
+nsPNGEncoder::EndImageEncode()
 {
   // must be initialized
-  if (mImageBuffer == nullptr)
+  if (mImageBuffer == nullptr) {
     return NS_ERROR_NOT_INITIALIZED;
+  }
 
   // EndImageEncode has already been called, or some error
   // occurred earlier
-  if (!mPNG)
+  if (!mPNG) {
     return NS_BASE_STREAM_CLOSED;
+  }
 
   // libpng's error handler jumps back here upon an error.
   if (setjmp(png_jmpbuf(mPNG))) {
@@ -338,8 +355,9 @@
   NotifyListener();
 
   // if output callback can't get enough memory, it will free our buffer
-  if (!mImageBuffer)
+  if (!mImageBuffer) {
     return NS_ERROR_OUT_OF_MEMORY;
+  }
 
   return NS_OK;
 }
@@ -370,16 +388,19 @@
     while(*equals != '=' && *equals) {
       ++equals;
     }
-    if (*equals == '=')
+    if (*equals == '=') {
       value = equals + 1;
+    }
 
-    if (value)
+    if (value) {
       *equals = '\0'; // temporary null
+    }
 
     // transparency=[yes|no|none]
     if (nsCRT::strcmp(token, "transparency") == 0 && useTransparency) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
       if (nsCRT::strcmp(value, "none") == 0 ||
           nsCRT::strcmp(value, "no") == 0) {
@@ -393,8 +414,9 @@
     // skipfirstframe=[yes|no]
     } else if (nsCRT::strcmp(token, "skipfirstframe") == 0 &&
                skipFirstFrame) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
       if (nsCRT::strcmp(value, "no") == 0) {
         *skipFirstFrame = false;
@@ -406,31 +428,36 @@
 
     // frames=#
     } else if (nsCRT::strcmp(token, "frames") == 0 && numFrames) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
       if (PR_sscanf(value, "%u", numFrames) != 1) {
         return NS_ERROR_INVALID_ARG;
       }
 
       // frames=0 is nonsense.
-      if (*numFrames == 0)
+      if (*numFrames == 0) {
         return NS_ERROR_INVALID_ARG;
+      }
 
     // plays=#
     } else if (nsCRT::strcmp(token, "plays") == 0 && numPlays) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
       // plays=0 to loop forever, otherwise play sequence specified
       // number of times
-      if (PR_sscanf(value, "%u", numPlays) != 1)
+      if (PR_sscanf(value, "%u", numPlays) != 1) {
         return NS_ERROR_INVALID_ARG;
+      }
 
     // dispose=[none|background|previous]
     } else if (nsCRT::strcmp(token, "dispose") == 0 && frameDispose) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
       if (nsCRT::strcmp(value, "none") == 0) {
         *frameDispose = PNG_DISPOSE_OP_NONE;
@@ -444,8 +471,9 @@
 
     // blend=[source|over]
     } else if (nsCRT::strcmp(token, "blend") == 0 && frameBlend) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
       if (nsCRT::strcmp(value, "source") == 0) {
         *frameBlend = PNG_BLEND_OP_SOURCE;
@@ -457,34 +485,41 @@
 
     // delay=# (in ms)
     } else if (nsCRT::strcmp(token, "delay") == 0 && frameDelay) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
-      if (PR_sscanf(value, "%u", frameDelay) != 1)
+      if (PR_sscanf(value, "%u", frameDelay) != 1) {
         return NS_ERROR_INVALID_ARG;
+      }
 
     // xoffset=#
     } else if (nsCRT::strcmp(token, "xoffset") == 0 && offsetX) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
-      if (PR_sscanf(value, "%u", offsetX) != 1)
+      if (PR_sscanf(value, "%u", offsetX) != 1) {
         return NS_ERROR_INVALID_ARG;
+      }
 
     // yoffset=#
     } else if (nsCRT::strcmp(token, "yoffset") == 0 && offsetY) {
-      if (!value)
+      if (!value) {
         return NS_ERROR_INVALID_ARG;
+      }
 
-      if (PR_sscanf(value, "%u", offsetY) != 1)
+      if (PR_sscanf(value, "%u", offsetY) != 1) {
         return NS_ERROR_INVALID_ARG;
+      }
 
     // unknown token name
     } else
       return NS_ERROR_INVALID_ARG;
 
-    if (value)
+    if (value) {
       *equals = '='; // restore '=' so strtok doesn't get lost
+    }
   }
 
 #endif
@@ -493,7 +528,8 @@
 
 
 /* void close (); */
-NS_IMETHODIMP nsPNGEncoder::Close()
+NS_IMETHODIMP
+nsPNGEncoder::Close()
 {
   if (mImageBuffer != nullptr) {
     moz_free(mImageBuffer);
@@ -506,10 +542,12 @@
 }
 
 /* unsigned long available (); */
-NS_IMETHODIMP nsPNGEncoder::Available(uint64_t *_retval)
+NS_IMETHODIMP
+nsPNGEncoder::Available(uint64_t* _retval)
 {
-  if (!mImageBuffer)
+  if (!mImageBuffer) {
     return NS_BASE_STREAM_CLOSED;
+    }
 
   *_retval = mImageBufferUsed - mImageBufferReadPoint;
   return NS_OK;
@@ -517,8 +555,8 @@
 
 /* [noscript] unsigned long read (in charPtr aBuf,
                                   in unsigned long aCount); */
-NS_IMETHODIMP nsPNGEncoder::Read(char * aBuf, uint32_t aCount,
-                                 uint32_t *_retval)
+NS_IMETHODIMP
+nsPNGEncoder::Read(char* aBuf, uint32_t aCount, uint32_t* _retval)
 {
   return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, _retval);
 }
@@ -526,9 +564,10 @@
 /* [noscript] unsigned long readSegments (in nsWriteSegmentFun aWriter,
                                           in voidPtr aClosure,
                                           in unsigned long aCount); */
-NS_IMETHODIMP nsPNGEncoder::ReadSegments(nsWriteSegmentFun aWriter,
-                                         void *aClosure, uint32_t aCount,
-                                         uint32_t *_retval)
+NS_IMETHODIMP
+nsPNGEncoder::ReadSegments(nsWriteSegmentFun aWriter,
+                           void* aClosure, uint32_t aCount,
+                           uint32_t* _retval)
 {
   // Avoid another thread reallocing the buffer underneath us
   ReentrantMonitorAutoEnter autoEnter(mReentrantMonitor);
@@ -539,8 +578,10 @@
     return mFinished ? NS_OK : NS_BASE_STREAM_WOULD_BLOCK;
   }
 
-  if (aCount > maxCount)
+  if (aCount > maxCount) {
     aCount = maxCount;
+  }
+
   nsresult rv =
       aWriter(this, aClosure,
               reinterpret_cast<const char*>(mImageBuffer+mImageBufferReadPoint),
@@ -555,28 +596,33 @@
 }
 
 /* boolean isNonBlocking (); */
-NS_IMETHODIMP nsPNGEncoder::IsNonBlocking(bool *_retval)
+NS_IMETHODIMP
+nsPNGEncoder::IsNonBlocking(bool* _retval)
 {
   *_retval = true;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPNGEncoder::AsyncWait(nsIInputStreamCallback *aCallback,
-                                      uint32_t aFlags,
-                                      uint32_t aRequestedCount,
-                                      nsIEventTarget *aTarget)
+NS_IMETHODIMP
+nsPNGEncoder::AsyncWait(nsIInputStreamCallback* aCallback,
+                        uint32_t aFlags,
+                        uint32_t aRequestedCount,
+                        nsIEventTarget* aTarget)
 {
-  if (aFlags != 0)
+  if (aFlags != 0) {
     return NS_ERROR_NOT_IMPLEMENTED;
+  }
 
-  if (mCallback || mCallbackTarget)
+  if (mCallback || mCallbackTarget) {
     return NS_ERROR_UNEXPECTED;
+  }
 
   mCallbackTarget = aTarget;
   // 0 means "any number of bytes except 0"
   mNotifyThreshold = aRequestedCount;
-  if (!aRequestedCount)
+  if (!aRequestedCount) {
     mNotifyThreshold = 1024; // We don't want to notify incessantly
+  }
 
   // We set the callback absolutely last, because NotifyListener uses it to
   // determine if someone needs to be notified.  If we don't set it last,
@@ -590,7 +636,8 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPNGEncoder::CloseWithStatus(nsresult aStatus)
+NS_IMETHODIMP
+nsPNGEncoder::CloseWithStatus(nsresult aStatus)
 {
   return Close();
 }
@@ -610,7 +657,7 @@
   uint32_t pixelStride = aUseTransparency ? 4 : 3;
   for (uint32_t x = 0; x < aPixelWidth; x ++) {
     const uint32_t& pixelIn = ((const uint32_t*)(aSrc))[x];
-    uint8_t *pixelOut = &aDest[x * pixelStride];
+    uint8_t* pixelOut = &aDest[x * pixelStride];
 
     uint8_t alpha = (pixelIn & 0xff000000) >> 24;
     if (alpha == 0) {
@@ -672,8 +719,9 @@
                             png_size_t size)
 {
   nsPNGEncoder* that = static_cast<nsPNGEncoder*>(png_get_io_ptr(png));
-  if (! that->mImageBuffer)
+  if (!that->mImageBuffer) {
     return;
+  }
 
   if (that->mImageBufferUsed + size > that->mImageBufferSize) {
     // When we're reallocing the buffer we need to take the lock to ensure
@@ -684,7 +732,7 @@
     that->mImageBufferSize *= 2;
     uint8_t* newBuf = (uint8_t*)moz_realloc(that->mImageBuffer,
                                             that->mImageBufferSize);
-    if (! newBuf) {
+    if (!newBuf) {
       // can't resize, just zero (this will keep us from writing more)
       moz_free(that->mImageBuffer);
       that->mImageBuffer = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgIContainer.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgIContainer.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgIContainer.idl	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgIContainer.idl	2014-11-26 21:45:47.000000000 +0000
@@ -69,7 +69,7 @@
  *
  * Internally, imgIContainer also manages animation of images.
  */
-[scriptable, builtinclass, uuid(f8bb7671-5f36-490b-b828-3f4c6ad38665)]
+[scriptable, builtinclass, uuid(14ea6fa5-183e-4409-ac88-110bd2e05292)]
 interface imgIContainer : nsISupports
 {
   /**
@@ -215,12 +215,9 @@
                                                      in uint32_t aFlags);
 
   /**
-   * Whether the given frame is opaque; that is, needs the background painted
-   * behind it.
-   *
-   * @param aWhichFrame Frame specifier of the FRAME_* variety.
+   * Whether this image is opaque (i.e., needs a background painted behind it).
    */
-  [notxpcom] boolean frameIsOpaque(in uint32_t aWhichFrame);
+  [notxpcom] boolean isOpaque();
 
   /**
    * Attempts to create an ImageContainer (and Image) containing the current
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgILoader.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgILoader.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgILoader.idl	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgILoader.idl	2014-11-26 21:45:47.000000000 +0000
@@ -27,7 +27,7 @@
  * @version 0.3
  * @see imagelib2
  */
-[scriptable, builtinclass, uuid(42ef3b0a-cd82-454b-b4c4-f3470014a68b)]
+[scriptable, builtinclass, uuid(e61377d2-910e-4c65-a64b-428d150e1fd1)]
 interface imgILoader : nsISupports
 {
   // Extra flags to pass to loadImage if you want a load to use CORS
@@ -40,6 +40,9 @@
    * @param aURI the URI to load
    * @param aInitialDocumentURI the URI that 'initiated' the load -- used for 3rd party cookie blocking
    * @param aReferrerURI the 'referring' URI
+   * @param aReferrerPolicy the policy to apply to sending referrers.
+   *           examples: "default", "never", "always", "origin"
+   *           (see W3C referrer-policy spec for valid policy strings)
    * @param aLoadingPrincipal the principal of the loading document
    * @param aLoadGroup Loadgroup to put the image load into
    * @param aObserver the observer (may be null)
@@ -52,7 +55,7 @@
    *                           nsIContentPolicy::TYPE_IMAGE
 
 
-   * libpr0n does NOT keep a strong ref to the observer; this prevents
+   * ImageLib does NOT keep a strong ref to the observer; this prevents
    * reference cycles.  This means that callers of loadImage should
    * make sure to Cancel() the resulting request before the observer
    * goes away.
@@ -60,6 +63,7 @@
   imgIRequest loadImageXPCOM(in nsIURI aURI,
                              in nsIURI aInitialDocumentURL,
                              in nsIURI aReferrerURI,
+                             in AString aReferrerPolicy,
                              in nsIPrincipal aLoadingPrincipal,
                              in nsILoadGroup aLoadGroup,
                              in imgINotificationObserver aObserver,
@@ -82,7 +86,7 @@
    *        not interested in the data. @aChannel will be canceled for you in
    *        this case.
    *
-   * libpr0n does NOT keep a strong ref to the observer; this prevents
+   * ImageLib does NOT keep a strong ref to the observer; this prevents
    * reference cycles.  This means that callers of loadImageWithChannel should
    * make sure to Cancel() the resulting request before the observer goes away.
    */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgINotificationObserver.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgINotificationObserver.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgINotificationObserver.idl	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgINotificationObserver.idl	2014-11-26 21:45:47.000000000 +0000
@@ -14,17 +14,44 @@
 
 [ptr] native nsIntRect(nsIntRect);
 
-[scriptable, builtinclass, uuid(ac65c702-7771-4f6d-b18b-1c7d806ce3c1)]
+[scriptable, builtinclass, uuid(03da5641-a333-454a-a859-036d0bb683b7)]
 interface imgINotificationObserver : nsISupports
 {
+  // GetWidth() and GetHeight() can now be used to retrieve the size of the
+  // image.
   const long SIZE_AVAILABLE = 1;
+
+  // A region of the image (indicated by the |aRect| argument to |notify|) has
+  // changed, and needs to be redrawn. This is triggered both for incremental
+  // rendering as the image gets decoded and for changes due to animation.
   const long FRAME_UPDATE = 2;
+
+  // The first frame of the image is now decoded and ready to draw.
   const long FRAME_COMPLETE = 3;
+
+  // The entire image has been loaded. That doesn't mean that it has been
+  // decoded, but it does mean that imgIContainer::Draw is guaranteed to succeed
+  // (modulo decode errors, at least) if you specify FLAG_SYNC_DECODE.
   const long LOAD_COMPLETE = 4;
+
+  // The entire image has been decoded.
   const long DECODE_COMPLETE = 5;
+
+  // The decoded version of the image has been discarded. Content should never
+  // change as a result of this notification - discarding is an implementation
+  // detail. This notification should normally only be observed by tests.
   const long DISCARD = 6;
+
+  // The image was drawn without being locked. This notification is part of the
+  // image locking mechanism that prevents visible images from being discarded;
+  // generally only image locking code needs to observe it.
   const long UNLOCKED_DRAW = 7;
+
+  // The image is animated.
   const long IS_ANIMATED = 8;
 
+  // The image is transparent.
+  const long HAS_TRANSPARENCY = 9;
+
   [noscript] void notify(in imgIRequest aProxy, in long aType, [const] in nsIntRect aRect);
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgIRequest.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgIRequest.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgIRequest.idl	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgIRequest.idl	2014-11-26 21:45:47.000000000 +0000
@@ -19,7 +19,7 @@
  * @version 0.1
  * @see imagelib2
  */
-[scriptable, builtinclass, uuid(dc61f0ea-4139-4c2a-ae69-cec82d33e089)]
+[scriptable, builtinclass, uuid(83a7708b-5c35-409f-bab3-7fc08be6a264)]
 interface imgIRequest : nsIRequest
 {
   /**
@@ -54,6 +54,10 @@
    * completely decoded.
    *
    * STATUS_DECODE_COMPLETE: The whole image has been decoded.
+   *
+   * STATUS_IS_ANIMATED: The image is animated.
+   *
+   * STATUS_HAS_TRANSPARENCY: The image is partially or completely transparent.
    */
   //@{
   const long STATUS_NONE             = 0x0;
@@ -63,6 +67,8 @@
   const long STATUS_DECODE_STARTED   = 0x8;
   const long STATUS_FRAME_COMPLETE   = 0x10;
   const long STATUS_DECODE_COMPLETE  = 0x20;
+  const long STATUS_IS_ANIMATED      = 0x40;
+  const long STATUS_HAS_TRANSPARENCY = 0x80;
   //@}
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgIScriptedNotificationObserver.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgIScriptedNotificationObserver.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/public/imgIScriptedNotificationObserver.idl	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/public/imgIScriptedNotificationObserver.idl	2014-11-26 21:45:47.000000000 +0000
@@ -18,4 +18,5 @@
   void decodeComplete(in imgIRequest aRequest);
   void discard(in imgIRequest aRequest);
   void isAnimated(in imgIRequest aRequest);
+  void hasTransparency(in imgIRequest aRequest);
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ClippedImage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ClippedImage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ClippedImage.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ClippedImage.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -134,8 +134,8 @@
   // available yet, in which case we'll try again later.
   if (mShouldClip.isNothing()) {
     int32_t width, height;
-    nsRefPtr<imgStatusTracker> innerImageStatusTracker =
-      InnerImage()->GetStatusTracker();
+    nsRefPtr<ProgressTracker> progressTracker =
+      InnerImage()->GetProgressTracker();
     if (InnerImage()->HasError()) {
       // If there's a problem with the inner image we'll let it handle everything.
       mShouldClip.emplace(false);
@@ -147,8 +147,7 @@
       // If the clipping region is the same size as the underlying image we
       // don't have to do anything.
       mShouldClip.emplace(!mClip.IsEqualInterior(nsIntRect(0, 0, width, height)));
-    } else if (innerImageStatusTracker &&
-               innerImageStatusTracker->IsLoading()) {
+    } else if (progressTracker && progressTracker->IsLoading()) {
       // The image just hasn't finished loading yet. We don't yet know whether
       // clipping with be needed or not for now. Just return without memoizing
       // anything.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DecodePool.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DecodePool.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DecodePool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DecodePool.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,512 @@
+/* -*- 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 "DecodePool.h"
+
+#include <algorithm>
+
+#include "mozilla/ClearOnShutdown.h"
+#include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "nsIObserverService.h"
+#include "nsIThreadPool.h"
+#include "nsXPCOMCIDInternal.h"
+#include "prsystem.h"
+
+#ifdef MOZ_NUWA_PROCESS
+#include "ipc/Nuwa.h"
+#endif
+
+#include "gfxPrefs.h"
+
+#include "Decoder.h"
+#include "RasterImage.h"
+
+using std::max;
+using std::min;
+
+namespace mozilla {
+namespace image {
+
+///////////////////////////////////////////////////////////////////////////////
+// Helper runnables.
+///////////////////////////////////////////////////////////////////////////////
+
+class NotifyProgressWorker : public nsRunnable
+{
+public:
+  /**
+   * Called by the DecodePool when it's done some significant portion of
+   * decoding, so that progress can be recorded and notifications can be sent.
+   */
+  static void Dispatch(RasterImage* aImage)
+  {
+    nsCOMPtr<nsIRunnable> worker = new NotifyProgressWorker(aImage);
+    NS_DispatchToMainThread(worker);
+  }
+
+  NS_IMETHOD Run() MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    ReentrantMonitorAutoEnter lock(mImage->mDecodingMonitor);
+
+    mImage->FinishedSomeDecoding(ShutdownReason::DONE);
+
+    return NS_OK;
+  }
+
+private:
+  explicit NotifyProgressWorker(RasterImage* aImage)
+    : mImage(aImage)
+  { }
+
+  nsRefPtr<RasterImage> mImage;
+};
+
+class FrameNeededWorker : public nsRunnable
+{
+public:
+  /**
+   * Called when an off-main-thread decoder needs a new frame to be allocated on
+   * the main thread.
+   *
+   * After allocating the new frame, the worker will call RequestDecode to
+   * continue decoding.
+   */
+  static void Dispatch(RasterImage* aImage)
+  {
+    nsCOMPtr<nsIRunnable> worker = new FrameNeededWorker(aImage);
+    NS_DispatchToMainThread(worker);
+  }
+
+  NS_IMETHOD Run() MOZ_OVERRIDE
+  {
+    ReentrantMonitorAutoEnter lock(mImage->mDecodingMonitor);
+    nsresult rv = NS_OK;
+
+    // If we got a synchronous decode in the mean time, we don't need to do
+    // anything.
+    if (mImage->mDecoder && mImage->mDecoder->NeedsNewFrame()) {
+      rv = mImage->mDecoder->AllocateFrame();
+    }
+
+    if (NS_SUCCEEDED(rv) && mImage->mDecoder) {
+      // By definition, we're not done decoding, so enqueue us for more decoding.
+      DecodePool::Singleton()->RequestDecode(mImage);
+    }
+
+    return NS_OK;
+  }
+
+private:
+  explicit FrameNeededWorker(RasterImage* aImage)
+    : mImage(aImage)
+  { }
+
+  nsRefPtr<RasterImage> mImage;
+};
+
+class DecodeWorker : public nsRunnable
+{
+public:
+  DecodeWorker(RasterImage* aImage)
+    : mImage(aImage)
+  { }
+
+  NS_IMETHOD Run() MOZ_OVERRIDE
+  {
+    ReentrantMonitorAutoEnter lock(mImage->mDecodingMonitor);
+
+    // If we were interrupted, we shouldn't do any work.
+    if (mImage->mDecodeStatus == DecodeStatus::STOPPED) {
+      NotifyProgressWorker::Dispatch(mImage);
+      return NS_OK;
+    }
+
+    // If someone came along and synchronously decoded us, there's nothing for us to do.
+    if (!mImage->mDecoder || mImage->IsDecodeFinished()) {
+      NotifyProgressWorker::Dispatch(mImage);
+      return NS_OK;
+    }
+
+    // If we're a decode job that's been enqueued since a previous decode that
+    // still needs a new frame, we can't do anything. Wait until the
+    // FrameNeededWorker enqueues another frame.
+    if (mImage->mDecoder->NeedsNewFrame()) {
+      return NS_OK;
+    }
+
+    mImage->mDecodeStatus = DecodeStatus::ACTIVE;
+
+    size_t oldByteCount = mImage->mDecoder->BytesDecoded();
+
+    // Multithreaded decoding can be disabled. If we've done so, we don't want
+    // to monopolize the main thread, and will allow a timeout.
+    DecodeUntil type = NS_IsMainThread() ? DecodeUntil::TIME
+                                         : DecodeUntil::DONE_BYTES;
+
+    size_t maxBytes = mImage->mSourceData.Length() -
+                      mImage->mDecoder->BytesDecoded();
+    DecodePool::Singleton()->DecodeSomeOfImage(mImage, DecodeStrategy::ASYNC,
+                                               type, maxBytes);
+
+    size_t bytesDecoded = mImage->mDecoder->BytesDecoded() - oldByteCount;
+
+    mImage->mDecodeStatus = DecodeStatus::WORK_DONE;
+
+    if (mImage->mDecoder && mImage->mDecoder->NeedsNewFrame()) {
+      // The decoder needs a new frame. Enqueue an event to get it; that event
+      // will enqueue another decode request when it's done.
+      FrameNeededWorker::Dispatch(mImage);
+    } else if (mImage->mDecoder &&
+               !mImage->mError &&
+               !mImage->mPendingError &&
+               !mImage->IsDecodeFinished() &&
+               bytesDecoded < maxBytes &&
+               bytesDecoded > 0) {
+      // We aren't finished decoding, and we have more data, so add this request
+      // to the back of the list.
+      DecodePool::Singleton()->RequestDecode(mImage);
+    } else {
+      // Nothing more for us to do - let everyone know what happened.
+      NotifyProgressWorker::Dispatch(mImage);
+    }
+
+    return NS_OK;
+  }
+
+protected:
+  virtual ~DecodeWorker()
+  {
+    if (gfxPrefs::ImageMTDecodingEnabled()) {
+      // Dispatch mImage to main thread to prevent mImage from being destructed by decode thread.
+      nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
+      NS_WARN_IF_FALSE(mainThread, "Couldn't get the main thread!");
+      if (mainThread) {
+        // Handle ambiguous nsISupports inheritance
+        RasterImage* rawImg = nullptr;
+        mImage.swap(rawImg);
+        DebugOnly<nsresult> rv = NS_ProxyRelease(mainThread, NS_ISUPPORTS_CAST(ImageResource*, rawImg));
+        MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to proxy release to main thread");
+      }
+    }
+  }
+
+private:
+  nsRefPtr<RasterImage> mImage;
+};
+
+#ifdef MOZ_NUWA_PROCESS
+
+class RIDThreadPoolListener MOZ_FINAL : public nsIThreadPoolListener
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSITHREADPOOLLISTENER
+  
+  RIDThreadPoolListener() { }
+
+private:
+  ~RIDThreadPoolListener() { }
+};
+
+NS_IMPL_ISUPPORTS(RIDThreadPoolListener, nsIThreadPoolListener)
+
+NS_IMETHODIMP
+RIDThreadPoolListener::OnThreadCreated()
+{
+    if (IsNuwaProcess()) {
+        NuwaMarkCurrentThread(static_cast<void(*)(void*)>(nullptr), nullptr);
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+RIDThreadPoolListener::OnThreadShuttingDown()
+{
+    return NS_OK;
+}
+
+#endif // MOZ_NUWA_PROCESS
+
+
+///////////////////////////////////////////////////////////////////////////////
+// DecodePool implementation.
+///////////////////////////////////////////////////////////////////////////////
+
+/* static */ StaticRefPtr<DecodePool> DecodePool::sSingleton;
+
+NS_IMPL_ISUPPORTS(DecodePool, nsIObserver)
+
+/* static */ DecodePool*
+DecodePool::Singleton()
+{
+  if (!sSingleton) {
+    MOZ_ASSERT(NS_IsMainThread());
+    sSingleton = new DecodePool();
+    ClearOnShutdown(&sSingleton);
+  }
+
+  return sSingleton;
+}
+
+already_AddRefed<nsIEventTarget>
+DecodePool::GetEventTarget()
+{
+  nsCOMPtr<nsIEventTarget> target = do_QueryInterface(mThreadPool);
+  return target.forget();
+}
+
+DecodePool::DecodePool()
+  : mThreadPoolMutex("Thread Pool")
+{
+  if (gfxPrefs::ImageMTDecodingEnabled()) {
+    mThreadPool = do_CreateInstance(NS_THREADPOOL_CONTRACTID);
+    if (mThreadPool) {
+      mThreadPool->SetName(NS_LITERAL_CSTRING("ImageDecoder"));
+      int32_t prefLimit = gfxPrefs::ImageMTDecodingLimit();
+      uint32_t limit;
+      if (prefLimit <= 0) {
+        limit = max(PR_GetNumberOfProcessors(), 2) - 1;
+      } else {
+        limit = static_cast<uint32_t>(prefLimit);
+      }
+
+      mThreadPool->SetThreadLimit(limit);
+      mThreadPool->SetIdleThreadLimit(limit);
+
+#ifdef MOZ_NUWA_PROCESS
+      if (IsNuwaProcess()) {
+        mThreadPool->SetListener(new RIDThreadPoolListener());
+      }
+#endif
+
+      nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
+      if (obsSvc) {
+        obsSvc->AddObserver(this, "xpcom-shutdown-threads", false);
+      }
+    }
+  }
+}
+
+DecodePool::~DecodePool()
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Must shut down DecodePool on main thread!");
+}
+
+NS_IMETHODIMP
+DecodePool::Observe(nsISupports*, const char* aTopic, const char16_t*)
+{
+  MOZ_ASSERT(strcmp(aTopic, "xpcom-shutdown-threads") == 0, "Unexpected topic");
+
+  nsCOMPtr<nsIThreadPool> threadPool;
+
+  {
+    MutexAutoLock threadPoolLock(mThreadPoolMutex);
+    threadPool = mThreadPool;
+    mThreadPool = nullptr;
+  }
+
+  if (threadPool) {
+    threadPool->Shutdown();
+  }
+
+  return NS_OK;
+}
+
+void
+DecodePool::RequestDecode(RasterImage* aImage)
+{
+  MOZ_ASSERT(aImage->mDecoder);
+  aImage->mDecodingMonitor.AssertCurrentThreadIn();
+
+  // If we're currently waiting on a new frame for this image, we can't do any
+  // decoding.
+  if (!aImage->mDecoder->NeedsNewFrame()) {
+    if (aImage->mDecodeStatus == DecodeStatus::PENDING ||
+        aImage->mDecodeStatus == DecodeStatus::ACTIVE) {
+      // The image is already in our list of images to decode, or currently being
+      // decoded, so we don't have to do anything else.
+      return;
+    }
+
+    aImage->mDecodeStatus = DecodeStatus::PENDING;
+    nsCOMPtr<nsIRunnable> worker = new DecodeWorker(aImage);
+
+    MutexAutoLock threadPoolLock(mThreadPoolMutex);
+    if (!gfxPrefs::ImageMTDecodingEnabled() || !mThreadPool) {
+      NS_DispatchToMainThread(worker);
+    } else {
+      mThreadPool->Dispatch(worker, nsIEventTarget::DISPATCH_NORMAL);
+    }
+  }
+}
+
+void
+DecodePool::DecodeABitOf(RasterImage* aImage, DecodeStrategy aStrategy)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  aImage->mDecodingMonitor.AssertCurrentThreadIn();
+
+  // If the image is waiting for decode work to be notified, go ahead and do that.
+  if (aImage->mDecodeStatus == DecodeStatus::WORK_DONE) {
+    aImage->FinishedSomeDecoding();
+  }
+
+  DecodeSomeOfImage(aImage, aStrategy);
+
+  aImage->FinishedSomeDecoding();
+
+  // If the decoder needs a new frame, enqueue an event to get it; that event
+  // will enqueue another decode request when it's done.
+  if (aImage->mDecoder && aImage->mDecoder->NeedsNewFrame()) {
+    FrameNeededWorker::Dispatch(aImage);
+  } else {
+    // If we aren't yet finished decoding and we have more data in hand, add
+    // this request to the back of the priority list.
+    if (aImage->mDecoder &&
+        !aImage->mError &&
+        !aImage->IsDecodeFinished() &&
+        aImage->mSourceData.Length() > aImage->mDecoder->BytesDecoded()) {
+      RequestDecode(aImage);
+    }
+  }
+}
+
+/* static */ void
+DecodePool::StopDecoding(RasterImage* aImage)
+{
+  aImage->mDecodingMonitor.AssertCurrentThreadIn();
+
+  // If we haven't got a decode request, we're not currently decoding. (Having
+  // a decode request doesn't imply we *are* decoding, though.)
+  aImage->mDecodeStatus = DecodeStatus::STOPPED;
+}
+
+nsresult
+DecodePool::DecodeUntilSizeAvailable(RasterImage* aImage)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  ReentrantMonitorAutoEnter lock(aImage->mDecodingMonitor);
+
+  // If the image is waiting for decode work to be notified, go ahead and do that.
+  if (aImage->mDecodeStatus == DecodeStatus::WORK_DONE) {
+    nsresult rv = aImage->FinishedSomeDecoding();
+    if (NS_FAILED(rv)) {
+      aImage->DoError();
+      return rv;
+    }
+  }
+
+  // We use DecodeStrategy::ASYNC here because we just want to get the size
+  // information here and defer the rest of the work.
+  nsresult rv =
+    DecodeSomeOfImage(aImage, DecodeStrategy::ASYNC, DecodeUntil::SIZE);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  // If the decoder needs a new frame, enqueue an event to get it; that event
+  // will enqueue another decode request when it's done.
+  if (aImage->mDecoder && aImage->mDecoder->NeedsNewFrame()) {
+    FrameNeededWorker::Dispatch(aImage);
+  } else {
+    rv = aImage->FinishedSomeDecoding();
+  }
+
+  return rv;
+}
+
+nsresult
+DecodePool::DecodeSomeOfImage(RasterImage* aImage,
+                              DecodeStrategy aStrategy,
+                              DecodeUntil aDecodeUntil /* = DecodeUntil::TIME */,
+                              uint32_t bytesToDecode /* = 0 */)
+{
+  MOZ_ASSERT(aImage->mInitialized, "Worker active for uninitialized container");
+  aImage->mDecodingMonitor.AssertCurrentThreadIn();
+
+  // If an error is flagged, it probably happened while we were waiting
+  // in the event queue.
+  if (aImage->mError) {
+    return NS_OK;
+  }
+
+  // If there is an error worker pending (say because the main thread has enqueued
+  // another decode request for us before processing the error worker) then bail out.
+  if (aImage->mPendingError) {
+    return NS_OK;
+  }
+
+  // If mDecoded or we don't have a decoder, we must have finished already (for
+  // example, a synchronous decode request came while the worker was pending).
+  if (!aImage->mDecoder || aImage->mDecoded) {
+    return NS_OK;
+  }
+
+  if (aImage->mDecoder->NeedsNewFrame()) {
+    if (aStrategy == DecodeStrategy::SYNC) {
+      MOZ_ASSERT(NS_IsMainThread());
+      aImage->mDecoder->AllocateFrame();
+    } else {
+      return NS_OK;
+    }
+  }
+
+  nsRefPtr<Decoder> decoderKungFuDeathGrip = aImage->mDecoder;
+
+  uint32_t maxBytes;
+  if (aImage->mDecoder->IsSizeDecode()) {
+    // Decode all available data if we're a size decode; they're cheap, and we
+    // want them to be more or less synchronous.
+    maxBytes = aImage->mSourceData.Length();
+  } else {
+    // We're only guaranteed to decode this many bytes, so in particular,
+    // gfxPrefs::ImageMemDecodeBytesAtATime should be set high enough for us
+    // to read the size from most images.
+    maxBytes = gfxPrefs::ImageMemDecodeBytesAtATime();
+  }
+
+  if (bytesToDecode == 0) {
+    bytesToDecode = aImage->mSourceData.Length() - aImage->mDecoder->BytesDecoded();
+  }
+
+  TimeStamp deadline = TimeStamp::Now() +
+                       TimeDuration::FromMilliseconds(gfxPrefs::ImageMemMaxMSBeforeYield());
+
+  // We keep decoding chunks until:
+  //  * we don't have any data left to decode,
+  //  * the decode completes,
+  //  * we're an DecodeUntil::SIZE decode and we get the size, or
+  //  * we run out of time.
+  // We also try to decode at least one "chunk" if we've allocated a new frame,
+  // even if we have no more data to send to the decoder.
+  while ((aImage->mSourceData.Length() > aImage->mDecoder->BytesDecoded() &&
+          bytesToDecode > 0 &&
+          !aImage->IsDecodeFinished() &&
+          !(aDecodeUntil == DecodeUntil::SIZE && aImage->mHasSize) &&
+          !aImage->mDecoder->NeedsNewFrame()) ||
+         aImage->mDecoder->NeedsToFlushData()) {
+    uint32_t chunkSize = min(bytesToDecode, maxBytes);
+    nsresult rv = aImage->DecodeSomeData(chunkSize, aStrategy);
+    if (NS_FAILED(rv)) {
+      aImage->DoError();
+      return rv;
+    }
+
+    bytesToDecode -= chunkSize;
+
+    // Yield if we've been decoding for too long. We check this _after_ decoding
+    // a chunk to ensure that we don't yield without doing any decoding.
+    if (aDecodeUntil == DecodeUntil::TIME && TimeStamp::Now() >= deadline) {
+      break;
+    }
+  }
+
+  return NS_OK;
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DecodePool.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DecodePool.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DecodePool.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DecodePool.h	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,151 @@
+/* -*- 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/. */
+
+/**
+ * DecodePool manages the threads used for decoding raster images.
+ */
+
+#ifndef MOZILLA_IMAGELIB_DECODEPOOL_H_
+#define MOZILLA_IMAGELIB_DECODEPOOL_H_
+
+#include "mozilla/Mutex.h"
+#include "mozilla/StaticPtr.h"
+#include <mozilla/TypedEnum.h>
+#include "nsCOMPtr.h"
+#include "nsIEventTarget.h"
+#include "nsIObserver.h"
+
+class nsIThreadPool;
+
+namespace mozilla {
+namespace image {
+
+class Decoder;
+class RasterImage;
+
+MOZ_BEGIN_ENUM_CLASS(DecodeStrategy, uint8_t)
+  // DecodeStrategy::SYNC requests a synchronous decode, which will continue
+  // decoding frames as long as it has more source data. It returns to the
+  // caller only once decoding is complete (or until it needs more source data
+  // before continuing). Because DecodeStrategy::SYNC can involve allocating new
+  // imgFrames, it can only be run on the main thread.
+  SYNC,
+
+  // DecodeStrategy::ASYNC requests an asynchronous decode, which will continue
+  // decoding until it either finishes a frame or runs out of source data.
+  // Because DecodeStrategy::ASYNC does not allocate new imgFrames, it can be
+  // safely run off the main thread. (And hence workers in the decode pool
+  // always use it.)
+  ASYNC
+MOZ_END_ENUM_CLASS(DecodeStrategy)
+
+MOZ_BEGIN_ENUM_CLASS(DecodeStatus, uint8_t)
+  INACTIVE,
+  PENDING,
+  ACTIVE,
+  WORK_DONE,
+  STOPPED
+MOZ_END_ENUM_CLASS(DecodeStatus)
+
+MOZ_BEGIN_ENUM_CLASS(DecodeUntil, uint8_t)
+  TIME,
+  SIZE,
+  DONE_BYTES
+MOZ_END_ENUM_CLASS(DecodeUntil)
+
+MOZ_BEGIN_ENUM_CLASS(ShutdownReason, uint8_t)
+  DONE,
+  NOT_NEEDED,
+  FATAL_ERROR
+MOZ_END_ENUM_CLASS(ShutdownReason)
+
+
+/**
+ * DecodePool is a singleton class we use when decoding large images.
+ *
+ * When we wish to decode an image larger than
+ * image.mem.max_bytes_for_sync_decode, we call DecodePool::RequestDecode()
+ * for the image.  This adds the image to a queue of pending requests and posts
+ * the DecodePool singleton to the event queue, if it's not already pending
+ * there.
+ *
+ * When the DecodePool is run from the event queue, it decodes the image (and
+ * all others it's managing) in chunks, periodically yielding control back to
+ * the event loop.
+ */
+class DecodePool : public nsIObserver
+{
+public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  static DecodePool* Singleton();
+
+  /**
+   * Ask the DecodePool to asynchronously decode this image.
+   */
+  void RequestDecode(RasterImage* aImage);
+
+  /**
+   * Decode aImage for a short amount of time, and post the remainder to the
+   * queue.
+   */
+  void DecodeABitOf(RasterImage* aImage, DecodeStrategy aStrategy);
+
+  /**
+   * Ask the DecodePool to stop decoding this image.  Internally, we also
+   * call this function when we finish decoding an image.
+   *
+   * Since the DecodePool keeps raw pointers to RasterImages, make sure you
+   * call this before a RasterImage is destroyed!
+   */
+  static void StopDecoding(RasterImage* aImage);
+
+  /**
+   * Synchronously decode the beginning of the image until we run out of
+   * bytes or we get the image's size.  Note that this done on a best-effort
+   * basis; if the size is burried too deep in the image, we'll give up.
+   *
+   * @return NS_ERROR if an error is encountered, and NS_OK otherwise.  (Note
+   *         that we return NS_OK even when the size was not found.)
+   */
+  nsresult DecodeUntilSizeAvailable(RasterImage* aImage);
+
+  /**
+   * Returns an event target interface to the thread pool; primarily for
+   * OnDataAvailable delivery off main thread.
+   *
+   * @return An nsIEventTarget interface to mThreadPool.
+   */
+  already_AddRefed<nsIEventTarget> GetEventTarget();
+
+  /**
+   * Decode some chunks of the given image.  If aDecodeUntil is SIZE,
+   * decode until we have the image's size, then stop. If bytesToDecode is
+   * non-0, at most bytesToDecode bytes will be decoded. if aDecodeUntil is
+   * DONE_BYTES, decode until all bytesToDecode bytes are decoded.
+   */
+  nsresult DecodeSomeOfImage(RasterImage* aImage,
+                             DecodeStrategy aStrategy,
+                             DecodeUntil aDecodeUntil = DecodeUntil::TIME,
+                             uint32_t bytesToDecode = 0);
+
+private:
+  DecodePool();
+  virtual ~DecodePool();
+
+  static StaticRefPtr<DecodePool> sSingleton;
+
+  // mThreadPoolMutex protects mThreadPool. For all RasterImages R,
+  // R::mDecodingMonitor must be acquired before mThreadPoolMutex
+  // if both are acquired; the other order may cause deadlock.
+  Mutex                     mThreadPoolMutex;
+  nsCOMPtr<nsIThreadPool>   mThreadPool;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // MOZILLA_IMAGELIB_DECODEPOOL_H_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/Decoder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/Decoder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/Decoder.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/Decoder.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -17,8 +17,10 @@
 Decoder::Decoder(RasterImage &aImage)
   : mImage(aImage)
   , mCurrentFrame(nullptr)
+  , mProgress(NoProgress)
   , mImageData(nullptr)
   , mColormap(nullptr)
+  , mChunkCount(0)
   , mDecodeFlags(0)
   , mBytesDecoded(0)
   , mDecodeDone(false)
@@ -26,15 +28,19 @@
   , mFrameCount(0)
   , mFailCode(NS_OK)
   , mNeedsNewFrame(false)
+  , mNeedsToFlushData(false)
   , mInitialized(false)
   , mSizeDecode(false)
   , mInFrame(false)
   , mIsAnimated(false)
-{
-}
+{ }
 
 Decoder::~Decoder()
 {
+  MOZ_ASSERT(mProgress == NoProgress,
+             "Destroying Decoder without taking all its progress changes");
+  MOZ_ASSERT(mInvalidRect.IsEmpty(),
+             "Destroying Decoder without taking all its invalidations");
   mInitialized = false;
 }
 
@@ -47,11 +53,11 @@
 {
   // No re-initializing
   NS_ABORT_IF_FALSE(!mInitialized, "Can't re-initialize a decoder!");
-  NS_ABORT_IF_FALSE(mObserver, "Need an observer!");
 
   // Fire OnStartDecode at init time to support bug 512435.
-  if (!IsSizeDecode())
-      mObserver->OnStartDecode();
+  if (!IsSizeDecode()) {
+      mProgress |= FLAG_DECODE_STARTED | FLAG_ONLOAD_BLOCKED;
+  }
 
   // Implementation-specific initialization
   InitInternal();
@@ -68,7 +74,6 @@
 {
   // No re-initializing
   NS_ABORT_IF_FALSE(!mInitialized, "Can't re-initialize a decoder!");
-  NS_ABORT_IF_FALSE(mObserver, "Need an observer!");
 
   mImageData = imageData;
   mImageDataLength = imageDataLength;
@@ -91,16 +96,26 @@
   PROFILER_LABEL("ImageDecoder", "Write",
     js::ProfileEntry::Category::GRAPHICS);
 
-  MOZ_ASSERT(NS_IsMainThread() || aStrategy == DECODE_ASYNC);
+  MOZ_ASSERT(NS_IsMainThread() || aStrategy == DecodeStrategy::ASYNC);
 
   // We're strict about decoder errors
   MOZ_ASSERT(!HasDecoderError(),
              "Not allowed to make more decoder calls after error!");
 
+  // Begin recording telemetry data.
+  TimeStamp start = TimeStamp::Now();
+  mChunkCount++;
+
   // Keep track of the total number of bytes written.
   mBytesDecoded += aCount;
 
-  // If a data error occured, just ignore future data
+  // If we're flushing data, clear the flag.
+  if (aBuffer == nullptr && aCount == 0) {
+    MOZ_ASSERT(mNeedsToFlushData, "Flushing when we don't need to");
+    mNeedsToFlushData = false;
+  }
+
+  // If a data error occured, just ignore future data.
   if (HasDataError())
     return;
 
@@ -114,18 +129,25 @@
 
   // If we're a synchronous decoder and we need a new frame to proceed, let's
   // create one and call it again.
-  while (aStrategy == DECODE_SYNC && NeedsNewFrame() && !HasDataError()) {
-    nsresult rv = AllocateFrame();
+  if (aStrategy == DecodeStrategy::SYNC) {
+    while (NeedsNewFrame() && !HasDataError()) {
+      nsresult rv = AllocateFrame();
+
+      if (NS_SUCCEEDED(rv)) {
+        // Use the data we saved when we asked for a new frame.
+        WriteInternal(nullptr, 0, aStrategy);
+      }
 
-    if (NS_SUCCEEDED(rv)) {
-      // Tell the decoder to use the data it saved when it asked for a new frame.
-      WriteInternal(nullptr, 0, aStrategy);
+      mNeedsToFlushData = false;
     }
   }
+
+  // Finish telemetry.
+  mDecodeTime += (TimeStamp::Now() - start);
 }
 
 void
-Decoder::Finish(RasterImage::eShutdownIntent aShutdownIntent)
+Decoder::Finish(ShutdownReason aReason)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -162,7 +184,7 @@
     }
 
     bool usable = !HasDecoderError();
-    if (aShutdownIntent != RasterImage::eShutdownIntent_NotNeeded && !HasDecoderError()) {
+    if (aReason != ShutdownReason::NOT_NEEDED && !HasDecoderError()) {
       // If we only have a data error, we're usable if we have at least one complete frame.
       if (GetCompleteFrameCount() == 0) {
         usable = false;
@@ -177,9 +199,10 @@
       }
       PostDecodeDone();
     } else {
-      if (mObserver) {
-        mObserver->OnStopDecode(NS_ERROR_FAILURE);
+      if (!IsSizeDecode()) {
+        mProgress |= FLAG_DECODE_COMPLETE | FLAG_ONLOAD_UNBLOCKED;
       }
+      mProgress |= FLAG_HAS_ERROR;
     }
   }
 
@@ -242,6 +265,12 @@
   // so they can tell us if they need yet another.
   mNeedsNewFrame = false;
 
+  // If we've received any data at all, we may have pending data that needs to
+  // be flushed now that we have a frame to decode into.
+  if (mBytesDecoded > 0) {
+    mNeedsToFlushData = true;
+  }
+
   return rv;
 }
 
@@ -280,9 +309,14 @@
   // Tell the image
   mImageMetadata.SetSize(aWidth, aHeight, aOrientation);
 
-  // Notify the observer
-  if (mObserver)
-    mObserver->OnStartContainer();
+  // Record this notification.
+  mProgress |= FLAG_SIZE_AVAILABLE;
+}
+
+void
+Decoder::PostHasTransparency()
+{
+  mProgress |= FLAG_HAS_TRANSPARENCY;
 }
 
 void
@@ -295,6 +329,12 @@
   mFrameCount++;
   mInFrame = true;
 
+  // If we just became animated, record that fact.
+  if (mFrameCount > 1) {
+    mIsAnimated = true;
+    mProgress |= FLAG_IS_ANIMATED;
+  }
+
   // Decoder implementations should only call this method if they successfully
   // appended the frame to the image. So mFrameCount should always match that
   // reported by the Image.
@@ -309,8 +349,9 @@
                        FrameBlender::FrameBlendMethod aBlendMethod /* = FrameBlender::kBlendOver */)
 {
   // We should be mid-frame
-  NS_ABORT_IF_FALSE(mInFrame, "Stopping frame when we didn't start one!");
-  NS_ABORT_IF_FALSE(mCurrentFrame, "Stopping frame when we don't have one!");
+  MOZ_ASSERT(!IsSizeDecode(), "Stopping frame during a size decode");
+  MOZ_ASSERT(mInFrame, "Stopping frame when we didn't start one");
+  MOZ_ASSERT(mCurrentFrame, "Stopping frame when we don't have one");
 
   // Update our state
   mInFrame = false;
@@ -324,14 +365,7 @@
   mCurrentFrame->SetBlendMethod(aBlendMethod);
   mCurrentFrame->ImageUpdated(mCurrentFrame->GetRect());
 
-  // Fire notifications
-  if (mObserver) {
-    mObserver->OnStopFrame();
-    if (mFrameCount > 1 && !mIsAnimated) {
-      mIsAnimated = true;
-      mObserver->OnImageIsAnimated();
-    }
-  }
+  mProgress |= FLAG_FRAME_COMPLETE | FLAG_ONLOAD_UNBLOCKED;
 }
 
 void
@@ -357,9 +391,7 @@
   mImageMetadata.SetLoopCount(aLoopCount);
   mImageMetadata.SetIsNonPremultiplied(GetDecodeFlags() & DECODER_NO_PREMULTIPLY_ALPHA);
 
-  if (mObserver) {
-    mObserver->OnStopDecode(NS_OK);
-  }
+  mProgress |= FLAG_DECODE_COMPLETE;
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/Decoder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/Decoder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/Decoder.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/Decoder.h	2014-11-26 21:45:47.000000000 +0000
@@ -7,9 +7,8 @@
 #define MOZILLA_IMAGELIB_DECODER_H_
 
 #include "RasterImage.h"
-#include "imgDecoderObserver.h"
 #include "mozilla/RefPtr.h"
-#include "DecodeStrategy.h"
+#include "DecodePool.h"
 #include "ImageMetadata.h"
 #include "Orientation.h"
 #include "mozilla/Telemetry.h"
@@ -44,6 +43,11 @@
   /**
    * Writes data to the decoder.
    *
+   * If aBuffer is null and aCount is 0, Write() flushes any buffered data to
+   * the decoder. Data is buffered if the decoder wasn't able to completely
+   * decode it because it needed a new frame.  If it's necessary to flush data,
+   * NeedsToFlushData() will return true.
+   *
    * @param aBuffer buffer containing the data to be written
    * @param aCount the number of bytes to write
    *
@@ -58,7 +62,7 @@
    *
    * Notifications Sent: TODO
    */
-  void Finish(RasterImage::eShutdownIntent aShutdownIntent);
+  void Finish(ShutdownReason aReason);
 
   /**
    * Informs the shared decoder that all the data has been written.
@@ -81,6 +85,18 @@
     return invalidRect;
   }
 
+  /**
+   * Gets the progress changes accumulated by the decoder so far, and clears
+   * them. This means that each call to TakeProgress() returns only the changes
+   * accumulated since the last call to TakeProgress().
+   */
+  Progress TakeProgress()
+  {
+    Progress progress = mProgress;
+    mProgress = NoProgress;
+    return progress;
+  }
+
   // We're not COM-y, so we don't get refcounts by default
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Decoder)
 
@@ -98,14 +114,14 @@
     mSizeDecode = aSizeDecode;
   }
 
-  void SetObserver(imgDecoderObserver* aObserver)
-  {
-    MOZ_ASSERT(aObserver);
-    mObserver = aObserver;
-  }
-
   size_t BytesDecoded() const { return mBytesDecoded; }
 
+  // The amount of time we've spent inside Write() so far for this decoder.
+  TimeDuration DecodeTime() const { return mDecodeTime; }
+
+  // The number of times Write() has been called so far for this decoder.
+  uint32_t ChunkCount() const { return mChunkCount; }
+
   // The number of frames we have, including anything in-progress. Thus, this
   // is only 0 if we haven't begun any frames.
   uint32_t GetFrameCount() { return mFrameCount; }
@@ -161,6 +177,11 @@
 
   virtual bool NeedsNewFrame() const { return mNeedsNewFrame; }
 
+  // Returns true if we may have stored data that we need to flush now that we
+  // have a new frame to decode into. Callers can use Write() to actually
+  // flush the data; see the documentation for that method.
+  bool NeedsToFlushData() const { return mNeedsToFlushData; }
+
   // Try to allocate a frame as described in mNewFrameData and return the
   // status code from that attempt. Clears mNewFrameData.
   virtual nsresult AllocateFrame();
@@ -179,7 +200,8 @@
    * only these methods.
    */
   virtual void InitInternal();
-  virtual void WriteInternal(const char* aBuffer, uint32_t aCount, DecodeStrategy aStrategy);
+  virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
+    DecodeStrategy aStrategy);
   virtual void FinishInternal();
 
   /*
@@ -192,6 +214,18 @@
                 int32_t aHeight,
                 Orientation aOrientation = Orientation());
 
+  // Called by decoders if they determine that the image has transparency.
+  //
+  // This should be fired as early as possible to allow observers to do things
+  // that affect content, so it's necessarily pessimistic - if there's a
+  // possibility that the image has transparency, for example because its header
+  // specifies that it has an alpha channel, we fire PostHasTransparency
+  // immediately. PostFrameStop's aFrameAlpha argument, on the other hand, is
+  // only used internally to ImageLib. Because PostFrameStop isn't delivered
+  // until the entire frame has been decoded, decoders may take into account the
+  // actual contents of the frame and give a more accurate result.
+  void PostHasTransparency();
+
   // Called by decoders when they begin a frame. Informs the image, sends
   // notifications, and does internal book-keeping.
   void PostFrameStart();
@@ -230,14 +264,19 @@
    */
   RasterImage &mImage;
   nsRefPtr<imgFrame> mCurrentFrame;
-  RefPtr<imgDecoderObserver> mObserver;
   ImageMetadata mImageMetadata;
+  nsIntRect mInvalidRect; // Tracks an invalidation region in the current frame.
+  Progress mProgress;
 
   uint8_t* mImageData;       // Pointer to image data in either Cairo or 8bit format
   uint32_t mImageDataLength;
   uint32_t* mColormap;       // Current colormap to be used in Cairo format
   uint32_t mColormapSize;
 
+  // Telemetry data for this decoder.
+  TimeDuration mDecodeTime;
+  uint32_t mChunkCount;
+
   uint32_t mDecodeFlags;
   size_t mBytesDecoded;
   bool mDecodeDone;
@@ -246,8 +285,6 @@
 private:
   uint32_t mFrameCount; // Number of frames, including anything in-progress
 
-  nsIntRect mInvalidRect; // Tracks an invalidation region in the current frame.
-
   nsresult mFailCode;
 
   struct NewFrameData
@@ -276,6 +313,7 @@
   };
   NewFrameData mNewFrameData;
   bool mNeedsNewFrame;
+  bool mNeedsToFlushData;
   bool mInitialized;
   bool mSizeDecode;
   bool mInFrame;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DecodeStrategy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DecodeStrategy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DecodeStrategy.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DecodeStrategy.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/** @file
- * An enumeration used by RasterImage and Decoder to specify which 'strategy' to
- * use for image decoding - synchronous or asynchronous.
- */
-
-#ifndef mozilla_imagelib_DecodeStrategy_h_
-#define mozilla_imagelib_DecodeStrategy_h_
-
-namespace mozilla {
-namespace image {
-
-enum DecodeStrategy {
-  // DECODE_SYNC requests a synchronous decode, which will continue decoding
-  // frames as long as it has more source data. It returns to the caller only
-  // once decoding is complete (or until it needs more source data before
-  // continuing). Because DECODE_SYNC can involve allocating new imgFrames, it
-  // can only be run on the main thread.
-  DECODE_SYNC,
-
-  // DECODE_ASYNC requests an asynchronous decode, which will continue decoding
-  // until it either finishes a frame or runs out of source data. Because
-  // DECODE_ASYNC does not allocate new imgFrames, it can be safely run off the
-  // main thread. (And hence workers in the decode pool always use it.)
-  DECODE_ASYNC
-};
-
-} // namespace image
-} // namespace mozilla
-
-#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DynamicImage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DynamicImage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DynamicImage.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DynamicImage.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -30,8 +30,8 @@
   return NS_OK;
 }
 
-already_AddRefed<imgStatusTracker>
-DynamicImage::GetStatusTracker()
+already_AddRefed<ProgressTracker>
+DynamicImage::GetProgressTracker()
 {
   return nullptr;
 }
@@ -228,7 +228,7 @@
 }
 
 NS_IMETHODIMP_(bool)
-DynamicImage::FrameIsOpaque(uint32_t aWhichFrame)
+DynamicImage::IsOpaque()
 {
   // XXX(seth): For performance reasons it'd be better to return true here, but
   // I'm not sure how we can guarantee it for an arbitrary gfxDrawable.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DynamicImage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DynamicImage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/DynamicImage.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/DynamicImage.h	2014-11-26 21:45:47.000000000 +0000
@@ -34,7 +34,7 @@
   // Inherited methods from Image.
   virtual nsresult Init(const char* aMimeType, uint32_t aFlags) MOZ_OVERRIDE;
 
-  virtual already_AddRefed<imgStatusTracker> GetStatusTracker() MOZ_OVERRIDE;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() MOZ_OVERRIDE;
   virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;
 
   virtual uint32_t SizeOfData() MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/FrozenImage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/FrozenImage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/FrozenImage.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/FrozenImage.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -50,12 +50,6 @@
   return InnerImage()->GetFrame(FRAME_FIRST, aFlags);
 }
 
-NS_IMETHODIMP_(bool)
-FrozenImage::FrameIsOpaque(uint32_t aWhichFrame)
-{
-  return InnerImage()->FrameIsOpaque(FRAME_FIRST);
-}
-
 NS_IMETHODIMP
 FrozenImage::GetImageContainer(layers::LayerManager* aManager,
                                layers::ImageContainer** _retval)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/FrozenImage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/FrozenImage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/FrozenImage.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/FrozenImage.h	2014-11-26 21:45:47.000000000 +0000
@@ -38,7 +38,6 @@
   NS_IMETHOD GetAnimated(bool* aAnimated) MOZ_OVERRIDE;
   NS_IMETHOD_(TemporaryRef<SourceSurface>)
     GetFrame(uint32_t aWhichFrame, uint32_t aFlags) MOZ_OVERRIDE;
-  NS_IMETHOD_(bool) FrameIsOpaque(uint32_t aWhichFrame) MOZ_OVERRIDE;
   NS_IMETHOD GetImageContainer(layers::LayerManager* aManager,
                                layers::ImageContainer** _retval) MOZ_OVERRIDE;
   NS_IMETHOD Draw(gfxContext* aContext,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageFactory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageFactory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageFactory.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageFactory.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -96,7 +96,7 @@
 
 /* static */ already_AddRefed<Image>
 ImageFactory::CreateImage(nsIRequest* aRequest,
-                          imgStatusTracker* aStatusTracker,
+                          ProgressTracker* aProgressTracker,
                           const nsCString& aMimeType,
                           ImageURL* aURI,
                           bool aIsMultiPart,
@@ -110,10 +110,10 @@
 
   // Select the type of image to create based on MIME type.
   if (aMimeType.EqualsLiteral(IMAGE_SVG_XML)) {
-    return CreateVectorImage(aRequest, aStatusTracker, aMimeType,
+    return CreateVectorImage(aRequest, aProgressTracker, aMimeType,
                              aURI, imageFlags, aInnerWindowId);
   } else {
-    return CreateRasterImage(aRequest, aStatusTracker, aMimeType,
+    return CreateRasterImage(aRequest, aProgressTracker, aMimeType,
                              aURI, imageFlags, aInnerWindowId);
   }
 }
@@ -185,7 +185,7 @@
 
 /* static */ already_AddRefed<Image>
 ImageFactory::CreateRasterImage(nsIRequest* aRequest,
-                                imgStatusTracker* aStatusTracker,
+                                ProgressTracker* aProgressTracker,
                                 const nsCString& aMimeType,
                                 ImageURL* aURI,
                                 uint32_t aImageFlags,
@@ -193,7 +193,7 @@
 {
   nsresult rv;
 
-  nsRefPtr<RasterImage> newImage = new RasterImage(aStatusTracker, aURI);
+  nsRefPtr<RasterImage> newImage = new RasterImage(aProgressTracker, aURI);
 
   rv = newImage->Init(aMimeType.get(), aImageFlags);
   NS_ENSURE_SUCCESS(rv, BadImage(newImage));
@@ -246,7 +246,7 @@
 
 /* static */ already_AddRefed<Image>
 ImageFactory::CreateVectorImage(nsIRequest* aRequest,
-                                imgStatusTracker* aStatusTracker,
+                                ProgressTracker* aProgressTracker,
                                 const nsCString& aMimeType,
                                 ImageURL* aURI,
                                 uint32_t aImageFlags,
@@ -254,7 +254,7 @@
 {
   nsresult rv;
 
-  nsRefPtr<VectorImage> newImage = new VectorImage(aStatusTracker, aURI);
+  nsRefPtr<VectorImage> newImage = new VectorImage(aProgressTracker, aURI);
 
   rv = newImage->Init(aMimeType.get(), aImageFlags);
   NS_ENSURE_SUCCESS(rv, BadImage(newImage));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageFactory.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageFactory.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageFactory.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageFactory.h	2014-11-26 21:45:47.000000000 +0000
@@ -12,13 +12,13 @@
 
 class nsCString;
 class nsIRequest;
-class imgStatusTracker;
 
 namespace mozilla {
 namespace image {
 
 class Image;
 class ImageURL;
+class ProgressTracker;
 
 class ImageFactory
 {
@@ -40,15 +40,15 @@
    * Creates a new image with the given properties.
    * Can be called on or off the main thread.
    *
-   * @param aRequest       The associated request.
-   * @param aStatusTracker A status tracker for the image to use.
-   * @param aMimeType      The mimetype of the image.
-   * @param aURI           The URI of the image.
-   * @param aIsMultiPart   Whether the image is part of a multipart request.
-   * @param aInnerWindowId The window this image belongs to.
+   * @param aRequest         The associated request.
+   * @param aProgressTracker A status tracker for the image to use.
+   * @param aMimeType        The mimetype of the image.
+   * @param aURI             The URI of the image.
+   * @param aIsMultiPart     Whether the image is part of a multipart request.
+   * @param aInnerWindowId   The window this image belongs to.
    */
   static already_AddRefed<Image> CreateImage(nsIRequest* aRequest,
-                                             imgStatusTracker* aStatusTracker,
+                                             ProgressTracker* aProgressTracker,
                                              const nsCString& aMimeType,
                                              ImageURL* aURI,
                                              bool aIsMultiPart,
@@ -64,14 +64,14 @@
 private:
   // Factory functions that create specific types of image containers.
   static already_AddRefed<Image> CreateRasterImage(nsIRequest* aRequest,
-                                                   imgStatusTracker* aStatusTracker,
+                                                   ProgressTracker* aProgressTracker,
                                                    const nsCString& aMimeType,
                                                    ImageURL* aURI,
                                                    uint32_t aImageFlags,
                                                    uint32_t aInnerWindowId);
 
   static already_AddRefed<Image> CreateVectorImage(nsIRequest* aRequest,
-                                                   imgStatusTracker* aStatusTracker,
+                                                   ProgressTracker* aProgressTracker,
                                                    const nsCString& aMimeType,
                                                    ImageURL* aURI,
                                                    uint32_t aImageFlags,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/Image.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/Image.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/Image.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/Image.h	2014-11-26 21:45:47.000000000 +0000
@@ -8,7 +8,7 @@
 
 #include "mozilla/MemoryReporting.h"
 #include "imgIContainer.h"
-#include "imgStatusTracker.h"
+#include "ProgressTracker.h"
 #include "ImageURL.h"
 #include "nsStringFwd.h"
 
@@ -63,8 +63,8 @@
   virtual nsresult Init(const char* aMimeType,
                         uint32_t aFlags) = 0;
 
-  virtual already_AddRefed<imgStatusTracker> GetStatusTracker() = 0;
-  virtual void SetStatusTracker(imgStatusTracker* aStatusTracker) {}
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() = 0;
+  virtual void SetProgressTracker(ProgressTracker* aProgressTracker) {}
 
   /**
    * The rectangle defining the location and size of the given frame.
@@ -146,15 +146,15 @@
 class ImageResource : public Image
 {
 public:
-  already_AddRefed<imgStatusTracker> GetStatusTracker() MOZ_OVERRIDE {
-    nsRefPtr<imgStatusTracker> statusTracker = mStatusTracker;
-    MOZ_ASSERT(statusTracker);
-    return statusTracker.forget();
+  already_AddRefed<ProgressTracker> GetProgressTracker() MOZ_OVERRIDE {
+    nsRefPtr<ProgressTracker> progressTracker = mProgressTracker;
+    MOZ_ASSERT(progressTracker);
+    return progressTracker.forget();
   }
-  void SetStatusTracker(imgStatusTracker* aStatusTracker) MOZ_OVERRIDE MOZ_FINAL {
-    MOZ_ASSERT(aStatusTracker);
-    MOZ_ASSERT(!mStatusTracker);
-    mStatusTracker = aStatusTracker;
+  void SetProgressTracker(ProgressTracker* aProgressTracker) MOZ_OVERRIDE MOZ_FINAL {
+    MOZ_ASSERT(aProgressTracker);
+    MOZ_ASSERT(!mProgressTracker);
+    mProgressTracker = aProgressTracker;
   }
   virtual uint32_t SizeOfData() MOZ_OVERRIDE;
 
@@ -215,7 +215,7 @@
   virtual nsresult StopAnimation() = 0;
 
   // Member data shared by all implementations of this abstract class
-  nsRefPtr<imgStatusTracker>    mStatusTracker;
+  nsRefPtr<ProgressTracker>     mProgressTracker;
   nsRefPtr<ImageURL>            mURI;
   TimeStamp                     mLastRefreshTime;
   uint64_t                      mInnerWindowId;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageWrapper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageWrapper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageWrapper.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageWrapper.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -27,10 +27,10 @@
   return mInnerImage->Init(aMimeType, aFlags);
 }
 
-already_AddRefed<imgStatusTracker>
-ImageWrapper::GetStatusTracker()
+already_AddRefed<ProgressTracker>
+ImageWrapper::GetProgressTracker()
 {
-  return mInnerImage->GetStatusTracker();
+  return mInnerImage->GetProgressTracker();
 }
 
 nsIntRect
@@ -209,9 +209,9 @@
 }
 
 NS_IMETHODIMP_(bool)
-ImageWrapper::FrameIsOpaque(uint32_t aWhichFrame)
+ImageWrapper::IsOpaque()
 {
-  return mInnerImage->FrameIsOpaque(aWhichFrame);
+  return mInnerImage->IsOpaque();
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageWrapper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageWrapper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ImageWrapper.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ImageWrapper.h	2014-11-26 21:45:47.000000000 +0000
@@ -24,7 +24,7 @@
   // Inherited methods from Image.
   virtual nsresult Init(const char* aMimeType, uint32_t aFlags) MOZ_OVERRIDE;
 
-  virtual already_AddRefed<imgStatusTracker> GetStatusTracker() MOZ_OVERRIDE;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() MOZ_OVERRIDE;
   virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;
 
   virtual uint32_t SizeOfData() MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgDecoderObserver.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgDecoderObserver.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgDecoderObserver.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgDecoderObserver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef MOZILLA_IMAGELIB_IMGDECODEROBSERVER_H_
-#define MOZILLA_IMAGELIB_IMGDECODEROBSERVER_H_
-
-#include "nsRect.h"
-#include "mozilla/WeakPtr.h"
-
-struct nsIntRect;
-
-/**
- * imgDecoderObserver interface
- *
- * This interface is used to observe Decoder objects.
- *
- * We make the distinction here between "load" and "decode" notifications. Load
- * notifications are fired as the image is loaded from the network or
- * filesystem. Decode notifications are fired as the image is decoded. If an
- * image is decoded on load and not visibly discarded, decode notifications are
- * nested logically inside load notifications as one might expect. However, with
- * decode-on-draw, the set of decode notifications can come completely _after_
- * the load notifications, and can come multiple times if the image is
- * discardable. Moreover, they can be interleaved in various ways. In general,
- * any presumed ordering between load and decode notifications should not be
- * relied upon.
- *
- * Decode notifications may or may not be synchronous, depending on the
- * situation. If imgIDecoder::FLAG_SYNC_DECODE is passed to a function that
- * triggers a decode, all notifications that can be generated from the currently
- * loaded data fire before the call returns. If FLAG_SYNC_DECODE is not passed,
- * all, some, or none of the notifications may fire before the call returns.
- */
-class imgDecoderObserver
-{
-public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(imgDecoderObserver);
-
-  /**
-   * Load notification.
-   *
-   * called at the same time that nsIRequestObserver::onStartRequest would be
-   * (used only for observers of imgIRequest objects, which are nsIRequests,
-   * not imgIDecoder objects)
-   */
-  virtual void OnStartRequest() = 0;
-
-  /**
-   * Decode notification.
-   *
-   * Called as soon as the image begins getting decoded. This does not include
-   * "header-only" decodes used by decode-on-draw to parse the width/height
-   * out of the image. Thus, it is a decode notification only.
-   */
-  virtual void OnStartDecode() = 0;
-
-  /**
-   * Load notification.
-   *
-   * Called once enough data has been loaded from the network that we were able
-   * to parse the width/height from the image. By the time this callback is been
-   * called, the size has been set on the container and STATUS_SIZE_AVAILABLE
-   * has been set on the associated imgRequest.
-   */
-  virtual void OnStartContainer() = 0;
-
-  /**
-   * Decode notification.
-   *
-   * called when a frame is finished decoding.
-   */
-  virtual void OnStopFrame() = 0;
-
-  /**
-   * Notification for when an image is known to be animated. This should be
-   * fired at the earliest possible time.
-   */
-  virtual void OnImageIsAnimated() = 0;
-
-  /**
-   * Decode notification.
-   *
-   * Called when all decoding has terminated.
-   */
-  virtual void OnStopDecode(nsresult status) = 0;
-
-  /**
-   * Load notification.
-   *
-   * called at the same time that nsIRequestObserver::onStopRequest would be
-   * (used only for observers of imgIRequest objects, which are nsIRequests,
-   * not imgIDecoder objects)
-   */
-  virtual void OnStopRequest(bool aIsLastPart, nsresult aStatus) = 0;
-
-  /**
-   * Called when we are asked to Draw an image that is not locked.
-   */
-  virtual void OnUnlockedDraw() = 0;
-
-  /**
-   * Called when an image is realized to be in error state.
-   */
-  virtual void OnError() = 0;
-
-protected:
-  virtual ~imgDecoderObserver() = 0;
-};
-
-// We must define a destructor because derived classes call our destructor from
-// theirs.  Pure virtual destructors only requires that child classes implement
-// a virtual destructor, not that we can't have one too!
-inline imgDecoderObserver::~imgDecoderObserver()
-{}
-
-#endif // MOZILLA_IMAGELIB_IMGDECODEROBSERVER_H
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgFrame.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgFrame.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -584,12 +584,6 @@
   return mFormat;
 }
 
-bool imgFrame::GetNeedsBackground() const
-{
-  // We need a background painted if we have alpha or we're incomplete.
-  return (mFormat == SurfaceFormat::B8G8R8A8 || !ImageComplete());
-}
-
 uint32_t imgFrame::GetImageBytesPerRow() const
 {
   if (mVBuf)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgFrame.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgFrame.h	2014-11-26 21:45:47.000000000 +0000
@@ -88,7 +88,6 @@
   bool NeedsPadding() const { return mOffset != nsIntPoint(0, 0); }
   int32_t GetStride() const;
   SurfaceFormat GetFormat() const;
-  bool GetNeedsBackground() const;
   uint32_t GetImageBytesPerRow() const;
   uint32_t GetImageDataLength() const;
   bool GetIsPaletted() const;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgLoader.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgLoader.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -48,6 +48,7 @@
 
 using namespace mozilla;
 using namespace mozilla::image;
+using namespace mozilla::net;
 
 MOZ_DEFINE_MALLOC_SIZE_OF(ImagesMallocSizeOf)
 
@@ -590,11 +591,18 @@
 
 // Returns true if this request is compatible with the given CORS mode on the
 // given loading principal, and false if the request may not be reused due
-// to CORS.
+// to CORS.  Also checks the Referrer Policy, since requests with different
+// referrers/policies may generate different responses.
 static bool
-ValidateCORSAndPrincipal(imgRequest* request, bool forcePrincipalCheck,
-                         int32_t corsmode, nsIPrincipal* loadingPrincipal)
+ValidateSecurityInfo(imgRequest* request, bool forcePrincipalCheck,
+                     int32_t corsmode, nsIPrincipal* loadingPrincipal,
+                     ReferrerPolicy referrerPolicy)
 {
+  // If the entry's Referrer Policy doesn't match, we can't use this request.
+  if (referrerPolicy != request->GetReferrerPolicy()) {
+    return false;
+  }
+
   // If the entry's CORS mode doesn't match, or the CORS mode matches but the
   // document principal isn't the same, we can't use this request.
   if (request->GetCORSMode() != corsmode) {
@@ -632,6 +640,7 @@
                                 nsIURI *aURI,
                                 nsIURI *aInitialDocumentURI,
                                 nsIURI *aReferringURI,
+                                ReferrerPolicy aReferrerPolicy,
                                 nsILoadGroup *aLoadGroup,
                                 const nsCString& aAcceptHeader,
                                 nsLoadFlags aLoadFlags,
@@ -663,18 +672,18 @@
   //
   aLoadFlags |= nsIChannel::LOAD_CLASSIFY_URI;
 
-  nsCOMPtr<nsIPrincipal> requestingPrincipal = aLoadingPrincipal;
+  nsCOMPtr<nsIPrincipal> triggeringPrincipal = aLoadingPrincipal;
   bool isSandBoxed = false;
   // only inherit if we have a principal
   bool inherit = false;
-  if (requestingPrincipal) {
-    inherit = nsContentUtils::ChannelShouldInheritPrincipal(requestingPrincipal,
+  if (triggeringPrincipal) {
+    inherit = nsContentUtils::ChannelShouldInheritPrincipal(triggeringPrincipal,
                                                             aURI,
                                                             false,  // aInheritForAboutBlank
                                                             false); // aForceInherit
   }
   else {
-    requestingPrincipal = nsContentUtils::GetSystemPrincipal();
+    triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
   }
   nsCOMPtr<nsINode> requestingNode = do_QueryInterface(aRequestingContext);
   nsSecurityFlags securityFlags = nsILoadInfo::SEC_NORMAL;
@@ -682,19 +691,36 @@
     securityFlags |= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
   }
 
-  // Note we are calling NS_NewChannelInternal() here with a node and a principal.
-  // This is for things like background images that are specified by user
-  // stylesheets, where the document is being styled, but the principal is that
-  // of the user stylesheet.
-  rv = NS_NewChannelInternal(aResult,
-                             aURI,
-                             requestingNode,
-                             requestingPrincipal,
-                             securityFlags,
-                             aPolicyType,
-                             nullptr,   // loadGroup
-                             callbacks,
-                             aLoadFlags);
+  // Note we are calling NS_NewChannelWithTriggeringPrincipal() here with a node
+  // and a principal. This is for things like background images that are specified
+  // by user stylesheets, where the document is being styled, but the principal
+  // is that of the user stylesheet.
+  if (requestingNode) {
+    rv = NS_NewChannelWithTriggeringPrincipal(aResult,
+                                              aURI,
+                                              requestingNode,
+                                              triggeringPrincipal,
+                                              securityFlags,
+                                              nsIContentPolicy::TYPE_IMAGE,
+                                              nullptr,   // loadGroup
+                                              callbacks,
+                                              aLoadFlags);
+  }
+  else {
+    // either we are loading something inside a document, in which case
+    // we should always have a requestingNode, or we are loading something
+    // outside a document, in which case the triggeringPrincipal
+    // should always be the systemPrincipal.
+    MOZ_ASSERT(nsContentUtils::IsSystemPrincipal(triggeringPrincipal));
+    rv = NS_NewChannel(aResult,
+                       aURI,
+                       triggeringPrincipal,
+                       securityFlags,
+                       nsIContentPolicy::TYPE_IMAGE,
+                       nullptr,   // loadGroup
+                       callbacks,
+                       aLoadFlags);
+  }
 
   if (NS_FAILED(rv))
     return rv;
@@ -711,7 +737,7 @@
     nsCOMPtr<nsIHttpChannelInternal> httpChannelInternal = do_QueryInterface(newHttpChannel);
     NS_ENSURE_TRUE(httpChannelInternal, NS_ERROR_UNEXPECTED);
     httpChannelInternal->SetDocumentURI(aInitialDocumentURI);
-    newHttpChannel->SetReferrer(aReferringURI);
+    newHttpChannel->SetReferrerWithPolicy(aReferringURI, aReferrerPolicy);
   }
 
   // Image channels are loaded by default with reduced priority.
@@ -1440,6 +1466,7 @@
                                                 nsIURI *aURI,
                                                 nsIURI *aInitialDocumentURI,
                                                 nsIURI *aReferrerURI,
+                                                ReferrerPolicy aReferrerPolicy,
                                                 nsILoadGroup *aLoadGroup,
                                                 imgINotificationObserver *aObserver,
                                                 nsISupports *aCX,
@@ -1490,6 +1517,7 @@
                          aURI,
                          aInitialDocumentURI,
                          aReferrerURI,
+                         aReferrerPolicy,
                          aLoadGroup,
                          mAcceptHeader,
                          aLoadFlags,
@@ -1567,6 +1595,7 @@
                                 nsIURI *aURI,
                                 nsIURI *aInitialDocumentURI,
                                 nsIURI *aReferrerURI,
+                                ReferrerPolicy aReferrerPolicy,
                                 nsILoadGroup *aLoadGroup,
                                 imgINotificationObserver *aObserver,
                                 nsISupports *aCX,
@@ -1612,8 +1641,9 @@
   if (!request)
     return false;
 
-  if (!ValidateCORSAndPrincipal(request, aEntry->ForcePrincipalCheck(),
-                                aCORSMode, aLoadingPrincipal))
+  if (!ValidateSecurityInfo(request, aEntry->ForcePrincipalCheck(),
+                            aCORSMode, aLoadingPrincipal,
+                            aReferrerPolicy))
     return false;
 
   // data URIs are immutable and by their nature can't leak data, so we can
@@ -1682,7 +1712,8 @@
     LOG_SCOPE(GetImgLog(), "imgLoader::ValidateRequest |cache hit| must validate");
 
     return ValidateRequestWithNewChannel(request, aURI, aInitialDocumentURI,
-                                         aReferrerURI, aLoadGroup, aObserver,
+                                         aReferrerURI, aReferrerPolicy,
+                                         aLoadGroup, aObserver,
                                          aCX, aLoadFlags, aLoadPolicyType,
                                          aProxyRequest, aLoadingPrincipal,
                                          aCORSMode);
@@ -1853,6 +1884,7 @@
 NS_IMETHODIMP imgLoader::LoadImageXPCOM(nsIURI *aURI,
                                    nsIURI *aInitialDocumentURI,
                                    nsIURI *aReferrerURI,
+                                   const nsAString& aReferrerPolicy,
                                    nsIPrincipal* aLoadingPrincipal,
                                    nsILoadGroup *aLoadGroup,
                                    imgINotificationObserver *aObserver,
@@ -1867,20 +1899,22 @@
       aContentPolicyType = nsIContentPolicy::TYPE_IMAGE;
     }
     imgRequestProxy *proxy;
-    nsresult result = LoadImage(aURI,
-                                aInitialDocumentURI,
-                                aReferrerURI,
-                                aLoadingPrincipal,
-                                aLoadGroup,
-                                aObserver,
-                                aCX,
-                                aLoadFlags,
-                                aCacheKey,
-                                aContentPolicyType,
-                                EmptyString(),
-                                &proxy);
+    ReferrerPolicy refpol = ReferrerPolicyFromString(aReferrerPolicy);
+    nsresult rv = LoadImage(aURI,
+                            aInitialDocumentURI,
+                            aReferrerURI,
+                            refpol,
+                            aLoadingPrincipal,
+                            aLoadGroup,
+                            aObserver,
+                            aCX,
+                            aLoadFlags,
+                            aCacheKey,
+                            aContentPolicyType,
+                            EmptyString(),
+                            &proxy);
     *_retval = proxy;
-    return result;
+    return rv;
 }
 
 // imgIRequest loadImage(in nsIURI aURI,
@@ -1895,6 +1929,7 @@
 nsresult imgLoader::LoadImage(nsIURI *aURI,
                               nsIURI *aInitialDocumentURI,
                               nsIURI *aReferrerURI,
+                              ReferrerPolicy aReferrerPolicy,
                               nsIPrincipal* aLoadingPrincipal,
                               nsILoadGroup *aLoadGroup,
                               imgINotificationObserver *aObserver,
@@ -1980,8 +2015,8 @@
 
   if (cache.Get(spec, getter_AddRefs(entry)) && entry) {
     if (ValidateEntry(entry, aURI, aInitialDocumentURI, aReferrerURI,
-                      aLoadGroup, aObserver, aCX, requestFlags,
-                      aContentPolicyType, true, _retval,
+                      aReferrerPolicy, aLoadGroup, aObserver, aCX,
+                      requestFlags, aContentPolicyType, true, _retval,
                       aLoadingPrincipal, corsmode)) {
       request = entry->GetRequest();
 
@@ -2021,6 +2056,7 @@
                          aURI,
                          aInitialDocumentURI,
                          aReferrerURI,
+                         aReferrerPolicy,
                          aLoadGroup,
                          mAcceptHeader,
                          requestFlags,
@@ -2040,7 +2076,7 @@
     nsCOMPtr<nsILoadGroup> channelLoadGroup;
     newChannel->GetLoadGroup(getter_AddRefs(channelLoadGroup));
     request->Init(aURI, aURI, channelLoadGroup, newChannel, entry, aCX,
-                  aLoadingPrincipal, corsmode);
+                  aLoadingPrincipal, corsmode, aReferrerPolicy);
 
     // Add the initiator type for this image load
     nsCOMPtr<nsITimedChannel> timedChannel = do_QueryInterface(newChannel);
@@ -2210,8 +2246,8 @@
       //
       // Since aCanMakeNewChannel == false, we don't need to pass content policy
       // type/principal/etc
-      if (ValidateEntry(entry, uri, nullptr, nullptr, nullptr,
-                        aObserver, aCX, requestFlags,
+      if (ValidateEntry(entry, uri, nullptr, nullptr, RP_Default,
+                        nullptr, aObserver, aCX, requestFlags,
                         nsIContentPolicy::TYPE_INVALID, false, nullptr,
                         nullptr, imgIRequest::CORS_NONE)) {
         request = entry->GetRequest();
@@ -2274,7 +2310,7 @@
 
     // No principal specified here, because we're not passed one.
     request->Init(originalURI, uri, channel, channel, entry,
-                  aCX, nullptr, imgIRequest::CORS_NONE);
+                  aCX, nullptr, imgIRequest::CORS_NONE, RP_Default);
 
     ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request.get()));
     NS_ADDREF(pl);
@@ -2595,6 +2631,7 @@
 #endif
 
   int32_t corsmode = mRequest->GetCORSMode();
+  ReferrerPolicy refpol = mRequest->GetReferrerPolicy();
   nsCOMPtr<nsIPrincipal> loadingPrincipal = mRequest->GetLoadingPrincipal();
 
   // Doom the old request's cache entry
@@ -2608,7 +2645,7 @@
   channel->GetOriginalURI(getter_AddRefs(originalURI));
   mNewRequest->Init(originalURI, uri, aRequest, channel, mNewEntry,
                     mContext, loadingPrincipal,
-                    corsmode);
+                    corsmode, refpol);
 
   mDestListener = new ProxyListener(mNewRequest);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgLoader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgLoader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgLoader.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgLoader.h	2014-11-26 21:45:47.000000000 +0000
@@ -22,6 +22,7 @@
 #include "nsIChannel.h"
 #include "nsIThreadRetargetableStreamListener.h"
 #include "imgIRequest.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class imgLoader;
 class imgRequestProxy;
@@ -149,7 +150,7 @@
   void SetHasNoProxies(bool hasNoProxies);
 
   // Private, unimplemented copy constructor.
-  imgCacheEntry(const imgCacheEntry &);
+  imgCacheEntry(const imgCacheEntry&);
 
 private: // data
   nsAutoRefCnt mRefCnt;
@@ -217,6 +218,7 @@
   typedef mozilla::image::ImageURL ImageURL;
   typedef nsRefPtrHashtable<nsCStringHashKey, imgCacheEntry> imgCacheTable;
   typedef nsTHashtable<nsPtrHashKey<imgRequest>> imgSet;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
   typedef mozilla::Mutex Mutex;
 
   NS_DECL_ISUPPORTS
@@ -251,6 +253,7 @@
   nsresult LoadImage(nsIURI *aURI,
                      nsIURI *aInitialDocumentURI,
                      nsIURI *aReferrerURI,
+                     ReferrerPolicy aReferrerPolicy,
                      nsIPrincipal* aLoadingPrincipal,
                      nsILoadGroup *aLoadGroup,
                      imgINotificationObserver *aObserver,
@@ -336,6 +339,7 @@
 
   bool ValidateEntry(imgCacheEntry *aEntry, nsIURI *aKey,
                        nsIURI *aInitialDocumentURI, nsIURI *aReferrerURI,
+                       ReferrerPolicy aReferrerPolicy,
                        nsILoadGroup *aLoadGroup,
                        imgINotificationObserver *aObserver, nsISupports *aCX,
                        nsLoadFlags aLoadFlags,
@@ -348,6 +352,7 @@
   bool ValidateRequestWithNewChannel(imgRequest *request, nsIURI *aURI,
                                        nsIURI *aInitialDocumentURI,
                                        nsIURI *aReferrerURI,
+                                       ReferrerPolicy aReferrerPolicy,
                                        nsILoadGroup *aLoadGroup,
                                        imgINotificationObserver *aObserver,
                                        nsISupports *aCX, nsLoadFlags aLoadFlags,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequest.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequest.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "imgLoader.h"
 #include "imgRequestProxy.h"
-#include "imgStatusTracker.h"
+#include "ProgressTracker.h"
 #include "ImageFactory.h"
 #include "Image.h"
 #include "RasterImage.h"
@@ -62,10 +62,11 @@
 
 imgRequest::imgRequest(imgLoader* aLoader)
  : mLoader(aLoader)
- , mStatusTracker(new imgStatusTracker(nullptr))
+ , mProgressTracker(new ProgressTracker(nullptr))
  , mValidator(nullptr)
  , mInnerWindowId(0)
  , mCORSMode(imgIRequest::CORS_NONE)
+ , mReferrerPolicy(mozilla::net::RP_Default)
  , mImageErrorCode(NS_OK)
  , mDecodeRequested(false)
  , mIsMultiPartChannel(false)
@@ -94,7 +95,8 @@
                           imgCacheEntry *aCacheEntry,
                           void *aLoadId,
                           nsIPrincipal* aLoadingPrincipal,
-                          int32_t aCORSMode)
+                          int32_t aCORSMode,
+                          ReferrerPolicy aReferrerPolicy)
 {
   MOZ_ASSERT(NS_IsMainThread(), "Cannot use nsIURI off main thread!");
 
@@ -117,6 +119,7 @@
 
   mLoadingPrincipal = aLoadingPrincipal;
   mCORSMode = aCORSMode;
+  mReferrerPolicy = aReferrerPolicy;
 
   mChannel->GetNotificationCallbacks(getter_AddRefs(mPrevChannelSink));
 
@@ -136,19 +139,19 @@
   mLoader = nullptr;
 }
 
-already_AddRefed<imgStatusTracker>
-imgRequest::GetStatusTracker()
+already_AddRefed<ProgressTracker>
+imgRequest::GetProgressTracker()
 {
   if (mImage && mGotData) {
-    NS_ABORT_IF_FALSE(!mStatusTracker,
-                      "Should have given mStatusTracker to mImage");
-    return mImage->GetStatusTracker();
+    NS_ABORT_IF_FALSE(!mProgressTracker,
+                      "Should have given mProgressTracker to mImage");
+    return mImage->GetProgressTracker();
   } else {
-    NS_ABORT_IF_FALSE(mStatusTracker,
-                      "Should have mStatusTracker until we create mImage");
-    nsRefPtr<imgStatusTracker> statusTracker = mStatusTracker;
-    MOZ_ASSERT(statusTracker);
-    return statusTracker.forget();
+    NS_ABORT_IF_FALSE(mProgressTracker,
+                      "Should have mProgressTracker until we create mImage");
+    nsRefPtr<ProgressTracker> progressTracker = mProgressTracker;
+    MOZ_ASSERT(progressTracker);
+    return progressTracker.forget();
   }
 }
 
@@ -176,15 +179,15 @@
 
   // If we're empty before adding, we have to tell the loader we now have
   // proxies.
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  if (statusTracker->ConsumerCount() == 0) {
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (progressTracker->ConsumerCount() == 0) {
     NS_ABORT_IF_FALSE(mURI, "Trying to SetHasProxies without key uri.");
     if (mLoader) {
       mLoader->SetHasProxies(this);
     }
   }
 
-  statusTracker->AddConsumer(proxy);
+  progressTracker->AddConsumer(proxy);
 }
 
 nsresult imgRequest::RemoveProxy(imgRequestProxy *proxy, nsresult aStatus)
@@ -200,11 +203,11 @@
   // below, because Cancel() may result in OnStopRequest being called back
   // before Cancel() returns, leaving the image in a different state then the
   // one it was in at this point.
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  if (!statusTracker->RemoveConsumer(proxy, aStatus))
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (!progressTracker->RemoveConsumer(proxy, aStatus))
     return NS_OK;
 
-  if (statusTracker->ConsumerCount() == 0) {
+  if (progressTracker->ConsumerCount() == 0) {
     // If we have no observers, there's nothing holding us alive. If we haven't
     // been cancelled and thus removed from the cache, tell the image loader so
     // we can be evicted from the cache.
@@ -228,7 +231,7 @@
        This way, if a proxy is destroyed without calling cancel on it, it won't leak
        and won't leave a bad pointer in the observer list.
      */
-    if (statusTracker->IsLoading() && NS_FAILED(aStatus)) {
+    if (progressTracker->IsLoading() && NS_FAILED(aStatus)) {
       LOG_MSG(GetImgLog(), "imgRequest::RemoveProxy", "load in progress.  canceling");
 
       this->Cancel(NS_BINDING_ABORTED);
@@ -286,15 +289,8 @@
 void imgRequest::Cancel(nsresult aStatus)
 {
   /* The Cancel() method here should only be called by this class. */
-
   LOG_SCOPE(GetImgLog(), "imgRequest::Cancel");
 
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-
-  statusTracker->MaybeUnblockOnload();
-
-  statusTracker->RecordCancel();
-
   if (NS_IsMainThread()) {
     ContinueCancel(aStatus);
   } else {
@@ -306,10 +302,12 @@
 {
   MOZ_ASSERT(NS_IsMainThread());
 
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  progressTracker->SyncNotifyProgress(FLAG_HAS_ERROR | FLAG_ONLOAD_UNBLOCKED);
+
   RemoveFromCache();
 
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  if (mRequest && statusTracker->IsLoading()) {
+  if (mRequest && progressTracker->IsLoading()) {
      mRequest->Cancel(aStatus);
   }
 }
@@ -418,8 +416,8 @@
 
 bool imgRequest::HasConsumers()
 {
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  return statusTracker && statusTracker->ConsumerCount() > 0;
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  return progressTracker && progressTracker->ConsumerCount() > 0;
 }
 
 int32_t imgRequest::Priority() const
@@ -440,8 +438,8 @@
   // concern though is that image loads remain lower priority than other pieces
   // of content such as link clicks, CSS, and JS.
   //
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  if (!statusTracker->FirstConsumerIs(proxy))
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (!progressTracker->FirstConsumerIs(proxy))
     return;
 
   nsCOMPtr<nsISupportsPriority> p = do_QueryInterface(mChannel);
@@ -635,10 +633,10 @@
 
   // Figure out if we're multipart
   nsCOMPtr<nsIMultiPartChannel> mpchan(do_QueryInterface(aRequest));
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
   if (mpchan) {
     mIsMultiPartChannel = true;
-    statusTracker->SetIsMultipart();
+    progressTracker->SetIsMultipart();
   } else {
     NS_ABORT_IF_FALSE(!mIsMultiPartChannel, "Something went wrong");
   }
@@ -675,9 +673,9 @@
     mRequest = chan;
   }
 
-  // Note: refreshing statusTracker in case OnNewSourceData changed it.
-  statusTracker = GetStatusTracker();
-  statusTracker->OnStartRequest();
+  // Note: refreshing progressTracker in case OnNewSourceData changed it.
+  progressTracker = GetProgressTracker();
+  progressTracker->ResetForNewRequest();
 
   nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
   if (channel)
@@ -701,7 +699,7 @@
   mApplicationCache = GetApplicationCache(aRequest);
 
   // Shouldn't we be dead already if this gets hit?  Probably multipart/x-mixed-replace...
-  if (statusTracker->ConsumerCount() == 0) {
+  if (progressTracker->ConsumerCount() == 0) {
     this->Cancel(NS_IMAGELIB_ERROR_FAILURE);
   }
 
@@ -732,6 +730,7 @@
 NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, nsresult status)
 {
   LOG_FUNC(GetImgLog(), "imgRequest::OnStopRequest");
+  MOZ_ASSERT(NS_IsMainThread(), "Can't send notifications off-main-thread");
 
   // XXXldb What if this is a non-last part of a multipart request?
   // xxx before we release our reference to mRequest, lets
@@ -793,10 +792,13 @@
   }
 
   if (!mImage) {
-    // We have to fire imgStatusTracker::OnStopRequest ourselves because there's
+    // We have to fire the OnStopRequest notifications ourselves because there's
     // no image capable of doing so.
-    nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-    statusTracker->OnStopRequest(lastPart, status);
+    Progress progress =
+      LoadCompleteProgress(lastPart, /* aError = */ false, status);
+
+    nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+    progressTracker->SyncNotifyProgress(progress);
   }
 
   mTimedChannel = nullptr;
@@ -890,12 +892,16 @@
       // new status tracker to give to the image, because we don't have one of
       // our own any more.
       if (resniffMimeType) {
-        NS_ABORT_IF_FALSE(mIsMultiPartChannel, "Resniffing a non-multipart image");
+        MOZ_ASSERT(mIsMultiPartChannel, "Resniffing a non-multipart image");
 
-        nsRefPtr<imgStatusTracker> freshTracker = new imgStatusTracker(nullptr);
-        nsRefPtr<imgStatusTracker> oldStatusTracker = GetStatusTracker();
-        freshTracker->AdoptConsumers(oldStatusTracker);
-        mStatusTracker = freshTracker.forget();
+        // Initialize a new status tracker.
+        nsRefPtr<ProgressTracker> freshTracker = new ProgressTracker(nullptr);
+        freshTracker->SetIsMultipart();
+
+        // Replace the old status tracker with it.
+        nsRefPtr<ProgressTracker> oldProgressTracker = GetProgressTracker();
+        freshTracker->AdoptConsumers(oldProgressTracker);
+        mProgressTracker = freshTracker.forget();
       }
 
       SetProperties(chan);
@@ -908,17 +914,16 @@
 
       // Now we can create a new image to hold the data. If we don't have a decoder
       // for this mimetype we'll find out about it here.
-      mImage = ImageFactory::CreateImage(aRequest, mStatusTracker, mContentType,
+      mImage = ImageFactory::CreateImage(aRequest, mProgressTracker, mContentType,
                                          mURI, mIsMultiPartChannel,
                                          static_cast<uint32_t>(mInnerWindowId));
 
       // Release our copy of the status tracker since the image owns it now.
-      mStatusTracker = nullptr;
+      mProgressTracker = nullptr;
 
       // Notify listeners that we have an image.
-      // XXX(seth): The name of this notification method is pretty misleading.
-      nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-      statusTracker->OnDataAvailable();
+      nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+      progressTracker->OnImageAvailable();
 
       if (mImage->HasError() && !mIsMultiPartChannel) { // Probably bad mimetype
         // We allow multipart images to fail to initialize without cancelling the
@@ -928,7 +933,7 @@
         return NS_BINDING_ABORTED;
       }
 
-      NS_ABORT_IF_FALSE(statusTracker->HasImage(), "Status tracker should have an image!");
+      NS_ABORT_IF_FALSE(progressTracker->HasImage(), "Status tracker should have an image!");
       NS_ABORT_IF_FALSE(mImage, "imgRequest should have an image!");
 
       if (mDecodeRequested)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequest.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequest.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequest.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequest.h	2014-11-26 21:45:47.000000000 +0000
@@ -19,9 +19,9 @@
 #include "nsStringGlue.h"
 #include "nsError.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class imgCacheValidator;
-class imgStatusTracker;
 class imgLoader;
 class imgRequestProxy;
 class imgCacheEntry;
@@ -37,6 +37,7 @@
 namespace image {
 class Image;
 class ImageURL;
+class ProgressTracker;
 } // namespace image
 } // namespace mozilla
 
@@ -49,7 +50,11 @@
   virtual ~imgRequest();
 
 public:
+  typedef mozilla::image::Image Image;
   typedef mozilla::image::ImageURL ImageURL;
+  typedef mozilla::image::ProgressTracker ProgressTracker;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
+
   explicit imgRequest(imgLoader* aLoader);
 
   NS_DECL_THREADSAFE_ISUPPORTS
@@ -61,7 +66,8 @@
                 imgCacheEntry *aCacheEntry,
                 void *aLoadId,
                 nsIPrincipal* aLoadingPrincipal,
-                int32_t aCORSMode);
+                int32_t aCORSMode,
+                ReferrerPolicy aReferrerPolicy);
 
   void ClearLoader();
 
@@ -113,6 +119,9 @@
   // The CORS mode for which we loaded this image.
   int32_t GetCORSMode() const { return mCORSMode; }
 
+  // The Referrer Policy in effect when loading this image.
+  ReferrerPolicy GetReferrerPolicy() const { return mReferrerPolicy; }
+
   // The principal for the document that loaded this image. Used when trying to
   // validate a CORS image load.
   already_AddRefed<nsIPrincipal> GetLoadingPrincipal() const
@@ -121,10 +130,10 @@
     return principal.forget();
   }
 
-  // Return the imgStatusTracker associated with this imgRequest. It may live
-  // in |mStatusTracker| or in |mImage.mStatusTracker|, depending on whether
+  // Return the ProgressTracker associated with this imgRequest. It may live
+  // in |mProgressTracker| or in |mImage.mProgressTracker|, depending on whether
   // mImage has been instantiated yet.
-  already_AddRefed<imgStatusTracker> GetStatusTracker();
+  already_AddRefed<ProgressTracker> GetProgressTracker();
 
   // Get the current principal of the image. No AddRefing.
   inline nsIPrincipal* GetPrincipal() const { return mPrincipal.get(); }
@@ -146,9 +155,9 @@
   friend class imgRequestProxy;
   friend class imgLoader;
   friend class imgCacheValidator;
-  friend class imgStatusTracker;
   friend class imgCacheExpirationTracker;
   friend class imgRequestNotifyRunnable;
+  friend class mozilla::image::ProgressTracker;
 
   inline void SetLoadId(void *aLoadId) {
     mLoadId = aLoadId;
@@ -222,9 +231,9 @@
   nsCOMPtr<nsIPrincipal> mLoadingPrincipal;
   // The principal of this image.
   nsCOMPtr<nsIPrincipal> mPrincipal;
-  // Status-tracker -- transferred to mImage, when it gets instantiated
-  nsRefPtr<imgStatusTracker> mStatusTracker;
-  nsRefPtr<mozilla::image::Image> mImage;
+  // Progress tracker -- transferred to mImage, when it gets instantiated.
+  nsRefPtr<ProgressTracker> mProgressTracker;
+  nsRefPtr<Image> mImage;
   nsCOMPtr<nsIProperties> mProperties;
   nsCOMPtr<nsISupports> mSecurityInfo;
   nsCOMPtr<nsIChannel> mChannel;
@@ -250,6 +259,9 @@
   // default, imgIRequest::CORS_NONE.
   int32_t mCORSMode;
 
+  // The Referrer Policy (defined in ReferrerPolicy.h) used for this image.
+  ReferrerPolicy mReferrerPolicy;
+
   nsresult mImageErrorCode;
 
   // Sometimes consumers want to do things before the image is ready. Let them,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequestProxy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequestProxy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequestProxy.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequestProxy.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -28,7 +28,7 @@
 
   virtual already_AddRefed<mozilla::image::Image> GetImage() const = 0;
   virtual bool HasImage() const = 0;
-  virtual already_AddRefed<imgStatusTracker> GetStatusTracker() const = 0;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const = 0;
   virtual imgRequest* GetOwner() const = 0;
   virtual void SetOwner(imgRequest* aOwner) = 0;
 };
@@ -40,7 +40,7 @@
 
   virtual already_AddRefed<mozilla::image::Image> GetImage() const MOZ_OVERRIDE;
   virtual bool HasImage() const MOZ_OVERRIDE;
-  virtual already_AddRefed<imgStatusTracker> GetStatusTracker() const MOZ_OVERRIDE;
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const MOZ_OVERRIDE;
 
   virtual imgRequest* GetOwner() const MOZ_OVERRIDE {
     return mOwner;
@@ -50,8 +50,8 @@
     mOwner = aOwner;
 
     if (mOwner) {
-      nsRefPtr<imgStatusTracker> ownerStatusTracker = GetStatusTracker();
-      mOwnerHasImage = ownerStatusTracker && ownerStatusTracker->HasImage();
+      nsRefPtr<ProgressTracker> ownerProgressTracker = GetProgressTracker();
+      mOwnerHasImage = ownerProgressTracker && ownerProgressTracker->HasImage();
     } else {
       mOwnerHasImage = false;
     }
@@ -74,20 +74,20 @@
 {
   if (!mOwnerHasImage)
     return nullptr;
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  return statusTracker->GetImage();
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  return progressTracker->GetImage();
 }
 
-already_AddRefed<imgStatusTracker>
-RequestBehaviour::GetStatusTracker() const
+already_AddRefed<ProgressTracker>
+RequestBehaviour::GetProgressTracker() const
 {
   // NOTE: It's possible that our mOwner has an Image that it didn't notify
   // us about, if we were Canceled before its Image was constructed.
   // (Canceling removes us as an observer, so mOwner has no way to notify us).
-  // That's why this method uses mOwner->GetStatusTracker() instead of just
-  // mOwner->mStatusTracker -- we might have a null mImage and yet have an
-  // mOwner with a non-null mImage (and a null mStatusTracker pointer).
-  return mOwner->GetStatusTracker();
+  // That's why this method uses mOwner->GetProgressTracker() instead of just
+  // mOwner->mProgressTracker -- we might have a null mImage and yet have an
+  // mOwner with a non-null mImage (and a null mProgressTracker pointer).
+  return mOwner->GetProgressTracker();
 }
 
 NS_IMPL_ADDREF(imgRequestProxy)
@@ -113,8 +113,7 @@
   mIsInLoadGroup(false),
   mListenerIsStrongRef(false),
   mDecodeRequested(false),
-  mDeferNotifications(false),
-  mSentStartContainer(false)
+  mDeferNotifications(false)
 {
   /* member initializers and constructor code */
 
@@ -201,9 +200,9 @@
 
   // Were we decoded before?
   bool wasDecoded = false;
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  if (statusTracker->HasImage() &&
-      statusTracker->GetImageStatus() & imgIRequest::STATUS_FRAME_COMPLETE) {
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  if (progressTracker->HasImage() &&
+      progressTracker->GetImageStatus() & imgIRequest::STATUS_FRAME_COMPLETE) {
     wasDecoded = true;
   }
 
@@ -511,8 +510,8 @@
 /* readonly attribute unsigned long imageStatus; */
 NS_IMETHODIMP imgRequestProxy::GetImageStatus(uint32_t *aStatus)
 {
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  *aStatus = statusTracker->GetImageStatus();
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  *aStatus = progressTracker->GetImageStatus();
 
   return NS_OK;
 }
@@ -721,8 +720,6 @@
   return NS_OK;
 }
 
-/** imgDecoderObserver methods **/
-
 void imgRequestProxy::OnStartDecode()
 {
   // This notification is deliberately not propagated since there are no
@@ -731,27 +728,26 @@
     // In the case of streaming jpegs, it is possible to get multiple
     // OnStartDecodes which indicates the beginning of a new decode.  The cache
     // entry's size therefore needs to be reset to 0 here.  If we do not do
-    // this, the code in imgStatusTrackerObserver::OnStopFrame will continue to
+    // this, the code in ProgressTrackerObserver::OnStopFrame will continue to
     // increase the data size cumulatively.
     GetOwner()->ResetCacheEntry();
   }
 }
 
-void imgRequestProxy::OnStartContainer()
+void imgRequestProxy::OnSizeAvailable()
 {
   LOG_FUNC(GetImgLog(), "imgRequestProxy::OnStartContainer");
 
-  if (mListener && !mCanceled && !mSentStartContainer) {
+  if (mListener && !mCanceled) {
     // Hold a ref to the listener while we call it, just in case.
     nsCOMPtr<imgINotificationObserver> kungFuDeathGrip(mListener);
     mListener->Notify(this, imgINotificationObserver::SIZE_AVAILABLE, nullptr);
-    mSentStartContainer = true;
   }
 }
 
 void imgRequestProxy::OnFrameUpdate(const nsIntRect * rect)
 {
-  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnDataAvailable");
+  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnFrameUpdate");
 
   if (mListener && !mCanceled) {
     // Hold a ref to the listener while we call it, just in case.
@@ -760,9 +756,9 @@
   }
 }
 
-void imgRequestProxy::OnStopFrame()
+void imgRequestProxy::OnFrameComplete()
 {
-  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnStopFrame");
+  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnFrameComplete");
 
   if (mListener && !mCanceled) {
     // Hold a ref to the listener while we call it, just in case.
@@ -771,9 +767,9 @@
   }
 }
 
-void imgRequestProxy::OnStopDecode()
+void imgRequestProxy::OnDecodeComplete()
 {
-  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnStopDecode");
+  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnDecodeComplete");
 
   if (mListener && !mCanceled) {
     // Hold a ref to the listener while we call it, just in case.
@@ -785,10 +781,6 @@
     // We finished the decode, and thus have the decoded frames. Update the cache
     // entry size to take this into account.
     GetOwner()->UpdateCacheEntrySize();
-
-    // Multipart needs reset for next OnStartContainer.
-    if (GetOwner()->GetMultipart())
-      mSentStartContainer = false;
   }
 }
 
@@ -818,26 +810,27 @@
   }
 }
 
-void imgRequestProxy::OnImageIsAnimated()
+void imgRequestProxy::OnImageHasTransparency()
 {
-  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnImageIsAnimated");
+  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnImageHasTransparency");
   if (mListener && !mCanceled) {
     // Hold a ref to the listener while we call it, just in case.
     nsCOMPtr<imgINotificationObserver> kungFuDeathGrip(mListener);
-    mListener->Notify(this, imgINotificationObserver::IS_ANIMATED, nullptr);
+    mListener->Notify(this, imgINotificationObserver::HAS_TRANSPARENCY, nullptr);
   }
 }
 
-void imgRequestProxy::OnStartRequest()
+void imgRequestProxy::OnImageIsAnimated()
 {
-#ifdef PR_LOGGING
-  nsAutoCString name;
-  GetName(name);
-  LOG_FUNC_WITH_PARAM(GetImgLog(), "imgRequestProxy::OnStartRequest", "name", name.get());
-#endif
+  LOG_FUNC(GetImgLog(), "imgRequestProxy::OnImageIsAnimated");
+  if (mListener && !mCanceled) {
+    // Hold a ref to the listener while we call it, just in case.
+    nsCOMPtr<imgINotificationObserver> kungFuDeathGrip(mListener);
+    mListener->Notify(this, imgINotificationObserver::IS_ANIMATED, nullptr);
+  }
 }
 
-void imgRequestProxy::OnStopRequest(bool lastPart)
+void imgRequestProxy::OnLoadComplete(bool aLastPart)
 {
 #ifdef PR_LOGGING
   nsAutoCString name;
@@ -859,17 +852,17 @@
   // to the loadgroup so that the document doesn't lose track of the load.
   // If the request is already a background request and there's more data
   // coming, we can just leave the request in the loadgroup as-is.
-  if (lastPart || (mLoadFlags & nsIRequest::LOAD_BACKGROUND) == 0) {
-    RemoveFromLoadGroup(lastPart);
+  if (aLastPart || (mLoadFlags & nsIRequest::LOAD_BACKGROUND) == 0) {
+    RemoveFromLoadGroup(aLastPart);
     // More data is coming, so change the request to be a background request
     // and put it back in the loadgroup.
-    if (!lastPart) {
+    if (!aLastPart) {
       mLoadFlags |= nsIRequest::LOAD_BACKGROUND;
       AddToLoadGroup();
     }
   }
 
-  if (mListenerIsStrongRef && lastPart) {
+  if (mListenerIsStrongRef && aLastPart) {
     NS_PRECONDITION(mListener, "How did that happen?");
     // Drop our strong ref to the listener now that we're done with
     // everything.  Note that this can cancel us and other fun things
@@ -975,16 +968,16 @@
   // processing when we receive notifications (like OnStopRequest()), and we
   // need to check mCanceled everywhere too.
 
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
   if (GetOwner()) {
     // Send the notifications to our listener asynchronously.
-    statusTracker->Notify(this);
+    progressTracker->Notify(this);
   } else {
     // We don't have an imgRequest, so we can only notify the clone of our
     // current state, but we still have to do that asynchronously.
     NS_ABORT_IF_FALSE(HasImage(),
                       "if we have no imgRequest, we should have an Image");
-    statusTracker->NotifyCurrentState(this);
+    progressTracker->NotifyCurrentState(this);
   }
 }
 
@@ -995,16 +988,16 @@
   // processing when we receive notifications (like OnStopRequest()), and we
   // need to check mCanceled everywhere too.
 
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  statusTracker->SyncNotify(this);
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  progressTracker->SyncNotify(this);
 }
 
 void
 imgRequestProxy::SetHasImage()
 {
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  MOZ_ASSERT(statusTracker);
-  nsRefPtr<Image> image = statusTracker->GetImage();
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  MOZ_ASSERT(progressTracker);
+  nsRefPtr<Image> image = progressTracker->GetImage();
   MOZ_ASSERT(image);
 
   // Force any private status related to the owner to reflect
@@ -1020,10 +1013,10 @@
     image->IncrementAnimationConsumers();
 }
 
-already_AddRefed<imgStatusTracker>
-imgRequestProxy::GetStatusTracker() const
+already_AddRefed<ProgressTracker>
+imgRequestProxy::GetProgressTracker() const
 {
-  return mBehaviour->GetStatusTracker();
+  return mBehaviour->GetProgressTracker();
 }
 
 already_AddRefed<mozilla::image::Image>
@@ -1037,8 +1030,8 @@
 {
   if (!mOwnerHasImage)
     return false;
-  nsRefPtr<imgStatusTracker> statusTracker = GetStatusTracker();
-  return statusTracker ? statusTracker->HasImage() : false;
+  nsRefPtr<ProgressTracker> progressTracker = GetProgressTracker();
+  return progressTracker ? progressTracker->HasImage() : false;
 }
 
 bool
@@ -1070,8 +1063,8 @@
     return mImage;
   }
 
-  virtual already_AddRefed<imgStatusTracker> GetStatusTracker() const MOZ_OVERRIDE  {
-    return mImage->GetStatusTracker();
+  virtual already_AddRefed<ProgressTracker> GetProgressTracker() const MOZ_OVERRIDE  {
+    return mImage->GetProgressTracker();
   }
 
   virtual imgRequest* GetOwner() const MOZ_OVERRIDE {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequestProxy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequestProxy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgRequestProxy.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgRequestProxy.h	2014-11-26 21:45:47.000000000 +0000
@@ -39,6 +39,7 @@
 namespace image {
 class Image;
 class ImageURL;
+class ProgressTracker;
 } // namespace image
 } // namespace mozilla
 
@@ -52,8 +53,11 @@
   virtual ~imgRequestProxy();
 
 public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(imgRequestProxy)
+  typedef mozilla::image::Image Image;
   typedef mozilla::image::ImageURL ImageURL;
+  typedef mozilla::image::ProgressTracker ProgressTracker;
+
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(imgRequestProxy)
   NS_DECL_ISUPPORTS
   NS_DECL_IMGIREQUEST
   NS_DECL_NSIREQUEST
@@ -91,7 +95,7 @@
   // asynchronously-called function.
   void SyncNotifyListener();
 
-  // Whether we want notifications from imgStatusTracker to be deferred until
+  // Whether we want notifications from ProgressTracker to be deferred until
   // an event it has scheduled has been fired.
   bool NotificationsDeferred() const
   {
@@ -117,7 +121,7 @@
   nsresult GetURI(ImageURL **aURI);
 
 protected:
-  friend class imgStatusTracker;
+  friend class mozilla::image::ProgressTracker;
   friend class imgStatusNotifyRunnable;
   friend class imgRequestNotifyRunnable;
 
@@ -142,22 +146,21 @@
   };
 
   // The following notification functions are protected to ensure that (friend
-  // class) imgStatusTracker is the only class allowed to send us
+  // class) ProgressTracker is the only class allowed to send us
   // notifications.
 
-  /* non-virtual imgDecoderObserver methods */
-  void OnStartDecode     ();
-  void OnStartContainer  ();
-  void OnFrameUpdate     (const nsIntRect * aRect);
-  void OnStopFrame       ();
-  void OnStopDecode      ();
-  void OnDiscard         ();
-  void OnUnlockedDraw    ();
-  void OnImageIsAnimated ();
+  void OnStartDecode();
+  void OnSizeAvailable();
+  void OnFrameUpdate(const nsIntRect* aRect);
+  void OnFrameComplete();
+  void OnDecodeComplete();
+  void OnDiscard();
+  void OnUnlockedDraw();
+  void OnImageHasTransparency();
+  void OnImageIsAnimated();
 
   /* non-virtual sort-of-nsIRequestObserver methods */
-  void OnStartRequest();
-  void OnStopRequest(bool aLastPart);
+  void OnLoadComplete(bool aLastPart);
 
   /* non-virtual imgIOnloadBlocker methods */
   void BlockOnload();
@@ -173,11 +176,11 @@
     RemoveFromLoadGroup(true);
   }
 
-  // Return the imgStatusTracker associated with mOwner and/or mImage. It may
+  // Return the ProgressTracker associated with mOwner and/or mImage. It may
   // live either on mOwner or mImage, depending on whether
   //   (a) we have an mOwner at all
   //   (b) whether mOwner has instantiated its image yet
-  already_AddRefed<imgStatusTracker> GetStatusTracker() const;
+  already_AddRefed<ProgressTracker> GetProgressTracker() const;
 
   nsITimedChannel* TimedChannel()
   {
@@ -186,7 +189,7 @@
     return GetOwner()->mTimedChannel;
   }
 
-  already_AddRefed<mozilla::image::Image> GetImage() const;
+  already_AddRefed<Image> GetImage() const;
   bool HasImage() const;
   imgRequest* GetOwner() const;
 
@@ -224,10 +227,6 @@
   // Whether we want to defer our notifications by the non-virtual Observer
   // interfaces as image loads proceed.
   bool mDeferNotifications;
-
-  // We only want to send OnStartContainer once for each proxy, but we might
-  // get multiple OnStartContainer calls.
-  bool mSentStartContainer;
 };
 
 // Used for static image proxies for which no requests are available, so
@@ -236,8 +235,7 @@
 {
 
 public:
-  imgRequestProxyStatic(mozilla::image::Image* aImage,
-                        nsIPrincipal* aPrincipal);
+  imgRequestProxyStatic(Image* aImage, nsIPrincipal* aPrincipal);
 
   NS_IMETHOD GetImagePrincipal(nsIPrincipal** aPrincipal) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgStatusTracker.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgStatusTracker.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgStatusTracker.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgStatusTracker.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,958 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "ImageLogging.h"
-#include "imgStatusTracker.h"
-
-#include "imgIContainer.h"
-#include "imgRequestProxy.h"
-#include "imgDecoderObserver.h"
-#include "Image.h"
-#include "nsNetUtil.h"
-#include "nsIObserverService.h"
-
-#include "mozilla/Assertions.h"
-#include "mozilla/Services.h"
-
-using namespace mozilla::image;
-using mozilla::WeakPtr;
-
-class imgStatusTrackerObserver : public imgDecoderObserver
-{
-public:
-  explicit imgStatusTrackerObserver(imgStatusTracker* aTracker)
-  : mTracker(aTracker)
-  {
-    MOZ_ASSERT(aTracker);
-  }
-
-  void SetTracker(imgStatusTracker* aTracker)
-  {
-    MOZ_ASSERT(aTracker);
-    mTracker = aTracker;
-  }
-
-  /** imgDecoderObserver methods **/
-
-  virtual void OnStartDecode() MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnStartDecode");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    tracker->RecordStartDecode();
-    if (!tracker->IsMultipart()) {
-      tracker->RecordBlockOnload();
-    }
-  }
-
-  virtual void OnStartRequest() MOZ_OVERRIDE
-  {
-    NS_NOTREACHED("imgStatusTrackerObserver(imgDecoderObserver)::OnStartRequest");
-  }
-
-  virtual void OnStartContainer() MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnStartContainer");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    nsRefPtr<Image> image = tracker->GetImage();;
-    tracker->RecordStartContainer(image);
-  }
-
-  virtual void OnStopFrame() MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnStopFrame");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    tracker->RecordStopFrame();
-    tracker->RecordUnblockOnload();
-  }
-
-  virtual void OnStopDecode(nsresult aStatus) MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnStopDecode");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    tracker->RecordStopDecode(aStatus);
-
-    // This is really hacky. We need to handle the case where we start decoding,
-    // block onload, but then hit an error before we get to our first frame.
-    tracker->RecordUnblockOnload();
-  }
-
-  virtual void OnStopRequest(bool aLastPart, nsresult aStatus) MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnStopRequest");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    tracker->RecordStopRequest(aLastPart, aStatus);
-  }
-
-  virtual void OnUnlockedDraw() MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnUnlockedDraw");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    NS_ABORT_IF_FALSE(tracker->HasImage(),
-                      "OnUnlockedDraw callback before we've created our image");
-    tracker->RecordUnlockedDraw();
-  }
-
-  virtual void OnImageIsAnimated() MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnImageIsAnimated");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    tracker->RecordImageIsAnimated();
-  }
-
-  virtual void OnError() MOZ_OVERRIDE
-  {
-    LOG_SCOPE(GetImgLog(), "imgStatusTrackerObserver::OnError");
-    nsRefPtr<imgStatusTracker> tracker = mTracker.get();
-    if (!tracker) { return; }
-    tracker->RecordError();
-  }
-
-protected:
-  virtual ~imgStatusTrackerObserver() {}
-
-private:
-  WeakPtr<imgStatusTracker> mTracker;
-};
-
-// imgStatusTracker methods
-
-imgStatusTracker::imgStatusTracker(Image* aImage)
-  : mImage(aImage)
-  , mState(0)
-{
-  mTrackerObserver = new imgStatusTrackerObserver(this);
-}
-
-// Private, used only by CloneForRecording.
-imgStatusTracker::imgStatusTracker(const imgStatusTracker& aOther)
-  : mImage(aOther.mImage)
-  , mState(aOther.mState)
-    // Note: we explicitly don't copy several fields:
-    //  - mRequestRunnable, because it won't be nulled out when the
-    //    mRequestRunnable's Run function eventually gets called.
-    //  - mProperties, because we don't need it and it'd just point at the same
-    //    object
-    //  - mConsumers, because we don't need to talk to consumers
-{
-  mTrackerObserver = new imgStatusTrackerObserver(this);
-}
-
-imgStatusTracker::~imgStatusTracker()
-{}
-
-imgStatusTrackerInit::imgStatusTrackerInit(mozilla::image::Image* aImage,
-                                           imgStatusTracker* aTracker)
-{
-  MOZ_ASSERT(aImage);
-
-  if (aTracker) {
-    mTracker = aTracker;
-    mTracker->SetImage(aImage);
-  } else {
-    mTracker = new imgStatusTracker(aImage);
-  }
-  aImage->SetStatusTracker(mTracker);
-  MOZ_ASSERT(mTracker);
-}
-
-imgStatusTrackerInit::~imgStatusTrackerInit()
-{
-  mTracker->ResetImage();
-}
-
-void
-imgStatusTracker::SetImage(Image* aImage)
-{
-  NS_ABORT_IF_FALSE(aImage, "Setting null image");
-  NS_ABORT_IF_FALSE(!mImage, "Setting image when we already have one");
-  mImage = aImage;
-}
-
-void
-imgStatusTracker::ResetImage()
-{
-  NS_ABORT_IF_FALSE(mImage, "Resetting image when it's already null!");
-  mImage = nullptr;
-}
-
-void imgStatusTracker::SetIsMultipart()
-{
-  mState |= FLAG_IS_MULTIPART;
-}
-
-bool
-imgStatusTracker::IsLoading() const
-{
-  // Checking for whether OnStopRequest has fired allows us to say we're
-  // loading before OnStartRequest gets called, letting the request properly
-  // get removed from the cache in certain cases.
-  return !(mState & FLAG_REQUEST_STOPPED);
-}
-
-uint32_t
-imgStatusTracker::GetImageStatus() const
-{
-  uint32_t status = imgIRequest::STATUS_NONE;
-
-  // Translate our current state to a set of imgIRequest::STATE_* flags.
-  if (mState & FLAG_HAS_SIZE) {
-    status |= imgIRequest::STATUS_SIZE_AVAILABLE;
-  }
-  if (mState & FLAG_DECODE_STARTED) {
-    status |= imgIRequest::STATUS_DECODE_STARTED;
-  }
-  if (mState & FLAG_DECODE_STOPPED) {
-    status |= imgIRequest::STATUS_DECODE_COMPLETE;
-  }
-  if (mState & FLAG_FRAME_STOPPED) {
-    status |= imgIRequest::STATUS_FRAME_COMPLETE;
-  }
-  if (mState & FLAG_REQUEST_STOPPED) {
-    status |= imgIRequest::STATUS_LOAD_COMPLETE;
-  }
-  if (mState & FLAG_HAS_ERROR) {
-    status |= imgIRequest::STATUS_ERROR;
-  }
-
-  return status;
-}
-
-// A helper class to allow us to call SyncNotify asynchronously.
-class imgRequestNotifyRunnable : public nsRunnable
-{
-  public:
-    imgRequestNotifyRunnable(imgStatusTracker* aTracker,
-                             imgRequestProxy* aRequestProxy)
-      : mTracker(aTracker)
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
-      MOZ_ASSERT(aRequestProxy, "aRequestProxy should not be null");
-      MOZ_ASSERT(aTracker, "aTracker should not be null");
-      mProxies.AppendElement(aRequestProxy);
-    }
-
-    NS_IMETHOD Run()
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
-      MOZ_ASSERT(mTracker, "mTracker should not be null");
-      for (uint32_t i = 0; i < mProxies.Length(); ++i) {
-        mProxies[i]->SetNotificationsDeferred(false);
-        mTracker->SyncNotify(mProxies[i]);
-      }
-
-      mTracker->mRequestRunnable = nullptr;
-      return NS_OK;
-    }
-
-    void AddProxy(imgRequestProxy* aRequestProxy)
-    {
-      mProxies.AppendElement(aRequestProxy);
-    }
-
-    void RemoveProxy(imgRequestProxy* aRequestProxy)
-    {
-      mProxies.RemoveElement(aRequestProxy);
-    }
-
-  private:
-    friend class imgStatusTracker;
-
-    nsRefPtr<imgStatusTracker> mTracker;
-    nsTArray< nsRefPtr<imgRequestProxy> > mProxies;
-};
-
-void
-imgStatusTracker::Notify(imgRequestProxy* proxy)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "imgRequestProxy is not threadsafe");
-#ifdef PR_LOGGING
-  if (mImage && mImage->GetURI()) {
-    nsRefPtr<ImageURL> uri(mImage->GetURI());
-    nsAutoCString spec;
-    uri->GetSpec(spec);
-    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgStatusTracker::Notify async", "uri", spec.get());
-  } else {
-    LOG_FUNC_WITH_PARAM(GetImgLog(), "imgStatusTracker::Notify async", "uri", "<unknown>");
-  }
-#endif
-
-  proxy->SetNotificationsDeferred(true);
-
-  // If we have an existing runnable that we can use, we just append this proxy
-  // to its list of proxies to be notified. This ensures we don't unnecessarily
-  // delay onload.
-  imgRequestNotifyRunnable* runnable = static_cast<imgRequestNotifyRunnable*>(mRequestRunnable.get());
-  if (runnable) {
-    runnable->AddProxy(proxy);
-  } else {
-    mRequestRunnable = new imgRequestNotifyRunnable(this, proxy);
-    NS_DispatchToCurrentThread(mRequestRunnable);
-  }
-}
-
-// A helper class to allow us to call SyncNotify asynchronously for a given,
-// fixed, state.
-class imgStatusNotifyRunnable : public nsRunnable
-{
-  public:
-    imgStatusNotifyRunnable(imgStatusTracker* statusTracker,
-                            imgRequestProxy* requestproxy)
-      : mStatusTracker(statusTracker), mProxy(requestproxy)
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
-      MOZ_ASSERT(requestproxy, "requestproxy cannot be null");
-      MOZ_ASSERT(statusTracker, "status should not be null");
-      mImage = statusTracker->GetImage();
-    }
-
-    NS_IMETHOD Run()
-    {
-      MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
-      mProxy->SetNotificationsDeferred(false);
-
-      mStatusTracker->SyncNotify(mProxy);
-      return NS_OK;
-    }
-
-  private:
-    nsRefPtr<imgStatusTracker> mStatusTracker;
-    // We have to hold on to a reference to the tracker's image, just in case
-    // it goes away while we're in the event queue.
-    nsRefPtr<Image> mImage;
-    nsRefPtr<imgRequestProxy> mProxy;
-};
-
-void
-imgStatusTracker::NotifyCurrentState(imgRequestProxy* proxy)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "imgRequestProxy is not threadsafe");
-#ifdef PR_LOGGING
-  nsRefPtr<ImageURL> uri;
-  proxy->GetURI(getter_AddRefs(uri));
-  nsAutoCString spec;
-  uri->GetSpec(spec);
-  LOG_FUNC_WITH_PARAM(GetImgLog(), "imgStatusTracker::NotifyCurrentState", "uri", spec.get());
-#endif
-
-  proxy->SetNotificationsDeferred(true);
-
-  // We don't keep track of
-  nsCOMPtr<nsIRunnable> ev = new imgStatusNotifyRunnable(this, proxy);
-  NS_DispatchToCurrentThread(ev);
-}
-
-#define NOTIFY_IMAGE_OBSERVERS(func) \
-  do { \
-    ProxyArray::ForwardIterator iter(aProxies); \
-    while (iter.HasMore()) { \
-      nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get(); \
-      if (proxy && !proxy->NotificationsDeferred()) { \
-        proxy->func; \
-      } \
-    } \
-  } while (false);
-
-/* static */ void
-imgStatusTracker::SyncNotifyState(ProxyArray& aProxies,
-                                  bool aHasImage, uint32_t aState,
-                                  const nsIntRect& aDirtyRect)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  // OnStartRequest
-  if (aState & FLAG_REQUEST_STARTED)
-    NOTIFY_IMAGE_OBSERVERS(OnStartRequest());
-
-  // OnStartContainer
-  if (aState & FLAG_HAS_SIZE)
-    NOTIFY_IMAGE_OBSERVERS(OnStartContainer());
-
-  // OnStartDecode
-  if (aState & FLAG_DECODE_STARTED)
-    NOTIFY_IMAGE_OBSERVERS(OnStartDecode());
-
-  // BlockOnload
-  if (aState & FLAG_ONLOAD_BLOCKED)
-    NOTIFY_IMAGE_OBSERVERS(BlockOnload());
-
-  if (aHasImage) {
-    // OnFrameUpdate
-    // If there's any content in this frame at all (always true for
-    // vector images, true for raster images that have decoded at
-    // least one frame) then send OnFrameUpdate.
-    if (!aDirtyRect.IsEmpty())
-      NOTIFY_IMAGE_OBSERVERS(OnFrameUpdate(&aDirtyRect));
-
-    if (aState & FLAG_FRAME_STOPPED)
-      NOTIFY_IMAGE_OBSERVERS(OnStopFrame());
-
-    // OnImageIsAnimated
-    if (aState & FLAG_IS_ANIMATED)
-      NOTIFY_IMAGE_OBSERVERS(OnImageIsAnimated());
-  }
-
-  // Send UnblockOnload before OnStopDecode and OnStopRequest. This allows
-  // observers that can fire events when they receive those notifications to do
-  // so then, instead of being forced to wait for UnblockOnload.
-  if (aState & FLAG_ONLOAD_UNBLOCKED) {
-    NOTIFY_IMAGE_OBSERVERS(UnblockOnload());
-  }
-
-  if (aState & FLAG_DECODE_STOPPED) {
-    MOZ_ASSERT(aHasImage, "Stopped decoding without ever having an image?");
-    NOTIFY_IMAGE_OBSERVERS(OnStopDecode());
-  }
-
-  if (aState & FLAG_REQUEST_STOPPED) {
-    NOTIFY_IMAGE_OBSERVERS(OnStopRequest(aState & FLAG_MULTIPART_STOPPED));
-  }
-}
-
-ImageStatusDiff
-imgStatusTracker::Difference(imgStatusTracker* aOther) const
-{
-  MOZ_ASSERT(aOther, "aOther cannot be null");
-  ImageStatusDiff diff;
-  diff.diffState = ~mState & aOther->mState;
-  return diff;
-}
-
-ImageStatusDiff
-imgStatusTracker::DecodeStateAsDifference() const
-{
-  ImageStatusDiff diff;
-  // XXX(seth): Is FLAG_REQUEST_STARTED really the only non-"decode state" flag?
-  diff.diffState = mState & ~FLAG_REQUEST_STARTED;
-  return diff;
-}
-
-void
-imgStatusTracker::ApplyDifference(const ImageStatusDiff& aDiff)
-{
-  LOG_SCOPE(GetImgLog(), "imgStatusTracker::ApplyDifference");
-  mState |= aDiff.diffState;
-}
-
-void
-imgStatusTracker::SyncNotifyDifference(const ImageStatusDiff& aDiff,
-                                       const nsIntRect& aInvalidRect /* = nsIntRect() */)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
-  LOG_SCOPE(GetImgLog(), "imgStatusTracker::SyncNotifyDifference");
-
-  SyncNotifyState(mConsumers, !!mImage, aDiff.diffState, aInvalidRect);
-
-  if (aDiff.diffState & FLAG_HAS_ERROR) {
-    FireFailureNotification();
-  }
-}
-
-already_AddRefed<imgStatusTracker>
-imgStatusTracker::CloneForRecording()
-{
-  // Grab a ref to this to ensure it isn't deleted.
-  nsRefPtr<imgStatusTracker> thisStatusTracker = this;
-  nsRefPtr<imgStatusTracker> clone = new imgStatusTracker(*thisStatusTracker);
-  return clone.forget();
-}
-
-void
-imgStatusTracker::SyncNotify(imgRequestProxy* proxy)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "imgRequestProxy is not threadsafe");
-#ifdef PR_LOGGING
-  nsRefPtr<ImageURL> uri;
-  proxy->GetURI(getter_AddRefs(uri));
-  nsAutoCString spec;
-  uri->GetSpec(spec);
-  LOG_SCOPE_WITH_PARAM(GetImgLog(), "imgStatusTracker::SyncNotify", "uri", spec.get());
-#endif
-
-  nsIntRect r;
-  if (mImage) {
-    // XXX - Should only send partial rects here, but that needs to
-    // wait until we fix up the observer interface
-    r = mImage->FrameRect(imgIContainer::FRAME_CURRENT);
-  }
-
-  ProxyArray array;
-  array.AppendElement(proxy);
-  SyncNotifyState(array, !!mImage, mState, r);
-}
-
-void
-imgStatusTracker::EmulateRequestFinished(imgRequestProxy* aProxy,
-                                         nsresult aStatus)
-{
-  MOZ_ASSERT(NS_IsMainThread(),
-             "SyncNotifyState and mConsumers are not threadsafe");
-  nsCOMPtr<imgIRequest> kungFuDeathGrip(aProxy);
-
-  // In certain cases the request might not have started yet.
-  // We still need to fulfill the contract.
-  if (!(mState & FLAG_REQUEST_STARTED)) {
-    aProxy->OnStartRequest();
-  }
-
-  if (mState & FLAG_ONLOAD_BLOCKED && !(mState & FLAG_ONLOAD_UNBLOCKED)) {
-    aProxy->UnblockOnload();
-  }
-
-  if (!(mState & FLAG_REQUEST_STOPPED)) {
-    aProxy->OnStopRequest(true);
-  }
-}
-
-void
-imgStatusTracker::AddConsumer(imgRequestProxy* aConsumer)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  mConsumers.AppendElementUnlessExists(aConsumer);
-}
-
-// XXX - The last argument should go away.
-bool
-imgStatusTracker::RemoveConsumer(imgRequestProxy* aConsumer, nsresult aStatus)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  // Remove the proxy from the list.
-  bool removed = mConsumers.RemoveElement(aConsumer);
-
-  // Consumers can get confused if they don't get all the proper teardown
-  // notifications. Part ways on good terms.
-  if (removed && !aConsumer->NotificationsDeferred()) {
-    EmulateRequestFinished(aConsumer, aStatus);
-  }
-
-  // Make sure we don't give callbacks to a consumer that isn't interested in
-  // them any more.
-  imgRequestNotifyRunnable* runnable = static_cast<imgRequestNotifyRunnable*>(mRequestRunnable.get());
-  if (aConsumer->NotificationsDeferred() && runnable) {
-    runnable->RemoveProxy(aConsumer);
-    aConsumer->SetNotificationsDeferred(false);
-  }
-
-  return removed;
-}
-
-bool
-imgStatusTracker::FirstConsumerIs(imgRequestProxy* aConsumer)
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      return proxy.get() == aConsumer;
-    }
-  }
-  return false;
-}
-
-void
-imgStatusTracker::RecordCancel()
-{
-  mState |= FLAG_HAS_ERROR;
-}
-
-void
-imgStatusTracker::RecordLoaded()
-{
-  NS_ABORT_IF_FALSE(mImage, "RecordLoaded called before we have an Image");
-  mState |= FLAG_REQUEST_STARTED | FLAG_HAS_SIZE |
-            FLAG_REQUEST_STOPPED | FLAG_MULTIPART_STOPPED;
-}
-
-void
-imgStatusTracker::RecordDecoded()
-{
-  NS_ABORT_IF_FALSE(mImage, "RecordDecoded called before we have an Image");
-  mState |= FLAG_DECODE_STARTED | FLAG_DECODE_STOPPED | FLAG_FRAME_STOPPED;
-}
-
-void
-imgStatusTracker::RecordStartDecode()
-{
-  NS_ABORT_IF_FALSE(mImage, "RecordStartDecode without an Image");
-  mState |= FLAG_DECODE_STARTED;
-}
-
-void
-imgStatusTracker::SendStartDecode(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnStartDecode();
-}
-
-void
-imgStatusTracker::RecordStartContainer(imgIContainer* aContainer)
-{
-  NS_ABORT_IF_FALSE(mImage,
-                    "RecordStartContainer called before we have an Image");
-  NS_ABORT_IF_FALSE(mImage == aContainer,
-                    "RecordStartContainer called with wrong Image");
-  mState |= FLAG_HAS_SIZE;
-}
-
-void
-imgStatusTracker::SendStartContainer(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnStartContainer();
-}
-
-void
-imgStatusTracker::RecordStopFrame()
-{
-  NS_ABORT_IF_FALSE(mImage, "RecordStopFrame called before we have an Image");
-  mState |= FLAG_FRAME_STOPPED;
-}
-
-void
-imgStatusTracker::SendStopFrame(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnStopFrame();
-}
-
-void
-imgStatusTracker::RecordStopDecode(nsresult aStatus)
-{
-  MOZ_ASSERT(mImage, "RecordStopDecode called before we have an Image");
-
-  mState |= FLAG_DECODE_STOPPED;
-
-  if (NS_FAILED(aStatus)) {
-    mState |= FLAG_HAS_ERROR;
-  }
-}
-
-void
-imgStatusTracker::SendStopDecode(imgRequestProxy* aProxy,
-                                 nsresult aStatus)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnStopDecode();
-}
-
-void
-imgStatusTracker::SendDiscard(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnDiscard();
-}
-
-
-void
-imgStatusTracker::RecordUnlockedDraw()
-{
-  NS_ABORT_IF_FALSE(mImage,
-                    "RecordUnlockedDraw called before we have an Image");
-}
-
-void
-imgStatusTracker::RecordImageIsAnimated()
-{
-  NS_ABORT_IF_FALSE(mImage,
-                    "RecordImageIsAnimated called before we have an Image");
-  mState |= FLAG_IS_ANIMATED;
-}
-
-void
-imgStatusTracker::SendImageIsAnimated(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnImageIsAnimated();
-}
-
-void
-imgStatusTracker::SendUnlockedDraw(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnUnlockedDraw();
-}
-
-void
-imgStatusTracker::OnUnlockedDraw()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  RecordUnlockedDraw();
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      SendUnlockedDraw(proxy);
-    }
-  }
-}
-
-/* non-virtual sort-of-nsIRequestObserver methods */
-void
-imgStatusTracker::RecordStartRequest()
-{
-  // We're starting a new load, so clear any status and state bits indicating
-  // load/decode.
-  // XXX(seth): Are these really the only flags we want to clear?
-  mState &= ~FLAG_REQUEST_STARTED;
-  mState &= ~FLAG_DECODE_STARTED;
-  mState &= ~FLAG_DECODE_STOPPED;
-  mState &= ~FLAG_REQUEST_STOPPED;
-  mState &= ~FLAG_ONLOAD_BLOCKED;
-  mState &= ~FLAG_ONLOAD_UNBLOCKED;
-  mState &= ~FLAG_IS_ANIMATED;
-
-  mState |= FLAG_REQUEST_STARTED;
-}
-
-void
-imgStatusTracker::SendStartRequest(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred())
-    aProxy->OnStartRequest();
-}
-
-void
-imgStatusTracker::OnStartRequest()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  RecordStartRequest();
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      SendStartRequest(proxy);
-    }
-  }
-}
-
-void
-imgStatusTracker::RecordStopRequest(bool aLastPart,
-                                    nsresult aStatus)
-{
-  mState |= FLAG_REQUEST_STOPPED;
-  if (aLastPart) {
-    mState |= FLAG_MULTIPART_STOPPED;
-  }
-  if (NS_FAILED(aStatus)) {
-    mState |= FLAG_HAS_ERROR;
-  }
-}
-
-void
-imgStatusTracker::SendStopRequest(imgRequestProxy* aProxy,
-                                  bool aLastPart,
-                                  nsresult aStatus)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred()) {
-    aProxy->OnStopRequest(aLastPart);
-  }
-}
-
-class OnStopRequestEvent : public nsRunnable
-{
-public:
-  OnStopRequestEvent(imgStatusTracker* aTracker,
-                     bool aLastPart,
-                     nsresult aStatus)
-    : mTracker(aTracker)
-    , mLastPart(aLastPart)
-    , mStatus(aStatus)
-  {
-    MOZ_ASSERT(!NS_IsMainThread(), "Should be created off the main thread");
-    MOZ_ASSERT(aTracker, "aTracker should not be null");
-  }
-
-  NS_IMETHOD Run()
-  {
-    MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
-    MOZ_ASSERT(mTracker, "mTracker should not be null");
-    mTracker->OnStopRequest(mLastPart, mStatus);
-    return NS_OK;
-  }
-private:
-  nsRefPtr<imgStatusTracker> mTracker;
-  bool mLastPart;
-  nsresult mStatus;
-};
-
-void
-imgStatusTracker::OnStopRequest(bool aLastPart,
-                                nsresult aStatus)
-{
-  if (!NS_IsMainThread()) {
-    NS_DispatchToMainThread(
-      new OnStopRequestEvent(this, aLastPart, aStatus));
-    return;
-  }
-  bool preexistingError = mState & FLAG_HAS_ERROR;
-
-  RecordStopRequest(aLastPart, aStatus);
-  /* notify the kids */
-  ProxyArray::ForwardIterator srIter(mConsumers);
-  while (srIter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = srIter.GetNext().get();
-    if (proxy) {
-      SendStopRequest(proxy, aLastPart, aStatus);
-    }
-  }
-
-  if (NS_FAILED(aStatus) && !preexistingError) {
-    FireFailureNotification();
-  }
-}
-
-void
-imgStatusTracker::OnDiscard()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  /* notify the kids */
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      SendDiscard(proxy);
-    }
-  }
-}
-
-void
-imgStatusTracker::OnStopFrame()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  RecordStopFrame();
-
-  /* notify the kids */
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      SendStopFrame(proxy);
-    }
-  }
-}
-
-void
-imgStatusTracker::OnDataAvailable()
-{
-  if (!NS_IsMainThread()) {
-    // Note: SetHasImage calls Image::Lock and Image::IncrementAnimationCounter
-    // so subsequent calls or dispatches which Unlock or Decrement~ should
-    // be issued after this to avoid race conditions.
-    NS_DispatchToMainThread(
-      NS_NewRunnableMethod(this, &imgStatusTracker::OnDataAvailable));
-    return;
-  }
-  // Notify any imgRequestProxys that are observing us that we have an Image.
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      proxy->SetHasImage();
-    }
-  }
-}
-
-void
-imgStatusTracker::RecordBlockOnload()
-{
-  mState |= FLAG_ONLOAD_BLOCKED;
-}
-
-void
-imgStatusTracker::SendBlockOnload(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred()) {
-    aProxy->BlockOnload();
-  }
-}
-
-void
-imgStatusTracker::RecordUnblockOnload()
-{
-  // We sometimes unblock speculatively, so only actually unblock if we've
-  // previously blocked.
-  if (mState & FLAG_ONLOAD_BLOCKED) {
-    mState |= FLAG_ONLOAD_UNBLOCKED;
-  }
-}
-
-void
-imgStatusTracker::SendUnblockOnload(imgRequestProxy* aProxy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!aProxy->NotificationsDeferred()) {
-    aProxy->UnblockOnload();
-  }
-}
-
-void
-imgStatusTracker::MaybeUnblockOnload()
-{
-  if (!NS_IsMainThread()) {
-    NS_DispatchToMainThread(
-      NS_NewRunnableMethod(this, &imgStatusTracker::MaybeUnblockOnload));
-    return;
-  }
-  if (!(mState & FLAG_ONLOAD_BLOCKED) || (mState & FLAG_ONLOAD_UNBLOCKED)) {
-    return;
-  }
-
-  RecordUnblockOnload();
-
-  ProxyArray::ForwardIterator iter(mConsumers);
-  while (iter.HasMore()) {
-    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
-    if (proxy) {
-      SendUnblockOnload(proxy);
-    }
-  }
-}
-
-void
-imgStatusTracker::RecordError()
-{
-  mState |= FLAG_HAS_ERROR;
-}
-
-void
-imgStatusTracker::FireFailureNotification()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-
-  // Some kind of problem has happened with image decoding.
-  // Report the URI to net:failed-to-process-uri-conent observers.
-  if (mImage) {
-    // Should be on main thread, so ok to create a new nsIURI.
-    nsCOMPtr<nsIURI> uri;
-    {
-      nsRefPtr<ImageURL> threadsafeUriData = mImage->GetURI();
-      uri = threadsafeUriData ? threadsafeUriData->ToIURI() : nullptr;
-    }
-    if (uri) {
-      nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-      if (os) {
-        os->NotifyObservers(uri, "net:failed-to-process-uri-content", nullptr);
-      }
-    }
-  }
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgStatusTracker.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgStatusTracker.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgStatusTracker.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgStatusTracker.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,304 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef imgStatusTracker_h__
-#define imgStatusTracker_h__
-
-class imgDecoderObserver;
-class imgIContainer;
-class imgStatusNotifyRunnable;
-class imgRequestNotifyRunnable;
-class imgStatusTrackerObserver;
-class nsIRunnable;
-
-#include "mozilla/RefPtr.h"
-#include "mozilla/WeakPtr.h"
-#include "nsCOMPtr.h"
-#include "nsTObserverArray.h"
-#include "nsThreadUtils.h"
-#include "nsRect.h"
-#include "imgRequestProxy.h"
-
-namespace mozilla {
-namespace image {
-
-class Image;
-
-// Image state bitflags.
-enum {
-  FLAG_REQUEST_STARTED    = 1u << 0,
-  FLAG_HAS_SIZE           = 1u << 1,  // STATUS_SIZE_AVAILABLE
-  FLAG_DECODE_STARTED     = 1u << 2,  // STATUS_DECODE_STARTED
-  FLAG_DECODE_STOPPED     = 1u << 3,  // STATUS_DECODE_COMPLETE
-  FLAG_FRAME_STOPPED      = 1u << 4,  // STATUS_FRAME_COMPLETE
-  FLAG_REQUEST_STOPPED    = 1u << 5,  // STATUS_LOAD_COMPLETE
-  FLAG_ONLOAD_BLOCKED     = 1u << 6,
-  FLAG_ONLOAD_UNBLOCKED   = 1u << 7,
-  FLAG_IS_ANIMATED        = 1u << 8,
-  FLAG_IS_MULTIPART       = 1u << 9,
-  FLAG_MULTIPART_STOPPED  = 1u << 10,
-  FLAG_HAS_ERROR          = 1u << 11  // STATUS_ERROR
-};
-
-struct ImageStatusDiff
-{
-  ImageStatusDiff()
-    : diffState(0)
-  { }
-
-  static ImageStatusDiff NoChange() { return ImageStatusDiff(); }
-  bool IsNoChange() const { return *this == NoChange(); }
-
-  bool operator!=(const ImageStatusDiff& aOther) const { return !(*this == aOther); }
-  bool operator==(const ImageStatusDiff& aOther) const {
-    return aOther.diffState == diffState;
-  }
-
-  void Combine(const ImageStatusDiff& aOther) {
-    diffState |= aOther.diffState;
-  }
-
-  uint32_t diffState;
-};
-
-} // namespace image
-} // namespace mozilla
-
-/*
- * The image status tracker is a class that encapsulates all the loading and
- * decoding status about an Image, and makes it possible to send notifications
- * to imgRequestProxys, both synchronously (i.e., the status now) and
- * asynchronously (the status later).
- *
- * When a new proxy needs to be notified of the current state of an image, call
- * the Notify() method on this class with the relevant proxy as its argument,
- * and the notifications will be replayed to the proxy asynchronously.
- */
-
-
-class imgStatusTracker : public mozilla::SupportsWeakPtr<imgStatusTracker>
-{
-  virtual ~imgStatusTracker();
-
-public:
-  MOZ_DECLARE_REFCOUNTED_TYPENAME(imgStatusTracker)
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(imgStatusTracker)
-
-  // aImage is the image that this status tracker will pass to the
-  // imgRequestProxys in SyncNotify() and EmulateRequestFinished(), and must be
-  // alive as long as this instance is, because we hold a weak reference to it.
-  explicit imgStatusTracker(mozilla::image::Image* aImage);
-
-  // Image-setter, for imgStatusTrackers created by imgRequest::Init, which
-  // are created before their Image is created.  This method should only
-  // be called once, and only on an imgStatusTracker that was initialized
-  // without an image.
-  void SetImage(mozilla::image::Image* aImage);
-
-  // Image resetter, for when mImage is about to go out of scope. mImage is a
-  // weak reference, and thus must be set to null when it's object is deleted.
-  void ResetImage();
-
-  // Inform this status tracker that it is associated with a multipart image.
-  void SetIsMultipart();
-
-  // Schedule an asynchronous "replaying" of all the notifications that would
-  // have to happen to put us in the current state.
-  // We will also take note of any notifications that happen between the time
-  // Notify() is called and when we call SyncNotify on |proxy|, and replay them
-  // as well.
-  // Should be called on the main thread only, since imgRequestProxy and GetURI
-  // are not threadsafe.
-  void Notify(imgRequestProxy* proxy);
-
-  // Schedule an asynchronous "replaying" of all the notifications that would
-  // have to happen to put us in the state we are in right now.
-  // Unlike Notify(), does *not* take into account future notifications.
-  // This is only useful if you do not have an imgRequest, e.g., if you are a
-  // static request returned from imgIRequest::GetStaticRequest().
-  // Should be called on the main thread only, since imgRequestProxy and GetURI
-  // are not threadsafe.
-  void NotifyCurrentState(imgRequestProxy* proxy);
-
-  // "Replay" all of the notifications that would have to happen to put us in
-  // the state we're currently in.
-  // Only use this if you're already servicing an asynchronous call (e.g.
-  // OnStartRequest).
-  // Should be called on the main thread only, since imgRequestProxy and GetURI
-  // are not threadsafe.
-  void SyncNotify(imgRequestProxy* proxy);
-
-  // Send some notifications that would be necessary to make |proxy| believe
-  // the request is finished downloading and decoding.  We only send
-  // OnStopRequest and UnblockOnload, and only if necessary.
-  void EmulateRequestFinished(imgRequestProxy* proxy, nsresult aStatus);
-
-  // We manage a set of consumers that are using an image and thus concerned
-  // with its status. Weak pointers.
-  void AddConsumer(imgRequestProxy* aConsumer);
-  bool RemoveConsumer(imgRequestProxy* aConsumer, nsresult aStatus);
-  size_t ConsumerCount() const {
-    MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
-    return mConsumers.Length();
-  }
-
-  // This is intentionally non-general because its sole purpose is to support an
-  // some obscure network priority logic in imgRequest. That stuff could probably
-  // be improved, but it's too scary to mess with at the moment.
-  bool FirstConsumerIs(imgRequestProxy* aConsumer);
-
-  void AdoptConsumers(imgStatusTracker* aTracker) {
-    MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
-    MOZ_ASSERT(aTracker);
-    mConsumers = aTracker->mConsumers;
-  }
-
-  // Returns whether we are in the process of loading; that is, whether we have
-  // not received OnStopRequest.
-  bool IsLoading() const;
-
-  // Get the current image status (as in imgIRequest).
-  uint32_t GetImageStatus() const;
-
-  // Following are all the notification methods. You must call the Record
-  // variant on this status tracker, then call the Send variant for each proxy
-  // you want to notify.
-
-  // Call when the request is being cancelled.
-  void RecordCancel();
-
-  // Shorthand for recording all the load notifications: StartRequest,
-  // StartContainer, StopRequest.
-  void RecordLoaded();
-
-  // Shorthand for recording all the decode notifications: StartDecode,
-  // DataAvailable, StopFrame, StopDecode.
-  void RecordDecoded();
-
-  /* non-virtual imgDecoderObserver methods */
-  // Functions with prefix Send- are main thread only, since they contain calls
-  // to imgRequestProxy functions, which are expected on the main thread.
-  void RecordStartDecode();
-  void SendStartDecode(imgRequestProxy* aProxy);
-  void RecordStartContainer(imgIContainer* aContainer);
-  void SendStartContainer(imgRequestProxy* aProxy);
-  void RecordStopFrame();
-  void SendStopFrame(imgRequestProxy* aProxy);
-  void RecordStopDecode(nsresult statusg);
-  void SendStopDecode(imgRequestProxy* aProxy, nsresult aStatus);
-  void SendDiscard(imgRequestProxy* aProxy);
-  void RecordUnlockedDraw();
-  void SendUnlockedDraw(imgRequestProxy* aProxy);
-  void RecordImageIsAnimated();
-  void SendImageIsAnimated(imgRequestProxy *aProxy);
-
-  /* non-virtual sort-of-nsIRequestObserver methods */
-  // Functions with prefix Send- are main thread only, since they contain calls
-  // to imgRequestProxy functions, which are expected on the main thread.
-  void RecordStartRequest();
-  void SendStartRequest(imgRequestProxy* aProxy);
-  void RecordStopRequest(bool aLastPart, nsresult aStatus);
-  void SendStopRequest(imgRequestProxy* aProxy, bool aLastPart, nsresult aStatus);
-
-  // All main thread only because they call functions (like SendStartRequest)
-  // which are expected to be called on the main thread.
-  void OnStartRequest();
-  // OnDataAvailable will dispatch a call to itself onto the main thread if not
-  // called there.
-  void OnDataAvailable();
-  void OnStopRequest(bool aLastPart, nsresult aStatus);
-  void OnDiscard();
-  void OnUnlockedDraw();
-  // This is called only by VectorImage, and only to ensure tests work
-  // properly. Do not use it.
-  void OnStopFrame();
-
-  /* non-virtual imgIOnloadBlocker methods */
-  // NB: If UnblockOnload is sent, and then we are asked to replay the
-  // notifications, we will not send a BlockOnload/UnblockOnload pair.  This
-  // is different from all the other notifications.
-  void RecordBlockOnload();
-  void SendBlockOnload(imgRequestProxy* aProxy);
-  void RecordUnblockOnload();
-  void SendUnblockOnload(imgRequestProxy* aProxy);
-
-  // Main thread only because mConsumers is not threadsafe.
-  void MaybeUnblockOnload();
-
-  void RecordError();
-
-  bool IsMultipart() const { return mState & mozilla::image::FLAG_IS_MULTIPART; }
-
-  // Weak pointer getters - no AddRefs.
-  inline already_AddRefed<mozilla::image::Image> GetImage() const {
-    nsRefPtr<mozilla::image::Image> image = mImage;
-    return image.forget();
-  }
-  inline bool HasImage() { return mImage; }
-
-  inline imgDecoderObserver* GetDecoderObserver() { return mTrackerObserver.get(); }
-
-  already_AddRefed<imgStatusTracker> CloneForRecording();
-
-  // Compute the difference between this status tracker and aOther.
-  mozilla::image::ImageStatusDiff Difference(imgStatusTracker* aOther) const;
-
-  // Captures all of the decode notifications (i.e., not OnStartRequest /
-  // OnStopRequest) so far as an ImageStatusDiff.
-  mozilla::image::ImageStatusDiff DecodeStateAsDifference() const;
-
-  // Update our state to incorporate the changes in aDiff.
-  void ApplyDifference(const mozilla::image::ImageStatusDiff& aDiff);
-
-  // Notify for the changes captured in an ImageStatusDiff. Because this may
-  // result in recursive notifications, no decoding locks may be held.
-  // Called on the main thread only.
-  void SyncNotifyDifference(const mozilla::image::ImageStatusDiff& aDiff,
-                            const nsIntRect& aInvalidRect = nsIntRect());
-
-private:
-  typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy>> ProxyArray;
-  friend class imgStatusNotifyRunnable;
-  friend class imgRequestNotifyRunnable;
-  friend class imgStatusTrackerObserver;
-  friend class imgStatusTrackerInit;
-  imgStatusTracker(const imgStatusTracker& aOther);
-
-  // Main thread only because it deals with the observer service.
-  void FireFailureNotification();
-
-  // Main thread only, since imgRequestProxy calls are expected on the main
-  // thread, and mConsumers is not threadsafe.
-  static void SyncNotifyState(ProxyArray& aProxies,
-                              bool aHasImage, uint32_t aState,
-                              const nsIntRect& aInvalidRect);
-
-  nsCOMPtr<nsIRunnable> mRequestRunnable;
-
-  // This weak ref should be set null when the image goes out of scope.
-  mozilla::image::Image* mImage;
-
-  // List of proxies attached to the image. Each proxy represents a consumer
-  // using the image. Array and/or individual elements should only be accessed
-  // on the main thread.
-  ProxyArray mConsumers;
-
-  mozilla::RefPtr<imgDecoderObserver> mTrackerObserver;
-
-  uint32_t mState;
-};
-
-class imgStatusTrackerInit
-{
-public:
-  imgStatusTrackerInit(mozilla::image::Image* aImage,
-                       imgStatusTracker* aTracker);
-  ~imgStatusTrackerInit();
-private:
-  imgStatusTracker* mTracker;
-};
-
-#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgTools.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgTools.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/imgTools.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/imgTools.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -60,13 +60,13 @@
                                     imgIContainer **aContainer)
 {
   nsresult rv;
-  nsRefPtr<image::Image> image;
 
   NS_ENSURE_ARG_POINTER(aInStr);
 
   // Create a new image container to hold the decoded data.
   nsAutoCString mimeType(aMimeType);
-  image = ImageFactory::CreateAnonymousImage(mimeType);
+  nsRefPtr<image::Image> image = ImageFactory::CreateAnonymousImage(mimeType);
+  nsRefPtr<ProgressTracker> tracker = image->GetProgressTracker();
 
   if (image->HasError())
     return NS_ERROR_FAILURE;
@@ -89,8 +89,10 @@
   // Send the source data to the Image.
   rv = image->OnImageDataAvailable(nullptr, nullptr, inStream, 0, uint32_t(length));
   NS_ENSURE_SUCCESS(rv, rv);
+
   // Let the Image know we've sent all the data.
   rv = image->OnImageDataComplete(nullptr, nullptr, NS_OK, true);
+  tracker->SyncNotifyProgress(FLAG_LOAD_COMPLETE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // All done.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/moz.build	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/moz.build	2014-11-26 21:45:47.000000000 +0000
@@ -16,6 +16,7 @@
 
 UNIFIED_SOURCES += [
     'ClippedImage.cpp',
+    'DecodePool.cpp',
     'Decoder.cpp',
     'DiscardTracker.cpp',
     'DynamicImage.cpp',
@@ -43,7 +44,7 @@
     'imgLoader.cpp',
     'imgRequest.cpp',
     'imgRequestProxy.cpp',
-    'imgStatusTracker.cpp',
+    'ProgressTracker.cpp',
     'RasterImage.cpp',
 ]
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/OrientedImage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/OrientedImage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/OrientedImage.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/OrientedImage.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -112,7 +112,7 @@
 
   // Determine an appropriate format for the surface.
   gfx::SurfaceFormat surfaceFormat;
-  if (InnerImage()->FrameIsOpaque(aWhichFrame)) {
+  if (InnerImage()->IsOpaque()) {
     surfaceFormat = gfx::SurfaceFormat::B8G8R8X8;
   } else {
     surfaceFormat = gfx::SurfaceFormat::B8G8R8A8;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ProgressTracker.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ProgressTracker.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ProgressTracker.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ProgressTracker.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,539 @@
+/* -*- 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 "ImageLogging.h"
+#include "ProgressTracker.h"
+
+#include "imgIContainer.h"
+#include "imgRequestProxy.h"
+#include "Image.h"
+#include "nsNetUtil.h"
+#include "nsIObserverService.h"
+
+#include "mozilla/Assertions.h"
+#include "mozilla/Services.h"
+
+using mozilla::WeakPtr;
+
+namespace mozilla {
+namespace image {
+
+ProgressTrackerInit::ProgressTrackerInit(Image* aImage,
+                                         ProgressTracker* aTracker)
+{
+  MOZ_ASSERT(aImage);
+
+  if (aTracker) {
+    mTracker = aTracker;
+    mTracker->SetImage(aImage);
+  } else {
+    mTracker = new ProgressTracker(aImage);
+  }
+  aImage->SetProgressTracker(mTracker);
+  MOZ_ASSERT(mTracker);
+}
+
+ProgressTrackerInit::~ProgressTrackerInit()
+{
+  mTracker->ResetImage();
+}
+
+static void
+CheckProgressConsistency(Progress aProgress)
+{
+  // Check preconditions for every progress bit.
+
+  if (aProgress & FLAG_SIZE_AVAILABLE) {
+    // No preconditions.
+  }
+  if (aProgress & FLAG_DECODE_STARTED) {
+    // No preconditions.
+  }
+  if (aProgress & FLAG_DECODE_COMPLETE) {
+    MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
+  }
+  if (aProgress & FLAG_FRAME_COMPLETE) {
+    MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
+  }
+  if (aProgress & FLAG_LOAD_COMPLETE) {
+    // No preconditions.
+  }
+  if (aProgress & FLAG_ONLOAD_BLOCKED) {
+    if (aProgress & FLAG_IS_MULTIPART) {
+      MOZ_ASSERT(aProgress & FLAG_ONLOAD_UNBLOCKED);
+    } else {
+      MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
+    }
+  }
+  if (aProgress & FLAG_ONLOAD_UNBLOCKED) {
+    MOZ_ASSERT(aProgress & FLAG_ONLOAD_BLOCKED);
+    MOZ_ASSERT(aProgress & (FLAG_FRAME_COMPLETE |
+                            FLAG_IS_MULTIPART |
+                            FLAG_HAS_ERROR));
+  }
+  if (aProgress & FLAG_IS_ANIMATED) {
+    MOZ_ASSERT(aProgress & FLAG_DECODE_STARTED);
+    MOZ_ASSERT(aProgress & FLAG_SIZE_AVAILABLE);
+  }
+  if (aProgress & FLAG_HAS_TRANSPARENCY) {
+    MOZ_ASSERT(aProgress & FLAG_SIZE_AVAILABLE);
+  }
+  if (aProgress & FLAG_IS_MULTIPART) {
+    // No preconditions.
+  }
+  if (aProgress & FLAG_LAST_PART_COMPLETE) {
+    MOZ_ASSERT(aProgress & FLAG_LOAD_COMPLETE);
+  }
+  if (aProgress & FLAG_HAS_ERROR) {
+    // No preconditions.
+  }
+}
+
+void
+ProgressTracker::SetImage(Image* aImage)
+{
+  NS_ABORT_IF_FALSE(aImage, "Setting null image");
+  NS_ABORT_IF_FALSE(!mImage, "Setting image when we already have one");
+  mImage = aImage;
+}
+
+void
+ProgressTracker::ResetImage()
+{
+  NS_ABORT_IF_FALSE(mImage, "Resetting image when it's already null!");
+  mImage = nullptr;
+}
+
+void ProgressTracker::SetIsMultipart()
+{
+  if (mProgress & FLAG_IS_MULTIPART) {
+    return;
+  }
+
+  MOZ_ASSERT(!(mProgress & FLAG_ONLOAD_BLOCKED),
+             "Blocked onload before we knew we were multipart?");
+
+  // Set the MULTIPART flag and ensure that we never block onload.
+  mProgress |= FLAG_IS_MULTIPART | FLAG_ONLOAD_BLOCKED | FLAG_ONLOAD_UNBLOCKED;
+
+  CheckProgressConsistency(mProgress);
+}
+
+bool
+ProgressTracker::IsLoading() const
+{
+  // Checking for whether OnStopRequest has fired allows us to say we're
+  // loading before OnStartRequest gets called, letting the request properly
+  // get removed from the cache in certain cases.
+  return !(mProgress & FLAG_LOAD_COMPLETE);
+}
+
+uint32_t
+ProgressTracker::GetImageStatus() const
+{
+  uint32_t status = imgIRequest::STATUS_NONE;
+
+  // Translate our current state to a set of imgIRequest::STATE_* flags.
+  if (mProgress & FLAG_SIZE_AVAILABLE) {
+    status |= imgIRequest::STATUS_SIZE_AVAILABLE;
+  }
+  if (mProgress & FLAG_DECODE_STARTED) {
+    status |= imgIRequest::STATUS_DECODE_STARTED;
+  }
+  if (mProgress & FLAG_DECODE_COMPLETE) {
+    status |= imgIRequest::STATUS_DECODE_COMPLETE;
+  }
+  if (mProgress & FLAG_FRAME_COMPLETE) {
+    status |= imgIRequest::STATUS_FRAME_COMPLETE;
+  }
+  if (mProgress & FLAG_LOAD_COMPLETE) {
+    status |= imgIRequest::STATUS_LOAD_COMPLETE;
+  }
+  if (mProgress & FLAG_IS_ANIMATED) {
+    status |= imgIRequest::STATUS_IS_ANIMATED;
+  }
+  if (mProgress & FLAG_HAS_TRANSPARENCY) {
+    status |= imgIRequest::STATUS_HAS_TRANSPARENCY;
+  }
+  if (mProgress & FLAG_HAS_ERROR) {
+    status |= imgIRequest::STATUS_ERROR;
+  }
+
+  return status;
+}
+
+// A helper class to allow us to call SyncNotify asynchronously.
+class AsyncNotifyRunnable : public nsRunnable
+{
+  public:
+    AsyncNotifyRunnable(ProgressTracker* aTracker,
+                        imgRequestProxy* aRequestProxy)
+      : mTracker(aTracker)
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
+      MOZ_ASSERT(aTracker, "aTracker should not be null");
+      MOZ_ASSERT(aRequestProxy, "aRequestProxy should not be null");
+      mProxies.AppendElement(aRequestProxy);
+    }
+
+    NS_IMETHOD Run()
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
+      MOZ_ASSERT(mTracker, "mTracker should not be null");
+      for (uint32_t i = 0; i < mProxies.Length(); ++i) {
+        mProxies[i]->SetNotificationsDeferred(false);
+        mTracker->SyncNotify(mProxies[i]);
+      }
+
+      mTracker->mRunnable = nullptr;
+      return NS_OK;
+    }
+
+    void AddProxy(imgRequestProxy* aRequestProxy)
+    {
+      mProxies.AppendElement(aRequestProxy);
+    }
+
+    void RemoveProxy(imgRequestProxy* aRequestProxy)
+    {
+      mProxies.RemoveElement(aRequestProxy);
+    }
+
+  private:
+    friend class ProgressTracker;
+
+    nsRefPtr<ProgressTracker> mTracker;
+    nsTArray<nsRefPtr<imgRequestProxy>> mProxies;
+};
+
+void
+ProgressTracker::Notify(imgRequestProxy* proxy)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "imgRequestProxy is not threadsafe");
+#ifdef PR_LOGGING
+  if (mImage && mImage->GetURI()) {
+    nsRefPtr<ImageURL> uri(mImage->GetURI());
+    nsAutoCString spec;
+    uri->GetSpec(spec);
+    LOG_FUNC_WITH_PARAM(GetImgLog(), "ProgressTracker::Notify async", "uri", spec.get());
+  } else {
+    LOG_FUNC_WITH_PARAM(GetImgLog(), "ProgressTracker::Notify async", "uri", "<unknown>");
+  }
+#endif
+
+  proxy->SetNotificationsDeferred(true);
+
+  // If we have an existing runnable that we can use, we just append this proxy
+  // to its list of proxies to be notified. This ensures we don't unnecessarily
+  // delay onload.
+  AsyncNotifyRunnable* runnable =
+    static_cast<AsyncNotifyRunnable*>(mRunnable.get());
+
+  if (runnable) {
+    runnable->AddProxy(proxy);
+  } else {
+    mRunnable = new AsyncNotifyRunnable(this, proxy);
+    NS_DispatchToCurrentThread(mRunnable);
+  }
+}
+
+// A helper class to allow us to call SyncNotify asynchronously for a given,
+// fixed, state.
+class AsyncNotifyCurrentStateRunnable : public nsRunnable
+{
+  public:
+    AsyncNotifyCurrentStateRunnable(ProgressTracker* aProgressTracker,
+                                    imgRequestProxy* aProxy)
+      : mProgressTracker(aProgressTracker)
+      , mProxy(aProxy)
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be created on the main thread");
+      MOZ_ASSERT(mProgressTracker, "mProgressTracker should not be null");
+      MOZ_ASSERT(mProxy, "mProxy should not be null");
+      mImage = mProgressTracker->GetImage();
+    }
+
+    NS_IMETHOD Run()
+    {
+      MOZ_ASSERT(NS_IsMainThread(), "Should be running on the main thread");
+      mProxy->SetNotificationsDeferred(false);
+
+      mProgressTracker->SyncNotify(mProxy);
+      return NS_OK;
+    }
+
+  private:
+    nsRefPtr<ProgressTracker> mProgressTracker;
+    nsRefPtr<imgRequestProxy> mProxy;
+
+    // We have to hold on to a reference to the tracker's image, just in case
+    // it goes away while we're in the event queue.
+    nsRefPtr<Image> mImage;
+};
+
+void
+ProgressTracker::NotifyCurrentState(imgRequestProxy* proxy)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "imgRequestProxy is not threadsafe");
+#ifdef PR_LOGGING
+  nsRefPtr<ImageURL> uri;
+  proxy->GetURI(getter_AddRefs(uri));
+  nsAutoCString spec;
+  uri->GetSpec(spec);
+  LOG_FUNC_WITH_PARAM(GetImgLog(), "ProgressTracker::NotifyCurrentState", "uri", spec.get());
+#endif
+
+  proxy->SetNotificationsDeferred(true);
+
+  nsCOMPtr<nsIRunnable> ev = new AsyncNotifyCurrentStateRunnable(this, proxy);
+  NS_DispatchToCurrentThread(ev);
+}
+
+#define NOTIFY_IMAGE_OBSERVERS(PROXIES, FUNC) \
+  do { \
+    ProxyArray::ForwardIterator iter(PROXIES); \
+    while (iter.HasMore()) { \
+      nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get(); \
+      if (proxy && !proxy->NotificationsDeferred()) { \
+        proxy->FUNC; \
+      } \
+    } \
+  } while (false);
+
+/* static */ void
+ProgressTracker::SyncNotifyInternal(ProxyArray& aProxies,
+                                    bool aHasImage,
+                                    Progress aProgress,
+                                    const nsIntRect& aDirtyRect)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (aProgress & FLAG_SIZE_AVAILABLE)
+    NOTIFY_IMAGE_OBSERVERS(aProxies, OnSizeAvailable());
+
+  if (aProgress & FLAG_DECODE_STARTED)
+    NOTIFY_IMAGE_OBSERVERS(aProxies, OnStartDecode());
+
+  if (aProgress & FLAG_ONLOAD_BLOCKED)
+    NOTIFY_IMAGE_OBSERVERS(aProxies, BlockOnload());
+
+  if (aHasImage) {
+    // OnFrameUpdate
+    // If there's any content in this frame at all (always true for
+    // vector images, true for raster images that have decoded at
+    // least one frame) then send OnFrameUpdate.
+    if (!aDirtyRect.IsEmpty())
+      NOTIFY_IMAGE_OBSERVERS(aProxies, OnFrameUpdate(&aDirtyRect));
+
+    if (aProgress & FLAG_FRAME_COMPLETE)
+      NOTIFY_IMAGE_OBSERVERS(aProxies, OnFrameComplete());
+
+    if (aProgress & FLAG_HAS_TRANSPARENCY)
+      NOTIFY_IMAGE_OBSERVERS(aProxies, OnImageHasTransparency());
+
+    if (aProgress & FLAG_IS_ANIMATED)
+      NOTIFY_IMAGE_OBSERVERS(aProxies, OnImageIsAnimated());
+  }
+
+  // Send UnblockOnload before OnStopDecode and OnStopRequest. This allows
+  // observers that can fire events when they receive those notifications to do
+  // so then, instead of being forced to wait for UnblockOnload.
+  if (aProgress & FLAG_ONLOAD_UNBLOCKED) {
+    NOTIFY_IMAGE_OBSERVERS(aProxies, UnblockOnload());
+  }
+
+  if (aProgress & FLAG_DECODE_COMPLETE) {
+    MOZ_ASSERT(aHasImage, "Stopped decoding without ever having an image?");
+    NOTIFY_IMAGE_OBSERVERS(aProxies, OnDecodeComplete());
+  }
+
+  if (aProgress & FLAG_LOAD_COMPLETE) {
+    NOTIFY_IMAGE_OBSERVERS(aProxies,
+                           OnLoadComplete(aProgress & FLAG_LAST_PART_COMPLETE));
+  }
+}
+
+void
+ProgressTracker::SyncNotifyProgress(Progress aProgress,
+                                    const nsIntRect& aInvalidRect /* = nsIntRect() */)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
+
+  // Don't unblock onload if we're not blocked.
+  Progress progress = Difference(aProgress);
+  if (!((mProgress | progress) & FLAG_ONLOAD_BLOCKED)) {
+    progress &= ~FLAG_ONLOAD_UNBLOCKED;
+  }
+
+  // Apply the changes.
+  mProgress |= progress;
+
+  CheckProgressConsistency(mProgress);
+
+  // Send notifications.
+  SyncNotifyInternal(mConsumers, !!mImage, progress, aInvalidRect);
+
+  if (progress & FLAG_HAS_ERROR) {
+    FireFailureNotification();
+  }
+}
+
+void
+ProgressTracker::SyncNotify(imgRequestProxy* proxy)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "imgRequestProxy is not threadsafe");
+#ifdef PR_LOGGING
+  nsRefPtr<ImageURL> uri;
+  proxy->GetURI(getter_AddRefs(uri));
+  nsAutoCString spec;
+  uri->GetSpec(spec);
+  LOG_SCOPE_WITH_PARAM(GetImgLog(), "ProgressTracker::SyncNotify", "uri", spec.get());
+#endif
+
+  nsIntRect r;
+  if (mImage) {
+    // XXX - Should only send partial rects here, but that needs to
+    // wait until we fix up the observer interface
+    r = mImage->FrameRect(imgIContainer::FRAME_CURRENT);
+  }
+
+  ProxyArray array;
+  array.AppendElement(proxy);
+  SyncNotifyInternal(array, !!mImage, mProgress, r);
+}
+
+void
+ProgressTracker::EmulateRequestFinished(imgRequestProxy* aProxy,
+                                        nsresult aStatus)
+{
+  MOZ_ASSERT(NS_IsMainThread(),
+             "SyncNotifyState and mConsumers are not threadsafe");
+  nsCOMPtr<imgIRequest> kungFuDeathGrip(aProxy);
+
+  if (mProgress & FLAG_ONLOAD_BLOCKED && !(mProgress & FLAG_ONLOAD_UNBLOCKED)) {
+    aProxy->UnblockOnload();
+  }
+
+  if (!(mProgress & FLAG_LOAD_COMPLETE)) {
+    aProxy->OnLoadComplete(true);
+  }
+}
+
+void
+ProgressTracker::AddConsumer(imgRequestProxy* aConsumer)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mConsumers.AppendElementUnlessExists(aConsumer);
+}
+
+// XXX - The last argument should go away.
+bool
+ProgressTracker::RemoveConsumer(imgRequestProxy* aConsumer, nsresult aStatus)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  // Remove the proxy from the list.
+  bool removed = mConsumers.RemoveElement(aConsumer);
+
+  // Consumers can get confused if they don't get all the proper teardown
+  // notifications. Part ways on good terms.
+  if (removed && !aConsumer->NotificationsDeferred()) {
+    EmulateRequestFinished(aConsumer, aStatus);
+  }
+
+  // Make sure we don't give callbacks to a consumer that isn't interested in
+  // them any more.
+  AsyncNotifyRunnable* runnable =
+    static_cast<AsyncNotifyRunnable*>(mRunnable.get());
+
+  if (aConsumer->NotificationsDeferred() && runnable) {
+    runnable->RemoveProxy(aConsumer);
+    aConsumer->SetNotificationsDeferred(false);
+  }
+
+  return removed;
+}
+
+bool
+ProgressTracker::FirstConsumerIs(imgRequestProxy* aConsumer)
+{
+  MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
+  ProxyArray::ForwardIterator iter(mConsumers);
+  while (iter.HasMore()) {
+    nsRefPtr<imgRequestProxy> proxy = iter.GetNext().get();
+    if (proxy) {
+      return proxy.get() == aConsumer;
+    }
+  }
+  return false;
+}
+
+void
+ProgressTracker::OnUnlockedDraw()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NOTIFY_IMAGE_OBSERVERS(mConsumers, OnUnlockedDraw());
+}
+
+void
+ProgressTracker::ResetForNewRequest()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // We're starting a new load (and if this is called more than once, this is a
+  // multipart request) so keep only the bits that carry over between loads.
+  mProgress &= FLAG_IS_MULTIPART | FLAG_HAS_ERROR |
+               FLAG_ONLOAD_BLOCKED | FLAG_ONLOAD_UNBLOCKED;
+
+  CheckProgressConsistency(mProgress);
+}
+
+void
+ProgressTracker::OnDiscard()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  NOTIFY_IMAGE_OBSERVERS(mConsumers, OnDiscard());
+}
+
+void
+ProgressTracker::OnImageAvailable()
+{
+  if (!NS_IsMainThread()) {
+    // Note: SetHasImage calls Image::Lock and Image::IncrementAnimationCounter
+    // so subsequent calls or dispatches which Unlock or Decrement~ should
+    // be issued after this to avoid race conditions.
+    NS_DispatchToMainThread(
+      NS_NewRunnableMethod(this, &ProgressTracker::OnImageAvailable));
+    return;
+  }
+
+  NOTIFY_IMAGE_OBSERVERS(mConsumers, SetHasImage());
+}
+
+void
+ProgressTracker::FireFailureNotification()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Some kind of problem has happened with image decoding.
+  // Report the URI to net:failed-to-process-uri-conent observers.
+  if (mImage) {
+    // Should be on main thread, so ok to create a new nsIURI.
+    nsCOMPtr<nsIURI> uri;
+    {
+      nsRefPtr<ImageURL> threadsafeUriData = mImage->GetURI();
+      uri = threadsafeUriData ? threadsafeUriData->ToIURI() : nullptr;
+    }
+    if (uri) {
+      nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+      if (os) {
+        os->NotifyObservers(uri, "net:failed-to-process-uri-content", nullptr);
+      }
+    }
+  }
+}
+
+} // namespace image
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ProgressTracker.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ProgressTracker.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ProgressTracker.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ProgressTracker.h	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,233 @@
+/* -*- 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 ProgressTracker_h__
+#define ProgressTracker_h__
+
+#include "mozilla/RefPtr.h"
+#include "mozilla/WeakPtr.h"
+#include "nsCOMPtr.h"
+#include "nsTObserverArray.h"
+#include "nsThreadUtils.h"
+#include "nsRect.h"
+#include "imgRequestProxy.h"
+
+class imgIContainer;
+class nsIRunnable;
+
+namespace mozilla {
+namespace image {
+
+class AsyncNotifyRunnable;
+class AsyncNotifyCurrentStateRunnable;
+class Image;
+
+// Image progress bitflags.
+enum {
+  FLAG_SIZE_AVAILABLE     = 1u << 0,  // STATUS_SIZE_AVAILABLE
+  FLAG_DECODE_STARTED     = 1u << 1,  // STATUS_DECODE_STARTED
+  FLAG_DECODE_COMPLETE    = 1u << 2,  // STATUS_DECODE_COMPLETE
+  FLAG_FRAME_COMPLETE     = 1u << 3,  // STATUS_FRAME_COMPLETE
+  FLAG_LOAD_COMPLETE      = 1u << 4,  // STATUS_LOAD_COMPLETE
+  FLAG_ONLOAD_BLOCKED     = 1u << 5,
+  FLAG_ONLOAD_UNBLOCKED   = 1u << 6,
+  FLAG_IS_ANIMATED        = 1u << 7,  // STATUS_IS_ANIMATED
+  FLAG_HAS_TRANSPARENCY   = 1u << 8,  // STATUS_HAS_TRANSPARENCY
+  FLAG_IS_MULTIPART       = 1u << 9,
+  FLAG_LAST_PART_COMPLETE = 1u << 10,
+  FLAG_HAS_ERROR          = 1u << 11  // STATUS_ERROR
+};
+
+typedef uint32_t Progress;
+
+const uint32_t NoProgress = 0;
+
+inline Progress LoadCompleteProgress(bool aLastPart,
+                                     bool aError,
+                                     nsresult aStatus)
+{
+  Progress progress = FLAG_LOAD_COMPLETE;
+  if (aLastPart) {
+    progress |= FLAG_LAST_PART_COMPLETE;
+  }
+  if (NS_FAILED(aStatus) || aError) {
+    progress |= FLAG_HAS_ERROR;
+  }
+  return progress;
+}
+
+/**
+ * ProgressTracker is a class that records an Image's progress through the
+ * loading and decoding process, and makes it possible to send notifications to
+ * imgRequestProxys, both synchronously and asynchronously.
+ *
+ * When a new proxy needs to be notified of the current progress of an image,
+ * call the Notify() method on this class with the relevant proxy as its
+ * argument, and the notifications will be replayed to the proxy asynchronously.
+ */
+class ProgressTracker : public mozilla::SupportsWeakPtr<ProgressTracker>
+{
+  virtual ~ProgressTracker() { }
+
+public:
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(ProgressTracker)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ProgressTracker)
+
+  // aImage is the image that will be passed to the observers in SyncNotify()
+  // and EmulateRequestFinished(), and must be alive as long as this instance
+  // is, because we hold a weak reference to it.
+  explicit ProgressTracker(Image* aImage)
+    : mImage(aImage)
+    , mProgress(NoProgress)
+  { }
+
+  bool HasImage() const { return mImage; }
+  already_AddRefed<Image> GetImage() const
+  {
+    nsRefPtr<Image> image = mImage;
+    return image.forget();
+  }
+
+  // Informs this ProgressTracker that it's associated with a multipart image.
+  void SetIsMultipart();
+
+  // Returns whether we are in the process of loading; that is, whether we have
+  // not received OnStopRequest from Necko.
+  bool IsLoading() const;
+
+  // Get the current image status (as in imgIRequest).
+  uint32_t GetImageStatus() const;
+
+  // Get the current Progress.
+  Progress GetProgress() const { return mProgress; }
+ 
+  // Schedule an asynchronous "replaying" of all the notifications that would
+  // have to happen to put us in the current state.
+  // We will also take note of any notifications that happen between the time
+  // Notify() is called and when we call SyncNotify on |proxy|, and replay them
+  // as well.
+  // Should be called on the main thread only, since imgRequestProxy and GetURI
+  // are not threadsafe.
+  void Notify(imgRequestProxy* proxy);
+
+  // Schedule an asynchronous "replaying" of all the notifications that would
+  // have to happen to put us in the state we are in right now.
+  // Unlike Notify(), does *not* take into account future notifications.
+  // This is only useful if you do not have an imgRequest, e.g., if you are a
+  // static request returned from imgIRequest::GetStaticRequest().
+  // Should be called on the main thread only, since imgRequestProxy and GetURI
+  // are not threadsafe.
+  void NotifyCurrentState(imgRequestProxy* proxy);
+
+  // "Replay" all of the notifications that would have to happen to put us in
+  // the state we're currently in.
+  // Only use this if you're already servicing an asynchronous call (e.g.
+  // OnStartRequest).
+  // Should be called on the main thread only, since imgRequestProxy and GetURI
+  // are not threadsafe.
+  void SyncNotify(imgRequestProxy* proxy);
+
+  // Get this ProgressTracker ready for a new request. This resets all the
+  // state that doesn't persist between requests.
+  void ResetForNewRequest();
+
+  // Stateless notifications. These are dispatched and immediately forgotten
+  // about. All except OnImageAvailable are main thread only.
+  void OnDiscard();
+  void OnUnlockedDraw();
+  void OnImageAvailable();
+
+  // Compute the difference between this our progress and aProgress. This allows
+  // callers to predict whether SyncNotifyProgress will send any notifications.
+  Progress Difference(Progress aProgress) const
+  {
+    return ~mProgress & aProgress;
+  }
+
+  // Update our state to incorporate the changes in aProgress and synchronously
+  // notify our observers.
+  //
+  // Because this may result in recursive notifications, no decoding locks may
+  // be held.  Called on the main thread only.
+  void SyncNotifyProgress(Progress aProgress,
+                          const nsIntRect& aInvalidRect = nsIntRect());
+
+  // We manage a set of consumers that are using an image and thus concerned
+  // with its loading progress. Weak pointers.
+  void AddConsumer(imgRequestProxy* aConsumer);
+  bool RemoveConsumer(imgRequestProxy* aConsumer, nsresult aStatus);
+  size_t ConsumerCount() const {
+    MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
+    return mConsumers.Length();
+  }
+
+  // This is intentionally non-general because its sole purpose is to support an
+  // some obscure network priority logic in imgRequest. That stuff could probably
+  // be improved, but it's too scary to mess with at the moment.
+  bool FirstConsumerIs(imgRequestProxy* aConsumer);
+
+  void AdoptConsumers(ProgressTracker* aTracker) {
+    MOZ_ASSERT(NS_IsMainThread(), "Use mConsumers on main thread only");
+    MOZ_ASSERT(aTracker);
+    mConsumers = aTracker->mConsumers;
+  }
+
+private:
+  typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy>> ProxyArray;
+  friend class AsyncNotifyRunnable;
+  friend class AsyncNotifyCurrentStateRunnable;
+  friend class ProgressTrackerInit;
+
+  ProgressTracker(const ProgressTracker& aOther) MOZ_DELETE;
+
+  // This method should only be called once, and only on an ProgressTracker
+  // that was initialized without an image. ProgressTrackerInit automates this.
+  void SetImage(Image* aImage);
+
+  // Resets our weak reference to our image, for when mImage is about to go out
+  // of scope.  ProgressTrackerInit automates this.
+  void ResetImage();
+
+  // Send some notifications that would be necessary to make |aProxy| believe
+  // the request is finished downloading and decoding.  We only send
+  // FLAG_REQUEST_* and FLAG_ONLOAD_UNBLOCKED, and only if necessary.
+  void EmulateRequestFinished(imgRequestProxy* aProxy, nsresult aStatus);
+
+  // Main thread only because it deals with the observer service.
+  void FireFailureNotification();
+
+  // Main thread only, since imgRequestProxy calls are expected on the main
+  // thread, and mConsumers is not threadsafe.
+  static void SyncNotifyInternal(ProxyArray& aProxies,
+                                 bool aHasImage, Progress aProgress,
+                                 const nsIntRect& aInvalidRect);
+
+  nsCOMPtr<nsIRunnable> mRunnable;
+
+  // This weak ref should be set null when the image goes out of scope.
+  Image* mImage;
+
+  // List of proxies attached to the image. Each proxy represents a consumer
+  // using the image. Array and/or individual elements should only be accessed
+  // on the main thread.
+  ProxyArray mConsumers;
+
+  Progress mProgress;
+};
+
+class ProgressTrackerInit
+{
+public:
+  ProgressTrackerInit(Image* aImage, ProgressTracker* aTracker);
+  ~ProgressTrackerInit();
+private:
+  ProgressTracker* mTracker;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/RasterImage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/RasterImage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/RasterImage.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/RasterImage.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -11,7 +11,6 @@
 #include "base/histogram.h"
 #include "gfxPlatform.h"
 #include "nsComponentManagerUtils.h"
-#include "imgDecoderObserver.h"
 #include "nsError.h"
 #include "Decoder.h"
 #include "nsAutoPtr.h"
@@ -21,9 +20,6 @@
 #include "ImageRegion.h"
 #include "Layers.h"
 #include "nsPresContext.h"
-#include "nsIThreadPool.h"
-#include "nsXPCOMCIDInternal.h"
-#include "nsIObserverService.h"
 #include "SurfaceCache.h"
 #include "FrameAnimator.h"
 
@@ -52,10 +48,6 @@
 #include "gfxPrefs.h"
 #include <algorithm>
 
-#ifdef MOZ_NUWA_PROCESS
-#include "ipc/Nuwa.h"
-#endif
-
 namespace mozilla {
 
 using namespace gfx;
@@ -297,7 +289,6 @@
   ScaleState           mState;
 };
 
-/* static */ StaticRefPtr<RasterImage::DecodePool> RasterImage::DecodePool::sSingleton;
 static nsCOMPtr<nsIThread> sScaleWorkerThread = nullptr;
 
 #ifndef DEBUG
@@ -308,7 +299,7 @@
 #endif
 
 //******************************************************************************
-RasterImage::RasterImage(imgStatusTracker* aStatusTracker,
+RasterImage::RasterImage(ProgressTracker* aProgressTracker,
                          ImageURL* aURI /* = nullptr */) :
   ImageResource(aURI), // invoke superclass's constructor
   mSize(0,0),
@@ -321,8 +312,8 @@
 #endif
   mDecodingMonitor("RasterImage Decoding Monitor"),
   mDecoder(nullptr),
-  mInDecoder(false),
-  mStatusDiff(ImageStatusDiff::NoChange()),
+  mDecodeStatus(DecodeStatus::INACTIVE),
+  mNotifyProgress(NoProgress),
   mNotifying(false),
   mHasSize(false),
   mDecodeOnDraw(false),
@@ -332,12 +323,10 @@
   mDecoded(false),
   mHasBeenDecoded(false),
   mAnimationFinished(false),
-  mFinishing(false),
-  mInUpdateImageContainer(false),
   mWantFullDecode(false),
   mPendingError(false)
 {
-  mStatusTrackerInit = new imgStatusTrackerInit(this, aStatusTracker);
+  mProgressTrackerInit = new ProgressTrackerInit(this, aProgressTracker);
 
   // Set up the discard tracker node.
   mDiscardTrackerNode.img = this;
@@ -484,9 +473,8 @@
 
     UpdateImageContainer();
 
-    if (mStatusTracker) {
-      mStatusTracker->SyncNotifyDifference(ImageStatusDiff::NoChange(),
-                                           res.dirtyRect);
+    if (mProgressTracker) {
+      mProgressTracker->SyncNotifyProgress(NoProgress, res.dirtyRect);
     }
   }
 
@@ -666,33 +654,22 @@
   return nsIntRect(nsIntPoint(0,0), mSize);
 }
 
-//******************************************************************************
-/* [notxpcom] boolean frameIsOpaque(in uint32_t aWhichFrame); */
 NS_IMETHODIMP_(bool)
-RasterImage::FrameIsOpaque(uint32_t aWhichFrame)
+RasterImage::IsOpaque()
 {
-  if (aWhichFrame > FRAME_MAX_VALUE) {
-    NS_WARNING("aWhichFrame outside valid range!");
+  if (mError) {
     return false;
   }
 
-  if (mError)
-    return false;
-
-  // See if we can get an image frame.
-  nsRefPtr<imgFrame> frame =
-    LookupFrameNoDecode(GetRequestedFrameIndex(aWhichFrame));
+  Progress progress = mProgressTracker->GetProgress();
 
-  // If we don't get a frame, the safe answer is "not opaque".
-  if (!frame)
+  // If we haven't yet finished decoding, the safe answer is "not opaque".
+  if (!(progress & FLAG_DECODE_COMPLETE)) {
     return false;
+  }
 
-  // Other, the frame is transparent if either:
-  //  1. It needs a background.
-  //  2. Its size doesn't cover our entire area.
-  nsIntRect framerect = frame->GetRect();
-  return !frame->GetNeedsBackground() &&
-         framerect.IsEqualInterior(nsIntRect(0, 0, mSize.width, mSize.height));
+  // Other, we're opaque if FLAG_HAS_TRANSPARENCY is not set.
+  return !(progress & FLAG_HAS_TRANSPARENCY);
 }
 
 nsIntRect
@@ -714,7 +691,7 @@
 
   // If the frame doesn't exist, we return the empty rectangle. It's not clear
   // whether this is appropriate in general, but at the moment the only
-  // consumer of this method is imgStatusTracker (when it wants to figure out
+  // consumer of this method is ProgressTracker (when it wants to figure out
   // dirty rectangles to send out batched observer updates). This should
   // probably be revisited when we fix bug 503973.
   return nsIntRect();
@@ -779,11 +756,7 @@
   if (mError)
     return nullptr;
 
-  // Disallowed in the API
-  if (mInDecoder && (aFlags & imgIContainer::FLAG_SYNC_DECODE))
-    return nullptr;
-
-  if (!ApplyDecodeFlags(aFlags, aWhichFrame))
+  if (!ApplyDecodeFlags(aFlags))
     return nullptr;
 
   // Get the frame. If it's not there, it's probably the caller's fault for
@@ -860,11 +833,7 @@
   if (mError)
     return nullptr;
 
-  // Disallowed in the API
-  if (mInDecoder && (aFlags & imgIContainer::FLAG_SYNC_DECODE))
-    return nullptr;
-
-  if (!ApplyDecodeFlags(aFlags, aWhichFrame))
+  if (!ApplyDecodeFlags(aFlags))
     return nullptr;
 
   // Get the frame. If it's not there, it's probably the caller's fault for
@@ -934,8 +903,8 @@
     return NS_OK;
   }
 
-  if (IsUnlocked() && mStatusTracker) {
-    mStatusTracker->OnUnlockedDraw();
+  if (IsUnlocked() && mProgressTracker) {
+    mProgressTracker->OnUnlockedDraw();
   }
 
   if (!mImageContainer) {
@@ -969,18 +938,16 @@
 void
 RasterImage::UpdateImageContainer()
 {
-  if (!mImageContainer || IsInUpdateImageContainer()) {
+  if (!mImageContainer) {
     return;
   }
 
-  SetInUpdateImageContainer(true);
-
   nsRefPtr<layers::Image> image = GetCurrentImage();
   if (!image) {
     return;
   }
+
   mImageContainer->SetCurrentImage(image);
-  SetInUpdateImageContainer(false);
 }
 
 size_t
@@ -1043,10 +1010,6 @@
     // since we didn't kill the source data in the old world either, locking
     // is acceptable for the moment.
     LockImage();
-
-    // Notify our observers that we are starting animation.
-    nsRefPtr<imgStatusTracker> statusTracker = CurrentStatusTracker();
-    statusTracker->RecordImageIsAnimated();
   }
 }
 
@@ -1146,7 +1109,7 @@
 }
 
 bool
-RasterImage::ApplyDecodeFlags(uint32_t aNewFlags, uint32_t aWhichFrame)
+RasterImage::ApplyDecodeFlags(uint32_t aNewFlags)
 {
   if (mFrameDecodeFlags == (aNewFlags & DECODE_FLAGS_MASK))
     return true; // Not asking very much of us here.
@@ -1159,7 +1122,7 @@
       (mFrameDecodeFlags & DECODE_FLAGS_MASK) & ~FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
     uint32_t newNonAlphaFlags =
       (aNewFlags & DECODE_FLAGS_MASK) & ~FLAG_DECODE_NO_PREMULTIPLY_ALPHA;
-    if (currentNonAlphaFlags == newNonAlphaFlags && FrameIsOpaque(aWhichFrame)) {
+    if (currentNonAlphaFlags == newNonAlphaFlags && IsOpaque()) {
       return true;
     }
 
@@ -1466,9 +1429,9 @@
   // we fix bug 500402.
 
   // Update display
-  if (mStatusTracker) {
+  if (mProgressTracker) {
     nsIntRect rect = mAnim->GetFirstFrameRefreshArea();
-    mStatusTracker->SyncNotifyDifference(ImageStatusDiff::NoChange(), rect);
+    mProgressTracker->SyncNotifyProgress(NoProgress, rect);
   }
 
   // Start the animation again. It may not have been running before, if
@@ -1535,9 +1498,6 @@
   NS_ABORT_IF_FALSE(!mHasSourceData, "Calling AddSourceData() after calling "
                                      "sourceDataComplete()!");
 
-  // This call should come straight from necko - no reentrancy allowed
-  NS_ABORT_IF_FALSE(!mInDecoder, "Re-entrant call to AddSourceData!");
-
   // Image is already decoded, we shouldn't be getting data, but it could
   // be extra garbage data at the end of a file.
   if (mDecoded) {
@@ -1566,7 +1526,7 @@
   // write the data directly to the decoder. (If we haven't gotten the size,
   // we'll queue up the data and write it out when we do.)
   if (!StoringSourceData() && mHasSize) {
-    rv = WriteToDecoder(aBuffer, aCount, DECODE_SYNC);
+    rv = WriteToDecoder(aBuffer, aCount, DecodeStrategy::SYNC);
     CONTAINER_ENSURE_SUCCESS(rv);
 
     rv = FinishedSomeDecoding();
@@ -1648,19 +1608,6 @@
   {
     ReentrantMonitorAutoEnter lock(mDecodingMonitor);
 
-    // If we're not storing any source data, then there's nothing more we can do
-    // once we've tried decoding for size.
-    if (!StoringSourceData() && mDecoder) {
-      nsresult rv = ShutdownDecoder(eShutdownIntent_Done);
-      CONTAINER_ENSURE_SUCCESS(rv);
-    }
-
-    // If DecodeUntilSizeAvailable didn't finish the decode, let the decode worker
-    // finish decoding this image.
-    if (mDecoder) {
-      DecodePool::Singleton()->RequestDecode(this);
-    }
-
     // Free up any extra space in the backing buffer
     mSourceData.Compact();
   }
@@ -1699,11 +1646,8 @@
   // We just recorded OnStopRequest; we need to inform our listeners.
   {
     ReentrantMonitorAutoEnter lock(mDecodingMonitor);
-
-    nsRefPtr<imgStatusTracker> statusTracker = CurrentStatusTracker();
-    statusTracker->GetDecoderObserver()->OnStopRequest(aLastPart, finalStatus);
-
-    FinishedSomeDecoding();
+    FinishedSomeDecoding(ShutdownReason::DONE,
+                         LoadCompleteProgress(aLastPart, mError, finalStatus));
   }
 
   return finalStatus;
@@ -1769,7 +1713,7 @@
   mHasSourceData = false;
   mHasSize = false;
   mWantFullDecode = true;
-  mDecodeRequest = nullptr;
+  mDecodeStatus = DecodeStatus::INACTIVE;
 
   if (mAnim) {
     mAnim->SetDoneDecoding(false);
@@ -1782,6 +1726,12 @@
   return NS_OK;
 }
 
+/* static */ already_AddRefed<nsIEventTarget>
+RasterImage::GetEventTarget()
+{
+  return DecodePool::Singleton()->GetEventTarget();
+}
+
 nsresult
 RasterImage::SetSourceSizeHint(uint32_t sizeHint)
 {
@@ -1867,10 +1817,10 @@
   mDecoded = false;
 
   // Notify that we discarded
-  if (mStatusTracker)
-    mStatusTracker->OnDiscard();
+  if (mProgressTracker)
+    mProgressTracker->OnDiscard();
 
-  mDecodeRequest = nullptr;
+  mDecodeStatus = DecodeStatus::INACTIVE;
 
   if (force)
     DiscardTracker::Remove(&mDiscardTrackerNode);
@@ -1990,12 +1940,6 @@
   }
 
   // Initialize the decoder
-  if (!mDecodeRequest) {
-    mDecodeRequest = new DecodeRequest(this);
-  }
-  MOZ_ASSERT(mDecodeRequest->mStatusTracker);
-  MOZ_ASSERT(mDecodeRequest->mStatusTracker->GetDecoderObserver());
-  mDecoder->SetObserver(mDecodeRequest->mStatusTracker->GetDecoderObserver());
   mDecoder->SetSizeDecode(aDoSizeDecode);
   mDecoder->SetDecodeFlags(mFrameDecodeFlags);
   if (!aDoSizeDecode) {
@@ -2032,20 +1976,17 @@
 // state. It is an error to call this function when there is no initialized
 // decoder.
 //
-// aIntent specifies the intent of the shutdown. If aIntent is
-// eShutdownIntent_Done, an error is flagged if we didn't get what we should
-// have out of the decode. If aIntent is eShutdownIntent_NotNeeded, we don't
-// check this. If aIntent is eShutdownIntent_Error, we shut down in error mode.
+// aReason specifies why the shutdown is happening. If aReason is
+// ShutdownReason::DONE, an error is flagged if we didn't get what we should
+// have out of the decode. If aReason is ShutdownReason::NOT_NEEDED, we don't
+// check this. If aReason is ShutdownReason::FATAL_ERROR, we shut down in error
+// mode.
 nsresult
-RasterImage::ShutdownDecoder(eShutdownIntent aIntent)
+RasterImage::ShutdownDecoder(ShutdownReason aReason)
 {
   MOZ_ASSERT(NS_IsMainThread());
   mDecodingMonitor.AssertCurrentThreadIn();
 
-  // Ensure that our intent is valid
-  NS_ABORT_IF_FALSE((aIntent >= 0) && (aIntent < eShutdownIntent_AllCount),
-                    "Invalid shutdown intent");
-
   // Ensure that the decoder is initialized
   NS_ABORT_IF_FALSE(mDecoder, "Calling ShutdownDecoder() with no active decoder!");
 
@@ -2058,11 +1999,7 @@
   nsRefPtr<Decoder> decoder = mDecoder;
   mDecoder = nullptr;
 
-  mFinishing = true;
-  mInDecoder = true;
-  decoder->Finish(aIntent);
-  mInDecoder = false;
-  mFinishing = false;
+  decoder->Finish(aReason);
 
   // Unlock the last frame (if we have any). Our invariant is that, while we
   // have a decoder open, the last frame is always locked.
@@ -2083,12 +2020,8 @@
 
   // We just shut down the decoder. If we didn't get what we want, but expected
   // to, flag an error
-  bool failed = false;
-  if (wasSizeDecode && !mHasSize)
-    failed = true;
-  if (!wasSizeDecode && !mDecoded)
-    failed = true;
-  if ((aIntent == eShutdownIntent_Done) && failed) {
+  bool succeeded = wasSizeDecode ? mHasSize : mDecoded;
+  if ((aReason == ShutdownReason::DONE) && !succeeded) {
     DoError();
     return NS_ERROR_FAILURE;
   }
@@ -2113,9 +2046,7 @@
 
   // Write
   nsRefPtr<Decoder> kungFuDeathGrip = mDecoder;
-  mInDecoder = true;
   mDecoder->Write(aBuffer, aCount, aStrategy);
-  mInDecoder = false;
 
   CONTAINER_ENSURE_SUCCESS(mDecoder->GetDecoderError());
 
@@ -2195,28 +2126,11 @@
   if (mDecoded)
     return NS_OK;
 
-  // mFinishing protects against the case when we enter RequestDecode from
-  // ShutdownDecoder -- in that case, we're done with the decode, we're just
-  // not quite ready to admit it.  See bug 744309.
-  if (mFinishing)
-    return NS_OK;
-
   // If we're currently waiting for a new frame, we can't do anything until
   // that frame is allocated.
   if (mDecoder && mDecoder->NeedsNewFrame())
     return NS_OK;
 
-  // If our callstack goes through a size decoder, we have a problem.
-  // We need to shutdown the size decode and replace it with  a full
-  // decoder, but can't do that from within the decoder itself. Thus, we post
-  // an asynchronous event to the event loop to do it later. Since
-  // RequestDecode() is an asynchronous function this works fine (though it's
-  // a little slower).
-  if (mInDecoder) {
-    nsRefPtr<imgDecodeRequestor> requestor = new imgDecodeRequestor(*this);
-    return NS_DispatchToCurrentThread(requestor);
-  }
-
   // If we have a size decoder open, make sure we get the size
   if (mDecoder && mDecoder->IsSizeDecode()) {
     nsresult rv = DecodePool::Singleton()->DecodeUntilSizeAvailable(this);
@@ -2231,8 +2145,7 @@
   }
 
   // If the image is waiting for decode work to be notified, go ahead and do that.
-  if (mDecodeRequest &&
-      mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_WORK_DONE &&
+  if (mDecodeStatus == DecodeStatus::WORK_DONE &&
       aDecodeType == SYNCHRONOUS_NOTIFY) {
     ReentrantMonitorAutoEnter lock(mDecodingMonitor);
     nsresult rv = FinishedSomeDecoding();
@@ -2268,9 +2181,7 @@
   // we need to repeat the following three checks after getting the lock.
 
   // If the image is waiting for decode work to be notified, go ahead and do that.
-  if (mDecodeRequest &&
-      mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_WORK_DONE &&
-      aDecodeType != ASYNCHRONOUS) {
+  if (mDecodeStatus == DecodeStatus::WORK_DONE && aDecodeType != ASYNCHRONOUS) {
     nsresult rv = FinishedSomeDecoding();
     CONTAINER_ENSURE_SUCCESS(rv);
   }
@@ -2292,7 +2203,7 @@
   // If we have a size decode open, interrupt it and shut it down; or if
   // the decoder has different flags than what we need
   if (mDecoder && mDecoder->GetDecodeFlags() != mFrameDecodeFlags) {
-    nsresult rv = FinishedSomeDecoding(eShutdownIntent_NotNeeded);
+    nsresult rv = FinishedSomeDecoding(ShutdownReason::NOT_NEEDED);
     CONTAINER_ENSURE_SUCCESS(rv);
   }
 
@@ -2315,11 +2226,11 @@
   // If we can do decoding now, do so.  Small images will decode completely,
   // large images will decode a bit and post themselves to the event loop
   // to finish decoding.
-  if (!mDecoded && !mInDecoder && mHasSourceData && aDecodeType == SYNCHRONOUS_NOTIFY_AND_SOME_DECODE) {
+  if (!mDecoded && mHasSourceData && aDecodeType == SYNCHRONOUS_NOTIFY_AND_SOME_DECODE) {
     PROFILER_LABEL_PRINTF("RasterImage", "DecodeABitOf",
       js::ProfileEntry::Category::GRAPHICS, "%s", GetURIString().get());
 
-    DecodePool::Singleton()->DecodeABitOf(this, DECODE_SYNC);
+    DecodePool::Singleton()->DecodeABitOf(this, DecodeStrategy::SYNC);
     return NS_OK;
   }
 
@@ -2355,18 +2266,10 @@
 
   ReentrantMonitorAutoEnter lock(mDecodingMonitor);
 
-  // We really have no good way of forcing a synchronous decode if we're being
-  // called in a re-entrant manner (ie, from an event listener fired by a
-  // decoder), because the decoding machinery is already tied up. We thus explicitly
-  // disallow this type of call in the API, and check for it in API methods.
-  NS_ABORT_IF_FALSE(!mInDecoder, "Yikes, forcing sync in reentrant call!");
-
-  if (mDecodeRequest) {
-    // If the image is waiting for decode work to be notified, go ahead and do that.
-    if (mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_WORK_DONE) {
-      nsresult rv = FinishedSomeDecoding();
-      CONTAINER_ENSURE_SUCCESS(rv);
-    }
+  // If the image is waiting for decode work to be notified, go ahead and do that.
+  if (mDecodeStatus == DecodeStatus::WORK_DONE) {
+    nsresult rv = FinishedSomeDecoding();
+    CONTAINER_ENSURE_SUCCESS(rv);
   }
 
   nsresult rv;
@@ -2386,7 +2289,7 @@
   // If we have a decoder open with different flags than what we need, shut it
   // down
   if (mDecoder && mDecoder->GetDecodeFlags() != mFrameDecodeFlags) {
-    nsresult rv = FinishedSomeDecoding(eShutdownIntent_NotNeeded);
+    nsresult rv = FinishedSomeDecoding(ShutdownReason::NOT_NEEDED);
     CONTAINER_ENSURE_SUCCESS(rv);
 
     if (mDecoded) {
@@ -2399,11 +2302,9 @@
     }
   }
 
-  // If we're currently waiting on a new frame for this image, we have to create
-  // it now.
+  // If we're currently waiting on a new frame for this image, create it now.
   if (mDecoder && mDecoder->NeedsNewFrame()) {
     mDecoder->AllocateFrame();
-    mDecodeRequest->mAllocatedNewFrame = true;
   }
 
   // If we don't have a decoder, create one
@@ -2416,7 +2317,7 @@
 
   // Write everything we have
   rv = DecodeSomeData(mSourceData.Length() - mDecoder->BytesDecoded(),
-                      DECODE_SYNC);
+                      DecodeStrategy::SYNC);
   CONTAINER_ENSURE_SUCCESS(rv);
 
   rv = FinishedSomeDecoding();
@@ -2489,11 +2390,11 @@
 void
 RasterImage::NotifyNewScaledFrame()
 {
-  if (mStatusTracker) {
+  if (mProgressTracker) {
     // Send an invalidation so observers will repaint and can take advantage of
     // the new scaled frame if possible.
     nsIntRect rect(0, 0, mSize.width, mSize.height);
-    mStatusTracker->SyncNotifyDifference(ImageStatusDiff::NoChange(), rect);
+    mProgressTracker->SyncNotifyProgress(NoProgress, rect);
   }
 }
 
@@ -2611,10 +2512,6 @@
   if (mError)
     return NS_ERROR_FAILURE;
 
-  // Disallowed in the API
-  if (mInDecoder && (aFlags & imgIContainer::FLAG_SYNC_DECODE))
-    return NS_ERROR_FAILURE;
-
   // Illegal -- you can't draw with non-default decode flags.
   // (Disabling colorspace conversion might make sense to allow, but
   // we don't currently.)
@@ -2629,8 +2526,7 @@
   //    is opaque.
   bool haveDefaultFlags = (mFrameDecodeFlags == DECODE_FLAGS_DEFAULT);
   bool haveSafeAlphaFlags =
-    (mFrameDecodeFlags == FLAG_DECODE_NO_PREMULTIPLY_ALPHA) &&
-    FrameIsOpaque(FRAME_CURRENT);
+    (mFrameDecodeFlags == FLAG_DECODE_NO_PREMULTIPLY_ALPHA) && IsOpaque();
 
   if (!(haveDefaultFlags || haveSafeAlphaFlags)) {
     if (!CanForciblyDiscardAndRedecode())
@@ -2651,8 +2547,8 @@
   }
 
 
-  if (IsUnlocked() && mStatusTracker) {
-    mStatusTracker->OnUnlockedDraw();
+  if (IsUnlocked() && mProgressTracker) {
+    mProgressTracker->OnUnlockedDraw();
   }
 
   // We use !mDecoded && mHasSourceData to mean discarded.
@@ -2735,7 +2631,7 @@
            ("RasterImage[0x%p] canceling decode because image "
             "is now unlocked.", this));
     ReentrantMonitorAutoEnter lock(mDecodingMonitor);
-    FinishedSomeDecoding(eShutdownIntent_NotNeeded);
+    FinishedSomeDecoding(ShutdownReason::NOT_NEEDED);
     ForceDiscard();
     return NS_OK;
   }
@@ -2773,8 +2669,7 @@
   // First, if we've just been called because we allocated a frame on the main
   // thread, let the decoder deal with the data it set aside at that time by
   // passing it a null buffer.
-  if (mDecodeRequest->mAllocatedNewFrame) {
-    mDecodeRequest->mAllocatedNewFrame = false;
+  if (mDecoder->NeedsToFlushData()) {
     nsresult rv = WriteToDecoder(nullptr, 0, aStrategy);
     if (NS_FAILED(rv) || mDecoder->NeedsNewFrame()) {
       return rv;
@@ -2820,8 +2715,7 @@
   // If the decoder returned because it needed a new frame and we haven't
   // written to it since then, the decoder may be storing data that it hasn't
   // decoded yet.
-  if (mDecoder->NeedsNewFrame() ||
-      (mDecodeRequest && mDecodeRequest->mAllocatedNewFrame)) {
+  if (mDecoder->NeedsNewFrame() || mDecoder->NeedsToFlushData()) {
     return false;
   }
 
@@ -2853,21 +2747,17 @@
     return;
   }
 
-  // Calling FinishedSomeDecoding and CurrentStatusTracker requires us to be in
-  // the decoding monitor.
+  // Calling FinishedSomeDecoding requires us to be in the decoding monitor.
   ReentrantMonitorAutoEnter lock(mDecodingMonitor);
 
   // If we're mid-decode, shut down the decoder.
   if (mDecoder) {
-    FinishedSomeDecoding(eShutdownIntent_Error);
+    FinishedSomeDecoding(ShutdownReason::FATAL_ERROR);
   }
 
   // Put the container in an error state.
   mError = true;
 
-  nsRefPtr<imgStatusTracker> statusTracker = CurrentStatusTracker();
-  statusTracker->GetDecoderObserver()->OnError();
-
   // Log our error
   LOG_CONTAINER_ERROR;
 }
@@ -2948,7 +2838,7 @@
 
 nsresult
 RasterImage::RequestDecodeIfNeeded(nsresult aStatus,
-                                   eShutdownIntent aIntent,
+                                   ShutdownReason aReason,
                                    bool aDone,
                                    bool aWasSize)
 {
@@ -2956,7 +2846,7 @@
 
   // If we were a size decode and a full decode was requested, now's the time.
   if (NS_SUCCEEDED(aStatus) &&
-      aIntent == eShutdownIntent_Done &&
+      aReason == ShutdownReason::DONE &&
       aDone &&
       aWasSize &&
       mWantFullDecode) {
@@ -2974,20 +2864,13 @@
 }
 
 nsresult
-RasterImage::FinishedSomeDecoding(eShutdownIntent aIntent /* = eShutdownIntent_Done */,
-                                  DecodeRequest* aRequest /* = nullptr */)
+RasterImage::FinishedSomeDecoding(ShutdownReason aReason /* = ShutdownReason::DONE */,
+                                  Progress aProgress /* = NoProgress */)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   mDecodingMonitor.AssertCurrentThreadIn();
 
-  nsRefPtr<DecodeRequest> request;
-  if (aRequest) {
-    request = aRequest;
-  } else {
-    request = mDecodeRequest;
-  }
-
   // Ensure that, if the decoder is the last reference to the image, we don't
   // destroy it by destroying the decoder.
   nsRefPtr<RasterImage> image(this);
@@ -2996,12 +2879,15 @@
   bool wasSize = false;
   nsIntRect invalidRect;
   nsresult rv = NS_OK;
+  Progress progress = aProgress;
 
   if (image->mDecoder) {
     invalidRect = image->mDecoder->TakeInvalidRect();
+    progress |= image->mDecoder->TakeProgress();
 
-    if (request && request->mChunkCount && !image->mDecoder->IsSizeDecode()) {
-      Telemetry::Accumulate(Telemetry::IMAGE_DECODE_CHUNKS, request->mChunkCount);
+    if (!image->mDecoder->IsSizeDecode() && image->mDecoder->ChunkCount()) {
+      Telemetry::Accumulate(Telemetry::IMAGE_DECODE_CHUNKS,
+                            image->mDecoder->ChunkCount());
     }
 
     if (!image->mHasSize && image->mDecoder->HasSize()) {
@@ -3010,7 +2896,7 @@
 
     // If the decode finished, or we're specifically being told to shut down,
     // tell the image and shut down the decoder.
-    if (image->IsDecodeFinished() || aIntent != eShutdownIntent_Done) {
+    if (image->IsDecodeFinished() || aReason != ShutdownReason::DONE) {
       done = true;
 
       // Hold on to a reference to the decoder until we're done with it
@@ -3019,26 +2905,30 @@
       wasSize = decoder->IsSizeDecode();
 
       // Do some telemetry if this isn't a size decode.
-      if (request && !wasSize) {
+      if (!wasSize) {
         Telemetry::Accumulate(Telemetry::IMAGE_DECODE_TIME,
-                              int32_t(request->mDecodeTime.ToMicroseconds()));
+                              int32_t(decoder->DecodeTime().ToMicroseconds()));
 
         // We record the speed for only some decoders. The rest have
         // SpeedHistogram return HistogramCount.
         Telemetry::ID id = decoder->SpeedHistogram();
         if (id < Telemetry::HistogramCount) {
           int32_t KBps = int32_t(decoder->BytesDecoded() /
-                                 (1024 * request->mDecodeTime.ToSeconds()));
+                                 (1024 * decoder->DecodeTime().ToSeconds()));
           Telemetry::Accumulate(id, KBps);
         }
       }
 
       // We need to shut down the decoder first, in order to ensure all
       // decoding routines have been finished.
-      rv = image->ShutdownDecoder(aIntent);
+      rv = image->ShutdownDecoder(aReason);
       if (NS_FAILED(rv)) {
         image->DoError();
       }
+
+      // If there were any final changes, grab them.
+      invalidRect.Union(decoder->TakeInvalidRect());
+      progress |= decoder->TakeProgress();
     }
   }
 
@@ -3053,40 +2943,37 @@
                            : nsIntRect();
   }
 
-  ImageStatusDiff diff =
-    request ? image->mStatusTracker->Difference(request->mStatusTracker)
-            : image->mStatusTracker->DecodeStateAsDifference();
-  image->mStatusTracker->ApplyDifference(diff);
-
   if (mNotifying) {
-    // Accumulate the status changes. We don't permit recursive notifications
+    // Accumulate the progress changes. We don't permit recursive notifications
     // because they cause subtle concurrency bugs, so we'll delay sending out
     // the notifications until we pop back to the lowest invocation of
     // FinishedSomeDecoding on the stack.
-    NS_WARNING("Recursively notifying in RasterImage::FinishedSomeDecoding!");
-    mStatusDiff.Combine(diff);
-    mInvalidRect.Union(invalidRect);
+    mNotifyProgress |= progress;
+    mNotifyInvalidRect.Union(invalidRect);
   } else {
-    MOZ_ASSERT(mStatusDiff.IsNoChange(), "Shouldn't have an accumulated change at this point");
-    MOZ_ASSERT(mInvalidRect.IsEmpty(), "Shouldn't have an accumulated invalidation rect here");
+    MOZ_ASSERT(mNotifyProgress == NoProgress && mNotifyInvalidRect.IsEmpty(),
+               "Shouldn't have an accumulated change at this point");
 
-    while (!diff.IsNoChange() || !invalidRect.IsEmpty()) {
+    progress = image->mProgressTracker->Difference(progress);
+
+    while (progress != NoProgress || !invalidRect.IsEmpty()) {
       // Tell the observers what happened.
       mNotifying = true;
-      image->mStatusTracker->SyncNotifyDifference(diff, invalidRect);
+      image->mProgressTracker->SyncNotifyProgress(progress, invalidRect);
       mNotifying = false;
 
-      // Gather any status changes that may have occurred as a result of sending
+      // Gather any progress changes that may have occurred as a result of sending
       // out the previous notifications. If there were any, we'll send out
       // notifications for them next.
-      diff = mStatusDiff;
-      mStatusDiff = ImageStatusDiff::NoChange();
-      invalidRect = mInvalidRect;
-      mInvalidRect = nsIntRect();
+      progress = image->mProgressTracker->Difference(mNotifyProgress);
+      mNotifyProgress = NoProgress;
+
+      invalidRect = mNotifyInvalidRect;
+      mNotifyInvalidRect = nsIntRect();
     }
   }
 
-  return RequestDecodeIfNeeded(rv, aIntent, done, wasSize);
+  return RequestDecodeIfNeeded(rv, aReason, done, wasSize);
 }
 
 already_AddRefed<imgIContainer>
@@ -3096,466 +2983,6 @@
   return self.forget();
 }
 
-NS_IMPL_ISUPPORTS(RasterImage::DecodePool,
-                  nsIObserver)
-
-/* static */ RasterImage::DecodePool*
-RasterImage::DecodePool::Singleton()
-{
-  if (!sSingleton) {
-    MOZ_ASSERT(NS_IsMainThread());
-    sSingleton = new DecodePool();
-    ClearOnShutdown(&sSingleton);
-  }
-
-  return sSingleton;
-}
-
-already_AddRefed<nsIEventTarget>
-RasterImage::DecodePool::GetEventTarget()
-{
-  nsCOMPtr<nsIEventTarget> target = do_QueryInterface(mThreadPool);
-  return target.forget();
-}
-
-#ifdef MOZ_NUWA_PROCESS
-
-class RIDThreadPoolListener MOZ_FINAL : public nsIThreadPoolListener
-{
-public:
-    NS_DECL_THREADSAFE_ISUPPORTS
-    NS_DECL_NSITHREADPOOLLISTENER
-
-    RIDThreadPoolListener() {}
-    ~RIDThreadPoolListener() {}
-};
-
-NS_IMPL_ISUPPORTS(RIDThreadPoolListener, nsIThreadPoolListener)
-
-NS_IMETHODIMP
-RIDThreadPoolListener::OnThreadCreated()
-{
-    if (IsNuwaProcess()) {
-        NuwaMarkCurrentThread((void (*)(void *))nullptr, nullptr);
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-RIDThreadPoolListener::OnThreadShuttingDown()
-{
-    return NS_OK;
-}
-
-#endif // MOZ_NUWA_PROCESS
-
-RasterImage::DecodePool::DecodePool()
- : mThreadPoolMutex("Thread Pool")
-{
-  if (gfxPrefs::ImageMTDecodingEnabled()) {
-    mThreadPool = do_CreateInstance(NS_THREADPOOL_CONTRACTID);
-    if (mThreadPool) {
-      mThreadPool->SetName(NS_LITERAL_CSTRING("ImageDecoder"));
-      int32_t prefLimit = gfxPrefs::ImageMTDecodingLimit();
-      uint32_t limit;
-      if (prefLimit <= 0) {
-        limit = std::max(PR_GetNumberOfProcessors(), 2) - 1;
-      } else {
-        limit = static_cast<uint32_t>(prefLimit);
-      }
-
-      mThreadPool->SetThreadLimit(limit);
-      mThreadPool->SetIdleThreadLimit(limit);
-
-#ifdef MOZ_NUWA_PROCESS
-      if (IsNuwaProcess()) {
-        mThreadPool->SetListener(new RIDThreadPoolListener());
-      }
-#endif
-
-      nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService();
-      if (obsSvc) {
-        obsSvc->AddObserver(this, "xpcom-shutdown-threads", false);
-      }
-    }
-  }
-}
-
-RasterImage::DecodePool::~DecodePool()
-{
-  MOZ_ASSERT(NS_IsMainThread(), "Must shut down DecodePool on main thread!");
-}
-
-NS_IMETHODIMP
-RasterImage::DecodePool::Observe(nsISupports *subject, const char *topic,
-                                 const char16_t *data)
-{
-  NS_ASSERTION(strcmp(topic, "xpcom-shutdown-threads") == 0, "oops");
-
-  nsCOMPtr<nsIThreadPool> threadPool;
-
-  {
-    MutexAutoLock threadPoolLock(mThreadPoolMutex);
-    threadPool = mThreadPool;
-    mThreadPool = nullptr;
-  }
-
-  if (threadPool) {
-    threadPool->Shutdown();
-  }
-
-  return NS_OK;
-}
-
-void
-RasterImage::DecodePool::RequestDecode(RasterImage* aImg)
-{
-  MOZ_ASSERT(aImg->mDecoder);
-  aImg->mDecodingMonitor.AssertCurrentThreadIn();
-
-  // If we're currently waiting on a new frame for this image, we can't do any
-  // decoding.
-  if (!aImg->mDecoder->NeedsNewFrame()) {
-    // No matter whether this is currently being decoded, we need to update the
-    // number of bytes we want it to decode.
-    aImg->mDecodeRequest->mBytesToDecode =
-      aImg->mSourceData.Length() - aImg->mDecoder->BytesDecoded();
-
-    if (aImg->mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_PENDING ||
-        aImg->mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_ACTIVE) {
-      // The image is already in our list of images to decode, or currently being
-      // decoded, so we don't have to do anything else.
-      return;
-    }
-
-    aImg->mDecodeRequest->mRequestStatus = DecodeRequest::REQUEST_PENDING;
-    nsRefPtr<DecodeJob> job = new DecodeJob(aImg->mDecodeRequest, aImg);
-
-    MutexAutoLock threadPoolLock(mThreadPoolMutex);
-    if (!gfxPrefs::ImageMTDecodingEnabled() || !mThreadPool) {
-      NS_DispatchToMainThread(job);
-    } else {
-      mThreadPool->Dispatch(job, nsIEventTarget::DISPATCH_NORMAL);
-    }
-  }
-}
-
-void
-RasterImage::DecodePool::DecodeABitOf(RasterImage* aImg, DecodeStrategy aStrategy)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  aImg->mDecodingMonitor.AssertCurrentThreadIn();
-
-  if (aImg->mDecodeRequest) {
-    // If the image is waiting for decode work to be notified, go ahead and do that.
-    if (aImg->mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_WORK_DONE) {
-      aImg->FinishedSomeDecoding();
-    }
-  }
-
-  DecodeSomeOfImage(aImg, aStrategy);
-
-  aImg->FinishedSomeDecoding();
-
-  // If the decoder needs a new frame, enqueue an event to get it; that event
-  // will enqueue another decode request when it's done.
-  if (aImg->mDecoder && aImg->mDecoder->NeedsNewFrame()) {
-    FrameNeededWorker::GetNewFrame(aImg);
-  } else {
-    // If we aren't yet finished decoding and we have more data in hand, add
-    // this request to the back of the priority list.
-    if (aImg->mDecoder &&
-        !aImg->mError &&
-        !aImg->IsDecodeFinished() &&
-        aImg->mSourceData.Length() > aImg->mDecoder->BytesDecoded()) {
-      RequestDecode(aImg);
-    }
-  }
-}
-
-/* static */ void
-RasterImage::DecodePool::StopDecoding(RasterImage* aImg)
-{
-  aImg->mDecodingMonitor.AssertCurrentThreadIn();
-
-  // If we haven't got a decode request, we're not currently decoding. (Having
-  // a decode request doesn't imply we *are* decoding, though.)
-  if (aImg->mDecodeRequest) {
-    aImg->mDecodeRequest->mRequestStatus = DecodeRequest::REQUEST_STOPPED;
-  }
-}
-
-NS_IMETHODIMP
-RasterImage::DecodePool::DecodeJob::Run()
-{
-  ReentrantMonitorAutoEnter lock(mImage->mDecodingMonitor);
-
-  // If we were interrupted, we shouldn't do any work.
-  if (mRequest->mRequestStatus == DecodeRequest::REQUEST_STOPPED) {
-    DecodeDoneWorker::NotifyFinishedSomeDecoding(mImage, mRequest);
-    return NS_OK;
-  }
-
-  // If someone came along and synchronously decoded us, there's nothing for us to do.
-  if (!mImage->mDecoder || mImage->IsDecodeFinished()) {
-    DecodeDoneWorker::NotifyFinishedSomeDecoding(mImage, mRequest);
-    return NS_OK;
-  }
-
-  // If we're a decode job that's been enqueued since a previous decode that
-  // still needs a new frame, we can't do anything. Wait until the
-  // FrameNeededWorker enqueues another frame.
-  if (mImage->mDecoder->NeedsNewFrame()) {
-    return NS_OK;
-  }
-
-  mRequest->mRequestStatus = DecodeRequest::REQUEST_ACTIVE;
-
-  size_t oldByteCount = mImage->mDecoder->BytesDecoded();
-
-  DecodeType type = DECODE_TYPE_UNTIL_DONE_BYTES;
-
-  // Multithreaded decoding can be disabled. If we've done so, we don't want to
-  // monopolize the main thread, and will allow a timeout in DecodeSomeOfImage.
-  if (NS_IsMainThread()) {
-    type = DECODE_TYPE_UNTIL_TIME;
-  }
-
-  DecodePool::Singleton()->DecodeSomeOfImage(mImage, DECODE_ASYNC, type, mRequest->mBytesToDecode);
-
-  size_t bytesDecoded = mImage->mDecoder->BytesDecoded() - oldByteCount;
-
-  mRequest->mRequestStatus = DecodeRequest::REQUEST_WORK_DONE;
-
-  // If the decoder needs a new frame, enqueue an event to get it; that event
-  // will enqueue another decode request when it's done.
-  if (mImage->mDecoder && mImage->mDecoder->NeedsNewFrame()) {
-    FrameNeededWorker::GetNewFrame(mImage);
-  }
-  // If we aren't yet finished decoding and we have more data in hand, add
-  // this request to the back of the list.
-  else if (mImage->mDecoder &&
-           !mImage->mError &&
-           !mImage->mPendingError &&
-           !mImage->IsDecodeFinished() &&
-           bytesDecoded < mRequest->mBytesToDecode &&
-           bytesDecoded > 0) {
-    DecodePool::Singleton()->RequestDecode(mImage);
-  } else {
-    // Nothing more for us to do - let everyone know what happened.
-    DecodeDoneWorker::NotifyFinishedSomeDecoding(mImage, mRequest);
-  }
-
-  return NS_OK;
-}
-
-RasterImage::DecodePool::DecodeJob::~DecodeJob()
-{
-  if (gfxPrefs::ImageMTDecodingEnabled()) {
-    // Dispatch mImage to main thread to prevent mImage from being destructed by decode thread.
-    nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
-    NS_WARN_IF_FALSE(mainThread, "Couldn't get the main thread!");
-    if (mainThread) {
-      // Handle ambiguous nsISupports inheritance
-      RasterImage* rawImg = nullptr;
-      mImage.swap(rawImg);
-      DebugOnly<nsresult> rv = NS_ProxyRelease(mainThread, NS_ISUPPORTS_CAST(ImageResource*, rawImg));
-      MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to proxy release to main thread");
-    }
-  }
-}
-
-nsresult
-RasterImage::DecodePool::DecodeUntilSizeAvailable(RasterImage* aImg)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  ReentrantMonitorAutoEnter lock(aImg->mDecodingMonitor);
-
-  if (aImg->mDecodeRequest) {
-    // If the image is waiting for decode work to be notified, go ahead and do that.
-    if (aImg->mDecodeRequest->mRequestStatus == DecodeRequest::REQUEST_WORK_DONE) {
-      nsresult rv = aImg->FinishedSomeDecoding();
-      if (NS_FAILED(rv)) {
-        aImg->DoError();
-        return rv;
-      }
-    }
-  }
-
-  // We use DECODE_ASYNC here because we just want to get the size information
-  // here and defer the rest of the work.
-  nsresult rv = DecodeSomeOfImage(aImg, DECODE_ASYNC, DECODE_TYPE_UNTIL_SIZE);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // If the decoder needs a new frame, enqueue an event to get it; that event
-  // will enqueue another decode request when it's done.
-  if (aImg->mDecoder && aImg->mDecoder->NeedsNewFrame()) {
-    FrameNeededWorker::GetNewFrame(aImg);
-  } else {
-    rv = aImg->FinishedSomeDecoding();
-  }
-
-  return rv;
-}
-
-nsresult
-RasterImage::DecodePool::DecodeSomeOfImage(RasterImage* aImg,
-                                           DecodeStrategy aStrategy,
-                                           DecodeType aDecodeType /* = DECODE_TYPE_UNTIL_TIME */,
-                                           uint32_t bytesToDecode /* = 0 */)
-{
-  NS_ABORT_IF_FALSE(aImg->mInitialized,
-                    "Worker active for uninitialized container!");
-  aImg->mDecodingMonitor.AssertCurrentThreadIn();
-
-  // If an error is flagged, it probably happened while we were waiting
-  // in the event queue.
-  if (aImg->mError)
-    return NS_OK;
-
-  // If there is an error worker pending (say because the main thread has enqueued
-  // another decode request for us before processing the error worker) then bail out.
-  if (aImg->mPendingError)
-    return NS_OK;
-
-  // If mDecoded or we don't have a decoder, we must have finished already (for
-  // example, a synchronous decode request came while the worker was pending).
-  if (!aImg->mDecoder || aImg->mDecoded)
-    return NS_OK;
-
-  // If we're doing synchronous decodes, and we're waiting on a new frame for
-  // this image, get it now.
-  if (aStrategy == DECODE_SYNC && aImg->mDecoder->NeedsNewFrame()) {
-    MOZ_ASSERT(NS_IsMainThread());
-
-    aImg->mDecoder->AllocateFrame();
-    aImg->mDecodeRequest->mAllocatedNewFrame = true;
-  }
-
-  // If we're not synchronous, we can't allocate a frame right now.
-  else if (aImg->mDecoder->NeedsNewFrame()) {
-    return NS_OK;
-  }
-
-  nsRefPtr<Decoder> decoderKungFuDeathGrip = aImg->mDecoder;
-
-  uint32_t maxBytes;
-  if (aImg->mDecoder->IsSizeDecode()) {
-    // Decode all available data if we're a size decode; they're cheap, and we
-    // want them to be more or less synchronous.
-    maxBytes = aImg->mSourceData.Length();
-  } else {
-    // We're only guaranteed to decode this many bytes, so in particular,
-    // gfxPrefs::ImageMemDecodeBytesAtATime should be set high enough for us
-    // to read the size from most images.
-    maxBytes = gfxPrefs::ImageMemDecodeBytesAtATime();
-  }
-
-  if (bytesToDecode == 0) {
-    bytesToDecode = aImg->mSourceData.Length() - aImg->mDecoder->BytesDecoded();
-  }
-
-  int32_t chunkCount = 0;
-  TimeStamp start = TimeStamp::Now();
-  TimeStamp deadline = start + TimeDuration::FromMilliseconds(gfxPrefs::ImageMemMaxMSBeforeYield());
-
-  // We keep decoding chunks until:
-  //  * we don't have any data left to decode,
-  //  * the decode completes,
-  //  * we're an UNTIL_SIZE decode and we get the size, or
-  //  * we run out of time.
-  // We also try to decode at least one "chunk" if we've allocated a new frame,
-  // even if we have no more data to send to the decoder.
-  while ((aImg->mSourceData.Length() > aImg->mDecoder->BytesDecoded() &&
-          bytesToDecode > 0 &&
-          !aImg->IsDecodeFinished() &&
-          !(aDecodeType == DECODE_TYPE_UNTIL_SIZE && aImg->mHasSize) &&
-          !aImg->mDecoder->NeedsNewFrame()) ||
-         (aImg->mDecodeRequest && aImg->mDecodeRequest->mAllocatedNewFrame)) {
-    chunkCount++;
-    uint32_t chunkSize = std::min(bytesToDecode, maxBytes);
-    nsresult rv = aImg->DecodeSomeData(chunkSize, aStrategy);
-    if (NS_FAILED(rv)) {
-      aImg->DoError();
-      return rv;
-    }
-
-    bytesToDecode -= chunkSize;
-
-    // Yield if we've been decoding for too long. We check this _after_ decoding
-    // a chunk to ensure that we don't yield without doing any decoding.
-    if (aDecodeType == DECODE_TYPE_UNTIL_TIME && TimeStamp::Now() >= deadline)
-      break;
-  }
-
-  if (aImg->mDecodeRequest) {
-    aImg->mDecodeRequest->mDecodeTime += (TimeStamp::Now() - start);
-    aImg->mDecodeRequest->mChunkCount += chunkCount;
-  }
-
-  return NS_OK;
-}
-
-RasterImage::DecodeDoneWorker::DecodeDoneWorker(RasterImage* image, DecodeRequest* request)
- : mImage(image)
- , mRequest(request)
-{}
-
-void
-RasterImage::DecodeDoneWorker::NotifyFinishedSomeDecoding(RasterImage* image, DecodeRequest* request)
-{
-  image->mDecodingMonitor.AssertCurrentThreadIn();
-
-  nsCOMPtr<nsIRunnable> worker = new DecodeDoneWorker(image, request);
-  NS_DispatchToMainThread(worker);
-}
-
-NS_IMETHODIMP
-RasterImage::DecodeDoneWorker::Run()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  ReentrantMonitorAutoEnter lock(mImage->mDecodingMonitor);
-
-  mImage->FinishedSomeDecoding(eShutdownIntent_Done, mRequest);
-
-  return NS_OK;
-}
-
-RasterImage::FrameNeededWorker::FrameNeededWorker(RasterImage* image)
- : mImage(image)
-{}
-
-
-void
-RasterImage::FrameNeededWorker::GetNewFrame(RasterImage* image)
-{
-  nsCOMPtr<nsIRunnable> worker = new FrameNeededWorker(image);
-  NS_DispatchToMainThread(worker);
-}
-
-NS_IMETHODIMP
-RasterImage::FrameNeededWorker::Run()
-{
-  ReentrantMonitorAutoEnter lock(mImage->mDecodingMonitor);
-  nsresult rv = NS_OK;
-
-  // If we got a synchronous decode in the mean time, we don't need to do
-  // anything.
-  if (mImage->mDecoder && mImage->mDecoder->NeedsNewFrame()) {
-    rv = mImage->mDecoder->AllocateFrame();
-    mImage->mDecodeRequest->mAllocatedNewFrame = true;
-  }
-
-  if (NS_SUCCEEDED(rv) && mImage->mDecoder) {
-    // By definition, we're not done decoding, so enqueue us for more decoding.
-    DecodePool::Singleton()->RequestDecode(mImage);
-  }
-
-  return NS_OK;
-}
-
 nsIntSize
 RasterImage::OptimalImageSizeForDest(const gfxSize& aDest, uint32_t aWhichFrame,
                                      GraphicsFilter aFilter, uint32_t aFlags)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/RasterImage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/RasterImage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/RasterImage.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/RasterImage.h	2014-11-26 21:45:47.000000000 +0000
@@ -25,15 +25,14 @@
 #include "nsTArray.h"
 #include "imgFrame.h"
 #include "nsThreadUtils.h"
-#include "DecodeStrategy.h"
+#include "DecodePool.h"
 #include "DiscardTracker.h"
 #include "Orientation.h"
 #include "nsIObserver.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Mutex.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/StaticPtr.h"
+#include "mozilla/TypedEnum.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/UniquePtr.h"
 #ifdef DEBUG
@@ -134,7 +133,6 @@
 
 class Decoder;
 class FrameAnimator;
-class ScaleRunner;
 
 class RasterImage MOZ_FINAL : public ImageResource
                             , public nsIProperties
@@ -251,9 +249,7 @@
                                        bool aLastPart) MOZ_OVERRIDE;
   virtual nsresult OnNewSourceData() MOZ_OVERRIDE;
 
-  static already_AddRefed<nsIEventTarget> GetEventTarget() {
-    return DecodePool::Singleton()->GetEventTarget();
-  }
+  static already_AddRefed<nsIEventTarget> GetEventTarget();
 
   /**
    * A hint of the number of bytes of source data that the image contains. If
@@ -285,8 +281,6 @@
     return mRequestedSampleSize;
   }
 
-
-
  nsCString GetURIString() {
     nsCString spec;
     if (GetURI()) {
@@ -295,243 +289,16 @@
     return spec;
   }
 
-  // Called from module startup. Sets up RasterImage to be used.
   static void Initialize();
 
-  // Decoder shutdown
-  enum eShutdownIntent {
-    eShutdownIntent_Done        = 0,
-    eShutdownIntent_NotNeeded   = 1,
-    eShutdownIntent_Error       = 2,
-    eShutdownIntent_AllCount    = 3
-  };
-
-  // Decode strategy
-
 private:
-  already_AddRefed<imgStatusTracker> CurrentStatusTracker()
-  {
-    mDecodingMonitor.AssertCurrentThreadIn();
-    nsRefPtr<imgStatusTracker> statusTracker;
-    statusTracker = mDecodeRequest ? mDecodeRequest->mStatusTracker
-                                   : mStatusTracker;
-    MOZ_ASSERT(statusTracker);
-    return statusTracker.forget();
-  }
-
-  nsresult OnImageDataCompleteCore(nsIRequest* aRequest, nsISupports*, nsresult aStatus);
-
-  /**
-   * Each RasterImage has a pointer to one or zero heap-allocated
-   * DecodeRequests.
-   */
-  struct DecodeRequest
-  {
-    explicit DecodeRequest(RasterImage* aImage)
-      : mImage(aImage)
-      , mBytesToDecode(0)
-      , mRequestStatus(REQUEST_INACTIVE)
-      , mChunkCount(0)
-      , mAllocatedNewFrame(false)
-    {
-      MOZ_ASSERT(aImage, "aImage cannot be null");
-      MOZ_ASSERT(aImage->mStatusTracker,
-                 "aImage should have an imgStatusTracker");
-      mStatusTracker = aImage->mStatusTracker->CloneForRecording();
-    }
-
-    NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DecodeRequest)
-
-    // The status tracker that is associated with a given decode request, to
-    // ensure their lifetimes are linked.
-    nsRefPtr<imgStatusTracker> mStatusTracker;
-
-    RasterImage* mImage;
-
-    size_t mBytesToDecode;
-
-    enum DecodeRequestStatus
-    {
-      REQUEST_INACTIVE,
-      REQUEST_PENDING,
-      REQUEST_ACTIVE,
-      REQUEST_WORK_DONE,
-      REQUEST_STOPPED
-    } mRequestStatus;
-
-    /* Keeps track of how much time we've burned decoding this particular decode
-     * request. */
-    TimeDuration mDecodeTime;
-
-    /* The number of chunks it took to decode this image. */
-    int32_t mChunkCount;
-
-    /* True if a new frame has been allocated, but DecodeSomeData hasn't yet
-     * been called to flush data to it */
-    bool mAllocatedNewFrame;
-
-  private:
-    ~DecodeRequest() {}
-  };
-
-  /*
-   * DecodePool is a singleton class we use when decoding large images.
-   *
-   * When we wish to decode an image larger than
-   * image.mem.max_bytes_for_sync_decode, we call DecodePool::RequestDecode()
-   * for the image.  This adds the image to a queue of pending requests and posts
-   * the DecodePool singleton to the event queue, if it's not already pending
-   * there.
-   *
-   * When the DecodePool is run from the event queue, it decodes the image (and
-   * all others it's managing) in chunks, periodically yielding control back to
-   * the event loop.
-   */
-  class DecodePool : public nsIObserver
-  {
-  public:
-    NS_DECL_THREADSAFE_ISUPPORTS
-    NS_DECL_NSIOBSERVER
-
-    static DecodePool* Singleton();
-
-    /**
-     * Ask the DecodePool to asynchronously decode this image.
-     */
-    void RequestDecode(RasterImage* aImg);
-
-    /**
-     * Decode aImg for a short amount of time, and post the remainder to the
-     * queue.
-     */
-    void DecodeABitOf(RasterImage* aImg, DecodeStrategy aStrategy);
-
-    /**
-     * Ask the DecodePool to stop decoding this image.  Internally, we also
-     * call this function when we finish decoding an image.
-     *
-     * Since the DecodePool keeps raw pointers to RasterImages, make sure you
-     * call this before a RasterImage is destroyed!
-     */
-    static void StopDecoding(RasterImage* aImg);
-
-    /**
-     * Synchronously decode the beginning of the image until we run out of
-     * bytes or we get the image's size.  Note that this done on a best-effort
-     * basis; if the size is burried too deep in the image, we'll give up.
-     *
-     * @return NS_ERROR if an error is encountered, and NS_OK otherwise.  (Note
-     *         that we return NS_OK even when the size was not found.)
-     */
-    nsresult DecodeUntilSizeAvailable(RasterImage* aImg);
-
-    /**
-     * Returns an event target interface to the thread pool; primarily for
-     * OnDataAvailable delivery off main thread.
-     *
-     * @return An nsIEventTarget interface to mThreadPool.
-     */
-    already_AddRefed<nsIEventTarget> GetEventTarget();
+  friend class DecodePool;
+  friend class DecodeWorker;
+  friend class FrameNeededWorker;
+  friend class NotifyProgressWorker;
 
-  private: /* statics */
-    static StaticRefPtr<DecodePool> sSingleton;
-
-  private: /* methods */
-    DecodePool();
-    virtual ~DecodePool();
-
-    enum DecodeType {
-      DECODE_TYPE_UNTIL_TIME,
-      DECODE_TYPE_UNTIL_SIZE,
-      DECODE_TYPE_UNTIL_DONE_BYTES
-    };
-
-    /* Decode some chunks of the given image.  If aDecodeType is UNTIL_SIZE,
-     * decode until we have the image's size, then stop. If bytesToDecode is
-     * non-0, at most bytesToDecode bytes will be decoded. if aDecodeType is
-     * UNTIL_DONE_BYTES, decode until all bytesToDecode bytes are decoded.
-     */
-    nsresult DecodeSomeOfImage(RasterImage* aImg,
-                               DecodeStrategy aStrategy,
-                               DecodeType aDecodeType = DECODE_TYPE_UNTIL_TIME,
-                               uint32_t bytesToDecode = 0);
-
-    /* A decode job dispatched to a thread pool by DecodePool.
-     */
-    class DecodeJob : public nsRunnable
-    {
-    public:
-      DecodeJob(DecodeRequest* aRequest, RasterImage* aImg)
-        : mRequest(aRequest)
-        , mImage(aImg)
-      {}
-
-      NS_IMETHOD Run();
-
-    protected:
-      virtual ~DecodeJob();
-
-    private:
-      nsRefPtr<DecodeRequest> mRequest;
-      nsRefPtr<RasterImage> mImage;
-    };
-
-  private: /* members */
-
-    // mThreadPoolMutex protects mThreadPool. For all RasterImages R,
-    // R::mDecodingMonitor must be acquired before mThreadPoolMutex
-    // if both are acquired; the other order may cause deadlock.
-    Mutex                     mThreadPoolMutex;
-    nsCOMPtr<nsIThreadPool>   mThreadPool;
-  };
-
-  class DecodeDoneWorker : public nsRunnable
-  {
-  public:
-    /**
-     * Called by the DecodePool with an image when it's done some significant
-     * portion of decoding that needs to be notified about.
-     *
-     * Ensures the decode state accumulated by the decoding process gets
-     * applied to the image.
-     */
-    static void NotifyFinishedSomeDecoding(RasterImage* image, DecodeRequest* request);
-
-    NS_IMETHOD Run();
-
-  private: /* methods */
-    DecodeDoneWorker(RasterImage* image, DecodeRequest* request);
-
-  private: /* members */
-
-    nsRefPtr<RasterImage> mImage;
-    nsRefPtr<DecodeRequest> mRequest;
-  };
-
-  class FrameNeededWorker : public nsRunnable
-  {
-  public:
-    /**
-     * Called by the DecodeJob with an image when it's been told by the
-     * decoder that it needs a new frame to be allocated on the main thread.
-     *
-     * Dispatches an event to do so, which will further dispatch a
-     * DecodeRequest event to continue decoding.
-     */
-    static void GetNewFrame(RasterImage* image);
-
-    NS_IMETHOD Run();
-
-  private: /* methods */
-    explicit FrameNeededWorker(RasterImage* image);
-
-  private: /* members */
-
-    nsRefPtr<RasterImage> mImage;
-  };
-
-  nsresult FinishedSomeDecoding(eShutdownIntent intent = eShutdownIntent_Done,
-                                DecodeRequest* request = nullptr);
+  nsresult FinishedSomeDecoding(ShutdownReason aReason = ShutdownReason::DONE,
+                                Progress aProgress = NoProgress);
 
   void DrawWithPreDownscaleIfNeeded(DrawableFrameRef&& aFrameRef,
                                     gfxContext* aContext,
@@ -571,13 +338,11 @@
 
   nsresult DoImageDataComplete();
 
-  bool ApplyDecodeFlags(uint32_t aNewFlags, uint32_t aWhichFrame);
+  bool ApplyDecodeFlags(uint32_t aNewFlags);
 
   already_AddRefed<layers::Image> GetCurrentImage();
   void UpdateImageContainer();
 
-  void SetInUpdateImageContainer(bool aInUpdate) { mInUpdateImageContainer = aInUpdate; }
-  bool IsInUpdateImageContainer() { return mInUpdateImageContainer; }
   enum RequestDecodeType {
       ASYNCHRONOUS,
       SYNCHRONOUS_NOTIFY,
@@ -657,14 +422,12 @@
 
   // Decoder and friends
   nsRefPtr<Decoder>          mDecoder;
-  nsRefPtr<DecodeRequest>    mDecodeRequest;
-
-  bool                       mInDecoder;
+  DecodeStatus               mDecodeStatus;
   // END LOCKED MEMBER VARIABLES
 
   // Notification state. Used to avoid recursive notifications.
-  ImageStatusDiff            mStatusDiff;
-  nsIntRect                  mInvalidRect;
+  Progress                   mNotifyProgress;
+  nsIntRect                  mNotifyInvalidRect;
   bool                       mNotifying:1;
 
   // Boolean flags (clustered together to conserve space):
@@ -683,11 +446,6 @@
   // of frames, or no more owning request
   bool                       mAnimationFinished:1;
 
-  // Whether we're calling Decoder::Finish() from ShutdownDecoder.
-  bool                       mFinishing:1;
-
-  bool                       mInUpdateImageContainer:1;
-
   // Whether, once we are done doing a size decode, we should immediately kick
   // off a full decode.
   bool                       mWantFullDecode:1;
@@ -698,10 +456,8 @@
   bool                       mPendingError:1;
 
   // Decoding
-  nsresult RequestDecodeIfNeeded(nsresult aStatus,
-                                 eShutdownIntent aIntent,
-                                 bool aDone,
-                                 bool aWasSize);
+  nsresult RequestDecodeIfNeeded(nsresult aStatus, ShutdownReason aReason,
+                                 bool aDone, bool aWasSize);
   nsresult WantDecodedFrames(uint32_t aFlags, bool aShouldSyncNotify);
   nsresult SyncDecode();
   nsresult InitDecoder(bool aDoSizeDecode);
@@ -710,10 +466,10 @@
   bool     IsDecodeFinished();
   TimeStamp mDrawStartTime;
 
-  // Initializes imgStatusTracker and resets it on RasterImage destruction.
-  nsAutoPtr<imgStatusTrackerInit> mStatusTrackerInit;
+  // Initializes ProgressTracker and resets it on RasterImage destruction.
+  nsAutoPtr<ProgressTrackerInit> mProgressTrackerInit;
 
-  nsresult ShutdownDecoder(eShutdownIntent aIntent);
+  nsresult ShutdownDecoder(ShutdownReason aReason);
 
 
   //////////////////////////////////////////////////////////////////////////////
@@ -761,7 +517,7 @@
   bool StoringSourceData() const;
 
 protected:
-  explicit RasterImage(imgStatusTracker* aStatusTracker = nullptr,
+  explicit RasterImage(ProgressTracker* aProgressTracker = nullptr,
                        ImageURL* aURI = nullptr);
 
   bool ShouldAnimate();
@@ -773,28 +529,6 @@
   return GetAnimationModeInternal(aAnimationMode);
 }
 
-// Asynchronous Decode Requestor
-//
-// We use this class when someone calls requestDecode() from within a decode
-// notification. Since requestDecode() involves modifying the decoder's state
-// (for example, possibly shutting down a header-only decode and starting a
-// full decode), we don't want to do this from inside a decoder.
-class imgDecodeRequestor : public nsRunnable
-{
-  public:
-    explicit imgDecodeRequestor(RasterImage &aContainer) {
-      mContainer = &aContainer;
-    }
-    NS_IMETHOD Run() {
-      if (mContainer)
-        mContainer->StartDecoding();
-      return NS_OK;
-    }
-
-  private:
-    WeakPtr<RasterImage> mContainer;
-};
-
 } // namespace image
 } // namespace mozilla
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ScriptedNotificationObserver.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ScriptedNotificationObserver.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/ScriptedNotificationObserver.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/ScriptedNotificationObserver.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -46,6 +46,8 @@
     return mInner->Discard(aRequest);
   if (aType == imgINotificationObserver::IS_ANIMATED)
     return mInner->IsAnimated(aRequest);
+  if (aType == imgINotificationObserver::HAS_TRANSPARENCY)
+    return mInner->HasTransparency(aRequest);
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/VectorImage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/VectorImage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/VectorImage.cpp	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/VectorImage.cpp	2014-11-26 21:45:47.000000000 +0000
@@ -10,7 +10,6 @@
 #include "gfxDrawable.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
-#include "imgDecoderObserver.h"
 #include "imgFrame.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/MemoryReporting.h"
@@ -323,7 +322,7 @@
 //------------------------------------------------------------------------------
 // Constructor / Destructor
 
-VectorImage::VectorImage(imgStatusTracker* aStatusTracker,
+VectorImage::VectorImage(ProgressTracker* aProgressTracker,
                          ImageURL* aURI /* = nullptr */) :
   ImageResource(aURI), // invoke superclass's constructor
   mIsInitialized(false),
@@ -332,7 +331,7 @@
   mHaveAnimations(false),
   mHasPendingInvalidation(false)
 {
-  mStatusTrackerInit = new imgStatusTrackerInit(this, aStatusTracker);
+  mProgressTrackerInit = new ProgressTrackerInit(this, aProgressTracker);
 }
 
 VectorImage::~VectorImage()
@@ -434,7 +433,7 @@
                                  bool aLastPart)
 {
   // Call our internal OnStopRequest method, which only talks to our embedded
-  // SVG document. This won't have any effect on our imgStatusTracker.
+  // SVG document. This won't have any effect on our ProgressTracker.
   nsresult finalStatus = OnStopRequest(aRequest, aContext, aStatus);
 
   // Give precedence to Necko failure codes.
@@ -442,14 +441,10 @@
     finalStatus = aStatus;
 
   // Actually fire OnStopRequest.
-  if (mStatusTracker) {
-    // XXX(seth): Is this seriously the least insane way to do this?
-    nsRefPtr<imgStatusTracker> clone = mStatusTracker->CloneForRecording();
-    imgDecoderObserver* observer = clone->GetDecoderObserver();
-    observer->OnStopRequest(aLastPart, finalStatus);
-    ImageStatusDiff diff = mStatusTracker->Difference(clone);
-    mStatusTracker->ApplyDifference(diff);
-    mStatusTracker->SyncNotifyDifference(diff);
+  if (mProgressTracker) {
+    mProgressTracker->SyncNotifyProgress(LoadCompleteProgress(aLastPart,
+                                                              mError,
+                                                              finalStatus));
   }
   return finalStatus;
 }
@@ -569,12 +564,10 @@
   // we would miss the subsequent invalidations if we didn't send out the
   // notifications directly in |InvalidateObservers...|.
 
-  if (mStatusTracker) {
+  if (mProgressTracker) {
     SurfaceCache::Discard(this);
-    ImageStatusDiff diff;
-    diff.diffState = FLAG_FRAME_STOPPED;
-    mStatusTracker->ApplyDifference(diff);
-    mStatusTracker->SyncNotifyDifference(diff, nsIntRect::GetMaxSizedIntRect());
+    mProgressTracker->SyncNotifyProgress(FLAG_FRAME_COMPLETE,
+                                         nsIntRect::GetMaxSizedIntRect());
   }
 }
 
@@ -694,15 +687,9 @@
   return 0;
 }
 
-
-//******************************************************************************
-/* [notxpcom] boolean frameIsOpaque(in uint32_t aWhichFrame); */
 NS_IMETHODIMP_(bool)
-VectorImage::FrameIsOpaque(uint32_t aWhichFrame)
+VectorImage::IsOpaque()
 {
-  if (aWhichFrame > FRAME_MAX_VALUE)
-    NS_WARNING("aWhichFrame outside valid range!");
-
   return false; // In general, SVG content is not opaque.
 }
 
@@ -828,8 +815,8 @@
     return NS_ERROR_FAILURE;
   }
 
-  if (mAnimationConsumers == 0 && mStatusTracker) {
-    mStatusTracker->OnUnlockedDraw();
+  if (mAnimationConsumers == 0 && mProgressTracker) {
+    mProgressTracker->OnUnlockedDraw();
   }
 
   AutoRestore<bool> autoRestoreIsDrawing(mIsDrawing);
@@ -1036,13 +1023,9 @@
   // Sending StartDecode will block page load until the document's ready.  (We
   // unblock it by sending StopDecode in OnSVGDocumentLoaded or
   // OnSVGDocumentError.)
-  if (mStatusTracker) {
-    nsRefPtr<imgStatusTracker> clone = mStatusTracker->CloneForRecording();
-    imgDecoderObserver* observer = clone->GetDecoderObserver();
-    observer->OnStartDecode();
-    ImageStatusDiff diff = mStatusTracker->Difference(clone);
-    mStatusTracker->ApplyDifference(diff);
-    mStatusTracker->SyncNotifyDifference(diff);
+  if (mProgressTracker) {
+    mProgressTracker->SyncNotifyProgress(FLAG_DECODE_STARTED |
+                                         FLAG_ONLOAD_BLOCKED);
   }
 
   // Create a listener to wait until the SVG document is fully loaded, which
@@ -1120,12 +1103,13 @@
   mRenderingObserver = new SVGRootRenderingObserver(mSVGDocumentWrapper, this);
 
   // Tell *our* observers that we're done loading.
-  if (mStatusTracker) {
-    ImageStatusDiff diff;
-    diff.diffState = FLAG_HAS_SIZE | FLAG_FRAME_STOPPED | FLAG_DECODE_STOPPED |
-                     FLAG_ONLOAD_UNBLOCKED;
-    mStatusTracker->ApplyDifference(diff);
-    mStatusTracker->SyncNotifyDifference(diff, nsIntRect::GetMaxSizedIntRect());
+  if (mProgressTracker) {
+    mProgressTracker->SyncNotifyProgress(FLAG_SIZE_AVAILABLE |
+                                         FLAG_HAS_TRANSPARENCY |
+                                         FLAG_FRAME_COMPLETE |
+                                         FLAG_DECODE_COMPLETE |
+                                         FLAG_ONLOAD_UNBLOCKED,
+                                         nsIntRect::GetMaxSizedIntRect());
   }
 
   EvaluateAnimation();
@@ -1141,15 +1125,11 @@
   // "broken image" icon.  See bug 594505.
   mError = true;
 
-  if (mStatusTracker) {
-    nsRefPtr<imgStatusTracker> clone = mStatusTracker->CloneForRecording();
-    imgDecoderObserver* observer = clone->GetDecoderObserver();
-
+  if (mProgressTracker) {
     // Unblock page load.
-    observer->OnStopDecode(NS_ERROR_FAILURE);
-    ImageStatusDiff diff = mStatusTracker->Difference(clone);
-    mStatusTracker->ApplyDifference(diff);
-    mStatusTracker->SyncNotifyDifference(diff);
+    mProgressTracker->SyncNotifyProgress(FLAG_DECODE_COMPLETE |
+                                         FLAG_ONLOAD_UNBLOCKED |
+                                         FLAG_HAS_ERROR);
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/VectorImage.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/VectorImage.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/src/VectorImage.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/src/VectorImage.h	2014-11-26 21:45:47.000000000 +0000
@@ -78,7 +78,7 @@
   void OnSVGDocumentError();
 
 protected:
-  explicit VectorImage(imgStatusTracker* aStatusTracker = nullptr,
+  explicit VectorImage(ProgressTracker* aProgressTracker = nullptr,
                        ImageURL* aURI = nullptr);
   virtual ~VectorImage();
 
@@ -106,8 +106,8 @@
   bool           mHasPendingInvalidation; // Invalidate observers next refresh
                                           // driver tick.
 
-  // Initializes imgStatusTracker and resets it on RasterImage destruction.
-  nsAutoPtr<imgStatusTrackerInit> mStatusTrackerInit;
+  // Initializes ProgressTracker and resets it on RasterImage destruction.
+  nsAutoPtr<ProgressTrackerInit> mProgressTrackerInit;
 
   friend class ImageFactory;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/animationPolling.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/animationPolling.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/animationPolling.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/animationPolling.js	2014-11-26 21:45:47.000000000 +0000
@@ -80,7 +80,7 @@
 {
   // We want to test the cold loading behavior, so clear cache in case an
   // earlier test got our image in there already.
-  clearImageCache();
+  clearAllImageCaches();
 
   this.wereFailures = false;
   this.pollFreq = pollFreq;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/chrome.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/chrome.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/chrome.ini	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/chrome.ini	2014-11-26 21:45:47.000000000 +0000
@@ -11,25 +11,34 @@
   damon.jpg
   filter-final.svg
   filter.svg
+  first-frame-padding.gif
+  ico-bmp-opaque.ico
+  ico-bmp-transparent.ico
   iframe.html
   imgutils.js
   invalid.jpg
   lime-anim-100x100-2.svg
   lime-anim-100x100.svg
   lime100x100.svg
+  opaque.bmp
   purple.gif
+  red.gif
   red.png
   ref-iframe.html
   rillybad.jpg
+  transparent.gif
+  transparent.png
 
 [test_animSVGImage.html]
 [test_animSVGImage2.html]
 [test_animation.html]
+skip-if = true # bug 1100497
 [test_animation2.html]
 [test_background_image_anim.html]
 [test_bullet_animation.html]
 [test_changeOfSource.html]
 [test_changeOfSource2.html]
+[test_has_transparency.html]
 [test_net_failedtoprocess.html]
 [test_removal_ondecode.html]
 [test_removal_onload.html]
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/first-frame-padding.gif and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/first-frame-padding.gif differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/ico-bmp-opaque.ico and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/ico-bmp-opaque.ico differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/ico-bmp-transparent.ico and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/ico-bmp-transparent.ico differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/imgutils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/imgutils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/imgutils.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/imgutils.js	2014-11-26 21:45:47.000000000 +0000
@@ -4,6 +4,16 @@
 // Note that this is use by tests elsewhere in the source tree. When in doubt,
 // check mxr before removing or changing functionality.
 
+// Helper function to clear both the content and chrome image caches
+function clearAllImageCaches()
+{
+  var tools = SpecialPowers.Cc["@mozilla.org/image/tools;1"]
+                             .getService(SpecialPowers.Ci.imgITools);
+  var imageCache = tools.getImgCacheForDocument(window.document);
+  imageCache.clearCache(true);  // true=chrome
+  imageCache.clearCache(false); // false=content
+}
+
 // Helper function to clear the image cache of content images
 function clearImageCache()
 {
@@ -117,11 +127,12 @@
 // JS implementation of imgIScriptedNotificationObserver with stubs for all of its methods.
 function ImageDecoderObserverStub()
 {
-  this.sizeAvailable = function sizeAvailable(aRequest)   {}
-  this.frameComplete = function frameComplete(aRequest)   {}
-  this.decodeComplete = function decodeComplete(aRequest) {}
-  this.loadComplete = function loadComplete(aRequest)     {}
-  this.frameUpdate = function frameUpdate(aRequest)       {}
-  this.discard = function discard(aRequest)               {}
-  this.isAnimated = function isAnimated(aRequest)         {}
+  this.sizeAvailable = function sizeAvailable(aRequest)     {}
+  this.frameComplete = function frameComplete(aRequest)     {}
+  this.decodeComplete = function decodeComplete(aRequest)   {}
+  this.loadComplete = function loadComplete(aRequest)       {}
+  this.frameUpdate = function frameUpdate(aRequest)         {}
+  this.discard = function discard(aRequest)                 {}
+  this.isAnimated = function isAnimated(aRequest)           {}
+  this.hasTransparency = function hasTransparency(aRequest) {}
 }
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/opaque.bmp and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/opaque.bmp differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/red.gif and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/red.gif differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_animSVGImage2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_animSVGImage2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_animSVGImage2.html	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_animSVGImage2.html	2014-11-26 21:45:47.000000000 +0000
@@ -32,9 +32,8 @@
 
 var gMyDecoderObserver; // value will be set in main()
 var gReferenceSnapshot; // value will be set in takeReferenceSnapshot()
-var gOnStopFrameCounter = 0;
+var gOnFrameUpdateCounter = 0;
 var gIsTestFinished = false;
-var gTimer = null;
 
 
 function takeReferenceSnapshot() {
@@ -55,30 +54,33 @@
      "reference div should disappear when it becomes display:none");
 }
 
-function myOnStopFrame(aRequest) {
-  gOnStopFrameCounter++;
-  ok(true, "myOnStopFrame called");
+function myOnFrameUpdate(aRequest) {
+  if (gIsTestFinished) {
+    return;
+  }
+  gOnFrameUpdateCounter++;
+  ok(true, "myOnFrameUpdate called");
   let currentSnapshot = snapshotWindow(window, false);
   if (compareSnapshots(currentSnapshot, gReferenceSnapshot, true)[0]) {
     // SUCCESS!
     ok(true, "Animated image looks correct, " +
-             "at call #" + gOnStopFrameCounter + " to onStopFrame");
+             "at call #" + gOnFrameUpdateCounter + " to myOnFrameUpdate");
     cleanUpAndFinish();
   }
-  if (!gTimer)
-    gTimer = setTimeout(function() { gTimer = null; myOnStopFrame(0, 0); }, 1000);
 }
 
 function failTest() {
+  if (gIsTestFinished) {
+    return;
+  }
   ok(false, "timing out after " + FAILURE_TIMEOUT + "ms.  " +
             "Animated image still doesn't look correct, " +
-            "after call #" + gOnStopFrameCounter + " to onStopFrame");
+            "after call #" + gOnFrameUpdateCounter + " to myOnFrameUpdate");
   cleanUpAndFinish();
 }
 
 function cleanUpAndFinish() {
-  clearTimeout(gTimer);
-  // On the off chance that failTest and myOnStopFrame are triggered
+  // On the off chance that failTest and myOnFrameUpdate are triggered
   // back-to-back, use a flag to prevent multiple calls to SimpleTest.finish.
   if (gIsTestFinished) {
     return;
@@ -94,7 +96,7 @@
 
   // Create, customize & attach decoder observer
   observer = new ImageDecoderObserverStub();
-  observer.frameComplete = myOnStopFrame;
+  observer.frameUpdate = myOnFrameUpdate;
   gMyDecoderObserver =
     Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
       .createScriptedObserver(observer);
@@ -103,9 +105,9 @@
 
   // We want to test the cold loading behavior, so clear cache in case an
   // earlier test got our image in there already.
-  clearImageCache();
+  clearAllImageCaches();
 
-  // kick off image-loading! myOnStopFrame handles the rest.
+  // kick off image-loading! myOnFrameUpdate handles the rest.
   gImg.setAttribute("src", "lime-anim-100x100-2.svg");
 
   // In case something goes wrong, fail earlier than mochitest timeout,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_animSVGImage.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_animSVGImage.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_animSVGImage.html	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_animSVGImage.html	2014-11-26 21:45:47.000000000 +0000
@@ -32,7 +32,7 @@
 
 var gMyDecoderObserver; // value will be set in main()
 var gReferenceSnapshot; // value will be set in takeReferenceSnapshot()
-var gOnStopFrameCounter = 0;
+var gPollCounter = 0;
 var gIsTestFinished = false;
 
 
@@ -54,29 +54,29 @@
      "reference div should disappear when it becomes display:none");
 }
 
-function myOnStopFrame() {
-  gOnStopFrameCounter++;
-  ok(true, "myOnStopFrame called");
+function myPoll() {
+  gPollCounter++;
+  ok(true, "myPoll called");
   let currentSnapshot = snapshotWindow(window, false);
   if (compareSnapshots(currentSnapshot, gReferenceSnapshot, true)[0]) {
     // SUCCESS!
     ok(true, "Animated image looks correct, " +
-             "at call #" + gOnStopFrameCounter + " to onStopFrame");
+             "at call #" + gPollCounter + " to myPoll");
     cleanUpAndFinish();
   }
   else
-    setTimeout(myOnStopFrame, 1);
+    setTimeout(myPoll, 1);
 }
 
 function failTest() {
   ok(false, "timing out after " + FAILURE_TIMEOUT + "ms.  " +
             "Animated image still doesn't look correct, " +
-            "after call #" + gOnStopFrameCounter + " to onStopFrame");
+            "after call #" + gPollCounter + " to myPoll");
   cleanUpAndFinish();
 }
 
 function cleanUpAndFinish() {
-  // On the off chance that failTest and myOnStopFrame are triggered
+  // On the off chance that failTest and myPoll are triggered
   // back-to-back, use a flag to prevent multiple calls to SimpleTest.finish.
   if (gIsTestFinished) {
     return;
@@ -90,11 +90,11 @@
 
   // We want to test the cold loading behavior, so clear cache in case an
   // earlier test got our image in there already.
-  clearImageCache();
+  clearAllImageCaches();
 
-  setTimeout(myOnStopFrame, 1);
+  setTimeout(myPoll, 1);
 
-  // kick off image-loading! myOnStopFrame handles the rest.
+  // kick off image-loading! myPoll handles the rest.
   gImg.setAttribute("src", "lime-anim-100x100.svg");
 
   // In case something goes wrong, fail earlier than mochitest timeout,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_has_transparency.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_has_transparency.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_has_transparency.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_has_transparency.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,162 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1089880
+-->
+<head>
+  <title>Test for Bug 1089880</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
+  <script type="application/javascript" src="imgutils.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1089880">Mozilla Bug 1089880</a>
+<p id="display"></p>
+<div id="content">
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.8">
+/** Test for Bug 1089880 **/
+
+SimpleTest.waitForExplicitFinish();
+
+const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const gContent = document.getElementById("content");
+
+var gCanvas;
+var gCanvasCtx;
+var gImg;
+var gMyDecoderObserver;
+var gIsTestFinished = false;
+var gFiles;
+var gCurrentFileIsTransparent = false;
+var gHasTransparencyWasCalled = false;
+
+function testFiles() {
+  // [A, B] where 'A' is the image and 'B' is whether it's transparent.
+
+  // PNGs and GIFs may be transparent or not.
+  yield ["red.png", false];
+  yield ["transparent.png", true];
+  yield ["red.gif", false];
+  yield ["transparent.gif", true];
+
+  // GIFs with padding on the first frame are always transparent.
+  yield ["first-frame-padding.gif", true];
+
+  // JPEGs and BMPs are never transparent.
+  yield ["damon.jpg", false];
+  yield ["opaque.bmp", false];
+
+  // ICO files which contain BMPs have an additional type of transparency - the
+  // AND mask - that warrants separate testing.
+  yield ["ico-bmp-opaque.ico", false];
+  yield ["ico-bmp-transparent.ico", true];
+
+  // SVGs are always transparent.
+  yield ["lime100x100.svg", true];
+}
+
+function loadNext() {
+  var currentFile = "";
+  try {
+    gHasTransparencyWasCalled = false;
+    [currentFile, gCurrentFileIsTransparent] = gFiles.next();
+    gImg.setAttribute("src", currentFile);
+  } catch (e) {
+    // We ran out of test files.
+    cleanUpAndFinish();
+  }
+}
+
+function onHasTransparency(aRequest) {
+  gHasTransparencyWasCalled = true;
+}
+
+function onDecodeComplete(aRequest) {
+  if (!gCurrentFileIsTransparent) {
+    ok(!gHasTransparencyWasCalled,
+       "onHasTransparency was not called for non-transparent file " + gImg.src);
+  } else {
+    ok(gHasTransparencyWasCalled,
+       "onHasTransparency was called for transparent file " + gImg.src);
+  }
+  loadNext();
+}
+
+function onError() {
+  if (gIsTestFinished) {
+    return;
+  }
+  ok(false, "Should successfully load " + gImg.src);
+  loadNext();
+}
+
+function onLoad() {
+  if (gIsTestFinished) {
+    return;
+  }
+  ok(true, "Should successfully load " + gImg.src);
+
+  // Force decoding of the image.
+  SimpleTest.executeSoon(function() {
+    gCanvasCtx.drawImage(gImg, 0, 0);
+  });
+}
+
+function failTest() {
+  ok(false, "timing out after " + FAILURE_TIMEOUT + "ms.  " +
+            "currently displaying " + gImg.src);
+  cleanUpAndFinish();
+}
+
+function cleanUpAndFinish() {
+  if (gIsTestFinished) {
+    return;
+  }
+  gIsTestFinished = true;
+  let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
+  imgLoadingContent.removeObserver(gMyDecoderObserver);
+  SimpleTest.finish();
+}
+
+function main() {
+  gFiles = testFiles();
+  gCanvas = document.createElement('canvas');
+  gCanvasCtx = gCanvas.getContext('2d');
+  gImg = new Image();
+  gImg.onload = onLoad;
+  gImg.onerror = onError;
+
+  // Create, customize & attach decoder observer.
+  observer = new ImageDecoderObserverStub();
+  observer.hasTransparency = onHasTransparency;
+  observer.decodeComplete = onDecodeComplete;
+  gMyDecoderObserver =
+    Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
+      .createScriptedObserver(observer);
+  let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
+  imgLoadingContent.addObserver(gMyDecoderObserver);
+
+  // We want to test the cold loading behavior, so clear cache in case an
+  // earlier test got our image in there already.
+  clearAllImageCaches();
+
+  // Load the first image.
+  loadNext();
+
+  // In case something goes wrong, fail earlier than mochitest timeout,
+  // and with more information.
+  setTimeout(failTest, FAILURE_TIMEOUT);
+}
+
+window.onload = main;
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_removal_ondecode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_removal_ondecode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_removal_ondecode.html	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_removal_ondecode.html	2014-11-26 21:45:47.000000000 +0000
@@ -109,7 +109,7 @@
 
   // We want to test the cold loading behavior, so clear cache in case an
   // earlier test got our image in there already.
-  clearImageCache();
+  clearAllImageCaches();
 
   // kick off image-loading! myOnStopFrame handles the rest.
   gImg.setAttribute("src", gFiles.next());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_removal_onload.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_removal_onload.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_removal_onload.html	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_removal_onload.html	2014-11-26 21:45:47.000000000 +0000
@@ -109,7 +109,7 @@
 
   // We want to test the cold loading behavior, so clear cache in case an
   // earlier test got our image in there already.
-  clearImageCache();
+  clearAllImageCaches();
 
   // kick off image-loading! myOnStopFrame handles the rest.
   gImg.setAttribute("src", gFiles.next());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_synchronized_animation.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_synchronized_animation.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/test_synchronized_animation.html	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/test_synchronized_animation.html	2014-11-26 21:45:47.000000000 +0000
@@ -106,7 +106,7 @@
 
   // We want to test the cold loading behavior, so clear cache in case an
   // earlier test got our image in there already.
-  clearImageCache();
+  clearAllImageCaches();
 
   // These are two copies of the same image; hence, they have the same frame rate.
   gImg1.src = "animated1.gif";
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/transparent.gif and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/transparent.gif differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/mochitest/transparent.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/mochitest/transparent.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/async_load_tests.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/async_load_tests.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/async_load_tests.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/async_load_tests.js	2014-11-26 21:45:47.000000000 +0000
@@ -96,7 +96,7 @@
   var listener = new ImageListener(checkClone, secondLoadDone);
   var outer = Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
                 .createScriptedObserver(listener);
-  requests.push(gCurrentLoader.loadImageXPCOM(uri, null, null, null, null, outer, null, 0, null));
+  requests.push(gCurrentLoader.loadImageXPCOM(uri, null, null, "default", null, null, outer, null, 0, null));
   listener.synchronous = false;
 }
 
@@ -194,7 +194,7 @@
     var listener2 = new ImageListener(null, function(foo, bar) { do_test_finished(); });
     var outer = Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
                   .createScriptedObserver(listener2);
-    requests.push(gCurrentLoader.loadImageXPCOM(uri, null, null, null, null, outer, null, 0, null));
+    requests.push(gCurrentLoader.loadImageXPCOM(uri, null, null, "default", null, null, outer, null, 0, null));
     listener2.synchronous = false;
 
     // Now that we've started another load, chain to the callback.
@@ -221,7 +221,7 @@
   var listener = new ImageListener(startImageCallback(checkClone), firstLoadDone);
   var outer = Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
                 .createScriptedObserver(listener);
-  var req = gCurrentLoader.loadImageXPCOM(uri, null, null, null, null, outer, null, 0, null);
+  var req = gCurrentLoader.loadImageXPCOM(uri, null, null, "default", null, null, outer, null, 0, null);
   requests.push(req);
 
   // Ensure that we don't cause any mayhem when we lock an image.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/test_encoder_apng.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/test_encoder_apng.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/test_encoder_apng.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/test_encoder_apng.js	2014-11-26 21:45:48.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Test for APNG encoding in libpr0n
+ * Test for APNG encoding in ImageLib
  *
  */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/test_encoder_png.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/test_encoder_png.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/test_encoder_png.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/test_encoder_png.js	2014-11-26 21:45:48.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Test for PNG encoding in libpr0n
+ * Test for PNG encoding in ImageLib
  *
  */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/test_private_channel.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/test_private_channel.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/image/test/unit/test_private_channel.js	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/image/test/unit/test_private_channel.js	2014-11-26 21:45:48.000000000 +0000
@@ -77,7 +77,7 @@
   var loadGroup = Cc["@mozilla.org/network/load-group;1"].createInstance(Ci.nsILoadGroup);
   loadGroup.notificationCallbacks = new NotificationCallbacks(isPrivate);
   var loader = isPrivate ? gPrivateLoader : gPublicLoader;
-  requests.push(loader.loadImageXPCOM(uri, null, null, null, loadGroup, outer, null, 0, null));
+  requests.push(loader.loadImageXPCOM(uri, null, null, "default", null, loadGroup, outer, null, 0, null));
   listener.synchronous = false;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/intl/unicharutil/util/nsBidiUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/intl/unicharutil/util/nsBidiUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/intl/unicharutil/util/nsBidiUtils.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/intl/unicharutil/util/nsBidiUtils.h	2014-11-26 21:45:52.000000000 +0000
@@ -46,6 +46,25 @@
 typedef enum nsCharType nsCharType;
 
 /**
+ * Find the direction of an embedding level or paragraph level set by
+ * the Unicode Bidi Algorithm. (Even levels are left-to-right, odd
+ * levels right-to-left.
+ */
+#define IS_LEVEL_RTL(level) (((level) & 1) == 1)
+
+/**
+ * Check whether two bidi levels have the same parity and thus the same
+ * directionality
+ */
+#define IS_SAME_DIRECTION(level1, level2) (((level1 ^ level2) & 1) == 0)
+
+/**
+ * Convert from nsBidiLevel to nsBidiDirection
+ */
+#define DIRECTION_FROM_LEVEL(level) ((IS_LEVEL_RTL(level)) \
+   ? NSBIDI_RTL : NSBIDI_LTR)
+
+/**
  * definitions of bidirection character types by category
  */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/app/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/app/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/app/moz.build	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/app/moz.build	2014-11-26 21:45:52.000000000 +0000
@@ -33,6 +33,13 @@
     '/xpcom/base',
 ]
 
+# We link GMPLoader into plugin-container on desktop so that its code is
+# covered by the desktop DRM vendor's voucher.
+if CONFIG['OS_TARGET'] != 'Android':
+    SOURCES += [
+        '../../dom/media/gmp/GMPLoader.cpp',
+    ]
+
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
     # For sandbox includes and the include dependencies those have
     LOCAL_INCLUDES += [
@@ -41,6 +48,7 @@
         '/security/sandbox/chromium',
     ]
     USE_LIBS += [
+        'rlz',
         'sandbox_staticruntime_s',
     ]
     DELAYLOAD_DLLS += [
@@ -48,6 +56,15 @@
         'nss3.dll',
         'xul.dll'
     ]
+    DEFINES['HASH_NODE_ID_WITH_DEVICE_ID'] = 1;
+    SOURCES += [
+        'sha256.c',
+    ]
+
+if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Linux':
+    USE_LIBS += [
+        'mozsandbox',
+    ]
 
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/app/sha256.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/app/sha256.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/app/sha256.c	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/app/sha256.c	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,491 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Stripped down version of security/nss/lib/freebl/sha512.c
+// and related headers.
+
+#include "sha256.h"
+#include "string.h"
+#include "prcpucfg.h"
+#if defined(NSS_X86) || defined(SHA_NO_LONG_LONG)
+#define NOUNROLL512 1
+#undef HAVE_LONG_LONG
+#endif
+
+#define SHA256_BLOCK_LENGTH 64 /* bytes */ 
+
+typedef enum _SECStatus {
+    SECWouldBlock = -2,
+    SECFailure = -1,
+    SECSuccess = 0
+} SECStatus;
+
+/* ============= Common constants and defines ======================= */
+
+#define W ctx->u.w
+#define B ctx->u.b
+#define H ctx->h
+
+#define SHR(x,n) (x >> n)
+#define SHL(x,n) (x << n)
+#define Ch(x,y,z)  ((x & y) ^ (~x & z))
+#define Maj(x,y,z) ((x & y) ^ (x & z) ^ (y & z))
+#define SHA_MIN(a,b) (a < b ? a : b)
+
+/* Padding used with all flavors of SHA */
+static const PRUint8 pad[240] = { 
+0x80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+   /* compiler will fill the rest in with zeros */
+};
+
+/* ============= SHA256 implementation ================================== */
+
+/* SHA-256 constants, K256. */
+static const PRUint32 K256[64] = {
+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 
+    0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 
+    0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 
+    0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 
+    0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 
+    0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 
+    0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 
+    0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 
+    0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+};
+
+/* SHA-256 initial hash values */
+static const PRUint32 H256[8] = {
+    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 
+    0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+};
+
+#if (_MSC_VER >= 1300)
+#include <stdlib.h>
+#pragma intrinsic(_byteswap_ulong)
+#define SHA_HTONL(x) _byteswap_ulong(x)
+#define BYTESWAP4(x)  x = SHA_HTONL(x)
+#elif defined(_MSC_VER) && defined(NSS_X86_OR_X64)
+#ifndef FORCEINLINE
+#if (_MSC_VER >= 1200)
+#define FORCEINLINE __forceinline
+#else
+#define FORCEINLINE __inline
+#endif
+#endif
+#define FASTCALL __fastcall
+
+static FORCEINLINE PRUint32 FASTCALL 
+swap4b(PRUint32 dwd) 
+{
+    __asm {
+    	mov   eax,dwd
+	bswap eax
+    }
+}
+
+#define SHA_HTONL(x) swap4b(x)
+#define BYTESWAP4(x)  x = SHA_HTONL(x)
+
+#elif defined(__GNUC__) && defined(NSS_X86_OR_X64)
+static __inline__ PRUint32 swap4b(PRUint32 value)
+{
+    __asm__("bswap %0" : "+r" (value));
+    return (value);
+}
+#define SHA_HTONL(x) swap4b(x)
+#define BYTESWAP4(x)  x = SHA_HTONL(x)
+
+#elif defined(__GNUC__) && (defined(__thumb2__) || \
+      (!defined(__thumb__) && \
+      (defined(__ARM_ARCH_6__) || \
+       defined(__ARM_ARCH_6J__) || \
+       defined(__ARM_ARCH_6K__) || \
+       defined(__ARM_ARCH_6Z__) || \
+       defined(__ARM_ARCH_6ZK__) || \
+       defined(__ARM_ARCH_6T2__) || \
+       defined(__ARM_ARCH_7__) || \
+       defined(__ARM_ARCH_7A__) || \
+       defined(__ARM_ARCH_7R__))))
+static __inline__ PRUint32 swap4b(PRUint32 value)
+{
+    PRUint32 ret;
+    __asm__("rev %0, %1" : "=r" (ret) : "r"(value));
+    return ret;
+}
+#define SHA_HTONL(x) swap4b(x)
+#define BYTESWAP4(x)  x = SHA_HTONL(x)
+
+#else
+#define SWAP4MASK  0x00FF00FF
+#define SHA_HTONL(x) (t1 = (x), t1 = (t1 << 16) | (t1 >> 16), \
+                      ((t1 & SWAP4MASK) << 8) | ((t1 >> 8) & SWAP4MASK))
+#define BYTESWAP4(x)  x = SHA_HTONL(x)
+#endif
+
+#if defined(_MSC_VER)
+#pragma intrinsic (_lrotr, _lrotl) 
+#define ROTR32(x,n) _lrotr(x,n)
+#define ROTL32(x,n) _lrotl(x,n)
+#else
+#define ROTR32(x,n) ((x >> n) | (x << ((8 * sizeof x) - n)))
+#define ROTL32(x,n) ((x << n) | (x >> ((8 * sizeof x) - n)))
+#endif
+
+/* Capitol Sigma and lower case sigma functions */
+#define S0(x) (ROTR32(x, 2) ^ ROTR32(x,13) ^ ROTR32(x,22))
+#define S1(x) (ROTR32(x, 6) ^ ROTR32(x,11) ^ ROTR32(x,25))
+#define s0(x) (t1 = x, ROTR32(t1, 7) ^ ROTR32(t1,18) ^ SHR(t1, 3))
+#define s1(x) (t2 = x, ROTR32(t2,17) ^ ROTR32(t2,19) ^ SHR(t2,10))
+
+void 
+SHA256_Begin(SHA256Context *ctx)
+{
+    memset(ctx, 0, sizeof *ctx);
+    memcpy(H, H256, sizeof H256);
+}
+
+static void
+SHA256_Compress(SHA256Context *ctx)
+{
+  {
+    register PRUint32 t1, t2;
+
+#if defined(IS_LITTLE_ENDIAN)
+    BYTESWAP4(W[0]);
+    BYTESWAP4(W[1]);
+    BYTESWAP4(W[2]);
+    BYTESWAP4(W[3]);
+    BYTESWAP4(W[4]);
+    BYTESWAP4(W[5]);
+    BYTESWAP4(W[6]);
+    BYTESWAP4(W[7]);
+    BYTESWAP4(W[8]);
+    BYTESWAP4(W[9]);
+    BYTESWAP4(W[10]);
+    BYTESWAP4(W[11]);
+    BYTESWAP4(W[12]);
+    BYTESWAP4(W[13]);
+    BYTESWAP4(W[14]);
+    BYTESWAP4(W[15]);
+#endif
+
+#define INITW(t) W[t] = (s1(W[t-2]) + W[t-7] + s0(W[t-15]) + W[t-16])
+
+    /* prepare the "message schedule"   */
+#ifdef NOUNROLL256
+    {
+	int t;
+	for (t = 16; t < 64; ++t) {
+	    INITW(t);
+	}
+    }
+#else
+    INITW(16);
+    INITW(17);
+    INITW(18);
+    INITW(19);
+
+    INITW(20);
+    INITW(21);
+    INITW(22);
+    INITW(23);
+    INITW(24);
+    INITW(25);
+    INITW(26);
+    INITW(27);
+    INITW(28);
+    INITW(29);
+
+    INITW(30);
+    INITW(31);
+    INITW(32);
+    INITW(33);
+    INITW(34);
+    INITW(35);
+    INITW(36);
+    INITW(37);
+    INITW(38);
+    INITW(39);
+
+    INITW(40);
+    INITW(41);
+    INITW(42);
+    INITW(43);
+    INITW(44);
+    INITW(45);
+    INITW(46);
+    INITW(47);
+    INITW(48);
+    INITW(49);
+
+    INITW(50);
+    INITW(51);
+    INITW(52);
+    INITW(53);
+    INITW(54);
+    INITW(55);
+    INITW(56);
+    INITW(57);
+    INITW(58);
+    INITW(59);
+
+    INITW(60);
+    INITW(61);
+    INITW(62);
+    INITW(63);
+
+#endif
+#undef INITW
+  }
+  {
+    PRUint32 a, b, c, d, e, f, g, h;
+
+    a = H[0];
+    b = H[1];
+    c = H[2];
+    d = H[3];
+    e = H[4];
+    f = H[5];
+    g = H[6];
+    h = H[7];
+
+#define ROUND(n,a,b,c,d,e,f,g,h) \
+    h += S1(e) + Ch(e,f,g) + K256[n] + W[n]; \
+    d += h; \
+    h += S0(a) + Maj(a,b,c); 
+
+#ifdef NOUNROLL256
+    {
+	int t;
+	for (t = 0; t < 64; t+= 8) {
+	    ROUND(t+0,a,b,c,d,e,f,g,h)
+	    ROUND(t+1,h,a,b,c,d,e,f,g)
+	    ROUND(t+2,g,h,a,b,c,d,e,f)
+	    ROUND(t+3,f,g,h,a,b,c,d,e)
+	    ROUND(t+4,e,f,g,h,a,b,c,d)
+	    ROUND(t+5,d,e,f,g,h,a,b,c)
+	    ROUND(t+6,c,d,e,f,g,h,a,b)
+	    ROUND(t+7,b,c,d,e,f,g,h,a)
+	}
+    }
+#else
+    ROUND( 0,a,b,c,d,e,f,g,h)
+    ROUND( 1,h,a,b,c,d,e,f,g)
+    ROUND( 2,g,h,a,b,c,d,e,f)
+    ROUND( 3,f,g,h,a,b,c,d,e)
+    ROUND( 4,e,f,g,h,a,b,c,d)
+    ROUND( 5,d,e,f,g,h,a,b,c)
+    ROUND( 6,c,d,e,f,g,h,a,b)
+    ROUND( 7,b,c,d,e,f,g,h,a)
+
+    ROUND( 8,a,b,c,d,e,f,g,h)
+    ROUND( 9,h,a,b,c,d,e,f,g)
+    ROUND(10,g,h,a,b,c,d,e,f)
+    ROUND(11,f,g,h,a,b,c,d,e)
+    ROUND(12,e,f,g,h,a,b,c,d)
+    ROUND(13,d,e,f,g,h,a,b,c)
+    ROUND(14,c,d,e,f,g,h,a,b)
+    ROUND(15,b,c,d,e,f,g,h,a)
+
+    ROUND(16,a,b,c,d,e,f,g,h)
+    ROUND(17,h,a,b,c,d,e,f,g)
+    ROUND(18,g,h,a,b,c,d,e,f)
+    ROUND(19,f,g,h,a,b,c,d,e)
+    ROUND(20,e,f,g,h,a,b,c,d)
+    ROUND(21,d,e,f,g,h,a,b,c)
+    ROUND(22,c,d,e,f,g,h,a,b)
+    ROUND(23,b,c,d,e,f,g,h,a)
+
+    ROUND(24,a,b,c,d,e,f,g,h)
+    ROUND(25,h,a,b,c,d,e,f,g)
+    ROUND(26,g,h,a,b,c,d,e,f)
+    ROUND(27,f,g,h,a,b,c,d,e)
+    ROUND(28,e,f,g,h,a,b,c,d)
+    ROUND(29,d,e,f,g,h,a,b,c)
+    ROUND(30,c,d,e,f,g,h,a,b)
+    ROUND(31,b,c,d,e,f,g,h,a)
+
+    ROUND(32,a,b,c,d,e,f,g,h)
+    ROUND(33,h,a,b,c,d,e,f,g)
+    ROUND(34,g,h,a,b,c,d,e,f)
+    ROUND(35,f,g,h,a,b,c,d,e)
+    ROUND(36,e,f,g,h,a,b,c,d)
+    ROUND(37,d,e,f,g,h,a,b,c)
+    ROUND(38,c,d,e,f,g,h,a,b)
+    ROUND(39,b,c,d,e,f,g,h,a)
+
+    ROUND(40,a,b,c,d,e,f,g,h)
+    ROUND(41,h,a,b,c,d,e,f,g)
+    ROUND(42,g,h,a,b,c,d,e,f)
+    ROUND(43,f,g,h,a,b,c,d,e)
+    ROUND(44,e,f,g,h,a,b,c,d)
+    ROUND(45,d,e,f,g,h,a,b,c)
+    ROUND(46,c,d,e,f,g,h,a,b)
+    ROUND(47,b,c,d,e,f,g,h,a)
+
+    ROUND(48,a,b,c,d,e,f,g,h)
+    ROUND(49,h,a,b,c,d,e,f,g)
+    ROUND(50,g,h,a,b,c,d,e,f)
+    ROUND(51,f,g,h,a,b,c,d,e)
+    ROUND(52,e,f,g,h,a,b,c,d)
+    ROUND(53,d,e,f,g,h,a,b,c)
+    ROUND(54,c,d,e,f,g,h,a,b)
+    ROUND(55,b,c,d,e,f,g,h,a)
+
+    ROUND(56,a,b,c,d,e,f,g,h)
+    ROUND(57,h,a,b,c,d,e,f,g)
+    ROUND(58,g,h,a,b,c,d,e,f)
+    ROUND(59,f,g,h,a,b,c,d,e)
+    ROUND(60,e,f,g,h,a,b,c,d)
+    ROUND(61,d,e,f,g,h,a,b,c)
+    ROUND(62,c,d,e,f,g,h,a,b)
+    ROUND(63,b,c,d,e,f,g,h,a)
+#endif
+
+    H[0] += a;
+    H[1] += b;
+    H[2] += c;
+    H[3] += d;
+    H[4] += e;
+    H[5] += f;
+    H[6] += g;
+    H[7] += h;
+  }
+#undef ROUND
+}
+
+#undef s0
+#undef s1
+#undef S0
+#undef S1
+
+void 
+SHA256_Update(SHA256Context *ctx, const unsigned char *input,
+		    unsigned int inputLen)
+{
+    unsigned int inBuf = ctx->sizeLo & 0x3f;
+    if (!inputLen)
+    	return;
+
+    /* Add inputLen into the count of bytes processed, before processing */
+    if ((ctx->sizeLo += inputLen) < inputLen)
+    	ctx->sizeHi++;
+
+    /* if data already in buffer, attemp to fill rest of buffer */
+    if (inBuf) {
+    	unsigned int todo = SHA256_BLOCK_LENGTH - inBuf;
+	if (inputLen < todo)
+	    todo = inputLen;
+	memcpy(B + inBuf, input, todo);
+	input    += todo;
+	inputLen -= todo;
+	if (inBuf + todo == SHA256_BLOCK_LENGTH)
+	    SHA256_Compress(ctx);
+    }
+
+    /* if enough data to fill one or more whole buffers, process them. */
+    while (inputLen >= SHA256_BLOCK_LENGTH) {
+    	memcpy(B, input, SHA256_BLOCK_LENGTH);
+	input    += SHA256_BLOCK_LENGTH;
+	inputLen -= SHA256_BLOCK_LENGTH;
+	SHA256_Compress(ctx);
+    }
+    /* if data left over, fill it into buffer */
+    if (inputLen) 
+    	memcpy(B, input, inputLen);
+}
+
+void 
+SHA256_End(SHA256Context *ctx, unsigned char *digest,
+           unsigned int *digestLen, unsigned int maxDigestLen)
+{
+    unsigned int inBuf = ctx->sizeLo & 0x3f;
+    unsigned int padLen = (inBuf < 56) ? (56 - inBuf) : (56 + 64 - inBuf);
+    PRUint32 hi, lo;
+#ifdef SWAP4MASK
+    PRUint32 t1;
+#endif
+
+    hi = (ctx->sizeHi << 3) | (ctx->sizeLo >> 29);
+    lo = (ctx->sizeLo << 3);
+
+    SHA256_Update(ctx, pad, padLen);
+
+#if defined(IS_LITTLE_ENDIAN)
+    W[14] = SHA_HTONL(hi);
+    W[15] = SHA_HTONL(lo);
+#else
+    W[14] = hi;
+    W[15] = lo;
+#endif
+    SHA256_Compress(ctx);
+
+    /* now output the answer */
+#if defined(IS_LITTLE_ENDIAN)
+    BYTESWAP4(H[0]);
+    BYTESWAP4(H[1]);
+    BYTESWAP4(H[2]);
+    BYTESWAP4(H[3]);
+    BYTESWAP4(H[4]);
+    BYTESWAP4(H[5]);
+    BYTESWAP4(H[6]);
+    BYTESWAP4(H[7]);
+#endif
+    padLen = PR_MIN(SHA256_LENGTH, maxDigestLen);
+    memcpy(digest, H, padLen);
+    if (digestLen)
+	*digestLen = padLen;
+}
+
+void
+SHA256_EndRaw(SHA256Context *ctx, unsigned char *digest,
+	      unsigned int *digestLen, unsigned int maxDigestLen)
+{
+    PRUint32 h[8];
+    unsigned int len;
+#ifdef SWAP4MASK
+    PRUint32 t1;
+#endif
+
+    memcpy(h, ctx->h, sizeof(h));
+
+#if defined(IS_LITTLE_ENDIAN)
+    BYTESWAP4(h[0]);
+    BYTESWAP4(h[1]);
+    BYTESWAP4(h[2]);
+    BYTESWAP4(h[3]);
+    BYTESWAP4(h[4]);
+    BYTESWAP4(h[5]);
+    BYTESWAP4(h[6]);
+    BYTESWAP4(h[7]);
+#endif
+
+    len = PR_MIN(SHA256_LENGTH, maxDigestLen);
+    memcpy(digest, h, len);
+    if (digestLen)
+	*digestLen = len;
+}
+
+SECStatus 
+SHA256_HashBuf(unsigned char *dest, const unsigned char *src, 
+               PRUint32 src_length)
+{
+    SHA256Context ctx;
+    unsigned int outLen;
+
+    SHA256_Begin(&ctx);
+    SHA256_Update(&ctx, src, src_length);
+    SHA256_End(&ctx, dest, &outLen, SHA256_LENGTH);
+    memset(&ctx, 0, sizeof ctx);
+
+    return SECSuccess;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/app/sha256.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/app/sha256.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/app/sha256.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/app/sha256.h	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,46 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Stripped down version of security/nss/lib/freebl/blapi.h
+// and related headers.
+
+#ifndef _SHA256_H_
+#define _SHA256_H_
+
+#define SHA256_LENGTH 32 
+
+#include "prtypes.h"	/* for PRUintXX */
+#include "prlong.h"
+
+#ifdef __cplusplus 
+extern "C" {
+#endif
+
+struct SHA256Context {
+  union {
+    PRUint32 w[64];	    /* message schedule, input buffer, plus 48 words */
+    PRUint8  b[256];
+  } u;
+  PRUint32 h[8];		/* 8 state variables */
+  PRUint32 sizeHi,sizeLo;	/* 64-bit count of hashed bytes. */
+};
+
+typedef struct SHA256Context SHA256Context;
+
+extern void
+SHA256_Begin(SHA256Context *ctx);
+
+extern void 
+SHA256_Update(SHA256Context *ctx, const unsigned char *input,
+		    unsigned int inputLen);
+
+extern void
+SHA256_End(SHA256Context *ctx, unsigned char *digest,
+           unsigned int *digestLen, unsigned int maxDigestLen);
+
+#ifdef __cplusplus 
+} /* extern C */
+#endif
+
+#endif /* _SHA256_H_ */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/chromium/src/base/message_pump_qt.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/chromium/src/base/message_pump_qt.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/chromium/src/base/message_pump_qt.cc	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/chromium/src/base/message_pump_qt.cc	2014-11-26 21:45:52.000000000 +0000
@@ -15,7 +15,6 @@
 #include <math.h>
 
 #include "base/eintr_wrapper.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	2014-11-26 21:45:52.000000000 +0000
@@ -707,11 +707,6 @@
       msg->set_fd_cookie(++last_pending_fd_id_);
 #endif
     }
-#ifdef MOZ_TASK_TRACER
-    GetCurTraceInfo(&msg->header()->source_event_id,
-                    &msg->header()->parent_task_id,
-                    &msg->header()->source_event_type);
-#endif
 
     size_t amt_to_write = msg->size() - message_send_bytes_written_;
     DCHECK(amt_to_write != 0);
@@ -886,6 +881,12 @@
 
 void Channel::ChannelImpl::OutputQueuePush(Message* msg)
 {
+#ifdef MOZ_TASK_TRACER
+  // Save the current TaskTracer info into the message header.
+  GetCurTraceInfo(&msg->header()->source_event_id,
+                  &msg->header()->parent_task_id,
+                  &msg->header()->source_event_type);
+#endif
   output_queue_.push(msg);
   output_queue_length_++;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/chromium/src/chrome/common/ipc_message.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/chromium/src/chrome/common/ipc_message.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/chromium/src/chrome/common/ipc_message.cc	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/chromium/src/chrome/common/ipc_message.cc	2014-11-26 21:45:52.000000000 +0000
@@ -36,7 +36,7 @@
 #ifdef MOZ_TASK_TRACER
   header()->source_event_id = 0;
   header()->parent_task_id = 0;
-  header()->source_event_type = SourceEventType::UNKNOWN;
+  header()->source_event_type = SourceEventType::Unknown;
 #endif
   InitLoggingVariables();
 }
@@ -61,7 +61,7 @@
 #ifdef MOZ_TASK_TRACER
   header()->source_event_id = 0;
   header()->parent_task_id = 0;
-  header()->source_event_type = SourceEventType::UNKNOWN;
+  header()->source_event_type = SourceEventType::Unknown;
 #endif
   InitLoggingVariables(name);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/contentproc/plugin-container.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/contentproc/plugin-container.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/contentproc/plugin-container.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/contentproc/plugin-container.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
+#include "nsAutoPtr.h"
 
 // FIXME/cjones testing
 #if !defined(OS_WIN)
@@ -21,6 +22,8 @@
 #include "nsSetDllDirectory.h"
 #endif
 
+#include "GMPLoader.h"
+
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
 #include "sandbox/chromium/base/basictypes.h"
 #include "sandbox/win/src/sandbox.h"
@@ -32,6 +35,11 @@
 #endif
 #endif
 
+#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
+#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
+#endif
+
 #ifdef MOZ_WIDGET_GONK
 # include <sys/time.h>
 # include <sys/resource.h> 
@@ -82,7 +90,49 @@
         target_service->LowerToken();
     }
 }
+
+class WinSandboxStarter : public mozilla::gmp::SandboxStarter {
+public:
+    virtual void Start(const char *aLibPath) MOZ_OVERRIDE {
+        StartSandboxCallback();
+    }
+};
+#endif
+
+#if defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
+class LinuxSandboxStarter : public mozilla::gmp::SandboxStarter {
+    LinuxSandboxStarter() { }
+public:
+    static SandboxStarter* Make() {
+        if (mozilla::SandboxInfo::Get().CanSandboxMedia()) {
+            return new LinuxSandboxStarter();
+        } else {
+            // Sandboxing isn't possible, but the parent has already
+            // checked that this plugin doesn't require it.  (Bug 1074561)
+            return nullptr;
+        }
+    }
+    virtual void Start(const char *aLibPath) MOZ_OVERRIDE {
+        mozilla::SetMediaPluginSandbox(aLibPath);
+    }
+};
+#endif
+
+mozilla::gmp::SandboxStarter*
+MakeSandboxStarter()
+{
+    // Note: MacOSX creates its SandboxStarter inside xul code; it
+    // needs to change to statically link its sandbox code into
+    // plugin-container. Once it does that, we can create the
+    // SandboxStarter for it here.
+#if defined(XP_WIN) && defined(MOZ_SANDBOX)
+    return new WinSandboxStarter();
+#elif defined(XP_LINUX) && defined(MOZ_GMP_SANDBOX)
+    return LinuxSandboxStarter::Make();
+#else
+    return nullptr;
 #endif
+}
 
 int
 content_process_main(int argc, char* argv[])
@@ -154,8 +204,16 @@
     }
 #endif
 #endif
-
-    nsresult rv = XRE_InitChildProcess(argc, argv);
+    nsAutoPtr<mozilla::gmp::GMPLoader> loader;
+#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
+    // On desktop, the GMPLoader lives in plugin-container, so that its
+    // code can be covered by an EME/GMP vendor's voucher.
+    nsAutoPtr<mozilla::gmp::SandboxStarter> starter(MakeSandboxStarter());
+    if (XRE_GetProcessType() == GeckoProcessType_GMPlugin) {
+        loader = mozilla::gmp::CreateGMPLoader(starter);
+    }
+#endif
+    nsresult rv = XRE_InitChildProcess(argc, argv, loader);
     NS_ENSURE_SUCCESS(rv, 1);
 
     return 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/glue/BackgroundChildImpl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/glue/BackgroundChildImpl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/glue/BackgroundChildImpl.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/glue/BackgroundChildImpl.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -5,6 +5,7 @@
 #include "BackgroundChildImpl.h"
 
 #include "FileDescriptorSetChild.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/PBlobChild.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBFactoryChild.h"
 #include "mozilla/dom/ipc/BlobChild.h"
@@ -81,6 +82,39 @@
 }
 
 void
+BackgroundChildImpl::ProcessingError(Result aWhat)
+{
+  // May happen on any thread!
+
+  nsAutoCString abortMessage;
+
+  switch (aWhat) {
+
+#define HANDLE_CASE(_result)                                                   \
+    case _result:                                                              \
+      abortMessage.AssignLiteral(#_result);                                    \
+      break
+
+    HANDLE_CASE(MsgDropped);
+    HANDLE_CASE(MsgNotKnown);
+    HANDLE_CASE(MsgNotAllowed);
+    HANDLE_CASE(MsgPayloadError);
+    HANDLE_CASE(MsgProcessingError);
+    HANDLE_CASE(MsgRouteError);
+    HANDLE_CASE(MsgValueError);
+
+#undef HANDLE_CASE
+
+    default:
+      MOZ_CRASH("Unknown error code!");
+  }
+
+  // This is just MOZ_CRASH() un-inlined so that we can pass the result code as
+  // a string. MOZ_CRASH() only supports string literals at the moment.
+  MOZ_ReportCrash(abortMessage.get(), __FILE__, __LINE__); MOZ_REALLY_CRASH();
+}
+
+void
 BackgroundChildImpl::ActorDestroy(ActorDestroyReason aWhy)
 {
   // May happen on any thread!
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/glue/BackgroundChildImpl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/glue/BackgroundChildImpl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/glue/BackgroundChildImpl.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/glue/BackgroundChildImpl.h	2014-11-26 21:45:52.000000000 +0000
@@ -41,6 +41,9 @@
   virtual ~BackgroundChildImpl();
 
   virtual void
+  ProcessingError(Result aWhat) MOZ_OVERRIDE;
+
+  virtual void
   ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 
   virtual PBackgroundTestChild*
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/glue/CrossProcessMutex.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/glue/CrossProcessMutex.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/glue/CrossProcessMutex.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/glue/CrossProcessMutex.h	2014-11-26 21:45:52.000000000 +0000
@@ -9,7 +9,7 @@
 #include "base/process.h"
 #include "mozilla/Mutex.h"
 
-#if defined(OS_POSIX)
+#if defined(OS_LINUX) || defined(OS_MACOSX)
 #include <pthread.h>
 #include "SharedMemoryBasic.h"
 #include "mozilla/Atomics.h"
@@ -34,7 +34,7 @@
 namespace mozilla {
 #if defined(OS_WIN)
 typedef HANDLE CrossProcessMutexHandle;
-#elif defined(OS_POSIX)
+#elif defined(OS_LINUX) || defined(OS_MACOSX)
 typedef mozilla::ipc::SharedMemoryBasic::Handle CrossProcessMutexHandle;
 #else
 // Stub for other platforms. We can't use uintptr_t here since different
@@ -100,7 +100,7 @@
 
 #if defined(OS_WIN)
   HANDLE mMutex;
-#elif defined(OS_POSIX)
+#elif defined(OS_LINUX) || defined(OS_MACOSX)
   nsRefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer;
   pthread_mutex_t* mMutex;
   mozilla::Atomic<int32_t>* mCount;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/keystore/KeyStore.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/keystore/KeyStore.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/keystore/KeyStore.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/keystore/KeyStore.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -69,7 +69,13 @@
   virtual int64_t getmtime(const String16& name) {return 0;}
   virtual int32_t duplicate(const String16& srcKey, int32_t srcUid, const String16& destKey, int32_t destUid) {return 0;}
   virtual int32_t clear_uid(int64_t uid) {return 0;}
-#if ANDROID_VERSION == 18
+#if ANDROID_VERSION >= 21
+  virtual int32_t generate(const String16& name, int32_t uid, int32_t keyType, int32_t keySize, int32_t flags, Vector<sp<KeystoreArg> >* args) {return 0;}
+  virtual int32_t is_hardware_backed(const String16& keyType) {return 0;}
+  virtual int32_t reset_uid(int32_t uid) {return 0;}
+  virtual int32_t sync_uid(int32_t sourceUid, int32_t targetUid) {return 0;}
+  virtual int32_t password_uid(const String16& password, int32_t uid) {return 0;}
+#elif ANDROID_VERSION == 18
   virtual int32_t generate(const String16& name, int uid, int32_t flags) {return 0;}
   virtual int32_t is_hardware_backed() {return 0;}
 #else
@@ -156,7 +162,13 @@
   int64_t getmtime(const String16& name) {return ::UNDEFINED_ACTION;}
   int32_t duplicate(const String16& srcKey, int32_t srcUid, const String16& destKey, int32_t destUid) {return ::UNDEFINED_ACTION;}
   int32_t clear_uid(int64_t uid) {return ::UNDEFINED_ACTION;}
-#if ANDROID_VERSION == 18
+#if ANDROID_VERSION >= 21
+  virtual int32_t generate(const String16& name, int32_t uid, int32_t keyType, int32_t keySize, int32_t flags, Vector<sp<KeystoreArg> >* args) {return ::UNDEFINED_ACTION;}
+  virtual int32_t is_hardware_backed(const String16& keyType) {return ::UNDEFINED_ACTION;}
+  virtual int32_t reset_uid(int32_t uid) {return ::UNDEFINED_ACTION;;}
+  virtual int32_t sync_uid(int32_t sourceUid, int32_t targetUid) {return ::UNDEFINED_ACTION;}
+  virtual int32_t password_uid(const String16& password, int32_t uid) {return ::UNDEFINED_ACTION;}
+#elif ANDROID_VERSION == 18
   virtual int32_t generate(const String16& name, int uid, int32_t flags) {return ::UNDEFINED_ACTION;}
   virtual int32_t is_hardware_backed() {return ::UNDEFINED_ACTION;}
 #else
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/unixsocket/SocketBase.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/unixsocket/SocketBase.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/ipc/unixsocket/SocketBase.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/ipc/unixsocket/SocketBase.h	2014-11-26 21:45:53.000000000 +0000
@@ -503,7 +503,7 @@
 #ifdef MOZ_TASK_TRACER
     // Make unix socket creation events to be the source events of TaskTracer,
     // and originate the rest correlation tasks from here.
-    AutoSourceEvent taskTracerEvent(SourceEventType::UNIXSOCKET);
+    AutoSourceEvent taskTracerEvent(SourceEventType::Unixsocket);
 #endif
 
     nsRefPtr<nsRunnable> r =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/CPOWTimer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/CPOWTimer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/CPOWTimer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/CPOWTimer.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 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 "jsfriendapi.h"
+#include "xpcprivate.h"
+#include "CPOWTimer.h"
+
+CPOWTimer::~CPOWTimer() {
+    /* This is a best effort to find the compartment responsible for this CPOW call */
+    xpc::CompartmentPrivate* compartment = xpc::CompartmentPrivate::Get(js::GetObjectCompartment(mozilla::dom::GetIncumbentGlobal()
+                                                                                                 ->GetGlobalJSObject()));
+    PRIntervalTime time = PR_IntervalNow() - startInterval;
+    compartment->CPOWTime += time;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/CPOWTimer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/CPOWTimer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/CPOWTimer.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/CPOWTimer.h	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 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 CPOWTIMER_H
+#define CPOWTIMER_H
+
+#include "prinrval.h"
+
+class JSObject;
+
+class MOZ_STACK_CLASS CPOWTimer {
+  public:
+    CPOWTimer(): startInterval(PR_IntervalNow()) {}
+    ~CPOWTimer();
+
+  private:
+    PRIntervalTime startInterval;
+};
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/moz.build	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/moz.build	2014-11-26 21:45:53.000000000 +0000
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
+    'CPOWTimer.cpp',
     'JavaScriptChild.cpp',
     'JavaScriptParent.cpp',
     'JavaScriptShared.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/WrapperAnswer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/WrapperAnswer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/WrapperAnswer.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/WrapperAnswer.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -9,7 +9,7 @@
 #include "JavaScriptLogging.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/BindingUtils.h"
-#include "nsContentUtils.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "xpcprivate.h"
 #include "jsfriendapi.h"
 
@@ -17,7 +17,14 @@
 using namespace mozilla;
 using namespace mozilla::jsipc;
 
-using mozilla::AutoSafeJSContext;
+// Note - Using AutoJSAPI (rather than AutoEntryScript) for a trap means
+// that we don't expect it to run script. For most of these traps that will only
+// happen if the target is a scripted proxy, which is probably something that we
+// don't want to support over CPOWs. When enough code is fixed up, the long-term
+// plan is to have the JS engine throw if it encounters script when it isn't
+// expecting it.
+using mozilla::dom::AutoJSAPI;
+using mozilla::dom::AutoEntryScript;
 
 bool
 WrapperAnswer::fail(JSContext *cx, ReturnStatus *rs)
@@ -61,16 +68,16 @@
 WrapperAnswer::RecvPreventExtensions(const ObjectId &objId, ReturnStatus *rs,
                                      bool *succeeded)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     *succeeded = false;
-
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
     if (!JS_PreventExtensions(cx, obj, succeeded))
         return fail(cx, rs);
 
@@ -93,17 +100,16 @@
 WrapperAnswer::RecvGetPropertyDescriptor(const ObjectId &objId, const JSIDVariant &idVar,
                                          ReturnStatus *rs, PPropertyDescriptor *out)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     EmptyDesc(out);
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.getPropertyDescriptor(%s)", ReceiverObj(objId), Identifier(idVar));
 
     RootedId id(cx);
@@ -124,17 +130,16 @@
 WrapperAnswer::RecvGetOwnPropertyDescriptor(const ObjectId &objId, const JSIDVariant &idVar,
                                             ReturnStatus *rs, PPropertyDescriptor *out)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     EmptyDesc(out);
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.getOwnPropertyDescriptor(%s)", ReceiverObj(objId), Identifier(idVar));
 
     RootedId id(cx);
@@ -155,15 +160,15 @@
 WrapperAnswer::RecvDefineProperty(const ObjectId &objId, const JSIDVariant &idVar,
                                   const PPropertyDescriptor &descriptor, ReturnStatus *rs)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("define %s[%s]", ReceiverObj(objId), Identifier(idVar));
 
     RootedId id(cx);
@@ -198,17 +203,16 @@
 WrapperAnswer::RecvDelete(const ObjectId &objId, const JSIDVariant &idVar, ReturnStatus *rs,
                           bool *success)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     *success = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("delete %s[%s]", ReceiverObj(objId), Identifier(idVar));
 
     RootedId id(cx);
@@ -224,17 +228,16 @@
 bool
 WrapperAnswer::RecvHas(const ObjectId &objId, const JSIDVariant &idVar, ReturnStatus *rs, bool *bp)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     *bp = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.has(%s)", ReceiverObj(objId), Identifier(idVar));
 
     RootedId id(cx);
@@ -253,17 +256,16 @@
 WrapperAnswer::RecvHasOwn(const ObjectId &objId, const JSIDVariant &idVar, ReturnStatus *rs,
                           bool *bp)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     *bp = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.hasOwn(%s)", ReceiverObj(objId), Identifier(idVar));
 
     RootedId id(cx);
@@ -282,8 +284,9 @@
 WrapperAnswer::RecvGet(const ObjectId &objId, const ObjectVariant &receiverVar,
                        const JSIDVariant &idVar, ReturnStatus *rs, JSVariant *result)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    // We may run scripted getters.
+    AutoEntryScript aes(xpc::NativeGlobal(scopeForTargetObjects()));
+    JSContext *cx = aes.cx();
 
     // The outparam will be written to the buffer, so it must be set even if
     // the parent won't read it.
@@ -293,8 +296,6 @@
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     RootedObject receiver(cx, fromObjectVariant(cx, receiverVar));
     if (!receiver)
         return fail(cx, rs);
@@ -320,8 +321,9 @@
                        const JSIDVariant &idVar, const bool &strict, const JSVariant &value,
                        ReturnStatus *rs, JSVariant *result)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    // We may run scripted setters.
+    AutoEntryScript aes(xpc::NativeGlobal(scopeForTargetObjects()));
+    JSContext *cx = aes.cx();
 
     // The outparam will be written to the buffer, so it must be set even if
     // the parent won't read it.
@@ -331,8 +333,6 @@
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     RootedObject receiver(cx, fromObjectVariant(cx, receiverVar));
     if (!receiver)
         return fail(cx, rs);
@@ -361,17 +361,16 @@
 bool
 WrapperAnswer::RecvIsExtensible(const ObjectId &objId, ReturnStatus *rs, bool *result)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     *result = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.isExtensible()", ReceiverObj(objId));
 
     bool extensible;
@@ -390,8 +389,8 @@
                                    JSVariant *result,
                                    nsTArray<JSParam> *outparams)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoEntryScript aes(xpc::NativeGlobal(scopeForTargetObjects()));
+    JSContext *cx = aes.cx();
 
     // The outparam will be written to the buffer, so it must be set even if
     // the parent won't read it.
@@ -401,8 +400,6 @@
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     MOZ_ASSERT(argv.Length() >= 2);
 
     RootedValue objv(cx);
@@ -492,15 +489,15 @@
 bool
 WrapperAnswer::RecvHasInstance(const ObjectId &objId, const JSVariant &vVar, ReturnStatus *rs, bool *bp)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.hasInstance(%s)", ReceiverObj(objId), InVariant(vVar));
 
     RootedValue val(cx);
@@ -517,8 +514,10 @@
 WrapperAnswer::RecvObjectClassIs(const ObjectId &objId, const uint32_t &classValue,
                                  bool *result)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj) {
@@ -527,8 +526,6 @@
         return true;
     }
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.objectClassIs()", ReceiverObj(objId));
 
     *result = js_ObjectClassIs(cx, obj, (js::ESClassValue)classValue);
@@ -538,8 +535,10 @@
 bool
 WrapperAnswer::RecvClassName(const ObjectId &objId, nsString *name)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj) {
@@ -547,8 +546,6 @@
         return "<dead CPOW>";
     }
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.className()", ReceiverObj(objId));
 
     *name = NS_ConvertASCIItoUTF16(js_ObjectClassName(cx, obj));
@@ -559,14 +556,16 @@
 WrapperAnswer::RecvRegExpToShared(const ObjectId &objId, ReturnStatus *rs,
                                   nsString *source, uint32_t *flags)
 {
-    AutoSafeJSContext cx;
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
+
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment ac(cx, obj);
     MOZ_RELEASE_ASSERT(JS_ObjectIsRegExp(cx, obj));
-
     RootedString sourceJSStr(cx, JS_GetRegExpSource(cx, obj));
     if (!sourceJSStr)
         return fail(cx, rs);
@@ -584,15 +583,15 @@
 WrapperAnswer::RecvGetPropertyKeys(const ObjectId &objId, const uint32_t &flags,
                                    ReturnStatus *rs, nsTArray<JSIDVariant> *ids)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.getPropertyKeys()", ReceiverObj(objId));
 
     AutoIdVector props(cx);
@@ -614,8 +613,10 @@
 WrapperAnswer::RecvInstanceOf(const ObjectId &objId, const JSIID &iid, ReturnStatus *rs,
                               bool *instanceof)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
 
     *instanceof = false;
 
@@ -623,8 +624,6 @@
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.instanceOf()", ReceiverObj(objId));
 
     nsID nsiid;
@@ -641,17 +640,16 @@
 WrapperAnswer::RecvDOMInstanceOf(const ObjectId &objId, const int &prototypeID,
                                  const int &depth, ReturnStatus *rs, bool *instanceof)
 {
-    AutoSafeJSContext cx;
-    JSAutoRequest request(cx);
-
+    AutoJSAPI jsapi;
+    if (NS_WARN_IF(!jsapi.Init(scopeForTargetObjects())))
+        return false;
+    JSContext *cx = jsapi.cx();
     *instanceof = false;
 
     RootedObject obj(cx, findObjectById(cx, objId));
     if (!obj)
         return fail(cx, rs);
 
-    JSAutoCompartment comp(cx, obj);
-
     LOG("%s.domInstanceOf()", ReceiverObj(objId));
 
     bool tmp;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/WrapperOwner.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/WrapperOwner.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/WrapperOwner.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/WrapperOwner.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "jsfriendapi.h"
 #include "xpcprivate.h"
+#include "CPOWTimer.h"
 #include "WrapperFactory.h"
 
 #include "nsIRemoteTagService.h"
@@ -93,7 +94,6 @@
     virtual bool ownPropertyKeys(JSContext *cx, HandleObject proxy,
                                  AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE;
     virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
     virtual bool has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
@@ -109,6 +109,8 @@
     virtual bool hasOwn(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
                                               AutoIdVector &props) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool hasInstance(JSContext *cx, HandleObject proxy,
                              MutableHandleValue v, bool *bp) const MOZ_OVERRIDE;
     virtual bool objectClassIs(HandleObject obj, js::ESClassValue classValue,
@@ -133,7 +135,10 @@
         JS_ReportError(cx, "cannot use a CPOW whose process is gone");  \
         return false;                                                   \
     }                                                                   \
-    return owner->call args;
+    {                                                                   \
+        CPOWTimer timer;                                                \
+        return owner->call args;                                        \
+    }
 
 bool
 CPOWProxyHandler::getPropertyDescriptor(JSContext *cx, HandleObject proxy, HandleId id,
@@ -263,18 +268,6 @@
 }
 
 bool
-CPOWProxyHandler::enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const
-{
-    FORWARD(enumerate, (cx, proxy, props));
-}
-
-bool
-WrapperOwner::enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props)
-{
-    return getPropertyKeys(cx, proxy, 0, props);
-}
-
-bool
 CPOWProxyHandler::has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const
 {
     FORWARD(has, (cx, proxy, id, bp));
@@ -479,6 +472,18 @@
 }
 
 bool
+CPOWProxyHandler::getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props) const
+{
+    FORWARD(getEnumerablePropertyKeys, (cx, proxy, props));
+}
+
+bool
+WrapperOwner::getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props)
+{
+    return getPropertyKeys(cx, proxy, 0, props);
+}
+
+bool
 CPOWProxyHandler::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const
 {
     FORWARD(preventExtensions, (cx, proxy, succeeded));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/WrapperOwner.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/WrapperOwner.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/ipc/WrapperOwner.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/ipc/WrapperOwner.h	2014-11-26 21:45:53.000000000 +0000
@@ -39,7 +39,6 @@
                         JS::MutableHandle<JSPropertyDescriptor> desc);
     bool ownPropertyKeys(JSContext *cx, JS::HandleObject proxy, JS::AutoIdVector &props);
     bool delete_(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp);
-    bool enumerate(JSContext *cx, JS::HandleObject proxy, JS::AutoIdVector &props);
     bool preventExtensions(JSContext *cx, JS::HandleObject proxy, bool *succeeded);
     bool isExtensible(JSContext *cx, JS::HandleObject proxy, bool *extensible);
     bool has(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp);
@@ -56,6 +55,8 @@
     bool hasOwn(JSContext *cx, JS::HandleObject proxy, JS::HandleId id, bool *bp);
     bool getOwnEnumerablePropertyKeys(JSContext *cx, JS::HandleObject proxy,
                                       JS::AutoIdVector &props);
+    bool getEnumerablePropertyKeys(JSContext *cx, JS::HandleObject proxy,
+                                   JS::AutoIdVector &props);
     // We use "iterate" provided by the base class here.
     bool hasInstance(JSContext *cx, JS::HandleObject proxy, JS::MutableHandleValue v, bool *bp);
     bool objectClassIs(JSContext *cx, JS::HandleObject obj, js::ESClassValue classValue);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/Debug.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/Debug.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/Debug.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/Debug.h	2014-11-26 21:45:53.000000000 +0000
@@ -250,6 +250,7 @@
     JSObject *unwrap(Object &object) { return unwrapAny(object); }
 };
 
+
 
 // Finding the size of blocks allocated with malloc
 // ------------------------------------------------
@@ -263,6 +264,42 @@
 // malloc'd blocks.
 void SetDebuggerMallocSizeOf(JSRuntime *runtime, mozilla::MallocSizeOf mallocSizeOf);
 
+
+
+// Handlers for observing Promises
+// -------------------------------
+//
+// The Debugger wants to observe behavior of promises, which are implemented by
+// Gecko with webidl and which SpiderMonkey knows nothing about. On the other
+// hand, Gecko knows nothing about which (if any) debuggers are observing a
+// promise's global. The compromise is that Gecko is responsible for calling
+// these handlers at the appropriate times, and SpiderMonkey will handle
+// notifying any Debugger instances that are observing the given promise's
+// global.
+
+// Notify any Debugger instances observing this promise's global that a new
+// promise was allocated.
+JS_PUBLIC_API(void)
+onNewPromise(JSContext *cx, HandleObject promise);
+
+// Notify any Debugger instances observing this promise's global that the
+// promise has settled (ie, it has either been fulfilled or rejected). Note that
+// this is *not* equivalent to the promise resolution (ie, the promise's fate
+// getting locked in) because you can resolve a promise with another pending
+// promise, in which case neither promise has settled yet.
+//
+// It is Gecko's responsibility to ensure that this is never called on the same
+// promise more than once (because a promise can only make the transition from
+// unsettled to settled once).
+JS_PUBLIC_API(void)
+onPromiseSettled(JSContext *cx, HandleObject promise);
+
+
+
+// Return true if the given value is a Debugger object, false otherwise.
+JS_PUBLIC_API(bool)
+IsDebugger(JS::Value val);
+
 } // namespace dbg
 } // namespace JS
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/HeapAPI.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/HeapAPI.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/HeapAPI.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/HeapAPI.h	2014-11-26 21:45:53.000000000 +0000
@@ -98,7 +98,7 @@
 struct Zone;
 
 /* Default size for the generational nursery in bytes. */
-const uint32_t DefaultNurseryBytes = 16 * 1024 * 1024;
+const uint32_t DefaultNurseryBytes = 16 * js::gc::ChunkSize;
 
 /* Default maximum heap size in bytes to pass to JS_NewRuntime(). */
 const uint32_t DefaultHeapMaxBytes = 32 * 1024 * 1024;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/RootingAPI.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/RootingAPI.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/RootingAPI.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/RootingAPI.h	2014-11-26 21:45:53.000000000 +0000
@@ -1266,7 +1266,6 @@
     MOZ_ASSERT(!IsInsideNursery(cell));
     JS::Heap<T> *asHeapT = reinterpret_cast<JS::Heap<T>*>(v);
     aCallbacks.Trace(asHeapT, aName, aClosure);
-    MOZ_ASSERT(GCMethods<T>::asGCThingOrNull(*v) == cell);
 }
 
 } /* namespace gc */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/TracingAPI.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/TracingAPI.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/TracingAPI.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/TracingAPI.h	2014-11-26 21:45:53.000000000 +0000
@@ -201,7 +201,7 @@
     trc->setTracingLocation(reinterpret_cast<void *>(&const_cast<JSObject *&>(key)));
     JS_CallUnbarrieredObjectTracer(trc, &updated, name);
     if (updated != key)
-        e.rekeyFront(key, updated);
+        e.rekeyFront(updated);
 }
 
 // Trace an object that is known to always be tenured.  No post barriers are
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/UbiNode.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/UbiNode.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/UbiNode.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/UbiNode.h	2014-11-26 21:45:53.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/Alignment.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
 
@@ -19,6 +20,7 @@
 #include "js/HashTable.h"
 #include "js/TracingAPI.h"
 #include "js/TypeDecls.h"
+#include "js/Vector.h"
 
 // JS::ubi::Node
 //
@@ -139,6 +141,8 @@
 namespace JS {
 namespace ubi {
 
+using mozilla::Maybe;
+
 class Edge;
 class EdgeRange;
 
@@ -422,8 +426,104 @@
 };
 
 
+// A dumb Edge concrete class. All but the most essential members have the
+// default behavior.
+class SimpleEdge : public Edge {
+    SimpleEdge(SimpleEdge &) MOZ_DELETE;
+    SimpleEdge &operator=(const SimpleEdge &) MOZ_DELETE;
+
+  public:
+    SimpleEdge() : Edge() { }
+
+    // Construct an initialized SimpleEdge, taking ownership of |name|.
+    SimpleEdge(char16_t *name, const Node &referent) {
+        this->name = name;
+        this->referent = referent;
+    }
+    ~SimpleEdge() {
+        js_free(const_cast<char16_t *>(name));
+    }
+
+    // Move construction and assignment.
+    SimpleEdge(SimpleEdge &&rhs) {
+        name = rhs.name;
+        referent = rhs.referent;
+
+        rhs.name = nullptr;
+    }
+    SimpleEdge &operator=(SimpleEdge &&rhs) {
+        MOZ_ASSERT(&rhs != this);
+        this->~SimpleEdge();
+        new(this) SimpleEdge(mozilla::Move(rhs));
+        return *this;
+    }
+};
+
+typedef mozilla::Vector<SimpleEdge, 8, js::TempAllocPolicy> SimpleEdgeVector;
+
+
+// RootList is a class that can be pointed to by a |ubi::Node|, creating a
+// fictional root-of-roots which has edges to every GC root in the JS
+// runtime. Having a single root |ubi::Node| is useful for algorithms written
+// with the assumption that there aren't multiple roots (such as computing
+// dominator trees) and you want a single point of entry. It also ensures that
+// the roots themselves get visited by |ubi::BreadthFirst| (they would otherwise
+// only be used as starting points).
+//
+// RootList::init itself causes a minor collection, but once the list of roots
+// has been created, GC must not occur, as the referent ubi::Nodes are not
+// stable across GC. The init calls emplace |gcp|'s AutoCheckCannotGC, whose
+// lifetime must extend at least as long as the RootList itself.
+//
+// Example usage:
+//
+//    {
+//        mozilla::Maybe<JS::AutoCheckCannotGC> maybeNoGC;
+//        JS::ubi::RootList rootList(cx, maybeNoGC);
+//        if (!rootList.init(cx))
+//            return false;
+//
+//        // The AutoCheckCannotGC is guaranteed to exist if init returned true.
+//        MOZ_ASSERT(maybeNoGC.isSome());
+//
+//        JS::ubi::Node root(&rootList);
+//
+//        ...
+//    }
+class MOZ_STACK_CLASS RootList {
+    Maybe<AutoCheckCannotGC> &noGC;
+
+  public:
+    SimpleEdgeVector edges;
+    bool             wantNames;
+
+    RootList(JSContext *cx, Maybe<AutoCheckCannotGC> &noGC, bool wantNames = false);
+
+    // Find all GC roots.
+    bool init(JSContext *cx);
+    // Find only GC roots in the provided set of |Zone|s.
+    bool init(JSContext *cx, ZoneSet &debuggees);
+    // Find only GC roots in the given Debugger object's set of debuggee zones.
+    bool init(JSContext *cx, HandleObject debuggees);
+};
+
+
 // Concrete classes for ubi::Node referent types.
 
+template<>
+struct Concrete<RootList> : public Base {
+    EdgeRange *edges(JSContext *cx, bool wantNames) const MOZ_OVERRIDE;
+    const char16_t *typeName() const MOZ_OVERRIDE { return concreteTypeName; }
+
+  protected:
+    explicit Concrete(RootList *ptr) : Base(ptr) { }
+    RootList &get() const { return *static_cast<RootList *>(ptr); }
+
+  public:
+    static const char16_t concreteTypeName[];
+    static void construct(void *storage, RootList *ptr) { new (storage) Concrete(ptr); }
+};
+
 // A reusable ubi::Concrete specialization base class for types supported by
 // JS_TraceChildren.
 template<typename Referent>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/Utility.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/Utility.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/Utility.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/Utility.h	2014-11-26 21:45:53.000000000 +0000
@@ -47,8 +47,9 @@
 #define JS_MOVED_TENURED_PATTERN 0x49
 #define JS_SWEPT_TENURED_PATTERN 0x4B
 #define JS_ALLOCATED_TENURED_PATTERN 0x4D
-#define JS_SWEPT_CODE_PATTERN 0x3b
-#define JS_SWEPT_FRAME_PATTERN 0x5b
+#define JS_EMPTY_STOREBUFFER_PATTERN 0x1B
+#define JS_SWEPT_CODE_PATTERN 0x3B
+#define JS_SWEPT_FRAME_PATTERN 0x5B
 #define JS_POISONED_FORKJOIN_CHUNK 0xBD
 
 #define JS_STATIC_ASSERT(cond)           static_assert(cond, "JS_STATIC_ASSERT")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/Value.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/Value.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/public/Value.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/public/Value.h	2014-11-26 21:45:53.000000000 +0000
@@ -84,7 +84,8 @@
     JSVAL_TYPE_MISSING             = 0x21
 } JS_ENUM_FOOTER(JSValueType);
 
-JS_STATIC_ASSERT(sizeof(JSValueType) == 1);
+static_assert(sizeof(JSValueType) == 1,
+              "compiler typed enum support is apparently buggy");
 
 #if defined(JS_NUNBOX32)
 
@@ -102,7 +103,8 @@
     JSVAL_TAG_OBJECT               = JSVAL_TAG_CLEAR | JSVAL_TYPE_OBJECT
 } JS_ENUM_FOOTER(JSValueTag);
 
-JS_STATIC_ASSERT(sizeof(JSValueTag) == 4);
+static_assert(sizeof(JSValueTag) == sizeof(uint32_t),
+              "compiler typed enum support is apparently buggy");
 
 #elif defined(JS_PUNBOX64)
 
@@ -120,7 +122,8 @@
     JSVAL_TAG_OBJECT               = JSVAL_TAG_MAX_DOUBLE | JSVAL_TYPE_OBJECT
 } JS_ENUM_FOOTER(JSValueTag);
 
-JS_STATIC_ASSERT(sizeof(JSValueTag) == sizeof(uint32_t));
+static_assert(sizeof(JSValueTag) == sizeof(uint32_t),
+              "compiler typed enum support is apparently buggy");
 
 JS_ENUM_HEADER(JSValueShiftedTag, uint64_t)
 {
@@ -135,10 +138,21 @@
     JSVAL_SHIFTED_TAG_OBJECT       = (((uint64_t)JSVAL_TAG_OBJECT)     << JSVAL_TAG_SHIFT)
 } JS_ENUM_FOOTER(JSValueShiftedTag);
 
-JS_STATIC_ASSERT(sizeof(JSValueShiftedTag) == sizeof(uint64_t));
+static_assert(sizeof(JSValueShiftedTag) == sizeof(uint64_t),
+              "compiler typed enum support is apparently buggy");
 
 #endif
 
+/*
+ * All our supported compilers implement C++11 |enum Foo : T| syntax, so don't
+ * expose these macros. (This macro exists *only* because gcc bug 51242
+ * <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51242> makes bit-fields of
+ * typed enums trigger a warning that can't be turned off. Don't expose it
+ * beyond this file!)
+ */
+#undef JS_ENUM_HEADER
+#undef JS_ENUM_FOOTER
+
 #else  /* !defined(__SUNPRO_CC) && !defined(__xlC__) */
 
 typedef uint8_t JSValueType;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSFrameIterator.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSFrameIterator.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSFrameIterator.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSFrameIterator.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -79,7 +79,7 @@
         fp_ = nullptr;
         MOZ_ASSERT(done());
         break;
-      case AsmJSModule::CodeRange::IonFFI:
+      case AsmJSModule::CodeRange::JitFFI:
       case AsmJSModule::CodeRange::SlowFFI:
       case AsmJSModule::CodeRange::Interrupt:
       case AsmJSModule::CodeRange::Inline:
@@ -458,7 +458,7 @@
         callerFP_ = CallerFPFromFP(fp);
         AssertMatchesCallSite(*module_, codeRange, callerPC_, callerFP_, fp);
         break;
-      case AsmJSModule::CodeRange::IonFFI:
+      case AsmJSModule::CodeRange::JitFFI:
       case AsmJSModule::CodeRange::SlowFFI:
       case AsmJSModule::CodeRange::Interrupt:
       case AsmJSModule::CodeRange::Inline:
@@ -513,7 +513,7 @@
     const AsmJSModule::CodeRange *codeRange = module_->lookupCodeRange(state.pc);
     switch (codeRange->kind()) {
       case AsmJSModule::CodeRange::Function:
-      case AsmJSModule::CodeRange::IonFFI:
+      case AsmJSModule::CodeRange::JitFFI:
       case AsmJSModule::CodeRange::SlowFFI:
       case AsmJSModule::CodeRange::Interrupt:
       case AsmJSModule::CodeRange::Thunk: {
@@ -615,7 +615,7 @@
         callerPC_ = nullptr;
         break;
       case AsmJSModule::CodeRange::Function:
-      case AsmJSModule::CodeRange::IonFFI:
+      case AsmJSModule::CodeRange::JitFFI:
       case AsmJSModule::CodeRange::SlowFFI:
       case AsmJSModule::CodeRange::Interrupt:
       case AsmJSModule::CodeRange::Inline:
@@ -672,15 +672,15 @@
     //
     // NB: these labels are regexp-matched by
     //     browser/devtools/profiler/cleopatra/js/parserWorker.js.
-    const char *ionFFIDescription = "fast FFI trampoline (in asm.js)";
+    const char *jitFFIDescription = "fast FFI trampoline (in asm.js)";
     const char *slowFFIDescription = "slow FFI trampoline (in asm.js)";
     const char *interruptDescription = "interrupt due to out-of-bounds or long execution (in asm.js)";
 
     switch (AsmJSExit::ExtractReasonKind(exitReason_)) {
       case AsmJSExit::Reason_None:
         break;
-      case AsmJSExit::Reason_IonFFI:
-        return ionFFIDescription;
+      case AsmJSExit::Reason_JitFFI:
+        return jitFFIDescription;
       case AsmJSExit::Reason_SlowFFI:
         return slowFFIDescription;
       case AsmJSExit::Reason_Interrupt:
@@ -693,7 +693,7 @@
     switch (codeRange->kind()) {
       case AsmJSModule::CodeRange::Function:  return codeRange->functionProfilingLabel(*module_);
       case AsmJSModule::CodeRange::Entry:     return "entry trampoline (in asm.js)";
-      case AsmJSModule::CodeRange::IonFFI:    return ionFFIDescription;
+      case AsmJSModule::CodeRange::JitFFI:    return jitFFIDescription;
       case AsmJSModule::CodeRange::SlowFFI:   return slowFFIDescription;
       case AsmJSModule::CodeRange::Interrupt: return interruptDescription;
       case AsmJSModule::CodeRange::Inline:    return "inline stub (in asm.js)";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSFrameIterator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSFrameIterator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSFrameIterator.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSFrameIterator.h	2014-11-26 21:45:53.000000000 +0000
@@ -69,7 +69,7 @@
     // handler).
     enum ReasonKind {
         Reason_None,
-        Reason_IonFFI,
+        Reason_JitFFI,
         Reason_SlowFFI,
         Reason_Interrupt,
         Reason_Builtin
@@ -106,7 +106,7 @@
     typedef uint32_t Reason;
 
     static const uint32_t None = Reason_None;
-    static const uint32_t IonFFI = Reason_IonFFI;
+    static const uint32_t JitFFI = Reason_JitFFI;
     static const uint32_t SlowFFI = Reason_SlowFFI;
     static const uint32_t Interrupt = Reason_Interrupt;
     static inline Reason Builtin(BuiltinKind builtin) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSLink.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSLink.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSLink.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSLink.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -30,6 +30,7 @@
 #include "jswrapper.h"
 
 #include "asmjs/AsmJSModule.h"
+#include "builtin/AtomicsObject.h"
 #include "builtin/SIMD.h"
 #include "frontend/BytecodeCompiler.h"
 #include "jit/Ion.h"
@@ -219,7 +220,7 @@
 }
 
 static bool
-ValidateArrayView(JSContext *cx, AsmJSModule::Global &global, HandleValue globalVal)
+ValidateArrayView(JSContext *cx, AsmJSModule::Global &global, HandleValue globalVal, bool isShared)
 {
     RootedPropertyName field(cx, global.maybeViewName());
     if (!field)
@@ -229,11 +230,10 @@
     if (!GetDataProperty(cx, globalVal, field, &v))
         return false;
 
-    if (!IsTypedArrayConstructor(v, global.viewType()) &&
-        !IsSharedTypedArrayConstructor(v, global.viewType()))
-    {
+    bool tac = IsTypedArrayConstructor(v, global.viewType());
+    bool stac = IsSharedTypedArrayConstructor(v, global.viewType());
+    if (!((tac || stac) && stac == isShared))
         return LinkFail(cx, "bad typed array constructor");
-    }
 
     return true;
 }
@@ -407,6 +407,35 @@
 }
 
 static bool
+ValidateAtomicsBuiltinFunction(JSContext *cx, AsmJSModule::Global &global, HandleValue globalVal)
+{
+    RootedValue v(cx);
+    if (!GetDataProperty(cx, globalVal, cx->names().Atomics, &v))
+        return false;
+    RootedPropertyName field(cx, global.atomicsName());
+    if (!GetDataProperty(cx, v, field, &v))
+        return false;
+
+    Native native = nullptr;
+    switch (global.atomicsBuiltinFunction()) {
+      case AsmJSAtomicsBuiltin_compareExchange: native = atomics_compareExchange; break;
+      case AsmJSAtomicsBuiltin_load: native = atomics_load; break;
+      case AsmJSAtomicsBuiltin_store: native = atomics_store; break;
+      case AsmJSAtomicsBuiltin_fence: native = atomics_fence; break;
+      case AsmJSAtomicsBuiltin_add: native = atomics_add; break;
+      case AsmJSAtomicsBuiltin_sub: native = atomics_sub; break;
+      case AsmJSAtomicsBuiltin_and: native = atomics_and; break;
+      case AsmJSAtomicsBuiltin_or: native = atomics_or; break;
+      case AsmJSAtomicsBuiltin_xor: native = atomics_xor; break;
+    }
+
+    if (!IsNativeFunction(v, native))
+        return LinkFail(cx, "bad Atomics.* builtin function");
+
+    return true;
+}
+
+static bool
 ValidateConstant(JSContext *cx, AsmJSModule::Global &global, HandleValue globalVal)
 {
     RootedPropertyName field(cx, global.constantName());
@@ -533,8 +562,9 @@
                 return false;
             break;
           case AsmJSModule::Global::ArrayView:
+          case AsmJSModule::Global::SharedArrayView:
           case AsmJSModule::Global::ArrayViewCtor:
-            if (!ValidateArrayView(cx, global, globalVal))
+            if (!ValidateArrayView(cx, global, globalVal, module.hasArrayView() && module.isSharedView()))
                 return false;
             break;
           case AsmJSModule::Global::ByteLength:
@@ -545,6 +575,10 @@
             if (!ValidateMathBuiltinFunction(cx, global, globalVal))
                 return false;
             break;
+          case AsmJSModule::Global::AtomicsBuiltinFunction:
+            if (!ValidateAtomicsBuiltinFunction(cx, global, globalVal))
+                return false;
+            break;
           case AsmJSModule::Global::Constant:
             if (!ValidateConstant(cx, global, globalVal))
                 return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSModule.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSModule.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -105,11 +105,11 @@
     if (code_) {
         for (unsigned i = 0; i < numExits(); i++) {
             AsmJSModule::ExitDatum &exitDatum = exitIndexToGlobalDatum(i);
-            if (!exitDatum.ionScript)
+            if (!exitDatum.baselineScript)
                 continue;
 
             jit::DependentAsmJSModuleExit exit(this, i);
-            exitDatum.ionScript->removeDependentAsmJSModule(exit);
+            exitDatum.baselineScript->removeDependentAsmJSModule(exit);
         }
 
         DeallocateExecutableMemory(code_, pod.totalBytes_, AsmJSPageSize);
@@ -501,23 +501,31 @@
 }
 
 static bool
-TryEnablingIon(JSContext *cx, AsmJSModule &module, HandleFunction fun, uint32_t exitIndex,
+TryEnablingJit(JSContext *cx, AsmJSModule &module, HandleFunction fun, uint32_t exitIndex,
                int32_t argc, Value *argv)
 {
     if (!fun->hasScript())
         return true;
 
-    // Test if the function is Ion compiled
+    // Test if the function is JIT compiled.
     JSScript *script = fun->nonLazyScript();
-    if (!script->hasIonScript())
+    if (!script->hasBaselineScript()) {
+        MOZ_ASSERT(!script->hasIonScript());
         return true;
+    }
 
     // Currently we can't rectify arguments. Therefore disabling if argc is too low.
     if (fun->nargs() > size_t(argc))
         return true;
 
-    // Normally the types should correspond, since we just ran with those types,
-    // but there are reports this is asserting. Therefore doing it as a check, instead of DEBUG only.
+    // Ensure the argument types are included in the argument TypeSets stored in
+    // the TypeScript. This is necessary for Ion, because the FFI exit will
+    // use the skip-arg-checks entry point.
+    //
+    // Note that the TypeScript is never discarded while the script has a
+    // BaselineScript, so if those checks hold now they must hold at least until
+    // the BaselineScript is discarded and when that happens the FFI exit is
+    // patched back.
     if (!types::TypeScript::ThisTypes(script)->hasType(types::Type::UndefinedType()))
         return true;
     for (uint32_t i = 0; i < fun->nargs(); i++) {
@@ -533,11 +541,11 @@
     if (module.exitIsOptimized(exitIndex))
         return true;
 
-    IonScript *ionScript = script->ionScript();
-    if (!ionScript->addDependentAsmJSModule(cx, DependentAsmJSModuleExit(&module, exitIndex)))
+    BaselineScript *baselineScript = script->baselineScript();
+    if (!baselineScript->addDependentAsmJSModule(cx, DependentAsmJSModuleExit(&module, exitIndex)))
         return false;
 
-    module.optimizeExit(exitIndex, ionScript);
+    module.optimizeExit(exitIndex, baselineScript);
     return true;
 }
 
@@ -553,7 +561,7 @@
     if (!Invoke(cx, UndefinedValue(), fval, argc, argv, rval))
         return false;
 
-    return TryEnablingIon(cx, module, fun, exitIndex, argc, argv);
+    return TryEnablingJit(cx, module, fun, exitIndex, argc, argv);
 }
 
 // Use an int32_t return type instead of bool since bool does not have a
@@ -748,12 +756,35 @@
         AsmJSModule::ExitDatum &exitDatum = exitIndexToGlobalDatum(i);
         exitDatum.exit = interpExitTrampoline(exits_[i]);
         exitDatum.fun = nullptr;
-        exitDatum.ionScript = nullptr;
+        exitDatum.baselineScript = nullptr;
     }
 
     MOZ_ASSERT(isStaticallyLinked());
 }
 
+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+static inline size_t
+ViewTypeByteSize(AsmJSHeapAccess::ViewType vt)
+{
+    switch (vt) {
+      case AsmJSHeapAccess::Int8:
+      case AsmJSHeapAccess::Uint8:
+      case AsmJSHeapAccess::Uint8Clamped:
+      case AsmJSHeapAccess::Int16:
+      case AsmJSHeapAccess::Uint16:
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:
+      case AsmJSHeapAccess::Float32:
+      case AsmJSHeapAccess::Float64:
+        return 1 << TypedArrayShift(Scalar::Type(vt));
+      case AsmJSHeapAccess::Float32x4:
+      case AsmJSHeapAccess::Int32x4:
+        return 16;
+    }
+    MOZ_CRASH("unexpected view type");
+}
+#endif // JS_CODEGEN_X86 || JS_CODEGEN_X64
+
 void
 AsmJSModule::initHeap(Handle<ArrayBufferObjectMaybeShared *> heap, JSContext *cx)
 {
@@ -767,28 +798,38 @@
 
 #if defined(JS_CODEGEN_X86)
     uint8_t *heapOffset = heap->dataPointer();
-    void *heapLength = (void*)heap->byteLength();
     for (unsigned i = 0; i < heapAccesses_.length(); i++) {
         const jit::AsmJSHeapAccess &access = heapAccesses_[i];
-        if (access.hasLengthCheck())
-            X86Assembler::setPointer(access.patchLengthAt(code_), heapLength);
+        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.)
+            AsmJSHeapAccess::ViewType vt = access.viewType();
+            X86Assembler::setPointer(access.patchLengthAt(code_),
+                                     (void*)(heap->byteLength() + 1 - ViewTypeByteSize(vt)));
+        }
         void *addr = access.patchOffsetAt(code_);
         uint32_t disp = reinterpret_cast<uint32_t>(X86Assembler::getPointer(addr));
         MOZ_ASSERT(disp <= INT32_MAX);
         X86Assembler::setPointer(addr, (void *)(heapOffset + disp));
     }
 #elif defined(JS_CODEGEN_X64)
-    if (usesSignalHandlersForOOB())
-        return;
-    // If we cannot use the signal handlers, we need to patch the heap length
+    // Even with signal handling being used for most bounds checks, there may be
+    // atomic operations that depend on explicit checks.
+    //
+    // If we have any explicit bounds checks, we need to patch the heap length
     // 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}Heap)
+    // CodeGeneratorX64::visitAsmJS{Load,Store,CompareExchange,AtomicBinop}Heap)
     int32_t heapLength = int32_t(intptr_t(heap->byteLength()));
     for (size_t i = 0; i < heapAccesses_.length(); i++) {
         const jit::AsmJSHeapAccess &access = heapAccesses_[i];
-        if (access.hasLengthCheck())
-            X86Assembler::setInt32(access.patchLengthAt(code_), heapLength);
+        if (access.hasLengthCheck()) {
+            // See comment above for x86 codegen.
+            X86Assembler::setInt32(access.patchLengthAt(code_),
+                                   heapLength + 1 - ViewTypeByteSize(access.viewType()));
+        }
     }
 #elif defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
     uint32_t heapLength = heap->byteLength();
@@ -871,7 +912,7 @@
     // Even if this->active(), to reach here, the activation must have called
     // out via an FFI stub. FFI stubs check if heapDatum() is null on reentry
     // and throw an exception if so.
-    MOZ_ASSERT_IF(active(), activation()->exitReason() == AsmJSExit::Reason_IonFFI ||
+    MOZ_ASSERT_IF(active(), activation()->exitReason() == AsmJSExit::Reason_JitFFI ||
                             activation()->exitReason() == AsmJSExit::Reason_SlowFFI);
 
     restoreHeapToInitialState(maybeHeap_);
@@ -1305,7 +1346,7 @@
 
     MOZ_ASSERT(begin_ < profilingReturn_);
     MOZ_ASSERT(profilingReturn_ < end_);
-    MOZ_ASSERT(u.kind_ == IonFFI || u.kind_ == SlowFFI || u.kind_ == Interrupt);
+    MOZ_ASSERT(u.kind_ == JitFFI || u.kind_ == SlowFFI || u.kind_ == Interrupt);
 }
 
 AsmJSModule::CodeRange::CodeRange(AsmJSExit::BuiltinKind builtin, uint32_t begin,
@@ -1592,6 +1633,9 @@
     if (interrupted_)
         return false;
 
+    AutoFlushICache afc("AsmJSModule::changeHeap");
+    setAutoFlushICacheRange();
+
     restoreHeapToInitialState(maybeHeap_);
     initHeap(newHeap, cx);
     return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSModule.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSModule.h	2014-11-26 21:45:53.000000000 +0000
@@ -66,6 +66,20 @@
     AsmJSMathBuiltin_clz32
 };
 
+// The asm.js spec will recognize this set of builtin Atomics functions.
+enum AsmJSAtomicsBuiltinFunction
+{
+    AsmJSAtomicsBuiltin_compareExchange,
+    AsmJSAtomicsBuiltin_load,
+    AsmJSAtomicsBuiltin_store,
+    AsmJSAtomicsBuiltin_fence,
+    AsmJSAtomicsBuiltin_add,
+    AsmJSAtomicsBuiltin_sub,
+    AsmJSAtomicsBuiltin_and,
+    AsmJSAtomicsBuiltin_or,
+    AsmJSAtomicsBuiltin_xor
+};
+
 // Set of known global object SIMD's attributes, i.e. types
 enum AsmJSSimdType
 {
@@ -200,8 +214,8 @@
     class Global
     {
       public:
-        enum Which { Variable, FFI, ArrayView, ArrayViewCtor, MathBuiltinFunction, Constant,
-                     SimdCtor, SimdOperation, ByteLength };
+        enum Which { Variable, FFI, ArrayView, ArrayViewCtor, SharedArrayView, MathBuiltinFunction,
+                     AtomicsBuiltinFunction, Constant, SimdCtor, SimdOperation, ByteLength };
         enum VarInitKind { InitConstant, InitImport };
         enum ConstantKind { GlobalConstant, MathConstant };
 
@@ -220,6 +234,7 @@
                 uint32_t ffiIndex_;
                 Scalar::Type viewType_;
                 AsmJSMathBuiltinFunction mathBuiltinFunc_;
+                AsmJSAtomicsBuiltinFunction atomicsBuiltinFunc_;
                 AsmJSSimdType simdCtorType_;
                 struct {
                     AsmJSSimdType type_;
@@ -289,21 +304,29 @@
         //   var i32 = new I32(buffer);
         // the second import has nothing to validate and thus has a null field.
         PropertyName *maybeViewName() const {
-            MOZ_ASSERT(pod.which_ == ArrayView || pod.which_ == ArrayViewCtor);
+            MOZ_ASSERT(pod.which_ == ArrayView || pod.which_ == SharedArrayView || pod.which_ == ArrayViewCtor);
             return name_;
         }
         Scalar::Type viewType() const {
-            MOZ_ASSERT(pod.which_ == ArrayView || pod.which_ == ArrayViewCtor);
+            MOZ_ASSERT(pod.which_ == ArrayView || pod.which_ == SharedArrayView || pod.which_ == ArrayViewCtor);
             return pod.u.viewType_;
         }
         PropertyName *mathName() const {
             MOZ_ASSERT(pod.which_ == MathBuiltinFunction);
             return name_;
         }
+        PropertyName *atomicsName() const {
+            MOZ_ASSERT(pod.which_ == AtomicsBuiltinFunction);
+            return name_;
+        }
         AsmJSMathBuiltinFunction mathBuiltinFunction() const {
             MOZ_ASSERT(pod.which_ == MathBuiltinFunction);
             return pod.u.mathBuiltinFunc_;
         }
+        AsmJSAtomicsBuiltinFunction atomicsBuiltinFunction() const {
+            MOZ_ASSERT(pod.which_ == AtomicsBuiltinFunction);
+            return pod.u.atomicsBuiltinFunc_;
+        }
         AsmJSSimdType simdCtorType() const {
             MOZ_ASSERT(pod.which_ == SimdCtor);
             return pod.u.simdCtorType_;
@@ -348,7 +371,7 @@
         unsigned ffiIndex_;
         unsigned globalDataOffset_;
         unsigned interpCodeOffset_;
-        unsigned ionCodeOffset_;
+        unsigned jitCodeOffset_;
 
         friend class AsmJSModule;
 
@@ -356,7 +379,7 @@
         Exit() {}
         Exit(unsigned ffiIndex, unsigned globalDataOffset)
           : ffiIndex_(ffiIndex), globalDataOffset_(globalDataOffset),
-            interpCodeOffset_(0), ionCodeOffset_(0)
+            interpCodeOffset_(0), jitCodeOffset_(0)
         {}
         unsigned ffiIndex() const {
             return ffiIndex_;
@@ -368,13 +391,13 @@
             MOZ_ASSERT(!interpCodeOffset_);
             interpCodeOffset_ = off;
         }
-        void initIonOffset(unsigned off) {
-            MOZ_ASSERT(!ionCodeOffset_);
-            ionCodeOffset_ = off;
+        void initJitOffset(unsigned off) {
+            MOZ_ASSERT(!jitCodeOffset_);
+            jitCodeOffset_ = off;
         }
         void updateOffsets(jit::MacroAssembler &masm) {
             interpCodeOffset_ = masm.actualOffset(interpCodeOffset_);
-            ionCodeOffset_ = masm.actualOffset(ionCodeOffset_);
+            jitCodeOffset_ = masm.actualOffset(jitCodeOffset_);
         }
 
         size_t serializedSize() const;
@@ -387,7 +410,7 @@
         uint64_t lo;
         uint64_t hi;
     };
-    JS_STATIC_ASSERT(sizeof(EntryArg) >= jit::Simd128DataSize);
+
     typedef int32_t (*CodePtr)(EntryArg *args, uint8_t *global);
 
     // An Exit holds bookkeeping information about an exit; the ExitDatum
@@ -396,7 +419,7 @@
     struct ExitDatum
     {
         uint8_t *exit;
-        jit::IonScript *ionScript;
+        jit::BaselineScript *baselineScript;
         HeapPtrFunction fun;
     };
 
@@ -535,7 +558,7 @@
         void setDeltas(uint32_t entry, uint32_t profilingJump, uint32_t profilingEpilogue);
 
       public:
-        enum Kind { Function, Entry, IonFFI, SlowFFI, Interrupt, Thunk, Inline };
+        enum Kind { Function, Entry, JitFFI, SlowFFI, Interrupt, Thunk, Inline };
 
         CodeRange() {}
         CodeRange(uint32_t nameIndex, uint32_t lineNumber, const AsmJSFunctionLabels &l);
@@ -547,7 +570,7 @@
         Kind kind() const { return Kind(u.kind_); }
         bool isFunction() const { return kind() == Function; }
         bool isEntry() const { return kind() == Entry; }
-        bool isFFI() const { return kind() == IonFFI || kind() == SlowFFI; }
+        bool isFFI() const { return kind() == JitFFI || kind() == SlowFFI; }
         bool isInterrupt() const { return kind() == Interrupt; }
         bool isThunk() const { return kind() == Thunk; }
 
@@ -783,6 +806,7 @@
         uint32_t                          srcLengthWithRightBrace_;
         bool                              strict_;
         bool                              hasArrayView_;
+        bool                              isSharedView_;
         bool                              hasFixedMinHeapLength_;
         bool                              usesSignalHandlers_;
     } pod;
@@ -982,16 +1006,20 @@
         g.pod.u.ffiIndex_ = *ffiIndex = pod.numFFIs_++;
         return globals_.append(g);
     }
-    bool addArrayView(Scalar::Type vt, PropertyName *maybeField) {
+    bool addArrayView(Scalar::Type vt, PropertyName *maybeField, bool isSharedView) {
         MOZ_ASSERT(!isFinishedWithModulePrologue());
+        MOZ_ASSERT(!pod.hasArrayView_ || (pod.isSharedView_ == isSharedView));
         pod.hasArrayView_ = true;
+        pod.isSharedView_ = isSharedView;
         Global g(Global::ArrayView, maybeField);
         g.pod.u.viewType_ = vt;
         return globals_.append(g);
     }
-    bool addArrayViewCtor(Scalar::Type vt, PropertyName *field) {
+    bool addArrayViewCtor(Scalar::Type vt, PropertyName *field, bool isSharedView) {
         MOZ_ASSERT(!isFinishedWithModulePrologue());
         MOZ_ASSERT(field);
+        MOZ_ASSERT(!pod.isSharedView_ || isSharedView);
+        pod.isSharedView_ = isSharedView;
         Global g(Global::ArrayViewCtor, field);
         g.pod.u.viewType_ = vt;
         return globals_.append(g);
@@ -1014,6 +1042,12 @@
         g.pod.u.constant.kind_ = Global::MathConstant;
         return globals_.append(g);
     }
+    bool addAtomicsBuiltinFunction(AsmJSAtomicsBuiltinFunction func, PropertyName *field) {
+        MOZ_ASSERT(!isFinishedWithModulePrologue());
+        Global g(Global::AtomicsBuiltinFunction, field);
+        g.pod.u.atomicsBuiltinFunc_ = func;
+        return globals_.append(g);
+    }
     bool addSimdCtor(AsmJSSimdType type, PropertyName *field) {
         Global g(Global::SimdCtor, field);
         g.pod.u.simdCtorType_ = type;
@@ -1038,6 +1072,11 @@
     Global &global(unsigned i) {
         return globals_[i];
     }
+    bool isValidViewSharedness(bool shared) const {
+        if (pod.hasArrayView_)
+            return pod.isSharedView_ == shared;
+        return !pod.isSharedView_ || shared;
+    }
 
     /*************************************************************************/
 
@@ -1054,6 +1093,10 @@
         MOZ_ASSERT(isFinishedWithModulePrologue());
         return pod.hasArrayView_;
     }
+    bool isSharedView() const {
+        MOZ_ASSERT(pod.hasArrayView_);
+        return pod.isSharedView_;
+    }
     void addChangeHeap(uint32_t mask, uint32_t min, uint32_t max) {
         MOZ_ASSERT(isFinishedWithModulePrologue());
         MOZ_ASSERT(!pod.hasFixedMinHeapLength_);
@@ -1282,10 +1325,10 @@
         MOZ_ASSERT(exit.interpCodeOffset_);
         return code_ + exit.interpCodeOffset_;
     }
-    uint8_t *ionExitTrampoline(const Exit &exit) const {
+    uint8_t *jitExitTrampoline(const Exit &exit) const {
         MOZ_ASSERT(isFinished());
-        MOZ_ASSERT(exit.ionCodeOffset_);
-        return code_ + exit.ionCodeOffset_;
+        MOZ_ASSERT(exit.jitCodeOffset_);
+        return code_ + exit.jitCodeOffset_;
     }
   public:
 
@@ -1420,17 +1463,17 @@
         ExitDatum &exitDatum = exitIndexToGlobalDatum(exitIndex);
         return exitDatum.exit != interpExitTrampoline(exit(exitIndex));
     }
-    void optimizeExit(unsigned exitIndex, jit::IonScript *ionScript) const {
+    void optimizeExit(unsigned exitIndex, jit::BaselineScript *baselineScript) const {
         MOZ_ASSERT(!exitIsOptimized(exitIndex));
         ExitDatum &exitDatum = exitIndexToGlobalDatum(exitIndex);
-        exitDatum.exit = ionExitTrampoline(exit(exitIndex));
-        exitDatum.ionScript = ionScript;
+        exitDatum.exit = jitExitTrampoline(exit(exitIndex));
+        exitDatum.baselineScript = baselineScript;
     }
-    void detachIonCompilation(size_t exitIndex) const {
+    void detachJitCompilation(size_t exitIndex) const {
         MOZ_ASSERT(isFinished());
         ExitDatum &exitDatum = exitIndexToGlobalDatum(exitIndex);
         exitDatum.exit = interpExitTrampoline(exit(exitIndex));
-        exitDatum.ionScript = nullptr;
+        exitDatum.baselineScript = nullptr;
     }
 
     /*************************************************************************/
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -321,51 +321,82 @@
 static uint8_t **
 ContextToPC(CONTEXT *context)
 {
-    return reinterpret_cast<uint8_t**>(&PC_sig(context));
+#ifdef JS_CODEGEN_NONE
+    MOZ_CRASH();
+#else
+     return reinterpret_cast<uint8_t**>(&PC_sig(context));
+#endif
 }
 
-#if defined(JS_CPU_X64)
+#if defined(JS_CODEGEN_X64)
 template <class T>
 static void
-SetXMMRegToNaN(bool isFloat32, T *xmm_reg)
+SetXMMRegToNaN(AsmJSHeapAccess::ViewType viewType, T *xmm_reg)
 {
-    if (isFloat32) {
+    switch (viewType) {
+      case AsmJSHeapAccess::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;
-    } else {
+        break;
+      }
+      case AsmJSHeapAccess::Float64: {
         JS_STATIC_ASSERT(sizeof(T) == 2 * sizeof(double));
         double *dbls = reinterpret_cast<double*>(xmm_reg);
         dbls[0] = GenericNaN();
         dbls[1] = 0;
+        break;
+      }
+      case AsmJSHeapAccess::Float32x4: {
+        JS_STATIC_ASSERT(sizeof(T) == 4 * sizeof(float));
+        float *floats = reinterpret_cast<float*>(xmm_reg);
+        for (unsigned i = 0; i < 4; i++)
+            floats[i] = GenericNaN();
+        break;
+      }
+      case AsmJSHeapAccess::Int32x4: {
+        JS_STATIC_ASSERT(sizeof(T) == 4 * sizeof(int32_t));
+        int32_t *ints = reinterpret_cast<int32_t*>(xmm_reg);
+        for (unsigned i = 0; i < 4; i++)
+            ints[i] = 0;
+        break;
+      }
+      case AsmJSHeapAccess::Int8:
+      case AsmJSHeapAccess::Uint8:
+      case AsmJSHeapAccess::Int16:
+      case AsmJSHeapAccess::Uint16:
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:
+      case AsmJSHeapAccess::Uint8Clamped:
+        MOZ_CRASH("unexpected type in SetXMMRegToNaN");
     }
 }
 
 # if !defined(XP_MACOSX)
 static void
-SetRegisterToCoercedUndefined(CONTEXT *context, bool isFloat32, AnyRegister reg)
+SetRegisterToCoercedUndefined(CONTEXT *context, AsmJSHeapAccess::ViewType viewType, AnyRegister reg)
 {
     if (reg.isFloat()) {
         switch (reg.fpu().code()) {
-          case X86Registers::xmm0:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 0)); break;
-          case X86Registers::xmm1:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 1)); break;
-          case X86Registers::xmm2:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 2)); break;
-          case X86Registers::xmm3:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 3)); break;
-          case X86Registers::xmm4:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 4)); break;
-          case X86Registers::xmm5:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 5)); break;
-          case X86Registers::xmm6:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 6)); break;
-          case X86Registers::xmm7:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 7)); break;
-          case X86Registers::xmm8:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 8)); break;
-          case X86Registers::xmm9:  SetXMMRegToNaN(isFloat32, &XMM_sig(context, 9)); break;
-          case X86Registers::xmm10: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 10)); break;
-          case X86Registers::xmm11: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 11)); break;
-          case X86Registers::xmm12: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 12)); break;
-          case X86Registers::xmm13: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 13)); break;
-          case X86Registers::xmm14: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 14)); break;
-          case X86Registers::xmm15: SetXMMRegToNaN(isFloat32, &XMM_sig(context, 15)); break;
+          case X86Registers::xmm0:  SetXMMRegToNaN(viewType, &XMM_sig(context, 0)); break;
+          case X86Registers::xmm1:  SetXMMRegToNaN(viewType, &XMM_sig(context, 1)); break;
+          case X86Registers::xmm2:  SetXMMRegToNaN(viewType, &XMM_sig(context, 2)); break;
+          case X86Registers::xmm3:  SetXMMRegToNaN(viewType, &XMM_sig(context, 3)); break;
+          case X86Registers::xmm4:  SetXMMRegToNaN(viewType, &XMM_sig(context, 4)); break;
+          case X86Registers::xmm5:  SetXMMRegToNaN(viewType, &XMM_sig(context, 5)); break;
+          case X86Registers::xmm6:  SetXMMRegToNaN(viewType, &XMM_sig(context, 6)); break;
+          case X86Registers::xmm7:  SetXMMRegToNaN(viewType, &XMM_sig(context, 7)); break;
+          case X86Registers::xmm8:  SetXMMRegToNaN(viewType, &XMM_sig(context, 8)); break;
+          case X86Registers::xmm9:  SetXMMRegToNaN(viewType, &XMM_sig(context, 9)); break;
+          case X86Registers::xmm10: SetXMMRegToNaN(viewType, &XMM_sig(context, 10)); break;
+          case X86Registers::xmm11: SetXMMRegToNaN(viewType, &XMM_sig(context, 11)); break;
+          case X86Registers::xmm12: SetXMMRegToNaN(viewType, &XMM_sig(context, 12)); break;
+          case X86Registers::xmm13: SetXMMRegToNaN(viewType, &XMM_sig(context, 13)); break;
+          case X86Registers::xmm14: SetXMMRegToNaN(viewType, &XMM_sig(context, 14)); break;
+          case X86Registers::xmm15: SetXMMRegToNaN(viewType, &XMM_sig(context, 15)); break;
           default: MOZ_CRASH();
         }
     } else {
@@ -391,7 +422,7 @@
     }
 }
 # endif  // !XP_MACOSX
-#endif // JS_CPU_X64
+#endif // JS_CODEGEN_X64
 
 #if defined(XP_WIN)
 
@@ -425,7 +456,7 @@
     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*)record->ExceptionInformation[1];
@@ -451,8 +482,9 @@
     // 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->isFloat32Load(), heapAccess->loadedReg());
+        SetRegisterToCoercedUndefined(context, heapAccess->viewType(), heapAccess->loadedReg());
     *ppc += heapAccess->opLength();
+
     return true;
 # else
     return false;
@@ -476,15 +508,17 @@
 ContextToPC(x86_thread_state_t &state)
 {
 # if defined(JS_CPU_X64)
-    JS_STATIC_ASSERT(sizeof(state.uts.ts64.__rip) == sizeof(void*));
+    static_assert(sizeof(state.uts.ts64.__rip) == sizeof(void*),
+                  "stored IP should be compile-time pointer-sized");
     return reinterpret_cast<uint8_t**>(&state.uts.ts64.__rip);
 # else
-    JS_STATIC_ASSERT(sizeof(state.uts.ts32.__eip) == sizeof(void*));
+    static_assert(sizeof(state.uts.ts32.__eip) == sizeof(void*),
+                  "stored IP should be compile-time pointer-sized");
     return reinterpret_cast<uint8_t**>(&state.uts.ts32.__eip);
 # endif
 }
 
-# if defined(JS_CPU_X64)
+# if defined(JS_CODEGEN_X64)
 static bool
 SetRegisterToCoercedUndefined(mach_port_t rtThread, x86_thread_state64_t &state,
                               const AsmJSHeapAccess &heapAccess)
@@ -498,24 +532,24 @@
         if (kret != KERN_SUCCESS)
             return false;
 
-        bool f32 = heapAccess.isFloat32Load();
+        AsmJSHeapAccess::ViewType viewType = heapAccess.viewType();
         switch (heapAccess.loadedReg().fpu().code()) {
-          case X86Registers::xmm0:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm0); break;
-          case X86Registers::xmm1:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm1); break;
-          case X86Registers::xmm2:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm2); break;
-          case X86Registers::xmm3:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm3); break;
-          case X86Registers::xmm4:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm4); break;
-          case X86Registers::xmm5:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm5); break;
-          case X86Registers::xmm6:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm6); break;
-          case X86Registers::xmm7:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm7); break;
-          case X86Registers::xmm8:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm8); break;
-          case X86Registers::xmm9:  SetXMMRegToNaN(f32, &fstate.__fpu_xmm9); break;
-          case X86Registers::xmm10: SetXMMRegToNaN(f32, &fstate.__fpu_xmm10); break;
-          case X86Registers::xmm11: SetXMMRegToNaN(f32, &fstate.__fpu_xmm11); break;
-          case X86Registers::xmm12: SetXMMRegToNaN(f32, &fstate.__fpu_xmm12); break;
-          case X86Registers::xmm13: SetXMMRegToNaN(f32, &fstate.__fpu_xmm13); break;
-          case X86Registers::xmm14: SetXMMRegToNaN(f32, &fstate.__fpu_xmm14); break;
-          case X86Registers::xmm15: SetXMMRegToNaN(f32, &fstate.__fpu_xmm15); break;
+          case X86Registers::xmm0:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm0); break;
+          case X86Registers::xmm1:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm1); break;
+          case X86Registers::xmm2:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm2); break;
+          case X86Registers::xmm3:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm3); break;
+          case X86Registers::xmm4:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm4); break;
+          case X86Registers::xmm5:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm5); break;
+          case X86Registers::xmm6:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm6); break;
+          case X86Registers::xmm7:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm7); break;
+          case X86Registers::xmm8:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm8); break;
+          case X86Registers::xmm9:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm9); break;
+          case X86Registers::xmm10: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm10); break;
+          case X86Registers::xmm11: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm11); break;
+          case X86Registers::xmm12: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm12); break;
+          case X86Registers::xmm13: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm13); break;
+          case X86Registers::xmm14: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm14); break;
+          case X86Registers::xmm15: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm15); break;
           default: MOZ_CRASH();
         }
 
@@ -818,7 +852,7 @@
     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 = info->si_addr;
@@ -840,8 +874,9 @@
     // 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->isFloat32Load(), heapAccess->loadedReg());
+        SetRegisterToCoercedUndefined(context, heapAccess->viewType(), heapAccess->loadedReg());
     *ppc += heapAccess->opLength();
+
     return true;
 # else
     return false;
@@ -968,8 +1003,8 @@
 #if defined(XP_WIN)
     // Windows uses SuspendThread to stop the main thread from another thread,
     // so the only handler we need is for asm.js out-of-bound faults.
-    if (!AddVectoredExceptionHandler(/* FirstHandler = */true, AsmJSFaultHandler))
-        MOZ_CRASH("unable to install vectored exception handler");
+    if (!AddVectoredExceptionHandler(/* FirstHandler = */ true, AsmJSFaultHandler))
+        return false;
 #else
     // The interrupt handler allows the main thread to be paused from another
     // thread (see InterruptRunningJitCode).
@@ -1039,23 +1074,19 @@
     // to halt the runtime's main thread first.
 #if defined(XP_WIN)
     // On Windows, we can simply suspend the main thread and work directly on
-    // its context from this thread.
+    // its context from this thread. SuspendThread can sporadically fail if the
+    // thread is in the middle of a syscall. Rather than retrying in a loop,
+    // just wait for the next request for interrupt.
     HANDLE thread = (HANDLE)rt->ownerThreadNative();
-    if (SuspendThread(thread) == -1)
-        MOZ_CRASH("Failed to suspend main thread");
-
-    CONTEXT context;
-    context.ContextFlags = CONTEXT_CONTROL;
-    if (!GetThreadContext(thread, &context))
-        MOZ_CRASH("Failed to get suspended thread context");
-
-    RedirectJitCodeToInterruptCheck(rt, &context);
-
-    if (!SetThreadContext(thread, &context))
-        MOZ_CRASH("Failed to set suspended thread context");
-
-    if (ResumeThread(thread) == -1)
-        MOZ_CRASH("Failed to resume main thread");
+    if (SuspendThread(thread) != -1) {
+        CONTEXT context;
+        context.ContextFlags = CONTEXT_CONTROL;
+        if (GetThreadContext(thread, &context)) {
+            RedirectJitCodeToInterruptCheck(rt, &context);
+            SetThreadContext(thread, &context);
+        }
+        ResumeThread(thread);
+    }
 #else
     // On Unix, we instead deliver an async signal to the main thread which
     // halts the thread and callers our JitInterruptHandler (which has already
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSValidate.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSValidate.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSValidate.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSValidate.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -566,38 +566,13 @@
         MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Invalid Type");
     }
 
-    Type simdToScalarType() const {
+    AsmJSSimdType simdType() const {
         MOZ_ASSERT(isSimd());
         switch (which_) {
           case Int32x4:
-            return Signed;
+            return AsmJSSimdType_int32x4;
           case Float32x4:
-            return Float;
-          // Scalar types
-          case Double:
-          case DoubleLit:
-          case MaybeDouble:
-          case Float:
-          case MaybeFloat:
-          case Floatish:
-          case Fixnum:
-          case Int:
-          case Signed:
-          case Unsigned:
-          case Intish:
-          case Void:
-            break;
-        }
-        MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Invalid SIMD Type");
-    }
-
-    Type simdToCoercedScalarType() const {
-        MOZ_ASSERT(isSimd());
-        switch (which_) {
-          case Int32x4:
-            return Intish;
-          case Float32x4:
-            return Floatish;
+            return AsmJSSimdType_float32x4;
           // Scalar types
           case Double:
           case DoubleLit:
@@ -613,7 +588,7 @@
           case Void:
             break;
         }
-        MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("Invalid SIMD Type");
+        MOZ_CRASH("not a SIMD Type");
     }
 
     const char *toChars() const {
@@ -1064,6 +1039,7 @@
             ArrayView,
             ArrayViewCtor,
             MathBuiltinFunction,
+            AtomicsBuiltinFunction,
             SimdCtor,
             SimdOperation,
             ByteLength,
@@ -1083,6 +1059,7 @@
             uint32_t ffiIndex_;
             Scalar::Type viewType_;
             AsmJSMathBuiltinFunction mathBuiltinFunc_;
+            AsmJSAtomicsBuiltinFunction atomicsBuiltinFunc_;
             AsmJSSimdType simdCtorType_;
             struct {
                 AsmJSSimdType type_;
@@ -1130,8 +1107,11 @@
             MOZ_ASSERT(which_ == FFI);
             return u.ffiIndex_;
         }
+        bool isAnyArrayView() const {
+            return which_ == ArrayView || which_ == ArrayViewCtor;
+        }
         Scalar::Type viewType() const {
-            MOZ_ASSERT(which_ == ArrayView || which_ == ArrayViewCtor);
+            MOZ_ASSERT(isAnyArrayView());
             return u.viewType_;
         }
         bool isMathFunction() const {
@@ -1141,6 +1121,13 @@
             MOZ_ASSERT(which_ == MathBuiltinFunction);
             return u.mathBuiltinFunc_;
         }
+        bool isAtomicsFunction() const {
+            return which_ == AtomicsBuiltinFunction;
+        }
+        AsmJSAtomicsBuiltinFunction atomicsBuiltinFunction() const {
+            MOZ_ASSERT(which_ == AtomicsBuiltinFunction);
+            return u.atomicsBuiltinFunc_;
+        }
         bool isSimdCtor() const {
             return which_ == SimdCtor;
         }
@@ -1278,6 +1265,7 @@
     };
 
     typedef HashMap<PropertyName*, MathBuiltin> MathNameMap;
+    typedef HashMap<PropertyName*, AsmJSAtomicsBuiltinFunction> AtomicsNameMap;
     typedef HashMap<PropertyName*, AsmJSSimdOperation> SimdOperationNameMap;
     typedef HashMap<PropertyName*, Global*> GlobalMap;
     typedef Vector<Func*> FuncVector;
@@ -1301,6 +1289,7 @@
     ArrayViewVector                arrayViews_;
     ExitMap                        exits_;
     MathNameMap                    standardLibraryMathNames_;
+    AtomicsNameMap                 standardLibraryAtomicsNames_;
     SimdOperationNameMap           standardLibrarySimdOpNames_;
     NonAssertingLabel              stackOverflowLabel_;
     NonAssertingLabel              asyncInterruptLabel_;
@@ -1333,6 +1322,12 @@
         MathBuiltin builtin(cst);
         return standardLibraryMathNames_.putNew(atom->asPropertyName(), builtin);
     }
+    bool addStandardLibraryAtomicsName(const char *name, AsmJSAtomicsBuiltinFunction func) {
+        JSAtom *atom = Atomize(cx_, name, strlen(name));
+        if (!atom)
+            return false;
+        return standardLibraryAtomicsNames_.putNew(atom->asPropertyName(), func);
+    }
     bool addStandardLibrarySimdOpName(const char *name, AsmJSSimdOperation op) {
         JSAtom *atom = Atomize(cx_, name, strlen(name));
         if (!atom)
@@ -1354,6 +1349,7 @@
         arrayViews_(cx),
         exits_(cx),
         standardLibraryMathNames_(cx),
+        standardLibraryAtomicsNames_(cx),
         standardLibrarySimdOpNames_(cx),
         errorString_(nullptr),
         errorOffset_(UINT32_MAX),
@@ -1415,6 +1411,20 @@
             return false;
         }
 
+        if (!standardLibraryAtomicsNames_.init() ||
+            !addStandardLibraryAtomicsName("compareExchange", AsmJSAtomicsBuiltin_compareExchange) ||
+            !addStandardLibraryAtomicsName("load", AsmJSAtomicsBuiltin_load) ||
+            !addStandardLibraryAtomicsName("store", AsmJSAtomicsBuiltin_store) ||
+            !addStandardLibraryAtomicsName("fence", AsmJSAtomicsBuiltin_fence) ||
+            !addStandardLibraryAtomicsName("add", AsmJSAtomicsBuiltin_add) ||
+            !addStandardLibraryAtomicsName("sub", AsmJSAtomicsBuiltin_sub) ||
+            !addStandardLibraryAtomicsName("and", AsmJSAtomicsBuiltin_and) ||
+            !addStandardLibraryAtomicsName("or", AsmJSAtomicsBuiltin_or) ||
+            !addStandardLibraryAtomicsName("xor", AsmJSAtomicsBuiltin_xor))
+        {
+            return false;
+        }
+
 #define ADDSTDLIBSIMDOPNAME(op) || !addStandardLibrarySimdOpName(#op, AsmJSSimdOperation_##op)
         if (!standardLibrarySimdOpNames_.init()
             FORALL_SIMD_OP(ADDSTDLIBSIMDOPNAME))
@@ -1544,6 +1554,13 @@
         }
         return false;
     }
+    bool lookupStandardLibraryAtomicsName(PropertyName *name, AsmJSAtomicsBuiltinFunction *atomicsBuiltin) const {
+        if (AtomicsNameMap::Ptr p = standardLibraryAtomicsNames_.lookup(name)) {
+            *atomicsBuiltin = p->value();
+            return true;
+        }
+        return false;
+    }
     bool lookupStandardSimdOpName(PropertyName *name, AsmJSSimdOperation *op) const {
         if (SimdOperationNameMap::Ptr p = standardLibrarySimdOpNames_.lookup(name)) {
             *op = p->value();
@@ -1660,22 +1677,22 @@
         global->u.ffiIndex_ = index;
         return globals_.putNew(varName, global);
     }
-    bool addArrayView(PropertyName *varName, Scalar::Type vt, PropertyName *maybeField) {
+    bool addArrayView(PropertyName *varName, Scalar::Type vt, PropertyName *maybeField, bool isSharedView) {
         if (!arrayViews_.append(ArrayView(varName, vt)))
             return false;
         Global *global = moduleLifo_.new_<Global>(Global::ArrayView);
         if (!global)
             return false;
-        if (!module_->addArrayView(vt, maybeField))
+        if (!module_->addArrayView(vt, maybeField, isSharedView))
             return false;
         global->u.viewType_ = vt;
         return globals_.putNew(varName, global);
     }
-    bool addArrayViewCtor(PropertyName *varName, Scalar::Type vt, PropertyName *fieldName) {
+    bool addArrayViewCtor(PropertyName *varName, Scalar::Type vt, PropertyName *fieldName, bool isSharedView) {
         Global *global = moduleLifo_.new_<Global>(Global::ArrayViewCtor);
         if (!global)
             return false;
-        if (!module_->addArrayViewCtor(vt, fieldName))
+        if (!module_->addArrayViewCtor(vt, fieldName, isSharedView))
             return false;
         global->u.viewType_ = vt;
         return globals_.putNew(varName, global);
@@ -1689,6 +1706,15 @@
         global->u.mathBuiltinFunc_ = func;
         return globals_.putNew(varName, global);
     }
+    bool addAtomicsBuiltinFunction(PropertyName *varName, AsmJSAtomicsBuiltinFunction func, PropertyName *fieldName) {
+        if (!module_->addAtomicsBuiltinFunction(func, fieldName))
+            return false;
+        Global *global = moduleLifo_.new_<Global>(Global::AtomicsBuiltinFunction);
+        if (!global)
+            return false;
+        global->u.atomicsBuiltinFunc_ = func;
+        return globals_.putNew(varName, global);
+    }
     bool addSimdCtor(PropertyName *varName, AsmJSSimdType type, PropertyName *fieldName) {
         if (!module_->addSimdCtor(type, fieldName))
             return false;
@@ -1844,13 +1870,13 @@
         uint32_t end = masm_.currentOffset();
         return module_->addCodeRange(AsmJSModule::CodeRange::SlowFFI, beg, pret, end);
     }
-    bool finishGeneratingIonExit(unsigned exitIndex, Label *begin, Label *profilingReturn) {
+    bool finishGeneratingJitExit(unsigned exitIndex, Label *begin, Label *profilingReturn) {
         MOZ_ASSERT(finishedFunctionBodies_);
         uint32_t beg = begin->offset();
-        module_->exit(exitIndex).initIonOffset(beg);
+        module_->exit(exitIndex).initJitOffset(beg);
         uint32_t pret = profilingReturn->offset();
         uint32_t end = masm_.currentOffset();
-        return module_->addCodeRange(AsmJSModule::CodeRange::IonFFI, beg, pret, end);
+        return module_->addCodeRange(AsmJSModule::CodeRange::JitFFI, beg, pret, end);
     }
     bool finishGeneratingInterrupt(Label *begin, Label *profilingReturn) {
         MOZ_ASSERT(finishedFunctionBodies_);
@@ -2730,7 +2756,7 @@
         curBlock_->setSlot(info().localSlot(local.slot), def);
     }
 
-    MDefinition *loadHeap(Scalar::Type vt, MDefinition *ptr, NeedsBoundsCheck chk)
+    MDefinition *loadHeap(AsmJSHeapAccess::ViewType vt, MDefinition *ptr, NeedsBoundsCheck chk)
     {
         if (inDeadCode())
             return nullptr;
@@ -2741,7 +2767,8 @@
         return load;
     }
 
-    void storeHeap(Scalar::Type vt, MDefinition *ptr, MDefinition *v, NeedsBoundsCheck chk)
+    void storeHeap(AsmJSHeapAccess::ViewType vt, MDefinition *ptr, MDefinition *v,
+                   NeedsBoundsCheck chk)
     {
         if (inDeadCode())
             return;
@@ -2751,6 +2778,66 @@
         curBlock_->add(store);
     }
 
+    void memoryBarrier(MemoryBarrierBits type)
+    {
+        if (inDeadCode())
+            return;
+        MMemoryBarrier *ins = MMemoryBarrier::New(alloc(), type);
+        curBlock_->add(ins);
+    }
+
+    MDefinition *atomicLoadHeap(AsmJSHeapAccess::ViewType vt, MDefinition *ptr, NeedsBoundsCheck chk)
+    {
+        if (inDeadCode())
+            return nullptr;
+
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        MAsmJSLoadHeap *load = MAsmJSLoadHeap::New(alloc(), vt, ptr, needsBoundsCheck,
+                                                   MembarBeforeLoad, MembarAfterLoad);
+        curBlock_->add(load);
+        return load;
+    }
+
+    void atomicStoreHeap(AsmJSHeapAccess::ViewType vt, MDefinition *ptr, MDefinition *v,
+                         NeedsBoundsCheck chk)
+    {
+        if (inDeadCode())
+            return;
+
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        MAsmJSStoreHeap *store = MAsmJSStoreHeap::New(alloc(), vt, ptr, v, needsBoundsCheck,
+                                                      MembarBeforeStore, MembarAfterStore);
+        curBlock_->add(store);
+    }
+
+    MDefinition *atomicCompareExchangeHeap(AsmJSHeapAccess::ViewType vt, MDefinition *ptr,
+                                           MDefinition *oldv, MDefinition *newv, NeedsBoundsCheck chk)
+    {
+        if (inDeadCode())
+            return nullptr;
+
+        // The code generator requires explicit bounds checking for compareExchange.
+        bool needsBoundsCheck = true;
+        MAsmJSCompareExchangeHeap *cas =
+            MAsmJSCompareExchangeHeap::New(alloc(), vt, ptr, oldv, newv, needsBoundsCheck);
+        curBlock_->add(cas);
+        return cas;
+    }
+
+    MDefinition *atomicBinopHeap(js::jit::AtomicOp op, AsmJSHeapAccess::ViewType vt,
+                                 MDefinition *ptr, MDefinition *v, NeedsBoundsCheck chk)
+    {
+        if (inDeadCode())
+            return nullptr;
+
+        // The code generator requires explicit bounds checking for the binops.
+        bool needsBoundsCheck = true;
+        MAsmJSAtomicBinopHeap *binop =
+            MAsmJSAtomicBinopHeap::New(alloc(), op, vt, ptr, v, needsBoundsCheck);
+        curBlock_->add(binop);
+        return binop;
+    }
+
     MDefinition *loadGlobalVar(const ModuleCompiler::Global &global)
     {
         if (inDeadCode())
@@ -3358,7 +3445,7 @@
   private:
     void noteBasicBlockPosition(MBasicBlock *blk, ParseNode *pn)
     {
-#if defined(JS_ION_PERF)
+#if defined(JS_ION_PERF) || defined(DEBUG)
         if (pn) {
             unsigned line = 0U, column = 0U;
             m().tokenStream().srcCoords.lineNumAndColumnIndex(pn->pn_pos.begin, &line, &column);
@@ -3648,27 +3735,53 @@
 }
 
 static bool
-IsArrayViewCtorName(ModuleCompiler &m, PropertyName *name, Scalar::Type *type)
+IsArrayViewCtorName(ModuleCompiler &m, PropertyName *name, Scalar::Type *type, bool *shared)
 {
     JSAtomState &names = m.cx()->names();
-    if (name == names.Int8Array || name == names.SharedInt8Array)
+    *shared = false;
+    if (name == names.Int8Array) {
         *type = Scalar::Int8;
-    else if (name == names.Uint8Array || name == names.SharedUint8Array)
+    } else if (name == names.Uint8Array) {
         *type = Scalar::Uint8;
-    else if (name == names.Int16Array || name == names.SharedInt16Array)
+    } else if (name == names.Int16Array) {
         *type = Scalar::Int16;
-    else if (name == names.Uint16Array || name == names.SharedUint16Array)
+    } else if (name == names.Uint16Array) {
         *type = Scalar::Uint16;
-    else if (name == names.Int32Array || name == names.SharedInt32Array)
+    } else if (name == names.Int32Array) {
         *type = Scalar::Int32;
-    else if (name == names.Uint32Array || name == names.SharedUint32Array)
+    } else if (name == names.Uint32Array) {
         *type = Scalar::Uint32;
-    else if (name == names.Float32Array || name == names.SharedFloat32Array)
+    } else if (name == names.Float32Array) {
         *type = Scalar::Float32;
-    else if (name == names.Float64Array || name == names.SharedFloat64Array)
+    } else if (name == names.Float64Array) {
         *type = Scalar::Float64;
-    else
+    } else if (name == names.SharedInt8Array) {
+        *shared = true;
+        *type = Scalar::Int8;
+    } else if (name == names.SharedUint8Array) {
+        *shared = true;
+        *type = Scalar::Uint8;
+    } else if (name == names.SharedInt16Array) {
+        *shared = true;
+        *type = Scalar::Int16;
+    } else if (name == names.SharedUint16Array) {
+        *shared = true;
+        *type = Scalar::Uint16;
+    } else if (name == names.SharedInt32Array) {
+        *shared = true;
+        *type = Scalar::Int32;
+    } else if (name == names.SharedUint32Array) {
+        *shared = true;
+        *type = Scalar::Uint32;
+    } else if (name == names.SharedFloat32Array) {
+        *shared = true;
+        *type = Scalar::Float32;
+    } else if (name == names.SharedFloat64Array) {
+        *shared = true;
+        *type = Scalar::Float64;
+    } else {
         return false;
+    }
     return true;
 }
 
@@ -3700,6 +3813,7 @@
 
     PropertyName *field;
     Scalar::Type type;
+    bool shared = false;
     if (ctorExpr->isKind(PNK_DOT)) {
         ParseNode *base = DotBase(ctorExpr);
 
@@ -3707,7 +3821,7 @@
             return m.failName(base, "expecting '%s.*Array", globalName);
 
         field = DotMember(ctorExpr);
-        if (!IsArrayViewCtorName(m, field, &type))
+        if (!IsArrayViewCtorName(m, field, &type, &shared))
             return m.fail(ctorExpr, "could not match typed array name");
     } else {
         if (!ctorExpr->isKind(PNK_NAME))
@@ -3728,7 +3842,10 @@
     if (!CheckNewArrayViewArgs(m, ctorExpr, bufferName))
         return false;
 
-    return m.addArrayView(varName, type, field);
+    if (!m.module().isValidViewSharedness(shared))
+        return m.failName(ctorExpr, "%s has different sharedness than previous view constructors", globalName);
+
+    return m.addArrayView(varName, type, field, shared);
 }
 
 static bool
@@ -3782,6 +3899,18 @@
 }
 
 static bool
+CheckGlobalAtomicsImport(ModuleCompiler &m, ParseNode *initNode, PropertyName *varName,
+                         PropertyName *field)
+{
+    // Atomics builtin, with the form glob.Atomics.[[builtin]]
+    AsmJSAtomicsBuiltinFunction func;
+    if (!m.lookupStandardLibraryAtomicsName(field, &func))
+        return m.failName(initNode, "'%s' is not a standard Atomics builtin", field);
+
+    return m.addAtomicsBuiltinFunction(varName, func, field);
+}
+
+static bool
 CheckGlobalSimdImport(ModuleCompiler &m, ParseNode *initNode, PropertyName *varName,
                       PropertyName *field)
 {
@@ -3817,7 +3946,7 @@
 
     if (base->isKind(PNK_DOT)) {
         ParseNode *global = DotBase(base);
-        PropertyName *mathOrSimd = DotMember(base);
+        PropertyName *mathOrAtomicsOrSimd = DotMember(base);
 
         PropertyName *globalName = m.module().globalArgumentName();
         if (!globalName)
@@ -3831,9 +3960,11 @@
             return m.failName(base, "expecting %s.*", globalName);
         }
 
-        if (mathOrSimd == m.cx()->names().Math)
+        if (mathOrAtomicsOrSimd == m.cx()->names().Math)
             return CheckGlobalMathImport(m, initNode, varName, field);
-        if (mathOrSimd == m.cx()->names().SIMD)
+        if (mathOrAtomicsOrSimd == m.cx()->names().Atomics)
+            return CheckGlobalAtomicsImport(m, initNode, varName, field);
+        if (mathOrAtomicsOrSimd == m.cx()->names().SIMD)
             return CheckGlobalSimdImport(m, initNode, varName, field);
         return m.failName(base, "expecting %s.{Math|SIMD}", globalName);
     }
@@ -3850,8 +3981,12 @@
             return m.addByteLength(varName);
 
         Scalar::Type type;
-        if (IsArrayViewCtorName(m, field, &type))
-            return m.addArrayViewCtor(varName, type, field);
+        bool shared = false;
+        if (IsArrayViewCtorName(m, field, &type, &shared)) {
+            if (!m.module().isValidViewSharedness(shared))
+                return m.failName(initNode, "'%s' has different sharedness than previous view constructors", field);
+            return m.addArrayViewCtor(varName, type, field, shared);
+        }
 
         return m.failName(initNode, "'%s' is not a standard constant or typed array name", field);
     }
@@ -4159,6 +4294,7 @@
           case ModuleCompiler::Global::Function:
           case ModuleCompiler::Global::FFI:
           case ModuleCompiler::Global::MathBuiltinFunction:
+          case ModuleCompiler::Global::AtomicsBuiltinFunction:
           case ModuleCompiler::Global::FuncPtrTable:
           case ModuleCompiler::Global::ArrayView:
           case ModuleCompiler::Global::ArrayViewCtor:
@@ -4208,18 +4344,16 @@
 }
 
 static bool
-CheckArrayAccess(FunctionCompiler &f, ParseNode *elem, Scalar::Type *viewType,
-                 MDefinition **def, NeedsBoundsCheck *needsBoundsCheck)
+CheckArrayAccess(FunctionCompiler &f, ParseNode *viewName, ParseNode *indexExpr,
+                 Scalar::Type *viewType, MDefinition **def, NeedsBoundsCheck *needsBoundsCheck)
 {
-    ParseNode *viewName = ElemBase(elem);
-    ParseNode *indexExpr = ElemIndex(elem);
     *needsBoundsCheck = NEEDS_BOUNDS_CHECK;
 
     if (!viewName->isKind(PNK_NAME))
         return f.fail(viewName, "base of array access must be a typed array view name");
 
     const ModuleCompiler::Global *global = f.lookupGlobal(viewName->name());
-    if (!global || global->which() != ModuleCompiler::Global::ArrayView)
+    if (!global || !global->isAnyArrayView())
         return f.fail(viewName, "base of array access must be a typed array view name");
 
     *viewType = global->viewType();
@@ -4316,10 +4450,10 @@
     Scalar::Type viewType;
     MDefinition *pointerDef;
     NeedsBoundsCheck needsBoundsCheck;
-    if (!CheckArrayAccess(f, elem, &viewType, &pointerDef, &needsBoundsCheck))
+    if (!CheckArrayAccess(f, ElemBase(elem), ElemIndex(elem), &viewType, &pointerDef, &needsBoundsCheck))
         return false;
 
-    *def = f.loadHeap(viewType, pointerDef, needsBoundsCheck);
+    *def = f.loadHeap(AsmJSHeapAccess::ViewType(viewType), pointerDef, needsBoundsCheck);
     *type = TypedArrayLoadType(viewType);
     return true;
 }
@@ -4360,7 +4494,11 @@
     else
         return f.fail(base, "dot access field must be a lane name (x, y, z, w) or signMask");
 
-    *type = baseType.simdToScalarType();
+    switch (baseType.simdType()) {
+      case AsmJSSimdType_int32x4:   *type = Type::Signed; break;
+      case AsmJSSimdType_float32x4: *type = Type::Float;  break;
+    }
+
     *def = f.extractSimdElement(lane, baseDef, type->toMIRType());
     return true;
 }
@@ -4371,7 +4509,7 @@
     Scalar::Type viewType;
     MDefinition *pointerDef;
     NeedsBoundsCheck needsBoundsCheck;
-    if (!CheckArrayAccess(f, lhs, &viewType, &pointerDef, &needsBoundsCheck))
+    if (!CheckArrayAccess(f, ElemBase(lhs), ElemIndex(lhs), &viewType, &pointerDef, &needsBoundsCheck))
         return false;
 
     f.enterHeapExpression();
@@ -4409,7 +4547,7 @@
         MOZ_CRASH("Unexpected view type");
     }
 
-    f.storeHeap(viewType, pointerDef, rhsDef, needsBoundsCheck);
+    f.storeHeap(AsmJSHeapAccess::ViewType(viewType), pointerDef, rhsDef, needsBoundsCheck);
 
     *def = rhsDef;
     *type = rhsType;
@@ -4621,6 +4759,195 @@
     return true;
 }
 
+static bool
+CheckSharedArrayAtomicAccess(FunctionCompiler &f, ParseNode *viewName, ParseNode *indexExpr,
+                             Scalar::Type *viewType, MDefinition** pointerDef,
+                             NeedsBoundsCheck *needsBoundsCheck)
+{
+    if (!CheckArrayAccess(f, viewName, indexExpr, viewType, pointerDef, needsBoundsCheck))
+        return false;
+
+    // Atomic accesses may be made on shared integer arrays only.
+
+    // The global will be sane, CheckArrayAccess checks it.
+    const ModuleCompiler::Global *global = f.lookupGlobal(viewName->name());
+    if (global->which() != ModuleCompiler::Global::ArrayView || !f.m().module().isSharedView())
+        return f.fail(viewName, "base of array access must be a shared typed array view name");
+
+    switch (*viewType) {
+      case Scalar::Int8:
+      case Scalar::Int16:
+      case Scalar::Int32:
+      case Scalar::Uint8:
+      case Scalar::Uint16:
+      case Scalar::Uint32:
+        return true;
+      default:
+        return f.failf(viewName, "not an integer array");
+    }
+
+    return true;
+}
+
+static bool
+CheckAtomicsFence(FunctionCompiler &f, ParseNode *call, MDefinition **def, Type *type)
+{
+    if (CallArgListLength(call) != 0)
+        return f.fail(call, "Atomics.fence must be passed 0 arguments");
+
+    f.memoryBarrier(MembarFull);
+    *type = Type::Void;
+    return true;
+}
+
+static bool
+CheckAtomicsLoad(FunctionCompiler &f, ParseNode *call, MDefinition **def, Type *type)
+{
+    if (CallArgListLength(call) != 2)
+        return f.fail(call, "Atomics.load must be passed 2 arguments");
+
+    ParseNode *arrayArg = CallArgList(call);
+    ParseNode *indexArg = NextNode(arrayArg);
+
+    Scalar::Type viewType;
+    MDefinition *pointerDef;
+    NeedsBoundsCheck needsBoundsCheck;
+    if (!CheckSharedArrayAtomicAccess(f, arrayArg, indexArg, &viewType, &pointerDef, &needsBoundsCheck))
+        return false;
+
+    *def = f.atomicLoadHeap(AsmJSHeapAccess::ViewType(viewType), pointerDef, needsBoundsCheck);
+    *type = Type::Signed;
+    return true;
+}
+
+static bool
+CheckAtomicsStore(FunctionCompiler &f, ParseNode *call, MDefinition **def, Type *type)
+{
+    if (CallArgListLength(call) != 3)
+        return f.fail(call, "Atomics.store must be passed 3 arguments");
+
+    ParseNode *arrayArg = CallArgList(call);
+    ParseNode *indexArg = NextNode(arrayArg);
+    ParseNode *valueArg = NextNode(indexArg);
+
+    Scalar::Type viewType;
+    MDefinition *pointerDef;
+    NeedsBoundsCheck needsBoundsCheck;
+    if (!CheckSharedArrayAtomicAccess(f, arrayArg, indexArg, &viewType, &pointerDef, &needsBoundsCheck))
+        return false;
+
+    MDefinition *rhsDef;
+    Type rhsType;
+    if (!CheckExpr(f, valueArg, &rhsDef, &rhsType))
+        return false;
+
+    if (!rhsType.isIntish())
+        return f.failf(arrayArg, "%s is not a subtype of intish", rhsType.toChars());
+
+    f.atomicStoreHeap(AsmJSHeapAccess::ViewType(viewType), pointerDef, rhsDef, needsBoundsCheck);
+
+    *def = rhsDef;
+    *type = Type::Signed;
+    return true;
+}
+
+static bool
+CheckAtomicsBinop(FunctionCompiler &f, ParseNode *call, MDefinition **def, Type *type, js::jit::AtomicOp op)
+{
+    if (CallArgListLength(call) != 3)
+        return f.fail(call, "Atomics binary operator must be passed 3 arguments");
+
+    ParseNode *arrayArg = CallArgList(call);
+    ParseNode *indexArg = NextNode(arrayArg);
+    ParseNode *valueArg = NextNode(indexArg);
+
+    Scalar::Type viewType;
+    MDefinition *pointerDef;
+    NeedsBoundsCheck needsBoundsCheck;
+    if (!CheckSharedArrayAtomicAccess(f, arrayArg, indexArg, &viewType, &pointerDef, &needsBoundsCheck))
+        return false;
+
+    MDefinition *valueArgDef;
+    Type valueArgType;
+    if (!CheckExpr(f, valueArg, &valueArgDef, &valueArgType))
+        return false;
+
+    if (!valueArgType.isIntish())
+        return f.failf(valueArg, "%s is not a subtype of intish", valueArgType.toChars());
+
+    *def = f.atomicBinopHeap(op, AsmJSHeapAccess::ViewType(viewType), pointerDef, valueArgDef,
+                             needsBoundsCheck);
+    *type = Type::Signed;
+    return true;
+}
+
+static bool
+CheckAtomicsCompareExchange(FunctionCompiler &f, ParseNode *call, MDefinition **def, Type *type)
+{
+    if (CallArgListLength(call) != 4)
+        return f.fail(call, "Atomics.compareExchange must be passed 4 arguments");
+
+    ParseNode *arrayArg = CallArgList(call);
+    ParseNode *indexArg = NextNode(arrayArg);
+    ParseNode *oldValueArg = NextNode(indexArg);
+    ParseNode *newValueArg = NextNode(oldValueArg);
+
+    Scalar::Type viewType;
+    MDefinition *pointerDef;
+    NeedsBoundsCheck needsBoundsCheck;
+    if (!CheckSharedArrayAtomicAccess(f, arrayArg, indexArg, &viewType, &pointerDef, &needsBoundsCheck))
+        return false;
+
+    MDefinition *oldValueArgDef;
+    Type oldValueArgType;
+    if (!CheckExpr(f, oldValueArg, &oldValueArgDef, &oldValueArgType))
+        return false;
+
+    MDefinition *newValueArgDef;
+    Type newValueArgType;
+    if (!CheckExpr(f, newValueArg, &newValueArgDef, &newValueArgType))
+        return false;
+
+    if (!oldValueArgType.isIntish())
+        return f.failf(oldValueArg, "%s is not a subtype of intish", oldValueArgType.toChars());
+
+    if (!newValueArgType.isIntish())
+        return f.failf(newValueArg, "%s is not a subtype of intish", newValueArgType.toChars());
+
+    *def = f.atomicCompareExchangeHeap(AsmJSHeapAccess::ViewType(viewType), pointerDef,
+                                       oldValueArgDef, newValueArgDef, needsBoundsCheck);
+    *type = Type::Signed;
+    return true;
+}
+
+static bool
+CheckAtomicsBuiltinCall(FunctionCompiler &f, ParseNode *callNode, AsmJSAtomicsBuiltinFunction func,
+                        MDefinition **resultDef, Type *resultType)
+{
+    switch (func) {
+      case AsmJSAtomicsBuiltin_compareExchange:
+        return CheckAtomicsCompareExchange(f, callNode, resultDef, resultType);
+      case AsmJSAtomicsBuiltin_load:
+        return CheckAtomicsLoad(f, callNode, resultDef, resultType);
+      case AsmJSAtomicsBuiltin_store:
+        return CheckAtomicsStore(f, callNode, resultDef, resultType);
+      case AsmJSAtomicsBuiltin_fence:
+        return CheckAtomicsFence(f, callNode, resultDef, resultType);
+      case AsmJSAtomicsBuiltin_add:
+        return CheckAtomicsBinop(f, callNode, resultDef, resultType, AtomicFetchAddOp);
+      case AsmJSAtomicsBuiltin_sub:
+        return CheckAtomicsBinop(f, callNode, resultDef, resultType, AtomicFetchSubOp);
+      case AsmJSAtomicsBuiltin_and:
+        return CheckAtomicsBinop(f, callNode, resultDef, resultType, AtomicFetchAndOp);
+      case AsmJSAtomicsBuiltin_or:
+        return CheckAtomicsBinop(f, callNode, resultDef, resultType, AtomicFetchOrOp);
+      case AsmJSAtomicsBuiltin_xor:
+        return CheckAtomicsBinop(f, callNode, resultDef, resultType, AtomicFetchXorOp);
+      default:
+        MOZ_CRASH("unexpected atomicsBuiltin function");
+    }
+}
+
 typedef bool (*CheckArgType)(FunctionCompiler &f, ParseNode *argNode, Type type);
 
 static bool
@@ -5023,7 +5350,7 @@
     Type formalType_;
 
   public:
-    explicit CheckArgIsSubtypeOf(Type t) : formalType_(t) {}
+    explicit CheckArgIsSubtypeOf(AsmJSSimdType t) : formalType_(t) {}
 
     bool operator()(FunctionCompiler &f, ParseNode *arg, unsigned argIndex, Type actualType,
                     MDefinition **def) const
@@ -5036,14 +5363,26 @@
     }
 };
 
+static inline Type
+SimdToCoercedScalarType(AsmJSSimdType t)
+{
+    switch (t) {
+      case AsmJSSimdType_int32x4:
+        return Type::Intish;
+      case AsmJSSimdType_float32x4:
+        return Type::Floatish;
+    }
+    MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("unexpected SIMD type");
+}
+
 class CheckSimdScalarArgs
 {
-    Type simdType_;
+    AsmJSSimdType simdType_;
     Type formalType_;
 
   public:
-    CheckSimdScalarArgs(Type simdType)
-      : simdType_(simdType), formalType_(simdType.simdToCoercedScalarType())
+    CheckSimdScalarArgs(AsmJSSimdType simdType)
+      : simdType_(simdType), formalType_(SimdToCoercedScalarType(simdType))
     {}
 
     bool operator()(FunctionCompiler &f, ParseNode *arg, unsigned argIndex, Type actualType,
@@ -5052,10 +5391,10 @@
         if (!(actualType <= formalType_)) {
             // As a special case, accept doublelit arguments to float32x4 ops by
             // re-emitting them as float32 constants.
-            if (!simdType_.isFloat32x4() || !actualType.isDoubleLit()) {
+            if (simdType_ != AsmJSSimdType_float32x4 || !actualType.isDoubleLit()) {
                 return f.failf(arg, "%s is not a subtype of %s%s",
                                actualType.toChars(), formalType_.toChars(),
-                               simdType_.isFloat32x4() ? " or doublelit" : "");
+                               simdType_ == AsmJSSimdType_float32x4 ? " or doublelit" : "");
             }
 
             AsmJSNumLit doubleLit = ExtractNumericLiteral(f.m(), arg);
@@ -5071,7 +5410,7 @@
     Type formalType_;
 
   public:
-    explicit CheckSimdSelectArgs(Type t) : formalType_(t) {}
+    explicit CheckSimdSelectArgs(AsmJSSimdType t) : formalType_(t) {}
 
     bool operator()(FunctionCompiler &f, ParseNode *arg, unsigned argIndex, Type actualType,
                     MDefinition **def) const
@@ -5093,10 +5432,10 @@
 
 class CheckSimdVectorScalarArgs
 {
-    Type formalType_;
+    AsmJSSimdType formalSimdType_;
 
   public:
-    explicit CheckSimdVectorScalarArgs(Type t) : formalType_(t) {}
+    explicit CheckSimdVectorScalarArgs(AsmJSSimdType t) : formalSimdType_(t) {}
 
     bool operator()(FunctionCompiler &f, ParseNode *arg, unsigned argIndex, Type actualType,
                     MDefinition **def) const
@@ -5104,15 +5443,15 @@
         MOZ_ASSERT(argIndex < 2);
         if (argIndex == 0) {
             // First argument is the vector
-            if (!(actualType <= formalType_)) {
+            if (!(actualType <= Type(formalSimdType_))) {
                 return f.failf(arg, "%s is not a subtype of %s", actualType.toChars(),
-                               formalType_.toChars());
+                               Type(formalSimdType_).toChars());
             }
             return true;
         }
 
         // Second argument is the scalar
-        Type coercedFormalType = formalType_.simdToCoercedScalarType();
+        Type coercedFormalType = SimdToCoercedScalarType(formalSimdType_);
         if (!(actualType <= coercedFormalType)) {
             return f.failf(arg, "%s is not a subtype of %s", actualType.toChars(),
                            coercedFormalType.toChars());
@@ -5124,82 +5463,87 @@
 } // anonymous namespace
 
 static inline bool
-CheckSimdUnary(FunctionCompiler &f, ParseNode *call, Type retType, MSimdUnaryArith::Operation op,
-               MDefinition **def, Type *type)
+CheckSimdUnary(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType,
+               MSimdUnaryArith::Operation op, MDefinition **def, Type *type)
 {
     DefinitionVector defs;
-    if (!CheckSimdCallArgs(f, call, 1, CheckArgIsSubtypeOf(retType), &defs))
+    if (!CheckSimdCallArgs(f, call, 1, CheckArgIsSubtypeOf(opType), &defs))
         return false;
-    *def = f.unarySimd(defs[0], op, retType.toMIRType());
-    *type = retType;
+    *type = opType;
+    *def = f.unarySimd(defs[0], op, type->toMIRType());
     return true;
 }
 
 template<class OpEnum>
 static inline bool
-CheckSimdBinary(FunctionCompiler &f, ParseNode *call, Type retType, OpEnum op, MDefinition **def,
-                Type *type)
+CheckSimdBinary(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType, OpEnum op,
+                MDefinition **def, Type *type)
 {
     DefinitionVector argDefs;
-    if (!CheckSimdCallArgs(f, call, 2, CheckArgIsSubtypeOf(retType), &argDefs))
+    if (!CheckSimdCallArgs(f, call, 2, CheckArgIsSubtypeOf(opType), &argDefs))
         return false;
-    *def = f.binarySimd(argDefs[0], argDefs[1], op, retType.toMIRType());
-    *type = retType;
+    *type = opType;
+    *def = f.binarySimd(argDefs[0], argDefs[1], op, type->toMIRType());
     return true;
 }
 
 template<>
 inline bool
-CheckSimdBinary<MSimdBinaryComp::Operation>(FunctionCompiler &f, ParseNode *call, Type retType,
-                                            MSimdBinaryComp::Operation op, MDefinition **def,
-                                            Type *type)
+CheckSimdBinary<MSimdBinaryComp::Operation>(FunctionCompiler &f, ParseNode *call,
+                                            AsmJSSimdType opType, MSimdBinaryComp::Operation op,
+                                            MDefinition **def, Type *type)
 {
     DefinitionVector argDefs;
-    if (!CheckSimdCallArgs(f, call, 2, CheckArgIsSubtypeOf(retType), &argDefs))
+    if (!CheckSimdCallArgs(f, call, 2, CheckArgIsSubtypeOf(opType), &argDefs))
         return false;
-    *def = f.binarySimd<MSimdBinaryComp>(argDefs[0], argDefs[1], op);
     *type = Type::Int32x4;
+    *def = f.binarySimd<MSimdBinaryComp>(argDefs[0], argDefs[1], op);
     return true;
 }
 
 template<>
 inline bool
-CheckSimdBinary<MSimdShift::Operation>(FunctionCompiler &f, ParseNode *call, Type retType,
+CheckSimdBinary<MSimdShift::Operation>(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType,
                                        MSimdShift::Operation op, MDefinition **def, Type *type)
 {
     DefinitionVector argDefs;
-    if (!CheckSimdCallArgs(f, call, 2, CheckSimdVectorScalarArgs(retType), &argDefs))
+    if (!CheckSimdCallArgs(f, call, 2, CheckSimdVectorScalarArgs(opType), &argDefs))
         return false;
-    *def = f.binarySimd<MSimdShift>(argDefs[0], argDefs[1], op);
     *type = Type::Int32x4;
+    *def = f.binarySimd<MSimdShift>(argDefs[0], argDefs[1], op);
     return true;
 }
 
 static bool
-CheckSimdWith(FunctionCompiler &f, ParseNode *call, Type retType, SimdLane lane, MDefinition **def,
-              Type *type)
+CheckSimdWith(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType, SimdLane lane,
+              MDefinition **def, Type *type)
 {
     DefinitionVector defs;
-    if (!CheckSimdCallArgs(f, call, 2, CheckSimdVectorScalarArgs(retType), &defs))
+    if (!CheckSimdCallArgs(f, call, 2, CheckSimdVectorScalarArgs(opType), &defs))
         return false;
-    *def = f.insertElementSimd(defs[0], defs[1], lane, retType.toMIRType());
-    *type = retType;
+    *type = opType;
+    *def = f.insertElementSimd(defs[0], defs[1], lane, type->toMIRType());
     return true;
 }
 
+namespace {
+// Include CheckSimdCast in unnamed namespace to avoid MSVC name lookup bug (due to the use of Type).
+
 template<class T>
 static bool
-CheckSimdCast(FunctionCompiler &f, ParseNode *call, Type fromType, Type toType, MDefinition **def,
-              Type *type)
+CheckSimdCast(FunctionCompiler &f, ParseNode *call, AsmJSSimdType fromType, AsmJSSimdType toType,
+              MDefinition **def, Type *type)
 {
     DefinitionVector defs;
     if (!CheckSimdCallArgs(f, call, 1, CheckArgIsSubtypeOf(fromType), &defs))
         return false;
-    *def = f.convertSimd<T>(defs[0], fromType.toMIRType(), toType.toMIRType());
     *type = toType;
+    *def = f.convertSimd<T>(defs[0], Type(fromType).toMIRType(), type->toMIRType());
     return true;
 }
 
+}
+
 static bool
 CheckSimdShuffleSelectors(FunctionCompiler &f, ParseNode *lane, int32_t lanes[4], uint32_t maxLane)
 {
@@ -5215,12 +5559,14 @@
 }
 
 static bool
-CheckSimdSwizzle(FunctionCompiler &f, ParseNode *call, Type retType, MDefinition **def, Type *type)
+CheckSimdSwizzle(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType, MDefinition **def,
+                 Type *type)
 {
     unsigned numArgs = CallArgListLength(call);
     if (numArgs != 5)
         return f.failf(call, "expected 5 arguments to SIMD swizzle, got %u", numArgs);
 
+    Type retType = opType;
     ParseNode *vec = CallArgList(call);
     MDefinition *vecDef;
     Type vecType;
@@ -5239,12 +5585,14 @@
 }
 
 static bool
-CheckSimdShuffle(FunctionCompiler &f, ParseNode *call, Type retType, MDefinition **def, Type *type)
+CheckSimdShuffle(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType, MDefinition **def,
+                 Type *type)
 {
     unsigned numArgs = CallArgListLength(call);
     if (numArgs != 6)
         return f.failf(call, "expected 6 arguments to SIMD shuffle, got %u", numArgs);
 
+    Type retType = opType;
     ParseNode *arg = CallArgList(call);
     MDefinition *vecs[2];
     for (unsigned i = 0; i < 2; i++, arg = NextNode(arg)) {
@@ -5266,106 +5614,215 @@
 }
 
 static bool
+CheckSimdLoadStoreArgs(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType,
+                       AsmJSHeapAccess::ViewType *viewType, MDefinition **index,
+                       NeedsBoundsCheck *needsBoundsCheck)
+{
+    ParseNode *view = CallArgList(call);
+    if (!view->isKind(PNK_NAME))
+        return f.fail(view, "expected Uint8Array view as SIMD.*.store first argument");
+
+    const ModuleCompiler::Global *global = f.lookupGlobal(view->name());
+    if (!global ||
+        global->which() != ModuleCompiler::Global::ArrayView ||
+        global->viewType() != Scalar::Uint8)
+    {
+        return f.fail(view, "expected Uint8Array view as SIMD.*.store first argument");
+    }
+
+    *needsBoundsCheck = NEEDS_BOUNDS_CHECK;
+
+    switch (opType) {
+      case AsmJSSimdType_int32x4:   *viewType = AsmJSHeapAccess::Int32x4;   break;
+      case AsmJSSimdType_float32x4: *viewType = AsmJSHeapAccess::Float32x4; break;
+    }
+
+    ParseNode *indexExpr = NextNode(view);
+    uint32_t indexLit;
+    if (IsLiteralOrConstInt(f, indexExpr, &indexLit)) {
+        if (indexLit > INT32_MAX)
+            return f.fail(indexExpr, "constant index out of range");
+
+        if (!f.m().tryRequireHeapLengthToBeAtLeast(indexLit + Simd128DataSize)) {
+            return f.failf(indexExpr, "constant index outside heap size range declared by the "
+                                      "change-heap function (0x%x - 0x%x)",
+                                      f.m().minHeapLength(), f.m().module().maxHeapLength());
+        }
+
+        *needsBoundsCheck = NO_BOUNDS_CHECK;
+        *index = f.constant(Int32Value(indexLit), Type::Int);
+        return true;
+    }
+
+    f.enterHeapExpression();
+
+    Type indexType;
+    if (!CheckExpr(f, indexExpr, index, &indexType))
+        return false;
+    if (!indexType.isIntish())
+        return f.failf(indexExpr, "%s is not a subtype of intish", indexType.toChars());
+
+    f.leaveHeapExpression();
+
+    return true;
+}
+
+static bool
+CheckSimdLoad(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType, MDefinition **def, Type *type)
+{
+    unsigned numArgs = CallArgListLength(call);
+    if (numArgs != 2)
+        return f.failf(call, "expected 2 arguments to SIMD load, got %u", numArgs);
+
+    AsmJSHeapAccess::ViewType viewType;
+    MDefinition *index;
+    NeedsBoundsCheck needsBoundsCheck;
+    if (!CheckSimdLoadStoreArgs(f, call, opType, &viewType, &index, &needsBoundsCheck))
+        return false;
+
+    *def = f.loadHeap(viewType, index, needsBoundsCheck);
+    *type = opType;
+    return true;
+}
+
+static bool
+CheckSimdStore(FunctionCompiler &f, ParseNode *call, AsmJSSimdType opType, MDefinition **def, Type *type)
+{
+    unsigned numArgs = CallArgListLength(call);
+    if (numArgs != 3)
+        return f.failf(call, "expected 3 arguments to SIMD load, got %u", numArgs);
+
+    AsmJSHeapAccess::ViewType viewType;
+    MDefinition *index;
+    NeedsBoundsCheck needsBoundsCheck;
+    if (!CheckSimdLoadStoreArgs(f, call, opType, &viewType, &index, &needsBoundsCheck))
+        return false;
+
+    Type retType = opType;
+    ParseNode *vecExpr = NextNode(NextNode(CallArgList(call)));
+    MDefinition *vec;
+    Type vecType;
+    if (!CheckExpr(f, vecExpr, &vec, &vecType))
+        return false;
+    if (!(vecType <= retType))
+        return f.failf(vecExpr, "%s is not a subtype of %s", vecType.toChars(), retType.toChars());
+
+    f.storeHeap(viewType, index, vec, needsBoundsCheck);
+    *def = vec;
+    *type = vecType;
+    return true;
+}
+
+static bool
 CheckSimdOperationCall(FunctionCompiler &f, ParseNode *call, const ModuleCompiler::Global *global,
                        MDefinition **def, Type *type)
 {
     MOZ_ASSERT(global->isSimdOperation());
 
-    Type retType = global->simdOperationType();
+    AsmJSSimdType opType = global->simdOperationType();
 
     switch (global->simdOperation()) {
       case AsmJSSimdOperation_add:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryArith::Add, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::Add, def, type);
       case AsmJSSimdOperation_sub:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryArith::Sub, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::Sub, def, type);
       case AsmJSSimdOperation_mul:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryArith::Mul, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::Mul, def, type);
       case AsmJSSimdOperation_div:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryArith::Div, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::Div, def, type);
       case AsmJSSimdOperation_max:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryArith::Max, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::Max, def, type);
       case AsmJSSimdOperation_min:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryArith::Min, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::Min, def, type);
+      case AsmJSSimdOperation_maxNum:
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::MaxNum, def, type);
+      case AsmJSSimdOperation_minNum:
+        return CheckSimdBinary(f, call, opType, MSimdBinaryArith::MinNum, def, type);
 
       case AsmJSSimdOperation_lessThan:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryComp::lessThan, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryComp::lessThan, def, type);
       case AsmJSSimdOperation_lessThanOrEqual:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryComp::lessThanOrEqual, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryComp::lessThanOrEqual, def, type);
       case AsmJSSimdOperation_equal:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryComp::equal, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryComp::equal, def, type);
       case AsmJSSimdOperation_notEqual:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryComp::notEqual, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryComp::notEqual, def, type);
       case AsmJSSimdOperation_greaterThan:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryComp::greaterThan, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryComp::greaterThan, def, type);
       case AsmJSSimdOperation_greaterThanOrEqual:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryComp::greaterThanOrEqual, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryComp::greaterThanOrEqual, def, type);
 
       case AsmJSSimdOperation_and:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryBitwise::and_, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryBitwise::and_, def, type);
       case AsmJSSimdOperation_or:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryBitwise::or_, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryBitwise::or_, def, type);
       case AsmJSSimdOperation_xor:
-        return CheckSimdBinary(f, call, retType, MSimdBinaryBitwise::xor_, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdBinaryBitwise::xor_, def, type);
 
       case AsmJSSimdOperation_withX:
-        return CheckSimdWith(f, call, retType, SimdLane::LaneX, def, type);
+        return CheckSimdWith(f, call, opType, SimdLane::LaneX, def, type);
       case AsmJSSimdOperation_withY:
-        return CheckSimdWith(f, call, retType, SimdLane::LaneY, def, type);
+        return CheckSimdWith(f, call, opType, SimdLane::LaneY, def, type);
       case AsmJSSimdOperation_withZ:
-        return CheckSimdWith(f, call, retType, SimdLane::LaneZ, def, type);
+        return CheckSimdWith(f, call, opType, SimdLane::LaneZ, def, type);
       case AsmJSSimdOperation_withW:
-        return CheckSimdWith(f, call, retType, SimdLane::LaneW, def, type);
+        return CheckSimdWith(f, call, opType, SimdLane::LaneW, def, type);
 
       case AsmJSSimdOperation_fromInt32x4:
-        return CheckSimdCast<MSimdConvert>(f, call, Type::Int32x4, retType, def, type);
+        return CheckSimdCast<MSimdConvert>(f, call, AsmJSSimdType_int32x4, opType, def, type);
       case AsmJSSimdOperation_fromInt32x4Bits:
-        return CheckSimdCast<MSimdReinterpretCast>(f, call, Type::Int32x4, retType, def, type);
+        return CheckSimdCast<MSimdReinterpretCast>(f, call, AsmJSSimdType_int32x4, opType, def, type);
       case AsmJSSimdOperation_fromFloat32x4:
-        return CheckSimdCast<MSimdConvert>(f, call, Type::Float32x4, retType, def, type);
+        return CheckSimdCast<MSimdConvert>(f, call, AsmJSSimdType_float32x4, opType, def, type);
       case AsmJSSimdOperation_fromFloat32x4Bits:
-        return CheckSimdCast<MSimdReinterpretCast>(f, call, Type::Float32x4, retType, def, type);
+        return CheckSimdCast<MSimdReinterpretCast>(f, call, AsmJSSimdType_float32x4, opType, def, type);
 
       case AsmJSSimdOperation_shiftLeft:
-        return CheckSimdBinary(f, call, Type::Int32x4, MSimdShift::lsh, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdShift::lsh, def, type);
       case AsmJSSimdOperation_shiftRight:
-        return CheckSimdBinary(f, call, Type::Int32x4, MSimdShift::rsh, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdShift::rsh, def, type);
       case AsmJSSimdOperation_shiftRightLogical:
-        return CheckSimdBinary(f, call, Type::Int32x4, MSimdShift::ursh, def, type);
+        return CheckSimdBinary(f, call, opType, MSimdShift::ursh, def, type);
 
       case AsmJSSimdOperation_abs:
-        return CheckSimdUnary(f, call, retType, MSimdUnaryArith::abs, def, type);
+        return CheckSimdUnary(f, call, opType, MSimdUnaryArith::abs, def, type);
       case AsmJSSimdOperation_neg:
-        return CheckSimdUnary(f, call, retType, MSimdUnaryArith::neg, def, type);
+        return CheckSimdUnary(f, call, opType, MSimdUnaryArith::neg, def, type);
       case AsmJSSimdOperation_not:
-        return CheckSimdUnary(f, call, retType, MSimdUnaryArith::not_, def, type);
+        return CheckSimdUnary(f, call, opType, MSimdUnaryArith::not_, def, type);
       case AsmJSSimdOperation_sqrt:
-        return CheckSimdUnary(f, call, retType, MSimdUnaryArith::sqrt, def, type);
+        return CheckSimdUnary(f, call, opType, MSimdUnaryArith::sqrt, def, type);
       case AsmJSSimdOperation_reciprocal:
-        return CheckSimdUnary(f, call, retType, MSimdUnaryArith::reciprocal, def, type);
+        return CheckSimdUnary(f, call, opType, MSimdUnaryArith::reciprocal, def, type);
       case AsmJSSimdOperation_reciprocalSqrt:
-        return CheckSimdUnary(f, call, retType, MSimdUnaryArith::reciprocalSqrt, def, type);
+        return CheckSimdUnary(f, call, opType, MSimdUnaryArith::reciprocalSqrt, def, type);
 
       case AsmJSSimdOperation_swizzle:
-        return CheckSimdSwizzle(f, call, retType, def, type);
+        return CheckSimdSwizzle(f, call, opType, def, type);
       case AsmJSSimdOperation_shuffle:
-        return CheckSimdShuffle(f, call, retType, def, type);
+        return CheckSimdShuffle(f, call, opType, def, type);
+
+      case AsmJSSimdOperation_load:
+        return CheckSimdLoad(f, call, opType, def, type);
+      case AsmJSSimdOperation_store:
+        return CheckSimdStore(f, call, opType, def, type);
 
       case AsmJSSimdOperation_splat: {
         DefinitionVector defs;
-        if (!CheckSimdCallArgs(f, call, 1, CheckSimdScalarArgs(retType), &defs))
+        if (!CheckSimdCallArgs(f, call, 1, CheckSimdScalarArgs(opType), &defs))
             return false;
-        *def = f.splatSimd(defs[0], retType.toMIRType());
-        *type = retType;
+        *type = opType;
+        *def = f.splatSimd(defs[0], type->toMIRType());
         return true;
       }
 
       case AsmJSSimdOperation_select: {
         DefinitionVector defs;
-        if (!CheckSimdCallArgs(f, call, 3, CheckSimdSelectArgs(retType), &defs))
+        if (!CheckSimdCallArgs(f, call, 3, CheckSimdSelectArgs(opType), &defs))
             return false;
+        *type = opType;
         *def = f.ternarySimd(defs[0], defs[1], defs[2], MSimdTernaryBitwise::select,
-                             retType.toMIRType());
-        *type = retType;
+                             type->toMIRType());
         return true;
       }
     }
@@ -5384,16 +5841,15 @@
         return CheckCoercionArg(f, argNode, coercion, def, type);
 
     AsmJSSimdType simdType = global->simdCtorType();
-    Type retType = simdType;
     unsigned length = SimdTypeToLength(simdType);
     DefinitionVector defs;
-    if (!CheckSimdCallArgs(f, call, length, CheckSimdScalarArgs(retType), &defs))
+    if (!CheckSimdCallArgs(f, call, length, CheckSimdScalarArgs(simdType), &defs))
         return false;
 
     // This code will need to be generalized when we handle float64x2
     MOZ_ASSERT(length == 4);
-    *def = f.constructSimd<MSimdValueX4>(defs[0], defs[1], defs[2], defs[3], retType.toMIRType());
-    *type = retType;
+    *type = simdType;
+    *def = f.constructSimd<MSimdValueX4>(defs[0], defs[1], defs[2], defs[3], type->toMIRType());
     return true;
 }
 
@@ -5406,6 +5862,8 @@
     if (IsCallToGlobal(f.m(), expr, &global)) {
         if (global->isMathFunction())
             return CheckMathBuiltinCall(f, expr, global->mathBuiltinFunction(), def, type);
+        if (global->isAtomicsFunction())
+            return CheckAtomicsBuiltinCall(f, expr, global->atomicsBuiltinFunction(), def, type);
         if (global->isSimdCtor())
             return CheckSimdCtorCall(f, expr, global, def, type);
         if (global->isSimdOperation())
@@ -5510,6 +5968,18 @@
 }
 
 static bool
+CheckCoercedAtomicsBuiltinCall(FunctionCompiler &f, ParseNode *callNode,
+                               AsmJSAtomicsBuiltinFunction func, RetType retType,
+                               MDefinition **resultDef, Type *resultType)
+{
+    MDefinition *operand;
+    Type actualRetType;
+    if (!CheckAtomicsBuiltinCall(f, callNode, func, &operand, &actualRetType))
+        return false;
+    return CoerceResult(f, callNode, retType, operand, actualRetType, resultDef, resultType);
+}
+
+static bool
 CheckCoercedCall(FunctionCompiler &f, ParseNode *call, RetType retType, MDefinition **def, Type *type)
 {
     JS_CHECK_RECURSION_DONT_REPORT(f.cx(), return f.m().failOverRecursed());
@@ -5541,6 +6011,8 @@
             return CheckFFICall(f, call, global->ffiIndex(), retType, def, type);
           case ModuleCompiler::Global::MathBuiltinFunction:
             return CheckCoercedMathBuiltinCall(f, call, global->mathBuiltinFunction(), retType, def, type);
+          case ModuleCompiler::Global::AtomicsBuiltinFunction:
+            return CheckCoercedAtomicsBuiltinCall(f, call, global->atomicsBuiltinFunction(), retType, def, type);
           case ModuleCompiler::Global::ConstantLiteral:
           case ModuleCompiler::Global::ConstantImport:
           case ModuleCompiler::Global::Variable:
@@ -7686,7 +8158,9 @@
           case ABIArg::GPR:
             masm.load32(src, iter->gpr());
             break;
-          case ABIArg::FPU:
+          case ABIArg::FPU: {
+            static_assert(sizeof(AsmJSModule::EntryArg) >= jit::Simd128DataSize,
+                          "EntryArg must be big enough to store SIMD values");
             switch (type) {
               case MIRType_Int32x4:
                 masm.loadUnalignedInt32x4(src, iter->fpu());
@@ -7705,6 +8179,7 @@
                 break;
             }
             break;
+          }
           case ABIArg::Stack:
             switch (type) {
               case MIRType_Int32:
@@ -7978,7 +8453,7 @@
     unsigned framePushed = Max(ionFrameSize, coerceFrameSize);
 
     Label begin;
-    GenerateAsmJSExitPrologue(masm, framePushed, AsmJSExit::IonFFI, &begin);
+    GenerateAsmJSExitPrologue(masm, framePushed, AsmJSExit::JitFFI, &begin);
 
     // 1. Descriptor
     size_t argOffset = offsetToIonArgs;
@@ -8026,7 +8501,7 @@
     argOffset += exit.sig().args().length() * sizeof(Value);
     MOZ_ASSERT(argOffset == offsetToIonArgs + ionArgBytes);
 
-    // 6. Ion will clobber all registers, even non-volatiles. GlobalReg and
+    // 6. Jit code will clobber all registers, even non-volatiles. GlobalReg and
     //    HeapReg are removed from the general register set for asm.js code, so
     //    these will not have been saved by the caller like all other registers,
     //    so they must be explicitly preserved. Only save GlobalReg since
@@ -8078,7 +8553,7 @@
 
     // 2. Call
     AssertStackAlignment(masm, AsmJSStackAlignment);
-    masm.callIonFromAsmJS(callee);
+    masm.callJitFromAsmJS(callee);
     AssertStackAlignment(masm, AsmJSStackAlignment);
 
     {
@@ -8150,7 +8625,7 @@
     GenerateCheckForHeapDetachment(m, ABIArgGenerator::NonReturn_VolatileReg0);
 
     Label profilingReturn;
-    GenerateAsmJSExitEpilogue(masm, framePushed, AsmJSExit::IonFFI, &profilingReturn);
+    GenerateAsmJSExitEpilogue(masm, framePushed, AsmJSExit::JitFFI, &profilingReturn);
 
     if (oolConvert.used()) {
         masm.bind(&oolConvert);
@@ -8194,7 +8669,7 @@
 
     MOZ_ASSERT(masm.framePushed() == 0);
 
-    return m.finishGeneratingIonExit(exitIndex, &begin, &profilingReturn) && !masm.oom();
+    return m.finishGeneratingJitExit(exitIndex, &begin, &profilingReturn) && !masm.oom();
 }
 
 // See "asm.js FFI calls" comment above.
@@ -8677,7 +9152,7 @@
     if (!parser.options().compileAndGo)
         return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Temporarily disabled for event-handler and other cloneable scripts");
 
-    if (cx->compartment()->debugMode())
+    if (cx->compartment()->isDebuggee())
         return Warn(parser, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by debugger");
 
     if (parser.pc->isGenerator())
@@ -8739,7 +9214,7 @@
 #else
     bool available = cx->jitSupportsFloatingPoint() &&
                      cx->gcSystemPageSize() == AsmJSPageSize &&
-                     !cx->compartment()->debugMode() &&
+                     !cx->compartment()->isDebuggee() &&
                      cx->runtime()->options().asmJS();
 #endif
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSValidate.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSValidate.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/asmjs/AsmJSValidate.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/asmjs/AsmJSValidate.h	2014-11-26 21:45:53.000000000 +0000
@@ -57,7 +57,9 @@
 // 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.
-static const size_t AsmJSMappedSize = 4 * 1024ULL * 1024ULL * 1024ULL;
+// 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;
 #endif
 
 // From the asm.js spec Linking section:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/Array.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/Array.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/Array.js	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/Array.js	2014-11-26 21:45:53.000000000 +0000
@@ -581,6 +581,50 @@
     return O;
 }
 
+// Proposed for ES7:
+// https://github.com/domenic/Array.prototype.includes/blob/master/spec.md
+function ArrayIncludes(searchElement, fromIndex = 0) {
+    // Steps 1-2.
+    var O = ToObject(this);
+
+    // Steps 3-4.
+    var len = ToLength(O.length);
+
+    // Step 5.
+    if (len === 0)
+        return false;
+
+    // Steps 6-7.
+    var n = ToInteger(fromIndex);
+
+    // Step 8.
+    var k;
+    if (n >= 0) {
+        k = n;
+    }
+    // Step 9.
+    else {
+        // Step a.
+        k = len + n;
+        // Step b.
+        if (k < 0)
+            k = 0;
+    }
+
+    // Step 10.
+    while (k < len) {
+        // Steps a-c.
+        if (SameValueZero(searchElement, O[k]))
+            return true;
+
+        // Step d.
+        k++;
+    }
+
+    // Step 11.
+    return false;
+}
+
 #define ARRAY_ITERATOR_SLOT_ITERATED_OBJECT 0
 #define ARRAY_ITERATOR_SLOT_NEXT_INDEX 1
 #define ARRAY_ITERATOR_SLOT_ITEM_KIND 2
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/Generator.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/Generator.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/Generator.js	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/Generator.js	2014-11-26 21:45:53.000000000 +0000
@@ -3,14 +3,20 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function StarGeneratorNext(val) {
-    if (!IsObject(this) || !IsStarGeneratorObject(this))
-        return callFunction(CallStarGeneratorMethodIfWrapped, this, val, "StarGeneratorNext");
+    // The IsSuspendedStarGenerator call below is not necessary for
+    // correctness. It's a performance optimization to check for the
+    // common case with a single call. It's also inlined in Baseline.
+
+    if (!IsSuspendedStarGenerator(this)) {
+	if (!IsObject(this) || !IsStarGeneratorObject(this))
+            return callFunction(CallStarGeneratorMethodIfWrapped, this, val, "StarGeneratorNext");
 
-    if (StarGeneratorObjectIsClosed(this))
-        return { value: undefined, done: true };
+	if (StarGeneratorObjectIsClosed(this))
+            return { value: undefined, done: true };
 
-    if (GeneratorIsRunning(this))
-        ThrowError(JSMSG_NESTING_GENERATOR);
+	if (GeneratorIsRunning(this))
+            ThrowError(JSMSG_NESTING_GENERATOR);
+    }
 
     try {
         return resumeGenerator(this, val, 'next');
@@ -22,14 +28,16 @@
 }
 
 function StarGeneratorThrow(val) {
-    if (!IsObject(this) || !IsStarGeneratorObject(this))
-        return callFunction(CallStarGeneratorMethodIfWrapped, this, val, "StarGeneratorThrow");
+    if (!IsSuspendedStarGenerator(this)) {
+	if (!IsObject(this) || !IsStarGeneratorObject(this))
+            return callFunction(CallStarGeneratorMethodIfWrapped, this, val, "StarGeneratorThrow");
 
-    if (StarGeneratorObjectIsClosed(this))
-        throw val;
+	if (StarGeneratorObjectIsClosed(this))
+            throw val;
 
-    if (GeneratorIsRunning(this))
-        ThrowError(JSMSG_NESTING_GENERATOR);
+	if (GeneratorIsRunning(this))
+            ThrowError(JSMSG_NESTING_GENERATOR);
+    }
 
     try {
         return resumeGenerator(this, val, 'throw');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/MapObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/MapObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/MapObject.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/MapObject.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -1250,7 +1250,8 @@
             if (done)
                 break;
             if (!pairVal.isObject()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INVALID_MAP_ITERABLE);
+                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                                     JSMSG_INVALID_MAP_ITERABLE, "Map");
                 return false;
             }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/SIMD.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/SIMD.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/SIMD.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/SIMD.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -167,7 +167,7 @@
 
 const Class SimdTypeDescr::class_ = {
     "SIMD",
-    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS),
+    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS) | JSCLASS_BACKGROUND_FINALIZE,
     JS_PropertyStub,         /* addProperty */
     JS_DeletePropertyStub,   /* delProperty */
     JS_PropertyStub,         /* getProperty */
@@ -175,7 +175,7 @@
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
-    nullptr,             /* finalize    */
+    TypeDescr::finalize,
     call,                /* call        */
     nullptr,             /* hasInstance */
     nullptr,             /* construct   */
@@ -267,6 +267,7 @@
     typeDescr->initReservedSlot(JS_DESCR_SLOT_SIZE, Int32Value(SimdTypeDescr::size(type)));
     typeDescr->initReservedSlot(JS_DESCR_SLOT_OPAQUE, BooleanValue(false));
     typeDescr->initReservedSlot(JS_DESCR_SLOT_TYPE, Int32Value(T::type));
+    typeDescr->initReservedSlot(JS_DESCR_SLOT_TRACE_LIST, PrivateValue(nullptr));
 
     if (!CreateUserSizeAndAlignmentProperties(cx, typeDescr))
         return nullptr;
@@ -508,11 +509,19 @@
 };
 template<typename T>
 struct Minimum {
-    static inline T apply(T l, T r) { return l < r ? l : r; }
+    static inline T apply(T l, T r) { return math_min_impl(l, r); }
+};
+template<typename T>
+struct MinNum {
+    static inline T apply(T l, T r) { return IsNaN(l) ? r : (IsNaN(r) ? l : math_min_impl(l, r)); }
 };
 template<typename T>
 struct Maximum {
-    static inline T apply(T l, T r) { return l > r ? l : r; }
+    static inline T apply(T l, T r) { return math_max_impl(l, r); }
+};
+template<typename T>
+struct MaxNum {
+    static inline T apply(T l, T r) { return IsNaN(l) ? r : (IsNaN(r) ? l : math_max_impl(l, r)); }
 };
 template<typename T>
 struct LessThan {
@@ -551,10 +560,6 @@
     static inline T apply(T l, T r) { return l | r; }
 };
 template<typename T>
-struct Scale {
-    static inline T apply(int32_t lane, T scalar, T x) { return scalar * x; }
-};
-template<typename T>
 struct WithX {
     static inline T apply(int32_t lane, T scalar, T x) { return lane == 0 ? scalar : x; }
 };
@@ -570,22 +575,6 @@
 struct WithW {
     static inline T apply(int32_t lane, T scalar, T x) { return lane == 3 ? scalar : x; }
 };
-template<typename T>
-struct WithFlagX {
-    static inline T apply(T l, T f, T x) { return l == 0 ? (f ? 0xFFFFFFFF : 0x0) : x; }
-};
-template<typename T>
-struct WithFlagY {
-    static inline T apply(T l, T f, T x) { return l == 1 ? (f ? 0xFFFFFFFF : 0x0) : x; }
-};
-template<typename T>
-struct WithFlagZ {
-    static inline T apply(T l, T f, T x) { return l == 2 ? (f ? 0xFFFFFFFF : 0x0) : x; }
-};
-template<typename T>
-struct WithFlagW {
-    static inline T apply(T l, T f, T x) { return l == 3 ? (f ? 0xFFFFFFFF : 0x0) : x; }
-};
 struct ShiftLeft {
     static inline int32_t apply(int32_t v, int32_t bits) { return v << bits; }
 };
@@ -971,6 +960,84 @@
     return StoreResult<Float32x4>(cx, args, result);
 }
 
+template<class VElem, unsigned NumElem>
+static bool
+TypedArrayDataPtrFromArgs(JSContext *cx, const CallArgs &args, VElem **data)
+{
+    if (!args[0].isObject())
+        return ErrorBadArgs(cx);
+
+    JSObject &argobj = args[0].toObject();
+    if (!argobj.is<TypedArrayObject>())
+        return ErrorBadArgs(cx);
+
+    Rooted<TypedArrayObject*> typedArray(cx, &argobj.as<TypedArrayObject>());
+
+    int32_t index;
+    if (!ToInt32(cx, args[1], &index))
+        return false;
+
+    int32_t byteStart = index * typedArray->bytesPerElement();
+    if (byteStart < 0 || (uint32_t(byteStart) + NumElem * sizeof(VElem)) > typedArray->byteLength())
+        return ErrorBadArgs(cx);
+
+    *data = reinterpret_cast<VElem*>(static_cast<char*>(typedArray->viewData()) + byteStart);
+    return true;
+}
+
+template<class V, unsigned NumElem>
+static bool
+Load(JSContext *cx, unsigned argc, Value *vp)
+{
+    typedef typename V::Elem Elem;
+
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() != 2)
+        return ErrorBadArgs(cx);
+
+    Elem *typedArrayData = nullptr;
+    if (!TypedArrayDataPtrFromArgs<Elem, NumElem>(cx, args, &typedArrayData))
+        return false;
+
+    Rooted<TypeDescr*> typeDescr(cx, &V::GetTypeDescr(*cx->global()));
+    MOZ_ASSERT(typeDescr);
+    Rooted<TypedObject *> result(cx, OutlineTypedObject::createZeroed(cx, typeDescr, 0));
+    if (!result)
+        return false;
+
+    Elem *dest = reinterpret_cast<Elem*>(result->typedMem());
+    for (unsigned i = 0; i < NumElem; i++)
+        dest[i] = typedArrayData[i];
+
+    args.rval().setObject(*result);
+    return true;
+}
+
+template<class V, unsigned NumElem>
+static bool
+Store(JSContext *cx, unsigned argc, Value *vp)
+{
+    typedef typename V::Elem Elem;
+
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() != 3)
+        return ErrorBadArgs(cx);
+
+    Elem *typedArrayData = nullptr;
+    if (!TypedArrayDataPtrFromArgs<Elem, NumElem>(cx, args, &typedArrayData))
+        return false;
+
+    if (!IsVectorObject<V>(args[2]))
+        return ErrorBadArgs(cx);
+
+    Elem *src = TypedObjectMemory<Elem*>(args[2]);
+    for (unsigned i = 0; i < NumElem; i++)
+        typedArrayData[i] = src[i];
+
+    args.rval().setObject(args[2].toObject());
+    return true;
+}
+
 #define DEFINE_SIMD_FLOAT32X4_FUNCTION(Name, Func, Operands, Flags) \
 bool                                                                \
 js::simd_float32x4_##Name(JSContext *cx, unsigned argc, Value *vp)  \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/SIMD.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/SIMD.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/SIMD.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/SIMD.h	2014-11-26 21:45:53.000000000 +0000
@@ -18,9 +18,6 @@
  * https://github.com/johnmccutchan/ecmascript_simd/blob/master/src/ecmascript_simd.js
  */
 
-#define FLOAT32X4_NULLARY_FUNCTION_LIST(V)                                          \
-  V(zero, (FuncZero<Float32x4>), 0, 0)
-
 #define FLOAT32X4_UNARY_FUNCTION_LIST(V)                                            \
   V(abs, (UnaryFunc<Float32x4, Abs, Float32x4>), 1, 0)                              \
   V(fromInt32x4, (FuncConvert<Int32x4, Float32x4> ), 1, 0)                          \
@@ -41,12 +38,21 @@
   V(greaterThanOrEqual, (CompareFunc<Float32x4, GreaterThanOrEqual>), 2, 0)         \
   V(lessThan, (CompareFunc<Float32x4, LessThan>), 2, 0)                             \
   V(lessThanOrEqual, (CompareFunc<Float32x4, LessThanOrEqual>), 2, 0)               \
+  V(load,    (Load<Float32x4, 4>), 2, 0)                                            \
+  V(loadXYZ, (Load<Float32x4, 3>), 2, 0)                                            \
+  V(loadXY,  (Load<Float32x4, 2>), 2, 0)                                            \
+  V(loadX,   (Load<Float32x4, 1>), 2, 0)                                            \
   V(max, (BinaryFunc<Float32x4, Maximum, Float32x4>), 2, 0)                         \
+  V(maxNum, (BinaryFunc<Float32x4, MaxNum, Float32x4>), 2, 0)                       \
   V(min, (BinaryFunc<Float32x4, Minimum, Float32x4>), 2, 0)                         \
+  V(minNum, (BinaryFunc<Float32x4, MinNum, Float32x4>), 2, 0)                       \
   V(mul, (BinaryFunc<Float32x4, Mul, Float32x4>), 2, 0)                             \
   V(notEqual, (CompareFunc<Float32x4, NotEqual>), 2, 0)                             \
   V(or, (CoercedBinaryFunc<Float32x4, Int32x4, Or, Float32x4>), 2, 0)               \
-  V(scale, (FuncWith<Float32x4, Scale>), 2, 0)                                      \
+  V(store,    (Store<Float32x4, 4>), 3, 0)                                          \
+  V(storeXYZ, (Store<Float32x4, 3>), 3, 0)                                          \
+  V(storeXY,  (Store<Float32x4, 2>), 3, 0)                                          \
+  V(storeX,   (Store<Float32x4, 1>), 3, 0)                                          \
   V(sub, (BinaryFunc<Float32x4, Sub, Float32x4>), 2, 0)                             \
   V(withX, (FuncWith<Float32x4, WithX>), 2, 0)                                      \
   V(withY, (FuncWith<Float32x4, WithY>), 2, 0)                                      \
@@ -63,15 +69,11 @@
   V(shuffle, Shuffle<Float32x4>, 3, 0)
 
 #define FLOAT32X4_FUNCTION_LIST(V)                                                  \
-  FLOAT32X4_NULLARY_FUNCTION_LIST(V)                                                \
   FLOAT32X4_UNARY_FUNCTION_LIST(V)                                                  \
   FLOAT32X4_BINARY_FUNCTION_LIST(V)                                                 \
   FLOAT32X4_TERNARY_FUNCTION_LIST(V)                                                \
   FLOAT32X4_SHUFFLE_FUNCTION_LIST(V)
 
-#define INT32X4_NULLARY_FUNCTION_LIST(V)                                            \
-  V(zero, (FuncZero<Int32x4>), 0, 0)
-
 #define INT32X4_UNARY_FUNCTION_LIST(V)                                              \
   V(fromFloat32x4, (FuncConvert<Float32x4, Int32x4>), 1, 0)                         \
   V(fromFloat32x4Bits, (FuncConvertBits<Float32x4, Int32x4>), 1, 0)                 \
@@ -84,17 +86,24 @@
   V(and, (BinaryFunc<Int32x4, And, Int32x4>), 2, 0)                                 \
   V(equal, (CompareFunc<Int32x4, Equal>), 2, 0)                                     \
   V(greaterThan, (CompareFunc<Int32x4, GreaterThan>), 2, 0)                         \
+  V(greaterThanOrEqual, (CompareFunc<Int32x4, GreaterThanOrEqual>), 2, 0)           \
   V(lessThan, (CompareFunc<Int32x4, LessThan>), 2, 0)                               \
+  V(lessThanOrEqual, (CompareFunc<Int32x4, LessThanOrEqual>), 2, 0)                 \
+  V(load,    (Load<Int32x4, 4>), 2, 0)                                              \
+  V(loadXYZ, (Load<Int32x4, 3>), 2, 0)                                              \
+  V(loadXY,  (Load<Int32x4, 2>), 2, 0)                                              \
+  V(loadX,   (Load<Int32x4, 1>), 2, 0)                                              \
   V(mul, (BinaryFunc<Int32x4, Mul, Int32x4>), 2, 0)                                 \
+  V(notEqual, (CompareFunc<Int32x4, NotEqual>), 2, 0)                               \
   V(or, (BinaryFunc<Int32x4, Or, Int32x4>), 2, 0)                                   \
   V(sub, (BinaryFunc<Int32x4, Sub, Int32x4>), 2, 0)                                 \
   V(shiftLeft, (Int32x4BinaryScalar<ShiftLeft>), 2, 0)                              \
   V(shiftRight, (Int32x4BinaryScalar<ShiftRight>), 2, 0)                            \
   V(shiftRightLogical, (Int32x4BinaryScalar<ShiftRightLogical>), 2, 0)              \
-  V(withFlagX, (FuncWith<Int32x4, WithFlagX>), 2, 0)                                \
-  V(withFlagY, (FuncWith<Int32x4, WithFlagY>), 2, 0)                                \
-  V(withFlagZ, (FuncWith<Int32x4, WithFlagZ>), 2, 0)                                \
-  V(withFlagW, (FuncWith<Int32x4, WithFlagW>), 2, 0)                                \
+  V(store,    (Store<Int32x4, 4>), 3, 0)                                            \
+  V(storeXYZ, (Store<Int32x4, 3>), 3, 0)                                            \
+  V(storeXY,  (Store<Int32x4, 2>), 3, 0)                                            \
+  V(storeX,   (Store<Int32x4, 1>), 3, 0)                                            \
   V(withX, (FuncWith<Int32x4, WithX>), 2, 0)                                        \
   V(withY, (FuncWith<Int32x4, WithY>), 2, 0)                                        \
   V(withZ, (FuncWith<Int32x4, WithZ>), 2, 0)                                        \
@@ -112,7 +121,6 @@
   V(shuffle, Shuffle<Int32x4>, 3, 0)
 
 #define INT32X4_FUNCTION_LIST(V)                                                    \
-  INT32X4_NULLARY_FUNCTION_LIST(V)                                                  \
   INT32X4_UNARY_FUNCTION_LIST(V)                                                    \
   INT32X4_BINARY_FUNCTION_LIST(V)                                                   \
   INT32X4_TERNARY_FUNCTION_LIST(V)                                                  \
@@ -136,15 +144,17 @@
     _(div)                           \
     _(max)                           \
     _(min)                           \
-    _(lessThanOrEqual)               \
-    _(notEqual)                      \
-    _(greaterThanOrEqual)
+    _(maxNum)                        \
+    _(minNum)
 #define FOREACH_COMMONX4_SIMD_OP(_)  \
     _(add)                           \
     _(sub)                           \
     _(lessThan)                      \
+    _(lessThanOrEqual)               \
     _(equal)                         \
+    _(notEqual)                      \
     _(greaterThan)                   \
+    _(greaterThanOrEqual)            \
     _(and)                           \
     _(or)                            \
     _(xor)                           \
@@ -157,7 +167,9 @@
     _(withZ)                         \
     _(withW)                         \
     _(not)                           \
-    _(neg)
+    _(neg)                           \
+    _(load)                          \
+    _(store)
 #define FORALL_SIMD_OP(_)            \
     FOREACH_INT32X4_SIMD_OP(_)       \
     FOREACH_FLOAT32X4_SIMD_OP(_)     \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/String.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/String.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/String.js	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/String.js	2014-11-26 21:45:53.000000000 +0000
@@ -4,6 +4,126 @@
 
 /*global intl_Collator: false, */
 
+/* ES6 Draft Oct 14, 2014 21.1.3.19 */
+function String_substring(start, end) {
+    // Steps 1-3.
+    CheckObjectCoercible(this);
+    var str = ToString(this);
+
+    // Step 4.
+    var len = str.length;
+
+    // Step 5.
+    var intStart = ToInteger(start);
+
+    // Step 6.
+    var intEnd = (end === undefined) ? len : ToInteger(end);
+
+    // Step 7.
+    var finalStart = std_Math_min(std_Math_max(intStart, 0), len);
+
+    // Step 8.
+    var finalEnd = std_Math_min(std_Math_max(intEnd, 0), len);
+
+    // Steps 9-10.
+    var from, to;
+    if (finalStart < finalEnd) {
+        from = finalStart;
+        to = finalEnd;
+    } else {
+        from = finalEnd;
+        to = finalStart;
+    }
+
+    // Step 11.
+    // While |from| and |to - from| are bounded to the length of |str| and this
+    // and thus definitely in the int32 range, they can still be typed as
+    // double. Eagerly truncate since SubstringKernel only accepts int32.
+    return SubstringKernel(str, from | 0, (to - from) | 0);
+}
+
+function String_static_substring(string, start, end) {
+    if (arguments.length < 1)
+        ThrowError(JSMSG_MISSING_FUN_ARG, 0, 'String.substring');
+    return callFunction(String_substring, string, start, end);
+}
+
+/* ES6 Draft Oct 14, 2014 B.2.3.1 */
+function String_substr(start, length) {
+    // Steps 1-2.
+    CheckObjectCoercible(this);
+    var str = ToString(this);
+
+    // Steps 3-4.
+    var intStart = ToInteger(start);
+
+    // Steps 5-7.
+    var size = str.length;
+    // Use |size| instead of +Infinity to avoid performing calculations with
+    // doubles. (The result is the same either way.)
+    var end = (length === undefined) ? size : ToInteger(length);
+
+    // Step 8.
+    if (intStart < 0)
+        intStart = std_Math_max(intStart + size, 0);
+
+    // Step 9.
+    var resultLength = std_Math_min(std_Math_max(end, 0), size - intStart)
+
+    // Step 10.
+    if (resultLength <= 0)
+        return "";
+
+    // Step 11.
+    // While |intStart| and |resultLength| are bounded to the length of |str|
+    // and thus definitely in the int32 range, they can still be typed as
+    // double. Eagerly truncate since SubstringKernel only accepts int32.
+    return SubstringKernel(str, intStart | 0, resultLength | 0);
+}
+
+function String_static_substr(string, start, length) {
+    if (arguments.length < 1)
+        ThrowError(JSMSG_MISSING_FUN_ARG, 0, 'String.substr');
+    return callFunction(String_substr, string, start, length);
+}
+
+/* ES6 Draft Oct 14, 2014 21.1.3.16 */
+function String_slice(start, end) {
+    // Steps 1-3.
+    CheckObjectCoercible(this);
+    var str = ToString(this);
+
+    // Step 4.
+    var len = str.length;
+
+    // Step 5.
+    var intStart = ToInteger(start);
+
+    // Step 6.
+    var intEnd = (end === undefined) ? len : ToInteger(end);
+
+    // Step 7.
+    var from = (intStart < 0) ? std_Math_max(len + intStart, 0) : std_Math_min(intStart, len);
+
+    // Step 8.
+    var to = (intEnd < 0) ? std_Math_max(len + intEnd, 0) : std_Math_min(intEnd, len);
+
+    // Step 9.
+    var span = std_Math_max(to - from, 0);
+
+    // Step 10.
+    // While |from| and |span| are bounded to the length of |str|
+    // and thus definitely in the int32 range, they can still be typed as
+    // double. Eagerly truncate since SubstringKernel only accepts int32.
+    return SubstringKernel(str, from | 0, span | 0);
+}
+
+function String_static_slice(string, start, end) {
+    if (arguments.length < 1)
+        ThrowError(JSMSG_MISSING_FUN_ARG, 0, 'String.slice');
+    return callFunction(String_slice, string, start, end);
+}
+
 /* ES6 Draft September 5, 2013 21.1.3.3 */
 function String_codePointAt(pos) {
     // Steps 1-3.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TestingFunctions.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TestingFunctions.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TestingFunctions.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TestingFunctions.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -21,6 +21,7 @@
 
 #include "asmjs/AsmJSLink.h"
 #include "asmjs/AsmJSValidate.h"
+#include "js/Debug.h"
 #include "js/HashTable.h"
 #include "js/StructuredClone.h"
 #include "js/UbiNode.h"
@@ -956,6 +957,50 @@
 }
 #endif
 
+static const js::Class FakePromiseClass = {
+    "Promise", JSCLASS_IS_ANONYMOUS,
+    JS_PropertyStub,       /* addProperty */
+    JS_DeletePropertyStub, /* delProperty */
+    JS_PropertyStub,       /* getProperty */
+    JS_StrictPropertyStub, /* setProperty */
+    JS_EnumerateStub,
+    JS_ResolveStub,
+    JS_ConvertStub
+};
+
+static bool
+MakeFakePromise(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    RootedObject scope(cx, cx->global());
+    if (!scope)
+        return false;
+
+    RootedObject obj(cx, NewObjectWithGivenProto(cx, &FakePromiseClass, nullptr, scope));
+    if (!obj)
+        return false;
+
+    JS::dbg::onNewPromise(cx, obj);
+    args.rval().setObject(*obj);
+    return true;
+}
+
+static bool
+SettleFakePromise(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (!args.requireAtLeast(cx, "settleFakePromise", 1))
+        return false;
+    if (!args[0].isObject() || args[0].toObject().getClass() != &FakePromiseClass) {
+        JS_ReportError(cx, "first argument must be a (fake) Promise object");
+        return false;
+    }
+
+    RootedObject promise(cx, &args[0].toObject());
+    JS::dbg::onPromiseSettled(cx, promise);
+    return true;
+}
+
 static unsigned finalizeCount = 0;
 
 static void
@@ -2235,6 +2280,19 @@
 "  (return NULL)."),
 #endif
 
+    JS_FN_HELP("makeFakePromise", MakeFakePromise, 0, 0,
+"makeFakePromise()",
+"  Create an object whose [[Class]] name is 'Promise' and call\n"
+"  JS::dbg::onNewPromise on it before returning it. It doesn't actually have\n"
+"  any of the other behavior associated with promises."),
+
+    JS_FN_HELP("settleFakePromise", SettleFakePromise, 1, 0,
+"settleFakePromise(promise)",
+"  'Settle' a 'promise' created by makeFakePromise(). This doesn't have any\n"
+"  observable effects outside of firing any onPromiseSettled hooks set on\n"
+"  Debugger instances that are observing the given promise's global as a\n"
+"  debuggee."),
+
     JS_FN_HELP("makeFinalizeObserver", MakeFinalizeObserver, 0, 0,
 "makeFinalizeObserver()",
 "  Get a special object whose finalization increases the counter returned\n"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObjectConstants.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObjectConstants.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObjectConstants.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObjectConstants.h	2014-11-26 21:45:53.000000000 +0000
@@ -30,23 +30,22 @@
 #define JS_DESCR_SLOT_SIZE               3  // Size in bytes, else 0
 #define JS_DESCR_SLOT_OPAQUE             4  // Atomized string representation
 #define JS_DESCR_SLOT_TYPROTO            5  // Prototype for instances, if any
+#define JS_DESCR_SLOT_TRACE_LIST         6  // List of references for use in tracing
 
 // Slots on scalars, references, and x4s
-#define JS_DESCR_SLOT_TYPE               6  // Type code
-
-// Slots on all array descriptors
-#define JS_DESCR_SLOT_ARRAY_ELEM_TYPE    6
+#define JS_DESCR_SLOT_TYPE               7  // Type code
 
 // Slots on array descriptors
-#define JS_DESCR_SLOT_ARRAY_LENGTH 7
+#define JS_DESCR_SLOT_ARRAY_ELEM_TYPE    7
+#define JS_DESCR_SLOT_ARRAY_LENGTH       8
 
 // Slots on struct type objects
-#define JS_DESCR_SLOT_STRUCT_FIELD_NAMES 6
-#define JS_DESCR_SLOT_STRUCT_FIELD_TYPES 7
-#define JS_DESCR_SLOT_STRUCT_FIELD_OFFSETS 8
+#define JS_DESCR_SLOT_STRUCT_FIELD_NAMES 7
+#define JS_DESCR_SLOT_STRUCT_FIELD_TYPES 8
+#define JS_DESCR_SLOT_STRUCT_FIELD_OFFSETS 9
 
 // Maximum number of slots for any descriptor
-#define JS_DESCR_SLOTS                   9
+#define JS_DESCR_SLOTS                   10
 
 // These constants are for use exclusively in JS code. In C++ code,
 // prefer TypeRepresentation::Scalar etc, which allows you to
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObject.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObject.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -29,6 +29,7 @@
 using mozilla::AssertedCast;
 using mozilla::CheckedInt32;
 using mozilla::DebugOnly;
+using mozilla::PodCopy;
 
 using namespace js;
 
@@ -116,6 +117,7 @@
                  HandleTypeDescr typeObj,
                  HandleTypedObject typedObj,
                  int32_t offset,
+                 HandleAtom name,
                  HandleValue val)
 {
     RootedFunction func(
@@ -124,14 +126,18 @@
         return false;
 
     InvokeArgs args(cx);
-    if (!args.init(4))
+    if (!args.init(5))
         return false;
 
     args.setCallee(ObjectValue(*func));
     args[0].setObject(*typeObj);
     args[1].setObject(*typedObj);
     args[2].setInt32(offset);
-    args[3].set(val);
+    if (name)
+        args[3].setString(name);
+    else
+        args[3].setNull();
+    args[4].set(val);
 
     return Invoke(cx, args);
 }
@@ -140,7 +146,7 @@
 ConvertAndCopyTo(JSContext *cx, HandleTypedObject typedObj, HandleValue val)
 {
     Rooted<TypeDescr*> type(cx, &typedObj->typeDescr());
-    return ConvertAndCopyTo(cx, type, typedObj, 0, val);
+    return ConvertAndCopyTo(cx, type, typedObj, 0, NullPtr(), val);
 }
 
 /*
@@ -229,7 +235,7 @@
 
 const Class js::ScalarTypeDescr::class_ = {
     "Scalar",
-    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS),
+    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS) | JSCLASS_BACKGROUND_FINALIZE,
     JS_PropertyStub,       /* addProperty */
     JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
@@ -237,7 +243,7 @@
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
-    nullptr,
+    TypeDescr::finalize,
     ScalarTypeDescr::call,
     nullptr,
     nullptr,
@@ -325,7 +331,7 @@
 
 const Class js::ReferenceTypeDescr::class_ = {
     "Reference",
-    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS),
+    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS) | JSCLASS_BACKGROUND_FINALIZE,
     JS_PropertyStub,       /* addProperty */
     JS_DeletePropertyStub, /* delProperty */
     JS_PropertyStub,       /* getProperty */
@@ -333,7 +339,7 @@
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
-    nullptr,
+    TypeDescr::finalize,
     ReferenceTypeDescr::call,
     nullptr,
     nullptr,
@@ -507,7 +513,7 @@
 
 const Class ArrayTypeDescr::class_ = {
     "ArrayType",
-    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS),
+    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS) | JSCLASS_BACKGROUND_FINALIZE,
     JS_PropertyStub,
     JS_DeletePropertyStub,
     JS_PropertyStub,
@@ -515,7 +521,7 @@
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
-    nullptr,
+    TypeDescr::finalize,
     nullptr,
     nullptr,
     TypedObject::construct,
@@ -602,6 +608,9 @@
     return true;
 }
 
+static bool
+CreateTraceList(JSContext *cx, HandleTypeDescr descr);
+
 ArrayTypeDescr *
 ArrayMetaTypeDescr::create(JSContext *cx,
                            HandleObject arrayTypePrototype,
@@ -648,6 +657,9 @@
     if (!LinkConstructorAndPrototype(cx, obj, prototypeObj))
         return nullptr;
 
+    if (!CreateTraceList(cx, obj))
+        return nullptr;
+
     return obj;
 }
 
@@ -735,7 +747,7 @@
 
 const Class StructTypeDescr::class_ = {
     "StructType",
-    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS),
+    JSCLASS_HAS_RESERVED_SLOTS(JS_DESCR_SLOTS) | JSCLASS_BACKGROUND_FINALIZE,
     JS_PropertyStub,
     JS_DeletePropertyStub,
     JS_PropertyStub,
@@ -743,7 +755,7 @@
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
-    nullptr, /* finalize */
+    TypeDescr::finalize,
     nullptr, /* call */
     nullptr, /* hasInstance */
     TypedObject::construct,
@@ -1004,6 +1016,9 @@
     if (!LinkConstructorAndPrototype(cx, descr, prototypeObj))
         return nullptr;
 
+    if (!CreateTraceList(cx, descr))
+        return nullptr;
+
     return descr;
 }
 
@@ -1198,6 +1213,9 @@
         return false;
     }
 
+    if (!CreateTraceList(cx, descr))
+        return false;
+
     return true;
 }
 
@@ -1504,6 +1522,11 @@
 void
 OutlineTypedObject::setOwnerAndData(JSObject *owner, uint8_t *data)
 {
+    // Make sure we don't associate with array buffers whose data is from an
+    // inline typed object, see obj_trace.
+    MOZ_ASSERT_IF(owner && owner->is<ArrayBufferObject>(),
+                  !owner->as<ArrayBufferObject>().forInlineTypedObject());
+
     // Typed objects cannot move from one owner to another, so don't worry
     // about pre barriers during this initialization.
     owner_ = owner;
@@ -1547,6 +1570,14 @@
     MOZ_ASSERT(offset >= 0);
     MOZ_ASSERT((size_t) (offset + size()) <= buffer.byteLength());
 
+    // If the owner's data is from an inline typed object, associate this with
+    // the inline typed object instead, to simplify tracing.
+    if (buffer.forInlineTypedObject()) {
+        InlineTypedObject &realOwner = buffer.firstView()->as<InlineTypedObject>();
+        attach(cx, realOwner, offset);
+        return;
+    }
+
     buffer.setHasTypedObjectViews();
 
     if (!buffer.addView(cx, this))
@@ -1676,22 +1707,29 @@
     gc::MarkObjectUnbarriered(trc, &typedObj.owner_, "typed object owner");
     JSObject *owner = typedObj.owner_;
 
-    uint8_t *mem = typedObj.outOfLineTypedMem();
+    uint8_t *oldData = typedObj.outOfLineTypedMem();
+    uint8_t *newData = oldData;
 
     // Update the data pointer if the owner moved and the owner's data is
-    // inline with it.
+    // inline with it. Note that an array buffer pointing to data in an inline
+    // typed object will never be used as an owner for another outline typed
+    // object. In such cases, the owner will be the inline typed object itself.
+    MOZ_ASSERT_IF(owner->is<ArrayBufferObject>(),
+                  !owner->as<ArrayBufferObject>().forInlineTypedObject());
     if (owner != oldOwner &&
         (owner->is<InlineTypedObject>() ||
          owner->as<ArrayBufferObject>().hasInlineData()))
     {
-        mem += reinterpret_cast<uint8_t *>(owner) - reinterpret_cast<uint8_t *>(oldOwner);
-        typedObj.setData(mem);
+        newData += reinterpret_cast<uint8_t *>(owner) - reinterpret_cast<uint8_t *>(oldOwner);
+        typedObj.setData(newData);
+
+        trc->runtime()->gc.nursery.maybeSetForwardingPointer(trc, oldData, newData, /* direct = */ false);
     }
 
     if (!descr.opaque() || !typedObj.maybeForwardedIsAttached())
         return;
 
-    descr.traceInstances(trc, mem, 1);
+    descr.traceInstances(trc, newData, 1);
 }
 
 bool
@@ -1959,7 +1997,8 @@
 
         size_t offset = descr->fieldOffset(fieldIndex);
         Rooted<TypeDescr*> fieldType(cx, &descr->fieldDescr(fieldIndex));
-        return ConvertAndCopyTo(cx, fieldType, typedObj, offset, vp);
+        RootedAtom fieldName(cx, &descr->fieldName(fieldIndex));
+        return ConvertAndCopyTo(cx, fieldType, typedObj, offset, fieldName, vp);
       }
     }
 
@@ -2013,7 +2052,7 @@
     Rooted<TypeDescr*> elementType(cx);
     elementType = &descr->as<ArrayTypeDescr>().elementType();
     size_t offset = elementType->size() * index;
-    return ConvertAndCopyTo(cx, elementType, typedObj, offset, vp);
+    return ConvertAndCopyTo(cx, elementType, typedObj, offset, NullPtr(), vp);
 }
 
 bool
@@ -2245,6 +2284,11 @@
 {
     InlineTypedObject &typedObj = object->as<InlineTypedObject>();
 
+    // Inline transparent objects do not have references and do not need to be
+    // traced. If they have an entry in the compartment's LazyArrayBufferTable,
+    // tracing that reference will be taken care of by the table itself.
+    MOZ_ASSERT(typedObj.is<InlineOpaqueTypedObject>());
+
     // When this is called for compacting GC, the related objects we touch here
     // may not have had their slots updated yet.
     TypeDescr &descr = typedObj.maybeForwardedTypeDescr();
@@ -2252,6 +2296,25 @@
     descr.traceInstances(trc, typedObj.inlineTypedMem(), 1);
 }
 
+/* static */ void
+InlineTypedObject::objectMovedDuringMinorGC(JSTracer *trc, JSObject *dst, JSObject *src)
+{
+    // Inline typed object element arrays can be preserved on the stack by Ion
+    // and need forwarding pointers created during a minor GC. We can't do this
+    // in the trace hook because we don't have any stale data to determine
+    // whether this object moved and where it was moved from.
+    TypeDescr &descr = dst->as<InlineTypedObject>().typeDescr();
+    if (descr.kind() == type::Array) {
+        // The forwarding pointer can be direct as long as there is enough
+        // space for it. Other objects might point into the object's buffer,
+        // but they will not set any direct forwarding pointers.
+        uint8_t *oldData = reinterpret_cast<uint8_t *>(src) + offsetOfDataStart();
+        uint8_t *newData = dst->as<InlineTypedObject>().inlineTypedMem();
+        trc->runtime()->gc.nursery.maybeSetForwardingPointer(trc, oldData, newData,
+                                                             descr.size() >= sizeof(uintptr_t));
+    }
+}
+
 ArrayBufferObject *
 InlineTransparentTypedObject::getOrCreateBuffer(JSContext *cx)
 {
@@ -2412,7 +2475,7 @@
 
 DEFINE_TYPEDOBJ_CLASS(OutlineTransparentTypedObject, OutlineTypedObject::obj_trace);
 DEFINE_TYPEDOBJ_CLASS(OutlineOpaqueTypedObject,      OutlineTypedObject::obj_trace);
-DEFINE_TYPEDOBJ_CLASS(InlineTransparentTypedObject,  InlineTypedObject::obj_trace);
+DEFINE_TYPEDOBJ_CLASS(InlineTransparentTypedObject,  nullptr);
 DEFINE_TYPEDOBJ_CLASS(InlineOpaqueTypedObject,       InlineTypedObject::obj_trace);
 
 static int32_t
@@ -2822,21 +2885,27 @@
 
 #define JS_STORE_REFERENCE_CLASS_IMPL(_constant, T, _name)                      \
 bool                                                                            \
-js::StoreReference##T::Func(ThreadSafeContext *, unsigned argc, Value *vp)      \
+js::StoreReference##T::Func(ThreadSafeContext *cx, unsigned argc, Value *vp)    \
 {                                                                               \
     CallArgs args = CallArgsFromVp(argc, vp);                                   \
-    MOZ_ASSERT(args.length() == 3);                                             \
+    MOZ_ASSERT(args.length() == 4);                                             \
     MOZ_ASSERT(args[0].isObject() && args[0].toObject().is<TypedObject>());     \
     MOZ_ASSERT(args[1].isInt32());                                              \
+    MOZ_ASSERT(args[2].isString() || args[2].isNull());                         \
                                                                                 \
     TypedObject &typedObj = args[0].toObject().as<TypedObject>();               \
     int32_t offset = args[1].toInt32();                                         \
                                                                                 \
+    jsid id = args[2].isString()                                                \
+              ? types::IdToTypeId(AtomToId(&args[2].toString()->asAtom()))      \
+              : JSID_VOID;                                                      \
+                                                                                \
     /* Should be guaranteed by the typed objects API: */                        \
     MOZ_ASSERT(offset % MOZ_ALIGNOF(T) == 0);                                   \
                                                                                 \
     T *target = reinterpret_cast<T*>(typedObj.typedMem(offset));                \
-    store(target, args[2]);                                                     \
+    if (!store(cx, target, args[3], &typedObj, id))                             \
+        return false;                                                           \
     args.rval().setUndefined();                                                 \
     return true;                                                                \
 }                                                                               \
@@ -2896,24 +2965,54 @@
 // differs, we abstract it away using specialized variants of the
 // private methods `store()` and `load()`.
 
-void
-StoreReferenceHeapValue::store(HeapValue *heap, const Value &v)
+bool
+StoreReferenceHeapValue::store(ThreadSafeContext *cx, HeapValue *heap, const Value &v,
+                               TypedObject *obj, jsid id)
 {
+    // Undefined values are not included in type inference information for
+    // value properties of typed objects, as these properties are always
+    // considered to contain undefined.
+    if (!v.isUndefined()) {
+        if (cx->isJSContext())
+            types::AddTypePropertyId(cx->asJSContext(), obj, id, v);
+        else if (!types::HasTypePropertyId(obj, id, v))
+            return false;
+    }
+
     *heap = v;
+    return true;
 }
 
-void
-StoreReferenceHeapPtrObject::store(HeapPtrObject *heap, const Value &v)
+bool
+StoreReferenceHeapPtrObject::store(ThreadSafeContext *cx, HeapPtrObject *heap, const Value &v,
+                                   TypedObject *obj, jsid id)
 {
     MOZ_ASSERT(v.isObjectOrNull()); // or else Store_object is being misused
+
+    // Null pointers are not included in type inference information for
+    // object properties of typed objects, as these properties are always
+    // considered to contain null.
+    if (v.isObject()) {
+        if (cx->isJSContext())
+            types::AddTypePropertyId(cx->asJSContext(), obj, id, v);
+        else if (!types::HasTypePropertyId(obj, id, v))
+            return false;
+    }
+
     *heap = v.toObjectOrNull();
+    return true;
 }
 
-void
-StoreReferenceHeapPtrString::store(HeapPtrString *heap, const Value &v)
+bool
+StoreReferenceHeapPtrString::store(ThreadSafeContext *cx, HeapPtrString *heap, const Value &v,
+                                   TypedObject *obj, jsid id)
 {
     MOZ_ASSERT(v.isString()); // or else Store_string is being misused
+
+    // Note: string references are not reflected in type information for the object.
     *heap = v.toString();
+
+    return true;
 }
 
 void
@@ -2997,7 +3096,8 @@
 ///////////////////////////////////////////////////////////////////////////
 // Initializing instances
 
-namespace js {
+namespace {
+
 class MemoryInitVisitor {
     const JSRuntime *rt_;
 
@@ -3008,10 +3108,11 @@
 
     void visitReference(ReferenceTypeDescr &descr, uint8_t *mem);
 };
-} // namespace js
+
+} // anonymous namespace
 
 void
-js::MemoryInitVisitor::visitReference(ReferenceTypeDescr &descr, uint8_t *mem)
+MemoryInitVisitor::visitReference(ReferenceTypeDescr &descr, uint8_t *mem)
 {
     switch (descr.type()) {
       case ReferenceTypeDescr::TYPE_ANY:
@@ -3064,7 +3165,8 @@
 ///////////////////////////////////////////////////////////////////////////
 // Tracing instances
 
-namespace js {
+namespace {
+
 class MemoryTracingVisitor {
     JSTracer *trace_;
 
@@ -3076,10 +3178,11 @@
 
     void visitReference(ReferenceTypeDescr &descr, uint8_t *mem);
 };
-} // namespace js
+
+} // anonymous namespace
 
 void
-js::MemoryTracingVisitor::visitReference(ReferenceTypeDescr &descr, uint8_t *mem)
+MemoryTracingVisitor::visitReference(ReferenceTypeDescr &descr, uint8_t *mem)
 {
     switch (descr.type()) {
       case ReferenceTypeDescr::TYPE_ANY:
@@ -3122,3 +3225,83 @@
     }
 }
 
+namespace {
+
+struct TraceListVisitor {
+    typedef Vector<int32_t, 0, SystemAllocPolicy> VectorType;
+    VectorType stringOffsets, objectOffsets, valueOffsets;
+
+    void visitReference(ReferenceTypeDescr &descr, uint8_t *mem);
+
+    bool fillList(Vector<int32_t> &entries);
+};
+
+} // anonymous namespace
+
+void
+TraceListVisitor::visitReference(ReferenceTypeDescr &descr, uint8_t *mem)
+{
+    VectorType *offsets;
+    switch (descr.type()) {
+      case ReferenceTypeDescr::TYPE_ANY: offsets = &valueOffsets; break;
+      case ReferenceTypeDescr::TYPE_OBJECT: offsets = &objectOffsets; break;
+      case ReferenceTypeDescr::TYPE_STRING: offsets = &stringOffsets; break;
+      default: MOZ_CRASH("Invalid kind");
+    }
+
+    if (!offsets->append((uintptr_t) mem))
+        CrashAtUnhandlableOOM("TraceListVisitor::visitReference");
+}
+
+bool
+TraceListVisitor::fillList(Vector<int32_t> &entries)
+{
+    return entries.appendAll(stringOffsets) &&
+           entries.append(-1) &&
+           entries.appendAll(objectOffsets) &&
+           entries.append(-1) &&
+           entries.appendAll(valueOffsets) &&
+           entries.append(-1);
+}
+
+static bool
+CreateTraceList(JSContext *cx, HandleTypeDescr descr)
+{
+    // Trace lists are only used for inline typed objects. We don't use them
+    // for larger objects, both to limit the size of the trace lists and
+    // because tracing outline typed objects is considerably more complicated
+    // than inline ones.
+    if ((size_t) descr->size() > InlineTypedObject::MaximumSize || descr->transparent()) {
+        descr->initReservedSlot(JS_DESCR_SLOT_TRACE_LIST, PrivateValue(nullptr));
+        return true;
+    }
+
+    TraceListVisitor visitor;
+    visitReferences(*descr, nullptr, visitor);
+
+    Vector<int32_t> entries(cx);
+    if (!visitor.fillList(entries))
+        return false;
+
+    // Trace lists aren't necessary for descriptors with no references.
+    MOZ_ASSERT(entries.length() >= 3);
+    if (entries.length() == 3) {
+        descr->initReservedSlot(JS_DESCR_SLOT_TRACE_LIST, PrivateValue(nullptr));
+        return true;
+    }
+
+    int32_t *list = cx->pod_malloc<int32_t>(entries.length());
+    if (!list)
+        return false;
+
+    PodCopy(list, entries.begin(), entries.length());
+
+    descr->initReservedSlot(JS_DESCR_SLOT_TRACE_LIST, PrivateValue(list));
+    return true;
+}
+
+/* static */ void
+TypeDescr::finalize(FreeOp *fop, JSObject *obj)
+{
+    js_free(const_cast<int32_t *>(obj->as<TypeDescr>().traceList()));
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObject.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObject.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObject.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObject.h	2014-11-26 21:45:53.000000000 +0000
@@ -196,8 +196,24 @@
         return getReservedSlot(JS_DESCR_SLOT_SIZE).toInt32();
     }
 
+    // Type descriptors may contain a list of their references for use during
+    // scanning. Marking code is optimized to use this list to mark inline
+    // typed objects, rather than the slower trace hook. This list is only
+    // specified when (a) the descriptor is short enough that it can fit in an
+    // InlineTypedObject, and (b) the descriptor contains at least one
+    // reference. Otherwise it is null.
+    //
+    // The list is three consecutive arrays of int32_t offsets, with each array
+    // terminated by -1. The arrays store offsets of string, object, and value
+    // references in the descriptor, in that order.
+    const int32_t *traceList() const {
+        return reinterpret_cast<int32_t *>(getReservedSlot(JS_DESCR_SLOT_TRACE_LIST).toPrivate());
+    }
+
     void initInstances(const JSRuntime *rt, uint8_t *mem, size_t length);
     void traceInstances(JSTracer *trace, uint8_t *mem, size_t length);
+
+    static void finalize(FreeOp *fop, JSObject *obj);
 };
 
 typedef Handle<TypeDescr*> HandleTypeDescr;
@@ -725,7 +741,11 @@
         size_t nbytes = descr->size();
         MOZ_ASSERT(nbytes <= MaximumSize);
 
-        size_t dataSlots = AlignBytes(nbytes, sizeof(Value) / sizeof(Value));
+        if (nbytes <= sizeof(NativeObject) - sizeof(TypedObject))
+            return gc::FINALIZE_OBJECT0;
+        nbytes -= sizeof(NativeObject) - sizeof(TypedObject);
+
+        size_t dataSlots = AlignBytes(nbytes, sizeof(Value)) / sizeof(Value);
         MOZ_ASSERT(nbytes <= dataSlots * sizeof(Value));
         return gc::GetGCObjectKind(dataSlots);
     }
@@ -737,6 +757,7 @@
     }
 
     static void obj_trace(JSTracer *trace, JSObject *object);
+    static void objectMovedDuringMinorGC(JSTracer *trc, JSObject *dst, JSObject *src);
 
     static size_t offsetOfDataStart() {
         return offsetof(InlineTypedObject, data_);
@@ -906,9 +927,9 @@
 };
 
 /*
- * Usage: Store_Any(targetDatum, targetOffset, value)
- *        Store_Object(targetDatum, targetOffset, value)
- *        Store_string(targetDatum, targetOffset, value)
+ * Usage: Store_Any(targetDatum, targetOffset, fieldName, value)
+ *        Store_Object(targetDatum, targetOffset, fieldName, value)
+ *        Store_string(targetDatum, targetOffset, fieldName, value)
  *
  * Intrinsic function. Stores `value` into the memory referenced by
  * `targetDatum` at the offset `targetOffset`.
@@ -916,12 +937,13 @@
  * Assumes (and asserts) that:
  * - `targetDatum` is attached
  * - `targetOffset` is a valid offset within the bounds of `targetDatum`
- * - `value` is an object (`Store_Object`) or string (`Store_string`).
+ * - `value` is an object or null (`Store_Object`) or string (`Store_string`).
  */
 #define JS_STORE_REFERENCE_CLASS_DEFN(_constant, T, _name)                    \
 class StoreReference##T {                                                     \
   private:                                                                    \
-    static void store(T* heap, const Value &v);                               \
+    static bool store(ThreadSafeContext *cx, T* heap, const Value &v,         \
+                      TypedObject *obj, jsid id);                             \
                                                                               \
   public:                                                                     \
     static bool Func(ThreadSafeContext *cx, unsigned argc, Value *vp);        \
@@ -984,6 +1006,20 @@
            class_ == &InlineOpaqueTypedObject::class_;
 }
 
+inline bool
+IsOutlineTypedObjectClass(const Class *class_)
+{
+    return class_ == &OutlineOpaqueTypedObject::class_ ||
+           class_ == &OutlineTransparentTypedObject::class_;
+}
+
+inline bool
+IsInlineTypedObjectClass(const Class *class_)
+{
+    return class_ == &InlineOpaqueTypedObject::class_ ||
+           class_ == &InlineTransparentTypedObject::class_;
+}
+
 inline const Class *
 GetOutlineTypedObjectClass(bool opaque)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObject.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObject.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/TypedObject.js	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/TypedObject.js	2014-11-26 21:45:53.000000000 +0000
@@ -181,7 +181,7 @@
 // Writes `fromValue` into the `typedObj` at offset `offset`, adapting
 // it to `descr` as needed. This is the most general entry point
 // and works for any type.
-function TypedObjectSet(descr, typedObj, offset, fromValue) {
+function TypedObjectSet(descr, typedObj, offset, name, fromValue) {
   if (!TypedObjectIsAttached(typedObj))
     ThrowError(JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED);
 
@@ -191,7 +191,7 @@
     return;
 
   case JS_TYPEREPR_REFERENCE_KIND:
-    TypedObjectSetReference(descr, typedObj, offset, fromValue);
+    TypedObjectSetReference(descr, typedObj, offset, name, fromValue);
     return;
 
   case JS_TYPEREPR_SIMD_KIND:
@@ -217,7 +217,7 @@
       var fieldDescr = fieldDescrs[i];
       var fieldOffset = fieldOffsets[i];
       var fieldValue = fromValue[fieldName];
-      TypedObjectSet(fieldDescr, typedObj, offset + fieldOffset, fieldValue);
+      TypedObjectSet(fieldDescr, typedObj, offset + fieldOffset, fieldName, fieldValue);
     }
     return;
   }
@@ -241,7 +241,7 @@
     var elemSize = DESCR_SIZE(elemDescr);
     var elemOffset = offset;
     for (var i = 0; i < length; i++) {
-      TypedObjectSet(elemDescr, typedObj, elemOffset, fromValue[i]);
+      TypedObjectSet(elemDescr, typedObj, elemOffset, null, fromValue[i]);
       elemOffset += elemSize;
     }
   }
@@ -293,18 +293,18 @@
   return undefined;
 }
 
-function TypedObjectSetReference(descr, typedObj, offset, fromValue) {
+function TypedObjectSetReference(descr, typedObj, offset, name, fromValue) {
   var type = DESCR_TYPE(descr);
   switch (type) {
   case JS_REFERENCETYPEREPR_ANY:
-    return Store_Any(typedObj, offset, fromValue);
+    return Store_Any(typedObj, offset, name, fromValue);
 
   case JS_REFERENCETYPEREPR_OBJECT:
     var value = (fromValue === null ? fromValue : ToObject(fromValue));
-    return Store_Object(typedObj, offset, value);
+    return Store_Object(typedObj, offset, name, value);
 
   case JS_REFERENCETYPEREPR_STRING:
-    return Store_string(typedObj, offset, ToString(fromValue));
+    return Store_string(typedObj, offset, name, ToString(fromValue));
   }
 
   assert(false, "Unhandled scalar type: " + type);
@@ -351,6 +351,7 @@
 function ConvertAndCopyTo(destDescr,
                           destTypedObj,
                           destOffset,
+                          fieldName,
                           fromValue)
 {
   assert(IsObject(destDescr) && ObjectIsTypeDescr(destDescr),
@@ -361,7 +362,7 @@
   if (!TypedObjectIsAttached(destTypedObj))
     ThrowError(JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED);
 
-  TypedObjectSet(destDescr, destTypedObj, destOffset, fromValue);
+  TypedObjectSet(destDescr, destTypedObj, destOffset, fieldName, fromValue);
 }
 
 // Wrapper for use from C++ code.
@@ -791,7 +792,7 @@
   // and a depth of 2, we get
   //    grainType = T
   //    iterationSpace = [5, 4]
-  var [iterationSpace, grainType, totalLength] =
+  var {iterationSpace, grainType, totalLength} =
     ComputeIterationSpace(arrayType, depth, len);
 
   // Create a zeroed instance with no data
@@ -815,7 +816,7 @@
     var r = callFunction(std_Function_apply, func, undefined, indices);
     callFunction(std_Array_pop, indices);
     if (r !== undefined)
-      TypedObjectSet(grainType, result, outOffset, r); // result[...indices] = r;
+      TypedObjectSet(grainType, result, outOffset, null, r); // result[...indices] = r;
 
     // Increment indices.
     IncrementIterationSpace(indices, iterationSpace);
@@ -845,7 +846,9 @@
       ThrowError(JSMSG_TYPEDOBJECT_ARRAYTYPE_BAD_ARGS);
     }
   }
-  return [iterationSpace, grainType, totalLength];
+  return { iterationSpace: iterationSpace,
+           grainType: grainType,
+           totalLength: totalLength };
 }
 
 function IncrementIterationSpace(indices, iterationSpace) {
@@ -916,7 +919,7 @@
       var r = func(element, i, inArray, out);
 
       if (r !== undefined)
-        TypedObjectSet(outGrainType, result, outOffset, r); // result[i] = r
+        TypedObjectSet(outGrainType, result, outOffset, null, r); // result[i] = r
     }
 
     // Update offset and (implicitly) increment indices.
@@ -937,11 +940,11 @@
 
   // Compute iteration space for input and output and check for compatibility.
   var inputType = TypeOfTypedObject(inArray);
-  var [inIterationSpace, inGrainType, _] =
+  var {iterationSpace:inIterationSpace, grainType:inGrainType} =
     ComputeIterationSpace(inputType, depth, inArray.length);
   if (!IsObject(inGrainType) || !ObjectIsTypeDescr(inGrainType))
     ThrowError(JSMSG_TYPEDOBJECT_BAD_ARGS);
-  var [iterationSpace, outGrainType, totalLength] =
+  var {iterationSpace, grainType:outGrainType, totalLength} =
     ComputeIterationSpace(outputType, depth, outputType.length);
   for (var i = 0; i < depth; i++)
     if (inIterationSpace[i] !== iterationSpace[i])
@@ -976,7 +979,7 @@
       // Invoke: var r = func(element, ...indices, collection, out);
       var r = func(element, i, inArray, out);
       if (r !== undefined)
-        TypedObjectSet(outGrainType, result, outOffset, r); // result[i] = r
+        TypedObjectSet(outGrainType, result, outOffset, null, r); // result[i] = r
 
       // Update offsets and (implicitly) increment indices.
       inOffset += inUnitSize;
@@ -1011,7 +1014,7 @@
       callFunction(std_Array_push, args, inArray, out);
       var r = callFunction(std_Function_apply, func, void 0, args);
       if (r !== undefined)
-        TypedObjectSet(outGrainType, result, outOffset, r); // result[...indices] = r
+        TypedObjectSet(outGrainType, result, outOffset, null, r); // result[...indices] = r
 
       // Update offsets and explicitly increment indices.
       inOffset += inUnitSize;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/Utilities.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/Utilities.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/builtin/Utilities.js	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/builtin/Utilities.js	2014-11-26 21:45:53.000000000 +0000
@@ -32,6 +32,7 @@
 // The few items below here are either self-hosted or installing them under a
 // std_Foo name would require ugly contortions, so they just get aliased here.
 var std_Array_indexOf = ArrayIndexOf;
+var std_String_substring = String_substring;
 // WeakMap is a bare constructor without properties or methods.
 var std_WeakMap = WeakMap;
 // StopIteration is a bare constructor without properties or methods.
@@ -102,6 +103,11 @@
     return std_Math_min(v, 0x1fffffffffffff);
 }
 
+// Spec: ECMAScript Draft, 6th edition Oct 14, 2014, 7.2.4.
+function SameValueZero(x, y) {
+    return x === y || (x !== x && y !== y);
+}
+
 /********** Testing code **********/
 
 #ifdef ENABLE_PARALLEL_JS
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/configure.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/configure.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/configure.in	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/configure.in	2014-11-26 21:45:53.000000000 +0000
@@ -1189,6 +1189,7 @@
     # -Wint-to-pointer-cast - catches cast to pointer from integer of different size
     # -Wmissing-braces - catches aggregate initializers missing nested braces
     # -Wmultichar - catches multicharacter integer constants like 'THIS'
+    # -Wnon-literal-null-conversion - catches expressions used as a null pointer constant
     # -Wnonnull - catches NULL used with functions arguments marked as non-null
     # -Wparentheses - catches `if (a=b)` and operator precedence bugs
     # -Wpointer-arith - catches pointer arithmetic using NULL or sizeof(void)
@@ -1232,6 +1233,8 @@
         _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=trigraphs"
         _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=unknown-pragmas"
         _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Werror=write-strings"
+
+        MOZ_C_SUPPORTS_WARNING(-Werror=, non-literal-null-conversion, ac_c_has_werror_non_literal_null_conversion)
     fi
 
     # Turn off the following warnings that -Wall turns on:
@@ -1291,6 +1294,7 @@
     # -Wignored-qualifiers - catches returns types with qualifiers like const
     # -Wint-to-pointer-cast - catches cast to pointer from integer of different size
     # -Wmissing-braces - catches aggregate initializers missing nested braces
+    # -Wnon-literal-null-conversion - catches expressions used as a null pointer constant
     # -Woverloaded-virtual - function declaration hides virtual function from base class
     # -Wparentheses - catches `if (a=b)` and operator precedence bugs
     # -Wpointer-arith - catches pointer arithmetic using NULL or sizeof(void)
@@ -1333,6 +1337,7 @@
         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Werror=write-strings"
 
         MOZ_CXX_SUPPORTS_WARNING(-Werror=, conversion-null, ac_cxx_has_werror_conversion_null)
+        MOZ_CXX_SUPPORTS_WARNING(-Werror=, non-literal-null-conversion, ac_cxx_has_werror_non_literal_null_conversion)
     fi
 
     # Turn off the following warnings that -Wall turns on:
@@ -1765,7 +1770,7 @@
         if test "$CPU_ARCH" = "x86"; then
             WIN32_SUBSYSTEM_VERSION=5.01
         else
-            WIN32_SUBSYSTEM_VERSION=5.02
+            WIN32_SUBSYSTEM_VERSION=6.01
         fi
         WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
         WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
@@ -3970,7 +3975,17 @@
 dnl JavaScript shell
 dnl ========================================================
 
-AC_CHECK_HEADERS(malloc.h malloc/malloc.h)
+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
+MALLOC_H=
+
+for file in $MALLOC_HEADERS; do
+  MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
+  if test "$MALLOC_H" != ""; then
+    AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
+    break
+  fi
+done
+
 AC_CHECK_FUNCS(setlocale localeconv malloc_size malloc_usable_size)
 
 AC_SUBST(MOZILLA_VERSION)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/devtools/rootAnalysis/analyzeRoots.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/devtools/rootAnalysis/analyzeRoots.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/devtools/rootAnalysis/analyzeRoots.js	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/devtools/rootAnalysis/analyzeRoots.js	2014-11-26 21:45:53.000000000 +0000
@@ -421,7 +421,7 @@
 
 function computePrintedLines(functionName)
 {
-    assert(!system("xdbfind src_body.xdb '" + functionName + "' > " + tmpfile));
+    assert(!os.system("xdbfind src_body.xdb '" + functionName + "' > " + tmpfile));
     var lines = snarf(tmpfile).split('\n');
 
     for (var body of functionBodies)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/doc/Debugger/Debugger.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/doc/Debugger/Debugger.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/doc/Debugger/Debugger.md	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/doc/Debugger/Debugger.md	2014-11-26 21:45:53.000000000 +0000
@@ -81,12 +81,20 @@
 
 <code>onNewScript(<i>script</i>, <i>global</i>)</code>
 :   New code, represented by the [`Debugger.Script`][script] instance
-    <i>script</i>, has been loaded in the scope of the debuggee global
-    object <i>global</i>. <i>global</i> is a [`Debugger.Object`][object]
-    instance whose referent is the global object.
+    <i>script</i>, has been loaded in the scope of the debuggees.
 
     This method's return value is ignored.
 
+<code>onNewPromise(<i>promise</i>)</code>
+:   A new Promise object, referenced by the [`Debugger.Object`][object] instance
+    *promise*, has been allocated in the scope of the debuggees.
+
+    This handler method should return a [resumption value][rv] specifying how
+    the debuggee's execution should proceed. However, note that a <code>{ return:
+    <i>value</i> }</code> resumption value is treated like `undefined` ("continue
+    normally"); <i>value</i> is ignored. (Allowing the handler to substitute
+    its own value for the new global object doesn't seem useful.)
+
 <code>onDebuggerStatement(<i>frame</i>)</code>
 :   Debuggee code has executed a <i>debugger</i> statement in <i>frame</i>.
     This method should return a [resumption value][rv] specifying how the
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/doc/Debugger/Debugger.Source.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/doc/Debugger/Debugger.Source.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/doc/Debugger/Debugger.Source.md	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/doc/Debugger/Debugger.Source.md	2014-11-26 21:45:53.000000000 +0000
@@ -85,6 +85,11 @@
     specially formatted comment in the JavaScript source code, or via a
     header in the HTTP reply that carried the generated JavaScript.)
 
+    This property is writable, so you can change the source map URL by
+    setting it. All Debugger.Source objects referencing the same
+    source will see the change. Setting an empty string has no affect
+    and will not change existing value.
+
 `element`
 :   The [`Debugger.Object`][object] instance referring to the DOM element to which
     this source code belongs, if any, or `undefined` if it belongs to no DOM
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/ds/LifoAlloc.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/ds/LifoAlloc.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/ds/LifoAlloc.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/ds/LifoAlloc.h	2014-11-26 21:45:53.000000000 +0000
@@ -383,6 +383,14 @@
         return n;
     }
 
+    // Get the total size of the arena chunks (including unused space).
+    size_t computedSizeOfExcludingThis() const {
+        size_t n = 0;
+        for (BumpChunk *chunk = first; chunk; chunk = chunk->next())
+            n += chunk->computedSizeOfIncludingThis();
+        return n;
+    }
+
     // Like sizeOfExcludingThis(), but includes the size of the LifoAlloc itself.
     size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const {
         return mallocSizeOf(this) + sizeOfExcludingThis(mallocSizeOf);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/BytecodeCompiler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/BytecodeCompiler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/BytecodeCompiler.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/BytecodeCompiler.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -55,6 +55,7 @@
 SetSourceMap(ExclusiveContext *cx, TokenStream &tokenStream, ScriptSource *ss)
 {
     if (tokenStream.hasSourceMapURL()) {
+        MOZ_ASSERT(!ss->hasSourceMapURL());
         if (!ss->setSourceMapURL(cx, tokenStream.sourceMapURL()))
             return false;
     }
@@ -414,6 +415,13 @@
      * header) override any source map urls passed as comment pragmas.
      */
     if (options.sourceMapURL()) {
+        // Warn about the replacement, but use the new one.
+        if (ss->hasSourceMapURL()) {
+            if(!parser.report(ParseWarning, false, nullptr, JSMSG_ALREADY_HAS_PRAGMA,
+                              ss->filename(), "//# sourceMappingURL"))
+                return nullptr;
+        }
+
         if (!ss->setSourceMapURL(cx, options.sourceMapURL()))
             return nullptr;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/BytecodeEmitter.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/BytecodeEmitter.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/BytecodeEmitter.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/BytecodeEmitter.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -1679,30 +1679,18 @@
         return true;
     }
 
-    /*
-     * Turn attempts to mutate const-declared bindings into get ops (for
-     * pre-increment and pre-decrement ops, our caller will have to emit
-     * JSOP_POS, JSOP_ONE, and JSOP_ADD as well).
-     *
-     * Turn JSOP_DELNAME into JSOP_FALSE if dn is known, as all declared
-     * bindings visible to the compiler are permanent in JS unless the
-     * declaration originates at top level in eval code.
-     */
+    // Throw an error on attempts to mutate const-declared bindings.
     switch (op) {
       case JSOP_NAME:
       case JSOP_SETCONST:
         break;
       default:
         if (pn->isConst()) {
-            if (bce->sc->needStrictChecks()) {
-                JSAutoByteString name;
-                if (!AtomToPrintableString(cx, pn->pn_atom, &name) ||
-                    !bce->reportStrictModeError(pn, JSMSG_READ_ONLY, name.ptr()))
-                {
-                    return false;
-                }
-            }
-            pn->setOp(op = JSOP_NAME);
+            JSAutoByteString name;
+            if (!AtomToPrintableString(cx, pn->pn_atom, &name))
+                return false;
+            bce->reportError(pn, JSMSG_BAD_CONST_ASSIGN, name.ptr());
+            return false;
         }
     }
 
@@ -3017,7 +3005,10 @@
 
     SET_UINT24(bce->code(off), yieldIndex);
 
-    return bce->yieldOffsetList.append(bce->offset());
+    if (!bce->yieldOffsetList.append(bce->offset()))
+        return false;
+
+    return Emit1(cx, bce, JSOP_DEBUGAFTERYIELD) >= 0;
 }
 
 bool
@@ -3314,10 +3305,6 @@
             if (!BindNameToSlot(cx, bce, pn))
                 return false;
 
-            // Allow 'const [x,y] = o', make 'const x,y; [x,y] = o' a nop.
-            if (pn->isConst() && !pn->isDefn())
-                return Emit1(cx, bce, JSOP_POP) >= 0;
-
             switch (pn->getOp()) {
               case JSOP_SETNAME:
               case JSOP_SETGNAME:
@@ -3422,6 +3409,10 @@
 static bool
 EmitIteratorNext(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn=nullptr)
 {
+    MOZ_ASSERT(bce->emitterMode != BytecodeEmitter::SelfHosting,
+               ".next() iteration is prohibited in self-hosted code because it "
+               "can run user-modifiable iteration code");
+
     if (Emit1(cx, bce, JSOP_DUP) < 0)                          // ... ITER ITER
         return false;
     if (!EmitAtomOp(cx, cx->names().next, JSOP_CALLPROP, bce)) // ... ITER NEXT
@@ -4079,13 +4070,6 @@
     /* Finally, emit the specialized assignment bytecode. */
     switch (lhs->getKind()) {
       case PNK_NAME:
-        if (lhs->isConst()) {
-            if (!rhs) {
-                bce->reportError(lhs, JSMSG_BAD_FOR_LEFTSIDE);
-                return false;
-            }
-            break;
-        }
         if (lhs->isOp(JSOP_SETARG) || lhs->isOp(JSOP_SETLOCAL) || lhs->isOp(JSOP_SETALIASEDVAR)) {
             if (!EmitVarOp(cx, lhs, lhs->getOp(), bce))
                 return false;
@@ -4825,6 +4809,7 @@
     MOZ_ASSERT_IF(type == STMT_SPREAD, !pn);
 
     ParseNode *forHead = pn ? pn->pn_left : nullptr;
+    ParseNode *forHeadExpr = forHead ? forHead->pn_kid3 : nullptr;
     ParseNode *forBody = pn ? pn->pn_right : nullptr;
 
     ParseNode *pn1 = forHead ? forHead->pn_kid1 : nullptr;
@@ -4837,7 +4822,7 @@
         // current result object.
 
         // Compile the object expression to the right of 'of'.
-        if (!EmitTree(cx, bce, forHead->pn_kid3))
+        if (!EmitTree(cx, bce, forHeadExpr))
             return false;
         if (!EmitIterator(cx, bce))
             return false;
@@ -4917,7 +4902,7 @@
 
     // COME FROM the beginning of the loop to here.
     SetJumpOffsetAt(bce, jmp);
-    if (!EmitLoopEntry(cx, bce, nullptr))
+    if (!EmitLoopEntry(cx, bce, forHeadExpr))
         return false;
 
     if (type == STMT_FOR_OF_LOOP) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/Parser.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/Parser.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/Parser.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/Parser.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -514,6 +514,8 @@
     sawDeprecatedDestructuringForIn(false),
     sawDeprecatedLegacyGenerator(false),
     sawDeprecatedExpressionClosure(false),
+    sawDeprecatedLetBlock(false),
+    sawDeprecatedLetExpression(false),
     handler(cx, *alloc, tokenStream, foldConstants, syntaxParser, lazyOuterFunction)
 {
     {
@@ -2438,6 +2440,11 @@
     if (!pn)
         return null();
 
+    // Our tokenStream has no current token, so pn's position is garbage.
+    // Substitute the position of the first token in our source.
+    if (!tokenStream.peekTokenPos(&pn->pn_pos))
+        return null();
+
     Directives directives(/* strict = */ strict);
     FunctionBox *funbox = newFunctionBox(pn, fun, /* outerpc = */ nullptr, directives,
                                          generatorKind);
@@ -3642,7 +3649,7 @@
              * the return value of the expression.
              */
             needExprStmt = true;
-            letContext = LetExpresion;
+            letContext = LetExpression;
         }
     }
 
@@ -3652,11 +3659,16 @@
         if (!expr)
             return null();
         MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_LET);
+        sawDeprecatedLetBlock = true;
     } else {
-        MOZ_ASSERT(letContext == LetExpresion);
+        MOZ_ASSERT(letContext == LetExpression);
         expr = assignExpr();
         if (!expr)
             return null();
+
+        sawDeprecatedLetExpression = true;
+        if (!report(ParseWarning, pc->sc->strict, expr, JSMSG_DEPRECATED_LET_EXPRESSION))
+            return null();
     }
     handler.setLexicalScopeBody(block, expr);
     PopStatementPC(tokenStream, pc);
@@ -4333,7 +4345,7 @@
         break;
 
       case TOK_NAME:
-        // Handle the form |export a} in the same way as |export let a|, by
+        // Handle the form |export a| in the same way as |export let a|, by
         // acting as if we've just seen the let keyword. Simply unget the token
         // and fall through.
         tokenStream.ungetToken();
@@ -4360,7 +4372,6 @@
     return SyntaxParseHandler::NodeFailure;
 }
 
-
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::expressionStatement()
@@ -4607,7 +4618,7 @@
                 if (!tokenStream.peekToken(&tt))
                     return null();
                 if (tt == TOK_LP) {
-                    pn1 = letBlock(LetExpresion);
+                    pn1 = letBlock(LetExpression);
                 } else {
                     isForDecl = true;
                     blockObj = StaticBlockObject::create(context);
@@ -5807,7 +5818,10 @@
 
       case TOK_YIELD: {
         TokenKind next;
-        if (!tokenStream.peekToken(&next))
+        TokenStream::Modifier modifier = yieldExpressionsSupported()
+                                         ? TokenStream::Operand
+                                         : TokenStream::None;
+        if (!tokenStream.peekToken(&next, modifier))
             return null();
         if (next == TOK_COLON) {
             if (!checkYieldNameValidity())
@@ -6166,7 +6180,7 @@
             return stringLiteral();
     }
 
-    if (tt == TOK_YIELD && (versionNumber() >= JSVERSION_1_7 || pc->isGenerator()))
+    if (tt == TOK_YIELD && yieldExpressionsSupported())
         return yieldExpression();
 
     tokenStream.ungetToken();
@@ -8072,7 +8086,7 @@
         return objectLiteral();
 
       case TOK_LET:
-        return letBlock(LetExpresion);
+        return letBlock(LetExpression);
 
       case TOK_LP:
         return parenExprOrGeneratorComprehension();
@@ -8327,6 +8341,8 @@
         DeprecatedDestructuringForIn = 1, // JS 1.7 only
         DeprecatedLegacyGenerator = 2,    // JS 1.7+
         DeprecatedExpressionClosure = 3,  // Added in JS 1.8, but not version-gated
+        DeprecatedLetBlock = 4,           // Added in JS 1.7, but not version-gated
+        DeprecatedLetExpression = 5,      // Added in JS 1.7, but not version-gated
     };
 
     // Hazard analysis can't tell that the telemetry callbacks don't GC.
@@ -8341,6 +8357,10 @@
         (*cb)(JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, DeprecatedLegacyGenerator);
     if (sawDeprecatedExpressionClosure)
         (*cb)(JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, DeprecatedExpressionClosure);
+    if (sawDeprecatedLetBlock)
+        (*cb)(JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, DeprecatedLetBlock);
+    if (sawDeprecatedLetExpression)
+        (*cb)(JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, DeprecatedLetExpression);
 }
 
 template class Parser<FullParseHandler>;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/Parser.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/Parser.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/Parser.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/Parser.h	2014-11-26 21:45:53.000000000 +0000
@@ -325,7 +325,7 @@
 
 class CompExprTransplanter;
 
-enum LetContext { LetExpresion, LetStatement };
+enum LetContext { LetExpression, LetStatement };
 enum VarContext { HoistVars, DontHoistVars };
 enum FunctionType { Getter, Setter, Normal };
 
@@ -377,6 +377,8 @@
     bool sawDeprecatedDestructuringForIn:1;
     bool sawDeprecatedLegacyGenerator:1;
     bool sawDeprecatedExpressionClosure:1;
+    bool sawDeprecatedLetBlock:1;
+    bool sawDeprecatedLetExpression:1;
 
     typedef typename ParseHandler::Node Node;
     typedef typename ParseHandler::DefinitionNode DefinitionNode;
@@ -506,6 +508,9 @@
     // whether it's prohibited due to strictness, JS version, or occurrence
     // inside a star generator.
     bool checkYieldNameValidity();
+    bool yieldExpressionsSupported() {
+        return versionNumber() >= JSVERSION_1_7 || pc->isGenerator();
+    }
 
     virtual bool strictMode() { return pc->sc->strict; }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/TokenStream.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/TokenStream.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/frontend/TokenStream.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/frontend/TokenStream.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -1161,8 +1161,12 @@
 
         tp = newToken(-1);
 
-        // '$' and '_' don't pass IsLetter, but they're < 128 so never appear here.
-        JS_STATIC_ASSERT('$' < 128 && '_' < 128);
+        static_assert('$' < 128,
+                      "IdentifierStart contains '$', but as !IsLetter('$'), "
+                      "ensure that '$' is never handled here");
+        static_assert('_' < 128,
+                      "IdentifierStart contains '_', but as !IsLetter('_'), "
+                      "ensure that '_' is never handled here");
         if (IsLetter(c)) {
             identStart = userbuf.addressOfNextRawChar() - 1;
             hadUnicodeEscape = false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/GCInternals.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/GCInternals.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/GCInternals.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/GCInternals.h	2014-11-26 21:45:53.000000000 +0000
@@ -147,7 +147,6 @@
 };
 #endif
 
-
 } /* namespace gc */
 } /* namespace js */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/GCRuntime.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/GCRuntime.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/GCRuntime.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/GCRuntime.h	2014-11-26 21:45:53.000000000 +0000
@@ -37,6 +37,11 @@
 struct AutoPrepareForTracing;
 class AutoTraceSession;
 
+#ifdef JSGC_COMPACTING
+struct ArenasToUpdate;
+struct MovingTracer;
+#endif
+
 class ChunkPool
 {
     Chunk *head_;
@@ -47,22 +52,28 @@
 
     size_t count() const { return count_; }
 
-    /* Must be called with the GC lock taken. */
-    inline Chunk *get(JSRuntime *rt);
+    Chunk *head() { MOZ_ASSERT(head_); return head_; }
+    Chunk *pop();
+    void push(Chunk *chunk);
+    Chunk *remove(Chunk *chunk);
 
-    /* Must be called either during the GC or with the GC lock taken. */
-    inline void put(Chunk *chunk);
+#ifdef DEBUG
+    bool contains(Chunk *chunk) const;
+    bool verify() const;
+#endif
 
-    class Enum {
+    // Pool mutation does not invalidate an Iter unless the mutation
+    // is of the Chunk currently being visited by the Iter.
+    class Iter {
       public:
-        explicit Enum(ChunkPool &pool) : pool(pool), chunkp(&pool.head_) {}
-        bool empty() { return !*chunkp; }
-        Chunk *front();
-        inline void popFront();
-        inline void removeAndPopFront();
+        explicit Iter(ChunkPool &pool) : current_(pool.head_) {}
+        bool done() const { return !current_; }
+        void next();
+        Chunk *get() const { return current_; }
+        operator Chunk *() const { return get(); }
+        Chunk *operator->() const { return get(); }
       private:
-        ChunkPool &pool;
-        Chunk **chunkp;
+        Chunk *current_;
     };
 };
 
@@ -233,6 +244,39 @@
 template<typename F>
 class CallbackVector : public Vector<Callback<F>, 4, SystemAllocPolicy> {};
 
+template <typename T, typename Iter0, typename Iter1>
+class ChainedIter
+{
+    Iter0 iter0_;
+    Iter1 iter1_;
+
+  public:
+    ChainedIter(const Iter0 &iter0, const Iter1 &iter1)
+      : iter0_(iter0), iter1_(iter1)
+    {}
+
+    bool done() const { return iter0_.done() && iter1_.done(); }
+    void next() {
+        MOZ_ASSERT(!done());
+        if (!iter0_.done()) {
+            iter0_.next();
+        } else {
+            MOZ_ASSERT(!iter1_.done());
+            iter1_.next();
+        }
+    }
+    T get() const {
+        MOZ_ASSERT(!done());
+        if (!iter0_.done())
+            return iter0_.get();
+        MOZ_ASSERT(!iter1_.done());
+        return iter1_.get();
+    }
+
+    operator T() const { return get(); }
+    T operator->() const { return get(); }
+};
+
 class GCRuntime
 {
   public:
@@ -302,10 +346,12 @@
     void notifyDidPaint();
     void shrinkBuffers();
     void onOutOfMallocMemory();
+    void onOutOfMallocMemory(const AutoLockGC &lock);
 
 #ifdef JS_GC_ZEAL
     const void *addressOfZealMode() { return &zealMode; }
     void setZeal(uint8_t zeal, uint32_t frequency);
+    bool parseAndSetZeal(const char *str);
     void setNextScheduled(uint32_t count);
     void verifyPreBarriers();
     void verifyPostBarriers();
@@ -456,12 +502,16 @@
     inline void updateOnFreeArenaAlloc(const ChunkInfo &info);
     inline void updateOnArenaFree(const ChunkInfo &info);
 
-    GCChunkSet::Range allChunks() { return chunkSet.all(); }
-    Chunk **getAvailableChunkList();
-    void moveChunkToFreePool(Chunk *chunk, const AutoLockGC &lock);
-    bool hasChunk(Chunk *chunk) { return chunkSet.has(chunk); }
+    ChunkPool &fullChunks(const AutoLockGC &lock) { return fullChunks_; }
+    ChunkPool &availableChunks(const AutoLockGC &lock) { return availableChunks_; }
     ChunkPool &emptyChunks(const AutoLockGC &lock) { return emptyChunks_; }
+    const ChunkPool &fullChunks(const AutoLockGC &lock) const { return fullChunks_; }
+    const ChunkPool &availableChunks(const AutoLockGC &lock) const { return availableChunks_; }
     const ChunkPool &emptyChunks(const AutoLockGC &lock) const { return emptyChunks_; }
+    typedef ChainedIter<Chunk *, ChunkPool::Iter, ChunkPool::Iter> NonEmptyChunksIter;
+    NonEmptyChunksIter allNonEmptyChunks() {
+        return NonEmptyChunksIter(ChunkPool::Iter(availableChunks_), ChunkPool::Iter(fullChunks_));
+    }
 
 #ifdef JS_GC_ZEAL
     void startVerifyPreBarriers();
@@ -502,9 +552,8 @@
      * Return the list of chunks that can be released outside the GC lock.
      * Must be called either during the GC or with the GC lock taken.
      */
-    Chunk *expireEmptyChunkPool(bool shrinkBuffers, const AutoLockGC &lock);
+    ChunkPool expireEmptyChunkPool(bool shrinkBuffers, const AutoLockGC &lock);
     void freeEmptyChunks(JSRuntime *rt, const AutoLockGC &lock);
-    void freeChunkList(Chunk *chunkListHead);
     void prepareToFreeChunk(ChunkInfo &info);
     void releaseChunk(Chunk *chunk);
 
@@ -513,7 +562,6 @@
     inline bool wantBackgroundAllocation(const AutoLockGC &lock) const;
     void startBackgroundAllocTaskIfIdle();
 
-    bool initZeal();
     void requestMajorGC(JS::gcreason::Reason reason);
     void collect(bool incremental, SliceBudget &budget, JSGCInvocationKind gckind,
                  JS::gcreason::Reason reason);
@@ -549,18 +597,22 @@
     void endSweepPhase(bool lastGC);
     void sweepZones(FreeOp *fop, bool lastGC);
     void decommitAllWithoutUnlocking(const AutoLockGC &lock);
-    void decommitArenas(const AutoLockGC &lock);
-    void expireChunksAndArenas(bool shouldShrink, const AutoLockGC &lock);
-    void sweepBackgroundThings();
+    void decommitArenas(AutoLockGC &lock);
+    void expireChunksAndArenas(bool shouldShrink, AutoLockGC &lock);
+    void queueZonesForBackgroundSweep(js::gc::ZoneList& zones);
+    void sweepBackgroundThings(js::gc::ZoneList &zones, ThreadType threadType);
     void assertBackgroundSweepingFinished();
     bool shouldCompact();
+    bool compactPhase(bool lastGC);
 #ifdef JSGC_COMPACTING
     void sweepTypesAfterCompacting(Zone *zone);
     void sweepZoneAfterCompacting(Zone *zone);
-    void compactPhase(bool lastGC);
     ArenaHeader *relocateArenas();
+    void updateAllCellPointersParallel(ArenasToUpdate &source);
+    void updateAllCellPointersSerial(MovingTracer *trc, ArenasToUpdate &source);
     void updatePointersToRelocatedCells();
     void releaseRelocatedArenas(ArenaHeader *relocatedList);
+    void releaseRelocatedArenasWithoutUnlocking(ArenaHeader *relocatedList, const AutoLockGC& lock);
 #ifdef DEBUG
     void protectRelocatedArenas(ArenaHeader *relocatedList);
     void unprotectRelocatedArenas(ArenaHeader *relocatedList);
@@ -607,22 +659,23 @@
     GCSchedulingState schedulingState;
 
   private:
-    /*
-     * Set of all GC chunks with at least one allocated thing. The
-     * conservative GC uses it to quickly check if a possible GC thing points
-     * into an allocated chunk.
-     */
-    js::GCChunkSet chunkSet;
-
-    /*
-     * Doubly-linked lists of chunks from user and system compartments. The GC
-     * allocates its arenas from the corresponding list and when all arenas
-     * in the list head are taken, then the chunk is removed from the list.
-     * During the GC when all arenas in a chunk become free, that chunk is
-     * removed from the list and scheduled for release.
-     */
-    js::gc::Chunk *availableChunkListHead;
-    js::gc::ChunkPool emptyChunks_;
+    // When empty, chunks reside in the emptyChunks pool and are re-used as
+    // needed or eventually expired if not re-used. The emptyChunks pool gets
+    // refilled from the background allocation task heuristically so that empty
+    // chunks should always available for immediate allocation without syscalls.
+    ChunkPool             emptyChunks_;
+
+    // Chunks which have had some, but not all, of their arenas allocated live
+    // in the available chunk lists. When all available arenas in a chunk have
+    // been allocated, the chunk is removed from the available list and moved
+    // to the fullChunks pool. During a GC, if all arenas are free, the chunk
+    // is moved back to the emptyChunks pool and scheduled for eventual
+    // release.
+    ChunkPool             availableChunks_;
+
+    // When all arenas in a chunk are used, it is moved to the fullChunks pool
+    // so as to reduce the cost of operations on the available lists.
+    ChunkPool             fullChunks_;
 
     js::RootedValueMap rootsHash;
 
@@ -706,9 +759,8 @@
     /* Whether any black->gray edges were found during marking. */
     bool foundBlackGrayEdges;
 
-    /* List head of zones to be swept in the background. */
-    JS::Zone *sweepingZones;
-
+    /* Singly linekd list of zones to be swept in the background. */
+    js::gc::ZoneList backgroundSweepZones;
     /*
      * Free LIFO blocks are transferred to this allocator before being freed on
      * the background GC thread.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Heap.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Heap.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Heap.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Heap.h	2014-11-26 21:45:53.000000000 +0000
@@ -631,6 +631,9 @@
     inline void setNextAllocDuringSweep(ArenaHeader *aheader);
     inline void unsetAllocDuringSweep();
 
+    inline void setNextArenaToUpdate(ArenaHeader *aheader);
+    inline ArenaHeader *getNextArenaToUpdateAndUnlink();
+
     void unmarkAll();
 
 #ifdef JSGC_COMPACTING
@@ -742,9 +745,17 @@
 /* The chunk header (located at the end of the chunk to preserve arena alignment). */
 struct ChunkInfo
 {
+    void init() {
+        next = prev = nullptr;
+        age = 0;
+    }
+
+  private:
+    friend class ChunkPool;
     Chunk           *next;
-    Chunk           **prevp;
+    Chunk           *prev;
 
+  public:
     /* Free arenas are linked together with aheader.next. */
     ArenaHeader     *freeArenasHead;
 
@@ -942,14 +953,12 @@
         return info.numArenasFree != 0;
     }
 
-    inline void addToAvailableList(JSRuntime *rt);
-    inline void insertToAvailableList(Chunk **insertPoint);
-    inline void removeFromAvailableList();
-
     ArenaHeader *allocateArena(JSRuntime *rt, JS::Zone *zone, AllocKind kind,
                                const AutoLockGC &lock);
 
-    void releaseArena(JSRuntime *rt, ArenaHeader *aheader, const AutoLockGC &lock);
+    enum ArenaDecommitState { IsCommitted = false, IsDecommitted = true };
+    void releaseArena(JSRuntime *rt, ArenaHeader *aheader, const AutoLockGC &lock,
+                      ArenaDecommitState state = IsCommitted);
     void recycleArena(ArenaHeader *aheader, SortedArenaList &dest, AllocKind thingKind,
                       size_t thingsPerArena);
 
@@ -957,22 +966,6 @@
 
     void decommitAllArenas(JSRuntime *rt);
 
-    /*
-     * Assuming that the info.prevp points to the next field of the previous
-     * chunk in a doubly-linked list, get that chunk.
-     */
-    Chunk *getPrevious() {
-        MOZ_ASSERT(info.prevp);
-        return fromPointerToNext(info.prevp);
-    }
-
-    /* Get the chunk from a pointer to its info.next field. */
-    static Chunk *fromPointerToNext(Chunk **nextFieldPtr) {
-        uintptr_t addr = reinterpret_cast<uintptr_t>(nextFieldPtr);
-        MOZ_ASSERT((addr & ChunkMask) == offsetof(Chunk, info.next));
-        return reinterpret_cast<Chunk *>(addr - offsetof(Chunk, info.next));
-    }
-
   private:
     inline void init(JSRuntime *rt);
 
@@ -980,11 +973,12 @@
     unsigned findDecommittedArenaOffset();
     ArenaHeader* fetchNextDecommittedArena();
 
+    void addArenaToFreeList(JSRuntime *rt, ArenaHeader *aheader);
+    void addArenaToDecommittedList(JSRuntime *rt, const ArenaHeader *aheader);
+
   public:
     /* Unlink and return the freeArenasHead. */
     inline ArenaHeader* fetchNextFreeArena(JSRuntime *rt);
-
-    inline void addArenaToFreeList(JSRuntime *rt, ArenaHeader *aheader);
 };
 
 static_assert(sizeof(Chunk) == ChunkSize,
@@ -1149,6 +1143,23 @@
     auxNextLink = 0;
 }
 
+inline ArenaHeader *
+ArenaHeader::getNextArenaToUpdateAndUnlink()
+{
+    MOZ_ASSERT(!hasDelayedMarking && !allocatedDuringIncremental && !markOverflow);
+    ArenaHeader *next = &reinterpret_cast<Arena *>(auxNextLink << ArenaShift)->aheader;
+    auxNextLink = 0;
+    return next;
+}
+
+inline void
+ArenaHeader::setNextArenaToUpdate(ArenaHeader *aheader)
+{
+    MOZ_ASSERT(!hasDelayedMarking && !allocatedDuringIncremental && !markOverflow);
+    MOZ_ASSERT(!auxNextLink);
+    auxNextLink = aheader->arenaAddress() >> ArenaShift;
+}
+
 static void
 AssertValidColor(const TenuredCell *thing, uint32_t color)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Iteration.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Iteration.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Iteration.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Iteration.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -85,8 +85,8 @@
 {
     AutoPrepareForTracing prep(rt, SkipAtoms);
 
-    for (js::GCChunkSet::Range r = rt->gc.allChunks(); !r.empty(); r.popFront())
-        chunkCallback(rt, data, r.front());
+    for (auto chunk = rt->gc.allNonEmptyChunks(); !chunk.done(); chunk.next())
+        chunkCallback(rt, data, chunk);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Marking.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Marking.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Marking.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Marking.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -192,17 +192,23 @@
     if (ThingIsPermanentAtom(thing))
         return;
 
-    MOZ_ASSERT(thing->zone());
-    MOZ_ASSERT(thing->zone()->runtimeFromMainThread() == trc->runtime());
-    MOZ_ASSERT(trc->hasTracingDetails());
+    Zone *zone = thing->zoneFromAnyThread();
+    JSRuntime *rt = trc->runtime();
+
+#ifdef JSGC_COMPACTING
+    MOZ_ASSERT_IF(!MovingTracer::IsMovingTracer(trc), CurrentThreadCanAccessZone(zone));
+    MOZ_ASSERT_IF(!MovingTracer::IsMovingTracer(trc), CurrentThreadCanAccessRuntime(rt));
+#else
+    MOZ_ASSERT(CurrentThreadCanAccessZone(zone));
+    MOZ_ASSERT(CurrentThreadCanAccessRuntime(rt));
+#endif
 
-    DebugOnly<JSRuntime *> rt = trc->runtime();
+    MOZ_ASSERT(zone->runtimeFromAnyThread() == trc->runtime());
+    MOZ_ASSERT(trc->hasTracingDetails());
 
     bool isGcMarkingTracer = IS_GC_MARKING_TRACER(trc);
 
-    MOZ_ASSERT(CurrentThreadCanAccessRuntime(rt));
-
-    MOZ_ASSERT_IF(thing->zone()->requireGCTracer(), isGcMarkingTracer);
+    MOZ_ASSERT_IF(zone->requireGCTracer(), isGcMarkingTracer);
 
     MOZ_ASSERT(thing->isAligned());
 
@@ -211,14 +217,12 @@
     if (isGcMarkingTracer) {
         GCMarker *gcMarker = static_cast<GCMarker *>(trc);
         MOZ_ASSERT_IF(gcMarker->shouldCheckCompartments(),
-                      thing->zone()->isCollecting() || rt->isAtomsZone(thing->zone()));
+                      zone->isCollecting() || rt->isAtomsZone(zone));
 
         MOZ_ASSERT_IF(gcMarker->getMarkColor() == GRAY,
-                      !thing->zone()->isGCMarkingBlack() || rt->isAtomsZone(thing->zone()));
+                      !zone->isGCMarkingBlack() || rt->isAtomsZone(zone));
 
-        MOZ_ASSERT(!(thing->zone()->isGCSweeping() ||
-                     thing->zone()->isGCFinished() ||
-                     thing->zone()->isGCCompacting()));
+        MOZ_ASSERT(!(zone->isGCSweeping() || zone->isGCFinished() || zone->isGCCompacting()));
     }
 
     /*
@@ -1696,6 +1700,36 @@
     }
 }
 
+MOZ_ALWAYS_INLINE void
+GCMarker::markAndScanString(JSObject *source, JSString *str)
+{
+    if (!str->isPermanentAtom()) {
+        JS_COMPARTMENT_ASSERT_STR(runtime(), str);
+        MOZ_ASSERT(runtime()->isAtomsZone(str->zone()) || str->zone() == source->zone());
+        if (str->markIfUnmarked())
+            ScanString(this, str);
+    }
+}
+
+MOZ_ALWAYS_INLINE void
+GCMarker::markAndScanSymbol(JSObject *source, JS::Symbol *sym)
+{
+    if (!sym->isWellKnownSymbol()) {
+        JS_COMPARTMENT_ASSERT_SYM(runtime(), sym);
+        MOZ_ASSERT(runtime()->isAtomsZone(sym->zone()) || sym->zone() == source->zone());
+        if (sym->markIfUnmarked())
+            ScanSymbol(this, sym);
+    }
+}
+
+MOZ_ALWAYS_INLINE bool
+GCMarker::markObject(JSObject *source, JSObject *obj)
+{
+    JS_COMPARTMENT_ASSERT(runtime(), obj);
+    MOZ_ASSERT(obj->compartment() == source->compartment());
+    return obj->asTenured().markIfUnmarked(getMarkColor());
+}
+
 inline void
 GCMarker::processMarkStackTop(SliceBudget &budget)
 {
@@ -1738,34 +1772,55 @@
     while (vp != end) {
         const Value &v = *vp++;
         if (v.isString()) {
-            JSString *str = v.toString();
-            if (!str->isPermanentAtom()) {
-                JS_COMPARTMENT_ASSERT_STR(runtime(), str);
-                MOZ_ASSERT(runtime()->isAtomsZone(str->zone()) || str->zone() == obj->zone());
-                if (str->markIfUnmarked())
-                    ScanString(this, str);
-            }
+            markAndScanString(obj, v.toString());
         } else if (v.isObject()) {
             JSObject *obj2 = &v.toObject();
-            JS_COMPARTMENT_ASSERT(runtime(), obj2);
-            MOZ_ASSERT(obj->compartment() == obj2->compartment());
-            if (obj2->asTenured().markIfUnmarked(getMarkColor())) {
+            if (markObject(obj, obj2)) {
                 pushValueArray(obj, vp, end);
                 obj = obj2;
                 goto scan_obj;
             }
         } else if (v.isSymbol()) {
-            JS::Symbol *sym = v.toSymbol();
-            if (!sym->isWellKnownSymbol()) {
-                JS_COMPARTMENT_ASSERT_SYM(runtime(), sym);
-                MOZ_ASSERT(runtime()->isAtomsZone(sym->zone()) || sym->zone() == obj->zone());
-                if (sym->markIfUnmarked())
-                    ScanSymbol(this, sym);
-            }
+            markAndScanSymbol(obj, v.toSymbol());
         }
     }
     return;
 
+  scan_typed_obj:
+    {
+        const int32_t *list = obj->as<InlineOpaqueTypedObject>().typeDescr().traceList();
+        if (!list)
+            return;
+        uint8_t *memory = obj->as<InlineOpaqueTypedObject>().inlineTypedMem();
+        while (*list != -1) {
+            JSString *str = *reinterpret_cast<JSString **>(memory + *list);
+            markAndScanString(obj, str);
+            list++;
+        }
+        list++;
+        while (*list != -1) {
+            JSObject *obj2 = *reinterpret_cast<JSObject **>(memory + *list);
+            if (obj2 && markObject(obj, obj2))
+                pushObject(obj2);
+            list++;
+        }
+        list++;
+        while (*list != -1) {
+            const Value &v = *reinterpret_cast<Value *>(memory + *list);
+            if (v.isString()) {
+                markAndScanString(obj, v.toString());
+            } else if (v.isObject()) {
+                JSObject *obj2 = &v.toObject();
+                if (markObject(obj, obj2))
+                    pushObject(obj2);
+            } else if (v.isSymbol()) {
+                markAndScanSymbol(obj, v.toSymbol());
+            }
+            list++;
+        }
+        return;
+    }
+
   scan_obj:
     {
         JS_COMPARTMENT_ASSERT(runtime(), obj);
@@ -1793,6 +1848,8 @@
                             (!obj->compartment()->options().getTrace() ||
                              !obj->isOwnGlobal())),
                           clasp->flags & JSCLASS_IMPLEMENTS_BARRIERS);
+            if (clasp->trace == InlineTypedObject::obj_trace)
+                goto scan_typed_obj;
             clasp->trace(this, obj);
         }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Nursery.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Nursery.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Nursery.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Nursery.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -393,8 +393,8 @@
     // Proxies have finalizers and are not nursery allocated.
     MOZ_ASSERT(!IsProxy(obj));
 
-    // Inlined opaque typed objects are followed by their data, so make sure we
-    // copy it all over to the new object.
+    // Inlined typed objects are followed by their data, so make sure we copy
+    // it all over to the new object.
     if (obj->is<InlineTypedObject>()) {
         // Figure out the size of this object, from the prototype's TypeDescr.
         // The objects we are traversing here are all tenured, so we don't need
@@ -429,27 +429,41 @@
 }
 
 void
-js::Nursery::setSlotsForwardingPointer(HeapSlot *oldSlots, HeapSlot *newSlots, uint32_t nslots)
+Nursery::setForwardingPointer(void *oldData, void *newData, bool direct)
 {
+    MOZ_ASSERT(isInside(oldData));
+    MOZ_ASSERT(!isInside(newData));
+
+    if (direct) {
+        *reinterpret_cast<void **>(oldData) = newData;
+    } else {
+        if (!forwardedBuffers.initialized() && !forwardedBuffers.init())
+            CrashAtUnhandlableOOM("Nursery::setForwardingPointer");
+#ifdef DEBUG
+        if (ForwardedBufferMap::Ptr p = forwardedBuffers.lookup(oldData))
+            MOZ_ASSERT(p->value() == newData);
+#endif
+        if (!forwardedBuffers.put(oldData, newData))
+            CrashAtUnhandlableOOM("Nursery::setForwardingPointer");
+    }
+}
+
+void
+Nursery::setSlotsForwardingPointer(HeapSlot *oldSlots, HeapSlot *newSlots, uint32_t nslots)
+{
+    // Slot arrays always have enough space for a forwarding pointer, since the
+    // number of slots is never zero.
     MOZ_ASSERT(nslots > 0);
-    MOZ_ASSERT(isInside(oldSlots));
-    MOZ_ASSERT(!isInside(newSlots));
-    *reinterpret_cast<HeapSlot **>(oldSlots) = newSlots;
+    setForwardingPointer(oldSlots, newSlots, /* direct = */ true);
 }
 
 void
-js::Nursery::setElementsForwardingPointer(ObjectElements *oldHeader, ObjectElements *newHeader,
-                                          uint32_t nelems)
+Nursery::setElementsForwardingPointer(ObjectElements *oldHeader, ObjectElements *newHeader,
+                                      uint32_t nelems)
 {
-    /*
-     * If the JIT has hoisted a zero length pointer, then we do not need to
-     * relocate it because reads and writes to/from this pointer are invalid.
-     */
-    if (nelems - ObjectElements::VALUES_PER_HEADER < 1)
-        return;
-    MOZ_ASSERT(isInside(oldHeader));
-    MOZ_ASSERT(!isInside(newHeader));
-    *reinterpret_cast<HeapSlot **>(oldHeader->elements()) = newHeader->elements();
+    // Only use a direct forwarding pointer if there is enough space for one.
+    setForwardingPointer(oldHeader->elements(), newHeader->elements(),
+                         nelems > ObjectElements::VALUES_PER_HEADER);
 }
 
 #ifdef DEBUG
@@ -469,15 +483,19 @@
     if (!isInside(old))
         return;
 
-    /*
-     * If the elements buffer is zero length, the "first" item could be inside
-     * of the next object or past the end of the allocable area.  However,
-     * since we always store the runtime as the last word in the nursery,
-     * isInside will still be true, even if this zero-size allocation abuts the
-     * end of the allocable area. Thus, it is always safe to read the first
-     * word of |old| here.
-     */
-    *pSlotsElems = *reinterpret_cast<HeapSlot **>(old);
+    // The new location for this buffer is either stored inline with it or in
+    // the forwardedBuffers table.
+    do {
+        if (forwardedBuffers.initialized()) {
+            if (ForwardedBufferMap::Ptr p = forwardedBuffers.lookup(old)) {
+                *pSlotsElems = reinterpret_cast<HeapSlot *>(p->value());
+                break;
+            }
+        }
+
+        *pSlotsElems = *reinterpret_cast<HeapSlot **>(old);
+    } while (false);
+
     MOZ_ASSERT(!isInside(*pSlotsElems));
     MOZ_ASSERT(IsWriteableAddress(*pSlotsElems));
 }
@@ -585,7 +603,7 @@
     if (!dst)
         CrashAtUnhandlableOOM("Failed to allocate object while tenuring.");
 
-    trc->tenuredSize += moveObjectToTenured(dst, src, dstKind);
+    trc->tenuredSize += moveObjectToTenured(trc, dst, src, dstKind);
 
     RelocationOverlay *overlay = RelocationOverlay::fromCell(src);
     overlay->forwardTo(dst);
@@ -596,7 +614,8 @@
 }
 
 MOZ_ALWAYS_INLINE size_t
-js::Nursery::moveObjectToTenured(JSObject *dst, JSObject *src, AllocKind dstKind)
+js::Nursery::moveObjectToTenured(MinorCollectionTracer *trc,
+                                 JSObject *dst, JSObject *src, AllocKind dstKind)
 {
     size_t srcSize = Arena::thingSize(dstKind);
     size_t tenuredSize = srcSize;
@@ -620,8 +639,8 @@
         tenuredSize += moveElementsToTenured(ndst, nsrc, dstKind);
     }
 
-    if (src->is<TypedArrayObject>())
-        forwardTypedArrayPointers(&dst->as<TypedArrayObject>(), &src->as<TypedArrayObject>());
+    if (src->is<InlineTypedObject>())
+        InlineTypedObject::objectMovedDuringMinorGC(trc, dst, src);
 
     /* The shape's list head may point into the old object. */
     if (&src->shape_ == dst->shape_->listp)
@@ -630,35 +649,6 @@
     return tenuredSize;
 }
 
-void
-js::Nursery::forwardTypedArrayPointers(TypedArrayObject *dst, TypedArrayObject *src)
-{
-    /*
-     * Typed array data may be stored inline inside the object's fixed slots. If
-     * so, we need update the private pointer and leave a forwarding pointer at
-     * the start of the data.
-     */
-    if (src->buffer()) {
-        MOZ_ASSERT(!isInside(src->getPrivate()));
-        return;
-    }
-
-    void *srcData = src->fixedData(TypedArrayObject::FIXED_DATA_START);
-    void *dstData = dst->fixedData(TypedArrayObject::FIXED_DATA_START);
-    MOZ_ASSERT(src->getPrivate() == srcData);
-    dst->setPrivate(dstData);
-
-    /*
-     * We don't know the number of slots here, but
-     * TypedArrayObject::AllocKindForLazyBuffer ensures that it's always at
-     * least one.
-     */
-    size_t nslots = 1;
-    setSlotsForwardingPointer(reinterpret_cast<HeapSlot*>(srcData),
-                              reinterpret_cast<HeapSlot*>(dstData),
-                              nslots);
-}
-
 MOZ_ALWAYS_INLINE size_t
 js::Nursery::moveSlotsToTenured(NativeObject *dst, NativeObject *src, AllocKind dstKind)
 {
@@ -845,6 +835,7 @@
     // Update any slot or element pointers whose destination has been tenured.
     TIME_START(updateJitActivations);
     js::jit::UpdateJitActivationsForMinorGC<Nursery>(&rt->mainThread, &trc);
+    forwardedBuffers.finish();
     TIME_END(updateJitActivations);
 
     // Resize the nursery.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Nursery.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Nursery.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Nursery.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Nursery.h	2014-11-26 21:45:53.000000000 +0000
@@ -71,7 +71,7 @@
     {}
     ~Nursery();
 
-    bool init(uint32_t numNurseryChunks);
+    bool init(uint32_t maxNurseryBytes);
 
     bool exists() const { return numNurseryChunks_ != 0; }
     size_t numChunks() const { return numNurseryChunks_; }
@@ -137,6 +137,11 @@
 
     static void forwardBufferPointer(JSTracer* trc, HeapSlot **pSlotsElems);
 
+    void maybeSetForwardingPointer(JSTracer *trc, void *oldData, void *newData, bool direct) {
+        if (IsMinorCollectionTracer(trc) && isInside(oldData))
+            setForwardingPointer(oldData, newData, direct);
+    }
+
     size_t sizeOfHeapCommitted() const {
         return numActiveChunks_ * gc::ChunkSize;
     }
@@ -206,6 +211,16 @@
     typedef HashSet<HeapSlot *, PointerHasher<HeapSlot *, 3>, SystemAllocPolicy> HugeSlotsSet;
     HugeSlotsSet hugeSlots;
 
+    /*
+     * During a collection most hoisted slot and element buffers indicate their
+     * new location with a forwarding pointer at the base. This does not work
+     * for buffers whose length is less than pointer width, or when different
+     * buffers might overlap each other. For these, an entry in the following
+     * table is used.
+     */
+    typedef HashMap<void *, void *, PointerHasher<void *, 1>, SystemAllocPolicy> ForwardedBufferMap;
+    ForwardedBufferMap forwardedBuffers;
+
     /* The maximum number of slots allowed to reside inline in the nursery. */
     static const size_t MaxNurserySlots = 128;
 
@@ -285,12 +300,14 @@
     MOZ_ALWAYS_INLINE void markSlots(gc::MinorCollectionTracer *trc, HeapSlot *vp, HeapSlot *end);
     MOZ_ALWAYS_INLINE void markSlot(gc::MinorCollectionTracer *trc, HeapSlot *slotp);
     void *moveToTenured(gc::MinorCollectionTracer *trc, JSObject *src);
-    size_t moveObjectToTenured(JSObject *dst, JSObject *src, gc::AllocKind dstKind);
+    size_t moveObjectToTenured(gc::MinorCollectionTracer *trc, JSObject *dst, JSObject *src,
+                               gc::AllocKind dstKind);
     size_t moveElementsToTenured(NativeObject *dst, NativeObject *src, gc::AllocKind dstKind);
     size_t moveSlotsToTenured(NativeObject *dst, NativeObject *src, gc::AllocKind dstKind);
-    void forwardTypedArrayPointers(TypedArrayObject *dst, TypedArrayObject *src);
 
     /* Handle relocation of slots/elements pointers stored in Ion frames. */
+    void setForwardingPointer(void *oldData, void *newData, bool direct);
+
     void setSlotsForwardingPointer(HeapSlot *oldSlots, HeapSlot *newSlots, uint32_t nslots);
     void setElementsForwardingPointer(ObjectElements *oldHeader, ObjectElements *newHeader,
                                       uint32_t nelems);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Statistics.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Statistics.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Statistics.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Statistics.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -27,6 +27,7 @@
 using namespace js::gcstats;
 
 using mozilla::PodArrayZero;
+using mozilla::PodZero;
 
 /* Except for the first and last, slices of less than 10ms are not reported. */
 static const int64_t SLICE_MIN_REPORT_TIME = 10 * PRMJ_USEC_PER_MSEC;
@@ -283,6 +284,7 @@
 static const Phase PHASE_NO_PARENT = PHASE_LIMIT;
 
 static const PhaseInfo phases[] = {
+    { PHASE_MUTATOR, "Mutator Running", PHASE_NO_PARENT },
     { PHASE_GC_BEGIN, "Begin Callback", PHASE_NO_PARENT },
     { PHASE_WAIT_BACKGROUND_THREAD, "Wait Background Thread", PHASE_NO_PARENT },
     { PHASE_MARK_DISCARD_CODE, "Mark Discard Code", PHASE_NO_PARENT },
@@ -324,8 +326,9 @@
     { PHASE_COMPACT, "Compact", PHASE_NO_PARENT },
         { PHASE_COMPACT_MOVE, "Compact Move", PHASE_COMPACT },
         { PHASE_COMPACT_UPDATE, "Compact Update", PHASE_COMPACT, },
-            { PHASE_COMPACT_UPDATE_GRAY, "Compact Update Gray", PHASE_COMPACT_UPDATE, },
+            { PHASE_COMPACT_UPDATE_CELLS, "Compact Update Cells", PHASE_COMPACT_UPDATE, },
     { PHASE_GC_END, "End Callback", PHASE_NO_PARENT },
+    { PHASE_MINOR_GC, "Minor GC", PHASE_NO_PARENT },
     { PHASE_LIMIT, nullptr, PHASE_NO_PARENT }
 };
 
@@ -385,6 +388,7 @@
     ss.appendNumber("Total Zones", "%d", "", zoneStats.zoneCount);
     ss.appendNumber("Total Compartments", "%d", "", zoneStats.compartmentCount);
     ss.appendNumber("Minor GCs", "%d", "", counts[STAT_MINOR_GC]);
+    ss.appendNumber("Store Buffer Overflows", "%d", "", counts[STAT_STOREBUFFER_OVERFLOW]);
     ss.appendNumber("MMU (20ms)", "%d", "%", int(mmu20 * 100));
     ss.appendNumber("MMU (50ms)", "%d", "%", int(mmu50 * 100));
     ss.appendDecimal("SCC Sweep Total", "ms", t(sccTotal));
@@ -476,6 +480,7 @@
   Zones Collected: %d of %d\n\
   Compartments Collected: %d of %d\n\
   MinorGCs since last GC: %d\n\
+  Store Buffer Overflows: %d\n\
   MMU 20ms:%.1f%%; 50ms:%.1f%%\n\
   SCC Sweep Total (MaxPause): %.3fms (%.3fms)\n\
   HeapSize: %.3f MiB\n\
@@ -491,6 +496,7 @@
                 zoneStats.collectedZoneCount, zoneStats.zoneCount,
                 zoneStats.collectedCompartmentCount, zoneStats.compartmentCount,
                 counts[STAT_MINOR_GC],
+                counts[STAT_STOREBUFFER_OVERFLOW],
                 mmu20 * 100., mmu50 * 100.,
                 t(sccTotal), t(sccLongest),
                 double(preBytes) / 1024. / 1024.,
@@ -633,6 +639,8 @@
     fullFormat(false),
     gcDepth(0),
     nonincrementalReason(nullptr),
+    timingMutator(false),
+    timedGCStart(0),
     preBytes(0),
     maxPauseInInterval(0),
     phaseNestingDepth(0),
@@ -640,6 +648,8 @@
 {
     PodArrayZero(phaseTotals);
     PodArrayZero(counts);
+    PodArrayZero(phaseStartTimes);
+    PodArrayZero(phaseTimes);
 
     char *env = getenv("MOZ_GCTIMER");
     if (!env || strcmp(env, "none") == 0) {
@@ -723,9 +733,6 @@
 void
 Statistics::beginGC(JSGCInvocationKind kind)
 {
-    PodArrayZero(phaseStartTimes);
-    PodArrayZero(phaseTimes);
-
     slices.clearAndFree();
     sccTimes.clearAndFree();
     gckind = kind;
@@ -767,6 +774,11 @@
 
     if (fp)
         printStats();
+
+    // Clear the timers at the end of a GC because we accumulate time in
+    // between GCs for some (which come before PHASE_GC_BEGIN in the list.)
+    PodZero(&phaseStartTimes[PHASE_GC_BEGIN], PHASE_LIMIT - PHASE_GC_BEGIN);
+    PodZero(&phaseTimes[PHASE_GC_BEGIN], PHASE_LIMIT - PHASE_GC_BEGIN);
 }
 
 void
@@ -824,19 +836,59 @@
 }
 
 void
+Statistics::startTimingMutator()
+{
+    MOZ_ASSERT(!timingMutator);
+
+    // Should only be called from outside of GC
+    MOZ_ASSERT(phaseNestingDepth == 0);
+
+    timingMutator = true;
+    timedGCTime = 0;
+    phaseStartTimes[PHASE_MUTATOR] = 0;
+    phaseTimes[PHASE_MUTATOR] = 0;
+    timedGCStart = 0;
+
+    beginPhase(PHASE_MUTATOR);
+}
+
+void
+Statistics::stopTimingMutator(double &mutator_ms, double &gc_ms)
+{
+    MOZ_ASSERT(timingMutator);
+
+    // Should only be called from outside of GC
+    MOZ_ASSERT(phaseNestingDepth == 1 && phaseNesting[0] == PHASE_MUTATOR);
+
+    endPhase(PHASE_MUTATOR);
+    mutator_ms = t(phaseTimes[PHASE_MUTATOR]);
+    gc_ms = t(timedGCTime);
+    timingMutator = false;
+}
+
+void
 Statistics::beginPhase(Phase phase)
 {
     /* Guard against re-entry */
     MOZ_ASSERT(!phaseStartTimes[phase]);
 
+    if (timingMutator) {
+        if (phaseNestingDepth == 1 && phaseNesting[0] == PHASE_MUTATOR) {
+            endPhase(PHASE_MUTATOR);
+            timedGCStart = PRMJ_Now();
+        }
+    }
+
 #ifdef DEBUG
     MOZ_ASSERT(phases[phase].index == phase);
     Phase parent = phaseNestingDepth ? phaseNesting[phaseNestingDepth - 1] : PHASE_NO_PARENT;
     MOZ_ASSERT(phaseNestingDepth < MAX_NESTING);
-    MOZ_ASSERT_IF(gcDepth == 1, phases[phase].parent == parent);
+    // Major and minor GCs can nest inside PHASE_GC_BEGIN/PHASE_GC_END.
+    MOZ_ASSERT_IF(gcDepth == 1 && phase != PHASE_MINOR_GC, phases[phase].parent == parent);
+#endif
+
     phaseNesting[phaseNestingDepth] = phase;
     phaseNestingDepth++;
-#endif
 
     phaseStartTimes[phase] = PRMJ_Now();
 }
@@ -846,10 +898,19 @@
 {
     phaseNestingDepth--;
 
-    int64_t t = PRMJ_Now() - phaseStartTimes[phase];
-    slices.back().phaseTimes[phase] += t;
+    int64_t now = PRMJ_Now();
+    int64_t t = now - phaseStartTimes[phase];
+    if (!slices.empty())
+        slices.back().phaseTimes[phase] += t;
     phaseTimes[phase] += t;
     phaseStartTimes[phase] = 0;
+
+    if (timingMutator) {
+        if (phaseNestingDepth == 0 && phase != PHASE_MUTATOR) {
+            timedGCTime += now - timedGCStart;
+            beginPhase(PHASE_MUTATOR);
+        }
+    }
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Statistics.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Statistics.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Statistics.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Statistics.h	2014-11-26 21:45:53.000000000 +0000
@@ -27,6 +27,7 @@
 namespace gcstats {
 
 enum Phase {
+    PHASE_MUTATOR,
     PHASE_GC_BEGIN,
     PHASE_WAIT_BACKGROUND_THREAD,
     PHASE_MARK_DISCARD_CODE,
@@ -68,8 +69,9 @@
     PHASE_COMPACT,
     PHASE_COMPACT_MOVE,
     PHASE_COMPACT_UPDATE,
-    PHASE_COMPACT_UPDATE_GRAY,
+    PHASE_COMPACT_UPDATE_CELLS,
     PHASE_GC_END,
+    PHASE_MINOR_GC,
 
     PHASE_LIMIT
 };
@@ -79,6 +81,10 @@
     STAT_DESTROY_CHUNK,
     STAT_MINOR_GC,
 
+    // Number of times a 'put' into a storebuffer overflowed, triggering a
+    // compaction
+    STAT_STOREBUFFER_OVERFLOW,
+
     STAT_LIMIT
 };
 
@@ -118,6 +124,9 @@
                     JS::gcreason::Reason reason);
     void endSlice();
 
+    void startTimingMutator();
+    void stopTimingMutator(double &mutator_ms, double &gc_ms);
+
     void reset(const char *reason) { slices.back().resetReason = reason; }
     void nonincremental(const char *reason) { nonincrementalReason = reason; }
 
@@ -179,6 +188,13 @@
     /* Most recent time when the given phase started. */
     int64_t phaseStartTimes[PHASE_LIMIT];
 
+    /* Are we currently timing mutator vs GC time? */
+    bool timingMutator;
+
+    /* Bookkeeping for GC timings when timingMutator is true */
+    int64_t timedGCStart;
+    int64_t timedGCTime;
+
     /* Total time in a given phase for this GC. */
     int64_t phaseTimes[PHASE_LIMIT];
 
@@ -194,12 +210,10 @@
     /* Records the maximum GC pause in an API-controlled interval (in us). */
     int64_t maxPauseInInterval;
 
-#ifdef DEBUG
     /* Phases that are currently on stack. */
     static const size_t MAX_NESTING = 8;
     Phase phaseNesting[MAX_NESTING];
-#endif
-    mozilla::DebugOnly<size_t> phaseNestingDepth;
+    size_t phaseNestingDepth;
 
     /* Sweep times for SCCs of compartments. */
     Vector<int64_t, 0, SystemAllocPolicy> sccTimes;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/StoreBuffer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/StoreBuffer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/StoreBuffer.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/StoreBuffer.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -10,6 +10,7 @@
 
 #include "mozilla/Assertions.h"
 
+#include "gc/Statistics.h"
 #include "vm/ArgumentsObject.h"
 #include "vm/ForkJoin.h"
 
@@ -22,7 +23,7 @@
 /*** Edges ***/
 
 void
-StoreBuffer::SlotsEdge::mark(JSTracer *trc)
+StoreBuffer::SlotsEdge::mark(JSTracer *trc) const
 {
     NativeObject *obj = object();
 
@@ -48,7 +49,7 @@
 }
 
 void
-StoreBuffer::WholeCellEdges::mark(JSTracer *trc)
+StoreBuffer::WholeCellEdges::mark(JSTracer *trc) const
 {
     MOZ_ASSERT(edge->isTenured());
     JSGCTraceKind kind = GetGCThingTraceKind(edge);
@@ -64,7 +65,7 @@
 }
 
 void
-StoreBuffer::CellPtrEdge::mark(JSTracer *trc)
+StoreBuffer::CellPtrEdge::mark(JSTracer *trc) const
 {
     if (!*edge)
         return;
@@ -74,7 +75,7 @@
 }
 
 void
-StoreBuffer::ValueEdge::mark(JSTracer *trc)
+StoreBuffer::ValueEdge::mark(JSTracer *trc) const
 {
     if (!deref())
         return;
@@ -86,133 +87,12 @@
 
 template <typename T>
 void
-StoreBuffer::MonoTypeBuffer<T>::handleOverflow(StoreBuffer *owner)
-{
-    if (!owner->isAboutToOverflow()) {
-        /*
-         * Compact the buffer now, and if that fails to free enough space then
-         * trigger a minor collection.
-         */
-        compact(owner);
-        if (isLowOnSpace())
-            owner->setAboutToOverflow();
-    } else {
-         /*
-          * A minor GC has already been triggered, so there's no point
-          * compacting unless the buffer is totally full.
-          */
-        if (storage_->availableInCurrentChunk() < sizeof(T))
-            maybeCompact(owner);
-    }
-}
-
-template <typename T>
-void
-StoreBuffer::MonoTypeBuffer<T>::compactRemoveDuplicates(StoreBuffer *owner)
-{
-    typedef HashSet<T, typename T::Hasher, SystemAllocPolicy> DedupSet;
-
-    DedupSet duplicates;
-    if (!duplicates.init())
-        return; /* Failure to de-dup is acceptable. */
-
-    LifoAlloc::Enum insert(*storage_);
-    for (LifoAlloc::Enum e(*storage_); !e.empty(); e.popFront<T>()) {
-        T *edge = e.get<T>();
-        if (!duplicates.has(*edge)) {
-            insert.updateFront<T>(*edge);
-            insert.popFront<T>();
-
-            /* Failure to insert will leave the set with duplicates. Oh well. */
-            duplicates.put(*edge);
-        }
-    }
-    storage_->release(insert.mark());
-
-    duplicates.clear();
-}
-
-template <typename T>
-void
-StoreBuffer::MonoTypeBuffer<T>::compact(StoreBuffer *owner)
-{
-    MOZ_ASSERT(storage_);
-    compactRemoveDuplicates(owner);
-    usedAtLastCompact_ = storage_->used();
-}
-
-template <typename T>
-void
-StoreBuffer::MonoTypeBuffer<T>::maybeCompact(StoreBuffer *owner)
-{
-    MOZ_ASSERT(storage_);
-    if (storage_->used() != usedAtLastCompact_)
-        compact(owner);
-}
-
-template <typename T>
-void
 StoreBuffer::MonoTypeBuffer<T>::mark(StoreBuffer *owner, JSTracer *trc)
 {
-    MOZ_ASSERT(owner->isEnabled());
-    ReentrancyGuard g(*owner);
-    if (!storage_)
-        return;
-
-    maybeCompact(owner);
-    for (LifoAlloc::Enum e(*storage_); !e.empty(); e.popFront<T>()) {
-        T *edge = e.get<T>();
-        edge->mark(trc);
-    }
-}
-
-/*** RelocatableMonoTypeBuffer ***/
-
-template <typename T>
-void
-StoreBuffer::RelocatableMonoTypeBuffer<T>::compactMoved(StoreBuffer *owner)
-{
-    LifoAlloc &storage = *this->storage_;
-    EdgeSet invalidated;
-    if (!invalidated.init())
-        CrashAtUnhandlableOOM("RelocatableMonoTypeBuffer::compactMoved: Failed to init table.");
-
-    /* Collect the set of entries which are currently invalid. */
-    for (LifoAlloc::Enum e(storage); !e.empty(); e.popFront<T>()) {
-        T *edge = e.get<T>();
-        if (edge->isTagged()) {
-            if (!invalidated.put(edge->untagged().edge))
-                CrashAtUnhandlableOOM("RelocatableMonoTypeBuffer::compactMoved: Failed to put removal.");
-        } else {
-            invalidated.remove(edge->untagged().edge);
-        }
-    }
-
-    /* Remove all entries which are in the invalidated set. */
-    LifoAlloc::Enum insert(storage);
-    for (LifoAlloc::Enum e(storage); !e.empty(); e.popFront<T>()) {
-        T *edge = e.get<T>();
-        if (!edge->isTagged() && !invalidated.has(edge->untagged().edge)) {
-            insert.updateFront<T>(*edge);
-            insert.popFront<T>();
-        }
-    }
-    storage.release(insert.mark());
-
-    invalidated.clear();
-
-#ifdef DEBUG
-    for (LifoAlloc::Enum e(storage); !e.empty(); e.popFront<T>())
-        MOZ_ASSERT(!e.get<T>()->isTagged());
-#endif
-}
-
-template <typename T>
-void
-StoreBuffer::RelocatableMonoTypeBuffer<T>::compact(StoreBuffer *owner)
-{
-    compactMoved(owner);
-    StoreBuffer::MonoTypeBuffer<T>::compact(owner);
+    MOZ_ASSERT(stores_.initialized());
+    sinkStores(owner);
+    for (typename StoreSet::Range r = stores_.all(); !r.empty(); r.popFront())
+        r.front().mark(trc);
 }
 
 /*** GenericBuffer ***/
@@ -302,7 +182,10 @@
 void
 StoreBuffer::setAboutToOverflow()
 {
-    aboutToOverflow_ = true;
+    if (!aboutToOverflow_) {
+        aboutToOverflow_ = true;
+        runtime_->gc.stats.count(gcstats::STAT_STOREBUFFER_OVERFLOW);
+    }
     runtime_->gc.requestMinorGC(JS::gcreason::FULL_STORE_BUFFER);
 }
 
@@ -373,7 +256,5 @@
 template struct StoreBuffer::MonoTypeBuffer<StoreBuffer::CellPtrEdge>;
 template struct StoreBuffer::MonoTypeBuffer<StoreBuffer::SlotsEdge>;
 template struct StoreBuffer::MonoTypeBuffer<StoreBuffer::WholeCellEdges>;
-template struct StoreBuffer::RelocatableMonoTypeBuffer<StoreBuffer::ValueEdge>;
-template struct StoreBuffer::RelocatableMonoTypeBuffer<StoreBuffer::CellPtrEdge>;
 
 #endif /* JSGC_GENERATIONAL */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/StoreBuffer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/StoreBuffer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/StoreBuffer.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/StoreBuffer.h	2014-11-26 21:45:53.000000000 +0000
@@ -81,17 +81,6 @@
     static const size_t LowAvailableThreshold = (size_t)(LifoAllocBlockSize * 1.0 / 16.0);
 
     /*
-     * If the space available in the store buffer hits the
-     * LowAvailableThreshold and gets compacted, but still doesn't have at
-     * least HighAvailableThreshold space available, then we will trigger a
-     * minor GC. HighAvailableThreshold should be set to provide enough space
-     * for the mutator to run for a while in between compactions. (If
-     * HighAvailableThreshold is too low, we will thrash and spend most of the
-     * time compacting. If it is too high, we will tenure things too early.)
-     */
-    static const size_t HighAvailableThreshold = (size_t)(LifoAllocBlockSize * 1.0 / 4.0);
-
-    /*
      * This buffer holds only a single type of edge. Using this buffer is more
      * efficient than the generic buffer when many writes will be to the same
      * type of edge: e.g. Value or Cell*.
@@ -99,89 +88,81 @@
     template<typename T>
     struct MonoTypeBuffer
     {
-        LifoAlloc *storage_;
-        size_t usedAtLastCompact_;
+        /* The canonical set of stores. */
+        typedef HashSet<T, typename T::Hasher, SystemAllocPolicy> StoreSet;
+        StoreSet stores_;
 
-        explicit MonoTypeBuffer() : storage_(nullptr), usedAtLastCompact_(0) {}
-        ~MonoTypeBuffer() { js_delete(storage_); }
+        /*
+         * A small, fixed-size buffer in front of the canonical set to simplify
+         * insertion via jit code.
+         */
+        const static size_t NumBufferEntries = 4096 / sizeof(T);
+        T buffer_[NumBufferEntries];
+        T *insert_;
 
-        bool init() {
-            if (!storage_)
-                storage_ = js_new<LifoAlloc>(LifoAllocBlockSize);
-            clear();
-            return bool(storage_);
-        }
+        /* Maximum number of entries before we request a minor GC. */
+        const static size_t MaxEntries = 48 * 1024 / sizeof(T);
 
-        void clear() {
-            if (!storage_)
-                return;
+        explicit MonoTypeBuffer() { clearBuffer(); }
+        ~MonoTypeBuffer() { stores_.finish(); }
 
-            storage_->used() ? storage_->releaseAll() : storage_->freeAll();
-            usedAtLastCompact_ = 0;
+        bool init() {
+            if (!stores_.initialized() && !stores_.init())
+                return false;
+            clear();
+            return true;
         }
 
-        bool isAboutToOverflow() const {
-            return !storage_->isEmpty() && storage_->availableInCurrentChunk() < LowAvailableThreshold;
+        void clearBuffer() {
+            JS_POISON(buffer_, JS_EMPTY_STOREBUFFER_PATTERN, NumBufferEntries * sizeof(T));
+            insert_ = buffer_;
         }
 
-        bool isLowOnSpace() const {
-            return !storage_->isEmpty() && storage_->availableInCurrentChunk() < HighAvailableThreshold;
+        void clear() {
+            clearBuffer();
+            if (stores_.initialized())
+                stores_.clear();
         }
 
-        void handleOverflow(StoreBuffer *owner);
-
-        /* Compaction algorithms. */
-        void compactRemoveDuplicates(StoreBuffer *owner);
-
-        /*
-         * Attempts to reduce the usage of the buffer by removing unnecessary
-         * entries.
-         */
-        virtual void compact(StoreBuffer *owner);
-
-        /* Compacts if any entries have been added since the last compaction. */
-        void maybeCompact(StoreBuffer *owner);
-
         /* Add one item to the buffer. */
         void put(StoreBuffer *owner, const T &t) {
-            MOZ_ASSERT(storage_);
+            MOZ_ASSERT(stores_.initialized());
+            *insert_++ = t;
+            if (MOZ_UNLIKELY(insert_ == buffer_ + NumBufferEntries))
+                sinkStores(owner);
+        }
+
+        /* Move any buffered stores to the canonical store set. */
+        void sinkStores(StoreBuffer *owner) {
+            MOZ_ASSERT(stores_.initialized());
+
+            for (T *p = buffer_; p < insert_; ++p) {
+                if (!stores_.put(*p))
+                    CrashAtUnhandlableOOM("Failed to allocate for MonoTypeBuffer::sinkStores.");
+            }
+            clearBuffer();
 
-            T *tp = storage_->new_<T>(t);
-            if (!tp)
-                CrashAtUnhandlableOOM("Failed to allocate for MonoTypeBuffer::put.");
+            if (MOZ_UNLIKELY(stores_.count() > MaxEntries))
+                owner->setAboutToOverflow();
+        }
 
-            if (isAboutToOverflow())
-                handleOverflow(owner);
+        /* Remove an item from the store buffer. */
+        void unput(StoreBuffer *owner, const T &v) {
+            sinkStores(owner);
+            stores_.remove(v);
         }
 
         /* Mark the source of all edges in the store buffer. */
         void mark(StoreBuffer *owner, JSTracer *trc);
 
         size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) {
-            return storage_ ? storage_->sizeOfIncludingThis(mallocSizeOf) : 0;
+            return stores_.sizeOfExcludingThis(mallocSizeOf);
         }
 
       private:
         MonoTypeBuffer &operator=(const MonoTypeBuffer& other) MOZ_DELETE;
     };
 
-    /*
-     * Overrides the MonoTypeBuffer to support pointers that may be moved in
-     * memory outside of the GC's control.
-     */
-    template <typename T>
-    struct RelocatableMonoTypeBuffer : public MonoTypeBuffer<T>
-    {
-        /* Override compaction to filter out removed items. */
-        void compactMoved(StoreBuffer *owner);
-        virtual void compact(StoreBuffer *owner) MOZ_OVERRIDE;
-
-        /* Record a removal from the buffer. */
-        void unput(StoreBuffer *owner, const T &v) {
-            MonoTypeBuffer<T>::put(owner, v.tagged());
-        }
-    };
-
     struct GenericBuffer
     {
         LifoAlloc *storage_;
@@ -251,6 +232,7 @@
     {
         Cell **edge;
 
+        CellPtrEdge() : edge(nullptr) {}
         explicit CellPtrEdge(Cell **v) : edge(v) {}
         bool operator==(const CellPtrEdge &other) const { return edge == other.edge; }
         bool operator!=(const CellPtrEdge &other) const { return edge != other.edge; }
@@ -260,7 +242,7 @@
             return !nursery.isInside(edge);
         }
 
-        void mark(JSTracer *trc);
+        void mark(JSTracer *trc) const;
 
         CellPtrEdge tagged() const { return CellPtrEdge((Cell **)(uintptr_t(edge) | 1)); }
         CellPtrEdge untagged() const { return CellPtrEdge((Cell **)(uintptr_t(edge) & ~1)); }
@@ -273,6 +255,7 @@
     {
         JS::Value *edge;
 
+        ValueEdge() : edge(nullptr) {}
         explicit ValueEdge(JS::Value *v) : edge(v) {}
         bool operator==(const ValueEdge &other) const { return edge == other.edge; }
         bool operator!=(const ValueEdge &other) const { return edge != other.edge; }
@@ -284,7 +267,7 @@
             return !nursery.isInside(edge);
         }
 
-        void mark(JSTracer *trc);
+        void mark(JSTracer *trc) const;
 
         ValueEdge tagged() const { return ValueEdge((JS::Value *)(uintptr_t(edge) | 1)); }
         ValueEdge untagged() const { return ValueEdge((JS::Value *)(uintptr_t(edge) & ~1)); }
@@ -303,6 +286,7 @@
         int32_t start_;
         int32_t count_;
 
+        SlotsEdge() : objectAndKind_(0), start_(0), count_(0) {}
         SlotsEdge(NativeObject *object, int kind, int32_t start, int32_t count)
           : objectAndKind_(uintptr_t(object) | kind), start_(start), count_(count)
         {
@@ -329,7 +313,7 @@
             return !IsInsideNursery(JS::AsCell(reinterpret_cast<JSObject *>(object())));
         }
 
-        void mark(JSTracer *trc);
+        void mark(JSTracer *trc) const;
 
         typedef struct {
             typedef SlotsEdge Lookup;
@@ -342,6 +326,7 @@
     {
         Cell *edge;
 
+        WholeCellEdges() : edge(nullptr) {}
         explicit WholeCellEdges(Cell *cell) : edge(cell) {
             MOZ_ASSERT(edge->isTenured());
         }
@@ -354,7 +339,7 @@
         static bool supportsDeduplication() { return true; }
         void *deduplicationKey() const { return (void *)edge; }
 
-        void mark(JSTracer *trc);
+        void mark(JSTracer *trc) const;
 
         typedef PointerEdgeHasher<WholeCellEdges> Hasher;
     };
@@ -425,8 +410,8 @@
     MonoTypeBuffer<CellPtrEdge> bufferCell;
     MonoTypeBuffer<SlotsEdge> bufferSlot;
     MonoTypeBuffer<WholeCellEdges> bufferWholeCell;
-    RelocatableMonoTypeBuffer<ValueEdge> bufferRelocVal;
-    RelocatableMonoTypeBuffer<CellPtrEdge> bufferRelocCell;
+    MonoTypeBuffer<ValueEdge> bufferRelocVal;
+    MonoTypeBuffer<CellPtrEdge> bufferRelocCell;
     GenericBuffer bufferGeneric;
 
     JSRuntime *runtime_;
@@ -505,6 +490,13 @@
     /* For use by our owned buffers and for testing. */
     void setAboutToOverflow();
 
+    /* For jit access to the raw buffer. */
+    void oolSinkStoresForWholeCellBuffer() { bufferWholeCell.sinkStores(this); }
+    void *addressOfWholeCellBufferPointer() const { return (void *)&bufferWholeCell.insert_; }
+    void *addressOfWholeCellBufferEnd() const {
+        return (void *)(bufferWholeCell.buffer_ + bufferWholeCell.NumBufferEntries);
+    }
+
     void addSizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf, JS::GCSizes *sizes);
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Tracer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Tracer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Tracer.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Tracer.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -139,13 +139,14 @@
                 // zones multiple times, and don't hold a strong reference.
                 if (key.kind == CrossCompartmentKey::StringWrapper)
                     continue;
+                JSObject *obj = static_cast<JSObject *>(key.wrapped);
                 // Ignore CCWs whose wrapped value doesn't live in our given set
                 // of zones.
-                if (!zones.has(static_cast<JSObject *>(key.wrapped)->zone()))
+                if (!zones.has(obj->zone()))
                     continue;
 
-                void *thing = key.wrapped;
-                trc->callback(trc, &thing, GetGCThingTraceKind(key.wrapped));
+                MarkObjectUnbarriered(trc, &obj, "cross-compartment wrapper");
+                MOZ_ASSERT(obj == key.wrapped);
             }
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Tracer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Tracer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Tracer.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Tracer.h	2014-11-26 21:45:54.000000000 +0000
@@ -275,6 +275,10 @@
     inline void processMarkStackTop(SliceBudget &budget);
     void processMarkStackOther(uintptr_t tag, uintptr_t addr);
 
+    void markAndScanString(JSObject *source, JSString *str);
+    void markAndScanSymbol(JSObject *source, JS::Symbol *sym);
+    bool markObject(JSObject *source, JSObject *obj);
+
     void appendGrayRoot(void *thing, JSGCTraceKind kind);
 
     /* The color is only applied to objects and functions. */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Verifier.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Verifier.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Verifier.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Verifier.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -189,8 +189,8 @@
     if (!IsIncrementalGCSafe(rt))
         return;
 
-    for (GCChunkSet::Range r(chunkSet.all()); !r.empty(); r.popFront())
-        r.front()->bitmap.clear();
+    for (auto chunk = allNonEmptyChunks(); !chunk.done(); chunk.next())
+        chunk->bitmap.clear();
 
     number++;
 
@@ -503,7 +503,10 @@
     if (!edges.init())
         goto oom;
     trc->edges = &edges;
-    storeBuffer.markAll(trc);
+    {
+        gcstats::AutoPhase ap(stats, gcstats::PHASE_MINOR_GC);
+        storeBuffer.markAll(trc);
+    }
 
     /* Walk the heap to find any edges not the the |edges| set. */
     trc->setTraceCallback(PostVerifierVisitEdge);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Zone.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Zone.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Zone.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Zone.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -19,6 +19,8 @@
 using namespace js;
 using namespace js::gc;
 
+Zone * const Zone::NotOnList = reinterpret_cast<Zone *>(1);
+
 JS::Zone::Zone(JSRuntime *rt)
   : JS::shadow::Zone(rt, &rt->gc.marker),
     allocator(this),
@@ -37,7 +39,8 @@
     gcState_(NoGC),
     gcScheduled_(false),
     gcPreserveCode_(false),
-    jitUsingBarriers_(false)
+    jitUsingBarriers_(false),
+    listNext_(NotOnList)
 {
     /* Ensure that there are no vtables to mess us up here. */
     MOZ_ASSERT(reinterpret_cast<JS::shadow::Zone *>(this) ==
@@ -265,3 +268,95 @@
 {
     return rt->isAtomsZone(*it);
 }
+
+bool Zone::isOnList()
+{
+    return listNext_ != NotOnList;
+}
+
+ZoneList::ZoneList()
+  : head(nullptr), tail(nullptr)
+{}
+
+ZoneList::ZoneList(Zone *zone)
+  : head(zone), tail(zone)
+{
+    MOZ_ASSERT(!zone->isOnList());
+    zone->listNext_ = nullptr;
+}
+
+void
+ZoneList::check() const
+{
+#ifdef DEBUG
+    MOZ_ASSERT((head == nullptr) == (tail == nullptr));
+    if (head) {
+        Zone *zone = head;
+        while (zone != tail) {
+            zone = zone->listNext_;
+            MOZ_ASSERT(zone);
+        }
+        MOZ_ASSERT(!zone->listNext_);
+    }
+#endif
+}
+
+bool ZoneList::isEmpty() const
+{
+    return head == nullptr;
+}
+
+Zone *
+ZoneList::front() const
+{
+    MOZ_ASSERT(!isEmpty());
+    return head;
+}
+
+void
+ZoneList::append(Zone *zone)
+{
+    ZoneList singleZone(zone);
+    append(singleZone);
+}
+
+void
+ZoneList::append(ZoneList &other)
+{
+    check();
+    other.check();
+    MOZ_ASSERT(tail != other.tail);
+
+    if (tail)
+        tail->listNext_ = other.head;
+    else
+        head = other.head;
+    tail = other.tail;
+}
+
+Zone *
+ZoneList::removeFront()
+{
+    MOZ_ASSERT(!isEmpty());
+    check();
+
+    Zone *front = head;
+    head = head->listNext_;
+    if (!head)
+        tail = nullptr;
+
+    front->listNext_ = Zone::NotOnList;
+    return front;
+}
+
+void
+ZoneList::transferFrom(ZoneList& other)
+{
+    MOZ_ASSERT(isEmpty());
+    other.check();
+
+    head = other.head;
+    tail = other.tail;
+    other.head = nullptr;
+    other.tail = nullptr;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Zone.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Zone.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/gc/Zone.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/gc/Zone.h	2014-11-26 21:45:54.000000000 +0000
@@ -192,10 +192,17 @@
             return needsIncrementalBarrier();
     }
 
+    bool isCollectingFromAnyThread() const {
+        if (runtimeFromAnyThread()->isHeapCollecting())
+            return gcState_ != NoGC;
+        else
+            return needsIncrementalBarrier();
+    }
+
     // If this returns true, all object tracing must be done with a GC marking
     // tracer.
     bool requireGCTracer() const {
-        JSRuntime *rt = runtimeFromMainThread();
+        JSRuntime *rt = runtimeFromAnyThread();
         return rt->isHeapMajorCollecting() && !rt->isHeapCompacting() && gcState_ != NoGC;
     }
 
@@ -243,6 +250,10 @@
 
     js::jit::JitZone *createJitZone(JSContext *cx);
 
+    bool isQueuedForBackgroundSweep() {
+        return isOnList();
+    }
+
   public:
     js::Allocator allocator;
 
@@ -307,6 +318,12 @@
     bool gcPreserveCode_;
     bool jitUsingBarriers_;
 
+    // Allow zones to be linked into a list
+    friend class js::gc::ZoneList;
+    static Zone * const NotOnList;
+    Zone *listNext_;
+    bool isOnList();
+
     friend bool js::CurrentThreadCanAccessZone(Zone *zone);
     friend class js::gc::GCRuntime;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/CodeGenerator-arm.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/CodeGenerator-arm.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/CodeGenerator-arm.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/CodeGenerator-arm.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -40,8 +40,11 @@
 bool
 CodeGeneratorARM::generatePrologue()
 {
+    MOZ_ASSERT(masm.framePushed() == 0);
     MOZ_ASSERT(!gen->compilingAsmJS());
-
+#ifdef JS_USE_LINK_REGISTER
+    masm.pushReturnAddress();
+#endif
     // Note that this automatically sets MacroAssembler::framePushed().
     masm.reserveStack(frameSize());
     masm.checkStackAlignment();
@@ -1889,6 +1892,8 @@
       default: MOZ_CRASH("unexpected array type");
     }
 
+    memoryBarrier(mir->barrierBefore());
+
     const LAllocation *ptr = ins->ptr();
 
     if (ptr->isConstant()) {
@@ -1905,6 +1910,7 @@
             masm.ma_dataTransferN(IsLoad, size, isSigned, HeapReg, Imm32(ptrImm),
                                   ToRegister(ins->output()), Offset, Assembler::Always);
         }
+        memoryBarrier(mir->barrierAfter());
         return true;
     }
 
@@ -1921,6 +1927,7 @@
             masm.ma_dataTransferN(IsLoad, size, isSigned, HeapReg, ptrReg,
                                   ToRegister(ins->output()), Offset, Assembler::Always);
         }
+        memoryBarrier(mir->barrierAfter());
         return true;
     }
 
@@ -1942,6 +1949,7 @@
         masm.ma_mov(Imm32(0), d, NoSetCond, Assembler::AboveOrEqual);
         masm.ma_dataTransferN(IsLoad, size, isSigned, HeapReg, ptrReg, d, Offset, Assembler::Below);
     }
+    memoryBarrier(mir->barrierAfter());
     masm.append(AsmJSHeapAccess(bo.getOffset()));
     return true;
 }
@@ -1965,6 +1973,7 @@
       default: MOZ_CRASH("unexpected array type");
     }
     const LAllocation *ptr = ins->ptr();
+    memoryBarrier(mir->barrierBefore());
     if (ptr->isConstant()) {
         MOZ_ASSERT(!mir->needsBoundsCheck());
         int32_t ptrImm = ptr->toConstant()->toInt32();
@@ -1979,6 +1988,7 @@
             masm.ma_dataTransferN(IsStore, size, isSigned, HeapReg, Imm32(ptrImm),
                                   ToRegister(ins->value()), Offset, Assembler::Always);
         }
+        memoryBarrier(mir->barrierAfter());
         return true;
     }
 
@@ -1996,6 +2006,7 @@
             masm.ma_dataTransferN(IsStore, size, isSigned, HeapReg, ptrReg,
                                   ToRegister(ins->value()), Offset, Assembler::Always);
         }
+        memoryBarrier(mir->barrierAfter());
         return true;
     }
 
@@ -2010,11 +2021,94 @@
         masm.ma_dataTransferN(IsStore, size, isSigned, HeapReg, ptrReg,
                               ToRegister(ins->value()), Offset, Assembler::Below);
     }
+    memoryBarrier(mir->barrierAfter());
     masm.append(AsmJSHeapAccess(bo.getOffset()));
     return true;
 }
 
 bool
+CodeGeneratorARM::visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins)
+{
+    MAsmJSCompareExchangeHeap *mir = ins->mir();
+
+    MOZ_ASSERT(mir->viewType() <= AsmJSHeapAccess::Uint32);
+    Scalar::Type vt = Scalar::Type(mir->viewType());
+
+    const LAllocation *ptr = ins->ptr();
+    Register ptrReg = ToRegister(ptr);
+    BaseIndex srcAddr(HeapReg, ptrReg, TimesOne);
+
+    Register oldval = ToRegister(ins->oldValue());
+    Register newval = ToRegister(ins->newValue());
+
+    Label rejoin;
+    uint32_t maybeCmpOffset = 0;
+    if (mir->needsBoundsCheck()) {
+        Label goahead;
+        BufferOffset bo = masm.ma_BoundsCheck(ptrReg);
+        Register out = ToRegister(ins->output());
+        maybeCmpOffset = bo.getOffset();
+        masm.ma_b(&goahead, Assembler::LessThan);
+        memoryBarrier(MembarFull);
+        masm.as_eor(out, out, O2Reg(out));
+        masm.ma_b(&rejoin, Assembler::Always);
+        masm.bind(&goahead);
+    }
+    masm.compareExchangeToTypedIntArray(vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        srcAddr, oldval, newval, InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    if (rejoin.used()) {
+        masm.bind(&rejoin);
+        masm.append(AsmJSHeapAccess(maybeCmpOffset));
+    }
+    return true;
+}
+
+bool
+CodeGeneratorARM::visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins)
+{
+    MAsmJSAtomicBinopHeap *mir = ins->mir();
+
+    MOZ_ASSERT(mir->viewType() <= AsmJSHeapAccess::Uint32);
+    Scalar::Type vt = Scalar::Type(mir->viewType());
+
+    const LAllocation *ptr = ins->ptr();
+    Register ptrReg = ToRegister(ptr);
+    Register temp = ins->temp()->isBogusTemp() ? InvalidReg : ToRegister(ins->temp());
+    const LAllocation* value = ins->value();
+    AtomicOp op = mir->operation();
+
+    BaseIndex srcAddr(HeapReg, ptrReg, TimesOne);
+
+    Label rejoin;
+    uint32_t maybeCmpOffset = 0;
+    if (mir->needsBoundsCheck()) {
+        Label goahead;
+        BufferOffset bo = masm.ma_BoundsCheck(ptrReg);
+        Register out = ToRegister(ins->output());
+        maybeCmpOffset = bo.getOffset();
+        masm.ma_b(&goahead, Assembler::LessThan);
+        memoryBarrier(MembarFull);
+        masm.as_eor(out, out, O2Reg(out));
+        masm.ma_b(&rejoin, Assembler::Always);
+        masm.bind(&goahead);
+    }
+    if (value->isConstant())
+        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        Imm32(ToInt32(value)), srcAddr, temp, InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    else
+        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        ToRegister(value), srcAddr, temp, InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    if (rejoin.used()) {
+        masm.bind(&rejoin);
+        masm.append(AsmJSHeapAccess(maybeCmpOffset));
+    }
+    return true;
+}
+
+bool
 CodeGeneratorARM::visitAsmJSPassStackArg(LAsmJSPassStackArg *ins)
 {
     const MAsmJSPassStackArg *mir = ins->mir();
@@ -2249,7 +2343,7 @@
 }
 
 void
-CodeGeneratorARM::memoryBarrier(int barrier)
+CodeGeneratorARM::memoryBarrier(MemoryBarrierBits barrier)
 {
     // On ARMv6 the optional argument (BarrierST, etc) is ignored.
     if (barrier == (MembarStoreStore|MembarSynchronizing))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/CodeGenerator-arm.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/CodeGenerator-arm.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/CodeGenerator-arm.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/CodeGenerator-arm.h	2014-11-26 21:45:57.000000000 +0000
@@ -181,7 +181,7 @@
     bool modICommon(MMod *mir, Register lhs, Register rhs, Register output, LSnapshot *snapshot,
                     Label &done);
 
-    void memoryBarrier(int barrier);
+    void memoryBarrier(MemoryBarrierBits barrier);
 
   public:
     CodeGeneratorARM(MIRGenerator *gen, LIRGraph *graph, MacroAssembler *masm);
@@ -206,6 +206,8 @@
     bool visitAsmJSCall(LAsmJSCall *ins);
     bool visitAsmJSLoadHeap(LAsmJSLoadHeap *ins);
     bool visitAsmJSStoreHeap(LAsmJSStoreHeap *ins);
+    bool visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins);
+    bool visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins);
     bool visitAsmJSLoadGlobalVar(LAsmJSLoadGlobalVar *ins);
     bool visitAsmJSStoreGlobalVar(LAsmJSStoreGlobalVar *ins);
     bool visitAsmJSLoadFuncPtr(LAsmJSLoadFuncPtr *ins);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Lowering-arm.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Lowering-arm.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Lowering-arm.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Lowering-arm.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -55,6 +55,12 @@
     return useRegisterOrNonDoubleConstant(mir);
 }
 
+LDefinition
+LIRGeneratorARM::tempByteOpRegister()
+{
+    return temp();
+}
+
 bool
 LIRGeneratorARM::lowerConstantDouble(double d, MInstruction *mir)
 {
@@ -199,8 +205,9 @@
 
 }
 
+template<size_t Temps>
 bool
-LIRGeneratorARM::lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir, MDefinition *lhs, MDefinition *rhs)
+LIRGeneratorARM::lowerForFPU(LInstructionHelper<1, 2, Temps> *ins, MDefinition *mir, MDefinition *lhs, MDefinition *rhs)
 {
     ins->setOperand(0, useRegisterAtStart(lhs));
     ins->setOperand(1, useRegisterAtStart(rhs));
@@ -208,6 +215,11 @@
                   LDefinition(LDefinition::TypeFrom(mir->type()), LDefinition::REGISTER));
 }
 
+template bool LIRGeneratorARM::lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir,
+                                           MDefinition *lhs, MDefinition *rhs);
+template bool LIRGeneratorARM::lowerForFPU(LInstructionHelper<1, 2, 1> *ins, MDefinition *mir,
+                                           MDefinition *lhs, MDefinition *rhs);
+
 bool
 LIRGeneratorARM::lowerForBitAndAndBranch(LBitAndAndBranch *baab, MInstruction *mir,
                                          MDefinition *lhs, MDefinition *rhs)
@@ -636,3 +648,47 @@
 
     return define(lir, ins);
 }
+
+bool
+LIRGeneratorARM::visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap *ins)
+{
+    MOZ_ASSERT(ins->viewType() < AsmJSHeapAccess::Float32);
+
+    MDefinition *ptr = ins->ptr();
+    MOZ_ASSERT(ptr->type() == MIRType_Int32);
+
+    LAsmJSCompareExchangeHeap *lir =
+        new(alloc()) LAsmJSCompareExchangeHeap(useRegister(ptr),
+                                               useRegister(ins->oldValue()),
+                                               useRegister(ins->newValue()));
+
+    return define(lir, ins);
+}
+
+bool
+LIRGeneratorARM::visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap *ins)
+{
+    MOZ_ASSERT(ins->viewType() < AsmJSHeapAccess::Float32);
+
+    MDefinition *ptr = ins->ptr();
+    MOZ_ASSERT(ptr->type() == MIRType_Int32);
+
+    LAsmJSAtomicBinopHeap *lir =
+        new(alloc()) LAsmJSAtomicBinopHeap(useRegister(ptr),
+                                           useRegister(ins->value()),
+                                           LDefinition::BogusTemp());
+
+    return define(lir, ins);
+}
+
+bool
+LIRGeneratorARM::visitSubstr(MSubstr *ins)
+{
+    LSubstr *lir = new (alloc()) LSubstr(useRegister(ins->string()),
+                                         useRegister(ins->begin()),
+                                         useRegister(ins->length()),
+                                         temp(),
+                                         temp(),
+                                         tempByteOpRegister());
+    return define(lir, ins) && assignSafepoint(lir, ins);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Lowering-arm.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Lowering-arm.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Lowering-arm.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Lowering-arm.h	2014-11-26 21:45:57.000000000 +0000
@@ -30,6 +30,7 @@
     // stores and loads; on ARM all registers are okay.
     LAllocation useByteOpRegister(MDefinition *mir);
     LAllocation useByteOpRegisterOrNonDoubleConstant(MDefinition *mir);
+    LDefinition tempByteOpRegister();
 
     inline LDefinition tempToUnbox() {
         return LDefinition::BogusTemp();
@@ -56,7 +57,8 @@
 
     bool lowerForFPU(LInstructionHelper<1, 1, 0> *ins, MDefinition *mir,
                      MDefinition *src);
-    bool lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir,
+    template<size_t Temps>
+    bool lowerForFPU(LInstructionHelper<1, 2, Temps> *ins, MDefinition *mir,
                      MDefinition *lhs, MDefinition *rhs);
 
     bool lowerForCompIx4(LSimdBinaryCompIx4 *ins, MSimdBinaryComp *mir,
@@ -101,6 +103,8 @@
     bool visitAsmJSLoadHeap(MAsmJSLoadHeap *ins);
     bool visitAsmJSStoreHeap(MAsmJSStoreHeap *ins);
     bool visitAsmJSLoadFuncPtr(MAsmJSLoadFuncPtr *ins);
+    bool visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap *ins);
+    bool visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap *ins);
     bool visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins);
     bool visitForkJoinGetSlice(MForkJoinGetSlice *ins);
     bool visitSimdTernaryBitwise(MSimdTernaryBitwise *ins);
@@ -108,6 +112,7 @@
     bool visitSimdValueX4(MSimdValueX4 *ins);
     bool visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement *ins);
     bool visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop *ins);
+    bool visitSubstr(MSubstr *ins);
 };
 
 typedef LIRGeneratorARM LIRGeneratorSpecific;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/MacroAssembler-arm.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/MacroAssembler-arm.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/MacroAssembler-arm.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/MacroAssembler-arm.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -1861,11 +1861,11 @@
 }
 
 void
-MacroAssemblerARMCompat::callIonFromAsmJS(Register callee)
+MacroAssemblerARMCompat::callJitFromAsmJS(Register callee)
 {
     ma_callIonNoPush(callee);
 
-    // The Ion ABI has the callee pop the return address off the stack.
+    // The JIT ABI has the callee pop the return address off the stack.
     // The asm.js caller assumes that the call leaves sp unchanged, so bump
     // the stack.
     subPtr(Imm32(sizeof(void*)), sp);
@@ -3715,8 +3715,7 @@
     // When the stack is 8 byte aligned, we want to decrement sp by 8, and write
     // pc + 8 into the new sp. When we return from this call, sp will be its
     // present value minus 4.
-    AutoForbidPools afp(this, 2);
-    as_dtr(IsStore, 32, PreIndex, pc, DTRAddr(sp, DtrOffImm(-8)));
+    as_sub(sp, sp, Imm8(4));
     as_blx(r);
 }
 void
@@ -3724,8 +3723,9 @@
 {
     // Since we just write the return address into the stack, which is popped on
     // return, the net effect is removing 4 bytes from the stack.
-    AutoForbidPools afp(this, 2);
-    as_dtr(IsStore, 32, Offset, pc, DTRAddr(sp, DtrOffImm(0)));
+
+    // Bug 1103108: remove this function, and refactor all uses.
+    as_add(sp, sp, Imm8(4));
     as_blx(r);
 }
 
@@ -3735,19 +3735,18 @@
     // The stack is unaligned by 4 bytes. We push the pc to the stack to align
     // the stack before the call, when we return the pc is poped and the stack
     // is restored to its unaligned state.
-    AutoForbidPools afp(this, 2);
-    ma_push(pc);
     as_blx(r);
 }
 
 void
 MacroAssemblerARM::ma_callIonHalfPush(Label *label)
 {
-    // The stack is unaligned by 4 bytes. We push the pc to the stack to align
-    // the stack before the call, when we return the pc is poped and the stack
+    // The stack is unaligned by 4 bytes. The callee will push the lr to the stack to align
+    // the stack after the call, when we return the pc is poped and the stack
     // is restored to its unaligned state.
-    AutoForbidPools afp(this, 2);
-    ma_push(pc);
+
+    // leave the stack as-is so the callee-side can push when necessary.
+
     as_bl(label, Always);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/MacroAssembler-arm.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/MacroAssembler-arm.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/MacroAssembler-arm.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/MacroAssembler-arm.h	2014-11-26 21:45:57.000000000 +0000
@@ -1293,7 +1293,7 @@
     // Makes an Ion call using the only two methods that it is sane for
     // independent code to make a call.
     void callIon(Register callee);
-    void callIonFromAsmJS(Register callee);
+    void callJitFromAsmJS(Register callee);
 
     void reserveStack(uint32_t amount);
     void freeStack(uint32_t amount);
@@ -1833,6 +1833,9 @@
     void loadAsmJSHeapRegisterFromGlobalData() {
         loadPtr(Address(GlobalReg, AsmJSHeapGlobalDataOffset - AsmJSGlobalRegBias), HeapReg);
     }
+    void pushReturnAddress() {
+        push(lr);
+    }
 };
 
 typedef MacroAssemblerARMCompat MacroAssemblerSpecific;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Simulator-arm.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Simulator-arm.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Simulator-arm.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Simulator-arm.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -4186,6 +4186,8 @@
 void
 Simulator::disable_single_stepping()
 {
+    if (!single_stepping_)
+        return;
     single_step_callback_(single_step_callback_arg_, this, (void*)get_pc());
     single_stepping_ = false;
     single_step_callback_ = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Trampoline-arm.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Trampoline-arm.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/arm/Trampoline-arm.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/arm/Trampoline-arm.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -419,6 +419,8 @@
 JitRuntime::generateArgumentsRectifier(JSContext *cx, ExecutionMode mode, void **returnAddrOut)
 {
     MacroAssembler masm(cx);
+    masm.pushReturnAddress();
+
     // ArgumentsRectifierReg contains the |nargs| pushed onto the current frame.
     // Including |this|, there are (|nargs| + 1) arguments to copy.
     MOZ_ASSERT(ArgumentsRectifierReg == r8);
@@ -747,6 +749,10 @@
     //  +0  ExitFrame
     //
     // We're aligned to an exit frame, so link it up.
+    // If it isn't a tail call, then the return address needs to be saved
+    if (f.expectTailCall == NonTailCall)
+        masm.pushReturnAddress();
+
     masm.enterExitFrameAndLoadContext(&f, cxreg, regs.getAny(), f.executionMode);
 
     // Save the base of the argument set stored on the stack.
@@ -914,6 +920,7 @@
         save = RegisterSet(GeneralRegisterSet(Registers::VolatileMask),
                            FloatRegisterSet());
     }
+    save.add(lr);
     masm.PushRegsInMask(save);
 
     MOZ_ASSERT(PreBarrierReg == r1);
@@ -923,9 +930,9 @@
     masm.passABIArg(r0);
     masm.passABIArg(r1);
     masm.callWithABI(IonMarkFunction(type));
-
+    save.take(AnyRegister(lr));
+    save.add(pc);
     masm.PopRegsInMask(save);
-    masm.ret();
 
     Linker linker(masm);
     AutoFlushICache afc("PreBarrier");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/AtomicOp.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/AtomicOp.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/AtomicOp.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/AtomicOp.h	2014-11-26 21:45:56.000000000 +0000
@@ -35,18 +35,37 @@
     MembarSynchronizing = 16,
 
     // For validity testing
+    MembarNobits = 0,
     MembarAllbits = 31,
 };
 
+static inline MOZ_CONSTEXPR MemoryBarrierBits
+operator|(MemoryBarrierBits a, MemoryBarrierBits b)
+{
+    return MemoryBarrierBits(int(a) | int(b));
+}
+
+static inline MOZ_CONSTEXPR MemoryBarrierBits
+operator&(MemoryBarrierBits a, MemoryBarrierBits b)
+{
+    return MemoryBarrierBits(int(a) & int(b));
+}
+
+static inline MOZ_CONSTEXPR MemoryBarrierBits
+operator~(MemoryBarrierBits a)
+{
+    return MemoryBarrierBits(~int(a));
+}
+
 // Standard barrier bits for a full barrier.
-static const int MembarFull = MembarLoadLoad|MembarLoadStore|MembarStoreLoad|MembarStoreStore;
+static MOZ_CONSTEXPR_VAR MemoryBarrierBits MembarFull = MembarLoadLoad|MembarLoadStore|MembarStoreLoad|MembarStoreStore;
 
 // Standard sets of barrier bits for atomic loads and stores.
 // See http://gee.cs.oswego.edu/dl/jmm/cookbook.html for more.
-static const int MembarBeforeLoad = 0;
-static const int MembarAfterLoad = MembarLoadLoad|MembarLoadStore;
-static const int MembarBeforeStore = MembarStoreStore;
-static const int MembarAfterStore = MembarStoreLoad;
+static MOZ_CONSTEXPR_VAR MemoryBarrierBits MembarBeforeLoad = MembarNobits;
+static MOZ_CONSTEXPR_VAR MemoryBarrierBits MembarAfterLoad = MembarLoadLoad|MembarLoadStore;
+static MOZ_CONSTEXPR_VAR MemoryBarrierBits MembarBeforeStore = MembarStoreStore;
+static MOZ_CONSTEXPR_VAR MemoryBarrierBits MembarAfterStore = MembarStoreLoad;
 
 } // namespace jit
 } // namespace js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Bailouts.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Bailouts.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Bailouts.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Bailouts.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -87,7 +87,7 @@
     // increment the reference counter for each activation that appear on the
     // stack. As the bailed frame is one of them, we have to decrement it now.
     if (iter.ionScript()->invalidated())
-        iter.ionScript()->decref(cx->runtime()->defaultFreeOp());
+        iter.ionScript()->decrementInvalidationCount(cx->runtime()->defaultFreeOp());
 
     return retval;
 }
@@ -159,7 +159,7 @@
         JitSpew(JitSpew_IonInvalidate, "   new  ra %p", (void *) frame->returnAddress());
     }
 
-    iter.ionScript()->decref(cx->runtime()->defaultFreeOp());
+    iter.ionScript()->decrementInvalidationCount(cx->runtime()->defaultFreeOp());
 
     return retval;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineBailouts.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineBailouts.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineBailouts.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineBailouts.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -445,6 +445,28 @@
     return pc;
 }
 
+static bool
+HasLiveIteratorAtStackDepth(JSScript *script, jsbytecode *pc, uint32_t stackDepth)
+{
+    if (!script->hasTrynotes())
+        return false;
+
+    JSTryNote *tn = script->trynotes()->vector;
+    JSTryNote *tnEnd = tn + script->trynotes()->length;
+    uint32_t pcOffset = uint32_t(pc - script->main());
+    for (; tn != tnEnd; ++tn) {
+        if (pcOffset < tn->start)
+            continue;
+        if (pcOffset >= tn->start + tn->length)
+            continue;
+
+        if (tn->kind == JSTRY_ITER && stackDepth == tn->stackDepth)
+            return true;
+    }
+
+    return false;
+}
+
 // For every inline frame, we write out the following data:
 //
 //                      |      ...      |
@@ -607,6 +629,12 @@
         }
     }
 
+    // If we are bailing to a script whose execution is observed, mark the
+    // baseline frame as a debuggee frame. This is to cover the case where we
+    // don't rematerialize the Ion frame via the Debugger.
+    if (script->isDebuggee())
+        flags |= BaselineFrame::DEBUGGEE;
+
     // Initialize BaselineFrame's scopeChain and argsObj
     JSObject *scopeChain = nullptr;
     Value returnValue;
@@ -841,10 +869,11 @@
             //
             // For instance, if calling |f()| pushed an Ion frame which threw,
             // the snapshot expects the return value to be pushed, but it's
-            // possible nothing was pushed before we threw. Iterators might
-            // still be on the stack, so we can't just drop the stack.
-            MOZ_ASSERT(cx->compartment()->debugMode());
-            if (iter.moreFrames())
+            // possible nothing was pushed before we threw. We can't drop
+            // iterators, however, so read them out. They will be closed by
+            // HandleExceptionBaseline.
+            MOZ_ASSERT(cx->compartment()->isDebuggee());
+            if (iter.moreFrames() || HasLiveIteratorAtStackDepth(script, pc, i + 1))
                 v = iter.read();
             else
                 v = MagicValue(JS_OPTIMIZED_OUT);
@@ -1594,8 +1623,14 @@
             "  Copied from rematerialized frame at (%p,%u)",
             fp, inlineDepth);
 
-    if (cx->compartment()->debugMode())
+    // Propagate the debuggee frame flag. For the case where the Debugger did
+    // not rematerialize an Ion frame, the baseline frame has its debuggee
+    // flag set iff its script is considered a debuggee. See the debuggee case
+    // in InitFromBailout.
+    if (rematFrame->isDebuggee()) {
+        frame->setIsDebuggee();
         return Debugger::handleIonBailout(cx, rematFrame, frame);
+    }
 
     return true;
 }
@@ -1742,6 +1777,7 @@
       case Bailout_NonSymbolInput:
       case Bailout_GuardThreadExclusive:
       case Bailout_InitialState:
+      case Bailout_Debugger:
         // Do nothing.
         break;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineCompiler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineCompiler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineCompiler.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineCompiler.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "jit/BaselineCompiler.h"
 
+#include "mozilla/UniquePtr.h"
+
 #include "jit/BaselineHelpers.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
@@ -180,15 +182,16 @@
     // Note: There is an extra entry in the bytecode type map for the search hint, see below.
     size_t bytecodeTypeMapEntries = script->nTypeSets() + 1;
 
-    BaselineScript *baselineScript = BaselineScript::New(script, prologueOffset_.offset(),
-                                                         epilogueOffset_.offset(),
-                                                         spsPushToggleOffset_.offset(),
-                                                         postDebugPrologueOffset_.offset(),
-                                                         icEntries_.length(),
-                                                         pcMappingIndexEntries.length(),
-                                                         pcEntries.length(),
-                                                         bytecodeTypeMapEntries,
-                                                         yieldOffsets_.length());
+    mozilla::UniquePtr<BaselineScript, JS::DeletePolicy<BaselineScript> > baselineScript(
+        BaselineScript::New(script, prologueOffset_.offset(),
+                            epilogueOffset_.offset(),
+                            spsPushToggleOffset_.offset(),
+                            postDebugPrologueOffset_.offset(),
+                            icEntries_.length(),
+                            pcMappingIndexEntries.length(),
+                            pcEntries.length(),
+                            bytecodeTypeMapEntries,
+                            yieldOffsets_.length()));
     if (!baselineScript)
         return Method_Error;
 
@@ -196,7 +199,7 @@
     baselineScript->setTemplateScope(templateScope);
 
     JitSpew(JitSpew_BaselineScripts, "Created BaselineScript %p (raw %p) for %s:%d",
-            (void *) baselineScript, (void *) code->raw(),
+            (void *) baselineScript.get(), (void *) code->raw(),
             script->filename(), script->lineno());
 
 #ifdef JS_ION_PERF
@@ -247,13 +250,13 @@
 
     baselineScript->copyYieldEntries(script, yieldOffsets_);
 
-    if (script->compartment()->debugMode())
-        baselineScript->setDebugMode();
+    if (compileDebugInstrumentation_)
+        baselineScript->setHasDebugInstrumentation();
 
     // Register a native => bytecode mapping entry for this script if needed.
     if (cx->runtime()->jitRuntime()->isNativeToBytecodeMapEnabled(cx->runtime())) {
         JitSpew(JitSpew_Profiling, "Added JitcodeGlobalEntry for baseline script %s:%d (%p)",
-                    script->filename(), script->lineno(), baselineScript);
+                    script->filename(), script->lineno(), baselineScript.get());
         JitcodeGlobalEntry::BaselineEntry entry;
         entry.init(code->raw(), code->raw() + code->instructionsSize(), script);
 
@@ -265,7 +268,7 @@
         code->setHasBytecodeMap();
     }
 
-    script->setBaselineScript(cx, baselineScript);
+    script->setBaselineScript(cx, baselineScript.release());
 
     return Method_Compiled;
 }
@@ -306,11 +309,15 @@
 bool
 BaselineCompiler::emitPrologue()
 {
+#ifdef JS_USE_LINK_REGISTER
+    // Push link register from generateEnterJIT()'s BLR.
+    masm.pushReturnAddress();
+    masm.checkStackAlignment();
+#endif
     masm.push(BaselineFrameReg);
     masm.mov(BaselineStackReg, BaselineFrameReg);
 
     masm.subPtr(Imm32(BaselineFrame::Size()), BaselineStackReg);
-    masm.checkStackAlignment();
 
     // Initialize BaselineFrame. For eval scripts, the scope chain
     // is passed in R1, so we have to be careful not to clobber
@@ -557,7 +564,7 @@
 bool
 BaselineCompiler::emitDebugPrologue()
 {
-    if (debugMode_) {
+    if (compileDebugInstrumentation_) {
         // Load pointer to BaselineFrame in R0.
         masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
 
@@ -740,7 +747,7 @@
 bool
 BaselineCompiler::emitDebugTrap()
 {
-    MOZ_ASSERT(debugMode_);
+    MOZ_ASSERT(compileDebugInstrumentation_);
     MOZ_ASSERT(frame.numUnsyncedSlots() == 0);
 
     bool enabled = script->stepModeEnabled() || script->hasBreakpointsAt(pc);
@@ -828,7 +835,7 @@
         }
 
         // Always sync in debug mode.
-        if (debugMode_)
+        if (compileDebugInstrumentation_)
             frame.syncStack(0);
 
         // At the beginning of any op, at most the top 2 stack-values are unsynced.
@@ -850,7 +857,7 @@
             return Method_Error;
 
         // Emit traps for breakpoints and step mode.
-        if (debugMode_ && !emitDebugTrap())
+        if (compileDebugInstrumentation_ && !emitDebugTrap())
             return Method_Error;
 
         switch (op) {
@@ -2151,9 +2158,12 @@
     Address address = getScopeCoordinateAddress(R0.scratchReg());
     masm.loadValue(address, R0);
 
-    ICTypeMonitor_Fallback::Compiler compiler(cx, (ICMonitoredFallbackStub *) nullptr);
-    if (!emitOpIC(compiler.getStub(&stubSpace_)))
-        return false;
+    if (ionCompileable_) {
+        // No need to monitor types if we know Ion can't compile this script.
+        ICTypeMonitor_Fallback::Compiler compiler(cx, (ICMonitoredFallbackStub *) nullptr);
+        if (!emitOpIC(compiler.getStub(&stubSpace_)))
+            return false;
+    }
 
     frame.push(R0);
     return true;
@@ -2903,7 +2913,7 @@
 bool
 BaselineCompiler::emit_JSOP_DEBUGLEAVEBLOCK()
 {
-    if (!debugMode_)
+    if (!compileDebugInstrumentation_)
         return true;
 
     prepareVMCall();
@@ -2974,12 +2984,10 @@
 bool
 BaselineCompiler::emit_JSOP_DEBUGGER()
 {
-    if (!debugMode_)
-        return true;
-
     prepareVMCall();
     pushArg(ImmPtr(pc));
 
+    frame.assertSyncedStack();
     masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
     pushArg(R0.scratchReg());
 
@@ -3004,7 +3012,7 @@
 bool
 BaselineCompiler::emitReturn()
 {
-    if (debugMode_) {
+    if (compileDebugInstrumentation_) {
         // Move return value into the frame's rval slot.
         masm.storeValue(JSReturnOperand, frame.addressOfReturnValue());
         masm.or32(Imm32(BaselineFrame::HAS_RVAL), frame.addressOfFlags());
@@ -3402,6 +3410,22 @@
     return emitReturn();
 }
 
+typedef bool (*DebugAfterYieldFn)(JSContext *, BaselineFrame *);
+static const VMFunction DebugAfterYieldInfo = FunctionInfo<DebugAfterYieldFn>(jit::DebugAfterYield);
+
+bool
+BaselineCompiler::emit_JSOP_DEBUGAFTERYIELD()
+{
+    if (!compileDebugInstrumentation_)
+        return true;
+
+    frame.assertSyncedStack();
+    masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
+    prepareVMCall();
+    pushArg(R0.scratchReg());
+    return callVM(DebugAfterYieldInfo);
+}
+
 typedef bool (*FinalSuspendFn)(JSContext *, HandleObject, BaselineFrame *, jsbytecode *);
 static const VMFunction FinalSuspendInfo = FunctionInfo<FinalSuspendFn>(jit::FinalSuspend);
 
@@ -3429,8 +3453,8 @@
                                   MutableHandleValue);
 static const VMFunction InterpretResumeInfo = FunctionInfo<InterpretResumeFn>(jit::InterpretResume);
 
-typedef bool (*GeneratorThrowFn)(JSContext *, HandleObject, HandleValue, uint32_t);
-static const VMFunction GeneratorThrowInfo = FunctionInfo<GeneratorThrowFn>(js::GeneratorThrowOrClose);
+typedef bool (*GeneratorThrowFn)(JSContext *, BaselineFrame *, HandleObject, HandleValue, uint32_t);
+static const VMFunction GeneratorThrowInfo = FunctionInfo<GeneratorThrowFn>(jit::GeneratorThrowOrClose, TailCall);
 
 bool
 BaselineCompiler::emit_JSOP_RESUME()
@@ -3558,6 +3582,7 @@
         }
         masm.bind(&loopDone);
 
+        masm.patchableCallPreBarrier(exprStackSlot, MIRType_Value);
         masm.storeValue(NullValue(), exprStackSlot);
         regs.add(initLength);
     }
@@ -3580,11 +3605,13 @@
         masm.movePtr(scratch2, scratch3);
         masm.subPtr(BaselineStackReg, scratch2);
         masm.store32(scratch2, Address(BaselineFrameReg, BaselineFrame::reverseOffsetOfFrameSize()));
+        masm.loadBaselineFramePtr(BaselineFrameReg, scratch2);
 
         prepareVMCall();
         pushArg(Imm32(resumeKind));
         pushArg(retVal);
         pushArg(genObj);
+        pushArg(scratch2);
 
         JitCode *code = cx->runtime()->jitRuntime()->getVMWrapper(GeneratorThrowInfo);
         if (!code)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineCompiler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineCompiler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineCompiler.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineCompiler.h	2014-11-26 21:45:56.000000000 +0000
@@ -176,6 +176,7 @@
     _(JSOP_GENERATOR)          \
     _(JSOP_INITIALYIELD)       \
     _(JSOP_YIELD)              \
+    _(JSOP_DEBUGAFTERYIELD)    \
     _(JSOP_FINALYIELDRVAL)     \
     _(JSOP_RESUME)             \
     _(JSOP_CALLEE)             \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineDebugModeOSR.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineDebugModeOSR.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineDebugModeOSR.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineDebugModeOSR.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -107,6 +107,7 @@
     }
 
     bool allocateRecompileInfo(JSContext *cx) {
+        MOZ_ASSERT(script);
         MOZ_ASSERT(needsRecompileInfo());
 
         // If we are returning to a frame which needs a continuation fixer,
@@ -122,6 +123,7 @@
     }
 
     ICFallbackStub *fallbackStub() const {
+        MOZ_ASSERT(script);
         MOZ_ASSERT(oldStub);
         return script->baselineScript()->icEntryFromPCOffset(pcOffset).fallbackStub();
     }
@@ -167,8 +169,8 @@
 };
 
 static bool
-CollectOnStackScripts(JSContext *cx, const JitActivationIterator &activation,
-                      DebugModeOSREntryVector &entries)
+CollectJitStackScripts(JSContext *cx, const Debugger::ExecutionObservableSet &obs,
+                       const ActivationIterator &activation, DebugModeOSREntryVector &entries)
 {
     ICStub *prevFrameStubPtr = nullptr;
     bool needsRecompileHandler = false;
@@ -177,6 +179,11 @@
           case JitFrame_BaselineJS: {
             JSScript *script = iter.script();
 
+            if (!obs.shouldRecompileOrInvalidate(script)) {
+                prevFrameStubPtr = nullptr;
+                break;
+            }
+
             if (BaselineDebugModeOSRInfo *info = iter.baselineFrame()->getDebugModeOSRInfo()) {
                 // If patching a previously patched yet unpopped frame, we can
                 // use the BaselineDebugModeOSRInfo on the frame directly to
@@ -184,7 +191,7 @@
                 // it points into the debug mode OSR handler and cannot be
                 // used to look up a corresponding ICEntry.
                 //
-                // See cases F and G in PatchBaselineFrameForDebugMode.
+                // See cases F and G in PatchBaselineFramesForDebugMode.
                 if (!entries.append(DebugModeOSREntry(script, info)))
                     return false;
             } else {
@@ -201,7 +208,6 @@
 
                 needsRecompileHandler |= true;
             }
-
             entries.back().oldStub = prevFrameStubPtr;
             prevFrameStubPtr = nullptr;
             break;
@@ -213,12 +219,15 @@
             break;
 
           case JitFrame_IonJS: {
-            JSScript *script = iter.script();
-            if (!entries.append(DebugModeOSREntry(script)))
-                return false;
-            for (InlineFrameIterator inlineIter(cx, &iter); inlineIter.more(); ++inlineIter) {
-                if (!entries.append(DebugModeOSREntry(inlineIter.script())))
-                    return false;
+            InlineFrameIterator inlineIter(cx, &iter);
+            while (true) {
+                if (obs.shouldRecompileOrInvalidate(inlineIter.script())) {
+                    if (!entries.append(DebugModeOSREntry(inlineIter.script())))
+                        return false;
+                }
+                if (!inlineIter.more())
+                    break;
+                ++inlineIter;
             }
             break;
           }
@@ -238,6 +247,25 @@
     return true;
 }
 
+static bool
+CollectInterpreterStackScripts(JSContext *cx, const Debugger::ExecutionObservableSet &obs,
+                               const ActivationIterator &activation,
+                               DebugModeOSREntryVector &entries)
+{
+    // Collect interpreter frame stacks with IonScript or BaselineScript as
+    // well. These do not need to be patched, but do need to be invalidated
+    // and recompiled.
+    InterpreterActivation *act = activation.activation()->asInterpreter();
+    for (InterpreterFrameIterator iter(act); !iter.done(); ++iter) {
+        JSScript *script = iter.frame()->script();
+        if (obs.shouldRecompileOrInvalidate(script)) {
+            if (!entries.append(DebugModeOSREntry(iter.frame()->script())))
+                return false;
+        }
+    }
+    return true;
+}
+
 static const char *
 ICEntryKindToString(ICEntry::Kind kind)
 {
@@ -278,7 +306,8 @@
 }
 
 static void
-PatchBaselineFramesForDebugMode(JSContext *cx, const JitActivationIterator &activation,
+PatchBaselineFramesForDebugMode(JSContext *cx, const Debugger::ExecutionObservableSet &obs,
+                                const ActivationIterator &activation,
                                 DebugModeOSREntryVector &entries, size_t *start)
 {
     //
@@ -290,7 +319,8 @@
     //
     // Off to On:
     //  A. From a "can call" stub.
-    //  B. From a VM call (interrupt handler, debugger statement handler).
+    //  B. From a VM call (interrupt handler, debugger statement handler,
+    //                     throw).
     //
     // On to Off:
     //  - All the ways above.
@@ -312,14 +342,17 @@
 
     IonCommonFrameLayout *prev = nullptr;
     size_t entryIndex = *start;
-    DebugOnly<bool> expectedDebugMode = cx->compartment()->debugMode();
 
     for (JitFrameIterator iter(activation); !iter.done(); ++iter) {
-        DebugModeOSREntry &entry = entries[entryIndex];
-
         switch (iter.type()) {
           case JitFrame_BaselineJS: {
-            // If the script wasn't recompiled, there's nothing to patch.
+            // If the script wasn't recompiled or is not observed, there's
+            // nothing to patch.
+            if (!obs.shouldRecompileOrInvalidate(iter.script()))
+                break;
+
+            DebugModeOSREntry &entry = entries[entryIndex];
+
             if (!entry.recompiled()) {
                 entryIndex++;
                 break;
@@ -331,7 +364,6 @@
 
             MOZ_ASSERT(script == iter.script());
             MOZ_ASSERT(pcOffset < script->length());
-            MOZ_ASSERT(script->baselineScript()->debugMode() == expectedDebugMode);
 
             BaselineScript *bl = script->baselineScript();
             ICEntry::Kind kind = entry.frameKind;
@@ -348,6 +380,8 @@
                 // directly to the IC resume address.
                 uint8_t *retAddr = bl->returnAddressForIC(bl->icEntryFromPCOffset(pcOffset));
                 SpewPatchBaselineFrame(prev->returnAddress(), retAddr, script, kind, pc);
+                DebugModeOSRVolatileJitFrameIterator::forwardLiveIterators(
+                    cx, prev->returnAddress(), retAddr);
                 prev->setReturnAddress(retAddr);
                 entryIndex++;
                 break;
@@ -358,17 +392,20 @@
             // We undo a previous recompile by handling cases B, C, D, and E
             // like normal, except that we retrieved the pc information via
             // the previous OSR debug info stashed on the frame.
-            if (BaselineDebugModeOSRInfo *info = iter.baselineFrame()->getDebugModeOSRInfo()) {
+            BaselineDebugModeOSRInfo *info = iter.baselineFrame()->getDebugModeOSRInfo();
+            if (info) {
                 MOZ_ASSERT(info->pc == pc);
                 MOZ_ASSERT(info->frameKind == kind);
 
                 // Case G, might need to undo B, C, D, or E.
-                MOZ_ASSERT_IF(expectedDebugMode, (kind == ICEntry::Kind_CallVM ||
-                                                  kind == ICEntry::Kind_DebugTrap ||
-                                                  kind == ICEntry::Kind_DebugPrologue ||
-                                                  kind == ICEntry::Kind_DebugEpilogue));
+                MOZ_ASSERT_IF(script->baselineScript()->hasDebugInstrumentation(),
+                              kind == ICEntry::Kind_CallVM ||
+                              kind == ICEntry::Kind_DebugTrap ||
+                              kind == ICEntry::Kind_DebugPrologue ||
+                              kind == ICEntry::Kind_DebugEpilogue);
                 // Case F, should only need to undo case B.
-                MOZ_ASSERT_IF(!expectedDebugMode, kind == ICEntry::Kind_CallVM);
+                MOZ_ASSERT_IF(!script->baselineScript()->hasDebugInstrumentation(),
+                              kind == ICEntry::Kind_CallVM);
 
                 // We will have allocated a new recompile info, so delete the
                 // existing one.
@@ -387,7 +424,19 @@
                 // Patching returns from an interrupt handler or the debugger
                 // statement handler is similar in that we can resume at the
                 // next op.
-                pc += GetBytecodeLength(pc);
+                //
+                // Throws are treated differently, as patching a throw means
+                // we are recompiling on-stack scripts from inside an
+                // onExceptionUnwind invocation. The Baseline compiler
+                // considers all bytecode after the throw to be unreachable
+                // and does not compile them, so we cannot patch the resume
+                // address to be the next pc. Since execution cannot continue
+                // after the throw anyways, it doesn't matter what we patch
+                // the resume address with. So that frame iterators may
+                // continue working, we patch the resume address to be right
+                // at the throw.
+                if (JSOp(*pc) != JSOP_THROW)
+                    pc += GetBytecodeLength(pc);
                 recompInfo->resumeAddr = bl->nativeCodeForPC(script, pc, &recompInfo->slotInfo);
                 popFrameReg = true;
                 break;
@@ -441,13 +490,20 @@
           }
 
           case JitFrame_BaselineStub: {
+            JitFrameIterator prev(iter);
+            ++prev;
+            BaselineFrame *prevFrame = prev.baselineFrame();
+            if (!obs.shouldRecompileOrInvalidate(prevFrame->script()))
+                break;
+
+            DebugModeOSREntry &entry = entries[entryIndex];
+
             // If the script wasn't recompiled, there's nothing to patch.
             if (!entry.recompiled())
                 break;
 
             IonBaselineStubFrameLayout *layout =
                 reinterpret_cast<IonBaselineStubFrameLayout *>(iter.fp());
-            MOZ_ASSERT(entry.script->baselineScript()->debugMode() == expectedDebugMode);
             MOZ_ASSERT(layout->maybeStubPtr() == entry.oldStub);
 
             // Patch baseline stub frames for case A above.
@@ -476,12 +532,18 @@
             break;
           }
 
-          case JitFrame_IonJS:
+          case JitFrame_IonJS: {
             // Nothing to patch.
-            entryIndex++;
-            for (InlineFrameIterator inlineIter(cx, &iter); inlineIter.more(); ++inlineIter)
-                entryIndex++;
+            InlineFrameIterator inlineIter(cx, &iter);
+            while (true) {
+                if (obs.shouldRecompileOrInvalidate(inlineIter.script()))
+                    entryIndex++;
+                if (!inlineIter.more())
+                    break;
+                ++inlineIter;
+            }
             break;
+          }
 
           default:;
         }
@@ -492,28 +554,40 @@
     *start = entryIndex;
 }
 
+static void
+SkipInterpreterFrameEntries(const Debugger::ExecutionObservableSet &obs,
+                            const ActivationIterator &activation,
+                            DebugModeOSREntryVector &entries, size_t *start)
+{
+    size_t entryIndex = *start;
+
+    // Skip interpreter frames, which do not need patching.
+    InterpreterActivation *act = activation.activation()->asInterpreter();
+    for (InterpreterFrameIterator iter(act); !iter.done(); ++iter) {
+        if (obs.shouldRecompileOrInvalidate(iter.frame()->script()))
+            entryIndex++;
+    }
+
+    *start = entryIndex;
+}
+
 static bool
-RecompileBaselineScriptForDebugMode(JSContext *cx, JSScript *script)
+RecompileBaselineScriptForDebugMode(JSContext *cx, JSScript *script,
+                                    Debugger::IsObserving observing)
 {
     BaselineScript *oldBaselineScript = script->baselineScript();
 
     // If a script is on the stack multiple times, it may have already
     // been recompiled.
-    bool expectedDebugMode = cx->compartment()->debugMode();
-    if (oldBaselineScript->debugMode() == expectedDebugMode)
+    if (oldBaselineScript->hasDebugInstrumentation() == observing)
         return true;
 
-    JitSpew(JitSpew_BaselineDebugModeOSR, "Recompiling (%s:%d) for debug mode %s",
-            script->filename(), script->lineno(), expectedDebugMode ? "ON" : "OFF");
-
-    CancelOffThreadIonCompile(cx->compartment(), script);
-
-    if (script->hasIonScript())
-        Invalidate(cx, script, /* resetUses = */ false);
+    JitSpew(JitSpew_BaselineDebugModeOSR, "Recompiling (%s:%d) for %s",
+            script->filename(), script->lineno(), observing ? "DEBUGGING" : "NORMAL EXECUTION");
 
     script->setBaselineScript(cx, nullptr);
 
-    MethodStatus status = BaselineCompile(cx, script);
+    MethodStatus status = BaselineCompile(cx, script, /* forceDebugMode = */ observing);
     if (status != Method_Compiled) {
         // We will only fail to recompile for debug mode due to OOM. Restore
         // the old baseline script in case something doesn't properly
@@ -525,7 +599,7 @@
 
     // Don't destroy the old baseline script yet, since if we fail any of the
     // recompiles we need to rollback all the old baseline scripts.
-    MOZ_ASSERT(script->baselineScript()->debugMode() == expectedDebugMode);
+    MOZ_ASSERT(script->baselineScript()->hasDebugInstrumentation() == observing);
     return true;
 }
 
@@ -625,6 +699,35 @@
     return true;
 }
 
+static bool
+InvalidateScriptsInZone(JSContext *cx, Zone *zone, const Vector<DebugModeOSREntry> &entries)
+{
+    types::RecompileInfoVector invalid;
+    for (UniqueScriptOSREntryIter iter(entries); !iter.done(); ++iter) {
+        JSScript *script = iter.entry().script;
+        if (script->compartment()->zone() != zone)
+            continue;
+
+        if (script->hasIonScript()) {
+            if (!invalid.append(script->ionScript()->recompileInfo()))
+                return false;
+        }
+
+        // Cancel off-thread Ion compile for anything that has a
+        // BaselineScript. If we relied on the call to Invalidate below to
+        // cancel off-thread Ion compiles, only those with existing IonScripts
+        // would be cancelled.
+        if (script->hasBaselineScript())
+            CancelOffThreadIonCompile(script->compartment(), script);
+    }
+
+    // No need to cancel off-thread Ion compiles again, we already did it
+    // above.
+    Invalidate(zone->types, cx->runtime()->defaultFreeOp(), invalid,
+               /* resetUses = */ true, /* cancelOffThread = */ false);
+    return true;
+}
+
 static void
 UndoRecompileBaselineScriptsForDebugMode(JSContext *cx,
                                          const DebugModeOSREntryVector &entries)
@@ -643,39 +746,55 @@
 }
 
 bool
-jit::RecompileOnStackBaselineScriptsForDebugMode(JSContext *cx, JSCompartment *comp)
+jit::RecompileOnStackBaselineScriptsForDebugMode(JSContext *cx,
+                                                 const Debugger::ExecutionObservableSet &obs,
+                                                 Debugger::IsObserving observing)
 {
-    AutoCompartment ac(cx, comp);
-
     // First recompile the active scripts on the stack and patch the live
     // frames.
     Vector<DebugModeOSREntry> entries(cx);
 
-    for (JitActivationIterator iter(cx->runtime()); !iter.done(); ++iter) {
-        if (iter.activation()->compartment() == comp) {
-            if (!CollectOnStackScripts(cx, iter, entries))
+    for (ActivationIterator iter(cx->runtime()); !iter.done(); ++iter) {
+        if (iter->isJit()) {
+            if (!CollectJitStackScripts(cx, obs, iter, entries))
+                return false;
+        } else if (iter->isInterpreter()) {
+            if (!CollectInterpreterStackScripts(cx, obs, iter, entries))
                 return false;
         }
     }
 
+    if (entries.empty())
+        return true;
+
 #ifdef JSGC_GENERATIONAL
     // Scripts can entrain nursery things. See note in js::ReleaseAllJITCode.
-    if (!entries.empty())
-        cx->runtime()->gc.evictNursery();
+    cx->runtime()->gc.evictNursery();
 #endif
 
-    // When the profiler is enabled, we need to suppress sampling from here until
-    // the end of the function, since the basline jit scripts are in a state of
-    // flux.
-    AutoSuppressProfilerSampling suppressProfilerSampling(cx);
+    // When the profiler is enabled, we need to have suppressed sampling,
+    // since the basline jit scripts are in a state of flux.
+    MOZ_ASSERT(!cx->runtime()->isProfilerSamplingEnabled());
+
+    // Invalidate all scripts we are recompiling.
+    if (Zone *zone = obs.singleZone()) {
+        if (!InvalidateScriptsInZone(cx, zone, entries))
+            return false;
+    } else {
+        typedef Debugger::ExecutionObservableSet::ZoneRange ZoneRange;
+        for (ZoneRange r = obs.zones()->all(); !r.empty(); r.popFront()) {
+            if (!InvalidateScriptsInZone(cx, r.front(), entries))
+                return false;
+        }
+    }
 
     // Try to recompile all the scripts. If we encounter an error, we need to
     // roll back as if none of the compilations happened, so that we don't
     // crash.
     for (size_t i = 0; i < entries.length(); i++) {
         JSScript *script = entries[i].script;
-
-        if (!RecompileBaselineScriptForDebugMode(cx, script) ||
+        AutoCompartment ac(cx, script->compartment());
+        if (!RecompileBaselineScriptForDebugMode(cx, script, observing) ||
             !CloneOldBaselineStub(cx, entries, i))
         {
             UndoRecompileBaselineScriptsForDebugMode(cx, entries);
@@ -695,9 +814,11 @@
     }
 
     size_t processed = 0;
-    for (JitActivationIterator iter(cx->runtime()); !iter.done(); ++iter) {
-        if (iter.activation()->compartment() == comp)
-            PatchBaselineFramesForDebugMode(cx, iter, entries, &processed);
+    for (ActivationIterator iter(cx->runtime()); !iter.done(); ++iter) {
+        if (iter->isJit())
+            PatchBaselineFramesForDebugMode(cx, obs, iter, entries, &processed);
+        else if (iter->isInterpreter())
+            SkipInterpreterFrameEntries(obs, iter, entries, &processed);
     }
     MOZ_ASSERT(processed == entries.length());
 
@@ -891,3 +1012,14 @@
 
     return code;
 }
+
+/* static */ void
+DebugModeOSRVolatileJitFrameIterator::forwardLiveIterators(JSContext *cx,
+                                                           uint8_t *oldAddr, uint8_t *newAddr)
+{
+    DebugModeOSRVolatileJitFrameIterator *iter;
+    for (iter = cx->liveVolatileJitFrameIterators_; iter; iter = iter->prev) {
+        if (iter->returnAddressToFp_ == oldAddr)
+            iter->returnAddressToFp_ = newAddr;
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineDebugModeOSR.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineDebugModeOSR.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineDebugModeOSR.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineDebugModeOSR.h	2014-11-26 21:45:56.000000000 +0000
@@ -10,6 +10,9 @@
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
+#include "jit/JitFrameIterator.h"
+
+#include "vm/Debugger.h"
 
 namespace js {
 namespace jit {
@@ -66,6 +69,31 @@
 };
 
 //
+// A JitFrameIterator that updates itself in case of recompilation of an
+// on-stack baseline script.
+//
+class DebugModeOSRVolatileJitFrameIterator : public JitFrameIterator
+{
+    DebugModeOSRVolatileJitFrameIterator **stack, *prev;
+
+  public:
+    explicit DebugModeOSRVolatileJitFrameIterator(JSContext *cx)
+      : JitFrameIterator(cx)
+    {
+        stack = &cx->liveVolatileJitFrameIterators_;
+        prev = *stack;
+        *stack = this;
+    }
+
+    ~DebugModeOSRVolatileJitFrameIterator() {
+        MOZ_ASSERT(*stack == this);
+        *stack = prev;
+    }
+
+    static void forwardLiveIterators(JSContext *cx, uint8_t *oldAddr, uint8_t *newAddr);
+};
+
+//
 // Auxiliary info to help the DebugModeOSRHandler fix up state.
 //
 struct BaselineDebugModeOSRInfo
@@ -94,7 +122,9 @@
 };
 
 bool
-RecompileOnStackBaselineScriptsForDebugMode(JSContext *cx, JSCompartment *comp);
+RecompileOnStackBaselineScriptsForDebugMode(JSContext *cx,
+                                            const Debugger::ExecutionObservableSet &obs,
+                                            Debugger::IsObserving observing);
 
 } // namespace jit
 } // namespace js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineFrame.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineFrame.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -194,8 +194,8 @@
     for (uint32_t i = 0; i < numStackValues; i++)
         *valueSlot(i) = fp->slots()[i];
 
-    if (cx->compartment()->debugMode()) {
-        // In debug mode, update any Debugger.Frame objects for the
+    if (fp->isDebuggee()) {
+        // For debuggee frames, update any Debugger.Frame objects for the
         // InterpreterFrame to point to the BaselineFrame.
 
         // The caller pushed a fake return address. ScriptFrameIter, used by the
@@ -209,6 +209,8 @@
 
         if (!Debugger::handleBaselineOsr(cx, fp, this))
             return false;
+
+        setIsDebuggee();
     }
 
     return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineFrame.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineFrame.h	2014-11-26 21:45:56.000000000 +0000
@@ -47,8 +47,14 @@
         // See InterpreterFrame::PREV_UP_TO_DATE.
         PREV_UP_TO_DATE  = 1 << 5,
 
+        // Frame has execution observed by a Debugger.
+        //
+        // See comment above 'debugMode' in jscompartment.h for explanation of
+        // invariants of debuggee compartments, scripts, and frames.
+        DEBUGGEE         = 1 << 6,
+
         // Eval frame, see the "eval frames" comment.
-        EVAL             = 1 << 6,
+        EVAL             = 1 << 7,
 
         // Frame has profiler entry pushed.
         HAS_PUSHED_SPS_FRAME = 1 << 8,
@@ -268,6 +274,17 @@
         flags_ |= PREV_UP_TO_DATE;
     }
 
+    bool isDebuggee() const {
+        return flags_ & DEBUGGEE;
+    }
+    void setIsDebuggee() {
+        flags_ |= DEBUGGEE;
+    }
+    void unsetIsDebuggee() {
+        MOZ_ASSERT(!script()->isDebuggee());
+        flags_ &= ~DEBUGGEE;
+    }
+
     JSScript *evalScript() const {
         MOZ_ASSERT(isEvalFrame());
         return evalScript_;
@@ -353,7 +370,7 @@
     bool isNonEvalFunctionFrame() const {
         return isFunctionFrame() && !isEvalFrame();
     }
-    bool isDebuggerFrame() const {
+    bool isDebuggerEvalFrame() const {
         return false;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineFrame-inl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineFrame-inl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineFrame-inl.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineFrame-inl.h	2014-11-26 21:45:56.000000000 +0000
@@ -34,7 +34,7 @@
 inline void
 BaselineFrame::popWith(JSContext *cx)
 {
-    if (MOZ_UNLIKELY(cx->compartment()->debugMode()))
+    if (MOZ_UNLIKELY(isDebuggee()))
         DebugScopes::onPopWith(this);
 
     MOZ_ASSERT(scopeChain()->is<DynamicWithObject>());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineIC.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineIC.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineIC.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineIC.cpp	2014-11-26 21:45:56.000000000 +0000
@@ -660,6 +660,7 @@
     if (!code)
         return false;
 
+    MOZ_ASSERT(fun.expectTailCall == TailCall);
     uint32_t argSize = fun.explicitStackSlots() * sizeof(void *);
     EmitTailCallVM(code, masm, argSize);
     return true;
@@ -672,6 +673,7 @@
     if (!code)
         return false;
 
+    MOZ_ASSERT(fun.expectTailCall == NonTailCall);
     EmitCallVM(code, masm);
     return true;
 }
@@ -1120,7 +1122,7 @@
 
 typedef bool (*DoProfilerFallbackFn)(JSContext *, BaselineFrame *frame, ICProfiler_Fallback *);
 static const VMFunction DoProfilerFallbackInfo =
-    FunctionInfo<DoProfilerFallbackFn>(DoProfilerFallback);
+    FunctionInfo<DoProfilerFallbackFn>(DoProfilerFallback, TailCall);
 
 bool
 ICProfiler_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -1322,7 +1324,7 @@
 typedef bool (*DoTypeMonitorFallbackFn)(JSContext *, BaselineFrame *, ICTypeMonitor_Fallback *,
                                         HandleValue, MutableHandleValue);
 static const VMFunction DoTypeMonitorFallbackInfo =
-    FunctionInfo<DoTypeMonitorFallbackFn>(DoTypeMonitorFallback);
+    FunctionInfo<DoTypeMonitorFallbackFn>(DoTypeMonitorFallback, TailCall);
 
 bool
 ICTypeMonitor_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -1553,7 +1555,7 @@
 typedef bool (*DoTypeUpdateFallbackFn)(JSContext *, BaselineFrame *, ICUpdatedStub *, HandleValue,
                                        HandleValue);
 const VMFunction DoTypeUpdateFallbackInfo =
-    FunctionInfo<DoTypeUpdateFallbackFn>(DoTypeUpdateFallback);
+    FunctionInfo<DoTypeUpdateFallbackFn>(DoTypeUpdateFallback, NonTailCall);
 
 bool
 ICTypeUpdate_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -1696,7 +1698,7 @@
 }
 
 typedef bool (*DoThisFallbackFn)(JSContext *, ICThis_Fallback *, HandleValue, MutableHandleValue);
-static const VMFunction DoThisFallbackInfo = FunctionInfo<DoThisFallbackFn>(DoThisFallback);
+static const VMFunction DoThisFallbackInfo = FunctionInfo<DoThisFallbackFn>(DoThisFallback, TailCall);
 
 bool
 ICThis_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -1732,7 +1734,7 @@
 
 typedef bool(*DoNewArrayFn)(JSContext *, ICNewArray_Fallback *, uint32_t, HandleTypeObject,
                             MutableHandleValue);
-static const VMFunction DoNewArrayInfo = FunctionInfo<DoNewArrayFn>(DoNewArray);
+static const VMFunction DoNewArrayInfo = FunctionInfo<DoNewArrayFn>(DoNewArray, TailCall);
 
 bool
 ICNewArray_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -1765,7 +1767,7 @@
 }
 
 typedef bool(*DoNewObjectFn)(JSContext *, ICNewObject_Fallback *, MutableHandleValue);
-static const VMFunction DoNewObjectInfo = FunctionInfo<DoNewObjectFn>(DoNewObject);
+static const VMFunction DoNewObjectInfo = FunctionInfo<DoNewObjectFn>(DoNewObject, TailCall);
 
 bool
 ICNewObject_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -1977,7 +1979,7 @@
 typedef bool (*DoCompareFallbackFn)(JSContext *, BaselineFrame *, ICCompare_Fallback *,
                                     HandleValue, HandleValue, MutableHandleValue);
 static const VMFunction DoCompareFallbackInfo =
-    FunctionInfo<DoCompareFallbackFn>(DoCompareFallback, PopValues(2));
+    FunctionInfo<DoCompareFallbackFn>(DoCompareFallback, TailCall, PopValues(2));
 
 bool
 ICCompare_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -2312,7 +2314,7 @@
 
 typedef bool (*pf)(JSContext *, BaselineFrame *, ICToBool_Fallback *, HandleValue,
                    MutableHandleValue);
-static const VMFunction fun = FunctionInfo<pf>(DoToBoolFallback);
+static const VMFunction fun = FunctionInfo<pf>(DoToBoolFallback, TailCall);
 
 bool
 ICToBool_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -2479,7 +2481,7 @@
 
 typedef bool (*DoToNumberFallbackFn)(JSContext *, ICToNumber_Fallback *, HandleValue, MutableHandleValue);
 static const VMFunction DoToNumberFallbackInfo =
-    FunctionInfo<DoToNumberFallbackFn>(DoToNumberFallback, PopValues(1));
+    FunctionInfo<DoToNumberFallbackFn>(DoToNumberFallback, TailCall, PopValues(1));
 
 bool
 ICToNumber_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -2722,7 +2724,7 @@
 typedef bool (*DoBinaryArithFallbackFn)(JSContext *, BaselineFrame *, ICBinaryArith_Fallback *,
                                         HandleValue, HandleValue, MutableHandleValue);
 static const VMFunction DoBinaryArithFallbackInfo =
-    FunctionInfo<DoBinaryArithFallbackFn>(DoBinaryArithFallback, PopValues(2));
+    FunctionInfo<DoBinaryArithFallbackFn>(DoBinaryArithFallback, TailCall, PopValues(2));
 
 bool
 ICBinaryArith_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -2768,7 +2770,7 @@
 }
 
 typedef bool (*DoConcatStringsFn)(JSContext *, HandleValue, HandleValue, MutableHandleValue);
-static const VMFunction DoConcatStringsInfo = FunctionInfo<DoConcatStringsFn>(DoConcatStrings);
+static const VMFunction DoConcatStringsInfo = FunctionInfo<DoConcatStringsFn>(DoConcatStrings, TailCall);
 
 bool
 ICBinaryArith_StringConcat::Compiler::generateStubCode(MacroAssembler &masm)
@@ -2845,7 +2847,7 @@
 typedef bool (*DoConcatStringObjectFn)(JSContext *, bool lhsIsString, HandleValue, HandleValue,
                                        MutableHandleValue);
 static const VMFunction DoConcatStringObjectInfo =
-    FunctionInfo<DoConcatStringObjectFn>(DoConcatStringObject, PopValues(2));
+    FunctionInfo<DoConcatStringObjectFn>(DoConcatStringObject, TailCall, PopValues(2));
 
 bool
 ICBinaryArith_StringObjectConcat::Compiler::generateStubCode(MacroAssembler &masm)
@@ -3132,7 +3134,7 @@
 typedef bool (*DoUnaryArithFallbackFn)(JSContext *, BaselineFrame *, ICUnaryArith_Fallback *,
                                        HandleValue, MutableHandleValue);
 static const VMFunction DoUnaryArithFallbackInfo =
-    FunctionInfo<DoUnaryArithFallbackFn>(DoUnaryArithFallback, PopValues(1));
+    FunctionInfo<DoUnaryArithFallbackFn>(DoUnaryArithFallback, TailCall, PopValues(1));
 
 bool
 ICUnaryArith_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -4087,7 +4089,7 @@
 typedef bool (*DoGetElemFallbackFn)(JSContext *, BaselineFrame *, ICGetElem_Fallback *,
                                     HandleValue, HandleValue, MutableHandleValue);
 static const VMFunction DoGetElemFallbackInfo =
-    FunctionInfo<DoGetElemFallbackFn>(DoGetElemFallback, PopValues(2));
+    FunctionInfo<DoGetElemFallbackFn>(DoGetElemFallback, TailCall, PopValues(2));
 
 bool
 ICGetElem_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -4539,8 +4541,7 @@
     masm.branch32(Assembler::BelowOrEqual, initLength, key, &failure);
 
     // Hole check and load value.
-    JS_STATIC_ASSERT(sizeof(Value) == 8);
-    BaseIndex element(scratchReg, key, TimesEight);
+    BaseObjectElementIndex element(scratchReg, key);
     masm.branchTestMagic(Assembler::Equal, element, &failure);
 
     // Check if __noSuchMethod__ should be called.
@@ -4710,10 +4711,9 @@
         masm.branch32(Assembler::AboveOrEqual, idx, scratch, &failure);
 
         // Load argval
-        JS_STATIC_ASSERT(sizeof(Value) == 8);
         masm.movePtr(BaselineFrameReg, scratch);
         masm.addPtr(Imm32(BaselineFrame::offsetOfArg(0)), scratch);
-        BaseIndex element(scratch, idx, TimesEight);
+        BaseValueIndex element(scratch, idx);
         masm.loadValue(element, R0);
 
         // Enter type monitor IC to type-check result.
@@ -4787,7 +4787,7 @@
     regs.add(scratchReg);
     regs.add(tempReg);
     ValueOperand tempVal = regs.takeAnyValue();
-    masm.loadValue(BaseIndex(argData, idxReg, ScaleFromElemWidth(sizeof(Value))), tempVal);
+    masm.loadValue(BaseValueIndex(argData, idxReg), tempVal);
 
     // Makesure that this is not a FORWARD_TO_CALL_SLOT magic value.
     masm.branchTestMagic(Assembler::Equal, tempVal, &failureReconstructInputs);
@@ -5152,7 +5152,7 @@
 typedef bool (*DoSetElemFallbackFn)(JSContext *, BaselineFrame *, ICSetElem_Fallback *, Value *,
                                     HandleValue, HandleValue, HandleValue);
 static const VMFunction DoSetElemFallbackInfo =
-    FunctionInfo<DoSetElemFallbackFn>(DoSetElemFallback, PopValues(2));
+    FunctionInfo<DoSetElemFallbackFn>(DoSetElemFallback, TailCall, PopValues(2));
 
 bool
 ICSetElem_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -5676,7 +5676,7 @@
 typedef bool (*DoInFallbackFn)(JSContext *, ICIn_Fallback *, HandleValue, HandleValue,
                                MutableHandleValue);
 static const VMFunction DoInFallbackInfo =
-    FunctionInfo<DoInFallbackFn>(DoInFallback, PopValues(2));
+    FunctionInfo<DoInFallbackFn>(DoInFallback, TailCall, PopValues(2));
 
 bool
 ICIn_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -6040,7 +6040,7 @@
 
 typedef bool (*DoGetNameFallbackFn)(JSContext *, BaselineFrame *, ICGetName_Fallback *,
                                     HandleObject, MutableHandleValue);
-static const VMFunction DoGetNameFallbackInfo = FunctionInfo<DoGetNameFallbackFn>(DoGetNameFallback);
+static const VMFunction DoGetNameFallbackInfo = FunctionInfo<DoGetNameFallbackFn>(DoGetNameFallback, TailCall);
 
 bool
 ICGetName_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -6151,7 +6151,7 @@
 typedef bool (*DoBindNameFallbackFn)(JSContext *, BaselineFrame *, ICBindName_Fallback *,
                                      HandleObject, MutableHandleValue);
 static const VMFunction DoBindNameFallbackInfo =
-    FunctionInfo<DoBindNameFallbackFn>(DoBindNameFallback);
+    FunctionInfo<DoBindNameFallbackFn>(DoBindNameFallback, TailCall);
 
 bool
 ICBindName_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -6211,7 +6211,7 @@
 typedef bool (*DoGetIntrinsicFallbackFn)(JSContext *, BaselineFrame *, ICGetIntrinsic_Fallback *,
                                          MutableHandleValue);
 static const VMFunction DoGetIntrinsicFallbackInfo =
-    FunctionInfo<DoGetIntrinsicFallbackFn>(DoGetIntrinsicFallback);
+    FunctionInfo<DoGetIntrinsicFallbackFn>(DoGetIntrinsicFallback, TailCall);
 
 bool
 ICGetIntrinsic_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -6835,7 +6835,7 @@
 typedef bool (*DoGetPropFallbackFn)(JSContext *, BaselineFrame *, ICGetProp_Fallback *,
                                     MutableHandleValue, MutableHandleValue);
 static const VMFunction DoGetPropFallbackInfo =
-    FunctionInfo<DoGetPropFallbackFn>(DoGetPropFallback, PopValues(1));
+    FunctionInfo<DoGetPropFallbackFn>(DoGetPropFallback, TailCall, PopValues(1));
 
 bool
 ICGetProp_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -7987,7 +7987,7 @@
 typedef bool (*DoSetPropFallbackFn)(JSContext *, BaselineFrame *, ICSetProp_Fallback *,
                                     HandleValue, HandleValue, MutableHandleValue);
 static const VMFunction DoSetPropFallbackInfo =
-    FunctionInfo<DoSetPropFallbackFn>(DoSetPropFallback, PopValues(2));
+    FunctionInfo<DoSetPropFallbackFn>(DoSetPropFallback, TailCall, PopValues(2));
 
 bool
 ICSetProp_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -8817,6 +8817,20 @@
             return true;
         }
 
+        if (fun->native() == intrinsic_IsSuspendedStarGenerator) {
+            // This intrinsic only appears in self-hosted code.
+            MOZ_ASSERT(argc == 1);
+            JitSpew(JitSpew_BaselineIC, "  Generating Call_IsSuspendedStarGenerator stub");
+
+            ICCall_IsSuspendedStarGenerator::Compiler compiler(cx);
+            ICStub *newStub = compiler.getStub(compiler.getStubSpace(script));
+            if (!newStub)
+                return false;
+
+            stub->addNewStub(newStub);
+            return true;
+        }
+
         RootedNativeObject templateObject(cx);
         if (MOZ_LIKELY(!isSpread)) {
             CallArgs args = CallArgsFromVp(argc, vp);
@@ -9253,8 +9267,7 @@
     masm.loadPtr(Address(BaselineFrameReg, 0), startReg);
     masm.loadPtr(Address(startReg, BaselineFrame::offsetOfNumActualArgs()), endReg);
     masm.addPtr(Imm32(BaselineFrame::offsetOfArg(0)), startReg);
-    JS_STATIC_ASSERT(sizeof(Value) == 8);
-    masm.lshiftPtr(Imm32(3), endReg);
+    masm.lshiftPtr(Imm32(ValueShift), endReg);
     masm.addPtr(startReg, endReg);
 
     // Copying pre-decrements endReg by 8 until startReg is reached
@@ -9280,8 +9293,7 @@
     masm.extractObject(arrayVal, startReg);
     masm.loadPtr(Address(startReg, NativeObject::offsetOfElements()), startReg);
     masm.load32(Address(startReg, ObjectElements::offsetOfInitializedLength()), endReg);
-    JS_STATIC_ASSERT(sizeof(Value) == 8);
-    masm.lshiftPtr(Imm32(3), endReg);
+    masm.lshiftPtr(Imm32(ValueShift), endReg);
     masm.addPtr(startReg, endReg);
 
     // Copying pre-decrements endReg by 8 until startReg is reached
@@ -9440,8 +9452,7 @@
     if (isSpread_) {
         masm.loadValue(Address(BaselineStackReg, 2 * sizeof(Value) + ICStackValueOffset), R1);
     } else {
-        BaseIndex calleeSlot(BaselineStackReg, argcReg, TimesEight,
-                             ICStackValueOffset + sizeof(Value));
+        BaseValueIndex calleeSlot(BaselineStackReg, argcReg, ICStackValueOffset + sizeof(Value));
         masm.loadValue(calleeSlot, R1);
     }
     regs.take(R1);
@@ -9501,8 +9512,8 @@
             masm.loadValue(Address(BaselineStackReg,
                                    2 * sizeof(Value) + STUB_FRAME_SIZE + sizeof(size_t)), R1);
         } else {
-            BaseIndex calleeSlot2(BaselineStackReg, argcReg, TimesEight,
-                                  sizeof(Value) + STUB_FRAME_SIZE + sizeof(size_t));
+            BaseValueIndex calleeSlot2(BaselineStackReg, argcReg,
+                                       sizeof(Value) + STUB_FRAME_SIZE + sizeof(size_t));
             masm.loadValue(calleeSlot2, R1);
         }
         masm.push(masm.extractObject(R1, ExtractTemp0));
@@ -9534,7 +9545,7 @@
         if (isSpread_) {
             masm.storeValue(R0, Address(BaselineStackReg, sizeof(Value) + STUB_FRAME_SIZE));
         } else {
-            BaseIndex thisSlot(BaselineStackReg, argcReg, TimesEight, STUB_FRAME_SIZE);
+            BaseValueIndex thisSlot(BaselineStackReg, argcReg, STUB_FRAME_SIZE);
             masm.storeValue(R0, thisSlot);
         }
 
@@ -9550,8 +9561,7 @@
         if (isSpread_) {
             masm.loadValue(Address(BaselineStackReg, 2 * sizeof(Value) + STUB_FRAME_SIZE), R0);
         } else {
-            BaseIndex calleeSlot3(BaselineStackReg, argcReg, TimesEight,
-                                  sizeof(Value) + STUB_FRAME_SIZE);
+            BaseValueIndex calleeSlot3(BaselineStackReg, argcReg, sizeof(Value) + STUB_FRAME_SIZE);
             masm.loadValue(calleeSlot3, R0);
         }
         callee = masm.extractObject(R0, ExtractTemp0);
@@ -9650,8 +9660,8 @@
             masm.add32(Imm32(1), scratchReg);
         else
             masm.lshiftPtr(Imm32(1), scratchReg);
-        BaseIndex reloadThisSlot(BaselineStackReg, scratchReg, TimesEight,
-                                 STUB_FRAME_SIZE + sizeof(Value) + 3*sizeof(size_t));
+        BaseValueIndex reloadThisSlot(BaselineStackReg, scratchReg,
+                                      STUB_FRAME_SIZE + sizeof(Value) + 3 * sizeof(size_t));
         masm.loadValue(reloadThisSlot, JSReturnOperand);
 #ifdef DEBUG
         masm.branchTestObject(Assembler::Equal, JSReturnOperand, &skipThisReplace);
@@ -9771,6 +9781,48 @@
 }
 
 bool
+ICCall_IsSuspendedStarGenerator::Compiler::generateStubCode(MacroAssembler &masm)
+{
+    // The IsSuspendedStarGenerator intrinsic is only called in self-hosted
+    // code, so it's safe to assume we have a single argument and the callee
+    // is our intrinsic.
+
+    GeneralRegisterSet regs = availableGeneralRegs(0);
+
+    // Load the argument.
+    Address argAddr(BaselineStackReg, ICStackValueOffset);
+    ValueOperand argVal = regs.takeAnyValue();
+    masm.loadValue(argAddr, argVal);
+
+    // Check if it's an object.
+    Label returnFalse;
+    Register genObj = regs.takeAny();
+    masm.branchTestObject(Assembler::NotEqual, argVal, &returnFalse);
+    masm.unboxObject(argVal, genObj);
+
+    // Check if it's a StarGeneratorObject.
+    Register scratch = regs.takeAny();
+    masm.branchTestObjClass(Assembler::NotEqual, genObj, scratch, &StarGeneratorObject::class_,
+                            &returnFalse);
+
+    // If the yield index slot holds an int32 value < YIELD_INDEX_CLOSING,
+    // the generator is suspended.
+    masm.loadValue(Address(genObj, GeneratorObject::offsetOfYieldIndexSlot()), argVal);
+    masm.branchTestInt32(Assembler::NotEqual, argVal, &returnFalse);
+    masm.unboxInt32(argVal, scratch);
+    masm.branch32(Assembler::AboveOrEqual, scratch, Imm32(StarGeneratorObject::YIELD_INDEX_CLOSING),
+                  &returnFalse);
+
+    masm.moveValue(BooleanValue(true), R0);
+    EmitReturnFromIC(masm);
+
+    masm.bind(&returnFalse);
+    masm.moveValue(BooleanValue(false), R0);
+    EmitReturnFromIC(masm);
+    return true;
+}
+
+bool
 ICCall_Native::Compiler::generateStubCode(MacroAssembler &masm)
 {
     Label failure;
@@ -9787,7 +9839,7 @@
     if (isSpread_) {
         masm.loadValue(Address(BaselineStackReg, ICStackValueOffset + 2 * sizeof(Value)), R1);
     } else {
-        BaseIndex calleeSlot(BaselineStackReg, argcReg, TimesEight, ICStackValueOffset + sizeof(Value));
+        BaseValueIndex calleeSlot(BaselineStackReg, argcReg, ICStackValueOffset + sizeof(Value));
         masm.loadValue(calleeSlot, R1);
     }
     regs.take(R1);
@@ -9889,7 +9941,7 @@
     regs.takeUnchecked(BaselineTailCallReg);
 
     // Load the callee in R1.
-    BaseIndex calleeSlot(BaselineStackReg, argcReg, TimesEight, ICStackValueOffset + sizeof(Value));
+    BaseValueIndex calleeSlot(BaselineStackReg, argcReg, ICStackValueOffset + sizeof(Value));
     masm.loadValue(calleeSlot, R1);
     regs.take(R1);
 
@@ -10193,7 +10245,7 @@
 
     // Load the callee in R1.
     // Stack Layout: [ ..., CalleeVal, ThisVal, Arg0Val, ..., ArgNVal, +ICStackValueOffset+ ]
-    BaseIndex calleeSlot(BaselineStackReg, argcReg, TimesEight, ICStackValueOffset + sizeof(Value));
+    BaseValueIndex calleeSlot(BaselineStackReg, argcReg, ICStackValueOffset + sizeof(Value));
     masm.loadValue(calleeSlot, R1);
     regs.take(R1);
 
@@ -10434,7 +10486,7 @@
 typedef bool (*DoIteratorNewFallbackFn)(JSContext *, BaselineFrame *, ICIteratorNew_Fallback *,
                                         HandleValue, MutableHandleValue);
 static const VMFunction DoIteratorNewFallbackInfo =
-    FunctionInfo<DoIteratorNewFallbackFn>(DoIteratorNewFallback, PopValues(1));
+    FunctionInfo<DoIteratorNewFallbackFn>(DoIteratorNewFallback, TailCall, PopValues(1));
 
 bool
 ICIteratorNew_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -10490,7 +10542,7 @@
 typedef bool (*DoIteratorMoreFallbackFn)(JSContext *, BaselineFrame *, ICIteratorMore_Fallback *,
                                          HandleObject, MutableHandleValue);
 static const VMFunction DoIteratorMoreFallbackInfo =
-    FunctionInfo<DoIteratorMoreFallbackFn>(DoIteratorMoreFallback);
+    FunctionInfo<DoIteratorMoreFallbackFn>(DoIteratorMoreFallback, TailCall);
 
 bool
 ICIteratorMore_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -10569,7 +10621,7 @@
 
 typedef bool (*DoIteratorCloseFallbackFn)(JSContext *, ICIteratorClose_Fallback *, HandleValue);
 static const VMFunction DoIteratorCloseFallbackInfo =
-    FunctionInfo<DoIteratorCloseFallbackFn>(DoIteratorCloseFallback);
+    FunctionInfo<DoIteratorCloseFallbackFn>(DoIteratorCloseFallback, TailCall);
 
 bool
 ICIteratorClose_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -10616,7 +10668,7 @@
 typedef bool (*DoInstanceOfFallbackFn)(JSContext *, ICInstanceOf_Fallback *, HandleValue, HandleValue,
                                        MutableHandleValue);
 static const VMFunction DoInstanceOfFallbackInfo =
-    FunctionInfo<DoInstanceOfFallbackFn>(DoInstanceOfFallback, PopValues(2));
+    FunctionInfo<DoInstanceOfFallbackFn>(DoInstanceOfFallback, TailCall, PopValues(2));
 
 bool
 ICInstanceOf_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -10665,7 +10717,7 @@
 typedef bool (*DoTypeOfFallbackFn)(JSContext *, BaselineFrame *frame, ICTypeOf_Fallback *,
                                    HandleValue, MutableHandleValue);
 static const VMFunction DoTypeOfFallbackInfo =
-    FunctionInfo<DoTypeOfFallbackFn>(DoTypeOfFallback);
+    FunctionInfo<DoTypeOfFallbackFn>(DoTypeOfFallback, TailCall);
 
 bool
 ICTypeOf_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -10756,7 +10808,7 @@
 static const VMFunction DoRetSubFallbackInfo = FunctionInfo<DoRetSubFallbackFn>(DoRetSubFallback);
 
 typedef bool (*ThrowFn)(JSContext *, HandleValue);
-static const VMFunction ThrowInfoBaseline = FunctionInfo<ThrowFn>(js::Throw);
+static const VMFunction ThrowInfoBaseline = FunctionInfo<ThrowFn>(js::Throw, TailCall);
 
 bool
 ICRetSub_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
@@ -11479,7 +11531,7 @@
 typedef bool (*DoRestFallbackFn)(JSContext *, ICRest_Fallback *, BaselineFrame *,
                                  MutableHandleValue);
 static const VMFunction DoRestFallbackInfo =
-    FunctionInfo<DoRestFallbackFn>(DoRestFallback);
+    FunctionInfo<DoRestFallbackFn>(DoRestFallback, TailCall);
 
 bool
 ICRest_Fallback::Compiler::generateStubCode(MacroAssembler &masm)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineIC.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineIC.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineIC.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineIC.h	2014-11-26 21:45:56.000000000 +0000
@@ -380,6 +380,7 @@
     _(Call_ScriptedApplyArguments) \
     _(Call_ScriptedFunCall)     \
     _(Call_StringSplit)         \
+    _(Call_IsSuspendedStarGenerator) \
                                 \
     _(GetElem_Fallback)         \
     _(GetElem_NativeSlot)       \
@@ -6236,6 +6237,36 @@
         }
    };
 };
+
+class ICCall_IsSuspendedStarGenerator : public ICStub
+{
+    friend class ICStubSpace;
+
+  protected:
+    explicit ICCall_IsSuspendedStarGenerator(JitCode *stubCode)
+      : ICStub(ICStub::Call_IsSuspendedStarGenerator, stubCode)
+    {}
+
+  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);
+
+      public:
+        explicit Compiler(JSContext *cx)
+          : ICStubCompiler(cx, ICStub::Call_IsSuspendedStarGenerator)
+        {}
+        ICStub *getStub(ICStubSpace *space) {
+            return ICCall_IsSuspendedStarGenerator::New(space, getStubCode());
+        }
+   };
+};
 
 // Stub for performing a TableSwitch, updating the IC's return address to jump
 // to whatever point the switch is branching to.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineJIT.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineJIT.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineJIT.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineJIT.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/MemoryReporting.h"
 
+#include "asmjs/AsmJSModule.h"
 #include "jit/BaselineCompiler.h"
 #include "jit/BaselineIC.h"
 #include "jit/CompileInfo.h"
@@ -45,6 +46,7 @@
   : method_(nullptr),
     templateScope_(nullptr),
     fallbackStubSpace_(),
+    dependentAsmJSModules_(nullptr),
     prologueOffset_(prologueOffset),
     epilogueOffset_(epilogueOffset),
 #ifdef DEBUG
@@ -60,7 +62,7 @@
 static bool
 CheckFrame(InterpreterFrame *fp)
 {
-    if (fp->isDebuggerFrame()) {
+    if (fp->isDebuggerEvalFrame()) {
         // Debugger eval-in-frame. These are likely short-running scripts so
         // don't bother compiling them for now.
         JitSpew(JitSpew_BaselineAbort, "debugger frame");
@@ -158,8 +160,10 @@
 
     // Skip debug breakpoint/trap handler, the interpreter already handled it
     // for the current op.
-    if (cx->compartment()->debugMode())
+    if (fp->isDebuggee()) {
+        MOZ_ASSERT(baseline->hasDebugInstrumentation());
         data.jitcode += MacroAssembler::ToggledCallSize(data.jitcode);
+    }
 
     data.osrFrame = fp;
     data.osrNumStackValues = fp->script()->nfixed() + cx->interpreterRegs().stackDepth();
@@ -201,7 +205,7 @@
 }
 
 MethodStatus
-jit::BaselineCompile(JSContext *cx, JSScript *script)
+jit::BaselineCompile(JSContext *cx, JSScript *script, bool forceDebugInstrumentation)
 {
     MOZ_ASSERT(!script->hasBaselineScript());
     MOZ_ASSERT(script->canBaselineCompile());
@@ -219,6 +223,8 @@
     BaselineCompiler compiler(cx, *temp, script);
     if (!compiler.init())
         return Method_Error;
+    if (forceDebugInstrumentation)
+        compiler.setCompileDebugInstrumentation();
 
     MethodStatus status = compiler.compile();
 
@@ -232,7 +238,7 @@
 }
 
 static MethodStatus
-CanEnterBaselineJIT(JSContext *cx, HandleScript script, bool osr)
+CanEnterBaselineJIT(JSContext *cx, HandleScript script, InterpreterFrame *osrFrame)
 {
     MOZ_ASSERT(jit::IsBaselineEnabled(cx));
 
@@ -260,7 +266,7 @@
     // warm-up and only gathering type information for the loop, and not the
     // rest of the function.
     if (cx->runtime()->forkJoinWarmup > 0) {
-        if (osr)
+        if (osrFrame)
             return Method_Skipped;
     } else if (script->incWarmUpCounter() <= js_JitOptions.baselineWarmUpThreshold) {
         return Method_Skipped;
@@ -282,7 +288,10 @@
         }
     }
 
-    return BaselineCompile(cx, script);
+    // Frames can be marked as debuggee frames independently of its underlying
+    // script being a debuggee script, e.g., when performing
+    // Debugger.Frame.prototype.eval.
+    return BaselineCompile(cx, script, osrFrame && osrFrame->isDebuggee());
 }
 
 MethodStatus
@@ -301,7 +310,7 @@
        return Method_CantCompile;
 
    RootedScript script(cx, fp->script());
-   return CanEnterBaselineJIT(cx, script, /* osr = */true);
+   return CanEnterBaselineJIT(cx, script, fp);
 }
 
 MethodStatus
@@ -327,7 +336,7 @@
     }
 
     RootedScript script(cx, state.script());
-    return CanEnterBaselineJIT(cx, script, /* osr = */false);
+    return CanEnterBaselineJIT(cx, script, /* osrFrame = */ nullptr);
 };
 
 BaselineScript *
@@ -433,9 +442,54 @@
     MOZ_ASSERT(fop->runtime()->gc.nursery.isEmpty());
 #endif
 
+    script->unlinkDependentAsmJSModules(fop);
+
     fop->delete_(script);
 }
 
+void
+BaselineScript::unlinkDependentAsmJSModules(FreeOp *fop)
+{
+    // Remove any links from AsmJSModules that contain optimized FFI calls into
+    // this BaselineScript.
+    if (dependentAsmJSModules_) {
+        for (size_t i = 0; i < dependentAsmJSModules_->length(); i++) {
+            DependentAsmJSModuleExit exit = (*dependentAsmJSModules_)[i];
+            exit.module->detachJitCompilation(exit.exitIndex);
+        }
+
+        fop->delete_(dependentAsmJSModules_);
+        dependentAsmJSModules_ = nullptr;
+    }
+}
+
+bool
+BaselineScript::addDependentAsmJSModule(JSContext *cx, DependentAsmJSModuleExit exit)
+{
+    if (!dependentAsmJSModules_) {
+        dependentAsmJSModules_ = cx->new_<Vector<DependentAsmJSModuleExit> >(cx);
+        if (!dependentAsmJSModules_)
+            return false;
+    }
+    return dependentAsmJSModules_->append(exit);
+}
+
+void
+BaselineScript::removeDependentAsmJSModule(DependentAsmJSModuleExit exit)
+{
+    if (!dependentAsmJSModules_)
+        return;
+
+    for (size_t i = 0; i < dependentAsmJSModules_->length(); i++) {
+        if ((*dependentAsmJSModules_)[i].module == exit.module &&
+            (*dependentAsmJSModules_)[i].exitIndex == exit.exitIndex)
+        {
+            dependentAsmJSModules_->erase(dependentAsmJSModules_->begin() + i);
+            break;
+        }
+    }
+}
+
 ICEntry &
 BaselineScript::icEntry(size_t index)
 {
@@ -773,7 +827,7 @@
     MOZ_ASSERT(script->baselineScript() == this);
 
     // Only scripts compiled for debug mode have toggled calls.
-    if (!debugMode())
+    if (!hasDebugInstrumentation())
         return;
 
     SrcNoteLineScanner scanner(script->notes(), script->lineno());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineJIT.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineJIT.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BaselineJIT.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BaselineJIT.h	2014-11-26 21:45:57.000000000 +0000
@@ -93,6 +93,19 @@
     uint32_t bufferOffset;
 };
 
+// Describes a single AsmJSModule which jumps (via an FFI exit with the given
+// index) directly to a BaselineScript or IonScript.
+struct DependentAsmJSModuleExit
+{
+    const AsmJSModule *module;
+    size_t exitIndex;
+
+    DependentAsmJSModuleExit(const AsmJSModule *module, size_t exitIndex)
+      : module(module),
+        exitIndex(exitIndex)
+    { }
+};
+
 struct BaselineScript
 {
   public:
@@ -114,6 +127,10 @@
     // Allocated space for fallback stubs.
     FallbackICStubSpace fallbackStubSpace_;
 
+    // If non-null, the list of AsmJSModules that contain an optimized call
+    // directly to this script.
+    Vector<DependentAsmJSModuleExit> *dependentAsmJSModules_;
+
     // Native code offset right before the scope chain is initialized.
     uint32_t prologueOffset_;
 
@@ -149,9 +166,9 @@
         // (rather than call object stored) arguments.
         MODIFIES_ARGUMENTS = 1 << 2,
 
-        // Flag set when compiled for use for debug mode. Handles various
+        // Flag set when compiled for use with Debugger. Handles various
         // Debugger hooks and compiles toggled calls for traps.
-        DEBUG_MODE = 1 << 3,
+        HAS_DEBUG_INSTRUMENTATION = 1 << 3,
 
         // Flag set if this script has ever been Ion compiled, either directly
         // or inlined into another script. This is cleared when the script's
@@ -232,11 +249,11 @@
         return flags_ & MODIFIES_ARGUMENTS;
     }
 
-    void setDebugMode() {
-        flags_ |= DEBUG_MODE;
+    void setHasDebugInstrumentation() {
+        flags_ |= HAS_DEBUG_INSTRUMENTATION;
     }
-    bool debugMode() const {
-        return flags_ & DEBUG_MODE;
+    bool hasDebugInstrumentation() const {
+        return flags_ & HAS_DEBUG_INSTRUMENTATION;
     }
 
     void setIonCompiledOrInlined() {
@@ -347,6 +364,10 @@
     jsbytecode *pcForNativeAddress(JSScript *script, uint8_t *nativeAddress);
     jsbytecode *pcForNativeOffset(JSScript *script, uint32_t nativeOffset);
 
+    bool addDependentAsmJSModule(JSContext *cx, DependentAsmJSModuleExit exit);
+    void unlinkDependentAsmJSModules(FreeOp *fop);
+    void removeDependentAsmJSModule(DependentAsmJSModuleExit exit);
+
   private:
     jsbytecode *pcForNativeOffset(JSScript *script, uint32_t nativeOffset, bool isReturn);
 
@@ -461,7 +482,7 @@
 MarkActiveBaselineScripts(Zone *zone);
 
 MethodStatus
-BaselineCompile(JSContext *cx, JSScript *script);
+BaselineCompile(JSContext *cx, JSScript *script, bool forceDebugInstrumentation = false);
 
 } // namespace jit
 } // namespace js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BitSet.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BitSet.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/BitSet.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/BitSet.h	2014-11-26 21:45:57.000000000 +0000
@@ -129,8 +129,7 @@
             if (word_ == numWords)
                 return;
 
-            JS_STATIC_ASSERT(sizeof(value_) * 8 == BitSet::BitsPerWord);
-            index_ = word_ * sizeof(value_) * 8;
+            index_ = word_ * BitSet::BitsPerWord;
             value_ = bits[word_];
         }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/CodeGenerator.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/CodeGenerator.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/CodeGenerator.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/CodeGenerator.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -1095,7 +1095,10 @@
     RegExpStatics *res = cx->global()->getRegExpStatics(cx);
     if (!res)
         return false;
-
+#ifdef JS_USE_LINK_REGISTER
+    if (mode != RegExpShared::MatchOnly)
+        masm.pushReturnAddress();
+#endif
     if (mode == RegExpShared::Normal) {
         // First, fill in a skeletal MatchPairs instance on the stack. This will be
         // passed to the OOL stub in the caller if we aren't able to execute the
@@ -1214,8 +1217,8 @@
 }
 
 static void
-CopyStringChars(MacroAssembler &masm, Register to, Register from, Register len, Register scratch,
-                size_t fromWidth, size_t toWidth);
+CopyStringChars(MacroAssembler &masm, Register to, Register from, Register len,
+                Register byteOpScratch, size_t fromWidth, size_t toWidth);
 
 static void
 CreateDependentString(MacroAssembler &masm, const JSAtomState &names,
@@ -1573,6 +1576,10 @@
 
     MacroAssembler masm(cx);
 
+#ifdef JS_USE_LINK_REGISTER
+    masm.pushReturnAddress();
+#endif
+
     masm.reserveStack(sizeof(irregexp::InputOutputData));
 
     Label notFound, oolEntry;
@@ -2097,10 +2104,12 @@
     }
 #endif
 
-    // Allocate the full frame for this function.
-    uint32_t size = frameSize();
-    if (size != 0)
-        masm.subPtr(Imm32(size), StackPointer);
+    // Allocate the full frame for this function
+    // Note we have a new entry here. So we reset MacroAssembler::framePushed()
+    // to 0, before reserving the stack.
+    MOZ_ASSERT(masm.framePushed() == frameSize());
+    masm.setFramePushed(0);
+    masm.reserveStack(frameSize());
     return true;
 }
 
@@ -3278,9 +3287,9 @@
         Label loop;
         masm.bind(&loop);
 
-        // We remove sizeof(void*) from argvOffset because withtout it we target
+        // We remove sizeof(void*) from argvOffset because without it we target
         // the address after the memory area that we want to copy.
-        BaseIndex disp(StackPointer, argcreg, ScaleFromElemWidth(sizeof(Value)), argvOffset - sizeof(void*));
+        BaseValueIndex disp(StackPointer, argcreg, argvOffset - sizeof(void*));
 
         // Do not use Push here because other this account to 1 in the framePushed
         // instead of 0.  These push are only counted by argcreg.
@@ -3298,7 +3307,8 @@
 
     // Compute the stack usage.
     masm.movePtr(argcreg, extraStackSpace);
-    masm.lshiftPtr(Imm32::ShiftOf(ScaleFromElemWidth(sizeof(Value))), extraStackSpace);
+    NativeObject::elementsSizeMustNotOverflow();
+    masm.lshiftPtr(Imm32(ValueShift), extraStackSpace);
 
     // Join with all arguments copied and the extra stack usage computed.
     masm.bind(&end);
@@ -3593,23 +3603,6 @@
     MIRGraph &mir = gen->graph();
     MResumePoint *rp = mir.entryResumePoint();
 
-    // Reserve the amount of stack the actual frame will use. We have to undo
-    // this before falling through to the method proper though, because the
-    // monomorphic call case will bypass this entire path.
-
-    // On windows, we cannot skip very far down the stack without touching the
-    // memory pages in-between.  This is a corner-case code for situations where the
-    // Ion frame data for a piece of code is very large.  To handle this special case,
-    // for frames over 1k in size we allocate memory on the stack incrementally, touching
-    // it as we go.
-    uint32_t frameSizeLeft = frameSize();
-    while (frameSizeLeft > 4096) {
-        masm.reserveStack(4096);
-        masm.store32(Imm32(0), Address(StackPointer, 0));
-        frameSizeLeft -= 4096;
-    }
-    masm.reserveStack(frameSizeLeft);
-
     // No registers are allocated yet, so it's safe to grab anything.
     Register temp = GeneralRegisterSet(EntryTempMask).getAny();
 
@@ -3644,8 +3637,6 @@
         }
     }
 
-    masm.freeStack(frameSize());
-
     return true;
 }
 
@@ -3915,9 +3906,9 @@
     if (!ionScriptLabels_.append(label))
         return false;
 
-    // If IonScript::refcount != 0, the script has been invalidated.
+    // If IonScript::invalidationCount_ != 0, the script has been invalidated.
     masm.branch32(Assembler::NotEqual,
-                  Address(temp, IonScript::offsetOfRefcount()),
+                  Address(temp, IonScript::offsetOfInvalidationCount()),
                   Imm32(0),
                   invalidated);
     return true;
@@ -4103,8 +4094,22 @@
         if (current->isTrivial())
             continue;
 
-        JitSpew(JitSpew_Codegen, "# block%lu%s:", i,
+#ifdef DEBUG
+        const char *filename = nullptr;
+        unsigned lineNumber = 0, columnNumber = 0;
+        if (current->mir()->info().script()) {
+            filename = current->mir()->info().script()->filename();
+            if (current->mir()->pc())
+                lineNumber = PCToLineNumber(current->mir()->info().script(), current->mir()->pc(),
+                                            &columnNumber);
+        } else {
+            lineNumber = current->mir()->lineno();
+            columnNumber = current->mir()->columnIndex();
+        }
+        JitSpew(JitSpew_Codegen, "# block%lu %s:%u:%u%s:", i,
+                filename ? filename : "?", lineNumber, columnNumber,
                 current->mir()->isLoopHeader() ? " (loop header)" : "");
+#endif
 
         masm.bind(current->label());
 
@@ -4323,6 +4328,50 @@
     return true;
 }
 
+typedef ArrayObject *(*ArrayConstructorOneArgFn)(JSContext *, HandleTypeObject, int32_t length);
+static const VMFunction ArrayConstructorOneArgInfo =
+    FunctionInfo<ArrayConstructorOneArgFn>(ArrayConstructorOneArg);
+
+bool
+CodeGenerator::visitNewArrayDynamicLength(LNewArrayDynamicLength *lir)
+{
+    Register lengthReg = ToRegister(lir->length());
+    Register objReg = ToRegister(lir->output());
+    Register tempReg = ToRegister(lir->temp());
+
+    ArrayObject *templateObject = lir->mir()->templateObject();
+    gc::InitialHeap initialHeap = lir->mir()->initialHeap();
+
+    OutOfLineCode *ool = oolCallVM(ArrayConstructorOneArgInfo, lir,
+                                   (ArgList(), ImmGCPtr(templateObject->type()), lengthReg),
+                                   StoreRegisterTo(objReg));
+    if (!ool)
+        return false;
+
+    size_t numSlots = gc::GetGCKindSlots(templateObject->asTenured().getAllocKind());
+    size_t inlineLength = numSlots >= ObjectElements::VALUES_PER_HEADER
+                        ? numSlots - ObjectElements::VALUES_PER_HEADER
+                        : 0;
+
+    // Try to do the allocation inline if the template object is big enough
+    // for the length in lengthReg. If the length is bigger we could still
+    // use the template object and not allocate the elements, but it's more
+    // efficient to do a single big allocation than (repeatedly) reallocating
+    // the array later on when filling it.
+    if (!templateObject->hasSingletonType() && templateObject->length() <= inlineLength)
+        masm.branch32(Assembler::Above, lengthReg, Imm32(templateObject->length()), ool->entry());
+    else
+        masm.jump(ool->entry());
+
+    masm.createGCObject(objReg, tempReg, templateObject, initialHeap, ool->entry());
+
+    size_t lengthOffset = NativeObject::offsetOfFixedElements() + ObjectElements::offsetOfLength();
+    masm.store32(lengthReg, Address(objReg, lengthOffset));
+
+    masm.bind(ool->rejoin());
+    return true;
+}
+
 // Out-of-line object allocation for JSOP_NEWOBJECT.
 class OutOfLineNewObject : public OutOfLineCodeBase<CodeGenerator>
 {
@@ -5103,17 +5152,21 @@
     Register obj = ToRegister(lir->object());
     Register out = ToRegister(lir->output());
 
-    Label inlineObject, done;
-    masm.loadObjClass(obj, out);
-    masm.branchPtr(Assembler::Equal, out, ImmPtr(&InlineOpaqueTypedObject::class_), &inlineObject);
-    masm.branchPtr(Assembler::Equal, out, ImmPtr(&InlineTransparentTypedObject::class_), &inlineObject);
+    if (lir->mir()->definitelyOutline()) {
+        masm.loadPtr(Address(obj, OutlineTypedObject::offsetOfData()), out);
+    } else {
+        Label inlineObject, done;
+        masm.loadObjClass(obj, out);
+        masm.branchPtr(Assembler::Equal, out, ImmPtr(&InlineOpaqueTypedObject::class_), &inlineObject);
+        masm.branchPtr(Assembler::Equal, out, ImmPtr(&InlineTransparentTypedObject::class_), &inlineObject);
 
-    masm.loadPtr(Address(obj, OutlineTypedObject::offsetOfData()), out);
-    masm.jump(&done);
+        masm.loadPtr(Address(obj, OutlineTypedObject::offsetOfData()), out);
+        masm.jump(&done);
 
-    masm.bind(&inlineObject);
-    masm.computeEffectiveAddress(Address(obj, InlineTypedObject::offsetOfDataStart()), out);
-    masm.bind(&done);
+        masm.bind(&inlineObject);
+        masm.computeEffectiveAddress(Address(obj, InlineTypedObject::offsetOfDataStart()), out);
+        masm.bind(&done);
+    }
 
     return true;
 }
@@ -5868,8 +5921,8 @@
 }
 
 static void
-CopyStringChars(MacroAssembler &masm, Register to, Register from, Register len, Register scratch,
-                size_t fromWidth, size_t toWidth)
+CopyStringChars(MacroAssembler &masm, Register to, Register from, Register len,
+                Register byteOpScratch, size_t fromWidth, size_t toWidth)
 {
     // Copy |len| char16_t code units from |from| to |to|. Assumes len > 0
     // (checked below in debug builds), and when done |to| must point to the
@@ -5889,13 +5942,13 @@
     Label start;
     masm.bind(&start);
     if (fromWidth == 2)
-        masm.load16ZeroExtend(Address(from, 0), scratch);
+        masm.load16ZeroExtend(Address(from, 0), byteOpScratch);
     else
-        masm.load8ZeroExtend(Address(from, 0), scratch);
+        masm.load8ZeroExtend(Address(from, 0), byteOpScratch);
     if (toWidth == 2)
-        masm.store16(scratch, Address(to, 0));
+        masm.store16(byteOpScratch, Address(to, 0));
     else
-        masm.store8(scratch, Address(to, 0));
+        masm.store8(byteOpScratch, Address(to, 0));
     masm.addPtr(Imm32(fromWidth), from);
     masm.addPtr(Imm32(toWidth), to);
     masm.branchSub32(Assembler::NonZero, Imm32(1), len, &start);
@@ -6001,6 +6054,126 @@
     masm.ret();
 }
 
+typedef JSString *(*SubstringKernelFn)(JSContext *cx, HandleString str, int32_t begin, int32_t len);
+static const VMFunction SubstringKernelInfo =
+    FunctionInfo<SubstringKernelFn>(SubstringKernel);
+
+bool CodeGenerator::visitSubstr(LSubstr *lir)
+{
+    Register string = ToRegister(lir->string());
+    Register begin = ToRegister(lir->begin());
+    Register length = ToRegister(lir->length());
+    Register output = ToRegister(lir->output());
+    Register temp = ToRegister(lir->temp());
+    Register temp3 = ToRegister(lir->temp3());
+
+    // On x86 there are not enough registers. In that case reuse the string
+    // register as temporary.
+    Register temp2 = lir->temp2()->isBogusTemp() ? string : ToRegister(lir->temp2());
+
+    Address stringFlags(string, JSString::offsetOfFlags());
+
+    Label isLatin1, notInline, nonZero, isInlinedLatin1;
+
+    // For every edge case use the C++ variant.
+    // Note: we also use this upon allocation failure in newGCString and
+    // newGCFatInlineString. To squeeze out even more performance those failures
+    // can be handled by allocate in ool code and returning to jit code to fill
+    // in all data.
+    OutOfLineCode *ool = oolCallVM(SubstringKernelInfo, lir,
+                                   (ArgList(), string, begin, length),
+                                    StoreRegisterTo(output));
+    if (!ool)
+        return false;
+    Label *slowPath = ool->entry();
+    Label *done = ool->rejoin();
+
+    // Zero length, return emptystring.
+    masm.branchTest32(Assembler::NonZero, length, length, &nonZero);
+    const JSAtomState &names = GetIonContext()->runtime->names();
+    masm.movePtr(ImmGCPtr(names.empty), output);
+    masm.jump(done);
+
+    // Use slow path for ropes.
+    masm.bind(&nonZero);
+    static_assert(JSString::ROPE_FLAGS == 0,
+                  "rope flags must be zero for (flags & TYPE_FLAGS_MASK) == 0 "
+                  "to be a valid is-rope check");
+    masm.branchTest32(Assembler::Zero, stringFlags, Imm32(JSString::TYPE_FLAGS_MASK), slowPath);
+
+    // Handle inlined strings by creating a FatInlineString.
+    masm.branchTest32(Assembler::Zero, stringFlags, Imm32(JSString::INLINE_CHARS_BIT), &notInline);
+    masm.newGCFatInlineString(output, temp, slowPath);
+    masm.store32(length, Address(output, JSString::offsetOfLength()));
+    Address stringStorage(string, JSInlineString::offsetOfInlineStorage());
+    Address outputStorage(output, JSInlineString::offsetOfInlineStorage());
+
+    masm.branchTest32(Assembler::NonZero, stringFlags, Imm32(JSString::LATIN1_CHARS_BIT),
+                      &isInlinedLatin1);
+    {
+        masm.store32(Imm32(JSString::INIT_FAT_INLINE_FLAGS),
+                     Address(output, JSString::offsetOfFlags()));
+        masm.computeEffectiveAddress(stringStorage, temp);
+        if (temp2 == string)
+            masm.push(string);
+        BaseIndex chars(temp, begin, ScaleFromElemWidth(sizeof(char16_t)));
+        masm.computeEffectiveAddress(chars, temp2);
+        masm.computeEffectiveAddress(outputStorage, temp);
+        CopyStringChars(masm, temp, temp2, length, temp3, sizeof(char16_t), sizeof(char16_t));
+        masm.load32(Address(output, JSString::offsetOfLength()), length);
+        masm.store16(Imm32(0), Address(temp, 0));
+        if (temp2 == string)
+            masm.pop(string);
+        masm.jump(done);
+    }
+    masm.bind(&isInlinedLatin1);
+    {
+        masm.store32(Imm32(JSString::INIT_FAT_INLINE_FLAGS | JSString::LATIN1_CHARS_BIT),
+                     Address(output, JSString::offsetOfFlags()));
+        if (temp2 == string)
+            masm.push(string);
+        masm.computeEffectiveAddress(stringStorage, temp2);
+        static_assert(sizeof(char) == 1, "begin index shouldn't need scaling");
+        masm.addPtr(begin, temp2);
+        masm.computeEffectiveAddress(outputStorage, temp);
+        CopyStringChars(masm, temp, temp2, length, temp3, sizeof(char), sizeof(char));
+        masm.load32(Address(output, JSString::offsetOfLength()), length);
+        masm.store8(Imm32(0), Address(temp, 0));
+        if (temp2 == string)
+            masm.pop(string);
+        masm.jump(done);
+    }
+
+    // Handle other cases with a DependentString.
+    masm.bind(&notInline);
+    masm.newGCString(output, temp, slowPath);
+    masm.store32(length, Address(output, JSString::offsetOfLength()));
+    masm.storePtr(string, Address(output, JSDependentString::offsetOfBase()));
+
+    masm.branchTest32(Assembler::NonZero, stringFlags, Imm32(JSString::LATIN1_CHARS_BIT), &isLatin1);
+    {
+        masm.store32(Imm32(JSString::DEPENDENT_FLAGS), Address(output, JSString::offsetOfFlags()));
+        masm.loadPtr(Address(string, JSString::offsetOfNonInlineChars()), temp);
+        BaseIndex chars(temp, begin, ScaleFromElemWidth(sizeof(char16_t)));
+        masm.computeEffectiveAddress(chars, temp);
+        masm.storePtr(temp, Address(output, JSString::offsetOfNonInlineChars()));
+        masm.jump(done);
+    }
+    masm.bind(&isLatin1);
+    {
+        masm.store32(Imm32(JSString::DEPENDENT_FLAGS | JSString::LATIN1_CHARS_BIT),
+                     Address(output, JSString::offsetOfFlags()));
+        masm.loadPtr(Address(string, JSString::offsetOfNonInlineChars()), temp);
+        static_assert(sizeof(char) == 1, "begin index shouldn't need scaling");
+        masm.addPtr(begin, temp);
+        masm.storePtr(temp, Address(output, JSString::offsetOfNonInlineChars()));
+        masm.jump(done);
+    }
+
+    masm.bind(done);
+    return true;
+}
+
 JitCode *
 JitCompartment::generateStringConcatStub(JSContext *cx, ExecutionMode mode)
 {
@@ -6019,7 +6192,9 @@
     Register forkJoinContext = CallTempReg4;
 
     Label failure, failurePopTemps;
-
+#ifdef JS_USE_LINK_REGISTER
+    masm.pushReturnAddress();
+#endif
     // If lhs is empty, return rhs.
     Label leftEmpty;
     masm.loadStringLength(lhs, temp1);
@@ -6130,6 +6305,9 @@
     MacroAssembler masm(cx);
 
     RegisterSet regs = RegisterSet::Volatile();
+#ifdef JS_USE_LINK_REGISTER
+    masm.pushReturnAddress();
+#endif
     regs.takeUnchecked(regNBytes);
     masm.PushRegsInMask(regs);
 
@@ -6165,7 +6343,9 @@
     const Register regSlots = CallTempReg0;
 
     MacroAssembler masm(cx);
-
+#ifdef JS_USE_LINK_REGISTER
+    masm.pushReturnAddress();
+#endif
     RegisterSet regs = RegisterSet::Volatile();
     regs.takeUnchecked(regSlots);
     masm.PushRegsInMask(regs);
@@ -6198,15 +6378,26 @@
 JitRuntime::generateLazyLinkStub(JSContext *cx)
 {
     MacroAssembler masm(cx);
+#ifdef JS_USE_LINK_REGISTER
+    masm.push(lr);
+#endif
 
     Label call;
     GeneralRegisterSet regs = GeneralRegisterSet::Volatile();
     Register temp0 = regs.takeAny();
 
     masm.callWithExitFrame(&call);
+#ifdef JS_USE_LINK_REGISTER
+    // sigh, this should probably attempt to bypass the push lr that starts off the block
+    // but oh well.
+    masm.pop(lr);
+#endif
     masm.jump(ReturnReg);
 
     masm.bind(&call);
+#ifdef JS_USE_LINK_REGISTER
+        masm.push(lr);
+#endif
     masm.enterExitFrame();
     masm.setupUnalignedABICall(1, temp0);
     masm.loadJSContext(temp0);
@@ -6499,22 +6690,25 @@
 };
 
 bool
-CodeGenerator::emitStoreHoleCheck(Register elements, const LAllocation *index, LSnapshot *snapshot)
+CodeGenerator::emitStoreHoleCheck(Register elements, const LAllocation *index,
+                                  int32_t offsetAdjustment, LSnapshot *snapshot)
 {
     Label bail;
     if (index->isConstant()) {
-        masm.branchTestMagic(Assembler::Equal,
-                             Address(elements, ToInt32(index) * sizeof(js::Value)), &bail);
+        Address dest(elements, ToInt32(index) * sizeof(js::Value) + offsetAdjustment);
+        masm.branchTestMagic(Assembler::Equal, dest, &bail);
     } else {
-        masm.branchTestMagic(Assembler::Equal,
-                             BaseIndex(elements, ToRegister(index), TimesEight), &bail);
+        BaseIndex dest(elements, ToRegister(index), TimesEight, offsetAdjustment);
+        masm.branchTestMagic(Assembler::Equal, dest, &bail);
     }
     return bailoutFrom(&bail, snapshot);
 }
 
 void
-CodeGenerator::emitStoreElementTyped(const LAllocation *value, MIRType valueType, MIRType elementType,
-                                     Register elements, const LAllocation *index)
+CodeGenerator::emitStoreElementTyped(const LAllocation *value,
+                                     MIRType valueType, MIRType elementType,
+                                     Register elements, const LAllocation *index,
+                                     int32_t offsetAdjustment)
 {
     ConstantOrRegister v;
     if (value->isConstant())
@@ -6523,10 +6717,10 @@
         v = TypedOrValueRegister(valueType, ToAnyRegister(value));
 
     if (index->isConstant()) {
-        Address dest(elements, ToInt32(index) * sizeof(js::Value));
+        Address dest(elements, ToInt32(index) * sizeof(js::Value) + offsetAdjustment);
         masm.storeUnboxedValue(v, valueType, dest, elementType);
     } else {
-        BaseIndex dest(elements, ToRegister(index), TimesEight);
+        BaseIndex dest(elements, ToRegister(index), TimesEight, offsetAdjustment);
         masm.storeUnboxedValue(v, valueType, dest, elementType);
     }
 }
@@ -6540,11 +6734,15 @@
     if (store->mir()->needsBarrier())
         emitPreBarrier(elements, index);
 
-    if (store->mir()->needsHoleCheck() && !emitStoreHoleCheck(elements, index, store->snapshot()))
+    if (store->mir()->needsHoleCheck() &&
+        !emitStoreHoleCheck(elements, index, store->mir()->offsetAdjustment(), store->snapshot()))
+    {
         return false;
+    }
 
-    emitStoreElementTyped(store->value(), store->mir()->value()->type(), store->mir()->elementType(),
-                          elements, index);
+    emitStoreElementTyped(store->value(),
+                          store->mir()->value()->type(), store->mir()->elementType(),
+                          elements, index, store->mir()->offsetAdjustment());
     return true;
 }
 
@@ -6558,13 +6756,21 @@
     if (lir->mir()->needsBarrier())
         emitPreBarrier(elements, index);
 
-    if (lir->mir()->needsHoleCheck() && !emitStoreHoleCheck(elements, index, lir->snapshot()))
+    if (lir->mir()->needsHoleCheck() &&
+        !emitStoreHoleCheck(elements, index, lir->mir()->offsetAdjustment(), lir->snapshot()))
+    {
         return false;
+    }
 
-    if (lir->index()->isConstant())
-        masm.storeValue(value, Address(elements, ToInt32(lir->index()) * sizeof(js::Value)));
-    else
-        masm.storeValue(value, BaseIndex(elements, ToRegister(lir->index()), TimesEight));
+    if (lir->index()->isConstant()) {
+        Address dest(elements,
+                     ToInt32(lir->index()) * sizeof(js::Value) + lir->mir()->offsetAdjustment());
+        masm.storeValue(value, dest);
+    } else {
+        BaseIndex dest(elements, ToRegister(lir->index()), TimesEight,
+                       lir->mir()->offsetAdjustment());
+        masm.storeValue(value, dest);
+    }
     return true;
 }
 
@@ -6587,7 +6793,7 @@
 
     masm.bind(ool->rejoinStore());
     emitStoreElementTyped(lir->value(), lir->mir()->value()->type(), lir->mir()->elementType(),
-                          elements, index);
+                          elements, index, 0);
 
     masm.bind(ool->rejoin());
     return true;
@@ -6693,7 +6899,7 @@
         // so we do the store on the OOL path. We use MIRType_None for the element type
         // so that storeElementTyped will always store the type tag.
         emitStoreElementTyped(ins->toStoreElementHoleT()->value(), valueType, MIRType_None,
-                              elements, index);
+                              elements, index, 0);
         masm.jump(ool->rejoin());
     } else {
         // Jump to the inline path where we will store the value.
@@ -6739,18 +6945,27 @@
 bool
 CodeGenerator::visitStoreUnboxedPointer(LStoreUnboxedPointer *lir)
 {
-    MOZ_ASSERT(lir->mir()->isStoreUnboxedObjectOrNull() || lir->mir()->isStoreUnboxedString());
-    MIRType type = lir->mir()->isStoreUnboxedObjectOrNull() ? MIRType_Object : MIRType_String;
+    MIRType type;
+    int32_t offsetAdjustment;
+    if (lir->mir()->isStoreUnboxedObjectOrNull()) {
+        type = MIRType_Object;
+        offsetAdjustment = lir->mir()->toStoreUnboxedObjectOrNull()->offsetAdjustment();
+    } else if (lir->mir()->isStoreUnboxedString()) {
+        type = MIRType_String;
+        offsetAdjustment = lir->mir()->toStoreUnboxedString()->offsetAdjustment();
+    } else {
+        MOZ_CRASH();
+    }
 
     Register elements = ToRegister(lir->elements());
     const LAllocation *index = lir->index();
     const LAllocation *value = lir->value();
 
     if (index->isConstant()) {
-        Address address(elements, ToInt32(index) * sizeof(uintptr_t));
+        Address address(elements, ToInt32(index) * sizeof(uintptr_t) + offsetAdjustment);
         StoreUnboxedPointer(masm, address, type, value);
     } else {
-        BaseIndex address(elements, ToRegister(index), ScalePointer);
+        BaseIndex address(elements, ToRegister(index), ScalePointer, offsetAdjustment);
         StoreUnboxedPointer(masm, address, type, value);
     }
 
@@ -7224,7 +7439,7 @@
         masm.loadValue(argPtr, result);
     } else {
         Register i = ToRegister(index);
-        BaseIndex argPtr(StackPointer, i, ScaleFromElemWidth(sizeof(Value)), argvOffset);
+        BaseValueIndex argPtr(StackPointer, i, argvOffset);
         masm.loadValue(argPtr, result);
     }
     return true;
@@ -7441,14 +7656,8 @@
     if (!safepoints_.init(gen->alloc(), graph.totalSlotCount()))
         return false;
 
-#ifdef JS_TRACE_LOGGING
-    if (!gen->compilingAsmJS() && gen->info().executionMode() == SequentialExecution) {
-        if (!emitTracelogScriptStart())
-            return false;
-        if (!emitTracelogStartEvent(TraceLogger::IonMonkey))
-            return false;
-    }
-#endif
+    if (!generatePrologue())
+        return false;
 
     // Before generating any code, we generate type checks for all parameters.
     // This comes before deoptTable_, because we can't use deopt tables without
@@ -7462,14 +7671,19 @@
             return false;
     }
 
-#ifdef JS_TRACE_LOGGING
-    Label skip;
-    masm.jump(&skip);
-#endif
+    // Skip over the alternative entry to IonScript code.
+    Label skipPrologue;
+    masm.jump(&skipPrologue);
 
-    // Remember the entry offset to skip the argument check.
+    // An alternative entry to the IonScript code, which doesn't test the
+    // arguments.
     masm.flushBuffer();
     setSkipArgCheckEntryOffset(masm.size());
+    masm.setFramePushed(0);
+    if (!generatePrologue())
+        return false;
+
+    masm.bind(&skipPrologue);
 
 #ifdef JS_TRACE_LOGGING
     if (!gen->compilingAsmJS() && gen->info().executionMode() == SequentialExecution) {
@@ -7478,7 +7692,6 @@
         if (!emitTracelogStartEvent(TraceLogger::IonMonkey))
             return false;
     }
-    masm.bind(&skip);
 #endif
 
 #ifdef DEBUG
@@ -7487,9 +7700,6 @@
         return false;
 #endif
 
-    if (!generatePrologue())
-        return false;
-
     // Reset native => bytecode map table with top-level script and startPc.
     if (!addNativeToBytecodeEntry(startSite))
         return false;
@@ -8822,9 +9032,12 @@
 {
     Register elements = ToRegister(lir->elements());
     const LAllocation *index = lir->index();
-    if (index->isConstant())
-        return emitLoadElementT(lir, Address(elements, ToInt32(index) * sizeof(js::Value)));
-    return emitLoadElementT(lir, BaseIndex(elements, ToRegister(index), TimesEight));
+    if (index->isConstant()) {
+        int32_t offset = ToInt32(index) * sizeof(js::Value) + lir->mir()->offsetAdjustment();
+        return emitLoadElementT(lir, Address(elements, offset));
+    }
+    return emitLoadElementT(lir, BaseIndex(elements, ToRegister(index), TimesEight,
+                                           lir->mir()->offsetAdjustment()));
 }
 
 bool
@@ -8833,10 +9046,14 @@
     Register elements = ToRegister(load->elements());
     const ValueOperand out = ToOutValue(load);
 
-    if (load->index()->isConstant())
-        masm.loadValue(Address(elements, ToInt32(load->index()) * sizeof(Value)), out);
-    else
-        masm.loadValue(BaseIndex(elements, ToRegister(load->index()), TimesEight), out);
+    if (load->index()->isConstant()) {
+        NativeObject::elementsSizeMustNotOverflow();
+        int32_t offset = ToInt32(load->index()) * sizeof(Value) + load->mir()->offsetAdjustment();
+        masm.loadValue(Address(elements, offset), out);
+    } else {
+        masm.loadValue(BaseObjectElementIndex(elements, ToRegister(load->index()),
+                                              load->mir()->offsetAdjustment()), out);
+    }
 
     if (load->mir()->needsHoleCheck()) {
         Label testMagic;
@@ -8862,10 +9079,11 @@
     Label undefined, done;
     if (lir->index()->isConstant()) {
         masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(ToInt32(lir->index())), &undefined);
+        NativeObject::elementsSizeMustNotOverflow();
         masm.loadValue(Address(elements, ToInt32(lir->index()) * sizeof(Value)), out);
     } else {
         masm.branch32(Assembler::BelowOrEqual, initLength, ToRegister(lir->index()), &undefined);
-        masm.loadValue(BaseIndex(elements, ToRegister(lir->index()), TimesEight), out);
+        masm.loadValue(BaseObjectElementIndex(elements, ToRegister(lir->index())), out);
     }
 
     // If a hole check is needed, and the value wasn't a hole, we're done.
@@ -8900,10 +9118,13 @@
     Register elements = ToRegister(lir->elements());
     const ValueOperand out = ToOutValue(lir);
 
-    if (lir->index()->isConstant())
-        masm.loadPtr(Address(elements, ToInt32(lir->index()) * sizeof(uintptr_t)), out.scratchReg());
-    else
-        masm.loadPtr(BaseIndex(elements, ToRegister(lir->index()), ScalePointer), out.scratchReg());
+    if (lir->index()->isConstant()) {
+        int32_t offset = ToInt32(lir->index()) * sizeof(uintptr_t) + lir->mir()->offsetAdjustment();
+        masm.loadPtr(Address(elements, offset), out.scratchReg());
+    } else {
+        masm.loadPtr(BaseIndex(elements, ToRegister(lir->index()), ScalePointer,
+                               lir->mir()->offsetAdjustment()), out.scratchReg());
+    }
 
     Label notNull, done;
     masm.branchPtr(Assembler::NotEqual, out.scratchReg(), ImmWord(0), &notNull);
@@ -8925,10 +9146,34 @@
     const LAllocation *index = lir->index();
     Register out = ToRegister(lir->output());
 
-    if (index->isConstant())
-        masm.loadPtr(Address(elements, ToInt32(index) * sizeof(uintptr_t)), out);
-    else
-        masm.loadPtr(BaseIndex(elements, ToRegister(index), ScalePointer), out);
+    bool bailOnNull;
+    int32_t offsetAdjustment;
+    if (lir->mir()->isLoadUnboxedObjectOrNull()) {
+        MOZ_ASSERT(lir->mir()->toLoadUnboxedObjectOrNull()->bailOnNull());
+        bailOnNull = true;
+        offsetAdjustment = lir->mir()->toLoadUnboxedObjectOrNull()->offsetAdjustment();
+    } else if (lir->mir()->isLoadUnboxedString()) {
+        bailOnNull = false;
+        offsetAdjustment = lir->mir()->toLoadUnboxedString()->offsetAdjustment();
+    } else {
+        MOZ_CRASH();
+    }
+
+    if (index->isConstant()) {
+        Address source(elements, ToInt32(index) * sizeof(uintptr_t) + offsetAdjustment);
+        masm.loadPtr(source, out);
+    } else {
+        BaseIndex source(elements, ToRegister(index), ScalePointer, offsetAdjustment);
+        masm.loadPtr(source, out);
+    }
+
+    if (bailOnNull) {
+        Label bail;
+        masm.branchTestPtr(Assembler::Zero, out, out, &bail);
+        if (!bailoutFrom(&bail, lir->snapshot()))
+            return false;
+    }
+
     return true;
 }
 
@@ -8944,10 +9189,11 @@
 
     Label fail;
     if (lir->index()->isConstant()) {
-        Address source(elements, ToInt32(lir->index()) * width);
+        Address source(elements, ToInt32(lir->index()) * width + lir->mir()->offsetAdjustment());
         masm.loadFromTypedArray(arrayType, source, out, temp, &fail);
     } else {
-        BaseIndex source(elements, ToRegister(lir->index()), ScaleFromElemWidth(width));
+        BaseIndex source(elements, ToRegister(lir->index()), ScaleFromElemWidth(width),
+                         lir->mir()->offsetAdjustment());
         masm.loadFromTypedArray(arrayType, source, out, temp, &fail);
     }
 
@@ -9023,10 +9269,11 @@
     int width = Scalar::byteSize(arrayType);
 
     if (lir->index()->isConstant()) {
-        Address dest(elements, ToInt32(lir->index()) * width);
+        Address dest(elements, ToInt32(lir->index()) * width + lir->mir()->offsetAdjustment());
         StoreToTypedArray(masm, arrayType, value, dest);
     } else {
-        BaseIndex dest(elements, ToRegister(lir->index()), ScaleFromElemWidth(width));
+        BaseIndex dest(elements, ToRegister(lir->index()), ScaleFromElemWidth(width),
+                       lir->mir()->offsetAdjustment());
         StoreToTypedArray(masm, arrayType, value, dest);
     }
 
@@ -9227,6 +9474,7 @@
 
         masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(index), failedInitLength);
         if (mir->needsHoleCheck()) {
+            NativeObject::elementsSizeMustNotOverflow();
             Address address = Address(elements, index * sizeof(Value));
             masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
         }
@@ -10033,5 +10281,21 @@
     return callVM(ThrowUninitializedLexicalInfo, ins);
 }
 
+bool
+CodeGenerator::visitDebugger(LDebugger *ins)
+{
+    Register cx = ToRegister(ins->getTemp(0));
+    Register temp = ToRegister(ins->getTemp(1));
+
+    masm.loadJSContext(cx);
+    masm.setupUnalignedABICall(1, temp);
+    masm.passABIArg(cx);
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, GlobalHasLiveOnDebuggerStatement));
+
+    Label bail;
+    masm.branchIfTrueBool(ReturnReg, &bail);
+    return bailoutFrom(&bail, ins->snapshot());
+}
+
 } // namespace jit
 } // namespace js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/CodeGenerator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/CodeGenerator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/CodeGenerator.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/CodeGenerator.h	2014-11-26 21:45:57.000000000 +0000
@@ -153,6 +153,7 @@
     bool visitNewArray(LNewArray *lir);
     bool visitOutOfLineNewArray(OutOfLineNewArray *ool);
     bool visitNewArrayCopyOnWrite(LNewArrayCopyOnWrite *lir);
+    bool visitNewArrayDynamicLength(LNewArrayDynamicLength *lir);
     bool visitNewObjectVMCall(LNewObject *lir);
     bool visitNewObject(LNewObject *lir);
     bool visitOutOfLineNewObject(OutOfLineNewObject *ool);
@@ -187,6 +188,7 @@
     bool visitSetTypedObjectOffset(LSetTypedObjectOffset *lir);
     bool visitTypedObjectProto(LTypedObjectProto *ins);
     bool visitStringLength(LStringLength *lir);
+    bool visitSubstr(LSubstr *lir);
     bool visitInitializedLength(LInitializedLength *lir);
     bool visitSetInitializedLength(LSetInitializedLength *lir);
     bool visitNotO(LNotO *ins);
@@ -317,6 +319,7 @@
     bool visitAsmJSVoidReturn(LAsmJSVoidReturn *ret);
     bool visitLexicalCheck(LLexicalCheck *ins);
     bool visitThrowUninitializedLexical(LThrowUninitializedLexical *ins);
+    bool visitDebugger(LDebugger *ins);
 
     bool visitCheckOverRecursed(LCheckOverRecursed *lir);
     bool visitCheckOverRecursedFailure(CheckOverRecursedFailure *ool);
@@ -468,10 +471,12 @@
     Label *getJumpLabelForBranch(MBasicBlock *block);
 
     void emitStoreElementTyped(const LAllocation *value, MIRType valueType, MIRType elementType,
-                               Register elements, const LAllocation *index);
+                               Register elements, const LAllocation *index,
+                               int32_t offsetAdjustment);
 
     // Bailout if an element about to be written to is a hole.
-    bool emitStoreHoleCheck(Register elements, const LAllocation *index, LSnapshot *snapshot);
+    bool emitStoreHoleCheck(Register elements, const LAllocation *index, int32_t offsetAdjustment,
+                            LSnapshot *snapshot);
 
     bool emitAssertRangeI(const Range *r, Register input);
     bool emitAssertRangeD(const Range *r, FloatRegister input, FloatRegister temp);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/ExecutableAllocatorWin.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/ExecutableAllocatorWin.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/ExecutableAllocatorWin.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/ExecutableAllocatorWin.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -159,7 +159,7 @@
     // mov imm64, rax
     r->thunk[0]  = 0x48;
     r->thunk[1]  = 0xb8;
-    void *handler = &ExceptionHandler;
+    void *handler = JS_FUNC_TO_DATA_PTR(void *, ExceptionHandler);
     memcpy(&r->thunk[2], &handler, 8);
 
     // jmp rax
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonAnalysis.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonAnalysis.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonAnalysis.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonAnalysis.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -569,10 +569,6 @@
             if (js::jit::IsDiscardable(inst))
             {
                 block->discard(inst);
-            } else if (!inst->isRecoveredOnBailout() && !inst->isGuard() &&
-                       !inst->hasLiveDefUses() && inst->canRecoverOnBailout())
-            {
-                inst->setRecoveredOnBailout();
             }
         }
     }
@@ -1776,28 +1772,73 @@
     return false;
 }
 
-static bool
-CheckOperandImpliesUse(MNode *n, MDefinition *operand)
-{
-    MOZ_ASSERT(!operand->isDiscarded());
-    MOZ_ASSERT(operand->block() != nullptr);
+// If you have issues with the usesBalance assertions, then define the macro
+// _DEBUG_CHECK_OPERANDS_USES_BALANCE to spew information on the error output.
+// This output can then be processed with the following awk script to filter and
+// highlight which checks are missing or if there is an unexpected operand /
+// use.
+//
+// define _DEBUG_CHECK_OPERANDS_USES_BALANCE 1
+/*
 
-    for (MUseIterator i = operand->usesBegin(); i != operand->usesEnd(); i++) {
-        if (i->consumer() == n)
-            return true;
-    }
-    return false;
+$ ./js 2>stderr.log
+$ gawk '
+    /^==Check/ { context = ""; state = $2; }
+    /^[a-z]/ { context = context "\n\t" $0; }
+    /^==End/ {
+      if (state == "Operand") {
+        list[context] = list[context] - 1;
+      } else if (state == "Use") {
+        list[context] = list[context] + 1;
+      }
+    }
+    END {
+      for (ctx in list) {
+        if (list[ctx] > 0) {
+          print "Missing operand check", ctx, "\n"
+        }
+        if (list[ctx] < 0) {
+          print "Missing use check", ctx, "\n"
+        }
+      };
+    }'  < stderr.log
+
+*/
+
+static void
+CheckOperand(const MNode *consumer, const MUse *use, int32_t *usesBalance)
+{
+    MOZ_ASSERT(use->hasProducer());
+    MDefinition *producer = use->producer();
+    MOZ_ASSERT(!producer->isDiscarded());
+    MOZ_ASSERT(producer->block() != nullptr);
+    MOZ_ASSERT(use->consumer() == consumer);
+#ifdef _DEBUG_CHECK_OPERANDS_USES_BALANCE
+    fprintf(stderr, "==Check Operand\n");
+    use->producer()->dump(stderr);
+    fprintf(stderr, "  index: %zu\n", use->consumer()->indexOf(use));
+    use->consumer()->dump(stderr);
+    fprintf(stderr, "==End\n");
+#endif
+    --*usesBalance;
 }
 
-static bool
-CheckUseImpliesOperand(MDefinition *def, MUse *use)
+static void
+CheckUse(const MDefinition *producer, const MUse *use, int32_t *usesBalance)
 {
     MOZ_ASSERT(!use->consumer()->block()->isDead());
     MOZ_ASSERT_IF(use->consumer()->isDefinition(),
                   !use->consumer()->toDefinition()->isDiscarded());
     MOZ_ASSERT(use->consumer()->block() != nullptr);
-
-    return use->consumer()->getOperand(use->index()) == def;
+    MOZ_ASSERT(use->consumer()->getOperand(use->index()) == producer);
+#ifdef _DEBUG_CHECK_OPERANDS_USES_BALANCE
+    fprintf(stderr, "==Check Use\n");
+    use->producer()->dump(stderr);
+    fprintf(stderr, "  index: %zu\n", use->consumer()->indexOf(use));
+    use->consumer()->dump(stderr);
+    fprintf(stderr, "==End\n");
+#endif
+    ++*usesBalance;
 }
 #endif // DEBUG
 
@@ -1821,6 +1862,7 @@
 
     // Assert successor and predecessor list coherency.
     uint32_t count = 0;
+    int32_t usesBalance = 0;
     for (MBasicBlockIterator block(graph.begin()); block != graph.end(); block++) {
         count++;
 
@@ -1848,10 +1890,8 @@
             // the entry resume point because we are still storing resume points
             // in the InlinePropertyTable.
             MOZ_ASSERT_IF(iter->instruction(), iter->instruction()->block() == *block);
-            for (uint32_t i = 0, e = iter->numOperands(); i < e; i++) {
-                MOZ_ASSERT(iter->getUseFor(i)->hasProducer());
-                MOZ_ASSERT(CheckOperandImpliesUse(*iter, iter->getOperand(i)));
-            }
+            for (uint32_t i = 0, e = iter->numOperands(); i < e; i++)
+                CheckOperand(*iter, iter->getUseFor(i), &usesBalance);
         }
         for (MPhiIterator phi(block->phisBegin()); phi != block->phisEnd(); phi++) {
             MOZ_ASSERT(phi->numOperands() == block->numPredecessors());
@@ -1872,9 +1912,9 @@
 
             // Assert that use chains are valid for this instruction.
             for (uint32_t i = 0, end = iter->numOperands(); i < end; i++)
-                MOZ_ASSERT(CheckOperandImpliesUse(*iter, iter->getOperand(i)));
+                CheckOperand(*iter, iter->getUseFor(i), &usesBalance);
             for (MUseIterator use(iter->usesBegin()); use != iter->usesEnd(); use++)
-                MOZ_ASSERT(CheckUseImpliesOperand(*iter, *use));
+                CheckUse(*iter, *use, &usesBalance);
 
             if (iter->isInstruction()) {
                 if (MResumePoint *resume = iter->toInstruction()->resumePoint()) {
@@ -1888,6 +1928,7 @@
                 MOZ_ASSERT(!iter->hasLiveDefUses());
         }
 
+        // The control instruction is not visited by the MDefinitionIterator.
         MControlInstruction *control = block->lastIns();
         MOZ_ASSERT(control->block() == *block);
         MOZ_ASSERT(!control->hasUses());
@@ -1895,10 +1936,13 @@
         MOZ_ASSERT(!control->isDiscarded());
         MOZ_ASSERT(!control->isRecoveredOnBailout());
         MOZ_ASSERT(control->resumePoint() == nullptr);
-        for (uint32_t i = 0, end = control->numOperands(); i < end; ++i)
-            MOZ_ASSERT(CheckOperandImpliesUse(control, control->getOperand(i)));
+        for (uint32_t i = 0, end = control->numOperands(); i < end; i++)
+            CheckOperand(control, control->getUseFor(i), &usesBalance);
     }
 
+    // In case issues, see the _DEBUG_CHECK_OPERANDS_USES_BALANCE macro above.
+    MOZ_ASSERT(usesBalance <= 0, "More use checks than operand checks");
+    MOZ_ASSERT(usesBalance >= 0, "More operand checks than use checks");
     MOZ_ASSERT(graph.numBlocks() == count);
 #endif
 }
@@ -2508,6 +2552,25 @@
 }
 
 bool
+LinearSum::divide(int32_t scale)
+{
+    MOZ_ASSERT(scale > 0);
+
+    for (size_t i = 0; i < terms_.length(); i++) {
+        if (terms_[i].scale % scale != 0)
+            return false;
+    }
+    if (constant_ % scale != 0)
+        return false;
+
+    for (size_t i = 0; i < terms_.length(); i++)
+        terms_[i].scale /= scale;
+    constant_ /= scale;
+
+    return true;
+}
+
+bool
 LinearSum::add(const LinearSum &other, int32_t scale /* = 1 */)
 {
     for (size_t i = 0; i < other.terms_.length(); i++) {
@@ -2524,6 +2587,19 @@
 }
 
 bool
+LinearSum::add(SimpleLinearSum other, int32_t scale)
+{
+    if (other.term && !add(other.term, scale))
+        return false;
+
+    int32_t constant;
+    if (!SafeMul(other.constant, scale, &constant))
+        return false;
+
+    return add(constant);
+}
+
+bool
 LinearSum::add(MDefinition *term, int32_t scale)
 {
     MOZ_ASSERT(term);
@@ -2550,7 +2626,9 @@
         }
     }
 
-    terms_.append(LinearTerm(term, scale));
+    if (!terms_.append(LinearTerm(term, scale)))
+        CrashAtUnhandlableOOM("LinearSum::add");
+
     return true;
 }
 
@@ -2602,7 +2680,7 @@
 }
 
 MDefinition *
-jit::ConvertLinearSum(TempAllocator &alloc, MBasicBlock *block, const LinearSum &sum)
+jit::ConvertLinearSum(TempAllocator &alloc, MBasicBlock *block, const LinearSum &sum, bool convertConstant)
 {
     MDefinition *def = nullptr;
 
@@ -2647,7 +2725,20 @@
         }
     }
 
-    // Note: The constant component of the term is not converted.
+    if (convertConstant && sum.constant()) {
+        MConstant *constant = MConstant::New(alloc, Int32Value(sum.constant()));
+        block->insertAtEnd(constant);
+        constant->computeRange(alloc);
+        if (def) {
+            def = MAdd::New(alloc, def, constant);
+            def->toAdd()->setInt32();
+            block->insertAtEnd(def->toInstruction());
+            def->computeRange(alloc);
+        } else {
+            def = constant;
+        }
+    }
+
     if (!def) {
         def = MConstant::New(alloc, Int32Value(0));
         block->insertAtEnd(def->toInstruction());
@@ -3096,7 +3187,7 @@
     // scripts (generators can be suspended when speculation fails).
     //
     // FIXME: Don't build arguments for ES6 generator expressions.
-    if (cx->compartment()->debugMode() || script->isGenerator())
+    if (scriptArg->isDebuggee() || script->isGenerator())
         return true;
 
     // If the script has dynamic name accesses which could reach 'arguments',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonAnalysis.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonAnalysis.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonAnalysis.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonAnalysis.h	2014-11-26 21:45:57.000000000 +0000
@@ -131,11 +131,18 @@
         terms_.appendAll(other.terms_);
     }
 
+    // These return false on an integer overflow, and afterwards the sum must
+    // not be used.
     bool multiply(int32_t scale);
     bool add(const LinearSum &other, int32_t scale = 1);
+    bool add(SimpleLinearSum other, int32_t scale = 1);
     bool add(MDefinition *term, int32_t scale);
     bool add(int32_t constant);
 
+    // Unlike the above function, on failure this leaves the sum unchanged and
+    // it can still be used.
+    bool divide(int32_t scale);
+
     int32_t constant() const { return constant_; }
     size_t numTerms() const { return terms_.length(); }
     LinearTerm term(size_t i) const { return terms_[i]; }
@@ -150,10 +157,11 @@
     int32_t constant_;
 };
 
-// Convert all components of a linear sum *except* its constant to a definition,
-// adding any necessary instructions to the end of block.
+// Convert all components of a linear sum (except, optionally, the constant)
+// and add any new instructions to the end of block.
 MDefinition *
-ConvertLinearSum(TempAllocator &alloc, MBasicBlock *block, const LinearSum &sum);
+ConvertLinearSum(TempAllocator &alloc, MBasicBlock *block, const LinearSum &sum,
+                 bool convertConstant = false);
 
 // Convert the test 'sum >= 0' to a comparison, adding any necessary
 // instructions to the end of block.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonBuilder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonBuilder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonBuilder.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonBuilder.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -402,6 +402,9 @@
     if (inlineScript->needsArgsObj())
         return DontInline(inlineScript, "Script that needs an arguments object");
 
+    if (inlineScript->isDebuggee())
+        return DontInline(inlineScript, "Script is debuggee");
+
     types::TypeObjectKey *targetType = types::TypeObjectKey::get(target);
     if (targetType->unknownProperties())
         return DontInline(inlineScript, "Target type has unknown properties");
@@ -765,6 +768,11 @@
         return false;
     }
 
+    if (shouldForceAbort()) {
+        abortReason_ = AbortReason_Disable;
+        return false;
+    }
+
     MOZ_ASSERT(loopDepth_ == 0);
     abortReason_ = AbortReason_NoAbort;
     return true;
@@ -909,6 +917,17 @@
     // Discard unreferenced & pre-allocated resume points.
     replaceMaybeFallbackFunctionGetter(nullptr);
 
+    if (!abortedNewScriptPropertiesTypes().empty()) {
+        MOZ_ASSERT(!info().executionModeIsAnalysis());
+        abortReason_ = AbortReason_NewScriptProperties;
+        return false;
+    }
+
+    if (shouldForceAbort()) {
+        abortReason_ = AbortReason_Disable;
+        return false;
+    }
+
     return true;
 }
 
@@ -1806,6 +1825,9 @@
       case JSOP_DEBUGLEAVEBLOCK:
         return true;
 
+      case JSOP_DEBUGGER:
+        return jsop_debugger();
+
       default:
 #ifdef DEBUG
         return abort("Unsupported opcode: %s (line %d)", js_CodeName[op], info().lineno(pc));
@@ -4951,16 +4973,16 @@
     // Inline each of the inlineable targets.
     MOZ_ASSERT(targets.length() == originals.length());
     for (uint32_t i = 0; i < targets.length(); i++) {
+        // Target must be inlineable.
+        if (!choiceSet[i])
+            continue;
+
         // When original != target, the target is a callsite clone. The
         // original should be used for guards, and the target should be the
         // actual function inlined.
         JSFunction *original = &originals[i]->as<JSFunction>();
         JSFunction *target = &targets[i]->as<JSFunction>();
 
-        // Target must be inlineable.
-        if (!choiceSet[i])
-            continue;
-
         // Target must be reachable by the MDispatchInstruction.
         if (maybeCache && !maybeCache->propTable()->hasFunction(original)) {
             choiceSet[i] = false;
@@ -5069,8 +5091,12 @@
                     if (choiceSet[i])
                         continue;
 
-                    remaining = &targets[i]->as<JSFunction>();
-                    clonedAtCallsite = targets[i] != originals[i];
+                    MOZ_ASSERT(!remaining);
+
+                    if (targets[i]->is<JSFunction>()) {
+                        remaining = &targets[i]->as<JSFunction>();
+                        clonedAtCallsite = targets[i] != originals[i];
+                    }
                     break;
                 }
             }
@@ -6539,7 +6565,7 @@
     }
 
     if (clasp->resolve == fun_resolve)
-        return FunctionHasResolveHook(comp->runtime()->names(), name);
+        return FunctionHasResolveHook(comp->runtime()->names(), NameToId(name));
 
     return true;
 }
@@ -7021,7 +7047,7 @@
         return jsop_setprop(name);
     }
 
-    if (!CanWriteProperty(constraints(), property, value))
+    if (!CanWriteProperty(alloc(), constraints(), property, value))
         return jsop_setprop(name);
 
     current->pop();
@@ -7279,7 +7305,7 @@
                                           MDefinition *obj,
                                           MDefinition *index,
                                           TypedObjectPrediction objPrediction,
-                                          MDefinition **indexAsByteOffset)
+                                          LinearSum *indexAsByteOffset)
 {
     // Ensure index is an integer.
     MInstruction *idInt32 = MToInt32::New(alloc(), index);
@@ -7305,14 +7331,7 @@
 
     index = addBoundsCheck(idInt32, length);
 
-    // Since we passed the bounds check, it is impossible for the
-    // result of multiplication to overflow; so enable imul path.
-    MMul *mul = MMul::New(alloc(), index, constantInt(elemSize),
-                          MIRType_Int32, MMul::Integer);
-    current->add(mul);
-
-    *indexAsByteOffset = mul;
-    return true;
+    return indexAsByteOffset->add(index, elemSize);
 }
 
 bool
@@ -7329,7 +7348,7 @@
     ScalarTypeDescr::Type elemType = elemPrediction.scalarType();
     MOZ_ASSERT(elemSize == ScalarTypeDescr::alignment(elemType));
 
-    MDefinition *indexAsByteOffset;
+    LinearSum indexAsByteOffset(alloc());
     if (!checkTypedObjectIndexInBounds(elemSize, obj, index, objPrediction, &indexAsByteOffset))
         return true;
 
@@ -7350,18 +7369,18 @@
     ReferenceTypeDescr::Type elemType = elemPrediction.referenceType();
     size_t elemSize = ReferenceTypeDescr::size(elemType);
 
-    MDefinition *indexAsByteOffset;
+    LinearSum indexAsByteOffset(alloc());
     if (!checkTypedObjectIndexInBounds(elemSize, obj, index, objPrediction, &indexAsByteOffset))
         return true;
 
     *emitted = true;
 
-    return pushReferenceLoadFromTypedObject(obj, indexAsByteOffset, elemType);
+    return pushReferenceLoadFromTypedObject(obj, indexAsByteOffset, elemType, nullptr);
 }
 
 bool
 IonBuilder::pushScalarLoadFromTypedObject(MDefinition *obj,
-                                          MDefinition *offset,
+                                          const LinearSum &byteOffset,
                                           ScalarTypeDescr::Type elemType)
 {
     int32_t size = ScalarTypeDescr::size(elemType);
@@ -7369,10 +7388,14 @@
 
     // Find location within the owner object.
     MDefinition *elements, *scaledOffset;
-    loadTypedObjectElements(obj, offset, size, &elements, &scaledOffset);
+    int32_t adjustment;
+    loadTypedObjectElements(obj, byteOffset, size, &elements, &scaledOffset, &adjustment);
 
     // Load the element.
-    MLoadTypedArrayElement *load = MLoadTypedArrayElement::New(alloc(), elements, scaledOffset, elemType);
+    MLoadTypedArrayElement *load = MLoadTypedArrayElement::New(alloc(), elements, scaledOffset,
+                                                               elemType,
+                                                               DoesNotRequireMemoryBarrier,
+                                                               adjustment);
     current->add(load);
     current->push(load);
 
@@ -7398,33 +7421,47 @@
 
 bool
 IonBuilder::pushReferenceLoadFromTypedObject(MDefinition *typedObj,
-                                             MDefinition *byteOffset,
-                                             ReferenceTypeDescr::Type type)
+                                             const LinearSum &byteOffset,
+                                             ReferenceTypeDescr::Type type,
+                                             PropertyName *name)
 {
     // Find location within the owner object.
     MDefinition *elements, *scaledOffset;
+    int32_t adjustment;
     size_t alignment = ReferenceTypeDescr::alignment(type);
-    loadTypedObjectElements(typedObj, byteOffset, alignment, &elements, &scaledOffset);
+    loadTypedObjectElements(typedObj, byteOffset, alignment, &elements, &scaledOffset, &adjustment);
 
     types::TemporaryTypeSet *observedTypes = bytecodeTypes(pc);
 
     MInstruction *load;
-    BarrierKind barrier = BarrierKind::NoBarrier;
+    BarrierKind barrier = PropertyReadNeedsTypeBarrier(analysisContext, constraints(),
+                                                       typedObj, name, observedTypes);
+
     switch (type) {
-      case ReferenceTypeDescr::TYPE_ANY:
-        load = MLoadElement::New(alloc(), elements, scaledOffset, false, false);
-        if (!observedTypes->unknown())
-            barrier = BarrierKind::TypeSet;
+      case ReferenceTypeDescr::TYPE_ANY: {
+        // Make sure the barrier reflects the possibility of reading undefined.
+        bool bailOnUndefined = barrier == BarrierKind::NoBarrier &&
+                               !observedTypes->hasType(types::Type::UndefinedType());
+        if (bailOnUndefined)
+            barrier = BarrierKind::TypeTagOnly;
+        load = MLoadElement::New(alloc(), elements, scaledOffset, false, false, adjustment);
         break;
-      case ReferenceTypeDescr::TYPE_OBJECT:
-        load = MLoadUnboxedObjectOrNull::New(alloc(), elements, scaledOffset);
-        if (!observedTypes->unknownObject() || !observedTypes->hasType(types::Type::NullType()))
-            barrier = BarrierKind::TypeSet;
+      }
+      case ReferenceTypeDescr::TYPE_OBJECT: {
+        // Make sure the barrier reflects the possibility of reading null. When
+        // there is no other barrier needed we include the null bailout with
+        // MLoadUnboxedObjectOrNull, which avoids the need to box the result
+        // for a type barrier instruction.
+        bool bailOnNull = barrier == BarrierKind::NoBarrier &&
+                          !observedTypes->hasType(types::Type::NullType());
+        load = MLoadUnboxedObjectOrNull::New(alloc(), elements, scaledOffset, bailOnNull, adjustment);
         break;
-      case ReferenceTypeDescr::TYPE_STRING:
-        load = MLoadUnboxedString::New(alloc(), elements, scaledOffset);
+      }
+      case ReferenceTypeDescr::TYPE_STRING: {
+        load = MLoadUnboxedString::New(alloc(), elements, scaledOffset, adjustment);
         observedTypes->addType(types::Type::StringType(), alloc().lifoAlloc());
         break;
+      }
     }
 
     current->add(load);
@@ -7446,7 +7483,7 @@
     MDefinition *type = loadTypedObjectType(obj);
     MDefinition *elemTypeObj = typeObjectForElementFromArrayStructType(type);
 
-    MDefinition *indexAsByteOffset;
+    LinearSum indexAsByteOffset(alloc());
     if (!checkTypedObjectIndexInBounds(elemSize, obj, index, objPrediction, &indexAsByteOffset))
         return true;
 
@@ -7457,20 +7494,27 @@
 bool
 IonBuilder::pushDerivedTypedObject(bool *emitted,
                                    MDefinition *obj,
-                                   MDefinition *offset,
+                                   const LinearSum &baseByteOffset,
                                    TypedObjectPrediction derivedPrediction,
                                    MDefinition *derivedTypeObj)
 {
     // Find location within the owner object.
-    MDefinition *owner, *ownerOffset;
-    loadTypedObjectData(obj, offset, &owner, &ownerOffset);
+    MDefinition *owner;
+    LinearSum ownerByteOffset(alloc());
+    loadTypedObjectData(obj, &owner, &ownerByteOffset);
+
+    if (!ownerByteOffset.add(baseByteOffset, 1))
+        setForceAbort();
+
+    MDefinition *offset = ConvertLinearSum(alloc(), current, ownerByteOffset,
+                                           /* convertConstant = */ true);
 
     // Create the derived typed object.
     MInstruction *derivedTypedObj = MNewDerivedTypedObject::New(alloc(),
                                                                 derivedPrediction,
                                                                 derivedTypeObj,
                                                                 owner,
-                                                                ownerOffset);
+                                                                offset);
     current->add(derivedTypedObj);
     current->push(derivedTypedObj);
 
@@ -8160,8 +8204,12 @@
     if (!setElemTryArguments(&emitted, object, index, value) || emitted)
         return emitted;
 
-    if (script()->argumentsHasVarBinding() && object->mightBeType(MIRType_MagicOptimizedArguments))
+    if (script()->argumentsHasVarBinding() &&
+        object->mightBeType(MIRType_MagicOptimizedArguments) &&
+        info().executionMode() != ArgumentsUsageAnalysis)
+    {
         return abort("Type is not definitely lazy arguments.");
+    }
 
     if (!setElemTryCache(&emitted, object, index, value) || emitted)
         return emitted;
@@ -8233,12 +8281,12 @@
     ReferenceTypeDescr::Type elemType = elemPrediction.referenceType();
     size_t elemSize = ReferenceTypeDescr::size(elemType);
 
-    MDefinition *indexAsByteOffset;
+    LinearSum indexAsByteOffset(alloc());
     if (!checkTypedObjectIndexInBounds(elemSize, obj, index, objPrediction, &indexAsByteOffset))
         return true;
 
-    if (!storeReferenceTypedObjectValue(obj, indexAsByteOffset, elemType, value))
-        return false;
+    if (!storeReferenceTypedObjectValue(obj, indexAsByteOffset, elemType, value, nullptr))
+        return true;
 
     current->push(value);
 
@@ -8259,7 +8307,7 @@
     ScalarTypeDescr::Type elemType = elemPrediction.scalarType();
     MOZ_ASSERT(elemSize == ScalarTypeDescr::alignment(elemType));
 
-    MDefinition *indexAsByteOffset;
+    LinearSum indexAsByteOffset(alloc());
     if (!checkTypedObjectIndexInBounds(elemSize, obj, index, objPrediction, &indexAsByteOffset))
         return true;
 
@@ -8631,18 +8679,16 @@
 {
     MOZ_ASSERT(safety == SetElem_Unsafe); // Can be fixed, but there's been no reason to as of yet
 
-    MInstruction *int_index = MToInt32::New(alloc(), index);
-    current->add(int_index);
+    MInstruction *intIndex = MToInt32::New(alloc(), index);
+    current->add(intIndex);
 
     size_t elemSize = ScalarTypeDescr::alignment(arrayType);
-    MMul *byteOffset = MMul::New(alloc(), int_index, constantInt(elemSize),
-                                        MIRType_Int32, MMul::Integer);
-    current->add(byteOffset);
 
-    if (!storeScalarTypedObjectValue(object, byteOffset, arrayType, racy, value))
-        return false;
+    LinearSum byteOffset(alloc());
+    if (!byteOffset.add(intIndex, elemSize))
+        setForceAbort();
 
-    return true;
+    return storeScalarTypedObjectValue(object, byteOffset, arrayType, racy, value);
 }
 
 bool
@@ -9249,7 +9295,7 @@
         return emitted;
 
     // Try to emit loads from known binary data blocks
-    if (!getPropTryTypedObject(&emitted, obj, name, types) || emitted)
+    if (!getPropTryTypedObject(&emitted, obj, name) || emitted)
         return emitted;
 
     // Try to emit loads from definite slots.
@@ -9418,8 +9464,7 @@
 bool
 IonBuilder::getPropTryTypedObject(bool *emitted,
                                   MDefinition *obj,
-                                  PropertyName *name,
-                                  types::TemporaryTypeSet *resultTypes)
+                                  PropertyName *name)
 {
     TypedObjectPrediction fieldPrediction;
     size_t fieldOffset;
@@ -9438,22 +9483,20 @@
                                                   obj,
                                                   fieldOffset,
                                                   fieldPrediction,
-                                                  fieldIndex,
-                                                  resultTypes);
+                                                  fieldIndex);
 
       case type::Reference:
         return getPropTryReferencePropOfTypedObject(emitted,
                                                     obj,
                                                     fieldOffset,
                                                     fieldPrediction,
-                                                    resultTypes);
+                                                    name);
 
       case type::Scalar:
         return getPropTryScalarPropOfTypedObject(emitted,
                                                  obj,
                                                  fieldOffset,
-                                                 fieldPrediction,
-                                                 resultTypes);
+                                                 fieldPrediction);
     }
 
     MOZ_CRASH("Bad kind");
@@ -9462,8 +9505,7 @@
 bool
 IonBuilder::getPropTryScalarPropOfTypedObject(bool *emitted, MDefinition *typedObj,
                                               int32_t fieldOffset,
-                                              TypedObjectPrediction fieldPrediction,
-                                              types::TemporaryTypeSet *resultTypes)
+                                              TypedObjectPrediction fieldPrediction)
 {
     // Must always be loading the same scalar type
     Scalar::Type fieldType = fieldPrediction.scalarType();
@@ -9475,14 +9517,18 @@
 
     *emitted = true;
 
-    return pushScalarLoadFromTypedObject(typedObj, constantInt(fieldOffset), fieldType);
+    LinearSum byteOffset(alloc());
+    if (!byteOffset.add(fieldOffset))
+        setForceAbort();
+
+    return pushScalarLoadFromTypedObject(typedObj, byteOffset, fieldType);
 }
 
 bool
 IonBuilder::getPropTryReferencePropOfTypedObject(bool *emitted, MDefinition *typedObj,
                                                  int32_t fieldOffset,
                                                  TypedObjectPrediction fieldPrediction,
-                                                 types::TemporaryTypeSet *resultTypes)
+                                                 PropertyName *name)
 {
     ReferenceTypeDescr::Type fieldType = fieldPrediction.referenceType();
 
@@ -9492,7 +9538,11 @@
 
     *emitted = true;
 
-    return pushReferenceLoadFromTypedObject(typedObj, constantInt(fieldOffset), fieldType);
+    LinearSum byteOffset(alloc());
+    if (!byteOffset.add(fieldOffset))
+        setForceAbort();
+
+    return pushReferenceLoadFromTypedObject(typedObj, byteOffset, fieldType, name);
 }
 
 bool
@@ -9500,8 +9550,7 @@
                                                MDefinition *typedObj,
                                                int32_t fieldOffset,
                                                TypedObjectPrediction fieldPrediction,
-                                               size_t fieldIndex,
-                                               types::TemporaryTypeSet *resultTypes)
+                                               size_t fieldIndex)
 {
     // Don't optimize if the typed object might be neutered.
     types::TypeObjectKey *globalType = types::TypeObjectKey::get(&script()->global());
@@ -9514,7 +9563,11 @@
     MDefinition *type = loadTypedObjectType(typedObj);
     MDefinition *fieldTypeObj = typeObjectForFieldFromStructType(type, fieldIndex);
 
-    return pushDerivedTypedObject(emitted, typedObj, constantInt(fieldOffset),
+    LinearSum byteOffset(alloc());
+    if (!byteOffset.add(fieldOffset))
+        setForceAbort();
+
+    return pushDerivedTypedObject(emitted, typedObj, byteOffset,
                                   fieldPrediction, fieldTypeObj);
 }
 
@@ -9985,14 +10038,14 @@
     if (!setPropTryCommonSetter(&emitted, obj, name, value) || emitted)
         return emitted;
 
-    types::TemporaryTypeSet *objTypes = obj->resultTypeSet();
-    bool barrier = PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current, &obj, name, &value,
-                                                 /* canModify = */ true);
-
     // Try to emit stores to known binary data blocks
     if (!setPropTryTypedObject(&emitted, obj, name, value) || emitted)
         return emitted;
 
+    types::TemporaryTypeSet *objTypes = obj->resultTypeSet();
+    bool barrier = PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current, &obj, name, &value,
+                                                 /* canModify = */ true);
+
     if (!barrier) {
         // Try to emit store from definite slots.
         if (!setPropTryDefiniteSlot(&emitted, obj, name, value, objTypes) || emitted)
@@ -10140,7 +10193,7 @@
 
       case type::Reference:
         return setPropTryReferencePropOfTypedObject(emitted, obj, fieldOffset,
-                                                    value, fieldPrediction);
+                                                    value, fieldPrediction, name);
 
       case type::Scalar:
         return setPropTryScalarPropOfTypedObject(emitted, obj, fieldOffset,
@@ -10159,7 +10212,8 @@
                                                  MDefinition *obj,
                                                  int32_t fieldOffset,
                                                  MDefinition *value,
-                                                 TypedObjectPrediction fieldPrediction)
+                                                 TypedObjectPrediction fieldPrediction,
+                                                 PropertyName *name)
 {
     ReferenceTypeDescr::Type fieldType = fieldPrediction.referenceType();
 
@@ -10167,8 +10221,12 @@
     if (globalType->hasFlags(constraints(), types::OBJECT_FLAG_TYPED_OBJECT_NEUTERED))
         return true;
 
-    if (!storeReferenceTypedObjectValue(obj, constantInt(fieldOffset), fieldType, value))
-        return false;
+    LinearSum byteOffset(alloc());
+    if (!byteOffset.add(fieldOffset))
+        setForceAbort();
+
+    if (!storeReferenceTypedObjectValue(obj, byteOffset, fieldType, value, name))
+        return true;
 
     current->push(value);
 
@@ -10191,9 +10249,11 @@
     if (globalType->hasFlags(constraints(), types::OBJECT_FLAG_TYPED_OBJECT_NEUTERED))
         return true;
 
-    // OK! Perform the optimization.
+    LinearSum byteOffset(alloc());
+    if (!byteOffset.add(fieldOffset))
+        setForceAbort();
 
-    if (!storeScalarTypedObjectValue(obj, constantInt(fieldOffset), fieldType, false, value))
+    if (!storeScalarTypedObjectValue(obj, byteOffset, fieldType, false, value))
         return false;
 
     current->push(value);
@@ -11030,6 +11090,18 @@
     return resumeAfter(ins);
 }
 
+bool
+IonBuilder::jsop_debugger()
+{
+    MDebugger *debugger = MDebugger::New(alloc());
+    current->add(debugger);
+
+    // The |debugger;| statement will always bail out to baseline if
+    // cx->compartment()->isDebuggee(). Resume in-place and have baseline
+    // handle the details.
+    return resumeAt(debugger, pc);
+}
+
 MInstruction *
 IonBuilder::addConvertElementsToDoubles(MDefinition *elements)
 {
@@ -11156,12 +11228,10 @@
 // into dead code).
 void
 IonBuilder::loadTypedObjectData(MDefinition *typedObj,
-                                MDefinition *offset,
                                 MDefinition **owner,
-                                MDefinition **ownerOffset)
+                                LinearSum *ownerOffset)
 {
     MOZ_ASSERT(typedObj->type() == MIRType_Object);
-    MOZ_ASSERT(offset->type() == MIRType_Int32);
 
     // Shortcircuit derived type objects, meaning the intermediate
     // objects created to represent `a.b` in an expression like
@@ -11171,20 +11241,15 @@
     if (typedObj->isNewDerivedTypedObject()) {
         MNewDerivedTypedObject *ins = typedObj->toNewDerivedTypedObject();
 
-        // Note: we never need to check for neutering on this path,
-        // because when we create the derived typed object, we check
-        // for neutering there, if needed.
-
-        MAdd *offsetAdd = MAdd::NewAsmJS(alloc(), ins->offset(), offset, MIRType_Int32);
-        current->add(offsetAdd);
+        SimpleLinearSum base = ExtractLinearSum(ins->offset());
+        if (!ownerOffset->add(base))
+            setForceAbort();
 
         *owner = ins->owner();
-        *ownerOffset = offsetAdd;
         return;
     }
 
     *owner = typedObj;
-    *ownerOffset = offset;
 }
 
 // Takes as input a typed object, an offset into that typed object's
@@ -11194,29 +11259,54 @@
 // this is typically the alignment.
 void
 IonBuilder::loadTypedObjectElements(MDefinition *typedObj,
-                                    MDefinition *offset,
-                                    int32_t unit,
+                                    const LinearSum &baseByteOffset,
+                                    int32_t scale,
                                     MDefinition **ownerElements,
-                                    MDefinition **ownerScaledOffset)
+                                    MDefinition **ownerScaledOffset,
+                                    int32_t *ownerByteAdjustment)
 {
-    MDefinition *owner, *ownerOffset;
-    loadTypedObjectData(typedObj, offset, &owner, &ownerOffset);
-
-    // Load the element data.
-    MTypedObjectElements *elements = MTypedObjectElements::New(alloc(), owner);
-    current->add(elements);
-
-    // Scale to a different unit for compat with typed array MIRs.
-    if (unit != 1) {
-        MDiv *scaledOffset = MDiv::NewAsmJS(alloc(), ownerOffset, constantInt(unit), MIRType_Int32,
-                                            /* unsignd = */ false);
-        current->add(scaledOffset);
-        *ownerScaledOffset = scaledOffset;
+    MDefinition *owner;
+    LinearSum ownerByteOffset(alloc());
+    loadTypedObjectData(typedObj, &owner, &ownerByteOffset);
+
+    if (!ownerByteOffset.add(baseByteOffset))
+        setForceAbort();
+
+    types::TemporaryTypeSet *ownerTypes = owner->resultTypeSet();
+    const Class *clasp = ownerTypes ? ownerTypes->getKnownClass() : nullptr;
+    if (clasp && IsInlineTypedObjectClass(clasp)) {
+        // Perform the load directly from the owner pointer.
+        if (!ownerByteOffset.add(InlineTypedObject::offsetOfDataStart()))
+            setForceAbort();
+        *ownerElements = owner;
+    } else {
+        bool definitelyOutline = clasp && IsOutlineTypedObjectClass(clasp);
+        *ownerElements = MTypedObjectElements::New(alloc(), owner, definitelyOutline);
+        current->add((*ownerElements)->toInstruction());
+    }
+
+    // Extract the constant adjustment from the byte offset.
+    *ownerByteAdjustment = ownerByteOffset.constant();
+    int32_t negativeAdjustment;
+    if (!SafeSub(0, *ownerByteAdjustment, &negativeAdjustment))
+        setForceAbort();
+    if (!ownerByteOffset.add(negativeAdjustment))
+        setForceAbort();
+
+    // Scale the byte offset if required by the MIR node which will access the
+    // typed object. In principle we should always be able to cleanly divide
+    // the terms in this lienar sum due to alignment restrictions, but due to
+    // limitations of ExtractLinearSum when applied to the terms in derived
+    // typed objects this isn't always be possible. In these cases, fall back
+    // on an explicit division operation.
+    if (ownerByteOffset.divide(scale)) {
+        *ownerScaledOffset = ConvertLinearSum(alloc(), current, ownerByteOffset);
     } else {
-        *ownerScaledOffset = ownerOffset;
+        MDefinition *unscaledOffset = ConvertLinearSum(alloc(), current, ownerByteOffset);
+        *ownerScaledOffset = MDiv::NewAsmJS(alloc(), unscaledOffset, constantInt(scale),
+                                            MIRType_Int32, /* unsigned = */ false);
+        current->add((*ownerScaledOffset)->toInstruction());
     }
-
-    *ownerElements = elements;
 }
 
 // Looks up the offset/type-repr-set of the field `id`, given the type
@@ -11285,15 +11375,16 @@
 
 bool
 IonBuilder::storeScalarTypedObjectValue(MDefinition *typedObj,
-                                        MDefinition *byteOffset,
+                                        const LinearSum &byteOffset,
                                         ScalarTypeDescr::Type type,
                                         bool racy,
                                         MDefinition *value)
 {
     // Find location within the owner object.
     MDefinition *elements, *scaledOffset;
+    int32_t adjustment;
     size_t alignment = ScalarTypeDescr::alignment(type);
-    loadTypedObjectElements(typedObj, byteOffset, alignment, &elements, &scaledOffset);
+    loadTypedObjectElements(typedObj, byteOffset, alignment, &elements, &scaledOffset, &adjustment);
 
     // Clamp value to [0, 255] when type is Uint8Clamped
     MDefinition *toWrite = value;
@@ -11304,7 +11395,7 @@
 
     MStoreTypedArrayElement *store =
         MStoreTypedArrayElement::New(alloc(), elements, scaledOffset, toWrite,
-                                     type);
+                                     type, DoesNotRequireMemoryBarrier, adjustment);
     if (racy)
         store->setRacy();
     current->add(store);
@@ -11314,28 +11405,51 @@
 
 bool
 IonBuilder::storeReferenceTypedObjectValue(MDefinition *typedObj,
-                                           MDefinition *byteOffset,
+                                           const LinearSum &byteOffset,
                                            ReferenceTypeDescr::Type type,
-                                           MDefinition *value)
+                                           MDefinition *value,
+                                           PropertyName *name)
 {
-    if (NeedsPostBarrier(info(), value))
-        current->add(MPostWriteBarrier::New(alloc(), typedObj, value));
+    // Make sure we aren't adding new type information for writes of object and value
+    // references.
+    if (type != ReferenceTypeDescr::TYPE_STRING) {
+        MOZ_ASSERT(type == ReferenceTypeDescr::TYPE_ANY ||
+                   type == ReferenceTypeDescr::TYPE_OBJECT);
+        MIRType implicitType =
+            (type == ReferenceTypeDescr::TYPE_ANY) ? MIRType_Undefined : MIRType_Null;
+
+        if (PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current, &typedObj, name, &value,
+                                          /* canModify = */ true, implicitType))
+        {
+            return false;
+        }
+    }
 
     // Find location within the owner object.
     MDefinition *elements, *scaledOffset;
+    int32_t adjustment;
     size_t alignment = ReferenceTypeDescr::alignment(type);
-    loadTypedObjectElements(typedObj, byteOffset, alignment, &elements, &scaledOffset);
+    loadTypedObjectElements(typedObj, byteOffset, alignment, &elements, &scaledOffset, &adjustment);
 
     MInstruction *store;
     switch (type) {
       case ReferenceTypeDescr::TYPE_ANY:
-        store = MStoreElement::New(alloc(), elements, scaledOffset, value, false);
+        if (NeedsPostBarrier(info(), value))
+            current->add(MPostWriteBarrier::New(alloc(), typedObj, value));
+        store = MStoreElement::New(alloc(), elements, scaledOffset, value, false, adjustment);
+        store->toStoreElement()->setNeedsBarrier();
         break;
       case ReferenceTypeDescr::TYPE_OBJECT:
-        store = MStoreUnboxedObjectOrNull::New(alloc(), elements, scaledOffset, value);
+        // Note: We cannot necessarily tell at this point whether a post
+        // barrier is needed, because the type policy may insert ToObjectOrNull
+        // instructions later, and those may require a post barrier. Therefore,
+        // defer the insertion of post barriers to the type policy.
+        store = MStoreUnboxedObjectOrNull::New(alloc(), elements, scaledOffset, value, typedObj, adjustment);
         break;
       case ReferenceTypeDescr::TYPE_STRING:
-        store = MStoreUnboxedString::New(alloc(), elements, scaledOffset, value);
+        // Strings are not nursery allocated, so these writes do not need post
+        // barriers.
+        store = MStoreUnboxedString::New(alloc(), elements, scaledOffset, value, adjustment);
         break;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonBuilder.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonBuilder.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonBuilder.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonBuilder.h	2014-11-26 21:45:57.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/LinkedList.h"
 
 #include "jit/BytecodeAnalysis.h"
+#include "jit/IonAnalysis.h"
 #include "jit/IonOptimizationLevels.h"
 #include "jit/MIR.h"
 #include "jit/MIRGenerator.h"
@@ -420,21 +421,18 @@
                                 types::TemporaryTypeSet *types);
     bool getPropTryInlineAccess(bool *emitted, MDefinition *obj, PropertyName *name,
                                 BarrierKind barrier, types::TemporaryTypeSet *types);
-    bool getPropTryTypedObject(bool *emitted, MDefinition *obj, PropertyName *name,
-                               types::TemporaryTypeSet *resultTypes);
+    bool getPropTryTypedObject(bool *emitted, MDefinition *obj, PropertyName *name);
     bool getPropTryScalarPropOfTypedObject(bool *emitted, MDefinition *typedObj,
                                            int32_t fieldOffset,
-                                           TypedObjectPrediction fieldTypeReprs,
-                                           types::TemporaryTypeSet *resultTypes);
+                                           TypedObjectPrediction fieldTypeReprs);
     bool getPropTryReferencePropOfTypedObject(bool *emitted, MDefinition *typedObj,
                                               int32_t fieldOffset,
                                               TypedObjectPrediction fieldPrediction,
-                                              types::TemporaryTypeSet *resultTypes);
+                                              PropertyName *name);
     bool getPropTryComplexPropOfTypedObject(bool *emitted, MDefinition *typedObj,
                                             int32_t fieldOffset,
                                             TypedObjectPrediction fieldTypeReprs,
-                                            size_t fieldIndex,
-                                            types::TemporaryTypeSet *resultTypes);
+                                            size_t fieldIndex);
     bool getPropTryInnerize(bool *emitted, MDefinition *obj, PropertyName *name,
                             types::TemporaryTypeSet *types);
     bool getPropTryCache(bool *emitted, MDefinition *obj, PropertyName *name,
@@ -459,7 +457,8 @@
                                               MDefinition *obj,
                                               int32_t fieldOffset,
                                               MDefinition *value,
-                                              TypedObjectPrediction fieldPrediction);
+                                              TypedObjectPrediction fieldPrediction,
+                                              PropertyName *name);
     bool setPropTryScalarPropOfTypedObject(bool *emitted,
                                            MDefinition *obj,
                                            int32_t fieldOffset,
@@ -479,23 +478,24 @@
                              size_t *fieldIndex);
     MDefinition *loadTypedObjectType(MDefinition *value);
     void loadTypedObjectData(MDefinition *typedObj,
-                             MDefinition *offset,
                              MDefinition **owner,
-                             MDefinition **ownerOffset);
+                             LinearSum *ownerOffset);
     void loadTypedObjectElements(MDefinition *typedObj,
-                                 MDefinition *offset,
-                                 int32_t unit,
+                                 const LinearSum &byteOffset,
+                                 int32_t scale,
                                  MDefinition **ownerElements,
-                                 MDefinition **ownerScaledOffset);
+                                 MDefinition **ownerScaledOffset,
+                                 int32_t *ownerByteAdjustment);
     MDefinition *typeObjectForElementFromArrayStructType(MDefinition *typedObj);
     MDefinition *typeObjectForFieldFromStructType(MDefinition *type,
                                                   size_t fieldIndex);
     bool storeReferenceTypedObjectValue(MDefinition *typedObj,
-                                        MDefinition *byteOffset,
+                                        const LinearSum &byteOffset,
                                         ReferenceTypeDescr::Type type,
-                                        MDefinition *value);
+                                        MDefinition *value,
+                                        PropertyName *name);
     bool storeScalarTypedObjectValue(MDefinition *typedObj,
-                                     MDefinition *offset,
+                                     const LinearSum &byteOffset,
                                      ScalarTypeDescr::Type type,
                                      bool racy,
                                      MDefinition *value);
@@ -503,18 +503,19 @@
                                        MDefinition *obj,
                                        MDefinition *index,
                                        TypedObjectPrediction objTypeDescrs,
-                                       MDefinition **indexAsByteOffset);
+                                       LinearSum *indexAsByteOffset);
     bool pushDerivedTypedObject(bool *emitted,
                                 MDefinition *obj,
-                                MDefinition *offset,
+                                const LinearSum &byteOffset,
                                 TypedObjectPrediction derivedTypeDescrs,
                                 MDefinition *derivedTypeObj);
     bool pushScalarLoadFromTypedObject(MDefinition *obj,
-                                       MDefinition *offset,
+                                       const LinearSum &byteoffset,
                                        ScalarTypeDescr::Type type);
     bool pushReferenceLoadFromTypedObject(MDefinition *typedObj,
-                                          MDefinition *byteOffset,
-                                          ReferenceTypeDescr::Type type);
+                                          const LinearSum &byteOffset,
+                                          ReferenceTypeDescr::Type type,
+                                          PropertyName *name);
     MDefinition *neuterCheck(MDefinition *obj);
 
     // jsop_setelem() helpers.
@@ -679,6 +680,7 @@
     bool jsop_instanceof();
     bool jsop_getaliasedvar(ScopeCoordinate sc);
     bool jsop_setaliasedvar(ScopeCoordinate sc);
+    bool jsop_debugger();
 
     /* Inlining. */
 
@@ -792,6 +794,7 @@
                                   const Class *clasp3 = nullptr,
                                   const Class *clasp4 = nullptr);
     InliningStatus inlineIsConstructing(CallInfo &callInfo);
+    InliningStatus inlineSubstringKernel(CallInfo &callInfo);
 
     // Testing functions.
     InliningStatus inlineForceSequentialOrInParallelSection(CallInfo &callInfo);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonCaches.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonCaches.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonCaches.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonCaches.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -659,6 +659,7 @@
              TypedOrValueRegister output, Register scratchReg)
 {
     MOZ_ASSERT(holder);
+    NativeObject::slotsSizeMustNotOverflow();
     if (holder->isFixedSlot(shape->slot())) {
         Address addr(holderReg, NativeObject::getFixedSlotOffset(shape->slot()));
         masm.loadTypedOrValue(addr, output);
@@ -1166,7 +1167,7 @@
     // of turn. We don't mind doing this even when purity isn't required, because we
     // only miss out on shape hashification, which is only a temporary perf cost.
     // The limits were arbitrarily set, anyways.
-    if (!LookupPropertyPure(obj, NameToId(name), holder.address(), shape.address()))
+    if (!LookupPropertyPure(cx, obj, NameToId(name), holder.address(), shape.address()))
         return GetPropertyIC::CanAttachNone;
 
     RootedScript script(cx);
@@ -2006,6 +2007,7 @@
         }
     }
 
+    NativeObject::slotsSizeMustNotOverflow();
     if (obj->isFixedSlot(shape->slot())) {
         Address addr(object, NativeObject::getFixedSlotOffset(shape->slot()));
 
@@ -2612,6 +2614,7 @@
 
     // Set the value on the object. Since this is an add, obj->lastProperty()
     // must be the shape of the property we are adding.
+    NativeObject::slotsSizeMustNotOverflow();
     if (obj->isFixedSlot(newShape->slot())) {
         Address addr(object, NativeObject::getFixedSlotOffset(newShape->slot()));
         masm.storeConstantOrRegister(value, addr);
@@ -2780,7 +2783,7 @@
 }
 
 static SetPropertyIC::NativeSetPropCacheability
-CanAttachNativeSetProp(HandleObject obj, HandleId id, ConstantOrRegister val,
+CanAttachNativeSetProp(ThreadSafeContext *cx, HandleObject obj, HandleId id, ConstantOrRegister val,
                        bool needsTypeBarrier, MutableHandleNativeObject holder,
                        MutableHandleShape shape, bool *checkTypeset)
 {
@@ -2793,7 +2796,7 @@
 
     // If we couldn't find the property on the object itself, do a full, but
     // still pure lookup for setters.
-    if (!LookupPropertyPure(obj, id, holder.address(), shape.address()))
+    if (!LookupPropertyPure(cx, obj, id, holder.address(), shape.address()))
         return SetPropertyIC::CanAttachNone;
 
     // If the object doesn't have the property, we don't know if we can attach
@@ -2861,7 +2864,7 @@
         RootedShape shape(cx);
         RootedNativeObject holder(cx);
         bool checkTypeset;
-        canCache = CanAttachNativeSetProp(obj, id, cache.value(), cache.needsTypeBarrier(),
+        canCache = CanAttachNativeSetProp(cx, obj, id, cache.value(), cache.needsTypeBarrier(),
                                           &holder, &shape, &checkTypeset);
 
         if (!addedSetterStub && canCache == CanAttachSetSlot) {
@@ -2954,7 +2957,7 @@
                 RootedShape shape(cx);
                 RootedNativeObject holder(cx);
                 bool checkTypeset;
-                canCache = CanAttachNativeSetProp(nobj, id, cache.value(), cache.needsTypeBarrier(),
+                canCache = CanAttachNativeSetProp(cx, nobj, id, cache.value(), cache.needsTypeBarrier(),
                                                   &holder, &shape, &checkTypeset);
 
                 if (canCache == SetPropertyIC::CanAttachSetSlot) {
@@ -3182,7 +3185,7 @@
     masm.branch32(Assembler::BelowOrEqual, initLength, indexReg, &hole);
 
     // Check for holes & load the value.
-    masm.loadElementTypedOrValue(BaseIndex(object, indexReg, TimesEight),
+    masm.loadElementTypedOrValue(BaseObjectElementIndex(object, indexReg),
                                  output, true, &hole);
 
     masm.pop(object);
@@ -3426,7 +3429,7 @@
 
     // Restore original index register value, to use for indexing element.
     masm.pop(indexReg);
-    BaseIndex elemIdx(tmpReg, indexReg, ScaleFromElemWidth(sizeof(Value)));
+    BaseValueIndex elemIdx(tmpReg, indexReg);
 
     // Ensure result is not magic value, and type-check result.
     masm.branchTestMagic(Assembler::Equal, elemIdx, &failureRestoreIndex);
@@ -3600,7 +3603,7 @@
 
 static void
 StoreDenseElement(MacroAssembler &masm, ConstantOrRegister value, Register elements,
-                  BaseIndex target)
+                  BaseObjectElementIndex target)
 {
     // If the ObjectElements::CONVERT_DOUBLE_ELEMENTS flag is set, int32 values
     // have to be converted to double first. If the value is not int32, it can
@@ -3684,7 +3687,7 @@
         masm.loadPtr(Address(object, NativeObject::offsetOfElements()), elements);
 
         // Compute the location of the element.
-        BaseIndex target(elements, index, TimesEight);
+        BaseObjectElementIndex target(elements, index);
 
         // If TI cannot help us deal with HOLES by preventing indexed properties
         // on the prototype chain, we have to be very careful to check for ourselves
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonCode.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonCode.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonCode.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonCode.h	2014-11-26 21:45:57.000000000 +0000
@@ -160,19 +160,6 @@
 struct PatchableBackedgeInfo;
 struct CacheLocation;
 
-// Describes a single AsmJSModule which jumps (via an FFI exit with the given
-// index) directly into an IonScript.
-struct DependentAsmJSModuleExit
-{
-    const AsmJSModule *module;
-    size_t exitIndex;
-
-    DependentAsmJSModuleExit(const AsmJSModule *module, size_t exitIndex)
-      : module(module),
-        exitIndex(exitIndex)
-    { }
-};
-
 // An IonScript attaches Ion-generated information to a JSScript.
 struct IonScript
 {
@@ -279,7 +266,7 @@
     uint32_t backedgeEntries_;
 
     // Number of references from invalidation records.
-    uint32_t refcount_;
+    uint32_t invalidationCount_;
 
     // If this is a parallel script, the number of major GC collections it has
     // been idle, otherwise 0.
@@ -298,10 +285,6 @@
     // a LOOPENTRY pc other than osrPc_.
     uint32_t osrPcMismatchCounter_;
 
-    // If non-null, the list of AsmJSModules
-    // that contain an optimized call directly into this IonScript.
-    Vector<DependentAsmJSModuleExit> *dependentAsmJSModules;
-
     IonBuilder *pendingBuilder_;
 
   private:
@@ -352,19 +335,6 @@
     PatchableBackedge *backedgeList() {
         return (PatchableBackedge *) &bottomBuffer()[backedgeList_];
     }
-    bool addDependentAsmJSModule(JSContext *cx, DependentAsmJSModuleExit exit);
-    void removeDependentAsmJSModule(DependentAsmJSModuleExit exit) {
-        if (!dependentAsmJSModules)
-            return;
-        for (size_t i = 0; i < dependentAsmJSModules->length(); i++) {
-            if (dependentAsmJSModules->begin()[i].module == exit.module &&
-                dependentAsmJSModules->begin()[i].exitIndex == exit.exitIndex)
-            {
-                dependentAsmJSModules->erase(dependentAsmJSModules->begin() + i);
-                break;
-            }
-        }
-    }
 
   private:
     void trace(JSTracer *trc);
@@ -394,8 +364,8 @@
     static inline size_t offsetOfSkipArgCheckEntryOffset() {
         return offsetof(IonScript, skipArgCheckEntryOffset_);
     }
-    static inline size_t offsetOfRefcount() {
-        return offsetof(IonScript, refcount_);
+    static inline size_t offsetOfInvalidationCount() {
+        return offsetof(IonScript, invalidationCount_);
     }
     static inline size_t offsetOfRecompiling() {
         return offsetof(IonScript, recompiling_);
@@ -581,22 +551,22 @@
                                 MacroAssembler &masm);
 
     bool invalidated() const {
-        return refcount_ != 0;
+        return invalidationCount_ != 0;
     }
 
     // Invalidate the current compilation.
     bool invalidate(JSContext *cx, bool resetUses, const char *reason);
 
-    size_t refcount() const {
-        return refcount_;
+    size_t invalidationCount() const {
+        return invalidationCount_;
     }
-    void incref() {
-        refcount_++;
+    void incrementInvalidationCount() {
+        invalidationCount_++;
     }
-    void decref(FreeOp *fop) {
-        MOZ_ASSERT(refcount_);
-        refcount_--;
-        if (!refcount_)
+    void decrementInvalidationCount(FreeOp *fop) {
+        MOZ_ASSERT(invalidationCount_);
+        invalidationCount_--;
+        if (!invalidationCount_)
             Destroy(fop, this);
     }
     const types::RecompileInfo& recompileInfo() const {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Ion.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Ion.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Ion.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Ion.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -12,11 +12,9 @@
 #include "jscompartment.h"
 #include "jsprf.h"
 
-#include "asmjs/AsmJSModule.h"
 #include "gc/Marking.h"
 #include "jit/AliasAnalysis.h"
 #include "jit/BacktrackingAllocator.h"
-#include "jit/BaselineDebugModeOSR.h"
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineInspector.h"
 #include "jit/BaselineJIT.h"
@@ -39,6 +37,7 @@
 #include "jit/PerfSpewer.h"
 #include "jit/RangeAnalysis.h"
 #include "jit/ScalarReplacement.h"
+#include "jit/Sink.h"
 #include "jit/StupidAllocator.h"
 #include "jit/ValueNumbering.h"
 #include "vm/ForkJoin.h"
@@ -450,14 +449,17 @@
     }
 
     if (!activeParallelEntryScripts_) {
-        activeParallelEntryScripts_ = cx->new_<ScriptSet>(cx);
-        if (!activeParallelEntryScripts_ || !activeParallelEntryScripts_->init())
+        ScriptSet *scripts = js_new<ScriptSet>();
+        if (!scripts || !scripts->init()) {
+            js_delete(scripts);
+            js_ReportOutOfMemory(cx);
             return false;
+        }
+        activeParallelEntryScripts_ = scripts;
     }
 
     script->parallelIonScript()->setIsParallelEntryScript();
-    ScriptSet::AddPtr p = activeParallelEntryScripts_->lookupForAdd(script);
-    return p || activeParallelEntryScripts_->add(p, script);
+    return activeParallelEntryScripts_->put(script);
 }
 
 bool
@@ -589,8 +591,7 @@
             // off-thread helper too late (i.e., the ForkJoin finished with
             // warmup doing all the work), remove it.
             if (!script->hasParallelIonScript() ||
-                !script->parallelIonScript()->isParallelEntryScript() ||
-                trc->runtime()->gc.shouldCleanUpEverything())
+                !script->parallelIonScript()->isParallelEntryScript())
             {
                 e.removeFront();
                 continue;
@@ -602,7 +603,9 @@
             // Subtlety: We depend on the tracing of the parallel IonScript's
             // callTargetEntries to propagate the parallel age to the entire
             // call graph.
-            if (script->parallelIonScript()->shouldPreserveParallelCode(IonScript::IncreaseAge)) {
+            if (!trc->runtime()->gc.shouldCleanUpEverything() &&
+                script->parallelIonScript()->shouldPreserveParallelCode(IonScript::IncreaseAge))
+            {
                 MarkScript(trc, const_cast<PreBarrieredScript *>(&e.front()), "par-script");
                 MOZ_ASSERT(script == e.front());
             } else {
@@ -836,11 +839,10 @@
     callTargetEntries_(0),
     backedgeList_(0),
     backedgeEntries_(0),
-    refcount_(0),
+    invalidationCount_(0),
     parallelAge_(0),
     recompileInfo_(),
     osrPcMismatchCounter_(0),
-    dependentAsmJSModules(nullptr),
     pendingBuilder_(nullptr)
 {
 }
@@ -1218,32 +1220,9 @@
         getCacheFromIndex(i).destroy();
 }
 
-bool
-IonScript::addDependentAsmJSModule(JSContext *cx, DependentAsmJSModuleExit exit)
-{
-    if (!dependentAsmJSModules) {
-        dependentAsmJSModules = cx->new_<Vector<DependentAsmJSModuleExit> >(cx);
-        if (!dependentAsmJSModules)
-            return false;
-    }
-    return dependentAsmJSModules->append(exit);
-}
-
 void
 IonScript::unlinkFromRuntime(FreeOp *fop)
 {
-    // Remove any links from AsmJSModules that contain optimized FFI calls into
-    // this IonScript.
-    if (dependentAsmJSModules) {
-        for (size_t i = 0; i < dependentAsmJSModules->length(); i++) {
-            DependentAsmJSModuleExit exit = dependentAsmJSModules->begin()[i];
-            exit.module->detachIonCompilation(exit.exitIndex);
-        }
-
-        fop->delete_(dependentAsmJSModules);
-        dependentAsmJSModules = nullptr;
-    }
-
     // The writes to the executable buffer below may clobber backedge jumps, so
     // make sure that those backedges are unlinked from the runtime and not
     // reclobbered with garbage if an interrupt is requested.
@@ -1559,6 +1538,17 @@
             return false;
     }
 
+    if (mir->optimizationInfo().sinkEnabled()) {
+        AutoTraceLog log(logger, TraceLogger::EliminateDeadCode);
+        if (!Sink(mir, graph))
+            return false;
+        IonSpewPass("Sink");
+        AssertExtendedGraphCoherency(graph);
+
+        if (mir->shouldCancel("Sink"))
+            return false;
+    }
+
     // Make loops contiguous. We do this after GVN/UCE and range analysis,
     // which can remove CFG edges, exposing more blocks that can be moved.
     {
@@ -2025,7 +2015,7 @@
 CheckFrame(BaselineFrame *frame)
 {
     MOZ_ASSERT(!frame->script()->isGenerator());
-    MOZ_ASSERT(!frame->isDebuggerFrame());
+    MOZ_ASSERT(!frame->isDebuggerEvalFrame());
 
     // This check is to not overrun the stack.
     if (frame->isFunctionFrame()) {
@@ -2124,9 +2114,9 @@
     if (!script->hasBaselineScript())
         return Method_Skipped;
 
-    if (cx->compartment()->debugMode()) {
+    if (script->isDebuggee() || (osrFrame && osrFrame->isDebuggee())) {
         JitSpew(JitSpew_IonAbort, "debugging");
-        return Method_CantCompile;
+        return Method_Skipped;
     }
 
     if (!CheckScript(cx, script, bool(osrPc))) {
@@ -2674,7 +2664,7 @@
         // instructions after the call) in to capture an appropriate
         // snapshot after the call occurs.
 
-        ionScript->incref();
+        ionScript->incrementInvalidationCount();
 
         JitCode *ionCode = ionScript->method();
 
@@ -2708,8 +2698,8 @@
         CodeLocationLabel osiPatchPoint = SafepointReader::InvalidationPatchPoint(ionScript, si);
         CodeLocationLabel invalidateEpilogue(ionCode, CodeOffsetLabel(ionScript->invalidateEpilogueOffset()));
 
-        JitSpew(JitSpew_IonInvalidate, "   ! Invalidate ionScript %p (ref %u) -> patching osipoint %p",
-                ionScript, ionScript->refcount(), (void *) osiPatchPoint.raw());
+        JitSpew(JitSpew_IonInvalidate, "   ! Invalidate ionScript %p (inv count %u) -> patching osipoint %p",
+                ionScript, ionScript->invalidationCount(), (void *) osiPatchPoint.raw());
         Assembler::PatchWrite_NearCall(osiPatchPoint, invalidateEpilogue);
     }
 
@@ -2768,7 +2758,7 @@
         // Keep the ion script alive during the invalidation and flag this
         // ionScript as being invalidated.  This increment is removed by the
         // loop after the calls to InvalidateActivation.
-        co->ion()->incref();
+        co->ion()->incrementInvalidationCount();
         numInvalidations++;
     }
 
@@ -2796,7 +2786,7 @@
             continue;
 
         SetIonScript(nullptr, script, executionMode, nullptr);
-        ionScript->decref(fop);
+        ionScript->decrementInvalidationCount(fop);
         co->invalidate();
         numInvalidations--;
 
@@ -3181,88 +3171,6 @@
 }
 
 bool
-jit::RematerializeAllFrames(JSContext *cx, JSCompartment *comp)
-{
-    for (JitActivationIterator iter(comp->runtimeFromMainThread()); !iter.done(); ++iter) {
-        if (iter.activation()->compartment() == comp) {
-            for (JitFrameIterator frameIter(iter); !frameIter.done(); ++frameIter) {
-                if (!frameIter.isIonJS())
-                    continue;
-                if (!iter.activation()->asJit()->getRematerializedFrame(cx, frameIter))
-                    return false;
-            }
-        }
-    }
-    return true;
-}
-
-bool
-jit::UpdateForDebugMode(JSContext *maybecx, JSCompartment *comp,
-                     AutoDebugModeInvalidation &invalidate)
-{
-    MOZ_ASSERT(invalidate.isFor(comp));
-
-    // Schedule invalidation of all optimized JIT code since debug mode
-    // invalidates assumptions.
-    invalidate.scheduleInvalidation(comp->debugMode());
-
-    // Recompile on-stack baseline scripts if we have a cx.
-    if (maybecx) {
-        IonContext ictx(maybecx, nullptr);
-        if (!RecompileOnStackBaselineScriptsForDebugMode(maybecx, comp)) {
-            js_ReportOutOfMemory(maybecx);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-AutoDebugModeInvalidation::~AutoDebugModeInvalidation()
-{
-    MOZ_ASSERT(!!comp_ != !!zone_);
-
-    if (needInvalidation_ == NoNeed)
-        return;
-
-    Zone *zone = zone_ ? zone_ : comp_->zone();
-    JSRuntime *rt = zone->runtimeFromMainThread();
-    FreeOp *fop = rt->defaultFreeOp();
-
-    if (comp_) {
-        StopAllOffThreadCompilations(comp_);
-    } else {
-        for (CompartmentsInZoneIter comp(zone_); !comp.done(); comp.next())
-            StopAllOffThreadCompilations(comp);
-    }
-
-    // Don't discard active baseline scripts. They are recompiled for debug
-    // mode.
-    jit::MarkActiveBaselineScripts(zone);
-
-    for (JitActivationIterator iter(rt); !iter.done(); ++iter) {
-        JSCompartment *comp = iter->compartment();
-        if (comp_ == comp || zone_ == comp->zone()) {
-            IonContext ictx(CompileRuntime::get(rt));
-            JitSpew(JitSpew_IonInvalidate, "Invalidating frames for debug mode toggle");
-            InvalidateActivation(fop, iter, true);
-        }
-    }
-
-    for (gc::ZoneCellIter i(zone, gc::FINALIZE_SCRIPT); !i.done(); i.next()) {
-        JSScript *script = i.get<JSScript>();
-        if (script->compartment() == comp_ || zone_) {
-            FinishInvalidation<SequentialExecution>(fop, script);
-            FinishInvalidation<ParallelExecution>(fop, script);
-            FinishDiscardBaselineScript(fop, script);
-            script->resetWarmUpCounter();
-        } else if (script->hasBaselineScript()) {
-            script->baselineScript()->resetActive();
-        }
-    }
-}
-
-bool
 jit::JitSupportsFloatingPoint()
 {
     return js::jit::MacroAssembler::SupportsFloatingPoint();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonFrames.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonFrames.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonFrames.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonFrames.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -36,6 +36,7 @@
 #include "jsscriptinlines.h"
 #include "gc/Nursery-inl.h"
 #include "jit/JitFrameIterator-inl.h"
+#include "vm/Debugger-inl.h"
 #include "vm/Probes-inl.h"
 
 namespace js {
@@ -215,16 +216,6 @@
     return script;
 }
 
-uint8_t *
-JitFrameIterator::resumeAddressToFp() const
-{
-    // If we are settled on a patched BaselineFrame due to debug mode OSR, get
-    // the real return address via the stashed DebugModeOSRInfo.
-    if (isBaselineJS() && baselineFrame()->getDebugModeOSRInfo())
-        return baselineFrame()->debugModeOSRInfo()->resumeAddr;
-    return returnAddressToFp();
-}
-
 void
 JitFrameIterator::baselineScriptAndPc(JSScript **scriptRes, jsbytecode **pcRes) const
 {
@@ -232,7 +223,6 @@
     JSScript *script = this->script();
     if (scriptRes)
         *scriptRes = script;
-    uint8_t *retAddr = resumeAddressToFp();
 
     // If we have unwound the scope due to exception handling to a different
     // pc, the frame should behave as if it were settled on that pc.
@@ -241,6 +231,14 @@
         return;
     }
 
+    // If we are settled on a patched BaselineFrame due to debug mode OSR, get
+    // the stashed pc.
+    if (baselineFrame()->getDebugModeOSRInfo()) {
+        *pcRes = baselineFrame()->debugModeOSRInfo()->pc;
+        return;
+    }
+
+    uint8_t *retAddr = returnAddressToFp();
     if (pcRes) {
         // If the return address is into the prologue entry address or just
         // after the debug prologue, then assume start of script.
@@ -419,24 +417,37 @@
     RootedScript script(cx, frame.script());
     jsbytecode *pc = frame.pc();
 
-    bool bailedOutForDebugMode = false;
-    if (cx->compartment()->debugMode()) {
-        // If we have an exception from within Ion and the debugger is active,
-        // we do the following:
-        //
-        //   1. Bailout to baseline to reconstruct a baseline frame.
-        //   2. Resume immediately into the exception tail afterwards, and
-        //   handle the exception again with the top frame now a baseline
-        //   frame.
-        //
-        // An empty exception info denotes that we're propagating an Ion
-        // exception due to debug mode, which BailoutIonToBaseline needs to
-        // know. This is because we might not be able to fully reconstruct up
-        // to the stack depth at the snapshot, as we could've thrown in the
-        // middle of a call.
-        ExceptionBailoutInfo propagateInfo;
-        uint32_t retval = ExceptionHandlerBailout(cx, frame, rfe, propagateInfo, overrecursed);
-        bailedOutForDebugMode = retval == BAILOUT_RETURN_OK;
+    if (cx->compartment()->isDebuggee()) {
+        // We need to bail when we are the debuggee of a Debugger with a live
+        // onExceptionUnwind hook, or if a Debugger has observed this frame
+        // (e.g., for onPop).
+        bool shouldBail = Debugger::hasLiveHook(cx->global(), Debugger::OnExceptionUnwind);
+        if (!shouldBail) {
+            JitActivation *act = cx->mainThread().activation()->asJit();
+            RematerializedFrame *rematFrame =
+                act->lookupRematerializedFrame(frame.frame().fp(), frame.frameNo());
+            shouldBail = rematFrame && rematFrame->isDebuggee();
+        }
+
+        if (shouldBail) {
+            // If we have an exception from within Ion and the debugger is active,
+            // we do the following:
+            //
+            //   1. Bailout to baseline to reconstruct a baseline frame.
+            //   2. Resume immediately into the exception tail afterwards, and
+            //      handle the exception again with the top frame now a baseline
+            //      frame.
+            //
+            // An empty exception info denotes that we're propagating an Ion
+            // exception due to debug mode, which BailoutIonToBaseline needs to
+            // know. This is because we might not be able to fully reconstruct up
+            // to the stack depth at the snapshot, as we could've thrown in the
+            // middle of a call.
+            ExceptionBailoutInfo propagateInfo;
+            uint32_t retval = ExceptionHandlerBailout(cx, frame, rfe, propagateInfo, overrecursed);
+            if (retval == BAILOUT_RETURN_OK)
+                return;
+        }
     }
 
     if (!script->hasTrynotes())
@@ -466,7 +477,7 @@
             break;
 
           case JSTRY_CATCH:
-            if (cx->isExceptionPending() && !bailedOutForDebugMode) {
+            if (cx->isExceptionPending()) {
                 // Ion can compile try-catch, but bailing out to catch
                 // exceptions is slow. Reset the warm-up counter so that if we
                 // catch many exceptions we won't Ion-compile the script.
@@ -528,8 +539,11 @@
     cx->clearPendingException();
     frame.baselineFrame()->setReturnValue(UndefinedValue());
 
-    if (cx->compartment()->debugMode() && unwoundScopeToPc)
-        frame.baselineFrame()->setUnwoundScopeOverridePc(unwoundScopeToPc);
+    if (unwoundScopeToPc) {
+        if (frame.baselineFrame()->isDebuggee())
+            frame.baselineFrame()->setUnwoundScopeOverridePc(unwoundScopeToPc);
+        pc = unwoundScopeToPc;
+    }
 
     ForcedReturn(cx, frame, pc, rfe, calledDebugEpilogue);
 }
@@ -554,11 +568,10 @@
     }
 
     RootedValue exception(cx);
-    if (cx->isExceptionPending() && cx->compartment()->debugMode() &&
+    if (cx->isExceptionPending() && cx->compartment()->isDebuggee() &&
         cx->getPendingException(&exception) && !exception.isMagic(JS_GENERATOR_CLOSING))
     {
-        BaselineFrame *baselineFrame = frame.baselineFrame();
-        switch (Debugger::onExceptionUnwind(cx, baselineFrame)) {
+        switch (Debugger::onExceptionUnwind(cx, frame.baselineFrame())) {
           case JSTRAP_ERROR:
             // Uncatchable exception.
             MOZ_ASSERT(!cx->isExceptionPending());
@@ -693,7 +706,13 @@
     if (cx->runtime()->jitRuntime()->hasIonReturnOverride())
         cx->runtime()->jitRuntime()->takeIonReturnOverride();
 
-    JitFrameIterator iter(cx);
+    // 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
+    // JitFrameIterators cache the previous frame's return address when
+    // iterating, we need a variant here that is automatically updated should
+    // on-stack recompilation occur.
+    DebugModeOSRVolatileJitFrameIterator iter(cx);
     while (!iter.isEntry()) {
         bool overrecursed = false;
         if (iter.isIonJS()) {
@@ -710,7 +729,7 @@
 
                 if (rfe->kind == ResumeFromException::RESUME_BAILOUT) {
                     if (invalidated)
-                        ionScript->decref(cx->runtime()->defaultFreeOp());
+                        ionScript->decrementInvalidationCount(cx->runtime()->defaultFreeOp());
                     return;
                 }
 
@@ -743,7 +762,7 @@
             }
 
             if (invalidated)
-                ionScript->decref(cx->runtime()->defaultFreeOp());
+                ionScript->decrementInvalidationCount(cx->runtime()->defaultFreeOp());
 
         } else if (iter.isBaselineJS()) {
             // It's invalid to call DebugEpilogue twice for the same frame.
@@ -778,7 +797,7 @@
             // it doesn't try to pop the SPS frame again.
             iter.baselineFrame()->unsetPushedSPSFrame();
 
-            if (cx->compartment()->debugMode() && !calledDebugEpilogue) {
+            if (iter.baselineFrame()->isDebuggee() && !calledDebugEpilogue) {
                 // If we still need to call the DebugEpilogue, we must
                 // remember the pc we unwound the scope chain to, as it will
                 // be out of sync with the frame's actual pc.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Ion.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Ion.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Ion.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Ion.h	2014-11-26 21:45:57.000000000 +0000
@@ -201,10 +201,6 @@
 void DestroyIonScripts(FreeOp *fop, JSScript *script);
 void TraceIonScripts(JSTracer* trc, JSScript *script);
 
-bool RematerializeAllFrames(JSContext *cx, JSCompartment *comp);
-bool UpdateForDebugMode(JSContext *maybecx, JSCompartment *comp,
-                        AutoDebugModeInvalidation &invalidate);
-
 bool JitSupportsFloatingPoint();
 bool JitSupportsSimd();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonOptimizationLevels.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonOptimizationLevels.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonOptimizationLevels.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonOptimizationLevels.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -33,6 +33,7 @@
     rangeAnalysis_ = true;
     loopUnrolling_ = true;
     autoTruncate_ = true;
+    sink_ = true;
     registerAllocator_ = RegisterAllocator_LSRA;
 
     inlineMaxTotalBytecodeLength_ = 1000;
@@ -58,6 +59,7 @@
     edgeCaseAnalysis_ = false;
     eliminateRedundantChecks_ = false;
     autoTruncate_ = false;
+    sink_ = false;
     registerAllocator_ = RegisterAllocator_Backtracking;
     scalarReplacement_ = false;        // AsmJS has no objects.
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonOptimizationLevels.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonOptimizationLevels.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonOptimizationLevels.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonOptimizationLevels.h	2014-11-26 21:45:57.000000000 +0000
@@ -76,6 +76,9 @@
     // Toggles whether Truncation based on Range Analysis is used.
     bool autoTruncate_;
 
+    // Toggles whether sink is used.
+    bool sink_;
+
     // Describes which register allocator to use.
     IonRegisterAllocator registerAllocator_;
 
@@ -153,6 +156,10 @@
         return autoTruncate_ && rangeAnalysisEnabled();
     }
 
+    bool sinkEnabled() const {
+        return sink_ && !js_JitOptions.disableSink;
+    }
+
     bool eaaEnabled() const {
         return eaa_ && !js_JitOptions.disableEaa;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonTypes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonTypes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/IonTypes.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/IonTypes.h	2014-11-26 21:45:57.000000000 +0000
@@ -110,6 +110,9 @@
     // For the initial snapshot when entering a function.
     Bailout_InitialState,
 
+    // We hit a |debugger;| statement.
+    Bailout_Debugger,
+
     // END Normal bailouts
 
 
@@ -201,6 +204,8 @@
         return "Bailout_GuardThreadExclusive";
       case Bailout_InitialState:
         return "Bailout_InitialState";
+      case Bailout_Debugger:
+        return "Bailout_Debugger";
 
       // Bailouts caused by invalid assumptions.
       case Bailout_OverflowInvalidate:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitCompartment.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitCompartment.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitCompartment.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitCompartment.h	2014-11-26 21:45:57.000000000 +0000
@@ -462,7 +462,8 @@
     // Set of JSScripts invoked by ForkJoin (i.e. the entry script). These
     // scripts are marked if their respective parallel IonScripts' age is less
     // than a certain amount. See IonScript::parallelAge_.
-    typedef HashSet<PreBarrieredScript> ScriptSet;
+    typedef HashSet<PreBarrieredScript, DefaultHasher<PreBarrieredScript>, SystemAllocPolicy>
+        ScriptSet;
     ScriptSet *activeParallelEntryScripts_;
 
     JitCode *generateStringConcatStub(JSContext *cx, ExecutionMode mode);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitFrameIterator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitFrameIterator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitFrameIterator.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitFrameIterator.h	2014-11-26 21:45:57.000000000 +0000
@@ -179,10 +179,6 @@
         return returnAddressToFp_;
     }
 
-    // Returns the resume address. As above, except taking
-    // BaselineDebugModeOSRInfo into account, if present.
-    uint8_t *resumeAddressToFp() const;
-
     // Previous frame information extracted from the current frame.
     inline size_t prevFrameLocalSize() const;
     inline FrameType prevType() const;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitOptions.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitOptions.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitOptions.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitOptions.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -81,6 +81,9 @@
     // Toggles whether Range Analysis is globally disabled.
     SET_DEFAULT(disableRangeAnalysis, false);
 
+    // Toggles whether sink code motion is globally disabled.
+    SET_DEFAULT(disableSink, false);
+
     // Toggles whether Loop Unrolling is globally disabled.
     SET_DEFAULT(disableLoopUnrolling, true);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitOptions.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitOptions.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitOptions.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitOptions.h	2014-11-26 21:45:57.000000000 +0000
@@ -38,6 +38,7 @@
     bool disableInlining;
     bool disableEdgeCaseAnalysis;
     bool disableRangeAnalysis;
+    bool disableSink;
     bool disableLoopUnrolling;
     bool disableEaa;
     bool eagerCompilation;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitSpewer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitSpewer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitSpewer.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitSpewer.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -240,6 +240,7 @@
             "  alias      Alias analysis\n"
             "  gvn        Global Value Numbering\n"
             "  licm       Loop invariant code motion\n"
+            "  sink       Sink transformation\n"
             "  regalloc   Register allocation\n"
             "  inline     Inlining\n"
             "  snapshots  Snapshot information\n"
@@ -288,6 +289,8 @@
         EnableChannel(JitSpew_Unrolling);
     if (ContainsFlag(env, "licm"))
         EnableChannel(JitSpew_LICM);
+    if (ContainsFlag(env, "sink"))
+        EnableChannel(JitSpew_Sink);
     if (ContainsFlag(env, "regalloc"))
         EnableChannel(JitSpew_RegAlloc);
     if (ContainsFlag(env, "inline"))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitSpewer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitSpewer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/JitSpewer.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/JitSpewer.h	2014-11-26 21:45:57.000000000 +0000
@@ -26,6 +26,8 @@
     _(Alias)                                \
     /* Information during GVN */            \
     _(GVN)                                  \
+    /* Information during sinking */        \
+    _(Sink)                                 \
     /* Information during Range analysis */ \
     _(Range)                                \
     /* Information during loop unrolling */ \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/LIR-Common.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/LIR-Common.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/LIR-Common.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/LIR-Common.h	2014-11-26 21:45:57.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef jit_LIR_Common_h
 #define jit_LIR_Common_h
 
+#include "jit/AtomicOp.h"
 #include "jit/shared/Assembler-shared.h"
 
 // This file declares LIR instructions that are common to every platform.
@@ -365,19 +366,21 @@
 };
 
 // Binary SIMD arithmetic operation between two SIMD operands
-class LSimdBinaryArith : public LInstructionHelper<1, 2, 0>
+template<size_t Temps>
+class LSimdBinaryArith : public LInstructionHelper<1, 2, Temps>
 {
   public:
     LSimdBinaryArith() {}
 
     const LAllocation *lhs() {
-        return getOperand(0);
+        return this->getOperand(0);
     }
     const LAllocation *rhs() {
-        return getOperand(1);
+        return this->getOperand(1);
     }
+
     MSimdBinaryArith::Operation operation() const {
-        return mir_->toSimdBinaryArith()->operation();
+        return this->mir_->toSimdBinaryArith()->operation();
     }
     const char *extraName() const {
         return MSimdBinaryArith::OperationName(operation());
@@ -385,19 +388,23 @@
 };
 
 // Binary SIMD arithmetic operation between two Int32x4 operands
-class LSimdBinaryArithIx4 : public LSimdBinaryArith
+class LSimdBinaryArithIx4 : public LSimdBinaryArith<0>
 {
   public:
     LIR_HEADER(SimdBinaryArithIx4);
-    LSimdBinaryArithIx4() : LSimdBinaryArith() {}
+    LSimdBinaryArithIx4() : LSimdBinaryArith<0>() {}
 };
 
 // Binary SIMD arithmetic operation between two Float32x4 operands
-class LSimdBinaryArithFx4 : public LSimdBinaryArith
+class LSimdBinaryArithFx4 : public LSimdBinaryArith<1>
 {
   public:
     LIR_HEADER(SimdBinaryArithFx4);
-    LSimdBinaryArithFx4() : LSimdBinaryArith() {}
+    LSimdBinaryArithFx4() : LSimdBinaryArith<1>() {}
+
+    const LDefinition *temp() {
+        return getTemp(0);
+    }
 };
 
 // Unary SIMD arithmetic operation on a SIMD operand
@@ -726,6 +733,28 @@
     }
 };
 
+class LNewArrayDynamicLength : public LInstructionHelper<1, 1, 1>
+{
+  public:
+    LIR_HEADER(NewArrayDynamicLength)
+
+    explicit LNewArrayDynamicLength(const LAllocation &length, const LDefinition &temp) {
+        setOperand(0, length);
+        setTemp(0, temp);
+    }
+
+    const LAllocation *length() {
+        return getOperand(0);
+    }
+    const LDefinition *temp() {
+        return getTemp(0);
+    }
+
+    MNewArrayDynamicLength *mir() const {
+        return mir_->toNewArrayDynamicLength();
+    }
+};
+
 class LNewObject : public LInstructionHelper<1, 0, 1>
 {
   public:
@@ -3428,6 +3457,44 @@
     }
 };
 
+class LSubstr : public LInstructionHelper<1, 3, 3>
+{
+  public:
+    LIR_HEADER(Substr)
+
+    LSubstr(const LAllocation &string, const LAllocation &begin, const LAllocation &length,
+            const LDefinition &temp, const LDefinition &temp2, const LDefinition &temp3)
+    {
+        setOperand(0, string);
+        setOperand(1, begin);
+        setOperand(2, length);
+        setTemp(0, temp);
+        setTemp(1, temp2);
+        setTemp(2, temp3);
+    }
+    const LAllocation *string() {
+        return getOperand(0);
+    }
+    const LAllocation *begin() {
+        return getOperand(1);
+    }
+    const LAllocation *length() {
+        return getOperand(2);
+    }
+    const LDefinition *temp() {
+        return getTemp(0);
+    }
+    const LDefinition *temp2() {
+        return getTemp(1);
+    }
+    const LDefinition *temp3() {
+        return getTemp(2);
+    }
+    const MStringSplit *mir() const {
+        return mir_->toStringSplit();
+    }
+};
+
 // Convert a 32-bit integer to a double.
 class LInt32ToDouble : public LInstructionHelper<1, 1, 0>
 {
@@ -4508,8 +4575,9 @@
         setOperand(1, index);
     }
 
-    const MLoadUnboxedString *mir() const {
-        return mir_->toLoadUnboxedString();
+    MDefinition *mir() {
+        MOZ_ASSERT(mir_->isLoadUnboxedObjectOrNull() || mir_->isLoadUnboxedString());
+        return mir_;
     }
     const LAllocation *elements() {
         return getOperand(0);
@@ -5064,14 +5132,13 @@
     }
 };
 
-class LClampDToUint8 : public LInstructionHelper<1, 1, 1>
+class LClampDToUint8 : public LInstructionHelper<1, 1, 0>
 {
   public:
     LIR_HEADER(ClampDToUint8)
 
-    LClampDToUint8(const LAllocation &in, const LDefinition &temp) {
+    explicit LClampDToUint8(const LAllocation &in) {
         setOperand(0, in);
-        setTemp(0, temp);
     }
 };
 
@@ -6530,6 +6597,60 @@
     }
 };
 
+class LAsmJSCompareExchangeHeap : public LInstructionHelper<1, 3, 0>
+{
+  public:
+    LIR_HEADER(AsmJSCompareExchangeHeap);
+
+    LAsmJSCompareExchangeHeap(const LAllocation &ptr, const LAllocation &oldValue,
+                              const LAllocation &newValue)
+    {
+        setOperand(0, ptr);
+        setOperand(1, oldValue);
+        setOperand(2, newValue);
+    }
+
+    const LAllocation *ptr() {
+        return getOperand(0);
+    }
+    const LAllocation *oldValue() {
+        return getOperand(1);
+    }
+    const LAllocation *newValue() {
+        return getOperand(2);
+    }
+
+    MAsmJSCompareExchangeHeap *mir() const {
+        return mir_->toAsmJSCompareExchangeHeap();
+    }
+};
+
+class LAsmJSAtomicBinopHeap : public LInstructionHelper<1, 2, 1>
+{
+  public:
+    LIR_HEADER(AsmJSAtomicBinopHeap);
+    LAsmJSAtomicBinopHeap(const LAllocation &ptr, const LAllocation &value,
+                          const LDefinition &temp)
+    {
+        setOperand(0, ptr);
+        setOperand(1, value);
+        setTemp(0, temp);
+    }
+    const LAllocation *ptr() {
+        return getOperand(0);
+    }
+    const LAllocation *value() {
+        return getOperand(1);
+    }
+    const LDefinition *temp() {
+        return getTemp(0);
+    }
+
+    MAsmJSAtomicBinopHeap *mir() const {
+        return mir_->toAsmJSAtomicBinopHeap();
+    }
+};
+
 class LAsmJSLoadGlobalVar : public LInstructionHelper<1, 0, 0>
 {
   public:
@@ -6814,19 +6935,19 @@
 class LMemoryBarrier : public LInstructionHelper<0, 0, 0>
 {
   private:
-    const int type_;
+    const MemoryBarrierBits type_;
 
   public:
     LIR_HEADER(MemoryBarrier)
 
     // The parameter 'type' is a bitwise 'or' of the barrier types needed,
     // see AtomicOp.h.
-    explicit LMemoryBarrier(int type) : type_(type)
+    explicit LMemoryBarrier(MemoryBarrierBits type) : type_(type)
     {
-        MOZ_ASSERT((type_ & ~MembarAllbits) == 0);
+        MOZ_ASSERT((type_ & ~MembarAllbits) == MembarNobits);
     }
 
-    int type() const {
+    MemoryBarrierBits type() const {
         return type_;
     }
 
@@ -6835,6 +6956,17 @@
     }
 };
 
+class LDebugger : public LCallInstructionHelper<0, 0, 2>
+{
+  public:
+    LIR_HEADER(Debugger)
+
+    LDebugger(const LDefinition &temp1, const LDefinition &temp2) {
+        setTemp(0, temp1);
+        setTemp(1, temp2);
+    }
+};
+
 } // namespace jit
 } // namespace js
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/LOpcodes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/LOpcodes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/LOpcodes.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/LOpcodes.h	2014-11-26 21:45:57.000000000 +0000
@@ -46,6 +46,7 @@
     _(Goto)                         \
     _(NewArray)                     \
     _(NewArrayCopyOnWrite)          \
+    _(NewArrayDynamicLength)        \
     _(ArraySplice)                  \
     _(NewObject)                    \
     _(NewTypedObject)               \
@@ -187,6 +188,7 @@
     _(RegExpTest)                   \
     _(RegExpReplace)                \
     _(StringReplace)                \
+    _(Substr)                       \
     _(Lambda)                       \
     _(LambdaArrow)                  \
     _(LambdaForSingleton)           \
@@ -331,6 +333,8 @@
     _(AsmJSVoidReturn)              \
     _(AsmJSPassStackArg)            \
     _(AsmJSCall)                    \
+    _(AsmJSCompareExchangeHeap)     \
+    _(AsmJSAtomicBinopHeap)         \
     _(InterruptCheckPar)            \
     _(RecompileCheck)               \
     _(MemoryBarrier)                \
@@ -339,7 +343,8 @@
     _(AssertRangeF)                 \
     _(AssertRangeV)                 \
     _(LexicalCheck)                 \
-    _(ThrowUninitializedLexical)
+    _(ThrowUninitializedLexical)    \
+    _(Debugger)
 
 #if defined(JS_CODEGEN_X86)
 # include "jit/x86/LOpcodes-x86.h"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Lowering.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Lowering.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Lowering.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Lowering.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -169,6 +169,16 @@
 }
 
 bool
+LIRGenerator::visitNewArrayDynamicLength(MNewArrayDynamicLength *ins)
+{
+    MDefinition *length = ins->length();
+    MOZ_ASSERT(length->type() == MIRType_Int32);
+
+    LNewArrayDynamicLength *lir = new(alloc()) LNewArrayDynamicLength(useRegister(length), temp());
+    return define(lir, ins) && assignSafepoint(lir, ins);
+}
+
+bool
 LIRGenerator::visitNewObject(MNewObject *ins)
 {
     LNewObject *lir = new(alloc()) LNewObject(temp());
@@ -2456,7 +2466,8 @@
 {
 #ifdef JSGC_GENERATIONAL
     switch (ins->value()->type()) {
-      case MIRType_Object: {
+      case MIRType_Object:
+      case MIRType_ObjectOrNull: {
         LDefinition tmp = needTempForPostBarrier() ? temp() : LDefinition::BogusTemp();
         LPostWriteBarrierO *lir =
             new(alloc()) LPostWriteBarrierO(useRegisterOrConstant(ins->object()),
@@ -2665,7 +2676,7 @@
 bool
 LIRGenerator::visitLoadElement(MLoadElement *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
 
     switch (ins->type()) {
@@ -2711,9 +2722,19 @@
 bool
 LIRGenerator::visitLoadUnboxedObjectOrNull(MLoadUnboxedObjectOrNull *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
+
+    if (ins->type() == MIRType_Object) {
+        LLoadUnboxedPointerT *lir = new(alloc()) LLoadUnboxedPointerT(useRegister(ins->elements()),
+                                                                      useRegisterOrConstant(ins->index()));
+        if (ins->bailOnNull() && !assignSnapshot(lir, Bailout_TypeBarrierO))
+            return false;
+        return define(lir, ins);
+    }
+
     MOZ_ASSERT(ins->type() == MIRType_Value);
+    MOZ_ASSERT(!ins->bailOnNull());
 
     LLoadUnboxedPointerV *lir = new(alloc()) LLoadUnboxedPointerV(useRegister(ins->elements()),
                                                                   useRegisterOrConstant(ins->index()));
@@ -2723,7 +2744,7 @@
 bool
 LIRGenerator::visitLoadUnboxedString(MLoadUnboxedString *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
     MOZ_ASSERT(ins->type() == MIRType_String);
 
@@ -2735,7 +2756,7 @@
 bool
 LIRGenerator::visitStoreElement(MStoreElement *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
 
     const LUse elements = useRegister(ins->elements());
@@ -2795,7 +2816,7 @@
 bool
 LIRGenerator::visitStoreUnboxedObjectOrNull(MStoreUnboxedObjectOrNull *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
     MOZ_ASSERT(ins->value()->type() == MIRType_Object ||
                ins->value()->type() == MIRType_Null ||
@@ -2812,7 +2833,7 @@
 bool
 LIRGenerator::visitStoreUnboxedString(MStoreUnboxedString *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
     MOZ_ASSERT(ins->value()->type() == MIRType_String);
 
@@ -2919,7 +2940,7 @@
 bool
 LIRGenerator::visitLoadTypedArrayElement(MLoadTypedArrayElement *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
 
     const LUse elements = useRegister(ins->elements());
@@ -2963,7 +2984,7 @@
         return defineReuseInput(new(alloc()) LClampIToUint8(useRegisterAtStart(in)), ins, 0);
 
       case MIRType_Double:
-        return define(new(alloc()) LClampDToUint8(useRegisterAtStart(in), tempCopy(in, 0)), ins);
+        return define(new(alloc()) LClampDToUint8(useRegisterAtStart(in)), ins);
 
       case MIRType_Value:
       {
@@ -3012,7 +3033,7 @@
 bool
 LIRGenerator::visitStoreTypedArrayElement(MStoreTypedArrayElement *ins)
 {
-    MOZ_ASSERT(ins->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(ins->elements(), ins->offsetAdjustment()));
     MOZ_ASSERT(ins->index()->type() == MIRType_Int32);
 
     if (ins->isFloatArray()) {
@@ -4036,20 +4057,23 @@
 
     MDefinition *lhs = ins->lhs();
     MDefinition *rhs = ins->rhs();
+
     if (ins->isCommutative())
         ReorderCommutative(&lhs, &rhs, ins);
 
-    if (ins->type() == MIRType_Int32x4) {
-        LSimdBinaryArithIx4 *add = new(alloc()) LSimdBinaryArithIx4();
-        return lowerForFPU(add, ins, lhs, rhs);
-    }
+    if (ins->type() == MIRType_Int32x4)
+        return lowerForFPU(new(alloc()) LSimdBinaryArithIx4(), ins, lhs, rhs);
 
-    if (ins->type() == MIRType_Float32x4) {
-        LSimdBinaryArithFx4 *add = new(alloc()) LSimdBinaryArithFx4();
-        return lowerForFPU(add, ins, lhs, rhs);
-    }
+    MOZ_ASSERT(ins->type() == MIRType_Float32x4, "unknown simd type on binary arith operation");
+
+    LSimdBinaryArithFx4 *lir = new(alloc()) LSimdBinaryArithFx4();
+
+    bool needsTemp = ins->operation() == MSimdBinaryArith::Max ||
+                     ins->operation() == MSimdBinaryArith::MinNum ||
+                     ins->operation() == MSimdBinaryArith::MaxNum;
+    lir->setTemp(0, needsTemp ? temp(LDefinition::FLOAT32X4) : LDefinition::BogusTemp());
 
-    MOZ_CRASH("Unknown SIMD kind when adding values");
+    return lowerForFPU(lir, ins, lhs, rhs);
 }
 
 bool
@@ -4098,6 +4122,13 @@
     return add(lir, ins) && assignSafepoint(lir, ins);
 }
 
+bool
+LIRGenerator::visitDebugger(MDebugger *ins)
+{
+    LDebugger *lir = new(alloc()) LDebugger(tempFixed(CallTempReg0), tempFixed(CallTempReg1));
+    return assignSnapshot(lir, Bailout_Debugger) && add(lir, ins);
+}
+
 static void
 SpewResumePoint(MBasicBlock *block, MInstruction *ins, MResumePoint *resumePoint)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Lowering.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Lowering.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Lowering.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Lowering.h	2014-11-26 21:45:57.000000000 +0000
@@ -72,6 +72,7 @@
     bool visitTableSwitch(MTableSwitch *tableswitch);
     bool visitNewArray(MNewArray *ins);
     bool visitNewArrayCopyOnWrite(MNewArrayCopyOnWrite *ins);
+    bool visitNewArrayDynamicLength(MNewArrayDynamicLength *ins);
     bool visitNewObject(MNewObject *ins);
     bool visitNewTypedObject(MNewTypedObject *ins);
     bool visitNewDeclEnvObject(MNewDeclEnvObject *ins);
@@ -295,6 +296,7 @@
     bool visitUnknownValue(MUnknownValue *ins);
     bool visitLexicalCheck(MLexicalCheck *ins);
     bool visitThrowUninitializedLexical(MThrowUninitializedLexical *ins);
+    bool visitDebugger(MDebugger *ins);
 };
 
 } // namespace jit
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MCallOptimize.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MCallOptimize.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MCallOptimize.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MCallOptimize.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -197,6 +197,8 @@
         return inlineToString(callInfo);
     if (native == intrinsic_IsConstructing)
         return inlineIsConstructing(callInfo);
+    if (native == intrinsic_SubstringKernel)
+        return inlineSubstringKernel(callInfo);
 
     // TypedObject intrinsics.
     if (native == intrinsic_ObjectIsTypedObject)
@@ -355,13 +357,30 @@
         }
     }
 
+    types::TemporaryTypeSet::DoubleConversion conversion =
+        getInlineReturnTypeSet()->convertDoubleElements(constraints());
+    if (conversion == types::TemporaryTypeSet::AlwaysConvertToDoubles)
+        templateObject->setShouldConvertDoubleElements();
+    else
+        templateObject->clearShouldConvertDoubleElements();
+
     // A single integer argument denotes initial length.
     if (callInfo.argc() == 1) {
         if (callInfo.getArg(0)->type() != MIRType_Int32)
             return InliningStatus_NotInlined;
+
         MDefinition *arg = callInfo.getArg(0);
-        if (!arg->isConstant())
-            return InliningStatus_NotInlined;
+        if (!arg->isConstant()) {
+            callInfo.setImplicitlyUsedUnchecked();
+            ArrayObject *templateArray = &templateObject->as<ArrayObject>();
+            MNewArrayDynamicLength *ins =
+                MNewArrayDynamicLength::New(alloc(), constraints(), templateArray,
+                                            templateArray->type()->initialHeap(constraints()),
+                                            arg);
+            current->add(ins);
+            current->push(ins);
+            return InliningStatus_Inlined;
+        }
 
         // Negative lengths generate a RangeError, unhandled by the inline path.
         initLength = arg->toConstant()->value().toInt32();
@@ -383,13 +402,6 @@
 
     callInfo.setImplicitlyUsedUnchecked();
 
-    types::TemporaryTypeSet::DoubleConversion conversion =
-        getInlineReturnTypeSet()->convertDoubleElements(constraints());
-    if (conversion == types::TemporaryTypeSet::AlwaysConvertToDoubles)
-        templateObject->setShouldConvertDoubleElements();
-    else
-        templateObject->clearShouldConvertDoubleElements();
-
     MConstant *templateConst = MConstant::NewConstraintlessObject(alloc(), templateObject);
     current->add(templateConst);
 
@@ -1233,7 +1245,7 @@
     current->add(last);
 
     for (unsigned i = 2; i < cases.length(); i++) {
-        MMinMax *ins = MMinMax::New(alloc(), last, cases[2], returnType, max);
+        MMinMax *ins = MMinMax::New(alloc(), last, cases[i], returnType, max);
         current->add(ins);
         last = ins;
     }
@@ -1545,6 +1557,38 @@
     return InliningStatus_Inlined;
 }
 
+IonBuilder::InliningStatus
+IonBuilder::inlineSubstringKernel(CallInfo &callInfo)
+{
+    MOZ_ASSERT(callInfo.argc() == 3);
+    MOZ_ASSERT(!callInfo.constructing());
+
+    // Return: String.
+    if (getInlineReturnType() != MIRType_String)
+        return InliningStatus_NotInlined;
+
+    // Arg 0: String.
+    if (callInfo.getArg(0)->type() != MIRType_String)
+        return InliningStatus_NotInlined;
+
+    // Arg 1: Int.
+    if (callInfo.getArg(1)->type() != MIRType_Int32)
+        return InliningStatus_NotInlined;
+
+    // Arg 2: Int.
+    if (callInfo.getArg(2)->type() != MIRType_Int32)
+        return InliningStatus_NotInlined;
+
+    callInfo.setImplicitlyUsedUnchecked();
+
+    MSubstr *substr = MSubstr::New(alloc(), callInfo.getArg(0), callInfo.getArg(1),
+                                            callInfo.getArg(2));
+    current->add(substr);
+    current->push(substr);
+
+    return InliningStatus_Inlined;
+}
+
 IonBuilder::InliningStatus
 IonBuilder::inlineUnsafePutElements(CallInfo &callInfo)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/CodeGenerator-mips.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/CodeGenerator-mips.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/CodeGenerator-mips.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/CodeGenerator-mips.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -40,7 +40,9 @@
 bool
 CodeGeneratorMIPS::generatePrologue()
 {
+    MOZ_ASSERT(masm.framePushed() == 0);
     MOZ_ASSERT(!gen->compilingAsmJS());
+
     // Note that this automatically sets MacroAssembler::framePushed().
     masm.reserveStack(frameSize());
     masm.checkStackAlignment();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/Lowering-mips.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/Lowering-mips.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/Lowering-mips.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/Lowering-mips.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -57,6 +57,12 @@
     return useRegisterOrNonDoubleConstant(mir);
 }
 
+LDefinition
+LIRGeneratorMIPS::tempByteOpRegister()
+{
+    return temp();
+}
+
 bool
 LIRGeneratorMIPS::lowerConstantDouble(double d, MInstruction *mir)
 {
@@ -201,8 +207,9 @@
                   LDefinition(LDefinition::TypeFrom(mir->type()), LDefinition::REGISTER));
 }
 
+template<size_t Temps>
 bool
-LIRGeneratorMIPS::lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir,
+LIRGeneratorMIPS::lowerForFPU(LInstructionHelper<1, 2, Temps> *ins, MDefinition *mir,
                               MDefinition *lhs, MDefinition *rhs)
 {
     ins->setOperand(0, useRegister(lhs));
@@ -211,6 +218,11 @@
                   LDefinition(LDefinition::TypeFrom(mir->type()), LDefinition::REGISTER));
 }
 
+template bool LIRGeneratorMIPS::lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir,
+                                            MDefinition *lhs, MDefinition *rhs);
+template bool LIRGeneratorMIPS::lowerForFPU(LInstructionHelper<1, 2, 1> *ins, MDefinition *mir,
+                                            MDefinition *lhs, MDefinition *rhs);
+
 bool
 LIRGeneratorMIPS::lowerForBitAndAndBranch(LBitAndAndBranch *baab, MInstruction *mir,
                                           MDefinition *lhs, MDefinition *rhs)
@@ -520,6 +532,18 @@
 }
 
 bool
+LIRGeneratorMIPS::visitSubstr(MSubstr *ins)
+{
+    LSubstr *lir = new (alloc()) LSubstr(useRegister(ins->string()),
+                                         useRegister(ins->begin()),
+                                         useRegister(ins->length()),
+                                         temp(),
+                                         temp(),
+                                         tempByteOpRegister());
+    return define(lir, ins) && assignSafepoint(lir, ins);
+}
+
+bool
 LIRGeneratorMIPS::visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins)
 {
     MOZ_CRASH("NYI");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/Lowering-mips.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/Lowering-mips.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/Lowering-mips.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/Lowering-mips.h	2014-11-26 21:45:57.000000000 +0000
@@ -30,6 +30,7 @@
     // stores and loads; on MIPS all registers are okay.
     LAllocation useByteOpRegister(MDefinition *mir);
     LAllocation useByteOpRegisterOrNonDoubleConstant(MDefinition *mir);
+    LDefinition tempByteOpRegister();
 
     inline LDefinition tempToUnbox() {
         return LDefinition::BogusTemp();
@@ -56,7 +57,8 @@
 
     bool lowerForFPU(LInstructionHelper<1, 1, 0> *ins, MDefinition *mir,
                      MDefinition *src);
-    bool lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir,
+    template<size_t Temps>
+    bool lowerForFPU(LInstructionHelper<1, 2, Temps> *ins, MDefinition *mir,
                      MDefinition *lhs, MDefinition *rhs);
 
     bool lowerForCompIx4(LSimdBinaryCompIx4 *ins, MSimdBinaryComp *mir,
@@ -108,6 +110,7 @@
     bool visitSimdValueX4(MSimdValueX4 *ins);
     bool visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement *ins);
     bool visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop *ins);
+    bool visitSubstr(MSubstr *ins);
 };
 
 typedef LIRGeneratorMIPS LIRGeneratorSpecific;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -1549,11 +1549,11 @@
     }
 }
 void
-MacroAssemblerMIPSCompat::callIonFromAsmJS(Register callee)
+MacroAssemblerMIPSCompat::callJitFromAsmJS(Register callee)
 {
     ma_callIonNoPush(callee);
 
-    // The Ion ABI has the callee pop the return address off the stack.
+    // The JIT ABI has the callee pop the return address off the stack.
     // The asm.js caller assumes that the call leaves sp unchanged, so bump
     // the stack.
     subPtr(Imm32(sizeof(void*)), StackPointer);
@@ -2346,6 +2346,13 @@
     ma_b(SecondScratchReg, ImmTag(JSVAL_TAG_NULL), label, cond);
 }
 
+void
+MacroAssemblerMIPSCompat::branchTestNull(Condition cond, const Address &address, Label *label) {
+    MOZ_ASSERT(cond == Equal || cond == NotEqual);
+    extractTag(address, SecondScratchReg);
+    ma_b(SecondScratchReg, ImmTag(JSVAL_TAG_NULL), label, cond);
+}
+
 void
 MacroAssemblerMIPSCompat::testNullSet(Condition cond, const ValueOperand &value, Register dest)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/MacroAssembler-mips.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/MacroAssembler-mips.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/mips/MacroAssembler-mips.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/mips/MacroAssembler-mips.h	2014-11-26 21:45:57.000000000 +0000
@@ -430,6 +430,10 @@
         append(desc, currentOffset(), framePushed_);
     }
 
+    void callAndPushReturnAddress(Label *label) {
+        ma_callIonHalfPush(label);
+    }
+
     void branch(JitCode *c) {
         BufferOffset bo = m_buffer.nextOffset();
         addPendingJump(bo, ImmPtr(c->raw()), Relocation::JITCODE);
@@ -527,6 +531,10 @@
         as_nop();
     }
 
+    void jump(JitCode *code) {
+        branch(code);
+    }
+
     void neg32(Register reg) {
         ma_negu(reg, reg);
     }
@@ -668,6 +676,7 @@
     void branchTestNull(Condition cond, const ValueOperand &value, Label *label);
     void branchTestNull(Condition cond, Register tag, Label *label);
     void branchTestNull(Condition cond, const BaseIndex &src, Label *label);
+    void branchTestNull(Condition cond, const Address &address, Label *label);
     void testNullSet(Condition cond, const ValueOperand &value, Register dest);
 
     void branchTestObject(Condition cond, const ValueOperand &value, Label *label);
@@ -1131,7 +1140,7 @@
     // Makes an Ion call using the only two methods that it is sane for
     // indep code to make a call
     void callIon(Register callee);
-    void callIonFromAsmJS(Register callee);
+    void callJitFromAsmJS(Register callee);
 
     void reserveStack(uint32_t amount);
     void freeStack(uint32_t amount);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIR.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIR.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIR.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIR.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -4275,9 +4275,29 @@
 }
 
 static bool
+PropertyTypeIncludes(TempAllocator &alloc, types::HeapTypeSetKey property,
+                     MDefinition *value, MIRType implicitType)
+{
+    // If implicitType is not MIRType_None, it is an additional type which the
+    // property implicitly includes. In this case, make a new type set which
+    // explicitly contains the type.
+    types::TypeSet *types = property.maybeTypes();
+    if (implicitType != MIRType_None) {
+        types::Type newType = types::Type::PrimitiveType(ValueTypeFromMIRType(implicitType));
+        if (types)
+            types = types->clone(alloc.lifoAlloc());
+        else
+            types = alloc.lifoAlloc()->new_<types::TemporaryTypeSet>();
+        types->addType(newType, alloc.lifoAlloc());
+    }
+
+    return TypeSetIncludes(types, value->type(), value->resultTypeSet());
+}
+
+static bool
 TryAddTypeBarrierForWrite(TempAllocator &alloc, types::CompilerConstraintList *constraints,
                           MBasicBlock *current, types::TemporaryTypeSet *objTypes,
-                          PropertyName *name, MDefinition **pvalue)
+                          PropertyName *name, MDefinition **pvalue, MIRType implicitType)
 {
     // Return whether pvalue was modified to include a type barrier ensuring
     // that writing the value to objTypes/id will not require changing type
@@ -4301,7 +4321,7 @@
         if (!property.maybeTypes() || property.couldBeConstant(constraints))
             return false;
 
-        if (TypeSetIncludes(property.maybeTypes(), (*pvalue)->type(), (*pvalue)->resultTypeSet()))
+        if (PropertyTypeIncludes(alloc, property, *pvalue, implicitType))
             return false;
 
         // This freeze is not required for correctness, but ensures that we
@@ -4384,18 +4404,20 @@
 
 // Whether value can be written to property without changing type information.
 bool
-jit::CanWriteProperty(types::CompilerConstraintList *constraints,
-                      types::HeapTypeSetKey property, MDefinition *value)
+jit::CanWriteProperty(TempAllocator &alloc, types::CompilerConstraintList *constraints,
+                      types::HeapTypeSetKey property, MDefinition *value,
+                      MIRType implicitType /* = MIRType_None */)
 {
     if (property.couldBeConstant(constraints))
         return false;
-    return TypeSetIncludes(property.maybeTypes(), value->type(), value->resultTypeSet());
+    return PropertyTypeIncludes(alloc, property, value, implicitType);
 }
 
 bool
 jit::PropertyWriteNeedsTypeBarrier(TempAllocator &alloc, types::CompilerConstraintList *constraints,
                                    MBasicBlock *current, MDefinition **pobj,
-                                   PropertyName *name, MDefinition **pvalue, bool canModify)
+                                   PropertyName *name, MDefinition **pvalue,
+                                   bool canModify, MIRType implicitType)
 {
     // If any value being written is not reflected in the type information for
     // objects which obj could represent, a type barrier is needed when writing
@@ -4425,14 +4447,15 @@
 
         jsid id = name ? NameToId(name) : JSID_VOID;
         types::HeapTypeSetKey property = object->property(id);
-        if (!CanWriteProperty(constraints, property, *pvalue)) {
+        if (!CanWriteProperty(alloc, constraints, property, *pvalue, implicitType)) {
             // Either pobj or pvalue needs to be modified to filter out the
             // types which the value could have but are not in the property,
             // or a VM call is required. A VM call is always required if pobj
             // and pvalue cannot be modified.
             if (!canModify)
                 return true;
-            success = TryAddTypeBarrierForWrite(alloc, constraints, current, types, name, pvalue);
+            success = TryAddTypeBarrierForWrite(alloc, constraints, current, types, name, pvalue,
+                                                implicitType);
             break;
         }
     }
@@ -4457,7 +4480,7 @@
 
         jsid id = name ? NameToId(name) : JSID_VOID;
         types::HeapTypeSetKey property = object->property(id);
-        if (CanWriteProperty(constraints, property, *pvalue))
+        if (CanWriteProperty(alloc, constraints, property, *pvalue, implicitType))
             continue;
 
         if ((property.maybeTypes() && !property.maybeTypes()->empty()) || excluded)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIRGenerator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIRGenerator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIRGenerator.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIRGenerator.h	2014-11-26 21:45:57.000000000 +0000
@@ -175,6 +175,7 @@
     uint32_t nslots_;
     MIRGraph *graph_;
     AbortReason abortReason_;
+    bool shouldForceAbort_; // Force AbortReason_Disable
     TypeObjectVector abortedNewScriptPropertiesTypes_;
     bool error_;
     mozilla::Atomic<bool, mozilla::Relaxed> *pauseBuild_;
@@ -195,6 +196,12 @@
     bool instrumentedProfilingIsCached_;
 
     void addAbortedNewScriptPropertiesType(types::TypeObject *type);
+    void setForceAbort() {
+        shouldForceAbort_ = true;
+    }
+    bool shouldForceAbort() {
+        return shouldForceAbort_;
+    }
 
 #if defined(JS_ION_PERF)
     AsmJSPerfSpewer asmJSPerfSpewer_;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIRGraph.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIRGraph.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIRGraph.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIRGraph.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -26,6 +26,7 @@
     alloc_(alloc),
     graph_(graph),
     abortReason_(AbortReason_NoAbort),
+    shouldForceAbort_(false),
     abortedNewScriptPropertiesTypes_(*alloc_),
     error_(false),
     pauseBuild_(nullptr),
@@ -794,6 +795,27 @@
     ins->setTrackedSite(at->trackedSite());
 }
 
+MInstruction *
+MBasicBlock::safeInsertTop(MDefinition *ins, IgnoreTop ignore)
+{
+    // Beta nodes and interrupt checks are required to be located at the
+    // beginnings of basic blocks, so we must insert new instructions after any
+    // such instructions.
+    MInstructionIterator insertIter = !ins || ins->isPhi()
+                                    ? begin()
+                                    : begin(ins->toInstruction());
+    while (insertIter->isBeta() ||
+           insertIter->isInterruptCheck() ||
+           insertIter->isInterruptCheckPar() ||
+           insertIter->isConstant() ||
+           (!(ignore & IgnoreRecover) && insertIter->isRecoveredOnBailout()))
+    {
+        insertIter++;
+    }
+
+    return *insertIter;
+}
+
 void
 MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = RefType_Default */)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIRGraph.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIRGraph.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIRGraph.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIRGraph.h	2014-11-26 21:45:57.000000000 +0000
@@ -286,6 +286,15 @@
     // Move an instruction. Movement may cross block boundaries.
     void moveBefore(MInstruction *at, MInstruction *ins);
 
+    enum IgnoreTop {
+        IgnoreNone = 0,
+        IgnoreRecover = 1 << 0
+    };
+
+    // Locate the top of the |block|, where it is safe to insert a new
+    // instruction.
+    MInstruction *safeInsertTop(MDefinition *ins = nullptr, IgnoreTop ignore = IgnoreNone);
+
     // Removes an instruction with the intention to discard it.
     void discard(MInstruction *ins);
     void discardLastIns();
@@ -651,7 +660,7 @@
 
     const BytecodeSite *trackedSite_;
 
-#if defined (JS_ION_PERF)
+#if defined(JS_ION_PERF) || defined(DEBUG)
     unsigned lineno_;
     unsigned columnIndex_;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIR.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIR.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MIR.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MIR.h	2014-11-26 21:45:57.000000000 +0000
@@ -255,6 +255,9 @@
     virtual void dump() const = 0;
 
   protected:
+    // Need visibility on getUseFor to avoid O(n^2) complexity.
+    friend void AssertBasicGraphCoherency(MIRGraph &graph);
+
     // Gets the MUse corresponding to given operand.
     virtual MUse *getUseFor(size_t index) = 0;
     virtual const MUse *getUseFor(size_t index) const = 0;
@@ -1854,17 +1857,21 @@
         Mul,
         Div,
         Min,
-        Max
+        Max,
+        MinNum,
+        MaxNum
     };
 
     static const char* OperationName(Operation op) {
         switch (op) {
-          case Add: return "Add";
-          case Sub: return "Sub";
-          case Mul: return "Mul";
-          case Div: return "Div";
-          case Min: return "Min";
-          case Max: return "Max";
+          case Add:    return "Add";
+          case Sub:    return "Sub";
+          case Mul:    return "Mul";
+          case Div:    return "Div";
+          case Min:    return "Min";
+          case Max:    return "Max";
+          case MinNum: return "MinNum";
+          case MaxNum: return "MaxNum";
         }
         MOZ_CRASH("unexpected operation");
     }
@@ -2646,6 +2653,50 @@
     }
 };
 
+class MNewArrayDynamicLength
+  : public MUnaryInstruction,
+    public IntPolicy<0>::Data
+{
+    AlwaysTenured<ArrayObject*> templateObject_;
+    gc::InitialHeap initialHeap_;
+
+    MNewArrayDynamicLength(types::CompilerConstraintList *constraints, ArrayObject *templateObject,
+                           gc::InitialHeap initialHeap, MDefinition *length)
+      : MUnaryInstruction(length),
+        templateObject_(templateObject),
+        initialHeap_(initialHeap)
+    {
+        setGuard(); // Need to throw if length is negative.
+        setResultType(MIRType_Object);
+        if (!templateObject->hasSingletonType())
+            setResultTypeSet(MakeSingletonTypeSet(constraints, templateObject));
+    }
+
+  public:
+    INSTRUCTION_HEADER(NewArrayDynamicLength)
+
+    static MNewArrayDynamicLength *New(TempAllocator &alloc, types::CompilerConstraintList *constraints,
+                                       ArrayObject *templateObject, gc::InitialHeap initialHeap,
+                                       MDefinition *length)
+    {
+        return new(alloc) MNewArrayDynamicLength(constraints, templateObject, initialHeap, length);
+    }
+
+    MDefinition *length() const {
+        return getOperand(0);
+    }
+    ArrayObject *templateObject() const {
+        return templateObject_;
+    }
+    gc::InitialHeap initialHeap() const {
+        return initialHeap_;
+    }
+
+    virtual AliasSet getAliasSet() const {
+        return AliasSet::None();
+    }
+};
+
 class MNewObject : public MUnaryInstruction
 {
     gc::InitialHeap initialHeap_;
@@ -3707,6 +3758,11 @@
     bool isFloat32Comparison() const {
         return compareType() == Compare_Float32;
     }
+    bool isNumericComparison() const {
+        return isInt32Comparison() ||
+               isDoubleComparison() ||
+               isFloat32Comparison();
+    }
     void setCompareType(CompareType type) {
         compareType_ = type;
     }
@@ -5319,6 +5375,11 @@
         return true;
     }
 
+    bool writeRecoverData(CompactBufferWriter &writer) const;
+    bool canRecoverOnBailout() const {
+        return true;
+    }
+
     ALLOW_CLONE(MHypot)
 };
 
@@ -6893,6 +6954,54 @@
     AliasSet getAliasSet() const {
         return AliasSet::None();
     }
+
+    bool writeRecoverData(CompactBufferWriter &writer) const;
+    bool canRecoverOnBailout() const {
+        if (pattern()->isRegExp())
+            return !pattern()->toRegExp()->source()->global();
+        return false;
+    }
+};
+
+class MSubstr
+  : public MTernaryInstruction,
+    public Mix3Policy<StringPolicy<0>, IntPolicy<1>, IntPolicy<2>>
+{
+  private:
+
+    MSubstr(MDefinition *string, MDefinition *begin, MDefinition *length)
+      : MTernaryInstruction(string, begin, length)
+    {
+        setResultType(MIRType_String);
+    }
+
+  public:
+    INSTRUCTION_HEADER(Substr);
+
+    static MSubstr *New(TempAllocator &alloc, MDefinition *string, MDefinition *begin,
+                        MDefinition *length)
+    {
+        return new(alloc) MSubstr(string, begin, length);
+    }
+
+    MDefinition *string() {
+        return getOperand(0);
+    }
+
+    MDefinition *begin() {
+        return getOperand(1);
+    }
+
+    MDefinition *length() {
+        return getOperand(2);
+    }
+
+    bool congruentTo(const MDefinition *ins) const {
+        return congruentIfOperandsEqual(ins);
+    }
+    AliasSet getAliasSet() const {
+        return AliasSet::None();
+    }
 };
 
 struct LambdaFunctionInfo
@@ -7438,9 +7547,12 @@
   : public MUnaryInstruction,
     public SingleObjectPolicy::Data
 {
+    bool definitelyOutline_;
+
   private:
-    explicit MTypedObjectElements(MDefinition *object)
-      : MUnaryInstruction(object)
+    explicit MTypedObjectElements(MDefinition *object, bool definitelyOutline)
+      : MUnaryInstruction(object),
+        definitelyOutline_(definitelyOutline)
     {
         setResultType(MIRType_Elements);
         setMovable();
@@ -7449,15 +7561,24 @@
   public:
     INSTRUCTION_HEADER(TypedObjectElements)
 
-    static MTypedObjectElements *New(TempAllocator &alloc, MDefinition *object) {
-        return new(alloc) MTypedObjectElements(object);
+    static MTypedObjectElements *New(TempAllocator &alloc, MDefinition *object,
+                                     bool definitelyOutline) {
+        return new(alloc) MTypedObjectElements(object, definitelyOutline);
     }
 
     MDefinition *object() const {
         return getOperand(0);
     }
+    bool definitelyOutline() const {
+        return definitelyOutline_;
+    }
     bool congruentTo(const MDefinition *ins) const {
-        return congruentIfOperandsEqual(ins);
+        if (!ins->isTypedObjectElements())
+            return false;
+        const MTypedObjectElements *other = ins->toTypedObjectElements();
+        if (other->definitelyOutline() != definitelyOutline())
+            return false;
+        return congruentIfOperandsEqual(other);
     }
     AliasSet getAliasSet() const {
         return AliasSet::Load(AliasSet::ObjectFields);
@@ -7668,6 +7789,17 @@
     void collectRangeInfoPreTrunc();
 };
 
+// Instructions which access an object's elements can either do so on a
+// definition accessing that elements pointer, or on the object itself, if its
+// elements are inline. In the latter case there must be an offset associated
+// with the access.
+static inline bool
+IsValidElementsType(MDefinition *elements, int32_t offsetAdjustment)
+{
+    return elements->type() == MIRType_Elements ||
+           (elements->type() == MIRType_Object && offsetAdjustment != 0);
+}
+
 // Load a value from a dense array's element vector and does a hole check if the
 // array is not known to be packed.
 class MLoadElement
@@ -7676,11 +7808,14 @@
 {
     bool needsHoleCheck_;
     bool loadDoubles_;
+    int32_t offsetAdjustment_;
 
-    MLoadElement(MDefinition *elements, MDefinition *index, bool needsHoleCheck, bool loadDoubles)
+    MLoadElement(MDefinition *elements, MDefinition *index,
+                 bool needsHoleCheck, bool loadDoubles, int32_t offsetAdjustment)
       : MBinaryInstruction(elements, index),
         needsHoleCheck_(needsHoleCheck),
-        loadDoubles_(loadDoubles)
+        loadDoubles_(loadDoubles),
+        offsetAdjustment_(offsetAdjustment)
     {
         if (needsHoleCheck) {
             // Uses may be optimized away based on this instruction's result
@@ -7690,7 +7825,7 @@
         }
         setResultType(MIRType_Value);
         setMovable();
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
     }
 
@@ -7698,8 +7833,8 @@
     INSTRUCTION_HEADER(LoadElement)
 
     static MLoadElement *New(TempAllocator &alloc, MDefinition *elements, MDefinition *index,
-                             bool needsHoleCheck, bool loadDoubles) {
-        return new(alloc) MLoadElement(elements, index, needsHoleCheck, loadDoubles);
+                             bool needsHoleCheck, bool loadDoubles, int32_t offsetAdjustment = 0) {
+        return new(alloc) MLoadElement(elements, index, needsHoleCheck, loadDoubles, offsetAdjustment);
     }
 
     MDefinition *elements() const {
@@ -7714,6 +7849,9 @@
     bool loadDoubles() const {
         return loadDoubles_;
     }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     bool fallible() const {
         return needsHoleCheck();
     }
@@ -7725,6 +7863,8 @@
             return false;
         if (loadDoubles() != other->loadDoubles())
             return false;
+        if (offsetAdjustment() != other->offsetAdjustment())
+            return false;
         return congruentIfOperandsEqual(other);
     }
     MDefinition *foldsTo(TempAllocator &alloc);
@@ -7798,14 +7938,27 @@
     ALLOW_CLONE(MLoadElementHole)
 };
 
-class MLoadUnboxedObjectOrNull : public MBinaryInstruction
+class MLoadUnboxedObjectOrNull
+  : public MBinaryInstruction,
+    public SingleObjectPolicy::Data
 {
-    MLoadUnboxedObjectOrNull(MDefinition *elements, MDefinition *index)
-      : MBinaryInstruction(elements, index)
+    bool bailOnNull_;
+    int32_t offsetAdjustment_;
+
+    MLoadUnboxedObjectOrNull(MDefinition *elements, MDefinition *index,
+                             bool bailOnNull, int32_t offsetAdjustment)
+      : MBinaryInstruction(elements, index),
+        bailOnNull_(bailOnNull),
+        offsetAdjustment_(offsetAdjustment)
     {
-        setResultType(MIRType_Value);
+        if (bailOnNull) {
+            // Don't eliminate loads which bail out on a null pointer, for the
+            // same reason as MLoadElement.
+            setGuard();
+        }
+        setResultType(bailOnNull ? MIRType_Object : MIRType_Value);
         setMovable();
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
     }
 
@@ -7813,8 +7966,9 @@
     INSTRUCTION_HEADER(LoadUnboxedObjectOrNull)
 
     static MLoadUnboxedObjectOrNull *New(TempAllocator &alloc,
-                                         MDefinition *elements, MDefinition *index) {
-        return new(alloc) MLoadUnboxedObjectOrNull(elements, index);
+                                         MDefinition *elements, MDefinition *index,
+                                         bool bailOnNull, int32_t offsetAdjustment) {
+        return new(alloc) MLoadUnboxedObjectOrNull(elements, index, bailOnNull, offsetAdjustment);
     }
 
     MDefinition *elements() const {
@@ -7823,8 +7977,24 @@
     MDefinition *index() const {
         return getOperand(1);
     }
+    bool bailOnNull() const {
+        return bailOnNull_;
+    }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
+    bool fallible() const {
+        return bailOnNull();
+    }
     bool congruentTo(const MDefinition *ins) const {
-        return congruentIfOperandsEqual(ins);
+        if (!ins->isLoadUnboxedObjectOrNull())
+            return false;
+        const MLoadUnboxedObjectOrNull *other = ins->toLoadUnboxedObjectOrNull();
+        if (bailOnNull() != other->bailOnNull())
+            return false;
+        if (offsetAdjustment() != other->offsetAdjustment())
+            return false;
+        return congruentIfOperandsEqual(other);
     }
     AliasSet getAliasSet() const {
         return AliasSet::Load(AliasSet::Element);
@@ -7833,14 +8003,19 @@
     ALLOW_CLONE(MLoadUnboxedObjectOrNull)
 };
 
-class MLoadUnboxedString : public MBinaryInstruction
+class MLoadUnboxedString
+  : public MBinaryInstruction,
+    public SingleObjectPolicy::Data
 {
-    MLoadUnboxedString(MDefinition *elements, MDefinition *index)
-      : MBinaryInstruction(elements, index)
+    int32_t offsetAdjustment_;
+
+    MLoadUnboxedString(MDefinition *elements, MDefinition *index, int32_t offsetAdjustment)
+      : MBinaryInstruction(elements, index),
+        offsetAdjustment_(offsetAdjustment)
     {
         setResultType(MIRType_String);
         setMovable();
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
     }
 
@@ -7848,8 +8023,8 @@
     INSTRUCTION_HEADER(LoadUnboxedString)
 
     static MLoadUnboxedString *New(TempAllocator &alloc,
-                                   MDefinition *elements, MDefinition *index) {
-        return new(alloc) MLoadUnboxedString(elements, index);
+                                   MDefinition *elements, MDefinition *index, int32_t offsetAdjustment) {
+        return new(alloc) MLoadUnboxedString(elements, index, offsetAdjustment);
     }
 
     MDefinition *elements() const {
@@ -7858,7 +8033,15 @@
     MDefinition *index() const {
         return getOperand(1);
     }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     bool congruentTo(const MDefinition *ins) const {
+        if (!ins->isLoadUnboxedString())
+            return false;
+        const MLoadUnboxedString *other = ins->toLoadUnboxedString();
+        if (offsetAdjustment() != other->offsetAdjustment())
+            return false;
         return congruentIfOperandsEqual(ins);
     }
     AliasSet getAliasSet() const {
@@ -7910,13 +8093,16 @@
     public MixPolicy<SingleObjectPolicy, NoFloatPolicy<2> >::Data
 {
     bool needsHoleCheck_;
+    int32_t offsetAdjustment_;
 
-    MStoreElement(MDefinition *elements, MDefinition *index, MDefinition *value, bool needsHoleCheck) {
+    MStoreElement(MDefinition *elements, MDefinition *index, MDefinition *value,
+                  bool needsHoleCheck, int32_t offsetAdjustment) {
         initOperand(0, elements);
         initOperand(1, index);
         initOperand(2, value);
         needsHoleCheck_ = needsHoleCheck;
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        offsetAdjustment_ = offsetAdjustment;
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
     }
 
@@ -7924,8 +8110,9 @@
     INSTRUCTION_HEADER(StoreElement)
 
     static MStoreElement *New(TempAllocator &alloc, MDefinition *elements, MDefinition *index,
-                              MDefinition *value, bool needsHoleCheck) {
-        return new(alloc) MStoreElement(elements, index, value, needsHoleCheck);
+                              MDefinition *value,
+                              bool needsHoleCheck, int32_t offsetAdjustment = 0) {
+        return new(alloc) MStoreElement(elements, index, value, needsHoleCheck, offsetAdjustment);
     }
     MDefinition *elements() const {
         return getOperand(0);
@@ -7942,6 +8129,9 @@
     bool needsHoleCheck() const {
         return needsHoleCheck_;
     }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     bool fallible() const {
         return needsHoleCheck();
     }
@@ -7997,17 +8187,25 @@
     ALLOW_CLONE(MStoreElementHole)
 };
 
-// Store an unboxed object or null pointer to a vector.
+// Store an unboxed object or null pointer to a v\ector.
 class MStoreUnboxedObjectOrNull
-  : public MAryInstruction<3>,
-    public ConvertToObjectOrNullPolicy<2>::Data
+  : public MAryInstruction<4>,
+    public StoreUnboxedObjectOrNullPolicy::Data
 {
-    MStoreUnboxedObjectOrNull(MDefinition *elements, MDefinition *index, MDefinition *value) {
+    int32_t offsetAdjustment_;
+
+    MStoreUnboxedObjectOrNull(MDefinition *elements, MDefinition *index,
+                              MDefinition *value, MDefinition *typedObj,
+                              int32_t offsetAdjustment)
+      : offsetAdjustment_(offsetAdjustment)
+    {
         initOperand(0, elements);
         initOperand(1, index);
         initOperand(2, value);
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        initOperand(3, typedObj);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
+        MOZ_ASSERT(typedObj->type() == MIRType_Object);
     }
 
   public:
@@ -8015,8 +8213,10 @@
 
     static MStoreUnboxedObjectOrNull *New(TempAllocator &alloc,
                                           MDefinition *elements, MDefinition *index,
-                                          MDefinition *value) {
-        return new(alloc) MStoreUnboxedObjectOrNull(elements, index, value);
+                                          MDefinition *value, MDefinition *typedObj,
+                                          int32_t offsetAdjustment) {
+        return new(alloc) MStoreUnboxedObjectOrNull(elements, index, value, typedObj,
+                                                    offsetAdjustment);
     }
     MDefinition *elements() const {
         return getOperand(0);
@@ -8027,24 +8227,40 @@
     MDefinition *value() const {
         return getOperand(2);
     }
+    MDefinition *typedObj() const {
+        return getOperand(3);
+    }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     AliasSet getAliasSet() const {
         // Use AliasSet::Element for reference typed object fields.
         return AliasSet::Store(AliasSet::Element);
     }
 
+    // For StoreUnboxedObjectOrNullPolicy.
+    void setValue(MDefinition *def) {
+        replaceOperand(2, def);
+    }
+
     ALLOW_CLONE(MStoreUnboxedObjectOrNull)
 };
 
 // Store an unboxed object or null pointer to a vector.
 class MStoreUnboxedString
   : public MAryInstruction<3>,
-    public ConvertToStringPolicy<2>::Data
+    public MixPolicy<SingleObjectPolicy, ConvertToStringPolicy<2> >::Data
 {
-    MStoreUnboxedString(MDefinition *elements, MDefinition *index, MDefinition *value) {
+    int32_t offsetAdjustment_;
+
+    MStoreUnboxedString(MDefinition *elements, MDefinition *index, MDefinition *value,
+                        int32_t offsetAdjustment)
+      : offsetAdjustment_(offsetAdjustment)
+    {
         initOperand(0, elements);
         initOperand(1, index);
         initOperand(2, value);
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
     }
 
@@ -8053,8 +8269,8 @@
 
     static MStoreUnboxedString *New(TempAllocator &alloc,
                                     MDefinition *elements, MDefinition *index,
-                                    MDefinition *value) {
-        return new(alloc) MStoreUnboxedString(elements, index, value);
+                                    MDefinition *value, int32_t offsetAdjustment) {
+        return new(alloc) MStoreUnboxedString(elements, index, value, offsetAdjustment);
     }
     MDefinition *elements() const {
         return getOperand(0);
@@ -8065,6 +8281,9 @@
     MDefinition *value() const {
         return getOperand(2);
     }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     AliasSet getAliasSet() const {
         // Use AliasSet::Element for reference typed object fields.
         return AliasSet::Store(AliasSet::Element);
@@ -8239,23 +8458,27 @@
 // Also see comments above MMemoryBarrier, below.
 
 class MLoadTypedArrayElement
-  : public MBinaryInstruction
+  : public MBinaryInstruction,
+    public SingleObjectPolicy::Data
 {
     Scalar::Type arrayType_;
     bool requiresBarrier_;
+    int32_t offsetAdjustment_;
 
     MLoadTypedArrayElement(MDefinition *elements, MDefinition *index,
-                           Scalar::Type arrayType, MemoryBarrierRequirement requiresBarrier)
+                           Scalar::Type arrayType, MemoryBarrierRequirement requiresBarrier,
+                           int32_t offsetAdjustment)
       : MBinaryInstruction(elements, index),
         arrayType_(arrayType),
-        requiresBarrier_(requiresBarrier == DoesRequireMemoryBarrier)
+        requiresBarrier_(requiresBarrier == DoesRequireMemoryBarrier),
+        offsetAdjustment_(offsetAdjustment)
     {
         setResultType(MIRType_Value);
         if (requiresBarrier_)
             setGuard();         // Not removable or movable
         else
             setMovable();
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
         MOZ_ASSERT(arrayType >= 0 && arrayType < Scalar::TypeMax);
     }
@@ -8265,9 +8488,11 @@
 
     static MLoadTypedArrayElement *New(TempAllocator &alloc, MDefinition *elements, MDefinition *index,
                                        Scalar::Type arrayType,
-                                       MemoryBarrierRequirement requiresBarrier=DoesNotRequireMemoryBarrier)
+                                       MemoryBarrierRequirement requiresBarrier=DoesNotRequireMemoryBarrier,
+                                       int32_t offsetAdjustment = 0)
     {
-        return new(alloc) MLoadTypedArrayElement(elements, index, arrayType, requiresBarrier);
+        return new(alloc) MLoadTypedArrayElement(elements, index, arrayType,
+                                                 requiresBarrier, offsetAdjustment);
     }
 
     Scalar::Type arrayType() const {
@@ -8286,6 +8511,9 @@
     MDefinition *index() const {
         return getOperand(1);
     }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     AliasSet getAliasSet() const {
         // When a barrier is needed make the instruction effectful by
         // giving it a "store" effect.
@@ -8302,6 +8530,8 @@
         const MLoadTypedArrayElement *other = ins->toLoadTypedArrayElement();
         if (arrayType_ != other->arrayType_)
             return false;
+        if (offsetAdjustment() != other->offsetAdjustment())
+            return false;
         return congruentIfOperandsEqual(other);
     }
 
@@ -8432,22 +8662,25 @@
 {
     Scalar::Type arrayType_;
     bool requiresBarrier_;
+    int32_t offsetAdjustment_;
 
     // See note in MStoreElementCommon.
     bool racy_;
 
     MStoreTypedArrayElement(MDefinition *elements, MDefinition *index, MDefinition *value,
-                            Scalar::Type arrayType, MemoryBarrierRequirement requiresBarrier)
+                            Scalar::Type arrayType, MemoryBarrierRequirement requiresBarrier,
+                            int32_t offsetAdjustment)
       : MTernaryInstruction(elements, index, value),
         arrayType_(arrayType),
         requiresBarrier_(requiresBarrier == DoesRequireMemoryBarrier),
+        offsetAdjustment_(offsetAdjustment),
         racy_(false)
     {
         if (requiresBarrier_)
             setGuard();         // Not removable or movable
         else
             setMovable();
-        MOZ_ASSERT(elements->type() == MIRType_Elements);
+        MOZ_ASSERT(IsValidElementsType(elements, offsetAdjustment));
         MOZ_ASSERT(index->type() == MIRType_Int32);
         MOZ_ASSERT(arrayType >= 0 && arrayType < Scalar::TypeMax);
     }
@@ -8457,10 +8690,11 @@
 
     static MStoreTypedArrayElement *New(TempAllocator &alloc, MDefinition *elements, MDefinition *index,
                                         MDefinition *value, Scalar::Type arrayType,
-                                        MemoryBarrierRequirement requiresBarrier = DoesNotRequireMemoryBarrier)
+                                        MemoryBarrierRequirement requiresBarrier = DoesNotRequireMemoryBarrier,
+                                        int32_t offsetAdjustment = 0)
     {
         return new(alloc) MStoreTypedArrayElement(elements, index, value, arrayType,
-                                                  requiresBarrier);
+                                                  requiresBarrier, offsetAdjustment);
     }
 
     Scalar::Type arrayType() const {
@@ -8490,6 +8724,9 @@
     bool requiresMemoryBarrier() const {
         return requiresBarrier_;
     }
+    int32_t offsetAdjustment() const {
+        return offsetAdjustment_;
+    }
     bool racy() const {
         return racy_;
     }
@@ -11704,22 +11941,22 @@
   : public MNullaryInstruction
 {
     // The type is a combination of the memory barrier types in AtomicOp.h.
-    const int type_;
+    const MemoryBarrierBits type_;
 
-    explicit MMemoryBarrier(int type)
+    explicit MMemoryBarrier(MemoryBarrierBits type)
       : type_(type)
     {
-        MOZ_ASSERT((type_ & ~MembarAllbits) == 0);
+        MOZ_ASSERT((type_ & ~MembarAllbits) == MembarNobits);
         setGuard();             // Not removable
     }
 
   public:
     INSTRUCTION_HEADER(MemoryBarrier);
 
-    static MMemoryBarrier *New(TempAllocator &alloc, int type=MembarFull) {
+    static MMemoryBarrier *New(TempAllocator &alloc, MemoryBarrierBits type = MembarFull) {
         return new(alloc) MMemoryBarrier(type);
     }
-    int type() const {
+    MemoryBarrierBits type() const {
         return type_;
     }
 
@@ -11838,6 +12075,16 @@
     }
 };
 
+class MDebugger : public MNullaryInstruction
+{
+  public:
+    INSTRUCTION_HEADER(Debugger);
+
+    static MDebugger *New(TempAllocator &alloc) {
+        return new(alloc) MDebugger();
+    }
+};
+
 class MAsmJSNeg : public MUnaryInstruction
 {
     MAsmJSNeg(MDefinition *op, MIRType type)
@@ -11856,43 +12103,80 @@
 
 class MAsmJSHeapAccess
 {
-    Scalar::Type viewType_;
+  protected:
+    typedef AsmJSHeapAccess::ViewType ViewType;
+
+  private:
+    ViewType viewType_;
     bool needsBoundsCheck_;
 
   public:
-    MAsmJSHeapAccess(Scalar::Type vt, bool needsBoundsCheck)
+    MAsmJSHeapAccess(ViewType vt, bool needsBoundsCheck)
       : viewType_(vt), needsBoundsCheck_(needsBoundsCheck)
     {}
 
-    Scalar::Type viewType() const { return viewType_; }
+    ViewType viewType() const { return viewType_; }
     bool needsBoundsCheck() const { return needsBoundsCheck_; }
     void removeBoundsCheck() { needsBoundsCheck_ = false; }
 };
 
 class MAsmJSLoadHeap : public MUnaryInstruction, public MAsmJSHeapAccess
 {
-    MAsmJSLoadHeap(Scalar::Type vt, MDefinition *ptr, bool needsBoundsCheck)
-      : MUnaryInstruction(ptr), MAsmJSHeapAccess(vt, needsBoundsCheck)
+    MemoryBarrierBits barrierBefore_;
+    MemoryBarrierBits barrierAfter_;
+
+    MAsmJSLoadHeap(ViewType vt, MDefinition *ptr, bool needsBoundsCheck,
+                   MemoryBarrierBits before, MemoryBarrierBits after)
+      : MUnaryInstruction(ptr),
+        MAsmJSHeapAccess(vt, needsBoundsCheck),
+        barrierBefore_(before),
+        barrierAfter_(after)
     {
-        setMovable();
-        if (vt == Scalar::Float32)
-            setResultType(MIRType_Float32);
-        else if (vt == Scalar::Float64)
-            setResultType(MIRType_Double);
+        if (before|after)
+            setGuard();         // Not removable
         else
+            setMovable();
+
+        switch (vt) {
+          case AsmJSHeapAccess::Int8:
+          case AsmJSHeapAccess::Uint8:
+          case AsmJSHeapAccess::Int16:
+          case AsmJSHeapAccess::Uint16:
+          case AsmJSHeapAccess::Int32:
+          case AsmJSHeapAccess::Uint32:
             setResultType(MIRType_Int32);
+            break;
+          case AsmJSHeapAccess::Float32:
+            setResultType(MIRType_Float32);
+            break;
+          case AsmJSHeapAccess::Float64:
+            setResultType(MIRType_Double);
+            break;
+          case AsmJSHeapAccess::Float32x4:
+            setResultType(MIRType_Float32x4);
+            break;
+          case AsmJSHeapAccess::Int32x4:
+            setResultType(MIRType_Int32x4);
+            break;
+          case AsmJSHeapAccess::Uint8Clamped:
+            MOZ_CRASH("unexpected uint8clamped load heap in asm.js");
+        }
     }
 
   public:
     INSTRUCTION_HEADER(AsmJSLoadHeap);
 
-    static MAsmJSLoadHeap *New(TempAllocator &alloc, Scalar::Type vt,
-                               MDefinition *ptr, bool needsBoundsCheck)
+    static MAsmJSLoadHeap *New(TempAllocator &alloc, ViewType vt,
+                               MDefinition *ptr, bool needsBoundsCheck,
+                               MemoryBarrierBits barrierBefore = MembarNobits,
+                               MemoryBarrierBits barrierAfter = MembarNobits)
     {
-        return new(alloc) MAsmJSLoadHeap(vt, ptr, needsBoundsCheck);
+        return new(alloc) MAsmJSLoadHeap(vt, ptr, needsBoundsCheck, barrierBefore, barrierAfter);
     }
 
     MDefinition *ptr() const { return getOperand(0); }
+    MemoryBarrierBits barrierBefore() const { return barrierBefore_; }
+    MemoryBarrierBits barrierAfter() const { return barrierAfter_; }
 
     bool congruentTo(const MDefinition *ins) const;
     AliasSet getAliasSet() const {
@@ -11903,19 +12187,96 @@
 
 class MAsmJSStoreHeap : public MBinaryInstruction, public MAsmJSHeapAccess
 {
-    MAsmJSStoreHeap(Scalar::Type vt, MDefinition *ptr, MDefinition *v, bool needsBoundsCheck)
-      : MBinaryInstruction(ptr, v) , MAsmJSHeapAccess(vt, needsBoundsCheck)
-    {}
+    MemoryBarrierBits barrierBefore_;
+    MemoryBarrierBits barrierAfter_;
+
+    MAsmJSStoreHeap(ViewType vt, MDefinition *ptr, MDefinition *v, bool needsBoundsCheck,
+                    MemoryBarrierBits before, MemoryBarrierBits after)
+      : MBinaryInstruction(ptr, v),
+        MAsmJSHeapAccess(vt, needsBoundsCheck),
+        barrierBefore_(before),
+        barrierAfter_(after)
+    {
+        if (before|after)
+            setGuard();         // Not removable
+    }
 
   public:
     INSTRUCTION_HEADER(AsmJSStoreHeap);
 
-    static MAsmJSStoreHeap *New(TempAllocator &alloc, Scalar::Type vt,
-                                MDefinition *ptr, MDefinition *v, bool needsBoundsCheck)
+    static MAsmJSStoreHeap *New(TempAllocator &alloc, ViewType vt,
+                                MDefinition *ptr, MDefinition *v, bool needsBoundsCheck,
+                                MemoryBarrierBits barrierBefore = MembarNobits,
+                                MemoryBarrierBits barrierAfter = MembarNobits)
+    {
+        return new(alloc) MAsmJSStoreHeap(vt, ptr, v, needsBoundsCheck,
+                                          barrierBefore, barrierAfter);
+    }
+
+    MDefinition *ptr() const { return getOperand(0); }
+    MDefinition *value() const { return getOperand(1); }
+    MemoryBarrierBits barrierBefore() const { return barrierBefore_; }
+    MemoryBarrierBits barrierAfter() const { return barrierAfter_; }
+
+    AliasSet getAliasSet() const {
+        return AliasSet::Store(AliasSet::AsmJSHeap);
+    }
+};
+
+class MAsmJSCompareExchangeHeap : public MTernaryInstruction, public MAsmJSHeapAccess
+{
+    MAsmJSCompareExchangeHeap(ViewType vt, MDefinition *ptr, MDefinition *oldv, MDefinition *newv,
+                              bool needsBoundsCheck)
+        : MTernaryInstruction(ptr, oldv, newv),
+          MAsmJSHeapAccess(vt, needsBoundsCheck)
+    {
+        setGuard();             // Not removable
+        setResultType(MIRType_Int32);
+    }
+
+  public:
+    INSTRUCTION_HEADER(AsmJSCompareExchangeHeap);
+
+    static MAsmJSCompareExchangeHeap *New(TempAllocator &alloc, ViewType vt,
+                                          MDefinition *ptr, MDefinition *oldv,
+                                          MDefinition *newv, bool needsBoundsCheck)
+    {
+        return new(alloc) MAsmJSCompareExchangeHeap(vt, ptr, oldv, newv, needsBoundsCheck);
+    }
+
+    MDefinition *ptr() const { return getOperand(0); }
+    MDefinition *oldValue() const { return getOperand(1); }
+    MDefinition *newValue() const { return getOperand(2); }
+
+    AliasSet getAliasSet() const {
+        return AliasSet::Store(AliasSet::AsmJSHeap);
+    }
+};
+
+class MAsmJSAtomicBinopHeap : public MBinaryInstruction, public MAsmJSHeapAccess
+{
+    AtomicOp op_;
+
+    MAsmJSAtomicBinopHeap(AtomicOp op, ViewType vt, MDefinition *ptr, MDefinition *v,
+                          bool needsBoundsCheck)
+        : MBinaryInstruction(ptr, v),
+          MAsmJSHeapAccess(vt, needsBoundsCheck),
+          op_(op)
+    {
+        setGuard();         // Not removable
+        setResultType(MIRType_Int32);
+    }
+
+  public:
+    INSTRUCTION_HEADER(AsmJSAtomicBinopHeap);
+
+    static MAsmJSAtomicBinopHeap *New(TempAllocator &alloc, AtomicOp op, ViewType vt,
+                                      MDefinition *ptr, MDefinition *v, bool needsBoundsCheck)
     {
-        return new(alloc) MAsmJSStoreHeap(vt, ptr, v, needsBoundsCheck);
+        return new(alloc) MAsmJSAtomicBinopHeap(op, vt, ptr, v, needsBoundsCheck);
     }
 
+    AtomicOp operation() const { return op_; }
     MDefinition *ptr() const { return getOperand(0); }
     MDefinition *value() const { return getOperand(1); }
 
@@ -12283,12 +12644,13 @@
                               MDefinition *obj, PropertyName *name);
 void AddObjectsForPropertyRead(MDefinition *obj, PropertyName *name,
                                types::TemporaryTypeSet *observed);
-bool CanWriteProperty(types::CompilerConstraintList *constraints,
-                      types::HeapTypeSetKey property, MDefinition *value);
+bool CanWriteProperty(TempAllocator &alloc, types::CompilerConstraintList *constraints,
+                      types::HeapTypeSetKey property, MDefinition *value,
+                      MIRType implicitType = MIRType_None);
 bool PropertyWriteNeedsTypeBarrier(TempAllocator &alloc, types::CompilerConstraintList *constraints,
                                    MBasicBlock *current, MDefinition **pobj,
                                    PropertyName *name, MDefinition **pvalue,
-                                   bool canModify);
+                                   bool canModify, MIRType implicitType = MIRType_None);
 
 } // namespace jit
 } // namespace js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MOpcodes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MOpcodes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/MOpcodes.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/MOpcodes.h	2014-11-26 21:45:57.000000000 +0000
@@ -95,6 +95,7 @@
     _(CharCodeAt)                                                           \
     _(FromCharCode)                                                         \
     _(StringSplit)                                                          \
+    _(Substr)                                                               \
     _(Return)                                                               \
     _(Throw)                                                                \
     _(Box)                                                                  \
@@ -110,6 +111,7 @@
     _(ToObjectOrNull)                                                       \
     _(NewArray)                                                             \
     _(NewArrayCopyOnWrite)                                                  \
+    _(NewArrayDynamicLength)                                                \
     _(NewObject)                                                            \
     _(NewTypedObject)                                                       \
     _(NewDeclEnvObject)                                                     \
@@ -259,9 +261,12 @@
     _(InterruptCheckPar)                                                    \
     _(RecompileCheck)                                                       \
     _(MemoryBarrier)                                                        \
+    _(AsmJSCompareExchangeHeap)                                             \
+    _(AsmJSAtomicBinopHeap)                                                 \
     _(UnknownValue)                                                         \
     _(LexicalCheck)                                                         \
-    _(ThrowUninitializedLexical)
+    _(ThrowUninitializedLexical)                                            \
+    _(Debugger)
 
 // Forward declarations of MIR types.
 #define FORWARD_DECLARE(op) class M##op;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/none/Architecture-none.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/none/Architecture-none.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/none/Architecture-none.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/none/Architecture-none.h	2014-11-26 21:45:57.000000000 +0000
@@ -15,7 +15,7 @@
 namespace jit {
 
 static const bool SupportsSimd = false;
-static const uint32_t SimdStackAlignment = 0;
+static const uint32_t SimdStackAlignment = 4; // Make it 4 to avoid a bunch of div-by-zero warnings
 static const uint32_t AsmJSStackAlignment = 4;
 
 class Registers
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/none/Lowering-none.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/none/Lowering-none.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/none/Lowering-none.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/none/Lowering-none.h	2014-11-26 21:45:57.000000000 +0000
@@ -29,6 +29,7 @@
 
     LAllocation useByteOpRegister(MDefinition *) { MOZ_CRASH(); }
     LAllocation useByteOpRegisterOrNonDoubleConstant(MDefinition *) { MOZ_CRASH(); }
+    LDefinition tempByteOpRegister() { MOZ_CRASH(); }
     LDefinition tempToUnbox() { MOZ_CRASH(); }
     bool needTempForPostBarrier() { MOZ_CRASH(); }
     LDefinition tempForDispatchCache(MIRType v = MIRType_None) { MOZ_CRASH(); }
@@ -80,6 +81,8 @@
     bool visitForkJoinGetSlice(MForkJoinGetSlice *ins) { MOZ_CRASH(); }
     bool visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop *ins) { MOZ_CRASH(); }
     bool visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement *ins) { MOZ_CRASH(); }
+    bool visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap *ins) { MOZ_CRASH(); }
+    bool visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap *ins) { MOZ_CRASH(); }
 
     LTableSwitch *newLTableSwitch(LAllocation, LDefinition, MTableSwitch *) { MOZ_CRASH(); }
     LTableSwitchV *newLTableSwitchV(MTableSwitch *) { MOZ_CRASH(); }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/none/MacroAssembler-none.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/none/MacroAssembler-none.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/none/MacroAssembler-none.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/none/MacroAssembler-none.h	2014-11-26 21:45:57.000000000 +0000
@@ -180,6 +180,7 @@
     template <typename T> void call(T) { MOZ_CRASH(); }
     template <typename T, typename S> void call(T, S) { MOZ_CRASH(); }
     template <typename T> void callWithABI(T, MoveOp::Type v = MoveOp::GENERAL) { MOZ_CRASH(); }
+    void callAndPushReturnAddress(Label *label) { MOZ_CRASH(); }
 
     void setupAlignedABICall(uint32_t) { MOZ_CRASH(); }
     void setupUnalignedABICall(uint32_t, Register) { MOZ_CRASH(); }
@@ -190,7 +191,7 @@
     void callWithExitFrame(JitCode *, Register) { MOZ_CRASH(); }
 
     void callIon(Register callee) { MOZ_CRASH(); }
-    void callIonFromAsmJS(Register callee) { MOZ_CRASH(); }
+    void callJitFromAsmJS(Register callee) { MOZ_CRASH(); }
 
     void nop() { MOZ_CRASH(); }
     void breakpoint() { MOZ_CRASH(); }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/ParallelSafetyAnalysis.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/ParallelSafetyAnalysis.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/ParallelSafetyAnalysis.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/ParallelSafetyAnalysis.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -203,6 +203,7 @@
     UNSAFE_OP(ToObjectOrNull)
     CUSTOM_OP(NewArray)
     UNSAFE_OP(NewArrayCopyOnWrite)
+    UNSAFE_OP(NewArrayDynamicLength)
     UNSAFE_OP(NewTypedObject)
     CUSTOM_OP(NewObject)
     CUSTOM_OP(NewCallObject)
@@ -325,6 +326,7 @@
     UNSAFE_OP(CallInstanceOf)
     UNSAFE_OP(ProfilerStackOp)
     UNSAFE_OP(GuardString)
+    UNSAFE_OP(Substr)
     UNSAFE_OP(NewDeclEnvObject)
     UNSAFE_OP(In)
     UNSAFE_OP(InArray)
@@ -356,9 +358,12 @@
     UNSAFE_OP(CompareExchangeTypedArrayElement)
     UNSAFE_OP(AtomicTypedArrayElementBinop)
     UNSAFE_OP(MemoryBarrier)
+    UNSAFE_OP(AsmJSCompareExchangeHeap)
+    UNSAFE_OP(AsmJSAtomicBinopHeap)
     UNSAFE_OP(UnknownValue)
     UNSAFE_OP(LexicalCheck)
     UNSAFE_OP(ThrowUninitializedLexical)
+    UNSAFE_OP(Debugger)
 
     // It looks like these could easily be made safe:
     UNSAFE_OP(ConvertElementsToDoubles)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RangeAnalysis.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RangeAnalysis.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RangeAnalysis.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RangeAnalysis.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -247,9 +247,19 @@
             if (bound == 0)
                 comp.refineToExcludeNegativeZero();
             break;
+          case JSOP_STRICTEQ:
+            // A strict comparison can test for things other than numeric value.
+            if (!compare->isNumericComparison())
+                continue;
+            // Otherwise fall through to handle JSOP_STRICTEQ the same as JSOP_EQ.
           case JSOP_EQ:
             comp.setDouble(bound, bound);
             break;
+          case JSOP_STRICTNE:
+            // A strict comparison can test for things other than numeric value.
+            if (!compare->isNumericComparison())
+                continue;
+            // Otherwise fall through to handle JSOP_STRICTNE the same as JSOP_NE.
           case JSOP_NE:
             // Negative zero is not not-equal to zero.
             if (bound == 0) {
@@ -2253,22 +2263,12 @@
             // Beta nodes and interrupt checks are required to be located at the
             // beginnings of basic blocks, so we must insert range assertions
             // after any such instructions.
-            MInstructionIterator insertIter = ins->isPhi()
-                                            ? block->begin()
-                                            : block->begin(ins->toInstruction());
-            while (insertIter->isBeta() ||
-                   insertIter->isInterruptCheck() ||
-                   insertIter->isInterruptCheckPar() ||
-                   insertIter->isConstant() ||
-                   insertIter->isRecoveredOnBailout())
-            {
-                insertIter++;
-            }
+            MInstruction *insertAt = block->safeInsertTop(ins);
 
-            if (*insertIter == *iter)
-                block->insertAfter(*insertIter,  guard);
+            if (insertAt == *iter)
+                block->insertAfter(insertAt,  guard);
             else
-                block->insertBefore(*insertIter, guard);
+                block->insertBefore(insertAt, guard);
         }
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RangeAnalysis.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RangeAnalysis.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RangeAnalysis.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RangeAnalysis.h	2014-11-26 21:45:57.000000000 +0000
@@ -234,7 +234,8 @@
         // exponent 30, which is strictly less than MaxInt32Exponent. For
         // another example, 1.9 has an exponent of 0 but requires upper_ to be
         // at least 2, which has exponent 1.
-        uint32_t adjustedExponent = max_exponent_ + (canHaveFractionalPart_ ? 1 : 0);
+        mozilla::DebugOnly<uint32_t> adjustedExponent = max_exponent_ +
+            (canHaveFractionalPart_ ? 1 : 0);
         MOZ_ASSERT_IF(!hasInt32LowerBound_ || !hasInt32UpperBound_,
                       adjustedExponent >= MaxInt32Exponent);
         MOZ_ASSERT(adjustedExponent >= mozilla::FloorLog2(mozilla::Abs(upper_)));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Recover.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Recover.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Recover.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Recover.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -845,6 +845,38 @@
 }
 
 bool
+MHypot::writeRecoverData(CompactBufferWriter &writer) const
+{
+    MOZ_ASSERT(canRecoverOnBailout());
+    writer.writeUnsigned(uint32_t(RInstruction::Recover_Hypot));
+    return true;
+}
+
+RHypot::RHypot(CompactBufferReader &reader)
+{ }
+
+bool
+RHypot::recover(JSContext *cx, SnapshotIterator &iter) const
+{
+    JS::AutoValueVector vec(cx);
+
+    // currently, only 2 args can be saved in MIR
+    if (!vec.reserve(2))
+        return false;
+
+    vec.infallibleAppend(iter.read());
+    vec.infallibleAppend(iter.read());
+
+    RootedValue result(cx);
+
+    if(!js::math_hypot_handle(cx, vec, &result))
+        return false;
+
+    iter.storeInstructionResult(result);
+    return true;
+}
+
+bool
 MMathFunction::writeRecoverData(CompactBufferWriter &writer) const
 {
     MOZ_ASSERT(canRecoverOnBailout());
@@ -1226,3 +1258,28 @@
     iter.storeInstructionResult(result);
     return true;
 }
+
+bool
+MStringReplace::writeRecoverData(CompactBufferWriter &writer) const
+{
+    MOZ_ASSERT(canRecoverOnBailout());
+    writer.writeUnsigned(uint32_t(RInstruction::Recover_StringReplace));
+    return true;
+}
+
+RStringReplace::RStringReplace(CompactBufferReader &reader)
+{ }
+
+bool RStringReplace::recover(JSContext *cx, SnapshotIterator &iter) const
+{
+    RootedString string(cx, iter.read().toString());
+    RootedString pattern(cx, iter.read().toString());
+    RootedString replace(cx, iter.read().toString());
+    RootedValue result(cx);
+
+    if (!js::str_replace_string_raw(cx, string, pattern, replace, &result))
+        return false;
+
+    iter.storeInstructionResult(result);
+    return true;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Recover.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Recover.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Recover.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Recover.h	2014-11-26 21:45:57.000000000 +0000
@@ -46,10 +46,12 @@
     _(Abs)                                      \
     _(Sqrt)                                     \
     _(Atan2)                                    \
+    _(Hypot)                                    \
     _(StringSplit)                              \
     _(RegExpExec)                               \
     _(RegExpTest)                               \
     _(RegExpReplace)                            \
+    _(StringReplace)                            \
     _(TypeOf)                                   \
     _(ToDouble)                                 \
     _(ToFloat32)                                \
@@ -457,6 +459,18 @@
     bool recover(JSContext *cx, SnapshotIterator &iter) const;
 };
 
+class RHypot MOZ_FINAL : public RInstruction
+{
+   public:
+     RINSTRUCTION_HEADER_(Hypot)
+
+     virtual uint32_t numOperands() const {
+         return 2;
+     }
+
+     bool recover(JSContext *cx, SnapshotIterator &iter) const;
+};
+
 class RStringSplit MOZ_FINAL : public RInstruction
 {
   public:
@@ -500,6 +514,18 @@
 
     virtual uint32_t numOperands() const {
         return 3;
+    }
+
+    bool recover(JSContext *cx, SnapshotIterator &iter) const;
+};
+
+class RStringReplace MOZ_FINAL : public RInstruction
+{
+  public:
+    RINSTRUCTION_HEADER_(StringReplace)
+
+    virtual uint32_t numOperands() const {
+        return 3;
     }
 
     bool recover(JSContext *cx, SnapshotIterator &iter) const;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RematerializedFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RematerializedFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RematerializedFrame.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RematerializedFrame.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -31,6 +31,7 @@
 RematerializedFrame::RematerializedFrame(ThreadSafeContext *cx, uint8_t *top,
                                          unsigned numActualArgs, InlineFrameIterator &iter)
   : prevUpToDate_(false),
+    isDebuggee_(iter.script()->isDebuggee()),
     top_(top),
     pc_(iter.pc()),
     frameNo_(iter.frameNo()),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RematerializedFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RematerializedFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/RematerializedFrame.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/RematerializedFrame.h	2014-11-26 21:45:57.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "jsfun.h"
 
+#include "jit/IonFrames.h"
 #include "jit/JitFrameIterator.h"
 
 #include "vm/Stack.h"
@@ -25,6 +26,9 @@
     // See DebugScopes::updateLiveScopes.
     bool prevUpToDate_;
 
+    // Propagated to the Baseline frame once this is popped.
+    bool isDebuggee_;
+
     // The fp of the top frame associated with this possibly inlined frame.
     uint8_t *top_;
 
@@ -69,9 +73,24 @@
         prevUpToDate_ = true;
     }
 
+    bool isDebuggee() const {
+        return isDebuggee_;
+    }
+    void setIsDebuggee() {
+        isDebuggee_ = true;
+    }
+    void unsetIsDebuggee() {
+        MOZ_ASSERT(!script()->isDebuggee());
+        isDebuggee_ = false;
+    }
+
     uint8_t *top() const {
         return top_;
     }
+    JSScript *outerScript() const {
+        IonJSFrameLayout *jsFrame = (IonJSFrameLayout *)top_;
+        return ScriptFromCalleeToken(jsFrame->calleeToken());
+    }
     jsbytecode *pc() const {
         return pc_;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Assembler-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Assembler-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Assembler-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Assembler-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -18,6 +18,10 @@
 #include "jit/RegisterSets.h"
 #include "vm/HelperThreads.h"
 
+#if defined(JS_CODEGEN_ARM)
+#define JS_USE_LINK_REGISTER
+#endif
+
 #if defined(JS_CODEGEN_X64) || defined(JS_CODEGEN_ARM)
 // JS_SMALL_BRANCH means the range on a branch instruction
 // is smaller than the whole address space
@@ -38,6 +42,11 @@
     TimesEight = 3
 };
 
+static_assert(sizeof(JS::Value) == 8,
+              "required for TimesEight and 3 below to be correct");
+static const Scale ValueScale = TimesEight;
+static const size_t ValueShift = 3;
+
 static inline unsigned
 ScaleToShift(Scale scale)
 {
@@ -309,6 +318,40 @@
     BaseIndex() { mozilla::PodZero(this); }
 };
 
+// A BaseIndex used to access Values.  Note that |offset| is *not* scaled by
+// sizeof(Value).  Use this *only* if you're indexing into a series of Values
+// that aren't object elements or object slots (for example, values on the
+// stack, values in an arguments object, &c.).  If you're indexing into an
+// object's elements or slots, don't use this directly!  Use
+// BaseObject{Element,Slot}Index instead.
+struct BaseValueIndex : BaseIndex
+{
+    BaseValueIndex(Register base, Register index, int32_t offset = 0)
+      : BaseIndex(base, index, ValueScale, offset)
+    { }
+};
+
+// Specifies the address of an indexed Value within object elements from a
+// base.  The index must not already be scaled by sizeof(Value)!
+struct BaseObjectElementIndex : BaseValueIndex
+{
+    BaseObjectElementIndex(Register base, Register index, int32_t offset = 0)
+      : BaseValueIndex(base, index, offset)
+    {
+        NativeObject::elementsSizeMustNotOverflow();
+    }
+};
+
+// Like BaseObjectElementIndex, except for object slots.
+struct BaseObjectSlotIndex : BaseValueIndex
+{
+    BaseObjectSlotIndex(Register base, Register index)
+      : BaseValueIndex(base, index)
+    {
+        NativeObject::slotsSizeMustNotOverflow();
+    }
+};
+
 class Relocation {
   public:
     enum Kind {
@@ -692,11 +735,27 @@
 // #ifdefery.
 class AsmJSHeapAccess
 {
+  public:
+    enum ViewType {
+         Int8         = Scalar::Int8,
+         Uint8        = Scalar::Uint8,
+         Int16        = Scalar::Int16,
+         Uint16       = Scalar::Uint16,
+         Int32        = Scalar::Int32,
+         Uint32       = Scalar::Uint32,
+         Float32      = Scalar::Float32,
+         Float64      = Scalar::Float64,
+         Uint8Clamped = Scalar::Uint8Clamped,
+         Float32x4,
+         Int32x4
+    };
+
+  private:
     uint32_t offset_;
 #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 isFloat32Load_;
+    ViewType viewType_;
     AnyRegister::Code loadedReg_ : 8;
 #endif
 
@@ -709,19 +768,20 @@
 
     // If 'cmp' equals 'offset' 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 vt,
+    AsmJSHeapAccess(uint32_t offset, uint32_t after, ViewType viewType,
                     AnyRegister loadedReg, uint32_t cmp = NoLengthCheck)
       : offset_(offset),
         cmpDelta_(cmp == NoLengthCheck ? 0 : offset - cmp),
         opLength_(after - offset),
-        isFloat32Load_(vt == Scalar::Float32),
+        viewType_(viewType),
         loadedReg_(loadedReg.code())
     {}
-    AsmJSHeapAccess(uint32_t offset, uint8_t after, uint32_t cmp = NoLengthCheck)
+    AsmJSHeapAccess(uint32_t offset, uint8_t after, ViewType viewType,
+                    uint32_t cmp = NoLengthCheck)
       : offset_(offset),
         cmpDelta_(cmp == NoLengthCheck ? 0 : offset - cmp),
         opLength_(after - offset),
-        isFloat32Load_(false),
+        viewType_(viewType),
         loadedReg_(UINT8_MAX)
     {}
 #elif defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
@@ -740,7 +800,7 @@
     void *patchLengthAt(uint8_t *code) const { return code + (offset_ - cmpDelta_); }
     unsigned opLength() const { return opLength_; }
     bool isLoad() const { return loadedReg_ != UINT8_MAX; }
-    bool isFloat32Load() const { return isFloat32Load_; }
+    ViewType viewType() const { return viewType_; }
     AnyRegister loadedReg() const { return AnyRegister::FromCode(loadedReg_); }
 #endif
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Assembler-x86-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Assembler-x86-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Assembler-x86-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Assembler-x86-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -475,6 +475,9 @@
           case Operand::MEM_SCALE:
             masm.movaps_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
             break;
+          case Operand::FPREG:
+            masm.movaps_rr(src.fpu(), dest.code());
+            break;
           default:
             MOZ_CRASH("unexpected operand kind");
         }
@@ -1072,6 +1075,9 @@
     void addl(Imm32 imm, Register dest) {
         masm.addl_ir(imm.value, dest.code());
     }
+    void addl_wide(Imm32 imm, Register dest) {
+        masm.addl_ir_wide(imm.value, dest.code());
+    }
     void addl(Imm32 imm, const Operand &op) {
         switch (op.kind()) {
           case Operand::REG:
@@ -1685,6 +1691,21 @@
             MOZ_CRASH("unexpected operand kind");
         }
     }
+    void cmpeqps(const Operand &src, FloatRegister dest) {
+        cmpps(src, dest, X86Assembler::ConditionCmp_EQ);
+    }
+    void cmpltps(const Operand &src, FloatRegister dest) {
+        cmpps(src, dest, X86Assembler::ConditionCmp_LT);
+    }
+    void cmpleps(const Operand &src, FloatRegister dest) {
+        cmpps(src, dest, X86Assembler::ConditionCmp_LE);
+    }
+    void cmpunordps(const Operand &src, FloatRegister dest) {
+        cmpps(src, dest, X86Assembler::ConditionCmp_UNORD);
+    }
+    void cmpneqps(const Operand &src, FloatRegister dest) {
+        cmpps(src, dest, X86Assembler::ConditionCmp_NEQ);
+    }
     void rcpps(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
@@ -1886,6 +1907,7 @@
         }
     }
     void andnps(const Operand &src, FloatRegister dest) {
+        // Negates bits of dest and then applies AND
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::FPREG:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/BaseAssembler-x86-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/BaseAssembler-x86-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/BaseAssembler-x86-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/BaseAssembler-x86-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -197,6 +197,18 @@
         ConditionNC = ConditionAE
     } Condition;
 
+    // Conditions for CMP instructions (CMPSS, CMPSD, CMPPS, CMPPD, etc).
+    typedef enum {
+        ConditionCmp_EQ    = 0x0,
+        ConditionCmp_LT    = 0x1,
+        ConditionCmp_LE    = 0x2,
+        ConditionCmp_UNORD = 0x3,
+        ConditionCmp_NEQ   = 0x4,
+        ConditionCmp_NLT   = 0x5,
+        ConditionCmp_NLE   = 0x6,
+        ConditionCmp_ORD   = 0x7,
+    } ConditionCmp;
+
     static const char* nameCC(Condition cc)
     {
         static const char* const names[16]
@@ -610,6 +622,13 @@
             m_formatter.immediate32(imm);
         }
     }
+    void addl_ir_wide(int imm, RegisterID dst)
+    {
+        // 32-bit immediate always, for patching.
+        spew("addl       $0x%x, %s", imm, nameIReg(4,dst));
+        m_formatter.oneByteOp(OP_GROUP1_EvIz, GROUP1_OP_ADD, dst);
+        m_formatter.immediate32(imm);
+    }
 
     void addl_im(int imm, int offset, RegisterID base)
     {
@@ -3220,6 +3239,19 @@
         m_formatter.twoByteOp(OP2_MOVSD_VsdWsd, (RegisterID)dst, address);
     }
 
+    void movups_mr(const void* address, XMMRegisterID dst)
+    {
+        spew("movups     %p, %s", address, nameFPReg(dst));
+        m_formatter.twoByteOp(OP2_MOVPS_VpsWps, (RegisterID)dst, address);
+    }
+
+    void movdqu_mr(const void* address, XMMRegisterID dst)
+    {
+        spew("movdqu     %p, %s", address, nameFPReg(dst));
+        m_formatter.prefix(PRE_SSE_F3);
+        m_formatter.twoByteOp(OP2_MOVDQ_VdqWdq, (RegisterID)dst, address);
+    }
+
     void movsd_rm(XMMRegisterID src, const void* address)
     {
         spew("movsd      %s, %p", nameFPReg(src), address);
@@ -3244,6 +3276,19 @@
     void movaps_rm(XMMRegisterID src, const void* address)
     {
         spew("movaps     %s, %p", nameFPReg(src), address);
+        m_formatter.twoByteOp(OP2_MOVAPS_WsdVsd, (RegisterID)src, address);
+    }
+
+    void movdqu_rm(XMMRegisterID src, const void* address)
+    {
+        spew("movdqu     %s, %p", nameFPReg(src), address);
+        m_formatter.prefix(PRE_SSE_F3);
+        m_formatter.twoByteOp(OP2_MOVDQ_WdqVdq, (RegisterID)src, address);
+    }
+
+    void movups_rm(XMMRegisterID src, const void* address)
+    {
+        spew("movups     %s, %p", nameFPReg(src), address);
         m_formatter.twoByteOp(OP2_MOVPS_WpsVps, (RegisterID)src, address);
     }
 #ifdef JS_CODEGEN_X64
@@ -3327,6 +3372,12 @@
              nameFPReg(src), PRETTY_PRINT_OFFSET(offset), nameIReg(base));
         m_formatter.twoByteOp(OP2_MOVPS_WpsVps, (RegisterID)src, base, offset);
     }
+    void movups_rm_disp32(XMMRegisterID src, int offset, RegisterID base)
+    {
+        spew("movups     %s, %s0x%x(%s)",
+             nameFPReg(src), PRETTY_PRINT_OFFSET(offset), nameIReg(base));
+        m_formatter.twoByteOp_disp32(OP2_MOVPS_WpsVps, (RegisterID)src, base, offset);
+    }
     void movups_rm(XMMRegisterID src, int offset, RegisterID base, RegisterID index, int scale)
     {
         spew("movups     %s, %d(%s,%s,%d)",
@@ -3339,6 +3390,12 @@
              PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
         m_formatter.twoByteOp(OP2_MOVPS_VpsWps, (RegisterID)dst, base, offset);
     }
+    void movups_mr_disp32(int offset, RegisterID base, XMMRegisterID dst)
+    {
+        spew("movups     %s0x%x(%s), %s",
+             PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
+        m_formatter.twoByteOp_disp32(OP2_MOVPS_VpsWps, (RegisterID)dst, base, offset);
+    }
     void movups_mr(int offset, RegisterID base, RegisterID index, int scale, XMMRegisterID dst)
     {
         spew("movups     %d(%s,%s,%d), %s",
@@ -3391,6 +3448,14 @@
         m_formatter.twoByteOp(OP2_MOVDQ_WdqVdq, (RegisterID)src, base, offset);
     }
 
+    void movdqu_rm_disp32(XMMRegisterID src, int offset, RegisterID base)
+    {
+        spew("movdqu     %s, %s0x%x(%s)",
+             nameFPReg(src), PRETTY_PRINT_OFFSET(offset), nameIReg(base));
+        m_formatter.prefix(PRE_SSE_F3);
+        m_formatter.twoByteOp_disp32(OP2_MOVDQ_WdqVdq, (RegisterID)src, base, offset);
+    }
+
     void movdqu_rm(XMMRegisterID src, int offset, RegisterID base, RegisterID index, int scale)
     {
         spew("movdqu     %s, %d(%s,%s,%d)",
@@ -3407,6 +3472,14 @@
         m_formatter.twoByteOp(OP2_MOVDQ_VdqWdq, (RegisterID)dst, base, offset);
     }
 
+    void movdqu_mr_disp32(int offset, RegisterID base, XMMRegisterID dst)
+    {
+        spew("movdqu     %s0x%x(%s), %s",
+             PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
+        m_formatter.prefix(PRE_SSE_F3);
+        m_formatter.twoByteOp_disp32(OP2_MOVDQ_VdqWdq, (RegisterID)dst, base, offset);
+    }
+
     void movdqu_mr(int offset, RegisterID base, RegisterID index, int scale, XMMRegisterID dst)
     {
         spew("movdqu     %d(%s,%s,%d), %s",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/BaselineCompiler-shared.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/BaselineCompiler-shared.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/BaselineCompiler-shared.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/BaselineCompiler-shared.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -9,6 +9,8 @@
 #include "jit/BaselineIC.h"
 #include "jit/VMFunctions.h"
 
+#include "jsscriptinlines.h"
+
 using namespace js;
 using namespace js::jit;
 
@@ -18,7 +20,7 @@
     pc(script->code()),
     ionCompileable_(jit::IsIonEnabled(cx) && CanIonCompileScript(cx, script, false)),
     ionOSRCompileable_(jit::IsIonEnabled(cx) && CanIonCompileScript(cx, script, true)),
-    debugMode_(cx->compartment()->debugMode()),
+    compileDebugInstrumentation_(script->isDebuggee()),
     alloc_(alloc),
     analysis_(alloc, script),
     frame(script, masm),
@@ -88,7 +90,7 @@
         masm.makeFrameDescriptor(BaselineTailCallReg, JitFrame_BaselineJS);
         masm.push(BaselineTailCallReg);
     }
-
+    MOZ_ASSERT(fun.expectTailCall == NonTailCall);
     // Perform the call.
     masm.call(code);
     uint32_t callOffset = masm.currentOffset();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/BaselineCompiler-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/BaselineCompiler-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/BaselineCompiler-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/BaselineCompiler-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -24,7 +24,7 @@
     MacroAssembler masm;
     bool ionCompileable_;
     bool ionOSRCompileable_;
-    bool debugMode_;
+    bool compileDebugInstrumentation_;
 
     TempAllocator &alloc_;
     BytecodeAnalysis analysis_;
@@ -141,6 +141,10 @@
     BytecodeAnalysis &analysis() {
         return analysis_;
     }
+
+    void setCompileDebugInstrumentation() {
+        compileDebugInstrumentation_ = true;
+    }
 };
 
 } // namespace jit
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -41,11 +41,11 @@
 bool
 CodeGeneratorX86Shared::generatePrologue()
 {
+    MOZ_ASSERT(masm.framePushed() == 0);
     MOZ_ASSERT(!gen->compilingAsmJS());
 
     // Note that this automatically sets MacroAssembler::framePushed().
     masm.reserveStack(frameSize());
-
     return true;
 }
 
@@ -346,14 +346,29 @@
 bool
 CodeGeneratorX86Shared::visitOutOfLineLoadTypedArrayOutOfBounds(OutOfLineLoadTypedArrayOutOfBounds *ool)
 {
-    if (ool->dest().isFloat()) {
-        if (ool->isFloat32Load())
-            masm.loadConstantFloat32(float(GenericNaN()), ool->dest().fpu());
-        else
-            masm.loadConstantDouble(GenericNaN(), ool->dest().fpu());
-    } else {
+    switch (ool->viewType()) {
+      case AsmJSHeapAccess::Float32:
+        masm.loadConstantFloat32(float(GenericNaN()), ool->dest().fpu());
+        break;
+      case AsmJSHeapAccess::Float64:
+        masm.loadConstantDouble(GenericNaN(), ool->dest().fpu());
+        break;
+      case AsmJSHeapAccess::Float32x4:
+        masm.loadConstantFloat32x4(SimdConstant::SplatX4(float(GenericNaN())), ool->dest().fpu());
+        break;
+      case AsmJSHeapAccess::Int32x4:
+        masm.loadConstantInt32x4(SimdConstant::SplatX4(0), ool->dest().fpu());
+        break;
+      case AsmJSHeapAccess::Int8:
+      case AsmJSHeapAccess::Uint8:
+      case AsmJSHeapAccess::Int16:
+      case AsmJSHeapAccess::Uint16:
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:
+      case AsmJSHeapAccess::Uint8Clamped:
         Register destReg = ool->dest().gpr();
         masm.mov(ImmWord(0), destReg);
+        break;
     }
     masm.jmp(ool->rejoin());
     return true;
@@ -2662,6 +2677,8 @@
 bool
 CodeGeneratorX86Shared::visitSimdBinaryCompIx4(LSimdBinaryCompIx4 *ins)
 {
+    static const SimdConstant allOnes = SimdConstant::SplatX4(-1);
+
     FloatRegister lhs = ToFloatRegister(ins->lhs());
     Operand rhs = ToOperand(ins->rhs());
     MOZ_ASSERT(ToFloatRegister(ins->output()) == lhs);
@@ -2675,22 +2692,41 @@
         masm.packedEqualInt32x4(rhs, lhs);
         return true;
       case MSimdBinaryComp::lessThan:
-        // scr := rhs
+        // src := rhs
         if (rhs.kind() == Operand::FPREG)
             masm.moveAlignedInt32x4(ToFloatRegister(ins->rhs()), ScratchSimdReg);
         else
             masm.loadAlignedInt32x4(rhs, ScratchSimdReg);
 
-        // scr := scr > lhs (i.e. lhs < rhs)
+        // src := src > lhs (i.e. lhs < rhs)
         // Improve by doing custom lowering (rhs is tied to the output register)
         masm.packedGreaterThanInt32x4(ToOperand(ins->lhs()), ScratchSimdReg);
         masm.moveAlignedInt32x4(ScratchSimdReg, lhs);
         return true;
       case MSimdBinaryComp::notEqual:
+        // Ideally for notEqual, greaterThanOrEqual, and lessThanOrEqual, we
+        // should invert the comparison by, e.g. swapping the arms of a select
+        // if that's what it's used in.
+        masm.loadConstantInt32x4(allOnes, ScratchSimdReg);
+        masm.packedEqualInt32x4(rhs, lhs);
+        masm.bitwiseXorX4(Operand(ScratchSimdReg), lhs);
+        return true;
       case MSimdBinaryComp::greaterThanOrEqual:
+        // src := rhs
+        if (rhs.kind() == Operand::FPREG)
+            masm.moveAlignedInt32x4(ToFloatRegister(ins->rhs()), ScratchSimdReg);
+        else
+            masm.loadAlignedInt32x4(rhs, ScratchSimdReg);
+        masm.packedGreaterThanInt32x4(ToOperand(ins->lhs()), ScratchSimdReg);
+        masm.loadConstantInt32x4(allOnes, lhs);
+        masm.bitwiseXorX4(Operand(ScratchSimdReg), lhs);
+        return true;
       case MSimdBinaryComp::lessThanOrEqual:
-        // These operations are not part of the spec. so are not implemented.
-        break;
+        // lhs <= rhs is equivalent to !(rhs < lhs), which we compute here.
+        masm.loadConstantInt32x4(allOnes, ScratchSimdReg);
+        masm.packedGreaterThanInt32x4(rhs, lhs);
+        masm.bitwiseXorX4(Operand(ScratchSimdReg), lhs);
+        return true;
     }
     MOZ_CRASH("unexpected SIMD op");
 }
@@ -2705,16 +2741,16 @@
     MSimdBinaryComp::Operation op = ins->operation();
     switch (op) {
       case MSimdBinaryComp::equal:
-        masm.cmpps(rhs, lhs, 0x0);
+        masm.cmpeqps(rhs, lhs);
         return true;
       case MSimdBinaryComp::lessThan:
-        masm.cmpps(rhs, lhs, 0x1);
+        masm.cmpltps(rhs, lhs);
         return true;
       case MSimdBinaryComp::lessThanOrEqual:
-        masm.cmpps(rhs, lhs, 0x2);
+        masm.cmpleps(rhs, lhs);
         return true;
       case MSimdBinaryComp::notEqual:
-        masm.cmpps(rhs, lhs, 0x4);
+        masm.cmpneqps(rhs, lhs);
         return true;
       case MSimdBinaryComp::greaterThanOrEqual:
       case MSimdBinaryComp::greaterThan:
@@ -2754,6 +2790,9 @@
         // we can do max with a single instruction only if we have SSE4.1
         // using the PMINSD instruction.
         break;
+      case MSimdBinaryArith::MinNum:
+      case MSimdBinaryArith::MaxNum:
+        break;
     }
     MOZ_CRASH("unexpected SIMD op");
 }
@@ -2779,19 +2818,75 @@
       case MSimdBinaryArith::Div:
         masm.packedDivFloat32(rhs, lhs);
         return true;
-      case MSimdBinaryArith::Max:
-        // TODO: standardization of float32x4.min/max needs to define the
-        // semantics for particular values: if both input operands are -0 or 0,
-        // or one operand is NaN, the return value will be the "second operand"
-        // in the instruction.
-        // See also bug 1068028, which is about fixing semantics once the
-        // specification is stable.
+      case MSimdBinaryArith::Max: {
+        masm.movaps(lhs, ScratchSimdReg);
+        masm.cmpunordps(rhs, ScratchSimdReg);
+
+        FloatRegister tmp = ToFloatRegister(ins->temp());
+        masm.movaps(rhs, tmp);
+        masm.maxps(Operand(lhs), tmp);
         masm.maxps(rhs, lhs);
+
+        masm.andps(tmp, lhs);
+        masm.orps(ScratchSimdReg, lhs); // or in the all-ones NaNs
         return true;
-      case MSimdBinaryArith::Min:
-        // See comment above.
+      }
+      case MSimdBinaryArith::Min: {
+        FloatRegister rhsCopy = ScratchSimdReg;
+        masm.movaps(rhs, rhsCopy);
+        masm.minps(Operand(lhs), rhsCopy);
         masm.minps(rhs, lhs);
+        masm.orps(rhsCopy, lhs); // NaN or'd with arbitrary bits is NaN
+        return true;
+      }
+      case MSimdBinaryArith::MinNum: {
+        FloatRegister tmp = ToFloatRegister(ins->temp());
+        masm.loadConstantInt32x4(SimdConstant::SplatX4(int32_t(0x80000000)), ScratchSimdReg);
+        masm.movdqa(ScratchSimdReg, tmp);
+
+        FloatRegister mask = ScratchSimdReg;
+        masm.pcmpeqd(Operand(lhs), mask);
+        masm.andps(tmp, mask);
+
+        masm.movaps(lhs, tmp);
+        masm.minps(rhs, tmp);
+        masm.orps(mask, tmp);
+
+        masm.movaps(rhs, mask);
+        masm.cmpneqps(Operand(mask), mask);
+
+        // Emulates blendv
+        masm.andps(Operand(mask), lhs);
+        masm.andnps(Operand(tmp), mask);
+        masm.orps(Operand(mask), lhs);
         return true;
+      }
+      case MSimdBinaryArith::MaxNum: {
+        FloatRegister mask = ScratchSimdReg;
+        masm.loadConstantInt32x4(SimdConstant::SplatX4(0), mask);
+        masm.pcmpeqd(Operand(lhs), mask);
+
+        FloatRegister tmp = ToFloatRegister(ins->temp());
+        masm.loadConstantInt32x4(SimdConstant::SplatX4(int32_t(0x80000000)), tmp);
+        masm.andps(tmp, mask);
+
+        masm.movaps(lhs, tmp);
+        masm.maxps(rhs, tmp);
+        masm.andnps(Operand(tmp), mask);
+
+        // Ensure tmp always contains the temporary result
+        mask = tmp;
+        tmp = ScratchSimdReg;
+
+        masm.movaps(rhs, mask);
+        masm.cmpneqps(Operand(mask), mask);
+
+        // Emulates blendv
+        masm.andps(Operand(mask), lhs);
+        masm.andnps(Operand(tmp), mask);
+        masm.orps(Operand(mask), lhs);
+        return true;
+      }
     }
     MOZ_CRASH("unexpected SIMD op");
 }
@@ -2942,8 +3037,6 @@
     FloatRegister onFalse = ToFloatRegister(ins->rhs());
 
     MOZ_ASSERT(onTrue == ToFloatRegister(ins->output()));
-    // The onFalse argument is not destroyed but due to limitations of the
-    // register allocator its life ends at the start of the operation.
     masm.bitwiseAndX4(Operand(mask), onTrue);
     masm.bitwiseAndNotX4(Operand(onFalse), mask);
     masm.bitwiseOrX4(Operand(mask), onTrue);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -38,14 +38,14 @@
     class OutOfLineLoadTypedArrayOutOfBounds : public OutOfLineCodeBase<CodeGeneratorX86Shared>
     {
         AnyRegister dest_;
-        bool isFloat32Load_;
+        AsmJSHeapAccess::ViewType viewType_;
       public:
-        OutOfLineLoadTypedArrayOutOfBounds(AnyRegister dest, bool isFloat32Load)
-          : dest_(dest), isFloat32Load_(isFloat32Load)
+        OutOfLineLoadTypedArrayOutOfBounds(AnyRegister dest, AsmJSHeapAccess::ViewType viewType)
+          : dest_(dest), viewType_(viewType)
         {}
 
         AnyRegister dest() const { return dest_; }
-        bool isFloat32Load() const { return isFloat32Load_; }
+        AsmJSHeapAccess::ViewType viewType() const { return viewType_; }
         bool accept(CodeGeneratorX86Shared *codegen) {
             return codegen->visitOutOfLineLoadTypedArrayOutOfBounds(this);
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -100,14 +100,20 @@
     return defineReuseInput(ins, mir, 0);
 }
 
+template<size_t Temps>
 bool
-LIRGeneratorX86Shared::lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir, MDefinition *lhs, MDefinition *rhs)
+LIRGeneratorX86Shared::lowerForFPU(LInstructionHelper<1, 2, Temps> *ins, MDefinition *mir, MDefinition *lhs, MDefinition *rhs)
 {
     ins->setOperand(0, useRegisterAtStart(lhs));
     ins->setOperand(1, lhs != rhs ? use(rhs) : useAtStart(rhs));
     return defineReuseInput(ins, mir, 0);
 }
 
+template bool LIRGeneratorX86Shared::lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir,
+                                                 MDefinition *lhs, MDefinition *rhs);
+template bool LIRGeneratorX86Shared::lowerForFPU(LInstructionHelper<1, 2, 1> *ins, MDefinition *mir,
+                                                 MDefinition *lhs, MDefinition *rhs);
+
 bool
 LIRGeneratorX86Shared::lowerForCompIx4(LSimdBinaryCompIx4 *ins, MSimdBinaryComp *mir, MDefinition *lhs, MDefinition *rhs)
 {
@@ -489,6 +495,129 @@
 }
 
 bool
+LIRGeneratorX86Shared::visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap *ins)
+{
+    MDefinition *ptr = ins->ptr();
+    MOZ_ASSERT(ptr->type() == MIRType_Int32);
+
+    bool byteArray = false;
+    switch (ins->viewType()) {
+      case Scalar::Int8:
+      case Scalar::Uint8:
+        byteArray = true;
+        break;
+      case Scalar::Int16:
+      case Scalar::Uint16:
+      case Scalar::Int32:
+      case Scalar::Uint32:
+        break;
+      default:
+        MOZ_CRASH("Unexpected array type");
+    }
+
+    // Register allocation:
+    //
+    // The output must be eax.
+    //
+    // oldval must be in a register (it'll eventually end up in eax so
+    // ideally it's there to begin with).
+    //
+    // newval will need to be in a register.  If the source is a byte
+    // array then the newval must be a register that has a byte size:
+    // ebx, ecx, or edx, since eax is taken for the output in this
+    // case.  We pick ebx but it would be more flexible to pick any of
+    // the three that wasn't being used.
+    //
+    // Bug #1077036 describes some optimization opportunities.
+
+    const LAllocation newval = byteArray ? useFixed(ins->newValue(), ebx) : useRegister(ins->newValue());
+    const LAllocation oldval = useRegister(ins->oldValue());
+
+    LAsmJSCompareExchangeHeap *lir =
+        new(alloc()) LAsmJSCompareExchangeHeap(useRegister(ptr), oldval, newval);
+
+    return defineFixed(lir, ins, LAllocation(AnyRegister(eax)));
+}
+
+bool
+LIRGeneratorX86Shared::visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap *ins)
+{
+    MDefinition *ptr = ins->ptr();
+    MOZ_ASSERT(ptr->type() == MIRType_Int32);
+
+    bool byteArray = false;
+    switch (ins->viewType()) {
+      case Scalar::Int8:
+      case Scalar::Uint8:
+        byteArray = true;
+        break;
+      case Scalar::Int16:
+      case Scalar::Uint16:
+      case Scalar::Int32:
+      case Scalar::Uint32:
+        break;
+      default:
+        MOZ_CRASH("Unexpected array type");
+    }
+
+    // Register allocation:
+    //
+    // For ADD and SUB we'll use XADD:
+    //
+    //    movl       value, output
+    //    lock xaddl output, mem
+    //
+    // For the 8-bit variants XADD needs a byte register for the
+    // output only, we can still set up with movl; just pin the output
+    // to eax (or ebx / ecx / edx).
+    //
+    // For AND/OR/XOR we need to use a CMPXCHG loop:
+    //
+    //    movl          *mem, eax
+    // L: mov           eax, temp
+    //    andl          value, temp
+    //    lock cmpxchg  temp, mem  ; reads eax also
+    //    jnz           L
+    //    ; result in eax
+    //
+    // Note the placement of L, cmpxchg will update eax with *mem if
+    // *mem does not have the expected value, so reloading it at the
+    // top of the loop is redundant.
+    //
+    // We want to fix eax as the output.  We also need a temp for
+    // the intermediate value.
+    //
+    // For the 8-bit variants the temp must have a byte register.
+    //
+    // There are optimization opportunities:
+    //  - when the result is unused, Bug #1077014.
+    //  - better register allocation and instruction selection, Bug #1077036.
+
+    bool bitOp = !(ins->operation() == AtomicFetchAddOp || ins->operation() == AtomicFetchSubOp);
+    LDefinition tempDef = LDefinition::BogusTemp();
+    LAllocation value;
+
+    // Optimization opportunity: "value" need not be pinned to something that
+    // has a byte register unless the back-end insists on using a byte move
+    // for the setup or the payload computation, which really it need not do.
+
+    if (byteArray) {
+        value = useFixed(ins->value(), ebx);
+        if (bitOp)
+            tempDef = tempFixed(ecx);
+    } else {
+        value = useRegister(ins->value());
+        if (bitOp)
+            tempDef = temp();
+    }
+
+    LAsmJSAtomicBinopHeap *lir =
+        new(alloc()) LAsmJSAtomicBinopHeap(useRegister(ptr), value, tempDef);
+
+    return defineFixed(lir, ins, LAllocation(AnyRegister(eax)));
+}
+
+bool
 LIRGeneratorX86Shared::visitSimdTernaryBitwise(MSimdTernaryBitwise *ins)
 {
     MOZ_ASSERT(IsSimdType(ins->type()));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Lowering-x86-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Lowering-x86-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/Lowering-x86-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/Lowering-x86-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -31,7 +31,8 @@
     bool lowerForALU(LInstructionHelper<1, 1, 0> *ins, MDefinition *mir, MDefinition *input);
     bool lowerForALU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir, MDefinition *lhs,
                      MDefinition *rhs);
-    bool lowerForFPU(LInstructionHelper<1, 2, 0> *ins, MDefinition *mir, MDefinition *lhs,
+    template<size_t Temps>
+    bool lowerForFPU(LInstructionHelper<1, 2, Temps> *ins, MDefinition *mir, MDefinition *lhs,
                      MDefinition *rhs);
     bool lowerForCompIx4(LSimdBinaryCompIx4 *ins, MSimdBinaryComp *mir,
                          MDefinition *lhs, MDefinition *rhs);
@@ -57,6 +58,8 @@
     bool visitSimdValueX4(MSimdValueX4 *ins);
     bool visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement *ins);
     bool visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop *ins);
+    bool visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap *ins);
+    bool visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap *ins);
 };
 
 } // namespace jit
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.h	2014-11-26 21:45:57.000000000 +0000
@@ -844,9 +844,15 @@
     void loadUnalignedInt32x4(const Address &src, FloatRegister dest) {
         movdqu(Operand(src), dest);
     }
+    void loadUnalignedInt32x4(const Operand &src, FloatRegister dest) {
+        movdqu(src, dest);
+    }
     void storeUnalignedInt32x4(FloatRegister src, const Address &dest) {
         movdqu(src, Operand(dest));
     }
+    void storeUnalignedInt32x4(FloatRegister src, const Operand &dest) {
+        movdqu(src, dest);
+    }
     void packedEqualInt32x4(const Operand &src, FloatRegister dest) {
         pcmpeqd(src, dest);
     }
@@ -907,9 +913,15 @@
     void loadUnalignedFloat32x4(const Address &src, FloatRegister dest) {
         movups(Operand(src), dest);
     }
+    void loadUnalignedFloat32x4(const Operand &src, FloatRegister dest) {
+        movups(src, dest);
+    }
     void storeUnalignedFloat32x4(FloatRegister src, const Address &dest) {
         movups(src, Operand(dest));
     }
+    void storeUnalignedFloat32x4(FloatRegister src, const Operand &dest) {
+        movups(src, dest);
+    }
     void packedAddFloat32(const Operand &src, FloatRegister dest) {
         addps(src, dest);
     }
@@ -1193,7 +1205,7 @@
     void callIon(Register callee) {
         call(callee);
     }
-    void callIonFromAsmJS(Register callee) {
+    void callJitFromAsmJS(Register callee) {
         call(callee);
     }
     void call(AsmJSImmPtr target) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Sink.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Sink.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Sink.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Sink.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,202 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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/. */
+
+#include "jit/Sink.h"
+
+#include "mozilla/Vector.h"
+
+#include "jit/IonAnalysis.h"
+#include "jit/JitSpewer.h"
+#include "jit/MIR.h"
+#include "jit/MIRGenerator.h"
+#include "jit/MIRGraph.h"
+
+namespace js {
+namespace jit {
+
+// Given the last found common dominator and a new definition to dominate, the
+// CommonDominator function returns the basic block which dominate the last
+// common dominator and the definition. If no such block exists, then this
+// functions return null.
+static MBasicBlock *
+CommonDominator(MBasicBlock *commonDominator, MBasicBlock *defBlock)
+{
+    // This is the first instruction visited, record its basic block as being
+    // the only interesting one.
+    if (!commonDominator)
+        return defBlock;
+
+    // Iterate on immediate dominators of the known common dominator to find a
+    // block which dominates all previous uses as well as this instruction.
+    while (!commonDominator->dominates(defBlock)) {
+        MBasicBlock *nextBlock = commonDominator->immediateDominator();
+        // All uses are dominated, so, this cannot happen unless the graph
+        // coherency is not respected.
+        MOZ_ASSERT(commonDominator != nextBlock);
+        commonDominator = nextBlock;
+    }
+
+    return commonDominator;
+}
+
+bool
+Sink(MIRGenerator *mir, MIRGraph &graph)
+{
+    TempAllocator &alloc = graph.alloc();
+
+    for (PostorderIterator block = graph.poBegin(); block != graph.poEnd(); block++) {
+        if (mir->shouldCancel("Sink"))
+            return false;
+
+        for (MInstructionReverseIterator iter = block->rbegin(); iter != block->rend(); ) {
+            MInstruction *ins = *iter++;
+
+            // Only instructions which can be recovered on bailout can be moved
+            // into the bailout paths.
+            if (ins->isGuard() || ins->isRecoveredOnBailout() || !ins->canRecoverOnBailout())
+                continue;
+
+            // Compute a common dominator for all uses of the current
+            // instruction.
+            bool hasLiveUses = false;
+            bool hasUses = false;
+            MBasicBlock *usesDominator = nullptr;
+            for (MUseIterator i(ins->usesBegin()), e(ins->usesEnd()); i != e; i++) {
+                hasUses = true;
+                MNode *consumerNode = (*i)->consumer();
+                if (consumerNode->isResumePoint())
+                    continue;
+
+                MDefinition *consumer = consumerNode->toDefinition();
+                if (consumer->isRecoveredOnBailout())
+                    continue;
+
+                hasLiveUses = true;
+
+                // If the instruction is a Phi, then we should dominate the
+                // predecessor from which the value is coming from.
+                MBasicBlock *consumerBlock = consumer->block();
+                if (consumer->isPhi())
+                    consumerBlock = consumerBlock->getPredecessor(consumer->indexOf(*i));
+
+                usesDominator = CommonDominator(usesDominator, consumerBlock);
+                if (usesDominator == *block)
+                    break;
+            }
+
+            // Leave this instruction for DCE.
+            if (!hasUses)
+                continue;
+
+            // We have no uses, so sink this instruction in all the bailout
+            // paths.
+            if (!hasLiveUses) {
+                MOZ_ASSERT(!usesDominator);
+                ins->setRecoveredOnBailout();
+                JitSpewDef(JitSpew_Sink, "  No live uses, recover the instruction on bailout\n", ins);
+                continue;
+            }
+
+            // If all the uses are under a loop, we might not want to work
+            // against LICM by moving everything back into the loop, but if the
+            // loop is it-self inside an if, then we still want to move the
+            // computation under this if statement.
+            while (block->loopDepth() < usesDominator->loopDepth()) {
+                MOZ_ASSERT(usesDominator != usesDominator->immediateDominator());
+                usesDominator = usesDominator->immediateDominator();
+            }
+
+            // Only move instructions if there is a branch between the dominator
+            // of the uses and the original instruction. This prevent moving the
+            // computation of the arguments into an inline function if there is
+            // no major win.
+            MBasicBlock *lastJoin = usesDominator;
+            while (*block != lastJoin && lastJoin->numPredecessors() == 1) {
+                MOZ_ASSERT(lastJoin != lastJoin->immediateDominator());
+                MBasicBlock *next = lastJoin->immediateDominator();
+                if (next->numSuccessors() > 1)
+                    break;
+                lastJoin = next;
+            }
+            if (*block == lastJoin)
+                continue;
+
+            // Skip to the next instruction if we cannot find a common dominator
+            // for all the uses of this instruction, or if the common dominator
+            // correspond to the block of the current instruction.
+            if (!usesDominator || usesDominator == *block)
+                continue;
+
+            // Only instruction which can be recovered on bailout and which are
+            // sinkable can be moved into blocks which are below while filling
+            // the resume points with a clone which is recovered on bailout.
+
+            // If the instruction has live uses and if it is clonable, then we
+            // can clone the instruction for all non-dominated uses and move the
+            // instruction into the block which is dominating all live uses.
+            if (!ins->canClone())
+                continue;
+
+            JitSpewDef(JitSpew_Sink, "  Can Clone & Recover, sink instruction\n", ins);
+            JitSpew(JitSpew_Sink, "  into Block %u", usesDominator->id());
+
+            // Copy the arguments and clone the instruction.
+            MDefinitionVector operands(alloc);
+            for (size_t i = 0, end = ins->numOperands(); i < end; i++) {
+                if (!operands.append(ins->getOperand(i)))
+                    return false;
+            }
+
+            MInstruction *clone = ins->clone(alloc, operands);
+            ins->block()->insertBefore(ins, clone);
+            clone->setRecoveredOnBailout();
+
+            // We should not update the producer of the entry resume point, as
+            // it cannot refer to any instruction within the basic block excepts
+            // for Phi nodes.
+            MResumePoint *entry = usesDominator->entryResumePoint();
+
+            // Replace the instruction by its clone in all the resume points /
+            // recovered-on-bailout instructions which are not in blocks which
+            // are dominated by the usesDominator block.
+            for (MUseIterator i(ins->usesBegin()), e(ins->usesEnd()); i != e; ) {
+                MUse *use = *i++;
+                MNode *consumer = use->consumer();
+
+                // If the consumer is a Phi, then we look for the index of the
+                // use to find the corresponding predecessor block, which is
+                // then used as the consumer block.
+                MBasicBlock *consumerBlock = consumer->block();
+                if (consumer->isDefinition() && consumer->toDefinition()->isPhi()) {
+                    consumerBlock = consumerBlock->getPredecessor(
+                        consumer->toDefinition()->toPhi()->indexOf(use));
+                }
+
+                // Keep the current instruction for all dominated uses, except
+                // for the entry resume point of the block in which the
+                // instruction would be moved into.
+                if (usesDominator->dominates(consumerBlock) &&
+                    (!consumer->isResumePoint() || consumer->toResumePoint() != entry))
+                {
+                    continue;
+                }
+
+                use->replaceProducer(clone);
+            }
+
+            // Now, that all uses which are not dominated by usesDominator are
+            // using the cloned instruction, we can safely move the instruction
+            // into the usesDominator block.
+            MInstruction *at = usesDominator->safeInsertTop(nullptr, MBasicBlock::IgnoreRecover);
+            block->moveBefore(at, ins);
+        }
+    }
+
+    return true;
+}
+
+}
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Sink.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Sink.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Sink.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Sink.h	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 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/. */
+
+// This file declares sink transformation.
+#ifndef jit_Sink_h
+#define jit_Sink_h
+
+namespace js {
+namespace jit {
+
+class MIRGenerator;
+class MIRGraph;
+
+bool
+Sink(MIRGenerator *mir, MIRGraph &graph);
+
+} // namespace jit
+} // namespace js
+
+#endif /* jit_Sink_h */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Snapshots.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Snapshots.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/Snapshots.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/Snapshots.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -192,7 +192,8 @@
       case UNTYPED_STACK_REG: {
         static const RValueAllocation::Layout layout = {
             PAYLOAD_STACK_OFFSET,
-            PAYLOAD_GPR
+            PAYLOAD_GPR,
+            "value"
         };
         return layout;
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/TypePolicy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/TypePolicy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/TypePolicy.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/TypePolicy.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -409,31 +409,6 @@
 
 template <unsigned Op>
 bool
-ConvertToObjectOrNullPolicy<Op>::staticAdjustInputs(TempAllocator &alloc, MInstruction *ins)
-{
-    MDefinition *in = ins->getOperand(Op);
-    if (in->type() == MIRType_Object ||
-        in->type() == MIRType_Null ||
-        in->type() == MIRType_ObjectOrNull)
-    {
-        return true;
-    }
-
-    MToObjectOrNull *replace = MToObjectOrNull::New(alloc, in);
-    ins->block()->insertBefore(ins, replace);
-    ins->replaceOperand(Op, replace);
-
-    if (!BoxPolicy<0>::staticAdjustInputs(alloc, replace))
-        return false;
-
-    return true;
-}
-
-template bool ConvertToObjectOrNullPolicy<2>::staticAdjustInputs(TempAllocator &alloc,
-                                                                 MInstruction *ins);
-
-template <unsigned Op>
-bool
 IntPolicy<Op>::staticAdjustInputs(TempAllocator &alloc, MInstruction *def)
 {
     MDefinition *in = def->getOperand(Op);
@@ -842,8 +817,10 @@
 bool
 StoreTypedArrayPolicy::adjustInputs(TempAllocator &alloc, MInstruction *ins)
 {
+    SingleObjectPolicy::staticAdjustInputs(alloc, ins);
+
     MStoreTypedArrayElement *store = ins->toStoreTypedArrayElement();
-    MOZ_ASSERT(store->elements()->type() == MIRType_Elements);
+    MOZ_ASSERT(IsValidElementsType(store->elements(), store->offsetAdjustment()));
     MOZ_ASSERT(store->index()->type() == MIRType_Int32);
 
     return adjustValueInput(alloc, ins, store->arrayType(), store->value(), 2);
@@ -870,6 +847,41 @@
 }
 
 bool
+StoreUnboxedObjectOrNullPolicy::adjustInputs(TempAllocator &alloc, MInstruction *ins)
+{
+    SingleObjectPolicy::staticAdjustInputs(alloc, ins);
+
+    // Change the value input to a ToObjectOrNull instruction if it might be
+    // a non-null primitive. Insert a post barrier for the instruction's object
+    // and whatever its new value is, unless the value is definitely null.
+    MStoreUnboxedObjectOrNull *store = ins->toStoreUnboxedObjectOrNull();
+
+    MDefinition *value = store->value();
+    if (value->type() == MIRType_Object ||
+        value->type() == MIRType_Null ||
+        value->type() == MIRType_ObjectOrNull)
+    {
+        if (value->type() != MIRType_Null) {
+            MInstruction *barrier = MPostWriteBarrier::New(alloc, store->typedObj(), value);
+            store->block()->insertBefore(store, barrier);
+        }
+        return true;
+    }
+
+    MToObjectOrNull *replace = MToObjectOrNull::New(alloc, value);
+    store->block()->insertBefore(store, replace);
+    store->setValue(replace);
+
+    if (!BoxPolicy<0>::staticAdjustInputs(alloc, replace))
+        return false;
+
+    MInstruction *barrier = MPostWriteBarrier::New(alloc, store->typedObj(), replace);
+    store->block()->insertBefore(store, barrier);
+
+    return true;
+}
+
+bool
 ClampPolicy::adjustInputs(TempAllocator &alloc, MInstruction *ins)
 {
     MDefinition *in = ins->toClampToUint8()->input();
@@ -956,6 +968,7 @@
     _(StoreTypedArrayElementStaticPolicy)       \
     _(StoreTypedArrayHolePolicy)                \
     _(StoreTypedArrayPolicy)                    \
+    _(StoreUnboxedObjectOrNullPolicy)           \
     _(TestPolicy)                               \
     _(ToDoublePolicy)                           \
     _(ToInt32Policy)                            \
@@ -968,7 +981,6 @@
     _(ConvertToInt32Policy<0>)                                          \
     _(ConvertToStringPolicy<0>)                                         \
     _(ConvertToStringPolicy<2>)                                         \
-    _(ConvertToObjectOrNullPolicy<2>)                                   \
     _(DoublePolicy<0>)                                                  \
     _(FloatingPointPolicy<0>)                                           \
     _(IntPolicy<0>)                                                     \
@@ -993,6 +1005,7 @@
     _(MixPolicy<ObjectPolicy<0>, NoFloatPolicy<3> >)                    \
     _(MixPolicy<ObjectPolicy<0>, ObjectPolicy<1> >)                     \
     _(MixPolicy<ObjectPolicy<0>, StringPolicy<1> >)                     \
+    _(MixPolicy<ObjectPolicy<0>, ConvertToStringPolicy<2> >)            \
     _(MixPolicy<ObjectPolicy<1>, ConvertToStringPolicy<0> >)            \
     _(MixPolicy<StringPolicy<0>, IntPolicy<1> >)                        \
     _(MixPolicy<StringPolicy<0>, StringPolicy<1> >)                     \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/TypePolicy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/TypePolicy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/TypePolicy.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/TypePolicy.h	2014-11-26 21:45:57.000000000 +0000
@@ -148,19 +148,6 @@
     }
 };
 
-// Expect an object or null value for operand Op. Else a ToObjectOrNull
-// instruction is inserted.
-template <unsigned Op>
-class ConvertToObjectOrNullPolicy : public TypePolicy
-{
-  public:
-    EMPTY_DATA_;
-    static bool staticAdjustInputs(TempAllocator &alloc, MInstruction *def);
-    bool adjustInputs(TempAllocator &alloc, MInstruction *def) {
-        return staticAdjustInputs(alloc, def);
-    }
-};
-
 // Expect an Int for operand Op. If the input is a Value, it is unboxed.
 template <unsigned Op>
 class IntPolicy : public BoxInputsPolicy
@@ -397,6 +384,13 @@
     bool adjustInputs(TempAllocator &alloc, MInstruction *ins);
 };
 
+class StoreUnboxedObjectOrNullPolicy : public TypePolicy
+{
+  public:
+    EMPTY_DATA_;
+    bool adjustInputs(TempAllocator &alloc, MInstruction *def);
+};
+
 // Accepts integers and doubles. Everything else is boxed.
 class ClampPolicy : public BoxInputsPolicy
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/VMFunctions.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/VMFunctions.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/VMFunctions.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/VMFunctions.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -745,6 +745,11 @@
 bool
 DebugPrologue(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool *mustReturn)
 {
+    // Mark the BaselineFrame as a debuggee frame if necessary. This must be
+    // done dynamically, so we might as well do it here.
+    if (frame->script()->isDebuggee())
+        frame->setIsDebuggee();
+
     *mustReturn = false;
 
     switch (Debugger::onEnterFrame(cx, frame)) {
@@ -903,6 +908,24 @@
 }
 
 bool
+DebugAfterYield(JSContext *cx, BaselineFrame *frame)
+{
+    // The BaselineFrame has just been constructed by JSOP_RESUME in the
+    // caller. We need to set its debuggee flag as necessary.
+    if (frame->script()->isDebuggee())
+        frame->setIsDebuggee();
+    return true;
+}
+
+bool
+GeneratorThrowOrClose(JSContext *cx, BaselineFrame *frame, HandleObject obj, HandleValue arg,
+                      uint32_t resumeKind)
+{
+    MOZ_ALWAYS_TRUE(DebugAfterYield(cx, frame));
+    return js::GeneratorThrowOrClose(cx, obj, arg, resumeKind);
+}
+
+bool
 StrictEvalPrologue(JSContext *cx, BaselineFrame *frame)
 {
     return frame->strictEvalPrologue(cx);
@@ -963,7 +986,7 @@
     RootedScript script(cx, frame->script());
     jsbytecode *pc = script->baselineScript()->icEntryFromReturnAddress(retAddr).pc(script);
 
-    MOZ_ASSERT(cx->compartment()->debugMode());
+    MOZ_ASSERT(frame->isDebuggee());
     MOZ_ASSERT(script->stepModeEnabled() || script->hasBreakpointsAt(pc));
 
     RootedValue rval(cx);
@@ -1003,10 +1026,7 @@
 {
     *mustReturn = false;
 
-    RootedScript script(cx, frame->script());
-    RootedValue rval(cx);
-
-    switch (Debugger::onDebuggerStatement(cx, &rval)) {
+    switch (Debugger::onDebuggerStatement(cx, frame)) {
       case JSTRAP_ERROR:
         return false;
 
@@ -1014,12 +1034,10 @@
         return true;
 
       case JSTRAP_RETURN:
-        frame->setReturnValue(rval);
         *mustReturn = true;
         return jit::DebugEpilogue(cx, frame, pc, true);
 
       case JSTRAP_THROW:
-        cx->setPendingException(rval);
         return false;
 
       default:
@@ -1028,6 +1046,13 @@
 }
 
 bool
+GlobalHasLiveOnDebuggerStatement(JSContext *cx)
+{
+    return cx->compartment()->isDebuggee() &&
+           Debugger::hasLiveHook(cx->global(), Debugger::OnDebuggerStatement);
+}
+
+bool
 PushBlockScope(JSContext *cx, BaselineFrame *frame, Handle<StaticBlockObject *> block)
 {
     return frame->pushBlock(cx, block);
@@ -1043,10 +1068,9 @@
 bool
 DebugLeaveBlock(JSContext *cx, BaselineFrame *frame, jsbytecode *pc)
 {
-    MOZ_ASSERT(frame->script()->baselineScript()->debugMode());
-
-    DebugScopes::onPopBlock(cx, frame, pc);
-
+    MOZ_ASSERT(frame->script()->baselineScript()->hasDebugInstrumentation());
+    if (cx->compartment()->isDebuggee())
+        DebugScopes::onPopBlock(cx, frame, pc);
     return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/VMFunctions.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/VMFunctions.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/VMFunctions.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/VMFunctions.h	2014-11-26 21:45:57.000000000 +0000
@@ -41,6 +41,11 @@
     { }
 };
 
+enum MaybeTailCall {
+    TailCall,
+    NonTailCall
+};
+
 // Contains information about a virtual machine function that can be called
 // from JIT code. Functions described in this manner must conform to a simple
 // protocol: the return type must have a special "failure" value (for example,
@@ -123,6 +128,11 @@
     // wrapper.
     uint32_t extraValuesToPop;
 
+    // On some architectures, called functions need to explicitly push their
+    // return address, for a tail call, there is nothing to push, so tail-callness
+    // needs to be known at compile time.
+    MaybeTailCall expectTailCall;
+
     uint32_t argc() const {
         // JSContext * + args + (OutParam? *)
         return 1 + explicitArgc() + ((outParam == Type_Void) ? 0 : 1);
@@ -227,7 +237,8 @@
     VMFunction(void *wrapped, uint32_t explicitArgs, uint32_t argumentProperties,
                uint32_t argumentPassedInFloatRegs, uint64_t argRootTypes,
                DataType outParam, RootType outParamRootType, DataType returnType,
-               ExecutionMode executionMode, uint32_t extraValuesToPop = 0)
+               ExecutionMode executionMode, uint32_t extraValuesToPop = 0,
+               MaybeTailCall expectTailCall = NonTailCall)
       : wrapped(wrapped),
         explicitArgs(explicitArgs),
         argumentProperties(argumentProperties),
@@ -237,7 +248,8 @@
         argumentRootTypes(argRootTypes),
         outParamRootType(outParamRootType),
         executionMode(executionMode),
-        extraValuesToPop(extraValuesToPop)
+        extraValuesToPop(extraValuesToPop),
+        expectTailCall(expectTailCall)
     {
         // Check for valid failure/return type.
         MOZ_ASSERT_IF(outParam != Type_Void && executionMode == SequentialExecution,
@@ -503,12 +515,20 @@
     static inline uint64_t argumentRootTypes() {                                        \
         return ForEachNb(COMPUTE_ARG_ROOT, SEP_OR, NOTHING);                            \
     }                                                                                   \
+    explicit FunctionInfo(pf fun, MaybeTailCall expectTailCall,                         \
+                          PopValues extraValuesToPop = PopValues(0))                    \
+        : VMFunction(JS_FUNC_TO_DATA_PTR(void *, fun), explicitArgs(),                  \
+                     argumentProperties(), argumentPassedInFloatRegs(),                 \
+                     argumentRootTypes(), outParam(), outParamRootType(),               \
+                     returnType(), executionMode(),                                     \
+                     extraValuesToPop.numValues, expectTailCall)                        \
+    { }                                                                                 \
     explicit FunctionInfo(pf fun, PopValues extraValuesToPop = PopValues(0))            \
         : VMFunction(JS_FUNC_TO_DATA_PTR(void *, fun), explicitArgs(),                  \
                      argumentProperties(), argumentPassedInFloatRegs(),                 \
                      argumentRootTypes(), outParam(), outParamRootType(),               \
                      returnType(), executionMode(),                                     \
-                     extraValuesToPop.numValues)                                        \
+                     extraValuesToPop.numValues, NonTailCall)                           \
     { }
 
 template <typename Fun>
@@ -548,7 +568,13 @@
       : VMFunction(JS_FUNC_TO_DATA_PTR(void *, fun), explicitArgs(),
                    argumentProperties(), argumentPassedInFloatRegs(),
                    argumentRootTypes(), outParam(), outParamRootType(),
-                   returnType(), executionMode())
+                   returnType(), executionMode(), 0, NonTailCall)
+    { }
+    explicit FunctionInfo(pf fun, MaybeTailCall expectTailCall)
+      : VMFunction(JS_FUNC_TO_DATA_PTR(void *, fun), explicitArgs(),
+                   argumentProperties(), argumentPassedInFloatRegs(),
+                   argumentRootTypes(), outParam(), outParamRootType(),
+                   returnType(), executionMode(), 0, expectTailCall)
     { }
 };
 
@@ -712,6 +738,9 @@
 bool FinalSuspend(JSContext *cx, HandleObject obj, BaselineFrame *frame, jsbytecode *pc);
 bool InterpretResume(JSContext *cx, HandleObject obj, HandleValue val, HandlePropertyName kind,
                      MutableHandleValue rval);
+bool DebugAfterYield(JSContext *cx, BaselineFrame *frame);
+bool GeneratorThrowOrClose(JSContext *cx, BaselineFrame *frame, HandleObject obj, HandleValue arg,
+                           uint32_t resumeKind);
 
 bool StrictEvalPrologue(JSContext *cx, BaselineFrame *frame);
 bool HeavyweightFunPrologue(JSContext *cx, BaselineFrame *frame);
@@ -723,6 +752,7 @@
 
 bool HandleDebugTrap(JSContext *cx, BaselineFrame *frame, uint8_t *retAddr, bool *mustReturn);
 bool OnDebuggerStatement(JSContext *cx, BaselineFrame *frame, jsbytecode *pc, bool *mustReturn);
+bool GlobalHasLiveOnDebuggerStatement(JSContext *cx);
 
 bool EnterWith(JSContext *cx, BaselineFrame *frame, HandleValue val,
                Handle<StaticWithObject *> templ);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -258,11 +258,18 @@
     return true;
 }
 
+void
+CodeGeneratorX64::memoryBarrier(MemoryBarrierBits barrier)
+{
+    if (barrier & MembarStoreLoad)
+        masm.storeLoadFence();
+}
+
 bool
 CodeGeneratorX64::visitAsmJSLoadHeap(LAsmJSLoadHeap *ins)
 {
     MAsmJSLoadHeap *mir = ins->mir();
-    Scalar::Type vt = mir->viewType();
+    AsmJSHeapAccess::ViewType vt = mir->viewType();
     const LAllocation *ptr = ins->ptr();
     const LDefinition *out = ins->output();
     Operand srcAddr(HeapReg);
@@ -275,11 +282,11 @@
         srcAddr = Operand(HeapReg, ToRegister(ptr), TimesOne);
     }
 
+    memoryBarrier(ins->mir()->barrierBefore());
     OutOfLineLoadTypedArrayOutOfBounds *ool = nullptr;
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
     if (mir->needsBoundsCheck()) {
-        bool isFloat32Load = vt == Scalar::Float32;
-        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), isFloat32Load);
+        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), vt);
         if (!addOutOfLineCode(ool, ins->mir()))
             return false;
 
@@ -290,19 +297,22 @@
 
     uint32_t before = masm.size();
     switch (vt) {
-      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;
-      case Scalar::Uint16:  masm.movzwl(srcAddr, ToRegister(out)); break;
-      case Scalar::Int32:
-      case Scalar::Uint32:  masm.movl(srcAddr, ToRegister(out)); break;
-      case Scalar::Float32: masm.loadFloat32(srcAddr, ToFloatRegister(out)); break;
-      case Scalar::Float64: masm.loadDouble(srcAddr, ToFloatRegister(out)); break;
-      default: MOZ_CRASH("unexpected array type");
+      case AsmJSHeapAccess::Int8:      masm.movsbl(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Uint8:     masm.movzbl(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Int16:     masm.movswl(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Uint16:    masm.movzwl(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:    masm.movl(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Float32:   masm.loadFloat32(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Float64:   masm.loadDouble(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Float32x4: masm.loadUnalignedFloat32x4(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Int32x4:   masm.loadUnalignedInt32x4(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Uint8Clamped: MOZ_CRASH("unexpected array type");
     }
     uint32_t after = masm.size();
     if (ool)
         masm.bind(ool->rejoin());
+    memoryBarrier(ins->mir()->barrierAfter());
     masm.append(AsmJSHeapAccess(before, after, vt, ToAnyRegister(out), maybeCmpOffset));
     return true;
 }
@@ -311,7 +321,7 @@
 CodeGeneratorX64::visitAsmJSStoreHeap(LAsmJSStoreHeap *ins)
 {
     MAsmJSStoreHeap *mir = ins->mir();
-    Scalar::Type vt = mir->viewType();
+    AsmJSHeapAccess::ViewType vt = mir->viewType();
     const LAllocation *ptr = ins->ptr();
     Operand dstAddr(HeapReg);
 
@@ -323,6 +333,7 @@
         dstAddr = Operand(HeapReg, ToRegister(ptr), TimesOne);
     }
 
+    memoryBarrier(ins->mir()->barrierBefore());
     Label rejoin;
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
     if (mir->needsBoundsCheck()) {
@@ -334,31 +345,131 @@
     uint32_t before = masm.size();
     if (ins->value()->isConstant()) {
         switch (vt) {
-          case Scalar::Int8:
-          case Scalar::Uint8:   masm.movb(Imm32(ToInt32(ins->value())), dstAddr); break;
-          case Scalar::Int16:
-          case Scalar::Uint16:  masm.movw(Imm32(ToInt32(ins->value())), dstAddr); break;
-          case Scalar::Int32:
-          case Scalar::Uint32:  masm.movl(Imm32(ToInt32(ins->value())), dstAddr); break;
-          default: MOZ_CRASH("unexpected array type");
+          case AsmJSHeapAccess::Int8:
+          case AsmJSHeapAccess::Uint8:        masm.movb(Imm32(ToInt32(ins->value())), dstAddr); break;
+          case AsmJSHeapAccess::Int16:
+          case AsmJSHeapAccess::Uint16:       masm.movw(Imm32(ToInt32(ins->value())), dstAddr); break;
+          case AsmJSHeapAccess::Int32:
+          case AsmJSHeapAccess::Uint32:       masm.movl(Imm32(ToInt32(ins->value())), dstAddr); break;
+          case AsmJSHeapAccess::Float32:
+          case AsmJSHeapAccess::Float64:
+          case AsmJSHeapAccess::Float32x4:
+          case AsmJSHeapAccess::Int32x4:
+          case AsmJSHeapAccess::Uint8Clamped: MOZ_CRASH("unexpected array type");
         }
     } else {
         switch (vt) {
-          case Scalar::Int8:
-          case Scalar::Uint8:   masm.movb(ToRegister(ins->value()), dstAddr); break;
-          case Scalar::Int16:
-          case Scalar::Uint16:  masm.movw(ToRegister(ins->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;
-          default: MOZ_CRASH("unexpected array type");
+          case AsmJSHeapAccess::Int8:
+          case AsmJSHeapAccess::Uint8:        masm.movb(ToRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Int16:
+          case AsmJSHeapAccess::Uint16:       masm.movw(ToRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Int32:
+          case AsmJSHeapAccess::Uint32:       masm.movl(ToRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Float32:      masm.storeFloat32(ToFloatRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Float64:      masm.storeDouble(ToFloatRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Float32x4:    masm.storeUnalignedFloat32x4(ToFloatRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Int32x4:      masm.storeUnalignedInt32x4(ToFloatRegister(ins->value()), dstAddr); break;
+          case AsmJSHeapAccess::Uint8Clamped: MOZ_CRASH("unexpected array type");
         }
     }
     uint32_t after = masm.size();
     if (rejoin.used())
         masm.bind(&rejoin);
-    masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
+    memoryBarrier(ins->mir()->barrierAfter());
+    masm.append(AsmJSHeapAccess(before, after, vt, maybeCmpOffset));
+    return true;
+}
+
+bool
+CodeGeneratorX64::visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins)
+{
+    MAsmJSCompareExchangeHeap *mir = ins->mir();
+
+    MOZ_ASSERT(mir->viewType() <= AsmJSHeapAccess::Uint32);
+    Scalar::Type vt = Scalar::Type(mir->viewType());
+
+    const LAllocation *ptr = ins->ptr();
+
+    MOZ_ASSERT(ptr->isRegister());
+    BaseIndex srcAddr(HeapReg, ToRegister(ptr), TimesOne);
+
+    Register oldval = ToRegister(ins->oldValue());
+    Register newval = ToRegister(ins->newValue());
+
+    Label rejoin;
+    uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
+    MOZ_ASSERT(mir->needsBoundsCheck());
+    {
+        maybeCmpOffset = masm.cmplWithPatch(ToRegister(ptr), Imm32(0)).offset();
+        Label goahead;
+        masm.j(Assembler::LessThan, &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,
+                                        srcAddr,
+                                        oldval,
+                                        newval,
+                                        InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    uint32_t after = masm.size();
+    if (rejoin.used())
+        masm.bind(&rejoin);
+    masm.append(AsmJSHeapAccess(after, after, mir->viewType(), maybeCmpOffset));
+    return true;
+}
+
+bool
+CodeGeneratorX64::visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins)
+{
+    MAsmJSAtomicBinopHeap *mir = ins->mir();
+
+    MOZ_ASSERT(mir->viewType() <= AsmJSHeapAccess::Uint32);
+    Scalar::Type vt = Scalar::Type(mir->viewType());
+
+    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);
+
+    Label rejoin;
+    uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
+    MOZ_ASSERT(mir->needsBoundsCheck());
+    {
+        maybeCmpOffset = masm.cmplWithPatch(ToRegister(ptr), Imm32(0)).offset();
+        Label goahead;
+        masm.j(Assembler::LessThan, &goahead);
+        memoryBarrier(MembarFull);
+        Register out = ToRegister(ins->output());
+        masm.xorl(out,out);
+        masm.jmp(&rejoin);
+        masm.bind(&goahead);
+    }
+    if (value->isConstant()) {
+        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        Imm32(ToInt32(value)),
+                                        srcAddr,
+                                        temp,
+                                        InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    } else {
+        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        ToRegister(value),
+                                        srcAddr,
+                                        temp,
+                                        InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    }
+    uint32_t after = masm.size();
+    if (rejoin.used())
+        masm.bind(&rejoin);
+    masm.append(AsmJSHeapAccess(after, after, mir->viewType(), maybeCmpOffset));
     return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/CodeGenerator-x64.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/CodeGenerator-x64.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/CodeGenerator-x64.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/CodeGenerator-x64.h	2014-11-26 21:45:57.000000000 +0000
@@ -25,6 +25,7 @@
 
     void storeUnboxedValue(const LAllocation *value, MIRType valueType,
                            Operand dest, MIRType slotType);
+    void memoryBarrier(MemoryBarrierBits barrier);
 
   public:
     CodeGeneratorX64(MIRGenerator *gen, LIRGraph *graph, MacroAssembler *masm);
@@ -44,6 +45,8 @@
     bool visitAsmJSCall(LAsmJSCall *ins);
     bool visitAsmJSLoadHeap(LAsmJSLoadHeap *ins);
     bool visitAsmJSStoreHeap(LAsmJSStoreHeap *ins);
+    bool visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins);
+    bool visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins);
     bool visitAsmJSLoadGlobalVar(LAsmJSLoadGlobalVar *ins);
     bool visitAsmJSStoreGlobalVar(LAsmJSStoreGlobalVar *ins);
     bool visitAsmJSLoadFuncPtr(LAsmJSLoadFuncPtr *ins);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/Lowering-x64.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/Lowering-x64.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/Lowering-x64.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/Lowering-x64.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -50,6 +50,12 @@
 }
 
 LDefinition
+LIRGeneratorX64::tempByteOpRegister()
+{
+    return temp();
+}
+
+LDefinition
 LIRGeneratorX64::tempToUnbox()
 {
     return temp();
@@ -163,19 +169,21 @@
 
     LAsmJSStoreHeap *lir;
     switch (ins->viewType()) {
-      case Scalar::Int8:
-      case Scalar::Uint8:
-      case Scalar::Int16:
-      case Scalar::Uint16:
-      case Scalar::Int32:
-      case Scalar::Uint32:
+      case AsmJSHeapAccess::Int8:
+      case AsmJSHeapAccess::Uint8:
+      case AsmJSHeapAccess::Int16:
+      case AsmJSHeapAccess::Uint16:
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:
         lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useRegisterOrConstantAtStart(ins->value()));
         break;
-      case Scalar::Float32:
-      case Scalar::Float64:
+      case AsmJSHeapAccess::Float32:
+      case AsmJSHeapAccess::Float64:
+      case AsmJSHeapAccess::Float32x4:
+      case AsmJSHeapAccess::Int32x4:
         lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useRegisterAtStart(ins->value()));
         break;
-      default:
+      case AsmJSHeapAccess::Uint8Clamped:
         MOZ_CRASH("unexpected array type");
     }
 
@@ -189,6 +197,18 @@
 }
 
 bool
+LIRGeneratorX64::visitSubstr(MSubstr *ins)
+{
+    LSubstr *lir = new (alloc()) LSubstr(useRegister(ins->string()),
+                                         useRegister(ins->begin()),
+                                         useRegister(ins->length()),
+                                         temp(),
+                                         temp(),
+                                         tempByteOpRegister());
+    return define(lir, ins) && assignSafepoint(lir, ins);
+}
+
+bool
 LIRGeneratorX64::visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins)
 {
     MOZ_CRASH("NYI");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/Lowering-x64.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/Lowering-x64.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/Lowering-x64.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/Lowering-x64.h	2014-11-26 21:45:57.000000000 +0000
@@ -32,6 +32,7 @@
     // stores and loads; on x64 all registers are okay.
     LAllocation useByteOpRegister(MDefinition *mir);
     LAllocation useByteOpRegisterOrNonDoubleConstant(MDefinition *mir);
+    LDefinition tempByteOpRegister();
 
     LDefinition tempToUnbox();
 
@@ -53,6 +54,7 @@
     bool visitAsmJSStoreHeap(MAsmJSStoreHeap *ins);
     bool visitAsmJSLoadFuncPtr(MAsmJSLoadFuncPtr *ins);
     bool visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins);
+    bool visitSubstr(MSubstr *ins);
 
     static bool allowInlineForkJoinGetSlice() {
         return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/MacroAssembler-x64.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/MacroAssembler-x64.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x64/MacroAssembler-x64.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x64/MacroAssembler-x64.h	2014-11-26 21:45:57.000000000 +0000
@@ -552,8 +552,20 @@
     // Common interface.
     /////////////////////////////////////////////////////////////////
     void reserveStack(uint32_t amount) {
-        if (amount)
-            subq(Imm32(amount), StackPointer);
+        if (amount) {
+            // On windows, we cannot skip very far down the stack without touching the
+            // memory pages in-between.  This is a corner-case code for situations where the
+            // Ion frame data for a piece of code is very large.  To handle this special case,
+            // for frames over 1k in size we allocate memory on the stack incrementally, touching
+            // it as we go.
+            uint32_t amountLeft = amount;
+            while (amountLeft > 4096) {
+                subq(Imm32(4096), StackPointer);
+                store32(Imm32(0), Address(StackPointer, 0));
+                amountLeft -= 4096;
+            }
+            subq(Imm32(amountLeft), StackPointer);
+        }
         framePushed_ += amount;
     }
     void freeStack(uint32_t amount) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/Assembler-x86.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/Assembler-x86.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/Assembler-x86.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/Assembler-x86.h	2014-11-26 21:45:57.000000000 +0000
@@ -465,6 +465,16 @@
         masm.movsd_mr_disp32(src.offset, src.base.code(), dest.code());
         return CodeOffsetLabel(masm.currentOffset());
     }
+    CodeOffsetLabel movupsWithPatch(Address src, FloatRegister dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movups_mr_disp32(src.offset, src.base.code(), dest.code());
+        return CodeOffsetLabel(masm.currentOffset());
+    }
+    CodeOffsetLabel movdquWithPatch(Address src, FloatRegister dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movdqu_mr_disp32(src.offset, src.base.code(), dest.code());
+        return CodeOffsetLabel(masm.currentOffset());
+    }
 
     // Store to *(base + disp32) where disp32 can be patched.
     CodeOffsetLabel movbWithPatch(Register src, Address dest) {
@@ -489,6 +499,16 @@
         masm.movsd_rm_disp32(src.code(), dest.offset, dest.base.code());
         return CodeOffsetLabel(masm.currentOffset());
     }
+    CodeOffsetLabel movupsWithPatch(FloatRegister src, Address dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movups_rm_disp32(src.code(), dest.offset, dest.base.code());
+        return CodeOffsetLabel(masm.currentOffset());
+    }
+    CodeOffsetLabel movdquWithPatch(FloatRegister src, Address dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movdqu_rm_disp32(src.code(), dest.offset, dest.base.code());
+        return CodeOffsetLabel(masm.currentOffset());
+    }
 
     // Load from *(addr + index*scale) where addr can be patched.
     CodeOffsetLabel movlWithPatch(PatchedAbsoluteAddress addr, Register index, Scale scale,
@@ -534,11 +554,21 @@
         masm.movdqa_mr(src.addr, dest.code());
         return CodeOffsetLabel(masm.currentOffset());
     }
+    CodeOffsetLabel movdquWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movdqu_mr(src.addr, dest.code());
+        return CodeOffsetLabel(masm.currentOffset());
+    }
     CodeOffsetLabel movapsWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         masm.movaps_mr(src.addr, dest.code());
         return CodeOffsetLabel(masm.currentOffset());
     }
+    CodeOffsetLabel movupsWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movups_mr(src.addr, dest.code());
+        return CodeOffsetLabel(masm.currentOffset());
+    }
 
     // Store to *dest where dest can be patched.
     CodeOffsetLabel movbWithPatch(Register src, PatchedAbsoluteAddress dest) {
@@ -573,6 +603,16 @@
         masm.movaps_rm(src.code(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
+    CodeOffsetLabel movdquWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movdqu_rm(src.code(), dest.addr);
+        return CodeOffsetLabel(masm.currentOffset());
+    }
+    CodeOffsetLabel movupsWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
+        MOZ_ASSERT(HasSSE2());
+        masm.movups_rm(src.code(), dest.addr);
+        return CodeOffsetLabel(masm.currentOffset());
+    }
 
     void loadAsmJSActivation(Register dest) {
         CodeOffsetLabel label = movlWithPatch(PatchedAbsoluteAddress(), dest);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -267,26 +267,27 @@
 
 template<typename T>
 void
-CodeGeneratorX86::loadViewTypeElement(Scalar::Type vt, const T &srcAddr,
+CodeGeneratorX86::loadViewTypeElement(AsmJSHeapAccess::ViewType vt, const T &srcAddr,
                                       const LDefinition *out)
 {
     switch (vt) {
-      case Scalar::Int8:    masm.movsblWithPatch(srcAddr, ToRegister(out)); break;
-      case Scalar::Uint8Clamped:
-      case Scalar::Uint8:   masm.movzblWithPatch(srcAddr, ToRegister(out)); break;
-      case Scalar::Int16:   masm.movswlWithPatch(srcAddr, ToRegister(out)); break;
-      case Scalar::Uint16:  masm.movzwlWithPatch(srcAddr, ToRegister(out)); break;
-      case Scalar::Int32:
-      case Scalar::Uint32:  masm.movlWithPatch(srcAddr, ToRegister(out)); break;
-      case Scalar::Float32: masm.movssWithPatch(srcAddr, ToFloatRegister(out)); break;
-      case Scalar::Float64: masm.movsdWithPatch(srcAddr, ToFloatRegister(out)); break;
-      default: MOZ_CRASH("unexpected array type");
+      case AsmJSHeapAccess::Int8:         masm.movsblWithPatch(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Uint8Clamped:
+      case AsmJSHeapAccess::Uint8:        masm.movzblWithPatch(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Int16:        masm.movswlWithPatch(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Uint16:       masm.movzwlWithPatch(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:       masm.movlWithPatch(srcAddr, ToRegister(out)); break;
+      case AsmJSHeapAccess::Float32:      masm.movssWithPatch(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Float64:      masm.movsdWithPatch(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Float32x4:    masm.movupsWithPatch(srcAddr, ToFloatRegister(out)); break;
+      case AsmJSHeapAccess::Int32x4:      masm.movdquWithPatch(srcAddr, ToFloatRegister(out)); break;
     }
 }
 
 template<typename T>
 bool
-CodeGeneratorX86::loadAndNoteViewTypeElement(Scalar::Type vt, const T &srcAddr,
+CodeGeneratorX86::loadAndNoteViewTypeElement(AsmJSHeapAccess::ViewType vt, const T &srcAddr,
                                              const LDefinition *out)
 {
     uint32_t before = masm.size();
@@ -300,16 +301,15 @@
 CodeGeneratorX86::visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic *ins)
 {
     const MLoadTypedArrayElementStatic *mir = ins->mir();
-    Scalar::Type vt = mir->viewType();
-    MOZ_ASSERT_IF(vt == Scalar::Float32, mir->type() == MIRType_Float32);
+    AsmJSHeapAccess::ViewType vt = AsmJSHeapAccess::ViewType(mir->viewType());
+    MOZ_ASSERT_IF(vt == AsmJSHeapAccess::Float32, mir->type() == MIRType_Float32);
 
     Register ptr = ToRegister(ins->ptr());
     const LDefinition *out = ins->output();
 
     OutOfLineLoadTypedArrayOutOfBounds *ool = nullptr;
-    bool isFloat32Load = (vt == Scalar::Float32);
     if (!mir->fallible()) {
-        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), isFloat32Load);
+        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), vt);
         if (!addOutOfLineCode(ool, ins->mir()))
             return false;
     }
@@ -322,9 +322,9 @@
 
     Address srcAddr(ptr, (int32_t) mir->base());
     loadViewTypeElement(vt, srcAddr, out);
-    if (vt == Scalar::Float64)
+    if (vt == AsmJSHeapAccess::Float64)
         masm.canonicalizeDouble(ToFloatRegister(out));
-    if (vt == Scalar::Float32)
+    if (vt == AsmJSHeapAccess::Float32)
         masm.canonicalizeFloat(ToFloatRegister(out));
     if (ool)
         masm.bind(ool->rejoin());
@@ -358,31 +358,44 @@
     return true;
 }
 
+void
+CodeGeneratorX86::memoryBarrier(MemoryBarrierBits barrier)
+{
+    if (barrier & MembarStoreLoad)
+        masm.storeLoadFence();
+}
+
 bool
 CodeGeneratorX86::visitAsmJSLoadHeap(LAsmJSLoadHeap *ins)
 {
     const MAsmJSLoadHeap *mir = ins->mir();
-    Scalar::Type vt = mir->viewType();
+    AsmJSHeapAccess::ViewType vt = mir->viewType();
     const LAllocation *ptr = ins->ptr();
     const LDefinition *out = ins->output();
 
+    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());
-        return loadAndNoteViewTypeElement(vt, srcAddr, out);
+        loadAndNoteViewTypeElement(vt, srcAddr, out);
+        memoryBarrier(ins->mir()->barrierAfter());
+        return true;
     }
 
     Register ptrReg = ToRegister(ptr);
     Address srcAddr(ptrReg, 0);
 
-    if (!mir->needsBoundsCheck())
-        return loadAndNoteViewTypeElement(vt, srcAddr, out);
+    if (!mir->needsBoundsCheck()) {
+        loadAndNoteViewTypeElement(vt, srcAddr, out);
+        memoryBarrier(ins->mir()->barrierAfter());
+        return true;
+    }
 
-    bool isFloat32Load = vt == Scalar::Float32;
-    OutOfLineLoadTypedArrayOutOfBounds *ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), isFloat32Load);
+    OutOfLineLoadTypedArrayOutOfBounds *ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), vt);
     if (!addOutOfLineCode(ool, mir))
         return false;
 
@@ -393,45 +406,47 @@
     loadViewTypeElement(vt, srcAddr, out);
     uint32_t after = masm.size();
     masm.bind(ool->rejoin());
+    memoryBarrier(ins->mir()->barrierAfter());
     masm.append(AsmJSHeapAccess(before, after, vt, ToAnyRegister(out), cmp.offset()));
     return true;
 }
 
 template<typename T>
 void
-CodeGeneratorX86::storeViewTypeElement(Scalar::Type vt, const LAllocation *value,
+CodeGeneratorX86::storeViewTypeElement(AsmJSHeapAccess::ViewType vt, const LAllocation *value,
                                        const T &dstAddr)
 {
     switch (vt) {
-      case Scalar::Int8:
-      case Scalar::Uint8Clamped:
-      case Scalar::Uint8:   masm.movbWithPatch(ToRegister(value), dstAddr); break;
-      case Scalar::Int16:
-      case Scalar::Uint16:  masm.movwWithPatch(ToRegister(value), dstAddr); break;
-      case Scalar::Int32:
-      case Scalar::Uint32:  masm.movlWithPatch(ToRegister(value), dstAddr); break;
-      case Scalar::Float32: masm.movssWithPatch(ToFloatRegister(value), dstAddr); break;
-      case Scalar::Float64: masm.movsdWithPatch(ToFloatRegister(value), dstAddr); break;
-      default: MOZ_CRASH("unexpected array type");
+      case AsmJSHeapAccess::Int8:
+      case AsmJSHeapAccess::Uint8Clamped:
+      case AsmJSHeapAccess::Uint8:        masm.movbWithPatch(ToRegister(value), dstAddr); break;
+      case AsmJSHeapAccess::Int16:
+      case AsmJSHeapAccess::Uint16:       masm.movwWithPatch(ToRegister(value), dstAddr); break;
+      case AsmJSHeapAccess::Int32:
+      case AsmJSHeapAccess::Uint32:       masm.movlWithPatch(ToRegister(value), dstAddr); break;
+      case AsmJSHeapAccess::Float32:      masm.movssWithPatch(ToFloatRegister(value), dstAddr); break;
+      case AsmJSHeapAccess::Float64:      masm.movsdWithPatch(ToFloatRegister(value), dstAddr); break;
+      case AsmJSHeapAccess::Float32x4:    masm.movupsWithPatch(ToFloatRegister(value), dstAddr); break;
+      case AsmJSHeapAccess::Int32x4:      masm.movdquWithPatch(ToFloatRegister(value), dstAddr); break;
     }
 }
 
 template<typename T>
 void
-CodeGeneratorX86::storeAndNoteViewTypeElement(Scalar::Type vt, const LAllocation *value,
-                                              const T &dstAddr)
+CodeGeneratorX86::storeAndNoteViewTypeElement(AsmJSHeapAccess::ViewType vt,
+                                              const LAllocation *value, const T &dstAddr)
 {
     uint32_t before = masm.size();
     storeViewTypeElement(vt, value, dstAddr);
     uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after));
+    masm.append(AsmJSHeapAccess(before, after, vt));
 }
 
 bool
 CodeGeneratorX86::visitStoreTypedArrayElementStatic(LStoreTypedArrayElementStatic *ins)
 {
     MStoreTypedArrayElementStatic *mir = ins->mir();
-    Scalar::Type vt = mir->viewType();
+    AsmJSHeapAccess::ViewType vt = AsmJSHeapAccess::ViewType(mir->viewType());
 
     Register ptr = ToRegister(ins->ptr());
     const LAllocation *value = ins->value();
@@ -450,10 +465,12 @@
 CodeGeneratorX86::visitAsmJSStoreHeap(LAsmJSStoreHeap *ins)
 {
     MAsmJSStoreHeap *mir = ins->mir();
-    Scalar::Type vt = mir->viewType();
+    AsmJSHeapAccess::ViewType vt = mir->viewType();
     const LAllocation *value = ins->value();
     const LAllocation *ptr = ins->ptr();
 
+    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
@@ -461,6 +478,7 @@
         // base address is known during dynamic linking (AsmJSModule::initHeap).
         PatchedAbsoluteAddress dstAddr((void *) ptr->toConstant()->toInt32());
         storeAndNoteViewTypeElement(vt, value, dstAddr);
+        memoryBarrier(ins->mir()->barrierAfter());
         return true;
     }
 
@@ -469,6 +487,7 @@
 
     if (!mir->needsBoundsCheck()) {
         storeAndNoteViewTypeElement(vt, value, dstAddr);
+        memoryBarrier(ins->mir()->barrierAfter());
         return true;
     }
 
@@ -480,7 +499,118 @@
     storeViewTypeElement(vt, value, dstAddr);
     uint32_t after = masm.size();
     masm.bind(&rejoin);
-    masm.append(AsmJSHeapAccess(before, after, cmp.offset()));
+    memoryBarrier(ins->mir()->barrierAfter());
+    masm.append(AsmJSHeapAccess(before, after, vt, cmp.offset()));
+    return true;
+}
+
+bool
+CodeGeneratorX86::visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins)
+{
+    MAsmJSCompareExchangeHeap *mir = ins->mir();
+
+    MOZ_ASSERT(mir->viewType() <= AsmJSHeapAccess::Uint32);
+    Scalar::Type vt = Scalar::Type(mir->viewType());
+
+    const LAllocation *ptr = ins->ptr();
+    Register oldval = ToRegister(ins->oldValue());
+    Register newval = ToRegister(ins->newValue());
+
+    MOZ_ASSERT(ptr->isRegister());
+    // Set up the offset within the heap in the pointer reg.
+    Register ptrReg = ToRegister(ptr);
+
+    Label rejoin;
+    uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
+
+    if (mir->needsBoundsCheck()) {
+        maybeCmpOffset = masm.cmplWithPatch(ptrReg, Imm32(0)).offset();
+        Label goahead;
+        masm.j(Assembler::LessThan, &goahead);
+        memoryBarrier(MembarFull);
+        Register out = ToRegister(ins->output());
+        masm.xorl(out,out);
+        masm.jmp(&rejoin);
+        masm.bind(&goahead);
+    }
+
+    // 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.addl_wide(Imm32(0), ptrReg);
+    uint32_t after = masm.size();
+    masm.append(AsmJSHeapAccess(before, after, mir->viewType(), maybeCmpOffset));
+
+    Address memAddr(ToRegister(ptr), 0);
+    masm.compareExchangeToTypedIntArray(vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        memAddr,
+                                        oldval,
+                                        newval,
+                                        InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    if (rejoin.used())
+        masm.bind(&rejoin);
+
+    return true;
+}
+
+bool
+CodeGeneratorX86::visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins)
+{
+    MAsmJSAtomicBinopHeap *mir = ins->mir();
+
+    MOZ_ASSERT(mir->viewType() <= AsmJSHeapAccess::Uint32);
+    Scalar::Type vt = Scalar::Type(mir->viewType());
+
+    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());
+    // Set up the offset within the heap in the pointer reg.
+    Register ptrReg = ToRegister(ptr);
+
+    Label rejoin;
+    uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
+
+    if (mir->needsBoundsCheck()) {
+        maybeCmpOffset = masm.cmplWithPatch(ptrReg, Imm32(0)).offset();
+        Label goahead;
+        masm.j(Assembler::LessThan, &goahead);
+        memoryBarrier(MembarFull);
+        Register out = ToRegister(ins->output());
+        masm.xorl(out,out);
+        masm.jmp(&rejoin);
+        masm.bind(&goahead);
+    }
+
+    // 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.addl_wide(Imm32(0), ptrReg);
+    uint32_t after = masm.size();
+    masm.append(AsmJSHeapAccess(before, after, mir->viewType(), maybeCmpOffset));
+
+    Address memAddr(ptrReg, 0);
+    if (value->isConstant()) {
+        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        Imm32(ToInt32(value)),
+                                        memAddr,
+                                        temp,
+                                        InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    } else {
+        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+                                        ToRegister(value),
+                                        memAddr,
+                                        temp,
+                                        InvalidReg,
+                                        ToAnyRegister(ins->output()));
+    }
+    if (rejoin.used())
+        masm.bind(&rejoin);
+
     return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/CodeGenerator-x86.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/CodeGenerator-x86.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/CodeGenerator-x86.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/CodeGenerator-x86.h	2014-11-26 21:45:57.000000000 +0000
@@ -29,17 +29,20 @@
     ValueOperand ToTempValue(LInstruction *ins, size_t pos);
 
     template<typename T>
-    bool loadAndNoteViewTypeElement(Scalar::Type vt, const T &srcAddr,
-                             const LDefinition *out);
+    bool loadAndNoteViewTypeElement(AsmJSHeapAccess::ViewType vt, const T &srcAddr,
+                                    const LDefinition *out);
     template<typename T>
-    void loadViewTypeElement(Scalar::Type vt, const T &srcAddr,
-                                       const LDefinition *out);
+    void loadViewTypeElement(AsmJSHeapAccess::ViewType vt, const T &srcAddr,
+                             const LDefinition *out);
     template<typename T>
-    void storeAndNoteViewTypeElement(Scalar::Type vt, const LAllocation *value,
+    void storeAndNoteViewTypeElement(AsmJSHeapAccess::ViewType vt, const LAllocation *value,
                                      const T &dstAddr);
     template<typename T>
-    void storeViewTypeElement(Scalar::Type vt, const LAllocation *value,
+    void storeViewTypeElement(AsmJSHeapAccess::ViewType vt, const LAllocation *value,
                               const T &dstAddr);
+
+    void memoryBarrier(MemoryBarrierBits barrier);
+
   public:
     CodeGeneratorX86(MIRGenerator *gen, LIRGraph *graph, MacroAssembler *masm);
 
@@ -61,6 +64,8 @@
     bool visitAsmJSCall(LAsmJSCall *ins);
     bool visitAsmJSLoadHeap(LAsmJSLoadHeap *ins);
     bool visitAsmJSStoreHeap(LAsmJSStoreHeap *ins);
+    bool visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins);
+    bool visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins);
     bool visitAsmJSLoadGlobalVar(LAsmJSLoadGlobalVar *ins);
     bool visitAsmJSStoreGlobalVar(LAsmJSStoreGlobalVar *ins);
     bool visitAsmJSLoadFuncPtr(LAsmJSLoadFuncPtr *ins);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/Lowering-x86.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/Lowering-x86.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/Lowering-x86.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/Lowering-x86.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -76,6 +76,12 @@
     return useFixed(mir, eax);
 }
 
+LDefinition
+LIRGeneratorX86::tempByteOpRegister()
+{
+    return tempFixed(eax);
+}
+
 bool
 LIRGeneratorX86::visitBox(MBox *box)
 {
@@ -243,34 +249,38 @@
         MOZ_ASSERT(ptrValue >= 0);
         LAllocation ptrAlloc = LAllocation(ptr->toConstant()->vp());
         switch (ins->viewType()) {
-          case Scalar::Int8: case Scalar::Uint8:
+          case AsmJSHeapAccess::Int8: case AsmJSHeapAccess::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 AsmJSHeapAccess::Int16: case AsmJSHeapAccess::Uint16:
+          case AsmJSHeapAccess::Int32: case AsmJSHeapAccess::Uint32:
+          case AsmJSHeapAccess::Float32: case AsmJSHeapAccess::Float64:
+          case AsmJSHeapAccess::Float32x4: case AsmJSHeapAccess::Int32x4:
             // See comment below.
             lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useRegisterAtStart(ins->value()));
             break;
-          default: MOZ_CRASH("unexpected array type");
+          case AsmJSHeapAccess::Uint8Clamped:
+            MOZ_CRASH("unexpected array type");
         }
         return add(lir, ins);
     }
 
     switch (ins->viewType()) {
-      case Scalar::Int8: case Scalar::Uint8:
+      case AsmJSHeapAccess::Int8: case AsmJSHeapAccess::Uint8:
         // See comment for LIRGeneratorX86::useByteOpRegister.
         lir = new(alloc()) LAsmJSStoreHeap(useRegister(ins->ptr()), useFixed(ins->value(), eax));
         break;
-      case Scalar::Int16: case Scalar::Uint16:
-      case Scalar::Int32: case Scalar::Uint32:
-      case Scalar::Float32: case Scalar::Float64:
+      case AsmJSHeapAccess::Int16: case AsmJSHeapAccess::Uint16:
+      case AsmJSHeapAccess::Int32: case AsmJSHeapAccess::Uint32:
+      case AsmJSHeapAccess::Float32: case AsmJSHeapAccess::Float64:
+      case AsmJSHeapAccess::Float32x4: case AsmJSHeapAccess::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()));
         break;
-      default: MOZ_CRASH("unexpected array type");
+      case AsmJSHeapAccess::Uint8Clamped:
+        MOZ_CRASH("unexpected array type");
     }
 
     return add(lir, ins);
@@ -305,3 +315,18 @@
 {
     return define(new(alloc()) LAsmJSLoadFuncPtr(useRegisterAtStart(ins->index())), ins);
 }
+
+bool
+LIRGeneratorX86::visitSubstr(MSubstr *ins)
+{
+    // Due to lack of registers on x86, we reuse the string register as
+    // temporary. As a result we only need two temporary registers and take a
+    // bugos temporary as fifth argument.
+    LSubstr *lir = new (alloc()) LSubstr(useRegister(ins->string()),
+                                         useRegister(ins->begin()),
+                                         useRegister(ins->length()),
+                                         temp(),
+                                         LDefinition::BogusTemp(),
+                                         tempByteOpRegister());
+    return define(lir, ins) && assignSafepoint(lir, ins);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/Lowering-x86.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/Lowering-x86.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/Lowering-x86.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/Lowering-x86.h	2014-11-26 21:45:57.000000000 +0000
@@ -33,6 +33,7 @@
     // give us one of {al,bl,cl,dl}. For now, just useFixed(al).
     LAllocation useByteOpRegister(MDefinition *mir);
     LAllocation useByteOpRegisterOrNonDoubleConstant(MDefinition *mir);
+    LDefinition tempByteOpRegister();
 
     inline LDefinition tempToUnbox() {
         return LDefinition::BogusTemp();
@@ -55,6 +56,7 @@
     bool visitAsmJSStoreHeap(MAsmJSStoreHeap *ins);
     bool visitAsmJSLoadFuncPtr(MAsmJSLoadFuncPtr *ins);
     bool visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins);
+    bool visitSubstr(MSubstr *ins);
     bool lowerPhi(MPhi *phi);
 
     static bool allowTypedElementHoleCheck() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/MacroAssembler-x86.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/MacroAssembler-x86.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit/x86/MacroAssembler-x86.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit/x86/MacroAssembler-x86.h	2014-11-26 21:45:57.000000000 +0000
@@ -565,8 +565,20 @@
     // Common interface.
     /////////////////////////////////////////////////////////////////
     void reserveStack(uint32_t amount) {
-        if (amount)
-            subl(Imm32(amount), StackPointer);
+        if (amount) {
+            // On windows, we cannot skip very far down the stack without touching the
+            // memory pages in-between.  This is a corner-case code for situations where the
+            // Ion frame data for a piece of code is very large.  To handle this special case,
+            // for frames over 1k in size we allocate memory on the stack incrementally, touching
+            // it as we go.
+            uint32_t amountLeft = amount;
+            while (amountLeft > 4096) {
+                subl(Imm32(4096), StackPointer);
+                store32(Imm32(0), Address(StackPointer, 0));
+                amountLeft -= 4096;
+            }
+            subl(Imm32(amountLeft), StackPointer);
+        }
         framePushed_ += amount;
     }
     void freeStack(uint32_t amount) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/jit_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/jit_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/jit_test.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/jit_test.py	2014-11-26 21:45:54.000000000 +0000
@@ -52,6 +52,10 @@
                   action='store_true', help='show command lines of failed tests')
     op.add_option('-o', '--show-output', dest='show_output', action='store_true',
                   help='show output from js shell')
+    op.add_option('-F', '--failed-only', dest='failed_only', action='store_true',
+                  help="if --show-output is given, only print output for failed tests")
+    op.add_option('--no-show-failed', dest='no_show_failed', action='store_true',
+                  help="don't print output for failed tests (no-op with --show-output)")
     op.add_option('-x', '--exclude', dest='exclude', action='append',
                   help='exclude given test dir or path')
     op.add_option('--slow', dest='run_slow', action='store_true',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/lib/evalInFrame.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/lib/evalInFrame.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/lib/evalInFrame.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/lib/evalInFrame.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,32 @@
+var evalInFrame = (function (global) {
+  var dbgGlobal = newGlobal();
+  var dbg = new dbgGlobal.Debugger();
+
+  return function evalInFrame(upCount, code) {
+    dbg.addDebuggee(global);
+
+    // Skip ourself.
+    var frame = dbg.getNewestFrame().older;
+    for (var i = 0; i < upCount; i++) {
+      if (!frame.older)
+        break;
+      frame = frame.older;
+    }
+
+    var completion = frame.eval(code);
+    if (completion.return) {
+      var v = completion.return;
+      if (typeof v === "object")
+        v = v.unsafeDereference();
+      return v;
+    }
+    if (completion.throw) {
+      var v = completion.throw;
+      if (typeof v === "object")
+        v = v.unsafeDereference();
+      throw v;
+    }
+    if (completion === null)
+      terminate();
+  };
+})(this);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testAtomics.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testAtomics.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testAtomics.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testAtomics.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,253 @@
+if (!this.SharedArrayBuffer || !this.SharedInt32Array || !this.Atomics)
+    quit();
+
+function loadModule_int32(stdlib, foreign, heap) {
+    "use asm";
+
+    var atomic_fence = stdlib.Atomics.fence;
+    var atomic_load = stdlib.Atomics.load;
+    var atomic_store = stdlib.Atomics.store;
+    var atomic_cmpxchg = stdlib.Atomics.compareExchange;
+    var atomic_add = stdlib.Atomics.add;
+    var atomic_sub = stdlib.Atomics.sub;
+    var atomic_and = stdlib.Atomics.and;
+    var atomic_or = stdlib.Atomics.or;
+    var atomic_xor = stdlib.Atomics.xor;
+
+    var i32a = new stdlib.SharedInt32Array(heap);
+
+    function do_fence() {
+	atomic_fence();
+    }
+
+    // Load element 0
+    function do_load() {
+	var v = 0;
+	v = atomic_load(i32a, 0);
+	return v|0;
+    }
+
+    // Load element i
+    function do_load_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_load(i32a, i>>2);
+	return v|0;
+    }
+
+    // Store 37 in element 0
+    function do_store() {
+	var v = 0;
+	v = atomic_store(i32a, 0, 37);
+	return v|0;
+    }
+
+    // Store 37 in element i
+    function do_store_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_store(i32a, i>>2, 37);
+	return v|0;
+    }
+
+    // Add 37 to element 10
+    function do_add() {
+	var v = 0;
+	v = atomic_add(i32a, 10, 37);
+	return v|0;
+    }
+
+    // Add 37 to element i
+    function do_add_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_add(i32a, i>>2, 37);
+	return v|0;
+    }
+
+    // Subtract 148 from element 20
+    function do_sub() {
+	var v = 0;
+	v = atomic_sub(i32a, 20, 148);
+	return v|0;
+    }
+
+    // Subtract 148 from element i
+    function do_sub_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_sub(i32a, i>>2, 148);
+	return v|0;
+    }
+
+    // AND 0x33333333 into element 30
+    function do_and() {
+	var v = 0;
+	v = atomic_and(i32a, 30, 0x33333333);
+	return v|0;
+    }
+
+    // AND 0x33333333 into element i
+    function do_and_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_and(i32a, i>>2, 0x33333333);
+	return v|0;
+    }
+
+    // OR 0x33333333 into element 40
+    function do_or() {
+	var v = 0;
+	v = atomic_or(i32a, 40, 0x33333333);
+	return v|0;
+    }
+
+    // OR 0x33333333 into element i
+    function do_or_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_or(i32a, i>>2, 0x33333333);
+	return v|0;
+    }
+
+    // XOR 0x33333333 into element 50
+    function do_xor() {
+	var v = 0;
+	v = atomic_xor(i32a, 50, 0x33333333);
+	return v|0;
+    }
+
+    // XOR 0x33333333 into element i
+    function do_xor_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_xor(i32a, i>>2, 0x33333333);
+	return v|0;
+    }
+
+    // CAS element 100: 0 -> -1
+    function do_cas1() {
+	var v = 0;
+	v = atomic_cmpxchg(i32a, 100, 0, -1);
+	return v|0;
+    }
+
+    // CAS element 100: -1 -> 0x5A5A5A5A
+    function do_cas2() {
+	var v = 0;
+	v = atomic_cmpxchg(i32a, 100, -1, 0x5A5A5A5A);
+	return v|0;
+    }
+
+    // CAS element i: 0 -> -1
+    function do_cas1_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_cmpxchg(i32a, i>>2, 0, -1);
+	return v|0;
+    }
+
+    // CAS element i: -1 -> 0x5A5A5A5A
+    function do_cas2_i(i) {
+	i = i|0;
+	var v = 0;
+	v = atomic_cmpxchg(i32a, i>>2, -1, 0x5A5A5A5A);
+	return v|0;
+    }
+
+    return { fence: do_fence,
+	     load: do_load,
+	     load_i: do_load_i,
+	     store: do_store,
+	     store_i: do_store_i,
+	     add: do_add,
+	     add_i: do_add_i,
+	     sub: do_sub,
+	     sub_i: do_sub_i,
+	     and: do_and,
+	     and_i: do_and_i,
+	     or: do_or,
+	     or_i: do_or_i,
+	     xor: do_xor,
+	     xor_i: do_xor_i,
+	     cas1: do_cas1,
+	     cas2: do_cas2,
+	     cas1_i: do_cas1_i,
+	     cas2_i: do_cas2_i };
+}
+
+// TODO: byte arrays
+// TODO: halfword arrays
+// TODO: signed vs unsigned; negative results
+
+var heap = new SharedArrayBuffer(65536);
+var i32a = new SharedInt32Array(heap);
+var module = loadModule_int32(this, {}, heap);
+
+var size = 4;
+
+module.fence();
+
+i32a[0] = 12345;
+assertEq(module.load(), 12345);
+assertEq(module.load_i(size*0), 12345);
+
+assertEq(module.store(), 37);
+assertEq(i32a[0], 37);
+assertEq(module.store_i(size*0), 37);
+
+i32a[10] = 18;
+assertEq(module.add(), 18);
+assertEq(i32a[10], 18+37);
+assertEq(module.add_i(size*10), 18+37);
+assertEq(i32a[10], 18+37+37);
+
+i32a[20] = 4972;
+assertEq(module.sub(), 4972);
+assertEq(i32a[20], 4972 - 148);
+assertEq(module.sub_i(size*20), 4972 - 148);
+assertEq(i32a[20], 4972 - 148 - 148);
+
+i32a[30] = 0x66666666;
+assertEq(module.and(), 0x66666666);
+assertEq(i32a[30], 0x22222222);
+i32a[30] = 0x66666666;
+assertEq(module.and_i(size*30), 0x66666666);
+assertEq(i32a[30], 0x22222222);
+
+i32a[40] = 0x22222222;
+assertEq(module.or(), 0x22222222);
+assertEq(i32a[40], 0x33333333);
+i32a[40] = 0x22222222;
+assertEq(module.or_i(size*40), 0x22222222);
+assertEq(i32a[40], 0x33333333);
+
+i32a[50] = 0x22222222;
+assertEq(module.xor(), 0x22222222);
+assertEq(i32a[50], 0x11111111);
+i32a[50] = 0x22222222;
+assertEq(module.xor_i(size*50), 0x22222222);
+assertEq(i32a[50], 0x11111111);
+
+i32a[100] = 0;
+assertEq(module.cas1(), 0);
+assertEq(module.cas2(), -1);
+assertEq(i32a[100], 0x5A5A5A5A);
+
+i32a[100] = 0;
+assertEq(module.cas1_i(size*100), 0);
+assertEq(module.cas2_i(size*100), -1);
+assertEq(i32a[100], 0x5A5A5A5A);
+
+// Out-of-bounds accesses.
+
+assertEq(module.cas1_i(size*20000), 0);
+assertEq(module.cas2_i(size*20000), 0);
+
+assertEq(module.or_i(size*20001), 0);
+assertEq(module.xor_i(size*20001), 0);
+assertEq(module.and_i(size*20001), 0);
+assertEq(module.add_i(size*20001), 0);
+assertEq(module.sub_i(size*20001), 0);
+
+print("Done");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testBug1100237.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testBug1100237.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testBug1100237.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testBug1100237.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,33 @@
+load(libdir + "asm.js");
+
+var byteLength = Function.prototype.call.bind(
+    Object.getOwnPropertyDescriptor(ArrayBuffer.prototype, "byteLength").get
+);
+var m = asmCompile("glob", "s", "b", `
+    "use asm";
+    var I32 = glob.Int32Array;
+    var i32 = new I32(b);
+    var len = glob.byteLength;
+    function ch(b2) {
+        if (len(b2) & 0xffffff || len(b2) <= 0xffffff || len(b2) > 80000000) {
+            return false;
+        }
+        i32 = new I32(b2);
+        b = b2;
+        return true
+    }
+    function get(i) {
+        i = i | 0;
+        return i32[i >> 2] | 0
+    }
+    return {
+        get: get,
+        changeHeap: ch
+    }
+`);
+var buf1 = new ArrayBuffer(16777216)
+var { get, changeHeap } = asmLink(m, this, null, buf1)
+assertEq(changeHeap(new ArrayBuffer(33554432)), true)
+assertEq(get(), 0)
+assertEq(changeHeap(buf1), true);
+get();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js	2014-11-26 21:45:54.000000000 +0000
@@ -13,15 +13,9 @@
 assertAsmTypeFail(USE_ASM + "var i=1.2; function f(){ return i|0 } return f");
 assertAsmTypeFail(USE_ASM + "const i=1.2; function f(){ return i|0 } return f");
 assertAsmTypeFail(USE_ASM + "var i=0; function f(e){ e=+e; i=e } return f");
-assertAsmTypeFail(USE_ASM + "const i=0; function f(e){ e=+e; i=e } return f");
 assertAsmTypeFail(USE_ASM + "var d=0.1; function f(i){ i=i|0; d=i } return f");
-assertAsmTypeFail(USE_ASM + "const d=0.1; function f(i){ i=i|0; d=i } return f");
 assertEq(asmLink(asmCompile(USE_ASM + "var i=13; function f(j) { j=j|0; i=j; return i|0 } return f"))(42), 42);
-assertAsmTypeFail(USE_ASM + "const i=13; function f(j) { j=j|0; i=j; return i|0 } return f");
-assertAsmTypeFail(USE_ASM + "const c=0,i=13; function f(j) { j=j|0; i=j; return i|0 } return f");
 assertEq(asmLink(asmCompile(USE_ASM + "var d=.1; function f(e) { e=+e; d=e; return +e } return f"))(42.1), 42.1);
-assertAsmTypeFail(USE_ASM + "const d=.1; function f(e) { e=+e; d=e; return +e } return f");
-assertAsmTypeFail(USE_ASM + "const c=0, d=.1; function f(e) { e=+e; d=e; return +e } return f");
 assertEq(asmLink(asmCompile(USE_ASM + "var i=13; function f(i, j) { i=i|0; j=j|0; i=j; return i|0 } return f"))(42,43), 43);
 assertEq(asmLink(asmCompile(USE_ASM + "var i=13; function f(j) { j=j|0; var i=0; i=j; return i|0 } return f"))(42), 42);
 
@@ -61,7 +55,6 @@
 assertAsmTypeFail('global', USE_ASM + "const i=global.i|0; function f() { return i|0 } return f");
 assertAsmTypeFail('global', USE_ASM + "var i=global.i|0; function f() { return i|0 } return f");
 assertAsmTypeFail('global', USE_ASM + 'var i=global.Infinity; function f() { i = 0.0 } return f');
-assertAsmTypeFail('global', USE_ASM + 'const i=global.Infinity; function f() { i = 0.0 } return f');
 assertAsmLinkAlwaysFail(asmCompile('global', USE_ASM + 'var i=global.Infinity; function f() { return +i } return f'), undefined);
 assertAsmLinkAlwaysFail(asmCompile('global', USE_ASM + 'const i=global.Infinity; function f() { return +i } return f'), undefined);
 assertAsmLinkAlwaysFail(asmCompile('global', USE_ASM + 'var i=global.Infinity; function f() { return +i } return f'), null);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/asm.js/testSIMD.js	2014-11-26 21:45:54.000000000 +0000
@@ -444,6 +444,18 @@
 CheckF4(F32M, 'var x=f4(13.37,2,3,4); var y=f4(4,3,5,2); x=f4m(x,y)', [Math.fround(13.37) * 4,6,15,8]);
 CheckF4(F32M, 'var x=f4(13.37,2,3,4); var y=f4(4,3,5,2); x=f4(f4m(x,y))', [Math.fround(13.37) * 4,6,15,8]);
 
+var f32x4 = SIMD.float32x4(0, NaN, -0, NaN);
+var another = SIMD.float32x4(NaN, -1, -0, NaN);
+assertEqX4(asmLink(asmCompile('glob', USE_ASM + F32 + F32M + "function f(x, y) {x=f4(x); y=f4(y); x=f4m(x,y); return f4(x);} return f"), this)(f32x4, another), [NaN, NaN, 0, NaN]);
+
+CheckF4(F32D, 'var x=f4(1,2,3,4); x=f4d(x,x)', [1,1,1,1]);
+CheckF4(F32D, 'var x=f4(1,2,3,4); var y=f4(4,3,5,2); x=f4d(x,y)', [1/4,2/3,3/5,2]);
+CheckF4(F32D, 'var x=f4(13.37,1,1,4); var y=f4(4,0,-0.,2); x=f4d(x,y)', [Math.fround(13.37) / 4,+Infinity,-Infinity,2]);
+
+var f32x4 = SIMD.float32x4(0, 0, -0, NaN);
+var another = SIMD.float32x4(0, -0, 0, 0);
+assertEqX4(asmLink(asmCompile('glob', USE_ASM + F32 + F32D + "function f(x,y) {x=f4(x); y=f4(y); x=f4d(x,y); return f4(x);} return f"), this)(f32x4, another), [NaN, NaN, NaN, NaN]);
+
 // Unary arithmetic operators
 function CheckUnaryF4(op, checkFunc, assertFunc) {
     var _ = asmLink(asmCompile('glob', USE_ASM + F32 + 'var op=f4.' + op + '; function f(x){x=f4(x); return f4(op(x)); } return f'), this);
@@ -513,31 +525,36 @@
 const F32MIN = 'var min = f4.min;'
 const F32MAX = 'var max = f4.max;'
 
-// TODO amend tests once float32x4.min/max is fully specified, for NaN and -0
-// vs 0. See also comment in js::jit::CodeGeneratorX86Shared::visitSimdBinaryArithFx4.
-// In these tests, we assume x86/x64, so min(+0, -0) === +0, as specified in
-// the Intel developer manual. See also bug 1068028.
 CheckF4(F32MIN, 'var x=f4(1,2,3,4); x=min(x,x)', [1,2,3,4]);
 CheckF4(F32MIN, 'var x=f4(13.37,2,3,4); var y=f4(4,3,5,2); x=min(x,y)', [4,2,3,2]);
-CheckF4(F32MIN + FROUND + 'var Infinity = glob.Infinity;', 'var x=f4(0,0,0,0); var y=f4(2310,3,5,0); x=f4(f32(+Infinity),f32(-Infinity),f32(3),f32(-0.)); x=min(x,y)', [2310,-Infinity,3,0]);
+CheckF4(F32MIN + FROUND + 'var Infinity = glob.Infinity;', 'var x=f4(0,0,0,0); var y=f4(2310,3,5,0); x=f4(f32(+Infinity),f32(-Infinity),f32(3),f32(-0.)); x=min(x,y)', [2310,-Infinity,3,-0]);
+
+CheckF4(F32MIN, 'var x=f4(0,0,-0,-0); var y=f4(0,-0,0,-0); x=min(x,y)', [0,-0,-0,-0]);
+CheckF4(F32MIN + FROUND + 'var NaN = glob.NaN;', 'var x=f4(0,0,0,0); var y=f4(0,0,0,0); var n=f32(0); n=f32(NaN); x=f4(n,0.,n,0.); y=f4(n,n,0.,0.); x=min(x,y)', [NaN, NaN, NaN, 0]);
 
 CheckF4(F32MAX, 'var x=f4(1,2,3,4); x=max(x,x)', [1,2,3,4]);
 CheckF4(F32MAX, 'var x=f4(13.37,2,3,4); var y=f4(4,3,5,2); x=max(x,y)', [13.37, 3, 5, 4]);
 CheckF4(F32MAX + FROUND + 'var Infinity = glob.Infinity;', 'var x=f4(0,0,0,0); var y=f4(2310,3,5,0); x=f4(f32(+Infinity),f32(-Infinity),f32(3),f32(-0.)); x=max(x,y)', [+Infinity,3,5,0]);
 
-// Test NaN
-var f32x4 = SIMD.float32x4(0, NaN, -0, NaN);
-var another = SIMD.float32x4(NaN, -1, -0, NaN);
-assertEqX4(asmLink(asmCompile('glob', USE_ASM + F32 + F32M + "function f(x, y) {x=f4(x); y=f4(y); x=f4m(x,y); return f4(x);} return f"), this)(f32x4, another), [NaN, NaN, 0, NaN]);
+CheckF4(F32MAX, 'var x=f4(0,0,-0,-0); var y=f4(0,-0,0,-0); x=max(x,y)', [0,0,0,-0]);
+CheckF4(F32MAX + FROUND + 'var NaN = glob.NaN;', 'var x=f4(0,0,0,0); var y=f4(0,0,0,0); var n=f32(0); n=f32(NaN); x=f4(n,0.,n,0.); y=f4(n,n,0.,0.); x=max(x,y)', [NaN, NaN, NaN, 0]);
 
-CheckF4(F32D, 'var x=f4(1,2,3,4); x=f4d(x,x)', [1,1,1,1]);
-CheckF4(F32D, 'var x=f4(1,2,3,4); var y=f4(4,3,5,2); x=f4d(x,y)', [1/4,2/3,3/5,2]);
-CheckF4(F32D, 'var x=f4(13.37,1,1,4); var y=f4(4,0,-0.,2); x=f4d(x,y)', [Math.fround(13.37) / 4,+Infinity,-Infinity,2]);
+const F32MINNUM = 'var min = f4.minNum;'
+const F32MAXNUM = 'var max = f4.maxNum;'
 
-// Test NaN
-var f32x4 = SIMD.float32x4(0, 0, -0, NaN);
-var another = SIMD.float32x4(0, -0, 0, 0);
-assertEqX4(asmLink(asmCompile('glob', USE_ASM + F32 + F32D + "function f(x,y) {x=f4(x); y=f4(y); x=f4d(x,y); return f4(x);} return f"), this)(f32x4, another), [NaN, NaN, NaN, NaN]);
+CheckF4(F32MINNUM, 'var x=f4(1,2,3,4); x=min(x,x)', [1,2,3,4]);
+CheckF4(F32MINNUM, 'var x=f4(13.37,2,3,4); var y=f4(4,3,5,2); x=min(x,y)', [4,2,3,2]);
+CheckF4(F32MINNUM + FROUND + 'var Infinity = glob.Infinity;', 'var x=f4(0,0,0,0); var y=f4(2310,3,5,0); x=f4(f32(+Infinity),f32(-Infinity),f32(3),f32(-0.)); x=min(x,y)', [2310,-Infinity,3,-0]);
+
+CheckF4(F32MINNUM, 'var x=f4(0,0,-0,-0); var y=f4(0,-0,0,-0); x=min(x,y)', [0,-0,-0,-0]);
+CheckF4(F32MINNUM + FROUND + 'var NaN = glob.NaN;', 'var x=f4(0,0,0,0); var y=f4(0,0,0,0); var n=f32(0); n=f32(NaN); x=f4(n,0.,n,0.); y=f4(n,n,0.,0.); x=min(x,y)', [NaN, 0, 0, 0]);
+
+CheckF4(F32MAXNUM, 'var x=f4(1,2,3,4); x=max(x,x)', [1,2,3,4]);
+CheckF4(F32MAXNUM, 'var x=f4(13.37,2,3,4); var y=f4(4,3,5,2); x=max(x,y)', [13.37, 3, 5, 4]);
+CheckF4(F32MAXNUM + FROUND + 'var Infinity = glob.Infinity;', 'var x=f4(0,0,0,0); var y=f4(2310,3,5,0); x=f4(f32(+Infinity),f32(-Infinity),f32(3),f32(-0.)); x=max(x,y)', [+Infinity,3,5,0]);
+
+CheckF4(F32MAXNUM, 'var x=f4(0,0,-0,-0); var y=f4(0,-0,0,-0); x=max(x,y)', [0,0,0,-0]);
+CheckF4(F32MAXNUM + FROUND + 'var NaN = glob.NaN;', 'var x=f4(0,0,0,0); var y=f4(0,0,0,0); var n=f32(0); n=f32(NaN); x=f4(n,0.,n,0.); y=f4(n,n,0.,0.); x=max(x,y)', [NaN, 0, 0, 0]);
 
 // With
 const WXF = 'var w = f4.withX;';
@@ -573,26 +590,38 @@
 // yields all bits set to 0 (i.e 0).
 const T = -1;
 const F = 0;
-assertAsmTypeFail('glob', USE_ASM + I32 + "var lt=i4.lessThanOrEqual; function f() {} return f");
-assertAsmTypeFail('glob', USE_ASM + I32 + "var ge=i4.greaterThanOrEqual; function f() {} return f");
-assertAsmTypeFail('glob', USE_ASM + I32 + "var ne=i4.notEqual; function f() {} return f");
 
+const EQI32 = 'var eq = i4.equal';
+const NEI32 = 'var ne = i4.notEqual';
 const LTI32 = 'var lt = i4.lessThan;';
+const LEI32 = 'var le = i4.lessThanOrEqual';
 const GTI32 = 'var gt = i4.greaterThan;';
-const EQI32 = 'var eq = i4.equal;';
+const GEI32 = 'var ge = i4.greaterThanOrEqual';
+
+CheckI4(EQI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=eq(x,y)', [F, F, F, F]);
+CheckI4(EQI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=eq(x,y)', [F, F, F, F]);
+CheckI4(EQI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=eq(x,y)', [T, F, F, F]);
+
+CheckI4(NEI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=ne(x,y)', [T, T, T, T]);
+CheckI4(NEI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=ne(x,y)', [T, T, T, T]);
+CheckI4(NEI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=ne(x,y)', [F, T, T, T]);
 
 CheckI4(LTI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=lt(x,y)', [F, F, F, F]);
 CheckI4(LTI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=lt(x,y)', [T, T, T, T]);
 CheckI4(LTI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=lt(x,y)', [F, T, T, F]);
 
-CheckI4(EQI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=eq(x,y)', [F, F, F, F]);
-CheckI4(EQI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=eq(x,y)', [F, F, F, F]);
-CheckI4(EQI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=eq(x,y)', [T, F, F, F]);
+CheckI4(LEI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=le(x,y)', [F, F, F, F]);
+CheckI4(LEI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=le(x,y)', [T, T, T, T]);
+CheckI4(LEI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=le(x,y)', [T, T, T, F]);
 
 CheckI4(GTI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=gt(x,y)', [T, T, T, T]);
 CheckI4(GTI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=gt(x,y)', [F, F, F, F]);
 CheckI4(GTI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=gt(x,y)', [F, F, F, T]);
 
+CheckI4(GEI32, 'var x=i4(1,2,3,4); var y=i4(-1,1,0,2); x=ge(x,y)', [T, T, T, T]);
+CheckI4(GEI32, 'var x=i4(-1,1,0,2); var y=i4(1,2,3,4); x=ge(x,y)', [F, F, F, F]);
+CheckI4(GEI32, 'var x=i4(1,0,3,4); var y=i4(1,1,7,0); x=ge(x,y)', [T, F, F, T]);
+
 const LTF32 = 'var lt=f4.lessThan;';
 const LEF32 = 'var le=f4.lessThanOrEqual;';
 const GTF32 = 'var gt=f4.greaterThan;';
@@ -945,6 +974,224 @@
 assertAsmTypeFail('glob', 'ffi', USE_ASM + I32 + "var func=ffi.func; function f() {var x=i4(1,2,3,4); x=i4(func());} return f");
 assertAsmTypeFail('glob', 'ffi', USE_ASM + F32 + "var func=ffi.func; function f() {var x=f4(1,2,3,4); x=f4(func());} return f");
 
+// Load / Store
+(function testLoadStore() {
+
+var IMPORTS = USE_ASM + 'var H=new glob.Uint8Array(heap); var i4=glob.SIMD.int32x4; var load=i4.load; var store=i4.store;';
+
+//      Bad number of args
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load();} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load(3);} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load(3, 4, 5);} return f");
+
+//      Bad type of args
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load(3, 5);} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load(H, 5.0);} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){var i=0.;load(H, i);} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "var H2=new glob.Int32Array(heap); function f(){var i=0;load(H2, i)} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "var H2=42; function f(){var i=0;load(H2, i)} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){var i=0;load(H2, i)} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "var f4=glob.SIMD.float32x4; function f(){var i=0;var vec=f4(1,2,3,4); store(H, i, vec)} return f");
+
+//      Bad coercions of returned values
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){var i=0;return load(H, i)|0;} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){var i=0;return +load(H, i);} return f");
+
+//      Literal index constants
+var buf = new ArrayBuffer(BUF_MIN);
+var asI32 = new Int32Array(buf);
+asI32[(BUF_MIN >> 2) - 4] = 4;
+asI32[(BUF_MIN >> 2) - 3] = 3;
+asI32[(BUF_MIN >> 2) - 2] = 2;
+asI32[(BUF_MIN >> 2) - 1] = 1;
+
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load(H, " + (INT32_MAX + 1) + ");} return f");
+assertAsmTypeFail('glob', 'ffi', 'heap', IMPORTS + "function f(){load(H, " + (INT32_MAX + 1 - 15) + ");} return f");
+asmCompile('glob', 'ffi', 'heap', IMPORTS + "function f(){load(H, " + (INT32_MAX + 1 - 16) + ");} return f");
+
+assertAsmLinkFail(asmCompile('glob', 'ffi', 'heap', IMPORTS + "function f() {return i4(load(H, " + (BUF_MIN - 15) + "));} return f"), this, {}, buf);
+assertEqX4(asmLink(asmCompile('glob', 'ffi', 'heap', IMPORTS + "function f() {return i4(load(H, " + (BUF_MIN - 16) + "));} return f"), this, {}, buf)(), [4, 3, 2, 1]);
+assertEqX4(asmLink(asmCompile('glob', 'ffi', 'heap', IMPORTS + "function f() {return i4(load(H, " + BUF_MIN + " - 16 | 0));} return f"), this, {}, buf)(), [4, 3, 2, 1]);
+
+var CONSTANT_INDEX = 42;
+var CONSTANT_BYTE_INDEX = CONSTANT_INDEX << 2;
+
+var loadStoreCode = `
+    "use asm";
+
+    var H = new glob.Uint8Array(heap);
+
+    var i4 = glob.SIMD.int32x4;
+    var i4load = i4.load;
+    var i4store = i4.store;
+
+    var f4 = glob.SIMD.float32x4;
+    var f4load = f4.load;
+    var f4store = f4.store;
+
+    function f32l(i) { i=i|0; return f4(f4load(H, i|0)); }
+    function f32lcst() { return f4(f4load(H, ${CONSTANT_BYTE_INDEX})); }
+    function f32s(i, vec) { i=i|0; vec=f4(vec); f4store(H, i|0, vec); }
+    function f32scst(vec) { vec=f4(vec); f4store(H, ${CONSTANT_BYTE_INDEX}, vec); }
+
+    function i32l(i) { i=i|0; return i4(i4load(H, i|0)); }
+    function i32lcst() { return i4(i4load(H, ${CONSTANT_BYTE_INDEX})); }
+    function i32s(i, vec) { i=i|0; vec=i4(vec); i4store(H, i|0, vec); }
+    function i32scst(vec) { vec=i4(vec); i4store(H, ${CONSTANT_BYTE_INDEX}, vec); }
+
+    function f32lbndcheck(i) {
+        i=i|0;
+        if ((i|0) > ${CONSTANT_BYTE_INDEX}) i=${CONSTANT_BYTE_INDEX};
+        if ((i|0) < 0) i = 0;
+        return f4(f4load(H, i|0));
+    }
+    function f32sbndcheck(i, vec) {
+        i=i|0;
+        vec=f4(vec);
+        if ((i|0) > ${CONSTANT_BYTE_INDEX}) i=${CONSTANT_BYTE_INDEX};
+        if ((i|0) < 0) i = 0;
+        return f4(f4store(H, i|0, vec));
+    }
+
+    return {
+        f32l: f32l,
+        f32lcst: f32lcst,
+        f32s: f32s,
+        f32scst: f32scst,
+        f32lbndcheck: f32lbndcheck,
+        f32sbndcheck: f32sbndcheck,
+        i32l: i32l,
+        i32lcst: i32lcst,
+        i32s: i32s,
+        i32scst: i32scst
+    }
+`;
+
+const SIZE = 0x8000;
+
+var F32 = new Float32Array(SIZE);
+var reset = function() {
+    for (var i = 0; i < SIZE; i++)
+        F32[i] = i + 1;
+};
+reset();
+
+var buf = F32.buffer;
+var m = asmLink(asmCompile('glob', 'ffi', 'heap', loadStoreCode), this, null, buf);
+
+function slice(TA, i, n) { return Array.prototype.slice.call(TA, i, i + n); }
+
+// Float32x4.load
+function f32l(n) { return m.f32l((n|0) << 2 | 0); };
+
+//      Correct accesses
+assertEqX4(f32l(0), slice(F32, 0, 4));
+assertEqX4(f32l(1), slice(F32, 1, 4));
+assertEqX4(f32l(SIZE - 4), slice(F32, SIZE - 4, 4));
+
+assertEqX4(m.f32lcst(), slice(F32, CONSTANT_INDEX, 4));
+assertEqX4(m.f32lbndcheck(CONSTANT_BYTE_INDEX), slice(F32, CONSTANT_INDEX, 4));
+
+//      OOB
+var BatNaN = [NaN, NaN, NaN, NaN] // NaNNaNNaNNaN etc.
+assertEqX4(f32l(-1), BatNaN);
+assertEqX4(f32l(SIZE), BatNaN);
+assertEqX4(f32l(SIZE - 1), BatNaN);
+assertEqX4(f32l(SIZE - 2), BatNaN);
+assertEqX4(f32l(SIZE - 3), BatNaN);
+
+// Float32x4.store
+function f32s(n, v) { return m.f32s((n|0) << 2 | 0, v); };
+
+var vec  = SIMD.float32x4(5,6,7,8);
+var vec2 = SIMD.float32x4(0,1,2,3);
+
+reset();
+f32s(0, vec);
+assertEqX4(vec, slice(F32, 0, 4));
+
+reset();
+f32s(0, vec2);
+assertEqX4(vec2, slice(F32, 0, 4));
+
+reset();
+f32s(4, vec);
+assertEqX4(vec, slice(F32, 4, 4));
+
+reset();
+m.f32scst(vec2);
+assertEqX4(vec2, slice(F32, CONSTANT_INDEX, 4));
+
+reset();
+m.f32sbndcheck(CONSTANT_BYTE_INDEX, vec);
+assertEqX4(vec, slice(F32, CONSTANT_INDEX, 4));
+
+//      OOB
+reset();
+f32s(SIZE - 3, vec);
+f32s(SIZE - 2, vec);
+f32s(SIZE - 1, vec);
+f32s(SIZE, vec);
+for (var i = 0; i < SIZE; i++)
+    assertEq(F32[i], i + 1);
+
+// Int32x4.load
+var I32 = new Int32Array(buf);
+reset = function () {
+    for (var i = 0; i < SIZE; i++)
+        I32[i] = i + 1;
+};
+reset();
+
+function i32(n) { return m.i32l((n|0) << 2 | 0); };
+
+//      Correct accesses
+assertEqX4(i32(0), slice(I32, 0, 4));
+assertEqX4(i32(1), slice(I32, 1, 4));
+assertEqX4(i32(SIZE - 4), slice(I32, SIZE - 4, 4));
+
+assertEqX4(m.i32lcst(), slice(I32, CONSTANT_INDEX, 4));
+
+//      OOB
+assertEqX4(i32(-1), [0,0,0,0]);
+assertEqX4(i32(SIZE), [0,0,0,0]);
+assertEqX4(i32(SIZE - 1), [0,0,0,0]);
+assertEqX4(i32(SIZE - 2), [0,0,0,0]);
+assertEqX4(i32(SIZE - 3), [0,0,0,0]);
+
+// Int32x4.store
+function i32s(n, v) { return m.i32s((n|0) << 2 | 0, v); };
+
+var vec  = SIMD.int32x4(5,6,7,8);
+var vec2 = SIMD.int32x4(0,1,2,3);
+
+reset();
+i32s(0, vec);
+assertEqX4(vec, slice(I32, 0, 4));
+
+reset();
+i32s(0, vec2);
+assertEqX4(vec2, slice(I32, 0, 4));
+
+reset();
+i32s(4, vec);
+assertEqX4(vec, slice(I32, 4, 4));
+
+reset();
+m.i32scst(vec2);
+assertEqX4(vec2, slice(I32, CONSTANT_INDEX, 4));
+
+//      OOB
+reset();
+i32s(SIZE - 3, vec);
+i32s(SIZE - 2, vec);
+i32s(SIZE - 1, vec);
+i32s(SIZE - 0, vec);
+for (var i = 0; i < SIZE; i++)
+    assertEq(I32[i], i + 1);
+
+})();
+
 // 3.3 Internal calls
 // asm.js -> asm.js
 // Retrieving values from asm.js
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/auto-regress/bug765483.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/auto-regress/bug765483.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/auto-regress/bug765483.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/auto-regress/bug765483.js	2014-11-26 21:45:54.000000000 +0000
@@ -4,8 +4,7 @@
 // Flags: --ion-eager
 //
 
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 var obj1 = {}, obj2 = {};
 obj2['b'+i] = 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/auto-regress/bug800878.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/auto-regress/bug800878.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/auto-regress/bug800878.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/auto-regress/bug800878.js	2014-11-26 21:45:54.000000000 +0000
@@ -4,6 +4,8 @@
 // Flags: --ion-eager
 //
 
+load(libdir + "evalInFrame.js");
+
 [1,2,3,4,(':'),6,7,8].forEach(
     function(x) {
         assertEq(evalInFrame(0, ('^')), x);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug1100623.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug1100623.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug1100623.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug1100623.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,12 @@
+// |jit-test| error: baz is null
+var document = {getElementById: () => null};
+
+(function() {
+    const one = 1;
+
+    function foo() { return one; }
+    function bar() { return foo(); }
+
+    var baz = document.getElementById("baz");
+    baz.value;
+})();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug646968-7.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug646968-7.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug646968-7.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug646968-7.js	2014-11-26 21:45:54.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function test(s) {
     eval(s);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug646968-8.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug646968-8.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug646968-8.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug646968-8.js	2014-11-26 21:45:54.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 var x = 5;
 let (x = eval("x++")) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug673731.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug673731.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug673731.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug673731.js	2014-11-26 21:45:54.000000000 +0000
@@ -1,3 +1,3 @@
 // |jit-test| error: ReferenceError
 
-const IS_TOKEN_ARRAY = [ printBugNumber && IS_TOKEN_ARRAY++ && this() ? this() : this() ];
+const IS_TOKEN_ARRAY = [ printBugNumber && this() ? this() : this() ];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug821470.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug821470.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/bug821470.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/bug821470.js	2014-11-26 21:45:54.000000000 +0000
@@ -2,7 +2,7 @@
 
 assertThrowsInstanceOf(function () {
     eval("function x() { 'use strict'; const x = 4; x = 3; }");
-}, TypeError);
+}, SyntaxError);
 assertThrowsInstanceOf(function () {
     Function("'use strict'; const x = x = 5;");
-}, TypeError)
+}, SyntaxError)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/constAssignError.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/constAssignError.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/constAssignError.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/constAssignError.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,23 @@
+// Can't assign to const
+
+load(libdir + 'asserts.js');
+
+function assertSyntaxError(str) {
+  assertThrowsInstanceOf(function () { eval(str); }, SyntaxError);
+}
+
+assertSyntaxError("(function() { const x = 3; (function() x++)(); return x })");
+assertSyntaxError("(function() { const x = 3; (function() x++)(); return x++ })");
+assertSyntaxError("(function() { const x = 2; (function() x++)(); return ++x })");
+assertSyntaxError("(function() { const x = 2; (function() x++)(); return x += 1 })");
+
+assertSyntaxError("(function() { const x = 3; x = 1; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; x = 1; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; x++; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; ++x; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; x--; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; --x; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; x += 1; return (function() { return x})() })");
+assertSyntaxError("(function() { const x = 3; x -= 1; return (function() { return x})() })");
+
+assertSyntaxError("(function() { const x = 3; [x] = [1]; })");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/constGlobalAssignError.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/constGlobalAssignError.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/constGlobalAssignError.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/constGlobalAssignError.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,3 @@
+// |jit-test| error: SyntaxError
+
+const x = 1; x = 2;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/eif-generator.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/eif-generator.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/eif-generator.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/eif-generator.js	2014-11-26 21:45:54.000000000 +0000
@@ -1,5 +1,4 @@
-var global = newGlobal();
-var dbg = new global.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function f() {
     let (x = 1) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testBug552248.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testBug552248.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testBug552248.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testBug552248.js	2014-11-26 21:45:55.000000000 +0000
@@ -1,5 +1,4 @@
-var global = newGlobal();
-var dbg = new global.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 var a = new Array();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testBug663789-2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testBug663789-2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testBug663789-2.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testBug663789-2.js	2014-11-26 21:45:55.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 o = { toString:function() { return evalInFrame(1, "x") } }
 var x = 'C';
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testDynamicUsage.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testDynamicUsage.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testDynamicUsage.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testDynamicUsage.js	2014-11-26 21:45:55.000000000 +0000
@@ -8,20 +8,6 @@
 assertEq((function() { function f() { return 3 }; assertEq(f(), 3); return eval('f()') })(), 3);
 assertEq((function() { function f() { return 3 }; (function() f())(); return f() })(), 3);
 
-assertEq((function() { const x = 3; (function() x++)(); return x })(), 3);
-assertEq((function() { const x = 3; (function() x++)(); return x++ })(), 3);
-assertEq((function() { const x = 2; (function() x++)(); return ++x })(), 3);
-assertEq((function() { const x = 2; (function() x++)(); return x += 1 })(), 3);
-
-assertEq((function() { const x = 3; x = 1; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; x = 1; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; x++; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; ++x; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; x--; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; --x; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; x += 1; return (function() { return x})() })(), 3);
-assertEq((function() { const x = 3; x -= 1; return (function() { return x})() })(), 3);
-
 assertEq((function() { var x = 3; return eval("x") })(), 3);
 assertEq((function() { var x; x = 3; return eval("x") })(), 3);
 assertEq((function() { x = 3; var x; return eval("x") })(), 3);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testEvalInFrameEdgeCase.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testEvalInFrameEdgeCase.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/basic/testEvalInFrameEdgeCase.js	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/basic/testEvalInFrameEdgeCase.js	2014-11-26 21:45:55.000000000 +0000
@@ -1,5 +1,4 @@
-var global = newGlobal();
-var dbg = new global.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function g() {
     var x = 100;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-1.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-1.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-1.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-1.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,15 @@
+// The WeakMap constructor creates an empty WeakMap by default.
+
+load(libdir + "asserts.js");
+
+new WeakMap();
+new WeakMap(undefined);
+
+// FIXME: bug 1092538
+// new WeakMap(null);
+
+// FIXME: bug 1062075
+// assertThrowsInstanceOf(() => WeakMap(), TypeError);
+// assertThrowsInstanceOf(() => WeakMap(undefined), TypeError);
+// WeakMap(null) throws TypeError, but it's because of bug 1092538.
+// assertThrowsInstanceOf(() => WeakMap(null), TypeError);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-2.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-2.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,37 @@
+// The WeakMap constructor can take an argument that is an array of pairs.
+
+var k1 = {};
+var v1 = 42;
+var k2 = {};
+var v2 = 43;
+var k3 = {};
+
+var arr = [[k1, v1], [k2, v2]];
+
+var m = new WeakMap(arr);
+
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), v1);
+assertEq(m.get(k2), v2);
+assertEq(m.get(k3), undefined);
+
+var arraylike1 = {
+  0: k1,
+  1: v1
+};
+var arraylike2 = {
+  0: k2,
+  1: v2
+};
+arr = [arraylike1, arraylike2];
+
+m = new WeakMap(arr);
+
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), v1);
+assertEq(m.get(k2), v2);
+assertEq(m.get(k3), undefined);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-3.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-3.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-3.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-3.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,35 @@
+// WeakMap can take an argument that is an array of singleton arrays.
+
+var k1 = {};
+var k2 = {};
+var k3 = {};
+
+var arr = [[k1], [k2]];
+
+var m = new WeakMap(arr);
+
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), undefined);
+assertEq(m.get(k2), undefined);
+assertEq(m.get(k3), undefined);
+
+var arraylike1 = {
+  0: k1,
+  1: undefined
+};
+var arraylike2 = {
+  0: k2,
+};
+
+arr = [arraylike1, arraylike2];
+
+m = new WeakMap(arr);
+
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), undefined);
+assertEq(m.get(k2), undefined);
+assertEq(m.get(k3), undefined);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-4.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-4.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-4.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-4.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,8 @@
+// WeakMap(x) throws if x is not iterable (unless x is undefined).
+
+load(libdir + "asserts.js");
+// FIXME: bug 1092538
+// `new WeapMap(null)` should not throw.
+var nonIterables = [null, true, 1, -0, 3.14, NaN, {}, Math, this];
+for (let k of nonIterables)
+    assertThrowsInstanceOf(function () { new WeakMap(k); }, TypeError);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-5.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-5.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-5.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-5.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,23 @@
+// WeakMap(arr) throws if arr contains holes (or undefined values).
+
+load(libdir + "asserts.js");
+
+var k1 = {};
+var v1 = 42;
+var k2 = {};
+var v2 = 43;
+var k3 = {};
+var v3 = {};
+
+assertThrowsInstanceOf(function () { new WeakMap([undefined]); }, TypeError);
+assertThrowsInstanceOf(function () { new WeakMap([null]); }, TypeError);
+assertThrowsInstanceOf(function () { new WeakMap([[k1, v1], [k2, v2], , [k3, k3]]); }, TypeError);
+assertThrowsInstanceOf(function () { new WeakMap([[k1, v1], [k2, v2], ,]); }, TypeError);
+
+// WeakMap(iterable) throws if iterable doesn't have array-like objects
+
+assertThrowsInstanceOf(function () { new WeakMap([1, 2, 3]); }, TypeError);
+assertThrowsInstanceOf(function () {
+  let s = new Set([1, 2, "abc"]);
+  new WeakMap(s);
+}, TypeError);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-arraylike-exception.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-arraylike-exception.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-arraylike-exception.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-arraylike-exception.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,23 @@
+// WeakMap constructor should propagate exception while getting key and value.
+
+load(libdir + "asserts.js");
+
+var k1 = {};
+var v1 = 42;
+
+var error_thrower_0 = {
+  get 0() {
+    throw new Error;
+  },
+  1: v1
+};
+assertThrowsInstanceOf(() => new WeakMap([error_thrower_0]), Error);
+
+var error_thrower_1 = {
+  0: k1,
+  get 1() {
+    throw new Error;
+  }
+};
+assertThrowsInstanceOf(() => new WeakMap([error_thrower_1]), Error);
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-duplicates.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-duplicates.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-duplicates.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-duplicates.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,27 @@
+// When the argument to WeakMap contains a key multiple times, the last value
+// is retained.
+
+var k1 = {};
+var v1 = 42;
+var k2 = {};
+var v2 = 43;
+var k3 = {};
+var v3 = 44;
+var k4 = {};
+
+var wrong1 = 8;
+var wrong2 = 9;
+var wrong3 = 10;
+
+var arr = [[k1, wrong1], [k2, v2], [k3, wrong2], [k1, wrong3], [k3, v3], [k1, v1]];
+
+var m = new WeakMap(arr);
+
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), true);
+assertEq(m.has(k4), false);
+assertEq(m.get(k1), v1);
+assertEq(m.get(k2), v2);
+assertEq(m.get(k3), v3);
+assertEq(m.get(k4), undefined);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-1.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-1.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-1.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-1.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,43 @@
+// The argument to WeakMap can be a generator.
+
+var k1 = {};
+var v1 = 42;
+var k2 = {};
+var v2 = 43;
+var k3 = {};
+
+var done = false;
+
+function data() {
+  yield [k1, v1];
+  yield [k2, v2];
+  done = true;
+};
+
+var m = new WeakMap(data());
+
+assertEq(done, true);  // the constructor consumes the argument
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), v1);
+assertEq(m.get(k2), v2);
+assertEq(m.get(k3), undefined);
+
+done = false;
+
+function* data2() {
+  yield [k1, v1];
+  yield [k2, v2];
+  done = true;
+};
+
+m = new WeakMap(data2());
+
+assertEq(done, true);  // the constructor consumes the argument
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), v1);
+assertEq(m.get(k2), v2);
+assertEq(m.get(k3), undefined);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-2.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-2.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,19 @@
+// The argument to WeakMap can be a generator-expression.
+
+var k1 = {};
+var k2 = {};
+var k3 = {};
+var k4 = {};
+
+var valueToKey = {
+  1: k1,
+  2: k2,
+  "green": k3,
+  "red": k4
+};
+
+var arr = [1, 2, "green", "red"];
+var m = new WeakMap([valueToKey[v], v] for (v of arr));
+
+for (var i = 0; i < 4; i++)
+  assertEq(m.get(valueToKey[arr[i]]), arr[i]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-3.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-3.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-3.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-3.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,13 @@
+// The argument to WeakMap may be a generator-iterator that produces no values.
+
+new WeakMap(x for (x of []));
+
+function none() {
+    if (0) yield 0;
+}
+new WeakMap(none());
+
+function* none2() {
+    if (0) yield 0;
+}
+new WeakMap(none2());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-exception.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-exception.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-exception.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-generator-exception.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,22 @@
+// Iterating over the argument to WeakMap can throw. The exception is
+// propagated.
+
+load(libdir + "asserts.js");
+
+function data() {
+    yield [{}, "XR22/Z"];
+    yield [{}, "23D-BN"];
+    throw "oops";
+}
+
+var it = data();
+assertThrowsValue(() => new WeakMap(it), "oops");
+
+function* data2() {
+    yield [{}, "XR22/Z"];
+    yield [{}, "23D-BN"];
+    throw "oops";
+}
+
+var it2 = data2();
+assertThrowsValue(() => new WeakMap(it2), "oops");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-iterable.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-iterable.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-iterable.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-iterable.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,28 @@
+// The argument to WeakMap can be a iterable object.
+
+load(libdir + "iteration.js");
+
+var k1 = {};
+var v1 = 42;
+var k2 = {};
+var v2 = 43;
+var k3 = {};
+
+var done = false;
+
+var iterable = {};
+iterable[std_iterator] = function*() {
+  yield [k1, v1];
+  yield [k2, v2];
+  done = true;
+};
+var m = new WeakMap(iterable);
+
+assertEq(done, true);  // the constructor consumes the argument
+assertEq(m.has(k1), true);
+assertEq(m.has(k2), true);
+assertEq(m.has(k3), false);
+assertEq(m.get(k1), v1);
+assertEq(m.get(k2), v2);
+assertEq(m.get(k3), undefined);
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-non-iterable.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-non-iterable.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-non-iterable.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-non-iterable.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,13 @@
+// WeakMap should throw if argument is not iterable object.
+
+load(libdir + "asserts.js");
+load(libdir + "iteration.js");
+
+var non_iterable1 = {};
+non_iterable1[std_iterator] = {};
+assertThrowsInstanceOf(() => new WeakMap(non_iterable1), TypeError);
+
+var non_iterable2 = {};
+non_iterable2[std_iterator] = function() {
+};
+assertThrowsInstanceOf(() => new WeakMap(non_iterable2), TypeError);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-nonnull.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-nonnull.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-nonnull.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/collections/WeakMap-constructor-nonnull.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,11 @@
+// WeakMap constructor should throw when key is nonnull.
+
+load(libdir + "asserts.js");
+
+var v1 = 42;
+
+var primitive = 10;
+assertThrowsInstanceOf(() => new WeakMap([[primitive, v1]]), TypeError);
+
+var empty_array = [];
+assertThrowsInstanceOf(() => new WeakMap([empty_array]), TypeError);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/breakpoint-13.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/breakpoint-13.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/breakpoint-13.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/breakpoint-13.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,13 @@
+// Breakpoints should be hit on scripts gotten not via Debugger.Frame.
+
+var g = newGlobal();
+g.eval("function f(x) { return x + 1; }");
+// Warm up so f gets OSRed into the jits.
+g.eval("for (var i = 0; i < 10000; i++) f(i);");
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+var fw = gw.getOwnPropertyDescriptor("f").value;
+var hits = 0;
+fw.script.setBreakpoint(0, { hit: function(frame) { hits++; } });
+g.eval("f(42);");
+assertEq(hits, 1);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/breakpoint-14.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/breakpoint-14.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/breakpoint-14.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/breakpoint-14.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,14 @@
+// Breakpoints should be hit on scripts gotten not via Debugger.Frame.
+
+var g = newGlobal();
+g.eval("function f(x) { return x + 1; }");
+g.eval("function g(x) { f(x); }");
+// Warm up so f gets OSRed into the jits and g inlines f.
+g.eval("for (var i = 0; i < 10000; i++) g(i);");
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+var fw = gw.getOwnPropertyDescriptor("f").value;
+var hits = 0;
+fw.script.setBreakpoint(0, { hit: function(frame) { hits++; } });
+g.eval("g(42);");
+assertEq(hits, 1);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/bug911065.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/bug911065.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/bug911065.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/bug911065.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,34 @@
+var g = newGlobal();
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+g.eval(`                        //  1
+var line0 = Error().lineNumber; //  2
+function f() {                  //  3
+    for (var x of [0]) {        //  4
+        if (true == false)      //  5
+            return false;       //  6, aka line0 + 4
+    }                           //  7
+    return true;                //  8
+}                               //  9
+`);                             // 10
+
+if (g.dis)
+  g.dis(g.f);
+
+var script = gw.getOwnPropertyDescriptor("f").value.script;
+
+print("Debugger's view:");
+print("----------------");
+for (var i = script.startLine; i <= script.startLine + script.lineCount; i++) {
+  print("Line " + i + ": " + JSON.stringify(script.getLineOffsets(i)));
+}
+
+var hits = 0;
+var handler = {hit: function () { hits++; }};
+var offs = script.getLineOffsets(g.line0 + 4);
+for (var i = 0; i < offs.length; i++)
+    script.setBreakpoint(offs[i], handler);
+
+assertEq(g.f(), true);
+assertEq(hits, 0);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-enabled-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-enabled-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-enabled-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-enabled-02.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,17 @@
+// Tests that hooks work if set while the Debugger is disabled.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log = "";
+
+g.eval("" + function f() { return 42; });
+
+dbg.enabled = false;
+dbg.onEnterFrame = function (frame) {
+  log += "1";
+};
+dbg.enabled = true;
+
+g.f();
+
+assertEq(log, "1");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-01.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,17 @@
+// Test that the onNewPromise hook gets called when promises are allocated in
+// the scope of debuggee globals.
+
+var g = newGlobal();
+var dbg = new Debugger();
+var gw = dbg.addDebuggee(g);
+
+
+let promisesFound = [];
+dbg.onNewPromise = p => { promisesFound.push(p); };
+
+let p1 = g.makeFakePromise()
+dbg.enabled = false;
+let p2 = g.makeFakePromise();
+
+assertEq(promisesFound.indexOf(gw.makeDebuggeeValue(p1)) != -1, true);
+assertEq(promisesFound.indexOf(gw.makeDebuggeeValue(p2)) == -1, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-02.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,24 @@
+// onNewPromise handlers fire, until they are removed.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+
+log = '';
+g.makeFakePromise();
+assertEq(log, '');
+
+dbg.onNewPromise = function (promise) {
+  log += 'n';
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+};
+
+log = '';
+g.makeFakePromise();
+assertEq(log, 'n');
+
+log = '';
+dbg.onNewPromise = undefined;
+g.makeFakePromise();
+assertEq(log, '');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-03.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-03.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,41 @@
+// onNewPromise handlers on different Debugger instances are independent.
+
+var g = newGlobal();
+var dbg1 = new Debugger(g);
+var log1;
+function h1(promise) {
+  log1 += 'n';
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+}
+
+var dbg2 = new Debugger(g);
+var log2;
+function h2(promise) {
+  log2 += 'n';
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+}
+
+log1 = log2 = '';
+g.makeFakePromise();
+assertEq(log1, '');
+assertEq(log2, '');
+
+log1 = log2 = '';
+dbg1.onNewPromise = h1;
+g.makeFakePromise();
+assertEq(log1, 'n');
+assertEq(log2, '');
+
+log1 = log2 = '';
+dbg2.onNewPromise = h2;
+g.makeFakePromise();
+assertEq(log1, 'n');
+assertEq(log2, 'n');
+
+log1 = log2 = '';
+dbg1.onNewPromise = undefined;
+g.makeFakePromise();
+assertEq(log1, '');
+assertEq(log2, 'n');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-04.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-04.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,15 @@
+// An onNewPromise handler can disable itself.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+
+dbg.onNewPromise = function (promise) {
+  log += 'n';
+  dbg.onNewPromise = undefined;
+};
+
+log = '';
+g.makeFakePromise();
+g.makeFakePromise();
+assertEq(log, 'n');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-05.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-05.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-05.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-05.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,24 @@
+// Creating a promise within an onNewPromise handler causes a recursive handler
+// invocation.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+var depth;
+
+dbg.onNewPromise = function (promise) {
+  log += '('; depth++;
+
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+
+  if (depth < 3)
+    g.makeFakePromise();
+
+  log += ')'; depth--;
+};
+
+log = '';
+depth = 0;
+g.makeFakePromise();
+assertEq(log, '((()))');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-06.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-06.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-06.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-06.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,35 @@
+// Resumption values from onNewPromise handlers are disallowed.
+
+load(libdir + 'asserts.js');
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+
+dbg.onNewPromise = function (g) { log += 'n'; return undefined; };
+log = '';
+assertEq(typeof g.makeFakePromise(), "object");
+assertEq(log, 'n');
+
+dbg.uncaughtExceptionHook = function (ex) { assertEq(/disallowed/.test(ex), true); log += 'u'; }
+dbg.onNewPromise = function (g) { log += 'n'; return { return: "snoo" }; };
+log = '';
+assertEq(typeof g.makeFakePromise(), "object");
+assertEq(log, 'nu');
+
+dbg.onNewPromise = function (g) { log += 'n'; return { throw: "snoo" }; };
+log = '';
+assertEq(typeof g.makeFakePromise(), "object");
+assertEq(log, 'nu');
+
+dbg.onNewPromise = function (g) { log += 'n'; return null; };
+log = '';
+assertEq(typeof g.makeFakePromise(), "object");
+assertEq(log, 'nu');
+
+dbg.uncaughtExceptionHook = function (ex) { assertEq(/foopy/.test(ex), true); log += 'u'; }
+dbg.onNewPromise = function (g) { log += 'n'; throw "foopy"; };
+log = '';
+assertEq(typeof g.makeFakePromise(), "object");
+assertEq(log, 'nu');
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-07.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-07.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-07.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onNewPromise-07.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,13 @@
+// Errors in onNewPromise handlers are reported correctly, and don't mess up the
+// promise creation.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+let e;
+dbg.uncaughtExceptionHook = ee => { e = ee; };
+dbg.onNewPromise = () => { throw new Error("woops!"); };
+
+assertEq(typeof g.makeFakePromise(), "object");
+assertEq(!!e, true);
+assertEq(!!e.message.match(/woops/), true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-01.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,25 @@
+// Test that the onPromiseSettled hook gets called when a promise settles.
+
+var g = newGlobal();
+var dbg = new Debugger();
+var gw = dbg.addDebuggee(g);
+
+let log = "";
+let pw;
+dbg.onPromiseSettled = pw_ => {
+  pw = pw_;
+  log += "s";
+};
+
+let p = g.makeFakePromise();
+g.settleFakePromise(p);
+
+assertEq(log, "s");
+assertEq(pw, gw.makeDebuggeeValue(p));
+
+log = "";
+dbg.enabled = false;
+p = g.makeFakePromise();
+g.settleFakePromise(p);
+
+assertEq(log, "");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-02.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,24 @@
+// onPromiseSettled handlers fire, until they are removed.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, '');
+
+dbg.onPromiseSettled = function (promise) {
+  log += 's';
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+};
+
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 's');
+
+log = '';
+dbg.onPromiseSettled = undefined;
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, '');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-03.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-03.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-03.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-03.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,41 @@
+// onPromiseSettled handlers on different Debugger instances are independent.
+
+var g = newGlobal();
+var dbg1 = new Debugger(g);
+var log1;
+function h1(promise) {
+  log1 += 's';
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+}
+
+var dbg2 = new Debugger(g);
+var log2;
+function h2(promise) {
+  log2 += 's';
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+}
+
+log1 = log2 = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log1, '');
+assertEq(log2, '');
+
+log1 = log2 = '';
+dbg1.onPromiseSettled = h1;
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log1, 's');
+assertEq(log2, '');
+
+log1 = log2 = '';
+dbg2.onPromiseSettled = h2;
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log1, 's');
+assertEq(log2, 's');
+
+log1 = log2 = '';
+dbg1.onPromiseSettled = undefined;
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log1, '');
+assertEq(log2, 's');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-04.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-04.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,15 @@
+// An onPromiseSettled handler can disable itself.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+
+dbg.onPromiseSettled = function (promise) {
+  log += 's';
+  dbg.onPromiseSettled = undefined;
+};
+
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 's');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-05.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-05.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-05.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-05.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,24 @@
+// Settling a promise within an onPromiseSettled handler causes a recursive
+// handler invocation.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+var depth;
+
+dbg.onPromiseSettled = function (promise) {
+  log += '('; depth++;
+
+  assertEq(promise.seen, undefined);
+  promise.seen = true;
+
+  if (depth < 3)
+    g.settleFakePromise(g.makeFakePromise());
+
+  log += ')'; depth--;
+};
+
+log = '';
+depth = 0;
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, '((()))');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-06.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-06.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-06.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Debugger-onPromiseSettled-06.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,35 @@
+// Resumption values from onPromiseSettled handlers are disallowed.
+
+load(libdir + 'asserts.js');
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var log;
+
+dbg.onPromiseSettled = function (g) { log += 's'; return undefined; };
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 's');
+
+dbg.uncaughtExceptionHook = function (ex) { assertEq(/disallowed/.test(ex), true); log += 'u'; }
+dbg.onPromiseSettled = function (g) { log += 's'; return { return: "snoo" }; };
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 'su');
+
+dbg.onPromiseSettled = function (g) { log += 's'; return { throw: "snoo" }; };
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 'su');
+
+dbg.onPromiseSettled = function (g) { log += 's'; return null; };
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 'su');
+
+dbg.uncaughtExceptionHook = function (ex) { assertEq(/foopy/.test(ex), true); log += 'u'; }
+dbg.onPromiseSettled = function (g) { log += 's'; throw "foopy"; };
+log = '';
+g.settleFakePromise(g.makeFakePromise());
+assertEq(log, 'su');
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/execution-observability-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/execution-observability-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/execution-observability-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/execution-observability-01.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,22 @@
+// For perf reasons we don't recompile all a debuggee global's scripts when
+// Debugger no longer needs to observe all execution for that global. Test that
+// things don't crash if we try to run a script with a BaselineScript that was
+// compiled with debug instrumentation when the global is no longer a debuggee.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var counter = 0;
+dbg.onDebuggerStatement = function (frame) {
+  counter++;
+  if (counter == 15)
+    dbg.onDebuggerStatement = undefined;
+};
+
+g.eval("" + function f() {
+  {
+    let inner = 42;
+    debugger;
+    inner++;
+  }
+});
+g.eval("for (var i = 0; i < 20; i++) f()");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/execution-observability-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/execution-observability-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/execution-observability-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/execution-observability-02.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,15 @@
+// Test that baseline frames are marked as debuggee when resuming from
+// throwing.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+var hits = 0;
+dbg.onEnterFrame = function (f) { hits++; };
+
+try {
+  g.eval("for (c in (function() { yield })()) h");
+} catch (e) {
+}
+
+assertEq(hits, 2);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-04.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-04.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-04.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-04.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,26 @@
+// Test that Debugger.Memory.prototype.takeCensus finds GC roots that are on the
+// stack.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+g.eval(`
+  function withTypedArrayOnStack(f) {
+    (function () {
+      var onStack = new Int8Array();
+      f();
+    }())
+  }
+`);
+
+assertEq("Int8Array" in dbg.memory.takeCensus().objects, false,
+         "There shouldn't exist any typed arrays in the census.");
+
+var typedArrayCount;
+g.withTypedArrayOnStack(() => {
+  typedArrayCount = dbg.memory.takeCensus().objects.Int8Array.count;
+});
+
+assertEq(typedArrayCount, 1,
+         "Should have one typed array in the census, because there " +
+         "was one on the stack.");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-05.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-05.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-05.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Memory-takeCensus-05.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,14 @@
+// Test that Debugger.Memory.prototype.takeCensus finds cross compartment
+// wrapper GC roots.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+assertEq("Int8Array" in dbg.memory.takeCensus().objects, false,
+         "There shouldn't exist any typed arrays in the census.");
+
+this.ccw = g.eval("new Int8Array()");
+
+assertEq(dbg.memory.takeCensus().objects.Int8Array.count, 1,
+         "Should have one typed array in the census, because there " +
+         "is one cross-compartment wrapper.");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onDebuggerStatement-05.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onDebuggerStatement-05.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onDebuggerStatement-05.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onDebuggerStatement-05.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,22 @@
+// For perf reasons we don't recompile all a debuggee global's scripts when
+// Debugger no longer needs to observe all execution for that global. Test that
+// things don't crash if we try to run a script with a BaselineScript that was
+// compiled with debug instrumentation when the global is no longer a debuggee.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+var counter = 0;
+dbg.onDebuggerStatement = function (frame) {
+  counter++;
+  if (counter == 15)
+    dbg.onDebuggerStatement = undefined;
+};
+
+g.eval("" + function f() {
+  {
+    let inner = 42;
+    debugger;
+    inner++;
+  }
+});
+g.eval("for (var i = 0; i < 20; i++) f()");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onExceptionUnwind-12.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onExceptionUnwind-12.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onExceptionUnwind-12.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onExceptionUnwind-12.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,14 @@
+var g = newGlobal();
+g.parent = this;
+g.hits = 0;
+g.eval("new Debugger(parent).onExceptionUnwind = function () { hits++; };");
+function f() {
+    var x = f();
+}
+try {
+  f();
+} catch (e) {
+  assertEq(e instanceof InternalError, true);
+} finally {
+  assertEq(g.hits, 0);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-01.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,18 @@
+// We still get onNewScript notifications for code compiled off the main thread.
+
+if (helperThreadCount() === 0)
+  quit(0);
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+var log;
+dbg.onNewScript = function (s) {
+  log += 's';
+  assertEq(s.source.text, '"t" + "wine"');
+}
+
+log = '';
+g.offThreadCompileScript('"t" + "wine"');
+assertEq(g.runOffThreadScript(), 'twine');
+assertEq(log, 's');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread-02.js	2014-11-26 21:45:55.000000000 +0000
@@ -0,0 +1,13 @@
+if (helperThreadCount() === 0)
+  quit(0);
+
+var global = newGlobal();
+var dbg = new Debugger(global);
+
+dbg.onNewScript = function (s) {
+  if (s.url === "<string>")
+    assertEq(s.getChildScripts().length, 1);
+};
+
+global.eval('offThreadCompileScript("function inner() { \\\"use asm\\\"; function xxx() {} return xxx; }");');
+global.eval('runOffThreadScript();');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread.js	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/onNewScript-off-main-thread.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-// We still get onNewScript notifications for code compiled off the main thread.
-
-if (helperThreadCount() === 0)
-  quit(0);
-
-var g = newGlobal();
-var dbg = new Debugger(g);
-
-var log;
-dbg.onNewScript = function (s) {
-  log += 's';
-  assertEq(s.source.text, '"t" + "wine"');
-}
-
-log = '';
-g.offThreadCompileScript('"t" + "wine"');
-assertEq(g.runOffThreadScript(), 'twine');
-assertEq(log, 's');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL-deprecated.js	2014-11-26 21:45:55.000000000 +0000
@@ -9,6 +9,11 @@
     return fw.script.source.sourceMapURL;
 }
 
+function setSourceMapURL(url) {
+    let fw = gw.makeDebuggeeValue(g.f);
+    fw.script.source.sourceMapURL = url;
+}
+
 // Without a source map
 g.evaluate("function f(x) { return 2*x; }");
 assertEq(getSourceMapURL(), null);
@@ -68,3 +73,10 @@
            '//@ sourceMappingURL=http://example.com/foo.js.map',
            {sourceMapURL: 'http://example.com/bar.js.map'});
 assertEq(getSourceMapURL(), 'http://example.com/foo.js.map');
+
+// Make sure setting the sourceMapURL manually works
+setSourceMapURL('baz.js.map');
+assertEq(getSourceMapURL(), 'baz.js.map');
+
+setSourceMapURL('');
+assertEq(getSourceMapURL(), 'baz.js.map');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL.js	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/debug/Source-sourceMapURL.js	2014-11-26 21:45:55.000000000 +0000
@@ -9,6 +9,11 @@
     return fw.script.source.sourceMapURL;
 }
 
+function setSourceMapURL(url) {
+    let fw = gw.makeDebuggeeValue(g.f);
+    fw.script.source.sourceMapURL = url;
+}
+
 // Without a source map
 g.evaluate("function f(x) { return 2*x; }");
 assertEq(getSourceMapURL(), null);
@@ -68,3 +73,10 @@
            '//# sourceMappingURL=http://example.com/foo.js.map',
            {sourceMapURL: 'http://example.com/bar.js.map'});
 assertEq(getSourceMapURL(), 'http://example.com/foo.js.map');
+
+// Make sure setting the sourceMapURL manually works
+setSourceMapURL('baz.js.map');
+assertEq(getSourceMapURL(), 'baz.js.map');
+
+setSourceMapURL('');
+assertEq(getSourceMapURL(), 'baz.js.map');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/gc/incremental-state.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/gc/incremental-state.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/gc/incremental-state.js	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/gc/incremental-state.js	2014-11-26 21:45:56.000000000 +0000
@@ -17,6 +17,7 @@
      * Incremental GC in multiple slices: if marking takes more than one slice,
      * we yield before we start sweeping.
      */
+    gczeal(0);
     gcslice(1);
     assertEq(gcstate(), "mark");
     gcslice(1000000);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/generators/bug1098947.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/generators/bug1098947.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/generators/bug1098947.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/generators/bug1098947.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,11 @@
+function f() {
+    try {
+        let foo = 3;
+        for (var i=0; i<50; i++)
+            yield i + foo;
+    } catch(e) {}
+}
+var it = f();
+for (var i=0; i<40; i++)
+    it.next();
+it.close();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/generators/yield-regexp.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/generators/yield-regexp.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/generators/yield-regexp.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/generators/yield-regexp.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,41 @@
+// Bug 1099956
+
+load(libdir + "asserts.js");
+
+// ES6 treating yield as an identifier except in ES6 generators introduces a
+// syntax conflict with permissible JS >= 1.7 legacy generator syntax.  Is
+// |yield /a/g| inside a function an attempt to convert the function into a
+// legacy generator, yielding a RegExp instance?  Or does it instead read as
+// |(yield / a) / g|?  Similar ambiguities exist for different textual content
+// in place of |a| -- |yield /x+17/g| or |(yield / x) + 17 / g|, and so on.
+// (And, much less importantly, is |yield /a/g| a syntax error in global code
+// as in JS >= 1.7, or is it |(yield / a) / g|.)
+//
+// For now, in JS >= 1.7, we preserve the old behavior.  In all other JS we
+// conform to ES6: |yield /a/g| is a YieldExpression inside an ES6 generator,
+// and it's an IdentifierReference divided twice when not in an ES6 generator.
+// This test will need changes if we change our JS >= 1.7 parsing to be
+// ES6-compatible.
+
+function f1() {
+  yield /abc/g;
+}
+
+var g = f1();
+var v;
+v = g.next();
+assertEq(v instanceof RegExp, true);
+assertEq(v.toString(), "/abc/g");
+assertThrowsValue(() => g.next(), StopIteration);
+
+function* f2() {
+  yield /abc/g;
+}
+
+g = f2();
+v = g.next();
+assertEq(v.done, false);
+assertEq(v.value instanceof RegExp, true);
+assertEq(v.value.toString(), "/abc/g");
+v = g.next();
+assertEq(v.done, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/bug1101576.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/bug1101576.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/bug1101576.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/bug1101576.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,14 @@
+// Random chosen test: js/src/jit-test/tests/ion/bug928423.js
+o = {
+        a: 1,
+            b: 1
+}
+print(1);
+for (var x = 0; x < 2; x++) {
+    print(2);
+    o["a1".substr(0, 1)]
+    o["b1".substr(0, 1)]
+}
+print(3);
+// jsfunfuzz
+"a" + "b"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/bug1101821.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/bug1101821.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/bug1101821.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/bug1101821.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,89 @@
+
+// Makes it easier for fuzzers to get max or min statements with multiple arguments.
+function test(a, b, c, d, e, f) {
+    var r = 0
+    r += Math.max(a);
+    r += Math.max(a,b);
+    r += Math.max(a,b,c);
+    r += Math.max(a,b,c,d);
+    r += Math.max(a,b,c,d,e);
+    r += Math.max(a,b,c,d,e,f);
+    r += Math.min(a);
+    r += Math.min(a,b);
+    r += Math.min(a,b,c);
+    r += Math.min(a,b,c,d);
+    r += Math.min(a,b,c,d,e);
+    r += Math.min(a,b,c,d,e,f);
+    return r;
+}
+for (var i=0; i<10; i++) {
+    assertEq(test(12,5,32,6,18,2), 186);
+    assertEq(test(1,5,3,6,18,-10), 48);
+    assertEq(test(-19,5,20,6,18,1), -48);
+}
+
+// Test max/min result up to 5 arguments.
+for (var i=1; i<5; i++) {
+    var args = [];
+    for (var j=0; j<i; j++)
+        args[args.length] = "arg" + j;
+    var max = new Function(args, "return Math.max("+args.join(",")+");");
+    var min = new Function(args, "return Math.min("+args.join(",")+");");
+
+    var input = [];
+    for (var j=0; j<i; j++) {
+        input[input.length] = j;
+    }
+
+    permutate(input, function (a) {
+        var min_value = min.apply(undefined, a);
+        var max_value = max.apply(undefined, a);
+        assertEq(min_value, minimum(a));
+        assertEq(max_value, maximum(a));
+    });
+}
+
+function minimum(arr) {
+    var min = arr[0]
+    for (var i=1; i<arr.length; i++) {
+        if (min > arr[i])
+            min = arr[i]
+    }
+    return min
+}
+function maximum(arr) {
+    var max = arr[0]
+    for (var i=1; i<arr.length; i++) {
+        if (max < arr[i])
+            max = arr[i]
+    }
+    return max
+}
+
+function permutate(array, callback) {
+    function p(array, index, callback) {
+        function swap(a, i1, i2) {
+            var t = a[i1];
+            a[i1] = a[i2];
+            a[i2] = t;
+        }
+
+        if (index == array.length - 1) {
+            callback(array);
+            return 1;
+        } else {
+            var count = p(array, index + 1, callback);
+            for (var i = index + 1; i < array.length; i++) {
+                swap(array, i, index);
+                count += p(array, index + 1, callback);
+                swap(array, i, index);
+            }
+            return count;
+        }
+    }
+
+    if (!array || array.length == 0) {
+        return 0;
+    }
+    return p(array, 0, callback);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/dce-with-rinstructions.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/dce-with-rinstructions.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/dce-with-rinstructions.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/dce-with-rinstructions.js	2014-11-26 21:45:56.000000000 +0000
@@ -927,6 +927,48 @@
     return i;
 }
 
+var uceFault_string_replace = eval(uneval(uceFault).replace('uceFault', 'uceFault_string_replace'))
+function rstring_replace(i) {
+    var re = /str\d+9/;
+
+    assertEq(re.lastIndex == 0, true);
+    var res = "str00123456789".replace(re, "abc");
+    if (uceFault_string_replace(i) || uceFault_string_replace(i)) {
+        assertEq(res, "abc");
+    }
+    assertEq(re.lastIndex == 0, true);
+
+    return i;
+}
+
+var uceFault_string_replace_y = eval(uneval(uceFault).replace('uceFault', 'uceFault_string_replace_y'))
+function rstring_replace_y(i) {
+    var re = /str\d+9/y;
+
+    assertEq(re.lastIndex == 0, true);
+    var res = "str00123456789".replace(re, "abc");
+    if (uceFault_string_replace_y(i) || uceFault_string_replace_y(i)) {
+        assertEq(res, "abc");
+    }
+    assertEq(re.lastIndex == 0, true);
+
+    return i;
+}
+
+var uceFault_string_replace_g = eval(uneval(uceFault).replace('uceFault', 'uceFault_string_replace_g'))
+function rstring_replace_g(i) {
+    var re = /str\d+9/g;
+
+    assertEq(re.lastIndex == 0, true);
+    var res = "str00123456789str00123456789".replace(re, "abc");
+    if (uceFault_string_replace_g(i) || uceFault_string_replace_g(i)) {
+        assertEq(res, "abcabc");
+    }
+    assertEq(re.lastIndex == 0, true);
+
+    return i;
+}
+
 var uceFault_typeof = eval(uneval(uceFault).replace('uceFault', 'uceFault_typeof'))
 function rtypeof(i) {
     var inputs = [ {}, [], 1, true, undefined, function(){}, null ];
@@ -986,6 +1028,28 @@
     return i;
 }
 
+var uceFault_hypot_number = eval(uneval(uceFault).replace('uceFault', 'uceFault_hypot_number'));
+function rhypot_number(i) {
+    var x = Math.hypot(i, i + 1);
+    if (uceFault_hypot_number(i) || uceFault_hypot_number(i))
+        assertEq(x, Math.sqrt(i * i + (i + 1) * (i + 1)));
+    return i;
+}
+
+var uceFault_hypot_object = eval(uneval(uceFault).replace('uceFault', 'uceFault_hypot_object'));
+function rhypot_object(i) {
+    var t0 = i;
+    var t1 = i + 1;
+    var o0 = { valueOf: function () { return t0; } };
+    var o1 = { valueOf: function () { return t1; } };
+    var x = Math.hypot(o0, o1);
+    t0 = 1000;
+    t1 = 2000;
+    if (uceFault_hypot_object(i) || uceFault_hypot_object(i) )
+        assertEq(x, Math.sqrt(i * i + (i + 1) * (i + 1)));
+    return i;
+}
+
 for (i = 0; i < 100; i++) {
     rbitnot_number(i);
     rbitnot_object(i);
@@ -1076,11 +1140,16 @@
     rregexp_i_literal_replace(i);
     rregexp_m_replace(i);
     rregexp_m_literal_replace(i);
+    rstring_replace(i);
+    rstring_replace_y(i);
+    rstring_replace_g(i);
     rtypeof(i);
     rtodouble_value(i);
     rtodouble_number(i);
     rtofloat32_number(i);
     rtofloat32_object(i);
+    rhypot_number(i);
+    rhypot_object(i);
 }
 
 // Test that we can refer multiple time to the same recover instruction, as well
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/sink-in-recovered-object.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/sink-in-recovered-object.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/ion/sink-in-recovered-object.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/ion/sink-in-recovered-object.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,19 @@
+setJitCompilerOption("ion.warmup.trigger", 30);
+
+var arr = [];
+function f (cond, a) {
+  var obj = { a: 0 };
+  var x = 2 * a + 1;
+  if (cond) {
+    obj.a = x;
+    arr.push(obj.a);
+    obj.a = 1;
+  } else {
+    obj.a = 1;
+  }
+  return obj.a;
+}
+
+for (var i = 0; i < 100; i++) {
+  assertEq(f(i % 2, i), 1);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function callee() {
   evalInFrame(1, "x = 'success'");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function callee() {
   evalInFrame(1, "var x = 'success'");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-typechange.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-typechange.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-typechange.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-call-typechange.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function callee() {
   evalInFrame(1, "x = 'success'");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 this.__defineGetter__("someProperty", function () { evalInFrame(1, "x = 'success'"); });
 function caller(obj) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-newvar.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-newvar.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-newvar.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-newvar.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 this.__defineGetter__("someProperty", function () { evalInFrame(1, "var x = 'success'"); });
 function caller(obj) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-typechange.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-typechange.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-typechange.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-getter-typechange.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 this.__defineGetter__("someProperty", function () { evalInFrame(1, "var x = 'success'"); });
 function caller(obj) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-global-newvar.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-global-newvar.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-global-newvar.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/bug563000/eif-global-newvar.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 function callee() {
   evalInFrame(1, "var x = 'success'");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/invokeSessionGuard.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/invokeSessionGuard.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/jaeger/invokeSessionGuard.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/jaeger/invokeSessionGuard.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,5 +1,4 @@
-var g = newGlobal();
-var dbg = new g.Debugger(this);
+load(libdir + "evalInFrame.js");
 
 [1,2,3,4,5,6,7,8].forEach(
     function(x) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/parser/lazy-parse-bad-offset.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/parser/lazy-parse-bad-offset.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/parser/lazy-parse-bad-offset.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/parser/lazy-parse-bad-offset.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,5 @@
+// Bug 1098132: Shouldn't assert.
+
+options('strict');
+function eval() {};
+eval();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/saved-stacks/gc-frame-cache.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/saved-stacks/gc-frame-cache.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/saved-stacks/gc-frame-cache.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/saved-stacks/gc-frame-cache.js	2014-11-26 21:45:56.000000000 +0000
@@ -9,7 +9,7 @@
                     ". FUZZ_FACTOR = " + FUZZ_FACTOR);
 }
 
-const stacks = [];
+var stacks = [];
 
 stacks.push(saveStack());
 stacks.push(saveStack());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/saved-stacks/generators.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/saved-stacks/generators.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/saved-stacks/generators.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/saved-stacks/generators.js	2014-11-26 21:45:56.000000000 +0000
@@ -8,9 +8,12 @@
   }()).next();
 }());
 
-assertEq(frame.functionDisplayName, "iife2");
-assertEq(frame.parent.functionDisplayName, "generator");
-assertEq(frame.parent.parent.functionDisplayName, "next");
-assertEq(frame.parent.parent.parent.functionDisplayName, "iife1");
-assertEq(frame.parent.parent.parent.parent.functionDisplayName, null);
-assertEq(frame.parent.parent.parent.parent.parent, null);
+// Bug 1102498 - toString does not include self-hosted frames, which can appear
+// depending on GC timing. This may end up changing in the future, see
+// bug 1103155.
+
+var lines = frame.toString().split("\n");
+assertEq(lines[0].startsWith("iife2@"), true);
+assertEq(lines[1].startsWith("generator@"), true);
+assertEq(lines[2].startsWith("iife1@"), true);
+assertEq(lines[3].startsWith("@"), true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1096016.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1096016.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1096016.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1096016.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,13 @@
+if (typeof TypedObject === "undefined")
+  quit();
+
+var T = TypedObject;
+var ObjectStruct = new T.StructType({f: T.Object});
+var o = new ObjectStruct();
+function testGC(o, p) {
+    for (var i = 0; i < 5; i++) {
+        minorgc();
+        o.f >>=  p;
+    }
+}
+testGC(o, {});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1098961.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1098961.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1098961.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1098961.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,9 @@
+if (!this.hasOwnProperty("TypedObject"))
+    quit();
+
+Array.prototype[Symbol.iterator] = function() {
+    for (var i = 3; --i >= 0;) {
+        yield this[i]
+    }
+}
+new TypedObject.ArrayType(TypedObject.int32, 0).build(1, x => 1)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1100202.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1100202.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1100202.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1100202.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,15 @@
+if (typeof TypedObject === "undefined")
+  quit();
+
+(function() {
+    Object
+})()
+var {
+    Object
+} = TypedObject
+function f() {
+    Object(Symbol)
+}
+for (var i = 0; i < 1; i++) {
+    f()
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1102329.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1102329.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1102329.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1102329.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,12 @@
+if (typeof TypedObject === "undefined")
+  quit();
+
+A = Array.bind()
+var {
+    StructType
+} = TypedObject
+var A = new StructType({});
+(function() {
+    new A
+    for (var i = 0; i < 9; i++) {}
+})()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-1.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-1.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-1.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-1.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,12 @@
+
+gczeal(2);
+var Vec3u16Type = TypedObject.uint16.array(3);
+function foo_u16(n) {
+    if (n == 0)
+        return;
+    var i = 0;
+    var vec = new Vec3u16Type([i, i+1, i+2]);
+    var sum = vec[0] + vec[1] + vec[(/[]/g )];
+    foo_u16(n - 1);
+}
+foo_u16(100);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-2.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jit-test/tests/TypedObject/bug1103273-2.js	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,20 @@
+
+var Vec3u16Type = TypedObject.uint16.array(3);
+
+function foo() {
+    var x = 0;
+    for (var i = 0; i < 3; i++) {
+        var obj = new Vec3u16Type;
+        var buf = TypedObject.storage(obj).buffer;
+        var arr = new Uint8Array(buf, 3);
+        arr[0] = i + 1;
+        arr[1] = i + 2;
+        arr[2] = i + 3;
+        for (var j = 0; j < arr.length; j++) {
+            minorgc();
+            x += arr[j];
+        }
+    }
+    assertEq(x, 27);
+}
+foo();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -115,10 +115,6 @@
 #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
 #endif
 
-/* Make sure that char16_t is two bytes unsigned integer */
-JS_STATIC_ASSERT((char16_t)-1 > 0);
-JS_STATIC_ASSERT(sizeof(char16_t) == 2);
-
 bool
 JS::CallArgs::requireAtLeast(JSContext *cx, const char *fnname, unsigned required) {
     if (length() < required) {
@@ -4768,7 +4764,7 @@
 
 static bool
 Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
-         SourceBufferHolder &srcBuf, JS::Value *rval)
+         SourceBufferHolder &srcBuf, MutableHandleValue rval)
 {
     CompileOptions options(cx, optionsArg);
     MOZ_ASSERT(!cx->runtime()->isAtomsCompartment(cx->compartment()));
@@ -4779,7 +4775,6 @@
     AutoLastFrameCheck lfc(cx);
 
     options.setCompileAndGo(obj->is<GlobalObject>());
-    options.setNoScriptRval(!rval);
     SourceCompressionTask sct(cx);
     RootedScript script(cx, frontend::CompileScript(cx, &cx->tempLifoAlloc(),
                                                     obj, NullPtr(), options,
@@ -4789,7 +4784,8 @@
 
     MOZ_ASSERT(script->getVersion() == options.version);
 
-    bool result = Execute(cx, script, *obj, rval);
+    bool result = Execute(cx, script, *obj,
+                          options.noScriptRval ? nullptr : rval.address());
     if (!sct.complete())
         result = false;
 
@@ -4809,7 +4805,7 @@
 
 static bool
 Evaluate(JSContext *cx, AutoObjectVector &scopeChain, const ReadOnlyCompileOptions &optionsArg,
-         SourceBufferHolder &srcBuf, JS::Value *rval)
+         SourceBufferHolder &srcBuf, MutableHandleValue rval)
 {
     RootedObject dynamicScope(cx);
     RootedObject unusedStaticScope(cx);
@@ -4820,15 +4816,15 @@
 
 static bool
 Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
-         const char16_t *chars, size_t length, JS::Value *rval)
+         const char16_t *chars, size_t length, MutableHandleValue rval)
 {
   SourceBufferHolder srcBuf(chars, length, SourceBufferHolder::NoOwnership);
   return ::Evaluate(cx, obj, optionsArg, srcBuf, rval);
 }
 
-static bool
-Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &options,
-         const char *bytes, size_t length, JS::Value *rval)
+extern JS_PUBLIC_API(bool)
+JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &options,
+         const char *bytes, size_t length, MutableHandleValue rval)
 {
     char16_t *chars;
     if (options.utf8)
@@ -4845,7 +4841,7 @@
 
 static bool
 Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
-         const char *filename, JS::Value *rval)
+         const char *filename, MutableHandleValue rval)
 {
     FileContents buffer(cx);
     {
@@ -4859,114 +4855,32 @@
     return Evaluate(cx, obj, options, buffer.begin(), buffer.length(), rval);
 }
 
-extern JS_PUBLIC_API(bool)
+JS_PUBLIC_API(bool)
 JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
              SourceBufferHolder &srcBuf, MutableHandleValue rval)
 {
-    return ::Evaluate(cx, obj, optionsArg, srcBuf, rval.address());
+    return ::Evaluate(cx, obj, optionsArg, srcBuf, rval);
 }
 
-extern JS_PUBLIC_API(bool)
+JS_PUBLIC_API(bool)
 JS::Evaluate(JSContext *cx, AutoObjectVector &scopeChain, const ReadOnlyCompileOptions &optionsArg,
              SourceBufferHolder &srcBuf, MutableHandleValue rval)
 {
-    return ::Evaluate(cx, scopeChain, optionsArg, srcBuf, rval.address());
+    return ::Evaluate(cx, scopeChain, optionsArg, srcBuf, rval);
 }
 
-extern JS_PUBLIC_API(bool)
+JS_PUBLIC_API(bool)
 JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
              const char16_t *chars, size_t length, MutableHandleValue rval)
 {
-    return ::Evaluate(cx, obj, optionsArg, chars, length, rval.address());
-}
-
-extern JS_PUBLIC_API(bool)
-JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &options,
-             const char *bytes, size_t length, MutableHandleValue rval)
-{
-    return ::Evaluate(cx, obj, options, bytes, length, rval.address());
+    return ::Evaluate(cx, obj, optionsArg, chars, length, rval);
 }
 
-extern JS_PUBLIC_API(bool)
+JS_PUBLIC_API(bool)
 JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
              const char *filename, MutableHandleValue rval)
 {
-    return ::Evaluate(cx, obj, optionsArg, filename, rval.address());
-}
-
-extern JS_PUBLIC_API(bool)
-JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
-             SourceBufferHolder &srcBuf)
-{
-    return ::Evaluate(cx, obj, optionsArg, srcBuf, nullptr);
-}
-
-extern JS_PUBLIC_API(bool)
-JS::Evaluate(JSContext *cx, AutoObjectVector &scopeChain, const ReadOnlyCompileOptions &optionsArg,
-             SourceBufferHolder &srcBuf)
-{
-    return ::Evaluate(cx, scopeChain, optionsArg, srcBuf, nullptr);
-}
-
-extern JS_PUBLIC_API(bool)
-JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
-             const char16_t *chars, size_t length)
-{
-    return ::Evaluate(cx, obj, optionsArg, chars, length, nullptr);
-}
-
-extern JS_PUBLIC_API(bool)
-JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &options,
-             const char *bytes, size_t length)
-{
-    return ::Evaluate(cx, obj, options, bytes, length, nullptr);
-}
-
-extern JS_PUBLIC_API(bool)
-JS::Evaluate(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &optionsArg,
-             const char *filename)
-{
-    return ::Evaluate(cx, obj, optionsArg, filename, nullptr);
-}
-
-JS_PUBLIC_API(bool)
-JS_EvaluateUCScript(JSContext *cx, HandleObject obj, const char16_t *chars, unsigned length,
-                    const char *filename, unsigned lineno, MutableHandleValue rval)
-{
-    CompileOptions options(cx);
-    options.setFileAndLine(filename, lineno);
-
-    return ::Evaluate(cx, obj, options, chars, length, rval.address());
-}
-
-JS_PUBLIC_API(bool)
-JS_EvaluateUCScript(JSContext *cx, HandleObject obj, SourceBufferHolder &srcBuf,
-                    const char *filename, unsigned lineno, MutableHandleValue rval)
-{
-    CompileOptions options(cx);
-    options.setFileAndLine(filename, lineno);
-
-    return ::Evaluate(cx, obj, options, srcBuf, rval.address());
-}
-
-JS_PUBLIC_API(bool)
-JS_EvaluateScript(JSContext *cx, HandleObject obj, const char *bytes, unsigned nbytes,
-                  const char *filename, unsigned lineno, MutableHandleValue rval)
-{
-    CompileOptions options(cx);
-    options.setFileAndLine(filename, lineno);
-
-    return ::Evaluate(cx, obj, options, bytes, nbytes, rval.address());
-}
-
-JS_PUBLIC_API(bool)
-JS_EvaluateScript(JSContext *cx, HandleObject obj, const char *bytes, unsigned nbytes,
-                  const char *filename, unsigned lineno)
-{
-    CompileOptions options(cx);
-    options.setFileAndLine(filename, lineno);
-
-    return ::Evaluate(cx, obj, options, bytes, nbytes, nullptr);
+    return ::Evaluate(cx, obj, optionsArg, filename, rval);
 }
 
 JS_PUBLIC_API(bool)
@@ -6103,6 +6017,7 @@
 JS::AutoSaveExceptionState::AutoSaveExceptionState(JSContext *cx)
   : context(cx),
     wasPropagatingForcedReturn(cx->propagatingForcedReturn_),
+    wasOverRecursed(cx->overRecursed_),
     wasThrowing(cx->throwing),
     exceptionValue(cx)
 {
@@ -6110,6 +6025,8 @@
     CHECK_REQUEST(cx);
     if (wasPropagatingForcedReturn)
         cx->clearPropagatingForcedReturn();
+    if (wasOverRecursed)
+        cx->overRecursed_ = false;
     if (wasThrowing) {
         exceptionValue = cx->unwrappedException_;
         cx->clearPendingException();
@@ -6120,6 +6037,7 @@
 JS::AutoSaveExceptionState::restore()
 {
     context->propagatingForcedReturn_ = wasPropagatingForcedReturn;
+    context->overRecursed_ = wasOverRecursed;
     context->throwing = wasThrowing;
     context->unwrappedException_ = exceptionValue;
     drop();
@@ -6131,6 +6049,7 @@
         if (wasPropagatingForcedReturn)
             context->setPropagatingForcedReturn();
         if (wasThrowing) {
+            context->overRecursed_ = wasOverRecursed;
             context->throwing = true;
             context->unwrappedException_ = exceptionValue;
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi.h	2014-11-26 21:45:57.000000000 +0000
@@ -4006,7 +4006,7 @@
 JS_DecompileFunctionBody(JSContext *cx, JS::Handle<JSFunction*> fun, unsigned indent);
 
 /*
- * NB: JS_ExecuteScript and the JS_Evaluate*Script* quadruplets use the obj
+ * NB: JS_ExecuteScript and the JS::Evaluate APIs use the obj
  * parameter as the initial scope chain header, the 'this' keyword value, and
  * the variables object (ECMA parlance for where 'var' and 'function' bind
  * names) of the execution context for script.
@@ -4026,17 +4026,16 @@
  * non-ECMA explicit vs. implicit variable creation.
  *
  * Caveat embedders: unless you already depend on this buggy variables object
- * binding behavior, you should call ContextOptionsRef(cx).setVarObjFix(true)
+ * binding behavior, you should call RuntimeOptionsRef(rt).setVarObjFix(true)
  * for each context in the application, if you pass parented objects as the obj
  * parameter, or may ever pass such objects in the future.
  *
- * Why a runtime option?  The alternative is to add six or so new API entry
- * points with signatures matching the following six, and that doesn't seem
- * worth the code bloat cost.  Such new entry points would probably have less
- * obvious names, too, so would not tend to be used.  The JS_SetOption call,
- * OTOH, can be more easily hacked into existing code that does not depend on
- * the bug; such code can continue to use the familiar JS_EvaluateScript,
- * etc., entry points.
+ * Why a runtime option?  The alternative is to add APIs duplicating those below
+ * for the other value of varobjfix, and that doesn't seem worth the code bloat
+ * cost.  Such new entry points would probably have less obvious names, too, so
+ * would not tend to be used.  The RuntimeOptionsRef adjustment, OTOH, can be
+ * more easily hacked into existing code that does not depend on the bug; such
+ * code can continue to use the familiar JS::Evaluate, etc., entry points.
  */
 extern JS_PUBLIC_API(bool)
 JS_ExecuteScript(JSContext *cx, JS::HandleObject obj, JS::HandleScript script, JS::MutableHandleValue rval);
@@ -4067,23 +4066,6 @@
 
 } /* namespace JS */
 
-extern JS_PUBLIC_API(bool)
-JS_EvaluateScript(JSContext *cx, JS::HandleObject obj,
-                  const char *bytes, unsigned length,
-                  const char *filename, unsigned lineno,
-                  JS::MutableHandleValue rval);
-
-extern JS_PUBLIC_API(bool)
-JS_EvaluateScript(JSContext *cx, JS::HandleObject obj,
-                  const char *bytes, unsigned length,
-                  const char *filename, unsigned lineno);
-
-extern JS_PUBLIC_API(bool)
-JS_EvaluateUCScript(JSContext *cx, JS::Handle<JSObject*> obj,
-                    const char16_t *chars, unsigned length,
-                    const char *filename, unsigned lineno,
-                    JS::MutableHandle<JS::Value> rval);
-
 namespace JS {
 
 extern JS_PUBLIC_API(bool)
@@ -4106,26 +4088,6 @@
 Evaluate(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
          const char *filename, JS::MutableHandleValue rval);
 
-extern JS_PUBLIC_API(bool)
-Evaluate(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
-         SourceBufferHolder &srcBuf);
-
-extern JS_PUBLIC_API(bool)
-Evaluate(JSContext *cx, AutoObjectVector &scopeChain,
-         const ReadOnlyCompileOptions &options, SourceBufferHolder &srcBuf);
-
-extern JS_PUBLIC_API(bool)
-Evaluate(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
-         const char16_t *chars, size_t length);
-
-extern JS_PUBLIC_API(bool)
-Evaluate(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
-         const char *bytes, size_t length);
-
-extern JS_PUBLIC_API(bool)
-Evaluate(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
-         const char *filename);
-
 } /* namespace JS */
 
 extern JS_PUBLIC_API(bool)
@@ -4979,7 +4941,7 @@
  *
  * Typical usage:
  *
- *     bool ok = JS_EvaluateScript(cx, ...);
+ *     bool ok = JS::Evaluate(cx, ...);
  *     AutoSaveExceptionState savedExc(cx);
  *     ... cleanup that might re-enter JS ...
  *     return ok;
@@ -4989,6 +4951,7 @@
   private:
     JSContext *context;
     bool wasPropagatingForcedReturn;
+    bool wasOverRecursed;
     bool wasThrowing;
     RootedValue exceptionValue;
 
@@ -5011,6 +4974,7 @@
      */
     void drop() {
         wasPropagatingForcedReturn = false;
+        wasOverRecursed = false;
         wasThrowing = false;
         exceptionValue.setUndefined();
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/moz.build	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/moz.build	2014-11-26 21:45:57.000000000 +0000
@@ -34,6 +34,7 @@
     'testFuncCallback.cpp',
     'testFunctionProperties.cpp',
     'testGCAllocator.cpp',
+    'testGCChunkPool.cpp',
     'testGCExactRooting.cpp',
     'testGCFinalizeCallback.cpp',
     'testGCHeapPostBarriers.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/README thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/README
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/README	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/README	2014-11-26 21:45:57.000000000 +0000
@@ -72,7 +72,7 @@
 
     EXEC(const char *code);
 
-        Execute some JS code in global scope, using JS_EvaluateScript. Return
+        Execute some JS code in global scope, using JS::Evaluate. Return
         false if that fails. (This means that if the code throws an uncaught JS
         exception, the test fails.)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testArrayBufferView.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testArrayBufferView.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testArrayBufferView.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testArrayBufferView.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -93,7 +93,9 @@
     static const char code[] = "new DataView(new ArrayBuffer(8))";
 
     JS::Rooted<JS::Value> val(cx);
-    if (!JS_EvaluateScript(cx, global, code, strlen(code), __FILE__, __LINE__, &val))
+    JS::CompileOptions opts(cx);
+    if (!JS::Evaluate(cx, global, opts.setFileAndLine(__FILE__, __LINE__),
+                      code, strlen(code), &val))
         return nullptr;
 
     JS::Rooted<JSObject*> dv(cx, &val.toObject());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testFreshGlobalEvalRedefinition.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -41,7 +41,9 @@
     CHECK(JS_GetProperty(cx, g, "Object", &v));
 
     static const char data[] = "Object.defineProperty(this, 'eval', { configurable: false });";
-    CHECK(JS_EvaluateScript(cx, g, data, mozilla::ArrayLength(data) - 1, __FILE__, __LINE__, &v));
+    JS::CompileOptions opts(cx);
+    CHECK(JS::Evaluate(cx, g, opts.setFileAndLine(__FILE__, __LINE__),
+                       data, mozilla::ArrayLength(data) - 1, &v));
 
     return true;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testGCChunkPool.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testGCChunkPool.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testGCChunkPool.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testGCChunkPool.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+* 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/. */
+
+#include "mozilla/Move.h"
+
+#include "gc/GCRuntime.h"
+#include "gc/Heap.h"
+
+#include "jsapi-tests/tests.h"
+
+BEGIN_TEST(testGCChunkPool)
+{
+    const int N = 10;
+    js::gc::ChunkPool pool;
+
+    // Create.
+    for (int i = 0; i < N; ++i) {
+        js::gc::Chunk *chunk = js::gc::Chunk::allocate(rt);
+        CHECK(chunk);
+        pool.push(chunk);
+    }
+    MOZ_ASSERT(pool.verify());
+
+    // Iterate.
+    uint32_t i = 0;
+    for (js::gc::ChunkPool::Iter iter(pool); !iter.done(); iter.next(), ++i)
+        CHECK(iter.get());
+    CHECK(i == pool.count());
+    MOZ_ASSERT(pool.verify());
+
+    // Push/Pop.
+    for (int i = 0; i < N; ++i) {
+        js::gc::Chunk *chunkA = pool.pop();
+        js::gc::Chunk *chunkB = pool.pop();
+        js::gc::Chunk *chunkC = pool.pop();
+        pool.push(chunkA);
+        pool.push(chunkB);
+        pool.push(chunkC);
+    }
+    MOZ_ASSERT(pool.verify());
+
+    // Remove.
+    js::gc::Chunk *chunk = nullptr;
+    int offset = N / 2;
+    for (js::gc::ChunkPool::Iter iter(pool); !iter.done(); iter.next(), --offset) {
+        if (offset == 0) {
+            chunk = pool.remove(iter.get());
+            break;
+        }
+    }
+    CHECK(chunk);
+    MOZ_ASSERT(!pool.contains(chunk));
+    MOZ_ASSERT(pool.verify());
+    pool.push(chunk);
+
+    // Destruct.
+    js::AutoLockGC lock(rt);
+    for (js::gc::ChunkPool::Iter iter(pool); !iter.done();) {
+        js::gc::Chunk *chunk = iter.get();
+        iter.next();
+        pool.remove(chunk);
+        js::gc::UnmapPages(chunk, js::gc::ChunkSize);
+    }
+
+    return true;
+}
+END_TEST(testGCChunkPool)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testGCOutOfMemory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testGCOutOfMemory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testGCOutOfMemory.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testGCOutOfMemory.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -29,7 +29,8 @@
         "        array.push({});"
         "    array = []; array.push(0);"
         "})();";
-    bool ok = JS_EvaluateScript(cx, global, source, strlen(source), "", 1, &root);
+    JS::CompileOptions opts(cx);
+    bool ok = JS::Evaluate(cx, global, opts, source, strlen(source), &root);
 
     /* Check that we get OOM. */
     CHECK(!ok);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testJitRangeAnalysis.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testJitRangeAnalysis.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testJitRangeAnalysis.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testJitRangeAnalysis.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -5,6 +5,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/ArrayUtils.h"
+
 #include "jit/IonAnalysis.h"
 #include "jit/MIRGenerator.h"
 #include "jit/MIRGraph.h"
@@ -209,3 +211,67 @@
     return true;
 }
 END_TEST(testJitRangeAnalysis_MathSignBeta)
+
+BEGIN_TEST(testJitRangeAnalysis_StrictCompareBeta)
+{
+    MinimalFunc func;
+
+    MBasicBlock *entry = func.createEntryBlock();
+    MBasicBlock *thenBlock = func.createBlock(entry);
+    MBasicBlock *elseBlock = func.createBlock(entry);
+
+    // if (p === 0)
+    MParameter *p = func.createParameter();
+    entry->add(p);
+    MConstant *c0 = MConstant::New(func.alloc, DoubleValue(0.0));
+    entry->add(c0);
+    MCompare *cmp = MCompare::New(func.alloc, p, c0, JSOP_STRICTEQ);
+    entry->add(cmp);
+    entry->end(MTest::New(func.alloc, cmp, thenBlock, elseBlock));
+
+    // {
+    //   return p + -0;
+    // }
+    MConstant *cm0 = MConstant::New(func.alloc, DoubleValue(-0.0));
+    thenBlock->add(cm0);
+    MAdd *thenAdd = MAdd::NewAsmJS(func.alloc, p, cm0, MIRType_Double);
+    thenBlock->add(thenAdd);
+    MReturn *thenRet = MReturn::New(func.alloc, thenAdd);
+    thenBlock->end(thenRet);
+
+    // else
+    // {
+    //   return 0;
+    // }
+    MReturn *elseRet = MReturn::New(func.alloc, c0);
+    elseBlock->end(elseRet);
+
+    // If range analysis inserts a beta node for p, it will be able to compute
+    // a meaningful range for p + -0.
+
+    // We can't do beta node insertion with STRICTEQ and a non-numeric
+    // comparison though.
+    MCompare::CompareType nonNumerics[] = {
+        MCompare::Compare_Unknown,
+        MCompare::Compare_Object,
+        MCompare::Compare_Value,
+        MCompare::Compare_String
+    };
+    for (size_t i = 0; i < mozilla::ArrayLength(nonNumerics); ++i) {
+        cmp->setCompareType(nonNumerics[i]);
+        if (!func.runRangeAnalysis())
+            return false;
+        CHECK(!thenAdd->range() || thenAdd->range()->isUnknown());
+        ClearDominatorTree(func.graph);
+    }
+
+    // We can do it with a numeric comparison.
+    cmp->setCompareType(MCompare::Compare_Double);
+    if (!func.runRangeAnalysis())
+        return false;
+    CHECK(EquivalentRanges(thenAdd->range(),
+                           Range::NewDoubleRange(func.alloc, 0.0, 0.0)));
+
+    return true;
+}
+END_TEST(testJitRangeAnalysis_StrictCompareBeta)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testJSEvaluateScript.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testJSEvaluateScript.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testJSEvaluateScript.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testJSEvaluateScript.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -14,7 +14,9 @@
     static const char src[] = "var x = 5;";
 
     JS::RootedValue retval(cx);
-    CHECK(JS_EvaluateScript(cx, obj, src, sizeof(src) - 1, __FILE__, __LINE__, &retval));
+    JS::CompileOptions opts(cx);
+    CHECK(JS::Evaluate(cx, obj, opts.setFileAndLine(__FILE__, __LINE__),
+                       src, sizeof(src) - 1, &retval));
 
     bool hasProp = true;
     CHECK(JS_AlreadyHasOwnProperty(cx, obj, "x", &hasProp));
@@ -29,7 +31,8 @@
 
     static const char src2[] = "var y = 5;";
 
-    CHECK(JS_EvaluateScript(cx, obj, src2, sizeof(src2) - 1, __FILE__, __LINE__, &retval));
+    CHECK(JS::Evaluate(cx, obj, opts.setFileAndLine(__FILE__, __LINE__),
+                       src2, sizeof(src2) - 1, &retval));
 
     hasProp = false;
     CHECK(JS_AlreadyHasOwnProperty(cx, obj, "y", &hasProp));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/tests.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/tests.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/tests.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/tests.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -54,7 +54,9 @@
 {
     JS::RootedValue v(cx);
     JS::HandleObject global = JS::HandleObject::fromMarkedLocation(this->global.unsafeGet());
-    return JS_EvaluateScript(cx, global, bytes, strlen(bytes), filename, lineno, &v) ||
+    JS::CompileOptions opts(cx);
+    opts.setFileAndLine(filename, lineno);
+    return JS::Evaluate(cx, global, opts, bytes, strlen(bytes), &v) ||
         fail(JSAPITestString(bytes), filename, lineno);
 }
 
@@ -62,7 +64,9 @@
                          JS::MutableHandleValue vp)
 {
     JS::HandleObject global = JS::HandleObject::fromMarkedLocation(this->global.unsafeGet());
-    return JS_EvaluateScript(cx, global, bytes, strlen(bytes), filename, lineno, vp) ||
+    JS::CompileOptions opts(cx);
+    opts.setFileAndLine(filename, lineno);
+    return JS::Evaluate(cx, global, opts, bytes, strlen(bytes), vp) ||
         fail(JSAPITestString(bytes), filename, lineno);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testSourcePolicy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testSourcePolicy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsapi-tests/testSourcePolicy.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsapi-tests/testSourcePolicy.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -16,9 +16,15 @@
     s[0] = '"';
     memset(s + 1, 'x', strLen - 2);
     s[strLen - 1] = '"';
-    CHECK(JS::Evaluate(cx, global, opts, s, strLen));
+    // We don't want an rval for our Evaluate call
+    opts.setNoScriptRval(true);
+    JS::RootedValue unused(cx);
+    CHECK(JS::Evaluate(cx, global, opts, s, strLen, &unused));
     JS::RootedFunction fun(cx);
     JS::AutoObjectVector emptyScopeChain(cx);
+    // But when compiling a function we don't want to use no-rval
+    // mode, since it's not supported for functions.
+    opts.setNoScriptRval(false);
     CHECK(JS::CompileFunction(cx, emptyScopeChain, opts, "f", 0, nullptr, s, strLen, &fun));
     CHECK(fun);
     JS_free(cx, s);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsarray.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsarray.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsarray.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsarray.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -3119,7 +3119,7 @@
 }
 
 static bool
-ArrayFromCallArgs(JSContext *cx, RootedTypeObject &type, CallArgs &args)
+ArrayFromCallArgs(JSContext *cx, HandleTypeObject type, CallArgs &args)
 {
     if (!InitArrayTypes(cx, type, args.array(), args.length()))
         return false;
@@ -3227,6 +3227,12 @@
     JS_SELF_HOSTED_SYM_FN(iterator,  "ArrayValues",      0,0),
     JS_SELF_HOSTED_FN("entries",     "ArrayEntries",     0,0),
     JS_SELF_HOSTED_FN("keys",        "ArrayKeys",        0,0),
+
+    /* ES7 additions */
+#ifdef NIGHTLY_BUILD
+    JS_SELF_HOSTED_FN("includes",    "ArrayIncludes",    2,0),
+#endif
+
     JS_FS_END
 };
 
@@ -3296,6 +3302,21 @@
     return true;
 }
 
+ArrayObject *
+js::ArrayConstructorOneArg(JSContext *cx, HandleTypeObject type, int32_t lengthInt)
+{
+    if (lengthInt < 0) {
+        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+        return nullptr;
+    }
+
+    uint32_t length = uint32_t(lengthInt);
+    AllocatingBehaviour allocating = (length <= ArrayObject::EagerAllocationMaxLength)
+                                   ? NewArray_FullyAllocating
+                                   : NewArray_PartlyAllocating;
+    return NewDenseArray(cx, length, type, allocating);
+}
+
 static JSObject *
 CreateArrayPrototype(JSContext *cx, JSProtoKey key)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsarray.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsarray.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsarray.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsarray.h	2014-11-26 21:45:57.000000000 +0000
@@ -196,6 +196,9 @@
 extern bool
 NewbornArrayPush(JSContext *cx, HandleObject obj, const Value &v);
 
+extern ArrayObject *
+ArrayConstructorOneArg(JSContext *cx, HandleTypeObject type, int32_t lengthInt);
+
 } /* namespace js */
 
 #ifdef DEBUG
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscntxt.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscntxt.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscntxt.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscntxt.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -416,8 +416,10 @@
      */
     fprintf(stderr, "js_ReportOverRecursed called\n");
 #endif
-    if (maybecx)
+    if (maybecx) {
         JS_ReportErrorNumber(maybecx, js_GetErrorMessage, nullptr, JSMSG_OVER_RECURSED);
+        maybecx->overRecursed_ = true;
+    }
 }
 
 void
@@ -1010,7 +1012,9 @@
     throwing(false),
     unwrappedException_(UndefinedValue()),
     options_(),
+    overRecursed_(false),
     propagatingForcedReturn_(false),
+    liveVolatileJitFrameIterators_(nullptr),
     reportGranularity(JS_DEFAULT_JITREPORT_GRANULARITY),
     resolvingList(nullptr),
     generatingError(false),
@@ -1041,11 +1045,13 @@
     rval.set(unwrappedException_);
     if (IsAtomsCompartment(compartment()))
         return true;
+    bool wasOverRecursed = overRecursed_;
     clearPendingException();
     if (!compartment()->wrap(this, rval))
         return false;
     assertSameCompartment(this, rval);
     setPendingException(rval);
+    overRecursed_ = wasOverRecursed;
     return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscntxt.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscntxt.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscntxt.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscntxt.h	2014-11-26 21:45:57.000000000 +0000
@@ -35,6 +35,7 @@
 namespace jit {
 class IonContext;
 class CompileCompartment;
+class DebugModeOSRVolatileJitFrameIterator;
 }
 
 struct CallsiteCloneKey {
@@ -421,6 +422,8 @@
 
     friend class js::ExclusiveContext;
     friend class JS::AutoSaveExceptionState;
+    friend class js::jit::DebugModeOSRVolatileJitFrameIterator;
+    friend void js_ReportOverRecursed(JSContext *);
 
   private:
     /* Exception state -- the exception member is a GC root by definition. */
@@ -430,10 +433,18 @@
     /* Per-context options. */
     JS::ContextOptions  options_;
 
+    // True if the exception currently being thrown is by result of
+    // js_ReportOverRecursed. See Debugger::slowPathOnExceptionUnwind.
+    bool                overRecursed_;
+
     // True if propagating a forced return from an interrupt handler during
     // debug mode.
     bool                propagatingForcedReturn_;
 
+    // A stack of live iterators that need to be updated in case of debug mode
+    // OSR.
+    js::jit::DebugModeOSRVolatileJitFrameIterator *liveVolatileJitFrameIterators_;
+
   public:
     int32_t             reportGranularity;  /* see vm/Probes.h */
 
@@ -565,9 +576,11 @@
 
     void clearPendingException() {
         throwing = false;
+        overRecursed_ = false;
         unwrappedException_.setUndefined();
     }
 
+    bool isThrowingOverRecursed() const { return throwing && overRecursed_; }
     bool isPropagatingForcedReturn() const { return propagatingForcedReturn_; }
     void setPropagatingForcedReturn() { propagatingForcedReturn_ = true; }
     void clearPropagatingForcedReturn() { propagatingForcedReturn_ = false; }
@@ -958,6 +971,7 @@
 bool intrinsic_ThrowError(JSContext *cx, unsigned argc, Value *vp);
 bool intrinsic_NewDenseArray(JSContext *cx, unsigned argc, Value *vp);
 bool intrinsic_IsConstructing(JSContext *cx, unsigned argc, Value *vp);
+bool intrinsic_SubstringKernel(JSContext *cx, unsigned argc, Value *vp);
 
 bool intrinsic_UnsafePutElements(JSContext *cx, unsigned argc, Value *vp);
 bool intrinsic_DefineDataProperty(JSContext *cx, unsigned argc, Value *vp);
@@ -978,6 +992,8 @@
 bool intrinsic_TypeDescrIsSimpleType(JSContext *cx, unsigned argc, Value *vp);
 bool intrinsic_TypeDescrIsArrayType(JSContext *cx, unsigned argc, Value *vp);
 
+bool intrinsic_IsSuspendedStarGenerator(JSContext *cx, unsigned argc, Value *vp);
+
 class AutoLockForExclusiveAccess
 {
     JSRuntime *runtime;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscntxtinlines.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscntxtinlines.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscntxtinlines.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscntxtinlines.h	2014-11-26 21:45:57.000000000 +0000
@@ -367,6 +367,8 @@
 JSContext::setPendingException(js::Value v)
 {
     MOZ_ASSERT(!IsPoisonedValue(v));
+    // overRecursed_ is set after the fact by js_ReportOverRecursed.
+    this->overRecursed_ = false;
     this->throwing = true;
     this->unwrappedException_ = v;
     // We don't use assertSameCompartment here to allow
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscompartment.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscompartment.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscompartment.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscompartment.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -402,7 +402,7 @@
 
     // Invoke the prewrap callback. We're a bit worried about infinite
     // recursion here, so we do a check - see bug 809295.
-    JS_CHECK_CHROME_RECURSION(cx, return false);
+    JS_CHECK_SYSTEM_RECURSION(cx, return false);
     if (cb->preWrap) {
         obj.set(cb->preWrap(cx, global, obj, objectPassedToWrap));
         if (!obj)
@@ -563,7 +563,12 @@
 JSCompartment::sweepGlobalObject(FreeOp *fop)
 {
     if (global_.unbarrieredGet() && IsObjectAboutToBeFinalizedFromAnyThread(global_.unsafeGet())) {
-        if (debugMode())
+        // For main thread compartments, the invariant is that debug mode
+        // implies having at least one Debugger still attached. However, for
+        // off-thread compartments, which are used in off-thread parsing, they
+        // may be isDebuggee() without there being any Debuggers to prohibit
+        // asm.js.
+        if (isDebuggee() && !global_->compartment()->options().invisibleToDebugger())
             Debugger::detachAllDebuggersFromGlobal(fop, global_);
         global_.set(nullptr);
     }
@@ -716,17 +721,6 @@
     objectMetadataCallback = callback;
 }
 
-bool
-JSCompartment::hasScriptsOnStack()
-{
-    for (ActivationIterator iter(runtimeFromMainThread()); !iter.done(); ++iter) {
-        if (iter->compartment() == this)
-            return true;
-    }
-
-    return false;
-}
-
 static bool
 AddInnerLazyFunctionsFromScript(JSScript *script, AutoObjectVector &lazyFunctions)
 {
@@ -799,58 +793,12 @@
     return true;
 }
 
-bool
-JSCompartment::updateJITForDebugMode(JSContext *maybecx, AutoDebugModeInvalidation &invalidate)
-{
-    // The AutoDebugModeInvalidation argument makes sure we can't forget to
-    // invalidate, but it is also important not to run any scripts in this
-    // compartment until the invalidate is destroyed.  That is the caller's
-    // responsibility.
-    return jit::UpdateForDebugMode(maybecx, this, invalidate);
-}
-
-bool
-JSCompartment::enterDebugMode(JSContext *cx)
-{
-    AutoDebugModeInvalidation invalidate(this);
-    return enterDebugMode(cx, invalidate);
-}
-
-bool
-JSCompartment::enterDebugMode(JSContext *cx, AutoDebugModeInvalidation &invalidate)
-{
-    if (!debugMode()) {
-        debugModeBits |= DebugMode;
-        if (!updateJITForDebugMode(cx, invalidate))
-            return false;
-    }
-    return true;
-}
-
-bool
-JSCompartment::leaveDebugMode(JSContext *cx)
-{
-    AutoDebugModeInvalidation invalidate(this);
-    return leaveDebugMode(cx, invalidate);
-}
-
-bool
-JSCompartment::leaveDebugMode(JSContext *cx, AutoDebugModeInvalidation &invalidate)
-{
-    if (debugMode()) {
-        leaveDebugModeUnderGC();
-        if (!updateJITForDebugMode(cx, invalidate))
-            return false;
-    }
-    return true;
-}
-
 void
-JSCompartment::leaveDebugModeUnderGC()
+JSCompartment::unsetIsDebuggee()
 {
-    if (debugMode()) {
-        debugModeBits &= ~DebugMode;
-        DebugScopes::onCompartmentLeaveDebugMode(this);
+    if (isDebuggee()) {
+        debugModeBits &= ~DebugExecutionMask;
+        DebugScopes::onCompartmentUnsetIsDebuggee(this);
     }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscompartment.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscompartment.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jscompartment.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jscompartment.h	2014-11-26 21:45:57.000000000 +0000
@@ -130,7 +130,6 @@
 }
 
 namespace js {
-class AutoDebugModeInvalidation;
 class DebugScopes;
 class LazyArrayBufferTable;
 class WeakMapBase;
@@ -321,9 +320,14 @@
 
     enum {
         DebugMode = 1 << 0,
-        DebugNeedDelazification = 1 << 1
+        DebugObservesAllExecution = 1 << 1,
+        DebugNeedDelazification = 1 << 2
     };
 
+    // DebugObservesAllExecution is a submode of DebugMode, and is only valid
+    // when DebugMode is also set.
+    static const unsigned DebugExecutionMask = DebugMode | DebugObservesAllExecution;
+
     unsigned                     debugModeBits;
 
   public:
@@ -416,32 +420,66 @@
   private:
     JSCompartment *thisForCtor() { return this; }
 
-    // Only called from {enter,leave}DebugMode.
-    bool updateJITForDebugMode(JSContext *maybecx, js::AutoDebugModeInvalidation &invalidate);
-
   public:
+    //
+    // The Debugger observes execution on a frame-by-frame basis. The
+    // invariants of JSCompartment's debug mode bits, JSScript::isDebuggee,
+    // InterpreterFrame::isDebuggee, and Baseline::isDebuggee are enumerated
+    // below.
+    //
+    // 1. When a compartment's isDebuggee() == true, relazification and lazy
+    //    parsing are disabled.
+    //
+    // 2. When a compartment's debugObservesAllExecution() == true, all of the
+    //    compartment's scripts are considered debuggee scripts.
+    //
+    // 3. A script is considered a debuggee script either when, per above, its
+    //    compartment is observing all execution, or if it has breakpoints set.
+    //
+    // 4. A debuggee script always pushes a debuggee frame.
+    //
+    // 5. A debuggee frame calls all slow path Debugger hooks in the
+    //    Interpreter and Baseline. A debuggee frame implies that its script's
+    //    BaselineScript, if extant, has been compiled with debug hook calls.
+    //
+    // 6. A debuggee script or a debuggee frame (i.e., during OSR) ensures
+    //    that the compiled BaselineScript is compiled with debug hook calls
+    //    when attempting to enter Baseline.
+    //
+    // 7. A debuggee script or a debuggee frame (i.e., during OSR) does not
+    //    attempt to enter Ion.
+    //
+    // Note that a debuggee frame may exist without its script being a
+    // debuggee script. e.g., Debugger.Frame.prototype.eval only marks the
+    // frame in which it is evaluating as a debuggee frame.
+    //
+
     // True if this compartment's global is a debuggee of some Debugger
     // object.
-    bool debugMode() const {
-        return !!(debugModeBits & DebugMode);
+    bool isDebuggee() const { return !!(debugModeBits & DebugMode); }
+    void setIsDebuggee() { debugModeBits |= DebugMode; }
+    void unsetIsDebuggee();
+
+    // True if an this compartment's global is a debuggee of some Debugger
+    // object with a live hook that observes all execution; e.g.,
+    // onEnterFrame.
+    bool debugObservesAllExecution() const {
+        return (debugModeBits & DebugExecutionMask) == DebugExecutionMask;
+    }
+    void setDebugObservesAllExecution() {
+        MOZ_ASSERT(isDebuggee());
+        debugModeBits |= DebugObservesAllExecution;
+    }
+    void unsetDebugObservesAllExecution() {
+        MOZ_ASSERT(isDebuggee());
+        debugModeBits &= ~DebugObservesAllExecution;
     }
 
-    bool enterDebugMode(JSContext *cx);
-    bool enterDebugMode(JSContext *cx, js::AutoDebugModeInvalidation &invalidate);
-    bool leaveDebugMode(JSContext *cx);
-    bool leaveDebugMode(JSContext *cx, js::AutoDebugModeInvalidation &invalidate);
-    void leaveDebugModeUnderGC();
-
-    /* True if any scripts from this compartment are on the JS stack. */
-    bool hasScriptsOnStack();
-
     /*
      * Schedule the compartment to be delazified. Called from
      * LazyScript::Create.
      */
-    void scheduleDelazificationForDebugMode() {
-        debugModeBits |= DebugNeedDelazification;
-    }
+    void scheduleDelazificationForDebugMode() { debugModeBits |= DebugNeedDelazification; }
 
     /*
      * If we scheduled delazification for turning on debug mode, delazify all
@@ -494,60 +532,6 @@
     return zone == atomsCompartment_->zone();
 }
 
-// For use when changing the debug mode flag on one or more compartments.
-// Invalidate and discard JIT code since debug mode breaks JIT assumptions.
-//
-// AutoDebugModeInvalidation has two modes: compartment or zone
-// invalidation. While it is correct to always use compartment invalidation,
-// if you know ahead of time you need to invalidate a whole zone, it is faster
-// to invalidate the zone.
-//
-// Compartment invalidation only invalidates scripts belonging to that
-// compartment.
-//
-// Zone invalidation invalidates all scripts belonging to non-special
-// (i.e. those with principals) compartments of the zone.
-//
-// FIXME: Remove entirely once bug 716647 lands.
-//
-class js::AutoDebugModeInvalidation
-{
-    JSCompartment *comp_;
-    JS::Zone *zone_;
-
-    enum {
-        NoNeed = 0,
-        ToggledOn = 1,
-        ToggledOff = 2
-    } needInvalidation_;
-
-  public:
-    explicit AutoDebugModeInvalidation(JSCompartment *comp)
-      : comp_(comp), zone_(nullptr), needInvalidation_(NoNeed)
-    { }
-
-    explicit AutoDebugModeInvalidation(JS::Zone *zone)
-      : comp_(nullptr), zone_(zone), needInvalidation_(NoNeed)
-    { }
-
-    ~AutoDebugModeInvalidation();
-
-    bool isFor(JSCompartment *comp) {
-        if (comp_)
-            return comp == comp_;
-        return comp->zone() == zone_;
-    }
-
-    void scheduleInvalidation(bool debugMode) {
-        // If we are scheduling invalidation for multiple compartments, they
-        // must all agree on the toggle. This is so we can decide if we need
-        // to invalidate on-stack scripts.
-        MOZ_ASSERT_IF(needInvalidation_ != NoNeed,
-                      needInvalidation_ == (debugMode ? ToggledOn : ToggledOff));
-        needInvalidation_ = debugMode ? ToggledOn : ToggledOff;
-    }
-};
-
 namespace js {
 
 inline js::Handle<js::GlobalObject*>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsexn.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsexn.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsexn.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsexn.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -490,16 +490,6 @@
 }
 #endif
 
-/* JSProto_ ordering for exceptions shall match JSEXN_ constants. */
-JS_STATIC_ASSERT(JSEXN_ERR == 0);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_INTERNALERR  == JSProto_InternalError);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_EVALERR      == JSProto_EvalError);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_RANGEERR     == JSProto_RangeError);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_REFERENCEERR == JSProto_ReferenceError);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_SYNTAXERR    == JSProto_SyntaxError);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_TYPEERR      == JSProto_TypeError);
-JS_STATIC_ASSERT(JSProto_Error + JSEXN_URIERR       == JSProto_URIError);
-
 /* static */ JSObject *
 ErrorObject::createProto(JSContext *cx, JSProtoKey key)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsexn.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsexn.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsexn.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsexn.h	2014-11-26 21:45:57.000000000 +0000
@@ -86,6 +86,19 @@
 extern JSObject *
 js_CopyErrorObject(JSContext *cx, JS::Handle<js::ErrorObject*> errobj);
 
+static_assert(JSEXN_ERR == 0 &&
+              JSProto_Error + JSEXN_INTERNALERR == JSProto_InternalError &&
+              JSProto_Error + JSEXN_EVALERR == JSProto_EvalError &&
+              JSProto_Error + JSEXN_RANGEERR == JSProto_RangeError &&
+              JSProto_Error + JSEXN_REFERENCEERR == JSProto_ReferenceError &&
+              JSProto_Error + JSEXN_SYNTAXERR == JSProto_SyntaxError &&
+              JSProto_Error + JSEXN_TYPEERR == JSProto_TypeError &&
+              JSProto_Error + JSEXN_URIERR == JSProto_URIError &&
+              JSEXN_URIERR + 1 == JSEXN_LIMIT,
+              "GetExceptionProtoKey and ExnTypeFromProtoKey require that "
+              "each corresponding JSExnType and JSProtoKey value be separated "
+              "by the same constant value");
+
 static inline JSProtoKey
 GetExceptionProtoKey(JSExnType exn)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfriendapi.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfriendapi.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfriendapi.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfriendapi.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -789,13 +789,7 @@
         return buf;
 
     if (showArgs && iter.hasArgs()) {
-        BindingVector bindings(cx);
-        if (fun && fun->isInterpreted()) {
-            if (!FillBindingVector(script, &bindings))
-                return buf;
-        }
-
-
+        BindingIter bi(script);
         bool first = true;
         for (unsigned i = 0; i < iter.numActualArgs(); i++) {
             RootedValue arg(cx);
@@ -818,10 +812,12 @@
             JSAutoByteString nameBytes;
             const char *name = nullptr;
 
-            if (i < bindings.length()) {
-                name = nameBytes.encodeLatin1(cx, bindings[i].name());
+            if (i < iter.numFormalArgs()) {
+                MOZ_ASSERT(i == bi.argIndex());
+                name = nameBytes.encodeLatin1(cx, bi->name());
                 if (!buf)
                     return nullptr;
+                bi++;
             }
 
             if (value) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfriendapi.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfriendapi.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfriendapi.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfriendapi.h	2014-11-26 21:45:57.000000000 +0000
@@ -20,27 +20,12 @@
 #include "js/CallNonGenericMethod.h"
 #include "js/Class.h"
 
-/*
- * This macro checks if the stack pointer has exceeded a given limit. If
- * |tolerance| is non-zero, it returns true only if the stack pointer has
- * exceeded the limit by more than |tolerance| bytes. The WITH_INTOLERANCE
- * versions use a negative tolerance (i.e., the limit is reduced by
- * |intolerance| bytes).
- */
 #if JS_STACK_GROWTH_DIRECTION > 0
-# define JS_CHECK_STACK_SIZE_WITH_TOLERANCE(limit, sp, tolerance)  \
-    ((uintptr_t)(sp) < (limit)+(tolerance))
-# define JS_CHECK_STACK_SIZE_WITH_INTOLERANCE(limit, sp, intolerance)  \
-    ((uintptr_t)(sp) < (limit)-(intolerance))
+# define JS_CHECK_STACK_SIZE(limit, sp) ((uintptr_t)(sp) < (limit))
 #else
-# define JS_CHECK_STACK_SIZE_WITH_TOLERANCE(limit, sp, tolerance)  \
-    ((uintptr_t)(sp) > (limit)-(tolerance))
-# define JS_CHECK_STACK_SIZE_WITH_INTOLERANCE(limit, sp, intolerance)  \
-    ((uintptr_t)(sp) > (limit)+(intolerance))
+# define JS_CHECK_STACK_SIZE(limit, sp) ((uintptr_t)(sp) > (limit))
 #endif
 
-#define JS_CHECK_STACK_SIZE(limit, lval) JS_CHECK_STACK_SIZE_WITH_TOLERANCE(limit, lval, 0)
-
 class JSAtom;
 struct JSErrorFormatString;
 class JSLinearString;
@@ -991,31 +976,48 @@
 RunningWithTrustedPrincipals(JSContext *cx);
 
 inline uintptr_t
-GetNativeStackLimit(JSContext *cx)
+GetNativeStackLimit(JSContext *cx, StackKind kind, int extraAllowance = 0)
 {
-    StackKind kind = RunningWithTrustedPrincipals(cx) ? StackForTrustedScript
-                                                      : StackForUntrustedScript;
     PerThreadDataFriendFields *mainThread =
       PerThreadDataFriendFields::getMainThread(GetRuntime(cx));
-    return mainThread->nativeStackLimit[kind];
+    uintptr_t limit = mainThread->nativeStackLimit[kind];
+#if JS_STACK_GROWTH_DIRECTION > 0
+    limit += extraAllowance;
+#else
+    limit -= extraAllowance;
+#endif
+    return limit;
+}
+
+inline uintptr_t
+GetNativeStackLimit(JSContext *cx, int extraAllowance = 0)
+{
+    StackKind kind = RunningWithTrustedPrincipals(cx) ? StackForTrustedScript
+                                                      : StackForUntrustedScript;
+    return GetNativeStackLimit(cx, kind, extraAllowance);
 }
 
 /*
  * These macros report a stack overflow and run |onerror| if we are close to
- * using up the C stack. The JS_CHECK_CHROME_RECURSION variant gives us a little
- * extra space so that we can ensure that crucial code is able to run.
- * JS_CHECK_RECURSION_CONSERVATIVE gives us a little less space.
+ * using up the C stack. The JS_CHECK_CHROME_RECURSION variant gives us a
+ * little extra space so that we can ensure that crucial code is able to run.
+ * JS_CHECK_RECURSION_CONSERVATIVE allows less space than any other check,
+ * including a safety buffer (as in, it uses the untrusted limit and subtracts
+ * a little more from it).
  */
 
-#define JS_CHECK_RECURSION(cx, onerror)                                         \
+#define JS_CHECK_RECURSION_LIMIT(cx, limit, onerror)                            \
     JS_BEGIN_MACRO                                                              \
         int stackDummy_;                                                        \
-        if (!JS_CHECK_STACK_SIZE(js::GetNativeStackLimit(cx), &stackDummy_)) {  \
+        if (!JS_CHECK_STACK_SIZE(limit, &stackDummy_)) {                        \
             js_ReportOverRecursed(cx);                                          \
             onerror;                                                            \
         }                                                                       \
     JS_END_MACRO
 
+#define JS_CHECK_RECURSION(cx, onerror)                                         \
+    JS_CHECK_RECURSION_LIMIT(cx, js::GetNativeStackLimit(cx), onerror)
+
 #define JS_CHECK_RECURSION_DONT_REPORT(cx, onerror)                             \
     JS_BEGIN_MACRO                                                              \
         int stackDummy_;                                                        \
@@ -1039,29 +1041,11 @@
         }                                                                       \
     JS_END_MACRO
 
-#define JS_CHECK_CHROME_RECURSION(cx, onerror)                                  \
-    JS_BEGIN_MACRO                                                              \
-        int stackDummy_;                                                        \
-        if (!JS_CHECK_STACK_SIZE_WITH_TOLERANCE(js::GetNativeStackLimit(cx),    \
-                                                &stackDummy_,                   \
-                                                1024 * sizeof(size_t)))         \
-        {                                                                       \
-            js_ReportOverRecursed(cx);                                          \
-            onerror;                                                            \
-        }                                                                       \
-    JS_END_MACRO
+#define JS_CHECK_SYSTEM_RECURSION(cx, onerror)                                  \
+    JS_CHECK_RECURSION_LIMIT(cx, js::GetNativeStackLimit(cx, js::StackForSystemCode), onerror)
 
 #define JS_CHECK_RECURSION_CONSERVATIVE(cx, onerror)                            \
-    JS_BEGIN_MACRO                                                              \
-        int stackDummy_;                                                        \
-        if (!JS_CHECK_STACK_SIZE_WITH_INTOLERANCE(js::GetNativeStackLimit(cx),  \
-                                                  &stackDummy_,                 \
-                                                  1024 * sizeof(size_t)))       \
-        {                                                                       \
-            js_ReportOverRecursed(cx);                                          \
-            onerror;                                                            \
-        }                                                                       \
-    JS_END_MACRO
+    JS_CHECK_RECURSION_LIMIT(cx, js::GetNativeStackLimit(cx, js::StackForUntrustedScript, -1024 * int(sizeof(size_t))), onerror)
 
 JS_FRIEND_API(void)
 StartPCCountProfiling(JSContext *cx);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfun.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfun.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfun.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfun.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -443,9 +443,13 @@
 }
 
 bool
-js::FunctionHasResolveHook(const JSAtomState &atomState, PropertyName *name)
+js::FunctionHasResolveHook(const JSAtomState &atomState, jsid id)
 {
-    return name == atomState.prototype || name == atomState.length || name == atomState.name;
+    if (!JSID_IS_ATOM(id))
+        return false;
+
+    JSAtom *atom = JSID_TO_ATOM(id);
+    return atom == atomState.prototype || atom == atomState.length || atom == atomState.name;
 }
 
 bool
@@ -738,7 +742,7 @@
             // self-hosted function which can be cloned over again. The latter
             // is stored in the first extended slot.
             if (IS_GC_MARKING_TRACER(trc) && !compartment()->hasBeenEntered() &&
-                !compartment()->debugMode() && !compartment()->isSelfHosting &&
+                !compartment()->isDebuggee() && !compartment()->isSelfHosting &&
                 u.i.s.script_->isRelazifiable() && (!isSelfHostedBuiltin() || isExtended()))
             {
                 relazify(trc);
@@ -1069,16 +1073,17 @@
                 return nullptr;
 
             // Fish out the argument names.
-            BindingVector *localNames = cx->new_<BindingVector>(cx);
-            ScopedJSDeletePtr<BindingVector> freeNames(localNames);
-            if (!FillBindingVector(script, localNames))
-                return nullptr;
-            for (unsigned i = 0; i < fun->nargs(); i++) {
-                if ((i && !out.append(", ")) ||
-                    (i == unsigned(fun->nargs() - 1) && fun->hasRest() && !out.append("...")) ||
-                    !out.append((*localNames)[i].name())) {
+            MOZ_ASSERT(script->bindings.numArgs() == fun->nargs());
+
+            BindingIter bi(script);
+            for (unsigned i = 0; i < fun->nargs(); i++, bi++) {
+                MOZ_ASSERT(bi.argIndex() == i);
+                if (i && !out.append(", "))
+                    return nullptr;
+                if (i == unsigned(fun->nargs() - 1) && fun->hasRest() && !out.append("..."))
+                    return nullptr;
+                if (!out.append(bi->name()))
                     return nullptr;
-                }
             }
             if (!out.append(") {\n"))
                 return nullptr;
@@ -1500,7 +1505,7 @@
     JSScript *script = nonLazyScript();
     MOZ_ASSERT(script->isRelazifiable());
     MOZ_ASSERT(!compartment()->hasBeenEntered());
-    MOZ_ASSERT(!compartment()->debugMode());
+    MOZ_ASSERT(!compartment()->isDebuggee());
 
     // If the script's canonical function isn't lazy, we have to mark the
     // script. Otherwise, the following scenario would leave it unmarked
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfun.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfun.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsfun.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsfun.h	2014-11-26 21:45:57.000000000 +0000
@@ -58,11 +58,8 @@
         INTERPRETED_LAMBDA_ARROW = INTERPRETED | LAMBDA | ARROW
     };
 
-    static void staticAsserts() {
-        JS_STATIC_ASSERT(INTERPRETED == JS_FUNCTION_INTERPRETED_BIT);
-        static_assert(sizeof(JSFunction) == sizeof(js::shadow::Function),
-                      "shadow interface must match actual interface");
-    }
+    static_assert(INTERPRETED == JS_FUNCTION_INTERPRETED_BIT,
+                  "jsfriendapi.h's JSFunction::INTERPRETED-alike is wrong");
 
   private:
     uint16_t        nargs_;       /* number of formal arguments
@@ -423,8 +420,13 @@
     }
 
     static unsigned offsetOfNativeOrScript() {
-        JS_STATIC_ASSERT(offsetof(U, n.native) == offsetof(U, i.s.script_));
-        JS_STATIC_ASSERT(offsetof(U, n.native) == offsetof(U, nativeOrScript));
+        static_assert(offsetof(U, n.native) == offsetof(U, i.s.script_),
+                      "native and script pointers must be in the same spot "
+                      "for offsetOfNativeOrScript() have any sense");
+        static_assert(offsetof(U, n.native) == offsetof(U, nativeOrScript),
+                      "U::nativeOrScript must be at the same offset as "
+                      "native");
+
         return offsetof(JSFunction, u.nativeOrScript);
     }
 
@@ -460,7 +462,6 @@
 
   public:
     inline bool isExtended() const {
-        JS_STATIC_ASSERT(FinalizeKind != ExtendedFinalizeKind);
         MOZ_ASSERT_IF(isTenured(), !!(flags() & EXTENDED) == (asTenured().getAllocKind() == ExtendedFinalizeKind));
         return !!(flags() & EXTENDED);
     }
@@ -481,6 +482,10 @@
 
     /* GC support. */
     js::gc::AllocKind getAllocKind() const {
+        static_assert(FinalizeKind != ExtendedFinalizeKind,
+                      "extended/non-extended AllocKinds have to be different "
+                      "for getAllocKind() to have a reason to exist");
+
         js::gc::AllocKind kind = FinalizeKind;
         if (isExtended())
             kind = ExtendedFinalizeKind;
@@ -489,6 +494,9 @@
     }
 };
 
+static_assert(sizeof(JSFunction) == sizeof(js::shadow::Function),
+              "shadow interface must match actual interface");
+
 extern JSString *
 fun_toStringHelper(JSContext *cx, js::HandleObject obj, unsigned indent);
 
@@ -531,7 +539,7 @@
                NewObjectKind newKind = GenericObject);
 
 bool
-FunctionHasResolveHook(const JSAtomState &atomState, PropertyName *name);
+FunctionHasResolveHook(const JSAtomState &atomState, jsid id);
 
 extern bool
 fun_resolve(JSContext *cx, HandleObject obj, HandleId id, bool *resolvedp);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsgc.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsgc.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsgc.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsgc.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -189,7 +189,8 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
 
-#include <string.h>     /* for memset used when DEBUG */
+#include <ctype.h>
+#include <string.h>
 #ifndef XP_WIN
 # include <sys/mman.h>
 # include <unistd.h>
@@ -559,7 +560,7 @@
 {
     // When operating in the foreground, take the lock at the top.
     Maybe<AutoLockGC> maybeLock;
-    if (!fop->runtime()->gc.isBackgroundSweeping())
+    if (!fop->onBackgroundThread())
         maybeLock.emplace(fop->runtime());
 
     /*
@@ -579,9 +580,9 @@
 
         if (nmarked) {
             dest.insertAt(aheader, nfree);
-        } else if (keepArenas) {
+        } else if (keepArenas == ArenaLists::KEEP_ARENAS) {
             aheader->chunk()->recycleArena(aheader, dest, thingKind, thingsPerArena);
-        } else if (fop->runtime()->gc.isBackgroundSweeping()) {
+        } else if (fop->onBackgroundThread()) {
             // When background sweeping, take the lock around each release so
             // that we do not block the foreground for extended periods.
             AutoLockGC lock(fop->runtime());
@@ -663,56 +664,84 @@
     UnmapPages(static_cast<void *>(p), ChunkSize);
 }
 
-/* Must be called with the GC lock taken. */
-inline Chunk *
-ChunkPool::get(JSRuntime *rt)
+Chunk *
+ChunkPool::pop()
 {
-    Chunk *chunk = head_;
-    if (!chunk) {
-        MOZ_ASSERT(!count_);
+    MOZ_ASSERT(bool(head_) == bool(count_));
+    if (!count_)
         return nullptr;
-    }
-
-    MOZ_ASSERT(count_);
-    head_ = chunk->info.next;
-    --count_;
-    return chunk;
+    return remove(head_);
 }
 
-/* Must be called either during the GC or with the GC lock taken. */
-inline void
-ChunkPool::put(Chunk *chunk)
+void
+ChunkPool::push(Chunk *chunk)
 {
+    MOZ_ASSERT(!chunk->info.next);
+    MOZ_ASSERT(!chunk->info.prev);
+
     chunk->info.age = 0;
     chunk->info.next = head_;
+    if (head_)
+        head_->info.prev = chunk;
     head_ = chunk;
-    count_++;
+    ++count_;
+
+    MOZ_ASSERT(verify());
 }
 
-inline Chunk *
-ChunkPool::Enum::front()
+Chunk *
+ChunkPool::remove(Chunk *chunk)
 {
-    Chunk *chunk = *chunkp;
-    MOZ_ASSERT_IF(chunk, pool.count() != 0);
+    MOZ_ASSERT(count_ > 0);
+    MOZ_ASSERT(contains(chunk));
+
+    if (head_ == chunk)
+        head_ = chunk->info.next;
+    if (chunk->info.prev)
+        chunk->info.prev->info.next = chunk->info.next;
+    if (chunk->info.next)
+        chunk->info.next->info.prev = chunk->info.prev;
+    chunk->info.next = chunk->info.prev = nullptr;
+    --count_;
+
+    MOZ_ASSERT(verify());
     return chunk;
 }
 
-inline void
-ChunkPool::Enum::popFront()
+#ifdef DEBUG
+bool
+ChunkPool::contains(Chunk *chunk) const
 {
-    MOZ_ASSERT(!empty());
-    chunkp = &front()->info.next;
+    verify();
+    for (Chunk *cursor = head_; cursor; cursor = cursor->info.next) {
+        if (cursor == chunk)
+            return true;
+    }
+    return false;
 }
 
-inline void
-ChunkPool::Enum::removeAndPopFront()
+bool
+ChunkPool::verify() const
 {
-    MOZ_ASSERT(!empty());
-    *chunkp = front()->info.next;
-    --pool.count_;
+    MOZ_ASSERT(bool(head_) == bool(count_));
+    uint32_t count = 0;
+    for (Chunk *cursor = head_; cursor; cursor = cursor->info.next, ++count) {
+        MOZ_ASSERT_IF(cursor->info.prev, cursor->info.prev->info.next == cursor);
+        MOZ_ASSERT_IF(cursor->info.next, cursor->info.next->info.prev == cursor);
+    }
+    MOZ_ASSERT(count_ == count);
+    return true;
 }
+#endif
 
-Chunk *
+void
+ChunkPool::Iter::next()
+{
+    MOZ_ASSERT(!done());
+    current_ = current_->info.next;
+}
+
+ChunkPool
 GCRuntime::expireEmptyChunkPool(bool shrinkBuffers, const AutoLockGC &lock)
 {
     /*
@@ -721,38 +750,43 @@
      * without emptying the list, the older chunks will stay at the tail
      * and are more likely to reach the max age.
      */
-    Chunk *freeList = nullptr;
+    MOZ_ASSERT(emptyChunks(lock).verify());
+    ChunkPool expired;
     unsigned freeChunkCount = 0;
-    for (ChunkPool::Enum e(emptyChunks(lock)); !e.empty(); ) {
-        Chunk *chunk = e.front();
+    for (ChunkPool::Iter iter(emptyChunks(lock)); !iter.done();) {
+        Chunk *chunk = iter.get();
+        iter.next();
+
         MOZ_ASSERT(chunk->unused());
-        MOZ_ASSERT(!chunkSet.has(chunk));
+        MOZ_ASSERT(!fullChunks(lock).contains(chunk));
+        MOZ_ASSERT(!availableChunks(lock).contains(chunk));
         if (freeChunkCount >= tunables.maxEmptyChunkCount() ||
             (freeChunkCount >= tunables.minEmptyChunkCount() &&
              (shrinkBuffers || chunk->info.age == MAX_EMPTY_CHUNK_AGE)))
         {
-            e.removeAndPopFront();
+            emptyChunks(lock).remove(chunk);
             prepareToFreeChunk(chunk->info);
-            chunk->info.next = freeList;
-            freeList = chunk;
+            expired.push(chunk);
         } else {
             /* Keep the chunk but increase its age. */
             ++freeChunkCount;
             ++chunk->info.age;
-            e.popFront();
         }
     }
+    MOZ_ASSERT(expired.verify());
+    MOZ_ASSERT(emptyChunks(lock).verify());
     MOZ_ASSERT(emptyChunks(lock).count() <= tunables.maxEmptyChunkCount());
     MOZ_ASSERT_IF(shrinkBuffers, emptyChunks(lock).count() <= tunables.minEmptyChunkCount());
-    return freeList;
+    return expired;
 }
 
 static void
 FreeChunkPool(JSRuntime *rt, ChunkPool &pool)
 {
-    for (ChunkPool::Enum e(pool); !e.empty();) {
-        Chunk *chunk = e.front();
-        e.removeAndPopFront();
+    for (ChunkPool::Iter iter(pool); !iter.done();) {
+        Chunk *chunk = iter.get();
+        iter.next();
+        pool.remove(chunk);
         MOZ_ASSERT(!chunk->info.numArenasFreeCommitted);
         FreeChunk(rt, chunk);
     }
@@ -765,16 +799,6 @@
     FreeChunkPool(rt, emptyChunks(lock));
 }
 
-void
-GCRuntime::freeChunkList(Chunk *chunkListHead)
-{
-    while (Chunk *chunk = chunkListHead) {
-        MOZ_ASSERT(!chunk->info.numArenasFreeCommitted);
-        chunkListHead = chunk->info.next;
-        FreeChunk(rt, chunk);
-    }
-}
-
 /* static */ Chunk *
 Chunk::allocate(JSRuntime *rt)
 {
@@ -787,7 +811,7 @@
 }
 
 /* Must be called with the GC lock taken. */
-inline void
+void
 GCRuntime::releaseChunk(Chunk *chunk)
 {
     MOZ_ASSERT(chunk);
@@ -803,7 +827,7 @@
     stats.count(gcstats::STAT_DESTROY_CHUNK);
 #ifdef DEBUG
     /*
-     * Let FreeChunkList detect a missing prepareToFreeChunk call before it
+     * Let FreeChunkPool detect a missing prepareToFreeChunk call before it
      * frees chunk.
      */
     info.numArenasFreeCommitted = 0;
@@ -839,7 +863,7 @@
     decommitAllArenas(rt);
 
     /* Initialize the chunk info. */
-    info.age = 0;
+    info.init();
     info.trailer.storeBuffer = nullptr;
     info.trailer.location = ChunkLocationBitTenuredHeap;
     info.trailer.runtime = rt;
@@ -847,47 +871,6 @@
     /* The rest of info fields are initialized in pickChunk. */
 }
 
-inline Chunk **
-GCRuntime::getAvailableChunkList()
-{
-    return &availableChunkListHead;
-}
-
-inline void
-Chunk::addToAvailableList(JSRuntime *rt)
-{
-    insertToAvailableList(rt->gc.getAvailableChunkList());
-}
-
-inline void
-Chunk::insertToAvailableList(Chunk **insertPoint)
-{
-    MOZ_ASSERT(hasAvailableArenas());
-    MOZ_ASSERT(!info.prevp);
-    MOZ_ASSERT(!info.next);
-    info.prevp = insertPoint;
-    Chunk *insertBefore = *insertPoint;
-    if (insertBefore) {
-        MOZ_ASSERT(insertBefore->info.prevp == insertPoint);
-        insertBefore->info.prevp = &info.next;
-    }
-    info.next = insertBefore;
-    *insertPoint = this;
-}
-
-inline void
-Chunk::removeFromAvailableList()
-{
-    MOZ_ASSERT(info.prevp);
-    *info.prevp = info.next;
-    if (info.next) {
-        MOZ_ASSERT(info.next->info.prevp == &info.next);
-        info.next->info.prevp = info.prevp;
-    }
-    info.prevp = nullptr;
-    info.next = nullptr;
-}
-
 /*
  * Search for and return the next decommitted Arena. Our goal is to keep
  * lastDecommittedArenaOffset "close" to a free arena. We do this by setting
@@ -954,8 +937,10 @@
                            ? fetchNextFreeArena(rt)
                            : fetchNextDecommittedArena();
     aheader->init(zone, thingKind);
-    if (MOZ_UNLIKELY(!hasAvailableArenas()))
-        removeFromAvailableList();
+    if (MOZ_UNLIKELY(!hasAvailableArenas())) {
+        rt->gc.availableChunks(lock).remove(this);
+        rt->gc.fullChunks(lock).push(this);
+    }
     return aheader;
 }
 
@@ -965,7 +950,7 @@
     ++numArenasFreeCommitted;
 }
 
-inline void
+void
 Chunk::addArenaToFreeList(JSRuntime *rt, ArenaHeader *aheader)
 {
     MOZ_ASSERT(!aheader->allocated());
@@ -977,6 +962,13 @@
 }
 
 void
+Chunk::addArenaToDecommittedList(JSRuntime *rt, const ArenaHeader *aheader)
+{
+    ++info.numArenasFree;
+    decommittedArenas.set(Chunk::arenaIndex(aheader->arenaAddress()));
+}
+
+void
 Chunk::recycleArena(ArenaHeader *aheader, SortedArenaList &dest, AllocKind thingKind,
                     size_t thingsPerArena)
 {
@@ -985,37 +977,34 @@
 }
 
 void
-Chunk::releaseArena(JSRuntime *rt, ArenaHeader *aheader, const AutoLockGC &lock)
+Chunk::releaseArena(JSRuntime *rt, ArenaHeader *aheader, const AutoLockGC &lock,
+                    ArenaDecommitState state /* = IsCommitted */)
 {
     MOZ_ASSERT(aheader->allocated());
     MOZ_ASSERT(!aheader->hasDelayedMarking);
 
-    aheader->setAsNotAllocated();
-    addArenaToFreeList(rt, aheader);
+    if (state == IsCommitted) {
+        aheader->setAsNotAllocated();
+        addArenaToFreeList(rt, aheader);
+    } else {
+        addArenaToDecommittedList(rt, aheader);
+    }
 
     if (info.numArenasFree == 1) {
-        MOZ_ASSERT(!info.prevp);
-        MOZ_ASSERT(!info.next);
-        addToAvailableList(rt);
+        rt->gc.fullChunks(lock).remove(this);
+        rt->gc.availableChunks(lock).push(this);
     } else if (!unused()) {
-        MOZ_ASSERT(info.prevp);
+        MOZ_ASSERT(!rt->gc.fullChunks(lock).contains(this));
+        MOZ_ASSERT(rt->gc.availableChunks(lock).contains(this));
+        MOZ_ASSERT(!rt->gc.emptyChunks(lock).contains(this));
     } else {
         MOZ_ASSERT(unused());
-        removeFromAvailableList();
+        rt->gc.availableChunks(lock).remove(this);
         decommitAllArenas(rt);
-        rt->gc.moveChunkToFreePool(this, lock);
+        rt->gc.emptyChunks(lock).push(this);
     }
 }
 
-void
-GCRuntime::moveChunkToFreePool(Chunk *chunk, const AutoLockGC &lock)
-{
-    MOZ_ASSERT(chunk->unused());
-    MOZ_ASSERT(chunkSet.has(chunk));
-    chunkSet.remove(chunk);
-    emptyChunks(lock).put(chunk);
-}
-
 inline bool
 GCRuntime::wantBackgroundAllocation(const AutoLockGC &lock) const
 {
@@ -1024,7 +1013,7 @@
     // a small heap size (and therefore likely has a small growth rate).
     return allocTask.enabled() &&
            emptyChunks(lock).count() < tunables.minEmptyChunkCount() &&
-           chunkSet.count() >= 4;
+           (fullChunks(lock).count() + availableChunks(lock).count()) >= 4;
 }
 
 void
@@ -1067,12 +1056,10 @@
 GCRuntime::pickChunk(const AutoLockGC &lock,
                      AutoMaybeStartBackgroundAllocation &maybeStartBackgroundAllocation)
 {
-    Chunk **listHeadp = getAvailableChunkList();
-    Chunk *chunk = *listHeadp;
-    if (chunk)
-        return chunk;
+    if (availableChunks(lock).count())
+        return availableChunks(lock).head();
 
-    chunk = emptyChunks(lock).get(rt);
+    Chunk *chunk = emptyChunks(lock).pop();
     if (!chunk) {
         chunk = Chunk::allocate(rt);
         if (!chunk)
@@ -1081,27 +1068,14 @@
     }
 
     MOZ_ASSERT(chunk->unused());
-    MOZ_ASSERT(!chunkSet.has(chunk));
+    MOZ_ASSERT(!fullChunks(lock).contains(chunk));
 
     if (wantBackgroundAllocation(lock))
         maybeStartBackgroundAllocation.tryToStartBackgroundAllocation(rt);
 
     chunkAllocationSinceLastGC = true;
 
-    /*
-     * FIXME bug 583732 - chunk is newly allocated and cannot be present in
-     * the table so using ordinary lookupForAdd is suboptimal here.
-     */
-    GCChunkSet::AddPtr p = chunkSet.lookupForAdd(chunk);
-    MOZ_ASSERT(!p);
-    if (!chunkSet.add(p, chunk)) {
-        releaseChunk(chunk);
-        return nullptr;
-    }
-
-    chunk->info.prevp = nullptr;
-    chunk->info.next = nullptr;
-    chunk->addToAvailableList(rt);
+    availableChunks(lock).push(chunk);
 
     return chunk;
 }
@@ -1156,7 +1130,6 @@
     stats(rt),
     marker(rt),
     usage(nullptr),
-    availableChunkListHead(nullptr),
     maxMallocBytes(0),
     numArenasFreeCommitted(0),
     verifyPreData(nullptr),
@@ -1186,7 +1159,6 @@
     lastMarkSlice(false),
     sweepOnBackgroundThread(false),
     foundBlackGrayEdges(false),
-    sweepingZones(nullptr),
     freeLifoAlloc(JSRuntime::TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
     zoneGroupIndex(0),
     zoneGroups(nullptr),
@@ -1287,22 +1259,22 @@
 }
 
 bool
-GCRuntime::initZeal()
+GCRuntime::parseAndSetZeal(const char *str)
 {
-    const char *env = getenv("JS_GC_ZEAL");
-    if (!env)
-        return true;
-
     int zeal = -1;
-    int frequency = JS_DEFAULT_ZEAL_FREQ;
-    if (strcmp(env, "help") != 0) {
-        zeal = atoi(env);
-        const char *p = strchr(env, ',');
-        if (p)
+    int frequency = -1;
+
+    if (isdigit(str[0])) {
+        zeal = atoi(str);
+
+        const char *p = strchr(str, ',');
+        if (!p)
+            frequency = JS_DEFAULT_ZEAL_FREQ;
+        else
             frequency = atoi(p + 1);
     }
 
-    if (zeal < 0 || zeal > ZealLimit || frequency < 0) {
+    if (zeal < 0 || zeal > ZealLimit || frequency <= 0) {
         fprintf(stderr, "Format: JS_GC_ZEAL=level[,N]\n");
         fputs(ZealModeHelpText, stderr);
         return false;
@@ -1329,9 +1301,6 @@
     if (!lock)
         return false;
 
-    if (!chunkSet.init(INITIAL_CHUNK_CAPACITY))
-        return false;
-
     if (!rootsHash.init(256))
         return false;
 
@@ -1362,7 +1331,8 @@
 #endif
 
 #ifdef JS_GC_ZEAL
-    if (!initZeal())
+    const char *zealSpec = getenv("JS_GC_ZEAL");
+    if (zealSpec && zealSpec[0] && !parseAndSetZeal(zealSpec))
         return false;
 #endif
 
@@ -1400,13 +1370,8 @@
 
     zones.clear();
 
-    availableChunkListHead = nullptr;
-    if (chunkSet.initialized()) {
-        for (GCChunkSet::Range r(chunkSet.all()); !r.empty(); r.popFront())
-            releaseChunk(r.front());
-        chunkSet.clear();
-    }
-
+    FreeChunkPool(rt, fullChunks_);
+    FreeChunkPool(rt, availableChunks_);
     FreeChunkPool(rt, emptyChunks_);
 
     if (rootsHash.initialized())
@@ -1537,7 +1502,9 @@
       case JSGC_UNUSED_CHUNKS:
         return uint32_t(emptyChunks(lock).count());
       case JSGC_TOTAL_CHUNKS:
-        return uint32_t(chunkSet.count() + emptyChunks(lock).count());
+        return uint32_t(fullChunks(lock).count() +
+                        availableChunks(lock).count() +
+                        emptyChunks(lock).count());
       case JSGC_SLICE_TIME_BUDGET:
         return uint32_t(sliceBudget > 0 ? sliceBudget : 0);
       case JSGC_MARK_STACK_LIMIT:
@@ -1982,6 +1949,7 @@
     if (!aheader)
         return nullptr;
 
+    MOZ_ASSERT(!maybeLock->wasUnlocked());
     MOZ_ASSERT(al.isCursorAtEnd());
     al.insertAtCursor(aheader);
 
@@ -2129,7 +2097,7 @@
 }
 
 ArenaHeader *
-ArenaList::removeRemainingArenas(ArenaHeader **arenap)
+ArenaList::removeRemainingArenas(ArenaHeader **arenap, const AutoLockGC &lock)
 {
     // This is only ever called to remove arenas that are after the cursor, so
     // we don't need to update it.
@@ -2148,8 +2116,10 @@
  * arena list. Return the head of a list of arenas to relocate.
  */
 ArenaHeader *
-ArenaList::pickArenasToRelocate()
+ArenaList::pickArenasToRelocate(JSRuntime *runtime)
 {
+    AutoLockGC lock(runtime);
+
     check();
     if (isEmpty())
         return nullptr;
@@ -2157,7 +2127,7 @@
     // 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 = head()->zone->runtimeFromMainThread()->gc.zeal() == ZealCompactValue;
+    bool relocateAll = runtime->gc.zeal() == ZealCompactValue;
 #if defined(DEBUG) && defined(JS_PUNBOX64)
     relocateAll = true;
 #endif
@@ -2190,7 +2160,7 @@
     while (*arenap) {
         ArenaHeader *arena = *arenap;
         if (followingUsedCells <= previousFreeCells)
-            return removeRemainingArenas(arenap);
+            return removeRemainingArenas(arenap, lock);
         size_t freeCells = arena->countFreeCells();
         size_t usedCells = cellsPerArena - freeCells;
         followingUsedCells -= usedCells;
@@ -2311,7 +2281,7 @@
     for (size_t i = 0; i < FINALIZE_LIMIT; i++) {
         if (CanRelocateAllocKind(AllocKind(i))) {
             ArenaList &al = arenaLists[i];
-            ArenaHeader *toRelocate = al.pickArenasToRelocate();
+            ArenaHeader *toRelocate = al.pickArenasToRelocate(runtime_);
             if (toRelocate)
                 relocatedList = al.relocateArenas(toRelocate, relocatedList);
         }
@@ -2357,7 +2327,6 @@
         MOZ_ASSERT(!IsForwarded(thing));
         return;
     }
-    MOZ_ASSERT(CurrentThreadCanAccessZone(zone));
 
     if (IsForwarded(thing)) {
         Cell *dst = Forwarded(thing);
@@ -2413,21 +2382,250 @@
     }
 }
 
+template <typename T>
+static void
+UpdateCellPointersTyped(MovingTracer *trc, ArenaHeader *arena, JSGCTraceKind traceKind)
+{
+    for (ArenaCellIterUnderGC i(arena); !i.done(); i.next()) {
+        T *cell = reinterpret_cast<T*>(i.getCell());
+        cell->fixupAfterMovingGC();
+        TraceChildren(trc, cell, traceKind);
+    }
+}
+
 /*
- * Update the interal pointers for all cells of the specified kind in a zone.
+ * Update the interal pointers for all cells in an arena.
  */
-template <typename T>
 static void
-UpdateCellPointersByKind(MovingTracer *trc, ArenaLists &al, AllocKind thingKind) {
-    JSGCTraceKind traceKind = MapAllocToTraceKind(thingKind);
-    MOZ_ASSERT(MapTypeToTraceKind<T>::kind == traceKind);
-    for (ArenaHeader *arena = al.getFirstArena(thingKind); arena; arena = arena->next) {
-        for (ArenaCellIterUnderGC i(arena); !i.done(); i.next()) {
-            T *cell = reinterpret_cast<T*>(i.getCell());
-            cell->fixupAfterMovingGC();
-            TraceChildren(trc, cell, traceKind);
+UpdateCellPointers(MovingTracer *trc, ArenaHeader *arena)
+{
+    AllocKind kind = arena->getAllocKind();
+    JSGCTraceKind traceKind = MapAllocToTraceKind(kind);
+
+    switch (kind) {
+      case FINALIZE_OBJECT0:
+      case FINALIZE_OBJECT0_BACKGROUND:
+      case FINALIZE_OBJECT2:
+      case FINALIZE_OBJECT2_BACKGROUND:
+      case FINALIZE_OBJECT4:
+      case FINALIZE_OBJECT4_BACKGROUND:
+      case FINALIZE_OBJECT8:
+      case FINALIZE_OBJECT8_BACKGROUND:
+      case FINALIZE_OBJECT12:
+      case FINALIZE_OBJECT12_BACKGROUND:
+      case FINALIZE_OBJECT16:
+      case FINALIZE_OBJECT16_BACKGROUND:
+        UpdateCellPointersTyped<JSObject>(trc, arena, traceKind);
+        return;
+      case FINALIZE_SCRIPT:
+        UpdateCellPointersTyped<JSScript>(trc, arena, traceKind);
+        return;
+      case FINALIZE_LAZY_SCRIPT:
+        UpdateCellPointersTyped<LazyScript>(trc, arena, traceKind);
+        return;
+      case FINALIZE_SHAPE:
+        UpdateCellPointersTyped<Shape>(trc, arena, traceKind);
+        return;
+      case FINALIZE_ACCESSOR_SHAPE:
+        UpdateCellPointersTyped<AccessorShape>(trc, arena, traceKind);
+        return;
+      case FINALIZE_BASE_SHAPE:
+        UpdateCellPointersTyped<BaseShape>(trc, arena, traceKind);
+        return;
+      case FINALIZE_TYPE_OBJECT:
+        UpdateCellPointersTyped<types::TypeObject>(trc, arena, traceKind);
+        return;
+      case FINALIZE_JITCODE:
+        UpdateCellPointersTyped<jit::JitCode>(trc, arena, traceKind);
+        return;
+      default:
+        MOZ_CRASH("Invalid alloc kind for UpdateCellPointers");
+    }
+}
+
+namespace js {
+namespace gc {
+
+struct ArenasToUpdate
+{
+    ArenasToUpdate(JSRuntime *rt);
+    bool done() { return initialized && arena == nullptr; }
+    ArenaHeader* next();
+    ArenaHeader *getArenasToUpdate(AutoLockHelperThreadState& lock, unsigned max);
+
+  private:
+    bool initialized;
+    GCZonesIter zone;    // Current zone to process, unless zone.done()
+    unsigned kind;       // Current alloc kind to process
+    ArenaHeader *arena;  // Next arena to process
+
+    bool shouldProcessKind(unsigned kind);
+};
+
+bool ArenasToUpdate::shouldProcessKind(unsigned kind)
+{
+    MOZ_ASSERT(kind >= 0 && kind < FINALIZE_LIMIT);
+    return
+        kind != FINALIZE_FAT_INLINE_STRING &&
+        kind != FINALIZE_STRING &&
+        kind != FINALIZE_EXTERNAL_STRING &&
+        kind != FINALIZE_SYMBOL;
+}
+
+ArenasToUpdate::ArenasToUpdate(JSRuntime *rt)
+  : initialized(false), zone(rt, SkipAtoms)
+{}
+
+ArenaHeader *
+ArenasToUpdate::next()
+{
+    // Find the next arena to update.
+    //
+    // Note that this uses a generator-like arrangement. The first time this is
+    // called, |initialized| is false and the for-loops below are entered in the
+    // normal way, returning the first arena found. In subsequent invocations we
+    // jump directly into the body of the for loops just after the previous
+    // return. All state is stored in class members and so preserved between
+    // invocations.
+
+    if (initialized) {
+        MOZ_ASSERT(arena);
+        MOZ_ASSERT(shouldProcessKind(kind));
+        MOZ_ASSERT(!zone.done());
+        goto resumePoint;
+    }
+
+    initialized = true;
+    for (; !zone.done(); zone.next()) {
+        for (kind = 0; kind < FINALIZE_LIMIT; ++kind) {
+            if (shouldProcessKind(kind)) {
+                for (arena = zone.get()->allocator.arenas.getFirstArena(AllocKind(kind));
+                     arena;
+                     arena = arena->next)
+                {
+                    return arena;
+                    resumePoint:;
+                }
+            }
         }
     }
+    return nullptr;
+}
+
+ArenaHeader *
+ArenasToUpdate::getArenasToUpdate(AutoLockHelperThreadState& lock, unsigned count)
+{
+    if (zone.done())
+        return nullptr;
+
+    ArenaHeader *head = nullptr;
+    ArenaHeader *tail = nullptr;
+
+    for (unsigned i = 0; i < count; ++i) {
+        ArenaHeader *arena = next();
+        if (!arena)
+            break;
+
+        if (tail)
+            tail->setNextArenaToUpdate(arena);
+        else
+            head = arena;
+        tail = arena;
+    }
+
+    return head;
+}
+
+struct UpdateCellPointersTask : public GCParallelTask
+{
+    // Number of arenas to update in one block.
+#ifdef DEBUG
+    static const unsigned ArenasToProcess = 16;
+#else
+    static const unsigned ArenasToProcess = 256;
+#endif
+
+    UpdateCellPointersTask() : rt_(nullptr), source_(nullptr), arenaList_(nullptr) {}
+    void init(JSRuntime *rt, ArenasToUpdate *source, AutoLockHelperThreadState& lock);
+
+  private:
+    JSRuntime *rt_;
+    ArenasToUpdate *source_;
+    ArenaHeader *arenaList_;
+
+    virtual void run() MOZ_OVERRIDE;
+    void getArenasToUpdate(AutoLockHelperThreadState& lock);
+    void updateArenas();
+};
+
+void
+UpdateCellPointersTask::init(JSRuntime *rt, ArenasToUpdate *source, AutoLockHelperThreadState& lock)
+{
+    rt_ = rt;
+    source_ = source;
+    getArenasToUpdate(lock);
+}
+
+void
+UpdateCellPointersTask::getArenasToUpdate(AutoLockHelperThreadState& lock)
+{
+    arenaList_ = source_->getArenasToUpdate(lock, ArenasToProcess);
+}
+
+void
+UpdateCellPointersTask::updateArenas()
+{
+    MovingTracer trc(rt_);
+    for (ArenaHeader *arena = arenaList_;
+         arena;
+         arena = arena->getNextArenaToUpdateAndUnlink())
+    {
+        UpdateCellPointers(&trc, arena);
+    }
+    arenaList_ = nullptr;
+}
+
+/* virtual */ void
+UpdateCellPointersTask::run()
+{
+    while (arenaList_) {
+        updateArenas();
+        {
+            AutoLockHelperThreadState lock;
+            getArenasToUpdate(lock);
+        }
+    }
+}
+
+} // namespace gc
+} // namespace js
+
+void
+GCRuntime::updateAllCellPointersParallel(ArenasToUpdate &source)
+{
+    AutoDisableProxyCheck noProxyCheck(rt); // These checks assert when run in parallel.
+
+    const size_t maxTasks = 8;
+    unsigned taskCount = Min(HelperThreadState().cpuCount, maxTasks);
+    UpdateCellPointersTask updateTasks[maxTasks];
+
+    AutoLockHelperThreadState lock;
+    unsigned i;
+    for (i = 0; i < taskCount && !source.done(); ++i) {
+        updateTasks[i].init(rt, &source, lock);
+        startTask(updateTasks[i], gcstats::PHASE_COMPACT_UPDATE_CELLS);
+    }
+    unsigned tasksStarted = i;
+
+    for (i = 0; i < tasksStarted; ++i)
+        joinTask(updateTasks[i], gcstats::PHASE_COMPACT_UPDATE_CELLS);
+}
+
+void
+GCRuntime::updateAllCellPointersSerial(MovingTracer *trc, ArenasToUpdate &source)
+{
+    while (ArenaHeader *arena = source.next())
+        UpdateCellPointers(trc, arena);
 }
 
 /*
@@ -2452,19 +2650,14 @@
     for (CompartmentsIter comp(rt, SkipAtoms); !comp.done(); comp.next())
         comp->sweepCrossCompartmentWrappers();
 
-    // Iterate through all cells that can contain JSObject pointers to update them.
-    for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
-        ArenaLists &al = zone->allocator.arenas;
-        for (unsigned i = 0; i < FINALIZE_OBJECT_LIMIT; ++i)
-            UpdateCellPointersByKind<JSObject>(&trc, al, AllocKind(i));
-        UpdateCellPointersByKind<JSScript>(&trc, al, FINALIZE_SCRIPT);
-        UpdateCellPointersByKind<LazyScript>(&trc, al, FINALIZE_LAZY_SCRIPT);
-        UpdateCellPointersByKind<Shape>(&trc, al, FINALIZE_SHAPE);
-        UpdateCellPointersByKind<AccessorShape>(&trc, al, FINALIZE_ACCESSOR_SHAPE);
-        UpdateCellPointersByKind<BaseShape>(&trc, al, FINALIZE_BASE_SHAPE);
-        UpdateCellPointersByKind<types::TypeObject>(&trc, al, FINALIZE_TYPE_OBJECT);
-        UpdateCellPointersByKind<jit::JitCode>(&trc, al, FINALIZE_JITCODE);
-    }
+    // Iterate through all cells that can contain JSObject pointers to update
+    // them. Since updating each cell is independent we try to parallelize this
+    // as much as possible.
+    ArenasToUpdate source(rt);
+    if (CanUseExtraThreads())
+        updateAllCellPointersParallel(source);
+    else
+        updateAllCellPointersSerial(&trc, source);
 
     // Mark roots to update them.
     markRuntime(&trc, MarkRuntime);
@@ -2538,9 +2731,15 @@
 void
 GCRuntime::releaseRelocatedArenas(ArenaHeader *relocatedList)
 {
-    // Release the relocated arenas, now containing only forwarding pointers
     AutoLockGC lock(rt);
+    releaseRelocatedArenasWithoutUnlocking(relocatedList, lock);
+    expireChunksAndArenas(true, lock);
+}
 
+void
+GCRuntime::releaseRelocatedArenasWithoutUnlocking(ArenaHeader *relocatedList, const AutoLockGC &lock)
+{
+    // Release the relocated arenas, now containing only forwarding pointers
     unsigned count = 0;
     while (relocatedList) {
         ArenaHeader *aheader = relocatedList;
@@ -2565,8 +2764,6 @@
         releaseArena(aheader, lock);
         ++count;
     }
-
-    expireChunksAndArenas(true, lock);
 }
 
 #endif // JSGC_COMPACTING
@@ -2671,7 +2868,6 @@
 ArenaLists::queueForBackgroundSweep(FreeOp *fop, AllocKind thingKind)
 {
     MOZ_ASSERT(IsBackgroundFinalized(thingKind));
-    MOZ_ASSERT(!fop->runtime()->gc.isBackgroundSweeping());
 
     ArenaList *al = &arenaLists[thingKind];
     if (al->isEmpty()) {
@@ -2687,10 +2883,11 @@
 }
 
 /*static*/ void
-ArenaLists::backgroundFinalize(FreeOp *fop, ArenaHeader *listHead)
+ArenaLists::backgroundFinalize(FreeOp *fop, ArenaHeader *listHead, ArenaHeader **empty)
 {
     MOZ_ASSERT(listHead);
     MOZ_ASSERT(!InParallelSection());
+    MOZ_ASSERT(empty);
 
     AllocKind thingKind = listHead->getAllocKind();
     Zone *zone = listHead->zone;
@@ -2699,9 +2896,11 @@
     SortedArenaList finalizedSorted(thingsPerArena);
 
     SliceBudget budget;
-    FinalizeArenas(fop, &listHead, finalizedSorted, thingKind, budget, RELEASE_ARENAS);
+    FinalizeArenas(fop, &listHead, finalizedSorted, thingKind, budget, KEEP_ARENAS);
     MOZ_ASSERT(!listHead);
 
+    finalizedSorted.extractEmpty(empty);
+
     // When arenas are queued for background finalization, all arenas are moved
     // to arenaListsToSweep[], leaving the arenaLists[] empty. However, new
     // arenas may be allocated before background finalization finishes; now that
@@ -3045,7 +3244,6 @@
     if (usedBytes >= thresholdBytes) {
         // The threshold has been surpassed, immediately trigger a GC,
         // which will be done non-incrementally.
-        AutoUnlockGC unlock(rt);
         triggerZoneGC(zone, JS::gcreason::ALLOC_TRIGGER);
     } else if (usedBytes >= igcThresholdBytes) {
         // Reduce the delay to the start of the next incremental slice.
@@ -3059,7 +3257,6 @@
             // to try to avoid performing non-incremental GCs on zones
             // which allocate a lot of data, even when incremental slices
             // can't be triggered via scheduling in the event loop.
-            AutoUnlockGC unlock(rt);
             triggerZoneGC(zone, JS::gcreason::ALLOC_TRIGGER);
 
             // Delay the next slice until a certain amount of allocation
@@ -3170,7 +3367,7 @@
 GCRuntime::decommitAllWithoutUnlocking(const AutoLockGC &lock)
 {
     MOZ_ASSERT(emptyChunks(lock).count() == 0);
-    for (Chunk *chunk = *getAvailableChunkList(); chunk; chunk = chunk->info.next) {
+    for (ChunkPool::Iter chunk(availableChunks(lock)); !chunk.done(); chunk.next()) {
         for (size_t i = 0; i < ArenasPerChunk; ++i) {
             if (chunk->decommittedArenas.get(i) || chunk->arenas[i].aheader.allocated())
                 continue;
@@ -3181,128 +3378,66 @@
             }
         }
     }
+    MOZ_ASSERT(availableChunks(lock).verify());
 }
 
 void
-GCRuntime::decommitArenas(const AutoLockGC &lock)
+GCRuntime::decommitArenas(AutoLockGC &lock)
 {
-    Chunk **availableListHeadp = &availableChunkListHead;
-    Chunk *chunk = *availableListHeadp;
-    if (!chunk)
-        return;
+    // Verify that all entries in the empty chunks pool are decommitted.
+    for (ChunkPool::Iter chunk(emptyChunks(lock)); !chunk.done(); chunk.next())
+        MOZ_ASSERT(!chunk->info.numArenasFreeCommitted);
 
-    /*
-     * Decommit is expensive so we avoid holding the GC lock while calling it.
-     *
-     * We decommit from the tail of the list to minimize interference with the
-     * main thread that may start to allocate things at this point.
-     *
-     * The arena that is been decommitted outside the GC lock must not be
-     * available for allocations either via the free list or via the
-     * decommittedArenas bitmap. For that we just fetch the arena from the
-     * free list before the decommit pretending as it was allocated. If this
-     * arena also is the single free arena in the chunk, then we must remove
-     * from the available list before we release the lock so the allocation
-     * thread would not see chunks with no free arenas on the available list.
-     *
-     * After we retake the lock, we mark the arena as free and decommitted if
-     * the decommit was successful. We must also add the chunk back to the
-     * available list if we removed it previously or when the main thread
-     * have allocated all remaining free arenas in the chunk.
-     *
-     * We also must make sure that the aheader is not accessed again after we
-     * decommit the arena.
-     */
-    MOZ_ASSERT(chunk->info.prevp == availableListHeadp);
-    while (Chunk *next = chunk->info.next) {
-        MOZ_ASSERT(next->info.prevp == &chunk->info.next);
-        chunk = next;
+    // Build a Vector of all current available Chunks. Since we release the
+    // gc lock while doing the decommit syscall, it is dangerous to iterate
+    // the available list directly, as concurrent operations can modify it.
+    mozilla::Vector<Chunk *> toDecommit;
+    MOZ_ASSERT(availableChunks(lock).verify());
+    for (ChunkPool::Iter iter(availableChunks(lock)); !iter.done(); iter.next()) {
+        if (!toDecommit.append(iter.get())) {
+            // The OOM handler does a full, immediate decommit, so there is
+            // nothing more to do here in any case.
+            return onOutOfMallocMemory(lock);
+        }
     }
 
-    for (;;) {
-        while (chunk->info.numArenasFreeCommitted != 0) {
-            ArenaHeader *aheader = chunk->fetchNextFreeArena(rt);
-
-            Chunk **savedPrevp = chunk->info.prevp;
-            if (!chunk->hasAvailableArenas())
-                chunk->removeFromAvailableList();
-
-            size_t arenaIndex = Chunk::arenaIndex(aheader->arenaAddress());
+    // Start at the tail and stop before the first chunk: we allocate from the
+    // head and don't want to thrash with the mutator.
+    for (size_t i = toDecommit.length(); i > 1; --i) {
+        Chunk *chunk = toDecommit[i - 1];
+        MOZ_ASSERT(chunk);
+
+        // The arena list is not doubly-linked, so we have to work in the free
+        // list order and not in the natural order.
+        while (chunk->info.numArenasFreeCommitted) {
+            ArenaHeader *aheader = chunk->allocateArena(rt, nullptr, FINALIZE_OBJECT0, lock);
             bool ok;
             {
-                /*
-                 * If the main thread waits for the decommit to finish, skip
-                 * potentially expensive unlock/lock pair on the contested
-                 * lock.
-                 */
-                Maybe<AutoUnlockGC> maybeUnlock;
-                if (!isHeapBusy())
-                    maybeUnlock.emplace(rt);
+                AutoUnlockGC unlock(lock);
                 ok = MarkPagesUnused(aheader->getArena(), ArenaSize);
             }
+            chunk->releaseArena(rt, aheader, lock, Chunk::ArenaDecommitState(ok));
 
-            if (ok) {
-                ++chunk->info.numArenasFree;
-                chunk->decommittedArenas.set(arenaIndex);
-            } else {
-                chunk->addArenaToFreeList(rt, aheader);
-            }
-            MOZ_ASSERT(chunk->hasAvailableArenas());
-            MOZ_ASSERT(!chunk->unused());
-            if (chunk->info.numArenasFree == 1) {
-                /*
-                 * Put the chunk back to the available list either at the
-                 * point where it was before to preserve the available list
-                 * that we enumerate, or, when the allocation thread has fully
-                 * used all the previous chunks, at the beginning of the
-                 * available list.
-                 */
-                Chunk **insertPoint = savedPrevp;
-                if (savedPrevp != availableListHeadp) {
-                    Chunk *prev = Chunk::fromPointerToNext(savedPrevp);
-                    if (!prev->hasAvailableArenas())
-                        insertPoint = availableListHeadp;
-                }
-                chunk->insertToAvailableList(insertPoint);
-            } else {
-                MOZ_ASSERT(chunk->info.prevp);
-            }
-
-            if (chunkAllocationSinceLastGC || !ok) {
-                /*
-                 * The allocator thread has started to get new chunks. We should stop
-                 * to avoid decommitting arenas in just allocated chunks.
-                 */
+            // FIXME Bug 1095620: add cancellation support when this becomes
+            // a ParallelTask.
+            if (/* cancel_ || */ !ok)
                 return;
-            }
         }
-
-        /*
-         * chunk->info.prevp becomes null when the allocator thread consumed
-         * all chunks from the available list.
-         */
-        MOZ_ASSERT_IF(chunk->info.prevp, *chunk->info.prevp == chunk);
-        if (chunk->info.prevp == availableListHeadp || !chunk->info.prevp)
-            break;
-
-        /*
-         * prevp exists and is not the list head. It must point to the next
-         * field of the previous chunk.
-         */
-        chunk = chunk->getPrevious();
     }
+    MOZ_ASSERT(availableChunks(lock).verify());
 }
 
 void
-GCRuntime::expireChunksAndArenas(bool shouldShrink, const AutoLockGC &lock)
+GCRuntime::expireChunksAndArenas(bool shouldShrink, AutoLockGC &lock)
 {
 #ifdef JSGC_FJGENERATIONAL
     rt->threadPool.pruneChunkCache();
 #endif
 
-    if (Chunk *toFree = expireEmptyChunkPool(shouldShrink, lock)) {
-        AutoUnlockGC unlock(rt);
-        freeChunkList(toFree);
+    ChunkPool toFree = expireEmptyChunkPool(shouldShrink, lock);
+    if (toFree.count()) {
+        AutoUnlockGC unlock(lock);
+        FreeChunkPool(rt, toFree);
     }
 
     if (shouldShrink)
@@ -3310,38 +3445,41 @@
 }
 
 void
-GCRuntime::sweepBackgroundThings()
+GCRuntime::sweepBackgroundThings(ZoneList &zones, ThreadType threadType)
 {
-    /*
-     * We must finalize in the correct order, see comments in
-     * finalizeObjects.
-     */
-    FreeOp fop(rt);
-    for (unsigned phase = 0 ; phase < ArrayLength(BackgroundFinalizePhases) ; ++phase) {
-        for (Zone *zone = sweepingZones; zone; zone = zone->gcNextGraphNode) {
+    // We must finalize thing kinds in the order specified by BackgroundFinalizePhases.
+    FreeOp fop(rt, threadType);
+    while (!zones.isEmpty()) {
+        Zone *zone = zones.front();
+        ArenaHeader *emptyArenas = nullptr;
+        for (unsigned phase = 0 ; phase < ArrayLength(BackgroundFinalizePhases) ; ++phase) {
             for (unsigned index = 0 ; index < BackgroundFinalizePhases[phase].length ; ++index) {
                 AllocKind kind = BackgroundFinalizePhases[phase].kinds[index];
                 ArenaHeader *arenas = zone->allocator.arenas.arenaListsToSweep[kind];
                 if (arenas)
-                    ArenaLists::backgroundFinalize(&fop, arenas);
+                    ArenaLists::backgroundFinalize(&fop, arenas, &emptyArenas);
             }
         }
-    }
 
-    sweepingZones = nullptr;
+        AutoLockGC lock(rt);
+        ReleaseArenaList(rt, emptyArenas, lock);
+        zones.removeFront();
+    }
 }
 
 void
 GCRuntime::assertBackgroundSweepingFinished()
 {
 #ifdef DEBUG
-    MOZ_ASSERT(!sweepingZones);
+    MOZ_ASSERT(backgroundSweepZones.isEmpty());
     for (ZonesIter zone(rt, WithAtoms); !zone.done(); zone.next()) {
+        MOZ_ASSERT(!zone->isOnList());
         for (unsigned i = 0; i < FINALIZE_LIMIT; ++i) {
             MOZ_ASSERT(!zone->allocator.arenas.arenaListsToSweep[i]);
             MOZ_ASSERT(zone->allocator.arenas.doneBackgroundFinalize(AllocKind(i)));
         }
     }
+    MOZ_ASSERT(freeLifoAlloc.computedSizeOfExcludingThis() == 0);
 #endif
 }
 
@@ -3478,32 +3616,53 @@
     while (!cancel_ && runtime->gc.wantBackgroundAllocation(lock)) {
         Chunk *chunk;
         {
-            AutoUnlockGC unlock(runtime);
+            AutoUnlockGC unlock(lock);
             chunk = Chunk::allocate(runtime);
             if (!chunk)
                 break;
         }
-        chunkPool_.put(chunk);
+        chunkPool_.push(chunk);
     }
 }
 
 void
-GCHelperState::startBackgroundSweep()
+GCRuntime::queueZonesForBackgroundSweep(ZoneList &zones)
 {
-    MOZ_ASSERT(CanUseExtraThreads());
-
     AutoLockHelperThreadState helperLock;
     AutoLockGC lock(rt);
-    MOZ_ASSERT(state() == IDLE);
-    MOZ_ASSERT(!sweepFlag);
+    backgroundSweepZones.append(zones);
+    helperState.maybeStartBackgroundSweep(lock);
+}
+
+void
+GCRuntime::freeUnusedLifoBlocksAfterSweeping(LifoAlloc *lifo)
+{
+    MOZ_ASSERT(isHeapBusy());
+    AutoLockGC lock(rt);
+    freeLifoAlloc.transferUnusedFrom(lifo);
+}
+
+void
+GCRuntime::freeAllLifoBlocksAfterSweeping(LifoAlloc *lifo)
+{
+    MOZ_ASSERT(isHeapBusy());
+    AutoLockGC lock(rt);
+    freeLifoAlloc.transferFrom(lifo);
+}
+
+void
+GCHelperState::maybeStartBackgroundSweep(const AutoLockGC &lock)
+{
+    MOZ_ASSERT(CanUseExtraThreads());
+
     sweepFlag = true;
     shrinkFlag = false;
-    startBackgroundThread(SWEEPING);
+    if (state() == IDLE)
+        startBackgroundThread(SWEEPING);
 }
 
-/* Must be called with the GC lock taken. */
 void
-GCHelperState::startBackgroundShrink()
+GCHelperState::startBackgroundShrink(const AutoLockGC &lock)
 {
     MOZ_ASSERT(CanUseExtraThreads());
     switch (state()) {
@@ -3531,15 +3690,18 @@
 }
 
 void
-GCHelperState::doSweep(const AutoLockGC &lock)
+GCHelperState::doSweep(AutoLockGC &lock)
 {
-    if (sweepFlag) {
+    while (sweepFlag) {
         sweepFlag = false;
-        AutoUnlockGC unlock(rt);
-
-        rt->gc.sweepBackgroundThings();
+        ZoneList zones;
+        zones.transferFrom(rt->gc.backgroundSweepZones);
+        LifoAlloc freeLifoAlloc(JSRuntime::TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE);
+        freeLifoAlloc.transferFrom(&rt->gc.freeLifoAlloc);
+        AutoUnlockGC unlock(lock);
 
-        rt->gc.freeLifoAlloc.freeAll();
+        rt->gc.sweepBackgroundThings(zones, BackgroundThread);
+        freeLifoAlloc.freeAll();
     }
 
     bool shrinking = shrinkFlag;
@@ -3628,6 +3790,8 @@
 void
 GCRuntime::sweepZones(FreeOp *fop, bool lastGC)
 {
+    AutoLockGC lock(rt); // Avoid race with background sweeping.
+
     JSZoneCallback callback = rt->destroyZoneCallback;
 
     /* Skip the atomsCompartment zone. */
@@ -3641,10 +3805,13 @@
         Zone *zone = *read++;
 
         if (zone->wasGCStarted()) {
-            if ((zone->allocator.arenas.arenaListsAreEmpty() && !zone->hasMarkedCompartments()) ||
-                lastGC)
+            if ((!zone->isQueuedForBackgroundSweep() &&
+                 zone->allocator.arenas.arenaListsAreEmpty() &&
+                 !zone->hasMarkedCompartments()) || lastGC)
             {
                 zone->allocator.arenas.checkEmptyFreeLists();
+                AutoUnlockGC unlock(lock);
+
                 if (callback)
                     callback(zone);
                 zone->sweepCompartments(fop, false, lastGC);
@@ -3660,26 +3827,11 @@
 }
 
 void
-GCRuntime::freeUnusedLifoBlocksAfterSweeping(LifoAlloc *lifo)
-{
-    MOZ_ASSERT(isHeapBusy());
-    freeLifoAlloc.transferUnusedFrom(lifo);
-}
-
-void
-GCRuntime::freeAllLifoBlocksAfterSweeping(LifoAlloc *lifo)
-{
-    MOZ_ASSERT(isHeapBusy());
-    freeLifoAlloc.transferFrom(lifo);
-}
-
-void
 GCRuntime::purgeRuntime()
 {
     for (GCCompartmentsIter comp(rt); !comp.done(); comp.next())
         comp->purge();
 
-
     freeUnusedLifoBlocksAfterSweeping(&rt->tempLifoAlloc);
 
     rt->interpreterStack().purge(rt);
@@ -4130,15 +4282,17 @@
     JSRuntime *runtime = gc->rt;
     GCMarker *gcmarker = &gc->marker;
 
+    gc->waitBackgroundSweepEnd();
+
     /* Save existing mark bits. */
-    for (GCChunkSet::Range r(gc->chunkSet.all()); !r.empty(); r.popFront()) {
-        ChunkBitmap *bitmap = &r.front()->bitmap;
+    for (auto chunk = gc->allNonEmptyChunks(); !chunk.done(); chunk.next()) {
+        ChunkBitmap *bitmap = &chunk->bitmap;
 	ChunkBitmap *entry = js_new<ChunkBitmap>();
         if (!entry)
             return;
 
         memcpy((void *)entry->bitmap, (void *)bitmap->bitmap, sizeof(bitmap->bitmap));
-        if (!map.putNew(r.front(), entry))
+        if (!map.putNew(chunk, entry))
             return;
     }
 
@@ -4172,8 +4326,8 @@
     MOZ_ASSERT(gcmarker->isDrained());
     gcmarker->reset();
 
-    for (GCChunkSet::Range r(gc->chunkSet.all()); !r.empty(); r.popFront())
-        r.front()->bitmap.clear();
+    for (auto chunk = gc->allNonEmptyChunks(); !chunk.done(); chunk.next())
+        chunk->bitmap.clear();
 
     {
         gcstats::AutoPhase ap1(gc->stats, gcstats::PHASE_MARK);
@@ -4214,8 +4368,7 @@
     }
 
     /* Take a copy of the non-incremental mark state and restore the original. */
-    for (GCChunkSet::Range r(gc->chunkSet.all()); !r.empty(); r.popFront()) {
-        Chunk *chunk = r.front();
+    for (auto chunk = gc->allNonEmptyChunks(); !chunk.done(); chunk.next()) {
         ChunkBitmap *bitmap = &chunk->bitmap;
         ChunkBitmap *entry = map.lookup(chunk)->value();
         Swap(*entry, *bitmap);
@@ -4239,8 +4392,9 @@
     if (!initialized)
         return;
 
-    for (GCChunkSet::Range r(gc->chunkSet.all()); !r.empty(); r.popFront()) {
-        Chunk *chunk = r.front();
+    gc->waitBackgroundSweepEnd();
+
+    for (auto chunk = gc->allNonEmptyChunks(); !chunk.done(); chunk.next()) {
         BitmapMap::Ptr ptr = map.lookup(chunk);
         if (!ptr)
             continue;  /* Allocated after we did the non-incremental mark. */
@@ -5037,12 +5191,20 @@
 void
 GCRuntime::endSweepingZoneGroup()
 {
-    /* Update the GC state for zones we have swept and unlink the list. */
+    /* Update the GC state for zones we have swept. */
     for (GCZoneGroupIter zone(rt); !zone.done(); zone.next()) {
         MOZ_ASSERT(zone->isGCSweeping());
         zone->setGCState(Zone::Finished);
     }
 
+    /* Start background thread to sweep zones if required. */
+    if (sweepOnBackgroundThread) {
+        ZoneList zones;
+        for (GCZoneGroupIter zone(rt); !zone.done(); zone.next())
+            zones.append(zone);
+        queueZonesForBackgroundSweep(zones);
+    }
+
     /* Reset the list of arenas marked as being allocated during sweep phase. */
     while (ArenaHeader *arena = arenasAllocatedDuringSweep) {
         arenasAllocatedDuringSweep = arena->getNextAllocDuringSweep();
@@ -5074,7 +5236,7 @@
     gcstats::AutoPhase ap(stats, gcstats::PHASE_SWEEP);
 
     sweepOnBackgroundThread =
-        !lastGC && !TraceEnabled() && CanUseExtraThreads() && !shouldCompact();
+        !lastGC && !TraceEnabled() && CanUseExtraThreads();
 
     releaseObservedTypes = shouldReleaseObservedTypes();
 
@@ -5351,18 +5513,14 @@
             grayBitsValid = true;
     }
 
-    /* Set up list of zones for sweeping of background things. */
-    MOZ_ASSERT(!sweepingZones);
-    for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
-        zone->gcNextGraphNode = sweepingZones;
-        sweepingZones = zone;
-    }
-
     /* If not sweeping on background thread then we must do it here. */
     if (!sweepOnBackgroundThread) {
         gcstats::AutoPhase ap(stats, gcstats::PHASE_DESTROY);
 
-        sweepBackgroundThings();
+        ZoneList zones;
+        for (GCZonesIter zone(rt); !zone.done(); zone.next())
+            zones.append(zone);
+        sweepBackgroundThings(zones, MainThread);
 
         /*
          * Destroy arenas after we finished the sweeping so finalizers can
@@ -5402,20 +5560,28 @@
         }
     }
 #endif
-
-    if (sweepOnBackgroundThread)
-        helperState.startBackgroundSweep();
 }
 
-#ifdef JSGC_COMPACTING
-void
+bool
 GCRuntime::compactPhase(bool lastGC)
 {
-    MOZ_ASSERT(rt->gc.nursery.isEmpty());
-    MOZ_ASSERT(!sweepOnBackgroundThread);
-
+#ifndef JSGC_COMPACTING
+    MOZ_CRASH();
+#else
     gcstats::AutoPhase ap(stats, gcstats::PHASE_COMPACT);
 
+    if (isIncremental) {
+        // Poll for end of background sweeping
+        AutoLockGC lock(rt);
+        if (isBackgroundSweeping())
+            return false;
+    } else {
+        waitBackgroundSweepEnd();
+    }
+
+    MOZ_ASSERT(rt->gc.nursery.isEmpty());
+    assertBackgroundSweepingFinished();
+
     ArenaHeader *relocatedList = relocateArenas();
     updatePointersToRelocatedCells();
 
@@ -5451,8 +5617,10 @@
             zone->allocator.arenas.checkEmptyFreeLists();
     }
 #endif
-}
+
 #endif // JSGC_COMPACTING
+    return true;
+}
 
 void
 GCRuntime::finishCollection()
@@ -5578,6 +5746,8 @@
         rt->setNeedsIncrementalBarrier(false);
         AssertNeedsBarrierFlagsConsistent(rt);
 
+        freeLifoAlloc.freeAll();
+
         incrementalState = NO_INCREMENTAL;
 
         MOZ_ASSERT(!marker.shouldCheckCompartments());
@@ -5603,6 +5773,11 @@
         break;
       }
 
+#ifdef JSGC_COMPACTING
+      case COMPACT:
+        break;
+#endif
+
       default:
         MOZ_CRASH("Invalid incremental GC state");
     }
@@ -5795,24 +5970,31 @@
         /* fall through */
       }
 
-      case SWEEP: {
-        bool finished = sweepPhase(budget);
-        if (!finished)
-            break;
+      case SWEEP:
+        {
+            bool finished = sweepPhase(budget);
+            if (!finished)
+                break;
+        }
 
         endSweepPhase(lastGC);
 
-#ifdef JSGC_COMPACTING
+        incrementalState = COMPACT;
+
+        /* Yield before compacting since it is not incremental. */
+        if (shouldCompact() && isIncremental)
+            break;
+
+      case COMPACT:
         if (shouldCompact()) {
-            incrementalState = COMPACT;
-            compactPhase(lastGC);
+            bool finished = compactPhase(lastGC);
+            if (!finished)
+                break;
         }
-#endif
 
         finishCollection();
         incrementalState = NO_INCREMENTAL;
         break;
-      }
 
       default:
         MOZ_ASSERT(false);
@@ -5946,9 +6128,8 @@
     {
         gcstats::AutoPhase ap(stats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
 
-        // As we are about to purge caches and clear the mark bits, wait for
-        // background finalization to finish. It cannot run between slices
-        // so we only need to wait on the first slice.
+        // As we are about to clear the mark bits, wait for background
+        // finalization to finish. We only need to wait on the first slice.
         if (incrementalState == NO_INCREMENTAL)
             waitBackgroundSweepEnd();
 
@@ -6257,7 +6438,7 @@
     MOZ_ASSERT(!rt->isHeapBusy());
 
     if (CanUseExtraThreads())
-        helperState.startBackgroundShrink();
+        helperState.startBackgroundShrink(lock);
     else
         expireChunksAndArenas(true, lock);
 }
@@ -6268,10 +6449,23 @@
     // Stop allocating new chunks.
     allocTask.cancel(GCParallelTask::CancelAndWait);
 
-    // Throw away any excess chunks we have lying around.
     AutoLockGC lock(rt);
+    onOutOfMallocMemory(lock);
+}
+
+void
+GCRuntime::onOutOfMallocMemory(const AutoLockGC &lock)
+{
+    // Throw away any excess chunks we have lying around.
     freeEmptyChunks(rt, lock);
 
+    // Release any relocated areans we may be holding on to.
+#if defined(JSGC_COMPACTING) && defined(DEBUG)
+    unprotectRelocatedArenas(relocatedArenasToRelease);
+    releaseRelocatedArenasWithoutUnlocking(relocatedArenasToRelease, lock);
+    relocatedArenasToRelease = nullptr;
+#endif
+
     // Immediately decommit as many arenas as possible in the hopes that this
     // might let the OS scrape together enough pages to satisfy the failing
     // malloc request.
@@ -6282,6 +6476,7 @@
 GCRuntime::minorGC(JS::gcreason::Reason reason)
 {
 #ifdef JSGC_GENERATIONAL
+    gcstats::AutoPhase ap(stats, gcstats::PHASE_MINOR_GC);
     minorGCRequested = false;
     TraceLogger *logger = TraceLoggerForMainThread(rt);
     AutoTraceLog logMinorGC(logger, TraceLogger::MinorGC);
@@ -6296,6 +6491,7 @@
     // Alternate to the runtime-taking form above which allows marking type
     // objects as needing pretenuring.
 #ifdef JSGC_GENERATIONAL
+    gcstats::AutoPhase ap(stats, gcstats::PHASE_MINOR_GC);
     minorGCRequested = false;
     TraceLogger *logger = TraceLoggerForMainThread(rt);
     AutoTraceLog logMinorGC(logger, TraceLogger::MinorGC);
@@ -6435,6 +6631,7 @@
     // meaningless after merging into the target compartment.
 
     source->clearTables();
+    source->unsetIsDebuggee();
 
     // Fixup compartment pointers in source to refer to target, and make sure
     // type information generations are in sync.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsgc.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsgc.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsgc.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsgc.h	2014-11-26 21:45:57.000000000 +0000
@@ -39,6 +39,12 @@
     MinorCollecting   // doing a GC of the minor heap (nursery)
 };
 
+enum ThreadType
+{
+    MainThread,
+    BackgroundThread
+};
+
 namespace jit {
     class JitCode;
 }
@@ -52,9 +58,7 @@
     MARK_ROOTS,
     MARK,
     SWEEP,
-#ifdef JSGC_COMPACTING
     COMPACT
-#endif
 };
 
 /* Return a printable string for the given kind, for diagnostic purposes. */
@@ -500,8 +504,8 @@
 
 #ifdef JSGC_COMPACTING
     size_t countUsedCells();
-    ArenaHeader *removeRemainingArenas(ArenaHeader **arenap);
-    ArenaHeader *pickArenasToRelocate();
+    ArenaHeader *removeRemainingArenas(ArenaHeader **arenap, const AutoLockGC &lock);
+    ArenaHeader *pickArenasToRelocate(JSRuntime *runtime);
     ArenaHeader *relocateArenas(ArenaHeader *toRelocate, ArenaHeader *relocated);
 #endif
 };
@@ -845,7 +849,7 @@
 
     bool foregroundFinalize(FreeOp *fop, AllocKind thingKind, SliceBudget &sliceBudget,
                             SortedArenaList &sweepList);
-    static void backgroundFinalize(FreeOp *fop, ArenaHeader *listHead);
+    static void backgroundFinalize(FreeOp *fop, ArenaHeader *listHead, ArenaHeader **empty);
 
     void wipeDuringParallelExecution(JSRuntime *rt);
 
@@ -882,13 +886,6 @@
     friend class GCRuntime;
 };
 
-/*
- * Initial allocation size for data structures holding chunks is set to hold
- * chunks with total capacity of 16MB to avoid buffer resizes during browser
- * startup.
- */
-const size_t INITIAL_CHUNK_CAPACITY = 16 * 1024 * 1024 / ChunkSize;
-
 /* The number of GC cycles an empty chunk can survive before been released. */
 const size_t MAX_EMPTY_CHUNK_AGE = 4;
 
@@ -1030,8 +1027,7 @@
         js_free(array);
     }
 
-    /* Must be called with the GC lock taken. */
-    void doSweep(const AutoLockGC &lock);
+    void doSweep(AutoLockGC &lock);
 
   public:
     explicit GCHelperState(JSRuntime *rt)
@@ -1048,11 +1044,8 @@
 
     void work();
 
-    /* Must be called with the GC lock taken. */
-    void startBackgroundSweep();
-
-    /* Must be called with the GC lock taken. */
-    void startBackgroundShrink();
+    void maybeStartBackgroundSweep(const AutoLockGC &lock);
+    void startBackgroundShrink(const AutoLockGC &lock);
 
     /* Must be called without the GC lock taken. */
     void waitBackgroundSweepEnd();
@@ -1465,6 +1458,34 @@
 bool
 IsInsideGGCNursery(const gc::Cell *cell);
 
+// A singly linked list of zones.
+class ZoneList
+{
+    static Zone * const End;
+
+    Zone *head;
+    Zone *tail;
+
+  public:
+    ZoneList();
+    explicit ZoneList(Zone *singleZone);
+
+    bool isEmpty() const;
+    Zone *front() const;
+
+    void append(Zone *zone);
+    void append(ZoneList& list);
+    Zone *removeFront();
+
+    void transferFrom(ZoneList &other);
+
+  private:
+    void check() const;
+
+    ZoneList(const ZoneList &other) MOZ_DELETE;
+    ZoneList &operator=(const ZoneList &other) MOZ_DELETE;
+};
+
 } /* namespace gc */
 
 #ifdef DEBUG
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsgcinlines.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsgcinlines.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsgcinlines.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsgcinlines.h	2014-11-26 21:45:57.000000000 +0000
@@ -379,7 +379,9 @@
     ZonesIter zone;
 
   public:
-    explicit GCZonesIter(JSRuntime *rt) : zone(rt, WithAtoms) {
+    explicit GCZonesIter(JSRuntime *rt, ZoneSelector selector = WithAtoms)
+      : zone(rt, selector)
+    {
         if (!zone->isCollecting())
             next();
     }
@@ -390,7 +392,7 @@
         MOZ_ASSERT(!done());
         do {
             zone.next();
-        } while (!zone.done() && !zone->isCollecting());
+        } while (!zone.done() && !zone->isCollectingFromAnyThread());
     }
 
     JS::Zone *get() const {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsinfer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsinfer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsinfer.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsinfer.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -1244,6 +1244,14 @@
             break;
         }
 
+        // It could happen that one of the compiled scripts was made a
+        // debuggee mid-compilation (e.g., via setting a breakpoint). If so,
+        // throw away the compilation.
+        if (entry.script->isDebuggee()) {
+            succeeded = false;
+            break;
+        }
+
         if (!CheckFrozenTypeSet(cx, entry.thisTypes, types::TypeScript::ThisTypes(entry.script)))
             succeeded = false;
         unsigned nargs = entry.script->functionNonDelazifying()
@@ -4668,7 +4676,7 @@
 void
 TypeObject::maybeSweep(AutoClearTypeInferenceStateOnOOM *oom)
 {
-    if (generation() == zone()->types.generation) {
+    if (generation() == zoneFromAnyThread()->types.generation) {
         // No sweeping required.
         return;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsinfer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsinfer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsinfer.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsinfer.h	2014-11-26 21:45:57.000000000 +0000
@@ -1137,9 +1137,12 @@
      *
      * The type sets in the properties of a type object describe the possible
      * values that can be read out of that property in actual JS objects.
-     * Properties only account for native properties (those with a slot and no
-     * specialized getter hook) and the elements of dense arrays. For accesses
-     * on such properties, the correspondence is as follows:
+     * In native objects, property types account for plain data properties
+     * (those with a slot and no getter or setter hook) and dense elements.
+     * In typed objects, property types account for object and value properties
+     * and elements in the object.
+     *
+     * For accesses on these properties, the correspondence is as follows:
      *
      * 1. If the type has unknownProperties(), the possible properties and
      *    value types for associated JSObjects are unknown.
@@ -1148,16 +1151,21 @@
      *    which is a property in obj, before obj->getProperty(id) the property
      *    in type for id must reflect the result of the getProperty.
      *
-     *    There is an exception for properties of global JS objects which
-     *    are undefined at the point where the property was (lazily) generated.
-     *    In such cases the property type set will remain empty, and the
-     *    'undefined' type will only be added after a subsequent assignment or
-     *    deletion. After these properties have been assigned a defined value,
-     *    the only way they can become undefined again is after such an assign
-     *    or deletion.
+     * There are several exceptions to this:
      *
-     *    There is another exception for array lengths, which are special cased
-     *    by the compiler and VM and are not reflected in property types.
+     * 1. For properties of global JS objects which are undefined at the point
+     *    where the property was (lazily) generated, the property type set will
+     *    remain empty, and the 'undefined' type will only be added after a
+     *    subsequent assignment or deletion. After these properties have been
+     *    assigned a defined value, the only way they can become undefined
+     *    again is after such an assign or deletion.
+     *
+     * 2. Array lengths are special cased by the compiler and VM and are not
+     *    reflected in property types.
+     *
+     * 3. In typed objects, the initial values of properties (null pointers and
+     *    undefined values) are not reflected in the property types. These
+     *    values are always possible when reading the property.
      *
      * We establish these by using write barriers on calls to setProperty and
      * defineProperty which are on native properties, and on any jitcode which
@@ -1201,13 +1209,7 @@
     gc::InitialHeap initialHeap(CompilerConstraintList *constraints);
 
     bool canPreTenure() {
-        // Only types associated with particular allocation sites or 'new'
-        // scripts can be marked as needing pretenuring. Other types can be
-        // used for different purposes across the compartment and can't use
-        // this bit reliably.
-        if (unknownProperties())
-            return false;
-        return fromAllocationSite() || newScript();
+        return !unknownProperties();
     }
 
     bool fromAllocationSite() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsiter.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsiter.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsiter.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsiter.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -273,8 +273,9 @@
 static bool
 Snapshot(JSContext *cx, HandleObject pobj_, unsigned flags, AutoIdVector *props)
 {
+    // ~90% of the time this table ends up with 3 or fewer elements.
     IdSet ht(cx);
-    if (!ht.init(32))
+    if (!ht.init(3))
         return false;
 
     RootedObject pobj(cx, pobj_);
@@ -304,7 +305,7 @@
                             return false;
                     }
                 } else {
-                    if (!Proxy::enumerate(cx, pobj, proxyProps))
+                    if (!Proxy::getEnumerablePropertyKeys(cx, pobj, proxyProps))
                         return false;
                 }
 
@@ -406,18 +407,19 @@
 size_t sCustomIteratorCount = 0;
 
 static inline bool
-GetCustomIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleValue vp)
+GetCustomIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleObject objp)
 {
     JS_CHECK_RECURSION(cx, return false);
 
+    RootedValue rval(cx);
     /* Check whether we have a valid __iterator__ method. */
     HandlePropertyName name = cx->names().iteratorIntrinsic;
-    if (!JSObject::getProperty(cx, obj, obj, name, vp))
+    if (!JSObject::getProperty(cx, obj, obj, name, &rval))
         return false;
 
     /* If there is no custom __iterator__ method, we are done here. */
-    if (!vp.isObject()) {
-        vp.setUndefined();
+    if (!rval.isObject()) {
+        objp.set(nullptr);
         return true;
     }
 
@@ -426,9 +428,9 @@
 
     /* Otherwise call it and return that object. */
     Value arg = BooleanValue((flags & JSITER_FOREACH) == 0);
-    if (!Invoke(cx, ObjectValue(*obj), vp, 1, &arg, vp))
+    if (!Invoke(cx, ObjectValue(*obj), rval, 1, &arg, &rval))
         return false;
-    if (vp.isPrimitive()) {
+    if (rval.isPrimitive()) {
         /*
          * We are always coming from js::ValueToIterator, and we are no longer on
          * trace, so the object we are iterating over is on top of the stack (-1).
@@ -441,6 +443,7 @@
                              -1, val, js::NullPtr(), bytes.ptr());
         return false;
     }
+    objp.set(&rval.toObject());
     return true;
 }
 
@@ -561,15 +564,13 @@
 
 static inline bool
 VectorToKeyIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &keys,
-                    uint32_t slength, uint32_t key, MutableHandleValue vp)
+                    uint32_t slength, uint32_t key, MutableHandleObject objp)
 {
     MOZ_ASSERT(!(flags & JSITER_FOREACH));
 
-    if (obj) {
-        if (obj->hasSingletonType() && !obj->setIteratedSingleton(cx))
-            return false;
-        types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
-    }
+    if (obj->hasSingletonType() && !obj->setIteratedSingleton(cx))
+        return false;
+    types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
 
     Rooted<PropertyIteratorObject *> iterobj(cx, NewPropertyIteratorObject(cx, flags));
     if (!iterobj)
@@ -598,30 +599,21 @@
     }
 
     iterobj->setNativeIterator(ni);
-    vp.setObject(*iterobj);
+    objp.set(iterobj);
 
     RegisterEnumerator(cx, iterobj, ni);
     return true;
 }
 
-bool
-js::VectorToKeyIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &props,
-                        MutableHandleValue vp)
-{
-    return VectorToKeyIterator(cx, obj, flags, props, 0, 0, vp);
-}
-
-bool
-js::VectorToValueIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &keys,
-                          MutableHandleValue vp)
+static bool
+VectorToValueIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &keys,
+                      MutableHandleObject objp)
 {
     MOZ_ASSERT(flags & JSITER_FOREACH);
 
-    if (obj) {
-        if (obj->hasSingletonType() && !obj->setIteratedSingleton(cx))
-            return false;
-        types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
-    }
+    if (obj->hasSingletonType() && !obj->setIteratedSingleton(cx))
+        return false;
+    types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
 
     Rooted<PropertyIteratorObject*> iterobj(cx, NewPropertyIteratorObject(cx, flags));
     if (!iterobj)
@@ -633,7 +625,7 @@
     ni->init(obj, iterobj, flags, 0, 0);
 
     iterobj->setNativeIterator(ni);
-    vp.setObject(*iterobj);
+    objp.set(iterobj);
 
     RegisterEnumerator(cx, iterobj, ni);
     return true;
@@ -641,12 +633,33 @@
 
 bool
 js::EnumeratedIdVectorToIterator(JSContext *cx, HandleObject obj, unsigned flags,
-                                 AutoIdVector &props, MutableHandleValue vp)
+                                 AutoIdVector &props, MutableHandleObject objp)
 {
     if (!(flags & JSITER_FOREACH))
-        return VectorToKeyIterator(cx, obj, flags, props, vp);
+        return VectorToKeyIterator(cx, obj, flags, props, 0, 0, objp);
 
-    return VectorToValueIterator(cx, obj, flags, props, vp);
+    return VectorToValueIterator(cx, obj, flags, props, objp);
+}
+
+// Mainly used for .. in over null/undefined
+bool
+js::NewEmptyPropertyIterator(JSContext *cx, unsigned flags, MutableHandleObject objp)
+{
+    Rooted<PropertyIteratorObject*> iterobj(cx, NewPropertyIteratorObject(cx, flags));
+    if (!iterobj)
+        return false;
+
+    AutoIdVector keys(cx); // Empty
+    NativeIterator *ni = NativeIterator::allocateIterator(cx, 0, keys);
+    if (!ni)
+        return false;
+    ni->init(nullptr, iterobj, flags, 0, 0);
+
+    iterobj->setNativeIterator(ni);
+    objp.set(iterobj);
+
+    RegisterEnumerator(cx, iterobj, ni);
+    return true;
 }
 
 static inline void
@@ -658,121 +671,115 @@
 }
 
 bool
-js::GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleValue vp)
+js::GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleObject objp)
 {
+    if (obj->is<PropertyIteratorObject>() || obj->is<LegacyGeneratorObject>()) {
+        objp.set(obj);
+        return true;
+    }
+
     Vector<Shape *, 8> shapes(cx);
     uint32_t key = 0;
-
-    bool keysOnly = (flags == JSITER_ENUMERATE);
-
-    if (obj) {
-        if (obj->is<PropertyIteratorObject>() || obj->is<LegacyGeneratorObject>()) {
-            vp.setObject(*obj);
-            return true;
-        }
-
-        if (keysOnly) {
-            /*
-             * Check to see if this is the same as the most recent object which
-             * was iterated over.  We don't explicitly check for shapeless
-             * objects here, as they are not inserted into the cache and
-             * will result in a miss.
-             */
-            PropertyIteratorObject *last = cx->runtime()->nativeIterCache.last;
-            if (last) {
-                NativeIterator *lastni = last->getNativeIterator();
-                if (!(lastni->flags & (JSITER_ACTIVE|JSITER_UNREUSABLE)) &&
-                    obj->isNative() &&
-                    obj->as<NativeObject>().hasEmptyElements() &&
-                    obj->lastProperty() == lastni->shapes_array[0])
-                {
-                    JSObject *proto = obj->getProto();
-                    if (proto->isNative() &&
-                        proto->as<NativeObject>().hasEmptyElements() &&
-                        proto->lastProperty() == lastni->shapes_array[1] &&
-                        !proto->getProto())
-                    {
-                        vp.setObject(*last);
-                        UpdateNativeIterator(lastni, obj);
-                        RegisterEnumerator(cx, last, lastni);
-                        return true;
-                    }
-                }
-            }
-
-            /*
-             * The iterator object for JSITER_ENUMERATE never escapes, so we
-             * don't care for the proper parent/proto to be set. This also
-             * allows us to re-use a previous iterator object that is not
-             * currently active.
-             */
+    if (flags == JSITER_ENUMERATE) {
+        /*
+         * Check to see if this is the same as the most recent object which
+         * was iterated over.  We don't explicitly check for shapeless
+         * objects here, as they are not inserted into the cache and
+         * will result in a miss.
+         */
+        PropertyIteratorObject *last = cx->runtime()->nativeIterCache.last;
+        if (last) {
+            NativeIterator *lastni = last->getNativeIterator();
+            if (!(lastni->flags & (JSITER_ACTIVE|JSITER_UNREUSABLE)) &&
+                obj->isNative() &&
+                obj->as<NativeObject>().hasEmptyElements() &&
+                obj->lastProperty() == lastni->shapes_array[0])
             {
-                JSObject *pobj = obj;
-                do {
-                    if (!pobj->isNative() ||
-                        !pobj->as<NativeObject>().hasEmptyElements() ||
-                        IsAnyTypedArray(pobj) ||
-                        pobj->hasUncacheableProto() ||
-                        pobj->getOps()->enumerate ||
-                        pobj->getClass()->enumerate != JS_EnumerateStub ||
-                        pobj->as<NativeObject>().containsPure(cx->names().iteratorIntrinsic))
-                    {
-                        shapes.clear();
-                        goto miss;
-                    }
-                    Shape *shape = pobj->lastProperty();
-                    key = (key + (key << 16)) ^ (uintptr_t(shape) >> 3);
-                    if (!shapes.append(shape))
-                        return false;
-                    pobj = pobj->getProto();
-                } while (pobj);
-            }
-
-            PropertyIteratorObject *iterobj = cx->runtime()->nativeIterCache.get(key);
-            if (iterobj) {
-                NativeIterator *ni = iterobj->getNativeIterator();
-                if (!(ni->flags & (JSITER_ACTIVE|JSITER_UNREUSABLE)) &&
-                    ni->shapes_key == key &&
-                    ni->shapes_length == shapes.length() &&
-                    Compare(ni->shapes_array, shapes.begin(), ni->shapes_length)) {
-                    vp.setObject(*iterobj);
-
-                    UpdateNativeIterator(ni, obj);
-                    RegisterEnumerator(cx, iterobj, ni);
-                    if (shapes.length() == 2)
-                        cx->runtime()->nativeIterCache.last = iterobj;
+                JSObject *proto = obj->getProto();
+                if (proto->isNative() &&
+                    proto->as<NativeObject>().hasEmptyElements() &&
+                    proto->lastProperty() == lastni->shapes_array[1] &&
+                    !proto->getProto())
+                {
+                    objp.set(last);
+                    UpdateNativeIterator(lastni, obj);
+                    RegisterEnumerator(cx, last, lastni);
                     return true;
                 }
             }
         }
 
-      miss:
-        if (obj->is<ProxyObject>())
-            return Proxy::iterate(cx, obj, flags, vp);
+        /*
+         * The iterator object for JSITER_ENUMERATE never escapes, so we
+         * don't care for the proper parent/proto to be set. This also
+         * allows us to re-use a previous iterator object that is not
+         * currently active.
+         */
+        {
+            JSObject *pobj = obj;
+            do {
+                if (!pobj->isNative() ||
+                    !pobj->as<NativeObject>().hasEmptyElements() ||
+                    IsAnyTypedArray(pobj) ||
+                    pobj->hasUncacheableProto() ||
+                    pobj->getOps()->enumerate ||
+                    pobj->getClass()->enumerate != JS_EnumerateStub ||
+                    pobj->as<NativeObject>().containsPure(cx->names().iteratorIntrinsic))
+                {
+                    shapes.clear();
+                    goto miss;
+                }
+                Shape *shape = pobj->lastProperty();
+                key = (key + (key << 16)) ^ (uintptr_t(shape) >> 3);
+                if (!shapes.append(shape))
+                    return false;
+                pobj = pobj->getProto();
+            } while (pobj);
+        }
 
-        if (!GetCustomIterator(cx, obj, flags, vp))
-            return false;
-        if (!vp.isUndefined())
-            return true;
+        PropertyIteratorObject *iterobj = cx->runtime()->nativeIterCache.get(key);
+        if (iterobj) {
+            NativeIterator *ni = iterobj->getNativeIterator();
+            if (!(ni->flags & (JSITER_ACTIVE|JSITER_UNREUSABLE)) &&
+                ni->shapes_key == key &&
+                ni->shapes_length == shapes.length() &&
+                Compare(ni->shapes_array, shapes.begin(), ni->shapes_length)) {
+                objp.set(iterobj);
+
+                UpdateNativeIterator(ni, obj);
+                RegisterEnumerator(cx, iterobj, ni);
+                if (shapes.length() == 2)
+                    cx->runtime()->nativeIterCache.last = iterobj;
+                return true;
+            }
+        }
     }
 
-    /* NB: for (var p in null) succeeds by iterating over no properties. */
+  miss:
+    if (obj->is<ProxyObject>())
+        return Proxy::iterate(cx, obj, flags, objp);
+
+    if (!GetCustomIterator(cx, obj, flags, objp))
+        return false;
+    if (objp)
+        return true;
 
     AutoIdVector keys(cx);
     if (flags & JSITER_FOREACH) {
-        if (MOZ_LIKELY(obj != nullptr) && !Snapshot(cx, obj, flags, &keys))
-            return false;
         MOZ_ASSERT(shapes.empty());
-        if (!VectorToValueIterator(cx, obj, flags, keys, vp))
+
+        if (!Snapshot(cx, obj, flags, &keys))
+            return false;
+        if (!VectorToValueIterator(cx, obj, flags, keys, objp))
             return false;
     } else {
-        if (MOZ_LIKELY(obj != nullptr) && !Snapshot(cx, obj, flags, &keys))
+        if (!Snapshot(cx, obj, flags, &keys))
             return false;
-        if (!VectorToKeyIterator(cx, obj, flags, keys, shapes.length(), key, vp))
+        if (!VectorToKeyIterator(cx, obj, flags, keys, shapes.length(), key, objp))
             return false;
     }
 
-    PropertyIteratorObject *iterobj = &vp.toObject().as<PropertyIteratorObject>();
+    PropertyIteratorObject *iterobj = &objp->as<PropertyIteratorObject>();
 
     /* Cache the iterator object if possible. */
     if (shapes.length())
@@ -786,10 +793,10 @@
 JSObject *
 js::GetIteratorObject(JSContext *cx, HandleObject obj, uint32_t flags)
 {
-    RootedValue value(cx);
-    if (!GetIterator(cx, obj, flags, &value))
+    RootedObject iterator(cx);
+    if (!GetIterator(cx, obj, flags, &iterator))
         return nullptr;
-    return &value.toObject();
+    return iterator;
 }
 
 JSObject *
@@ -1004,20 +1011,28 @@
     if (vp.isObject()) {
         /* Common case. */
         obj = &vp.toObject();
-    } else {
+    } else if ((flags & JSITER_ENUMERATE) && vp.isNullOrUndefined()) {
         /*
          * Enumerating over null and undefined gives an empty enumerator, so
          * that |for (var p in <null or undefined>) <loop>;| never executes
          * <loop>, per ES5 12.6.4.
          */
-        if (!(flags & JSITER_ENUMERATE) || !vp.isNullOrUndefined()) {
-            obj = ToObject(cx, vp);
-            if (!obj)
-                return false;
-        }
+        RootedObject iter(cx);
+        if (!NewEmptyPropertyIterator(cx, flags, &iter))
+            return false;
+        vp.setObject(*iter);
+        return true;
+    } else {
+        obj = ToObject(cx, vp);
+        if (!obj)
+            return false;
     }
 
-    return GetIterator(cx, obj, flags, vp);
+    RootedObject iter(cx);
+    if (!GetIterator(cx, obj, flags, &iter))
+        return false;
+    vp.setObject(*iter);
+    return true;
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsiter.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsiter.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsiter.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsiter.h	2014-11-26 21:45:57.000000000 +0000
@@ -149,26 +149,21 @@
 VectorToIdArray(JSContext *cx, AutoIdVector &props, JSIdArray **idap);
 
 bool
-GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleValue vp);
+GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleObject objp);
 
 JSObject *
 GetIteratorObject(JSContext *cx, HandleObject obj, unsigned flags);
 
-bool
-VectorToKeyIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &props,
-                    MutableHandleValue vp);
-
-bool
-VectorToValueIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &props,
-                      MutableHandleValue vp);
-
 /*
  * Creates either a key or value iterator, depending on flags. For a value
  * iterator, performs value-lookup to convert the given list of jsids.
  */
 bool
 EnumeratedIdVectorToIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVector &props,
-                             MutableHandleValue vp);
+                             MutableHandleObject objp);
+
+bool
+NewEmptyPropertyIterator(JSContext *cx, unsigned flags, MutableHandleObject objp);
 
 /*
  * Convert the value stored in *vp to its iteration object. The flags should
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsmath.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsmath.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsmath.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsmath.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -565,8 +565,8 @@
     return true;
 }
 
-static double
-max_double(double x, double y)
+double
+js::math_max_impl(double x, double y)
 {
     // Math.max(num, NaN) => NaN, Math.max(-0, +0) => +0
     if (x > y || IsNaN(x) || (x == y && IsNegative(y)))
@@ -584,14 +584,14 @@
         double x;
         if (!ToNumber(cx, args[i], &x))
             return false;
-        maxval = max_double(x, maxval);
+        maxval = math_max_impl(x, maxval);
     }
     args.rval().setNumber(maxval);
     return true;
 }
 
-static double
-min_double(double x, double y)
+double
+js::math_min_impl(double x, double y)
 {
     // Math.min(num, NaN) => NaN, Math.min(-0, +0) => -0
     if (x < y || IsNaN(x) || (x == y && IsNegativeZero(x)))
@@ -609,7 +609,7 @@
         double x;
         if (!ToNumber(cx, args[i], &x))
             return false;
-        minval = min_double(x, minval);
+        minval = math_min_impl(x, minval);
     }
     args.rval().setNumber(minval);
     return true;
@@ -626,9 +626,9 @@
         return false;
 
     if (max)
-        res.setNumber(max_double(x, y));
+        res.setNumber(math_max_impl(x, y));
     else
-        res.setNumber(min_double(x, y));
+        res.setNumber(math_min_impl(x, y));
 
     return true;
 }
@@ -1377,7 +1377,12 @@
 js::math_hypot(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
+    return math_hypot_handle(cx, args, args.rval());
+}
 
+bool
+js::math_hypot_handle(JSContext *cx, HandleValueArray args, MutableHandleValue res)
+{
     // IonMonkey calls the system hypot function directly if two arguments are
     // given. Do that here as well to get the same results.
     if (args.length() == 2) {
@@ -1388,7 +1393,7 @@
             return false;
 
         double result = ecmaHypot(x, y);
-        args.rval().setNumber(result);
+        res.setNumber(result);
         return true;
     }
 
@@ -1419,7 +1424,7 @@
     double result = isInfinite ? PositiveInfinity<double>() :
                     isNaN ? GenericNaN() :
                     scale * sqrt(sumsq);
-    args.rval().setNumber(result);
+    res.setNumber(result);
     return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsmath.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsmath.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsmath.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsmath.h	2014-11-26 21:45:57.000000000 +0000
@@ -120,9 +120,15 @@
 extern bool
 math_abs(JSContext *cx, unsigned argc, js::Value *vp);
 
+extern double
+math_max_impl(double x, double y);
+
 extern bool
 math_max(JSContext *cx, unsigned argc, js::Value *vp);
 
+extern double
+math_min_impl(double x, double y);
+
 extern bool
 math_min(JSContext *cx, unsigned argc, js::Value *vp);
 
@@ -237,6 +243,9 @@
 math_hypot(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
+math_hypot_handle(JSContext *cx, HandleValueArray args, MutableHandleValue res);
+
+extern bool
 math_trunc(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/js.msg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/js.msg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/js.msg	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/js.msg	2014-11-26 21:45:57.000000000 +0000
@@ -65,7 +65,7 @@
 MSG_DEF(JSMSG_UNDECLARED_VAR,          1, JSEXN_REFERENCEERR, "assignment to undeclared variable {0}")
 MSG_DEF(JSMSG_GETTER_ONLY,             0, JSEXN_TYPEERR, "setting a property that has only a getter")
 MSG_DEF(JSMSG_UNDEFINED_PROP,          1, JSEXN_REFERENCEERR, "reference to undefined property {0}")
-MSG_DEF(JSMSG_INVALID_MAP_ITERABLE,    0, JSEXN_TYPEERR, "iterable for map should have array-like objects")
+MSG_DEF(JSMSG_INVALID_MAP_ITERABLE,    1, JSEXN_TYPEERR, "iterable for {0} should have array-like objects")
 MSG_DEF(JSMSG_NESTING_GENERATOR,       0, JSEXN_TYPEERR, "already executing generator")
 MSG_DEF(JSMSG_INCOMPATIBLE_METHOD,     3, JSEXN_TYPEERR, "{0} {1} called on incompatible {2}")
 MSG_DEF(JSMSG_OBJECT_WATCH_DEPRECATED, 0, JSEXN_NONE, "Object.prototype.watch and unwatch are very slow, non-standard, and deprecated; use a getter/setter instead")
@@ -90,7 +90,6 @@
 MSG_DEF(JSMSG_BAD_GET_SET_FIELD,       1, JSEXN_TYPEERR, "property descriptor's {0} field is neither undefined nor a function")
 MSG_DEF(JSMSG_THROW_TYPE_ERROR,        0, JSEXN_TYPEERR, "'caller', 'callee', and 'arguments' properties may not be accessed on strict mode functions or the arguments objects for calls to them")
 MSG_DEF(JSMSG_NOT_EXPECTED_TYPE,       3, JSEXN_TYPEERR, "{0}: expected {1}, got {2}")
-MSG_DEF(JSMSG_NEED_DEBUG_MODE,         0, JSEXN_ERR, "function can be called only in debug mode")
 MSG_DEF(JSMSG_NOT_ITERABLE,            1, JSEXN_TYPEERR, "{0} is not iterable")
 MSG_DEF(JSMSG_ALREADY_HAS_PRAGMA,      2, JSEXN_NONE, "{0} is being assigned a {1}, but already has one")
 MSG_DEF(JSMSG_NEXT_RETURNED_PRIMITIVE, 0, JSEXN_TYPEERR, "iterator.next() returned a non-object value")
@@ -182,6 +181,7 @@
 MSG_DEF(JSMSG_BAD_ARROW_ARGS,          0, JSEXN_SYNTAXERR, "invalid arrow-function arguments (parentheses around the arrow-function may help)")
 MSG_DEF(JSMSG_BAD_BINDING,             1, JSEXN_SYNTAXERR, "redefining {0} is deprecated")
 MSG_DEF(JSMSG_BAD_CONST_DECL,          0, JSEXN_SYNTAXERR, "missing = in const declaration")
+MSG_DEF(JSMSG_BAD_CONST_ASSIGN,        1, JSEXN_SYNTAXERR, "invalid assignment to const {0}")
 MSG_DEF(JSMSG_BAD_CONTINUE,            0, JSEXN_SYNTAXERR, "continue must be inside loop")
 MSG_DEF(JSMSG_BAD_DESTRUCT_ASS,        0, JSEXN_REFERENCEERR, "invalid destructuring assignment operator")
 MSG_DEF(JSMSG_BAD_DESTRUCT_TARGET,     0, JSEXN_SYNTAXERR, "invalid destructuring target")
@@ -226,6 +226,7 @@
 MSG_DEF(JSMSG_DECLARATION_AFTER_EXPORT,0, JSEXN_SYNTAXERR, "missing declaration after 'export' keyword")
 MSG_DEF(JSMSG_DECLARATION_AFTER_IMPORT,0, JSEXN_SYNTAXERR, "missing declaration after 'import' keyword")
 MSG_DEF(JSMSG_DEPRECATED_DELETE_OPERAND, 0, JSEXN_SYNTAXERR, "applying the 'delete' operator to an unqualified name is deprecated")
+MSG_DEF(JSMSG_DEPRECATED_LET_EXPRESSION, 0, JSEXN_NONE, "JavaScript 1.7's let expressions are deprecated")
 MSG_DEF(JSMSG_DEPRECATED_OCTAL,        0, JSEXN_SYNTAXERR, "octal literals and octal escape sequences are deprecated")
 MSG_DEF(JSMSG_DEPRECATED_PRAGMA,       1, JSEXN_NONE, "Using //@ to indicate {0} pragmas is deprecated. Use //# instead")
 MSG_DEF(JSMSG_DUPLICATE_FORMAL,        1, JSEXN_SYNTAXERR, "duplicate formal argument {0}")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsnum.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsnum.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsnum.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsnum.cpp	2014-11-26 21:45:57.000000000 +0000
@@ -542,9 +542,11 @@
 }
 #endif
 
-ToCStringBuf::ToCStringBuf() :dbuf(nullptr)
+ToCStringBuf::ToCStringBuf() : dbuf(nullptr)
 {
-    JS_STATIC_ASSERT(sbufSize >= DTOSTR_STANDARD_BUFFER_SIZE);
+    static_assert(sbufSize >= DTOSTR_STANDARD_BUFFER_SIZE,
+                  "builtin space must be large enough to store even the "
+                  "longest string produced by a conversion");
 }
 
 ToCStringBuf::~ToCStringBuf()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsobj.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsobj.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsobj.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsobj.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -3239,7 +3239,8 @@
 }
 
 static MOZ_ALWAYS_INLINE bool
-LookupPropertyPureInline(JSObject *obj, jsid id, NativeObject **objp, Shape **propp)
+LookupPropertyPureInline(ThreadSafeContext *cx, JSObject *obj, jsid id, NativeObject **objp,
+                         Shape **propp)
 {
     if (!obj->isNative())
         return false;
@@ -3274,9 +3275,17 @@
             return true;
         }
 
-        /* Fail if there's a resolve hook. */
-        if (current->getClass()->resolve != JS_ResolveStub)
+        // Fail if there's a resolve hook. We allow the JSFunction resolve hook
+        // if we know it will never add a property with this name.
+        do {
+            const Class *clasp = current->getClass();
+            MOZ_ASSERT(clasp->resolve);
+            if (clasp->resolve == JS_ResolveStub)
+                break;
+            if (clasp->resolve == fun_resolve && !FunctionHasResolveHook(cx->names(), id))
+                break;
             return false;
+        } while (0);
 
         JSObject *proto = current->getProto();
 
@@ -3308,9 +3317,10 @@
 }
 
 bool
-js::LookupPropertyPure(JSObject *obj, jsid id, NativeObject **objp, Shape **propp)
+js::LookupPropertyPure(ThreadSafeContext *cx, JSObject *obj, jsid id, NativeObject **objp,
+                       Shape **propp)
 {
-    return LookupPropertyPureInline(obj, id, objp, propp);
+    return LookupPropertyPureInline(cx, obj, id, objp, propp);
 }
 
 /*
@@ -3329,7 +3339,7 @@
     /* Deal with native objects. */
     NativeObject *obj2;
     Shape *shape;
-    if (!LookupPropertyPureInline(obj, id, &obj2, &shape))
+    if (!LookupPropertyPureInline(cx, obj, id, &obj2, &shape))
         return false;
 
     if (!shape) {
@@ -4133,8 +4143,8 @@
         fprintf(stderr, "  flags:");
         if (i.isConstructing())
             fprintf(stderr, " constructing");
-        if (!i.isJit() && i.interpFrame()->isDebuggerFrame())
-            fprintf(stderr, " debugger");
+        if (!i.isJit() && i.interpFrame()->isDebuggerEvalFrame())
+            fprintf(stderr, " debugger eval");
         if (i.isEvalFrame())
             fprintf(stderr, " eval");
         fputc('\n', stderr);
@@ -4153,7 +4163,7 @@
     Sprinter sprinter(cx);
     sprinter.init();
     size_t depth = 0;
-    for (ScriptFrameIter i(cx); !i.done(); ++i, ++depth) {
+    for (AllFramesIter i(cx); !i.done(); ++i, ++depth) {
         const char *filename = JS_GetScriptFilename(i.script());
         unsigned line = PCToLineNumber(i.script(), i.pc());
         JSScript *script = i.script();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsobj.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsobj.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsobj.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsobj.h	2014-11-26 21:45:58.000000000 +0000
@@ -1113,7 +1113,8 @@
 namespace js {
 
 bool
-LookupPropertyPure(JSObject *obj, jsid id, NativeObject **objp, Shape **propp);
+LookupPropertyPure(ThreadSafeContext *cx, JSObject *obj, jsid id, NativeObject **objp,
+                   Shape **propp);
 
 bool
 GetPropertyPure(ThreadSafeContext *cx, JSObject *obj, jsid id, Value *vp);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/json.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/json.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/json.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/json.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -47,13 +47,15 @@
     JS_ConvertStub
 };
 
-static inline bool IsQuoteSpecialCharacter(char16_t c)
+static inline bool
+IsQuoteSpecialCharacter(char16_t c)
 {
-    JS_STATIC_ASSERT('\b' < ' ');
-    JS_STATIC_ASSERT('\f' < ' ');
-    JS_STATIC_ASSERT('\n' < ' ');
-    JS_STATIC_ASSERT('\r' < ' ');
-    JS_STATIC_ASSERT('\t' < ' ');
+    static_assert('\b' < ' ', "'\\b' must be treated as special below");
+    static_assert('\f' < ' ', "'\\f' must be treated as special below");
+    static_assert('\n' < ' ', "'\\n' must be treated as special below");
+    static_assert('\r' < ' ', "'\\r' must be treated as special below");
+    static_assert('\t' < ' ', "'\\t' must be treated as special below");
+
     return c == '"' || c == '\\' || c < ' ';
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsopcode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsopcode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsopcode.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsopcode.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -1466,10 +1466,8 @@
 struct ExpressionDecompiler
 {
     JSContext *cx;
-    InterpreterFrame *fp;
     RootedScript script;
     RootedFunction fun;
-    BindingVector *localNames;
     BytecodeParser parser;
     Sprinter sprinter;
 
@@ -1477,11 +1475,9 @@
         : cx(cx),
           script(cx, script),
           fun(cx, fun),
-          localNames(nullptr),
           parser(cx, script),
           sprinter(cx)
     {}
-    ~ExpressionDecompiler();
     bool init();
     bool decompilePCForStackOperand(jsbytecode *pc, int i);
     bool decompilePC(jsbytecode *pc);
@@ -1631,11 +1627,6 @@
     return write("(intermediate value)");
 }
 
-ExpressionDecompiler::~ExpressionDecompiler()
-{
-    js_delete<BindingVector>(localNames);
-}
-
 bool
 ExpressionDecompiler::init()
 {
@@ -1644,13 +1635,6 @@
     if (!sprinter.init())
         return false;
 
-    localNames = cx->new_<BindingVector>(cx);
-    if (!localNames)
-        return false;
-    RootedScript script_(cx, script);
-    if (!FillBindingVector(script_, localNames))
-        return false;
-
     if (!parser.parse())
         return false;
 
@@ -1685,8 +1669,15 @@
 ExpressionDecompiler::getArg(unsigned slot)
 {
     MOZ_ASSERT(fun);
-    MOZ_ASSERT(slot < script->bindings.count());
-    return (*localNames)[slot].name();
+    MOZ_ASSERT(slot < script->bindings.numArgs());
+
+    for (BindingIter bi(script); bi; bi++) {
+        MOZ_ASSERT(bi->kind() == Binding::ARGUMENT);
+        if (bi.argIndex() == slot)
+            return bi->name();
+    }
+
+    MOZ_CRASH("No binding");
 }
 
 JSAtom *
@@ -1694,14 +1685,17 @@
 {
     MOZ_ASSERT(local < script->nfixed());
     if (local < script->nbodyfixed()) {
-        MOZ_ASSERT(fun);
-        uint32_t slot = local + fun->nargs();
-        MOZ_ASSERT(slot < script->bindings.count());
-        return (*localNames)[slot].name();
+        for (BindingIter bi(script); bi; bi++) {
+            if (bi->kind() != Binding::ARGUMENT && !bi->aliased() && bi.frameIndex() == local)
+                return bi->name();
+        }
+
+        MOZ_CRASH("No binding");
     }
     for (NestedScopeObject *chain = script->getStaticScope(pc);
          chain;
-         chain = chain->enclosingNestedScope()) {
+         chain = chain->enclosingNestedScope())
+    {
         if (!chain->is<StaticBlockObject>())
             continue;
         StaticBlockObject &block = chain->as<StaticBlockObject>();
@@ -2393,9 +2387,6 @@
 
     StringBuffer buf(cx);
 
-    if (!script->functionNonDelazifying() && !script->compileAndGo())
-        return buf.finishString();
-
     {
         AutoCompartment ac(cx, &script->global());
         if (!GetPCCountJSON(cx, sac, buf))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jspropertytree.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jspropertytree.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jspropertytree.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jspropertytree.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -323,12 +323,12 @@
             unowned = Forwarded(unowned);
 
         PropertyOp getter = key->getter();
-        if (key->hasGetterObject() && IsForwarded(key->getterObject()))
-            getter = PropertyOp(Forwarded(key->getterObject()));
+        if (key->hasGetterObject())
+            getter = PropertyOp(MaybeForwarded(key->getterObject()));
 
         StrictPropertyOp setter = key->setter();
-        if (key->hasSetterObject() && IsForwarded(key->setterObject()))
-            setter = StrictPropertyOp(Forwarded(key->setterObject()));
+        if (key->hasSetterObject())
+            setter = StrictPropertyOp(MaybeForwarded(key->setterObject()));
 
         StackShape lookup(unowned,
                           const_cast<Shape *>(key)->propidRef(),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsproxy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsproxy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsproxy.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsproxy.h	2014-11-26 21:45:58.000000000 +0000
@@ -255,7 +255,6 @@
     virtual bool ownPropertyKeys(JSContext *cx, HandleObject proxy,
                                  AutoIdVector &props) const = 0;
     virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const = 0;
-    virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const = 0;
 
     /*
      * These methods are standard, but the engine does not normally call them.
@@ -306,8 +305,10 @@
     virtual bool hasOwn(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
                                               AutoIdVector &props) const;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                           AutoIdVector &props) const = 0;
     virtual bool iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                         MutableHandleValue vp) const;
+                         MutableHandleObject objp) const;
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args) const;
     virtual bool hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v, bool *bp) const;
     virtual bool objectClassIs(HandleObject obj, ESClassValue classValue, JSContext *cx) const;
@@ -367,8 +368,6 @@
                                  AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id,
                          bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, HandleObject proxy,
-                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
                                 MutableHandleObject protop) const MOZ_OVERRIDE;
     virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto,
@@ -393,8 +392,10 @@
                         bool *bp) const MOZ_OVERRIDE;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
                                               AutoIdVector &props) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                         MutableHandleValue vp) const MOZ_OVERRIDE;
+                         MutableHandleObject objp) const MOZ_OVERRIDE;
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const MOZ_OVERRIDE;
     virtual bool hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsscript.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsscript.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsscript.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsscript.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -334,17 +334,6 @@
     }
 }
 
-bool
-js::FillBindingVector(HandleScript fromScript, BindingVector *vec)
-{
-    for (BindingIter bi(fromScript); bi; bi++) {
-        if (!vec->append(*bi))
-            return false;
-    }
-
-    return true;
-}
-
 template<XDRMode mode>
 bool
 js::XDRScriptConst(XDRState<mode> *xdr, MutableHandleValue vp)
@@ -2103,17 +2092,6 @@
 ScriptSource::setSourceMapURL(ExclusiveContext *cx, const char16_t *sourceMapURL)
 {
     MOZ_ASSERT(sourceMapURL);
-    if (hasSourceMapURL()) {
-        // Warn about the replacement, but use the new one.
-        if (cx->isJSContext()) {
-            JS_ReportErrorFlagsAndNumber(cx->asJSContext(), JSREPORT_WARNING,
-                                         js_GetErrorMessage, nullptr,
-                                         JSMSG_ALREADY_HAS_PRAGMA, filename_.get(),
-                                         "//# sourceMappingURL");
-        }
-
-        sourceMapURL_ = nullptr;
-    }
 
     size_t len = js_strlen(sourceMapURL) + 1;
     if (len == 1)
@@ -3315,7 +3293,7 @@
 JSScript::incrementStepModeCount(JSContext *cx)
 {
     assertSameCompartment(cx, this);
-    MOZ_ASSERT(cx->compartment()->debugMode());
+    MOZ_ASSERT(cx->compartment()->isDebuggee());
 
     if (!ensureHasDebugScript(cx))
         return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsscript.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsscript.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsscript.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsscript.h	2014-11-26 21:45:58.000000000 +0000
@@ -369,12 +369,17 @@
      */
     uint32_t        stepMode;
 
-    /* Number of breakpoint sites at opcodes in the script. */
+    /*
+     * Number of breakpoint sites at opcodes in the script. This is the number
+     * of populated entries in DebugScript::breakpoints, below.
+     */
     uint32_t        numSites;
 
     /*
-     * Array with all breakpoints installed at opcodes in the script, indexed
-     * by the offset of the opcode into the script.
+     * Breakpoints set in our script. For speed and simplicity, this array is
+     * parallel to script->code(): the BreakpointSite for the opcode at
+     * script->code()[offset] is debugScript->breakpoints[offset]. Naturally,
+     * this array's true length is script->length().
      */
     BreakpointSite  *breakpoints[1];
 };
@@ -1673,6 +1678,10 @@
     bool hasBreakpointsAt(jsbytecode *pc);
     bool hasAnyBreakpointsOrStepMode() { return hasDebugScript_; }
 
+    // See comment above 'debugMode' in jscompartment.h for explanation of
+    // invariants of debuggee compartments, scripts, and frames.
+    inline bool isDebuggee() const;
+
     js::BreakpointSite *getBreakpointSite(jsbytecode *pc)
     {
         return hasDebugScript_ ? debugScript()->breakpoints[pcToOffset(pc)] : nullptr;
@@ -1745,9 +1754,10 @@
         i_++;
     }
 
-    // Stack slots are assigned to arguments and unaliased locals. frameIndex()
-    // returns the slot index. It's invalid to call this method when the
-    // iterator is stopped on an aliased local, as it has no stack slot.
+    // Stack slots are assigned to arguments (aliased and unaliased) and
+    // unaliased locals. frameIndex() returns the slot index. It's invalid to
+    // call this method when the iterator is stopped on an aliased local, as it
+    // has no stack slot.
     uint32_t frameIndex() const {
         MOZ_ASSERT(!done());
         if (i_ < bindings_->numArgs())
@@ -1755,6 +1765,10 @@
         MOZ_ASSERT(!(*this)->aliased());
         return unaliasedLocal_;
     }
+
+    // If the current binding is an argument, argIndex() returns its index.
+    // It returns the same value as frameIndex(), as slots are allocated for
+    // both unaliased and aliased arguments.
     uint32_t argIndex() const {
         MOZ_ASSERT(!done());
         MOZ_ASSERT(i_ < bindings_->numArgs());
@@ -1780,16 +1794,6 @@
 };
 
 /*
- * This helper function fills the given BindingVector with the sequential
- * values of BindingIter.
- */
-
-typedef Vector<Binding, 32> BindingVector;
-
-extern bool
-FillBindingVector(HandleScript fromScript, BindingVector *vec);
-
-/*
  * Iterator over the aliased formal bindings in ascending index order. This can
  * be veiwed as a filtering of BindingIter with predicate
  *   bi->aliased() && bi->kind() == Binding::ARGUMENT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsscriptinlines.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsscriptinlines.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsscriptinlines.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsscriptinlines.h	2014-11-26 21:45:58.000000000 +0000
@@ -182,4 +182,10 @@
     return js::jit::AnalyzeArgumentsUsage(cx, this);
 }
 
+inline bool
+JSScript::isDebuggee() const
+{
+    return compartment_->debugObservesAllExecution() || hasDebugScript_;
+}
+
 #endif /* jsscriptinlines_h */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsstr.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsstr.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsstr.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsstr.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -575,9 +575,17 @@
     return true;
 }
 
-static JSString *
-DoSubstr(JSContext *cx, JSString *str, size_t begin, size_t len)
+JSString *
+js::SubstringKernel(JSContext *cx, HandleString str, int32_t beginInt, int32_t lengthInt)
 {
+    MOZ_ASSERT(0 <= beginInt);
+    MOZ_ASSERT(0 <= lengthInt);
+    MOZ_ASSERT(uint32_t(beginInt) <= str->length());
+    MOZ_ASSERT(uint32_t(lengthInt) <= str->length() - beginInt);
+
+    uint32_t begin = beginInt;
+    uint32_t len = lengthInt;
+
     /*
      * Optimization for one level deep ropes.
      * This is common for the following pattern:
@@ -591,16 +599,13 @@
         JSRope *rope = &str->asRope();
 
         /* Substring is totally in leftChild of rope. */
-        if (begin + len <= rope->leftChild()->length()) {
-            str = rope->leftChild();
-            return NewDependentString(cx, str, begin, len);
-        }
+        if (begin + len <= rope->leftChild()->length())
+            return NewDependentString(cx, rope->leftChild(), begin, len);
 
         /* Substring is totally in rightChild of rope. */
         if (begin >= rope->leftChild()->length()) {
-            str = rope->rightChild();
             begin -= rope->leftChild()->length();
-            return NewDependentString(cx, str, begin, len);
+            return NewDependentString(cx, rope->rightChild(), begin, len);
         }
 
         /*
@@ -628,65 +633,6 @@
     return NewDependentString(cx, str, begin, len);
 }
 
-bool
-js::str_substring(JSContext *cx, unsigned argc, Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    JSString *str = ThisToStringForStringProto(cx, args);
-    if (!str)
-        return false;
-
-    int32_t length, begin, end;
-    if (args.length() > 0) {
-        end = length = int32_t(str->length());
-
-        if (args[0].isInt32()) {
-            begin = args[0].toInt32();
-        } else {
-            RootedString strRoot(cx, str);
-            if (!ValueToIntegerRange(cx, args[0], &begin))
-                return false;
-            str = strRoot;
-        }
-
-        if (begin < 0)
-            begin = 0;
-        else if (begin > length)
-            begin = length;
-
-        if (args.hasDefined(1)) {
-            if (args[1].isInt32()) {
-                end = args[1].toInt32();
-            } else {
-                RootedString strRoot(cx, str);
-                if (!ValueToIntegerRange(cx, args[1], &end))
-                    return false;
-                str = strRoot;
-            }
-
-            if (end > length) {
-                end = length;
-            } else {
-                if (end < 0)
-                    end = 0;
-                if (end < begin) {
-                    int32_t tmp = begin;
-                    begin = end;
-                    end = tmp;
-                }
-            }
-        }
-
-        str = DoSubstr(cx, str, size_t(begin), size_t(end - begin));
-        if (!str)
-            return false;
-    }
-
-    args.rval().setString(str);
-    return true;
-}
-
 template <typename CharT>
 static JSString *
 ToLowerCase(JSContext *cx, JSLinearString *str)
@@ -3992,54 +3938,6 @@
     return aobj;
 }
 
-static bool
-str_substr(JSContext *cx, unsigned argc, Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-    RootedString str(cx, ThisToStringForStringProto(cx, args));
-    if (!str)
-        return false;
-
-    int32_t length, len, begin;
-    if (args.length() > 0) {
-        length = int32_t(str->length());
-        if (!ValueToIntegerRange(cx, args[0], &begin))
-            return false;
-
-        if (begin >= length) {
-            args.rval().setString(cx->runtime()->emptyString);
-            return true;
-        }
-        if (begin < 0) {
-            begin += length; /* length + INT_MIN will always be less than 0 */
-            if (begin < 0)
-                begin = 0;
-        }
-
-        if (args.hasDefined(1)) {
-            if (!ValueToIntegerRange(cx, args[1], &len))
-                return false;
-
-            if (len <= 0) {
-                args.rval().setString(cx->runtime()->emptyString);
-                return true;
-            }
-
-            if (uint32_t(length) < uint32_t(begin + len))
-                len = length - begin;
-        } else {
-            len = length - begin;
-        }
-
-        str = DoSubstr(cx, str, size_t(begin), size_t(len));
-        if (!str)
-            return false;
-    }
-
-    args.rval().setString(str);
-    return true;
-}
-
 /*
  * Python-esque sequence operations.
  */
@@ -4076,73 +3974,6 @@
     return true;
 }
 
-static bool
-str_slice(JSContext *cx, unsigned argc, Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    if (args.length() == 1 && args.thisv().isString() && args[0].isInt32()) {
-        JSString *str = args.thisv().toString();
-        size_t begin = args[0].toInt32();
-        size_t end = str->length();
-        if (begin <= end) {
-            size_t length = end - begin;
-            if (length == 0) {
-                str = cx->runtime()->emptyString;
-            } else {
-                str = (length == 1)
-                      ? cx->staticStrings().getUnitStringForElement(cx, str, begin)
-                      : NewDependentString(cx, str, begin, length);
-                if (!str)
-                    return false;
-            }
-            args.rval().setString(str);
-            return true;
-        }
-    }
-
-    RootedString str(cx, ThisToStringForStringProto(cx, args));
-    if (!str)
-        return false;
-
-    if (args.length() != 0) {
-        double begin, end, length;
-
-        if (!ToInteger(cx, args[0], &begin))
-            return false;
-        length = str->length();
-        if (begin < 0) {
-            begin += length;
-            if (begin < 0)
-                begin = 0;
-        } else if (begin > length) {
-            begin = length;
-        }
-
-        if (args.hasDefined(1)) {
-            if (!ToInteger(cx, args[1], &end))
-                return false;
-            if (end < 0) {
-                end += length;
-                if (end < 0)
-                    end = 0;
-            } else if (end > length) {
-                end = length;
-            }
-            if (end < begin)
-                end = begin;
-        } else {
-            end = length;
-        }
-
-        str = NewDependentString(cx, str, size_t(begin), size_t(end - begin));
-        if (!str)
-            return false;
-    }
-    args.rval().setString(str);
-    return true;
-}
-
 static const JSFunctionSpec string_methods[] = {
 #if JS_HAS_TOSOURCE
     JS_FN("quote",             str_quote,             0,JSFUN_GENERIC_NATIVE),
@@ -4152,11 +3983,11 @@
     /* 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("substring",         str_substring,         2,JSFUN_GENERIC_NATIVE),
     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_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),
     JS_FN("indexOf",           str_indexOf,           1,JSFUN_GENERIC_NATIVE),
@@ -4183,11 +4014,11 @@
     JS_FN("search",            str_search,            1,JSFUN_GENERIC_NATIVE),
     JS_FN("replace",           str_replace,           2,JSFUN_GENERIC_NATIVE),
     JS_FN("split",             str_split,             2,JSFUN_GENERIC_NATIVE),
-    JS_FN("substr",            str_substr,            2,JSFUN_GENERIC_NATIVE),
+    JS_SELF_HOSTED_FN("substr", "String_substr",      2,0),
 
     /* Python-esque sequence methods. */
     JS_FN("concat",            str_concat,            1,JSFUN_GENERIC_NATIVE),
-    JS_FN("slice",             str_slice,             2,JSFUN_GENERIC_NATIVE),
+    JS_SELF_HOSTED_FN("slice", "String_slice",        2,0),
 
     /* HTML string methods. */
     JS_SELF_HOSTED_FN("bold",     "String_bold",       0,0),
@@ -4293,13 +4124,17 @@
 
 static const JSFunctionSpec string_static_methods[] = {
     JS_FN("fromCharCode", js::str_fromCharCode, 1, 0),
-    JS_SELF_HOSTED_FN("fromCodePoint", "String_static_fromCodePoint", 1, 0),
-    JS_SELF_HOSTED_FN("raw", "String_static_raw", 2, 0),
+
+    JS_SELF_HOSTED_FN("fromCodePoint",   "String_static_fromCodePoint", 1,0),
+    JS_SELF_HOSTED_FN("raw",             "String_static_raw",           2,0),
+    JS_SELF_HOSTED_FN("substring",       "String_static_substring",     3,0),
+    JS_SELF_HOSTED_FN("substr",          "String_static_substr",        3,0),
+    JS_SELF_HOSTED_FN("slice",           "String_static_slice",         3,0),
 
     // This must be at the end because of bug 853075: functions listed after
     // self-hosted methods aren't available in self-hosted code.
 #if EXPOSE_INTL_API
-    JS_SELF_HOSTED_FN("localeCompare", "String_static_localeCompare", 2,0),
+    JS_SELF_HOSTED_FN("localeCompare",   "String_static_localeCompare", 2,0),
 #endif
     JS_FS_END
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsstr.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsstr.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsstr.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsstr.h	2014-11-26 21:45:58.000000000 +0000
@@ -250,6 +250,14 @@
 }
 
 /*
+ * Computes |str|'s substring for the range [beginInt, beginInt + lengthInt).
+ * Negative, overlarge, swapped, etc. |beginInt| and |lengthInt| are forbidden
+ * and constitute API misuse.
+ */
+JSString *
+SubstringKernel(JSContext *cx, HandleString str, int32_t beginInt, int32_t lengthInt);
+
+/*
  * Inflate bytes in ASCII encoding to char16_t code units. Return null on error,
  * otherwise return the char16_t buffer that was malloc'ed. length is updated to
  * the length of the new string (in char16_t code units). A null char is
@@ -312,9 +320,6 @@
 str_startsWith(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
-str_substring(JSContext *cx, unsigned argc, Value *vp);
-
-extern bool
 str_toLowerCase(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jstypes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jstypes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jstypes.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jstypes.h	2014-11-26 21:45:58.000000000 +0000
@@ -22,6 +22,7 @@
 #define jstypes_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/Casting.h"
 #include "mozilla/Types.h"
 
 // jstypes.h is (or should be!) included by every file in SpiderMonkey.
@@ -194,8 +195,8 @@
 ** MACROS:      JS_FUNC_TO_DATA_PTR
 **              JS_DATA_TO_FUNC_PTR
 ** DESCRIPTION:
-**      Macros to convert between function and data pointers assuming that
-**      they have the same size. Use them like this:
+**      Macros to convert between function and data pointers of the same
+**      size. Use them like this:
 **
 **      JSPropertyOp nativeGetter;
 **      JSObject *scriptedGetter;
@@ -206,14 +207,8 @@
 **
 ***********************************************************************/
 
-#ifdef __GNUC__
-# define JS_FUNC_TO_DATA_PTR(type, fun) (__extension__ (type) (size_t) (fun))
-# define JS_DATA_TO_FUNC_PTR(type, ptr) (__extension__ (type) (size_t) (ptr))
-#else
-/* Use an extra (void *) cast for MSVC. */
-# define JS_FUNC_TO_DATA_PTR(type, fun) ((type) (void *) (fun))
-# define JS_DATA_TO_FUNC_PTR(type, ptr) ((type) (void *) (ptr))
-#endif
+#define JS_FUNC_TO_DATA_PTR(type, fun)  (mozilla::BitwiseCast<type>(fun))
+#define JS_DATA_TO_FUNC_PTR(type, ptr)  (mozilla::BitwiseCast<type>(ptr))
 
 #ifdef __GNUC__
 # define JS_EXTENSION __extension__
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsutil.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsutil.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsutil.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsutil.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -33,12 +33,6 @@
 JS_PUBLIC_DATA(uint32_t) OOM_counter = 0;
 #endif
 
-/*
- * Checks the assumption that JS_FUNC_TO_DATA_PTR and JS_DATA_TO_FUNC_PTR
- * macros uses to implement casts between function and data pointers.
- */
-JS_STATIC_ASSERT(sizeof(void *) == sizeof(void (*)()));
-
 JS_PUBLIC_API(void)
 JS_Assert(const char *s, const char *file, int ln)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsweakmap.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsweakmap.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jsweakmap.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jsweakmap.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -522,10 +522,61 @@
 WeakMap_construct(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    JSObject *obj = NewBuiltinClassInstance(cx, &WeakMapObject::class_);
+    RootedObject obj(cx, NewBuiltinClassInstance(cx, &WeakMapObject::class_));
     if (!obj)
         return false;
 
+    // ES6 23.3.1.1 steps 5-6, 11.
+    if (args.hasDefined(0)) {
+        // Steps 7d-e.
+        JS::ForOfIterator iter(cx);
+        if (!iter.init(args[0]))
+            return false;
+
+        RootedValue pairVal(cx);
+        RootedObject pairObject(cx);
+        RootedValue keyVal(cx);
+        RootedObject keyObject(cx);
+        RootedValue val(cx);
+        while (true) {
+            // Steps 12a-e.
+            bool done;
+            if (!iter.next(&pairVal, &done))
+                return false;
+            if (done)
+                break;
+
+            // Step 12f.
+            if (!pairVal.isObject()) {
+                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                                     JSMSG_INVALID_MAP_ITERABLE, "WeakMap");
+                return false;
+            }
+
+            pairObject = &pairVal.toObject();
+            if (!pairObject)
+                return false;
+
+            // Steps 12g-h.
+            if (!JSObject::getElement(cx, pairObject, pairObject, 0, &keyVal))
+                return false;
+
+            // Steps 12i-j.
+            if (!JSObject::getElement(cx, pairObject, pairObject, 1, &val))
+                return false;
+
+            // Steps 12k-l.
+            if (keyVal.isPrimitive()) {
+                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+                return false;
+            }
+
+            keyObject = &keyVal.toObject();
+            if (!SetWeakMapEntry(cx, obj, keyObject, val))
+                return false;
+        }
+    }
+
     args.rval().setObject(*obj);
     return true;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jswrapper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jswrapper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/jswrapper.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/jswrapper.h	2014-11-26 21:45:58.000000000 +0000
@@ -121,7 +121,6 @@
     virtual bool ownPropertyKeys(JSContext *cx, HandleObject wrapper,
                                  AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
                                 MutableHandleObject protop) const MOZ_OVERRIDE;
     virtual bool setPrototypeOf(JSContext *cx, HandleObject proxy, HandleObject proto,
@@ -144,8 +143,10 @@
     virtual bool hasOwn(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, HandleObject wrapper,
                                               AutoIdVector &props) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject wrapper,
+                                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, HandleObject wrapper, unsigned flags,
-                         MutableHandleValue vp) const MOZ_OVERRIDE;
+                         MutableHandleObject objp) const MOZ_OVERRIDE;
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const MOZ_OVERRIDE;
     virtual bool hasInstance(JSContext *cx, HandleObject wrapper, MutableHandleValue v,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/moz.build	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/moz.build	2014-11-26 21:45:58.000000000 +0000
@@ -190,6 +190,7 @@
     'jit/shared/BaselineCompiler-shared.cpp',
     'jit/shared/CodeGenerator-shared.cpp',
     'jit/shared/Lowering-shared.cpp',
+    'jit/Sink.cpp',
     'jit/Snapshots.cpp',
     'jit/StupidAllocator.cpp',
     'jit/TypedObjectPrediction.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/BaseProxyHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/BaseProxyHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/BaseProxyHandler.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/BaseProxyHandler.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -198,18 +198,18 @@
 
 bool
 BaseProxyHandler::iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                          MutableHandleValue vp) const
+                          MutableHandleObject objp) const
 {
     assertEnteredPolicy(cx, proxy, JSID_VOID, ENUMERATE);
 
     AutoIdVector props(cx);
     if ((flags & JSITER_OWNONLY)
         ? !getOwnEnumerablePropertyKeys(cx, proxy, props)
-        : !enumerate(cx, proxy, props)) {
+        : !getEnumerablePropertyKeys(cx, proxy, props)) {
         return false;
     }
 
-    return EnumeratedIdVectorToIterator(cx, proxy, flags, props, vp);
+    return EnumeratedIdVectorToIterator(cx, proxy, flags, props, objp);
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/CrossCompartmentWrapper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/CrossCompartmentWrapper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/CrossCompartmentWrapper.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/CrossCompartmentWrapper.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -78,15 +78,6 @@
 }
 
 bool
-CrossCompartmentWrapper::enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const
-{
-    PIERCE(cx, wrapper,
-           NOTHING,
-           Wrapper::enumerate(cx, wrapper, props),
-           NOTHING);
-}
-
-bool
 CrossCompartmentWrapper::getPrototypeOf(JSContext *cx, HandleObject wrapper,
                                         MutableHandleObject protop) const
 {
@@ -197,16 +188,24 @@
            NOTHING);
 }
 
+bool
+CrossCompartmentWrapper::getEnumerablePropertyKeys(JSContext *cx, HandleObject wrapper,
+                                                   AutoIdVector &props) const
+{
+    PIERCE(cx, wrapper,
+           NOTHING,
+           Wrapper::getEnumerablePropertyKeys(cx, wrapper, props),
+           NOTHING);
+}
+
 /*
  * We can reify non-escaping iterator objects instead of having to wrap them. This
  * allows fast iteration over objects across a compartment boundary.
  */
 static bool
-CanReify(HandleValue vp)
+CanReify(HandleObject obj)
 {
-    JSObject *obj;
-    return vp.isObject() &&
-           (obj = &vp.toObject())->is<PropertyIteratorObject>() &&
+    return obj->is<PropertyIteratorObject>() &&
            (obj->as<PropertyIteratorObject>().getNativeIterator()->flags & JSITER_ENUMERATE);
 }
 
@@ -224,9 +223,9 @@
 };
 
 static bool
-Reify(JSContext *cx, JSCompartment *origin, MutableHandleValue vp)
+Reify(JSContext *cx, JSCompartment *origin, MutableHandleObject objp)
 {
-    Rooted<PropertyIteratorObject*> iterObj(cx, &vp.toObject().as<PropertyIteratorObject>());
+    Rooted<PropertyIteratorObject*> iterObj(cx, &objp->as<PropertyIteratorObject>());
     NativeIterator *ni = iterObj->getNativeIterator();
 
     AutoCloseIterator close(cx, iterObj);
@@ -242,7 +241,6 @@
      * implicit cx->enumerators state.
      */
     size_t length = ni->numKeys();
-    bool isKeyIter = ni->isKeyIter();
     AutoIdVector keys(cx);
     if (length > 0) {
         if (!keys.reserve(length))
@@ -260,29 +258,22 @@
     if (!CloseIterator(cx, iterObj))
         return false;
 
-    if (isKeyIter) {
-        if (!VectorToKeyIterator(cx, obj, ni->flags, keys, vp))
-            return false;
-    } else {
-        if (!VectorToValueIterator(cx, obj, ni->flags, keys, vp))
-            return false;
-    }
-    return true;
+    return EnumeratedIdVectorToIterator(cx, obj, ni->flags, keys, objp);
 }
 
 bool
 CrossCompartmentWrapper::iterate(JSContext *cx, HandleObject wrapper, unsigned flags,
-                                 MutableHandleValue vp) const
+                                 MutableHandleObject objp) const
 {
     {
         AutoCompartment call(cx, wrappedObject(wrapper));
-        if (!Wrapper::iterate(cx, wrapper, flags, vp))
+        if (!Wrapper::iterate(cx, wrapper, flags, objp))
             return false;
     }
 
-    if (CanReify(vp))
-        return Reify(cx, cx->compartment(), vp);
-    return cx->compartment()->wrap(cx, vp);
+    if (CanReify(objp))
+        return Reify(cx, cx->compartment(), objp);
+    return cx->compartment()->wrap(cx, objp);
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/DeadObjectProxy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/DeadObjectProxy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/DeadObjectProxy.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/DeadObjectProxy.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -54,7 +54,8 @@
 }
 
 bool
-DeadObjectProxy::enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const
+DeadObjectProxy::getEnumerablePropertyKeys(JSContext *cx, HandleObject wrapper,
+                                           AutoIdVector &props) const
 {
     JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/DeadObjectProxy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/DeadObjectProxy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/DeadObjectProxy.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/DeadObjectProxy.h	2014-11-26 21:45:58.000000000 +0000
@@ -26,7 +26,6 @@
     virtual bool ownPropertyKeys(JSContext *cx, HandleObject wrapper,
                                  AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, HandleObject wrapper, AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
                                 MutableHandleObject protop) const MOZ_OVERRIDE;
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE;
@@ -37,6 +36,8 @@
     /* SpiderMonkey extensions. */
     virtual bool getPropertyDescriptor(JSContext *cx, HandleObject wrapper, HandleId id,
                                        MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject wrapper,
+                                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const MOZ_OVERRIDE;
     virtual bool hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/DirectProxyHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/DirectProxyHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/DirectProxyHandler.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/DirectProxyHandler.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -68,16 +68,6 @@
 }
 
 bool
-DirectProxyHandler::enumerate(JSContext *cx, HandleObject proxy,
-                              AutoIdVector &props) const
-{
-    assertEnteredPolicy(cx, proxy, JSID_VOID, ENUMERATE);
-    MOZ_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
-    RootedObject target(cx, proxy->as<ProxyObject>().target());
-    return GetPropertyKeys(cx, target, 0, &props);
-}
-
-bool
 DirectProxyHandler::call(JSContext *cx, HandleObject proxy, const CallArgs &args) const
 {
     assertEnteredPolicy(cx, proxy, JSID_VOID, CALL);
@@ -253,13 +243,23 @@
 }
 
 bool
+DirectProxyHandler::getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                              AutoIdVector &props) const
+{
+    assertEnteredPolicy(cx, proxy, JSID_VOID, ENUMERATE);
+    MOZ_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
+    RootedObject target(cx, proxy->as<ProxyObject>().target());
+    return GetPropertyKeys(cx, target, 0, &props);
+}
+
+bool
 DirectProxyHandler::iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                            MutableHandleValue vp) const
+                            MutableHandleObject objp) const
 {
     assertEnteredPolicy(cx, proxy, JSID_VOID, ENUMERATE);
     MOZ_ASSERT(!hasPrototype()); // Should never be called if there's a prototype.
     RootedObject target(cx, proxy->as<ProxyObject>().target());
-    return GetIterator(cx, target, flags, vp);
+    return GetIterator(cx, target, flags, objp);
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/Proxy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/Proxy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/Proxy.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/Proxy.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -206,24 +206,6 @@
     return base.appendAll(uniqueOthers);
 }
 
-bool
-Proxy::enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props)
-{
-    JS_CHECK_RECURSION(cx, return false);
-    const BaseProxyHandler *handler = proxy->as<ProxyObject>().handler();
-    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOIDHANDLE, BaseProxyHandler::ENUMERATE, true);
-    if (!policy.allowed())
-        return policy.returnValue();
-    if (!handler->hasPrototype())
-        return proxy->as<ProxyObject>().handler()->enumerate(cx, proxy, props);
-    if (!handler->getOwnEnumerablePropertyKeys(cx, proxy, props))
-        return false;
-    AutoIdVector protoProps(cx);
-    INVOKE_ON_PROTOTYPE(cx, handler, proxy,
-                        GetPropertyKeys(cx, proto, 0, &protoProps) &&
-                        AppendUnique(cx, props, protoProps));
-}
-
 /* static */ bool
 Proxy::getPrototypeOf(JSContext *cx, HandleObject proxy, MutableHandleObject proto)
 {
@@ -385,31 +367,48 @@
 }
 
 bool
-Proxy::iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleValue vp)
+Proxy::getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props)
 {
     JS_CHECK_RECURSION(cx, return false);
     const BaseProxyHandler *handler = proxy->as<ProxyObject>().handler();
-    vp.setUndefined(); // default result if we refuse to perform this action
+    AutoEnterPolicy policy(cx, handler, proxy, JSID_VOIDHANDLE, BaseProxyHandler::ENUMERATE, true);
+    if (!policy.allowed())
+        return policy.returnValue();
+    if (!handler->hasPrototype())
+        return proxy->as<ProxyObject>().handler()->getEnumerablePropertyKeys(cx, proxy, props);
+    if (!handler->getOwnEnumerablePropertyKeys(cx, proxy, props))
+        return false;
+    AutoIdVector protoProps(cx);
+    INVOKE_ON_PROTOTYPE(cx, handler, proxy,
+                        GetPropertyKeys(cx, proto, 0, &protoProps) &&
+                        AppendUnique(cx, props, protoProps));
+}
+
+bool
+Proxy::iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleObject objp)
+{
+    JS_CHECK_RECURSION(cx, return false);
+    const BaseProxyHandler *handler = proxy->as<ProxyObject>().handler();
+    objp.set(nullptr); // default result if we refuse to perform this action
     if (!handler->hasPrototype()) {
         AutoEnterPolicy policy(cx, handler, proxy, JSID_VOIDHANDLE,
                                BaseProxyHandler::ENUMERATE, true);
         // If the policy denies access but wants us to return true, we need
         // to hand a valid (empty) iterator object to the caller.
         if (!policy.allowed()) {
-            AutoIdVector props(cx);
             return policy.returnValue() &&
-                   EnumeratedIdVectorToIterator(cx, proxy, flags, props, vp);
+                   NewEmptyPropertyIterator(cx, flags, objp);
         }
-        return handler->iterate(cx, proxy, flags, vp);
+        return handler->iterate(cx, proxy, flags, objp);
     }
     AutoIdVector props(cx);
     // The other Proxy::foo methods do the prototype-aware work for us here.
     if ((flags & JSITER_OWNONLY)
         ? !Proxy::getOwnEnumerablePropertyKeys(cx, proxy, props)
-        : !Proxy::enumerate(cx, proxy, props)) {
+        : !Proxy::getEnumerablePropertyKeys(cx, proxy, props)) {
         return false;
     }
-    return EnumeratedIdVectorToIterator(cx, proxy, flags, props, vp);
+    return EnumeratedIdVectorToIterator(cx, proxy, flags, props, objp);
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/Proxy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/Proxy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/Proxy.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/Proxy.h	2014-11-26 21:45:58.000000000 +0000
@@ -34,7 +34,6 @@
                                MutableHandle<JSPropertyDescriptor> desc);
     static bool ownPropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props);
     static bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp);
-    static bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props);
     static bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible);
     static bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded);
     static bool getPrototypeOf(JSContext *cx, HandleObject proxy, MutableHandleObject protop);
@@ -56,7 +55,8 @@
     static bool hasOwn(JSContext *cx, HandleObject proxy, HandleId id, bool *bp);
     static bool getOwnEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
                                              AutoIdVector &props);
-    static bool iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleValue vp);
+    static bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props);
+    static bool iterate(JSContext *cx, HandleObject proxy, unsigned flags, MutableHandleObject objp);
     static bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args);
     static bool hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v, bool *bp);
     static bool objectClassIs(HandleObject obj, ESClassValue classValue, JSContext *cx);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -761,7 +761,7 @@
 
 // ES6 (22 May, 2014) 9.5.11 Proxy.[[Enumerate]]
 bool
-ScriptedDirectProxyHandler::enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const
+ScriptedDirectProxyHandler::getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props) const
 {
     // step 1
     RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
@@ -782,7 +782,7 @@
 
     // step 6
     if (trap.isUndefined())
-        return DirectProxyHandler::enumerate(cx, proxy, props);
+        return DirectProxyHandler::getEnumerablePropertyKeys(cx, proxy, props);
 
     // step 7-8
     Value argv[] = {
@@ -1020,10 +1020,10 @@
 
 bool
 ScriptedDirectProxyHandler::iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                                    MutableHandleValue vp) const
+                                    MutableHandleObject objp) const
 {
     // FIXME: Provide a proper implementation for this trap, see bug 787004
-    return DirectProxyHandler::iterate(cx, proxy, flags, vp);
+    return DirectProxyHandler::iterate(cx, proxy, flags, objp);
 }
 
 // ES6 (22 May, 2014) 9.5.13 Proxy.[[Call]]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedDirectProxyHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedDirectProxyHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedDirectProxyHandler.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedDirectProxyHandler.h	2014-11-26 21:45:58.000000000 +0000
@@ -26,7 +26,6 @@
     virtual bool ownPropertyKeys(JSContext *cx, HandleObject proxy,
                                  AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE;
 
     /* These two are standard internal methods but aren't implemented to spec yet. */
     virtual bool getPrototypeOf(JSContext *cx, HandleObject proxy,
@@ -63,8 +62,10 @@
                                               AutoIdVector &props) const MOZ_OVERRIDE {
         return BaseProxyHandler::getOwnEnumerablePropertyKeys(cx, proxy, props);
     }
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                         MutableHandleValue vp) const MOZ_OVERRIDE;
+                         MutableHandleObject objp) const MOZ_OVERRIDE;
 
     virtual bool isCallable(JSObject *obj) const MOZ_OVERRIDE;
     virtual bool isConstructor(JSObject *obj) const MOZ_OVERRIDE {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -227,16 +227,6 @@
 }
 
 bool
-ScriptedIndirectProxyHandler::enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const
-{
-    RootedObject handler(cx, GetIndirectProxyHandlerObject(proxy));
-    RootedValue fval(cx), value(cx);
-    return GetFundamentalTrap(cx, handler, cx->names().enumerate, &fval) &&
-           Trap(cx, handler, fval, 0, nullptr, &value) &&
-           ArrayToIdVector(cx, value, props);
-}
-
-bool
 ScriptedIndirectProxyHandler::has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const
 {
     RootedObject handler(cx, GetIndirectProxyHandlerObject(proxy));
@@ -316,17 +306,34 @@
 }
 
 bool
+ScriptedIndirectProxyHandler::getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                                        AutoIdVector &props) const
+{
+    RootedObject handler(cx, GetIndirectProxyHandlerObject(proxy));
+    RootedValue fval(cx), value(cx);
+    return GetFundamentalTrap(cx, handler, cx->names().enumerate, &fval) &&
+           Trap(cx, handler, fval, 0, nullptr, &value) &&
+           ArrayToIdVector(cx, value, props);
+}
+
+bool
 ScriptedIndirectProxyHandler::iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                                      MutableHandleValue vp) const
+                                      MutableHandleObject objp) const
 {
     RootedObject handler(cx, GetIndirectProxyHandlerObject(proxy));
     RootedValue value(cx);
     if (!GetDerivedTrap(cx, handler, cx->names().iterate, &value))
         return false;
     if (!IsCallable(value))
-        return BaseProxyHandler::iterate(cx, proxy, flags, vp);
-    return Trap(cx, handler, value, 0, nullptr, vp) &&
-           ReturnedValueMustNotBePrimitive(cx, proxy, cx->names().iterate, vp);
+        return BaseProxyHandler::iterate(cx, proxy, flags, objp);
+
+    RootedValue rval(cx);
+    if (!Trap(cx, handler, value, 0, nullptr, &rval))
+        return false;
+    if (!ReturnedValueMustNotBePrimitive(cx, proxy, cx->names().iterate, rval))
+        return false;
+    objp.set(&rval.toObject());
+    return true;
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.h	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.h	2014-11-26 21:45:58.000000000 +0000
@@ -27,7 +27,6 @@
     virtual bool ownPropertyKeys(JSContext *cx, HandleObject proxy,
                                  AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const MOZ_OVERRIDE;
     virtual bool isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const MOZ_OVERRIDE;
     virtual bool has(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
@@ -42,8 +41,10 @@
     virtual bool hasOwn(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
                                               AutoIdVector &props) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy,
+                                           AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                         MutableHandleValue vp) const MOZ_OVERRIDE;
+                         MutableHandleObject objp) const MOZ_OVERRIDE;
     virtual bool nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const MOZ_OVERRIDE;
     virtual JSString *fun_toString(JSContext *cx, HandleObject proxy, unsigned indent) const MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/shell/js.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/shell/js.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/shell/js.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/shell/js.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -22,11 +22,8 @@
 # include <io.h>     /* for isatty() */
 #endif
 #include <locale.h>
-#ifdef HAVE_MALLOC_H /* for malloc_usable_size on Linux, _msize on Windows */
-#include <malloc.h>
-#endif
-#ifdef HAVE_MALLOC_MALLOC_H
-#include <malloc/malloc.h> /* for malloc_size on OSX */
+#if defined(MALLOC_H)
+# include MALLOC_H    /* for malloc_usable_size, malloc_size, _msize */
 #endif
 #include <math.h>
 #include <signal.h>
@@ -860,8 +857,9 @@
             .setCompileAndGo(true)
             .setNoScriptRval(true);
         RootedScript script(cx);
+        RootedValue unused(cx);
         if ((compileOnly && !Compile(cx, thisobj, opts, filename.ptr(), &script)) ||
-            !Evaluate(cx, thisobj, opts, filename.ptr()))
+            !Evaluate(cx, thisobj, opts, filename.ptr(), &unused))
         {
             return false;
         }
@@ -1669,6 +1667,43 @@
     return false;
 }
 
+static bool
+StartTimingMutator(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() > 0) {
+        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr,
+                             JSSMSG_TOO_MANY_ARGS, "startTimingMutator");
+        return false;
+    }
+
+    cx->runtime()->gc.stats.startTimingMutator();
+    args.rval().setUndefined();
+    return true;
+}
+
+static bool
+StopTimingMutator(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() > 0) {
+        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr,
+                             JSSMSG_TOO_MANY_ARGS, "stopTimingMutator");
+        return false;
+    }
+
+    double mutator_ms, gc_ms;
+    cx->runtime()->gc.stats.stopTimingMutator(mutator_ms, gc_ms);
+    double total_ms = mutator_ms + gc_ms;
+    if (total_ms > 0) {
+        fprintf(gOutFile, "Mutator: %.3fms (%.1f%%), GC: %.3fms (%.1f%%)\n",
+                mutator_ms, mutator_ms / total_ms * 100.0, gc_ms, gc_ms / total_ms * 100.0);
+    }
+
+    args.rval().setUndefined();
+    return true;
+}
+
 static const char *
 ToSource(JSContext *cx, MutableHandleValue vp, JSAutoByteString *bytes)
 {
@@ -2624,10 +2659,9 @@
             JS_ReportError(cx, "Invalid scope argument to evalcx");
             return false;
         }
-        if (!JS_EvaluateUCScript(cx, sobj, src, srclen,
-                                 filename.get(),
-                                 lineno,
-                                 args.rval())) {
+        JS::CompileOptions opts(cx);
+        opts.setFileAndLine(filename.get(), lineno);
+        if (!JS::Evaluate(cx, sobj, opts, src, srclen, args.rval())) {
             return false;
         }
     }
@@ -2638,70 +2672,6 @@
     return true;
 }
 
-static bool
-EvalInFrame(JSContext *cx, unsigned argc, jsval *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-    if (!args.get(0).isInt32() || !args.get(1).isString()) {
-        JS_ReportError(cx, "Invalid arguments to evalInFrame");
-        return false;
-    }
-
-    uint32_t upCount = args[0].toInt32();
-    RootedString str(cx, args[1].toString());
-    bool saveCurrent = args.get(2).isBoolean() ? args[2].toBoolean() : false;
-
-    if (!cx->compartment()->debugMode()) {
-        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage,
-                                     nullptr, JSMSG_NEED_DEBUG_MODE);
-        return false;
-    }
-
-    /* Debug-mode currently disables Ion compilation. */
-    ScriptFrameIter fi(cx);
-    for (uint32_t i = 0; i < upCount; ++i, ++fi) {
-        ScriptFrameIter next(fi);
-        ++next;
-        if (next.done())
-            break;
-    }
-
-    AutoStableStringChars stableChars(cx);
-    if (!stableChars.initTwoByte(cx, str))
-        return JSTRAP_ERROR;
-
-    AbstractFramePtr frame = fi.abstractFramePtr();
-    RootedScript fpscript(cx, frame.script());
-
-    RootedObject scope(cx);
-    {
-        RootedObject scopeChain(cx, frame.scopeChain());
-        AutoCompartment ac(cx, scopeChain);
-        scope = GetDebugScopeForFrame(cx, frame, fi.pc());
-    }
-    Rooted<Env*> env(cx, scope);
-    if (!env)
-        return false;
-
-    if (!ComputeThis(cx, frame))
-        return false;
-    RootedValue thisv(cx, frame.thisValue());
-
-    AutoSaveFrameChain sfc(cx);
-    if (saveCurrent) {
-        if (!sfc.save())
-            return false;
-    }
-
-    bool ok;
-    {
-        AutoCompartment ac(cx, env);
-        ok = EvaluateInEnv(cx, env, thisv, frame, stableChars.twoByteRange(), fpscript->filename(),
-                           PCToLineNumber(fpscript, fi.pc()), args.rval());
-    }
-    return ok;
-}
-
 struct WorkerInput
 {
     JSRuntime *runtime;
@@ -3642,30 +3612,6 @@
     return true;
 }
 
-static bool
-System(JSContext *cx, unsigned argc, jsval *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    if (args.length() == 0) {
-        JS_ReportErrorNumber(cx, my_GetErrorMessage, nullptr, JSSMSG_INVALID_ARGS,
-                             "system");
-        return false;
-    }
-
-    JSString *str = JS::ToString(cx, args[0]);
-    if (!str)
-        return false;
-
-    JSAutoByteString command(cx, str);
-    if (!command)
-        return false;
-
-    int result = system(command.ptr());
-    args.rval().setInt32(result);
-    return true;
-}
-
 static int sArgc;
 static char **sArgv;
 
@@ -4337,6 +4283,14 @@
 "  Throw if the first two arguments are not the same (both +0 or both -0,\n"
 "  both NaN, or non-zero and ===)."),
 
+    JS_FN_HELP("startTimingMutator", StartTimingMutator, 0, 0,
+"startTimingMutator()",
+"  Start accounting time to mutator vs GC."),
+
+    JS_FN_HELP("stopTimingMutator", StopTimingMutator, 0, 0,
+"stopTimingMutator()",
+"  Stop accounting time to mutator vs GC and dump the results."),
+
     JS_FN_HELP("throwError", ThrowError, 0, 0,
 "throwError()",
 "  Throw an error from JS_ReportError."),
@@ -4414,11 +4368,6 @@
 "  if (s == '' && !o) return new o with eager standard classes\n"
 "  if (s == 'lazy' && !o) return new o with lazy standard classes"),
 
-    JS_FN_HELP("evalInFrame", EvalInFrame, 2, 0,
-"evalInFrame(n,str,save)",
-"  Evaluate 'str' in the nth up frame.\n"
-"  If 'save' (default false), save the frame chain."),
-
     JS_FN_HELP("evalInWorker", EvalInWorker, 1, 0,
 "evalInWorker(str)",
 "  Evaluate 'str' in a separate thread with its own runtime.\n"),
@@ -4637,10 +4586,6 @@
 "  Redirect stdout and/or stderr to the named file. Pass undefined to avoid\n"
 "   redirecting. Filenames are relative to the current working directory."),
 
-    JS_FN_HELP("system", System, 1, 0,
-"system(command)",
-"  Execute command on the current host, returning result code."),
-
     JS_FN_HELP("nestedShell", NestedShell, 0, 0,
 "nestedShell(shellArgs...)",
 "  Execute the given code in a new JS shell process, passing this nested shell\n"
@@ -5472,7 +5417,9 @@
         } else {
             const char *code = codeChunks.front();
             RootedValue rval(cx);
-            if (!JS_EvaluateScript(cx, obj, code, strlen(code), "-e", 1, &rval))
+            JS::CompileOptions opts(cx);
+            opts.setFileAndLine("-e", 1);
+            if (!JS::Evaluate(cx, obj, opts, code, strlen(code), &rval))
                 return gExitCode ? gExitCode : EXITCODE_RUNTIME_ERROR;
             codeChunks.popFront();
         }
@@ -5553,6 +5500,15 @@
             return OptionFailure("ion-range-analysis", str);
     }
 
+    if (const char *str = op.getStringOption("ion-sink")) {
+        if (strcmp(str, "on") == 0)
+            jit::js_JitOptions.disableSink = false;
+        else if (strcmp(str, "off") == 0)
+            jit::js_JitOptions.disableSink = true;
+        else
+            return OptionFailure("ion-sink", str);
+    }
+
     if (const char *str = op.getStringOption("ion-loop-unrolling")) {
         if (strcmp(str, "on") == 0)
             jit::js_JitOptions.disableLoopUnrolling = false;
@@ -5682,6 +5638,12 @@
     dumpEntrainedVariables = op.getBoolOption("dump-entrained-variables");
 #endif
 
+#ifdef JS_GC_ZEAL
+    const char *zealStr = op.getStringOption("gc-zeal");
+    if (zealStr && !rt->gc.parseAndSetZeal(zealStr))
+        return false;
+#endif
+
     return true;
 }
 
@@ -5844,6 +5806,8 @@
                                "Find edge cases where Ion can avoid bailouts (default: on, off to disable)")
         || !op.addStringOption('\0', "ion-range-analysis", "on/off",
                                "Range analysis (default: on, off to disable)")
+        || !op.addStringOption('\0', "ion-sink", "on/off",
+                               "Sink code motion (default: on, off to disable)")
         || !op.addStringOption('\0', "ion-loop-unrolling", "on/off",
                                "Loop unrolling (default: off, on to enable)")
         || !op.addBoolOption('\0', "ion-check-range-analysis",
@@ -5914,6 +5878,11 @@
 #ifdef JSGC_GENERATIONAL
         || !op.addIntOption('\0', "nursery-size", "SIZE-MB", "Set the maximum nursery size in MB", 16)
 #endif
+#ifdef JS_GC_ZEAL
+        || !op.addStringOption('z', "gc-zeal", "LEVEL[,N]",
+                               "Specifies zealous garbage collection, overriding the environement "
+                               "variable JS_GC_ZEAL.")
+#endif
     )
     {
         return EXIT_FAILURE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/shell/OSObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/shell/OSObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/shell/OSObject.cpp	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/shell/OSObject.cpp	2014-11-26 21:45:58.000000000 +0000
@@ -8,7 +8,18 @@
 
 #include "shell/OSObject.h"
 
+#include <errno.h>
 #include <stdlib.h>
+#ifdef XP_WIN
+#include <process.h>
+#include <string.h>
+#else
+#include <sys/wait.h>
+#include <unistd.h>
+#endif
+
+// For JSFunctionSpecWithHelp
+#include "jsfriendapi.h"
 
 using namespace JS;
 
@@ -38,9 +49,239 @@
     return true;
 }
 
-static const JSFunctionSpec os_functions[] = {
-    JS_FS("getenv", os_getenv, 1, 0),
-    JS_FS_END
+static bool
+os_getpid(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() != 0) {
+        JS_ReportError(cx, "os.getpid takes no arguments");
+        return false;
+    }
+    args.rval().setInt32(getpid());
+    return true;
+}
+
+// There are two possible definitions of strerror_r floating around. The GNU
+// one returns a char* which may or may not be the buffer you passed in. The
+// other one returns an integer status code, and always writes the result into
+// the provided buffer.
+
+static inline char *
+strerror_message(int result, char *buffer)
+{
+    return result == 0 ? buffer : nullptr;
+}
+
+static inline char *
+strerror_message(char *result, char *buffer)
+{
+    return result;
+}
+
+static void
+ReportSysError(JSContext *cx, const char *prefix)
+{
+    static char buffer[200];
+#if defined(XP_WIN)
+    strerror_s(buffer, sizeof(buffer), errno);
+    const char *errstr = buffer;
+#else
+    const char *errstr = strerror_message(strerror_r(errno, buffer, sizeof(buffer)), buffer);
+#endif
+
+    if (!errstr)
+        errstr = "unknown error";
+
+    size_t nbytes = strlen(prefix) + strlen(errstr) + 3;
+    char *final = (char*) js_malloc(nbytes);
+    if (!final) {
+        JS_ReportOutOfMemory(cx);
+        return;
+    }
+
+#ifdef XP_WIN
+    _snprintf(final, nbytes, "%s: %s", prefix, errstr);
+#else
+    snprintf(final, nbytes, "%s: %s", prefix, errstr);
+#endif
+    JS_ReportError(cx, final);
+    js_free(final);
+}
+
+static bool
+os_system(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (args.length() == 0) {
+        JS_ReportError(cx, "os.system requires 1 argument");
+        return false;
+    }
+
+    JSString *str = JS::ToString(cx, args[0]);
+    if (!str)
+        return false;
+
+    JSAutoByteString command(cx, str);
+    if (!command)
+        return false;
+
+    int result = system(command.ptr());
+    if (result == -1) {
+        ReportSysError(cx, "system call failed");
+        return false;
+    }
+
+    args.rval().setInt32(result);
+    return true;
+}
+
+#ifndef XP_WIN
+static bool
+os_spawn(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (args.length() == 0) {
+        JS_ReportError(cx, "os.spawn requires 1 argument");
+        return false;
+    }
+
+    JSString *str = JS::ToString(cx, args[0]);
+    if (!str)
+        return false;
+
+    JSAutoByteString command(cx, str);
+    if (!command)
+        return false;
+
+    int32_t childPid = fork();
+    if (childPid) {
+        args.rval().setInt32(childPid);
+        return true;
+    }
+
+    if (childPid == -1) {
+        ReportSysError(cx, "fork failed");
+        return false;
+    }
+
+    // We are in the child
+
+    const char *cmd[] = {"sh", "-c", nullptr, nullptr};
+    cmd[2] = command.ptr();
+
+    execvp("sh", (char * const*)cmd);
+    exit(1);
+}
+
+static bool
+os_kill(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    int32_t pid;
+    if (args.length() < 1) {
+        JS_ReportError(cx, "os.kill requires 1 argument");
+        return false;
+    }
+    if (!JS::ToInt32(cx, args[0], &pid))
+        return false;
+
+    // It is too easy to kill yourself accidentally with os.kill("goose").
+    if (pid == 0 && !args[0].isInt32()) {
+        JS_ReportError(cx, "os.kill requires numeric pid");
+        return false;
+    }
+
+    int signal = SIGINT;
+    if (args.length() > 1) {
+        if (!JS::ToInt32(cx, args[1], &signal))
+            return false;
+    }
+
+    int status = kill(pid, signal);
+    if (status == -1)
+        ReportSysError(cx, "kill failed");
+    args.rval().setUndefined();
+    return true;
+}
+
+static bool
+os_waitpid(JSContext* cx, unsigned argc, Value* vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    int32_t pid;
+    if (args.length() == 0) {
+        pid = -1;
+    } else {
+        if (!JS::ToInt32(cx, args[0], &pid))
+            return false;
+    }
+
+    bool nohang = false;
+    if (args.length() >= 2)
+        nohang = JS::ToBoolean(args[1]);
+
+    int status;
+    pid_t result = waitpid(pid, &status, nohang ? WNOHANG : 0);
+    if (result == -1) {
+        ReportSysError(cx, "os.waitpid failed");
+        return false;
+    }
+
+    RootedObject info(cx, JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
+    if (!info)
+        return false;
+
+    RootedValue v(cx);
+    if (result != 0) {
+        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;
+    }
+
+    args.rval().setObject(*info);
+    return true;
+}
+#endif
+
+static const JSFunctionSpecWithHelp os_functions[] = {
+    JS_FN_HELP("getenv", os_getenv, 1, 0,
+"getenv(variable)",
+"  Get the value of an environment variable."),
+
+    JS_FN_HELP("getpid", os_getpid, 0, 0,
+"getpid()",
+"  Return the current process id."),
+
+    JS_FN_HELP("system", os_system, 1, 0,
+"system(command)",
+"  Execute command on the current host, returning result code or throwing an\n"
+"  exception on failure."),
+
+#ifndef XP_WIN
+    JS_FN_HELP("spawn", os_spawn, 1, 0,
+"spawn(command)",
+"  Start up a separate process running the given command. Returns the pid."),
+
+    JS_FN_HELP("kill", os_kill, 1, 0,
+"kill(pid[, signal])",
+"  Send a signal to the given pid. The default signal is SIGINT. The signal\n"
+"  passed in must be numeric, if given."),
+
+    JS_FN_HELP("waitpid", os_waitpid, 1, 0,
+"waitpid(pid[, nohang])",
+"  Calls waitpid(). 'nohang' is a boolean indicating whether to pass WNOHANG.\n"
+"  The return value is an object containing a 'pid' field, if a process was waitable\n"
+"  and an 'exitStatus' field if a pid exited."),
+#endif
+    JS_FS_HELP_END
 };
 
 bool
@@ -48,6 +289,6 @@
 {
     RootedObject obj(cx, JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
     return obj &&
-           JS_DefineFunctions(cx, obj, os_functions) &&
+           JS_DefineFunctionsWithHelp(cx, obj, os_functions) &&
            JS_DefineProperty(cx, global, "os", obj, 0);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/extensions/element-setting-ToNumber-neuters.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/extensions/element-setting-ToNumber-neuters.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/extensions/element-setting-ToNumber-neuters.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/extensions/element-setting-ToNumber-neuters.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,40 @@
+// |reftest| skip-if(!xulRuntime.shell) -- needs neuter()
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+"use strict"; // make test fail when limitation below is fixed
+
+var gTestfile = 'element-setting-ToNumber-neuters.js';
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 1001547;
+var summary =
+  "Don't assert assigning into memory neutered while converting the value to " +
+  "assign into a number";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+// Technically per current spec the element-sets should throw in strict mode,
+// but we just silently do nothing for now, somewhat due to limitations of our
+// internal MOP (which can't easily say "try this special behavior, else fall
+// back on normal logic"), somewhat because it's consistent with current
+// behavior (as of this test's addition) for out-of-bounds sets.
+
+var ab1 = new ArrayBuffer(64);
+var ta1 = new Uint32Array(ab1);
+ta1[4] = { valueOf: function() { neuter(ab1, "change-data"); return 5; } };
+
+var ab2 = new ArrayBuffer(64);
+var ta2 = new Uint32Array(ab2);
+ta2[4] = { valueOf: function() { neuter(ab2, "same-data"); return 5; } };
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/Generators/yield-non-regexp.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/Generators/yield-non-regexp.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/Generators/yield-non-regexp.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/Generators/yield-non-regexp.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,16 @@
+var BUGNUMBER = 1099956;
+var summary =
+  "The token next to yield should be tokenized as non-operand if yield is " +
+  "a valid name";
+
+printBugNumber(BUGNUMBER);
+printStatus(summary);
+
+var yield = 12, a = 3, b = 6, g = 2;
+var yieldParsedAsIdentifier = false;
+
+yield /a; yieldParsedAsIdentifier = true; b/g;
+
+assertEq(yieldParsedAsIdentifier, true);
+
+reportCompare(true, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/comparisons.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/comparisons.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/comparisons.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/comparisons.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
+
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+var float32x4 = SIMD.float32x4;
+var int32x4 = SIMD.int32x4;
+
+var fround = Math.fround;
+
+function boolToSimdLogical(b) {
+    return b ? 0xFFFFFFFF | 0 : 0x0;
+}
+
+function testEqualFloat32x4(v, w) {
+    testBinaryFunc(v, w, float32x4.equal, (x, y) => boolToSimdLogical(fround(x) == fround(y)));
+}
+function testNotEqualFloat32x4(v, w) {
+    testBinaryFunc(v, w, float32x4.notEqual, (x, y) => boolToSimdLogical(fround(x) != fround(y)));
+}
+function testLessThanFloat32x4(v, w) {
+    testBinaryFunc(v, w, float32x4.lessThan, (x, y) => boolToSimdLogical(fround(x) < fround(y)));
+}
+function testLessThanOrEqualFloat32x4(v, w) {
+    testBinaryFunc(v, w, float32x4.lessThanOrEqual, (x, y) => boolToSimdLogical(fround(x) <= fround(y)));
+}
+function testGreaterThanFloat32x4(v, w) {
+    testBinaryFunc(v, w, float32x4.greaterThan, (x, y) => boolToSimdLogical(fround(x) > fround(y)));
+}
+function testGreaterThanOrEqualFloat32x4(v, w) {
+    testBinaryFunc(v, w, float32x4.greaterThanOrEqual, (x, y) => boolToSimdLogical(fround(x) >= fround(y)));
+}
+
+function testEqualInt32x4(v, w) {
+    testBinaryFunc(v, w, int32x4.equal, (x, y) => boolToSimdLogical(x == y));
+}
+function testNotEqualInt32x4(v, w) {
+    testBinaryFunc(v, w, int32x4.notEqual, (x, y) => boolToSimdLogical(x != y));
+}
+function testLessThanInt32x4(v, w) {
+    testBinaryFunc(v, w, int32x4.lessThan, (x, y) => boolToSimdLogical(x < y));
+}
+function testLessThanOrEqualInt32x4(v, w) {
+    testBinaryFunc(v, w, int32x4.lessThanOrEqual, (x, y) => boolToSimdLogical(x <= y));
+}
+function testGreaterThanInt32x4(v, w) {
+    testBinaryFunc(v, w, int32x4.greaterThan, (x, y) => boolToSimdLogical(x > y));
+}
+function testGreaterThanOrEqualInt32x4(v, w) {
+    testBinaryFunc(v, w, int32x4.greaterThanOrEqual, (x, y) => boolToSimdLogical(x >= y));
+}
+
+function test() {
+  var float32x4val = [
+      float32x4(1, 20, 30, 4),
+      float32x4(10, 2, 3, 40),
+      float32x4(9.999, 2.1234, 30.4443, 4),
+      float32x4(10, 2.1233, 30.4444, 4.0001),
+      float32x4(NaN, -Infinity, +Infinity, -0),
+      float32x4(+Infinity, NaN, -0, -Infinity),
+      float32x4(13.37, 42.42, NaN, 0)
+  ];
+
+  var v, w;
+  for (v of float32x4val) {
+      for (w of float32x4val) {
+          testEqualFloat32x4(v, w);
+          testNotEqualFloat32x4(v, w);
+          testLessThanFloat32x4(v, w);
+          testLessThanOrEqualFloat32x4(v, w);
+          testGreaterThanFloat32x4(v, w);
+          testGreaterThanOrEqualFloat32x4(v, w);
+      }
+  }
+
+  var int32x4val = [
+      int32x4(1, 2, 3, 4),
+      int32x4(-1, -2, -3, -4),
+      int32x4(-1, 2, -3, 4),
+      int32x4(1, -2, 3, -4),
+      int32x4(INT32_MAX, INT32_MAX, INT32_MIN, INT32_MIN),
+      int32x4(INT32_MAX, INT32_MIN, INT32_MAX, INT32_MIN)
+  ];
+
+  for (v of int32x4val) {
+      for (w of int32x4val) {
+          testEqualInt32x4(v, w);
+          testNotEqualInt32x4(v, w);
+          testLessThanInt32x4(v, w);
+          testLessThanOrEqualInt32x4(v, w);
+          testGreaterThanInt32x4(v, w);
+          testGreaterThanOrEqualInt32x4(v, w);
+      }
+  }
+
+  if (typeof reportCompare === "function")
+    reportCompare(true, true);
+}
+
+test();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4equal.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4equal.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4equal.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4equal.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 equal';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of NaN/-0/Infinity/-Infinity border cases.
-
-  var a = float32x4(1, 20, 30, 40);
-  var b = float32x4(10, 20, 30, 4);
-  var c = SIMD.float32x4.equal(a, b);
-  assertEq(c.x, 0);
-  assertEq(c.y, -1);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  var d = float32x4(1.89, 20.51, 30.46, 40.12);
-  var e = float32x4(10.89, 20.51, Math.fround(30.46), 4.12);
-  var f = SIMD.float32x4.equal(d, e);
-  assertEq(c.x, 0);
-  assertEq(c.y, -1);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthan.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthan.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthan.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthan.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 greaterThan';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of -0/Infinity/-Infinity border cases.
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN border cases once the semantics are defined.
-
-  var a = float32x4(1, 20, 3, 40);
-  var b = float32x4(10, 2, 30, 4);
-  var c = SIMD.float32x4.greaterThan(b, a);
-  assertEq(c.x, -1);
-  assertEq(c.y, 0);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  var d = float32x4(10.8399, 20.37, 3.07, 4.6802);
-  var e = float32x4(10.8401, 20.367, 3.1, 4.6801);
-  var f = float32x4.greaterThan(e, d);
-  assertEq(f.x, -1);
-  assertEq(f.y, 0);
-  assertEq(f.z, -1);
-  assertEq(f.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthanorequal.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthanorequal.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthanorequal.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4greaterthanorequal.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 greaterThanOrEqual';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of -0/Infinity/-Infinity border cases.
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN border cases once the semantics are defined.
-
-  var a = float32x4(1, 20, 30, 40);
-  var b = float32x4(10, 20, 30, 4);
-  var c = SIMD.float32x4.greaterThanOrEqual(b, a);
-  assertEq(c.x, -1);
-  assertEq(c.y, -1);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  var d = float32x4(10.029, 20.87, 30.56, 4.7);
-  var e = float32x4(10.03, 20.87, 30.56, 4.698);
-  var f = float32x4.greaterThanOrEqual(e, d);
-  assertEq(f.x, -1);
-  assertEq(f.y, -1);
-  assertEq(f.z, -1);
-  assertEq(f.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthan.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthan.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthan.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthan.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 lessThan';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of -0/Infinity/-Infinity border cases.
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN border cases once the semantics are defined.
-
-  var a = float32x4(1, 20, 3, 40);
-  var b = float32x4(10, 2, 30, 4);
-  var c = SIMD.float32x4.lessThan(a, b);
-  assertEq(c.x, -1);
-  assertEq(c.y, 0);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  var d = float32x4(1.5399, 20.001, 30.045, 4.74);
-  var e = float32x4(1.54, 19.999, 30.05, 4.72);
-  var f = float32x4.lessThan(a, b);
-  assertEq(f.x, -1);
-  assertEq(f.y, 0);
-  assertEq(f.z, -1);
-  assertEq(f.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthanorequal.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthanorequal.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthanorequal.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4lessthanorequal.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 lessThanOrEqual';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of -0/Infinity/-Infinity border cases.
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN border cases once the semantics are defined.
-
-  var a = float32x4(1, 20, 30, 40);
-  var b = float32x4(10, 20, 30, 4);
-  var c = SIMD.float32x4.lessThanOrEqual(a, b);
-  assertEq(c.x, -1);
-  assertEq(c.y, -1);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  var d = float32x4(9.999, 20.78, 30.14, 40.1235);
-  var e = float32x4(10, 20.78, 30.14, 40.123);
-  var f = float32x4.lessThanOrEqual(d, e);
-  assertEq(f.x, -1);
-  assertEq(f.y, -1);
-  assertEq(f.z, -1);
-  assertEq(f.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4max.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4max.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4max.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4max.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 max';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of -0/Infinity/-Infinity border cases.
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN border cases once the semantics are defined.
-
-  var a = float32x4(1, 20, 30, 4);
-  var b = float32x4(10, 2, 3, 40);
-  var c = SIMD.float32x4.max(a, b);
-  assertEq(c.x, 10);
-  assertEq(c.y, 20);
-  assertEq(c.z, 30);
-  assertEq(c.w, 40);
-
-  var d = float32x4(9.999, 2.1234, 30.4443, 4);
-  var e = float32x4(10, 2.1233, 30.4444, 4.0001);
-  var f = float32x4.max(d, e);
-  assertEq(f.x, 10);
-  assertEq(f.y, Math.fround(2.1234));
-  assertEq(f.z, Math.fround(30.4444));
-  assertEq(f.w, Math.fround(4.0001));
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4min.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4min.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4min.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4min.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 min';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of -0/Infinity/-Infinity border cases.
-  // FIXME -- Bug 1068028: Amend to check for correctness of NaN border cases once the semantics are defined.
-
-  var a = float32x4(1, 20, 3, 40);
-  var b = float32x4(10, 2, 30, 4);
-  var c = SIMD.float32x4.min(a, b);
-  assertEq(c.x, 1);
-  assertEq(c.y, 2);
-  assertEq(c.z, 3);
-  assertEq(c.w, 4);
-
-  var d = float32x4(1.4321, 20.5567, 30.8999, 4.0002);
-  var e = float32x4(1.432, 20.5568, 30.8998, 4.0001);
-  var f = float32x4.min(d, e);
-  assertEq(f.x, Math.fround(1.432));
-  assertEq(f.y, Math.fround(20.5567));
-  assertEq(f.z, Math.fround(30.8998));
-  assertEq(f.w, Math.fround(4.0001));
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4-minmax.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4-minmax.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4-minmax.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4-minmax.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,54 @@
+// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
+var BUGNUMBER = 946042;
+
+var float32x4 = SIMD.float32x4;
+
+function testMaxFloat32(v, w) {
+    return testBinaryFunc(v, w, float32x4.max, (x, y) => Math.fround(Math.max(x, y)));
+}
+function testMinFloat32(v, w) {
+    return testBinaryFunc(v, w, float32x4.min, (x, y) => Math.fround(Math.min(x, y)));
+}
+
+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 testMaxNumFloat32(v, w) {
+    return testBinaryFunc(v, w, float32x4.maxNum, maxNum);
+}
+function testMinNumFloat32(v, w) {
+    return testBinaryFunc(v, w, float32x4.minNum, minNum);
+}
+
+function test() {
+  print(BUGNUMBER + ": " + summary);
+
+  for ([v, w] of [[float32x4(1, 20, 30, 4), float32x4(10, 2, 3, 40)],
+                  [float32x4(9.999, 2.1234, 30.4443, 4), float32x4(10, 2.1233, 30.4444, 4.0001)],
+                  [float32x4(NaN, -Infinity, +Infinity, -0), float32x4(13.37, 42.42, NaN, 0)]])
+  {
+      testMinFloat32(v, w);
+      testMaxFloat32(v, w);
+      testMinNumFloat32(v, w);
+      testMaxNumFloat32(v, w);
+  }
+
+  if (typeof reportCompare === "function")
+    reportCompare(true, true);
+}
+
+test();
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4notequal.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4notequal.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4notequal.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4notequal.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 notEqual';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  // FIXME -- Bug 1081697: Amend to check for correctness of NaN/-0/Infinity/-Infinity border cases.
-
-  var a = float32x4(1, 20, 30, 40);
-  var b = float32x4(10, 20, 30, 4);
-  var c = SIMD.float32x4.notEqual(a, b);
-  assertEq(c.x, -1);
-  assertEq(c.y, 0);
-  assertEq(c.z, 0);
-  assertEq(c.w, -1);
-
-  var d = float32x4(9.98, 20.65, 30.14, 4.235);
-  var e = float32x4(9.99, 20.65, Math.fround(30.14), 4.23);
-  var f = SIMD.float32x4.notEqual(d, e);
-  assertEq(f.x, -1);
-  assertEq(f.y, 0);
-  assertEq(f.z, 0);
-  assertEq(f.w, -1);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4scale.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4scale.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4scale.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/float32x4scale.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'float32x4 scale';
-
-function mulf(a, b) {
-  return Math.fround(Math.fround(a) * Math.fround(b));
-}
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  var a = float32x4(1, 2, 3, 4);
-  var c = SIMD.float32x4.scale(a, 2);
-  assertEq(c.x, 2);
-  assertEq(c.y, 4);
-  assertEq(c.z, 6);
-  assertEq(c.w, 8);
-
-  var d = float32x4(1.34, 2.76, 3.21, 4.09);
-  var f = float32x4.scale(d, 2.54);
-  assertEq(f.x, mulf(1.34, 2.54));
-  assertEq(f.y, mulf(2.76, 2.54));
-  assertEq(f.z, mulf(3.21, 2.54));
-  assertEq(f.w, mulf(4.09, 2.54));
-
-  var g = float32x4(NaN, -0, Infinity, -Infinity);
-  var i = float32x4.scale(g, 2.54);
-  assertEq(i.x, NaN);
-  assertEq(i.y, -0);
-  assertEq(i.z, Infinity);
-  assertEq(i.w, -Infinity);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4equal.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4equal.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4equal.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4equal.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 996076;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'int32x4 equal';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  var a = int32x4(1, 20, 30, 40);
-  var b = int32x4(10, 20, 30, 4);
-  var c = SIMD.int32x4.equal(a, b);
-  assertEq(c.x, 0);
-  assertEq(c.y, -1);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4greaterthan.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4greaterthan.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4greaterthan.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4greaterthan.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 996076;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'int32x4 greaterThan';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  var a = int32x4(1, 20, 3, 40);
-  var b = int32x4(10, 2, 30, 4);
-  var c = SIMD.int32x4.greaterThan(b,a);
-  assertEq(c.x, -1);
-  assertEq(c.y, 0);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4lessthan.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4lessthan.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4lessthan.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4lessthan.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 996076;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'int32x4 lessThan';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  var a = int32x4(1, 20, 3, 40);
-  var b = int32x4(10, 2, 30, 4);
-  var c = SIMD.int32x4.lessThan(a, b);
-  assertEq(c.x, -1);
-  assertEq(c.y, 0);
-  assertEq(c.z, -1);
-  assertEq(c.w, 0);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4select.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4select.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4select.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4select.js	2014-11-26 21:45:59.000000000 +0000
@@ -4,9 +4,6 @@
 
 var summary = 'int32x4 select';
 
-const INT32_MAX = Math.pow(2, 31) - 1;
-const INT32_MIN = INT32_MAX + 1 | 0;
-
 function test() {
   print(BUGNUMBER + ": " + summary);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4withflag.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4withflag.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4withflag.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/int32x4withflag.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
-var BUGNUMBER = 946042;
-var float32x4 = SIMD.float32x4;
-var int32x4 = SIMD.int32x4;
-
-var summary = 'int32x4 with';
-
-function test() {
-  print(BUGNUMBER + ": " + summary);
-
-  var a = int32x4(1, 2, 3, 4);
-  var x = SIMD.int32x4.withFlagX(a, true);
-  var y = SIMD.int32x4.withFlagY(a, false);
-  var z = SIMD.int32x4.withFlagZ(a, false);
-  var w = SIMD.int32x4.withFlagW(a, true);
-  assertEq(x.x, -1);
-  assertEq(y.y, 0);
-  assertEq(z.z, 0);
-  assertEq(w.w, -1);
-
-  if (typeof reportCompare === "function")
-    reportCompare(true, true);
-}
-
-test();
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/load.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/load.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/load.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/load.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,154 @@
+// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
+
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Our float32array will have 16 elements
+const SIZE_ARRAY = 16;
+
+// 1 float32 == 4 bytes
+const SIZE_BYTES = SIZE_ARRAY * 4;
+
+function MakeComparator(kind, arr) {
+    var bpe = arr.BYTES_PER_ELEMENT;
+    var uint8 = (bpe != 1) ? new Uint8Array(arr.buffer) : arr;
+
+    // Size in bytes of a single element in the SIMD vector.
+    var sizeOfLaneElem;
+    // Typed array constructor corresponding to the SIMD kind.
+    var typedArrayCtor;
+    switch (kind) {
+      case 'int32x4':
+        sizeOfLaneElem = 4;
+        typedArrayCtor = Int32Array;
+        break;
+      case 'float32x4':
+        sizeOfLaneElem = 4;
+        typedArrayCtor = Float32Array;
+        break;
+      default:
+        assertEq(true, false, "unknown SIMD kind");
+    }
+
+    // Reads (numElemToRead * sizeOfLaneElem) bytes in arr, and reinterprets
+    // these bytes as a typed array equivalent to the typed SIMD vector.
+    var slice = function(start, numElemToRead) {
+        // Read enough bytes
+        var startBytes = start * bpe;
+        var endBytes = startBytes + numElemToRead * sizeOfLaneElem;
+        var asArray = Array.prototype.slice.call(uint8, startBytes, endBytes);
+
+        // If length is less than SIZE_BYTES bytes, fill with 0.
+        // This is needed for loadX, loadXY, loadXYZ which do only partial
+        // reads.
+        for (var i = asArray.length; i < SIZE_BYTES; i++) asArray[i] = 0;
+        assertEq(asArray.length, SIZE_BYTES);
+
+        return new typedArrayCtor(new Uint8Array(asArray).buffer);
+    }
+
+    return {
+        loadX: function(index) {
+            var v = SIMD[kind].loadX(arr, index);
+            assertEqX4(v, slice(index, 1));
+        },
+
+        loadXY: function(index) {
+            var v = SIMD[kind].loadXY(arr, index);
+            assertEqX4(v, slice(index, 2));
+        },
+
+        loadXYZ: function(index) {
+            var v = SIMD[kind].loadXYZ(arr, index);
+            assertEqX4(v, slice(index, 3));
+        },
+
+        load: function(index) {
+            var v = SIMD[kind].load(arr, index);
+            assertEqX4(v, slice(index, 4));
+        }
+    }
+}
+
+function testLoad(kind, TA) {
+    for (var i = SIZE_ARRAY; i--;)
+        TA[i] = i;
+
+    for (var ta of [
+                    new Uint8Array(TA.buffer),
+                    new Int8Array(TA.buffer),
+                    new Uint16Array(TA.buffer),
+                    new Int16Array(TA.buffer),
+                    new Uint32Array(TA.buffer),
+                    new Int32Array(TA.buffer),
+                    new Float32Array(TA.buffer),
+                    new Float64Array(TA.buffer)
+                   ])
+    {
+        // Invalid args
+        assertThrowsInstanceOf(() => SIMD[kind].load(), TypeError);
+        assertThrowsInstanceOf(() => SIMD[kind].load(ta), TypeError);
+        assertThrowsInstanceOf(() => SIMD[kind].load("hello", 0), TypeError);
+        assertThrowsInstanceOf(() => SIMD[kind].load(ta, -1), TypeError);
+
+        // Valid and invalid reads
+        var C = MakeComparator(kind, ta);
+        var bpe = ta.BYTES_PER_ELEMENT;
+
+        var lastValidArgLoadX   = (SIZE_BYTES - 4)  / bpe | 0;
+        var lastValidArgLoadXY  = (SIZE_BYTES - 8)  / bpe | 0;
+        var lastValidArgLoadXYZ = (SIZE_BYTES - 12) / bpe | 0;
+        var lastValidArgLoad    = (SIZE_BYTES - 16) / bpe | 0;
+
+        C.load(0);
+        C.load(1);
+        C.load(2);
+        C.load(3);
+        C.load(lastValidArgLoad);
+        assertThrowsInstanceOf(() => SIMD[kind].load(ta, lastValidArgLoad + 1), TypeError);
+
+        C.loadX(0);
+        C.loadX(1);
+        C.loadX(2);
+        C.loadX(3);
+        C.loadX(lastValidArgLoadX);
+        assertThrowsInstanceOf(() => SIMD[kind].loadX(ta, lastValidArgLoadX + 1), TypeError);
+
+        C.loadXY(0);
+        C.loadXY(1);
+        C.loadXY(2);
+        C.loadXY(3);
+        C.loadXY(lastValidArgLoadXY);
+        assertThrowsInstanceOf(() => SIMD[kind].loadXY(ta, lastValidArgLoadXY + 1), TypeError);
+
+        C.loadXYZ(0);
+        C.loadXYZ(1);
+        C.loadXYZ(2);
+        C.loadXYZ(3);
+        C.loadXYZ(lastValidArgLoadXYZ);
+        assertThrowsInstanceOf(() => SIMD[kind].loadXYZ(ta, lastValidArgLoadXYZ + 1), TypeError);
+    }
+
+    // Test ToInt32 behavior
+    var v = SIMD[kind].load(TA, 12.5);
+    assertEqX4(v, [12, 13, 14, 15]);
+
+    var obj = {
+        valueOf: function() { return 12 }
+    }
+    var v = SIMD[kind].load(TA, obj);
+    assertEqX4(v, [12, 13, 14, 15]);
+
+    var obj = {
+        valueOf: function() { throw new TypeError("i ain't a number"); }
+    }
+    assertThrowsInstanceOf(() => SIMD[kind].load(TA, obj), TypeError);
+}
+
+testLoad('float32x4', new Float32Array(SIZE_ARRAY));
+testLoad('int32x4', new Int32Array(SIZE_ARRAY));
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/shell.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/shell.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/shell.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/shell.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,30 @@
+function assertEqX4(v, arr) {
+    try {
+        assertEq(v.x, arr[0]);
+        assertEq(v.y, arr[1]);
+        assertEq(v.z, arr[2]);
+        assertEq(v.w, arr[3]);
+    } catch (e) {
+        print("stack trace:", e.stack);
+        throw e;
+    }
+}
+
+function simdToArray(v) {
+    return [v.x, v.y, v.z, v.w];
+}
+
+const INT32_MAX = Math.pow(2, 31) - 1;
+const INT32_MIN = -Math.pow(2, 31);
+assertEq(INT32_MAX + 1 | 0, INT32_MIN);
+
+function testBinaryFunc(v, w, simdFunc, func) {
+    var varr = simdToArray(v);
+    var warr = simdToArray(w);
+
+    var observed = simdToArray(simdFunc(v, w));
+    var expected = varr.map(function(v, i) { return func(varr[i], warr[i]); });
+
+    for (var i = 0; i < observed.length; i++)
+        assertEq(observed[i], expected[i]);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/store.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/store.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/store.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/store.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,85 @@
+// |reftest| skip-if(!this.hasOwnProperty("SIMD"))
+
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// As SIMD.*.store is entirely symmetric to SIMD.*.load, this file just
+// contains basic tests to store on one single TypedArray kind, while load is
+// exhaustively tested. See load.js for more details.
+
+const POISON = 42;
+
+function reset(ta) {
+    for (var i = 0; i < ta.length; i++)
+        ta[i] = POISON + i;
+}
+
+function assertChanged(ta, from, expected) {
+    var i = 0;
+    for (; i < from; i++)
+        assertEq(ta[i], POISON + i);
+    for (; i < from + expected.length; i++)
+        assertEq(ta[i], expected[i - from]);
+    for (; i < ta.length; i++)
+        assertEq(ta[i], POISON + i);
+}
+
+function testStore(ta, kind, i, v) {
+    reset(ta);
+    SIMD[kind].storeX(ta, i, v);
+    assertChanged(ta, i, [v.x]);
+
+    reset(ta);
+    SIMD[kind].storeXY(ta, i, v);
+    assertChanged(ta, i, [v.x, v.y]);
+
+    reset(ta);
+    SIMD[kind].storeXYZ(ta, i, v);
+    assertChanged(ta, i, [v.x, v.y, v.z]);
+
+    reset(ta);
+    SIMD[kind].store(ta, i, v);
+    assertChanged(ta, i, [v.x, v.y, v.z, v.w]);
+}
+
+function testStoreInt32x4() {
+    var I32 = new Int32Array(16);
+
+    var v = SIMD.int32x4(0, 1, Math.pow(2,31) - 1, -Math.pow(2, 31));
+    testStore(I32, 'int32x4', 0, v);
+    testStore(I32, 'int32x4', 1, v);
+    testStore(I32, 'int32x4', 2, v);
+    testStore(I32, 'int32x4', 12, v);
+
+    assertThrowsInstanceOf(() => SIMD.int32x4.store(I32), TypeError);
+    assertThrowsInstanceOf(() => SIMD.int32x4.store(I32, 0), TypeError);
+    assertThrowsInstanceOf(() => SIMD.float32x4.store(I32, 0, v), TypeError);
+}
+
+function testStoreFloat32x4() {
+    var F32 = new Float32Array(16);
+
+    var v = SIMD.float32x4(1,2,3,4);
+    testStore(F32, 'float32x4', 0, v);
+    testStore(F32, 'float32x4', 1, v);
+    testStore(F32, 'float32x4', 2, v);
+    testStore(F32, 'float32x4', 12, v);
+
+    var v = SIMD.float32x4(NaN, -0, -Infinity, 5e-324);
+    testStore(F32, 'float32x4', 0, v);
+    testStore(F32, 'float32x4', 1, v);
+    testStore(F32, 'float32x4', 2, v);
+    testStore(F32, 'float32x4', 12, v);
+
+    assertThrowsInstanceOf(() => SIMD.float32x4.store(F32), TypeError);
+    assertThrowsInstanceOf(() => SIMD.float32x4.store(F32, 0), TypeError);
+    assertThrowsInstanceOf(() => SIMD.int32x4.store(F32, 0, v), TypeError);
+}
+
+testStoreInt32x4();
+testStoreFloat32x4();
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/swizzle-shuffle.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/swizzle-shuffle.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_6/TypedObject/simd/swizzle-shuffle.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_6/TypedObject/simd/swizzle-shuffle.js	2014-11-26 21:45:59.000000000 +0000
@@ -8,17 +8,6 @@
 var float32x4 = SIMD.float32x4;
 var int32x4 = SIMD.int32x4;
 
-function assertEq4(v, arr) {
-    assertEq(v.x, arr[0]);
-    assertEq(v.y, arr[1]);
-    assertEq(v.z, arr[2]);
-    assertEq(v.w, arr[3]);
-}
-
-function simdToArray(v) {
-    return [v.x, v.y, v.z, v.w];
-}
-
 function swizzle(arr, x, y, z, w) {
     return [arr[x], arr[y], arr[z], arr[w]];
 }
@@ -38,7 +27,7 @@
     var x, y, z, w;
     for (var i = 0; i < Math.pow(4, 4); i++) {
         [x, y, z, w] = [i & 3, (i >> 2) & 3, (i >> 4) & 3, (i >> 6) & 3];
-        assertEq4(type.swizzle(v, x, y, z, w), swizzle(simdToArray(v), x, y, z, w));
+        assertEqX4(type.swizzle(v, x, y, z, w), swizzle(simdToArray(v), x, y, z, w));
     }
 
     // Test that the lane inputs are converted into an int32.
@@ -47,7 +36,7 @@
         x: 0,
         valueOf: function() { return this.x++ }
     };
-    assertEq4(type.swizzle(v, obj, obj, obj, obj), swizzle(simdToArray(v), 0, 1, 2, 3));
+    assertEqX4(type.swizzle(v, obj, obj, obj, obj), swizzle(simdToArray(v), 0, 1, 2, 3));
 
     // Object for which ToInt32 will fail.
     obj = {
@@ -100,8 +89,8 @@
     var x, y, z, w;
     for (var i = 0; i < Math.pow(8, 4); i++) {
         [x, y, z, w] = [i & 7, (i >> 3) & 7, (i >> 6) & 7, (i >> 9) & 7];
-        assertEq4(type.shuffle(lhs, rhs, x, y, z, w),
-                  shuffle(simdToArray(lhs), simdToArray(rhs), x, y, z, w));
+        assertEqX4(type.shuffle(lhs, rhs, x, y, z, w),
+                   shuffle(simdToArray(lhs), simdToArray(rhs), x, y, z, w));
     }
 
     // Test that the lane inputs are converted into an int32.
@@ -110,8 +99,8 @@
         x: 0,
         valueOf: function() { return this.x++ }
     };
-    assertEq4(type.shuffle(lhs, rhs, obj, obj, obj, obj),
-              shuffle(simdToArray(lhs),simdToArray(rhs), 0, 1, 2, 3));
+    assertEqX4(type.shuffle(lhs, rhs, obj, obj, obj, obj),
+               shuffle(simdToArray(lhs),simdToArray(rhs), 0, 1, 2, 3));
 
     // Object for which ToInt32 will fail.
     obj = {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_7/Array/includes.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_7/Array/includes.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_7/Array/includes.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_7/Array/includes.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var BUGNUMBER = 1069063;
+var summary = "Implement Array.prototype.includes";
+
+print(BUGNUMBER + ": " + summary);
+
+if ('includes' in []) {
+    assertEq(typeof [].includes, "function");
+    assertEq([].includes.length, 1);
+
+    assertTrue([1, 2, 3].includes(2));
+    assertTrue([1,,2].includes(2));
+    assertTrue([1, 2, 3].includes(2, 1));
+    assertTrue([1, 2, 3].includes(2, -2));
+    assertTrue([1, 2, 3].includes(2, -100));
+    assertTrue([Object, Function, Array].includes(Function));
+    assertTrue([-0].includes(0));
+    assertTrue([NaN].includes(NaN));
+    assertTrue([,].includes());
+    assertTrue(staticIncludes("123", "2"));
+    assertTrue(staticIncludes({length: 3, 1: 2}, 2));
+    assertTrue(staticIncludes({length: 3, 1: 2, get 3(){throw ""}}, 2));
+    assertTrue(staticIncludes({length: 3, get 1() {return 2}}, 2));
+    assertTrue(staticIncludes({__proto__: {1: 2}, length: 3}, 2));
+    assertTrue(staticIncludes(new Proxy([1], {get(){return 2}}), 2));
+
+    assertFalse([1, 2, 3].includes("2"));
+    assertFalse([1, 2, 3].includes(2, 2));
+    assertFalse([1, 2, 3].includes(2, -1));
+    assertFalse([undefined].includes(NaN));
+    assertFalse([{}].includes({}));
+    assertFalse(staticIncludes({length: 3, 1: 2}, 2, 2));
+    assertFalse(staticIncludes({length: 3, get 0(){delete this[1]}, 1: 2}, 2));
+    assertFalse(staticIncludes({length: -100, 0: 1}, 1));
+
+    assertThrowsInstanceOf(() => staticIncludes(), TypeError);
+    assertThrowsInstanceOf(() => staticIncludes(null), TypeError);
+    assertThrowsInstanceOf(() => staticIncludes({get length(){throw TypeError()}}), TypeError);
+    assertThrowsInstanceOf(() => staticIncludes({length: 3, get 1() {throw TypeError()}}, 2), TypeError);
+    assertThrowsInstanceOf(() => staticIncludes({__proto__: {get 1() {throw TypeError()}}, length: 3}, 2), TypeError);
+    assertThrowsInstanceOf(() => staticIncludes(new Proxy([1], {get(){throw TypeError()}})), TypeError);
+}
+
+function assertTrue(v) {
+    assertEq(v, true);
+}
+
+function assertFalse(v) {
+    assertEq(v, false);
+}
+
+function staticIncludes(o, v, f) {
+    return [].includes.call(o, v, f);
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_7/shell.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_7/shell.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/ecma_7/shell.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/ecma_7/shell.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,205 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+if (typeof assertThrowsInstanceOf === 'undefined') {
+    var assertThrowsInstanceOf = 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);
+    };
+}
+
+if (typeof assertThrowsValue === 'undefined') {
+    var assertThrowsValue = function assertThrowsValue(f, val, msg) {
+        var fullmsg;
+        try {
+            f();
+        } catch (exc) {
+            if ((exc === val) === (val === val) && (val !== 0 || 1 / exc === 1 / val))
+                return;
+            fullmsg = "Assertion failed: expected exception " + val + ", got " + exc;
+        }
+        if (fullmsg === undefined)
+            fullmsg = "Assertion failed: expected exception " + val + ", no exception thrown";
+        if (msg !== undefined)
+            fullmsg += " - " + msg;
+        throw new Error(fullmsg);
+    };
+}
+
+if (typeof assertDeepEq === 'undefined') {
+    var assertDeepEq = (function(){
+        var call = Function.prototype.call,
+            Array_isArray = Array.isArray,
+            Map_ = Map,
+            Error_ = Error,
+            Map_has = call.bind(Map.prototype.has),
+            Map_get = call.bind(Map.prototype.get),
+            Map_set = call.bind(Map.prototype.set),
+            Object_toString = call.bind(Object.prototype.toString),
+            Function_toString = call.bind(Function.prototype.toString),
+            Object_getPrototypeOf = Object.getPrototypeOf,
+            Object_hasOwnProperty = call.bind(Object.prototype.hasOwnProperty),
+            Object_getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor,
+            Object_isExtensible = Object.isExtensible,
+            Object_getOwnPropertyNames = Object.getOwnPropertyNames,
+            uneval_ = uneval;
+
+        // Return true iff ES6 Type(v) isn't Object.
+        // Note that `typeof document.all === "undefined"`.
+        function isPrimitive(v) {
+            return (v === null ||
+                    v === undefined ||
+                    typeof v === "boolean" ||
+                    typeof v === "number" ||
+                    typeof v === "string" ||
+                    typeof v === "symbol");
+        }
+
+        function assertSameValue(a, b, msg) {
+            try {
+                assertEq(a, b);
+            } catch (exc) {
+                throw Error_(exc.message + (msg ? " " + msg : ""));
+            }
+        }
+
+        function assertSameClass(a, b, msg) {
+            var ac = Object_toString(a), bc = Object_toString(b);
+            assertSameValue(ac, bc, msg);
+            switch (ac) {
+            case "[object Function]":
+                assertSameValue(Function_toString(a), Function_toString(b), msg);
+            }
+        }
+
+        function at(prevmsg, segment) {
+            return prevmsg ? prevmsg + segment : "at _" + segment;
+        }
+
+        // Assert that the arguments a and b are thoroughly structurally equivalent.
+        //
+        // For the sake of speed, we cut a corner:
+        //        var x = {}, y = {}, ax = [x];
+        //        assertDeepEq([ax, x], [ax, y]);  // passes (?!)
+        //
+        // Technically this should fail, since the two object graphs are different.
+        // (The graph of [ax, y] contains one more object than the graph of [ax, x].)
+        //
+        // To get technically correct behavior, pass {strictEquivalence: true}.
+        // This is slower because we have to walk the entire graph, and Object.prototype
+        // is big.
+        //
+        return function assertDeepEq(a, b, options) {
+            var strictEquivalence = options ? options.strictEquivalence : false;
+
+            function assertSameProto(a, b, msg) {
+                check(Object_getPrototypeOf(a), Object_getPrototypeOf(b), at(msg, ".__proto__"));
+            }
+
+            function failPropList(na, nb, msg) {
+                throw Error_("got own properties " + uneval_(na) + ", expected " + uneval_(nb) +
+                             (msg ? " " + msg : ""));
+            }
+
+            function assertSameProps(a, b, msg) {
+                var na = Object_getOwnPropertyNames(a),
+                    nb = Object_getOwnPropertyNames(b);
+                if (na.length !== nb.length)
+                    failPropList(na, nb, msg);
+
+                // Ignore differences in whether Array elements are stored densely.
+                if (Array_isArray(a)) {
+                    na.sort();
+                    nb.sort();
+                }
+
+                for (var i = 0; i < na.length; i++) {
+                    var name = na[i];
+                    if (name !== nb[i])
+                        failPropList(na, nb, msg);
+                    var da = Object_getOwnPropertyDescriptor(a, name),
+                        db = Object_getOwnPropertyDescriptor(b, name);
+                    var pmsg = at(msg, /^[_$A-Za-z0-9]+$/.test(name)
+                                       ? /0|[1-9][0-9]*/.test(name) ? "[" + name + "]" : "." + name
+                                       : "[" + uneval_(name) + "]");
+                    assertSameValue(da.configurable, db.configurable, at(pmsg, ".[[Configurable]]"));
+                    assertSameValue(da.enumerable, db.enumerable, at(pmsg, ".[[Enumerable]]"));
+                    if (Object_hasOwnProperty(da, "value")) {
+                        if (!Object_hasOwnProperty(db, "value"))
+                            throw Error_("got data property, expected accessor property" + pmsg);
+                        check(da.value, db.value, pmsg);
+                    } else {
+                        if (Object_hasOwnProperty(db, "value"))
+                            throw Error_("got accessor property, expected data property" + pmsg);
+                        check(da.get, db.get, at(pmsg, ".[[Get]]"));
+                        check(da.set, db.set, at(pmsg, ".[[Set]]"));
+                    }
+                }
+            };
+
+            var ab = Map_();
+            var bpath = Map_();
+
+            function check(a, b, path) {
+                if (typeof a === "symbol") {
+                    // Symbols are primitives, but they have identity.
+                    // Symbol("x") !== Symbol("x") but
+                    // assertDeepEq(Symbol("x"), Symbol("x")) should pass.
+                    if (typeof b !== "symbol") {
+                        throw Error_("got " + uneval_(a) + ", expected " + uneval_(b) + " " + path);
+                    } else if (uneval_(a) !== uneval_(b)) {
+                        // We lamely use uneval_ to distinguish well-known symbols
+                        // from user-created symbols. The standard doesn't offer
+                        // a convenient way to do it.
+                        throw Error_("got " + uneval_(a) + ", expected " + uneval_(b) + " " + path);
+                    } else if (Map_has(ab, a)) {
+                        assertSameValue(Map_get(ab, a), b, path);
+                    } else if (Map_has(bpath, b)) {
+                        var bPrevPath = Map_get(bpath, b) || "_";
+                        throw Error_("got distinct symbols " + at(path, "") + " and " +
+                                     at(bPrevPath, "") + ", expected the same symbol both places");
+                    } else {
+                        Map_set(ab, a, b);
+                        Map_set(bpath, b, path);
+                    }
+                } else if (isPrimitive(a)) {
+                    assertSameValue(a, b, path);
+                } else if (isPrimitive(b)) {
+                    throw Error_("got " + Object_toString(a) + ", expected " + uneval_(b) + " " + path);
+                } else if (Map_has(ab, a)) {
+                    assertSameValue(Map_get(ab, a), b, path);
+                } else if (Map_has(bpath, b)) {
+                    var bPrevPath = Map_get(bpath, b) || "_";
+                    throw Error_("got distinct objects " + at(path, "") + " and " + at(bPrevPath, "") +
+                                 ", expected the same object both places");
+                } else {
+                    Map_set(ab, a, b);
+                    Map_set(bpath, b, path);
+                    if (a !== b || strictEquivalence) {
+                        assertSameClass(a, b, path);
+                        assertSameProto(a, b, path);
+                        assertSameProps(a, b, path);
+                        assertSameValue(Object_isExtensible(a),
+                                        Object_isExtensible(b),
+                                        at(path, ".[[Extensible]]"));
+                    }
+                }
+            }
+
+            check(a, b, "");
+        };
+    })();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_5/extensions/regress-452565.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_5/extensions/regress-452565.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_5/extensions/regress-452565.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_5/extensions/regress-452565.js	2014-11-26 21:46:00.000000000 +0000
@@ -14,7 +14,7 @@
 
 jit(true);
 
-const c = undefined; (function() { for (var j=0;j<5;++j) { c = 1; } })();
+var c = undefined; (function() { for (var j=0;j<5;++j) { c = 1; } })();
 
 jit(false);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_5/Regress/regress-383674.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_5/Regress/regress-383674.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_5/Regress/regress-383674.js	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_5/Regress/regress-383674.js	2014-11-26 21:46:00.000000000 +0000
@@ -19,7 +19,7 @@
   enterFunc ('test');
   printBugNumber(BUGNUMBER);
   printStatus (summary);
-    
+
   options("strict");
   options("werror");
 
@@ -27,11 +27,11 @@
   actual = 'toString not called';
   try
   {
-    var x = {toString: function() { 
-        actual = 'toString called'; 
-        print(actual); 
-      } 
-    }; 
+    var x = {toString: function() {
+        actual = 'toString called';
+        print(actual);
+      }
+    };
     var f = function() { var j = x; j + ""; }
     f();
     reportCompare(expect, actual, summary + ': 1');
@@ -44,7 +44,7 @@
   actual = 'toString not called';
   try
   {
-    (function() { const a = 
+    (function() { var a =
          ({toString: function(){
              actual = 'toString called'; print(actual)} }); a += ""; })();
     reportCompare(expect, actual, summary + ': 2');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_6/extensions/regress-465443.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_6/extensions/regress-465443.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_6/extensions/regress-465443.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_6/extensions/regress-465443.js	2014-11-26 21:46:00.000000000 +0000
@@ -19,8 +19,8 @@
   enterFunc ('test');
   printBugNumber(BUGNUMBER);
   printStatus (summary);
- 
-  expect = 'SyntaxError: invalid for/in left-hand side';
+
+  expect = 'SyntaxError: invalid assignment to const b';
 
   jit(true);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_7/extensions/regress-470176.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_7/extensions/regress-470176.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_7/extensions/regress-470176.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_7/extensions/regress-470176.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 470176;
-var summary = 'let-fun should not be able to modify constants';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
- 
-  const e = 8; 
-
-  expect = e;
-
-  jit (true);
-
-  let (f = function() { for (var h=0;h<6;++h) ++e; }) { f(); }
-
-  actual = e;
-
-  jit(false);
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/extensions/regress-437288-01.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/extensions/regress-437288-01.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/extensions/regress-437288-01.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/extensions/regress-437288-01.js	2014-11-26 21:46:00.000000000 +0000
@@ -20,7 +20,7 @@
   printBugNumber(BUGNUMBER);
   printStatus (summary);
 
-  expect = 'SyntaxError: invalid for/in left-hand side';
+  expect = 'SyntaxError: invalid assignment to const x';
   try
   {
     eval('(function() { const x = 1; for (x in null); })();');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-039.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-039.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-039.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-039.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 452498;
-var summary = 'TM: upvar2 regression tests';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  expect = '10';
-
-// ------- Comment #39 From Jesse Ruderman
-
-  const e = 0;
-  print(actual = ++e);
-
-  actual = String(actual) + e;
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-074.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-074.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-074.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-074.js	2014-11-26 21:46:00.000000000 +0000
@@ -24,7 +24,7 @@
 
 // ------- Comment #74 From Jesse Ruderman
 
-  const [d] = [1]; [d] = [2]; print(actual = d);
+  const [d] = [1]; print(actual = d);
 
   actual = String(actual);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-077.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-077.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-077.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-077.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 452498;
-var summary = 'TM: upvar2 regression tests';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  expect = '1';
-
-// ------- Comment #77 From Brendan Eich
-
-  (function () { const [d] = [1]; [d] = [2]; print(actual = d);})();
-
-  actual = String(actual);
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-110.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-110.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-110.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-110.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 452498;
-var summary = 'TM: upvar2 regression tests';
-var actual = '';
-var expect = '';
-
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-// ------- Comment #110 From Brendan Eich
-
-// (In reply to comment #107)
-
-  function f(a) { const b = a; print(++b); return b; }
-
-  expect = 'function f(a) { const b = a; print(++b); return b; }';
-  actual = f + '';
-  compareSource(expect, actual, 'function f(a) { const b = a; print(++b); return b; }');
-
-  expect = '01';
-  actual = 0;
-
-  function g(a) { const b = a; print(actual = ++b); return b; }
-  actual = String(actual) + g(1);
-  reportCompare(expect, actual, 'function g(a) { const b = a; print(actual = ++b); return b; }');
-
-  expect = '21';
-  actual = 0;
-
-  const x = 1; print(actual = ++x);
-  actual = String(actual) + x;
-
-  reportCompare(expect, actual, 'const x = 1; print(actual = ++x); ');
-
-  exitFunc ('test');
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-184.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-184.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-184.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-184.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 452498;
-var summary = 'TM: upvar2 regression tests';
-var actual = '';
-var expect = '';
-
-//-------  Comment #184  From  Jesse Ruderman
-
-//-----------------------------------------------------------------------------
-test();
-//-----------------------------------------------------------------------------
-
-function test()
-{
-  enterFunc ('test');
-  printBugNumber(BUGNUMBER);
-  printStatus (summary);
-
-  expect = '11';
-
-  const e = 8; print(actual = '' + ((e += 3)));
-
-  reportCompare(expect, actual, summary);
-
-  exitFunc ('test');
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-187.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-187.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_1/regress/regress-452498-187.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_1/regress/regress-452498-187.js	2014-11-26 21:46:00.000000000 +0000
@@ -21,7 +21,7 @@
   printBugNumber(BUGNUMBER);
   printStatus (summary);
 
-  expect = 'SyntaxError: invalid for/in left-hand side';
+  expect = 'SyntaxError: invalid assignment to const x';
   try
   {
     eval('const x = undefined; for (x in []);');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_5/extensions/compound-assign-const.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_5/extensions/compound-assign-const.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_5/extensions/compound-assign-const.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_5/extensions/compound-assign-const.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-// Any copyright is dedicated to the Public Domain.
-// http://creativecommons.org/licenses/publicdomain/
-
-//-----------------------------------------------------------------------------
-var BUGNUMBER = 730810;
-var summary = "Don't assert on compound assignment to a const";
-
-print(BUGNUMBER + ": " + summary);
-
-/**************
- * BEGIN TEST *
- **************/
-
-const x = 3;
-x += 2;
-assertEq(x, 3);
-
-/******************************************************************************/
-
-if (typeof reportCompare === "function")
-  reportCompare(true, true);
-
-print("Tests complete!");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_5/extensions/typedarray-set-neutering.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_5/extensions/typedarray-set-neutering.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_5/extensions/typedarray-set-neutering.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_5/extensions/typedarray-set-neutering.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,77 @@
+// |reftest| skip-if(!xulRuntime.shell)
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 983344;
+var summary =
+  "Uint8Array.prototype.set issues when this array changes during setting";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+var ab1 = new ArrayBuffer(200);
+var a1 = new Uint8Array(ab1);
+var a1_2 = new Uint8Array(10);
+
+var src1 = [ 10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             ];
+Object.defineProperty(src1, 4, {
+  get: function () {
+    neuter(ab1, "change-data");
+    gc();
+    return 200;
+  }
+});
+
+a1.set(src1);
+
+// Not really needed
+Array.reverse(a1_2);
+
+var ab2 = new ArrayBuffer(200);
+var a2 = new Uint8Array(ab2);
+var a2_2 = new Uint8Array(10);
+
+var src2 = [ 10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             10, 20, 30, 40,
+             ];
+Object.defineProperty(src2, 4, {
+  get: function () {
+    neuter(ab2, "same-data");
+    gc();
+    return 200;
+  }
+});
+
+a2.set(src2);
+
+// Not really needed
+Array.reverse(a2_2);
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_5/regress/regress-383902.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_5/regress/regress-383902.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/js1_8_5/regress/regress-383902.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/js1_8_5/regress/regress-383902.js	2014-11-26 21:46:00.000000000 +0000
@@ -26,7 +26,7 @@
   eval('"use strict"; function g(x) { const y = x; y = 1 + x; } c = 3');
   assertEq(0, 1);
 } catch (e) {
-  assertEq(e.name, 'TypeError');
+  assertEq(e.name, 'SyntaxError');
   assertEq(2, c);
 }
 
@@ -35,7 +35,7 @@
   eval('"use strict"; const z = w; z = 1 + w; c = 5');
   assertEq(0, 1);
 } catch (e) {
-  assertEq(e.name, 'TypeError');
+  assertEq(e.name, 'SyntaxError');
   assertEq(4, c);
   assertEq('z' in this, false);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/jstests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/jstests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/jstests.py	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/jstests.py	2014-11-26 21:46:01.000000000 +0000
@@ -121,6 +121,8 @@
                          help="Print each test's output to the file given by --output-file.")
     output_og.add_option('-F', '--failed-only', action='store_true',
                          help="If a --show-* option is given, only print output for failed tests.")
+    output_og.add_option('--no-show-failed', action='store_true',
+                         help="Don't print output for failed tests (no-op with --show-output).")
     output_og.add_option('-O', '--output-file',
                          help='Write all output to the given file (default: stdout).')
     output_og.add_option('--failure-file',
@@ -200,8 +202,6 @@
         except IOError as ex:
             raise SystemExit("Failed to open output file: " + str(ex))
 
-    options.show = options.show_cmd or options.show_output
-
     # Hide the progress bar if it will get in the way of other output.
     options.hide_progress = (options.tinderbox or
                              not ProgressBar.conservative_isatty() or
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/lib/jittests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/lib/jittests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/lib/jittests.py	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/lib/jittests.py	2014-11-26 21:46:01.000000000 +0000
@@ -599,21 +599,15 @@
                 traceback.print_exc()
                 sys.stderr.write('---\n')
 
-        def show_test(res):
-            if options.show_failed:
-                print('    ' + subprocess.list2cmdline(res.cmd))
-            else:
-                print('    ' + ' '.join(res.test.jitflags + [res.test.path]))
-
         print('FAILURES:')
         for res in failures:
             if not res.timed_out:
-                show_test(res)
+                print('    ' + ' '.join(res.test.jitflags + [res.test.path]))
 
         print('TIMEOUTS:')
         for res in failures:
             if res.timed_out:
-                show_test(res)
+                print('    ' + ' '.join(res.test.jitflags + [res.test.path]))
     else:
         print('PASSED ALL' + ('' if complete else ' (partial run -- interrupted by user %s)' % doing))
 
@@ -648,14 +642,23 @@
 
     try:
         for i, res in enumerate(results):
-            if options.show_output:
+            ok = check_output(res.out, res.err, res.rc, res.timed_out, res.test, options)
+
+            if ok:
+                show_output = options.show_output and not options.failed_only
+            else:
+                show_output = options.show_output or not options.no_show_failed
+
+            if show_output:
+                pb.beginline()
                 sys.stdout.write(res.out)
                 sys.stdout.write(res.err)
                 sys.stdout.write('Exit code: %s\n' % res.rc)
-            if res.test.valgrind:
+
+            if res.test.valgrind and not show_output:
+                pb.beginline()
                 sys.stdout.write(res.err)
 
-            ok = check_output(res.out, res.err, res.rc, res.timed_out, res.test, options)
             doing = 'after %s' % res.test.relpath_tests
             if not ok:
                 failures.append(res)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/lib/results.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/lib/results.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/lib/results.py	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/lib/results.py	2014-11-26 21:46:01.000000000 +0000
@@ -129,20 +129,28 @@
                 dev_label = 'TIMEOUTS'
             self.groups.setdefault(dev_label, []).append(result.test.path)
 
-            show = self.options.show
-            if self.options.failed_only and dev_label not in ('REGRESSIONS', 'TIMEOUTS'):
-                show = False
-            if show:
+            if dev_label == 'REGRESSIONS':
+                show_output = self.options.show_output or not self.options.no_show_failed
+            elif dev_label == 'TIMEOUTS':
+                show_output = self.options.show_output
+            else:
+                show_output = self.options.show_output and not self.options.failed_only
+
+            if dev_label in ('REGRESSIONS', 'TIMEOUTS'):
+                show_cmd = self.options.show_cmd
+            else:
+                show_cmd = self.options.show_cmd and not self.options.failed_only
+
+            if show_output or show_cmd:
                 self.pb.beginline()
 
-            if show:
-                if self.options.show_output:
+                if show_output:
                     print('## %s: rc = %d, run time = %f' % (output.test.path, output.rc, output.dt), file=self.fp)
 
-                if self.options.show_cmd:
+                if show_cmd:
                     print(escape_cmdline(output.cmd), file=self.fp)
 
-                if self.options.show_output:
+                if show_output:
                     self.fp.write(output.out)
                     self.fp.write(output.err)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/Makefile.in	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/Makefile.in	2014-11-26 21:45:58.000000000 +0000
@@ -18,6 +18,7 @@
   ecma_3_1/ \
   ecma_5/ \
   ecma_6/ \
+  ecma_7/ \
   Intl/ \
   js1_1/ \
   js1_2/ \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/shell/os.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/shell/os.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/shell/os.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/shell/os.js	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,39 @@
+// |reftest| skip-if(!xulRuntime.shell||xulRuntime.OS=="WINNT")
+/* -*- 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/
+ */
+
+var pid = os.getpid();
+assertEq(pid > 0, true);
+
+var PATH = os.getenv("PATH");
+assertEq(PATH.indexOf("bin") > 0, true);
+assertEq(os.getenv("SQUAMMISH_HILLBILLY_GOAT_SQUEEZERS"), undefined);
+
+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");
+assertEq(kidpid > 0, true, "spawning sleep");
+var info = os.waitpid(kidpid, true);
+assertEq(info.hasOwnProperty("pid"), false);
+assertEq(info.hasOwnProperty("exitStatus"), false);
+
+os.kill(kidpid);
+
+info = os.waitpid(kidpid);
+assertEq(info.hasOwnProperty("pid"), true, "waiting on dead process should return pid");
+assertEq(info.pid, kidpid);
+assertEq(info.hasOwnProperty("exitStatus"), false, "killed process should not have exitStatus");
+
+kidpid = os.spawn("false");
+assertEq(kidpid > 0, true, "spawning /bin/false");
+info = os.waitpid(kidpid);
+assertEq(info.hasOwnProperty("pid"), true, "waiting on dead process should return pid");
+assertEq(info.pid, kidpid);
+assertEq(info.hasOwnProperty("exitStatus"), true, "process should have exitStatus");
+assertEq(info.exitStatus, 1, "/bin/false should exit 1");
+
+reportCompare(true, true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/shell/README thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/shell/README
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/tests/shell/README	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/tests/shell/README	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1 @@
+Tests for JS shell-only functions
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ArrayBufferObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ArrayBufferObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ArrayBufferObject.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ArrayBufferObject.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -1187,13 +1187,36 @@
     HeapSlot &bufSlot = obj->getReservedSlotRef(TypedArrayLayout::BUFFER_SLOT);
     MarkSlot(trc, &bufSlot, "typedarray.buffer");
 
-    // Update obj's data pointer if the array buffer moved. Note that during
-    // initialization, bufSlot may still contain |undefined|.
+    // Update obj's data pointer if it moved.
     if (bufSlot.isObject()) {
         ArrayBufferObject &buf = AsArrayBuffer(MaybeForwarded(&bufSlot.toObject()));
         int32_t offset = obj->getReservedSlot(TypedArrayLayout::BYTEOFFSET_SLOT).toInt32();
         MOZ_ASSERT(buf.dataPointer() != nullptr);
-        obj->initPrivate(buf.dataPointer() + offset);
+
+        if (buf.forInlineTypedObject()) {
+            // The data is inline with an InlineTypedObject associated with the
+            // buffer. Get a new address for the typed object if it moved.
+            JSObject *view = buf.firstView();
+
+            // Mark the object to move it into the tenured space.
+            MarkObjectUnbarriered(trc, &view, "typed array nursery owner");
+            MOZ_ASSERT(view->is<InlineTypedObject>() && view != obj);
+
+            void *srcData = obj->getPrivate();
+            void *dstData = view->as<InlineTypedObject>().inlineTypedMem() + offset;
+            obj->setPrivate(dstData);
+
+            // We can't use a direct forwarding pointer here, as there might
+            // not be enough bytes available, and other views might have data
+            // pointers whose forwarding pointers would overlap this one.
+            trc->runtime()->gc.nursery.maybeSetForwardingPointer(trc, srcData, dstData,
+                                                                 /* direct = */ false);
+        } else {
+            // The data may or may not be inline with the buffer. The buffer
+            // can only move during a compacting GC, in which case its
+            // objectMoved hook has already updated the buffer's data pointer.
+           obj->initPrivate(buf.dataPointer() + offset);
+        }
     }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ArrayBufferObject.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ArrayBufferObject.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ArrayBufferObject.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ArrayBufferObject.h	2014-11-26 21:46:03.000000000 +0000
@@ -56,6 +56,22 @@
 // As ArrayBufferObject and SharedArrayBufferObject are separated, so are the
 // TypedArray hierarchies below the two.  However, the TypedArrays have the
 // same layout (see TypedArrayObject.h), so there is little code duplication.
+//
+// The possible data ownership and reference relationships with array buffers
+// and related classes are enumerated below. These are the possible locations
+// for typed data:
+//
+// (1) malloc'ed or mmap'ed data owned by an ArrayBufferObject.
+// (2) Data allocated inline with an ArrayBufferObject.
+// (3) Data allocated inline with a TypedArrayObject.
+// (4) Data allocated inline with an InlineTypedObject.
+//
+// An ArrayBufferObject may point to any of these sources of data, except (3).
+// All array buffer views may point to any of these sources of data, except
+// that (3) may only be pointed to by the typed array the data is inline with.
+//
+// During a minor GC, (3) and (4) may move. During a compacting GC, (2), (3),
+// and (4) may move.
 
 class ArrayBufferObjectMaybeShared;
 
@@ -329,6 +345,8 @@
         setFlags(flags() | TYPED_OBJECT_VIEWS);
     }
 
+    bool forInlineTypedObject() const { return flags() & FOR_INLINE_TYPED_OBJECT; }
+
   protected:
     void setDataPointer(BufferContents contents, OwnsState ownsState);
     void setByteLength(size_t length);
@@ -341,7 +359,6 @@
         setFlags(owns ? (flags() | OWNS_DATA) : (flags() & ~OWNS_DATA));
     }
 
-    bool forInlineTypedObject() const { return flags() & FOR_INLINE_TYPED_OBJECT; }
     bool hasTypedObjectViews() const { return flags() & TYPED_OBJECT_VIEWS; }
 
     void setIsAsmJSMalloced() { setFlags((flags() & ~KIND_MASK) | ASMJS_MALLOCED); }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Debugger.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Debugger.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Debugger.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Debugger.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -11,14 +11,15 @@
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jshashutil.h"
+#include "jsinfer.h"
 #include "jsnum.h"
 #include "jsobj.h"
 #include "jswrapper.h"
 
 #include "frontend/BytecodeCompiler.h"
 #include "gc/Marking.h"
+#include "jit/BaselineDebugModeOSR.h"
 #include "jit/BaselineJIT.h"
-#include "js/Debug.h"
 #include "js/GCAPI.h"
 #include "js/UbiNodeTraverse.h"
 #include "js/Vector.h"
@@ -28,6 +29,7 @@
 #include "vm/WrapperObject.h"
 
 #include "jsgcinlines.h"
+#include "jsinferinlines.h"
 #include "jsobjinlines.h"
 #include "jsopcodeinlines.h"
 #include "jsscriptinlines.h"
@@ -40,6 +42,7 @@
 using JS::dbg::Builder;
 using js::frontend::IsIdentifier;
 using mozilla::ArrayLength;
+using mozilla::DebugOnly;
 using mozilla::Maybe;
 
 
@@ -239,6 +242,7 @@
     }
 };
 
+
 /*** Breakpoints *********************************************************************************/
 
 BreakpointSite::BreakpointSite(JSScript *script, jsbytecode *pc)
@@ -341,6 +345,7 @@
     return (link == &site->breakpoints) ? nullptr : fromSiteLinks(link);
 }
 
+
 /*** Debugger hook dispatch **********************************************************************/
 
 Debugger::Debugger(JSContext *cx, NativeObject *dbg)
@@ -455,11 +460,27 @@
             js_ReportOutOfMemory(cx);
             return false;
         }
+
+        if (!ensureExecutionObservabilityOfFrame(cx, frame))
+            return false;
     }
     vp.setObject(*p->value());
     return true;
 }
 
+/* static */ bool
+Debugger::hasLiveHook(GlobalObject *global, Hook which)
+{
+    if (GlobalObject::DebuggerVector *debuggers = global->getDebuggers()) {
+        for (Debugger **p = debuggers->begin(); p != debuggers->end(); p++) {
+            Debugger *dbg = *p;
+            if (dbg->enabled && dbg->getHook(which))
+                return true;
+        }
+    }
+    return false;
+}
+
 JSObject *
 Debugger::getHook(Hook hook) const
 {
@@ -574,51 +595,57 @@
     RootedValue value(cx);
     Debugger::resultToCompletion(cx, frameOk, frame.returnValue(), &status, &value);
 
-    /* Build a list of the recipients. */
-    AutoObjectVector frames(cx);
-    for (FrameRange r(frame, global); !r.empty(); r.popFront()) {
-        if (!frames.append(r.frontFrame())) {
-            cx->clearPendingException();
-            return false;
+    // This path can be hit via unwinding the stack due to
+    // over-recursion. Only fire the frames' onPop handlers if we haven't
+    // over-recursed, because invoking more JS will only result in more
+    // over-recursion errors. See slowPathOnExceptionUnwind.
+    if (!cx->isThrowingOverRecursed()) {
+        /* Build a list of the recipients. */
+        AutoObjectVector frames(cx);
+        for (FrameRange r(frame, global); !r.empty(); r.popFront()) {
+            if (!frames.append(r.frontFrame())) {
+                cx->clearPendingException();
+                return false;
+            }
         }
-    }
 
-    /* For each Debugger.Frame, fire its onPop handler, if any. */
-    for (JSObject **p = frames.begin(); p != frames.end(); p++) {
-        RootedNativeObject frameobj(cx, &(*p)->as<NativeObject>());
-        Debugger *dbg = Debugger::fromChildJSObject(frameobj);
-
-        if (dbg->enabled &&
-            !frameobj->getReservedSlot(JSSLOT_DEBUGFRAME_ONPOP_HANDLER).isUndefined()) {
-            RootedValue handler(cx, frameobj->getReservedSlot(JSSLOT_DEBUGFRAME_ONPOP_HANDLER));
-
-            Maybe<AutoCompartment> ac;
-            ac.emplace(cx, dbg->object);
-
-            RootedValue completion(cx);
-            if (!dbg->newCompletionValue(cx, status, value, &completion)) {
-                status = dbg->handleUncaughtException(ac, false);
-                break;
-            }
+        /* For each Debugger.Frame, fire its onPop handler, if any. */
+        for (JSObject **p = frames.begin(); p != frames.end(); p++) {
+            RootedNativeObject frameobj(cx, &(*p)->as<NativeObject>());
+            Debugger *dbg = Debugger::fromChildJSObject(frameobj);
+
+            if (dbg->enabled &&
+                !frameobj->getReservedSlot(JSSLOT_DEBUGFRAME_ONPOP_HANDLER).isUndefined()) {
+                RootedValue handler(cx, frameobj->getReservedSlot(JSSLOT_DEBUGFRAME_ONPOP_HANDLER));
+
+                Maybe<AutoCompartment> ac;
+                ac.emplace(cx, dbg->object);
+
+                RootedValue completion(cx);
+                if (!dbg->newCompletionValue(cx, status, value, &completion)) {
+                    status = dbg->handleUncaughtException(ac, false);
+                    break;
+                }
 
-            /* Call the onPop handler. */
-            RootedValue rval(cx);
-            bool hookOk = Invoke(cx, ObjectValue(*frameobj), handler, 1, completion.address(),
-                                 &rval);
-            RootedValue nextValue(cx);
-            JSTrapStatus nextStatus = dbg->parseResumptionValue(ac, hookOk, rval, &nextValue);
+                /* Call the onPop handler. */
+                RootedValue rval(cx);
+                bool hookOk = Invoke(cx, ObjectValue(*frameobj), handler, 1, completion.address(),
+                                     &rval);
+                RootedValue nextValue(cx);
+                JSTrapStatus nextStatus = dbg->parseResumptionValue(ac, hookOk, rval, &nextValue);
 
-            /*
-             * At this point, we are back in the debuggee compartment, and any error has
-             * been wrapped up as a completion value.
-             */
-            MOZ_ASSERT(cx->compartment() == global->compartment());
-            MOZ_ASSERT(!cx->isExceptionPending());
+                /*
+                 * At this point, we are back in the debuggee compartment, and any error has
+                 * been wrapped up as a completion value.
+                 */
+                MOZ_ASSERT(cx->compartment() == global->compartment());
+                MOZ_ASSERT(!cx->isExceptionPending());
 
-            /* JSTRAP_CONTINUE means "make no change". */
-            if (nextStatus != JSTRAP_CONTINUE) {
-                status = nextStatus;
-                value = nextValue;
+                /* JSTRAP_CONTINUE means "make no change". */
+                if (nextStatus != JSTRAP_CONTINUE) {
+                    status = nextStatus;
+                    value = nextValue;
+                }
             }
         }
     }
@@ -668,11 +695,42 @@
     }
 }
 
-JSTrapStatus
+/* static */ JSTrapStatus
+Debugger::slowPathOnDebuggerStatement(JSContext *cx, AbstractFramePtr frame)
+{
+    RootedValue rval(cx);
+    JSTrapStatus status = dispatchHook(cx, &rval, OnDebuggerStatement, NullPtr());
+
+    switch (status) {
+      case JSTRAP_CONTINUE:
+      case JSTRAP_ERROR:
+        break;
+
+      case JSTRAP_RETURN:
+        frame.setReturnValue(rval);
+        break;
+
+      case JSTRAP_THROW:
+        cx->setPendingException(rval);
+        break;
+
+      default:
+        MOZ_CRASH("Invalid onDebuggerStatement trap status");
+    }
+
+    return status;
+}
+
+/* static */ JSTrapStatus
 Debugger::slowPathOnExceptionUnwind(JSContext *cx, AbstractFramePtr frame)
 {
+    // Invoking more JS on an over-recursed stack is only going to result in
+    // more over-recursion errors.
+    if (cx->isThrowingOverRecursed())
+        return JSTRAP_CONTINUE;
+
     RootedValue rval(cx);
-    JSTrapStatus status = dispatchHook(cx, &rval, OnExceptionUnwind);
+    JSTrapStatus status = dispatchHook(cx, &rval, OnExceptionUnwind, NullPtr());
 
     switch (status) {
       case JSTRAP_CONTINUE:
@@ -692,7 +750,7 @@
         break;
 
       default:
-        MOZ_CRASH("Invalid trap status");
+        MOZ_CRASH("Invalid onExceptionUnwind trap status");
     }
 
     return status;
@@ -1095,7 +1153,6 @@
     ac.emplace(cx, object);
 
     ScriptFrameIter iter(cx);
-
     RootedValue scriptFrame(cx);
     if (!getScriptFrame(cx, iter, &scriptFrame))
         return handleUncaughtException(ac, false);
@@ -1178,9 +1235,12 @@
 }
 
 /* static */ JSTrapStatus
-Debugger::dispatchHook(JSContext *cx, MutableHandleValue vp, Hook which)
+Debugger::dispatchHook(JSContext *cx, MutableHandleValue vp, Hook which, HandleObject payload)
 {
-    MOZ_ASSERT(which == OnDebuggerStatement || which == OnExceptionUnwind);
+    MOZ_ASSERT(which == OnDebuggerStatement ||
+               which == OnExceptionUnwind ||
+               which == OnNewPromise ||
+               which == OnPromiseSettled);
 
     /*
      * Determine which debuggers will receive this event, and in what order.
@@ -1209,9 +1269,22 @@
     for (Value *p = triggered.begin(); p != triggered.end(); p++) {
         Debugger *dbg = Debugger::fromJSObject(&p->toObject());
         if (dbg->debuggees.has(global) && dbg->enabled && dbg->getHook(which)) {
-            JSTrapStatus st = (which == OnDebuggerStatement)
-                              ? dbg->fireDebuggerStatement(cx, vp)
-                              : dbg->fireExceptionUnwind(cx, vp);
+            JSTrapStatus st;
+            switch (which) {
+              case OnDebuggerStatement:
+                st = dbg->fireDebuggerStatement(cx, vp);
+                break;
+              case OnExceptionUnwind:
+                st = dbg->fireExceptionUnwind(cx, vp);
+                break;
+              case OnNewPromise:
+              case OnPromiseSettled:
+                st = dbg->firePromiseHook(cx, which, payload, vp);
+                break;
+              default:
+                MOZ_ASSERT_UNREACHABLE("Unexpected debugger hook");
+                st = JSTRAP_CONTINUE;
+            }
             if (st != JSTRAP_CONTINUE)
                 return st;
         }
@@ -1278,10 +1351,9 @@
 /* static */ JSTrapStatus
 Debugger::onTrap(JSContext *cx, MutableHandleValue vp)
 {
-    MOZ_ASSERT(cx->compartment()->debugMode());
-
     ScriptFrameIter iter(cx);
     RootedScript script(cx, iter.script());
+    MOZ_ASSERT(script->isDebuggee());
     Rooted<GlobalObject*> scriptGlobal(cx, &script->global());
     jsbytecode *pc = iter.pc();
     BreakpointSite *site = script->getBreakpointSite(pc);
@@ -1568,6 +1640,434 @@
     allocationsLogLength = 0;
 }
 
+JSTrapStatus
+Debugger::firePromiseHook(JSContext *cx, Hook hook, HandleObject promise, MutableHandleValue vp)
+{
+    MOZ_ASSERT(hook == OnNewPromise || hook == OnPromiseSettled);
+
+    RootedObject hookObj(cx, getHook(hook));
+    MOZ_ASSERT(hookObj);
+    MOZ_ASSERT(hookObj->isCallable());
+
+    Maybe<AutoCompartment> ac;
+    ac.emplace(cx, object);
+
+    RootedValue dbgObj(cx, ObjectValue(*promise));
+    if (!wrapDebuggeeValue(cx, &dbgObj))
+        return handleUncaughtException(ac, false);
+
+    // Like onNewGlobalObject, the Promise hooks are infallible and the comments
+    // in |Debugger::fireNewGlobalObject| apply here as well.
+
+    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,
+                             JSMSG_DEBUG_RESUMPTION_VALUE_DISALLOWED);
+        ok = false;
+    }
+
+    JSTrapStatus status = ok ? JSTRAP_CONTINUE
+                             : handleUncaughtException(ac, vp, true);
+    MOZ_ASSERT(!cx->isExceptionPending());
+    return status;
+}
+
+/* static */ void
+Debugger::slowPathPromiseHook(JSContext *cx, Hook hook, HandleObject promise)
+{
+    MOZ_ASSERT(hook == OnNewPromise || hook == OnPromiseSettled);
+    RootedValue rval(cx);
+    DebugOnly<JSTrapStatus> status = dispatchHook(cx, &rval, hook, promise);
+    MOZ_ASSERT(status == JSTRAP_CONTINUE);
+    MOZ_ASSERT(!cx->isExceptionPending());
+}
+
+
+/*** Debugger code invalidation for observing execution ******************************************/
+
+class MOZ_STACK_CLASS ExecutionObservableCompartments : public Debugger::ExecutionObservableSet
+{
+    HashSet<JSCompartment *> compartments_;
+    HashSet<Zone *> zones_;
+
+  public:
+    explicit ExecutionObservableCompartments(JSContext *cx
+                                             MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+      : compartments_(cx),
+        zones_(cx)
+    {
+        MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+    }
+
+    bool init() { return compartments_.init() && zones_.init(); }
+    bool add(JSCompartment *comp) { return compartments_.put(comp) && zones_.put(comp->zone()); }
+
+    const HashSet<Zone *> *zones() const { return &zones_; }
+    bool shouldRecompileOrInvalidate(JSScript *script) const {
+        return script->hasBaselineScript() && compartments_.has(script->compartment());
+    }
+    bool shouldMarkAsDebuggee(ScriptFrameIter &iter) const {
+        // AbstractFramePtr can't refer to non-remateralized Ion frames, so if
+        // iter refers to one such, we know we don't match.
+        return iter.hasUsableAbstractFramePtr() && compartments_.has(iter.compartment());
+    }
+
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+};
+
+// Given a particular AbstractFramePtr F that has become observable, this
+// represents the stack frames that need to be bailed out or marked as
+// debuggees, and the scripts that need to be recompiled, taking inlining into
+// account.
+class MOZ_STACK_CLASS ExecutionObservableFrame : public Debugger::ExecutionObservableSet
+{
+    AbstractFramePtr frame_;
+
+  public:
+    explicit ExecutionObservableFrame(AbstractFramePtr frame
+                                      MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+      : frame_(frame)
+    {
+        MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+    }
+
+    Zone *singleZone() const {
+        // We never inline across compartments, let alone across zones, so
+        // frames_'s script's zone is the only one of interest.
+        return frame_.script()->compartment()->zone();
+    }
+
+    JSScript *singleScriptForZoneInvalidation() const {
+        MOZ_CRASH("ExecutionObservableFrame shouldn't need zone-wide invalidation.");
+        return nullptr;
+    }
+
+    bool shouldRecompileOrInvalidate(JSScript *script) const {
+        // Normally, *this represents exactly one script: the one frame_ is
+        // running.
+        //
+        // However, debug-mode OSR uses *this for both invalidating Ion frames,
+        // and recompiling the Baseline scripts that those Ion frames will bail
+        // out into. Suppose frame_ is an inline frame, executing a copy of its
+        // JSScript, S_inner, that has been inlined into the IonScript of some
+        // other JSScript, S_outer. We must match S_outer, to decide which Ion
+        // frame to invalidate; and we must match S_inner, to decide which
+        // Baseline script to recompile.
+        //
+        // Note that this does not, by design, invalidate *all* inliners of
+        // frame_.script(), as only frame_ is made observable, not
+        // frame_.script().
+        if (!script->hasBaselineScript())
+            return false;
+
+        if (script == frame_.script())
+            return true;
+
+        return frame_.isRematerializedFrame() &&
+               script == frame_.asRematerializedFrame()->outerScript();
+    }
+
+    bool shouldMarkAsDebuggee(ScriptFrameIter &iter) const {
+        // AbstractFramePtr can't refer to non-remateralized Ion frames, so if
+        // iter refers to one such, we know we don't match.
+        //
+        // We never use this 'has' overload for frame invalidation, only for
+        // frame debuggee marking; so this overload doesn't need a parallel to
+        // the just-so inlining logic above.
+        return iter.hasUsableAbstractFramePtr() && iter.abstractFramePtr() == frame_;
+    }
+
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+};
+
+class MOZ_STACK_CLASS ExecutionObservableScript : public Debugger::ExecutionObservableSet
+{
+    RootedScript script_;
+
+  public:
+    ExecutionObservableScript(JSContext *cx, JSScript *script
+                              MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+      : script_(cx, script)
+    {
+        MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+    }
+
+    Zone *singleZone() const { return script_->compartment()->zone(); }
+    JSScript *singleScriptForZoneInvalidation() const { return script_; }
+    bool shouldRecompileOrInvalidate(JSScript *script) const {
+        return script->hasBaselineScript() && script == script_;
+    }
+    bool shouldMarkAsDebuggee(ScriptFrameIter &iter) const {
+        // AbstractFramePtr can't refer to non-remateralized Ion frames, and
+        // while a non-rematerialized Ion frame may indeed be running script_,
+        // we cannot mark them as debuggees until they bail out.
+        //
+        // Upon bailing out, any newly constructed Baseline frames that came
+        // from Ion frames with scripts that are isDebuggee() is marked as
+        // debuggee. This is correct in that the only other way a frame may be
+        // marked as debuggee is via Debugger.Frame reflection, which would
+        // have rematerialized any Ion frames.
+        return iter.hasUsableAbstractFramePtr() && iter.abstractFramePtr().script() == script_;
+    }
+
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+};
+
+/* static */ bool
+Debugger::updateExecutionObservabilityOfFrames(JSContext *cx, const ExecutionObservableSet &obs,
+                                               IsObserving observing)
+{
+    AutoSuppressProfilerSampling suppressProfilerSampling(cx);
+
+    {
+        jit::IonContext ictx(cx, nullptr);
+        if (!jit::RecompileOnStackBaselineScriptsForDebugMode(cx, obs, observing)) {
+            js_ReportOutOfMemory(cx);
+            return false;
+        }
+    }
+
+    for (ScriptFrameIter iter(cx, ScriptFrameIter::ALL_CONTEXTS,
+                              ScriptFrameIter::GO_THROUGH_SAVED);
+         !iter.done();
+         ++iter)
+    {
+        if (obs.shouldMarkAsDebuggee(iter)) {
+            if (observing) {
+                iter.abstractFramePtr().setIsDebuggee();
+            } else {
+#ifdef DEBUG
+                // Debugger.Frame lifetimes are managed by the debug epilogue,
+                // so in general it's unsafe to unmark a frame if it has a
+                // Debugger.Frame associated with it.
+                FrameRange r(iter.abstractFramePtr());
+                MOZ_ASSERT(r.empty());
+#endif
+                iter.abstractFramePtr().unsetIsDebuggee();
+            }
+        }
+    }
+    return true;
+}
+
+static inline void
+MarkBaselineScriptActiveIfObservable(JSScript *script, const Debugger::ExecutionObservableSet &obs)
+{
+    if (obs.shouldRecompileOrInvalidate(script))
+        script->baselineScript()->setActive();
+}
+
+static bool
+AppendAndInvalidateScriptIfObservable(JSContext *cx, Zone *zone, JSScript *script,
+                                      const Debugger::ExecutionObservableSet &obs,
+                                      Vector<JSScript *> &scripts)
+{
+    if (obs.shouldRecompileOrInvalidate(script)) {
+        // Enter the script's compartment as addPendingRecompile attempts to
+        // cancel off-thread compilations, whose books are kept on the
+        // script's compartment.
+        MOZ_ASSERT(script->compartment()->zone() == zone);
+        AutoCompartment ac(cx, script->compartment());
+        zone->types.addPendingRecompile(cx, script);
+        return scripts.append(script);
+    }
+    return true;
+}
+
+static bool
+UpdateExecutionObservabilityOfScriptsInZone(JSContext *cx, Zone *zone,
+                                            const Debugger::ExecutionObservableSet &obs,
+                                            Debugger::IsObserving observing)
+{
+    using namespace js::jit;
+
+#ifdef JSGC_GENERATIONAL
+    // See note in js::ReleaseAllJITCode.
+    cx->runtime()->gc.evictNursery();
+#endif
+
+    AutoSuppressProfilerSampling suppressProfilerSampling(cx);
+
+    JSRuntime *rt = cx->runtime();
+    FreeOp *fop = cx->runtime()->defaultFreeOp();
+
+    // Mark active baseline scripts in the observable set so that they don't
+    // get discarded. They will be recompiled.
+    for (JitActivationIterator actIter(rt); !actIter.done(); ++actIter) {
+        if (actIter->compartment()->zone() != zone)
+            continue;
+
+        for (JitFrameIterator iter(actIter); !iter.done(); ++iter) {
+            switch (iter.type()) {
+              case JitFrame_BaselineJS:
+                MarkBaselineScriptActiveIfObservable(iter.script(), obs);
+                break;
+              case JitFrame_IonJS:
+                MarkBaselineScriptActiveIfObservable(iter.script(), obs);
+                for (InlineFrameIterator inlineIter(rt, &iter); inlineIter.more(); ++inlineIter)
+                    MarkBaselineScriptActiveIfObservable(inlineIter.script(), obs);
+                break;
+              default:;
+            }
+        }
+    }
+
+    Vector<JSScript *> scripts(cx);
+
+    // Iterate through observable scripts, invalidating their Ion scripts and
+    // appending them to a vector for discarding their baseline scripts later.
+    {
+        types::AutoEnterAnalysis enter(fop, zone);
+        if (JSScript *script = obs.singleScriptForZoneInvalidation()) {
+            if (!AppendAndInvalidateScriptIfObservable(cx, zone, script, obs, scripts))
+                return false;
+        } else {
+            for (gc::ZoneCellIter iter(zone, gc::FINALIZE_SCRIPT); !iter.done(); iter.next()) {
+                JSScript *script = iter.get<JSScript>();
+                if (!AppendAndInvalidateScriptIfObservable(cx, zone, script, obs, scripts))
+                    return false;
+            }
+        }
+    }
+
+    // Iterate through the scripts again and finish discarding
+    // BaselineScripts. This must be done as a separate phase as we can only
+    // discard the BaselineScript on scripts that have no IonScript.
+    for (size_t i = 0; i < scripts.length(); i++) {
+        MOZ_ASSERT_IF(scripts[i]->isDebuggee(), observing);
+        FinishDiscardBaselineScript(fop, scripts[i]);
+    }
+
+    return true;
+}
+
+/* static */ bool
+Debugger::updateExecutionObservabilityOfScripts(JSContext *cx, const ExecutionObservableSet &obs,
+                                                IsObserving observing)
+{
+    if (Zone *zone = obs.singleZone())
+        return UpdateExecutionObservabilityOfScriptsInZone(cx, zone, obs, observing);
+
+    typedef ExecutionObservableSet::ZoneRange ZoneRange;
+    for (ZoneRange r = obs.zones()->all(); !r.empty(); r.popFront()) {
+        if (!UpdateExecutionObservabilityOfScriptsInZone(cx, r.front(), obs, observing))
+            return false;
+    }
+
+    return true;
+}
+
+/* static */ bool
+Debugger::updateExecutionObservability(JSContext *cx, ExecutionObservableSet &obs,
+                                       IsObserving observing)
+{
+    if (!obs.singleZone() && obs.zones()->empty())
+        return true;
+
+    // Invalidate scripts first so we can set the needsArgsObj flag on scripts
+    // before patching frames.
+    return updateExecutionObservabilityOfScripts(cx, obs, observing) &&
+           updateExecutionObservabilityOfFrames(cx, obs, observing);
+}
+
+/* static */ bool
+Debugger::ensureExecutionObservabilityOfScript(JSContext *cx, JSScript *script)
+{
+    if (script->isDebuggee())
+        return true;
+    ExecutionObservableScript obs(cx, script);
+    return updateExecutionObservability(cx, obs, Observing);
+}
+
+/* static */ bool
+Debugger::ensureExecutionObservabilityOfFrame(JSContext *cx, AbstractFramePtr frame)
+{
+    MOZ_ASSERT_IF(frame.script()->isDebuggee(), frame.isDebuggee());
+    if (frame.isDebuggee())
+        return true;
+    ExecutionObservableFrame obs(frame);
+    return updateExecutionObservabilityOfFrames(cx, obs, Observing);
+}
+
+/* static */ bool
+Debugger::ensureExecutionObservabilityOfCompartment(JSContext *cx, JSCompartment *comp)
+{
+    if (comp->debugObservesAllExecution())
+        return true;
+    ExecutionObservableCompartments obs(cx);
+    if (!obs.init() || !obs.add(comp))
+        return false;
+    comp->setDebugObservesAllExecution();
+    return updateExecutionObservability(cx, obs, Observing);
+}
+
+/* static */ bool
+Debugger::hookObservesAllExecution(Hook which)
+{
+    return which == OnEnterFrame;
+}
+
+bool
+Debugger::hasAnyLiveHooksThatObserveAllExecution() const
+{
+    if (!enabled)
+        return false;
+    return hasAnyHooksThatObserveAllExecution();
+}
+
+bool
+Debugger::hasAnyHooksThatObserveAllExecution() const
+{
+    return !!getHook(OnEnterFrame);
+}
+
+/* static */ bool
+Debugger::anyOtherDebuggerObservingAllExecution(GlobalObject *global) const
+{
+    // If we are toggling from Observing to NotObserving, add the
+    // compartment to the observable set only if none of its other
+    // debuggers are observing all execution.
+    GlobalObject::DebuggerVector *debuggers = global->getDebuggers();
+    for (Debugger **p = debuggers->begin(); p != debuggers->end(); p++) {
+        Debugger *dbg = *p;
+        if (dbg != this && dbg->hasAnyLiveHooksThatObserveAllExecution())
+            return true;
+    }
+    return false;
+}
+
+// Toggle whether this Debugger's debuggees observe all execution. This is
+// called when a hook that observes all execution is set or unset. See
+// hookObservesAllExecution.
+bool
+Debugger::setObservesAllExecution(JSContext *cx, IsObserving observing)
+{
+    ExecutionObservableCompartments obs(cx);
+    if (!obs.init())
+        return false;
+
+    for (GlobalObjectSet::Range r = debuggees.all(); !r.empty(); r.popFront()) {
+        GlobalObject * global = r.front();
+        JSCompartment *comp = global->compartment();
+
+        if (comp->debugObservesAllExecution() == observing)
+            continue;
+
+        if (observing) {
+            if (!obs.add(comp))
+                return false;
+            comp->setDebugObservesAllExecution();
+        } else if (!anyOtherDebuggerObservingAllExecution(global)) {
+            // It's expensive to eagerly invalidate and recompile a
+            // compartment, so don't add the compartment to the set.
+            comp->unsetDebugObservesAllExecution();
+        }
+    }
+
+    return updateExecutionObservability(cx, obs, observing);
+}
+
 
 
 /*** Debugger JSObjects **************************************************************************/
@@ -1644,7 +2144,7 @@
      */
     JSRuntime *rt = trc->runtime();
     for (CompartmentsIter c(rt, SkipAtoms); !c.done(); c.next()) {
-        if (c->debugMode()) {
+        if (c->isDebuggee()) {
             GlobalObject *global = c->maybeGlobal();
             if (!IsObjectMarked(&global))
                 continue;
@@ -1794,12 +2294,8 @@
              * might be GC'd too. Since detaching requires access to both
              * objects, this must be done before finalize time.
              */
-            for (GlobalObjectSet::Enum e(dbg->debuggees); !e.empty(); e.popFront()) {
-                // We can't recompile on-stack scripts here, and we
-                // can only toggle debug mode to off, so we use an
-                // infallible variant of removeDebuggeeGlobal.
-                dbg->removeDebuggeeGlobalUnderGC(fop, e.front(), &e);
-            }
+            for (GlobalObjectSet::Enum e(dbg->debuggees); !e.empty(); e.popFront())
+                dbg->removeDebuggeeGlobal(fop, e.front(), &e);
         }
     }
 }
@@ -1810,7 +2306,7 @@
     const GlobalObject::DebuggerVector *debuggers = global->getDebuggers();
     MOZ_ASSERT(!debuggers->empty());
     while (!debuggers->empty())
-        debuggers->back()->removeDebuggeeGlobalUnderGC(fop, global, nullptr);
+        debuggers->back()->removeDebuggeeGlobal(fop, global, nullptr);
 }
 
 /* static */ void
@@ -1934,6 +2430,18 @@
                 JS_REMOVE_AND_INIT_LINK(&dbg->onNewGlobalObjectWatchersLink);
             }
         }
+
+        // Ensure the compartment is observable if we are re-enabling a
+        // Debugger with hooks that observe all execution.
+        if (enabled) {
+            if (dbg->hasAnyHooksThatObserveAllExecution()) {
+                if (!dbg->setObservesAllExecution(cx, Observing))
+                    return false;
+            }
+        } else {
+            if (!dbg->setObservesAllExecution(cx, NotObserving))
+                return false;
+        }
     }
 
     dbg->enabled = enabled;
@@ -1965,6 +2473,13 @@
         return false;
     }
     dbg->object->setReservedSlot(JSSLOT_DEBUG_HOOK_START + which, args[0]);
+    if (hookObservesAllExecution(which)) {
+        if (!dbg->setObservesAllExecution(cx, dbg->hasAnyLiveHooksThatObserveAllExecution()
+                                              ? Observing : NotObserving))
+        {
+            return false;
+        }
+    }
     args.rval().setUndefined();
     return true;
 }
@@ -2006,6 +2521,30 @@
 }
 
 /* static */ bool
+Debugger::getOnNewPromise(JSContext *cx, unsigned argc, Value *vp)
+{
+    return getHookImpl(cx, argc, vp, OnNewPromise);
+}
+
+/* static */ bool
+Debugger::setOnNewPromise(JSContext *cx, unsigned argc, Value *vp)
+{
+    return setHookImpl(cx, argc, vp, OnNewPromise);
+}
+
+/* static */ bool
+Debugger::getOnPromiseSettled(JSContext *cx, unsigned argc, Value *vp)
+{
+    return getHookImpl(cx, argc, vp, OnPromiseSettled);
+}
+
+/* static */ bool
+Debugger::setOnPromiseSettled(JSContext *cx, unsigned argc, Value *vp)
+{
+    return setHookImpl(cx, argc, vp, OnPromiseSettled);
+}
+
+/* static */ bool
 Debugger::getOnEnterFrame(JSContext *cx, unsigned argc, Value *vp)
 {
     return getHookImpl(cx, argc, vp, OnEnterFrame);
@@ -2160,10 +2699,6 @@
 {
     THIS_DEBUGGER(cx, argc, vp, "addAllGlobalsAsDebuggees", args, dbg);
     for (ZonesIter zone(cx->runtime(), SkipAtoms); !zone.done(); zone.next()) {
-        // Invalidate a zone at a time to avoid doing a ZoneCellIter
-        // per compartment.
-        AutoDebugModeInvalidation invalidate(zone);
-
         for (CompartmentsInZoneIter c(zone); !c.done(); c.next()) {
             if (c == dbg->object->compartment() || c->options().invisibleToDebugger())
                 continue;
@@ -2171,7 +2706,7 @@
             GlobalObject *global = c->maybeGlobal();
             if (global) {
                 Rooted<GlobalObject*> rg(cx, global);
-                if (!dbg->addDebuggeeGlobal(cx, rg, invalidate))
+                if (!dbg->addDebuggeeGlobal(cx, rg))
                     return false;
             }
         }
@@ -2185,15 +2720,29 @@
 Debugger::removeDebuggee(JSContext *cx, unsigned argc, Value *vp)
 {
     THIS_DEBUGGER(cx, argc, vp, "removeDebuggee", args, dbg);
+
     if (!args.requireAtLeast(cx, "Debugger.removeDebuggee", 1))
         return false;
     Rooted<GlobalObject *> global(cx, dbg->unwrapDebuggeeArgument(cx, args[0]));
     if (!global)
         return false;
+
+    ExecutionObservableCompartments obs(cx);
+    if (!obs.init())
+        return false;
+
     if (dbg->debuggees.has(global)) {
-        if (!dbg->removeDebuggeeGlobal(cx, global, nullptr))
+        dbg->removeDebuggeeGlobal(cx->runtime()->defaultFreeOp(), global, nullptr);
+
+        // Only update the compartment if there are no Debuggers left, as it's
+        // expensive to check if no other Debugger has a live script or frame hook
+        // on any of the current on-stack debuggee frames.
+        if (global->getDebuggers()->empty() && !obs.add(global->compartment()))
+            return false;
+        if (!updateExecutionObservability(cx, obs, NotObserving))
             return false;
     }
+
     args.rval().setUndefined();
     return true;
 }
@@ -2203,12 +2752,22 @@
 {
     THIS_DEBUGGER(cx, argc, vp, "removeAllDebuggees", args, dbg);
 
+    ExecutionObservableCompartments obs(cx);
+    if (!obs.init())
+        return false;
+
     for (GlobalObjectSet::Enum e(dbg->debuggees); !e.empty(); e.popFront()) {
         Rooted<GlobalObject *> global(cx, e.front());
-        if (!dbg->removeDebuggeeGlobal(cx, global, &e))
+        dbg->removeDebuggeeGlobal(cx->runtime()->defaultFreeOp(), global, &e);
+
+        // See note about adding to the observable set in removeDebuggee.
+        if (global->getDebuggers()->empty() && !obs.add(global->compartment()))
             return false;
     }
 
+    if (!updateExecutionObservability(cx, obs, NotObserving))
+        return false;
+
     args.rval().setUndefined();
     return true;
 }
@@ -2352,16 +2911,6 @@
 bool
 Debugger::addDebuggeeGlobal(JSContext *cx, Handle<GlobalObject*> global)
 {
-    AutoSuppressProfilerSampling suppressProfilerSampling(cx);
-    AutoDebugModeInvalidation invalidate(global->compartment());
-    return addDebuggeeGlobal(cx, global, invalidate);
-}
-
-bool
-Debugger::addDebuggeeGlobal(JSContext *cx,
-                            Handle<GlobalObject*> global,
-                            AutoDebugModeInvalidation &invalidate)
-{
     if (debuggees.has(global))
         return true;
 
@@ -2396,7 +2945,7 @@
          * Find all compartments containing debuggers debugging c's global
          * object. Add those compartments to visited.
          */
-        if (c->debugMode()) {
+        if (c->isDebuggee()) {
             GlobalObject::DebuggerVector *v = c->maybeGlobal()->getDebuggers();
             for (Debugger **p = v->begin(); p != v->end(); p++) {
                 JSCompartment *next = (*p)->object->compartment();
@@ -2423,8 +2972,11 @@
     }
 
     /*
-     * Each debugger-debuggee relation must be stored in up to three places.
-     * JSCompartment::addDebuggee enables debug mode if needed.
+     * For global to become this js::Debugger's debuggee:
+     * - global must be in this->debuggees,
+     * - this js::Debugger must be in global->getDebuggers(), and
+     * - JSCompartment::isDebuggee()'s bit must be set.
+     * All three indications must be kept consistent.
      */
     AutoCompartment ac(cx, global);
     GlobalObject::DebuggerVector *v = GlobalObject::getOrCreateDebuggers(cx, global);
@@ -2434,14 +2986,16 @@
         if (!debuggees.put(global)) {
             js_ReportOutOfMemory(cx);
         } else {
-            if (global->getDebuggers()->length() > 1)
+            debuggeeCompartment->setIsDebuggee();
+            if (!hasAnyLiveHooksThatObserveAllExecution())
                 return true;
-            if (debuggeeCompartment->enterDebugMode(cx, invalidate))
+            if (ensureExecutionObservabilityOfCompartment(cx, debuggeeCompartment))
                 return true;
 
             /* Maintain consistency on error. */
             debuggees.remove(global);
         }
+
         MOZ_ASSERT(v->back() == this);
         v->popBack();
     }
@@ -2454,8 +3008,7 @@
 }
 
 void
-Debugger::cleanupDebuggeeGlobalBeforeRemoval(FreeOp *fop, GlobalObject *global,
-                                             GlobalObjectSet::Enum *debugEnum)
+Debugger::removeDebuggeeGlobal(FreeOp *fop, GlobalObject *global, GlobalObjectSet::Enum *debugEnum)
 {
     /*
      * The caller might have found global by enumerating this->debuggees; if
@@ -2517,35 +3070,6 @@
      */
     if (trackingAllocationSites)
         global->compartment()->forgetObjectMetadataCallback();
-}
-
-bool
-Debugger::removeDebuggeeGlobal(JSContext *cx, Handle<GlobalObject *> global,
-                               GlobalObjectSet::Enum *debugEnum)
-{
-    AutoDebugModeInvalidation invalidate(global->compartment());
-    return removeDebuggeeGlobal(cx, global, invalidate, debugEnum);
-}
-
-bool
-Debugger::removeDebuggeeGlobal(JSContext *cx, Handle<GlobalObject *> global,
-                               AutoDebugModeInvalidation &invalidate,
-                               GlobalObjectSet::Enum *debugEnum)
-{
-    cleanupDebuggeeGlobalBeforeRemoval(cx->runtime()->defaultFreeOp(), global, debugEnum);
-
-    // The debuggee needs to be removed from the compartment last to save a root.
-    if (global->getDebuggers()->empty())
-        return global->compartment()->leaveDebugMode(cx, invalidate);
-
-    return true;
-}
-
-void
-Debugger::removeDebuggeeGlobalUnderGC(FreeOp *fop, GlobalObject *global,
-                                      GlobalObjectSet::Enum *debugEnum)
-{
-    cleanupDebuggeeGlobalBeforeRemoval(fop, global, debugEnum);
 
     /*
      * The debuggee needs to be removed from the compartment last, as this can
@@ -2553,7 +3077,7 @@
      * global cannot be rooted on the stack without a cx.
      */
     if (global->getDebuggers()->empty())
-        global->compartment()->leaveDebugModeUnderGC();
+        global->compartment()->unsetIsDebuggee();
 }
 
 static inline ScriptSourceObject *GetSourceReferent(JSObject *obj);
@@ -3255,6 +3779,8 @@
     JS_PSGS("onExceptionUnwind", Debugger::getOnExceptionUnwind,
             Debugger::setOnExceptionUnwind, 0),
     JS_PSGS("onNewScript", Debugger::getOnNewScript, Debugger::setOnNewScript, 0),
+    JS_PSGS("onNewPromise", Debugger::getOnNewPromise, Debugger::setOnNewPromise, 0),
+    JS_PSGS("onPromiseSettled", Debugger::getOnPromiseSettled, Debugger::setOnPromiseSettled, 0),
     JS_PSGS("onEnterFrame", Debugger::getOnEnterFrame, Debugger::setOnEnterFrame, 0),
     JS_PSGS("onNewGlobalObject", Debugger::getOnNewGlobalObject, Debugger::setOnNewGlobalObject, 0),
     JS_PSGS("uncaughtExceptionHook", Debugger::getUncaughtExceptionHook,
@@ -3984,6 +4510,7 @@
 Debugger::replaceFrameGuts(JSContext *cx, AbstractFramePtr from, AbstractFramePtr to,
                            ScriptFrameIter &iter)
 {
+    // Forward live Debugger.Frame objects.
     for (Debugger::FrameRange r(from); !r.empty(); r.popFront()) {
         RootedNativeObject frameobj(cx, r.frontFrame());
         Debugger *dbg = r.frontDebugger();
@@ -4006,6 +4533,9 @@
         }
     }
 
+    // Rekey missingScopes to maintain Debugger.Environment identity.
+    DebugScopes::rekeyMissingScopes(cx, from, to);
+
     return true;
 }
 
@@ -4068,10 +4598,17 @@
     if (!ScriptOffset(cx, script, args[0], &offset))
         return false;
 
-    JSObject *handler = NonNullObject(cx, args[1]);
+    RootedObject handler(cx, NonNullObject(cx, args[1]));
     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.
+    if (!dbg->ensureExecutionObservabilityOfScript(cx, script))
+        return false;
+
     jsbytecode *pc = script->offsetToPC(offset);
     BreakpointSite *site = script->getOrCreateBreakpointSite(cx, pc);
     if (!site)
@@ -4469,6 +5006,26 @@
 }
 
 static bool
+DebuggerSource_setSourceMapUrl(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_DEBUGSOURCE_REFERENT(cx, argc, vp, "sourceMapURL", args, obj, sourceObject);
+    ScriptSource *ss = sourceObject->source();
+    MOZ_ASSERT(ss);
+
+    JSString *str = ToString<CanGC>(cx, args[0]);
+    if (!str)
+        return false;
+
+    AutoStableStringChars stableChars(cx);
+    if (!stableChars.initTwoByte(cx, str))
+        return false;
+
+    ss->setSourceMapURL(cx, stableChars.twoByteChars());
+    args.rval().setUndefined();
+    return true;
+}
+
+static bool
 DebuggerSource_getSourceMapUrl(JSContext *cx, unsigned argc, Value *vp)
 {
     THIS_DEBUGSOURCE_REFERENT(cx, argc, vp, "(get sourceMapURL)", args, obj, sourceObject);
@@ -4497,7 +5054,7 @@
     JS_PSG("introductionOffset", DebuggerSource_getIntroductionOffset, 0),
     JS_PSG("introductionType", DebuggerSource_getIntroductionType, 0),
     JS_PSG("elementAttributeName", DebuggerSource_getElementProperty, 0),
-    JS_PSG("sourceMapURL", DebuggerSource_getSourceMapUrl, 0),
+    JS_PSGS("sourceMapURL", DebuggerSource_getSourceMapUrl, DebuggerSource_setSourceMapUrl, 0),
     JS_PS_END
 };
 
@@ -4654,7 +5211,7 @@
             maybeIter.emplace(cx, ScriptFrameIter::ALL_CONTEXTS,               \
                               ScriptFrameIter::GO_THROUGH_SAVED);              \
             ScriptFrameIter &iter = *maybeIter;                                \
-            while (iter.isIon() || iter.abstractFramePtr() != f)               \
+            while (!iter.hasUsableAbstractFramePtr() || iter.abstractFramePtr() != f) \
                 ++iter;                                                        \
             AbstractFramePtr data = iter.copyDataAsAbstractFramePtr();         \
             if (!data)                                                         \
@@ -5284,6 +5841,7 @@
     JS_FS_END
 };
 
+
 /*** Debugger.Object *****************************************************************************/
 
 static void
@@ -5479,15 +6037,14 @@
         MOZ_ASSERT(fun->nargs() == script->bindings.numArgs());
 
         if (fun->nargs() > 0) {
-            BindingVector bindings(cx);
-            if (!FillBindingVector(script, &bindings))
-                return false;
-            for (size_t i = 0; i < fun->nargs(); i++) {
+            BindingIter bi(script);
+            for (size_t i = 0; i < fun->nargs(); i++, bi++) {
+                MOZ_ASSERT(bi.argIndex() == i);
                 Value v;
-                if (bindings[i].name()->length() == 0)
+                if (bi->name()->length() == 0)
                     v = UndefinedValue();
                 else
-                    v = StringValue(bindings[i].name());
+                    v = StringValue(bi->name());
                 result->setDenseElement(i, v);
             }
         }
@@ -6702,3 +7259,39 @@
     debugProto->setReservedSlot(Debugger::JSSLOT_DEBUG_MEMORY_PROTO, ObjectValue(*memoryProto));
     return true;
 }
+
+static inline void
+AssertIsPromise(JSContext *cx, HandleObject promise)
+{
+    MOZ_ASSERT(promise);
+    assertSameCompartment(cx, promise);
+    MOZ_ASSERT(strcmp(promise->getClass()->name, "Promise") == 0 ||
+               strcmp(promise->getClass()->name, "MozAbortablePromise") == 0);
+}
+
+JS_PUBLIC_API(void)
+JS::dbg::onNewPromise(JSContext *cx, HandleObject promise)
+{
+    AssertIsPromise(cx, promise);
+    Debugger::slowPathPromiseHook(cx, Debugger::OnNewPromise, promise);
+}
+
+JS_PUBLIC_API(void)
+JS::dbg::onPromiseSettled(JSContext *cx, HandleObject promise)
+{
+    AssertIsPromise(cx, promise);
+    Debugger::slowPathPromiseHook(cx, Debugger::OnPromiseSettled, promise);
+}
+
+JS_PUBLIC_API(bool)
+JS::dbg::IsDebugger(JS::Value val)
+{
+    if (!val.isObject())
+        return false;
+
+    JSObject &obj = val.toObject();
+    if (obj.getClass() != &Debugger::jsclass)
+        return false;
+
+    return js::Debugger::fromJSObject(&obj) != nullptr;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Debugger.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Debugger.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Debugger.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Debugger.h	2014-11-26 21:46:03.000000000 +0000
@@ -17,6 +17,7 @@
 #include "jswrapper.h"
 
 #include "gc/Barrier.h"
+#include "js/Debug.h"
 #include "js/HashTable.h"
 #include "vm/GlobalObject.h"
 #include "vm/SavedStacks.h"
@@ -176,7 +177,10 @@
     friend class SavedStacks;
     friend class mozilla::LinkedListElement<Debugger>;
     friend bool (::JS_DefineDebuggerObject)(JSContext *cx, JS::HandleObject obj);
+    friend bool (::JS::dbg::IsDebugger)(JS::Value val);
     friend bool SavedStacksMetadataCallback(JSContext *cx, JSObject **pmetadata);
+    friend void JS::dbg::onNewPromise(JSContext *cx, HandleObject promise);
+    friend void JS::dbg::onPromiseSettled(JSContext *cx, HandleObject promise);
 
   public:
     enum Hook {
@@ -185,6 +189,8 @@
         OnNewScript,
         OnEnterFrame,
         OnNewGlobalObject,
+        OnNewPromise,
+        OnPromiseSettled,
         HookCount
     };
     enum {
@@ -201,6 +207,27 @@
         JSSLOT_DEBUG_MEMORY_INSTANCE = JSSLOT_DEBUG_HOOK_STOP,
         JSSLOT_DEBUG_COUNT
     };
+
+    class ExecutionObservableSet
+    {
+      public:
+        typedef HashSet<Zone *>::Range ZoneRange;
+
+        virtual Zone *singleZone() const { return nullptr; }
+        virtual JSScript *singleScriptForZoneInvalidation() const { return nullptr; }
+        virtual const HashSet<Zone *> *zones() const { return nullptr; }
+
+        virtual bool shouldRecompileOrInvalidate(JSScript *script) const = 0;
+        virtual bool shouldMarkAsDebuggee(ScriptFrameIter &iter) const = 0;
+    };
+
+    // This enum is converted to and compare with bool values; NotObserving
+    // must be 0 and Observing must be 1.
+    enum IsObserving {
+        NotObserving = 0,
+        Observing = 1
+    };
+
   private:
     HeapPtrNativeObject object;         /* The Debugger object. Strong reference. */
     GlobalObjectSet debuggees;          /* Debuggee globals. Cross-compartment weak references. */
@@ -274,17 +301,7 @@
     class ObjectQuery;
 
     bool addDebuggeeGlobal(JSContext *cx, Handle<GlobalObject*> obj);
-    bool addDebuggeeGlobal(JSContext *cx, Handle<GlobalObject*> obj,
-                           AutoDebugModeInvalidation &invalidate);
-    void cleanupDebuggeeGlobalBeforeRemoval(FreeOp *fop, GlobalObject *global,
-                                            GlobalObjectSet::Enum *debugEnum);
-    bool removeDebuggeeGlobal(JSContext *cx, Handle<GlobalObject *> global,
-                              GlobalObjectSet::Enum *debugEnum);
-    bool removeDebuggeeGlobal(JSContext *cx, Handle<GlobalObject *> global,
-                              AutoDebugModeInvalidation &invalidate,
-                              GlobalObjectSet::Enum *debugEnum);
-    void removeDebuggeeGlobalUnderGC(FreeOp *fop, GlobalObject *global,
-                                     GlobalObjectSet::Enum *debugEnum);
+    void removeDebuggeeGlobal(FreeOp *fop, GlobalObject *global, GlobalObjectSet::Enum *debugEnum);
 
     /*
      * Cope with an error or exception in a debugger hook.
@@ -358,6 +375,10 @@
     static bool setOnEnterFrame(JSContext *cx, unsigned argc, Value *vp);
     static bool getOnNewGlobalObject(JSContext *cx, unsigned argc, Value *vp);
     static bool setOnNewGlobalObject(JSContext *cx, unsigned argc, Value *vp);
+    static bool getOnNewPromise(JSContext *cx, unsigned argc, Value *vp);
+    static bool setOnNewPromise(JSContext *cx, unsigned argc, Value *vp);
+    static bool getOnPromiseSettled(JSContext *cx, unsigned argc, Value *vp);
+    static bool setOnPromiseSettled(JSContext *cx, unsigned argc, Value *vp);
     static bool getUncaughtExceptionHook(JSContext *cx, unsigned argc, Value *vp);
     static bool setUncaughtExceptionHook(JSContext *cx, unsigned argc, Value *vp);
     static bool getMemory(JSContext *cx, unsigned argc, Value *vp);
@@ -377,23 +398,49 @@
     static const JSPropertySpec properties[];
     static const JSFunctionSpec methods[];
 
+    static bool getNewestAbstractFramePtr(JSContext *cx);
+    static bool updateExecutionObservabilityOfFrames(JSContext *cx, const ExecutionObservableSet &obs,
+                                                     IsObserving observing);
+    static bool updateExecutionObservabilityOfScripts(JSContext *cx, const ExecutionObservableSet &obs,
+                                                      IsObserving observing);
+    static bool updateExecutionObservability(JSContext *cx, ExecutionObservableSet &obs,
+                                             IsObserving observing);
+
+  public:
+    // Public for DebuggerScript_setBreakpoint.
+    static bool ensureExecutionObservabilityOfScript(JSContext *cx, JSScript *script);
+
+  private:
+    static bool ensureExecutionObservabilityOfFrame(JSContext *cx, AbstractFramePtr frame);
+    static bool ensureExecutionObservabilityOfCompartment(JSContext *cx, JSCompartment *comp);
+
+    static bool hookObservesAllExecution(Hook which);
+    bool anyOtherDebuggerObservingAllExecution(GlobalObject *global) const;
+    bool hasAnyLiveHooksThatObserveAllExecution() const;
+    bool hasAnyHooksThatObserveAllExecution() const;
+    bool setObservesAllExecution(JSContext *cx, IsObserving observing);
+
     JSObject *getHook(Hook hook) const;
     bool hasAnyLiveHooks() const;
 
     static JSTrapStatus slowPathOnEnterFrame(JSContext *cx, AbstractFramePtr frame);
     static bool slowPathOnLeaveFrame(JSContext *cx, AbstractFramePtr frame, bool ok);
+    static JSTrapStatus slowPathOnDebuggerStatement(JSContext *cx, AbstractFramePtr frame);
     static JSTrapStatus slowPathOnExceptionUnwind(JSContext *cx, AbstractFramePtr frame);
     static void slowPathOnNewScript(JSContext *cx, HandleScript script,
                                     GlobalObject *compileAndGoGlobal);
     static void slowPathOnNewGlobalObject(JSContext *cx, Handle<GlobalObject *> global);
     static bool slowPathOnLogAllocationSite(JSContext *cx, HandleSavedFrame frame,
                                             int64_t when, GlobalObject::DebuggerVector &dbgs);
-    static JSTrapStatus dispatchHook(JSContext *cx, MutableHandleValue vp, Hook which);
+    static void slowPathPromiseHook(JSContext *cx, Hook hook, HandleObject promise);
+    static JSTrapStatus dispatchHook(JSContext *cx, MutableHandleValue vp, Hook which,
+                                     HandleObject payload);
 
     JSTrapStatus fireDebuggerStatement(JSContext *cx, MutableHandleValue vp);
     JSTrapStatus fireExceptionUnwind(JSContext *cx, MutableHandleValue vp);
     JSTrapStatus fireEnterFrame(JSContext *cx, AbstractFramePtr frame, MutableHandleValue vp);
     JSTrapStatus fireNewGlobalObject(JSContext *cx, Handle<GlobalObject *> global, MutableHandleValue vp);
+    JSTrapStatus firePromiseHook(JSContext *cx, Hook hook, HandleObject promise, MutableHandleValue vp);
 
     /*
      * Allocate and initialize a Debugger.Script instance whose referent is
@@ -440,6 +487,8 @@
     bool hasMemory() const;
     DebuggerMemory &memory() const;
 
+    GlobalObjectSet::Range allDebuggees() const { return debuggees.all(); }
+
     /*********************************** Methods for interaction with the GC. */
 
     /*
@@ -465,25 +514,50 @@
     static void findCompartmentEdges(JS::Zone *v, gc::ComponentFinder<JS::Zone> &finder);
 
     /*
-     * Announce to the debugger that the thread has entered a new JavaScript frame,
-     * |frame|. Call whatever hooks have been registered to observe new frames, and
-     * return a JSTrapStatus code indication how execution should proceed:
+     * JSTrapStatus Overview
+     * ---------------------
+     *
+     * The |onEnterFrame|, |onDebuggerStatement|, and |onExceptionUnwind|
+     * methods below return a JSTrapStatus code that indicates how execution
+     * should proceed:
      *
      * - JSTRAP_CONTINUE: Continue execution normally.
      *
-     * - JSTRAP_THROW: Throw an exception. onEnterFrame has set |cx|'s
+     * - JSTRAP_THROW: Throw an exception. The method has set |cx|'s
      *   pending exception to the value to be thrown.
      *
      * - JSTRAP_ERROR: Terminate execution (as is done when a script is terminated
-     *   for running too long). onEnterFrame has cleared |cx|'s pending
+     *   for running too long). The method has cleared |cx|'s pending
      *   exception.
      *
-     * - JSTRAP_RETURN: Return from the new frame immediately. onEnterFrame
-     *   has set |frame|'s return value appropriately.
+     * - JSTRAP_RETURN: Return from the new frame immediately. The method has
+     *   set the youngest JS frame's return value appropriately.
+     */
+
+    /*
+     * Announce to the debugger that the context has entered a new JavaScript
+     * frame, |frame|. Call whatever hooks have been registered to observe new
+     * frames.
      */
     static inline JSTrapStatus onEnterFrame(JSContext *cx, AbstractFramePtr frame);
 
     /*
+     * Announce to the debugger a |debugger;| statement on has been
+     * encountered on the youngest JS frame on |cx|. Call whatever hooks have
+     * been registered to observe this.
+     *
+     * Note that this method is called for all |debugger;| statements,
+     * regardless of the frame's debuggee-ness.
+     */
+    static inline JSTrapStatus onDebuggerStatement(JSContext *cx, AbstractFramePtr frame);
+
+    /*
+     * Announce to the debugger that an exception has been thrown and propagated
+     * to |frame|. Call whatever hooks have been registered to observe this.
+     */
+    static inline JSTrapStatus onExceptionUnwind(JSContext *cx, AbstractFramePtr frame);
+
+    /*
      * Announce to the debugger that the thread has exited a JavaScript frame, |frame|.
      * If |ok| is true, the frame is returning normally; if |ok| is false, the frame
      * is throwing an exception or terminating.
@@ -499,25 +573,6 @@
      */
     static inline bool onLeaveFrame(JSContext *cx, AbstractFramePtr frame, bool ok);
 
-    static inline JSTrapStatus onDebuggerStatement(JSContext *cx, MutableHandleValue vp);
-
-    /*
-     * Announce to the debugger that an exception has been thrown and propagated
-     * to |frame|. Call whatever hooks have been registered to observe this and
-     * return a JSTrapStatus code indication how execution should proceed:
-     *
-     * - JSTRAP_CONTINUE: Continue throwing the current exception.
-     *
-     * - JSTRAP_THROW: Throw another value. onExceptionUnwind has set |cx|'s
-     *   pending exception to the new value.
-     *
-     * - JSTRAP_ERROR: Terminate execution. onExceptionUnwind has cleared |cx|'s
-     *   pending exception.
-     *
-     * - JSTRAP_RETURN: Return from |frame|. onExceptionUnwind has cleared
-     *   |cx|'s pending exception and set |frame|'s return value.
-     */
-    static inline JSTrapStatus onExceptionUnwind(JSContext *cx, AbstractFramePtr frame);
     static inline void onNewScript(JSContext *cx, HandleScript script, GlobalObject *compileAndGoGlobal);
     static inline void onNewGlobalObject(JSContext *cx, Handle<GlobalObject *> global);
     static inline bool onLogAllocationSite(JSContext *cx, HandleSavedFrame frame, int64_t when);
@@ -526,6 +581,7 @@
     static bool handleBaselineOsr(JSContext *cx, InterpreterFrame *from, jit::BaselineFrame *to);
     static bool handleIonBailout(JSContext *cx, jit::RematerializedFrame *from, jit::BaselineFrame *to);
     static void propagateForcedReturn(JSContext *cx, AbstractFramePtr frame, HandleValue rval);
+    static bool hasLiveHook(GlobalObject *global, Hook which);
 
     /************************************* Functions for use by Debugger.cpp. */
 
@@ -792,30 +848,6 @@
     return debuggees.has(global);
 }
 
-/* static */ JSTrapStatus
-Debugger::onEnterFrame(JSContext *cx, AbstractFramePtr frame)
-{
-    if (!cx->compartment()->debugMode())
-        return JSTRAP_CONTINUE;
-    return slowPathOnEnterFrame(cx, frame);
-}
-
-/* static */ JSTrapStatus
-Debugger::onDebuggerStatement(JSContext *cx, MutableHandleValue vp)
-{
-    return cx->compartment()->debugMode()
-           ? dispatchHook(cx, vp, OnDebuggerStatement)
-           : JSTRAP_CONTINUE;
-}
-
-/* static */ JSTrapStatus
-Debugger::onExceptionUnwind(JSContext *cx, AbstractFramePtr frame)
-{
-    if (!cx->compartment()->debugMode())
-        return JSTRAP_CONTINUE;
-    return slowPathOnExceptionUnwind(cx, frame);
-}
-
 /* static */ void
 Debugger::onNewScript(JSContext *cx, HandleScript script, GlobalObject *compileAndGoGlobal)
 {
@@ -827,7 +859,7 @@
                   !script->selfHosted(),
                   script->compartment()->firedOnNewGlobalObject);
     MOZ_ASSERT_IF(!script->compileAndGo(), !compileAndGoGlobal);
-    if (script->compartment()->debugMode())
+    if (script->compartment()->isDebuggee())
         slowPathOnNewScript(cx, script, compileAndGoGlobal);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Debugger-inl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Debugger-inl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Debugger-inl.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Debugger-inl.h	2014-11-26 21:46:03.000000000 +0000
@@ -15,10 +15,12 @@
 js::Debugger::onLeaveFrame(JSContext *cx, AbstractFramePtr frame, bool ok)
 {
     MOZ_ASSERT_IF(frame.isInterpreterFrame(), frame.asInterpreterFrame() == cx->interpreterFrame());
+    MOZ_ASSERT_IF(frame.script()->isDebuggee(), frame.isDebuggee());
     /* Traps must be cleared from eval frames, see slowPathOnLeaveFrame. */
-    bool evalTraps = frame.isEvalFrame() &&
-                     frame.script()->hasAnyBreakpointsOrStepMode();
-    if (cx->compartment()->debugMode() || evalTraps)
+    mozilla::DebugOnly<bool> evalTraps = frame.isEvalFrame() &&
+                                         frame.script()->hasAnyBreakpointsOrStepMode();
+    MOZ_ASSERT_IF(evalTraps, frame.isDebuggee());
+    if (frame.isDebuggee())
         ok = slowPathOnLeaveFrame(cx, frame, ok);
     return ok;
 }
@@ -30,4 +32,29 @@
     return (Debugger *) obj->as<NativeObject>().getPrivate();
 }
 
+/* static */ JSTrapStatus
+js::Debugger::onEnterFrame(JSContext *cx, AbstractFramePtr frame)
+{
+    MOZ_ASSERT_IF(frame.script()->isDebuggee(), frame.isDebuggee());
+    if (!frame.isDebuggee())
+        return JSTRAP_CONTINUE;
+    return slowPathOnEnterFrame(cx, frame);
+}
+
+/* static */ JSTrapStatus
+js::Debugger::onDebuggerStatement(JSContext *cx, AbstractFramePtr frame)
+{
+    if (!cx->compartment()->isDebuggee())
+        return JSTRAP_CONTINUE;
+    return slowPathOnDebuggerStatement(cx, frame);
+}
+
+/* static */ JSTrapStatus
+js::Debugger::onExceptionUnwind(JSContext *cx, AbstractFramePtr frame)
+{
+    if (!cx->compartment()->isDebuggee())
+        return JSTRAP_CONTINUE;
+    return slowPathOnExceptionUnwind(cx, frame);
+}
+
 #endif /* vm_Debugger_inl_h */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/DebuggerMemory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/DebuggerMemory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/DebuggerMemory.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/DebuggerMemory.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -34,6 +34,7 @@
 
 using mozilla::Maybe;
 using mozilla::Move;
+using mozilla::Nothing;
 
 /* static */ DebuggerMemory *
 DebuggerMemory::create(JSContext *cx, Debugger *dbg)
@@ -754,34 +755,44 @@
 DebuggerMemory::takeCensus(JSContext *cx, unsigned argc, Value *vp)
 {
     THIS_DEBUGGER_MEMORY(cx, argc, vp, "Debugger.Memory.prototype.census", args, memory);
-    Debugger *debugger = memory->getDebugger();
 
     dbg::Census census(cx);
     if (!census.init())
         return false;
+
     dbg::DefaultCensusHandler handler(census);
     if (!handler.init(census))
         return false;
 
+    Debugger *dbg = memory->getDebugger();
+
+    // Populate census.debuggeeZones and ensure that all of our debuggee globals
+    // are rooted so that they are visible in the RootList.
+    JS::AutoObjectVector debuggees(cx);
+    for (GlobalObjectSet::Range r = dbg->allDebuggees(); !r.empty(); r.popFront()) {
+        if (!census.debuggeeZones.put(r.front()->zone()) ||
+            !debuggees.append(static_cast<JSObject *>(r.front())))
+        {
+            return false;
+        }
+    }
+
     {
-        JS::AutoCheckCannotGC noGC;
+        Maybe<JS::AutoCheckCannotGC> maybeNoGC;
+        JS::ubi::RootList rootList(cx, maybeNoGC);
+        if (!rootList.init(cx, census.debuggeeZones))
+            return false;
 
-        dbg::DefaultCensusTraversal traversal(cx, handler, noGC);
+        dbg::DefaultCensusTraversal traversal(cx, handler, maybeNoGC.ref());
         if (!traversal.init())
             return false;
         traversal.wantNames = false;
 
-        // Walk the debuggee compartments, using it to set the starting points
-        // (the debuggee globals) for the traversal, and to populate
-        // census.debuggeeZones.
-        for (GlobalObjectSet::Range r = debugger->debuggees.all(); !r.empty(); r.popFront()) {
-            if (!census.debuggeeZones.put(r.front()->zone()) ||
-                !traversal.addStart(static_cast<JSObject *>(r.front())))
-                return false;
-        }
-
-        if (!traversal.traverse())
+        if (!traversal.addStart(JS::ubi::Node(&rootList)) ||
+            !traversal.traverse())
+        {
             return false;
+        }
     }
 
     return handler.report(census, args.rval());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ForkJoin.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ForkJoin.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ForkJoin.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ForkJoin.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -1107,30 +1107,26 @@
                 sp.printf(" (%s:%u)", script->filename(), PCToLineNumber(script, frame->pc()));
 
                 // Format bindings.
-                BindingVector bindings(cx_);
-                if (!FillBindingVector(script, &bindings))
-                    return false;
-
                 unsigned scopeSlot = 0;
-                for (unsigned i = 0; i < bindings.length(); i++) {
+                for (BindingIter bi(script); bi; bi++) {
                     JSAutoByteString nameBytes;
                     const char *nameChars = nullptr;
-                    RootedPropertyName bindingName(cx_, bindings[i].name());
+                    RootedPropertyName bindingName(cx_, bi->name());
                     nameChars = nameBytes.encodeUtf8(cx_, bindingName);
                     if (!nameChars)
                         return false;
 
                     RootedValue arg(cx_);
-                    if (bindings[i].aliased()) {
+                    if (bi->aliased()) {
                         arg = frame->callObj().getSlot(scopeSlot);
                         scopeSlot++;
-                    } else if (i < frame->numFormalArgs()) {
+                    } else if (bi->kind() == Binding::ARGUMENT) {
                         if (script->argsObjAliasesFormals() && frame->hasArgsObj())
-                            arg = frame->argsObj().arg(i);
+                            arg = frame->argsObj().arg(bi.argIndex());
                         else
-                            arg = frame->unaliasedActual(i, DONT_CHECK_ALIASING);
+                            arg = frame->unaliasedActual(bi.argIndex(), DONT_CHECK_ALIASING);
                     } else {
-                        arg = frame->unaliasedLocal(i - frame->numFormalArgs());
+                        arg = frame->unaliasedLocal(bi.frameIndex());
                     }
 
                     JSAutoByteString valueBytes;
@@ -1139,7 +1135,7 @@
                         return false;
 
                     sp.printf("\n      %s %s = %s",
-                              bindings[i].kind() == Binding::ARGUMENT ? "arg" : "var",
+                              bi->kind() == Binding::ARGUMENT ? "arg" : "var",
                               nameChars, valueChars);
                 }
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/GeneratorObject.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/GeneratorObject.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/GeneratorObject.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/GeneratorObject.h	2014-11-26 21:46:03.000000000 +0000
@@ -136,8 +136,12 @@
         return getFixedSlot(YIELD_INDEX_SLOT).toInt32() == YIELD_INDEX_CLOSING;
     }
     bool isSuspended() const {
+        // Note: also update Baseline's IsSuspendedStarGenerator code if this
+        // changes.
         MOZ_ASSERT(!isClosed());
-        return !isRunning() && !isClosing();
+        static_assert(YIELD_INDEX_CLOSING < YIELD_INDEX_RUNNING,
+                      "test below should return false for YIELD_INDEX_RUNNING");
+        return getFixedSlot(YIELD_INDEX_SLOT).toInt32() < YIELD_INDEX_CLOSING;
     }
     void setRunning() {
         MOZ_ASSERT(isSuspended());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/HelperThreads.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/HelperThreads.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/HelperThreads.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/HelperThreads.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -365,6 +365,12 @@
     } else {
         task->activate(cx->runtime());
 
+        if (cx->compartment()->isDebuggee()) {
+            task->cx->compartment()->setIsDebuggee();
+            if (cx->compartment()->debugObservesAllExecution())
+                task->cx->compartment()->setDebugObservesAllExecution();
+        }
+
         AutoLockHelperThreadState lock;
 
         if (!HelperThreadState().parseWorklist().append(task.get()))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Interpreter.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Interpreter.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Interpreter.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Interpreter.cpp	2014-11-26 21:46:03.000000000 +0000
@@ -867,7 +867,7 @@
 {
     switch (si.type()) {
       case ScopeIter::Block:
-        if (cx->compartment()->debugMode())
+        if (cx->compartment()->isDebuggee())
             DebugScopes::onPopBlock(cx, si);
         if (si.staticBlock().needsClone())
             si.frame().popBlock(cx);
@@ -1530,7 +1530,7 @@
         moreInterrupts = true;
     }
 
-    if (cx->compartment()->debugMode()) {
+    if (script->isDebuggee()) {
         if (script->stepModeEnabled()) {
             RootedValue rval(cx);
             JSTrapStatus status = JSTRAP_CONTINUE;
@@ -1645,7 +1645,6 @@
 CASE(JSOP_UNUSED191)
 CASE(JSOP_UNUSED192)
 CASE(JSOP_UNUSED196)
-CASE(JSOP_UNUSED208)
 CASE(JSOP_UNUSED209)
 CASE(JSOP_UNUSED210)
 CASE(JSOP_UNUSED211)
@@ -3296,17 +3295,15 @@
 CASE(JSOP_DEBUGGER)
 {
     RootedValue rval(cx);
-    switch (Debugger::onDebuggerStatement(cx, &rval)) {
+    switch (Debugger::onDebuggerStatement(cx, REGS.fp())) {
       case JSTRAP_ERROR:
         goto error;
       case JSTRAP_CONTINUE:
         break;
       case JSTRAP_RETURN:
-        REGS.fp()->setReturnValue(rval);
         ForcedReturn(cx, REGS);
         goto successful_return_continuation;
       case JSTRAP_THROW:
-        cx->setPendingException(rval);
         goto error;
       default:;
     }
@@ -3348,7 +3345,7 @@
     // FIXME: This opcode should not be necessary.  The debugger shouldn't need
     // help from bytecode to do its job.  See bug 927782.
 
-    if (MOZ_UNLIKELY(cx->compartment()->debugMode()))
+    if (MOZ_UNLIKELY(cx->compartment()->isDebuggee()))
         DebugScopes::onPopBlock(cx, REGS.fp(), REGS.pc);
 }
 END_CASE(JSOP_DEBUGLEAVEBLOCK)
@@ -3413,6 +3410,14 @@
     ADVANCE_AND_DISPATCH(0);
 }
 
+CASE(JSOP_DEBUGAFTERYIELD)
+{
+    // No-op in the interpreter, as GeneratorObject::resume takes care of
+    // fixing up InterpreterFrames.
+    MOZ_ASSERT_IF(REGS.fp()->script()->isDebuggee(), REGS.fp()->isDebuggee());
+}
+END_CASE(JSOP_DEBUGAFTERYIELD)
+
 CASE(JSOP_FINALYIELDRVAL)
 {
     RootedObject &gen = rootObject0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/NativeObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/NativeObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/NativeObject.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/NativeObject.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -26,9 +26,6 @@
 using mozilla::DebugOnly;
 using mozilla::RoundUpPow2;
 
-JS_STATIC_ASSERT(int32_t((NativeObject::NELEMENTS_LIMIT - 1) * sizeof(Value)) ==
-                 int64_t((NativeObject::NELEMENTS_LIMIT - 1) * sizeof(Value)));
-
 PropDesc::PropDesc()
 {
     setUndefined();
@@ -122,9 +119,9 @@
 /* static */ bool
 ObjectElements::MakeElementsCopyOnWrite(ExclusiveContext *cx, NativeObject *obj)
 {
-    // Make sure there is enough room for the owner object pointer at the end
-    // of the elements.
-    JS_STATIC_ASSERT(sizeof(HeapSlot) >= sizeof(HeapPtrObject));
+    static_assert(sizeof(HeapSlot) >= sizeof(HeapPtrObject),
+                  "there must be enough room for the owner object pointer at "
+                  "the end of the elements");
     if (!obj->ensureElements(cx, obj->getDenseInitializedLength() + 1))
         return false;
 
@@ -461,6 +458,7 @@
      * the limited number of bits to store shape slots, object growth is
      * throttled well before the slot capacity can overflow.
      */
+    NativeObject::slotsSizeMustNotOverflow();
     MOZ_ASSERT(newCount < NELEMENTS_LIMIT);
 
     if (!oldCount) {
@@ -2055,7 +2053,7 @@
     RootedShape shape(cxArg);
     if (mode == ParallelExecution) {
         NativeObject *npobj;
-        if (!LookupPropertyPure(obj, id, &npobj, shape.address()))
+        if (!LookupPropertyPure(cxArg, obj, id, &npobj, shape.address()))
             return false;
         pobj = npobj;
     } else {
@@ -2311,7 +2309,7 @@
 
         if (!CallJSDeletePropertyOp(cx, obj->getClass()->delProperty, obj, id, succeeded))
             return false;
-        if (!succeeded)
+        if (!*succeeded)
             return true;
 
         NativeObject *nobj = &obj->as<NativeObject>();
@@ -2330,7 +2328,7 @@
     RootedId propid(cx, shape->propid());
     if (!CallJSDeletePropertyOp(cx, obj->getClass()->delProperty, obj, propid, succeeded))
         return false;
-    if (!succeeded)
+    if (!*succeeded)
         return true;
 
     return obj->removeProperty(cx, id) && SuppressDeletedProperty(cx, obj, id);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/NativeObject.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/NativeObject.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/NativeObject.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/NativeObject.h	2014-11-26 21:46:04.000000000 +0000
@@ -550,6 +550,14 @@
     bool shadowingShapeChange(ExclusiveContext *cx, const Shape &shape);
     bool clearFlag(ExclusiveContext *cx, BaseShape::Flag flag);
 
+    static void slotsSizeMustNotOverflow() {
+        static_assert((NativeObject::NELEMENTS_LIMIT - 1) <= INT32_MAX / sizeof(JS::Value),
+                      "every caller of this method requires that a slot "
+                      "number (or slot count) count multiplied by "
+                      "sizeof(Value) can't overflow uint32_t (and sometimes "
+                      "int32_t, too)");
+    }
+
     uint32_t numFixedSlots() const {
         return reinterpret_cast<const shadow::Object *>(this)->numFixedSlots();
     }
@@ -892,6 +900,13 @@
     /* Upper bound on the number of elements in an object. */
     static const uint32_t NELEMENTS_LIMIT = JS_BIT(28);
 
+    static void elementsSizeMustNotOverflow() {
+        static_assert((NativeObject::NELEMENTS_LIMIT - 1) <= INT32_MAX / sizeof(JS::Value),
+                      "every caller of this method require that an element "
+                      "count multiplied by sizeof(Value) can't overflow "
+                      "uint32_t (and sometimes int32_t ,too)");
+    }
+
     ObjectElements * getElementsHeader() const {
         return ObjectElements::fromElements(elements_);
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Opcodes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Opcodes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Opcodes.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Opcodes.h	2014-11-26 21:46:04.000000000 +0000
@@ -72,6 +72,7 @@
  *     Logical Operators
  *     Special Operators
  *     Stack Operations
+ *     Debugger
  *   [Literals]
  *     Constants
  *     Object
@@ -1619,7 +1620,16 @@
      */ \
     macro(JSOP_FORCEINTERPRETER, 207, "forceinterpreter", NULL,  1,  0,  0,  JOF_BYTE) \
     \
-    macro(JSOP_UNUSED208,     208, "unused208",    NULL,  1,  0,  0,  JOF_BYTE) \
+    /*
+     * Bytecode emitted after 'yield' expressions to help the Debugger
+     * fix up the frame in the JITs. No-op in the interpreter.
+     *
+     *   Category: Operator
+     *   Type: Debugger
+     *   Operands:
+     *   Stack: =>
+     */ \
+    macro(JSOP_DEBUGAFTERYIELD,  208, "debugafteryield",  NULL,  1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED209,     209, "unused209",    NULL,  1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED210,     210, "unused210",    NULL,  1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED211,     211, "unused211",    NULL,  1,  0,  0,  JOF_BYTE) \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Runtime.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Runtime.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Runtime.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Runtime.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -259,10 +259,11 @@
     // Get a platform-native handle for the owner thread, used by
     // js::InterruptRunningJitCode to halt the runtime's main thread.
 #ifdef XP_WIN
-    size_t openFlags = THREAD_GET_CONTEXT | THREAD_SET_CONTEXT | THREAD_SUSPEND_RESUME;
+    size_t openFlags = THREAD_GET_CONTEXT | THREAD_SET_CONTEXT | THREAD_SUSPEND_RESUME |
+                       THREAD_QUERY_INFORMATION;
     HANDLE self = OpenThread(openFlags, false, GetCurrentThreadId());
     if (!self)
-        MOZ_CRASH("Unable to open thread handle");
+        return false;
     static_assert(sizeof(HANDLE) <= sizeof(ownerThreadNative_), "need bigger field");
     ownerThreadNative_ = (size_t)self;
 #else
@@ -545,7 +546,7 @@
     if (cb(cx)) {
         // Debugger treats invoking the interrupt callback as a "step", so
         // invoke the onStep handler.
-        if (cx->compartment()->debugMode()) {
+        if (cx->compartment()->isDebuggee()) {
             ScriptFrameIter iter(cx);
             if (iter.script()->stepModeEnabled()) {
                 RootedValue rval(cx);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Runtime.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Runtime.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Runtime.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Runtime.h	2014-11-26 21:46:04.000000000 +0000
@@ -364,14 +364,15 @@
 class FreeOp : public JSFreeOp
 {
     Vector<void *, 0, SystemAllocPolicy> freeLaterList;
+    ThreadType threadType;
 
   public:
     static FreeOp *get(JSFreeOp *fop) {
         return static_cast<FreeOp *>(fop);
     }
 
-    explicit FreeOp(JSRuntime *rt)
-      : JSFreeOp(rt)
+    explicit FreeOp(JSRuntime *rt, ThreadType thread = MainThread)
+      : JSFreeOp(rt), threadType(thread)
     {}
 
     ~FreeOp() {
@@ -379,6 +380,10 @@
             free_(freeLaterList[i]);
     }
 
+    bool onBackgroundThread() {
+        return threadType == BackgroundThread;
+    }
+
     inline void free_(void *p);
     inline void freeLater(void *p);
 
@@ -1489,42 +1494,72 @@
         CrashAtUnhandlableOOM("FreeOp::freeLater");
 }
 
-class AutoLockGC
+/*
+ * RAII class that takes the GC lock while it is live.
+ *
+ * Note that the lock may be temporarily released by use of AutoUnlockGC when
+ * passed a non-const reference to this class.
+ */
+class MOZ_STACK_CLASS AutoLockGC
 {
   public:
     explicit AutoLockGC(JSRuntime *rt
                         MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
-      : runtime(rt)
+      : runtime_(rt), wasUnlocked_(false)
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-        rt->lockGC();
+        lock();
     }
 
-    ~AutoLockGC()
-    {
-        runtime->unlockGC();
+    ~AutoLockGC() {
+        unlock();
     }
 
+    void lock() {
+        runtime_->lockGC();
+    }
+
+    void unlock() {
+        runtime_->unlockGC();
+        wasUnlocked_ = true;
+    }
+
+#ifdef DEBUG
+    bool wasUnlocked() {
+        return wasUnlocked_;
+    }
+#endif
+
   private:
-    JSRuntime *runtime;
+    JSRuntime *runtime_;
+    mozilla::DebugOnly<bool> wasUnlocked_;
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+
+    AutoLockGC(const AutoLockGC&) MOZ_DELETE;
+    AutoLockGC& operator=(const AutoLockGC&) MOZ_DELETE;
 };
 
-class AutoUnlockGC
+class MOZ_STACK_CLASS AutoUnlockGC
 {
-  private:
-    JSRuntime *rt;
-    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
-
   public:
-    explicit AutoUnlockGC(JSRuntime *rt
+    explicit AutoUnlockGC(AutoLockGC& lock
                           MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
-      : rt(rt)
+      : lock(lock)
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-        rt->unlockGC();
+        lock.unlock();
     }
-    ~AutoUnlockGC() { rt->lockGC(); }
+
+    ~AutoUnlockGC() {
+        lock.lock();
+    }
+
+  private:
+    AutoLockGC& lock;
+    MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+
+    AutoUnlockGC(const AutoUnlockGC&) MOZ_DELETE;
+    AutoUnlockGC& operator=(const AutoUnlockGC&) MOZ_DELETE;
 };
 
 class MOZ_STACK_CLASS AutoKeepAtoms
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ScopeObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ScopeObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ScopeObject.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ScopeObject.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1252,7 +1252,7 @@
         MOZ_ASSERT(!cur_->is<ScopeObject>() ||
                    (cur_->is<DynamicWithObject>() &&
                     !cur_->as<DynamicWithObject>().isSyntactic()));
-        MOZ_ASSERT(frame_.isGlobalFrame() || frame_.isDebuggerFrame());
+        MOZ_ASSERT(frame_.isGlobalFrame() || frame_.isDebuggerEvalFrame());
         frame_ = NullFramePtr();
     }
 }
@@ -1755,7 +1755,7 @@
         return getScopePropertyNames(cx, proxy, props, JSITER_OWNONLY);
     }
 
-    bool enumerate(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE
+    bool getEnumerablePropertyKeys(JSContext *cx, HandleObject proxy, AutoIdVector &props) const MOZ_OVERRIDE
     {
         return getScopePropertyNames(cx, proxy, props, 0);
     }
@@ -2052,14 +2052,14 @@
 /*
  * Unfortunately, GetDebugScopeForFrame needs to work even outside debug mode
  * (in particular, JS_GetFrameScopeChain does not require debug mode). Since
- * DebugScopes::onPop* are only called in debug mode, this means we cannot
- * use any of the maps in DebugScopes. This will produce debug scope chains
- * that do not obey the debugger invariants but that is just fine.
+ * DebugScopes::onPop* are only called in debuggee frames, this means we
+ * cannot use any of the maps in DebugScopes. This will produce debug scope
+ * chains that do not obey the debugger invariants but that is just fine.
  */
 static bool
 CanUseDebugScopeMaps(JSContext *cx)
 {
-    return cx->compartment()->debugMode();
+    return cx->compartment()->isDebuggee();
 }
 
 DebugScopes *
@@ -2306,7 +2306,7 @@
 }
 
 void
-DebugScopes::onCompartmentLeaveDebugMode(JSCompartment *c)
+DebugScopes::onCompartmentUnsetIsDebuggee(JSCompartment *c)
 {
     DebugScopes *scopes = c->debugScopes;
     if (scopes) {
@@ -2343,6 +2343,9 @@
         if (frame.isFunctionFrame() && frame.callee()->isGenerator())
             continue;
 
+        if (!frame.isDebuggee())
+            continue;
+
         for (ScopeIter si(frame, i.pc(), cx); !si.done(); ++si) {
             if (si.hasScopeObject()) {
                 MOZ_ASSERT(si.scope().compartment() == cx->compartment());
@@ -2357,7 +2360,7 @@
 
         if (frame.prevUpToDate())
             return true;
-        MOZ_ASSERT(frame.scopeChain()->compartment()->debugMode());
+        MOZ_ASSERT(frame.scopeChain()->compartment()->isDebuggee());
         frame.setPrevUpToDate();
     }
 
@@ -2377,6 +2380,22 @@
     return nullptr;
 }
 
+/* static */ void
+DebugScopes::rekeyMissingScopes(JSContext *cx, AbstractFramePtr from, AbstractFramePtr to)
+{
+    DebugScopes *scopes = cx->compartment()->debugScopes;
+    if (!scopes)
+        return;
+
+    for (MissingScopeMap::Enum e(scopes->missingScopes); !e.empty(); e.popFront()) {
+        ScopeIterKey key = e.front().key();
+        if (key.frame() == from) {
+            key.updateFrame(to);
+            e.rekeyFront(key);
+        }
+    }
+}
+
 /*****************************************************************************/
 
 static JSObject *
@@ -2524,7 +2543,7 @@
 js::GetDebugScopeForFunction(JSContext *cx, HandleFunction fun)
 {
     assertSameCompartment(cx, fun);
-    MOZ_ASSERT(cx->compartment()->debugMode());
+    MOZ_ASSERT(CanUseDebugScopeMaps(cx));
     if (!DebugScopes::updateLiveScopes(cx))
         return nullptr;
     return GetDebugScope(cx, *fun->environment());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ScopeObject.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ScopeObject.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/ScopeObject.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/ScopeObject.h	2014-11-26 21:46:04.000000000 +0000
@@ -67,16 +67,24 @@
     StaticScopeIter(ExclusiveContext *cx, JSObject *obj)
       : obj(cx, obj), onNamedLambda(false)
     {
-        JS_STATIC_ASSERT(allowGC == CanGC);
-        MOZ_ASSERT_IF(obj, obj->is<StaticBlockObject>() || obj->is<StaticWithObject>() ||
+        static_assert(allowGC == CanGC,
+                      "the context-accepting constructor should only be used "
+                      "in CanGC code");
+        MOZ_ASSERT_IF(obj,
+                      obj->is<StaticBlockObject>() ||
+                      obj->is<StaticWithObject>() ||
                       obj->is<JSFunction>());
     }
 
     explicit StaticScopeIter(JSObject *obj)
       : obj((ExclusiveContext *) nullptr, obj), onNamedLambda(false)
     {
-        JS_STATIC_ASSERT(allowGC == NoGC);
-        MOZ_ASSERT_IF(obj, obj->is<StaticBlockObject>() || obj->is<StaticWithObject>() ||
+        static_assert(allowGC == NoGC,
+                      "the constructor not taking a context should only be "
+                      "used in NoGC code");
+        MOZ_ASSERT_IF(obj,
+                      obj->is<StaticBlockObject>() ||
+                      obj->is<StaticWithObject>() ||
                       obj->is<JSFunction>());
     }
 
@@ -766,6 +774,7 @@
 
     void updateCur(JSObject *obj) { cur_ = obj; }
     void updateStaticScope(NestedScopeObject *obj) { staticScope_ = obj; }
+    void updateFrame(AbstractFramePtr frame) { frame_ = frame; }
 
     /* For use as hash policy */
     typedef ScopeIterKey Lookup;
@@ -933,6 +942,8 @@
     static bool updateLiveScopes(JSContext *cx);
     static ScopeIterVal *hasLiveScope(ScopeObject &scope);
 
+    static void rekeyMissingScopes(JSContext *cx, AbstractFramePtr from, AbstractFramePtr to);
+
     // In debug-mode, these must be called whenever exiting a scope that might
     // have stack-allocated locals.
     static void onPopCall(AbstractFramePtr frame, JSContext *cx);
@@ -940,7 +951,7 @@
     static void onPopBlock(JSContext *cx, AbstractFramePtr frame, jsbytecode *pc);
     static void onPopWith(AbstractFramePtr frame);
     static void onPopStrictEvalScope(AbstractFramePtr frame);
-    static void onCompartmentLeaveDebugMode(JSCompartment *c);
+    static void onCompartmentUnsetIsDebuggee(JSCompartment *c);
 };
 
 }  /* namespace js */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/SelfHosting.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/SelfHosting.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/SelfHosting.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/SelfHosting.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -120,6 +120,26 @@
     return true;
 }
 
+bool
+js::intrinsic_SubstringKernel(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args[0].isString());
+    MOZ_ASSERT(args[1].isInt32());
+    MOZ_ASSERT(args[2].isInt32());
+
+    RootedString str(cx, args[0].toString());
+    int32_t begin = args[1].toInt32();
+    int32_t length = args[2].toInt32();
+
+    JSString *substr = SubstringKernel(cx, str, begin, length);
+    if (!substr)
+        return false;
+
+    args.rval().setString(substr);
+    return true;
+}
+
 static bool
 intrinsic_OwnPropertyKeys(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -681,6 +701,22 @@
     return true;
 }
 
+bool
+js::intrinsic_IsSuspendedStarGenerator(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 1);
+
+    if (!args[0].isObject() || !args[0].toObject().is<StarGeneratorObject>()) {
+        args.rval().setBoolean(false);
+        return true;
+    }
+
+    StarGeneratorObject &genObj = args[0].toObject().as<StarGeneratorObject>();
+    args.rval().setBoolean(!genObj.isClosed() && genObj.isSuspended());
+    return true;
+}
+
 static bool
 intrinsic_IsLegacyGeneratorObject(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -992,7 +1028,6 @@
     JS_FN("std_String_replace",                  str_replace,                  2,0),
     JS_FN("std_String_split",                    str_split,                    2,0),
     JS_FN("std_String_startsWith",               str_startsWith,               1,0),
-    JS_FN("std_String_substring",                str_substring,                2,0),
     JS_FN("std_String_toLowerCase",              str_toLowerCase,              0,0),
     JS_FN("std_String_toUpperCase",              str_toUpperCase,              0,0),
 
@@ -1017,6 +1052,7 @@
     JS_FN("_IsConstructing",         intrinsic_IsConstructing,          0,0),
     JS_FN("DecompileArg",            intrinsic_DecompileArg,            2,0),
     JS_FN("RuntimeDefaultLocale",    intrinsic_RuntimeDefaultLocale,    0,0),
+    JS_FN("SubstringKernel",         intrinsic_SubstringKernel,         3,0),
 
     JS_FN("UnsafePutElements",       intrinsic_UnsafePutElements,       3,0),
     JS_FN("_DefineDataProperty",     intrinsic_DefineDataProperty,      4,0),
@@ -1035,6 +1071,7 @@
 
     JS_FN("IsStarGeneratorObject",   intrinsic_IsStarGeneratorObject,   1,0),
     JS_FN("StarGeneratorObjectIsClosed", intrinsic_StarGeneratorObjectIsClosed, 1,0),
+    JS_FN("IsSuspendedStarGenerator",intrinsic_IsSuspendedStarGenerator,1,0),
 
     JS_FN("IsLegacyGeneratorObject", intrinsic_IsLegacyGeneratorObject, 1,0),
     JS_FN("LegacyGeneratorObjectIsClosed", intrinsic_LegacyGeneratorObjectIsClosed, 1,0),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Shape.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Shape.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Shape.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Shape.h	2014-11-26 21:46:04.000000000 +0000
@@ -588,7 +588,7 @@
     HeapPtrBaseShape    base_;
     PreBarrieredId      propid_;
 
-    JS_ENUM_HEADER(SlotInfo, uint32_t)
+    enum SlotInfo : uint32_t
     {
         /* Number of fixed slots in objects with this shape. */
         // FIXED_SLOTS_MAX is the biggest count of fixed slots a Shape can store
@@ -613,7 +613,7 @@
          * other shapes.
          */
         SLOT_MASK              = JS_BIT(24) - 1
-    } JS_ENUM_FOOTER(SlotInfo);
+    };
 
     uint32_t            slotInfo;       /* mask of above info */
     uint8_t             attrs;          /* attributes, see jsapi.h JSPROP_* */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Stack.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Stack.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Stack.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Stack.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -84,9 +84,12 @@
     prevpc_ = nullptr;
     prevsp_ = nullptr;
 
-    MOZ_ASSERT_IF(evalInFramePrev, isDebuggerFrame());
+    MOZ_ASSERT_IF(evalInFramePrev, isDebuggerEvalFrame());
     evalInFramePrev_ = evalInFramePrev;
 
+    if (script->isDebuggee())
+        setIsDebuggee();
+
 #ifdef DEBUG
     Debug_SetValueRangeToCrashOnTouch(&rval_, 1);
 #endif
@@ -229,10 +232,10 @@
     if (isEvalFrame()) {
         if (isStrictEvalFrame()) {
             MOZ_ASSERT_IF(hasCallObj(), scopeChain()->as<CallObject>().isForEval());
-            if (MOZ_UNLIKELY(cx->compartment()->debugMode()))
+            if (MOZ_UNLIKELY(cx->compartment()->isDebuggee()))
                 DebugScopes::onPopStrictEvalScope(this);
         } else if (isDirectEvalFrame()) {
-            if (isDebuggerFrame())
+            if (isDebuggerEvalFrame())
                 MOZ_ASSERT(!scopeChain()->is<ScopeObject>());
         } else {
             /*
@@ -242,7 +245,7 @@
              * indirect eval frames scoped to an object carrying the introduced
              * bindings.
              */
-            if (isDebuggerFrame()) {
+            if (isDebuggerEvalFrame()) {
                 MOZ_ASSERT(scopeChain()->is<GlobalObject>() ||
                            scopeChain()->enclosingScope()->is<GlobalObject>());
             } else {
@@ -268,7 +271,7 @@
         AssertDynamicScopeMatchesStaticScope(cx, script, scopeChain());
     }
 
-    if (MOZ_UNLIKELY(cx->compartment()->debugMode()))
+    if (MOZ_UNLIKELY(cx->compartment()->isDebuggee()))
         DebugScopes::onPopCall(this, cx);
 
     if (isConstructing() && thisValue().isObject() && returnValue().isPrimitive())
@@ -300,7 +303,7 @@
 void
 InterpreterFrame::popWith(JSContext *cx)
 {
-    if (MOZ_UNLIKELY(cx->compartment()->debugMode()))
+    if (MOZ_UNLIKELY(cx->compartment()->isDebuggee()))
         DebugScopes::onPopWith(this);
 
     MOZ_ASSERT(scopeChain()->is<DynamicWithObject>());
@@ -708,9 +711,8 @@
       case DONE:
         MOZ_CRASH("Unexpected state");
       case INTERP:
-        if (interpFrame()->isDebuggerFrame() && interpFrame()->evalInFramePrev()) {
+        if (interpFrame()->isDebuggerEvalFrame() && interpFrame()->evalInFramePrev()) {
             AbstractFramePtr eifPrev = interpFrame()->evalInFramePrev();
-            MOZ_ASSERT(!eifPrev.isRematerializedFrame());
 
             // Eval-in-frame can cross contexts and works across saved frame
             // chains.
@@ -721,7 +723,7 @@
 
             popInterpreterFrame();
 
-            while (isIon() || abstractFramePtr() != eifPrev) {
+            while (!hasUsableAbstractFramePtr() || abstractFramePtr() != eifPrev) {
                 if (data_.state_ == JIT)
                     popJitFrame();
                 else
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Stack.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Stack.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Stack.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Stack.h	2014-11-26 21:46:04.000000000 +0000
@@ -184,7 +184,7 @@
     inline bool isFunctionFrame() const;
     inline bool isGlobalFrame() const;
     inline bool isEvalFrame() const;
-    inline bool isDebuggerFrame() const;
+    inline bool isDebuggerEvalFrame() const;
 
     inline JSScript *script() const;
     inline JSFunction *fun() const;
@@ -218,6 +218,10 @@
     inline bool prevUpToDate() const;
     inline void setPrevUpToDate() const;
 
+    inline bool isDebuggee() const;
+    inline void setIsDebuggee();
+    inline void unsetIsDebuggee();
+
     JSObject *evalPrevScopeChain(JSContext *cx) const;
 
     inline HandleValue returnValue() const;
@@ -279,7 +283,7 @@
          *   previous frame in memory. Iteration should treat
          *   evalInFramePrev_ as this frame's previous frame.
          */
-        DEBUGGER           =        0x8,
+        DEBUGGER_EVAL      =        0x8,
 
         CONSTRUCTING       =       0x10,  /* frame is for a constructor invocation */
 
@@ -296,17 +300,23 @@
         /* Debugger state */
         PREV_UP_TO_DATE    =     0x4000,  /* see DebugScopes::updateLiveScopes */
 
+        /*
+         * See comment above 'debugMode' in jscompartment.h for explanation of
+         * invariants of debuggee compartments, scripts, and frames.
+         */
+        DEBUGGEE           =     0x8000,  /* Execution is being observed by Debugger */
+
         /* Used in tracking calls and profiling (see vm/SPSProfiler.cpp) */
-        HAS_PUSHED_SPS_FRAME =   0x8000,  /* SPS was notified of enty */
+        HAS_PUSHED_SPS_FRAME =   0x10000, /* SPS was notified of enty */
 
         /*
          * If set, we entered one of the JITs and ScriptFrameIter should skip
          * this frame.
          */
-        RUNNING_IN_JIT     =    0x10000,
+        RUNNING_IN_JIT     =    0x20000,
 
         /* Miscellaneous state. */
-        USE_NEW_TYPE       =    0x20000   /* Use new type for constructed |this| object. */
+        USE_NEW_TYPE       =    0x40000   /* Use new type for constructed |this| object. */
     };
 
   private:
@@ -335,8 +345,8 @@
     void                *unused;
 
     /*
-     * For an eval-in-frame DEBUGGER frame, the frame in whose scope we're
-     * evaluating code. Iteration treats this as our previous frame.
+     * For an eval-in-frame DEBUGGER_EVAL frame, the frame in whose scope
+     * we're evaluating code. Iteration treats this as our previous frame.
      */
     AbstractFramePtr    evalInFramePrev_;
 
@@ -811,8 +821,8 @@
         return flags_ & USE_NEW_TYPE;
     }
 
-    bool isDebuggerFrame() const {
-        return !!(flags_ & DEBUGGER);
+    bool isDebuggerEvalFrame() const {
+        return !!(flags_ & DEBUGGER_EVAL);
     }
 
     bool prevUpToDate() const {
@@ -823,6 +833,16 @@
         flags_ |= PREV_UP_TO_DATE;
     }
 
+    bool isDebuggee() const {
+        return !!(flags_ & DEBUGGEE);
+    }
+
+    void setIsDebuggee() {
+        flags_ |= DEBUGGEE;
+    }
+
+    inline void unsetIsDebuggee();
+
   public:
     void mark(JSTracer *trc);
     void markValues(JSTracer *trc, unsigned start, unsigned end);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Stack-inl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Stack-inl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Stack-inl.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Stack-inl.h	2014-11-26 21:46:04.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/PodOperations.h"
 
 #include "jscntxt.h"
+#include "jsscript.h"
 
 #include "jit/BaselineFrame.h"
 #include "jit/RematerializedFrame.h"
@@ -19,6 +20,7 @@
 #include "vm/ScopeObject.h"
 
 #include "jsobjinlines.h"
+#include "jsscriptinlines.h"
 
 #include "jit/BaselineFrame-inl.h"
 
@@ -89,6 +91,9 @@
     prevpc_ = prevpc;
     prevsp_ = prevsp;
 
+    if (script->isDebuggee())
+        setIsDebuggee();
+
     initLocals();
 }
 
@@ -220,6 +225,13 @@
     return pobj->as<CallObject>();
 }
 
+inline void
+InterpreterFrame::unsetIsDebuggee()
+{
+    MOZ_ASSERT(!script()->isDebuggee());
+    flags_ &= ~DEBUGGEE;
+}
+
 /*****************************************************************************/
 
 inline void
@@ -558,18 +570,51 @@
     MOZ_ASSERT(isRematerializedFrame());
     return false;
 }
+
 inline bool
-AbstractFramePtr::isDebuggerFrame() const
+AbstractFramePtr::isDebuggerEvalFrame() const
 {
     if (isInterpreterFrame())
-        return asInterpreterFrame()->isDebuggerFrame();
+        return asInterpreterFrame()->isDebuggerEvalFrame();
     if (isBaselineFrame())
-        return asBaselineFrame()->isDebuggerFrame();
+        return asBaselineFrame()->isDebuggerEvalFrame();
     MOZ_ASSERT(isRematerializedFrame());
     return false;
 }
 
 inline bool
+AbstractFramePtr::isDebuggee() const
+{
+    if (isInterpreterFrame())
+        return asInterpreterFrame()->isDebuggee();
+    if (isBaselineFrame())
+        return asBaselineFrame()->isDebuggee();
+    return asRematerializedFrame()->isDebuggee();
+}
+
+inline void
+AbstractFramePtr::setIsDebuggee()
+{
+    if (isInterpreterFrame())
+        asInterpreterFrame()->setIsDebuggee();
+    else if (isBaselineFrame())
+        asBaselineFrame()->setIsDebuggee();
+    else
+        asRematerializedFrame()->setIsDebuggee();
+}
+
+inline void
+AbstractFramePtr::unsetIsDebuggee()
+{
+    if (isInterpreterFrame())
+        asInterpreterFrame()->unsetIsDebuggee();
+    else if (isBaselineFrame())
+        asBaselineFrame()->unsetIsDebuggee();
+    else
+        asRematerializedFrame()->unsetIsDebuggee();
+}
+
+inline bool
 AbstractFramePtr::hasArgs() const {
     return isNonEvalFunctionFrame();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/String.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/String.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/String.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/String.h	2014-11-26 21:46:04.000000000 +0000
@@ -475,6 +475,9 @@
     }
 
     static size_t offsetOfNonInlineChars() {
+        static_assert(offsetof(JSString, d.s.u2.nonInlineCharsTwoByte) ==
+                      offsetof(JSString, d.s.u2.nonInlineCharsLatin1),
+                      "nonInlineCharsTwoByte and nonInlineCharsLatin1 must have same offset");
         return offsetof(JSString, d.s.u2.nonInlineCharsTwoByte);
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/StructuredClone.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/StructuredClone.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/StructuredClone.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/StructuredClone.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -50,6 +50,7 @@
 
 using namespace js;
 
+using mozilla::BitwiseCast;
 using mozilla::IsNaN;
 using mozilla::LittleEndian;
 using mozilla::NativeEndian;
@@ -204,7 +205,6 @@
     void staticAssertions() {
         JS_STATIC_ASSERT(sizeof(char16_t) == 2);
         JS_STATIC_ASSERT(sizeof(uint32_t) == 4);
-        JS_STATIC_ASSERT(sizeof(double) == 8);
     }
 
     JSContext *cx;
@@ -634,38 +634,16 @@
     return write(PairToUInt64(tag, data));
 }
 
-static inline uint64_t
-ReinterpretDoubleAsUInt64(double d)
-{
-    union {
-        double d;
-        uint64_t u;
-    } pun;
-    pun.d = d;
-    return pun.u;
-}
-
-static inline double
-ReinterpretUInt64AsDouble(uint64_t u)
-{
-    union {
-        uint64_t u;
-        double d;
-    } pun;
-    pun.u = u;
-    return pun.d;
-}
-
 static inline double
 ReinterpretPairAsDouble(uint32_t tag, uint32_t data)
 {
-    return ReinterpretUInt64AsDouble(PairToUInt64(tag, data));
+    return BitwiseCast<double>(PairToUInt64(tag, data));
 }
 
 bool
 SCOutput::writeDouble(double d)
 {
-    return write(ReinterpretDoubleAsUInt64(CanonicalizeNaN(d)));
+    return write(BitwiseCast<uint64_t>(CanonicalizeNaN(d)));
 }
 
 template <typename T>
@@ -718,7 +696,9 @@
 bool
 SCOutput::writeChars(const char16_t *p, size_t nchars)
 {
-    MOZ_ASSERT(sizeof(char16_t) == sizeof(uint16_t));
+    static_assert(sizeof(char16_t) == sizeof(uint16_t),
+                  "required so that treating char16_t[] memory as uint16_t[] "
+                  "memory is permissible");
     return writeArray((const uint16_t *) p, nchars);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/TypedArrayCommon.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/TypedArrayCommon.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/TypedArrayCommon.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/TypedArrayCommon.h	2014-11-26 21:46:04.000000000 +0000
@@ -160,13 +160,16 @@
             return true;
         }
 
+#ifdef __arm__
+#  define JS_VOLATILE_ARM volatile // Inhibit unaligned accesses on ARM.
+#else
+#  define JS_VOLATILE_ARM /* nothing */
+#endif
+
         void *data = source->viewData();
         switch (source->type()) {
           case Scalar::Int8: {
-#ifdef __arm__
-            // NB: Using volatile to fix unaligned access on ARM
-            volatile
-#endif
+            JS_VOLATILE_ARM
             int8_t *src = static_cast<int8_t*>(data);
 
             for (uint32_t i = 0; i < count; ++i)
@@ -175,42 +178,49 @@
           }
           case Scalar::Uint8:
           case Scalar::Uint8Clamped: {
+            JS_VOLATILE_ARM
             uint8_t *src = static_cast<uint8_t*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
             break;
           }
           case Scalar::Int16: {
+            JS_VOLATILE_ARM
             int16_t *src = static_cast<int16_t*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
             break;
           }
           case Scalar::Uint16: {
+            JS_VOLATILE_ARM
             uint16_t *src = static_cast<uint16_t*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
             break;
           }
           case Scalar::Int32: {
+            JS_VOLATILE_ARM
             int32_t *src = static_cast<int32_t*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
             break;
           }
           case Scalar::Uint32: {
+            JS_VOLATILE_ARM
             uint32_t *src = static_cast<uint32_t*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
             break;
           }
           case Scalar::Float32: {
+            JS_VOLATILE_ARM
             float *src = static_cast<float*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
             break;
           }
           case Scalar::Float64: {
+            JS_VOLATILE_ARM
             double *src = static_cast<double*>(data);
             for (uint32_t i = 0; i < count; ++i)
                 *dest++ = T(*src++);
@@ -220,6 +230,8 @@
             MOZ_CRASH("setFromTypedArray with a typed array with bogus type");
         }
 
+#undef JS_VOLATILE_ARM
+
         return true;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/TypedArrayObject.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/TypedArrayObject.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/TypedArrayObject.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/TypedArrayObject.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -125,13 +125,25 @@
 }
 
 /* static */ void
-TypedArrayObject::ObjectMoved(JSObject *dstArg, const JSObject *srcArg)
+TypedArrayObject::trace(JSTracer *trc, JSObject *objArg)
 {
-    const TypedArrayObject &src = srcArg->as<TypedArrayObject>();
-    TypedArrayObject &dst = dstArg->as<TypedArrayObject>();
-    if (!src.hasBuffer()) {
-        MOZ_ASSERT(src.getPrivate() == src.fixedData(FIXED_DATA_START));
-        dst.setPrivate(dst.fixedData(FIXED_DATA_START));
+    // Handle all tracing required when the object has a buffer.
+    ArrayBufferViewObject::trace(trc, objArg);
+
+    // If the typed array doesn't have a buffer, it must have a lazy buffer and
+    // its data pointer must point to its inline data. Watch for cases where
+    // the GC moved this object and fix up its data pointer.
+    TypedArrayObject &obj = objArg->as<TypedArrayObject>();
+    if (!obj.hasBuffer() && obj.getPrivate() != obj.fixedData(FIXED_DATA_START)) {
+        void *oldData = obj.getPrivate();
+        void *newData = obj.fixedData(FIXED_DATA_START);
+
+        obj.setPrivateUnbarriered(newData);
+
+        // If this is a minor GC, set a forwarding pointer for the array data.
+        // This can always be done inline, as AllocKindForLazyBuffer ensures
+        // there is at least a pointer's worth of inline data.
+        trc->runtime()->gc.nursery.maybeSetForwardingPointer(trc, oldData, newData, true);
     }
 }
 
@@ -354,6 +366,12 @@
 
         if (buffer) {
             obj->initPrivate(buffer->dataPointer() + byteOffset);
+
+            // If the buffer is for an inline typed object, the data pointer
+            // may be in the nursery, so include a barrier to make sure this
+            // object is updated if that typed object moves.
+            if (!IsInsideNursery(obj) && cx->runtime()->gc.nursery.isInside(buffer->dataPointer()))
+                cx->runtime()->gc.storeBuffer.putWholeCellFromMainThread(obj);
         } else {
             void *data = obj->fixedData(FIXED_DATA_START);
             obj->initPrivate(data);
@@ -581,9 +599,8 @@
     static bool
     maybeCreateArrayBuffer(JSContext *cx, uint32_t nelements, MutableHandle<ArrayBufferObject *> buffer)
     {
-        // Make sure that array elements evenly divide into the inline buffer's
-        // size, for the test below.
-        JS_STATIC_ASSERT((INLINE_BUFFER_LIMIT / sizeof(NativeType)) * sizeof(NativeType) == INLINE_BUFFER_LIMIT);
+        static_assert(INLINE_BUFFER_LIMIT % sizeof(NativeType) == 0,
+                      "ArrayBuffer inline storage shouldn't waste any space");
 
         if (nelements <= INLINE_BUFFER_LIMIT / sizeof(NativeType)) {
             // The array's data can be inline, and the buffer created lazily.
@@ -596,8 +613,12 @@
             return false;
         }
 
-        buffer.set(ArrayBufferObject::create(cx, nelements * sizeof(NativeType)));
-        return !!buffer;
+        ArrayBufferObject *buf = ArrayBufferObject::create(cx, nelements * sizeof(NativeType));
+        if (!buf)
+            return false;
+
+        buffer.set(buf);
+        return true;
     }
 
     static JSObject *
@@ -844,7 +865,9 @@
 Value
 TypedArrayObjectTemplate<NativeType>::getIndexValue(JSObject *tarray, uint32_t index)
 {
-    JS_STATIC_ASSERT(sizeof(NativeType) < 4);
+    static_assert(sizeof(NativeType) < 4,
+                  "this method must only handle NativeType values that are "
+                  "always exact int32_t values");
 
     return Int32Value(getIndex(tarray, index));
 }
@@ -962,6 +985,11 @@
     dvobj.initPrivate(arrayBuffer->dataPointer() + byteOffset);
     MOZ_ASSERT(byteOffset + byteLength <= arrayBuffer->byteLength());
 
+    // Include a barrier if the data view's data pointer is in the nursery, as
+    // is done for typed arrays.
+    if (!IsInsideNursery(obj) && cx->runtime()->gc.nursery.isInside(arrayBuffer->dataPointer()))
+        cx->runtime()->gc.storeBuffer.putWholeCellFromMainThread(obj);
+
     // Verify that the private slot is at the expected place
     MOZ_ASSERT(dvobj.numFixedSlots() == TypedArrayLayout::DATA_SLOT);
 
@@ -1742,15 +1770,8 @@
     nullptr,                 /* call        */                                 \
     nullptr,                 /* hasInstance */                                 \
     nullptr,                 /* construct   */                                 \
-    ArrayBufferViewObject::trace, /* trace  */                                 \
-    TYPED_ARRAY_CLASS_SPEC(_typedArray),                                       \
-    {                                                                          \
-        nullptr,             /* outerObject */                                 \
-        nullptr,             /* innerObject */                                 \
-        false,               /* isWrappedNative */                             \
-        nullptr,             /* weakmapKeyDelegateOp */                        \
-        TypedArrayObject::ObjectMoved                                          \
-    }                                                                          \
+    TypedArrayObject::trace, /* trace  */                                      \
+    TYPED_ARRAY_CLASS_SPEC(_typedArray)                                        \
 }
 
 const Class TypedArrayObject::classes[Scalar::TypeMax] = {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/TypedArrayObject.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/TypedArrayObject.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/TypedArrayObject.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/TypedArrayObject.h	2014-11-26 21:46:04.000000000 +0000
@@ -182,7 +182,7 @@
         return layout_;
     }
 
-    static void ObjectMoved(JSObject *obj, const JSObject *old);
+    static void trace(JSTracer *trc, JSObject *obj);
 
     /* Initialization bits */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/UbiNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/UbiNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/UbiNode.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/UbiNode.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -16,23 +16,30 @@
 #include "jsscript.h"
 
 #include "jit/IonCode.h"
+#include "js/Debug.h"
 #include "js/TracingAPI.h"
 #include "js/TypeDecls.h"
 #include "js/Utility.h"
 #include "js/Vector.h"
+#include "vm/GlobalObject.h"
 #include "vm/ScopeObject.h"
 #include "vm/Shape.h"
 #include "vm/String.h"
 #include "vm/Symbol.h"
 
 #include "jsobjinlines.h"
+#include "vm/Debugger-inl.h"
 
+using mozilla::Some;
 using JS::HandleValue;
 using JS::Value;
+using JS::ZoneSet;
 using JS::ubi::Concrete;
 using JS::ubi::Edge;
 using JS::ubi::EdgeRange;
 using JS::ubi::Node;
+using JS::ubi::SimpleEdge;
+using JS::ubi::SimpleEdgeVector;
 using JS::ubi::TracerConcrete;
 using JS::ubi::TracerConcreteWithCompartment;
 
@@ -103,42 +110,6 @@
     return v;
 }
 
-// A dumb Edge concrete class. All but the most essential members have the
-// default behavior.
-class SimpleEdge : public Edge {
-    SimpleEdge(SimpleEdge &) MOZ_DELETE;
-    SimpleEdge &operator=(const SimpleEdge &) MOZ_DELETE;
-
-  public:
-    SimpleEdge() : Edge() { }
-
-    // Construct an initialized SimpleEdge, taking ownership of |name|.
-    SimpleEdge(char16_t *name, const Node &referent) {
-        this->name = name;
-        this->referent = referent;
-    }
-    ~SimpleEdge() {
-        js_free(const_cast<char16_t *>(name));
-    }
-
-    // Move construction and assignment.
-    SimpleEdge(SimpleEdge &&rhs) {
-        name = rhs.name;
-        referent = rhs.referent;
-
-        rhs.name = nullptr;
-    }
-    SimpleEdge &operator=(SimpleEdge &&rhs) {
-        MOZ_ASSERT(&rhs != this);
-        this->~SimpleEdge();
-        new(this) SimpleEdge(mozilla::Move(rhs));
-        return *this;
-    }
-};
-
-
-typedef mozilla::Vector<SimpleEdge, 8, js::TempAllocPolicy> SimpleEdgeVector;
-
 
 // A JSTracer subclass that adds a SimpleEdge to a Vector for each edge on
 // which it is invoked.
@@ -285,3 +256,100 @@
 template class TracerConcrete<js::types::TypeObject>;
 }
 }
+
+
+namespace JS {
+namespace ubi {
+
+RootList::RootList(JSContext *cx, Maybe<AutoCheckCannotGC> &noGC, bool wantNames /* = false */)
+  : noGC(noGC),
+    edges(cx),
+    wantNames(wantNames)
+{ }
+
+
+bool
+RootList::init(JSContext *cx)
+{
+    SimpleEdgeVectorTracer tracer(cx, &edges, wantNames);
+    JS_TraceRuntime(&tracer);
+    if (!tracer.okay)
+        return false;
+    noGC.emplace(cx->runtime());
+    return true;
+}
+
+bool
+RootList::init(JSContext *cx, ZoneSet &debuggees)
+{
+    SimpleEdgeVector allRootEdges(cx);
+    SimpleEdgeVectorTracer tracer(cx, &allRootEdges, wantNames);
+
+    JS_TraceRuntime(&tracer);
+    if (!tracer.okay)
+        return false;
+    JS_TraceIncomingCCWs(&tracer, debuggees);
+    if (!tracer.okay)
+        return false;
+
+    for (SimpleEdgeVector::Range r = allRootEdges.all(); !r.empty(); r.popFront()) {
+        SimpleEdge &edge = r.front();
+        Zone *zone = edge.referent.zone();
+        if (zone && !debuggees.has(zone))
+            continue;
+        if (!edges.append(mozilla::Move(edge)))
+            return false;
+    }
+
+    noGC.emplace(cx->runtime());
+    return true;
+}
+
+bool
+RootList::init(JSContext *cx, HandleObject debuggees)
+{
+    MOZ_ASSERT(debuggees && JS::dbg::IsDebugger(ObjectValue(*debuggees)));
+    js::Debugger *dbg = js::Debugger::fromJSObject(debuggees);
+
+    ZoneSet debuggeeZones;
+    if (!debuggeeZones.init())
+        return false;
+
+    for (js::GlobalObjectSet::Range r = dbg->allDebuggees(); !r.empty(); r.popFront()) {
+        if (!debuggeeZones.put(r.front()->zone()))
+            return false;
+    }
+
+    return init(cx, debuggeeZones);
+}
+
+// An EdgeRange concrete class that holds a pre-existing vector of SimpleEdges.
+class PreComputedEdgeRange : public EdgeRange {
+    SimpleEdgeVector &edges;
+    size_t           i;
+
+    void settle() {
+        front_ = i < edges.length() ? &edges[i] : nullptr;
+    }
+
+  public:
+    explicit PreComputedEdgeRange(JSContext *cx, SimpleEdgeVector &edges)
+      : edges(edges),
+        i(0)
+    {
+        settle();
+    }
+
+    void popFront() MOZ_OVERRIDE { i++; settle(); }
+};
+
+const char16_t Concrete<RootList>::concreteTypeName[] = MOZ_UTF16("RootList");
+
+EdgeRange *
+Concrete<RootList>::edges(JSContext *cx, bool wantNames) const {
+    MOZ_ASSERT_IF(wantNames, get().wantNames);
+    return js_new<PreComputedEdgeRange>(cx, get().edges);
+}
+
+} // namespace ubi
+} // namespace JS
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Xdr.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Xdr.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/src/vm/Xdr.h	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/src/vm/Xdr.h	2014-11-26 21:46:04.000000000 +0000
@@ -34,7 +34,7 @@
  * Nightly) and without (all others).  FIXME: Bug 1066322 - Enable ES6 symbols
  * in all builds.
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 202;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 206;
 static_assert(XDR_BYTECODE_VERSION_SUBTRAHEND % 2 == 0, "see the comment above");
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - (XDR_BYTECODE_VERSION_SUBTRAHEND
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/Sandbox.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/Sandbox.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/Sandbox.cpp	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/Sandbox.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -738,9 +738,9 @@
 
 bool
 xpc::SandboxProxyHandler::iterate(JSContext *cx, JS::Handle<JSObject*> proxy,
-                                  unsigned flags, JS::MutableHandle<Value> vp) const
+                                  unsigned flags, JS::MutableHandle<JSObject*> objp) const
 {
-    return BaseProxyHandler::iterate(cx, proxy, flags, vp);
+    return BaseProxyHandler::iterate(cx, proxy, flags, objp);
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCInlines.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCInlines.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCInlines.h	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCInlines.h	2014-11-26 21:46:04.000000000 +0000
@@ -471,7 +471,7 @@
 inline
 JSObject* XPCWrappedNativeTearOff::GetJSObjectPreserveColor() const
 {
-    return reinterpret_cast<JSObject *>(reinterpret_cast<uintptr_t>(mJSObject) & ~1);
+    return mJSObject.getPtr();
 }
 
 inline
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCJSRuntime.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCJSRuntime.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCJSRuntime.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCJSRuntime.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -3012,7 +3012,7 @@
         Telemetry::Accumulate(Telemetry::GC_SCC_SWEEP_MAX_PAUSE_MS, sample);
         break;
       case JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT:
-        MOZ_ASSERT(sample <= 3);
+        MOZ_ASSERT(sample <= 5);
         Telemetry::Accumulate(Telemetry::JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, sample);
         break;
       default:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/xpcprivate.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/xpcprivate.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/xpcprivate.h	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/xpcprivate.h	2014-11-26 21:46:04.000000000 +0000
@@ -1147,8 +1147,11 @@
         return mDOMExpandoSet->put(expando);
     }
     void RemoveDOMExpandoObject(JSObject *expando) {
-        if (mDOMExpandoSet)
-            mDOMExpandoSet->remove(expando);
+        if (mDOMExpandoSet) {
+            DOMExpandoSet::Ptr p = mDOMExpandoSet->lookup(expando);
+            MOZ_ASSERT(p.found());
+            mDOMExpandoSet->remove(p);
+        }
     }
 
     typedef js::HashMap<JSAddonId *,
@@ -1939,9 +1942,9 @@
     inline void TraceJS(JSTracer* trc) {}
     inline void AutoTrace(JSTracer* trc) {}
 
-    void Mark()       {mJSObject = (JSObject*)(intptr_t(mJSObject) | 1);}
-    void Unmark()     {mJSObject = (JSObject*)(intptr_t(mJSObject) & ~1);}
-    bool IsMarked() const {return !!(intptr_t(mJSObject) & 1);}
+    void Mark()       {mJSObject.setFlags(1);}
+    void Unmark()     {mJSObject.unsetFlags(1);}
+    bool IsMarked() const {return mJSObject.hasFlag(1);}
 
 private:
     XPCWrappedNativeTearOff(const XPCWrappedNativeTearOff& r) MOZ_DELETE;
@@ -1950,7 +1953,7 @@
 private:
     XPCNativeInterface* mInterface;
     nsISupports*        mNative;
-    JSObject*           mJSObject;
+    JS::TenuredHeap<JSObject*> mJSObject;
 };
 
 /***********************************************/
@@ -3626,6 +3629,7 @@
         , skipWriteToGlobalPrototype(false)
         , universalXPConnectEnabled(false)
         , forcePermissiveCOWs(false)
+        , CPOWTime(0)
         , skipCOWCallableChecks(false)
         , scriptability(c)
         , scope(nullptr)
@@ -3679,6 +3683,9 @@
     // Using it in production is inherently unsafe.
     bool forcePermissiveCOWs;
 
+    // A running count of how much time we've spent processing CPOWs.
+    PRIntervalTime               CPOWTime;
+
     // Disables the XPConnect security checks that deny access to callables and
     // accessor descriptors on COWs. Do not use this unless you are bholley.
     bool skipCOWCallableChecks;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCShellImpl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCShellImpl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCShellImpl.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCShellImpl.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1066,7 +1066,9 @@
                 return usage();
             }
 
-            JS_EvaluateScript(cx, obj, argv[i], strlen(argv[i]), "-e", 1, &rval);
+            JS::CompileOptions opts(cx);
+            opts.setFileAndLine("-e", 1);
+            JS::Evaluate(cx, obj, opts, argv[i], strlen(argv[i]), &rval);
 
             isInteractive = false;
             break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCWrappedNative.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCWrappedNative.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCWrappedNative.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCWrappedNative.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1088,9 +1088,10 @@
                                          HandleObject aNewParent,
                                          nsISupports* aCOMObj)
 {
-    // Check if we're near the stack limit before we get anywhere near the
-    // transplanting code. We use a conservative check since we'll use a little
-    // more space before we actually hit the critical "can't fail" path.
+    // Check if we're anywhere near the stack limit before we reach the
+    // transplanting code, since it has no good way to handle errors. This uses
+    // the untrusted script limit, which is not strictly necessary since no
+    // actual script should run.
     AutoJSContext cx;
     JS_CHECK_RECURSION_CONSERVATIVE(cx, return NS_ERROR_FAILURE);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/src/XPCWrappedNativeScope.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -346,6 +346,16 @@
     MOZ_ASSERT(addonId);
     MOZ_ASSERT(nsContentUtils::IsSystemPrincipal(GetPrincipal()));
 
+    // In bug 1092156, we found that add-on scopes don't work correctly when the
+    // window navigates. The add-on global's prototype is an outer window, so,
+    // after the navigation, looking up window properties in the add-on scope
+    // will fail. However, in most cases where the window can be navigated, the
+    // entire window is part of the add-on. To solve the problem, we avoid
+    // returning an add-on scope for a window that is already tagged with the
+    // add-on ID.
+    if (AddonIdOfObject(global) == addonId)
+        return global;
+
     // If we already have an addon scope object, we know what to use.
     for (size_t i = 0; i < mAddonScopes.Length(); i++) {
         if (JS::AddonIdOfObject(js::UncheckedUnwrap(mAddonScopes[i])) == addonId)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul	2014-11-26 21:46:04.000000000 +0000
@@ -171,6 +171,7 @@
       "forEach", "map", "reduce", "reduceRight", "filter", "some", "every", "find",
       "findIndex", "copyWithin", "fill", kIteratorSymbol, "entries", "keys", "constructor"];
   if (isNightlyBuild) {
+    gPrototypeProperties['Array'].push('includes');
     let pjsMethods = ['mapPar', 'reducePar', 'scanPar', 'scatterPar', 'filterPar'];
     gPrototypeProperties['Array'] = gPrototypeProperties['Array'].concat(pjsMethods);
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/tests/mochitest/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/tests/mochitest/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/tests/mochitest/mochitest.ini	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/tests/mochitest/mochitest.ini	2014-11-26 21:46:04.000000000 +0000
@@ -95,6 +95,7 @@
 [test_bug993423.html]
 [test_bug1005806.html]
 [test_bug1021258.html]
+[test_bug1094930.html]
 [test_crossOriginObjects.html]
 [test_crosscompartment_weakmap.html]
 [test_frameWrapping.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/tests/mochitest/test_bug1094930.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/tests/mochitest/test_bug1094930.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/tests/mochitest/test_bug1094930.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/tests/mochitest/test_bug1094930.html	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1094930
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1094930</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <iframe id="ifr"></iframe>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1094930">Mozilla Bug 1094930</a>
+<p id="display"></p>
+<script type="application/javascript">
+  SimpleTest.waitForExplicitFinish();
+  var proto = { 
+    createdCallback: function() {
+      ok(true, "createdCallback was called");
+      SimpleTest.finish()
+    }
+  };
+
+  var f = document.registerElement.call(frames[0].document, "x-foo", { prototype: proto });
+  var inst = new f();
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/FilteringWrapper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/FilteringWrapper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/FilteringWrapper.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/FilteringWrapper.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -102,36 +102,37 @@
 
 template <typename Base, typename Policy>
 bool
-FilteringWrapper<Base, Policy>::enumerate(JSContext *cx, HandleObject wrapper,
-                                          AutoIdVector &props) const
+FilteringWrapper<Base, Policy>::getOwnEnumerablePropertyKeys(JSContext *cx,
+                                                             HandleObject wrapper,
+                                                             AutoIdVector &props) const
 {
     assertEnteredPolicy(cx, wrapper, JSID_VOID, BaseProxyHandler::ENUMERATE);
-    return Base::enumerate(cx, wrapper, props) &&
+    return Base::getOwnEnumerablePropertyKeys(cx, wrapper, props) &&
            Filter<Policy>(cx, wrapper, props);
 }
 
 template <typename Base, typename Policy>
 bool
-FilteringWrapper<Base, Policy>::getOwnEnumerablePropertyKeys(JSContext *cx,
-                                                             HandleObject wrapper,
-                                                             AutoIdVector &props) const
+FilteringWrapper<Base, Policy>::getEnumerablePropertyKeys(JSContext *cx,
+                                                          HandleObject wrapper,
+                                                          AutoIdVector &props) const
 {
     assertEnteredPolicy(cx, wrapper, JSID_VOID, BaseProxyHandler::ENUMERATE);
-    return Base::getOwnEnumerablePropertyKeys(cx, wrapper, props) &&
+    return Base::getEnumerablePropertyKeys(cx, wrapper, props) &&
            Filter<Policy>(cx, wrapper, props);
 }
 
 template <typename Base, typename Policy>
 bool
 FilteringWrapper<Base, Policy>::iterate(JSContext *cx, HandleObject wrapper,
-                                        unsigned flags, MutableHandleValue vp) const
+                                        unsigned flags, MutableHandleObject objp) const
 {
     assertEnteredPolicy(cx, wrapper, JSID_VOID, BaseProxyHandler::ENUMERATE);
     // We refuse to trigger the iterator hook across chrome wrappers because
     // we don't know how to censor custom iterator objects. Instead we trigger
     // the default proxy iterate trap, which will ask enumerate() for the list
     // of (censored) ids.
-    return js::BaseProxyHandler::iterate(cx, wrapper, flags, vp);
+    return js::BaseProxyHandler::iterate(cx, wrapper, flags, objp);
 }
 
 template <typename Base, typename Policy>
@@ -238,7 +239,7 @@
     // All properties on cross-origin objects are supposed |own|, despite what
     // the underlying native object may report. Override the inherited trap to
     // avoid passing JSITER_OWNONLY as a flag.
-    return SecurityXrayDOM::enumerate(cx, wrapper, JSITER_HIDDEN, props);
+    return SecurityXrayDOM::getPropertyKeys(cx, wrapper, JSITER_HIDDEN, props);
 }
 
 bool
@@ -259,8 +260,8 @@
 }
 
 bool
-CrossOriginXrayWrapper::enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper,
-                                  JS::AutoIdVector &props) const
+CrossOriginXrayWrapper::getEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
+                                                  JS::AutoIdVector &props) const
 {
     // Cross-origin properties are non-enumerable.
     return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/FilteringWrapper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/FilteringWrapper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/FilteringWrapper.h	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/FilteringWrapper.h	2014-11-26 21:46:04.000000000 +0000
@@ -33,16 +33,16 @@
                                           JS::MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
     virtual bool ownPropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                  JS::AutoIdVector &props) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper,
-                           JS::AutoIdVector &props) const MOZ_OVERRIDE;
 
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                        JS::Handle<jsid> id,
                                        JS::MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                               JS::AutoIdVector &props) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
+                                           JS::AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, JS::Handle<JSObject*> wrapper, unsigned flags,
-                         JS::MutableHandle<JS::Value> vp) const MOZ_OVERRIDE;
+                         JS::MutableHandle<JSObject*> objp) const MOZ_OVERRIDE;
 
     virtual bool call(JSContext *cx, JS::Handle<JSObject*> wrapper,
                       const JS::CallArgs &args) const MOZ_OVERRIDE;
@@ -80,12 +80,12 @@
                                  JS::AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, JS::Handle<JSObject*> wrapper,
                          JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper,
-                           JS::AutoIdVector &props) const MOZ_OVERRIDE;
 
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                        JS::Handle<jsid> id,
                                        JS::MutableHandle<JSPropertyDescriptor> desc) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
+                                           JS::AutoIdVector &props) const MOZ_OVERRIDE;
 };
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -60,10 +60,10 @@
 
 bool
 WaiveXrayWrapper::iterate(JSContext *cx, HandleObject proxy, unsigned flags,
-                         MutableHandleValue vp) const
+                          MutableHandleObject objp) const
 {
-    return CrossCompartmentWrapper::iterate(cx, proxy, flags, vp) &&
-           WrapperFactory::WaiveXrayAndWrap(cx, vp);
+    return CrossCompartmentWrapper::iterate(cx, proxy, flags, objp) &&
+           (!objp || WrapperFactory::WaiveXrayAndWrap(cx, objp));
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.h	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/WaiveXrayWrapper.h	2014-11-26 21:46:04.000000000 +0000
@@ -30,7 +30,7 @@
                            const JS::CallArgs &args) const MOZ_OVERRIDE;
 
     virtual bool iterate(JSContext *cx, JS::Handle<JSObject*> proxy, unsigned flags,
-                         JS::MutableHandle<JS::Value> vp) const MOZ_OVERRIDE;
+                         JS::MutableHandle<JSObject*> objp) const MOZ_OVERRIDE;
     virtual bool nativeCall(JSContext *cx, JS::IsAcceptableThis test,
                             JS::NativeImpl impl, JS::CallArgs args) const MOZ_OVERRIDE;
     virtual bool getPropertyDescriptor(JSContext *cx, JS::Handle<JSObject*> wrapper,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -2039,7 +2039,7 @@
                                            AutoIdVector &props) const
 {
     assertEnteredPolicy(cx, wrapper, JSID_VOID, BaseProxyHandler::ENUMERATE);
-    return enumerate(cx, wrapper, JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props);
+    return getPropertyKeys(cx, wrapper, JSITER_OWNONLY | JSITER_HIDDEN | JSITER_SYMBOLS, props);
 }
 
 template <typename Base, typename Traits>
@@ -2065,37 +2065,6 @@
 
 template <typename Base, typename Traits>
 bool
-XrayWrapper<Base, Traits>::enumerate(JSContext *cx, HandleObject wrapper, unsigned flags,
-                                     AutoIdVector &props) const
-{
-    assertEnteredPolicy(cx, wrapper, JSID_VOID, BaseProxyHandler::ENUMERATE);
-
-    // Enumerate expando properties first. Note that the expando object lives
-    // in the target compartment.
-    RootedObject target(cx, Traits::singleton.getTargetObject(wrapper));
-    RootedObject expando(cx);
-    if (!Traits::singleton.getExpandoObject(cx, target, wrapper, &expando))
-        return false;
-
-    if (expando) {
-        JSAutoCompartment ac(cx, expando);
-        if (!js::GetPropertyKeys(cx, expando, flags, &props))
-            return false;
-    }
-
-    return Traits::singleton.enumerateNames(cx, wrapper, flags, props);
-}
-
-template <typename Base, typename Traits>
-bool
-XrayWrapper<Base, Traits>::enumerate(JSContext *cx, HandleObject wrapper,
-                                    AutoIdVector &props) const
-{
-    return enumerate(cx, wrapper, 0, props);
-}
-
-template <typename Base, typename Traits>
-bool
 XrayWrapper<Base, Traits>::get(JSContext *cx, HandleObject wrapper,
                                HandleObject receiver, HandleId id,
                                MutableHandleValue vp) const
@@ -2149,11 +2118,19 @@
 
 template <typename Base, typename Traits>
 bool
+XrayWrapper<Base, Traits>::getEnumerablePropertyKeys(JSContext *cx, HandleObject wrapper,
+                                                     AutoIdVector &props) const
+{
+    return getPropertyKeys(cx, wrapper, 0, props);
+}
+
+template <typename Base, typename Traits>
+bool
 XrayWrapper<Base, Traits>::iterate(JSContext *cx, HandleObject wrapper,
-                                   unsigned flags, MutableHandleValue vp) const
+                                   unsigned flags, MutableHandleObject objp) const
 {
     // Skip our Base if it isn't already ProxyHandler.
-    return js::BaseProxyHandler::iterate(cx, wrapper, flags, vp);
+    return js::BaseProxyHandler::iterate(cx, wrapper, flags, objp);
 }
 
 template <typename Base, typename Traits>
@@ -2266,6 +2243,29 @@
     return true;
 }
 
+template <typename Base, typename Traits>
+bool
+XrayWrapper<Base, Traits>::getPropertyKeys(JSContext *cx, HandleObject wrapper, unsigned flags,
+                                           AutoIdVector &props) const
+{
+    assertEnteredPolicy(cx, wrapper, JSID_VOID, BaseProxyHandler::ENUMERATE);
+
+    // Enumerate expando properties first. Note that the expando object lives
+    // in the target compartment.
+    RootedObject target(cx, Traits::singleton.getTargetObject(wrapper));
+    RootedObject expando(cx);
+    if (!Traits::singleton.getExpandoObject(cx, target, wrapper, &expando))
+        return false;
+
+    if (expando) {
+        JSAutoCompartment ac(cx, expando);
+        if (!js::GetPropertyKeys(cx, expando, flags, &props))
+            return false;
+    }
+
+    return Traits::singleton.enumerateNames(cx, wrapper, flags, props);
+}
+
 /*
  * The Permissive / Security variants should be used depending on whether the
  * compartment of the wrapper is guranteed to subsume the compartment of the
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/XrayWrapper.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/XrayWrapper.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/js/xpconnect/wrappers/XrayWrapper.h	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/js/xpconnect/wrappers/XrayWrapper.h	2014-11-26 21:46:04.000000000 +0000
@@ -413,7 +413,6 @@
                                  JS::AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool delete_(JSContext *cx, JS::Handle<JSObject*> wrapper,
                          JS::Handle<jsid> id, bool *bp) const MOZ_OVERRIDE;
-    virtual bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper, JS::AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool getPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
                                 JS::MutableHandleObject protop) const MOZ_OVERRIDE;
     virtual bool setPrototypeOf(JSContext *cx, JS::HandleObject wrapper,
@@ -440,8 +439,10 @@
                         bool *bp) const MOZ_OVERRIDE;
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
                                               JS::AutoIdVector &props) const MOZ_OVERRIDE;
+    virtual bool getEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper,
+                                           JS::AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, JS::Handle<JSObject*> wrapper, unsigned flags,
-                         JS::MutableHandle<JS::Value> vp) const MOZ_OVERRIDE;
+                         JS::MutableHandle<JSObject*> objp) const MOZ_OVERRIDE;
 
     virtual const char *className(JSContext *cx, JS::HandleObject proxy) const MOZ_OVERRIDE;
     virtual bool defaultValue(JSContext *cx, JS::HandleObject wrapper,
@@ -473,8 +474,8 @@
     }
 
   protected:
-    bool enumerate(JSContext *cx, JS::Handle<JSObject*> wrapper, unsigned flags,
-                   JS::AutoIdVector &props) const;
+    bool getPropertyKeys(JSContext *cx, JS::Handle<JSObject*> wrapper, unsigned flags,
+                         JS::AutoIdVector &props) const;
 };
 
 #define PermissiveXrayXPCWN xpc::XrayWrapper<js::CrossCompartmentWrapper, xpc::XPCWrappedNativeXrayTraits>
@@ -512,7 +513,7 @@
     virtual bool getOwnEnumerablePropertyKeys(JSContext *cx, JS::Handle<JSObject*> proxy,
                                               JS::AutoIdVector &props) const MOZ_OVERRIDE;
     virtual bool iterate(JSContext *cx, JS::Handle<JSObject*> proxy, unsigned flags,
-                         JS::MutableHandle<JS::Value> vp) const MOZ_OVERRIDE;
+                         JS::MutableHandle<JSObject*> objp) const MOZ_OVERRIDE;
 };
 
 extern const SandboxProxyHandler sandboxProxyHandler;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/419985.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/419985.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/419985.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/419985.html	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,29 @@
+<html class="reftest-wait">
+<head>
+<title>Crash [@ nsView::~nsView()] with onload focusing and removing window</title>
+</head>
+<body>
+<iframe id="content" onload="doe()" src="data:text/html;charset=utf-8,%3Chtml%3E%3Chead%3E%3C/head%3E%0A%3Cbody%20onfocus%3D%22window.frameElement.parentNode.removeChild%28window.frameElement%29%22%3E%0A%3Ciframe%20src%3D%22data%3Atext/html%3Bcharset%3Dutf-8%2C%253Cbody%2520onload%253D%2522document.links%255B0%255D.focus%2528%2529%253B%2522%253E%253Ca%2520href%253D%2522javascript%253A%2522%253Em%253C/a%253E%22%3E%3C/iframe%3E%0A%3Cstyle%20id%3D%22e%22%3E%0A@import%20URL%28416107.xhtml%29%3B%0A%3C/style%3E%0A%3C/body%3E%0A%3C/html%3E"></iframe>
+
+<script>
+// Run the test for 2 seconds
+setTimeout(function() {
+    clearInterval(i);
+    document.documentElement.removeChild(document.body);
+    document.documentElement.className = "";
+  }, 2000);
+
+function doe2() {
+document.getElementById('content').src = document.getElementById('content').src;
+}
+var i = setInterval(doe2, 400);
+
+function doe(){
+document.getElementById('content').style.display = 'none';
+document.body.offsetHeight;
+document.getElementById('content').style.display = '';
+}
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/429881.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/429881.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/429881.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/429881.html	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<head></head>
+<body style="position: relative; -moz-column-width: 5em;" onload="document.body.removeChild(document.body.firstChild)"><div id="d"><div style="white-space: pre; position: absolute;">
+B<div style="position: fixed;"></div></div></div></body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/818454.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/818454.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/818454.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/818454.html	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,24 @@
+><pre>><style>#parent {
+    position: absolute;
+    }
+#parent::first-letter {
+</style>
+<video></video>>>><div id=parent>
+     <i> 9Z 1CU %b 1	*v
+` mMx#[j
+>></div>
+>><q><dt>><style>
+.class1 { stroke: none; direction: rtl;</style><script>
+var docElement = document.body;
+docElement.contentEditable = "true";
+function crash() {
+test1 = document.createElementNS("http://www.w3.org/1998/Math/MathML", "degree");
+docElement.appendChild(test1);
+test2 = document.createElementNS("http://www.w3.org/1999/xhtml", "textarea");
+docElement.appendChild(test2);
+test3 = document.createElementNS("http://www.w3.org/1998/Math/MathML", "mover");
+test3.setAttribute("class", "class1");
+docElement.appendChild(test3);
+}
+document.addEventListener("DOMContentLoaded", crash, false);
+</script>>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/crashtests/crashtests.list	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/crashtests/crashtests.list	2014-11-26 21:46:05.000000000 +0000
@@ -231,6 +231,7 @@
 load 414175-1.xul
 load 415503.xhtml
 load 416107.xhtml
+HTTP load 419985.html
 load 420031-1.html
 load 420213-1.html
 load 420219-1.html
@@ -247,6 +248,7 @@
 load 429088-2.html
 load 429780-1.xhtml
 load 429865-1.html
+load 429881.html
 load 430569-1.html
 load 430569-2.html
 load 432752-1.svg
@@ -421,6 +423,7 @@
 load 812665.html
 load 813372-1.html
 asserts(0-4) load 817219.html # bug 623436
+load 818454.html
 asserts-if(gtk2Widget,0-1) load 822865.html # bug 540078
 load 824862.html
 load 826163.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/DisplayItemClip.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/DisplayItemClip.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/DisplayItemClip.cpp	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/DisplayItemClip.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -6,6 +6,8 @@
 #include "DisplayItemClip.h"
 
 #include "gfxContext.h"
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/PathHelpers.h"
 #include "nsPresContext.h"
 #include "nsCSSRendering.h"
@@ -118,24 +120,34 @@
 }
 
 void
-DisplayItemClip::DrawRoundedRectsTo(gfxContext* aContext,
-                                    int32_t A2D,
-                                    uint32_t aBegin, uint32_t aEnd) const
+DisplayItemClip::FillIntersectionOfRoundedRectClips(gfxContext* aContext,
+                                                    const Color& aColor,
+                                                    int32_t aAppUnitsPerDevPixel,
+                                                    uint32_t aBegin,
+                                                    uint32_t aEnd) const
 {
   DrawTarget& aDrawTarget = *aContext->GetDrawTarget();
 
   aEnd = std::min<uint32_t>(aEnd, mRoundedClipRects.Length());
 
-  if (aEnd - aBegin == 0)
+  if (aBegin >= aEnd) {
     return;
+  }
+
+  // Push clips for any rects that come BEFORE the rect at |aEnd - 1|, if any:
+  ApplyRoundedRectClipsTo(aContext, aAppUnitsPerDevPixel, aBegin, aEnd - 1);
 
-  // If there is just one rounded rect we can just fill it, if there are more then we
-  // must clip the rest to get the intersection of clips
-  ApplyRoundedRectClipsTo(aContext, A2D, aBegin, aEnd - 1);
-  RefPtr<Path> roundedRect =
-    MakeRoundedRectPath(aDrawTarget, A2D, mRoundedClipRects[aEnd - 1]);
-  aContext->SetPath(roundedRect);
-  aContext->Fill();
+  // Now fill the rect at |aEnd - 1|:
+  RefPtr<Path> roundedRect = MakeRoundedRectPath(aDrawTarget,
+                                                 aAppUnitsPerDevPixel,
+                                                 mRoundedClipRects[aEnd - 1]);
+  ColorPattern color(ToDeviceColor(aColor));
+  aDrawTarget.Fill(roundedRect, color);
+
+  // Finally, pop any clips that we may have pushed:
+  for (uint32_t i = aBegin; i < aEnd - 1; ++i) {
+    aContext->PopClip();
+  }
 }
 
 TemporaryRef<Path>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/DisplayItemClip.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/DisplayItemClip.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/DisplayItemClip.h	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/DisplayItemClip.h	2014-11-26 21:46:04.000000000 +0000
@@ -32,6 +32,7 @@
  * SVG clip-path), including no clipping at all.
  */
 class DisplayItemClip {
+  typedef mozilla::gfx::Color Color;
   typedef mozilla::gfx::DrawTarget DrawTarget;
   typedef mozilla::gfx::Path Path;
 
@@ -85,8 +86,11 @@
                                uint32_t aBegin, uint32_t aEnd) const;
 
   // Draw (fill) the rounded rects in this clip to aContext
-  void DrawRoundedRectsTo(gfxContext* aContext, int32_t A2D,
-                          uint32_t aBegin, uint32_t aEnd) const;
+  void FillIntersectionOfRoundedRectClips(gfxContext* aContext,
+                                          const Color& aColor,
+                                          int32_t aAppUnitsPerDevPixel,
+                                          uint32_t aBegin,
+                                          uint32_t aEnd) const;
   // 'Draw' (create as a path, does not stroke or fill) aRoundRect to aContext
   mozilla::TemporaryRef<Path> MakeRoundedRectPath(DrawTarget& aDrawTarget,
                                                   int32_t A2D,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/FrameLayerBuilder.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/FrameLayerBuilder.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/FrameLayerBuilder.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/FrameLayerBuilder.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -268,6 +268,20 @@
     mNewChildLayersIndex(-1),
     mAllDrawingAbove(false)
   {}
+
+#ifdef MOZ_DUMP_PAINTING
+  /**
+   * Keep track of important decisions for debugging.
+   */
+  nsAutoCString mLog;
+
+  #define FLB_LOG_PAINTED_LAYER_DECISION(tld, ...) \
+          tld->mLog.AppendPrintf("\t\t\t\t"); \
+          tld->mLog.AppendPrintf(__VA_ARGS__);
+#else
+  #define FLB_LOG_PAINTED_LAYER_DECISION(...)
+#endif
+
   /**
    * Record that an item has been added to the PaintedLayer, so we
    * need to update our regions.
@@ -290,16 +304,16 @@
   const nsIFrame* GetAnimatedGeometryRoot() { return mAnimatedGeometryRoot; }
 
   /**
-   * Add aHitRegion, aMaybeHitRegion, and aDispatchToContentHitRegion to the
-   * hit regions for this PaintedLayer.
+   * Add the given hit regions to the hit regions to the hit retions for this
+   * PaintedLayer.
    */
-  void AccumulateEventRegions(const nsRegion& aHitRegion,
-                              const nsRegion& aMaybeHitRegion,
-                              const nsRegion& aDispatchToContentHitRegion)
+  void AccumulateEventRegions(nsDisplayLayerEventRegions* aEventRegions)
   {
-    mHitRegion.Or(mHitRegion, aHitRegion);
-    mMaybeHitRegion.Or(mMaybeHitRegion, aMaybeHitRegion);
-    mDispatchToContentHitRegion.Or(mDispatchToContentHitRegion, aDispatchToContentHitRegion);
+    FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating event regions %p against tld=%p\n", aEventRegions, this);
+
+    mHitRegion.Or(mHitRegion, aEventRegions->HitRegion());
+    mMaybeHitRegion.Or(mMaybeHitRegion, aEventRegions->MaybeHitRegion());
+    mDispatchToContentHitRegion.Or(mDispatchToContentHitRegion, aEventRegions->DispatchToContentHitRegion());
   }
 
   /**
@@ -374,20 +388,6 @@
     return mFixedPosFrameForLayerData != nullptr;
   }
 
-#ifdef MOZ_DUMP_PAINTING
-
-  /**
-   * Keep track of important decisions for debugging.
-   */
-  nsAutoCString mLog;
-
-  #define FLB_LOG_PAINTED_LAYER_DECISION(tld, ...) \
-          tld->mLog.AppendPrintf("\t\t\t\t"); \
-          tld->mLog.AppendPrintf(__VA_ARGS__);
-#else
-  #define FLB_LOG_PAINTED_LAYER_DECISION(...)
-#endif
-
   /**
    * The region of visible content in the layer, relative to the
    * container layer (which is at the snapped top-left of the display
@@ -3055,9 +3055,7 @@
       if (itemType == nsDisplayItem::TYPE_LAYER_EVENT_REGIONS) {
         nsDisplayLayerEventRegions* eventRegions =
             static_cast<nsDisplayLayerEventRegions*>(item);
-        paintedLayerData->AccumulateEventRegions(eventRegions->HitRegion(),
-                                                eventRegions->MaybeHitRegion(),
-                                                eventRegions->DispatchToContentHitRegion());
+        paintedLayerData->AccumulateEventRegions(eventRegions);
       } else {
         // check to see if the new item has rounded rect clips in common with
         // other items in the layer
@@ -4407,17 +4405,17 @@
   }
 
   DrawTarget *dt = aContext->GetDrawTarget();
-  return dt->GetBackendType() == BackendType::DIRECT2D;
+  return !dt->SupportsRegionClipping();
 }
 
-static void DrawForcedBackgroundColor(gfxContext* aContext, Layer* aLayer, nscolor aBackgroundColor)
+static void DrawForcedBackgroundColor(DrawTarget& aDrawTarget,
+                                      Layer* aLayer, nscolor
+                                      aBackgroundColor)
 {
   if (NS_GET_A(aBackgroundColor) > 0) {
     nsIntRect r = aLayer->GetVisibleRegion().GetBounds();
-    aContext->NewPath();
-    aContext->Rectangle(gfxRect(r.x, r.y, r.width, r.height));
-    aContext->SetColor(gfxRGBA(aBackgroundColor));
-    aContext->Fill();
+    ColorPattern color(ToDeviceColor(aBackgroundColor));
+    aDrawTarget.FillRect(Rect(r.x, r.y, r.width, r.height), color);
   }
 }
 
@@ -4457,6 +4455,8 @@
                                    const nsIntRegion& aRegionToInvalidate,
                                    void* aCallbackData)
 {
+  DrawTarget& aDrawTarget = *aContext->GetDrawTarget();
+
   PROFILER_LABEL("FrameLayerBuilder", "DrawPaintedLayer",
     js::ProfileEntry::Category::GRAPHICS);
 
@@ -4488,7 +4488,8 @@
       gfxUtils::ClipToRegion(aContext, aRegionToDraw);
     }
 
-    DrawForcedBackgroundColor(aContext, aLayer, userData->mForcedBackgroundColor);
+    DrawForcedBackgroundColor(aDrawTarget, aLayer,
+                              userData->mForcedBackgroundColor);
   }
 
   if (NS_GET_A(userData->mFontSmoothingBackgroundColor) > 0) {
@@ -4522,7 +4523,8 @@
       aContext->Rectangle(*iterRect);
       aContext->Clip();
 
-      DrawForcedBackgroundColor(aContext, aLayer, userData->mForcedBackgroundColor);
+      DrawForcedBackgroundColor(aDrawTarget, aLayer,
+                                userData->mForcedBackgroundColor);
 
       // Apply the residual transform if it has been enabled, to ensure that
       // snapping when we draw into aContext exactly matches the ideal transform.
@@ -4720,11 +4722,11 @@
     context->Multiply(ThebesMatrix(imageTransform));
 
     // paint the clipping rects with alpha to create the mask
-    context->SetColor(gfxRGBA(1, 1, 1, 1));
-    aClip.DrawRoundedRectsTo(context,
-                             newData.mAppUnitsPerDevPixel,
-                             0,
-                             aRoundedRectClipCount);
+    aClip.FillIntersectionOfRoundedRectClips(context,
+                                             Color(1.f, 1.f, 1.f, 1.f),
+                                             newData.mAppUnitsPerDevPixel,
+                                             0,
+                                             aRoundedRectClipCount);
 
     RefPtr<SourceSurface> surface = dt->Snapshot();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsBidiPresUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsBidiPresUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsBidiPresUtils.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsBidiPresUtils.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -358,10 +358,10 @@
          frame && aNumFramesOnLine--;
          frame = frame->GetNextSibling()) {
       AppendFrame(frame);
-      uint8_t level = nsBidiPresUtils::GetFrameEmbeddingLevel(frame);
+      nsBidiLevel level = nsBidiPresUtils::GetFrameEmbeddingLevel(frame);
       mLevels.AppendElement(level);
       mIndexMap.AppendElement(0);
-      if (level & 1) {
+      if (IS_LEVEL_RTL(level)) {
         hasRTLFrames = true;
       }
     }
@@ -658,7 +658,7 @@
   nsresult rv = aBpd->SetPara();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  uint8_t embeddingLevel = aBpd->GetParaLevel();
+  nsBidiLevel embeddingLevel = aBpd->GetParaLevel();
 
   rv = aBpd->CountRuns(&runCount);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1539,7 +1539,7 @@
   for (; index != limit; index += step) {
     frame = aBld->VisualFrameAt(index);
     RepositionFrame(frame,
-                    !(aBld->mLevels[aBld->mIndexMap[index]] & 1),
+                    !(IS_LEVEL_RTL(aBld->mLevels[aBld->mIndexMap[index]])),
                     start,
                     &continuationStates,
                     aLineWM,
@@ -1675,9 +1675,9 @@
 nsresult
 nsBidiPresUtils::FormatUnicodeText(nsPresContext*  aPresContext,
                                    char16_t*       aText,
-                                   int32_t&         aTextLength,
-                                   nsCharType       aCharType,
-                                   bool             aIsOddLevel)
+                                   int32_t&        aTextLength,
+                                   nsCharType      aCharType,
+                                   nsBidiDirection aDir)
 {
   nsresult rv = NS_OK;
   // ahmed 
@@ -1877,8 +1877,7 @@
   uint32_t visualStart = 0;
   uint8_t charType;
   uint8_t prevType = eCharType_LeftToRight;
-  nsBidiLevel level;
-      
+
   for(int nPosResolve=0; nPosResolve < aPosResolveCount; ++nPosResolve)
   {
     aPosResolve[nPosResolve].visualIndex = kNotFound;
@@ -1892,10 +1891,12 @@
     if (NS_FAILED(rv))
       return rv;
 
+    nsBidiLevel level;
     rv = aBidiEngine->GetLogicalRun(start, &limit, &level);
     if (NS_FAILED(rv))
       return rv;
 
+    dir = DIRECTION_FROM_LEVEL(level);
     int32_t subRunLength = limit - start;
     int32_t lineOffset = start;
     int32_t typeLimit = std::min(limit, aLength);
@@ -1914,8 +1915,8 @@
      * x-coordinate of the end of the run for the start of the next run.
      */
 
-    if (level & 1) {
-      aprocessor.SetText(aText + start, subRunLength, nsBidiDirection(level & 1));
+    if (dir == NSBIDI_RTL) {
+      aprocessor.SetText(aText + start, subRunLength, dir);
       width = aprocessor.GetWidth();
       xOffset += width;
       xEndRun = xOffset;
@@ -1925,18 +1926,18 @@
       // CalculateCharType can increment subRunCount if the run
       // contains mixed character types
       CalculateCharType(aBidiEngine, aText, lineOffset, typeLimit, subRunLimit, subRunLength, subRunCount, charType, prevType);
-      
+
       nsAutoString runVisualText;
       runVisualText.Assign(aText + start, subRunLength);
       if (int32_t(runVisualText.Length()) < subRunLength)
         return NS_ERROR_OUT_OF_MEMORY;
-      FormatUnicodeText(aPresContext, runVisualText.BeginWriting(), subRunLength,
-                        (nsCharType)charType, level & 1);
+      FormatUnicodeText(aPresContext, runVisualText.BeginWriting(),
+                        subRunLength, (nsCharType)charType, dir);
 
-      aprocessor.SetText(runVisualText.get(), subRunLength, nsBidiDirection(level & 1));
+      aprocessor.SetText(runVisualText.get(), subRunLength, dir);
       width = aprocessor.GetWidth();
       totalWidth += width;
-      if (level & 1) {
+      if (dir == NSBIDI_RTL) {
         xOffset -= width;
       }
       if (aMode == MODE_DRAW) {
@@ -2007,7 +2008,7 @@
             // The position in the text where this run's "left part" begins.
             const char16_t* visualLeftPart;
             const char16_t* visualRightSide;
-            if (level & 1) {
+            if (dir == NSBIDI_RTL) {
               // One day, son, this could all be replaced with mBidiEngine.GetVisualIndex ...
               posResolve->visualIndex = visualStart + (subRunLength - (posResolve->logicalIndex + 1 - start));
               // Skipping to the "left part".
@@ -2024,16 +2025,16 @@
             }
             // The delta between the start of the run and the left part's end.
             int32_t visualLeftLength = posResolve->visualIndex - visualStart;
-            aprocessor.SetText(visualLeftPart, visualLeftLength, nsBidiDirection(level & 1));
+            aprocessor.SetText(visualLeftPart, visualLeftLength, dir);
             subWidth = aprocessor.GetWidth();
-            aprocessor.SetText(visualRightSide, visualLeftLength + 1, nsBidiDirection(level & 1));
+            aprocessor.SetText(visualRightSide, visualLeftLength + 1, dir);
             posResolve->visualLeftTwips = xOffset + subWidth;
             posResolve->visualWidth = aprocessor.GetWidth() - subWidth;
           }
         }
       }
 
-      if (!(level & 1)) {
+      if (dir == NSBIDI_LTR) {
         xOffset += width;
       }
 
@@ -2042,10 +2043,10 @@
       subRunLimit = typeLimit;
       subRunLength = typeLimit - lineOffset;
     } // while
-    if (level & 1) {
+    if (dir == NSBIDI_RTL) {
       xOffset = xEndRun;
     }
-    
+
     visualStart += length;
   } // for
 
@@ -2075,8 +2076,8 @@
   }
 
   virtual void SetText(const char16_t* aText,
-                       int32_t          aLength,
-                       nsBidiDirection  aDirection) MOZ_OVERRIDE
+                       int32_t         aLength,
+                       nsBidiDirection aDirection) MOZ_OVERRIDE
   {
     mFontMetrics->SetTextRunRTL(aDirection==NSBIDI_RTL);
     mText = aText;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsBidiPresUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsBidiPresUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsBidiPresUtils.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsBidiPresUtils.h	2014-11-26 21:46:05.000000000 +0000
@@ -107,15 +107,15 @@
      * @remark The reason that the function gives a string instead of an index
      *  is that ProcessText copies and modifies the string passed to it, so
      *  passing an index would be impossible.
-     * 
+     *
      * @param aText The string of text.
      * @param aLength The length of the string of text.
      * @param aDirection The direction of the text. The string will never have
      *  mixed direction.
      */
     virtual void SetText(const char16_t*   aText,
-                         int32_t            aLength,
-                         nsBidiDirection    aDirection) = 0;
+                         int32_t           aLength,
+                         nsBidiDirection   aDirection) = 0;
 
     /**
      * Returns the measured width of the text given in SetText. If SetText was
@@ -171,11 +171,11 @@
    *
    * @lina 06/18/2000 
    */
-  static nsresult FormatUnicodeText(nsPresContext* aPresContext,
-                                    char16_t*      aText,
+  static nsresult FormatUnicodeText(nsPresContext*  aPresContext,
+                                    char16_t*       aText,
                                     int32_t&        aTextLength,
                                     nsCharType      aCharType,
-                                    bool            aIsOddLevel);
+                                    nsBidiDirection aDir);
 
   /**
    * Reorder plain text using the Unicode Bidi algorithm and send it to
@@ -286,6 +286,30 @@
    */
   static nsBidiLevel GetFrameBaseLevel(nsIFrame* aFrame);
 
+  /**
+   * Get an nsBidiDirection representing the direction implied by the
+   * bidi base level of the frame.
+   * @return NSBIDI_LTR (left-to-right) or NSBIDI_RTL (right-to-left)
+   *  NSBIDI_MIXED will never be returned.
+   */
+  static nsBidiDirection ParagraphDirection(nsIFrame* aFrame) {
+    return DIRECTION_FROM_LEVEL(GetFrameBaseLevel(aFrame));
+  }
+
+  /**
+   * Get an nsBidiDirection representing the direction implied by the
+   * bidi embedding level of the frame.
+   * @return NSBIDI_LTR (left-to-right) or NSBIDI_RTL (right-to-left)
+   *  NSBIDI_MIXED will never be returned.
+   */
+  static nsBidiDirection FrameDirection(nsIFrame* aFrame) {
+    return DIRECTION_FROM_LEVEL(GetFrameEmbeddingLevel(aFrame));
+  }
+
+  static bool IsFrameInParagraphDirection(nsIFrame* aFrame) {
+    return ParagraphDirection(aFrame) == FrameDirection(aFrame);
+  }
+
   enum Mode { MODE_DRAW, MODE_MEASURE };
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCaret.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCaret.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCaret.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCaret.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -381,7 +381,7 @@
 
   nsIContent* contentNode = focusNode->AsContent();
   nsFrameSelection* frameSelection = aSelection->GetFrameSelection();
-  uint8_t bidiLevel = frameSelection->GetCaretBidiLevel();
+  nsBidiLevel bidiLevel = frameSelection->GetCaretBidiLevel();
   nsIFrame* frame;
   nsresult rv = nsCaret::GetCaretFrameForNodeOffset(
       frameSelection, contentNode, focusOffset,
@@ -607,12 +607,12 @@
   }
 }
 
-nsresult 
+nsresult
 nsCaret::GetCaretFrameForNodeOffset(nsFrameSelection*    aFrameSelection,
                                     nsIContent*          aContentNode,
                                     int32_t              aOffset,
                                     CaretAssociationHint aFrameHint,
-                                    uint8_t              aBidiLevel,
+                                    nsBidiLevel          aBidiLevel,
                                     nsIFrame**           aReturnFrame,
                                     int32_t*             aReturnOffset)
 {
@@ -646,7 +646,6 @@
   // ------------------
   // NS_STYLE_DIRECTION_LTR : LTR or Default
   // NS_STYLE_DIRECTION_RTL
-  // NS_STYLE_DIRECTION_INHERIT
   if (IsBidiUI())
   {
     // If there has been a reflow, take the caret Bidi level to be the level of the current frame
@@ -657,8 +656,8 @@
     int32_t end;
     nsIFrame* frameBefore;
     nsIFrame* frameAfter;
-    uint8_t levelBefore;     // Bidi level of the character before the caret
-    uint8_t levelAfter;      // Bidi level of the character after the caret
+    nsBidiLevel levelBefore; // Bidi level of the character before the caret
+    nsBidiLevel levelAfter;  // Bidi level of the character after the caret
 
     theFrame->GetOffsets(start, end);
     if (start == 0 || end == 0 || start == theFrameOffset || end == theFrameOffset)
@@ -679,8 +678,10 @@
           aBidiLevel = std::max(aBidiLevel, std::min(levelBefore, levelAfter));                                  // rule c3
           aBidiLevel = std::min(aBidiLevel, std::max(levelBefore, levelAfter));                                  // rule c4
           if (aBidiLevel == levelBefore                                                                      // rule c1
-              || (aBidiLevel > levelBefore && aBidiLevel < levelAfter && !((aBidiLevel ^ levelBefore) & 1))    // rule c5
-              || (aBidiLevel < levelBefore && aBidiLevel > levelAfter && !((aBidiLevel ^ levelBefore) & 1)))  // rule c9
+              || (aBidiLevel > levelBefore && aBidiLevel < levelAfter &&
+                  IS_SAME_DIRECTION(aBidiLevel, levelBefore))   // rule c5
+              || (aBidiLevel < levelBefore && aBidiLevel > levelAfter &&
+                  IS_SAME_DIRECTION(aBidiLevel, levelBefore)))  // rule c9
           {
             if (theFrame != frameBefore)
             {
@@ -696,10 +697,12 @@
                 // so we stay with the current frame.
                 // Exception: when the first frame on the line has a different Bidi level from the paragraph level, there is no
                 // real frame for the caret to be in. We have to find the visually first frame on the line.
-                uint8_t baseLevel = NS_GET_BASE_LEVEL(frameAfter);
+                nsBidiLevel baseLevel = NS_GET_BASE_LEVEL(frameAfter);
                 if (baseLevel != levelAfter)
                 {
-                  nsPeekOffsetStruct pos(eSelectBeginLine, eDirPrevious, 0, 0, false, true, false, true);
+                  nsPeekOffsetStruct pos(eSelectBeginLine, eDirPrevious, 0,
+                                         nsPoint(0, 0), false, true, false,
+                                         true);
                   if (NS_SUCCEEDED(frameAfter->PeekOffset(&pos))) {
                     theFrame = pos.mResultFrame;
                     theFrameOffset = pos.mContentOffset;
@@ -709,8 +712,10 @@
             }
           }
           else if (aBidiLevel == levelAfter                                                                     // rule c2
-                   || (aBidiLevel > levelBefore && aBidiLevel < levelAfter && !((aBidiLevel ^ levelAfter) & 1))   // rule c6
-                   || (aBidiLevel < levelBefore && aBidiLevel > levelAfter && !((aBidiLevel ^ levelAfter) & 1)))  // rule c10
+                   || (aBidiLevel > levelBefore && aBidiLevel < levelAfter &&
+                       IS_SAME_DIRECTION(aBidiLevel, levelAfter))   // rule c6
+                   || (aBidiLevel < levelBefore && aBidiLevel > levelAfter &&
+                       IS_SAME_DIRECTION(aBidiLevel, levelAfter)))  // rule c10
           {
             if (theFrame != frameAfter)
             {
@@ -727,10 +732,12 @@
                 // so we stay with the current frame.
                 // Exception: when the last frame on the line has a different Bidi level from the paragraph level, there is no
                 // real frame for the caret to be in. We have to find the visually last frame on the line.
-                uint8_t baseLevel = NS_GET_BASE_LEVEL(frameBefore);
+                nsBidiLevel baseLevel = NS_GET_BASE_LEVEL(frameBefore);
                 if (baseLevel != levelBefore)
                 {
-                  nsPeekOffsetStruct pos(eSelectEndLine, eDirNext, 0, 0, false, true, false, true);
+                  nsPeekOffsetStruct pos(eSelectEndLine, eDirNext, 0,
+                                         nsPoint(0, 0), false, true, false,
+                                         true);
                   if (NS_SUCCEEDED(frameBefore->PeekOffset(&pos))) {
                     theFrame = pos.mResultFrame;
                     theFrameOffset = pos.mContentOffset;
@@ -740,33 +747,33 @@
             }
           }
           else if (aBidiLevel > levelBefore && aBidiLevel < levelAfter  // rule c7/8
-                   && !((levelBefore ^ levelAfter) & 1)                 // before and after have the same parity
-                   && ((aBidiLevel ^ levelAfter) & 1))                  // caret has different parity
+                   && IS_SAME_DIRECTION(levelBefore, levelAfter)        // before and after have the same parity
+                   && !IS_SAME_DIRECTION(aBidiLevel, levelAfter))       // caret has different parity
           {
             if (NS_SUCCEEDED(aFrameSelection->GetFrameFromLevel(frameAfter, eDirNext, aBidiLevel, &theFrame)))
             {
               theFrame->GetOffsets(start, end);
               levelAfter = NS_GET_EMBEDDING_LEVEL(theFrame);
-              if (aBidiLevel & 1) // c8: caret to the right of the rightmost character
-                theFrameOffset = (levelAfter & 1) ? start : end;
+              if (IS_LEVEL_RTL(aBidiLevel)) // c8: caret to the right of the rightmost character
+                theFrameOffset = IS_LEVEL_RTL(levelAfter) ? start : end;
               else               // c7: caret to the left of the leftmost character
-                theFrameOffset = (levelAfter & 1) ? end : start;
+                theFrameOffset = IS_LEVEL_RTL(levelAfter) ? end : start;
             }
           }
           else if (aBidiLevel < levelBefore && aBidiLevel > levelAfter  // rule c11/12
-                   && !((levelBefore ^ levelAfter) & 1)                 // before and after have the same parity
-                   && ((aBidiLevel ^ levelAfter) & 1))                  // caret has different parity
+                   && IS_SAME_DIRECTION(levelBefore, levelAfter)        // before and after have the same parity
+                   && !IS_SAME_DIRECTION(aBidiLevel, levelAfter))       // caret has different parity
           {
             if (NS_SUCCEEDED(aFrameSelection->GetFrameFromLevel(frameBefore, eDirPrevious, aBidiLevel, &theFrame)))
             {
               theFrame->GetOffsets(start, end);
               levelBefore = NS_GET_EMBEDDING_LEVEL(theFrame);
-              if (aBidiLevel & 1) // c12: caret to the left of the leftmost character
-                theFrameOffset = (levelBefore & 1) ? end : start;
+              if (IS_LEVEL_RTL(aBidiLevel)) // c12: caret to the left of the leftmost character
+                theFrameOffset = IS_LEVEL_RTL(levelBefore) ? end : start;
               else               // c11: caret to the right of the rightmost character
-                theFrameOffset = (levelBefore & 1) ? start : end;
+                theFrameOffset = IS_LEVEL_RTL(levelBefore) ? start : end;
             }
-          }   
+          }
         }
       }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSFrameConstructor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSFrameConstructor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSFrameConstructor.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSFrameConstructor.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -611,30 +611,6 @@
   aParent->SetInitialChildList(kPrincipalList, temp);
 }
 
-static nsContainerFrame*
-GetContentInsertionFrameFor(nsIContent* aContent)
-{
-  // Get the primary frame associated with the content
-  nsIFrame* frame = aContent->GetPrimaryFrame();
-
-  if (!frame)
-    return nullptr;
-
-  // If the content of the frame is not the desired content then this is not
-  // really a frame for the desired content.
-  // XXX This check is needed due to bug 135040. Remove it once that's fixed.
-  if (frame->GetContent() != aContent) {
-    return nullptr;
-  }
-
-  nsContainerFrame* insertionFrame = frame->GetContentInsertionFrame();
-
-  NS_ASSERTION(!insertionFrame || insertionFrame == frame || !frame->IsLeaf(),
-    "The insertion frame is the primary frame or the primary frame isn't a leaf");
-
-  return insertionFrame;
-}
-
 // -----------------------------------------------------------
 
 // Structure used when constructing formatting object trees.
@@ -2288,8 +2264,9 @@
   // eExcludesIgnorableWhitespace frames, where we know we'll be dropping them
   // all anyway, and involve an extra walk down the frame construction item
   // list.
-  if (!aParentFrame->IsFrameOfType(nsIFrame::eExcludesIgnorableWhitespace) ||
-      aParentFrame->IsGeneratedContentFrame() ||
+  if ((aParentFrame &&
+       (!aParentFrame->IsFrameOfType(nsIFrame::eExcludesIgnorableWhitespace) ||
+        aParentFrame->IsGeneratedContentFrame())) ||
       !aChildContent->IsNodeOfType(nsINode::eTEXT)) {
     return true;
   }
@@ -2597,7 +2574,8 @@
     newFrame = frameItems.FirstChild();
     NS_ASSERTION(frameItems.OnlyChild(), "multiple root element frames");
   } else {
-    MOZ_ASSERT(display->mDisplay == NS_STYLE_DISPLAY_BLOCK,
+    MOZ_ASSERT(display->mDisplay == NS_STYLE_DISPLAY_BLOCK ||
+               display->mDisplay == NS_STYLE_DISPLAY_CONTENTS,
                "Unhandled display type for root element");
     contentFrame = NS_NewBlockFormattingContext(mPresShell, styleContext);
     nsFrameItems frameItems;
@@ -2624,7 +2602,7 @@
   // Figure out which frame has the main style for the document element,
   // assigning it to mRootElementStyleFrame.
   // Backgrounds should be propagated from that frame to the viewport.
-  mRootElementStyleFrame = contentFrame->GetParentStyleContextFrame();
+  contentFrame->GetParentStyleContext(&mRootElementStyleFrame);
   bool isChild = mRootElementStyleFrame &&
                  mRootElementStyleFrame->GetParent() == contentFrame;
   if (!isChild) {
@@ -3704,19 +3682,22 @@
     return;
   }
 
-  nsStyleContext* const styleContext = aItem.mStyleContext;
-  const nsStyleDisplay* display = styleContext->StyleDisplay();
   nsIContent* const content = aItem.mContent;
+  nsIContent* parent = content->GetParent();
+
+  // Push display:contents ancestors.
+  AutoDisplayContentsAncestorPusher adcp(aState.mTreeMatchContext,
+                                         aState.mPresContext, parent);
 
   // Get the parent of the content and check if it is a XBL children element.
   // Push the children element as an ancestor here because it does
   // not have a frame and would not otherwise be pushed as an ancestor. It is
   // necessary to do so in order to correctly handle style resolution on
-  // descendants.
-  nsIContent* parent = content->GetParent();
+  // descendants.  (If !adcp.IsEmpty() then it was already pushed by
+  // AutoDisplayContentsAncestorPusher above.)
   TreeMatchContext::AutoAncestorPusher
     insertionPointPusher(aState.mTreeMatchContext);
-  if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
+  if (adcp.IsEmpty() && parent && nsContentUtils::IsContentInsertionPoint(parent)) {
     if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
       insertionPointPusher.PushAncestorAndStyleScope(parent);
     } else {
@@ -3742,6 +3723,8 @@
 
   nsIFrame* newFrame;
   nsIFrame* primaryFrame;
+  nsStyleContext* const styleContext = aItem.mStyleContext;
+  const nsStyleDisplay* display = styleContext->StyleDisplay();
   if (bits & FCDATA_FUNC_IS_FULL_CTOR) {
     newFrame =
       (this->*(data->mFullConstructor))(aState, aItem, aParentFrame,
@@ -3992,6 +3975,7 @@
   NS_ASSERTION(creator,
                "How can that happen if we have nodes to construct frames for?");
 
+  InsertionPoint insertion(aParentFrame, aParent);
   for (uint32_t i=0; i < count; i++) {
     nsIContent* content = newAnonymousItems[i].mContent;
     NS_ASSERTION(content, "null anonymous content?");
@@ -4015,7 +3999,7 @@
         TreeMatchContext::AutoParentDisplayBasedStyleFixupSkipper
           parentDisplayBasedStyleFixupSkipper(aState.mTreeMatchContext);
 
-        AddFrameConstructionItems(aState, content, true, aParentFrame, items);
+        AddFrameConstructionItems(aState, content, true, insertion, items);
       }
       ConstructFramesFromItemList(aState, items, aParentFrame, aChildItems);
     }
@@ -4508,7 +4492,8 @@
   // block-level.
   NS_ASSERTION(!(aDisplay->IsFloatingStyle() ||
                  aDisplay->IsAbsolutelyPositionedStyle()) ||
-               aDisplay->IsBlockOutsideStyle(),
+               aDisplay->IsBlockOutsideStyle() ||
+               aDisplay->mDisplay == NS_STYLE_DISPLAY_CONTENTS,
                "Style system did not apply CSS2.1 section 9.7 fixups");
 
   // If this is "body", try propagating its scroll style to the viewport
@@ -4649,9 +4634,16 @@
     { NS_STYLE_DISPLAY_TABLE_CELL,
       FULL_CTOR_FCDATA(FCDATA_IS_TABLE_PART |
                        FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRow),
-                       &nsCSSFrameConstructor::ConstructTableCell) }
+                       &nsCSSFrameConstructor::ConstructTableCell) },
+    { NS_STYLE_DISPLAY_CONTENTS,
+      FULL_CTOR_FCDATA(FCDATA_IS_CONTENTS, nullptr/*never called*/) }
   };
 
+  // See the mDisplay fixup code in nsRuleNode::ComputeDisplayData.
+  MOZ_ASSERT(aDisplay->mDisplay != NS_STYLE_DISPLAY_CONTENTS ||
+             !aElement->IsRootOfNativeAnonymousSubtree(),
+             "display:contents on anonymous content is unsupported");
+
   return FindDataByInt(aDisplay->mDisplay,
                        aElement, aStyleContext, sDisplayData,
                        ArrayLength(sDisplayData));
@@ -4765,27 +4757,48 @@
 
 already_AddRefed<nsStyleContext>
 nsCSSFrameConstructor::ResolveStyleContext(nsIFrame*         aParentFrame,
-                                           nsIContent*       aContent,
+                                           nsIContent*       aContainer,
+                                           nsIContent*       aChild,
                                            nsFrameConstructorState* aState)
 {
-  nsStyleContext* parentStyleContext = nullptr;
-  NS_ASSERTION(aContent->GetParent(), "Must have parent here");
+  MOZ_ASSERT(aContainer, "Must have parent here");
+  // XXX uncomment when bug 1089223 is fixed:
+  // MOZ_ASSERT(aContainer == aChild->GetFlattenedTreeParent());
+  nsStyleContext* parentStyleContext = GetDisplayContentsStyleFor(aContainer);
+  if (MOZ_LIKELY(!parentStyleContext)) {
+    aParentFrame = nsFrame::CorrectStyleParentFrame(aParentFrame, nullptr);
+    if (aParentFrame) {
+      MOZ_ASSERT(aParentFrame->GetContent() == aContainer);
+      // Resolve the style context based on the content object and the parent
+      // style context
+      parentStyleContext = aParentFrame->StyleContext();
+    } else {
+      // Perhaps aParentFrame is a canvasFrame and we're replicating
+      // fixed-pos frames.
+      // XXX should we create a way to tell ConstructFrame which style
+      // context to use, and pass it the style context for the
+      // previous page's fixed-pos frame?
+    }
+  }
 
-  aParentFrame = nsFrame::CorrectStyleParentFrame(aParentFrame, nullptr);
+  return ResolveStyleContext(parentStyleContext, aChild, aState);
+}
 
-  if (aParentFrame) {
-    // Resolve the style context based on the content object and the parent
-    // style context
-    parentStyleContext = aParentFrame->StyleContext();
-  } else {
-    // Perhaps aParentFrame is a canvasFrame and we're replicating
-    // fixed-pos frames.
-    // XXX should we create a way to tell ConstructFrame which style
-    // context to use, and pass it the style context for the
-    // previous page's fixed-pos frame?
-  }
+already_AddRefed<nsStyleContext>
+nsCSSFrameConstructor::ResolveStyleContext(nsIFrame*          aParentFrame,
+                                           nsIContent*              aChild,
+                                           nsFrameConstructorState* aState)
+{
+  return ResolveStyleContext(aParentFrame, aChild->GetFlattenedTreeParent(), aChild, aState);
+}
 
-  return ResolveStyleContext(parentStyleContext, aContent, aState);
+already_AddRefed<nsStyleContext>
+nsCSSFrameConstructor::ResolveStyleContext(const InsertionPoint&    aInsertion,
+                                           nsIContent*              aChild,
+                                           nsFrameConstructorState* aState)
+{
+  return ResolveStyleContext(aInsertion.mParentFrame, aInsertion.mContainer,
+                             aChild, aState);
 }
 
 already_AddRefed<nsStyleContext>
@@ -5303,12 +5316,10 @@
                     true, nullptr);
 }
 
-void
-nsCSSFrameConstructor::AddFrameConstructionItems(nsFrameConstructorState& aState,
+bool
+nsCSSFrameConstructor::ShouldCreateItemsForChild(nsFrameConstructorState& aState,
                                                  nsIContent* aContent,
-                                                 bool aSuppressWhiteSpaceOptimizations,
-                                                 nsContainerFrame* aParentFrame,
-                                                 FrameConstructionItemList& aItems)
+                                                 nsContainerFrame* aParentFrame)
 {
   aContent->UnsetFlags(NODE_DESCENDANTS_NEED_FRAMES | NODE_NEEDS_FRAME);
   if (aContent->IsElement()) {
@@ -5329,40 +5340,70 @@
       !aState.mCreatingExtraFrames) {
     NS_ERROR("asked to create frame construction item for a node that already "
              "has a frame");
-    return;
+    return false;
   }
 
   // don't create a whitespace frame if aParent doesn't want it
   if (!NeedFrameFor(aState, aParentFrame, aContent)) {
-    return;
+    return false;
   }
 
   // never create frames for comments or PIs
   if (aContent->IsNodeOfType(nsINode::eCOMMENT) ||
-      aContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION))
-    return;
+      aContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION)) {
+    return false;
+  }
 
-  nsRefPtr<nsStyleContext> styleContext;
-  styleContext = ResolveStyleContext(aParentFrame, aContent, &aState);
+  return true;
+}
 
+void
+nsCSSFrameConstructor::DoAddFrameConstructionItems(nsFrameConstructorState& aState,
+                                                   nsIContent* aContent,
+                                                   nsStyleContext* aStyleContext,
+                                                   bool aSuppressWhiteSpaceOptimizations,
+                                                   nsContainerFrame* aParentFrame,
+                                                   nsTArray<nsIAnonymousContentCreator::ContentInfo>* aAnonChildren,
+                                                   FrameConstructionItemList& aItems)
+{
   uint32_t flags = ITEM_ALLOW_XBL_BASE | ITEM_ALLOW_PAGE_BREAK;
-  if (aParentFrame->IsSVGText()) {
-    flags |= ITEM_IS_WITHIN_SVG_TEXT;
-  }
-  if (aParentFrame->GetType() == nsGkAtoms::blockFrame &&
-      aParentFrame->GetParent() &&
-      aParentFrame->GetParent()->GetType() == nsGkAtoms::svgTextFrame) {
-    flags |= ITEM_ALLOWS_TEXT_PATH_CHILD;
+  if (aParentFrame) {
+    if (aParentFrame->IsSVGText()) {
+      flags |= ITEM_IS_WITHIN_SVG_TEXT;
+    }
+    if (aParentFrame->GetType() == nsGkAtoms::blockFrame &&
+        aParentFrame->GetParent() &&
+        aParentFrame->GetParent()->GetType() == nsGkAtoms::svgTextFrame) {
+      flags |= ITEM_ALLOWS_TEXT_PATH_CHILD;
+    }
   }
   AddFrameConstructionItemsInternal(aState, aContent, aParentFrame,
                                     aContent->Tag(), aContent->GetNameSpaceID(),
                                     aSuppressWhiteSpaceOptimizations,
-                                    styleContext,
-                                    flags, nullptr,
+                                    aStyleContext,
+                                    flags, aAnonChildren,
                                     aItems);
 }
 
 void
+nsCSSFrameConstructor::AddFrameConstructionItems(nsFrameConstructorState& aState,
+                                                 nsIContent* aContent,
+                                                 bool aSuppressWhiteSpaceOptimizations,
+                                                 const InsertionPoint& aInsertion,
+                                                 FrameConstructionItemList& aItems)
+{
+  nsContainerFrame* parentFrame = aInsertion.mParentFrame;
+  if (!ShouldCreateItemsForChild(aState, aContent, parentFrame)) {
+    return;
+  }
+  nsRefPtr<nsStyleContext> styleContext =
+    ResolveStyleContext(aInsertion, aContent, &aState);
+  DoAddFrameConstructionItems(aState, aContent, styleContext,
+                              aSuppressWhiteSpaceOptimizations, parentFrame,
+                              nullptr, aItems);
+}
+
+void
 nsCSSFrameConstructor::SetAsUndisplayedContent(nsFrameConstructorState& aState,
                                                FrameConstructionItemList& aList,
                                                nsIContent* aContent,
@@ -5400,6 +5441,8 @@
   NS_PRECONDITION(aContent->IsNodeOfType(nsINode::eTEXT) ||
                   aContent->IsElement(),
                   "Shouldn't get anything else here!");
+  MOZ_ASSERT(!aContent->GetPrimaryFrame() || aState.mCreatingExtraFrames ||
+             aContent->Tag() == nsGkAtoms::area);
 
   // The following code allows the user to specify the base tag
   // of an element using XBL.  XUL and HTML objects (like boxes, menus, etc.)
@@ -5571,6 +5614,66 @@
     AddPageBreakItem(aContent, aStyleContext, aItems);
   }
 
+  if (MOZ_UNLIKELY(bits & FCDATA_IS_CONTENTS)) {
+    if (!GetDisplayContentsStyleFor(aContent)) {
+      MOZ_ASSERT(styleContext->GetPseudo() || !isGeneratedContent,
+                 "Should have had pseudo type");
+      aState.mFrameManager->SetDisplayContents(aContent, styleContext);
+    } else {
+      aState.mFrameManager->ChangeDisplayContents(aContent, styleContext);
+    }
+
+    TreeMatchContext::AutoAncestorPusher ancestorPusher(aState.mTreeMatchContext);
+    if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
+      ancestorPusher.PushAncestorAndStyleScope(aContent->AsElement());
+    } else {
+      ancestorPusher.PushStyleScope(aContent->AsElement());
+    }
+
+    if (aParentFrame) {
+      aParentFrame->AddStateBits(NS_FRAME_MAY_HAVE_GENERATED_CONTENT);
+    }
+    CreateGeneratedContentItem(aState, aParentFrame, aContent, styleContext,
+                               nsCSSPseudoElements::ePseudo_before, aItems);
+
+    FlattenedChildIterator iter(aContent);
+    for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
+      if (!ShouldCreateItemsForChild(aState, child, aParentFrame)) {
+        continue;
+      }
+
+      // Get the parent of the content and check if it is a XBL children element
+      // (if the content is a children element then parent != aContent because the
+      // FlattenedChildIterator will transitively iterate through <xbl:children>
+      // for default content). Push the children element as an ancestor here because
+      // it does not have a frame and would not otherwise be pushed as an ancestor.
+      nsIContent* parent = child->GetParent();
+      MOZ_ASSERT(parent, "Parent must be non-null because we are iterating children.");
+      TreeMatchContext::AutoAncestorPusher ancestorPusher(aState.mTreeMatchContext);
+      if (parent != aContent && parent->IsElement()) {
+        if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
+          ancestorPusher.PushAncestorAndStyleScope(parent->AsElement());
+        } else {
+          ancestorPusher.PushStyleScope(parent->AsElement());
+        }
+      }
+
+      nsRefPtr<nsStyleContext> childContext =
+        ResolveStyleContext(styleContext, child, &aState);
+      DoAddFrameConstructionItems(aState, child, childContext,
+                                  aSuppressWhiteSpaceOptimizations,
+                                  aParentFrame, aAnonChildren, aItems);
+    }
+    aItems.SetParentHasNoXBLChildren(!iter.XBLInvolved());
+
+    CreateGeneratedContentItem(aState, aParentFrame, aContent, styleContext,
+                               nsCSSPseudoElements::ePseudo_after, aItems);
+    if (canHavePageBreak && display->mBreakAfter) {
+      AddPageBreakItem(aContent, aStyleContext, aItems);
+    }
+    return;
+  }
+
   FrameConstructionItem* item =
     aItems.AppendItem(data, aContent, aTag, aNameSpaceID,
                       pendingBinding, styleContext.forget(),
@@ -5677,24 +5780,17 @@
 }
 
 static void
-DestroyContent(void* aPropertyValue)
-{
-  nsIContent* content = static_cast<nsIContent*>(aPropertyValue);
-  content->UnbindFromTree();
-  NS_RELEASE(content);
-}
-
-NS_DECLARE_FRAME_PROPERTY(BeforeProperty, DestroyContent)
-NS_DECLARE_FRAME_PROPERTY(AfterProperty, DestroyContent)
-
-static const FramePropertyDescriptor*
-GenConPseudoToProperty(nsIAtom* aPseudo)
+AddGenConPseudoToFrame(nsIFrame* aOwnerFrame, nsIContent* aContent)
 {
-  NS_ASSERTION(aPseudo == nsCSSPseudoElements::before ||
-               aPseudo == nsCSSPseudoElements::after,
-               "Bad gen-con pseudo");
-  return aPseudo == nsCSSPseudoElements::before ? BeforeProperty()
-      : AfterProperty();
+  typedef nsAutoTArray<nsIContent*, 2> T;
+  const FramePropertyDescriptor* prop = nsIFrame::GenConProperty();
+  FrameProperties props = aOwnerFrame->Properties();
+  T* value = static_cast<T*>(props.Get(prop));
+  if (!value) {
+    value = new T;
+    props.Set(prop, value);
+  }
+  value->AppendElement(aContent);
 }
 
 /**
@@ -5798,8 +5894,7 @@
     // setting it on a table pseudo-frame inserted under that instead.  That's
     // OK, though; we just need to do the property set so that the content will
     // get cleaned up when the frame is destroyed.
-    aParentFrame->Properties().Set(GenConPseudoToProperty(styleContext->GetPseudo()),
-                                   item.mContent);
+    ::AddGenConPseudoToFrame(aParentFrame, item.mContent);
 
     // Now that we've passed ownership of item.mContent to the frame, unset
     // our generated content flag so we don't release or unbind it ourselves.
@@ -5934,21 +6029,70 @@
  * frame before which appended content should go, if there is one.
  */
 static nsContainerFrame*
-AdjustAppendParentForAfterContent(nsPresContext* aPresContext,
+AdjustAppendParentForAfterContent(nsFrameManager* aFrameManager,
                                   nsIContent* aContainer,
                                   nsContainerFrame* aParentFrame,
+                                  nsIContent* aChild,
                                   nsIFrame** aAfterFrame)
 {
-  // See if the parent has an :after pseudo-element.  Check for the presence
-  // of style first, since nsLayoutUtils::GetAfterFrame is sorta expensive.
-  nsStyleContext* parentStyle = aParentFrame->StyleContext();
-  if (nsLayoutUtils::HasPseudoStyle(aContainer, parentStyle,
+  // If the parent frame has any pseudo-elements or aContainer is a
+  // display:contents node then we need to walk through the child
+  // frames to find the first one that is either a ::after frame for an
+  // ancestor of aChild or a frame that is for a node later in the
+  // document than aChild and return that in aAfterFrame.
+  if (aParentFrame->GetGenConPseudos() ||
+      nsLayoutUtils::HasPseudoStyle(aContainer, aParentFrame->StyleContext(),
                                     nsCSSPseudoElements::ePseudo_after,
-                                    aPresContext)) {
-    // Ensure that the :after frame is on the principal child list.
-    aParentFrame->DrainSelfOverflowList();
+                                    aParentFrame->PresContext()) ||
+      aFrameManager->GetDisplayContentsStyleFor(aContainer)) {
+    nsIFrame* afterFrame = nullptr;
+    nsContainerFrame* parent =
+      static_cast<nsContainerFrame*>(aParentFrame->LastContinuation());
+    bool done = false;
+    while (!done && parent) {
+      // Ensure that all normal flow children are on the principal child list.
+      parent->DrainSelfOverflowList();
+
+      nsIFrame* child = parent->GetLastChild(nsIFrame::kPrincipalList);
+      if (child && child->IsPseudoFrame(aContainer) &&
+          !child->IsGeneratedContentFrame()) {
+        // Drill down into non-generated pseudo frames of aContainer.
+        parent = nsLayoutUtils::LastContinuationWithChild(do_QueryFrame(child));
+        continue;
+      }
+
+      for (; child; child = child->GetPrevSibling()) {
+        nsIContent* c = child->GetContent();
+        if (child->IsGeneratedContentFrame()) {
+          nsIContent* p = c->GetParent();
+          if (c->Tag() == nsGkAtoms::mozgeneratedcontentafter) {
+            if (!nsContentUtils::ContentIsDescendantOf(aChild, p) &&
+                p != aContainer &&
+                nsContentUtils::PositionIsBefore(p, aChild)) {
+              // ::after generated content for content earlier in the doc and not
+              // for an ancestor.  "p != aContainer" may seem redundant but it
+              // checks if the ::after belongs to the XBL insertion point we're
+              // inserting aChild into (in which case ContentIsDescendantOf is
+              // false even though p == aContainer).
+              // See layout/reftests/bugs/482592-1a.xhtml for an example of that.
+              done = true;
+              break;
+            }
+          } else if (nsContentUtils::PositionIsBefore(p, aChild)) {
+            // Non-::after generated content for content earlier in the doc.
+            done = true;
+            break;
+          }
+        } else if (nsContentUtils::PositionIsBefore(c, aChild)) {
+          // Content is before aChild.
+          done = true;
+          break;
+        }
+        afterFrame = child;
+      }
 
-    nsIFrame* afterFrame = nsLayoutUtils::GetAfterFrame(aParentFrame);
+      parent = static_cast<nsContainerFrame*>(parent->GetPrevContinuation());
+    }
     if (afterFrame) {
       *aAfterFrame = afterFrame;
       return afterFrame->GetParent();
@@ -6143,15 +6287,19 @@
       nsGkAtoms::menuFrame == parentType) {
     // if we haven't already, construct a style context to find the display type of aContent
     if (UNSET_DISPLAY == aDisplay) {
-      nsRefPtr<nsStyleContext> styleContext;
-      nsIFrame* styleParent = aSibling->GetParentStyleContextFrame();
+      nsIFrame* styleParent;
+      aSibling->GetParentStyleContext(&styleParent);
+      if (!styleParent) {
+        styleParent = aSibling->GetParent();
+      }
       if (!styleParent) {
         NS_NOTREACHED("Shouldn't happen");
         return false;
       }
       // XXXbz when this code is killed, the state argument to
       // ResolveStyleContext can be made non-optional.
-      styleContext = ResolveStyleContext(styleParent, aContent, nullptr);
+      nsRefPtr<nsStyleContext> styleContext =
+        ResolveStyleContext(styleParent, aContent, nullptr);
       const nsStyleDisplay* display = styleContext->StyleDisplay();
       aDisplay = display->mDisplay;
     }
@@ -6211,10 +6359,33 @@
 nsCSSFrameConstructor::FindFrameForContentSibling(nsIContent* aContent,
                                                   nsIContent* aTargetContent,
                                                   uint8_t& aTargetContentDisplay,
+                                                  nsContainerFrame* aParentFrame,
                                                   bool aPrevSibling)
 {
   nsIFrame* sibling = aContent->GetPrimaryFrame();
-  if (!sibling || sibling->GetContent() != aContent) {
+  if (!sibling && GetDisplayContentsStyleFor(aContent)) {
+    // A display:contents node - check if it has a ::before / ::after frame...
+    sibling = aPrevSibling ?
+      nsLayoutUtils::GetAfterFrameForContent(aParentFrame, aContent) :
+      nsLayoutUtils::GetBeforeFrameForContent(aParentFrame, aContent);
+    if (!sibling) {
+      // ... then recurse into children ...
+      const bool forward = !aPrevSibling;
+      FlattenedChildIterator iter(aContent, forward);
+      sibling = aPrevSibling ?
+        FindPreviousSibling(iter, aTargetContent, aTargetContentDisplay, aParentFrame) :
+        FindNextSibling(iter, aTargetContent, aTargetContentDisplay, aParentFrame);
+    }
+    if (!sibling) {
+      // ... then ::after / ::before on the opposite end.
+      sibling = aPrevSibling ?
+        nsLayoutUtils::GetBeforeFrameForContent(aParentFrame, aContent) :
+        nsLayoutUtils::GetAfterFrameForContent(aParentFrame, aContent);
+    }
+    if (!sibling) {
+      return nullptr;
+    }
+  } else if (!sibling || sibling->GetContent() != aContent) {
     // XXX the GetContent() != aContent check is needed due to bug 135040.
     // Remove it once that's fixed.
     return nullptr;
@@ -6253,16 +6424,17 @@
 
 nsIFrame*
 nsCSSFrameConstructor::FindPreviousSibling(FlattenedChildIterator aIter,
-                                           uint8_t& aTargetContentDisplay)
+                                           nsIContent* aTargetContent,
+                                           uint8_t& aTargetContentDisplay,
+                                           nsContainerFrame* aParentFrame)
 {
-  nsIContent* child = aIter.Get();
-
   // Note: not all content objects are associated with a frame (e.g., if it's
-  // `display: none') so keep looking until we find a previous frame
+  // `display: none') so keep looking until we find a previous frame.
   while (nsIContent* sibling = aIter.GetPreviousChild()) {
+    MOZ_ASSERT(sibling != aTargetContent);
     nsIFrame* prevSibling =
-      FindFrameForContentSibling(sibling, child, aTargetContentDisplay, true);
-
+      FindFrameForContentSibling(sibling, aTargetContent, aTargetContentDisplay,
+                                 aParentFrame, true);
     if (prevSibling) {
       // Found a previous sibling, we're done!
       return prevSibling;
@@ -6274,13 +6446,15 @@
 
 nsIFrame*
 nsCSSFrameConstructor::FindNextSibling(FlattenedChildIterator aIter,
-                                       uint8_t& aTargetContentDisplay)
+                                       nsIContent* aTargetContent,
+                                       uint8_t& aTargetContentDisplay,
+                                       nsContainerFrame* aParentFrame)
 {
-  nsIContent* child = aIter.Get();
-
   while (nsIContent* sibling = aIter.GetNextChild()) {
+    MOZ_ASSERT(sibling != aTargetContent);
     nsIFrame* nextSibling =
-      FindFrameForContentSibling(sibling, child, aTargetContentDisplay, false);
+      FindFrameForContentSibling(sibling, aTargetContent, aTargetContentDisplay,
+                                 aParentFrame, false);
 
     if (nextSibling) {
       // We found a next sibling, we're done!
@@ -6313,26 +6487,24 @@
 }
 
 nsIFrame*
-nsCSSFrameConstructor::GetInsertionPrevSibling(nsContainerFrame*& aParentFrame,
-                                               nsIContent* aContainer,
+nsCSSFrameConstructor::GetInsertionPrevSibling(InsertionPoint* aInsertion,
                                                nsIContent* aChild,
-                                               bool* aIsAppend,
-                                               bool* aIsRangeInsertSafe,
+                                               bool*       aIsAppend,
+                                               bool*       aIsRangeInsertSafe,
                                                nsIContent* aStartSkipChild,
                                                nsIContent* aEndSkipChild)
 {
+  NS_PRECONDITION(aInsertion->mParentFrame, "Must have parent frame to start with");
+
   *aIsAppend = false;
 
   // Find the frame that precedes the insertion point. Walk backwards
   // from the parent frame to get the parent content, because if an
   // XBL insertion point is involved, we'll need to use _that_ to find
   // the preceding frame.
-
-  NS_PRECONDITION(aParentFrame, "Must have parent frame to start with");
-  nsIContent* container = aParentFrame->GetContent();
-
-  FlattenedChildIterator iter(container);
-  bool xblCase = iter.XBLInvolved() || container != aContainer;
+  FlattenedChildIterator iter(aInsertion->mContainer);
+  bool xblCase = iter.XBLInvolved() ||
+         aInsertion->mParentFrame->GetContent() != aInsertion->mContainer;
   if (xblCase || !aChild->IsRootOfAnonymousSubtree()) {
     // The check for IsRootOfAnonymousSubtree() is because editor is
     // severely broken and calls us directly for native anonymous
@@ -6352,47 +6524,66 @@
   // Note that FindPreviousSibling is passed the iterator by value, so that
   // the later usage of the iterator starts from the same place.
   uint8_t childDisplay = UNSET_DISPLAY;
-  nsIFrame* prevSibling = FindPreviousSibling(iter, childDisplay);
+  nsIFrame* prevSibling =
+    FindPreviousSibling(iter, iter.Get(), childDisplay, aInsertion->mParentFrame);
 
   // Now, find the geometric parent so that we can handle
   // continuations properly. Use the prev sibling if we have it;
   // otherwise use the next sibling.
   if (prevSibling) {
-    aParentFrame = prevSibling->GetParent()->GetContentInsertionFrame();
-  }
-  else {
+    aInsertion->mParentFrame = prevSibling->GetParent()->GetContentInsertionFrame();
+  } else {
     // If there is no previous sibling, then find the frame that follows
     if (aEndSkipChild) {
       iter.Seek(aEndSkipChild);
       iter.GetPreviousChild();
     }
-    nsIFrame* nextSibling = FindNextSibling(iter, childDisplay);
+    nsIFrame* nextSibling =
+      FindNextSibling(iter, iter.Get(), childDisplay, aInsertion->mParentFrame);
+    if (GetDisplayContentsStyleFor(aInsertion->mContainer)) {
+      if (!nextSibling) {
+        // Our siblings (if any) does not have a frame to guide us.
+        // The frame for aChild should be inserted whereever a frame for
+        // the container would be inserted.  This is needed when inserting
+        // into nested display:contents nodes.
+        nsIContent* child = aInsertion->mContainer;
+        InsertionPoint fakeInsertion(aInsertion->mParentFrame, child->GetParent());
+        nsIFrame* result = GetInsertionPrevSibling(&fakeInsertion, child, aIsAppend,
+                                                   aIsRangeInsertSafe, nullptr, nullptr);
+        MOZ_ASSERT(aInsertion->mParentFrame == fakeInsertion.mParentFrame);
+        return result;
+      }
 
-    if (nextSibling) {
-      aParentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
+      prevSibling = nextSibling->GetPrevSibling();
     }
-    else {
+
+    if (nextSibling) {
+      aInsertion->mParentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
+    } else {
       // No previous or next sibling, so treat this like an appended frame.
       *aIsAppend = true;
-      if (IsFramePartOfIBSplit(aParentFrame)) {
+      if (IsFramePartOfIBSplit(aInsertion->mParentFrame)) {
         // Since we're appending, we'll walk to the last anonymous frame
         // that was created for the broken inline frame.  But don't walk
         // to the trailing inline if it's empty; stop at the block.
-        aParentFrame = GetLastIBSplitSibling(aParentFrame, false);
+        aInsertion->mParentFrame =
+          GetLastIBSplitSibling(aInsertion->mParentFrame, false);
       }
       // Get continuation that parents the last child.  This MUST be done
       // before the AdjustAppendParentForAfterContent call.
-      aParentFrame = nsLayoutUtils::LastContinuationWithChild(aParentFrame);
+      aInsertion->mParentFrame =
+        nsLayoutUtils::LastContinuationWithChild(aInsertion->mParentFrame);
       // Deal with fieldsets
-      aParentFrame = ::GetAdjustedParentFrame(aParentFrame,
-                                              aParentFrame->GetType(),
-                                              aChild);
+      aInsertion->mParentFrame =
+        ::GetAdjustedParentFrame(aInsertion->mParentFrame,
+                                 aInsertion->mParentFrame->GetType(),
+                                 aChild);
       nsIFrame* appendAfterFrame;
-      aParentFrame =
-        ::AdjustAppendParentForAfterContent(mPresShell->GetPresContext(),
-                                            container, aParentFrame,
-                                            &appendAfterFrame);
-      prevSibling = ::FindAppendPrevSibling(aParentFrame, appendAfterFrame);
+      aInsertion->mParentFrame =
+        ::AdjustAppendParentForAfterContent(this, aInsertion->mContainer,
+                                            aInsertion->mParentFrame,
+                                            aChild, &appendAfterFrame);
+      prevSibling = ::FindAppendPrevSibling(aInsertion->mParentFrame, appendAfterFrame);
     }
   }
 
@@ -6400,6 +6591,40 @@
   return prevSibling;
 }
 
+nsContainerFrame*
+nsCSSFrameConstructor::GetContentInsertionFrameFor(nsIContent* aContent)
+{
+  // Get the primary frame associated with the content
+  nsIFrame* frame = aContent->GetPrimaryFrame();
+
+  if (!frame) {
+    if (GetDisplayContentsStyleFor(aContent)) {
+      nsIContent* parent = aContent->GetParent();
+      if (parent && parent == aContent->GetContainingShadow()) {
+        parent = parent->GetBindingParent();
+      }
+      frame = parent ? GetContentInsertionFrameFor(parent) : nullptr;
+    }
+    if (!frame) {
+      return nullptr;
+    }
+  } else {
+    // If the content of the frame is not the desired content then this is not
+    // really a frame for the desired content.
+    // XXX This check is needed due to bug 135040. Remove it once that's fixed.
+    if (frame->GetContent() != aContent) {
+      return nullptr;
+    }
+  }
+
+  nsContainerFrame* insertionFrame = frame->GetContentInsertionFrame();
+
+  NS_ASSERTION(!insertionFrame || insertionFrame == frame || !frame->IsLeaf(),
+    "The insertion frame is the primary frame or the primary frame isn't a leaf");
+
+  return insertionFrame;
+}
+
 static bool
 IsSpecialFramesetChild(nsIContent* aContent)
 {
@@ -6445,7 +6670,7 @@
 
 void
 nsCSSFrameConstructor::AddTextItemIfNeeded(nsFrameConstructorState& aState,
-                                           nsContainerFrame* aParentFrame,
+                                           const InsertionPoint& aInsertion,
                                            nsIContent* aPossibleTextContent,
                                            FrameConstructionItemList& aItems)
 {
@@ -6460,7 +6685,7 @@
   NS_ASSERTION(!aPossibleTextContent->GetPrimaryFrame(),
                "Text node has a frame and NS_CREATE_FRAME_IF_NON_WHITESPACE");
   AddFrameConstructionItems(aState, aPossibleTextContent, false,
-                            aParentFrame, aItems);
+                            aInsertion, aItems);
 }
 
 void
@@ -6537,6 +6762,10 @@
       needsFrameBitSet = true;
     }
 #endif
+    // XXXmats no lazy frames for display:contents descendants yet (bug 979782).
+    if (GetDisplayContentsStyleFor(content)) {
+      return false;
+    }
     content->SetFlags(NODE_DESCENDANTS_NEED_FRAMES);
     content = content->GetFlattenedTreeParent();
   }
@@ -6659,8 +6888,8 @@
   for (nsIContent* child = aStartChild;
        child != aEndChild;
        child = child->GetNextSibling()) {
-    if ((child->GetPrimaryFrame() ||
-         GetUndisplayedContent(child))
+    if ((child->GetPrimaryFrame() || GetUndisplayedContent(child) ||
+         GetDisplayContentsStyleFor(child))
 #ifdef MOZ_XUL
         //  Except listboxes suck, so do NOT skip anything here if
         //  we plan to notify a listbox.
@@ -6678,7 +6907,7 @@
   }
 }
 
-nsContainerFrame*
+nsCSSFrameConstructor::InsertionPoint
 nsCSSFrameConstructor::GetRangeInsertionPoint(nsIContent* aContainer,
                                               nsIContent* aStartChild,
                                               nsIContent* aEndChild,
@@ -6687,13 +6916,13 @@
   // See if we have an XBL insertion point. If so, then that's our
   // real parent frame; if not, then the frame hasn't been built yet
   // and we just bail.
-  bool multiple = false;
-  nsContainerFrame* insertionPoint = GetInsertionPoint(aContainer, nullptr, &multiple);
-  if (!insertionPoint && !multiple)
-    return nullptr; // Don't build the frames.
+  InsertionPoint insertionPoint = GetInsertionPoint(aContainer, nullptr);
+  if (!insertionPoint.mParentFrame && !insertionPoint.mMultiple) {
+    return insertionPoint; // Don't build the frames.
+  }
 
   bool hasInsertion = false;
-  if (!multiple) {
+  if (!insertionPoint.mMultiple) {
     // XXXbz XBL2/sXBL issue
     nsIDocument* document = aStartChild->GetComposedDoc();
     // XXXbz how would |document| be null here?
@@ -6702,12 +6931,12 @@
     }
   }
 
-  if (multiple || hasInsertion) {
+  if (insertionPoint.mMultiple || hasInsertion) {
     // We have an insertion point.  There are some additional tests we need to do
     // in order to ensure that an append is a safe operation.
     uint32_t childCount = 0;
 
-    if (!multiple) {
+    if (!insertionPoint.mMultiple) {
       // We may need to make multiple ContentInserted calls instead.  A
       // reasonable heuristic to employ (in order to maintain good performance)
       // is to find out if the insertion point's content node contains any
@@ -6720,19 +6949,19 @@
       // multiple ContentInserted calls anyway.
       // XXXndeakin This test doesn't work in the new world. Or rather, it works, but
       // it's slow
-      childCount = insertionPoint->GetContent()->GetChildCount();
+      childCount = insertionPoint.mParentFrame->GetContent()->GetChildCount();
     }
 
     // If we have multiple insertion points or if we have an insertion point
     // and the operation is not a true append or if the insertion point already
     // has explicit children, then we must fall back.
-    if (multiple || aEndChild != nullptr || childCount > 0) {
+    if (insertionPoint.mMultiple || aEndChild != nullptr || childCount > 0) {
       // Now comes the fun part.  For each inserted child, make a
       // ContentInserted call as if it had just gotten inserted and
       // let ContentInserted handle the mess.
       IssueSingleInsertNofications(aContainer, aStartChild, aEndChild,
                                    aAllowLazyConstruction);
-      return nullptr;
+      insertionPoint.mParentFrame = nullptr;
     }
   }
 
@@ -6823,11 +7052,9 @@
     return rv;
   }
 
-  // Get the frame associated with the content
-  nsContainerFrame* parentFrame = ::GetContentInsertionFrameFor(aContainer);
-
   // See comment in ContentRangeInserted for why this is necessary.
-  if (!parentFrame && !aContainer->IsActiveChildrenElement()) {
+  if (!GetContentInsertionFrameFor(aContainer) &&
+      !aContainer->IsActiveChildrenElement()) {
     return NS_OK;
   }
 
@@ -6837,9 +7064,10 @@
   }
 
   LAYOUT_PHASE_TEMP_EXIT();
-  parentFrame = GetRangeInsertionPoint(aContainer,
-                                       aFirstNewContent, nullptr,
-                                       aAllowLazyConstruction);
+  InsertionPoint insertion =
+    GetRangeInsertionPoint(aContainer, aFirstNewContent, nullptr,
+                           aAllowLazyConstruction);
+  nsContainerFrame*& parentFrame = insertion.mParentFrame;
   LAYOUT_PHASE_TEMP_REENTER();
   if (!parentFrame) {
     return NS_OK;
@@ -6898,9 +7126,8 @@
   // Deal with possible :after generated content on the parent
   nsIFrame* parentAfterFrame;
   parentFrame =
-    ::AdjustAppendParentForAfterContent(mPresShell->GetPresContext(),
-                                        aContainer, parentFrame,
-                                        &parentAfterFrame);
+    ::AdjustAppendParentForAfterContent(this, insertion.mContainer, parentFrame,
+                                        aFirstNewContent, &parentAfterFrame);
 
   // Create some new frames
   nsFrameConstructorState state(mPresShell,
@@ -6944,13 +7171,13 @@
     // (text in an XBL binding is not suppressed) or generated content
     // (and bare text nodes are not generated). Native anonymous content
     // generated by frames never participates in inline layout.
-    AddTextItemIfNeeded(state, parentFrame,
+    AddTextItemIfNeeded(state, insertion,
                         aFirstNewContent->GetPreviousSibling(), items);
   }
   for (nsIContent* child = aFirstNewContent;
        child;
        child = child->GetNextSibling()) {
-    AddFrameConstructionItems(state, child, false, parentFrame, items);
+    AddFrameConstructionItems(state, child, false, insertion, items);
   }
 
   nsIFrame* prevSibling = ::FindAppendPrevSibling(parentFrame, parentAfterFrame);
@@ -7263,44 +7490,49 @@
     return rv;
   }
 
-  nsContainerFrame* parentFrame = ::GetContentInsertionFrameFor(aContainer);
-  // The xbl:children element won't have a frame, but default content can have the children as
-  // a parent. While its uncommon to change the structure of the default content itself, a label,
-  // for example, can be reframed by having its value attribute set or removed.
-  if (!parentFrame && !aContainer->IsActiveChildrenElement()) {
-    return NS_OK;
-  }
+  // Put 'parentFrame' inside a scope so we don't confuse it with
+  // 'insertion.mParentFrame' later.
+  {
+    nsContainerFrame* parentFrame = GetContentInsertionFrameFor(aContainer);
+    // The xbl:children element won't have a frame, but default content can have the children as
+    // a parent. While its uncommon to change the structure of the default content itself, a label,
+    // for example, can be reframed by having its value attribute set or removed.
+    if (!parentFrame && !aContainer->IsActiveChildrenElement()) {
+      return NS_OK;
+    }
 
-  // Otherwise, we've got parent content. Find its frame.
-  NS_ASSERTION(!parentFrame || parentFrame->GetContent() == aContainer, "New XBL code is possibly wrong!");
+    // Otherwise, we've got parent content. Find its frame.
+    NS_ASSERTION(!parentFrame || parentFrame->GetContent() == aContainer ||
+                 GetDisplayContentsStyleFor(aContainer), "New XBL code is possibly wrong!");
 
-  if (aAllowLazyConstruction &&
-      MaybeConstructLazily(CONTENTINSERT, aContainer, aStartChild)) {
-    return NS_OK;
+    if (aAllowLazyConstruction &&
+        MaybeConstructLazily(CONTENTINSERT, aContainer, aStartChild)) {
+      return NS_OK;
+    }
   }
 
+  InsertionPoint insertion;
   if (isSingleInsert) {
     // See if we have an XBL insertion point. If so, then that's our
     // real parent frame; if not, then the frame hasn't been built yet
     // and we just bail.
-    parentFrame = GetInsertionPoint(aContainer, aStartChild);
+    insertion = GetInsertionPoint(aContainer, aStartChild);
   } else {
     // Get our insertion point. If we need to issue single ContentInserted's
     // GetRangeInsertionPoint will take care of that for us.
     LAYOUT_PHASE_TEMP_EXIT();
-    parentFrame = GetRangeInsertionPoint(aContainer, aStartChild, aEndChild,
-                                         aAllowLazyConstruction);
+    insertion = GetRangeInsertionPoint(aContainer, aStartChild, aEndChild,
+                                       aAllowLazyConstruction);
     LAYOUT_PHASE_TEMP_REENTER();
   }
 
-  if (!parentFrame) {
+  if (!insertion.mParentFrame) {
     return NS_OK;
   }
 
   bool isAppend, isRangeInsertSafe;
-  nsIFrame* prevSibling =
-    GetInsertionPrevSibling(parentFrame, aContainer, aStartChild,
-                            &isAppend, &isRangeInsertSafe);
+  nsIFrame* prevSibling = GetInsertionPrevSibling(&insertion, aStartChild,
+                                                  &isAppend, &isRangeInsertSafe);
 
   // check if range insert is safe
   if (!isSingleInsert && !isRangeInsertSafe) {
@@ -7312,11 +7544,11 @@
     return NS_OK;
   }
 
-  nsIContent* container = parentFrame->GetContent();
+  nsIContent* container = insertion.mParentFrame->GetContent();
 
-  nsIAtom* frameType = parentFrame->GetType();
+  nsIAtom* frameType = insertion.mParentFrame->GetType();
   LAYOUT_PHASE_TEMP_EXIT();
-  if (MaybeRecreateForFrameset(parentFrame, aStartChild, aEndChild)) {
+  if (MaybeRecreateForFrameset(insertion.mParentFrame, aStartChild, aEndChild)) {
     LAYOUT_PHASE_TEMP_REENTER();
     return NS_OK;
   }
@@ -7326,7 +7558,7 @@
   // fieldsets have multiple insertion points.
   NS_ASSERTION(isSingleInsert || frameType != nsGkAtoms::fieldSetFrame,
                "Unexpected parent");
-  if (IsFrameForFieldSet(parentFrame, frameType) &&
+  if (IsFrameForFieldSet(insertion.mParentFrame, frameType) &&
       aStartChild->Tag() == nsGkAtoms::legend) {
     // Just reframe the parent, since figuring out whether this
     // should be the new legend and then handling it is too complex.
@@ -7335,31 +7567,31 @@
     // and if so, proceed. But we'd have to extend nsFieldSetFrame
     // to locate this legend in the inserted frames and extract it.
     LAYOUT_PHASE_TEMP_EXIT();
-    nsresult rv = RecreateFramesForContent(parentFrame->GetContent(), false,
+    nsresult rv = RecreateFramesForContent(insertion.mParentFrame->GetContent(), false,
                                            REMOVE_FOR_RECONSTRUCTION, nullptr);
     LAYOUT_PHASE_TEMP_REENTER();
     return rv;
   }
 
   // Don't construct kids of leaves
-  if (parentFrame->IsLeaf()) {
+  if (insertion.mParentFrame->IsLeaf()) {
     // Clear lazy bits so we don't try to construct again.
     ClearLazyBits(aStartChild, aEndChild);
     return NS_OK;
   }
 
-  if (parentFrame->IsFrameOfType(nsIFrame::eMathML)) {
+  if (insertion.mParentFrame->IsFrameOfType(nsIFrame::eMathML)) {
     LAYOUT_PHASE_TEMP_EXIT();
-    nsresult rv = RecreateFramesForContent(parentFrame->GetContent(), false,
+    nsresult rv = RecreateFramesForContent(insertion.mParentFrame->GetContent(), false,
                                            REMOVE_FOR_RECONSTRUCTION, nullptr);
     LAYOUT_PHASE_TEMP_REENTER();
     return rv;
   }
 
   nsFrameConstructorState state(mPresShell,
-                                GetAbsoluteContainingBlock(parentFrame, FIXED_POS),
-                                GetAbsoluteContainingBlock(parentFrame, ABS_POS),
-                                GetFloatContainingBlock(parentFrame),
+                                GetAbsoluteContainingBlock(insertion.mParentFrame, FIXED_POS),
+                                GetAbsoluteContainingBlock(insertion.mParentFrame, ABS_POS),
+                                GetFloatContainingBlock(insertion.mParentFrame),
                                 aFrameState);
   state.mTreeMatchContext.InitAncestors(aContainer ?
                                           aContainer->AsElement() :
@@ -7378,9 +7610,9 @@
   // containing block haveFirst* flags if the parent frame where
   // the insertion/append is occurring is an inline or block
   // container. For other types of containers this isn't relevant.
-  uint8_t parentDisplay = parentFrame->GetDisplay();
+  uint8_t parentDisplay = insertion.mParentFrame->GetDisplay();
 
-  // Examine the parentFrame where the insertion is taking
+  // Examine the insertion.mParentFrame where the insertion is taking
   // place. If it's a certain kind of container then some special
   // processing is done.
   if ((NS_STYLE_DISPLAY_BLOCK == parentDisplay) ||
@@ -7396,18 +7628,18 @@
     }
 
     if (haveFirstLetterStyle) {
-      // If our current parentFrame is a Letter frame, use its parent as our
+      // If our current insertion.mParentFrame is a Letter frame, use its parent as our
       // new parent hint
-      if (parentFrame->GetType() == nsGkAtoms::letterFrame) {
-        // If parentFrame is out of flow, then we actually want the parent of
+      if (insertion.mParentFrame->GetType() == nsGkAtoms::letterFrame) {
+        // If insertion.mParentFrame is out of flow, then we actually want the parent of
         // the placeholder frame.
-        if (parentFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
+        if (insertion.mParentFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
           nsPlaceholderFrame* placeholderFrame =
-            GetPlaceholderFrameFor(parentFrame);
+            GetPlaceholderFrameFor(insertion.mParentFrame);
           NS_ASSERTION(placeholderFrame, "No placeholder for out-of-flow?");
-          parentFrame = placeholderFrame->GetParent();
+          insertion.mParentFrame = placeholderFrame->GetParent();
         } else {
-          parentFrame = parentFrame->GetParent();
+          insertion.mParentFrame = insertion.mParentFrame->GetParent();
         }
       }
 
@@ -7418,8 +7650,7 @@
       // Removing the letterframes messes around with the frame tree, removing
       // and creating frames.  We need to reget our prevsibling, parent frame,
       // etc.
-      prevSibling = GetInsertionPrevSibling(parentFrame, aContainer,
-                                            aStartChild, &isAppend,
+      prevSibling = GetInsertionPrevSibling(&insertion, aStartChild, &isAppend,
                                             &isRangeInsertSafe);
 
       // Need check whether a range insert is still safe.
@@ -7435,22 +7666,22 @@
         return NS_OK;
       }
 
-      container = parentFrame->GetContent();
-      frameType = parentFrame->GetType();
+      container = insertion.mParentFrame->GetContent();
+      frameType = insertion.mParentFrame->GetType();
     }
   }
 
   if (!prevSibling) {
     // We're inserting the new frames as the first child. See if the
     // parent has a :before pseudo-element
-    nsIFrame* firstChild = parentFrame->GetFirstPrincipalChild();
+    nsIFrame* firstChild = insertion.mParentFrame->GetFirstPrincipalChild();
 
     if (firstChild &&
         nsLayoutUtils::IsGeneratedContentFor(container, firstChild,
                                              nsCSSPseudoElements::before)) {
       // Insert the new frames after the last continuation of the :before
       prevSibling = firstChild->GetTailContinuation();
-      parentFrame = prevSibling->GetParent()->GetContentInsertionFrame();
+      insertion.mParentFrame = prevSibling->GetParent()->GetContentInsertionFrame();
       // Don't change isAppend here; we'll can call AppendFrames as needed, and
       // the change to our prevSibling doesn't affect that.
     }
@@ -7467,19 +7698,19 @@
     // it, because it might need a frame now.  No need to do this if our
     // parent type is not block, though, since WipeContainingBlock
     // already handles that sitation.
-    AddTextItemIfNeeded(state, parentFrame, aStartChild->GetPreviousSibling(),
+    AddTextItemIfNeeded(state, insertion, aStartChild->GetPreviousSibling(),
                         items);
   }
 
   if (isSingleInsert) {
     AddFrameConstructionItems(state, aStartChild,
                               aStartChild->IsRootOfAnonymousSubtree(),
-                              parentFrame, items);
+                              insertion, items);
   } else {
     for (nsIContent* child = aStartChild;
          child != aEndChild;
          child = child->GetNextSibling()){
-      AddFrameConstructionItems(state, child, false, parentFrame, items);
+      AddFrameConstructionItems(state, child, false, insertion, items);
     }
   }
 
@@ -7489,7 +7720,7 @@
     // it, because it might need a frame now.  No need to do this if our
     // parent type is not block, though, since WipeContainingBlock
     // already handles that sitation.
-    AddTextItemIfNeeded(state, parentFrame, aEndChild, items);
+    AddTextItemIfNeeded(state, insertion, aEndChild, items);
   }
 
   // Perform special check for diddling around with the frames in
@@ -7497,7 +7728,7 @@
   // If we're appending before :after content, then we're not really
   // appending, so let WipeContainingBlock know that.
   LAYOUT_PHASE_TEMP_EXIT();
-  if (WipeContainingBlock(state, containingBlock, parentFrame, items,
+  if (WipeContainingBlock(state, containingBlock, insertion.mParentFrame, items,
                           isAppend, prevSibling)) {
     LAYOUT_PHASE_TEMP_REENTER();
     return NS_OK;
@@ -7509,7 +7740,7 @@
   // We make no attempt here to set flags to indicate whether the list
   // will be at the start or end of a block. It doesn't seem worthwhile.
   nsFrameItems frameItems, captionItems;
-  ConstructFramesFromItemList(state, items, parentFrame, frameItems);
+  ConstructFramesFromItemList(state, items, insertion.mParentFrame, frameItems);
 
   if (frameItems.NotEmpty()) {
     for (nsIContent* child = aStartChild;
@@ -7560,15 +7791,14 @@
 #endif
     isAppend = true;
     nsIFrame* appendAfterFrame;
-    parentFrame =
-      ::AdjustAppendParentForAfterContent(mPresShell->GetPresContext(),
-                                          container,
+    insertion.mParentFrame =
+      ::AdjustAppendParentForAfterContent(this, container,
                                           frameItems.FirstChild()->GetParent(),
-                                          &appendAfterFrame);
-    prevSibling = ::FindAppendPrevSibling(parentFrame, appendAfterFrame);
+                                          aStartChild, &appendAfterFrame);
+    prevSibling = ::FindAppendPrevSibling(insertion.mParentFrame, appendAfterFrame);
   }
 
-  if (haveFirstLineStyle && parentFrame == containingBlock) {
+  if (haveFirstLineStyle && insertion.mParentFrame == containingBlock) {
     // It's possible that the new frame goes into a first-line
     // frame. Look at it and see...
     if (isAppend) {
@@ -7581,7 +7811,7 @@
       // XXXbz this method is a no-op, so it's easy for the args being passed
       // here to make no sense without anyone noticing...  If it ever stops
       // being a no-op, vet them carefully!
-      InsertFirstLineFrames(state, container, containingBlock, &parentFrame,
+      InsertFirstLineFrames(state, container, containingBlock, &insertion.mParentFrame,
                             prevSibling, frameItems);
     }
   }
@@ -7595,15 +7825,15 @@
     // We need to determine where to put the caption items; start with the
     // the parent frame that has already been determined and get the insertion
     // prevsibling of the first caption item.
-    nsContainerFrame* captionParent = parentFrame;
     bool captionIsAppend;
     nsIFrame* captionPrevSibling = nullptr;
 
     // aIsRangeInsertSafe is ignored on purpose because it is irrelevant here.
     bool ignored;
+    InsertionPoint captionInsertion(insertion.mParentFrame, insertion.mContainer);
     if (isSingleInsert) {
       captionPrevSibling =
-        GetInsertionPrevSibling(captionParent, aContainer, aStartChild,
+        GetInsertionPrevSibling(&captionInsertion, aStartChild,
                                 &captionIsAppend, &ignored);
     } else {
       nsIContent* firstCaption = captionItems.FirstChild()->GetContent();
@@ -7611,13 +7841,14 @@
       // [aStartChild,aEndChild) when looking for a
       // prevsibling.
       captionPrevSibling =
-        GetInsertionPrevSibling(captionParent, aContainer, firstCaption,
+        GetInsertionPrevSibling(&captionInsertion, firstCaption,
                                 &captionIsAppend, &ignored,
                                 aStartChild, aEndChild);
     }
 
     nsContainerFrame* outerTable = nullptr;
-    if (GetCaptionAdjustedParent(captionParent, captionItems.FirstChild(),
+    if (GetCaptionAdjustedParent(captionInsertion.mParentFrame,
+                                 captionItems.FirstChild(),
                                  &outerTable)) {
       // If the parent is not an outer table frame we will try to add frames
       // to a named child list that the parent does not honour and the frames
@@ -7645,9 +7876,9 @@
   if (frameItems.NotEmpty()) {
     // Notify the parent frame
     if (isAppend) {
-      AppendFramesToParent(state, parentFrame, frameItems, prevSibling);
+      AppendFramesToParent(state, insertion.mParentFrame, frameItems, prevSibling);
     } else {
-      InsertFrames(parentFrame, kPrincipalList, prevSibling, frameItems);
+      InsertFrames(insertion.mParentFrame, kPrincipalList, prevSibling, frameItems);
     }
   }
 
@@ -7658,9 +7889,9 @@
   }
 
 #ifdef DEBUG
-  if (gReallyNoisyContentUpdates && parentFrame) {
+  if (gReallyNoisyContentUpdates && insertion.mParentFrame) {
     printf("nsCSSFrameConstructor::ContentRangeInserted: resulting frame model:\n");
-    parentFrame->List(stdout, 0);
+    insertion.mParentFrame->List(stdout, 0);
   }
 #endif
 
@@ -7708,18 +7939,53 @@
   }
 #endif
 
-  nsPresContext *presContext = mPresShell->GetPresContext();
-  nsresult                  rv = NS_OK;
-
-  // Find the child frame that maps the content
+  nsresult rv = NS_OK;
   nsIFrame* childFrame = aChild->GetPrimaryFrame();
-
   if (!childFrame || childFrame->GetContent() != aChild) {
     // XXXbz the GetContent() != aChild check is needed due to bug 135040.
     // Remove it once that's fixed.
     ClearUndisplayedContentIn(aChild, aContainer);
   }
+  MOZ_ASSERT(!childFrame || !GetDisplayContentsStyleFor(aChild),
+             "display:contents nodes shouldn't have a frame");
+  if (!childFrame && GetDisplayContentsStyleFor(aChild)) {
+    nsIFrame* ancestorFrame = nullptr;
+    nsIContent* ancestor = aContainer;
+    for (; ancestor; ancestor = ancestor->GetParent()) {
+      ancestorFrame = ancestor->GetPrimaryFrame();
+      if (ancestorFrame) {
+        break;
+      }
+    }
+    if (ancestorFrame) {
+      nsTArray<nsIContent*>* generated = ancestorFrame->GetGenConPseudos();
+      if (generated) {
+        *aDidReconstruct = true;
+        LAYOUT_PHASE_TEMP_EXIT();
+        // XXXmats Can we recreate frames only for the ::after/::before content?
+        // XXX Perhaps even only those that belong to the aChild sub-tree?
+        RecreateFramesForContent(ancestor, false, aFlags, aDestroyedFramesFor);
+        LAYOUT_PHASE_TEMP_REENTER();
+        return NS_OK;
+      }
+    }
+
+    FlattenedChildIterator iter(aChild);
+    for (nsIContent* c = iter.GetNextChild(); c; c = iter.GetNextChild()) {
+      if (c->GetPrimaryFrame() || GetDisplayContentsStyleFor(c)) {
+        LAYOUT_PHASE_TEMP_EXIT();
+        rv = ContentRemoved(aChild, c, nullptr, aFlags, aDidReconstruct, aDestroyedFramesFor);
+        LAYOUT_PHASE_TEMP_REENTER();
+        NS_ENSURE_SUCCESS(rv, rv);
+        if (aFlags != REMOVE_DESTROY_FRAMES && *aDidReconstruct) {
+          return rv;
+        }
+      }
+    }
+    ClearDisplayContentsIn(aChild, aContainer);
+  }
 
+  nsPresContext* presContext = mPresShell->GetPresContext();
 #ifdef MOZ_XUL
   if (NotifyListBoxBody(presContext, aContainer, aChild, aOldNextSibling,
                         mDocument, childFrame, CONTENT_REMOVED)) {
@@ -8569,67 +8835,62 @@
   return NS_OK;
 }
 
-nsContainerFrame*
-nsCSSFrameConstructor::GetInsertionPoint(nsIContent*   aContainer,
-                                         nsIContent*   aChildContent,
-                                         bool*         aMultiple)
+nsCSSFrameConstructor::InsertionPoint
+nsCSSFrameConstructor::GetInsertionPoint(nsIContent* aContainer,
+                                         nsIContent* aChild)
 {
-  nsBindingManager *bindingManager = mDocument->BindingManager();
+  nsBindingManager* bindingManager = mDocument->BindingManager();
 
   nsIContent* insertionElement;
-  if (aChildContent) {
+  if (aChild) {
     // We've got an explicit insertion child. Check to see if it's
     // anonymous.
-    if (aChildContent->GetBindingParent() == aContainer) {
+    if (aChild->GetBindingParent() == aContainer) {
       // This child content is anonymous. Don't use the insertion
       // point, since that's only for the explicit kids.
-      return ::GetContentInsertionFrameFor(aContainer);
+      return InsertionPoint(GetContentInsertionFrameFor(aContainer), aContainer);
     }
 
     if (nsContentUtils::HasDistributedChildren(aContainer)) {
       // The container distributes nodes, use the frame of the flattened tree parent.
       // It may be the case that the node is distributed but not matched to any
       // insertion points, so there is no flattened parent.
-      nsIContent* flattenedParent = aChildContent->GetFlattenedTreeParent();
-      return flattenedParent ? ::GetContentInsertionFrameFor(flattenedParent) : nullptr;
+      nsIContent* flattenedParent = aChild->GetFlattenedTreeParent();
+      if (flattenedParent) {
+        return InsertionPoint(GetContentInsertionFrameFor(flattenedParent),
+                              flattenedParent);
+      }
+      return InsertionPoint();
     }
 
-    insertionElement = bindingManager->FindNestedInsertionPoint(aContainer, aChildContent);
-  }
-  else {
+    insertionElement = bindingManager->FindNestedInsertionPoint(aContainer, aChild);
+  } else {
     if (nsContentUtils::HasDistributedChildren(aContainer)) {
       // The container distributes nodes to shadow DOM insertion points.
       // Return with aMultiple set to true to induce callers to insert children
       // individually into the node's flattened tree parent.
-      *aMultiple = true;
-      return nullptr;
+      return InsertionPoint(nullptr, nullptr, true);
     }
 
     bool multiple;
     insertionElement = bindingManager->FindNestedSingleInsertionPoint(aContainer, &multiple);
-
     if (multiple) {
-      if (aMultiple) {
-        *aMultiple = true;
-      }
-      return nullptr;
+      return InsertionPoint(nullptr, nullptr, true);
     }
   }
 
   if (!insertionElement) {
     insertionElement = aContainer;
   }
+  InsertionPoint insertion(GetContentInsertionFrameFor(insertionElement),
+                           insertionElement);
 
-  nsContainerFrame* insertionPoint =
-    ::GetContentInsertionFrameFor(insertionElement);
-
-  // fieldsets have multiple insertion points.  Note that we might
-  // have to look at insertionElement here...
-  if (aMultiple && insertionElement->IsHTML(nsGkAtoms::fieldset)) {
-    *aMultiple = true;
+  // Fieldsets have multiple insertion points.
+  if (insertionElement->IsHTML(nsGkAtoms::fieldset)) {
+    insertion.mMultiple = true;
   }
 
-  return insertionPoint;
+  return insertion;
 }
 
 // Capture state for the frame tree rooted at the frame associated with the
@@ -8658,36 +8919,46 @@
          (aURI1 && aURI2 && aURI1->URIEquals(*aURI2));
 }
 
-nsresult
+nsStyleContext*
 nsCSSFrameConstructor::MaybeRecreateFramesForElement(Element* aElement)
 {
   nsRefPtr<nsStyleContext> oldContext = GetUndisplayedContent(aElement);
+  uint8_t oldDisplay = NS_STYLE_DISPLAY_NONE;
   if (!oldContext) {
-    return NS_OK;
+    oldContext = GetDisplayContentsStyleFor(aElement);
+    if (!oldContext) {
+      return nullptr;
+    }
+    oldDisplay = NS_STYLE_DISPLAY_CONTENTS;
   }
 
   // The parent has a frame, so try resolving a new context.
   nsRefPtr<nsStyleContext> newContext = mPresShell->StyleSet()->
     ResolveStyleFor(aElement, oldContext->GetParent());
 
-  ChangeUndisplayedContent(aElement, newContext);
+  if (oldDisplay == NS_STYLE_DISPLAY_NONE) {
+    ChangeUndisplayedContent(aElement, newContext);
+  } else {
+    ChangeDisplayContents(aElement, newContext);
+  }
+
   const nsStyleDisplay* disp = newContext->StyleDisplay();
-  if (disp->mDisplay == NS_STYLE_DISPLAY_NONE) {
+  if (oldDisplay == disp->mDisplay) {
     // We can skip trying to recreate frames here, but only if our style
     // context does not have a binding URI that differs from our old one.
     // Otherwise, we should try to recreate, because we may want to apply the
     // new binding
     if (!disp->mBinding) {
-      return NS_OK;
+      return newContext;
     }
     const nsStyleDisplay* oldDisp = oldContext->PeekStyleDisplay();
     if (oldDisp && EqualURIs(disp->mBinding, oldDisp->mBinding)) {
-      return NS_OK;
+      return newContext;
     }
   }
 
-  return RecreateFramesForContent(aElement, false, REMOVE_FOR_RECONSTRUCTION,
-                                  nullptr);
+  RecreateFramesForContent(aElement, false, REMOVE_FOR_RECONSTRUCTION, nullptr);
+  return nullptr;
 }
 
 static nsIFrame*
@@ -9841,6 +10112,7 @@
       NS_WARNING("ProcessChildren max depth exceeded");
     }
 
+    InsertionPoint insertion(aFrame, nullptr);
     FlattenedChildIterator iter(aContent);
     for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
       // Get the parent of the content and check if it is a XBL children element
@@ -9848,10 +10120,13 @@
       // FlattenedChildIterator will transitively iterate through <xbl:children>
       // for default content). Push the children element as an ancestor here because
       // it does not have a frame and would not otherwise be pushed as an ancestor.
+      insertion.mContainer = aContent;
       nsIContent* parent = child->GetParent();
       MOZ_ASSERT(parent, "Parent must be non-null because we are iterating children.");
       TreeMatchContext::AutoAncestorPusher ancestorPusher(aState.mTreeMatchContext);
       if (parent != aContent && parent->IsElement()) {
+        insertion.mContainer = child->GetFlattenedTreeParent();
+        MOZ_ASSERT(insertion.mContainer == GetInsertionPoint(parent, child).mContainer);
         if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
           ancestorPusher.PushAncestorAndStyleScope(parent->AsElement());
         } else {
@@ -9865,7 +10140,7 @@
         child->UnsetFlags(ELEMENT_ALL_RESTYLE_FLAGS);
       }
       if (addChildItems) {
-        AddFrameConstructionItems(aState, child, iter.XBLInvolved(), aFrame,
+        AddFrameConstructionItems(aState, child, iter.XBLInvolved(), insertion,
                                   itemsToConstruct);
       } else {
         ClearLazyBits(child, child->GetNextSibling());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSFrameConstructor.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSFrameConstructor.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSFrameConstructor.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSFrameConstructor.h	2014-11-26 21:46:05.000000000 +0000
@@ -108,15 +108,48 @@
                                     nsIContent* aEndChild,
                                     bool aAllowLazyConstruction);
 
-  // Checks if the children of aContainer in the range [aStartChild, aEndChild)
-  // can be inserted/appended to one insertion point together. If so, returns
-  // that insertion point. If not, returns null and issues single
-  // ContentInserted calls for each child.  aEndChild = nullptr indicates that we
-  // are dealing with an append.
-  nsContainerFrame* GetRangeInsertionPoint(nsIContent* aContainer,
-                                           nsIContent* aStartChild,
-                                           nsIContent* aEndChild,
-                                           bool aAllowLazyConstruction);
+  /**
+   * Data that represents an insertion point for some child content.
+   */
+  struct InsertionPoint
+  {
+    InsertionPoint()
+      : mParentFrame(nullptr), mContainer(nullptr), mMultiple(false) {}
+    InsertionPoint(nsContainerFrame* aParentFrame, nsIContent* aContainer,
+                   bool aMultiple = false)
+      : mParentFrame(aParentFrame), mContainer(aContainer),
+        mMultiple(aMultiple) {}
+    /**
+     * The parent frame to use if the inserted children needs to create
+     * frame(s).  May be null, which signals that  we shouldn't try to
+     * create frames for the inserted children; either because there are
+     * no parent frame or because there are multiple insertion points and
+     * we will call IssueSingleInsertNofications for each child instead.
+     * mContainer should not be used when mParentFrame is null.
+     */
+    nsContainerFrame* mParentFrame;
+    /**
+     * The flattened tree parent for the inserted children.
+     * It's undefined if mParentFrame is null.
+     */
+    nsIContent* mContainer;
+    /**
+     * If true then there are multiple insertion points, which means consumers
+     * should insert children individually into the node's flattened tree parent.
+     */
+    bool mMultiple;
+  };
+  /**
+   * Checks if the children of aContainer in the range [aStartChild, aEndChild)
+   * can be inserted/appended to one insertion point together. If so, returns
+   * that insertion point. If not, returns with InsertionPoint.mFrame == nullptr
+   * and issues single ContentInserted calls for each child.
+   * aEndChild = nullptr indicates that we are dealing with an append.
+   */
+  InsertionPoint GetRangeInsertionPoint(nsIContent* aContainer,
+                                        nsIContent* aStartChild,
+                                        nsIContent* aEndChild,
+                                        bool aAllowLazyConstruction);
 
   // Returns true if parent was recreated due to frameset child, false otherwise.
   bool MaybeRecreateForFrameset(nsIFrame* aParentFrame,
@@ -266,10 +299,10 @@
   // Copy over fixed frames from aParentFrame's prev-in-flow
   nsresult ReplicateFixedFrames(nsPageContentFrame* aParentFrame);
 
-  // Get the XBL insertion point for a child
-  nsContainerFrame* GetInsertionPoint(nsIContent* aContainer,
-                                      nsIContent* aChildContent,
-                                      bool*       aMultiple = nullptr);
+  /**
+   * Get the XBL insertion point for aChild in aContainer.
+   */
+  InsertionPoint GetInsertionPoint(nsIContent* aContainer, nsIContent* aChild);
 
   nsresult CreateListBoxContent(nsPresContext*    aPresContext,
                                 nsContainerFrame* aParentFrame,
@@ -321,12 +354,21 @@
   // aState can be null if not available; it's used as an optimization.
   // XXXbz IsValidSibling is the only caller that doesn't pass a state here!
   already_AddRefed<nsStyleContext>
-  ResolveStyleContext(nsIFrame*         aParentFrame,
-                      nsIContent*       aContent,
+  ResolveStyleContext(nsIFrame*                aParentFrame,
+                      nsIContent*              aContainer,
+                      nsIContent*              aChild,
+                      nsFrameConstructorState* aState);
+  already_AddRefed<nsStyleContext>
+  ResolveStyleContext(nsIFrame*                aParentFrame,
+                      nsIContent*              aChild,
                       nsFrameConstructorState* aState);
   already_AddRefed<nsStyleContext>
-  ResolveStyleContext(nsStyleContext* aParentStyleContext,
-                      nsIContent* aContent,
+  ResolveStyleContext(const InsertionPoint&    aInsertion,
+                      nsIContent*              aChild,
+                      nsFrameConstructorState* aState);
+  already_AddRefed<nsStyleContext>
+  ResolveStyleContext(nsStyleContext*          aParentStyleContext,
+                      nsIContent*              aContent,
                       nsFrameConstructorState* aState);
 
   // Add the frame construction items for the given aContent and aParentFrame
@@ -337,9 +379,26 @@
   void AddFrameConstructionItems(nsFrameConstructorState& aState,
                                  nsIContent*              aContent,
                                  bool                     aSuppressWhiteSpaceOptimizations,
-                                 nsContainerFrame*        aParentFrame,
+                                 const InsertionPoint&    aInsertion,
                                  FrameConstructionItemList& aItems);
 
+  // Helper method for AddFrameConstructionItems etc.
+  // Unsets the need-frame/restyle bits on aContent.
+  // return true iff we should attempt to create frames for aContent.
+  bool ShouldCreateItemsForChild(nsFrameConstructorState& aState,
+                                 nsIContent* aContent,
+                                 nsContainerFrame* aParentFrame);
+
+  // Helper method for AddFrameConstructionItems etc.
+  // Make sure ShouldCreateItemsForChild() returned true before calling this.
+  void DoAddFrameConstructionItems(nsFrameConstructorState& aState,
+                                   nsIContent* aContent,
+                                   nsStyleContext* aStyleContext,
+                                   bool aSuppressWhiteSpaceOptimizations,
+                                   nsContainerFrame* aParentFrame,
+                                   nsTArray<nsIAnonymousContentCreator::ContentInfo>* aAnonChildren,
+                                   FrameConstructionItemList& aItems);
+
   // Construct the frames for the document element.  This can return null if the
   // document element is display:none, or if the document element has a
   // not-yet-loaded XBL binding, or if it's an SVG element that's not <svg>.
@@ -631,6 +690,10 @@
   /* If FCDATA_IS_SVG_TEXT is set, then this text frame is a descendant of
      an SVG text frame. */
 #define FCDATA_IS_SVG_TEXT 0x80000
+  /**
+   * display:contents
+   */
+#define FCDATA_IS_CONTENTS 0x100000
 
   /* Structure representing information about how a frame should be
      constructed.  */
@@ -1163,7 +1226,7 @@
   // If aPossibleTextContent is a text node and doesn't have a frame, append a
   // frame construction item for it to aItems.
   void AddTextItemIfNeeded(nsFrameConstructorState& aState,
-                           nsContainerFrame* aParentFrame,
+                           const InsertionPoint& aInsertion,
                            nsIContent* aPossibleTextContent,
                            FrameConstructionItemList& aItems);
 
@@ -1502,7 +1565,14 @@
                         PendingBinding*          aPendingBinding,
                         nsFrameItems&            aFrameItems);
 
-  nsresult MaybeRecreateFramesForElement(Element* aElement);
+  /**
+   * ReResolve style for aElement then recreate frames if required.
+   * Do nothing for other types of style changes, except for undisplayed nodes
+   * (display:none/contents) which will have their style context updated in the
+   * frame manager undisplayed maps.
+   * @return null if frames were recreated, the new style context otherwise
+   */
+  nsStyleContext* MaybeRecreateFramesForElement(Element* aElement);
 
   /**
    * Recreate frames for aContent.
@@ -1772,29 +1842,64 @@
                                  nsIFrame*                aPrevSibling,
                                  nsFrameItems&            aFrameItems);
 
-  // Find the right frame to use for aContent when looking for sibling
-  // frames for aTargetContent.  If aPrevSibling is true, this
-  // will look for last continuations, etc, as necessary.  This calls
-  // IsValidSibling as needed; if that returns false it returns null.
-  //
-  // @param aTargetContentDisplay the CSS display enum for aTargetContent if
-  // already known, UNSET_DISPLAY otherwise. It will be filled in if needed.
+  /**
+   * Find the right frame to use for aContent when looking for sibling
+   * frames for aTargetContent.  If aPrevSibling is true, this
+   * will look for last continuations, etc, as necessary.  This calls
+   * IsValidSibling as needed; if that returns false it returns null.
+   *
+   * @param aContent the content to search for frames
+   * @param aTargetContent the content we're finding a sibling frame for
+   * @param aTargetContentDisplay the CSS display enum for aTargetContent if
+   *          already known, UNSET_DISPLAY otherwise. It will be filled in
+   *          if needed.
+   * @param aParentFrame the nearest ancestor frame, used internally for
+   *          finding ::after / ::before frames
+   * @param aPrevSibling true if we're searching in reverse DOM order
+   */
   nsIFrame* FindFrameForContentSibling(nsIContent* aContent,
                                        nsIContent* aTargetContent,
                                        uint8_t& aTargetContentDisplay,
+                                       nsContainerFrame* aParentFrame,
                                        bool aPrevSibling);
 
-  // Find the ``rightmost'' frame for the content immediately preceding the one
-  // aIter points to, following continuations if necessary.  aIter is passed by
-  // value on purpose, so as not to modify the caller's iterator.
+  /**
+   * Find the frame for the content immediately preceding the one aIter
+   * points to, following continuations if necessary.  aIter is passed by
+   * value on purpose, so as not to modify the caller's iterator.
+   *
+   * @param aIter should be positioned such that aIter.GetPreviousChild()
+   *          is the first content to search for frames
+   * @param aTargetContent the content we're finding a sibling frame for
+   * @param aTargetContentDisplay the CSS display enum for aTargetContent if
+   *          already known, UNSET_DISPLAY otherwise. It will be filled in
+   *          if needed.
+   * @param aParentFrame the nearest ancestor frame, used inernally for
+   *          finding ::after / ::before frames
+   */
   nsIFrame* FindPreviousSibling(mozilla::dom::FlattenedChildIterator aIter,
-                                uint8_t& aTargetContentDisplay);
+                                nsIContent* aTargetContent,
+                                uint8_t& aTargetContentDisplay,
+                                nsContainerFrame* aParentFrame);
 
-  // Find the frame for the content node immediately following the one aIter
-  // points to, following continuations if necessary.  aIter is passed by value
-  // on purpose, so as not to modify the caller's iterator.
+  /**
+   * Find the frame for the content node immediately following the one aIter
+   * points to, following continuations if necessary.  aIter is passed by value
+   * on purpose, so as not to modify the caller's iterator.
+   *
+   * @param aIter should be positioned such that aIter.GetNextChild()
+   *          is the first content to search for frames
+   * @param aTargetContent the content we're finding a sibling frame for
+   * @param aTargetContentDisplay the CSS display enum for aTargetContent if
+   *          already known, UNSET_DISPLAY otherwise. It will be filled in
+   *          if needed.
+   * @param aParentFrame the nearest ancestor frame, used inernally for
+   *          finding ::after / ::before frames
+   */
   nsIFrame* FindNextSibling(mozilla::dom::FlattenedChildIterator aIter,
-                            uint8_t& aTargetContentDisplay);
+                            nsIContent* aTargetContent,
+                            uint8_t& aTargetContentDisplay,
+                            nsContainerFrame* aParentFrame);
 
   // Find the right previous sibling for an insertion.  This also updates the
   // parent frame to point to the correct continuation of the parent frame to
@@ -1809,14 +1914,19 @@
   // including aEndSkipChild will be skipped over when looking for sibling
   // frames. Skipping a range can deal with XBL but not when there are multiple
   // insertion points.
-  nsIFrame* GetInsertionPrevSibling(nsContainerFrame*& aParentFrame, /* inout */
-                                    nsIContent* aContainer,
+  nsIFrame* GetInsertionPrevSibling(InsertionPoint* aInsertion, // inout
                                     nsIContent* aChild,
                                     bool* aIsAppend,
                                     bool* aIsRangeInsertSafe,
                                     nsIContent* aStartSkipChild = nullptr,
                                     nsIContent *aEndSkipChild = nullptr);
 
+  /**
+   * Return the insertion frame of the primary frame of aContent, or its nearest
+   * ancestor that isn't display:contents.
+   */
+  nsContainerFrame* GetContentInsertionFrameFor(nsIContent* aContent);
+
   // see if aContent and aSibling are legitimate siblings due to restrictions
   // imposed by table columns
   // XXXbz this code is generally wrong, since the frame for aContent
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSRenderingBorders.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSRenderingBorders.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSRenderingBorders.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSRenderingBorders.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -1444,7 +1444,7 @@
     strokeOptions.mDashOffset = 0.5f;
     DrawOptions drawOptions;
     drawOptions.mAntialiasMode = AntialiasMode::NONE;
-    mDrawTarget->StrokeRect(rect, color, strokeOptions);
+    mDrawTarget->StrokeRect(rect, color, strokeOptions, drawOptions);
     return;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSRendering.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSRendering.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsCSSRendering.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsCSSRendering.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -85,9 +85,9 @@
   void Reset()
   {
     mBoundingBox.SetRect(0,0,0,0);
-    mContinuationPoint = mLineContinuationPoint = mUnbrokenWidth = 0;
+    mContinuationPoint = mLineContinuationPoint = mUnbrokenMeasure = 0;
     mFrame = mBlockFrame = nullptr;
-    mLeftBorderData.Reset();
+    mPIStartBorderData.Reset();
   }
 
   /**
@@ -101,25 +101,31 @@
 
     SetFrame(aFrame);
 
-    nscoord x;
+    nscoord pos; // an x coordinate if writing-mode is horizontal;
+                 // y coordinate if vertical
     if (mBidiEnabled) {
-      x = mLineContinuationPoint;
+      pos = mLineContinuationPoint;
 
       // Scan continuations on the same line as aFrame and accumulate the widths
       // of frames that are to the left (if this is an LTR block) or right
       // (if it's RTL) of the current one.
       bool isRtlBlock = (mBlockFrame->StyleVisibility()->mDirection ==
                            NS_STYLE_DIRECTION_RTL);
-      nscoord curOffset = aFrame->GetOffsetTo(mBlockFrame).x;
+      nscoord curOffset = mVertical ? aFrame->GetOffsetTo(mBlockFrame).y
+                                    : aFrame->GetOffsetTo(mBlockFrame).x;
 
       // If the continuation is fluid we know inlineFrame is not on the same line.
       // If it's not fluid, we need to test further to be sure.
       nsIFrame* inlineFrame = aFrame->GetPrevContinuation();
       while (inlineFrame && !inlineFrame->GetNextInFlow() &&
              AreOnSameLine(aFrame, inlineFrame)) {
-        nscoord frameXOffset = inlineFrame->GetOffsetTo(mBlockFrame).x;
-        if(isRtlBlock == (frameXOffset >= curOffset)) {
-          x += inlineFrame->GetSize().width;
+        nscoord frameOffset = mVertical
+          ? inlineFrame->GetOffsetTo(mBlockFrame).y
+          : inlineFrame->GetOffsetTo(mBlockFrame).x;
+        if (isRtlBlock == (frameOffset >= curOffset)) {
+          pos += mVertical
+               ? inlineFrame->GetSize().height
+               : inlineFrame->GetSize().width;
         }
         inlineFrame = inlineFrame->GetPrevContinuation();
       }
@@ -127,59 +133,82 @@
       inlineFrame = aFrame->GetNextContinuation();
       while (inlineFrame && !inlineFrame->GetPrevInFlow() &&
              AreOnSameLine(aFrame, inlineFrame)) {
-        nscoord frameXOffset = inlineFrame->GetOffsetTo(mBlockFrame).x;
-        if(isRtlBlock == (frameXOffset >= curOffset)) {
-          x += inlineFrame->GetSize().width;
+        nscoord frameOffset = mVertical
+          ? inlineFrame->GetOffsetTo(mBlockFrame).y
+          : inlineFrame->GetOffsetTo(mBlockFrame).x;
+        if (isRtlBlock == (frameOffset >= curOffset)) {
+          pos += mVertical
+                 ? inlineFrame->GetSize().height
+                 : inlineFrame->GetSize().width;
         }
         inlineFrame = inlineFrame->GetNextContinuation();
       }
       if (isRtlBlock) {
         // aFrame itself is also to the right of its left edge, so add its width.
-        x += aFrame->GetSize().width;
-        // x is now the distance from the left edge of aFrame to the right edge
+        pos += mVertical ? aFrame->GetSize().height : aFrame->GetSize().width;
+        // pos is now the distance from the left [top] edge of aFrame to the right [bottom] edge
         // of the unbroken content. Change it to indicate the distance from the
-        // left edge of the unbroken content to the left edge of aFrame.
-        x = mUnbrokenWidth - x;
+        // left [top] edge of the unbroken content to the left [top] edge of aFrame.
+        pos = mUnbrokenMeasure - pos;
       }
     } else {
-      x = mContinuationPoint;
+      pos = mContinuationPoint;
     }
 
     // Assume background-origin: border and return a rect with offsets
     // relative to (0,0).  If we have a different background-origin,
     // then our rect should be deflated appropriately by our caller.
-    return nsRect(-x, 0, mUnbrokenWidth, mFrame->GetSize().height);
+    return mVertical
+      ? nsRect(0, -pos, mFrame->GetSize().width, mUnbrokenMeasure)
+      : nsRect(-pos, 0, mUnbrokenMeasure, mFrame->GetSize().height);
   }
 
   /**
    * Return a continuous rect for (an inline) aFrame relative to the
-   * continuation that should draw the left-border.  This is used when painting
+   * continuation that should draw the left[top]-border.  This is used when painting
    * borders and clipping backgrounds.  This may NOT be the same continuous rect
-   * as for drawing backgrounds; the continuation with the left-border might be
+   * as for drawing backgrounds; the continuation with the left[top]-border might be
    * somewhere in the middle of that rect (e.g. BIDI), in those cases we need
-   * the reverse background order starting at the left-border continuation.
+   * the reverse background order starting at the left[top]-border continuation.
    */
   nsRect GetBorderContinuousRect(nsIFrame* aFrame, nsRect aBorderArea)
   {
     // Calling GetContinuousRect(aFrame) here may lead to Reset/Init which
-    // resets our mLeftBorderData so we save it ...
-    LeftBorderData saved(mLeftBorderData);
+    // resets our mPIStartBorderData so we save it ...
+    PhysicalInlineStartBorderData saved(mPIStartBorderData);
     nsRect joinedBorderArea = GetContinuousRect(aFrame);
-    if (!saved.mIsValid || saved.mFrame != mLeftBorderData.mFrame) {
-      if (aFrame == mLeftBorderData.mFrame) {
-        mLeftBorderData.SetX(joinedBorderArea.x);
-      } else if (mLeftBorderData.mFrame) {
-        mLeftBorderData.SetX(GetContinuousRect(mLeftBorderData.mFrame).x);
+    if (!saved.mIsValid || saved.mFrame != mPIStartBorderData.mFrame) {
+      if (aFrame == mPIStartBorderData.mFrame) {
+        if (mVertical) {
+          mPIStartBorderData.SetCoord(joinedBorderArea.y);
+        } else {
+          mPIStartBorderData.SetCoord(joinedBorderArea.x);
+        }
+      } else if (mPIStartBorderData.mFrame) {
+        if (mVertical) {
+          mPIStartBorderData.SetCoord(GetContinuousRect(mPIStartBorderData.mFrame).y);
+        } else {
+          mPIStartBorderData.SetCoord(GetContinuousRect(mPIStartBorderData.mFrame).x);
+        }
       }
     } else {
       // ... and restore it when possible.
-      mLeftBorderData.mX = saved.mX;
+      mPIStartBorderData.mCoord = saved.mCoord;
     }
-    if (joinedBorderArea.x > mLeftBorderData.mX) {
-      joinedBorderArea.x =
-        -(mUnbrokenWidth + joinedBorderArea.x - aBorderArea.width);
+    if (mVertical) {
+      if (joinedBorderArea.y > mPIStartBorderData.mCoord) {
+        joinedBorderArea.y =
+          -(mUnbrokenMeasure + joinedBorderArea.y - aBorderArea.height);
+      } else {
+        joinedBorderArea.y -= mPIStartBorderData.mCoord;
+      }
     } else {
-      joinedBorderArea.x -= mLeftBorderData.mX;
+      if (joinedBorderArea.x > mPIStartBorderData.mCoord) {
+        joinedBorderArea.x =
+          -(mUnbrokenMeasure + joinedBorderArea.x - aBorderArea.width);
+      } else {
+        joinedBorderArea.x -= mPIStartBorderData.mCoord;
+      }
     }
     return joinedBorderArea;
   }
@@ -201,22 +230,27 @@
   }
 
 protected:
-  struct LeftBorderData {
+  // This is a coordinate on the inline axis, but is not a true logical inline-
+  // coord because it is always measured from left to right (if horizontal) or
+  // from top to bottom (if vertical), ignoring any bidi RTL directionality.
+  // We'll call this "physical inline start", or PIStart for short.
+  struct PhysicalInlineStartBorderData {
     nsIFrame* mFrame;   // the continuation that may have a left-border
-    nscoord   mX;       // cached GetContinuousRect(mFrame).x
-    bool      mIsValid; // true if mX is valid
+    nscoord   mCoord;   // cached GetContinuousRect(mFrame).x or .y
+    bool      mIsValid; // true if mCoord is valid
     void Reset() { mFrame = nullptr; mIsValid = false; }
-    void SetX(nscoord aX) { mX = aX; mIsValid = true; }
+    void SetCoord(nscoord aCoord) { mCoord = aCoord; mIsValid = true; }
   };
 
   nsIFrame*      mFrame;
   nsBlockFrame*  mBlockFrame;
   nsRect         mBoundingBox;
   nscoord        mContinuationPoint;
-  nscoord        mUnbrokenWidth;
+  nscoord        mUnbrokenMeasure;
   nscoord        mLineContinuationPoint;
-  LeftBorderData mLeftBorderData;
+  PhysicalInlineStartBorderData mPIStartBorderData;
   bool           mBidiEnabled;
+  bool           mVertical;
 
   void SetFrame(nsIFrame* aFrame)
   {
@@ -239,7 +273,8 @@
 
     // Get our last frame's size and add its width to our continuation
     // point before we cache the new frame.
-    mContinuationPoint += mFrame->GetSize().width;
+    mContinuationPoint += mVertical ? mFrame->GetSize().height
+                                    : mFrame->GetSize().width;
 
     // If this a new line, update mLineContinuationPoint.
     if (mBidiEnabled &&
@@ -289,7 +324,7 @@
 
   void Init(nsIFrame* aFrame)
   {
-    mLeftBorderData.Reset();
+    mPIStartBorderData.Reset();
     mBidiEnabled = aFrame->PresContext()->BidiEnabled();
     if (mBidiEnabled) {
       // Find the containing block frame
@@ -303,20 +338,23 @@
       NS_ASSERTION(mBlockFrame, "Cannot find containing block.");
     }
 
+    mVertical = aFrame->GetWritingMode().IsVertical();
+
     // Start with the previous flow frame as our continuation point
     // is the total of the widths of the previous frames.
     nsIFrame* inlineFrame = GetPrevContinuation(aFrame);
     while (inlineFrame) {
-      if (!mLeftBorderData.mFrame &&
-          !inlineFrame->GetSkipSides().Left()) {
-        mLeftBorderData.mFrame = inlineFrame;
+      if (!mPIStartBorderData.mFrame &&
+          !(mVertical ? inlineFrame->GetSkipSides().Top()
+                      : inlineFrame->GetSkipSides().Left())) {
+        mPIStartBorderData.mFrame = inlineFrame;
       }
       nsRect rect = inlineFrame->GetRect();
-      mContinuationPoint += rect.width;
+      mContinuationPoint += mVertical ? rect.height : rect.width;
       if (mBidiEnabled && !AreOnSameLine(aFrame, inlineFrame)) {
-        mLineContinuationPoint += rect.width;
+        mLineContinuationPoint += mVertical ? rect.height : rect.width;
       }
-      mUnbrokenWidth += rect.width;
+      mUnbrokenMeasure += mVertical ? rect.height : rect.width;
       mBoundingBox.UnionRect(mBoundingBox, rect);
       inlineFrame = GetPrevContinuation(inlineFrame);
     }
@@ -325,12 +363,13 @@
     // unbroken width.
     inlineFrame = aFrame;
     while (inlineFrame) {
-      if (!mLeftBorderData.mFrame &&
-          !inlineFrame->GetSkipSides().Left()) {
-        mLeftBorderData.mFrame = inlineFrame;
+      if (!mPIStartBorderData.mFrame &&
+          !(mVertical ? inlineFrame->GetSkipSides().Top()
+                      : inlineFrame->GetSkipSides().Left())) {
+        mPIStartBorderData.mFrame = inlineFrame;
       }
       nsRect rect = inlineFrame->GetRect();
-      mUnbrokenWidth += rect.width;
+      mUnbrokenMeasure += mVertical ? rect.height : rect.width;
       mBoundingBox.UnionRect(mBoundingBox, rect);
       inlineFrame = GetNextContinuation(inlineFrame);
     }
@@ -632,6 +671,8 @@
                                            nsStyleContext* aStyleContext,
                                            Sides aSkipSides)
 {
+  DrawTarget& aDrawTarget = *aRenderingContext.GetDrawTarget();
+
   PrintAsStringNewline("++ PaintBorder");
 
   // Check to see if we have an appearance defined.  If so, we let the theme
@@ -692,7 +733,7 @@
       aRenderingContext.ThebesContext()->
         Clip(NSRectToSnappedRect(aBorderArea,
                                  aForFrame->PresContext()->AppUnitsPerDevPixel(),
-                                 *aRenderingContext.GetDrawTarget()));
+                                 aDrawTarget));
     }
   } else {
     MOZ_ASSERT(joinedBorderArea.IsEqualEdges(aBorderArea),
@@ -731,14 +772,11 @@
 
 #if 0
   // this will draw a transparent red backround underneath the border area
-  ctx->Save();
-  ctx->Rectangle(ThebesRect(joinedBorderAreaPx));
-  ctx->SetColor(gfxRGBA(1.0, 0.0, 0.0, 0.5));
-  ctx->Fill();
-  ctx->Restore();
+  ColorPattern color(ToDeviceColor(Color(1.f, 0.f, 0.f, 0.5f)));
+  aDrawTarget.FillRect(joinedBorderAreaPx, color);
 #endif
 
-  nsCSSBorderRenderer br(ctx->GetDrawTarget(),
+  nsCSSBorderRenderer br(&aDrawTarget,
                          joinedBorderAreaPx,
                          borderStyles,
                          borderWidths,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsDisplayList.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsDisplayList.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsDisplayList.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsDisplayList.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -62,6 +62,7 @@
 #include "UnitTransforms.h"
 #include "LayersLogging.h"
 #include "FrameLayerBuilder.h"
+#include "RestyleManager.h"
 #include "nsCaret.h"
 #include "nsISelection.h"
 
@@ -440,6 +441,15 @@
     aLayer->ClearAnimations();
   }
 
+  // Update the animation generation on the layer. We need to do this before
+  // any early returns since even if we don't add any animations to the
+  // layer, we still need to mark it as up-to-date with regards to animations.
+  // Otherwise, in RestyleManager we'll notice the discrepancy between the
+  // animation generation numbers and update the layer indefinitely.
+  uint64_t animationGeneration =
+    RestyleManager::GetMaxAnimationGenerationForFrame(aFrame);
+  aLayer->SetAnimationGeneration(animationGeneration);
+
   nsIContent* content = aFrame->GetContent();
   if (!content) {
     return;
@@ -507,13 +517,11 @@
   if (transitions) {
     AddAnimationsForProperty(aFrame, aProperty, transitions->mPlayers,
                              aLayer, data, pending);
-    aLayer->SetAnimationGeneration(transitions->mAnimationGeneration);
   }
 
   if (animations) {
     AddAnimationsForProperty(aFrame, aProperty, animations->mPlayers,
                              aLayer, data, pending);
-    aLayer->SetAnimationGeneration(animations->mAnimationGeneration);
   }
 }
 
@@ -525,6 +533,7 @@
       mCurrentTableItem(nullptr),
       mCurrentFrame(aReferenceFrame),
       mCurrentReferenceFrame(aReferenceFrame),
+      mCurrentAnimatedGeometryRoot(aReferenceFrame),
       mWillChangeBudgetCalculated(false),
       mDirtyRect(-1,-1,-1,-1),
       mGlassDisplayItem(nullptr),
@@ -715,6 +724,11 @@
     if (lastSmoothScrollOrigin) {
       metrics.SetSmoothScrollOffsetUpdated(scrollableFrame->CurrentScrollGeneration());
     }
+
+    nsSize lineScrollAmount = scrollableFrame->GetLineScrollAmount();
+    LayoutDeviceIntSize lineScrollAmountInDevPixels =
+      LayoutDeviceIntSize::FromAppUnitsRounded(lineScrollAmount, presContext->AppUnitsPerDevPixel());
+    metrics.SetLineScrollAmount(lineScrollAmountInDevPixels);
   }
 
   metrics.SetScrollId(scrollId);
@@ -1068,6 +1082,104 @@
   return mReferenceFrame;
 }
 
+// Sticky frames are active if their nearest scrollable frame is also active.
+static bool
+IsStickyFrameActive(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsIFrame* aParent)
+{
+  MOZ_ASSERT(aFrame->StyleDisplay()->mPosition == NS_STYLE_POSITION_STICKY);
+
+  // Find the nearest scrollframe.
+  nsIFrame* cursor = aFrame;
+  nsIFrame* parent = aParent;
+  while (parent->GetType() != nsGkAtoms::scrollFrame) {
+    cursor = parent;
+    if ((parent = nsLayoutUtils::GetCrossDocParentFrame(cursor)) == nullptr) {
+      return false;
+    }
+  }
+
+  nsIScrollableFrame* sf = do_QueryFrame(parent);
+  return sf->IsScrollingActive(aBuilder) && sf->GetScrolledFrame() == cursor;
+}
+
+bool
+nsDisplayListBuilder::IsAnimatedGeometryRoot(nsIFrame* aFrame, nsIFrame** aParent)
+{
+  if (nsLayoutUtils::IsPopup(aFrame))
+    return true;
+  if (ActiveLayerTracker::IsOffsetOrMarginStyleAnimated(aFrame))
+    return true;
+  if (!aFrame->GetParent() &&
+      nsLayoutUtils::ViewportHasDisplayPort(aFrame->PresContext())) {
+    // Viewport frames in a display port need to be animated geometry roots
+    // for background-attachment:fixed elements.
+    return true;
+  }
+
+  nsIFrame* parent = nsLayoutUtils::GetCrossDocParentFrame(aFrame);
+  if (!parent)
+    return true;
+
+  nsIAtom* parentType = parent->GetType();
+  // Treat the slider thumb as being as an active scrolled root when it wants
+  // its own layer so that it can move without repainting.
+  if (parentType == nsGkAtoms::sliderFrame && nsLayoutUtils::IsScrollbarThumbLayerized(aFrame)) {
+    return true;
+  }
+
+  if (aFrame->StyleDisplay()->mPosition == NS_STYLE_POSITION_STICKY &&
+      IsStickyFrameActive(this, aFrame, parent))
+  {
+    return true;
+  }
+
+  if (parentType == nsGkAtoms::scrollFrame) {
+    nsIScrollableFrame* sf = do_QueryFrame(parent);
+    if (sf->IsScrollingActive(this) && sf->GetScrolledFrame() == aFrame) {
+      return true;
+    }
+  }
+
+  // Fixed-pos frames are parented by the viewport frame, which has no parent.
+  if (nsLayoutUtils::IsFixedPosFrameInDisplayPort(aFrame)) {
+    return true;
+  }
+
+  if (aParent) {
+    *aParent = parent;
+  }
+  return false;
+}
+
+static nsIFrame*
+ComputeAnimatedGeometryRootFor(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
+                               const nsIFrame* aStopAtAncestor = nullptr)
+{
+  nsIFrame* cursor = aFrame;
+  while (cursor != aStopAtAncestor) {
+    nsIFrame* next;
+    if (aBuilder->IsAnimatedGeometryRoot(cursor, &next))
+      return cursor;
+    cursor = next;
+  }
+  return cursor;
+}
+
+nsIFrame*
+nsDisplayListBuilder::FindAnimatedGeometryRootFor(nsIFrame* aFrame, const nsIFrame* aStopAtAncestor)
+{
+  if (aFrame == mCurrentFrame) {
+    return mCurrentAnimatedGeometryRoot;
+  }
+  return ComputeAnimatedGeometryRootFor(this, aFrame, aStopAtAncestor);
+}
+
+void
+nsDisplayListBuilder::RecomputeCurrentAnimatedGeometryRoot()
+{
+  mCurrentAnimatedGeometryRoot = ComputeAnimatedGeometryRootFor(this, const_cast<nsIFrame *>(mCurrentFrame));
+}
+
 void
 nsDisplayListBuilder::AdjustWindowDraggingRegion(nsIFrame* aFrame)
 {
@@ -1837,11 +1949,13 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplaySolidColor::WriteDebugInfo(nsACString& aTo)
+nsDisplaySolidColor::WriteDebugInfo(std::stringstream& aStream)
 {
-  aTo += nsPrintfCString(" (rgba %d,%d,%d,%d)",
-                 NS_GET_R(mColor), NS_GET_G(mColor),
-                 NS_GET_B(mColor), NS_GET_A(mColor));
+  aStream << " (rgba "
+          << (int)NS_GET_R(mColor) << ","
+          << (int)NS_GET_G(mColor) << ","
+          << (int)NS_GET_B(mColor) << ","
+          << (int)NS_GET_A(mColor) << ")";
 }
 #endif
 
@@ -2551,9 +2665,9 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplayThemedBackground::WriteDebugInfo(nsACString& aTo)
+nsDisplayThemedBackground::WriteDebugInfo(std::stringstream& aStream)
 {
-  aTo += nsPrintfCString(" (themed, appearance:%d)", mAppearance);
+  aStream << " (themed, appearance:" << (int)mAppearance << ")";
 }
 #endif
 
@@ -2699,20 +2813,19 @@
 nsDisplayBackgroundColor::Paint(nsDisplayListBuilder* aBuilder,
                                 nsRenderingContext* aCtx)
 {
+  DrawTarget& aDrawTarget = *aCtx->GetDrawTarget();
+
   if (mColor == NS_RGBA(0, 0, 0, 0)) {
     return;
   }
 
-  gfxContext* ctx = aCtx->ThebesContext();
   nsRect borderBox = nsRect(ToReferenceFrame(), mFrame->GetSize());
 
-  gfxRect bounds =
-    nsLayoutUtils::RectToGfxRect(borderBox, mFrame->PresContext()->AppUnitsPerDevPixel());
-
-  ctx->SetColor(mColor);
-  ctx->NewPath();
-  ctx->Rectangle(bounds, true);
-  ctx->Fill();
+  Rect rect = NSRectToSnappedRect(borderBox,
+                                  mFrame->PresContext()->AppUnitsPerDevPixel(),
+                                  aDrawTarget);
+  ColorPattern color(ToDeviceColor(mColor));
+  aDrawTarget.FillRect(rect, color);
 }
 
 nsRegion
@@ -2757,11 +2870,10 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplayBackgroundColor::WriteDebugInfo(nsACString& aTo)
+nsDisplayBackgroundColor::WriteDebugInfo(std::stringstream& aStream)
 {
-  aTo += nsPrintfCString(" (rgba %f,%f,%f,%f)",
-          mColor.r, mColor.g,
-          mColor.b, mColor.a);
+  aStream << " (rgba " << mColor.r << "," << mColor.g << ","
+          << mColor.b << "," << mColor.a << ")";
 }
 #endif
 
@@ -2846,6 +2958,9 @@
   if (pointerEvents == NS_STYLE_POINTER_EVENTS_NONE) {
     return;
   }
+  if (!aFrame->StyleVisibility()->IsVisible()) {
+    return;
+  }
   // XXX handle other pointerEvents values for SVG
   // XXX Do something clever here for the common case where the border box
   // is obviously entirely inside mHitRegion.
@@ -2870,6 +2985,28 @@
   }
 }
 
+void
+nsDisplayLayerEventRegions::AddInactiveScrollPort(const nsRect& aRect)
+{
+  mDispatchToContentHitRegion.Or(mDispatchToContentHitRegion, aRect);
+}
+
+#ifdef MOZ_DUMP_PAINTING
+void
+nsDisplayLayerEventRegions::WriteDebugInfo(std::stringstream& aStream)
+{
+  if (!mHitRegion.IsEmpty()) {
+    AppendToString(aStream, mHitRegion, " (hitRegion ", ")");
+  }
+  if (!mMaybeHitRegion.IsEmpty()) {
+    AppendToString(aStream, mMaybeHitRegion, " (maybeHitRegion ", ")");
+  }
+  if (!mDispatchToContentHitRegion.IsEmpty()) {
+    AppendToString(aStream, mDispatchToContentHitRegion, " (dispatchToContentRegion ", ")");
+  }
+}
+#endif
+
 nsDisplayCaret::nsDisplayCaret(nsDisplayListBuilder* aBuilder,
                                nsIFrame* aCaretFrame)
   : nsDisplayItem(aBuilder, aCaretFrame)
@@ -3561,9 +3698,9 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplayOpacity::WriteDebugInfo(nsACString& aTo)
+nsDisplayOpacity::WriteDebugInfo(std::stringstream& aStream)
 {
-  aTo += nsPrintfCString(" (opacity %f)", mOpacity);
+  aStream << " (opacity " << mOpacity << ")";
 }
 #endif
 
@@ -3783,7 +3920,9 @@
   nsPresContext* presContext = mFrame->PresContext();
   nsIFrame* rootScrollFrame = presContext->PresShell()->GetRootScrollFrame();
   bool isRootContentDocument = presContext->IsRootContentDocument();
-  ContainerLayerParameters params = aContainerParameters;
+  nsIPresShell* presShell = presContext->PresShell();
+  ContainerLayerParameters params(presShell->GetXResolution(),
+      presShell->GetYResolution(), nsIntPoint(), aContainerParameters);
   if ((mFlags & GENERATE_SCROLLABLE_LAYER) &&
       rootScrollFrame->GetContent() &&
       nsLayoutUtils::GetCriticalDisplayPort(rootScrollFrame->GetContent(), nullptr)) {
@@ -4324,10 +4463,10 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplayScrollLayer::WriteDebugInfo(nsACString& aTo)
+nsDisplayScrollLayer::WriteDebugInfo(std::stringstream& aStream)
 {
-  aTo += nsPrintfCString(" (scrollframe %p scrolledframe %p)",
-                         mScrollFrame, mScrolledFrame);
+  aStream << " (scrollframe " << mScrollFrame
+          << " scrolledFrame " << mScrolledFrame << ")";
 }
 #endif
 
@@ -4698,11 +4837,18 @@
 
   //TODO: Should this be using our bounds or the parent's bounds?
   // How do we handle aBoundsOverride in the latter case?
-  nsIFrame* parent = aFrame->GetParentStyleContextFrame();
-  if (!parent) {
+  nsIFrame* parent;
+  nsStyleContext* psc = aFrame->GetParentStyleContext(&parent);
+  if (!psc) {
     return Point3D();
   }
-  const nsStyleDisplay* display = parent->StyleDisplay();
+  if (!parent) {
+    parent = aFrame->GetParent();
+    if (!parent) {
+      return Point3D();
+    }
+  }
+  const nsStyleDisplay* display = psc->StyleDisplay();
   nsRect boundingRect = nsDisplayTransform::GetFrameBoundsForTransform(parent);
 
   /* Allows us to access named variables by index. */
@@ -5505,11 +5651,9 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplayTransform::WriteDebugInfo(nsACString& aTo)
+nsDisplayTransform::WriteDebugInfo(std::stringstream& aStream)
 {
-  std::stringstream ss;
-  AppendToString(ss, GetTransform());
-  aTo += ss.str().c_str();
+  AppendToString(aStream, GetTransform());
 }
 #endif
 
@@ -5528,6 +5672,30 @@
 }
 #endif
 
+nsDisplayVR::nsDisplayVR(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
+                         nsDisplayList* aList, mozilla::gfx::VRHMDInfo* aHMD)
+  : nsDisplayOwnLayer(aBuilder, aFrame, aList)
+  , mHMD(aHMD)
+{
+}
+
+already_AddRefed<Layer>
+nsDisplayVR::BuildLayer(nsDisplayListBuilder* aBuilder,
+                        LayerManager* aManager,
+                        const ContainerLayerParameters& aContainerParameters)
+{
+  ContainerLayerParameters newContainerParameters = aContainerParameters;
+  uint32_t flags = FrameLayerBuilder::CONTAINER_NOT_CLIPPED_BY_ANCESTORS;
+  nsRefPtr<ContainerLayer> container = aManager->GetLayerBuilder()->
+    BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
+                           newContainerParameters, nullptr, flags);
+
+  container->SetVRHMDInfo(mHMD);
+  container->SetUserData(nsIFrame::LayerIsPrerenderedDataKey(),
+                         /*the value is irrelevant*/nullptr);
+
+  return container.forget();
+}
 nsRegion nsDisplaySVGEffects::GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
                                               bool* aSnap)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsDisplayList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsDisplayList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsDisplayList.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsDisplayList.h	2014-11-26 21:46:05.000000000 +0000
@@ -28,6 +28,7 @@
 #include "FrameMetrics.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/gfx/UserData.h"
+#include "gfxVR.h"
 
 #include <stdint.h>
 #include "nsTHashtable.h"
@@ -209,7 +210,19 @@
    */
   const nsIFrame* FindReferenceFrameFor(const nsIFrame *aFrame,
                                         nsPoint* aOffset = nullptr);
-  
+
+  /**
+   * Returns whether a frame acts as an animated geometry root, optionally
+   * returning the next ancestor to check.
+   */
+  bool IsAnimatedGeometryRoot(nsIFrame* aFrame, nsIFrame** aParent = nullptr);
+
+  /**
+   * Returns the nearest ancestor frame to aFrame that is considered to have
+   * (or will have) animated geometry. This can return aFrame.
+   */
+  nsIFrame* FindAnimatedGeometryRootFor(nsIFrame* aFrame, const nsIFrame* aStopAtAncestor = nullptr);
+
   /**
    * @return the root of the display list's frame (sub)tree, whose origin
    * establishes the coordinate system for the display list
@@ -311,6 +324,10 @@
   const nsIFrame* GetCurrentFrame() { return mCurrentFrame; }
   const nsIFrame* GetCurrentReferenceFrame() { return mCurrentReferenceFrame; }
   const nsPoint& GetCurrentFrameOffsetToReferenceFrame() { return mCurrentOffsetToReferenceFrame; }
+  const nsIFrame* GetCurrentAnimatedGeometryRoot() {
+    return mCurrentAnimatedGeometryRoot;
+  }
+  void RecomputeCurrentAnimatedGeometryRoot();
 
   /**
    * Returns true if merging and flattening of display lists should be
@@ -539,6 +556,7 @@
       : mBuilder(aBuilder),
         mPrevFrame(aBuilder->mCurrentFrame),
         mPrevReferenceFrame(aBuilder->mCurrentReferenceFrame),
+        mPrevAnimatedGeometryRoot(mBuilder->mCurrentAnimatedGeometryRoot),
         mPrevLayerEventRegions(aBuilder->mLayerEventRegions),
         mPrevOffset(aBuilder->mCurrentOffsetToReferenceFrame),
         mPrevDirtyRect(aBuilder->mDirtyRect),
@@ -555,6 +573,16 @@
           aBuilder->FindReferenceFrameFor(aForChild,
               &aBuilder->mCurrentOffsetToReferenceFrame);
       }
+      if (aBuilder->mCurrentFrame == aForChild->GetParent()) {
+        if (aBuilder->IsAnimatedGeometryRoot(aForChild)) {
+          aBuilder->mCurrentAnimatedGeometryRoot = aForChild;
+        }
+      } else {
+        // Stop at the previous animated geometry root to help cases that
+        // aren't immediate descendents.
+        aBuilder->mCurrentAnimatedGeometryRoot =
+          aBuilder->FindAnimatedGeometryRootFor(aForChild, aBuilder->mCurrentAnimatedGeometryRoot);
+      }
       aBuilder->mCurrentFrame = aForChild;
       aBuilder->mDirtyRect = aDirtyRect;
       aBuilder->mIsAtRootOfPseudoStackingContext = aIsRoot;
@@ -566,6 +594,11 @@
       mBuilder->mCurrentReferenceFrame = aFrame;
       mBuilder->mCurrentOffsetToReferenceFrame = aOffset;
     }
+    // Return the previous frame's animated geometry root, whether or not the
+    // current frame is an immediate descendant.
+    const nsIFrame* GetPrevAnimatedGeometryRoot() const {
+      return mPrevAnimatedGeometryRoot;
+    }
     ~AutoBuildingDisplayList() {
       mBuilder->mCurrentFrame = mPrevFrame;
       mBuilder->mCurrentReferenceFrame = mPrevReferenceFrame;
@@ -574,11 +607,13 @@
       mBuilder->mDirtyRect = mPrevDirtyRect;
       mBuilder->mIsAtRootOfPseudoStackingContext = mPrevIsAtRootOfPseudoStackingContext;
       mBuilder->mAncestorHasTouchEventHandler = mPrevAncestorHasTouchEventHandler;
+      mBuilder->mCurrentAnimatedGeometryRoot = mPrevAnimatedGeometryRoot;
     }
   private:
     nsDisplayListBuilder* mBuilder;
     const nsIFrame*       mPrevFrame;
     const nsIFrame*       mPrevReferenceFrame;
+    nsIFrame*             mPrevAnimatedGeometryRoot;
     nsDisplayLayerEventRegions* mPrevLayerEventRegions;
     nsPoint               mPrevOffset;
     nsRect                mPrevDirtyRect;
@@ -795,6 +830,8 @@
   const nsIFrame*                mCurrentReferenceFrame;
   // The offset from mCurrentFrame to mCurrentReferenceFrame.
   nsPoint                        mCurrentOffsetToReferenceFrame;
+  // The animated geometry root for mCurrentFrame.
+  nsIFrame*                      mCurrentAnimatedGeometryRoot;
   // will-change budget tracker
   nsDataHashtable<nsPtrHashKey<nsPresContext>, DocumentWillChangeBudget>
                                  mWillChangeBudget;
@@ -1308,7 +1345,7 @@
    */
   virtual const char* Name() = 0;
 
-  virtual void WriteDebugInfo(nsACString& aTo) {}
+  virtual void WriteDebugInfo(std::stringstream& aStream) {}
 #endif
 
   nsDisplayItem* GetAbove() { return mAbove; }
@@ -2128,7 +2165,7 @@
   }
 
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 
   NS_DISPLAY_DECL_NAME("SolidColor", TYPE_SOLID_COLOR)
@@ -2289,7 +2326,7 @@
                                          nsRegion* aInvalidRegion) MOZ_OVERRIDE;
 
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 protected:
   nsRect GetBoundsInternal();
@@ -2352,7 +2389,7 @@
 
   NS_DISPLAY_DECL_NAME("BackgroundColor", TYPE_BACKGROUND_COLOR)
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 
 protected:
@@ -2583,10 +2620,19 @@
   // this layer. aFrame must have the same reference frame as mFrame.
   void AddFrame(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame);
 
+  // Indicate that an inactive scrollframe's scrollport should be added to the
+  // dispatch-to-content region, to ensure that APZ lets content create a
+  // displayport.
+  void AddInactiveScrollPort(const nsRect& aRect);
+
   const nsRegion& HitRegion() { return mHitRegion; }
   const nsRegion& MaybeHitRegion() { return mMaybeHitRegion; }
   const nsRegion& DispatchToContentHitRegion() { return mDispatchToContentHitRegion; }
 
+#ifdef MOZ_DUMP_PAINTING
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
+#endif
+
 private:
   // Relative to aFrame's reference frame.
   // These are the points that are definitely in the hit region.
@@ -2792,7 +2838,7 @@
   bool NeedsActiveLayer(nsDisplayListBuilder* aBuilder);
   NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 
   bool CanUseAsyncAnimations(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
@@ -3090,7 +3136,7 @@
   virtual nsIFrame* GetScrolledFrame() { return mScrolledFrame; }
 
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 
   bool IsDisplayPortOpaque() { return mDisplayPortContentsOpaque; }
@@ -3501,7 +3547,7 @@
   bool ShouldPrerender(nsDisplayListBuilder* aBuilder);
 
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 
 private:
@@ -3575,4 +3621,29 @@
   nscoord mRightEdge; // length from the right side
 };
 
+/**
+ * A wrapper layer that wraps its children in a container, then renders
+ * everything with an appropriate VR effect based on the HMDInfo.
+ */
+
+class nsDisplayVR : public nsDisplayOwnLayer {
+public:
+  nsDisplayVR(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
+              nsDisplayList* aList, mozilla::gfx::VRHMDInfo* aHMD);
+
+  virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
+                                   LayerManager* aManager,
+                                   const ContainerLayerParameters& aParameters) MOZ_OVERRIDE
+  {
+    return mozilla::LAYER_ACTIVE;
+  }
+
+  virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
+                                             LayerManager* aManager,
+                                             const ContainerLayerParameters& aContainerParameters) MOZ_OVERRIDE;
+
+protected:
+  nsRefPtr<mozilla::gfx::VRHMDInfo> mHMD;
+};
+
 #endif /*NSDISPLAYLIST_H_*/
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsDocumentViewer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsDocumentViewer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsDocumentViewer.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsDocumentViewer.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -121,6 +121,7 @@
 #include <stdio.h>
 
 #include "mozilla/dom/Element.h"
+#include "mozilla/Telemetry.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -665,7 +666,8 @@
 
   // Initialize our view manager
   int32_t p2a = mPresContext->AppUnitsPerDevPixel();
-  MOZ_ASSERT(p2a == mPresContext->DeviceContext()->UnscaledAppUnitsPerDevPixel());
+  MOZ_ASSERT(p2a ==
+             mPresContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom());
   nscoord width = p2a * mBounds.width;
   nscoord height = p2a * mBounds.height;
 
@@ -1198,6 +1200,7 @@
 
       nsAutoSyncOperation sync(mDocument);
       mInPermitUnloadPrompt = true;
+      mozilla::Telemetry::Accumulate(mozilla::Telemetry::ONBEFOREUNLOAD_PROMPT_COUNT, 1);
       rv = prompt->ConfirmEx(title, message, buttonFlags,
                              leaveLabel, stayLabel, nullptr, nullptr,
                              &dummy, &buttonPressed);
@@ -1212,12 +1215,15 @@
       // XXX: Are there other cases where prompts can abort? Is it ok to
       //      prevent unloading the page in those cases?
       if (NS_FAILED(rv)) {
+        mozilla::Telemetry::Accumulate(mozilla::Telemetry::ONBEFOREUNLOAD_PROMPT_ACTION, 2);
         *aPermitUnload = false;
         return NS_OK;
       }
 
       // Button 0 == leave, button 1 == stay
       *aPermitUnload = (buttonPressed == 0);
+      mozilla::Telemetry::Accumulate(mozilla::Telemetry::ONBEFOREUNLOAD_PROMPT_ACTION,
+        (*aPermitUnload ? 1 : 0));
       // If the user decided to go ahead, make sure not to prompt the user again
       // by toggling the internal prompting bool to false:
       if (*aPermitUnload) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsFrameManagerBase.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsFrameManagerBase.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsFrameManagerBase.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsFrameManagerBase.h	2014-11-26 21:46:05.000000000 +0000
@@ -34,6 +34,7 @@
     , mStyleSet(nullptr)
     , mRootFrame(nullptr)
     , mUndisplayedMap(nullptr)
+    , mDisplayContentsMap(nullptr)
     , mIsDestroyingFrames(false)
   {
     mPlaceholderMap.ops = nullptr;
@@ -65,6 +66,7 @@
   nsIFrame*                       mRootFrame;
   PLDHashTable                    mPlaceholderMap;
   UndisplayedMap*                 mUndisplayedMap;
+  UndisplayedMap*                 mDisplayContentsMap;
   bool                            mIsDestroyingFrames;  // The frame manager is destroying some frame(s).
 
   // The frame tree generation number
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsFrameManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsFrameManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsFrameManager.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsFrameManager.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -40,8 +40,10 @@
 
   #ifdef DEBUG
     //#define DEBUG_UNDISPLAYED_MAP
+    //#define DEBUG_DISPLAY_CONTENTS_MAP
   #else
     #undef DEBUG_UNDISPLAYED_MAP
+    #undef DEBUG_DISPLAY_CONTENTS_MAP
   #endif
 
 using namespace mozilla;
@@ -96,6 +98,7 @@
                                  UndisplayedNode* aNode);
 
   void RemoveNodesFor(nsIContent* aParentContent);
+  UndisplayedNode* UnlinkNodesFor(nsIContent* aParentContent);
 
   // Removes all entries from the hash table
   void  Clear(void);
@@ -139,6 +142,8 @@
   
   delete mUndisplayedMap;
   mUndisplayedMap = nullptr;
+  delete mDisplayContentsMap;
+  mDisplayContentsMap = nullptr;
 
   mPresShell = nullptr;
 }
@@ -220,14 +225,14 @@
 
 //----------------------------------------------------------------------
 
-nsStyleContext*
-nsFrameManager::GetUndisplayedContent(nsIContent* aContent)
+/* static */ nsStyleContext*
+nsFrameManager::GetStyleContextInMap(UndisplayedMap* aMap, nsIContent* aContent)
 {
-  if (!aContent || !mUndisplayedMap)
+  if (!aContent) {
     return nullptr;
-
+  }
   nsIContent* parent = aContent->GetParent();
-  for (UndisplayedNode* node = mUndisplayedMap->GetFirstNode(parent);
+  for (UndisplayedNode* node = aMap->GetFirstNode(parent);
          node; node = node->mNext) {
     if (node->mContent == aContent)
       return node->mStyle;
@@ -236,53 +241,69 @@
   return nullptr;
 }
 
+/* static */ UndisplayedNode*
+nsFrameManager::GetAllUndisplayedNodesInMapFor(UndisplayedMap* aMap,
+                                               nsIContent* aParentContent)
+{
+  return aMap ? aMap->GetFirstNode(aParentContent) : nullptr;
+}
+
 UndisplayedNode*
 nsFrameManager::GetAllUndisplayedContentIn(nsIContent* aParentContent)
 {
-  if (!mUndisplayedMap)
-    return nullptr;
-
-  return mUndisplayedMap->GetFirstNode(aParentContent);
+  return GetAllUndisplayedNodesInMapFor(mUndisplayedMap, aParentContent);
 }
 
-void
-nsFrameManager::SetUndisplayedContent(nsIContent* aContent, 
-                                      nsStyleContext* aStyleContext)
+/* static */ void
+nsFrameManager::SetStyleContextInMap(UndisplayedMap* aMap,
+                                     nsIContent* aContent,
+                                     nsStyleContext* aStyleContext)
 {
   NS_PRECONDITION(!aStyleContext->GetPseudo(),
                   "Should only have actual elements here");
 
-#ifdef DEBUG_UNDISPLAYED_MAP
+#if defined(DEBUG_UNDISPLAYED_MAP) || defined(DEBUG_DISPLAY_BOX_CONTENTS_MAP)
   static int i = 0;
-  printf("SetUndisplayedContent(%d): p=%p \n", i++, (void *)aContent);
+  printf("SetStyleContextInMap(%d): p=%p \n", i++, (void *)aContent);
 #endif
 
-  NS_ASSERTION(!GetUndisplayedContent(aContent),
-               "Already have an undisplayed context entry for aContent");
+  NS_ASSERTION(!GetStyleContextInMap(aMap, aContent),
+               "Already have an entry for aContent");
 
-  if (! mUndisplayedMap) {
-    mUndisplayedMap = new UndisplayedMap;
-  }
   nsIContent* parent = aContent->GetParent();
-  NS_ASSERTION(parent || (mPresShell && mPresShell->GetDocument() &&
-               mPresShell->GetDocument()->GetRootElement() == aContent),
+#ifdef DEBUG
+  nsIPresShell* shell = aStyleContext->PresContext()->PresShell();
+  NS_ASSERTION(parent || (shell && shell->GetDocument() &&
+                          shell->GetDocument()->GetRootElement() == aContent),
                "undisplayed content must have a parent, unless it's the root "
                "element");
-  mUndisplayedMap->AddNodeFor(parent, aContent, aStyleContext);
+#endif
+  aMap->AddNodeFor(parent, aContent, aStyleContext);
 }
 
 void
-nsFrameManager::ChangeUndisplayedContent(nsIContent* aContent, 
-                                         nsStyleContext* aStyleContext)
+nsFrameManager::SetUndisplayedContent(nsIContent* aContent,
+                                      nsStyleContext* aStyleContext)
 {
-  NS_ASSERTION(mUndisplayedMap, "no existing undisplayed content");
-  
-#ifdef DEBUG_UNDISPLAYED_MAP
+  if (!mUndisplayedMap) {
+    mUndisplayedMap = new UndisplayedMap;
+  }
+  SetStyleContextInMap(mUndisplayedMap, aContent, aStyleContext);
+}
+
+/* static */ void
+nsFrameManager::ChangeStyleContextInMap(UndisplayedMap* aMap,
+                                        nsIContent* aContent,
+                                        nsStyleContext* aStyleContext)
+{
+  MOZ_ASSERT(aMap, "expecting a map");
+
+#if defined(DEBUG_UNDISPLAYED_MAP) || defined(DEBUG_DISPLAY_BOX_CONTENTS_MAP)
    static int i = 0;
-   printf("ChangeUndisplayedContent(%d): p=%p \n", i++, (void *)aContent);
+   printf("ChangeStyleContextInMap(%d): p=%p \n", i++, (void *)aContent);
 #endif
 
-  for (UndisplayedNode* node = mUndisplayedMap->GetFirstNode(aContent->GetParent());
+  for (UndisplayedNode* node = aMap->GetFirstNode(aContent->GetParent());
          node; node = node->mNext) {
     if (node->mContent == aContent) {
       node->mStyle = aStyleContext;
@@ -290,7 +311,7 @@
     }
   }
 
-  NS_NOTREACHED("no existing undisplayed content");
+  MOZ_CRASH("couldn't find the entry to change");
 }
 
 void
@@ -321,6 +342,9 @@
       node = node->mNext;
     }
   }
+#ifdef DEBUG_UNDISPLAYED_MAP
+  printf( "not found.\n");
+#endif
 }
 
 void
@@ -348,6 +372,92 @@
 }
 
 //----------------------------------------------------------------------
+
+void
+nsFrameManager::SetDisplayContents(nsIContent* aContent,
+                                   nsStyleContext* aStyleContext)
+{
+  if (!mDisplayContentsMap) {
+    mDisplayContentsMap = new UndisplayedMap;
+  }
+  SetStyleContextInMap(mDisplayContentsMap, aContent, aStyleContext);
+}
+
+UndisplayedNode*
+nsFrameManager::GetAllDisplayContentsIn(nsIContent* aParentContent)
+{
+  return GetAllUndisplayedNodesInMapFor(mDisplayContentsMap, aParentContent);
+}
+
+void
+nsFrameManager::ClearDisplayContentsIn(nsIContent* aContent,
+                                       nsIContent* aParentContent)
+{
+#ifdef DEBUG_DISPLAY_CONTENTS_MAP
+  static int i = 0;
+  printf("ClearDisplayContents(%d): content=%p parent=%p --> ", i++, (void *)aContent, (void*)aParentContent);
+#endif
+  
+  if (mDisplayContentsMap) {
+    UndisplayedNode* node = mDisplayContentsMap->GetFirstNode(aParentContent);
+    while (node) {
+      if (node->mContent == aContent) {
+        mDisplayContentsMap->RemoveNodeFor(aParentContent, node);
+
+#ifdef DEBUG_DISPLAY_CONTENTS_MAP
+        printf( "REMOVED!\n");
+#endif
+#ifdef DEBUG
+        // make sure that there are no more entries for the same content
+        nsStyleContext* context = GetDisplayContentsStyleFor(aContent);
+        NS_ASSERTION(context == nullptr, "Found more entries for aContent after removal");
+#endif
+        ClearAllDisplayContentsIn(aContent);
+        ClearAllUndisplayedContentIn(aContent);
+        return;
+      }
+      node = node->mNext;
+    }
+  }
+#ifdef DEBUG_DISPLAY_CONTENTS_MAP
+  printf( "not found.\n");
+#endif
+}
+
+void
+nsFrameManager::ClearAllDisplayContentsIn(nsIContent* aParentContent)
+{
+#ifdef DEBUG_DISPLAY_CONTENTS_MAP
+  static int i = 0;
+  printf("ClearAllDisplayContentsIn(%d): parent=%p \n", i++, (void*)aParentContent);
+#endif
+
+  if (mDisplayContentsMap) {
+    UndisplayedNode* cur = mDisplayContentsMap->UnlinkNodesFor(aParentContent);
+    while (cur) {
+      UndisplayedNode* next = cur->mNext;
+      cur->mNext = nullptr;
+      ClearAllDisplayContentsIn(cur->mContent);
+      ClearAllUndisplayedContentIn(cur->mContent);
+      delete cur;
+      cur = next;
+    }
+  }
+
+  // Need to look at aParentContent's content list due to XBL insertions.
+  // Nodes in aParentContent's content list do not have aParentContent as a
+  // parent, but are treated as children of aParentContent. We iterate over
+  // the flattened content list and just ignore any nodes we don't care about.
+  FlattenedChildIterator iter(aParentContent);
+  for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
+    if (child->GetParent() != aParentContent) {
+      ClearDisplayContentsIn(child, child->GetParent());
+      ClearUndisplayedContentIn(child, child->GetParent());
+    }
+  }
+}
+
+//----------------------------------------------------------------------
 void
 nsFrameManager::AppendFrames(nsContainerFrame* aParentFrame,
                              ChildListID       aListID,
@@ -424,6 +534,7 @@
   nsIContent* content = aFrame->GetContent();
   if (content && content->GetPrimaryFrame() == aFrame) {
     ClearAllUndisplayedContentIn(content);
+    ClearAllDisplayContentsIn(content);
   }
 }
 
@@ -700,18 +811,26 @@
   delete aNode;
 }
 
-void
-nsFrameManagerBase::UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent)
+
+UndisplayedNode*
+nsFrameManagerBase::UndisplayedMap::UnlinkNodesFor(nsIContent* aParentContent)
 {
   PLHashEntry** entry = GetEntryFor(&aParentContent);
   NS_ASSERTION(entry, "content not in map");
   if (*entry) {
-    UndisplayedNode*  node = (UndisplayedNode*)((*entry)->value);
+    UndisplayedNode* node = (UndisplayedNode*)((*entry)->value);
     NS_ASSERTION(node, "null node for non-null entry in UndisplayedMap");
-    delete node;
     PL_HashTableRawRemove(mTable, entry, *entry);
     mLastLookup = nullptr; // hashtable may have shifted bucket out from under us
+    return node;
   }
+  return nullptr;
+}
+
+void
+nsFrameManagerBase::UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent)
+{
+  delete UnlinkNodesFor(aParentContent);
 }
 
 static int
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsFrameManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsFrameManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsFrameManager.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsFrameManager.h	2014-11-26 21:46:05.000000000 +0000
@@ -108,17 +108,67 @@
   void      ClearPlaceholderFrameMap();
 
   // Mapping undisplayed content
-  nsStyleContext* GetUndisplayedContent(nsIContent* aContent);
+  nsStyleContext* GetUndisplayedContent(nsIContent* aContent)
+  {
+    if (!mUndisplayedMap) {
+      return nullptr;
+    }
+    return GetStyleContextInMap(mUndisplayedMap, aContent);
+  }
   mozilla::UndisplayedNode*
     GetAllUndisplayedContentIn(nsIContent* aParentContent);
   void SetUndisplayedContent(nsIContent* aContent,
-                                         nsStyleContext* aStyleContext);
+                             nsStyleContext* aStyleContext);
   void ChangeUndisplayedContent(nsIContent* aContent,
-                                            nsStyleContext* aStyleContext);
+                                nsStyleContext* aStyleContext)
+  {
+    ChangeStyleContextInMap(mUndisplayedMap, aContent, aStyleContext);
+  }
+
   void ClearUndisplayedContentIn(nsIContent* aContent,
-                                             nsIContent* aParentContent);
+                                 nsIContent* aParentContent);
   void ClearAllUndisplayedContentIn(nsIContent* aParentContent);
 
+  // display:contents related methods:
+  /**
+   * Return the registered display:contents style context for aContent, if any.
+   */
+  nsStyleContext* GetDisplayContentsStyleFor(nsIContent* aContent)
+  {
+    if (!mDisplayContentsMap) {
+      return nullptr;
+    }
+    return GetStyleContextInMap(mDisplayContentsMap, aContent);
+  }
+
+  /**
+   * Return the linked list of UndisplayedNodes containing the registered
+   * display:contents children of aParentContent, if any.
+   */
+  mozilla::UndisplayedNode* GetAllDisplayContentsIn(nsIContent* aParentContent);
+  /**
+   * Register aContent having a display:contents style context.
+   */
+  void SetDisplayContents(nsIContent* aContent,
+                          nsStyleContext* aStyleContext);
+  /**
+   * Change the registered style context for aContent to aStyleContext.
+   */
+  void ChangeDisplayContents(nsIContent* aContent,
+                             nsStyleContext* aStyleContext)
+  {
+    ChangeStyleContextInMap(mDisplayContentsMap, aContent, aStyleContext);
+  }
+
+  /**
+   * Unregister the display:contents style context for aContent, if any.
+   * If found, then also unregister any display:contents and display:none
+   * style contexts for its descendants.
+   */
+  void ClearDisplayContentsIn(nsIContent* aContent,
+                              nsIContent* aParentContent);
+  void ClearAllDisplayContentsIn(nsIContent* aParentContent);
+
   // Functions for manipulating the frame model
   void AppendFrames(nsContainerFrame* aParentFrame,
                     ChildListID       aListID,
@@ -161,6 +211,18 @@
 
   void RestoreFrameStateFor(nsIFrame*              aFrame,
                                         nsILayoutHistoryState* aState);
+protected:
+  static nsStyleContext* GetStyleContextInMap(UndisplayedMap* aMap,
+                                              nsIContent* aContent);
+  static mozilla::UndisplayedNode*
+    GetAllUndisplayedNodesInMapFor(UndisplayedMap* aMap,
+                                   nsIContent* aParentContent);
+  static void SetStyleContextInMap(UndisplayedMap* aMap,
+                                   nsIContent* aContent,
+                                   nsStyleContext* aStyleContext);
+  static void ChangeStyleContextInMap(UndisplayedMap* aMap,
+                                      nsIContent* aContent,
+                                      nsStyleContext* aStyleContext);
 };
 
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsIPresShell.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsIPresShell.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsIPresShell.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsIPresShell.h	2014-11-26 21:46:05.000000000 +0000
@@ -1253,9 +1253,10 @@
     nsCOMPtr<nsIContent> mPendingContent;
     nsCOMPtr<nsIContent> mOverrideContent;
     bool                 mReleaseContent;
+    bool                 mPrimaryState;
     
-    explicit PointerCaptureInfo(nsIContent* aPendingContent) :
-      mPendingContent(aPendingContent), mReleaseContent(false)
+    explicit PointerCaptureInfo(nsIContent* aPendingContent, bool aPrimaryState) :
+      mPendingContent(aPendingContent), mReleaseContent(false), mPrimaryState(aPrimaryState)
     {
       MOZ_COUNT_CTOR(PointerCaptureInfo);
     }
@@ -1273,27 +1274,29 @@
   // Keeps a map between pointerId and element that currently capturing pointer
   // with such pointerId. If pointerId is absent in this map then nobody is
   // capturing it. Additionally keep information about pending capturing content.
+  // Additionally keep information about primaryState of pointer event.
   static nsClassHashtable<nsUint32HashKey, PointerCaptureInfo>* gPointerCaptureList;
 
   struct PointerInfo
   {
     bool      mActiveState;
     uint16_t  mPointerType;
-    PointerInfo(bool aActiveState, uint16_t aPointerType) :
-      mActiveState(aActiveState), mPointerType(aPointerType) {}
+    bool      mPrimaryState;
+    PointerInfo(bool aActiveState, uint16_t aPointerType, bool aPrimaryState) :
+      mActiveState(aActiveState), mPointerType(aPointerType), mPrimaryState(aPrimaryState) {}
   };
-  // Keeps information about pointers such as pointerId, activeState, pointerType
+  // Keeps information about pointers such as pointerId, activeState, pointerType, primaryState
   static nsClassHashtable<nsUint32HashKey, PointerInfo>* gActivePointersIds;
 
   static void DispatchGotOrLostPointerCaptureEvent(bool aIsGotCapture,
                                                    uint32_t aPointerId,
                                                    uint16_t aPointerType,
+                                                   bool aIsPrimary,
                                                    nsIContent* aCaptureTarget);
   static void SetPointerCapturingContent(uint32_t aPointerId, nsIContent* aContent);
   static void ReleasePointerCapturingContent(uint32_t aPointerId, nsIContent* aContent);
   static nsIContent* GetPointerCapturingContent(uint32_t aPointerId);
-  static uint16_t GetPointerType(uint32_t aPointerId);
-  
+
   // CheckPointerCaptureState checks cases, when got/lostpointercapture events should be fired.
   // Function returns true, if any of events was fired; false, if no one event was fired.
   static bool CheckPointerCaptureState(uint32_t aPointerId);
@@ -1302,6 +1305,12 @@
   // aActiveState is additional information, which shows state of pointer like button state for mouse.
   static bool GetPointerInfo(uint32_t aPointerId, bool& aActiveState);
 
+  // GetPointerType returns pointer type like mouse, pen or touch for pointer event with pointerId
+  static uint16_t GetPointerType(uint32_t aPointerId);
+
+  // GetPointerPrimaryState returns state of attribute isPrimary for pointer event with pointerId
+  static bool GetPointerPrimaryState(uint32_t aPointerId);
+
   /**
    * When capturing content is set, it traps all mouse events and retargets
    * them at this content node. If capturing is not allowed
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsLayoutDebugger.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsLayoutDebugger.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsLayoutDebugger.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsLayoutDebugger.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -191,9 +191,7 @@
   }
 
   // Display item specific debug info
-  nsCString itemStr;
-  aItem->WriteDebugInfo(itemStr);
-  aStream << itemStr.get();
+  aItem->WriteDebugInfo(aStream);
 
   if (aDumpHtml && aItem->Painted()) {
     aStream << "</a>";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsLayoutUtils.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsLayoutUtils.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsLayoutUtils.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsLayoutUtils.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/gfx/PathHelpers.h"
+#include "mozilla/Likely.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "nsCharTraits.h"
@@ -113,6 +114,7 @@
 #define GRID_ENABLED_PREF_NAME "layout.css.grid.enabled"
 #define RUBY_ENABLED_PREF_NAME "layout.css.ruby.enabled"
 #define STICKY_ENABLED_PREF_NAME "layout.css.sticky.enabled"
+#define DISPLAY_CONTENTS_ENABLED_PREF_NAME "layout.css.display-contents.enabled"
 #define TEXT_ALIGN_TRUE_ENABLED_PREF_NAME "layout.css.text-align-true-value.enabled"
 
 #ifdef DEBUG
@@ -294,6 +296,36 @@
     isStickyEnabled ? eCSSKeyword_sticky : eCSSKeyword_UNKNOWN;
 }
 
+// When the pref "layout.css.display-contents.enabled" changes, this function is
+// invoked to let us update kDisplayKTable, to selectively disable or restore
+// the entries for "contents" in that table.
+static void
+DisplayContentsEnabledPrefChangeCallback(const char* aPrefName, void* aClosure)
+{
+  NS_ASSERTION(strcmp(aPrefName, DISPLAY_CONTENTS_ENABLED_PREF_NAME) == 0,
+               "Did you misspell " DISPLAY_CONTENTS_ENABLED_PREF_NAME " ?");
+
+  static bool sIsDisplayContentsKeywordIndexInitialized;
+  static int32_t sIndexOfContentsInDisplayTable;
+  bool isDisplayContentsEnabled =
+    Preferences::GetBool(DISPLAY_CONTENTS_ENABLED_PREF_NAME, false);
+
+  if (!sIsDisplayContentsKeywordIndexInitialized) {
+    // First run: find the position of "contents" in kDisplayKTable.
+    sIndexOfContentsInDisplayTable =
+      nsCSSProps::FindIndexOfKeyword(eCSSKeyword_contents,
+                                     nsCSSProps::kDisplayKTable);
+    sIsDisplayContentsKeywordIndexInitialized = true;
+  }
+
+  // OK -- now, stomp on or restore the "contents" entry in kDisplayKTable,
+  // depending on whether the pref is enabled vs. disabled.
+  if (sIndexOfContentsInDisplayTable >= 0) {
+    nsCSSProps::kDisplayKTable[sIndexOfContentsInDisplayTable] =
+      isDisplayContentsEnabled ? eCSSKeyword_contents : eCSSKeyword_UNKNOWN;
+  }
+}
+
 // When the pref "layout.css.text-align-true-value.enabled" changes, this
 // function is called to let us update kTextAlignKTable & kTextAlignLastKTable,
 // to selectively disable or restore the entries for "true" in those tables.
@@ -854,6 +886,9 @@
   // Expand the rect by the margins
   screenRect.Inflate(aMarginsData->mMargins);
 
+  int alignmentX = gfxPlatform::GetPlatform()->GetTileWidth();
+  int alignmentY = gfxPlatform::GetPlatform()->GetTileHeight();
+
   // And then align it to the requested alignment.
   // Note on the correctness of applying the alignment in Screen space:
   //   The correct space to apply the alignment in would be Layer space, but
@@ -865,7 +900,7 @@
   //   screen resolution; since this is what Layout does most of the time,
   //   this is a good approximation. A proper solution would involve moving the
   //   choosing of the resolution to display-list building time.
-  if (aMarginsData->mAlignmentX > 0 || aMarginsData->mAlignmentY > 0) {
+  if (alignmentX > 0 && alignmentY > 0) {
     // Inflate the rectangle by 1 so that we always push to the next tile
     // boundary. This is desirable to stop from having a rectangle with a
     // moving origin occasionally being smaller when it coincidentally lines
@@ -873,21 +908,21 @@
     screenRect.Inflate(1);
 
     // Avoid division by zero.
-    if (aMarginsData->mAlignmentX == 0) {
-      aMarginsData->mAlignmentX = 1;
+    if (alignmentX == 0) {
+      alignmentX = 1;
     }
-    if (aMarginsData->mAlignmentY == 0) {
-      aMarginsData->mAlignmentY = 1;
+    if (alignmentY == 0) {
+      alignmentY = 1;
     }
 
     ScreenPoint scrollPosScreen = LayoutDevicePoint::FromAppUnits(scrollPos, auPerDevPixel)
                                 * res;
 
     screenRect += scrollPosScreen;
-    float x = aMarginsData->mAlignmentX * floor(screenRect.x / aMarginsData->mAlignmentX);
-    float y = aMarginsData->mAlignmentY * floor(screenRect.y / aMarginsData->mAlignmentY);
-    float w = aMarginsData->mAlignmentX * ceil(screenRect.XMost() / aMarginsData->mAlignmentX) - x;
-    float h = aMarginsData->mAlignmentY * ceil(screenRect.YMost() / aMarginsData->mAlignmentY) - y;
+    float x = alignmentX * floor(screenRect.x / alignmentX);
+    float y = alignmentY * floor(screenRect.y / alignmentY);
+    float w = alignmentX * ceil(screenRect.XMost() / alignmentX) - x;
+    float h = alignmentY * ceil(screenRect.YMost() / alignmentY) - y;
     screenRect = ScreenRect(x, y, w, h);
     screenRect -= scrollPosScreen;
   }
@@ -953,24 +988,22 @@
   return GetDisplayPortImpl(aContent, aResult, 1.0f);
 }
 
-void
+bool
 nsLayoutUtils::SetDisplayPortMargins(nsIContent* aContent,
                                      nsIPresShell* aPresShell,
                                      const ScreenMargin& aMargins,
-                                     uint32_t aAlignmentX,
-                                     uint32_t aAlignmentY,
                                      uint32_t aPriority,
                                      RepaintMode aRepaintMode)
 {
   DisplayPortMarginsPropertyData* currentData =
     static_cast<DisplayPortMarginsPropertyData*>(aContent->GetProperty(nsGkAtoms::DisplayPortMargins));
   if (currentData && currentData->mPriority > aPriority) {
-    return;
+    return false;
   }
 
   aContent->SetProperty(nsGkAtoms::DisplayPortMargins,
                         new DisplayPortMarginsPropertyData(
-                            aMargins, aAlignmentX, aAlignmentY, aPriority),
+                            aMargins, aPriority),
                         nsINode::DeleteProperty<DisplayPortMarginsPropertyData>);
 
   if (nsLayoutUtils::UsesAsyncScrolling()) {
@@ -989,6 +1022,8 @@
       rootFrame->SchedulePaint();
     }
   }
+
+  return true;
 }
 
 void
@@ -1026,73 +1061,6 @@
   return static_cast<nsContainerFrame*>(f);
 }
 
-/**
- * GetFirstChildFrame returns the first "real" child frame of a
- * given frame.  It will descend down into pseudo-frames (unless the
- * pseudo-frame is the :before generated frame).
- * @param aFrame the frame
- * @param aFrame the frame's content node
- */
-static nsIFrame*
-GetFirstChildFrame(nsIFrame*       aFrame,
-                   nsIContent*     aContent)
-{
-  NS_PRECONDITION(aFrame, "NULL frame pointer");
-
-  // Get the first child frame
-  nsIFrame* childFrame = aFrame->GetFirstPrincipalChild();
-
-  // If the child frame is a pseudo-frame, then return its first child.
-  // Note that the frame we create for the generated content is also a
-  // pseudo-frame and so don't drill down in that case
-  if (childFrame &&
-      childFrame->IsPseudoFrame(aContent) &&
-      !childFrame->IsGeneratedContentFrame()) {
-    return GetFirstChildFrame(childFrame, aContent);
-  }
-
-  return childFrame;
-}
-
-/**
- * GetLastChildFrame returns the last "real" child frame of a
- * given frame.  It will descend down into pseudo-frames (unless the
- * pseudo-frame is the :after generated frame).
- * @param aFrame the frame
- * @param aFrame the frame's content node
- */
-static nsIFrame*
-GetLastChildFrame(nsContainerFrame* aFrame,
-                  nsIContent*       aContent)
-{
-  NS_PRECONDITION(aFrame, "NULL frame pointer");
-
-  // Get the last continuation frame that's a parent
-  nsContainerFrame* lastParentContinuation =
-    nsLayoutUtils::LastContinuationWithChild(aFrame);
-  nsIFrame* lastChildFrame =
-    lastParentContinuation->GetLastChild(nsIFrame::kPrincipalList);
-  if (lastChildFrame) {
-    // Get the frame's first continuation. This matters in case the frame has
-    // been continued across multiple lines or split by BiDi resolution.
-    lastChildFrame = lastChildFrame->FirstContinuation();
-
-    // If the last child frame is a pseudo-frame, then return its last child.
-    // Note that the frame we create for the generated content is also a
-    // pseudo-frame and so don't drill down in that case
-    if (lastChildFrame &&
-        lastChildFrame->IsPseudoFrame(aContent) &&
-        !lastChildFrame->IsGeneratedContentFrame()) {
-      return GetLastChildFrame(static_cast<nsContainerFrame*>(lastChildFrame),
-                               aContent);
-    }
-
-    return lastChildFrame;
-  }
-
-  return nullptr;
-}
-
 //static
 FrameChildListID
 nsLayoutUtils::GetChildListNameFor(nsIFrame* aChildFrame)
@@ -1191,46 +1159,81 @@
   return id;
 }
 
-// static
-nsIFrame*
-nsLayoutUtils::GetBeforeFrame(nsIFrame* aFrame)
+/*static*/ nsIFrame*
+nsLayoutUtils::GetBeforeFrameForContent(nsIFrame* aFrame,
+                                        nsIContent* aContent)
 {
-  NS_PRECONDITION(aFrame, "NULL frame pointer");
-  NS_ASSERTION(!aFrame->GetPrevContinuation(),
-               "aFrame must be first continuation");
-
-  nsIFrame* cif = aFrame->GetContentInsertionFrame();
-  if (!cif) {
+  nsContainerFrame* genConParentFrame = aFrame->GetContentInsertionFrame();
+  if (!genConParentFrame) {
     return nullptr;
   }
-  nsIFrame* firstFrame = GetFirstChildFrame(cif, aFrame->GetContent());
-  if (firstFrame && IsGeneratedContentFor(nullptr, firstFrame,
-                                          nsCSSPseudoElements::before)) {
-    return firstFrame;
+  nsTArray<nsIContent*>* prop = genConParentFrame->GetGenConPseudos();
+  if (prop) {
+    const nsTArray<nsIContent*>& pseudos(*prop);
+    for (uint32_t i = 0; i < pseudos.Length(); ++i) {
+      if (pseudos[i]->GetParent() == aContent &&
+          pseudos[i]->Tag() == nsGkAtoms::mozgeneratedcontentbefore) {
+        return pseudos[i]->GetPrimaryFrame();
+      }
+    }
+  }
+  // If the first child frame is a pseudo-frame, then try that.
+  // Note that the frame we create for the generated content is also a
+  // pseudo-frame and so don't drill down in that case.
+  nsIFrame* childFrame = genConParentFrame->GetFirstPrincipalChild();
+  if (childFrame &&
+      childFrame->IsPseudoFrame(aContent) &&
+      !childFrame->IsGeneratedContentFrame()) {
+    return GetBeforeFrameForContent(childFrame, aContent);
   }
-
   return nullptr;
 }
 
-// static
-nsIFrame*
-nsLayoutUtils::GetAfterFrame(nsIFrame* aFrame)
+/*static*/ nsIFrame*
+nsLayoutUtils::GetBeforeFrame(nsIFrame* aFrame)
 {
-  NS_PRECONDITION(aFrame, "NULL frame pointer");
+  return GetBeforeFrameForContent(aFrame, aFrame->GetContent());
+}
 
-  nsContainerFrame* cif = aFrame->GetContentInsertionFrame();
-  if (!cif) {
+/*static*/ nsIFrame*
+nsLayoutUtils::GetAfterFrameForContent(nsIFrame* aFrame,
+                                       nsIContent* aContent)
+{
+  nsContainerFrame* genConParentFrame = aFrame->GetContentInsertionFrame();
+  if (!genConParentFrame) {
     return nullptr;
   }
-  nsIFrame* lastFrame = GetLastChildFrame(cif, aFrame->GetContent());
-  if (lastFrame && IsGeneratedContentFor(nullptr, lastFrame,
-                                         nsCSSPseudoElements::after)) {
-    return lastFrame;
+  nsTArray<nsIContent*>* prop = genConParentFrame->GetGenConPseudos();
+  if (prop) {
+    const nsTArray<nsIContent*>& pseudos(*prop);
+    for (uint32_t i = 0; i < pseudos.Length(); ++i) {
+      if (pseudos[i]->GetParent() == aContent &&
+          pseudos[i]->Tag() == nsGkAtoms::mozgeneratedcontentafter) {
+        return pseudos[i]->GetPrimaryFrame();
+      }
+    }
+  }
+  // If the last child frame is a pseudo-frame, then try that.
+  // Note that the frame we create for the generated content is also a
+  // pseudo-frame and so don't drill down in that case.
+  nsIFrame* lastParentContinuation =
+    nsLayoutUtils::LastContinuationWithChild(genConParentFrame);
+  nsIFrame* childFrame =
+    lastParentContinuation->GetLastChild(nsIFrame::kPrincipalList);
+  if (childFrame &&
+      childFrame->IsPseudoFrame(aContent) &&
+      !childFrame->IsGeneratedContentFrame()) {
+    return GetAfterFrameForContent(childFrame->FirstContinuation(), aContent);
   }
-
   return nullptr;
 }
 
+/*static*/ nsIFrame*
+nsLayoutUtils::GetAfterFrame(nsIFrame* aFrame)
+{
+  return GetAfterFrameForContent(aFrame, aFrame->GetContent());
+}
+
 // static
 nsIFrame*
 nsLayoutUtils::GetClosestFrameOfType(nsIFrame* aFrame, nsIAtom* aFrameType)
@@ -1717,8 +1720,8 @@
     reinterpret_cast<void*>(intptr_t(aLayerize)));
 }
 
-static bool
-IsScrollbarThumbLayerized(nsIFrame* aThumbFrame)
+bool
+nsLayoutUtils::IsScrollbarThumbLayerized(nsIFrame* aThumbFrame)
 {
   return reinterpret_cast<intptr_t>(aThumbFrame->Properties().Get(ScrollbarThumbLayerized()));
 }
@@ -1728,55 +1731,7 @@
                                                nsIFrame* aFrame,
                                                const nsIFrame* aStopAtAncestor)
 {
-  nsIFrame* f = aFrame;
-  nsIFrame* stickyFrame = nullptr;
-  while (f != aStopAtAncestor) {
-    if (nsLayoutUtils::IsPopup(f))
-      break;
-    if (ActiveLayerTracker::IsOffsetOrMarginStyleAnimated(f))
-      break;
-    if (!f->GetParent() &&
-        nsLayoutUtils::ViewportHasDisplayPort(f->PresContext())) {
-      // Viewport frames in a display port need to be animated geometry roots
-      // for background-attachment:fixed elements.
-      break;
-    }
-    nsIFrame* parent = nsLayoutUtils::GetCrossDocParentFrame(f);
-    if (!parent)
-      break;
-    nsIAtom* parentType = parent->GetType();
-    // Treat the slider thumb as being as an active scrolled root when it wants
-    // its own layer so that it can move without repainting.
-    if (parentType == nsGkAtoms::sliderFrame && IsScrollbarThumbLayerized(f)) {
-      break;
-    }
-    // Sticky frames are active if their nearest scrollable frame
-    // is also active, just keep a record of sticky frames that we
-    // encounter for now.
-    if (f->StyleDisplay()->mPosition == NS_STYLE_POSITION_STICKY &&
-        !stickyFrame) {
-      stickyFrame = f;
-    }
-    if (parentType == nsGkAtoms::scrollFrame) {
-      nsIScrollableFrame* sf = do_QueryFrame(parent);
-      if (sf->IsScrollingActive(aBuilder) && sf->GetScrolledFrame() == f) {
-        // If we found a sticky frame inside this active scroll frame,
-        // then use that. Otherwise use the scroll frame.
-        if (stickyFrame) {
-          return stickyFrame;
-        }
-        return f;
-      } else {
-        stickyFrame = nullptr;
-      }
-    }
-    // Fixed-pos frames are parented by the viewport frame, which has no parent
-    if (nsLayoutUtils::IsFixedPosFrameInDisplayPort(f)) {
-      return f;
-    }
-    f = parent;
-  }
-  return f;
+  return aBuilder->FindAnimatedGeometryRootFor(aFrame, aStopAtAncestor);
 }
 
 nsIFrame*
@@ -1837,12 +1792,24 @@
        f->GetParent() : nsLayoutUtils::GetCrossDocParentFrame(f)) {
     nsIScrollableFrame* scrollableFrame = do_QueryFrame(f);
     if (scrollableFrame) {
+      if (aFlags & SCROLLABLE_ONLY_ASYNC_SCROLLABLE) {
+        if (scrollableFrame->WantAsyncScroll()) {
+          return scrollableFrame;
+        }
+        continue;
+      }
       ScrollbarStyles ss = scrollableFrame->GetScrollbarStyles();
       if ((aFlags & SCROLLABLE_INCLUDE_HIDDEN) ||
           ss.mVertical != NS_STYLE_OVERFLOW_HIDDEN ||
           ss.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN)
         return scrollableFrame;
     }
+    if (aFlags & SCROLLABLE_ALWAYS_MATCH_ROOT) {
+      nsPresContext* pc = f->PresContext();
+      if (pc->IsRootContentDocument() && pc->PresShell()->GetRootScrollFrame() == f) {
+        return scrollableFrame;
+      }
+    }
   }
   return nullptr;
 }
@@ -2772,20 +2739,22 @@
   return NS_OK;
 }
 
-// aScrollFrame and aScrollFrameAsScrollable must be non-nullptr
+// aScrollFrameAsScrollable must be non-nullptr and queryable to an nsIFrame
 static FrameMetrics
-CalculateFrameMetricsForDisplayPort(nsIFrame* aScrollFrame,
-                                    nsIScrollableFrame* aScrollFrameAsScrollable) {
+CalculateFrameMetricsForDisplayPort(nsIScrollableFrame* aScrollFrame) {
+  nsIFrame* frame = do_QueryFrame(aScrollFrame);
+  MOZ_ASSERT(frame);
+
   // Calculate the metrics necessary for calculating the displayport.
   // This code has a lot in common with the code in ComputeFrameMetrics();
   // we may want to refactor this at some point.
   FrameMetrics metrics;
-  nsPresContext* presContext = aScrollFrame->PresContext();
+  nsPresContext* presContext = frame->PresContext();
   nsIPresShell* presShell = presContext->PresShell();
   CSSToLayoutDeviceScale deviceScale(float(nsPresContext::AppUnitsPerCSSPixel())
                                      / presContext->AppUnitsPerDevPixel());
   float resolution = 1.0f;
-  if (aScrollFrame == presShell->GetRootScrollFrame()) {
+  if (frame == presShell->GetRootScrollFrame()) {
     // Only the root scrollable frame for a given presShell should pick up
     // the presShell's resolution. All the other frames are 1.0.
     resolution = presShell->GetXResolution();
@@ -2798,7 +2767,7 @@
   // and leaving mExtraResolution at 1.
   LayoutDeviceToLayerScale cumulativeResolution(
       presShell->GetCumulativeResolution().width
-    * nsLayoutUtils::GetTransformToAncestorScale(aScrollFrame).width);
+    * nsLayoutUtils::GetTransformToAncestorScale(frame).width);
 
   LayerToParentLayerScale layerToParentLayerScale(1.0f);
   metrics.mDevPixelsPerCSSPixel = deviceScale;
@@ -2808,9 +2777,9 @@
 
   // Only the size of the composition bounds is relevant to the
   // displayport calculation, not its origin.
-  nsSize compositionSize = nsLayoutUtils::CalculateCompositionSizeForFrame(aScrollFrame);
+  nsSize compositionSize = nsLayoutUtils::CalculateCompositionSizeForFrame(frame);
   LayoutDeviceToParentLayerScale compBoundsScale(1.0f);
-  if (aScrollFrame == presShell->GetRootScrollFrame() && presContext->IsRootContentDocument()) {
+  if (frame == presShell->GetRootScrollFrame() && presContext->IsRootContentDocument()) {
     if (presContext->GetParentPresContext()) {
       gfxSize res = presContext->GetParentPresContext()->PresShell()->GetCumulativeResolution();
       compBoundsScale = LayoutDeviceToParentLayerScale(res.width, res.height);
@@ -2824,18 +2793,34 @@
       * compBoundsScale;
 
   metrics.SetRootCompositionSize(
-      nsLayoutUtils::CalculateRootCompositionSize(aScrollFrame, false, metrics));
+      nsLayoutUtils::CalculateRootCompositionSize(frame, false, metrics));
 
   metrics.SetScrollOffset(CSSPoint::FromAppUnits(
-      aScrollFrameAsScrollable->GetScrollPosition()));
+      aScrollFrame->GetScrollPosition()));
 
   metrics.mScrollableRect = CSSRect::FromAppUnits(
-      nsLayoutUtils::CalculateScrollableRectForFrame(aScrollFrameAsScrollable, nullptr));
+      nsLayoutUtils::CalculateScrollableRectForFrame(aScrollFrame, nullptr));
 
   return metrics;
 }
 
 bool
+nsLayoutUtils::CalculateAndSetDisplayPortMargins(nsIScrollableFrame* aScrollFrame,
+                                                 RepaintMode aRepaintMode) {
+  nsIFrame* frame = do_QueryFrame(aScrollFrame);
+  MOZ_ASSERT(frame);
+  nsIContent* content = frame->GetContent();
+  MOZ_ASSERT(content);
+
+  FrameMetrics metrics = CalculateFrameMetricsForDisplayPort(aScrollFrame);
+  ScreenMargin displayportMargins = APZCTreeManager::CalculatePendingDisplayPort(
+      metrics, ParentLayerPoint(0.0f, 0.0f), 0.0);
+  nsIPresShell* presShell = frame->PresContext()->GetPresShell();
+  return nsLayoutUtils::SetDisplayPortMargins(
+      content, presShell, displayportMargins, 0, aRepaintMode);
+}
+
+bool
 nsLayoutUtils::GetOrMaybeCreateDisplayPort(nsDisplayListBuilder& aBuilder,
                                            nsIFrame* aScrollFrame,
                                            nsRect aDisplayPortBase,
@@ -2865,16 +2850,7 @@
 
     // If we don't already have a displayport, calculate and set one.
     if (!haveDisplayPort) {
-      FrameMetrics metrics = CalculateFrameMetricsForDisplayPort(aScrollFrame, scrollableFrame);
-      ScreenMargin displayportMargins = APZCTreeManager::CalculatePendingDisplayPort(
-          metrics, ParentLayerPoint(0.0f, 0.0f), 0.0);
-      nsIPresShell* presShell = aScrollFrame->PresContext()->GetPresShell();
-      gfx::IntSize alignment = gfxPlatform::GetPlatform()->UseTiling()
-          ? gfx::IntSize(gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight()) :
-            gfx::IntSize(0, 0);
-      nsLayoutUtils::SetDisplayPortMargins(
-          content, presShell, displayportMargins, alignment.width,
-          alignment.height, 0, nsLayoutUtils::RepaintMode::DoNotRepaint);
+      CalculateAndSetDisplayPortMargins(scrollableFrame, nsLayoutUtils::RepaintMode::DoNotRepaint);
       haveDisplayPort = GetDisplayPort(content, aOutDisplayport);
       NS_ASSERTION(haveDisplayPort, "should have a displayport after having just set it");
     }
@@ -3466,6 +3442,218 @@
   return resultRect;
 }
 
+enum ObjectDimensionType { eWidth, eHeight };
+static nscoord
+ComputeMissingDimension(const nsSize& aDefaultObjectSize,
+                        const nsSize& aIntrinsicRatio,
+                        const Maybe<nscoord>& aSpecifiedWidth,
+                        const Maybe<nscoord>& aSpecifiedHeight,
+                        ObjectDimensionType aDimensionToCompute)
+{
+  // The "default sizing algorithm" computes the missing dimension as follows:
+  // (source: http://dev.w3.org/csswg/css-images-3/#default-sizing )
+
+  // 1. "If the object has an intrinsic aspect ratio, the missing dimension of
+  //     the concrete object size is calculated using the intrinsic aspect
+  //     ratio and the present dimension."
+  if (aIntrinsicRatio.width > 0 && aIntrinsicRatio.height > 0) {
+    // Fill in the missing dimension using the intrinsic aspect ratio.
+    nscoord knownDimensionSize;
+    float ratio;
+    if (aDimensionToCompute == eWidth) {
+      knownDimensionSize = *aSpecifiedHeight;
+      ratio = aIntrinsicRatio.width / aIntrinsicRatio.height;
+    } else {
+      knownDimensionSize = *aSpecifiedWidth;
+      ratio = aIntrinsicRatio.height / aIntrinsicRatio.width;
+    }
+    return NSCoordSaturatingNonnegativeMultiply(knownDimensionSize, ratio);
+  }
+
+  // 2. "Otherwise, if the missing dimension is present in the object’s
+  //     intrinsic dimensions, [...]"
+  // NOTE: *Skipping* this case, because we already know it's not true -- we're
+  // in this function because the missing dimension is *not* present in
+  // the object's intrinsic dimensions.
+
+  // 3. "Otherwise, the missing dimension of the concrete object size is taken
+  //     from the default object size. "
+  return (aDimensionToCompute == eWidth) ?
+    aDefaultObjectSize.width : aDefaultObjectSize.height;
+}
+
+/*
+ * This computes & returns the concrete object size of replaced content, if
+ * that content were to be rendered with "object-fit: none".  (Or, if the
+ * element has neither an intrinsic height nor width, this method returns an
+ * empty Maybe<> object.)
+ *
+ * As specced...
+ *   http://dev.w3.org/csswg/css-images-3/#valdef-object-fit-none
+ * ..we use "the default sizing algorithm with no specified size,
+ * and a default object size equal to the replaced element's used width and
+ * height."
+ *
+ * The default sizing algorithm is described here:
+ *   http://dev.w3.org/csswg/css-images-3/#default-sizing
+ * Quotes in the function-impl are taken from that ^ spec-text.
+ *
+ * Per its final bulleted section: since there's no specified size,
+ * we run the default sizing algorithm using the object's intrinsic size in
+ * place of the specified size. But if the object has neither an intrinsic
+ * height nor an intrinsic width, then we instead return without populating our
+ * outparam, and we let the caller figure out the size (using a contain
+ * constraint).
+ */
+static Maybe<nsSize>
+MaybeComputeObjectFitNoneSize(const nsSize& aDefaultObjectSize,
+                              const IntrinsicSize& aIntrinsicSize,
+                              const nsSize& aIntrinsicRatio)
+{
+  // "If the object has an intrinsic height or width, its size is resolved as
+  // if its intrinsic dimensions were given as the specified size."
+  //
+  // So, first we check if we have an intrinsic height and/or width:
+  Maybe<nscoord> specifiedWidth;
+  if (aIntrinsicSize.width.GetUnit() == eStyleUnit_Coord) {
+    specifiedWidth.emplace(aIntrinsicSize.width.GetCoordValue());
+  }
+
+  Maybe<nscoord> specifiedHeight;
+  if (aIntrinsicSize.height.GetUnit() == eStyleUnit_Coord) {
+    specifiedHeight.emplace(aIntrinsicSize.height.GetCoordValue());
+  }
+
+  Maybe<nsSize> noneSize; // (the value we'll return)
+  if (specifiedWidth || specifiedHeight) {
+    // We have at least one specified dimension; use whichever dimension is
+    // specified, and compute the other one using our intrinsic ratio, or (if
+    // no valid ratio) using the default object size.
+    noneSize.emplace();
+
+    noneSize->width = specifiedWidth ?
+      *specifiedWidth :
+      ComputeMissingDimension(aDefaultObjectSize, aIntrinsicRatio,
+                              specifiedWidth, specifiedHeight,
+                              eWidth);
+
+    noneSize->height = specifiedHeight ?
+      *specifiedHeight :
+      ComputeMissingDimension(aDefaultObjectSize, aIntrinsicRatio,
+                              specifiedWidth, specifiedHeight,
+                              eHeight);
+  }
+  // [else:] "Otherwise [if there's neither an intrinsic height nor width], its
+  // size is resolved as a contain constraint against the default object size."
+  // We'll let our caller do that, to share code & avoid redundant
+  // computations; so, we return w/out populating noneSize.
+  return noneSize;
+}
+
+// Computes the concrete object size to render into, as described at
+// http://dev.w3.org/csswg/css-images-3/#concrete-size-resolution
+static nsSize
+ComputeConcreteObjectSize(const nsSize& aConstraintSize,
+                          const IntrinsicSize& aIntrinsicSize,
+                          const nsSize& aIntrinsicRatio,
+                          uint8_t aObjectFit)
+{
+  // Handle default behavior (filling the container) w/ fast early return.
+  // (Also: if there's no valid intrinsic ratio, then we have the "fill"
+  // behavior & just use the constraint size.)
+  if (MOZ_LIKELY(aObjectFit == NS_STYLE_OBJECT_FIT_FILL) ||
+      aIntrinsicRatio.width == 0 ||
+      aIntrinsicRatio.height == 0) {
+    return aConstraintSize;
+  }
+
+  // The type of constraint to compute (cover/contain), if needed:
+  Maybe<nsImageRenderer::FitType> fitType;
+
+  Maybe<nsSize> noneSize;
+  if (aObjectFit == NS_STYLE_OBJECT_FIT_NONE ||
+      aObjectFit == NS_STYLE_OBJECT_FIT_SCALE_DOWN) {
+    noneSize = MaybeComputeObjectFitNoneSize(aConstraintSize, aIntrinsicSize,
+                                             aIntrinsicRatio);
+    if (!noneSize || aObjectFit == NS_STYLE_OBJECT_FIT_SCALE_DOWN) {
+      // Need to compute a 'CONTAIN' constraint (either for the 'none' size
+      // itself, or for comparison w/ the 'none' size to resolve 'scale-down'.)
+      fitType.emplace(nsImageRenderer::CONTAIN);
+    }
+  } else if (aObjectFit == NS_STYLE_OBJECT_FIT_COVER) {
+    fitType.emplace(nsImageRenderer::COVER);
+  } else if (aObjectFit == NS_STYLE_OBJECT_FIT_CONTAIN) {
+    fitType.emplace(nsImageRenderer::CONTAIN);
+  }
+
+  Maybe<nsSize> constrainedSize;
+  if (fitType) {
+    constrainedSize.emplace(
+      nsImageRenderer::ComputeConstrainedSize(aConstraintSize,
+                                              aIntrinsicRatio,
+                                              *fitType));
+  }
+
+  // Now, we should have all the sizing information that we need.
+  switch (aObjectFit) {
+    // skipping NS_STYLE_OBJECT_FIT_FILL; we handled it w/ early-return.
+    case NS_STYLE_OBJECT_FIT_CONTAIN:
+    case NS_STYLE_OBJECT_FIT_COVER:
+      MOZ_ASSERT(constrainedSize);
+      return *constrainedSize;
+
+    case NS_STYLE_OBJECT_FIT_NONE:
+      if (noneSize) {
+        return *noneSize;
+      }
+      MOZ_ASSERT(constrainedSize);
+      return *constrainedSize;
+
+    case NS_STYLE_OBJECT_FIT_SCALE_DOWN:
+      MOZ_ASSERT(constrainedSize);
+      if (noneSize) {
+        constrainedSize->width =
+          std::min(constrainedSize->width, noneSize->width);
+        constrainedSize->height =
+          std::min(constrainedSize->height, noneSize->height);
+      }
+      return *constrainedSize;
+
+    default:
+      MOZ_ASSERT_UNREACHABLE("Unexpected enum value for 'object-fit'");
+      return aConstraintSize; // fall back to (default) 'fill' behavior
+  }
+}
+
+/* static */ nsRect
+nsLayoutUtils::ComputeObjectDestRect(const nsRect& aConstraintRect,
+                                     const IntrinsicSize& aIntrinsicSize,
+                                     const nsSize& aIntrinsicRatio,
+                                     const nsStylePosition* aStylePos)
+{
+  // Step 1: Figure out our "concrete object size"
+  // (the size of the region we'll actually draw our image's pixels into).
+  nsSize concreteObjectSize =
+    ComputeConcreteObjectSize(aConstraintRect.Size(), aIntrinsicSize,
+                              aIntrinsicRatio, aStylePos->mObjectFit);
+
+  // Step 2: Figure out how to align that region in the element's content-box.
+  nsPoint imageTopLeftPt, imageAnchorPt;
+  nsImageRenderer::ComputeObjectAnchorPoint(aStylePos->mObjectPosition,
+                                            aConstraintRect.Size(),
+                                            concreteObjectSize,
+                                            &imageTopLeftPt, &imageAnchorPt);
+  // Right now, we're with respect to aConstraintRect's top-left point.  We add
+  // that point here, to convert to the same broader coordinate space that
+  // aConstraintRect is in.
+  imageTopLeftPt += aConstraintRect.TopLeft();
+  imageAnchorPt += aConstraintRect.TopLeft();
+
+  // XXXdholbert Per bug 1098417, we should be returning imageAnchorPt here,
+  // and our caller should make sure it's pixel-aligned.
+  return nsRect(imageTopLeftPt, concreteObjectSize);
+}
+
 nsresult
 nsLayoutUtils::GetFontMetricsForFrame(const nsIFrame* aFrame,
                                       nsFontMetrics** aFontMetrics,
@@ -6459,6 +6647,10 @@
   StickyEnabledPrefChangeCallback(STICKY_ENABLED_PREF_NAME, nullptr);
   Preferences::RegisterCallback(TextAlignTrueEnabledPrefChangeCallback,
                                 TEXT_ALIGN_TRUE_ENABLED_PREF_NAME);
+  Preferences::RegisterCallback(DisplayContentsEnabledPrefChangeCallback,
+                                DISPLAY_CONTENTS_ENABLED_PREF_NAME);
+  DisplayContentsEnabledPrefChangeCallback(DISPLAY_CONTENTS_ENABLED_PREF_NAME,
+                                           nullptr);
   TextAlignTrueEnabledPrefChangeCallback(TEXT_ALIGN_TRUE_ENABLED_PREF_NAME,
                                          nullptr);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsLayoutUtils.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsLayoutUtils.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsLayoutUtils.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsLayoutUtils.h	2014-11-26 21:46:05.000000000 +0000
@@ -96,16 +96,11 @@
 
 struct DisplayPortMarginsPropertyData {
   DisplayPortMarginsPropertyData(const ScreenMargin& aMargins,
-                                 uint32_t aAlignmentX, uint32_t aAlignmentY,
                                  uint32_t aPriority)
     : mMargins(aMargins)
-    , mAlignmentX(aAlignmentX)
-    , mAlignmentY(aAlignmentY)
     , mPriority(aPriority)
   {}
   ScreenMargin mMargins;
-  uint32_t mAlignmentX;
-  uint32_t mAlignmentY;
   uint32_t mPriority;
 };
 
@@ -122,6 +117,7 @@
   typedef mozilla::dom::DOMRectList DOMRectList;
   typedef mozilla::layers::Layer Layer;
   typedef mozilla::ContainerLayerParameters ContainerLayerParameters;
+  typedef mozilla::IntrinsicSize IntrinsicSize;
   typedef mozilla::gfx::SourceSurface SourceSurface;
   typedef mozilla::gfx::Color Color;
   typedef mozilla::gfx::DrawTarget DrawTarget;
@@ -185,12 +181,11 @@
    * @param aPriority a priority value to determine which margins take effect
    *                  when multiple callers specify margins
    * @param aRepaintMode whether to schedule a paint after setting the margins
+   * @return true if the new margins were applied.
    */
-  static void SetDisplayPortMargins(nsIContent* aContent,
+  static bool SetDisplayPortMargins(nsIContent* aContent,
                                     nsIPresShell* aPresShell,
                                     const ScreenMargin& aMargins,
-                                    uint32_t aAlignmentX,
-                                    uint32_t aAlignmentY,
                                     uint32_t aPriority = 0,
                                     RepaintMode aRepaintMode = RepaintMode::Repaint);
 
@@ -215,22 +210,47 @@
   static mozilla::layout::FrameChildListID GetChildListNameFor(nsIFrame* aChildFrame);
 
   /**
-   * GetBeforeFrame returns the outermost :before frame of the given frame, if
+   * GetBeforeFrameForContent returns the ::before frame for aContent, if
    * one exists.  This is typically O(1).  The frame passed in must be
    * the first-in-flow.
    *
-   * @param aFrame the frame whose :before is wanted
+   * @param aGenConParentFrame an ancestor of the ::before frame
+   * @param aContent the content whose ::before is wanted
+   * @return the ::before frame or nullptr if there isn't one
+   */
+  static nsIFrame* GetBeforeFrameForContent(nsIFrame* aGenConParentFrame,
+                                            nsIContent* aContent);
+
+  /**
+   * GetBeforeFrame returns the outermost ::before frame of the given frame, if
+   * one exists.  This is typically O(1).  The frame passed in must be
+   * the first-in-flow.
+   *
+   * @param aFrame the frame whose ::before is wanted
    * @return the :before frame or nullptr if there isn't one
    */
   static nsIFrame* GetBeforeFrame(nsIFrame* aFrame);
 
   /**
-   * GetAfterFrame returns the outermost :after frame of the given frame, if one
+   * GetAfterFrameForContent returns the ::after frame for aContent, if one
+   * exists.  This will walk the in-flow chain of aGenConParentFrame to the
+   * last-in-flow if needed.  This function is typically O(N) in the number
+   * of child frames, following in-flows, etc.
+   *
+   * @param aGenConParentFrame an ancestor of the ::after frame
+   * @param aContent the content whose ::after is wanted
+   * @return the ::after frame or nullptr if there isn't one
+   */
+  static nsIFrame* GetAfterFrameForContent(nsIFrame* aGenConParentFrame,
+                                           nsIContent* aContent);
+
+  /**
+   * GetAfterFrame returns the outermost ::after frame of the given frame, if one
    * exists.  This will walk the in-flow chain to the last-in-flow if
    * needed.  This function is typically O(N) in the number of child
    * frames, following in-flows, etc.
    *
-   * @param aFrame the frame whose :after is wanted
+   * @param aFrame the frame whose ::after is wanted
    * @return the :after frame or nullptr if there isn't one
    */
   static nsIFrame* GetAfterFrame(nsIFrame* aFrame);
@@ -494,6 +514,12 @@
   static void SetScrollbarThumbLayerization(nsIFrame* aThumbFrame, bool aLayerize);
 
   /**
+   * Returns whether aThumbFrame wants its own layer due to having called
+   * SetScrollbarThumbLayerization.
+   */
+  static bool IsScrollbarThumbLayerized(nsIFrame* aThumbFrame);
+
+  /**
    * Finds the nearest ancestor frame to aItem that is considered to have (or
    * will have) "animated geometry". For example the scrolled frames of
    * scrollframes which are actively being scrolled fall into this category.
@@ -542,8 +568,27 @@
                                                                    Direction aDirection);
 
   enum {
+    /**
+     * If the SCROLLABLE_SAME_DOC flag is set, then we only walk the frame tree
+     * up to the root frame in the current document.
+     */
     SCROLLABLE_SAME_DOC = 0x01,
-    SCROLLABLE_INCLUDE_HIDDEN = 0x02
+    /**
+     * If the SCROLLABLE_INCLUDE_HIDDEN flag is set then we allow
+     * overflow:hidden scrollframes to be returned as scrollable frames.
+     */
+    SCROLLABLE_INCLUDE_HIDDEN = 0x02,
+    /**
+     * If the SCROLLABLE_ONLY_ASYNC_SCROLLABLE flag is set, then we only
+     * want to match scrollable frames for which WantAsyncScroll() returns
+     * true.
+     */
+    SCROLLABLE_ONLY_ASYNC_SCROLLABLE = 0x04,
+    /**
+     * If the SCROLLABLE_ALWAYS_MATCH_ROOT flag is set, then return the
+     * root scrollable frame for the root content document if we hit it.
+     */
+    SCROLLABLE_ALWAYS_MATCH_ROOT = 0x08,
   };
   /**
    * GetNearestScrollableFrame locates the first ancestor of aFrame
@@ -1087,6 +1132,32 @@
                                         uint32_t aFlags = 0);
 
   /**
+   * Computes the destination rect that a given replaced element should render
+   * into, based on its CSS 'object-fit' and 'object-position' properties.
+   *
+   * @param aConstraintRect The constraint rect that we have at our disposal,
+   *                        which would e.g. be exactly filled by the image
+   *                        if we had "object-fit: fill".
+   * @param aIntrinsicSize The replaced content's intrinsic size, as reported
+   *                       by nsIFrame::GetIntrinsicSize().
+   * @param aIntrinsicRatio The replaced content's intrinsic ratio, as reported
+   *                        by nsIFrame::GetIntrinsicRatio().
+   * @param aStylePos The nsStylePosition struct that contains the 'object-fit'
+   *                  and 'object-position' values that we should rely on.
+   *                  (This should usually be the nsStylePosition for the
+   *                  replaced element in question, but not always. For
+   *                  example, a <video>'s poster-image has a dedicated
+   *                  anonymous element & child-frame, but we should still use
+   *                  the <video>'s 'object-fit' and 'object-position' values.)
+   * @return The nsRect into which we should render the replaced content (using
+   *         the same coordinate space as the passed-in aConstraintRect).
+   */
+  static nsRect ComputeObjectDestRect(const nsRect& aConstraintRect,
+                                      const IntrinsicSize& aIntrinsicSize,
+                                      const nsSize& aIntrinsicRatio,
+                                      const nsStylePosition* aStylePos);
+
+  /**
    * Get the font metrics corresponding to the frame's style data.
    * @param aFrame the frame
    * @param aFontMetrics the font metrics result
@@ -2359,7 +2430,18 @@
     }
   }
 
- /**
+  /**
+   * Calculate a default set of displayport margins for the given scrollframe
+   * and set them on the scrollframe's content element. The margins are set with
+   * the default priority, which may clobber previously set margins. The repaint
+   * mode provided is passed through to the call to SetDisplayPortMargins.
+   * The |aScrollFrame| parameter must be non-null and queryable to an nsIFrame.
+   * @return true iff the call to SetDisplayPortMargins returned true.
+   */
+  static bool CalculateAndSetDisplayPortMargins(nsIScrollableFrame* aScrollFrame,
+                                                RepaintMode aRepaintMode);
+
+  /**
    * Get the display port for |aScrollFrame|'s content. If |aScrollFrame|
    * WantsAsyncScroll() and we don't have a scrollable displayport yet (as
    * tracked by |aBuilder|), calculate and set a display port. Returns true if
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresContext.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresContext.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -248,8 +248,6 @@
   if (log && log->level >= PR_LOG_WARNING) {
     mTextPerf = new gfxTextPerfMetrics();
   }
-
-  PR_INIT_CLIST(&mDOMMediaQueryLists);
 }
 
 void
@@ -325,9 +323,6 @@
   NS_PRECONDITION(!mShell, "Presshell forgot to clear our mShell pointer");
   SetShell(nullptr);
 
-  NS_ABORT_IF_FALSE(PR_CLIST_IS_EMPTY(&mDOMMediaQueryLists),
-                    "must not have media query lists left");
-
   Destroy();
 }
 
@@ -355,18 +350,6 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mEventManager);
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(mLanguage); // an atom
 
-  // We own only the items in mDOMMediaQueryLists that have listeners;
-  // this reference is managed by their AddListener and RemoveListener
-  // methods.
-  for (PRCList *l = PR_LIST_HEAD(&tmp->mDOMMediaQueryLists);
-       l != &tmp->mDOMMediaQueryLists; l = PR_NEXT_LINK(l)) {
-    MediaQueryList *mql = static_cast<MediaQueryList*>(l);
-    if (mql->HasListeners()) {
-      NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mDOMMediaQueryLists item");
-      cb.NoteXPCOMChild(mql);
-    }
-  }
-
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTheme); // a service
   // NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLangService); // a service
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrintSettings);
@@ -376,17 +359,6 @@
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsPresContext)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument);
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mDeviceContext); // worth bothering?
-  // We own only the items in mDOMMediaQueryLists that have listeners;
-  // this reference is managed by their AddListener and RemoveListener
-  // methods.
-  for (PRCList *l = PR_LIST_HEAD(&tmp->mDOMMediaQueryLists);
-       l != &tmp->mDOMMediaQueryLists; ) {
-    PRCList *next = PR_NEXT_LINK(l);
-    MediaQueryList *mql = static_cast<MediaQueryList*>(l);
-    mql->RemoveAllListeners();
-    l = next;
-  }
-
   // NS_RELEASE(tmp->mLanguage); // an atom
   // NS_IMPL_CYCLE_COLLECTION_UNLINK(mTheme); // a service
   // NS_IMPL_CYCLE_COLLECTION_UNLINK(mLangService); // a service
@@ -957,7 +929,7 @@
 
   mDeviceContext = aDeviceContext;
 
-  if (mDeviceContext->SetPixelScale(mFullZoom))
+  if (mDeviceContext->SetFullZoom(mFullZoom))
     mDeviceContext->FlushFontCache();
   mCurAppUnitsPerDevPixel = AppUnitsPerDevPixel();
 
@@ -1475,7 +1447,7 @@
   mShell->GetViewManager()->GetWindowDimensions(&oldWidthAppUnits, &oldHeightAppUnits);
   float oldWidthDevPixels = oldWidthAppUnits / float(mCurAppUnitsPerDevPixel);
   float oldHeightDevPixels = oldHeightAppUnits / float(mCurAppUnitsPerDevPixel);
-  mDeviceContext->SetPixelScale(aZoom);
+  mDeviceContext->SetFullZoom(aZoom);
 
   NS_ASSERTION(!mSupressResizeReflow, "two zooms happening at the same time? impossible!");
   mSupressResizeReflow = true;
@@ -1558,7 +1530,7 @@
 }
 
 bool
-nsPresContext::StyleUpdateForAllAnimationsIsUpToDate()
+nsPresContext::StyleUpdateForAllAnimationsIsUpToDate() const
 {
   return mLastStyleUpdateForAllAnimations == mRefreshDriver->MostRecentRefresh();
 }
@@ -1569,6 +1541,12 @@
   mLastStyleUpdateForAllAnimations = mRefreshDriver->MostRecentRefresh();
 }
 
+void
+nsPresContext::ClearLastStyleUpdateForAllAnimations()
+{
+  mLastStyleUpdateForAllAnimations = TimeStamp();
+}
+
 bool
 nsPresContext::BidiEnabledExternal() const
 {
@@ -1904,7 +1882,7 @@
   mPendingViewportChange = false;
 
   if (mDocument->IsBeingUsedAsImage()) {
-    MOZ_ASSERT(PR_CLIST_IS_EMPTY(&mDOMMediaQueryLists));
+    MOZ_ASSERT(PR_CLIST_IS_EMPTY(mDocument->MediaQueryLists()));
     return;
   }
 
@@ -1917,7 +1895,7 @@
   // Note that we do this after the new style from media queries in
   // style sheets has been computed.
 
-  if (!PR_CLIST_IS_EMPTY(&mDOMMediaQueryLists)) {
+  if (!PR_CLIST_IS_EMPTY(mDocument->MediaQueryLists())) {
     // We build a list of all the notifications we're going to send
     // before we send any of them.  (The spec says the notifications
     // should be a queued task, so any removals that happen during the
@@ -1931,8 +1909,8 @@
     // list in the order they were created and, for each list, to the
     // listeners in the order added.
     MediaQueryList::NotifyList notifyList;
-    for (PRCList *l = PR_LIST_HEAD(&mDOMMediaQueryLists);
-         l != &mDOMMediaQueryLists; l = PR_NEXT_LINK(l)) {
+    for (PRCList *l = PR_LIST_HEAD(mDocument->MediaQueryLists());
+         l != mDocument->MediaQueryLists(); l = PR_NEXT_LINK(l)) {
       MediaQueryList *mql = static_cast<MediaQueryList*>(l);
       mql->MediumFeaturesChanged(notifyList);
     }
@@ -1976,17 +1954,6 @@
   }
 }
 
-already_AddRefed<MediaQueryList>
-nsPresContext::MatchMedia(const nsAString& aMediaQueryList)
-{
-  nsRefPtr<MediaQueryList> result = new MediaQueryList(this, aMediaQueryList);
-
-  // Insert the new item at the end of the linked list.
-  PR_INSERT_BEFORE(result, &mDOMMediaQueryLists);
-
-  return result.forget();
-}
-
 nsCompatibility
 nsPresContext::CompatibilityMode() const
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresContext.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresContext.h	2014-11-26 21:46:05.000000000 +0000
@@ -72,7 +72,6 @@
 class CounterStyleManager;
 namespace dom {
 class FontFaceSet;
-class MediaQueryList;
 }
 namespace layers {
 class ContainerLayer;
@@ -290,12 +289,6 @@
   }
 
   /**
-   * Support for window.matchMedia()
-   */
-  already_AddRefed<mozilla::dom::MediaQueryList>
-    MatchMedia(const nsAString& aMediaQueryList);
-
-  /**
    * Access compatibility mode for this context.  This is the same as
    * our document's compatibility mode.
    */
@@ -705,10 +698,11 @@
   }
 
   /**
-   * Getter and setter for OMTA time counters
+   * Getter and setters for OMTA time counters
    */
-  bool StyleUpdateForAllAnimationsIsUpToDate();
+  bool StyleUpdateForAllAnimationsIsUpToDate() const;
   void TickLastStyleUpdateForAllAnimations();
+  void ClearLastStyleUpdateForAllAnimations();
 
   /**
    *  Check if bidi enabled (set depending on the presence of RTL
@@ -1238,8 +1232,6 @@
 
   mozilla::WeakPtr<nsDocShell>             mContainer;
 
-  PRCList               mDOMMediaQueryLists;
-
   // Base minimum font size, independent of the language-specific global preference. Defaults to 0
   int32_t               mBaseMinFontSize;
   float                 mTextZoom;      // Text zoom, defaults to 1.0
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresShell.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresShell.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresShell.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresShell.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -1402,7 +1402,7 @@
 PresShell::CreatePreferenceStyleSheet()
 {
   NS_ASSERTION(!mPrefStyleSheet, "prefStyleSheet already exists");
-  mPrefStyleSheet = new CSSStyleSheet(CORS_NONE);
+  mPrefStyleSheet = new CSSStyleSheet(CORS_NONE, mozilla::net::RP_Default);
   nsCOMPtr<nsIURI> uri;
   nsresult rv = NS_NewURI(getter_AddRefs(uri), "about:PreferenceStyleSheet", nullptr);
   if (NS_FAILED(rv)) {
@@ -2304,6 +2304,12 @@
 //implementation of nsISelectionController
 
 NS_IMETHODIMP
+PresShell::PhysicalMove(int16_t aDirection, int16_t aAmount, bool aExtend)
+{
+  return mSelection->PhysicalMove(aDirection, aAmount, aExtend);
+}
+
+NS_IMETHODIMP
 PresShell::CharacterMove(bool aForward, bool aExtend)
 {
   return mSelection->CharacterMove(aForward, aExtend);
@@ -6411,7 +6417,8 @@
   if (pointerCaptureInfo) {
     pointerCaptureInfo->mPendingContent = aContent;
   } else {
-    gPointerCaptureList->Put(aPointerId, new PointerCaptureInfo(aContent));
+    gPointerCaptureList->Put(aPointerId,
+                             new PointerCaptureInfo(aContent, GetPointerPrimaryState(aPointerId)));
   }
 }
 
@@ -6442,16 +6449,6 @@
   return nullptr;
 }
 
-/* static */ uint16_t
-nsIPresShell::GetPointerType(uint32_t aPointerId)
-{
-  PointerInfo* pointerInfo = nullptr;
-  if (gActivePointersIds->Get(aPointerId, &pointerInfo) && pointerInfo) {
-    return pointerInfo->mPointerType;
-  }
-  return nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
-}
-
 /* static */ bool
 nsIPresShell::CheckPointerCaptureState(uint32_t aPointerId)
 {
@@ -6463,6 +6460,7 @@
     if (pointerCaptureInfo->mPendingContent || pointerCaptureInfo->mReleaseContent) {
       if (pointerCaptureInfo->mOverrideContent) {
         uint16_t pointerType = GetPointerType(aPointerId);
+        bool isPrimary = pointerCaptureInfo->mPrimaryState;
         nsCOMPtr<nsIContent> content;
         pointerCaptureInfo->mOverrideContent.swap(content);
         if (pointerCaptureInfo->mReleaseContent) {
@@ -6471,7 +6469,7 @@
         if (pointerCaptureInfo->Empty()) {
           gPointerCaptureList->Remove(aPointerId);
         }
-        DispatchGotOrLostPointerCaptureEvent(false, aPointerId, pointerType, content);
+        DispatchGotOrLostPointerCaptureEvent(false, aPointerId, pointerType, isPrimary, content);
         didDispatchEvent = true;
       } else if (pointerCaptureInfo->mPendingContent && pointerCaptureInfo->mReleaseContent) {
         // If anybody calls element.releasePointerCapture
@@ -6489,6 +6487,7 @@
       pointerCaptureInfo->mReleaseContent = false;
       DispatchGotOrLostPointerCaptureEvent(true, aPointerId,
                                            GetPointerType(aPointerId),
+                                           pointerCaptureInfo->mPrimaryState,
                                            pointerCaptureInfo->mOverrideContent);
       didDispatchEvent = true;
     }
@@ -6496,6 +6495,26 @@
   return didDispatchEvent;
 }
 
+/* static */ uint16_t
+nsIPresShell::GetPointerType(uint32_t aPointerId)
+{
+  PointerInfo* pointerInfo = nullptr;
+  if (gActivePointersIds->Get(aPointerId, &pointerInfo) && pointerInfo) {
+    return pointerInfo->mPointerType;
+  }
+  return nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
+}
+
+/* static */ bool
+nsIPresShell::GetPointerPrimaryState(uint32_t aPointerId)
+{
+  PointerInfo* pointerInfo = nullptr;
+  if (gActivePointersIds->Get(aPointerId, &pointerInfo) && pointerInfo) {
+    return pointerInfo->mPrimaryState;
+  }
+  return false;
+}
+
 /* static */ bool
 nsIPresShell::GetPointerInfo(uint32_t aPointerId, bool& aActiveState)
 {
@@ -6514,20 +6533,23 @@
   case NS_MOUSE_ENTER:
     // In this case we have to know information about available mouse pointers
     if (WidgetMouseEvent* mouseEvent = aEvent->AsMouseEvent()) {
-      gActivePointersIds->Put(mouseEvent->pointerId, new PointerInfo(false, mouseEvent->inputSource));
+      gActivePointersIds->Put(mouseEvent->pointerId,
+                              new PointerInfo(false, mouseEvent->inputSource, true));
     }
     break;
   case NS_POINTER_DOWN:
     // In this case we switch pointer to active state
     if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) {
-      gActivePointersIds->Put(pointerEvent->pointerId, new PointerInfo(true, pointerEvent->inputSource));
+      gActivePointersIds->Put(pointerEvent->pointerId,
+                              new PointerInfo(true, pointerEvent->inputSource, pointerEvent->isPrimary));
     }
     break;
   case NS_POINTER_UP:
     // In this case we remove information about pointer or turn off active state
     if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) {
       if(pointerEvent->inputSource != nsIDOMMouseEvent::MOZ_SOURCE_TOUCH) {
-        gActivePointersIds->Put(pointerEvent->pointerId, new PointerInfo(false, pointerEvent->inputSource));
+        gActivePointersIds->Put(pointerEvent->pointerId,
+                                new PointerInfo(false, pointerEvent->inputSource, pointerEvent->isPrimary));
       } else {
         gActivePointersIds->Remove(pointerEvent->pointerId);
       }
@@ -7177,6 +7199,7 @@
 
   // Dispatch after events to partial items.
   if (defaultPrevented) {
+    *aStatus = nsEventStatus_eConsumeNoDefault;
     DispatchAfterKeyboardEventInternal(chain, aEvent,
                                        aEvent.mFlags.mDefaultPrevented, chainIndex);
 
@@ -7213,13 +7236,13 @@
 #ifdef MOZ_TASK_TRACER
   // Make touch events, mouse events and hardware key events to be the source
   // events of TaskTracer, and originate the rest correlation tasks from here.
-  SourceEventType type = SourceEventType::UNKNOWN;
+  SourceEventType type = SourceEventType::Unknown;
   if (WidgetTouchEvent* inputEvent = aEvent->AsTouchEvent()) {
-    type = SourceEventType::TOUCH;
+    type = SourceEventType::Touch;
   } else if (WidgetMouseEvent* inputEvent = aEvent->AsMouseEvent()) {
-    type = SourceEventType::MOUSE;
+    type = SourceEventType::Mouse;
   } else if (WidgetKeyboardEvent* inputEvent = aEvent->AsKeyboardEvent()) {
-    type = SourceEventType::KEY;
+    type = SourceEventType::Key;
   }
   AutoSourceEvent taskTracerEvent(type);
 #endif
@@ -8245,12 +8268,14 @@
 nsIPresShell::DispatchGotOrLostPointerCaptureEvent(bool aIsGotCapture,
                                                    uint32_t aPointerId,
                                                    uint16_t aPointerType,
+                                                   bool aIsPrimary,
                                                    nsIContent* aCaptureTarget)
 {
   PointerEventInit init;
   init.mPointerId = aPointerId;
   init.mBubbles = true;
   ConvertPointerTypeToString(aPointerType, init.mPointerType);
+  init.mIsPrimary = aIsPrimary;
   nsRefPtr<mozilla::dom::PointerEvent> event;
   event = PointerEvent::Constructor(aCaptureTarget,
                                     aIsGotCapture
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresShell.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresShell.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsPresShell.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsPresShell.h	2014-11-26 21:46:05.000000000 +0000
@@ -249,6 +249,7 @@
 
   // nsISelectionController
 
+  NS_IMETHOD PhysicalMove(int16_t aDirection, int16_t aAmount, bool aExtend) MOZ_OVERRIDE;
   NS_IMETHOD CharacterMove(bool aForward, bool aExtend) MOZ_OVERRIDE;
   NS_IMETHOD CharacterExtendForDelete() MOZ_OVERRIDE;
   NS_IMETHOD CharacterExtendForBackspace() MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsRefreshDriver.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsRefreshDriver.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsRefreshDriver.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsRefreshDriver.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -51,6 +51,8 @@
 #include "nsDocShell.h"
 #include "nsISimpleEnumerator.h"
 
+#include "mozilla/Telemetry.h"
+
 using namespace mozilla;
 using namespace mozilla::widget;
 
@@ -296,6 +298,7 @@
         this,
         (aNowTime - mTargetTime).ToMilliseconds(),
         delay);
+    Telemetry::Accumulate(Telemetry::FX_REFRESH_DRIVER_FRAME_DELAY_MS, (aNowTime - mTargetTime).ToMilliseconds());
 
     // then schedule the timer
     LOG("[%p] scheduling callback for %d ms (2)", this, delay);
@@ -410,6 +413,7 @@
         this,
         (aNowTime - mTargetTime).ToMilliseconds(),
         delay);
+    Telemetry::Accumulate(Telemetry::FX_REFRESH_DRIVER_FRAME_DELAY_MS, (aNowTime - mTargetTime).ToMilliseconds());
 
     // then schedule the timer
     LOG("[%p] scheduling callback for %d ms (2)", this, delay);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsStyleChangeList.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsStyleChangeList.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/nsStyleChangeList.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/nsStyleChangeList.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -10,6 +10,8 @@
 
 #include "nsStyleChangeList.h"
 #include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsFrameManager.h"
 
 static const uint32_t kGrowArrayBy = 10;
 
@@ -58,8 +60,13 @@
   NS_ASSERTION(aContent || !(aHint & nsChangeHint_ReconstructFrame),
                "must have content");
   // XXXbz we should make this take Element instead of nsIContent
-  NS_ASSERTION(!aContent || aContent->IsElement(),
-               "Shouldn't be trying to restyle non-elements directly");
+  NS_ASSERTION(!aContent || aContent->IsElement() ||
+               // display:contents elements posts the changes for their children:
+               (aFrame && aContent->GetParent() &&
+                aFrame->PresContext()->FrameManager()->
+                  GetDisplayContentsStyleFor(aContent->GetParent())),
+               "Shouldn't be trying to restyle non-elements directly, "
+               "except if it's a display:contents child");
   NS_ASSERTION(!(aHint & nsChangeHint_AllReflowHints) ||
                (aHint & nsChangeHint_NeedReflow),
                "Reflow hint bits set without actually asking for a reflow");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/RestyleManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/RestyleManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/RestyleManager.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/RestyleManager.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -8,9 +8,12 @@
  * changes need to happen, scheduling them, and doing them.
  */
 
+#include <algorithm> // For std::max
 #include "RestyleManager.h"
 #include "mozilla/EventStates.h"
 #include "nsLayoutUtils.h"
+#include "AnimationCommon.h" // For GetLayerAnimationInfo
+#include "FrameLayerBuilder.h"
 #include "GeckoProfiler.h"
 #include "nsStyleChangeList.h"
 #include "nsRuleProcessorData.h"
@@ -101,6 +104,33 @@
 static bool gInApplyRenderingChangeToTree = false;
 #endif
 
+static inline nsIFrame*
+GetNextBlockInInlineSibling(FramePropertyTable* aPropTable, nsIFrame* aFrame)
+{
+  NS_ASSERTION(!aFrame->GetPrevContinuation(),
+               "must start with the first continuation");
+  // Might we have ib-split siblings?
+  if (!(aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT)) {
+    // nothing more to do here
+    return nullptr;
+  }
+
+  return static_cast<nsIFrame*>
+    (aPropTable->Get(aFrame, nsIFrame::IBSplitSibling()));
+}
+
+static nsIFrame*
+GetNearestAncestorFrame(nsIContent* aContent)
+{
+  nsIFrame* ancestorFrame = nullptr;
+  for (nsIContent* ancestor = aContent->GetParent();
+       ancestor && !ancestorFrame;
+       ancestor = ancestor->GetParent()) {
+    ancestorFrame = ancestor->GetPrimaryFrame();
+  }
+  return ancestorFrame;
+}
+
 static void
 DoApplyRenderingChangeToTree(nsIFrame* aFrame,
                              nsChangeHint aChange);
@@ -875,8 +905,7 @@
 #ifdef DEBUG
     // reget frame from content since it may have been regenerated...
     if (changeData->mContent) {
-      if (!nsAnimationManager::ContentOrAncestorHasAnimation(changeData->mContent) &&
-          !nsTransitionManager::ContentOrAncestorHasTransition(changeData->mContent)) {
+      if (!css::CommonAnimationManager::ContentOrAncestorHasAnimation(changeData->mContent)) {
         nsIFrame* frame = changeData->mContent->GetPrimaryFrame();
         if (frame) {
           DebugVerifyStyleTree(frame);
@@ -946,7 +975,14 @@
     // we have *some* restyling for this frame.  This means we'll
     // potentially get ahead of ourselves in that case, but not as much
     // as we would if we didn't check the restyle hint.
-    FrameConstructor()->MaybeRecreateFramesForElement(aElement);
+    nsStyleContext* newContext =
+      FrameConstructor()->MaybeRecreateFramesForElement(aElement);
+    if (newContext &&
+        newContext->StyleDisplay()->mDisplay == NS_STYLE_DISPLAY_CONTENTS) {
+      // Style change for a display:contents node that did not recreate frames.
+      ComputeAndProcessStyleChange(newContext, aElement, aMinHint,
+                                   aRestyleTracker, aRestyleHint);
+    }
   }
 }
 
@@ -1149,6 +1185,27 @@
   PostRestyleEvent(aElement, rshint, hint);
 }
 
+/* static */ uint64_t
+RestyleManager::GetMaxAnimationGenerationForFrame(nsIFrame* aFrame)
+{
+  nsIContent* content = aFrame->GetContent();
+  if (!content || !content->IsElement()) {
+    return 0;
+  }
+
+  nsCSSPseudoElements::Type pseudoType =
+    aFrame->StyleContext()->GetPseudoType();
+  AnimationPlayerCollection* transitions =
+    aFrame->PresContext()->TransitionManager()->GetAnimationPlayers(
+      content->AsElement(), pseudoType, false /* don't create */);
+  AnimationPlayerCollection* animations =
+    aFrame->PresContext()->AnimationManager()->GetAnimationPlayers(
+      content->AsElement(), pseudoType, false /* don't create */);
+
+  return std::max(transitions ? transitions->mAnimationGeneration : 0,
+                  animations ? animations->mAnimationGeneration : 0);
+}
+
 void
 RestyleManager::RestyleForEmptyChange(Element* aContainer)
 {
@@ -1560,7 +1617,7 @@
   // correct old style for starting the transition.
   if (nsLayoutUtils::AreAsyncAnimationsEnabled() &&
       mPendingRestyles.Count() > 0) {
-    ++mAnimationGeneration;
+    IncrementAnimationGeneration();
     UpdateOnlyAnimationStyles();
   }
 
@@ -1779,14 +1836,8 @@
   }
 
   if (!aParentContext) {
-    // Get the correct parent context from the frame
-    //  - if the frame is a placeholder, we get the out of flow frame's context
-    //    as the parent context instead of asking the frame
-
-    // get the parent context from the frame (indirectly)
-    nsIFrame* providerFrame = aFrame->GetParentStyleContextFrame();
-    if (providerFrame)
-      aParentContext = providerFrame->StyleContext();
+    nsIFrame* providerFrame;
+    aParentContext = aFrame->GetParentStyleContext(&providerFrame);
     // aParentContext could still be null
   }
 
@@ -2118,20 +2169,19 @@
   nsStyleContext* oldContext = aFrame->StyleContext();
 
   nsRefPtr<nsStyleContext> newContext;
-  nsIFrame* providerFrame = aFrame->GetParentStyleContextFrame();
+  nsIFrame* providerFrame;
+  nsStyleContext* newParentContext = aFrame->GetParentStyleContext(&providerFrame);
   bool isChild = providerFrame && providerFrame->GetParent() == aFrame;
-  nsStyleContext* newParentContext = nullptr;
   nsIFrame* providerChild = nullptr;
   if (isChild) {
     ReparentStyleContext(providerFrame);
+    // Get the style context again after ReparentStyleContext() which might have
+    // changed it.
     newParentContext = providerFrame->StyleContext();
     providerChild = providerFrame;
-  } else if (providerFrame) {
-    newParentContext = providerFrame->StyleContext();
-  } else {
-    NS_NOTREACHED("Reparenting something that has no usable parent? "
-                  "Shouldn't happen!");
   }
+  NS_ASSERTION(newParentContext, "Reparenting something that has no usable"
+               " parent? Shouldn't happen!");
   // XXX need to do something here to produce the correct style context for
   // an IB split whose first inline part is inside a first-line frame.
   // Currently the first IB anonymous block's style context takes the first
@@ -2408,6 +2458,69 @@
 {
 }
 
+ElementRestyler::ElementRestyler(nsPresContext* aPresContext,
+                                 nsIContent* aContent,
+                                 nsStyleChangeList* aChangeList,
+                                 nsChangeHint aHintsHandledByAncestors,
+                                 RestyleTracker& aRestyleTracker,
+                                 TreeMatchContext& aTreeMatchContext,
+                                 nsTArray<nsIContent*>&
+                                 aVisibleKidsOfHiddenElement)
+  : mPresContext(aPresContext)
+  , mFrame(nullptr)
+  , mParentContent(nullptr)
+  , mContent(aContent)
+  , mChangeList(aChangeList)
+  , mHintsHandled(NS_SubtractHint(aHintsHandledByAncestors,
+                  NS_HintsNotHandledForDescendantsIn(aHintsHandledByAncestors)))
+  , mParentFrameHintsNotHandledForDescendants(nsChangeHint(0))
+  , mHintsNotHandledForDescendants(nsChangeHint(0))
+  , mRestyleTracker(aRestyleTracker)
+  , mTreeMatchContext(aTreeMatchContext)
+  , mResolvedChild(nullptr)
+#ifdef ACCESSIBILITY
+  , mDesiredA11yNotifications(eSendAllNotifications)
+  , mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
+  , mOurA11yNotification(eDontNotify)
+  , mVisibleKidsOfHiddenElement(aVisibleKidsOfHiddenElement)
+#endif
+{
+}
+
+void
+ElementRestyler::AddLayerChangesForAnimation()
+{
+  // Bug 847286 - We should have separate animation generation counters
+  // on layers for transitions and animations and use != comparison below
+  // rather than a > comparison.
+  uint64_t frameGeneration =
+    RestyleManager::GetMaxAnimationGenerationForFrame(mFrame);
+
+  nsChangeHint hint = nsChangeHint(0);
+  const auto& layerInfo = css::CommonAnimationManager::sLayerAnimationInfo;
+  for (size_t i = 0; i < ArrayLength(layerInfo); i++) {
+    Layer* layer =
+      FrameLayerBuilder::GetDedicatedLayer(mFrame, layerInfo[i].mLayerType);
+    if (layer && frameGeneration > layer->GetAnimationGeneration()) {
+      // If we have a transform layer but don't have any transform style, we
+      // probably just removed the transform but haven't destroyed the layer
+      // yet. In this case we will add the appropriate change hint
+      // (nsChangeHint_AddOrRemoveTransform) when we compare style contexts
+      // so we can skip adding any change hint here. (If we *were* to add
+      // nsChangeHint_UpdateTransformLayer, ApplyRenderingChangeToTree would
+      // complain that we're updating a transform layer without a transform).
+      if (layerInfo[i].mLayerType == nsDisplayItem::TYPE_TRANSFORM &&
+          !mFrame->StyleDisplay()->HasTransformStyle()) {
+        continue;
+      }
+      NS_UpdateHint(hint, layerInfo[i].mChangeHint);
+    }
+  }
+  if (hint) {
+    mChangeList->AppendChange(mFrame, mContent, hint);
+  }
+}
+
 void
 ElementRestyler::CaptureChange(nsStyleContext* aOldContext,
                                nsStyleContext* aNewContext,
@@ -2493,6 +2606,9 @@
   MOZ_ASSERT(!(aRestyleHint & eRestyle_LaterSiblings),
              "eRestyle_LaterSiblings must not be part of aRestyleHint");
 
+  AutoDisplayContentsAncestorPusher adcp(mTreeMatchContext, mFrame->PresContext(),
+      mFrame->GetContent() ? mFrame->GetContent()->GetParent() : nullptr);
+
   // List of descendant elements of mContent we know we will eventually need to
   // restyle.  Before we return from this function, we call
   // RestyleTracker::AddRestyleRootsIfAwaitingRestyle to ensure they get
@@ -2522,6 +2638,12 @@
     }
   }
 
+  // Some changes to animations don't affect the computed style and yet still
+  // require the layer to be updated. For example, pausing an animation via
+  // the Web Animations API won't affect an element's style but still
+  // requires us to pull the animation off the layer.
+  AddLayerChangesForAnimation();
+
   // If we are restyling this frame with eRestyle_Self or weaker hints,
   // we restyle children with nsRestyleHint(0).  But we pass the
   // eRestyle_ChangeAnimationPhaseDescendants and eRestyle_ForceDescendants
@@ -2586,9 +2708,8 @@
     MOZ_ASSERT(mFrame->StyleContext() == oldContext,
                "frame should have been left with its old style context");
 
-    nsStyleContext* newParent =
-      mFrame->GetParentStyleContextFrame()->StyleContext();
-
+    nsIFrame* unused;
+    nsStyleContext* newParent = mFrame->GetParentStyleContext(&unused);
     if (oldContext->GetParent() != newParent) {
       // If we received eRestyleResult_Stop, then the old style context was
       // left on mFrame.  Since we ended up restyling our parent, change
@@ -2601,7 +2722,7 @@
     // Send the accessibility notifications that RestyleChildren otherwise
     // would have sent.
     if (!(mHintsHandled & nsChangeHint_ReconstructFrame)) {
-      InitializeAccessibilityNotifications();
+      InitializeAccessibilityNotifications(mFrame->StyleContext());
       SendAccessibilityNotifications();
     }
 
@@ -2621,7 +2742,14 @@
       nsRestyleHint(childRestyleHint | eRestyle_ForceDescendants);
   }
 
-  RestyleChildren(childRestyleHint);
+  // No need to do this if we're planning to reframe already.
+  // It's also important to check mHintsHandled since we use
+  // mFrame->StyleContext(), which is out of date if mHintsHandled
+  // has a ReconstructFrame hint.  Using an out of date style
+  // context could trigger assertions about mismatched rule trees.
+  if (!(mHintsHandled & nsChangeHint_ReconstructFrame)) {
+    RestyleChildren(childRestyleHint);
+  }
 
   if (oldContext && !oldContext->HasSingleReference()) {
     // If we swapped some structs out of oldContext in the RestyleSelf call
@@ -2820,20 +2948,14 @@
   nsIAtom* const pseudoTag = oldContext->GetPseudo();
   const nsCSSPseudoElements::Type pseudoType = oldContext->GetPseudoType();
 
-  nsStyleContext* parentContext;
   // Get the frame providing the parent style context.  If it is a
   // child, then resolve the provider first.
-  nsIFrame* providerFrame = aSelf->GetParentStyleContextFrame();
+  nsIFrame* providerFrame;
+  nsStyleContext* parentContext = aSelf->GetParentStyleContext(&providerFrame);
   bool isChild = providerFrame && providerFrame->GetParent() == aSelf;
-  if (!isChild) {
-    if (providerFrame)
-      parentContext = providerFrame->StyleContext();
-    else
-      parentContext = nullptr;
-  }
-  else {
+  if (isChild) {
     MOZ_ASSERT(providerFrame->GetContent() == aSelf->GetContent(),
-               "Postcondition for GetParentStyleContextFrame() violated. "
+               "Postcondition for GetParentStyleContext() violated. "
                "That means we need to add the current element to the "
                "ancestor filter.");
 
@@ -3224,6 +3346,9 @@
 void
 ElementRestyler::RestyleChildren(nsRestyleHint aChildRestyleHint)
 {
+  MOZ_ASSERT(!(mHintsHandled & nsChangeHint_ReconstructFrame),
+             "No need to do this if we're planning to reframe already.");
+
   // We'd like style resolution to be exact in the sense that an
   // animation-only style flush flushes only the styles it requests
   // flushing and doesn't update any other styles.  This means avoiding
@@ -3238,7 +3363,7 @@
   // and pseudo-elements when we can skip it.
   bool mightReframePseudos = aChildRestyleHint & eRestyle_Subtree;
 
-  RestyleUndisplayedChildren(aChildRestyleHint);
+  RestyleUndisplayedDescendants(aChildRestyleHint);
 
   // Check whether we might need to create a new ::before frame.
   // There's no need to do this if we're planning to reframe already
@@ -3263,7 +3388,7 @@
   // assertions about mismatched rule trees.
   nsIFrame *lastContinuation;
   if (!(mHintsHandled & nsChangeHint_ReconstructFrame)) {
-    InitializeAccessibilityNotifications();
+    InitializeAccessibilityNotifications(mFrame->StyleContext());
 
     for (nsIFrame* f = mFrame; f;
          f = GetNextContinuationWithSameStyle(f, f->StyleContext())) {
@@ -3283,100 +3408,235 @@
 }
 
 void
-ElementRestyler::RestyleUndisplayedChildren(nsRestyleHint aChildRestyleHint)
+ElementRestyler::RestyleChildrenOfDisplayContentsElement(
+  nsIFrame*       aParentFrame,
+  nsStyleContext* aNewContext,
+  nsChangeHint    aMinHint,
+  RestyleTracker& aRestyleTracker,
+  nsRestyleHint   aRestyleHint)
+{
+  MOZ_ASSERT(!(mHintsHandled & nsChangeHint_ReconstructFrame), "why call me?");
+
+  const bool mightReframePseudos = aRestyleHint & eRestyle_Subtree;
+  DoRestyleUndisplayedDescendants(nsRestyleHint(0), mContent, aNewContext);
+  if (!(mHintsHandled & nsChangeHint_ReconstructFrame) && mightReframePseudos) {
+    MaybeReframeForBeforePseudo(aParentFrame, nullptr, mContent, aNewContext);
+  }
+  if (!(mHintsHandled & nsChangeHint_ReconstructFrame) && mightReframePseudos) {
+    MaybeReframeForAfterPseudo(aParentFrame, nullptr, mContent, aNewContext);
+  }
+  if (!(mHintsHandled & nsChangeHint_ReconstructFrame)) {
+    InitializeAccessibilityNotifications(aNewContext);
+
+    // Then process child frames for content that is a descendant of mContent.
+    // XXX perhaps it's better to walk child frames (before reresolving
+    // XXX undisplayed contexts above) and mark those that has a stylecontext
+    // XXX leading up to mContent's old context? (instead of the
+    // XXX ContentIsDescendantOf check below)
+    nsIFrame::ChildListIterator lists(aParentFrame);
+    for ( ; !lists.IsDone(); lists.Next()) {
+      nsFrameList::Enumerator childFrames(lists.CurrentList());
+      for (; !childFrames.AtEnd(); childFrames.Next()) {
+        nsIFrame* f = childFrames.get();
+        if (nsContentUtils::ContentIsDescendantOf(f->GetContent(), mContent) &&
+            !f->GetPrevContinuation()) {
+          if (!(f->GetStateBits() & NS_FRAME_OUT_OF_FLOW)) {
+            ComputeStyleChangeFor(f, mChangeList, aMinHint, aRestyleTracker,
+                                  aRestyleHint);
+          }
+        }
+      }
+    }
+  }
+  if (!(mHintsHandled & nsChangeHint_ReconstructFrame)) {
+    SendAccessibilityNotifications();
+  }
+}
+
+void
+ElementRestyler::ComputeStyleChangeFor(nsIFrame*          aFrame,
+                                       nsStyleChangeList* aChangeList,
+                                       nsChangeHint       aMinChange,
+                                       RestyleTracker&    aRestyleTracker,
+                                       nsRestyleHint      aRestyleHint)
+{
+  PROFILER_LABEL("ElementRestyler", "ComputeStyleChangeFor",
+    js::ProfileEntry::Category::CSS);
+
+  nsIContent* content = aFrame->GetContent();
+  if (aMinChange) {
+    aChangeList->AppendChange(aFrame, content, aMinChange);
+  }
+
+  NS_ASSERTION(!aFrame->GetPrevContinuation(),
+               "must start with the first continuation");
+
+  // We want to start with this frame and walk all its next-in-flows,
+  // as well as all its ib-split siblings and their next-in-flows,
+  // reresolving style on all the frames we encounter in this walk that
+  // we didn't reach already.  In the normal case, this will mean only
+  // restyling the first two block-in-inline splits and no
+  // continuations, and skipping everything else.  However, when we have
+  // a style change targeted at an element inside a context where styles
+  // vary between continuations (e.g., a style change on an element that
+  // extends from inside a styled ::first-line to outside of that first
+  // line), we might restyle more than that.
+
+  nsPresContext* presContext = aFrame->PresContext();
+  FramePropertyTable* propTable = presContext->PropertyTable();
+
+  TreeMatchContext treeMatchContext(true,
+                                    nsRuleWalker::eRelevantLinkUnvisited,
+                                    presContext->Document());
+  Element* parent =
+    content ? content->GetParentElementCrossingShadowRoot() : nullptr;
+  treeMatchContext.InitAncestors(parent);
+  nsTArray<nsIContent*> visibleKidsOfHiddenElement;
+  for (nsIFrame* ibSibling = aFrame; ibSibling;
+       ibSibling = GetNextBlockInInlineSibling(propTable, ibSibling)) {
+    // Outer loop over ib-split siblings
+    for (nsIFrame* cont = ibSibling; cont; cont = cont->GetNextContinuation()) {
+      if (GetPrevContinuationWithSameStyle(cont)) {
+        // We already handled this element when dealing with its earlier
+        // continuation.
+        continue;
+      }
+
+      // Inner loop over next-in-flows of the current frame
+      ElementRestyler restyler(presContext, cont, aChangeList,
+                               aMinChange, aRestyleTracker,
+                               treeMatchContext,
+                               visibleKidsOfHiddenElement);
+
+      restyler.Restyle(aRestyleHint);
+
+      if (restyler.HintsHandledForFrame() & nsChangeHint_ReconstructFrame) {
+        // If it's going to cause a framechange, then don't bother
+        // with the continuations or ib-split siblings since they'll be
+        // clobbered by the frame reconstruct anyway.
+        NS_ASSERTION(!cont->GetPrevContinuation(),
+                     "continuing frame had more severe impact than first-in-flow");
+        return;
+      }
+    }
+  }
+}
+
+void
+ElementRestyler::RestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint)
 {
   // When the root element is display:none, we still construct *some*
   // frames that have the root element as their mContent, down to the
   // DocElementContainingBlock.
   bool checkUndisplayed;
   nsIContent* undisplayedParent;
-  nsCSSFrameConstructor* frameConstructor = mPresContext->FrameConstructor();
   if (mFrame->StyleContext()->GetPseudo()) {
-    checkUndisplayed = mFrame == frameConstructor->
+    checkUndisplayed = mFrame == mPresContext->FrameConstructor()->
                                    GetDocElementContainingBlock();
     undisplayedParent = nullptr;
   } else {
     checkUndisplayed = !!mFrame->GetContent();
     undisplayedParent = mFrame->GetContent();
   }
-  if (checkUndisplayed &&
-      // No need to do this if we're planning to reframe already.
-      // It's also important to check mHintsHandled since we use
-      // mFrame->StyleContext(), which is out of date if mHintsHandled
-      // has a ReconstructFrame hint.  Using an out of date style
-      // context could trigger assertions about mismatched rule trees.
-      !(mHintsHandled & nsChangeHint_ReconstructFrame)) {
-    UndisplayedNode* undisplayed =
-      frameConstructor->GetAllUndisplayedContentIn(undisplayedParent);
-    TreeMatchContext::AutoAncestorPusher pusher(mTreeMatchContext);
-    if (undisplayed) {
-      pusher.PushAncestorAndStyleScope(undisplayedParent);
-    }
-    for (; undisplayed; undisplayed = undisplayed->mNext) {
-      NS_ASSERTION(undisplayedParent ||
-                   undisplayed->mContent ==
-                     mPresContext->Document()->GetRootElement(),
-                   "undisplayed node child of null must be root");
-      NS_ASSERTION(!undisplayed->mStyle->GetPseudo(),
-                   "Shouldn't have random pseudo style contexts in the "
-                   "undisplayed map");
-
-      LOG_RESTYLE("RestyleUndisplayedChildren: undisplayed->mContent = %p",
-                  undisplayed->mContent.get());
-
-      // Get the parent of the undisplayed content and check if it is a XBL
-      // children element. Push the children element as an ancestor here because it does
-      // not have a frame and would not otherwise be pushed as an ancestor.
-      nsIContent* parent = undisplayed->mContent->GetParent();
-      TreeMatchContext::AutoAncestorPusher insertionPointPusher(mTreeMatchContext);
-      if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
-        insertionPointPusher.PushAncestorAndStyleScope(parent);
-      }
-
-      nsRestyleHint thisChildHint = aChildRestyleHint;
-      nsAutoPtr<RestyleTracker::RestyleData> undisplayedRestyleData;
-      Element* element = undisplayed->mContent->AsElement();
-      if (mRestyleTracker.GetRestyleData(element,
-                                         undisplayedRestyleData)) {
-        thisChildHint =
-          nsRestyleHint(thisChildHint | undisplayedRestyleData->mRestyleHint);
-      }
-      nsRefPtr<nsStyleContext> undisplayedContext;
-      nsStyleSet* styleSet = mPresContext->StyleSet();
-      if (thisChildHint & (eRestyle_Self | eRestyle_Subtree)) {
-        undisplayedContext =
-          styleSet->ResolveStyleFor(element,
-                                    mFrame->StyleContext(),
-                                    mTreeMatchContext);
-      } else if (thisChildHint ||
-                 styleSet->IsInRuleTreeReconstruct()) {
-        // Use ResolveStyleWithReplacement either for actual
-        // replacements, or as a substitute for ReparentStyleContext
-        // that rebuilds the path in the rule tree rather than reusing
-        // the rule node, as we need to do during a rule tree
-        // reconstruct.
-        undisplayedContext =
-          styleSet->ResolveStyleWithReplacement(element,
-                                                mFrame->StyleContext(),
-                                                undisplayed->mStyle,
-                                                thisChildHint);
-      } else {
-        undisplayedContext =
-          styleSet->ReparentStyleContext(undisplayed->mStyle,
-                                         mFrame->StyleContext(),
-                                         element, element);
-      }
-      const nsStyleDisplay* display = undisplayedContext->StyleDisplay();
-      if (display->mDisplay != NS_STYLE_DISPLAY_NONE) {
-        NS_ASSERTION(undisplayed->mContent,
-                     "Must have undisplayed content");
-        mChangeList->AppendChange(nullptr, undisplayed->mContent,
-                                  NS_STYLE_HINT_FRAMECHANGE);
-        // The node should be removed from the undisplayed map when
-        // we reframe it.
-      } else {
-        // update the undisplayed node with the new context
-        undisplayed->mStyle = undisplayedContext;
+  if (checkUndisplayed) {
+    DoRestyleUndisplayedDescendants(aChildRestyleHint, undisplayedParent,
+                                    mFrame->StyleContext());
+  }
+}
+
+void
+ElementRestyler::DoRestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint,
+                                                 nsIContent* aParent,
+                                                 nsStyleContext* aParentContext)
+{
+  nsCSSFrameConstructor* fc = mPresContext->FrameConstructor();
+  UndisplayedNode* nodes = fc->GetAllUndisplayedContentIn(aParent);
+  RestyleUndisplayedNodes(aChildRestyleHint, nodes, aParent,
+                          aParentContext, NS_STYLE_DISPLAY_NONE);
+  nodes = fc->GetAllDisplayContentsIn(aParent);
+  RestyleUndisplayedNodes(aChildRestyleHint, nodes, aParent,
+                          aParentContext, NS_STYLE_DISPLAY_CONTENTS);
+}
+
+void
+ElementRestyler::RestyleUndisplayedNodes(nsRestyleHint    aChildRestyleHint,
+                                         UndisplayedNode* aUndisplayed,
+                                         nsIContent*      aUndisplayedParent,
+                                         nsStyleContext*  aParentContext,
+                                         const uint8_t    aDisplay)
+{
+  nsIContent* undisplayedParent = aUndisplayedParent;
+  UndisplayedNode* undisplayed = aUndisplayed;
+  TreeMatchContext::AutoAncestorPusher pusher(mTreeMatchContext);
+  if (undisplayed) {
+    pusher.PushAncestorAndStyleScope(undisplayedParent);
+  }
+  for (; undisplayed; undisplayed = undisplayed->mNext) {
+    NS_ASSERTION(undisplayedParent ||
+                 undisplayed->mContent ==
+                   mPresContext->Document()->GetRootElement(),
+                 "undisplayed node child of null must be root");
+    NS_ASSERTION(!undisplayed->mStyle->GetPseudo(),
+                 "Shouldn't have random pseudo style contexts in the "
+                 "undisplayed map");
+
+    LOG_RESTYLE("RestyleUndisplayedChildren: undisplayed->mContent = %p",
+                undisplayed->mContent.get());
+
+    // Get the parent of the undisplayed content and check if it is a XBL
+    // children element. Push the children element as an ancestor here because it does
+    // not have a frame and would not otherwise be pushed as an ancestor.
+    nsIContent* parent = undisplayed->mContent->GetParent();
+    TreeMatchContext::AutoAncestorPusher insertionPointPusher(mTreeMatchContext);
+    if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
+      insertionPointPusher.PushAncestorAndStyleScope(parent);
+    }
+
+    nsRestyleHint thisChildHint = aChildRestyleHint;
+    nsAutoPtr<RestyleTracker::RestyleData> undisplayedRestyleData;
+    Element* element = undisplayed->mContent->AsElement();
+    if (mRestyleTracker.GetRestyleData(element,
+                                       undisplayedRestyleData)) {
+      thisChildHint =
+        nsRestyleHint(thisChildHint | undisplayedRestyleData->mRestyleHint);
+    }
+    nsRefPtr<nsStyleContext> undisplayedContext;
+    nsStyleSet* styleSet = mPresContext->StyleSet();
+    if (thisChildHint & (eRestyle_Self | eRestyle_Subtree)) {
+      undisplayedContext =
+        styleSet->ResolveStyleFor(element, aParentContext, mTreeMatchContext);
+    } else if (thisChildHint ||
+               styleSet->IsInRuleTreeReconstruct()) {
+      // Use ResolveStyleWithReplacement either for actual
+      // replacements, or as a substitute for ReparentStyleContext
+      // that rebuilds the path in the rule tree rather than reusing
+      // the rule node, as we need to do during a rule tree
+      // reconstruct.
+      undisplayedContext =
+        styleSet->ResolveStyleWithReplacement(element,
+                                              aParentContext,
+                                              undisplayed->mStyle,
+                                              thisChildHint);
+    } else {
+      undisplayedContext =
+        styleSet->ReparentStyleContext(undisplayed->mStyle,
+                                       aParentContext,
+                                       element, element);
+    }
+    const nsStyleDisplay* display = undisplayedContext->StyleDisplay();
+    if (display->mDisplay != aDisplay) {
+      NS_ASSERTION(element, "Must have undisplayed content");
+      mChangeList->AppendChange(nullptr, element,
+                                NS_STYLE_HINT_FRAMECHANGE);
+      // The node should be removed from the undisplayed map when
+      // we reframe it.
+    } else {
+      // update the undisplayed node with the new context
+      undisplayed->mStyle = undisplayedContext;
+
+      if (aDisplay == NS_STYLE_DISPLAY_CONTENTS) {
+        DoRestyleUndisplayedDescendants(aChildRestyleHint, element,
+                                        undisplayed->mStyle);
       }
     }
   }
@@ -3385,30 +3645,38 @@
 void
 ElementRestyler::MaybeReframeForBeforePseudo()
 {
+  MaybeReframeForBeforePseudo(mFrame, mFrame, mFrame->GetContent(),
+                              mFrame->StyleContext());
+}
+
+void
+ElementRestyler::MaybeReframeForBeforePseudo(nsIFrame* aGenConParentFrame,
+                                             nsIFrame* aFrame,
+                                             nsIContent* aContent,
+                                             nsStyleContext* aStyleContext)
+{
   // Make sure not to do this for pseudo-frames or frames that
   // can't have generated content.
   nsContainerFrame* cif;
-  if (!mFrame->StyleContext()->GetPseudo() &&
-      ((mFrame->GetStateBits() & NS_FRAME_MAY_HAVE_GENERATED_CONTENT) ||
-       // Our content insertion frame might have gotten flagged
-       ((cif = mFrame->GetContentInsertionFrame()) &&
+  if (!aStyleContext->GetPseudo() &&
+      ((aGenConParentFrame->GetStateBits() & NS_FRAME_MAY_HAVE_GENERATED_CONTENT) ||
+       // Our content insertion frame might have gotten flagged.
+       ((cif = aGenConParentFrame->GetContentInsertionFrame()) &&
         (cif->GetStateBits() & NS_FRAME_MAY_HAVE_GENERATED_CONTENT)))) {
-    // Check for a new :before pseudo and an existing :before
-    // frame, but only if the frame is the first continuation.
-    nsIFrame* prevContinuation = mFrame->GetPrevContinuation();
-    if (!prevContinuation) {
-      // Checking for a :before frame is cheaper than getting the
-      // :before style context.
-      if (!nsLayoutUtils::GetBeforeFrame(mFrame) &&
-          nsLayoutUtils::HasPseudoStyle(mFrame->GetContent(),
-                                        mFrame->StyleContext(),
+    // Check for a ::before pseudo style and the absence of a ::before content,
+    // but only if aFrame is null or is the first continuation.
+    if (!aFrame || !aFrame->GetPrevContinuation()) {
+      // Checking for a ::before frame is cheaper than getting the
+      // ::before style context.
+      if (!nsLayoutUtils::GetBeforeFrameForContent(aGenConParentFrame, aContent) &&
+          nsLayoutUtils::HasPseudoStyle(aContent, aStyleContext,
                                         nsCSSPseudoElements::ePseudo_before,
                                         mPresContext)) {
-        // Have to create the new :before frame
+        // Have to create the new ::before frame.
         LOG_RESTYLE("MaybeReframeForBeforePseudo, appending "
                     "nsChangeHint_ReconstructFrame");
         NS_UpdateHint(mHintsHandled, nsChangeHint_ReconstructFrame);
-        mChangeList->AppendChange(mFrame, mContent,
+        mChangeList->AppendChange(aFrame, aContent,
                                   nsChangeHint_ReconstructFrame);
       }
     }
@@ -3422,27 +3690,35 @@
 void
 ElementRestyler::MaybeReframeForAfterPseudo(nsIFrame* aFrame)
 {
+  MOZ_ASSERT(aFrame);
+  MaybeReframeForAfterPseudo(aFrame, aFrame, aFrame->GetContent(),
+                             aFrame->StyleContext());
+}
+
+void
+ElementRestyler::MaybeReframeForAfterPseudo(nsIFrame* aGenConParentFrame,
+                                            nsIFrame* aFrame,
+                                            nsIContent* aContent,
+                                            nsStyleContext* aStyleContext)
+{
   // Make sure not to do this for pseudo-frames or frames that
   // can't have generated content.
   nsContainerFrame* cif;
-  if (!aFrame->StyleContext()->GetPseudo() &&
-      ((aFrame->GetStateBits() & NS_FRAME_MAY_HAVE_GENERATED_CONTENT) ||
-       // Our content insertion frame might have gotten flagged
-       ((cif = aFrame->GetContentInsertionFrame()) &&
+  if (!aStyleContext->GetPseudo() &&
+      ((aGenConParentFrame->GetStateBits() & NS_FRAME_MAY_HAVE_GENERATED_CONTENT) ||
+       // Our content insertion frame might have gotten flagged.
+       ((cif = aGenConParentFrame->GetContentInsertionFrame()) &&
         (cif->GetStateBits() & NS_FRAME_MAY_HAVE_GENERATED_CONTENT)))) {
-    // Check for new :after content, but only if the frame is the
-    // last continuation.
-    nsIFrame* nextContinuation = aFrame->GetNextContinuation();
-
-    if (!nextContinuation) {
-      // Getting the :after frame is more expensive than getting the pseudo
-      // context, so get the pseudo context first.
-      if (nsLayoutUtils::HasPseudoStyle(aFrame->GetContent(),
-                                        aFrame->StyleContext(),
+    // Check for an ::after pseudo style and the absence of an ::after content,
+    // but only if aFrame is null or is the last continuation.
+    if (!aFrame || !aFrame->GetNextContinuation()) {
+      // Checking for an ::after frame is cheaper than getting the
+      // ::after style context.
+      if (!nsLayoutUtils::GetAfterFrameForContent(aGenConParentFrame, aContent) &&
+          nsLayoutUtils::HasPseudoStyle(aContent, aStyleContext,
                                         nsCSSPseudoElements::ePseudo_after,
-                                        mPresContext) &&
-          !nsLayoutUtils::GetAfterFrame(aFrame)) {
-        // have to create the new :after frame
+                                        mPresContext)) {
+        // Have to create the new ::after frame.
         LOG_RESTYLE("MaybeReframeForAfterPseudo, appending "
                     "nsChangeHint_ReconstructFrame");
         NS_UpdateHint(mHintsHandled, nsChangeHint_ReconstructFrame);
@@ -3454,17 +3730,18 @@
 }
 
 void
-ElementRestyler::InitializeAccessibilityNotifications()
+ElementRestyler::InitializeAccessibilityNotifications(nsStyleContext* aNewContext)
 {
 #ifdef ACCESSIBILITY
   // Notify a11y for primary frame only if it's a root frame of visibility
   // changes or its parent frame was hidden while it stays visible and
   // it is not inside a {ib} split or is the first frame of {ib} split.
   if (nsIPresShell::IsAccessibilityActive() &&
-      !mFrame->GetPrevContinuation() &&
-      !mFrame->FrameIsNonFirstInIBSplit()) {
+      (!mFrame ||
+       (!mFrame->GetPrevContinuation() &&
+        !mFrame->FrameIsNonFirstInIBSplit()))) {
     if (mDesiredA11yNotifications == eSendAllNotifications) {
-      bool isFrameVisible = mFrame->StyleVisibility()->IsVisible();
+      bool isFrameVisible = aNewContext->StyleVisibility()->IsVisible();
       if (isFrameVisible != mWasFrameVisible) {
         if (isFrameVisible) {
           // Notify a11y the element (perhaps with its children) was shown.
@@ -3483,10 +3760,10 @@
         }
       }
     } else if (mDesiredA11yNotifications == eNotifyIfShown &&
-               mFrame->StyleVisibility()->IsVisible()) {
-      // Notify a11y that element stayed visible while its parent was
-      // hidden.
-      mVisibleKidsOfHiddenElement.AppendElement(mFrame->GetContent());
+               aNewContext->StyleVisibility()->IsVisible()) {
+      // Notify a11y that element stayed visible while its parent was hidden.
+      nsIContent* c = mFrame ? mFrame->GetContent() : mContent;
+      mVisibleKidsOfHiddenElement.AppendElement(c);
       mKidsDesiredA11yNotifications = eSkipNotifications;
     }
   }
@@ -3534,7 +3811,7 @@
           NS_ASSERTION(outOfFlowFrame != mResolvedChild,
                        "out-of-flow frame not a true descendant");
 
-          // |nsFrame::GetParentStyleContextFrame| checks being out
+          // |nsFrame::GetParentStyleContext| checks being out
           // of flow so that this works correctly.
           do {
             if (GetPrevContinuationWithSameStyle(outOfFlowFrame)) {
@@ -3574,8 +3851,8 @@
   if (mOurA11yNotification == eNotifyShown) {
     nsAccessibilityService* accService = nsIPresShell::AccService();
     if (accService) {
-      nsIPresShell* presShell = mFrame->PresContext()->GetPresShell();
-      nsIContent* content = mFrame->GetContent();
+      nsIPresShell* presShell = mPresContext->GetPresShell();
+      nsIContent* content = mFrame ? mFrame->GetContent() : mContent;
 
       accService->ContentRangeInserted(presShell, content->GetParent(),
                                        content,
@@ -3584,8 +3861,8 @@
   } else if (mOurA11yNotification == eNotifyHidden) {
     nsAccessibilityService* accService = nsIPresShell::AccService();
     if (accService) {
-      nsIPresShell* presShell = mFrame->PresContext()->GetPresShell();
-      nsIContent* content = mFrame->GetContent();
+      nsIPresShell* presShell = mPresContext->GetPresShell();
+      nsIContent* content = mFrame ? mFrame->GetContent() : mContent;
       accService->ContentRemoved(presShell, content);
 
       // Process children staying shown.
@@ -3602,21 +3879,6 @@
 #endif
 }
 
-static inline nsIFrame*
-GetNextBlockInInlineSibling(FramePropertyTable* aPropTable, nsIFrame* aFrame)
-{
-  NS_ASSERTION(!aFrame->GetPrevContinuation(),
-               "must start with the first continuation");
-  // Might we have ib-split siblings?
-  if (!(aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT)) {
-    // nothing more to do here
-    return nullptr;
-  }
-
-  return static_cast<nsIFrame*>
-    (aPropTable->Get(aFrame, nsIFrame::IBSplitSibling()));
-}
-
 void
 RestyleManager::ComputeAndProcessStyleChange(nsIFrame*          aFrame,
                                              nsChangeHint       aMinChange,
@@ -3631,76 +3893,81 @@
   mReframingStyleContexts = &reframingStyleContexts;
 
   nsStyleChangeList changeList;
-  ComputeStyleChangeFor(aFrame, &changeList, aMinChange,
-                        aRestyleTracker, aRestyleHint);
+  ElementRestyler::ComputeStyleChangeFor(aFrame, &changeList, aMinChange,
+                                         aRestyleTracker, aRestyleHint);
   ProcessRestyledFrames(changeList);
 }
 
 void
-RestyleManager::ComputeStyleChangeFor(nsIFrame*          aFrame,
-                                      nsStyleChangeList* aChangeList,
-                                      nsChangeHint       aMinChange,
-                                      RestyleTracker&    aRestyleTracker,
-                                      nsRestyleHint      aRestyleHint)
+RestyleManager::ComputeAndProcessStyleChange(nsStyleContext*    aNewContext,
+                                             Element*           aElement,
+                                             nsChangeHint       aMinChange,
+                                             RestyleTracker&    aRestyleTracker,
+                                             nsRestyleHint      aRestyleHint)
 {
-  PROFILER_LABEL("RestyleManager", "ComputeStyleChangeFor",
-    js::ProfileEntry::Category::CSS);
-
-  nsIContent *content = aFrame->GetContent();
-  if (aMinChange) {
-    aChangeList->AppendChange(aFrame, content, aMinChange);
-  }
-
-  NS_ASSERTION(!aFrame->GetPrevContinuation(),
-               "must start with the first continuation");
-
-  // We want to start with this frame and walk all its next-in-flows,
-  // as well as all its ib-split siblings and their next-in-flows,
-  // reresolving style on all the frames we encounter in this walk that
-  // we didn't reach already.  In the normal case, this will mean only
-  // restyling the first two block-in-inline splits and no
-  // continuations, and skipping everything else.  However, when we have
-  // a style change targeted at an element inside a context where styles
-  // vary between continuations (e.g., a style change on an element that
-  // extends from inside a styled ::first-line to outside of that first
-  // line), we might restyle more than that.
-
-  FramePropertyTable* propTable = mPresContext->PropertyTable();
+  // Create a ReframingStyleContexts struct on the stack and put it in
+  // our mReframingStyleContexts for the scope of this function.
+  MOZ_ASSERT(!mReframingStyleContexts, "shouldn't call recursively");
+  AutoRestore<ReframingStyleContexts*> ar(mReframingStyleContexts);
+  ReframingStyleContexts reframingStyleContexts;
+  mReframingStyleContexts = &reframingStyleContexts;
 
+  MOZ_ASSERT(aNewContext->StyleDisplay()->mDisplay == NS_STYLE_DISPLAY_CONTENTS);
+  nsIFrame* frame = GetNearestAncestorFrame(aElement);
+  MOZ_ASSERT(frame, "display:contents node in map although it's a "
+                    "display:none descendant?");
   TreeMatchContext treeMatchContext(true,
                                     nsRuleWalker::eRelevantLinkUnvisited,
-                                    mPresContext->Document());
-  Element* parent =
-    content ? content->GetParentElementCrossingShadowRoot() : nullptr;
-  treeMatchContext.InitAncestors(parent);
+                                    frame->PresContext()->Document());
+  nsIContent* parent = aElement->GetParent();
+  Element* parentElement =
+    parent && parent->IsElement() ? parent->AsElement() : nullptr;
+  treeMatchContext.InitAncestors(parentElement);
   nsTArray<nsIContent*> visibleKidsOfHiddenElement;
-  for (nsIFrame* ibSibling = aFrame; ibSibling;
-       ibSibling = GetNextBlockInInlineSibling(propTable, ibSibling)) {
-    // Outer loop over ib-split siblings
-    for (nsIFrame* cont = ibSibling; cont; cont = cont->GetNextContinuation()) {
-      if (GetPrevContinuationWithSameStyle(cont)) {
-        // We already handled this element when dealing with its earlier
-        // continuation.
-        continue;
-      }
-
-      // Inner loop over next-in-flows of the current frame
-      ElementRestyler restyler(mPresContext, cont, aChangeList,
-                               aMinChange, aRestyleTracker,
-                               treeMatchContext,
-                               visibleKidsOfHiddenElement);
-
-      restyler.Restyle(aRestyleHint);
+  nsStyleChangeList changeList;
+  ElementRestyler r(frame->PresContext(), aElement, &changeList, aMinChange,
+                    aRestyleTracker, treeMatchContext,
+                    visibleKidsOfHiddenElement);
+  r.RestyleChildrenOfDisplayContentsElement(frame, aNewContext, aMinChange,
+                                            aRestyleTracker, aRestyleHint);
+  ProcessRestyledFrames(changeList);
+}
 
-      if (restyler.HintsHandledForFrame() & nsChangeHint_ReconstructFrame) {
-        // If it's going to cause a framechange, then don't bother
-        // with the continuations or ib-split siblings since they'll be
-        // clobbered by the frame reconstruct anyway.
-        NS_ASSERTION(!cont->GetPrevContinuation(),
-                     "continuing frame had more severe impact than first-in-flow");
-        return;
+AutoDisplayContentsAncestorPusher::AutoDisplayContentsAncestorPusher(
+  TreeMatchContext& aTreeMatchContext, nsPresContext* aPresContext,
+  nsIContent* aParent)
+  : mTreeMatchContext(aTreeMatchContext)
+  , mPresContext(aPresContext)
+{
+  if (aParent) {
+    nsFrameManager* fm = mPresContext->FrameManager();
+    // Push display:contents mAncestors onto mTreeMatchContext.
+    for (nsIContent* p = aParent; p && fm->GetDisplayContentsStyleFor(p);
+         p = p->GetParent()) {
+      mAncestors.AppendElement(p->AsElement());
+    }
+    bool hasFilter = mTreeMatchContext.mAncestorFilter.HasFilter();
+    nsTArray<mozilla::dom::Element*>::size_type i = mAncestors.Length();
+    while (i--) {
+      if (hasFilter) {
+        mTreeMatchContext.mAncestorFilter.PushAncestor(mAncestors[i]);
       }
+      mTreeMatchContext.PushStyleScope(mAncestors[i]);
+    }
+  }
+}
+
+AutoDisplayContentsAncestorPusher::~AutoDisplayContentsAncestorPusher()
+{
+  // Pop the ancestors we pushed in the CTOR, if any.
+  typedef nsTArray<mozilla::dom::Element*>::size_type sz;
+  sz len = mAncestors.Length();
+  bool hasFilter = mTreeMatchContext.mAncestorFilter.HasFilter();
+  for (sz i = 0; i < len; ++i) {
+    if (hasFilter) {
+      mTreeMatchContext.mAncestorFilter.PopAncestor();
     }
+    mTreeMatchContext.PopStyleScope(mAncestors[i]);
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/RestyleManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/RestyleManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/RestyleManager.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/RestyleManager.h	2014-11-26 21:46:04.000000000 +0000
@@ -26,12 +26,14 @@
 
 namespace mozilla {
   class EventStates;
+  struct UndisplayedNode;
 
 namespace dom {
   class Element;
 } // namespace dom
 
-class RestyleManager MOZ_FINAL {
+class RestyleManager MOZ_FINAL
+{
 public:
   friend class ::nsRefreshDriver;
   friend class RestyleTracker;
@@ -92,6 +94,19 @@
   // track whether off-main-thread animations are up-to-date.
   uint64_t GetAnimationGeneration() const { return mAnimationGeneration; }
 
+  // A workaround until bug 847286 lands that gets the maximum of the animation
+  // generation counters stored on the set of animations and transitions
+  // respectively for |aFrame|.
+  static uint64_t GetMaxAnimationGenerationForFrame(nsIFrame* aFrame);
+
+  // Update the animation generation count to mark that animation state
+  // has changed.
+  //
+  // This is normally performed automatically by ProcessPendingRestyles
+  // but it is also called when we have out-of-band changes to animations
+  // such as changes made through the Web Animations API.
+  void IncrementAnimationGeneration() { ++mAnimationGeneration; }
+
   // Whether rule matching should skip styles associated with animation
   bool SkipAnimationRules() const {
     MOZ_ASSERT(mSkipAnimationRules || !mPostAnimationRestyles,
@@ -125,22 +140,17 @@
   nsresult ReparentStyleContext(nsIFrame* aFrame);
 
 private:
-  void ComputeAndProcessStyleChange(nsIFrame* aFrame,
-                                    nsChangeHint aMinChange,
+  // Used when restyling an element with a frame.
+  void ComputeAndProcessStyleChange(nsIFrame*       aFrame,
+                                    nsChangeHint    aMinChange,
                                     RestyleTracker& aRestyleTracker,
-                                    nsRestyleHint aRestyleHint);
-
-  /**
-   * Re-resolve the style contexts for a frame tree, building
-   * aChangeList based on the resulting style changes, plus aMinChange
-   * applied to aFrame.
-   */
-  void
-    ComputeStyleChangeFor(nsIFrame* aFrame,
-                          nsStyleChangeList* aChangeList,
-                          nsChangeHint aMinChange,
-                          RestyleTracker& aRestyleTracker,
-                          nsRestyleHint aRestyleHint);
+                                    nsRestyleHint   aRestyleHint);
+  // Used when restyling a display:contents element.
+  void ComputeAndProcessStyleChange(nsStyleContext* aNewContext,
+                                    Element*        aElement,
+                                    nsChangeHint    aMinChange,
+                                    RestyleTracker& aRestyleTracker,
+                                    nsRestyleHint   aRestyleHint);
 
 public:
 
@@ -503,7 +513,8 @@
  * An ElementRestyler is created for *each* element in a subtree that we
  * recompute styles for.
  */
-class ElementRestyler MOZ_FINAL {
+class ElementRestyler MOZ_FINAL
+{
 public:
   typedef mozilla::dom::Element Element;
 
@@ -535,6 +546,15 @@
                   const ElementRestyler& aParentFrameRestyler,
                   nsIFrame* aFrame);
 
+  // For restyling undisplayed content only (mFrame==null).
+  ElementRestyler(nsPresContext* aPresContext,
+                  nsIContent* aContent,
+                  nsStyleChangeList* aChangeList,
+                  nsChangeHint aHintsHandledByAncestors,
+                  RestyleTracker& aRestyleTracker,
+                  TreeMatchContext& aTreeMatchContext,
+                  nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement);
+
   /**
    * Restyle our frame's element and its subtree.
    *
@@ -555,6 +575,26 @@
    */
   nsChangeHint HintsHandledForFrame() { return mHintsHandled; }
 
+  /**
+   * Called from RestyleManager::ComputeAndProcessStyleChange to restyle
+   * children of a display:contents element.
+   */
+  void RestyleChildrenOfDisplayContentsElement(nsIFrame*       aParentFrame,
+                                               nsStyleContext* aNewContext,
+                                               nsChangeHint    aMinHint,
+                                               RestyleTracker& aRestyleTracker,
+                                               nsRestyleHint   aRestyleHint);
+
+  /**
+   * Re-resolve the style contexts for a frame tree, building aChangeList
+   * based on the resulting style changes, plus aMinChange applied to aFrame.
+   */
+  static void ComputeStyleChangeFor(nsIFrame*          aFrame,
+                                    nsStyleChangeList* aChangeList,
+                                    nsChangeHint       aMinChange,
+                                    RestyleTracker&    aRestyleTracker,
+                                    nsRestyleHint      aRestyleHint);
+
 #ifdef RESTYLE_LOGGING
   bool ShouldLogRestyle() {
     return RestyleManager::ShouldLogRestyle(mPresContext);
@@ -594,6 +634,11 @@
   void RestyleChildren(nsRestyleHint aChildRestyleHint);
 
   /**
+   * Helpers for Restyle().
+   */
+  void AddLayerChangesForAnimation();
+
+  /**
    * Helpers for RestyleSelf().
    */
   void CaptureChange(nsStyleContext* aOldContext,
@@ -607,12 +652,33 @@
   /**
    * Helpers for RestyleChildren().
    */
-  void RestyleUndisplayedChildren(nsRestyleHint aChildRestyleHint);
+  void RestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint);
+  /**
+   * In the following two methods, aParentStyleContext is either
+   * mFrame->StyleContext() if we have a frame, or a display:contents
+   * style context if we don't.
+   */
+  void DoRestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint,
+                                       nsIContent* aParent,
+                                       nsStyleContext* aParentStyleContext);
+  void RestyleUndisplayedNodes(nsRestyleHint    aChildRestyleHint,
+                               UndisplayedNode* aUndisplayed,
+                               nsIContent*      aUndisplayedParent,
+                               nsStyleContext*  aParentStyleContext,
+                               const uint8_t    aDisplay);
   void MaybeReframeForBeforePseudo();
+  void MaybeReframeForBeforePseudo(nsIFrame* aGenConParentFrame,
+                                   nsIFrame* aFrame,
+                                   nsIContent* aContent,
+                                   nsStyleContext* aStyleContext);
   void MaybeReframeForAfterPseudo(nsIFrame* aFrame);
+  void MaybeReframeForAfterPseudo(nsIFrame* aGenConParentFrame,
+                                  nsIFrame* aFrame,
+                                  nsIContent* aContent,
+                                  nsStyleContext* aStyleContext);
   void RestyleContentChildren(nsIFrame* aParent,
                               nsRestyleHint aChildRestyleHint);
-  void InitializeAccessibilityNotifications();
+  void InitializeAccessibilityNotifications(nsStyleContext* aNewContext);
   void SendAccessibilityNotifications();
 
   enum DesiredA11yNotifications {
@@ -670,6 +736,27 @@
 #endif
 };
 
+/**
+ * This pushes any display:contents nodes onto a TreeMatchContext.
+ * Use it before resolving style for kids of aParent where aParent
+ * (and further ancestors) may be display:contents nodes which have
+ * not yet been pushed onto TreeMatchContext.
+ */
+class MOZ_STACK_CLASS AutoDisplayContentsAncestorPusher MOZ_FINAL
+{
+ public:
+  typedef mozilla::dom::Element Element;
+  AutoDisplayContentsAncestorPusher(TreeMatchContext& aTreeMatchContext,
+                                    nsPresContext*    aPresContext,
+                                    nsIContent*       aParent);
+  ~AutoDisplayContentsAncestorPusher();
+  bool IsEmpty() const { return mAncestors.Length() == 0; }
+private:
+  TreeMatchContext& mTreeMatchContext;
+  nsPresContext* const mPresContext;
+  nsAutoTArray<mozilla::dom::Element*, 4> mAncestors;
+};
+
 } // namespace mozilla
 
 #endif /* mozilla_RestyleManager_h */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/RestyleTracker.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/RestyleTracker.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/RestyleTracker.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/RestyleTracker.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -9,10 +9,12 @@
  */
 
 #include "RestyleTracker.h"
-#include "nsStyleChangeList.h"
-#include "RestyleManager.h"
+
 #include "GeckoProfiler.h"
+#include "nsFrameManager.h"
 #include "nsIDocument.h"
+#include "nsStyleChangeList.h"
+#include "RestyleManager.h"
 #include "RestyleTrackerInlines.h"
 
 namespace mozilla {
@@ -114,8 +116,10 @@
   NS_ASSERTION(!element->HasFlag(collector->tracker->RootBit()) ||
                // Maybe we're just not reachable via the frame tree?
                (element->GetFlattenedTreeParent() &&
-                (!element->GetFlattenedTreeParent()->GetPrimaryFrame()||
-                 element->GetFlattenedTreeParent()->GetPrimaryFrame()->IsLeaf())) ||
+                (!element->GetFlattenedTreeParent()->GetPrimaryFrame() ||
+                 element->GetFlattenedTreeParent()->GetPrimaryFrame()->IsLeaf() ||
+                 element->GetCurrentDoc()->GetShell()->FrameManager()
+                   ->GetDisplayContentsStyleFor(element))) ||
                // Or not reachable due to an async reinsert we have
                // pending?  If so, we'll have a reframe hint around.
                // That incidentally makes it safe that we still have
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/SelectionCarets.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/SelectionCarets.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/SelectionCarets.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/SelectionCarets.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -63,13 +63,6 @@
 static const int32_t kMoveStartTolerancePx = 5;
 // Time for trigger scroll end event, in miliseconds.
 static const int32_t kScrollEndTimerDelay = 300;
-// Read from preference "selectioncaret.noneditable". Indicate whether support
-// non-editable fields selection or not. We have stable state for editable
-// fields selection now. And we don't want to break this stable state when
-// enabling non-editable support. So I add a pref to control to support or
-// not. Once non-editable fields support is stable. We should remove this
-// pref.
-static bool kSupportNonEditableFields = false;
 
 NS_IMPL_ISUPPORTS(SelectionCarets,
                   nsIReflowObserver,
@@ -103,8 +96,6 @@
   if (!addedPref) {
     Preferences::AddIntVarCache(&sSelectionCaretsInflateSize,
                                 "selectioncaret.inflatesize.threshold");
-    Preferences::AddBoolVarCache(&kSupportNonEditableFields,
-                                 "selectioncaret.noneditable");
     addedPref = true;
   }
 }
@@ -325,7 +316,7 @@
 {
   mEndCaretVisible = aVisible;
   SELECTIONCARETS_LOG("Set end frame visibility %s",
-                      (mStartCaretVisible ? "shown" : "hidden"));
+                      (mEndCaretVisible ? "shown" : "hidden"));
 
   dom::Element* element = mPresShell->GetSelectionCaretsEndElement();
   SetElementVisibility(element, mVisible && mEndCaretVisible);
@@ -459,6 +450,11 @@
 
   // Check start and end frame is rtl or ltr text
   nsRefPtr<nsFrameSelection> fs = GetFrameSelection();
+  if (!fs) {
+    SetVisibility(false);
+    return;
+  }
+
   int32_t startOffset;
   nsIFrame* startFrame = FindFirstNodeWithFrame(mPresShell->GetDocument(),
                                                 firstRange, fs, false, startOffset);
@@ -472,14 +468,6 @@
     return;
   }
 
-  // If frame isn't editable and we don't support non-editable fields, bail
-  // out.
-  if (!kSupportNonEditableFields &&
-      (!startFrame->GetContent()->IsEditable() ||
-       !endFrame->GetContent()->IsEditable())) {
-    return;
-  }
-
   // Check if startFrame is after endFrame.
   if (nsLayoutUtils::CompareTreePosition(startFrame, endFrame) > 0) {
     SetVisibility(false);
@@ -558,12 +546,6 @@
     return NS_OK;
   }
 
-  // If frame isn't editable and we don't support non-editable fields, bail
-  // out.
-  if (!kSupportNonEditableFields && !ptFrame->GetContent()->IsEditable()) {
-    return NS_OK;
-  }
-
   nsPoint ptInFrame = mDownPoint;
   nsLayoutUtils::TransformPoint(rootFrame, ptFrame, ptInFrame);
 
@@ -603,7 +585,9 @@
 
   // Clear maintain selection otherwise we cannot select less than a word
   nsRefPtr<nsFrameSelection> fs = GetFrameSelection();
-  fs->MaintainSelection();
+  if (fs) {
+    fs->MaintainSelection();
+  }
   return rs;
 }
 
@@ -651,7 +635,7 @@
   nsPeekOffsetStruct pos(eSelectCluster,
                          dir,
                          offset,
-                         0,
+                         nsPoint(0, 0),
                          true,
                          true,  //limit on scrolled views
                          false,
@@ -693,6 +677,9 @@
   }
 
   nsRefPtr<nsFrameSelection> fs = GetFrameSelection();
+  if (!fs) {
+    return nsEventStatus_eConsumeNoDefault;
+  }
 
   nsresult result;
   nsIFrame *newFrame = nullptr;
@@ -717,6 +704,10 @@
   }
 
   nsRefPtr<dom::Selection> selection = GetSelection();
+  if (!selection) {
+    return nsEventStatus_eConsumeNoDefault;
+  }
+
   int32_t rangeCount = selection->GetRangeCount();
   if (rangeCount <= 0) {
     return nsEventStatus_eConsumeNoDefault;
@@ -767,12 +758,19 @@
   }
 
   nsRefPtr<dom::Selection> selection = GetSelection();
+  if (!selection) {
+    return 0;
+  }
+
   int32_t rangeCount = selection->GetRangeCount();
   if (rangeCount <= 0) {
     return 0;
   }
 
   nsRefPtr<nsFrameSelection> fs = GetFrameSelection();
+  if (!fs) {
+    return 0;
+  }
 
   MOZ_ASSERT(mDragMode != NONE);
   nsCOMPtr<nsIContent> node;
@@ -805,14 +803,18 @@
 SelectionCarets::SetSelectionDragState(bool aState)
 {
   nsRefPtr<nsFrameSelection> fs = GetFrameSelection();
-  fs->SetDragState(aState);
+  if (fs) {
+    fs->SetDragState(aState);
+  }
 }
 
 void
 SelectionCarets::SetSelectionDirection(bool aForward)
 {
   nsRefPtr<dom::Selection> selection = GetSelection();
-  selection->SetDirection(aForward ? eDirNext : eDirPrevious);
+  if (selection) {
+    selection->SetDirection(aForward ? eDirNext : eDirPrevious);
+  }
 }
 
 static void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/bug613807-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/bug613807-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/bug613807-1.html	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/bug613807-1.html	2014-11-26 21:46:05.000000000 +0000
@@ -81,18 +81,7 @@
       });
 
     // commit
-    synthesizeCompositionChange(
-      { composition:
-        { string: "\u732B",
-          clauses: [
-            { length: 0, attr: 0 }
-          ]
-        },
-        caret: { start: 1, length: 0 }
-      });
-
-    // end composition
-    synthesizeComposition({ type: "compositionend", data: "\u732B" });
+    synthesizeComposition({ type: "compositioncommitasis" });
 
     document.body.clientWidth;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/bug977003_inner_1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/bug977003_inner_1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/bug977003_inner_1.html	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/bug977003_inner_1.html	2014-11-26 21:46:05.000000000 +0000
@@ -3,10 +3,11 @@
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=977003
 https://bugzilla.mozilla.org/show_bug.cgi?id=1094913
+https://bugzilla.mozilla.org/show_bug.cgi?id=1098139
 -->
 <head>
   <meta charset="utf-8">
-  <title>Test for Bugs 977003, 1094913</title>
+  <title>Test for Bugs 977003, 1094913, 1098139</title>
   <meta name="author" content="Maksim Lebedev" />
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
@@ -19,9 +20,11 @@
     var test_send_got = 0;
     var test_got_async = 0;
     var test_got_type = "";
+    var test_got_primary = false;
     var test_send_lost = 0;
     var test_lost_async = 0;
     var test_lost_type = "";
+    var test_lost_primary = false;
 
     function DownHandler(event) {
       logger("Receive event: " + event.type);
@@ -35,6 +38,7 @@
       if(test_send_got)
         test_got_async++;
       test_got_type = event.pointerType;
+      test_got_primary = event.isPrimary;
       logger("Send releasePointerCapture from target");
       target.releasePointerCapture(event.pointerId);
       logger("releasePointerCapture was executed");
@@ -45,6 +49,7 @@
       if(test_send_lost)
         test_lost_async++;
       test_lost_type = event.pointerType;
+      test_lost_primary = event.isPrimary;
     }
     function logger(message) {
       console.log(message);
@@ -71,9 +76,11 @@
       parent.is(test_send_got,        1, "Part 1: gotpointercapture event should be sent once");
       parent.is(test_got_async,       1, "Part 1: gotpointercapture event should be asynchronous");
       parent.is(test_got_type,  "mouse", "Part 1: gotpointercapture event should have pointerType mouse");
+      parent.is(test_got_primary,  true, "Part 1: gotpointercapture event should have isPrimary as true");
       parent.is(test_send_lost,       1, "Part 1: lostpointercapture event should be sent once");
       parent.is(test_lost_async,      1, "Part 1: lostpointercapture event should be asynchronous");
       parent.is(test_lost_type, "mouse", "Part 1: lostpointercapture event should have pointerType mouse");
+      parent.is(test_lost_primary, true, "Part 1: lostpointercapture event should have isPrimary as true");
       logger("finishTest");
       parent.finishTest();
     }
@@ -82,6 +89,7 @@
 <body onload="prepareTest()">
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=977003">Mozilla Bug 977003 Test 1</a>
   <br><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1094913">Mozilla Bug 1094913</a>
+  <br><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1098139">Mozilla Bug 1098139</a>
   <p id="display"></p>
   <div id="content" style="display: none">
   </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/bug977003_inner_5.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/bug977003_inner_5.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/bug977003_inner_5.html	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/bug977003_inner_5.html	2014-11-26 21:46:05.000000000 +0000
@@ -4,10 +4,11 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=977003
 https://bugzilla.mozilla.org/show_bug.cgi?id=1073563
 https://bugzilla.mozilla.org/show_bug.cgi?id=1094913
+https://bugzilla.mozilla.org/show_bug.cgi?id=1098139
 -->
 <head>
   <meta charset="utf-8">
-  <title>Test for Bugs 977003, 1073563, 1094913</title>
+  <title>Test for Bugs 977003, 1073563, 1094913, 1098139</title>
   <meta name="author" content="Maksim Lebedev" />
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
@@ -21,9 +22,11 @@
     var test_down_target = false;
     var test_got_listener = false;
     var test_got_type = "";
+    var test_got_primary = false;
     var test_lost_listener = false;
     var test_lost_type = "";
     var test_listener = false;
+    var test_lost_primary = false;
 
     function TargetDownHandler(event) {
       logger("Target receive event: " + event.type);
@@ -37,11 +40,13 @@
       listener.releasePointerCapture(event.pointerId);
       test_got_listener = true;
       test_got_type = event.pointerType;
+      test_got_primary = event.isPrimary;
     }
     function ListenerLostPCHandler(event) {
       logger("Receive event on Listener: " + event.type + "(" + event.pointerType + ")");
       test_lost_listener = true;
       test_lost_type = event.pointerType;
+      test_lost_primary = event.isPrimary;
     }
     function ListenerHandler(event) {
       logger("Receive event on Listener: " + event.type);
@@ -69,17 +74,19 @@
       listener.addEventListener("pointerup",          ListenerHandler,        false);
       listener.addEventListener("pointerout",         ListenerHandler,        false);
       var rect = target.getBoundingClientRect();
-      synthesizePointer(target, rect.width/2, rect.height/2, {type: "pointerdown", inputSource: SpecialPowers.Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH});
-      synthesizePointer(target, rect.width/2, rect.height/2, {type: "pointermove", inputSource: SpecialPowers.Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH});
-      synthesizePointer(target, rect.width/2, rect.height/2, {type: "pointerup",   inputSource: SpecialPowers.Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH});
+      synthesizePointer(target, rect.width/2, rect.height/2, {type: "pointerdown", isPrimary: true, inputSource: SpecialPowers.Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH});
+      synthesizePointer(target, rect.width/2, rect.height/2, {type: "pointermove", isPrimary: true, inputSource: SpecialPowers.Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH});
+      synthesizePointer(target, rect.width/2, rect.height/2, {type: "pointerup",   isPrimary: true, inputSource: SpecialPowers.Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH});
       finishTest();
     }
     function finishTest() {
       parent.is(test_down_target,     true, "Part 5: pointerdown event should be received by target");
       parent.is(test_got_listener,    true, "Part 5: listener should receive gotpointercapture event");
       parent.is(test_got_type,     "touch", "Part 5: gotpointercapture event should have pointerType touch");
+      parent.is(test_got_primary,     true, "Part 5: gotpointercapture event should have isPrimary as true");
       parent.is(test_lost_listener,   true, "Part 5: listener should receive lostpointercapture event");
       parent.is(test_lost_type,    "touch", "Part 5: lostpointercapture event should have pointerType touch");
+      parent.is(test_lost_primary,    true, "Part 5: lostpointercapture event should have isPrimary as true");
       parent.is(test_listener,       false, "Part 5: listener should not receive any other events");
       logger("finishTest");
       parent.finishTest();
@@ -90,6 +97,7 @@
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=977003">Mozilla Bug 977003 Test 5</a>
   <br><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1073563">Mozilla Bug 1073563</a>
   <br><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1094913">Mozilla Bug 1094913</a>
+  <br><a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1098139">Mozilla Bug 1098139</a>
   <p id="display"></p>
   <div id="content" style="display: none">
   </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py	2014-11-26 21:46:05.000000000 +0000
@@ -7,6 +7,7 @@
 from marionette import Actions
 from marionette_test import MarionetteTestCase
 from selection import SelectionManager
+from gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsMultipleRangeTest(MarionetteTestCase):
@@ -36,10 +37,6 @@
         self._sel6 = self.marionette.find_element(By.ID, 'sel6')
         self._nonsel1 = self.marionette.find_element(By.ID, 'nonsel1')
 
-    def _long_press_without_contextmenu(self, el, x, y):
-        return self.actions.press(el, x, y).move_by_offset(0, 0).\
-            wait(self._long_press_time).release()
-
     def _long_press_to_select_word(self, el, wordOrdinal):
         sel = SelectionManager(el)
         original_content = sel.content
@@ -61,7 +58,7 @@
         # Long press the caret position. Selection carets should appear, and the
         # word will be selected. On Windows, those spaces after the word
         # will also be selected.
-        self._long_press_without_contextmenu(el, x, y).perform()
+        long_press_without_contextmenu(self.marionette, el, self._long_press_time, x, y)
 
     def _to_unix_line_ending(self, s):
         """Changes all Windows/Mac line endings in s to UNIX line endings."""
@@ -74,7 +71,7 @@
 
         self.openTestHtml(enabled=True)
         halfY = self._nonsel1.size['height'] / 2
-        self._long_press_without_contextmenu(self._nonsel1, 0, halfY).perform()
+        long_press_without_contextmenu(self.marionette, self._nonsel1, self._long_press_time, 0, halfY)
         sel = SelectionManager(self._nonsel1)
         range_count = sel.range_count()
         self.assertEqual(range_count, 0)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/marionette/test_selectioncarets.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/marionette/test_selectioncarets.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/tests/marionette/test_selectioncarets.py	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/tests/marionette/test_selectioncarets.py	2014-11-26 21:46:05.000000000 +0000
@@ -7,6 +7,7 @@
 from marionette import Actions
 from marionette_test import MarionetteTestCase
 from selection import SelectionManager
+from gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsTest(MarionetteTestCase):
@@ -48,7 +49,7 @@
         # Long press the caret position. Selection carets should appear, and the
         # first word will be selected. On Windows, those spaces after the word
         # will also be selected.
-        self.actions.long_press(el, self._long_press_time, x, y).perform()
+        long_press_without_contextmenu(self.marionette, el, self._long_press_time, x, y)
 
     def _test_long_press_to_select_a_word(self, el, assertFunc):
         sel = SelectionManager(el)
@@ -216,5 +217,4 @@
     ########################################################################
     def test_content_non_editable_minimum_select_one_character_by_selection(self):
         self.openTestHtml(enabled=True)
-        # Currently, selection carets do not show on non-editable elements.
-        self._test_minimum_select_one_character(self._content, self.assertNotEqual)
+        self._test_minimum_select_one_character(self._content, self.assertEqual)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/Units.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/Units.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/base/Units.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/base/Units.h	2014-11-26 21:46:04.000000000 +0000
@@ -27,18 +27,7 @@
 struct LayerPixel;
 struct RenderTargetPixel;
 struct ScreenPixel;
-// The layer coordinates of the parent frame.
-// This can be arrived at in three ways:
-//   - Start with the CSS coordinates of the parent frame, multiply by the
-//     device scale and the cumulative resolution of the parent frame.
-//   - Start with the CSS coordinates of current frame, multiply by the device
-//     scale, the cumulative resolution of the current frame, and the scales
-//     from the CSS and async transforms of the current frame.
-//   - Start with global screen coordinates and unapply all CSS and async
-//     transforms from the root down to and including the parent.
-// It's helpful to look at https://wiki.mozilla.org/Platform/GFX/APZ#Coordinate_systems
-// to get a picture of how the various coordinate systems relate to each other.
-struct ParentLayerPixel {};
+struct ParentLayerPixel;
 
 template<> struct IsPixel<CSSPixel>          : TrueType {};
 template<> struct IsPixel<LayoutDevicePixel> : TrueType {};
@@ -247,6 +236,12 @@
     return FromUntyped(aRect.ToNearestPixels(aAppUnitsPerDevPixel));
   }
 
+  static LayoutDeviceIntSize FromAppUnitsRounded(const nsSize& aSize, nscoord aAppUnitsPerDevPixel) {
+    return LayoutDeviceIntSize(
+      NSAppUnitsToIntPixels(aSize.width, aAppUnitsPerDevPixel),
+      NSAppUnitsToIntPixels(aSize.height, aAppUnitsPerDevPixel));
+  }
+
   static nsSize ToAppUnits(const LayoutDeviceIntSize& aSize, nscoord aAppUnitsPerDevPixel) {
     return nsSize(aSize.width * aAppUnitsPerDevPixel,
                   aSize.height * aAppUnitsPerDevPixel);
@@ -339,6 +334,24 @@
   }
 };
 
+/* The layer coordinates of the parent frame.
+ * This can be arrived at in three ways:
+ *   - Start with the CSS coordinates of the parent frame, multiply by the
+ *     device scale and the cumulative resolution of the parent frame.
+ *   - Start with the CSS coordinates of current frame, multiply by the device
+ *     scale, the cumulative resolution of the current frame, and the scales
+ *     from the CSS and async transforms of the current frame.
+ *   - Start with global screen coordinates and unapply all CSS and async
+ *     transforms from the root down to and including the parent.
+ * It's helpful to look at https://wiki.mozilla.org/Platform/GFX/APZ#Coordinate_systems
+ * to get a picture of how the various coordinate systems relate to each other.
+ */
+struct ParentLayerPixel {
+  static nsIntRect ToUntyped(const ParentLayerIntRect& aRect) {
+    return nsIntRect(aRect.x, aRect.y, aRect.width, aRect.height);
+  }
+};
+
 // Operators to apply ScaleFactors directly to Coords, Points, Rects, Sizes and Margins
 
 template<class src, class dst>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/build/nsLayoutModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/build/nsLayoutModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/build/nsLayoutModule.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/build/nsLayoutModule.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -1129,10 +1129,7 @@
   { "@mozilla.org/content/post-content-iterator;1", &kNS_CONTENTITERATOR_CID },
   { "@mozilla.org/content/pre-content-iterator;1", &kNS_PRECONTENTITERATOR_CID },
   { "@mozilla.org/content/subtree-content-iterator;1", &kNS_SUBTREEITERATOR_CID },
-  { "@mozilla.org/content/canvas-rendering-context;1?id=experimental-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
-#ifdef MOZ_WEBGL_CONFORMANT
   { "@mozilla.org/content/canvas-rendering-context;1?id=webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
-#endif
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "application/xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "application/xhtml+xml", &kNS_TEXT_ENCODER_CID },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/crashtests/1102791.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/crashtests/1102791.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/crashtests/1102791.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/crashtests/1102791.html	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<html class="reftest-print"><head>
+    <meta charset="utf-8">
+    <title>Testcase for bug 1102791</title>
+    <style type="text/css">
+
+html,body {
+    color:black; background-color:white; font-size:16px; padding:0; margin:0;
+}
+
+button {
+  position: absolute;
+  -moz-appearance: none;
+  background: transparent;
+  padding: 0;
+  border-style:none;
+}
+button::before {
+  position: absolute;
+  content: "::before";
+  width: 10px;
+  height: 200em;
+  border: 1px solid black;
+}
+
+    </style>
+</head>
+<body>
+
+<button></button>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/crashtests/399262.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/crashtests/399262.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/crashtests/399262.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/crashtests/399262.html	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,50 @@
+<style>
+select::first-letter, option::first-letter { color:green; }
+.block select, .block option{ display:block; }
+.scroll select, .scroll option{ display:block; overflow:hidden; }
+</style>
+
+<select></select>
+<select>F</select>
+<select>Ff</select>
+<select><option>F</select>
+<select><option>Ff</select>
+
+<div class="block">
+<select></select>
+<select>F</select>
+<select>Ff</select>
+<select><option>F</select>
+<select><option>Ff</select>
+</div>
+
+<div class="scroll">
+<select></select>
+<select>F</select>
+<select>Ff</select>
+<select><option>F</select>
+<select><option>Ff</select>
+</div>
+
+<select size=2></select>
+<select size=2>F</select>
+<select size=2>Ff</select>
+<select size=2><option>F</select>
+<select size=2><option>Ff</select>
+
+<div class="block">
+<select size=2></select>
+<select size=2>F</select>
+<select size=2>Ff</select>
+<select size=2><option>F</select>
+<select size=2><option>Ff</select>
+</div>
+
+<div class="scroll">
+<select size=2></select>
+<select size=2>F</select>
+<select size=2>Ff</select>
+<select size=2><option>F</select>
+<select size=2><option>Ff</select>
+</div>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/crashtests/crashtests.list	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/crashtests/crashtests.list	2014-11-26 21:46:05.000000000 +0000
@@ -33,6 +33,7 @@
 load 388374-2.html
 load 393656-1.xhtml
 load 393656-2.xhtml
+load 399262.html
 load 402852-1.html
 load 403148-1.html
 load 404118-1.html
@@ -58,3 +59,4 @@
 load 949891.xhtml
 load 959311.html
 load 960277-2.html
+load 1102791.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/nsFileControlFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/nsFileControlFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/nsFileControlFrame.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/nsFileControlFrame.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -187,7 +187,22 @@
   }
 
   nsCOMPtr<nsIDOMDragEvent> dragEvent = do_QueryInterface(aEvent);
-  if (!dragEvent || !IsValidDropData(dragEvent)) {
+  if (!dragEvent) {
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIDOMDataTransfer> dataTransfer;
+  dragEvent->GetDataTransfer(getter_AddRefs(dataTransfer));
+  if (!IsValidDropData(dataTransfer)) {
+    return NS_OK;
+  }
+
+
+  nsIContent* content = mFrame->GetContent();
+  bool supportsMultiple = content && content->HasAttr(kNameSpaceID_None, nsGkAtoms::multiple);
+  if (!CanDropTheseFiles(dataTransfer, supportsMultiple)) {
+    dataTransfer->SetDropEffect(NS_LITERAL_STRING("none"));
+    aEvent->StopPropagation();
     return NS_OK;
   }
 
@@ -203,15 +218,11 @@
     aEvent->StopPropagation();
     aEvent->PreventDefault();
 
-    nsIContent* content = mFrame->GetContent();
     NS_ASSERTION(content, "The frame has no content???");
 
     HTMLInputElement* inputElement = HTMLInputElement::FromContent(content);
     NS_ASSERTION(inputElement, "No input element for this file upload control frame!");
 
-    nsCOMPtr<nsIDOMDataTransfer> dataTransfer;
-    dragEvent->GetDataTransfer(getter_AddRefs(dataTransfer));
-
     nsCOMPtr<nsIDOMFileList> fileList;
     dataTransfer->GetFiles(getter_AddRefs(fileList));
 
@@ -225,11 +236,9 @@
 }
 
 /* static */ bool
-nsFileControlFrame::DnDListener::IsValidDropData(nsIDOMDragEvent* aEvent)
+nsFileControlFrame::DnDListener::IsValidDropData(nsIDOMDataTransfer* aDOMDataTransfer)
 {
-  nsCOMPtr<nsIDOMDataTransfer> domDataTransfer;
-  aEvent->GetDataTransfer(getter_AddRefs(domDataTransfer));
-  nsCOMPtr<DataTransfer> dataTransfer = do_QueryInterface(domDataTransfer);
+  nsCOMPtr<DataTransfer> dataTransfer = do_QueryInterface(aDOMDataTransfer);
   NS_ENSURE_TRUE(dataTransfer, false);
 
   // We only support dropping files onto a file upload control
@@ -237,6 +246,23 @@
   return types->Contains(NS_LITERAL_STRING("Files"));
 }
 
+/* static */ bool
+nsFileControlFrame::DnDListener::CanDropTheseFiles(nsIDOMDataTransfer* aDOMDataTransfer,
+                                                   bool aSupportsMultiple)
+{
+  nsCOMPtr<DataTransfer> dataTransfer = do_QueryInterface(aDOMDataTransfer);
+  NS_ENSURE_TRUE(dataTransfer, false);
+
+  nsCOMPtr<nsIDOMFileList> fileList;
+  dataTransfer->GetFiles(getter_AddRefs(fileList));
+
+  uint32_t listLength = 0;
+  if (fileList) {
+    fileList->GetLength(&listLength);
+  }
+  return listLength <= 1 || aSupportsMultiple;
+}
+
 nscoord
 nsFileControlFrame::GetMinISize(nsRenderingContext *aRenderingContext)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/nsFileControlFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/nsFileControlFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/nsFileControlFrame.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/nsFileControlFrame.h	2014-11-26 21:46:05.000000000 +0000
@@ -14,7 +14,7 @@
 #include "nsCOMPtr.h"
 
 class nsTextControlFrame;
-class nsIDOMDragEvent;
+class nsIDOMDataTransfer;
 
 class nsFileControlFrame : public nsBlockFrame,
                            public nsIFormControlFrame,
@@ -117,7 +117,8 @@
 
     NS_DECL_NSIDOMEVENTLISTENER
 
-    static bool IsValidDropData(nsIDOMDragEvent* aEvent);
+    static bool IsValidDropData(nsIDOMDataTransfer* aDOMDataTransfer);
+    static bool CanDropTheseFiles(nsIDOMDataTransfer* aDOMDataTransfer, bool aSupportsMultiple);
   };
 
   virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -203,6 +203,11 @@
   FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize,
                                  aReflowState, aStatus);
 
+  // We're always complete and we don't support overflow containers
+  // so we shouldn't have a next-in-flow ever.
+  aStatus = NS_FRAME_COMPLETE;
+  MOZ_ASSERT(!GetNextInFlow());
+
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/429458.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/429458.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/429458.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/429458.xhtml	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml">
+
+<head>
+
+<bindings xmlns="http://www.mozilla.org/xbl">
+  <binding id="foo">
+    <content><html:span><children xmlns="http://www.mozilla.org/xbl"/></html:span></content>
+  </binding>
+</bindings>
+
+<script type="text/javascript">
+
+function boom()
+{
+  var s = document.getAnonymousNodes(document.body)[0];
+  s.appendChild(document.createTextNode("apples and oranges"));
+  document.body.offsetHeight;
+  document.body.appendChild(document.createTextNode("\n\n"));
+}
+
+</script>
+
+</head>
+
+<body onload="boom();" style="-moz-binding: url('#foo'); width: 1px; word-spacing: 1px;"></body>
+
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/429960-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/429960-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/429960-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/429960-1.html	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html style="direction: rtl;" contenteditable="true">
+<head>
+<script type="text/javascript">
+
+function boom()
+{
+  document.body.firstChild.style.MozColumnCount = "3";
+}
+
+</script>
+</head>
+
+<body style="width: 1px;" onload="boom();"><div>examination<span style="font-family: verdana;">x x x x  </span></div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/429960-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/429960-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/429960-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/429960-2.html	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html style="direction: rtl;" contenteditable="true">
+<head>
+<script type="text/javascript">
+
+function boom()
+{
+  document.body.firstChild.style.MozColumnCount = "3";
+}
+
+</script>
+</head>
+
+<body style="width: 1px;" onload="boom();"><div>examination<span style="font-family: verdana;">x x x x 
+</span></div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/430991.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/430991.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/430991.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/430991.html	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script type="text/javascript">
+
+function boom()
+{
+  var li = document.getElementById("li");
+  li.removeChild(li.lastChild);
+}
+
+</script>
+</head>
+
+<body onload="boom();">
+
+<ul id="ul">
+<li id="li" style="-moz-column-count: -1; white-space: pre-wrap;"><span>A</span><span>B</span><span style="float: right;"></span>
+
+</li>
+</ul>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/472957.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/472957.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/472957.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/472957.xhtml	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,14 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<head>
+
+<bindings xmlns="http://www.mozilla.org/xbl">
+  <binding id="b">
+    <content><xul:hbox><children/></xul:hbox></content>
+  </binding>  
+</bindings>
+
+</head>
+
+<body><xul:listboxbody height="168178912813" style="-moz-binding: url(#b);"><xul:iframe/></xul:listboxbody></body>
+
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/622596.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/622596.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/622596.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/622596.html	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,6 @@
+<script>
+t2 = window.open();
+t2.document.documentElement.childNodes.item(undefined).contentEditable = true;
+t2.getSelection().containsNode([], false);
+t2.close()
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/crashtests/crashtests.list	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/crashtests/crashtests.list	2014-11-26 21:46:06.000000000 +0000
@@ -261,12 +261,16 @@
 load 426040-1.html
 load 426272-1.html
 load 428263-1.html
+load 429458.xhtml
+load 429960-1.html
+load 429960-2.html
 load 429969-1.html
 load 429981-1.html
 load 430332-1.html
 load 430344-1.html
 load 430352-1.html
 load 430744-1.html
+load 430991.html
 load 431260-1.html
 load 431260-2.html
 load 435529.html
@@ -330,6 +334,7 @@
 load 472774-1.html
 load 472776-1.html
 load 472950-1.html
+load 472957.xhtml
 load 473278-1.xhtml
 load 473894-1.html
 load 476241-1.html
@@ -430,6 +435,7 @@
 load 619021.html
 load 621424-1.html
 load 621841-1.html
+load 622596.html
 load 645072-1.html
 load 645072-2.html
 load 646561-1.html
@@ -473,7 +479,7 @@
 load 737313-3.html
 load 747688.html
 load 750066.html
-test-pref(font.size.inflation.emPerLine,15) asserts-if(!browserIsRemote,1-100) load font-inflation-762332.html # bug 762332
+pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) asserts-if(!browserIsRemote,1-100) load font-inflation-762332.html # bug 762332
 load 762902.html
 load 762764-1.html
 load 765409.html
@@ -509,9 +515,9 @@
 load 840818.html
 load 812822-1.html
 load 812893.html
-asserts(1) load 824297-1.html # bug 399262
+load 824297-1.html
 load 826483-1.html
-asserts(1) load 826532-1.html # bug 399262
+load 826532-1.html
 load 827168-1.html
 load 836895.html
 load 837007.xhtml
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -132,7 +132,8 @@
                           aConstrainHeight, kidFrame, kidStatus,
                           aOverflowAreas);
       nsIFrame* nextFrame = kidFrame->GetNextInFlow();
-      if (!NS_FRAME_IS_FULLY_COMPLETE(kidStatus)) {
+      if (!NS_FRAME_IS_FULLY_COMPLETE(kidStatus) &&
+          aDelegatingFrame->IsFrameOfType(nsIFrame::eCanContainOverflowContainers)) {
         // Need a continuation
         if (!nextFrame) {
           nextFrame =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBlockFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBlockFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBlockFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBlockFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -296,7 +296,7 @@
 NS_DECLARE_FRAME_PROPERTY_FRAMELIST(PushedFloatProperty)
 NS_DECLARE_FRAME_PROPERTY_FRAMELIST(OutsideBulletProperty)
 NS_DECLARE_FRAME_PROPERTY(InsideBulletProperty, nullptr)
-NS_DECLARE_FRAME_PROPERTY(BottomEdgeOfChildrenProperty, nullptr)
+NS_DECLARE_FRAME_PROPERTY(BlockEndEdgeOfChildrenProperty, nullptr)
 
 //----------------------------------------------------------------------
 
@@ -1048,7 +1048,7 @@
     if (GetLogicalSkipSides().BStart()) {
       blockDirExtras.BStart(wm) = 0;
     } else {
-      // Bottom margin never causes us to create continuations, so we
+      // Block-end margin never causes us to create continuations, so we
       // don't need to worry about whether it fits in its entirety.
       blockDirExtras.BStart(wm) +=
         aReflowState.ComputedLogicalMargin().BStart(wm);
@@ -1206,11 +1206,11 @@
     WritingMode wm = aReflowState.GetWritingMode();
     bool havePosition = nsLayoutUtils::GetFirstLinePosition(wm, this,
                                                             &position);
-    nscoord lineTop = havePosition ?
+    nscoord lineBStart = havePosition ?
       position.mBStart :
       reflowState->ComputedLogicalBorderPadding().BStart(wm);
     nsIFrame* bullet = GetOutsideBullet();
-    ReflowBullet(bullet, state, metrics, lineTop);
+    ReflowBullet(bullet, state, metrics, lineBStart);
     NS_ASSERTION(!BulletIsEmpty() || metrics.BSize(wm) == 0,
                  "empty bullet took up space");
 
@@ -1225,7 +1225,8 @@
       bbox.BStart(wm) = position.mBaseline - metrics.BlockStartAscent();
       bullet->SetRect(wm, bbox, metrics.Width());
     }
-    // Otherwise just leave the bullet where it is, up against our top padding.
+    // Otherwise just leave the bullet where it is, up against our
+    // block-start padding.
   }
 
   CheckFloats(state);
@@ -1369,7 +1370,7 @@
     printf(": status=%x (%scomplete) metrics=%d,%d carriedMargin=%d",
            aStatus, NS_FRAME_IS_COMPLETE(aStatus) ? "" : "not ",
            aMetrics.ISize(parentWM), aMetrics.BSize(parentWM),
-           aMetrics.mCarriedOutBottomMargin.get());
+           aMetrics.mCarriedOutBEndMargin.get());
     if (HasOverflowAreas()) {
       printf(" overflow-vis={%d,%d,%d,%d}",
              aMetrics.VisualOverflow().x,
@@ -1452,42 +1453,42 @@
                                               aReflowState.ComputedISize()),
                          borderPadding.IEnd(wm));
 
-  // Return bottom margin information
+  // Return block-end margin information
   // rbs says he hit this assertion occasionally (see bug 86947), so
   // just set the margin to zero and we'll figure out why later
-  //NS_ASSERTION(aMetrics.mCarriedOutBottomMargin.IsZero(),
+  //NS_ASSERTION(aMetrics.mCarriedOutBEndMargin.IsZero(),
   //             "someone else set the margin");
   nscoord nonCarriedOutBDirMargin = 0;
   if (!aState.GetFlag(BRS_ISBENDMARGINROOT)) {
     // Apply rule from CSS 2.1 section 8.3.1. If we have some empty
-    // line with clearance and a non-zero top margin and all
+    // line with clearance and a non-zero block-start margin and all
     // subsequent lines are empty, then we do not allow our children's
-    // carried out bottom margin to be carried out of us and collapse
-    // with our own bottom margin.
+    // carried out block-end margin to be carried out of us and collapse
+    // with our own block-end margin.
     if (CheckForCollapsedBEndMarginFromClearanceLine()) {
       // Convert the children's carried out margin to something that
       // we will include in our height
       nonCarriedOutBDirMargin = aState.mPrevBEndMargin.get();
       aState.mPrevBEndMargin.Zero();
     }
-    aMetrics.mCarriedOutBottomMargin = aState.mPrevBEndMargin;
+    aMetrics.mCarriedOutBEndMargin = aState.mPrevBEndMargin;
   } else {
-    aMetrics.mCarriedOutBottomMargin.Zero();
+    aMetrics.mCarriedOutBEndMargin.Zero();
   }
 
   nscoord blockEndEdgeOfChildren = aState.mBCoord + nonCarriedOutBDirMargin;
   // Shrink wrap our height around our contents.
   if (aState.GetFlag(BRS_ISBENDMARGINROOT) ||
       NS_UNCONSTRAINEDSIZE != aReflowState.ComputedBSize()) {
-    // When we are a bottom-margin root make sure that our last
-    // childs bottom margin is fully applied. We also do this when
+    // When we are a block-end-margin root make sure that our last
+    // childs block-end margin is fully applied. We also do this when
     // we have a computed height, since in that case the carried out
     // margin is not going to be applied anywhere, so we should note it
     // here to be included in the overflow area.
     // Apply the margin only if there's space for it.
     if (blockEndEdgeOfChildren < aState.mReflowState.AvailableBSize())
     {
-      // Truncate bottom margin if it doesn't fit to our available height.
+      // Truncate block-end margin if it doesn't fit to our available BSize.
       blockEndEdgeOfChildren =
         std::min(blockEndEdgeOfChildren + aState.mPrevBEndMargin.get(),
                aState.mReflowState.AvailableBSize());
@@ -1495,7 +1496,7 @@
   }
   if (aState.GetFlag(BRS_FLOAT_MGR)) {
     // Include the float manager's state to properly account for the
-    // bottom margin of any floated elements; e.g., inside a table cell.
+    // block-end margin of any floated elements; e.g., inside a table cell.
     nscoord floatHeight =
       aState.ClearFloats(blockEndEdgeOfChildren, NS_STYLE_CLEAR_BOTH,
                          nullptr, nsFloatManager::DONT_CLEAR_PUSHED_FLOATS);
@@ -1527,16 +1528,16 @@
       // height in the current frame, not whether it's last-in-flow.
     }
 
-    // Don't carry out a bottom margin when our height is fixed.
-    aMetrics.mCarriedOutBottomMargin.Zero();
+    // Don't carry out a block-end margin when our BSize is fixed.
+    aMetrics.mCarriedOutBEndMargin.Zero();
   }
   else if (NS_FRAME_IS_COMPLETE(aState.mReflowStatus)) {
     nscoord contentBSize = blockEndEdgeOfChildren - borderPadding.BStart(wm);
     nscoord autoBSize = aReflowState.ApplyMinMaxHeight(contentBSize);
     if (autoBSize != contentBSize) {
       // Our min-height or max-height made our height change.  Don't carry out
-      // our kids' bottom margins.
-      aMetrics.mCarriedOutBottomMargin.Zero();
+      // our kids' block-end margins.
+      aMetrics.mCarriedOutBEndMargin.Zero();
     }
     autoBSize += borderPadding.BStart(wm) + borderPadding.BEnd(wm);
     finalSize.BSize(wm) = autoBSize;
@@ -1566,10 +1567,10 @@
 
   FrameProperties properties = Properties();
   if (blockEndEdgeOfChildren != finalSize.BSize(wm) - borderPadding.BEnd(wm)) {
-    properties.Set(BottomEdgeOfChildrenProperty(),
+    properties.Set(BlockEndEdgeOfChildrenProperty(),
                    NS_INT32_TO_PTR(blockEndEdgeOfChildren));
   } else {
-    properties.Delete(BottomEdgeOfChildrenProperty());
+    properties.Delete(BlockEndEdgeOfChildrenProperty());
   }
 
   aMetrics.SetSize(wm, finalSize);
@@ -1583,25 +1584,45 @@
 }
 
 static void
-ConsiderBottomEdgeOfChildren(nscoord aBottomEdgeOfChildren,
-                             nsOverflowAreas& aOverflowAreas)
+ConsiderBlockEndEdgeOfChildren(const WritingMode aWritingMode,
+                               nscoord aBEndEdgeOfChildren,
+                               nsOverflowAreas& aOverflowAreas)
 {
-  // Factor in the bottom edge of the children.  Child frames will be added
+  // Factor in the block-end edge of the children.  Child frames will be added
   // to the overflow area as we iterate through the lines, but their margins
-  // won't, so we need to account for bottom margins here.
+  // won't, so we need to account for block-end margins here.
   // REVIEW: For now, we do this for both visual and scrollable area,
   // although when we make scrollable overflow area not be a subset of
   // visual, we can change this.
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-    nsRect& o = aOverflowAreas.Overflow(otype);
-    o.height = std::max(o.YMost(), aBottomEdgeOfChildren) - o.y;
+  // XXX Currently, overflow areas are stored as physical rects, so we have
+  // to handle writing modes explicitly here. If we change overflow rects
+  // to be stored logically, this can be simplified again.
+  if (aWritingMode.IsVertical()) {
+    if (aWritingMode.IsVerticalLR()) {
+      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+        nsRect& o = aOverflowAreas.Overflow(otype);
+        o.width = std::max(o.XMost(), aBEndEdgeOfChildren) - o.x;
+      }
+    } else {
+      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+        nsRect& o = aOverflowAreas.Overflow(otype);
+        nscoord xmost = o.XMost();
+        o.x = std::min(o.x, xmost - aBEndEdgeOfChildren);
+        o.width = xmost - o.x;
+      }
+    }
+  } else {
+    NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+      nsRect& o = aOverflowAreas.Overflow(otype);
+      o.height = std::max(o.YMost(), aBEndEdgeOfChildren) - o.y;
+    }
   }
 }
 
 void
 nsBlockFrame::ComputeOverflowAreas(const nsRect&         aBounds,
                                    const nsStyleDisplay* aDisplay,
-                                   nscoord               aBottomEdgeOfChildren,
+                                   nscoord               aBEndEdgeOfChildren,
                                    nsOverflowAreas&      aOverflowAreas)
 {
   // Compute the overflow areas of our children
@@ -1625,7 +1646,8 @@
       areas.UnionAllWith(outsideBullet->GetRect());
     }
 
-    ConsiderBottomEdgeOfChildren(aBottomEdgeOfChildren, areas);
+    ConsiderBlockEndEdgeOfChildren(GetWritingMode(),
+                                   aBEndEdgeOfChildren, areas);
   }
 
 #ifdef NOISY_COMBINED_AREA
@@ -1679,10 +1701,11 @@
                                     kPrincipalList | kFloatList);
 
   bool found;
-  nscoord bottomEdgeOfChildren = NS_PTR_TO_INT32(
-    Properties().Get(BottomEdgeOfChildrenProperty(), &found));
+  nscoord blockEndEdgeOfChildren = NS_PTR_TO_INT32(
+    Properties().Get(BlockEndEdgeOfChildrenProperty(), &found));
   if (found) {
-    ConsiderBottomEdgeOfChildren(bottomEdgeOfChildren, overflowAreas);
+    ConsiderBlockEndEdgeOfChildren(GetWritingMode(),
+                                   blockEndEdgeOfChildren, overflowAreas);
   }
 
   return FinishAndStoreOverflow(overflowAreas, GetSize());
@@ -2077,7 +2100,7 @@
         // Reflow the line if it might not have clearance anymore.
         if (newBCoord == curBCoord
             // aState.mBCoord is the clearance point which should be the
-            // top border-edge of the block frame. If sliding the
+            // block-start border-edge of the block frame. If sliding the
             // block by deltaBCoord isn't going to put it in the predicted
             // position, then we'd better reflow the line.
             || newBCoord != line->BStart() + deltaBCoord) {
@@ -2156,9 +2179,9 @@
     }
 
     if (needToRecoverState && line->IsDirty()) {
-      // We need to reconstruct the bottom margin only if we didn't
+      // We need to reconstruct the block-end margin only if we didn't
       // reflow the previous line and we do need to reflow (or repair
-      // the top position of) the next line.
+      // the block-start position of) the next line.
       aState.ReconstructMarginBefore(line);
     }
 
@@ -2227,22 +2250,22 @@
       // Test to see whether the margin that should be carried out
       // to the next line (NL) might have changed. In ReflowBlockFrame
       // we call nextLine->MarkPreviousMarginDirty if the block's
-      // actual carried-out bottom margin changed. So here we only
+      // actual carried-out block-end margin changed. So here we only
       // need to worry about the following effects:
       // 1) the line was just created, and it might now be blocking
-      // a carried-out bottom margin from previous lines that
+      // a carried-out block-end margin from previous lines that
       // used to reach NL from reaching NL
       // 2) the line used to be empty, and is now not empty,
-      // thus blocking a carried-out bottom margin from previous lines
+      // thus blocking a carried-out block-end margin from previous lines
       // that used to reach NL from reaching NL
       // 3) the line wasn't empty, but now is, so a carried-out
-      // bottom margin from previous lines that didn't used to reach NL
+      // block-end margin from previous lines that didn't used to reach NL
       // now does
       // 4) the line might have changed in a way that affects NL's
       // ShouldApplyBStartMargin decision. The three things that matter
-      // are the line's emptiness, its adjacency to the top of the block,
-      // and whether it has clearance (the latter only matters if the block
-      // was and is adjacent to the top and empty).
+      // are the line's emptiness, its adjacency to the block-start edge of the
+      // block, and whether it has clearance (the latter only matters if the
+      // block was and is adjacent to the block-start and empty).
       //
       // If the line is empty now, we can't reliably tell if the line was empty
       // before, so we just assume it was and do nextLine->MarkPreviousMarginDirty.
@@ -2956,8 +2979,8 @@
   if (!aState.IsAdjacentWithTop() ||
       aChildFrame->StyleBorder()->mBoxDecorationBreak ==
         NS_STYLE_BOX_DECORATION_BREAK_CLONE) {
-    // If we aren't at the top Y coordinate then something of non-zero
-    // height must have been placed. Therefore the childs top-margin
+    // If we aren't at the start block-coordinate then something of non-zero
+    // height must have been placed. Therefore the childs block-start margin
     // applies.
     aState.SetFlag(BRS_APPLYBSTARTMARGIN, true);
     return true;
@@ -2971,11 +2994,11 @@
   while (line != aLine) {
     if (!line->CachedIsEmpty() || line->HasClearance()) {
       // A line which precedes aLine is non-empty, or has clearance,
-      // so therefore the top margin applies.
+      // so therefore the block-start margin applies.
       aState.SetFlag(BRS_APPLYBSTARTMARGIN, true);
       return true;
     }
-    // No need to apply the top margin if the line has floats.  We
+    // No need to apply the block-start margin if the line has floats.  We
     // should collapse anyway (bug 44419)
     ++line;
     aState.SetFlag(BRS_HAVELINEADJACENTTOTOP, true);
@@ -2983,7 +3006,7 @@
   }
 
   // The line being reflowed is "essentially" the first line in the
-  // block. Therefore its top-margin will be collapsed by the
+  // block. Therefore its block-start margin will be collapsed by the
   // generational collapsing logic with its parent (us).
   return false;
 }
@@ -3015,9 +3038,9 @@
   // Clear past floats before the block if the clear style is not none
   aLine->SetBreakTypeBefore(breakType);
 
-  // See if we should apply the top margin. If the block frame being
+  // See if we should apply the block-start margin. If the block frame being
   // reflowed is a continuation (non-null prev-in-flow) then we don't
-  // apply its top margin because it's not significant unless it has
+  // apply its block-start margin because it's not significant unless it has
   // 'box-decoration-break:clone'.  Otherwise, dig deeper.
   bool applyBStartMargin = (frame->StyleBorder()->mBoxDecorationBreak ==
                               NS_STYLE_BOX_DECORATION_BREAK_CLONE ||
@@ -3025,7 +3048,7 @@
                            ShouldApplyBStartMargin(aState, aLine, frame);
   if (applyBStartMargin) {
     // The HasClearance setting is only valid if ShouldApplyBStartMargin
-    // returned false (in which case the top-margin-root set our
+    // returned false (in which case the block-start margin-root set our
     // clearance flag). Otherwise clear it now. We'll set it later on
     // ourselves if necessary.
     aLine->ClearHasClearance();
@@ -3039,8 +3062,8 @@
     replacedBlock = frame;
   }
 
-  // If our top margin was counted as part of some parents top-margin
-  // collapse and we are being speculatively reflowed assuming this
+  // If our block-start margin was counted as part of some parent's block-start
+  // margin collapse, and we are being speculatively reflowed assuming this
   // frame DID NOT need clearance, then we need to check that
   // assumption.
   if (!treatWithClearance && !applyBStartMargin && mightClearFloats &&
@@ -3080,19 +3103,19 @@
     bool mayNeedRetry = false;
     bool clearedFloats = false;
     if (applyBStartMargin) {
-      // Precompute the blocks top margin value so that we can get the
+      // Precompute the blocks block-start margin value so that we can get the
       // correct available space (there might be a float that's
       // already been placed below the aState.mPrevBEndMargin
 
-      // Setup a reflowState to get the style computed margin-top
+      // Setup a reflowState to get the style computed block-start margin
       // value. We'll use a reason of `resize' so that we don't fudge
       // any incremental reflow state.
 
       // The availSpace here is irrelevant to our needs - all we want
-      // out if this setup is the margin-top value which doesn't depend
+      // out if this setup is the block-start margin value which doesn't depend
       // on the childs available space.
-      // XXX building a complete nsHTMLReflowState just to get the margin-top
-      // seems like a waste. And we do this for almost every block!
+      // XXX building a complete nsHTMLReflowState just to get the block-start
+      // margin seems like a waste. And we do this for almost every block!
       WritingMode wm = frame->GetWritingMode();
       LogicalSize availSpace = aState.ContentSize(wm);
       availSpace.BSize(wm) = NS_UNCONSTRAINEDSIZE;
@@ -3117,7 +3140,7 @@
 
       if (clearanceFrame) {
         // Don't allow retries on the second pass. The clearance decisions for the
-        // blocks whose top-margins collapse with ours are now fixed.
+        // blocks whose block-start margins collapse with ours are now fixed.
         mayNeedRetry = false;
       }
 
@@ -3173,7 +3196,7 @@
         // Note that negative clearance is possible
         clearance = aState.mBCoord - (currentBCoord + bStartMargin);
 
-        // Add clearance to our top margin while we compute available
+        // Add clearance to our block-start margin while we compute available
         // space for the frame
         bStartMargin += clearance;
 
@@ -3200,14 +3223,14 @@
 
     // The check for
     //   (!aState.mReflowState.mFlags.mIsTopOfPage || clearedFloats)
-    // is to some degree out of paranoia:  if we reliably eat up top
+    // is to some degree out of paranoia:  if we reliably eat up block-start
     // margins at the top of the page as we ought to, it wouldn't be
     // needed.
     if ((!aState.mReflowState.mFlags.mIsTopOfPage || clearedFloats) &&
         availSpace.BSize(wm) < 0) {
       // We know already that this child block won't fit on this
-      // page/column due to the top margin or the clearance.  So we need
-      // to get out of here now.  (If we don't, most blocks will handle
+      // page/column due to the block-start margin or the clearance.  So we
+      // need to get out of here now.  (If we don't, most blocks will handle
       // things fine, and report break-before, but zero-height blocks
       // won't, and will thus make their parent overly-large and force
       // *it* to be pushed in its entirety.)
@@ -3393,7 +3416,7 @@
             }
             *aKeepReflowGoing = false;
             
-            // The bottom margin for a block is only applied on the last
+            // The block-end margin for a block is only applied on the last
             // flow block. Since we just continued the child block frame,
             // we know that line->mFirstChild is not the last flow block
             // therefore zero out the running margin value.
@@ -3494,7 +3517,7 @@
   aLine->SetLineIsImpactedByFloat(false);
 
   // Setup initial coordinate system for reflowing the inline frames
-  // into. Apply a previous block frame's bottom margin first.
+  // into. Apply a previous block frame's block-end margin first.
   if (ShouldApplyBStartMargin(aState, aLine, aLine->mFirstChild)) {
     aState.mBCoord += aState.mPrevBEndMargin.get();
   }
@@ -3505,7 +3528,7 @@
     nscoord availableSpaceHeight = 0;
     do {
       bool allowPullUp = true;
-      nsIContent* forceBreakInContent = nullptr;
+      nsIFrame* forceBreakInFrame = nullptr;
       int32_t forceBreakOffset = -1;
       gfxBreakPriority forceBreakPriority = gfxBreakPriority::eNoBreak;
       do {
@@ -3524,8 +3547,8 @@
                                 aState.mReflowState.mFloatManager,
                                 &aState.mReflowState, &aLine);
         lineLayout.Init(&aState, aState.mMinLineHeight, aState.mLineNumber);
-        if (forceBreakInContent) {
-          lineLayout.ForceBreakAtPosition(forceBreakInContent, forceBreakOffset);
+        if (forceBreakInFrame) {
+          lineLayout.ForceBreakAtPosition(forceBreakInFrame, forceBreakOffset);
         }
         DoReflowInlineFrames(aState, lineLayout, aLine,
                              floatAvailableSpace, availableSpaceHeight,
@@ -3537,13 +3560,14 @@
             LINE_REFLOW_REDO_MORE_FLOATS == lineReflowStatus ||
             LINE_REFLOW_REDO_NEXT_BAND == lineReflowStatus) {
           if (lineLayout.NeedsBackup()) {
-            NS_ASSERTION(!forceBreakInContent, "Backing up twice; this should never be necessary");
+            NS_ASSERTION(!forceBreakInFrame, "Backing up twice; this should never be necessary");
             // If there is no saved break position, then this will set
-            // set forceBreakInContent to null and we won't back up, which is
+            // set forceBreakInFrame to null and we won't back up, which is
             // correct.
-            forceBreakInContent = lineLayout.GetLastOptionalBreakPosition(&forceBreakOffset, &forceBreakPriority);
+            forceBreakInFrame =
+              lineLayout.GetLastOptionalBreakPosition(&forceBreakOffset, &forceBreakPriority);
           } else {
-            forceBreakInContent = nullptr;
+            forceBreakInFrame = nullptr;
           }
           // restore the float manager state
           aState.mReflowState.mFloatManager->PopState(&floatManagerState);
@@ -3650,7 +3674,8 @@
   if (aFloatAvailableSpace.mHasFloats) {
     // There is a soft break opportunity at the start of the line, because
     // we can always move this line down below float(s).
-    if (aLineLayout.NotifyOptionalBreakPosition(frame->GetContent(), 0, true, gfxBreakPriority::eNormalBreak)) {
+    if (aLineLayout.NotifyOptionalBreakPosition(
+            frame, 0, true, gfxBreakPriority::eNormalBreak)) {
       lineReflowStatus = LINE_REFLOW_REDO_NEXT_BAND;
     }
   }
@@ -3722,11 +3747,12 @@
     // We need to try backing up to before a text run
     int32_t offset;
     gfxBreakPriority breakPriority;
-    nsIContent* breakContent = aLineLayout.GetLastOptionalBreakPosition(&offset, &breakPriority);
+    nsIFrame* breakFrame =
+      aLineLayout.GetLastOptionalBreakPosition(&offset, &breakPriority);
     // XXX It's possible, in fact not unusual, for the break opportunity to already
     // be the end of the line. We should detect that and optimize to not
     // re-do the line.
-    if (breakContent) {
+    if (breakFrame) {
       // We can back up!
       lineReflowStatus = LINE_REFLOW_REDO_NO_PULL;
     }
@@ -4283,9 +4309,9 @@
 
   // Inline lines do not have margins themselves; however they are
   // impacted by prior block margins. If this line ends up having some
-  // height then we zero out the previous bottom margin value that was
+  // height then we zero out the previous block-end margin value that was
   // already applied to the line's starting Y coordinate. Otherwise we
-  // leave it be so that the previous blocks bottom margin can be
+  // leave it be so that the previous blocks block-end margin can be
   // collapsed with a block that follows.
   nscoord newBCoord;
 
@@ -5895,7 +5921,7 @@
     nsCollapsingMargin margin;
     bool mayNeedRetry = false;
     floatRS.mDiscoveredClearance = nullptr;
-    // Only first in flow gets a top margin.
+    // Only first in flow gets a block-start margin.
     if (!aFloat->GetPrevInFlow()) {
       brc.ComputeCollapsedBStartMargin(floatRS, &margin,
                                        clearanceFrame,
@@ -6561,20 +6587,23 @@
 #ifdef DEBUG
     // The only times a block that is an anonymous box is allowed to have a
     // first-letter frame are when it's the block inside a non-anonymous cell,
-    // the block inside a fieldset, a scrolled content block, or a column
-    // content block.  Note that this means that blocks which are the anonymous
-    // block in {ib} splits do NOT get first-letter frames.  Note that
-    // NS_BLOCK_HAS_FIRST_LETTER_STYLE gets set on all continuations of the
-    // block.
+    // the block inside a fieldset, button or column set, or a scrolled content
+    // block, except for <select>.  Note that this means that blocks which are
+    // the anonymous block in {ib} splits do NOT get first-letter frames.
+    // Note that NS_BLOCK_HAS_FIRST_LETTER_STYLE gets set on all continuations
+    // of the block.
     nsIAtom *pseudo = StyleContext()->GetPseudo();
     bool haveFirstLetterStyle =
       (!pseudo ||
        (pseudo == nsCSSAnonBoxes::cellContent &&
         GetParent()->StyleContext()->GetPseudo() == nullptr) ||
        pseudo == nsCSSAnonBoxes::fieldsetContent ||
-       pseudo == nsCSSAnonBoxes::scrolledContent ||
+       pseudo == nsCSSAnonBoxes::buttonContent ||
        pseudo == nsCSSAnonBoxes::columnContent ||
+       (pseudo == nsCSSAnonBoxes::scrolledContent &&
+        GetParent()->GetType() != nsGkAtoms::listControlFrame) ||
        pseudo == nsCSSAnonBoxes::mozSVGText) &&
+      GetType() != nsGkAtoms::comboboxControlFrame &&
       !IsFrameOfType(eMathML) &&
       nsRefPtr<nsStyleContext>(GetFirstLetterStyle(presContext)) != nullptr;
     NS_ASSERTION(haveFirstLetterStyle ==
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBlockReflowContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBlockReflowContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBlockReflowContext.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBlockReflowContext.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -351,7 +351,7 @@
   WritingMode wm = aReflowState.GetWritingMode();
   WritingMode parentWM = mMetrics.GetWritingMode();
   if (NS_FRAME_IS_COMPLETE(aReflowStatus)) {
-    aBEndMarginResult = mMetrics.mCarriedOutBottomMargin;
+    aBEndMarginResult = mMetrics.mCarriedOutBEndMargin;
     aBEndMarginResult.Include(aReflowState.ComputedLogicalMargin().BEnd(wm));
   } else {
     // The used bottom-margin is set to zero above a break.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBlockReflowContext.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBlockReflowContext.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBlockReflowContext.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBlockReflowContext.h	2014-11-26 21:46:06.000000000 +0000
@@ -46,7 +46,7 @@
                   nsReflowStatus           aReflowStatus);
 
   nsCollapsingMargin& GetCarriedOutBEndMargin() {
-    return mMetrics.mCarriedOutBottomMargin;
+    return mMetrics.mCarriedOutBEndMargin;
   }
 
   const nsHTMLReflowMetrics& GetMetrics() const {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBulletFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBulletFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBulletFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBulletFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -318,8 +318,7 @@
                   padding.top + aPt.y,
                   mRect.width - (padding.left + padding.right),
                   mRect.height - (padding.top + padding.bottom));
-      Rect devPxRect =
-        NSRectToSnappedRect(rect, appUnitsPerDevPixel, *drawTarget);
+      Rect devPxRect = NSRectToRect(rect, appUnitsPerDevPixel);
       RefPtr<PathBuilder> builder = drawTarget->CreatePathBuilder();
       AppendEllipseToPath(builder, devPxRect.Center(), devPxRect.Size());
       RefPtr<Path> ellipse = builder->Finish();
@@ -659,7 +658,7 @@
   if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
     nsCOMPtr<imgIContainer> image;
     aRequest->GetImage(getter_AddRefs(image));
-    return OnStartContainer(aRequest, image);
+    return OnSizeAvailable(aRequest, image);
   }
 
   if (aType == imgINotificationObserver::FRAME_UPDATE) {
@@ -734,8 +733,8 @@
                        : nullptr;
 }
 
-nsresult nsBulletFrame::OnStartContainer(imgIRequest *aRequest,
-                                         imgIContainer *aImage)
+nsresult
+nsBulletFrame::OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage)
 {
   if (!aImage) return NS_ERROR_INVALID_ARG;
   if (!aRequest) return NS_ERROR_INVALID_ARG;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBulletFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBulletFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsBulletFrame.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsBulletFrame.h	2014-11-26 21:46:06.000000000 +0000
@@ -108,7 +108,7 @@
   already_AddRefed<imgIContainer> GetImage() const;
 
 protected:
-  nsresult OnStartContainer(imgIRequest *aRequest, imgIContainer *aImage);
+  nsresult OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage);
 
   void AppendSpacingToPadding(nsFontMetrics* aFontMetrics);
   void GetDesiredSize(nsPresContext* aPresContext,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsCanvasFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsCanvasFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsCanvasFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsCanvasFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -286,11 +286,13 @@
 
 #ifdef MOZ_DUMP_PAINTING
 void
-nsDisplayCanvasBackgroundColor::WriteDebugInfo(nsACString& aTo)
+nsDisplayCanvasBackgroundColor::WriteDebugInfo(std::stringstream& aStream)
 {
-  aTo += nsPrintfCString(" (rgba %d,%d,%d,%d)",
-          NS_GET_R(mColor), NS_GET_G(mColor),
-          NS_GET_B(mColor), NS_GET_A(mColor));
+  aStream << " (rgba "
+          << (int)NS_GET_R(mColor) << ","
+          << (int)NS_GET_G(mColor) << ","
+          << (int)NS_GET_B(mColor) << ","
+          << (int)NS_GET_A(mColor) << ")";
 }
 #endif
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsCanvasFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsCanvasFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsCanvasFrame.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsCanvasFrame.h	2014-11-26 21:46:06.000000000 +0000
@@ -214,7 +214,7 @@
 
   NS_DISPLAY_DECL_NAME("CanvasBackgroundColor", TYPE_CANVAS_BACKGROUND_COLOR)
 #ifdef MOZ_DUMP_PAINTING
-  virtual void WriteDebugInfo(nsACString& aTo) MOZ_OVERRIDE;
+  virtual void WriteDebugInfo(std::stringstream& aStream) MOZ_OVERRIDE;
 #endif
 
 private:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsColumnSetFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsColumnSetFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsColumnSetFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsColumnSetFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -572,12 +572,12 @@
 #ifdef DEBUG_roc
       printf("*** Reflowed child #%d %p: status = %d, desiredSize=%d,%d CarriedOutBottomMargin=%d\n",
              columnCount, (void*)child, aStatus, kidDesiredSize.Width(), kidDesiredSize.Height(),
-             kidDesiredSize.mCarriedOutBottomMargin.get());
+             kidDesiredSize.mCarriedOutBEndMargin.get());
 #endif
 
       NS_FRAME_TRACE_REFLOW_OUT("Column::Reflow", aStatus);
 
-      *aBottomMarginCarriedOut = kidDesiredSize.mCarriedOutBottomMargin;
+      *aBottomMarginCarriedOut = kidDesiredSize.mCarriedOutBEndMargin;
       
       FinishReflowChild(child, PresContext(), kidDesiredSize,
                         &kidReflowState, childOrigin.x, childOrigin.y, 0);
@@ -1030,7 +1030,7 @@
 
   FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize, aReflowState, aStatus, false);
 
-  aDesiredSize.mCarriedOutBottomMargin = carriedOutBottomMargin;
+  aDesiredSize.mCarriedOutBEndMargin = carriedOutBottomMargin;
 
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/PathHelpers.h"
 
 #include "nsCOMPtr.h"
 #include "nsFrameList.h"
@@ -102,6 +103,12 @@
 using namespace mozilla::layers;
 using namespace mozilla::layout;
 
+namespace mozilla {
+namespace gfx {
+class VRHMDInfo;
+}
+}
+
 // Struct containing cached metrics for box-wrapped frames.
 struct nsBoxLayoutMetrics
 {
@@ -130,6 +137,11 @@
 #define FORCE_SELECTION_UPDATE 1
 #define CALC_DEBUG             0
 
+// This is faster than nsBidiPresUtils::IsFrameInParagraphDirection,
+// because it uses the frame pointer passed in without drilling down to
+// the leaf frame.
+#define REVERSED_DIRECTION_FRAME(frame) \
+  (!IS_SAME_DIRECTION(NS_GET_EMBEDDING_LEVEL(frame), NS_GET_BASE_LEVEL(frame)))
 
 #include "nsILineIterator.h"
 
@@ -585,6 +597,10 @@
                  "root frame should always be a container");
   }
 
+  if (aContent && aContent->GetProperty(nsGkAtoms::vr_state) != nullptr) {
+    AddStateBits(NS_FRAME_HAS_VR_CONTENT);
+  }
+
   DidSetStyleContext(nullptr);
 
   if (::IsBoxWrapped(this))
@@ -1448,6 +1464,8 @@
 void nsDisplaySelectionOverlay::Paint(nsDisplayListBuilder* aBuilder,
                                       nsRenderingContext* aCtx)
 {
+  DrawTarget& aDrawTarget = *aCtx->GetDrawTarget();
+
   LookAndFeel::ColorID colorID;
   if (mSelectionValue == nsISelectionController::SELECTION_ON) {
     colorID = LookAndFeel::eColorID_TextSelectBackground;
@@ -1457,19 +1475,16 @@
     colorID = LookAndFeel::eColorID_TextSelectBackgroundDisabled;
   }
 
-  nscolor color = LookAndFeel::GetColor(colorID, NS_RGB(255, 255, 255));
-
-  gfxRGBA c(color);
+  Color c = Color::FromABGR(LookAndFeel::GetColor(colorID, NS_RGB(255, 255, 255)));
   c.a = .5;
-
-  gfxContext *ctx = aCtx->ThebesContext();
-  ctx->SetColor(c);
+  ColorPattern color(ToDeviceColor(c));
 
   nsIntRect pxRect =
     mVisibleRect.ToOutsidePixels(mFrame->PresContext()->AppUnitsPerDevPixel());
-  ctx->NewPath();
-  ctx->Rectangle(gfxRect(pxRect.x, pxRect.y, pxRect.width, pxRect.height), true);
-  ctx->Fill();
+  Rect rect(pxRect.x, pxRect.y, pxRect.width, pxRect.height);
+  MaybeSnapToDevicePixels(rect, aDrawTarget);
+
+  aDrawTarget.FillRect(rect, color);
 }
 
 /********************************************************
@@ -1990,6 +2005,12 @@
 
   nsDisplayListBuilder::AutoBuildingDisplayList
     buildingDisplayList(aBuilder, this, dirtyRect, true);
+
+  mozilla::gfx::VRHMDInfo* vrHMDInfo = nullptr;
+  if ((GetStateBits() & NS_FRAME_HAS_VR_CONTENT)) {
+    vrHMDInfo = static_cast<mozilla::gfx::VRHMDInfo*>(mContent->GetProperty(nsGkAtoms::vr_state));
+  }
+
   DisplayListClipState::AutoSaveRestore clipState(aBuilder);
 
   if (isTransformed || useOpacity || useBlendMode || usingSVGEffects || useStickyPosition) {
@@ -2150,6 +2171,13 @@
     }
   }
 
+  /* If we're doing VR rendering, then we need to wrap everything in a nsDisplayVR
+   */
+  if (vrHMDInfo && !resultList.IsEmpty()) {
+    resultList.AppendNewToTop(
+      new (aBuilder) nsDisplayVR(aBuilder, this, &resultList, vrHMDInfo));
+  }
+
   /* If adding both a nsDisplayBlendContainer and a nsDisplayMixBlendMode to the
    * same list, the nsDisplayBlendContainer should be added first. This only
    * happens when the element creating this stacking context has mix-blend-mode
@@ -2320,7 +2348,8 @@
     // but the spec says it acts like the rest of these
     || disp->mChildPerspective.GetUnit() == eStyleUnit_Coord
     || disp->mMixBlendMode != NS_STYLE_BLEND_NORMAL
-    || nsSVGIntegrationUtils::UsingEffectsForFrame(child);
+    || nsSVGIntegrationUtils::UsingEffectsForFrame(child)
+    || (child->GetStateBits() & NS_FRAME_HAS_VR_CONTENT);
 
   bool isPositioned = disp->IsPositioned(child);
   bool isStackingContext =
@@ -2390,6 +2419,22 @@
       // THIS IS THE COMMON CASE.
       // Not a pseudo or real stacking context. Do the simple thing and
       // return early.
+
+      if (aBuilder->IsBuildingLayerEventRegions()) {
+        MOZ_ASSERT(buildingForChild.GetPrevAnimatedGeometryRoot() ==
+                   aBuilder->FindAnimatedGeometryRootFor(child->GetParent()));
+
+        // If this frame has a different animated geometry root than its parent,
+        // make sure we accumulate event regions for its layer.
+        nsIFrame *animatedGeometryRoot = aBuilder->FindAnimatedGeometryRootFor(child);
+        if (animatedGeometryRoot != buildingForChild.GetPrevAnimatedGeometryRoot()) {
+          nsDisplayLayerEventRegions* eventRegions =
+            new (aBuilder) nsDisplayLayerEventRegions(aBuilder, child);
+          aBuilder->SetLayerEventRegions(eventRegions);
+          aLists.BorderBackground()->AppendNewToTop(eventRegions);
+        }
+      }
+
       nsDisplayLayerEventRegions* eventRegions = aBuilder->GetLayerEventRegions();
       if (eventRegions) {
         eventRegions->AddFrame(aBuilder, child);
@@ -3047,7 +3092,7 @@
     nsPeekOffsetStruct pos(eSelectCharacter,
                            eDirNext,
                            aStartPos,
-                           0,
+                           nsPoint(0, 0),
                            aJumpLines,
                            true,  //limit on scrolled views
                            false,
@@ -3063,7 +3108,7 @@
   nsPeekOffsetStruct startpos(aAmountBack,
                               eDirPrevious,
                               baseOffset,
-                              0,
+                              nsPoint(0, 0),
                               aJumpLines,
                               true,  //limit on scrolled views
                               false,
@@ -3075,7 +3120,7 @@
   nsPeekOffsetStruct endpos(aAmountForward,
                             eDirNext,
                             aStartPos,
-                            0,
+                            nsPoint(0, 0),
                             aJumpLines,
                             true,  //limit on scrolled views
                             false,
@@ -5405,7 +5450,7 @@
     ClearOverflowRects();
     aMetrics.ClearSize();
     aMetrics.SetBlockStartAscent(0);
-    aMetrics.mCarriedOutBottomMargin.Zero();
+    aMetrics.mCarriedOutBEndMargin.Zero();
     aMetrics.mOverflowAreas.Clear();
 
     if (GetNextInFlow()) {
@@ -5574,8 +5619,15 @@
       pseudoTag->ToString(atomString);
       aTo += nsPrintfCString("%s", NS_LossyConvertUTF16toASCII(atomString).get());
     }
-    if (GetParent() && mStyleContext->GetParent() != GetParent()->StyleContext()) {
-      aTo += nsPrintfCString(",parent=%p", mStyleContext->GetParent());
+    if (!mStyleContext->GetParent() ||
+        (GetParent() && GetParent()->StyleContext() != mStyleContext->GetParent())) {
+      aTo += nsPrintfCString("^%p", mStyleContext->GetParent());
+      if (mStyleContext->GetParent()) {
+        aTo += nsPrintfCString("^%p", mStyleContext->GetParent()->GetParent());
+        if (mStyleContext->GetParent()->GetParent()) {
+          aTo += nsPrintfCString("^%p", mStyleContext->GetParent()->GetParent()->GetParent());
+        }
+      }
     }
   }
   aTo += "]";
@@ -5900,7 +5952,18 @@
     if (newContent){
       int32_t newOffset = newContent->IndexOf(mContent);
 
-      bool isRTL = (NS_GET_EMBEDDING_LEVEL(this) & 1) == 1;
+      // Find the direction of the frame from the EmbeddingLevelProperty,
+      // which is the resolved bidi level set in
+      // nsBidiPresUtils::ResolveParagraph (odd levels = right-to-left).
+      // If the embedding level isn't set, just use the CSS direction
+      // property.
+      bool hasEmbeddingLevel;
+      nsBidiLevel embeddingLevel =
+        NS_PTR_TO_INT32(Properties().Get(nsIFrame::EmbeddingLevelProperty(),
+                                         &hasEmbeddingLevel));
+      bool isRTL = hasEmbeddingLevel
+        ? IS_LEVEL_RTL(embeddingLevel)
+        : StyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL;
       if ((!isRTL && inOffset > newOffset) ||
           (isRTL && inOffset <= newOffset)) {
         pt = contentRect.TopRight();
@@ -6022,8 +6085,10 @@
       nsPoint offset;
       nsView * view; //used for call of get offset from view
       aBlockFrame->GetOffsetFromView(offset,&view);
-      nscoord newDesiredX  = aPos->mDesiredX - offset.x;//get desired x into blockframe coordinates!
-      result = it->FindFrameAt(searchingLine, newDesiredX, &resultFrame, &isBeforeFirstFrame, &isAfterLastFrame);
+      nsPoint newDesiredPos =
+        aPos->mDesiredPos - offset; //get desired position into blockframe coords
+      result = it->FindFrameAt(searchingLine, newDesiredPos, &resultFrame,
+                               &isBeforeFirstFrame, &isAfterLastFrame);
       if(NS_FAILED(result))
         continue;
     }
@@ -6054,8 +6119,6 @@
       nsIFrame *storeOldResultFrame = resultFrame;
       while ( !found ){
         nsPoint point;
-        point.x = aPos->mDesiredX;
-
         nsRect tempRect = resultFrame->GetRect();
         nsPoint offset;
         nsView * view; //used for call of get offset from view
@@ -6063,7 +6126,13 @@
         if (!view) {
           return NS_ERROR_FAILURE;
         }
-        point.y = tempRect.height + offset.y;
+        if (resultFrame->GetWritingMode().IsVertical()) {
+          point.y = aPos->mDesiredPos.y;
+          point.x = tempRect.width + offset.x;
+        } else {
+          point.y = tempRect.height + offset.y;
+          point.x = aPos->mDesiredPos.x;
+        }
 
         //special check. if we allow non-text selection then we can allow a hit location to fall before a table.
         //otherwise there is no way to get and click signal to fall before a table (it being a line iterator itself)
@@ -6146,7 +6215,7 @@
                                       );
       }
       while ( !found ){
-        nsPoint point(aPos->mDesiredX, 0);
+        nsPoint point = aPos->mDesiredPos;
         nsView* view;
         nsPoint offset;
         resultFrame->GetOffsetFromView(offset, &view);
@@ -6343,8 +6412,7 @@
 // Determine movement direction relative to frame
 static bool IsMovingInFrameDirection(nsIFrame* frame, nsDirection aDirection, bool aVisual)
 {
-  bool isReverseDirection = aVisual ?
-    (NS_GET_EMBEDDING_LEVEL(frame) & 1) != (NS_GET_BASE_LEVEL(frame) & 1) : false;
+  bool isReverseDirection = aVisual && REVERSED_DIRECTION_FRAME(frame);
   return aDirection == (isReverseDirection ? eDirPrevious : eDirNext);
 }
 
@@ -6638,11 +6706,14 @@
         result = it->CheckLineOrder(thisLine, &isReordered, &firstFrame, &lastFrame);
         baseFrame = endOfLine ? lastFrame : firstFrame;
         if (baseFrame) {
-          nsBidiLevel embeddingLevel = nsBidiPresUtils::GetFrameEmbeddingLevel(baseFrame);
-          // If the direction of the frame on the edge is opposite to that of the line,
-          // we'll need to drill down to its opposite end, so reverse endOfLine.
-          if ((embeddingLevel & 1) == !lineIsRTL)
+          bool frameIsRTL =
+            (nsBidiPresUtils::FrameDirection(baseFrame) == NSBIDI_RTL);
+          // If the direction of the frame on the edge is opposite to
+          // that of the line, we'll need to drill down to its opposite
+          // end, so reverse endOfLine.
+          if (frameIsRTL != lineIsRTL) {
             endOfLine = !endOfLine;
+          }
         }
       } else {
         it->GetLine(thisLine, &firstFrame, &lineFrameCount, usedRect, &lineFlags);
@@ -6863,9 +6934,9 @@
       result = it->CheckLineOrder(thisLine, &isReordered, &firstFrame, &lastFrame);
       nsIFrame** framePtr = aDirection == eDirPrevious ? &firstFrame : &lastFrame;
       if (*framePtr) {
-        nsBidiLevel embeddingLevel = nsBidiPresUtils::GetFrameEmbeddingLevel(*framePtr);
-        if ((((embeddingLevel & 1) && lineIsRTL) || (!(embeddingLevel & 1) && !lineIsRTL)) ==
-            (aDirection == eDirPrevious)) {
+        bool frameIsRTL =
+          (nsBidiPresUtils::FrameDirection(*framePtr) == NSBIDI_RTL);
+        if ((frameIsRTL == lineIsRTL) == (aDirection == eDirPrevious)) {
           nsFrame::GetFirstLeaf(presContext, framePtr);
         } else {
           nsFrame::GetLastLeaf(presContext, framePtr);
@@ -6934,11 +7005,9 @@
 
   *aOutOffset = (aDirection == eDirNext) ? 0 : -1;
 
-  if (aVisual) {
-    uint8_t newLevel = NS_GET_EMBEDDING_LEVEL(traversedFrame);
-    uint8_t newBaseLevel = NS_GET_BASE_LEVEL(traversedFrame);
-    if ((newLevel & 1) != (newBaseLevel & 1)) // The new frame is reverse-direction, go to the other end
-      *aOutOffset = -1 - *aOutOffset;
+  if (aVisual && REVERSED_DIRECTION_FRAME(traversedFrame)) {
+    // The new frame is reverse-direction, go to the other end
+    *aOutOffset = -1 - *aOutOffset;
   }
   *aOutFrame = traversedFrame;
   return NS_OK;
@@ -7718,15 +7787,33 @@
   return nullptr;
 }
 
-nsIFrame*
-nsFrame::DoGetParentStyleContextFrame() const
+nsStyleContext*
+nsFrame::DoGetParentStyleContext(nsIFrame** aProviderFrame) const
 {
-  if (mContent && !mContent->GetParent() &&
-      !StyleContext()->GetPseudo()) {
-    // we're a frame for the root.  We have no style context parent.
-    return nullptr;
+  *aProviderFrame = nullptr;
+  nsFrameManager* fm = PresContext()->FrameManager();
+  if (MOZ_LIKELY(mContent)) {
+    nsIContent* parentContent = mContent->GetFlattenedTreeParent();
+    if (MOZ_LIKELY(parentContent)) {
+      nsIAtom* pseudo = StyleContext()->GetPseudo();
+      if (!pseudo || !mContent->IsElement() ||
+          !nsCSSAnonBoxes::IsAnonBox(pseudo) ||
+          /* if next is true then it's really a request for the table frame's
+             parent context, see nsTable[Outer]Frame::GetParentStyleContext. */
+          pseudo == nsCSSAnonBoxes::tableOuter) {
+        nsStyleContext* sc = fm->GetDisplayContentsStyleFor(parentContent);
+        if (MOZ_UNLIKELY(sc)) {
+          return sc;
+        }
+      }
+    } else {
+      if (!StyleContext()->GetPseudo()) {
+        // we're a frame for the root.  We have no style context parent.
+        return nullptr;
+      }
+    }
   }
-  
+
   if (!(mState & NS_FRAME_OUT_OF_FLOW)) {
     /*
      * If this frame is an anonymous block created when an inline with a block
@@ -7736,26 +7823,27 @@
     if (mState & NS_FRAME_PART_OF_IBSPLIT) {
       nsIFrame* ibSplitSibling = GetIBSplitSiblingForAnonymousBlock(this);
       if (ibSplitSibling) {
-        return ibSplitSibling;
+        return (*aProviderFrame = ibSplitSibling)->StyleContext();
       }
     }
 
     // If this frame is one of the blocks that split an inline, we must
     // return the "special" inline parent, i.e., the parent that this
     // frame would have if we didn't mangle the frame structure.
-    return GetCorrectedParent(this);
+    *aProviderFrame = GetCorrectedParent(this);
+    return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
   }
 
   // We're an out-of-flow frame.  For out-of-flow frames, we must
   // resolve underneath the placeholder's parent.  The placeholder is
   // reached from the first-in-flow.
-  nsIFrame* placeholder = PresContext()->FrameManager()->
-                            GetPlaceholderFrameFor(FirstInFlow());
+  nsIFrame* placeholder = fm->GetPlaceholderFrameFor(FirstInFlow());
   if (!placeholder) {
     NS_NOTREACHED("no placeholder frame for out-of-flow frame");
-    return GetCorrectedParent(this);
+    *aProviderFrame = GetCorrectedParent(this);
+    return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
   }
-  return placeholder->GetParentStyleContextFrame();
+  return placeholder->GetParentStyleContext(aProviderFrame);
 }
 
 void
@@ -8618,6 +8706,19 @@
   delete static_cast<nsRegion*>(aPropertyValue);
 }
 
+/*static*/ void
+nsIFrame::DestroyContentArray(void* aPropertyValue)
+{
+  typedef nsTArray<nsIContent*> T;
+  T* arr = static_cast<T*>(aPropertyValue);
+  for (T::size_type i = 0; i < arr->Length(); ++i) {
+    nsIContent* content = (*arr)[i];
+    content->UnbindFromTree();
+    NS_RELEASE(content);
+  }
+  delete arr;
+}
+
 bool
 nsIFrame::IsPseudoStackingContextFromStyle() {
   const nsStyleDisplay* disp = StyleDisplay();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrame.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrame.h	2014-11-26 21:46:06.000000000 +0000
@@ -221,18 +221,24 @@
   virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
 #endif
 
-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE {
-    return DoGetParentStyleContextFrame();
+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE {
+    return DoGetParentStyleContext(aProviderFrame);
   }
 
   /**
    * Do the work for getting the parent style context frame so that
-   * other frame's |GetParentStyleContextFrame| methods can call this
+   * other frame's |GetParentStyleContext| methods can call this
    * method on *another* frame.  (This function handles out-of-flow
    * frames by using the frame manager's placeholder map and it also
    * handles block-within-inline and generated content wrappers.)
+   *
+   * @param aProviderFrame (out) the frame associated with the returned value
+   *     or null if the style context is for display:contents content.
+   * @return The style context that should be the parent of this frame's
+   *         style context.  Null is permitted, and means that this frame's
+   *         style context should be the root of the style context tree.
    */
-  nsIFrame* DoGetParentStyleContextFrame() const;
+  nsStyleContext* DoGetParentStyleContext(nsIFrame** aProviderFrame) const;
 
   virtual bool IsEmpty() MOZ_OVERRIDE;
   virtual bool IsSelfEmpty() MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrameList.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrameList.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrameList.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrameList.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -347,31 +347,30 @@
 {
   if (!mFirstChild)
     return nullptr;
-  
+
   nsIFrame* parent = mFirstChild->GetParent();
   if (!parent)
     return aFrame ? aFrame->GetPrevSibling() : LastChild();
 
-  nsBidiLevel baseLevel = nsBidiPresUtils::GetFrameBaseLevel(mFirstChild);  
+  nsBidiDirection paraDir = nsBidiPresUtils::ParagraphDirection(mFirstChild);
 
   nsAutoLineIterator iter = parent->GetLineIterator();
-  if (!iter) { 
+  if (!iter) {
     // Parent is not a block Frame
     if (parent->GetType() == nsGkAtoms::lineFrame) {
       // Line frames are not bidi-splittable, so need to consider bidi reordering
-      if (baseLevel == NSBIDI_LTR) {
+      if (paraDir == NSBIDI_LTR) {
         return nsBidiPresUtils::GetFrameToLeftOf(aFrame, mFirstChild, -1);
       } else { // RTL
         return nsBidiPresUtils::GetFrameToRightOf(aFrame, mFirstChild, -1);
       }
     } else {
       // Just get the next or prev sibling, depending on block and frame direction.
-      nsBidiLevel frameEmbeddingLevel = nsBidiPresUtils::GetFrameEmbeddingLevel(mFirstChild);
-      if ((frameEmbeddingLevel & 1) == (baseLevel & 1)) {
+      if (nsBidiPresUtils::IsFrameInParagraphDirection(mFirstChild)) {
         return aFrame ? aFrame->GetPrevSibling() : LastChild();
       } else {
         return aFrame ? aFrame->GetNextSibling() : mFirstChild;
-      }    
+      }
     }
   }
 
@@ -396,7 +395,7 @@
   if (aFrame) {
     iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
 
-    if (baseLevel == NSBIDI_LTR) {
+    if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
       frame = nsBidiPresUtils::GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
@@ -407,7 +406,7 @@
     // Get the last frame of the previous line
     iter->GetLine(thisLine - 1, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
 
-    if (baseLevel == NSBIDI_LTR) {
+    if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToLeftOf(nullptr, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
       frame = nsBidiPresUtils::GetFrameToRightOf(nullptr, firstFrameOnLine, numFramesOnLine);
@@ -426,22 +425,21 @@
   if (!parent)
     return aFrame ? aFrame->GetPrevSibling() : mFirstChild;
 
-  nsBidiLevel baseLevel = nsBidiPresUtils::GetFrameBaseLevel(mFirstChild);
-  
+  nsBidiDirection paraDir = nsBidiPresUtils::ParagraphDirection(mFirstChild);
+
   nsAutoLineIterator iter = parent->GetLineIterator();
   if (!iter) { 
     // Parent is not a block Frame
     if (parent->GetType() == nsGkAtoms::lineFrame) {
       // Line frames are not bidi-splittable, so need to consider bidi reordering
-      if (baseLevel == NSBIDI_LTR) {
+      if (paraDir == NSBIDI_LTR) {
         return nsBidiPresUtils::GetFrameToRightOf(aFrame, mFirstChild, -1);
       } else { // RTL
         return nsBidiPresUtils::GetFrameToLeftOf(aFrame, mFirstChild, -1);
       }
     } else {
       // Just get the next or prev sibling, depending on block and frame direction.
-      nsBidiLevel frameEmbeddingLevel = nsBidiPresUtils::GetFrameEmbeddingLevel(mFirstChild);
-      if ((frameEmbeddingLevel & 1) == (baseLevel & 1)) {
+      if (nsBidiPresUtils::IsFrameInParagraphDirection(mFirstChild)) {
         return aFrame ? aFrame->GetNextSibling() : mFirstChild;
       } else {
         return aFrame ? aFrame->GetPrevSibling() : LastChild();
@@ -469,20 +467,20 @@
 
   if (aFrame) {
     iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
-    
-    if (baseLevel == NSBIDI_LTR) {
+
+    if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
       frame = nsBidiPresUtils::GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
     }
   }
-  
+
   int32_t numLines = iter->GetNumLines();
   if (!frame && thisLine < numLines - 1) {
     // Get the first frame of the next line
     iter->GetLine(thisLine + 1, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
-    
-    if (baseLevel == NSBIDI_LTR) {
+
+    if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToRightOf(nullptr, firstFrameOnLine, numFramesOnLine);
     } else { // RTL
       frame = nsBidiPresUtils::GetFrameToLeftOf(nullptr, firstFrameOnLine, numFramesOnLine);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrameSelection.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrameSelection.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrameSelection.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrameSelection.h	2014-11-26 21:46:06.000000000 +0000
@@ -17,6 +17,7 @@
 #include "nsIDOMElement.h"
 #include "WordMovementType.h"
 #include "CaretAssociationHint.h"
+#include "nsBidiPresUtils.h"
 
 class nsRange;
 class nsTableOuterFrame;
@@ -62,7 +63,7 @@
   nsPeekOffsetStruct(nsSelectionAmount aAmount,
                      nsDirection aDirection,
                      int32_t aStartOffset,
-                     nscoord aDesiredX,
+                     nsPoint aDesiredPos,
                      bool aJumpLines,
                      bool aScrollViewStop,
                      bool aIsKeyboardSelect,
@@ -95,9 +96,10 @@
   //               Used with: eSelectCharacter, eSelectWord
   int32_t mStartOffset;
   
-  // mDesiredX: The desired x coordinate for the caret.
-  //            Used with: eSelectLine.
-  nscoord mDesiredX;
+  // mDesiredPos: The desired inline coordinate for the caret
+  //              (one of .x or .y will be used, depending on line's writing mode)
+  //              Used with: eSelectLine.
+  nsPoint mDesiredPos;
 
   // mWordMovementType: An enum that determines whether to prefer the start or end of a word
   //                    or to use the default beahvior, which is a combination of 
@@ -145,8 +147,8 @@
 {
   void SetData(nsIFrame* aFrameBefore,
                nsIFrame* aFrameAfter,
-               uint8_t aLevelBefore,
-               uint8_t aLevelAfter)
+               nsBidiLevel aLevelBefore,
+               nsBidiLevel aLevelAfter)
   {
     mFrameBefore = aFrameBefore;
     mFrameAfter = aFrameAfter;
@@ -155,8 +157,8 @@
   }
   nsIFrame* mFrameBefore;
   nsIFrame* mFrameAfter;
-  uint8_t mLevelBefore;
-  uint8_t mLevelAfter;
+  nsBidiLevel mLevelBefore;
+  nsBidiLevel mLevelAfter;
 };
 
 namespace mozilla {
@@ -403,16 +405,26 @@
    *  @param aLevel the caret bidi level
    *  This method is virtual since it gets called from outside of layout.
    */
-  virtual void SetCaretBidiLevel (uint8_t aLevel);
+  virtual void SetCaretBidiLevel(nsBidiLevel aLevel);
   /** GetCaretBidiLevel gets the caret bidi level
    *  This method is virtual since it gets called from outside of layout.
    */
-  virtual uint8_t GetCaretBidiLevel() const;
+  virtual nsBidiLevel GetCaretBidiLevel() const;
   /** UndefineCaretBidiLevel sets the caret bidi level to "undefined"
    *  This method is virtual since it gets called from outside of layout.
    */
   virtual void UndefineCaretBidiLevel();
 
+  /** PhysicalMove will generally be called from the nsiselectioncontroller implementations.
+   *  the effect being the selection will move one unit 'aAmount' in the
+   *  given aDirection.
+   * @param aDirection  the direction to move the selection
+   * @param aAmount     amount of movement (char/line; word/page; eol/doc)
+   * @param aExtend     continue selection
+   */
+  /*unsafe*/
+  nsresult PhysicalMove(int16_t aDirection, int16_t aAmount, bool aExtend);
+
   /** CharacterMove will generally be called from the nsiselectioncontroller implementations.
    *  the effect being the selection will move one character left or right.
    * @param aForward move forward in document.
@@ -554,7 +566,7 @@
    */
   nsresult GetFrameFromLevel(nsIFrame *aFrameIn,
                              nsDirection aDirection,
-                             uint8_t aBidiLevel,
+                             nsBidiLevel aBidiLevel,
                              nsIFrame **aFrameOut) const;
 
   /**
@@ -597,7 +609,7 @@
   void BidiLevelFromMove(nsIPresShell* aPresShell,
                          nsIContent *aNode,
                          uint32_t aContentOffset,
-                         uint32_t aKeycode,
+                         nsSelectionAmount aAmount,
                          CaretAssociateHint aHint);
   void BidiLevelFromClick(nsIContent *aNewFocus, uint32_t aContentOffset);
   nsPrevNextBidiLevels GetPrevNextBidiLevels(nsIContent *aNode,
@@ -631,16 +643,22 @@
 #endif /* DEBUG */
 
   void ResizeBuffer(uint32_t aNewBufSize);
+
 /*HELPER METHODS*/
-  nsresult     MoveCaret(uint32_t aKeycode, bool aContinueSelection,
-                         nsSelectionAmount aAmount);
-  nsresult     MoveCaret(uint32_t aKeycode, bool aContinueSelection,
+  // Whether MoveCaret should use logical or visual movement,
+  // or follow the bidi.edit.caret_movement_style preference.
+  enum CaretMovementStyle {
+    eLogical,
+    eVisual,
+    eUsePrefStyle
+  };
+  nsresult     MoveCaret(nsDirection aDirection, bool aContinueSelection,
                          nsSelectionAmount aAmount,
-                         bool aVisualMovement);
+                         CaretMovementStyle aMovementStyle);
 
-  nsresult     FetchDesiredX(nscoord &aDesiredX); //the x position requested by the Key Handling for up down
-  void         InvalidateDesiredX(); //do not listen to mDesiredX you must get another.
-  void         SetDesiredX(nscoord aX); //set the mDesiredX
+  nsresult     FetchDesiredPos(nsPoint &aDesiredPos); //the position requested by the Key Handling for up down
+  void         InvalidateDesiredPos(); //do not listen to mDesiredPos you must get another.
+  void         SetDesiredPos(nsPoint aPos); //set the mDesiredPos
 
   uint32_t     GetBatching() const {return mBatching; }
   bool         GetNotifyFrames() const { return mNotifyFrames; }
@@ -705,9 +723,9 @@
   int16_t mDisplaySelection; //for visual display purposes.
 
   CaretAssociateHint mHint;   //hint to tell if the selection is at the end of this line or beginning of next
-  uint8_t mCaretBidiLevel;
+  nsBidiLevel mCaretBidiLevel;
 
-  int32_t mDesiredX;
+  nsPoint mDesiredPos;
   uint32_t mDelayedMouseEventClickCount;
   bool mDelayedMouseEventIsShift;
   bool mDelayedMouseEventValid;
@@ -717,7 +735,7 @@
   bool mDragSelectingCells;
   bool mDragState;   //for drag purposes
   bool mMouseDoubleDownState; //has the doubleclick down happened
-  bool mDesiredXSet;
+  bool mDesiredPosSet;
 
   int8_t mCaretMovementStyle;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrameStateBits.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrameStateBits.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsFrameStateBits.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsFrameStateBits.h	2014-11-26 21:46:06.000000000 +0000
@@ -249,6 +249,9 @@
 // Frame has a LayerActivityProperty property
 FRAME_STATE_BIT(Generic, 54, NS_FRAME_HAS_LAYER_ACTIVITY_PROPERTY)
 
+// Frame has VR content, and needs VR display items created
+FRAME_STATE_BIT(Generic, 57, NS_FRAME_HAS_VR_CONTENT)
+
 // Set for all descendants of MathML sub/supscript elements (other than the
 // base frame) to indicate that the SSTY font feature should be used.
 FRAME_STATE_BIT(Generic, 58, NS_FRAME_MATHML_SCRIPT_DESCENDANT)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsGfxScrollFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsGfxScrollFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsGfxScrollFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsGfxScrollFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -419,37 +419,63 @@
                                        nsHTMLReflowMetrics* aMetrics,
                                        bool aFirstPass)
 {
+  WritingMode wm = mHelper.mScrolledFrame->GetWritingMode();
+
   // these could be NS_UNCONSTRAINEDSIZE ... std::min arithmetic should
   // be OK
-  const nsMargin& padding = aState->mReflowState.ComputedPhysicalPadding();
-  nscoord availWidth = aState->mReflowState.ComputedWidth() + padding.LeftRight();
-
-  nscoord computedHeight = aState->mReflowState.ComputedHeight();
-  nscoord computedMinHeight = aState->mReflowState.ComputedMinHeight();
-  nscoord computedMaxHeight = aState->mReflowState.ComputedMaxHeight();
+  LogicalMargin padding = aState->mReflowState.ComputedLogicalPadding();
+  nscoord availISize =
+    aState->mReflowState.ComputedISize() + padding.IStartEnd(wm);
+
+  nscoord computedBSize = aState->mReflowState.ComputedBSize();
+  nscoord computedMinBSize = aState->mReflowState.ComputedMinBSize();
+  nscoord computedMaxBSize = aState->mReflowState.ComputedMaxBSize();
   if (!ShouldPropagateComputedHeightToScrolledContent()) {
-    computedHeight = NS_UNCONSTRAINEDSIZE;
-    computedMinHeight = 0;
-    computedMaxHeight = NS_UNCONSTRAINEDSIZE;
-  }
-  if (aAssumeHScroll) {
-    nsSize hScrollbarPrefSize;
-    GetScrollbarMetrics(aState->mBoxState, mHelper.mHScrollbarBox,
-                        nullptr, &hScrollbarPrefSize, false);
-    if (computedHeight != NS_UNCONSTRAINEDSIZE) {
-      computedHeight = std::max(0, computedHeight - hScrollbarPrefSize.height);
-    }
-    computedMinHeight = std::max(0, computedMinHeight - hScrollbarPrefSize.height);
-    if (computedMaxHeight != NS_UNCONSTRAINEDSIZE) {
-      computedMaxHeight = std::max(0, computedMaxHeight - hScrollbarPrefSize.height);
-    }
+    computedBSize = NS_UNCONSTRAINEDSIZE;
+    computedMinBSize = 0;
+    computedMaxBSize = NS_UNCONSTRAINEDSIZE;
   }
 
-  if (aAssumeVScroll) {
-    nsSize vScrollbarPrefSize;
-    GetScrollbarMetrics(aState->mBoxState, mHelper.mVScrollbarBox,
-                        nullptr, &vScrollbarPrefSize, true);
-    availWidth = std::max(0, availWidth - vScrollbarPrefSize.width);
+  if (wm.IsVertical()) {
+    if (aAssumeVScroll) {
+      nsSize vScrollbarPrefSize;
+      GetScrollbarMetrics(aState->mBoxState, mHelper.mVScrollbarBox,
+                          nullptr, &vScrollbarPrefSize, false);
+      if (computedBSize != NS_UNCONSTRAINEDSIZE) {
+        computedBSize = std::max(0, computedBSize - vScrollbarPrefSize.width);
+      }
+      computedMinBSize = std::max(0, computedMinBSize - vScrollbarPrefSize.width);
+      if (computedMaxBSize != NS_UNCONSTRAINEDSIZE) {
+        computedMaxBSize = std::max(0, computedMaxBSize - vScrollbarPrefSize.width);
+      }
+    }
+
+    if (aAssumeHScroll) {
+      nsSize hScrollbarPrefSize;
+      GetScrollbarMetrics(aState->mBoxState, mHelper.mHScrollbarBox,
+                          nullptr, &hScrollbarPrefSize, true);
+      availISize = std::max(0, availISize - hScrollbarPrefSize.height);
+    }
+  } else {
+    if (aAssumeHScroll) {
+      nsSize hScrollbarPrefSize;
+      GetScrollbarMetrics(aState->mBoxState, mHelper.mHScrollbarBox,
+                          nullptr, &hScrollbarPrefSize, false);
+      if (computedBSize != NS_UNCONSTRAINEDSIZE) {
+        computedBSize = std::max(0, computedBSize - hScrollbarPrefSize.height);
+      }
+      computedMinBSize = std::max(0, computedMinBSize - hScrollbarPrefSize.height);
+      if (computedMaxBSize != NS_UNCONSTRAINEDSIZE) {
+        computedMaxBSize = std::max(0, computedMaxBSize - hScrollbarPrefSize.height);
+      }
+    }
+
+    if (aAssumeVScroll) {
+      nsSize vScrollbarPrefSize;
+      GetScrollbarMetrics(aState->mBoxState, mHelper.mVScrollbarBox,
+                          nullptr, &vScrollbarPrefSize, true);
+      availISize = std::max(0, availISize - vScrollbarPrefSize.width);
+    }
   }
 
   nsPresContext* presContext = PresContext();
@@ -458,16 +484,16 @@
   nsHTMLReflowState
     kidReflowState(presContext, aState->mReflowState,
                    mHelper.mScrolledFrame,
-                   LogicalSize(mHelper.mScrolledFrame->GetWritingMode(),
-                               nsSize(availWidth, NS_UNCONSTRAINEDSIZE)),
+                   LogicalSize(wm, availISize, NS_UNCONSTRAINEDSIZE),
                    -1, -1, nsHTMLReflowState::CALLER_WILL_INIT);
+  const nsMargin physicalPadding = padding.GetPhysicalMargin(wm);
   kidReflowState.Init(presContext, -1, -1, nullptr,
-                      &padding);
+                      &physicalPadding);
   kidReflowState.mFlags.mAssumingHScrollbar = aAssumeHScroll;
   kidReflowState.mFlags.mAssumingVScrollbar = aAssumeVScroll;
-  kidReflowState.SetComputedHeight(computedHeight);
-  kidReflowState.ComputedMinHeight() = computedMinHeight;
-  kidReflowState.ComputedMaxHeight() = computedMaxHeight;
+  kidReflowState.SetComputedBSize(computedBSize);
+  kidReflowState.ComputedMinBSize() = computedMinBSize;
+  kidReflowState.ComputedMaxBSize() = computedMaxBSize;
 
   // Temporarily set mHasHorizontalScrollbar/mHasVerticalScrollbar to
   // reflect our assumptions while we reflow the child.
@@ -507,8 +533,10 @@
     nsOverflowAreas childOverflow;
     nsLayoutUtils::UnionChildOverflow(mHelper.mScrolledFrame, childOverflow);
     nsRect childScrollableOverflow = childOverflow.ScrollableOverflow();
-    childScrollableOverflow.Inflate(padding);
-    nsRect contentArea = nsRect(0, 0, availWidth, computedHeight);
+    childScrollableOverflow.Inflate(padding.GetPhysicalMargin(wm));
+    nsRect contentArea =
+      wm.IsVertical() ? nsRect(0, 0, computedBSize, availISize)
+                      : nsRect(0, 0, availISize, computedBSize);
     if (!contentArea.Contains(childScrollableOverflow)) {
       aMetrics->mOverflowAreas.ScrollableOverflow() = childScrollableOverflow;
     }
@@ -1877,7 +1905,6 @@
     nsLayoutUtils::SetDisplayPortMargins(mOuter->GetContent(),
                                          mOuter->PresContext()->PresShell(),
                                          ScreenMargin(),
-                                         gfxPrefs::LayersTileWidth(), gfxPrefs::LayersTileHeight(),
                                          0,
                                          nsLayoutUtils::RepaintMode::DoNotRepaint);
   }
@@ -2852,6 +2879,8 @@
   nsRect displayPort;
   bool usingDisplayport = false;
   if (aBuilder->IsPaintingToWindow()) {
+    bool wasUsingDisplayPort = nsLayoutUtils::GetDisplayPort(mOuter->GetContent(), nullptr);
+
     if (!mIsRoot) {
       // For a non-root scroll frame, override the value of the display port
       // base rect, and possibly create a display port if there isn't one
@@ -2876,6 +2905,12 @@
     // Override the dirty rectangle if the displayport has been set.
     if (usingDisplayport) {
       dirtyRect = displayPort;
+
+      // The cached animated geometry root for the display builder is out of
+      // date if we just introduced a new animated geometry root.
+      if (!wasUsingDisplayPort) {
+        aBuilder->RecomputeCurrentAnimatedGeometryRoot();
+      }
     }
   }
 
@@ -2925,6 +2960,17 @@
       (!mIsRoot || aBuilder->RootReferenceFrame()->PresContext() != mOuter->PresContext());
   }
 
+  if (aBuilder->IsPaintingToWindow() &&
+      !mShouldBuildScrollableLayer &&
+      shouldBuildLayer)
+  {
+    if (nsDisplayLayerEventRegions *eventRegions = aBuilder->GetLayerEventRegions()) {
+      // Make sure that APZ will dispatch events back to content so we can
+      // create a displayport for this frame.
+      eventRegions->AddInactiveScrollPort(mScrollPort + aBuilder->ToReferenceFrame(mOuter));
+    }
+  }
+
   mScrollParentID = aBuilder->GetCurrentScrollParentId();
 
   nsDisplayListCollection scrolledContent;
@@ -4129,7 +4175,8 @@
     }
   }
 
-  return frame->StyleVisibility()->mDirection != NS_STYLE_DIRECTION_RTL;
+  WritingMode wm = frame->GetWritingMode();
+  return wm.IsVertical() ? wm.IsVerticalLR() : wm.IsBidiLTR();
 }
 
 bool
@@ -4585,13 +4632,21 @@
                          aPresContext->DevPixelsToAppUnits(widgetRect.height));
   }
 
-  if (!resizerRect.Contains(aRect.BottomRight() - nsPoint(1, 1)))
-    return;
-
-  if (aVertical)
-    aRect.height = std::max(0, resizerRect.y - aRect.y);
-  else
-    aRect.width = std::max(0, resizerRect.x - aRect.x);
+  if (resizerRect.Contains(aRect.BottomRight() - nsPoint(1, 1))) {
+    if (aVertical) {
+      aRect.height = std::max(0, resizerRect.y - aRect.y);
+    } else {
+      aRect.width = std::max(0, resizerRect.x - aRect.x);
+    }
+  } else if (resizerRect.Contains(aRect.BottomLeft() + nsPoint(1, -1))) {
+    if (aVertical) {
+      aRect.height = std::max(0, resizerRect.y - aRect.y);
+    } else {
+      nscoord xmost = aRect.XMost();
+      aRect.x = std::max(aRect.x, resizerRect.XMost());
+      aRect.width = xmost - aRect.x;
+    }
+  }
 }
 
 static void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsHTMLReflowMetrics.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsHTMLReflowMetrics.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsHTMLReflowMetrics.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsHTMLReflowMetrics.h	2014-11-26 21:46:06.000000000 +0000
@@ -287,9 +287,9 @@
   // of the base and the text of the superscript.
   nsBoundingMetrics mBoundingMetrics;  // [OUT]
 
-  // Carried out bottom margin values. This is the collapsed
-  // (generational) bottom margin value.
-  nsCollapsingMargin mCarriedOutBottomMargin;
+  // Carried out block-end margin values. This is the collapsed
+  // (generational) block-end margin value.
+  nsCollapsingMargin mCarriedOutBEndMargin;
 
   // For frames that have content that overflow their content area
   // (HasOverflowAreas() is true) these rectangles represent the total
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsHTMLReflowState.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsHTMLReflowState.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsHTMLReflowState.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsHTMLReflowState.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -192,6 +192,16 @@
   AvailableISize() = aAvailableSpace.ISize(mWritingMode);
   AvailableBSize() = aAvailableSpace.BSize(mWritingMode);
 
+  if (mWritingMode.IsOrthogonalTo(aParentReflowState.GetWritingMode())) {
+    // If we're setting up for an orthogonal flow, and the parent reflow state
+    // had a constrained ComputedBSize, we can use that as our AvailableISize
+    // in preference to leaving it unconstrained.
+    if (AvailableISize() == NS_UNCONSTRAINEDSIZE &&
+        aParentReflowState.ComputedBSize() != NS_UNCONSTRAINEDSIZE) {
+      AvailableISize() = aParentReflowState.ComputedBSize();
+    }
+  }
+
   mFloatManager = aParentReflowState.mFloatManager;
   if (frame->IsFrameOfType(nsIFrame::eLineParticipant))
     mLineLayout = aParentReflowState.mLineLayout;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsIFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsIFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsIFrame.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsIFrame.h	2014-11-26 21:46:06.000000000 +0000
@@ -160,14 +160,18 @@
                         // choice for movement or selection by "character"
                         // as perceived by the user
   eSelectWord      = 2,
-  eSelectLine      = 3, // previous drawn line in flow.
-  eSelectBeginLine = 4,
-  eSelectEndLine   = 5,
-  eSelectNoAmount  = 6, // just bounce back current offset.
-  eSelectParagraph = 7,  // select a "paragraph"
-  eSelectWordNoSpace = 8 // select a "word" without selecting the following
-                         // space, no matter what the default platform
-                         // behavior is
+  eSelectWordNoSpace = 3, // select a "word" without selecting the following
+                          // space, no matter what the default platform
+                          // behavior is
+  eSelectLine      = 4, // previous drawn line in flow.
+  // NOTE that selection code depends on the ordering of the above values,
+  // allowing simple <= tests to check categories of caret movement.
+  // Don't rearrange without checking the usage in nsSelection.cpp!
+
+  eSelectBeginLine = 5,
+  eSelectEndLine   = 6,
+  eSelectNoAmount  = 7, // just bounce back current offset.
+  eSelectParagraph = 8  // select a "paragraph"
 };
 
 enum nsSpread {
@@ -794,6 +798,7 @@
 
   static void DestroySurface(void* aPropertyValue);
   static void DestroyDT(void* aPropertyValue);
+  static void DestroyContentArray(void* aPropertyValue);
 
 #ifdef _MSC_VER
 // XXX Workaround MSVC issue by making the static FramePropertyDescriptor
@@ -853,6 +858,13 @@
 
   NS_DECLARE_FRAME_PROPERTY(RefusedAsyncAnimation, nullptr)
 
+  NS_DECLARE_FRAME_PROPERTY(GenConProperty, DestroyContentArray)
+
+  nsTArray<nsIContent*>* GetGenConPseudos() {
+    const FramePropertyDescriptor* prop = GenConProperty();
+    return static_cast<nsTArray<nsIContent*>*>(Properties().Get(prop));
+  }
+
   /**
    * Return the distance between the border edge of the frame and the
    * margin edge of the frame.  Like GetRect(), returns the dimensions
@@ -2474,11 +2486,13 @@
    * return a grandparent or higher!  Furthermore, if a child frame is
    * returned it must have the same GetContent() as this frame.
    *
-   * @return The frame whose style context should be the parent of this frame's
+   * @param aProviderFrame (out) the frame associated with the returned value
+   *     or nullptr if the style context is for display:contents content.
+   * @return The style context that should be the parent of this frame's
    *         style context.  Null is permitted, and means that this frame's
    *         style context should be the root of the style context tree.
    */
-  virtual nsIFrame* GetParentStyleContextFrame() const = 0;
+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const = 0;
 
   /**
    * Determines whether a frame is visible for painting;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsILineIterator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsILineIterator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsILineIterator.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsILineIterator.h	2014-11-26 21:46:06.000000000 +0000
@@ -6,7 +6,7 @@
 #define nsILineIterator_h___
 
 #include "nscore.h"
-#include "nsCoord.h"
+#include "nsPoint.h"
 #include "mozilla/Attributes.h"
 
 class nsIFrame;
@@ -49,6 +49,8 @@
    *
    * @return true if the CSS direction property for the block is
    *         "rtl", otherwise false
+   *
+   *XXX after bug 924851 change this to return a UBiDiDirection
    */
   virtual bool GetDirection() = 0;
 
@@ -80,15 +82,16 @@
   virtual int32_t FindLineContaining(nsIFrame* aFrame,
                                      int32_t aStartLine = 0) = 0;
 
-  // Given a line number and an X coordinate, find the frame on the
-  // line that is nearest to the X coordinate. The
-  // aXIsBeforeFirstFrame and aXIsAfterLastFrame flags are updated
+  // Given a line number and a coordinate, find the frame on the line
+  // that is nearest to aPos along the inline axis. (The block-axis coord
+  // of aPos is irrelevant.)
+  // The aPosIsBeforeFirstFrame and aPosIsAfterLastFrame flags are updated
   // appropriately.
   NS_IMETHOD FindFrameAt(int32_t aLineNumber,
-                         nscoord aX,
+                         nsPoint aPos,
                          nsIFrame** aFrameFound,
-                         bool* aXIsBeforeFirstFrame,
-                         bool* aXIsAfterLastFrame) = 0;
+                         bool* aPosIsBeforeFirstFrame,
+                         bool* aPosIsAfterLastFrame) = 0;
 
   // Give the line iterator implementor a chance todo something more complicated than
   // nsIFrame::GetNextSibling()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsImageFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsImageFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsImageFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsImageFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -31,6 +31,7 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsStyleCoord.h"
+#include "nsStyleUtil.h"
 #include "nsTransform2D.h"
 #include "nsImageMap.h"
 #include "nsIIOService.h"
@@ -288,11 +289,11 @@
   if (p)
     p->AdjustPriority(-1);
 
-  // If we already have an image container, OnStartContainer won't be called
+  // If we already have an image container, OnSizeAvailable won't be called.
   if (currentRequest) {
     nsCOMPtr<imgIContainer> image;
     currentRequest->GetImage(getter_AddRefs(image));
-    OnStartContainer(currentRequest, image);
+    OnSizeAvailable(currentRequest, image);
   }
 }
 
@@ -346,25 +347,36 @@
 bool
 nsImageFrame::GetSourceToDestTransform(nsTransform2D& aTransform)
 {
-  // Set the translation components.
+  // First, figure out destRect (the rect we're rendering into).
+  // NOTE: We use mComputedSize instead of just GetInnerArea()'s own size here,
+  // because GetInnerArea() might be smaller if we're fragmented, whereas
+  // mComputedSize has our full content-box size (which we need for
+  // ComputeObjectDestRect to work correctly).
+  nsRect constraintRect(GetInnerArea().TopLeft(), mComputedSize);
+  constraintRect.y -= GetContinuationOffset();
+
+  nsRect destRect = nsLayoutUtils::ComputeObjectDestRect(constraintRect,
+                                                         mIntrinsicSize,
+                                                         mIntrinsicRatio,
+                                                         StylePosition());
+  // Set the translation components, based on destRect
   // XXXbz does this introduce rounding errors because of the cast to
   // float?  Should we just manually add that stuff in every time
   // instead?
-  nsRect innerArea = GetInnerArea();
-  aTransform.SetToTranslate(float(innerArea.x),
-                            float(innerArea.y - GetContinuationOffset()));
+  aTransform.SetToTranslate(float(destRect.x),
+                            float(destRect.y));
 
-  // Set the scale factors.
+  // Set the scale factors, based on destRect and intrinsic size.
   if (mIntrinsicSize.width.GetUnit() == eStyleUnit_Coord &&
       mIntrinsicSize.width.GetCoordValue() != 0 &&
       mIntrinsicSize.height.GetUnit() == eStyleUnit_Coord &&
       mIntrinsicSize.height.GetCoordValue() != 0 &&
-      mIntrinsicSize.width.GetCoordValue() != mComputedSize.width &&
-      mIntrinsicSize.height.GetCoordValue() != mComputedSize.height) {
+      mIntrinsicSize.width.GetCoordValue() != destRect.width &&
+      mIntrinsicSize.height.GetCoordValue() != destRect.height) {
 
-    aTransform.SetScale(float(mComputedSize.width)  /
+    aTransform.SetScale(float(destRect.width)  /
                         float(mIntrinsicSize.width.GetCoordValue()),
-                        float(mComputedSize.height) /
+                        float(destRect.height) /
                         float(mIntrinsicSize.height.GetCoordValue()));
     return true;
   }
@@ -523,16 +535,18 @@
 }
 
 nsresult
-nsImageFrame::Notify(imgIRequest* aRequest, int32_t aType, const nsIntRect* aData)
+nsImageFrame::Notify(imgIRequest* aRequest,
+                     int32_t aType,
+                     const nsIntRect* aRect)
 {
   if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
     nsCOMPtr<imgIContainer> image;
     aRequest->GetImage(getter_AddRefs(image));
-    return OnStartContainer(aRequest, image);
+    return OnSizeAvailable(aRequest, image);
   }
 
   if (aType == imgINotificationObserver::FRAME_UPDATE) {
-    return OnDataAvailable(aRequest, aData);
+    return OnFrameUpdate(aRequest, aRect);
   }
 
   if (aType == imgINotificationObserver::FRAME_COMPLETE) {
@@ -544,7 +558,7 @@
     aRequest->GetImageStatus(&imgStatus);
     nsresult status =
         imgStatus & imgIRequest::STATUS_ERROR ? NS_ERROR_FAILURE : NS_OK;
-    return OnStopRequest(aRequest, status);
+    return OnLoadComplete(aRequest, status);
   }
 
   return NS_OK;
@@ -563,7 +577,7 @@
 }
 
 nsresult
-nsImageFrame::OnStartContainer(imgIRequest *aRequest, imgIContainer *aImage)
+nsImageFrame::OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage)
 {
   if (!aImage) return NS_ERROR_INVALID_ARG;
 
@@ -616,8 +630,7 @@
 }
 
 nsresult
-nsImageFrame::OnDataAvailable(imgIRequest *aRequest,
-                              const nsIntRect *aRect)
+nsImageFrame::OnFrameUpdate(imgIRequest* aRequest, const nsIntRect* aRect)
 {
   if (mFirstFrameComplete) {
     nsCOMPtr<imgIContainer> container;
@@ -625,9 +638,8 @@
     return FrameChanged(aRequest, container);
   }
 
-  // XXX do we need to make sure that the reflow from the
-  // OnStartContainer has been processed before we start calling
-  // invalidate?
+  // XXX do we need to make sure that the reflow from the OnSizeAvailable has
+  // been processed before we start calling invalidate?
 
   NS_ENSURE_ARG_POINTER(aRect);
 
@@ -662,8 +674,7 @@
 }
 
 nsresult
-nsImageFrame::OnStopRequest(imgIRequest *aRequest,
-                            nsresult aStatus)
+nsImageFrame::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus)
 {
   // Check what request type we're dealing with
   nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent);
@@ -1436,6 +1447,37 @@
   return LAYER_ACTIVE;
 }
 
+
+/* virtual */ nsRegion
+nsDisplayImage::GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
+                                bool* aSnap)
+{
+  *aSnap = true;
+  if (mImage && mImage->IsOpaque()) {
+    // OK, the entire region painted by the image is opaque. But what is that
+    // region? It's the image's "dest rect" (the rect where a full copy of
+    // the image is mapped), clipped to the container's content box (which is
+    // what GetBounds() returns). So, we grab those rects and intersect them.
+    const nsRect frameContentBox = GetBounds(aSnap);
+
+    // Note: To get the "dest rect", we have to provide the "constraint rect"
+    // (which is the content-box, with the effects of fragmentation undone).
+    nsImageFrame* imageFrame = static_cast<nsImageFrame*>(mFrame);
+    nsRect constraintRect(frameContentBox.TopLeft(),
+                          imageFrame->mComputedSize);
+    constraintRect.y -= imageFrame->GetContinuationOffset();
+
+    const nsRect destRect =
+      nsLayoutUtils::ComputeObjectDestRect(constraintRect,
+                                           imageFrame->mIntrinsicSize,
+                                           imageFrame->mIntrinsicRatio,
+                                           imageFrame->StylePosition());
+
+    return nsRegion(destRect.Intersect(frameContentBox));
+  }
+  return nsRegion();
+}
+
 already_AddRefed<Layer>
 nsDisplayImage::BuildLayer(nsDisplayListBuilder* aBuilder,
                            LayerManager* aManager,
@@ -1488,9 +1530,18 @@
   // Render the image into our content area (the area inside
   // the borders and padding)
   NS_ASSERTION(GetInnerArea().width == mComputedSize.width, "bad width");
-  nsRect inner = GetInnerArea() + aPt;
-  nsRect dest(inner.TopLeft(), mComputedSize);
-  dest.y -= GetContinuationOffset();
+
+  // NOTE: We use mComputedSize instead of just GetInnerArea()'s own size here,
+  // because GetInnerArea() might be smaller if we're fragmented, whereas
+  // mComputedSize has our full content-box size (which we need for
+  // ComputeObjectDestRect to work correctly).
+  nsRect constraintRect(aPt + GetInnerArea().TopLeft(), mComputedSize);
+  constraintRect.y -= GetContinuationOffset();
+
+  nsRect dest = nsLayoutUtils::ComputeObjectDestRect(constraintRect,
+                                                     mIntrinsicSize,
+                                                     mIntrinsicRatio,
+                                                     StylePosition());
 
   nsLayoutUtils::DrawSingleImage(*aRenderingContext.ThebesContext(),
     PresContext(), aImage,
@@ -1500,7 +1551,7 @@
   nsImageMap* map = GetImageMap();
   if (map) {
     gfxPoint devPixelOffset =
-      nsLayoutUtils::PointToGfxPoint(inner.TopLeft(),
+      nsLayoutUtils::PointToGfxPoint(dest.TopLeft(),
                                      PresContext()->AppUnitsPerDevPixel());
     AutoRestoreTransform autoRestoreTransform(drawTarget);
     drawTarget->SetTransform(
@@ -1528,8 +1579,12 @@
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
+  uint32_t clipFlags =
+    nsStyleUtil::ObjectPropsMightCauseOverflow(StylePosition()) ?
+    0 : DisplayListClipState::ASSUME_DRAWING_RESTRICTED_TO_CONTENT_RECT;
+
   DisplayListClipState::AutoClipContainingBlockDescendantsToContentBox
-    clip(aBuilder, this, DisplayListClipState::ASSUME_DRAWING_RESTRICTED_TO_CONTENT_RECT);
+    clip(aBuilder, this, clipFlags);
 
   if (mComputedSize.width != 0 && mComputedSize.height != 0) {
     nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent);
@@ -1957,6 +2012,7 @@
                                        relevant for cookies, so does not
                                        apply to icons. */
                        nullptr,      /* referrer (not relevant for icons) */
+                       mozilla::net::RP_Default,
                        nullptr,      /* principal (not relevant for icons) */
                        loadGroup,
                        gIconLoad,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsImageFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsImageFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsImageFrame.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsImageFrame.h	2014-11-26 21:46:06.000000000 +0000
@@ -221,10 +221,10 @@
 protected:
   friend class nsImageListener;
   friend class nsImageLoadingContent;
-  nsresult OnStartContainer(imgIRequest *aRequest, imgIContainer *aImage);
-  nsresult OnDataAvailable(imgIRequest *aRequest, const nsIntRect *rect);
-  nsresult OnStopRequest(imgIRequest *aRequest,
-                         nsresult aStatus);
+
+  nsresult OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage);
+  nsresult OnFrameUpdate(imgIRequest* aRequest, const nsIntRect* aRect);
+  nsresult OnLoadComplete(imgIRequest* aRequest, nsresult aStatus);
   nsresult FrameChanged(imgIRequest *aRequest,
                         imgIContainer *aContainer);
   /**
@@ -399,20 +399,14 @@
     return imageFrame->GetInnerArea() + ToReferenceFrame();
   }
 
-  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
+  virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
+                           bool* aSnap) MOZ_OVERRIDE
   {
     return GetBounds(aSnap);
   }
 
-  virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder, bool* aSnap)
-  {
-    *aSnap = true;
-    bool animated;
-    if (mImage && mImage->GetAnimated(&animated) == NS_OK && !animated && mImage->FrameIsOpaque(imgIContainer::FRAME_CURRENT)) {
-      return nsRegion(GetBounds(aSnap));
-    }
-    return nsRegion();
-  }
+  virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
+                                   bool* aSnap) MOZ_OVERRIDE;
 
   virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
                                              LayerManager* aManager,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineBox.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineBox.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineBox.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineBox.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -711,14 +711,14 @@
 
 NS_IMETHODIMP
 nsLineIterator::FindFrameAt(int32_t aLineNumber,
-                            nscoord aX,
+                            nsPoint aPos,
                             nsIFrame** aFrameFound,
-                            bool* aXIsBeforeFirstFrame,
-                            bool* aXIsAfterLastFrame)
+                            bool* aPosIsBeforeFirstFrame,
+                            bool* aPosIsAfterLastFrame)
 {
-  NS_PRECONDITION(aFrameFound && aXIsBeforeFirstFrame && aXIsAfterLastFrame,
+  NS_PRECONDITION(aFrameFound && aPosIsBeforeFirstFrame && aPosIsAfterLastFrame,
                   "null OUT ptr");
-  if (!aFrameFound || !aXIsBeforeFirstFrame || !aXIsAfterLastFrame) {
+  if (!aFrameFound || !aPosIsBeforeFirstFrame || !aPosIsAfterLastFrame) {
     return NS_ERROR_NULL_POINTER;
   }
   if ((aLineNumber < 0) || (aLineNumber >= mNumLines)) {
@@ -728,8 +728,8 @@
   nsLineBox* line = mLines[aLineNumber];
   if (!line) {
     *aFrameFound = nullptr;
-    *aXIsBeforeFirstFrame = true;
-    *aXIsAfterLastFrame = false;
+    *aPosIsBeforeFirstFrame = true;
+    *aPosIsAfterLastFrame = false;
     return NS_OK;
   }
 
@@ -737,51 +737,58 @@
     return NS_ERROR_FAILURE;
 
   nsIFrame* frame = line->mFirstChild;
-  nsIFrame* closestFromLeft = nullptr;
-  nsIFrame* closestFromRight = nullptr;
+  nsIFrame* closestFromStart = nullptr;
+  nsIFrame* closestFromEnd = nullptr;
+
+  WritingMode wm = line->mWritingMode;
+  nscoord cw = line->mContainerWidth;
+
+  LogicalPoint pos(wm, aPos, cw);
+
   int32_t n = line->GetChildCount();
   while (n--) {
-    nsRect rect = frame->GetRect();
-    if (rect.width > 0) {
-      // If aX is inside this frame - this is it
-      if (rect.x <= aX && rect.XMost() > aX) {
-        closestFromLeft = closestFromRight = frame;
+    LogicalRect rect = frame->GetLogicalRect(wm, cw);
+    if (rect.ISize(wm) > 0) {
+      // If pos.I() is inside this frame - this is it
+      if (rect.IStart(wm) <= pos.I(wm) && rect.IEnd(wm) > pos.I(wm)) {
+        closestFromStart = closestFromEnd = frame;
         break;
       }
-      if (rect.x < aX) {
-        if (!closestFromLeft || 
-            rect.XMost() > closestFromLeft->GetRect().XMost())
-          closestFromLeft = frame;
+      if (rect.IStart(wm) < pos.I(wm)) {
+        if (!closestFromStart || 
+            rect.IEnd(wm) > closestFromStart->GetLogicalRect(wm, cw).IEnd(wm))
+          closestFromStart = frame;
       }
       else {
-        if (!closestFromRight ||
-            rect.x < closestFromRight->GetRect().x)
-          closestFromRight = frame;
+        if (!closestFromEnd ||
+            rect.IStart(wm) < closestFromEnd->GetLogicalRect(wm, cw).IStart(wm))
+          closestFromEnd = frame;
       }
     }
     frame = frame->GetNextSibling();
   }
-  if (!closestFromLeft && !closestFromRight) {
+  if (!closestFromStart && !closestFromEnd) {
     // All frames were zero-width. Just take the first one.
-    closestFromLeft = closestFromRight = line->mFirstChild;
+    closestFromStart = closestFromEnd = line->mFirstChild;
   }
-  *aXIsBeforeFirstFrame = mRightToLeft ? !closestFromRight : !closestFromLeft;
-  *aXIsAfterLastFrame = mRightToLeft ? !closestFromLeft : !closestFromRight;
-  if (closestFromLeft == closestFromRight) {
-    *aFrameFound = closestFromLeft;
+  *aPosIsBeforeFirstFrame = mRightToLeft ? !closestFromEnd : !closestFromStart;
+  *aPosIsAfterLastFrame = mRightToLeft ? !closestFromStart : !closestFromEnd;
+  if (closestFromStart == closestFromEnd) {
+    *aFrameFound = closestFromStart;
   }
-  else if (!closestFromLeft) {
-    *aFrameFound = closestFromRight;
+  else if (!closestFromStart) {
+    *aFrameFound = closestFromEnd;
   }
-  else if (!closestFromRight) {
-    *aFrameFound = closestFromLeft;
+  else if (!closestFromEnd) {
+    *aFrameFound = closestFromStart;
   }
   else { // we're between two frames
-    nscoord delta = closestFromRight->GetRect().x - closestFromLeft->GetRect().XMost();
-    if (aX < closestFromLeft->GetRect().XMost() + delta/2)
-      *aFrameFound = closestFromLeft;
+    nscoord delta = closestFromEnd->GetLogicalRect(wm, cw).IStart(wm) -
+                    closestFromStart->GetLogicalRect(wm, cw).IEnd(wm);
+    if (pos.I(wm) < closestFromStart->GetLogicalRect(wm, cw).IEnd(wm) + delta/2)
+      *aFrameFound = closestFromStart;
     else
-      *aFrameFound = closestFromRight;
+      *aFrameFound = closestFromEnd;
   }
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineBox.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineBox.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineBox.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineBox.h	2014-11-26 21:46:06.000000000 +0000
@@ -1705,10 +1705,10 @@
                      uint32_t* aLineFlags) MOZ_OVERRIDE;
   virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0) MOZ_OVERRIDE;
   NS_IMETHOD FindFrameAt(int32_t aLineNumber,
-                         nscoord aX,
+                         nsPoint aPos,
                          nsIFrame** aFrameFound,
-                         bool* aXIsBeforeFirstFrame,
-                         bool* aXIsAfterLastFrame) MOZ_OVERRIDE;
+                         bool* aPosIsBeforeFirstFrame,
+                         bool* aPosIsAfterLastFrame) MOZ_OVERRIDE;
 
   NS_IMETHOD GetNextSiblingOnLine(nsIFrame*& aFrame, int32_t aLineNumber) MOZ_OVERRIDE;
   NS_IMETHOD CheckLineOrder(int32_t                  aLine,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineLayout.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineLayout.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineLayout.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineLayout.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -55,12 +55,12 @@
   : mPresContext(aPresContext),
     mFloatManager(aFloatManager),
     mBlockReflowState(aOuterReflowState),
-    mLastOptionalBreakContent(nullptr),
-    mForceBreakContent(nullptr),
+    mLastOptionalBreakFrame(nullptr),
+    mForceBreakFrame(nullptr),
     mBlockRS(nullptr),/* XXX temporary */
     mLastOptionalBreakPriority(gfxBreakPriority::eNoBreak),
-    mLastOptionalBreakContentOffset(-1),
-    mForceBreakContentOffset(-1),
+    mLastOptionalBreakFrameOffset(-1),
+    mForceBreakFrameOffset(-1),
     mMinLineBSize(0),
     mTextIndent(0),
     mFirstLetterStyleOK(false),
@@ -855,7 +855,7 @@
 
   int32_t savedOptionalBreakOffset;
   gfxBreakPriority savedOptionalBreakPriority;
-  nsIContent* savedOptionalBreakContent =
+  nsIFrame* savedOptionalBreakFrame =
     GetLastOptionalBreakPosition(&savedOptionalBreakOffset,
                                  &savedOptionalBreakPriority);
 
@@ -1021,7 +1021,7 @@
                  "How'd we get a floated inline frame? "
                  "The frame ctor should've dealt with this.");
     if (CanPlaceFrame(pfd, notSafeToBreak, continuingTextRun,
-                      savedOptionalBreakContent != nullptr, metrics,
+                      savedOptionalBreakFrame != nullptr, metrics,
                       aReflowStatus, &optionalBreakAfterFits)) {
       if (!isEmpty) {
         psd->mHasNonemptyContent = true;
@@ -1049,7 +1049,9 @@
           // record soft break opportunity after this content that can't be
           // part of a text run. This is not a text frame so we know
           // that offset INT32_MAX means "after the content".
-          if (NotifyOptionalBreakPosition(aFrame->GetContent(), INT32_MAX, optionalBreakAfterFits, gfxBreakPriority::eNormalBreak)) {
+          if (NotifyOptionalBreakPosition(aFrame, INT32_MAX,
+                                          optionalBreakAfterFits,
+                                          gfxBreakPriority::eNormalBreak)) {
             // If this returns true then we are being told to actually break here.
             aReflowStatus = NS_INLINE_LINE_BREAK_AFTER(aReflowStatus);
           }
@@ -1061,7 +1063,7 @@
       aPushedFrame = true;
       // Undo any saved break positions that the frame might have told us about,
       // since we didn't end up placing it
-      RestoreSavedBreakPosition(savedOptionalBreakContent,
+      RestoreSavedBreakPosition(savedOptionalBreakFrame,
                                 savedOptionalBreakOffset,
                                 savedOptionalBreakPriority);
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineLayout.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineLayout.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsLineLayout.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsLineLayout.h	2014-11-26 21:46:06.000000000 +0000
@@ -205,8 +205,8 @@
    * frames containing optional break points (e.g., whitespace in text frames)
    * can call SetLastOptionalBreakPosition to record where a break could
    * have been made, but wasn't because we decided to place more content on
-   * the line. For non-text frames, offset 0 means
-   * before the content, offset INT32_MAX means after the content.
+   * the line. For non-text frames, offset 0 means before the frame, offset
+   * INT32_MAX means after the frame.
    * 
    * Currently this is used to handle cases where a single word comprises
    * multiple frames, and the first frame fits on the line but the whole word
@@ -214,6 +214,8 @@
    * reflow the whole line again, forcing a break at that position. The last
    * optional break position could be in a text frame or else after a frame
    * that cannot be part of a text run, so those are the positions we record.
+   *
+   * @param aFrame the frame which contains the optional break position.
    * 
    * @param aFits set to true if the break position is within the available width.
    * 
@@ -224,30 +226,30 @@
    * @return true if we are actually reflowing with forced break position and we
    * should break here
    */
-  bool NotifyOptionalBreakPosition(nsIContent* aContent, int32_t aOffset,
-                                     bool aFits, gfxBreakPriority aPriority) {
+  bool NotifyOptionalBreakPosition(nsIFrame* aFrame, int32_t aOffset,
+                                   bool aFits, gfxBreakPriority aPriority) {
     NS_ASSERTION(!aFits || !mNeedBackup,
                   "Shouldn't be updating the break position with a break that fits after we've already flagged an overrun");
     // Remember the last break position that fits; if there was no break that fit,
     // just remember the first break
     if ((aFits && aPriority >= mLastOptionalBreakPriority) ||
-        !mLastOptionalBreakContent) {
-      mLastOptionalBreakContent = aContent;
-      mLastOptionalBreakContentOffset = aOffset;
+        !mLastOptionalBreakFrame) {
+      mLastOptionalBreakFrame = aFrame;
+      mLastOptionalBreakFrameOffset = aOffset;
       mLastOptionalBreakPriority = aPriority;
     }
-    return aContent && mForceBreakContent == aContent &&
-      mForceBreakContentOffset == aOffset;
+    return aFrame && mForceBreakFrame == aFrame &&
+      mForceBreakFrameOffset == aOffset;
   }
   /**
    * Like NotifyOptionalBreakPosition, but here it's OK for mNeedBackup
    * to be set, because the caller is merely pruning some saved break position(s)
    * that are actually not feasible.
    */
-  void RestoreSavedBreakPosition(nsIContent* aContent, int32_t aOffset,
+  void RestoreSavedBreakPosition(nsIFrame* aFrame, int32_t aOffset,
                                  gfxBreakPriority aPriority) {
-    mLastOptionalBreakContent = aContent;
-    mLastOptionalBreakContentOffset = aOffset;
+    mLastOptionalBreakFrame = aFrame;
+    mLastOptionalBreakFrameOffset = aOffset;
     mLastOptionalBreakPriority = aPriority;
   }
   /**
@@ -255,17 +257,17 @@
    */
   void ClearOptionalBreakPosition() {
     mNeedBackup = false;
-    mLastOptionalBreakContent = nullptr;
-    mLastOptionalBreakContentOffset = -1;
+    mLastOptionalBreakFrame = nullptr;
+    mLastOptionalBreakFrameOffset = -1;
     mLastOptionalBreakPriority = gfxBreakPriority::eNoBreak;
   }
   // Retrieve last set optional break position. When this returns null, no
   // optional break has been recorded (which means that the line can't break yet).
-  nsIContent* GetLastOptionalBreakPosition(int32_t* aOffset,
-                                           gfxBreakPriority* aPriority) {
-    *aOffset = mLastOptionalBreakContentOffset;
+  nsIFrame* GetLastOptionalBreakPosition(int32_t* aOffset,
+                                         gfxBreakPriority* aPriority) {
+    *aOffset = mLastOptionalBreakFrameOffset;
     *aPriority = mLastOptionalBreakPriority;
-    return mLastOptionalBreakContent;
+    return mLastOptionalBreakFrame;
   }
   
   /**
@@ -283,13 +285,13 @@
   // Record that we want to break at the given content+offset (which
   // should have been previously returned by GetLastOptionalBreakPosition
   // from another nsLineLayout).
-  void ForceBreakAtPosition(nsIContent* aContent, int32_t aOffset) {
-    mForceBreakContent = aContent;
-    mForceBreakContentOffset = aOffset;
+  void ForceBreakAtPosition(nsIFrame* aFrame, int32_t aOffset) {
+    mForceBreakFrame = aFrame;
+    mForceBreakFrameOffset = aOffset;
   }
-  bool HaveForcedBreakPosition() { return mForceBreakContent != nullptr; }
-  int32_t GetForcedBreakPosition(nsIContent* aContent) {
-    return mForceBreakContent == aContent ? mForceBreakContentOffset : -1;
+  bool HaveForcedBreakPosition() { return mForceBreakFrame != nullptr; }
+  int32_t GetForcedBreakPosition(nsIFrame* aFrame) {
+    return mForceBreakFrame == aFrame ? mForceBreakFrameOffset : -1;
   }
 
   /**
@@ -338,8 +340,8 @@
   const nsStyleText* mStyleText; // for the block
   const nsHTMLReflowState* mBlockReflowState;
 
-  nsIContent* mLastOptionalBreakContent;
-  nsIContent* mForceBreakContent;
+  nsIFrame* mLastOptionalBreakFrame;
+  nsIFrame* mForceBreakFrame;
   
   // XXX remove this when landing bug 154892 (splitting absolute positioned frames)
   friend class nsInlineFrame;
@@ -507,8 +509,8 @@
   }
 
   gfxBreakPriority mLastOptionalBreakPriority;
-  int32_t     mLastOptionalBreakContentOffset;
-  int32_t     mForceBreakContentOffset;
+  int32_t     mLastOptionalBreakFrameOffset;
+  int32_t     mForceBreakFrameOffset;
 
   nscoord mMinLineBSize;
   
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsPlaceholderFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsPlaceholderFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsPlaceholderFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsPlaceholderFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -189,15 +189,26 @@
   return mOutOfFlowFrame->CanContinueTextRun();
 }
 
-nsIFrame*
-nsPlaceholderFrame::GetParentStyleContextFrame() const
+nsStyleContext*
+nsPlaceholderFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
 {
   NS_PRECONDITION(GetParent(), "How can we not have a parent here?");
 
+  nsIContent* parentContent = mContent ? mContent->GetParent() : nullptr;
+  if (parentContent) {
+    nsStyleContext* sc =
+      PresContext()->FrameManager()->GetDisplayContentsStyleFor(parentContent);
+    if (sc) {
+      *aProviderFrame = nullptr;
+      return sc;
+    }
+  }
+
   // Lie about our pseudo so we can step out of all anon boxes and
   // pseudo-elements.  The other option would be to reimplement the
   // {ib} split gunk here.
-  return CorrectStyleParentFrame(GetParent(), nsGkAtoms::placeholderFrame);
+  *aProviderFrame = CorrectStyleParentFrame(GetParent(), nsGkAtoms::placeholderFrame);
+  return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
 }
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsPlaceholderFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsPlaceholderFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsPlaceholderFrame.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsPlaceholderFrame.h	2014-11-26 21:46:06.000000000 +0000
@@ -135,7 +135,7 @@
   }
 #endif
 
-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
 
   /**
    * @return the out-of-flow for aFrame if aFrame is a placeholder; otherwise
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsSelection.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsSelection.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsSelection.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsSelection.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -22,7 +22,6 @@
 #include "nsIDOMNode.h"
 #include "nsRange.h"
 #include "nsCOMArray.h"
-#include "nsIDOMKeyEvent.h"
 #include "nsITableCellLayout.h"
 #include "nsTArray.h"
 #include "nsTableOuterFrame.h"
@@ -49,7 +48,6 @@
 #include "mozilla/Preferences.h"
 #include "nsDOMClassInfoID.h"
 
-//included for desired x position;
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsCaret.h"
@@ -109,7 +107,7 @@
 nsPeekOffsetStruct::nsPeekOffsetStruct(nsSelectionAmount aAmount,
                                        nsDirection aDirection,
                                        int32_t aStartOffset,
-                                       nscoord aDesiredX,
+                                       nsPoint aDesiredPos,
                                        bool aJumpLines,
                                        bool aScrollViewStop,
                                        bool aIsKeyboardSelect,
@@ -118,7 +116,7 @@
   : mAmount(aAmount)
   , mDirection(aDirection)
   , mStartOffset(aStartOffset)
-  , mDesiredX(aDesiredX)
+  , mDesiredPos(aDesiredPos)
   , mWordMovementType(aWordMovementType)
   , mJumpLines(aJumpLines)
   , mScrollViewStop(aScrollViewStop)
@@ -437,57 +435,55 @@
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsFrameSelection, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(nsFrameSelection, Release)
 
-
+// Get the x (or y, in vertical writing mode) position requested
+// by the Key Handling for line-up/down
 nsresult
-nsFrameSelection::FetchDesiredX(nscoord &aDesiredX) //the x position requested by the Key Handling for up down
+nsFrameSelection::FetchDesiredPos(nsPoint &aDesiredPos)
 {
-  if (!mShell)
-  {
-    NS_ERROR("fetch desired X failed");
+  if (!mShell) {
+    NS_ERROR("fetch desired position failed");
     return NS_ERROR_FAILURE;
   }
-  if (mDesiredXSet)
-  {
-    aDesiredX = mDesiredX;
+  if (mDesiredPosSet) {
+    aDesiredPos = mDesiredPos;
     return NS_OK;
   }
 
   nsRefPtr<nsCaret> caret = mShell->GetCaret();
-  if (!caret)
+  if (!caret) {
     return NS_ERROR_NULL_POINTER;
+  }
 
   int8_t index = GetIndexFromSelectionType(nsISelectionController::SELECTION_NORMAL);
   caret->SetSelection(mDomSelections[index]);
 
   nsRect coord;
   nsIFrame* caretFrame = caret->GetGeometry(&coord);
-  if (!caretFrame)
+  if (!caretFrame) {
     return NS_ERROR_FAILURE;
+  }
   nsPoint viewOffset(0, 0);
   nsView* view = nullptr;
   caretFrame->GetOffsetFromView(viewOffset, &view);
-  if (view)
-    coord.x += viewOffset.x;
-
-  aDesiredX = coord.x;
+  if (view) {
+    coord += viewOffset;
+  }
+  aDesiredPos = coord.TopLeft();
   return NS_OK;
 }
 
-
-
 void
-nsFrameSelection::InvalidateDesiredX() //do not listen to mDesiredX you must get another.
+nsFrameSelection::InvalidateDesiredPos() // do not listen to mDesiredPos;
+                                         // you must get another.
 {
-  mDesiredXSet = false;
+  mDesiredPosSet = false;
 }
 
-
-
 void
-nsFrameSelection::SetDesiredX(nscoord aX) //set the mDesiredX
+nsFrameSelection::SetDesiredPos(nsPoint aPos)
 {
-  mDesiredX = aX;
-  mDesiredXSet = true;
+  mDesiredPos = aPos;
+  mDesiredPosSet = true;
 }
 
 nsresult
@@ -626,7 +622,7 @@
 }
 
 void
-nsFrameSelection::SetCaretBidiLevel(uint8_t aLevel)
+nsFrameSelection::SetCaretBidiLevel(nsBidiLevel aLevel)
 {
   // If the current level is undefined, we have just inserted new text.
   // In this case, we don't want to reset the keyboard language
@@ -634,7 +630,7 @@
   return;
 }
 
-uint8_t
+nsBidiLevel
 nsFrameSelection::GetCaretBidiLevel() const
 {
   return mCaretBidiLevel;
@@ -719,7 +715,7 @@
 {
   mShell = aShell;
   mDragState = false;
-  mDesiredXSet = false;
+  mDesiredPosSet = false;
   mLimiter = aLimiter;
   mCaretMovementStyle =
     Preferences::GetInt("bidi.edit.caret_movement_style", 2);
@@ -743,28 +739,16 @@
 }
 
 nsresult
-nsFrameSelection::MoveCaret(uint32_t          aKeycode,
-                            bool              aContinueSelection,
-                            nsSelectionAmount aAmount)
-{
-  bool visualMovement =
-      (aKeycode == nsIDOMKeyEvent::DOM_VK_BACK_SPACE ||
-       aKeycode == nsIDOMKeyEvent::DOM_VK_DELETE ||
-       aKeycode == nsIDOMKeyEvent::DOM_VK_HOME ||
-       aKeycode == nsIDOMKeyEvent::DOM_VK_END) ?
-      false : // Delete operations and home/end are always logical
-      mCaretMovementStyle == 1 ||
-        (mCaretMovementStyle == 2 && !aContinueSelection);
-
-  return MoveCaret(aKeycode, aContinueSelection, aAmount, visualMovement);
-}
-
-nsresult
-nsFrameSelection::MoveCaret(uint32_t          aKeycode,
+nsFrameSelection::MoveCaret(nsDirection       aDirection,
                             bool              aContinueSelection,
                             nsSelectionAmount aAmount,
-                            bool              aVisualMovement)
+                            CaretMovementStyle aMovementStyle)
 {
+  bool visualMovement = aMovementStyle == eVisual ||
+    (aMovementStyle == eUsePrefStyle &&
+      (mCaretMovementStyle == 1 ||
+        (mCaretMovementStyle == 2 && !aContinueSelection)));
+
   NS_ENSURE_STATE(mShell);
   // Flush out layout, since we need it to be up to date to do caret
   // positioning.
@@ -779,7 +763,7 @@
     return NS_ERROR_FAILURE;
 
   bool isCollapsed;
-  nscoord desiredX = 0; //we must keep this around and revalidate it when its just UP/DOWN
+  nsPoint desiredPos(0, 0); //we must keep this around and revalidate it when its just UP/DOWN
 
   int8_t index = GetIndexFromSelectionType(nsISelectionController::SELECTION_NORMAL);
   nsRefPtr<Selection> sel = mDomSelections[index];
@@ -799,32 +783,31 @@
   }
 
   nsresult result = sel->GetIsCollapsed(&isCollapsed);
-  if (NS_FAILED(result))
+  if (NS_FAILED(result)) {
     return result;
-  if (aKeycode == nsIDOMKeyEvent::DOM_VK_UP ||
-      aKeycode == nsIDOMKeyEvent::DOM_VK_DOWN)
-  {
-    result = FetchDesiredX(desiredX);
-    if (NS_FAILED(result))
+  }
+  if (aAmount == eSelectLine) {
+    result = FetchDesiredPos(desiredPos);
+    if (NS_FAILED(result)) {
       return result;
-    SetDesiredX(desiredX);
+    }
+    SetDesiredPos(desiredPos);
   }
 
   int32_t caretStyle = Preferences::GetInt("layout.selection.caret_style", 0);
   if (caretStyle == 0
 #ifdef XP_WIN
-      && aKeycode != nsIDOMKeyEvent::DOM_VK_UP
-      && aKeycode != nsIDOMKeyEvent::DOM_VK_DOWN
+      && aAmount != eSelectLine
 #endif
      ) {
-    // Put caret at the selection edge in the |aKeycode| direction.
+    // Put caret at the selection edge in the |aDirection| direction.
     caretStyle = 2;
   }
 
-  if (!isCollapsed && !aContinueSelection && caretStyle == 2) {
-    switch (aKeycode){
-      case nsIDOMKeyEvent::DOM_VK_LEFT  :
-      case nsIDOMKeyEvent::DOM_VK_UP    :
+  if (!isCollapsed && !aContinueSelection && caretStyle == 2 &&
+      aAmount <= eSelectLine) {
+    switch (aDirection) {
+      case eDirPrevious:
         {
           const nsRange* anchorFocusRange = sel->GetAnchorFocusRange();
           if (anchorFocusRange) {
@@ -839,8 +822,7 @@
           return NS_OK;
         }
 
-      case nsIDOMKeyEvent::DOM_VK_RIGHT :
-      case nsIDOMKeyEvent::DOM_VK_DOWN  :
+      case eDirNext:
         {
           const nsRange* anchorFocusRange = sel->GetAnchorFocusRange();
           if (anchorFocusRange) {
@@ -860,53 +842,42 @@
   nsIFrame *frame;
   int32_t offsetused = 0;
   result = sel->GetPrimaryFrameForFocusNode(&frame, &offsetused,
-                                            aVisualMovement);
+                                            visualMovement);
 
   if (NS_FAILED(result) || !frame)
     return NS_FAILED(result) ? result : NS_ERROR_FAILURE;
 
   //set data using mLimiter to stop on scroll views.  If we have a limiter then we stop peeking
   //when we hit scrollable views.  If no limiter then just let it go ahead
-  nsPeekOffsetStruct pos(aAmount, eDirPrevious, offsetused, desiredX,
-                         true, mLimiter != nullptr, true, aVisualMovement);
+  nsPeekOffsetStruct pos(aAmount, eDirPrevious, offsetused, desiredPos,
+                         true, mLimiter != nullptr, true, visualMovement);
+
+  nsBidiDirection paraDir = nsBidiPresUtils::ParagraphDirection(frame);
 
-  nsBidiLevel baseLevel = nsBidiPresUtils::GetFrameBaseLevel(frame);
-  
   CaretAssociateHint tHint(mHint); //temporary variable so we dont set mHint until it is necessary
-  switch (aKeycode){
-    case nsIDOMKeyEvent::DOM_VK_RIGHT : 
-        InvalidateDesiredX();
-        pos.mDirection = (baseLevel & 1) ? eDirPrevious : eDirNext;
+  switch (aAmount){
+   case eSelectCharacter:
+    case eSelectCluster:
+    case eSelectWord:
+    case eSelectWordNoSpace:
+      InvalidateDesiredPos();
+      pos.mAmount = aAmount;
+      pos.mDirection = (visualMovement && paraDir == NSBIDI_RTL)
+                       ? nsDirection(1 - aDirection) : aDirection;
       break;
-    case nsIDOMKeyEvent::DOM_VK_LEFT :
-        InvalidateDesiredX();
-        pos.mDirection = (baseLevel & 1) ? eDirNext : eDirPrevious;
+    case eSelectLine:
+      pos.mAmount = aAmount;
+      pos.mDirection = aDirection;
       break;
-    case nsIDOMKeyEvent::DOM_VK_DELETE :
-        InvalidateDesiredX();
-        pos.mDirection = eDirNext;
+    case eSelectBeginLine:
+    case eSelectEndLine:
+      InvalidateDesiredPos();
+      pos.mAmount = aAmount;
+      pos.mDirection = (visualMovement && paraDir == NSBIDI_RTL)
+                       ? nsDirection(1 - aDirection) : aDirection;
       break;
-    case nsIDOMKeyEvent::DOM_VK_BACK_SPACE : 
-        InvalidateDesiredX();
-        pos.mDirection = eDirPrevious;
-      break;
-    case nsIDOMKeyEvent::DOM_VK_DOWN : 
-        pos.mAmount = eSelectLine;
-        pos.mDirection = eDirNext;
-      break;
-    case nsIDOMKeyEvent::DOM_VK_UP : 
-        pos.mAmount = eSelectLine;
-        pos.mDirection = eDirPrevious;
-      break;
-    case nsIDOMKeyEvent::DOM_VK_HOME :
-        InvalidateDesiredX();
-        pos.mAmount = eSelectBeginLine;
-      break;
-    case nsIDOMKeyEvent::DOM_VK_END :
-        InvalidateDesiredX();
-        pos.mAmount = eSelectEndLine;
-      break;
-  default :return NS_ERROR_FAILURE;
+    default:
+      return NS_ERROR_FAILURE;
   }
   PostReason(nsISelectionListener::KEYPRESS_REASON);
   if (NS_SUCCEEDED(result = frame->PeekOffset(&pos)) && pos.mResultContent)
@@ -914,7 +885,7 @@
     nsIFrame *theFrame;
     int32_t currentOffset, frameStart, frameEnd;
 
-    if (aAmount >= eSelectCharacter && aAmount <= eSelectWord)
+    if (aAmount <= eSelectWordNoSpace)
     {
       // For left/right, PeekOffset() sets pos.mResultFrame correctly, but does not set pos.mAttachForward,
       // so determine the hint here based on the result frame and offset:
@@ -941,27 +912,31 @@
 
     if (context->BidiEnabled())
     {
-      switch (aKeycode) {
-        case nsIDOMKeyEvent::DOM_VK_HOME:
-        case nsIDOMKeyEvent::DOM_VK_END:
+      switch (aAmount) {
+        case eSelectBeginLine:
+        case eSelectEndLine:
           // set the caret Bidi level to the paragraph embedding level
           SetCaretBidiLevel(NS_GET_BASE_LEVEL(theFrame));
           break;
 
         default:
-          // If the current position is not a frame boundary, it's enough just to take the Bidi level of the current frame
-          if ((pos.mContentOffset != frameStart && pos.mContentOffset != frameEnd)
-              || (eSelectLine == aAmount))
-          {
+          // If the current position is not a frame boundary, it's enough just
+          // to take the Bidi level of the current frame
+          if ((pos.mContentOffset != frameStart &&
+               pos.mContentOffset != frameEnd) ||
+              eSelectLine == aAmount) {
             SetCaretBidiLevel(NS_GET_EMBEDDING_LEVEL(theFrame));
           }
-          else
-            BidiLevelFromMove(mShell, pos.mResultContent, pos.mContentOffset, aKeycode, tHint);
+          else {
+            BidiLevelFromMove(mShell, pos.mResultContent, pos.mContentOffset,
+                              aAmount, tHint);
+          }
       }
     }
     result = TakeFocus(pos.mResultContent, pos.mContentOffset, pos.mContentOffset,
                        tHint, aContinueSelection, false);
-  } else if (aKeycode == nsIDOMKeyEvent::DOM_VK_RIGHT && !aContinueSelection) {
+  } else if (aAmount <= eSelectWordNoSpace && aDirection == eDirNext &&
+             !aContinueSelection) {
     // Collapse selection if PeekOffset failed, we either
     //  1. bumped into the BRFrame, bug 207623
     //  2. had select-all in a text input (DIV range), bug 352759.
@@ -1169,9 +1144,9 @@
   if (NS_FAILED(rv))
     newFrame = nullptr;
 
-  uint8_t baseLevel = NS_GET_BASE_LEVEL(currentFrame);
-  uint8_t currentLevel = NS_GET_EMBEDDING_LEVEL(currentFrame);
-  uint8_t newLevel = newFrame ? NS_GET_EMBEDDING_LEVEL(newFrame) : baseLevel;
+  nsBidiLevel baseLevel = NS_GET_BASE_LEVEL(currentFrame);
+  nsBidiLevel currentLevel = NS_GET_EMBEDDING_LEVEL(currentFrame);
+  nsBidiLevel newLevel = newFrame ? NS_GET_EMBEDDING_LEVEL(newFrame) : baseLevel;
   
   // If not jumping lines, disregard br frames, since they might be positioned incorrectly.
   // XXX This could be removed once bug 339786 is fixed.
@@ -1197,11 +1172,11 @@
 nsresult
 nsFrameSelection::GetFrameFromLevel(nsIFrame    *aFrameIn,
                                     nsDirection  aDirection,
-                                    uint8_t      aBidiLevel,
+                                    nsBidiLevel  aBidiLevel,
                                     nsIFrame   **aFrameOut) const
 {
   NS_ENSURE_STATE(mShell);
-  uint8_t foundLevel = 0;
+  nsBidiLevel foundLevel = 0;
   nsIFrame *foundFrame = aFrameIn;
 
   nsCOMPtr<nsIFrameEnumerator> frameTraversal;
@@ -1272,20 +1247,26 @@
  * @param aPresShell is the presentation shell
  * @param aNode is the content node
  * @param aContentOffset is the new caret position, as an offset into aNode
- * @param aKeycode is the keyboard event that moved the caret to the new position
+ * @param aAmount is the amount of the move that gave the caret its new position
  * @param aHint is the hint indicating in what logical direction the caret moved
  */
 void nsFrameSelection::BidiLevelFromMove(nsIPresShell*      aPresShell,
                                          nsIContent*        aNode,
                                          uint32_t           aContentOffset,
-                                         uint32_t           aKeycode,
+                                         nsSelectionAmount  aAmount,
                                          CaretAssociateHint aHint)
 {
-  switch (aKeycode) {
+  switch (aAmount) {
 
-    // Right and Left: the new cursor Bidi level is the level of the character moved over
-    case nsIDOMKeyEvent::DOM_VK_RIGHT:
-    case nsIDOMKeyEvent::DOM_VK_LEFT:
+    // Movement within the line: the new cursor Bidi level is the level of the
+    // last character moved over
+    case eSelectCharacter:
+    case eSelectCluster:
+    case eSelectWord:
+    case eSelectWordNoSpace:
+    case eSelectBeginLine:
+    case eSelectEndLine:
+    case eSelectNoAmount:
     {
       nsPrevNextBidiLevels levels = GetPrevNextBidiLevels(aNode, aContentOffset,
                                                           aHint, false);
@@ -1296,8 +1277,8 @@
     }
       /*
     // Up and Down: the new cursor Bidi level is the smaller of the two surrounding characters      
-    case nsIDOMKeyEvent::DOM_VK_UP:
-    case nsIDOMKeyEvent::DOM_VK_DOWN:
+    case eSelectLine:
+    case eSelectParagraph:
       GetPrevNextBidiLevels(aContext, aNode, aContentOffset, &firstFrame, &secondFrame, &firstLevel, &secondLevel);
       aPresShell->SetCaretBidiLevel(std::min(firstLevel, secondLevel));
       break;
@@ -1387,7 +1368,7 @@
   if (!aNewFocus)
     return NS_ERROR_INVALID_ARG;
 
-  InvalidateDesiredX();
+  InvalidateDesiredPos();
 
   if (!aContinueSelection) {
     mMaintainRange = nullptr;
@@ -1459,15 +1440,16 @@
     if (frame && amount == eSelectWord && direction == eDirPrevious) {
       // To avoid selecting the previous word when at start of word,
       // first move one character forward.
-      nsPeekOffsetStruct charPos(eSelectCharacter, eDirNext, offset, 0,
-                                 false, mLimiter != nullptr, false, false);
+      nsPeekOffsetStruct charPos(eSelectCharacter, eDirNext, offset,
+                                 nsPoint(0, 0), false, mLimiter != nullptr,
+                                 false, false);
       if (NS_SUCCEEDED(frame->PeekOffset(&charPos))) {
         frame = charPos.mResultFrame;
         offset = charPos.mContentOffset;
       }
     }
 
-    nsPeekOffsetStruct pos(amount, direction, offset, 0,
+    nsPeekOffsetStruct pos(amount, direction, offset, nsPoint(0, 0),
                            false, mLimiter != nullptr, false, false);
 
     if (frame && NS_SUCCEEDED(frame->PeekOffset(&pos)) && pos.mResultContent) {
@@ -1556,17 +1538,16 @@
       mDomSelections[index]->AddRange(newRange);
       mBatching = batching;
       mChangesDuringBatching = changes;
-    }
-    else
-    {
-      bool oldDesiredXSet = mDesiredXSet; //need to keep old desired X if it was set.
+    } else {
+      bool oldDesiredPosSet = mDesiredPosSet; //need to keep old desired position if it was set.
       mDomSelections[index]->Collapse(aNewFocus, aContentOffset);
-      mDesiredXSet = oldDesiredXSet; //now reset desired X back.
+      mDesiredPosSet = oldDesiredPosSet; //now reset desired pos back.
       mBatching = batching;
       mChangesDuringBatching = changes;
     }
-    if (aContentEndOffset != aContentOffset)
+    if (aContentEndOffset != aContentOffset) {
       mDomSelections[index]->Extend(aNewFocus, aContentEndOffset);
+    }
 
     //find out if we are inside a table. if so, find out which one and which cell
     //once we do that, the next time we get a takefocus, check the parent tree. 
@@ -1875,10 +1856,11 @@
     return;
 
   // find out where the caret is.
-  // we should know mDesiredX value of nsFrameSelection, but I havent seen that behavior in other windows applications yet.
+  // we should know mDesiredPos value of nsFrameSelection, but I havent seen that behavior in other windows applications yet.
   nsISelection* domSel = GetSelection(nsISelectionController::SELECTION_NORMAL);
-  if (!domSel) 
+  if (!domSel) {
     return;
+  }
 
   nsRect caretPos;
   nsIFrame* caretFrame = nsCaret::GetGeometry(domSel, &caretPos);
@@ -1916,60 +1898,143 @@
 }
 
 nsresult
+nsFrameSelection::PhysicalMove(int16_t aDirection, int16_t aAmount,
+                               bool aExtend)
+{
+  NS_ENSURE_STATE(mShell);
+  // Flush out layout, since we need it to be up to date to do caret
+  // positioning.
+  mShell->FlushPendingNotifications(Flush_Layout);
+
+  if (!mShell) {
+    return NS_OK;
+  }
+
+  // Check that parameters are safe
+  if (aDirection < 0 || aDirection > 3 || aAmount < 0 || aAmount > 1) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsPresContext *context = mShell->GetPresContext();
+  if (!context) {
+    return NS_ERROR_FAILURE;
+  }
+
+  int8_t index = GetIndexFromSelectionType(nsISelectionController::SELECTION_NORMAL);
+  nsRefPtr<Selection> sel = mDomSelections[index];
+  if (!sel) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  // Map the abstract movement amounts (0-1) to direction-specific
+  // selection units.
+  static const nsSelectionAmount inlineAmount[] =
+    { eSelectCluster, eSelectWord };
+  static const nsSelectionAmount blockPrevAmount[] =
+    { eSelectLine, eSelectBeginLine };
+  static const nsSelectionAmount blockNextAmount[] =
+    { eSelectLine, eSelectEndLine };
+
+  struct PhysicalToLogicalMapping {
+    nsDirection direction;
+    const nsSelectionAmount *amounts;
+  };
+  static const PhysicalToLogicalMapping verticalLR[4] = {
+    { eDirPrevious, blockPrevAmount },  // left
+    { eDirNext, blockNextAmount },      // right
+    { eDirPrevious, inlineAmount }, // up
+    { eDirNext, inlineAmount }      // down
+  };
+  static const PhysicalToLogicalMapping verticalRL[4] = {
+    { eDirNext, blockNextAmount },
+    { eDirPrevious, blockPrevAmount },
+    { eDirPrevious, inlineAmount },
+    { eDirNext, inlineAmount }
+  };
+  static const PhysicalToLogicalMapping horizontal[4] = {
+    { eDirPrevious, inlineAmount },
+    { eDirNext, inlineAmount },
+    { eDirPrevious, blockPrevAmount },
+    { eDirNext, blockNextAmount }
+  };
+
+  WritingMode wm;
+  nsIFrame *frame = nullptr;
+  int32_t offsetused = 0;
+  if (NS_SUCCEEDED(sel->GetPrimaryFrameForFocusNode(&frame, &offsetused,
+                                                    true))) {
+    if (frame) {
+      wm = frame->GetWritingMode();
+    }
+  }
+
+  const PhysicalToLogicalMapping& mapping =
+    wm.IsVertical()
+      ? wm.IsVerticalLR() ? verticalLR[aDirection] : verticalRL[aDirection]
+      : horizontal[aDirection];
+
+  nsresult rv = MoveCaret(mapping.direction, aExtend, mapping.amounts[aAmount],
+                          eVisual);
+  if (NS_FAILED(rv)) {
+    // If we tried to do a line move, but couldn't move in the given direction,
+    // then we'll "promote" this to a line-edge move instead.
+    if (mapping.amounts[aAmount] == eSelectLine) {
+      rv = MoveCaret(mapping.direction, aExtend, mapping.amounts[aAmount + 1],
+                     eVisual);
+    }
+  }
+
+  return rv;
+}
+
+nsresult
 nsFrameSelection::CharacterMove(bool aForward, bool aExtend)
 {
-  if (aForward)
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_RIGHT, aExtend, eSelectCluster);
-  else
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_LEFT, aExtend, eSelectCluster);
+  return MoveCaret(aForward ? eDirNext : eDirPrevious, aExtend, eSelectCluster,
+                   eUsePrefStyle);
 }
 
 nsresult
 nsFrameSelection::CharacterExtendForDelete()
 {
-  return MoveCaret(nsIDOMKeyEvent::DOM_VK_DELETE, true, eSelectCluster);
+  return MoveCaret(eDirNext, true, eSelectCluster, eLogical);
 }
 
 nsresult
 nsFrameSelection::CharacterExtendForBackspace()
 {
-  return MoveCaret(nsIDOMKeyEvent::DOM_VK_BACK_SPACE, true, eSelectCharacter);
+  return MoveCaret(eDirPrevious, true, eSelectCharacter, eLogical);
 }
 
 nsresult
 nsFrameSelection::WordMove(bool aForward, bool aExtend)
 {
-  if (aForward)
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_RIGHT,aExtend,eSelectWord);
-  else
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_LEFT,aExtend,eSelectWord);
+  return MoveCaret(aForward ? eDirNext : eDirPrevious, aExtend, eSelectWord,
+                   eUsePrefStyle);
 }
 
 nsresult
 nsFrameSelection::WordExtendForDelete(bool aForward)
 {
-  if (aForward)
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_DELETE, true, eSelectWord);
-  else
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_BACK_SPACE, true, eSelectWord);
+  return MoveCaret(aForward ? eDirNext : eDirPrevious, true, eSelectWord,
+                   eLogical);
 }
 
 nsresult
 nsFrameSelection::LineMove(bool aForward, bool aExtend)
 {
-  if (aForward)
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_DOWN,aExtend,eSelectLine);
-  else
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_UP,aExtend,eSelectLine);
+  return MoveCaret(aForward ? eDirNext : eDirPrevious, aExtend, eSelectLine,
+                   eUsePrefStyle);
 }
 
 nsresult
 nsFrameSelection::IntraLineMove(bool aForward, bool aExtend)
 {
-  if (aForward)
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_END,aExtend,eSelectLine);
-  else
-    return MoveCaret(nsIDOMKeyEvent::DOM_VK_HOME,aExtend,eSelectLine);
+  if (aForward) {
+    return MoveCaret(eDirNext, aExtend, eSelectEndLine, eLogical);
+  } else {
+    return MoveCaret(eDirPrevious, aExtend, eSelectBeginLine, eLogical);
+  }
 }
 
 nsresult
@@ -3954,7 +4019,7 @@
   CaretAssociationHint hint = mFrameSelection->GetHint();
 
   if (aVisual) {
-    uint8_t caretBidiLevel = mFrameSelection->GetCaretBidiLevel();
+    nsBidiLevel caretBidiLevel = mFrameSelection->GetCaretBidiLevel();
 
     return nsCaret::GetCaretFrameForNodeOffset(mFrameSelection,
       content, FocusOffset(), hint, caretBidiLevel, aReturnFrame, aOffsetUsed);
@@ -4617,7 +4682,7 @@
 
   nsCOMPtr<nsINode> kungfuDeathGrip = &aParentNode;
 
-  mFrameSelection->InvalidateDesiredX();
+  mFrameSelection->InvalidateDesiredPos();
   if (!IsValidSelectionPoint(mFrameSelection, &aParentNode)) {
     aRv.Throw(NS_ERROR_FAILURE);
     return;
@@ -5774,38 +5839,23 @@
 
   bool extend  = aAlter.LowerCaseEqualsLiteral("extend");
 
-  // The uint32_t casts below prevent an enum mismatch warning.
   nsSelectionAmount amount;
-  uint32_t keycode;
   if (aGranularity.LowerCaseEqualsLiteral("character")) {
     amount = eSelectCluster;
-    keycode = forward ? (uint32_t) nsIDOMKeyEvent::DOM_VK_RIGHT :
-                        (uint32_t) nsIDOMKeyEvent::DOM_VK_LEFT;
-  }
-  else if (aGranularity.LowerCaseEqualsLiteral("word")) {
+  } else if (aGranularity.LowerCaseEqualsLiteral("word")) {
     amount = eSelectWordNoSpace;
-    keycode = forward ? (uint32_t) nsIDOMKeyEvent::DOM_VK_RIGHT :
-                        (uint32_t) nsIDOMKeyEvent::DOM_VK_LEFT;
-  }
-  else if (aGranularity.LowerCaseEqualsLiteral("line")) {
+  } else if (aGranularity.LowerCaseEqualsLiteral("line")) {
     amount = eSelectLine;
-    keycode = forward ? (uint32_t) nsIDOMKeyEvent::DOM_VK_DOWN :
-                        (uint32_t) nsIDOMKeyEvent::DOM_VK_UP;
-  }
-  else if (aGranularity.LowerCaseEqualsLiteral("lineboundary")) {
-    amount = eSelectLine;
-    keycode = forward ? (uint32_t) nsIDOMKeyEvent::DOM_VK_END :
-                        (uint32_t) nsIDOMKeyEvent::DOM_VK_HOME;
-  }
-  else if (aGranularity.LowerCaseEqualsLiteral("sentence") ||
-           aGranularity.LowerCaseEqualsLiteral("sentenceboundary") ||
-           aGranularity.LowerCaseEqualsLiteral("paragraph") ||
-           aGranularity.LowerCaseEqualsLiteral("paragraphboundary") ||
-           aGranularity.LowerCaseEqualsLiteral("documentboundary")) {
+  } else if (aGranularity.LowerCaseEqualsLiteral("lineboundary")) {
+    amount = forward ? eSelectEndLine : eSelectBeginLine;
+  } else if (aGranularity.LowerCaseEqualsLiteral("sentence") ||
+             aGranularity.LowerCaseEqualsLiteral("sentenceboundary") ||
+             aGranularity.LowerCaseEqualsLiteral("paragraph") ||
+             aGranularity.LowerCaseEqualsLiteral("paragraphboundary") ||
+             aGranularity.LowerCaseEqualsLiteral("documentboundary")) {
     aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
     return;
-  }
-  else {
+  } else {
     aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
     return;
   }
@@ -5825,26 +5875,21 @@
     Collapse(focusNode, focusOffset);
   }
 
-  // If the base level of the focused frame is odd, we may have to swap the
-  // direction of the keycode.
+  // If the paragraph direction of the focused frame is right-to-left,
+  // we may have to swap the direction of movement.
   nsIFrame *frame;
   int32_t offset;
   rv = GetPrimaryFrameForFocusNode(&frame, &offset, visual);
   if (NS_SUCCEEDED(rv) && frame) {
-    nsBidiLevel baseLevel = nsBidiPresUtils::GetFrameBaseLevel(frame);
+    nsBidiDirection paraDir = nsBidiPresUtils::ParagraphDirection(frame);
 
-    if (baseLevel & 1) {
-      if (!visual && keycode == nsIDOMKeyEvent::DOM_VK_RIGHT) {
-        keycode = nsIDOMKeyEvent::DOM_VK_LEFT;
-      }
-      else if (!visual && keycode == nsIDOMKeyEvent::DOM_VK_LEFT) {
-        keycode = nsIDOMKeyEvent::DOM_VK_RIGHT;
-      }
-      else if (visual && keycode == nsIDOMKeyEvent::DOM_VK_HOME) {
-        keycode = nsIDOMKeyEvent::DOM_VK_END;
-      }
-      else if (visual && keycode == nsIDOMKeyEvent::DOM_VK_END) {
-        keycode = nsIDOMKeyEvent::DOM_VK_HOME;
+    if (paraDir == NSBIDI_RTL && visual) {
+      if (amount == eSelectBeginLine) {
+        amount = eSelectEndLine;
+        forward = !forward;
+      } else if (amount == eSelectEndLine) {
+        amount = eSelectBeginLine;
+        forward = !forward;
       }
     }
   }
@@ -5853,7 +5898,10 @@
   // direction, but we just ignore this error unless it's a line move, in which
   // case we call nsISelectionController::CompleteMove to move the cursor to
   // the beginning/end of the line.
-  rv = mFrameSelection->MoveCaret(keycode, extend, amount, visual);
+  rv = mFrameSelection->MoveCaret(forward ? eDirNext : eDirPrevious,
+                                  extend, amount,
+                                  visual ? nsFrameSelection::eVisual
+                                         : nsFrameSelection::eLogical);
 
   if (aGranularity.LowerCaseEqualsLiteral("line") && NS_FAILED(rv)) {
     nsCOMPtr<nsISelectionController> shell =
@@ -5886,12 +5934,12 @@
   int32_t frameStart, frameEnd;
   focusFrame->GetOffsets(frameStart, frameEnd);
   nsRefPtr<nsPresContext> context = GetPresContext();
-  uint8_t levelBefore, levelAfter;
+  nsBidiLevel levelBefore, levelAfter;
   if (!context) {
     return NS_ERROR_FAILURE;
   }
 
-  uint8_t level = NS_GET_EMBEDDING_LEVEL(focusFrame);
+  nsBidiLevel level = NS_GET_EMBEDDING_LEVEL(focusFrame);
   int32_t focusOffset = static_cast<int32_t>(FocusOffset());
   if ((focusOffset != frameStart) && (focusOffset != frameEnd))
     // the cursor is not at a frame boundary, so the level of both the characters (logically) before and after the cursor
@@ -5908,14 +5956,14 @@
     levelAfter = levels.mLevelAfter;
   }
 
-  if ((levelBefore & 1) == (levelAfter & 1)) {
+  if (IS_SAME_DIRECTION(levelBefore, levelAfter)) {
     // if cursor is between two characters with the same orientation, changing the keyboard language
     //  must toggle the cursor level between the level of the character with the lowest level
     //  (if the new language corresponds to the orientation of that character) and this level plus 1
     //  (if the new language corresponds to the opposite orientation)
     if ((level != levelBefore) && (level != levelAfter))
       level = std::min(levelBefore, levelAfter);
-    if ((level & 1) == aLangRTL)
+    if (IS_LEVEL_RTL(level) == aLangRTL)
       mFrameSelection->SetCaretBidiLevel(level);
     else
       mFrameSelection->SetCaretBidiLevel(level + 1);
@@ -5923,15 +5971,15 @@
   else {
     // if cursor is between characters with opposite orientations, changing the keyboard language must change
     //  the cursor level to that of the adjacent character with the orientation corresponding to the new language.
-    if ((levelBefore & 1) == aLangRTL)
+    if (IS_LEVEL_RTL(levelBefore) == aLangRTL)
       mFrameSelection->SetCaretBidiLevel(levelBefore);
     else
       mFrameSelection->SetCaretBidiLevel(levelAfter);
   }
   
-  // The caret might have moved, so invalidate the desired X position
+  // The caret might have moved, so invalidate the desired position
   // for future usages of up-arrow or down-arrow
-  mFrameSelection->InvalidateDesiredX();
+  mFrameSelection->InvalidateDesiredPos();
   
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsSubDocumentFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsSubDocumentFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsSubDocumentFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsSubDocumentFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -273,6 +273,18 @@
     } else {
       docSizeAppUnits = GetContentRect().Size();
     }
+    // Adjust subdocument size, according to 'object-fit' and the
+    // subdocument's intrinsic size and ratio.
+    nsIFrame* subDocRoot = ObtainIntrinsicSizeFrame();
+    if (subDocRoot) {
+      nsRect destRect =
+        nsLayoutUtils::ComputeObjectDestRect(nsRect(nsPoint(), docSizeAppUnits),
+                                             subDocRoot->GetIntrinsicSize(),
+                                             subDocRoot->GetIntrinsicRatio(),
+                                             StylePosition());
+      docSizeAppUnits = destRect.Size();
+    }
+
     return nsIntSize(presContext->AppUnitsToDevPixels(docSizeAppUnits.width),
                      presContext->AppUnitsToDevPixels(docSizeAppUnits.height));
   }
@@ -756,14 +768,27 @@
   nsPoint offset = nsPoint(aReflowState.ComputedPhysicalBorderPadding().left,
                            aReflowState.ComputedPhysicalBorderPadding().top);
 
-  nsSize innerSize(aDesiredSize.Width(), aDesiredSize.Height());
-  innerSize.width  -= aReflowState.ComputedPhysicalBorderPadding().LeftRight();
-  innerSize.height -= aReflowState.ComputedPhysicalBorderPadding().TopBottom();
-
   if (mInnerView) {
+    const nsMargin& bp = aReflowState.ComputedPhysicalBorderPadding();
+    nsSize innerSize(aDesiredSize.Width() - bp.LeftRight(),
+                     aDesiredSize.Height() - bp.TopBottom());
+
+    // Size & position the view according to 'object-fit' & 'object-position'.
+    nsIFrame* subDocRoot = ObtainIntrinsicSizeFrame();
+    IntrinsicSize intrinsSize;
+    nsSize intrinsRatio;
+    if (subDocRoot) {
+      intrinsSize = subDocRoot->GetIntrinsicSize();
+      intrinsRatio = subDocRoot->GetIntrinsicRatio();
+    }
+    nsRect destRect =
+      nsLayoutUtils::ComputeObjectDestRect(nsRect(offset, innerSize),
+                                           intrinsSize, intrinsRatio,
+                                           StylePosition());
+
     nsViewManager* vm = mInnerView->GetViewManager();
-    vm->MoveViewTo(mInnerView, offset.x, offset.y);
-    vm->ResizeView(mInnerView, nsRect(nsPoint(0, 0), innerSize), true);
+    vm->MoveViewTo(mInnerView, destRect.x, destRect.y);
+    vm->ResizeView(mInnerView, nsRect(nsPoint(0, 0), destRect.Size()), true);
   }
 
   aDesiredSize.SetOverflowAreasToDesiredBounds();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsTextFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsTextFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsTextFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsTextFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -2059,7 +2059,7 @@
   if (textFlags & nsTextFrameUtils::TEXT_HAS_SHY) {
     textFlags |= gfxTextRunFactory::TEXT_ENABLE_HYPHEN_BREAKS;
   }
-  if (mBidiEnabled && (NS_GET_EMBEDDING_LEVEL(firstFrame) & 1)) {
+  if (mBidiEnabled && (IS_LEVEL_RTL(NS_GET_EMBEDDING_LEVEL(firstFrame)))) {
     textFlags |= gfxTextRunFactory::TEXT_IS_RTL;
   }
   if (mNextRunContextInfo & nsTextFrameUtils::INCOMING_WHITESPACE) {
@@ -8191,16 +8191,15 @@
                "We shouldn't be passed NS_REFLOW_CALC_BOUNDING_METRICS anymore");
 
   int32_t limitLength = length;
-  int32_t forceBreak = aLineLayout.GetForcedBreakPosition(mContent);
+  int32_t forceBreak = aLineLayout.GetForcedBreakPosition(this);
   bool forceBreakAfter = false;
-  if (forceBreak >= offset + length) {
-    forceBreakAfter = forceBreak == offset + length;
+  if (forceBreak >= length) {
+    forceBreakAfter = forceBreak == length;
     // The break is not within the text considered for this textframe.
     forceBreak = -1;
   }
   if (forceBreak >= 0) {
-    limitLength = forceBreak - offset;
-    NS_ASSERTION(limitLength >= 0, "Weird break found!");
+    limitLength = forceBreak;
   }
   // This is the heart of text reflow right here! We don't know where
   // to break, so we need to see how much text fits in the available width.
@@ -8317,7 +8316,9 @@
     // record the last break opportunity
     NS_ASSERTION(textMetrics.mAdvanceWidth - trimmableWidth <= aAvailableWidth,
                  "If the text doesn't fit, and we have a break opportunity, why didn't MeasureText use it?");
-    aLineLayout.NotifyOptionalBreakPosition(mContent, lastBreak, true, breakPriority);
+    MOZ_ASSERT(lastBreak >= offset, "Strange break position");
+    aLineLayout.NotifyOptionalBreakPosition(this, lastBreak - offset,
+                                            true, breakPriority);
   }
 
   int32_t contentLength = offset + charsFit - GetContentOffset();
@@ -8417,10 +8418,11 @@
   if (charsFit > 0 && charsFit == length &&
       textStyle->mHyphens != NS_STYLE_HYPHENS_NONE &&
       HasSoftHyphenBefore(frag, mTextRun, offset, end)) {
+    bool fits =
+      textMetrics.mAdvanceWidth + provider.GetHyphenWidth() <= availWidth;
     // Record a potential break after final soft hyphen
-    aLineLayout.NotifyOptionalBreakPosition(mContent, offset + length,
-        textMetrics.mAdvanceWidth + provider.GetHyphenWidth() <= availWidth,
-                                           gfxBreakPriority::eNormalBreak);
+    aLineLayout.NotifyOptionalBreakPosition(this, length, fits,
+                                            gfxBreakPriority::eNormalBreak);
   }
   bool breakAfter = forceBreakAfter;
   // length == 0 means either the text is empty or it's all collapsed away
@@ -8439,8 +8441,8 @@
     if (textMetrics.mAdvanceWidth - trimmableWidth > availWidth) {
       breakAfter = true;
     } else {
-      aLineLayout.NotifyOptionalBreakPosition(mContent, offset + length,
-                                              true, gfxBreakPriority::eNormalBreak);
+      aLineLayout.NotifyOptionalBreakPosition(this, length, true,
+                                              gfxBreakPriority::eNormalBreak);
     }
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsVideoFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsVideoFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/nsVideoFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/nsVideoFrame.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -25,6 +25,7 @@
 #include "ImageContainer.h"
 #include "ImageLayers.h"
 #include "nsContentList.h"
+#include "nsStyleUtil.h"
 #include <algorithm>
 
 using namespace mozilla;
@@ -152,32 +153,18 @@
   return true;
 }
 
-// Return the largest rectangle that fits in aRect and has the
-// same aspect ratio as aRatio, centered at the center of aRect
-static gfxRect
-CorrectForAspectRatio(const gfxRect& aRect, const nsIntSize& aRatio)
-{
-  NS_ASSERTION(aRatio.width > 0 && aRatio.height > 0 && !aRect.IsEmpty(),
-               "Nothing to draw");
-  // Choose scale factor that scales aRatio to just fit into aRect
-  gfxFloat scale =
-    std::min(aRect.Width()/aRatio.width, aRect.Height()/aRatio.height);
-  gfxSize scaledRatio(scale*aRatio.width, scale*aRatio.height);
-  gfxPoint topLeft((aRect.Width() - scaledRatio.width)/2,
-                   (aRect.Height() - scaledRatio.height)/2);
-  return gfxRect(aRect.TopLeft() + topLeft, scaledRatio);
-}
-
 already_AddRefed<Layer>
 nsVideoFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
                          LayerManager* aManager,
                          nsDisplayItem* aItem,
                          const ContainerLayerParameters& aContainerParameters)
 {
-  nsRect area = GetContentRectRelativeToSelf() + aItem->ToReferenceFrame();
+  nsSize contentBoxSize = GetContentRectRelativeToSelf().Size();
   HTMLVideoElement* element = static_cast<HTMLVideoElement*>(GetContent());
-  nsIntSize videoSize;
-  if (NS_FAILED(element->GetVideoSize(&videoSize)) || area.IsEmpty()) {
+
+  nsIntSize videoSizeInPx;
+  if (NS_FAILED(element->GetVideoSize(&videoSizeInPx)) ||
+      contentBoxSize.IsEmpty()) {
     return nullptr;
   }
 
@@ -193,21 +180,31 @@
     return nullptr;
   }
 
-  // Compute the rectangle in which to paint the video. We need to use
-  // the largest rectangle that fills our content-box and has the
-  // correct aspect ratio.
-  nsPresContext* presContext = PresContext();
-  gfxRect r = gfxRect(presContext->AppUnitsToGfxUnits(area.x),
-                      presContext->AppUnitsToGfxUnits(area.y),
-                      presContext->AppUnitsToGfxUnits(area.width),
-                      presContext->AppUnitsToGfxUnits(area.height));
-  r = CorrectForAspectRatio(r, videoSize);
-  r.Round();
-  if (r.IsEmpty()) {
+  // Convert video size from pixel units into app units, to get an aspect-ratio
+  // (which has to be represented as a nsSize) and an IntrinsicSize that we
+  // can pass to ComputeObjectRenderRect.
+  nsSize aspectRatio(nsPresContext::CSSPixelsToAppUnits(videoSizeInPx.width),
+                     nsPresContext::CSSPixelsToAppUnits(videoSizeInPx.height));
+  IntrinsicSize intrinsicSize;
+  intrinsicSize.width.SetCoordValue(aspectRatio.width);
+  intrinsicSize.height.SetCoordValue(aspectRatio.height);
+
+  nsRect contentBoxRect(
+    GetContentRectRelativeToSelf().TopLeft() + aItem->ToReferenceFrame(),
+    contentBoxSize);
+
+  nsRect dest = nsLayoutUtils::ComputeObjectDestRect(contentBoxRect,
+                                                     intrinsicSize,
+                                                     aspectRatio,
+                                                     StylePosition());
+
+  gfxRect destGFXRect = PresContext()->AppUnitsToGfxUnits(dest);
+  destGFXRect.Round();
+  if (destGFXRect.IsEmpty()) {
     return nullptr;
   }
-  IntSize scaleHint(static_cast<int32_t>(r.Width()),
-                    static_cast<int32_t>(r.Height()));
+  IntSize scaleHint(static_cast<int32_t>(destGFXRect.Width()),
+                    static_cast<int32_t>(destGFXRect.Height()));
   container->SetScaleHint(scaleHint);
 
   nsRefPtr<ImageLayer> layer = static_cast<ImageLayer*>
@@ -221,11 +218,10 @@
   layer->SetContainer(container);
   layer->SetFilter(nsLayoutUtils::GetGraphicsFilterForFrame(this));
   // Set a transform on the layer to draw the video in the right place
-  gfxPoint p = r.TopLeft() + aContainerParameters.mOffset;
+  gfxPoint p = destGFXRect.TopLeft() + aContainerParameters.mOffset;
   Matrix transform = Matrix::Translation(p.x, p.y);
-  transform.PreScale(r.Width() / frameSize.width,
-                     r.Height() / frameSize.height);
   layer->SetBaseTransform(gfx::Matrix4x4::From2D(transform));
+  layer->SetScaleToSize(scaleHint, ScaleMode::STRETCH);
   nsRefPtr<Layer> result = layer.forget();
   return result.forget();
 }
@@ -287,35 +283,20 @@
                                        aMetrics.Width(),
                                        aMetrics.Height());
 
-      uint32_t posterHeight, posterWidth;
-      nsSize scaledPosterSize(0, 0);
-      nsSize computedArea(aReflowState.ComputedWidth(), aReflowState.ComputedHeight());
-      nsPoint posterTopLeft(0, 0);
-
-      nsCOMPtr<nsIDOMHTMLImageElement> posterImage = do_QueryInterface(mPosterImage);
-      if (!posterImage) {
-        return;
-      }
-      posterImage->GetNaturalHeight(&posterHeight);
-      posterImage->GetNaturalWidth(&posterWidth);
-
-      if (ShouldDisplayPoster() && posterHeight && posterWidth) {
-        gfxFloat scale =
-          std::min(static_cast<float>(computedArea.width)/nsPresContext::CSSPixelsToAppUnits(static_cast<float>(posterWidth)),
-                 static_cast<float>(computedArea.height)/nsPresContext::CSSPixelsToAppUnits(static_cast<float>(posterHeight)));
-        gfxSize scaledRatio = gfxSize(scale*posterWidth, scale*posterHeight);
-        scaledPosterSize.width = nsPresContext::CSSPixelsToAppUnits(static_cast<float>(scaledRatio.width));
-        scaledPosterSize.height = nsPresContext::CSSPixelsToAppUnits(static_cast<int32_t>(scaledRatio.height));
+      nsRect posterRenderRect;
+      if (ShouldDisplayPoster()) {
+        posterRenderRect =
+          nsRect(nsPoint(mBorderPadding.left, mBorderPadding.top),
+                 nsSize(aReflowState.ComputedWidth(),
+                        aReflowState.ComputedHeight()));
       }
-      kidReflowState.SetComputedWidth(scaledPosterSize.width);
-      kidReflowState.SetComputedHeight(scaledPosterSize.height);
-      posterTopLeft.x = ((computedArea.width - scaledPosterSize.width) / 2) + mBorderPadding.left;
-      posterTopLeft.y = ((computedArea.height - scaledPosterSize.height) / 2) + mBorderPadding.top;
-
+      kidReflowState.SetComputedWidth(posterRenderRect.width);
+      kidReflowState.SetComputedHeight(posterRenderRect.height);
       ReflowChild(imageFrame, aPresContext, kidDesiredSize, kidReflowState,
-                        posterTopLeft.x, posterTopLeft.y, 0, aStatus);
-      FinishReflowChild(imageFrame, aPresContext, kidDesiredSize, &kidReflowState,
-                        posterTopLeft.x, posterTopLeft.y, 0);
+                  posterRenderRect.x, posterRenderRect.y, 0, aStatus);
+      FinishReflowChild(imageFrame, aPresContext,
+                        kidDesiredSize, &kidReflowState,
+                        posterRenderRect.x, posterRenderRect.y, 0);
     } else if (child->GetContent() == mVideoControls) {
       // Reflow the video controls frame.
       nsBoxLayoutState boxState(PresContext(), aReflowState.rendContext);
@@ -433,10 +414,24 @@
 
   DisplayBorderBackgroundOutline(aBuilder, aLists);
 
+  const bool shouldDisplayPoster = ShouldDisplayPoster();
+
+  // NOTE: If we're displaying a poster image (instead of video data), we can
+  // trust the nsImageFrame to constrain its drawing to its content rect
+  // (which happens to be the same as our content rect).
+  uint32_t clipFlags;
+  if (shouldDisplayPoster ||
+      !nsStyleUtil::ObjectPropsMightCauseOverflow(StylePosition())) {
+    clipFlags =
+      DisplayListClipState::ASSUME_DRAWING_RESTRICTED_TO_CONTENT_RECT;
+  } else {
+    clipFlags = 0;
+  }
+
   DisplayListClipState::AutoClipContainingBlockDescendantsToContentBox
-    clip(aBuilder, this, DisplayListClipState::ASSUME_DRAWING_RESTRICTED_TO_CONTENT_RECT);
+    clip(aBuilder, this, clipFlags);
 
-  if (HasVideoElement() && !ShouldDisplayPoster()) {
+  if (HasVideoElement() && !shouldDisplayPoster) {
     aLists.Content()->AppendNewToTop(
       new (aBuilder) nsDisplayVideo(aBuilder, this));
   }
@@ -447,7 +442,7 @@
   for (nsIFrame *child = mFrames.FirstChild();
        child;
        child = child->GetNextSibling()) {
-    if (child->GetContent() != mPosterImage || ShouldDisplayPoster()) {
+    if (child->GetContent() != mPosterImage || shouldDisplayPoster) {
       child->BuildDisplayListForStackingContext(aBuilder,
                                                 aDirtyRect - child->GetOffsetTo(this),
                                                 aLists.Content());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/test/frame_selection_underline-ref.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/test/frame_selection_underline-ref.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/test/frame_selection_underline-ref.xhtml	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/test/frame_selection_underline-ref.xhtml	2014-11-26 21:46:07.000000000 +0000
@@ -32,8 +32,8 @@
   target.style.fontFamily = aTest.font.family;
   target.style.fontSize = aTest.font.defaultSize;
 
-  decoration.style.MozTextDecorationStyle = aTest.decoration.styleName;
-  decoration.style.MozTextDecorationColor = aTest.selection.decorationColor;
+  decoration.style.textDecorationStyle = aTest.decoration.styleName;
+  decoration.style.textDecorationColor = aTest.selection.decorationColor;
 
   document.documentElement.removeAttribute("class");
   setTimeout(function () {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/WritingModes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/WritingModes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/generic/WritingModes.h	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/generic/WritingModes.h	2014-11-26 21:46:06.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsRect.h"
 #include "nsStyleContext.h"
+#include "nsBidiUtils.h"
 
 // If WRITING_MODE_VERTICAL_ENABLED is defined, we will attempt to support
 // the vertical writing-mode values; if it is not defined, then
@@ -16,7 +17,12 @@
 // of transitioning layout to use writing-mode and logical directions, but
 // not yet ready to ship vertical support.
 
-/* #define WRITING_MODE_VERTICAL_ENABLED 1 */
+// XXX To be removed, and the #ifdef blocks below made unconditional,
+//     once we're confident we can leave it permanently enabled.
+
+#ifndef RELEASE_BUILD
+#define WRITING_MODE_VERTICAL_ENABLED 1
+#endif
 
 // It is the caller's responsibility to operate on logical-coordinate objects
 // with matched writing modes. Failure to do so will be a runtime bug; the
@@ -304,11 +310,11 @@
   //XXX change uint8_t to UBiDiLevel after bug 924851
   void SetDirectionFromBidiLevel(uint8_t level)
   {
-    if (level & 1) {
-      // odd level, set RTL
+    if (IS_LEVEL_RTL(level)) {
+      // set RTL
       mWritingMode |= eBidiMask;
     } else {
-      // even level, set LTR
+      // set LTR
       mWritingMode &= ~eBidiMask;
     }
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/ipc/RenderFrameParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/ipc/RenderFrameParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/ipc/RenderFrameParent.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/ipc/RenderFrameParent.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -545,6 +545,22 @@
 }
 
 void
+RenderFrameParent::SetTargetAPZC(uint64_t aInputBlockId,
+                                 const nsTArray<ScrollableLayerGuid>& aTargets)
+{
+  for (size_t i = 0; i < aTargets.Length(); i++) {
+    if (aTargets[i].mLayersId != mLayersId) {
+      // Guard against bad data from hijacked child processes
+      NS_ERROR("Unexpected layers id in SetTargetAPZC; dropping message...");
+      return;
+    }
+  }
+  if (GetApzcTreeManager()) {
+    GetApzcTreeManager()->SetTargetAPZC(aInputBlockId, aTargets);
+  }
+}
+
+void
 RenderFrameParent::UpdateZoomConstraints(uint32_t aPresShellId,
                                          ViewID aViewId,
                                          bool aIsRoot,
@@ -565,6 +581,19 @@
   return mTouchRegion.Contains(aRect);
 }
 
+void
+RenderFrameParent::GetTextureFactoryIdentifier(TextureFactoryIdentifier* aTextureFactoryIdentifier)
+{
+  nsRefPtr<LayerManager> lm = GetFrom(mFrameLoader);
+  // Perhaps the document containing this frame currently has no presentation?
+  if (lm && lm->GetBackendType() == LayersBackend::LAYERS_CLIENT) {
+    *aTextureFactoryIdentifier =
+      static_cast<ClientLayerManager*>(lm.get())->GetTextureFactoryIdentifier();
+  } else {
+    *aTextureFactoryIdentifier = TextureFactoryIdentifier();
+  }
+}
+
 }  // namespace layout
 }  // namespace mozilla
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/ipc/RenderFrameParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/ipc/RenderFrameParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/ipc/RenderFrameParent.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/ipc/RenderFrameParent.h	2014-11-26 21:46:07.000000000 +0000
@@ -101,6 +101,8 @@
   void ContentReceivedTouch(const ScrollableLayerGuid& aGuid,
                             uint64_t aInputBlockId,
                             bool aPreventDefault);
+  void SetTargetAPZC(uint64_t aInputBlockId,
+                     const nsTArray<ScrollableLayerGuid>& aTargets);
 
   void UpdateZoomConstraints(uint32_t aPresShellId,
                              ViewID aViewId,
@@ -109,6 +111,11 @@
 
   bool HitTest(const nsRect& aRect);
 
+  bool UseAsyncPanZoom() { return !!mContentController; }
+
+  void GetTextureFactoryIdentifier(TextureFactoryIdentifier* aTextureFactoryIdentifier);
+
+  inline uint64_t GetLayersId() { return mLayersId; }
 protected:
   void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/mathml.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/mathml.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/mathml.css	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/mathml.css	2014-11-26 21:46:07.000000000 +0000
@@ -16,6 +16,7 @@
 /**************************************************************************/
 
 math {
+  writing-mode: horizontal-tb !important;
   direction: ltr;
   unicode-bidi: embed;
   display: inline;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/nsMathMLChar.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/nsMathMLChar.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/nsMathMLChar.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/nsMathMLChar.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -2119,9 +2119,9 @@
     case DRAW_PARTS: {
       // paint by parts
       if (NS_STRETCH_DIRECTION_VERTICAL == mDirection)
-        PaintVertically(aPresContext, thebesContext, r);
+        PaintVertically(aPresContext, thebesContext, r, fgColor);
       else if (NS_STRETCH_DIRECTION_HORIZONTAL == mDirection)
-        PaintHorizontally(aPresContext, thebesContext, r);
+        PaintHorizontally(aPresContext, thebesContext, r, fgColor);
       break;
     }
     default:
@@ -2167,22 +2167,25 @@
 }
 
 static void
-PaintRule(gfxContext* aThebesContext,
+PaintRule(DrawTarget& aDrawTarget,
           int32_t     aAppUnitsPerGfxUnit,
-          nsRect&     aRect)
+          nsRect&     aRect,
+          nscolor     aColor)
 {
-  aThebesContext->NewPath();
-  gfxRect rect = nsLayoutUtils::RectToGfxRect(aRect, aAppUnitsPerGfxUnit);
-  aThebesContext->SnappedRectangle(rect);
-  aThebesContext->Fill();
+  Rect rect = NSRectToSnappedRect(aRect, aAppUnitsPerGfxUnit, aDrawTarget);
+  ColorPattern color(ToDeviceColor(aColor));
+  aDrawTarget.FillRect(rect, color);
 }
 
 // paint a stretchy char by assembling glyphs vertically
 nsresult
 nsMathMLChar::PaintVertically(nsPresContext* aPresContext,
                               gfxContext*    aThebesContext,
-                              nsRect&        aRect)
+                              nsRect&        aRect,
+                              nscolor        aColor)
 {
+  DrawTarget& aDrawTarget = *aThebesContext->GetDrawTarget();
+
   // Get the device pixel size in the vertical direction.
   // (This makes no effort to optimize for non-translation transformations.)
   nscoord oneDevPixel = aPresContext->AppUnitsPerDevPixel();
@@ -2306,7 +2309,7 @@
       // paint the rule between the parts
       nsRect rule(aRect.x + lbearing, end[first],
                   rbearing - lbearing, start[last] - end[first]);
-      PaintRule(aThebesContext, oneDevPixel, rule);
+      PaintRule(aDrawTarget, oneDevPixel, rule, aColor);
       first = last;
       last++;
     }
@@ -2355,8 +2358,11 @@
 nsresult
 nsMathMLChar::PaintHorizontally(nsPresContext* aPresContext,
                                 gfxContext*    aThebesContext,
-                                nsRect&        aRect)
+                                nsRect&        aRect,
+                                nscolor        aColor)
 {
+  DrawTarget& aDrawTarget = *aThebesContext->GetDrawTarget();
+
   // Get the device pixel size in the horizontal direction.
   // (This makes no effort to optimize for non-translation transformations.)
   nscoord oneDevPixel = aPresContext->AppUnitsPerDevPixel();
@@ -2473,7 +2479,7 @@
       // paint the rule between the parts
       nsRect rule(end[first], dy - ascent,
                   start[last] - end[first], ascent + descent);
-      PaintRule(aThebesContext, oneDevPixel, rule);
+      PaintRule(aDrawTarget, oneDevPixel, rule, aColor);
       first = last;
       last++;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/nsMathMLChar.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/nsMathMLChar.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/nsMathMLChar.h	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/nsMathMLChar.h	2014-11-26 21:46:07.000000000 +0000
@@ -7,6 +7,7 @@
 #define nsMathMLChar_h___
 
 #include "nsAutoPtr.h"
+#include "nsColor.h"
 #include "nsMathMLOperators.h"
 #include "nsPoint.h"
 #include "nsRect.h"
@@ -258,12 +259,14 @@
   nsresult
   PaintVertically(nsPresContext* aPresContext,
                   gfxContext*    aThebesContext,
-                  nsRect&        aRect);
+                  nsRect&        aRect,
+                  nscolor        aColor);
 
   nsresult
   PaintHorizontally(nsPresContext* aPresContext,
                     gfxContext*    aThebesContext,
-                    nsRect&        aRect);
+                    nsRect&        aRect,
+                    nscolor        aColor);
 
   void
   ApplyTransforms(gfxContext* aThebesContext, int32_t aAppUnitsPerGfxUnit,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/nsMathMLmfracFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/nsMathMLmfracFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/mathml/nsMathMLmfracFrame.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/mathml/nsMathMLmfracFrame.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -5,6 +5,11 @@
 
 
 #include "nsMathMLmfracFrame.h"
+
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/RefPtr.h"
+#include "nsLayoutUtils.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
 #include "nsDisplayList.h"
@@ -12,6 +17,9 @@
 #include "nsMathMLElement.h"
 #include <algorithm>
 
+using namespace mozilla;
+using namespace mozilla::gfx;
+
 //
 // <mfrac> -- form a fraction from two subexpressions - implementation
 //
@@ -602,32 +610,32 @@
 void nsDisplayMathMLSlash::Paint(nsDisplayListBuilder* aBuilder,
                                  nsRenderingContext* aCtx)
 {
+  DrawTarget& aDrawTarget = *aCtx->GetDrawTarget();
+
   // get the gfxRect
   nsPresContext* presContext = mFrame->PresContext();
-  gfxRect rect = presContext->AppUnitsToGfxUnits(mRect + ToReferenceFrame());
+  Rect rect = NSRectToRect(mRect + ToReferenceFrame(),
+                           presContext->AppUnitsPerDevPixel());
   
-  // paint with the current text color
-  aCtx->ThebesContext()->SetColor(mFrame->GetVisitedDependentColor(eCSSProperty_color));
+  ColorPattern color(ToDeviceColor(
+                       mFrame->GetVisitedDependentColor(eCSSProperty_color)));
  
   // draw the slash as a parallelogram 
-  gfxContext *gfxCtx = aCtx->ThebesContext();
-  gfxPoint delta = gfxPoint(presContext->AppUnitsToGfxUnits(mThickness), 0);
-  gfxCtx->NewPath();
-
+  Point delta = Point(presContext->AppUnitsToGfxUnits(mThickness), 0);
+  RefPtr<PathBuilder> builder = aDrawTarget.CreatePathBuilder();
   if (mRTL) {
-    gfxCtx->MoveTo(rect.TopLeft());
-    gfxCtx->LineTo(rect.TopLeft() + delta);
-    gfxCtx->LineTo(rect.BottomRight());
-    gfxCtx->LineTo(rect.BottomRight() - delta);
+    builder->MoveTo(rect.TopLeft());
+    builder->LineTo(rect.TopLeft() + delta);
+    builder->LineTo(rect.BottomRight());
+    builder->LineTo(rect.BottomRight() - delta);
   } else {
-    gfxCtx->MoveTo(rect.BottomLeft());
-    gfxCtx->LineTo(rect.BottomLeft() + delta);
-    gfxCtx->LineTo(rect.TopRight());
-    gfxCtx->LineTo(rect.TopRight() - delta);
+    builder->MoveTo(rect.BottomLeft());
+    builder->LineTo(rect.BottomLeft() + delta);
+    builder->LineTo(rect.TopRight());
+    builder->LineTo(rect.TopRight() - delta);
   }
-
-  gfxCtx->ClosePath();
-  gfxCtx->Fill();
+  RefPtr<Path> path = builder->Finish();
+  aDrawTarget.Fill(path, color);
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/border-radius/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/border-radius/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/border-radius/reftest.list	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/border-radius/reftest.list	2014-11-26 21:46:08.000000000 +0000
@@ -24,11 +24,11 @@
 
 # more serious tests, using SVG reference
 == border-circle-2.html border-circle-2-ref.xhtml
-fails == curved-stripe-border.html curved-stripe-border-ref.svg # bug 459945
+fuzzy-if(gtk2Widget,7,437) fuzzy-if(azureQuartz,4,582) fuzzy-if(Android||B2G,36,264) fuzzy-if(d2d,51,323) fuzzy-if(winWidget&&!d2d,16,377) == curved-stripe-border.html curved-stripe-border-ref.svg # bug 459945
 
 # Corners
 == corner-1.html corner-1-ref.svg # bottom corners different radius than top corners
-random == corner-2.html corner-2-ref.svg # right corners different radius than left corners; see bug 500804
+fuzzy-if(winWidget&&!d2d,23,5) fuzzy-if(d2d,32,8) fuzzy-if(Android||B2G,10,8) == corner-2.html corner-2-ref.svg # right corners different radius than left corners; see bug 500804
 fuzzy-if(winWidget&&!d2d,3,10) fuzzy-if(d2d,15,32) fuzzy-if(Android||B2G,3,15) == corner-3.html corner-3-ref.svg
 == corner-4.html corner-4-ref.svg
 
@@ -39,7 +39,7 @@
 fails == clipping-1.html clipping-1-ref.html # background color should completely fill box; bug 466572
 != clipping-2.html about:blank # background color clipped to inner/outer border, can't get
 # great tests for this due to antialiasing problems described in bug 466572
-fuzzy-if(Android&&AndroidVersion<15,9,73) fuzzy-if(Android&&AndroidVersion>=15,9,200) == clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background
+== clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background
 
 # Tests for clipping the contents of replaced elements and overflow!=visible
 != clipping-4-ref.html clipping-4-notref.html
@@ -87,6 +87,6 @@
 == iframe-1.html iframe-1-ref.html
 
 # Test for antialiasing gaps between background and border
-skip-if(B2G) fails-if(d2d) fuzzy-if(winWidget&&!d2d,1,9) fuzzy-if(Android,1,5) == curved-border-background-nogap.html curved-border-background-nogap-ref.html
+fuzzy-if(winWidget&&!d2d,1,9) fuzzy-if(d2d,5,40) fuzzy-if(Android||B2G,1,5) == curved-border-background-nogap.html curved-border-background-nogap-ref.html
 
 == color-layer-1a.html color-layer-1-ref.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/bugs/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/bugs/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/bugs/reftest.list	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/bugs/reftest.list	2014-11-26 21:45:45.000000000 +0000
@@ -1195,9 +1195,9 @@
 == 455280-1.xhtml 455280-1-ref.xhtml
 skip-if(B2G) fails-if(Android) == 455826-1.html 455826-1-ref.html
 skip-if(B2G) fails-if(cocoaWidget) fails-if(Android) == 456147.xul 456147-ref.html # bug 458047
-skip-if(B2G) fails-if(Android) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,69) == 456219-1a.html 456219-1-ref.html # bug 853273
-skip-if(B2G) fails-if(Android) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,69) == 456219-1b.html 456219-1-ref.html # bug 853273
-skip-if(B2G) fails-if(Android) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),1,1) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,69) == 456219-1c.html 456219-1-ref.html # bug 853273
+fuzzy-if(Android,11,40) fuzzy-if(B2G,11,35) fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,69) == 456219-1a.html 456219-1-ref.html # bug 853273
+fuzzy-if(Android,11,40) fuzzy-if(B2G,11,35) fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,69) == 456219-1b.html 456219-1-ref.html # bug 853273
+fuzzy-if(Android,11,40) fuzzy-if(B2G,11,35) fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,69) == 456219-1c.html 456219-1-ref.html # bug 853273
 == 456219-2.html 456219-2-ref.html
 == 456330-1.gif 456330-1-ref.png
 == 456484-1.html 456484-1-ref.html
@@ -1383,7 +1383,7 @@
 == 495385-3.html 495385-3-ref.html
 == 495385-4.html 495385-4-ref.html
 == 495385-5.html 495385-5-ref.html
-asserts(1) == 496032-1.html 496032-1-ref.html # bug 399262
+== 496032-1.html 496032-1-ref.html
 == 496840-1.html 496840-1-ref.html
 skip-if(B2G&&browserIsRemote) == 498228-1.xul 498228-1-ref.xul # bug 974780
 == 501037.html 501037-ref.html
@@ -1652,7 +1652,7 @@
 skip-if(!haveTestPlugin) skip-if(B2G) fails-if(Android) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535)  == 632423-1.html 632423-1-ref.html
 skip-if(Android||B2G) random-if(winWidget) == 632781-verybig.html 632781-ref.html
 == 632781-normalsize.html 632781-ref.html
-== 633344-1.html 633344-1-ref.html
+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
@@ -1843,5 +1843,5 @@
 == 1069716-1.html 1069716-1-ref.html
 == 1078262-1.html about:blank
 test-pref(layout.testing.overlay-scrollbars.always-visible,false) == 1081072-1.html 1081072-1-ref.html
-== 1081185-1.html 1081185-1-ref.html
+fuzzy-if(winWidget&&!layersGPUAccelerated,1,31) == 1081185-1.html 1081185-1-ref.html
 == 1097437-1.html 1097437-1-ref.html
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-495385-2d.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-495385-2d.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-495385-2d.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-495385-2d.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+<!-- Test that before/after generated content stops suppression correctly,
+     both statically and dynamically -->
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; with ::after/::before</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style>
+body > div { border:1px solid black; margin:1em;
+             font-family:sans-serif; letter-spacing:2px; }
+#d1:before { content:"Hello"; }
+#d2:after { content:"Kitty"; }
+#d3.c:before { content:"Hello"; }
+#d4.c:after { content:"Kitty"; }
+#d5.c:before { content:"Hello"; }
+#d6.c:after { content:"Kitty"; }
+#d7.c:after { content:"Kitty"; }
+#d8.c:before { content:"Hello"; }
+#d5,#d6 { overflow:hidden; }
+#d1,#d2,#d3,#d4 { display:contents; }
+x { display:table; }
+y { display:table-outer; }
+</style>
+<script>
+function loaded() {
+  document.body.offsetHeight;
+  document.getElementById("d3").setAttribute("class", "c");
+  document.getElementById("d4").setAttribute("class", "c");
+  document.getElementById("d5").setAttribute("class", "c");
+  document.getElementById("d6").setAttribute("class", "c");
+  document.getElementById("d7").setAttribute("class", "c");
+  document.getElementById("d8").setAttribute("class", "c");
+}
+</script>
+</head>
+<body onload="loaded()">
+  <div><div id="d1"> <span>Kitty</span></div></div>
+  <div><div id="d2"><span>Hello</span> </div></div>
+  <div><div id="d3"> <span>Kitty</span></div></div>
+  <div><div id="d4"><span>Hello</span> </div></div>
+  <div><div id="d5"> <span>Kitty</span></div></div>
+  <div><div id="d6"><span>Hello</span> </div></div>
+  <div><x id="d7"><span>Hello</span> </div></x>
+  <div><x id="d8"> <span>Kitty</span> </div></x>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-495385-2d-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-495385-2d-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-495385-2d-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-495385-2d-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<head>
+<style>
+body > div { border:1px solid black; margin:1em;
+             font-family:sans-serif; letter-spacing:2px; }
+</style>
+</head>
+<body>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+  <div><span>Hello</span> <span>Kitty</span></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-dyn-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-dyn-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-dyn-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-dyn-1.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+
+        html,body {
+            color:black; background-color:white; height:100%; font-size:16px; padding:0; margin:0;
+        }
+
+iframe { padding:0;margin:0;border-width:0;width:100%;height:90%; color:red; }
+
+    </style>
+<script>
+function runTest(iframe) {
+  var win = iframe.contentWindow;
+  var doc = iframe.contentDocument;
+  doc.body.offsetHeight
+  var e = doc.querySelectorAll('*');
+  var contents = new Array;
+  for (i=0; i < e.length; ++i) {
+    var elm = e[i];
+    if (win.getComputedStyle(elm).display == 'contents') {
+      contents.push(elm);
+      elm.style.display='none';
+    }
+  }
+  doc.body.offsetHeight;
+  for (i=0; i < contents.length; ++i) {
+    elm = contents[i];
+    elm.style.display='contents';
+  }
+  doc.body.offsetHeight;
+}
+</script>
+</head>
+<body>
+
+<iframe src="display-contents-acid.html" frameborder=0 onload="runTest(this)"></iframe>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-dyn-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-dyn-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-dyn-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-dyn-2.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+
+        html,body {
+            color:black; background-color:white; height:100%; font-size:16px; padding:0; margin:0;
+        }
+
+iframe { padding:0;margin:0;border-width:0;width:100%;height:90%; color:red; }
+
+    </style>
+<script>
+function runTest(iframe) {
+  var win = iframe.contentWindow;
+  var doc = iframe.contentDocument;
+  doc.body.offsetHeight
+  var e = doc.querySelectorAll('*');
+  var contents = new Array;
+  for (i=0; i < e.length; ++i) {
+    var elm = e[i];
+    if (win.getComputedStyle(elm).display == 'contents') {
+      contents.push(elm);
+      elm.style.display='inline';
+    }
+  }
+  doc.body.offsetHeight;
+  for (i=0; i < contents.length; ++i) {
+    elm = contents[i];
+    elm.style.display='contents';
+  }
+  doc.body.offsetHeight;
+}
+</script>
+</head>
+<body>
+
+<iframe src="display-contents-acid.html" frameborder=0 onload="runTest(this)"></iframe>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-dyn-3.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-dyn-3.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-dyn-3.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-dyn-3.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+
+        html,body {
+            color:black; background-color:white; height:100%; font-size:16px; padding:0; margin:0;
+        }
+
+iframe { padding:0;margin:0;border-width:0;width:100%;height:90%; color:red; }
+
+    </style>
+<script>
+function runTest(iframe) {
+  var win = iframe.contentWindow;
+  var doc = iframe.contentDocument;
+  doc.body.offsetHeight
+  var e = doc.querySelectorAll('*');
+  var contents = new Array;
+  for (i=0; i < e.length; ++i) {
+    var elm = e[i];
+    if (win.getComputedStyle(elm).display == 'contents') {
+      contents.push([ elm, elm.nextSibling, elm.parentNode ]);
+      elm.parentNode.removeChild(elm);
+    }
+  }
+  doc.body.offsetHeight;
+  var i = contents.length;
+  while(i--) {
+    var arr = contents[i];
+    arr[2].insertBefore(arr[0], arr[1]);
+  }
+  doc.body.offsetHeight;
+}
+</script>
+</head>
+<body>
+
+<iframe src="display-contents-acid.html" frameborder=0 onload="runTest(this)"></iframe>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+
+        html,body {
+            color:black; background-color:white; font-size:16px; padding:0; margin:0;
+        }
+	
+.table   { display:table; border-collapse:collapse; border: blue solid 1pt;}
+.itable  { display:inline-table; }
+.caption { display:table-caption; }
+.cell    { display:table-cell; border:inherit; }
+.row     { display:table-row; border: green dashed 1pt; }
+.rowg    { display:table-row-group; }
+.head    { display:table-header-group; }
+.foot    { display:table-footer-group; }
+.col     { display:table-column; }
+.colg    { display:table-column-group; }
+.flex    { display:flex; }
+.iflex   { display:inline-flex; }
+.li      { display:list-item; }
+.ib      { display:inline-block; }
+.inline  { display:inline; }
+.columns  { -moz-columns:2; columns:2; height:4em; }
+
+.contents { display:contents; }
+
+.c1 { color:lime; }
+.c2 { background:blue; color:pink; }
+.c3 { color:teal; }
+.c4 { color:green; }
+.c5 { color:silver; }
+.c6 { color:cyan; }
+.c7 { color:magenta; }
+.c8 { color:yellow; }
+.c9 { color:grey; }
+.c10{ color:black; }
+
+.b { background:inherit; }
+    </style>
+</head>
+<body style="color:red">
+
+<div class="contents c1"><div class="contents c2"><div class="caption">1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div class="row">2a<div class="cell">2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
+<div class="contents c3"><div class="cell">3</div></div>
+<div class="contents c4"><div class="rowg">4</div></div>
+<div class="contents c5"><div class="cell">5a</div></div>
+<div class="cell c5">5b</div>
+<div class="contents c6"><div class="head">6</div></div>
+<div class="contents c7"><div class="cell"><div class="contents c2">7<span class="b">a</span></div></div></div>
+<div class="contents c8"><div class="cell">7b</div></div>
+<div class="contents c9"><div class="foot">8</div></div>
+<div class="contents c9"><div class="foot">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
+<div class="contents c10"><div class="cell">10</div></div>
+
+<div class="table" style="float:right">
+<div class="contents c1"><div class="contents c2"><div class="caption">1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div class="row">2a<div class="cell">2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
+<div class="contents c3"><div class="cell">3</div></div>
+<div class="contents c4"><div class="rowg">4</div></div>
+<div class="contents c5"><div class="cell">5a</div></div>
+<div class="cell c5">5b</div>
+<div class="contents c6"><div class="head">6</div></div>
+<div class="contents c7"><div class="cell"><div class="contents c2">7<span class="b">a</span></div></div></div>
+<div class="contents c8"><div class="cell">7b</div></div>
+<div class="contents c9"><div class="foot">8</div></div>
+<div class="contents c9"><div class="foot">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
+<div class="contents c10"><div class="cell">10</div></div>
+</div>
+
+<div class="flex c1">
+0
+<div class="contents c1">x</div>
+<div class="contents c1"><div class="contents c2">y</div></div>
+<div class="contents c1"><div class="contents c2"><div class="">1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div class="inline">2a<div class="">2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
+<div class="contents c3"><div class="inline">3</div></div>
+<div class="inline"><div class="contents c4">4</div></div>
+<div class=""><div class="contents c5">5a</div></div>
+<div class=" c5">5b</div>
+<div class="contents c6"><div class="">6</div></div>
+<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
+<div class="contents c9"><div class="">8</div></div>
+<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
+<div class="contents c10"><div class="">10</div></div>
+</div>
+
+<div class="flex"><div class="contents c2">
+0
+<div class="contents c1">x</div>
+<div class="contents c1"><div class="contents c2">y</div></div>
+<div class="contents c1"><div class="contents c2"><div class="">1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div class="inline">2a<div class="">2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
+<div class="contents c3"><div class="inline">3</div></div>
+<div class=""><div class="contents c4">4</div></div>
+<div class=""><div class="contents c5">5a</div></div>
+<div class=" c5">5b</div>
+<div class="contents c6"><div class="">6</div></div>
+<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
+<div class="contents c9"><div class="">8</div></div>
+<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
+<div class="contents c10"><div class="">10</div></div>
+</div></div>
+
+<div class="iflex"><div class="contents c2">
+0
+</div></div>
+<div class="iflex"><div class="contents c2">
+0
+<div class="contents c1">1</div>
+2
+</div></div>
+<div class="iflex"><div class="contents c2">
+0
+<div class="c1">1</div>
+2
+</div></div>
+<div class="iflex c3">
+0
+<div class="contents c2"><div class="c1">1</div></div>
+2
+</div>
+<div class="iflex c3">
+<div class="contents c2">0</div>
+<div class="contents c2"><div class="c1">1</div></div>
+<div class="contents c2">2</div>
+</div>
+<div class="iflex c3">
+<div class="inline">0</div>
+<div class="contents"><div class="inline c1">1</div></div>
+<div class="inline">2</div>
+</div>
+
+<ul><li class="c1"><div class="contents c2">
+0
+<div class="contents c1">x</div>
+<div class="contents c1"><div class="contents c2">y</div></div>
+<div class="contents c1"><div class="contents c2"><div class="">1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div class="inline">2a<div class="">2<div class="contents c2">b<span class="b">b</span></div></div></div></div>
+<div class="contents c3"><div class="inline">3</div></div>
+<div class="inline"><div class="contents c4">4</div></div>
+<div class=""><div class="contents c5">5a</div></div>
+<div class=" c5">5b</div>
+<div class="contents c6"><div class="">6</div></div>
+<div class="ib"><div class="contents c7"><div class="contents c2">7<span class="b">a</span></div></div></div>
+<div class="contents c9"><div class="">8</div></div>
+<div class="contents c9"><div class="contents">9<div class="contents c2">a<span class="b">b</span>c</div></div></div>
+<div class="contents c10"><div class="">10</div></div>
+</div></li>
+</ul>
+
+<div class="columns">
+<div class="contents c1"><div class="contents c2"><div>1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div>2</div></div>
+<div class="contents c3"><div>3</div></div>
+</div>
+
+<div class="columns">
+<div class="columns contents">
+<div class="contents c1"><div class="contents c2"><div>1<span class="b">1</span></div></div></div>
+<div class="contents c2"><div>2</div></div>
+<div class="contents c3"><div>3</div></div>
+</div>
+</div>
+
+<div class="contents c3"><!-- comment node --></div>
+<div class="contents c3"><?PI ?></div>
+
+<span class="c2"><legend class="contents c1">Legend</legend><legend class="contents c1">Legend</legend></span>
+<br clear="all">
+<span class="c3">x<div class="contents c1" style="float:left">float:left</div></span>
+<span class="c3">y<div class="contents c1" style="position:absolute">position:absolute</div></span>
+
+<!-- Stuff below should simply ignore having display:contents -->
+
+<fieldset class="contents c1"><legend class="contents">Legend</legend>fieldset</fieldset>
+<button class="contents c1">but<span>ton</span></button>
+<select class="contents c1"><option>select</select>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-acid-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-acid-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+<style type="text/css">
+
+        html,body {
+            color:black; background-color:white; font-size:16px; padding:0; margin:0;
+        }
+	
+.table   { display:table; border-collapse:collapse; border: blue solid 1pt;}
+.itable  { display:inline-table; }
+.caption { display:table-caption; }
+.cell    { display:table-cell; border:inherit; }
+.row     { display:table-row; border: green dashed 1pt; }
+.rowg    { display:table-row-group; }
+.head    { display:table-header-group; }
+.foot    { display:table-footer-group; }
+.col     { display:table-column; }
+.colg    { display:table-column-group; }
+.flex    { display:flex; }
+.iflex   { display:inline-flex; }
+.li      { display:list-item; }
+.ib      { display:inline-block; }
+.inline  { display:inline; }
+.columns  { -moz-columns:2; columns:2; height:4em; }
+
+
+
+.c1 { color:lime; }
+.c2 { color:pink; }
+.c3 { color:teal; }
+.c4 { color:green; }
+.c5 { color:silver; }
+.c6 { color:cyan; }
+.c7 { color:magenta; }
+.c8 { color:yellow; }
+.c9 { color:grey; }
+.c10{ color:black; }
+
+.b { background:blue; }
+    </style>
+</head>
+<body style="color:red">
+
+<div class="caption c2">1<span>1</span></div>
+<div class="row c2">2a<div class="cell">2<div class="inline c2">b<span class="b">b</span></div></div></div>
+<div class="cell c3">3</div>
+<div class="rowg c4">4</div>
+<div class="cell c5">5a</div>
+<div class="cell c5">5b</div>
+<div class="head c6">6</div>
+<div class="cell c7"><div class="inline c2">7<span class="b">a</span></div></div>
+<div class="cell c8">7b</div>
+<div class="foot c9">8</div>
+<div class="foot c9">9<div class="inline c2">a<span class="b">b</span>c</div></div>
+<div class="cell c10">10</div>
+
+<div class="table" style="float:right">
+<div class="caption c2">1<span>1</span></div>
+<div class="row c2">2a<div class="cell">2<div class="inline c2">b<span class="b">b</span></div></div></div>
+<div class="cell c3" style="border:none">3</div>
+<div class="rowg c4">4</div>
+<div class="cell c5" style="border:none">5a</div>
+<div class="cell c5">5b</div>
+<div class="head c6">6</div>
+<div class="cell c7" style="border:none"><div class="inline c2">7<span class="b">a</span></div></div>
+<div class="cell c8" style="border:none">7b</div>
+<div class="foot c9" style="border:none">8</div>
+<div class="foot c9">9<div class="inline c2">a<span class="b">b</span>c</div></div>
+<div class="cell c10" style="border:none">10</div>
+</div>
+
+<div class="flex c1">
+0&nbsp;
+<div class="inline c1">x&nbsp;</div>
+<div class="inline c1"><div class="inline c2">y</div></div>
+<div class="inline c1"><div class="inline c2"><div class="">1<span>1</span></div></div></div>
+<div class="inline c2"><div class="inline">2a<div class="">2<div class="inline c2">b<span class="b">b</span></div></div></div></div>
+<div class="c3">3</div>
+<div class="inline"><div class="inline c4">4</div></div>
+<div class=""><div class="inline c5">5a</div></div>
+<div class=" c5">5b</div>
+<div class="inline c6"><div class="">6</div></div>
+<div class="ib"><div class="inline c7"><div class="inline c2">7<span class="b">a</span></div></div></div>
+<div class="inline c9"><div class="">8</div></div>
+<div class="inline c9"><div class="inline">9<div class="inline c2">a</div></div></div>
+<span class="c2 b">b</span>
+<div class="inline c2">c</div>
+<div class="inline c10"><div class="">10</div></div>
+</div>
+
+<div class="flex c1">
+<div class="inline c2">0&nbsp;</div>
+<div class="inline c1">x&nbsp;</div>
+<div class="inline c1"><div class="inline c2">y</div></div>
+<div class="inline c1"><div class="inline c2"><div class="">1<span>1</span></div></div></div>
+<div class="c2"><div class="inline">2a<div>2<div class="inline c2">b<span class="b">b</span></div></div></div></div>
+<div class="c3">3</div>
+<div class="inline"><div class="inline c4">4</div></div>
+<div class=""><div class="inline c5">5a</div></div>
+<div class=" c5">5b</div>
+<div class="inline c6"><div class="">6</div></div>
+<div class="ib"><div class="inline c7"><div class="inline c2">7<span class="b">a</span></div></div></div>
+<div class="inline c9"><div class="">8</div></div>
+<div class="inline c9"><div class="inline">9<div class="inline c2">a</div></div></div>
+<span class="c2 b">b</span>
+<div class="inline c2">c</div>
+<div class="inline c10"><div class="">10</div></div>
+</div>
+
+
+<div class="iflex"><div class="contents c2">
+0
+</div></div>
+<div class="iflex"><div class="contents c2">
+0
+<div class="inline c1">1</div>
+2
+</div></div>
+<div class="iflex"><div class="contents c2">
+0<div class="inline c1">1</div>2
+</div></div>
+<div class="iflex c3">
+0<div class="inline c2"><div class="c1">1</div></div>2
+</div>
+<div class="iflex c3">
+<div class="inline c2">0</div><div class="inline c2"><div class="c1">1</div></div><div class="inline c2">2</div>
+</div>
+<div class="iflex c3">
+<div class="inline">0</div>
+<div class="inline"><div class="inline c1">1</div></div>
+<div class="inline">2</div>
+</div>
+
+<ul><li class="c1"><div class="inline c2">
+0
+<div class="inline c1">x</div>
+<div class="inline c1"><div class="inline c2">y</div></div>
+<div class="inline c1"><div class="inline c2"><div class="">1<span>1</span></div></div></div>
+<div class="inline c2"><div class="inline">2a<div class="">2<div class="inline c2">b<span class="b">b</span></div></div></div></div>
+<div class="inline c3"><div class="inline">3</div></div>
+<div class="inline"><div class="inline c4">4</div></div>
+<div class=""><div class="inline c5">5a</div></div>
+<div class=" c5">5b</div>
+<div class="inline c6"><div class="">6</div></div>
+<div class="ib"><div class="inline c7"><div class="inline c2">7<span class="b">a</span></div></div></div>
+<div class="inline c9"><div class="">8</div></div>
+<div class="inline c9"><div class="inline">9<div class="inline c2">a<span class="b">b</span>c</div></div></div>
+<div class="inline c10"><div class="">10</div></div>
+</div></li>
+</ul>
+
+<div class="columns">
+<div class="contents c1"><div class="contents c2"><div>1<span>1</span></div></div></div>
+<div class="contents c2"><div>2</div></div>
+<div class="contents c3"><div>3</div></div>
+</div>
+
+<div class="columns">
+<div class="contents c1"><div class="contents c2"><div>1<span>1</span></div></div></div>
+<div class="contents c2"><div>2</div></div>
+<div class="contents c3"><div>3</div></div>
+</div>
+
+<span class="c2 b"><legend class="inline c1">Legend</legend><legend class="inline c1">Legend</legend></span>
+<br clear="all">
+<span class="c3">x<div class="inline c1">float:left</div></span>
+<span class="c3">y<div class="inline c1">position:absolute</div></span>
+
+<!--  -->
+
+<fieldset class="c1" style="display:inline"><legend>Legend</legend>fieldset</fieldset>
+<button class="c1">but<span>ton</span></button>
+<select class="c1"><option>select</select>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-generated-content-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-generated-content-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-generated-content-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-generated-content-2.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,240 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US" class="reftest-wait">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; generated content</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+body,html { color:black; background-color:white; }
+div { display:inline; }
+
+.test {
+  display: contents;
+  content: "content";
+  color: lime;
+}
+.contents {
+  display: contents;
+  color: green;
+}
+.s1 {display: none;}
+.s2 {display: none;}
+.s3 {display: contents;}
+.s5 {display: contents;}
+.s7 {display: none;}
+.s8 {display: none;}
+.s9 {display: contents;}
+.s11 {display: contents;}
+.before::before {
+  display: contents;
+  content:"before";
+}
+.after::after {
+  display: contents;
+  content:"after";
+}
+</style>
+<script>
+
+function setup() {
+  document.body.offsetHeight;
+  document.querySelector('.t1').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t2').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t3').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t4').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t5').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t6').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t7').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t8').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t9').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t10').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t11').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t12').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t13').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s1').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s2').style.display = 'inline';
+  document.body.offsetHeight;
+  document.querySelector('.s3').style.display = 'normal';
+  document.body.offsetHeight;
+  document.querySelector('.s4').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s5').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.s6').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.s7').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s8').style.display = 'inline';
+  document.body.offsetHeight;
+  document.querySelector('.s9').style.display = 'normal';
+  document.body.offsetHeight;
+  document.querySelector('.s10').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s11').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.s12').style.display = 'none';
+  document.body.offsetHeight;
+}
+
+function runTest() {
+  var doc = document;
+  var win = window;
+  setup();
+  var e = doc.querySelectorAll('*');
+  for (i=0; i < e.length; ++i) {
+    var elm = e[i];
+    if (win.getComputedStyle(elm).display == 'contents') {
+      var c = elm.childNodes[0];
+      if (c) {
+        var next = c.nextSibling;
+        elm.removeChild(c);
+        elm.insertBefore(c,next);
+      }
+      var c = elm.childNodes[1];
+      if (c) {
+        var next = c.nextSibling;
+        elm.removeChild(c);
+        elm.insertBefore(c,next);
+      }
+      var c = elm.childNodes.length ? elm.childNodes[elm.childNodes.length-1] : null;
+      if (c) {
+        elm.removeChild(c);
+        elm.appendChild(c);
+      }
+    }
+  }
+
+  document.documentElement.className = '';
+}
+
+</script>
+</head>
+<body onload="runTest()">
+
+<div class="test"><span>A a</span></div>
+<div class="test"><span class="t1">t1</span></div>
+<div class="test"><span class="t2">t2</span></div>
+<div class="contents before">1<span>B b</span>2</div>
+<div class="contents after">1<span>C c</span>2</div>
+<div class="contents before after">1<span>D d</span>2</div>
+<div class="contents before">1<span class="t5">B b</span>2</div>
+<div class="contents after">1<span class="t6">C c</span>2</div>
+<div class="contents before after">1<span class="t7">D d</span>2</div>
+
+<div class="contents">
+  <div class="test"><span>span</span></div>
+  <div class="test"><span class="t3">t3</span></div>
+  <div class="test"><span class="t4">t4</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+  <div class="contents before">1<span class="t8">span</span>2</div>
+  <div class="contents after">1<span class="t9">span</span>2</div>
+  <div class="contents before after">1<span class="t10">span</span>2</div>
+  <div class="contents before">1<span class="t11">span</span>2</div>
+  <div class="contents after">1<span class="t12">span</span>2</div>
+  <div class="contents before after">1<span class="t13">span</span>2</div>
+</div>
+
+<div class="contents"><span class="s1">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s2">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s3">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s4">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s5">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s6">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before"><span class="s7">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents after"><span class="s8">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s9">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before after"><span class="s10">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before"><span class="s11">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents after"><span class="s12">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-generated-content.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-generated-content.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-generated-content.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-generated-content.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US" class="reftest-wait">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; generated content</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+body,html { color:black; background-color:white; }
+div { display:inline; }
+
+.test {
+  display: contents;
+  content: "content";
+  color: lime;
+}
+.contents {
+  display: contents;
+  color: green;
+}
+.s1 {display: none;}
+.s2 {display: none;}
+.s3 {display: contents;}
+.s5 {display: contents;}
+.s7 {display: none;}
+.s8 {display: none;}
+.s9 {display: contents;}
+.s11 {display: contents;}
+.before::before {
+  display: contents;
+  content:"before";
+}
+.after::after {
+  display: contents;
+  content:"after";
+}
+</style>
+<script>
+
+function runTest() {
+  document.body.offsetHeight;
+  document.querySelector('.t1').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t2').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t3').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t4').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t5').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t6').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t7').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t8').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t9').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t10').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t11').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.t12').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.t13').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s1').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s2').style.display = 'inline';
+  document.body.offsetHeight;
+  document.querySelector('.s3').style.display = 'normal';
+  document.body.offsetHeight;
+  document.querySelector('.s4').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s5').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.s6').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.s7').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s8').style.display = 'inline';
+  document.body.offsetHeight;
+  document.querySelector('.s9').style.display = 'normal';
+  document.body.offsetHeight;
+  document.querySelector('.s10').className = 'contents';
+  document.body.offsetHeight;
+  document.querySelector('.s11').style.display = 'none';
+  document.body.offsetHeight;
+  document.querySelector('.s12').style.display = 'none';
+  document.body.offsetHeight;
+
+  document.documentElement.className = '';
+}
+
+</script>
+</head>
+<body onload="runTest()">
+
+<div class="test"><span>A a</span></div>
+<div class="test"><span class="t1">t1</span></div>
+<div class="test"><span class="t2">t2</span></div>
+<div class="contents before">1<span>B b</span>2</div>
+<div class="contents after">1<span>C c</span>2</div>
+<div class="contents before after">1<span>D d</span>2</div>
+<div class="contents before">1<span class="t5">B b</span>2</div>
+<div class="contents after">1<span class="t6">C c</span>2</div>
+<div class="contents before after">1<span class="t7">D d</span>2</div>
+
+<div class="contents">
+  <div class="test"><span>span</span></div>
+  <div class="test"><span class="t3">t3</span></div>
+  <div class="test"><span class="t4">t4</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+  <div class="contents before">1<span class="t8">span</span>2</div>
+  <div class="contents after">1<span class="t9">span</span>2</div>
+  <div class="contents before after">1<span class="t10">span</span>2</div>
+  <div class="contents before">1<span class="t11">span</span>2</div>
+  <div class="contents after">1<span class="t12">span</span>2</div>
+  <div class="contents before after">1<span class="t13">span</span>2</div>
+</div>
+
+<div class="contents"><span class="s1">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s2">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s3">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s4">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s5">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s6">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before"><span class="s7">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents after"><span class="s8">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s9">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before after"><span class="s10">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before"><span class="s11">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents after"><span class="s12">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-generated-content-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-generated-content-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-generated-content-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-generated-content-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; generated content</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+body,html { color:black; background-color:white; }
+
+.test {
+  display: inline;
+  content: "content";
+  color: lime;
+}
+.contents {
+  display: inline;
+  color: green;
+}
+.before::before {
+  display: inline;
+  content:"before";
+}
+.after::after {
+  display: inline;
+  content:"after";
+}
+</style>
+</head>
+<body>
+
+<div class="test"><span>A a</span></div>
+<div class="test"><span class="contents">t1</span></div>
+<div class="test"></div>
+<div class="contents before">1<span>B b</span>2</div>
+<div class="contents after">1<span>C c</span>2</div>
+<div class="contents before after">1<span>D d</span>2</div>
+<div class="contents before">1<span class="t5">B b</span>2</div>
+<div class="contents after">12</div>
+<div class="contents before after">1<span class="t7">D d</span>2</div>
+
+<div class="contents">
+  <div class="test"><span>span</span></div>
+  <div class="test"><span class="contents">t3</span></div>
+  <div class="test"></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+  <div class="contents before">12</div>
+  <div class="contents after">1<span class="t9">span</span>2</div>
+  <div class="contents before after">12</div>
+  <div class="contents before">1<span class="t11">span</span>2</div>
+  <div class="contents after">12</div>
+  <div class="contents before after">1<span class="t13">span</span>2</div>
+</div>
+
+<div class="contents"><span class="s1">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s2">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s3">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s4">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"></div>
+
+<div class="contents"></div>
+
+<div class="contents before"><span class="s7">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents after"><span class="s8">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents"><span class="s9">
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before after"><span class="s10">
+  <div class="test"><span>span</span></div>
+  <div class="contents before">1<span>span</span>2</div>
+  <div class="contents after">1<span>span</span>2</div>
+  <div class="contents before after">1<span>span</span>2</div>
+</span></div>
+
+<div class="contents before"></div>
+
+<div class="contents after"></div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-wait" lang="en-US">
+  <head>
+  <title>CSS Test: CSS display:contents; in Shadow DOM</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style>
+html,body {
+    color:black; background-color:white; font-size:16px; padding:0; margin:0;
+}
+.before::before {content: "a ";}
+.after::after {content: " c";}
+div.before::before {content: "X ";}
+div.after::after {content: " Y";}
+.b,.c { display:contents; }
+</style>
+  </head>
+  <body>
+    <div id="host1" class="before"></div>
+    <span id="host2"></span>
+    <div id="host3" class="after"></div>
+    <div id="host4" class="before after"></div>
+    <div id="host5" class="after"></div>
+    <div id="host6" class="before"></div>
+    <div id="host7"></div>
+    <div id="host8" class="after"></div>
+    <div id="host9" class="before after"></div>
+    <div id="hostA" class="after"></div>
+    <div id="hostB"></div>
+    <div id="hostC"></div>
+    <div id="hostD"></div>
+    <div id="hostE"></div>
+    <div id="hostF" class="before"></div>
+    <div id="hostG"></div>
+    <span id="hostH"></span>
+    <div id="hostI"></div>
+    <div id="hostJ"></div>
+    <span id="hostK"></span>
+    <div id="hostL"></div>
+    <div id="hostM"><i>Two</i><b>One</b></div>
+    <div id="hostN"><i class="c">Two</i><b>One</b></div>
+    <div id="hostO"><i>Two</i><b class="c">One</b></div>
+    <div id="hostP"><i class="c">Two</i><b class="c">One</b></div>
+    <div id="hostQ" class="c" style="color:blue"><i class="c">Two</i><b class="c">One</b></div>Three
+    <span id="hostR"><style scoped>:scope{color:green}</style></span>
+    <div id="hostS" class="c"><span class="c">S</span></div>
+    <div id="hostT" class="c">T</div>
+    <div id="hostU"><span class="c">U</span></div>
+    <div id="hostV" class="c" style="color:red"><b class="c" style="color:inherit">V</b></div>
+    <div id="hostW" class="c" style="color:red"><b class="c" style="color:inherit">W</b></div>
+    <span id="hostX" style="color:red"><b class="c" style="color:inherit">X</b></span>
+    <!-- TODO(bug 1021572?) <div id="hostY" class="c" style="color:red"><b>Y</b></div> -->
+
+   <script>
+      function shadow(id) {
+        return document.getElementById(id).createShadowRoot();
+      }
+      function span(s) {
+        var e = document.createElement("span");
+        var t = document.createTextNode(s);
+        e.appendChild(t);
+        return e;
+      }
+      function text(s) {
+        return document.createTextNode(s);
+      }
+      function contents(n) {
+        var e = document.createElement("z");
+        e.style.display = "contents";
+        e.style.color = "blue"; 
+        if (n) e.appendChild(n);
+        return e;
+      }
+
+      document.body.offsetHeight;
+
+      shadow("host1").innerHTML = '<content></content> c';
+      shadow("host2").innerHTML = 'a <content style="display:contents"></content> c';
+      shadow("host3").innerHTML = 'a <content style="display:contents"></content>';
+      shadow("host4").innerHTML = '<content style="display:contents"></content>';
+      shadow("host5").innerHTML = 'a <content style="display:contents"></content>';
+      shadow("host6").innerHTML = '<z style="color:blue; display:contents"><content></content></z> c';
+      shadow("host7").innerHTML = 'a <content style="display:contents"></content> c';
+      shadow("host8").innerHTML = 'a <z style="color:blue; display:contents"><content style="display:contents"></z></content>';
+      shadow("host9").innerHTML = '<content style="display:contents"></content>';
+      shadow("hostA").innerHTML = 'a <content style="display:contents"></content>';
+      shadow("hostB").innerHTML = 'a <content select=".c"></content> <content select=".b"></content> B';
+      shadow("hostC").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
+      shadow("hostD").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B <content select=".b"></content>';
+      shadow("hostE").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
+      shadow("hostF").innerHTML = '<content select=".c"></content> <content select=".b"></content> B';
+      shadow("hostG").innerHTML = '<content select=".b"></content>';
+      shadow("hostH").innerHTML = '<content select=".b"></content>';
+      shadow("hostI").innerHTML = 'A<content select=".b"></content>';
+      shadow("hostJ").innerHTML = 'A<content select=".b"></content>';
+      shadow("hostK").innerHTML = '<content select=".b"></content>';
+      shadow("hostL").innerHTML = '<content select=".b"></content>';
+      shadow("hostM").innerHTML = '<content select="b"></content><content select="i"></content>';
+      shadow("hostN").innerHTML = '<content select="b"></content><content select="i"></content>';
+      shadow("hostO").innerHTML = '<content select="b"></content><content select="i"></content>';
+      shadow("hostP").innerHTML = '<content select="b"></content><content select="i"></content>';
+      shadow("hostQ").innerHTML = '<content select="b"></content><content select="i"></content>';
+      shadow("hostR").innerHTML = '<content select="span"></content>';
+      shadow("hostW").innerHTML = '<z style="color:red"><content select="b"></content></z>';
+      shadow("hostX").innerHTML = '<z style="color:red"><content select="b"></content></z>';
+      // TODO(bug 1021572?) shadow("hostY").innerHTML = '<content select="b"><style scoped>:scope{color:green}</style></content>';
+
+      function tweak() {
+        document.body.offsetHeight;
+
+        host1.appendChild(span("1"));
+        host2.appendChild(text("2"));
+        host3.appendChild(span("3"));
+        host4.appendChild(text("4"));
+
+        var e = span("5");
+        e.style.display = "contents";
+        host5.appendChild(e);
+
+        host6.appendChild(span("6"));
+        host7.appendChild(contents(text("7")));
+        host8.appendChild(contents(span("8")));
+        host9.appendChild(contents(text("9")));
+
+        var e = contents(span("A"));
+        e.style.display = "contents";
+        hostA.appendChild(e);
+
+        var e = contents(text("2"));
+        e.className = "b";
+        hostB.appendChild(e);
+        var e = contents(text("1"));
+        e.className = "c";
+        hostB.appendChild(e);
+
+        var e = contents(text("2"));
+        e.className = "b after";
+        hostC.appendChild(e);
+        var e = contents(text("1"));
+        e.className = "c  before";
+        hostC.appendChild(e);
+
+        var e = contents(text("2"));
+        e.className = "b before after";
+        hostD.appendChild(e);
+        var e = contents(text(" 3"));
+        e.className = "b before after";
+        hostD.appendChild(e);
+        var e = contents(text("1"));
+        e.className = "c  before";
+        hostD.appendChild(e);
+
+        var e = contents(contents(text("2")));
+        e.className = "before b after";
+        hostE.appendChild(e);
+        var e2 = contents(text("1"));
+        e2.className = "c  before after";
+        hostE.insertBefore(e2, e);
+
+        var e = contents(text("2"));
+        e.className = "before b after";
+        hostF.appendChild(e);
+        var e2 = contents(text("1"));
+        e2.className = "c  before after";
+        hostF.insertBefore(e2, e);
+
+        var e = contents(contents(text("1")));
+        e.className = "b";
+        hostG.appendChild(e);
+        var e = contents(text("2"));
+        e.className = "b  before after";
+        hostG.appendChild(e);
+
+        var e = contents(contents(text("2")));
+        e.className = "b";
+        hostH.appendChild(e);
+        var e2 = contents(text("1"));
+        e2.className = "b  before after";
+        hostH.insertBefore(e2, e);
+
+        var e = contents(text("b"));
+        e.className = "b";
+        hostI.appendChild(e);
+        var e = span("c");
+        e.className = "b";
+        hostI.appendChild(e);
+
+        var e = contents(contents(text("b")));
+        e.className = "b";
+        hostJ.appendChild(e);
+        var e = span("c");
+        e.className = "b";
+        hostJ.appendChild(e);
+
+        var inner = span("b");
+        inner.className = "after";
+        var e = contents(contents(inner));
+        e.className = "b";
+        hostK.appendChild(e);
+        var e = span("d");
+        e.className = "b";
+        hostK.appendChild(e);
+
+        var inner = contents(null);
+        inner.className = "before";
+        var e = contents(inner);
+        e.className = "b";
+        hostL.appendChild(e);
+        var e = span("b");
+        e.className = "b";
+        hostL.appendChild(e);
+
+        hostR.appendChild(span("R"));
+
+        document.body.offsetHeight;
+        setTimeout(function() {
+            shadow("hostS");
+            shadow("hostT");
+            shadow("hostU");
+            shadow("hostV").innerHTML = '<z style="color:green"><content select="b"></content></z>';
+            shadow("hostW").innerHTML = '<z style="color:green"><content select="b"></content></z>';
+            shadow("hostX").innerHTML = '<z style="color:green"><content select="b"></content></z>';
+
+            document.body.offsetHeight;
+            document.documentElement.removeAttribute("class");
+          },0);
+      }
+
+      window.addEventListener("MozReftestInvalidate", tweak, false);
+    </script>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+  <title>CSS Test: CSS display:contents; in Shadow DOM</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+<style>
+html,body {
+    color:black; background-color:white; font-size:16px; padding:0; margin:0;
+}
+
+span { color:blue; }
+</style>
+  </head>
+  <body>
+    <div>X 1 c</div>
+    <div>a 2 c</div>
+    <div>a 3 Y</div>
+    <div>X 4 Y</div>
+    <div>a 5 Y</div>
+    <div>X <span>6</span> c</div>
+    <div>a <span>7</span> c</div>
+    <div>a <span>8</span> Y</div>
+    <div>X <span>9</span> Y</div>
+    <div>a <span>A</span> Y</div>
+    <div>a <span>1 2</span> B</div>
+    <div>A <span>a 1 2 c</span> B</div>
+    <div>A <span>a 1 a 2 ca 3 c</span> B</div>
+    <div>A <span>a 1 c a 2 c</span> B</div>
+    <div>X <span>a 1 c a 2 c</span> B</div>
+    <div><span>1a 2 c</span></div>
+    <div><span>a 1 c2</span></div>
+    <div>A<span>b</span>c</div>
+    <div>A<span>b</span>c</div>
+    <div><span>b c</span>d</div>
+    <div><span>a </span>b</div>
+    <div><b>One</b><i>Two</i></div>
+    <div><b>One</b><i>Two</i></div>
+    <div><b>One</b><i>Two</i></div>
+    <div><b>One</b><i>Two</i></div>
+    <b style="color:blue">One</b><i style="color:blue">Two</i>Three
+    <span style="color:green">R</span>
+    <div></div>
+    <b style="color:green">V</b>
+    <b style="color:green">W</b>
+    <b style="color:green">X</b>
+    <!-- <b style="color:green">Y</b> -->
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-dom-mutations.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US" class="reftest-wait">
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: CSS display:contents; style inheritance, DOM mutations</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+body,span { color:black; background-color:white; }
+.test { display:contents; }
+.green { color:green; }
+.border { border-left:1px solid green; }
+b { border:inherit; font-weight:normal; }
+</style>
+<script>
+function $(id) { return document.getElementById(id); }
+function text(s) { return document.createTextNode(s); }
+function b(s) { var e = document.createElement('b'); e.appendChild(document.createTextNode(s)); return e; }
+function div(s) { var e = document.createElement('div'); e.setAttribute('class','test'); e.appendChild(document.createTextNode(s)); return e; }
+function runTest() {
+  document.body.offsetHeight;
+
+  var e = $('t1');
+  var c = e.firstChild;
+  e.insertBefore(text('g'), c);
+  e.insertBefore(text('r'), c);
+  e.appendChild(text('n'));
+
+  var e = $('t1b');
+  var c = e.firstChild;
+  e.insertBefore(text('g'), c);
+  e.insertBefore(text('r'), c);
+  e.appendChild(text('n'));
+
+  var e = $('t2');
+  var c = e.firstChild;
+  e.insertBefore(text('gr'), c);
+  e.appendChild(text('n'));
+
+  var e = $('t2b');
+  var c = e.firstChild;
+  e.insertBefore(text('gr'), c);
+  e.appendChild(text('n'));
+
+  var e = $('t3');
+  var c = e.firstChild;
+  e.insertBefore(text('n'), c);
+  e.insertBefore(text('o'), c);
+  e.appendChild(text('er'));
+
+  var e = $('t4');
+  var c = e.firstChild;
+  e.insertBefore(text('n'), c);
+  e.insertBefore(text('o'), c);
+  e.appendChild(text('er'));
+
+  var e = $('t5');
+  var c = e.firstChild;
+  e.insertBefore(b('1px green left '), c);
+  e.appendChild(text('er'));
+
+  var e = $('t6');
+  e.appendChild(b('2px green left border'));
+
+  var e = $('t7');
+  e.appendChild(div('green'));
+
+  var e = $('t8');
+  e.appendChild(div('green'));
+
+  var e = $('t9');
+  var c = b("1px green left border");
+  var d = div('');
+  d.appendChild(c);
+  e.appendChild(d);
+
+  var e = $('t10');
+  var c = b("1px green left border");
+  var d = div('');
+  d.setAttribute('style','border:inherit');
+  d.appendChild(c);
+  e.appendChild(d);
+
+  var e = $('t11');
+  var c = b("2px green left border");
+  var d = div('');
+  d.setAttribute('style','border:inherit');
+  d.appendChild(c);
+  e.appendChild(d);
+
+  var e = $('t12');
+  var c = e.firstChild;
+  e.insertBefore(text("This text"), c);
+  e.insertBefore(b(" should be"), c);
+  e.appendChild(text(" green"));
+
+  var e = $('t13');
+  e.className = 'test';
+
+  var e = $('t14');
+  e.removeAttribute('style')
+
+  var e = $('t15');
+  e.innerHTML=':scope{color:green}';
+  var e = $('t16');
+  e.innerHTML=':scope{color:inherit}';
+  var e = $('t17');
+  e.innerHTML=':scope{color:inherit}';
+  e.parentNode.appendChild(text("green"));
+
+  var e = $('t18');
+  var c = e.appendChild(div("green"));
+  document.body.offsetHeight;
+  document.styleSheets[8].cssRules[0].style.setProperty('color','green');
+  document.body.offsetHeight;
+
+  document.documentElement.className = '';
+}
+</script>
+</head>
+<body onload="runTest()">
+
+<span class="green"><div class="test" id="t1">ee</div></span>
+<span class="green"><div class="test" id="t1b">ee</div>x</span>
+<span><div class="test green" id="t2">ee</div></span>
+<span><div class="test green" id="t2b">ee</div>x</span>
+<br>
+<span><div class="test border" id="t3"> bord</div></span>
+<span><div class="test border" id="t4"><span> bord</span></div></span>
+<span class="border"><div class="test" id="t5">bord</div></span>
+<span class="border"><div class="test" style="border:inherit" id="t6"></div></span>
+<br>
+
+<span class="green"><div class="test" id="t7"></div></span>
+<span><div class="test green" id="t8"></div></span>
+<br>
+<span class="border"><div class="test" id="t9"></div></span>
+<span class="border"><div class="test" id="t10"></div></span>
+<span class="border"><div class="test" style="border:inherit" id="t11"></div></span>
+<br>
+
+<span style="color:red"><div class="test green" id="t12"></div></span>
+<span style="color:red"><span><style scoped>:scope{color:green}</style><di id="t13"v>green</div></span></span>
+<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div id="t14" class="test" style="color:red">green</div></span></span>
+<span style="color:red"><div class="test"><style id="t15" scoped></style>green</div></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>
+  <div class="test"><style scoped id="t16"></style>green</div>
+  <div class="test"><style scoped id="t17"></style></div></div></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
+  <div class="test" id="t18"><style scoped>:scope{color:red}</style></div></div></span>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: CSS display:contents; style inheritance</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+body,span { color:black; background-color:white; }
+.test { display:contents; }
+.green { color:green; }
+.border { border-left:1px solid green; }
+b { border:inherit; font-weight:normal; }
+</style>
+</head>
+<body>
+<span class="green"><div class="test">green</div></span>
+<span class="green"><div class="test">green</div>x</span>
+<span><div class="test green">green</div></span>
+<span><div class="test green">green</div>x</span>
+<br>
+<span><div class="test border">no border</div></span>
+<span><div class="test border"><span>no border</span></div></span>
+<span class="border"><div class="test"><b>1px green left border</b></div></span>
+<span class="border"><div class="test" style="border:inherit"><b>2px green left border</b></div></span>
+<br>
+
+<span class="green"><div class="test"><div class="test">green</div></div></span>
+<span><div class="test green"><div class="test">green</div></div></span>
+<br>
+<span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
+<span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
+<span class="border"><div class="test" style="border:inherit"><div class="test" style="border:inherit"><b>2px green left border</b></div></div></span>
+<br>
+
+<span style="color:red"><div class="test green">This text should be green</div></span>
+<span style="color:red"><span><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
+<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>green</div></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
+  <div class="test"><style scoped>:scope{color:green}</style>green</div>
+  <div class="test"><style scoped>:scope{color:green}</style>green</div></div></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style><div class="test"><style scoped>:scope{color:red}</style>
+  <div class="test"><style scoped>:scope{color:green}</style>green</div></div></div></span>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: CSS display:contents; style inheritance</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+<style type="text/css">
+body,span { color:black; background-color:white; }
+.test { display:inline; }
+.green { color:green; }
+.border { border-left:1px solid green; }
+b { font-weight:normal; }
+</style>
+</head>
+<body>
+<span class="green"><div class="test">green</div></span>
+<span class="green"><div class="test">green</div>x</span>
+<span><div class="test green">green</div></span>
+<span><div class="test green">green</div>x</span>
+<br>
+<span><div class="test">no border</div></span>
+<span><div class="test">no border</div></span>
+<span class="border"><div class="test"><b>1px green left border</b></div></span>
+<span class="border"><div class="test" style="border:inherit"><b>2px green left border</b></div></span>
+<br>
+
+<span class="green"><div class="test"><div class="test">green</div></div></span>
+<span><div class="test green"><div class="test">green</div></div></span>
+<br>
+<span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
+<span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
+<span class="border"><div class="test" style="border:inherit"><div class="test"><b>2px green left border</b></div></div></span>
+<br>
+
+<span><div class="green">This text should be green green green green greengreen green</div></span>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-style-inheritance-1-stylechange.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US" class="reftest-wait">
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: CSS display:contents; style inheritance, style changes</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+<style type="text/css">
+body,span { color:black; background-color:white; }
+.test { display:contents; border:10px solid black; }
+.test2 { display:contents; border-style:none; }
+.test3:not(:lang(foo)) { display:contents; color:cyan; }
+#t18:lang(foo) { display:contents; color:red; }
+.green { color:green; }
+.border { border-left:1px solid green; }
+b { border:inherit; font-weight:normal; }
+</style>
+<script>
+function runTest() {
+  var elms = document.querySelectorAll('.test')
+  for (i=0; i < elms.length; ++i) {
+    elms[i].classList.remove('test');
+    elms[i].classList.add('test2');
+  }
+  document.body.lang = 'foo';
+  document.body.offsetWidth;
+
+  document.documentElement.className = '';
+}
+</script>
+</head>
+<body onload="setTimeout(runTest,0)">
+<span class="green"><div class="test">green</div></span>
+<span class="green"><div class="test">green</div>x</span>
+<span><div class="test green">green</div></span>
+<span><div class="test green">green</div>x</span>
+<br>
+<span><div class="test border">no border</div></span>
+<span><div class="test border"><span>no border</span></div></span>
+<span class="border"><div class="test"><b>1px green left border</b></div></span>
+<span class="border"><div class="test" style="border:inherit"><b>2px green left border</b></div></span>
+<br>
+
+<span class="green"><div class="test"><div class="test">green</div></div></span>
+<span><div class="test green"><div class="test">green</div></div></span>
+<br>
+<span class="border"><div class="test"><div class="test"><b>1px green left border</b></div></div></span>
+<span class="border"><div class="test"><div class="test" style="border:inherit"><b>1px green left border</b></div></div></span>
+<span class="border"><div class="test" style="border:inherit"><div class="test" style="border:inherit"><b>2px green left border</b></div></div></span>
+<br>
+
+<span style="color:red"><span class="test3 green">This text should be green</span></span>
+<span style="color:red"><span><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
+<span style="color:red"><span class="test"><style scoped>:scope{color:green}</style><div class="test">green</div></span></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style>green</div></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:red}</style>
+  <div class="test"><style scoped>:scope{color:green}</style>green</div>
+  <div class="test"><style scoped>:scope{color:green}</style>green</div></div></span>
+<span style="color:red"><div class="test"><style scoped>:scope{color:green}</style><div class="test">
+  <div id="t18" class="test"><style scoped>:scope{color:inherit}</style>green</div></div></div></span>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-2.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-2.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-2.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-2.xhtml	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+  <title>CSS Test: CSS display:contents; tables</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396"/>
+  <link rel="help" href="http://dev.w3.org/csswg/css-display"/>
+<style type="text/css">
+html { color:red; background-color:white; }
+body { color:white; background-color:pink; width:0; }
+.test { display:contents; color:white; background-color:lime; }
+td { background-color:inherit; }
+</style>
+</head>
+<body><div class="test"><td>green</td></div><td>pink</td></body></html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-3-ref.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-3-ref.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-3-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-3-ref.xhtml	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+  <title>CSS Test: CSS display:contents; tables</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396"/>
+<style type="text/css">
+body { color:red; background-color:white; }
+.test { float:left; color:white; background-color:lime; }
+td { background-color:inherit; }
+</style>
+</head>
+<body><div class="test"><td>green</td></div></body></html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-3.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-3.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-3.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-3.xhtml	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+  <title>CSS Test: CSS display:contents; tables</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396"/>
+  <link rel="help" href="http://dev.w3.org/csswg/css-display"/>
+<style type="text/css">
+body { color:red; background-color:white; }
+.test { display:contents; color:white; background-color:lime; }
+td { background-color:inherit; }
+</style>
+</head>
+<body><div class="test"><td>green</td></div></body></html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-ref.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-ref.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables-ref.xhtml	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+  <title>CSS Test: CSS display:contents; tables</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396"/>
+<style type="text/css">
+body { color:red; background-color:white; }
+td { color:white; background-color:lime; }
+.pink { background-color:pink; }
+</style>
+</head>
+<body><td>green</td><td class="pink">pink</td></body></html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-tables.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-tables.xhtml	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+  <title>CSS Test: CSS display:contents; tables</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396"/>
+  <link rel="help" href="http://dev.w3.org/csswg/css-display"/>
+<style type="text/css">
+body { color:red; background-color:white; }
+.test { display:contents; color:white; background-color:lime; }
+td { background-color:inherit; }
+</style>
+</head>
+<body><div class="test"><td>green</td></div><div class="test" style="background-color:pink"><td>pink</td></div></body></html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-2.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US" class="reftest-wait">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; visibility:hidden</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+</head>
+<body style="color: red">
+  <div id="x" style="display:contents; visibility: hidden; color: green">
+    Line 1
+  </div><script type="text/javascript">
+    document.body.offsetWidth;
+    document.getElementById("x").style.visibility = "visible";
+    document.body.offsetWidth;
+
+    document.documentElement.className = '';
+  </script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-visibility-hidden.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-visibility-hidden.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-visibility-hidden.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-visibility-hidden.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US" class="reftest-wait">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; visibility:hidden</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+  <link rel="help" href="http://dev.w3.org/csswg/css-display">
+</head>
+<body>
+  <div id="x" style="display:contents; visibility: hidden">
+    Line 1
+  </div><script type="text/javascript">
+    document.body.offsetWidth;
+    document.getElementById("x").style.visibility = "visible";
+    document.body.style.color = "green";
+    document.body.offsetWidth;
+
+    document.documentElement.className = '';
+  </script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-visibility-hidden-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html lang="en-US">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: CSS display:contents; visibility:hidden</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396">
+</head>
+<body>
+  <div id="x" style="color:green">
+    Line 1
+  </div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-2-ref.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-2-ref.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-2-ref.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-2-ref.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="document.documentElement.removeChild(document.getElementById('b'));"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content><children><x>GREEN AGAIN</x></children></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:green; border:1px solid; display:contents" ><xbl:children style="color:red;" /></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<span id="l" style="-moz-binding: url(#foo); color:red"></span>
+<span></span>
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-2.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-2.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-2.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-2.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="
+            document.documentElement.removeChild(document.getElementById('b'));
+            setTimeout(function(){
+              l = document.getElementById('l');
+              x = document.getElementById('x');
+              l.removeChild(x);
+              document.documentElement.appendChild(document.createElementNS('http://www.w3.org/1999/xhtml', 'span'));
+            }, 0);
+            
+"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content><children><x>GREEN AGAIN</x></children></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:green; border:1px solid; display:contents" ><xbl:children style="color:red;" /></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<span id="l" style="-moz-binding: url(#foo); color:red"><hbox id="x">GREEN</hbox></span>
+
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-3-ref.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-3-ref.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-3-ref.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-3-ref.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="document.documentElement.removeChild(document.getElementById('b'));"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content style="color:red"><children style="color:red;"><html:span id="x" style="border:inherit">X</html:span></children></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red;"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:green; border:solid; display:contents" ><xbl:children style="color:red;"/></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<b id="l" style="-moz-binding: url(#foo); color:red; "></b>
+
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-3.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-3.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-3.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-3.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="
+            document.documentElement.removeChild(document.getElementById('b'));
+            setTimeout(function(){
+              x = document.getElementById('x');
+              c = x.parentNode;
+              c.removeChild(x);
+              c.appendChild(x);
+            }, 0);
+            
+"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content style="color:red"><children style="color:red;"><html:span id="x" style="border:inherit">X</html:span></children></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red;"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:green; border:solid; display:contents" ><xbl:children style="color:red;"/></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<b id="l" style="-moz-binding: url(#foo); color:red; "></b>
+
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-4-ref.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-4-ref.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-4-ref.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-4-ref.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="document.documentElement.removeChild(document.getElementById('b'));"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content style="color:red">Y<html:z style="color:blue; font-weight:bold; font-size:48px; display:contents">Z<children><html:span id="x">X</html:span></children></html:z></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:green; border:solid;" ><xbl:children style="color:red"/></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<span id="l" style="-moz-binding: url(#foo); color:pink"></span>
+
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-4.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-4.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-4.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-4.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="
+            document.documentElement.removeChild(document.getElementById('b'));
+            setTimeout(function(){
+              x = document.getElementById('x');
+              c = x.parentNode;
+              c.removeChild(x);
+              c.appendChild(x);
+            }, 0);
+            
+"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content style="color:red">Y<html:z style="color:blue; font-weight:bold; font-size:48px; display:contents">Z<children><html:span id="x">X</html:span></children></html:z></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:green; border:solid;" ><xbl:children style="color:red"/></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<span id="l" style="-moz-binding: url(#foo); color:pink"></span>
+
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-5.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-5.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-5.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-5.xul	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window onload="
+            document.documentElement.removeChild(document.getElementById('b'));
+            setTimeout(function(){
+              x = document.getElementById('x');
+              c = x.parentNode;
+              c.removeChild(x);
+              c.appendChild(x);
+            }, 0);
+            
+"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        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"
+>
+
+<bindings xmlns="http://www.mozilla.org/xbl" id="b">
+    <binding id="mylistitem"><content style="color:red"><html:span style="border:solid;color:green;display:contents"><children style="color:red;"><html:span id="x" style="border:inherit">X</html:span></children></html:span></content></binding>
+
+    <binding id="foo">
+        <content id="c" style="color:red;"><xul:mylistitem id="i" style="-moz-binding: url(#mylistitem); color:red; border:dashed; display:contents" ><xbl:children style="color:red;"/></xul:mylistitem></content>
+    </binding>
+</bindings>
+
+<b id="l" style="-moz-binding: url(#foo); color:red; "></b>
+
+
+</window>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl-ref.html	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+<body>
+<div>a <span style="color:blue">b</span> c</div>
+<div style="color:blue">a <span>b</span> c</div>
+<div>a <span style="color:blue">b</span> cd</div>
+<div>a <span style="color:blue">b</span> c</div>
+<div>a <span style="color:blue">b</span> c</div>
+<div><b>One</b><i>Two</i></div>
+<div><b>One</b><i>Two</i></div>
+<div><b>One</b><i>Two</i></div>
+<div><b>Oneb</b><i>Two</i></div>
+<div><b>Oneb</b><i>Two</i></div>
+<div><b>Oneb</b><i>Two</i></div>
+<div><b>One</b><i>Twoi</i></div>
+<div><b>One</b><i>Twoi</i></div>
+<div><b>One</b><i>Twoi</i></div>
+<div><b>bOne</b><i>Two</i></div>
+<div><b>bOne</b><i>Two</i></div>
+<div><b>bOne</b><i>Two</i></div>
+<div><b>One</b><i>iTwo</i></div>
+<div><b>One</b><i>iTwo</i></div>
+<div><b>One</b><i>iTwo</i></div>
+<div style="color:green">a <b style="color:blue">I</b> c</div>
+<div style="color:green">a <b style="color:blue">J</b> c</div>
+<div style="color:blue">a <b>K</b> c</div>
+<div style="color:blue"><b>L1</b><span style="color:green">2</span></div>
+<div style="color:blue"><b>M1</b><span style="color:green">2</span></div>
+<span style="color:green">a <b style="color:blue">O</b> c</span>
+<span style="color:blue">a <b>P</b> c</span>
+<span style="color:blue"><b>Q1</b><span style="color:green">2</span></span>
+<span style="color:blue"><b>R1</b><span style="color:green">2</span></span>
+<span>a <span style="color:blue">b</span> c</span>
+<span style="color:blue">a <span>b</span> c</span>
+<span>a <span style="color:blue">b</span> cd</span>
+<span>a <span style="color:blue">b</span> c</span>
+<span>a <span style="color:blue">b</span> c</span>
+<span><b>One</b><i>Two</i></span>
+<span><b>One</b><i>Two</i></span>
+<span><b>One</b><i>Two</i></span>
+<span><b>Oneb</b><i>Two</i></span>
+<span><b>Oneb</b><i>Two</i></span>
+<span><b>Oneb</b><i>Two</i></span>
+<span><b>One</b><i>Twoi</i></span>
+<span><b>One</b><i>Twoi</i></span>
+<span><b>One</b><i>Twoi</i></span>
+<span><b>bOne</b><i>Two</i></span>
+<span><b>bOne</b><i>Two</i></span>
+<span><b>bOne</b><i>Two</i></span>
+<span><b>One</b><i>iTwo</i></span>
+<span><b>One</b><i>iTwo</i></span>
+<span><b>One</b><i>iTwo</i></span>
+<div><b>a <span style="color:blue">One</span> c</b><i>i</i><i>a<span style="color:blue">Two</span>c</i></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/display-contents-xbl.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/display-contents-xbl.xhtml	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,272 @@
+<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-wait">
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<head>
+  <title>CSS Test: CSS display:contents in XBL</title>
+  <link rel="author" title="William Chen" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1040291"/>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=907396"/>
+  <link rel="help" href="http://dev.w3.org/csswg/css-display"/>
+
+<style>
+.c { display:contents; }
+</style>
+<bindings xmlns="http://www.mozilla.org/xbl"
+          xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <binding id="a">
+    <content>
+      <style xmlns="http://www.w3.org/1999/xhtml">
+        .a {
+          display: contents;
+          color: blue;
+        }
+      </style>
+      <xhtml:span>a</xhtml:span>
+      <xhtml:span class="a">
+        <children></children>
+      </xhtml:span>
+      <xhtml:span>c</xhtml:span>
+    </content>
+  </binding>
+
+  <binding id="b">
+    <content>
+      <style xmlns="http://www.w3.org/1999/xhtml">
+        .b {
+          display: contents;
+          color: blue;
+        }
+	.b::after {
+          content: 'c';
+        }
+      </style>
+      <xhtml:span class="b">
+        a <children></children>
+      </xhtml:span>
+    </content>
+  </binding>
+
+  <binding id="c">
+    <content>
+      <xhtml:span>a</xhtml:span>
+      <xhtml:span style="color:blue"> <children></children> </xhtml:span>
+      <xhtml:span>c</xhtml:span>
+    </content>
+  </binding>
+
+  <binding id="d">
+    <content>
+      <style xmlns="http://www.w3.org/1999/xhtml">
+        .d {
+          display: contents;
+          color: blue;
+        }
+        #d1::after { content: "a"; }
+        #d2::before { content: "c"; }
+      </style>
+      <xhtml:span id="d1"></xhtml:span>
+      <xhtml:span class="d">
+        <children></children>
+      </xhtml:span>
+      <xhtml:span id="d2"></xhtml:span>
+    </content>
+  </binding>
+
+  <binding id="e">
+    <content>
+      <style xmlns="http://www.w3.org/1999/xhtml">
+        .e {
+          display: contents;
+          color: blue;
+        }
+	.e::before {
+          content: 'a';
+          color: black;
+        }
+      </style>
+      <xhtml:span class="e">
+        <children></children> <xhtml:span style="color:black">c</xhtml:span>
+      </xhtml:span>
+    </content>
+  </binding>
+
+  <binding id="f">
+    <content><children includes="b"/><children includes="i"/></content>
+  </binding>
+
+  <binding id="g">
+    <content>
+      <style xmlns="http://www.w3.org/1999/xhtml">
+        .a {
+          display: contents;
+          color: blue;
+        }
+      </style>
+      <xhtml:span class="a"><children includes="b"></children></xhtml:span>
+      <xhtml:span class="a" style="color:green"><children includes="c"></children></xhtml:span>
+    </content>
+  </binding>
+</bindings>
+</head>
+<body>
+<div id="host1" style="-moz-binding: url(#a);"></div>
+<div id="host2" style="-moz-binding: url(#b);"></div>
+<div id="host3" style="-moz-binding: url(#c); display: contents;"></div>d
+<div id="host4" style="-moz-binding: url(#d);"></div>
+<div id="host5" style="-moz-binding: url(#e);"></div>
+<div            style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div            style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div            style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="host6" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="host7" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="host8" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="host9" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hostA" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hostB" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostC" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hostD" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hostE" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostF" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hostG" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hostH" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostI" style="color:green"><b style="display:contents">I</b></div>
+<div id="hostJ" style="-moz-binding:url(#a); color:green"><b>J</b></div>
+<div id="hostK" style="-moz-binding:url(#b); color:red"><b>K</b></div>
+<div id="hostL" style="color:red"><c>2</c><b style="display:contents">L1</b></div>
+<div id="hostM" style="-moz-binding:url(#g); color:red"><c>2</c><b style="display:contents">M1</b></div>
+<div id="hostO" class="c" style="-moz-binding:url(#a); color:green"><b>O</b></div>
+<div id="hostP" class="c" style="-moz-binding:url(#b); color:red"><b>P</b></div>
+<div id="hostQ" class="c" style="color:red"><c>2</c><b style="display:contents">Q1</b></div>
+<div id="hostR" class="c" style="-moz-binding:url(#g); color:red"><c>2</c><b style="display:contents">R1</b></div>
+<div id="hostS" style="-moz-binding: url(#a);"></div>
+<div id="hostT" style="-moz-binding: url(#b);"></div>
+<div id="hostU" style="-moz-binding: url(#c); display: contents;"></div>d
+<div id="hostV" style="-moz-binding: url(#d);"></div>
+<div id="hostW" style="-moz-binding: url(#e);"></div>
+<div class="c"  style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div class="c"  style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div class="c"  style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostX" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hostY" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hostZ" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hosta" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hostb" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hostc" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostd" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hoste" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hostf" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostg" style="-moz-binding: url(#f)"><i>Two</i><b>One</b></div>
+<div id="hosth" style="-moz-binding: url(#f)"><i style="display: contents;">Two</i><b>One</b></div>
+<div id="hosti" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+<div id="hostj" style="-moz-binding: url(#f)"><i>Two</i><b style="display: contents;">One</b></div>
+
+<script>
+
+function tweak() {
+  document.body.offsetHeight;
+
+  function span(s) {
+    var elm = document.createElement("span");
+    elm.textContent = s;
+    return elm;
+  }
+  function elem(tag) {
+    var elm = document.createElement(tag);
+    elm.textContent = tag;
+    return elm;
+  }
+
+  // Span should be distributed to the xbl:children insertion point between 'a' and 'c'.
+  host1.appendChild(span("b"));
+
+  var elm = span("b");
+  elm.style.display = "contents";
+  elm.style.color = "blue";
+  host2.appendChild(elm);
+
+  host3.appendChild(span("b"));
+  host4.appendChild(span("b"));
+  host5.appendChild(span("b"));
+
+  host6.appendChild(elem("b"));
+  host7.appendChild(elem("b"));
+  host8.appendChild(elem("b"));
+
+  host9.appendChild(elem("i"));
+  hostA.appendChild(elem("i"));
+  hostB.appendChild(elem("i"));
+
+  hostC.insertBefore(elem("b"), hostC.firstChild);
+  hostD.insertBefore(elem("b"), hostD.firstChild);
+  hostE.insertBefore(elem("b"), hostE.firstChild);
+
+  hostF.insertBefore(elem("i"), hostF.firstChild);
+  hostG.insertBefore(elem("i"), hostG.firstChild);
+  hostH.insertBefore(elem("i"), hostH.firstChild);
+
+  document.body.offsetHeight;
+  hostI.style.MozBinding='url(#a)';
+  hostL.style.MozBinding='url(#g)';
+  hostO.style.MozBinding='url(#a)';
+  hostQ.style.MozBinding='url(#g)';
+
+  hostS.className="c";
+  hostT.className="c";
+  hostU.className="c";
+  hostV.className="c";
+  hostW.className="c";
+  hostX.className="c";
+  hostY.className="c";
+  hostZ.className="c";
+  hosta.className="c";
+  hostb.className="c";
+  hostc.className="c";
+  hostd.className="c";
+  hoste.className="c";
+  hostf.className="c";
+  hostg.className="c";
+  hosth.className="c";
+  hosti.className="c";
+
+  hostS.appendChild(span("b"));
+
+  var elm = span("b");
+  elm.style.display = "contents";
+  elm.style.color = "blue";
+  hostT.appendChild(elm);
+
+  hostU.appendChild(span("b"));
+  hostV.appendChild(span("b"));
+  hostW.appendChild(span("b"));
+
+  hostX.appendChild(elem("b"));
+  hostY.appendChild(elem("b"));
+  hostZ.appendChild(elem("b"));
+
+  hosta.appendChild(elem("i"));
+  hostb.appendChild(elem("i"));
+  hostc.appendChild(elem("i"));
+
+  hostd.insertBefore(elem("b"), hostd.firstChild);
+  hoste.insertBefore(elem("b"), hoste.firstChild);
+  hostf.insertBefore(elem("b"), hostf.firstChild);
+
+  hostg.insertBefore(elem("i"), hostg.firstChild);
+  hosth.insertBefore(elem("i"), hosth.firstChild);
+  hosti.insertBefore(elem("i"), hosti.firstChild);
+
+  document.body.offsetHeight;
+  hostj.children[0].style.MozBinding='url(#a)';
+  hostj.children[1].style.MozBinding='url(#a)';
+  document.body.offsetHeight;
+  hostj.insertBefore(elem("i"), hostj.firstChild);
+
+  document.body.offsetHeight;
+  document.documentElement.removeAttribute("class");
+}
+
+window.addEventListener("MozReftestInvalidate", tweak);
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/css-display/reftest.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/css-display/reftest.list	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,24 @@
+# Tests for CSS Display spec features.
+# http://dev.w3.org/csswg/css-display
+
+pref(layout.css.display-contents.enabled,true) == display-contents-acid.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-1.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-2.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-3.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-generated-content.html display-contents-generated-content-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-generated-content-2.html display-contents-generated-content-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
+pref(layout.css.display-contents.enabled,true) fuzzy-if(winWidget,12,100) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-tables.xhtml display-contents-tables-ref.xhtml
+pref(layout.css.display-contents.enabled,true) == display-contents-tables-2.xhtml display-contents-tables-ref.xhtml
+pref(layout.css.display-contents.enabled,true) == display-contents-tables-3.xhtml display-contents-tables-3-ref.xhtml
+pref(layout.css.display-contents.enabled,true) == display-contents-visibility-hidden.html display-contents-visibility-hidden-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-visibility-hidden-2.html display-contents-visibility-hidden-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-495385-2d.html display-contents-495385-2d-ref.html
+skip-if(B2G) pref(layout.css.display-contents.enabled,true) == display-contents-xbl.xhtml display-contents-xbl-ref.html
+pref(layout.css.display-contents.enabled,true) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
+skip-if(B2G) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-2.xul display-contents-xbl-2-ref.xul
+skip-if(B2G) asserts(1) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-3.xul display-contents-xbl-3-ref.xul # bug 1089223
+skip pref(layout.css.display-contents.enabled,true) == display-contents-xbl-4.xul display-contents-xbl-4-ref.xul # fails (not just asserts) due to bug 1089223
+skip-if(B2G) asserts(1) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-5.xul display-contents-xbl-3-ref.xul # bug 1089223
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/font-inflation/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/font-inflation/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/font-inflation/reftest.list	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/font-inflation/reftest.list	2014-11-26 21:45:46.000000000 +0000
@@ -5,6 +5,12 @@
 # with the lineThreshold preference explicitly set to zero.  However,
 # newer tests should probably focus more on testing nonzero values of
 # that preference.
+
+# The font-inflation code uses the meta-viewport tag as one of its inputs
+# when determining if font-inflation needs to be applied, so enable it for
+# these tests.
+default-preferences pref(dom.meta-viewport.enabled,true)
+
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) test-pref(font.size.inflation.maxRatio,200) == maxRatio-1.html maxRatio-1-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-1.html text-1-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-2.html text-2-ref.html
@@ -100,3 +106,6 @@
 pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) pref(font.size.inflation.lineThreshold,0) == min-width-passes-1.html min-width-passes-1-ref.html
 
 pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) == xul-reflow-1.html xul-reflow-1-ref.html
+
+# reset the default preferences
+default-preferences
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/forms/button/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/forms/button/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/forms/button/reftest.list	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/forms/button/reftest.list	2014-11-26 21:45:47.000000000 +0000
@@ -1,5 +1,5 @@
-asserts(2) == first-letter-1.html first-letter-1-ref.html
-asserts(1) != first-letter-1.html first-letter-1-noref.html
+== first-letter-1.html first-letter-1-ref.html
+!= first-letter-1.html first-letter-1-noref.html
 == max-height.html max-height-ref.html
 == min-height.html min-height-ref.html
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-1.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This testcase ensures that we paint the background around an opaque image,
+     when the image is kept from filling the container via 'object-fit'. This
+     is an interesting case because, by default, images fill their container,
+     which means we can often optimize away the background completely. BUT, if
+     "object-fit" prevents the image from filling its container, we can't
+     optimize away the background; it need to be painted in the uncovered area.
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      .test {
+        background: salmon;
+        object-fit: none;
+        width: 40px;
+        height: 40px;
+        display: block;
+        margin-bottom: 2px;
+      }
+    </style>
+  </head>
+  <body>
+    <img    class="test"    src="blue-32x32.png">
+    <embed  class="test"    src="blue-32x32.png">
+    <object class="test"   data="blue-32x32.png"></object>
+    <video  class="test" poster="blue-32x32.png"></video>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-1-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-1-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-1-ref.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      .test {
+        background: salmon;
+        padding: 4px;
+        width: 32px;
+        height: 32px;
+        display: block;
+        margin-bottom: 2px;
+      }
+    </style>
+  </head>
+  <body>
+    <img    class="test"    src="blue-32x32.png">
+    <embed  class="test"    src="blue-32x32.png">
+    <object class="test"   data="blue-32x32.png"></object>
+    <video  class="test" poster="blue-32x32.png"></video>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-2.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This testcase ensures that we paint the background around an opaque image,
+     when the image is kept from filling the container via 'object-fit' (and
+     the img element is fragmented). This is an interesting case because, by
+     default, images fill their container, which means we can often optimize
+     away the background completely. BUT, if "object-fit" prevents the image
+     from filling its container, we can't optimize away the background; it need
+     to be painted in the uncovered area.
+-->
+<html class="reftest-print">
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      img.test {
+        background: salmon;
+        object-fit: none;
+        width: 32px;
+        /* We make the height 6in larger than the image's intrinsic height,
+         * which gives us the following happy results:
+         *  (1) the <img> will split over several 3in tall reftest-print cards
+         *      (so, we get to test fragmentation).
+         *  (2) the image pixels end up on the second fragment (not the first),
+         *      so we get to test image-data painting on later fragments.
+         *  (3) the reference case can easily match us using a simple img
+         *      with 3in-tall divs before & after it.
+         */
+        height: calc(32px + 6in);
+        display: block; /* Required for fragmentation */
+      }
+    </style>
+  </head>
+  <body>
+    <img class="test" src="blue-32x32.png">
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-2-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-2-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-fit-with-background-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-fit-with-background-2-ref.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-print">
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      .fakeBackground {
+        background: salmon;
+        height: 3in;
+        width: 32px;
+      }
+
+      img.test {
+        width: 32px;
+        height: 32px;
+        display: block; /* Required for fragmentation */
+      }
+    </style>
+  </head>
+  <body>
+    <div class="fakeBackground"></div>
+    <img class="test" src="blue-32x32.png">
+    <div class="fakeBackground"></div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-1.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This testcase ensures that we paint the background around an opaque image,
+     when the image is offset from the container via 'object-position'. This is
+     an interesting case because, by default, images fill their container,
+     which means we can often optimize away the background completely. BUT, if
+     "object-position" offsets the image from its container's content-box, we
+     can't optimize away the background; it need to be painted in the uncovered
+     area.
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      .test {
+        background: salmon;
+        object-position: 5px 5px;
+        width: 32px;
+        height: 32px;
+        display: block;
+        margin-bottom: 2px;
+      }
+    </style>
+  </head>
+  <body>
+    <img    class="test"    src="blue-32x32.png">
+    <embed  class="test"    src="blue-32x32.png">
+    <object class="test"   data="blue-32x32.png"></object>
+    <video  class="test" poster="blue-32x32.png"></video>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-1-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-1-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-1-ref.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      .test {
+        background: salmon;
+        padding-top: 5px;
+        padding-left: 5px;
+        width: 27px;
+        height: 27px;
+        display: block;
+        margin-bottom: 2px;
+      }
+    </style>
+  </head>
+  <body>
+    <img    class="test"    src="blue-32x32.png">
+    <embed  class="test"    src="blue-32x32.png">
+    <object class="test"   data="blue-32x32.png"></object>
+    <video  class="test" poster="blue-32x32.png"></video>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-2.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!--
+     This testcase ensures that we paint the background around an opaque image,
+     when the image is offset from the container via 'object-position' (and
+     the img element is fragmented). This is an interesting case because, by
+     default, images fill their container, which means we can often optimize
+     away the background completely. BUT, if "object-position" offsets the
+     image from its container's content-box, we can't optimize away the
+     background; it need to be painted in the uncovered area.
+-->
+<html class="reftest-print">
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      img.test {
+        background: salmon;
+        object-position: 10px 20px;
+        width: 32px;
+        height: 5in;
+        display: block; /* Required for fragmentation */
+      }
+    </style>
+  </head>
+  <body>
+    <img class="test" src="blue-32x32.png">
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-2-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-2-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/image-object-position-with-background-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/image-object-position-with-background-2-ref.html	2014-11-26 21:45:47.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-print">
+  <head>
+    <meta charset="utf-8">
+    <style type="text/css">
+      img.test {
+        background: salmon;
+        padding-left: 10px;
+        padding-top: 20px;
+        width: 22px;
+        height: calc(5in - 20px);
+        display: block; /* Required for fragmentation */
+      }
+    </style>
+  </head>
+  <body>
+    <img class="test" src="blue-32x32.png">
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image/reftest.list	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image/reftest.list	2014-11-26 21:45:47.000000000 +0000
@@ -11,6 +11,12 @@
 random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1c.html sync-image-switch-1-ref.html # bug 855050 for WinXP
 random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1d.html sync-image-switch-1-ref.html # bug 855050 for WinXP
 
+# Tests for "object-fit" & "object-position"
+test-pref(layout.css.object-fit-and-position.enabled,true) == image-object-fit-with-background-1.html image-object-fit-with-background-1-ref.html
+test-pref(layout.css.object-fit-and-position.enabled,true) == image-object-fit-with-background-2.html image-object-fit-with-background-2-ref.html
+test-pref(layout.css.object-fit-and-position.enabled,true) == image-object-position-with-background-1.html image-object-position-with-background-1-ref.html
+test-pref(layout.css.object-fit-and-position.enabled,true) == image-object-position-with-background-2.html image-object-position-with-background-2-ref.html
+
 # Tests for image-orientation used with 'from-image' (note that all
 # image-orientation tests are fuzzy because the JPEG images do not perfectly
 # reproduce blocks of solid color, even at maximum quality):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image-element/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image-element/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/image-element/reftest.list	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/image-element/reftest.list	2014-11-26 21:45:47.000000000 +0000
@@ -17,7 +17,7 @@
 == element-paint-background-size-02.html element-paint-background-size-02-ref.html
 == element-paint-transform-repeated.html element-paint-transform-repeated-ref.html
 fuzzy-if(d2d,255,24) == element-paint-transform-03.html element-paint-transform-03-ref.html
-fuzzy-if(B2G,1,5) fuzzy-if(gtk2Widget,1,32) fuzzy-if(cocoaWidget,1,106) == element-paint-native-widget.html element-paint-native-widget-ref.html
+== element-paint-native-widget.html element-paint-native-widget-ref.html
 == element-paint-subimage-sampling-restriction.html about:blank
 == element-paint-clippath.html element-paint-clippath-ref.html
 == element-paint-sharpness-01a.html element-paint-sharpness-01b.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/mathml/font-inflation-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/mathml/font-inflation-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/mathml/font-inflation-1.html	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/mathml/font-inflation-1.html	2014-11-26 21:45:48.000000000 +0000
@@ -48,7 +48,7 @@
       window.addEventListener("MozReftestInvalidate", verifySizes, false);
     </script>
   </head>
-  <body onload="verifySizes()">
+  <body>
 
 <p>The text
 '<math>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/reftest.list	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/reftest.list	2014-11-26 21:45:48.000000000 +0000
@@ -8,7 +8,7 @@
 # verify the tests work
 include reftest-sanity/reftest.list
 
-# images (if libpr0n is busted, could result in weird failures in other tests)
+# images (if ImageLib is busted, could result in weird failures in other tests)
 include ../../image/test/reftest/reftest.list
 
 # CSSWG tests
@@ -69,6 +69,9 @@
 # css default pseudo class tests
 include css-default/reftest.list
 
+# css-display spec tests
+include css-display/reftest.list
+
 # css :disable tests
 include css-disabled/reftest.list
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -4,13 +4,13 @@
   padding-left: 11px;
 }
 p.dotted span {
-  -moz-text-decoration-style: dotted;
+  text-decoration-style: dotted;
 }
 p.dashed span {
-  -moz-text-decoration-style: dashed;
+  text-decoration-style: dashed;
 }
 p.wavy span {
-  -moz-text-decoration-style: wavy;
+  text-decoration-style: wavy;
 }
 span {
   text-decoration: underline line-through overline;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks-ref.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-quirks-ref.html	2014-11-26 21:45:50.000000000 +0000
@@ -4,13 +4,13 @@
   padding-left: 11px;
 }
 p.dotted span {
-  -moz-text-decoration-style: dotted;
+  text-decoration-style: dotted;
 }
 p.dashed span {
-  -moz-text-decoration-style: dashed;
+  text-decoration-style: dashed;
 }
 p.wavy span {
-  -moz-text-decoration-style: wavy;
+  text-decoration-style: wavy;
 }
 span {
   text-decoration: underline line-through overline;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -5,13 +5,13 @@
   padding-left: 11px;
 }
 p.dotted span {
-  -moz-text-decoration-style: dotted;
+  text-decoration-style: dotted;
 }
 p.dashed span {
-  -moz-text-decoration-style: dashed;
+  text-decoration-style: dashed;
 }
 p.wavy span {
-  -moz-text-decoration-style: wavy;
+  text-decoration-style: wavy;
 }
 span {
   text-decoration: underline line-through overline;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards-ref.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/complex-decoration-style-standards-ref.html	2014-11-26 21:45:50.000000000 +0000
@@ -5,13 +5,13 @@
   padding-left: 11px;
 }
 p.dotted span {
-  -moz-text-decoration-style: dotted;
+  text-decoration-style: dotted;
 }
 p.dashed span {
-  -moz-text-decoration-style: dashed;
+  text-decoration-style: dashed;
 }
 p.wavy span {
-  -moz-text-decoration-style: wavy;
+  text-decoration-style: wavy;
 }
 span {
   text-decoration: underline line-through overline;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,21 +1,21 @@
 <p style="color: blue;
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: green;">
+          text-decoration-color: green;">
   This blue text has green decoration lines
 </p>
 <p style="color: #ff0000;
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: #ffff00;">
+          text-decoration-color: #ffff00;">
   This red text has yellow decoration lines
 </p>
 <p style="color: rgb(0%, 0%, 100%);
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: rgb(100%, 0%, 0%);">
+          text-decoration-color: rgb(100%, 0%, 0%);">
   This blue text has red lines
 </p>
 <p style="color: orange;
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: transparent;">
+          text-decoration-color: transparent;">
   This orange text has transparent lines
 </p>
 <p>
@@ -23,7 +23,7 @@
   <span style="font-size: 2em;
                color: blue;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: green;">
+               text-decoration-color: green;">
     this blue text has green decoration lines</span>,
   and here is no decoration lines too.
 </p>
@@ -31,7 +31,7 @@
   This is red paragraph and here is no decoration lines, but
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: green;">
+               text-decoration-color: green;">
     here are green decoration lines</span>,
   and here is no decoration lines too.
 </p>
@@ -40,7 +40,7 @@
   This is purple paragraph and here are decoration lines of current color, but
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: red;">
+               text-decoration-color: red;">
     here are red decoration lines</span>,
   and here are current color decoration lines.
 </p>
@@ -48,7 +48,7 @@
           text-decoration: underline line-through overline;">
   This is green paragraph and here are decoration lines of current color, and
   <span style="font-size: 2em;
-               -moz-text-decoration-color: red;">
+               text-decoration-color: red;">
     here is specified red decoration color but has current color lines</span>,
   and here are current color decoration lines.
 </p>
@@ -57,22 +57,22 @@
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: inherit;">
+               text-decoration-color: inherit;">
     here is red text with blue decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
 <p style="color: blue;
-          -moz-text-decoration-color: green;">
+          text-decoration-color: green;">
   This is blue paragraph and decoration color is specified as green,
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: inherit;">
+               text-decoration-color: inherit;">
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
 <p style="color: blue;
-          -moz-text-decoration-color: red;
+          text-decoration-color: red;
           text-decoration: underline line-through overline;">
   Here has blue decoration lines even though its color is specified as red
   before text-decoration.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-quirks-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-quirks-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-quirks-ref.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-quirks-ref.html	2014-11-26 21:45:50.000000000 +0000
@@ -50,7 +50,7 @@
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: blue;">
+               text-decoration-color: blue;">
     here is red text with blue decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
@@ -59,7 +59,7 @@
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: green;">
+               text-decoration-color: green;">
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,29 +1,29 @@
 <!DOCTYPE html>
 <p style="color: blue;
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: green;">
+          text-decoration-color: green;">
   This blue text has green decoration lines
 </p>
 <p style="color: #ff0000;
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: #ffff00;">
+          text-decoration-color: #ffff00;">
   This red text has yellow decoration lines
 </p>
 <p style="color: rgb(0%, 0%, 100%);
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: rgb(100%, 0%, 0%);">
+          text-decoration-color: rgb(100%, 0%, 0%);">
   This blue text has red lines
 </p>
 <p style="color: orange;
           text-decoration: underline line-through overline;
-          -moz-text-decoration-color: transparent;">
+          text-decoration-color: transparent;">
   This orange text has transparent lines
 </p>
 <p>
   Here is no decoration lines, but
   <span style="font-size: 2em; color: blue;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: green;">
+               text-decoration-color: green;">
     this blue text has green decoration lines</span>,
   and here is no decoration lines too.
 </p>
@@ -31,7 +31,7 @@
   This is red paragraph and here is no decoration lines, but
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: green;">
+               text-decoration-color: green;">
     here are green decoration lines</span>,
   and here is no decoration lines too.</p>
 <p style="color: purple;
@@ -39,7 +39,7 @@
   This is purple paragraph and here are decoration lines of current color, but
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: red;">
+               text-decoration-color: red;">
     here are red decoration lines</span>,
   and here are current color decoration lines.
 </p>
@@ -47,7 +47,7 @@
           text-decoration: underline line-through overline;">
   This is green paragraph and here are decoration lines of current color, and
   <span style="font-size: 2em;
-               -moz-text-decoration-color: red;">
+               text-decoration-color: red;">
     here is specified red decoration color but has current color lines</span>,
   and here are current color decoration lines.
 </p>
@@ -56,22 +56,22 @@
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: inherit;">
+               text-decoration-color: inherit;">
     here is red text with blue decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
 <p style="color: blue;
-          -moz-text-decoration-color: green;">
+          text-decoration-color: green;">
   This is blue paragraph and decoration color is specified as green,
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: inherit;">
+               text-decoration-color: inherit;">
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
 <p style="color: blue;
-          -moz-text-decoration-color: red;
+          text-decoration-color: red;
           text-decoration: underline line-through overline;">
   Here has blue decoration lines even though its color is specified as red
   before text-decoration.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-standards-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-standards-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-color-standards-ref.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-color-standards-ref.html	2014-11-26 21:45:50.000000000 +0000
@@ -52,7 +52,7 @@
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: blue;">
+               text-decoration-color: blue;">
     here is red text with blue decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
@@ -61,7 +61,7 @@
   <span style="font-size:2em;
                color: red;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-color: green;">
+               text-decoration-color: green;">
     here is red text with green decoration lines</span>,
   and here is blue text without decoration lines.
 </p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,41 +1,41 @@
-<p style="-moz-text-decoration-style: dotted;">
+<p style="text-decoration-style: dotted;">
   Here is specified the decoration style as dotted but no decoration lines, however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;">
     here has solid decoration lines</span>,
   and here has no decoration lines.
 </p>
-<p style="-moz-text-decoration-style: dashed;">
+<p style="text-decoration-style: dashed;">
   Here is specified the decoration style as dashed but no decoration lines,
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-style: inherit;">
+               text-decoration-style: inherit;">
     here has inherited decoration lines</span>,
   and here has no decoration lines.
 </p>
 <p style="text-decoration: underline line-through overline;
-          -moz-text-decoration-style: dotted;">
+          text-decoration-style: dotted;">
   Here has dotted decoration lines,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-style: wavy;">
+               text-decoration-style: wavy;">
     here has wavy decoration lines</span>,
   and here has dotted decoration lines.
 </p>
 <p style="text-decoration: underline line-through overline;
-          -moz-text-decoration-style: double;">
+          text-decoration-style: double;">
   Here has double decoration lines,
   <span style="font-size: 2em;
-               -moz-text-decoration-style: dashed;">
+               text-decoration-style: dashed;">
     here is specified as dashed decoration lines but should be ignored</span>,
   and here has double decoration lines.
 </p>
 <p style="text-decoration: underline line-through overline;
-          -moz-text-decoration-style: -moz-none;">
+          text-decoration-style: -moz-none;">
   Here is specified the decoration style as -moz-none.
 </p>
-<p style="-moz-text-decoration-style: dotted;
+<p style="text-decoration-style: dotted;
           text-decoration: underline line-through overline;">
   Here has solid decoration lines even if its style is specified as dotted
   before text-decoration.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-quirks-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-quirks-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-quirks-ref.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-quirks-ref.html	2014-11-26 21:45:50.000000000 +0000
@@ -3,7 +3,7 @@
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration: solid;">
+               text-decoration-style: solid;">
     here has solid decoration lines</span>,
   and here has no decoration lines.
 </p>
@@ -12,32 +12,32 @@
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-style: dashed;">
+               text-decoration-style: dashed;">
     here has inherited decoration lines</span>,
   and here has no decoration lines.
 </p>
 <p>
   <span style="text-decoration: underline line-through overline;
-               -moz-text-decoration-style: dotted;">
+               text-decoration-style: dotted;">
     Here has dotted decoration lines,
   </span><span style="text-decoration: underline line-through overline;
-					  -moz-text-decoration-style: dotted">
+					  text-decoration-style: dotted">
    <span style="font-size: 2em;
                 text-decoration: underline line-through overline;
-                -moz-text-decoration-style: wavy;">
+                text-decoration-style: wavy;">
     here has wavy decoration
     lines</span></span><span style="text-decoration: underline line-through overline;
-                             -moz-text-decoration-style: dotted;">,
+                             text-decoration-style: dotted;">,
     and here has dotted decoration lines.</span>
 </p>
 <p>
   <span style="text-decoration: underline line-through overline;
-               -moz-text-decoration-style: double;">
+               text-decoration-style: double;">
     Here has double decoration lines,
   <span style="font-size: 2em;">
     here is specified as dashed decoration lines but should be
     ignored</span><span style="text-decoration: underline line-through overline;
-                               -moz-text-decoration-style: double;">,
+                               text-decoration-style: double;">,
     and here has double decoration lines.</span></span>
 </p>
 <p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,33 +1,33 @@
 <!DOCTYPE html>
-<p style="-moz-text-decoration-style: dotted;">
+<p style="text-decoration-style: dotted;">
   Here is specified the decoration style as dotted but no decoration lines,
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;">
     here has solid decoration lines</span>, and here has no decoration lines.
 </p>
-<p style="-moz-text-decoration-style: dashed;">
+<p style="text-decoration-style: dashed;">
   Here is specified the decoration style as dashed but no decoration lines,
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-style: inherit;">
+               text-decoration-style: inherit;">
     here has inherited decoration lines</span>,
   and here has no decoration lines.
 </p>
 <p style="text-decoration: underline line-through overline;
-          -moz-text-decoration-style: double;">
+          text-decoration-style: double;">
   Here has double decoration lines,
   <span style="font-size: 2em;
-               -moz-text-decoration-style: dashed;">
+               text-decoration-style: dashed;">
     here is specified as dashed decoration lines but should be ignored</span>,
   and here has double decoration lines.
 </p>
 <p style="text-decoration: underline line-through overline;
-          -moz-text-decoration-style: -moz-none;">
+          text-decoration-style: -moz-none;">
   Here is specified the decoration style as -moz-none.
 </p>
-<p style="-moz-text-decoration-style: dotted;
+<p style="text-decoration-style: dotted;
           text-decoration: underline line-through overline;">
   Here has solid decoration lines even if its style is specified as dotted
   before text-decoration.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-standards-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-standards-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/decoration-style-standards-ref.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/decoration-style-standards-ref.html	2014-11-26 21:45:50.000000000 +0000
@@ -4,7 +4,7 @@
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration: solid;">
+               text-decoration-style: solid;">
     here has solid decoration lines</span>,
   and here has no decoration lines.
 </p>
@@ -13,12 +13,12 @@
   however,
   <span style="font-size: 2em;
                text-decoration: underline line-through overline;
-               -moz-text-decoration-style: dashed;">
+               text-decoration-style: dashed;">
     here has inherited decoration lines</span>,
   and here has no decoration lines.
 </p>
 <p style="text-decoration: underline line-through overline;
-          -moz-text-decoration-style: double;">
+          text-decoration-style: double;">
   Here has double decoration lines,
   <span style="font-size: 2em;
                text-decoration: none;">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: line-through; -moz-text-decoration-style: dashed;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: dashed;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dashed-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: line-through; -moz-text-decoration-style: dashed;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: dashed;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: line-through; -moz-text-decoration-style: dotted;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: dotted;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-dotted-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: line-through; -moz-text-decoration-style: dotted;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: dotted;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-double-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-double-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-double-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-double-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: line-through; -moz-text-decoration-style: double;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: double;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-double-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-double-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-double-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-double-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: line-through; -moz-text-decoration-style: double;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: double;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: line-through; -moz-text-decoration-style: solid;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: solid;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-solid-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: line-through; -moz-text-decoration-style: solid;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: solid;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: line-through; -moz-text-decoration-style: wavy;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: wavy;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-block-wavy-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: line-through; -moz-text-decoration-style: wavy;">This paragraph has line-through</p>
+<p style="text-decoration: line-through; text-decoration-style: wavy;">This paragraph has line-through</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dashed-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dashed;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-dotted-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: dotted;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-double-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: double;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-solid-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: solid;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/line-through-style-inline-wavy-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; -moz-text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: line-through; text-decoration-style: wavy;">here has line-through</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: overline; -moz-text-decoration-style: dashed;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: dashed;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dashed-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: overline; -moz-text-decoration-style: dashed;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: dashed;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: overline; -moz-text-decoration-style: dotted;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: dotted;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-dotted-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: overline; -moz-text-decoration-style: dotted;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: dotted;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-double-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-double-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-double-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-double-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: overline; -moz-text-decoration-style: double;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: double;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-double-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-double-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-double-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-double-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: overline; -moz-text-decoration-style: double;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: double;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-solid-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-solid-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-solid-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-solid-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: overline; -moz-text-decoration-style: solid;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: solid;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-solid-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-solid-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-solid-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-solid-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: overline; -moz-text-decoration-style: solid;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: solid;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: overline; -moz-text-decoration-style: wavy;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: wavy;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-block-wavy-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: overline; -moz-text-decoration-style: wavy;">This paragraph has overline</p>
+<p style="text-decoration: overline; text-decoration-style: wavy;">This paragraph has overline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dashed-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dashed;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-dotted-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: dotted;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-double-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-double-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-double-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-double-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-double-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-double-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-double-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-double-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: double;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-solid-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: solid;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/overline-style-inline-wavy-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; -moz-text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: overline; text-decoration-style: wavy;">here has overline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: underline; -moz-text-decoration-style: dashed;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: dashed;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dashed-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: underline; -moz-text-decoration-style: dashed;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: dashed;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: underline; -moz-text-decoration-style: dotted;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: dotted;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-dotted-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: underline; -moz-text-decoration-style: dotted;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: dotted;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-double-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-double-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-double-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-double-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: underline; -moz-text-decoration-style: double;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: double;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-double-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-double-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-double-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-double-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: underline; -moz-text-decoration-style: double;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: double;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-solid-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-solid-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-solid-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-solid-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: underline; -moz-text-decoration-style: solid;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: solid;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-solid-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-solid-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-solid-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-solid-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: underline; -moz-text-decoration-style: solid;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: solid;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p style="text-decoration: underline; -moz-text-decoration-style: wavy;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: wavy;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-block-wavy-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p style="text-decoration: underline; -moz-text-decoration-style: wavy;">This paragraph has underline</p>
+<p style="text-decoration: underline; text-decoration-style: wavy;">This paragraph has underline</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dashed-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dashed;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-dotted-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: dotted;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-double-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-double-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-double-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-double-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-double-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-double-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-double-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-double-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: double;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-solid-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: solid;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-quirks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-quirks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-quirks.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-quirks.html	2014-11-26 21:45:50.000000000 +0000
@@ -1 +1 @@
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-standards.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-standards.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-standards.html	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/text-decoration/underline-style-inline-wavy-standards.html	2014-11-26 21:45:50.000000000 +0000
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; -moz-text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>
+<p>This paragraph has no decoration lines, but <span style="text-decoration: underline; text-decoration-style: wavy;">here has underline</span>, and here has no decoration lines.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/transform-3d/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/transform-3d/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/transform-3d/reftest.list	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/transform-3d/reftest.list	2014-11-26 21:45:51.000000000 +0000
@@ -35,12 +35,12 @@
 != backface-visibility-1a.html about:blank
 == backface-visibility-1b.html about:blank
 == backface-visibility-1c.html about:blank
-== backface-visibility-2.html backface-visibility-2-ref.html
+fuzzy-if(winWidget&&!layersGPUAccelerated,1,251) == backface-visibility-2.html backface-visibility-2-ref.html
 == backface-visibility-3.html backface-visibility-3-ref.html
 != perspective-origin-1a.html rotatex-perspective-1a.html
 random-if(Android&&AndroidVersion==17) == perspective-origin-1b.html perspective-origin-1a.html
 random-if(Android&&!browserIsRemote) == perspective-origin-2a.html perspective-origin-2-ref.html # bug 732568
-== perspective-origin-3a.html perspective-origin-3-ref.html
+fuzzy-if(winWidget&&!layersGPUAccelerated,1,61) == perspective-origin-3a.html perspective-origin-3-ref.html
 == perspective-origin-4a.html perspective-origin-4-ref.html
 != sorting-1a.html sorting-1-ref.html
 # Parallel planes, different z depth
@@ -50,8 +50,8 @@
 == sorting-3a.html green-rect.html
 # Different, but equivalent (for the given transform) transform origins
 == rotatex-transformorigin-1a.html rotatex-transformorigin-1-ref.html
-== overflow-hidden-1a.html overflow-hidden-1-ref.html
+fuzzy-if((gtk2Widget&&layersOMTC)||(winWidget&&!layersGPUAccelerated),1,86) == overflow-hidden-1a.html overflow-hidden-1-ref.html
 == transform-style-flat-1a.html transform-style-flat-1-ref.html
 pref(layout.css.will-change.enabled,true) == willchange-containing-block.html?willchange willchange-containing-block.html?ref
 pref(layout.css.will-change.enabled,true) != willchange-containing-block.html?willchange willchange-containing-block.html?noblock
-== scroll-perspective-1.html scroll-perspective-1-ref.html
+fuzzy-if(winWidget&&!layersGPUAccelerated,1,606) == scroll-perspective-1.html scroll-perspective-1-ref.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.png" class="bigWide tr">
+    <embed src="support/colors-16x8.png" class="bigWide bl">
+    <embed src="support/colors-16x8.png" class="bigWide tl">
+    <embed src="support/colors-16x8.png" class="bigWide br">
+    <embed src="support/colors-16x8.png" class="bigWide tc">
+    <embed src="support/colors-16x8.png" class="bigWide cr">
+    <embed src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.png" class="bigTall tr">
+    <embed src="support/colors-16x8.png" class="bigTall bl">
+    <embed src="support/colors-16x8.png" class="bigTall tl">
+    <embed src="support/colors-16x8.png" class="bigTall br">
+    <embed src="support/colors-16x8.png" class="bigTall tc">
+    <embed src="support/colors-16x8.png" class="bigTall cr">
+    <embed src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.png" class="small tr">
+    <embed src="support/colors-16x8.png" class="small bl">
+    <embed src="support/colors-16x8.png" class="small tl">
+    <embed src="support/colors-16x8.png" class="small br">
+    <embed src="support/colors-16x8.png" class="small tc">
+    <embed src="support/colors-16x8.png" class="small cr">
+    <embed src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.png" class="bigWide tr">
+    <img src="support/colors-16x8.png" class="bigWide bl">
+    <img src="support/colors-16x8.png" class="bigWide tl">
+    <img src="support/colors-16x8.png" class="bigWide br">
+    <img src="support/colors-16x8.png" class="bigWide tc">
+    <img src="support/colors-16x8.png" class="bigWide cr">
+    <img src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.png" class="bigTall tr">
+    <img src="support/colors-16x8.png" class="bigTall bl">
+    <img src="support/colors-16x8.png" class="bigTall tl">
+    <img src="support/colors-16x8.png" class="bigTall br">
+    <img src="support/colors-16x8.png" class="bigTall tc">
+    <img src="support/colors-16x8.png" class="bigTall cr">
+    <img src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.png" class="small tr">
+    <img src="support/colors-16x8.png" class="small bl">
+    <img src="support/colors-16x8.png" class="small tl">
+    <img src="support/colors-16x8.png" class="small br">
+    <img src="support/colors-16x8.png" class="small tc">
+    <img src="support/colors-16x8.png" class="small cr">
+    <img src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.png" class="bigWide tr"></object>
+    <object data="support/colors-16x8.png" class="bigWide bl"></object>
+    <object data="support/colors-16x8.png" class="bigWide tl"></object>
+    <object data="support/colors-16x8.png" class="bigWide br"></object>
+    <object data="support/colors-16x8.png" class="bigWide tc"></object>
+    <object data="support/colors-16x8.png" class="bigWide cr"></object>
+    <object data="support/colors-16x8.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.png" class="bigTall tr"></object>
+    <object data="support/colors-16x8.png" class="bigTall bl"></object>
+    <object data="support/colors-16x8.png" class="bigTall tl"></object>
+    <object data="support/colors-16x8.png" class="bigTall br"></object>
+    <object data="support/colors-16x8.png" class="bigTall tc"></object>
+    <object data="support/colors-16x8.png" class="bigTall cr"></object>
+    <object data="support/colors-16x8.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.png" class="small tr"></object>
+    <object data="support/colors-16x8.png" class="small bl"></object>
+    <object data="support/colors-16x8.png" class="small tl"></object>
+    <object data="support/colors-16x8.png" class="small br"></object>
+    <object data="support/colors-16x8.png" class="small tc"></object>
+    <object data="support/colors-16x8.png" class="small cr"></object>
+    <object data="support/colors-16x8.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.png" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide br"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.png" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.png" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall br"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.png" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.png" class="small tr"></video>
+    <video poster="support/colors-16x8.png" class="small bl"></video>
+    <video poster="support/colors-16x8.png" class="small tl"></video>
+    <video poster="support/colors-16x8.png" class="small br"></video>
+    <video poster="support/colors-16x8.png" class="small tc"></video>
+    <video poster="support/colors-16x8.png" class="small cr"></video>
+    <video poster="support/colors-16x8.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.png");
+        background-size: contain;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.png" class="bigWide tr">
+    <embed src="support/colors-8x16.png" class="bigWide bl">
+    <embed src="support/colors-8x16.png" class="bigWide tl">
+    <embed src="support/colors-8x16.png" class="bigWide br">
+    <embed src="support/colors-8x16.png" class="bigWide tc">
+    <embed src="support/colors-8x16.png" class="bigWide cr">
+    <embed src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.png" class="bigTall tr">
+    <embed src="support/colors-8x16.png" class="bigTall bl">
+    <embed src="support/colors-8x16.png" class="bigTall tl">
+    <embed src="support/colors-8x16.png" class="bigTall br">
+    <embed src="support/colors-8x16.png" class="bigTall tc">
+    <embed src="support/colors-8x16.png" class="bigTall cr">
+    <embed src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.png" class="small tr">
+    <embed src="support/colors-8x16.png" class="small bl">
+    <embed src="support/colors-8x16.png" class="small tl">
+    <embed src="support/colors-8x16.png" class="small br">
+    <embed src="support/colors-8x16.png" class="small tc">
+    <embed src="support/colors-8x16.png" class="small cr">
+    <embed src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.png" class="bigWide tr">
+    <img src="support/colors-8x16.png" class="bigWide bl">
+    <img src="support/colors-8x16.png" class="bigWide tl">
+    <img src="support/colors-8x16.png" class="bigWide br">
+    <img src="support/colors-8x16.png" class="bigWide tc">
+    <img src="support/colors-8x16.png" class="bigWide cr">
+    <img src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.png" class="bigTall tr">
+    <img src="support/colors-8x16.png" class="bigTall bl">
+    <img src="support/colors-8x16.png" class="bigTall tl">
+    <img src="support/colors-8x16.png" class="bigTall br">
+    <img src="support/colors-8x16.png" class="bigTall tc">
+    <img src="support/colors-8x16.png" class="bigTall cr">
+    <img src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.png" class="small tr">
+    <img src="support/colors-8x16.png" class="small bl">
+    <img src="support/colors-8x16.png" class="small tl">
+    <img src="support/colors-8x16.png" class="small br">
+    <img src="support/colors-8x16.png" class="small tc">
+    <img src="support/colors-8x16.png" class="small cr">
+    <img src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.png" class="bigWide tr"></object>
+    <object data="support/colors-8x16.png" class="bigWide bl"></object>
+    <object data="support/colors-8x16.png" class="bigWide tl"></object>
+    <object data="support/colors-8x16.png" class="bigWide br"></object>
+    <object data="support/colors-8x16.png" class="bigWide tc"></object>
+    <object data="support/colors-8x16.png" class="bigWide cr"></object>
+    <object data="support/colors-8x16.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.png" class="bigTall tr"></object>
+    <object data="support/colors-8x16.png" class="bigTall bl"></object>
+    <object data="support/colors-8x16.png" class="bigTall tl"></object>
+    <object data="support/colors-8x16.png" class="bigTall br"></object>
+    <object data="support/colors-8x16.png" class="bigTall tc"></object>
+    <object data="support/colors-8x16.png" class="bigTall cr"></object>
+    <object data="support/colors-8x16.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.png" class="small tr"></object>
+    <object data="support/colors-8x16.png" class="small bl"></object>
+    <object data="support/colors-8x16.png" class="small tl"></object>
+    <object data="support/colors-8x16.png" class="small br"></object>
+    <object data="support/colors-8x16.png" class="small tc"></object>
+    <object data="support/colors-8x16.png" class="small cr"></object>
+    <object data="support/colors-8x16.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-png-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.png" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide br"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.png" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.png" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall br"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.png" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.png" class="small tr"></video>
+    <video poster="support/colors-8x16.png" class="small bl"></video>
+    <video poster="support/colors-8x16.png" class="small tl"></video>
+    <video poster="support/colors-8x16.png" class="small br"></video>
+    <video poster="support/colors-8x16.png" class="small tc"></video>
+    <video poster="support/colors-8x16.png" class="small cr"></video>
+    <video poster="support/colors-8x16.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-png-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.png");
+        background-size: contain;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.svg" class="bigWide tr">
+    <embed src="support/colors-16x8.svg" class="bigWide bl">
+    <embed src="support/colors-16x8.svg" class="bigWide tl">
+    <embed src="support/colors-16x8.svg" class="bigWide br">
+    <embed src="support/colors-16x8.svg" class="bigWide tc">
+    <embed src="support/colors-16x8.svg" class="bigWide cr">
+    <embed src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.svg" class="bigTall tr">
+    <embed src="support/colors-16x8.svg" class="bigTall bl">
+    <embed src="support/colors-16x8.svg" class="bigTall tl">
+    <embed src="support/colors-16x8.svg" class="bigTall br">
+    <embed src="support/colors-16x8.svg" class="bigTall tc">
+    <embed src="support/colors-16x8.svg" class="bigTall cr">
+    <embed src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.svg" class="small tr">
+    <embed src="support/colors-16x8.svg" class="small bl">
+    <embed src="support/colors-16x8.svg" class="small tl">
+    <embed src="support/colors-16x8.svg" class="small br">
+    <embed src="support/colors-16x8.svg" class="small tc">
+    <embed src="support/colors-16x8.svg" class="small cr">
+    <embed src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.svg" class="bigWide tr">
+    <img src="support/colors-16x8.svg" class="bigWide bl">
+    <img src="support/colors-16x8.svg" class="bigWide tl">
+    <img src="support/colors-16x8.svg" class="bigWide br">
+    <img src="support/colors-16x8.svg" class="bigWide tc">
+    <img src="support/colors-16x8.svg" class="bigWide cr">
+    <img src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.svg" class="bigTall tr">
+    <img src="support/colors-16x8.svg" class="bigTall bl">
+    <img src="support/colors-16x8.svg" class="bigTall tl">
+    <img src="support/colors-16x8.svg" class="bigTall br">
+    <img src="support/colors-16x8.svg" class="bigTall tc">
+    <img src="support/colors-16x8.svg" class="bigTall cr">
+    <img src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.svg" class="small tr">
+    <img src="support/colors-16x8.svg" class="small bl">
+    <img src="support/colors-16x8.svg" class="small tl">
+    <img src="support/colors-16x8.svg" class="small br">
+    <img src="support/colors-16x8.svg" class="small tc">
+    <img src="support/colors-16x8.svg" class="small cr">
+    <img src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.svg" class="small tr"></object>
+    <object data="support/colors-16x8.svg" class="small bl"></object>
+    <object data="support/colors-16x8.svg" class="small tl"></object>
+    <object data="support/colors-16x8.svg" class="small br"></object>
+    <object data="support/colors-16x8.svg" class="small tc"></object>
+    <object data="support/colors-16x8.svg" class="small cr"></object>
+    <object data="support/colors-16x8.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.svg" class="small tr"></video>
+    <video poster="support/colors-16x8.svg" class="small bl"></video>
+    <video poster="support/colors-16x8.svg" class="small tl"></video>
+    <video poster="support/colors-16x8.svg" class="small br"></video>
+    <video poster="support/colors-16x8.svg" class="small tc"></video>
+    <video poster="support/colors-16x8.svg" class="small cr"></video>
+    <video poster="support/colors-16x8.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.svg");
+        background-size: contain;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.svg" class="bigWide tr">
+    <embed src="support/colors-8x16.svg" class="bigWide bl">
+    <embed src="support/colors-8x16.svg" class="bigWide tl">
+    <embed src="support/colors-8x16.svg" class="bigWide br">
+    <embed src="support/colors-8x16.svg" class="bigWide tc">
+    <embed src="support/colors-8x16.svg" class="bigWide cr">
+    <embed src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.svg" class="bigTall tr">
+    <embed src="support/colors-8x16.svg" class="bigTall bl">
+    <embed src="support/colors-8x16.svg" class="bigTall tl">
+    <embed src="support/colors-8x16.svg" class="bigTall br">
+    <embed src="support/colors-8x16.svg" class="bigTall tc">
+    <embed src="support/colors-8x16.svg" class="bigTall cr">
+    <embed src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.svg" class="small tr">
+    <embed src="support/colors-8x16.svg" class="small bl">
+    <embed src="support/colors-8x16.svg" class="small tl">
+    <embed src="support/colors-8x16.svg" class="small br">
+    <embed src="support/colors-8x16.svg" class="small tc">
+    <embed src="support/colors-8x16.svg" class="small cr">
+    <embed src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.svg" class="bigWide tr">
+    <img src="support/colors-8x16.svg" class="bigWide bl">
+    <img src="support/colors-8x16.svg" class="bigWide tl">
+    <img src="support/colors-8x16.svg" class="bigWide br">
+    <img src="support/colors-8x16.svg" class="bigWide tc">
+    <img src="support/colors-8x16.svg" class="bigWide cr">
+    <img src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.svg" class="bigTall tr">
+    <img src="support/colors-8x16.svg" class="bigTall bl">
+    <img src="support/colors-8x16.svg" class="bigTall tl">
+    <img src="support/colors-8x16.svg" class="bigTall br">
+    <img src="support/colors-8x16.svg" class="bigTall tc">
+    <img src="support/colors-8x16.svg" class="bigTall cr">
+    <img src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.svg" class="small tr">
+    <img src="support/colors-8x16.svg" class="small bl">
+    <img src="support/colors-8x16.svg" class="small tl">
+    <img src="support/colors-8x16.svg" class="small br">
+    <img src="support/colors-8x16.svg" class="small tc">
+    <img src="support/colors-8x16.svg" class="small cr">
+    <img src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.svg" class="small tr"></object>
+    <object data="support/colors-8x16.svg" class="small bl"></object>
+    <object data="support/colors-8x16.svg" class="small tl"></object>
+    <object data="support/colors-8x16.svg" class="small br"></object>
+    <object data="support/colors-8x16.svg" class="small tc"></object>
+    <object data="support/colors-8x16.svg" class="small cr"></object>
+    <object data="support/colors-8x16.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.svg" class="small tr"></video>
+    <video poster="support/colors-8x16.svg" class="small bl"></video>
+    <video poster="support/colors-8x16.svg" class="small tl"></video>
+    <video poster="support/colors-8x16.svg" class="small br"></video>
+    <video poster="support/colors-8x16.svg" class="small tc"></video>
+    <video poster="support/colors-8x16.svg" class="small cr"></video>
+    <video poster="support/colors-8x16.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.svg");
+        background-size: contain;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-003-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-noSize.svg" class="small tr">
+    <embed src="support/colors-16x8-noSize.svg" class="small bl">
+    <embed src="support/colors-16x8-noSize.svg" class="small tl">
+    <embed src="support/colors-16x8-noSize.svg" class="small br">
+    <embed src="support/colors-16x8-noSize.svg" class="small tc">
+    <embed src="support/colors-16x8-noSize.svg" class="small cr">
+    <embed src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-003-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-noSize.svg" class="small tr">
+    <img src="support/colors-16x8-noSize.svg" class="small bl">
+    <img src="support/colors-16x8-noSize.svg" class="small tl">
+    <img src="support/colors-16x8-noSize.svg" class="small br">
+    <img src="support/colors-16x8-noSize.svg" class="small tc">
+    <img src="support/colors-16x8-noSize.svg" class="small cr">
+    <img src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-003-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-noSize.svg" class="small tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-003-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-003-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-noSize.svg");
+        background-size: contain;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-004-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-noSize.svg" class="small tr">
+    <embed src="support/colors-8x16-noSize.svg" class="small bl">
+    <embed src="support/colors-8x16-noSize.svg" class="small tl">
+    <embed src="support/colors-8x16-noSize.svg" class="small br">
+    <embed src="support/colors-8x16-noSize.svg" class="small tc">
+    <embed src="support/colors-8x16-noSize.svg" class="small cr">
+    <embed src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-004-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-noSize.svg" class="small tr">
+    <img src="support/colors-8x16-noSize.svg" class="small bl">
+    <img src="support/colors-8x16-noSize.svg" class="small tl">
+    <img src="support/colors-8x16-noSize.svg" class="small br">
+    <img src="support/colors-8x16-noSize.svg" class="small tc">
+    <img src="support/colors-8x16-noSize.svg" class="small cr">
+    <img src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-004-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-noSize.svg" class="small tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-004-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-004-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-noSize.svg");
+        background-size: contain;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-005-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="small tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small br">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="small cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-005-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-parDefault.svg" class="small tr">
+    <img src="support/colors-16x8-parDefault.svg" class="small bl">
+    <img src="support/colors-16x8-parDefault.svg" class="small tl">
+    <img src="support/colors-16x8-parDefault.svg" class="small br">
+    <img src="support/colors-16x8-parDefault.svg" class="small tc">
+    <img src="support/colors-16x8-parDefault.svg" class="small cr">
+    <img src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-005-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-005-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-005-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-parDefault.svg");
+        background-size: contain;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-006-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="small tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small br">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="small cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-006-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-parDefault.svg" class="small tr">
+    <img src="support/colors-8x16-parDefault.svg" class="small bl">
+    <img src="support/colors-8x16-parDefault.svg" class="small tl">
+    <img src="support/colors-8x16-parDefault.svg" class="small br">
+    <img src="support/colors-8x16-parDefault.svg" class="small tc">
+    <img src="support/colors-8x16-parDefault.svg" class="small cr">
+    <img src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-006-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-svg-006-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-contain-svg-006-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-parDefault.svg");
+        background-size: contain;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.png" class="bigWide tr">
+    <embed src="support/colors-16x8.png" class="bigWide bl">
+    <embed src="support/colors-16x8.png" class="bigWide tl">
+    <embed src="support/colors-16x8.png" class="bigWide br">
+    <embed src="support/colors-16x8.png" class="bigWide tc">
+    <embed src="support/colors-16x8.png" class="bigWide cr">
+    <embed src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.png" class="bigTall tr">
+    <embed src="support/colors-16x8.png" class="bigTall bl">
+    <embed src="support/colors-16x8.png" class="bigTall tl">
+    <embed src="support/colors-16x8.png" class="bigTall br">
+    <embed src="support/colors-16x8.png" class="bigTall tc">
+    <embed src="support/colors-16x8.png" class="bigTall cr">
+    <embed src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.png" class="small tr">
+    <embed src="support/colors-16x8.png" class="small bl">
+    <embed src="support/colors-16x8.png" class="small tl">
+    <embed src="support/colors-16x8.png" class="small br">
+    <embed src="support/colors-16x8.png" class="small tc">
+    <embed src="support/colors-16x8.png" class="small cr">
+    <embed src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.png" class="bigWide tr">
+    <img src="support/colors-16x8.png" class="bigWide bl">
+    <img src="support/colors-16x8.png" class="bigWide tl">
+    <img src="support/colors-16x8.png" class="bigWide br">
+    <img src="support/colors-16x8.png" class="bigWide tc">
+    <img src="support/colors-16x8.png" class="bigWide cr">
+    <img src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.png" class="bigTall tr">
+    <img src="support/colors-16x8.png" class="bigTall bl">
+    <img src="support/colors-16x8.png" class="bigTall tl">
+    <img src="support/colors-16x8.png" class="bigTall br">
+    <img src="support/colors-16x8.png" class="bigTall tc">
+    <img src="support/colors-16x8.png" class="bigTall cr">
+    <img src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.png" class="small tr">
+    <img src="support/colors-16x8.png" class="small bl">
+    <img src="support/colors-16x8.png" class="small tl">
+    <img src="support/colors-16x8.png" class="small br">
+    <img src="support/colors-16x8.png" class="small tc">
+    <img src="support/colors-16x8.png" class="small cr">
+    <img src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.png" class="bigWide tr"></object>
+    <object data="support/colors-16x8.png" class="bigWide bl"></object>
+    <object data="support/colors-16x8.png" class="bigWide tl"></object>
+    <object data="support/colors-16x8.png" class="bigWide br"></object>
+    <object data="support/colors-16x8.png" class="bigWide tc"></object>
+    <object data="support/colors-16x8.png" class="bigWide cr"></object>
+    <object data="support/colors-16x8.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.png" class="bigTall tr"></object>
+    <object data="support/colors-16x8.png" class="bigTall bl"></object>
+    <object data="support/colors-16x8.png" class="bigTall tl"></object>
+    <object data="support/colors-16x8.png" class="bigTall br"></object>
+    <object data="support/colors-16x8.png" class="bigTall tc"></object>
+    <object data="support/colors-16x8.png" class="bigTall cr"></object>
+    <object data="support/colors-16x8.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.png" class="small tr"></object>
+    <object data="support/colors-16x8.png" class="small bl"></object>
+    <object data="support/colors-16x8.png" class="small tl"></object>
+    <object data="support/colors-16x8.png" class="small br"></object>
+    <object data="support/colors-16x8.png" class="small tc"></object>
+    <object data="support/colors-16x8.png" class="small cr"></object>
+    <object data="support/colors-16x8.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.png" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide br"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.png" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.png" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall br"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.png" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.png" class="small tr"></video>
+    <video poster="support/colors-16x8.png" class="small bl"></video>
+    <video poster="support/colors-16x8.png" class="small tl"></video>
+    <video poster="support/colors-16x8.png" class="small br"></video>
+    <video poster="support/colors-16x8.png" class="small tc"></video>
+    <video poster="support/colors-16x8.png" class="small cr"></video>
+    <video poster="support/colors-16x8.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.png");
+        background-size: cover;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.png" class="bigWide tr">
+    <embed src="support/colors-8x16.png" class="bigWide bl">
+    <embed src="support/colors-8x16.png" class="bigWide tl">
+    <embed src="support/colors-8x16.png" class="bigWide br">
+    <embed src="support/colors-8x16.png" class="bigWide tc">
+    <embed src="support/colors-8x16.png" class="bigWide cr">
+    <embed src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.png" class="bigTall tr">
+    <embed src="support/colors-8x16.png" class="bigTall bl">
+    <embed src="support/colors-8x16.png" class="bigTall tl">
+    <embed src="support/colors-8x16.png" class="bigTall br">
+    <embed src="support/colors-8x16.png" class="bigTall tc">
+    <embed src="support/colors-8x16.png" class="bigTall cr">
+    <embed src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.png" class="small tr">
+    <embed src="support/colors-8x16.png" class="small bl">
+    <embed src="support/colors-8x16.png" class="small tl">
+    <embed src="support/colors-8x16.png" class="small br">
+    <embed src="support/colors-8x16.png" class="small tc">
+    <embed src="support/colors-8x16.png" class="small cr">
+    <embed src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.png" class="bigWide tr">
+    <img src="support/colors-8x16.png" class="bigWide bl">
+    <img src="support/colors-8x16.png" class="bigWide tl">
+    <img src="support/colors-8x16.png" class="bigWide br">
+    <img src="support/colors-8x16.png" class="bigWide tc">
+    <img src="support/colors-8x16.png" class="bigWide cr">
+    <img src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.png" class="bigTall tr">
+    <img src="support/colors-8x16.png" class="bigTall bl">
+    <img src="support/colors-8x16.png" class="bigTall tl">
+    <img src="support/colors-8x16.png" class="bigTall br">
+    <img src="support/colors-8x16.png" class="bigTall tc">
+    <img src="support/colors-8x16.png" class="bigTall cr">
+    <img src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.png" class="small tr">
+    <img src="support/colors-8x16.png" class="small bl">
+    <img src="support/colors-8x16.png" class="small tl">
+    <img src="support/colors-8x16.png" class="small br">
+    <img src="support/colors-8x16.png" class="small tc">
+    <img src="support/colors-8x16.png" class="small cr">
+    <img src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.png" class="bigWide tr"></object>
+    <object data="support/colors-8x16.png" class="bigWide bl"></object>
+    <object data="support/colors-8x16.png" class="bigWide tl"></object>
+    <object data="support/colors-8x16.png" class="bigWide br"></object>
+    <object data="support/colors-8x16.png" class="bigWide tc"></object>
+    <object data="support/colors-8x16.png" class="bigWide cr"></object>
+    <object data="support/colors-8x16.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.png" class="bigTall tr"></object>
+    <object data="support/colors-8x16.png" class="bigTall bl"></object>
+    <object data="support/colors-8x16.png" class="bigTall tl"></object>
+    <object data="support/colors-8x16.png" class="bigTall br"></object>
+    <object data="support/colors-8x16.png" class="bigTall tc"></object>
+    <object data="support/colors-8x16.png" class="bigTall cr"></object>
+    <object data="support/colors-8x16.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.png" class="small tr"></object>
+    <object data="support/colors-8x16.png" class="small bl"></object>
+    <object data="support/colors-8x16.png" class="small tl"></object>
+    <object data="support/colors-8x16.png" class="small br"></object>
+    <object data="support/colors-8x16.png" class="small tc"></object>
+    <object data="support/colors-8x16.png" class="small cr"></object>
+    <object data="support/colors-8x16.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-png-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.png" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide br"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.png" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.png" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall br"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.png" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.png" class="small tr"></video>
+    <video poster="support/colors-8x16.png" class="small bl"></video>
+    <video poster="support/colors-8x16.png" class="small tl"></video>
+    <video poster="support/colors-8x16.png" class="small br"></video>
+    <video poster="support/colors-8x16.png" class="small tc"></video>
+    <video poster="support/colors-8x16.png" class="small cr"></video>
+    <video poster="support/colors-8x16.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-png-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.png");
+        background-size: cover;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.svg" class="bigWide tr">
+    <embed src="support/colors-16x8.svg" class="bigWide bl">
+    <embed src="support/colors-16x8.svg" class="bigWide tl">
+    <embed src="support/colors-16x8.svg" class="bigWide br">
+    <embed src="support/colors-16x8.svg" class="bigWide tc">
+    <embed src="support/colors-16x8.svg" class="bigWide cr">
+    <embed src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.svg" class="bigTall tr">
+    <embed src="support/colors-16x8.svg" class="bigTall bl">
+    <embed src="support/colors-16x8.svg" class="bigTall tl">
+    <embed src="support/colors-16x8.svg" class="bigTall br">
+    <embed src="support/colors-16x8.svg" class="bigTall tc">
+    <embed src="support/colors-16x8.svg" class="bigTall cr">
+    <embed src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.svg" class="small tr">
+    <embed src="support/colors-16x8.svg" class="small bl">
+    <embed src="support/colors-16x8.svg" class="small tl">
+    <embed src="support/colors-16x8.svg" class="small br">
+    <embed src="support/colors-16x8.svg" class="small tc">
+    <embed src="support/colors-16x8.svg" class="small cr">
+    <embed src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.svg" class="bigWide tr">
+    <img src="support/colors-16x8.svg" class="bigWide bl">
+    <img src="support/colors-16x8.svg" class="bigWide tl">
+    <img src="support/colors-16x8.svg" class="bigWide br">
+    <img src="support/colors-16x8.svg" class="bigWide tc">
+    <img src="support/colors-16x8.svg" class="bigWide cr">
+    <img src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.svg" class="bigTall tr">
+    <img src="support/colors-16x8.svg" class="bigTall bl">
+    <img src="support/colors-16x8.svg" class="bigTall tl">
+    <img src="support/colors-16x8.svg" class="bigTall br">
+    <img src="support/colors-16x8.svg" class="bigTall tc">
+    <img src="support/colors-16x8.svg" class="bigTall cr">
+    <img src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.svg" class="small tr">
+    <img src="support/colors-16x8.svg" class="small bl">
+    <img src="support/colors-16x8.svg" class="small tl">
+    <img src="support/colors-16x8.svg" class="small br">
+    <img src="support/colors-16x8.svg" class="small tc">
+    <img src="support/colors-16x8.svg" class="small cr">
+    <img src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.svg" class="small tr"></object>
+    <object data="support/colors-16x8.svg" class="small bl"></object>
+    <object data="support/colors-16x8.svg" class="small tl"></object>
+    <object data="support/colors-16x8.svg" class="small br"></object>
+    <object data="support/colors-16x8.svg" class="small tc"></object>
+    <object data="support/colors-16x8.svg" class="small cr"></object>
+    <object data="support/colors-16x8.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.svg" class="small tr"></video>
+    <video poster="support/colors-16x8.svg" class="small bl"></video>
+    <video poster="support/colors-16x8.svg" class="small tl"></video>
+    <video poster="support/colors-16x8.svg" class="small br"></video>
+    <video poster="support/colors-16x8.svg" class="small tc"></video>
+    <video poster="support/colors-16x8.svg" class="small cr"></video>
+    <video poster="support/colors-16x8.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.svg");
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.svg" class="bigWide tr">
+    <embed src="support/colors-8x16.svg" class="bigWide bl">
+    <embed src="support/colors-8x16.svg" class="bigWide tl">
+    <embed src="support/colors-8x16.svg" class="bigWide br">
+    <embed src="support/colors-8x16.svg" class="bigWide tc">
+    <embed src="support/colors-8x16.svg" class="bigWide cr">
+    <embed src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.svg" class="bigTall tr">
+    <embed src="support/colors-8x16.svg" class="bigTall bl">
+    <embed src="support/colors-8x16.svg" class="bigTall tl">
+    <embed src="support/colors-8x16.svg" class="bigTall br">
+    <embed src="support/colors-8x16.svg" class="bigTall tc">
+    <embed src="support/colors-8x16.svg" class="bigTall cr">
+    <embed src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.svg" class="small tr">
+    <embed src="support/colors-8x16.svg" class="small bl">
+    <embed src="support/colors-8x16.svg" class="small tl">
+    <embed src="support/colors-8x16.svg" class="small br">
+    <embed src="support/colors-8x16.svg" class="small tc">
+    <embed src="support/colors-8x16.svg" class="small cr">
+    <embed src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.svg" class="bigWide tr">
+    <img src="support/colors-8x16.svg" class="bigWide bl">
+    <img src="support/colors-8x16.svg" class="bigWide tl">
+    <img src="support/colors-8x16.svg" class="bigWide br">
+    <img src="support/colors-8x16.svg" class="bigWide tc">
+    <img src="support/colors-8x16.svg" class="bigWide cr">
+    <img src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.svg" class="bigTall tr">
+    <img src="support/colors-8x16.svg" class="bigTall bl">
+    <img src="support/colors-8x16.svg" class="bigTall tl">
+    <img src="support/colors-8x16.svg" class="bigTall br">
+    <img src="support/colors-8x16.svg" class="bigTall tc">
+    <img src="support/colors-8x16.svg" class="bigTall cr">
+    <img src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.svg" class="small tr">
+    <img src="support/colors-8x16.svg" class="small bl">
+    <img src="support/colors-8x16.svg" class="small tl">
+    <img src="support/colors-8x16.svg" class="small br">
+    <img src="support/colors-8x16.svg" class="small tc">
+    <img src="support/colors-8x16.svg" class="small cr">
+    <img src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.svg" class="small tr"></object>
+    <object data="support/colors-8x16.svg" class="small bl"></object>
+    <object data="support/colors-8x16.svg" class="small tl"></object>
+    <object data="support/colors-8x16.svg" class="small br"></object>
+    <object data="support/colors-8x16.svg" class="small tc"></object>
+    <object data="support/colors-8x16.svg" class="small cr"></object>
+    <object data="support/colors-8x16.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.svg" class="small tr"></video>
+    <video poster="support/colors-8x16.svg" class="small bl"></video>
+    <video poster="support/colors-8x16.svg" class="small tl"></video>
+    <video poster="support/colors-8x16.svg" class="small br"></video>
+    <video poster="support/colors-8x16.svg" class="small tc"></video>
+    <video poster="support/colors-8x16.svg" class="small cr"></video>
+    <video poster="support/colors-8x16.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.svg");
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-003-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-noSize.svg" class="small tr">
+    <embed src="support/colors-16x8-noSize.svg" class="small bl">
+    <embed src="support/colors-16x8-noSize.svg" class="small tl">
+    <embed src="support/colors-16x8-noSize.svg" class="small br">
+    <embed src="support/colors-16x8-noSize.svg" class="small tc">
+    <embed src="support/colors-16x8-noSize.svg" class="small cr">
+    <embed src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-003-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-noSize.svg" class="small tr">
+    <img src="support/colors-16x8-noSize.svg" class="small bl">
+    <img src="support/colors-16x8-noSize.svg" class="small tl">
+    <img src="support/colors-16x8-noSize.svg" class="small br">
+    <img src="support/colors-16x8-noSize.svg" class="small tc">
+    <img src="support/colors-16x8-noSize.svg" class="small cr">
+    <img src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-003-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-noSize.svg" class="small tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-003-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-003-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-noSize.svg");
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-004-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-noSize.svg" class="small tr">
+    <embed src="support/colors-8x16-noSize.svg" class="small bl">
+    <embed src="support/colors-8x16-noSize.svg" class="small tl">
+    <embed src="support/colors-8x16-noSize.svg" class="small br">
+    <embed src="support/colors-8x16-noSize.svg" class="small tc">
+    <embed src="support/colors-8x16-noSize.svg" class="small cr">
+    <embed src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-004-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-noSize.svg" class="small tr">
+    <img src="support/colors-8x16-noSize.svg" class="small bl">
+    <img src="support/colors-8x16-noSize.svg" class="small tl">
+    <img src="support/colors-8x16-noSize.svg" class="small br">
+    <img src="support/colors-8x16-noSize.svg" class="small tc">
+    <img src="support/colors-8x16-noSize.svg" class="small cr">
+    <img src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-004-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-noSize.svg" class="small tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-004-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-004-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-noSize.svg");
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-005-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="small tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small br">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="small cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-005-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-parDefault.svg" class="small tr">
+    <img src="support/colors-16x8-parDefault.svg" class="small bl">
+    <img src="support/colors-16x8-parDefault.svg" class="small tl">
+    <img src="support/colors-16x8-parDefault.svg" class="small br">
+    <img src="support/colors-16x8-parDefault.svg" class="small tc">
+    <img src="support/colors-16x8-parDefault.svg" class="small cr">
+    <img src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-005-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-005-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-005-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-parDefault.svg");
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-006-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="small tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small br">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="small cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-006-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-parDefault.svg" class="small tr">
+    <img src="support/colors-8x16-parDefault.svg" class="small bl">
+    <img src="support/colors-8x16-parDefault.svg" class="small tl">
+    <img src="support/colors-8x16-parDefault.svg" class="small br">
+    <img src="support/colors-8x16-parDefault.svg" class="small tc">
+    <img src="support/colors-8x16-parDefault.svg" class="small cr">
+    <img src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-006-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-svg-006-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-cover-svg-006-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-parDefault.svg");
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.png" class="bigWide tr">
+    <embed src="support/colors-16x8.png" class="bigWide bl">
+    <embed src="support/colors-16x8.png" class="bigWide tl">
+    <embed src="support/colors-16x8.png" class="bigWide br">
+    <embed src="support/colors-16x8.png" class="bigWide tc">
+    <embed src="support/colors-16x8.png" class="bigWide cr">
+    <embed src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.png" class="bigTall tr">
+    <embed src="support/colors-16x8.png" class="bigTall bl">
+    <embed src="support/colors-16x8.png" class="bigTall tl">
+    <embed src="support/colors-16x8.png" class="bigTall br">
+    <embed src="support/colors-16x8.png" class="bigTall tc">
+    <embed src="support/colors-16x8.png" class="bigTall cr">
+    <embed src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.png" class="small tr">
+    <embed src="support/colors-16x8.png" class="small bl">
+    <embed src="support/colors-16x8.png" class="small tl">
+    <embed src="support/colors-16x8.png" class="small br">
+    <embed src="support/colors-16x8.png" class="small tc">
+    <embed src="support/colors-16x8.png" class="small cr">
+    <embed src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.png" class="bigWide tr">
+    <img src="support/colors-16x8.png" class="bigWide bl">
+    <img src="support/colors-16x8.png" class="bigWide tl">
+    <img src="support/colors-16x8.png" class="bigWide br">
+    <img src="support/colors-16x8.png" class="bigWide tc">
+    <img src="support/colors-16x8.png" class="bigWide cr">
+    <img src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.png" class="bigTall tr">
+    <img src="support/colors-16x8.png" class="bigTall bl">
+    <img src="support/colors-16x8.png" class="bigTall tl">
+    <img src="support/colors-16x8.png" class="bigTall br">
+    <img src="support/colors-16x8.png" class="bigTall tc">
+    <img src="support/colors-16x8.png" class="bigTall cr">
+    <img src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.png" class="small tr">
+    <img src="support/colors-16x8.png" class="small bl">
+    <img src="support/colors-16x8.png" class="small tl">
+    <img src="support/colors-16x8.png" class="small br">
+    <img src="support/colors-16x8.png" class="small tc">
+    <img src="support/colors-16x8.png" class="small cr">
+    <img src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.png" class="bigWide tr"></object>
+    <object data="support/colors-16x8.png" class="bigWide bl"></object>
+    <object data="support/colors-16x8.png" class="bigWide tl"></object>
+    <object data="support/colors-16x8.png" class="bigWide br"></object>
+    <object data="support/colors-16x8.png" class="bigWide tc"></object>
+    <object data="support/colors-16x8.png" class="bigWide cr"></object>
+    <object data="support/colors-16x8.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.png" class="bigTall tr"></object>
+    <object data="support/colors-16x8.png" class="bigTall bl"></object>
+    <object data="support/colors-16x8.png" class="bigTall tl"></object>
+    <object data="support/colors-16x8.png" class="bigTall br"></object>
+    <object data="support/colors-16x8.png" class="bigTall tc"></object>
+    <object data="support/colors-16x8.png" class="bigTall cr"></object>
+    <object data="support/colors-16x8.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.png" class="small tr"></object>
+    <object data="support/colors-16x8.png" class="small bl"></object>
+    <object data="support/colors-16x8.png" class="small tl"></object>
+    <object data="support/colors-16x8.png" class="small br"></object>
+    <object data="support/colors-16x8.png" class="small tc"></object>
+    <object data="support/colors-16x8.png" class="small cr"></object>
+    <object data="support/colors-16x8.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.png" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide br"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.png" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.png" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall br"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.png" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.png" class="small tr"></video>
+    <video poster="support/colors-16x8.png" class="small bl"></video>
+    <video poster="support/colors-16x8.png" class="small tl"></video>
+    <video poster="support/colors-16x8.png" class="small br"></video>
+    <video poster="support/colors-16x8.png" class="small tc"></video>
+    <video poster="support/colors-16x8.png" class="small cr"></video>
+    <video poster="support/colors-16x8.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.png");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.png" class="bigWide tr">
+    <embed src="support/colors-8x16.png" class="bigWide bl">
+    <embed src="support/colors-8x16.png" class="bigWide tl">
+    <embed src="support/colors-8x16.png" class="bigWide br">
+    <embed src="support/colors-8x16.png" class="bigWide tc">
+    <embed src="support/colors-8x16.png" class="bigWide cr">
+    <embed src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.png" class="bigTall tr">
+    <embed src="support/colors-8x16.png" class="bigTall bl">
+    <embed src="support/colors-8x16.png" class="bigTall tl">
+    <embed src="support/colors-8x16.png" class="bigTall br">
+    <embed src="support/colors-8x16.png" class="bigTall tc">
+    <embed src="support/colors-8x16.png" class="bigTall cr">
+    <embed src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.png" class="small tr">
+    <embed src="support/colors-8x16.png" class="small bl">
+    <embed src="support/colors-8x16.png" class="small tl">
+    <embed src="support/colors-8x16.png" class="small br">
+    <embed src="support/colors-8x16.png" class="small tc">
+    <embed src="support/colors-8x16.png" class="small cr">
+    <embed src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.png" class="bigWide tr">
+    <img src="support/colors-8x16.png" class="bigWide bl">
+    <img src="support/colors-8x16.png" class="bigWide tl">
+    <img src="support/colors-8x16.png" class="bigWide br">
+    <img src="support/colors-8x16.png" class="bigWide tc">
+    <img src="support/colors-8x16.png" class="bigWide cr">
+    <img src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.png" class="bigTall tr">
+    <img src="support/colors-8x16.png" class="bigTall bl">
+    <img src="support/colors-8x16.png" class="bigTall tl">
+    <img src="support/colors-8x16.png" class="bigTall br">
+    <img src="support/colors-8x16.png" class="bigTall tc">
+    <img src="support/colors-8x16.png" class="bigTall cr">
+    <img src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.png" class="small tr">
+    <img src="support/colors-8x16.png" class="small bl">
+    <img src="support/colors-8x16.png" class="small tl">
+    <img src="support/colors-8x16.png" class="small br">
+    <img src="support/colors-8x16.png" class="small tc">
+    <img src="support/colors-8x16.png" class="small cr">
+    <img src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.png" class="bigWide tr"></object>
+    <object data="support/colors-8x16.png" class="bigWide bl"></object>
+    <object data="support/colors-8x16.png" class="bigWide tl"></object>
+    <object data="support/colors-8x16.png" class="bigWide br"></object>
+    <object data="support/colors-8x16.png" class="bigWide tc"></object>
+    <object data="support/colors-8x16.png" class="bigWide cr"></object>
+    <object data="support/colors-8x16.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.png" class="bigTall tr"></object>
+    <object data="support/colors-8x16.png" class="bigTall bl"></object>
+    <object data="support/colors-8x16.png" class="bigTall tl"></object>
+    <object data="support/colors-8x16.png" class="bigTall br"></object>
+    <object data="support/colors-8x16.png" class="bigTall tc"></object>
+    <object data="support/colors-8x16.png" class="bigTall cr"></object>
+    <object data="support/colors-8x16.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.png" class="small tr"></object>
+    <object data="support/colors-8x16.png" class="small bl"></object>
+    <object data="support/colors-8x16.png" class="small tl"></object>
+    <object data="support/colors-8x16.png" class="small br"></object>
+    <object data="support/colors-8x16.png" class="small tc"></object>
+    <object data="support/colors-8x16.png" class="small cr"></object>
+    <object data="support/colors-8x16.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-png-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.png" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide br"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.png" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.png" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall br"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.png" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.png" class="small tr"></video>
+    <video poster="support/colors-8x16.png" class="small bl"></video>
+    <video poster="support/colors-8x16.png" class="small tl"></video>
+    <video poster="support/colors-8x16.png" class="small br"></video>
+    <video poster="support/colors-8x16.png" class="small tc"></video>
+    <video poster="support/colors-8x16.png" class="small cr"></video>
+    <video poster="support/colors-8x16.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-png-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.png");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.svg" class="bigWide tr">
+    <embed src="support/colors-16x8.svg" class="bigWide bl">
+    <embed src="support/colors-16x8.svg" class="bigWide tl">
+    <embed src="support/colors-16x8.svg" class="bigWide br">
+    <embed src="support/colors-16x8.svg" class="bigWide tc">
+    <embed src="support/colors-16x8.svg" class="bigWide cr">
+    <embed src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.svg" class="bigTall tr">
+    <embed src="support/colors-16x8.svg" class="bigTall bl">
+    <embed src="support/colors-16x8.svg" class="bigTall tl">
+    <embed src="support/colors-16x8.svg" class="bigTall br">
+    <embed src="support/colors-16x8.svg" class="bigTall tc">
+    <embed src="support/colors-16x8.svg" class="bigTall cr">
+    <embed src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.svg" class="small tr">
+    <embed src="support/colors-16x8.svg" class="small bl">
+    <embed src="support/colors-16x8.svg" class="small tl">
+    <embed src="support/colors-16x8.svg" class="small br">
+    <embed src="support/colors-16x8.svg" class="small tc">
+    <embed src="support/colors-16x8.svg" class="small cr">
+    <embed src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.svg" class="bigWide tr">
+    <img src="support/colors-16x8.svg" class="bigWide bl">
+    <img src="support/colors-16x8.svg" class="bigWide tl">
+    <img src="support/colors-16x8.svg" class="bigWide br">
+    <img src="support/colors-16x8.svg" class="bigWide tc">
+    <img src="support/colors-16x8.svg" class="bigWide cr">
+    <img src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.svg" class="bigTall tr">
+    <img src="support/colors-16x8.svg" class="bigTall bl">
+    <img src="support/colors-16x8.svg" class="bigTall tl">
+    <img src="support/colors-16x8.svg" class="bigTall br">
+    <img src="support/colors-16x8.svg" class="bigTall tc">
+    <img src="support/colors-16x8.svg" class="bigTall cr">
+    <img src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.svg" class="small tr">
+    <img src="support/colors-16x8.svg" class="small bl">
+    <img src="support/colors-16x8.svg" class="small tl">
+    <img src="support/colors-16x8.svg" class="small br">
+    <img src="support/colors-16x8.svg" class="small tc">
+    <img src="support/colors-16x8.svg" class="small cr">
+    <img src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.svg" class="small tr"></object>
+    <object data="support/colors-16x8.svg" class="small bl"></object>
+    <object data="support/colors-16x8.svg" class="small tl"></object>
+    <object data="support/colors-16x8.svg" class="small br"></object>
+    <object data="support/colors-16x8.svg" class="small tc"></object>
+    <object data="support/colors-16x8.svg" class="small cr"></object>
+    <object data="support/colors-16x8.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.svg" class="small tr"></video>
+    <video poster="support/colors-16x8.svg" class="small bl"></video>
+    <video poster="support/colors-16x8.svg" class="small tl"></video>
+    <video poster="support/colors-16x8.svg" class="small br"></video>
+    <video poster="support/colors-16x8.svg" class="small tc"></video>
+    <video poster="support/colors-16x8.svg" class="small cr"></video>
+    <video poster="support/colors-16x8.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.svg" class="bigWide tr">
+    <embed src="support/colors-8x16.svg" class="bigWide bl">
+    <embed src="support/colors-8x16.svg" class="bigWide tl">
+    <embed src="support/colors-8x16.svg" class="bigWide br">
+    <embed src="support/colors-8x16.svg" class="bigWide tc">
+    <embed src="support/colors-8x16.svg" class="bigWide cr">
+    <embed src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.svg" class="bigTall tr">
+    <embed src="support/colors-8x16.svg" class="bigTall bl">
+    <embed src="support/colors-8x16.svg" class="bigTall tl">
+    <embed src="support/colors-8x16.svg" class="bigTall br">
+    <embed src="support/colors-8x16.svg" class="bigTall tc">
+    <embed src="support/colors-8x16.svg" class="bigTall cr">
+    <embed src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.svg" class="small tr">
+    <embed src="support/colors-8x16.svg" class="small bl">
+    <embed src="support/colors-8x16.svg" class="small tl">
+    <embed src="support/colors-8x16.svg" class="small br">
+    <embed src="support/colors-8x16.svg" class="small tc">
+    <embed src="support/colors-8x16.svg" class="small cr">
+    <embed src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.svg" class="bigWide tr">
+    <img src="support/colors-8x16.svg" class="bigWide bl">
+    <img src="support/colors-8x16.svg" class="bigWide tl">
+    <img src="support/colors-8x16.svg" class="bigWide br">
+    <img src="support/colors-8x16.svg" class="bigWide tc">
+    <img src="support/colors-8x16.svg" class="bigWide cr">
+    <img src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.svg" class="bigTall tr">
+    <img src="support/colors-8x16.svg" class="bigTall bl">
+    <img src="support/colors-8x16.svg" class="bigTall tl">
+    <img src="support/colors-8x16.svg" class="bigTall br">
+    <img src="support/colors-8x16.svg" class="bigTall tc">
+    <img src="support/colors-8x16.svg" class="bigTall cr">
+    <img src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.svg" class="small tr">
+    <img src="support/colors-8x16.svg" class="small bl">
+    <img src="support/colors-8x16.svg" class="small tl">
+    <img src="support/colors-8x16.svg" class="small br">
+    <img src="support/colors-8x16.svg" class="small tc">
+    <img src="support/colors-8x16.svg" class="small cr">
+    <img src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.svg" class="small tr"></object>
+    <object data="support/colors-8x16.svg" class="small bl"></object>
+    <object data="support/colors-8x16.svg" class="small tl"></object>
+    <object data="support/colors-8x16.svg" class="small br"></object>
+    <object data="support/colors-8x16.svg" class="small tc"></object>
+    <object data="support/colors-8x16.svg" class="small cr"></object>
+    <object data="support/colors-8x16.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.svg" class="small tr"></video>
+    <video poster="support/colors-8x16.svg" class="small bl"></video>
+    <video poster="support/colors-8x16.svg" class="small tl"></video>
+    <video poster="support/colors-8x16.svg" class="small br"></video>
+    <video poster="support/colors-8x16.svg" class="small tc"></video>
+    <video poster="support/colors-8x16.svg" class="small cr"></video>
+    <video poster="support/colors-8x16.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-003-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-noSize.svg" class="small tr">
+    <embed src="support/colors-16x8-noSize.svg" class="small bl">
+    <embed src="support/colors-16x8-noSize.svg" class="small tl">
+    <embed src="support/colors-16x8-noSize.svg" class="small br">
+    <embed src="support/colors-16x8-noSize.svg" class="small tc">
+    <embed src="support/colors-16x8-noSize.svg" class="small cr">
+    <embed src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-003-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-noSize.svg" class="small tr">
+    <img src="support/colors-16x8-noSize.svg" class="small bl">
+    <img src="support/colors-16x8-noSize.svg" class="small tl">
+    <img src="support/colors-16x8-noSize.svg" class="small br">
+    <img src="support/colors-16x8-noSize.svg" class="small tc">
+    <img src="support/colors-16x8-noSize.svg" class="small cr">
+    <img src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-003-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-noSize.svg" class="small tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-003-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-003-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-noSize.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-004-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-noSize.svg" class="small tr">
+    <embed src="support/colors-8x16-noSize.svg" class="small bl">
+    <embed src="support/colors-8x16-noSize.svg" class="small tl">
+    <embed src="support/colors-8x16-noSize.svg" class="small br">
+    <embed src="support/colors-8x16-noSize.svg" class="small tc">
+    <embed src="support/colors-8x16-noSize.svg" class="small cr">
+    <embed src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-004-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-noSize.svg" class="small tr">
+    <img src="support/colors-8x16-noSize.svg" class="small bl">
+    <img src="support/colors-8x16-noSize.svg" class="small tl">
+    <img src="support/colors-8x16-noSize.svg" class="small br">
+    <img src="support/colors-8x16-noSize.svg" class="small tc">
+    <img src="support/colors-8x16-noSize.svg" class="small cr">
+    <img src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-004-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-noSize.svg" class="small tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-004-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-004-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-noSize.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-005-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="small tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small br">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="small cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-005-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-parDefault.svg" class="small tr">
+    <img src="support/colors-16x8-parDefault.svg" class="small bl">
+    <img src="support/colors-16x8-parDefault.svg" class="small tl">
+    <img src="support/colors-16x8-parDefault.svg" class="small br">
+    <img src="support/colors-16x8-parDefault.svg" class="small tc">
+    <img src="support/colors-16x8-parDefault.svg" class="small cr">
+    <img src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-005-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-005-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-005-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-parDefault.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-006-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="small tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small br">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="small cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-006-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-parDefault.svg" class="small tr">
+    <img src="support/colors-8x16-parDefault.svg" class="small bl">
+    <img src="support/colors-8x16-parDefault.svg" class="small tl">
+    <img src="support/colors-8x16-parDefault.svg" class="small br">
+    <img src="support/colors-8x16-parDefault.svg" class="small tc">
+    <img src="support/colors-8x16-parDefault.svg" class="small cr">
+    <img src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-006-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-svg-006-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-fill-svg-006-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-parDefault.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.png" class="bigWide tr">
+    <embed src="support/colors-16x8.png" class="bigWide bl">
+    <embed src="support/colors-16x8.png" class="bigWide tl">
+    <embed src="support/colors-16x8.png" class="bigWide br">
+    <embed src="support/colors-16x8.png" class="bigWide tc">
+    <embed src="support/colors-16x8.png" class="bigWide cr">
+    <embed src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.png" class="bigTall tr">
+    <embed src="support/colors-16x8.png" class="bigTall bl">
+    <embed src="support/colors-16x8.png" class="bigTall tl">
+    <embed src="support/colors-16x8.png" class="bigTall br">
+    <embed src="support/colors-16x8.png" class="bigTall tc">
+    <embed src="support/colors-16x8.png" class="bigTall cr">
+    <embed src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.png" class="small tr">
+    <embed src="support/colors-16x8.png" class="small bl">
+    <embed src="support/colors-16x8.png" class="small tl">
+    <embed src="support/colors-16x8.png" class="small br">
+    <embed src="support/colors-16x8.png" class="small tc">
+    <embed src="support/colors-16x8.png" class="small cr">
+    <embed src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.png" class="bigWide tr">
+    <img src="support/colors-16x8.png" class="bigWide bl">
+    <img src="support/colors-16x8.png" class="bigWide tl">
+    <img src="support/colors-16x8.png" class="bigWide br">
+    <img src="support/colors-16x8.png" class="bigWide tc">
+    <img src="support/colors-16x8.png" class="bigWide cr">
+    <img src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.png" class="bigTall tr">
+    <img src="support/colors-16x8.png" class="bigTall bl">
+    <img src="support/colors-16x8.png" class="bigTall tl">
+    <img src="support/colors-16x8.png" class="bigTall br">
+    <img src="support/colors-16x8.png" class="bigTall tc">
+    <img src="support/colors-16x8.png" class="bigTall cr">
+    <img src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.png" class="small tr">
+    <img src="support/colors-16x8.png" class="small bl">
+    <img src="support/colors-16x8.png" class="small tl">
+    <img src="support/colors-16x8.png" class="small br">
+    <img src="support/colors-16x8.png" class="small tc">
+    <img src="support/colors-16x8.png" class="small cr">
+    <img src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.png" class="bigWide tr"></object>
+    <object data="support/colors-16x8.png" class="bigWide bl"></object>
+    <object data="support/colors-16x8.png" class="bigWide tl"></object>
+    <object data="support/colors-16x8.png" class="bigWide br"></object>
+    <object data="support/colors-16x8.png" class="bigWide tc"></object>
+    <object data="support/colors-16x8.png" class="bigWide cr"></object>
+    <object data="support/colors-16x8.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.png" class="bigTall tr"></object>
+    <object data="support/colors-16x8.png" class="bigTall bl"></object>
+    <object data="support/colors-16x8.png" class="bigTall tl"></object>
+    <object data="support/colors-16x8.png" class="bigTall br"></object>
+    <object data="support/colors-16x8.png" class="bigTall tc"></object>
+    <object data="support/colors-16x8.png" class="bigTall cr"></object>
+    <object data="support/colors-16x8.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.png" class="small tr"></object>
+    <object data="support/colors-16x8.png" class="small bl"></object>
+    <object data="support/colors-16x8.png" class="small tl"></object>
+    <object data="support/colors-16x8.png" class="small br"></object>
+    <object data="support/colors-16x8.png" class="small tc"></object>
+    <object data="support/colors-16x8.png" class="small cr"></object>
+    <object data="support/colors-16x8.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.png" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide br"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.png" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.png" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall br"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.png" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.png" class="small tr"></video>
+    <video poster="support/colors-16x8.png" class="small bl"></video>
+    <video poster="support/colors-16x8.png" class="small tl"></video>
+    <video poster="support/colors-16x8.png" class="small br"></video>
+    <video poster="support/colors-16x8.png" class="small tc"></video>
+    <video poster="support/colors-16x8.png" class="small cr"></video>
+    <video poster="support/colors-16x8.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.png" class="bigWide tr">
+    <embed src="support/colors-8x16.png" class="bigWide bl">
+    <embed src="support/colors-8x16.png" class="bigWide tl">
+    <embed src="support/colors-8x16.png" class="bigWide br">
+    <embed src="support/colors-8x16.png" class="bigWide tc">
+    <embed src="support/colors-8x16.png" class="bigWide cr">
+    <embed src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.png" class="bigTall tr">
+    <embed src="support/colors-8x16.png" class="bigTall bl">
+    <embed src="support/colors-8x16.png" class="bigTall tl">
+    <embed src="support/colors-8x16.png" class="bigTall br">
+    <embed src="support/colors-8x16.png" class="bigTall tc">
+    <embed src="support/colors-8x16.png" class="bigTall cr">
+    <embed src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.png" class="small tr">
+    <embed src="support/colors-8x16.png" class="small bl">
+    <embed src="support/colors-8x16.png" class="small tl">
+    <embed src="support/colors-8x16.png" class="small br">
+    <embed src="support/colors-8x16.png" class="small tc">
+    <embed src="support/colors-8x16.png" class="small cr">
+    <embed src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.png" class="bigWide tr">
+    <img src="support/colors-8x16.png" class="bigWide bl">
+    <img src="support/colors-8x16.png" class="bigWide tl">
+    <img src="support/colors-8x16.png" class="bigWide br">
+    <img src="support/colors-8x16.png" class="bigWide tc">
+    <img src="support/colors-8x16.png" class="bigWide cr">
+    <img src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.png" class="bigTall tr">
+    <img src="support/colors-8x16.png" class="bigTall bl">
+    <img src="support/colors-8x16.png" class="bigTall tl">
+    <img src="support/colors-8x16.png" class="bigTall br">
+    <img src="support/colors-8x16.png" class="bigTall tc">
+    <img src="support/colors-8x16.png" class="bigTall cr">
+    <img src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.png" class="small tr">
+    <img src="support/colors-8x16.png" class="small bl">
+    <img src="support/colors-8x16.png" class="small tl">
+    <img src="support/colors-8x16.png" class="small br">
+    <img src="support/colors-8x16.png" class="small tc">
+    <img src="support/colors-8x16.png" class="small cr">
+    <img src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.png" class="bigWide tr"></object>
+    <object data="support/colors-8x16.png" class="bigWide bl"></object>
+    <object data="support/colors-8x16.png" class="bigWide tl"></object>
+    <object data="support/colors-8x16.png" class="bigWide br"></object>
+    <object data="support/colors-8x16.png" class="bigWide tc"></object>
+    <object data="support/colors-8x16.png" class="bigWide cr"></object>
+    <object data="support/colors-8x16.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.png" class="bigTall tr"></object>
+    <object data="support/colors-8x16.png" class="bigTall bl"></object>
+    <object data="support/colors-8x16.png" class="bigTall tl"></object>
+    <object data="support/colors-8x16.png" class="bigTall br"></object>
+    <object data="support/colors-8x16.png" class="bigTall tc"></object>
+    <object data="support/colors-8x16.png" class="bigTall cr"></object>
+    <object data="support/colors-8x16.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.png" class="small tr"></object>
+    <object data="support/colors-8x16.png" class="small bl"></object>
+    <object data="support/colors-8x16.png" class="small tl"></object>
+    <object data="support/colors-8x16.png" class="small br"></object>
+    <object data="support/colors-8x16.png" class="small tc"></object>
+    <object data="support/colors-8x16.png" class="small cr"></object>
+    <object data="support/colors-8x16.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-png-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.png" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide br"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.png" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.png" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall br"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.png" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.png" class="small tr"></video>
+    <video poster="support/colors-8x16.png" class="small bl"></video>
+    <video poster="support/colors-8x16.png" class="small tl"></video>
+    <video poster="support/colors-8x16.png" class="small br"></video>
+    <video poster="support/colors-8x16.png" class="small tc"></video>
+    <video poster="support/colors-8x16.png" class="small cr"></video>
+    <video poster="support/colors-8x16.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-png-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.svg" class="bigWide tr">
+    <embed src="support/colors-16x8.svg" class="bigWide bl">
+    <embed src="support/colors-16x8.svg" class="bigWide tl">
+    <embed src="support/colors-16x8.svg" class="bigWide br">
+    <embed src="support/colors-16x8.svg" class="bigWide tc">
+    <embed src="support/colors-16x8.svg" class="bigWide cr">
+    <embed src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.svg" class="bigTall tr">
+    <embed src="support/colors-16x8.svg" class="bigTall bl">
+    <embed src="support/colors-16x8.svg" class="bigTall tl">
+    <embed src="support/colors-16x8.svg" class="bigTall br">
+    <embed src="support/colors-16x8.svg" class="bigTall tc">
+    <embed src="support/colors-16x8.svg" class="bigTall cr">
+    <embed src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.svg" class="small tr">
+    <embed src="support/colors-16x8.svg" class="small bl">
+    <embed src="support/colors-16x8.svg" class="small tl">
+    <embed src="support/colors-16x8.svg" class="small br">
+    <embed src="support/colors-16x8.svg" class="small tc">
+    <embed src="support/colors-16x8.svg" class="small cr">
+    <embed src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.svg" class="bigWide tr">
+    <img src="support/colors-16x8.svg" class="bigWide bl">
+    <img src="support/colors-16x8.svg" class="bigWide tl">
+    <img src="support/colors-16x8.svg" class="bigWide br">
+    <img src="support/colors-16x8.svg" class="bigWide tc">
+    <img src="support/colors-16x8.svg" class="bigWide cr">
+    <img src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.svg" class="bigTall tr">
+    <img src="support/colors-16x8.svg" class="bigTall bl">
+    <img src="support/colors-16x8.svg" class="bigTall tl">
+    <img src="support/colors-16x8.svg" class="bigTall br">
+    <img src="support/colors-16x8.svg" class="bigTall tc">
+    <img src="support/colors-16x8.svg" class="bigTall cr">
+    <img src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.svg" class="small tr">
+    <img src="support/colors-16x8.svg" class="small bl">
+    <img src="support/colors-16x8.svg" class="small tl">
+    <img src="support/colors-16x8.svg" class="small br">
+    <img src="support/colors-16x8.svg" class="small tc">
+    <img src="support/colors-16x8.svg" class="small cr">
+    <img src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.svg" class="small tr"></object>
+    <object data="support/colors-16x8.svg" class="small bl"></object>
+    <object data="support/colors-16x8.svg" class="small tl"></object>
+    <object data="support/colors-16x8.svg" class="small br"></object>
+    <object data="support/colors-16x8.svg" class="small tc"></object>
+    <object data="support/colors-16x8.svg" class="small cr"></object>
+    <object data="support/colors-16x8.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.svg" class="small tr"></video>
+    <video poster="support/colors-16x8.svg" class="small bl"></video>
+    <video poster="support/colors-16x8.svg" class="small tl"></video>
+    <video poster="support/colors-16x8.svg" class="small br"></video>
+    <video poster="support/colors-16x8.svg" class="small tc"></video>
+    <video poster="support/colors-16x8.svg" class="small cr"></video>
+    <video poster="support/colors-16x8.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.svg" class="bigWide tr">
+    <embed src="support/colors-8x16.svg" class="bigWide bl">
+    <embed src="support/colors-8x16.svg" class="bigWide tl">
+    <embed src="support/colors-8x16.svg" class="bigWide br">
+    <embed src="support/colors-8x16.svg" class="bigWide tc">
+    <embed src="support/colors-8x16.svg" class="bigWide cr">
+    <embed src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.svg" class="bigTall tr">
+    <embed src="support/colors-8x16.svg" class="bigTall bl">
+    <embed src="support/colors-8x16.svg" class="bigTall tl">
+    <embed src="support/colors-8x16.svg" class="bigTall br">
+    <embed src="support/colors-8x16.svg" class="bigTall tc">
+    <embed src="support/colors-8x16.svg" class="bigTall cr">
+    <embed src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.svg" class="small tr">
+    <embed src="support/colors-8x16.svg" class="small bl">
+    <embed src="support/colors-8x16.svg" class="small tl">
+    <embed src="support/colors-8x16.svg" class="small br">
+    <embed src="support/colors-8x16.svg" class="small tc">
+    <embed src="support/colors-8x16.svg" class="small cr">
+    <embed src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.svg" class="bigWide tr">
+    <img src="support/colors-8x16.svg" class="bigWide bl">
+    <img src="support/colors-8x16.svg" class="bigWide tl">
+    <img src="support/colors-8x16.svg" class="bigWide br">
+    <img src="support/colors-8x16.svg" class="bigWide tc">
+    <img src="support/colors-8x16.svg" class="bigWide cr">
+    <img src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.svg" class="bigTall tr">
+    <img src="support/colors-8x16.svg" class="bigTall bl">
+    <img src="support/colors-8x16.svg" class="bigTall tl">
+    <img src="support/colors-8x16.svg" class="bigTall br">
+    <img src="support/colors-8x16.svg" class="bigTall tc">
+    <img src="support/colors-8x16.svg" class="bigTall cr">
+    <img src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.svg" class="small tr">
+    <img src="support/colors-8x16.svg" class="small bl">
+    <img src="support/colors-8x16.svg" class="small tl">
+    <img src="support/colors-8x16.svg" class="small br">
+    <img src="support/colors-8x16.svg" class="small tc">
+    <img src="support/colors-8x16.svg" class="small cr">
+    <img src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.svg" class="small tr"></object>
+    <object data="support/colors-8x16.svg" class="small bl"></object>
+    <object data="support/colors-8x16.svg" class="small tl"></object>
+    <object data="support/colors-8x16.svg" class="small br"></object>
+    <object data="support/colors-8x16.svg" class="small tc"></object>
+    <object data="support/colors-8x16.svg" class="small cr"></object>
+    <object data="support/colors-8x16.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.svg" class="small tr"></video>
+    <video poster="support/colors-8x16.svg" class="small bl"></video>
+    <video poster="support/colors-8x16.svg" class="small tl"></video>
+    <video poster="support/colors-8x16.svg" class="small br"></video>
+    <video poster="support/colors-8x16.svg" class="small tc"></video>
+    <video poster="support/colors-8x16.svg" class="small cr"></video>
+    <video poster="support/colors-8x16.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-003-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-noSize.svg" class="small tr">
+    <embed src="support/colors-16x8-noSize.svg" class="small bl">
+    <embed src="support/colors-16x8-noSize.svg" class="small tl">
+    <embed src="support/colors-16x8-noSize.svg" class="small br">
+    <embed src="support/colors-16x8-noSize.svg" class="small tc">
+    <embed src="support/colors-16x8-noSize.svg" class="small cr">
+    <embed src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-003-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-noSize.svg" class="small tr">
+    <img src="support/colors-16x8-noSize.svg" class="small bl">
+    <img src="support/colors-16x8-noSize.svg" class="small tl">
+    <img src="support/colors-16x8-noSize.svg" class="small br">
+    <img src="support/colors-16x8-noSize.svg" class="small tc">
+    <img src="support/colors-16x8-noSize.svg" class="small cr">
+    <img src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-003-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-noSize.svg" class="small tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-003-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-003-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-noSize.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-004-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-noSize.svg" class="small tr">
+    <embed src="support/colors-8x16-noSize.svg" class="small bl">
+    <embed src="support/colors-8x16-noSize.svg" class="small tl">
+    <embed src="support/colors-8x16-noSize.svg" class="small br">
+    <embed src="support/colors-8x16-noSize.svg" class="small tc">
+    <embed src="support/colors-8x16-noSize.svg" class="small cr">
+    <embed src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-004-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-noSize.svg" class="small tr">
+    <img src="support/colors-8x16-noSize.svg" class="small bl">
+    <img src="support/colors-8x16-noSize.svg" class="small tl">
+    <img src="support/colors-8x16-noSize.svg" class="small br">
+    <img src="support/colors-8x16-noSize.svg" class="small tc">
+    <img src="support/colors-8x16-noSize.svg" class="small cr">
+    <img src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-004-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-noSize.svg" class="small tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-004-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-004-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-noSize.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-005-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="small tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small br">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="small cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-005-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-parDefault.svg" class="small tr">
+    <img src="support/colors-16x8-parDefault.svg" class="small bl">
+    <img src="support/colors-16x8-parDefault.svg" class="small tl">
+    <img src="support/colors-16x8-parDefault.svg" class="small br">
+    <img src="support/colors-16x8-parDefault.svg" class="small tc">
+    <img src="support/colors-16x8-parDefault.svg" class="small cr">
+    <img src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-005-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-005-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-005-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-parDefault.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-006-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="small tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small br">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="small cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-006-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-parDefault.svg" class="small tr">
+    <img src="support/colors-8x16-parDefault.svg" class="small bl">
+    <img src="support/colors-8x16-parDefault.svg" class="small tl">
+    <img src="support/colors-8x16-parDefault.svg" class="small br">
+    <img src="support/colors-8x16-parDefault.svg" class="small tc">
+    <img src="support/colors-8x16-parDefault.svg" class="small cr">
+    <img src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-006-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-svg-006-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-none-svg-006-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-parDefault.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.png" class="bigWide tr">
+    <embed src="support/colors-16x8.png" class="bigWide bl">
+    <embed src="support/colors-16x8.png" class="bigWide tl">
+    <embed src="support/colors-16x8.png" class="bigWide br">
+    <embed src="support/colors-16x8.png" class="bigWide tc">
+    <embed src="support/colors-16x8.png" class="bigWide cr">
+    <embed src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.png" class="bigTall tr">
+    <embed src="support/colors-16x8.png" class="bigTall bl">
+    <embed src="support/colors-16x8.png" class="bigTall tl">
+    <embed src="support/colors-16x8.png" class="bigTall br">
+    <embed src="support/colors-16x8.png" class="bigTall tc">
+    <embed src="support/colors-16x8.png" class="bigTall cr">
+    <embed src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.png" class="small tr">
+    <embed src="support/colors-16x8.png" class="small bl">
+    <embed src="support/colors-16x8.png" class="small tl">
+    <embed src="support/colors-16x8.png" class="small br">
+    <embed src="support/colors-16x8.png" class="small tc">
+    <embed src="support/colors-16x8.png" class="small cr">
+    <embed src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.png" class="bigWide tr">
+    <img src="support/colors-16x8.png" class="bigWide bl">
+    <img src="support/colors-16x8.png" class="bigWide tl">
+    <img src="support/colors-16x8.png" class="bigWide br">
+    <img src="support/colors-16x8.png" class="bigWide tc">
+    <img src="support/colors-16x8.png" class="bigWide cr">
+    <img src="support/colors-16x8.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.png" class="bigTall tr">
+    <img src="support/colors-16x8.png" class="bigTall bl">
+    <img src="support/colors-16x8.png" class="bigTall tl">
+    <img src="support/colors-16x8.png" class="bigTall br">
+    <img src="support/colors-16x8.png" class="bigTall tc">
+    <img src="support/colors-16x8.png" class="bigTall cr">
+    <img src="support/colors-16x8.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.png" class="small tr">
+    <img src="support/colors-16x8.png" class="small bl">
+    <img src="support/colors-16x8.png" class="small tl">
+    <img src="support/colors-16x8.png" class="small br">
+    <img src="support/colors-16x8.png" class="small tc">
+    <img src="support/colors-16x8.png" class="small cr">
+    <img src="support/colors-16x8.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.png" class="bigWide tr"></object>
+    <object data="support/colors-16x8.png" class="bigWide bl"></object>
+    <object data="support/colors-16x8.png" class="bigWide tl"></object>
+    <object data="support/colors-16x8.png" class="bigWide br"></object>
+    <object data="support/colors-16x8.png" class="bigWide tc"></object>
+    <object data="support/colors-16x8.png" class="bigWide cr"></object>
+    <object data="support/colors-16x8.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.png" class="bigTall tr"></object>
+    <object data="support/colors-16x8.png" class="bigTall bl"></object>
+    <object data="support/colors-16x8.png" class="bigTall tl"></object>
+    <object data="support/colors-16x8.png" class="bigTall br"></object>
+    <object data="support/colors-16x8.png" class="bigTall tc"></object>
+    <object data="support/colors-16x8.png" class="bigTall cr"></object>
+    <object data="support/colors-16x8.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.png" class="small tr"></object>
+    <object data="support/colors-16x8.png" class="small bl"></object>
+    <object data="support/colors-16x8.png" class="small tl"></object>
+    <object data="support/colors-16x8.png" class="small br"></object>
+    <object data="support/colors-16x8.png" class="small tc"></object>
+    <object data="support/colors-16x8.png" class="small cr"></object>
+    <object data="support/colors-16x8.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.png" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.png" class="bigWide br"></video>
+    <video poster="support/colors-16x8.png" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.png" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.png" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.png" class="bigTall br"></video>
+    <video poster="support/colors-16x8.png" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.png" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.png" class="small tr"></video>
+    <video poster="support/colors-16x8.png" class="small bl"></video>
+    <video poster="support/colors-16x8.png" class="small tl"></video>
+    <video poster="support/colors-16x8.png" class="small br"></video>
+    <video poster="support/colors-16x8.png" class="small tc"></video>
+    <video poster="support/colors-16x8.png" class="small cr"></video>
+    <video poster="support/colors-16x8.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.png" class="bigWide tr">
+    <embed src="support/colors-8x16.png" class="bigWide bl">
+    <embed src="support/colors-8x16.png" class="bigWide tl">
+    <embed src="support/colors-8x16.png" class="bigWide br">
+    <embed src="support/colors-8x16.png" class="bigWide tc">
+    <embed src="support/colors-8x16.png" class="bigWide cr">
+    <embed src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.png" class="bigTall tr">
+    <embed src="support/colors-8x16.png" class="bigTall bl">
+    <embed src="support/colors-8x16.png" class="bigTall tl">
+    <embed src="support/colors-8x16.png" class="bigTall br">
+    <embed src="support/colors-8x16.png" class="bigTall tc">
+    <embed src="support/colors-8x16.png" class="bigTall cr">
+    <embed src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.png" class="small tr">
+    <embed src="support/colors-8x16.png" class="small bl">
+    <embed src="support/colors-8x16.png" class="small tl">
+    <embed src="support/colors-8x16.png" class="small br">
+    <embed src="support/colors-8x16.png" class="small tc">
+    <embed src="support/colors-8x16.png" class="small cr">
+    <embed src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.png" class="bigWide tr">
+    <img src="support/colors-8x16.png" class="bigWide bl">
+    <img src="support/colors-8x16.png" class="bigWide tl">
+    <img src="support/colors-8x16.png" class="bigWide br">
+    <img src="support/colors-8x16.png" class="bigWide tc">
+    <img src="support/colors-8x16.png" class="bigWide cr">
+    <img src="support/colors-8x16.png" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.png" class="bigTall tr">
+    <img src="support/colors-8x16.png" class="bigTall bl">
+    <img src="support/colors-8x16.png" class="bigTall tl">
+    <img src="support/colors-8x16.png" class="bigTall br">
+    <img src="support/colors-8x16.png" class="bigTall tc">
+    <img src="support/colors-8x16.png" class="bigTall cr">
+    <img src="support/colors-8x16.png" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.png" class="small tr">
+    <img src="support/colors-8x16.png" class="small bl">
+    <img src="support/colors-8x16.png" class="small tl">
+    <img src="support/colors-8x16.png" class="small br">
+    <img src="support/colors-8x16.png" class="small tc">
+    <img src="support/colors-8x16.png" class="small cr">
+    <img src="support/colors-8x16.png" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.png" class="bigWide tr"></object>
+    <object data="support/colors-8x16.png" class="bigWide bl"></object>
+    <object data="support/colors-8x16.png" class="bigWide tl"></object>
+    <object data="support/colors-8x16.png" class="bigWide br"></object>
+    <object data="support/colors-8x16.png" class="bigWide tc"></object>
+    <object data="support/colors-8x16.png" class="bigWide cr"></object>
+    <object data="support/colors-8x16.png" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.png" class="bigTall tr"></object>
+    <object data="support/colors-8x16.png" class="bigTall bl"></object>
+    <object data="support/colors-8x16.png" class="bigTall tl"></object>
+    <object data="support/colors-8x16.png" class="bigTall br"></object>
+    <object data="support/colors-8x16.png" class="bigTall tc"></object>
+    <object data="support/colors-8x16.png" class="bigTall cr"></object>
+    <object data="support/colors-8x16.png" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.png" class="small tr"></object>
+    <object data="support/colors-8x16.png" class="small bl"></object>
+    <object data="support/colors-8x16.png" class="small tl"></object>
+    <object data="support/colors-8x16.png" class="small br"></object>
+    <object data="support/colors-8x16.png" class="small tc"></object>
+    <object data="support/colors-8x16.png" class="small cr"></object>
+    <object data="support/colors-8x16.png" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a PNG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-png-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.png" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.png" class="bigWide br"></video>
+    <video poster="support/colors-8x16.png" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.png" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.png" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.png" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.png" class="bigTall br"></video>
+    <video poster="support/colors-8x16.png" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.png" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.png" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.png" class="small tr"></video>
+    <video poster="support/colors-8x16.png" class="small bl"></video>
+    <video poster="support/colors-8x16.png" class="small tl"></video>
+    <video poster="support/colors-8x16.png" class="small br"></video>
+    <video poster="support/colors-8x16.png" class="small tc"></video>
+    <video poster="support/colors-8x16.png" class="small cr"></video>
+    <video poster="support/colors-8x16.png" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-png-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-001-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8.svg" class="bigWide tr">
+    <embed src="support/colors-16x8.svg" class="bigWide bl">
+    <embed src="support/colors-16x8.svg" class="bigWide tl">
+    <embed src="support/colors-16x8.svg" class="bigWide br">
+    <embed src="support/colors-16x8.svg" class="bigWide tc">
+    <embed src="support/colors-16x8.svg" class="bigWide cr">
+    <embed src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8.svg" class="bigTall tr">
+    <embed src="support/colors-16x8.svg" class="bigTall bl">
+    <embed src="support/colors-16x8.svg" class="bigTall tl">
+    <embed src="support/colors-16x8.svg" class="bigTall br">
+    <embed src="support/colors-16x8.svg" class="bigTall tc">
+    <embed src="support/colors-16x8.svg" class="bigTall cr">
+    <embed src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8.svg" class="small tr">
+    <embed src="support/colors-16x8.svg" class="small bl">
+    <embed src="support/colors-16x8.svg" class="small tl">
+    <embed src="support/colors-16x8.svg" class="small br">
+    <embed src="support/colors-16x8.svg" class="small tc">
+    <embed src="support/colors-16x8.svg" class="small cr">
+    <embed src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-001-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8.svg" class="bigWide tr">
+    <img src="support/colors-16x8.svg" class="bigWide bl">
+    <img src="support/colors-16x8.svg" class="bigWide tl">
+    <img src="support/colors-16x8.svg" class="bigWide br">
+    <img src="support/colors-16x8.svg" class="bigWide tc">
+    <img src="support/colors-16x8.svg" class="bigWide cr">
+    <img src="support/colors-16x8.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8.svg" class="bigTall tr">
+    <img src="support/colors-16x8.svg" class="bigTall bl">
+    <img src="support/colors-16x8.svg" class="bigTall tl">
+    <img src="support/colors-16x8.svg" class="bigTall br">
+    <img src="support/colors-16x8.svg" class="bigTall tc">
+    <img src="support/colors-16x8.svg" class="bigTall cr">
+    <img src="support/colors-16x8.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8.svg" class="small tr">
+    <img src="support/colors-16x8.svg" class="small bl">
+    <img src="support/colors-16x8.svg" class="small tl">
+    <img src="support/colors-16x8.svg" class="small br">
+    <img src="support/colors-16x8.svg" class="small tc">
+    <img src="support/colors-16x8.svg" class="small cr">
+    <img src="support/colors-16x8.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-001-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8.svg" class="small tr"></object>
+    <object data="support/colors-16x8.svg" class="small bl"></object>
+    <object data="support/colors-16x8.svg" class="small tl"></object>
+    <object data="support/colors-16x8.svg" class="small br"></object>
+    <object data="support/colors-16x8.svg" class="small tc"></object>
+    <object data="support/colors-16x8.svg" class="small cr"></object>
+    <object data="support/colors-16x8.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8.svg" class="small tr"></video>
+    <video poster="support/colors-16x8.svg" class="small bl"></video>
+    <video poster="support/colors-16x8.svg" class="small tl"></video>
+    <video poster="support/colors-16x8.svg" class="small br"></video>
+    <video poster="support/colors-16x8.svg" class="small tc"></video>
+    <video poster="support/colors-16x8.svg" class="small cr"></video>
+    <video poster="support/colors-16x8.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-002-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16.svg" class="bigWide tr">
+    <embed src="support/colors-8x16.svg" class="bigWide bl">
+    <embed src="support/colors-8x16.svg" class="bigWide tl">
+    <embed src="support/colors-8x16.svg" class="bigWide br">
+    <embed src="support/colors-8x16.svg" class="bigWide tc">
+    <embed src="support/colors-8x16.svg" class="bigWide cr">
+    <embed src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16.svg" class="bigTall tr">
+    <embed src="support/colors-8x16.svg" class="bigTall bl">
+    <embed src="support/colors-8x16.svg" class="bigTall tl">
+    <embed src="support/colors-8x16.svg" class="bigTall br">
+    <embed src="support/colors-8x16.svg" class="bigTall tc">
+    <embed src="support/colors-8x16.svg" class="bigTall cr">
+    <embed src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16.svg" class="small tr">
+    <embed src="support/colors-8x16.svg" class="small bl">
+    <embed src="support/colors-8x16.svg" class="small tl">
+    <embed src="support/colors-8x16.svg" class="small br">
+    <embed src="support/colors-8x16.svg" class="small tc">
+    <embed src="support/colors-8x16.svg" class="small cr">
+    <embed src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-002-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16.svg" class="bigWide tr">
+    <img src="support/colors-8x16.svg" class="bigWide bl">
+    <img src="support/colors-8x16.svg" class="bigWide tl">
+    <img src="support/colors-8x16.svg" class="bigWide br">
+    <img src="support/colors-8x16.svg" class="bigWide tc">
+    <img src="support/colors-8x16.svg" class="bigWide cr">
+    <img src="support/colors-8x16.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16.svg" class="bigTall tr">
+    <img src="support/colors-8x16.svg" class="bigTall bl">
+    <img src="support/colors-8x16.svg" class="bigTall tl">
+    <img src="support/colors-8x16.svg" class="bigTall br">
+    <img src="support/colors-8x16.svg" class="bigTall tc">
+    <img src="support/colors-8x16.svg" class="bigTall cr">
+    <img src="support/colors-8x16.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16.svg" class="small tr">
+    <img src="support/colors-8x16.svg" class="small bl">
+    <img src="support/colors-8x16.svg" class="small tl">
+    <img src="support/colors-8x16.svg" class="small br">
+    <img src="support/colors-8x16.svg" class="small tc">
+    <img src="support/colors-8x16.svg" class="small cr">
+    <img src="support/colors-8x16.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-002-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16.svg" class="small tr"></object>
+    <object data="support/colors-8x16.svg" class="small bl"></object>
+    <object data="support/colors-8x16.svg" class="small tl"></object>
+    <object data="support/colors-8x16.svg" class="small br"></object>
+    <object data="support/colors-8x16.svg" class="small tc"></object>
+    <object data="support/colors-8x16.svg" class="small cr"></object>
+    <object data="support/colors-8x16.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16.svg" class="small tr"></video>
+    <video poster="support/colors-8x16.svg" class="small bl"></video>
+    <video poster="support/colors-8x16.svg" class="small tl"></video>
+    <video poster="support/colors-8x16.svg" class="small br"></video>
+    <video poster="support/colors-8x16.svg" class="small tc"></video>
+    <video poster="support/colors-8x16.svg" class="small cr"></video>
+    <video poster="support/colors-8x16.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-003-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-noSize.svg" class="small tr">
+    <embed src="support/colors-16x8-noSize.svg" class="small bl">
+    <embed src="support/colors-16x8-noSize.svg" class="small tl">
+    <embed src="support/colors-16x8-noSize.svg" class="small br">
+    <embed src="support/colors-16x8-noSize.svg" class="small tc">
+    <embed src="support/colors-16x8-noSize.svg" class="small cr">
+    <embed src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-003-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide br">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall bl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tl">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall br">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall tc">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall cr">
+    <img src="support/colors-16x8-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-noSize.svg" class="small tr">
+    <img src="support/colors-16x8-noSize.svg" class="small bl">
+    <img src="support/colors-16x8-noSize.svg" class="small tl">
+    <img src="support/colors-16x8-noSize.svg" class="small br">
+    <img src="support/colors-16x8-noSize.svg" class="small tc">
+    <img src="support/colors-16x8-noSize.svg" class="small cr">
+    <img src="support/colors-16x8-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-003-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-noSize.svg" class="small tr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small bl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tl"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small br"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small tc"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small cr"></object>
+    <object data="support/colors-16x8-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-003-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small br"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-003-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-noSize.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-004-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-noSize.svg" class="small tr">
+    <embed src="support/colors-8x16-noSize.svg" class="small bl">
+    <embed src="support/colors-8x16-noSize.svg" class="small tl">
+    <embed src="support/colors-8x16-noSize.svg" class="small br">
+    <embed src="support/colors-8x16-noSize.svg" class="small tc">
+    <embed src="support/colors-8x16-noSize.svg" class="small cr">
+    <embed src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-004-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide br">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall bl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tl">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall br">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall tc">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall cr">
+    <img src="support/colors-8x16-noSize.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-noSize.svg" class="small tr">
+    <img src="support/colors-8x16-noSize.svg" class="small bl">
+    <img src="support/colors-8x16-noSize.svg" class="small tl">
+    <img src="support/colors-8x16-noSize.svg" class="small br">
+    <img src="support/colors-8x16-noSize.svg" class="small tc">
+    <img src="support/colors-8x16-noSize.svg" class="small cr">
+    <img src="support/colors-8x16-noSize.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-004-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-noSize.svg" class="small tr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small bl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tl"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small br"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small tc"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small cr"></object>
+    <object data="support/colors-8x16-noSize.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-004-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-noSize.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small br"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-noSize.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-004-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-noSize.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-005-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-16x8-parDefault.svg" class="small tr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small bl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tl">
+    <embed src="support/colors-16x8-parDefault.svg" class="small br">
+    <embed src="support/colors-16x8-parDefault.svg" class="small tc">
+    <embed src="support/colors-16x8-parDefault.svg" class="small cr">
+    <embed src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-005-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall br">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-16x8-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-16x8-parDefault.svg" class="small tr">
+    <img src="support/colors-16x8-parDefault.svg" class="small bl">
+    <img src="support/colors-16x8-parDefault.svg" class="small tl">
+    <img src="support/colors-16x8-parDefault.svg" class="small br">
+    <img src="support/colors-16x8-parDefault.svg" class="small tc">
+    <img src="support/colors-16x8-parDefault.svg" class="small cr">
+    <img src="support/colors-16x8-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-005-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-16x8-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small br"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-16x8-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-005-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-16x8-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-16x8-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-005-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-16x8-parDefault.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006e.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006e.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on embed element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-006-ref.html">
+    <style type="text/css">
+      embed {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <embed src="support/colors-8x16-parDefault.svg" class="small tr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small bl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tl">
+    <embed src="support/colors-8x16-parDefault.svg" class="small br">
+    <embed src="support/colors-8x16-parDefault.svg" class="small tc">
+    <embed src="support/colors-8x16-parDefault.svg" class="small cr">
+    <embed src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006i.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006i.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006i.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006i.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on img element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-006-ref.html">
+    <style type="text/css">
+      img {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigWide">
+    <br>
+    <!-- big/tall: -->
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall bl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tl">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall br">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall tc">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall cr">
+    <img src="support/colors-8x16-parDefault.svg" class="bigTall">
+    <br>
+    <!-- small: -->
+    <img src="support/colors-8x16-parDefault.svg" class="small tr">
+    <img src="support/colors-8x16-parDefault.svg" class="small bl">
+    <img src="support/colors-8x16-parDefault.svg" class="small tl">
+    <img src="support/colors-8x16-parDefault.svg" class="small br">
+    <img src="support/colors-8x16-parDefault.svg" class="small tc">
+    <img src="support/colors-8x16-parDefault.svg" class="small cr">
+    <img src="support/colors-8x16-parDefault.svg" class="small">
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006o.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006o.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006o.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006o.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on object element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-006-ref.html">
+    <style type="text/css">
+      object {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigWide"></object>
+    <br>
+    <!-- big/tall: -->
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="bigTall"></object>
+    <br>
+    <!-- small: -->
+    <object data="support/colors-8x16-parDefault.svg" class="small tr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small bl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tl"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small br"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small tc"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small cr"></object>
+    <object data="support/colors-8x16-parDefault.svg" class="small"></object>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006p.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006p.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a SVG image and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-svg-006-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video poster="support/colors-8x16-parDefault.svg" class="small tr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small bl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tl"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small br"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small tc"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small cr"></video>
+    <video poster="support/colors-8x16-parDefault.svg" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/object-fit-scale-down-svg-006-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("support/colors-8x16-parDefault.svg");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/reftest.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/reftest.list	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,164 @@
+default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)
+# Tests for 'object-fit' / 'object-position' with a PNG image
+== object-fit-fill-png-001e.html object-fit-fill-png-001-ref.html
+== object-fit-fill-png-001i.html object-fit-fill-png-001-ref.html
+== object-fit-fill-png-001o.html object-fit-fill-png-001-ref.html
+== object-fit-fill-png-001p.html object-fit-fill-png-001-ref.html
+== object-fit-fill-png-002e.html object-fit-fill-png-002-ref.html
+== object-fit-fill-png-002i.html object-fit-fill-png-002-ref.html
+== object-fit-fill-png-002o.html object-fit-fill-png-002-ref.html
+== object-fit-fill-png-002p.html object-fit-fill-png-002-ref.html
+== object-fit-contain-png-001e.html object-fit-contain-png-001-ref.html
+== object-fit-contain-png-001i.html object-fit-contain-png-001-ref.html
+== object-fit-contain-png-001o.html object-fit-contain-png-001-ref.html
+== object-fit-contain-png-001p.html object-fit-contain-png-001-ref.html
+== object-fit-contain-png-002e.html object-fit-contain-png-002-ref.html
+== object-fit-contain-png-002i.html object-fit-contain-png-002-ref.html
+== object-fit-contain-png-002o.html object-fit-contain-png-002-ref.html
+== object-fit-contain-png-002p.html object-fit-contain-png-002-ref.html
+== object-fit-cover-png-001e.html object-fit-cover-png-001-ref.html
+== object-fit-cover-png-001i.html object-fit-cover-png-001-ref.html
+== object-fit-cover-png-001o.html object-fit-cover-png-001-ref.html
+== object-fit-cover-png-001p.html object-fit-cover-png-001-ref.html
+== object-fit-cover-png-002e.html object-fit-cover-png-002-ref.html
+== object-fit-cover-png-002i.html object-fit-cover-png-002-ref.html
+== object-fit-cover-png-002o.html object-fit-cover-png-002-ref.html
+== object-fit-cover-png-002p.html object-fit-cover-png-002-ref.html
+== object-fit-none-png-001e.html object-fit-none-png-001-ref.html
+== object-fit-none-png-001i.html object-fit-none-png-001-ref.html
+== object-fit-none-png-001o.html object-fit-none-png-001-ref.html
+== object-fit-none-png-001p.html object-fit-none-png-001-ref.html
+== object-fit-none-png-002e.html object-fit-none-png-002-ref.html
+== object-fit-none-png-002i.html object-fit-none-png-002-ref.html
+== object-fit-none-png-002o.html object-fit-none-png-002-ref.html
+== object-fit-none-png-002p.html object-fit-none-png-002-ref.html
+== object-fit-scale-down-png-001e.html object-fit-scale-down-png-001-ref.html
+== object-fit-scale-down-png-001i.html object-fit-scale-down-png-001-ref.html
+== object-fit-scale-down-png-001o.html object-fit-scale-down-png-001-ref.html
+== object-fit-scale-down-png-001p.html object-fit-scale-down-png-001-ref.html
+== object-fit-scale-down-png-002e.html object-fit-scale-down-png-002-ref.html
+== object-fit-scale-down-png-002i.html object-fit-scale-down-png-002-ref.html
+== object-fit-scale-down-png-002o.html object-fit-scale-down-png-002-ref.html
+== object-fit-scale-down-png-002p.html object-fit-scale-down-png-002-ref.html
+
+# Tests for 'object-fit' / 'object-position' with an SVG image
+== object-fit-fill-svg-001e.html object-fit-fill-svg-001-ref.html
+== object-fit-fill-svg-001i.html object-fit-fill-svg-001-ref.html
+== object-fit-fill-svg-001o.html object-fit-fill-svg-001-ref.html
+== object-fit-fill-svg-001p.html object-fit-fill-svg-001-ref.html
+== object-fit-fill-svg-002e.html object-fit-fill-svg-002-ref.html
+== object-fit-fill-svg-002i.html object-fit-fill-svg-002-ref.html
+== object-fit-fill-svg-002o.html object-fit-fill-svg-002-ref.html
+== object-fit-fill-svg-002p.html object-fit-fill-svg-002-ref.html
+== object-fit-fill-svg-003e.html object-fit-fill-svg-003-ref.html
+== object-fit-fill-svg-003i.html object-fit-fill-svg-003-ref.html
+== object-fit-fill-svg-003o.html object-fit-fill-svg-003-ref.html
+== object-fit-fill-svg-003p.html object-fit-fill-svg-003-ref.html
+== object-fit-fill-svg-004e.html object-fit-fill-svg-004-ref.html
+== object-fit-fill-svg-004i.html object-fit-fill-svg-004-ref.html
+== object-fit-fill-svg-004o.html object-fit-fill-svg-004-ref.html
+== object-fit-fill-svg-004p.html object-fit-fill-svg-004-ref.html
+fails == object-fit-fill-svg-005e.html object-fit-fill-svg-005-ref.html # bug 1092436
+fails == object-fit-fill-svg-005i.html object-fit-fill-svg-005-ref.html # bug 1092436
+fails == object-fit-fill-svg-005o.html object-fit-fill-svg-005-ref.html # bug 1092436
+fails == object-fit-fill-svg-005p.html object-fit-fill-svg-005-ref.html # bug 1092436
+fails == object-fit-fill-svg-006e.html object-fit-fill-svg-006-ref.html # bug 1092436
+fails == object-fit-fill-svg-006i.html object-fit-fill-svg-006-ref.html # bug 1092436
+fails == object-fit-fill-svg-006o.html object-fit-fill-svg-006-ref.html # bug 1092436
+fails == object-fit-fill-svg-006p.html object-fit-fill-svg-006-ref.html # bug 1092436
+== object-fit-contain-svg-001e.html object-fit-contain-svg-001-ref.html
+== object-fit-contain-svg-001i.html object-fit-contain-svg-001-ref.html
+== object-fit-contain-svg-001o.html object-fit-contain-svg-001-ref.html
+== object-fit-contain-svg-001p.html object-fit-contain-svg-001-ref.html
+== object-fit-contain-svg-002e.html object-fit-contain-svg-002-ref.html
+== object-fit-contain-svg-002i.html object-fit-contain-svg-002-ref.html
+== object-fit-contain-svg-002o.html object-fit-contain-svg-002-ref.html
+== object-fit-contain-svg-002p.html object-fit-contain-svg-002-ref.html
+== object-fit-contain-svg-003e.html object-fit-contain-svg-003-ref.html
+== object-fit-contain-svg-003i.html object-fit-contain-svg-003-ref.html
+== object-fit-contain-svg-003o.html object-fit-contain-svg-003-ref.html
+== object-fit-contain-svg-003p.html object-fit-contain-svg-003-ref.html
+== object-fit-contain-svg-004e.html object-fit-contain-svg-004-ref.html
+== object-fit-contain-svg-004i.html object-fit-contain-svg-004-ref.html
+== object-fit-contain-svg-004o.html object-fit-contain-svg-004-ref.html
+== object-fit-contain-svg-004p.html object-fit-contain-svg-004-ref.html
+== object-fit-contain-svg-005e.html object-fit-contain-svg-005-ref.html
+== object-fit-contain-svg-005i.html object-fit-contain-svg-005-ref.html
+== object-fit-contain-svg-005o.html object-fit-contain-svg-005-ref.html
+== object-fit-contain-svg-005p.html object-fit-contain-svg-005-ref.html
+== object-fit-contain-svg-006e.html object-fit-contain-svg-006-ref.html
+== object-fit-contain-svg-006i.html object-fit-contain-svg-006-ref.html
+== object-fit-contain-svg-006o.html object-fit-contain-svg-006-ref.html
+== object-fit-contain-svg-006p.html object-fit-contain-svg-006-ref.html
+== object-fit-cover-svg-001e.html object-fit-cover-svg-001-ref.html
+== object-fit-cover-svg-001i.html object-fit-cover-svg-001-ref.html
+== object-fit-cover-svg-001o.html object-fit-cover-svg-001-ref.html
+== object-fit-cover-svg-001p.html object-fit-cover-svg-001-ref.html
+== object-fit-cover-svg-002e.html object-fit-cover-svg-002-ref.html
+== object-fit-cover-svg-002i.html object-fit-cover-svg-002-ref.html
+== object-fit-cover-svg-002o.html object-fit-cover-svg-002-ref.html
+== object-fit-cover-svg-002p.html object-fit-cover-svg-002-ref.html
+== object-fit-cover-svg-003e.html object-fit-cover-svg-003-ref.html
+== object-fit-cover-svg-003i.html object-fit-cover-svg-003-ref.html
+== object-fit-cover-svg-003o.html object-fit-cover-svg-003-ref.html
+== object-fit-cover-svg-003p.html object-fit-cover-svg-003-ref.html
+== object-fit-cover-svg-004e.html object-fit-cover-svg-004-ref.html
+== object-fit-cover-svg-004i.html object-fit-cover-svg-004-ref.html
+== object-fit-cover-svg-004o.html object-fit-cover-svg-004-ref.html
+== object-fit-cover-svg-004p.html object-fit-cover-svg-004-ref.html
+== object-fit-cover-svg-005e.html object-fit-cover-svg-005-ref.html
+== object-fit-cover-svg-005i.html object-fit-cover-svg-005-ref.html
+== object-fit-cover-svg-005o.html object-fit-cover-svg-005-ref.html
+== object-fit-cover-svg-005p.html object-fit-cover-svg-005-ref.html
+== object-fit-cover-svg-006e.html object-fit-cover-svg-006-ref.html
+== object-fit-cover-svg-006i.html object-fit-cover-svg-006-ref.html
+== object-fit-cover-svg-006o.html object-fit-cover-svg-006-ref.html
+== object-fit-cover-svg-006p.html object-fit-cover-svg-006-ref.html
+== object-fit-none-svg-001e.html object-fit-none-svg-001-ref.html
+== object-fit-none-svg-001i.html object-fit-none-svg-001-ref.html
+== object-fit-none-svg-001o.html object-fit-none-svg-001-ref.html
+== object-fit-none-svg-001p.html object-fit-none-svg-001-ref.html
+== object-fit-none-svg-002e.html object-fit-none-svg-002-ref.html
+== object-fit-none-svg-002i.html object-fit-none-svg-002-ref.html
+== object-fit-none-svg-002o.html object-fit-none-svg-002-ref.html
+== object-fit-none-svg-002p.html object-fit-none-svg-002-ref.html
+== object-fit-none-svg-003e.html object-fit-none-svg-003-ref.html
+== object-fit-none-svg-003i.html object-fit-none-svg-003-ref.html
+== object-fit-none-svg-003o.html object-fit-none-svg-003-ref.html
+== object-fit-none-svg-003p.html object-fit-none-svg-003-ref.html
+== object-fit-none-svg-004e.html object-fit-none-svg-004-ref.html
+== object-fit-none-svg-004i.html object-fit-none-svg-004-ref.html
+== object-fit-none-svg-004o.html object-fit-none-svg-004-ref.html
+== object-fit-none-svg-004p.html object-fit-none-svg-004-ref.html
+== object-fit-none-svg-005e.html object-fit-none-svg-005-ref.html
+== object-fit-none-svg-005i.html object-fit-none-svg-005-ref.html
+== object-fit-none-svg-005o.html object-fit-none-svg-005-ref.html
+== object-fit-none-svg-005p.html object-fit-none-svg-005-ref.html
+== object-fit-none-svg-006e.html object-fit-none-svg-006-ref.html
+== object-fit-none-svg-006i.html object-fit-none-svg-006-ref.html
+== object-fit-none-svg-006o.html object-fit-none-svg-006-ref.html
+== object-fit-none-svg-006p.html object-fit-none-svg-006-ref.html
+== object-fit-scale-down-svg-001e.html object-fit-scale-down-svg-001-ref.html
+== object-fit-scale-down-svg-001i.html object-fit-scale-down-svg-001-ref.html
+== object-fit-scale-down-svg-001o.html object-fit-scale-down-svg-001-ref.html
+== object-fit-scale-down-svg-001p.html object-fit-scale-down-svg-001-ref.html
+== object-fit-scale-down-svg-002e.html object-fit-scale-down-svg-002-ref.html
+== object-fit-scale-down-svg-002i.html object-fit-scale-down-svg-002-ref.html
+== object-fit-scale-down-svg-002o.html object-fit-scale-down-svg-002-ref.html
+== object-fit-scale-down-svg-002p.html object-fit-scale-down-svg-002-ref.html
+== object-fit-scale-down-svg-003e.html object-fit-scale-down-svg-003-ref.html
+== object-fit-scale-down-svg-003i.html object-fit-scale-down-svg-003-ref.html
+== object-fit-scale-down-svg-003o.html object-fit-scale-down-svg-003-ref.html
+== object-fit-scale-down-svg-003p.html object-fit-scale-down-svg-003-ref.html
+== object-fit-scale-down-svg-004e.html object-fit-scale-down-svg-004-ref.html
+== object-fit-scale-down-svg-004i.html object-fit-scale-down-svg-004-ref.html
+== object-fit-scale-down-svg-004o.html object-fit-scale-down-svg-004-ref.html
+== object-fit-scale-down-svg-004p.html object-fit-scale-down-svg-004-ref.html
+== object-fit-scale-down-svg-005e.html object-fit-scale-down-svg-005-ref.html
+== object-fit-scale-down-svg-005i.html object-fit-scale-down-svg-005-ref.html
+== object-fit-scale-down-svg-005o.html object-fit-scale-down-svg-005-ref.html
+== object-fit-scale-down-svg-005p.html object-fit-scale-down-svg-005-ref.html
+== object-fit-scale-down-svg-006e.html object-fit-scale-down-svg-006-ref.html
+== object-fit-scale-down-svg-006i.html object-fit-scale-down-svg-006-ref.html
+== object-fit-scale-down-svg-006o.html object-fit-scale-down-svg-006-ref.html
+== object-fit-scale-down-svg-006p.html object-fit-scale-down-svg-006-ref.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-noSize.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-noSize.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-noSize.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-noSize.svg	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This SVG file has an aspect-ratio (from its viewBox attribute),
+     but no intrinsic size.
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 16 8">
+  <rect x="0" y="0" width="8px" height="4px" style="fill: blue"/>
+  <rect x="8" y="0" width="8px" height="4px" style="fill: black"/>
+  <rect x="0" y="4" width="8px" height="4px" style="fill: rgb(255,128,128)"/>
+  <rect x="8" y="4" width="8px" height="4px" style="fill: lime"/>
+</svg>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-parDefault.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-parDefault.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-parDefault.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8-parDefault.svg	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This SVG file has the default preserveAspectRatio (xMidyMid meet).
+
+     If it's rendered via e.g. a square <img> element with 'object-fit: fill',
+     the SVG will receive the <img>'s full content-box to use as its viewport.
+     But, importantly, its viewBox-region should NOT be stretched/squashed to
+     fill this viewport; instead, the viewBox will scale *proportionally* until
+     it *just* fits inside the viewport (the <img>), without overflowing, and
+     it'll be centered inside the viewport in whichever dimension has extra
+     space available. (This is what "xMidYMid meet" requires.)
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="16" height="8" viewBox="0 0 16 8">
+  <rect x="0" y="0" width="8px" height="4px" style="fill: blue"/>
+  <rect x="8" y="0" width="8px" height="4px" style="fill: black"/>
+  <rect x="0" y="4" width="8px" height="4px" style="fill: rgb(255,128,128)"/>
+  <rect x="8" y="4" width="8px" height="4px" style="fill: lime"/>
+</svg>
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-16x8.svg	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This SVG file is meant to mimic colors-8x16.png as closely
+     as possible. In particular, this SVG has:
+      (1) an intrinsic size (from the 'width' & 'height' attributes)
+      (2) preserveAspectRatio="none", allowing it to stretch in the
+          same way that a raster image would.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none"
+     width="16" height="8" viewBox="0 0 16 8">
+  <rect x="0" y="0" width="8px" height="4px" style="fill: blue"/>
+  <rect x="8" y="0" width="8px" height="4px" style="fill: black"/>
+  <rect x="0" y="4" width="8px" height="4px" style="fill: rgb(255,128,128)"/>
+  <rect x="8" y="4" width="8px" height="4px" style="fill: lime"/>
+</svg>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-noSize.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-noSize.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-noSize.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-noSize.svg	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This SVG file has an aspect-ratio (from its viewBox attribute),
+     but no intrinsic size.
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 8 16">
+  <rect x="0" y="0" width="4px" height="8px" style="fill: blue"/>
+  <rect x="4" y="0" width="4px" height="8px" style="fill: black"/>
+  <rect x="0" y="8" width="4px" height="8px" style="fill: rgb(255,128,128)"/>
+  <rect x="4" y="8" width="4px" height="8px" style="fill: lime"/>
+</svg>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-parDefault.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-parDefault.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-parDefault.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16-parDefault.svg	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This SVG file has the default preserveAspectRatio (xMidyMid meet).
+
+     If it's rendered via e.g. a square <img> element with 'object-fit: fill',
+     the SVG will receive the <img>'s full content-box to use as its viewport.
+     But, importantly, its viewBox-region should NOT be stretched/squashed to
+     fill this viewport; instead, the viewBox will scale *proportionally* until
+     it *just* fits inside the viewport (the <img>), without overflowing, and
+     it'll be centered inside the viewport in whichever dimension has extra
+     space available. (This is what "xMidYMid meet" requires.)
+-->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="8" height="16" viewBox="0 0 8 16">
+  <rect x="0" y="0" width="4px" height="8px" style="fill: blue"/>
+  <rect x="4" y="0" width="4px" height="8px" style="fill: black"/>
+  <rect x="0" y="8" width="4px" height="8px" style="fill: rgb(255,128,128)"/>
+  <rect x="4" y="8" width="4px" height="8px" style="fill: lime"/>
+</svg>
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/colors-8x16.svg	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This SVG file is meant to mimic colors-8x16.png as closely
+     as possible. In particular, this SVG has:
+      (1) an intrinsic size (from the 'width' & 'height' attributes)
+      (2) preserveAspectRatio="none", allowing it to stretch in the
+          same way that a raster image would.
+-->
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none"
+     width="8" height="16" viewBox="0 0 8 16">
+  <rect x="0" y="0" width="4px" height="8px" style="fill: blue"/>
+  <rect x="4" y="0" width="4px" height="8px" style="fill: black"/>
+  <rect x="0" y="8" width="4px" height="8px" style="fill: rgb(255,128,128)"/>
+  <rect x="4" y="8" width="4px" height="8px" style="fill: lime"/>
+</svg>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-png-tests.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-png-tests.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-png-tests.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-png-tests.sh	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,109 @@
+#!/bin/bash
+#
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+#
+# This is a script that I used to generate a suite of tests for the CSS
+# properties "object-fit" and "object-position", using a template testcase
+# file and reference case file.
+#
+# The reference case uses the "background-size" & "background-position"
+# equivalent of the tested "object-fit" / "object-position" values.
+# (One exception: since there is no "background-size" equivalent of
+# "object-fit: scale-down", we add an extra CSS rule for the "scale-down"
+# reference cases -- see REPLACEME_SCALE_DOWN_EXTRA_RULE below.)
+
+FILE_PATH="./"
+REFTEST_LIST_FILE="$FILE_PATH/reftest.list"
+
+TEMPLATE_TESTCASE_FILENAME=$FILE_PATH/support/template-object-fit-test.html
+TEMPLATE_REFERENCE_FILENAME=$FILE_PATH/support/template-object-fit-ref.html
+
+imageFileFormat="png"
+
+# Array of image files to use for testing:
+imageFileArr=("support/colors-16x8.png" "support/colors-8x16.png")
+numImageFiles=${#imageFileArr[@]}
+
+# Array of "object-fit" values, & of corresponding "background-size" values.
+# (Note: background-size has no equivalent for "object-fit: scale-down". We use
+# "auto auto" here, which is equivalent *some* of the time; and for the cases
+# where it's *not* equivalent, we use an extra CSS rule in the reference case.
+# See REPLACEME_SCALE_DOWN_EXTRA_RULE below.)
+objectFitArr=(           "fill"      "contain" "cover" "none"      "scale-down" )
+backgroundSizeEquivArr=( "100% 100%" "contain" "cover" "auto auto" "auto auto"  )
+numObjectFitVals=${#objectFitArr[@]}
+
+# Array of tag-names for elements that we'd like to test:
+# (Also: array of a single-letter abbreviation for each element, an array of
+# the close tag for each element -- if a close tag is needed -- and an array
+# indicating the attribute that each element uses to specify its image source.)
+tagNameArr=(       "embed" "img" "object"    "video" )
+tagLetterArr=(     "e"     "i"   "o"         "p" )
+tagCloseTokenArr=( ""      ""    "</object>" "</video>" )
+tagSrcAttrArr=(        "src"   "src" "data"      "poster" )
+numTags=${#tagNameArr[@]}
+
+# FIRST: Add 'default-preferences' line to the top of our reftest manifest:
+echo "default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)
+# Tests for 'object-fit' / 'object-position' with a PNG image" \
+ >> $REFTEST_LIST_FILE
+
+for ((i = 0; i < $numObjectFitVals; i++)); do
+  objectFit=${objectFitArr[$i]}
+  backgroundSizeEquiv=${backgroundSizeEquivArr[$i]}
+
+  # The reference case for "scale-down" needs an additional style rule, to
+  # look like "object-fit: scale-down" on small objects. (This is necessary
+  # because "background-size" doesn't have a value that exactly maps to
+  # "object-fit: scale-down".)
+  if [[ $objectFit == "scale-down" ]]; then
+      scaledownRule=".objectOuter > .small { background-size: contain; }"
+      scaledownSedCmd="s/REPLACEME_SCALE_DOWN_EXTRA_RULE/$scaledownRule/"
+  else
+      # (We're not testing "scale-down" in this generated file, so just delete
+      # the template's placeholder line for a "scale-down"-specific CSS rule.)
+      scaledownSedCmd="/REPLACEME_SCALE_DOWN_EXTRA_RULE/d"
+  fi
+
+  for ((j = 0; j < $numImageFiles; j++)); do
+    imageFile=${imageFileArr[$j]}
+    let testNum=$j+1
+    testNum="00$testNum" # zero-pad to 3 digits, per w3c convention
+
+    filenameStub="object-fit-$objectFit-$imageFileFormat-$testNum"
+
+    # Generate a reference case:
+    filenameRef="$filenameStub-ref.html"
+    echo Generating ${filenameRef}.
+    cat $TEMPLATE_REFERENCE_FILENAME \
+      | sed "s,REPLACEME_IMAGE_FILENAME,$imageFile," \
+      | sed "s/REPLACEME_BACKGROUND_SIZE_VAL/$backgroundSizeEquiv/" \
+      | sed "$scaledownSedCmd" \
+      > $FILE_PATH/$filenameRef;
+
+    # Generate a test for each of our tags:
+    for ((k = 0; k < $numTags; k++)); do
+      tagName=${tagNameArr[$k]}
+      tagLetter=${tagLetterArr[$k]}
+      tagCloseToken=${tagCloseTokenArr[$k]}
+      tagSrcAttr=${tagSrcAttrArr[$k]}
+
+      filenameTest="$filenameStub$tagLetter.html"
+      testTitle="'object-fit: $objectFit' on $tagName element, with a PNG image and with various 'object-position' values"
+      echo Generating ${filenameTest}.
+      cat $TEMPLATE_TESTCASE_FILENAME \
+        | sed "s,REPLACEME_IMAGE_FILENAME,$imageFile," \
+        | sed "s/REPLACEME_TEST_TITLE/$testTitle/" \
+        | sed "s,REPLACEME_REFERENCE_FILENAME,$filenameRef," \
+        | sed "s/REPLACEME_CONTAINER_TAG/$tagName/" \
+        | sed "s,REPLACEME_CONTAINER_CLOSETAG,$tagCloseToken,"  \
+        | sed "s/REPLACEME_SRC_ATTR/$tagSrcAttr/" \
+        | sed "s/REPLACEME_OBJECT_FIT_VAL/$objectFit/" \
+        > $FILE_PATH/$filenameTest
+
+      echo "== $filenameTest $filenameRef" \
+        >> $REFTEST_LIST_FILE
+    done
+  done
+done
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-svg-tests.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-svg-tests.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-svg-tests.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/generate-object-fit-svg-tests.sh	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,116 @@
+#!/bin/bash
+#
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+#
+# This is a script that I used to generate a suite of tests for the CSS
+# properties "object-fit" and "object-position", using a template testcase
+# file and reference case file.
+#
+# The reference case uses the "background-size" & "background-position"
+# equivalent of the tested "object-fit" / "object-position" values.
+# (One exception: since there is no "background-size" equivalent of
+# "object-fit: scale-down", we add an extra CSS rule for the "scale-down"
+# reference cases -- see REPLACEME_SCALE_DOWN_EXTRA_RULE below.)
+
+FILE_PATH="./"
+REFTEST_LIST_FILE="$FILE_PATH/reftest.list"
+
+TEMPLATE_TESTCASE_FILENAME=$FILE_PATH/support/template-object-fit-test.html
+TEMPLATE_REFERENCE_FILENAME=$FILE_PATH/support/template-object-fit-ref.html
+
+imageFileFormat="svg"
+
+# Array of image files to use for testing:
+imageFileArr=("support/colors-16x8.svg"
+              "support/colors-8x16.svg"
+              "support/colors-16x8-noSize.svg"
+              "support/colors-8x16-noSize.svg"
+              "support/colors-16x8-parDefault.svg"
+              "support/colors-8x16-parDefault.svg")
+numImageFiles=${#imageFileArr[@]}
+
+# Array of "object-fit" values, & of corresponding "background-size" values.
+# (Note: background-size has no equivalent for "object-fit: scale-down". We use
+# "auto auto" here, which is equivalent *some* of the time; and for the cases
+# where it's *not* equivalent, we use an extra CSS rule in the reference case.
+# See REPLACEME_SCALE_DOWN_EXTRA_RULE below.)
+objectFitArr=(           "fill"      "contain" "cover" "none"      "scale-down" )
+backgroundSizeEquivArr=( "100% 100%" "contain" "cover" "auto auto" "auto auto"  )
+numObjectFitVals=${#objectFitArr[@]}
+
+# Array of tag-names for elements that we'd like to test:
+# (Also: array of a single-letter abbreviation for each element, an array of
+# the close tag for each element -- if a close tag is needed -- and an array
+# indicating the attribute that each element uses to specify its image source.)
+tagNameArr=(       "embed" "img" "object"    "video" )
+tagLetterArr=(     "e"     "i"   "o"         "p" )
+tagCloseTokenArr=( ""      ""    "</object>" "</video>" )
+tagSrcAttrArr=(        "src"   "src" "data"      "poster" )
+numTags=${#tagNameArr[@]}
+
+# FIRST: Add blank line & descriptive comment to reftest manifest:
+echo "
+# Tests for 'object-fit' / 'object-position' with an SVG image" \
+ >> $REFTEST_LIST_FILE
+
+for ((i = 0; i < $numObjectFitVals; i++)); do
+  objectFit=${objectFitArr[$i]}
+  backgroundSizeEquiv=${backgroundSizeEquivArr[$i]}
+
+  # The reference case for "scale-down" needs an additional style rule, to
+  # look like "object-fit: scale-down" on small objects. (This is necessary
+  # because "background-size" doesn't have a value that exactly maps to
+  # "object-fit: scale-down".)
+  if [[ $objectFit == "scale-down" ]]; then
+      scaledownRule=".objectOuter > .small { background-size: contain; }"
+      scaledownSedCmd="s/REPLACEME_SCALE_DOWN_EXTRA_RULE/$scaledownRule/"
+  else
+      # (We're not testing "scale-down" in this generated file, so just delete
+      # the template's placeholder line for a "scale-down"-specific CSS rule.)
+      scaledownSedCmd="/REPLACEME_SCALE_DOWN_EXTRA_RULE/d"
+  fi
+
+  for ((j = 0; j < $numImageFiles; j++)); do
+    imageFile=${imageFileArr[$j]}
+    let testNum=$j+1
+    testNum="00$testNum" # zero-pad to 3 digits, per w3c convention
+
+    filenameStub="object-fit-$objectFit-$imageFileFormat-$testNum"
+
+    # Generate a reference case:
+    filenameRef="$filenameStub-ref.html"
+    echo Generating ${filenameRef}.
+    cat $TEMPLATE_REFERENCE_FILENAME \
+      | sed "s,REPLACEME_IMAGE_FILENAME,$imageFile," \
+      | sed "s/REPLACEME_BACKGROUND_SIZE_VAL/$backgroundSizeEquiv/" \
+      | sed "$scaledownSedCmd" \
+      | sed "/image-rendering:/d" \
+      > $FILE_PATH/$filenameRef;
+
+    # Generate a test for each of our tags:
+    for ((k = 0; k < $numTags; k++)); do
+      tagName=${tagNameArr[$k]}
+      tagLetter=${tagLetterArr[$k]}
+      tagCloseToken=${tagCloseTokenArr[$k]}
+      tagSrcAttr=${tagSrcAttrArr[$k]}
+
+      filenameTest="$filenameStub$tagLetter.html"
+      testTitle="'object-fit: $objectFit' on $tagName element, with a SVG image and with various 'object-position' values"
+      echo Generating ${filenameTest}.
+      cat $TEMPLATE_TESTCASE_FILENAME \
+        | sed "s,REPLACEME_IMAGE_FILENAME,$imageFile," \
+        | sed "s/REPLACEME_TEST_TITLE/$testTitle/" \
+        | sed "s,REPLACEME_REFERENCE_FILENAME,$filenameRef," \
+        | sed "s/REPLACEME_CONTAINER_TAG/$tagName/" \
+        | sed "s,REPLACEME_CONTAINER_CLOSETAG,$tagCloseToken,"  \
+        | sed "s/REPLACEME_SRC_ATTR/$tagSrcAttr/" \
+        | sed "s/REPLACEME_OBJECT_FIT_VAL/$objectFit/" \
+        | sed "/image-rendering:/d" \
+        > $FILE_PATH/$filenameTest
+
+      echo "== $filenameTest $filenameRef" \
+        >> $REFTEST_LIST_FILE
+    done
+  done
+done
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("REPLACEME_IMAGE_FILENAME");
+        background-size: REPLACEME_BACKGROUND_SIZE_VAL;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      REPLACEME_SCALE_DOWN_EXTRA_RULE
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-test.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-test.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-test.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/images3/support/template-object-fit-test.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: REPLACEME_TEST_TITLE</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="REPLACEME_REFERENCE_FILENAME">
+    <style type="text/css">
+      REPLACEME_CONTAINER_TAG {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: REPLACEME_OBJECT_FIT_VAL;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide tr">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide bl">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide tl">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide br">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide tc">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide cr">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigWide">REPLACEME_CONTAINER_CLOSETAG
+    <br>
+    <!-- big/tall: -->
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall tr">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall bl">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall tl">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall br">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall tc">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall cr">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="bigTall">REPLACEME_CONTAINER_CLOSETAG
+    <br>
+    <!-- small: -->
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small tr">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small bl">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small tl">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small br">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small tc">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small cr">REPLACEME_CONTAINER_CLOSETAG
+    <REPLACEME_CONTAINER_TAG REPLACEME_SRC_ATTR="REPLACEME_IMAGE_FILENAME" class="small">REPLACEME_CONTAINER_CLOSETAG
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/w3c-css/submitted/reftest.list	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/w3c-css/submitted/reftest.list	2014-11-26 21:45:51.000000000 +0000
@@ -26,7 +26,7 @@
 # include fonts3/reftest.list
 
 # Image Values and Replaced Content Level 3
-# include images3/reftest.list
+include images3/reftest.list
 
 # Media Queries Level 3
 # include mediaqueries3/reftest.list
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/colors-16x8.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/colors-16x8.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/colors-16x8.webm and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/colors-16x8.webm differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/colors-8x16.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/colors-8x16.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/colors-8x16.webm and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/colors-8x16.webm differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/generate-object-fit-video-tests.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/generate-object-fit-video-tests.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/generate-object-fit-video-tests.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/generate-object-fit-video-tests.sh	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,87 @@
+#!/bin/bash
+#
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+#
+# Script to generate <video src> reftest files, from corresponding reftest
+# files that use <video poster>.
+#
+# This script expects to be run from this working directory:
+#  mozilla-central/layout/reftests/w3c-css/submitted/images3
+#
+# It requires that the tools png2yuv and vpxenc be available, from the
+# Ubuntu packages 'mjpegtools' and 'vpx-tools'. More info here:
+#  http://wiki.webmproject.org/howtos/convert-png-frames-to-webm-video
+
+VIDEO_REFTEST_PATH="../../../webm-video"
+
+imageFileArr=("colors-16x8.png" "colors-8x16.png")
+numImageFiles=${#imageFileArr[@]}
+
+# Copy image files, and generate webm files:
+for ((i = 0; i < $numImageFiles; i++)); do
+  imageFileName=${imageFileArr[$i]}
+  imageDest=$VIDEO_REFTEST_PATH/$imageFileName
+
+  echo "Copying $imageDest."
+  hg cp support/$imageFileName $imageDest
+
+  videoDest=`echo $imageDest | sed "s/png/webm/"`
+  echo "Generating $videoDest."
+  png2yuv -f 1 -I p -b 1 -n 1 -j $imageDest \
+    | vpxenc --passes=1 --pass=1 --codec=vp9 --lossless=1 --max-q=0 -o $videoDest -
+  hg add $videoDest
+done
+
+# Add comment & default-preferences line to reftest.list in dest directory:
+reftestListFileName="$VIDEO_REFTEST_PATH/reftest.list"
+echo "
+# Tests for <video src> with 'object-fit' & 'object-position':
+# These tests should be very similar to tests in our w3c-css/submitted/images3
+# reftest directory. They live here because they use WebM video (VP9), and it
+# wouldn't be fair of us to make a W3C testsuite implicitly depend on any
+# particular (non-spec-mandated) video codec.
+default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)"\
+  >> $reftestListFileName
+
+# Loop across all <video poster> tests:
+for origTestName in object*p.html; do
+  # Find the corresponding reference case:
+  origReferenceName=$(echo $origTestName |
+                      sed "s/p.html/-ref.html/")
+
+  # The generated testcase will have "-webm" instead of "-png", and unlike
+  # the original png test, it won't have a single-letter suffix to indicate the
+  # particular container element. (since it's unnecessary -- there's only one
+  # possible container element for webm, "<video>")
+  videoTestName=$(echo $origTestName |
+                  sed "s/png/webm/" |
+                  sed "s/p.html/.html/")
+
+  videoReferenceName=$(echo $videoTestName |
+                       sed "s/.html/-ref.html/")
+
+  # Generate reference file (dropping "support" subdir from image paths):
+  echo "Copying $origReferenceName to $VIDEO_REFTEST_PATH."
+  videoReferenceFullPath=$VIDEO_REFTEST_PATH/$videoReferenceName
+  hg cp $origReferenceName $videoReferenceFullPath
+  sed -i "s,support/,," $videoReferenceFullPath
+
+  # Generate testcase
+  # (converting <video poster="support/foo.png"> to <video src="foo.webm">):
+  echo "Generating $videoTestName from $origTestName."
+  videoTestFullPath=$VIDEO_REFTEST_PATH/$videoTestName
+  hg cp $origTestName $videoTestFullPath
+  sed -i "s/PNG image/WebM video/" $videoTestFullPath
+  sed -i "s/poster/src/" $videoTestFullPath
+  sed -i "s,support/,," $videoTestFullPath
+  sed -i "s/png/webm/" $videoTestFullPath
+  sed -i "s/$origReferenceName/$videoReferenceName/" $videoTestFullPath
+
+  # Update reftest manifest:
+  annotation="fails-if(layersGPUAccelerated) skip-if(Android||B2G)"
+  comment="# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures"
+  echo "$annotation == $videoTestName $videoReferenceName $comment" \
+    >> $reftestListFileName
+
+done
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-webm-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-16x8.webm" class="bigWide tr"></video>
+    <video src="colors-16x8.webm" class="bigWide bl"></video>
+    <video src="colors-16x8.webm" class="bigWide tl"></video>
+    <video src="colors-16x8.webm" class="bigWide br"></video>
+    <video src="colors-16x8.webm" class="bigWide tc"></video>
+    <video src="colors-16x8.webm" class="bigWide cr"></video>
+    <video src="colors-16x8.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-16x8.webm" class="bigTall tr"></video>
+    <video src="colors-16x8.webm" class="bigTall bl"></video>
+    <video src="colors-16x8.webm" class="bigTall tl"></video>
+    <video src="colors-16x8.webm" class="bigTall br"></video>
+    <video src="colors-16x8.webm" class="bigTall tc"></video>
+    <video src="colors-16x8.webm" class="bigTall cr"></video>
+    <video src="colors-16x8.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-16x8.webm" class="small tr"></video>
+    <video src="colors-16x8.webm" class="small bl"></video>
+    <video src="colors-16x8.webm" class="small tl"></video>
+    <video src="colors-16x8.webm" class="small br"></video>
+    <video src="colors-16x8.webm" class="small tc"></video>
+    <video src="colors-16x8.webm" class="small cr"></video>
+    <video src="colors-16x8.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-16x8.png");
+        background-size: contain;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: contain' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-contain-webm-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: contain;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-8x16.webm" class="bigWide tr"></video>
+    <video src="colors-8x16.webm" class="bigWide bl"></video>
+    <video src="colors-8x16.webm" class="bigWide tl"></video>
+    <video src="colors-8x16.webm" class="bigWide br"></video>
+    <video src="colors-8x16.webm" class="bigWide tc"></video>
+    <video src="colors-8x16.webm" class="bigWide cr"></video>
+    <video src="colors-8x16.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-8x16.webm" class="bigTall tr"></video>
+    <video src="colors-8x16.webm" class="bigTall bl"></video>
+    <video src="colors-8x16.webm" class="bigTall tl"></video>
+    <video src="colors-8x16.webm" class="bigTall br"></video>
+    <video src="colors-8x16.webm" class="bigTall tc"></video>
+    <video src="colors-8x16.webm" class="bigTall cr"></video>
+    <video src="colors-8x16.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-8x16.webm" class="small tr"></video>
+    <video src="colors-8x16.webm" class="small bl"></video>
+    <video src="colors-8x16.webm" class="small tl"></video>
+    <video src="colors-8x16.webm" class="small br"></video>
+    <video src="colors-8x16.webm" class="small tc"></video>
+    <video src="colors-8x16.webm" class="small cr"></video>
+    <video src="colors-8x16.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-contain-webm-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-8x16.png");
+        background-size: contain;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-webm-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-16x8.webm" class="bigWide tr"></video>
+    <video src="colors-16x8.webm" class="bigWide bl"></video>
+    <video src="colors-16x8.webm" class="bigWide tl"></video>
+    <video src="colors-16x8.webm" class="bigWide br"></video>
+    <video src="colors-16x8.webm" class="bigWide tc"></video>
+    <video src="colors-16x8.webm" class="bigWide cr"></video>
+    <video src="colors-16x8.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-16x8.webm" class="bigTall tr"></video>
+    <video src="colors-16x8.webm" class="bigTall bl"></video>
+    <video src="colors-16x8.webm" class="bigTall tl"></video>
+    <video src="colors-16x8.webm" class="bigTall br"></video>
+    <video src="colors-16x8.webm" class="bigTall tc"></video>
+    <video src="colors-16x8.webm" class="bigTall cr"></video>
+    <video src="colors-16x8.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-16x8.webm" class="small tr"></video>
+    <video src="colors-16x8.webm" class="small bl"></video>
+    <video src="colors-16x8.webm" class="small tl"></video>
+    <video src="colors-16x8.webm" class="small br"></video>
+    <video src="colors-16x8.webm" class="small tc"></video>
+    <video src="colors-16x8.webm" class="small cr"></video>
+    <video src="colors-16x8.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-16x8.png");
+        background-size: cover;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: cover' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-cover-webm-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: cover;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-8x16.webm" class="bigWide tr"></video>
+    <video src="colors-8x16.webm" class="bigWide bl"></video>
+    <video src="colors-8x16.webm" class="bigWide tl"></video>
+    <video src="colors-8x16.webm" class="bigWide br"></video>
+    <video src="colors-8x16.webm" class="bigWide tc"></video>
+    <video src="colors-8x16.webm" class="bigWide cr"></video>
+    <video src="colors-8x16.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-8x16.webm" class="bigTall tr"></video>
+    <video src="colors-8x16.webm" class="bigTall bl"></video>
+    <video src="colors-8x16.webm" class="bigTall tl"></video>
+    <video src="colors-8x16.webm" class="bigTall br"></video>
+    <video src="colors-8x16.webm" class="bigTall tc"></video>
+    <video src="colors-8x16.webm" class="bigTall cr"></video>
+    <video src="colors-8x16.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-8x16.webm" class="small tr"></video>
+    <video src="colors-8x16.webm" class="small bl"></video>
+    <video src="colors-8x16.webm" class="small tl"></video>
+    <video src="colors-8x16.webm" class="small br"></video>
+    <video src="colors-8x16.webm" class="small tc"></video>
+    <video src="colors-8x16.webm" class="small cr"></video>
+    <video src="colors-8x16.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-cover-webm-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-8x16.png");
+        background-size: cover;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-webm-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-16x8.webm" class="bigWide tr"></video>
+    <video src="colors-16x8.webm" class="bigWide bl"></video>
+    <video src="colors-16x8.webm" class="bigWide tl"></video>
+    <video src="colors-16x8.webm" class="bigWide br"></video>
+    <video src="colors-16x8.webm" class="bigWide tc"></video>
+    <video src="colors-16x8.webm" class="bigWide cr"></video>
+    <video src="colors-16x8.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-16x8.webm" class="bigTall tr"></video>
+    <video src="colors-16x8.webm" class="bigTall bl"></video>
+    <video src="colors-16x8.webm" class="bigTall tl"></video>
+    <video src="colors-16x8.webm" class="bigTall br"></video>
+    <video src="colors-16x8.webm" class="bigTall tc"></video>
+    <video src="colors-16x8.webm" class="bigTall cr"></video>
+    <video src="colors-16x8.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-16x8.webm" class="small tr"></video>
+    <video src="colors-16x8.webm" class="small bl"></video>
+    <video src="colors-16x8.webm" class="small tl"></video>
+    <video src="colors-16x8.webm" class="small br"></video>
+    <video src="colors-16x8.webm" class="small tc"></video>
+    <video src="colors-16x8.webm" class="small cr"></video>
+    <video src="colors-16x8.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-16x8.png");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: fill' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-fill-webm-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: fill;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-8x16.webm" class="bigWide tr"></video>
+    <video src="colors-8x16.webm" class="bigWide bl"></video>
+    <video src="colors-8x16.webm" class="bigWide tl"></video>
+    <video src="colors-8x16.webm" class="bigWide br"></video>
+    <video src="colors-8x16.webm" class="bigWide tc"></video>
+    <video src="colors-8x16.webm" class="bigWide cr"></video>
+    <video src="colors-8x16.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-8x16.webm" class="bigTall tr"></video>
+    <video src="colors-8x16.webm" class="bigTall bl"></video>
+    <video src="colors-8x16.webm" class="bigTall tl"></video>
+    <video src="colors-8x16.webm" class="bigTall br"></video>
+    <video src="colors-8x16.webm" class="bigTall tc"></video>
+    <video src="colors-8x16.webm" class="bigTall cr"></video>
+    <video src="colors-8x16.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-8x16.webm" class="small tr"></video>
+    <video src="colors-8x16.webm" class="small bl"></video>
+    <video src="colors-8x16.webm" class="small tl"></video>
+    <video src="colors-8x16.webm" class="small br"></video>
+    <video src="colors-8x16.webm" class="small tc"></video>
+    <video src="colors-8x16.webm" class="small cr"></video>
+    <video src="colors-8x16.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-fill-webm-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-8x16.png");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-001.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-webm-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-16x8.webm" class="bigWide tr"></video>
+    <video src="colors-16x8.webm" class="bigWide bl"></video>
+    <video src="colors-16x8.webm" class="bigWide tl"></video>
+    <video src="colors-16x8.webm" class="bigWide br"></video>
+    <video src="colors-16x8.webm" class="bigWide tc"></video>
+    <video src="colors-16x8.webm" class="bigWide cr"></video>
+    <video src="colors-16x8.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-16x8.webm" class="bigTall tr"></video>
+    <video src="colors-16x8.webm" class="bigTall bl"></video>
+    <video src="colors-16x8.webm" class="bigTall tl"></video>
+    <video src="colors-16x8.webm" class="bigTall br"></video>
+    <video src="colors-16x8.webm" class="bigTall tc"></video>
+    <video src="colors-16x8.webm" class="bigTall cr"></video>
+    <video src="colors-16x8.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-16x8.webm" class="small tr"></video>
+    <video src="colors-16x8.webm" class="small bl"></video>
+    <video src="colors-16x8.webm" class="small tl"></video>
+    <video src="colors-16x8.webm" class="small br"></video>
+    <video src="colors-16x8.webm" class="small tc"></video>
+    <video src="colors-16x8.webm" class="small cr"></video>
+    <video src="colors-16x8.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-16x8.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-002.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: none' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-none-webm-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: none;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-8x16.webm" class="bigWide tr"></video>
+    <video src="colors-8x16.webm" class="bigWide bl"></video>
+    <video src="colors-8x16.webm" class="bigWide tl"></video>
+    <video src="colors-8x16.webm" class="bigWide br"></video>
+    <video src="colors-8x16.webm" class="bigWide tc"></video>
+    <video src="colors-8x16.webm" class="bigWide cr"></video>
+    <video src="colors-8x16.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-8x16.webm" class="bigTall tr"></video>
+    <video src="colors-8x16.webm" class="bigTall bl"></video>
+    <video src="colors-8x16.webm" class="bigTall tl"></video>
+    <video src="colors-8x16.webm" class="bigTall br"></video>
+    <video src="colors-8x16.webm" class="bigTall tc"></video>
+    <video src="colors-8x16.webm" class="bigTall cr"></video>
+    <video src="colors-8x16.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-8x16.webm" class="small tr"></video>
+    <video src="colors-8x16.webm" class="small bl"></video>
+    <video src="colors-8x16.webm" class="small tl"></video>
+    <video src="colors-8x16.webm" class="small br"></video>
+    <video src="colors-8x16.webm" class="small tc"></video>
+    <video src="colors-8x16.webm" class="small cr"></video>
+    <video src="colors-8x16.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-none-webm-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-none-webm-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-8x16.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-webm-001-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-16x8.webm" class="bigWide tr"></video>
+    <video src="colors-16x8.webm" class="bigWide bl"></video>
+    <video src="colors-16x8.webm" class="bigWide tl"></video>
+    <video src="colors-16x8.webm" class="bigWide br"></video>
+    <video src="colors-16x8.webm" class="bigWide tc"></video>
+    <video src="colors-16x8.webm" class="bigWide cr"></video>
+    <video src="colors-16x8.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-16x8.webm" class="bigTall tr"></video>
+    <video src="colors-16x8.webm" class="bigTall bl"></video>
+    <video src="colors-16x8.webm" class="bigTall tl"></video>
+    <video src="colors-16x8.webm" class="bigTall br"></video>
+    <video src="colors-16x8.webm" class="bigTall tc"></video>
+    <video src="colors-16x8.webm" class="bigTall cr"></video>
+    <video src="colors-16x8.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-16x8.webm" class="small tr"></video>
+    <video src="colors-16x8.webm" class="small bl"></video>
+    <video src="colors-16x8.webm" class="small tl"></video>
+    <video src="colors-16x8.webm" class="small br"></video>
+    <video src="colors-16x8.webm" class="small tc"></video>
+    <video src="colors-16x8.webm" class="small cr"></video>
+    <video src="colors-16x8.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-001-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-16x8.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Test: 'object-fit: scale-down' on video element, with a WebM video and with various 'object-position' values</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#sizing">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-fit">
+    <link rel="help" href="http://www.w3.org/TR/css3-images/#the-object-position">
+    <link rel="match" href="object-fit-scale-down-webm-002-ref.html">
+    <style type="text/css">
+      video {
+        border: 1px dashed gray;
+        padding: 1px;
+        object-fit: scale-down;
+        image-rendering: -moz-crisp-edges;
+        float: left;
+      }
+
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { object-position: top right }
+      .bl { object-position: bottom left }
+      .tl { object-position: top 25% left 25% }
+      .br { object-position: bottom 1px right 2px }
+
+      .tc { object-position: top 3px center }
+      .cr { object-position: center right 25% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <video src="colors-8x16.webm" class="bigWide tr"></video>
+    <video src="colors-8x16.webm" class="bigWide bl"></video>
+    <video src="colors-8x16.webm" class="bigWide tl"></video>
+    <video src="colors-8x16.webm" class="bigWide br"></video>
+    <video src="colors-8x16.webm" class="bigWide tc"></video>
+    <video src="colors-8x16.webm" class="bigWide cr"></video>
+    <video src="colors-8x16.webm" class="bigWide"></video>
+    <br>
+    <!-- big/tall: -->
+    <video src="colors-8x16.webm" class="bigTall tr"></video>
+    <video src="colors-8x16.webm" class="bigTall bl"></video>
+    <video src="colors-8x16.webm" class="bigTall tl"></video>
+    <video src="colors-8x16.webm" class="bigTall br"></video>
+    <video src="colors-8x16.webm" class="bigTall tc"></video>
+    <video src="colors-8x16.webm" class="bigTall cr"></video>
+    <video src="colors-8x16.webm" class="bigTall"></video>
+    <br>
+    <!-- small: -->
+    <video src="colors-8x16.webm" class="small tr"></video>
+    <video src="colors-8x16.webm" class="small bl"></video>
+    <video src="colors-8x16.webm" class="small tl"></video>
+    <video src="colors-8x16.webm" class="small br"></video>
+    <video src="colors-8x16.webm" class="small tc"></video>
+    <video src="colors-8x16.webm" class="small cr"></video>
+    <video src="colors-8x16.webm" class="small"></video>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/object-fit-scale-down-webm-002-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+    <style type="text/css">
+      .objectOuter {
+        border: 1px dashed gray;
+        padding: 1px;
+        float: left;
+      }
+      .objectOuter > * {
+        background-image: url("colors-8x16.png");
+        background-size: auto auto;
+        background-repeat: no-repeat;
+        image-rendering: -moz-crisp-edges;
+      }
+      .objectOuter > .small { background-size: contain; }
+      .bigWide {
+        width: 48px;
+        height: 32px;
+      }
+      .bigTall {
+        width: 32px;
+        height: 48px;
+      }
+      .small {
+        width: 8px;
+        height: 8px;
+      }
+
+      br { clear: both; }
+
+      .tr { background-position: top right }
+      .bl { background-position: bottom left }
+      .tl { background-position: top 25% left 25% }
+      .br { background-position: bottom 1px right 2px }
+
+      .tc { background-position: top 3px center }
+      .cr { background-position: center right 25% }
+      .default { background-position: 50% 50% }
+    </style>
+  </head>
+  <body>
+    <!-- big/wide: -->
+    <div class="objectOuter"><div class="bigWide tr"></div></div>
+    <div class="objectOuter"><div class="bigWide bl"></div></div>
+    <div class="objectOuter"><div class="bigWide tl"></div></div>
+    <div class="objectOuter"><div class="bigWide br"></div></div>
+    <div class="objectOuter"><div class="bigWide tc"></div></div>
+    <div class="objectOuter"><div class="bigWide cr"></div></div>
+    <div class="objectOuter"><div class="bigWide default"></div></div>
+    <br>
+    <!-- big/tall: -->
+    <div class="objectOuter"><div class="bigTall tr"></div></div>
+    <div class="objectOuter"><div class="bigTall bl"></div></div>
+    <div class="objectOuter"><div class="bigTall tl"></div></div>
+    <div class="objectOuter"><div class="bigTall br"></div></div>
+    <div class="objectOuter"><div class="bigTall tc"></div></div>
+    <div class="objectOuter"><div class="bigTall cr"></div></div>
+    <div class="objectOuter"><div class="bigTall default"></div></div>
+    <br>
+    <!-- small: -->
+    <div class="objectOuter"><div class="small tr"></div></div>
+    <div class="objectOuter"><div class="small bl"></div></div>
+    <div class="objectOuter"><div class="small tl"></div></div>
+    <div class="objectOuter"><div class="small br"></div></div>
+    <div class="objectOuter"><div class="small tc"></div></div>
+    <div class="objectOuter"><div class="small cr"></div></div>
+    <div class="objectOuter"><div class="small default"></div></div>
+    <br>
+  </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/webm-video/reftest.list	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/webm-video/reftest.list	2014-11-26 21:45:51.000000000 +0000
@@ -33,3 +33,20 @@
 skip-if(Android||B2G) == poster-13.html poster-ref-blue400x300.html
 skip-if(Android||B2G) == poster-15.html poster-ref-green70x30.html
 random-if(winWidget) random-if(cocoaWidget) skip-if(Android||B2G) == bug686957.html bug686957-ref.html # bug 922951 for OS X
+
+# Tests for <video src> with 'object-fit' & 'object-position':
+# These tests should be very similar to tests in our w3c-css/submitted/images3
+# reftest directory. They live here because they use WebM video (VP9), and it
+# wouldn't be fair of us to make a W3C testsuite implicitly depend on any
+# particular (non-spec-mandated) video codec.
+default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-contain-webm-001.html object-fit-contain-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-contain-webm-002.html object-fit-contain-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-cover-webm-001.html object-fit-cover-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-cover-webm-002.html object-fit-cover-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-fill-webm-001.html object-fit-fill-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-fill-webm-002.html object-fit-fill-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-none-webm-001.html object-fit-none-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-none-webm-002.html object-fit-none-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-scale-down-webm-001.html object-fit-scale-down-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
+fails-if(layersGPUAccelerated) skip-if(Android||B2G) == object-fit-scale-down-webm-002.html object-fit-scale-down-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-1-inline-border.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-1-inline-border.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-1-inline-border.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-1-inline-border.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+<meta charset="utf-8">
+<style>
+.test {
+  margin:10px;
+  border:1px solid blue;
+  font-family: monospace;
+  font-size: 16px;
+  word-break:break-all;
+  text-transform:full-width;
+  width:7.8em;
+  height:7.8em;
+}
+
+.h { writing-mode:horizontal-tb; }
+.v-lr { writing-mode:vertical-lr; }
+.v-rl { writing-mode:vertical-rl; }
+
+b {
+  background-color: yellow;
+}
+
+.bh {
+  border-left: 3px solid cyan;
+  border-right: 3px solid magenta;
+}
+
+.bv {
+  border-top: 3px solid cyan;
+  border-bottom: 3px solid magenta;
+}
+</style>
+</head>
+
+<body>
+
+<div class="test h">ABCDE<b class="bh">FGHIJKLMNOPQRST</b>UVWXYZ</div>
+
+<div class="test v-lr">ABCDE<b class="bv">FGHIJKLMNOPQRST</b>UVWXYZ</div>
+
+<div class="test v-rl">ABCDE<b class="bv">FGHIJKLMNOPQRST</b>UVWXYZ</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-1-inline-border-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-1-inline-border-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-1-inline-border-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-1-inline-border-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+<meta charset="utf-8">
+<style>
+.test {
+  margin:10px;
+  border:1px solid blue;
+  font-family: monospace;
+  font-size: 16px;
+  word-break:break-all;
+  text-transform:full-width;
+  width:7.8em;
+  height:7.8em;
+}
+
+.h { writing-mode:horizontal-tb; }
+.v-lr { writing-mode:vertical-lr; }
+.v-rl { writing-mode:vertical-rl; }
+
+b {
+  background-color: yellow;
+}
+
+.bh1 {
+  border-left: 3px solid cyan;
+}
+.bh2 {
+  border-right: 3px solid magenta;
+}
+
+.bv1 {
+  border-top: 3px solid cyan;
+}
+.bv2 {
+  border-bottom: 3px solid magenta;
+}
+</style>
+</head>
+
+<body>
+
+<div class="test h">ABCDE<b class="bh1">F</b><b>GHIJKLMNOPQRS</b><b class="bh2">T</b>UVWXYZ</div>
+
+<div class="test v-lr">ABCDE<b class="bv1">F</b><b>GHIJKLMNOPQRS</b><b class="bv2">T</b>UVWXYZ</div>
+
+<div class="test v-rl">ABCDE<b class="bv1">F</b><b>GHIJKLMNOPQRS</b><b class="bv2">T</b>UVWXYZ</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-2-inline-background.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-2-inline-background.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-2-inline-background.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-2-inline-background.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+<meta charset="utf-8">
+<style>
+.test {
+  margin:10px;
+  border:1px solid blue;
+  font-family: monospace;
+  font-size: 16px;
+  word-break:break-all;
+  text-transform:full-width;
+  width:7.8em;
+  height:7.8em;
+}
+
+.h { writing-mode:horizontal-tb; }
+.v-lr { writing-mode:vertical-lr; }
+.v-rl { writing-mode:vertical-rl; }
+
+.bgtest {
+  background: url(blue-32x32.png) no-repeat;
+}
+</style>
+</head>
+
+<body>
+
+<div class="test h">ABCDE<b class="bgtest">FGHIJKLMNOPQRST</b>UVWXYZ</div>
+
+<div class="test v-lr">ABCDE<b class="bgtest">FGHIJKLMNOPQRST</b>UVWXYZ</div>
+
+<div class="test v-rl">ABCDE<b class="bgtest">FGHIJKLMNOPQRST</b>UVWXYZ</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-2-inline-background-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-2-inline-background-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-2-inline-background-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-2-inline-background-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+<meta charset="utf-8">
+<style>
+.test {
+  margin:10px;
+  border:1px solid blue;
+  font-family: monospace;
+  font-size: 16px;
+  word-break:break-all;
+  text-transform:full-width;
+  width:7.8em;
+  height:7.8em;
+}
+
+.h { writing-mode:horizontal-tb; }
+.v-lr { writing-mode:vertical-lr; }
+.v-rl { writing-mode:vertical-rl; }
+
+.bgtest {
+  background: url(blue-32x32.png) no-repeat;
+}
+</style>
+</head>
+
+<body>
+
+<div class="test h">ABCDE<b class="bgtest">FG</b><b>HIJKLMNOPQRST</b>UVWXYZ</div>
+
+<div class="test v-lr">ABCDE<b class="bgtest">FG</b><b>HIJKLMNOPQRST</b>UVWXYZ</div>
+
+<div class="test v-rl">ABCDE<b class="bgtest">FG</b><b>HIJKLMNOPQRST</b>UVWXYZ</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+.test {
+  margin: 10px;
+  border: 1px solid gray;
+  font: 16px/24px monospace;
+  word-break: break-all;
+  width: 10em;
+  height: 6em;
+  /* we use text-orientation:upright to improve the chances that our
+     glyphs will have an advance of exactly 1em, as the reference
+     rendering relies on this */
+  text-orientation: upright;
+}
+
+.v-lr { writing-mode:vertical-lr; }
+.v-rl { writing-mode:vertical-rl; }
+
+.bgtest {
+  background: url(4colors.png); /* A square divided into a 2x2 grid of 4 colors; */
+                                /* only the two left squares (blue & cyan) should show */
+  background-size: 32px;
+}
+</style>
+</head>
+
+<body>
+
+<div class="test v-lr">ABCD<span class="bgtest">EFGHIJKLMNOPQRSTU</span>VWXYZ</div>
+
+<div class="test v-rl">ABCD<span class="bgtest">EFGHIJKLMNOPQRSTU</span>VWXYZ</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1083848-3-inline-background-repeat-ref.html	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+.test {
+  margin: 10px;
+  border: 1px solid gray;
+  font: 16px/24px monospace;
+  word-break: break-all;
+  width: 10em;
+  height: 6em;
+  /* we use text-orientation:upright to improve the chances that our
+     glyphs will have an advance of exactly 1em, as the reference
+     rendering relies on this */
+  text-orientation: upright;
+}
+
+.v-lr { writing-mode:vertical-lr; }
+.v-rl { writing-mode:vertical-rl; }
+
+.c { background: cyan; }
+.b { background: blue; }
+</style>
+</head>
+
+<body>
+
+<div class="test v-lr">ABCD<span class="c">E</span><span class="b">F</span><span
+ class="c">G</span><span class="b">H</span><span class="c">I</span><span
+ class="b">J</span><span class="c">K</span><span class="b">L</span><span
+ class="c">M</span><span class="b">N</span><span class="c">O</span><span
+ class="b">P</span><span class="c">Q</span><span class="b">R</span><span
+ class="c">S</span><span class="b">T</span><span class="c">U</span>VWXYZ</div>
+
+<div class="test v-rl">ABCD<span class="c">E</span><span class="b">F</span><span
+ class="c">G</span><span class="b">H</span><span class="c">I</span><span
+ class="b">J</span><span class="c">K</span><span class="b">L</span><span
+ class="c">M</span><span class="b">N</span><span class="c">O</span><span
+ class="b">P</span><span class="c">Q</span><span class="b">R</span><span
+ class="c">S</span><span class="b">T</span><span class="c">U</span>VWXYZ</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1103613-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1103613-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1103613-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1103613-1.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+#outer {
+  height: 200px;
+  width: 300px;
+  margin: 10px;
+  border: 50px solid #ddd;
+}
+#test {
+  writing-mode: vertical-lr;
+  margin: 10px;
+}
+</style>
+</head>
+
+<body>
+<div id="outer">
+<div id="test">
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1103613-1-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1103613-1-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/1103613-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/1103613-1-ref.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+#outer {
+  height: 200px;
+  width: 300px;
+  margin: 10px;
+  border: 50px solid #ddd;
+}
+#test {
+  writing-mode: vertical-lr;
+  margin: 10px;
+  height: 180px;
+}
+</style>
+</head>
+
+<body>
+<div id="outer">
+<div id="test">
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+</div>
+</div>
+
+</body>
+</html>
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/4colors.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/4colors.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/blue-32x32.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/blue-32x32.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/reftest.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/reftest.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/reftests/writing-mode/reftest.list	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/reftests/writing-mode/reftest.list	2014-11-26 21:45:52.000000000 +0000
@@ -3,6 +3,9 @@
 # is turned on
 == 1082844.html 1082844-ref.html
 == 1083748.html 1083748-ref.html
+== 1083848-1-inline-border.html 1083848-1-inline-border-ref.html
+== 1083848-2-inline-background.html 1083848-2-inline-background-ref.html
+== 1083848-3-inline-background-repeat.html 1083848-3-inline-background-repeat-ref.html
 == 1083892-1.html 1083892-1-ref.html
 == 1086883-1a.html 1086883-1-ref.html
 == 1086883-1b.html 1086883-1-ref.html
@@ -19,3 +22,4 @@
 random-if(gtk2Widget) == 1094434-2.html 1094434-2-ref.html # bug 1094845
 == 1094914-1a.html 1094914-1-ref.html
 == 1094914-1b.html 1094914-1-ref.html
+== 1103613-1.html 1103613-1-ref.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/AnimationCommon.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/AnimationCommon.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/AnimationCommon.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/AnimationCommon.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -22,6 +22,7 @@
 #include "nsDisplayList.h"
 #include "mozilla/MemoryReporting.h"
 #include "RestyleManager.h"
+#include "nsRuleProcessorData.h"
 #include "nsStyleSet.h"
 #include "nsStyleChangeList.h"
 
@@ -52,6 +53,7 @@
 
 CommonAnimationManager::CommonAnimationManager(nsPresContext *aPresContext)
   : mPresContext(aPresContext)
+  , mIsObservingRefreshDriver(false)
 {
   PR_INIT_CLIST(&mElementCollections);
 }
@@ -71,6 +73,21 @@
 }
 
 void
+CommonAnimationManager::AddElementCollection(AnimationPlayerCollection*
+                                               aCollection)
+{
+  if (!mIsObservingRefreshDriver) {
+    NS_ASSERTION(aCollection->mNeedsRefreshes,
+      "Added data which doesn't need refreshing?");
+    // We need to observe the refresh driver.
+    mPresContext->RefreshDriver()->AddRefreshObserver(this, Flush_Style);
+    mIsObservingRefreshDriver = true;
+  }
+
+  PR_INSERT_BEFORE(aCollection, &mElementCollections);
+}
+
+void
 CommonAnimationManager::RemoveAllElementCollections()
 {
   while (!PR_CLIST_IS_EMPTY(&mElementCollections)) {
@@ -81,6 +98,26 @@
   }
 }
 
+void
+CommonAnimationManager::CheckNeedsRefresh()
+{
+  for (PRCList *l = PR_LIST_HEAD(&mElementCollections);
+       l != &mElementCollections;
+       l = PR_NEXT_LINK(l)) {
+    if (static_cast<AnimationPlayerCollection*>(l)->mNeedsRefreshes) {
+      if (!mIsObservingRefreshDriver) {
+        mPresContext->RefreshDriver()->AddRefreshObserver(this, Flush_Style);
+        mIsObservingRefreshDriver = true;
+      }
+      return;
+    }
+  }
+  if (mIsObservingRefreshDriver) {
+    mIsObservingRefreshDriver = false;
+    mPresContext->RefreshDriver()->RemoveRefreshObserver(this, Flush_Style);
+  }
+}
+
 AnimationPlayerCollection*
 CommonAnimationManager::GetAnimationsForCompositor(nsIContent* aContent,
                                                    nsIAtom* aElementProperty,
@@ -102,10 +139,12 @@
   // Mark the frame as active, in case we are able to throttle this animation.
   nsIFrame* frame = nsLayoutUtils::GetStyleFrame(collection->mElement);
   if (frame) {
-    if (aProperty == eCSSProperty_opacity) {
-      ActiveLayerTracker::NotifyAnimated(frame, eCSSProperty_opacity);
-    } else if (aProperty == eCSSProperty_transform) {
-      ActiveLayerTracker::NotifyAnimated(frame, eCSSProperty_transform);
+    const auto& info = sLayerAnimationInfo;
+    for (size_t i = 0; i < ArrayLength(info); i++) {
+      if (aProperty == info[i].mProperty) {
+        ActiveLayerTracker::NotifyAnimated(frame, aProperty);
+        break;
+      }
     }
   }
 
@@ -148,6 +187,50 @@
   return false;
 }
 
+/* virtual */ void
+CommonAnimationManager::RulesMatching(ElementRuleProcessorData* aData)
+{
+  NS_ABORT_IF_FALSE(aData->mPresContext == mPresContext,
+                    "pres context mismatch");
+  nsIStyleRule *rule =
+    GetAnimationRule(aData->mElement,
+                     nsCSSPseudoElements::ePseudo_NotPseudoElement);
+  if (rule) {
+    aData->mRuleWalker->Forward(rule);
+  }
+}
+
+/* virtual */ void
+CommonAnimationManager::RulesMatching(PseudoElementRuleProcessorData* aData)
+{
+  NS_ABORT_IF_FALSE(aData->mPresContext == mPresContext,
+                    "pres context mismatch");
+  if (aData->mPseudoType != nsCSSPseudoElements::ePseudo_before &&
+      aData->mPseudoType != nsCSSPseudoElements::ePseudo_after) {
+    return;
+  }
+
+  // FIXME: Do we really want to be the only thing keeping a
+  // pseudo-element alive?  I *think* the non-animation restyle should
+  // handle that, but should add a test.
+  nsIStyleRule *rule = GetAnimationRule(aData->mElement, aData->mPseudoType);
+  if (rule) {
+    aData->mRuleWalker->Forward(rule);
+  }
+}
+
+/* virtual */ void
+CommonAnimationManager::RulesMatching(AnonBoxRuleProcessorData* aData)
+{
+}
+
+#ifdef MOZ_XUL
+/* virtual */ void
+CommonAnimationManager::RulesMatching(XULTreeRuleProcessorData* aData)
+{
+}
+#endif
+
 /* virtual */ size_t
 CommonAnimationManager::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
 {
@@ -189,6 +272,17 @@
   }
 }
 
+void
+CommonAnimationManager::NotifyCollectionUpdated(AnimationPlayerCollection&
+                                                  aCollection)
+{
+  CheckNeedsRefresh();
+  mPresContext->ClearLastStyleUpdateForAllAnimations();
+  mPresContext->RestyleManager()->IncrementAnimationGeneration();
+  aCollection.UpdateAnimationGeneration(mPresContext);
+  aCollection.PostRestyleForAnimation(mPresContext);
+}
+
 /* static */ bool
 CommonAnimationManager::ExtractComputedValueForTransition(
                           nsCSSProperty aProperty,
@@ -208,6 +302,115 @@
   return result;
 }
 
+AnimationPlayerCollection*
+CommonAnimationManager::GetAnimationPlayers(dom::Element *aElement,
+                                            nsCSSPseudoElements::Type aPseudoType,
+                                            bool aCreateIfNeeded)
+{
+  if (!aCreateIfNeeded && PR_CLIST_IS_EMPTY(&mElementCollections)) {
+    // Early return for the most common case.
+    return nullptr;
+  }
+
+  nsIAtom *propName;
+  if (aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement) {
+    propName = GetAnimationsAtom();
+  } else if (aPseudoType == nsCSSPseudoElements::ePseudo_before) {
+    propName = GetAnimationsBeforeAtom();
+  } else if (aPseudoType == nsCSSPseudoElements::ePseudo_after) {
+    propName = GetAnimationsAfterAtom();
+  } else {
+    NS_ASSERTION(!aCreateIfNeeded,
+                 "should never try to create transitions for pseudo "
+                 "other than :before or :after");
+    return nullptr;
+  }
+  AnimationPlayerCollection* collection =
+    static_cast<AnimationPlayerCollection*>(aElement->GetProperty(propName));
+  if (!collection && aCreateIfNeeded) {
+    // FIXME: Consider arena-allocating?
+    collection =
+      new AnimationPlayerCollection(aElement, propName, this);
+    nsresult rv =
+      aElement->SetProperty(propName, collection,
+                            &AnimationPlayerCollection::PropertyDtor, false);
+    if (NS_FAILED(rv)) {
+      NS_WARNING("SetProperty failed");
+      delete collection;
+      return nullptr;
+    }
+    if (propName == nsGkAtoms::animationsProperty ||
+        propName == nsGkAtoms::transitionsProperty) {
+      aElement->SetMayHaveAnimations();
+    }
+
+    AddElementCollection(collection);
+  }
+
+  return collection;
+}
+
+nsIStyleRule*
+CommonAnimationManager::GetAnimationRule(mozilla::dom::Element* aElement,
+                                         nsCSSPseudoElements::Type aPseudoType)
+{
+  NS_ABORT_IF_FALSE(
+    aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
+    aPseudoType == nsCSSPseudoElements::ePseudo_before ||
+    aPseudoType == nsCSSPseudoElements::ePseudo_after,
+    "forbidden pseudo type");
+
+  if (!mPresContext->IsDynamic()) {
+    // For print or print preview, ignore animations.
+    return nullptr;
+  }
+
+  AnimationPlayerCollection* collection =
+    GetAnimationPlayers(aElement, aPseudoType, false);
+  if (!collection) {
+    return nullptr;
+  }
+
+  RestyleManager* restyleManager = mPresContext->RestyleManager();
+  if (restyleManager->SkipAnimationRules()) {
+    // During the non-animation part of processing restyles, we don't
+    // add the animation rule.
+
+    if (collection->mStyleRule && restyleManager->PostAnimationRestyles()) {
+      collection->PostRestyleForAnimation(mPresContext);
+    }
+
+    return nullptr;
+  }
+
+  // Animations should already be refreshed, but transitions may not be.
+  // Note that this is temporary, we would like both animations and transitions
+  // to both be refreshed by this point.
+  if (IsAnimationManager()) {
+    NS_WARN_IF_FALSE(!collection->mNeedsRefreshes ||
+                     collection->mStyleRuleRefreshTime ==
+                       mPresContext->RefreshDriver()->MostRecentRefresh(),
+                     "should already have refreshed style rule");
+  } else {
+    // FIXME: Remove this assignment.  See bug 1061364.
+    collection->mNeedsRefreshes = true;
+    collection->EnsureStyleRuleFor(
+      mPresContext->RefreshDriver()->MostRecentRefresh(),
+      EnsureStyleRule_IsNotThrottled);
+  }
+
+  return collection->mStyleRule;
+}
+
+/* static */ const CommonAnimationManager::LayerAnimationRecord
+  CommonAnimationManager::sLayerAnimationInfo[] =
+    { { eCSSProperty_transform,
+        nsDisplayItem::TYPE_TRANSFORM,
+        nsChangeHint_UpdateTransformLayer },
+      { eCSSProperty_opacity,
+        nsDisplayItem::TYPE_OPACITY,
+        nsChangeHint_UpdateOpacityLayer } };
+
 NS_IMPL_ISUPPORTS(AnimValuesStyleRule, nsIStyleRule)
 
 /* virtual */ void
@@ -438,6 +641,16 @@
   return pseudoFrame->GetContent()->AsElement();
 }
 
+void
+AnimationPlayerCollection::NotifyPlayerUpdated()
+{
+  // On the next flush, force us to update the style rule
+  mNeedsRefreshes = true;
+  mStyleRuleRefreshTime = TimeStamp();
+
+  mManager->NotifyCollectionUpdated(*this);
+}
+
 /* static */ void
 AnimationPlayerCollection::LogAsyncAnimationFailure(nsCString& aMessage,
                                                      const nsIContent* aContent)
@@ -527,8 +740,9 @@
                                         mNeedsRefreshes);
     }
   }
-}
 
+  mManager->CheckNeedsRefresh();
+}
 
 bool
 AnimationPlayerCollection::CanThrottleTransformChanges(TimeStamp aTime)
@@ -546,7 +760,8 @@
   }
 
   // If this animation can cause overflow, we can throttle some of the ticks.
-  if ((aTime - mStyleRuleRefreshTime) < TimeDuration::FromMilliseconds(200)) {
+  if (!mStyleRuleRefreshTime.IsNull() &&
+      (aTime - mStyleRuleRefreshTime) < TimeDuration::FromMilliseconds(200)) {
     return true;
   }
 
@@ -576,27 +791,27 @@
     return false;
   }
 
-  bool hasTransform = HasAnimationOfProperty(eCSSProperty_transform);
-  bool hasOpacity = HasAnimationOfProperty(eCSSProperty_opacity);
-  if (hasOpacity) {
+
+  const auto& info = css::CommonAnimationManager::sLayerAnimationInfo;
+  for (size_t i = 0; i < ArrayLength(info); i++) {
+    auto record = info[i];
+    if (!HasAnimationOfProperty(record.mProperty)) {
+      continue;
+    }
+
     Layer* layer = FrameLayerBuilder::GetDedicatedLayer(
-                     frame, nsDisplayItem::TYPE_OPACITY);
+                     frame, record.mLayerType);
     if (!layer || mAnimationGeneration > layer->GetAnimationGeneration()) {
       return false;
     }
-  }
 
-  if (!hasTransform) {
-    return true;
-  }
-
-  Layer* layer = FrameLayerBuilder::GetDedicatedLayer(
-                   frame, nsDisplayItem::TYPE_TRANSFORM);
-  if (!layer || mAnimationGeneration > layer->GetAnimationGeneration()) {
-    return false;
+    if (record.mProperty == eCSSProperty_transform &&
+        !CanThrottleTransformChanges(aTime)) {
+      return false;
+    }
   }
 
-  return CanThrottleTransformChanges(aTime);
+  return true;
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/AnimationCommon.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/AnimationCommon.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/AnimationCommon.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/AnimationCommon.h	2014-11-26 21:45:52.000000000 +0000
@@ -10,7 +10,9 @@
 #include "nsIStyleRule.h"
 #include "nsRefreshDriver.h"
 #include "prclist.h"
+#include "nsChangeHint.h"
 #include "nsCSSProperty.h"
+#include "nsDisplayList.h" // For nsDisplayItem::Type
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StyleAnimationValue.h"
 #include "mozilla/dom/AnimationPlayer.h"
@@ -51,6 +53,12 @@
   virtual nsRestyleHint
     HasAttributeDependentStyle(AttributeRuleProcessorData* aData) MOZ_OVERRIDE;
   virtual bool MediumFeaturesChanged(nsPresContext* aPresContext) MOZ_OVERRIDE;
+  virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
+  virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
+  virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
+#ifdef MOZ_XUL
+  virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
+#endif
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf)
     const MOZ_MUST_OVERRIDE MOZ_OVERRIDE;
   virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
@@ -66,26 +74,76 @@
   // elements.
   void AddStyleUpdatesTo(mozilla::RestyleTracker& aTracker);
 
+  AnimationPlayerCollection*
+  GetAnimationPlayers(dom::Element *aElement,
+                      nsCSSPseudoElements::Type aPseudoType,
+                      bool aCreateIfNeeded);
+
+  // Returns true if aContent or any of its ancestors has an animation
+  // or transition.
+  static bool ContentOrAncestorHasAnimation(nsIContent* aContent) {
+    do {
+      if (aContent->GetProperty(nsGkAtoms::animationsProperty) ||
+          aContent->GetProperty(nsGkAtoms::transitionsProperty)) {
+        return true;
+      }
+    } while ((aContent = aContent->GetParent()));
+
+    return false;
+  }
+
+  // Notify this manager that one of its collections of animation players,
+  // has been updated.
+  void NotifyCollectionUpdated(AnimationPlayerCollection& aCollection);
+
   enum FlushFlags {
     Can_Throttle,
     Cannot_Throttle
   };
 
+  nsIStyleRule* GetAnimationRule(mozilla::dom::Element* aElement,
+                                 nsCSSPseudoElements::Type aPseudoType);
+
   static bool ExtractComputedValueForTransition(
                   nsCSSProperty aProperty,
                   nsStyleContext* aStyleContext,
                   mozilla::StyleAnimationValue& aComputedValue);
+
+  // For CSS properties that may be animated on a separate layer, represents
+  // a record of the corresponding layer type and change hint.
+  struct LayerAnimationRecord {
+    nsCSSProperty mProperty;
+    nsDisplayItem::Type mLayerType;
+    nsChangeHint mChangeHint;
+  };
+
+protected:
+  static const size_t kLayerRecords = 2;
+
+public:
+  static const LayerAnimationRecord sLayerAnimationInfo[kLayerRecords];
+
 protected:
   virtual ~CommonAnimationManager();
 
   // For ElementCollectionRemoved
   friend struct mozilla::AnimationPlayerCollection;
 
-  virtual void
-  AddElementCollection(AnimationPlayerCollection* aCollection) = 0;
-  virtual void ElementCollectionRemoved() = 0;
+  void AddElementCollection(AnimationPlayerCollection* aCollection);
+  void ElementCollectionRemoved() { CheckNeedsRefresh(); }
   void RemoveAllElementCollections();
 
+  // Check to see if we should stop or start observing the refresh driver
+  void CheckNeedsRefresh();
+
+  virtual nsIAtom* GetAnimationsAtom() = 0;
+  virtual nsIAtom* GetAnimationsBeforeAtom() = 0;
+  virtual nsIAtom* GetAnimationsAfterAtom() = 0;
+
+  virtual bool IsAnimationManager() {
+    return false;
+  }
+
   // When this returns a value other than nullptr, it also,
   // as a side-effect, notifies the ActiveLayerTracker.
   static AnimationPlayerCollection*
@@ -95,6 +153,7 @@
 
   PRCList mElementCollections;
   nsPresContext *mPresContext; // weak (non-null from ctor to Disconnect)
+  bool mIsObservingRefreshDriver;
 };
 
 /**
@@ -184,10 +243,6 @@
 
   void Tick();
 
-  // This updates mNeedsRefreshes so the caller may need to check
-  // for changes to values (for example, nsAnimationManager provides
-  // CheckNeedsRefresh to register or unregister from observing the refresh
-  // driver when this value changes).
   void EnsureStyleRuleFor(TimeStamp aRefreshTime, EnsureStyleRuleFlags aFlags);
 
   bool CanThrottleTransformChanges(mozilla::TimeStamp aTime);
@@ -270,10 +325,15 @@
   void PostRestyleForAnimation(nsPresContext *aPresContext) {
     mozilla::dom::Element* element = GetElementToRestyle();
     if (element) {
-      aPresContext->PresShell()->RestyleForAnimation(element, eRestyle_Self);
+      nsRestyleHint hint = IsForTransitions() ? eRestyle_CSSTransitions
+                                              : eRestyle_CSSAnimations;
+      hint |= eRestyle_ChangeAnimationPhase;
+      aPresContext->PresShell()->RestyleForAnimation(element, hint);
     }
   }
 
+  void NotifyPlayerUpdated();
+
   static void LogAsyncAnimationFailure(nsCString& aMessage,
                                        const nsIContent* aContent = nullptr);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/crashtests/1089463-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/crashtests/1089463-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/crashtests/1089463-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/crashtests/1089463-1.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<div></div>
+<script>
+window.onload = function() {
+  var div = document.querySelector("div");
+  var shadow = div.createShadowRoot();
+  shadow.innerHTML = "<p style='display: none'><span><i>x</i></span></p>";
+  var p = shadow.lastChild;
+  var span = p.firstChild;
+  var i = span.firstChild;
+
+  span.style.color = 'blue';
+  p.remove();
+
+  document.body.offsetTop;
+
+  shadow.appendChild(p);
+  i.style.color = 'red';
+};
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/crashtests/559491.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/crashtests/559491.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/crashtests/559491.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/crashtests/559491.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<script type="text/javascript">
+
+function boom()
+{
+  for (var i = 0; i < 200; ++i) {
+    //dump(i + "\n");
+    r1 = document.createElementNS("http://www.w3.org/1999/xhtml", "a");
+    r1.setAttributeNS(null, "href", "404");
+    r1.style.color = "green";
+    r2 = document.createElementNS("http://www.w3.org/1999/xhtml", "span");
+    r2.style.color = "red";
+    document.removeChild(document.documentElement);
+    document.appendChild(r1);
+    document.removeChild(document.documentElement);
+    document.appendChild(r2);
+    document.removeChild(document.documentElement);
+    document.appendChild(r1);
+    document.documentElement.offsetHeight;
+  }
+}
+
+</script>
+</head>
+
+<body onload="boom();"></body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/crashtests/crashtests.list	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/crashtests/crashtests.list	2014-11-26 21:45:52.000000000 +0000
@@ -61,6 +61,7 @@
 load 536789-1.html
 load 565248-1.html
 load 558943-1.xhtml
+load 559491.html
 load 571105-1.xhtml
 load 573127-1.html
 load 580685.html
@@ -109,5 +110,6 @@
 load 1028514-1.html
 load 1066089-1.html
 load 1074651-1.html
+pref(dom.webcomponents.enabled,true) load 1089463-1.html
 load large_border_image_width.html
 load border-image-visited-link.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/CSSStyleSheet.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/CSSStyleSheet.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/CSSStyleSheet.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/CSSStyleSheet.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -720,12 +720,14 @@
 
 
 CSSStyleSheetInner::CSSStyleSheetInner(CSSStyleSheet* aPrimarySheet,
-                                       CORSMode aCORSMode)
-  : mSheets(),
-    mCORSMode(aCORSMode),
-    mComplete(false)
+                                       CORSMode aCORSMode,
+                                       ReferrerPolicy aReferrerPolicy)
+  : mSheets()
+  , mCORSMode(aCORSMode)
+  , mReferrerPolicy (aReferrerPolicy)
+  , mComplete(false)
 #ifdef DEBUG
-    , mPrincipalSet(false)
+  , mPrincipalSet(false)
 #endif
 {
   MOZ_COUNT_CTOR(CSSStyleSheetInner);
@@ -843,6 +845,7 @@
     mBaseURI(aCopy.mBaseURI),
     mPrincipal(aCopy.mPrincipal),
     mCORSMode(aCopy.mCORSMode),
+    mReferrerPolicy(aCopy.mReferrerPolicy),
     mComplete(aCopy.mComplete)
 #ifdef DEBUG
     , mPrincipalSet(aCopy.mPrincipalSet)
@@ -971,7 +974,7 @@
 // CSS Style Sheet
 //
 
-CSSStyleSheet::CSSStyleSheet(CORSMode aCORSMode)
+CSSStyleSheet::CSSStyleSheet(CORSMode aCORSMode, ReferrerPolicy aReferrerPolicy)
   : mTitle(), 
     mParent(nullptr),
     mOwnerRule(nullptr),
@@ -982,7 +985,7 @@
     mScopeElement(nullptr),
     mRuleProcessors(nullptr)
 {
-  mInner = new CSSStyleSheetInner(this, aCORSMode);
+  mInner = new CSSStyleSheetInner(this, aCORSMode, aReferrerPolicy);
 }
 
 CSSStyleSheet::CSSStyleSheet(const CSSStyleSheet& aCopy,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/CSSStyleSheet.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/CSSStyleSheet.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/CSSStyleSheet.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/CSSStyleSheet.h	2014-11-26 21:45:52.000000000 +0000
@@ -25,6 +25,7 @@
 #include "mozilla/CORSMode.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class CSSRuleListImpl;
 class nsCSSRuleProcessor;
@@ -58,9 +59,12 @@
 public:
   friend class mozilla::CSSStyleSheet;
   friend class ::nsCSSRuleProcessor;
+  typedef net::ReferrerPolicy ReferrerPolicy;
+
 private:
   CSSStyleSheetInner(CSSStyleSheet* aPrimarySheet,
-                     CORSMode aCORSMode);
+                     CORSMode aCORSMode,
+                     ReferrerPolicy aReferrerPolicy);
   CSSStyleSheetInner(CSSStyleSheetInner& aCopy,
                      CSSStyleSheet* aPrimarySheet);
   ~CSSStyleSheetInner();
@@ -90,6 +94,9 @@
   // parent chain and things are good.
   nsRefPtr<CSSStyleSheet> mFirstChild;
   CORSMode               mCORSMode;
+  // The Referrer Policy of a stylesheet is used for its child sheets, so it is
+  // stored here.
+  ReferrerPolicy         mReferrerPolicy;
   bool                   mComplete;
 
 #ifdef DEBUG
@@ -115,7 +122,8 @@
                                 public nsWrapperCache
 {
 public:
-  explicit CSSStyleSheet(CORSMode aCORSMode);
+  typedef net::ReferrerPolicy ReferrerPolicy;
+  CSSStyleSheet(CORSMode aCORSMode, ReferrerPolicy aReferrerPolicy);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(CSSStyleSheet,
@@ -251,6 +259,9 @@
   // Get this style sheet's CORS mode
   CORSMode GetCORSMode() const { return mInner->mCORSMode; }
 
+  // Get this style sheet's Referrer Policy
+  ReferrerPolicy GetReferrerPolicy() const { return mInner->mReferrerPolicy; }
+
   dom::Element* GetScopeElement() const { return mScopeElement; }
   void SetScopeElement(dom::Element* aScopeElement)
   {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/Declaration.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/Declaration.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/Declaration.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/Declaration.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -114,38 +114,6 @@
   return true;
 }
 
-// Helper to append |aString| with the shorthand sides notation used in e.g.
-// 'padding'. |aProperties| and |aValues| are expected to have 4 elements.
-static void
-AppendSidesShorthandToString(const nsCSSProperty aProperties[],
-                             const nsCSSValue* aValues[],
-                             nsAString& aString,
-                             nsCSSValue::Serialization aSerialization)
-{
-  const nsCSSValue& value1 = *aValues[0];
-  const nsCSSValue& value2 = *aValues[1];
-  const nsCSSValue& value3 = *aValues[2];
-  const nsCSSValue& value4 = *aValues[3];
-
-  NS_ABORT_IF_FALSE(value1.GetUnit() != eCSSUnit_Null, "null value 1");
-  value1.AppendToString(aProperties[0], aString, aSerialization);
-  if (value1 != value2 || value1 != value3 || value1 != value4) {
-    aString.Append(char16_t(' '));
-    NS_ABORT_IF_FALSE(value2.GetUnit() != eCSSUnit_Null, "null value 2");
-    value2.AppendToString(aProperties[1], aString, aSerialization);
-    if (value1 != value3 || value2 != value4) {
-      aString.Append(char16_t(' '));
-      NS_ABORT_IF_FALSE(value3.GetUnit() != eCSSUnit_Null, "null value 3");
-      value3.AppendToString(aProperties[2], aString, aSerialization);
-      if (value2 != value4) {
-        aString.Append(char16_t(' '));
-        NS_ABORT_IF_FALSE(value4.GetUnit() != eCSSUnit_Null, "null value 4");
-        value4.AppendToString(aProperties[3], aString, aSerialization);
-      }
-    }
-  }
-}
-
 void
 Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
 {
@@ -294,7 +262,8 @@
         data->ValueFor(subprops[2]),
         data->ValueFor(subprops[3])
       };
-      AppendSidesShorthandToString(subprops, vals, aValue, aSerialization);
+      nsCSSValue::AppendSidesShorthandToString(subprops, vals, aValue,
+                                               aSerialization);
       break;
     }
     case eCSSProperty_border_radius:
@@ -307,27 +276,8 @@
         data->ValueFor(subprops[2]),
         data->ValueFor(subprops[3])
       };
-
-      // For compatibility, only write a slash and the y-values
-      // if they're not identical to the x-values.
-      bool needY = false;
-      const nsCSSValue* xVals[4];
-      const nsCSSValue* yVals[4];
-      for (int i = 0; i < 4; i++) {
-        if (vals[i]->GetUnit() == eCSSUnit_Pair) {
-          needY = true;
-          xVals[i] = &vals[i]->GetPairValue().mXValue;
-          yVals[i] = &vals[i]->GetPairValue().mYValue;
-        } else {
-          xVals[i] = yVals[i] = vals[i];
-        }
-      }
-
-      AppendSidesShorthandToString(subprops, xVals, aValue, aSerialization);
-      if (needY) {
-        aValue.AppendLiteral(" / ");
-        AppendSidesShorthandToString(subprops, yVals, aValue, aSerialization);
-      }
+      nsCSSValue::AppendBasicShapeRadiusToString(subprops, vals, aValue,
+                                                 aSerialization);
       break;
     }
     case eCSSProperty_border_image: {
@@ -789,8 +739,6 @@
       break;
     }
     case eCSSProperty_text_decoration: {
-      // If text-decoration-color or text-decoration-style isn't initial value,
-      // we cannot serialize the text-decoration shorthand value.
       const nsCSSValue *decorationColor =
         data->ValueFor(eCSSProperty_text_decoration_color);
       const nsCSSValue *decorationStyle =
@@ -800,15 +748,20 @@
                         nsPrintfCString("bad text-decoration-style unit %d",
                                         decorationStyle->GetUnit()).get());
 
-      if (decorationColor->GetUnit() != eCSSUnit_Enumerated ||
-          decorationColor->GetIntValue() != NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR ||
-          decorationStyle->GetIntValue() !=
-            NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
-        return;
-      }
-
       AppendValueToString(eCSSProperty_text_decoration_line, aValue,
                           aSerialization);
+      if (decorationStyle->GetIntValue() !=
+            NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
+        aValue.Append(char16_t(' '));
+        AppendValueToString(eCSSProperty_text_decoration_style, aValue,
+                            aSerialization);
+      }
+      if (decorationColor->GetUnit() != eCSSUnit_Enumerated ||
+          decorationColor->GetIntValue() != NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR) {
+        aValue.Append(char16_t(' '));
+        AppendValueToString(eCSSProperty_text_decoration_color, aValue,
+                            aSerialization);
+      }
       break;
     }
     case eCSSProperty_transition: {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/FontFaceSet.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/FontFaceSet.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/FontFaceSet.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/FontFaceSet.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -389,17 +389,17 @@
   nsCOMPtr<nsILoadGroup> loadGroup(ps->GetDocument()->GetDocumentLoadGroup());
 
   nsCOMPtr<nsIChannel> channel;
-  // Note we are calling NS_NewChannelInternal() with both a node and a
-  // principal.  This is because the document where the font is being loaded
-  // might have a different origin from the principal of the stylesheet
-  // that initiated the font load.
-  rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                             aFontFaceSrc->mURI,
-                             ps->GetDocument(),
-                             aUserFontEntry->GetPrincipal(),
-                             nsILoadInfo::SEC_NORMAL,
-                             nsIContentPolicy::TYPE_FONT,
-                             loadGroup);
+  // Note we are calling NS_NewChannelWithTriggeringPrincipal() with both a
+  // node and a principal.  This is because the document where the font is
+  // being loaded might have a different origin from the principal of the
+  // stylesheet that initiated the font load.
+  rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(channel),
+                                            aFontFaceSrc->mURI,
+                                            ps->GetDocument(),
+                                            aUserFontEntry->GetPrincipal(),
+                                            nsILoadInfo::SEC_NORMAL,
+                                            nsIContentPolicy::TYPE_FONT,
+                                            loadGroup);
 
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -425,7 +425,8 @@
 
   nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
   if (httpChannel) {
-    httpChannel->SetReferrer(aFontFaceSrc->mReferrer);
+    httpChannel->SetReferrerWithPolicy(aFontFaceSrc->mReferrer,
+                                       ps->GetDocument()->GetReferrerPolicy());
     nsAutoCString accept("application/font-woff;q=0.9,*/*;q=0.8");
     if (Preferences::GetBool(GFX_PREF_WOFF2_ENABLED)) {
       accept.Insert(NS_LITERAL_CSTRING("application/font-woff2;q=1.0,"), 0);
@@ -1185,16 +1186,16 @@
   if (!ps) {
     return NS_ERROR_FAILURE;
   }
-  // Note we are calling NS_NewChannelInternal() with both a node and a
-  // principal.  This is because the document where the font is being loaded
-  // might have a different origin from the principal of the stylesheet
-  // that initiated the font load.
-  rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                             aFontFaceSrc->mURI,
-                             ps->GetDocument(),
-                             aFontToLoad->GetPrincipal(),
-                             nsILoadInfo::SEC_NORMAL,
-                             nsIContentPolicy::TYPE_FONT);
+  // Note we are calling NS_NewChannelWithTriggeringPrincipal() with both a
+  // node and a principal.  This is because the document where the font is
+  // being loaded might have a different origin from the principal of the
+  // stylesheet that initiated the font load.
+  rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(channel),
+                                            aFontFaceSrc->mURI,
+                                            ps->GetDocument(),
+                                            aFontToLoad->GetPrincipal(),
+                                            nsILoadInfo::SEC_NORMAL,
+                                            nsIContentPolicy::TYPE_FONT);
 
   NS_ENSURE_SUCCESS(rv, rv);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/forms.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/forms.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/forms.css	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/forms.css	2014-11-26 21:45:52.000000000 +0000
@@ -132,8 +132,8 @@
   padding: inherit !important;
   margin: 0px;
   text-decoration: inherit;
-  -moz-text-decoration-color: inherit;
-  -moz-text-decoration-style: inherit;
+  text-decoration-color: inherit;
+  text-decoration-style: inherit;
   display: inline-block;
   ime-mode: inherit;
   resize: inherit;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/html.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/html.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/html.css	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/html.css	2014-11-26 21:45:52.000000000 +0000
@@ -720,6 +720,13 @@
   object-fit: contain;
 }
 
+video > img:-moz-native-anonymous {
+  /* Video poster images should render with the video element's "object-fit" &
+     "object-position" properties */
+  object-fit: inherit !important;
+  object-position: inherit !important;
+}
+
 audio:not([controls]) {
   display: none;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/ImageLoader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/ImageLoader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/ImageLoader.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/ImageLoader.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -285,6 +285,7 @@
 
   nsRefPtr<imgRequestProxy> request;
   nsContentUtils::LoadImage(aURI, mDocument, aOriginPrincipal, aReferrer,
+                            mDocument->GetReferrerPolicy(),
                             nullptr, nsIRequest::LOAD_NORMAL,
                             NS_LITERAL_STRING("css"),
                             getter_AddRefs(request));
@@ -395,31 +396,31 @@
 NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP
-ImageLoader::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData)
+ImageLoader::Notify(imgIRequest* aRequest, int32_t aType, const nsIntRect* aData)
 {
   if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
     nsCOMPtr<imgIContainer> image;
     aRequest->GetImage(getter_AddRefs(image));
-    return OnStartContainer(aRequest, image);
+    return OnSizeAvailable(aRequest, image);
   }
 
   if (aType == imgINotificationObserver::IS_ANIMATED) {
     return OnImageIsAnimated(aRequest);
   }
 
-  if (aType == imgINotificationObserver::LOAD_COMPLETE) {
-    return OnStopFrame(aRequest);
+  if (aType == imgINotificationObserver::FRAME_COMPLETE) {
+    return OnFrameComplete(aRequest);
   }
 
   if (aType == imgINotificationObserver::FRAME_UPDATE) {
-    return FrameChanged(aRequest);
+    return OnFrameUpdate(aRequest);
   }
 
   return NS_OK;
 }
 
 nsresult
-ImageLoader::OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage)
+ImageLoader::OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage)
 { 
   nsPresContext* presContext = GetPresContext();
   if (!presContext) {
@@ -456,7 +457,7 @@
 }
 
 nsresult
-ImageLoader::OnStopFrame(imgIRequest *aRequest)
+ImageLoader::OnFrameComplete(imgIRequest* aRequest)
 {
   if (!mDocument || mInClone) {
     return NS_OK;
@@ -478,7 +479,7 @@
 }
 
 nsresult
-ImageLoader::FrameChanged(imgIRequest *aRequest)
+ImageLoader::OnFrameUpdate(imgIRequest* aRequest)
 {
   if (!mDocument || mInClone) {
     return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/ImageLoader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/ImageLoader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/ImageLoader.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/ImageLoader.h	2014-11-26 21:45:52.000000000 +0000
@@ -100,13 +100,10 @@
   DeregisterRequestEnumerator(nsISupports* aKey, FrameSet* aValue,
                               void* aClosure);
 
-  nsresult OnStartContainer(imgIRequest *aRequest, imgIContainer* aImage);
-  nsresult OnStopFrame(imgIRequest *aRequest);
-  nsresult OnImageIsAnimated(imgIRequest *aRequest);
-  nsresult FrameChanged(imgIRequest* aRequest);
-  // Do not override OnDataAvailable since background images are not
-  // displayed incrementally; they are displayed after the entire image
-  // has been loaded.
+  nsresult OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage);
+  nsresult OnFrameComplete(imgIRequest* aRequest);
+  nsresult OnImageIsAnimated(imgIRequest* aRequest);
+  nsresult OnFrameUpdate(imgIRequest* aRequest);
 
   // A map of imgIRequests to the nsIFrames that are using them.
   RequestToFrameMap mRequestToFrameMap;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/Loader.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/Loader.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/Loader.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/Loader.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -562,7 +562,7 @@
 }
 
 static PLDHashOperator
-CollectNonAlternates(URIPrincipalAndCORSModeHashKey *aKey,
+CollectNonAlternates(URIPrincipalReferrerPolicyAndCORSModeHashKey *aKey,
                      SheetLoadData* &aData,
                      void* aClosure)
 {
@@ -987,7 +987,7 @@
 }
 
 /* static */ PLDHashOperator
-Loader::RemoveEntriesWithURI(URIPrincipalAndCORSModeHashKey* aKey,
+Loader::RemoveEntriesWithURI(URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey,
                              nsRefPtr<CSSStyleSheet>& aSheet,
                              void* aUserData)
 {
@@ -1081,9 +1081,10 @@
                     nsIContent* aLinkingContent,
                     nsIPrincipal* aLoaderPrincipal,
                     CORSMode aCORSMode,
+                    ReferrerPolicy aReferrerPolicy,
                     bool aSyncLoad,
                     bool aHasAlternateRel,
-                    const nsAString& aTitle,                       
+                    const nsAString& aTitle,
                     StyleSheetState& aSheetState,
                     bool *aIsAlternate,
                     CSSStyleSheet** aSheet)
@@ -1122,7 +1123,7 @@
     bool fromCompleteSheets = false;
     if (!sheet) {
       // Then our per-document complete sheets.
-      URIPrincipalAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode);
+      URIPrincipalReferrerPolicyAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode, aReferrerPolicy);
 
       mSheets->mCompleteSheets.Get(&key, getter_AddRefs(sheet));
       LOG(("  From completed: %p", sheet.get()));
@@ -1149,7 +1150,7 @@
     if (!sheet && !aSyncLoad) {
       aSheetState = eSheetLoading;
       SheetLoadData* loadData = nullptr;
-      URIPrincipalAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode);
+      URIPrincipalReferrerPolicyAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode, aReferrerPolicy);
       mSheets->mLoadingDatas.Get(&key, &loadData);
       if (loadData) {
         sheet = loadData->mSheet;
@@ -1202,7 +1203,7 @@
         // anyone.  Replace it in the cache, so that if our CSSOM is
         // later modified we don't end up with two copies of our inner
         // hanging around.
-        URIPrincipalAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode);
+        URIPrincipalReferrerPolicyAndCORSModeHashKey key(aURI, aLoaderPrincipal, aCORSMode, aReferrerPolicy);
         NS_ASSERTION((*aSheet)->IsComplete(),
                      "Should only be caching complete sheets");
         mSheets->mCompleteSheets.Put(&key, *aSheet);
@@ -1228,7 +1229,7 @@
       originalURI = aURI;
     }
 
-    nsRefPtr<CSSStyleSheet> sheet = new CSSStyleSheet(aCORSMode);
+    nsRefPtr<CSSStyleSheet> sheet = new CSSStyleSheet(aCORSMode, aReferrerPolicy);
     sheet->SetURIs(sheetURI, originalURI, baseURI);
     sheet.forget(aSheet);
   }
@@ -1424,8 +1425,8 @@
   }
 
   bool inherit = false;
-  nsIPrincipal* requestingPrincipal = aLoadData->mLoaderPrincipal;
-  if (requestingPrincipal) {
+  nsIPrincipal* triggeringPrincipal = aLoadData->mLoaderPrincipal;
+  if (triggeringPrincipal) {
     rv = NS_URIChainHasFlags(aLoadData->mURI,
                              nsIProtocolHandler::URI_INHERITS_SECURITY_CONTEXT,
                              &inherit);
@@ -1436,7 +1437,7 @@
                      CheckMayLoad(aLoadData->mURI, false, false))));
   }
   else {
-    requestingPrincipal = nsContentUtils::GetSystemPrincipal();
+    triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
   }
 
   if (aLoadData->mSyncLoad) {
@@ -1469,17 +1470,36 @@
     // principal.  This is because of a case where the node is the document
     // being styled and the principal is the stylesheet (perhaps from a
     // different origin)  that is applying the styles.
-    rv = NS_OpenURIInternal(getter_AddRefs(stream),
-                            aLoadData->mURI,
-                            aLoadData->mRequestingNode,
-                            requestingPrincipal,
-                            nsILoadInfo::SEC_NORMAL,
-                            nsIContentPolicy::TYPE_OTHER,
-                            nullptr,   // aLoadGroup
-                            nullptr,   // aCallbacks
-                            nsIRequest::LOAD_NORMAL,
-                            nullptr,   // aIoService
-                            getter_AddRefs(channel));
+    if (aLoadData->mRequestingNode) {
+      rv = NS_OpenURIWithTriggeringPrincipal(getter_AddRefs(stream),
+                                             aLoadData->mURI,
+                                             aLoadData->mRequestingNode,
+                                             triggeringPrincipal,
+                                             nsILoadInfo::SEC_NORMAL,
+                                             nsIContentPolicy::TYPE_OTHER,
+                                             nullptr,   // aLoadGroup
+                                             nullptr,   // aCallbacks
+                                             nsIRequest::LOAD_NORMAL,
+                                             nullptr,   // aIoService
+                                             getter_AddRefs(channel));
+    }
+    else {
+      // either we are loading something inside a document, in which case
+      // we should always have a requestingNode, or we are loading something
+      // outside a document, in which case the triggeringPrincipal
+      // should always be the systemPrincipal.
+      MOZ_ASSERT(nsContentUtils::IsSystemPrincipal(triggeringPrincipal));
+      rv = NS_OpenURI(getter_AddRefs(stream),
+                      aLoadData->mURI,
+                      triggeringPrincipal,
+                      nsILoadInfo::SEC_NORMAL,
+                      nsIContentPolicy::TYPE_OTHER,
+                      nullptr,   // aLoadGroup
+                      nullptr,   // aCallbacks
+                      nsIRequest::LOAD_NORMAL,
+                      nullptr,   // aIoService
+                      getter_AddRefs(channel));
+    }
 
     if (NS_FAILED(rv)) {
       LOG_ERROR(("  Failed to open URI synchronously"));
@@ -1505,9 +1525,10 @@
 
   SheetLoadData* existingData = nullptr;
 
-  URIPrincipalAndCORSModeHashKey key(aLoadData->mURI,
+  URIPrincipalReferrerPolicyAndCORSModeHashKey key(aLoadData->mURI,
                                      aLoadData->mLoaderPrincipal,
-                                     aLoadData->mSheet->GetCORSMode());
+                                     aLoadData->mSheet->GetCORSMode(),
+                                     aLoadData->mSheet->GetReferrerPolicy());
   if (aSheetState == eSheetLoading) {
     mSheets->mLoadingDatas.Get(&key, &existingData);
     NS_ASSERTION(existingData, "CreateSheet lied about the state");
@@ -1560,20 +1581,38 @@
   }
 
   nsCOMPtr<nsIChannel> channel;
-  // Note we are calling NS_NewChannelInternal here with a node and a principal.
-  // This is because of a case where the node is the document being styled and
-  // the principal is the stylesheet (perhaps from a different origin)  that is
-  // applying the styles.
-  rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                             aLoadData->mURI,
-                             aLoadData->mRequestingNode,
-                             requestingPrincipal,
-                             securityFlags,
-                             nsIContentPolicy::TYPE_STYLESHEET,
-                             loadGroup,
-                             nullptr,   // aCallbacks
-                             nsIChannel::LOAD_NORMAL |
-                             nsIChannel::LOAD_CLASSIFY_URI);
+  // Note we are calling NS_NewChannelWithTriggeringPrincipal here with a node
+  // and a principal. This is because of a case where the node is the document
+  // being styled and the principal is the stylesheet (perhaps from a different
+  // origin)  that is applying the styles.
+  if (aLoadData->mRequestingNode) {
+    rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(channel),
+                                              aLoadData->mURI,
+                                              aLoadData->mRequestingNode,
+                                              triggeringPrincipal,
+                                              securityFlags,
+                                              nsIContentPolicy::TYPE_STYLESHEET,
+                                              loadGroup,
+                                              nullptr,   // aCallbacks
+                                              nsIChannel::LOAD_NORMAL |
+                                              nsIChannel::LOAD_CLASSIFY_URI);
+  }
+  else {
+    // either we are loading something inside a document, in which case
+    // we should always have a requestingNode, or we are loading something
+    // outside a document, in which case the triggeringPrincipal
+    // should always be the systemPrincipal.
+    MOZ_ASSERT(nsContentUtils::IsSystemPrincipal(triggeringPrincipal));
+    rv = NS_NewChannel(getter_AddRefs(channel),
+                       aLoadData->mURI,
+                       triggeringPrincipal,
+                       securityFlags,
+                       nsIContentPolicy::TYPE_STYLESHEET,
+                       loadGroup,
+                       nullptr,   // aCallbacks
+                       nsIChannel::LOAD_NORMAL |
+                       nsIChannel::LOAD_CLASSIFY_URI);
+  }
 
   if (NS_FAILED(rv)) {
 #ifdef DEBUG
@@ -1597,7 +1636,8 @@
                                   false);
     nsCOMPtr<nsIURI> referrerURI = aLoadData->GetReferrerURI();
     if (referrerURI)
-      httpChannel->SetReferrer(referrerURI);
+      httpChannel->SetReferrerWithPolicy(referrerURI,
+                                         aLoadData->mSheet->GetReferrerPolicy());
 
     // Set the initiator type
     nsCOMPtr<nsITimedChannel> timedChannel(do_QueryInterface(httpChannel));
@@ -1789,9 +1829,10 @@
     LOG_URI("  Finished loading: '%s'", aLoadData->mURI);
     // Remove the data from the list of loading datas
     if (aLoadData->mIsLoading) {
-      URIPrincipalAndCORSModeHashKey key(aLoadData->mURI,
+      URIPrincipalReferrerPolicyAndCORSModeHashKey key(aLoadData->mURI,
                                          aLoadData->mLoaderPrincipal,
-                                         aLoadData->mSheet->GetCORSMode());
+                                         aLoadData->mSheet->GetCORSMode(),
+                                         aLoadData->mSheet->GetReferrerPolicy());
 #ifdef DEBUG
       SheetLoadData *loadingData;
       NS_ASSERTION(mSheets->mLoadingDatas.Get(&key, &loadingData) &&
@@ -1875,9 +1916,10 @@
     }
     else {
 #endif
-      URIPrincipalAndCORSModeHashKey key(aLoadData->mURI,
+      URIPrincipalReferrerPolicyAndCORSModeHashKey key(aLoadData->mURI,
                                          aLoadData->mLoaderPrincipal,
-                                         aLoadData->mSheet->GetCORSMode());
+                                         aLoadData->mSheet->GetCORSMode(),
+                                         aLoadData->mSheet->GetReferrerPolicy());
       NS_ASSERTION(sheet->IsComplete(),
                    "Should only be caching complete sheets");
       mSheets->mCompleteSheets.Put(&key, sheet);
@@ -1917,10 +1959,11 @@
 
   // Since we're not planning to load a URI, no need to hand a principal to the
   // load data or to CreateSheet().  Also, OK to use CORS_NONE for the CORS
-  // mode.
+  // mode and mDocument's ReferrerPolicy.
   StyleSheetState state;
   nsRefPtr<CSSStyleSheet> sheet;
-  nsresult rv = CreateSheet(nullptr, aElement, nullptr, CORS_NONE, false, false,
+  nsresult rv = CreateSheet(nullptr, aElement, nullptr, CORS_NONE,
+                            mDocument->GetReferrerPolicy(), false, false,
                             aTitle, state, aIsAlternate, getter_AddRefs(sheet));
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ASSERTION(state == eSheetNeedsParser,
@@ -1966,6 +2009,7 @@
                       const nsAString& aMedia,
                       bool aHasAlternateRel,
                       CORSMode aCORSMode,
+                      ReferrerPolicy aReferrerPolicy,
                       nsICSSLoaderObserver* aObserver,
                       bool* aIsAlternate)
 {
@@ -1999,7 +2043,8 @@
 
   StyleSheetState state;
   nsRefPtr<CSSStyleSheet> sheet;
-  rv = CreateSheet(aURL, aElement, principal, aCORSMode, false,
+  rv = CreateSheet(aURL, aElement, principal, aCORSMode,
+                   aReferrerPolicy, false,
                    aHasAlternateRel, aTitle, state, aIsAlternate,
                    getter_AddRefs(sheet));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2036,8 +2081,10 @@
   if (aURL && state == eSheetNeedsParser && mSheets->mLoadingDatas.Count() != 0 &&
       *aIsAlternate) {
     LOG(("  Deferring alternate sheet load"));
-    URIPrincipalAndCORSModeHashKey key(data->mURI, data->mLoaderPrincipal,
-                                       data->mSheet->GetCORSMode());
+    URIPrincipalReferrerPolicyAndCORSModeHashKey key(data->mURI,
+                                                     data->mLoaderPrincipal,
+                                                     data->mSheet->GetCORSMode(),
+                                                     data->mSheet->GetReferrerPolicy());
     mSheets->mPendingDatas.Put(&key, data);
 
     data->mMustNotify = true;
@@ -2160,6 +2207,7 @@
   const nsSubstring& empty = EmptyString();
   // For now, use CORS_NONE for child sheets
   rv = CreateSheet(aURL, nullptr, principal, CORS_NONE,
+                   aParentSheet->GetReferrerPolicy(),
                    parentData ? parentData->mSyncLoad : false,
                    false, empty, state, &isAlternate, getter_AddRefs(sheet));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2225,12 +2273,14 @@
                   nsIPrincipal* aOriginPrincipal,
                   const nsCString& aCharset,
                   nsICSSLoaderObserver* aObserver,
-                  CORSMode aCORSMode)
+                  CORSMode aCORSMode,
+                  ReferrerPolicy aReferrerPolicy)
 {
   LOG(("css::Loader::LoadSheet(aURL, aObserver) api call"));
   return InternalLoadNonDocumentSheet(aURL, false, false,
                                       aOriginPrincipal, aCharset,
-                                      nullptr, aObserver, aCORSMode);
+                                      nullptr, aObserver, aCORSMode,
+                                      aReferrerPolicy);
 }
 
 nsresult
@@ -2241,7 +2291,8 @@
                                      const nsCString& aCharset,
                                      CSSStyleSheet** aSheet,
                                      nsICSSLoaderObserver* aObserver,
-                                     CORSMode aCORSMode)
+                                     CORSMode aCORSMode,
+                                     ReferrerPolicy aReferrerPolicy)
 {
   NS_PRECONDITION(aURL, "Must have a URI to load");
   NS_PRECONDITION(aSheet || aObserver, "Sheet and observer can't both be null");
@@ -2271,7 +2322,8 @@
   bool syncLoad = (aObserver == nullptr);
   const nsSubstring& empty = EmptyString();
 
-  rv = CreateSheet(aURL, nullptr, aOriginPrincipal, aCORSMode, syncLoad, false,
+  rv = CreateSheet(aURL, nullptr, aOriginPrincipal, aCORSMode,
+                   aReferrerPolicy, syncLoad, false,
                    empty, state, &isAlternate, getter_AddRefs(sheet));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2384,7 +2436,7 @@
 }
 
 static PLDHashOperator
-StopLoadingSheetCallback(URIPrincipalAndCORSModeHashKey* aKey,
+StopLoadingSheetCallback(URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey,
                          SheetLoadData*& aData,
                          void* aClosure)
 {
@@ -2468,7 +2520,7 @@
 }
 
 static PLDHashOperator
-CollectLoadDatas(URIPrincipalAndCORSModeHashKey *aKey,
+CollectLoadDatas(URIPrincipalReferrerPolicyAndCORSModeHashKey *aKey,
                  SheetLoadData* &aData,
                  void* aClosure)
 {
@@ -2491,7 +2543,7 @@
 }
 
 static PLDHashOperator
-TraverseSheet(URIPrincipalAndCORSModeHashKey*,
+TraverseSheet(URIPrincipalReferrerPolicyAndCORSModeHashKey*,
               CSSStyleSheet* aSheet,
               void* aClosure)
 {
@@ -2532,7 +2584,7 @@
 };
 
 static size_t
-CountSheetMemory(URIPrincipalAndCORSModeHashKey* /* unused */,
+CountSheetMemory(URIPrincipalReferrerPolicyAndCORSModeHashKey* /* unused */,
                  const nsRefPtr<CSSStyleSheet>& aSheet,
                  mozilla::MallocSizeOf aMallocSizeOf,
                  void* /* unused */)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/Loader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/Loader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/Loader.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/Loader.h	2014-11-26 21:45:52.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/CORSMode.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class nsIAtom;
 class nsICSSLoaderObserver;
@@ -40,41 +41,52 @@
 
 namespace mozilla {
 
-class URIPrincipalAndCORSModeHashKey : public nsURIHashKey
+class URIPrincipalReferrerPolicyAndCORSModeHashKey : public nsURIHashKey
 {
 public:
-  typedef URIPrincipalAndCORSModeHashKey* KeyType;
-  typedef const URIPrincipalAndCORSModeHashKey* KeyTypePointer;
-
-  explicit URIPrincipalAndCORSModeHashKey(const URIPrincipalAndCORSModeHashKey* aKey)
-    : nsURIHashKey(aKey->mKey), mPrincipal(aKey->mPrincipal),
-      mCORSMode(aKey->mCORSMode)
+  typedef URIPrincipalReferrerPolicyAndCORSModeHashKey* KeyType;
+  typedef const URIPrincipalReferrerPolicyAndCORSModeHashKey* KeyTypePointer;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
+
+  explicit URIPrincipalReferrerPolicyAndCORSModeHashKey(const URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey)
+    : nsURIHashKey(aKey->mKey),
+      mPrincipal(aKey->mPrincipal),
+      mCORSMode(aKey->mCORSMode),
+      mReferrerPolicy(aKey->mReferrerPolicy)
   {
-    MOZ_COUNT_CTOR(URIPrincipalAndCORSModeHashKey);
+    MOZ_COUNT_CTOR(URIPrincipalReferrerPolicyAndCORSModeHashKey);
   }
-  URIPrincipalAndCORSModeHashKey(nsIURI* aURI, nsIPrincipal* aPrincipal,
-                                 CORSMode aCORSMode)
-    : nsURIHashKey(aURI), mPrincipal(aPrincipal), mCORSMode(aCORSMode)
+
+  URIPrincipalReferrerPolicyAndCORSModeHashKey(nsIURI* aURI,
+                                               nsIPrincipal* aPrincipal,
+                                               CORSMode aCORSMode,
+                                               ReferrerPolicy aReferrerPolicy)
+    : nsURIHashKey(aURI),
+      mPrincipal(aPrincipal),
+      mCORSMode(aCORSMode),
+      mReferrerPolicy(aReferrerPolicy)
   {
-    MOZ_COUNT_CTOR(URIPrincipalAndCORSModeHashKey);
+    MOZ_COUNT_CTOR(URIPrincipalReferrerPolicyAndCORSModeHashKey);
   }
-  URIPrincipalAndCORSModeHashKey(const URIPrincipalAndCORSModeHashKey& toCopy)
-    : nsURIHashKey(toCopy), mPrincipal(toCopy.mPrincipal),
-      mCORSMode(toCopy.mCORSMode)
+  URIPrincipalReferrerPolicyAndCORSModeHashKey(const URIPrincipalReferrerPolicyAndCORSModeHashKey& toCopy)
+    : nsURIHashKey(toCopy),
+      mPrincipal(toCopy.mPrincipal),
+      mCORSMode(toCopy.mCORSMode),
+      mReferrerPolicy(toCopy.mReferrerPolicy)
   {
-    MOZ_COUNT_CTOR(URIPrincipalAndCORSModeHashKey);
+    MOZ_COUNT_CTOR(URIPrincipalReferrerPolicyAndCORSModeHashKey);
   }
-  ~URIPrincipalAndCORSModeHashKey()
+  ~URIPrincipalReferrerPolicyAndCORSModeHashKey()
   {
-    MOZ_COUNT_DTOR(URIPrincipalAndCORSModeHashKey);
+    MOZ_COUNT_DTOR(URIPrincipalReferrerPolicyAndCORSModeHashKey);
   }
 
-  URIPrincipalAndCORSModeHashKey* GetKey() const {
-    return const_cast<URIPrincipalAndCORSModeHashKey*>(this);
+  URIPrincipalReferrerPolicyAndCORSModeHashKey* GetKey() const {
+    return const_cast<URIPrincipalReferrerPolicyAndCORSModeHashKey*>(this);
   }
-  const URIPrincipalAndCORSModeHashKey* GetKeyPointer() const { return this; }
+  const URIPrincipalReferrerPolicyAndCORSModeHashKey* GetKeyPointer() const { return this; }
 
-  bool KeyEquals(const URIPrincipalAndCORSModeHashKey* aKey) const {
+  bool KeyEquals(const URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey) const {
     if (!nsURIHashKey::KeyEquals(aKey->mKey)) {
       return false;
     }
@@ -89,14 +101,19 @@
       return false;
     }
 
+    if (mReferrerPolicy != aKey->mReferrerPolicy) {
+      // Different ReferrerPolicy; we don't match
+      return false;
+    }
+
     bool eq;
     return !mPrincipal ||
       (NS_SUCCEEDED(mPrincipal->Equals(aKey->mPrincipal, &eq)) && eq);
   }
 
-  static const URIPrincipalAndCORSModeHashKey*
-  KeyToPointer(URIPrincipalAndCORSModeHashKey* aKey) { return aKey; }
-  static PLDHashNumber HashKey(const URIPrincipalAndCORSModeHashKey* aKey) {
+  static const URIPrincipalReferrerPolicyAndCORSModeHashKey*
+  KeyToPointer(URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey) { return aKey; }
+  static PLDHashNumber HashKey(const URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey) {
     return nsURIHashKey::HashKey(aKey->mKey);
   }
 
@@ -107,6 +124,7 @@
 protected:
   nsCOMPtr<nsIPrincipal> mPrincipal;
   CORSMode mCORSMode;
+  ReferrerPolicy mReferrerPolicy;
 };
 
 
@@ -128,6 +146,8 @@
 };
 
 class Loader MOZ_FINAL {
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
+
 public:
   Loader();
   explicit Loader(nsIDocument*);
@@ -205,6 +225,7 @@
                          const nsAString& aMedia,
                          bool aHasAlternateRel,
                          CORSMode aCORSMode,
+                         ReferrerPolicy aReferrerPolicy,
                          nsICSSLoaderObserver* aObserver,
                          bool* aIsAlternate);
 
@@ -301,7 +322,8 @@
                      nsIPrincipal* aOriginPrincipal,
                      const nsCString& aCharset,
                      nsICSSLoaderObserver* aObserver,
-                     CORSMode aCORSMode = CORS_NONE);
+                     CORSMode aCORSMode = CORS_NONE,
+                     ReferrerPolicy aReferrerPolicy = mozilla::net::RP_Default);
 
   /**
    * Stop loading all sheets.  All nsICSSLoaderObservers involved will be
@@ -378,7 +400,7 @@
   friend class SheetLoadData;
 
   static PLDHashOperator
-  RemoveEntriesWithURI(URIPrincipalAndCORSModeHashKey* aKey,
+  RemoveEntriesWithURI(URIPrincipalReferrerPolicyAndCORSModeHashKey* aKey,
                        nsRefPtr<CSSStyleSheet>& aSheet,
                        void* aUserData);
 
@@ -397,6 +419,7 @@
                        nsIContent* aLinkingContent,
                        nsIPrincipal* aLoaderPrincipal,
                        CORSMode aCORSMode,
+                       ReferrerPolicy aReferrerPolicy,
                        bool aSyncLoad,
                        bool aHasAlternateRel,
                        const nsAString& aTitle,
@@ -429,7 +452,8 @@
                                         const nsCString& aCharset,
                                         CSSStyleSheet** aSheet,
                                         nsICSSLoaderObserver* aObserver,
-                                        CORSMode aCORSMode = CORS_NONE);
+                                        CORSMode aCORSMode = CORS_NONE,
+                                        ReferrerPolicy aReferrerPolicy = mozilla::net::RP_Default);
 
   // Post a load event for aObserver to be notified about aSheet.  The
   // notification will be sent with status NS_OK unless the load event is
@@ -473,11 +497,11 @@
                        LoadDataArray& aDatasToNotify);
 
   struct Sheets {
-    nsRefPtrHashtable<URIPrincipalAndCORSModeHashKey, CSSStyleSheet>
+    nsRefPtrHashtable<URIPrincipalReferrerPolicyAndCORSModeHashKey, CSSStyleSheet>
                       mCompleteSheets;
-    nsDataHashtable<URIPrincipalAndCORSModeHashKey, SheetLoadData*>
+    nsDataHashtable<URIPrincipalReferrerPolicyAndCORSModeHashKey, SheetLoadData*>
                       mLoadingDatas; // weak refs
-    nsDataHashtable<URIPrincipalAndCORSModeHashKey, SheetLoadData*>
+    nsDataHashtable<URIPrincipalReferrerPolicyAndCORSModeHashKey, SheetLoadData*>
                       mPendingDatas; // weak refs
   };
   nsAutoPtr<Sheets> mSheets;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/MediaQueryList.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/MediaQueryList.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/MediaQueryList.cpp	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/MediaQueryList.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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
@@ -14,9 +15,9 @@
 namespace mozilla {
 namespace dom {
 
-MediaQueryList::MediaQueryList(nsPresContext *aPresContext,
+MediaQueryList::MediaQueryList(nsIDocument *aDocument,
                                const nsAString &aMediaQueryList)
-  : mPresContext(aPresContext),
+  : mDocument(aDocument),
     mMediaList(new nsMediaList),
     mMatchesValid(false)
 {
@@ -28,7 +29,7 @@
 
 MediaQueryList::~MediaQueryList()
 {
-  if (mPresContext) {
+  if (mDocument) {
     PR_REMOVE_LINK(this);
   }
 }
@@ -36,15 +37,15 @@
 NS_IMPL_CYCLE_COLLECTION_CLASS(MediaQueryList)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(MediaQueryList)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPresContext)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCallbacks)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(MediaQueryList)
-  if (tmp->mPresContext) {
+  if (tmp->mDocument) {
     PR_REMOVE_LINK(tmp);
-    NS_IMPL_CYCLE_COLLECTION_UNLINK(mPresContext)
+    NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument)
   }
   tmp->RemoveAllListeners();
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
@@ -138,11 +139,33 @@
 void
 MediaQueryList::RecomputeMatches()
 {
-  if (!mPresContext) {
+  if (!mDocument) {
     return;
   }
 
-  mMatches = mMediaList->Matches(mPresContext, nullptr);
+  if (mDocument->GetParentDocument()) {
+    // Flush frames on the parent so our prescontext will get
+    // recreated as needed.
+    mDocument->GetParentDocument()->FlushPendingNotifications(Flush_Frames);
+    // That might have killed our document, so recheck that.
+    if (!mDocument) {
+      return;
+    }
+  }
+
+  nsIPresShell* shell = mDocument->GetShell();
+  if (!shell) {
+    // XXXbz What's the right behavior here?  Spec doesn't say.
+    return;
+  }
+
+  nsPresContext* presContext = shell->GetPresContext();
+  if (!presContext) {
+    // XXXbz What's the right behavior here?  Spec doesn't say.
+    return;
+  }
+
+  mMatches = mMediaList->Matches(presContext, nullptr);
   mMatchesValid = true;
 }
 
@@ -169,10 +192,7 @@
 nsISupports*
 MediaQueryList::GetParentObject() const
 {
-  if (!mPresContext) {
-    return nullptr;
-  }
-  return mPresContext->Document();
+  return mDocument;
 }
 
 JSObject*
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/MediaQueryList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/MediaQueryList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/MediaQueryList.h	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/MediaQueryList.h	2014-11-26 21:45:52.000000000 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 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
@@ -11,13 +12,14 @@
 #include "nsISupports.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
 #include "nsTArray.h"
 #include "prclist.h"
 #include "mozilla/Attributes.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/MediaQueryListBinding.h"
 
-class nsPresContext;
+class nsIDocument;
 class nsMediaList;
 
 namespace mozilla {
@@ -30,7 +32,7 @@
 public:
   // The caller who constructs is responsible for calling Evaluate
   // before calling any other methods.
-  MediaQueryList(nsPresContext *aPresContext,
+  MediaQueryList(nsIDocument *aDocument,
                  const nsAString &aMediaQueryList);
 private:
   ~MediaQueryList();
@@ -67,7 +69,7 @@
 private:
   void RecomputeMatches();
 
-  // We only need a pointer to the pres context to support lazy
+  // We only need a pointer to the document to support lazy
   // reevaluation following dynamic changes.  However, this lazy
   // reevaluation is perhaps somewhat important, since some usage
   // patterns may involve the creation of large numbers of
@@ -77,11 +79,11 @@
   // This pointer does make us a little more dependent on cycle
   // collection.
   //
-  // We have a non-null mPresContext for our entire lifetime except
-  // after cycle collection unlinking.  Having a non-null mPresContext
-  // is equivalent to being in that pres context's mDOMMediaQueryLists
+  // We have a non-null mDocument for our entire lifetime except
+  // after cycle collection unlinking.  Having a non-null mDocument
+  // is equivalent to being in that document's mDOMMediaQueryLists
   // linked list.
-  nsRefPtr<nsPresContext> mPresContext;
+  nsCOMPtr<nsIDocument> mDocument;
 
   nsRefPtr<nsMediaList> mMediaList;
   bool mMatches;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsAnimationManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsAnimationManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsAnimationManager.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsAnimationManager.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -11,7 +11,6 @@
 #include "mozilla/StyleAnimationValue.h"
 
 #include "nsPresContext.h"
-#include "nsRuleProcessorData.h"
 #include "nsStyleSet.h"
 #include "nsStyleChangeList.h"
 #include "nsCSSRules.h"
@@ -28,17 +27,35 @@
 using mozilla::CSSAnimationPlayer;
 
 void
-CSSAnimationPlayer::Play(UpdateFlags aUpdateFlags)
+CSSAnimationPlayer::Play()
 {
   mPauseShouldStick = false;
-  AnimationPlayer::Play(aUpdateFlags);
+  AnimationPlayer::Play();
 }
 
 void
-CSSAnimationPlayer::Pause(UpdateFlags aUpdateFlags)
+CSSAnimationPlayer::Pause()
 {
   mPauseShouldStick = true;
-  AnimationPlayer::Pause(aUpdateFlags);
+  AnimationPlayer::Pause();
+}
+
+mozilla::dom::AnimationPlayState
+CSSAnimationPlayer::PlayStateFromJS() const
+{
+  // Flush style to ensure that any properties controlling animation state
+  // (e.g. animation-play-state) are fully updated.
+  FlushStyle();
+  return AnimationPlayer::PlayStateFromJS();
+}
+
+void
+CSSAnimationPlayer::PlayFromJS()
+{
+  // Note that flushing style below might trigger calls to
+  // PlayFromStyle()/PauseFromStyle() on this object.
+  FlushStyle();
+  AnimationPlayer::PlayFromJS();
 }
 
 void
@@ -46,7 +63,7 @@
 {
   mIsStylePaused = false;
   if (!mPauseShouldStick) {
-    AnimationPlayer::Play(eNoUpdate);
+    DoPlay();
   }
 }
 
@@ -59,7 +76,7 @@
   }
 
   mIsStylePaused = true;
-  AnimationPlayer::Pause(eNoUpdate);
+  DoPause();
 }
 
 void
@@ -134,6 +151,17 @@
   }
 }
 
+CommonAnimationManager*
+CSSAnimationPlayer::GetAnimationManager() const
+{
+  nsPresContext* context = GetPresContext();
+  if (!context) {
+    return nullptr;
+  }
+
+  return context->AnimationManager();
+}
+
 /* static */ nsString
 CSSAnimationPlayer::PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType)
 {
@@ -155,7 +183,6 @@
 {
   aCollection->EnsureStyleRuleFor(aRefreshTime, aFlags);
   QueueEvents(aCollection, mPendingEvents);
-  CheckNeedsRefresh();
 }
 
 void
@@ -170,97 +197,6 @@
   }
 }
 
-AnimationPlayerCollection*
-nsAnimationManager::GetAnimationPlayers(dom::Element *aElement,
-                                        nsCSSPseudoElements::Type aPseudoType,
-                                        bool aCreateIfNeeded)
-{
-  if (!aCreateIfNeeded && PR_CLIST_IS_EMPTY(&mElementCollections)) {
-    // Early return for the most common case.
-    return nullptr;
-  }
-
-  nsIAtom *propName;
-  if (aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement) {
-    propName = nsGkAtoms::animationsProperty;
-  } else if (aPseudoType == nsCSSPseudoElements::ePseudo_before) {
-    propName = nsGkAtoms::animationsOfBeforeProperty;
-  } else if (aPseudoType == nsCSSPseudoElements::ePseudo_after) {
-    propName = nsGkAtoms::animationsOfAfterProperty;
-  } else {
-    NS_ASSERTION(!aCreateIfNeeded,
-                 "should never try to create transitions for pseudo "
-                 "other than :before or :after");
-    return nullptr;
-  }
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(aElement->GetProperty(propName));
-  if (!collection && aCreateIfNeeded) {
-    // FIXME: Consider arena-allocating?
-    collection =
-      new AnimationPlayerCollection(aElement, propName, this);
-    nsresult rv =
-      aElement->SetProperty(propName, collection,
-                            &AnimationPlayerCollection::PropertyDtor, false);
-    if (NS_FAILED(rv)) {
-      NS_WARNING("SetProperty failed");
-      delete collection;
-      return nullptr;
-    }
-    if (propName == nsGkAtoms::animationsProperty) {
-      aElement->SetMayHaveAnimations();
-    }
-
-    AddElementCollection(collection);
-  }
-
-  return collection;
-}
-
-/* virtual */ void
-nsAnimationManager::RulesMatching(ElementRuleProcessorData* aData)
-{
-  NS_ABORT_IF_FALSE(aData->mPresContext == mPresContext,
-                    "pres context mismatch");
-  nsIStyleRule *rule =
-    GetAnimationRule(aData->mElement,
-                     nsCSSPseudoElements::ePseudo_NotPseudoElement);
-  if (rule) {
-    aData->mRuleWalker->Forward(rule);
-  }
-}
-
-/* virtual */ void
-nsAnimationManager::RulesMatching(PseudoElementRuleProcessorData* aData)
-{
-  NS_ABORT_IF_FALSE(aData->mPresContext == mPresContext,
-                    "pres context mismatch");
-  if (aData->mPseudoType != nsCSSPseudoElements::ePseudo_before &&
-      aData->mPseudoType != nsCSSPseudoElements::ePseudo_after) {
-    return;
-  }
-
-  // FIXME: Do we really want to be the only thing keeping a
-  // pseudo-element alive?  I *think* the non-animation restyle should
-  // handle that, but should add a test.
-  nsIStyleRule *rule = GetAnimationRule(aData->mElement, aData->mPseudoType);
-  if (rule) {
-    aData->mRuleWalker->Forward(rule);
-  }
-}
-
-/* virtual */ void
-nsAnimationManager::RulesMatching(AnonBoxRuleProcessorData* aData)
-{
-}
-
-#ifdef MOZ_XUL
-/* virtual */ void
-nsAnimationManager::RulesMatching(XULTreeRuleProcessorData* aData)
-{
-}
-#endif
-
 /* virtual */ size_t
 nsAnimationManager::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {
@@ -701,47 +637,6 @@
   return true;
 }
 
-nsIStyleRule*
-nsAnimationManager::GetAnimationRule(mozilla::dom::Element* aElement,
-                                     nsCSSPseudoElements::Type aPseudoType)
-{
-  NS_ABORT_IF_FALSE(
-    aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
-    aPseudoType == nsCSSPseudoElements::ePseudo_before ||
-    aPseudoType == nsCSSPseudoElements::ePseudo_after,
-    "forbidden pseudo type");
-
-  if (!mPresContext->IsDynamic()) {
-    // For print or print preview, ignore animations.
-    return nullptr;
-  }
-
-  AnimationPlayerCollection* collection =
-    GetAnimationPlayers(aElement, aPseudoType, false);
-  if (!collection) {
-    return nullptr;
-  }
-
-  RestyleManager* restyleManager = mPresContext->RestyleManager();
-  if (restyleManager->SkipAnimationRules()) {
-    // During the non-animation part of processing restyles, we don't
-    // add the animation rule.
-
-    if (collection->mStyleRule && restyleManager->PostAnimationRestyles()) {
-      collection->PostRestyleForAnimation(mPresContext);
-    }
-
-    return nullptr;
-  }
-
-  NS_WARN_IF_FALSE(!collection->mNeedsRefreshes ||
-                   collection->mStyleRuleRefreshTime ==
-                     mPresContext->RefreshDriver()->MostRecentRefresh(),
-                   "should already have refreshed style rule");
-
-  return collection->mStyleRule;
-}
-
 /* virtual */ void
 nsAnimationManager::WillRefresh(mozilla::TimeStamp aTime)
 {
@@ -761,42 +656,6 @@
 }
 
 void
-nsAnimationManager::AddElementCollection(
-  AnimationPlayerCollection* aCollection)
-{
-  if (!mObservingRefreshDriver) {
-    NS_ASSERTION(
-      static_cast<AnimationPlayerCollection*>(aCollection)->mNeedsRefreshes,
-      "Added data which doesn't need refreshing?");
-    // We need to observe the refresh driver.
-    mPresContext->RefreshDriver()->AddRefreshObserver(this, Flush_Style);
-    mObservingRefreshDriver = true;
-  }
-
-  PR_INSERT_BEFORE(aCollection, &mElementCollections);
-}
-
-void
-nsAnimationManager::CheckNeedsRefresh()
-{
-  for (PRCList *l = PR_LIST_HEAD(&mElementCollections);
-       l != &mElementCollections;
-       l = PR_NEXT_LINK(l)) {
-    if (static_cast<AnimationPlayerCollection*>(l)->mNeedsRefreshes) {
-      if (!mObservingRefreshDriver) {
-        mPresContext->RefreshDriver()->AddRefreshObserver(this, Flush_Style);
-        mObservingRefreshDriver = true;
-      }
-      return;
-    }
-  }
-  if (mObservingRefreshDriver) {
-    mObservingRefreshDriver = false;
-    mPresContext->RefreshDriver()->RemoveRefreshObserver(this, Flush_Style);
-  }
-}
-
-void
 nsAnimationManager::FlushAnimations(FlushFlags aFlags)
 {
   // FIXME: check that there's at least one style rule that's not
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsAnimationManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsAnimationManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsAnimationManager.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsAnimationManager.h	2014-11-26 21:45:52.000000000 +0000
@@ -63,8 +63,11 @@
   virtual CSSAnimationPlayer*
   AsCSSAnimationPlayer() MOZ_OVERRIDE { return this; }
 
-  virtual void Play(UpdateFlags aUpdateFlags) MOZ_OVERRIDE;
-  virtual void Pause(UpdateFlags aUpdateFlags) MOZ_OVERRIDE;
+  virtual void Play() MOZ_OVERRIDE;
+  virtual void Pause() MOZ_OVERRIDE;
+
+  virtual dom::AnimationPlayState PlayStateFromJS() const MOZ_OVERRIDE;
+  virtual void PlayFromJS() MOZ_OVERRIDE;
 
   void PlayFromStyle();
   void PauseFromStyle();
@@ -75,6 +78,7 @@
 
 protected:
   virtual ~CSSAnimationPlayer() { }
+  virtual css::CommonAnimationManager* GetAnimationManager() const MOZ_OVERRIDE;
 
   static nsString PseudoTypeAsString(nsCSSPseudoElements::Type aPseudoType);
 
@@ -147,7 +151,6 @@
 public:
   explicit nsAnimationManager(nsPresContext *aPresContext)
     : mozilla::css::CommonAnimationManager(aPresContext)
-    , mObservingRefreshDriver(false)
   {
   }
 
@@ -158,17 +161,6 @@
       aContent, nsGkAtoms::animationsProperty, aProperty);
   }
 
-  // Returns true if aContent or any of its ancestors has an animation.
-  static bool ContentOrAncestorHasAnimation(nsIContent* aContent) {
-    do {
-      if (aContent->GetProperty(nsGkAtoms::animationsProperty)) {
-        return true;
-      }
-    } while ((aContent = aContent->GetParent()));
-
-    return false;
-  }
-
   void UpdateStyleAndEvents(mozilla::AnimationPlayerCollection* aEA,
                             mozilla::TimeStamp aRefreshTime,
                             mozilla::EnsureStyleRuleFlags aFlags);
@@ -176,12 +168,6 @@
                    mozilla::EventArray &aEventsToDispatch);
 
   // nsIStyleRuleProcessor (parts)
-  virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
-  virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
-  virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
-#ifdef MOZ_XUL
-  virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
-#endif
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf)
     const MOZ_MUST_OVERRIDE MOZ_OVERRIDE;
   virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
@@ -220,25 +206,19 @@
     }
   }
 
-  mozilla::AnimationPlayerCollection*
-  GetAnimationPlayers(mozilla::dom::Element *aElement,
-                      nsCSSPseudoElements::Type aPseudoType,
-                      bool aCreateIfNeeded);
-  nsIStyleRule* GetAnimationRule(mozilla::dom::Element* aElement,
-                                 nsCSSPseudoElements::Type aPseudoType);
-
 protected:
-  virtual void ElementCollectionRemoved() MOZ_OVERRIDE
-  {
-    CheckNeedsRefresh();
+  virtual nsIAtom* GetAnimationsAtom() MOZ_OVERRIDE {
+    return nsGkAtoms::animationsProperty;
+  }
+  virtual nsIAtom* GetAnimationsBeforeAtom() MOZ_OVERRIDE {
+    return nsGkAtoms::animationsOfBeforeProperty;
+  }
+  virtual nsIAtom* GetAnimationsAfterAtom() MOZ_OVERRIDE {
+    return nsGkAtoms::animationsOfAfterProperty;
+  }
+  virtual bool IsAnimationManager() MOZ_OVERRIDE {
+    return true;
   }
-  virtual void
-  AddElementCollection(mozilla::AnimationPlayerCollection* aData) MOZ_OVERRIDE;
-
-  /**
-   * Check to see if we should stop or start observing the refresh driver
-   */
-  void CheckNeedsRefresh();
 
 private:
   void BuildAnimations(nsStyleContext* aStyleContext,
@@ -257,8 +237,6 @@
   void DoDispatchEvents();
 
   mozilla::EventArray mPendingEvents;
-
-  bool mObservingRefreshDriver;
 };
 
 #endif /* !defined(nsAnimationManager_h_) */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsComputedDOMStyle.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsComputedDOMStyle.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsComputedDOMStyle.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsComputedDOMStyle.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -3147,42 +3147,27 @@
 {
   const nsStyleTextReset* textReset = StyleTextReset();
 
-  // If decoration style or color wasn't initial value, the author knew the
-  // text-decoration is a shorthand property in CSS 3.
-  // Return nullptr in such cases.
-  if (textReset->GetDecorationStyle() != NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
-    return nullptr;
-  }
-
+  bool isInitialStyle =
+    textReset->GetDecorationStyle() == NS_STYLE_TEXT_DECORATION_STYLE_SOLID;
   nscolor color;
   bool isForegroundColor;
   textReset->GetDecorationColor(color, isForegroundColor);
-  if (!isForegroundColor) {
-    return nullptr;
-  }
 
-  // Otherwise, the web pages may have been written for CSS 2.1 or earlier,
-  // i.e., text-decoration was assumed as a longhand property.  In that case,
-  // we should return computed value same as CSS 2.1 for backward compatibility.
+  if (isInitialStyle && isForegroundColor) {
+    return DoGetTextDecorationLine();
+  }
 
-  nsROCSSPrimitiveValue* val = new nsROCSSPrimitiveValue;
-  uint8_t line = textReset->mTextDecorationLine;
-  // Clear the -moz-anchor-decoration bit and the OVERRIDE_ALL bits -- we
-  // don't want these to appear in the computed style.
-  line &= ~(NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS |
-            NS_STYLE_TEXT_DECORATION_LINE_OVERRIDE_ALL);
+  nsDOMCSSValueList *valueList = GetROCSSValueList(false);
 
-  if (line == NS_STYLE_TEXT_DECORATION_LINE_NONE) {
-    val->SetIdent(eCSSKeyword_none);
-  } else {
-    nsAutoString str;
-    nsStyleUtil::AppendBitmaskCSSValue(eCSSProperty_text_decoration_line,
-      line, NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
-      NS_STYLE_TEXT_DECORATION_LINE_BLINK, str);
-    val->SetString(str);
+  valueList->AppendCSSValue(DoGetTextDecorationLine());
+  if (!isInitialStyle) {
+    valueList->AppendCSSValue(DoGetTextDecorationStyle());
+  }
+  if (!isForegroundColor) {
+    valueList->AppendCSSValue(DoGetTextDecorationColor());
   }
 
-  return val;
+  return valueList;
 }
 
 CSSValue*
@@ -5214,13 +5199,67 @@
     case nsStyleBasicShape::Type::eEllipse:
       functionName = eCSSKeyword_ellipse;
       break;
+    case nsStyleBasicShape::Type::eInset:
+      functionName = eCSSKeyword_inset;
+      break;
     default:
+      functionName = eCSSKeyword_UNKNOWN;
       NS_NOTREACHED("unexpected type");
   }
   AppendASCIItoUTF16(nsCSSKeywords::GetStringValue(functionName),
                      aString);
 }
 
+void
+nsComputedDOMStyle::BoxValuesToString(nsAString& aString,
+                                      const nsTArray<nsStyleCoord>& aBoxValues)
+{
+  NS_ABORT_IF_FALSE(aBoxValues.Length() == 4, "wrong number of box values");
+  nsAutoString value1, value2, value3, value4;
+  SetCssTextToCoord(value1, aBoxValues[0]);
+  SetCssTextToCoord(value2, aBoxValues[1]);
+  SetCssTextToCoord(value3, aBoxValues[2]);
+  SetCssTextToCoord(value4, aBoxValues[3]);
+
+  // nsROCSSPrimitiveValue do not have binary comparison operators.
+  // Compare string results instead.
+  aString.Append(value1);
+  if (value1 != value2 || value1 != value3 || value1 != value4) {
+    aString.Append(' ');
+    aString.Append(value2);
+    if (value1 != value3 || value2 != value4) {
+      aString.Append(' ');
+      aString.Append(value3);
+      if (value2 != value4) {
+        aString.Append(' ');
+        aString.Append(value4);
+      }
+    }
+  }
+}
+
+void
+nsComputedDOMStyle::BasicShapeRadiiToString(nsAString& aCssText,
+                                            const nsStyleCorners& aCorners)
+{
+  nsTArray<nsStyleCoord> horizontal, vertical;
+  nsAutoString horizontalString, verticalString;
+  NS_FOR_CSS_FULL_CORNERS(corner) {
+    horizontal.AppendElement(
+      aCorners.Get(NS_FULL_TO_HALF_CORNER(corner, false)));
+    vertical.AppendElement(
+      aCorners.Get(NS_FULL_TO_HALF_CORNER(corner, true)));
+  }
+  BoxValuesToString(horizontalString, horizontal);
+  BoxValuesToString(verticalString, vertical);
+  aCssText.Append(horizontalString);
+  if (horizontalString == verticalString) {
+    return;
+  }
+  aCssText.AppendLiteral(" / ");
+  aCssText.Append(verticalString);
+}
+
 CSSValue*
 nsComputedDOMStyle::CreatePrimitiveValueForClipPath(
   const nsStyleBasicShape* aStyleBasicShape, uint8_t aSizingBox)
@@ -5280,6 +5319,16 @@
         shapeFunctionString.Append(positionString);
         break;
       }
+      case nsStyleBasicShape::Type::eInset: {
+        BoxValuesToString(shapeFunctionString, aStyleBasicShape->Coordinates());
+        if (aStyleBasicShape->HasRadius()) {
+          shapeFunctionString.AppendLiteral(" round ");
+          nsAutoString radiiString;
+          BasicShapeRadiiToString(radiiString, aStyleBasicShape->GetRadius());
+          shapeFunctionString.Append(radiiString);
+        }
+        break;
+      }
       default:
         NS_NOTREACHED("unexpected type");
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsComputedDOMStyle.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsComputedDOMStyle.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsComputedDOMStyle.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsComputedDOMStyle.h	2014-11-26 21:45:52.000000000 +0000
@@ -591,6 +591,11 @@
   // Helper function for computing basic shape styles.
   mozilla::dom::CSSValue* CreatePrimitiveValueForClipPath(
     const nsStyleBasicShape* aStyleBasicShape, uint8_t aSizingBox);
+  void BoxValuesToString(nsAString& aString,
+                         const nsTArray<nsStyleCoord>& aBoxValues);
+  void BasicShapeRadiiToString(nsAString& aCssText,
+                               const nsStyleCorners& aCorners);
+
 
   static nsComputedStyleMap* GetComputedStyleMap();
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsComputedDOMStylePropertyList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsComputedDOMStylePropertyList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsComputedDOMStylePropertyList.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsComputedDOMStylePropertyList.h	2014-11-26 21:45:52.000000000 +0000
@@ -203,6 +203,9 @@
 COMPUTED_STYLE_PROP(text_align,                    TextAlign)
 COMPUTED_STYLE_PROP(text_combine_upright,          TextCombineUpright)
 COMPUTED_STYLE_PROP(text_decoration,               TextDecoration)
+COMPUTED_STYLE_PROP(text_decoration_color,         TextDecorationColor)
+COMPUTED_STYLE_PROP(text_decoration_line,          TextDecorationLine)
+COMPUTED_STYLE_PROP(text_decoration_style,         TextDecorationStyle)
 COMPUTED_STYLE_PROP(text_indent,                   TextIndent)
 COMPUTED_STYLE_PROP(text_orientation,              TextOrientation)
 COMPUTED_STYLE_PROP(text_overflow,                 TextOverflow)
@@ -268,9 +271,6 @@
 COMPUTED_STYLE_PROP(stack_sizing,                  StackSizing)
 COMPUTED_STYLE_PROP(_moz_tab_size,                 TabSize)
 COMPUTED_STYLE_PROP(text_align_last,               TextAlignLast)
-COMPUTED_STYLE_PROP(text_decoration_color,         TextDecorationColor)
-COMPUTED_STYLE_PROP(text_decoration_line,          TextDecorationLine)
-COMPUTED_STYLE_PROP(text_decoration_style,         TextDecorationStyle)
 COMPUTED_STYLE_PROP(text_size_adjust,              TextSizeAdjust)
 COMPUTED_STYLE_PROP(user_focus,                    UserFocus)
 COMPUTED_STYLE_PROP(user_input,                    UserInput)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSKeywordList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSKeywordList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSKeywordList.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSKeywordList.h	2014-11-26 21:45:52.000000000 +0000
@@ -195,6 +195,7 @@
 CSS_KEY(condensed, condensed)
 CSS_KEY(contain, contain)
 CSS_KEY(content-box, content_box)
+CSS_KEY(contents, contents)
 CSS_KEY(context-fill, context_fill)
 CSS_KEY(context-fill-opacity, context_fill_opacity)
 CSS_KEY(context-menu, context_menu)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSParser.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSParser.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSParser.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSParser.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -889,7 +889,9 @@
   bool ParseDirectionalBoxProperty(nsCSSProperty aProperty,
                                      int32_t aSourceType);
   bool ParseBoxCornerRadius(const nsCSSProperty aPropID);
+  bool ParseBoxCornerRadiiInternals(nsCSSValue array[]);
   bool ParseBoxCornerRadii(const nsCSSProperty aPropIDs[]);
+
   int32_t ParseChoice(nsCSSValue aValues[],
                       const nsCSSProperty aPropIDs[], int32_t aNumIDs);
   bool ParseColor(nsCSSValue& aValue);
@@ -966,6 +968,7 @@
   bool ParseBasicShape(nsCSSValue& aValue, bool* aConsumedTokens);
   bool ParsePolygonFunction(nsCSSValue& aValue);
   bool ParseCircleOrEllipseFunction(nsCSSKeyword, nsCSSValue& aValue);
+  bool ParseInsetFunction(nsCSSValue& aValue);
 
   /* Functions for transform Parsing */
   bool ParseSingleTransform(bool aIsPrefixed, nsCSSValue& aValue);
@@ -9383,7 +9386,7 @@
 }
 
 bool
-CSSParserImpl::ParseBoxCornerRadii(const nsCSSProperty aPropIDs[])
+CSSParserImpl::ParseBoxCornerRadiiInternals(nsCSSValue array[])
 {
   // Rectangles are used as scratch storage.
   // top => top-left, right => top-right,
@@ -9446,16 +9449,30 @@
     nsCSSValue& y = dimenY.*nsCSSRect::sides[side];
 
     if (x == y) {
-      AppendValue(aPropIDs[side], x);
+      array[side] = x;
     } else {
       nsCSSValue pair;
       pair.SetPairValue(x, y);
-      AppendValue(aPropIDs[side], pair);
+      array[side] = pair;
     }
   }
   return true;
 }
 
+bool
+CSSParserImpl::ParseBoxCornerRadii(const nsCSSProperty aPropIDs[])
+{
+  nsCSSValue value[4];
+  if (!ParseBoxCornerRadiiInternals(value)) {
+    return false;
+  }
+
+  NS_FOR_CSS_SIDES(side) {
+    AppendValue(aPropIDs[side], value[side]);
+  }
+  return true;
+}
+
 // These must be in CSS order (top,right,bottom,left) for indexing to work
 static const nsCSSProperty kBorderStyleIDs[] = {
   eCSSProperty_border_top_style,
@@ -13144,82 +13161,36 @@
 bool
 CSSParserImpl::ParseTextDecoration()
 {
-  enum {
-    eDecorationNone         = NS_STYLE_TEXT_DECORATION_LINE_NONE,
-    eDecorationUnderline    = NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE,
-    eDecorationOverline     = NS_STYLE_TEXT_DECORATION_LINE_OVERLINE,
-    eDecorationLineThrough  = NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
-    eDecorationBlink        = NS_STYLE_TEXT_DECORATION_LINE_BLINK,
-    eDecorationPrefAnchors  = NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS
-  };
-  static_assert((eDecorationNone ^ eDecorationUnderline ^
-                 eDecorationOverline ^ eDecorationLineThrough ^
-                 eDecorationBlink ^ eDecorationPrefAnchors) ==
-                (eDecorationNone | eDecorationUnderline |
-                 eDecorationOverline | eDecorationLineThrough |
-                 eDecorationBlink | eDecorationPrefAnchors),
-                "text decoration constants need to be bitmasks");
-
-  static const KTableValue kTextDecorationKTable[] = {
-    eCSSKeyword_none,                   eDecorationNone,
-    eCSSKeyword_underline,              eDecorationUnderline,
-    eCSSKeyword_overline,               eDecorationOverline,
-    eCSSKeyword_line_through,           eDecorationLineThrough,
-    eCSSKeyword_blink,                  eDecorationBlink,
-    eCSSKeyword__moz_anchor_decoration, eDecorationPrefAnchors,
-    eCSSKeyword_UNKNOWN,-1
+  static const nsCSSProperty kTextDecorationIDs[] = {
+    eCSSProperty_text_decoration_line,
+    eCSSProperty_text_decoration_style,
+    eCSSProperty_text_decoration_color
   };
+  const int32_t numProps = MOZ_ARRAY_LENGTH(kTextDecorationIDs);
+  nsCSSValue values[numProps];
 
-  nsCSSValue value;
-  if (!ParseVariant(value, VARIANT_HK, kTextDecorationKTable)) {
+  int32_t found = ParseChoice(values, kTextDecorationIDs, numProps);
+  if (found < 1) {
     return false;
   }
 
-  nsCSSValue line, style, color;
-  switch (value.GetUnit()) {
-    case eCSSUnit_Enumerated: {
-      // We shouldn't accept decoration line style and color via
-      // text-decoration.
-      color.SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR,
-                        eCSSUnit_Enumerated);
-      style.SetIntValue(NS_STYLE_TEXT_DECORATION_STYLE_SOLID,
-                        eCSSUnit_Enumerated);
-
-      int32_t intValue = value.GetIntValue();
-      if (intValue == eDecorationNone) {
-        line.SetIntValue(NS_STYLE_TEXT_DECORATION_LINE_NONE,
-                         eCSSUnit_Enumerated);
-        break;
-      }
-
-      // look for more keywords
-      nsCSSValue keyword;
-      int32_t index;
-      for (index = 0; index < 3; index++) {
-        if (!ParseEnum(keyword, kTextDecorationKTable)) {
-          break;
-        }
-        int32_t newValue = keyword.GetIntValue();
-        if (newValue == eDecorationNone || newValue & intValue) {
-          // 'none' keyword in conjuction with others is not allowed, and
-          // duplicate keyword is not allowed.
-          return false;
-        }
-        intValue |= newValue;
-      }
-
-      line.SetIntValue(intValue, eCSSUnit_Enumerated);
-      break;
-    }
-    default:
-      line = color = style = value;
-      break;
+  // Provide default values
+  if ((found & 1) == 0) { // Provide default text-decoration-line
+    values[0].SetIntValue(NS_STYLE_TEXT_DECORATION_LINE_NONE,
+                          eCSSUnit_Enumerated);
+  }
+  if ((found & 2) == 0) { // Provide default text-decoration-style
+    values[1].SetIntValue(NS_STYLE_TEXT_DECORATION_STYLE_SOLID,
+                          eCSSUnit_Enumerated);
+  }
+  if ((found & 4) == 0) { // Provide default text-decoration-color
+    values[2].SetIntValue(NS_STYLE_COLOR_MOZ_USE_TEXT_COLOR,
+                          eCSSUnit_Enumerated);
   }
 
-  AppendValue(eCSSProperty_text_decoration_line, line);
-  AppendValue(eCSSProperty_text_decoration_color, color);
-  AppendValue(eCSSProperty_text_decoration_style, style);
-
+  for (int32_t index = 0; index < numProps; index++) {
+    AppendValue(kTextDecorationIDs[index], values[index]);
+  }
   return true;
 }
 
@@ -13274,6 +13245,19 @@
 bool
 CSSParserImpl::ParseTextDecorationLine(nsCSSValue& aValue)
 {
+  static_assert((NS_STYLE_TEXT_DECORATION_LINE_NONE ^
+                 NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE ^
+                 NS_STYLE_TEXT_DECORATION_LINE_OVERLINE ^
+                 NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH ^
+                 NS_STYLE_TEXT_DECORATION_LINE_BLINK ^
+                 NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS) ==
+                (NS_STYLE_TEXT_DECORATION_LINE_NONE |
+                 NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE |
+                 NS_STYLE_TEXT_DECORATION_LINE_OVERLINE |
+                 NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH |
+                 NS_STYLE_TEXT_DECORATION_LINE_BLINK |
+                 NS_STYLE_TEXT_DECORATION_LINE_PREF_ANCHORS),
+                "text decoration constants need to be bitmasks");
   if (ParseVariant(aValue, VARIANT_HK, nsCSSProps::kTextDecorationLineKTable)) {
     if (eCSSUnit_Enumerated == aValue.GetUnit()) {
       int32_t intValue = aValue.GetIntValue();
@@ -13921,6 +13905,49 @@
 }
 
 bool
+CSSParserImpl::ParseInsetFunction(nsCSSValue& aValue)
+{
+  nsRefPtr<nsCSSValue::Array> functionArray =
+    aValue.InitFunction(eCSSKeyword_inset, 5);
+
+  if (ParseVariant(functionArray->Item(1), VARIANT_LPCALC, nullptr)) {
+    // Consume up to 4, but only require one.
+    ParseVariant(functionArray->Item(2), VARIANT_LPCALC, nullptr) &&
+    ParseVariant(functionArray->Item(3), VARIANT_LPCALC, nullptr) &&
+    ParseVariant(functionArray->Item(4), VARIANT_LPCALC, nullptr);
+  } else {
+    REPORT_UNEXPECTED_TOKEN(PEExpectedShapeArg);
+    SkipUntil(')');
+    return false;
+  }
+
+  if (!ExpectSymbol(')', true)) {
+    if (!GetToken(true)) {
+      NS_NOTREACHED("ExpectSymbol should have returned true");
+      return false;
+    }
+
+    nsRefPtr<nsCSSValue::Array> radiusArray = nsCSSValue::Array::Create(4);
+    functionArray->Item(5).SetArrayValue(radiusArray, eCSSUnit_Array);
+    if (mToken.mType != eCSSToken_Ident ||
+        !mToken.mIdent.LowerCaseEqualsLiteral("round") ||
+        !ParseBoxCornerRadiiInternals(radiusArray->ItemStorage())) {
+      REPORT_UNEXPECTED_TOKEN(PEExpectedRadius);
+      SkipUntil(')');
+      return false;
+    }
+
+    if (!ExpectSymbol(')', true)) {
+      REPORT_UNEXPECTED_TOKEN(PEExpectedCloseParen);
+      SkipUntil(')');
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool
 CSSParserImpl::ParseBasicShape(nsCSSValue& aValue, bool* aConsumedTokens)
 {
   if (!GetToken(true)) {
@@ -13941,6 +13968,8 @@
   case eCSSKeyword_circle:
   case eCSSKeyword_ellipse:
     return ParseCircleOrEllipseFunction(keyword, aValue);
+  case eCSSKeyword_inset:
+    return ParseInsetFunction(aValue);
   default:
     return false;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSPropAliasList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSPropAliasList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSPropAliasList.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSPropAliasList.h	2014-11-26 21:45:52.000000000 +0000
@@ -127,3 +127,15 @@
                font_language_override,
                MozFontLanguageOverride,
                "layout.css.prefixes.font-features")
+CSS_PROP_ALIAS(-moz-text-decoration-color,
+               text_decoration_color,
+               MozTextDecorationColor,
+               "")
+CSS_PROP_ALIAS(-moz-text-decoration-line,
+               text_decoration_line,
+               MozTextDecorationLine,
+               "")
+CSS_PROP_ALIAS(-moz-text-decoration-style,
+               text_decoration_style,
+               MozTextDecorationStyle,
+               "")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSPropList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSPropList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSPropList.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSPropList.h	2014-11-26 21:45:52.000000000 +0000
@@ -3045,9 +3045,9 @@
     offsetof(nsStyleText, mTextCombineUpright),
     eStyleAnimType_EnumU8)
 CSS_PROP_TEXTRESET(
-    -moz-text-decoration-color,
+    text-decoration-color,
     text_decoration_color,
-    CSS_PROP_DOMPROP_PREFIXED(TextDecorationColor),
+    TextDecorationColor,
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
         CSS_PROPERTY_APPLIES_TO_PLACEHOLDER |
@@ -3058,9 +3058,9 @@
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_Custom)
 CSS_PROP_TEXTRESET(
-    -moz-text-decoration-line,
+    text-decoration-line,
     text_decoration_line,
-    CSS_PROP_DOMPROP_PREFIXED(TextDecorationLine),
+    TextDecorationLine,
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_VALUE_PARSER_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
@@ -3071,9 +3071,9 @@
     offsetof(nsStyleTextReset, mTextDecorationLine),
     eStyleAnimType_EnumU8)
 CSS_PROP_TEXTRESET(
-    -moz-text-decoration-style,
+    text-decoration-style,
     text_decoration_style,
-    CSS_PROP_DOMPROP_PREFIXED(TextDecorationStyle),
+    TextDecorationStyle,
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
         CSS_PROPERTY_APPLIES_TO_PLACEHOLDER,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSProps.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSProps.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSProps.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSProps.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -1120,6 +1120,9 @@
   eCSSKeyword_ruby_base_container, NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER,
   eCSSKeyword_ruby_text,           NS_STYLE_DISPLAY_RUBY_TEXT,
   eCSSKeyword_ruby_text_container, NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER,
+  // The next entry is controlled by the layout.css.display-contents.enabled
+  // pref.
+  eCSSKeyword_contents,            NS_STYLE_DISPLAY_CONTENTS,
   eCSSKeyword_UNKNOWN,-1
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSProps.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSProps.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSProps.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSProps.h	2014-11-26 21:45:52.000000000 +0000
@@ -564,8 +564,8 @@
   static const KTableValue kControlCharacterVisibilityKTable[];
   static const KTableValue kCursorKTable[];
   static const KTableValue kDirectionKTable[];
-  // Not const because we modify its entries when the pref
-  // "layout.css.grid.enabled" changes:
+  // Not const because we modify its entries when various 
+  // "layout.css.*.enabled" prefs changes:
   static KTableValue kDisplayKTable[];
   static const KTableValue kElevationKTable[];
   static const KTableValue kEmptyCellsKTable[];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSRuleProcessor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSRuleProcessor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSRuleProcessor.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSRuleProcessor.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -53,6 +53,8 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/Likely.h"
+#include "mozilla/TypedEnum.h"
+#include "mozilla/TypedEnumBits.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -1429,6 +1431,30 @@
   }
 };
 
+/**
+ * Additional information about a selector (without combinators) that is
+ * being matched.
+ */
+MOZ_BEGIN_ENUM_CLASS(SelectorMatchesFlags, uint8_t)
+  NONE = 0,
+
+  // The selector's flags are unknown.  This happens when you don't know
+  // if you're starting from the top of a selector.  Only used in cases
+  // where it's acceptable for matching to return a false positive.
+  // (It's not OK to return a false negative.)
+  UNKNOWN = 1 << 0,
+
+  // The selector is part of a compound selector which has been split in
+  // half, where the other half is a pseudo-element.  The current
+  // selector is not a pseudo-element itself.
+  HAS_PSEUDO_ELEMENT = 1 << 1,
+
+  // The selector is part of an argument to a functional pseudo-class or
+  // pseudo-element.
+  IS_PSEUDO_CLASS_ARGUMENT = 1 << 2
+MOZ_END_ENUM_CLASS(SelectorMatchesFlags)
+MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(SelectorMatchesFlags)
+
 static bool ValueIncludes(const nsSubstring& aValueList,
                             const nsSubstring& aValue,
                             const nsStringComparator& aComparator)
@@ -1458,18 +1484,33 @@
   return false;
 }
 
-// Return whether we should apply a "global" (i.e., universal-tag)
-// selector for event states in quirks mode.  Note that
-// |IsLink()| is checked separately by the caller, so we return
-// false for |nsGkAtoms::a|, which here means a named anchor.
-inline bool IsQuirkEventSensitive(nsIAtom *aContentTag)
-{
-  return bool ((nsGkAtoms::button == aContentTag) ||
-                 (nsGkAtoms::img == aContentTag)    ||
-                 (nsGkAtoms::input == aContentTag)  ||
-                 (nsGkAtoms::label == aContentTag)  ||
-                 (nsGkAtoms::select == aContentTag) ||
-                 (nsGkAtoms::textarea == aContentTag));
+// Return whether the selector matches conditions for the :active and
+// :hover quirk.
+static inline bool ActiveHoverQuirkMatches(nsCSSSelector* aSelector,
+                                           SelectorMatchesFlags aSelectorFlags)
+{
+  if (aSelector->HasTagSelector() || aSelector->mAttrList ||
+      aSelector->mIDList || aSelector->mClassList ||
+      aSelector->IsPseudoElement() ||
+      // Having this quirk means that some selectors will no longer match,
+      // so it's better to return false when we aren't sure (i.e., the
+      // flags are unknown).
+      aSelectorFlags & (SelectorMatchesFlags::UNKNOWN |
+                        SelectorMatchesFlags::HAS_PSEUDO_ELEMENT |
+                        SelectorMatchesFlags::IS_PSEUDO_CLASS_ARGUMENT)) {
+    return false;
+  }
+
+  // No pseudo-class other than :active and :hover.
+  for (nsPseudoClassList* pseudoClass = aSelector->mPseudoClassList;
+       pseudoClass; pseudoClass = pseudoClass->mNext) {
+    if (pseudoClass->mType != nsCSSPseudoClasses::ePseudoClass_hover &&
+        pseudoClass->mType != nsCSSPseudoClasses::ePseudoClass_active) {
+      return false;
+    }
+  }
+
+  return true;
 }
 
 
@@ -1666,6 +1707,7 @@
                      nsCSSSelector* aSelector,
                      NodeMatchContext& aNodeMatchContext,
                      TreeMatchContext& aTreeMatchContext,
+                     SelectorMatchesFlags aSelectorFlags,
                      bool* const aDependence,
                      EventStates aStatesToCheck)
 {
@@ -1673,24 +1715,14 @@
                   "should only need to call StateSelectorMatches if "
                   "aStatesToCheck is not empty");
 
-  const bool isNegated = aDependence != nullptr;
-
   // Bit-based pseudo-classes
-  if (aStatesToCheck.HasAtLeastOneOfStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE) &&
+  if (aStatesToCheck.HasAtLeastOneOfStates(NS_EVENT_STATE_ACTIVE |
+                                           NS_EVENT_STATE_HOVER) &&
       aTreeMatchContext.mCompatMode == eCompatibility_NavQuirks &&
-      // global selector:
-      !aSelector->HasTagSelector() && !aSelector->mIDList &&
-      !aSelector->mClassList && !aSelector->mAttrList &&
-      // This (or the other way around) both make :not() asymmetric
-      // in quirks mode (and it's hard to work around since we're
-      // testing the current mNegations, not the first
-      // (unnegated)). This at least makes it closer to the spec.
-      !isNegated &&
-      // important for |IsQuirkEventSensitive|:
-      aElement->IsHTML() && !nsCSSRuleProcessor::IsLink(aElement) &&
-      !IsQuirkEventSensitive(aElement->Tag())) {
-    // In quirks mode, only make certain elements sensitive to
-    // selectors ":hover" and ":active".
+      ActiveHoverQuirkMatches(aSelector, aSelectorFlags) &&
+      aElement->IsHTML() && !nsCSSRuleProcessor::IsLink(aElement)) {
+    // In quirks mode, only make links sensitive to selectors ":active"
+    // and ":hover".
     return false;
   }
 
@@ -1723,14 +1755,16 @@
 StateSelectorMatches(Element* aElement,
                      nsCSSSelector* aSelector,
                      NodeMatchContext& aNodeMatchContext,
-                     TreeMatchContext& aTreeMatchContext)
+                     TreeMatchContext& aTreeMatchContext,
+                     SelectorMatchesFlags aSelectorFlags)
 {
   for (nsPseudoClassList* pseudoClass = aSelector->mPseudoClassList;
        pseudoClass; pseudoClass = pseudoClass->mNext) {
     EventStates statesToCheck = sPseudoClassStates[pseudoClass->mType];
     if (!statesToCheck.IsEmpty() &&
         !StateSelectorMatches(aElement, aSelector, aNodeMatchContext,
-                              aTreeMatchContext, nullptr, statesToCheck)) {
+                              aTreeMatchContext, aSelectorFlags, nullptr,
+                              statesToCheck)) {
       return false;
     }
   }
@@ -1743,11 +1777,11 @@
 //  * what it points to should be set to true whenever a test is skipped
 //    because of aNodeMatchContent.mStateMask
 static bool SelectorMatches(Element* aElement,
-                              nsCSSSelector* aSelector,
-                              NodeMatchContext& aNodeMatchContext,
-                              TreeMatchContext& aTreeMatchContext,
-                              bool* const aDependence = nullptr)
-
+                            nsCSSSelector* aSelector,
+                            NodeMatchContext& aNodeMatchContext,
+                            TreeMatchContext& aTreeMatchContext,
+                            SelectorMatchesFlags aSelectorFlags,
+                            bool* const aDependence = nullptr)
 {
   NS_PRECONDITION(!aSelector->IsPseudoElement(),
                   "Pseudo-element snuck into SelectorMatches?");
@@ -1962,8 +1996,9 @@
             nsCSSSelector *s = l->mSelectors;
             NS_ABORT_IF_FALSE(!s->mNext && !s->IsPseudoElement(),
                               "parser failed");
-            if (SelectorMatches(aElement, s, aNodeMatchContext,
-                                aTreeMatchContext)) {
+            if (SelectorMatches(
+                  aElement, s, aNodeMatchContext, aTreeMatchContext,
+                  SelectorMatchesFlags::IS_PSEUDO_CLASS_ARGUMENT)) {
               break;
             }
           }
@@ -2225,7 +2260,7 @@
       }
     } else {
       if (!StateSelectorMatches(aElement, aSelector, aNodeMatchContext,
-                                aTreeMatchContext, aDependence,
+                                aTreeMatchContext, aSelectorFlags, aDependence,
                                 statesToCheck)) {
         return false;
       }
@@ -2315,7 +2350,9 @@
          result && negation; negation = negation->mNegations) {
       bool dependence = false;
       result = !SelectorMatches(aElement, negation, aNodeMatchContext,
-                                aTreeMatchContext, &dependence);
+                                aTreeMatchContext,
+                                SelectorMatchesFlags::IS_PSEUDO_CLASS_ARGUMENT,
+                                &dependence);
       // If the selector does match due to the dependence on
       // aNodeMatchContext.mStateMask, then we want to keep result true
       // so that the final result of SelectorMatches is true.  Doing so
@@ -2423,7 +2460,8 @@
       aLookForRelevantLink = false;
       aTreeMatchContext.SetHaveRelevantLink();
     }
-    if (SelectorMatches(element, selector, nodeContext, aTreeMatchContext)) {
+    if (SelectorMatches(element, selector, nodeContext, aTreeMatchContext,
+                        SelectorMatchesFlags::NONE)) {
       // to avoid greedy matching, we need to recur if this is a
       // descendant or general sibling combinator and the next
       // combinator is different, but we can make an exception for
@@ -2505,13 +2543,19 @@
       return;
     }
     if (!StateSelectorMatches(pdata->mPseudoElement, aSelector, nodeContext,
-                              data->mTreeMatchContext)) {
+                              data->mTreeMatchContext,
+                              SelectorMatchesFlags::NONE)) {
       return;
     }
     selector = selector->mNext;
   }
+
+  SelectorMatchesFlags selectorFlags = SelectorMatchesFlags::NONE;
+  if (aSelector->IsPseudoElement()) {
+    selectorFlags |= SelectorMatchesFlags::HAS_PSEUDO_ELEMENT;
+  }
   if (SelectorMatches(data->mElement, selector, nodeContext,
-                      data->mTreeMatchContext)) {
+                      data->mTreeMatchContext, selectorFlags)) {
     nsCSSSelector *next = selector->mNext;
     if (!next || SelectorMatchesTree(data->mElement, next,
                                      data->mTreeMatchContext,
@@ -2656,6 +2700,7 @@
       }
 
       nsRestyleHint possibleChange = RestyleHintForOp(selector->mOperator);
+      SelectorMatchesFlags selectorFlags = SelectorMatchesFlags::UNKNOWN;
 
       // If hint already includes all the bits of possibleChange,
       // don't bother calling SelectorMatches, since even if it returns false
@@ -2685,9 +2730,9 @@
           (!isPseudoElement ||
            StateSelectorMatches(aStatefulElement, selectorForPseudo,
                                 nodeContext, aData->mTreeMatchContext,
-                                nullptr, aStateMask)) &&
+                                selectorFlags, nullptr, aStateMask)) &&
           SelectorMatches(aData->mElement, selector, nodeContext,
-                          aData->mTreeMatchContext) &&
+                          aData->mTreeMatchContext, selectorFlags) &&
           SelectorMatchesTree(aData->mElement, selector->mNext,
                               aData->mTreeMatchContext,
                               false))
@@ -2754,7 +2799,7 @@
   NodeMatchContext nodeContext(EventStates(), false);
   if ((possibleChange & ~(aData->change)) &&
       SelectorMatches(data->mElement, aSelector, nodeContext,
-                      data->mTreeMatchContext) &&
+                      data->mTreeMatchContext, SelectorMatchesFlags::UNKNOWN) &&
       SelectorMatchesTree(data->mElement, aSelector->mNext,
                           data->mTreeMatchContext, false)) {
     aData->change = nsRestyleHint(aData->change | possibleChange);
@@ -3571,7 +3616,8 @@
     NS_ASSERTION(sel, "Should have *some* selectors");
     NS_ASSERTION(!sel->IsPseudoElement(), "Shouldn't have been called");
     NodeMatchContext nodeContext(EventStates(), false);
-    if (SelectorMatches(aElement, sel, nodeContext, aTreeMatchContext)) {
+    if (SelectorMatches(aElement, sel, nodeContext, aTreeMatchContext,
+                        SelectorMatchesFlags::NONE)) {
       nsCSSSelector* next = sel->mNext;
       if (!next ||
           SelectorMatchesTree(aElement, next, aTreeMatchContext, false)) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSValue.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSValue.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSValue.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSValue.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -904,6 +904,108 @@
                                     aResult, aSerialization);
 }
 
+// Helper to append |aString| with the shorthand sides notation used in e.g.
+// 'padding'. |aProperties| and |aValues| are expected to have 4 elements.
+/*static*/ void
+nsCSSValue::AppendSidesShorthandToString(const nsCSSProperty aProperties[],
+                                         const nsCSSValue* aValues[],
+                                         nsAString& aString,
+                                         nsCSSValue::Serialization
+                                            aSerialization)
+{
+  const nsCSSValue& value1 = *aValues[0];
+  const nsCSSValue& value2 = *aValues[1];
+  const nsCSSValue& value3 = *aValues[2];
+  const nsCSSValue& value4 = *aValues[3];
+
+  NS_ABORT_IF_FALSE(value1.GetUnit() != eCSSUnit_Null, "null value 1");
+  value1.AppendToString(aProperties[0], aString, aSerialization);
+  if (value1 != value2 || value1 != value3 || value1 != value4) {
+    aString.Append(char16_t(' '));
+    NS_ABORT_IF_FALSE(value2.GetUnit() != eCSSUnit_Null, "null value 2");
+    value2.AppendToString(aProperties[1], aString, aSerialization);
+    if (value1 != value3 || value2 != value4) {
+      aString.Append(char16_t(' '));
+      NS_ABORT_IF_FALSE(value3.GetUnit() != eCSSUnit_Null, "null value 3");
+      value3.AppendToString(aProperties[2], aString, aSerialization);
+      if (value2 != value4) {
+        aString.Append(char16_t(' '));
+        NS_ABORT_IF_FALSE(value4.GetUnit() != eCSSUnit_Null, "null value 4");
+        value4.AppendToString(aProperties[3], aString, aSerialization);
+      }
+    }
+  }
+}
+
+/*static*/ void
+nsCSSValue::AppendBasicShapeRadiusToString(const nsCSSProperty aProperties[],
+                                           const nsCSSValue* aValues[],
+                                           nsAString& aResult,
+                                           Serialization aSerialization)
+{
+  bool needY = false;
+  const nsCSSValue* xVals[4];
+  const nsCSSValue* yVals[4];
+  for (int i = 0; i < 4; i++) {
+    if (aValues[i]->GetUnit() == eCSSUnit_Pair) {
+      needY = true;
+      xVals[i] = &aValues[i]->GetPairValue().mXValue;
+      yVals[i] = &aValues[i]->GetPairValue().mYValue;
+    } else {
+      xVals[i] = yVals[i] = aValues[i];
+    }
+  }
+
+  AppendSidesShorthandToString(aProperties, xVals, aResult, aSerialization);
+  if (needY) {
+    aResult.AppendLiteral(" / ");
+    AppendSidesShorthandToString(aProperties, yVals, aResult, aSerialization);
+  }
+}
+
+void
+nsCSSValue::AppendInsetToString(nsCSSProperty aProperty, nsAString& aResult,
+                                Serialization aSerialization) const
+{
+  const nsCSSValue::Array* array = GetArrayValue();
+  NS_ABORT_IF_FALSE(array->Count() == 6,
+                    "inset function has wrong number of arguments");
+  if (array->Item(1).GetUnit() != eCSSUnit_Null) {
+    array->Item(1).AppendToString(aProperty, aResult, aSerialization);
+    if (array->Item(2).GetUnit() != eCSSUnit_Null) {
+      aResult.Append(' ');
+      array->Item(2).AppendToString(aProperty, aResult, aSerialization);
+      if (array->Item(3).GetUnit() != eCSSUnit_Null) {
+        aResult.Append(' ');
+        array->Item(3).AppendToString(aProperty, aResult, aSerialization);
+        if (array->Item(4).GetUnit() != eCSSUnit_Null) {
+          aResult.Append(' ');
+          array->Item(4).AppendToString(aProperty, aResult, aSerialization);
+        }
+      }
+    }
+  }
+
+  if (array->Item(5).GetUnit() == eCSSUnit_Array) {
+    const nsCSSProperty* subprops =
+      nsCSSProps::SubpropertyEntryFor(eCSSProperty_border_radius);
+    const nsCSSValue::Array* radius = array->Item(5).GetArrayValue();
+    NS_ABORT_IF_FALSE(radius->Count() == 4, "expected 4 radii values");
+    const nsCSSValue* vals[4] = {
+      &(radius->Item(0)),
+      &(radius->Item(1)),
+      &(radius->Item(2)),
+      &(radius->Item(3))
+    };
+    aResult.AppendLiteral(" round ");
+    AppendBasicShapeRadiusToString(subprops, vals, aResult,
+                                   aSerialization);
+  } else {
+    NS_ABORT_IF_FALSE(array->Item(5).GetUnit() == eCSSUnit_Null,
+                      "unexpected value");
+  }
+}
+
 void
 nsCSSValue::AppendToString(nsCSSProperty aProperty, nsAString& aResult,
                            Serialization aSerialization) const
@@ -1049,6 +1151,10 @@
                                       aSerialization);
         break;
 
+      case eCSSKeyword_inset:
+        AppendInsetToString(aProperty, aResult, aSerialization);
+        break;
+
       default: {
         // Now, step through the function contents, writing each of
         // them as we go.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSValue.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSValue.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsCSSValue.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsCSSValue.h	2014-11-26 21:45:52.000000000 +0000
@@ -714,6 +714,16 @@
 
   size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
+  static void
+  AppendSidesShorthandToString(const nsCSSProperty aProperties[],
+                               const nsCSSValue* aValues[],
+                               nsAString& aString,
+                               Serialization aSerialization);
+  static void
+  AppendBasicShapeRadiusToString(const nsCSSProperty aProperties[],
+                                 const nsCSSValue* aValues[],
+                                 nsAString& aResult,
+                                 Serialization aValueSerialization);
 private:
   static const char16_t* GetBufferValue(nsStringBuffer* aBuffer) {
     return static_cast<char16_t*>(aBuffer->Data());
@@ -729,6 +739,8 @@
            nsCSSKeyword aFunctionId,
            nsCSSProperty aProperty, nsAString& aResult,
            Serialization aValueSerialization) const;
+  void AppendInsetToString(nsCSSProperty aProperty, nsAString& aResult,
+                           Serialization aValueSerialization) const;
 protected:
   nsCSSUnit mUnit;
   union {
@@ -779,6 +791,11 @@
 
   size_t Count() const { return mCount; }
 
+  // callers depend on the items being contiguous
+  nsCSSValue* ItemStorage() {
+    return this->First();
+  }
+
   bool operator==(const Array& aOther) const
   {
     if (mCount != aOther.mCount)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsLayoutStylesheetCache.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsLayoutStylesheetCache.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsLayoutStylesheetCache.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsLayoutStylesheetCache.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -114,6 +114,12 @@
 nsLayoutStylesheetCache::UASheet()
 {
   EnsureGlobal();
+
+  if (!gStyleCache->mUASheet) {
+    LoadSheetURL("resource://gre-resources/ua.css",
+                 gStyleCache->mUASheet, true);
+  }
+
   return gStyleCache->mUASheet;
 }
 
@@ -258,13 +264,12 @@
                mQuirkSheet, true);
   LoadSheetURL("resource://gre/res/svg.css",
                mSVGSheet, true);
-  LoadSheetURL("resource://gre-resources/ua.css",
-               mUASheet, true);
   LoadSheetURL("chrome://global/content/xul.css",
                mXULSheet, true);
 
-  // The remaining sheets are created on-demand since their use is rarer. This
-  // helps save memory for Firefox OS apps.
+  // The remaining sheets are created on-demand do to their use being rarer
+  // (which helps save memory for Firefox OS apps) or because they need to
+  // be re-loadable in DependentPrefChanged.
 }
 
 nsLayoutStylesheetCache::~nsLayoutStylesheetCache()
@@ -292,6 +297,13 @@
 
   Preferences::AddBoolVarCache(&sNumberControlEnabled, NUMBER_CONTROL_PREF,
                                true);
+
+  // For each pref that controls a CSS feature that a UA style sheet depends
+  // on (such as a pref that enables a property that a UA style sheet uses),
+  // register DependentPrefChanged as a callback to ensure that the relevant
+  // style sheets will be re-parsed.
+  Preferences::RegisterCallback(&DependentPrefChanged,
+                                "layout.css.ruby.enabled");
 }
 
 void
@@ -390,6 +402,31 @@
   }
 }
 
+/* static */ void
+nsLayoutStylesheetCache::InvalidateSheet(nsRefPtr<CSSStyleSheet>& aSheet)
+{
+  MOZ_ASSERT(gCSSLoader, "pref changed before we loaded a sheet?");
+
+  if (aSheet) {
+    gCSSLoader->ObsoleteSheet(aSheet->GetSheetURI());
+    aSheet = nullptr;
+  }
+}
+
+/* static */ void
+nsLayoutStylesheetCache::DependentPrefChanged(const char* aPref, void* aData)
+{
+  MOZ_ASSERT(gStyleCache, "pref changed after shutdown?");
+
+  // Cause any UA style sheets whose parsing depends on the value of prefs
+  // to be re-parsed by dropping the sheet from gCSSLoader's cache then
+  // setting our cached sheet pointer to null.  This will only work for sheets
+  // that are loaded lazily.
+
+  // for layout.css.ruby.enabled
+  InvalidateSheet(gStyleCache->mUASheet);
+}
+
 mozilla::StaticRefPtr<nsLayoutStylesheetCache>
 nsLayoutStylesheetCache::gStyleCache;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsLayoutStylesheetCache.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsLayoutStylesheetCache.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsLayoutStylesheetCache.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsLayoutStylesheetCache.h	2014-11-26 21:45:52.000000000 +0000
@@ -67,6 +67,8 @@
                             nsRefPtr<mozilla::CSSStyleSheet>& aSheet);
   static void LoadSheet(nsIURI* aURI, nsRefPtr<mozilla::CSSStyleSheet>& aSheet,
                         bool aEnableUnsafeRules);
+  static void InvalidateSheet(nsRefPtr<mozilla::CSSStyleSheet>& aSheet);
+  static void DependentPrefChanged(const char* aPref, void* aData);
 
   static mozilla::StaticRefPtr<nsLayoutStylesheetCache> gStyleCache;
   static mozilla::css::Loader* gCSSLoader;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsRuleNode.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsRuleNode.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsRuleNode.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsRuleNode.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -126,6 +126,7 @@
 
 
 // EnsureBlockDisplay:
+// Never change display:none or display:contents *ever*, otherwise:
 //  - if the display value (argument) is not a block-type
 //    then we set it to a valid block display value
 //  - For enforcing the floated/positioned element CSS2 rules
@@ -149,7 +150,8 @@
       break;
     } // else, fall through to share the 'break' for non-changing display vals
   case NS_STYLE_DISPLAY_NONE :
-    // never change display:none *ever*
+  case NS_STYLE_DISPLAY_CONTENTS :
+    // never change display:none or display:contents *ever*
   case NS_STYLE_DISPLAY_TABLE :
   case NS_STYLE_DISPLAY_BLOCK :
   case NS_STYLE_DISPLAY_FLEX :
@@ -3387,7 +3389,7 @@
       (LookAndFeel::FontID)systemFontValue->GetIntValue();
     float devPerCSS =
       (float)nsPresContext::AppUnitsPerCSSPixel() /
-      aPresContext->DeviceContext()->UnscaledAppUnitsPerDevPixel();
+      aPresContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
     nsAutoString systemFontName;
     if (LookAndFeel::GetFont(fontID, systemFontName, fontStyle, devPerCSS)) {
       systemFontName.Trim("\"'");
@@ -3398,9 +3400,10 @@
       systemFont.weight = fontStyle.weight;
       systemFont.stretch = fontStyle.stretch;
       systemFont.decorations = NS_FONT_DECORATION_NONE;
-      systemFont.size = NSFloatPixelsToAppUnits(fontStyle.size,
-                                                aPresContext->DeviceContext()->
-                                                UnscaledAppUnitsPerDevPixel());
+      systemFont.size =
+        NSFloatPixelsToAppUnits(fontStyle.size,
+                                aPresContext->DeviceContext()->
+                                  AppUnitsPerDevPixelAtUnitFullZoom());
       //systemFont.langGroup = fontStyle.langGroup;
       systemFont.sizeAdjust = fontStyle.sizeAdjust;
 
@@ -5559,7 +5562,22 @@
     // and 'position'.  Since generated content can't be floated or
     // positioned, we can deal with it here.
 
-    if (nsCSSPseudoElements::firstLetter == aContext->GetPseudo()) {
+    nsIAtom* pseudo = aContext->GetPseudo();
+    if (pseudo && display->mDisplay == NS_STYLE_DISPLAY_CONTENTS) {
+      // We don't want to create frames for anonymous content using a parent
+      // frame that is for content above the root of the anon tree.
+      // (XXX what we really should check here is not GetPseudo() but if there's
+      //  a 'content' property value that implies anon content but we can't
+      //  check that here since that's a different struct(?))
+      // We might get display:contents to work for CSS_PSEUDO_ELEMENT_CONTAINS_ELEMENTS
+      // pseudos (:first-letter etc) in the future, but those have a lot of
+      // special handling in frame construction so they are also unsupported
+      // for now.
+      display->mOriginalDisplay = display->mDisplay = NS_STYLE_DISPLAY_INLINE;
+      canStoreInRuleTree = false;
+    }
+
+    if (nsCSSPseudoElements::firstLetter == pseudo) {
       // a non-floating first-letter must be inline
       // XXX this fix can go away once bug 103189 is fixed correctly
       // Note that we reset mOriginalDisplay to enforce the invariant that it equals mDisplay if we're not positioned or floating.
@@ -8833,8 +8851,8 @@
           basicShape->SetFillRule(shapeFunction->Item(j).GetIntValue());
           ++j;
         }
-        int32_t mask = SETCOORD_PERCENT | SETCOORD_LENGTH |
-                       SETCOORD_STORE_CALC;
+        const int32_t mask = SETCOORD_PERCENT | SETCOORD_LENGTH |
+                             SETCOORD_STORE_CALC;
         const nsCSSValuePairList* curPair =
           shapeFunction->Item(j).GetPairListValue();
         nsTArray<nsStyleCoord>& coordinates = basicShape->Coordinates();
@@ -8861,8 +8879,8 @@
                                        nsStyleBasicShape::eEllipse;
         NS_ABORT_IF_FALSE(!basicShape, "did not expect value");
         basicShape = new nsStyleBasicShape(type);
-        int32_t mask = SETCOORD_PERCENT | SETCOORD_LENGTH |
-                       SETCOORD_STORE_CALC | SETCOORD_ENUMERATED;
+        const int32_t mask = SETCOORD_PERCENT | SETCOORD_LENGTH |
+                             SETCOORD_STORE_CALC | SETCOORD_ENUMERATED;
         size_t count = type == nsStyleBasicShape::eCircle ? 2 : 3;
         NS_ABORT_IF_FALSE(shapeFunction->Count() == count + 1,
                           "unexpected arguments count");
@@ -8894,8 +8912,66 @@
             NS_ABORT_IF_FALSE(positionVal.GetUnit() == eCSSUnit_Null,
                               "expected no value");
         }
+      } else if (functionName == eCSSKeyword_inset) {
+        NS_ABORT_IF_FALSE(!basicShape, "did not expect value");
+        basicShape = new nsStyleBasicShape(nsStyleBasicShape::eInset);
+        NS_ABORT_IF_FALSE(shapeFunction->Count() == 6,
+                          "inset function has wrong number of arguments");
+        NS_ABORT_IF_FALSE(shapeFunction->Item(1).GetUnit() != eCSSUnit_Null,
+                          "no shape arguments defined");
+        const int32_t mask = SETCOORD_PERCENT | SETCOORD_LENGTH |
+                             SETCOORD_STORE_CALC;
+        nsTArray<nsStyleCoord>& coords = basicShape->Coordinates();
+        for (size_t j = 1; j <= 4; ++j) {
+          const nsCSSValue& val = shapeFunction->Item(j);
+          nsStyleCoord inset;
+          // Fill missing values to get 4 at the end.
+          if (val.GetUnit() == eCSSUnit_Null) {
+            if (j == 4) {
+              inset = coords[1];
+            } else {
+              NS_ABORT_IF_FALSE(j != 1, "first argument not specified");
+              inset = coords[0];
+            }
+          } else {
+            DebugOnly<bool> didSetInset = SetCoord(val, inset,
+                                                   nsStyleCoord(), mask,
+                                                   aStyleContext, aPresContext,
+                                                   aCanStoreInRuleTree);
+            NS_ABORT_IF_FALSE(didSetInset, "unexpected inset unit");
+          }
+          coords.AppendElement(inset);
+        }
+
+        nsStyleCorners& insetRadius = basicShape->GetRadius();
+        if (shapeFunction->Item(5).GetUnit() == eCSSUnit_Array) {
+          nsCSSValue::Array* radiiArray = shapeFunction->Item(5).GetArrayValue();
+          NS_FOR_CSS_FULL_CORNERS(corner) {
+            int cx = NS_FULL_TO_HALF_CORNER(corner, false);
+            int cy = NS_FULL_TO_HALF_CORNER(corner, true);
+            const nsCSSValue& radius = radiiArray->Item(corner);
+            nsStyleCoord coordX, coordY;
+            DebugOnly<bool> didSetRadii = SetPairCoords(radius, coordX, coordY,
+                                                        nsStyleCoord(),
+                                                        nsStyleCoord(), mask,
+                                                        aStyleContext,
+                                                        aPresContext,
+                                                        aCanStoreInRuleTree);
+            NS_ABORT_IF_FALSE(didSetRadii, "unexpected radius unit");
+            insetRadius.Set(cx, coordX);
+            insetRadius.Set(cy, coordY);
+          }
+        } else {
+          NS_ABORT_IF_FALSE(shapeFunction->Item(5).GetUnit() ==
+                            eCSSUnit_Null, "unexpected value");
+          // Initialize border-radius
+          nsStyleCoord zero;
+          zero.SetCoordValue(0);
+          NS_FOR_CSS_HALF_CORNERS(j) {
+            insetRadius.Set(j, zero);
+          }
+        }
       } else {
-        // XXX Handle more basic shape functions later.
         NS_NOTREACHED("unexpected basic shape function");
         return;
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleConsts.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleConsts.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleConsts.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleConsts.h	2014-11-26 21:45:52.000000000 +0000
@@ -79,7 +79,7 @@
 #define NS_STYLE_BASIC_SHAPE_POLYGON       0
 #define NS_STYLE_BASIC_SHAPE_CIRCLE        1
 #define NS_STYLE_BASIC_SHAPE_ELLIPSE       2
-//#define NS_STYLE_BASIC_SHAPE_INSET       3
+#define NS_STYLE_BASIC_SHAPE_INSET         3
 
 // box-shadow
 #define NS_STYLE_BOX_SHADOW_INSET         0
@@ -399,7 +399,6 @@
 // See nsStyleVisibility
 #define NS_STYLE_DIRECTION_LTR                  0
 #define NS_STYLE_DIRECTION_RTL                  1
-#define NS_STYLE_DIRECTION_INHERIT              2
 
 // See nsStyleVisibility
 #define NS_STYLE_WRITING_MODE_HORIZONTAL_TB     0
@@ -444,6 +443,7 @@
 #define NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER    35
 #define NS_STYLE_DISPLAY_RUBY_TEXT              36
 #define NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER    37
+#define NS_STYLE_DISPLAY_CONTENTS               38
 
 // See nsStylePosition
 #define NS_STYLE_ALIGN_CONTENT_FLEX_START       0
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleContext.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleContext.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleContext.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleContext.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -509,8 +509,21 @@
   // Any direct children of elements with Ruby display values which are
   // block-level are converted to their inline-level equivalents.
   if (!aSkipParentDisplayBasedStyleFixup && mParent) {
-    const nsStyleDisplay* parentDisp = mParent->StyleDisplay();
-    if (parentDisp->IsFlexOrGridDisplayType() &&
+    // Skip display:contents ancestors to reach the potential container.
+    // (If there are only display:contents ancestors between this node and
+    // a flex/grid container ancestor, then this node is a flex/grid item, since
+    // its parent *in the frame tree* will be the flex/grid container. So we treat
+    // it like a flex/grid item here.)
+    nsStyleContext* containerContext = mParent;
+    const nsStyleDisplay* containerDisp = containerContext->StyleDisplay();
+    while (containerDisp->mDisplay == NS_STYLE_DISPLAY_CONTENTS) {
+      if (!containerContext->GetParent()) {
+        break;
+      }
+      containerContext = containerContext->GetParent();
+      containerDisp = containerContext->StyleDisplay();
+    }
+    if (containerDisp->IsFlexOrGridDisplayType() &&
         GetPseudo() != nsCSSAnonBoxes::mozNonElement) {
       uint8_t displayVal = disp->mDisplay;
       // Skip table parts.
@@ -543,8 +556,8 @@
             static_cast<nsStyleDisplay*>(GetUniqueStyleData(eStyleStruct_Display));
           mutable_display->mDisplay = displayVal;
         }
-      } 
-    } else if (parentDisp->IsRubyDisplayType()) {
+      }
+    } else if (containerDisp->IsRubyDisplayType()) {
       uint8_t displayVal = disp->mDisplay;
       nsRuleNode::EnsureInlineDisplay(displayVal);
       // The display change should only occur for "in-flow" children
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleSet.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleSet.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleSet.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleSet.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -1282,9 +1282,13 @@
 
   nsRuleWalker ruleWalker(mRuleTree, mAuthorStyleDisabled);
   ruleWalker.SetCurrentNode(aBaseContext->RuleNode());
-  // FIXME: Perhaps this should be passed in, but it probably doesn't
-  // matter.
-  ruleWalker.SetLevel(eDocSheet, false, false);
+  // This needs to be the transition sheet because that is the highest
+  // level of the cascade, and thus the only thing that makes sense if
+  // we are ever going to call ResolveStyleWithReplacement on the
+  // resulting context.  It's also the right thing for the one case (the
+  // transition manager's cover rule) where we put the result of this
+  // function in the style context tree.
+  ruleWalker.SetLevel(eTransitionSheet, false, false);
   for (int32_t i = 0; i < aRules.Count(); i++) {
     ruleWalker.ForwardOnPossiblyCSSRule(aRules.ObjectAt(i));
   }
@@ -1446,8 +1450,11 @@
           if (aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
               aPseudoType == nsCSSPseudoElements::ePseudo_before ||
               aPseudoType == nsCSSPseudoElements::ePseudo_after) {
-            PresContext()->TransitionManager()->
-              WalkTransitionRule(aElement, aPseudoType, &ruleWalker);
+            nsIStyleRule* rule = PresContext()->TransitionManager()->
+              GetAnimationRule(aElement, aPseudoType);
+            if (rule) {
+              ruleWalker.ForwardOnPossiblyCSSRule(rule);
+            }
           }
           break;
         }
@@ -1520,6 +1527,10 @@
     }
   }
 
+  NS_ASSERTION(rulesIndex == 0,
+               "rules are in incorrect cascading order, "
+               "which means we replaced them incorrectly");
+
   return ruleWalker.CurrentNode();
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleSet.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleSet.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleSet.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleSet.h	2014-11-26 21:45:52.000000000 +0000
@@ -115,6 +115,17 @@
   // Get a style context that represents aBaseContext, but as though
   // it additionally matched the rules in the aRules array (in that
   // order, as more specific than any other rules).
+  //
+  // One of the following must hold:
+  // 1. The resulting style context must be used only on a temporary
+  //    basis, and it must never be put into the style context tree
+  //    (and, in particular, we must never call
+  //    ResolveStyleWithReplacement with it as the old context, which
+  //    might happen if it is put in the style context tree), or
+  // 2. The additional rules must be appropriate for the transitions
+  //    level of the cascade, which is the highest level of the cascade.
+  //    (This is the case for one current caller, the cover rule used
+  //    for CSS transitions.)
   already_AddRefed<nsStyleContext>
   ResolveStyleByAddingRules(nsStyleContext* aBaseContext,
                             const nsCOMArray<nsIStyleRule> &aRules);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleStruct.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleStruct.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleStruct.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleStruct.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -2054,8 +2054,8 @@
   mImage->GetImage(getter_AddRefs(imageContainer));
   NS_ABORT_IF_FALSE(imageContainer, "IsComplete() said image container is ready");
 
-  // Check if the crop region of the current image frame is opaque.
-  if (imageContainer->FrameIsOpaque(imgIContainer::FRAME_CURRENT)) {
+  // Check if the crop region of the image is opaque.
+  if (imageContainer->IsOpaque()) {
     if (!mCropRect)
       return true;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleStruct.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleStruct.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleStruct.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleStruct.h	2014-11-26 21:45:52.000000000 +0000
@@ -2101,7 +2101,8 @@
            NS_STYLE_DISPLAY_RUBY_BASE == aDisplay ||
            NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER == aDisplay ||
            NS_STYLE_DISPLAY_RUBY_TEXT == aDisplay ||
-           NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER == aDisplay;
+           NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER == aDisplay ||
+           NS_STYLE_DISPLAY_CONTENTS == aDisplay;
   }
 
   bool IsInlineOutsideStyle() const {
@@ -2837,14 +2838,15 @@
 class nsStyleBasicShape MOZ_FINAL {
 public:
   enum Type {
-    // eInset,
+    eInset,
     eCircle,
     eEllipse,
     ePolygon
   };
 
   explicit nsStyleBasicShape(Type type)
-    : mType(type)
+    : mType(type),
+      mFillRule(NS_STYLE_FILL_RULE_NONZERO)
   {
     mPosition.SetInitialPercentValues(0.5f);
   }
@@ -2870,19 +2872,35 @@
     return mPosition;
   }
 
+  bool HasRadius() const {
+    NS_ASSERTION(mType == eInset, "expected inset");
+    nsStyleCoord zero;
+    zero.SetCoordValue(0);
+    NS_FOR_CSS_HALF_CORNERS(corner) {
+      if (mRadius.Get(corner) != zero) {
+        return true;
+      }
+    }
+    return false;
+  }
+  nsStyleCorners& GetRadius() {
+    NS_ASSERTION(mType == eInset, "expected circle or ellipse");
+    return mRadius;
+  }
+  const nsStyleCorners& GetRadius() const {
+    NS_ASSERTION(mType == eInset, "expected circle or ellipse");
+    return mRadius;
+  }
+
   // mCoordinates has coordinates for polygon or radii for
   // ellipse and circle.
   nsTArray<nsStyleCoord>& Coordinates()
   {
-    NS_ASSERTION(mType == ePolygon || mType == eCircle || mType == eEllipse,
-                 "expected polygon, circle or ellipse");
     return mCoordinates;
   }
 
   const nsTArray<nsStyleCoord>& Coordinates() const
   {
-    NS_ASSERTION(mType == ePolygon || mType == eCircle || mType == eEllipse,
-                 "expected polygon, circle or ellipse");
     return mCoordinates;
   }
 
@@ -2891,7 +2909,8 @@
     return mType == aOther.mType &&
            mFillRule == aOther.mFillRule &&
            mCoordinates == aOther.mCoordinates &&
-           mPosition == aOther.mPosition;
+           mPosition == aOther.mPosition &&
+           mRadius == aOther.mRadius;
   }
   bool operator!=(const nsStyleBasicShape& aOther) const {
     return !(*this == aOther);
@@ -2904,10 +2923,12 @@
 
   Type mType;
   int32_t mFillRule;
+
   // mCoordinates has coordinates for polygon or radii for
   // ellipse and circle.
   nsTArray<nsStyleCoord> mCoordinates;
   Position mPosition;
+  nsStyleCorners mRadius;
 };
 
 struct nsStyleClipPath
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleUtil.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleUtil.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleUtil.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleUtil.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsCSSProps.h"
 #include "nsRuleNode.h"
 #include "nsROCSSPrimitiveValue.h"
+#include "nsStyleStruct.h"
 #include "nsIContentPolicy.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIURI.h"
@@ -619,6 +620,57 @@
   return aFlexBasis.GetIntValue() == NS_STYLE_FLEX_BASIS_MAIN_SIZE;
 }
 
+// For a replaced element whose concrete object size is no larger than the
+// element's content-box, this method checks whether the given
+// "object-position" coordinate might cause overflow in its dimension.
+typedef nsStyleBackground::Position::PositionCoord PositionCoord;
+static bool
+ObjectPositionCoordMightCauseOverflow(const PositionCoord& aCoord)
+{
+  // Any nonzero length in "object-position" can push us to overflow
+  // (particularly if our concrete object size is exactly the same size as the
+  // replaced element's content-box).
+  if (aCoord.mLength != 0) {
+    return true;
+  }
+
+  // Percentages are interpreted as a fraction of the extra space. So,
+  // percentages in the 0-100% range are safe, but values outside of that
+  // range could cause overflow.
+  if (aCoord.mHasPercent &&
+      (aCoord.mPercent < 0.0f || aCoord.mPercent > 1.0f)) {
+    return true;
+  }
+  return false;
+}
+
+
+/* static */ bool
+nsStyleUtil::ObjectPropsMightCauseOverflow(const nsStylePosition* aStylePos)
+{
+  auto objectFit = aStylePos->mObjectFit;
+
+  // "object-fit: cover" & "object-fit: none" can give us a render rect that's
+  // larger than our container element's content-box.
+  if (objectFit == NS_STYLE_OBJECT_FIT_COVER ||
+      objectFit == NS_STYLE_OBJECT_FIT_NONE) {
+    return true;
+  }
+  // (All other object-fit values produce a concrete object size that's no larger
+  // than the constraint region.)
+
+  // Check each of our "object-position" coords to see if it could cause
+  // overflow in its dimension:
+  const nsStyleBackground::Position& objectPosistion = aStylePos->mObjectPosition;
+  if (ObjectPositionCoordMightCauseOverflow(objectPosistion.mXPosition) ||
+      ObjectPositionCoordMightCauseOverflow(objectPosistion.mYPosition)) {
+    return true;
+  }
+
+  return false;
+}
+
+
 /* static */ bool
 nsStyleUtil::CSPAllowsInlineStyle(nsIContent* aContent,
                                   nsIPrincipal* aPrincipal,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleUtil.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleUtil.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsStyleUtil.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsStyleUtil.h	2014-11-26 21:45:52.000000000 +0000
@@ -20,6 +20,7 @@
 struct gfxFontFeature;
 struct gfxAlternateValue;
 struct nsCSSValueList;
+struct nsStylePosition;
 
 // Style utility functions
 class nsStyleUtil {
@@ -130,6 +131,23 @@
   static bool IsFlexBasisMainSize(const nsStyleCoord& aFlexBasis,
                                   bool aIsMainAxisHorizontal);
 
+  /**
+   * Returns true if our object-fit & object-position properties might cause
+   * a replaced element's contents to overflow its content-box (requiring
+   * clipping), or false if we can be sure that this won't happen.
+   *
+   * This lets us optimize by skipping clipping when we can tell it's
+   * unnecessary (particularly with the default values of these properties).
+   *
+   * @param aStylePos The nsStylePosition whose object-fit & object-position
+   *                  properties should be checked for potential overflow.
+   * @return false if we can be sure that the object-fit & object-position
+   *         properties on 'aStylePos' cannot cause a replaced element's
+   *         contents to overflow its content-box. Otherwise (if overflow is
+   *         is possible), returns true.
+   */
+  static bool ObjectPropsMightCauseOverflow(const nsStylePosition* aStylePos);
+
   /*
    *  Does this principal have a CSP that blocks the application of
    *  inline styles? Returns false if application of the style should
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsTransitionManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsTransitionManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsTransitionManager.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsTransitionManager.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -71,32 +71,38 @@
 }
 
 /*****************************************************************************
- * nsTransitionManager                                                       *
+ * CSSTransitionPlayer                                                       *
  *****************************************************************************/
 
-void
-nsTransitionManager::ElementCollectionRemoved()
+mozilla::dom::AnimationPlayState
+CSSTransitionPlayer::PlayStateFromJS() const
 {
-  // If we have no transitions or animations left, remove ourselves from
-  // the refresh driver.
-  if (PR_CLIST_IS_EMPTY(&mElementCollections)) {
-    mPresContext->RefreshDriver()->RemoveRefreshObserver(this, Flush_Style);
-  }
+  FlushStyle();
+  return AnimationPlayer::PlayStateFromJS();
 }
 
 void
-nsTransitionManager::AddElementCollection(
-  AnimationPlayerCollection* aCollection)
+CSSTransitionPlayer::PlayFromJS()
+{
+  FlushStyle();
+  AnimationPlayer::PlayFromJS();
+}
+
+CommonAnimationManager*
+CSSTransitionPlayer::GetAnimationManager() const
 {
-  if (PR_CLIST_IS_EMPTY(&mElementCollections)) {
-    // We need to observe the refresh driver.
-    nsRefreshDriver *rd = mPresContext->RefreshDriver();
-    rd->AddRefreshObserver(this, Flush_Style);
+  nsPresContext* context = GetPresContext();
+  if (!context) {
+    return nullptr;
   }
 
-  PR_INSERT_BEFORE(aCollection, &mElementCollections);
+  return context->TransitionManager();
 }
 
+/*****************************************************************************
+ * nsTransitionManager                                                       *
+ *****************************************************************************/
+
 already_AddRefed<nsIStyleRule>
 nsTransitionManager::StyleContextChanged(dom::Element *aElement,
                                          nsStyleContext *aOldStyleContext,
@@ -166,7 +172,7 @@
   }
 
   AnimationPlayerCollection* collection =
-    GetElementTransitions(aElement, pseudoType, false);
+    GetAnimationPlayers(aElement, pseudoType, false);
   if (!collection &&
       disp->mTransitionPropertyCount == 1 &&
       disp->mTransitions[0].GetDelay() == 0.0f &&
@@ -430,7 +436,7 @@
              "Should have one animation property segment for a transition");
   if (haveCurrentTransition && haveValues &&
       oldPT->Properties()[0].mSegments[0].mToValue == endValue) {
-    // WalkTransitionRule already called RestyleForAnimation.
+    // GetAnimationRule already called RestyleForAnimation.
     return;
   }
 
@@ -454,7 +460,7 @@
         // |aElementTransitions| is now a dangling pointer!
         aElementTransitions = nullptr;
       }
-      // WalkTransitionRule already called RestyleForAnimation.
+      // GetAnimationRule already called RestyleForAnimation.
     }
     return;
   }
@@ -532,14 +538,13 @@
   segment.mToKey = 1;
   segment.mTimingFunction.Init(tf);
 
-  nsRefPtr<dom::AnimationPlayer> player = new dom::AnimationPlayer(timeline);
+  nsRefPtr<CSSTransitionPlayer> player = new CSSTransitionPlayer(timeline);
   player->mStartTime = timeline->GetCurrentTime();
   player->SetSource(pt);
 
   if (!aElementTransitions) {
     aElementTransitions =
-      GetElementTransitions(aElement, aNewStyleContext->GetPseudoType(),
-                            true);
+      GetAnimationPlayers(aElement, aNewStyleContext->GetPseudoType(), true);
     if (!aElementTransitions) {
       NS_WARNING("allocating CommonAnimationManager failed");
       return;
@@ -574,133 +579,10 @@
   aWhichStarted->AddProperty(aProperty);
 }
 
-AnimationPlayerCollection*
-nsTransitionManager::GetElementTransitions(
-  dom::Element *aElement,
-  nsCSSPseudoElements::Type aPseudoType,
-  bool aCreateIfNeeded)
-{
-  if (!aCreateIfNeeded && PR_CLIST_IS_EMPTY(&mElementCollections)) {
-    // Early return for the most common case.
-    return nullptr;
-  }
-
-  nsIAtom *propName;
-  if (aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement) {
-    propName = nsGkAtoms::transitionsProperty;
-  } else if (aPseudoType == nsCSSPseudoElements::ePseudo_before) {
-    propName = nsGkAtoms::transitionsOfBeforeProperty;
-  } else if (aPseudoType == nsCSSPseudoElements::ePseudo_after) {
-    propName = nsGkAtoms::transitionsOfAfterProperty;
-  } else {
-    NS_ASSERTION(!aCreateIfNeeded,
-                 "should never try to create transitions for pseudo "
-                 "other than :before or :after");
-    return nullptr;
-  }
-  AnimationPlayerCollection* collection =
-    static_cast<AnimationPlayerCollection*>(aElement->GetProperty(propName));
-  if (!collection && aCreateIfNeeded) {
-    // FIXME: Consider arena-allocating?
-    collection = new AnimationPlayerCollection(aElement, propName, this);
-    nsresult rv =
-      aElement->SetProperty(propName, collection,
-                            &AnimationPlayerCollection::PropertyDtor, false);
-    if (NS_FAILED(rv)) {
-      NS_WARNING("SetProperty failed");
-      delete collection;
-      return nullptr;
-    }
-    if (propName == nsGkAtoms::transitionsProperty) {
-      aElement->SetMayHaveAnimations();
-    }
-
-    AddElementCollection(collection);
-  }
-
-  return collection;
-}
-
 /*
  * nsIStyleRuleProcessor implementation
  */
 
-void
-nsTransitionManager::WalkTransitionRule(dom::Element* aElement,
-                                        nsCSSPseudoElements::Type aPseudoType,
-                                        nsRuleWalker* aRuleWalker)
-{
-  AnimationPlayerCollection* collection =
-    GetElementTransitions(aElement, aPseudoType, false);
-  if (!collection) {
-    return;
-  }
-
-  if (!mPresContext->IsDynamic()) {
-    // For print or print preview, ignore animations.
-    return;
-  }
-
-  RestyleManager* restyleManager = mPresContext->RestyleManager();
-  if (restyleManager->SkipAnimationRules()) {
-    // If we're processing a normal style change rather than one from
-    // animation, don't add the transition rule.  This allows us to
-    // compute the new style value rather than having the transition
-    // override it, so that we can start transitioning differently.
-
-    if (restyleManager->PostAnimationRestyles()) {
-      // We need to immediately restyle with animation
-      // after doing this.
-      collection->PostRestyleForAnimation(mPresContext);
-    }
-    return;
-  }
-
-  collection->mNeedsRefreshes = true;
-  collection->EnsureStyleRuleFor(
-    mPresContext->RefreshDriver()->MostRecentRefresh(),
-    EnsureStyleRule_IsNotThrottled);
-
-  if (collection->mStyleRule) {
-    aRuleWalker->Forward(collection->mStyleRule);
-  }
-}
-
-/* virtual */ void
-nsTransitionManager::RulesMatching(ElementRuleProcessorData* aData)
-{
-  NS_ABORT_IF_FALSE(aData->mPresContext == mPresContext,
-                    "pres context mismatch");
-  WalkTransitionRule(aData->mElement,
-                     nsCSSPseudoElements::ePseudo_NotPseudoElement,
-                     aData->mRuleWalker);
-}
-
-/* virtual */ void
-nsTransitionManager::RulesMatching(PseudoElementRuleProcessorData* aData)
-{
-  NS_ABORT_IF_FALSE(aData->mPresContext == mPresContext,
-                    "pres context mismatch");
-
-  // Note:  If we're the only thing keeping a pseudo-element frame alive
-  // (per ProbePseudoStyleContext), we still want to keep it alive, so
-  // this is ok.
-  WalkTransitionRule(aData->mElement, aData->mPseudoType,
-                     aData->mRuleWalker);
-}
-
-/* virtual */ void
-nsTransitionManager::RulesMatching(AnonBoxRuleProcessorData* aData)
-{
-}
-
-#ifdef MOZ_XUL
-/* virtual */ void
-nsTransitionManager::RulesMatching(XULTreeRuleProcessorData* aData)
-{
-}
-#endif
-
 /* virtual */ size_t
 nsTransitionManager::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsTransitionManager.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsTransitionManager.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/nsTransitionManager.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/nsTransitionManager.h	2014-11-26 21:45:52.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/Animation.h"
+#include "mozilla/dom/AnimationPlayer.h"
 #include "AnimationCommon.h"
 #include "nsCSSPseudoElements.h"
 
@@ -64,6 +65,26 @@
   double CurrentValuePortion() const;
 };
 
+class CSSTransitionPlayer MOZ_FINAL : public dom::AnimationPlayer
+{
+public:
+ explicit CSSTransitionPlayer(dom::AnimationTimeline* aTimeline)
+    : dom::AnimationPlayer(aTimeline)
+  {
+  }
+
+  virtual CSSTransitionPlayer*
+  AsCSSTransitionPlayer() MOZ_OVERRIDE { return this; }
+
+  virtual dom::AnimationPlayState PlayStateFromJS() const MOZ_OVERRIDE;
+  virtual void PlayFromJS() MOZ_OVERRIDE;
+
+protected:
+  virtual ~CSSTransitionPlayer() { }
+
+  virtual css::CommonAnimationManager* GetAnimationManager() const MOZ_OVERRIDE;
+};
+
 } // namespace mozilla
 
 class nsTransitionManager MOZ_FINAL
@@ -79,23 +100,6 @@
   typedef mozilla::AnimationPlayerCollection AnimationPlayerCollection;
 
   static AnimationPlayerCollection*
-  GetTransitions(nsIContent* aContent) {
-    return static_cast<AnimationPlayerCollection*>
-      (aContent->GetProperty(nsGkAtoms::transitionsProperty));
-  }
-
-  // Returns true if aContent or any of its ancestors has a transition.
-  static bool ContentOrAncestorHasTransition(nsIContent* aContent) {
-    do {
-      if (GetTransitions(aContent)) {
-        return true;
-      }
-    } while ((aContent = aContent->GetParent()));
-
-    return false;
-  }
-
-  static AnimationPlayerCollection*
   GetAnimationsForCompositor(nsIContent* aContent, nsCSSProperty aProperty)
   {
     return mozilla::css::CommonAnimationManager::GetAnimationsForCompositor(
@@ -127,13 +131,6 @@
     mInAnimationOnlyStyleUpdate = aInAnimationOnlyUpdate;
   }
 
-  // nsIStyleRuleProcessor (parts)
-  virtual void RulesMatching(ElementRuleProcessorData* aData) MOZ_OVERRIDE;
-  virtual void RulesMatching(PseudoElementRuleProcessorData* aData) MOZ_OVERRIDE;
-  virtual void RulesMatching(AnonBoxRuleProcessorData* aData) MOZ_OVERRIDE;
-#ifdef MOZ_XUL
-  virtual void RulesMatching(XULTreeRuleProcessorData* aData) MOZ_OVERRIDE;
-#endif
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
     MOZ_MUST_OVERRIDE MOZ_OVERRIDE;
   virtual size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
@@ -144,18 +141,16 @@
 
   void FlushTransitions(FlushFlags aFlags);
 
-  AnimationPlayerCollection* GetElementTransitions(
-    mozilla::dom::Element *aElement,
-    nsCSSPseudoElements::Type aPseudoType,
-    bool aCreateIfNeeded);
-  void WalkTransitionRule(mozilla::dom::Element* aElement,
-                          nsCSSPseudoElements::Type aPseudoType,
-                          nsRuleWalker* aRuleWalker);
-
 protected:
-  virtual void ElementCollectionRemoved() MOZ_OVERRIDE;
-  virtual void
-  AddElementCollection(AnimationPlayerCollection* aCollection) MOZ_OVERRIDE;
+  virtual nsIAtom* GetAnimationsAtom() MOZ_OVERRIDE {
+    return nsGkAtoms::transitionsProperty;
+  }
+  virtual nsIAtom* GetAnimationsBeforeAtom() MOZ_OVERRIDE {
+    return nsGkAtoms::transitionsOfBeforeProperty;
+  }
+  virtual nsIAtom* GetAnimationsAfterAtom() MOZ_OVERRIDE {
+    return nsGkAtoms::transitionsOfAfterProperty;
+  }
 
 private:
   void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/Makefile.in	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/Makefile.in	2014-11-26 21:45:52.000000000 +0000
@@ -23,5 +23,6 @@
 GARBAGE += css_properties.js
 TEST_FILES := css_properties.js
 TEST_DEST = $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+TEST_TARGET := misc
 INSTALL_TARGETS += TEST
 endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/mochitest.ini	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/mochitest.ini	2014-11-26 21:45:52.000000000 +0000
@@ -97,6 +97,7 @@
 support-files = file_bug645998-1.css file_bug645998-2.css
 [test_bug716226.html]
 [test_bug765590.html]
+[test_bug771043.html]
 [test_bug798567.html]
 [test_bug798843_pref.html]
 [test_bug829816.html]
@@ -147,6 +148,7 @@
 [test_grid_container_shorthands.html]
 [test_grid_shorthand_serialization.html]
 [test_group_insertRule.html]
+[test_hover_quirk.html]
 [test_html_attribute_computed_values.html]
 [test_ident_escaping.html]
 [test_inherit_computation.html]
@@ -196,6 +198,7 @@
 [test_style_struct_copy_constructors.html]
 [test_supports_rules.html]
 [test_system_font_serialization.html]
+[test_text_decoration_shorthands.html]
 [test_transitions_and_reframes.html]
 [test_transitions_and_restyles.html]
 [test_transitions_and_zoom.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/moz.build	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/moz.build	2014-11-26 21:45:52.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
+
 HostSimplePrograms([
     'host_ListCSSProperties',
 ])
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/property_database.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/property_database.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/property_database.js	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/property_database.js	2014-11-26 21:45:52.000000000 +0000
@@ -3284,33 +3284,61 @@
     domProp: "textDecoration",
     inherited: false,
     type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
-    subproperties: [ "-moz-text-decoration-color", "-moz-text-decoration-line", "-moz-text-decoration-style" ],
+    subproperties: [ "text-decoration-color", "text-decoration-line", "text-decoration-style" ],
     initial_values: [ "none" ],
-    other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
-    invalid_values: [ "none none", "underline none", "none underline", "blink none", "none blink", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink",
-                      "underline red solid", "underline #ff0000", "solid underline", "red underline", "#ff0000 underline" ]
+    other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration",
+                    "underline red solid", "underline #ff0000", "solid underline", "red underline", "#ff0000 underline", "dotted underline" ],
+    invalid_values: [ "none none", "underline none", "none underline", "blink none", "none blink", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink" ]
+  },
+  "text-decoration-color": {
+    domProp: "textDecorationColor",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    prerequisites: { "color": "black" },
+    initial_values: [ "currentColor", "-moz-use-text-color" ],
+    other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
+    invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000", "000000", "ff00ff" ]
   },
   "-moz-text-decoration-color": {
     domProp: "MozTextDecorationColor",
     inherited: false,
-    type: CSS_TYPE_LONGHAND,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "text-decoration-color",
     prerequisites: { "color": "black" },
     initial_values: [ "currentColor", "-moz-use-text-color" ],
     other_values: [ "green", "rgba(255,128,0,0.5)", "transparent" ],
     invalid_values: [ "#0", "#00", "#0000", "#00000", "#0000000", "#00000000", "#000000000", "000000", "ff00ff" ]
   },
+  "text-decoration-line": {
+    domProp: "textDecorationLine",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "none" ],
+    other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
+    invalid_values: [ "none none", "underline none", "none underline", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink" ]
+  },
   "-moz-text-decoration-line": {
     domProp: "MozTextDecorationLine",
     inherited: false,
-    type: CSS_TYPE_LONGHAND,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "text-decoration-line",
     initial_values: [ "none" ],
     other_values: [ "underline", "overline", "line-through", "blink", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],
     invalid_values: [ "none none", "underline none", "none underline", "line-through blink line-through", "underline overline line-through blink none", "underline overline line-throuh blink blink" ]
   },
+  "text-decoration-style": {
+    domProp: "textDecorationStyle",
+    inherited: false,
+    type: CSS_TYPE_LONGHAND,
+    initial_values: [ "solid" ],
+    other_values: [ "double", "dotted", "dashed", "wavy", "-moz-none" ],
+    invalid_values: [ "none", "groove", "ridge", "inset", "outset", "solid dashed", "wave" ]
+  },
   "-moz-text-decoration-style": {
     domProp: "MozTextDecorationStyle",
     inherited: false,
-    type: CSS_TYPE_LONGHAND,
+    type: CSS_TYPE_SHORTHAND_AND_LONGHAND,
+    alias_for: "text-decoration-style",
     initial_values: [ "solid" ],
     other_values: [ "double", "dotted", "dashed", "wavy", "-moz-none" ],
     invalid_values: [ "none", "groove", "ridge", "inset", "outset", "solid dashed", "wave" ]
@@ -4605,7 +4633,7 @@
 
 if (SpecialPowers.getBoolPref("layout.css.clip-path-shapes.enabled")) {
   gCSSProperties["clip-path"] = {
-    domProp: "clip-path",
+    domProp: "clipPath",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "none" ],
@@ -4674,6 +4702,15 @@
       "ellipse(20px 50% at top right)",
       "ellipse(closest-side 40% at 50% 100%)",
       "ellipse(calc(20% + 20%) calc(20px + 20cm) at right bottom)",
+
+      "inset(1px)",
+      "inset(20% -20px)",
+      "inset(20em 4rem calc(20% + 20px))",
+      "inset(20vh 20vw 20pt 3%)",
+      "inset(5px round 3px)",
+      "inset(1px 2px round 3px / 3px)",
+      "inset(1px 2px 3px round 3px 2em / 20%)",
+      "inset(1px 2px 3px 4px round 3px 2vw 20% / 20px 3em 2vh 20%)",
     ],
     invalid_values: [
       "url(#test) url(#tes2)",
@@ -4739,6 +4776,18 @@
       "polygon(at center top closest-side closest-side)",
       "polygon(40% at 50% 100%)",
       "polygon(40% farthest-side 20px at 50% 100%)",
+
+      "inset()",
+      "inset(round)",
+      "inset(round 3px)",
+      "inset(1px round 1px 2px 3px 4px 5px)",
+      "inset(1px 2px 3px 4px 5px)",
+      "inset(1px, round 3px)",
+      "inset(1px, 2px)",
+      "inset(1px 2px, 3px)",
+      "inset(1px at 3px)",
+      "inset(1px round 1px // 2px)",
+      "inset(1px round)",
     ],
     unbalanced_values: [
       "polygon(30% 30%",
@@ -4749,6 +4798,13 @@
       "circle(40% at 50% 100%",
       "ellipse(",
       "ellipse(40% at 50% 100%",
+
+      "inset(1px",
+      "inset(1px 2px",
+      "inset(1px 2px 3px",
+      "inset(1px 2px 3px 4px",
+      "inset(1px 2px 3px 4px round 5px",
+      "inset(1px 2px 3px 4px round 5px / 6px",
     ]
   };
 }
@@ -5431,6 +5487,10 @@
   };
 }
 
+if (SpecialPowers.getBoolPref("layout.css.display-contents.enabled")) {
+  gCSSProperties["display"].other_values.push("contents");
+}
+
 if (SpecialPowers.getBoolPref("layout.css.image-orientation.enabled")) {
   gCSSProperties["image-orientation"] = {
     domProp: "imageOrientation",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_bug652486.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_bug652486.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_bug652486.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_bug652486.html	2014-11-26 21:45:52.000000000 +0000
@@ -2,14 +2,16 @@
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=652486
+https://bugzilla.mozilla.org/show_bug.cgi?id=1039488
 -->
 <head>
-  <title>Test for Bug 652486</title>
+  <title>Test for Bug 652486 and Bug 1039488</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=652486">Mozilla Bug 652486</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1039488">Mozilla Bug 1039488</a>
 
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -18,19 +20,13 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-/** Test for Bug 652486 **/
+/** Test for Bug 652486 and Bug 1039488 **/
 
 function c() {
   return document.defaultView.getComputedStyle($('t'), "").
            getPropertyValue("text-decoration");
 }
 
-function cval() {
-  var val = document.defaultView.getComputedStyle($('t'), "").
-              getPropertyCSSValue("text-decoration");
-  return val ? val.getStringValue() : val;
-}
-
 var tests = [
   // When only text-decoration was specified, text-decoration should look like
   // a longhand property.
@@ -88,13 +84,13 @@
   // text-decoration should be a shorthand property.
   { decoration: "blink",
     line: null, color: "rgb(0, 0, 0)", style: null,
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "blink rgb(0, 0, 0)", expectedCSSValue: [ "blink", [0, 0, 0] ] },
   { decoration: "underline",
     line: null, color: "black", style: null,
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "underline rgb(0, 0, 0)", expectedCSSValue: [ "underline", [0, 0, 0] ] },
   { decoration: "overline",
     line: null, color: "#ff0000", style: null,
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "overline rgb(255, 0, 0)", expectedCSSValue: [ "overline", [255, 0, 0] ] },
   { decoration: "line-through",
     line: null, color: "initial", style: null,
     expectedValue: "line-through", expectedCSSValue: "line-through" },
@@ -110,19 +106,19 @@
   // text-decoration should be a shorthand property.
   { decoration: "blink",
     line: null, color: null, style: "-moz-none",
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "blink -moz-none", expectedCSSValue: [ "blink", "-moz-none" ] },
   { decoration: "underline",
     line: null, color: null, style: "dotted",
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "underline dotted", expectedCSSValue: [ "underline", "dotted" ] },
   { decoration: "overline",
     line: null, color: null, style: "dashed",
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "overline dashed", expectedCSSValue: [ "overline", "dashed" ] },
   { decoration: "line-through",
     line: null, color: null, style: "double",
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "line-through double", expectedCSSValue: [ "line-through", "double" ] },
   { decoration: "blink underline",
     line: null, color: null, style: "wavy",
-    expectedValue: "", expectedCSSValue: null },
+    expectedValue: "underline blink wavy", expectedCSSValue: [ "underline blink", "wavy" ] },
   { decoration: "underline blink overline line-through",
     line: null, color: null, style: "solid",
     expectedValue: "underline overline line-through blink",
@@ -140,13 +136,13 @@
     str += "text-decoration: " + aTest.decoration + "; ";
   }
   if (aTest.color) {
-    str += "-moz-text-decoration-color: " + aTest.color + "; ";
+    str += "text-decoration-color: " + aTest.color + "; ";
   }
   if (aTest.line) {
-    str += "-moz-text-decoration-line: " + aTest.line + "; ";
+    str += "text-decoration-line: " + aTest.line + "; ";
   }
   if (aTest.style) {
-    str += "-moz-text-decoration-style: " + aTest.style + "; ";
+    str += "text-decoration-style: " + aTest.style + "; ";
   }
   return str;
 }
@@ -156,31 +152,56 @@
   $('t').style.textDecoration = null;
 }
 
+function testCSSValue(testname, test, dec) {
+  var val = document.defaultView.getComputedStyle($('t'), "").
+              getPropertyCSSValue("text-decoration");
+  isnot(val, null, testname + " (CSS value): " + dec);
+
+  if (typeof test.expectedCSSValue == "string") {
+    is(val.getStringValue(), test.expectedCSSValue, testname + " (CSS value): " + dec);
+    return;
+  }
+
+  is(val.length, test.expectedCSSValue.length, testname + " (CSS value length): " + dec);
+  for (var i = 0; i < val.length; i ++) {
+    var actual = val[i];
+    var expected = test.expectedCSSValue[i];
+    if (typeof expected == "string") {
+      is(actual.getStringValue(), expected, testname + " (CSS value [" + i + "] value): " + dec);
+    } else if (typeof expected == "object") {
+      var rgb = actual.getRGBColorValue();
+      is(rgb.red.getFloatValue(CSSPrimitiveValue.CSS_NUMBER), expected[0], testname + " (CSS value [" + i + "] red): " + dec);
+      is(rgb.green.getFloatValue(CSSPrimitiveValue.CSS_NUMBER), expected[1], testname + " (CSS value [" + i + "] green): " + dec);
+      is(rgb.blue.getFloatValue(CSSPrimitiveValue.CSS_NUMBER), expected[2], testname + " (CSS value [" + i + "] blue): " + dec);
+    }
+  }
+}
+
 for (var i = 0; i < tests.length; ++i) {
   var test = tests[i];
   if (test.decoration) {
     $('t').style.textDecoration = test.decoration;
   }
   if (test.color) {
-    $('t').style.MozTextDecorationColor = test.color;
+    $('t').style.textDecorationColor = test.color;
   }
   if (test.line) {
-    $('t').style.MozTextDecorationLine = test.line;
+    $('t').style.textDecorationLine = test.line;
   }
   if (test.style) {
-    $('t').style.MozTextDecorationStyle = test.style;
+    $('t').style.textDecorationStyle = test.style;
   }
 
   var dec = makeDeclaration(test);
   is(c(), test.expectedValue, "Test1 (computed value): " + dec);
-  is(cval(), test.expectedCSSValue, "Test1 (CSS value): " + dec);
+  testCSSValue("Test1", test, dec);
 
   clearStyleObject();
 
   $('t').setAttribute("style", dec);
 
   is(c(), test.expectedValue, "Test2 (computed value): " + dec);
-  is(cval(), test.expectedCSSValue, "Test2 (CSS value): " + dec);
+  testCSSValue("Test2", test, dec);
 
   $('t').removeAttribute("style");
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_bug771043.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_bug771043.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_bug771043.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_bug771043.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=771043
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 771043</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 771043 **/
+  var expectedValue;
+  var callCount = 0;
+  var storedHeight;
+  function callback(arg) {
+    ++callCount;
+    is(arg.matches, expectedValue,
+       "Should have the right value on call #" + callCount + " to the callback");
+    SimpleTest.executeSoon(tests.shift());
+  }
+
+  function flushLayout() {
+    storedHeight = document.querySelector("iframe").offsetHeight;
+  }
+
+  function setHeight(height) {
+    var ifr = document.querySelector("iframe");
+    ifr.style.height = height + "px";
+    flushLayout();
+  }
+
+  SimpleTest.waitForExplicitFinish();
+
+  var tests = [
+    () => { expectedValue = true; setHeight(50); },
+    () => { expectedValue = false; setHeight(200); },
+    () => {
+      var ifr = document.querySelector("iframe");
+      ifr.style.display = "none";
+      flushLayout();
+      ifr.style.display = "";
+      expectedValue = true;
+      setHeight(50);
+    },
+    () => { expectedValue = false; setHeight(200); },
+    SimpleTest.finish.bind(SimpleTest)
+  ];
+
+  addLoadEvent(function() {
+    var mql = frames[0].matchMedia("(orientation: landscape)");
+    mql.addListener(callback);
+
+    tests.shift()();
+  });
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=771043">Mozilla Bug 771043</a>
+<!-- Important: the iframe needs to be displayed -->
+<p id="display"><iframe style="width: 100px; height: 200px"</p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_hover_quirk.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_hover_quirk.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_hover_quirk.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_hover_quirk.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,82 @@
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=783213
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for the :active and :hover quirk</title>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
+  <style type="text/css">
+    /* Should apply to all elements: */
+    #content :hover:first-of-type {
+      color: rgb(255, 0, 0);
+    }
+    #content :-moz-any(:hover) {
+      text-transform: lowercase;
+    }
+    #content :hover::after {
+      content: "any element";
+    }
+    #content :hover:first-of-type .child::after {
+      content: "any child";
+    }
+
+    /* Should apply only to links: */
+    #content :hover {
+      color: rgb(0, 255, 0) !important;
+      text-transform: uppercase !important;
+    }
+    #content :hover .child::after {
+      content: "link child" !important;
+    }
+  </style>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript">
+    /** Test for the :active and :hover quirk **/
+    function test(element, isLink) {
+      if (!isLink)
+        var styles = {color: "rgb(255, 0, 0)", textTransform: "lowercase",
+                      childContent: '"any child"'};
+      else
+        var styles = {color: "rgb(0, 255, 0)", textTransform: "uppercase",
+                      childContent: '"link child"'};
+
+      // Trigger the :hover pseudo-class.
+      synthesizeMouseAtCenter(element, {type: "mousemove"});
+
+      var computedStyle = getComputedStyle(element);
+      is(computedStyle.color, styles.color, "Unexpected color value");
+      is(computedStyle.textTransform, styles.textTransform,
+         "Unexpected text-transform value");
+
+      computedStyle = getComputedStyle(element, "::after");
+      is(computedStyle.content, '"any element"',
+         "Unexpected pseudo-element content");
+
+      computedStyle = getComputedStyle(
+          element.getElementsByClassName("child")[0], "::after");
+      is(computedStyle.content, styles.childContent,
+         "Unexpected pseudo-element content for child");
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    SimpleTest.waitForFocus(function() {
+      test(document.getElementById("span"), false);
+      test(document.getElementById("label"), false);
+      test(document.getElementById("link"), true);
+      SimpleTest.finish();
+    });
+  </script>
+</head>
+<body>
+  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=783213">Mozilla Bug 783213</a>
+  <p id="display"></p>
+  <div id="content">
+    <span id="span">Span<span class="child"></span></span><br>
+    <label id="label">Label<span class="child"></span></label><br>
+    <a id="link" href="#">Link<span class="child"></span></a>
+  </div>
+  <pre id="test"></pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_text_decoration_shorthands.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_text_decoration_shorthands.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_text_decoration_shorthands.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_text_decoration_shorthands.html	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset=utf-8>
+  <title>Test parsing of text-decoration shorthands</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <link rel='stylesheet' href='/resources/testharness.css'>
+</head>
+<body>
+
+<script>
+
+var initial_values = {
+    textDecorationColor: "rgb(255, 0, 255)",
+    textDecorationLine: "none",
+    textDecorationStyle: "solid",
+};
+
+// For various specified values of the text-decoration shorthand,
+// test the computed values of the corresponding longhands.
+var text_decoration_test_cases = [
+    {
+        specified: "none",
+    },
+    {
+        specified: "red",
+        textDecorationColor: "rgb(255, 0, 0)",
+    },
+    {
+        specified: "line-through",
+        textDecorationLine: "line-through",
+    },
+    {
+        specified: "dotted",
+        textDecorationStyle: "dotted",
+    },
+    {
+        specified: "#00ff00 underline",
+        textDecorationColor: "rgb(0, 255, 0)",
+        textDecorationLine: "underline",
+    },
+    {
+        specified: "#ffff00 wavy",
+        textDecorationColor: "rgb(255, 255, 0)",
+        textDecorationStyle: "wavy",
+    },
+    {
+        specified: "overline double",
+        textDecorationLine: "overline",
+        textDecorationStyle: "double",
+    },
+    {
+        specified: "red underline solid",
+        textDecorationColor: "rgb(255, 0, 0)",
+        textDecorationLine: "underline",
+        textDecorationStyle: "solid",
+    },
+    {
+        specified: "double overline blue",
+        textDecorationColor: "rgb(0, 0, 255)",
+        textDecorationLine: "overline",
+        textDecorationStyle: "double",
+    },
+];
+
+function run_tests(test_cases, shorthand, subproperties) {
+    test_cases.forEach(function(test_case) {
+        test(function() {
+            var element = document.createElement('div');
+            document.body.appendChild(element);
+            // Set text color to test initial value of text-decoration-color
+            // (currentColor).
+            element.style.color = "#ff00ff";
+            element.style[shorthand] = test_case.specified;
+            var computed = window.getComputedStyle(element);
+            subproperties.forEach(function(longhand) {
+                assert_equals(
+                    computed[longhand],
+                    test_case[longhand] || initial_values[longhand],
+                    longhand
+                );
+            });
+        }, "test parsing of 'text-decoration: " + test_case.specified + "'");
+    });
+}
+
+run_tests(text_decoration_test_cases, "textDecoration", [
+    "textDecorationColor", "textDecorationLine", "textDecorationStyle"]);
+
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_transitions_events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_transitions_events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_transitions_events.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_transitions_events.html	2014-11-26 21:45:52.000000000 +0000
@@ -20,7 +20,7 @@
   transition: 500ms color;
   border-color: black; /* don't derive from color */
   -moz-column-rule-color: black; /* don't derive from color */
-  -moz-text-decoration-color: black; /* don't derive from color */
+  text-decoration-color: black; /* don't derive from color */
 }
 
 #four {
@@ -177,9 +177,9 @@
         got_one_target_columnrule = true;
         event.stopPropagation();
         break;
-      case "-moz-text-decoration-color":
+      case "text-decoration-color":
         ok(!got_one_target_textdecorationcolor,
-           "transitionend on one on target (-moz-text-decoration-color)");
+           "transitionend on one on target (text-decoration-color)");
         got_one_target_textdecorationcolor = true;
         event.stopPropagation();
         break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_transitions_per_property.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_transitions_per_property.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/style/test/test_transitions_per_property.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/style/test/test_transitions_per_property.html	2014-11-26 21:45:52.000000000 +0000
@@ -82,8 +82,6 @@
     "-moz-outline-radius-bottomright": [ test_radius_transition ],
     "-moz-outline-radius-topleft": [ test_radius_transition ],
     "-moz-outline-radius-topright": [ test_radius_transition ],
-    "-moz-text-decoration-color": [ test_color_transition,
-                                    test_border_color_transition ],
     "background-color": [ test_color_transition ],
     "background-position": [ test_background_position_transition,
                              // FIXME: We don't currently test clamping,
@@ -231,6 +229,10 @@
     // test_length_percent_calc_transition.
     "stroke-width": [ test_length_transition_svg, test_percent_transition,
                       test_length_clamped_svg, test_percent_clamped ],
+    "text-decoration": [ test_color_shorthand_transition,
+                         test_border_color_shorthand_transition ],
+    "text-decoration-color": [ test_color_transition,
+                               test_border_color_transition ],
     "text-indent": [ test_length_transition, test_percent_transition,
                      test_length_percent_calc_transition,
                      test_length_unclamped, test_percent_unclamped ],
@@ -1081,30 +1083,33 @@
                        "calc(50% + 50px)");
 }
 
-function test_color_transition(prop) {
+function test_color_transition(prop, get_color=(x => x), is_shorthand=false) {
   div.style.setProperty("transition-property", "none", "");
   div.style.setProperty(prop, "rgb(255, 28, 0)", "");
-  is(cs.getPropertyValue(prop), "rgb(255, 28, 0)",
+  is(get_color(cs.getPropertyValue(prop)), "rgb(255, 28, 0)",
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("transition-property", prop, "");
   div.style.setProperty(prop, "rgb(75, 84, 128)", "");
-  is(cs.getPropertyValue(prop), "rgb(210, 42, 32)",
+  is(get_color(cs.getPropertyValue(prop)), "rgb(210, 42, 32)",
      "color-valued property " + prop + ": interpolation of colors");
 
   div.style.setProperty("transition-property", "none", "");
   div.style.setProperty(prop, "rgb(128, 64, 0)", "");
   (prop == "color" ? div.parentNode : div).style.
     setProperty("color", "rgb(0, 0, 128)", "");
-  is(cs.getPropertyValue(prop), "rgb(128, 64, 0)",
+  is(get_color(cs.getPropertyValue(prop)), "rgb(128, 64, 0)",
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("transition-property", prop, "");
   div.style.setProperty(prop, "currentColor", "");
-  is(cs.getPropertyValue(prop), "rgb(96, 48, 32)",
+  is(get_color(cs.getPropertyValue(prop)), "rgb(96, 48, 32)",
      "color-valued property " + prop + ": interpolation of currentColor");
 
-  check_distance(prop, "rgb(255, 28, 0)", "rgb(210, 42, 32)",
-                       "rgb(75, 84, 128)");
-  check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)", "currentColor");
+  if (!is_shorthand) {
+    check_distance(prop, "rgb(255, 28, 0)", "rgb(210, 42, 32)",
+                         "rgb(75, 84, 128)");
+    check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)",
+                         "currentColor");
+  }
 
   (prop == "color" ? div.parentNode : div).style.removeProperty("color");
 
@@ -1135,22 +1140,38 @@
   div.style.setProperty("transition-timing-function", "linear", "");
 }
 
-function test_border_color_transition(prop) {
+function test_border_color_transition(prop, get_color=(x => x), is_shorthand=false) {
   div.style.setProperty("transition-property", "none", "");
   div.style.setProperty(prop, "rgb(128, 64, 0)", "");
   div.style.setProperty("color", "rgb(0, 0, 128)", "");
-  is(cs.getPropertyValue(prop), "rgb(128, 64, 0)",
+  is(get_color(cs.getPropertyValue(prop)), "rgb(128, 64, 0)",
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("transition-property", prop, "");
   div.style.removeProperty(prop);
-  is(cs.getPropertyValue(prop), "rgb(96, 48, 32)",
+  is(get_color(cs.getPropertyValue(prop)), "rgb(96, 48, 32)",
      "color-valued property " + prop + ": interpolation of initial value");
 
-  check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)", "initial");
+  if (!is_shorthand) {
+    check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)", "initial");
+  }
 
   div.style.removeProperty("color");
 }
 
+function get_color_from_shorthand_value(value) {
+  var m = value.match(/rgb\([^, ]*, [^, ]*, [^, ]*\)/);
+  isnot(m, null, "shorthand property value should contain color");
+  return m[0];
+}
+
+function test_color_shorthand_transition(prop) {
+  test_color_transition(prop, get_color_from_shorthand_value, true);
+}
+
+function test_border_color_shorthand_transition(prop) {
+  test_border_color_transition(prop, get_color_from_shorthand_value, true);
+}
+
 function filter_function_list_equals(computedValStr, expectedList)
 {
   // Check simple case "none"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/svg/nsSVGPatternFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/svg/nsSVGPatternFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/svg/nsSVGPatternFrame.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/svg/nsSVGPatternFrame.cpp	2014-11-26 21:45:52.000000000 +0000
@@ -376,14 +376,10 @@
   if (!dt) {
     return nullptr;
   }
+  dt->ClearRect(Rect(0, 0, surfaceSize.width, surfaceSize.height));
 
   nsRefPtr<gfxContext> gfx = new gfxContext(dt);
 
-  // Fill with transparent black
-  gfx->SetOperator(gfxContext::OPERATOR_CLEAR);
-  gfx->Paint();
-  gfx->SetOperator(gfxContext::OPERATOR_OVER);
-
   if (aGraphicOpacity != 1.0f) {
     gfx->Save();
     gfx->PushGroup(gfxContentType::COLOR_ALPHA);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/563009-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/563009-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/563009-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/563009-1.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,42 @@
+<html class="reftest-print">
+<head>
+<style type="text/css">
+
+ div.room {
+   display: inline-block;
+   float: left;
+   border: 1px solid green; 
+ }
+
+
+ </style>
+</head>
+<body>
+
+<!-- adjust height to get tfoot at page boundary" -->
+<div style=" width:430px; height: 880px; border: 1px solid green;">
+
+</div>
+
+
+<div class="room">
+ <table  border width="260px" >
+  <tbody>
+   <tr>
+    <td><div style="width:50px; height:28px; border: 1px solid green;"></div>
+    </td>
+   </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td >
+        <div style="width:50px; height:68px; border: 1px solid green;"></div>
+      </td>
+    </tr>
+  </tfoot>
+</table>
+</div>
+
+<div class="room" style=" width:430px; height: 311px"></div>
+
+<div class="room" style=" width:430px; height: 311px"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/563009-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/563009-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/563009-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/563009-2.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,40 @@
+<html class="reftest-print">
+<head>
+<style type="text/css">
+
+ div{
+   border: 1px solid green; 
+ }
+
+
+ </style>
+</head>
+<body>
+
+
+<div style=" width:10px; height: 10px; border: 1px solid green;">
+
+</div>
+
+
+
+ <table  border width="260px" style="float:left">
+  <tbody>
+   <tr>
+    <td><div style="width:50px; height:910px;"></div>
+    </td>
+   </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td >
+        <div style="width:50px; height:68px;"></div>
+      </td>
+    </tr>
+  </tfoot>
+</table>
+
+
+<div style="float:left; width:430px; height: 311px"></div>
+
+<div style="float:left; width:430px; height: 311px"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/563009-3.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/563009-3.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/563009-3.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/563009-3.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,34 @@
+<html class="reftest-print">
+<head>
+<style type="text/css">
+
+ div{
+   border: 1px solid green; 
+ }
+
+
+ </style>
+</head>
+<body>
+
+
+ <table  border width="260px" style="float:left">
+  <tbody>
+   <tr>
+    <td><div style="width:50px; height:910px;"></div>
+    </td>
+   </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td >
+        <div style="width:50px; height:68px;"></div>
+      </td>
+    </tr>
+  </tfoot>
+</table>
+
+
+<div style="float:left; width:430px; height: 311px"></div>
+
+<div style="float:left; width:430px; height: 311px"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/crashtests.list thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/crashtests.list
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/crashtests/crashtests.list	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/crashtests/crashtests.list	2014-11-26 21:45:53.000000000 +0000
@@ -124,6 +124,9 @@
 load 513732-1.html
 asserts(0-1) load 533380-1.xhtml # Bug 614457
 load 534716-1.html
+load 563009-1.html
+load 563009-2.html
+load 563009-3.html
 load 573354-1.xhtml
 load 576890-1.html
 load 576890-2.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableColGroupFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableColGroupFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableColGroupFrame.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableColGroupFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -295,9 +295,9 @@
       nsTableColFrame* nextCol;
       while (col && col->GetColType() == eColAnonymousCol) {
 #ifdef DEBUG
-        nsIFrame* providerFrame = colFrame->GetParentStyleContextFrame();
-        if (colFrame->StyleContext()->GetParent() ==
-            providerFrame->StyleContext()) {
+        nsIFrame* providerFrame;
+        nsStyleContext* psc = colFrame->GetParentStyleContext(&providerFrame);
+        if (colFrame->StyleContext()->GetParent() == psc) {
           NS_ASSERTION(col->StyleContext() == colFrame->StyleContext() &&
                        col->GetContent() == colFrame->GetContent(),
                        "How did that happen??");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableFrame.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -134,8 +134,8 @@
   BCPixelSize mRightCellBorderWidth;
 };
 
-nsIFrame*
-nsTableFrame::GetParentStyleContextFrame() const
+nsStyleContext*
+nsTableFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
 {
   // Since our parent, the table outer frame, returned this frame, we
   // must return whatever our parent would normally have returned.
@@ -143,10 +143,11 @@
   NS_PRECONDITION(GetParent(), "table constructed without outer table");
   if (!mContent->GetParent() && !StyleContext()->GetPseudo()) {
     // We're the root.  We have no style context parent.
+    *aProviderFrame = nullptr;
     return nullptr;
   }
 
-  return GetParent()->DoGetParentStyleContextFrame();
+  return GetParent()->DoGetParentStyleContext(aProviderFrame);
 }
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableFrame.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableFrame.h	2014-11-26 21:45:53.000000000 +0000
@@ -358,7 +358,8 @@
 
   nsFrameList& GetColGroups();
 
-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
+  virtual nsStyleContext*
+  GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
 
   /**
    * Get the "type" of the frame
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableOuterFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableOuterFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableOuterFrame.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableOuterFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -2,7 +2,10 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.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 "nsTableOuterFrame.h"
+
+#include "nsFrameManager.h"
 #include "nsTableFrame.h"
 #include "nsTableCellFrame.h"
 #include "nsStyleContext.h"
@@ -102,25 +105,32 @@
   return result;
 }
 
-nsIFrame*
-nsTableCaptionFrame::GetParentStyleContextFrame() const
+nsStyleContext*
+nsTableCaptionFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
 {
-  NS_PRECONDITION(mContent->GetParent(),
-                  "How could we not have a parent here?");
+  MOZ_ASSERT(GetContent()->GetParent(), "How could we not have a parent here?");
     
+  nsStyleContext* sc =
+    PresContext()->FrameManager()->GetDisplayContentsStyleFor(GetContent()->GetParent());
+  if (sc) {
+    *aProviderFrame = nullptr;
+    return sc;
+  }
+
   // The caption's style context parent is the inner frame, unless
   // it's anonymous.
   nsIFrame* outerFrame = GetParent();
   if (outerFrame && outerFrame->GetType() == nsGkAtoms::tableOuterFrame) {
     nsIFrame* innerFrame = outerFrame->GetFirstPrincipalChild();
     if (innerFrame) {
-      return nsFrame::CorrectStyleParentFrame(innerFrame,
-                                              StyleContext()->GetPseudo());
+      *aProviderFrame = nsFrame::CorrectStyleParentFrame(innerFrame,
+                                   StyleContext()->GetPseudo());
+      return *aProviderFrame ? (*aProviderFrame)->StyleContext() : nullptr;
     }
   }
 
   NS_NOTREACHED("Where is our inner table frame?");
-  return nsBlockFrame::GetParentStyleContextFrame();
+  return nsBlockFrame::GetParentStyleContext(aProviderFrame);
 }
 
 #ifdef ACCESSIBILITY
@@ -324,8 +334,8 @@
   }
 }
 
-nsIFrame*
-nsTableOuterFrame::GetParentStyleContextFrame() const
+nsStyleContext*
+nsTableOuterFrame::GetParentStyleContext(nsIFrame** aProviderFrame) const
 {
   // The table outer frame and the (inner) table frame split the style
   // data by giving the table frame the style context associated with
@@ -337,7 +347,7 @@
   // children of the table inherit directly from the inner table, and
   // the outer table's style context is a leaf.
 
-  return InnerTableFrame();
+  return (*aProviderFrame = InnerTableFrame())->StyleContext();
 }
 
 // INCREMENTAL REFLOW HELPER FUNCTIONS 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableOuterFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableOuterFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableOuterFrame.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableOuterFrame.h	2014-11-26 21:45:53.000000000 +0000
@@ -32,7 +32,7 @@
                   const mozilla::LogicalSize& aPadding,
                   bool aShrinkWrap) MOZ_OVERRIDE;
 
-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
 
 #ifdef ACCESSIBILITY
   virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;
@@ -136,7 +136,7 @@
   virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
 #endif
 
-  virtual nsIFrame* GetParentStyleContextFrame() const MOZ_OVERRIDE;
+  virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const MOZ_OVERRIDE;
 
   /**
    * Return the content for the cell at the given row and column.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableRowGroupFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableRowGroupFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableRowGroupFrame.cpp	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableRowGroupFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -1732,84 +1732,89 @@
 
 NS_IMETHODIMP
 nsTableRowGroupFrame::FindFrameAt(int32_t    aLineNumber, 
-                                  nscoord    aX, 
+                                  nsPoint    aPos, 
                                   nsIFrame** aFrameFound,
-                                  bool*    aXIsBeforeFirstFrame, 
-                                  bool*    aXIsAfterLastFrame)
+                                  bool*    aPosIsBeforeFirstFrame, 
+                                  bool*    aPosIsAfterLastFrame)
 {
-   nsTableFrame* table = nsTableFrame::GetTableFrame(this);
-   nsTableCellMap* cellMap = table->GetCellMap();
-   
-   *aFrameFound = nullptr;
-   *aXIsBeforeFirstFrame = true;
-   *aXIsAfterLastFrame = false;
+  nsTableFrame* table = nsTableFrame::GetTableFrame(this);
+  nsTableCellMap* cellMap = table->GetCellMap();
 
-   aLineNumber += GetStartRowIndex();
-   int32_t numCells = cellMap->GetNumCellsOriginatingInRow(aLineNumber);
-   if (numCells == 0) {
-     return NS_OK;
-   }
+  WritingMode wm = table->GetWritingMode();
+  nscoord cw = table->GetRect().width;
+  LogicalPoint pos(wm, aPos, cw);
   
-   nsIFrame* frame = nullptr;
-   int32_t colCount = table->GetColCount();
-   for (int32_t i = 0; i < colCount; i++) {
-     CellData* data = cellMap->GetDataAt(aLineNumber, i);
-     if (data && data->IsOrig()) {
-       frame = (nsIFrame*)data->GetCellFrame();
-       break;
-     }
-   }
-   NS_ASSERTION(frame, "cellmap is lying");
-   bool isRTL = (NS_STYLE_DIRECTION_RTL ==
-                   table->StyleVisibility()->mDirection);
-   
-   nsIFrame* closestFromLeft = nullptr;
-   nsIFrame* closestFromRight = nullptr;
-   int32_t n = numCells;
-   nsIFrame* firstFrame = frame;
-   while (n--) {
-     nsRect rect = frame->GetRect();
-     if (rect.width > 0) {
-       // If aX is inside this frame - this is it
-       if (rect.x <= aX && rect.XMost() > aX) {
-         closestFromLeft = closestFromRight = frame;
-         break;
-       }
-       if (rect.x < aX) {
-         if (!closestFromLeft ||
-             rect.XMost() > closestFromLeft->GetRect().XMost())
-           closestFromLeft = frame;
-       }
-       else {
-         if (!closestFromRight ||
-             rect.x < closestFromRight->GetRect().x)
-           closestFromRight = frame;
-       }
-     }
-     frame = frame->GetNextSibling();
-   }
-   if (!closestFromLeft && !closestFromRight) {
-     // All frames were zero-width. Just take the first one.
-     closestFromLeft = closestFromRight = firstFrame;
-   }
-   *aXIsBeforeFirstFrame = isRTL ? !closestFromRight : !closestFromLeft;
-   *aXIsAfterLastFrame =   isRTL ? !closestFromLeft : !closestFromRight;
-   if (closestFromLeft == closestFromRight) {
-     *aFrameFound = closestFromLeft;
-   }
-   else if (!closestFromLeft) {
-     *aFrameFound = closestFromRight;
-   }
-   else if (!closestFromRight) {
-     *aFrameFound = closestFromLeft;
-   }
-   else { // we're between two frames
-     nscoord delta = closestFromRight->GetRect().x -
-                     closestFromLeft->GetRect().XMost();
-     if (aX < closestFromLeft->GetRect().XMost() + delta/2)
-       *aFrameFound = closestFromLeft;
-     else
-       *aFrameFound = closestFromRight;
+  *aFrameFound = nullptr;
+  *aPosIsBeforeFirstFrame = true;
+  *aPosIsAfterLastFrame = false;
+
+  aLineNumber += GetStartRowIndex();
+  int32_t numCells = cellMap->GetNumCellsOriginatingInRow(aLineNumber);
+  if (numCells == 0) {
+    return NS_OK;
+  }
+  
+  nsIFrame* frame = nullptr;
+  int32_t colCount = table->GetColCount();
+  for (int32_t i = 0; i < colCount; i++) {
+    CellData* data = cellMap->GetDataAt(aLineNumber, i);
+    if (data && data->IsOrig()) {
+      frame = (nsIFrame*)data->GetCellFrame();
+      break;
+    }
+  }
+  NS_ASSERTION(frame, "cellmap is lying");
+  bool isRTL = (NS_STYLE_DIRECTION_RTL ==
+                  table->StyleVisibility()->mDirection);
+  
+  nsIFrame* closestFromStart = nullptr;
+  nsIFrame* closestFromEnd = nullptr;
+  int32_t n = numCells;
+  nsIFrame* firstFrame = frame;
+  while (n--) {
+    LogicalRect rect = frame->GetLogicalRect(wm, cw);
+    if (rect.ISize(wm) > 0) {
+      // If pos.I() is inside this frame - this is it
+      if (rect.IStart(wm) <= pos.I(wm) && rect.IEnd(wm) > pos.I(wm)) {
+        closestFromStart = closestFromEnd = frame;
+        break;
+      }
+      if (rect.IStart(wm) < pos.I(wm)) {
+        if (!closestFromStart ||
+            rect.IEnd(wm) > closestFromStart->GetLogicalRect(wm, cw).IEnd(wm))
+          closestFromStart = frame;
+      }
+      else {
+        if (!closestFromEnd ||
+            rect.IStart(wm) < closestFromEnd->GetLogicalRect(wm, cw).IStart(wm))
+          closestFromEnd = frame;
+      }
+    }
+    frame = frame->GetNextSibling();
+  }
+  if (!closestFromStart && !closestFromEnd) {
+    // All frames were zero-width. Just take the first one.
+    closestFromStart = closestFromEnd = firstFrame;
+  }
+  *aPosIsBeforeFirstFrame = isRTL ? !closestFromEnd : !closestFromStart;
+  *aPosIsAfterLastFrame =   isRTL ? !closestFromStart : !closestFromEnd;
+  if (closestFromStart == closestFromEnd) {
+    *aFrameFound = closestFromStart;
+  }
+  else if (!closestFromStart) {
+    *aFrameFound = closestFromEnd;
+  }
+  else if (!closestFromEnd) {
+    *aFrameFound = closestFromStart;
+  }
+  else { // we're between two frames
+    nscoord delta = closestFromEnd->GetLogicalRect(wm, cw).IStart(wm) -
+                    closestFromStart->GetLogicalRect(wm, cw).IEnd(wm);
+    if (pos.I(wm) < closestFromStart->GetLogicalRect(wm, cw).IEnd(wm) + delta/2) {
+      *aFrameFound = closestFromStart;
+    } else {
+      *aFrameFound = closestFromEnd;
+    }
   }
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableRowGroupFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableRowGroupFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tables/nsTableRowGroupFrame.h	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tables/nsTableRowGroupFrame.h	2014-11-26 21:45:53.000000000 +0000
@@ -228,21 +228,21 @@
   virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0) MOZ_OVERRIDE;
 
   /** Find the orginating cell frame on a row that is the nearest to the
-    * coordinate X.
+    * inline-dir coordinate of aPos.
     * @param aLineNumber          - the index of the row relative to the row group
-    * @param aX                   - X coordinate in twips relative to the
+    * @param aPos                 - coordinate in twips relative to the
     *                               origin of the row group
     * @param aFrameFound          - pointer to the cellframe
-    * @param aXIsBeforeFirstFrame - the point is before the first originating
+    * @param aPosIsBeforeFirstFrame - the point is before the first originating
     *                               cellframe
-    * @param aXIsAfterLastFrame   - the point is after the last originating
+    * @param aPosIsAfterLastFrame   - the point is after the last originating
     *                               cellframe
     */
   NS_IMETHOD FindFrameAt(int32_t aLineNumber,
-                         nscoord aX,
+                         nsPoint aPos,
                          nsIFrame** aFrameFound,
-                         bool* aXIsBeforeFirstFrame,
-                         bool* aXIsAfterLastFrame) MOZ_OVERRIDE;
+                         bool* aPosIsBeforeFirstFrame,
+                         bool* aPosIsAfterLastFrame) MOZ_OVERRIDE;
 
    /** Check whether visual and logical order of cell frames within a line are
      * identical. As the layout will reorder them this is always the case
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tools/reftest/runreftest.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tools/reftest/runreftest.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/tools/reftest/runreftest.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/tools/reftest/runreftest.py	2014-11-26 21:45:53.000000000 +0000
@@ -22,7 +22,6 @@
 sys.path.insert(0, SCRIPT_DIRECTORY)
 
 from automationutils import (
-    addCommonOptions,
     dumpScreen,
     environment,
     processLeakLog
@@ -618,8 +617,26 @@
   def __init__(self):
     OptionParser.__init__(self)
     defaults = {}
-    addCommonOptions(self)
-
+    self.add_option("--xre-path",
+                    action = "store", type = "string", dest = "xrePath",
+                    # individual scripts will set a sane default
+                    default = None,
+                    help = "absolute path to directory containing XRE (probably xulrunner)")
+    self.add_option("--symbols-path",
+                    action = "store", type = "string", dest = "symbolsPath",
+                    default = None,
+                    help = "absolute path to directory containing breakpad symbols, or the URL of a zip file containing symbols")
+    self.add_option("--debugger",
+                    action = "store", dest = "debugger",
+                    help = "use the given debugger to launch the application")
+    self.add_option("--debugger-args",
+                    action = "store", dest = "debuggerArgs",
+                    help = "pass the given args to the debugger _before_ "
+                           "the application on the command line")
+    self.add_option("--debugger-interactive",
+                    action = "store_true", dest = "debuggerInteractive",
+                    help = "prevents the test harness from redirecting "
+                        "stdout and stderr for interactive debuggers")
     self.add_option("--appname",
                     action = "store", type = "string", dest = "app",
                     help = "absolute path to application, overriding default")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsImageBoxFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsImageBoxFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsImageBoxFrame.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsImageBoxFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -238,7 +238,8 @@
     if (uri && nsContentUtils::CanLoadImage(uri, mContent, doc,
                                             mContent->NodePrincipal())) {
       nsContentUtils::LoadImage(uri, doc, mContent->NodePrincipal(),
-                                doc->GetDocumentURI(), mListener, mLoadFlags,
+                                doc->GetDocumentURI(), doc->GetReferrerPolicy(),
+                                mListener, mLoadFlags,
                                 EmptyString(), getter_AddRefs(mImageRequest));
 
       if (mImageRequest) {
@@ -602,16 +603,18 @@
 #endif
 
 nsresult
-nsImageBoxFrame::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData)
+nsImageBoxFrame::Notify(imgIRequest* aRequest,
+                        int32_t aType,
+                        const nsIntRect* aData)
 {
   if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
     nsCOMPtr<imgIContainer> image;
     aRequest->GetImage(getter_AddRefs(image));
-    return OnStartContainer(aRequest, image);
+    return OnSizeAvailable(aRequest, image);
   }
 
   if (aType == imgINotificationObserver::DECODE_COMPLETE) {
-    return OnStopDecode(aRequest);
+    return OnDecodeComplete(aRequest);
   }
 
   if (aType == imgINotificationObserver::LOAD_COMPLETE) {
@@ -619,7 +622,7 @@
     aRequest->GetImageStatus(&imgStatus);
     nsresult status =
         imgStatus & imgIRequest::STATUS_ERROR ? NS_ERROR_FAILURE : NS_OK;
-    return OnStopRequest(aRequest, status);
+    return OnLoadComplete(aRequest, status);
   }
 
   if (aType == imgINotificationObserver::IS_ANIMATED) {
@@ -627,25 +630,25 @@
   }
 
   if (aType == imgINotificationObserver::FRAME_UPDATE) {
-    return FrameChanged(aRequest);
+    return OnFrameUpdate(aRequest);
   }
 
   return NS_OK;
 }
 
-nsresult nsImageBoxFrame::OnStartContainer(imgIRequest *request,
-                                           imgIContainer *image)
+nsresult
+nsImageBoxFrame::OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage)
 {
-  NS_ENSURE_ARG_POINTER(image);
+  NS_ENSURE_ARG_POINTER(aImage);
 
   // Ensure the animation (if any) is started. Note: There is no
   // corresponding call to Decrement for this. This Increment will be
   // 'cleaned up' by the Request when it is destroyed, but only then.
-  request->IncrementAnimationConsumers();
+  aRequest->IncrementAnimationConsumers();
 
   nscoord w, h;
-  image->GetWidth(&w);
-  image->GetHeight(&h);
+  aImage->GetWidth(&w);
+  aImage->GetHeight(&h);
 
   mIntrinsicSize.SizeTo(nsPresContext::CSSPixelsToAppUnits(w),
                         nsPresContext::CSSPixelsToAppUnits(h));
@@ -658,13 +661,14 @@
   return NS_OK;
 }
 
-nsresult nsImageBoxFrame::OnStopDecode(imgIRequest *request)
+nsresult
+nsImageBoxFrame::OnDecodeComplete(imgIRequest* aRequest)
 {
   if (mFireEventOnDecode) {
     mFireEventOnDecode = false;
 
     uint32_t reqStatus;
-    request->GetImageStatus(&reqStatus);
+    aRequest->GetImageStatus(&reqStatus);
     if (!(reqStatus & imgIRequest::STATUS_ERROR)) {
       FireImageDOMEvent(mContent, NS_LOAD);
     } else {
@@ -682,11 +686,11 @@
   return NS_OK;
 }
 
-nsresult nsImageBoxFrame::OnStopRequest(imgIRequest *request,
-                                        nsresult aStatus)
+nsresult
+nsImageBoxFrame::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus)
 {
   uint32_t reqStatus;
-  request->GetImageStatus(&reqStatus);
+  aRequest->GetImageStatus(&reqStatus);
 
   // We want to give the decoder a chance to find errors. If we haven't found
   // an error yet and we've already started decoding, we must only fire these
@@ -711,7 +715,8 @@
   return NS_OK;
 }
 
-nsresult nsImageBoxFrame::OnImageIsAnimated(imgIRequest *aRequest)
+nsresult
+nsImageBoxFrame::OnImageIsAnimated(imgIRequest* aRequest)
 {
   // Register with our refresh driver, if we're animated.
   nsLayoutUtils::RegisterImageRequest(PresContext(), aRequest,
@@ -720,7 +725,8 @@
   return NS_OK;
 }
 
-nsresult nsImageBoxFrame::FrameChanged(imgIRequest *aRequest)
+nsresult
+nsImageBoxFrame::OnFrameUpdate(imgIRequest* aRequest)
 {
   if ((0 == mRect.width) || (0 == mRect.height)) {
     return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsImageBoxFrame.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsImageBoxFrame.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsImageBoxFrame.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsImageBoxFrame.h	2014-11-26 21:45:53.000000000 +0000
@@ -101,11 +101,11 @@
   virtual void GetImageSize();
 
 private:
-  nsresult OnStartContainer(imgIRequest *request, imgIContainer *image);
-  nsresult OnStopDecode(imgIRequest *request);
-  nsresult OnStopRequest(imgIRequest *request, nsresult status);
+  nsresult OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage);
+  nsresult OnDecodeComplete(imgIRequest* aRequest);
+  nsresult OnLoadComplete(imgIRequest* aRequest, nsresult aStatus);
   nsresult OnImageIsAnimated(imgIRequest* aRequest);
-  nsresult FrameChanged(imgIRequest *aRequest);
+  nsresult OnFrameUpdate(imgIRequest* aRequest);
 
   nsRect mSubRect; ///< If set, indicates that only the portion of the image specified by the rect should be used.
   nsSize mIntrinsicSize;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsMenuBarFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsMenuBarFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsMenuBarFrame.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsMenuBarFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -177,8 +177,9 @@
     return nullptr; // no character was pressed so just return
 
   // Enumerate over our list of frames.
-  nsIFrame* immediateParent = PresContext()->PresShell()->FrameConstructor()->
+  auto insertion = PresContext()->PresShell()->FrameConstructor()->
     GetInsertionPoint(GetContent(), nullptr);
+  nsContainerFrame* immediateParent = insertion.mParentFrame;
   if (!immediateParent)
     immediateParent = this;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsMenuPopupFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsMenuPopupFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsMenuPopupFrame.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsMenuPopupFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -1300,9 +1300,9 @@
   else {
     // the popup is positioned at a screen coordinate.
     // first convert the screen position in mScreenXPos and mScreenYPos from
-    // CSS pixels into device pixels, ignoring any scaling as mScreenXPos and
-    // mScreenYPos are unscaled screen coordinates.
-    int32_t factor = devContext->UnscaledAppUnitsPerDevPixel();
+    // CSS pixels into device pixels, ignoring any zoom as mScreenXPos and
+    // mScreenYPos are unzoomed screen coordinates.
+    int32_t factor = devContext->AppUnitsPerDevPixelAtUnitFullZoom();
 
     // context menus should be offset by two pixels so that they don't appear
     // directly where the cursor is. Otherwise, it is too easy to have the
@@ -1313,7 +1313,7 @@
       offsetForContextMenu = presContext->DevPixelsToAppUnits(offsetForContextMenuDev);
     }
 
-    // next, convert into app units accounting for the scaling
+    // next, convert into app units accounting for the zoom
     screenPoint.x = presContext->DevPixelsToAppUnits(
                       nsPresContext::CSSPixelsToAppUnits(mScreenXPos) / factor);
     screenPoint.y = presContext->DevPixelsToAppUnits(
@@ -1680,8 +1680,9 @@
   doAction = false;
 
   // Enumerate over our list of frames.
-  nsContainerFrame* immediateParent = PresContext()->PresShell()->
+  auto insertion = PresContext()->PresShell()->
     FrameConstructor()->GetInsertionPoint(GetContent(), nullptr);
+  nsContainerFrame* immediateParent = insertion.mParentFrame;
   if (!immediateParent)
     immediateParent = this;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsXULPopupManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsXULPopupManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/nsXULPopupManager.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/nsXULPopupManager.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -2201,8 +2201,9 @@
                                    bool aIsPopup)
 {
   nsPresContext* presContext = aParent->PresContext();
-  nsContainerFrame* immediateParent = presContext->PresShell()->
+  auto insertion = presContext->PresShell()->
     FrameConstructor()->GetInsertionPoint(aParent->GetContent(), nullptr);
+  nsContainerFrame* immediateParent = insertion.mParentFrame;
   if (!immediateParent)
     immediateParent = aParent;
 
@@ -2261,8 +2262,9 @@
                                        bool aIsPopup)
 {
   nsPresContext* presContext = aParent->PresContext();
-  nsContainerFrame* immediateParent = presContext->PresShell()->
+  auto insertion = presContext->PresShell()->
     FrameConstructor()->GetInsertionPoint(aParent->GetContent(), nullptr);
+  nsContainerFrame* immediateParent = insertion.mParentFrame;
   if (!immediateParent)
     immediateParent = aParent;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp	2014-11-26 21:45:53.000000000 +0000
@@ -2193,6 +2193,7 @@
                                                 doc,
                                                 mContent->NodePrincipal(),
                                                 doc->GetDocumentURI(),
+                                                doc->GetReferrerPolicy(),
                                                 imgNotificationObserver,
                                                 nsIRequest::LOAD_NORMAL,
                                                 EmptyString(),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/moz.build	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/moz.build	2014-11-26 21:45:53.000000000 +0000
@@ -14,7 +14,6 @@
     'ClearKeyUtils.cpp',
     'gmp-clearkey.cpp',
     'openaes/oaes_lib.c',
-    'openaes/rand.c',
 ]
 
 LOCAL_INCLUDES += [
@@ -25,3 +24,20 @@
 
 DISABLE_STL_WRAPPING = True
 DEFINES['MOZ_NO_MOZALLOC'] = True
+
+# Suppress warnings in third-party code.
+if CONFIG['GNU_CXX']:
+    CFLAGS += [
+        '-Wno-missing-braces',
+        '-Wno-pointer-to-int-cast',
+        '-Wno-sign-compare',
+        '-include stdio.h',         # for sprintf() prototype
+        '-include unistd.h',        # for getpid() prototype
+    ]
+elif CONFIG['_MSC_VER']:
+    CFLAGS += [
+        '-FI stdio.h',              # for sprintf() prototype
+        '-wd4090',                  # '=' : different 'const' qualifiers
+    ]
+
+FAIL_ON_WARNINGS = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/openaes/oaes_lib.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/openaes/oaes_lib.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/openaes/oaes_lib.c	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/openaes/oaes_lib.c	2014-11-26 21:45:53.000000000 +0000
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <time.h> 
-#include <sys/timeb.h>
 #include <string.h>
 
 #ifdef WIN32
@@ -480,6 +479,7 @@
 	return OAES_RET_SUCCESS;
 }
 
+/*
 #ifdef OAES_HAVE_ISAAC
 static void oaes_get_seed( char buf[RANDSIZ + 1] )
 {
@@ -519,6 +519,7 @@
 	return _ret;
 }
 #endif // OAES_HAVE_ISAAC
+*/
 
 static OAES_RET oaes_key_destroy( oaes_key ** key )
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/openaes/rand.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/openaes/rand.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/openaes/rand.c	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/openaes/rand.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-/*
-------------------------------------------------------------------------------
-rand.c: By Bob Jenkins.  My random number generator, ISAAC.  Public Domain.
-MODIFIED:
-  960327: Creation (addition of randinit, really)
-  970719: use context, not global variables, for internal state
-  980324: added main (ifdef'ed out), also rearranged randinit()
-  010626: Note that this is public domain
-------------------------------------------------------------------------------
-*/
-#ifndef STANDARD
-#include "standard.h"
-#endif
-#ifndef RAND
-#include "rand.h"
-#endif
-
-
-#define ind(mm,x)  (*(ub4 *)((ub1 *)(mm) + ((x) & ((RANDSIZ-1)<<2))))
-#define rngstep(mix,a,b,mm,m,m2,r,x) \
-{ \
-  x = *m;  \
-  a = (a^(mix)) + *(m2++); \
-  *(m++) = y = ind(mm,x) + a + b; \
-  *(r++) = b = ind(mm,y>>RANDSIZL) + x; \
-}
-
-void     isaac(ctx)
-randctx *ctx;
-{
-   register ub4 a,b,x,y,*m,*mm,*m2,*r,*mend;
-   mm=ctx->randmem; r=ctx->randrsl;
-   a = ctx->randa; b = ctx->randb + (++ctx->randc);
-   for (m = mm, mend = m2 = m+(RANDSIZ/2); m<mend; )
-   {
-      rngstep( a<<13, a, b, mm, m, m2, r, x);
-      rngstep( a>>6 , a, b, mm, m, m2, r, x);
-      rngstep( a<<2 , a, b, mm, m, m2, r, x);
-      rngstep( a>>16, a, b, mm, m, m2, r, x);
-   }
-   for (m2 = mm; m2<mend; )
-   {
-      rngstep( a<<13, a, b, mm, m, m2, r, x);
-      rngstep( a>>6 , a, b, mm, m, m2, r, x);
-      rngstep( a<<2 , a, b, mm, m, m2, r, x);
-      rngstep( a>>16, a, b, mm, m, m2, r, x);
-   }
-   ctx->randb = b; ctx->randa = a;
-}
-
-
-#define mix(a,b,c,d,e,f,g,h) \
-{ \
-   a^=b<<11; d+=a; b+=c; \
-   b^=c>>2;  e+=b; c+=d; \
-   c^=d<<8;  f+=c; d+=e; \
-   d^=e>>16; g+=d; e+=f; \
-   e^=f<<10; h+=e; f+=g; \
-   f^=g>>4;  a+=f; g+=h; \
-   g^=h<<8;  b+=g; h+=a; \
-   h^=a>>9;  c+=h; a+=b; \
-}
-
-/* if (flag==TRUE), then use the contents of randrsl[] to initialize mm[]. */
-void randinit(ctx, flag)
-randctx *ctx;
-word     flag;
-{
-   word i;
-   ub4 a,b,c,d,e,f,g,h;
-   ub4 *m,*r;
-   ctx->randa = ctx->randb = ctx->randc = 0;
-   m=ctx->randmem;
-   r=ctx->randrsl;
-   a=b=c=d=e=f=g=h=0x9e3779b9;  /* the golden ratio */
-
-   for (i=0; i<4; ++i)          /* scramble it */
-   {
-     mix(a,b,c,d,e,f,g,h);
-   }
-
-   if (flag) 
-   {
-     /* initialize using the contents of r[] as the seed */
-     for (i=0; i<RANDSIZ; i+=8)
-     {
-       a+=r[i  ]; b+=r[i+1]; c+=r[i+2]; d+=r[i+3];
-       e+=r[i+4]; f+=r[i+5]; g+=r[i+6]; h+=r[i+7];
-       mix(a,b,c,d,e,f,g,h);
-       m[i  ]=a; m[i+1]=b; m[i+2]=c; m[i+3]=d;
-       m[i+4]=e; m[i+5]=f; m[i+6]=g; m[i+7]=h;
-     }
-     /* do a second pass to make all of the seed affect all of m */
-     for (i=0; i<RANDSIZ; i+=8)
-     {
-       a+=m[i  ]; b+=m[i+1]; c+=m[i+2]; d+=m[i+3];
-       e+=m[i+4]; f+=m[i+5]; g+=m[i+6]; h+=m[i+7];
-       mix(a,b,c,d,e,f,g,h);
-       m[i  ]=a; m[i+1]=b; m[i+2]=c; m[i+3]=d;
-       m[i+4]=e; m[i+5]=f; m[i+6]=g; m[i+7]=h;
-     }
-   }
-   else
-   {
-     /* fill in m[] with messy stuff */
-     for (i=0; i<RANDSIZ; i+=8)
-     {
-       mix(a,b,c,d,e,f,g,h);
-       m[i  ]=a; m[i+1]=b; m[i+2]=c; m[i+3]=d;
-       m[i+4]=e; m[i+5]=f; m[i+6]=g; m[i+7]=h;
-     }
-   }
-
-   isaac(ctx);            /* fill in the first set of results */
-   ctx->randcnt=RANDSIZ;  /* prepare to use the first set of results */
-}
-
-
-#ifdef NEVER
-int main()
-{
-  ub4 i,j;
-  randctx ctx;
-  ctx.randa=ctx.randb=ctx.randc=(ub4)0;
-  for (i=0; i<256; ++i) ctx.randrsl[i]=(ub4)0;
-  randinit(&ctx, TRUE);
-  for (i=0; i<2; ++i)
-  {
-    isaac(&ctx);
-    for (j=0; j<256; ++j)
-    {
-      printf("%.8lx",ctx.randrsl[j]);
-      if ((j&7)==7) printf("\n");
-    }
-  }
-}
-#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/openaes/rand.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/openaes/rand.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/gmp-clearkey/0.1/openaes/rand.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/gmp-clearkey/0.1/openaes/rand.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
-------------------------------------------------------------------------------
-rand.h: definitions for a random number generator
-By Bob Jenkins, 1996, Public Domain
-MODIFIED:
-  960327: Creation (addition of randinit, really)
-  970719: use context, not global variables, for internal state
-  980324: renamed seed to flag
-  980605: recommend RANDSIZL=4 for noncryptography.
-  010626: note this is public domain
-------------------------------------------------------------------------------
-*/
-#ifndef STANDARD
-#include "standard.h"
-#endif
-
-#ifndef RAND
-#define RAND
-#define RANDSIZL   (8)
-#define RANDSIZ    (1<<RANDSIZL)
-
-/* context of random number generator */
-struct randctx
-{
-  ub4 randcnt;
-  ub4 randrsl[RANDSIZ];
-  ub4 randmem[RANDSIZ];
-  ub4 randa;
-  ub4 randb;
-  ub4 randc;
-};
-typedef  struct randctx  randctx;
-
-/*
-------------------------------------------------------------------------------
- If (flag==TRUE), then use the contents of randrsl[0..RANDSIZ-1] as the seed.
-------------------------------------------------------------------------------
-*/
-void randinit(/*_ randctx *r, word flag _*/);
-
-void isaac(/*_ randctx *r _*/);
-
-
-/*
-------------------------------------------------------------------------------
- Call rand(/o_ randctx *r _o/) to retrieve a single 32-bit random value
-------------------------------------------------------------------------------
-*/
-#define rand(r) \
-   (!(r)->randcnt-- ? \
-     (isaac(r), (r)->randcnt=RANDSIZ-1, (r)->randrsl[(r)->randcnt]) : \
-     (r)->randrsl[(r)->randcnt])
-
-#endif  /* RAND */
-
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/AnnexB.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/AnnexB.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/AnnexB.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/AnnexB.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -15,12 +15,15 @@
 static const uint8_t kAnnexBDelimiter[] = { 0, 0, 0, 1 };
 
 void
-AnnexB::ConvertSample(MP4Sample* aSample,
-                      const mozilla::Vector<uint8_t>& annexB)
+AnnexB::ConvertSample(MP4Sample* aSample)
 {
   MOZ_ASSERT(aSample);
+  if (!aSample->size) {
+    return;
+  }
   MOZ_ASSERT(aSample->data);
   MOZ_ASSERT(aSample->size >= ArrayLength(kAnnexBDelimiter));
+  MOZ_ASSERT(aSample->prefix_data);
 
   uint8_t* d = aSample->data;
   while (d + 4 < aSample->data + aSample->size) {
@@ -35,11 +38,12 @@
 
   // Prepend the Annex B header with SPS and PPS tables to keyframes.
   if (aSample->is_sync_point) {
-    aSample->Prepend(annexB.begin(), annexB.length());
+    aSample->Prepend(&(*aSample->prefix_data)[0],
+                     aSample->prefix_data->Length());
   }
 }
 
-Vector<uint8_t>
+already_AddRefed<nsRcTArray<uint8_t>>
 AnnexB::ConvertExtraDataToAnnexB(mozilla::Vector<uint8_t>& aExtraData)
 {
   // AVCC 6 byte header looks like:
@@ -57,25 +61,25 @@
   // [5] | unused             | numSps                           |
   //     +------+------+------+------+------+------+------+------+
 
-  Vector<uint8_t> annexB;
+  nsRefPtr<nsRcTArray<uint8_t>> annexB = new nsRcTArray<uint8_t>();
 
   ByteReader reader(aExtraData);
   const uint8_t* ptr = reader.Read(5);
   if (ptr && ptr[0] == 1) {
     // Append SPS then PPS
-    ConvertSPSOrPPS(reader, reader.ReadU8() & 31, &annexB);
-    ConvertSPSOrPPS(reader, reader.ReadU8(), &annexB);
+    ConvertSPSOrPPS(reader, reader.ReadU8() & 31, annexB);
+    ConvertSPSOrPPS(reader, reader.ReadU8(), annexB);
 
     // MP4Box adds extra bytes that we ignore. I don't know what they do.
   }
   reader.DiscardRemaining();
 
-  return annexB;
+  return annexB.forget();
 }
 
 void
 AnnexB::ConvertSPSOrPPS(ByteReader& aReader, uint8_t aCount,
-                        Vector<uint8_t>* aAnnexB)
+                        nsTArray<uint8_t>* aAnnexB)
 {
   for (int i = 0; i < aCount; i++) {
     uint16_t length = aReader.ReadU16();
@@ -85,8 +89,8 @@
       MOZ_ASSERT(false);
       return;
     }
-    aAnnexB->append(kAnnexBDelimiter, ArrayLength(kAnnexBDelimiter));
-    aAnnexB->append(ptr, length);
+    aAnnexB->AppendElements(kAnnexBDelimiter, ArrayLength(kAnnexBDelimiter));
+    aAnnexB->AppendElements(ptr, length);
   }
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/Box.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/Box.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/Box.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/Box.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -59,15 +59,19 @@
   }
 
   MediaByteRange boxRange(aOffset, aOffset + size);
-  if (mChildOffset >= boxRange.mEnd ||
+  if (mChildOffset > boxRange.mEnd ||
       (mParent && !mParent->mRange.Contains(boxRange)) ||
       !byteRange->Contains(boxRange)) {
     return;
   }
-  mRange = MediaByteRange(aOffset, aOffset + size);
+  mRange = boxRange;
   mType = BigEndian::readUint32(&header[4]);
 }
 
+Box::Box()
+  : mContext(nullptr), mType(0)
+{}
+
 Box
 Box::Next() const
 {
@@ -79,6 +83,9 @@
 Box::FirstChild() const
 {
   MOZ_ASSERT(IsAvailable());
+  if (mChildOffset == mRange.mEnd) {
+    return Box();
+  }
   return Box(mContext, mChildOffset, this);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/DecoderData.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/DecoderData.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/DecoderData.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/DecoderData.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -6,6 +6,7 @@
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/ByteReader.h"
 #include "mp4_demuxer/DecoderData.h"
+#include <media/stagefright/foundation/ABitReader.h>
 #include "media/stagefright/MetaData.h"
 #include "media/stagefright/MediaBuffer.h"
 #include "media/stagefright/MediaDefs.h"
@@ -150,8 +151,16 @@
     const void* data;
     size_t size;
     if (esds.getCodecSpecificInfo(&data, &size) == OK) {
-      audio_specific_config.append(reinterpret_cast<const uint8_t*>(data),
-                                   size);
+      const uint8_t* cdata = reinterpret_cast<const uint8_t*>(data);
+      audio_specific_config.append(cdata, size);
+      if (size > 1) {
+        ABitReader br(cdata, size);
+        extended_profile = br.getBits(5);
+
+        if (extended_profile == 31) {  // AAC-ELD => additional 6 bits
+          extended_profile = 32 + br.getBits(6);
+        }
+      }
     }
   }
 }
@@ -169,6 +178,8 @@
   TrackConfig::Update(aMetaData, aMimeType);
   display_width = FindInt32(aMetaData, kKeyDisplayWidth);
   display_height = FindInt32(aMetaData, kKeyDisplayHeight);
+  image_width = FindInt32(aMetaData, kKeyWidth);
+  image_height = FindInt32(aMetaData, kKeyHeight);
 
   if (FindData(aMetaData, kKeyAVCC, &extra_data) && extra_data.length() >= 7) {
     // Set size of the NAL length to 4. The demuxer formats its output with
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/AnnexB.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/AnnexB.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/AnnexB.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/AnnexB.h	2014-11-26 21:45:54.000000000 +0000
@@ -5,7 +5,9 @@
 #ifndef MP4_DEMUXER_ANNEX_B_H_
 #define MP4_DEMUXER_ANNEX_B_H_
 
-#include "mozilla/Vector.h"
+#include "mp4_demuxer/DecoderData.h"
+
+template <class T> struct already_AddRefed;
 
 namespace mp4_demuxer
 {
@@ -17,17 +19,16 @@
 public:
   // Convert a sample from NAL unit syntax to Annex B.
   // Assumes size of NAL length field is 4 bytes.
-  static void ConvertSample(MP4Sample* aSample,
-                            const mozilla::Vector<uint8_t>& annexB);
+  static void ConvertSample(MP4Sample* aSample);
 
   // Parse an AVCC box and construct the Annex B sample header.
-  static mozilla::Vector<uint8_t> ConvertExtraDataToAnnexB(
+  static already_AddRefed<nsRcTArray<uint8_t>> ConvertExtraDataToAnnexB(
     mozilla::Vector<uint8_t>& aExtraData);
 
 private:
   // AVCC box parser helper.
   static void ConvertSPSOrPPS(ByteReader& aReader, uint8_t aCount,
-                              mozilla::Vector<uint8_t>* aAnnexB);
+                              nsTArray<uint8_t>* aAnnexB);
 };
 
 } // namespace mp4_demuxer
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/Box.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/Box.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/Box.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/Box.h	2014-11-26 21:45:54.000000000 +0000
@@ -35,6 +35,7 @@
 {
 public:
   Box(BoxContext* aContext, uint64_t aOffset, const Box* aParent = nullptr);
+  Box();
 
   bool IsAvailable() const { return !mRange.IsNull(); }
   uint64_t Offset() const { return mRange.mStart; }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/ByteReader.h	2014-11-26 21:45:54.000000000 +0000
@@ -76,6 +76,16 @@
     return mozilla::BigEndian::readUint32(ptr);
   }
 
+  int64_t Read32()
+  {
+    auto ptr = Read(4);
+    if (!ptr) {
+      MOZ_ASSERT(false);
+      return 0;
+    }
+    return mozilla::BigEndian::readInt32(ptr);
+  }
+
   uint64_t ReadU64()
   {
     auto ptr = Read(8);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h	2014-11-26 21:45:54.000000000 +0000
@@ -22,6 +22,14 @@
 
 class MP4Demuxer;
 
+template <typename T>
+class nsRcTArray : public nsTArray<T> {
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(nsRcTArray);
+
+private:
+  ~nsRcTArray() {}
+};
+
 struct PsshInfo
 {
   PsshInfo() {}
@@ -89,6 +97,7 @@
     , samples_per_second(0)
     , frequency_index(0)
     , aac_profile(0)
+    , extended_profile(0)
   {
   }
 
@@ -97,6 +106,7 @@
   uint32_t samples_per_second;
   int8_t frequency_index;
   int8_t aac_profile;
+  int8_t extended_profile;
   mozilla::Vector<uint8_t> extra_data;
   mozilla::Vector<uint8_t> audio_specific_config;
 
@@ -116,8 +126,11 @@
   int32_t display_width;
   int32_t display_height;
 
-  mozilla::Vector<uint8_t> extra_data; // Unparsed AVCDecoderConfig payload.
-  mozilla::Vector<uint8_t> annex_b;    // Parsed version for sample prepend.
+  int32_t image_width;
+  int32_t image_height;
+
+  mozilla::Vector<uint8_t> extra_data;   // Unparsed AVCDecoderConfig payload.
+  nsRefPtr<nsRcTArray<uint8_t>> annex_b; // Parsed version for sample prepend.
 
   void Update(stagefright::sp<stagefright::MetaData>& aMetaData,
               const char* aMimeType);
@@ -146,6 +159,7 @@
   size_t size;
 
   CryptoSample crypto;
+  nsRefPtr<nsRcTArray<uint8_t>> prefix_data;
 
   void Prepend(const uint8_t* aData, size_t aSize);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/MoofParser.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/MoofParser.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/MoofParser.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/MoofParser.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -174,6 +174,7 @@
     reader->DiscardRemaining();
     return;
   }
+  uint8_t version = flags >> 24;
 
   uint32_t sampleCount = reader->ReadU32();
   if (sampleCount == 0) {
@@ -194,7 +195,14 @@
       flags & 0x400 ? reader->ReadU32() : hasFirstSampleFlags && i == 0
                                             ? firstSampleFlags
                                             : aTfhd.mDefaultSampleFlags;
-    uint32_t ctsOffset = flags & 0x800 ? reader->ReadU32() : 0;
+    int64_t ctsOffset = 0;
+    if (flags & 0x800) {
+      if (version == 0) {
+        ctsOffset = reader->ReadU32();
+      } else {
+        ctsOffset = reader->Read32();
+      }
+    }
 
     Sample sample;
     sample.mByteRange = MediaByteRange(offset, offset + sampleSize);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/mp4_demuxer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/mp4_demuxer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/binding/mp4_demuxer.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/binding/mp4_demuxer.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -191,6 +191,7 @@
   }
 
   sample->Update();
+  sample->prefix_data = mVideoConfig.annex_b;
 
   return sample.forget();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp	2014-11-26 21:45:54.000000000 +0000
@@ -139,7 +139,7 @@
         off64_t offset;
         uint32_t size;
         uint32_t duration;
-        uint32_t ctsOffset;
+        int64_t ctsOffset;
         uint32_t flags;
         uint8_t iv[16];
         Vector<uint16_t> clearsizes;
@@ -464,6 +464,14 @@
     status_t err;
     while (!mFirstTrack) {
         err = parseChunk(&offset, 0);
+        // The parseChunk function returns UNKNOWN_ERROR to skip
+        // some boxes we don't want to handle. Filter that error
+        // code but return others so e.g. I/O errors propagate.
+        if (err != OK && err != (status_t) UNKNOWN_ERROR) {
+          ALOGW("Error %d parsing chuck at offset %lld looking for first track",
+              err, (long long)offset);
+          break;
+        }
     }
 
     if (mInitCheck == OK) {
@@ -2993,9 +3001,10 @@
     if (!mDataSource->getUInt32(offset, &flags)) {
         return ERROR_MALFORMED;
     }
+    uint8_t version = flags >> 24;
     ALOGV("fragment run flags: %08x", flags);
 
-    if (flags & 0xff000000) {
+    if (version > 1) {
         return -EINVAL;
     }
 
@@ -3124,7 +3133,11 @@
         tmp.offset = dataOffset;
         tmp.size = sampleSize;
         tmp.duration = sampleDuration;
-        tmp.ctsOffset = sampleCtsOffset;
+        if (version == 0) {
+          tmp.ctsOffset = sampleCtsOffset;
+        } else {
+          tmp.ctsOffset = (int32_t)sampleCtsOffset;
+        }
         mCurrentSamples.add(tmp);
 
         dataOffset += sampleSize;
@@ -3606,7 +3619,7 @@
 
                     // If we're pointing to a segment type or sidx box then we skip them.
                     if (chunk_type != FOURCC('m', 'o', 'o', 'f')) {
-                        moofOffset += chunk_size;
+                        mNextMoofOffset += chunk_size;
                         continue;
                     }
                     mCurrentMoofOffset = moofOffset;
@@ -3649,7 +3662,7 @@
     off64_t offset = 0;
     size_t size = 0;
     uint32_t dts = 0;
-    uint32_t cts = 0;
+    int64_t cts = 0;
     uint32_t duration = 0;
     bool isSyncSample = false;
     bool newBuffer = false;
@@ -3740,7 +3753,7 @@
             mBuffer->meta_data()->setInt64(
                     kKeyDecodingTime, ((int64_t)dts * 1000000) / mTimescale);
             mBuffer->meta_data()->setInt64(
-                    kKeyTime, ((int64_t)cts * 1000000) / mTimescale);
+                    kKeyTime, (cts * 1000000) / mTimescale);
             mBuffer->meta_data()->setInt64(
                     kKeyDuration, ((int64_t)duration * 1000000) / mTimescale);
 
@@ -3869,7 +3882,7 @@
         mBuffer->meta_data()->setInt64(
                 kKeyDecodingTime, ((int64_t)dts * 1000000) / mTimescale);
         mBuffer->meta_data()->setInt64(
-                kKeyTime, ((int64_t)cts * 1000000) / mTimescale);
+                kKeyTime, (cts * 1000000) / mTimescale);
         mBuffer->meta_data()->setInt64(
                 kKeyDuration, ((int64_t)duration * 1000000) / mTimescale);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libstagefright/moz.build	2014-11-14 09:37:19.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libstagefright/moz.build	2014-11-26 21:45:54.000000000 +0000
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEFINES['ANDROID_SMP'] = 0
-DEFINES['LOG_NDEBUG'] = 0
+DEFINES['LOG_NDEBUG'] = 1
 
 if CONFIG['OS_TARGET'] != 'WINNT':
    DEFINES['_GLIBCXX_OS_DEFINES'] = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/include/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/include/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/include/moz.build	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/include/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['theora']
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/include/theora/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/include/theora/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/include/theora/moz.build	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/include/theora/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS.theora += [
-    'codec.h',
-    'theora.h',
-    'theoradec.h',
-    'theoraenc.h',
-]
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/lib/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/lib/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/lib/Makefile.in	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/lib/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-ifdef GNU_AS
-ifeq ($(CPU_ARCH),arm)
-
-# These flags are a lie; they're just used to enable the requisite
-# opcodes; actual arch detection is done at runtime.
-ASFLAGS = -march=armv7-a -mfpu=neon
-
-armfrag-gnu.$(ASM_SUFFIX): armopts-gnu.S
-armidct-gnu.$(ASM_SUFFIX): armopts-gnu.S
-armloop-gnu.$(ASM_SUFFIX): armopts-gnu.S
-
-# armopts needs a specific rule, because arm2gnu.pl will always add the .S
-# suffix when translating the files that include it.
-armopts-gnu.S: arm/armopts.s
-	$(PERL) $(srcdir)/arm/arm2gnu.pl < $< > $@
-# For all others, we can use an implicit rule with the configured $(ASM_SUFFIX).
-%-gnu.$(ASM_SUFFIX): arm/%.s
-	$(PERL) $(srcdir)/arm/arm2gnu.pl < $< > $@
-
-endif
-endif
-
-include $(topsrcdir)/config/rules.mk
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/lib/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/lib/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/lib/moz.build	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/lib/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-UNIFIED_SOURCES += [
-    'apiwrapper.c',
-    'bitpack.c',
-    'decapiwrapper.c',
-    'decinfo.c',
-    'decode.c',
-    'dequant.c',
-    'fragment.c',
-    'huffdec.c',
-    'idct.c',
-    'info.c',
-    'internal.c',
-    'quant.c',
-    'state.c',
-]
-
-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
-    GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
-        'armbits-gnu',
-        'armfrag-gnu',
-        'armidct-gnu',
-        'armloop-gnu',
-    ]]
-
-if '86' in CONFIG['OS_TEST']:
-    if CONFIG['OS_ARCH'] != 'SunOS':
-        if CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':
-            DEFINES['OC_X86_ASM'] = True
-            if '64' in CONFIG['OS_TEST']:
-                DEFINES['OC_X86_64_ASM'] = True
-    if CONFIG['_MSC_VER']:
-        if '64' not in CONFIG['OS_TEST']:
-            SOURCES += [
-                'x86_vc/mmxfrag.c',
-                'x86_vc/mmxidct.c',
-                'x86_vc/mmxstate.c',
-                'x86_vc/x86cpu.c',
-                'x86_vc/x86state.c',
-            ]
-    else:
-        SOURCES += [
-            'x86/mmxfrag.c',
-            'x86/mmxidct.c',
-            'x86/mmxstate.c',
-            'x86/sse2idct.c',
-            'x86/x86cpu.c',
-            'x86/x86state.c',
-        ]
-
-if CONFIG['GNU_AS']:
-    if 'arm' in CONFIG['OS_TEST']:
-        SOURCES += [
-            'arm/armcpu.c',
-            'arm/armstate.c',
-        ]
-        for var in ('OC_ARM_ASM', 'OC_ARM_ASM_EDSP', 'OC_ARM_ASM_MEDIA',
-                    'OC_ARM_ASM_NEON'):
-            DEFINES[var] = True
-        # The Android NDK doesn't pre-define anything to indicate the OS it's
-        # on, so do it for them.
-        if CONFIG['OS_TARGET'] == 'Android':
-            DEFINES['__linux__'] = True
-
-MSVC_ENABLE_PGO = True
-
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    NO_VISIBILITY_FLAGS = True
-
-FINAL_LIBRARY = 'gkmedias'
-
-# The encoder is currently not included.
-DEFINES['THEORA_DISABLE_ENCODE'] = True
-
-# Suppress warnings in third-party code.
-if CONFIG['GNU_CC']:
-    CFLAGS += ['-Wno-type-limits']
-    if CONFIG['CLANG_CXX']:
-        CFLAGS += ['-Wno-tautological-compare']
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/Makefile.in	2014-11-26 21:45:54.000000000 +0000
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+ifdef GNU_AS
+ifeq ($(CPU_ARCH),arm)
+
+# These flags are a lie; they're just used to enable the requisite
+# opcodes; actual arch detection is done at runtime.
+ASFLAGS = -march=armv7-a -mfpu=neon
+
+armfrag-gnu.$(ASM_SUFFIX): armopts-gnu.S
+armidct-gnu.$(ASM_SUFFIX): armopts-gnu.S
+armloop-gnu.$(ASM_SUFFIX): armopts-gnu.S
+
+# armopts needs a specific rule, because arm2gnu.pl will always add the .S
+# suffix when translating the files that include it.
+armopts-gnu.S: lib/arm/armopts.s
+	$(PERL) $(srcdir)/lib/arm/arm2gnu.pl < $< > $@
+# For all others, we can use an implicit rule with the configured $(ASM_SUFFIX).
+%-gnu.$(ASM_SUFFIX): lib/arm/%.s
+	$(PERL) $(srcdir)/lib/arm/arm2gnu.pl < $< > $@
+
+endif
+endif
+
+include $(topsrcdir)/config/rules.mk
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/libtheora/moz.build	2014-11-14 09:37:20.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/libtheora/moz.build	2014-11-26 21:45:54.000000000 +0000
@@ -4,5 +4,92 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['include', 'lib']
+EXPORTS.theora += [
+    'include/theora/codec.h',
+    'include/theora/theoradec.h',
+    'include/theora/theoraenc.h',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'gkmedias'
+
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
+# The encoder is currently not included.
+DEFINES['THEORA_DISABLE_ENCODE'] = True
+
+# Suppress warnings in third-party code.
+if CONFIG['GNU_CC']:
+    CFLAGS += ['-Wno-type-limits']
+    if CONFIG['CLANG_CXX']:
+        CFLAGS += ['-Wno-tautological-compare']
+
+UNIFIED_SOURCES += [
+    'lib/apiwrapper.c',
+    'lib/bitpack.c',
+    'lib/decapiwrapper.c',
+    'lib/decinfo.c',
+    'lib/decode.c',
+    'lib/dequant.c',
+    'lib/fragment.c',
+    'lib/huffdec.c',
+    'lib/idct.c',
+    'lib/info.c',
+    'lib/internal.c',
+    'lib/quant.c',
+    'lib/state.c',
+]
+
+LOCAL_INCLUDES += ['include']
+
+if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
+    GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
+        'armbits-gnu',
+        'armfrag-gnu',
+        'armidct-gnu',
+        'armloop-gnu',
+    ]]
+
+if '86' in CONFIG['OS_TEST']:
+    if CONFIG['OS_ARCH'] != 'SunOS':
+        if CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':
+            DEFINES['OC_X86_ASM'] = True
+            if '64' in CONFIG['OS_TEST']:
+                DEFINES['OC_X86_64_ASM'] = True
+    if CONFIG['_MSC_VER']:
+        if '64' not in CONFIG['OS_TEST']:
+            SOURCES += [
+                'lib/x86_vc/mmxfrag.c',
+                'lib/x86_vc/mmxidct.c',
+                'lib/x86_vc/mmxstate.c',
+                'lib/x86_vc/x86cpu.c',
+                'lib/x86_vc/x86state.c',
+            ]
+    else:
+        SOURCES += [
+            'lib/x86/mmxfrag.c',
+            'lib/x86/mmxidct.c',
+            'lib/x86/mmxstate.c',
+            'lib/x86/sse2idct.c',
+            'lib/x86/x86cpu.c',
+            'lib/x86/x86state.c',
+        ]
+
+if CONFIG['GNU_AS']:
+    if 'arm' in CONFIG['OS_TEST']:
+        SOURCES += [
+            'lib/arm/armcpu.c',
+            'lib/arm/armstate.c',
+        ]
+        for var in ('OC_ARM_ASM',
+                    'OC_ARM_ASM_EDSP',
+                    'OC_ARM_ASM_MEDIA',
+                    'OC_ARM_ASM_NEON'):
+            DEFINES[var] = True
+        # The Android NDK doesn't pre-define anything to indicate the OS it's
+        # on, so do it for them.
+        if CONFIG['OS_TARGET'] == 'Android':
+            DEFINES['__linux__'] = True
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/mtransport/test/buffered_stun_socket_unittest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/mtransport/test/buffered_stun_socket_unittest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/mtransport/test/buffered_stun_socket_unittest.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/mtransport/test/buffered_stun_socket_unittest.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -42,18 +42,6 @@
 };
 static size_t kStunMessageLen = sizeof(kStunMessage);
 
-class DummySocket;
-
-// Temporary whitelist for refcounted class dangerously exposing its destructor.
-// Filed bug 1028140 to address this class.
-namespace mozilla {
-template<>
-struct HasDangerousPublicDestructor<DummySocket>
-{
-  static const bool value = true;
-};
-}
-
 class DummySocket : public NrSocketBase {
  public:
   DummySocket()
@@ -207,6 +195,8 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DummySocket);
 
  private:
+  ~DummySocket() {}
+
   DISALLOW_COPY_ASSIGN(DummySocket);
 
   size_t writable_;  // Amount we allow someone to write.
@@ -230,7 +220,7 @@
   }
 
   void SetUp() {
-    ScopedDeletePtr<DummySocket> dummy(new DummySocket());
+    nsRefPtr<DummySocket> dummy(new DummySocket());
 
     int r = nr_socket_buffered_stun_create(
         dummy->get_nr_socket(),
@@ -251,7 +241,7 @@
   nr_socket *socket() { return test_socket_; }
 
  protected:
-  DummySocket *dummy_;
+  nsRefPtr<DummySocket> dummy_;
   nr_socket *test_socket_;
   nr_transport_addr remote_addr_;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -940,26 +940,24 @@
 // Called if we're attached with AddDirectListener()
 void MediaPipelineTransmit::PipelineListener::
 NotifyRealtimeData(MediaStreamGraph* graph, TrackID tid,
-                   TrackRate rate,
-                   TrackTicks offset,
+                   StreamTime offset,
                    uint32_t events,
                    const MediaSegment& media) {
   MOZ_MTLOG(ML_DEBUG, "MediaPipeline::NotifyRealtimeData()");
 
-  NewData(graph, tid, rate, offset, events, media);
+  NewData(graph, tid, offset, events, media);
 }
 
 void MediaPipelineTransmit::PipelineListener::
 NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
-                         TrackRate rate,
-                         TrackTicks offset,
+                         StreamTime offset,
                          uint32_t events,
                          const MediaSegment& queued_media) {
   MOZ_MTLOG(ML_DEBUG, "MediaPipeline::NotifyQueuedTrackChanges()");
 
   // ignore non-direct data if we're also getting direct data
   if (!direct_connect_) {
-    NewData(graph, tid, rate, offset, events, queued_media);
+    NewData(graph, tid, offset, events, queued_media);
   }
 }
 
@@ -974,8 +972,7 @@
 
 void MediaPipelineTransmit::PipelineListener::
 NewData(MediaStreamGraph* graph, TrackID tid,
-        TrackRate rate,
-        TrackTicks offset,
+        StreamTime offset,
         uint32_t events,
         const MediaSegment& media) {
   if (!active_) {
@@ -1007,6 +1004,12 @@
 
     AudioSegment::ChunkIterator iter(*audio);
     while(!iter.IsEnded()) {
+      TrackRate rate;
+#ifdef USE_FAKE_MEDIA_STREAMS
+      rate = Fake_MediaStream::GraphRate();
+#else
+      rate = graph->GraphRate();
+#endif
       ProcessAudioChunk(static_cast<AudioSessionConduit*>(conduit_.get()),
                         rate, *iter);
       iter.Next();
@@ -1019,7 +1022,7 @@
     VideoSegment::ChunkIterator iter(*video);
     while(!iter.IsEnded()) {
       ProcessVideoChunk(static_cast<VideoSessionConduit*>(conduit_.get()),
-                        rate, *iter);
+                        *iter);
       iter.Next();
     }
 #endif
@@ -1128,7 +1131,6 @@
 #ifdef MOZILLA_INTERNAL_API
 void MediaPipelineTransmit::PipelineListener::ProcessVideoChunk(
     VideoSessionConduit* conduit,
-    TrackRate rate,
     VideoChunk& chunk) {
   layers::Image *img = chunk.mFrame.GetImage();
 
@@ -1330,8 +1332,15 @@
       // To avoid assertions, we need to insert a dummy segment that covers up
       // to the "start" time for the track
       segment_->AppendNullData(current_ticks);
-      mStream->AsSourceStream()->AddTrack(track_id_, track_rate_,
-                                          current_ticks, segment_.forget());
+      if (segment_->GetType() == MediaSegment::AUDIO) {
+        mStream->AsSourceStream()->AddAudioTrack(track_id_, track_rate_,
+                                                 current_ticks,
+                                                 static_cast<AudioSegment*>(segment_.forget()));
+      } else {
+        NS_ASSERTION(mStream->GraphRate() == track_rate_, "Rate mismatch");
+        mStream->AsSourceStream()->AddTrack(track_id_,
+                                            current_ticks, segment_.forget());
+      }
       // AdvanceKnownTracksTicksTime(HEAT_DEATH_OF_UNIVERSE) means that in
       // theory per the API, we can't add more tracks before that
       // time. However, the impl actually allows it, and it avoids a whole
@@ -1356,7 +1365,12 @@
   source->GraphImpl()->AppendMessage(new Message(source, track_id, track_rate, segment, listener, completed));
 #else
   source->AddListener(listener);
-  source->AsSourceStream()->AddTrack(track_id, track_rate, 0, segment);
+  if (segment->GetType() == MediaSegment::AUDIO) {
+    source->AsSourceStream()->AddAudioTrack(track_id, track_rate, 0,
+        static_cast<AudioSegment*>(segment));
+  } else {
+    source->AsSourceStream()->AddTrack(track_id, 0, segment);
+  }
 #endif
 }
 
@@ -1459,7 +1473,7 @@
 
 MediaPipelineReceiveVideo::PipelineListener::PipelineListener(
   SourceMediaStream* source, TrackID track_id)
-  : GenericReceiveListener(source, track_id, USECS_PER_S),
+  : GenericReceiveListener(source, track_id, source->GraphRate()),
     width_(640),
     height_(480),
 #ifdef MOZILLA_INTERNAL_API
@@ -1527,8 +1541,9 @@
 
 #ifdef MOZILLA_INTERNAL_API
   nsRefPtr<layers::Image> image = image_;
-  TrackTicks target = source_->TimeToTicksRoundUp(USECS_PER_S, desired_time);
-  TrackTicks delta = target - played_ticks_;
+  // our constructor sets track_rate_ to the graph rate
+  MOZ_ASSERT(track_rate_ == source_->GraphRate());
+  StreamTime delta = desired_time - played_ticks_;
 
   // Don't append if we've already provided a frame that supposedly
   // goes past the current aDesiredTime Doing so means a negative
@@ -1538,7 +1553,7 @@
     segment.AppendFrame(image.forget(), delta, IntSize(width_, height_));
     // Handle track not actually added yet or removed/finished
     if (source_->AppendToTrack(track_id_, &segment)) {
-      played_ticks_ = target;
+      played_ticks_ = desired_time;
     } else {
       MOZ_MTLOG(ML_ERROR, "AppendToTrack failed");
       return;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h	2014-11-26 21:45:55.000000000 +0000
@@ -463,23 +463,20 @@
 
     // Implement MediaStreamListener
     virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
-                                          TrackRate rate,
-                                          TrackTicks offset,
+                                          StreamTime offset,
                                           uint32_t events,
                                           const MediaSegment& queued_media) MOZ_OVERRIDE;
     virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) MOZ_OVERRIDE {}
 
     // Implement MediaStreamDirectListener
     virtual void NotifyRealtimeData(MediaStreamGraph* graph, TrackID tid,
-                                    TrackRate rate,
-                                    TrackTicks offset,
+                                    StreamTime offset,
                                     uint32_t events,
                                     const MediaSegment& media) MOZ_OVERRIDE;
 
    private:
     void NewData(MediaStreamGraph* graph, TrackID tid,
-                 TrackRate rate,
-                 TrackTicks offset,
+                 StreamTime offset,
                  uint32_t events,
                  const MediaSegment& media);
 
@@ -487,7 +484,7 @@
                                    TrackRate rate, AudioChunk& chunk);
 #ifdef MOZILLA_INTERNAL_API
     virtual void ProcessVideoChunk(VideoSessionConduit *conduit,
-                                   TrackRate rate, VideoChunk& chunk);
+                                   VideoChunk& chunk);
 #endif
     RefPtr<MediaSessionConduit> conduit_;
 
@@ -626,8 +623,7 @@
 
     // Implement MediaStreamListener
     virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
-                                          TrackRate rate,
-                                          TrackTicks offset,
+                                          StreamTime offset,
                                           uint32_t events,
                                           const MediaSegment& queued_media) MOZ_OVERRIDE {}
     virtual void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) MOZ_OVERRIDE;
@@ -716,8 +712,7 @@
 
     // Implement MediaStreamListener
     virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
-                                          TrackRate rate,
-                                          TrackTicks offset,
+                                          StreamTime offset,
                                           uint32_t events,
                                           const MediaSegment& queued_media) MOZ_OVERRIDE {}
     virtual void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -78,6 +78,7 @@
 #include "mozilla/dom/RTCPeerConnectionBinding.h"
 #include "mozilla/dom/PeerConnectionImplBinding.h"
 #include "mozilla/dom/DataChannelBinding.h"
+#include "mozilla/dom/PluginCrashedEvent.h"
 #include "MediaStreamList.h"
 #include "MediaStreamTrack.h"
 #include "AudioStreamTrack.h"
@@ -1789,53 +1790,20 @@
     return true;
   }
 
-  ErrorResult rv;
-  nsRefPtr<Event> event =
-    doc->CreateEvent(NS_LITERAL_STRING("customevent"), rv);
-  nsCOMPtr<nsIDOMCustomEvent> customEvent(do_QueryObject(event));
-  if (!customEvent) {
-    NS_WARNING("Couldn't QI event for PluginCrashed event!");
-    return true;
-  }
+  PluginCrashedEventInit init;
+  init.mPluginDumpID = aPluginDumpID;
+  init.mPluginName = aPluginName;
+  init.mSubmittedCrashReport = false;
+  init.mGmpPlugin = true;
+  init.mBubbles = true;
+  init.mCancelable = true;
 
-  nsCOMPtr<nsIWritableVariant> variant;
-  variant = do_CreateInstance("@mozilla.org/variant;1");
-  if (!variant) {
-    NS_WARNING("Couldn't create detail variant for PluginCrashed event!");
-    return true;
-  }
+  nsRefPtr<PluginCrashedEvent> event =
+    PluginCrashedEvent::Constructor(doc, NS_LITERAL_STRING("PluginCrashed"), init);
 
-  customEvent->InitCustomEvent(NS_LITERAL_STRING("PluginCrashed"),
-                               true, true, variant);
   event->SetTrusted(true);
   event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true;
 
-  nsCOMPtr<nsIWritablePropertyBag2> propBag;
-  propBag = do_CreateInstance("@mozilla.org/hash-property-bag;1");
-  if (!propBag) {
-    NS_WARNING("Couldn't create a property bag for PluginCrashed event!");
-    return true;
-  }
-
-  // add a "pluginDumpID" property to this event
-  propBag->SetPropertyAsAString(NS_LITERAL_STRING("pluginDumpID"),
-                                aPluginDumpID);
-
-
-  // add a "pluginName" property to this event
-  propBag->SetPropertyAsAString(NS_LITERAL_STRING("pluginName"),
-                                aPluginName);
-
-  // add a "pluginName" property to this event
-  propBag->SetPropertyAsBool(NS_LITERAL_STRING("gmpPlugin"),
-                             true);
-
-  // add a "submittedCrashReport" property to this event
-  propBag->SetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"),
-                             false);
-
-  variant->SetAsISupports(propBag);
-
   EventDispatcher::DispatchDOMEvent(mWindow, nullptr, event, nullptr, nullptr);
 #endif
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h	2014-11-26 21:45:55.000000000 +0000
@@ -63,7 +63,7 @@
 
     // Make a track
     mozilla::AudioSegment *segment = new mozilla::AudioSegment();
-    mStream->GetStream()->AsSourceStream()->AddTrack(1, 16000, 0, segment);
+    mStream->GetStream()->AsSourceStream()->AddAudioTrack(1, 16000, 0, segment);
 
     // Set the timer
     mTimer->InitWithFuncCallback(Callback, this, 100, nsITimer::TYPE_REPEATING_PRECISE);
@@ -107,7 +107,7 @@
 
     // Make a track
     mozilla::VideoSegment *segment = new mozilla::VideoSegment();
-    mStream->GetStream()->AsSourceStream()->AddTrack(1, mozilla::USECS_PER_S, 0, segment);
+    mStream->GetStream()->AsSourceStream()->AddTrack(1, 0, segment);
     mStream->GetStream()->AsSourceStream()->AdvanceKnownTracksTime(mozilla::STREAM_TIME_MAX);
 
     // Set the timer. Set to 10 fps.
@@ -157,7 +157,8 @@
     // AddTrack takes ownership of segment
     mozilla::VideoSegment *segment = new mozilla::VideoSegment();
     // 10 fps.
-    segment->AppendFrame(image.forget(), mozilla::USECS_PER_S / 10,
+    segment->AppendFrame(image.forget(),
+                         gen->mStream->GetStream()->GraphRate() / 10,
                          IntSize(WIDTH, HEIGHT));
 
     gen->mStream->GetStream()->AsSourceStream()->AppendToTrack(1, segment);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h	2014-11-26 21:45:55.000000000 +0000
@@ -32,17 +32,14 @@
 
 class Fake_SourceMediaStream;
 
-static const int64_t USECS_PER_S = 1000000;
-
 class Fake_MediaStreamListener
 {
- protected:
+protected:
   virtual ~Fake_MediaStreamListener() {}
 
- public:
+public:
   virtual void NotifyQueuedTrackChanges(mozilla::MediaStreamGraph* aGraph, mozilla::TrackID aID,
-                                        mozilla::TrackRate aTrackRate,
-                                        mozilla::TrackTicks aTrackOffset,
+                                        mozilla::StreamTime aTrackOffset,
                                         uint32_t aTrackEvents,
                                         const mozilla::MediaSegment& aQueuedMedia)  = 0;
   virtual void NotifyPull(mozilla::MediaStreamGraph* aGraph, mozilla::StreamTime aDesiredTime) = 0;
@@ -52,13 +49,12 @@
 
 class Fake_MediaStreamDirectListener : public Fake_MediaStreamListener
 {
- protected:
+protected:
   virtual ~Fake_MediaStreamDirectListener() {}
 
- public:
+public:
   virtual void NotifyRealtimeData(mozilla::MediaStreamGraph* graph, mozilla::TrackID tid,
-                                  mozilla::TrackRate rate,
-                                  mozilla::TrackTicks offset,
+                                  mozilla::StreamTime offset,
                                   uint32_t events,
                                   const mozilla::MediaSegment& media) = 0;
 };
@@ -71,7 +67,7 @@
  public:
   Fake_MediaStream () : mListeners(), mMutex("Fake MediaStream") {}
 
-  uint32_t GraphRate() { return 16000; }
+  static uint32_t GraphRate() { return 16000; }
 
   void AddListener(Fake_MediaStreamListener *aListener) {
     mozilla::MutexAutoLock lock(mMutex);
@@ -132,10 +128,14 @@
                              mStop(false),
                              mPeriodic(new Fake_MediaPeriodic(this)) {}
 
-  void AddTrack(mozilla::TrackID aID, mozilla::TrackRate aRate, mozilla::TrackTicks aStart,
+  void AddTrack(mozilla::TrackID aID, mozilla::StreamTime aStart,
                 mozilla::MediaSegment* aSegment) {
     delete aSegment;
   }
+  void AddAudioTrack(mozilla::TrackID aID, mozilla::TrackRate aRate, mozilla::StreamTime aStart,
+                     mozilla::AudioSegment* aSegment) {
+    delete aSegment;
+  }
   void EndTrack(mozilla::TrackID aID) {}
 
   bool AppendToTrack(mozilla::TrackID aID, mozilla::MediaSegment* aSegment,
@@ -329,14 +329,6 @@
   nsRefPtr<Fake_MediaStreamTrack> mAudioTrack;
 };
 
-class Fake_MediaStreamGraph
-{
-public:
-  virtual ~Fake_MediaStreamGraph() {}
-};
-
-
-
 class Fake_MediaStreamBase : public Fake_MediaStream {
  public:
   Fake_MediaStreamBase() : mPeriodic(new Fake_MediaPeriodic(this)) {}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/test/FakeMediaStreamsImpl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/test/FakeMediaStreamsImpl.h	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/test/FakeMediaStreamsImpl.h	2014-11-26 21:45:55.000000000 +0000
@@ -114,7 +114,6 @@
        it != mListeners.end(); ++it) {
     (*it)->NotifyQueuedTrackChanges(nullptr, // Graph
                                     0, // TrackID
-                                    GRAPH_RATE, // Rate (hz)
                                     0, // Offset TODO(ekr@rtfm.com) fix
                                     0, // ???
                                     segment);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/test/mediapipeline_unittest.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/test/mediapipeline_unittest.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/media/webrtc/signaling/test/mediapipeline_unittest.cpp	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/media/webrtc/signaling/test/mediapipeline_unittest.cpp	2014-11-26 21:45:55.000000000 +0000
@@ -296,7 +296,7 @@
     audio->SetPullEnabled(true);
 
     mozilla::AudioSegment* segment= new mozilla::AudioSegment();
-    audio->AddTrack(0, 100, 0, segment);
+    audio->AddAudioTrack(0, 100, 0, segment);
     audio->AdvanceKnownTracksTime(mozilla::STREAM_TIME_MAX);
 
     audio_ = new Fake_DOMMediaStream(audio);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/malloc_decls.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/malloc_decls.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/malloc_decls.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/malloc_decls.h	2014-11-26 21:45:59.000000000 +0000
@@ -24,7 +24,9 @@
 #  define MALLOC_FUNCS_MALLOC 1
 #  define MALLOC_FUNCS_JEMALLOC 2
 #  define MALLOC_FUNCS_INIT 4
-#  define MALLOC_FUNCS_ALL (MALLOC_FUNCS_INIT | MALLOC_FUNCS_MALLOC | MALLOC_FUNCS_JEMALLOC)
+#  define MALLOC_FUNCS_BRIDGE 8
+#  define MALLOC_FUNCS_ALL (MALLOC_FUNCS_INIT | MALLOC_FUNCS_BRIDGE | \
+                            MALLOC_FUNCS_MALLOC | MALLOC_FUNCS_JEMALLOC)
 
 #endif /* malloc_decls_h */
 
@@ -36,6 +38,9 @@
 #  if MALLOC_FUNCS & MALLOC_FUNCS_INIT
 MALLOC_DECL(init, void, const malloc_table_t *)
 #  endif
+#  if MALLOC_FUNCS & MALLOC_FUNCS_BRIDGE
+MALLOC_DECL(get_bridge, struct ReplaceMallocBridge*, void)
+#  endif
 #  if MALLOC_FUNCS & MALLOC_FUNCS_MALLOC
 MALLOC_DECL(malloc, void *, size_t)
 MALLOC_DECL(posix_memalign, int, void **, size_t, size_t)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/moz.build	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/moz.build	2014-11-26 21:45:59.000000000 +0000
@@ -15,8 +15,8 @@
     EXPORTS += [
         'malloc_decls.h',
         'replace_malloc.h',
+        'replace_malloc_bridge.h',
     ]
-    DEFINES['MOZ_REPLACE_MALLOC'] = True
 
 SOURCES += [
     'jemalloc_config.c',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/replace_malloc_bridge.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/replace_malloc_bridge.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/replace_malloc_bridge.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/replace_malloc_bridge.h	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,133 @@
+/* -*- 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 replace_malloc_bridge_h
+#define replace_malloc_bridge_h
+
+/*
+ * The replace-malloc bridge allows bidirectional method calls between
+ * a program and the replace-malloc library that has been loaded for it.
+ * In Firefox, this is used to allow method calls between code in libxul
+ * and code in the replace-malloc library, without libxul needing to link
+ * against that library or vice-versa.
+ *
+ * Subsystems can add methods for their own need. Replace-malloc libraries
+ * can decide to implement those methods or not.
+ *
+ * Replace-malloc libraries can provide such a bridge by implementing
+ * a ReplaceMallocBridge-derived class, and a replace_get_bridge function
+ * returning an instance of that class. The default methods in
+ * ReplaceMallocBridge are expected to return values that callers would
+ * understand as "the bridge doesn't implement this method", so that a
+ * replace-malloc library doesn't have to implement all methods.
+ *
+ * The ReplaceMallocBridge class contains definitions for methods for
+ * all replace-malloc libraries. Each library picks the methods it wants
+ * to reply to in its ReplaceMallocBridge-derived class instance.
+ * All methods of ReplaceMallocBridge must be virtual. Similarly,
+ * anything passed as an argument to those methods must be plain data, or
+ * an instance of a class with only virtual methods.
+ *
+ * Binary compatibility is expected to be maintained, such that a newer
+ * Firefox can be used with an old replace-malloc library, or an old
+ * Firefox can be used with a newer replace-malloc library. As such, only
+ * new virtual methods should be added to ReplaceMallocBridge, and
+ * each change should have a corresponding bump of the mVersion value.
+ * At the same time, each virtual method should have a corresponding
+ * wrapper calling the virtual method on the instance from
+ * ReplaceMallocBridge::Get(), giving it the version the virtual method
+ * was added.
+ *
+ * Parts that are not relevant to the replace-malloc library end of the
+ * bridge are hidden when REPLACE_MALLOC_IMPL is not defined, which is
+ * the case when including replace_malloc.h.
+ */
+
+struct ReplaceMallocBridge;
+
+#ifdef __cplusplus
+
+#include "mozilla/NullPtr.h"
+#include "mozilla/Types.h"
+
+#ifndef REPLACE_MALLOC_IMPL
+/* Returns the replace-malloc bridge if there is one to be returned. */
+extern "C" MFBT_API ReplaceMallocBridge* get_bridge();
+#endif
+
+namespace mozilla {
+namespace dmd {
+struct DMDFuncs;
+}
+
+/* Callbacks to register debug file handles for Poison IO interpose.
+ * See Mozilla(|Un)RegisterDebugHandle in xpcom/build/PoisonIOInterposer.h */
+struct DebugFdRegistry
+{
+  virtual void RegisterHandle(intptr_t aFd);
+
+  virtual void UnRegisterHandle(intptr_t aFd);
+};
+
+} // namespace mozilla
+
+struct ReplaceMallocBridge
+{
+  ReplaceMallocBridge() : mVersion(2) {}
+
+  /* This method was added in version 1 of the bridge. */
+  virtual mozilla::dmd::DMDFuncs* GetDMDFuncs() { return nullptr; }
+
+  /* Send a DebugFdRegistry instance to the replace-malloc library so that
+   * it can register/unregister file descriptors whenever needed. The
+   * instance is valid until the process dies.
+   * This method was added in version 2 of the bridge. */
+  virtual void InitDebugFd(mozilla::DebugFdRegistry&) {}
+
+#ifndef REPLACE_MALLOC_IMPL
+  /* Returns the replace-malloc bridge if its version is at least the
+   * requested one. */
+  static ReplaceMallocBridge* Get(int aMinimumVersion) {
+    static ReplaceMallocBridge* sSingleton = get_bridge();
+    return (sSingleton && sSingleton->mVersion >= aMinimumVersion)
+      ? sSingleton : nullptr;
+  }
+#endif
+
+protected:
+  const int mVersion;
+};
+
+#ifndef REPLACE_MALLOC_IMPL
+/* Class containing wrappers for calls to ReplaceMallocBridge methods.
+ * Those wrappers need to be static methods in a class because compilers
+ * complain about unused static global functions, and linkers complain
+ * about multiple definitions of non-static global functions.
+ * Using a separate class from ReplaceMallocBridge allows the function
+ * names to be identical. */
+struct ReplaceMalloc
+{
+  /* Don't call this method from performance critical code. Use
+   * mozilla::dmd::DMDFuncs::Get() instead, it has less overhead. */
+  static mozilla::dmd::DMDFuncs* GetDMDFuncs()
+  {
+    auto singleton = ReplaceMallocBridge::Get(/* minimumVersion */ 1);
+    return singleton ? singleton->GetDMDFuncs() : nullptr;
+  }
+
+  static void InitDebugFd(mozilla::DebugFdRegistry& aRegistry)
+  {
+    auto singleton = ReplaceMallocBridge::Get(/* minimumVersion */ 2);
+    if (singleton) {
+      singleton->InitDebugFd(aRegistry);
+    }
+  }
+};
+#endif
+
+#endif /* __cplusplus */
+
+#endif /* replace_malloc_bridge_h */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/replace_malloc.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/replace_malloc.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/replace_malloc.c	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/replace_malloc.c	2014-11-26 21:45:59.000000000 +0000
@@ -22,6 +22,7 @@
 #include "malloc_decls.h"
 
 #include "mozilla/Likely.h"
+
 /*
  * Windows doesn't come with weak imports as they are possible with
  * LD_PRELOAD or DYLD_INSERT_LIBRARIES on Linux/OSX. On this platform,
@@ -131,6 +132,16 @@
     replace_init(&malloc_table);
 }
 
+MFBT_API struct ReplaceMallocBridge*
+get_bridge(void)
+{
+  if (MOZ_UNLIKELY(!replace_malloc_initialized))
+    init();
+  if (MOZ_LIKELY(!replace_get_bridge))
+    return NULL;
+  return replace_get_bridge();
+}
+
 void*
 malloc_impl(size_t size)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/replace_malloc.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/replace_malloc.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/build/replace_malloc.h	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/build/replace_malloc.h	2014-11-26 21:45:59.000000000 +0000
@@ -58,6 +58,15 @@
  * are taken care of by memory/replace/defs.mk.
  */
 
+#ifdef replace_malloc_bridge_h
+#error Do not include replace_malloc_bridge.h before replace_malloc.h. \
+  In fact, you only need the latter.
+#endif
+
+#define REPLACE_MALLOC_IMPL
+
+#include "replace_malloc_bridge.h"
+
 /* Implementing a replace-malloc library is incompatible with using mozalloc. */
 #define MOZ_NO_MOZALLOC 1
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/mozjemalloc/jemalloc.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/mozjemalloc/jemalloc.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/mozjemalloc/jemalloc.c	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/mozjemalloc/jemalloc.c	2014-11-26 21:45:59.000000000 +0000
@@ -200,18 +200,6 @@
  */
 /* #define	MALLOC_BALANCE */
 
-/*
- * MALLOC_PAGEFILE causes all mmap()ed memory to be backed by temporary
- * files, so that if a chunk is mapped, it is guaranteed to be swappable.
- * This avoids asynchronous OOM failures that are due to VM over-commit.
- */
-/* #define MALLOC_PAGEFILE */
-
-#ifdef MALLOC_PAGEFILE
-/* Write size when initializing a page file. */
-#  define MALLOC_PAGEFILE_WRITE_SIZE 512
-#endif
-
 #if defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID)
 #define	_GNU_SOURCE /* For mremap(2). */
 #if 0 /* Enable in order to test decommit code on Linux. */
@@ -296,6 +284,18 @@
 #define	MALLOC_DECOMMIT
 #endif
 
+/*
+ * Allow unmapping pages on all platforms. Note that if this is disabled,
+ * jemalloc will never unmap anything, instead recycling pages for later use.
+ */
+#define JEMALLOC_MUNMAP
+
+/*
+ * Enable limited chunk recycling on all platforms. Note that when
+ * JEMALLOC_MUNMAP is not defined, all chunks will be recycled unconditionally.
+ */
+#define JEMALLOC_RECYCLE
+
 #ifndef MOZ_MEMORY_WINDOWS
 #ifndef MOZ_MEMORY_SOLARIS
 #include <sys/cdefs.h>
@@ -765,6 +765,9 @@
 
 	/* Total region size. */
 	size_t	size;
+
+	/* True if zero-filled; used by chunk recycling code. */
+	bool	zeroed;
 };
 typedef rb_tree(extent_node_t) extent_tree_t;
 
@@ -1067,6 +1070,18 @@
 static unsigned		ncpus;
 #endif
 
+#ifdef JEMALLOC_MUNMAP
+static const bool config_munmap = true;
+#else
+static const bool config_munmap = false;
+#endif
+
+#ifdef JEMALLOC_RECYCLE
+static const bool config_recycle = true;
+#else
+static const bool config_recycle = false;
+#endif
+
 /*
  * When MALLOC_STATIC_SIZES is defined most of the parameters
  * controlling the malloc behavior are defined as compile-time constants
@@ -1161,6 +1176,12 @@
 #define calculate_arena_maxclass()					\
 	(chunksize - (arena_chunk_header_npages << pagesize_2pow))
 
+/*
+ * Recycle at most 128 chunks. With 1 MiB chunks, this means we retain at most
+ * 6.25% of the process address space on a 32-bit OS for later use.
+ */
+#define CHUNK_RECYCLE_LIMIT 128
+
 #ifdef MALLOC_STATIC_SIZES
 #define CHUNKSIZE_DEFAULT		((size_t) 1 << CHUNK_2POW_DEFAULT)
 static const size_t	chunksize =	CHUNKSIZE_DEFAULT;
@@ -1168,14 +1189,19 @@
 static const size_t	chunk_npages =	CHUNKSIZE_DEFAULT >> pagesize_2pow;
 #define arena_chunk_header_npages	calculate_arena_header_pages()
 #define arena_maxclass			calculate_arena_maxclass()
+static const size_t	recycle_limit = CHUNK_RECYCLE_LIMIT * CHUNKSIZE_DEFAULT;
 #else
 static size_t		chunksize;
 static size_t		chunksize_mask; /* (chunksize - 1). */
 static size_t		chunk_npages;
 static size_t		arena_chunk_header_npages;
 static size_t		arena_maxclass; /* Max size class for arenas. */
+static size_t		recycle_limit;
 #endif
 
+/* The current amount of recycled bytes, updated atomically. */
+static size_t recycled_size;
+
 /********/
 /*
  * Chunks.
@@ -1186,6 +1212,18 @@
 #endif
 
 /* Protects chunk-related data structures. */
+static malloc_mutex_t	chunks_mtx;
+
+/*
+ * Trees of chunks that were previously allocated (trees differ only in node
+ * ordering).  These are used when allocating chunks, in an attempt to re-use
+ * address space.  Depending on function, different tree orderings are needed,
+ * which is why there are two trees with the same contents.
+ */
+static extent_tree_t	chunks_szad_mmap;
+static extent_tree_t	chunks_ad_mmap;
+
+/* Protects huge allocation-related data structures. */
 static malloc_mutex_t	huge_mtx;
 
 /* Tree of chunks that are stand-alone huge allocations. */
@@ -1199,10 +1237,6 @@
 static size_t		huge_mapped;
 #endif
 
-#ifdef MALLOC_PAGEFILE
-static char		pagefile_templ[PATH_MAX];
-#endif
-
 /****************************/
 /*
  * base (internal allocation).
@@ -1297,9 +1331,6 @@
 static size_t	opt_small_max_2pow = SMALL_MAX_2POW_DEFAULT;
 static size_t	opt_chunk_2pow = CHUNK_2POW_DEFAULT;
 #endif
-#ifdef MALLOC_PAGEFILE
-static bool	opt_pagefile = false;
-#endif
 #ifdef MALLOC_UTRACE
 static bool	opt_utrace = false;
 #endif
@@ -1347,7 +1378,6 @@
 #endif
 static void	malloc_printf(const char *format, ...);
 #endif
-static bool	base_pages_alloc_mmap(size_t minsize);
 static bool	base_pages_alloc(size_t minsize);
 static void	*base_alloc(size_t size);
 static void	*base_calloc(size_t number, size_t size);
@@ -1356,15 +1386,16 @@
 #ifdef MALLOC_STATS
 static void	stats_print(arena_t *arena);
 #endif
-static void	*pages_map(void *addr, size_t size, int pfd);
+static void	*pages_map(void *addr, size_t size);
 static void	pages_unmap(void *addr, size_t size);
-static void	*chunk_alloc_mmap(size_t size, bool pagefile);
-#ifdef MALLOC_PAGEFILE
-static int	pagefile_init(size_t size);
-static void	pagefile_close(int pfd);
-#endif
-static void	*chunk_alloc(size_t size, bool zero, bool pagefile);
-static void	chunk_dealloc_mmap(void *chunk, size_t size);
+static void	*chunk_alloc_mmap(size_t size, size_t alignment);
+static void	*chunk_recycle(extent_tree_t *chunks_szad,
+	extent_tree_t *chunks_ad, size_t size,
+	size_t alignment, bool base, bool *zero);
+static void	*chunk_alloc(size_t size, size_t alignment, bool base, bool zero);
+static void	chunk_record(extent_tree_t *chunks_szad,
+	extent_tree_t *chunks_ad, void *chunk, size_t size);
+static bool	chunk_dalloc_mmap(void *chunk, size_t size);
 static void	chunk_dealloc(void *chunk, size_t size);
 #ifndef NO_TLS
 static arena_t	*choose_arena_hard(void);
@@ -1402,7 +1433,7 @@
 static bool	arena_new(arena_t *arena);
 static arena_t	*arenas_extend(unsigned ind);
 static void	*huge_malloc(size_t size, bool zero);
-static void	*huge_palloc(size_t alignment, size_t size);
+static void	*huge_palloc(size_t size, size_t alignment, bool zero);
 static void	*huge_ralloc(void *ptr, size_t size, size_t oldsize);
 static void	huge_dalloc(void *ptr);
 static void	malloc_print_stats(void);
@@ -1477,6 +1508,24 @@
  */
 /******************************************************************************/
 
+static inline size_t
+load_acquire_z(size_t *p)
+{
+	volatile size_t result = *p;
+#  ifdef MOZ_MEMORY_WINDOWS
+	/*
+	 * We use InterlockedExchange with a dummy value to insert a memory
+	 * barrier. This has been confirmed to generate the right instruction
+	 * and is also used by MinGW.
+	 */
+	volatile long dummy = 0;
+	InterlockedExchange(&dummy, 1);
+#  else
+	__sync_synchronize();
+#  endif
+	return result;
+}
+
 /*
  * umax2s() provides minimal integer printing functionality, which is
  * especially useful for situations where allocation in vsnprintf() calls would
@@ -1964,7 +2013,21 @@
 {
 
 #ifdef MOZ_MEMORY_WINDOWS
-	VirtualFree(addr, size, MEM_DECOMMIT);
+	/*
+	* The region starting at addr may have been allocated in multiple calls
+	* to VirtualAlloc and recycled, so decommitting the entire region in one
+	* go may not be valid. However, since we allocate at least a chunk at a
+	* time, we may touch any region in chunksized increments.
+	*/
+	size_t pages_size = min(size, chunksize -
+		CHUNK_ADDR2OFFSET((uintptr_t)addr));
+	while (size > 0) {
+		if (!VirtualFree(addr, pages_size, MEM_DECOMMIT))
+			abort();
+		addr = (void *)((uintptr_t)addr + pages_size);
+		size -= pages_size;
+		pages_size = min(size, chunksize);
+	}
 #else
 	if (mmap(addr, size, PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1,
 	    0) == MAP_FAILED)
@@ -1978,8 +2041,21 @@
 {
 
 #  ifdef MOZ_MEMORY_WINDOWS
-	if (!VirtualAlloc(addr, size, MEM_COMMIT, PAGE_READWRITE))
-		abort();
+	/*
+	* The region starting at addr may have been allocated in multiple calls
+	* to VirtualAlloc and recycled, so committing the entire region in one
+	* go may not be valid. However, since we allocate at least a chunk at a
+	* time, we may touch any region in chunksized increments.
+	*/
+	size_t pages_size = min(size, chunksize -
+		CHUNK_ADDR2OFFSET((uintptr_t)addr));
+	while (size > 0) {
+		if (!VirtualAlloc(addr, pages_size, MEM_COMMIT, PAGE_READWRITE))
+			abort();
+		addr = (void *)((uintptr_t)addr + pages_size);
+		size -= pages_size;
+		pages_size = min(size, chunksize);
+	}
 #  else
 	if (mmap(addr, size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE |
 	    MAP_ANON, -1, 0) == MAP_FAILED)
@@ -1989,30 +2065,18 @@
 }
 
 static bool
-base_pages_alloc_mmap(size_t minsize)
+base_pages_alloc(size_t minsize)
 {
-	bool ret;
 	size_t csize;
 #if defined(MALLOC_DECOMMIT) || defined(MALLOC_STATS)
 	size_t pminsize;
 #endif
-	int pfd;
 
 	assert(minsize != 0);
 	csize = CHUNK_CEILING(minsize);
-#ifdef MALLOC_PAGEFILE
-	if (opt_pagefile) {
-		pfd = pagefile_init(csize);
-		if (pfd == -1)
-			return (true);
-	} else
-#endif
-		pfd = -1;
-	base_pages = pages_map(NULL, csize, pfd);
-	if (base_pages == NULL) {
-		ret = true;
-		goto RETURN;
-	}
+	base_pages = chunk_alloc(csize, chunksize, true, false);
+	if (base_pages == NULL)
+		return (true);
 	base_next_addr = base_pages;
 	base_past_addr = (void *)((uintptr_t)base_pages + csize);
 #if defined(MALLOC_DECOMMIT) || defined(MALLOC_STATS)
@@ -2032,25 +2096,9 @@
 #  endif
 #endif
 
-	ret = false;
-RETURN:
-#ifdef MALLOC_PAGEFILE
-	if (pfd != -1)
-		pagefile_close(pfd);
-#endif
 	return (false);
 }
 
-static bool
-base_pages_alloc(size_t minsize)
-{
-
-	if (base_pages_alloc_mmap(minsize) == false)
-		return (false);
-
-	return (true);
-}
-
 static void *
 base_alloc(size_t size)
 {
@@ -2301,7 +2349,7 @@
 #ifdef MOZ_MEMORY_WINDOWS
 
 static void *
-pages_map(void *addr, size_t size, int pfd)
+pages_map(void *addr, size_t size)
 {
 	void *ret = NULL;
 	ret = VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE,
@@ -2322,7 +2370,7 @@
 #else
 #ifdef JEMALLOC_USES_MAP_ALIGN
 static void *
-pages_map_align(size_t size, int pfd, size_t alignment)
+pages_map_align(size_t size, size_t alignment)
 {
 	void *ret;
 
@@ -2330,16 +2378,8 @@
 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
 	 * of existing mappings, and we only want to create new mappings.
 	 */
-#ifdef MALLOC_PAGEFILE
-	if (pfd != -1) {
-		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-		    MAP_NOSYNC | MAP_ALIGN, pfd, 0);
-	} else
-#endif
-	       {
-		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-		    MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
-	}
+	ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE,
+		MAP_PRIVATE | MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
 	assert(ret != NULL);
 
 	if (ret == MAP_FAILED)
@@ -2351,7 +2391,7 @@
 #endif
 
 static void *
-pages_map(void *addr, size_t size, int pfd)
+pages_map(void *addr, size_t size)
 {
 	void *ret;
 #if defined(__ia64__)
@@ -2379,16 +2419,8 @@
 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
 	 * of existing mappings, and we only want to create new mappings.
 	 */
-#ifdef MALLOC_PAGEFILE
-	if (pfd != -1) {
-		ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-		    MAP_NOSYNC, pfd, 0);
-	} else
-#endif
-	       {
-		ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-		    MAP_ANON, -1, 0);
-	}
+	ret = mmap(addr, size, PROT_READ | PROT_WRITE,
+		MAP_PRIVATE | MAP_ANON, -1, 0);
 	assert(ret != NULL);
 
 	if (ret == MAP_FAILED) {
@@ -2610,79 +2642,6 @@
 }
 #endif
 
-#if defined(MOZ_MEMORY_WINDOWS) || defined(JEMALLOC_USES_MAP_ALIGN) || defined(MALLOC_PAGEFILE)
-
-/* Allocate an aligned chunk while maintaining a 1:1 correspondence between
- * mmap and unmap calls.  This is important on Windows, but not elsewhere. */
-static void *
-chunk_alloc_mmap(size_t size, bool pagefile)
-{
-	void *ret;
-#ifndef JEMALLOC_USES_MAP_ALIGN
-	size_t offset;
-#endif
-	int pfd;
-
-#ifdef MALLOC_PAGEFILE
-	if (opt_pagefile && pagefile) {
-		pfd = pagefile_init(size);
-		if (pfd == -1)
-			return (NULL);
-	} else
-#endif
-		pfd = -1;
-
-#ifdef JEMALLOC_USES_MAP_ALIGN
-	ret = pages_map_align(size, pfd, chunksize);
-#else
-	ret = pages_map(NULL, size, pfd);
-	if (ret == NULL)
-		goto RETURN;
-
-	offset = CHUNK_ADDR2OFFSET(ret);
-	if (offset != 0) {
-		/* Deallocate, then try to allocate at (ret + size - offset). */
-		pages_unmap(ret, size);
-		ret = pages_map((void *)((uintptr_t)ret + size - offset), size,
-		    pfd);
-		while (ret == NULL) {
-			/*
-			 * Over-allocate in order to map a memory region that
-			 * is definitely large enough.
-			 */
-			ret = pages_map(NULL, size + chunksize, -1);
-			if (ret == NULL)
-				goto RETURN;
-			/*
-			 * Deallocate, then allocate the correct size, within
-			 * the over-sized mapping.
-			 */
-			offset = CHUNK_ADDR2OFFSET(ret);
-			pages_unmap(ret, size + chunksize);
-			if (offset == 0)
-				ret = pages_map(ret, size, pfd);
-			else {
-				ret = pages_map((void *)((uintptr_t)ret +
-				    chunksize - offset), size, pfd);
-			}
-			/*
-			 * Failure here indicates a race with another thread, so
-			 * try again.
-			 */
-		}
-	}
-RETURN:
-#endif
-#ifdef MALLOC_PAGEFILE
-	if (pfd != -1)
-		pagefile_close(pfd);
-#endif
-
-	return (ret);
-}
-
-#else /* ! (defined(MOZ_MEMORY_WINDOWS) || defined(JEMALLOC_USES_MAP_ALIGN) || defined(MALLOC_PAGEFILE)) */
-
 /* pages_trim, chunk_alloc_mmap_slow and chunk_alloc_mmap were cherry-picked
  * from upstream jemalloc 3.4.1 to fix Mozilla bug 956501. */
 
@@ -2697,17 +2656,32 @@
 static void *
 pages_trim(void *addr, size_t alloc_size, size_t leadsize, size_t size)
 {
-        size_t trailsize;
         void *ret = (void *)((uintptr_t)addr + leadsize);
 
         assert(alloc_size >= leadsize + size);
-        trailsize = alloc_size - leadsize - size;
+#ifdef MOZ_MEMORY_WINDOWS
+        {
+                void *new_addr;
 
-        if (leadsize != 0)
-                pages_unmap(addr, leadsize);
-        if (trailsize != 0)
-                pages_unmap((void *)((uintptr_t)ret + size), trailsize);
-        return (ret);
+                pages_unmap(addr, alloc_size);
+                new_addr = pages_map(ret, size);
+                if (new_addr == ret)
+                        return (ret);
+                if (new_addr)
+                        pages_unmap(new_addr, size);
+                return (NULL);
+        }
+#else
+        {
+                size_t trailsize = alloc_size - leadsize - size;
+
+                if (leadsize != 0)
+                        pages_unmap(addr, leadsize);
+                if (trailsize != 0)
+                        pages_unmap((void *)((uintptr_t)ret + size), trailsize);
+                return (ret);
+        }
+#endif
 }
 
 static void *
@@ -2721,7 +2695,7 @@
         if (alloc_size < size)
                 return (NULL);
         do {
-                pages = pages_map(NULL, alloc_size, -1);
+                pages = pages_map(NULL, alloc_size);
                 if (pages == NULL)
                         return (NULL);
                 leadsize = ALIGNMENT_CEILING((uintptr_t)pages, alignment) -
@@ -2734,8 +2708,11 @@
 }
 
 static void *
-chunk_alloc_mmap(size_t size, bool pagefile)
+chunk_alloc_mmap(size_t size, size_t alignment)
 {
+#ifdef JEMALLOC_USES_MAP_ALIGN
+        return pages_map_align(size, alignment);
+#else
         void *ret;
         size_t offset;
 
@@ -2752,100 +2729,193 @@
          * approach works most of the time.
          */
 
-        ret = pages_map(NULL, size, -1);
+        ret = pages_map(NULL, size);
         if (ret == NULL)
                 return (NULL);
-        offset = ALIGNMENT_ADDR2OFFSET(ret, chunksize);
+        offset = ALIGNMENT_ADDR2OFFSET(ret, alignment);
         if (offset != 0) {
                 pages_unmap(ret, size);
-                return (chunk_alloc_mmap_slow(size, chunksize));
+                return (chunk_alloc_mmap_slow(size, alignment));
         }
 
         assert(ret != NULL);
         return (ret);
+#endif
 }
 
-#endif /* defined(MOZ_MEMORY_WINDOWS) || defined(JEMALLOC_USES_MAP_ALIGN) || defined(MALLOC_PAGEFILE) */
-
-#ifdef MALLOC_PAGEFILE
-static int
-pagefile_init(size_t size)
+bool
+pages_purge(void *addr, size_t length)
 {
-	int ret;
-	size_t i;
-	char pagefile_path[PATH_MAX];
-	char zbuf[MALLOC_PAGEFILE_WRITE_SIZE];
+	bool unzeroed;
 
+#ifdef MALLOC_DECOMMIT
+	pages_decommit(addr, length);
+	unzeroed = false;
+#else
+#  ifdef MOZ_MEMORY_WINDOWS
 	/*
-	 * Create a temporary file, then immediately unlink it so that it will
-	 * not persist.
-	 */
-	strcpy(pagefile_path, pagefile_templ);
-	ret = mkstemp(pagefile_path);
-	if (ret == -1)
-		return (ret);
-	if (unlink(pagefile_path)) {
-		char buf[STRERROR_BUF];
-
-		strerror_r(errno, buf, sizeof(buf));
-		_malloc_message(_getprogname(), ": (malloc) Error in unlink(\"",
-		    pagefile_path, "\"):");
-		_malloc_message(buf, "\n", "", "");
-		if (opt_abort)
-			abort();
+	* The region starting at addr may have been allocated in multiple calls
+	* to VirtualAlloc and recycled, so resetting the entire region in one
+	* go may not be valid. However, since we allocate at least a chunk at a
+	* time, we may touch any region in chunksized increments.
+	*/
+	size_t pages_size = min(length, chunksize -
+		CHUNK_ADDR2OFFSET((uintptr_t)addr));
+	while (length > 0) {
+		VirtualAlloc(addr, pages_size, MEM_RESET, PAGE_READWRITE);
+		addr = (void *)((uintptr_t)addr + pages_size);
+		length -= pages_size;
+		pages_size = min(length, chunksize);
 	}
+	unzeroed = true;
+#  else
+#    ifdef MOZ_MEMORY_LINUX
+#      define JEMALLOC_MADV_PURGE MADV_DONTNEED
+#      define JEMALLOC_MADV_ZEROS true
+#    else /* FreeBSD and Darwin. */
+#      define JEMALLOC_MADV_PURGE MADV_FREE
+#      define JEMALLOC_MADV_ZEROS false
+#    endif
+	int err = madvise(addr, length, JEMALLOC_MADV_PURGE);
+	unzeroed = (JEMALLOC_MADV_ZEROS == false || err != 0);
+#    undef JEMALLOC_MADV_PURGE
+#    undef JEMALLOC_MADV_ZEROS
+#  endif
+#endif
+	return (unzeroed);
+}
 
-	/*
-	 * Write sequential zeroes to the file in order to assure that disk
-	 * space is committed, with minimal fragmentation.  It would be
-	 * sufficient to write one zero per disk block, but that potentially
-	 * results in more system calls, for no real gain.
-	 */
-	memset(zbuf, 0, sizeof(zbuf));
-	for (i = 0; i < size; i += sizeof(zbuf)) {
-		if (write(ret, zbuf, sizeof(zbuf)) != sizeof(zbuf)) {
-			if (errno != ENOSPC) {
-				char buf[STRERROR_BUF];
+static void *
+chunk_recycle(extent_tree_t *chunks_szad, extent_tree_t *chunks_ad, size_t size,
+    size_t alignment, bool base, bool *zero)
+{
+	void *ret;
+	extent_node_t *node;
+	extent_node_t key;
+	size_t alloc_size, leadsize, trailsize;
+	bool zeroed;
 
-				strerror_r(errno, buf, sizeof(buf));
-				_malloc_message(_getprogname(),
-				    ": (malloc) Error in write(): ", buf, "\n");
-				if (opt_abort)
-					abort();
+	if (base) {
+		/*
+		 * This function may need to call base_node_{,de}alloc(), but
+		 * the current chunk allocation request is on behalf of the
+		 * base allocator.  Avoid deadlock (and if that weren't an
+		 * issue, potential for infinite recursion) by returning NULL.
+		 */
+		return (NULL);
+	}
+
+	alloc_size = size + alignment - chunksize;
+	/* Beware size_t wrap-around. */
+	if (alloc_size < size)
+		return (NULL);
+	key.addr = NULL;
+	key.size = alloc_size;
+	malloc_mutex_lock(&chunks_mtx);
+	node = extent_tree_szad_nsearch(chunks_szad, &key);
+	if (node == NULL) {
+		malloc_mutex_unlock(&chunks_mtx);
+		return (NULL);
+	}
+	leadsize = ALIGNMENT_CEILING((uintptr_t)node->addr, alignment) -
+	    (uintptr_t)node->addr;
+	assert(node->size >= leadsize + size);
+	trailsize = node->size - leadsize - size;
+	ret = (void *)((uintptr_t)node->addr + leadsize);
+	zeroed = node->zeroed;
+	if (zeroed)
+	    *zero = true;
+	/* Remove node from the tree. */
+	extent_tree_szad_remove(chunks_szad, node);
+	extent_tree_ad_remove(chunks_ad, node);
+	if (leadsize != 0) {
+		/* Insert the leading space as a smaller chunk. */
+		node->size = leadsize;
+		extent_tree_szad_insert(chunks_szad, node);
+		extent_tree_ad_insert(chunks_ad, node);
+		node = NULL;
+	}
+	if (trailsize != 0) {
+		/* Insert the trailing space as a smaller chunk. */
+		if (node == NULL) {
+			/*
+			 * An additional node is required, but
+			 * base_node_alloc() can cause a new base chunk to be
+			 * allocated.  Drop chunks_mtx in order to avoid
+			 * deadlock, and if node allocation fails, deallocate
+			 * the result before returning an error.
+			 */
+			malloc_mutex_unlock(&chunks_mtx);
+			node = base_node_alloc();
+			if (node == NULL) {
+				chunk_dealloc(ret, size);
+				return (NULL);
 			}
-			pagefile_close(ret);
-			return (-1);
+			malloc_mutex_lock(&chunks_mtx);
 		}
+		node->addr = (void *)((uintptr_t)(ret) + size);
+		node->size = trailsize;
+		node->zeroed = zeroed;
+		extent_tree_szad_insert(chunks_szad, node);
+		extent_tree_ad_insert(chunks_ad, node);
+		node = NULL;
 	}
 
-	return (ret);
-}
+	if (config_munmap && config_recycle)
+		recycled_size -= size;
 
-static void
-pagefile_close(int pfd)
-{
+	malloc_mutex_unlock(&chunks_mtx);
 
-	if (close(pfd)) {
-		char buf[STRERROR_BUF];
+	if (node != NULL)
+		base_node_dealloc(node);
+#ifdef MALLOC_DECOMMIT
+	pages_commit(ret, size);
+#endif
+	if (*zero) {
+		if (zeroed == false)
+			memset(ret, 0, size);
+#ifdef DEBUG
+		else {
+			size_t i;
+			size_t *p = (size_t *)(uintptr_t)ret;
 
-		strerror_r(errno, buf, sizeof(buf));
-		_malloc_message(_getprogname(),
-		    ": (malloc) Error in close(): ", buf, "\n");
-		if (opt_abort)
-			abort();
+			for (i = 0; i < size / sizeof(size_t); i++)
+				assert(p[i] == 0);
+		}
+#endif
 	}
+	return (ret);
 }
+
+#ifdef MOZ_MEMORY_WINDOWS
+/*
+ * On Windows, calls to VirtualAlloc and VirtualFree must be matched, making it
+ * awkward to recycle allocations of varying sizes. Therefore we only allow
+ * recycling when the size equals the chunksize, unless deallocation is entirely
+ * disabled.
+ */
+#define CAN_RECYCLE(size) (size == chunksize)
+#else
+#define CAN_RECYCLE(size) true
 #endif
 
 static void *
-chunk_alloc(size_t size, bool zero, bool pagefile)
+chunk_alloc(size_t size, size_t alignment, bool base, bool zero)
 {
 	void *ret;
 
 	assert(size != 0);
 	assert((size & chunksize_mask) == 0);
+	assert(alignment != 0);
+	assert((alignment & chunksize_mask) == 0);
 
-	ret = chunk_alloc_mmap(size, pagefile);
+	if (!config_munmap || (config_recycle && CAN_RECYCLE(size))) {
+		ret = chunk_recycle(&chunks_szad_mmap, &chunks_ad_mmap,
+			size, alignment, base, &zero);
+		if (ret != NULL)
+			goto RETURN;
+	}
+	ret = chunk_alloc_mmap(size, alignment);
 	if (ret != NULL) {
 		goto RETURN;
 	}
@@ -2855,7 +2925,7 @@
 RETURN:
 
 #ifdef MALLOC_VALIDATE
-	if (ret != NULL) {
+	if (ret != NULL && base == false) {
 		if (malloc_rtree_set(chunk_rtree, (uintptr_t)ret, ret)) {
 			chunk_dealloc(ret, size);
 			return (NULL);
@@ -2868,12 +2938,108 @@
 }
 
 static void
-chunk_dealloc_mmap(void *chunk, size_t size)
+chunk_record(extent_tree_t *chunks_szad, extent_tree_t *chunks_ad, void *chunk,
+    size_t size)
+{
+	bool unzeroed;
+	extent_node_t *xnode, *node, *prev, *xprev, key;
+
+	unzeroed = pages_purge(chunk, size);
+
+	/*
+	 * Allocate a node before acquiring chunks_mtx even though it might not
+	 * be needed, because base_node_alloc() may cause a new base chunk to
+	 * be allocated, which could cause deadlock if chunks_mtx were already
+	 * held.
+	 */
+	xnode = base_node_alloc();
+	/* Use xprev to implement conditional deferred deallocation of prev. */
+	xprev = NULL;
+
+	malloc_mutex_lock(&chunks_mtx);
+	key.addr = (void *)((uintptr_t)chunk + size);
+	node = extent_tree_ad_nsearch(chunks_ad, &key);
+	/* Try to coalesce forward. */
+	if (node != NULL && node->addr == key.addr) {
+		/*
+		 * Coalesce chunk with the following address range.  This does
+		 * not change the position within chunks_ad, so only
+		 * remove/insert from/into chunks_szad.
+		 */
+		extent_tree_szad_remove(chunks_szad, node);
+		node->addr = chunk;
+		node->size += size;
+		node->zeroed = (node->zeroed && (unzeroed == false));
+		extent_tree_szad_insert(chunks_szad, node);
+	} else {
+		/* Coalescing forward failed, so insert a new node. */
+		if (xnode == NULL) {
+			/*
+			 * base_node_alloc() failed, which is an exceedingly
+			 * unlikely failure.  Leak chunk; its pages have
+			 * already been purged, so this is only a virtual
+			 * memory leak.
+			 */
+			goto label_return;
+		}
+		node = xnode;
+		xnode = NULL; /* Prevent deallocation below. */
+		node->addr = chunk;
+		node->size = size;
+		node->zeroed = (unzeroed == false);
+		extent_tree_ad_insert(chunks_ad, node);
+		extent_tree_szad_insert(chunks_szad, node);
+	}
+
+	/* Try to coalesce backward. */
+	prev = extent_tree_ad_prev(chunks_ad, node);
+	if (prev != NULL && (void *)((uintptr_t)prev->addr + prev->size) ==
+	    chunk) {
+		/*
+		 * Coalesce chunk with the previous address range.  This does
+		 * not change the position within chunks_ad, so only
+		 * remove/insert node from/into chunks_szad.
+		 */
+		extent_tree_szad_remove(chunks_szad, prev);
+		extent_tree_ad_remove(chunks_ad, prev);
+
+		extent_tree_szad_remove(chunks_szad, node);
+		node->addr = prev->addr;
+		node->size += prev->size;
+		node->zeroed = (node->zeroed && prev->zeroed);
+		extent_tree_szad_insert(chunks_szad, node);
+
+		xprev = prev;
+	}
+
+	if (config_munmap && config_recycle)
+		recycled_size += size;
+
+label_return:
+	malloc_mutex_unlock(&chunks_mtx);
+	/*
+	 * Deallocate xnode and/or xprev after unlocking chunks_mtx in order to
+	 * avoid potential deadlock.
+	 */
+	if (xnode != NULL)
+		base_node_dealloc(xnode);
+	if (xprev != NULL)
+		base_node_dealloc(xprev);
+}
+
+static bool
+chunk_dalloc_mmap(void *chunk, size_t size)
 {
+	if (!config_munmap || (config_recycle && CAN_RECYCLE(size) &&
+			load_acquire_z(&recycled_size) < recycle_limit))
+		return true;
 
 	pages_unmap(chunk, size);
+	return false;
 }
 
+#undef CAN_RECYCLE
+
 static void
 chunk_dealloc(void *chunk, size_t size)
 {
@@ -2887,7 +3053,8 @@
 	malloc_rtree_set(chunk_rtree, (uintptr_t)chunk, NULL);
 #endif
 
-	chunk_dealloc_mmap(chunk, size);
+	if (chunk_dalloc_mmap(chunk, size))
+		chunk_record(&chunks_szad_mmap, &chunks_ad_mmap, chunk, size);
 }
 
 /*
@@ -3503,7 +3670,7 @@
 	 */
 	{
 		arena_chunk_t *chunk = (arena_chunk_t *)
-		    chunk_alloc(chunksize, true, true);
+		    chunk_alloc(chunksize, chunksize, false, true);
 		if (chunk == NULL)
 			return (NULL);
 
@@ -4293,7 +4460,7 @@
 		} else if (alignment <= chunksize)
 			ret = huge_malloc(ceil_size, false);
 		else
-			ret = huge_palloc(alignment, ceil_size);
+			ret = huge_palloc(ceil_size, alignment, false);
 	}
 
 	assert(((uintptr_t)ret & (alignment - 1)) == 0);
@@ -4886,6 +5053,12 @@
 static void *
 huge_malloc(size_t size, bool zero)
 {
+	return huge_palloc(size, chunksize, zero);
+}
+
+static void *
+huge_palloc(size_t size, size_t alignment, bool zero)
+{
 	void *ret;
 	size_t csize;
 	size_t psize;
@@ -4904,7 +5077,7 @@
 	if (node == NULL)
 		return (NULL);
 
-	ret = chunk_alloc(csize, zero, true);
+	ret = chunk_alloc(csize, alignment, false, zero);
 	if (ret == NULL) {
 		base_node_dealloc(node);
 		return (NULL);
@@ -4968,125 +5141,6 @@
 	return (ret);
 }
 
-/* Only handles large allocations that require more than chunk alignment. */
-static void *
-huge_palloc(size_t alignment, size_t size)
-{
-	void *ret;
-	size_t alloc_size, chunk_size, offset;
-	size_t psize;
-	extent_node_t *node;
-	int pfd;
-
-	/*
-	 * This allocation requires alignment that is even larger than chunk
-	 * alignment.  This means that huge_malloc() isn't good enough.
-	 *
-	 * Allocate almost twice as many chunks as are demanded by the size or
-	 * alignment, in order to assure the alignment can be achieved, then
-	 * unmap leading and trailing chunks.
-	 */
-	assert(alignment >= chunksize);
-
-	chunk_size = CHUNK_CEILING(size);
-
-	if (size >= alignment)
-		alloc_size = chunk_size + alignment - chunksize;
-	else
-		alloc_size = (alignment << 1) - chunksize;
-
-	/* Allocate an extent node with which to track the chunk. */
-	node = base_node_alloc();
-	if (node == NULL)
-		return (NULL);
-
-	/*
-	 * Windows requires that there be a 1:1 mapping between VM
-	 * allocation/deallocation operations.  Therefore, take care here to
-	 * acquire the final result via one mapping operation.
-	 *
-	 * The MALLOC_PAGEFILE code also benefits from this mapping algorithm,
-	 * since it reduces the number of page files.
-	 */
-#ifdef MALLOC_PAGEFILE
-	if (opt_pagefile) {
-		pfd = pagefile_init(size);
-		if (pfd == -1)
-			return (NULL);
-	} else
-#endif
-		pfd = -1;
-#ifdef JEMALLOC_USES_MAP_ALIGN
-		ret = pages_map_align(chunk_size, pfd, alignment);
-#else
-	do {
-		void *over;
-
-		over = chunk_alloc(alloc_size, false, false);
-		if (over == NULL) {
-			base_node_dealloc(node);
-			ret = NULL;
-			goto RETURN;
-		}
-
-		offset = (uintptr_t)over & (alignment - 1);
-		assert((offset & chunksize_mask) == 0);
-		assert(offset < alloc_size);
-		ret = (void *)((uintptr_t)over + offset);
-		chunk_dealloc(over, alloc_size);
-		ret = pages_map(ret, chunk_size, pfd);
-		/*
-		 * Failure here indicates a race with another thread, so try
-		 * again.
-		 */
-	} while (ret == NULL);
-#endif
-	/* Insert node into huge. */
-	node->addr = ret;
-	psize = PAGE_CEILING(size);
-	node->size = psize;
-
-	malloc_mutex_lock(&huge_mtx);
-	extent_tree_ad_insert(&huge, node);
-#ifdef MALLOC_STATS
-	huge_nmalloc++;
-        /* See note in huge_alloc() for why huge_allocated += psize is correct
-         * here even when DECOMMIT is not defined. */
-	huge_allocated += psize;
-	huge_mapped += chunk_size;
-#endif
-	malloc_mutex_unlock(&huge_mtx);
-
-#ifdef MALLOC_DECOMMIT
-	if (chunk_size - psize > 0) {
-		pages_decommit((void *)((uintptr_t)ret + psize),
-		    chunk_size - psize);
-	}
-#endif
-
-#ifdef MALLOC_FILL
-	if (opt_junk)
-#  ifdef MALLOC_DECOMMIT
-		memset(ret, 0xa5, psize);
-#  else
-		memset(ret, 0xa5, chunk_size);
-#  endif
-	else if (opt_zero)
-#  ifdef MALLOC_DECOMMIT
-		memset(ret, 0, psize);
-#  else
-		memset(ret, 0, chunk_size);
-#  endif
-#endif
-
-RETURN:
-#ifdef MALLOC_PAGEFILE
-	if (pfd != -1)
-		pagefile_close(pfd);
-#endif
-	return (ret);
-}
-
 static void *
 huge_ralloc(void *ptr, size_t size, size_t oldsize)
 {
@@ -5343,9 +5397,6 @@
 		_malloc_message(opt_poison ? "C" : "c", "", "", "");
 		_malloc_message(opt_junk ? "J" : "j", "", "", "");
 #endif
-#ifdef MALLOC_PAGEFILE
-		_malloc_message(opt_pagefile ? "o" : "O", "", "", "");
-#endif
 		_malloc_message("P", "", "", "");
 #ifdef MALLOC_UTRACE
 		_malloc_message(opt_utrace ? "U" : "u", "", "", "");
@@ -5552,37 +5603,6 @@
 	pagesize_mask = (size_t) result - 1;
 	pagesize_2pow = ffs((int)result) - 1;
 #endif
-	
-#ifdef MALLOC_PAGEFILE
-	/*
-	 * Determine where to create page files.  It is insufficient to
-	 * unconditionally use P_tmpdir (typically "/tmp"), since for some
-	 * operating systems /tmp is a separate filesystem that is rather small.
-	 * Therefore prefer, in order, the following locations:
-	 *
-	 * 1) MALLOC_TMPDIR
-	 * 2) TMPDIR
-	 * 3) P_tmpdir
-	 */
-	{
-		char *s;
-		size_t slen;
-		static const char suffix[] = "/jemalloc.XXXXXX";
-
-		if ((s = getenv("MALLOC_TMPDIR")) == NULL && (s =
-		    getenv("TMPDIR")) == NULL)
-			s = P_tmpdir;
-		slen = strlen(s);
-		if (slen + sizeof(suffix) > sizeof(pagefile_templ)) {
-			_malloc_message(_getprogname(),
-			    ": (malloc) Page file path too long\n",
-			    "", "");
-			abort();
-		}
-		memcpy(pagefile_templ, s, slen);
-		memcpy(&pagefile_templ[slen], suffix, sizeof(suffix));
-	}
-#endif
 
 	for (i = 0; i < 3; i++) {
 		unsigned j;
@@ -5734,16 +5754,6 @@
 				case 'N':
 					opt_narenas_lshift++;
 					break;
-#ifdef MALLOC_PAGEFILE
-				case 'o':
-					/* Do not over-commit. */
-					opt_pagefile = true;
-					break;
-				case 'O':
-					/* Allow over-commit. */
-					opt_pagefile = false;
-					break;
-#endif
 				case 'p':
 					opt_print_stats = false;
 					break;
@@ -5863,8 +5873,12 @@
 
 	arena_chunk_header_npages = calculate_arena_header_pages();
 	arena_maxclass = calculate_arena_maxclass();
+
+	recycle_limit = CHUNK_RECYCLE_LIMIT * chunksize;
 #endif
 
+	recycled_size = 0;
+
 #ifdef JEMALLOC_USES_MAP_ALIGN
 	/*
 	 * When using MAP_ALIGN, the alignment parameter must be a power of two
@@ -5883,6 +5897,11 @@
 	assert(quantum * 4 <= chunksize);
 
 	/* Initialize chunks data. */
+	malloc_mutex_init(&chunks_mtx);
+	extent_tree_szad_new(&chunks_szad_mmap);
+	extent_tree_ad_new(&chunks_ad_mmap);
+
+	/* Initialize huge allocation data. */
 	malloc_mutex_init(&huge_mtx);
 	extent_tree_ad_new(&huge);
 #ifdef MALLOC_STATS
@@ -6728,6 +6747,17 @@
 		if (arena != NULL)
 			hard_purge_arena(arena);
 	}
+	if (!config_munmap || config_recycle) {
+		malloc_mutex_lock(&chunks_mtx);
+		extent_node_t *node = extent_tree_szad_first(&chunks_szad_mmap);
+		while (node) {
+			pages_decommit(node->addr, node->size);
+			pages_commit(node->addr, node->size);
+			node->zeroed = true;
+			node = extent_tree_szad_next(&chunks_szad_mmap, node);
+		}
+		malloc_mutex_unlock(&chunks_mtx);
+	}
 }
 
 #else /* !defined MALLOC_DOUBLE_PURGE */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/mozjemalloc/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/mozjemalloc/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/mozjemalloc/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/mozjemalloc/moz.build	2014-11-26 21:45:59.000000000 +0000
@@ -23,9 +23,6 @@
 
 DEFINES['abort'] = 'moz_abort'
 
-if CONFIG['MOZ_REPLACE_MALLOC']:
-    DEFINES['MOZ_REPLACE_MALLOC'] = True
-
 DEFINES['MOZ_JEMALLOC_IMPL'] = True
 
 #XXX: PGO on Linux causes problems here
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/DMD.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/DMD.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/DMD.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/DMD.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -4,8 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "DMD.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -45,6 +43,8 @@
 // DMD depend on XPCOM's object file.
 #include "CodeAddressService.h"
 
+// replace_malloc.h needs to be included before replace_malloc_bridge.h,
+// which DMD.h includes, so DMD.h needs to be included after replace_malloc.h.
 // MOZ_REPLACE_ONLY_MEMALIGN saves us from having to define
 // replace_{posix_memalign,aligned_alloc,valloc}.  It requires defining
 // PAGE_SIZE.  Nb: sysconf() is expensive, but it's only used for (the obsolete
@@ -66,9 +66,34 @@
 #undef MOZ_REPLACE_ONLY_MEMALIGN
 #undef PAGE_SIZE
 
+#include "DMD.h"
+
 namespace mozilla {
 namespace dmd {
 
+class DMDBridge : public ReplaceMallocBridge
+{
+  virtual DMDFuncs* GetDMDFuncs() MOZ_OVERRIDE;
+};
+
+static DMDBridge sDMDBridge;
+static DMDFuncs sDMDFuncs;
+
+DMDFuncs*
+DMDBridge::GetDMDFuncs()
+{
+  return &sDMDFuncs;
+}
+
+inline void
+StatusMsg(const char* aFmt, ...)
+{
+  va_list ap;
+  va_start(ap, aFmt);
+  sDMDFuncs.StatusMsg(aFmt, ap);
+  va_end(ap);
+}
+
 //---------------------------------------------------------------------------
 // Utilities
 //---------------------------------------------------------------------------
@@ -81,8 +106,8 @@
 
 static const malloc_table_t* gMallocTable = nullptr;
 
-// This enables/disables DMD.
-static bool gIsDMDRunning = false;
+// Whether DMD finished initializing.
+static bool gIsDMDInitialized = false;
 
 // This provides infallible allocations (they abort on OOM).  We use it for all
 // of DMD's own allocations, which fall into the following three cases.
@@ -197,26 +222,23 @@
   return gMallocTable->malloc_usable_size(const_cast<void*>(aPtr));
 }
 
-MOZ_EXPORT void
-StatusMsg(const char* aFmt, ...)
+void
+DMDFuncs::StatusMsg(const char* aFmt, va_list aAp)
 {
-  va_list ap;
-  va_start(ap, aFmt);
 #ifdef ANDROID
 #ifdef MOZ_B2G_LOADER
   // Don't call __android_log_vprint() during initialization, or the magic file
   // descriptors will be occupied by android logcat.
-  if (gIsDMDRunning)
+  if (gIsDMDInitialized)
 #endif
-    __android_log_vprint(ANDROID_LOG_INFO, "DMD", aFmt, ap);
+    __android_log_vprint(ANDROID_LOG_INFO, "DMD", aFmt, aAp);
 #else
   // The +64 is easily enough for the "DMD[<pid>] " prefix and the NUL.
   char* fmt = (char*) InfallibleAllocPolicy::malloc_(strlen(aFmt) + 64);
   sprintf(fmt, "DMD[%d] %s", getpid(), aFmt);
-  vfprintf(stderr, fmt, ap);
+  vfprintf(stderr, fmt, aAp);
   InfallibleAllocPolicy::free_(fmt);
 #endif
-  va_end(ap);
 }
 
 /* static */ void
@@ -374,7 +396,7 @@
 };
 
 // This lock must be held while manipulating global state, such as
-// gStackTraceTable, gBlockTable, etc.
+// gStackTraceTable, gLiveBlockTable, etc.
 static Mutex* gStateLock = nullptr;
 
 class AutoLockState
@@ -521,9 +543,7 @@
   {
     size_t n = 0;
     n += mSet.sizeOfExcludingThis(aMallocSizeOf);
-    for (StringHashSet::Range r = mSet.all();
-         !r.empty();
-         r.popFront()) {
+    for (auto r = mSet.all(); !r.empty(); r.popFront()) {
       n += aMallocSizeOf(r.front());
     }
     return n;
@@ -755,15 +775,15 @@
 };
 
 // A live heap block.
-class Block
+class LiveBlock
 {
   const void*  mPtr;
   const size_t mReqSize;    // size requested
 
   // Ptr: |mAllocStackTrace| - stack trace where this block was allocated.
-  // Tag bit 0: |mSampled| - was this block sampled? (if so, slop == 0).
+  // Tag bit 0: |mIsSampled| - was this block sampled? (if so, slop == 0).
   TaggedPtr<const StackTrace* const>
-    mAllocStackTrace_mSampled;
+    mAllocStackTrace_mIsSampled;
 
   // This array has two elements because we record at most two reports of a
   // block.
@@ -773,16 +793,16 @@
   //   allocation?  If so, DMD must not clear the report at the end of
   //   AnalyzeReports(). Only relevant if |mReportStackTrace| is non-nullptr.
   //
-  // |mPtr| is used as the key in BlockTable, so it's ok for this member
+  // |mPtr| is used as the key in LiveBlockTable, so it's ok for this member
   // to be |mutable|.
   mutable TaggedPtr<const StackTrace*> mReportStackTrace_mReportedOnAlloc[2];
 
 public:
-  Block(const void* aPtr, size_t aReqSize, const StackTrace* aAllocStackTrace,
-        bool aSampled)
+  LiveBlock(const void* aPtr, size_t aReqSize,
+            const StackTrace* aAllocStackTrace, bool aIsSampled)
     : mPtr(aPtr),
       mReqSize(aReqSize),
-      mAllocStackTrace_mSampled(aAllocStackTrace, aSampled),
+      mAllocStackTrace_mIsSampled(aAllocStackTrace, aIsSampled),
       mReportStackTrace_mReportedOnAlloc()     // all fields get zeroed
   {
     MOZ_ASSERT(aAllocStackTrace);
@@ -805,12 +825,12 @@
 
   bool IsSampled() const
   {
-    return mAllocStackTrace_mSampled.Tag();
+    return mAllocStackTrace_mIsSampled.Tag();
   }
 
   const StackTrace* AllocStackTrace() const
   {
-    return mAllocStackTrace_mSampled.Ptr();
+    return mAllocStackTrace_mIsSampled.Ptr();
   }
 
   const StackTrace* ReportStackTrace1() const
@@ -894,14 +914,14 @@
     return mozilla::HashGeneric(aPtr);
   }
 
-  static bool match(const Block& aB, const void* const& aPtr)
+  static bool match(const LiveBlock& aB, const void* const& aPtr)
   {
     return aB.mPtr == aPtr;
   }
 };
 
-typedef js::HashSet<Block, Block, InfallibleAllocPolicy> BlockTable;
-static BlockTable* gBlockTable = nullptr;
+typedef js::HashSet<LiveBlock, LiveBlock, InfallibleAllocPolicy> LiveBlockTable;
+static LiveBlockTable* gLiveBlockTable = nullptr;
 
 // Add a pointer to each live stack trace into the given StackTraceSet.  (A
 // stack trace is live if it's used by one of the live blocks.)
@@ -914,9 +934,8 @@
   aStackTraces.finish();
   aStackTraces.init(512);
 
-  for (BlockTable::Range r = gBlockTable->all(); !r.empty(); r.popFront()) {
-    const Block& b = r.front();
-    b.AddStackTracesToTable(aStackTraces);
+  for (auto r = gLiveBlockTable->all(); !r.empty(); r.popFront()) {
+    r.front().AddStackTracesToTable(aStackTraces);
   }
 }
 
@@ -954,8 +973,6 @@
 static void
 AllocCallback(void* aPtr, size_t aReqSize, Thread* aT)
 {
-  MOZ_ASSERT(gIsDMDRunning);
-
   if (!aPtr) {
     return;
   }
@@ -975,21 +992,20 @@
     if (gSmallBlockActualSizeCounter >= sampleBelowSize) {
       gSmallBlockActualSizeCounter -= sampleBelowSize;
 
-      Block b(aPtr, sampleBelowSize, StackTrace::Get(aT), /* sampled */ true);
-      (void)gBlockTable->putNew(aPtr, b);
+      LiveBlock b(aPtr, sampleBelowSize, StackTrace::Get(aT),
+                  /* isSampled */ true);
+      (void)gLiveBlockTable->putNew(aPtr, b);
     }
   } else {
     // If this block size is larger than the sample size, record it exactly.
-    Block b(aPtr, aReqSize, StackTrace::Get(aT), /* sampled */ false);
-    (void)gBlockTable->putNew(aPtr, b);
+    LiveBlock b(aPtr, aReqSize, StackTrace::Get(aT), /* isSampled */ false);
+    (void)gLiveBlockTable->putNew(aPtr, b);
   }
 }
 
 static void
 FreeCallback(void* aPtr, Thread* aT)
 {
-  MOZ_ASSERT(gIsDMDRunning);
-
   if (!aPtr) {
     return;
   }
@@ -997,7 +1013,7 @@
   AutoLockState lock;
   AutoBlockIntercepts block(aT);
 
-  gBlockTable->remove(aPtr);
+  gLiveBlockTable->remove(aPtr);
 
   if (gStackTraceTable->count() > gGCStackTraceTableWhenSizeExceeds) {
     GCStackTraces();
@@ -1019,12 +1035,18 @@
   mozilla::dmd::Init(aMallocTable);
 }
 
+ReplaceMallocBridge*
+replace_get_bridge()
+{
+  return &mozilla::dmd::sDMDBridge;
+}
+
 void*
 replace_malloc(size_t aSize)
 {
   using namespace mozilla::dmd;
 
-  if (!gIsDMDRunning) {
+  if (!gIsDMDInitialized) {
     // DMD hasn't started up, either because it wasn't enabled by the user, or
     // we're still in Init() and something has indirectly called malloc.  Do a
     // vanilla malloc.  (In the latter case, if it fails we'll crash.  But
@@ -1050,7 +1072,7 @@
 {
   using namespace mozilla::dmd;
 
-  if (!gIsDMDRunning) {
+  if (!gIsDMDInitialized) {
     return gMallocTable->calloc(aCount, aSize);
   }
 
@@ -1069,7 +1091,7 @@
 {
   using namespace mozilla::dmd;
 
-  if (!gIsDMDRunning) {
+  if (!gIsDMDInitialized) {
     return gMallocTable->realloc(aOldPtr, aSize);
   }
 
@@ -1106,7 +1128,7 @@
 {
   using namespace mozilla::dmd;
 
-  if (!gIsDMDRunning) {
+  if (!gIsDMDInitialized) {
     return gMallocTable->memalign(aAlignment, aSize);
   }
 
@@ -1125,7 +1147,7 @@
 {
   using namespace mozilla::dmd;
 
-  if (!gIsDMDRunning) {
+  if (!gIsDMDInitialized) {
     gMallocTable->free(aPtr);
     return;
   }
@@ -1266,11 +1288,8 @@
   StatusMsg("\n");
   StatusMsg("Bad entry in the $DMD environment variable: '%s'.\n", aArg);
   StatusMsg("\n");
-  StatusMsg("Valid values of $DMD are:\n");
-  StatusMsg("- undefined or \"\" or \"0\", which disables DMD, or\n");
-  StatusMsg("- \"1\", which enables it with the default options, or\n");
-  StatusMsg("- a whitespace-separated list of |--option=val| entries, which\n");
-  StatusMsg("  enables it with non-default options.\n");
+  StatusMsg("$DMD must be a whitespace-separated list of |--option=val|\n");
+  StatusMsg("entries.\n");
   StatusMsg("\n");
   StatusMsg("The following options are allowed;  defaults are shown in [].\n");
   StatusMsg("  --sample-below=<1..%d> Sample blocks smaller than this [%d]\n",
@@ -1304,18 +1323,13 @@
 static void
 Init(const malloc_table_t* aMallocTable)
 {
-  MOZ_ASSERT(!gIsDMDRunning);
-
   gMallocTable = aMallocTable;
 
   // DMD is controlled by the |DMD| environment variable.
-  // - If it's unset or empty or "0", DMD doesn't run.
-  // - Otherwise, the contents dictate DMD's behaviour.
+  const char* e = getenv("DMD");
 
-  char* e = getenv("DMD");
-
-  if (!e || strcmp(e, "") == 0 || strcmp(e, "0") == 0) {
-    return;
+  if (!e) {
+    e = "1";
   }
 
   StatusMsg("$DMD = '%s'\n", e);
@@ -1346,11 +1360,11 @@
     gStackTraceTable = InfallibleAllocPolicy::new_<StackTraceTable>();
     gStackTraceTable->init(8192);
 
-    gBlockTable = InfallibleAllocPolicy::new_<BlockTable>();
-    gBlockTable->init(8192);
+    gLiveBlockTable = InfallibleAllocPolicy::new_<LiveBlockTable>();
+    gLiveBlockTable->init(8192);
   }
 
-  gIsDMDRunning = true;
+  gIsDMDInitialized = true;
 }
 
 //---------------------------------------------------------------------------
@@ -1360,7 +1374,7 @@
 static void
 ReportHelper(const void* aPtr, bool aReportedOnAlloc)
 {
-  if (!gIsDMDRunning || !aPtr) {
+  if (!aPtr) {
     return;
   }
 
@@ -1369,7 +1383,7 @@
   AutoBlockIntercepts block(t);
   AutoLockState lock;
 
-  if (BlockTable::Ptr p = gBlockTable->lookup(aPtr)) {
+  if (LiveBlockTable::Ptr p = gLiveBlockTable->lookup(aPtr)) {
     p->Report(t, aReportedOnAlloc);
   } else {
     // We have no record of the block.  Do nothing.  Either:
@@ -1379,14 +1393,14 @@
   }
 }
 
-MOZ_EXPORT void
-Report(const void* aPtr)
+void
+DMDFuncs::Report(const void* aPtr)
 {
   ReportHelper(aPtr, /* onAlloc */ false);
 }
 
-MOZ_EXPORT void
-ReportOnAlloc(const void* aPtr)
+void
+DMDFuncs::ReportOnAlloc(const void* aPtr)
 {
   ReportHelper(aPtr, /* onAlloc */ true);
 }
@@ -1420,16 +1434,10 @@
 
   aSizes->Clear();
 
-  if (!gIsDMDRunning) {
-    return;
-  }
-
   StackTraceSet usedStackTraces;
   GatherUsedStackTraces(usedStackTraces);
 
-  for (StackTraceTable::Range r = gStackTraceTable->all();
-       !r.empty();
-       r.popFront()) {
+  for (auto r = gStackTraceTable->all(); !r.empty(); r.popFront()) {
     StackTrace* const& st = r.front();
 
     if (usedStackTraces.has(st)) {
@@ -1442,46 +1450,32 @@
   aSizes->mStackTraceTable =
     gStackTraceTable->sizeOfIncludingThis(MallocSizeOf);
 
-  aSizes->mBlockTable = gBlockTable->sizeOfIncludingThis(MallocSizeOf);
+  aSizes->mLiveBlockTable = gLiveBlockTable->sizeOfIncludingThis(MallocSizeOf);
 }
 
-MOZ_EXPORT void
-SizeOf(Sizes* aSizes)
+void
+DMDFuncs::SizeOf(Sizes* aSizes)
 {
   aSizes->Clear();
 
-  if (!gIsDMDRunning) {
-    return;
-  }
-
   AutoBlockIntercepts block(Thread::Fetch());
   AutoLockState lock;
   SizeOfInternal(aSizes);
 }
 
-MOZ_EXPORT void
-ClearReports()
+void
+DMDFuncs::ClearReports()
 {
-  if (!gIsDMDRunning) {
-    return;
-  }
-
   AutoLockState lock;
 
   // Unreport all blocks that were marked reported by a memory reporter.  This
   // excludes those that were reported on allocation, because they need to keep
   // their reported marking.
-  for (BlockTable::Range r = gBlockTable->all(); !r.empty(); r.popFront()) {
+  for (auto r = gLiveBlockTable->all(); !r.empty(); r.popFront()) {
     r.front().UnreportIfNotReportedOnAlloc();
   }
 }
 
-MOZ_EXPORT bool
-IsRunning()
-{
-  return gIsDMDRunning;
-}
-
 class ToIdStringConverter MOZ_FINAL
 {
 public:
@@ -1551,10 +1545,6 @@
 static void
 AnalyzeReportsImpl(UniquePtr<JSONWriteFunc> aWriter)
 {
-  if (!gIsDMDRunning) {
-    return;
-  }
-
   AutoBlockIntercepts block(Thread::Fetch());
   AutoLockState lock;
 
@@ -1590,8 +1580,8 @@
 
     writer.StartArrayProperty("blockList");
     {
-      for (BlockTable::Range r = gBlockTable->all(); !r.empty(); r.popFront()) {
-        const Block& b = r.front();
+      for (auto r = gLiveBlockTable->all(); !r.empty(); r.popFront()) {
+        const LiveBlock& b = r.front();
         b.AddStackTracesToTable(usedStackTraces);
 
         writer.StartObjectElement(writer.SingleLineStyle);
@@ -1625,8 +1615,8 @@
 
     writer.StartObjectProperty("traceTable");
     {
-      for (StackTraceSet::Enum e(usedStackTraces); !e.empty(); e.popFront()) {
-        const StackTrace* const st = e.front();
+      for (auto r = usedStackTraces.all(); !r.empty(); r.popFront()) {
+        const StackTrace* const st = r.front();
         writer.StartArrayProperty(isc.ToIdString(st), writer.SingleLineStyle);
         {
           for (uint32_t i = 0; i < st->Length(); i++) {
@@ -1686,10 +1676,10 @@
       Show(gStackTraceTable->capacity(), buf2, kBufLen),
       Show(gStackTraceTable->count(),    buf3, kBufLen));
 
-    StatusMsg("      Block table:          %10s bytes (%s entries, %s used)\n",
-      Show(sizes.mBlockTable,       buf1, kBufLen),
-      Show(gBlockTable->capacity(), buf2, kBufLen),
-      Show(gBlockTable->count(),    buf3, kBufLen));
+    StatusMsg("      Live block table:     %10s bytes (%s entries, %s used)\n",
+      Show(sizes.mLiveBlockTable,       buf1, kBufLen),
+      Show(gLiveBlockTable->capacity(), buf2, kBufLen),
+      Show(gLiveBlockTable->count(),    buf3, kBufLen));
 
     StatusMsg("    }\n");
     StatusMsg("    Data structures that are destroyed after Dump() ends {\n");
@@ -1727,8 +1717,8 @@
   StatusMsg("}\n");
 }
 
-MOZ_EXPORT void
-AnalyzeReports(UniquePtr<JSONWriteFunc> aWriter)
+void
+DMDFuncs::AnalyzeReports(UniquePtr<JSONWriteFunc> aWriter)
 {
   AnalyzeReportsImpl(Move(aWriter));
   ClearReports();
@@ -1738,16 +1728,16 @@
 // Testing
 //---------------------------------------------------------------------------
 
-MOZ_EXPORT void
-SetSampleBelowSize(size_t aSize)
+void
+DMDFuncs::SetSampleBelowSize(size_t aSize)
 {
   gOptions->SetSampleBelowSize(aSize);
 }
 
-MOZ_EXPORT void
-ClearBlocks()
+void
+DMDFuncs::ClearBlocks()
 {
-  gBlockTable->clear();
+  gLiveBlockTable->clear();
   gSmallBlockActualSizeCounter = 0;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/DMD.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/DMD.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/DMD.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/DMD.h	2014-11-26 21:45:59.000000000 +0000
@@ -8,23 +8,117 @@
 #define DMD_h___
 
 #include <string.h>
+#include <stdarg.h>
 
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Move.h"
 #include "mozilla/Types.h"
 #include "mozilla/UniquePtr.h"
 
+#include "replace_malloc_bridge.h"
+
 namespace mozilla {
 
 class JSONWriteFunc;
 
 namespace dmd {
 
+struct Sizes
+{
+  size_t mStackTracesUsed;
+  size_t mStackTracesUnused;
+  size_t mStackTraceTable;
+  size_t mLiveBlockTable;
+
+  Sizes() { Clear(); }
+  void Clear() { memset(this, 0, sizeof(Sizes)); }
+};
+
+// See further below for a description of each method. The DMDFuncs class
+// should contain a virtual method for each of them (except IsRunning,
+// which can be inferred from the DMDFuncs singleton existing).
+struct DMDFuncs
+{
+  virtual void Report(const void*);
+
+  virtual void ReportOnAlloc(const void*);
+
+  virtual void ClearReports();
+
+  virtual void AnalyzeReports(UniquePtr<JSONWriteFunc>);
+
+  virtual void SizeOf(Sizes*);
+
+  virtual void StatusMsg(const char*, va_list);
+
+  virtual void SetSampleBelowSize(size_t);
+
+  virtual void ClearBlocks();
+
+#ifndef REPLACE_MALLOC_IMPL
+  // We deliberately don't use ReplaceMalloc::GetDMDFuncs here, because if we
+  // did, the following would happen.
+  // - The code footprint of each call to Get() larger as GetDMDFuncs ends
+  //   up inlined.
+  // - When no replace-malloc library is loaded, the number of instructions
+  //   executed is equivalent, but don't necessarily fit in the same cache
+  //   line.
+  // - When a non-DMD replace-malloc library is loaded, the overhead is
+  //   higher because there is first a check for the replace malloc bridge
+  //   and then for the DMDFuncs singleton.
+  // Initializing the DMDFuncs singleton on the first access makes the
+  // overhead even worse. Either Get() is inlined and massive, or it isn't
+  // and a simple value check becomes a function call.
+  static DMDFuncs* Get() { return sSingleton.Get(); }
+
+private:
+  // Wrapper class keeping a pointer to the DMD functions. It is statically
+  // initialized because it needs to be set early enough.
+  // Debug builds also check that it's never accessed before the static
+  // initialization actually occured, which could be the case if some other
+  // static initializer ended up calling into DMD.
+  class Singleton
+  {
+  public:
+    Singleton() : mValue(ReplaceMalloc::GetDMDFuncs()), mInitialized(true) {}
+
+    DMDFuncs* Get()
+    {
+      MOZ_ASSERT(mInitialized);
+      return mValue;
+    }
+
+  private:
+    DMDFuncs* mValue;
+    DebugOnly<bool> mInitialized;
+  };
+
+  // This singleton pointer must be defined on the program side. In Gecko,
+  // this is done in xpcom/base/nsMemoryInfoDumper.cpp.
+  static /* DMDFuncs:: */Singleton sSingleton;
+#endif
+};
+
+#ifndef REPLACE_MALLOC_IMPL
 // Mark a heap block as reported by a memory reporter.
-MOZ_EXPORT void
-Report(const void* aPtr);
+inline void
+Report(const void* aPtr)
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->Report(aPtr);
+  }
+}
 
 // Mark a heap block as reported immediately on allocation.
-MOZ_EXPORT void
-ReportOnAlloc(const void* aPtr);
+inline void
+ReportOnAlloc(const void* aPtr)
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->ReportOnAlloc(aPtr);
+  }
+}
 
 // Clears existing reportedness data from any prior runs of the memory
 // reporters.  The following sequence should be used.
@@ -32,8 +126,14 @@
 // - run the memory reporters
 // - AnalyzeReports()
 // This sequence avoids spurious twice-reported warnings.
-MOZ_EXPORT void
-ClearReports();
+inline void
+ClearReports()
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->ClearReports();
+  }
+}
 
 // Determines which heap blocks have been reported, and dumps JSON output
 // (via |aWriter|) describing the heap.
@@ -121,42 +221,74 @@
 //     "H": "#00: quuux (Quux.cpp:567)"
 //   }
 // }
-MOZ_EXPORT void
-AnalyzeReports(mozilla::UniquePtr<mozilla::JSONWriteFunc>);
-
-struct Sizes
+// Implementation note: normally, this wouldn't be templated, but in that case,
+// the function is compiled, which makes the destructor for the UniquePtr fire up,
+// and that needs JSONWriteFunc to be fully defined. That, in turn, requires to
+// include JSONWriter.h, which includes double-conversion.h, which ends up breaking
+// various things built with -Werror for various reasons.
+template <typename JSONWriteFunc>
+inline void
+AnalyzeReports(UniquePtr<JSONWriteFunc> aWriteFunc)
 {
-  size_t mStackTracesUsed;
-  size_t mStackTracesUnused;
-  size_t mStackTraceTable;
-  size_t mBlockTable;
-
-  Sizes() { Clear(); }
-  void Clear() { memset(this, 0, sizeof(Sizes)); }
-};
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->AnalyzeReports(Move(aWriteFunc));
+  }
+}
 
 // Gets the size of various data structures.  Used to implement a memory
 // reporter for DMD.
-MOZ_EXPORT void
-SizeOf(Sizes* aSizes);
+inline void
+SizeOf(Sizes* aSizes)
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->SizeOf(aSizes);
+  }
+}
 
 // Prints a status message prefixed with "DMD[<pid>]". Use sparingly.
-MOZ_EXPORT void
-StatusMsg(const char* aFmt, ...);
+inline void
+StatusMsg(const char* aFmt, ...)
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    va_list ap;
+    va_start(ap, aFmt);
+    funcs->StatusMsg(aFmt, ap);
+    va_end(ap);
+  }
+}
 
 // Indicates whether or not DMD is running.
-MOZ_EXPORT bool
-IsRunning();
+inline bool
+IsRunning()
+{
+  return !!DMDFuncs::Get();
+}
 
 // Sets the sample-below size. Only used for testing purposes.
-MOZ_EXPORT void
-SetSampleBelowSize(size_t aSize);
+inline void
+SetSampleBelowSize(size_t aSize)
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->SetSampleBelowSize(aSize);
+  }
+}
 
 // Clears all records of live allocations. Only used for testing purposes.
-MOZ_EXPORT void
-ClearBlocks();
+inline void
+ClearBlocks()
+{
+  DMDFuncs* funcs = DMDFuncs::Get();
+  if (funcs) {
+    funcs->ClearBlocks();
+  }
+}
+#endif
 
-} // namespace mozilla
 } // namespace dmd
+} // namespace mozilla
 
 #endif /* DMD_h___ */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/test/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/test/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/test/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/test/moz.build	2014-11-26 21:45:59.000000000 +0000
@@ -18,8 +18,6 @@
 
 DISABLE_STL_WRAPPING = True
 
-USE_LIBS += ['dmd']
-
 XPCSHELL_TESTS_MANIFESTS += [
     'xpcshell.ini',
 ]
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/test/script-sort-by.json.gz and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/test/script-sort-by.json.gz differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/test/SmokeDMD.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/test/SmokeDMD.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/dmd/test/SmokeDMD.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/dmd/test/SmokeDMD.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -26,6 +26,8 @@
 using mozilla::MakeUnique;
 using namespace mozilla::dmd;
 
+DMDFuncs::Singleton DMDFuncs::sSingleton;
+
 class FpWriteFunc : public mozilla::JSONWriteFunc
 {
 public:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/FdPrintf.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/FdPrintf.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/FdPrintf.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/FdPrintf.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -7,12 +7,13 @@
 #include <cstdarg>
 
 #ifdef _WIN32
-#include <io.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #endif
 #include <cstring>
 #include "mozilla/Assertions.h"
+#include "mozilla/NullPtr.h"
 
 /* Template class allowing a limited number of increments on a value */
 template <typename T>
@@ -46,9 +47,9 @@
 };
 
 void
-FdPrintf(int aFd, const char* aFormat, ...)
+FdPrintf(intptr_t aFd, const char* aFormat, ...)
 {
-  if (aFd == -1) {
+  if (aFd == 0) {
     return;
   }
   char buf[256];
@@ -120,6 +121,12 @@
     f++;
   }
 out:
+#ifdef _WIN32
+  // See comment in FdPrintf.h as to why WriteFile is used.
+  DWORD written;
+  WriteFile(reinterpret_cast<HANDLE>(aFd), buf, b - buf, &written, nullptr);
+#else
   write(aFd, buf, b - buf);
+#endif
   va_end(ap);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/FdPrintf.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/FdPrintf.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/FdPrintf.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/FdPrintf.h	2014-11-26 21:45:59.000000000 +0000
@@ -12,8 +12,12 @@
  * Only %p and %z are supported.
  * /!\ This function used a fixed-size internal buffer. The caller is
  * expected to not use a format string that may overflow.
+ * The aFd argument is a file descriptor on UNIX and a native win32 file
+ * handle on Windows (from CreateFile). We can't use the windows POSIX
+ * APIs is that they don't support O_APPEND in a multi-process-safe way,
+ * while CreateFile does.
  */
-extern void FdPrintf(int aFd, const char* aFormat, ...)
+extern void FdPrintf(intptr_t aFd, const char* aFormat, ...)
 #ifdef __GNUC__
 __attribute__((format(printf, 2, 3)))
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/LogAlloc.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/LogAlloc.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/LogAlloc.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/LogAlloc.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -24,7 +24,8 @@
 #include "base/lock.h"
 
 static const malloc_table_t* sFuncs = nullptr;
-static int sFd = -1;
+static intptr_t sFd = 0;
+static bool sStdoutOrStderr = false;
 
 static Lock sLock;
 
@@ -48,6 +49,15 @@
 int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
 #endif
 
+class LogAllocBridge : public ReplaceMallocBridge
+{
+  virtual void InitDebugFd(mozilla::DebugFdRegistry& aRegistry) MOZ_OVERRIDE {
+    if (!sStdoutOrStderr) {
+      aRegistry.RegisterHandle(sFd);
+    }
+  }
+};
+
 void
 replace_init(const malloc_table_t* aTable)
 {
@@ -70,28 +80,56 @@
    * descriptor number. Other values are considered as a file name. */
   char* log = getenv("MALLOC_LOG");
   if (log && *log) {
-    sFd = 0;
+    int fd = 0;
     const char *fd_num = log;
     while (*fd_num) {
       /* Reject non digits. */
       if (*fd_num < '0' || *fd_num > '9') {
-        sFd = -1;
+        fd = -1;
         break;
       }
-      sFd = sFd * 10 + (*fd_num - '0');
+      fd = fd * 10 + (*fd_num - '0');
       /* Reject values >= 10000. */
-      if (sFd >= 10000) {
-        sFd = -1;
+      if (fd >= 10000) {
+        fd = -1;
         break;
       }
       fd_num++;
     }
-    if (sFd == -1) {
-      sFd = open(log, O_WRONLY | O_CREAT | O_APPEND, 0644);
+    if (fd == 1 || fd == 2) {
+      sStdoutOrStderr = true;
+    }
+#ifdef _WIN32
+    // See comment in FdPrintf.h as to why CreateFile is used.
+    HANDLE handle;
+    if (fd > 0) {
+      handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
+    } else {
+      handle = CreateFileA(log, FILE_APPEND_DATA, FILE_SHARE_READ |
+                           FILE_SHARE_WRITE, nullptr, OPEN_ALWAYS,
+                           FILE_ATTRIBUTE_NORMAL, nullptr);
+    }
+    if (handle != INVALID_HANDLE_VALUE) {
+      sFd = reinterpret_cast<intptr_t>(handle);
     }
+#else
+    if (fd == -1) {
+      fd = open(log, O_WRONLY | O_CREAT | O_APPEND, 0644);
+    }
+    if (fd > 0) {
+      sFd = fd;
+    }
+#endif
   }
 }
 
+ReplaceMallocBridge*
+replace_get_bridge()
+{
+  static LogAllocBridge bridge;
+  return &bridge;
+}
+
 /* Do a simple, text-form, log of all calls to replace-malloc functions.
  * Use locking to guarantee that an allocation that did happen is logged
  * before any other allocation/free happens.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/replay/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/replay/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/replay/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/replay/moz.build	2014-11-26 21:45:59.000000000 +0000
@@ -21,5 +21,3 @@
 ]
 
 DISABLE_STL_WRAPPING = True
-
-DEFINES['MOZ_REPLACE_MALLOC'] = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/replay/Replay.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/replay/Replay.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/memory/replace/logalloc/replay/Replay.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/memory/replace/logalloc/replay/Replay.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -346,7 +346,14 @@
 class Replay
 {
 public:
-  Replay(): mOps(0) {}
+  Replay(): mOps(0) {
+#ifdef _WIN32
+    // See comment in FdPrintf.h as to why native win32 handles are used.
+    mStdErr = reinterpret_cast<intptr_t>(GetStdHandle(STD_ERROR_HANDLE));
+#else
+    mStdErr = fileno(stderr);
+#endif
+  }
 
   MemSlot& operator[] (size_t index) const
   {
@@ -456,10 +463,11 @@
     }
     jemalloc_stats_t stats;
     ::jemalloc_stats_impl(&stats);
-    FdPrintf(2, "#%zu mapped: %zu; allocated: %zu; waste: %zu; dirty: %zu; "
-                "bookkeep: %zu; binunused: %zu\n", mOps, stats.mapped,
-                stats.allocated, stats.waste, stats.page_cache,
-                stats.bookkeeping, stats.bin_unused);
+    FdPrintf(mStdErr,
+             "#%zu mapped: %zu; allocated: %zu; waste: %zu; dirty: %zu; "
+             "bookkeep: %zu; binunused: %zu\n", mOps, stats.mapped,
+             stats.allocated, stats.waste, stats.page_cache,
+             stats.bookkeeping, stats.bin_unused);
     /* TODO: Add more data, like actual RSS as measured by OS, but compensated
      * for the replay internal data. */
   }
@@ -470,6 +478,7 @@
     memset(aSlot.mPtr, 0x5a, aSlot.mSize);
   }
 
+  intptr_t mStdErr;
   size_t mOps;
   MemSlotList mSlots;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/ChaosMode.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/ChaosMode.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/ChaosMode.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/ChaosMode.h	2014-11-26 21:45:59.000000000 +0000
@@ -7,6 +7,8 @@
 #ifndef mozilla_ChaosMode_h
 #define mozilla_ChaosMode_h
 
+#include "mozilla/EnumSet.h"
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -20,10 +22,29 @@
 class ChaosMode
 {
 public:
-  static bool isActive()
+  enum ChaosFeature {
+    None = 0x0,
+    // Altering thread scheduling.
+    ThreadScheduling = 0x1,
+    // Altering network request scheduling.
+    NetworkScheduling = 0x2,
+    // Altering timer scheduling.
+    TimerScheduling = 0x4,
+    // Read and write less-than-requested amounts.
+    IOAmounts = 0x8,
+    // Iterate over hash tables in random order.
+    HashTableIteration = 0x10,
+    Any = 0xffffffff,
+  };
+
+private:
+  // Change this to any non-None value to activate ChaosMode.
+  static const ChaosFeature sChaosFeatures = None;
+
+public:
+  static bool isActive(ChaosFeature aFeature)
   {
-    // Flip this to true to activate chaos mode
-    return false;
+    return sChaosFeatures & aFeature;
   }
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/CheckedInt.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/CheckedInt.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/CheckedInt.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/CheckedInt.h	2014-11-26 21:45:59.000000000 +0000
@@ -574,30 +574,35 @@
                                   const CheckedInt<U>& aRhs);
   template<typename U>
   CheckedInt& operator +=(U aRhs);
+  CheckedInt& operator +=(const CheckedInt<T>& aRhs);
 
   template<typename U>
   friend CheckedInt<U> operator -(const CheckedInt<U>& aLhs,
                                   const CheckedInt<U>& aRhs);
   template<typename U>
   CheckedInt& operator -=(U aRhs);
+  CheckedInt& operator -=(const CheckedInt<T>& aRhs);
 
   template<typename U>
   friend CheckedInt<U> operator *(const CheckedInt<U>& aLhs,
                                   const CheckedInt<U>& aRhs);
   template<typename U>
   CheckedInt& operator *=(U aRhs);
+  CheckedInt& operator *=(const CheckedInt<T>& aRhs);
 
   template<typename U>
   friend CheckedInt<U> operator /(const CheckedInt<U>& aLhs,
                                   const CheckedInt<U>& aRhs);
   template<typename U>
   CheckedInt& operator /=(U aRhs);
+  CheckedInt& operator /=(const CheckedInt<T>& aRhs);
 
   template<typename U>
   friend CheckedInt<U> operator %(const CheckedInt<U>& aLhs,
                                   const CheckedInt<U>& aRhs);
   template<typename U>
   CheckedInt& operator %=(U aRhs);
+  CheckedInt& operator %=(const CheckedInt<T>& aRhs);
 
   CheckedInt operator -() const
   {
@@ -723,23 +728,29 @@
   return detail::CastToCheckedIntImpl<T, U>::run(aU);
 }
 
-#define MOZ_CHECKEDINT_CONVENIENCE_BINARY_OPERATORS(OP, COMPOUND_OP)          \
-  template<typename T>                                                        \
-  template<typename U>                                                        \
-  CheckedInt<T>& CheckedInt<T>::operator COMPOUND_OP(U aRhs)                  \
-  {                                                                           \
-    *this = *this OP castToCheckedInt<T>(aRhs);                               \
-    return *this;                                                             \
-  }                                                                           \
-  template<typename T, typename U>                                            \
-  inline CheckedInt<T> operator OP(const CheckedInt<T>& aLhs, U aRhs)         \
-  {                                                                           \
-    return aLhs OP castToCheckedInt<T>(aRhs);                                 \
-  }                                                                           \
-  template<typename T, typename U>                                            \
-  inline CheckedInt<T> operator OP(U aLhs, const CheckedInt<T>& aRhs)         \
-  {                                                                           \
-    return castToCheckedInt<T>(aLhs) OP aRhs;                                 \
+#define MOZ_CHECKEDINT_CONVENIENCE_BINARY_OPERATORS(OP, COMPOUND_OP)            \
+  template<typename T>                                                          \
+  template<typename U>                                                          \
+  CheckedInt<T>& CheckedInt<T>::operator COMPOUND_OP(U aRhs)                    \
+  {                                                                             \
+    *this = *this OP castToCheckedInt<T>(aRhs);                                 \
+    return *this;                                                               \
+  }                                                                             \
+  template<typename T>                                                          \
+  CheckedInt<T>& CheckedInt<T>::operator COMPOUND_OP(const CheckedInt<T>& aRhs) \
+  {                                                                             \
+    *this = *this OP aRhs;                                                      \
+    return *this;                                                               \
+  }                                                                             \
+  template<typename T, typename U>                                              \
+  inline CheckedInt<T> operator OP(const CheckedInt<T>& aLhs, U aRhs)           \
+  {                                                                             \
+    return aLhs OP castToCheckedInt<T>(aRhs);                                   \
+  }                                                                             \
+  template<typename T, typename U>                                              \
+  inline CheckedInt<T> operator OP(U aLhs, const CheckedInt<T>& aRhs)           \
+  {                                                                             \
+    return castToCheckedInt<T>(aLhs) OP aRhs;                                   \
   }
 
 MOZ_CHECKEDINT_CONVENIENCE_BINARY_OPERATORS(+, +=)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/tests/TestCheckedInt.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/tests/TestCheckedInt.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/tests/TestCheckedInt.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/tests/TestCheckedInt.cpp	2014-11-26 21:45:59.000000000 +0000
@@ -422,6 +422,62 @@
   VERIFY_IS_FALSE(someInvalid == 1);
   VERIFY_IS_FALSE(1 == someInvalid);
 
+  // Check that compound operators work when both sides of the expression
+  // are checked integers
+  {
+    CheckedInt<T> x = one;
+    x += two;
+    VERIFY(x == three);
+  }
+  {
+    CheckedInt<T> x = two;
+    x -= one;
+    VERIFY(x == one);
+  }
+  {
+    CheckedInt<T> x = one;
+    x *= two;
+    VERIFY(x == two);
+  }
+  {
+    CheckedInt<T> x = four;
+    x /= two;
+    VERIFY(x == two);
+  }
+  {
+    CheckedInt<T> x = three;
+    x %= two;
+    VERIFY(x == one);
+  }
+
+  // Check that compound operators work when both sides of the expression
+  // are checked integers and the right-hand side is invalid
+  {
+    CheckedInt<T> x = one;
+    x += someInvalid;
+    VERIFY_IS_INVALID(x);
+  }
+  {
+    CheckedInt<T> x = two;
+    x -= someInvalid;
+    VERIFY_IS_INVALID(x);
+  }
+  {
+    CheckedInt<T> x = one;
+    x *= someInvalid;
+    VERIFY_IS_INVALID(x);
+  }
+  {
+    CheckedInt<T> x = four;
+    x /= someInvalid;
+    VERIFY_IS_INVALID(x);
+  }
+  {
+    CheckedInt<T> x = three;
+    x %= someInvalid;
+    VERIFY_IS_INVALID(x);
+  }
+
   // Check simple casting between different signedness and sizes.
   {
     CheckedInt<uint8_t> foo = CheckedInt<uint16_t>(2).toChecked<uint8_t>();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/WindowsVersion.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/WindowsVersion.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mfbt/WindowsVersion.h	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mfbt/WindowsVersion.h	2014-11-26 21:45:59.000000000 +0000
@@ -84,6 +84,44 @@
   return false;
 }
 
+#if defined(_M_X64) || defined(_M_AMD64)
+// We support only Win7 or later on Win64.
+MOZ_ALWAYS_INLINE bool
+IsXPSP3OrLater()
+{
+  return true;
+}
+
+MOZ_ALWAYS_INLINE bool
+IsWin2003OrLater()
+{
+  return true;
+}
+
+MOZ_ALWAYS_INLINE bool
+IsWin2003SP2OrLater()
+{
+  return true;
+}
+
+MOZ_ALWAYS_INLINE bool
+IsVistaOrLater()
+{
+  return true;
+}
+
+MOZ_ALWAYS_INLINE bool
+IsVistaSP1OrLater()
+{
+  return true;
+}
+
+MOZ_ALWAYS_INLINE bool
+IsWin7OrLater()
+{
+  return true;
+}
+#else
 MOZ_ALWAYS_INLINE bool
 IsXPSP3OrLater()
 {
@@ -119,6 +157,7 @@
 {
   return IsWindowsVersionOrLater(0x06010000ul);
 }
+#endif
 
 MOZ_ALWAYS_INLINE bool
 IsWin7SP1OrLater()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/android-services.mozbuild thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/android-services.mozbuild
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/android-services.mozbuild	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/android-services.mozbuild	2014-11-26 21:46:00.000000000 +0000
@@ -1137,8 +1137,8 @@
 ]
 
 sync_generated_java_files = [
-    'org/mozilla/gecko/background/common/GlobalConstants.java',
-    'org/mozilla/gecko/background/healthreport/HealthReportConstants.java',
-    'org/mozilla/gecko/fxa/FxAccountConstants.java',
-    'org/mozilla/gecko/sync/SyncConstants.java',
+    'background/common/GlobalConstants.java',
+    'background/healthreport/HealthReportConstants.java',
+    'fxa/FxAccountConstants.java',
+    'sync/SyncConstants.java',
 ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/animation/TransitionsTracker.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/animation/TransitionsTracker.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/animation/TransitionsTracker.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/animation/TransitionsTracker.java	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,119 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.animation;
+
+import com.nineoldandroids.animation.Animator;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener;
+import org.mozilla.gecko.util.ThreadUtils;
+
+
+/**
+ * {@link TransitionsTracker} provides a simple API to avoid running layout code
+ * during UI transitions. You should use it whenever you need to time-shift code
+ * that will likely trigger a layout traversal during an animation.
+ */
+public class TransitionsTracker {
+    private static final ArrayList<Runnable> pendingActions = new ArrayList<>();
+    private static int transitionCount;
+
+    private static final PropertyAnimationListener propertyAnimatorListener =
+            new PropertyAnimationListener() {
+        @Override
+        public void onPropertyAnimationStart() {
+            pushTransition();
+        }
+
+        @Override
+        public void onPropertyAnimationEnd() {
+            popTransition();
+        }
+    };
+
+    private static final Animator.AnimatorListener animatorListener =
+            new Animator.AnimatorListener() {
+        @Override
+        public void onAnimationStart(Animator animation) {
+            pushTransition();
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            popTransition();
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
+    };
+
+    private static void runPendingActions() {
+        ThreadUtils.assertOnUiThread();
+
+        final int size = pendingActions.size();
+        for (int i = 0; i < size; i++) {
+            pendingActions.get(i).run();
+        }
+
+        pendingActions.clear();
+    }
+
+    public static void pushTransition() {
+        ThreadUtils.assertOnUiThread();
+        transitionCount++;
+    }
+
+    public static void popTransition() {
+        ThreadUtils.assertOnUiThread();
+        transitionCount--;
+
+        if (transitionCount < 0) {
+            throw new IllegalStateException("Invalid transition stack update");
+        }
+
+        if (transitionCount == 0) {
+            runPendingActions();
+        }
+    }
+
+    public static boolean areTransitionsRunning() {
+        ThreadUtils.assertOnUiThread();
+        return (transitionCount > 0);
+    }
+
+    public static void track(PropertyAnimator animator) {
+        ThreadUtils.assertOnUiThread();
+        animator.addPropertyAnimationListener(propertyAnimatorListener);
+    }
+
+    public static void track(Animator animator) {
+        ThreadUtils.assertOnUiThread();
+        animator.addListener(animatorListener);
+    }
+
+    public static boolean cancelPendingAction(Runnable action) {
+        ThreadUtils.assertOnUiThread();
+        return pendingActions.removeAll(Collections.singleton(action));
+    }
+
+    public static void runAfterTransitions(Runnable action) {
+        ThreadUtils.assertOnUiThread();
+
+        if (transitionCount == 0) {
+            action.run();
+        } else {
+            pendingActions.add(action);
+        }
+    }
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/AppConstants.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/AppConstants.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/AppConstants.java.in	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/AppConstants.java.in	2014-11-26 21:45:59.000000000 +0000
@@ -6,10 +6,11 @@
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.mozglue.RobocopTarget;
-
 import android.os.Build;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * A collection of constants that pertain to the build and runtime state of the
  * application. Typically these are sourced from build-time definitions (see
@@ -19,7 +20,9 @@
  * See also SysInfo.java, which includes some of the values available from
  * nsSystemInfo inside Gecko.
  */
-@RobocopTarget
+// Normally, we'd annotate with @RobocopTarget.  Since AppConstants is compiled
+// before RobocopTarget, we instead add o.m.g.AppConstants directly to the
+// Proguard configuration.
 public class AppConstants {
     public static final String ANDROID_PACKAGE_NAME = "@ANDROID_PACKAGE_NAME@";
     public static final String MANGLED_ANDROID_PACKAGE_NAME = "@MANGLED_ANDROID_PACKAGE_NAME@";
@@ -262,4 +265,11 @@
 //#else
     false;
 //#endif
+
+    public static final boolean MOZ_LINKER_EXTRACT =
+//#ifdef MOZ_LINKER_EXTRACT
+    true;
+//#else
+    false;
+//#endif
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/background/fxa/FxAccountAgeLockoutHelper.java	2014-11-26 21:46:00.000000000 +0000
@@ -35,13 +35,13 @@
     // Otherwise, find out how long it's been since we last failed.
     long millsecondsSinceLastFailedAgeCheck = elapsedRealtime - ELAPSED_REALTIME_OF_LAST_FAILED_AGE_CHECK;
     boolean isLockedOut = millsecondsSinceLastFailedAgeCheck < FxAccountConstants.MINIMUM_TIME_TO_WAIT_AFTER_AGE_CHECK_FAILED_IN_MILLISECONDS;
-    FxAccountConstants.pii(LOG_TAG, "Checking if locked out: it's been " + millsecondsSinceLastFailedAgeCheck + "ms " +
+    FxAccountUtils.pii(LOG_TAG, "Checking if locked out: it's been " + millsecondsSinceLastFailedAgeCheck + "ms " +
         "since last lockout, so " + (isLockedOut ? "yes." : "no."));
     return isLockedOut;
   }
 
   public static synchronized void lockOut(long elapsedRealtime) {
-      FxAccountConstants.pii(LOG_TAG, "Locking out at time: " + elapsedRealtime);
+      FxAccountUtils.pii(LOG_TAG, "Locking out at time: " + elapsedRealtime);
       ELAPSED_REALTIME_OF_LAST_FAILED_AGE_CHECK = Math.max(elapsedRealtime, ELAPSED_REALTIME_OF_LAST_FAILED_AGE_CHECK);
   }
 
@@ -60,8 +60,8 @@
     int thisYear = Calendar.getInstance().get(Calendar.YEAR);
     int approximateAge = thisYear - yearOfBirth;
     boolean oldEnough = approximateAge >= FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
-      FxAccountConstants.pii(LOG_TAG, "Age check " + (oldEnough ? "passes" : "fails") +
+    if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+      FxAccountUtils.pii(LOG_TAG, "Age check " + (oldEnough ? "passes" : "fails") +
           ": age is " + approximateAge + " = " + thisYear + " - " + yearOfBirth);
     }
     return oldEnough;
@@ -79,7 +79,7 @@
     }
     if (!Arrays.asList(yearItems).contains(yearText)) {
       // This should never happen, but let's be careful.
-      FxAccountConstants.pii(LOG_TAG, "Failed age check: year text was not found in item list.");
+      FxAccountUtils.pii(LOG_TAG, "Failed age check: year text was not found in item list.");
       return false;
     }
     Integer yearOfBirth;
@@ -88,7 +88,7 @@
     } catch (NumberFormatException e) {
       // Any non-numbers in the list are ranges (and we say as much to
       // translators in the resource file), so these people pass the age check.
-      FxAccountConstants.pii(LOG_TAG, "Passed age check: year text was found in item list but was not a number.");
+      FxAccountUtils.pii(LOG_TAG, "Passed age check: year text was found in item list but was not a number.");
       return true;
     }
     return passesAgeCheck(yearOfBirth);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/background/fxa/FxAccountClient20.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/background/fxa/FxAccountClient20.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/background/fxa/FxAccountClient20.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/background/fxa/FxAccountClient20.java	2014-11-26 21:46:00.000000000 +0000
@@ -13,7 +13,6 @@
 import org.json.simple.JSONObject;
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
 import org.mozilla.gecko.sync.Utils;
 import org.mozilla.gecko.sync.net.BaseResource;
@@ -206,7 +205,7 @@
       final RequestDelegate<LoginResponse> delegate) {
     byte[] quickStretchedPW;
     try {
-      FxAccountConstants.pii(LOG_TAG, "Trying user provided email: '" + new String(emailUTF8, "UTF-8") + "'" );
+      FxAccountUtils.pii(LOG_TAG, "Trying user provided email: '" + new String(emailUTF8, "UTF-8") + "'" );
       quickStretchedPW = stretcher.getQuickStretchedPW(emailUTF8);
     } catch (Exception e) {
       delegate.handleError(e);
@@ -233,7 +232,7 @@
         };
 
         Logger.info(LOG_TAG, "Server returned alternate email; retrying login with provided email.");
-        FxAccountConstants.pii(LOG_TAG, "Trying server provided email: '" + alternateEmail + "'" );
+        FxAccountUtils.pii(LOG_TAG, "Trying server provided email: '" + alternateEmail + "'" );
 
         try {
           // Nota bene: this is not recursive, since we call the fixed password
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/background/fxa/FxAccountUtils.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/background/fxa/FxAccountUtils.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/background/fxa/FxAccountUtils.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/background/fxa/FxAccountUtils.java	2014-11-26 21:46:00.000000000 +0000
@@ -35,6 +35,16 @@
 
   public static final int NUMBER_OF_QUICK_STRETCH_ROUNDS = 1000;
 
+  // For extra debugging.  Not final so it can be changed from Fennec, or from
+  // an add-on.
+  public static boolean LOG_PERSONAL_INFORMATION = false;
+
+  public static void pii(String tag, String message) {
+    if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+      Logger.info(tag, "$$FxA PII$$: " + message);
+    }
+  }
+
   public static String bytes(String string) throws UnsupportedEncodingException {
     return Utils.byte2Hex(string.getBytes("UTF-8"));
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/BrowserApp.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/BrowserApp.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/BrowserApp.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/BrowserApp.java	2014-11-26 21:45:59.000000000 +0000
@@ -7,6 +7,7 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.lang.Override;
 import java.lang.reflect.Method;
 import java.net.URLEncoder;
 import java.util.EnumSet;
@@ -24,6 +25,7 @@
 import org.mozilla.gecko.GeckoProfileDirectories.NoMozillaDirectoryException;
 import org.mozilla.gecko.Tabs.TabEvents;
 import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.TransitionsTracker;
 import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
@@ -1769,6 +1771,15 @@
 
         if (areTabsShown()) {
             mTabsPanel.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
+            // Hide the web content from accessibility tools even though it's visible
+            // so that you can't examine it as long as the tabs are being shown.
+            if (Versions.feature16Plus) {
+                mLayerView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+            }
+        } else {
+            if (Versions.feature16Plus) {
+                mLayerView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+            }
         }
 
         mMainLayoutAnimator = new PropertyAnimator(animationLength, sTabsInterpolator);
@@ -1944,12 +1955,12 @@
     }
 
     /**
-     * Enters editing mode with the specified URL. This method will
-     * always open the HISTORY page on about:home.
+     * Enters editing mode with the specified URL. If a null
+     * url is given, the empty String will be used instead.
      */
     private void enterEditingMode(String url) {
         if (url == null) {
-            throw new IllegalArgumentException("Cannot handle null URLs in enterEditingMode");
+            url = "";
         }
 
         if (mBrowserToolbar.isEditing() || mBrowserToolbar.isAnimating()) {
@@ -1962,6 +1973,8 @@
         final PropertyAnimator animator = new PropertyAnimator(250);
         animator.setUseHardwareLayer(false);
 
+        TransitionsTracker.track(animator);
+
         mBrowserToolbar.startEditing(url, animator);
 
         final String panelId = selectedTab.getMostRecentHomePanel();
@@ -2728,7 +2741,7 @@
         bookmark.setVisible(!GeckoProfile.get(this).inGuestMode());
         bookmark.setCheckable(true);
         bookmark.setChecked(tab.isBookmark());
-        bookmark.setIcon(tab.isBookmark() ? R.drawable.ic_menu_bookmark_remove : R.drawable.ic_menu_bookmark_add);
+        bookmark.setIcon(resolveBookmarkIconID(tab.isBookmark()));
 
         back.setEnabled(tab.canDoBack());
         forward.setEnabled(tab.canDoForward());
@@ -2827,6 +2840,22 @@
         return true;
     }
 
+    private int resolveBookmarkIconID(final boolean isBookmark) {
+        if (NewTabletUI.isEnabled(this) && HardwareUtils.isLargeTablet()) {
+            if (isBookmark) {
+                return R.drawable.new_tablet_ic_menu_bookmark_remove;
+            } else {
+                return R.drawable.new_tablet_ic_menu_bookmark_add;
+            }
+        }
+
+        if (isBookmark) {
+            return R.drawable.ic_menu_bookmark_remove;
+        } else {
+            return R.drawable.ic_menu_bookmark_add;
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Tab tab = null;
@@ -2848,11 +2877,11 @@
                 if (item.isChecked()) {
                     Telemetry.sendUIEvent(TelemetryContract.Event.UNSAVE, TelemetryContract.Method.MENU, "bookmark");
                     tab.removeBookmark();
-                    item.setIcon(R.drawable.ic_menu_bookmark_add);
+                    item.setIcon(resolveBookmarkIconID(false));
                 } else {
                     Telemetry.sendUIEvent(TelemetryContract.Event.SAVE, TelemetryContract.Method.MENU, "bookmark");
                     tab.addBookmark();
-                    item.setIcon(R.drawable.ic_menu_bookmark_remove);
+                    item.setIcon(resolveBookmarkIconID(true));
                 }
             }
             return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/distribution/Distribution.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/distribution/Distribution.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/distribution/Distribution.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/distribution/Distribution.java	2014-11-26 21:46:00.000000000 +0000
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
-import java.util.Scanner;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
@@ -42,6 +41,7 @@
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.mozglue.RobocopTarget;
+import org.mozilla.gecko.util.FileUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.app.Activity;
@@ -286,7 +286,7 @@
         }
 
         try {
-            JSONObject all = new JSONObject(getFileContents(descFile));
+            JSONObject all = new JSONObject(FileUtils.getFileContents(descFile));
 
             if (!all.has("Global")) {
                 Log.e(LOGTAG, "Distribution preferences.json has no Global entry!");
@@ -314,7 +314,7 @@
         }
 
         try {
-            return new JSONArray(getFileContents(bookmarks));
+            return new JSONArray(FileUtils.getFileContents(bookmarks));
         } catch (IOException e) {
             Log.e(LOGTAG, "Error getting bookmarks", e);
             Telemetry.HistogramAdd(HISTOGRAM_CODE_CATEGORY, CODE_CATEGORY_MALFORMED_DISTRIBUTION);
@@ -739,19 +739,6 @@
         return null;
     }
 
-    // Shortcut to slurp a file without messing around with streams.
-    private String getFileContents(File file) throws IOException {
-        Scanner scanner = null;
-        try {
-            scanner = new Scanner(file, "UTF-8");
-            return scanner.useDelimiter("\\A").next();
-        } finally {
-            if (scanner != null) {
-                scanner.close();
-            }
-        }
-    }
-
     private String getDataDir() {
         return context.getApplicationInfo().dataDir;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/docs/gradle.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/docs/gradle.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/docs/gradle.rst	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/docs/gradle.rst	2014-11-26 21:46:00.000000000 +0000
@@ -10,8 +10,7 @@
 .. code-block:: shell
 
   ./mach build && ./mach package
-  cd $OBJDIR/mobile/android
-  ./gradlew build
+  ./mach gradle build
 
 The debug APK will be at
 ``$OBJDIR/mobile/android/gradle/app/build/outputs/apk/app-debug.apk``.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountAbstractSetupActivity.java	2014-11-26 21:46:00.000000000 +0000
@@ -324,7 +324,7 @@
       }
 
       // For great debugging.
-      if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+      if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
         fxAccount.dump();
       }
 
@@ -403,9 +403,9 @@
     // This sets defaults as well as extracting from extras, so it's not conditional.
     updateServersFromIntentExtras(getIntent());
 
-    if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
-      FxAccountConstants.pii(LOG_TAG, "Using auth server: " + authServerEndpoint);
-      FxAccountConstants.pii(LOG_TAG, "Using sync server: " + syncServerEndpoint);
+    if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+      FxAccountUtils.pii(LOG_TAG, "Using auth server: " + authServerEndpoint);
+      FxAccountUtils.pii(LOG_TAG, "Using sync server: " + syncServerEndpoint);
     }
 
     updateCustomServerView();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java	2014-11-26 21:46:00.000000000 +0000
@@ -19,8 +19,8 @@
 import org.mozilla.gecko.background.fxa.FxAccountClient20;
 import org.mozilla.gecko.background.fxa.FxAccountClient20.LoginResponse;
 import org.mozilla.gecko.background.fxa.FxAccountClientException.FxAccountClientRemoteException;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.background.fxa.PasswordStretcher;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.tasks.FxAccountCreateAccountTask;
 
 import android.app.AlertDialog;
@@ -250,10 +250,10 @@
             ? selectedEngines
             : null;
         if (FxAccountAgeLockoutHelper.passesAgeCheck(yearEdit.getText().toString(), yearItems)) {
-          FxAccountConstants.pii(LOG_TAG, "Passed age check.");
+          FxAccountUtils.pii(LOG_TAG, "Passed age check.");
           createAccount(email, password, engines);
         } else {
-          FxAccountConstants.pii(LOG_TAG, "Failed age check!");
+          FxAccountUtils.pii(LOG_TAG, "Failed age check!");
           FxAccountAgeLockoutHelper.lockOut(SystemClock.elapsedRealtime());
           setResult(RESULT_CANCELED);
           redirectToActivity(FxAccountCreateAccountNotAllowedActivity.class);
@@ -304,7 +304,7 @@
         selectedEngines.put("history", checkedItems[INDEX_HISTORY]);
         selectedEngines.put("tabs", checkedItems[INDEX_TABS]);
         selectedEngines.put("passwords", checkedItems[INDEX_PASSWORDS]);
-        FxAccountConstants.pii(LOG_TAG, "Updating selectedEngines: " + selectedEngines.toString());
+        FxAccountUtils.pii(LOG_TAG, "Updating selectedEngines: " + selectedEngines.toString());
       }
     };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java	2014-11-26 21:46:00.000000000 +0000
@@ -9,6 +9,7 @@
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.background.fxa.FxAccountAgeLockoutHelper;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.sync.setup.activities.ActivityUtils;
@@ -133,7 +134,7 @@
     TextView oldFirefox = (TextView) findViewById(R.id.old_firefox);
     String text = getResources().getString(R.string.fxaccount_getting_started_old_firefox);
     final String url = FirefoxAccounts.getOldSyncUpgradeURL(getResources(), Locale.getDefault());
-    FxAccountConstants.pii(LOG_TAG, "Old Firefox url is: " + url); // Don't want to leak locale in particular.
+    FxAccountUtils.pii(LOG_TAG, "Old Firefox url is: " + url); // Don't want to leak locale in particular.
     ActivityUtils.linkTextView(oldFirefox, text, url);
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountStatusFragment.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountStatusFragment.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountStatusFragment.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountStatusFragment.java	2014-11-26 21:46:00.000000000 +0000
@@ -10,6 +10,7 @@
 
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.log.Logger;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.background.preferences.PreferenceFragment;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.FxAccountConstants;
@@ -38,6 +39,7 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 
 /**
  * A fragment that displays the status of an AndroidFxAccount.
@@ -86,6 +88,7 @@
   protected EditTextPreference deviceNamePreference;
   protected Preference syncServerPreference;
   protected Preference morePreference;
+  protected Preference syncNowPreference;
 
   protected volatile AndroidFxAccount fxAccount;
   // The contract is: when fxAccount is non-null, then clientsDataDelegate is
@@ -143,7 +146,7 @@
     tabsPreference = (CheckBoxPreference) ensureFindPreference("tabs");
     passwordsPreference = (CheckBoxPreference) ensureFindPreference("passwords");
 
-    if (!FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+    if (!FxAccountUtils.LOG_PERSONAL_INFORMATION) {
       removeDebugButtons();
     } else {
       connectDebugButtons();
@@ -167,6 +170,10 @@
     morePreference = ensureFindPreference("more");
     morePreference.setOnPreferenceClickListener(this);
 
+    syncNowPreference = ensureFindPreference("sync_now");
+    syncNowPreference.setEnabled(true);
+    syncNowPreference.setOnPreferenceClickListener(this);
+
     if (HardwareUtils.hasMenuButton()) {
       syncCategory.removePreference(morePreference);
     }
@@ -229,6 +236,13 @@
       return true;
     }
 
+    if (preference == syncNowPreference) {
+      if (fxAccount != null) {
+        FirefoxAccounts.requestSync(fxAccount.getAndroidAccount(), FirefoxAccounts.FORCE, null, null);
+      }
+      return true;
+    }
+
     return false;
   }
 
@@ -250,6 +264,7 @@
     passwordsPreference.setEnabled(enabled);
     // Since we can't sync, we can't update our remote client record.
     deviceNamePreference.setEnabled(enabled);
+    syncNowPreference.setEnabled(enabled);
   }
 
   /**
@@ -470,6 +485,26 @@
     final String clientName = clientsDataDelegate.getClientName();
     deviceNamePreference.setSummary(clientName);
     deviceNamePreference.setText(clientName);
+
+    updateSyncNowPreference();
+  }
+
+  // This is a helper function similar to TabsAccessor.getLastSyncedString() to calculate relative "Last synced" time span.
+  private String getLastSyncedString(final long startTime) {
+    final CharSequence relativeTimeSpanString = DateUtils.getRelativeTimeSpanString(startTime);
+    return getActivity().getResources().getString(R.string.fxaccount_status_last_synced, relativeTimeSpanString);
+  }
+
+  protected void updateSyncNowPreference() {
+    final boolean currentlySyncing = fxAccount.isCurrentlySyncing();
+    syncNowPreference.setEnabled(!currentlySyncing);
+    if (currentlySyncing) {
+      syncNowPreference.setTitle(R.string.fxaccount_status_syncing);
+    } else {
+      syncNowPreference.setTitle(R.string.fxaccount_status_sync_now);
+    }
+    final String lastSynced = getLastSyncedString(fxAccount.getLastSyncedTimestamp());
+    syncNowPreference.setSummary(lastSynced);
   }
 
   protected void updateAuthServerPreference() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/activities/FxAccountUpdateCredentialsActivity.java	2014-11-26 21:46:00.000000000 +0000
@@ -17,7 +17,6 @@
 import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.background.fxa.PasswordStretcher;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
 import org.mozilla.gecko.fxa.login.Engaged;
 import org.mozilla.gecko.fxa.login.State;
@@ -156,7 +155,7 @@
       fxAccount.requestSync(FirefoxAccounts.FORCE);
 
       // For great debugging.
-      if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+      if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
         fxAccount.dump();
       }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/authenticator/AndroidFxAccount.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/authenticator/AndroidFxAccount.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/authenticator/AndroidFxAccount.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/authenticator/AndroidFxAccount.java	2014-11-26 21:46:00.000000000 +0000
@@ -65,6 +65,8 @@
 
   protected static final List<String> ANDROID_AUTHORITIES = Collections.unmodifiableList(Arrays.asList(BrowserContract.AUTHORITY));
 
+  private static final String PREF_KEY_LAST_SYNCED_TIMESTAMP = "lastSyncedTimestamp";
+
   protected final Context context;
   protected final AccountManager accountManager;
   protected final Account account;
@@ -514,14 +516,14 @@
    * <b>For debugging only!</b>
    */
   public void dump() {
-    if (!FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+    if (!FxAccountUtils.LOG_PERSONAL_INFORMATION) {
       return;
     }
     ExtendedJSONObject o = toJSONObject();
     ArrayList<String> list = new ArrayList<String>(o.keySet());
     Collections.sort(list);
     for (String key : list) {
-      FxAccountConstants.pii(LOG_TAG, key + ": " + o.get(key));
+      FxAccountUtils.pii(LOG_TAG, key + ": " + o.get(key));
     }
   }
 
@@ -565,4 +567,22 @@
     intent.putExtra(FxAccountConstants.ACCOUNT_DELETED_INTENT_ACCOUNT_KEY, account.name);
     return intent;
   }
+
+  public void setLastSyncedTimestamp(long now) {
+    try {
+      getSyncPrefs().edit().putLong(PREF_KEY_LAST_SYNCED_TIMESTAMP, now).commit();
+    } catch (Exception e) {
+      Logger.warn(LOG_TAG, "Got exception setting last synced time; ignoring.", e);
+    }
+  }
+
+  public long getLastSyncedTimestamp() {
+    final long neverSynced = -1L;
+    try {
+      return getSyncPrefs().getLong(PREF_KEY_LAST_SYNCED_TIMESTAMP, neverSynced);
+    } catch (Exception e) {
+      Logger.warn(LOG_TAG, "Got exception getting last synced time; ignoring.", e);
+      return neverSynced;
+    }
+  }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/FxAccountConstants.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/FxAccountConstants.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/FxAccountConstants.java.in	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/FxAccountConstants.java.in	2014-11-26 21:46:00.000000000 +0000
@@ -6,7 +6,6 @@
 package org.mozilla.gecko.fxa;
 
 import org.mozilla.gecko.background.common.GlobalConstants;
-import org.mozilla.gecko.background.common.log.Logger;
 
 public class FxAccountConstants {
   public static final String GLOBAL_LOG_TAG = "FxAccounts";
@@ -18,16 +17,6 @@
   public static final String STAGE_AUTH_SERVER_ENDPOINT = "https://api-accounts.stage.mozaws.net/v1";
   public static final String STAGE_TOKEN_SERVER_ENDPOINT = "https://token.stage.mozaws.net/1.0/sync/1.5";
 
-  // For extra debugging.  Not final so it can be changed from Fennec, or from
-  // an add-on.
-  public static boolean LOG_PERSONAL_INFORMATION = false;
-
-  public static void pii(String tag, String message) {
-    if (LOG_PERSONAL_INFORMATION) {
-      Logger.info(tag, "$$FxA PII$$: " + message);
-    }
-  }
-
   // You must be at least 14 years old to create a Firefox Account.
   public static final int MINIMUM_AGE_TO_CREATE_AN_ACCOUNT = 14;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/Cohabiting.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/Cohabiting.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/Cohabiting.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/Cohabiting.java	2014-11-26 21:46:00.000000000 +0000
@@ -4,9 +4,9 @@
 
 package org.mozilla.gecko.fxa.login;
 
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.browserid.BrowserIDKeyPair;
 import org.mozilla.gecko.browserid.JSONWebTokenUtils;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate;
 import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LogMessage;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
@@ -24,19 +24,19 @@
         new BaseRequestDelegate<String>(this, delegate) {
       @Override
       public void handleSuccess(String certificate) {
-        if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+        if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
           try {
-            FxAccountConstants.pii(LOG_TAG, "Fetched certificate: " + certificate);
+            FxAccountUtils.pii(LOG_TAG, "Fetched certificate: " + certificate);
             ExtendedJSONObject c = JSONWebTokenUtils.parseCertificate(certificate);
             if (c != null) {
-              FxAccountConstants.pii(LOG_TAG, "Header   : " + c.getObject("header"));
-              FxAccountConstants.pii(LOG_TAG, "Payload  : " + c.getObject("payload"));
-              FxAccountConstants.pii(LOG_TAG, "Signature: " + c.getString("signature"));
+              FxAccountUtils.pii(LOG_TAG, "Header   : " + c.getObject("header"));
+              FxAccountUtils.pii(LOG_TAG, "Payload  : " + c.getObject("payload"));
+              FxAccountUtils.pii(LOG_TAG, "Signature: " + c.getString("signature"));
             } else {
-              FxAccountConstants.pii(LOG_TAG, "Could not parse certificate!");
+              FxAccountUtils.pii(LOG_TAG, "Could not parse certificate!");
             }
           } catch (Exception e) {
-            FxAccountConstants.pii(LOG_TAG, "Could not parse certificate!");
+            FxAccountUtils.pii(LOG_TAG, "Could not parse certificate!");
           }
         }
         delegate.handleTransition(new LogMessage("sign succeeded"), new Married(email, uid, sessionToken, kA, kB, keyPair, certificate));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/Engaged.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/Engaged.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/Engaged.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/Engaged.java	2014-11-26 21:46:00.000000000 +0000
@@ -9,7 +9,6 @@
 import org.mozilla.gecko.background.fxa.FxAccountClient10.TwoKeys;
 import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.browserid.BrowserIDKeyPair;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate;
 import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.AccountVerified;
 import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LocalError;
@@ -61,10 +60,10 @@
         byte[] kB;
         try {
           kB = FxAccountUtils.unwrapkB(unwrapkB, result.wrapkB);
-          if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
-            FxAccountConstants.pii(LOG_TAG, "Fetched kA: " + Utils.byte2Hex(result.kA));
-            FxAccountConstants.pii(LOG_TAG, "And wrapkB: " + Utils.byte2Hex(result.wrapkB));
-            FxAccountConstants.pii(LOG_TAG, "Giving kB : " + Utils.byte2Hex(kB));
+          if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+            FxAccountUtils.pii(LOG_TAG, "Fetched kA: " + Utils.byte2Hex(result.kA));
+            FxAccountUtils.pii(LOG_TAG, "And wrapkB: " + Utils.byte2Hex(result.wrapkB));
+            FxAccountUtils.pii(LOG_TAG, "Giving kB : " + Utils.byte2Hex(kB));
           }
         } catch (Exception e) {
           delegate.handleTransition(new RemoteError(e), new Separated(email, uid, verified));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/Married.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/Married.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/Married.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/Married.java	2014-11-26 21:46:00.000000000 +0000
@@ -17,7 +17,6 @@
 import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.browserid.BrowserIDKeyPair;
 import org.mozilla.gecko.browserid.JSONWebTokenUtils;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.login.FxAccountLoginStateMachine.ExecuteDelegate;
 import org.mozilla.gecko.fxa.login.FxAccountLoginTransition.LogMessage;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
@@ -61,23 +60,23 @@
     // invalid-timestamp errors from the token server.
     final long expiresAt = JSONWebTokenUtils.DEFAULT_FUTURE_EXPIRES_AT_IN_MILLISECONDS;
     String assertion = JSONWebTokenUtils.createAssertion(keyPair.getPrivate(), certificate, audience, issuer, null, expiresAt);
-    if (!FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+    if (!FxAccountUtils.LOG_PERSONAL_INFORMATION) {
       return assertion;
     }
 
     try {
-      FxAccountConstants.pii(LOG_TAG, "Generated assertion: " + assertion);
+      FxAccountUtils.pii(LOG_TAG, "Generated assertion: " + assertion);
       ExtendedJSONObject a = JSONWebTokenUtils.parseAssertion(assertion);
       if (a != null) {
-        FxAccountConstants.pii(LOG_TAG, "aHeader   : " + a.getObject("header"));
-        FxAccountConstants.pii(LOG_TAG, "aPayload  : " + a.getObject("payload"));
-        FxAccountConstants.pii(LOG_TAG, "aSignature: " + a.getString("signature"));
+        FxAccountUtils.pii(LOG_TAG, "aHeader   : " + a.getObject("header"));
+        FxAccountUtils.pii(LOG_TAG, "aPayload  : " + a.getObject("payload"));
+        FxAccountUtils.pii(LOG_TAG, "aSignature: " + a.getString("signature"));
         String certificate = a.getString("certificate");
         if (certificate != null) {
           ExtendedJSONObject c = JSONWebTokenUtils.parseCertificate(certificate);
-          FxAccountConstants.pii(LOG_TAG, "cHeader   : " + c.getObject("header"));
-          FxAccountConstants.pii(LOG_TAG, "cPayload  : " + c.getObject("payload"));
-          FxAccountConstants.pii(LOG_TAG, "cSignature: " + c.getString("signature"));
+          FxAccountUtils.pii(LOG_TAG, "cHeader   : " + c.getObject("header"));
+          FxAccountUtils.pii(LOG_TAG, "cPayload  : " + c.getObject("payload"));
+          FxAccountUtils.pii(LOG_TAG, "cSignature: " + c.getString("signature"));
           // Print the relevant timestamps in sorted order with labels.
           HashMap<Long, String> map = new HashMap<Long, String>();
           map.put(a.getObject("payload").getLong("iat"), "aiat");
@@ -87,16 +86,16 @@
           ArrayList<Long> values = new ArrayList<Long>(map.keySet());
           Collections.sort(values);
           for (Long value : values) {
-            FxAccountConstants.pii(LOG_TAG, map.get(value) + ": " + value);
+            FxAccountUtils.pii(LOG_TAG, map.get(value) + ": " + value);
           }
         } else {
-          FxAccountConstants.pii(LOG_TAG, "Could not parse certificate!");
+          FxAccountUtils.pii(LOG_TAG, "Could not parse certificate!");
         }
       } else {
-        FxAccountConstants.pii(LOG_TAG, "Could not parse assertion!");
+        FxAccountUtils.pii(LOG_TAG, "Could not parse assertion!");
       }
     } catch (Exception e) {
-      FxAccountConstants.pii(LOG_TAG, "Got exception dumping assertion debug info.");
+      FxAccountUtils.pii(LOG_TAG, "Got exception dumping assertion debug info.");
     }
     return assertion;
   }
@@ -107,8 +106,8 @@
   }
 
   public String getClientState() {
-    if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
-      FxAccountConstants.pii(LOG_TAG, "Client state: " + this.clientState);
+    if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+      FxAccountUtils.pii(LOG_TAG, "Client state: " + this.clientState);
     }
     return this.clientState;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/StateFactory.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/StateFactory.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/login/StateFactory.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/login/StateFactory.java	2014-11-26 21:46:00.000000000 +0000
@@ -8,10 +8,10 @@
 import java.security.spec.InvalidKeySpecException;
 
 import org.mozilla.gecko.background.common.log.Logger;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.browserid.BrowserIDKeyPair;
 import org.mozilla.gecko.browserid.DSACryptoImplementation;
 import org.mozilla.gecko.browserid.RSACryptoImplementation;
-import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.login.State.StateLabel;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
 import org.mozilla.gecko.sync.NonObjectJSONException;
@@ -135,15 +135,15 @@
   }
 
   protected static void logMigration(State from, State to) {
-    if (!FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+    if (!FxAccountUtils.LOG_PERSONAL_INFORMATION) {
       return;
     }
     try {
-      FxAccountConstants.pii(LOG_TAG, "V1 persisted state is: " + from.toJSONObject().toJSONString());
+      FxAccountUtils.pii(LOG_TAG, "V1 persisted state is: " + from.toJSONObject().toJSONString());
     } catch (Exception e) {
       Logger.warn(LOG_TAG, "Error producing JSON representation of V1 state.", e);
     }
-    FxAccountConstants.pii(LOG_TAG, "Generated new V2 state: " + to.toJSONObject().toJSONString());
+    FxAccountUtils.pii(LOG_TAG, "Generated new V2 state: " + to.toJSONObject().toJSONString());
   }
 
   protected static State migrateV1toV2(StateLabel stateLabel, State state) throws NoSuchAlgorithmException {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/receivers/FxAccountUpgradeReceiver.java	2014-11-26 21:46:00.000000000 +0000
@@ -10,6 +10,7 @@
 import java.util.concurrent.Executors;
 
 import org.mozilla.gecko.background.common.log.Logger;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.fxa.FirefoxAccounts;
 import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
@@ -112,7 +113,7 @@
         try {
           final AndroidFxAccount fxAccount = new AndroidFxAccount(context, account);
           // For great debugging.
-          if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
+          if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
             fxAccount.dump();
           }
           State state = fxAccount.getState();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/sync/FxAccountNotificationManager.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/sync/FxAccountNotificationManager.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/sync/FxAccountNotificationManager.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/sync/FxAccountNotificationManager.java	2014-11-26 21:46:00.000000000 +0000
@@ -7,7 +7,7 @@
 import org.mozilla.gecko.BrowserLocaleManager;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.log.Logger;
-import org.mozilla.gecko.fxa.FxAccountConstants;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.fxa.activities.FxAccountStatusActivity;
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
 import org.mozilla.gecko.fxa.login.State;
@@ -70,7 +70,7 @@
     final String title = context.getResources().getString(R.string.fxaccount_sync_sign_in_error_notification_title);
     final String text = context.getResources().getString(R.string.fxaccount_sync_sign_in_error_notification_text, state.email);
     Logger.info(LOG_TAG, "State " + state.getStateLabel() + " needs action; offering notification with title: " + title);
-    FxAccountConstants.pii(LOG_TAG, "And text: " + text);
+    FxAccountUtils.pii(LOG_TAG, "And text: " + text);
 
     final Intent notificationIntent = new Intent(context, FxAccountStatusActivity.class);
     final PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/sync/FxAccountSchedulePolicy.java	2014-11-26 21:46:00.000000000 +0000
@@ -105,6 +105,7 @@
 
   @Override
   public void onSuccessfulSync(int otherClientsCount) {
+    this.account.setLastSyncedTimestamp(System.currentTimeMillis());
     // This undoes the change made in observeBackoffMillis -- once we hit backoff we'll
     // periodically sync at the backoff duration, but as soon as we succeed we'll switch
     // into the client-count-dependent interval.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/fxa/sync/FxAccountSyncAdapter.java	2014-11-26 21:46:00.000000000 +0000
@@ -17,6 +17,7 @@
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.background.fxa.FxAccountClient;
 import org.mozilla.gecko.background.fxa.FxAccountClient20;
+import org.mozilla.gecko.background.fxa.FxAccountUtils;
 import org.mozilla.gecko.background.fxa.SkewHandler;
 import org.mozilla.gecko.browserid.BrowserIDKeyPair;
 import org.mozilla.gecko.browserid.JSONWebTokenUtils;
@@ -315,7 +316,7 @@
 
       @Override
       public void handleSuccess(final TokenServerToken token) {
-        FxAccountConstants.pii(LOG_TAG, "Got token! uid is " + token.uid + " and endpoint is " + token.endpoint + ".");
+        FxAccountUtils.pii(LOG_TAG, "Got token! uid is " + token.uid + " and endpoint is " + token.endpoint + ".");
 
         if (!didReceiveBackoff) {
           // We must be OK to touch this token server.
@@ -358,9 +359,9 @@
         FxAccountGlobalSession globalSession = null;
         try {
           final ClientsDataDelegate clientsDataDelegate = new SharedPreferencesClientsDataDelegate(sharedPrefs, getContext());
-          if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
-            FxAccountConstants.pii(LOG_TAG, "Client device name is: '" + clientsDataDelegate.getClientName() + "'.");
-            FxAccountConstants.pii(LOG_TAG, "Client device data last modified: " + clientsDataDelegate.getLastModifiedTimestamp());
+          if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+            FxAccountUtils.pii(LOG_TAG, "Client device name is: '" + clientsDataDelegate.getClientName() + "'.");
+            FxAccountUtils.pii(LOG_TAG, "Client device data last modified: " + clientsDataDelegate.getLastModifiedTimestamp());
           }
 
           // We compute skew over time using SkewHandler. This yields an unchanging
@@ -434,11 +435,20 @@
     Logger.setThreadLogTag(FxAccountConstants.GLOBAL_LOG_TAG);
     Logger.resetLogging();
 
+    final Context context = getContext();
+    final AndroidFxAccount fxAccount = new AndroidFxAccount(context, account);
+
     Logger.info(LOG_TAG, "Syncing FxAccount" +
         " account named like " + Utils.obfuscateEmail(account.name) +
         " for authority " + authority +
         " with instance " + this + ".");
 
+    Logger.info(LOG_TAG, "Account last synced at: " + fxAccount.getLastSyncedTimestamp());
+
+    if (FxAccountUtils.LOG_PERSONAL_INFORMATION) {
+      fxAccount.dump();
+    }
+
     final EnumSet<FirefoxAccounts.SyncHint> syncHints = FirefoxAccounts.getHintsToSyncFromBundle(extras);
     FirefoxAccounts.logSyncHints(syncHints);
 
@@ -450,12 +460,6 @@
       return;
     }
 
-    final Context context = getContext();
-    final AndroidFxAccount fxAccount = new AndroidFxAccount(context, account);
-    if (FxAccountConstants.LOG_PERSONAL_INFORMATION) {
-      fxAccount.dump();
-    }
-
     // Pickle in a background thread to avoid strict mode warnings.
     ThreadPool.run(new Runnable() {
       @Override
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/GeckoAccessibility.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/GeckoAccessibility.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/GeckoAccessibility.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/GeckoAccessibility.java	2014-11-26 21:46:00.000000000 +0000
@@ -34,14 +34,17 @@
 
 public class GeckoAccessibility {
     private static final String LOGTAG = "GeckoAccessibility";
-    private static final int VIRTUAL_CURSOR_PREVIOUS = 1;
-    private static final int VIRTUAL_CURSOR_POSITION = 2;
-    private static final int VIRTUAL_CURSOR_NEXT = 3;
+    private static final int VIRTUAL_ENTRY_POINT_BEFORE = 1;
+    private static final int VIRTUAL_CURSOR_PREVIOUS = 2;
+    private static final int VIRTUAL_CURSOR_POSITION = 3;
+    private static final int VIRTUAL_CURSOR_NEXT = 4;
+    private static final int VIRTUAL_ENTRY_POINT_AFTER = 5;
 
     private static boolean sEnabled;
     // Used to store the JSON message and populate the event later in the code path.
     private static JSONObject sEventMessage;
     private static AccessibilityNodeInfo sVirtualCursorNode;
+    private static int sCurrentNode;
 
     // This is the number Brailleback uses to start indexing routing keys.
     private static final int BRAILLE_CLICK_BASE_INDEX = -275000000;
@@ -151,6 +154,15 @@
         if (!sEnabled)
             return;
 
+        final String exitView = message.optString("exitView");
+        if (exitView.equals("moveNext")) {
+            sCurrentNode = VIRTUAL_ENTRY_POINT_AFTER;
+        } else if (exitView.equals("movePrevious")) {
+            sCurrentNode = VIRTUAL_ENTRY_POINT_BEFORE;
+        } else {
+            sCurrentNode = VIRTUAL_CURSOR_POSITION;
+        }
+
         final int eventType = message.optInt("eventType", -1);
         if (eventType < 0) {
             Log.e(LOGTAG, "No accessibility event type provided");
@@ -285,8 +297,7 @@
             super.onPopulateAccessibilityEvent(host, event);
             if (sEventMessage != null) {
                 populateEventFromJSON(event, sEventMessage);
-                // No matter where the a11y focus is requested, we always force it back to the current vc position.
-                event.setSource(host, VIRTUAL_CURSOR_POSITION);
+                event.setSource(host, sCurrentNode);
             }
             // We save the hover enter event so that we could reuse it for a subsequent accessibility focus event.
             if (event.getEventType() != AccessibilityEvent.TYPE_VIEW_HOVER_ENTER)
@@ -296,11 +307,13 @@
         @Override
         public AccessibilityNodeProvider getAccessibilityNodeProvider(final View host) {
             if (mAccessibilityNodeProvider == null)
-                // The accessibility node structure for web content consists of 3 LayerView child nodes:
-                // 1. VIRTUAL_CURSOR_PREVIOUS: Represents the virtual cursor position that is previous to the
+                // The accessibility node structure for web content consists of 5 LayerView child nodes:
+                // 1. VIRTUAL_ENTRY_POINT_BEFORE: Represents the entry point before the LayerView.
+                // 2. VIRTUAL_CURSOR_PREVIOUS: Represents the virtual cursor position that is previous to the
                 // current one.
-                // 2. VIRTUAL_CURSOR_POSITION: Represents the current position of the virtual cursor.
-                // 3. VIRTUAL_CURSOR_NEXT: Represents the next virtual cursor position.
+                // 3. VIRTUAL_CURSOR_POSITION: Represents the current position of the virtual cursor.
+                // 4. VIRTUAL_CURSOR_NEXT: Represents the next virtual cursor position.
+                // 5. VIRTUAL_ENTRY_POINT_AFTER: Represents the entry point after the LayerView.
                 mAccessibilityNodeProvider = new AccessibilityNodeProvider() {
                         @Override
                         public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualDescendantId) {
@@ -312,9 +325,11 @@
                             case View.NO_ID:
                                 // This is the parent LayerView node, populate it with children.
                                 onInitializeAccessibilityNodeInfo(host, info);
+                                info.addChild(host, VIRTUAL_ENTRY_POINT_BEFORE);
                                 info.addChild(host, VIRTUAL_CURSOR_PREVIOUS);
                                 info.addChild(host, VIRTUAL_CURSOR_POSITION);
                                 info.addChild(host, VIRTUAL_CURSOR_NEXT);
+                                info.addChild(host, VIRTUAL_ENTRY_POINT_AFTER);
                                 break;
                             default:
                                 info.setParent(host);
@@ -322,6 +337,7 @@
                                 info.setVisibleToUser(host.isShown());
                                 info.setPackageName(GeckoAppShell.getContext().getPackageName());
                                 info.setClassName(host.getClass().getName());
+                                info.setEnabled(true);
                                 info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
                                 info.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
                                 info.addAction(AccessibilityNodeInfo.ACTION_CLICK);
@@ -342,6 +358,7 @@
                                 // The accessibility focus is permanently on the middle node, VIRTUAL_CURSOR_POSITION.
                                 // When accessibility focus is requested on one of its siblings we move the virtual cursor
                                 // either forward or backward depending on which sibling was selected.
+                                // When we enter the view forward or backward we just ask Gecko to get focus, keeping the current position.
 
                                 switch (virtualViewId) {
                                 case VIRTUAL_CURSOR_PREVIOUS:
@@ -352,6 +369,10 @@
                                     GeckoAppShell.
                                         sendEventToGecko(GeckoEvent.createBroadcastEvent("Accessibility:NextObject", null));
                                     return true;
+                                case VIRTUAL_ENTRY_POINT_BEFORE:
+                                case VIRTUAL_ENTRY_POINT_AFTER:
+                                    GeckoAppShell.
+                                        sendEventToGecko(GeckoEvent.createBroadcastEvent("Accessibility:Focus", "true"));
                                 default:
                                     break;
                                 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/GeckoAppShell.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/GeckoAppShell.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/GeckoAppShell.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/GeckoAppShell.java	2014-11-26 21:46:00.000000000 +0000
@@ -228,6 +228,7 @@
     private static Sensor gLightSensor;
 
     private static final String GECKOREQUEST_RESPONSE_KEY = "response";
+    private static final String GECKOREQUEST_ERROR_KEY = "error";
 
     /*
      * Keep in sync with constants found here:
@@ -434,7 +435,7 @@
             public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
                 EventDispatcher.getInstance().unregisterGeckoThreadListener(this, event);
                 if (!message.has(GECKOREQUEST_RESPONSE_KEY)) {
-                    request.onError();
+                    request.onError(message.getObject(GECKOREQUEST_ERROR_KEY));
                     return;
                 }
                 request.onResponse(message.getObject(GECKOREQUEST_RESPONSE_KEY));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/GeckoThread.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/GeckoThread.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/GeckoThread.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/GeckoThread.java	2014-11-26 21:46:00.000000000 +0000
@@ -88,18 +88,19 @@
     }
 
     private String initGeckoEnvironment() {
-        // At some point while loading the gecko libs our default locale gets set
-        // so just save it to locale here and reset it as default after the join
-        Locale locale = Locale.getDefault();
+        final Locale locale = Locale.getDefault();
 
+        final Context context = GeckoAppShell.getContext();
+        final Resources res = context.getResources();
         if (locale.toString().equalsIgnoreCase("zh_hk")) {
-            locale = Locale.TRADITIONAL_CHINESE;
-            Locale.setDefault(locale);
+            final Locale mappedLocale = Locale.TRADITIONAL_CHINESE;
+            Locale.setDefault(mappedLocale);
+            Configuration config = res.getConfiguration();
+            config.locale = mappedLocale;
+            res.updateConfiguration(config, null);
         }
 
-        Context context = GeckoAppShell.getContext();
         String resourcePath = "";
-        Resources res  = null;
         String[] pluginDirs = null;
         try {
             pluginDirs = GeckoAppShell.getPluginDirectories();
@@ -108,7 +109,6 @@
         }
 
         resourcePath = context.getPackageResourcePath();
-        res = context.getResources();
         GeckoLoader.setupGeckoEnvironment(context, pluginDirs, context.getFilesDir().getPath());
 
         GeckoLoader.loadSQLiteLibs(context, resourcePath);
@@ -116,12 +116,6 @@
         GeckoLoader.loadGeckoLibs(context, resourcePath);
         GeckoJavaSampler.setLibsLoaded();
 
-        Locale.setDefault(locale);
-
-        Configuration config = res.getConfiguration();
-        config.locale = locale;
-        res.updateConfiguration(config, null);
-
         return resourcePath;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/geckoview.ddf thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/geckoview.ddf
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/geckoview.ddf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/geckoview.ddf	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,74 @@
+# This is a Classycle dependency definition file that asserts that the contents
+# of the GeckoView library (Classycle set [lib]) is a dependency (but does not
+# depend) on Fennec (Classycle set [main]).  The additional Classycle set
+# [middle] consists of classes referenced by GeckoView that probably should not
+# be referenced.  We want this middle set to shrink over time.
+
+show allResults
+
+[lib] = \
+  org.mozilla.gecko.gfx.* \
+  org.mozilla.gecko.mozglue.* \
+  org.mozilla.gecko.sqlite.* \
+  org.mozilla.gecko.util.* \
+  org.mozilla.gecko.AndroidGamepadManager \
+  org.mozilla.gecko.AppConstants \
+  org.mozilla.gecko.BaseGeckoInterface \
+  org.mozilla.gecko.ContextGetter \
+  org.mozilla.gecko.CrashHandler \
+  org.mozilla.gecko.EventDispatcher \
+  org.mozilla.gecko.GeckoAccessibility \
+  org.mozilla.gecko.GeckoAppShell \
+  org.mozilla.gecko.GeckoBatteryManager \
+  org.mozilla.gecko.GeckoEditable \
+  org.mozilla.gecko.GeckoEditableClient \
+  org.mozilla.gecko.GeckoEditableListener \
+  org.mozilla.gecko.GeckoEvent \
+  org.mozilla.gecko.GeckoInputConnection \
+  org.mozilla.gecko.GeckoJavaSampler \
+  org.mozilla.gecko.GeckoNetworkManager \
+  org.mozilla.gecko.GeckoProfile \
+  org.mozilla.gecko.GeckoScreenOrientation \
+  org.mozilla.gecko.GeckoSharedPrefs \
+  org.mozilla.gecko.GeckoThread \
+  org.mozilla.gecko.GeckoView \
+  org.mozilla.gecko.GlobalHistory \
+  org.mozilla.gecko.InputMethods \
+  org.mozilla.gecko.NSSBridge \
+  org.mozilla.gecko.NotificationClient \
+  org.mozilla.gecko.NotificationHandler \
+  org.mozilla.gecko.PrefsHelper \
+  org.mozilla.gecko.SmsManager \
+  org.mozilla.gecko.SurfaceBits \
+  org.mozilla.gecko.SysInfo \
+  org.mozilla.gecko.TouchEventInterceptor \
+  org.mozilla.gecko.ZoomConstraints
+
+[middle] = \
+  org.mozilla.gecko.prompts.* \
+  org.mozilla.gecko.AlertNotification \
+  org.mozilla.gecko.FormAssistPopup \
+  org.mozilla.gecko.GeckoActivity \
+  org.mozilla.gecko.GeckoApp \
+  org.mozilla.gecko.GeckoProfileDirectories \
+  org.mozilla.gecko.GuestSession \
+  org.mozilla.gecko.R \
+  org.mozilla.gecko.Tab \
+  org.mozilla.gecko.Tabs \
+  org.mozilla.gecko.Telemetry \
+  org.mozilla.gecko.TelemetryContract \
+  org.mozilla.gecko.ThumbnailHelper \
+  org.mozilla.gecko.db.BrowserDB \
+  org.mozilla.gecko.db.LocalBrowserDB \
+  org.mozilla.gecko.distribution.Distribution \
+  org.mozilla.gecko.favicons.Favicons \
+  org.mozilla.gecko.favicons.OnFaviconLoadedListener
+
+[main] = org.mozilla.gecko.* excluding [lib] [middle]
+
+check sets [lib] [middle] [main]
+
+check [lib] directlyIndependentOf [main]
+
+# This fails; if this passed, GeckoView would be ready to extract from Fennec.
+# check [lib] independentOf [middle]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/gfx/OverscrollEdgeEffect.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/gfx/OverscrollEdgeEffect.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/gfx/OverscrollEdgeEffect.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/gfx/OverscrollEdgeEffect.java	2014-11-26 21:46:00.000000000 +0000
@@ -9,9 +9,13 @@
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.view.View;
 import android.widget.EdgeEffect;
 
+import java.lang.reflect.Field;
 
 public class OverscrollEdgeEffect implements Overscroll {
     // Used to index particular edges in the edges array
@@ -27,10 +31,31 @@
     private final View mView;
 
     public OverscrollEdgeEffect(final View v) {
+        Field paintField = null;
+        if (Versions.feature21Plus) {
+            try {
+                paintField = EdgeEffect.class.getDeclaredField("mPaint");
+                paintField.setAccessible(true);
+            } catch (NoSuchFieldException e) {
+            }
+        }
+
         mView = v;
         Context context = v.getContext();
         for (int i = 0; i < 4; i++) {
             mEdges[i] = new EdgeEffect(context);
+
+            try {
+                if (paintField != null) {
+                    final Paint p = (Paint) paintField.get(mEdges[i]);
+
+                    // The Android EdgeEffect class uses a mode of SRC_ATOP here, which means it will only
+                    // draw the effect where there are non-transparent pixels in the destination. Since the LayerView
+                    // itself is fully transparent, it doesn't display at all. We need to use SRC instead.
+                    p.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));
+                }
+            } catch (IllegalAccessException e) {
+            }
         }
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/BookmarksPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/BookmarksPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/BookmarksPanel.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/BookmarksPanel.java	2014-11-26 21:46:00.000000000 +0000
@@ -216,7 +216,7 @@
     /**
      * Loader callbacks for the LoaderManager of this fragment.
      */
-    private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             if (args == null) {
@@ -229,7 +229,7 @@
         }
 
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
             BookmarksLoader bl = (BookmarksLoader) loader;
             mListAdapter.swapCursor(c, bl.getFolderInfo(), bl.getRefreshType());
             updateUiFromCursor(c);
@@ -237,6 +237,8 @@
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
+
             if (mList != null) {
                 mListAdapter.swapCursor(null);
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/DynamicPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/DynamicPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/DynamicPanel.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/DynamicPanel.java	2014-11-26 21:46:00.000000000 +0000
@@ -262,12 +262,6 @@
         public void requestDataset(DatasetRequest request) {
             Log.d(LOGTAG, "Requesting request: " + request);
 
-            // Ignore dataset requests while the fragment is not
-            // allowed to load its content.
-            if (!getCanLoadHint()) {
-                return;
-            }
-
             final Bundle bundle = new Bundle();
             bundle.putParcelable(DATASET_REQUEST, request);
 
@@ -352,7 +346,7 @@
     /**
      * LoaderCallbacks implementation that interacts with the LoaderManager.
      */
-    private class PanelLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class PanelLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             final DatasetRequest request = (DatasetRequest) args.getParcelable(DATASET_REQUEST);
@@ -362,7 +356,7 @@
         }
 
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor cursor) {
             final DatasetRequest request = getRequestFromLoader(loader);
             Log.d(LOGTAG, "Finished loader for request: " + request);
 
@@ -373,6 +367,8 @@
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
+
             final DatasetRequest request = getRequestFromLoader(loader);
             Log.d(LOGTAG, "Resetting loader for request: " + request);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/HistoryPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/HistoryPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/HistoryPanel.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/HistoryPanel.java	2014-11-26 21:46:00.000000000 +0000
@@ -471,20 +471,21 @@
         }
     }
 
-    private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             return new HistoryCursorLoader(getActivity());
         }
 
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
             mAdapter.swapCursor(c);
             updateUiFromCursor(c);
         }
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
             mAdapter.swapCursor(null);
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/HomePager.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/HomePager.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/HomePager.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/HomePager.java	2014-11-26 21:46:00.000000000 +0000
@@ -223,7 +223,7 @@
 
         final HomeAdapter adapter = new HomeAdapter(mContext, fm);
         adapter.setOnAddPanelListener(mAddPanelListener);
-        adapter.setCanLoadHint(!shouldAnimate);
+        adapter.setCanLoadHint(true);
         setAdapter(adapter);
 
         // Don't show the tabs strip until we have the
@@ -243,7 +243,6 @@
                 @Override
                 public void onPropertyAnimationEnd() {
                     setLayerType(View.LAYER_TYPE_NONE, null);
-                    adapter.setCanLoadHint(true);
                 }
             });
 
@@ -373,9 +372,7 @@
         final HomeAdapter adapter = (HomeAdapter) getAdapter();
 
         // Disable any fragment loading until we have the initial
-        // panel selection done. Store previous value to restore
-        // it if necessary once the UI is fully updated.
-        final boolean canLoadHint = adapter.getCanLoadHint();
+        // panel selection done.
         adapter.setCanLoadHint(false);
 
         // Destroy any existing panels currently loaded
@@ -436,19 +433,15 @@
             }
         }
 
-        // If the load hint was originally true, this means the pager
-        // is not animating and it's fine to restore the load hint back.
-        if (canLoadHint) {
-            // The selection is updated asynchronously so we need to post to
-            // UI thread to give the pager time to commit the new page selection
-            // internally and load the right initial panel.
-            ThreadUtils.getUiHandler().post(new Runnable() {
-                @Override
-                public void run() {
-                    adapter.setCanLoadHint(true);
-                }
-            });
-        }
+        // The selection is updated asynchronously so we need to post to
+        // UI thread to give the pager time to commit the new page selection
+        // internally and load the right initial panel.
+        ThreadUtils.getUiHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                adapter.setCanLoadHint(true);
+            }
+        });
     }
 
     public void setOnPanelChangeListener(OnPanelChangeListener listener) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/HomePagerTabStrip.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/HomePagerTabStrip.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/HomePagerTabStrip.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/HomePagerTabStrip.java	2014-11-26 21:46:00.000000000 +0000
@@ -8,6 +8,7 @@
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.animation.BounceAnimator;
 import org.mozilla.gecko.animation.BounceAnimator.Attributes;
+import org.mozilla.gecko.animation.TransitionsTracker;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -120,6 +121,8 @@
         nextBounceAnimator.queue(new Attributes(0, BOUNCE4_MS));
         nextBounceAnimator.setStartDelay(ANIMATION_DELAY_MS);
 
+        TransitionsTracker.track(nextBounceAnimator);
+
         // Start animations.
         alphaAnimatorSet.start();
         prevBounceAnimator.start();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/ReadingListPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/ReadingListPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/ReadingListPanel.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/ReadingListPanel.java	2014-11-26 21:46:00.000000000 +0000
@@ -197,20 +197,21 @@
     /**
      * LoaderCallbacks implementation that interacts with the LoaderManager.
      */
-    private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             return new ReadingListLoader(getActivity());
         }
 
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
             mAdapter.swapCursor(c);
             updateUiFromCursor(c);
         }
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
             mAdapter.swapCursor(null);
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/RecentTabsPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/RecentTabsPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/RecentTabsPanel.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/RecentTabsPanel.java	2014-11-26 21:46:00.000000000 +0000
@@ -404,20 +404,21 @@
          }
     }
 
-    private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             return new RecentTabsCursorLoader(getActivity(), mClosedTabs);
         }
 
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
             mAdapter.swapCursor(c);
             updateUiFromCursor(c);
         }
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
             mAdapter.swapCursor(null);
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/RemoteTabsExpandableListFragment.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/RemoteTabsExpandableListFragment.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/RemoteTabsExpandableListFragment.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/RemoteTabsExpandableListFragment.java	2014-11-26 21:46:00.000000000 +0000
@@ -392,14 +392,14 @@
         }
     }
 
-    private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             return new RemoteTabsCursorLoader(getActivity());
         }
 
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        public void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
             final List<RemoteClient> clients = TabsAccessor.getClientsFromCursor(c);
 
             // Filter the hidden clients out of the clients list. The clients
@@ -421,6 +421,7 @@
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
             mAdapter.replaceClients(null);
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/TopSitesPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/TopSitesPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/TopSitesPanel.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/TopSitesPanel.java	2014-11-26 21:46:00.000000000 +0000
@@ -689,7 +689,7 @@
         }
     }
 
-    private class CursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private class CursorLoaderCallbacks extends TransitionAwareCursorLoaderCallbacks {
         @Override
         public Loader<Cursor> onCreateLoader(int id, Bundle args) {
             trace("Creating TopSitesLoader: " + id);
@@ -707,7 +707,7 @@
          * Why that is... dunno.
          */
         @Override
-        public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        protected void onLoadFinishedAfterTransitions(Loader<Cursor> loader, Cursor c) {
             debug("onLoadFinished: " + c.getCount() + " rows.");
 
             mListAdapter.swapCursor(c);
@@ -752,6 +752,8 @@
 
         @Override
         public void onLoaderReset(Loader<Cursor> loader) {
+            super.onLoaderReset(loader);
+
             if (mListAdapter != null) {
                 mListAdapter.swapCursor(null);
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,57 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.home;
+
+import android.database.Cursor;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.Loader;
+
+import org.mozilla.gecko.animation.TransitionsTracker;
+
+/**
+ * A {@link LoaderCallbacks} implementation that avoids running its
+ * {@link #onLoadFinished(Loader, Cursor)} method during animations as it's
+ * likely to trigger a layout traversal as a result of a cursor swap in the
+ * target adapter.
+ */
+public abstract class TransitionAwareCursorLoaderCallbacks implements LoaderCallbacks<Cursor> {
+    private OnLoadFinishedRunnable onLoadFinishedRunnable;
+
+    @Override
+    public void onLoadFinished(Loader<Cursor> loader, Cursor c) {
+        if (onLoadFinishedRunnable != null) {
+            TransitionsTracker.cancelPendingAction(onLoadFinishedRunnable);
+        }
+
+        onLoadFinishedRunnable = new OnLoadFinishedRunnable(loader, c);
+        TransitionsTracker.runAfterTransitions(onLoadFinishedRunnable);
+    }
+
+    protected abstract void onLoadFinishedAfterTransitions(Loader<Cursor> loade, Cursor c);
+
+    @Override
+    public void onLoaderReset(Loader<Cursor> loader) {
+        if (onLoadFinishedRunnable != null) {
+            TransitionsTracker.cancelPendingAction(onLoadFinishedRunnable);
+            onLoadFinishedRunnable = null;
+        }
+    }
+
+    private class OnLoadFinishedRunnable implements Runnable {
+        private final Loader<Cursor> loader;
+        private final Cursor cursor;
+
+        public OnLoadFinishedRunnable(Loader<Cursor> loader, Cursor cursor) {
+            this.loader = loader;
+            this.cursor = cursor;
+        }
+
+        @Override
+        public void run() {
+            onLoadFinishedAfterTransitions(loader, cursor);
+            onLoadFinishedRunnable = null;
+        }
+    }
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/locales/en-US/android_strings.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/locales/en-US/android_strings.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/locales/en-US/android_strings.dtd	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/locales/en-US/android_strings.dtd	2014-11-26 21:46:00.000000000 +0000
@@ -474,6 +474,8 @@
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity_run_by "which is run by">
+<!ENTITY identity_no_info "This website does not supply identity information.">
+<!ENTITY identity_not_encrypted "Your connection to this website is not encrypted.">
 
 <!-- Mixed content notifications in site identity popup -->
 <!ENTITY loaded_mixed_content_message "This page is displaying content that isn\'t secure.">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/locales/en-US/sync_strings.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/locales/en-US/sync_strings.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/locales/en-US/sync_strings.dtd	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/locales/en-US/sync_strings.dtd	2014-11-26 21:46:00.000000000 +0000
@@ -187,6 +187,8 @@
 <!ENTITY fxaccount_status_header2 'Firefox Account'>
 <!ENTITY fxaccount_status_signed_in_as 'Signed in as'>
 <!ENTITY fxaccount_status_auth_server 'Account server'>
+<!ENTITY fxaccount_status_sync_now 'Sync now'>
+<!ENTITY fxaccount_status_syncing2 'Syncing…'>
 <!ENTITY fxaccount_status_device_name 'Device name'>
 <!ENTITY fxaccount_status_sync_server 'Sync server'>
 <!ENTITY fxaccount_status_sync '&syncBrand.shortName.label;'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/Makefile.in	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/Makefile.in	2014-11-26 21:46:00.000000000 +0000
@@ -79,6 +79,7 @@
 JAVA_CLASSPATH := $(subst $(NULL) ,:,$(strip $(JAVA_CLASSPATH)))
 
 ALL_JARS = \
+  constants.jar \
   gecko-R.jar \
   gecko-browser.jar \
   gecko-mozglue.jar \
@@ -134,11 +135,24 @@
   endif
 endif
 
+# This stanza ensures that the set of GeckoView classes does not depend on too
+# much of Fennec, where "too much" is defined as the set of potentially
+# non-GeckoView classes that GeckoView already depended on at a certain point in
+# time.  The idea is to set a high-water mark that is not to be crossed.
+classycle_jar := $(topsrcdir)/mobile/android/build/classycle/classycle-1.4.1.jar
+.geckoview.deps: geckoview.ddf $(classycle_jar) $(ALL_JARS)
+	java -cp $(classycle_jar) \
+		classycle.dependency.DependencyChecker \
+		-mergeInnerClasses \
+		-dependencies=@$< \
+		$(ALL_JARS)
+	@$(TOUCH) $@
+
 # We touch the target file before invoking Proguard so that Proguard's
 # outputs are fresher than the target, preventing a subsequent
 # invocation from thinking Proguard's outputs are stale.  This is safe
 # because Make removes the target file if any recipe command fails.
-.proguard.deps: $(ALL_JARS)
+.proguard.deps: .geckoview.deps $(ALL_JARS) $(topsrcdir)/mobile/android/config/proguard.cfg
 	$(REPORT_BUILD)
 	@$(TOUCH) $@
 	java \
@@ -178,14 +192,6 @@
 GeneratedJNIWrappers.cpp: $(ALL_JARS)
 	$(JAVA) -classpath gecko-mozglue.jar:$(JAVA_BOOTCLASSPATH):$(JAVA_CLASSPATH):$(ANNOTATION_PROCESSOR_JAR_FILES) org.mozilla.gecko.annotationProcessors.AnnotationProcessor $(ALL_JARS)
 
-# Like generated/org/mozilla/fennec_$USERID.
-android_package_dir = $(addprefix generated/,$(subst .,/,$(ANDROID_PACKAGE_NAME)))
-
-# These _PP_JAVAFILES are specified in moz.build and defined in
-# backend.mk, which is included by config.mk.  Therefore this needs to
-# be defined after config.mk is included.
-PP_JAVAFILES := $(filter-out generated/org/mozilla/gecko/R.java,$(gecko-mozglue_PP_JAVAFILES) $(gecko-browser_PP_JAVAFILES))
-
 manifest := \
   AndroidManifest.xml.in \
   WebappManifestFragment.xml.frag.in \
@@ -197,28 +203,20 @@
 # generates these files into generated/org/mozilla/gecko for
 # consumption by the build system and IDEs.
 
-preprocessed := $(addsuffix .in,$(subst generated/org/mozilla/gecko/,,$(filter generated/org/mozilla/gecko/%,$(PP_JAVAFILES))))
+# The list in moz.build looks like
+# 'preprocessed/org/mozilla/gecko/AppConstants.java'.  The list in
+# constants_PP_JAVAFILES looks like
+# 'generated/preprocessed/org/mozilla/gecko/AppConstants.java'.  We
+# need to write AppConstants.java.in to
+# generated/preprocessed/org/mozilla/gecko.
+preprocessed := $(addsuffix .in,$(subst generated/preprocessed/org/mozilla/gecko/,,$(filter generated/preprocessed/org/mozilla/gecko/%,$(constants_PP_JAVAFILES))))
 
-preprocessed_PATH := generated/org/mozilla/gecko
+preprocessed_PATH := generated/preprocessed/org/mozilla/gecko
 preprocessed_KEEP_PATH := 1
 preprocessed_FLAGS := --marker='//\\\#'
 
 PP_TARGETS += preprocessed
 
-# Certain source files have Java package name @ANDROID_PACKAGE_NAME@.
-# We hate these files but they are necessary for backwards
-# compatibility.  These special rules generate these files into
-# generated/org/mozilla/{firefox,firefox_beta,fennec,fennec_$USER} for
-# consumption by the build system and IDEs.
-
-preprocessed_package := $(addsuffix .in,$(subst $(android_package_dir)/,,$(filter $(android_package_dir)/%,$(PP_JAVAFILES))))
-
-preprocessed_package_PATH := $(android_package_dir)
-preprocessed_package_KEEP_PATH := 1
-preprocessed_package_FLAGS := --marker='//\\\#'
-
-PP_TARGETS += preprocessed_package
-
 include $(topsrcdir)/config/rules.mk
 
 not_android_res_files := \
@@ -397,6 +395,16 @@
 # Override the Java settings with some specific android settings
 include $(topsrcdir)/config/android-common.mk
 
+update-generated-wrappers:
+	@mv $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp.old
+	@mv $(topsrcdir)/widget/android/GeneratedJNIWrappers.h $(topsrcdir)/widget/android/GeneratedJNIWrappers.h.old
+	@echo old GeneratedJNIWrappers.cpp/h moved to GeneratedJNIWrappers.cpp/h.old
+	@cp $(CURDIR)/jni-stubs.inc $(topsrcdir)/mozglue/android
+	@cp $(CURDIR)/GeneratedJNIWrappers.* $(topsrcdir)/widget/android
+	@echo Updated GeneratedJNIWrappers
+
+.PHONY: update-generated-wrappers
+
 # This target is only used by IDE integrations. It rebuilds resources
 # that end up in omni.ja, does most of the packaging step, and then
 # updates omni.ja in place. If you're not using an IDE, you should be
@@ -427,7 +435,7 @@
 	  echo '***   Error: The generated JNI code has changed   ***' && \
 	  echo '* To update generated code in the tree, please run  *' && \
 	  echo && \
-	  echo '  cp $(CURDIR)/jni-stubs.inc $(topsrcdir)/mozglue/android && cp $(CURDIR)/GeneratedJNIWrappers.* $(topsrcdir)/widget/android' && \
+	  echo '  make -C $(CURDIR) update-generated-wrappers' && \
 	  echo && \
 	  echo '* Repeat the build, and check in any changes.       *' && \
 	  echo '*****************************************************' && \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/menu/GeckoMenuInflater.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/menu/GeckoMenuInflater.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/menu/GeckoMenuInflater.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/menu/GeckoMenuInflater.java	2014-11-26 21:46:00.000000000 +0000
@@ -7,6 +7,7 @@
 import java.io.IOException;
 
 import org.mozilla.gecko.AppConstants.Versions;
+import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.xmlpull.v1.XmlPullParser;
@@ -132,12 +133,20 @@
         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 (which only has a new reload button).
-        if (item.id == R.id.reload && NewTabletUI.isEnabled(mContext)) {
-            item.iconRes = R.drawable.new_tablet_ic_menu_reload;
+        // 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 {
-            item.iconRes = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
+            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;
 
         if (Versions.feature11Plus) {
             item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/moz.build	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/moz.build	2014-11-26 21:46:00.000000000 +0000
@@ -11,6 +11,14 @@
 
 thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/'
 
+constants_jar = add_java_jar('constants')
+constants_jar.sources = []
+constants_jar.generated_sources = [
+    'preprocessed/org/mozilla/gecko/AppConstants.java',
+    'preprocessed/org/mozilla/gecko/SysInfo.java',
+]
+constants_jar.generated_sources += ['preprocessed/org/mozilla/gecko/' + f for f in sync_generated_java_files]
+
 resjar = add_java_jar('gecko-R')
 resjar.sources = []
 resjar.generated_sources += [
@@ -29,6 +37,7 @@
     'mozglue/ByteBufferInputStream.java',
     'mozglue/ContextUtils.java',
     'mozglue/DirectBufferAllocator.java',
+    'mozglue/GeckoLoader.java',
     'mozglue/generatorannotations/OptionalGeneratedParameter.java',
     'mozglue/generatorannotations/WrapElementForJNI.java',
     'mozglue/generatorannotations/WrapEntireClassForJNI.java',
@@ -38,9 +47,9 @@
     'mozglue/RobocopTarget.java',
     'mozglue/WebRTCJNITarget.java',
 ]
-mgjar.generated_sources += [
-    'org/mozilla/gecko/AppConstants.java',
-    'org/mozilla/gecko/mozglue/GeckoLoader.java',
+mgjar.generated_sources = [] # Keep it this way.
+mgjar.extra_jars += [
+    'constants.jar',
 ]
 mgjar.javac_flags += ['-Xlint:all']
 
@@ -77,7 +86,8 @@
     'util/WebActivityMapper.java',
 ]
 gujar.extra_jars = [
-    'gecko-mozglue.jar'
+    'constants.jar',
+    'gecko-mozglue.jar',
 ]
 gujar.javac_flags += ['-Xlint:all,-deprecation']
 
@@ -124,6 +134,7 @@
     'animation/HeightChangeAnimation.java',
     'animation/PropertyAnimator.java',
     'animation/Rotate3DAnimation.java',
+    'animation/TransitionsTracker.java',
     'animation/ViewHelper.java',
     'ANRReporter.java',
     'AppNotificationClient.java',
@@ -310,6 +321,7 @@
     'home/TopSitesGridView.java',
     'home/TopSitesPanel.java',
     'home/TopSitesThumbnailView.java',
+    'home/TransitionAwareCursorLoaderCallbacks.java',
     'home/TwoLinePageRow.java',
     'InputMethods.java',
     'IntentHelper.java',
@@ -478,22 +490,28 @@
     'widget/TwoWayView.java',
     'ZoomConstraints.java',
 ]
+# The following sources are checked in to version control but
+# generated by a script (widget/generate_themed_views.py).  If you're
+# editing this list, make sure to edit that script.
+gbjar.sources += [
+    'widget/ThemedEditText.java',
+    'widget/ThemedImageButton.java',
+    'widget/ThemedImageView.java',
+    'widget/ThemedLinearLayout.java',
+    'widget/ThemedRelativeLayout.java',
+    'widget/ThemedTextSwitcher.java',
+    'widget/ThemedTextView.java',
+    'widget/ThemedView.java',
+]
 gbjar.sources += [ thirdparty_source_dir + f for f in [
     'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',
     'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java',
     'com/googlecode/eyesfree/braille/selfbraille/WriteData.java',
 ] ]
 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')
-gbjar.generated_sources += [
-    'org/mozilla/gecko/SysInfo.java',
-    'org/mozilla/gecko/widget/ThemedEditText.java',
-    'org/mozilla/gecko/widget/ThemedImageButton.java',
-    'org/mozilla/gecko/widget/ThemedImageView.java',
-    'org/mozilla/gecko/widget/ThemedLinearLayout.java',
-    'org/mozilla/gecko/widget/ThemedRelativeLayout.java',
-    'org/mozilla/gecko/widget/ThemedTextSwitcher.java',
-    'org/mozilla/gecko/widget/ThemedTextView.java',
-    'org/mozilla/gecko/widget/ThemedView.java',
+gbjar.generated_sources = [] # Keep it this way.
+gbjar.extra_jars += [
+    'constants.jar'
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
     gbjar.sources += [ 'CrashReporter.java' ]
@@ -532,8 +550,7 @@
     ANDROID_RES_DIRS += [ SRCDIR + '/newtablet/res' ]
 
 gbjar.sources += sync_java_files
-gbjar.generated_sources += sync_generated_java_files
-gbjar.extra_jars = [
+gbjar.extra_jars += [
     'gecko-R.jar',
     'gecko-mozglue.jar',
     'gecko-thirdparty.jar',
@@ -679,6 +696,7 @@
     search_activity.sources += [search_source_dir + '/' + f for f in search_activity_sources]
     search_activity.javac_flags += ['-Xlint:all']
     search_activity.extra_jars = [
+        'constants.jar',
         'gecko-R.jar',
         'gecko-browser.jar',
         'gecko-mozglue.jar',
@@ -776,11 +794,8 @@
 # Manifest.java for all packages) but also preprocessed files. In the past, the
 # generated R.java files were used by the Eclipse build, but now Eclipse
 # generates these files itself. Therefore, we exclude those generated sources.
-main.add_classpathentry('generated', OBJDIR + '/generated',
-    dstdir='generated',
-    exclude_patterns=[
-        '**/R.java',
-        '**/Manifest.java'])
+main.add_classpathentry('generated', OBJDIR + '/generated/preprocessed',
+    dstdir='generated')
 main.add_classpathentry('thirdparty', TOPSRCDIR + '/mobile/android/thirdparty',
     dstdir='thirdparty',
     ignore_warnings=True)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/mozglue/GeckoLoader.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/mozglue/GeckoLoader.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/mozglue/GeckoLoader.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/mozglue/GeckoLoader.java	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,566 @@
+/* -*- 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.mozglue;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.Locale;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Environment;
+import android.util.Log;
+
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent;
+
+public final class GeckoLoader {
+    private static final String LOGTAG = "GeckoLoader";
+
+    private static volatile SafeIntent sIntent;
+    private static File sCacheFile;
+    private static File sGREDir;
+
+    private static final Object sLibLoadingLock = new Object();
+    // Must hold sLibLoadingLock while accessing the following boolean variables.
+    private static boolean sSQLiteLibsLoaded;
+    private static boolean sNSSLibsLoaded;
+    private static boolean sMozGlueLoaded;
+    private static boolean sLibsSetup;
+
+    private GeckoLoader() {
+        // prevent instantiation
+    }
+
+    public static File getCacheDir(Context context) {
+        if (sCacheFile == null) {
+            sCacheFile = context.getCacheDir();
+        }
+        return sCacheFile;
+    }
+
+    public static File getGREDir(Context context) {
+        if (sGREDir == null) {
+            sGREDir = new File(context.getApplicationInfo().dataDir);
+        }
+        return sGREDir;
+    }
+
+    private static void setupPluginEnvironment(Context context, String[] pluginDirs) {
+        // setup plugin path directories
+        try {
+            // Check to see if plugins were blocked.
+            if (pluginDirs == null) {
+                putenv("MOZ_PLUGINS_BLOCKED=1");
+                putenv("MOZ_PLUGIN_PATH=");
+                return;
+            }
+
+            StringBuilder pluginSearchPath = new StringBuilder();
+            for (int i = 0; i < pluginDirs.length; i++) {
+                pluginSearchPath.append(pluginDirs[i]);
+                pluginSearchPath.append(":");
+            }
+            putenv("MOZ_PLUGIN_PATH="+pluginSearchPath);
+
+            File pluginDataDir = context.getDir("plugins", 0);
+            putenv("ANDROID_PLUGIN_DATADIR=" + pluginDataDir.getPath());
+
+            File pluginPrivateDataDir = context.getDir("plugins_private", 0);
+            putenv("ANDROID_PLUGIN_DATADIR_PRIVATE=" + pluginPrivateDataDir.getPath());
+
+        } catch (Exception ex) {
+            Log.w(LOGTAG, "Caught exception getting plugin dirs.", ex);
+        }
+    }
+
+    private static void setupDownloadEnvironment(final Context context) {
+        try {
+            File downloadDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+            File updatesDir  = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+            if (downloadDir == null) {
+                downloadDir = new File(Environment.getExternalStorageDirectory().getPath(), "download");
+            }
+            if (updatesDir == null) {
+                updatesDir = downloadDir;
+            }
+            putenv("DOWNLOADS_DIRECTORY=" + downloadDir.getPath());
+            putenv("UPDATES_DIRECTORY="   + updatesDir.getPath());
+        } catch (Exception e) {
+            Log.w(LOGTAG, "No download directory found.", e);
+        }
+    }
+
+    private static void delTree(File file) {
+        if (file.isDirectory()) {
+            File children[] = file.listFiles();
+            for (File child : children) {
+                delTree(child);
+            }
+        }
+        file.delete();
+    }
+
+    private static File getTmpDir(Context context) {
+        File tmpDir = context.getDir("tmpdir", Context.MODE_PRIVATE);
+        // check if the old tmp dir is there
+        File oldDir = new File(tmpDir.getParentFile(), "app_tmp");
+        if (oldDir.exists()) {
+            delTree(oldDir);
+        }
+        return tmpDir;
+    }
+
+    public static void setLastIntent(SafeIntent intent) {
+        sIntent = intent;
+    }
+
+    public static void setupGeckoEnvironment(Context context, String[] pluginDirs, String profilePath) {
+        // if we have an intent (we're being launched by an activity)
+        // read in any environmental variables from it here
+        final SafeIntent intent = sIntent;
+        if (intent != null) {
+            String env = intent.getStringExtra("env0");
+            Log.d(LOGTAG, "Gecko environment env0: " + env);
+            for (int c = 1; env != null; c++) {
+                putenv(env);
+                env = intent.getStringExtra("env" + c);
+                Log.d(LOGTAG, "env" + c + ": " + env);
+            }
+        }
+
+        setupPluginEnvironment(context, pluginDirs);
+        setupDownloadEnvironment(context);
+
+        // profile home path
+        putenv("HOME=" + profilePath);
+
+        // setup the tmp path
+        File f = getTmpDir(context);
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+        putenv("TMPDIR=" + f.getPath());
+
+        // setup the downloads path
+        f = Environment.getDownloadCacheDirectory();
+        putenv("EXTERNAL_STORAGE=" + f.getPath());
+
+        // setup the app-specific cache path
+        f = context.getCacheDir();
+        putenv("CACHE_DIRECTORY=" + f.getPath());
+
+        /* We really want to use this code, but it requires bumping up the SDK to 17 so for now
+           we will use reflection. See https://bugzilla.mozilla.org/show_bug.cgi?id=811763#c11
+
+        if (Build.VERSION.SDK_INT >= 17) {
+            android.os.UserManager um = (android.os.UserManager)context.getSystemService(Context.USER_SERVICE);
+            if (um != null) {
+                putenv("MOZ_ANDROID_USER_SERIAL_NUMBER=" + um.getSerialNumberForUser(android.os.Process.myUserHandle()));
+            } else {
+                Log.d(LOGTAG, "Unable to obtain user manager service on a device with SDK version " + Build.VERSION.SDK_INT);
+            }
+        }
+        */
+        try {
+            Object userManager = context.getSystemService("user");
+            if (userManager != null) {
+                // if userManager is non-null that means we're running on 4.2+ and so the rest of this
+                // should just work
+                Object userHandle = android.os.Process.class.getMethod("myUserHandle", (Class[])null).invoke(null);
+                Object userSerial = userManager.getClass().getMethod("getSerialNumberForUser", userHandle.getClass()).invoke(userManager, userHandle);
+                putenv("MOZ_ANDROID_USER_SERIAL_NUMBER=" + userSerial.toString());
+            }
+        } catch (Exception e) {
+            // Guard against any unexpected failures
+            Log.d(LOGTAG, "Unable to set the user serial number", e);
+        }
+
+        setupLocaleEnvironment();
+
+        // We don't need this any more.
+        sIntent = null;
+    }
+
+    private static void loadLibsSetup(Context context) {
+        synchronized (sLibLoadingLock) {
+            if (sLibsSetup) {
+                return;
+            }
+            sLibsSetup = true;
+        }
+
+        // The package data lib directory isn't placed in ld.so's
+        // search path, so we have to manually load libraries that
+        // libxul will depend on.  Not ideal.
+
+        File cacheFile = getCacheDir(context);
+        putenv("GRE_HOME=" + getGREDir(context).getPath());
+
+        // setup the libs cache
+        String linkerCache = System.getenv("MOZ_LINKER_CACHE");
+        if (linkerCache == null) {
+            linkerCache = cacheFile.getPath();
+            putenv("MOZ_LINKER_CACHE=" + linkerCache);
+        }
+
+        // Disable on-demand decompression of the linker on devices where it
+        // is known to cause crashes.
+        String forced_ondemand = System.getenv("MOZ_LINKER_ONDEMAND");
+        if (forced_ondemand == null) {
+            if ("HTC".equals(android.os.Build.MANUFACTURER) &&
+                "HTC Vision".equals(android.os.Build.MODEL)) {
+                putenv("MOZ_LINKER_ONDEMAND=0");
+            }
+        }
+
+        if (AppConstants.MOZ_LINKER_EXTRACT) {
+            putenv("MOZ_LINKER_EXTRACT=1");
+            // Ensure that the cache dir is world-writable
+            File cacheDir = new File(linkerCache);
+            if (cacheDir.isDirectory()) {
+                cacheDir.setWritable(true, false);
+                cacheDir.setExecutable(true, false);
+                cacheDir.setReadable(true, false);
+            }
+        }
+    }
+
+    @RobocopTarget
+    public static void loadSQLiteLibs(final Context context, final String apkName) {
+        synchronized (sLibLoadingLock) {
+            if (sSQLiteLibsLoaded) {
+                return;
+            }
+            sSQLiteLibsLoaded = true;
+        }
+
+        loadMozGlue(context);
+        loadLibsSetup(context);
+        loadSQLiteLibsNative(apkName);
+    }
+
+    public static void loadNSSLibs(final Context context, final String apkName) {
+        synchronized (sLibLoadingLock) {
+            if (sNSSLibsLoaded) {
+                return;
+            }
+            sNSSLibsLoaded = true;
+        }
+
+        loadMozGlue(context);
+        loadLibsSetup(context);
+        loadNSSLibsNative(apkName);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static final String getCPUABI() {
+        return android.os.Build.CPU_ABI;
+    }
+
+    /**
+     * Copy a library out of our APK.
+     *
+     * @param context a Context.
+     * @param lib the name of the library; e.g., "mozglue".
+     * @param outDir the output directory for the .so. No trailing slash.
+     * @return true on success, false on failure.
+     */
+    private static boolean extractLibrary(final Context context, final String lib, final String outDir) {
+        final String apkPath = context.getApplicationInfo().sourceDir;
+
+        // Sanity check.
+        if (!apkPath.endsWith(".apk")) {
+            Log.w(LOGTAG, "sourceDir is not an APK.");
+            return false;
+        }
+
+        // Try to extract the named library from the APK.
+        File outDirFile = new File(outDir);
+        if (!outDirFile.isDirectory()) {
+            if (!outDirFile.mkdirs()) {
+                Log.e(LOGTAG, "Couldn't create " + outDir);
+                return false;
+            }
+        }
+
+        final String abi = getCPUABI();
+
+        try {
+            final ZipFile zipFile = new ZipFile(new File(apkPath));
+            try {
+                final String libPath = "lib/" + abi + "/lib" + lib + ".so";
+                final ZipEntry entry = zipFile.getEntry(libPath);
+                if (entry == null) {
+                    Log.w(LOGTAG, libPath + " not found in APK " + apkPath);
+                    return false;
+                }
+
+                final InputStream in = zipFile.getInputStream(entry);
+                try {
+                    final String outPath = outDir + "/lib" + lib + ".so";
+                    final FileOutputStream out = new FileOutputStream(outPath);
+                    final byte[] bytes = new byte[1024];
+                    int read;
+
+                    Log.d(LOGTAG, "Copying " + libPath + " to " + outPath);
+                    boolean failed = false;
+                    try {
+                        while ((read = in.read(bytes, 0, 1024)) != -1) {
+                            out.write(bytes, 0, read);
+                        }
+                    } catch (Exception e) {
+                        Log.w(LOGTAG, "Failing library copy.", e);
+                        failed = true;
+                    } finally {
+                        out.close();
+                    }
+
+                    if (failed) {
+                        // Delete the partial copy so we don't fail to load it.
+                        // Don't bother to check the return value -- there's nothing
+                        // we can do about a failure.
+                        new File(outPath).delete();
+                    } else {
+                        // Mark the file as executable. This doesn't seem to be
+                        // necessary for the loader, but it's the normal state of
+                        // affairs.
+                        Log.d(LOGTAG, "Marking " + outPath + " as executable.");
+                        new File(outPath).setExecutable(true);
+                    }
+
+                    return !failed;
+                } finally {
+                    in.close();
+                }
+            } finally {
+                zipFile.close();
+            }
+        } catch (Exception e) {
+            Log.e(LOGTAG, "Failed to extract lib from APK.", e);
+            return false;
+        }
+    }
+
+    private static String getLoadDiagnostics(final Context context, final String lib) {
+        final String androidPackageName = context.getPackageName();
+
+        final StringBuilder message = new StringBuilder("LOAD ");
+        message.append(lib);
+
+        // These might differ. If so, we know why the library won't load!
+        message.append(": ABI: " + AppConstants.MOZ_APP_ABI + ", " + getCPUABI());
+        message.append(": Data: " + context.getApplicationInfo().dataDir);
+        try {
+            final boolean appLibExists = new File("/data/app-lib/" + androidPackageName + "/lib" + lib + ".so").exists();
+            final boolean dataDataExists = new File("/data/data/" + androidPackageName + "/lib/lib" + lib + ".so").exists();
+            message.append(", ax=" + appLibExists);
+            message.append(", ddx=" + dataDataExists);
+        } catch (Throwable e) {
+            message.append(": ax/ddx fail, ");
+        }
+
+        try {
+            final String dashOne = "/data/data/" + androidPackageName + "-1";
+            final String dashTwo = "/data/data/" + androidPackageName + "-2";
+            final boolean dashOneExists = new File(dashOne).exists();
+            final boolean dashTwoExists = new File(dashTwo).exists();
+            message.append(", -1x=" + dashOneExists);
+            message.append(", -2x=" + dashTwoExists);
+        } catch (Throwable e) {
+            message.append(", dash fail, ");
+        }
+
+        try {
+            if (Build.VERSION.SDK_INT >= 9) {
+                final String nativeLibPath = context.getApplicationInfo().nativeLibraryDir;
+                final boolean nativeLibDirExists = new File(nativeLibPath).exists();
+                final boolean nativeLibLibExists = new File(nativeLibPath + "/lib" + lib + ".so").exists();
+
+                message.append(", nativeLib: " + nativeLibPath);
+                message.append(", dirx=" + nativeLibDirExists);
+                message.append(", libx=" + nativeLibLibExists);
+            } else {
+                message.append(", <pre-9>");
+            }
+        } catch (Throwable e) {
+            message.append(", nativeLib fail.");
+        }
+
+        return message.toString();
+    }
+
+    private static final boolean attemptLoad(final String path) {
+        try {
+            System.load(path);
+            return true;
+        } catch (Throwable e) {
+            Log.wtf(LOGTAG, "Couldn't load " + path + ": " + e);
+        }
+
+        return false;
+    }
+
+    /**
+     * The first two attempts at loading a library: directly, and
+     * then using the app library path.
+     *
+     * Returns null or the cause exception.
+     */
+    private static final Throwable doLoadLibraryExpected(final Context context, final String lib) {
+        try {
+            // Attempt 1: the way that should work.
+            System.loadLibrary(lib);
+            return null;
+        } catch (Throwable e) {
+            Log.wtf(LOGTAG, "Couldn't load " + lib + ". Trying native library dir.");
+
+            if (Build.VERSION.SDK_INT < 9) {
+                // We can't use nativeLibraryDir.
+                return e;
+            }
+
+            // Attempt 2: use nativeLibraryDir, which should also work.
+            final String libDir = context.getApplicationInfo().nativeLibraryDir;
+            final String libPath = libDir + "/lib" + lib + ".so";
+
+            // Does it even exist?
+            if (new File(libPath).exists()) {
+                if (attemptLoad(libPath)) {
+                    // Success!
+                    return null;
+                }
+                Log.wtf(LOGTAG, "Library exists but couldn't load!");
+            } else {
+                Log.wtf(LOGTAG, "Library doesn't exist when it should.");
+            }
+
+            // We failed. Return the original cause.
+            return e;
+        }
+    }
+
+    public static void doLoadLibrary(final Context context, final String lib) {
+        final Throwable e = doLoadLibraryExpected(context, lib);
+        if (e == null) {
+            // Success.
+            return;
+        }
+
+        // If we're in a mismatched UID state (Bug 1042935 Comment 16) there's really
+        // nothing we can do.
+        if (Build.VERSION.SDK_INT >= 9) {
+            final String nativeLibPath = context.getApplicationInfo().nativeLibraryDir;
+            if (nativeLibPath.contains("mismatched_uid")) {
+                throw new RuntimeException("Fatal: mismatched UID: cannot load.");
+            }
+        }
+
+        // Attempt 3: try finding the path the pseudo-supported way using .dataDir.
+        final String dataLibPath = context.getApplicationInfo().dataDir + "/lib/lib" + lib + ".so";
+        if (attemptLoad(dataLibPath)) {
+            return;
+        }
+
+        // Attempt 4: use /data/app-lib directly. This is a last-ditch effort.
+        final String androidPackageName = context.getPackageName();
+        if (attemptLoad("/data/app-lib/" + androidPackageName + "/lib" + lib + ".so")) {
+            return;
+        }
+
+        // Attempt 5: even more optimistic.
+        if (attemptLoad("/data/data/" + androidPackageName + "/lib/lib" + lib + ".so")) {
+            return;
+        }
+
+        // Look in our files directory, copying from the APK first if necessary.
+        final String filesLibDir = context.getFilesDir() + "/lib";
+        final String filesLibPath = filesLibDir + "/lib" + lib + ".so";
+        if (new File(filesLibPath).exists()) {
+            if (attemptLoad(filesLibPath)) {
+                return;
+            }
+        } else {
+            // Try copying.
+            if (extractLibrary(context, lib, filesLibDir)) {
+                // Let's try it!
+                if (attemptLoad(filesLibPath)) {
+                    return;
+                }
+            }
+        }
+
+        // Give up loudly, leaking information to debug the failure.
+        final String message = getLoadDiagnostics(context, lib);
+        Log.e(LOGTAG, "Load diagnostics: " + message);
+
+        // Throw the descriptive message, using the original library load
+        // failure as the cause.
+        throw new RuntimeException(message, e);
+    }
+
+    public static void loadMozGlue(final Context context) {
+        synchronized (sLibLoadingLock) {
+            if (sMozGlueLoaded) {
+                return;
+            }
+            sMozGlueLoaded = true;
+        }
+
+        doLoadLibrary(context, "mozglue");
+    }
+
+    public static void loadGeckoLibs(final Context context, final String apkName) {
+        loadLibsSetup(context);
+        loadGeckoLibsNative(apkName);
+    }
+
+    private static void setupLocaleEnvironment() {
+        putenv("LANG=" + Locale.getDefault().toString());
+        NumberFormat nf = NumberFormat.getInstance();
+        if (nf instanceof DecimalFormat) {
+            DecimalFormat df = (DecimalFormat)nf;
+            DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();
+
+            putenv("LOCALE_DECIMAL_POINT=" + dfs.getDecimalSeparator());
+            putenv("LOCALE_THOUSANDS_SEP=" + dfs.getGroupingSeparator());
+            putenv("LOCALE_GROUPING=" + (char)df.getGroupingSize());
+        }
+    }
+
+    @SuppressWarnings("serial")
+    public static class AbortException extends Exception {
+        public AbortException(String msg) {
+            super(msg);
+        }
+    }
+
+    @JNITarget
+    public static void abort(final String msg) {
+        final Thread thread = Thread.currentThread();
+        final Thread.UncaughtExceptionHandler uncaughtHandler =
+            thread.getUncaughtExceptionHandler();
+        if (uncaughtHandler != null) {
+            uncaughtHandler.uncaughtException(thread, new AbortException(msg));
+        }
+    }
+
+    // These methods are implemented in mozglue/android/nsGeckoUtils.cpp
+    private static native void putenv(String map);
+
+    // These methods are implemented in mozglue/android/APKOpen.cpp
+    public static native void nativeRun(String args);
+    private static native void loadGeckoLibsNative(String apkName);
+    private static native void loadSQLiteLibsNative(String apkName);
+    private static native void loadNSSLibsNative(String apkName);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/mozglue/GeckoLoader.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/mozglue/GeckoLoader.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/mozglue/GeckoLoader.java.in	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/mozglue/GeckoLoader.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,567 +0,0 @@
-//#filter substitution
-/* -*- 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.mozglue;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
-import java.util.Locale;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Environment;
-import android.util.Log;
-
-import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent;
-
-public final class GeckoLoader {
-    private static final String LOGTAG = "GeckoLoader";
-
-    // These match AppConstants, but we're built earlier.
-    private static final String ANDROID_PACKAGE_NAME = "@ANDROID_PACKAGE_NAME@";
-    private static final String MOZ_APP_ABI = "@MOZ_APP_ABI@";
-
-    private static volatile SafeIntent sIntent;
-    private static File sCacheFile;
-    private static File sGREDir;
-
-    private static final Object sLibLoadingLock = new Object();
-    // Must hold sLibLoadingLock while accessing the following boolean variables.
-    private static boolean sSQLiteLibsLoaded;
-    private static boolean sNSSLibsLoaded;
-    private static boolean sMozGlueLoaded;
-    private static boolean sLibsSetup;
-
-    private GeckoLoader() {
-        // prevent instantiation
-    }
-
-    public static File getCacheDir(Context context) {
-        if (sCacheFile == null) {
-            sCacheFile = context.getCacheDir();
-        }
-        return sCacheFile;
-    }
-
-    public static File getGREDir(Context context) {
-        if (sGREDir == null) {
-            sGREDir = new File(context.getApplicationInfo().dataDir);
-        }
-        return sGREDir;
-    }
-
-    private static void setupPluginEnvironment(Context context, String[] pluginDirs) {
-        // setup plugin path directories
-        try {
-            // Check to see if plugins were blocked.
-            if (pluginDirs == null) {
-                putenv("MOZ_PLUGINS_BLOCKED=1");
-                putenv("MOZ_PLUGIN_PATH=");
-                return;
-            }
-
-            StringBuilder pluginSearchPath = new StringBuilder();
-            for (int i = 0; i < pluginDirs.length; i++) {
-                pluginSearchPath.append(pluginDirs[i]);
-                pluginSearchPath.append(":");
-            }
-            putenv("MOZ_PLUGIN_PATH="+pluginSearchPath);
-
-            File pluginDataDir = context.getDir("plugins", 0);
-            putenv("ANDROID_PLUGIN_DATADIR=" + pluginDataDir.getPath());
-
-            File pluginPrivateDataDir = context.getDir("plugins_private", 0);
-            putenv("ANDROID_PLUGIN_DATADIR_PRIVATE=" + pluginPrivateDataDir.getPath());
-
-        } catch (Exception ex) {
-            Log.w(LOGTAG, "Caught exception getting plugin dirs.", ex);
-        }
-    }
-
-    private static void setupDownloadEnvironment(final Context context) {
-        try {
-            File downloadDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-            File updatesDir  = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-            if (downloadDir == null) {
-                downloadDir = new File(Environment.getExternalStorageDirectory().getPath(), "download");
-            }
-            if (updatesDir == null) {
-                updatesDir = downloadDir;
-            }
-            putenv("DOWNLOADS_DIRECTORY=" + downloadDir.getPath());
-            putenv("UPDATES_DIRECTORY="   + updatesDir.getPath());
-        } catch (Exception e) {
-            Log.w(LOGTAG, "No download directory found.", e);
-        }
-    }
-
-    private static void delTree(File file) {
-        if (file.isDirectory()) {
-            File children[] = file.listFiles();
-            for (File child : children) {
-                delTree(child);
-            }
-        }
-        file.delete();
-    }
-
-    private static File getTmpDir(Context context) {
-        File tmpDir = context.getDir("tmpdir", Context.MODE_PRIVATE);
-        // check if the old tmp dir is there
-        File oldDir = new File(tmpDir.getParentFile(), "app_tmp");
-        if (oldDir.exists()) {
-            delTree(oldDir);
-        }
-        return tmpDir;
-    }
-
-    public static void setLastIntent(SafeIntent intent) {
-        sIntent = intent;
-    }
-
-    public static void setupGeckoEnvironment(Context context, String[] pluginDirs, String profilePath) {
-        // if we have an intent (we're being launched by an activity)
-        // read in any environmental variables from it here
-        final SafeIntent intent = sIntent;
-        if (intent != null) {
-            String env = intent.getStringExtra("env0");
-            Log.d(LOGTAG, "Gecko environment env0: " + env);
-            for (int c = 1; env != null; c++) {
-                putenv(env);
-                env = intent.getStringExtra("env" + c);
-                Log.d(LOGTAG, "env" + c + ": " + env);
-            }
-        }
-
-        setupPluginEnvironment(context, pluginDirs);
-        setupDownloadEnvironment(context);
-
-        // profile home path
-        putenv("HOME=" + profilePath);
-
-        // setup the tmp path
-        File f = getTmpDir(context);
-        if (!f.exists()) {
-            f.mkdirs();
-        }
-        putenv("TMPDIR=" + f.getPath());
-
-        // setup the downloads path
-        f = Environment.getDownloadCacheDirectory();
-        putenv("EXTERNAL_STORAGE=" + f.getPath());
-
-        // setup the app-specific cache path
-        f = context.getCacheDir();
-        putenv("CACHE_DIRECTORY=" + f.getPath());
-
-        /* We really want to use this code, but it requires bumping up the SDK to 17 so for now
-           we will use reflection. See https://bugzilla.mozilla.org/show_bug.cgi?id=811763#c11
-
-        if (Build.VERSION.SDK_INT >= 17) {
-            android.os.UserManager um = (android.os.UserManager)context.getSystemService(Context.USER_SERVICE);
-            if (um != null) {
-                putenv("MOZ_ANDROID_USER_SERIAL_NUMBER=" + um.getSerialNumberForUser(android.os.Process.myUserHandle()));
-            } else {
-                Log.d(LOGTAG, "Unable to obtain user manager service on a device with SDK version " + Build.VERSION.SDK_INT);
-            }
-        }
-        */
-        try {
-            Object userManager = context.getSystemService("user");
-            if (userManager != null) {
-                // if userManager is non-null that means we're running on 4.2+ and so the rest of this
-                // should just work
-                Object userHandle = android.os.Process.class.getMethod("myUserHandle", (Class[])null).invoke(null);
-                Object userSerial = userManager.getClass().getMethod("getSerialNumberForUser", userHandle.getClass()).invoke(userManager, userHandle);
-                putenv("MOZ_ANDROID_USER_SERIAL_NUMBER=" + userSerial.toString());
-            }
-        } catch (Exception e) {
-            // Guard against any unexpected failures
-            Log.d(LOGTAG, "Unable to set the user serial number", e);
-        }
-
-        setupLocaleEnvironment();
-
-        // We don't need this any more.
-        sIntent = null;
-    }
-
-    private static void loadLibsSetup(Context context) {
-        synchronized (sLibLoadingLock) {
-            if (sLibsSetup) {
-                return;
-            }
-            sLibsSetup = true;
-        }
-
-        // The package data lib directory isn't placed in ld.so's
-        // search path, so we have to manually load libraries that
-        // libxul will depend on.  Not ideal.
-
-        File cacheFile = getCacheDir(context);
-        putenv("GRE_HOME=" + getGREDir(context).getPath());
-
-        // setup the libs cache
-        String linkerCache = System.getenv("MOZ_LINKER_CACHE");
-        if (linkerCache == null) {
-            linkerCache = cacheFile.getPath();
-            putenv("MOZ_LINKER_CACHE=" + linkerCache);
-        }
-
-        // Disable on-demand decompression of the linker on devices where it
-        // is known to cause crashes.
-        String forced_ondemand = System.getenv("MOZ_LINKER_ONDEMAND");
-        if (forced_ondemand == null) {
-            if ("HTC".equals(android.os.Build.MANUFACTURER) &&
-                "HTC Vision".equals(android.os.Build.MODEL)) {
-                putenv("MOZ_LINKER_ONDEMAND=0");
-            }
-        }
-
-//#ifdef MOZ_LINKER_EXTRACT
-        putenv("MOZ_LINKER_EXTRACT=1");
-        // Ensure that the cache dir is world-writable
-        File cacheDir = new File(linkerCache);
-        if (cacheDir.isDirectory()) {
-            cacheDir.setWritable(true, false);
-            cacheDir.setExecutable(true, false);
-            cacheDir.setReadable(true, false);
-        }
-//#endif
-    }
-
-    @RobocopTarget
-    public static void loadSQLiteLibs(final Context context, final String apkName) {
-        synchronized (sLibLoadingLock) {
-            if (sSQLiteLibsLoaded) {
-                return;
-            }
-            sSQLiteLibsLoaded = true;
-        }
-
-        loadMozGlue(context);
-        loadLibsSetup(context);
-        loadSQLiteLibsNative(apkName);
-    }
-
-    public static void loadNSSLibs(final Context context, final String apkName) {
-        synchronized (sLibLoadingLock) {
-            if (sNSSLibsLoaded) {
-                return;
-            }
-            sNSSLibsLoaded = true;
-        }
-
-        loadMozGlue(context);
-        loadLibsSetup(context);
-        loadNSSLibsNative(apkName);
-    }
-
-    @SuppressWarnings("deprecation")
-    private static final String getCPUABI() {
-        return android.os.Build.CPU_ABI;
-    }
-
-    /**
-     * Copy a library out of our APK.
-     *
-     * @param context a Context.
-     * @param lib the name of the library; e.g., "mozglue".
-     * @param outDir the output directory for the .so. No trailing slash.
-     * @return true on success, false on failure.
-     */
-    private static boolean extractLibrary(final Context context, final String lib, final String outDir) {
-        final String apkPath = context.getApplicationInfo().sourceDir;
-
-        // Sanity check.
-        if (!apkPath.endsWith(".apk")) {
-            Log.w(LOGTAG, "sourceDir is not an APK.");
-            return false;
-        }
-
-        // Try to extract the named library from the APK.
-        File outDirFile = new File(outDir);
-        if (!outDirFile.isDirectory()) {
-            if (!outDirFile.mkdirs()) {
-                Log.e(LOGTAG, "Couldn't create " + outDir);
-                return false;
-            }
-        }
-
-        final String abi = getCPUABI();
-
-        try {
-            final ZipFile zipFile = new ZipFile(new File(apkPath));
-            try {
-                final String libPath = "lib/" + abi + "/lib" + lib + ".so";
-                final ZipEntry entry = zipFile.getEntry(libPath);
-                if (entry == null) {
-                    Log.w(LOGTAG, libPath + " not found in APK " + apkPath);
-                    return false;
-                }
-
-                final InputStream in = zipFile.getInputStream(entry);
-                try {
-                    final String outPath = outDir + "/lib" + lib + ".so";
-                    final FileOutputStream out = new FileOutputStream(outPath);
-                    final byte[] bytes = new byte[1024];
-                    int read;
-
-                    Log.d(LOGTAG, "Copying " + libPath + " to " + outPath);
-                    boolean failed = false;
-                    try {
-                        while ((read = in.read(bytes, 0, 1024)) != -1) {
-                            out.write(bytes, 0, read);
-                        }
-                    } catch (Exception e) {
-                        Log.w(LOGTAG, "Failing library copy.", e);
-                        failed = true;
-                    } finally {
-                        out.close();
-                    }
-
-                    if (failed) {
-                        // Delete the partial copy so we don't fail to load it.
-                        // Don't bother to check the return value -- there's nothing
-                        // we can do about a failure.
-                        new File(outPath).delete();
-                    } else {
-                        // Mark the file as executable. This doesn't seem to be
-                        // necessary for the loader, but it's the normal state of
-                        // affairs.
-                        Log.d(LOGTAG, "Marking " + outPath + " as executable.");
-                        new File(outPath).setExecutable(true);
-                    }
-
-                    return !failed;
-                } finally {
-                    in.close();
-                }
-            } finally {
-                zipFile.close();
-            }
-        } catch (Exception e) {
-            Log.e(LOGTAG, "Failed to extract lib from APK.", e);
-            return false;
-        }
-    }
-
-    private static String getLoadDiagnostics(final Context context, final String lib) {
-        final StringBuilder message = new StringBuilder("LOAD ");
-        message.append(lib);
-
-        // These might differ. If so, we know why the library won't load!
-        message.append(": ABI: " + MOZ_APP_ABI + ", " + getCPUABI());
-        message.append(": Data: " + context.getApplicationInfo().dataDir);
-        try {
-            final boolean appLibExists = new File("/data/app-lib/" + ANDROID_PACKAGE_NAME + "/lib" + lib + ".so").exists();
-            final boolean dataDataExists = new File("/data/data/" + ANDROID_PACKAGE_NAME + "/lib/lib" + lib + ".so").exists();
-            message.append(", ax=" + appLibExists);
-            message.append(", ddx=" + dataDataExists);
-        } catch (Throwable e) {
-            message.append(": ax/ddx fail, ");
-        }
-
-        try {
-            final String dashOne = "/data/data/" + ANDROID_PACKAGE_NAME + "-1";
-            final String dashTwo = "/data/data/" + ANDROID_PACKAGE_NAME + "-2";
-            final boolean dashOneExists = new File(dashOne).exists();
-            final boolean dashTwoExists = new File(dashTwo).exists();
-            message.append(", -1x=" + dashOneExists);
-            message.append(", -2x=" + dashTwoExists);
-        } catch (Throwable e) {
-            message.append(", dash fail, ");
-        }
-
-        try {
-            if (Build.VERSION.SDK_INT >= 9) {
-                final String nativeLibPath = context.getApplicationInfo().nativeLibraryDir;
-                final boolean nativeLibDirExists = new File(nativeLibPath).exists();
-                final boolean nativeLibLibExists = new File(nativeLibPath + "/lib" + lib + ".so").exists();
-
-                message.append(", nativeLib: " + nativeLibPath);
-                message.append(", dirx=" + nativeLibDirExists);
-                message.append(", libx=" + nativeLibLibExists);
-            } else {
-                message.append(", <pre-9>");
-            }
-        } catch (Throwable e) {
-            message.append(", nativeLib fail.");
-        }
-
-        return message.toString();
-    }
-
-    private static final boolean attemptLoad(final String path) {
-        try {
-            System.load(path);
-            return true;
-        } catch (Throwable e) {
-            Log.wtf(LOGTAG, "Couldn't load " + path + ": " + e);
-        }
-
-        return false;
-    }
-
-    /**
-     * The first two attempts at loading a library: directly, and
-     * then using the app library path.
-     *
-     * Returns null or the cause exception.
-     */
-    private static final Throwable doLoadLibraryExpected(final Context context, final String lib) {
-        try {
-            // Attempt 1: the way that should work.
-            System.loadLibrary(lib);
-            return null;
-        } catch (Throwable e) {
-            Log.wtf(LOGTAG, "Couldn't load " + lib + ". Trying native library dir.");
-
-            if (Build.VERSION.SDK_INT < 9) {
-                // We can't use nativeLibraryDir.
-                return e;
-            }
-
-            // Attempt 2: use nativeLibraryDir, which should also work.
-            final String libDir = context.getApplicationInfo().nativeLibraryDir;
-            final String libPath = libDir + "/lib" + lib + ".so";
-
-            // Does it even exist?
-            if (new File(libPath).exists()) {
-                if (attemptLoad(libPath)) {
-                    // Success!
-                    return null;
-                }
-                Log.wtf(LOGTAG, "Library exists but couldn't load!");
-            } else {
-                Log.wtf(LOGTAG, "Library doesn't exist when it should.");
-            }
-
-            // We failed. Return the original cause.
-            return e;
-        }
-    }
-
-    public static void doLoadLibrary(final Context context, final String lib) {
-        final Throwable e = doLoadLibraryExpected(context, lib);
-        if (e == null) {
-            // Success.
-            return;
-        }
-
-        // If we're in a mismatched UID state (Bug 1042935 Comment 16) there's really
-        // nothing we can do.
-        if (Build.VERSION.SDK_INT >= 9) {
-            final String nativeLibPath = context.getApplicationInfo().nativeLibraryDir;
-            if (nativeLibPath.contains("mismatched_uid")) {
-                throw new RuntimeException("Fatal: mismatched UID: cannot load.");
-            }
-        }
-
-        // Attempt 3: try finding the path the pseudo-supported way using .dataDir.
-        final String dataLibPath = context.getApplicationInfo().dataDir + "/lib/lib" + lib + ".so";
-        if (attemptLoad(dataLibPath)) {
-            return;
-        }
-
-        // Attempt 4: use /data/app-lib directly. This is a last-ditch effort.
-        if (attemptLoad("/data/app-lib/" + ANDROID_PACKAGE_NAME + "/lib" + lib + ".so")) {
-            return;
-        }
-
-        // Attempt 5: even more optimistic.
-        if (attemptLoad("/data/data/" + ANDROID_PACKAGE_NAME + "/lib/lib" + lib + ".so")) {
-            return;
-        }
-
-        // Look in our files directory, copying from the APK first if necessary.
-        final String filesLibDir = context.getFilesDir() + "/lib";
-        final String filesLibPath = filesLibDir + "/lib" + lib + ".so";
-        if (new File(filesLibPath).exists()) {
-            if (attemptLoad(filesLibPath)) {
-                return;
-            }
-        } else {
-            // Try copying.
-            if (extractLibrary(context, lib, filesLibDir)) {
-                // Let's try it!
-                if (attemptLoad(filesLibPath)) {
-                    return;
-                }
-            }
-        }
-
-        // Give up loudly, leaking information to debug the failure.
-        final String message = getLoadDiagnostics(context, lib);
-        Log.e(LOGTAG, "Load diagnostics: " + message);
-
-        // Throw the descriptive message, using the original library load
-        // failure as the cause.
-        throw new RuntimeException(message, e);
-    }
-
-    public static void loadMozGlue(final Context context) {
-        synchronized (sLibLoadingLock) {
-            if (sMozGlueLoaded) {
-                return;
-            }
-            sMozGlueLoaded = true;
-        }
-
-        doLoadLibrary(context, "mozglue");
-    }
-
-    public static void loadGeckoLibs(final Context context, final String apkName) {
-        loadLibsSetup(context);
-        loadGeckoLibsNative(apkName);
-    }
-
-    private static void setupLocaleEnvironment() {
-        putenv("LANG=" + Locale.getDefault().toString());
-        NumberFormat nf = NumberFormat.getInstance();
-        if (nf instanceof DecimalFormat) {
-            DecimalFormat df = (DecimalFormat)nf;
-            DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();
-
-            putenv("LOCALE_DECIMAL_POINT=" + dfs.getDecimalSeparator());
-            putenv("LOCALE_THOUSANDS_SEP=" + dfs.getGroupingSeparator());
-            putenv("LOCALE_GROUPING=" + (char)df.getGroupingSize());
-        }
-    }
-
-    @SuppressWarnings("serial")
-    public static class AbortException extends Exception {
-        public AbortException(String msg) {
-            super(msg);
-        }
-    }
-
-    @JNITarget
-    public static void abort(final String msg) {
-        final Thread thread = Thread.currentThread();
-        final Thread.UncaughtExceptionHandler uncaughtHandler =
-            thread.getUncaughtExceptionHandler();
-        if (uncaughtHandler != null) {
-            uncaughtHandler.uncaughtException(thread, new AbortException(msg));
-        }
-    }
-
-    // These methods are implemented in mozglue/android/nsGeckoUtils.cpp
-    private static native void putenv(String map);
-
-    // These methods are implemented in mozglue/android/APKOpen.cpp
-    public static native void nativeRun(String args);
-    private static native void loadGeckoLibsNative(String apkName);
-    private static native void loadSQLiteLibsNative(String apkName);
-    private static native void loadNSSLibsNative(String apkName);
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java	2014-11-26 21:46:00.000000000 +0000
@@ -44,5 +44,14 @@
      */
     boolean noThrow() default false;
 
+    /**
+     * If set, uses UTF-8 strings
+     */
     boolean narrowChars() default false;
+
+    /**
+     * If set, the generated stub will catch any exception thrown and
+     * set a passed-in nsresult to NS_ERROR_FAILURE
+     */
+    boolean catchException() default false;
 }
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_add.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_add.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_remove.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_remove.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_add.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_add.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_remove.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_remove.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_add.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_add.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_remove.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_remove.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_add.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_add.png differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_remove.png and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_remove.png differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml	2014-11-26 21:46:00.000000000 +0000
@@ -62,6 +62,7 @@
             android:id="@+id/tabs"
             style="@style/UrlBar.ImageButton.NewTablet"
             android:layout_toLeftOf="@id/menu"
+            android:layout_alignWithParentIfMissing="true"
             android:background="@drawable/new_tablet_action_bar_button"/>
 
     <!-- In a 56x60dp space, centering 24dp image will leave 16x18dp. -->
@@ -81,7 +82,6 @@
             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-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml	2014-11-26 21:46:00.000000000 +0000
@@ -12,6 +12,8 @@
         android:layout_weight="1"
         android:paddingTop="4dp"/>
 
+    <!-- The right margin creates a "dead area" on the right side of the button
+         which we compensate for with a touch delegate. See TabStrip -->
     <ImageButton
         android:id="@+id/add_tab"
         style="@style/UrlBar.ImageButton"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_add.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_add.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_add.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_add.xml	2014-11-26 21:46:01.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="@null"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_remove.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_remove.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_remove.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/drawable/new_tablet_ic_menu_bookmark_remove.xml	2014-11-26 21:46:01.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="@null"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/layout/fxaccount_confirm_account.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/layout/fxaccount_confirm_account.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/layout/fxaccount_confirm_account.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/layout/fxaccount_confirm_account.xml	2014-11-26 21:46:01.000000000 +0000
@@ -45,7 +45,7 @@
             style="@style/FxAccountLinkItem"
             android:text="@string/fxaccount_confirm_account_resend_email" />
 
-       	<TextView
+        <TextView
             android:id="@+id/change_confirmation_email_link"
             style="@style/FxAccountLinkItem"
             android:text="@string/fxaccount_confirm_account_change_email" />
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/layout/site_identity_unknown.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/layout/site_identity_unknown.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/layout/site_identity_unknown.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/layout/site_identity_unknown.xml	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,26 @@
+<?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/. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/site_identity_unknown_container"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:visibility="gone">
+
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textSize="14sp"
+              android:textColor="@color/doorhanger_text"
+              android:text="@string/identity_no_info"/>
+
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textSize="14sp"
+              android:textColor="@color/doorhanger_text"
+              android:text="@string/identity_not_encrypted"
+              android:paddingTop="12dip"/>
+
+</LinearLayout>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/layout/site_identity.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/layout/site_identity.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/layout/site_identity.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/layout/site_identity.xml	2014-11-26 21:46:01.000000000 +0000
@@ -15,45 +15,53 @@
                android:src="@drawable/larry"
                android:paddingRight="@dimen/doorhanger_padding"/>
 
-    <LinearLayout android:layout_width="0dip"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1.0"
-                  android:orientation="vertical">
-
-        <TextView android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="14sp"
-                  android:textColor="@color/doorhanger_text"
-                  android:text="@string/identity_connected_to"/>
-
-        <TextView android:id="@+id/host"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="20sp"
-                  android:textColor="@color/doorhanger_text"
-                  android:textStyle="bold"/>
-
-        <TextView android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="14sp"
-                  android:textColor="@color/doorhanger_text"
-                  android:text="@string/identity_run_by"
-                  android:paddingTop="12dip"/>
-
-        <TextView android:id="@+id/owner"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textColor="@color/doorhanger_text"
-                  android:textSize="16sp"
-                  android:textStyle="bold"/>
-
-        <TextView android:id="@+id/verifier"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="14sp"
-                  android:textColor="@color/doorhanger_text"
-                  android:paddingTop="12dip"/>
+    <FrameLayout android:layout_width="0dip"
+                 android:layout_height="wrap_content"
+                 android:layout_weight="1.0">
+
+        <include layout="@layout/site_identity_unknown" />
+
+        <LinearLayout android:id="@+id/site_identity_known_container"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical">
+
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:textSize="14sp"
+                      android:textColor="@color/doorhanger_text"
+                      android:text="@string/identity_connected_to"/>
+
+            <TextView android:id="@+id/host"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:textSize="20sp"
+                      android:textColor="@color/doorhanger_text"
+                      android:textStyle="bold"/>
+
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:textSize="14sp"
+                      android:textColor="@color/doorhanger_text"
+                      android:text="@string/identity_run_by"
+                      android:paddingTop="12dip"/>
+
+            <TextView android:id="@+id/owner"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:textColor="@color/doorhanger_text"
+                      android:textSize="16sp"
+                      android:textStyle="bold"/>
+
+            <TextView android:id="@+id/verifier"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:textSize="14sp"
+                      android:textColor="@color/doorhanger_text"
+                      android:paddingTop="12dip"/>
 
-    </LinearLayout>
+        </LinearLayout>
+
+     </FrameLayout>
 
 </LinearLayout>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values/dimens.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values/dimens.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values/dimens.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values/dimens.xml	2014-11-26 21:46:01.000000000 +0000
@@ -33,6 +33,7 @@
     <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-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values/styles.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values/styles.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values/styles.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values/styles.xml	2014-11-26 21:46:01.000000000 +0000
@@ -204,6 +204,7 @@
         <item name="android:horizontalSpacing">2dp</item>
         <item name="android:verticalSpacing">2dp</item>
         <item name="android:drawSelectorOnTop">true</item>
+        <item name="android:clipToPadding">false</item>
     </style>
 
     <style name="Widget.BookmarkItemView" parent="Widget.TwoLinePageRow"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values-large-v11/styles.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values-large-v11/styles.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values-large-v11/styles.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values-large-v11/styles.xml	2014-11-26 21:46:01.000000000 +0000
@@ -107,15 +107,10 @@
         <!-- layout_width/height doesn't work here, likely because it's
              an ImageButton, so we use padding instead.
 
-             Because the curve of the reload button is lower than the end of the arrow and thus
-             the top of the view, it is perceived to be slighly lower than the other buttons.
-             Thus we use padding to fill a slightly smaller height than the toolbar and let
-             android:gravity center the image with a slight offset (.5dp higher) instead. Note that
-             this offset also affects the pressed state, but it's hardly noticeable and thus negligible.
-
-             Note: the above change is done on a generic style and thus any other items added
-             to the menu bar may appear to be offset. -->
-        <item name="android:paddingTop">20dp</item>
+             Notes:
+                 * The bookmarks star is larger than the reload button
+                 * The reload button contains whitespace at the top of the image to lower it -->
+        <item name="android:paddingTop">19dp</item>
         <item name="android:paddingBottom">21dp</item>
         <item name="android:paddingLeft">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
         <item name="android:paddingRight">@dimen/new_tablet_browser_toolbar_menu_item_padding_horizontal</item>
@@ -137,6 +132,7 @@
         <item name="android:paddingTop">30dp</item>
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
+        <item name="android:clipToPadding">false</item>
         <item name="topDivider">false</item>
     </style>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values-xlarge-land-v11/styles.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values-xlarge-land-v11/styles.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values-xlarge-land-v11/styles.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values-xlarge-land-v11/styles.xml	2014-11-26 21:46:01.000000000 +0000
@@ -8,6 +8,7 @@
         <item name="android:paddingTop">30dp</item>
         <item name="android:paddingLeft">120dp</item>
         <item name="android:paddingRight">120dp</item>
+        <item name="android:clipToPadding">false</item>
         <item name="topDivider">false</item>
     </style>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values-xlarge-v11/styles.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values-xlarge-v11/styles.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/values-xlarge-v11/styles.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/values-xlarge-v11/styles.xml	2014-11-26 21:46:01.000000000 +0000
@@ -26,6 +26,7 @@
         <item name="android:paddingTop">30dp</item>
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
+        <item name="android:clipToPadding">false</item>
         <item name="topDivider">false</item>
     </style>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml	2014-11-26 21:46:01.000000000 +0000
@@ -55,6 +55,14 @@
             android:persistent="false"
             android:title="@string/fxaccount_status_needs_account_enabled" />
 
+        <Preference
+            android:editable="false"
+            android:key="sync_now"
+            android:defaultValue=""
+            android:persistent="false"
+            android:title="Sync now"
+            android:summary="" />
+
         <CheckBoxPreference
             android:key="bookmarks"
             android:persistent="false"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/SharedPreferencesHelper.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/SharedPreferencesHelper.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/SharedPreferencesHelper.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/SharedPreferencesHelper.java	2014-11-26 21:46:00.000000000 +0000
@@ -27,6 +27,10 @@
 {
     public static final String LOGTAG = "GeckoAndSharedPrefs";
 
+    // Calculate this once, at initialization. isLoggable is too expensive to
+    // have in-line in each log call.
+    private static final boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
+
     private enum Scope {
         APP("app"),
         PROFILE("profile"),
@@ -214,7 +218,7 @@
 
         @Override
         public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-            if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {
+            if (logVerbose) {
                 Log.v(LOGTAG, "Got onSharedPreferenceChanged");
             }
             try {
@@ -279,19 +283,19 @@
         // overwriting an in-progress response.
         try {
             if (event.equals("SharedPreferences:Set")) {
-                if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {
+                if (logVerbose) {
                     Log.v(LOGTAG, "Got SharedPreferences:Set message.");
                 }
                 handleSet(message);
             } else if (event.equals("SharedPreferences:Get")) {
-                if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {
+                if (logVerbose) {
                     Log.v(LOGTAG, "Got SharedPreferences:Get message.");
                 }
                 JSONObject obj = new JSONObject();
                 obj.put("values", handleGet(message));
                 EventDispatcher.sendResponse(message, obj);
             } else if (event.equals("SharedPreferences:Observe")) {
-                if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {
+                if (logVerbose) {
                     Log.v(LOGTAG, "Got SharedPreferences:Observe message.");
                 }
                 handleObserve(message);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/StartPane.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/StartPane.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/StartPane.java	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/StartPane.java	2014-11-26 21:46:00.000000000 +0000
@@ -2,6 +2,7 @@
 
 import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity;
 
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -55,11 +56,19 @@
         return view;
     }
 
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        // StartPane is closed by touching outside the dialog.
+        Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL, TelemetryContract.Method.DIALOG, "firstrun-pane");
+        super.onCancel(dialog);
+    }
+
     // Add handler for dismissing the StartPane on a single click.
     private void addDismissHandler(View view) {
         final GestureDetector gestureDetector = new GestureDetector(getActivity(), new GestureDetector.SimpleOnGestureListener() {
             @Override
             public boolean onSingleTapUp(MotionEvent e) {
+                Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL, TelemetryContract.Method.DIALOG, "firstrun-pane");
                 StartPane.this.dismiss();
                 return true;
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/strings.xml.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/strings.xml.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/strings.xml.in	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/strings.xml.in	2014-11-26 21:46:01.000000000 +0000
@@ -96,6 +96,7 @@
   <string name="share_image_failed">&share_image_failed;</string>
   <string name="save_as_pdf">&save_as_pdf;</string>
   <string name="find_in_page">&find_in_page;</string>
+  <string name="find_matchcase">&find_matchcase;</string>
   <string name="desktop_mode">&desktop_mode;</string>
   <string name="page">&page;</string>
   <string name="tools">&tools;</string>
@@ -410,6 +411,8 @@
   <!-- Site identity popup -->
   <string name="identity_connected_to">&identity_connected_to;</string>
   <string name="identity_run_by">&identity_run_by;</string>
+  <string name="identity_no_info">&identity_no_info;</string>
+  <string name="identity_not_encrypted">&identity_not_encrypted;</string>
   <string name="loaded_mixed_content_message">&loaded_mixed_content_message;</string>
   <string name="blocked_mixed_content_message_top">&blocked_mixed_content_message_top;</string>
   <string name="blocked_mixed_content_message_bottom">&blocked_mixed_content_message_bottom;</string>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/delegates/ClientsDataDelegate.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/delegates/ClientsDataDelegate.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/delegates/ClientsDataDelegate.java	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/delegates/ClientsDataDelegate.java	2014-11-26 21:46:01.000000000 +0000
@@ -12,6 +12,7 @@
   public void setClientsCount(int clientsCount);
   public int getClientsCount();
   public boolean isLocalGUID(String guid);
+  public String getFormFactor();
 
   /**
    * The last time the client's data was modified in a way that should be
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/net/BaseResource.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/net/BaseResource.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/net/BaseResource.java	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/net/BaseResource.java	2014-11-26 21:46:01.000000000 +0000
@@ -65,7 +65,7 @@
 
   private boolean retryOnFailedRequest = true;
 
-  public static final boolean rewriteLocalhost = true;
+  public static boolean rewriteLocalhost = true;
 
   private static final String LOG_TAG = "BaseResource";
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabaseAccessor.java	2014-11-26 21:46:01.000000000 +0000
@@ -118,12 +118,21 @@
   }
 
   protected static ClientRecord recordFromCursor(Cursor cur) {
-    String accountGUID = RepoUtils.getStringFromCursor(cur, ClientsDatabase.COL_ACCOUNT_GUID);
-    String clientName = RepoUtils.getStringFromCursor(cur, ClientsDatabase.COL_NAME);
-    String clientType = RepoUtils.getStringFromCursor(cur, ClientsDatabase.COL_TYPE);
-    ClientRecord record = new ClientRecord(accountGUID);
+    final String accountGUID = RepoUtils.getStringFromCursor(cur, ClientsDatabase.COL_ACCOUNT_GUID);
+    final String clientName = RepoUtils.getStringFromCursor(cur, ClientsDatabase.COL_NAME);
+    final String clientType = RepoUtils.getStringFromCursor(cur, ClientsDatabase.COL_TYPE);
+
+    final ClientRecord record = new ClientRecord(accountGUID);
     record.name = clientName;
     record.type = clientType;
+
+    // Optional fields. These will either be null or strings.
+    record.formfactor = RepoUtils.optStringFromCursor(cur, ClientsDatabase.COL_FORMFACTOR);
+    record.os = RepoUtils.optStringFromCursor(cur, ClientsDatabase.COL_OS);
+    record.device = RepoUtils.optStringFromCursor(cur, ClientsDatabase.COL_DEVICE);
+    record.appPackage = RepoUtils.optStringFromCursor(cur, ClientsDatabase.COL_APP_PACKAGE);
+    record.application = RepoUtils.optStringFromCursor(cur, ClientsDatabase.COL_APPLICATION);
+
     return record;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabase.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabase.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabase.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/android/ClientsDatabase.java	2014-11-26 21:46:01.000000000 +0000
@@ -19,7 +19,7 @@
 
   // Database Specifications.
   protected static final String DB_NAME = "clients_database";
-  protected static final int SCHEMA_VERSION = 2;
+  protected static final int SCHEMA_VERSION = 3;
 
   // Clients Table.
   public static final String TBL_CLIENTS      = "clients";
@@ -28,7 +28,15 @@
   public static final String COL_NAME         = "name";
   public static final String COL_TYPE         = "device_type";
 
-  public static final String[] TBL_CLIENTS_COLUMNS = new String[] { COL_ACCOUNT_GUID, COL_PROFILE, COL_NAME, COL_TYPE };
+  // Optional fields.
+  public static final String COL_FORMFACTOR = "formfactor";
+  public static final String COL_OS = "os";
+  public static final String COL_APPLICATION = "application";
+  public static final String COL_APP_PACKAGE = "appPackage";
+  public static final String COL_DEVICE = "device";
+
+  public static final String[] TBL_CLIENTS_COLUMNS = new String[] { COL_ACCOUNT_GUID, COL_PROFILE, COL_NAME, COL_TYPE,
+                                                                    COL_FORMFACTOR, COL_OS, COL_APPLICATION, COL_APP_PACKAGE, COL_DEVICE };
   public static final String TBL_CLIENTS_KEY = COL_ACCOUNT_GUID + " = ? AND " +
                                                COL_PROFILE + " = ?";
 
@@ -65,6 +73,11 @@
         + COL_PROFILE + " TEXT, "
         + COL_NAME + " TEXT, "
         + COL_TYPE + " TEXT, "
+        + COL_FORMFACTOR + " TEXT, "
+        + COL_OS + " TEXT, "
+        + COL_APPLICATION + " TEXT, "
+        + COL_APP_PACKAGE + " TEXT, "
+        + COL_DEVICE + " TEXT, "
         + "PRIMARY KEY (" + COL_ACCOUNT_GUID + ", " + COL_PROFILE + "))";
     db.execSQL(createClientsTableSql);
   }
@@ -82,16 +95,28 @@
 
   @Override
   public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-    Logger.debug(LOG_TAG, "ClientsDatabase.onUpgrade().");
-    // For now we'll just drop and recreate the tables.
-    db.execSQL("DROP TABLE IF EXISTS " + TBL_CLIENTS);
-    db.execSQL("DROP TABLE IF EXISTS " + TBL_COMMANDS);
-    onCreate(db);
+    Logger.debug(LOG_TAG, "ClientsDatabase.onUpgrade(" + oldVersion + ", " + newVersion + ").");
+    if (oldVersion < 2) {
+      // For now we'll just drop and recreate the tables.
+      db.execSQL("DROP TABLE IF EXISTS " + TBL_CLIENTS);
+      db.execSQL("DROP TABLE IF EXISTS " + TBL_COMMANDS);
+      onCreate(db);
+      return;
+    }
+
+    if (newVersion >= 3) {
+      // Add the optional columns to clients.
+      db.execSQL("ALTER TABLE " + TBL_CLIENTS + " ADD COLUMN " + COL_FORMFACTOR + " TEXT");
+      db.execSQL("ALTER TABLE " + TBL_CLIENTS + " ADD COLUMN " + COL_OS + " TEXT");
+      db.execSQL("ALTER TABLE " + TBL_CLIENTS + " ADD COLUMN " + COL_APPLICATION + " TEXT");
+      db.execSQL("ALTER TABLE " + TBL_CLIENTS + " ADD COLUMN " + COL_APP_PACKAGE + " TEXT");
+      db.execSQL("ALTER TABLE " + TBL_CLIENTS + " ADD COLUMN " + COL_DEVICE + " TEXT");
+    }
   }
 
   public void wipeDB() {
     SQLiteDatabase db = this.getCachedWritableDatabase();
-    onUpgrade(db, SCHEMA_VERSION, SCHEMA_VERSION);
+    onUpgrade(db, 0, SCHEMA_VERSION);
   }
 
   public void wipeClientsTable() {
@@ -115,6 +140,26 @@
     cv.put(COL_NAME, record.name);
     cv.put(COL_TYPE, record.type);
 
+    if (record.formfactor != null) {
+      cv.put(COL_FORMFACTOR, record.formfactor);
+    }
+
+    if (record.os != null) {
+      cv.put(COL_OS, record.os);
+    }
+
+    if (record.application != null) {
+      cv.put(COL_APPLICATION, record.application);
+    }
+
+    if (record.appPackage != null) {
+      cv.put(COL_APP_PACKAGE, record.appPackage);
+    }
+
+    if (record.device != null) {
+      cv.put(COL_DEVICE, record.device);
+    }
+
     String[] args = new String[] { record.guid, profileId };
     int rowsUpdated = db.update(TBL_CLIENTS, cv, TBL_CLIENTS_KEY, args);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/android/RepoUtils.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/android/RepoUtils.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/android/RepoUtils.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/android/RepoUtils.java	2014-11-26 21:46:01.000000000 +0000
@@ -95,7 +95,24 @@
     }
   }
 
-  public static String getStringFromCursor(Cursor cur, String colId) {
+  /**
+   * This method exists because the behavior of <code>cur.getString()</code> is undefined
+   * when the value in the database is <code>NULL</code>.
+   * This method will return <code>null</code> in that case.
+   */
+  public static String optStringFromCursor(final Cursor cur, final String colId) {
+    final int col = cur.getColumnIndex(colId);
+    if (cur.isNull(col)) {
+      return null;
+    }
+    return cur.getString(col);
+  }
+
+  /**
+   * The behavior of this method when the value in the database is <code>NULL</code> is
+   * determined by the implementation of the {@link Cursor}.
+   */
+  public static String getStringFromCursor(final Cursor cur, final String colId) {
     // TODO: getColumnIndexOrThrow?
     // TODO: don't look up columns by name!
     return cur.getString(cur.getColumnIndex(colId));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/domain/ClientRecord.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/domain/ClientRecord.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/repositories/domain/ClientRecord.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/repositories/domain/ClientRecord.java	2014-11-26 21:46:01.000000000 +0000
@@ -41,6 +41,16 @@
   public JSONArray commands;
   public JSONArray protocols;
 
+  // Optional fields.
+  // See <https://github.com/mozilla-services/docs/blob/master/source/sync/objectformats.rst#user-content-clients>
+  // for full formats.
+  // If a value isn't known, the field is omitted.
+  public String formfactor;          // "phone", "largetablet", "smalltablet", "desktop", "laptop", "tv".
+  public String os;                  // One of "Android", "Darwin", "WINNT", "Linux", "iOS", "Firefox OS".
+  public String application;         // Display name, E.g., "Firefox Beta"
+  public String appPackage;          // E.g., "org.mozilla.firefox_beta"
+  public String device;              // E.g., "HTC One"
+
   public ClientRecord(String guid, String collection, long lastModified, boolean deleted) {
     super(guid, collection, lastModified, deleted);
     this.ttl = CLIENTS_TTL;
@@ -85,6 +95,26 @@
       Logger.debug(LOG_TAG, "Got non-array protocols in client record " + guid, e);
       protocols = null;
     }
+
+    if (payload.containsKey("formfactor")) {
+      this.formfactor = payload.getString("formfactor");
+    }
+
+    if (payload.containsKey("os")) {
+      this.os = payload.getString("os");
+    }
+
+    if (payload.containsKey("application")) {
+      this.application = payload.getString("application");
+    }
+
+    if (payload.containsKey("appPackage")) {
+      this.appPackage = payload.getString("appPackage");
+    }
+
+    if (payload.containsKey("device")) {
+      this.device = payload.getString("device");
+    }
   }
 
   @Override
@@ -101,6 +131,27 @@
     if (this.protocols != null) {
       payload.put("protocols",  this.protocols);
     }
+
+
+    if (this.formfactor != null) {
+      payload.put("formfactor", this.formfactor);
+    }
+
+    if (this.os != null) {
+      payload.put("os", this.os);
+    }
+
+    if (this.application != null) {
+      payload.put("application", this.application);
+    }
+
+    if (this.appPackage != null) {
+      payload.put("appPackage", this.appPackage);
+    }
+
+    if (this.device != null) {
+      payload.put("device", this.device);
+    }
   }
 
   @Override
@@ -123,7 +174,7 @@
       return false;
     }
 
-    // Don't compare versions or protocols, no matter how much we might want to.
+    // Don't compare versions, protocols, or other optional fields, no matter how much we might want to.
     // They're not required by the spec.
     ClientRecord other = (ClientRecord) o;
     if (!RepoUtils.stringsEqual(other.name, this.name) ||
@@ -144,6 +195,13 @@
     out.type = this.type;
     out.version = this.version;
     out.protocols = this.protocols;
+
+    out.formfactor = this.formfactor;
+    out.os = this.os;
+    out.application = this.application;
+    out.appPackage = this.appPackage;
+    out.device = this.device;
+
     return out;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/SharedPreferencesClientsDataDelegate.java	2014-11-26 21:46:01.000000000 +0000
@@ -7,6 +7,7 @@
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.background.common.GlobalConstants;
 import org.mozilla.gecko.sync.delegates.ClientsDataDelegate;
+import org.mozilla.gecko.util.HardwareUtils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,6 +23,9 @@
   public SharedPreferencesClientsDataDelegate(SharedPreferences sharedPreferences, Context context) {
     this.sharedPreferences = sharedPreferences;
     this.context = context;
+
+    // It's safe to init this multiple times.
+    HardwareUtils.init(context);
   }
 
   @Override
@@ -92,4 +96,21 @@
   public long getLastModifiedTimestamp() {
     return sharedPreferences.getLong(SyncConfiguration.PREF_CLIENT_DATA_TIMESTAMP, 0);
   }
+
+  @Override
+  public String getFormFactor() {
+    if (HardwareUtils.isLargeTablet()) {
+      return "largetablet";
+    }
+
+    if (HardwareUtils.isSmallTablet()) {
+      return "smalltablet";
+    }
+
+    if (HardwareUtils.isTelevision()) {
+      return "tv";
+    }
+
+    return "phone";
+  }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/stage/SyncClientsEngineStage.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/stage/SyncClientsEngineStage.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/stage/SyncClientsEngineStage.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/stage/SyncClientsEngineStage.java	2014-11-26 21:46:01.000000000 +0000
@@ -13,6 +13,7 @@
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.background.common.GlobalConstants;
 import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.sync.CommandProcessor;
@@ -38,7 +39,9 @@
 import org.mozilla.gecko.sync.repositories.domain.ClientRecord;
 import org.mozilla.gecko.sync.repositories.domain.ClientRecordFactory;
 import org.mozilla.gecko.sync.repositories.domain.VersionConstants;
+import org.mozilla.gecko.util.HardwareUtils;
 
+import android.content.Context;
 import ch.boye.httpclientandroidlib.HttpStatus;
 
 public class SyncClientsEngineStage extends AbstractSessionManagingSyncStage {
@@ -378,6 +381,13 @@
     r.name = ourName;
     r.version = getLocalClientVersion();
     r.protocols = getLocalClientProtocols();
+
+    r.os = "Android";
+    r.application = GlobalConstants.MOZ_APP_DISPLAYNAME;
+    r.appPackage = AppConstants.ANDROID_PACKAGE_NAME;
+    r.device = android.os.Build.MODEL;
+    r.formfactor = delegate.getFormFactor();
+
     return r;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/SyncConfiguration.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/SyncConfiguration.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/sync/SyncConfiguration.java	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/sync/SyncConfiguration.java	2014-11-26 21:46:01.000000000 +0000
@@ -37,7 +37,6 @@
       this.editor = config.getEditor();
     }
 
-    @Override
     public void apply() {
       // Android <=r8 SharedPreferences.Editor does not contain apply() for overriding.
       this.editor.commit();
@@ -86,7 +85,6 @@
 
     // Not marking as Override, because Android <= 10 doesn't have
     // putStringSet. Neither can we implement it.
-    @Override
     public Editor putStringSet(String key, Set<String> value) {
       throw new RuntimeException("putStringSet not available.");
     }
@@ -162,7 +160,6 @@
 
     // Not marking as Override, because Android <= 10 doesn't have
     // getStringSet. Neither can we implement it.
-    @Override
     public Set<String> getStringSet(String key, Set<String> defValue) {
       throw new RuntimeException("getStringSet not available.");
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/SysInfo.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/SysInfo.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/SysInfo.java.in	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/SysInfo.java.in	2014-11-26 21:46:00.000000000 +0000
@@ -6,13 +6,17 @@
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.util.HardwareUtils;
-
 import android.os.StrictMode;
 import android.util.Log;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 import java.util.regex.Pattern;
 
@@ -21,27 +25,35 @@
  * nsSystemInfo. See also the constants in AppConstants, which reflect
  * much of nsIXULAppInfo.
  */
+// Normally, we'd annotate with @RobocopTarget.  Since SysInfo is compiled
+// before RobocopTarget, we instead add o.m.g.SysInfo directly to the Proguard
+// configuration.
 public final class SysInfo {
     private static final String LOG_TAG = "GeckoSysInfo";
 
+    // Number of bytes of /proc/meminfo to read in one go.
+    private static final int MEMINFO_BUFFER_SIZE_BYTES = 256;
+
     // We don't mind an instant of possible duplicate work, we only wish to
     // avoid inconsistency, so we don't bother with synchronization for
     // these.
     private static volatile int cpuCount = -1;
 
-      /**
-       * Get the number of cores on the device.
-       *
-       * We can't use a nice tidy API call, because they're all wrong:
-       *
-       * <http://stackoverflow.com/questions/7962155/how-can-you-detect-a-dual-core-
-       * cpu-on-an-android-device-from-code>
-       *
-       * This method is based on that code.
-       *
-       * @return the number of CPU cores, or 1 if the number could not be
-       *         determined.
-       */
+    private static volatile int totalRAM = -1;
+
+    /**
+     * Get the number of cores on the device.
+     *
+     * We can't use a nice tidy API call, because they're all wrong:
+     *
+     * <http://stackoverflow.com/questions/7962155/how-can-you-detect-a-dual-core-
+     * cpu-on-an-android-device-from-code>
+     *
+     * This method is based on that code.
+     *
+     * @return the number of CPU cores, or 1 if the number could not be
+     *         determined.
+     */
     public static int getCPUCount() {
         if (cpuCount > 0) {
             return cpuCount;
@@ -73,10 +85,93 @@
     }
 
     /**
-     * Wraps HardwareUtils so callers don't need to know about it.
+     * Helper functions used to extract key/value data from /proc/meminfo
+     * Pulled from:
+     * http://androidxref.com/4.2_r1/xref/frameworks/base/core/java/com/android/internal/util/MemInfoReader.java
+     */
+    private static boolean matchMemText(byte[] buffer, int index, int bufferLength, byte[] text) {
+        final int N = text.length;
+        if ((index + N) >= bufferLength) {
+            return false;
+        }
+        for (int i = 0; i < N; i++) {
+            if (buffer[index + i] != text[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Parses a line like:
+     *
+     *  MemTotal: 1605324 kB
+     *
+     * into 1605324.
+     *
+     * @return the first uninterrupted sequence of digits following the
+     *         specified index, parsed as an integer value in KB.
+     */
+    private static int extractMemValue(byte[] buffer, int offset, int length) {
+        if (offset >= length) {
+            return 0;
+        }
+
+        while (offset < length && buffer[offset] != '\n') {
+            if (buffer[offset] >= '0' && buffer[offset] <= '9') {
+                int start = offset++;
+                while (offset < length &&
+                       buffer[offset] >= '0' &&
+                       buffer[offset] <= '9') {
+                    ++offset;
+                }
+                return Integer.parseInt(new String(buffer, start, offset - start), 10);
+            }
+            ++offset;
+        }
+        return 0;
+    }
+
+    /**
+     * Fetch the total memory of the device in MB by parsing /proc/meminfo.
+     *
+     * Of course, Android doesn't have a neat and tidy way to find total
+     * RAM, so we do it by parsing /proc/meminfo.
+     *
+     * @return 0 if a problem occurred, or memory size in MB.
      */
     public static int getMemSize() {
-        return HardwareUtils.getMemSize();
+        if (totalRAM >= 0) {
+            return totalRAM;
+        }
+
+        // This is the string "MemTotal" that we're searching for in the buffer.
+        final byte[] MEMTOTAL = {'M', 'e', 'm', 'T', 'o', 't', 'a', 'l'};
+        try {
+            final byte[] buffer = new byte[MEMINFO_BUFFER_SIZE_BYTES];
+            final FileInputStream is = new FileInputStream("/proc/meminfo");
+            try {
+                final int length = is.read(buffer);
+
+                for (int i = 0; i < length; i++) {
+                    if (matchMemText(buffer, i, length, MEMTOTAL)) {
+                        i += 8;
+                        totalRAM = extractMemValue(buffer, i, length) / 1024;
+                        Log.d(LOG_TAG, "System memory: " + totalRAM + "MB.");
+                        return totalRAM;
+                    }
+                }
+            } finally {
+                is.close();
+            }
+
+            Log.w(LOG_TAG, "Did not find MemTotal line in /proc/meminfo.");
+            return totalRAM = 0;
+        } catch (FileNotFoundException f) {
+            return totalRAM = 0;
+        } catch (IOException e) {
+            return totalRAM = 0;
+        }
     }
 
     /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabsLayoutItemView.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabsLayoutItemView.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabsLayoutItemView.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabsLayoutItemView.java	2014-11-26 21:46:01.000000000 +0000
@@ -4,6 +4,7 @@
 
 package org.mozilla.gecko.tabs;
 
+import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.widget.TabThumbnailWrapper;
@@ -12,6 +13,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.TouchDelegate;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -88,17 +90,28 @@
         mCloseButton = (ImageButton) findViewById(R.id.close);
         mThumbnailWrapper = (TabThumbnailWrapper) findViewById(R.id.wrapper);
 
+        if (NewTabletUI.isEnabled(getContext())) {
+            growCloseButtonHitArea();
+        }
+    }
+
+    private void growCloseButtonHitArea() {
         getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
             @Override
             public boolean onPreDraw() {
                 getViewTreeObserver().removeOnPreDrawListener(this);
 
-                final Rect r = new Rect();
-                mCloseButton.getHitRect(r);
-                r.left -= 25;
-                r.bottom += 25;
+                // Ideally we want the close button hit area to be 40x40dp but we are constrained by the height of the parent, so
+                // we make it as tall as the parent view and 40dp across.
+                final int targetHitArea = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40, getResources().getDisplayMetrics());;
+
+                final Rect hitRect = new Rect();
+                hitRect.top = 0;
+                hitRect.right = getWidth();
+                hitRect.left = getWidth() - targetHitArea;
+                hitRect.bottom = targetHitArea;
 
-                setTouchDelegate(new TouchDelegate(r, mCloseButton));
+                setTouchDelegate(new TouchDelegate(hitRect, mCloseButton));
 
                 return true;
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabsPanel.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabsPanel.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabsPanel.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabsPanel.java	2014-11-26 21:46:01.000000000 +0000
@@ -241,9 +241,10 @@
         Resources resources = tabsContainer.getContext().getResources();
 
         int screenHeight = resources.getDisplayMetrics().heightPixels;
+        int actionBarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height);
 
         if(NewTabletUI.isEnabled(tabsContainer.getContext())){
-            return screenHeight;
+            return screenHeight - actionBarHeight;
         }
 
         PanelView panelView = tabsContainer.getCurrentPanelView();
@@ -251,8 +252,6 @@
             return resources.getDimensionPixelSize(R.dimen.tabs_layout_horizontal_height);
         }
 
-        int actionBarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height);
-
         Rect windowRect = new Rect();
         tabsContainer.getWindowVisibleDisplayFrame(windowRect);
         int windowHeight = windowRect.bottom - windowRect.top;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabStrip.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabStrip.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabStrip.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabStrip.java	2014-11-26 21:46:01.000000000 +0000
@@ -6,9 +6,12 @@
 package org.mozilla.gecko.tabs;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.TouchDelegate;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.widget.ImageButton;
 
 import org.mozilla.gecko.R;
@@ -51,6 +54,25 @@
             }
         });
 
+        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                @Override
+                public boolean onPreDraw() {
+                    getViewTreeObserver().removeOnPreDrawListener(this);
+
+                    final Rect r = new Rect();
+                    r.left = addTabButton.getRight();
+                    r.right = getWidth();
+                    r.top = 0;
+                    r.bottom = getHeight();
+
+                    // Redirect touch events between the 'new tab' button and the edge
+                    // of the screen to the 'new tab' button.
+                    setTouchDelegate(new TouchDelegate(r, addTabButton));
+
+                    return true;
+                }
+            });
+
         tabsListener = new TabsListener();
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabStripView.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabStripView.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tabs/TabStripView.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tabs/TabStripView.java	2014-11-26 21:46:01.000000000 +0000
@@ -18,12 +18,14 @@
 import android.view.ViewTreeObserver.OnPreDrawListener;
 
 import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.Animator.AnimatorListener;
 import com.nineoldandroids.animation.AnimatorSet;
 import com.nineoldandroids.animation.ObjectAnimator;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.mozilla.gecko.animation.TransitionsTracker;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -39,6 +41,8 @@
     private final TabStripAdapter adapter;
     private final Drawable divider;
 
+    private final TabAnimatorListener animatorListener;
+
     // Filled by calls to ShapeDrawable.getPadding();
     // saved to prevent allocation in draw().
     private final Rect dividerPadding = new Rect();
@@ -63,6 +67,8 @@
                 resources.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_item_margin);
         setItemMargin(itemMargin);
 
+        animatorListener = new TabAnimatorListener();
+
         adapter = new TabStripAdapter(context);
         setAdapter(adapter);
     }
@@ -119,7 +125,6 @@
                 for (int i = removedPosition - firstPosition; i < childCount; i++) {
                     final View child = getChildAt(i);
 
-                    // TODO: optimize with Valueresolver
                     final ObjectAnimator animator =
                             ObjectAnimator.ofFloat(child, "translationX", removedSize, 0);
                     childAnimators.add(animator);
@@ -129,6 +134,10 @@
                 animatorSet.playTogether(childAnimators);
                 animatorSet.setDuration(ANIM_TIME_MS);
                 animatorSet.setInterpolator(ANIM_INTERPOLATOR);
+                animatorSet.addListener(animatorListener);
+
+                TransitionsTracker.track(animatorSet);
+
                 animatorSet.start();
 
                 return true;
@@ -177,6 +186,10 @@
                 animatorSet.playTogether(childAnimators);
                 animatorSet.setDuration(ANIM_TIME_MS);
                 animatorSet.setInterpolator(ANIM_INTERPOLATOR);
+                animatorSet.addListener(animatorListener);
+
+                TransitionsTracker.track(animatorSet);
+
                 animatorSet.start();
 
                 return true;
@@ -302,4 +315,33 @@
             divider.draw(canvas);
         }
     }
+
+    private class TabAnimatorListener implements AnimatorListener {
+        private void setLayerType(int layerType) {
+            final int childCount = getChildCount();
+            for (int i = 0; i < childCount; i++) {
+                getChildAt(i).setLayerType(layerType, null);
+            }
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+            setLayerType(View.LAYER_TYPE_HARDWARE);
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            // This method is called even if the animator is canceled.
+            setLayerType(View.LAYER_TYPE_NONE);
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+    }
 }
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/javascript_redirect.sjs thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/javascript_redirect.sjs
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/javascript_redirect.sjs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/javascript_redirect.sjs	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,8 @@
+function handleRequest(request, response)
+{
+  let page = "<!DOCTYPE html><html><head><script>window.opener = null; location.replace('" + request.queryString + "')</script></head><body><p>Redirecting...</p></body></html>";
+
+  response.setStatusLine("1.0", 200, "OK");
+  response.setHeader("Content-Type", "text/html; charset=utf-8", false);
+  response.write(page);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/JavascriptTest.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/JavascriptTest.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/JavascriptTest.java	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/JavascriptTest.java	2014-11-26 21:46:01.000000000 +0000
@@ -11,6 +11,11 @@
     private static final String LOGTAG = "JavascriptTest";
     private static final String EVENT_TYPE = JavascriptBridge.EVENT_TYPE;
 
+    // Calculate these once, at initialization. isLoggable is too expensive to
+    // have in-line in each log call.
+    private static final boolean logDebug   = Log.isLoggable(LOGTAG, Log.DEBUG);
+    private static final boolean logVerbose = Log.isLoggable(LOGTAG, Log.VERBOSE);
+
     private final String javascriptUrl;
 
     public JavascriptTest(String javascriptUrl) {
@@ -39,11 +44,11 @@
                 new JavascriptMessageParser(mAsserter, false);
         try {
             while (!testMessageParser.isTestFinished()) {
-                if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {
+                if (logVerbose) {
                     Log.v(LOGTAG, "Waiting for " + EVENT_TYPE);
                 }
                 String data = expecter.blockForEventData();
-                if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {
+                if (logVerbose) {
                     Log.v(LOGTAG, "Got event with data '" + data + "'");
                 }
 
@@ -60,7 +65,7 @@
                 testMessageParser.logMessage(message);
             }
 
-            if (Log.isLoggable(LOGTAG, Log.DEBUG)) {
+            if (logDebug) {
                 Log.d(LOGTAG, "Got test finished message");
             }
         } finally {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/reader_mode_pages/addons.mozilla.org/en-US/firefox/index.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/reader_mode_pages/addons.mozilla.org/en-US/firefox/index.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/reader_mode_pages/addons.mozilla.org/en-US/firefox/index.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/reader_mode_pages/addons.mozilla.org/en-US/firefox/index.html	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,320 @@
+<!DOCTYPE html>
+<html lang="en-US" dir="ltr">
+  <head>
+          <style>
+        html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}.js-hidden{display:none}i{font-style:italic;color:#838382}.item details .vitals:after,header:after,header nav:after,section:after,.menu:after,.grouped_ratings:after,.persona-confirm:after,.persona-slider .confirm-buttons:after{content:".";display:block;clear:both;height:0;visibility:hidden}.locked #page{display:none}.moz-menu .tab{background:#33589f}footer:before,.tabs{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAABCAYAAAASC7TOAAAAEElEQVQIHWP8//8/Aw7wHwBR6AP+G53o6QAAAABJRU5ErkJggg==),-moz-linear-gradient(#fff, #dcedfd);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAABCAYAAAASC7TOAAAAEElEQVQIHWP8//8/Aw7wHwBR6AP+G53o6QAAAABJRU5ErkJggg==),-webkit-gradient(linear,left top,left bottom,from(#fff),to( #dcedfd))}#page{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAABCAYAAAASC7TOAAAAEElEQVQIHWP8//8/Aw7wHwBR6AP+G53o6QAAAABJRU5ErkJggg==),-moz-linear-gradient( #dcedfd 0,#fff 200px);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAABCAYAAAASC7TOAAAAEElEQVQIHWP8//8/Aw7wHwBR6AP+G53o6QAAAABJRU5ErkJggg==),-webkit-gradient(linear,left top,left 200,from( #dcedfd),to(#fff));margin-bottom:30px;min-height:430px}#sort-menu .label span:after,.moz-menu .tab a:after,.menu a.expando:after{content:"\00a0";display:block;position:absolute;right:8px;width:0;height:0;-moz-transition:.3s -moz-transform ease;-webkit-transition:.3s -webkit-transform ease;-moz-transform-origin:50% 25%;-webkit-transform-origin:50% 25%;top:16px;border:5px solid transparent;border-top-color:#000;pointer-events:none}html,body{height:100%}table{width:100%}table tr{border:1px solid #ddd}table th,table td{padding:4px 8px 4px 4px;vertical-align:top}.html-rtl table th,.html-rtl table td{padding:4px 4px 4px 8px}table th{background:#f4f4f4;color:#666;text-align:right;font-weight:700;width:50%}.html-rtl table th{text-align:left}#content{width:100%;overflow:hidden;position:relative;padding:8px 0 16px}.paginator{display:-moz-box;display:-webkit-box;text-align:center;color:#ccc;font-size:1.1em;width:100%;height:40px}.paginator .page{color:#666;margin:0 2%;-moz-box-flex:1;-webkit-box-flex:1}.paginator a{padding:14px}.paginator .next a:after{content:' \00bb'}.paginator .prev a:before{content:' \00ab'}#sort-menu{-moz-box-align:center;padding:0 14px}#sort-menu ul{height:0;position:relative;top:-1px;overflow:hidden;-moz-transition:.5s height ease;-webkit-transition:.5s height ease;border:0 solid transparent;border-width:1px 0}#sort-menu.expand ul{border-color:#a9badb;height:254px;margin:0 -14px}.purchases #sort-menu.expand ul{height:100px}#sort-menu li{border-top:1px solid #dde4ef}#sort-menu li a{display:block;height:26px;line-height:26px;padding:12px 14px}#sort-menu li:first-child{border-top:0}#sort-menu .label{color:#888}#sort-menu .label span{position:relative;display:inline-block;z-index:10;background:transparent;color:#447bc4;text-align:center;white-space:nowrap;border:1px solid transparent;border-width:1px 1px 0 1px;border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;-webkit-border-radius:6px 6px 0 0;margin-left:4px;padding:11px 22px 11px 6px;-moz-transition:.3s background ease}#sort-menu.expand .label span{background:#fff;border-color:#a9badb;border-bottom:1px solid white;box-shadow:0 -1px 1px #dde4ef}#sort-menu .label span:after{top:16px;border:5px solid transparent;border-top-color:#447BC4}#sort-menu.expand .label span:after{-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg)}.tabs{border-bottom:1px solid #a2bbdc;height:41px;font:16px Georgia,serif;padding:14px 14px 0;box-shadow:0 -1px 1px rgba(0,0,0,.1) inset}.tabs ul{display:-webkit-box;display:-moz-box;margin:0;width:100%;z-index:1}.tabs ul li{-moz-box-flex:1;-webkit-box-flex:1;border:0;-webkit-transition:.3s background ease;-moz-transition:.3s background ease}.tabs a:-moz-focusring{outline:0;border:0}.tabs ul li a{display:block;white-space:nowrap;text-align:center;color:#447bc4;padding:11px 8px 11px 6px}.tabs ul li.selected{background:#fff;box-shadow:0 -1px 1px rgba(0,0,0,.1);border:1px solid #a2bbdc;border-width:1px 1px 0 1px;border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;-webkit-border-radius:6px 6px 0 0}.tabs ul li.selected a{color:#444;padding:11px 8px 11px 6px}.tab-pane{display:none}.tab-pane.selected{display:block}.slider{white-space:nowrap;position:relative;left:0;-moz-transition-duration:.3s;-moz-transition-property:left,right;-webkit-transition-duration:.3s;-webkit-transition-property:left,right}.html-rtl .slider{left:auto;right:0}.slider-mask{width:100%;overflow:hidden}.slider .tab-pane{vertical-align:top;width:100%;display:inline-block}#lightbox{background:rgba(0,0,0,.9);position:absolute;width:100%;height:101%;display:none;z-index:9000;color:#fff;text-align:center;opacity:0;overflow:hidden;pointer-events:none;-moz-transition:.5s opacity ease;-webkit-transition:.5s opacity ease}#lightbox .close{display:block;position:absolute;z-index:100;font-family:sans-serif;color:#fff;top:14px;right:14px;line-height:12px;text-align:center;-moz-border-radius:8px;-webkit-border-radius:8px;border-radius:8px;width:12px;height:12px;padding:12px;border:1px solid white}#lightbox.show{pointer-events:auto;opacity:1}#lightbox section{position:relative;width:100%;height:100%}#lightbox .content{height:70%;display:block;position:relative;text-align:center}#lightbox .controls{height:25%;min-height:100px;position:relative;padding:5% 40px 0}#lightbox .control.prev,#lightbox .control.next{color:#fff;left:0;-moz-transition:.3s opacity ease}.html-rtl #lightbox .control.prev{left:auto;right:0}#lightbox .control.next{left:auto;right:0}.html-rtl #lightbox .control.next{right:auto;left:0}#lightbox .control.disabled{opacity:0}#lightbox .caption{font-size:18px}#lightbox img{max-width:95%;max-height:100%;-moz-transition:.5s opacity ease;-webkit-transition:.5s opacity ease;opacity:0;position:absolute}td .versions li a{display:block;margin:0 0 8px}td .versions li:last-child a{margin:0}.author,.author a{font-family:"Droid Sans",Helvetica,Arial,sans-serif;color:#888;font-size:12px;line-height:12px}.personas-grid h2{border-bottom:#ccc 1px solid}#persona-lists{padding-bottom:104px}#persona-header{margin:0 14px}#persona-header hgroup{padding-left:0}#persona-header h2{margin:0}#persona-header h3{color:#444;font-size:18px;margin-bottom:14px}#persona-header h2{font-style:normal;text-transform:uppercase}#persona h3,#persona .author{display:inline-block;font-size:14px}#persona h3{color:#444;font-family:"Droid Sans",Helvetica,sans-serif;font-weight:700}#persona .author,#persona .persona-large{margin-bottom:8px}#persona .badges{margin-top:0}#persona .badges li{margin:8px 0 0}ul.license{position:relative;top:3px}ul.license li{display:block;float:left;list-style:none;margin-right:2px}.html-rtl ul.license li{float:right;margin:0 0 0 2px}ul.license li.text{font-size:90%;line-height:15px;margin-left:4px}.html-rtl ul.license li.text{margin:0 4px 0 0}ul.license li.icon{background:url(../../media/img/zamboni/licenses.png%3Ffa83f55) no-repeat top left;height:15px;width:15px}ul.license li.cc-attrib{background-position:0 0}ul.license li.cc-noderiv{background-position:0 -65px}ul.license li.cc-noncom{background-position:0 -130px}ul.license li.cc-share{background-position:0 -195px}ul.license li.copyr{background-position:0 -260px}.persona-preview [data-browsertheme]{display:block;position:relative}.persona-large [data-browsertheme],.persona-large p{border-radius:6px}#listing-featured .persona-previewer:last-child .persona-slider{border-radius:0 0 6px 6px}.persona-large{max-width:680px}.persona-large [data-browsertheme]{background:transparent no-repeat right top;border-bottom:1px solid rgba(0,0,0,.4);display:table;height:64px;width:100%}.persona-large p{background-image:url(../../media/img/zamboni/mobile/loading-white.png%3F2816057);background-repeat:no-repeat;background-position:50% 50%;-moz-background-size:auto 32px;-wekbkit-background-size:auto 32px;background-size:auto 32px;color:#fff;display:none;font:18px Georgia,serif;pointer-events:none;text-align:center;text-shadow:0 1px 0 rgba(0,0,0,.5);vertical-align:middle}.persona-hover [data-browsertheme] p{background-color:rgba(0,0,0,.4);display:table-cell}.persona-previewing p,.persona-installed p{background:0}#persona .confirm-buttons,.persona-slider .badges{display:none}.persona-previewer .confirm-buttons .add{float:left;width:-moz-calc(50% - 63px)}.persona-previewer .confirm-buttons .cancel{float:right;width:-moz-calc(50% - 39px)}.persona-previewer .persona-installed p:before{background:url(../../media/img/zamboni/mobile/checkmark.png%3F521c6c8) no-repeat top left;content:" ";display:inline-block;margin:0 3px -3px 0;position:relative;top:3px;height:25px;width:25px}li.persona-previewer{padding:10px}.persona-slider{background-color:#ccc;height:0;overflow:hidden;padding:0 10px;position:relative;top:11px;left:-10px;width:100%;-moz-transition:.5s height ease;-webkit-transition:.5s height ease}.persona-slider.expand{border-top:1px solid #999}.persona-slider .more{clear:both;color:#447bc4;display:block;font-weight:700;line-height:1;padding-top:10px;text-align:center}.persona-slider .confirm-buttons{margin-top:10px}.version h3{font-size:20px;color:#000}.version time{display:block;font-family:"Droid Sans",Helvetica,Arial,sans-serif;margin:10px 0}.version blockquote{color:#666;font-family:Georgia,serif;overflow:hidden}.version .meta{font-style:italic;color:#666}.version .meta h4{margin-top:12px;font-family:"Droid Sans",Helvetica,Arial,sans-serif;font-weight:700;color:#666}.message{-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;margin:14px;padding:14px}.message h3{font-family:"Droid Sans",Helvetica,sans-serif;font-weight:700;margin-bottom:14px}.message.warning{background:#fff0a6}.apps-error-msg{display:none;padding:1em 0}#content .apps-error-msg h2{font-style:normal}#content .apps-error-msg p{margin-bottom:1em;margin-left:1em}.install-wrapper{margin:10px 0 4px;padding-top:8px;text-align:center;font-weight:700}.infobox .install-wrapper,#persona .persona-confirm{border-top:2px solid #fff;box-shadow:0 -1px #ccc}#persona .persona-confirm{padding-top:8px}.persona-confirm .install-wrapper{margin:0;padding-top:0}#persona .persona-confirm .install-wrapper{border-top-width:0;box-shadow:none}button{cursor:pointer;margin:0}button,.button,a.button{-moz-transition:-moz-box-shadow .3s ease 0s;background-color:#669BE1;border:0;-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;box-shadow:0 3px rgba(0,0,0,.1),0 -4px rgba(0,0,0,.1) inset;-moz-box-shadow:0 3px rgba(0,0,0,.1),0 -4px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 3px rgba(0,0,0,.1),0 -4px rgba(0,0,0,.1) inset;color:#fff;font:bold 20px/1 "Trebuchet MS",sans-serif;padding:12px 16px 14px;position:relative;text-align:center;display:block;text-decoration:none}a.button:link{color:#fff}button:active,.button:active,.button.selected{top:2px;-moz-box-shadow:0 1px rgba(0,0,0,.1),0 -4px rgba(0,0,0,.1) inset,0 0 100px rgba(255,255,255,.2) inset}.button.small{font-size:13px;font-weight:400;padding:6px 12px;padding-bottom:9px;-moz-box-shadow:0 2px rgba(0,0,0,.1),0 -3px rgba(0,0,0,.1) inset}.button.small:hover,.button.small:focus,.button.small:active,.button.small.selected{-moz-box-shadow:0 2px rgba(0,0,0,.1),0 -3px rgba(0,0,0,.1) inset,0 0 100px rgba(255,255,255,.2) inset}.button.small:active,.button.small.selected{top:2px;-moz-box-shadow:0 0 rgba(0,0,0,.1),0 -3px rgba(0,0,0,.1) inset,0 0 100px rgba(255,255,255,.2) inset}.button.preview,.button.affirmative,.button.add{background-color:#84C63C;color:#fff}.button.premium{background:#da6}.button.negative{background-color:#84C63C;color:#fff}.button.cancel{background-color:#b25951}.button.add{padding-left:40px}.button.add:before{content:" ";display:block;width:24px;height:24px;position:absolute;left:14px;top:10px;background:url(../../media/img/zamboni/mobile/install.svg%3Fad1ef3d) no-repeat top left}.button.warning{background-attachment:scroll,scroll;background-clip:border-box,border-box;background-color:transparent;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAGlJREFUeNqc0cEJACEMRFFNARaw/RexFe1dG3AjCBJJYDL/kNtjDqn9lRLUnlrixjd5qVdo6WNQOhiXN05Jg7PyYEJuzMmFaRn+GZG6KrQMlxHpY1A6GJc3TkmDs/JgQm7MyYVpqf0CDABVcj3T2ITzOAAAAABJRU5ErkJggg==);background-origin:padding-box,padding-box;background-position:0 0,0 0;background-repeat:repeat,repeat;background-size:auto auto,auto auto;text-shadow:0 -1px 0 rgba(255,255,255,.5);top:0}.button.warning,.button.warning:link{color:#333}.button.add.warning:before{background:url(../../media/img/zamboni/mobile/install.svg%3Fad1ef3d) no-repeat 0 -50px}.button.disabled,.button.waiting{background-color:#d1d4d7;color:#fff;-moz-box-shadow:0 3px rgba(0,0,0,.05),0 -4px rgba(0,0,0,.05) inset;top:0}.button.add.disabled:before{background:url(../../media/img/zamboni/mobile/install.svg%3Fad1ef3d) no-repeat top left}.badges{margin-top:8px}.badges a,.badges li{display:block;color:#000}#content .badges li{border:1px solid #ddd;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;margin-bottom:8px;font-size:12px;line-height:20px;height:20px;background:#fff}#content .badges .error{background-color:#edd4d2;border-color:#ac9a98}#content .badges .warning{background-color:#fef9d7;border-color:#bebaa1}#content .badges .warning span{cursor:pointer}.install .privacy-policy{display:block;margin-top:12px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;height:27px;font-size:.9em;color:#000;line-height:25px;border:1px solid #ccc;background-color:#e6e6e6}.badges li span{color:#447bc4}.lite-msg{display:none;font-size:.9em}#eula{display:block;position:absolute;top:0;left:0;width:100%;min-height:100%;background:#333;display:none}#eula-content{-moz-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;margin:14px;padding:14px 0 70px 0;background:#fff}#eula-text{padding:0 14px;font-family:Georgia,serif;line-height:1.2em}#eula-body{margin-top:14px;color:#666}#eula-body ul{list-style:disc outside none;margin-left:20px}#eula-body ol{list-style:decimal outside none;margin-left:20px}#eula-menu{position:fixed;bottom:-1px;left:14px;width:-moz-calc(100% - 28px);background:#fff}#eula:after{position:absolute;content:"";bottom:0;height:20px;width:-moz-calc(100% - 28px);z-index:1000;border-width:14px;border-style:solid;pointer-events:none;border-color:transparent #333 #333;-moz-border-radius:14px;-webkit-border-radius:14px;border-radius:14px}#eula-menu div{margin-bottom:14px;overflow:hidden;position:relative;background:#fff;-moz-border-radius:0 0 6px 6px;-webkit-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}#eula-menu .button{margin:8px;display:block;float:left;width:-moz-calc(50% - 48px)}.stars{text-indent:-5000px;background-image:url(../../media/img/icons/stars.png%3F29bed4f);background-position:0 50%;background-repeat:no-repeat;width:63px;display:block}.reviews .stars{float:left}.html-rtl .stars{float:right}.stars-4{background-position:-13px 50%}.stars-3{background-position:-26px 50%}.stars-2{background-position:-39px 50%}.stars-1{background-position:-52px 50%}.stars-0{background-position:-65px 50%}.grouped_ratings{margin:16px 0}.grouped_ratings .stars-4{background-position:13px 50%}.grouped_ratings .stars-3{background-position:26px 50%}.grouped_ratings .stars-2{background-position:39px 50%}.grouped_ratings .stars-1{background-position:52px 50%}.grouped_ratings .stars-0{background-position:65px 50%}.grouped_ratings li{height:12px;margin-bottom:8px;clear:both}.grouped_ratings .rating_bar{float:left;height:12px;margin-top:4px;background:#eee;position:relative;overflow:visible;width:120px}.num_ratings{color:#888;width:1px;position:absolute;right:-6px;top:0;line-height:1em;font-size:.9em}.grouped_ratings .rating_bar span.bar{display:block;height:100%;background:#888;height:12px}.review p{max-height:6.2em;overflow:hidden}.html-rtl .grouped_ratings .rating_bar{border-left:0;float:right}.html-rtl .grouped_ratings .rating_bar span.bar{float:right}.html-rtl .grouped_ratings .rating_bar span.num_ratings{right:auto;left:-4px}.review .old-version{font-size:.8em;font-style:italic;line-height:1em;color:#888;margin-top:4px}.review{margin-bottom:1.5em}.carousel .control,#lightbox .control{display:block;position:absolute;top:0;opacity:.9;width:45px;height:95%;line-height:100px;font-size:48px;text-align:center;color:#447BC4;text-shadow:0 0 5px #fff;-moz-transition:.2s color ease;-webkit-transition:.2s color ease}.carousel .control.disabled{color:#ccc}.carousel .control.prev,.html-rtl .carousel .control.next{background-image:-moz-linear-gradient(left,#fff 20%,rgba(255,255,255,0));right:auto;left:0}.carousel .control.next,.html-rtl .carousel .control.prev{background-image:-moz-linear-gradient(left,rgba(255,255,255,0),#fff 80%);left:auto;right:0}.carousel{position:relative;padding:14px 40px;overflow:hidden;background-color:#fff;border-bottom:2px solid #dcedfd;margin-bottom:20px}.carousel ul{height:78px;white-space:nowrap;position:relative;left:0;-moz-transition-duration:.5s;-moz-transition-property:left,right;-webkit-transition-duration:.5s;-webkit-transition-property:left,right}.carousel li{display:inline-block;width:50%;text-align:center}.carousel li img{border:1px solid #afbed0;max-height:75px;max-width:100px;border-radius:6px;-moz-box-shadow:0 0 4px rgba(0,0,0,.2);-webkit-box-shadow:0 0 4px rgba(0,0,0,.2)}.browserid-divider{text-align:center;margin:2em 1em 0;border-bottom:1px dashed #ccc}.browserid-divider span{background-color:#FFF;font-style:italic;padding:0 15px;position:relative;top:.4em}#browserid{margin-bottom:2em;text-align:center}#browserid .button{margin:auto;display:inline-block}a.expando:-moz-focusring{border:0;outline:0}a.expando{color:#447BC4}.menu a.expando{position:relative;display:block;padding:10px 20px;float:right;color:#447BC4}.html-rtl .menu a.expando{float:left}.menu a.expando:after{border-top-color:#447BC4;top:15px}.menu a.expando.expand:after{-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg)}.expando-managed{overflow:hidden;height:0;-moz-transition:.5s height ease;-webkit-transition:.5s height ease}.readmore{padding:10px 20px;color:#447BC4;text-align:right;display:none}body{font-family:Georgia,serif}a:link{color:#447bc4;text-decoration:none}.num_ratings,.review .old-version,.install-wrapper,table,table a:link{font-family:"Helvetica Neue",Arial,sans-serif}#full h1,#content h2,#eula h2{font-style:italic;margin:0 14px 14px;font-size:1.4em}#content #full{line-height:1.3}#content #full h1{margin:0}#content #full p{margin:1em 0 0}#content #full>p{margin:1em}#content h3{font-size:1.2em;padding-bottom:2px}#full p,.copy p{color:#666}p strong{font-weight:700}#content details,#content p,#content .copy,#content .menu{margin:0 14px}.copy{line-height:1.2em}#full h1,#content h2{padding-bottom:4px;border-bottom:1px solid #ccc;box-shadow:0 1px #fff}#content .error h2{border:0;box-shadow:none;padding:0}.htruncate{white-space:nowrap;overflow:hidden}.req,.errorlist,.error{color:#c00000}.form-mobile,#full form{padding:1em}.form-mobile.form-mobile label,#full form.form-mobile label,.form-mobile.form-mobile .errorlist,#full form.form-mobile .errorlist{font-family:"Helvetica Neue",Arial,sans-serif}.form-mobile label,#full form label{color:#666;display:block;padding-bottom:6px}.form-mobile label.check,#full form label.check{margin-bottom:1em}.form-mobile .errorlist,#full form .errorlist{font-weight:700;margin:0 0 1em}.form-mobile .errorlist+p input,#full form .errorlist+p input,.form-mobile .errorlist+p textarea,#full form .errorlist+p textarea{border-color:red;background-color:#FFEBEB}.form-mobile input[type=checkbox],#full form input[type=checkbox]{margin-bottom:.5em}.form-mobile input[type=text],#full form input[type=text],.form-mobile input[type=password],#full form input[type=password],.form-mobile select,#full form select,.form-mobile textarea,#full form textarea{margin-bottom:1em;font-size:1.3em}.form-mobile input[type=text]+.errorlist,#full form input[type=text]+.errorlist,.form-mobile input[type=password]+.errorlist,#full form input[type=password]+.errorlist,.form-mobile select+.errorlist,#full form select+.errorlist,.form-mobile textarea+.errorlist,#full form textarea+.errorlist{margin-top:-.5em}.form-mobile textarea,#full form textarea,.form-mobile input[type=text],#full form input[type=text],.form-mobile input[type=password],#full form input[type=password]{border:1px solid #ccc;padding:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%}.form-mobile .stars,#full form .stars{background-image:url(../../media/img/icons/stars-big.png%3F19d1207)}.form-mobile .stars label,#full form .stars label{height:40px}.form-mobile .stars-0,#full form .stars-0{background-position:-195px 50%}.form-mobile .stars-1,#full form .stars-1{background-position:-156px 50%}.form-mobile .stars-2,#full form .stars-2{background-position:-117px 50%}.form-mobile .stars-3,#full form .stars-3{background-position:-78px 50%}.form-mobile .stars-4,#full form .stars-4{background-position:-39px 50%}.form-mobile .stars-5,#full form .stars-5{background-position:0 50%}.form-mobile .ratingwidget,#full form .ratingwidget{display:block;float:none;width:195px;margin-bottom:1em;height:40px}.form-mobile .ratingwidget input,#full form .ratingwidget input{display:none}.form-mobile .ratingwidget label,#full form .ratingwidget label{text-indent:-5000px;display:block;float:left;width:39px}#content .notification-box{padding:1em;margin:1em;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}#content .notification-box h2{margin:0}#content .notification-box.error{background-color:#FFD5D5}.browserid-login.loading-submit:after{background-image:url(../../media/img/zamboni/loading-white.gif%3F005dbc7);content:"";display:block;height:16px;margin-left:10px;position:absolute;right:-32px;top:12px;width:16px}#home-header,.mini-header{margin:0 14px}.moz-menu{-moz-transition:.5s top ease;-webkit-transition:.5s top ease;transition:.5s top ease;position:relative;top:0;z-index:100}.moz-menu .tab{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;box-shadow:0 -3px rgba(0,0,0,.2) inset;-moz-box-shadow:0 -3px rgba(0,0,0,.2) inset;-webkit-box-shadow:0 -3px rgba(0,0,0,.2) inset}.moz-menu .tab a{background:url(../../media/img/zamboni/global/wordmark.png%3F71db942) no-repeat 8px 6px;display:block;height:30px;line-height:22px;text-align:right;color:#fff;font-style:italic;padding:8px 25px}.moz-menu .tab a:after{top:18px;border:6px solid transparent;border-top-color:#fff}.mini-header .moz-menu .tab{width:104px;float:right;overflow:hidden;position:relative}.mini-header .moz-menu .tab a{text-indent:-9999px;text-align:left}.html-rtl .mini-header .moz-menu .tab{float:left}.html-rtl .mini-header .moz-menu .tab a{text-indent:9999px}.moz-menu .menu-items{position:absolute;width:100%;left:-14px;right:-14px;bottom:46px}.moz-menu .menu-items li{border-bottom:1px solid #294976;border-top:1px solid #537ab4;background-color:#3a67af;height:50px;width:100%;padding:0 14px}.moz-menu .menu-items a{font:bold 17px/26px "Trebuchet MS",sans-serif;color:#fff;display:block;height:26px;padding:12px 0;text-transform:uppercase}.mini-header .moz-menu .menu-items{bottom:0}.moz-menu.expand{top:312px}.moz-menu.expand .tab a:after{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}header hgroup{margin:8px 0;position:relative;padding-left:80px}.html-rtl header hgroup{padding-left:0;padding-right:80px}.html-rtl .mini-header hgroup{padding-right:0}header nav ul{float:left;padding:14px 0}header nav ul li{float:left;line-height:14px}header nav ul a{color:#447bc4;display:block}header nav #auth-nav{float:right}.html-rtl header nav ul,.html-rtl header nav li{float:right}.html-rtl header nav #auth-nav{float:left}header #auth-nav li{border-left:1px solid #ccc;margin-left:7px;padding-left:7px}header #auth-nav li.user{font-weight:700}.html-ltr header #auth-nav li:first-child,.html-rtl header #auth-nav li:last-child{border-left:0;margin-left:0;padding-left:0}.mini-header .site-title{padding:4px 120px 0 0}.mini-header .site-title a{font-size:28px;line-height:50px}.html-rtl .mini-header .site-title{padding:4px 0 0 120px}#home-header hgroup{min-height:75px;margin-bottom:8px}#home-header h1{padding-top:4px}#home-header h2{margin:4px 0;color:#666}#home-header .site-title img{position:absolute;left:0;top:0}.mini-header hgroup{margin-top:0;padding:2px 0 0}.html-rtl #home-header .site-title img{left:auto;right:0}.site-title a{color:#000;font:36px/32px Georgia,serif;text-decoration:none;text-transform:uppercase}.site-title span{display:block}.mini-header .site-title img{float:left;height:50px;margin-right:6px}.html-rtl .mini-header .site-title img{float:right;margin:0 0 0 6px}#home-header #search{margin:0}#learnmore-msg{-webkit-border-radius:1em;-moz-border-radius:1em;border-radius:1em;box-shadow:0 0 3px #000;-moz-box-shadow:0 0 3px #000;-webkit-box-shadow:0 0 3px #000;-moz-transition:.3s opacity ease;-webkit-transition:.3s opacity ease;transition:.3s opacity ease;background:#444;color:#fff;font:14px/1.3 "Helvetica Neue",Arial,sans-serif;margin:12px 14px 0;max-width:260px;opacity:0;padding:14px;pointer-events:none;position:absolute;left:0;z-index:100}#learnmore-msg.show{opacity:1;pointer-events:auto}#learnmore-msg:after{content:"\00a0";display:block;position:absolute;z-index:100;top:-28px;left:94px;width:0;height:0;border:15px solid transparent;border-bottom-color:#444;pointer-events:none}#learnmore{color:#447bc4;padding:4px 0}.get-fx-message{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;border:1px solid #e3873b;background:#fcefb7 url(../../media/img/zamboni/icons/alert-32x32.png%3Fee16f6d) 11px center no-repeat;clear:both;display:none;font-size:105%;margin-top:12px;line-height:1.1em;padding:12px 12px 10px 56px}#search{position:relative;margin-bottom:14px;width:100%}#search input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:url(../../media/img/zamboni/mobile/search.svg%3F6f451df) no-repeat 10px center #fff;border:1px solid #ddd;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;display:block;font-size:18px;margin-right:8px;padding:10px 10px 10px 40px;width:94%;width:-moz-calc(100% - 68px);width:-webkit-calc(100% - 68px);width:-o-calc(100% - 68px);width:calc(100% - 68px)}#search button{box-shadow:0 -3px rgba(0,0,0,.1) inset;-moz-box-shadow:0 -3px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 -3px rgba(0,0,0,.1) inset;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;background-color:#83c53c;display:block;font-size:18px;padding:8px 0;position:absolute;top:0;right:0;width:56px}.html-rtl #search input[type=search]{background-position:99% 50%;margin:0 0 0 8px;padding:10px 40px 10px 10px}.html-rtl #search button{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1);right:auto;left:0}.noInlineSVG #search button{background:#83c53c url(../../media/img/zamboni/mobile/arrow.png%3F1ae5de1) center no-repeat}#content.search .item .install-wrapper{clear:both;margin:0 10px;padding:0}#content.search .item .badges{margin:0}#content.search .item .buttons,#content.search .item .privacy-policy{display:none}.no-results{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;border:1px solid #ddd;background-color:#f4f4f4;color:#999;font:bold 18px Georgia,serif;text-align:center;margin:14px 14px 1em;padding:14px}.listview,.infobox{margin:14px 14px 1em;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;border:1px solid #ddd;background-color:#f4f4f4;display:block}.infobox{padding:10px}.listview>li{border-top:1px solid #ccc;font-size:1em;white-space:normal}.listview>li:first-child{border:0}.listview>li,a.listview{position:relative}.listview>li>a,.listview>li>.info>a,a.listview{color:#444;font-family:Georgia,serif;font-size:1.1em;display:block;overflow:hidden;text-decoration:none;padding:10px}.html-rtl .listview>li>a,.html-rtl .listview>li>.info>a,.html-rtl a.listview{padding-left:34px}.listview .item>a,.listview>li>.info>a,.listview div.item{padding:10px;font-size:1em}.listview li.item>a,.listview>li>.info>a{padding:10px 10px 0}.listview>li>a:before,.listview>li>.info>a:before,a.listview:before{content:" ";display:block;width:10px;height:100%;position:absolute;right:10px;top:0;background:url(../../media/img/zamboni/mobile/arrow.svg%3F8638b4c) no-repeat center 12px}.html-rtl .listview>li>a:before,.html-rtl .listview>li>.info>a:before,.html-rtl a.listview:before{right:auto;left:10px;-moz-transform:scalex(-1)}.icon{float:left;margin-right:8px}.html-rtl .icon{float:right;margin-left:8px;margin-right:0}li.item{line-height:1.3em;overflow:hidden;padding-left:42px}li.item .icon{float:none;margin:0;position:absolute;left:10px}li.item h3{font-size:1.1em}li.item .desc{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#666;display:block}li.item details{font-size:.9em;margin:0 0 7px!important;padding:0 10px}li.item .vital{color:#093;padding-left:.5em}li.item .vital:before{color:#aaa;content:"\B7";padding-right:.25em}li.item .vital:first-child{padding:0}li.item .vital:first-child:before{display:none}li.item .vital.premium{color:#d16b00}li.item .stars,li.item i,li.item .vital{display:block;float:left}li.item .info,li.item .action{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}li.item .info{float:left;width:80%}li.item .action{float:right;padding:14px 34px 14px 14px;text-align:right;width:20%}li.item .action,li.item .contributions{color:#999;font-size:13px;line-height:15px}li.item.refunded{opacity:.6}li.item .contributions{clear:both;margin-top:.5em}li.item .contributions .supportable:after{content:'\00B7';padding:0 .25em}.html-rtl li.item{padding:0 42px 0 0}.html-rtl li.item .icon{left:auto;right:10px}.html-rtl li.item .stars,.html-rtl li.item i,.html-rtl li.item .vital{float:right}.html-rtl li.item .vital{padding:0 .5em 0 0}.html-rtl li.item .vital:first-child{padding:0}.html-rtl li.item .price:before{padding:0 0 0 .25em}.html-rtl li.item .info{float:right}.html-rtl li.item .action{float:left;margin:0;padding:14px 14px 14px 34px;text-align:left}footer{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;box-shadow:0 2px rgba(0,0,0,.1) inset;-moz-box-shadow:0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 2px rgba(0,0,0,.1) inset;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAABCAYAAAASC7TOAAAAFElEQVQIHWO0DZ3xnwELYOXgYwAAOHwCRjqu6SgAAAAASUVORK5CYII=);color:#fff;font:1em "Helvetica Neue",Arial,sans-serif;padding:14px;position:relative;z-index:-1}footer:before{box-shadow:0 -2px rgba(0,0,0,.1) inset;-moz-box-shadow:0 -2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 -2px rgba(0,0,0,.1) inset;content:"";display:block;height:30px;position:absolute;top:-30px;left:0;width:100%}footer.sticky{position:absolute;bottom:0;z-index:1;width:100%}footer select{display:block;height:30px;margin-top:4px;padding-top:4px;width:100%}footer a.desktop-link{background:#5f92ce;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;color:#fff;display:block;font-family:"Helvetica Neue",Arial,sans-serif;font-size:150%;font-weight:700;line-height:2;margin:1em 0;text-align:center;text-transform:uppercase}#footer-links,#footer-links a{color:#5f92ce;font-size:14px;padding:4px;text-align:center}
+      </style>
+        <script></script>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, user-scalable=no, maximum-scale=1">
+    <title>Add-ons for Firefox</title>
+
+    <link rel="shortcut icon" type="image/x-icon"
+          href="../../../addons.cdn.mozilla.net/media/img/favicon.ico%3Fb=4ddb6c0">
+
+    
+        <link title="Firefox Add-ons"
+          rel="search" type="application/opensearchdescription+xml"
+          href="https://addons.mozilla.org/en-US/firefox/opensearch.xml" />
+
+    
+      </head>
+  <body class="html-ltr firefox lang-en-US "
+        data-app="firefox"
+        data-appname="Firefox"
+        data-appid="1"
+        data-min-beta-version="3.7"
+        data-anonymous="true"
+        data-readonly="false"
+        data-media-url="https://addons.cdn.mozilla.net/media/"
+                        >
+
+    <div id="page">
+        <header id="home-header">
+    <div class="moz-menu">
+  <ul class="menu-items">
+    <li><a href="http://www.mozilla.com/mobile/">Mozilla Firefox</a></li>
+    <li><a href="http://www.mozilla.com/firefox/features/">Features</a></li>
+    <li><a href="http://mozilla.com/firefox/">Desktop</a></li>
+    <li><a href="http://addons.mozilla.org/">Add-Ons</a></li>
+    <li><a href="http://support.mozilla.com/">Support</a></li>
+    <li><a href="http://mozilla.org/">Visit Mozilla</a></li>
+  </ul>
+  <div class="tab"><a href="index.html#">menu</a></div>
+</div>          <div class="get-fx-message">
+        You need Firefox to install add-ons. <a href="http://mozilla.com/mobile">Learn More&nbsp;&raquo;</a>
+      </div>
+        <hgroup>
+      <h1 class="site-title">
+                <a href="index.html"
+          title="Return to the Firefox Add-ons homepage">
+          <img alt="Firefox" src="../../../addons.cdn.mozilla.net/media/img/zamboni/app_icons/firefox.png%3Fb=4ddb6c0">
+          Firefox Add-ons
+        </a>
+      </h1>
+      <h2>Easy ways to personalize.</h2>
+      <a href="index.html#" id="learnmore">Learn More&raquo;</a>
+      <div id="learnmore-msg">
+        Add-ons are applications that let you personalize Firefox with extra functionality and style. Whether you mistype the name of a website or can't read a busy page, there's an add-on to improve your on-the-go browsing.      </div>
+    </hgroup>
+      <form id="search" action="https://addons.mozilla.org/en-US/firefox/search/">
+  <input name="q" type="search" value=""
+         placeholder="search for add-ons">
+        <input type="hidden" name="appver" id="id_appver" />
+    <input type="hidden" name="platform" id="id_platform" />
+    <button type="submit" value="">
+    <svg width="22" height="23" xmlns="http://www.w3.org/2000/svg" version="1.1"><polygon fill="#ffffff" points="22,12 11,23 8,20 14,14 0,14 0,10 14,10 8,4 11,1"/></svg>
+  </button>
+</form>  </header>
+
+      <section id="content" class="">
+          <nav class="tabs" data-manages="addon-lists">
+    <ul>
+      <li class="selected"><a href="index.html#listing-featured">Featured</a></li>
+      <li><a href="index.html#listing-popular">Popular</a></li>
+      <li><a href="index.html#listing-categories">Categories</a></li>
+    </ul>
+  </nav>
+  <div id="addon-lists" class="slider">
+    <div id="listing-featured" class="tab-pane selected">
+      <ul id="list-featured" class="listview">
+                <li class="item">
+    <div class="info">
+                                <a href="https://addons.mozilla.org/en-US/firefox/addon/autopager/?src=homepagebrowse">
+        <img class="icon" width="32" height="32" src="../../../addons.cdn.mozilla.net/img/uploads/addon_icons/4/4925-32.png%3Fmodified=1347927624">
+        <h3>AutoPager</h3>
+        <span class="desc">AutoPager automatically loads next pages when you reach the end of a page. It works on a ton of sites,Google,Yahoo.. It works well with most other add-ons adblock plus, WOT and most of the greasemonke...</span>
+      </a>
+      <details>
+        <div class="vitals">
+                                      <span class="stars stars-4" title="Rated 4 out of 5 stars">Rated 4 out of 5 stars</span>
+
+                                  
+                      <span class="vital adu">
+                                              <strong>225,651</strong> users
+                          </span>
+                                      </div>
+      </details>
+    </div>
+          </li>
+        <li class="item">
+    <div class="info">
+                                <a href="https://addons.mozilla.org/en-US/firefox/addon/simple-timer/?src=homepagebrowse">
+        <img class="icon" width="32" height="32" src="../../../addons.cdn.mozilla.net/img/uploads/addon_icons/9/9675-32.png%3Fmodified=1330563742">
+        <h3>Simple Timer</h3>
+        <span class="desc">A timer/clock residing in the statusbar/toolbar.</span>
+      </a>
+      <details>
+        <div class="vitals">
+                                      <span class="stars stars-4" title="Rated 4 out of 5 stars">Rated 4 out of 5 stars</span>
+
+                                  
+                      <span class="vital adu">
+                                              <strong>10,531</strong> users
+                          </span>
+                                      </div>
+      </details>
+    </div>
+          </li>
+
+        <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/?sort=featured">
+          View all Featured add-ons</a></li>
+      </ul>
+    </div><div id="listing-popular" class="tab-pane">
+      <ul id="list-popular" class="listview">
+                <li class="item">
+    <div class="info">
+                                <a href="https://addons.mozilla.org/en-US/firefox/addon/adblock-plus/?src=homepagebrowse">
+        <img class="icon" width="32" height="32" src="../../../addons.cdn.mozilla.net/img/uploads/addon_icons/1/1865-32.png%3Fmodified=1346769870">
+        <h3>Adblock Plus</h3>
+        <span class="desc">Annoyed by adverts? Troubled by tracking? Bothered by banners? Install Adblock Plus now to regain control of the internet and change the way that you view the web. A short video overview is available ...</span>
+      </a>
+      <details>
+        <div class="vitals">
+                                      <span class="stars stars-5" title="Rated 5 out of 5 stars">Rated 5 out of 5 stars</span>
+
+                                  
+                      <span class="vital downloads">
+                                              <strong>935,408</strong> weekly downloads
+                          </span>
+                                      </div>
+      </details>
+    </div>
+          </li>
+        <li class="item">
+    <div class="info">
+                                <a href="https://addons.mozilla.org/en-US/firefox/addon/noscript/?src=homepagebrowse">
+        <img class="icon" width="32" height="32" src="../../../addons.cdn.mozilla.net/img/uploads/addon_icons/0/722-32.png%3Fmodified=1343588643">
+        <h3>NoScript</h3>
+        <span class="desc">The best security you can get in a web browser! Allow active content to run only from sites you trust, and protect yourself against XSS and Clickjacking attacks.</span>
+      </a>
+      <details>
+        <div class="vitals">
+                                      <span class="stars stars-5" title="Rated 5 out of 5 stars">Rated 5 out of 5 stars</span>
+
+                                  
+                      <span class="vital downloads">
+                                              <strong>117,491</strong> weekly downloads
+                          </span>
+                                      </div>
+      </details>
+    </div>
+          </li>
+        <li class="item">
+    <div class="info">
+                                <a href="https://addons.mozilla.org/en-US/firefox/addon/easy-youtube-video-downl-10137/?src=homepagebrowse">
+        <img class="icon" width="32" height="32" src="../../../addons.cdn.mozilla.net/img/uploads/addon_icons/10/10137-32.png%3Fmodified=1348505777">
+        <h3>Easy YouTube Video Downloader</h3>
+        <span class="desc">Fastest, easiest &amp; most reliable free YouTube downloader. Highest sound quality available with M4A, MP3, MP4, AAC, FLV and HD formats! Single click, non-intrusive, direct download button works directl...</span>
+      </a>
+      <details>
+        <div class="vitals">
+                                      <span class="stars stars-4" title="Rated 4 out of 5 stars">Rated 4 out of 5 stars</span>
+
+                                  
+                      <span class="vital downloads">
+                                              <strong>321,726</strong> weekly downloads
+                          </span>
+                                      </div>
+      </details>
+    </div>
+          </li>
+
+        <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/?sort=popular">
+          View all Popular add-ons</a></li>
+      </ul>
+    </div><div id="listing-categories" class="tab-pane">
+            <ul id="list-popular" class="listview">
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/alerts-updates/">
+          Alerts &amp; Updates</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/appearance/">
+          Appearance</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/bookmarks/">
+          Bookmarks</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/download-management/">
+          Download Management</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/feeds-news-blogging/">
+          Feeds, News &amp; Blogging</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/games-entertainment/">
+          Games &amp; Entertainment</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/language-support/">
+          Language Support</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/photos-music-videos/">
+          Photos, Music &amp; Videos</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/privacy-security/">
+          Privacy &amp; Security</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/shopping/">
+          Shopping</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/social-communication/">
+          Social &amp; Communication</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/tabs/">
+          Tabs</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/web-development/">
+          Web Development</a></li>
+                <li><a href="https://addons.mozilla.org/en-US/firefox/extensions/other/">
+          Other</a></li>
+              </ul>
+    </div>
+  </div>
+  <h2>More Add-ons</h2>
+  <ul id="more-addons" class="listview">
+    <li class="rating"><a href="https://addons.mozilla.org/en-US/firefox/extensions/?sort=rating">
+      Highest Rated</a></li>
+    <li class="created"><a href="https://addons.mozilla.org/en-US/firefox/extensions/?sort=created">
+      Newest</a></li>
+      </ul>
+      </section>
+    </div>
+    <footer id="footer">
+      <form class="languages go" id="lang_form" method="get" action="index.html">
+  <label for="language">Other languages</label>
+  <select id="language" name="lang" dir="ltr">
+    <option value="af" >
+        Afrikaans
+      </option><option value="ar" >
+        عربي
+      </option><option value="bg" >
+        Българ�ки
+      </option><option value="ca" >
+        catalĂ 
+      </option><option value="cs" >
+        Čeština
+      </option><option value="da" >
+        Dansk
+      </option><option value="de" >
+        Deutsch
+      </option><option value="el" >
+        Ελληνικά
+      </option><option value="en-us" selected>
+        English (US)
+      </option><option value="es" >
+        Español
+      </option><option value="eu" >
+        Euskara
+      </option><option value="fa" >
+        �ارسی
+      </option><option value="fi" >
+        suomi
+      </option><option value="fr" >
+        Français
+      </option><option value="ga-ie" >
+        Gaeilge (Éire)
+      </option><option value="he" >
+        עברית
+      </option><option value="hu" >
+        magyar
+      </option><option value="id" >
+        Bahasa Indonesia
+      </option><option value="it" >
+        Italiano
+      </option><option value="ja" >
+        日本語
+      </option><option value="ko" >
+        í•śęµ­ě–´
+      </option><option value="mn" >
+        Монгол
+      </option><option value="nl" >
+        Nederlands
+      </option><option value="pl" >
+        Polski
+      </option><option value="pt-br" >
+        PortuguĂŞs (do Brasil)
+      </option><option value="pt-pt" >
+        PortuguĂŞs (Europeu)
+      </option><option value="ro" >
+        român�
+      </option><option value="ru" >
+        Р���кий
+      </option><option value="sk" >
+        slovenÄŤina
+      </option><option value="sl" >
+        Slovenščina
+      </option><option value="sq" >
+        Shqip
+      </option><option value="sv-se" >
+        Svenska
+      </option><option value="uk" >
+        Україн�ька
+      </option><option value="vi" >
+        Tiếng Việt
+      </option><option value="zh-cn" >
+        中文 (简体)
+      </option><option value="zh-tw" >
+        正體中文 (�體)
+      </option>  </select>
+  <noscript><button type="submit">Go</button></noscript>
+</form>              <a class="desktop-link" href="index.html#">View full site</a>
+        <p id="footer-links">
+          <a href="http://mozilla.com/privacy-policy.html">Privacy Policy</a> &nbsp;|&nbsp;
+          <a href="http://mozilla.com/about/legal.html">Legal Notices</a>
+        </p>
+          </footer>
+                      <script src="../../../addons.cdn.mozilla.net/en-US/firefox/jsi18n.js%3Fb=4ddb6c0"></script>
+      <script src="../../../addons.cdn.mozilla.net/media/js/zamboni/mobile-min.js%3Fbuild=4ddb6c0"></script>
+                      <script defer src="../../../addons.cdn.mozilla.net/media/js/webtrends/webtrends-v0.1.js%3Fb=4ddb6c0"></script>
+    <noscript>
+      <img id="DCSIMG" width="1" height="1"
+        src="../../../statse.webtrendslive.com/dcso6de4r0000082npfcmh4rf_4b1e/njs.gif%3Fdcsuri=%252Fnojavascript&amp;WT.js=No&amp;WT.tv=8.6.2" />
+    </noscript>
+      </body>
+</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/reader_mode_pages/basic_article.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/reader_mode_pages/basic_article.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/reader_mode_pages/basic_article.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/reader_mode_pages/basic_article.html	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Article title</title>
+<meta name="description" content="This is the article description." />
+</head>
+<body>
+<header>Site header</header>
+<div>
+<h1>Article title</h1>
+<h2 class="author">by Jane Doe</h2>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.</p>
+<p>Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenatis pulvinar tellus gravida ornare. Sed et erat faucibus nunc euismod ultricies ut id justo. Nullam cursus suscipit nisi, et ultrices justo sodales nec. Fusce venenatis facilisis lectus ac semper. Aliquam at massa ipsum. Quisque bibendum purus convallis nulla ultrices ultricies. Nullam aliquam, mi eu aliquam tincidunt, purus velit laoreet tortor, viverra pretium nisi quam vitae mi. Fusce vel volutpat elit. Nam sagittis nisi dui.</p>
+</div>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/reader_mode_pages/developer.mozilla.org/en/XULRunner/Build_Instructions.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/reader_mode_pages/developer.mozilla.org/en/XULRunner/Build_Instructions.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/reader_mode_pages/developer.mozilla.org/en/XULRunner/Build_Instructions.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/reader_mode_pages/developer.mozilla.org/en/XULRunner/Build_Instructions.html	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,373 @@
+<!DOCTYPE html>
+<html lang="en-US" dir="ltr" id="developer-mozilla-org" xmlns:fb="http://www.facebook.com/2008/fbml" xmlns:og="http://ogp.me/ns#">
+<head>
+  <title>Building XULRunner | MDN</title>
+  
+  <meta charset="utf-8">
+  <meta name="robots" content="index, follow">
+  <link rel="home" href="https://developer.mozilla.org/en-US/">
+  <link rel="copyright" href="Build_Instructions.html#copyright">
+  <link rel="shortcut icon" href="../../media/img/favicon.ico">
+
+        <!--[if !IE 6]><!-->
+  <link rel="stylesheet" media="screen,projection,tv" href="../../media/css/mdn-min.css%3Fbuild=f424781.css" />
+      <link rel="stylesheet" media="screen,projection,tv" href="../../media/css/wiki-min.css%3Fbuild=f424781.css" />
+    <!--<![endif]-->
+  <!--[if IE]><link rel="stylesheet" type="text/css" media="all" href="//developer.mozilla.org/media/css/mdn-ie.css"><![endif]-->
+  <!--[if lte IE 7]><link rel="stylesheet" type="text/css" media="all" href="//developer.mozilla.org/media/css/mdn-ie7.css"><![endif]-->
+  <!--[if lte IE 6]><link rel="stylesheet" type="text/css" media="all" href="//developer.mozilla.org/media/css/mdn-ie6.css"><![endif]-->
+  <link rel="stylesheet" type="text/css" media="print" href="../../media/css/mdn-print.css">
+  <link rel="stylesheet" href="../../../www.mozilla.org/tabzilla/media/css/tabzilla.css">
+  
+    <link rel="stylesheet" media="print" href="../../media/css/wiki-print-min.css%3Fbuild=f424781.css" />
+          <link rel="stylesheet" type="text/css"
+            href="../../en-US/docs/Template:CustomCSS%3Fraw=1.css" />
+    
+  <!--[if IE]>
+  <meta http-equiv="imagetoolbar" content="no">
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+  <script src="//developer.mozilla.org/media/js/html5.js"></script>
+  <![endif]-->
+
+    <link rel="alternate" type="application/json" href="https://developer.mozilla.org/en-US/docs/XULRunner/Build_Instructions$json" />
+  <link rel="canonical" href="Build_Instructions.html" />
+
+  <meta property="og:title" content="Building XULRunner"/>
+  <meta property="og:type" content="website"/>
+  <meta property="og:image" content="https://developer.mozilla.org/media/img/mdn-logo-sm.png"/>    
+  <meta property="og:site_name" content="Mozilla Developer Network"/>
+
+    <meta property="og:description" content="XULRunner is built using basically the same process as Firefox or other applications. Please read and follow the general Build Documentation for instructions on how to get sources and set up build prerequisites."/>
+  <meta name="description" content="XULRunner is built using basically the same process as Firefox or other applications. Please read and follow the general Build Documentation for instructions on how to get sources and set up build prerequisites." />
+  </head>
+
+<body id="" class="html-ltr document" role="document">
+<!--[if lte IE 8]>
+<noscript><div class="global-notice">
+<p><strong>Warning:</strong> The Mozilla Developer Network website employs emerging web standards that may not be fully supported in some versions of MicroSoft Internet Explorer. You can improve your experience of this website by enabling JavaScript.</p>
+</div></noscript>
+<![endif]-->
+  <header id="masthead" class="minor">
+    <div class="wrap">
+      <ul id="nav-access">
+        <li><a href="Build_Instructions.html#language">Select language</a></li>
+        <li><a href="Build_Instructions.html#q">Skip to search</a></li>
+        <li><a href="Build_Instructions.html#content">Skip to main content</a></li>
+      </ul>
+    
+      <div id="branding">
+                <div id="logo"><a href="https://developer.mozilla.org/en-US/"><img src="../../media/img/mdn-logo-sm.png" alt="Mozilla Developer Network" title="Mozilla Developer Network" width="62" height="71"> Mozilla Developer Network</a></div>
+              </div>
+      
+      
+      <nav id="nav">
+        <ul id="nav-main" role="menubar">
+          <li id="nav-main-topics" class="menu" role="menuitem"><a href="Build_Instructions.html#nav-sub-topics" class="toggle" aria-haspopup="true" aria-labelledby="nav-main-topics" title="Explore other parts of MDN">Topics</a>
+            <ul id="nav-sub-topics" class="sub-menu" aria-hidden="true">
+              <li id="nav-sub-web"><a href="https://developer.mozilla.org/en-US/web">Web</a></li>
+              <li id="nav-sub-apps"><a href="https://developer.mozilla.org/en-US/apps">Apps</a></li>
+              <li id="nav-sub-mobile"><a href="https://developer.mozilla.org/en-US/mobile">Mobile</a></li>
+              <li id="nav-sub-addons"><a href="https://developer.mozilla.org/en-US/addons">Add-ons</a></li>
+              <li id="nav-sub-mozilla"><a href="https://developer.mozilla.org/en-US/mozilla">Mozilla</a></li>
+            </ul>
+          </li>
+          <li id="nav-main-docs" class="menu" role="menuitem">
+            <a href="https://developer.mozilla.org/en-US/docs" class="docs toggle" aria-haspopup="true" aria-labelledby="nav-main-docs">Docs</a>
+            <div id="nav-sub-docs" class="sub-menu" aria-hidden="true">
+              <ul>
+                <li>
+                  <ul>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/HTML">HTML</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/DOM">DOM</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/Using_HTML5_audio_and_video_in_Firefox">Video</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/Using_HTML5_audio_and_video_in_Firefox">Audio</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/SVG">SVG</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/WebGL">WebGL</a></li>
+                  </ul>
+                </li>
+                <li>
+                  <ul>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/HTML/HTML5">HTML5</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/WebSockets">WebSockets</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/HTML/Using_the_application_cache">Offline Cache</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/DOM/Storage">Local Storage</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/IndexedDB">IndexedDB</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/Using_files_from_web_applications">File API</a></li>
+                  </ul>
+                </li>
+                <li>
+                  <ul>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/CSS">CSS</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/CSS/Using_CSS_gradients">Gradients</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/CSS/Using_CSS_transforms">Transforms</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/CSS/Using_CSS_transitions">Transitions</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/CSS/Using_CSS_animations">Animations</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/CSS/Media_queries">Media Queries</a></li>
+                  </ul>
+                </li>
+                <li>
+                  <ul>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/JavaScript">JavaScript</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/AJAX">AJAX</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/HTML/Canvas">Canvas</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/Using_geolocation">Geolocation</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/DragDrop/Drag_and_Drop">Drag &amp; Drop</a></li>
+                    <li><a href="https://developer.mozilla.org/en-US/docs/DOM/Using_web_workers">Web Workers</a></li>
+                  </ul>
+                </li>
+              </ul>
+              <p><a href="https://developer.mozilla.org/en-US/docs">More docs&hellip;</a></p>
+            </div>
+          </li>
+          <li id="nav-main-demos" role="menuitem"><a href="https://developer.mozilla.org/en-US/demos/" class="demos">Demos</a></li>
+          <li id="nav-main-learning" role="menuitem"><a href="https://developer.mozilla.org/en-US/learn" class="learning">Learning</a></li>
+          <li id="nav-main-community" class="menu" role="menuitem"><a href="Build_Instructions.html#nav-sub-community" class="community toggle" aria-haspopup="true" aria-labelledby="nav-main-community">Community</a>
+            <ul id="nav-sub-community" class="sub-menu">
+              <li><a href="https://developer.mozilla.org/en-US/events">Events</a></li>
+              <li><a href="https://developer.mozilla.org/en-US/discussions">Discussions</a></li>
+              <li><a href="https://developer.mozilla.org/en-US/promote">Promote</a></li>
+            </ul>
+          </li>
+        </ul>
+      </nav>
+          
+      <ul class="user-state signed-out">
+    <li class="user-signin menu">
+    <form class="browserid" action="https://developer.mozilla.org/en-US/users/browserid_verify" method="POST"><div style='display:none;'><input type='hidden' id='csrfmiddlewaretoken' name='csrfmiddlewaretoken' value='c92fde167c4768ad483a05412bede68c' /></div>
+        <input id="next" name="next" type="hidden" value="/en-US/docs/XULRunner/Build_Instructions"/>
+        <input required="required" type="hidden" name="assertion" id="id_assertion" />
+                        <a href="Build_Instructions.html#" target="_blank" class="browserid-signin toggle" aria-haspopup="true" title="Sign in with Persona">Sign in</a>
+                <div class="browserid-info sub-menu" aria-hidden="true">
+                <h3>What's this?</h3> <p>MDN has switched to <a href="https://persona.org/" target="_blank" rel="external">Persona</a>, a safe and simple way to sign in with just your e-mail address. <a href="http://identity.mozilla.com/post/12950196039/deploying-browserid-at-mozilla" rel="external">Learn more about why Mozilla is using Persona</a>.</p> <p><strong>Returning members:</strong> sign in with Persona and you'll be connected to your MDN profile (all your information is still here).</p> <p><strong>New members:</strong> sign in with Persona first, then you'll be able to set up your new MDN profile.</p>          <p><a href="Build_Instructions.html#" target="_blank" class="browserid-signin" title="Sign in with Persona">Sign in</a></p>
+        </div>
+              </form>
+    </li>
+  </ul>
+      
+      <form id="site-search" method="get" action="http://www.google.com/search"
+              data-url="/en-US/search">
+        <p>
+          <input type="text" role="search" placeholder="Search MDN" id="q" name="q" value="">
+          <noscript><button type="submit">Search</button></noscript>
+        </p>
+        <input type="hidden" name="sitesearch" value="developer.mozilla.org">
+        <div id="site-search-gg"></div>
+      </form>
+
+      <a href="http://www.mozilla.org/" id="tabzilla">mozilla</a>
+    </div>
+  </header>
+
+    
+
+<!-- top toolbar -->
+<section id="nav-toolbar"><div><div class="wrap">
+  <!-- right floated navigation -->
+  <nav id="tool-menus" role="navigation">
+    <ul id="tools">
+      <li class="menu">
+        <a href="Build_Instructions.html#page-tools" class="toggle">This page</a>
+        <ul id="page-tools" class="sub-menu">
+          <li class="page-print"> <a href="Build_Instructions.html#" onclick="return window.print();"  title="Print page">Print page</a></li>
+                      <li><a href="https://developer.mozilla.org/en-US/docs/new?parent=15078">New sub-page</a></li>
+                  </ul>
+      </li>
+            <li class="menu">
+        <a href="Build_Instructions.html#" class="toggle">Languages</a>
+        <ul id="translations">
+                      <li><a rel="internal" href="https://developer.mozilla.org/ja/docs/XULRunner/Build_Instructions" title="Building XULRunner">日本語</a></li>
+                    
+                      <li><a href="https://developer.mozilla.org/en-US/docs/XULRunner/Build_Instructions$locales">Add translation</a></li>
+                  </ul>
+      </li>
+          </ul>
+  </nav>
+  
+  <!-- left crumb navigation -->
+  <nav class="crumbs" role="navigation">
+    <ol>
+              <li class="crumb"><a href="https://developer.mozilla.org/en-US/docs/en">MDN</a></li>
+              <li class="crumb"><a href="https://developer.mozilla.org/en-US/docs/XULRunner">XULRunner</a></li>
+            <li class="crumb">Building XULRunner</li>
+    </ol>
+  </nav>
+  
+</div></div></section>
+
+
+
+<section id="content">
+  <div class="wrap">
+    <div id="content-main" class="full">
+      <article class="article" role="main" 
+          data-current-revision="129041"
+          data-refresh-message="Your changes were merged. However, something else has been edited, so this page will be refreshed to reflect the changes."
+          data-cancel-edit-message="Abort editing in progress? Your unsaved changes will be discarded.">
+      <header id="article-head">
+        <div class="title">
+            <h1 class="page-title">Building XULRunner</h1>
+                    </div>
+        <ul id="page-buttons">
+            <li class="page-history"><a href="https://developer.mozilla.org/en-US/docs/XULRunner/Build_Instructions$history">History</a></li>
+                                                                                  <li class="page-edit"><a href="https://developer.mozilla.org/en-US/docs/XULRunner/Build_Instructions$edit">Edit</a></li>
+                    </ul>
+
+        
+               </header>
+
+           
+                                
+            
+      <div id="wikiArticle" class="page-content boxed">
+                <div id="article-nav">
+          <div class="page-toc">
+            <h2>Table of Contents</h2>
+            <ol>
+              <code></code><li><ol><li><a href="Build_Instructions.html#CVS_tags_and_XULRunner_versions" rel="internal">CVS tags and XULRunner versions</a><li><a href="Build_Instructions.html#Fetching_Sources_from_Mercurial" rel="internal">Fetching Sources from Mercurial</a></ol></li>
+            </ol>
+          </div>
+          <ul class="page-anchors">
+            <li class="anchor-tags">
+                              <a href="Build_Instructions.html#page-tags">Tags</a>
+                          </li>
+            <li class="anchor-files">
+                              <span title="This document has no attachments">Files</span>
+                          </li>
+          </ul>
+        </div>
+                                <p> </p>
+<p><a href="https://developer.mozilla.org/en/XULRunner" title="en/XULRunner">XULRunner</a> is built using basically the same process as Firefox or other applications. Please read and follow the general <a href="https://developer.mozilla.org/En/Developer_Guide/Build_Instructions" title="En/Developer_Guide/Build_Instructions">Build Documentation</a> for instructions on how to get sources and set up build prerequisites.</p>
+<p>By default, XULRunner is built with <a href="https://developer.mozilla.org/en/JavaXPCOM" title="en/JavaXPCOM">JavaXPCOM</a> support; the build system must be able to find an appropriate JDK on the system; see the instructions on <a href="https://developer.mozilla.org/En/Developer_Guide/Build_Instructions/Building_JavaXPCOM" title="En/Developer_Guide/Build_Instructions/Building_JavaXPCOM">Building JavaXPCOM</a> for more details. If you do not want to build JavaXPCOM support, specify <code>--disable-javaxpcom</code> in your configuration.</p>
+<p>On Mac, XULRunner requires Mac OS X 10.3 or higher and XCode 1.5 or higher to build properly. The runtime requirement is Mac OS X 10.2.</p>
+<p>A basic minimal <a href="https://developer.mozilla.org/en/Configuring_Build_Options#Using_a_.mozconfig_Configuration_File" title="en/Configuring_Build_Options#Using_a_.mozconfig_Configuration_File">mozconfig</a> which will build a release configuration of XULRunner is:</p>
+<pre class="eval">mk_add_options MOZ_CO_PROJECT=xulrunner
+mk_add_options MOZ_OBJDIR=@topsrcdir@/obj-xulrunner
+
+ac_add_options --enable-application=xulrunner
+#Uncomment the following line if you don't want to build JavaXPCOM:
+#ac_add_options --disable-javaxpcom
+</pre>
+<h3 id="CVS_tags_and_XULRunner_versions">CVS tags and XULRunner versions</h3>
+<p>Older XULRunner releases where tagged in CVS with (for instance XULRUNNER_1_8_0_5_RELEASE ) up to version 1.8.0.5</p>
+<p>The CVS repository does not have specific tags for XULRunner anymore. Instead a XULRunner build is a just special build made from the Firefox/Mozilla tree, using the same tag as a Firefox build. There is a convention where a certain XULRunner version maps to a certain tag in the CVS.</p>
+<p>For instance XULRunner 1.8.1.3, the corresponding tag is CVS is : FIREFOX_2_0_0_3_RELEASE</p>
+<p>To find out how those Firefox tags and XULRunner version maps, check out the file mozilla/config/milestone.txt .</p>
+<p>You can also check the User Agent string in Firefox Help/About menu to get the mapping from a certain binary Firefox version to the corresponding XULRunner version. For instance, in Firefox 2.0.0.9 you will get :</p>
+<pre class="eval">Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/2.0.0.9
+</pre>
+<p>Therefore the XULRunner version for this Firefox version is : 1.8.1.9</p>
+<h3 id="Fetching_Sources_from_Mercurial">Fetching Sources from Mercurial</h3>
+<p>As with all other Mozilla products, one would fetch recent sources from Mercurial. For example, to build XULRunner with the top of the tree:</p>
+<pre>hg clone http://hg.mozilla.org/mozilla-central/ src
+cd src
+echo ". \$topsrcdir/xulrunner/config/mozconfig" &gt; .mozconfig
+make -f client.mk build
+</pre>
+<p><span>Interwiki Language Links</span></p>
+<p></p>
+                  </div>
+    <section class="page-meta">
+      
+            <section id="page-tags">
+        <h2>Tags (4)</h2>
+        <div id="deki-page-tags">
+          <ul class="tags tagit ui-widget ui-widget-content">
+                        <li class="tagit-choice ui-widget-content ui-state-default">
+                <a class="text tagit-label" href="https://developer.mozilla.org/en-US/docs/tag/Developing%20Mozilla">Developing Mozilla</a>
+            </li>
+                        <li class="tagit-choice ui-widget-content ui-state-default">
+                <a class="text tagit-label" href="https://developer.mozilla.org/en-US/docs/tag/XUL">XUL</a>
+            </li>
+                        <li class="tagit-choice ui-widget-content ui-state-default">
+                <a class="text tagit-label" href="https://developer.mozilla.org/en-US/docs/tag/XULRunner">XULRunner</a>
+            </li>
+                        <li class="tagit-choice ui-widget-content ui-state-default">
+                <a class="text tagit-label" href="https://developer.mozilla.org/en-US/docs/tag/Build%20documentation">Build documentation</a>
+            </li>
+                      </ul>
+        </div>
+      </section>
+      
+      
+      <section id="doc-contributors">
+        Contributors to this page: <a href="https://developer.mozilla.org/en-US/profiles/Kray2">Kray2</a>, <a href="https://developer.mozilla.org/en-US/profiles/Taken">Taken</a>, <a href="https://developer.mozilla.org/en-US/profiles/Kozawa">Kozawa</a>, <a href="https://developer.mozilla.org/en-US/profiles/Benjamin%20Smedberg">Benjamin Smedberg</a>, <a href="https://developer.mozilla.org/en-US/profiles/Nickolay">Nickolay</a>, <a href="https://developer.mozilla.org/en-US/profiles/NickolayBot">NickolayBot</a>, <a href="https://developer.mozilla.org/en-US/profiles/Pombredanne">Pombredanne</a>
+                          <br />
+          Last updated by:  
+          <a href="https://developer.mozilla.org/en-US/profiles/Taken">Taken</a>, 
+          <time datetime="2009-10-08T15:16:43-07:00">Oct 8, 2009 3:16:43 PM</time>
+                        </section>
+    </section>
+  </article>
+  <form id="wiki-page-edit" class="editing" method="post" action="https://developer.mozilla.org/en-US/docs/XULRunner/Build_Instructions$edit"><div style='display:none;'><input type='hidden'  name='csrfmiddlewaretoken' value='c92fde167c4768ad483a05412bede68c' /></div>
+      <input type="hidden" name="form" id="form" value="rev" />
+      <input type="hidden" name="content" id="content" value="" />
+  </form>
+      </div>
+   </div>
+    </section>
+
+<section id="footbar">
+<div class="wrap">
+  <p>
+  What do you think of the new MDN? Please <a href="http://mdn.uservoice.com/forums/51389-mdn-website-feedback-http-developer-mozilla-org">share your feedback</a> with us. <a id="dev-mdc-link" href="https://lists.mozilla.org/listinfo/dev-mdc">Join our mailing list</a> to discuss ways to help create great documentation.  </p>
+</div>
+</section>
+<footer id="site-info" class="footer" role="contentinfo">
+<div class="wrap">
+    <div id="legal">
+      <img src="../../media/img/mdn-logo-tiny.png" alt="" width="42" height="48">
+      <p id="copyright">&copy; 2005 - 2012 Mozilla Developer Network and individual contributors</p>
+      <p>
+      Content is available under <a href="https://developer.mozilla.org/en-US/docs/Project:Copyrights">these licenses</a>      &bull; <a href="https://developer.mozilla.org/en-US/docs/Project:About">About MDN</a> &bull;
+      <a href="http://www.mozilla.org/en-US/privacy">Privacy Policy</a> &bull;
+      <a href="https://developer.mozilla.org/discussions">Help</a></p>
+    </div>
+    <ul class="user-state signed-out">
+    <li class="user-signin menu">
+    <form class="browserid" action="https://developer.mozilla.org/en-US/users/browserid_verify" method="POST"><div style='display:none;'><input type='hidden'  name='csrfmiddlewaretoken' value='c92fde167c4768ad483a05412bede68c' /></div>
+        <input id="next" name="next" type="hidden" value="/en-US/docs/XULRunner/Build_Instructions"/>
+        <input required="required" type="hidden" name="assertion" id="id_assertion" />
+                        <a href="Build_Instructions.html#" target="_blank" class="browserid-signin toggle" aria-haspopup="true" title="Sign in with Persona">Sign in</a>
+                <div class="browserid-info sub-menu" aria-hidden="true">
+                <h3>What's this?</h3> <p>MDN has switched to <a href="https://persona.org/" target="_blank" rel="external">Persona</a>, a safe and simple way to sign in with just your e-mail address. <a href="http://identity.mozilla.com/post/12950196039/deploying-browserid-at-mozilla" rel="external">Learn more about why Mozilla is using Persona</a>.</p> <p><strong>Returning members:</strong> sign in with Persona and you'll be connected to your MDN profile (all your information is still here).</p> <p><strong>New members:</strong> sign in with Persona first, then you'll be able to set up your new MDN profile.</p>          <p><a href="Build_Instructions.html#" target="_blank" class="browserid-signin" title="Sign in with Persona">Sign in</a></p>
+        </div>
+              </form>
+    </li>
+  </ul>
+          <form class="languages go" method="get" action="https://developer.mozilla.org/en-US/docs">
+      <label for="language">Other languages:</label>
+      <select id="language" class="wiki-l10n" name="next" dir="ltr">
+        <option value="/en-US/docs/XULRunner/Build_Instructions" selected>
+          English (US)
+        </option>
+                  <option value="/ja/docs/XULRunner/Build_Instructions">
+            日本語
+          </option>      </select>
+      <noscript><button type="submit">Go</button></noscript>
+    </form>
+  </div>
+</footer>
+
+<script src="../../en-US/jsi18n/build:f424781"></script>
+  <script src="../../../www.google.com/jsapi" type="text/javascript"></script>
+  <script src="../../../login.persona.org/include.js" type="text/javascript" async></script>
+  <script src="../../../www.mozilla.org/tabzilla/media/js/tabzilla.js" async></script>
+  <script src="../../media/js/mdn-min.js%3Fbuild=f424781"></script>
+      <script src="../../media/js/wiki-min.js%3Fbuild=f424781"></script>
+      
+<script type="text/javascript">
+//<![CDATA[
+var _tag=new WebTrends();
+_tag.dcsGetId();
+//]]>>
+</script>
+<script type="text/javascript">
+//<![CDATA[
+_tag.dcsCollect();
+//]]>>
+</script>
+<noscript>
+<div><img alt="DCSIMG" id="DCSIMG" width="1" height="1" src="../../../statse.webtrendslive.com/dcs8yrjuavz5bdaun34r2o8bi_8o8x/njs.gif%3Fdcsuri=%252Fnojavascript&amp;WT.js=No&amp;WT.tv=8.6.2"/></div>
+</noscript>
+</body>
+</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/robocop_article.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/robocop_article.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/robocop_article.html	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/robocop_article.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Article title</title>
-<meta name="description" content="This is the article description." />
-</head>
-<body>
-<header>Site header</header>
-<div>
-<h1>Article title</h1>
-<h2 class="author">by Jane Doe</h2>
-<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.</p>
-<p>Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenatis pulvinar tellus gravida ornare. Sed et erat faucibus nunc euismod ultricies ut id justo. Nullam cursus suscipit nisi, et ultrices justo sodales nec. Fusce venenatis facilisis lectus ac semper. Aliquam at massa ipsum. Quisque bibendum purus convallis nulla ultrices ultricies. Nullam aliquam, mi eu aliquam tincidunt, purus velit laoreet tortor, viverra pretium nisi quam vitae mi. Fusce vel volutpat elit. Nam sagittis nisi dui.</p>
-</div>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/robocop.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/robocop.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/robocop.ini	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/robocop.ini	2014-11-26 21:46:01.000000000 +0000
@@ -104,6 +104,7 @@
 [testDebuggerServer]
 [testDeviceSearchEngine]
 [testFilePicker]
+[testHistoryService]
 [testJNI]
 # [testMozPay] # see bug 945675
 [testNetworkManager]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/simple_redirect.sjs thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/simple_redirect.sjs
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/simple_redirect.sjs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/simple_redirect.sjs	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,5 @@
+function handleRequest(request, response)
+{
+  response.setStatusLine(request.httpVersion, 301, "Moved Permanently");
+  response.setHeader("Location", request.queryString, false);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testGeckoRequest.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testGeckoRequest.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testGeckoRequest.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testGeckoRequest.java	2014-11-26 21:46:01.000000000 +0000
@@ -96,7 +96,7 @@
             }
 
             @Override
-            public void onError() {
+            public void onError(NativeJSObject error) {
                 errorReceived.set(true);
             }
         });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testHistoryService.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testHistoryService.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testHistoryService.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testHistoryService.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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;
+
+public class testHistoryService extends JavascriptTest {
+
+    public testHistoryService() {
+        super("testHistoryService.js");
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testHistoryService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testHistoryService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testHistoryService.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testHistoryService.js	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,130 @@
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+function ok(passed, text) {
+  do_report_result(passed, text, Components.stack.caller, false);
+}
+
+// Make the timer global so it doesn't get GC'd
+let gTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+
+function sleep(wait) {
+  return new Promise((resolve, reject) => {
+    do_print("sleep start");
+    gTimer.initWithCallback({
+      notify: function () {
+        do_print("sleep end");
+        resolve();
+      },
+    }, wait, gTimer.TYPE_ONE_SHOT);
+  });
+}
+
+function promiseLoadEvent(browser, url, eventType="load") {
+  return new Promise((resolve, reject) => {
+    do_print("Wait browser event: " + eventType);
+
+    function handle(event) {
+      // Since we'll be redirecting, don't make assumptions about the given URL and the loaded URL
+      if (event.target != browser.contentDocument || event.target.location.href == "about:blank") {
+        do_print("Skipping spurious '" + eventType + "' event" + " for " + event.target.location.href);
+        return;
+      }
+
+      browser.removeEventListener(eventType, handle, true);
+      do_print("Browser event received: " + eventType);
+      resolve(event);
+    }
+
+    browser.addEventListener(eventType, handle, true);
+    if (url) {
+      browser.loadURI(url);
+    }
+  });
+}
+
+// Wait 4 seconds for the pending visits to flush (which should happen in 3 seconds)
+const PENDING_VISIT_WAIT = 4000;
+
+// Manage the saved history visits so we can compare in the tests
+let gVisitURLs = [];
+function visitObserver(subject, topic, data) {
+  let uri = subject.QueryInterface(Ci.nsIURI);
+  do_print("Observer: " + uri.spec);
+  gVisitURLs.push(uri.spec);
+};
+
+// Track the <browser> where the tests are happening
+let gBrowser;
+
+add_test(function setup_browser() {
+  let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
+  let BrowserApp = chromeWin.BrowserApp;
+
+  do_register_cleanup(function cleanup() {
+    Services.obs.removeObserver(visitObserver, "link-visited");
+    BrowserApp.closeTab(BrowserApp.getTabForBrowser(browser));
+  });
+
+  Services.obs.addObserver(visitObserver, "link-visited", false);
+
+  // Load a blank page
+  let url = "about:blank";
+  gBrowser = BrowserApp.addTab(url, { selected: true, parentId: BrowserApp.selectedTab.id }).browser;
+  gBrowser.addEventListener("load", function startTests(event) {
+    gBrowser.removeEventListener("load", startTests, true);
+    Services.tm.mainThread.dispatch(run_next_test, Ci.nsIThread.DISPATCH_NORMAL);
+  }, true);
+});
+
+add_task(function* () {
+  // Wait for any initial page loads to be saved to history
+  yield sleep(PENDING_VISIT_WAIT);
+
+  // Load a simple HTML page with no redirects
+  gVisitURLs = [];
+  yield promiseLoadEvent(gBrowser, "http://example.org/tests/robocop/robocop_blank_01.html");
+  yield sleep(PENDING_VISIT_WAIT);
+
+  do_print("visit counts: " + gVisitURLs.length);
+  ok(gVisitURLs.length == 1, "Simple visit makes 1 history item");
+
+  do_print("visit URL: " + gVisitURLs[0]);
+  ok(gVisitURLs[0] == "http://example.org/tests/robocop/robocop_blank_01.html", "Simple visit makes final history item");
+
+  // Load a simple HTML page via a 301 temporary redirect
+  gVisitURLs = [];
+  yield promiseLoadEvent(gBrowser, "http://example.org/tests/robocop/simple_redirect.sjs?http://example.org/tests/robocop/robocop_blank_02.html");
+  yield sleep(PENDING_VISIT_WAIT);
+
+  do_print("visit counts: " + gVisitURLs.length);
+  ok(gVisitURLs.length == 1, "Simple 301 redirect makes 1 history item");
+
+  do_print("visit URL: " + gVisitURLs[0]);
+  ok(gVisitURLs[0] == "http://example.org/tests/robocop/robocop_blank_02.html", "Simple 301 redirect makes final history item");
+
+  // Load a simple HTML page via a JavaScript redirect
+  gVisitURLs = [];
+  yield promiseLoadEvent(gBrowser, "http://example.org/tests/robocop/javascript_redirect.sjs?http://example.org/tests/robocop/robocop_blank_03.html");
+  yield sleep(PENDING_VISIT_WAIT);
+
+  do_print("visit counts: " + gVisitURLs.length);
+  ok(gVisitURLs.length == 2, "JavaScript redirect makes 2 history items");
+
+  do_print("visit URL 1: " + gVisitURLs[0]);
+  ok(gVisitURLs[0] == "http://example.org/tests/robocop/javascript_redirect.sjs?http://example.org/tests/robocop/robocop_blank_03.html", "JavaScript redirect makes intermediate history item");
+
+  do_print("visit URL 2: " + gVisitURLs[1]);
+  ok(gVisitURLs[1] == "http://example.org/tests/robocop/robocop_blank_03.html", "JavaScript redirect makes final history item");
+});
+
+run_next_test();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testReadingListCache.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testReadingListCache.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testReadingListCache.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testReadingListCache.js	2014-11-26 21:46:01.000000000 +0000
@@ -5,62 +5,87 @@
 
 const { utils: Cu } = Components;
 
-Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
-// Values from robocop_article.html
-const ARTICLE = {
-  url: "http://mochi.test:8888/tests/robocop/robocop_article.html",
-  title: "Article title",
-  byline: "by Jane Doe",
-  excerpt: "This is the article description.",
-  length: 1931,
-  content: "Lorem ipsum..." // This test doesn't actually compare content strings
-};
+let Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
 
-const ARTICLE_URI = Services.io.newURI(ARTICLE.url, null, null);
+const URL_PREFIX = "http://mochi.test:8888/tests/robocop/reader_mode_pages/";
 
-add_task(function* test_article_not_found() {
-  let Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
+let TEST_PAGES = [
+  {
+    url: URL_PREFIX + "basic_article.html",
+    expected: {
+      title: "Article title",
+      byline: "by Jane Doe",
+      excerpt: "This is the article description.",
+      length: 1931
+    }
+  },
+  {
+    url: URL_PREFIX + "addons.mozilla.org/en-US/firefox/index.html",
+    expected: null
+  },
+  {
+    url: URL_PREFIX + "developer.mozilla.org/en/XULRunner/Build_Instructions.html",
+    expected: {
+      title: "Building XULRunner | MDN",
+      byline: null,
+      excerpt: "XULRunner is built using basically the same process as Firefox or other applications. Please read and follow the general Build Documentation for instructions on how to get sources and set up build prerequisites.",
+      length: 2300
+    }
+  },
+];
 
-  let article = yield Reader.getArticleFromCache(ARTICLE_URI);
+add_task(function* test_article_not_found() {
+  let uri = Services.io.newURI(TEST_PAGES[0].url, null, null);
+  let article = yield Reader.getArticleFromCache(uri);
   do_check_eq(article, null);
 });
 
 add_task(function* test_store_article() {
-  let Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
-
-  yield Reader.storeArticleInCache(ARTICLE);
-
-  let article = yield Reader.getArticleFromCache(ARTICLE_URI);
-  checkArticle(article);
+  // Create an article object to store in the cache.
+  yield Reader.storeArticleInCache({
+    url: TEST_PAGES[0].url,
+    content: "Lorem ipsum",
+    title: TEST_PAGES[0].expected.title,
+    byline: TEST_PAGES[0].expected.byline,
+    excerpt: TEST_PAGES[0].expected.excerpt,
+    length: TEST_PAGES[0].expected.length
+  });
+
+  let uri = Services.io.newURI(TEST_PAGES[0].url, null, null);
+  let article = yield Reader.getArticleFromCache(uri);
+  checkArticle(article, TEST_PAGES[0]);
 });
 
 add_task(function* test_remove_article() {
-  let Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
-
-  yield Reader.removeArticleFromCache(ARTICLE_URI);
-
-  let article = yield Reader.getArticleFromCache(ARTICLE_URI);
+  let uri = Services.io.newURI(TEST_PAGES[0].url, null, null);
+  yield Reader.removeArticleFromCache(uri);
+  let article = yield Reader.getArticleFromCache(uri);
   do_check_eq(article, null);
 });
 
-add_task(function* test_parse_article() {
-  let Reader = Services.wm.getMostRecentWindow("navigator:browser").Reader;
-
-  let article = yield Reader._downloadAndParseDocument(ARTICLE.url);
-  checkArticle(article);
+add_task(function* test_parse_articles() {
+  for (let testcase of TEST_PAGES) {
+    let article = yield Reader._downloadAndParseDocument(testcase.url);
+    checkArticle(article, testcase);
+  }
 });
 
-function checkArticle(article) {
+function checkArticle(article, testcase) {
+  if (testcase.expected == null) {
+    do_check_eq(article, null);
+    return;
+  }
+
   do_check_neq(article, null);
-  do_check_neq(article.content, null);
-  do_check_eq(article.url, ARTICLE.url);
-  do_check_eq(article.title, ARTICLE.title);
-  do_check_eq(article.byline, ARTICLE.byline);
-  do_check_eq(article.excerpt, ARTICLE.excerpt);
-  do_check_eq(article.length, ARTICLE.length);
+  do_check_eq(!!article.content, true); // A bit of a hack to avoid spamming the test log.
+  do_check_eq(article.url, testcase.url);
+  do_check_eq(article.title, testcase.expected.title);
+  do_check_eq(article.byline, testcase.expected.byline);
+  do_check_eq(article.excerpt, testcase.expected.excerpt);
+  do_check_eq(article.length, testcase.expected.length);
 }
 
 run_next_test();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testTrackingProtection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testTrackingProtection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/tests/testTrackingProtection.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/tests/testTrackingProtection.js	2014-11-26 21:46:01.000000000 +0000
@@ -15,7 +15,7 @@
   do_report_result(passed, text, Components.stack.caller, false);
 }
 
-function promiseLoadEvent(browser, url, eventType="load") {
+function promiseLoadEvent(browser, url, eventType="load", runBeforeLoad) {
   return new Promise((resolve, reject) => {
     do_print("Wait browser event: " + eventType);
 
@@ -30,7 +30,11 @@
       resolve(event);
     }
 
-    browser.addEventListener(eventType, handle, true, true);
+    browser.addEventListener(eventType, handle, true);
+
+    if (runBeforeLoad) {
+      runBeforeLoad();
+    }
     if (url) {
       browser.loadURI(url);
     }
@@ -122,6 +126,19 @@
   yield promiseLoadEvent(browser, "http://tracking.example.org/tests/robocop/tracking_bad.html");
   Messaging.sendRequest({ type: "Test:Expected", expected: "tracking_content_blocked" });
 
+  // Simulate a click on the "Disable protection" button in the site identity popup.
+  // We need to wait for a "load" event because "Session:Reload" will cause a full page reload.
+  yield promiseLoadEvent(browser, undefined, undefined, () => {
+    Services.obs.notifyObservers(null, "Session:Reload", "{\"allowContent\":true,\"contentType\":\"tracking\"}");
+  });
+  Messaging.sendRequest({ type: "Test:Expected", expected: "tracking_content_loaded" });
+
+  // Simulate a click on the "Enable protection" button in the site identity popup.
+  yield promiseLoadEvent(browser, undefined, undefined, () => {
+    Services.obs.notifyObservers(null, "Session:Reload", "{\"allowContent\":false,\"contentType\":\"tracking\"}");
+  });
+  Messaging.sendRequest({ type: "Test:Expected", expected: "tracking_content_blocked" });
+
   // Disable Tracking Protection
   Services.prefs.setBoolPref(PREF, false);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/toolbar/BrowserToolbarNewTablet.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/toolbar/BrowserToolbarNewTablet.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/toolbar/BrowserToolbarNewTablet.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/toolbar/BrowserToolbarNewTablet.java	2014-11-26 21:46:01.000000000 +0000
@@ -10,7 +10,7 @@
 import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
+import android.content.res.Resources;
 import android.util.AttributeSet;
 
 /**
@@ -51,6 +51,16 @@
         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-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/toolbar/SiteIdentityPopup.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/toolbar/SiteIdentityPopup.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/toolbar/SiteIdentityPopup.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/toolbar/SiteIdentityPopup.java	2014-11-26 21:46:01.000000000 +0000
@@ -4,6 +4,7 @@
 
 package org.mozilla.gecko.toolbar;
 
+import org.mozilla.gecko.AboutPages;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
@@ -11,10 +12,11 @@
 import org.mozilla.gecko.SiteIdentity.SecurityMode;
 import org.mozilla.gecko.SiteIdentity.MixedMode;
 import org.mozilla.gecko.SiteIdentity.TrackingMode;
+import org.mozilla.gecko.Tab;
+import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.widget.ArrowPopup;
 import org.mozilla.gecko.widget.DoorHanger;
 import org.mozilla.gecko.widget.DoorHanger.OnButtonClickListener;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -42,6 +44,10 @@
     private SiteIdentity mSiteIdentity;
 
     private LinearLayout mIdentity;
+
+    private LinearLayout mIdentityKnownContainer;
+    private LinearLayout mIdentityUnknownContainer;
+
     private TextView mHost;
     private TextView mOwner;
     private TextView mVerifier;
@@ -69,45 +75,70 @@
         mIdentity = (LinearLayout) inflater.inflate(R.layout.site_identity, null);
         mContent.addView(mIdentity);
 
-        mHost = (TextView) mIdentity.findViewById(R.id.host);
-        mOwner = (TextView) mIdentity.findViewById(R.id.owner);
-        mVerifier = (TextView) mIdentity.findViewById(R.id.verifier);
+        mIdentityKnownContainer =
+                (LinearLayout) mIdentity.findViewById(R.id.site_identity_known_container);
+        mIdentityUnknownContainer =
+                (LinearLayout) mIdentity.findViewById(R.id.site_identity_unknown_container);
+
+        mHost = (TextView) mIdentityKnownContainer.findViewById(R.id.host);
+        mOwner = (TextView) mIdentityKnownContainer.findViewById(R.id.owner);
+        mVerifier = (TextView) mIdentityKnownContainer.findViewById(R.id.verifier);
     }
 
-    private void updateIdentity() {
+    private void updateIdentity(final SiteIdentity siteIdentity) {
         if (!mInflated) {
             init();
         }
 
-        final MixedMode mixedMode = mSiteIdentity.getMixedMode();
-        final TrackingMode trackingMode = mSiteIdentity.getTrackingMode();
+        final MixedMode mixedMode = siteIdentity.getMixedMode();
+        final TrackingMode trackingMode = siteIdentity.getTrackingMode();
         if (mixedMode != MixedMode.UNKNOWN || trackingMode != TrackingMode.UNKNOWN) {
             // Hide the identity data if there isn't valid site identity data.
             // Set some top padding on the popup content to create a of light blue
             // between the popup arrow and the mixed content notification.
             mContent.setPadding(0, (int) mContext.getResources().getDimension(R.dimen.identity_padding_top), 0, 0);
             mIdentity.setVisibility(View.GONE);
-        } else {
-            mHost.setText(mSiteIdentity.getHost());
+            return;
+        }
 
-            String owner = mSiteIdentity.getOwner();
+        mIdentity.setVisibility(View.VISIBLE);
+        mContent.setPadding(0, 0, 0, 0);
 
-            // Supplemental data is optional.
-            final String supplemental = mSiteIdentity.getSupplemental();
-            if (!TextUtils.isEmpty(supplemental)) {
-                owner += "\n" + supplemental;
-            }
-            mOwner.setText(owner);
+        final boolean isIdentityKnown = (siteIdentity.getSecurityMode() != SecurityMode.UNKNOWN);
+        toggleIdentityKnownContainerVisibility(isIdentityKnown);
 
-            final String verifier = mSiteIdentity.getVerifier();
-            final String encrypted = mSiteIdentity.getEncrypted();
-            mVerifier.setText(verifier + "\n" + encrypted);
+        if (isIdentityKnown) {
+            updateIdentityInformation(siteIdentity);
+        }
+    }
 
-            mContent.setPadding(0, 0, 0, 0);
-            mIdentity.setVisibility(View.VISIBLE);
+    private void toggleIdentityKnownContainerVisibility(final boolean isIdentityKnown) {
+        if (isIdentityKnown) {
+            mIdentityKnownContainer.setVisibility(View.VISIBLE);
+            mIdentityUnknownContainer.setVisibility(View.GONE);
+        } else {
+            mIdentityKnownContainer.setVisibility(View.GONE);
+            mIdentityUnknownContainer.setVisibility(View.VISIBLE);
         }
     }
 
+    private void updateIdentityInformation(final SiteIdentity siteIdentity) {
+        mHost.setText(siteIdentity.getHost());
+
+        String owner = siteIdentity.getOwner();
+
+        // Supplemental data is optional.
+        final String supplemental = siteIdentity.getSupplemental();
+        if (!TextUtils.isEmpty(supplemental)) {
+            owner += "\n" + supplemental;
+        }
+        mOwner.setText(owner);
+
+        final String verifier = siteIdentity.getVerifier();
+        final String encrypted = siteIdentity.getEncrypted();
+        mVerifier.setText(verifier + "\n" + encrypted);
+    }
+
     private void addMixedContentNotification(boolean blocked) {
         // Remove any existing mixed content notification.
         removeMixedContentNotification();
@@ -195,20 +226,22 @@
             return;
         }
 
-        final SecurityMode identityMode = mSiteIdentity.getSecurityMode();
-        final MixedMode mixedMode = mSiteIdentity.getMixedMode();
-        final TrackingMode trackingMode = mSiteIdentity.getTrackingMode();
-        if (identityMode == SecurityMode.UNKNOWN && mixedMode == MixedMode.UNKNOWN && trackingMode == TrackingMode.UNKNOWN) {
-            Log.e(LOGTAG, "Can't show site identity popup in a completely unknown state");
+        // about: has an unknown SiteIdentity in code, but showing "This
+        // site's identity is unknown" is misleading! So don't show a popup.
+        final Tab selectedTab = Tabs.getInstance().getSelectedTab();
+        if (selectedTab != null && AboutPages.isAboutPage(selectedTab.getURL())) {
+            Log.d(LOGTAG, "We don't show site identity popups for about: pages");
             return;
         }
 
-        updateIdentity();
+        updateIdentity(mSiteIdentity);
 
+        final MixedMode mixedMode = mSiteIdentity.getMixedMode();
         if (mixedMode != MixedMode.UNKNOWN) {
             addMixedContentNotification(mixedMode == MixedMode.MIXED_CONTENT_BLOCKED);
         }
 
+        final TrackingMode trackingMode = mSiteIdentity.getTrackingMode();
         if (trackingMode != TrackingMode.UNKNOWN) {
             addTrackingContentNotification(trackingMode == TrackingMode.TRACKING_CONTENT_BLOCKED);
         }
@@ -254,8 +287,8 @@
         public void onButtonClick(DoorHanger dh, String tag) {
             try {
                 JSONObject data = new JSONObject();
-                String allowType = (dh == mMixedContentNotification ? "allowMixedContent" : "allowTrackingContent");
-                data.put(allowType, tag.equals("disable"));
+                data.put("allowContent", tag.equals("disable"));
+                data.put("contentType", (dh == mMixedContentNotification ? "mixed" : "tracking"));
 
                 GeckoEvent e = GeckoEvent.createBroadcastEvent("Session:Reload", data.toString());
                 GeckoAppShell.sendEventToGecko(e);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/util/FileUtils.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/util/FileUtils.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/util/FileUtils.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/util/FileUtils.java	2014-11-26 21:46:01.000000000 +0000
@@ -9,6 +9,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.FilenameFilter;
+import java.util.Scanner;
 
 import org.mozilla.gecko.mozglue.RobocopTarget;
 
@@ -81,4 +82,17 @@
         // Even if this is a dir, it should now be empty and delete should work
         return file.delete();
     }
+
+    // Shortcut to slurp a file without messing around with streams.
+    public static String getFileContents(File file) throws IOException {
+        Scanner scanner = null;
+        try {
+            scanner = new Scanner(file, "UTF-8");
+            return scanner.useDelimiter("\\A").next();
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+    }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/util/GeckoRequest.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/util/GeckoRequest.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/util/GeckoRequest.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/util/GeckoRequest.java	2014-11-26 21:46:01.000000000 +0000
@@ -1,3 +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/. */
 package org.mozilla.gecko.util;
 
 import java.util.concurrent.atomic.AtomicInteger;
@@ -77,15 +80,15 @@
     /**
      * Callback executed when the request fails.
      *
-     * In general, this should not be overridden since there's no way to differentiate between
-     * expected errors and logic errors in JS. If the Gecko-side request handler wants to send a
-     * recoverable error to Java, it should include any error data in the response object that the
-     * {@link #onResponse(NativeJSObject)} callback can handle as necessary.
+     * By default, an exception is thrown. This should be overridden if the
+     * GeckoRequest is able to recover from the error.
      *
      * @throws RuntimeException
      */
     @RobocopTarget
-    public void onError() {
-        throw new RuntimeException("Unhandled error for GeckoRequest: " + name);
+    public void onError(NativeJSObject error) {
+        final String message = error.optString("message", "<no message>");
+        final String stack = error.optString("stack", "<no stack>");
+        throw new RuntimeException("Unhandled error for GeckoRequest " + name + ": " + message + "\nJS stack:\n" + stack);
     }
-}
\ No newline at end of file
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/util/HardwareUtils.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/util/HardwareUtils.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/util/HardwareUtils.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/util/HardwareUtils.java	2014-11-26 21:46:01.000000000 +0000
@@ -5,9 +5,7 @@
 
 package org.mozilla.gecko.util;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import org.mozilla.gecko.SysInfo;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -27,14 +25,10 @@
     // reading list capabilities in HomePager.
     private static final int LOW_MEMORY_THRESHOLD_MB = 384;
 
-    // Number of bytes of /proc/meminfo to read in one go.
-    private static final int MEMINFO_BUFFER_SIZE_BYTES = 256;
-
     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") ||
                                                     Build.MODEL.startsWith("KF"));
-    private static volatile int sTotalRAM = -1;
 
     private static volatile boolean sInited;
 
@@ -99,95 +93,8 @@
         return sHasMenuButton;
     }
 
-    /**
-    * Helper functions used to extract key/value data from /proc/meminfo
-    * Pulled from:
-    * http://androidxref.com/4.2_r1/xref/frameworks/base/core/java/com/android/internal/util/MemInfoReader.java
-    */
-
-    private static boolean matchMemText(byte[] buffer, int index, int bufferLength, byte[] text) {
-        final int N = text.length;
-        if ((index + N) >= bufferLength) {
-            return false;
-        }
-        for (int i = 0; i < N; i++) {
-            if (buffer[index + i] != text[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Parses a line like:
-     *
-     *  MemTotal: 1605324 kB
-     *
-     * into 1605324.
-     *
-     * @return the first uninterrupted sequence of digits following the
-     *         specified index, parsed as an integer value in KB.
-     */
-    private static int extractMemValue(byte[] buffer, int offset, int length) {
-        if (offset >= length) {
-            return 0;
-        }
-
-        while (offset < length && buffer[offset] != '\n') {
-            if (buffer[offset] >= '0' && buffer[offset] <= '9') {
-                int start = offset++;
-                while (offset < length &&
-                       buffer[offset] >= '0' &&
-                       buffer[offset] <= '9') {
-                    ++offset;
-                }
-                return Integer.parseInt(new String(buffer, start, offset - start), 10);
-            }
-            ++offset;
-        }
-        return 0;
-    }
-
-    /**
-     * Fetch the total memory of the device in MB by parsing /proc/meminfo.
-     *
-     * Of course, Android doesn't have a neat and tidy way to find total
-     * RAM, so we do it by parsing /proc/meminfo.
-     *
-     * @return 0 if a problem occurred, or memory size in MB.
-     */
     public static int getMemSize() {
-        if (sTotalRAM >= 0) {
-            return sTotalRAM;
-        }
-
-        // This is the string "MemTotal" that we're searching for in the buffer.
-        final byte[] MEMTOTAL = {'M', 'e', 'm', 'T', 'o', 't', 'a', 'l'};
-        try {
-            final byte[] buffer = new byte[MEMINFO_BUFFER_SIZE_BYTES];
-            final FileInputStream is = new FileInputStream("/proc/meminfo");
-            try {
-                final int length = is.read(buffer);
-
-                for (int i = 0; i < length; i++) {
-                    if (matchMemText(buffer, i, length, MEMTOTAL)) {
-                        i += 8;
-                        sTotalRAM = extractMemValue(buffer, i, length) / 1024;
-                        Log.d(LOGTAG, "System memory: " + sTotalRAM + "MB.");
-                        return sTotalRAM;
-                    }
-                }
-            } finally {
-                is.close();
-            }
-
-            Log.w(LOGTAG, "Did not find MemTotal line in /proc/meminfo.");
-            return sTotalRAM = 0;
-        } catch (FileNotFoundException f) {
-            return sTotalRAM = 0;
-        } catch (IOException e) {
-            return sTotalRAM = 0;
-        }
+        return SysInfo.getMemSize();
     }
 
     public static boolean isLowMemoryPlatform() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/generate_themed_views.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/generate_themed_views.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/generate_themed_views.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/generate_themed_views.py	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,66 @@
+#!/bin/python
+
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 generate Themed*.java source files for Fennec.
+
+This script runs the preprocessor on a input template and writes
+updated files into the source directory.
+
+To update the themed views, update the input template
+(ThemedView.java.frag) and run the script.  Use version control to
+examine the differences, and don't forget to commit the changes to the
+template and the outputs.
+'''
+
+from __future__ import (
+    print_function,
+    unicode_literals,
+)
+
+import os
+
+from mozbuild.preprocessor import Preprocessor
+
+__DIR__ = os.path.dirname(os.path.abspath(__file__))
+
+template = os.path.join(__DIR__, 'ThemedView.java.frag')
+dest_format_string = 'Themed%(VIEW_NAME_SUFFIX)s.java'
+
+views = [
+    dict(VIEW_NAME_SUFFIX='EditText',
+         BASE_TYPE='android.widget.EditText',
+         STYLE_CONSTRUCTOR=1),
+    dict(VIEW_NAME_SUFFIX='ImageButton',
+         BASE_TYPE='android.widget.ImageButton',
+         STYLE_CONSTRUCTOR=1),
+    dict(VIEW_NAME_SUFFIX='ImageView',
+         BASE_TYPE='android.widget.ImageView',
+         STYLE_CONSTRUCTOR=1),
+    dict(VIEW_NAME_SUFFIX='LinearLayout',
+         BASE_TYPE='android.widget.LinearLayout'),
+    dict(VIEW_NAME_SUFFIX='RelativeLayout',
+         BASE_TYPE='android.widget.RelativeLayout',
+         STYLE_CONSTRUCTOR=1),
+    dict(VIEW_NAME_SUFFIX='TextSwitcher',
+         BASE_TYPE='android.widget.TextSwitcher'),
+    dict(VIEW_NAME_SUFFIX='TextView',
+         BASE_TYPE='android.widget.TextView',
+         STYLE_CONSTRUCTOR=1),
+    dict(VIEW_NAME_SUFFIX='View',
+         BASE_TYPE='android.view.View',
+         STYLE_CONSTRUCTOR=1),
+]
+
+for view in views:
+    pp = Preprocessor(defines=view, marker='//#')
+
+    dest = os.path.join(__DIR__, dest_format_string % view)
+    with open(template, 'rU') as input:
+        with open(dest, 'wt') as output:
+            pp.processFile(input=input, output=output)
+            print('%s' % dest)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedEditText.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedEditText.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedEditText.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedEditText.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,155 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedEditText extends android.widget.EditText
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public ThemedEditText(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedEditText.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedEditText.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedEditText.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedEditText.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX EditText
-//#define BASE_TYPE android.widget.EditText
-//#define STYLE_CONSTRUCTOR 1
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageButton.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageButton.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageButton.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageButton.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,155 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedImageButton extends android.widget.ImageButton
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedImageButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public ThemedImageButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageButton.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageButton.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageButton.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageButton.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX ImageButton
-//#define BASE_TYPE android.widget.ImageButton
-//#define STYLE_CONSTRUCTOR 1
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageView.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageView.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageView.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageView.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,155 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedImageView extends android.widget.ImageView
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public ThemedImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageView.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageView.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedImageView.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedImageView.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX ImageView
-//#define BASE_TYPE android.widget.ImageView
-//#define STYLE_CONSTRUCTOR 1
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedLinearLayout.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedLinearLayout.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedLinearLayout.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedLinearLayout.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,150 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedLinearLayout extends android.widget.LinearLayout
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedLinearLayout.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedLinearLayout.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedLinearLayout.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedLinearLayout.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX LinearLayout
-//#define BASE_TYPE android.widget.LinearLayout
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,155 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedRelativeLayout extends android.widget.RelativeLayout
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedRelativeLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public ThemedRelativeLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedRelativeLayout.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX RelativeLayout
-//#define BASE_TYPE android.widget.RelativeLayout
-//#define STYLE_CONSTRUCTOR 1
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,150 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedTextSwitcher extends android.widget.TextSwitcher
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedTextSwitcher(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextSwitcher.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX TextSwitcher
-//#define BASE_TYPE android.widget.TextSwitcher
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextView.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextView.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextView.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextView.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,155 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedTextView extends android.widget.TextView
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public ThemedTextView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextView.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextView.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedTextView.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedTextView.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX TextView
-//#define BASE_TYPE android.widget.TextView
-//#define STYLE_CONSTRUCTOR 1
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedView.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedView.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedView.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedView.java	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,155 @@
+// This file is generated by generate_themed_views.py; do not edit.
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.widget;
+
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.LightweightTheme;
+import org.mozilla.gecko.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+
+public class ThemedView extends android.view.View
+                                     implements LightweightTheme.OnChangeListener {
+    private LightweightTheme mTheme;
+
+    private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
+    private static final int[] STATE_LIGHT = { R.attr.state_light };
+    private static final int[] STATE_DARK = { R.attr.state_dark };
+
+    protected static final int[] PRIVATE_PRESSED_STATE_SET = { R.attr.state_private, android.R.attr.state_pressed };
+    protected static final int[] PRIVATE_FOCUSED_STATE_SET = { R.attr.state_private, android.R.attr.state_focused };
+    protected static final int[] PRIVATE_STATE_SET = { R.attr.state_private };
+
+    private boolean mIsPrivate;
+    private boolean mIsLight;
+    private boolean mIsDark;
+    private boolean mAutoUpdateTheme;        // always false if there's no theme.
+
+    public ThemedView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public ThemedView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(final Context context, final AttributeSet attrs) {
+        // The theme can be null, particularly for webapps: Bug 1089266.
+        mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();
+
+        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.LightweightTheme);
+        mAutoUpdateTheme = mTheme != null && a.getBoolean(R.styleable.LightweightTheme_autoUpdateTheme, true);
+        a.recycle();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.addListener(this);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mAutoUpdateTheme)
+            mTheme.removeListener(this);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+        if (mIsPrivate)
+            mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
+        else if (mIsLight)
+            mergeDrawableStates(drawableState, STATE_LIGHT);
+        else if (mIsDark)
+            mergeDrawableStates(drawableState, STATE_DARK);
+
+        return drawableState;
+    }
+
+    @Override
+    public void onLightweightThemeChanged() {
+        if (mAutoUpdateTheme && mTheme.isEnabled())
+            setTheme(mTheme.isLightTheme());
+    }
+
+    @Override
+    public void onLightweightThemeReset() {
+        if (mAutoUpdateTheme)
+            resetTheme();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        onLightweightThemeChanged();
+    }
+
+    public boolean isPrivateMode() {
+        return mIsPrivate;
+    }
+
+    public void setPrivateMode(boolean isPrivate) {
+        if (mIsPrivate != isPrivate) {
+            mIsPrivate = isPrivate;
+            refreshDrawableState();
+        }
+    }
+
+    public void setTheme(boolean isLight) {
+        // Set the theme only if it is different from existing theme.
+        if ((isLight && mIsLight != isLight) ||
+            (!isLight && mIsDark == isLight)) {
+            if (isLight) {
+                mIsLight = true;
+                mIsDark = false;
+            } else {
+                mIsLight = false;
+                mIsDark = true;
+            }
+
+            refreshDrawableState();
+        }
+    }
+
+    public void resetTheme() {
+        if (mIsLight || mIsDark) {
+            mIsLight = false;
+            mIsDark = false;
+            refreshDrawableState();
+        }
+    }
+
+    public void setAutoUpdateTheme(boolean autoUpdateTheme) {
+        if (mTheme == null) {
+            return;
+        }
+
+        if (mAutoUpdateTheme != autoUpdateTheme) {
+            mAutoUpdateTheme = autoUpdateTheme;
+
+            if (mAutoUpdateTheme)
+                mTheme.addListener(this);
+            else
+                mTheme.removeListener(this);
+        }
+    }
+
+    public ColorDrawable getColorDrawable(int id) {
+        return new ColorDrawable(getResources().getColor(id));
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedView.java.frag thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedView.java.frag
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedView.java.frag	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedView.java.frag	2014-11-26 21:46:01.000000000 +0000
@@ -1,3 +1,6 @@
+//#filter substitution
+// This file is generated by generate_themed_views.py; do not edit.
+
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.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-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedView.java.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedView.java.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/base/widget/ThemedView.java.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/base/widget/ThemedView.java.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-//#filter substitution
-//#define VIEW_NAME_SUFFIX View
-//#define BASE_TYPE android.view.View
-//#define STYLE_CONSTRUCTOR 1
-//#include ThemedView.java.frag
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/branding/unofficial/configure.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/branding/unofficial/configure.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/branding/unofficial/configure.sh	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/branding/unofficial/configure.sh	2014-11-26 21:46:01.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/.
 
-ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER`
-MOZ_APP_DISPLAYNAME="Fennec `echo $USER`"
+ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER | sed 's/-/_/g'`
+MOZ_APP_DISPLAYNAME="Fennec `echo $USER | sed 's/-/_/g'`"
 MOZ_UPDATER=
 MOZ_ANDROID_ANR_REPORTER=
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/build/classycle/classycle-1.4.1.jar and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/build/classycle/classycle-1.4.1.jar differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/build/classycle/LICENSE.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/build/classycle/LICENSE.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/build/classycle/LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/build/classycle/LICENSE.txt	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright (c) 2003-2008, Franz-Josef Elmer, 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.
+
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/browser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/browser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/browser.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/browser.js	2014-11-26 21:46:02.000000000 +0000
@@ -478,36 +478,6 @@
       Services.prefs.setBoolPref("xpinstall.enabled", false);
     }
 
-    // Fix fallout from Bug 1091803.
-    if (Services.prefs.prefHasUserValue("intl.locale.os")) {
-      try {
-        let currentAcceptLang = Services.prefs.getCharPref("intl.accept_languages");
-
-        // The trailing comma is very important. This means we've set it to a
-        // real char pref, and it's something like "chrome://...,en-US,en".
-        if (currentAcceptLang.startsWith("chrome://global/locale/intl.properties,")) {
-          // If general.useragent.locale was set to a plain string, we ought to fix it, too.
-          try {
-            let currentUALocale = Services.prefs.getCharPref("general.useragent.locale");
-            if (currentUALocale.startsWith("chrome://")) {
-              // We're fine. This is what happens when you read a localized string as a char pref.
-            } else {
-              // Turn it into a localized string.
-              this.setLocalizedPref("general.useragent.locale", currentUALocale);
-            }
-          } catch (ee) {
-          }
-
-          // Now compute and save a valid Accept-Languages header from the clean strings.
-          let osLocale = this.getOSLocalePref();
-          let uaLocale = this.getUALocalePref();
-          this.computeAcceptLanguages(osLocale, uaLocale);
-        }
-      } catch (e) {
-        // Phew.
-      }
-    }
-
     try {
       // Set the tiles click observer only if tiles reporting is enabled (that
       // is, a report URL is set in prefs).
@@ -1578,14 +1548,34 @@
 
         // Check to see if this is a message to enable/disable mixed content blocking.
         if (aData) {
-          let allowMixedContent = JSON.parse(aData).allowMixedContent;
-          if (allowMixedContent) {
-            // Set a flag to disable mixed content blocking.
-            flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_MIXED_CONTENT;
-          } else {
-            // Set mixedContentChannel to null to re-enable mixed content blocking.
-            let docShell = browser.webNavigation.QueryInterface(Ci.nsIDocShell);
-            docShell.mixedContentChannel = null;
+          let data = JSON.parse(aData);
+          if (data.contentType === "mixed") {
+            if (data.allowContent) {
+              // Set a flag to disable mixed content blocking.
+              flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_MIXED_CONTENT;
+            } else {
+              // Set mixedContentChannel to null to re-enable mixed content blocking.
+              let docShell = browser.webNavigation.QueryInterface(Ci.nsIDocShell);
+              docShell.mixedContentChannel = null;
+            }
+          } else if (data.contentType === "tracking") {
+            if (data.allowContent) {
+              // Convert document URI into the format used by
+              // nsChannelClassifier::ShouldEnableTrackingProtection
+              // (any scheme turned into https is correct)
+              let normalizedUrl = Services.io.newURI("https://" + browser.currentURI.hostPort, null, null);
+              // Add the current host in the 'trackingprotection' consumer of
+              // the permission manager using a normalized URI. This effectively
+              // places this host on the tracking protection white list.
+              Services.perms.add(normalizedUrl, "trackingprotection", Services.perms.ALLOW_ACTION);
+              Telemetry.addData("TRACKING_PROTECTION_EVENTS", 1);
+            } else {
+              // Remove the current host from the 'trackingprotection' consumer
+              // of the permission manager. This effectively removes this host
+              // from the tracking protection white list (any list actually).
+              Services.perms.remove(browser.currentURI.host, "trackingprotection");
+              Telemetry.addData("TRACKING_PROTECTION_EVENTS", 2);
+            }
           }
         }
 
@@ -1925,18 +1915,6 @@
     return this.defaultBrowserWidth = width;
   },
 
-  get layersTileWidth() {
-    delete this.layersTileWidth;
-    let width = Services.prefs.getIntPref("layers.tile-width");
-    return this.layersTileWidth = width;
-  },
-
-  get layersTileHeight() {
-    delete this.layersTileHeight;
-    let height = Services.prefs.getIntPref("layers.tile-height");
-    return this.layersTileHeight = height;
-  },
-
   // nsIAndroidBrowserApp
   get selectedTab() {
     return this._selectedTab;
@@ -2957,6 +2935,8 @@
 
 var DesktopUserAgent = {
   DESKTOP_UA: null,
+  TCO_DOMAIN: "t.co",
+  TCO_REPLACE: / Gecko.*/,
 
   init: function ua_init() {
     Services.obs.addObserver(this, "DesktopMode:Change", false);
@@ -2970,26 +2950,40 @@
   },
 
   onRequest: function(channel, defaultUA) {
+#ifdef NIGHTLY_BUILD
+    if (this.TCO_DOMAIN == channel.URI.host) {
+      // Force the referrer
+      channel.referrer = channel.URI;
+
+      // Send a bot-like UA to t.co to get a real redirect. We strip off the
+      // "Gecko/x.y Firefox/x.y" part
+      return defaultUA.replace(this.TCO_REPLACE, "");
+    }
+#endif
+
     let channelWindow = this._getWindowForRequest(channel);
     let tab = BrowserApp.getTabForWindow(channelWindow);
-    if (tab == null)
-      return null;
+    if (tab) {
+      return this.getUserAgentForTab(tab);
+    }
 
-    return this.getUserAgentForTab(tab);
+    return null;
   },
 
   getUserAgentForWindow: function ua_getUserAgentForWindow(aWindow) {
     let tab = BrowserApp.getTabForWindow(aWindow.top);
-    if (tab)
+    if (tab) {
       return this.getUserAgentForTab(tab);
+    }
 
     return null;
   },
 
   getUserAgentForTab: function ua_getUserAgentForTab(aTab) {
     // Send desktop UA if "Request Desktop Site" is enabled.
-    if (aTab.desktopMode)
+    if (aTab.desktopMode) {
       return this.DESKTOP_UA;
+    }
 
     return null;
   },
@@ -3026,8 +3020,9 @@
     if (aTopic === "DesktopMode:Change") {
       let args = JSON.parse(aData);
       let tab = BrowserApp.getTabForId(args.tabId);
-      if (tab != null)
+      if (tab) {
         tab.reloadWithMode(args.desktopMode);
+      }
     }
   }
 };
@@ -3161,8 +3156,6 @@
   this._fixedMarginTop = 0;
   this._fixedMarginRight = 0;
   this._fixedMarginBottom = 0;
-  this._readerEnabled = false;
-  this._readerActive = false;
   this.userScrollPos = { x: 0, y: 0 };
   this.viewportExcludesHorizontalMargins = true;
   this.viewportExcludesVerticalMargins = true;
@@ -3597,7 +3590,6 @@
                                           displayPortMargins.top,
                                           displayPortMargins.right,
                                           displayPortMargins.bottom,
-                                          BrowserApp.layersTileWidth, BrowserApp.layersTileHeight,
                                           element, 0);
     }
     this._oldDisplayPortMargins = displayPortMargins;
@@ -3920,6 +3912,8 @@
           if (contentDocument.body) {
             new AboutReader(contentDocument, this.browser.contentWindow);
           }
+          // Update the page action to show the "reader active" icon.
+          Reader.updatePageAction(this);
         }
 
         break;
@@ -4223,21 +4217,15 @@
           this.tilesData = null;
         }
 
-        if (!Reader.isEnabledForParseOnLoad) {
+        // Don't try to parse the document if reader mode is disabled,
+        // or if the page is already in reader mode.
+        if (!Reader.isEnabledForParseOnLoad || this.readerActive) {
           return;
         }
 
-        let resetReaderFlags = currentURL => {
-          // Don't clear the article for about:reader pages since we want to
-          // use the article from the previous page.
-          if (!currentURL.startsWith("about:reader")) {
-            this.savedArticle = null;
-            this.readerEnabled = false;
-            this.readerActive = false;
-          } else {
-            this.readerActive = true;
-          }
-        };
+        // Reader mode is disabled until proven enabled.
+        this.savedArticle = null;
+        Reader.updatePageAction(this);
 
         // Once document is fully loaded, parse it
         Reader.parseDocumentFromTab(this).then(article => {
@@ -4247,27 +4235,17 @@
 
           // Do nothing if there's no article or the page in this tab has changed.
           if (article == null || (article.url != currentURL)) {
-            resetReaderFlags(currentURL);
             return;
           }
 
           this.savedArticle = article;
+          Reader.updatePageAction(this);
 
           Messaging.sendRequest({
             type: "Content:ReaderEnabled",
             tabID: this.id
           });
-
-          if (this.readerActive) {
-            this.readerActive = false;
-          }
-          if (!this.readerEnabled) {
-            this.readerEnabled = true;
-          }
-        }).catch(e => {
-          Cu.reportError("Error parsing document from tab: " + e);
-          resetReaderFlags(this.browser.currentURI.specIgnoringRef);
-        });
+        }).catch(e => Cu.reportError("Error parsing document from tab: " + e));
       }
     }
   },
@@ -4812,24 +4790,8 @@
     }
   },
 
-  set readerEnabled(isReaderEnabled) {
-    this._readerEnabled = isReaderEnabled;
-    if (this.getActive())
-      Reader.updatePageAction(this);
-  },
-
-  get readerEnabled() {
-    return this._readerEnabled;
-  },
-
-  set readerActive(isReaderActive) {
-    this._readerActive = isReaderActive;
-    if (this.getActive())
-      Reader.updatePageAction(this);
-  },
-
   get readerActive() {
-    return this._readerActive;
+    return this.browser.currentURI.spec.startsWith("about:reader");
   },
 
   // nsIBrowserTab
@@ -5220,7 +5182,7 @@
     let win = BrowserApp.selectedBrowser.contentWindow;
     try {
       let cwu = win.top.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
-      cwu.sendMouseEventToWindow(aName, aX, aY, 0, 1, 0, true, 0, Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH);
+      cwu.sendMouseEventToWindow(aName, aX, aY, 0, 1, 0, true, 0, Ci.nsIDOMMouseEvent.MOZ_SOURCE_TOUCH, false);
     } catch(e) {
       Cu.reportError(e);
     }
@@ -6920,7 +6882,7 @@
   PREF_SUGGEST_PROMPTED: "browser.search.suggest.prompted",
 
   // Shared preference key used for search activity default engine.
-  PREF_SEARCH_ACTIVITY_ENGINE_KEY: "search.engines.default",
+  PREF_SEARCH_ACTIVITY_ENGINE_KEY: "search.engines.defaultname",
 
   init: function init() {
     Services.obs.addObserver(this, "SearchEngines:Add", false);
@@ -7060,34 +7022,7 @@
 
   // Updates the search activity pref when the default engine changes.
   _setSearchActivityDefaultPref: function _setSearchActivityDefaultPref(engine) {
-    // Helper function copied from nsSearchService.js. This is the logic that is used
-    // to create file names for search plugin XML serialized to disk.
-    function sanitizeName(aName) {
-      const maxLength = 60;
-      const minLength = 1;
-      let name = aName.toLowerCase();
-      name = name.replace(/\s+/g, "-");
-      name = name.replace(/[^-a-z0-9]/g, "");
-
-      if (name.length < minLength) {
-        // Well, in this case, we're kinda screwed. In this case, the search service
-        // generates a random file name, so to do this the right way, we'd need
-        // to open up search.json and see what file name is stored.
-        Cu.reportError("Couldn't create search plugin file name from engine name: " + aName);
-        return null;
-      }
-
-      // Force max length.
-      return name.substring(0, maxLength);
-    }
-
-    let identifier = engine.identifier;
-    if (identifier === null) {
-      // The identifier will be null for non-built-in engines. In this case, we need to
-      // figure out an identifier to store from the engine name.
-      identifier = sanitizeName(engine.name);
-    }
-    SharedPreferences.forApp().setCharPref(this.PREF_SEARCH_ACTIVITY_ENGINE_KEY, identifier);
+    SharedPreferences.forApp().setCharPref(this.PREF_SEARCH_ACTIVITY_ENGINE_KEY, engine.name);
   },
 
   // Display context menu listing names of the search engines available to be added.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/netError.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/netError.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/netError.xhtml	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/netError.xhtml	2014-11-26 21:46:02.000000000 +0000
@@ -154,8 +154,8 @@
           document.getElementById("errorTryAgain").style.display = "none";
         }
 
-        if (err == "cspFrameAncestorBlocked") {
-          // Remove the "Try again" button for CSP frame ancestors violation, since it's
+        if (err == "cspBlocked") {
+          // Remove the "Try again" button for CSP violations, since it's
           // almost certainly useless. (Bug 553180)
           document.getElementById("errorTryAgain").style.display = "none";
         }
@@ -293,7 +293,7 @@
         <h1 id="et_unsafeContentType">&unsafeContentType.title;</h1>
         <h1 id="et_nssFailure2">&nssFailure2.title;</h1>
         <h1 id="et_nssBadCert">&nssBadCert.title;</h1>
-        <h1 id="et_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.title;</h1>
+        <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
       </div>
@@ -322,7 +322,7 @@
         <div id="ed_unsafeContentType">&unsafeContentType.longDesc;</div>
         <div id="ed_nssFailure2">&nssFailure2.longDesc2;</div>
         <div id="ed_nssBadCert">&nssBadCert.longDesc2;</div>
-        <div id="ed_cspFrameAncestorBlocked">&cspFrameAncestorBlocked.longDesc;</div>
+        <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
       </div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/Readability.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/Readability.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/Readability.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/Readability.js	2014-11-26 21:46:02.000000000 +0000
@@ -199,7 +199,7 @@
     // 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 === null) {
+    if (!doc.body) {
       let body = doc.createElement("body");
 
       try {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/Reader.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/Reader.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/chrome/content/Reader.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/chrome/content/Reader.js	2014-11-26 21:46:02.000000000 +0000
@@ -43,6 +43,10 @@
   },
 
   updatePageAction: function(tab) {
+    if (!tab.getActive()) {
+      return;
+    }
+
     if (this.pageAction.id) {
       PageActions.remove(this.pageAction.id);
       delete this.pageAction.id;
@@ -65,7 +69,7 @@
     // Only stop a reader session if the foreground viewer is not visible.
     UITelemetry.stopSession("reader.1", "", null);
 
-    if (tab.readerEnabled) {
+    if (tab.savedArticle) {
       this.pageAction.id = PageActions.add({
         title: Strings.browser.GetStringFromName("readerMode.enter"),
         icon: "drawable://reader",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/components/build/nsAndroidHistory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/components/build/nsAndroidHistory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/components/build/nsAndroidHistory.cpp	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/components/build/nsAndroidHistory.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -4,12 +4,13 @@
 
 #include "nsThreadUtils.h"
 #include "nsAndroidHistory.h"
+#include "nsComponentManagerUtils.h"
 #include "AndroidBridge.h"
 #include "Link.h"
 #include "nsIURI.h"
-#include "mozilla/Services.h"
 #include "nsIObserverService.h"
 
+#include "mozilla/Services.h"
 #include "mozilla/Preferences.h"
 
 #define NS_LINK_VISITED_EVENT_TOPIC "link-visited"
@@ -18,10 +19,13 @@
 // Note that we don't yet observe this pref at runtime.
 #define PREF_HISTORY_ENABLED "places.history.enabled"
 
+// Time we wait to see if a pending visit is really a redirect
+#define PENDING_REDIRECT_TIMEOUT 3000
+
 using namespace mozilla;
 using mozilla::dom::Link;
 
-NS_IMPL_ISUPPORTS(nsAndroidHistory, IHistory, nsIRunnable)
+NS_IMPL_ISUPPORTS(nsAndroidHistory, IHistory, nsIRunnable, nsITimerCallback)
 
 nsAndroidHistory* nsAndroidHistory::sHistory = nullptr;
 
@@ -42,6 +46,8 @@
   : mHistoryEnabled(true)
 {
   LoadPrefs();
+
+  mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
 }
 
 NS_IMETHODIMP
@@ -158,11 +164,69 @@
   return equals;
 }
 
+inline bool
+nsAndroidHistory::RemovePendingVisitURI(nsIURI* aURI) {
+  // Remove the first pending URI that matches. Return a boolean to
+  // let the caller know if we removed a URI or not.
+  bool equals = false;
+  PendingVisitArray::index_type i;
+  for (i = 0; i < mPendingVisitURIs.Length(); ++i) {
+    aURI->Equals(mPendingVisitURIs.ElementAt(i), &equals);
+    if (equals) {
+      mPendingVisitURIs.RemoveElementAt(i);
+      return true;
+    }
+  }
+  return false;
+}
+
+NS_IMETHODIMP
+nsAndroidHistory::Notify(nsITimer *timer)
+{
+  // Any pending visits left in the queue have exceeded our threshold for
+  // redirects, so save them
+  PendingVisitArray::index_type i;
+  for (i = 0; i < mPendingVisitURIs.Length(); ++i) {
+    SaveVisitURI(mPendingVisitURIs.ElementAt(i));
+  }
+  mPendingVisitURIs.Clear();
+
+  return NS_OK;
+}
+
+void
+nsAndroidHistory::SaveVisitURI(nsIURI* aURI) {
+  // Add the URI to our cache so we can take a fast path later
+  AppendToRecentlyVisitedURIs(aURI);
+
+  if (AndroidBridge::HasEnv()) {
+    // Save this URI in our history
+    nsAutoCString spec;
+    (void)aURI->GetSpec(spec);
+    mozilla::widget::android::GeckoAppShell::MarkURIVisited(NS_ConvertUTF8toUTF16(spec));
+  }
+
+  // Finally, notify that we've been visited.
+  nsCOMPtr<nsIObserverService> obsService = mozilla::services::GetObserverService();
+  if (obsService) {
+    obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nullptr);
+  }
+}
+
 NS_IMETHODIMP
 nsAndroidHistory::VisitURI(nsIURI *aURI, nsIURI *aLastVisitedURI, uint32_t aFlags)
 {
-  if (!aURI)
+  if (!aURI) {
     return NS_OK;
+  }
+
+  if (!(aFlags & VisitFlags::TOP_LEVEL)) {
+    return NS_OK;
+  }
+
+  if (aFlags & VisitFlags::UNRECOVERABLE_ERROR) {
+    return NS_OK;
+  }
 
   // Silently return if URI is something we shouldn't add to DB.
   bool canAdd;
@@ -173,6 +237,15 @@
   }
 
   if (aLastVisitedURI) {
+    if (aFlags & VisitFlags::REDIRECT_SOURCE ||
+        aFlags & VisitFlags::REDIRECT_PERMANENT ||
+        aFlags & VisitFlags::REDIRECT_TEMPORARY) {
+      // aLastVisitedURI redirected to aURI. We want to ignore aLastVisitedURI,
+      // so remove the pending visit. We want to give aURI a chance to be saved,
+      // so don't return early.
+      RemovePendingVisitURI(aLastVisitedURI);
+    }
+
     bool same;
     rv = aURI->Equals(aLastVisitedURI, &same);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -180,35 +253,17 @@
       // Do not save refresh visits if we have visited this URI recently.
       return NS_OK;
     }
-  }
-
-  if (!(aFlags & VisitFlags::TOP_LEVEL)) {
-    AppendToEmbedURIs(aURI);
-    return NS_OK;
-  }
 
-  if (aFlags & VisitFlags::REDIRECT_SOURCE)
-    return NS_OK;
-
-  if (aFlags & VisitFlags::UNRECOVERABLE_ERROR)
-    return NS_OK;
-
-  if (AndroidBridge::HasEnv()) {
-    nsAutoCString uri;
-    rv = aURI->GetSpec(uri);
-    if (NS_FAILED(rv)) return rv;
-    NS_ConvertUTF8toUTF16 uriString(uri);
-    mozilla::widget::android::GeckoAppShell::MarkURIVisited(uriString);
+    // Since we have a last visited URI and we were not redirected, it is
+    // safe to save the visit if it's still pending.
+    if (RemovePendingVisitURI(aLastVisitedURI)) {
+      SaveVisitURI(aLastVisitedURI);
+    }
   }
 
-  AppendToRecentlyVisitedURIs(aURI);
-
-  // Finally, notify that we've been visited.
-  nsCOMPtr<nsIObserverService> obsService =
-    mozilla::services::GetObserverService();
-  if (obsService) {
-    obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nullptr);
-  }
+  // Let's wait and see if this visit is not a redirect.
+  mPendingVisitURIs.AppendElement(aURI);
+  mTimer->InitWithCallback(this, PENDING_REDIRECT_TIMEOUT, nsITimer::TYPE_ONE_SHOT);
 
   return NS_OK;
 }
@@ -244,7 +299,7 @@
   if (aURI && sHistory) {
     nsAutoCString spec;
     (void)aURI->GetSpec(spec);
-    sHistory->mPendingURIs.Push(NS_ConvertUTF8toUTF16(spec));
+    sHistory->mPendingLinkURIs.Push(NS_ConvertUTF8toUTF16(spec));
     NS_DispatchToMainThread(sHistory);
   }
   return NS_OK;
@@ -253,8 +308,8 @@
 NS_IMETHODIMP
 nsAndroidHistory::Run()
 {
-  while (! mPendingURIs.IsEmpty()) {
-    nsString uriString = mPendingURIs.Pop();
+  while (! mPendingLinkURIs.IsEmpty()) {
+    nsString uriString = mPendingLinkURIs.Pop();
     nsTArray<Link*>* list = sHistory->mListeners.Get(uriString);
     if (list) {
       for (unsigned int i = 0; i < list->Length(); i++) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/components/build/nsAndroidHistory.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/components/build/nsAndroidHistory.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/components/build/nsAndroidHistory.h	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/components/build/nsAndroidHistory.h	2014-11-26 21:46:02.000000000 +0000
@@ -11,6 +11,8 @@
 #include "nsTPriorityQueue.h"
 #include "nsIRunnable.h"
 #include "nsIURI.h"
+#include "nsITimer.h"
+
 
 #define NS_ANDROIDHISTORY_CID \
     {0xCCAA4880, 0x44DD, 0x40A7, {0xA1, 0x3F, 0x61, 0x56, 0xFC, 0x88, 0x2C, 0x0B}}
@@ -21,12 +23,15 @@
 // Max size of History::mEmbedURIs
 #define EMBED_URI_SIZE 128
 
-class nsAndroidHistory MOZ_FINAL : public mozilla::IHistory, public nsIRunnable
+class nsAndroidHistory MOZ_FINAL : public mozilla::IHistory,
+                                   public nsIRunnable,
+                                   public nsITimerCallback
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_IHISTORY
   NS_DECL_NSIRUNNABLE
+  NS_DECL_NSITIMERCALLBACK
 
   /**
    * Obtains a pointer that has had AddRef called on it.  Used by the service
@@ -44,19 +49,33 @@
   // Will mimic the value of the places.history.enabled preference.
   bool mHistoryEnabled;
 
-  nsDataHashtable<nsStringHashKey, nsTArray<mozilla::dom::Link *> *> mListeners;
-  nsTPriorityQueue<nsString> mPendingURIs;
-
   void LoadPrefs();
   bool ShouldRecordHistory();
   nsresult CanAddURI(nsIURI* aURI, bool* canAdd);
 
   /**
+   * We need to manage data used to determine a:visited status.
+   */
+  nsDataHashtable<nsStringHashKey, nsTArray<mozilla::dom::Link *> *> mListeners;
+  nsTPriorityQueue<nsString> mPendingLinkURIs;
+
+  /**
+   * Redirection (temporary and permanent) flags are sent with the redirected
+   * URI, not the original URI. Since we want to ignore the original URI, we
+   * need to cache the pending visit and make sure it doesn't redirect.
+   */
+  nsRefPtr<nsITimer> mTimer;
+  typedef nsAutoTArray<nsCOMPtr<nsIURI>, RECENTLY_VISITED_URI_SIZE> PendingVisitArray;
+  PendingVisitArray mPendingVisitURIs;
+
+  bool RemovePendingVisitURI(nsIURI* aURI);
+  void SaveVisitURI(nsIURI* aURI);
+
+  /**
    * mRecentlyVisitedURIs remembers URIs which are recently added to the DB,
    * to avoid saving these locations repeatedly in a short period.
    */
-  typedef nsAutoTArray<nsCOMPtr<nsIURI>, RECENTLY_VISITED_URI_SIZE>
-          RecentlyVisitedArray;
+  typedef nsAutoTArray<nsCOMPtr<nsIURI>, RECENTLY_VISITED_URI_SIZE> RecentlyVisitedArray;
   RecentlyVisitedArray mRecentlyVisitedURIs;
   RecentlyVisitedArray::index_type mRecentlyVisitedURIsNextIndex;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android/nightly	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android/nightly	2014-11-26 21:46:02.000000000 +0000
@@ -1,7 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
 # Android
 ac_add_options --target=arm-linux-androideabi
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-api-10/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-api-10/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-api-10/nightly	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-api-10/nightly	2014-11-26 21:46:02.000000000 +0000
@@ -1,7 +1,6 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
 # Android
 ac_add_options --with-android-min-sdk=10
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/debug thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/debug
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/debug	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/debug	2014-11-26 21:46:02.000000000 +0000
@@ -7,7 +7,7 @@
 ac_add_options --with-android-min-sdk=9
 ac_add_options --with-android-max-sdk=9
 ac_add_options --enable-android-resource-constrained
-ac_add_options --disable-android-include-fonts
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --target=arm-linux-androideabi
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/nightly	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-api-9-constrained/nightly	2014-11-26 21:46:02.000000000 +0000
@@ -1,13 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
 # Android
 ac_add_options --with-android-min-sdk=9
 ac_add_options --with-android-max-sdk=9
 ac_add_options --enable-android-resource-constrained
-ac_add_options --disable-android-include-fonts
+export MOZ_DISABLE_GECKOVIEW=1
 
 ac_add_options --target=arm-linux-androideabi
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-x86/nightly thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-x86/nightly
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/android-x86/nightly	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/android-x86/nightly	2014-11-26 21:46:02.000000000 +0000
@@ -3,7 +3,6 @@
 ac_add_options --target=i386-linux-android
 
 ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/common thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/common
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/mozconfigs/common	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/mozconfigs/common	2014-11-26 21:46:02.000000000 +0000
@@ -15,7 +15,7 @@
 
 ANDROID_NDK_VERSION="r8e"
 ANDROID_NDK_VERSION_32BIT="r8c"
-ANDROID_SDK_VERSION="20"
+ANDROID_SDK_VERSION="21"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/proguard.cfg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/proguard.cfg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/proguard.cfg	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/proguard.cfg	2014-11-26 21:46:02.000000000 +0000
@@ -194,6 +194,14 @@
 
 -keep class **.R$*
 
+# Keep classes, and all their contents, compiled before mozglue.RobocopTarget.
+-keep class org.mozilla.gecko.AppConstants {
+    *;
+}
+-keep class org.mozilla.gecko.SysInfo {
+    *;
+}
+
 # Disable obfuscation because it makes exception stack traces more difficult to read.
 -dontobfuscate
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/tooltool-manifests/android/releng.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/tooltool-manifests/android/releng.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/tooltool-manifests/android/releng.manifest	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/tooltool-manifests/android/releng.manifest	2014-11-26 21:46:02.000000000 +0000
@@ -6,8 +6,8 @@
 "filename": "android-ndk.tar.bz2"
 },
 {
-"size": 207966812,
-"digest": "9f6d50e5e67e6a6784dea3b5573178a869b017d2d0c7588af9eb53fdd23c7d1bd6f775f07a9ad1510ba36bf1608d21baa4e26e92afe61e190429870a6371b97d",
+"size": 227988048,
+"digest": "c84db0abd1f4fda1bb38292ef561e211e1e6b99586764fd8cf0829fa4d0c6a605eb21e1eb5462465fcca64749d48e22ac1b13029e2623bbdfe103801f5ef1411",
 "algorithm": "sha512",
 "filename": "android-sdk.tar.xz"
 },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest	2014-11-26 21:46:02.000000000 +0000
@@ -6,8 +6,8 @@
 "filename": "android-ndk.tar.bz2"
 },
 {
-"size": 207966812,
-"digest": "9f6d50e5e67e6a6784dea3b5573178a869b017d2d0c7588af9eb53fdd23c7d1bd6f775f07a9ad1510ba36bf1608d21baa4e26e92afe61e190429870a6371b97d",
+"size": 227988048,
+"digest": "c84db0abd1f4fda1bb38292ef561e211e1e6b99586764fd8cf0829fa4d0c6a605eb21e1eb5462465fcca64749d48e22ac1b13029e2623bbdfe103801f5ef1411",
 "algorithm": "sha512",
 "filename": "android-sdk.tar.xz"
 },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/tooltool-manifests/android-x86/releng.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/config/tooltool-manifests/android-x86/releng.manifest	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/config/tooltool-manifests/android-x86/releng.manifest	2014-11-26 21:46:02.000000000 +0000
@@ -6,8 +6,8 @@
 "filename": "android-ndk.tar.bz2"
 },
 {
-"size": 207966812,
-"digest": "9f6d50e5e67e6a6784dea3b5573178a869b017d2d0c7588af9eb53fdd23c7d1bd6f775f07a9ad1510ba36bf1608d21baa4e26e92afe61e190429870a6371b97d",
+"size": 227988048,
+"digest": "c84db0abd1f4fda1bb38292ef561e211e1e6b99586764fd8cf0829fa4d0c6a605eb21e1eb5462465fcca64749d48e22ac1b13029e2623bbdfe103801f5ef1411",
 "algorithm": "sha512",
 "filename": "android-sdk.tar.xz"
 },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/confvars.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/confvars.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/confvars.sh	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/confvars.sh	2014-11-26 21:46:02.000000000 +0000
@@ -55,11 +55,6 @@
 # Enable UI for healthreporter
 MOZ_SERVICES_HEALTHREPORT=1
 
-# Wifi-AP/cell tower data reporting is enabled on non-release builds.
-if test ! "$RELEASE_BUILD"; then
-MOZ_DATA_REPORTING=1
-fi
-
 # Enable runtime locale switching.
 MOZ_LOCALE_SWITCHER=1
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/geckoview_library/local.properties.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/geckoview_library/local.properties.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/geckoview_library/local.properties.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/geckoview_library/local.properties.in	2014-11-26 21:46:02.000000000 +0000
@@ -8,4 +8,4 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=@ANDROID_SDK@/../../
+sdk.dir=@ANDROID_SDK_ROOT@
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/geckoview_library/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/geckoview_library/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/geckoview_library/Makefile.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/geckoview_library/Makefile.in	2014-11-26 21:46:02.000000000 +0000
@@ -10,13 +10,13 @@
   build.xml \
   $(NULL)
 
-PP_TARGETS = properties manifest project
-
-properties = local.properties.in
-project = project.properties.in
-manifest = AndroidManifest.xml.in
-
-GARBAGE = $(GECKOVIEW_LIBRARY_FILES) local.properties project.properties AndroidManifest.xml
+PP_TARGETS += gen
+gen := \
+  local.properties.in \
+  project.properties.in \
+  AndroidManifest.xml.in \
+  $(NULL)
+gen_FLAGS += -DANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT)
 
 GARBAGE_DIRS = \
   bin \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/gradle/local.properties.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/gradle/local.properties.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/gradle/local.properties.in	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/gradle/local.properties.in	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,2 @@
+#filter substitution
+sdk.dir=@ANDROID_SDK_ROOT@
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/gradle/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/gradle/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/gradle/Makefile.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/gradle/Makefile.in	2014-11-26 21:46:02.000000000 +0000
@@ -3,12 +3,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 gradle := \
+  local.properties.in \
   gradle.properties.in \
   $(NULL)
 
 gradle_PATH := $(CURDIR)
 gradle_FLAGS += -Dtopsrcdir=$(abspath $(topsrcdir))
 gradle_FLAGS += -Dtopobjdir=$(abspath $(DEPTH))
+gradle_FLAGS += -DANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT)
 gradle_KEEP_PATH := 1
 PP_TARGETS += gradle
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/mach_commands.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/mach_commands.py	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,36 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 __future__ import print_function, unicode_literals
+
+import argparse
+import logging
+import mozpack.path as mozpath
+
+from mozbuild.base import (
+    MachCommandBase,
+    MachCommandConditions as conditions,
+)
+
+from mach.decorators import (
+    CommandArgument,
+    CommandProvider,
+    Command,
+)
+
+
+@CommandProvider
+class MachCommands(MachCommandBase):
+    @Command('gradle', category='devenv',
+        description='Run gradle.',
+        conditions=[conditions.is_android])
+    @CommandArgument('args', nargs=argparse.REMAINDER)
+    def gradle(self, args):
+        # Avoid logging the command
+        self.log_manager.terminal_handler.setLevel(logging.CRITICAL)
+
+        return self.run_process(['./gradlew'] + args,
+            pass_thru=True, # Allow user to run gradle interactively.
+            ensure_exit_code=False, # Don't throw on non-zero exit code.
+            cwd=mozpath.join(self.topobjdir, 'mobile', 'android', 'gradle'))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/modules/Messaging.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/modules/Messaging.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/modules/Messaging.jsm	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/modules/Messaging.jsm	2014-11-26 21:46:02.000000000 +0000
@@ -143,24 +143,26 @@
     let wrapper = JSON.parse(aData);
     let listener = this._listeners[aTopic];
 
-    // A null response indicates an error. If an error occurs in the callback
-    // below, the response will remain null, and Java will fire onError for
-    // this request.
-    let response = null;
-
     try {
-      let result = yield listener(wrapper.data);
-      if (typeof result !== "object" || result === null) {
+      let response = yield listener(wrapper.data);
+      if (typeof response !== "object" || response === null) {
         throw new Error("Gecko request listener did not return an object");
       }
-      response = result;
+
+      Messaging.sendRequest({
+        type: "Gecko:Request" + wrapper.id,
+        response: response
+      });
     } catch (e) {
-      Cu.reportError(e);
-    }
+      Cu.reportError("Error in Messaging handler for " + aTopic + ": " + e);
 
-    Messaging.sendRequest({
-      type: "Gecko:Request" + wrapper.id,
-      response: response
-    });
+      Messaging.sendRequest({
+        type: "Gecko:Request" + wrapper.id,
+        error: {
+          message: e.message || (e && e.toString()),
+          stack: e.stack || Components.stack.formattedStack,
+        }
+      });
+    }
   })
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/Constants.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/Constants.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/Constants.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/Constants.java	2014-11-26 21:46:02.000000000 +0000
@@ -17,9 +17,4 @@
 public class Constants {
 
     public static final String ABOUT_BLANK = "about:blank";
-
-    // TODO: Localize this with region.properties (or a similar solution). See bug 1065306.
-    public static final String DEFAULT_ENGINE_IDENTIFIER = "yahoo";
-
-    public static final String PREF_SEARCH_ENGINE_KEY = "search.engines.default";
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngine.java	2014-11-26 21:46:02.000000000 +0000
@@ -52,7 +52,9 @@
                     "document.getElementsByTagName('head')[0].appendChild(tag);" +
                     "tag.innerText='%s'})();";
 
+    // The Gecko search identifier. This will be null for engines that don't ship with the locale.
     private final String identifier;
+
     private String shortName;
     private String iconURL;
 
@@ -189,7 +191,9 @@
     public String getInjectableJs() {
         final String css;
 
-        if (identifier.equals("bing")) {
+        if (identifier == null) {
+            css = "";
+        } else if (identifier.equals("bing")) {
             css = "#mHeader{display:none}#contentWrapper{margin-top:0}";
         } else if (identifier.equals("google")) {
             css = "#sfcnt,#top_nav{display:none}";
@@ -247,7 +251,7 @@
     public String resultsUriForQuery(String query) {
         final Uri resultsUri = getResultsUri();
         if (resultsUri == null) {
-            Log.e(LOG_TAG, "No results URL for search engine: " + identifier);
+            Log.e(LOG_TAG, "No results URL for search engine: " + shortName);
             return "";
         }
         final String template = Uri.decode(resultsUri.toString());
@@ -261,7 +265,7 @@
      */
     public String getSuggestionTemplate(String query) {
         if (suggestUri == null) {
-            Log.e(LOG_TAG, "No suggestions template for search engine: " + identifier);
+            Log.e(LOG_TAG, "No suggestions template for search engine: " + shortName);
             return "";
         }
         final String template = Uri.decode(suggestUri.toString());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java	2014-11-26 21:46:02.000000000 +0000
@@ -6,15 +6,21 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.BrowserLocaleManager;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.util.FileUtils;
 import org.mozilla.gecko.util.GeckoJarReader;
+import org.mozilla.gecko.util.RawResource;
+import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.distribution.Distribution;
 import org.mozilla.search.Constants;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -30,9 +36,16 @@
 import java.util.Locale;
 
 public class SearchEngineManager implements SharedPreferences.OnSharedPreferenceChangeListener {
-    private static final String LOG_TAG = "SearchEngineManager";
+    private static final String LOG_TAG = "GeckoSearchEngineManager";
+
+    // Gecko pref that defines the name of the default search engine.
+    private static final String PREF_GECKO_DEFAULT_ENGINE = "browser.search.defaultenginename";
+
+    // Key for shared preference that stores default engine name.
+    private static final String PREF_DEFAULT_ENGINE_KEY = "search.engines.defaultname";
 
     private Context context;
+    private Distribution distribution;
     private SearchEngineCallback changeCallback;
     private SearchEngine engine;
 
@@ -40,11 +53,19 @@
         public void execute(SearchEngine engine);
     }
 
-    public SearchEngineManager(Context context) {
+    public SearchEngineManager(Context context, Distribution distribution) {
         this.context = context;
+        this.distribution = distribution;
         GeckoSharedPrefs.forApp(context).registerOnSharedPreferenceChangeListener(this);
     }
 
+    /**
+     * Sets a callback to be called when the default engine changes.
+     *
+     * @param callback SearchEngineCallback to be called after the search engine
+     *                 changed. This will run on the UI thread.
+     *                 Note: callback may be called with null engine.
+     */
     public void setChangeCallback(SearchEngineCallback changeCallback) {
         this.changeCallback = changeCallback;
     }
@@ -60,80 +81,230 @@
         if (engine != null) {
             callback.execute(engine);
         } else {
-            getEngineFromPrefs(callback);
+            getDefaultEngine(callback);
         }
     }
 
     public void destroy() {
         GeckoSharedPrefs.forApp(context).unregisterOnSharedPreferenceChangeListener(this);
         context = null;
+        distribution = null;
         changeCallback = null;
         engine = null;
     }
 
+    private int ignorePreferenceChange = 0;
+
     @Override
     public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
-        if (!TextUtils.equals(Constants.PREF_SEARCH_ENGINE_KEY, key)) {
+        if (!TextUtils.equals(PREF_DEFAULT_ENGINE_KEY, key)) {
             return;
         }
-        getEngineFromPrefs(changeCallback);
+
+        if (ignorePreferenceChange > 0) {
+            ignorePreferenceChange--;
+            return;
+        }
+
+        getDefaultEngine(changeCallback);
     }
 
     /**
-     * Look up the current search engine in shared preferences.
-     * Creates a SearchEngine instance and caches it for use on the main thread.
+     * Runs a SearchEngineCallback on the main thread.
+     */
+    private void runCallback(final SearchEngine engine, final SearchEngineCallback callback) {
+        ThreadUtils.postToUiThread(new Runnable() {
+            @Override
+            public void run() {
+                // Cache engine for future calls to getEngine.
+                SearchEngineManager.this.engine = engine;
+                callback.execute(engine);
+            }
+        });
+    }
+
+    /**
+     * This method finds and creates the default search engine. It will first look for
+     * the default engine name, then create the engine from that name.
      *
-     * @param callback a SearchEngineCallback to be called after successfully looking
+     * To find the default engine name, we first look in shared preferences, then
+     * the distribution (if one exists), and finally fall back to the localized default.
+     *
+     * @param callback SearchEngineCallback to be called after successfully looking
      *                 up the search engine. This will run on the UI thread.
+     *                 Note: callback may be called with null engine.
      */
-    private void getEngineFromPrefs(final SearchEngineCallback callback) {
-        final AsyncTask<Void, Void, SearchEngine> task = new AsyncTask<Void, Void, SearchEngine>() {
+    private void getDefaultEngine(final SearchEngineCallback callback) {
+        // This runnable is posted to the background thread.
+        distribution.addOnDistributionReadyCallback(new Runnable() {
             @Override
-            protected SearchEngine doInBackground(Void... params) {
-                String identifier = GeckoSharedPrefs.forApp(context).getString(Constants.PREF_SEARCH_ENGINE_KEY, null);
-                if (!TextUtils.isEmpty(identifier)) {
-                    try {
-                        return createEngine(identifier);
-                    } catch (IllegalArgumentException e) {
-                        Log.e(LOG_TAG, "Exception creating search engine from pref. Falling back to default engine.", e);
+            public void run() {
+                // First look for a default name stored in shared preferences.
+                String name = GeckoSharedPrefs.forApp(context).getString(PREF_DEFAULT_ENGINE_KEY, null);
+
+                if (name != null) {
+                    Log.d(LOG_TAG, "Found default engine name in SharedPreferences: " + name);
+                } else {
+                    // First, look for the default search engine in a distribution.
+                    name = getDefaultEngineNameFromDistribution();
+                    if (name == null) {
+                        // Otherwise, get the default engine that we ship.
+                        name = getDefaultEngineNameFromLocale();
                     }
-                }
 
-                try {
-                    return createEngine(Constants.DEFAULT_ENGINE_IDENTIFIER);
-                } catch (IllegalArgumentException e) {
-                    Log.e(LOG_TAG, "Exception creating search engine from default identifier. " +
-                            "This will happen if the locale doesn't contain the default search plugin.", e);
+                    // Store the default engine name for the future.
+                    // Increment an 'ignore' counter so that this preference change
+                    // won'tcause getDefaultEngine to be called again.
+                    ignorePreferenceChange++;
+                    GeckoSharedPrefs.forApp(context)
+                                    .edit()
+                                    .putString(PREF_DEFAULT_ENGINE_KEY, name)
+                                    .apply();
                 }
 
-                return null;
+                final SearchEngine engine = createEngineFromName(name);
+                runCallback(engine, callback);
             }
+        });
+    }
 
-            @Override
-            protected void onPostExecute(SearchEngine engine) {
-                if (engine != null) {
-                    // Only touch engine on the main thread.
-                    SearchEngineManager.this.engine = engine;
-                    if (callback != null) {
-                        callback.execute(engine);
-                    }
+    /**
+     * Looks for a default search engine included in a distribution.
+     * This method must be called after the distribution is ready.
+     *
+     * @return search engine name.
+     */
+    private String getDefaultEngineNameFromDistribution() {
+        if (!distribution.exists()) {
+            return null;
+        }
+
+        final File prefFile = distribution.getDistributionFile("preferences.json");
+        if (prefFile == null) {
+            return null;
+        }
+
+        try {
+            final JSONObject all = new JSONObject(FileUtils.getFileContents(prefFile));
+
+            // First, check to see if there's a locale-specific override.
+            final String languageTag = BrowserLocaleManager.getLanguageTag(Locale.getDefault());
+            final String overridesKey = "LocalizablePreferences." + languageTag;
+            if (all.has(overridesKey)) {
+                final JSONObject overridePrefs = all.getJSONObject(overridesKey);
+                if (overridePrefs.has(PREF_GECKO_DEFAULT_ENGINE)) {
+                    Log.d(LOG_TAG, "Found default engine name in distribution LocalizablePreferences override.");
+                    return overridePrefs.getString(PREF_GECKO_DEFAULT_ENGINE);
                 }
             }
-        };
-        task.execute();
+
+            // Next, check to see if there's a non-override default pref.
+            if (all.has("LocalizablePreferences")) {
+                final JSONObject localizablePrefs = all.getJSONObject("LocalizablePreferences");
+                if (localizablePrefs.has(PREF_GECKO_DEFAULT_ENGINE)) {
+                    Log.d(LOG_TAG, "Found default engine name in distribution LocalizablePreferences.");
+                    return localizablePrefs.getString(PREF_GECKO_DEFAULT_ENGINE);
+                }
+            }
+        } catch (IOException e) {
+            Log.e(LOG_TAG, "Error getting search engine name from preferences.json", e);
+        } catch (JSONException e) {
+            Log.e(LOG_TAG, "Error parsing preferences.json", e);
+        }
+        return null;
     }
 
     /**
-     * Creates a list of SearchEngine instances from all available open search plugins.
-     * This method does disk I/O, call it from a background thread.
+     * Looks for the default search engine shipped in the locale.
      *
-     * @return List of SearchEngine instances
+     * @return search engine name.
      */
-    public List<SearchEngine> getAllEngines() {
-        // First try to read the engine list from the jar.
-        InputStream in = getInputStreamFromJar("list.txt");
+    private String getDefaultEngineNameFromLocale() {
+        try {
+            final JSONObject browsersearch = new JSONObject(RawResource.getAsString(context, R.raw.browsersearch));
+            if (browsersearch.has("default")) {
+                Log.d(LOG_TAG, "Found default engine name in browsersearch.json.");
+                return browsersearch.getString("default");
+            }
+        } catch (IOException e) {
+            Log.e(LOG_TAG, "Error getting search engine name from browsersearch.json", e);
+        } catch (JSONException e) {
+            Log.e(LOG_TAG, "Error parsing browsersearch.json", e);
+        }
+        return null;
+    }
+
+    /**
+     * Creates a SearchEngine instance from an engine name.
+     *
+     * To create the engine, we first try to find the search plugin in the distribution
+     * (if one exists), followed by the localized plugins we ship with the browser, and
+     * then finally third-party plugins that are installed in the profile directory.
+     *
+     * This method must be called after the distribution is ready.
+     *
+     * @param name The search engine name (e.g. "Google" or "Amazon.com")
+     * @return SearchEngine instance for name.
+     */
+    private SearchEngine createEngineFromName(String name) {
+        // First, look in the distribution.
+        SearchEngine engine = createEngineFromDistribution(name);
+
+        // Second, look in the jar for plugins shipped with the locale.
+        if (engine == null) {
+            engine = createEngineFromLocale(name);
+        }
 
-        final List<SearchEngine> list = new ArrayList<SearchEngine>();
+        // Finally, look in the profile for third-party plugins.
+        if (engine == null) {
+            engine = createEngineFromProfile(name);
+        }
+
+        if (engine == null) {
+            Log.e(LOG_TAG, "Could not create search engine from name: " + name);
+        }
+
+        return engine;
+    }
+
+    /**
+     * Creates a SearchEngine instance for a distribution search plugin.
+     *
+     * This method iterates through the distribution searchplugins directory,
+     * creating SearchEngine instances until it finds one with the right name.
+     *
+     * This method must be called after the distribution is ready.
+     *
+     * @param name Search engine name.
+     * @return SearchEngine instance for name.
+     */
+    private SearchEngine createEngineFromDistribution(String name) {
+        if (!distribution.exists()) {
+            return null;
+        }
+
+        final File pluginsDir = distribution.getDistributionFile("searchplugins");
+        if (pluginsDir == null) {
+            return null;
+        }
+
+        final File[] files = (new File(pluginsDir, "common")).listFiles();
+        return createEngineFromFileList(files, name);
+    }
+
+    /**
+     * Creates a SearchEngine instance for a search plugin shipped in the locale.
+     *
+     * This method reads the list of search plugin file names from list.txt, then
+     * iterates through the files, creating SearchEngine instances until it finds one
+     * with the right name. Unfortunately, we need to do this because there is no
+     * other way to map the search engine "name" to the file for the search plugin.
+     *
+     * @param name Search engine name.
+     * @return SearchEngine instance for name.
+     */
+    private SearchEngine createEngineFromLocale(String name) {
+        final InputStream in = getInputStreamFromSearchPluginsJar("list.txt");
         InputStreamReader isr = null;
 
         try {
@@ -141,10 +312,14 @@
             BufferedReader br = new BufferedReader(isr);
             String identifier;
             while ((identifier = br.readLine()) != null) {
-                list.add(createEngine(identifier));
+                final InputStream pluginIn = getInputStreamFromSearchPluginsJar(identifier + ".xml");
+                final SearchEngine engine = createEngineFromInputStream(identifier, pluginIn);
+                if (engine != null && engine.getName().equals(name)) {
+                    return engine;
+                }
             }
         } catch (IOException e) {
-            throw new IllegalStateException("Error creating all search engines from list.txt");
+            Log.e(LOG_TAG, "Error creating shipped search engine from name: " + name, e);
         } finally {
             if (isr != null) {
                 try {
@@ -159,27 +334,62 @@
                 // Ignore.
             }
         }
-        return list;
+        return null;
     }
 
     /**
-     * Creates a SearchEngine instance from an open search plugin.
-     * This method does disk I/O, call it from a background thread.
+     * Creates a SearchEngine instance for a search plugin in the profile directory.
+     *
+     * This method iterates through the profile searchplugins directory, creating
+     * SearchEngine instances until it finds one with the right name.
      *
-     * @param identifier search engine identifier (e.g. "google")
-     * @return SearchEngine instance for identifier
+     * @param name Search engine name.
+     * @return SearchEngine instance for name.
      */
-    private SearchEngine createEngine(String identifier) {
-        InputStream in = getInputStreamFromJar(identifier + ".xml");
-
-        if (in == null) {
-            in = getEngineFromProfile(identifier);
+    private SearchEngine createEngineFromProfile(String name) {
+        final File pluginsDir = GeckoProfile.get(context).getFile("searchplugins");
+        if (pluginsDir == null) {
+            return null;
         }
 
-        if (in == null) {
-            throw new IllegalArgumentException("Couldn't find search engine for identifier: " + identifier);
+        final File[] files = pluginsDir.listFiles();
+        return createEngineFromFileList(files, name);
+    }
+
+    /**
+     * This method iterates through an array of search plugin files, creating
+     * SearchEngine instances until it finds one with the right name.
+     *
+     * @param files Array of search plugin files.
+     * @param name Search engine name.
+     * @return SearchEngine instance for name.
+     */
+    private SearchEngine createEngineFromFileList(File[] files, String name) {
+        for (int i = 0; i < files.length; i++) {
+            try {
+                final FileInputStream fis = new FileInputStream(files[i]);
+                final SearchEngine engine = createEngineFromInputStream(null, fis);
+                if (engine != null && engine.getName().equals(name)) {
+                    return engine;
+                }
+            } catch (IOException e) {
+                Log.e(LOG_TAG, "Error creating earch engine from name: " + name, e);
+            }
         }
+        return null;
+    }
 
+    /**
+     * Creates a SearchEngine instance from an InputStream.
+     *
+     * This method closes the stream after it is done reading it.
+     *
+     * @param identifier Seach engine identifier. This only exists for search engines that
+     *                   ship with the default set of engines in the locale.
+     * @param in InputStream for search plugin XML file.
+     * @return SearchEngine instance.
+     */
+    private SearchEngine createEngineFromInputStream(String identifier, InputStream in) {
         try {
             try {
                 return new SearchEngine(identifier, in);
@@ -194,13 +404,12 @@
     }
 
     /**
-     * Reads a file from the searchplugins directory in the Gecko jar. This will only work
-     * if the search activity is built as part of mozilla-central.
+     * Reads a file from the searchplugins directory in the Gecko jar.
      *
-     * @param fileName name of the file to read
-     * @return InputStream for file
+     * @param fileName name of the file to read.
+     * @return InputStream for file.
      */
-    private InputStream getInputStreamFromJar(String fileName) {
+    private InputStream getInputStreamFromSearchPluginsJar(String fileName) {
         final Locale locale = Locale.getDefault();
 
         // First, try a file path for the full locale.
@@ -228,32 +437,14 @@
     }
 
     /**
-     * Gets the jar URL for a file in the searchplugins directory
+     * Gets the jar URL for a file in the searchplugins directory.
      *
-     * @param locale String representing the Gecko locale (e.g. "en-US")
-     * @param fileName name of the file to read
-     * @return URL for jar file
+     * @param locale String representing the Gecko locale (e.g. "en-US").
+     * @param fileName The name of the file to read.
+     * @return URL for jar file.
      */
     private String getSearchPluginsJarURL(String locale, String fileName) {
         final String path = "!/chrome/" + locale + "/locale/" + locale + "/browser/searchplugins/" + fileName;
         return "jar:jar:file://" + context.getPackageResourcePath() + "!/" + AppConstants.OMNIJAR_NAME + path;
     }
-
-    /**
-     * Opens the search plugin XML file from the searchplugins directory in the Gecko profile.
-     *
-     * @param identifier
-     * @return InputStream for search plugin file
-     */
-    private InputStream getEngineFromProfile(String identifier) {
-        final File f = GeckoProfile.get(context).getFile("searchplugins/" + identifier + ".xml");
-        if (f.exists()) {
-            try {
-                return new FileInputStream(f);
-            } catch (FileNotFoundException e) {
-                Log.e(LOG_TAG, "Exception getting search engine from profile", e);
-            }
-        }
-        return null;
-    }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/SearchActivity.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/SearchActivity.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/SearchActivity.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/SearchActivity.java	2014-11-26 21:46:02.000000000 +0000
@@ -10,6 +10,7 @@
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.db.BrowserContract.SearchHistory;
+import org.mozilla.gecko.distribution.Distribution;
 import org.mozilla.gecko.health.BrowserHealthRecorder;
 import org.mozilla.search.autocomplete.SearchBar;
 import org.mozilla.search.autocomplete.SuggestionsFragment;
@@ -101,7 +102,7 @@
         suggestionsFragment = (SuggestionsFragment) getSupportFragmentManager().findFragmentById(R.id.suggestions);
         postSearchFragment = (PostSearchFragment)  getSupportFragmentManager().findFragmentById(R.id.postsearch);
 
-        searchEngineManager = new SearchEngineManager(this);
+        searchEngineManager = new SearchEngineManager(this, Distribution.init(this));
         searchEngineManager.setChangeCallback(this);
 
         // Initialize the fragments with the selected search engine.
@@ -279,7 +280,10 @@
         searchEngineManager.getEngine(new SearchEngineCallback() {
             @Override
             public void execute(SearchEngine engine) {
-                postSearchFragment.startSearch(engine, query);
+                // TODO: If engine is null, we should show an error message.
+                if (engine != null) {
+                    postSearchFragment.startSearch(engine, query);
+                }
             }
         });
     }
@@ -293,6 +297,10 @@
      */
     @Override
     public void execute(SearchEngine engine) {
+        // TODO: If engine is null, we should show an error message.
+        if (engine == null) {
+            return;
+        }
         this.engine = engine;
         suggestionsFragment.setEngine(engine);
         searchBar.setEngine(engine);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/search/java/org/mozilla/search/SearchPreferenceActivity.java	2014-11-26 21:46:02.000000000 +0000
@@ -19,6 +19,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 /**
@@ -105,4 +106,13 @@
         };
         clearHistoryTask.execute();
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return false;
+    }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/services/strings.xml.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/services/strings.xml.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/services/strings.xml.in	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/services/strings.xml.in	2014-11-26 21:46:02.000000000 +0000
@@ -175,6 +175,9 @@
 <string name="fxaccount_status_header">&fxaccount_status_header2;</string>
 <string name="fxaccount_status_signed_in_as">&fxaccount_status_signed_in_as;</string>
 <string name="fxaccount_status_auth_server">&fxaccount_status_auth_server;</string>
+<string name="fxaccount_status_sync_now">&fxaccount_status_sync_now;</string>
+<string name="fxaccount_status_syncing">&fxaccount_status_syncing2;</string>
+<string name="fxaccount_status_last_synced">&remote_tabs_last_synced;</string>
 <string name="fxaccount_status_device_name">&fxaccount_status_device_name;</string>
 <string name="fxaccount_status_sync_server">&fxaccount_status_sync_server;</string>
 <string name="fxaccount_status_sync">&fxaccount_status_sync;</string>
@@ -216,6 +219,3 @@
 <string name="fxaccount_remove_account_dialog_message">&fxaccount_remove_account_dialog_message;</string>
 <string name="fxaccount_remove_account_toast">&fxaccount_remove_account_toast;</string>
 <string name="fxaccount_remove_account_menu_item">&fxaccount_remove_account_menu_item;</string>
-
-<!-- Find-In-Page strings -->
-<string name="find_matchcase">&find_matchcase;</string>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/DataStorageManager.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/DataStorageManager.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/DataStorageManager.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/DataStorageManager.java	2014-11-26 21:46:02.000000000 +0000
@@ -424,8 +424,8 @@
         }
 
         mCurrentReports.reports.add(report);
-        mCurrentReports.wifiCount = wifiCount;
-        mCurrentReports.cellCount = cellCount;
+        mCurrentReports.wifiCount += wifiCount;
+        mCurrentReports.cellCount += cellCount;
 
         if (mCurrentReports.reports.size() >= MAX_REPORTS_IN_MEMORY) {
             // save to disk
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/Reporter.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/Reporter.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/Reporter.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/Reporter.java	2014-11-26 21:46:02.000000000 +0000
@@ -32,6 +32,7 @@
 public final class Reporter extends BroadcastReceiver {
     private static final String LOG_TAG = AppGlobals.makeLogTag(Reporter.class.getSimpleName());
     public static final String ACTION_FLUSH_TO_BUNDLE = AppGlobals.ACTION_NAMESPACE + ".FLUSH";
+    public static final String ACTION_NEW_BUNDLE = AppGlobals.ACTION_NAMESPACE + ".NEW_BUNDLE";
     private boolean mIsStarted;
 
     /* The maximum number of Wi-Fi access points in a single observation. */
@@ -62,7 +63,12 @@
 
         mContext = context.getApplicationContext();
         TelephonyManager tm = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
-        mPhoneType = tm.getPhoneType();
+        if (tm != null) {
+            mPhoneType = tm.getPhoneType();
+        } else {
+            Log.d(LOG_TAG, "No telephony manager.");
+            mPhoneType = TelephonyManager.PHONE_TYPE_NONE;
+        }
 
         mIsStarted = true;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerImplementation.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerImplementation.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerImplementation.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerImplementation.java	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,293 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.mozstumbler.service.stumblerthread.scanners.cellscanner;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.telephony.CellIdentityCdma;
+import android.telephony.CellIdentityGsm;
+import android.telephony.CellIdentityLte;
+import android.telephony.CellIdentityWcdma;
+import android.telephony.CellInfoCdma;
+import android.telephony.CellInfoGsm;
+import android.telephony.CellInfoLte;
+import android.telephony.CellInfoWcdma;
+import android.telephony.CellLocation;
+import android.telephony.CellSignalStrengthCdma;
+import android.telephony.CellSignalStrengthGsm;
+import android.telephony.CellSignalStrengthLte;
+import android.telephony.CellSignalStrengthWcdma;
+import android.telephony.NeighboringCellInfo;
+import android.telephony.PhoneStateListener;
+import android.telephony.SignalStrength;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import org.mozilla.mozstumbler.service.AppGlobals;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class CellScannerImplementation implements CellScanner.CellScannerImpl {
+
+    protected static String LOG_TAG = AppGlobals.makeLogTag(CellScannerImplementation.class.getSimpleName());
+    protected GetAllCellInfoScannerImpl mGetAllInfoCellScanner;
+    protected TelephonyManager mTelephonyManager;
+    protected boolean mIsStarted;
+    protected int mPhoneType;
+    protected final Context mContext;
+
+    protected volatile int mSignalStrength = CellInfo.UNKNOWN_SIGNAL;
+    protected volatile int mCdmaDbm = CellInfo.UNKNOWN_SIGNAL;
+
+    private PhoneStateListener mPhoneStateListener;
+
+    private static class GetAllCellInfoScannerDummy implements GetAllCellInfoScannerImpl {
+        @Override
+        public List<CellInfo> getAllCellInfo(TelephonyManager tm) {
+            return Collections.emptyList();
+        }
+    }
+
+    interface GetAllCellInfoScannerImpl {
+        List<CellInfo> getAllCellInfo(TelephonyManager tm);
+    }
+
+    public CellScannerImplementation(Context context) {
+        mContext = context;
+    }
+
+    public boolean isSupportedOnThisDevice() {
+        TelephonyManager telephonyManager = mTelephonyManager;
+        if (telephonyManager == null) {
+            telephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+        }
+        return telephonyManager != null &&
+                (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA ||
+                 telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM);
+    }
+
+    @Override
+    public synchronized boolean isStarted() {
+        return mIsStarted;
+    }
+
+    @Override
+    public synchronized void start() {
+        if (mIsStarted || !isSupportedOnThisDevice()) {
+            return;
+        }
+        mIsStarted = true;
+
+        if (mTelephonyManager == null) {
+            if (Build.VERSION.SDK_INT >= 18 /*Build.VERSION_CODES.JELLY_BEAN_MR2 */) { // Fennec: no Build.VERSION_CODES
+                mGetAllInfoCellScanner = new GetAllCellInfoScannerMr2();
+            } else {
+                mGetAllInfoCellScanner = new GetAllCellInfoScannerDummy();
+            }
+
+            mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+        }
+
+        mPhoneStateListener = new PhoneStateListener() {
+            @Override
+            public void onSignalStrengthsChanged(SignalStrength ss) {
+                if (ss.isGsm()) {
+                    mSignalStrength = ss.getGsmSignalStrength();
+                } else {
+                    mCdmaDbm = ss.getCdmaDbm();
+                }
+            }
+        };
+        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
+    }
+
+    @Override
+    public synchronized void stop() {
+        mIsStarted = false;
+        if (mTelephonyManager != null && mPhoneStateListener != null) {
+            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        }
+        mSignalStrength = CellInfo.UNKNOWN_SIGNAL;
+        mCdmaDbm = CellInfo.UNKNOWN_SIGNAL;
+    }
+
+    @Override
+    public synchronized List<CellInfo> getCellInfo() {
+        List<CellInfo> records = new ArrayList<CellInfo>();
+
+        List<CellInfo> allCells = mGetAllInfoCellScanner.getAllCellInfo(mTelephonyManager);
+        if (allCells.isEmpty()) {
+            CellInfo currentCell = getCurrentCellInfo();
+            if (currentCell == null) {
+                return records;
+            }
+            records.add(currentCell);
+        }else {
+            records.addAll(allCells);
+        }
+
+        // getNeighboringCells() sometimes contains more information than that is already
+        // in getAllCellInfo(). Use the results of both of them.
+        records.addAll(getNeighboringCells());
+        return records;
+    }
+
+    private String getNetworkOperator() {
+        String networkOperator = mTelephonyManager.getNetworkOperator();
+        // getNetworkOperator() may be unreliable on CDMA networks
+        if (networkOperator == null || networkOperator.length() <= 3) {
+            networkOperator = mTelephonyManager.getSimOperator();
+        }
+        return networkOperator;
+    }
+
+    protected CellInfo getCurrentCellInfo() {
+        final CellLocation currentCell = mTelephonyManager.getCellLocation();
+        if (currentCell == null) {
+            return null;
+        }
+
+        try {
+            final CellInfo info = new CellInfo(mPhoneType);
+            final int signalStrength = mSignalStrength;
+            final int cdmaDbm = mCdmaDbm;
+            info.setCellLocation(currentCell,
+                    mTelephonyManager.getNetworkType(),
+                    getNetworkOperator(),
+                    signalStrength == CellInfo.UNKNOWN_SIGNAL ? null : signalStrength,
+                    cdmaDbm == CellInfo.UNKNOWN_SIGNAL ? null : cdmaDbm);
+            return info;
+        } catch (IllegalArgumentException iae) {
+            Log.e(LOG_TAG, "Skip invalid or incomplete CellLocation: " + currentCell, iae);
+        }
+        return null;
+    }
+
+    private List<CellInfo> getNeighboringCells() {
+        Collection<NeighboringCellInfo> cells = mTelephonyManager.getNeighboringCellInfo();
+        if (cells == null || cells.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        String networkOperator = getNetworkOperator();
+        List<CellInfo> records = new ArrayList<CellInfo>(cells.size());
+        for (NeighboringCellInfo nci : cells) {
+            try {
+                final CellInfo record = new CellInfo(mPhoneType);
+                record.setNeighboringCellInfo(nci, networkOperator);
+                if (record.isCellRadioValid()) {
+                    records.add(record);
+                }
+            } catch (IllegalArgumentException iae) {
+                Log.e(LOG_TAG, "Skip invalid or incomplete NeighboringCellInfo: " + nci, iae);
+            }
+        }
+        return records;
+    }
+
+
+    @TargetApi(18)
+    protected boolean addWCDMACellToList(List<CellInfo> cells,
+                                         android.telephony.CellInfo observedCell,
+                                         TelephonyManager tm) {
+        boolean added = false;
+        if (Build.VERSION.SDK_INT >= 18 &&
+                observedCell instanceof CellInfoWcdma) {
+            CellIdentityWcdma ident = ((CellInfoWcdma) observedCell).getCellIdentity();
+            if (ident.getMnc() != Integer.MAX_VALUE && ident.getMcc() != Integer.MAX_VALUE) {
+                CellInfo cell = new CellInfo(tm.getPhoneType());
+                CellSignalStrengthWcdma strength = ((CellInfoWcdma) observedCell).getCellSignalStrength();
+                cell.setWcmdaCellInfo(ident.getMcc(),
+                        ident.getMnc(),
+                        ident.getLac(),
+                        ident.getCid(),
+                        ident.getPsc(),
+                        strength.getAsuLevel());
+                cells.add(cell);
+                added = true;
+            }
+        }
+        return added;
+    }
+
+    @TargetApi(18)
+    protected boolean addCellToList(List<CellInfo> cells,
+                                    android.telephony.CellInfo observedCell,
+                                    TelephonyManager tm) {
+        if (tm.getPhoneType() == 0) {
+            return false;
+        }
+
+        boolean added = false;
+        if (observedCell instanceof CellInfoGsm) {
+            CellIdentityGsm ident = ((CellInfoGsm) observedCell).getCellIdentity();
+            if (ident.getMcc() != Integer.MAX_VALUE && ident.getMnc() != Integer.MAX_VALUE) {
+                CellSignalStrengthGsm strength = ((CellInfoGsm) observedCell).getCellSignalStrength();
+                CellInfo cell = new CellInfo(tm.getPhoneType());
+                cell.setGsmCellInfo(ident.getMcc(),
+                        ident.getMnc(),
+                        ident.getLac(),
+                        ident.getCid(),
+                        strength.getAsuLevel());
+                cells.add(cell);
+                added = true;
+            }
+        } else if (observedCell instanceof CellInfoCdma) {
+            CellInfo cell = new CellInfo(tm.getPhoneType());
+            CellIdentityCdma ident = ((CellInfoCdma) observedCell).getCellIdentity();
+            CellSignalStrengthCdma strength = ((CellInfoCdma) observedCell).getCellSignalStrength();
+            cell.setCdmaCellInfo(ident.getBasestationId(),
+                    ident.getNetworkId(),
+                    ident.getSystemId(),
+                    strength.getDbm());
+            cells.add(cell);
+            added = true;
+        } else if (observedCell instanceof CellInfoLte) {
+            CellIdentityLte ident = ((CellInfoLte) observedCell).getCellIdentity();
+            if (ident.getMnc() != Integer.MAX_VALUE && ident.getMcc() != Integer.MAX_VALUE) {
+                CellInfo cell = new CellInfo(tm.getPhoneType());
+                CellSignalStrengthLte strength = ((CellInfoLte) observedCell).getCellSignalStrength();
+                cell.setLteCellInfo(ident.getMcc(),
+                        ident.getMnc(),
+                        ident.getCi(),
+                        ident.getPci(),
+                        ident.getTac(),
+                        strength.getAsuLevel(),
+                        strength.getTimingAdvance());
+                cells.add(cell);
+                added = true;
+            }
+        }
+
+        if (!added && Build.VERSION.SDK_INT >= 18) {
+            added = addWCDMACellToList(cells, observedCell, tm);
+        }
+
+        return added;
+    }
+
+    @TargetApi(18)
+    private class GetAllCellInfoScannerMr2 implements GetAllCellInfoScannerImpl {
+        @Override
+        public List<CellInfo> getAllCellInfo(TelephonyManager tm) {
+            final List<android.telephony.CellInfo> observed = tm.getAllCellInfo();
+            if (observed == null || observed.isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            List<CellInfo> cells = new ArrayList<CellInfo>(observed.size());
+            for (android.telephony.CellInfo observedCell : observed) {
+                if (!addCellToList(cells, observedCell, tm)) {
+                    //Log.i(LOG_TAG, "Skipped CellInfo of unknown class: " + observedCell.toString());
+                }
+            }
+            return cells;
+        }
+    }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScanner.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScanner.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScanner.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScanner.java	2014-11-26 21:46:02.000000000 +0000
@@ -4,21 +4,28 @@
 
 package org.mozilla.mozstumbler.service.stumblerthread.scanners.cellscanner;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v4.content.LocalBroadcastManager;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import org.mozilla.mozstumbler.service.AppGlobals;
+import org.mozilla.mozstumbler.service.AppGlobals.ActiveOrPassiveStumbling;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
-
-import org.mozilla.mozstumbler.service.AppGlobals;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.mozilla.mozstumbler.service.AppGlobals.ActiveOrPassiveStumbling;
-
+import org.mozilla.mozstumbler.service.stumblerthread.Reporter;
 
 public class CellScanner {
     public static final String ACTION_BASE = AppGlobals.ACTION_NAMESPACE + ".CellScanner.";
@@ -30,47 +37,30 @@
     private static final long CELL_MIN_UPDATE_TIME = 1000; // milliseconds
 
     private final Context mContext;
-    private static CellScannerImpl sImpl;
     private Timer mCellScanTimer;
     private final Set<String> mCells = new HashSet<String>();
-    private int mCurrentCellInfoCount;
+    private final ReportFlushedReceiver mReportFlushedReceiver = new ReportFlushedReceiver();
+    private final AtomicBoolean mReportWasFlushed = new AtomicBoolean();
+    private Handler mBroadcastScannedHandler;
+    private final CellScannerImpl mCellScannerImplementation;
 
     public ArrayList<CellInfo> sTestingModeCellInfoArray;
 
     public interface CellScannerImpl {
-        public void start();
-
-        public void stop();
-
-        public List<CellInfo> getCellInfo();
+        void start();
+        boolean isStarted();
+        boolean isSupportedOnThisDevice();
+        void stop();
+        List<CellInfo> getCellInfo();
     }
 
     public CellScanner(Context context) {
         mContext = context;
-    }
-
-    private static synchronized CellScannerImpl getImplementation() {
-        return sImpl;
-    }
-
-    public static synchronized boolean isCellScannerImplSet() {
-        return sImpl != null;
-    }
-
-    /* Fennec doesn't support the apis needed for full scanning, we have different implementations.*/
-    public static synchronized void setCellScannerImpl(CellScannerImpl cellScanner) {
-        sImpl = cellScanner;
+        mCellScannerImplementation = new CellScannerImplementation(context);
     }
 
     public void start(final ActiveOrPassiveStumbling stumblingMode) {
-        if (getImplementation() == null) {
-            return;
-        }
-
-        try {
-            getImplementation().start();
-        } catch (UnsupportedOperationException uoe) {
-            Log.e(LOG_TAG, "Cell scanner probe failed", uoe);
+        if (!mCellScannerImplementation.isSupportedOnThisDevice()) {
             return;
         }
 
@@ -78,58 +68,95 @@
             return;
         }
 
+        LocalBroadcastManager.getInstance(mContext).registerReceiver(mReportFlushedReceiver,
+                new IntentFilter(Reporter.ACTION_NEW_BUNDLE));
+
+        // This is to ensure the broadcast happens from the same thread the CellScanner start() is on
+        mBroadcastScannedHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                Intent intent = (Intent) msg.obj;
+                LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent);
+            }
+        };
+
+        mCellScannerImplementation.start();
+
         mCellScanTimer = new Timer();
 
         mCellScanTimer.schedule(new TimerTask() {
             int mPassiveScanCount;
             @Override
             public void run() {
-                if (getImplementation() == null) {
+                if (!mCellScannerImplementation.isStarted()) {
                     return;
                 }
 
                 if (stumblingMode == ActiveOrPassiveStumbling.PASSIVE_STUMBLING &&
-                        mPassiveScanCount++ > AppGlobals.PASSIVE_MODE_MAX_SCANS_PER_GPS)
+                    mPassiveScanCount++ > AppGlobals.PASSIVE_MODE_MAX_SCANS_PER_GPS)
                 {
                     mPassiveScanCount = 0;
                     stop();
                     return;
                 }
-                //if (SharedConstants.isDebug) Log.d(LOG_TAG, "Cell Scanning Timer fired");
+
                 final long curTime = System.currentTimeMillis();
 
                 ArrayList<CellInfo> cells = (sTestingModeCellInfoArray != null)? sTestingModeCellInfoArray :
-                        new ArrayList<CellInfo>(getImplementation().getCellInfo());
+                        new ArrayList<CellInfo>(mCellScannerImplementation.getCellInfo());
+
+                if (mReportWasFlushed.getAndSet(false)) {
+                    clearCells();
+                }
 
-                mCurrentCellInfoCount = cells.size();
                 if (cells.isEmpty()) {
                     return;
                 }
-                for (CellInfo cell: cells) mCells.add(cell.getCellIdentity());
+
+                for (CellInfo cell : cells) {
+                    addToCells(cell.getCellIdentity());
+                }
 
                 Intent intent = new Intent(ACTION_CELLS_SCANNED);
                 intent.putParcelableArrayListExtra(ACTION_CELLS_SCANNED_ARG_CELLS, cells);
                 intent.putExtra(ACTION_CELLS_SCANNED_ARG_TIME, curTime);
-                LocalBroadcastManager.getInstance(mContext).sendBroadcastSync(intent);
+                // send to handler, so broadcast is not from timer thread
+                Message message = new Message();
+                message.obj = intent;
+                mBroadcastScannedHandler.sendMessage(message);
+
             }
         }, 0, CELL_MIN_UPDATE_TIME);
     }
 
-    public void stop() {
+    private synchronized void clearCells() {
+        mCells.clear();
+    }
+
+    private synchronized void addToCells(String cell) {
+        mCells.add(cell);
+    }
+
+    public synchronized void stop() {
+        mReportWasFlushed.set(false);
+        clearCells();
+        LocalBroadcastManager.getInstance(mContext).unregisterReceiver(mReportFlushedReceiver);
+
         if (mCellScanTimer != null) {
             mCellScanTimer.cancel();
             mCellScanTimer = null;
         }
-        if (getImplementation() != null) {
-            getImplementation().stop();
-        }
+        mCellScannerImplementation.stop();
     }
 
-    public int getCellInfoCount() {
+    public synchronized int getCellInfoCount() {
         return mCells.size();
     }
 
-    public int getCurrentCellInfoCount() {
-        return mCurrentCellInfoCount;
+    private class ReportFlushedReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context c, Intent i) {
+            mReportWasFlushed.set(true);
+        }
     }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerNoWCDMA.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerNoWCDMA.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerNoWCDMA.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerNoWCDMA.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +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.mozstumbler.service.stumblerthread.scanners.cellscanner;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.telephony.CellIdentityCdma;
-import android.telephony.CellIdentityGsm;
-import android.telephony.CellIdentityLte;
-import android.telephony.CellInfoCdma;
-import android.telephony.CellInfoGsm;
-import android.telephony.CellInfoLte;
-import android.telephony.CellLocation;
-import android.telephony.CellSignalStrengthCdma;
-import android.telephony.CellSignalStrengthGsm;
-import android.telephony.CellSignalStrengthLte;
-import android.telephony.NeighboringCellInfo;
-import android.telephony.PhoneStateListener;
-import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-import org.mozilla.mozstumbler.service.AppGlobals;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/* Fennec does not yet support the api level for WCDMA import */
-public class CellScannerNoWCDMA implements CellScanner.CellScannerImpl {
-
-    protected static String LOG_TAG = AppGlobals.makeLogTag(CellScannerNoWCDMA.class.getSimpleName());
-    protected GetAllCellInfoScannerImpl mGetAllInfoCellScanner;
-    protected TelephonyManager mTelephonyManager;
-    protected boolean mIsStarted;
-    protected int mPhoneType;
-    protected final Context mContext;
-    protected volatile int mSignalStrength;
-    protected volatile int mCdmaDbm;
-
-    private PhoneStateListener mPhoneStateListener;
-
-    private static class GetAllCellInfoScannerDummy implements GetAllCellInfoScannerImpl {
-        @Override
-        public List<CellInfo> getAllCellInfo(TelephonyManager tm) {
-            return Collections.emptyList();
-        }
-    }
-
-    interface GetAllCellInfoScannerImpl {
-        List<CellInfo> getAllCellInfo(TelephonyManager tm);
-    }
-
-    public CellScannerNoWCDMA(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public void start() {
-        if (mIsStarted) {
-            return;
-        }
-        mIsStarted = true;
-
-        if (mTelephonyManager == null) {
-            if (Build.VERSION.SDK_INT >= 18 /*Build.VERSION_CODES.JELLY_BEAN_MR2 */) { // Fennec: no Build.VERSION_CODES
-                mGetAllInfoCellScanner = new GetAllCellInfoScannerMr2();
-            } else {
-                mGetAllInfoCellScanner = new GetAllCellInfoScannerDummy();
-            }
-
-            mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
-            if (mTelephonyManager == null) {
-                throw new UnsupportedOperationException("TelephonyManager service is not available");
-            }
-
-            mPhoneType = mTelephonyManager.getPhoneType();
-
-            if (mPhoneType != TelephonyManager.PHONE_TYPE_GSM
-                && mPhoneType != TelephonyManager.PHONE_TYPE_CDMA) {
-                throw new UnsupportedOperationException("Unexpected Phone Type: " + mPhoneType);
-            }
-            mSignalStrength = CellInfo.UNKNOWN_SIGNAL;
-            mCdmaDbm = CellInfo.UNKNOWN_SIGNAL;
-        }
-
-        mSignalStrength = CellInfo.UNKNOWN_SIGNAL;
-        mCdmaDbm = CellInfo.UNKNOWN_SIGNAL;
-
-        mPhoneStateListener = new PhoneStateListener() {
-            @Override
-            public void onSignalStrengthsChanged(SignalStrength ss) {
-                if (ss.isGsm()) {
-                    mSignalStrength = ss.getGsmSignalStrength();
-                } else {
-                    mCdmaDbm = ss.getCdmaDbm();
-                }
-            }
-        };
-        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
-    }
-
-    @Override
-    public void stop() {
-        mIsStarted = false;
-        if (mTelephonyManager != null) {
-            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-        }
-        mSignalStrength = CellInfo.UNKNOWN_SIGNAL;
-        mCdmaDbm = CellInfo.UNKNOWN_SIGNAL;
-    }
-
-    @Override
-    public List<CellInfo> getCellInfo() {
-        List<CellInfo> records = new ArrayList<CellInfo>();
-
-        List<CellInfo> allCells = mGetAllInfoCellScanner.getAllCellInfo(mTelephonyManager);
-        if (allCells.isEmpty()) {
-            CellInfo currentCell = getCurrentCellInfo();
-            if (currentCell == null) {
-                return records;
-            }
-            records.add(currentCell);
-        }else {
-            records.addAll(allCells);
-        }
-
-        // getNeighboringCells() sometimes contains more information than that is already
-        // in getAllCellInfo(). Use the results of both of them.
-        records.addAll(getNeighboringCells());
-        return records;
-    }
-
-    private String getNetworkOperator() {
-        String networkOperator = mTelephonyManager.getNetworkOperator();
-        // getNetworkOperator() may be unreliable on CDMA networks
-        if (networkOperator == null || networkOperator.length() <= 3) {
-            networkOperator = mTelephonyManager.getSimOperator();
-        }
-        return networkOperator;
-    }
-
-    protected CellInfo getCurrentCellInfo() {
-        final CellLocation currentCell = mTelephonyManager.getCellLocation();
-        if (currentCell == null) {
-            return null;
-        }
-
-        try {
-            final CellInfo info = new CellInfo(mPhoneType);
-            final int signalStrength = mSignalStrength;
-            final int cdmaDbm = mCdmaDbm;
-            info.setCellLocation(currentCell,
-                    mTelephonyManager.getNetworkType(),
-                    getNetworkOperator(),
-                    signalStrength == CellInfo.UNKNOWN_SIGNAL ? null : signalStrength,
-                    cdmaDbm == CellInfo.UNKNOWN_SIGNAL ? null : cdmaDbm);
-            return info;
-        } catch (IllegalArgumentException iae) {
-            Log.e(LOG_TAG, "Skip invalid or incomplete CellLocation: " + currentCell, iae);
-        }
-        return null;
-    }
-
-    private List<CellInfo> getNeighboringCells() {
-        Collection<NeighboringCellInfo> cells = mTelephonyManager.getNeighboringCellInfo();
-        if (cells == null || cells.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        String networkOperator = getNetworkOperator();
-        List<CellInfo> records = new ArrayList<CellInfo>(cells.size());
-        for (NeighboringCellInfo nci : cells) {
-            try {
-                final CellInfo record = new CellInfo(mPhoneType);
-                record.setNeighboringCellInfo(nci, networkOperator);
-                if (record.isCellRadioValid()) {
-                    records.add(record);
-                }
-            } catch (IllegalArgumentException iae) {
-                Log.e(LOG_TAG, "Skip invalid or incomplete NeighboringCellInfo: " + nci, iae);
-            }
-        }
-        return records;
-    }
-
-    @TargetApi(18)
-    protected boolean addCellToList(List<CellInfo> cells,
-                                 android.telephony.CellInfo observedCell,
-                                 TelephonyManager tm) {
-        boolean added = false;
-        if (observedCell instanceof CellInfoGsm) {
-            CellIdentityGsm ident = ((CellInfoGsm) observedCell).getCellIdentity();
-            if (ident.getMcc() != Integer.MAX_VALUE && ident.getMnc() != Integer.MAX_VALUE) {
-                CellSignalStrengthGsm strength = ((CellInfoGsm) observedCell).getCellSignalStrength();
-                CellInfo cell = new CellInfo(tm.getPhoneType());
-                cell.setGsmCellInfo(ident.getMcc(),
-                        ident.getMnc(),
-                        ident.getLac(),
-                        ident.getCid(),
-                        strength.getAsuLevel());
-                cells.add(cell);
-                added = true;
-            }
-        } else if (observedCell instanceof CellInfoCdma) {
-            CellInfo cell = new CellInfo(tm.getPhoneType());
-            CellIdentityCdma ident = ((CellInfoCdma) observedCell).getCellIdentity();
-            CellSignalStrengthCdma strength = ((CellInfoCdma) observedCell).getCellSignalStrength();
-            cell.setCdmaCellInfo(ident.getBasestationId(),
-                    ident.getNetworkId(),
-                    ident.getSystemId(),
-                    strength.getDbm());
-            cells.add(cell);
-            added = true;
-        } else if (observedCell instanceof CellInfoLte) {
-            CellIdentityLte ident = ((CellInfoLte) observedCell).getCellIdentity();
-            if (ident.getMnc() != Integer.MAX_VALUE && ident.getMcc() != Integer.MAX_VALUE) {
-                CellInfo cell = new CellInfo(tm.getPhoneType());
-                CellSignalStrengthLte strength = ((CellInfoLte) observedCell).getCellSignalStrength();
-                cell.setLteCellInfo(ident.getMcc(),
-                        ident.getMnc(),
-                        ident.getCi(),
-                        ident.getPci(),
-                        ident.getTac(),
-                        strength.getAsuLevel(),
-                        strength.getTimingAdvance());
-               cells.add(cell);
-               added = true;
-            }
-        }
-        return added;
-    }
-
-    @TargetApi(18)
-    private class GetAllCellInfoScannerMr2 implements GetAllCellInfoScannerImpl {
-        @Override
-        public List<CellInfo> getAllCellInfo(TelephonyManager tm) {
-            final List<android.telephony.CellInfo> observed = tm.getAllCellInfo();
-            if (observed == null || observed.isEmpty()) {
-                return Collections.emptyList();
-            }
-
-            List<CellInfo> cells = new ArrayList<CellInfo>(observed.size());
-            for (android.telephony.CellInfo observedCell : observed) {
-                if (!addCellToList(cells, observedCell, tm)) {
-                    //Log.i(LOG_TAG, "Skipped CellInfo of unknown class: " + observedCell.toString());
-                }
-            }
-            return cells;
-        }
-    }
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/GPSScanner.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/GPSScanner.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/GPSScanner.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/GPSScanner.java	2014-11-26 21:46:02.000000000 +0000
@@ -65,8 +65,23 @@
         }
     }
 
+    private boolean isGpsAvailable(LocationManager locationManager) {
+        if (locationManager == null ||
+            locationManager.getProvider(LocationManager.GPS_PROVIDER) == null) {
+            String msg = "No GPS available, scanning not started.";
+            Log.d(LOG_TAG, msg);
+            AppGlobals.guiLogError(msg);
+            return false;
+        }
+        return true;
+    }
+
     private void startPassiveMode() {
         LocationManager locationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
+        if (!isGpsAvailable(locationManager)) {
+            return;
+        }
+
         locationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER,
                                                0,
                                                0, this);
@@ -74,6 +89,10 @@
 
     private void startActiveMode() {
         LocationManager lm = getLocationManager();
+        if (!isGpsAvailable(lm)) {
+            return;
+        }
+
         lm.requestLocationUpdates(LocationManager.GPS_PROVIDER,
                                   ACTIVE_MODE_GPS_MIN_UPDATE_TIME_MS,
                                   ACTIVE_MODE_GPS_MIN_UPDATE_DISTANCE_M,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/ScanManager.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/ScanManager.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/ScanManager.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/ScanManager.java	2014-11-26 21:46:02.000000000 +0000
@@ -98,6 +98,11 @@
         }
 
         mContext = context.getApplicationContext();
+        if (mContext == null) {
+            Log.w(LOG_TAG, "No app context available.");
+            return;
+        }
+
         if (mGPSScanner == null) {
             mGPSScanner = new GPSScanner(context, this);
             mWifiScanner = new WifiScanner(context);
@@ -158,10 +163,6 @@
         return (mCellScanner == null)? 0 :mCellScanner.getCellInfoCount();
     }
 
-    public int getCurrentCellInfoCount() {
-        return (mCellScanner == null)? 0 :mCellScanner.getCurrentCellInfoCount();
-    }
-
     public int getLocationCount() {
         return (mGPSScanner == null)? 0 : mGPSScanner.getLocationCount();
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/WifiScanner.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/WifiScanner.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/WifiScanner.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/WifiScanner.java	2014-11-26 21:46:02.000000000 +0000
@@ -65,7 +65,11 @@
     }
 
     private List<ScanResult> getScanResults() {
-        return (sIsTestMode)? mTestModeFakeScanResults : getWifiManager().getScanResults();
+        WifiManager manager = getWifiManager();
+        if (manager == null) {
+            return null;
+        }
+        return getWifiManager().getScanResults();
     }
 
 
@@ -105,8 +109,12 @@
                 deactivatePeriodicScan();
             }
         } else if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION.equals(action)) {
-            ArrayList<ScanResult> scanResults = new ArrayList<ScanResult>();
-            for (ScanResult scanResult : getScanResults()) {
+            final List<ScanResult> scanResultList = getScanResults();
+            if (scanResultList == null) {
+                return;
+            }
+            final ArrayList<ScanResult> scanResults = new ArrayList<ScanResult>();
+            for (ScanResult scanResult : scanResultList) {
                 scanResult.BSSID = BSSIDBlockList.canonicalizeBSSID(scanResult.BSSID);
                 if (shouldLog(scanResult)) {
                     scanResults.add(scanResult);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/StumblerService.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/StumblerService.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/StumblerService.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/StumblerService.java	2014-11-26 21:46:02.000000000 +0000
@@ -17,7 +17,6 @@
 import org.mozilla.mozstumbler.service.stumblerthread.datahandling.DataStorageManager;
 import org.mozilla.mozstumbler.service.stumblerthread.scanners.ScanManager;
 import org.mozilla.mozstumbler.service.stumblerthread.scanners.cellscanner.CellScanner;
-import org.mozilla.mozstumbler.service.stumblerthread.scanners.cellscanner.CellScannerNoWCDMA;
 import org.mozilla.mozstumbler.service.uploadthread.UploadAlarmReceiver;
 import org.mozilla.mozstumbler.service.utils.NetworkUtils;
 import org.mozilla.mozstumbler.service.utils.PersistentIntentService;
@@ -109,10 +108,6 @@
         return mScanManager.getCellInfoCount();
     }
 
-    public int getCurrentCellInfoCount() {
-        return mScanManager.getCurrentCellInfoCount();
-    }
-
     public boolean isGeofenced () {
         return mScanManager.isGeofenced();
     }
@@ -125,10 +120,6 @@
         NetworkUtils.createGlobalInstance(this);
         DataStorageManager.createGlobalInstance(this, this);
 
-        if (!CellScanner.isCellScannerImplSet()) {
-            CellScanner.setCellScannerImpl(new CellScannerNoWCDMA(this));
-        }
-
         mReporter.startup(this);
     }
 
@@ -144,8 +135,6 @@
     public void onDestroy() {
         super.onDestroy();
 
-        UploadAlarmReceiver.cancelAlarm(this, !mScanManager.isPassiveMode());
-
         if (!mScanManager.isScanning()) {
             return;
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/stumbler_sources.mozbuild thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/stumbler_sources.mozbuild
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/stumbler/stumbler_sources.mozbuild	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/stumbler/stumbler_sources.mozbuild	2014-11-26 21:46:02.000000000 +0000
@@ -17,7 +17,7 @@
     'java/org/mozilla/mozstumbler/service/stumblerthread/Reporter.java',
     'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellInfo.java',
     'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScanner.java',
-    'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerNoWCDMA.java',
+    'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/cellscanner/CellScannerImplementation.java',
     'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/GPSScanner.java',
     'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/LocationBlockList.java',
     'java/org/mozilla/mozstumbler/service/stumblerthread/scanners/ScanManager.java',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/tests/background/junit3/src/sync/TestClientsStage.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/tests/background/junit3/src/sync/TestClientsStage.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/tests/background/junit3/src/sync/TestClientsStage.java	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/tests/background/junit3/src/sync/TestClientsStage.java	2014-11-26 21:46:02.000000000 +0000
@@ -63,16 +63,25 @@
       }
     };
 
-    String guid = "clientabcdef";
+    final String guid = "clientabcdef";
     long lastModified = System.currentTimeMillis();
     ClientRecord record = new ClientRecord(guid, "clients", lastModified , false);
     record.name = "John's Phone";
     record.type = "mobile";
+    record.device = "Some Device";
+    record.os = "iOS";
     record.commands = new JSONArray();
 
     dataAccessor.store(record);
     assertEquals(1, dataAccessor.clientsCount());
 
+    final ClientRecord stored = dataAccessor.fetchAllClients().get(guid);
+    assertNotNull(stored);
+    assertEquals("John's Phone", stored.name);
+    assertEquals("mobile", stored.type);
+    assertEquals("Some Device", stored.device);
+    assertEquals("iOS", stored.os);
+
     stage.wipeLocal(session);
 
     try {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/tests/background/junit3/src/testhelpers/MockClientsDataDelegate.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/tests/background/junit3/src/testhelpers/MockClientsDataDelegate.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/tests/background/junit3/src/testhelpers/MockClientsDataDelegate.java	2014-11-14 09:37:32.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/tests/background/junit3/src/testhelpers/MockClientsDataDelegate.java	2014-11-26 21:46:02.000000000 +0000
@@ -58,4 +58,9 @@
   public synchronized long getLastModifiedTimestamp() {
     return clientDataTimestamp;
   }
+
+  @Override
+  public String getFormFactor() {
+    return "phone";
+  }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/thirdparty/org/mozilla/apache/commons/codec/binary/Hex.java thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/thirdparty/org/mozilla/apache/commons/codec/binary/Hex.java
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/android/thirdparty/org/mozilla/apache/commons/codec/binary/Hex.java	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/android/thirdparty/org/mozilla/apache/commons/codec/binary/Hex.java	2014-11-26 21:46:03.000000000 +0000
@@ -274,7 +274,9 @@
         try {
             byte[] byteArray = object instanceof String ? ((String) object).getBytes(getCharsetName()) : (byte[]) object;
             return encodeHex(byteArray);
-        } catch (ClassCastException | UnsupportedEncodingException e) {
+        } catch (ClassCastException e) {
+            throw new EncoderException(e.getMessage(), e);
+        } catch (UnsupportedEncodingException e) {
             throw new EncoderException(e.getMessage(), e);
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/locales/en-US/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/locales/en-US/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/locales/en-US/overrides/appstrings.properties	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/locales/en-US/overrides/appstrings.properties	2014-11-26 21:46:03.000000000 +0000
@@ -31,6 +31,6 @@
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspFrameAncestorBlocked=This page has a content security policy that prevents it from being embedded in this way.
+cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/locales/en-US/overrides/netError.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/locales/en-US/overrides/netError.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mobile/locales/en-US/overrides/netError.dtd	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mobile/locales/en-US/overrides/netError.dtd	2014-11-26 21:46:03.000000000 +0000
@@ -175,8 +175,8 @@
 </ul>
 ">
 
-<!ENTITY cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
-<!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
+<!ENTITY cspBlocked.title "Blocked by Content Security Policy">
+<!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentError.title "Corrupted Content Error">
 <!ENTITY corruptedContentError.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/modules/libjar/nsJARChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/modules/libjar/nsJARChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/modules/libjar/nsJARChannel.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/modules/libjar/nsJARChannel.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -879,16 +879,15 @@
                                       mLoadFlags & ~(LOAD_DOCUMENT_URI | LOAD_CALL_CONTENT_SNIFFERS));
             }
             else {
-              rv = NS_OpenURIInternal(mDownloader,
-                                      nullptr,   // aContext
-                                      mJarBaseURI,
-                                      nullptr, // aRequestingNode,
-                                      nsContentUtils::GetSystemPrincipal(),
-                                      nsILoadInfo::SEC_NORMAL,
-                                      nsIContentPolicy::TYPE_OTHER,
-                                      mLoadGroup,
-                                      mCallbacks,
-                                      mLoadFlags & ~(LOAD_DOCUMENT_URI | LOAD_CALL_CONTENT_SNIFFERS));
+              rv = NS_OpenURI(mDownloader,
+                              nullptr,   // aContext
+                              mJarBaseURI,
+                              nsContentUtils::GetSystemPrincipal(),
+                              nsILoadInfo::SEC_NORMAL,
+                              nsIContentPolicy::TYPE_OTHER,
+                              mLoadGroup,
+                              mCallbacks,
+                              mLoadFlags & ~(LOAD_DOCUMENT_URI | LOAD_CALL_CONTENT_SNIFFERS));
             }
         }
     } else if (mOpeningRemote) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/modules/libpref/init/all.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/modules/libpref/init/all.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/modules/libpref/init/all.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/modules/libpref/init/all.js	2014-11-26 21:46:04.000000000 +0000
@@ -284,6 +284,9 @@
 #endif
 #ifdef MOZ_WEBM
 pref("media.webm.enabled", true);
+#if defined(MOZ_FMP4) && defined(MOZ_WMF)
+pref("media.webm.intel_decoder.enabled", false);
+#endif
 #endif
 #ifdef MOZ_GSTREAMER
 pref("media.gstreamer.enabled", true);
@@ -1271,7 +1274,6 @@
 
 // Try and use SPDY when using SSL
 pref("network.http.spdy.enabled", true);
-pref("network.http.spdy.enabled.v3", true);
 pref("network.http.spdy.enabled.v3-1", true);
 pref("network.http.spdy.enabled.http2draft", true);
 pref("network.http.spdy.enabled.http2", false);
@@ -1771,7 +1773,7 @@
 // These fonts are ignored the underline offset, instead of it, the underline is lowered to bottom of its em descent.
 pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka");
 
-#ifdef MOZ_WIDGET_GONK
+#ifdef MOZ_B2G
 // Whitelist of fonts that ship with B2G that do not include space lookups in
 // default features. This allows us to skip analyzing the GSUB/GPOS tables
 // unless features are explicitly enabled.
@@ -2124,7 +2126,7 @@
 pref("layout.css.vertical-text.enabled", false);
 
 // Is support for object-fit and object-position enabled?
-pref("layout.css.object-fit-and-position.enabled", false);
+pref("layout.css.object-fit-and-position.enabled", true);
 
 // Is -moz-osx-font-smoothing enabled?
 // Only supported in OSX builds
@@ -2150,8 +2152,16 @@
 pref("layout.css.grid.enabled", false);
 
 // Is support for CSS Ruby enabled?
+//
+// When this pref is removed, make sure that the pref callback registration
+// 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);
 
+// Is support for CSS display:contents enabled?
+pref("layout.css.display-contents.enabled", false);
+
 // Is support for CSS box-decoration-break enabled?
 pref("layout.css.box-decoration-break.enabled", true);
 
@@ -2643,7 +2653,8 @@
 #ifdef XP_WIN
 
 pref("font.name.serif.ar", "Times New Roman");
-pref("font.name.sans-serif.ar", "Arial");
+pref("font.name.sans-serif.ar", "Segoe UI");
+pref("font.name-list.sans-serif.ar", "Segoe UI, Tahoma, Arial");
 pref("font.name.monospace.ar", "Courier New");
 pref("font.name.cursive.ar", "Comic Sans MS");
 
@@ -3340,166 +3351,6 @@
 pref("layout.css.scroll-behavior.enabled", false);
 pref("layout.css.scroll-behavior.property-enabled", false);
 
-# ANDROID
-#endif
-
-#if defined(ANDROID) || defined(FXOS_SIMULATOR)
-// font names
-
-// Gonk (along with FxOS Simulator) and Android ship different sets of fonts
-#if defined(MOZ_WIDGET_GONK) || defined(FXOS_SIMULATOR)
-
-// TODO: some entries could probably be cleaned up.
-
-// ar
-
-pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars
-pref("font.name.sans-serif.el", "Fira Sans");
-pref("font.name.monospace.el", "Fira Mono");
-
-pref("font.name.serif.he", "Charis SIL Compact");
-pref("font.name.sans-serif.he", "Fira Sans");
-pref("font.name.monospace.he", "Fira Mono");
-pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Fira Sans");
-
-pref("font.name.serif.ja", "Charis SIL Compact");
-pref("font.name.sans-serif.ja", "Fira Sans");
-pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.sans-serif.ja", "Fira Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Fira Mono");
-
-pref("font.name.serif.ko", "Charis SIL Compact");
-pref("font.name.sans-serif.ko", "Fira Sans");
-pref("font.name.monospace.ko", "Fira Mono");
-
-pref("font.name.serif.th", "Charis SIL Compact");
-pref("font.name.sans-serif.th", "Fira Sans");
-pref("font.name.monospace.th", "Fira Mono");
-pref("font.name-list.sans-serif.th", "Fira Sans, Noto Sans Thai, Droid Sans Thai");
-
-pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
-pref("font.name.sans-serif.x-cyrillic", "Fira Sans");
-pref("font.name.monospace.x-cyrillic", "Fira Mono");
-
-pref("font.name.serif.x-unicode", "Charis SIL Compact");
-pref("font.name.sans-serif.x-unicode", "Fira Sans");
-pref("font.name.monospace.x-unicode", "Fira Mono");
-
-pref("font.name.serif.x-western", "Charis SIL Compact");
-pref("font.name.sans-serif.x-western", "Fira Sans");
-pref("font.name.monospace.x-western", "Fira Mono");
-
-pref("font.name.serif.zh-CN", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-CN", "Fira Sans");
-pref("font.name.monospace.zh-CN", "Fira Mono");
-
-pref("font.name.serif.zh-HK", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-HK", "Fira Sans");
-pref("font.name.monospace.zh-HK", "Fira Mono");
-
-pref("font.name.serif.zh-TW", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-TW", "Fira Sans");
-pref("font.name.monospace.zh-TW", "Fira Mono");
-
-#else
-
-// not MOZ_WIDGET_GONK / FXOS_SIMULATOR
-// (i.e. this is Firefox for Android) - here, we use the bundled fonts
-
-// ar
-
-pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars
-pref("font.name.sans-serif.el", "Clear Sans");
-pref("font.name.monospace.el", "Droid Sans Mono");
-pref("font.name-list.sans-serif.el", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.he", "Droid Serif");
-pref("font.name.sans-serif.he", "Clear Sans");
-pref("font.name.monospace.he", "Droid Sans Mono");
-pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Clear Sans, Droid Sans");
-
-pref("font.name.serif.ja", "Charis SIL Compact");
-pref("font.name.sans-serif.ja", "Clear Sans");
-pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.serif.ja", "Droid Serif");
-pref("font.name-list.sans-serif.ja", "Clear Sans, Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
-
-pref("font.name.serif.ko", "Charis SIL Compact");
-pref("font.name.sans-serif.ko", "Clear Sans");
-pref("font.name.monospace.ko", "Droid Sans Mono");
-pref("font.name-list.serif.ko", "Droid Serif, HYSerif");
-pref("font.name-list.sans-serif.ko", "SmartGothic, NanumGothic, DroidSansFallback, Droid Sans Fallback");
-
-pref("font.name.serif.th", "Charis SIL Compact");
-pref("font.name.sans-serif.th", "Clear Sans");
-pref("font.name.monospace.th", "Droid Sans Mono");
-pref("font.name-list.serif.th", "Droid Serif");
-pref("font.name-list.sans-serif.th", "Droid Sans Thai, Clear Sans, Droid Sans");
-
-pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
-pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
-pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
-pref("font.name-list.serif.x-cyrillic", "Droid Serif");
-pref("font.name-list.sans-serif.x-cyrillic", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.x-unicode", "Charis SIL Compact");
-pref("font.name.sans-serif.x-unicode", "Clear Sans");
-pref("font.name.monospace.x-unicode", "Droid Sans Mono");
-pref("font.name-list.serif.x-unicode", "Droid Serif");
-pref("font.name-list.sans-serif.x-unicode", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.x-western", "Charis SIL Compact");
-pref("font.name.sans-serif.x-western", "Clear Sans");
-pref("font.name.monospace.x-western", "Droid Sans Mono");
-pref("font.name-list.serif.x-western", "Droid Serif");
-pref("font.name-list.sans-serif.x-western", "Clear Sans, Roboto, Droid Sans");
-
-pref("font.name.serif.zh-CN", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-CN", "Clear Sans");
-pref("font.name.monospace.zh-CN", "Droid Sans Mono");
-pref("font.name-list.serif.zh-CN", "Droid Serif, Droid Sans Fallback");
-pref("font.name-list.sans-serif.zh-CN", "Roboto, Droid Sans, Droid Sans Fallback");
-pref("font.name-list.monospace.zh-CN", "Droid Sans Fallback");
-
-pref("font.name.serif.zh-HK", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-HK", "Clear Sans");
-pref("font.name.monospace.zh-HK", "Droid Sans Mono");
-pref("font.name-list.serif.zh-HK", "Droid Serif, Droid Sans Fallback");
-pref("font.name-list.sans-serif.zh-HK", "Roboto, Droid Sans, Droid Sans Fallback");
-pref("font.name-list.monospace.zh-HK", "Droid Sans Fallback");
-
-pref("font.name.serif.zh-TW", "Charis SIL Compact");
-pref("font.name.sans-serif.zh-TW", "Clear Sans");
-pref("font.name.monospace.zh-TW", "Droid Sans Mono");
-pref("font.name-list.serif.zh-TW", "Droid Serif, Droid Sans Fallback");
-pref("font.name-list.sans-serif.zh-TW", "Roboto, Droid Sans, Droid Sans Fallback");
-pref("font.name-list.monospace.zh-TW", "Droid Sans Fallback");
-
-// end ! (MOZ_WIDGET_GONK || FXOS_SIMULATOR)
-
-#endif
-
-pref("font.size.fixed.ar", 12);
-
-pref("font.default.el", "sans-serif");
-pref("font.size.fixed.el", 12);
-
-pref("font.size.fixed.he", 12);
-
-pref("font.default.x-cyrillic", "sans-serif");
-pref("font.size.fixed.x-cyrillic", 12);
-
-pref("font.default.x-unicode", "sans-serif");
-pref("font.size.fixed.x-unicode", 12);
-
-pref("font.default.x-western", "sans-serif");
-pref("font.size.fixed.x-western", 12);
-
-# ANDROID || FXOS_SIMUALTOR
-#endif
-
-#ifdef ANDROID
 /* PostScript print module prefs */
 // pref("print.postscript.enabled",      true);
 pref("print.postscript.paper_size",    "letter");
@@ -3650,6 +3501,157 @@
 #endif
 #endif
 
+#if defined(ANDROID) || defined(MOZ_B2G)
+
+pref("font.size.fixed.ar", 12);
+
+pref("font.default.el", "sans-serif");
+pref("font.size.fixed.el", 12);
+
+pref("font.size.fixed.he", 12);
+
+pref("font.default.x-cyrillic", "sans-serif");
+pref("font.size.fixed.x-cyrillic", 12);
+
+pref("font.default.x-unicode", "sans-serif");
+pref("font.size.fixed.x-unicode", 12);
+
+pref("font.default.x-western", "sans-serif");
+pref("font.size.fixed.x-western", 12);
+
+# ANDROID || MOZ_B2G
+#endif
+
+#if defined(MOZ_B2G)
+// Gonk, FxOS Simulator, B2G Desktop and Mulet.
+
+// TODO: some entries could probably be cleaned up.
+
+// ar
+
+pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars
+pref("font.name.sans-serif.el", "Fira Sans");
+pref("font.name.monospace.el", "Fira Mono");
+
+pref("font.name.serif.he", "Charis SIL Compact");
+pref("font.name.sans-serif.he", "Fira Sans");
+pref("font.name.monospace.he", "Fira Mono");
+pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Fira Sans");
+
+pref("font.name.serif.ja", "Charis SIL Compact");
+pref("font.name.sans-serif.ja", "Fira Sans");
+pref("font.name.monospace.ja", "MotoyaLMaru");
+pref("font.name-list.sans-serif.ja", "Fira Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
+pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Fira Mono");
+
+pref("font.name.serif.ko", "Charis SIL Compact");
+pref("font.name.sans-serif.ko", "Fira Sans");
+pref("font.name.monospace.ko", "Fira Mono");
+
+pref("font.name.serif.th", "Charis SIL Compact");
+pref("font.name.sans-serif.th", "Fira Sans");
+pref("font.name.monospace.th", "Fira Mono");
+pref("font.name-list.sans-serif.th", "Fira Sans, Noto Sans Thai, Droid Sans Thai");
+
+pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
+pref("font.name.sans-serif.x-cyrillic", "Fira Sans");
+pref("font.name.monospace.x-cyrillic", "Fira Mono");
+
+pref("font.name.serif.x-unicode", "Charis SIL Compact");
+pref("font.name.sans-serif.x-unicode", "Fira Sans");
+pref("font.name.monospace.x-unicode", "Fira Mono");
+
+pref("font.name.serif.x-western", "Charis SIL Compact");
+pref("font.name.sans-serif.x-western", "Fira Sans");
+pref("font.name.monospace.x-western", "Fira Mono");
+
+pref("font.name.serif.zh-CN", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-CN", "Fira Sans");
+pref("font.name.monospace.zh-CN", "Fira Mono");
+
+pref("font.name.serif.zh-HK", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-HK", "Fira Sans");
+pref("font.name.monospace.zh-HK", "Fira Mono");
+
+pref("font.name.serif.zh-TW", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-TW", "Fira Sans");
+pref("font.name.monospace.zh-TW", "Fira Mono");
+
+#elif defined(ANDROID)
+// We use the bundled fonts for Firefox for Android
+
+// ar
+
+pref("font.name.serif.el", "Droid Serif"); // not Charis SIL Compact, only has a few Greek chars
+pref("font.name.sans-serif.el", "Clear Sans");
+pref("font.name.monospace.el", "Droid Sans Mono");
+pref("font.name-list.sans-serif.el", "Clear Sans, Roboto, Droid Sans");
+
+pref("font.name.serif.he", "Droid Serif");
+pref("font.name.sans-serif.he", "Clear Sans");
+pref("font.name.monospace.he", "Droid Sans Mono");
+pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Clear Sans, Droid Sans");
+
+pref("font.name.serif.ja", "Charis SIL Compact");
+pref("font.name.sans-serif.ja", "Clear Sans");
+pref("font.name.monospace.ja", "MotoyaLMaru");
+pref("font.name-list.serif.ja", "Droid Serif");
+pref("font.name-list.sans-serif.ja", "Clear Sans, Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Noto Sans JP, Droid Sans Japanese");
+pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
+
+pref("font.name.serif.ko", "Charis SIL Compact");
+pref("font.name.sans-serif.ko", "Clear Sans");
+pref("font.name.monospace.ko", "Droid Sans Mono");
+pref("font.name-list.serif.ko", "Droid Serif, HYSerif");
+pref("font.name-list.sans-serif.ko", "SmartGothic, NanumGothic, Noto Sans KR, DroidSansFallback, Droid Sans Fallback");
+
+pref("font.name.serif.th", "Charis SIL Compact");
+pref("font.name.sans-serif.th", "Clear Sans");
+pref("font.name.monospace.th", "Droid Sans Mono");
+pref("font.name-list.serif.th", "Droid Serif");
+pref("font.name-list.sans-serif.th", "Droid Sans Thai, Clear Sans, Droid Sans");
+
+pref("font.name.serif.x-cyrillic", "Charis SIL Compact");
+pref("font.name.sans-serif.x-cyrillic", "Clear Sans");
+pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
+pref("font.name-list.serif.x-cyrillic", "Droid Serif");
+pref("font.name-list.sans-serif.x-cyrillic", "Clear Sans, Roboto, Droid Sans");
+
+pref("font.name.serif.x-unicode", "Charis SIL Compact");
+pref("font.name.sans-serif.x-unicode", "Clear Sans");
+pref("font.name.monospace.x-unicode", "Droid Sans Mono");
+pref("font.name-list.serif.x-unicode", "Droid Serif");
+pref("font.name-list.sans-serif.x-unicode", "Clear Sans, Roboto, Droid Sans");
+
+pref("font.name.serif.x-western", "Charis SIL Compact");
+pref("font.name.sans-serif.x-western", "Clear Sans");
+pref("font.name.monospace.x-western", "Droid Sans Mono");
+pref("font.name-list.serif.x-western", "Droid Serif");
+pref("font.name-list.sans-serif.x-western", "Clear Sans, Roboto, Droid Sans");
+
+pref("font.name.serif.zh-CN", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-CN", "Clear Sans");
+pref("font.name.monospace.zh-CN", "Droid Sans Mono");
+pref("font.name-list.serif.zh-CN", "Droid Serif, Droid Sans Fallback");
+pref("font.name-list.sans-serif.zh-CN", "Roboto, Droid Sans, Noto Sans SC, Droid Sans Fallback");
+pref("font.name-list.monospace.zh-CN", "Droid Sans Fallback");
+
+pref("font.name.serif.zh-HK", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-HK", "Clear Sans");
+pref("font.name.monospace.zh-HK", "Droid Sans Mono");
+pref("font.name-list.serif.zh-HK", "Droid Serif, Droid Sans Fallback");
+pref("font.name-list.sans-serif.zh-HK", "Roboto, Droid Sans, Noto Sans TC, Noto Sans SC, Droid Sans Fallback");
+pref("font.name-list.monospace.zh-HK", "Droid Sans Fallback");
+
+pref("font.name.serif.zh-TW", "Charis SIL Compact");
+pref("font.name.sans-serif.zh-TW", "Clear Sans");
+pref("font.name.monospace.zh-TW", "Droid Sans Mono");
+pref("font.name-list.serif.zh-TW", "Droid Serif, Droid Sans Fallback");
+pref("font.name-list.sans-serif.zh-TW", "Roboto, Droid Sans, Noto Sans TC, Noto Sans SC, Droid Sans Fallback");
+pref("font.name-list.monospace.zh-TW", "Droid Sans Fallback");
+
+#endif
+
 #if OS_ARCH==AIX
 
 // Override default Japanese fonts
@@ -3838,7 +3840,7 @@
 pref("webgl.prefer-16bpp", false);
 pref("webgl.default-no-alpha", false);
 pref("webgl.force-layers-readback", false);
-pref("webgl.lose-context-on-memory-preasure", false);
+pref("webgl.lose-context-on-memory-pressure", false);
 pref("webgl.can-lose-context-in-foreground", true);
 pref("webgl.restore-context-when-visible", true);
 pref("webgl.max-warnings-per-context", 32);
@@ -3909,6 +3911,12 @@
 pref("layers.tile-height", 256);
 // Max number of layers per container. See Overwrite in mobile prefs.
 pref("layers.max-active", -1);
+// If this is set the tile size will only be treated as a suggestion.
+// On B2G we will round this to the stride of the underlying allocation.
+// On any platform we may later use the screen size and ignore
+// tile-width/tile-height entirely. Its recommended to turn this off
+// if you change the tile size.
+pref("layers.tiles.adjust", true);
 
 // Set the default values, and then override per-platform as needed
 pref("layers.offmainthreadcomposition.enabled", false);
@@ -4216,6 +4224,10 @@
 // Whether we should show the placeholder when the element is focused but empty.
 pref("dom.placeholder.show_on_focus", true);
 
+pref("dom.vr.enabled", false);
+// 0 = never; 1 = only if real devices aren't there; 2 = always
+pref("dom.vr.add-test-devices", 1);
+
 // MMS UA Profile settings
 pref("wap.UAProf.url", "");
 pref("wap.UAProf.tagname", "x-wap-profile");
@@ -4361,7 +4373,6 @@
 
 // Turn off selection caret by default
 pref("selectioncaret.enabled", false);
-pref("selectioncaret.noneditable", false);
 
 // This will inflate size of selection caret frame when we checking if
 // user click on selection caret or not. In app units.
@@ -4407,3 +4418,6 @@
 #ifdef XP_MACOSX
 pref("intl.collation.mac.use_icu", true);
 #endif
+
+// Enable meta-viewport support in remote APZ-enabled frames.
+pref("dom.meta-viewport.enabled", false);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/android/APKOpen.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/android/APKOpen.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/android/APKOpen.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/android/APKOpen.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -28,7 +28,6 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/prctl.h>
-#include "Zip.h"
 #include "sqlite3.h"
 #include "SQLiteBridge.h"
 #include "NSSBridge.h"
@@ -217,8 +216,6 @@
   getrusage(RUSAGE_THREAD, &usage1_thread);
   getrusage(RUSAGE_SELF, &usage1);
   
-  RefPtr<Zip> zip = ZipCollection::GetZip(apkName);
-
   char *file = new char[strlen(apkName) + sizeof("!/assets/" ANDROID_CPU_ARCH "/libxul.so")];
   sprintf(file, "%s!/assets/" ANDROID_CPU_ARCH "/libxul.so", apkName);
   xul_handle = __wrap_dlopen(file, RTLD_GLOBAL | RTLD_LAZY);
@@ -273,7 +270,6 @@
 #else
   chdir(getenv("GRE_HOME"));
 
-  RefPtr<Zip> zip = ZipCollection::GetZip(apkName);
   if (!lib_mapping) {
     lib_mapping = (struct mapping_info *)calloc(MAX_MAPPING_INFO, sizeof(*lib_mapping));
   }
@@ -301,7 +297,6 @@
 
   chdir(getenv("GRE_HOME"));
 
-  RefPtr<Zip> zip = ZipCollection::GetZip(apkName);
   if (!lib_mapping) {
     lib_mapping = (struct mapping_info *)calloc(MAX_MAPPING_INFO, sizeof(*lib_mapping));
   }
@@ -445,11 +440,11 @@
   void (*fXRE_SetProcessType)(char*);
   xul_dlsym("XRE_SetProcessType", &fXRE_SetProcessType);
 
-  mozglueresult (*fXRE_InitChildProcess)(int, char**);
+  mozglueresult (*fXRE_InitChildProcess)(int, char**, void*);
   xul_dlsym("XRE_InitChildProcess", &fXRE_InitChildProcess);
 
   fXRE_SetProcessType(argv[--argc]);
 
-  return fXRE_InitChildProcess(argc, argv);
+  return fXRE_InitChildProcess(argc, argv, nullptr);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/build/Nuwa.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/build/Nuwa.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/build/Nuwa.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/build/Nuwa.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -29,10 +29,6 @@
 
 using namespace mozilla;
 
-extern "C" MFBT_API int tgkill(pid_t tgid, pid_t tid, int signalno) {
-  return syscall(__NR_tgkill, tgid, tid, signalno);
-}
-
 /**
  * Provides the wrappers to a selected set of pthread and system-level functions
  * as the basis for implementing Zygote-like preforking mechanism.
@@ -121,6 +117,22 @@
 
 #define NATIVE_THREAD_NAME_LENGTH 16
 
+typedef struct nuwa_construct {
+  typedef void(*construct_t)(void*);
+
+  construct_t construct;
+  void *arg;
+
+  nuwa_construct(construct_t aConstruct, void *aArg)
+    : construct(aConstruct)
+    , arg(aArg)
+  { }
+
+  nuwa_construct(const nuwa_construct&) = default;
+  nuwa_construct& operator=(const nuwa_construct&) = default;
+
+} nuwa_construct_t;
+
 struct thread_info : public mozilla::LinkedListElement<thread_info> {
   pthread_t origThreadID;
   pthread_t recreatedThreadID;
@@ -135,8 +147,15 @@
 
   // The thread specific function to recreate the new thread. It's executed
   // after the thread is recreated.
-  void (*recrFunc)(void *arg);
-  void *recrArg;
+
+  std::vector<nuwa_construct_t> *recrFunctions;
+  void addThreadConstructor(const nuwa_construct_t *construct) {
+    if (!recrFunctions) {
+      recrFunctions = new std::vector<nuwa_construct_t>();
+    }
+
+    recrFunctions->push_back(*construct);
+  }
 
   TLSInfoList tlsInfo;
 
@@ -173,8 +192,12 @@
 static void
 RunCustomRecreation() {
   thread_info_t *tinfo = sCurrentRecreatingThread;
-  if (tinfo->recrFunc != nullptr) {
-    tinfo->recrFunc(tinfo->recrArg);
+  if (tinfo->recrFunctions) {
+    for (auto iter = tinfo->recrFunctions->begin();
+         iter != tinfo->recrFunctions->end();
+         iter++) {
+      iter->construct(iter->arg);
+    }
   }
 }
 
@@ -193,11 +216,6 @@
 #define TINFO_FLAG_NUWA_SKIP 0x2
 #define TINFO_FLAG_NUWA_EXPLICIT_CHECKPOINT 0x4
 
-typedef struct nuwa_construct {
-  void (*construct)(void *);
-  void *arg;
-} nuwa_construct_t;
-
 static std::vector<nuwa_construct_t> sConstructors;
 static std::vector<nuwa_construct_t> sFinalConstructors;
 
@@ -511,8 +529,7 @@
   /* link tinfo to sAllThreads */
   thread_info_t *tinfo = new thread_info_t();
   tinfo->flags = 0;
-  tinfo->recrFunc = nullptr;
-  tinfo->recrArg = nullptr;
+  tinfo->recrFunctions = nullptr;
   tinfo->recreatedThreadID = 0;
   tinfo->recreatedNativeThreadID = 0;
   tinfo->condMutex = nullptr;
@@ -560,6 +577,10 @@
   tinfo->remove();
   pthread_mutex_unlock(&sThreadCountLock);
 
+  if (tinfo->recrFunctions) {
+    delete tinfo->recrFunctions;
+  }
+
   // while sThreadCountLock is held, since delete calls wrapped functions
   // which try to lock sThreadCountLock. This results in deadlock. And we
   // need to delete |tinfo| before decreasing sThreadCount, so Nuwa won't
@@ -1350,27 +1371,6 @@
   return rv;
 }
 
-extern "C" MFBT_API int
-__wrap_tgkill(pid_t tgid, pid_t tid, int signalno)
-{
-  if (sIsNuwaProcess) {
-    return tgkill(tgid, tid, signalno);
-  }
-
-  if (tid == sMainThread.origNativeThreadID) {
-    return tgkill(tgid, sMainThread.recreatedNativeThreadID, signalno);
-  }
-
-  thread_info_t *tinfo = (tid == sMainThread.origNativeThreadID ?
-      &sMainThread :
-      GetThreadInfo(tid));
-  if (!tinfo) {
-    return tgkill(tgid, tid, signalno);
-  }
-
-  return tgkill(tgid, tinfo->recreatedNativeThreadID, signalno);
-}
-
 static void *
 thread_recreate_startup(void *arg) {
   /*
@@ -1790,8 +1790,10 @@
   }
 
   tinfo->flags |= TINFO_FLAG_NUWA_SUPPORT;
-  tinfo->recrFunc = recreate;
-  tinfo->recrArg = arg;
+  if (recreate) {
+    nuwa_construct_t construct(recreate, arg);
+    tinfo->addThreadConstructor(&construct);
+  }
 
   // XXX Thread name might be set later than this call. If this is the case, we
   // might need to delay getting the thread name.
@@ -1898,9 +1900,7 @@
  */
 MFBT_API void
 NuwaAddConstructor(void (*construct)(void *), void *arg) {
-  nuwa_construct_t ctr;
-  ctr.construct = construct;
-  ctr.arg = arg;
+  nuwa_construct_t ctr(construct, arg);
   sConstructors.push_back(ctr);
 }
 
@@ -1910,12 +1910,21 @@
  */
 MFBT_API void
 NuwaAddFinalConstructor(void (*construct)(void *), void *arg) {
-  nuwa_construct_t ctr;
-  ctr.construct = construct;
-  ctr.arg = arg;
+  nuwa_construct_t ctr(construct, arg);
   sFinalConstructors.push_back(ctr);
 }
 
+MFBT_API void
+NuwaAddThreadConstructor(void (*aConstruct)(void *), void *aArg) {
+  thread_info *tinfo = CUR_THREAD_INFO;
+  if (!tinfo || !aConstruct) {
+    return;
+  }
+
+  nuwa_construct_t construct(aConstruct, aArg);
+  tinfo->addThreadConstructor(&construct);
+}
+
 /**
  * @return if the current process is the nuwa process.
  */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/build/Nuwa.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/build/Nuwa.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/build/Nuwa.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/build/Nuwa.h	2014-11-26 21:46:04.000000000 +0000
@@ -88,6 +88,10 @@
  * @param recreate The custom function that will be called in the spawned
  *                 process, after the thread is recreated. Can be nullptr if no
  *                 custom function to be called after the thread is recreated.
+ *                 Note that this function is called duing thread recreation
+ *                 while other threads are frozen. It must not perform any
+ *                 action (e.g. acquiring a mutex) that might depend on another
+ *                 thread that is still blocked.
  * @param arg The argument passed to the custom function. Can be nullptr.
  */
 MFBT_API void NuwaMarkCurrentThread(void (*recreate)(void *), void *arg);
@@ -137,22 +141,38 @@
 
 /**
  * Register a method to be invoked after a new process is spawned. The method
- * will be invoked on the main thread.
+ * will be invoked on the main thread *before* recreating the other threads.
+ * The registered method must not perform any action (e.g. acquiring a mutex)
+ * that might depend on another thread that has not yet been recreated.
  *
  * @param construct The method to be invoked.
  * @param arg The argument passed to the method.
  */
 MFBT_API void NuwaAddConstructor(void (*construct)(void *), void *arg);
 
+
 /**
  * Register a method to be invoked after a new process is spawned and threads
- * are recreated. The method will be invoked on the main thread.
+ * are recreated. The method will be invoked on the main thread *after*
+ * the other threads are recreated and fully functional.
  *
  * @param construct The method to be invoked.
  * @param arg The argument passed to the method.
  */
 MFBT_API void NuwaAddFinalConstructor(void (*construct)(void *), void *arg);
 
+
+/**
+ * Register a method to be invoked after the current thread is recreated in the
+ * spawned process. Note that this function is called while other threads are
+ * frozen. It must not perform any action (e.g. acquiring a mutex) that might
+ * depend on another thread that is still blocked.
+ *
+ * @param construct The method to be invoked.
+ * @param arg The argument passed to the method.
+ */
+MFBT_API void NuwaAddThreadConstructor(void (*construct)(void *), void *arg);
+
 /**
  * The methods to query the Nuwa-related states.
  */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/build/replace_malloc.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/build/replace_malloc.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/mozglue/build/replace_malloc.mk	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/mozglue/build/replace_malloc.mk	2014-11-26 21:46:04.000000000 +0000
@@ -5,6 +5,7 @@
 ifeq (Darwin_1,$(OS_TARGET)_$(MOZ_REPLACE_MALLOC))
 OS_LDFLAGS += \
   -Wl,-U,_replace_init \
+  -Wl,-U,_replace_get_bridge \
   -Wl,-U,_replace_malloc \
   -Wl,-U,_replace_posix_memalign \
   -Wl,-U,_replace_aligned_alloc \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/public/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/public/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/public/moz.build	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/public/moz.build	2014-11-26 21:46:04.000000000 +0000
@@ -144,6 +144,10 @@
     'nsURIHashKey.h',
 ]
 
+EXPORTS.mozilla.net += [
+    'ReferrerPolicy.h',
+]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS += [
         'NetStatistics.h',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/public/nsNetUtil.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/public/nsNetUtil.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/public/nsNetUtil.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/public/nsNetUtil.h	2014-11-26 21:46:04.000000000 +0000
@@ -251,6 +251,7 @@
                       nsIURI*                aUri,
                       nsINode*               aRequestingNode,
                       nsIPrincipal*          aRequestingPrincipal,
+                      nsIPrincipal*          aTriggeringPrincipal,
                       nsSecurityFlags        aSecurityFlags,
                       nsContentPolicyType    aContentPolicyType,
                       nsILoadGroup*          aLoadGroup = nullptr,
@@ -261,10 +262,8 @@
   NS_ASSERTION(aRequestingPrincipal, "Can not create channel without a requesting Principal!");
 
   nsCOMPtr<nsILoadInfo> loadInfo =
-    new mozilla::LoadInfo(aRequestingPrincipal,
-                          aRequestingNode,
-                          aSecurityFlags,
-                          aContentPolicyType);
+    new mozilla::LoadInfo(aRequestingPrincipal, aTriggeringPrincipal,
+                          aRequestingNode, aSecurityFlags, aContentPolicyType);
   if (!loadInfo) {
     return NS_ERROR_UNEXPECTED;
   }
@@ -277,6 +276,59 @@
                                aIoService);
 }
 
+inline nsresult /*NS_NewChannelWithNodeAndTriggeringPrincipal */
+NS_NewChannelWithTriggeringPrincipal(nsIChannel**           outChannel,
+                                     nsIURI*                aUri,
+                                     nsINode*               aRequestingNode,
+                                     nsIPrincipal*          aTriggeringPrincipal,
+                                     nsSecurityFlags        aSecurityFlags,
+                                     nsContentPolicyType    aContentPolicyType,
+                                     nsILoadGroup*          aLoadGroup = nullptr,
+                                     nsIInterfaceRequestor* aCallbacks = nullptr,
+                                     nsLoadFlags            aLoadFlags = nsIRequest::LOAD_NORMAL,
+                                     nsIIOService*          aIoService = nullptr)
+{
+  MOZ_ASSERT(aRequestingNode);
+  NS_ASSERTION(aTriggeringPrincipal, "Can not create channel without a triggering Principal!");
+  return NS_NewChannelInternal(outChannel,
+                               aUri,
+                               aRequestingNode,
+                               aRequestingNode->NodePrincipal(),
+                               aTriggeringPrincipal,
+                               aSecurityFlags,
+                               aContentPolicyType,
+                               aLoadGroup,
+                               aCallbacks,
+                               aLoadFlags,
+                               aIoService);
+}
+
+inline nsresult /*NS_NewChannelWithPrincipalAndTriggeringPrincipal */
+NS_NewChannelWithTriggeringPrincipal(nsIChannel**           outChannel,
+                                     nsIURI*                aUri,
+                                     nsIPrincipal*          aRequestingPrincipal,
+                                     nsIPrincipal*          aTriggeringPrincipal,
+                                     nsSecurityFlags        aSecurityFlags,
+                                     nsContentPolicyType    aContentPolicyType,
+                                     nsILoadGroup*          aLoadGroup = nullptr,
+                                     nsIInterfaceRequestor* aCallbacks = nullptr,
+                                     nsLoadFlags            aLoadFlags = nsIRequest::LOAD_NORMAL,
+                                     nsIIOService*          aIoService = nullptr)
+{
+  NS_ASSERTION(aRequestingPrincipal, "Can not create channel without a requesting Principal!");
+  return NS_NewChannelInternal(outChannel,
+                               aUri,
+                               nullptr, // aRequestingNode
+                               aRequestingPrincipal,
+                               aTriggeringPrincipal,
+                               aSecurityFlags,
+                               aContentPolicyType,
+                               aLoadGroup,
+                               aCallbacks,
+                               aLoadFlags,
+                               aIoService);
+}
+
 inline nsresult /* NS_NewChannelNode */
 NS_NewChannel(nsIChannel**           outChannel,
               nsIURI*                aUri,
@@ -293,6 +345,7 @@
                                aUri,
                                aRequestingNode,
                                aRequestingNode->NodePrincipal(),
+                               nullptr, // aTriggeringPrincipal
                                aSecurityFlags,
                                aContentPolicyType,
                                aLoadGroup,
@@ -316,6 +369,7 @@
                                aUri,
                                nullptr, // aRequestingNode,
                                aRequestingPrincipal,
+                               nullptr, // aTriggeringPrincipal
                                aSecurityFlags,
                                aContentPolicyType,
                                aLoadGroup,
@@ -333,6 +387,7 @@
                    nsIURI*                aUri,
                    nsINode*               aRequestingNode,
                    nsIPrincipal*          aRequestingPrincipal,
+                   nsIPrincipal*          aTriggeringPrincipal,
                    nsSecurityFlags        aSecurityFlags,
                    nsContentPolicyType    aContentPolicyType,
                    nsILoadGroup*          aLoadGroup = nullptr,
@@ -348,6 +403,7 @@
                                       aUri,
                                       aRequestingNode,
                                       aRequestingPrincipal,
+                                      aTriggeringPrincipal,
                                       aSecurityFlags,
                                       aContentPolicyType,
                                       aLoadGroup,
@@ -383,6 +439,36 @@
                             aUri,
                             nullptr, // aRequestingNode
                             aRequestingPrincipal,
+                            nullptr, // aTriggeringPrincipal
+                            aSecurityFlags,
+                            aContentPolicyType,
+                            aLoadGroup,
+                            aCallbacks,
+                            aLoadFlags,
+                            aIoService,
+                            outChannel);
+}
+
+inline nsresult /* NS_OpenURIWithTriggeringPrincipalAndNode */
+NS_OpenURIWithTriggeringPrincipal(nsIInputStream**       outStream,
+                                  nsIURI*                aUri,
+                                  nsINode*               aRequestingNode,
+                                  nsIPrincipal*          aTriggeringPrincipal,
+                                  nsSecurityFlags        aSecurityFlags,
+                                  nsContentPolicyType    aContentPolicyType,
+                                  nsILoadGroup*          aLoadGroup = nullptr,
+                                  nsIInterfaceRequestor* aCallbacks = nullptr,
+                                  nsLoadFlags            aLoadFlags = nsIRequest::LOAD_NORMAL,
+                                  nsIIOService*          aIoService = nullptr,
+                                  nsIChannel**           outChannel = nullptr)
+{
+  MOZ_ASSERT(aRequestingNode);
+  NS_ASSERTION(aTriggeringPrincipal, "Can not open uri without a triggering Principal!");
+  return NS_OpenURIInternal(outStream,
+                            aUri,
+                            aRequestingNode,
+                            aRequestingNode->NodePrincipal(),
+                            aTriggeringPrincipal,
                             aSecurityFlags,
                             aContentPolicyType,
                             aLoadGroup,
@@ -420,6 +506,7 @@
                    nsIURI*                aUri,
                    nsINode*               aRequestingNode,
                    nsIPrincipal*          aRequestingPrincipal,
+                   nsIPrincipal*          aTriggeringPrincipal,
                    nsSecurityFlags        aSecurityFlags,
                    nsContentPolicyType    aContentPolicyType,
                    nsILoadGroup*          aLoadGroup = nullptr,
@@ -431,6 +518,7 @@
 
   nsCOMPtr<nsILoadInfo> loadInfo =
     new mozilla::LoadInfo(aRequestingPrincipal,
+                          aTriggeringPrincipal,
                           aRequestingNode,
                           aSecurityFlags,
                           aContentPolicyType);
@@ -464,6 +552,7 @@
                             aUri,
                             nullptr, // aRequestingNode
                             aRequestingPrincipal,
+                            nullptr, // aTriggeringPrincipal
                             aSecurityFlags,
                             aContentPolicyType,
                             aLoadGroup,
@@ -604,6 +693,7 @@
                                  const nsACString&   aContentCharset,
                                  nsINode*            aRequestingNode,
                                  nsIPrincipal*       aRequestingPrincipal,
+                                 nsIPrincipal*       aTriggeringPrincipal,
                                  nsSecurityFlags     aSecurityFlags,
                                  nsContentPolicyType aContentPolicyType,
                                  nsIURI*             aBaseURI = nullptr)
@@ -632,6 +722,7 @@
 
   nsCOMPtr<nsILoadInfo> loadInfo =
     new mozilla::LoadInfo(aRequestingPrincipal,
+                          aTriggeringPrincipal,
                           aRequestingNode,
                           aSecurityFlags,
                           aContentPolicyType,
@@ -668,6 +759,7 @@
                                           aContentCharset,
                                           nullptr, // aRequestingNode
                                           aRequestingPrincipal,
+                                          nullptr, // aTriggeringPrincipal
                                           aSecurityFlags,
                                           aContentPolicyType);
 }
@@ -679,6 +771,7 @@
                                  const nsACString&   aContentType,
                                  nsINode*            aRequestingNode,
                                  nsIPrincipal*       aRequestingPrincipal,
+                                 nsIPrincipal*       aTriggeringPrincipal,
                                  nsSecurityFlags     aSecurityFlags,
                                  nsContentPolicyType aContentPolicyType,
                                  bool                aIsSrcdocChannel = false,
@@ -706,6 +799,7 @@
                                         NS_LITERAL_CSTRING("UTF-8"),
                                         aRequestingNode,
                                         aRequestingPrincipal,
+                                        aTriggeringPrincipal,
                                         aSecurityFlags,
                                         aContentPolicyType,
                                         aBaseURI);
@@ -738,6 +832,7 @@
                                           aContentType,
                                           nullptr, // aRequestingNode
                                           aRequestingPrincipal,
+                                          nullptr, // aTriggeringPrincipal
                                           aSecurityFlags,
                                           aContentPolicyType,
                                           aIsSrcdocChannel,
@@ -864,6 +959,7 @@
                                        aUri,
                                        aRequestingNode,
                                        aRequestingPrincipal,
+                                       nullptr, // aTriggeringPrincipal
                                        aSecurityFlags,
                                        aContentPolicyType,
                                        aLoadGroup,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/public/ReferrerPolicy.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/public/ReferrerPolicy.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/public/ReferrerPolicy.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/public/ReferrerPolicy.h	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,61 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 ReferrerPolicy_h__
+#define ReferrerPolicy_h__
+
+#include "nsStringGlue.h"
+#include "nsIHttpChannel.h"
+
+namespace mozilla { namespace net {
+
+enum ReferrerPolicy {
+  /* spec tokens: never no-referrer */
+  RP_No_Referrer                 = nsIHttpChannel::REFERRER_POLICY_NO_REFERRER,
+
+  /* spec tokens: origin */
+  RP_Origin                      = nsIHttpChannel::REFERRER_POLICY_ORIGIN,
+
+  /* spec tokens: default no-referrer-when-downgrade */
+  RP_No_Referrer_When_Downgrade  = nsIHttpChannel::REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE,
+  RP_Default                     = nsIHttpChannel::REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE,
+
+  /* spec tokens: origin-when-crossorigin */
+  RP_Origin_When_Crossorigin     = nsIHttpChannel::REFERRER_POLICY_ORIGIN_WHEN_XORIGIN,
+
+  /* spec tokens: always unsafe-url */
+  RP_Unsafe_URL                  = nsIHttpChannel::REFERRER_POLICY_UNSAFE_URL
+};
+
+inline ReferrerPolicy
+ReferrerPolicyFromString(const nsAString& content)
+{
+  // This is implemented step by step as described in the Referrer Policy
+  // specification, section 6.4 "Determine token's Policy".
+  if (content.LowerCaseEqualsLiteral("never") ||
+      content.LowerCaseEqualsLiteral("no-referrer")) {
+    return RP_No_Referrer;
+  }
+  if (content.LowerCaseEqualsLiteral("origin")) {
+    return RP_Origin;
+  }
+  if (content.LowerCaseEqualsLiteral("default") ||
+      content.LowerCaseEqualsLiteral("no-referrer-when-downgrade")) {
+    return RP_No_Referrer_When_Downgrade;
+  }
+  if (content.LowerCaseEqualsLiteral("origin-when-crossorigin")) {
+    return RP_Origin_When_Crossorigin;
+  }
+  if (content.LowerCaseEqualsLiteral("always") ||
+      content.LowerCaseEqualsLiteral("unsafe-url")) {
+    return RP_Unsafe_URL;
+  }
+  // Spec says if none of the previous match, use No_Referrer.
+  return RP_No_Referrer;
+
+}
+
+} } //namespace mozilla::net
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/src/Dashboard.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/src/Dashboard.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/src/Dashboard.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/src/Dashboard.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -778,9 +778,7 @@
 void
 HttpConnInfo::SetHTTP2ProtocolVersion(uint8_t pv)
 {
-    if (pv == SPDY_VERSION_3) {
-        protocolVersion.AssignLiteral(MOZ_UTF16("spdy/3"));
-    } else if (pv == SPDY_VERSION_31) {
+    if (pv == SPDY_VERSION_31) {
         protocolVersion.AssignLiteral(MOZ_UTF16("spdy/3.1"));
     } else if (pv == NS_HTTP2_DRAFT_VERSION) {
         MOZ_ASSERT (pv == NS_HTTP2_DRAFT_VERSION);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/src/nsSocketTransportService2.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/src/nsSocketTransportService2.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/base/src/nsSocketTransportService2.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/base/src/nsSocketTransportService2.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -226,7 +226,7 @@
     }
     
     uint32_t newSocketIndex = mActiveCount;
-    if (ChaosMode::isActive()) {
+    if (ChaosMode::isActive(ChaosMode::NetworkScheduling)) {
       newSocketIndex = ChaosMode::randomUint32LessThan(mActiveCount + 1);
       PodMove(mActiveList + newSocketIndex + 1, mActiveList + newSocketIndex,
               mActiveCount - newSocketIndex);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/cache2/CacheStorage.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/cache2/CacheStorage.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/cache2/CacheStorage.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/cache2/CacheStorage.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -69,6 +69,11 @@
   if (LookupAppCache()) {
     rv = ChooseApplicationCache(noRefURI, getter_AddRefs(appCache));
     NS_ENSURE_SUCCESS(rv, rv);
+
+    if (appCache) {
+      // From a chosen appcache open only as readonly
+      aFlags &= ~nsICacheStorage::OPEN_TRUNCATE;
+    }
   }
 
   if (appCache) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/dns/effective_tld_names.dat thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/dns/effective_tld_names.dat
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/dns/effective_tld_names.dat	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/dns/effective_tld_names.dat	2014-11-26 21:46:04.000000000 +0000
@@ -9060,6 +9060,13 @@
 med.pl
 sopot.pl
 
+// UDR Limited : http://www.udr.hk.com
+// Submitted by registry <hostmaster@udr.hk.com> 2014-11-07
+hk.com
+hk.org
+ltd.hk
+inc.hk
+
 // Yola : https://www.yola.com/
 // Submitted by Stefano Rivera <stefano@yola.com> 2014-07-09
 yolasite.com
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/ipc/NeckoChannelParams.ipdlh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/ipc/NeckoChannelParams.ipdlh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/ipc/NeckoChannelParams.ipdlh	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/ipc/NeckoChannelParams.ipdlh	2014-11-26 21:46:04.000000000 +0000
@@ -32,6 +32,7 @@
   OptionalURIParams           original;
   OptionalURIParams           doc;
   OptionalURIParams           referrer;
+  uint32_t                    referrerPolicy;
   OptionalURIParams           apiRedirectTo;
   OptionalURIParams           topWindowURI;
   uint32_t                    loadFlags;
@@ -52,6 +53,7 @@
   bool                        allowSpdy;
   OptionalFileDescriptorSet   fds;
   PrincipalInfo               requestingPrincipalInfo;
+  PrincipalInfo               triggeringPrincipalInfo;
   uint32_t                    securityFlags;
   uint32_t                    contentPolicyType;
 };
@@ -78,6 +80,7 @@
   nsCString                 entityID;
   OptionalInputStreamParams uploadStream;
   PrincipalInfo             requestingPrincipalInfo;
+  PrincipalInfo             triggeringPrincipalInfo;
   uint32_t                  securityFlags;
   uint32_t                  contentPolicyType;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/ftp/FTPChannelChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/ftp/FTPChannelChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/ftp/FTPChannelChild.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/ftp/FTPChannelChild.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -149,12 +149,18 @@
 propagateLoadInfo(nsILoadInfo *aLoadInfo,
                   FTPChannelOpenArgs& openArgs)
 {
-  mozilla::ipc::PrincipalInfo principalInfo;
+  mozilla::ipc::PrincipalInfo requestingPrincipalInfo;
+  mozilla::ipc::PrincipalInfo triggeringPrincipalInfo;
 
   if (aLoadInfo) {
     mozilla::ipc::PrincipalToPrincipalInfo(aLoadInfo->LoadingPrincipal(),
-                                           &principalInfo);
-    openArgs.requestingPrincipalInfo() = principalInfo;
+                                           &requestingPrincipalInfo);
+    openArgs.requestingPrincipalInfo() = requestingPrincipalInfo;
+
+    mozilla::ipc::PrincipalToPrincipalInfo(aLoadInfo->TriggeringPrincipal(),
+                                           &triggeringPrincipalInfo);
+    openArgs.triggeringPrincipalInfo() = triggeringPrincipalInfo;
+
     openArgs.securityFlags() = aLoadInfo->GetSecurityFlags();
     openArgs.contentPolicyType() = aLoadInfo->GetContentPolicyType();
     return;
@@ -162,8 +168,9 @@
 
   // use default values if no loadInfo is provided
   mozilla::ipc::PrincipalToPrincipalInfo(nsContentUtils::GetSystemPrincipal(),
-                                         &principalInfo);
-  openArgs.requestingPrincipalInfo() = principalInfo;
+                                         &requestingPrincipalInfo);
+  openArgs.requestingPrincipalInfo() = requestingPrincipalInfo;
+  openArgs.triggeringPrincipalInfo() = requestingPrincipalInfo;
   openArgs.securityFlags() = nsILoadInfo::SEC_NORMAL;
   openArgs.contentPolicyType() = nsIContentPolicy::TYPE_OTHER;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/ftp/FTPChannelParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/ftp/FTPChannelParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/ftp/FTPChannelParent.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/ftp/FTPChannelParent.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -87,8 +87,8 @@
   {
     const FTPChannelOpenArgs& a = aArgs.get_FTPChannelOpenArgs();
     return DoAsyncOpen(a.uri(), a.startPos(), a.entityID(), a.uploadStream(),
-                       a.requestingPrincipalInfo(), a.securityFlags(),
-                       a.contentPolicyType());
+                       a.requestingPrincipalInfo(), a.triggeringPrincipalInfo(),
+                       a.securityFlags(), a.contentPolicyType());
   }
   case FTPChannelCreationArgs::TFTPChannelConnectArgs:
   {
@@ -107,6 +107,7 @@
                               const nsCString& aEntityID,
                               const OptionalInputStreamParams& aUploadStream,
                               const ipc::PrincipalInfo& aRequestingPrincipalInfo,
+                              const ipc::PrincipalInfo& aTriggeringPrincipalInfo,
                               const uint32_t& aSecurityFlags,
                               const uint32_t& aContentPolicyType)
 {
@@ -142,17 +143,24 @@
   if (NS_FAILED(rv)) {
     return SendFailedAsyncOpen(rv);
   }
+  nsCOMPtr<nsIPrincipal> triggeringPrincipal =
+    mozilla::ipc::PrincipalInfoToPrincipal(aTriggeringPrincipalInfo, &rv);
+  if (NS_FAILED(rv)) {
+    return SendFailedAsyncOpen(rv);
+  }
+  
 
   nsCOMPtr<nsIChannel> chan;
-  rv = NS_NewChannel(getter_AddRefs(chan),
-                     uri,
-                     requestingPrincipal,
-                     aSecurityFlags,
-                     aContentPolicyType,
-                     nullptr, // aLoadGroup
-                     nullptr, // aCallbacks
-                     nsIRequest::LOAD_NORMAL,
-                     ios);
+  rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(chan),
+                                            uri,
+                                            requestingPrincipal,
+                                            triggeringPrincipal,
+                                            aSecurityFlags,
+                                            aContentPolicyType,
+                                            nullptr, // aLoadGroup
+                                            nullptr, // aCallbacks
+                                            nsIRequest::LOAD_NORMAL,
+                                            ios);
 
   if (NS_FAILED(rv))
     return SendFailedAsyncOpen(rv);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/ftp/FTPChannelParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/ftp/FTPChannelParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/ftp/FTPChannelParent.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/ftp/FTPChannelParent.h	2014-11-26 21:46:04.000000000 +0000
@@ -66,6 +66,7 @@
                    const nsCString& aEntityID,
                    const OptionalInputStreamParams& aUploadStream,
                    const ipc::PrincipalInfo& aRequestingPrincipalInfo,
+                   const ipc::PrincipalInfo& aTriggeringPrincipalInfo,
                    const uint32_t& aSecurityFlags,
                    const uint32_t& aContentPolicyType);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/AlternateServices.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/AlternateServices.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/AlternateServices.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/AlternateServices.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -189,8 +189,7 @@
     // insist on spdy/3* or >= http/2
     uint32_t version = mConnection->Version();
     LOG(("AltSvcTransaction::MaybeValidate() %p version %d\n", this, version));
-    if ((version < HTTP_VERSION_2) &&
-        (version != SPDY_VERSION_31) && (version != SPDY_VERSION_3)) {
+    if ((version < HTTP_VERSION_2) && (version != SPDY_VERSION_31)) {
       LOG(("AltSvcTransaction::MaybeValidate %p Failed due to protocol version", this));
       return;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/ASpdySession.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/ASpdySession.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/ASpdySession.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/ASpdySession.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -8,7 +8,7 @@
 #include "HttpLog.h"
 
 /*
-  Currently supported are HTTP-draft-[see nshttp.h]/2.0 spdy/3.1 and spdy/3
+  Currently supported are HTTP-draft-[see nshttp.h]/2.0 spdy/3.1
 */
 
 #include "nsHttp.h"
@@ -16,10 +16,8 @@
 
 #include "ASpdySession.h"
 #include "PSpdyPush.h"
-#include "SpdyPush3.h"
 #include "SpdyPush31.h"
 #include "Http2Push.h"
-#include "SpdySession3.h"
 #include "SpdySession31.h"
 #include "Http2Session.h"
 
@@ -42,8 +40,7 @@
 {
   // This is a necko only interface, so we can enforce version
   // requests as a precondition
-  MOZ_ASSERT(version == SPDY_VERSION_3 ||
-             version == SPDY_VERSION_31 ||
+  MOZ_ASSERT(version == SPDY_VERSION_31 ||
              version == HTTP_VERSION_2 ||
              version == NS_HTTP2_DRAFT_VERSION,
              "Unsupported spdy version");
@@ -55,11 +52,9 @@
 
   Telemetry::Accumulate(Telemetry::SPDY_VERSION2, version);
 
-  if (version == SPDY_VERSION_3) {
-    return new SpdySession3(aTransport);
-  } else  if (version == SPDY_VERSION_31) {
+  if (version == SPDY_VERSION_31) {
     return new SpdySession31(aTransport);
-  } else  if (version == NS_HTTP2_DRAFT_VERSION || version == HTTP_VERSION_2) {
+  } else if (version == NS_HTTP2_DRAFT_VERSION || version == HTTP_VERSION_2) {
     return new Http2Session(aTransport);
   }
 
@@ -74,25 +69,21 @@
 {
   // highest index of enabled protocols is the
   // most preferred for ALPN negotiaton
-  Version[0] = SPDY_VERSION_3;
-  VersionString[0] = NS_LITERAL_CSTRING("spdy/3");
+  Version[0] = SPDY_VERSION_31;
+  VersionString[0] = NS_LITERAL_CSTRING("spdy/3.1");
   ALPNCallbacks[0] = SpdySessionTrue;
 
-  Version[1] = SPDY_VERSION_31;
-  VersionString[1] = NS_LITERAL_CSTRING("spdy/3.1");
-  ALPNCallbacks[1] = SpdySessionTrue;
+  Version[1] = HTTP_VERSION_2;
+  VersionString[1] = NS_LITERAL_CSTRING("h2");
+  ALPNCallbacks[1] = Http2Session::ALPNCallback;
 
-  Version[2] = HTTP_VERSION_2;
-  VersionString[2] = NS_LITERAL_CSTRING("h2");
+  Version[2] = NS_HTTP2_DRAFT_VERSION;
+  VersionString[2] = NS_LITERAL_CSTRING("h2-14");
   ALPNCallbacks[2] = Http2Session::ALPNCallback;
 
   Version[3] = NS_HTTP2_DRAFT_VERSION;
-  VersionString[3] = NS_LITERAL_CSTRING("h2-14");
+  VersionString[3] = NS_LITERAL_CSTRING(NS_HTTP2_DRAFT_TOKEN);
   ALPNCallbacks[3] = Http2Session::ALPNCallback;
-
-  Version[4] = NS_HTTP2_DRAFT_VERSION;
-  VersionString[4] = NS_LITERAL_CSTRING(NS_HTTP2_DRAFT_TOKEN);
-  ALPNCallbacks[4] = Http2Session::ALPNCallback;
 }
 
 bool
@@ -102,13 +93,11 @@
 
   switch (index) {
   case 0:
-    return gHttpHandler->IsSpdyV3Enabled();
-  case 1:
     return gHttpHandler->IsSpdyV31Enabled();
-  case 2:
+  case 1:
     return gHttpHandler->IsHttp2Enabled();
+  case 2:
   case 3:
-  case 4:
     return gHttpHandler->IsHttp2DraftEnabled();
   }
   return false;
@@ -141,38 +130,11 @@
 
 SpdyPushCache::~SpdyPushCache()
 {
-  mHashSpdy3.Clear();
   mHashSpdy31.Clear();
   mHashHttp2.Clear();
 }
 
 bool
-SpdyPushCache::RegisterPushedStreamSpdy3(nsCString key,
-                                         SpdyPushedStream3 *stream)
-{
-  LOG3(("SpdyPushCache::RegisterPushedStreamSpdy3 %s 0x%X\n",
-        key.get(), stream->StreamID()));
-  if(mHashSpdy3.Get(key)) {
-    LOG3(("SpdyPushCache::RegisterPushedStreamSpdy3 %s 0x%X duplicate key\n",
-          key.get(), stream->StreamID()));
-    return false;
-  }
-  mHashSpdy3.Put(key, stream);
-  return true;
-}
-
-SpdyPushedStream3 *
-SpdyPushCache::RemovePushedStreamSpdy3(nsCString key)
-{
-  SpdyPushedStream3 *rv = mHashSpdy3.Get(key);
-  LOG3(("SpdyPushCache::RemovePushedStream %s 0x%X\n",
-        key.get(), rv ? rv->StreamID() : 0));
-  if (rv)
-    mHashSpdy3.Remove(key);
-  return rv;
-}
-
-bool
 SpdyPushCache::RegisterPushedStreamSpdy31(nsCString key,
                                           SpdyPushedStream31 *stream)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/ASpdySession.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/ASpdySession.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/ASpdySession.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/ASpdySession.h	2014-11-26 21:46:04.000000000 +0000
@@ -74,7 +74,7 @@
   SpdyInformation();
   ~SpdyInformation() {}
 
-  static const uint32_t kCount = 5;
+  static const uint32_t kCount = 4;
 
   // determine the index (0..kCount-1) of the spdy information that
   // correlates to the npn string. NS_FAILED() if no match is found.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/ConnectionDiagnostics.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/ConnectionDiagnostics.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/ConnectionDiagnostics.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/ConnectionDiagnostics.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "nsHttpConnectionMgr.h"
 #include "nsHttpConnection.h"
-#include "SpdySession3.h"
 #include "SpdySession31.h"
 #include "Http2Session.h"
 #include "nsHttpHandler.h"
@@ -161,44 +160,6 @@
     mSpdySession->PrintDiagnostics(log);
 }
 
-
-void
-SpdySession3::PrintDiagnostics(nsCString &log)
-{
-  log.AppendPrintf("     ::: SPDY VERSION 3\n");
-  log.AppendPrintf("     shouldgoaway = %d mClosed = %d CanReuse = %d nextID=0x%X\n",
-                   mShouldGoAway, mClosed, CanReuse(), mNextStreamID);
-
-  log.AppendPrintf("     concurrent = %d maxconcurrent = %d\n",
-                   mConcurrent, mMaxConcurrent);
-
-  log.AppendPrintf("     roomformorestreams = %d roomformoreconcurrent = %d\n",
-                   RoomForMoreStreams(), RoomForMoreConcurrent());
-
-  log.AppendPrintf("     transactionHashCount = %d streamIDHashCount = %d\n",
-                   mStreamTransactionHash.Count(),
-                   mStreamIDHash.Count());
-
-  log.AppendPrintf("     Queued Stream Size = %d\n", mQueuedStreams.GetSize());
-
-  PRIntervalTime now = PR_IntervalNow();
-  log.AppendPrintf("     Ping Threshold = %ums next ping id = 0x%X\n",
-                   PR_IntervalToMilliseconds(mPingThreshold),
-                   mNextPingID);
-  log.AppendPrintf("     Ping Timeout = %ums\n",
-                   PR_IntervalToMilliseconds(gHttpHandler->SpdyPingTimeout()));
-  log.AppendPrintf("     Idle for Any Activity (ping) = %ums\n",
-                   PR_IntervalToMilliseconds(now - mLastReadEpoch));
-  log.AppendPrintf("     Idle for Data Activity = %ums\n",
-                   PR_IntervalToMilliseconds(now - mLastDataReadEpoch));
-  if (mPingSentEpoch)
-    log.AppendPrintf("     Ping Outstanding (ping) = %ums, expired = %d\n",
-                     PR_IntervalToMilliseconds(now - mPingSentEpoch),
-                     now - mPingSentEpoch >= gHttpHandler->SpdyPingTimeout());
-  else
-    log.AppendPrintf("     No Ping Outstanding\n");
-}
-
 void
 SpdySession31::PrintDiagnostics(nsCString &log)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/Http2Session.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/Http2Session.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/Http2Session.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/Http2Session.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1636,7 +1636,7 @@
   if (NS_SUCCEEDED(rv)) {
     rv = Http2Stream::MakeOriginURL(pushedStream->Origin(), pushedURL);
   }
-  LOG3(("Http2Session::RecvPushPromise %p checking %s == %s",
+  LOG3(("Http2Session::RecvPushPromise %p checking %s == %s", self,
         associatedStream->Origin().get(), pushedStream->Origin().get()));
   bool match = false;
   if (NS_SUCCEEDED(rv)) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -76,12 +76,19 @@
   , mProxyResolveFlags(0)
   , mContentDispositionHint(UINT32_MAX)
   , mHttpHandler(gHttpHandler)
+  , mReferrerPolicy(REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE)
   , mRedirectCount(0)
   , mForcePending(false)
 {
   LOG(("Creating HttpBaseChannel @%x\n", this));
 
-  // Subfields of unions cannot be targeted in an initializer list
+  // Subfields of unions cannot be targeted in an initializer list.
+#ifdef MOZ_VALGRIND
+  // Zero the entire unions so that Valgrind doesn't complain when we send them
+  // to another process.
+  memset(&mSelfAddr, 0, sizeof(NetAddr));
+  memset(&mPeerAddr, 0, sizeof(NetAddr));
+#endif
   mSelfAddr.raw.family = PR_AF_UNSPEC;
   mPeerAddr.raw.family = PR_AF_UNSPEC;
 }
@@ -899,14 +906,37 @@
 NS_IMETHODIMP
 HttpBaseChannel::SetReferrer(nsIURI *referrer)
 {
+  return SetReferrerWithPolicy(referrer, REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE);
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetReferrerPolicy(uint32_t *referrerPolicy)
+{
+  NS_ENSURE_ARG_POINTER(referrerPolicy);
+  *referrerPolicy = mReferrerPolicy;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::SetReferrerWithPolicy(nsIURI *referrer,
+                                       uint32_t referrerPolicy)
+{
   ENSURE_CALLED_BEFORE_CONNECT();
 
   // clear existing referrer, if any
   mReferrer = nullptr;
   mRequestHead.ClearHeader(nsHttp::Referer);
+  mReferrerPolicy = REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE;
 
-  if (!referrer)
-      return NS_OK;
+  if (!referrer) {
+    return NS_OK;
+  }
+
+  // Don't send referrer at all when the meta referrer setting is "no-referrer"
+  if (referrerPolicy == REFERRER_POLICY_NO_REFERRER) {
+    mReferrerPolicy = REFERRER_POLICY_NO_REFERRER;
+    return NS_OK;
+  }
 
   // 0: never send referer
   // 1: send referer for direct user action
@@ -929,12 +959,14 @@
 
   // check referrer blocking pref
   uint32_t referrerLevel;
-  if (mLoadFlags & LOAD_INITIAL_DOCUMENT_URI)
+  if (mLoadFlags & LOAD_INITIAL_DOCUMENT_URI) {
     referrerLevel = 1; // user action
-  else
+  } else {
     referrerLevel = 2; // inline content
-  if (userReferrerLevel < referrerLevel)
+  }
+  if (userReferrerLevel < referrerLevel) {
     return NS_OK;
+  }
 
   nsCOMPtr<nsIURI> referrerGrip;
   nsresult rv;
@@ -992,8 +1024,7 @@
     rv = referrer->SchemeIs(*scheme, &match);
     if (NS_FAILED(rv)) return rv;
   }
-  if (!match)
-    return NS_OK; // kick out....
+  if (!match) return NS_OK; // kick out....
 
   //
   // Handle secure referrals.
@@ -1003,28 +1034,52 @@
   //
   rv = referrer->SchemeIs("https", &match);
   if (NS_FAILED(rv)) return rv;
+
   if (match) {
     rv = mURI->SchemeIs("https", &match);
     if (NS_FAILED(rv)) return rv;
-    if (!match)
-      return NS_OK;
 
-    if (!gHttpHandler->SendSecureXSiteReferrer()) {
-      nsAutoCString referrerHost;
-      nsAutoCString host;
-
-      rv = referrer->GetAsciiHost(referrerHost);
-      if (NS_FAILED(rv)) return rv;
-
-      rv = mURI->GetAsciiHost(host);
-      if (NS_FAILED(rv)) return rv;
-
-      // GetAsciiHost returns lowercase hostname.
-      if (!referrerHost.Equals(host))
-        return NS_OK;
+    // It's ok to send referrer for https-to-http scenarios if the referrer
+    // policy is "unsafe-url" or "origin".
+    if (referrerPolicy != REFERRER_POLICY_UNSAFE_URL &&
+        referrerPolicy != REFERRER_POLICY_ORIGIN) {
+
+      // in other referrer policies, https->http is not allowed...
+      if (!match) return NS_OK;
+
+      // ...and https->https is possibly only allowed if the hosts match.
+      if (!gHttpHandler->SendSecureXSiteReferrer()) {
+        nsAutoCString referrerHost;
+        nsAutoCString host;
+
+        rv = referrer->GetAsciiHost(referrerHost);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = mURI->GetAsciiHost(host);
+        if (NS_FAILED(rv)) return rv;
+
+        // GetAsciiHost returns lowercase hostname.
+        if (!referrerHost.Equals(host))
+          return NS_OK;
+      }
     }
   }
 
+  // for cross-origin-based referrer changes (not just host-based), figure out
+  // if the referrer is being sent cross-origin.
+  nsCOMPtr<nsIURI> loadingURI;
+  bool isCrossOrigin = true;
+  if (mLoadInfo) {
+    mLoadInfo->LoadingPrincipal()->GetURI(getter_AddRefs(loadingURI));
+  }
+  if (loadingURI) {
+    nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
+    rv = ssm->CheckSameOriginURI(loadingURI, mURI, false);
+    isCrossOrigin = NS_FAILED(rv);
+  } else {
+    NS_WARNING("no loading principal available via loadInfo, assumming load is cross-origin");
+  }
+
   nsCOMPtr<nsIURI> clone;
   //
   // we need to clone the referrer, so we can:
@@ -1032,6 +1087,7 @@
   //  (2) keep a reference to it after returning from this function
   //
   // Use CloneIgnoringRef to strip away any fragment per RFC 2616 section 14.36
+  // and Referrer Policy section 6.3.5.
   rv = referrer->CloneIgnoringRef(getter_AddRefs(clone));
   if (NS_FAILED(rv)) return rv;
 
@@ -1077,11 +1133,22 @@
   }
 
   // strip away any userpass; we don't want to be giving out passwords ;-)
+  // This is required by Referrer Policy stripping algorithm.
   rv = clone->SetUserPass(EmptyCString());
   if (NS_FAILED(rv)) return rv;
 
   nsAutoCString spec;
 
+  // site-specified referrer trimming may affect the trim level
+  // "unsafe-url" behaves like "origin" (send referrer in the same situations) but
+  // "unsafe-url" sends the whole referrer and origin removes the path.
+  // "origin-when-cross-origin" trims the referrer only when the request is
+  // cross-origin.
+  if (referrerPolicy == REFERRER_POLICY_ORIGIN ||
+      (isCrossOrigin && referrerPolicy == REFERRER_POLICY_ORIGIN_WHEN_XORIGIN)) {
+    userReferrerTrimmingPolicy = 2;
+  }
+
   // check how much referer to send
   switch (userReferrerTrimmingPolicy) {
 
@@ -1117,8 +1184,11 @@
   }
 
   // finally, remember the referrer URI and set the Referer header.
+  rv = SetRequestHeader(NS_LITERAL_CSTRING("Referer"), spec, false);
+  if (NS_FAILED(rv)) return rv;
+
   mReferrer = clone;
-  mRequestHead.SetHeader(nsHttp::Referer, spec);
+  mReferrerPolicy = referrerPolicy;
   return NS_OK;
 }
 
@@ -2071,7 +2141,7 @@
   }
   // convey the referrer if one was used for this channel to the next one
   if (mReferrer)
-    httpChannel->SetReferrer(mReferrer);
+    httpChannel->SetReferrerWithPolicy(mReferrer, mReferrerPolicy);
   // convey the mAllowPipelining and mAllowSTS flags
   httpChannel->SetAllowPipelining(mAllowPipelining);
   httpChannel->SetAllowSTS(mAllowSTS);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpBaseChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpBaseChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpBaseChannel.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpBaseChannel.h	2014-11-26 21:46:04.000000000 +0000
@@ -133,6 +133,8 @@
   NS_IMETHOD SetRequestMethod(const nsACString& aMethod);
   NS_IMETHOD GetReferrer(nsIURI **referrer);
   NS_IMETHOD SetReferrer(nsIURI *referrer);
+  NS_IMETHOD GetReferrerPolicy(uint32_t *referrerPolicy);
+  NS_IMETHOD SetReferrerWithPolicy(nsIURI *referrer, uint32_t referrerPolicy);
   NS_IMETHOD GetRequestHeader(const nsACString& aHeader, nsACString& aValue);
   NS_IMETHOD SetRequestHeader(const nsACString& aHeader,
                               const nsACString& aValue, bool aMerge);
@@ -383,6 +385,8 @@
 
   nsRefPtr<nsHttpHandler>           mHttpHandler;  // keep gHttpHandler alive
 
+  uint32_t                          mReferrerPolicy;
+
   // Performance tracking
   // The initiator type (for this resource) - how was the resource referenced in
   // the HTML file.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpChannelChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpChannelChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpChannelChild.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpChannelChild.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1244,12 +1244,18 @@
 propagateLoadInfo(nsILoadInfo *aLoadInfo,
                   HttpChannelOpenArgs& openArgs)
 {
-  mozilla::ipc::PrincipalInfo principalInfo;
+  mozilla::ipc::PrincipalInfo requestingPrincipalInfo;
+  mozilla::ipc::PrincipalInfo triggeringPrincipalInfo;
 
   if (aLoadInfo) {
     mozilla::ipc::PrincipalToPrincipalInfo(aLoadInfo->LoadingPrincipal(),
-                                           &principalInfo);
-    openArgs.requestingPrincipalInfo() = principalInfo;
+                                           &requestingPrincipalInfo);
+    openArgs.requestingPrincipalInfo() = requestingPrincipalInfo;
+
+    mozilla::ipc::PrincipalToPrincipalInfo(aLoadInfo->TriggeringPrincipal(),
+                                           &triggeringPrincipalInfo);
+    openArgs.triggeringPrincipalInfo() = triggeringPrincipalInfo;
+
     openArgs.securityFlags() = aLoadInfo->GetSecurityFlags();
     openArgs.contentPolicyType() = aLoadInfo->GetContentPolicyType();
     return;
@@ -1257,8 +1263,9 @@
 
   // use default values if no loadInfo is provided
   mozilla::ipc::PrincipalToPrincipalInfo(nsContentUtils::GetSystemPrincipal(),
-                                         &principalInfo);
-  openArgs.requestingPrincipalInfo() = principalInfo;
+                                         &requestingPrincipalInfo);
+  openArgs.requestingPrincipalInfo() = requestingPrincipalInfo;
+  openArgs.triggeringPrincipalInfo() = requestingPrincipalInfo;
   openArgs.securityFlags() = nsILoadInfo::SEC_NORMAL;
   openArgs.contentPolicyType() = nsIContentPolicy::TYPE_OTHER;
 }
@@ -1467,6 +1474,7 @@
   SerializeURI(mOriginalURI, openArgs.original());
   SerializeURI(mDocumentURI, openArgs.doc());
   SerializeURI(mReferrer, openArgs.referrer());
+  openArgs.referrerPolicy() = mReferrerPolicy;
   SerializeURI(mAPIRedirectToURI, openArgs.apiRedirectTo());
   openArgs.loadFlags() = mLoadFlags;
   openArgs.requestHeaders() = mClientSetRequestHeaders;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpChannelParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpChannelParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpChannelParent.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpChannelParent.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -97,7 +97,7 @@
   {
     const HttpChannelOpenArgs& a = aArgs.get_HttpChannelOpenArgs();
     return DoAsyncOpen(a.uri(), a.original(), a.doc(), a.referrer(),
-                       a.apiRedirectTo(), a.topWindowURI(),
+                       a.referrerPolicy(), a.apiRedirectTo(), a.topWindowURI(),
                        a.loadFlags(), a.requestHeaders(),
                        a.requestMethod(), a.uploadStream(),
                        a.uploadStreamHasHeaders(), a.priority(),
@@ -105,8 +105,8 @@
                        a.thirdPartyFlags(), a.resumeAt(), a.startPos(),
                        a.entityID(), a.chooseApplicationCache(),
                        a.appCacheClientID(), a.allowSpdy(), a.fds(),
-                       a.requestingPrincipalInfo(), a.securityFlags(),
-                       a.contentPolicyType());
+                       a.requestingPrincipalInfo(), a.triggeringPrincipalInfo(),
+                       a.securityFlags(), a.contentPolicyType());
   }
   case HttpChannelCreationArgs::THttpChannelConnectArgs:
   {
@@ -172,6 +172,7 @@
                                  const OptionalURIParams&   aOriginalURI,
                                  const OptionalURIParams&   aDocURI,
                                  const OptionalURIParams&   aReferrerURI,
+                                 const uint32_t&            aReferrerPolicy,
                                  const OptionalURIParams&   aAPIRedirectToURI,
                                  const OptionalURIParams&   aTopWindowURI,
                                  const uint32_t&            aLoadFlags,
@@ -192,6 +193,7 @@
                                  const bool&                allowSpdy,
                                  const OptionalFileDescriptorSet& aFds,
                                  const ipc::PrincipalInfo&  aRequestingPrincipalInfo,
+                                 const ipc::PrincipalInfo&  aTriggeringPrincipalInfo,
                                  const uint32_t&            aSecurityFlags,
                                  const uint32_t&            aContentPolicyType)
 {
@@ -223,6 +225,11 @@
   if (NS_FAILED(rv)) {
     return SendFailedAsyncOpen(rv);
   }
+  nsCOMPtr<nsIPrincipal> triggeringPrincipal =
+    mozilla::ipc::PrincipalInfoToPrincipal(aTriggeringPrincipalInfo, &rv);
+  if (NS_FAILED(rv)) {
+    return SendFailedAsyncOpen(rv);
+  }
 
   bool appOffline = false;
   uint32_t appId = GetAppId();
@@ -239,15 +246,16 @@
   }
 
   nsCOMPtr<nsIChannel> channel;
-  rv = NS_NewChannel(getter_AddRefs(channel),
-                     uri,
-                     requestingPrincipal,
-                     aSecurityFlags,
-                     aContentPolicyType,
-                     nullptr,   // loadGroup
-                     nullptr,   // aCallbacks
-                     loadFlags,
-                     ios);
+  rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(channel),
+                                            uri,
+                                            requestingPrincipal,
+                                            triggeringPrincipal,
+                                            aSecurityFlags,
+                                            aContentPolicyType,
+                                            nullptr,   // loadGroup
+                                            nullptr,   // aCallbacks
+                                            loadFlags,
+                                            ios);
 
   if (NS_FAILED(rv))
     return SendFailedAsyncOpen(rv);
@@ -266,7 +274,7 @@
   if (docUri)
     mChannel->SetDocumentURI(docUri);
   if (referrerUri)
-    mChannel->SetReferrerInternal(referrerUri);
+    mChannel->SetReferrerWithPolicyInternal(referrerUri, aReferrerPolicy);
   if (apiRedirectToUri)
     mChannel->RedirectTo(apiRedirectToUri);
   if (topWindowUri)
@@ -961,11 +969,6 @@
 
   mDivertListener = aListener;
 
-  if (NS_WARN_IF(mIPCClosed || !SendFlushedForDiversion())) {
-    FailDiversion(NS_ERROR_UNEXPECTED);
-    return;
-  }
-
   // Call OnStartRequest and SendDivertMessages asynchronously to avoid
   // reentering client context.
   NS_DispatchToCurrentThread(
@@ -1013,6 +1016,11 @@
   MOZ_ASSERT(NS_SUCCEEDED(rvdbg));
   mDivertListener = nullptr;
 
+  if (NS_WARN_IF(mIPCClosed || !SendFlushedForDiversion())) {
+    FailDiversion(NS_ERROR_UNEXPECTED);
+    return;
+  }
+
   // The listener chain should now be setup; tell HttpChannelChild to divert
   // the OnDataAvailables and OnStopRequest to this HttpChannelParent.
   if (NS_WARN_IF(mIPCClosed || !SendDivertMessages())) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpChannelParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpChannelParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/HttpChannelParent.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/HttpChannelParent.h	2014-11-26 21:46:04.000000000 +0000
@@ -90,6 +90,7 @@
                    const OptionalURIParams&   originalUri,
                    const OptionalURIParams&   docUri,
                    const OptionalURIParams&   referrerUri,
+                   const uint32_t&            referrerPolicy,
                    const OptionalURIParams&   internalRedirectUri,
                    const OptionalURIParams&   topWindowUri,
                    const uint32_t&            loadFlags,
@@ -110,6 +111,7 @@
                    const bool&                allowSpdy,
                    const OptionalFileDescriptorSet& aFds,
                    const ipc::PrincipalInfo&  aRequestingPrincipalInfo,
+                   const ipc::PrincipalInfo&  aTriggeringPrincipalInfo,
                    const uint32_t&            aSecurityFlags,
                    const uint32_t&            aContentPolicyType);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/moz.build	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/moz.build	2014-11-26 21:46:04.000000000 +0000
@@ -75,11 +75,8 @@
     'nsHttpResponseHead.cpp',
     'nsHttpTransaction.cpp',
     'NullHttpTransaction.cpp',
-    'SpdyPush3.cpp',
     'SpdyPush31.cpp',
-    'SpdySession3.cpp',
     'SpdySession31.cpp',
-    'SpdyStream3.cpp',
     'SpdyStream31.cpp',
     'SpdyZlibReporter.cpp',
     'TunnelUtils.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpChannel.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpChannel.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1438,7 +1438,15 @@
     // notify "http-on-examine-response" observers
     gHttpHandler->OnExamineResponse(this);
 
-    SetCookie(mResponseHead->PeekHeader(nsHttp::Set_Cookie));
+    // Cookies and Alt-Service should not be handled on proxy failure either.
+    // This would be consolidated with ProcessSecurityHeaders but it should
+    // happen after OnExamineResponse.
+    if (!mTransaction->ProxyConnectFailed() && (httpStatus != 407)) {
+        SetCookie(mResponseHead->PeekHeader(nsHttp::Set_Cookie));
+        if (httpStatus < 500) {
+            ProcessAltService();
+        }
+    }
 
     // handle unused username and password in url (see bug 232567)
     if (httpStatus != 401 && httpStatus != 407) {
@@ -1454,10 +1462,6 @@
         LOG(("  continuation state has been reset"));
     }
 
-    if (httpStatus < 500) {
-        ProcessAltService();
-    }
-
     bool successfulReval = false;
 
     // handle different server response categories.  Note that we handle
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpChannel.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpChannel.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpChannel.h	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpChannel.h	2014-11-26 21:46:04.000000000 +0000
@@ -142,11 +142,13 @@
     void SetUploadStreamHasHeaders(bool hasHeaders)
       { mUploadStreamHasHeaders = hasHeaders; }
 
-    nsresult SetReferrerInternal(nsIURI *referrer) {
+    nsresult SetReferrerWithPolicyInternal(nsIURI *referrer,
+                                           uint32_t referrerPolicy) {
         nsAutoCString spec;
         nsresult rv = referrer->GetAsciiSpec(spec);
         if (NS_FAILED(rv)) return rv;
         mReferrer = referrer;
+        mReferrerPolicy = referrerPolicy;
         mRequestHead.SetHeader(nsHttp::Referer, spec);
         return NS_OK;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpConnection.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpConnection.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpConnection.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpConnection.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1644,7 +1644,8 @@
         return NS_ERROR_FAILURE; // stop iterating
     }
 
-    if (ChaosMode::isActive() && ChaosMode::randomUint32LessThan(2)) {
+    if (ChaosMode::isActive(ChaosMode::IOAmounts) &&
+        ChaosMode::randomUint32LessThan(2)) {
         // read 1...count bytes
         count = ChaosMode::randomUint32LessThan(count) + 1;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -55,7 +55,7 @@
     for (int32_t i=pendingQ.Length()-1; i>=0; --i) {
         nsHttpTransaction *t = pendingQ[i];
         if (trans->Priority() >= t->Priority()) {
-            if (ChaosMode::isActive()) {
+	  if (ChaosMode::isActive(ChaosMode::NetworkScheduling)) {
                 int32_t samePriorityCount;
                 for (samePriorityCount = 0; i - samePriorityCount >= 0; ++samePriorityCount) {
                     if (pendingQ[i - samePriorityCount]->Priority() != trans->Priority()) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttp.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttp.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttp.h	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttp.h	2014-11-26 21:46:04.000000000 +0000
@@ -27,8 +27,8 @@
 
 namespace net {
     enum {
-        SPDY_VERSION_2_REMOVED = 2,
-        SPDY_VERSION_3 = 3,
+        // SPDY_VERSION_2 = 2, REMOVED
+        // SPDY_VERSION_3 = 3, REMOVED
         SPDY_VERSION_31 = 4,
         HTTP_VERSION_2 = 5,
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpHandler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpHandler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpHandler.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpHandler.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -179,7 +179,6 @@
     , mAllowExperiments(true)
     , mHandlerActive(false)
     , mEnableSpdy(false)
-    , mSpdyV3(true)
     , mSpdyV31(true)
     , mHttp2DraftEnabled(true)
     , mHttp2Enabled(true)
@@ -1177,12 +1176,6 @@
             mEnableSpdy = cVar;
     }
 
-    if (PREF_CHANGED(HTTP_PREF("spdy.enabled.v3"))) {
-        rv = prefs->GetBoolPref(HTTP_PREF("spdy.enabled.v3"), &cVar);
-        if (NS_SUCCEEDED(rv))
-            mSpdyV3 = cVar;
-    }
-
     if (PREF_CHANGED(HTTP_PREF("spdy.enabled.v3-1"))) {
         rv = prefs->GetBoolPref(HTTP_PREF("spdy.enabled.v3-1"), &cVar);
         if (NS_SUCCEEDED(rv))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsHttpHandler.h	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsHttpHandler.h	2014-11-26 21:46:05.000000000 +0000
@@ -96,7 +96,6 @@
     bool           AllowExperiments() { return mTelemetryEnabled && mAllowExperiments; }
 
     bool           IsSpdyEnabled() { return mEnableSpdy; }
-    bool           IsSpdyV3Enabled() { return mSpdyV3; }
     bool           IsSpdyV31Enabled() { return mSpdyV31; }
     bool           IsHttp2DraftEnabled() { return mHttp2DraftEnabled; }
     bool           IsHttp2Enabled() { return mHttp2DraftEnabled && mHttp2Enabled; }
@@ -468,7 +467,6 @@
     uint32_t           mHandlerActive : 1;
 
     uint32_t           mEnableSpdy : 1;
-    uint32_t           mSpdyV3 : 1;
     uint32_t           mSpdyV31 : 1;
     uint32_t           mHttp2DraftEnabled : 1;
     uint32_t           mHttp2Enabled : 1;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsIHttpChannel.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsIHttpChannel.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/nsIHttpChannel.idl	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/nsIHttpChannel.idl	2014-11-26 21:46:05.000000000 +0000
@@ -14,7 +14,7 @@
  * the inspection of the resulting HTTP response status and headers when they
  * become available.
  */
-[scriptable, uuid(1bc753ad-5b88-454d-b4c0-4fd34cce6d96)]
+[scriptable, uuid(82083578-fb78-4f9a-953c-cecbae500697)]
 interface nsIHttpChannel : nsIChannel
 {
     /**************************************************************************
@@ -56,6 +56,33 @@
     attribute nsIURI referrer;
 
     /**
+     * Referrer policies. See ReferrerPolicy.h for more details.
+     */
+
+    /*   default state, doesn't send referrer from https->http          */
+    const unsigned long REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE = 0;
+    /*   sends no referrer                                              */
+    const unsigned long REFERRER_POLICY_NO_REFERRER                = 1;
+    /*   only sends the origin of the referring URL                     */
+    const unsigned long REFERRER_POLICY_ORIGIN                     = 2;
+    /*   same as default, but reduced to ORIGIN when cross-origin.      */
+    const unsigned long REFERRER_POLICY_ORIGIN_WHEN_XORIGIN        = 3;
+    /*   always sends the referrer, even on downgrade.                  */
+    const unsigned long REFERRER_POLICY_UNSAFE_URL                 = 4;
+
+    /**
+     * Get the HTTP referrer policy.  The policy is retrieved from the meta
+     * referrer tag, which can be one of many values (see ReferrerPolicy.h for
+     * more details).
+     */
+    readonly attribute unsigned long referrerPolicy;
+
+    /**
+     * Set the HTTP referrer URI with a referrer policy.
+     */
+    void setReferrerWithPolicy(in nsIURI referrer, in unsigned long referrerPolicy);
+
+    /**
      * Get the value of a particular request header.
      *
      * @param aHeader
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/PSpdyPush.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/PSpdyPush.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/PSpdyPush.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/PSpdyPush.h	2014-11-26 21:46:04.000000000 +0000
@@ -34,7 +34,6 @@
 namespace mozilla {
 namespace net {
 
-class SpdyPushedStream3;
 class SpdyPushedStream31;
 class Http2PushedStream;
 
@@ -46,15 +45,6 @@
   SpdyPushCache();
   virtual ~SpdyPushCache();
 
-// for spdy/3
-public:
-  bool               RegisterPushedStreamSpdy3(nsCString key,
-                                               SpdyPushedStream3 *stream);
-  SpdyPushedStream3 *RemovePushedStreamSpdy3(nsCString key);
-
-private:
-  nsDataHashtable<nsCStringHashKey, SpdyPushedStream3 *> mHashSpdy3;
-
 // for spdy/3.1
 public:
   bool               RegisterPushedStreamSpdy31(nsCString key,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyPush3.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyPush3.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyPush3.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyPush3.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,379 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 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/. */
-
-// HttpLog.h should generally be included first
-#include "HttpLog.h"
-
-// Log on level :5, instead of default :4.
-#undef LOG
-#define LOG(args) LOG5(args)
-#undef LOG_ENABLED
-#define LOG_ENABLED() LOG5_ENABLED()
-
-#include <algorithm>
-
-#include "SpdyPush3.h"
-#include "PSpdyPush.h"
-#include "SpdySession3.h"
-#include "nsHttpRequestHead.h"
-
-namespace mozilla {
-namespace net {
-
-//////////////////////////////////////////
-// SpdyPushedStream3
-//////////////////////////////////////////
-
-SpdyPushedStream3::SpdyPushedStream3(SpdyPush3TransactionBuffer *aTransaction,
-                                     SpdySession3 *aSession,
-                                     SpdyStream3 *aAssociatedStream,
-                                     uint32_t aID)
-  :SpdyStream3(aTransaction, aSession,
-               0 /* priority is only for sending, so ignore it on push */)
-    , mConsumerStream(nullptr)
-    , mBufferedPush(aTransaction)
-    , mStatus(NS_OK)
-    , mPushCompleted(false)
-    , mDeferCleanupOnSuccess(true)
-{
-  LOG3(("SpdyPushedStream3 ctor this=%p 0x%X\n", this, aID));
-  mStreamID = aID;
-  mBufferedPush->SetPushStream(this);
-  mLoadGroupCI = aAssociatedStream->LoadGroupConnectionInfo();
-  mLastRead = TimeStamp::Now();
-}
-
-bool
-SpdyPushedStream3::GetPushComplete()
-{
-  return mPushCompleted;
-}
-
-nsresult
-SpdyPushedStream3::WriteSegments(nsAHttpSegmentWriter *writer,
-                                 uint32_t count,
-                                 uint32_t *countWritten)
-{
-  nsresult rv = SpdyStream3::WriteSegments(writer, count, countWritten);
-  if (NS_SUCCEEDED(rv) && *countWritten) {
-    mLastRead = TimeStamp::Now();
-  }
-
-  if (rv == NS_BASE_STREAM_CLOSED) {
-    mPushCompleted = true;
-    rv = NS_OK; // this is what a normal HTTP transaction would do
-  }
-  if (rv != NS_BASE_STREAM_WOULD_BLOCK && NS_FAILED(rv))
-    mStatus = rv;
-  return rv;
-}
-
-nsresult
-SpdyPushedStream3::ReadSegments(nsAHttpSegmentReader *,  uint32_t, uint32_t *count)
-{
-  // The SYN_STREAM for this has been processed, so we need to verify
-  // that :host, :scheme, and :path MUST be present
-  nsDependentCSubstring host, scheme, path;
-  nsresult rv;
-
-  rv = SpdyStream3::FindHeader(NS_LITERAL_CSTRING(":host"), host);
-  if (NS_FAILED(rv)) {
-    LOG3(("SpdyPushedStream3::ReadSegments session=%p ID 0x%X "
-          "push without required :host\n", mSession, mStreamID));
-    return rv;
-  }
-
-  rv = SpdyStream3::FindHeader(NS_LITERAL_CSTRING(":scheme"), scheme);
-  if (NS_FAILED(rv)) {
-    LOG3(("SpdyPushedStream3::ReadSegments session=%p ID 0x%X "
-          "push without required :scheme\n", mSession, mStreamID));
-    return rv;
-  }
-
-  rv = SpdyStream3::FindHeader(NS_LITERAL_CSTRING(":path"), path);
-  if (NS_FAILED(rv)) {
-    LOG3(("SpdyPushedStream3::ReadSegments session=%p ID 0x%X "
-          "push without required :host\n", mSession, mStreamID));
-    return rv;
-  }
-
-  CreatePushHashKey(nsCString(scheme), nsCString(host),
-                    mSession->Serial(), path,
-                    mOrigin, mHashKey);
-
-  LOG3(("SpdyPushStream3 0x%X hash key %s\n", mStreamID, mHashKey.get()));
-
-  // the write side of a pushed transaction just involves manipulating a little state
-  SpdyStream3::mSentFinOnData = 1;
-  SpdyStream3::mSynFrameComplete = 1;
-  SpdyStream3::ChangeState(UPSTREAM_COMPLETE);
-  *count = 0;
-  return NS_OK;
-}
-
-bool
-SpdyPushedStream3::GetHashKey(nsCString &key)
-{
-  if (mHashKey.IsEmpty())
-    return false;
-
-  key = mHashKey;
-  return true;
-}
-
-void
-SpdyPushedStream3::ConnectPushedStream(SpdyStream3 *stream)
-{
-  mSession->ConnectPushedStream(stream);
-}
-
-bool
-SpdyPushedStream3::IsOrphaned(TimeStamp now)
-{
-  MOZ_ASSERT(!now.IsNull());
-
-  // if spdy is not transmitting, and is also not connected to a consumer
-  // stream, and its been like that for too long then it is oprhaned
-
-  if (mConsumerStream)
-    return false;
-
-  bool rv = ((now - mLastRead).ToSeconds() > 30.0);
-  if (rv) {
-    LOG3(("SpdyPushCache::IsOrphaned 0x%X IsOrphaned %3.2f\n",
-          mStreamID, (now - mLastRead).ToSeconds()));
-  }
-  return rv;
-}
-
-nsresult
-SpdyPushedStream3::GetBufferedData(char *buf,
-                                   uint32_t count,
-                                   uint32_t *countWritten)
-{
-  if (NS_FAILED(mStatus))
-    return mStatus;
-
-  nsresult rv = mBufferedPush->GetBufferedData(buf, count, countWritten);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!*countWritten)
-    rv = GetPushComplete() ? NS_BASE_STREAM_CLOSED : NS_BASE_STREAM_WOULD_BLOCK;
-
-  return rv;
-}
-
-//////////////////////////////////////////
-// SpdyPush3TransactionBuffer
-// This is the nsAHttpTransction owned by the stream when the pushed
-// stream has not yet been matched with a pull request
-//////////////////////////////////////////
-
-NS_IMPL_ISUPPORTS0(SpdyPush3TransactionBuffer)
-
-SpdyPush3TransactionBuffer::SpdyPush3TransactionBuffer()
-  : mStatus(NS_OK)
-  , mRequestHead(nullptr)
-  , mPushStream(nullptr)
-  , mIsDone(false)
-  , mBufferedHTTP1Size(kDefaultBufferSize)
-  , mBufferedHTTP1Used(0)
-  , mBufferedHTTP1Consumed(0)
-{
-  mBufferedHTTP1 = new char[mBufferedHTTP1Size];
-}
-
-SpdyPush3TransactionBuffer::~SpdyPush3TransactionBuffer()
-{
-  delete mRequestHead;
-}
-
-void
-SpdyPush3TransactionBuffer::SetConnection(nsAHttpConnection *conn)
-{
-}
-
-nsAHttpConnection *
-SpdyPush3TransactionBuffer::Connection()
-{
-  return nullptr;
-}
-
-void
-SpdyPush3TransactionBuffer::GetSecurityCallbacks(nsIInterfaceRequestor **outCB)
-{
-  *outCB = nullptr;
-}
-
-void
-SpdyPush3TransactionBuffer::OnTransportStatus(nsITransport* transport,
-                                       nsresult status, uint64_t progress)
-{
-}
-
-nsHttpConnectionInfo *
-SpdyPush3TransactionBuffer::ConnectionInfo()
-{
-  if (!mPushStream) {
-    return nullptr;
-  }
-  if (!mPushStream->Transaction()) {
-    return nullptr;
-  }
-  MOZ_ASSERT(mPushStream->Transaction() != this);
-  return mPushStream->Transaction()->ConnectionInfo();
-}
-
-bool
-SpdyPush3TransactionBuffer::IsDone()
-{
-  return mIsDone;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::Status()
-{
-  return mStatus;
-}
-
-uint32_t
-SpdyPush3TransactionBuffer::Caps()
-{
-  return 0;
-}
-
-void
-SpdyPush3TransactionBuffer::SetDNSWasRefreshed()
-{
-}
-
-uint64_t
-SpdyPush3TransactionBuffer::Available()
-{
-  return mBufferedHTTP1Used - mBufferedHTTP1Consumed;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::ReadSegments(nsAHttpSegmentReader *reader,
-                                  uint32_t count, uint32_t *countRead)
-{
-  *countRead = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::WriteSegments(nsAHttpSegmentWriter *writer,
-                                         uint32_t count, uint32_t *countWritten)
-{
-  if ((mBufferedHTTP1Size - mBufferedHTTP1Used) < 20480) {
-    EnsureBuffer(mBufferedHTTP1, mBufferedHTTP1Size + kDefaultBufferSize,
-                 mBufferedHTTP1Used, mBufferedHTTP1Size);
-  }
-
-  count = std::min(count, mBufferedHTTP1Size - mBufferedHTTP1Used);
-  nsresult rv = writer->OnWriteSegment(mBufferedHTTP1 + mBufferedHTTP1Used,
-                                       count, countWritten);
-  if (NS_SUCCEEDED(rv)) {
-    mBufferedHTTP1Used += *countWritten;
-  }
-  else if (rv == NS_BASE_STREAM_CLOSED) {
-    mIsDone = true;
-  }
-
-  if (Available()) {
-    SpdyStream3 *consumer = mPushStream->GetConsumerStream();
-
-    if (consumer) {
-      LOG3(("SpdyPush3TransactionBuffer::WriteSegments notifying connection "
-            "consumer data available 0x%X [%u]\n",
-            mPushStream->StreamID(), Available()));
-      mPushStream->ConnectPushedStream(consumer);
-    }
-  }
-
-  return rv;
-}
-
-uint32_t
-SpdyPush3TransactionBuffer::Http1xTransactionCount()
-{
-  return 0;
-}
-
-nsHttpRequestHead *
-SpdyPush3TransactionBuffer::RequestHead()
-{
-  if (!mRequestHead)
-    mRequestHead = new nsHttpRequestHead();
-  return mRequestHead;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::TakeSubTransactions(
-  nsTArray<nsRefPtr<nsAHttpTransaction> > &outTransactions)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-void
-SpdyPush3TransactionBuffer::SetProxyConnectFailed()
-{
-}
-
-void
-SpdyPush3TransactionBuffer::Close(nsresult reason)
-{
-  mStatus = reason;
-  mIsDone = true;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::AddTransaction(nsAHttpTransaction *trans)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-uint32_t
-SpdyPush3TransactionBuffer::PipelineDepth()
-{
-  return 0;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::SetPipelinePosition(int32_t position)
-{
-    return NS_OK;
-}
-
-int32_t
-SpdyPush3TransactionBuffer::PipelinePosition()
-{
-  return 1;
-}
-
-nsresult
-SpdyPush3TransactionBuffer::GetBufferedData(char *buf,
-                                           uint32_t count,
-                                           uint32_t *countWritten)
-{
-  *countWritten = std::min(count, static_cast<uint32_t>(Available()));
-  if (*countWritten) {
-    memcpy(buf, mBufferedHTTP1 + mBufferedHTTP1Consumed, *countWritten);
-    mBufferedHTTP1Consumed += *countWritten;
-  }
-
-  // If all the data has been consumed then reset the buffer
-  if (mBufferedHTTP1Consumed == mBufferedHTTP1Used) {
-    mBufferedHTTP1Consumed = 0;
-    mBufferedHTTP1Used = 0;
-  }
-
-  return NS_OK;
-}
-
-} // namespace mozilla::net
-} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyPush3.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyPush3.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyPush3.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyPush3.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// SPDY Server Push as defined by
-// http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3
-
-#ifndef mozilla_net_SpdyPush3_Internal_h
-#define mozilla_net_SpdyPush3_Internal_h
-
-#include "mozilla/Attributes.h"
-#include "mozilla/TimeStamp.h"
-#include "nsILoadGroup.h"
-#include "nsString.h"
-#include "SpdyStream3.h"
-
-namespace mozilla {
-namespace net {
-
-class SpdySession3;
-
-class SpdyPush3TransactionBuffer;
-
-class SpdyPushedStream3 MOZ_FINAL : public SpdyStream3
-{
-public:
-  SpdyPushedStream3(SpdyPush3TransactionBuffer *aTransaction,
-                    SpdySession3 *aSession,
-                    SpdyStream3 *aAssociatedStream,
-                    uint32_t aID);
-  virtual ~SpdyPushedStream3() {}
-
-  bool GetPushComplete();
-  SpdyStream3 *GetConsumerStream() { return mConsumerStream; };
-  void SetConsumerStream(SpdyStream3 *aStream) { mConsumerStream = aStream; }
-  bool GetHashKey(nsCString &key);
-
-  // override of SpdyStream3
-  nsresult ReadSegments(nsAHttpSegmentReader *,  uint32_t, uint32_t *);
-  nsresult WriteSegments(nsAHttpSegmentWriter *, uint32_t, uint32_t *);
-
-  nsILoadGroupConnectionInfo *LoadGroupConnectionInfo() { return mLoadGroupCI; };
-  void ConnectPushedStream(SpdyStream3 *consumer);
-
-  bool DeferCleanupOnSuccess() { return mDeferCleanupOnSuccess; }
-  void SetDeferCleanupOnSuccess(bool val) { mDeferCleanupOnSuccess = val; }
-
-  bool IsOrphaned(TimeStamp now);
-
-  nsresult GetBufferedData(char *buf, uint32_t count, uint32_t *countWritten);
-
-  // overload of SpdyStream3
-  virtual bool HasSink() { return !!mConsumerStream; }
-
-private:
-
-  SpdyStream3 *mConsumerStream; // paired request stream that consumes from
-                                // real spdy one.. null until a match is made.
-
-  nsCOMPtr<nsILoadGroupConnectionInfo> mLoadGroupCI;
-
-  SpdyPush3TransactionBuffer *mBufferedPush;
-  TimeStamp          mLastRead;
-
-  nsCString mHashKey;
-  nsresult mStatus;
-  bool mPushCompleted; // server push FIN received
-  bool mDeferCleanupOnSuccess;
-};
-
-class SpdyPush3TransactionBuffer MOZ_FINAL : public nsAHttpTransaction
-{
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSAHTTPTRANSACTION
-
-  SpdyPush3TransactionBuffer();
-
-  nsresult GetBufferedData(char *buf, uint32_t count, uint32_t *countWritten);
-  void SetPushStream(SpdyPushedStream3 *stream) { mPushStream = stream; }
-
-private:
-  virtual ~SpdyPush3TransactionBuffer();
-
-  const static uint32_t kDefaultBufferSize = 4096;
-
-  nsresult mStatus;
-  nsHttpRequestHead *mRequestHead;
-  SpdyPushedStream3 *mPushStream;
-  bool mIsDone;
-
-  nsAutoArrayPtr<char> mBufferedHTTP1;
-  uint32_t mBufferedHTTP1Size;
-  uint32_t mBufferedHTTP1Used;
-  uint32_t mBufferedHTTP1Consumed;
-};
-
-} // namespace mozilla::net
-} // namespace mozilla
-
-#endif // mozilla_net_SpdyPush3_Internal_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdySession31.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdySession31.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdySession31.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdySession31.cpp	2014-11-26 21:46:04.000000000 +0000
@@ -1460,7 +1460,7 @@
 {
   MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_NOOP);
 
-  // Should not be receiving noop frames in spdy/3, so we'll just
+  // Should not be receiving noop frames in spdy/3.1, so we'll just
   // make a log and ignore it
 
   LOG3(("SpdySession31::HandleNoop %p NOP.", self));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdySession3.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdySession3.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdySession3.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdySession3.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,2864 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 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/. */
-
-// HttpLog.h should generally be included first
-#include "HttpLog.h"
-
-// Log on level :5, instead of default :4.
-#undef LOG
-#define LOG(args) LOG5(args)
-#undef LOG_ENABLED
-#define LOG_ENABLED() LOG5_ENABLED()
-
-#include "mozilla/Endian.h"
-#include "mozilla/Telemetry.h"
-#include "nsHttp.h"
-#include "nsHttpHandler.h"
-#include "nsILoadGroup.h"
-#include "nsISupportsPriority.h"
-#include "prprf.h"
-#include "SpdyPush3.h"
-#include "SpdySession3.h"
-#include "SpdyStream3.h"
-#include "PSpdyPush.h"
-#include "SpdyZlibReporter.h"
-#include "TunnelUtils.h"
-
-#include <algorithm>
-
-#ifdef DEBUG
-// defined by the socket transport service while active
-extern PRThread *gSocketThread;
-#endif
-
-namespace mozilla {
-namespace net {
-
-// SpdySession3 has multiple inheritance of things that implement
-// nsISupports, so this magic is taken from nsHttpPipeline that
-// implements some of the same abstract classes.
-NS_IMPL_ADDREF(SpdySession3)
-NS_IMPL_RELEASE(SpdySession3)
-NS_INTERFACE_MAP_BEGIN(SpdySession3)
-    NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsAHttpConnection)
-NS_INTERFACE_MAP_END
-
-SpdySession3::SpdySession3(nsISocketTransport *aSocketTransport)
-  : mSocketTransport(aSocketTransport)
-  , mSegmentReader(nullptr)
-  , mSegmentWriter(nullptr)
-  , mNextStreamID(1)
-  , mConcurrentHighWater(0)
-  , mDownstreamState(BUFFERING_FRAME_HEADER)
-  , mInputFrameBufferSize(kDefaultBufferSize)
-  , mInputFrameBufferUsed(0)
-  , mInputFrameDataLast(false)
-  , mInputFrameDataStream(nullptr)
-  , mNeedsCleanup(nullptr)
-  , mShouldGoAway(false)
-  , mClosed(false)
-  , mCleanShutdown(false)
-  , mDataPending(false)
-  , mGoAwayID(0)
-  , mMaxConcurrent(kDefaultMaxConcurrent)
-  , mConcurrent(0)
-  , mServerPushedResources(0)
-  , mServerInitialWindow(kDefaultServerRwin)
-  , mOutputQueueSize(kDefaultQueueSize)
-  , mOutputQueueUsed(0)
-  , mOutputQueueSent(0)
-  , mLastReadEpoch(PR_IntervalNow())
-  , mPingSentEpoch(0)
-  , mNextPingID(1)
-  , mPreviousUsed(false)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  static uint64_t sSerial;
-  mSerial = ++sSerial;
-
-  LOG3(("SpdySession3::SpdySession3 %p serial=0x%X\n", this, mSerial));
-
-  mInputFrameBuffer = new char[mInputFrameBufferSize];
-  mOutputQueueBuffer = new char[mOutputQueueSize];
-  zlibInit();
-
-  mPushAllowance = gHttpHandler->SpdyPushAllowance();
-  mSendingChunkSize = gHttpHandler->SpdySendingChunkSize();
-  GenerateSettings();
-
-  mLastDataReadEpoch = mLastReadEpoch;
-
-  mPingThreshold = gHttpHandler->SpdyPingThreshold();
-}
-
-PLDHashOperator
-SpdySession3::ShutdownEnumerator(nsAHttpTransaction *key,
-                                 nsAutoPtr<SpdyStream3> &stream,
-                                 void *closure)
-{
-  SpdySession3 *self = static_cast<SpdySession3 *>(closure);
-
-  // On a clean server hangup the server sets the GoAwayID to be the ID of
-  // the last transaction it processed. If the ID of stream in the
-  // local stream is greater than that it can safely be restarted because the
-  // server guarantees it was not partially processed. Streams that have not
-  // registered an ID haven't actually been sent yet so they can always be
-  // restarted.
-  if (self->mCleanShutdown &&
-      (stream->StreamID() > self->mGoAwayID || !stream->HasRegisteredID()))
-    self->CloseStream(stream, NS_ERROR_NET_RESET); // can be restarted
-  else
-    self->CloseStream(stream, NS_ERROR_ABORT);
-
-  return PL_DHASH_NEXT;
-}
-
-PLDHashOperator
-SpdySession3::GoAwayEnumerator(nsAHttpTransaction *key,
-                               nsAutoPtr<SpdyStream3> &stream,
-                               void *closure)
-{
-  SpdySession3 *self = static_cast<SpdySession3 *>(closure);
-
-  // these streams were not processed by the server and can be restarted.
-  // Do that after the enumerator completes to avoid the risk of
-  // a restart event re-entrantly modifying this hash. Be sure not to restart
-  // a pushed (even numbered) stream
-  if ((stream->StreamID() > self->mGoAwayID && (stream->StreamID() & 1)) ||
-      !stream->HasRegisteredID()) {
-    self->mGoAwayStreamsToRestart.Push(stream);
-  }
-
-  return PL_DHASH_NEXT;
-}
-
-SpdySession3::~SpdySession3()
-{
-  LOG3(("SpdySession3::~SpdySession3 %p mDownstreamState=%X",
-        this, mDownstreamState));
-
-  inflateEnd(&mDownstreamZlib);
-  deflateEnd(&mUpstreamZlib);
-
-  mStreamTransactionHash.Enumerate(ShutdownEnumerator, this);
-  Telemetry::Accumulate(Telemetry::SPDY_PARALLEL_STREAMS, mConcurrentHighWater);
-  Telemetry::Accumulate(Telemetry::SPDY_REQUEST_PER_CONN, (mNextStreamID - 1) / 2);
-  Telemetry::Accumulate(Telemetry::SPDY_SERVER_INITIATED_STREAMS,
-                        mServerPushedResources);
-}
-
-void
-SpdySession3::LogIO(SpdySession3 *self, SpdyStream3 *stream, const char *label,
-                    const char *data, uint32_t datalen)
-{
-  if (!LOG5_ENABLED())
-    return;
-
-  LOG5(("SpdySession3::LogIO %p stream=%p id=0x%X [%s]",
-        self, stream, stream ? stream->StreamID() : 0, label));
-
-  // Max line is (16 * 3) + 10(prefix) + newline + null
-  char linebuf[128];
-  uint32_t index;
-  char *line = linebuf;
-
-  linebuf[127] = 0;
-
-  for (index = 0; index < datalen; ++index) {
-    if (!(index % 16)) {
-      if (index) {
-        *line = 0;
-        LOG5(("%s", linebuf));
-      }
-      line = linebuf;
-      PR_snprintf(line, 128, "%08X: ", index);
-      line += 10;
-    }
-    PR_snprintf(line, 128 - (line - linebuf), "%02X ",
-                ((unsigned char *)data)[index]);
-    line += 3;
-  }
-  if (index) {
-    *line = 0;
-    LOG5(("%s", linebuf));
-  }
-}
-
-bool
-SpdySession3::RoomForMoreConcurrent()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  return (mConcurrent < mMaxConcurrent);
-}
-
-bool
-SpdySession3::RoomForMoreStreams()
-{
-  if (mNextStreamID + mStreamTransactionHash.Count() * 2 > kMaxStreamID)
-    return false;
-
-  return !mShouldGoAway;
-}
-
-PRIntervalTime
-SpdySession3::IdleTime()
-{
-  return PR_IntervalNow() - mLastDataReadEpoch;
-}
-
-uint32_t
-SpdySession3::ReadTimeoutTick(PRIntervalTime now)
-{
-    MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-    MOZ_ASSERT(mNextPingID & 1, "Ping Counter Not Odd");
-
-    LOG(("SpdySession3::ReadTimeoutTick %p delta since last read %ds\n",
-         this, PR_IntervalToSeconds(now - mLastReadEpoch)));
-
-    if (!mPingThreshold)
-      return UINT32_MAX;
-
-    if ((now - mLastReadEpoch) < mPingThreshold) {
-      // recent activity means ping is not an issue
-      if (mPingSentEpoch) {
-        mPingSentEpoch = 0;
-        if (mPreviousUsed) {
-          // restore the former value
-          mPingThreshold = mPreviousPingThreshold;
-          mPreviousUsed = false;
-        }
-      }
-
-      return PR_IntervalToSeconds(mPingThreshold) -
-        PR_IntervalToSeconds(now - mLastReadEpoch);
-    }
-
-    if (mPingSentEpoch) {
-      LOG(("SpdySession3::ReadTimeoutTick %p handle outstanding ping\n"));
-      if ((now - mPingSentEpoch) >= gHttpHandler->SpdyPingTimeout()) {
-        LOG(("SpdySession3::ReadTimeoutTick %p Ping Timer Exhaustion\n",
-             this));
-        mPingSentEpoch = 0;
-        Close(NS_ERROR_NET_TIMEOUT);
-        return UINT32_MAX;
-      }
-      return 1; // run the tick aggressively while ping is outstanding
-    }
-
-    LOG(("SpdySession3::ReadTimeoutTick %p generating ping 0x%X\n",
-         this, mNextPingID));
-
-    if (mNextPingID == 0xffffffff) {
-      LOG(("SpdySession3::ReadTimeoutTick %p cannot form ping - ids exhausted\n",
-           this));
-      return UINT32_MAX;
-    }
-
-    mPingSentEpoch = PR_IntervalNow();
-    if (!mPingSentEpoch)
-      mPingSentEpoch = 1; // avoid the 0 sentinel value
-    GeneratePing(mNextPingID);
-    mNextPingID += 2;
-    ResumeRecv(); // read the ping reply
-
-    // Check for orphaned push streams. This looks expensive, but generally the
-    // list is empty.
-    SpdyPushedStream3 *deleteMe;
-    TimeStamp timestampNow;
-    do {
-      deleteMe = nullptr;
-
-      for (uint32_t index = mPushedStreams.Length();
-           index > 0 ; --index) {
-        SpdyPushedStream3 *pushedStream = mPushedStreams[index - 1];
-
-        if (timestampNow.IsNull())
-          timestampNow = TimeStamp::Now(); // lazy initializer
-
-        // if spdy finished, but not connected, and its been like that for too long..
-        // cleanup the stream..
-        if (pushedStream->IsOrphaned(timestampNow))
-        {
-          LOG3(("SpdySession3 Timeout Pushed Stream %p 0x%X\n",
-                this, pushedStream->StreamID()));
-          deleteMe = pushedStream;
-          break; // don't CleanupStream() while iterating this vector
-        }
-      }
-      if (deleteMe)
-        CleanupStream(deleteMe, NS_ERROR_ABORT, RST_CANCEL);
-
-    } while (deleteMe);
-
-    if (mNextPingID == 0xffffffff) {
-      LOG(("SpdySession3::ReadTimeoutTick %p "
-           "ping ids exhausted marking goaway\n", this));
-      mShouldGoAway = true;
-    }
-    return 1; // run the tick aggressively while ping is outstanding
-}
-
-uint32_t
-SpdySession3::RegisterStreamID(SpdyStream3 *stream, uint32_t aNewID)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  MOZ_ASSERT(mNextStreamID < 0xfffffff0,
-             "should have stopped admitting streams");
-
-  MOZ_ASSERT(!(aNewID & 1),
-             "0 for autoassign pull, otherwise explicit even push assignment");
-  if (!aNewID) {
-    // auto generate a new pull stream ID
-    aNewID = mNextStreamID;
-    MOZ_ASSERT(aNewID & 1, "pull ID must be odd.");
-    mNextStreamID += 2;
-  }
-
-  LOG3(("SpdySession3::RegisterStreamID session=%p stream=%p id=0x%X "
-        "concurrent=%d",this, stream, aNewID, mConcurrent));
-
-  // We've used up plenty of ID's on this session. Start
-  // moving to a new one before there is a crunch involving
-  // server push streams or concurrent non-registered submits
-  if (aNewID >= kMaxStreamID)
-    mShouldGoAway = true;
-
-  // integrity check
-  if (mStreamIDHash.Get(aNewID)) {
-    LOG3(("   New ID already present\n"));
-    MOZ_ASSERT(false, "New ID already present in mStreamIDHash");
-    mShouldGoAway = true;
-    return kDeadStreamID;
-  }
-
-  mStreamIDHash.Put(aNewID, stream);
-  return aNewID;
-}
-
-bool
-SpdySession3::AddStream(nsAHttpTransaction *aHttpTransaction,
-                        int32_t aPriority,
-                        bool aUseTunnel,
-                        nsIInterfaceRequestor *aCallbacks)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  // integrity check
-  if (mStreamTransactionHash.Get(aHttpTransaction)) {
-    LOG3(("   New transaction already present\n"));
-    MOZ_ASSERT(false, "AddStream duplicate transaction pointer");
-    return false;
-  }
-
-  if (!mConnection) {
-    mConnection = aHttpTransaction->Connection();
-  }
-
-  aHttpTransaction->SetConnection(this);
-
-  if (aUseTunnel) {
-    LOG3(("SpdySession3::AddStream session=%p trans=%p OnTunnel",
-          this, aHttpTransaction));
-    DispatchOnTunnel(aHttpTransaction, aCallbacks);
-    return true;
-  }
-
-  SpdyStream3 *stream = new SpdyStream3(aHttpTransaction, this, aPriority);
-
-  LOG3(("SpdySession3::AddStream session=%p stream=%p serial=%u "
-        "NextID=0x%X (tentative)", this, stream, mSerial, mNextStreamID));
-
-  mStreamTransactionHash.Put(aHttpTransaction, stream);
-
-  if (RoomForMoreConcurrent()) {
-    LOG3(("SpdySession3::AddStream %p stream %p activated immediately.",
-          this, stream));
-    ActivateStream(stream);
-  }
-  else {
-    LOG3(("SpdySession3::AddStream %p stream %p queued.", this, stream));
-    mQueuedStreams.Push(stream);
-  }
-
-  if (!(aHttpTransaction->Caps() & NS_HTTP_ALLOW_KEEPALIVE) &&
-      !aHttpTransaction->IsNullTransaction()) {
-    LOG3(("SpdySession3::AddStream %p transaction %p forces keep-alive off.\n",
-          this, aHttpTransaction));
-    DontReuse();
-  }
-  return true;
-}
-
-void
-SpdySession3::ActivateStream(SpdyStream3 *stream)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(!stream->StreamID() || (stream->StreamID() & 1),
-             "Do not activate pushed streams");
-
-  nsAHttpTransaction *trans = stream->Transaction();
-  if (!trans || !trans->IsNullTransaction() || trans->QuerySpdyConnectTransaction()) {
-    ++mConcurrent;
-    if (mConcurrent > mConcurrentHighWater)
-      mConcurrentHighWater = mConcurrent;
-    LOG3(("SpdySession3::AddStream %p activating stream %p Currently %d "
-          "streams in session, high water mark is %d",
-          this, stream, mConcurrent, mConcurrentHighWater));
-  }
-
-  mReadyForWrite.Push(stream);
-  SetWriteCallbacks();
-
-  // Kick off the SYN transmit without waiting for the poll loop
-  // This won't work for stream id=1 because there is no segment reader
-  // yet.
-  if (mSegmentReader) {
-    uint32_t countRead;
-    ReadSegments(nullptr, kDefaultBufferSize, &countRead);
-  }
-}
-
-void
-SpdySession3::ProcessPending()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  while (RoomForMoreConcurrent()) {
-    SpdyStream3 *stream = static_cast<SpdyStream3 *>(mQueuedStreams.PopFront());
-    if (!stream)
-      return;
-    LOG3(("SpdySession3::ProcessPending %p stream %p activated from queue.",
-          this, stream));
-    ActivateStream(stream);
-  }
-}
-
-nsresult
-SpdySession3::NetworkRead(nsAHttpSegmentWriter *writer, char *buf,
-                          uint32_t count, uint32_t *countWritten)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  if (!count) {
-    *countWritten = 0;
-    return NS_OK;
-  }
-
-  nsresult rv = writer->OnWriteSegment(buf, count, countWritten);
-  if (NS_SUCCEEDED(rv) && *countWritten > 0)
-    mLastReadEpoch = PR_IntervalNow();
-  return rv;
-}
-
-void
-SpdySession3::SetWriteCallbacks()
-{
-  if (mConnection && (GetWriteQueueSize() || mOutputQueueUsed))
-      mConnection->ResumeSend();
-}
-
-void
-SpdySession3::RealignOutputQueue()
-{
-  mOutputQueueUsed -= mOutputQueueSent;
-  memmove(mOutputQueueBuffer.get(),
-          mOutputQueueBuffer.get() + mOutputQueueSent,
-          mOutputQueueUsed);
-  mOutputQueueSent = 0;
-}
-
-void
-SpdySession3::FlushOutputQueue()
-{
-  if (!mSegmentReader || !mOutputQueueUsed)
-    return;
-
-  nsresult rv;
-  uint32_t countRead;
-  uint32_t avail = mOutputQueueUsed - mOutputQueueSent;
-
-  rv = mSegmentReader->
-    OnReadSegment(mOutputQueueBuffer.get() + mOutputQueueSent, avail,
-                                     &countRead);
-  LOG3(("SpdySession3::FlushOutputQueue %p sz=%d rv=%x actual=%d",
-        this, avail, rv, countRead));
-
-  // Dont worry about errors on write, we will pick this up as a read error too
-  if (NS_FAILED(rv))
-    return;
-
-  if (countRead == avail) {
-    mOutputQueueUsed = 0;
-    mOutputQueueSent = 0;
-    return;
-  }
-
-  mOutputQueueSent += countRead;
-
-  // If the output queue is close to filling up and we have sent out a good
-  // chunk of data from the beginning then realign it.
-
-  if ((mOutputQueueSent >= kQueueMinimumCleanup) &&
-      ((mOutputQueueSize - mOutputQueueUsed) < kQueueTailRoom)) {
-    RealignOutputQueue();
-  }
-}
-
-void
-SpdySession3::DontReuse()
-{
-  mShouldGoAway = true;
-  if (!mStreamTransactionHash.Count())
-    Close(NS_OK);
-}
-
-uint32_t
-SpdySession3::GetWriteQueueSize()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  return mReadyForWrite.GetSize();
-}
-
-void
-SpdySession3::ChangeDownstreamState(enum stateType newState)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  LOG3(("SpdySession3::ChangeDownstreamState() %p from %X to %X",
-        this, mDownstreamState, newState));
-  mDownstreamState = newState;
-}
-
-void
-SpdySession3::ResetDownstreamState()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  LOG3(("SpdySession3::ResetDownstreamState() %p", this));
-  ChangeDownstreamState(BUFFERING_FRAME_HEADER);
-
-  if (mInputFrameDataLast && mInputFrameDataStream) {
-    mInputFrameDataLast = false;
-    if (!mInputFrameDataStream->RecvdFin()) {
-      LOG3(("  SetRecvdFin id=0x%x\n", mInputFrameDataStream->StreamID()));
-      mInputFrameDataStream->SetRecvdFin(true);
-      DecrementConcurrent(mInputFrameDataStream);
-    }
-  }
-  mInputFrameBufferUsed = 0;
-  mInputFrameDataStream = nullptr;
-}
-
-void
-SpdySession3::DecrementConcurrent(SpdyStream3 *aStream)
-{
-  uint32_t id = aStream->StreamID();
-
-  if (id && !(id & 0x1))
-    return; // pushed streams aren't counted in concurrent limit
-
-  MOZ_ASSERT(mConcurrent);
-  --mConcurrent;
-  LOG3(("DecrementConcurrent %p id=0x%X concurrent=%d\n",
-        this, id, mConcurrent));
-  ProcessPending();
-}
-
-void
-SpdySession3::zlibInit()
-{
-  mDownstreamZlib.zalloc = SpdyZlibReporter::Alloc;
-  mDownstreamZlib.zfree = SpdyZlibReporter::Free;
-  mDownstreamZlib.opaque = Z_NULL;
-
-  inflateInit(&mDownstreamZlib);
-
-  mUpstreamZlib.zalloc = SpdyZlibReporter::Alloc;
-  mUpstreamZlib.zfree = SpdyZlibReporter::Free;
-  mUpstreamZlib.opaque = Z_NULL;
-
-  // mixing carte blanche compression with tls subjects us to traffic
-  // analysis attacks
-  deflateInit(&mUpstreamZlib, Z_NO_COMPRESSION);
-  deflateSetDictionary(&mUpstreamZlib,
-                       SpdyStream3::kDictionary,
-                       sizeof(SpdyStream3::kDictionary));
-}
-
-// Need to decompress some data in order to keep the compression
-// context correct, but we really don't care what the result is
-nsresult
-SpdySession3::UncompressAndDiscard(uint32_t offset,
-                                   uint32_t blockLen)
-{
-  char *blockStart = mInputFrameBuffer + offset;
-  unsigned char trash[2048];
-  mDownstreamZlib.avail_in = blockLen;
-  mDownstreamZlib.next_in = reinterpret_cast<unsigned char *>(blockStart);
-  bool triedDictionary = false;
-
-  do {
-    mDownstreamZlib.next_out = trash;
-    mDownstreamZlib.avail_out = sizeof(trash);
-    int zlib_rv = inflate(&mDownstreamZlib, Z_NO_FLUSH);
-
-    if (zlib_rv == Z_NEED_DICT) {
-      if (triedDictionary) {
-        LOG3(("SpdySession3::UncompressAndDiscard %p Dictionary Error\n", this));
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-
-      triedDictionary = true;
-      inflateSetDictionary(&mDownstreamZlib, SpdyStream3::kDictionary,
-                           sizeof(SpdyStream3::kDictionary));
-    }
-
-    if (zlib_rv == Z_DATA_ERROR)
-      return NS_ERROR_ILLEGAL_VALUE;
-
-    if (zlib_rv == Z_MEM_ERROR)
-      return NS_ERROR_FAILURE;
-  }
-  while (mDownstreamZlib.avail_in);
-  return NS_OK;
-}
-
-void
-SpdySession3::GeneratePing(uint32_t aID)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::GeneratePing %p 0x%X\n", this, aID));
-
-  EnsureBuffer(mOutputQueueBuffer, mOutputQueueUsed + 12,
-               mOutputQueueUsed, mOutputQueueSize);
-  char *packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
-  mOutputQueueUsed += 12;
-
-  packet[0] = kFlag_Control;
-  packet[1] = kVersion;
-  packet[2] = 0;
-  packet[3] = CONTROL_TYPE_PING;
-  packet[4] = 0;                                  /* flags */
-  packet[5] = 0;
-  packet[6] = 0;
-  packet[7] = 4;                                  /* length */
-
-  NetworkEndian::writeUint32(packet + 8, aID);
-
-  LogIO(this, nullptr, "Generate Ping", packet, 12);
-  FlushOutputQueue();
-}
-
-void
-SpdySession3::GenerateRstStream(uint32_t aStatusCode, uint32_t aID)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::GenerateRst %p 0x%X %d\n", this, aID, aStatusCode));
-
-  EnsureBuffer(mOutputQueueBuffer, mOutputQueueUsed + 16,
-               mOutputQueueUsed, mOutputQueueSize);
-  char *packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
-  mOutputQueueUsed += 16;
-
-  packet[0] = kFlag_Control;
-  packet[1] = kVersion;
-  packet[2] = 0;
-  packet[3] = CONTROL_TYPE_RST_STREAM;
-  packet[4] = 0;                                  /* flags */
-  packet[5] = 0;
-  packet[6] = 0;
-  packet[7] = 8;                                  /* length */
-
-  NetworkEndian::writeUint32(packet + 8, aID);
-  NetworkEndian::writeUint32(packet + 12, aStatusCode);
-
-  LogIO(this, nullptr, "Generate Reset", packet, 16);
-  FlushOutputQueue();
-}
-
-void
-SpdySession3::GenerateGoAway(uint32_t aStatusCode)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::GenerateGoAway %p code=%X\n", this, aStatusCode));
-
-  EnsureBuffer(mOutputQueueBuffer, mOutputQueueUsed + 16,
-               mOutputQueueUsed, mOutputQueueSize);
-  char *packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
-  mOutputQueueUsed += 16;
-
-  memset(packet, 0, 16);
-  packet[0] = kFlag_Control;
-  packet[1] = kVersion;
-  packet[3] = CONTROL_TYPE_GOAWAY;
-  packet[7] = 8;                                  /* data length */
-
-  // last-good-stream-id are bytes 8-11, when we accept server push this will
-  // need to be set non zero
-
-  // bytes 12-15 are the status code.
-  NetworkEndian::writeUint32(packet + 12, aStatusCode);
-
-  LogIO(this, nullptr, "Generate GoAway", packet, 16);
-  FlushOutputQueue();
-}
-
-void
-SpdySession3::GenerateSettings()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::GenerateSettings %p\n", this));
-
-  static const uint32_t maxDataLen = 4 + 3 * 8; // sized for 3 settings
-  EnsureBuffer(mOutputQueueBuffer, mOutputQueueUsed + 8 + maxDataLen,
-               mOutputQueueUsed, mOutputQueueSize);
-  char *packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
-
-  memset(packet, 0, 8 + maxDataLen);
-  packet[0] = kFlag_Control;
-  packet[1] = kVersion;
-  packet[3] = CONTROL_TYPE_SETTINGS;
-
-  uint8_t numberOfEntries = 0;
-
-  // entries need to be listed in order by ID
-  // 1st entry is bytes 12 to 19
-  // 2nd entry is bytes 20 to 27
-  // 3rd entry is bytes 28 to 35
-
-  if (!gHttpHandler->AllowPush()) {
-  // announcing that we accept 0 incoming streams is done to
-  // disable server push
-    packet[15 + 8 * numberOfEntries] = SETTINGS_TYPE_MAX_CONCURRENT;
-    // The value portion of the setting pair is already initialized to 0
-    numberOfEntries++;
-  }
-
-  nsRefPtr<nsHttpConnectionInfo> ci;
-  uint32_t cwnd = 0;
-  GetConnectionInfo(getter_AddRefs(ci));
-  if (ci)
-    cwnd = gHttpHandler->ConnMgr()->GetSpdyCWNDSetting(ci);
-  if (cwnd) {
-    packet[12 + 8 * numberOfEntries] = PERSISTED_VALUE;
-    packet[15 + 8 * numberOfEntries] = SETTINGS_TYPE_CWND;
-    LOG(("SpdySession3::GenerateSettings %p sending CWND %u\n", this, cwnd));
-    NetworkEndian::writeUint32(packet + 16 + 8 * numberOfEntries, cwnd);
-    numberOfEntries++;
-  }
-
-  // Advertise the Push RWIN and on each client SYN_STREAM pipeline
-  // a window update with it in order to use larger initial windows with pulled
-  // streams.
-  packet[15 + 8 * numberOfEntries] = SETTINGS_TYPE_INITIAL_WINDOW;
-  NetworkEndian::writeUint32(packet + 16 + 8 * numberOfEntries, mPushAllowance);
-  numberOfEntries++;
-
-  uint32_t dataLen = 4 + 8 * numberOfEntries;
-  mOutputQueueUsed += 8 + dataLen;
-  packet[7] = dataLen;
-  packet[11] = numberOfEntries;
-
-  LogIO(this, nullptr, "Generate Settings", packet, 8 + dataLen);
-  FlushOutputQueue();
-}
-
-// perform a bunch of integrity checks on the stream.
-// returns true if passed, false (plus LOG and ABORT) if failed.
-bool
-SpdySession3::VerifyStream(SpdyStream3 *aStream, uint32_t aOptionalID = 0)
-{
-  // This is annoying, but at least it is O(1)
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-#ifndef DEBUG
-  // Only do the real verification in debug builds
-  return true;
-#endif
-
-  if (!aStream)
-    return true;
-
-  uint32_t test = 0;
-
-  do {
-    if (aStream->StreamID() == kDeadStreamID)
-      break;
-
-    nsAHttpTransaction *trans = aStream->Transaction();
-
-    test++;
-    if (!trans)
-      break;
-
-    test++;
-    if (mStreamTransactionHash.Get(trans) != aStream)
-      break;
-
-    if (aStream->StreamID()) {
-      SpdyStream3 *idStream = mStreamIDHash.Get(aStream->StreamID());
-
-      test++;
-      if (idStream != aStream)
-        break;
-
-      if (aOptionalID) {
-        test++;
-        if (idStream->StreamID() != aOptionalID)
-          break;
-      }
-    }
-
-    // tests passed
-    return true;
-  } while (0);
-
-  LOG(("SpdySession3 %p VerifyStream Failure %p stream->id=0x%X "
-       "optionalID=0x%X trans=%p test=%d\n",
-       this, aStream, aStream->StreamID(),
-       aOptionalID, aStream->Transaction(), test));
-
-  MOZ_ASSERT(false, "VerifyStream");
-  return false;
-}
-
-void
-SpdySession3::CleanupStream(SpdyStream3 *aStream, nsresult aResult,
-                            rstReason aResetCode)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::CleanupStream %p %p 0x%X %X\n",
-        this, aStream, aStream ? aStream->StreamID() : 0, aResult));
-  if (!aStream) {
-    return;
-  }
-
-  SpdyPushedStream3 *pushSource = nullptr;
-
-  if (NS_SUCCEEDED(aResult) && aStream->DeferCleanupOnSuccess()) {
-    LOG(("SpdySession3::CleanupStream 0x%X deferred\n", aStream->StreamID()));
-    return;
-  }
-
-  if (!VerifyStream(aStream)) {
-    LOG(("SpdySession3::CleanupStream failed to verify stream\n"));
-    return;
-  }
-
-  pushSource = aStream->PushSource();
-
-  if (!aStream->RecvdFin() && aStream->StreamID()) {
-    LOG3(("Stream had not processed recv FIN, sending RST code %X\n",
-          aResetCode));
-    GenerateRstStream(aResetCode, aStream->StreamID());
-    DecrementConcurrent(aStream);
-  }
-
-  CloseStream(aStream, aResult);
-
-  // Remove the stream from the ID hash table and, if an even id, the pushed
-  // table too.
-  uint32_t id = aStream->StreamID();
-  if (id > 0) {
-    mStreamIDHash.Remove(id);
-    if (!(id & 1))
-      mPushedStreams.RemoveElement(aStream);
-  }
-
-  RemoveStreamFromQueues(aStream);
-
-  // removing from the stream transaction hash will
-  // delete the SpdyStream3 and drop the reference to
-  // its transaction
-  mStreamTransactionHash.Remove(aStream->Transaction());
-
-  if (mShouldGoAway && !mStreamTransactionHash.Count())
-    Close(NS_OK);
-
-  if (pushSource) {
-    pushSource->SetDeferCleanupOnSuccess(false);
-    CleanupStream(pushSource, aResult, aResetCode);
-  }
-}
-
-static void RemoveStreamFromQueue(SpdyStream3 *aStream, nsDeque &queue)
-{
-  uint32_t size = queue.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
-    SpdyStream3 *stream = static_cast<SpdyStream3 *>(queue.PopFront());
-    if (stream != aStream)
-      queue.Push(stream);
-  }
-}
-
-void
-SpdySession3::RemoveStreamFromQueues(SpdyStream3 *aStream)
-{
-  RemoveStreamFromQueue(aStream, mReadyForWrite);
-  RemoveStreamFromQueue(aStream, mQueuedStreams);
-  RemoveStreamFromQueue(aStream, mReadyForRead);
-}
-
-void
-SpdySession3::CloseStream(SpdyStream3 *aStream, nsresult aResult)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::CloseStream %p %p 0x%x %X\n",
-        this, aStream, aStream->StreamID(), aResult));
-
-  // Check if partial frame reader
-  if (aStream == mInputFrameDataStream) {
-    LOG3(("Stream had active partial read frame on close"));
-    ChangeDownstreamState(DISCARDING_DATA_FRAME);
-    mInputFrameDataStream = nullptr;
-  }
-
-  RemoveStreamFromQueues(aStream);
-
-  if (aStream->IsTunnel()) {
-    UnRegisterTunnel(aStream);
-  }
-
-  // Send the stream the close() indication
-  aStream->Close(aResult);
-}
-
-nsresult
-SpdySession3::HandleSynStream(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_SYN_STREAM);
-
-  if (self->mInputFrameDataSize < 18) {
-    LOG3(("SpdySession3::HandleSynStream %p SYN_STREAM too short data=%d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint32_t streamID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-  uint32_t associatedID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 3 * sizeof(uint32_t));
-  uint8_t flags = reinterpret_cast<uint8_t *>(self->mInputFrameBuffer.get())[4];
-
-  LOG3(("SpdySession3::HandleSynStream %p recv SYN_STREAM (push) "
-        "for ID 0x%X associated with 0x%X.\n",
-        self, streamID, associatedID));
-
-  if (streamID & 0x01) {                   // test for odd stream ID
-    LOG3(("SpdySession3::HandleSynStream %p recvd SYN_STREAM id must be even.",
-          self));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  // confirm associated-to
-  nsresult rv = self->SetInputFrameDataStream(associatedID);
-  if (NS_FAILED(rv))
-    return rv;
-  SpdyStream3 *associatedStream = self->mInputFrameDataStream;
-
-  ++(self->mServerPushedResources);
-
-  // Anytime we start using the high bit of stream ID (either client or server)
-  // begin to migrate to a new session.
-  if (streamID >= kMaxStreamID)
-    self->mShouldGoAway = true;
-
-  bool resetStream = true;
-  SpdyPushCache *cache = nullptr;
-
-  if (!(flags & kFlag_Data_UNI)) {
-    // pushed streams require UNIDIRECTIONAL flag
-    LOG3(("SpdySession3::HandleSynStream %p ID %0x%X associated ID 0x%X failed.\n",
-          self, streamID, associatedID));
-    self->GenerateRstStream(RST_PROTOCOL_ERROR, streamID);
-
-  } else if (!associatedID) {
-    // associated stream 0 will never find a match, but the spec requires a
-    // PROTOCOL_ERROR in this specific case
-    LOG3(("SpdySession3::HandleSynStream %p associated ID of 0 failed.\n", self));
-    self->GenerateRstStream(RST_PROTOCOL_ERROR, streamID);
-
-  } else if (!gHttpHandler->AllowPush()) {
-    // MAX_CONCURRENT_STREAMS of 0 in settings should have disabled push,
-    // but some servers are buggy about that.. or the config could have
-    // been updated after the settings frame was sent. In both cases just
-    // reject the pushed stream as refused
-    LOG3(("SpdySession3::HandleSynStream Push Recevied when Disabled\n"));
-    self->GenerateRstStream(RST_REFUSED_STREAM, streamID);
-
-  } else if (!associatedStream) {
-    LOG3(("SpdySession3::HandleSynStream %p lookup associated ID failed.\n", self));
-    self->GenerateRstStream(RST_INVALID_STREAM, streamID);
-
-  } else {
-    nsILoadGroupConnectionInfo *loadGroupCI = associatedStream->LoadGroupConnectionInfo();
-    if (loadGroupCI) {
-      loadGroupCI->GetSpdyPushCache(&cache);
-      if (!cache) {
-        cache = new SpdyPushCache();
-        if (!cache || NS_FAILED(loadGroupCI->SetSpdyPushCache(cache))) {
-          delete cache;
-          cache = nullptr;
-        }
-      }
-    }
-    if (!cache) {
-      // this is unexpected, but we can handle it just be refusing the push
-      LOG3(("SpdySession3::HandleSynStream Push Recevied without loadgroup cache\n"));
-      self->GenerateRstStream(RST_REFUSED_STREAM, streamID);
-    }
-    else {
-      resetStream = false;
-    }
-  }
-
-  if (resetStream) {
-    // Need to decompress the headers even though we aren't using them yet in
-    // order to keep the compression context consistent for other syn_reply frames
-    rv = self->UncompressAndDiscard(18, self->mInputFrameDataSize - 10);
-    if (NS_FAILED(rv)) {
-      LOG(("SpdySession3::HandleSynStream uncompress failed\n"));
-      return rv;
-    }
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  // Create the buffering transaction and push stream
-  nsRefPtr<SpdyPush3TransactionBuffer> transactionBuffer =
-    new SpdyPush3TransactionBuffer();
-  transactionBuffer->SetConnection(self);
-  SpdyPushedStream3 *pushedStream =
-    new SpdyPushedStream3(transactionBuffer, self,
-                          associatedStream, streamID);
-
-  // ownership of the pushed stream is by the transaction hash, just as it
-  // is for a client initiated stream. Errors that aren't fatal to the
-  // whole session must call cleanupStream() after this point in order
-  // to remove the stream from that hash.
-  self->mStreamTransactionHash.Put(transactionBuffer, pushedStream);
-  self->mPushedStreams.AppendElement(pushedStream);
-
-  // The pushed stream is unidirectional so it is fully open immediately
-  rv = pushedStream->SetFullyOpen();
-  if (NS_FAILED(rv)) {
-    LOG(("SpdySession3::HandleSynStream pushedstream fully open failed\n"));
-    self->CleanupStream(pushedStream, rv, RST_CANCEL);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  // Uncompress the response headers into a stream specific buffer, leaving them
-  // in spdy format for the time being.
-  rv = pushedStream->Uncompress(&self->mDownstreamZlib,
-                                self->mInputFrameBuffer + 18,
-                                self->mInputFrameDataSize - 10);
-  if (NS_FAILED(rv)) {
-    LOG(("SpdySession3::HandleSynStream uncompress failed\n"));
-    return rv;
-  }
-
-  if (self->RegisterStreamID(pushedStream, streamID) == kDeadStreamID) {
-    LOG(("SpdySession3::HandleSynStream registerstreamid failed\n"));
-    return NS_ERROR_FAILURE;
-  }
-
-  // Fake the request side of the pushed HTTP transaction. Sets up hash
-  // key and origin
-  uint32_t notUsed;
-  pushedStream->ReadSegments(nullptr, 1, &notUsed);
-
-  nsAutoCString key;
-  if (!pushedStream->GetHashKey(key)) {
-    LOG(("SpdySession3::HandleSynStream one of :host :scheme :path missing from push\n"));
-    self->CleanupStream(pushedStream, NS_ERROR_FAILURE, RST_INVALID_STREAM);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  if (!associatedStream->Origin().Equals(pushedStream->Origin())) {
-    LOG(("SpdySession3::HandleSynStream pushed stream mismatched origin\n"));
-    self->CleanupStream(pushedStream, NS_ERROR_FAILURE, RST_INVALID_STREAM);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  if (!cache->RegisterPushedStreamSpdy3(key, pushedStream)) {
-    LOG(("SpdySession3::HandleSynStream registerPushedStream Failed\n"));
-    self->CleanupStream(pushedStream, NS_ERROR_FAILURE, RST_INVALID_STREAM);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::SetInputFrameDataStream(uint32_t streamID)
-{
-  mInputFrameDataStream = mStreamIDHash.Get(streamID);
-  if (VerifyStream(mInputFrameDataStream, streamID))
-    return NS_OK;
-
-  LOG(("SpdySession3::SetInputFrameDataStream failed to verify 0x%X\n",
-       streamID));
-  mInputFrameDataStream = nullptr;
-  return NS_ERROR_UNEXPECTED;
-}
-
-nsresult
-SpdySession3::HandleSynReply(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_SYN_REPLY);
-
-  if (self->mInputFrameDataSize < 4) {
-    LOG3(("SpdySession3::HandleSynReply %p SYN REPLY too short data=%d",
-          self, self->mInputFrameDataSize));
-    // A framing error is a session wide error that cannot be recovered
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint32_t streamID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-  LOG3(("SpdySession3::HandleSynReply %p lookup via streamID 0x%X in syn_reply.\n",
-        self, streamID));
-  nsresult rv = self->SetInputFrameDataStream(streamID);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!self->mInputFrameDataStream) {
-    // Cannot find stream. We can continue the SPDY session, but we need to
-    // uncompress the header block to maintain the correct compression context
-
-    LOG3(("SpdySession3::HandleSynReply %p lookup streamID in syn_reply "
-          "0x%X failed. NextStreamID = 0x%X\n",
-          self, streamID, self->mNextStreamID));
-
-    if (streamID >= self->mNextStreamID)
-      self->GenerateRstStream(RST_INVALID_STREAM, streamID);
-
-    rv = self->UncompressAndDiscard(12, self->mInputFrameDataSize - 4);
-    if (NS_FAILED(rv)) {
-      LOG(("SpdySession3::HandleSynReply uncompress failed\n"));
-      // this is fatal to the session
-      return rv;
-    }
-
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  // Uncompress the headers into a stream specific buffer, leaving them in
-  // spdy format for the time being. Make certain to do this
-  // step before any error handling that might abort the stream but not
-  // the session becuase the session compression context will become
-  // inconsistent if all of the compressed data is not processed.
-  rv = self->mInputFrameDataStream->Uncompress(&self->mDownstreamZlib,
-                                               self->mInputFrameBuffer + 12,
-                                               self->mInputFrameDataSize - 4);
-
-  if (NS_FAILED(rv)) {
-    LOG(("SpdySession3::HandleSynReply uncompress failed\n"));
-    return rv;
-  }
-
-  if (self->mInputFrameDataStream->GetFullyOpen()) {
-    // "If an endpoint receives multiple SYN_REPLY frames for the same active
-    // stream ID, it MUST issue a stream error (Section 2.4.2) with the error
-    // code STREAM_IN_USE."
-    //
-    // "STREAM_ALREADY_CLOSED. The endpoint received a data or SYN_REPLY
-    // frame for a stream which is half closed."
-    //
-    // If the stream is open then just RST_STREAM with STREAM_IN_USE
-    // If the stream is half closed then RST_STREAM with STREAM_ALREADY_CLOSED
-    // abort the session
-    //
-    LOG3(("SpdySession3::HandleSynReply %p dup SYN_REPLY for 0x%X"
-          " recvdfin=%d", self, self->mInputFrameDataStream->StreamID(),
-          self->mInputFrameDataStream->RecvdFin()));
-
-    self->CleanupStream(self->mInputFrameDataStream, NS_ERROR_ALREADY_OPENED,
-                        self->mInputFrameDataStream->RecvdFin() ?
-                        RST_STREAM_ALREADY_CLOSED : RST_STREAM_IN_USE);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  rv = self->mInputFrameDataStream->SetFullyOpen();
-  if (NS_FAILED(rv)) {
-    LOG(("SpdySession3::HandleSynReply SetFullyOpen failed\n"));
-    if (self->mInputFrameDataStream->IsTunnel()) {
-      gHttpHandler->ConnMgr()->CancelTransactions(
-        self->mInputFrameDataStream->Transaction()->ConnectionInfo(),
-        NS_ERROR_CONNECTION_REFUSED);
-    }
-    self->CleanupStream(self->mInputFrameDataStream, rv, RST_CANCEL);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  self->mInputFrameDataLast = self->mInputFrameBuffer[4] & kFlag_Data_FIN;
-  self->mInputFrameDataStream->UpdateTransportReadEvents(self->mInputFrameDataSize);
-  self->mLastDataReadEpoch = self->mLastReadEpoch;
-
-  if (self->mInputFrameBuffer[4] & ~kFlag_Data_FIN) {
-    LOG3(("SynReply %p had undefined flag set 0x%X\n", self, streamID));
-    self->CleanupStream(self->mInputFrameDataStream, NS_ERROR_ILLEGAL_VALUE,
-                        RST_PROTOCOL_ERROR);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  if (!self->mInputFrameDataLast) {
-    // don't process the headers yet as there could be more coming from HEADERS
-    // frames
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  rv = self->ResponseHeadersComplete();
-  if (rv == NS_ERROR_ILLEGAL_VALUE) {
-    LOG3(("SpdySession3::HandleSynReply %p PROTOCOL_ERROR detected 0x%X\n",
-          self, streamID));
-    self->CleanupStream(self->mInputFrameDataStream, rv, RST_PROTOCOL_ERROR);
-    self->ResetDownstreamState();
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-// ResponseHeadersComplete() returns NS_ERROR_ILLEGAL_VALUE when the stream
-// should be reset with a PROTOCOL_ERROR, NS_OK when the SYN_REPLY was
-// fine, and any other error is fatal to the session.
-nsresult
-SpdySession3::ResponseHeadersComplete()
-{
-  LOG3(("SpdySession3::ResponseHeadersComplete %p for 0x%X fin=%d",
-        this, mInputFrameDataStream->StreamID(), mInputFrameDataLast));
-
-  // The spdystream needs to see flattened http headers
-  // Uncompressed spdy format headers currently live in
-  // SpdyStream3::mDecompressBuffer - convert that to HTTP format in
-  // mFlatHTTPResponseHeaders via ConvertHeaders()
-
-  mFlatHTTPResponseHeadersOut = 0;
-  nsresult rv = mInputFrameDataStream->ConvertHeaders(mFlatHTTPResponseHeaders);
-  if (NS_FAILED(rv))
-    return rv;
-
-  ChangeDownstreamState(PROCESSING_COMPLETE_HEADERS);
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::HandleRstStream(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_RST_STREAM);
-
-  if (self->mInputFrameDataSize != 8) {
-    LOG3(("SpdySession3::HandleRstStream %p RST_STREAM wrong length data=%d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint8_t flags = reinterpret_cast<uint8_t *>(self->mInputFrameBuffer.get())[4];
-
-  uint32_t streamID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-
-  self->mDownstreamRstReason =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 3 * sizeof(uint32_t));
-
-  LOG3(("SpdySession3::HandleRstStream %p RST_STREAM Reason Code %u ID %x "
-        "flags %x", self, self->mDownstreamRstReason, streamID, flags));
-
-  if (flags != 0) {
-    LOG3(("SpdySession3::HandleRstStream %p RST_STREAM with flags is illegal",
-          self));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  if (self->mDownstreamRstReason == RST_INVALID_STREAM ||
-      self->mDownstreamRstReason == RST_STREAM_IN_USE ||
-      self->mDownstreamRstReason == RST_FLOW_CONTROL_ERROR) {
-    // basically just ignore this
-    LOG3(("SpdySession3::HandleRstStream %p No Reset Processing Needed.\n"));
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  nsresult rv = self->SetInputFrameDataStream(streamID);
-
-  if (!self->mInputFrameDataStream) {
-    if (NS_FAILED(rv))
-      LOG(("SpdySession3::HandleRstStream %p lookup streamID for RST Frame "
-           "0x%X failed reason = %d :: VerifyStream Failed\n", self, streamID,
-           self->mDownstreamRstReason));
-
-    LOG3(("SpdySession3::HandleRstStream %p lookup streamID for RST Frame "
-          "0x%X failed reason = %d", self, streamID,
-          self->mDownstreamRstReason));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  self->ChangeDownstreamState(PROCESSING_CONTROL_RST_STREAM);
-  return NS_OK;
-}
-
-PLDHashOperator
-SpdySession3::UpdateServerRwinEnumerator(nsAHttpTransaction *key,
-                                         nsAutoPtr<SpdyStream3> &stream,
-                                         void *closure)
-{
-  int32_t delta = *(static_cast<int32_t *>(closure));
-  stream->UpdateRemoteWindow(delta);
-  return PL_DHASH_NEXT;
-}
-
-nsresult
-SpdySession3::HandleSettings(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_SETTINGS);
-
-  if (self->mInputFrameDataSize < 4) {
-    LOG3(("SpdySession3::HandleSettings %p SETTINGS wrong length data=%d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint32_t numEntries =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-
-  // Ensure frame is large enough for supplied number of entries
-  // Each entry is 8 bytes, frame data is reduced by 4 to account for
-  // the NumEntries value.
-  if ((self->mInputFrameDataSize - 4) < (numEntries * 8)) {
-    LOG3(("SpdySession3::HandleSettings %p SETTINGS wrong length data=%d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  LOG3(("SpdySession3::HandleSettings %p SETTINGS Control Frame with %d entries",
-        self, numEntries));
-
-  for (uint32_t index = 0; index < numEntries; ++index) {
-    unsigned char *setting = reinterpret_cast<unsigned char *>
-      (self->mInputFrameBuffer.get()) + 12 + index * 8;
-
-    uint32_t flags = setting[0];
-    uint32_t id = NetworkEndian::readUint32(setting) & 0xffffff;
-    uint32_t value = NetworkEndian::readUint32(setting + 1 * sizeof(uint32_t));
-
-    LOG3(("Settings ID %d, Flags %X, Value %d", id, flags, value));
-
-    switch (id)
-    {
-    case SETTINGS_TYPE_UPLOAD_BW:
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_UL_BW, value);
-      break;
-
-    case SETTINGS_TYPE_DOWNLOAD_BW:
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_DL_BW, value);
-      break;
-
-    case SETTINGS_TYPE_RTT:
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_RTT, value);
-      break;
-
-    case SETTINGS_TYPE_MAX_CONCURRENT:
-      self->mMaxConcurrent = value;
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_MAX_STREAMS, value);
-      break;
-
-    case SETTINGS_TYPE_CWND:
-      if (flags & PERSIST_VALUE)
-      {
-        nsRefPtr<nsHttpConnectionInfo> ci;
-        self->GetConnectionInfo(getter_AddRefs(ci));
-        if (ci)
-          gHttpHandler->ConnMgr()->ReportSpdyCWNDSetting(ci, value);
-      }
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_CWND, value);
-      break;
-
-    case SETTINGS_TYPE_DOWNLOAD_RETRANS_RATE:
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_RETRANS, value);
-      break;
-
-    case SETTINGS_TYPE_INITIAL_WINDOW:
-      Telemetry::Accumulate(Telemetry::SPDY_SETTINGS_IW, value >> 10);
-      {
-        int32_t delta = value - self->mServerInitialWindow;
-        self->mServerInitialWindow = value;
-
-        // we need to add the delta to all open streams (delta can be negative)
-        self->mStreamTransactionHash.Enumerate(UpdateServerRwinEnumerator,
-                                               &delta);
-      }
-      break;
-
-    default:
-      break;
-    }
-
-  }
-
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::HandleNoop(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_NOOP);
-
-  // Should not be receiving noop frames in spdy/3, so we'll just
-  // make a log and ignore it
-
-  LOG3(("SpdySession3::HandleNoop %p NOP.", self));
-
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::HandlePing(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_PING);
-
-  if (self->mInputFrameDataSize != 4) {
-    LOG3(("SpdySession3::HandlePing %p PING had wrong amount of data %d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint32_t pingID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-
-  LOG3(("SpdySession3::HandlePing %p PING ID 0x%X.", self, pingID));
-
-  if (pingID & 0x01) {
-    // presumably a reply to our timeout ping
-    self->mPingSentEpoch = 0;
-  }
-  else {
-    // Servers initiate even numbered pings, go ahead and echo it back
-    self->GeneratePing(pingID);
-  }
-
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::HandleGoAway(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_GOAWAY);
-
-  if (self->mInputFrameDataSize != 8) {
-    LOG3(("SpdySession3::HandleGoAway %p GOAWAY had wrong amount of data %d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  self->mShouldGoAway = true;
-  self->mGoAwayID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-  self->mCleanShutdown = true;
-
-  // Find streams greater than the last-good ID and mark them for deletion
-  // in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The
-  // underlying transaction can be restarted.
-  self->mStreamTransactionHash.Enumerate(GoAwayEnumerator, self);
-
-  // Process the streams marked for deletion and restart.
-  uint32_t size = self->mGoAwayStreamsToRestart.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
-    SpdyStream3 *stream =
-      static_cast<SpdyStream3 *>(self->mGoAwayStreamsToRestart.PopFront());
-
-    self->CloseStream(stream, NS_ERROR_NET_RESET);
-    if (stream->HasRegisteredID())
-      self->mStreamIDHash.Remove(stream->StreamID());
-    self->mStreamTransactionHash.Remove(stream->Transaction());
-  }
-
-  // Queued streams can also be deleted from this session and restarted
-  // in another one. (they were never sent on the network so they implicitly
-  // are not covered by the last-good id.
-  size = self->mQueuedStreams.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
-    SpdyStream3 *stream =
-      static_cast<SpdyStream3 *>(self->mQueuedStreams.PopFront());
-    self->CloseStream(stream, NS_ERROR_NET_RESET);
-    self->mStreamTransactionHash.Remove(stream->Transaction());
-  }
-
-  LOG3(("SpdySession3::HandleGoAway %p GOAWAY Last-Good-ID 0x%X status 0x%X "
-        "live streams=%d\n", self, self->mGoAwayID,
-        NetworkEndian::readUint32(self->mInputFrameBuffer +
-                                  3 * sizeof(uint32_t)),
-        self->mStreamTransactionHash.Count()));
-
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::HandleHeaders(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_HEADERS);
-
-  if (self->mInputFrameDataSize < 4) {
-    LOG3(("SpdySession3::HandleHeaders %p HEADERS had wrong amount of data %d",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint32_t streamID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-  LOG3(("SpdySession3::HandleHeaders %p HEADERS for Stream 0x%X.\n",
-        self, streamID));
-  nsresult rv = self->SetInputFrameDataStream(streamID);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!self->mInputFrameDataStream) {
-    LOG3(("SpdySession3::HandleHeaders %p lookup streamID 0x%X failed.\n",
-          self, streamID));
-    if (streamID >= self->mNextStreamID)
-      self->GenerateRstStream(RST_INVALID_STREAM, streamID);
-
-    rv = self->UncompressAndDiscard(12, self->mInputFrameDataSize - 4);
-    if (NS_FAILED(rv)) {
-      LOG(("SpdySession3::HandleHeaders uncompress failed\n"));
-      // this is fatal to the session
-      return rv;
-    }
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  // Uncompress the headers into local buffers in the SpdyStream, leaving
-  // them in spdy format for the time being. Make certain to do this
-  // step before any error handling that might abort the stream but not
-  // the session becuase the session compression context will become
-  // inconsistent if all of the compressed data is not processed.
-  rv = self->mInputFrameDataStream->Uncompress(&self->mDownstreamZlib,
-                                               self->mInputFrameBuffer + 12,
-                                               self->mInputFrameDataSize - 4);
-  if (NS_FAILED(rv)) {
-    LOG(("SpdySession3::HandleHeaders uncompress failed\n"));
-    return rv;
-  }
-
-  self->mInputFrameDataLast = self->mInputFrameBuffer[4] & kFlag_Data_FIN;
-  self->mInputFrameDataStream->
-    UpdateTransportReadEvents(self->mInputFrameDataSize);
-  self->mLastDataReadEpoch = self->mLastReadEpoch;
-
-  if (self->mInputFrameBuffer[4] & ~kFlag_Data_FIN) {
-    LOG3(("Headers %p had undefined flag set 0x%X\n", self, streamID));
-    self->CleanupStream(self->mInputFrameDataStream, NS_ERROR_ILLEGAL_VALUE,
-                        RST_PROTOCOL_ERROR);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  if (!self->mInputFrameDataLast) {
-    // don't process the headers yet as there could be more HEADERS frames
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  rv = self->ResponseHeadersComplete();
-  if (rv == NS_ERROR_ILLEGAL_VALUE) {
-    LOG3(("SpdySession3::HanndleHeaders %p PROTOCOL_ERROR detected 0x%X\n",
-          self, streamID));
-    self->CleanupStream(self->mInputFrameDataStream, rv, RST_PROTOCOL_ERROR);
-    self->ResetDownstreamState();
-    rv = NS_OK;
-  }
-  return rv;
-}
-
-nsresult
-SpdySession3::HandleWindowUpdate(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_WINDOW_UPDATE);
-
-  if (self->mInputFrameDataSize < 8) {
-    LOG3(("SpdySession3::HandleWindowUpdate %p Window Update wrong length %d\n",
-          self, self->mInputFrameDataSize));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  uint32_t delta =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 3 * sizeof(uint32_t));
-  delta &= 0x7fffffff;
-  uint32_t streamID =
-    NetworkEndian::readUint32(self->mInputFrameBuffer + 2 * sizeof(uint32_t));
-  streamID &= 0x7fffffff;
-
-  LOG3(("SpdySession3::HandleWindowUpdate %p len=%d for Stream 0x%X.\n",
-        self, delta, streamID));
-  nsresult rv = self->SetInputFrameDataStream(streamID);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (!self->mInputFrameDataStream) {
-    LOG3(("SpdySession3::HandleWindowUpdate %p lookup streamID 0x%X failed.\n",
-          self, streamID));
-    if (streamID >= self->mNextStreamID)
-      self->GenerateRstStream(RST_INVALID_STREAM, streamID);
-    self->ResetDownstreamState();
-    return NS_OK;
-  }
-
-  self->mInputFrameDataStream->UpdateRemoteWindow(delta);
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::HandleCredential(SpdySession3 *self)
-{
-  MOZ_ASSERT(self->mFrameControlType == CONTROL_TYPE_CREDENTIAL);
-
-  // These aren't used yet. Just ignore the frame.
-
-  LOG3(("SpdySession3::HandleCredential %p NOP.", self));
-
-  self->ResetDownstreamState();
-  return NS_OK;
-}
-
-//-----------------------------------------------------------------------------
-// nsAHttpTransaction. It is expected that nsHttpConnection is the caller
-// of these methods
-//-----------------------------------------------------------------------------
-
-void
-SpdySession3::OnTransportStatus(nsITransport* aTransport,
-                                nsresult aStatus,
-                                uint64_t aProgress)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  switch (aStatus) {
-    // These should appear only once, deliver to the first
-    // transaction on the session.
-  case NS_NET_STATUS_RESOLVING_HOST:
-  case NS_NET_STATUS_RESOLVED_HOST:
-  case NS_NET_STATUS_CONNECTING_TO:
-  case NS_NET_STATUS_CONNECTED_TO:
-  {
-    SpdyStream3 *target = mStreamIDHash.Get(1);
-    nsAHttpTransaction *transaction = target ? target->Transaction() : nullptr;
-    if (transaction)
-      transaction->OnTransportStatus(aTransport, aStatus, aProgress);
-    break;
-  }
-
-  default:
-    // The other transport events are ignored here because there is no good
-    // way to map them to the right transaction in spdy. Instead, the events
-    // are generated again from the spdy code and passed directly to the
-    // correct transaction.
-
-    // NS_NET_STATUS_SENDING_TO:
-    // This is generated by the socket transport when (part) of
-    // a transaction is written out
-    //
-    // There is no good way to map it to the right transaction in spdy,
-    // so it is ignored here and generated separately when the SYN_STREAM
-    // is sent from SpdyStream3::TransmitFrame
-
-    // NS_NET_STATUS_WAITING_FOR:
-    // Created by nsHttpConnection when the request has been totally sent.
-    // There is no good way to map it to the right transaction in spdy,
-    // so it is ignored here and generated separately when the same
-    // condition is complete in SpdyStream3 when there is no more
-    // request body left to be transmitted.
-
-    // NS_NET_STATUS_RECEIVING_FROM
-    // Generated in spdysession whenever we read a data frame or a syn_reply
-    // that can be attributed to a particular stream/transaction
-
-    break;
-  }
-}
-
-// ReadSegments() is used to write data to the network. Generally, HTTP
-// request data is pulled from the approriate transaction and
-// converted to SPDY data. Sometimes control data like window-update are
-// generated instead.
-
-nsresult
-SpdySession3::ReadSegments(nsAHttpSegmentReader *reader,
-                           uint32_t count,
-                           uint32_t *countRead)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  MOZ_ASSERT(!mSegmentReader || !reader || (mSegmentReader == reader),
-             "Inconsistent Write Function Callback");
-
-  if (reader)
-    mSegmentReader = reader;
-
-  nsresult rv;
-  *countRead = 0;
-
-  LOG3(("SpdySession3::ReadSegments %p", this));
-
-  SpdyStream3 *stream = static_cast<SpdyStream3 *>(mReadyForWrite.PopFront());
-  if (!stream) {
-    LOG3(("SpdySession3 %p could not identify a stream to write; suspending.",
-          this));
-    FlushOutputQueue();
-    SetWriteCallbacks();
-    return NS_BASE_STREAM_WOULD_BLOCK;
-  }
-
-  LOG3(("SpdySession3 %p will write from SpdyStream3 %p 0x%X "
-        "block-input=%d block-output=%d\n", this, stream, stream->StreamID(),
-        stream->RequestBlockedOnRead(), stream->BlockedOnRwin()));
-
-  rv = stream->ReadSegments(this, count, countRead);
-
-  // Not every permutation of stream->ReadSegents produces data (and therefore
-  // tries to flush the output queue) - SENDING_FIN_STREAM can be an example
-  // of that. But we might still have old data buffered that would be good
-  // to flush.
-  FlushOutputQueue();
-
-  // Allow new server reads - that might be data or control information
-  // (e.g. window updates or http replies) that are responses to these writes
-  ResumeRecv();
-
-  if (stream->RequestBlockedOnRead()) {
-
-    // We are blocked waiting for input - either more http headers or
-    // any request body data. When more data from the request stream
-    // becomes available the httptransaction will call conn->ResumeSend().
-
-    LOG3(("SpdySession3::ReadSegments %p dealing with block on read", this));
-
-    // call readsegments again if there are other streams ready
-    // to run in this session
-    if (GetWriteQueueSize())
-      rv = NS_OK;
-    else
-      rv = NS_BASE_STREAM_WOULD_BLOCK;
-    SetWriteCallbacks();
-    return rv;
-  }
-
-  if (NS_FAILED(rv)) {
-    LOG3(("SpdySession3::ReadSegments %p may return FAIL code %X",
-          this, rv));
-    if (rv == NS_BASE_STREAM_WOULD_BLOCK) {
-      return rv;
-    }
-
-    CleanupStream(stream, rv, RST_CANCEL);
-    if (SoftStreamError(rv)) {
-      LOG3(("SpdySession3::ReadSegments %p soft error override\n", this));
-      rv = NS_OK;
-    }
-    return rv;
-  }
-
-  if (*countRead > 0) {
-    LOG3(("SpdySession3::ReadSegments %p stream=%p countread=%d",
-          this, stream, *countRead));
-    mReadyForWrite.Push(stream);
-    SetWriteCallbacks();
-    return rv;
-  }
-
-  if (stream->BlockedOnRwin()) {
-    LOG3(("SpdySession3 %p will stream %p 0x%X suspended for flow control\n",
-          this, stream, stream->StreamID()));
-    return NS_BASE_STREAM_WOULD_BLOCK;
-  }
-
-  LOG3(("SpdySession3::ReadSegments %p stream=%p stream send complete",
-        this, stream));
-
-  // call readsegments again if there are other streams ready
-  // to go in this session
-  SetWriteCallbacks();
-
-  return rv;
-}
-
-// WriteSegments() is used to read data off the socket. Generally this is
-// just the SPDY frame header and from there the appropriate SPDYStream
-// is identified from the Stream-ID. The http transaction associated with
-// that read then pulls in the data directly, which it will feed to
-// OnWriteSegment(). That function will gateway it into http and feed
-// it to the appropriate transaction.
-
-// we call writer->OnWriteSegment via NetworkRead() to get a spdy header..
-// and decide if it is data or control.. if it is control, just deal with it.
-// if it is data, identify the spdy stream
-// call stream->WriteSegments which can call this::OnWriteSegment to get the
-// data. It always gets full frames if they are part of the stream
-
-nsresult
-SpdySession3::WriteSegments(nsAHttpSegmentWriter *writer,
-                            uint32_t count,
-                            uint32_t *countWritten)
-{
-  typedef nsresult  (*Control_FX) (SpdySession3 *self);
-  static const Control_FX sControlFunctions[] =
-  {
-    nullptr,
-    SpdySession3::HandleSynStream,
-    SpdySession3::HandleSynReply,
-    SpdySession3::HandleRstStream,
-    SpdySession3::HandleSettings,
-    SpdySession3::HandleNoop,
-    SpdySession3::HandlePing,
-    SpdySession3::HandleGoAway,
-    SpdySession3::HandleHeaders,
-    SpdySession3::HandleWindowUpdate,
-    SpdySession3::HandleCredential
-  };
-
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  nsresult rv;
-  *countWritten = 0;
-
-  if (mClosed)
-    return NS_ERROR_FAILURE;
-
-  SetWriteCallbacks();
-
-  // If there are http transactions attached to a push stream with filled buffers
-  // trigger that data pump here. This only reads from buffers (not the network)
-  // so mDownstreamState doesn't matter.
-  SpdyStream3 *pushConnectedStream =
-    static_cast<SpdyStream3 *>(mReadyForRead.PopFront());
-  if (pushConnectedStream) {
-    LOG3(("SpdySession3::WriteSegments %p processing pushed stream 0x%X\n",
-          this, pushConnectedStream->StreamID()));
-    mSegmentWriter = writer;
-    rv = pushConnectedStream->WriteSegments(this, count, countWritten);
-    mSegmentWriter = nullptr;
-
-    // The pipe in nsHttpTransaction rewrites CLOSED error codes into OK
-    // so we need this check to determine the truth.
-    if (NS_SUCCEEDED(rv) && !*countWritten &&
-        pushConnectedStream->PushSource() &&
-        pushConnectedStream->PushSource()->GetPushComplete()) {
-      rv = NS_BASE_STREAM_CLOSED;
-    }
-
-    if (rv == NS_BASE_STREAM_CLOSED) {
-      CleanupStream(pushConnectedStream, NS_OK, RST_CANCEL);
-      rv = NS_OK;
-    }
-
-    // if we return OK to nsHttpConnection it will use mSocketInCondition
-    // to determine whether to schedule more reads, incorrectly
-    // assuming that nsHttpConnection::OnSocketWrite() was called.
-    if (NS_SUCCEEDED(rv) || rv == NS_BASE_STREAM_WOULD_BLOCK) {
-      rv = NS_BASE_STREAM_WOULD_BLOCK;
-      ResumeRecv();
-    }
-
-    return rv;
-  }
-
-  // We buffer all control frames and act on them in this layer.
-  // We buffer the first 8 bytes of data frames (the header) but
-  // the actual data is passed through unprocessed.
-
-  if (mDownstreamState == BUFFERING_FRAME_HEADER) {
-    // The first 8 bytes of every frame is header information that
-    // we are going to want to strip before passing to http. That is
-    // true of both control and data packets.
-
-    MOZ_ASSERT(mInputFrameBufferUsed < 8,
-               "Frame Buffer Used Too Large for State");
-
-    rv = NetworkRead(writer, mInputFrameBuffer + mInputFrameBufferUsed,
-                     8 - mInputFrameBufferUsed, countWritten);
-
-    if (NS_FAILED(rv)) {
-      LOG3(("SpdySession3 %p buffering frame header read failure %x\n",
-            this, rv));
-      // maybe just blocked reading from network
-      if (rv == NS_BASE_STREAM_WOULD_BLOCK)
-        rv = NS_OK;
-      return rv;
-    }
-
-    LogIO(this, nullptr, "Reading Frame Header",
-          mInputFrameBuffer + mInputFrameBufferUsed, *countWritten);
-
-    mInputFrameBufferUsed += *countWritten;
-
-    if (mInputFrameBufferUsed < 8)
-    {
-      LOG3(("SpdySession3::WriteSegments %p "
-            "BUFFERING FRAME HEADER incomplete size=%d",
-            this, mInputFrameBufferUsed));
-      return rv;
-    }
-
-    // For both control and data frames the second 32 bit word of the header
-    // is 8-flags, 24-length. (network byte order)
-    mInputFrameDataSize =
-      NetworkEndian::readUint32(mInputFrameBuffer + 1 * sizeof(uint32_t));
-    mInputFrameDataSize &= 0x00ffffff;
-    mInputFrameDataRead = 0;
-
-    if (mInputFrameBuffer[0] & kFlag_Control) {
-      EnsureBuffer(mInputFrameBuffer, mInputFrameDataSize + 8, 8,
-                   mInputFrameBufferSize);
-      ChangeDownstreamState(BUFFERING_CONTROL_FRAME);
-
-      // The first 32 bit word of the header is
-      // 1 ctrl - 15 version - 16 type
-      uint16_t version = NetworkEndian::readUint16(mInputFrameBuffer);
-      version &= 0x7fff;
-
-      mFrameControlType =
-        NetworkEndian::readUint16(mInputFrameBuffer + sizeof(uint16_t));
-
-      LOG3(("SpdySession3::WriteSegments %p - Control Frame Identified "
-            "type %d version %d data len %d",
-            this, mFrameControlType, version, mInputFrameDataSize));
-
-      if (mFrameControlType >= CONTROL_TYPE_LAST ||
-          mFrameControlType <= CONTROL_TYPE_FIRST)
-        return NS_ERROR_ILLEGAL_VALUE;
-
-      if (version != kVersion)
-        return NS_ERROR_ILLEGAL_VALUE;
-    }
-    else {
-      ChangeDownstreamState(PROCESSING_DATA_FRAME);
-
-      Telemetry::Accumulate(Telemetry::SPDY_CHUNK_RECVD,
-                            mInputFrameDataSize >> 10);
-      mLastDataReadEpoch = mLastReadEpoch;
-
-      uint32_t streamID = NetworkEndian::readUint32(mInputFrameBuffer);
-      rv = SetInputFrameDataStream(streamID);
-      if (NS_FAILED(rv)) {
-        LOG(("SpdySession3::WriteSegments %p lookup streamID 0x%X failed. "
-              "probably due to verification.\n", this, streamID));
-        return rv;
-      }
-      if (!mInputFrameDataStream) {
-        LOG3(("SpdySession3::WriteSegments %p lookup streamID 0x%X failed. "
-              "Next = 0x%X", this, streamID, mNextStreamID));
-        if (streamID >= mNextStreamID)
-          GenerateRstStream(RST_INVALID_STREAM, streamID);
-        ChangeDownstreamState(DISCARDING_DATA_FRAME);
-      }
-      else if (mInputFrameDataStream->RecvdFin()) {
-        LOG3(("SpdySession3::WriteSegments %p streamID 0x%X "
-              "Data arrived for already server closed stream.\n",
-              this, streamID));
-        GenerateRstStream(RST_STREAM_ALREADY_CLOSED, streamID);
-        ChangeDownstreamState(DISCARDING_DATA_FRAME);
-      }
-      else if (!mInputFrameDataStream->RecvdData()) {
-        LOG3(("SpdySession3 %p First Data Frame Flushes Headers stream 0x%X\n",
-              this, streamID));
-
-        mInputFrameDataStream->SetRecvdData(true);
-        rv = ResponseHeadersComplete();
-        if (rv == NS_ERROR_ILLEGAL_VALUE) {
-          LOG3(("SpdySession3 %p PROTOCOL_ERROR detected 0x%X\n",
-                this, streamID));
-          CleanupStream(mInputFrameDataStream, rv, RST_PROTOCOL_ERROR);
-          ChangeDownstreamState(DISCARDING_DATA_FRAME);
-        }
-        else {
-          mDataPending = true;
-        }
-      }
-
-      mInputFrameDataLast = (mInputFrameBuffer[4] & kFlag_Data_FIN);
-      LOG3(("Start Processing Data Frame. "
-            "Session=%p Stream ID 0x%X Stream Ptr %p Fin=%d Len=%d",
-            this, streamID, mInputFrameDataStream, mInputFrameDataLast,
-            mInputFrameDataSize));
-      UpdateLocalRwin(mInputFrameDataStream, mInputFrameDataSize);
-    }
-  }
-
-  if (mDownstreamState == PROCESSING_CONTROL_RST_STREAM) {
-    if (mDownstreamRstReason == RST_REFUSED_STREAM)
-      rv = NS_ERROR_NET_RESET;            //we can retry this 100% safely
-    else if (mDownstreamRstReason == RST_CANCEL) {
-      rv = mInputFrameDataStream->RecvdData() ?
-        NS_ERROR_NET_PARTIAL_TRANSFER :
-        NS_ERROR_NET_INTERRUPT;
-    }
-    else if (mDownstreamRstReason == RST_PROTOCOL_ERROR ||
-             mDownstreamRstReason == RST_INTERNAL_ERROR ||
-             mDownstreamRstReason == RST_UNSUPPORTED_VERSION) {
-      rv = NS_ERROR_NET_INTERRUPT;
-    }
-    else if (mDownstreamRstReason == RST_FRAME_TOO_LARGE)
-      rv = NS_ERROR_FILE_TOO_BIG;
-    else
-      rv = NS_ERROR_ILLEGAL_VALUE;
-
-    if (mDownstreamRstReason != RST_REFUSED_STREAM &&
-        mDownstreamRstReason != RST_CANCEL)
-      mShouldGoAway = true;
-
-    // mInputFrameDataStream is reset by ChangeDownstreamState
-    SpdyStream3 *stream = mInputFrameDataStream;
-    ResetDownstreamState();
-    LOG3(("SpdySession3::WriteSegments cleanup stream on recv of rst "
-          "session=%p stream=%p 0x%X\n", this, stream,
-          stream ? stream->StreamID() : 0));
-    CleanupStream(stream, rv, RST_CANCEL);
-    return NS_OK;
-  }
-
-  if (mDownstreamState == PROCESSING_DATA_FRAME ||
-      mDownstreamState == PROCESSING_COMPLETE_HEADERS) {
-
-    // The cleanup stream should only be set while stream->WriteSegments is
-    // on the stack and then cleaned up in this code block afterwards.
-    MOZ_ASSERT(!mNeedsCleanup, "cleanup stream set unexpectedly");
-    mNeedsCleanup = nullptr;                     /* just in case */
-
-    SpdyStream3 *stream = mInputFrameDataStream;
-    mSegmentWriter = writer;
-    rv = mInputFrameDataStream->WriteSegments(this, count, countWritten);
-    mSegmentWriter = nullptr;
-
-    mLastDataReadEpoch = mLastReadEpoch;
-
-    if (SoftStreamError(rv)) {
-      // This will happen when the transaction figures out it is EOF, generally
-      // due to a content-length match being made. Return OK from this function
-      // otherwise the whole session would be torn down.
-
-      // if we were doing PROCESSING_COMPLETE_HEADERS need to pop the state
-      // back to PROCESSING_DATA_FRAME where we came from
-      mDownstreamState = PROCESSING_DATA_FRAME;
-
-      if (mInputFrameDataRead == mInputFrameDataSize)
-        ResetDownstreamState();
-      LOG3(("SpdySession3::WriteSegments session=%p stream=%p 0x%X "
-            "needscleanup=%p. cleanup stream based on "
-            "stream->writeSegments returning code %X\n",
-            this, stream, stream ? stream->StreamID() : 0,
-            mNeedsCleanup, rv));
-      CleanupStream(stream, NS_OK, RST_CANCEL);
-      MOZ_ASSERT(!mNeedsCleanup || mNeedsCleanup == stream);
-      mNeedsCleanup = nullptr;
-      return NS_OK;
-    }
-
-    if (mNeedsCleanup) {
-      LOG3(("SpdySession3::WriteSegments session=%p stream=%p 0x%X "
-            "cleanup stream based on mNeedsCleanup.\n",
-            this, mNeedsCleanup, mNeedsCleanup ? mNeedsCleanup->StreamID() : 0));
-      CleanupStream(mNeedsCleanup, NS_OK, RST_CANCEL);
-      mNeedsCleanup = nullptr;
-    }
-
-    if (NS_FAILED(rv)) {
-      LOG3(("SpdySession3 %p data frame read failure %x\n", this, rv));
-      // maybe just blocked reading from network
-      if (rv == NS_BASE_STREAM_WOULD_BLOCK)
-        rv = NS_OK;
-    }
-
-    return rv;
-  }
-
-  if (mDownstreamState == DISCARDING_DATA_FRAME) {
-    char trash[4096];
-    uint32_t count = std::min(4096U, mInputFrameDataSize - mInputFrameDataRead);
-
-    if (!count) {
-      ResetDownstreamState();
-      ResumeRecv();
-      return NS_BASE_STREAM_WOULD_BLOCK;
-    }
-
-    rv = NetworkRead(writer, trash, count, countWritten);
-
-    if (NS_FAILED(rv)) {
-      LOG3(("SpdySession3 %p discard frame read failure %x\n", this, rv));
-      // maybe just blocked reading from network
-      if (rv == NS_BASE_STREAM_WOULD_BLOCK)
-        rv = NS_OK;
-      return rv;
-    }
-
-    LogIO(this, nullptr, "Discarding Frame", trash, *countWritten);
-
-    mInputFrameDataRead += *countWritten;
-
-    if (mInputFrameDataRead == mInputFrameDataSize)
-      ResetDownstreamState();
-    return rv;
-  }
-
-  MOZ_ASSERT(mDownstreamState == BUFFERING_CONTROL_FRAME);
-  if (mDownstreamState != BUFFERING_CONTROL_FRAME) {
-    // this cannot happen
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  MOZ_ASSERT(mInputFrameBufferUsed == 8,
-             "Frame Buffer Header Not Present");
-
-  rv = NetworkRead(writer, mInputFrameBuffer + 8 + mInputFrameDataRead,
-                   mInputFrameDataSize - mInputFrameDataRead, countWritten);
-
-  if (NS_FAILED(rv)) {
-    LOG3(("SpdySession3 %p buffering control frame read failure %x\n",
-          this, rv));
-    // maybe just blocked reading from network
-    if (rv == NS_BASE_STREAM_WOULD_BLOCK)
-      rv = NS_OK;
-    return rv;
-  }
-
-  LogIO(this, nullptr, "Reading Control Frame",
-        mInputFrameBuffer + 8 + mInputFrameDataRead, *countWritten);
-
-  mInputFrameDataRead += *countWritten;
-
-  if (mInputFrameDataRead != mInputFrameDataSize)
-    return NS_OK;
-
-  // This check is actually redundant, the control type was previously
-  // checked to make sure it was in range, but we will check it again
-  // at time of use to make sure a regression doesn't creep in.
-  if (mFrameControlType >= CONTROL_TYPE_LAST ||
-      mFrameControlType <= CONTROL_TYPE_FIRST)
-  {
-    MOZ_ASSERT(false, "control type out of range");
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-  rv = sControlFunctions[mFrameControlType](this);
-
-  MOZ_ASSERT(NS_FAILED(rv) ||
-             mDownstreamState != BUFFERING_CONTROL_FRAME,
-             "Control Handler returned OK but did not change state");
-
-  if (mShouldGoAway && !mStreamTransactionHash.Count())
-    Close(NS_OK);
-  return rv;
-}
-
-void
-SpdySession3::UpdateLocalRwin(SpdyStream3 *stream,
-                              uint32_t bytes)
-{
-  // If this data packet was not for a valid or live stream then there
-  // is no reason to mess with the flow control
-  if (!stream || stream->RecvdFin())
-    return;
-
-  stream->DecrementLocalWindow(bytes);
-
-  // Don't necessarily ack every data packet. Only do it
-  // after a significant amount of data.
-  uint64_t unacked = stream->LocalUnAcked();
-  int64_t  localWindow = stream->LocalWindow();
-
-  LOG3(("SpdySession3::UpdateLocalRwin this=%p id=0x%X newbytes=%u "
-        "unacked=%llu localWindow=%lld\n",
-        this, stream->StreamID(), bytes, unacked, localWindow));
-
-  if (!unacked)
-    return;
-
-  if ((unacked < kMinimumToAck) && (localWindow > kEmergencyWindowThreshold))
-    return;
-
-  if (!stream->HasSink()) {
-    LOG3(("SpdySession3::UpdateLocalRwin %p 0x%X Pushed Stream Has No Sink\n",
-          this, stream->StreamID()));
-    return;
-  }
-
-  // Generate window updates directly out of spdysession instead of the stream
-  // in order to avoid queue delays in getting the 'ACK' out.
-  uint32_t toack = (unacked <= 0x7fffffffU) ? unacked : 0x7fffffffU;
-
-  LOG3(("SpdySession3::UpdateLocalRwin Ack this=%p id=0x%X acksize=%d\n",
-        this, stream->StreamID(), toack));
-  stream->IncrementLocalWindow(toack);
-
-  static const uint32_t dataLen = 8;
-  EnsureBuffer(mOutputQueueBuffer, mOutputQueueUsed + 8 + dataLen,
-               mOutputQueueUsed, mOutputQueueSize);
-  char *packet = mOutputQueueBuffer.get() + mOutputQueueUsed;
-  mOutputQueueUsed += 8 + dataLen;
-
-  memset(packet, 0, 8 + dataLen);
-  packet[0] = kFlag_Control;
-  packet[1] = kVersion;
-  packet[3] = CONTROL_TYPE_WINDOW_UPDATE;
-  packet[7] = dataLen;
-
-  NetworkEndian::writeUint32(packet + 8, stream->StreamID());
-  NetworkEndian::writeUint32(packet + 12, toack);
-
-  LogIO(this, stream, "Window Update", packet, 8 + dataLen);
-  FlushOutputQueue();
-}
-
-void
-SpdySession3::Close(nsresult aReason)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  if (mClosed)
-    return;
-
-  LOG3(("SpdySession3::Close %p %X", this, aReason));
-
-  mClosed = true;
-
-  mStreamTransactionHash.Enumerate(ShutdownEnumerator, this);
-  mStreamIDHash.Clear();
-  mStreamTransactionHash.Clear();
-
-  uint32_t goAwayReason;
-  if (NS_SUCCEEDED(aReason)) {
-    goAwayReason = OK;
-  } else if (aReason == NS_ERROR_ILLEGAL_VALUE) {
-    goAwayReason = PROTOCOL_ERROR;
-  } else {
-    goAwayReason = INTERNAL_ERROR;
-  }
-  GenerateGoAway(goAwayReason);
-  mConnection = nullptr;
-  mSegmentReader = nullptr;
-  mSegmentWriter = nullptr;
-}
-
-nsHttpConnectionInfo *
-SpdySession3::ConnectionInfo()
-{
-  nsRefPtr<nsHttpConnectionInfo> ci;
-  GetConnectionInfo(getter_AddRefs(ci));
-  return ci.get();
-}
-
-void
-SpdySession3::CloseTransaction(nsAHttpTransaction *aTransaction,
-                               nsresult aResult)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::CloseTransaction %p %p %x", this, aTransaction, aResult));
-
-  // Generally this arrives as a cancel event from the connection manager.
-
-  // need to find the stream and call CleanupStream() on it.
-  SpdyStream3 *stream = mStreamTransactionHash.Get(aTransaction);
-  if (!stream) {
-    LOG3(("SpdySession3::CloseTransaction %p %p %x - not found.",
-          this, aTransaction, aResult));
-    return;
-  }
-  LOG3(("SpdySession3::CloseTransaction probably a cancel. "
-        "this=%p, trans=%p, result=%x, streamID=0x%X stream=%p",
-        this, aTransaction, aResult, stream->StreamID(), stream));
-  CleanupStream(stream, aResult, RST_CANCEL);
-  ResumeRecv();
-}
-
-
-//-----------------------------------------------------------------------------
-// nsAHttpSegmentReader
-//-----------------------------------------------------------------------------
-
-nsresult
-SpdySession3::OnReadSegment(const char *buf,
-                            uint32_t count,
-                            uint32_t *countRead)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  nsresult rv;
-
-  // If we can release old queued data then we can try and write the new
-  // data directly to the network without using the output queue at all
-  if (mOutputQueueUsed)
-    FlushOutputQueue();
-
-  if (!mOutputQueueUsed && mSegmentReader) {
-    // try and write directly without output queue
-    rv = mSegmentReader->OnReadSegment(buf, count, countRead);
-
-    if (rv == NS_BASE_STREAM_WOULD_BLOCK)
-      *countRead = 0;
-    else if (NS_FAILED(rv))
-      return rv;
-
-    if (*countRead < count) {
-      uint32_t required = count - *countRead;
-      // assuming a commitment() happened, this ensurebuffer is a nop
-      // but just in case the queuesize is too small for the required data
-      // call ensurebuffer().
-      EnsureBuffer(mOutputQueueBuffer, required, 0, mOutputQueueSize);
-      memcpy(mOutputQueueBuffer.get(), buf + *countRead, required);
-      mOutputQueueUsed = required;
-    }
-
-    *countRead = count;
-    return NS_OK;
-  }
-
-  // At this point we are going to buffer the new data in the output
-  // queue if it fits. By coalescing multiple small submissions into one larger
-  // buffer we can get larger writes out to the network later on.
-
-  // This routine should not be allowed to fill up the output queue
-  // all on its own - at least kQueueReserved bytes are always left
-  // for other routines to use - but this is an all-or-nothing function,
-  // so if it will not all fit just return WOULD_BLOCK
-
-  if ((mOutputQueueUsed + count) > (mOutputQueueSize - kQueueReserved))
-    return NS_BASE_STREAM_WOULD_BLOCK;
-
-  memcpy(mOutputQueueBuffer.get() + mOutputQueueUsed, buf, count);
-  mOutputQueueUsed += count;
-  *countRead = count;
-
-  FlushOutputQueue();
-
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::CommitToSegmentSize(uint32_t count, bool forceCommitment)
-{
-  if (mOutputQueueUsed)
-    FlushOutputQueue();
-
-  // would there be enough room to buffer this if needed?
-  if ((mOutputQueueUsed + count) <= (mOutputQueueSize - kQueueReserved))
-    return NS_OK;
-
-  // if we are using part of our buffers already, try again later unless
-  // forceCommitment is set.
-  if (mOutputQueueUsed && !forceCommitment)
-    return NS_BASE_STREAM_WOULD_BLOCK;
-
-  if (mOutputQueueUsed) {
-    // normally we avoid the memmove of RealignOutputQueue, but we'll try
-    // it if forceCommitment is set before growing the buffer.
-    RealignOutputQueue();
-
-    // is there enough room now?
-    if ((mOutputQueueUsed + count) <= (mOutputQueueSize - kQueueReserved))
-      return NS_OK;
-  }
-
-  // resize the buffers as needed
-  EnsureBuffer(mOutputQueueBuffer, mOutputQueueUsed + count + kQueueReserved,
-               mOutputQueueUsed, mOutputQueueSize);
-
-  MOZ_ASSERT((mOutputQueueUsed + count) <= (mOutputQueueSize - kQueueReserved),
-             "buffer not as large as expected");
-
-  return NS_OK;
-}
-
-//-----------------------------------------------------------------------------
-// nsAHttpSegmentWriter
-//-----------------------------------------------------------------------------
-
-nsresult
-SpdySession3::OnWriteSegment(char *buf,
-                             uint32_t count,
-                             uint32_t *countWritten)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  nsresult rv;
-
-  if (!mSegmentWriter) {
-    // the only way this could happen would be if Close() were called on the
-    // stack with WriteSegments()
-    return NS_ERROR_FAILURE;
-  }
-
-  if (mDownstreamState == PROCESSING_DATA_FRAME) {
-
-    if (mInputFrameDataLast &&
-        mInputFrameDataRead == mInputFrameDataSize) {
-      *countWritten = 0;
-      SetNeedsCleanup();
-      return NS_BASE_STREAM_CLOSED;
-    }
-
-    count = std::min(count, mInputFrameDataSize - mInputFrameDataRead);
-    rv = NetworkRead(mSegmentWriter, buf, count, countWritten);
-    if (NS_FAILED(rv))
-      return rv;
-
-    LogIO(this, mInputFrameDataStream, "Reading Data Frame",
-          buf, *countWritten);
-
-    mInputFrameDataRead += *countWritten;
-
-    mInputFrameDataStream->UpdateTransportReadEvents(*countWritten);
-    if ((mInputFrameDataRead == mInputFrameDataSize) && !mInputFrameDataLast)
-      ResetDownstreamState();
-
-    return rv;
-  }
-
-  if (mDownstreamState == PROCESSING_COMPLETE_HEADERS) {
-
-    if (mFlatHTTPResponseHeaders.Length() == mFlatHTTPResponseHeadersOut &&
-        mInputFrameDataLast) {
-      *countWritten = 0;
-      SetNeedsCleanup();
-      return NS_BASE_STREAM_CLOSED;
-    }
-
-    count = std::min(count,
-                   mFlatHTTPResponseHeaders.Length() -
-                   mFlatHTTPResponseHeadersOut);
-    memcpy(buf,
-           mFlatHTTPResponseHeaders.get() + mFlatHTTPResponseHeadersOut,
-           count);
-    mFlatHTTPResponseHeadersOut += count;
-    *countWritten = count;
-
-    if (mFlatHTTPResponseHeaders.Length() == mFlatHTTPResponseHeadersOut) {
-      if (mDataPending) {
-        // Now ready to process data frames - pop PROCESING_DATA_FRAME back onto
-        // the stack because receipt of that first data frame triggered the
-        // response header processing
-        mDataPending = false;
-        ChangeDownstreamState(PROCESSING_DATA_FRAME);
-      }
-      else if (!mInputFrameDataLast) {
-        // If more frames are expected in this stream, then reset the state so they can be
-        // handled. Otherwise (e.g. a 0 length response with the fin on the SYN_REPLY)
-        // stay in PROCESSING_COMPLETE_HEADERS state so the SetNeedsCleanup() code above can
-        // cleanup the stream.
-        ResetDownstreamState();
-      }
-    }
-
-    return NS_OK;
-  }
-
-  return NS_ERROR_UNEXPECTED;
-}
-
-void
-SpdySession3::SetNeedsCleanup()
-{
-  LOG3(("SpdySession3::SetNeedsCleanup %p - recorded downstream fin of "
-        "stream %p 0x%X", this, mInputFrameDataStream,
-        mInputFrameDataStream->StreamID()));
-
-  // This will result in Close() being called
-  MOZ_ASSERT(!mNeedsCleanup, "mNeedsCleanup unexpectedly set");
-  mNeedsCleanup = mInputFrameDataStream;
-  ResetDownstreamState();
-}
-
-void
-SpdySession3::ConnectPushedStream(SpdyStream3 *stream)
-{
-  mReadyForRead.Push(stream);
-  ForceRecv();
-}
-
-uint32_t
-SpdySession3::FindTunnelCount(nsHttpConnectionInfo *aConnInfo)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  uint32_t rv = 0;
-  mTunnelHash.Get(aConnInfo->HashKey(), &rv);
-  return rv;
-}
-
-void
-SpdySession3::RegisterTunnel(SpdyStream3 *aTunnel)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  nsHttpConnectionInfo *ci = aTunnel->Transaction()->ConnectionInfo();
-  uint32_t newcount = FindTunnelCount(ci) + 1;
-  mTunnelHash.Remove(ci->HashKey());
-  mTunnelHash.Put(ci->HashKey(), newcount);
-  LOG3(("SpdySession3::RegisterTunnel %p stream=%p tunnels=%d [%s]",
-        this, aTunnel, newcount, ci->HashKey().get()));
-}
-
-void
-SpdySession3::UnRegisterTunnel(SpdyStream3 *aTunnel)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  nsHttpConnectionInfo *ci = aTunnel->Transaction()->ConnectionInfo();
-  MOZ_ASSERT(FindTunnelCount(ci));
-  uint32_t newcount = FindTunnelCount(ci) - 1;
-  mTunnelHash.Remove(ci->HashKey());
-  if (newcount) {
-    mTunnelHash.Put(ci->HashKey(), newcount);
-  }
-  LOG3(("SpdySession3::UnRegisterTunnel %p stream=%p tunnels=%d [%s]",
-        this, aTunnel, newcount, ci->HashKey().get()));
-}
-
-void
-SpdySession3::DispatchOnTunnel(nsAHttpTransaction *aHttpTransaction,
-                               nsIInterfaceRequestor *aCallbacks)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  nsHttpTransaction *trans = aHttpTransaction->QueryHttpTransaction();
-  nsHttpConnectionInfo *ci = aHttpTransaction->ConnectionInfo();
-  MOZ_ASSERT(trans);
-
-  LOG3(("SpdySession3::DispatchOnTunnel %p trans=%p", this, trans));
-
-  aHttpTransaction->SetConnection(nullptr);
-
-  // this transaction has done its work of setting up a tunnel, let
-  // the connection manager queue it if necessary
-  trans->SetDontRouteViaWildCard(true);
-  trans->EnableKeepAlive();
-
-  if (FindTunnelCount(ci) < gHttpHandler->MaxConnectionsPerOrigin()) {
-    LOG3(("SpdySession3::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);
-    SpdyStream3 *tunnel = mStreamTransactionHash.Get(connectTrans);
-    MOZ_ASSERT(tunnel);
-    RegisterTunnel(tunnel);
-  } 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.
-    LOG3(("SpdySession3::DispatchOnTunnel %p trans=%p queue in connection manager",
-          this, trans));
-    gHttpHandler->InitiateTransaction(trans, trans->Priority());
-  }
-}
-
-//-----------------------------------------------------------------------------
-// Modified methods of nsAHttpConnection
-//-----------------------------------------------------------------------------
-
-void
-SpdySession3::TransactionHasDataToWrite(nsAHttpTransaction *caller)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::TransactionHasDataToWrite %p trans=%p", this, caller));
-
-  // a trapped signal from the http transaction to the connection that
-  // it is no longer blocked on read.
-
-  SpdyStream3 *stream = mStreamTransactionHash.Get(caller);
-  if (!stream || !VerifyStream(stream)) {
-    LOG3(("SpdySession3::TransactionHasDataToWrite %p caller %p not found",
-          this, caller));
-    return;
-  }
-
-  LOG3(("SpdySession3::TransactionHasDataToWrite %p ID is 0x%X\n",
-        this, stream->StreamID()));
-
-  mReadyForWrite.Push(stream);
-  SetWriteCallbacks();
-
-  // NSPR poll will not poll the network if there are non system PR_FileDesc's
-  // that are ready - so we can get into a deadlock waiting for the system IO
-  // to come back here if we don't force the send loop manually.
-  ForceSend();
-}
-
-void
-SpdySession3::TransactionHasDataToWrite(SpdyStream3 *stream)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  LOG3(("SpdySession3::TransactionHasDataToWrite %p stream=%p ID=%x",
-        this, stream, stream->StreamID()));
-
-  mReadyForWrite.Push(stream);
-  SetWriteCallbacks();
-  ForceSend();
-}
-
-bool
-SpdySession3::IsPersistent()
-{
-  return true;
-}
-
-nsresult
-SpdySession3::TakeTransport(nsISocketTransport **,
-                            nsIAsyncInputStream **,
-                            nsIAsyncOutputStream **)
-{
-  MOZ_ASSERT(false, "TakeTransport of SpdySession3");
-  return NS_ERROR_UNEXPECTED;
-}
-
-nsHttpConnection *
-SpdySession3::TakeHttpConnection()
-{
-  MOZ_ASSERT(false, "TakeHttpConnection of SpdySession3");
-  return nullptr;
-}
-
-uint32_t
-SpdySession3::CancelPipeline(nsresult reason)
-{
-  // we don't pipeline inside spdy, so this isn't an issue
-  return 0;
-}
-
-nsAHttpTransaction::Classifier
-SpdySession3::Classification()
-{
-  if (!mConnection)
-    return nsAHttpTransaction::CLASS_GENERAL;
-  return mConnection->Classification();
-}
-
-void
-SpdySession3::GetSecurityCallbacks(nsIInterfaceRequestor **aOut)
-{
-  *aOut = nullptr;
-}
-
-//-----------------------------------------------------------------------------
-// unused methods of nsAHttpTransaction
-// We can be sure of this because SpdySession3 is only constructed in
-// nsHttpConnection and is never passed out of that object or a TLSFilterTransaction
-// TLS tunnel
-//-----------------------------------------------------------------------------
-
-void
-SpdySession3::SetConnection(nsAHttpConnection *)
-{
-  // This is unexpected
-  MOZ_ASSERT(false, "SpdySession3::SetConnection()");
-}
-
-void
-SpdySession3::SetProxyConnectFailed()
-{
-  MOZ_ASSERT(false, "SpdySession3::SetProxyConnectFailed()");
-}
-
-bool
-SpdySession3::IsDone()
-{
-  return !mStreamTransactionHash.Count();
-}
-
-nsresult
-SpdySession3::Status()
-{
-  MOZ_ASSERT(false, "SpdySession3::Status()");
-  return NS_ERROR_UNEXPECTED;
-}
-
-uint32_t
-SpdySession3::Caps()
-{
-  MOZ_ASSERT(false, "SpdySession3::Caps()");
-  return 0;
-}
-
-void
-SpdySession3::SetDNSWasRefreshed()
-{
-}
-
-uint64_t
-SpdySession3::Available()
-{
-  MOZ_ASSERT(false, "SpdySession3::Available()");
-  return 0;
-}
-
-nsHttpRequestHead *
-SpdySession3::RequestHead()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(false,
-             "SpdySession3::RequestHead() "
-             "should not be called after SPDY is setup");
-  return nullptr;
-}
-
-uint32_t
-SpdySession3::Http1xTransactionCount()
-{
-  return 0;
-}
-
-// used as an enumerator by TakeSubTransactions()
-static PLDHashOperator
-TakeStream(nsAHttpTransaction *key,
-           nsAutoPtr<SpdyStream3> &stream,
-           void *closure)
-{
-  nsTArray<nsRefPtr<nsAHttpTransaction> > *list =
-    static_cast<nsTArray<nsRefPtr<nsAHttpTransaction> > *>(closure);
-
-  list->AppendElement(key);
-
-  // removing the stream from the hash will delete the stream
-  // and drop the transaction reference the hash held
-  return PL_DHASH_REMOVE;
-}
-
-nsresult
-SpdySession3::TakeSubTransactions(
-    nsTArray<nsRefPtr<nsAHttpTransaction> > &outTransactions)
-{
-  // Generally this cannot be done with spdy as transactions are
-  // started right away.
-
-  LOG3(("SpdySession3::TakeSubTransactions %p\n", this));
-
-  if (mConcurrentHighWater > 0)
-    return NS_ERROR_ALREADY_OPENED;
-
-  LOG3(("   taking %d\n", mStreamTransactionHash.Count()));
-
-  mStreamTransactionHash.Enumerate(TakeStream, &outTransactions);
-  return NS_OK;
-}
-
-nsresult
-SpdySession3::AddTransaction(nsAHttpTransaction *)
-{
-  // This API is meant for pipelining, SpdySession3's should be
-  // extended with AddStream()
-
-  MOZ_ASSERT(false,
-             "SpdySession3::AddTransaction() should not be called");
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-uint32_t
-SpdySession3::PipelineDepth()
-{
-  return IsDone() ? 0 : 1;
-}
-
-nsresult
-SpdySession3::SetPipelinePosition(int32_t position)
-{
-  // This API is meant for pipelining, SpdySession3's should be
-  // extended with AddStream()
-
-  MOZ_ASSERT(false,
-             "SpdySession3::SetPipelinePosition() should not be called");
-
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-int32_t
-SpdySession3::PipelinePosition()
-{
-    return 0;
-}
-
-//-----------------------------------------------------------------------------
-// Pass through methods of nsAHttpConnection
-//-----------------------------------------------------------------------------
-
-nsAHttpConnection *
-SpdySession3::Connection()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  return mConnection;
-}
-
-nsresult
-SpdySession3::OnHeadersAvailable(nsAHttpTransaction *transaction,
-                                 nsHttpRequestHead *requestHead,
-                                 nsHttpResponseHead *responseHead,
-                                 bool *reset)
-{
-  return mConnection->OnHeadersAvailable(transaction,
-                                         requestHead,
-                                         responseHead,
-                                         reset);
-}
-
-bool
-SpdySession3::IsReused()
-{
-  return mConnection->IsReused();
-}
-
-nsresult
-SpdySession3::PushBack(const char *buf, uint32_t len)
-{
-  return mConnection->PushBack(buf, len);
-}
-
-void
-SpdySession3::SendPing()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  if (mPreviousUsed) {
-    // alredy in progress, get out
-    return;
-  }
-
-  mPingSentEpoch = PR_IntervalNow();
-  if (!mPingSentEpoch) {
-    mPingSentEpoch = 1; // avoid the 0 sentinel value
-  }
-  if (!mPingThreshold ||
-      (mPingThreshold > gHttpHandler->NetworkChangedTimeout())) {
-    mPreviousPingThreshold = mPingThreshold;
-    mPreviousUsed = true;
-    mPingThreshold = gHttpHandler->NetworkChangedTimeout();
-  }
-
-  GeneratePing(mNextPingID);
-  mNextPingID += 2;
-  ResumeRecv();
-
-  gHttpHandler->ConnMgr()->ActivateTimeoutTick();
-}
-
-
-} // namespace mozilla::net
-} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdySession3.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdySession3.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdySession3.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdySession3.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,406 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_net_SpdySession3_h
-#define mozilla_net_SpdySession3_h
-
-// SPDY as defined by
-// http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3
-
-#include "ASpdySession.h"
-#include "mozilla/Attributes.h"
-#include "nsAHttpConnection.h"
-#include "nsClassHashtable.h"
-#include "nsDataHashtable.h"
-#include "nsDeque.h"
-#include "nsHashKeys.h"
-#include "zlib.h"
-
-class nsISocketTransport;
-
-namespace mozilla { namespace net {
-
-class SpdyPushedStream3;
-class SpdyStream3;
-class nsHttpTransaction;
-
-class SpdySession3 MOZ_FINAL : public ASpdySession
-                             , public nsAHttpConnection
-                             , public nsAHttpSegmentReader
-                             , public nsAHttpSegmentWriter
-{
-  ~SpdySession3();
-
-public:
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSAHTTPTRANSACTION
-  NS_DECL_NSAHTTPCONNECTION(mConnection)
-  NS_DECL_NSAHTTPSEGMENTREADER
-  NS_DECL_NSAHTTPSEGMENTWRITER
-
-  explicit SpdySession3(nsISocketTransport *);
-
-  bool AddStream(nsAHttpTransaction *, int32_t,
-                 bool, nsIInterfaceRequestor *);
-  bool CanReuse() { return !mShouldGoAway && !mClosed; }
-  bool RoomForMoreStreams();
-
-  // When the connection is active this is called up to once every 1 second
-  // return the interval (in seconds) that the connection next wants to
-  // have this invoked. It might happen sooner depending on the needs of
-  // other connections.
-  uint32_t  ReadTimeoutTick(PRIntervalTime now);
-
-  // Idle time represents time since "goodput".. e.g. a data or header frame
-  PRIntervalTime IdleTime();
-
-  // Registering with a newID of 0 means pick the next available odd ID
-  uint32_t RegisterStreamID(SpdyStream3 *, uint32_t aNewID = 0);
-
-  const static uint8_t kVersion        = 3;
-
-  const static uint8_t kFlag_Control   = 0x80;
-
-  const static uint8_t kFlag_Data_FIN  = 0x01;
-  const static uint8_t kFlag_Data_UNI  = 0x02;
-
-  enum
-  {
-    CONTROL_TYPE_FIRST = 0,
-    CONTROL_TYPE_SYN_STREAM = 1,
-    CONTROL_TYPE_SYN_REPLY = 2,
-    CONTROL_TYPE_RST_STREAM = 3,
-    CONTROL_TYPE_SETTINGS = 4,
-    CONTROL_TYPE_NOOP = 5,                        /* deprecated */
-    CONTROL_TYPE_PING = 6,
-    CONTROL_TYPE_GOAWAY = 7,
-    CONTROL_TYPE_HEADERS = 8,
-    CONTROL_TYPE_WINDOW_UPDATE = 9,
-    CONTROL_TYPE_CREDENTIAL = 10,
-    CONTROL_TYPE_LAST = 11
-  };
-
-  enum rstReason
-  {
-    RST_PROTOCOL_ERROR = 1,
-    RST_INVALID_STREAM = 2,
-    RST_REFUSED_STREAM = 3,
-    RST_UNSUPPORTED_VERSION = 4,
-    RST_CANCEL = 5,
-    RST_INTERNAL_ERROR = 6,
-    RST_FLOW_CONTROL_ERROR = 7,
-    RST_STREAM_IN_USE = 8,
-    RST_STREAM_ALREADY_CLOSED = 9,
-    RST_INVALID_CREDENTIALS = 10,
-    RST_FRAME_TOO_LARGE = 11
-  };
-
-  enum goawayReason
-  {
-    OK = 0,
-    PROTOCOL_ERROR = 1,
-    INTERNAL_ERROR = 2,    // sometimes misdocumented as 11
-    NUM_STATUS_CODES = 3   // reserved by chromium but undocumented
-  };
-
-  enum settingsFlags
-  {
-    PERSIST_VALUE = 1,
-    PERSISTED_VALUE = 2
-  };
-
-  enum
-  {
-    SETTINGS_TYPE_UPLOAD_BW = 1, // kb/s
-    SETTINGS_TYPE_DOWNLOAD_BW = 2, // kb/s
-    SETTINGS_TYPE_RTT = 3, // ms
-    SETTINGS_TYPE_MAX_CONCURRENT = 4, // streams
-    SETTINGS_TYPE_CWND = 5, // packets
-    SETTINGS_TYPE_DOWNLOAD_RETRANS_RATE = 6, // percentage
-    SETTINGS_TYPE_INITIAL_WINDOW = 7,  // bytes for flow control
-    SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8
-  };
-
-  // This should be big enough to hold all of your control packets,
-  // but if it needs to grow for huge headers it can do so dynamically.
-  // About 1% of responses from SPDY google services seem to be > 1000
-  // with all less than 2000 when compression is enabled.
-  const static uint32_t kDefaultBufferSize = 2048;
-
-  // kDefaultQueueSize must be >= other queue size constants
-  const static uint32_t kDefaultQueueSize =  32768;
-  const static uint32_t kQueueMinimumCleanup = 24576;
-  const static uint32_t kQueueTailRoom    =  4096;
-  const static uint32_t kQueueReserved    =  1024;
-
-  const static uint32_t kDefaultMaxConcurrent = 100;
-  const static uint32_t kMaxStreamID = 0x7800000;
-
-  // This is a sentinel for a deleted stream. It is not a valid
-  // 31 bit stream ID.
-  const static uint32_t kDeadStreamID = 0xffffdead;
-
-  // below the emergency threshold of local window we ack every received
-  // byte. Above that we coalesce bytes into the MinimumToAck size.
-  const static int32_t  kEmergencyWindowThreshold = 1024 * 1024;
-  const static uint32_t kMinimumToAck = 64 * 1024;
-
-  // The default peer rwin is 64KB unless updated by a settings frame
-  const static uint32_t kDefaultServerRwin = 64 * 1024;
-
-  static nsresult HandleSynStream(SpdySession3 *);
-  static nsresult HandleSynReply(SpdySession3 *);
-  static nsresult HandleRstStream(SpdySession3 *);
-  static nsresult HandleSettings(SpdySession3 *);
-  static nsresult HandleNoop(SpdySession3 *);
-  static nsresult HandlePing(SpdySession3 *);
-  static nsresult HandleGoAway(SpdySession3 *);
-  static nsresult HandleHeaders(SpdySession3 *);
-  static nsresult HandleWindowUpdate(SpdySession3 *);
-  static nsresult HandleCredential(SpdySession3 *);
-
-  // For writing the SPDY data stream to LOG4
-  static void LogIO(SpdySession3 *, SpdyStream3 *, const char *,
-                    const char *, uint32_t);
-
-  // an overload of nsAHttpConnection
-  void TransactionHasDataToWrite(nsAHttpTransaction *);
-
-  // a similar version for SpdyStream3
-  void TransactionHasDataToWrite(SpdyStream3 *);
-
-  // an overload of nsAHttpSegementReader
-  virtual nsresult CommitToSegmentSize(uint32_t size, bool forceCommitment);
-
-  uint32_t GetServerInitialWindow() { return mServerInitialWindow; }
-
-  void ConnectPushedStream(SpdyStream3 *stream);
-  void DecrementConcurrent(SpdyStream3 *stream);
-
-  uint64_t Serial() { return mSerial; }
-
-  void     PrintDiagnostics (nsCString &log);
-
-  // Streams need access to these
-  uint32_t SendingChunkSize() { return mSendingChunkSize; }
-  uint32_t PushAllowance() { return mPushAllowance; }
-  z_stream *UpstreamZlib() { return &mUpstreamZlib; }
-  nsISocketTransport *SocketTransport() { return mSocketTransport; }
-
-  void SendPing() MOZ_OVERRIDE;
-
-private:
-
-  enum stateType {
-    BUFFERING_FRAME_HEADER,
-    BUFFERING_CONTROL_FRAME,
-    PROCESSING_DATA_FRAME,
-    DISCARDING_DATA_FRAME,
-    PROCESSING_COMPLETE_HEADERS,
-    PROCESSING_CONTROL_RST_STREAM
-  };
-
-  nsresult    ResponseHeadersComplete();
-  uint32_t    GetWriteQueueSize();
-  void        ChangeDownstreamState(enum stateType);
-  void        ResetDownstreamState();
-  nsresult    UncompressAndDiscard(uint32_t, uint32_t);
-  void        zlibInit();
-  void        GeneratePing(uint32_t);
-  void        GenerateRstStream(uint32_t, uint32_t);
-  void        GenerateGoAway(uint32_t);
-  void        CleanupStream(SpdyStream3 *, nsresult, rstReason);
-  void        CloseStream(SpdyStream3 *, nsresult);
-  void        GenerateSettings();
-  void        RemoveStreamFromQueues(SpdyStream3 *);
-
-  void        SetWriteCallbacks();
-  void        FlushOutputQueue();
-  void        RealignOutputQueue();
-
-  bool        RoomForMoreConcurrent();
-  void        ActivateStream(SpdyStream3 *);
-  void        ProcessPending();
-  nsresult    SetInputFrameDataStream(uint32_t);
-  bool        VerifyStream(SpdyStream3 *, uint32_t);
-  void        SetNeedsCleanup();
-
-  void        UpdateLocalRwin(SpdyStream3 *stream, uint32_t bytes);
-
-  // a wrapper for all calls to the nshttpconnection level segment writer. Used
-  // to track network I/O for timeout purposes
-  nsresult   NetworkRead(nsAHttpSegmentWriter *, char *, uint32_t, uint32_t *);
-
-  static PLDHashOperator ShutdownEnumerator(nsAHttpTransaction *,
-                                            nsAutoPtr<SpdyStream3> &,
-                                            void *);
-
-  static PLDHashOperator GoAwayEnumerator(nsAHttpTransaction *,
-                                          nsAutoPtr<SpdyStream3> &,
-                                          void *);
-
-  static PLDHashOperator UpdateServerRwinEnumerator(nsAHttpTransaction *,
-                                                    nsAutoPtr<SpdyStream3> &,
-                                                    void *);
-
-  // This is intended to be nsHttpConnectionMgr:nsConnectionHandle taken
-  // from the first transaction on this session. That object contains the
-  // pointer to the real network-level nsHttpConnection object.
-  nsRefPtr<nsAHttpConnection> mConnection;
-
-  // The underlying socket transport object is needed to propogate some events
-  nsISocketTransport         *mSocketTransport;
-
-  // These are temporary state variables to hold the argument to
-  // Read/WriteSegments so it can be accessed by On(read/write)segment
-  // further up the stack.
-  nsAHttpSegmentReader       *mSegmentReader;
-  nsAHttpSegmentWriter       *mSegmentWriter;
-
-  uint32_t          mSendingChunkSize;        /* the transmission chunk size */
-  uint32_t          mNextStreamID;            /* 24 bits */
-  uint32_t          mConcurrentHighWater;     /* max parallelism on session */
-  uint32_t          mPushAllowance;           /* rwin for unmatched pushes */
-
-  stateType         mDownstreamState; /* in frame, between frames, etc..  */
-
-  // Maintain 2 indexes - one by stream ID, one by transaction pointer.
-  // There are also several lists of streams: ready to write, queued due to
-  // max parallelism, streams that need to force a read for push, and the full
-  // set of pushed streams.
-  // The objects are not ref counted - they get destroyed
-  // by the nsClassHashtable implementation when they are removed from
-  // the transaction hash.
-  nsDataHashtable<nsUint32HashKey, SpdyStream3 *>     mStreamIDHash;
-  nsClassHashtable<nsPtrHashKey<nsAHttpTransaction>,
-                   SpdyStream3>                       mStreamTransactionHash;
-
-  nsDeque                                             mReadyForWrite;
-  nsDeque                                             mQueuedStreams;
-  nsDeque                                             mReadyForRead;
-  nsTArray<SpdyPushedStream3 *>                       mPushedStreams;
-
-  // Compression contexts for header transport using deflate.
-  // SPDY compresses only HTTP headers and does not reset zlib in between
-  // frames. Even data that is not associated with a stream (e.g invalid
-  // stream ID) is passed through these contexts to keep the compression
-  // context correct.
-  z_stream            mDownstreamZlib;
-  z_stream            mUpstreamZlib;
-
-  // mInputFrameBuffer is used to store received control packets and the 8 bytes
-  // of header on data packets
-  uint32_t             mInputFrameBufferSize;
-  uint32_t             mInputFrameBufferUsed;
-  nsAutoArrayPtr<char> mInputFrameBuffer;
-
-  // mInputFrameDataSize/Read are used for tracking the amount of data consumed
-  // in a data frame. the data itself is not buffered in spdy
-  // The frame size is mInputFrameDataSize + the constant 8 byte header
-  uint32_t             mInputFrameDataSize;
-  uint32_t             mInputFrameDataRead;
-  bool                 mInputFrameDataLast; // This frame was marked FIN
-
-  // When a frame has been received that is addressed to a particular stream
-  // (e.g. a data frame after the stream-id has been decoded), this points
-  // to the stream.
-  SpdyStream3          *mInputFrameDataStream;
-
-  // mNeedsCleanup is a state variable to defer cleanup of a closed stream
-  // If needed, It is set in session::OnWriteSegments() and acted on and
-  // cleared when the stack returns to session::WriteSegments(). The stream
-  // cannot be destroyed directly out of OnWriteSegments because
-  // stream::writeSegments() is on the stack at that time.
-  SpdyStream3          *mNeedsCleanup;
-
-  // The CONTROL_TYPE value for a control frame
-  uint32_t             mFrameControlType;
-
-  // This reason code in the last processed RESET frame
-  uint32_t             mDownstreamRstReason;
-
-  // for the conversion of downstream http headers into spdy formatted headers
-  // The data here does not persist between frames
-  nsCString            mFlatHTTPResponseHeaders;
-  uint32_t             mFlatHTTPResponseHeadersOut;
-
-  // when set, the session will go away when it reaches 0 streams. This flag
-  // is set when: the stream IDs are running out (at either the client or the
-  // server), when DontReuse() is called, a RST that is not specific to a
-  // particular stream is received, a GOAWAY frame has been received from
-  // the server.
-  bool                 mShouldGoAway;
-
-  // the session has received a nsAHttpTransaction::Close()  call
-  bool                 mClosed;
-
-  // the session received a GoAway frame with a valid GoAwayID
-  bool                 mCleanShutdown;
-
-  // indicates PROCESSING_COMPLETE_HEADERS state was pushed onto the stack
-  // over an active PROCESSING_DATA_FRAME, which should be restored when
-  // the processed headers are written to the stream
-  bool                 mDataPending;
-
-  // If a GoAway message was received this is the ID of the last valid
-  // stream. 0 otherwise. (0 is never a valid stream id.)
-  uint32_t             mGoAwayID;
-
-  // The limit on number of concurrent streams for this session. Normally it
-  // is basically unlimited, but the SETTINGS control message from the
-  // server might bring it down.
-  uint32_t             mMaxConcurrent;
-
-  // The actual number of concurrent streams at this moment. Generally below
-  // mMaxConcurrent, but the max can be lowered in real time to a value
-  // below the current value
-  uint32_t             mConcurrent;
-
-  // The number of server initiated SYN-STREAMS, tracked for telemetry
-  uint32_t             mServerPushedResources;
-
-  // The server rwin for new streams as determined from a SETTINGS frame
-  uint32_t             mServerInitialWindow;
-
-  // This is a output queue of bytes ready to be written to the SSL stream.
-  // When that streams returns WOULD_BLOCK on direct write the bytes get
-  // coalesced together here. This results in larger writes to the SSL layer.
-  // The buffer is not dynamically grown to accomodate stream writes, but
-  // does expand to accept infallible session wide frames like GoAway and RST.
-  uint32_t             mOutputQueueSize;
-  uint32_t             mOutputQueueUsed;
-  uint32_t             mOutputQueueSent;
-  nsAutoArrayPtr<char> mOutputQueueBuffer;
-
-  PRIntervalTime       mPingThreshold;
-  PRIntervalTime       mLastReadEpoch;     // used for ping timeouts
-  PRIntervalTime       mLastDataReadEpoch; // used for IdleTime()
-  PRIntervalTime       mPingSentEpoch;
-  uint32_t             mNextPingID;
-
-  PRIntervalTime       mPreviousPingThreshold; // backup for the former value
-  bool                 mPreviousUsed;          // true when backup is used
-
-  // used as a temporary buffer while enumerating the stream hash during GoAway
-  nsDeque  mGoAwayStreamsToRestart;
-
-  // Each session gets a unique serial number because the push cache is correlated
-  // by the load group and the serial number can be used as part of the cache key
-  // to make sure streams aren't shared across sessions.
-  uint64_t        mSerial;
-
-private:
-/// connect tunnels
-  void DispatchOnTunnel(nsAHttpTransaction *, nsIInterfaceRequestor *);
-  void RegisterTunnel(SpdyStream3 *);
-  void UnRegisterTunnel(SpdyStream3 *);
-  uint32_t FindTunnelCount(nsHttpConnectionInfo *);
-
-  nsDataHashtable<nsCStringHashKey, uint32_t> mTunnelHash;
-};
-
-}} // namespace mozilla::net
-
-#endif // mozilla_net_SpdySession3_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyStream3.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyStream3.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyStream3.cpp	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyStream3.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1586 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 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/. */
-
-// HttpLog.h should generally be included first
-#include "HttpLog.h"
-
-// Log on level :5, instead of default :4.
-#undef LOG
-#define LOG(args) LOG5(args)
-#undef LOG_ENABLED
-#define LOG_ENABLED() LOG5_ENABLED()
-
-#include "mozilla/Endian.h"
-#include "mozilla/Telemetry.h"
-#include "nsHttp.h"
-#include "nsHttpHandler.h"
-#include "nsHttpRequestHead.h"
-#include "nsISocketTransport.h"
-#include "nsISupportsPriority.h"
-#include "prnetdb.h"
-#include "SpdyPush3.h"
-#include "SpdySession3.h"
-#include "SpdyStream3.h"
-#include "PSpdyPush.h"
-#include "SpdyZlibReporter.h"
-#include "TunnelUtils.h"
-
-#include <algorithm>
-
-#ifdef DEBUG
-// defined by the socket transport service while active
-extern PRThread *gSocketThread;
-#endif
-
-namespace mozilla {
-namespace net {
-
-SpdyStream3::SpdyStream3(nsAHttpTransaction *httpTransaction,
-                         SpdySession3 *spdySession,
-                         int32_t priority)
-  : mStreamID(0)
-  , mSession(spdySession)
-  , mUpstreamState(GENERATING_SYN_STREAM)
-  , mSynFrameComplete(0)
-  , mSentFinOnData(0)
-  , mTransaction(httpTransaction)
-  , mSocketTransport(spdySession->SocketTransport())
-  , mSegmentReader(nullptr)
-  , mSegmentWriter(nullptr)
-  , mChunkSize(spdySession->SendingChunkSize())
-  , mRequestBlockedOnRead(0)
-  , mRecvdFin(0)
-  , mFullyOpen(0)
-  , mSentWaitingFor(0)
-  , mReceivedData(0)
-  , mSetTCPSocketBuffer(0)
-  , mTxInlineFrameSize(SpdySession3::kDefaultBufferSize)
-  , mTxInlineFrameUsed(0)
-  , mTxStreamFrameSize(0)
-  , mZlib(spdySession->UpstreamZlib())
-  , mDecompressBufferSize(SpdySession3::kDefaultBufferSize)
-  , mDecompressBufferUsed(0)
-  , mDecompressedBytes(0)
-  , mRequestBodyLenRemaining(0)
-  , mPriority(priority)
-  , mLocalUnacked(0)
-  , mBlockedOnRwin(false)
-  , mTotalSent(0)
-  , mTotalRead(0)
-  , mPushSource(nullptr)
-  , mIsTunnel(false)
-  , mPlainTextTunnel(false)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  LOG3(("SpdyStream3::SpdyStream3 %p", this));
-
-  mRemoteWindow = spdySession->GetServerInitialWindow();
-  mLocalWindow = spdySession->PushAllowance();
-
-  mTxInlineFrame = new uint8_t[mTxInlineFrameSize];
-  mDecompressBuffer = new char[mDecompressBufferSize];
-}
-
-SpdyStream3::~SpdyStream3()
-{
-  ClearTransactionsBlockedOnTunnel();
-  mStreamID = SpdySession3::kDeadStreamID;
-}
-
-// ReadSegments() is used to write data down the socket. Generally, HTTP
-// request data is pulled from the approriate transaction and
-// converted to SPDY data. Sometimes control data like a window-update is
-// generated instead.
-
-nsresult
-SpdyStream3::ReadSegments(nsAHttpSegmentReader *reader,
-                         uint32_t count,
-                         uint32_t *countRead)
-{
-  LOG3(("SpdyStream3 %p ReadSegments reader=%p count=%d state=%x",
-        this, reader, count, mUpstreamState));
-
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  nsresult rv = NS_ERROR_UNEXPECTED;
-  mRequestBlockedOnRead = 0;
-
-  switch (mUpstreamState) {
-  case GENERATING_SYN_STREAM:
-  case GENERATING_REQUEST_BODY:
-  case SENDING_REQUEST_BODY:
-    // Call into the HTTP Transaction to generate the HTTP request
-    // stream. That stream will show up in OnReadSegment().
-    mSegmentReader = reader;
-    rv = mTransaction->ReadSegments(this, count, countRead);
-    mSegmentReader = nullptr;
-    LOG3(("SpdyStream3::ReadSegments %p trans readsegments rv %x read=%d\n",
-          this, rv, *countRead));
-    // Check to see if the transaction's request could be written out now.
-    // If not, mark the stream for callback when writing can proceed.
-    if (NS_SUCCEEDED(rv) &&
-        mUpstreamState == GENERATING_SYN_STREAM &&
-        !mSynFrameComplete)
-      mSession->TransactionHasDataToWrite(this);
-
-    // mTxinlineFrameUsed represents any queued un-sent frame. It might
-    // be 0 if there is no such frame, which is not a gurantee that we
-    // don't have more request body to send - just that any data that was
-    // sent comprised a complete SPDY frame. Likewise, a non 0 value is
-    // a queued, but complete, spdy frame length.
-
-    // Mark that we are blocked on read if the http transaction needs to
-    // provide more of the request message body and there is nothing queued
-    // for writing
-    if (rv == NS_BASE_STREAM_WOULD_BLOCK && !mTxInlineFrameUsed)
-      mRequestBlockedOnRead = 1;
-
-    // If the sending flow control window is open (!mBlockedOnRwin) then
-    // continue sending the request
-    if (!mBlockedOnRwin &&
-        !mTxInlineFrameUsed && NS_SUCCEEDED(rv) && (!*countRead)) {
-      LOG3(("SpdyStream3::ReadSegments %p 0x%X: Sending request data complete, "
-            "mUpstreamState=%x finondata=%d",this, mStreamID,
-            mUpstreamState, mSentFinOnData));
-      if (mSentFinOnData) {
-        ChangeState(UPSTREAM_COMPLETE);
-      }
-      else {
-        GenerateDataFrameHeader(0, true);
-        ChangeState(SENDING_FIN_STREAM);
-        mSession->TransactionHasDataToWrite(this);
-        rv = NS_BASE_STREAM_WOULD_BLOCK;
-      }
-    }
-    break;
-
-  case SENDING_FIN_STREAM:
-    // We were trying to send the FIN-STREAM but were blocked from
-    // sending it out - try again.
-    if (!mSentFinOnData) {
-      mSegmentReader = reader;
-      rv = TransmitFrame(nullptr, nullptr, false);
-      mSegmentReader = nullptr;
-      MOZ_ASSERT(NS_FAILED(rv) || !mTxInlineFrameUsed,
-                 "Transmit Frame should be all or nothing");
-      if (NS_SUCCEEDED(rv))
-        ChangeState(UPSTREAM_COMPLETE);
-    }
-    else {
-      rv = NS_OK;
-      mTxInlineFrameUsed = 0;         // cancel fin data packet
-      ChangeState(UPSTREAM_COMPLETE);
-    }
-
-    *countRead = 0;
-
-    // don't change OK to WOULD BLOCK. we are really done sending if OK
-    break;
-
-  case UPSTREAM_COMPLETE:
-    *countRead = 0;
-    rv = NS_OK;
-    break;
-
-  default:
-    MOZ_ASSERT(false, "SpdyStream3::ReadSegments unknown state");
-    break;
-  }
-
-  return rv;
-}
-
-// WriteSegments() is used to read data off the socket. Generally this is
-// just a call through to the associated nsHttpTransaction for this stream
-// for the remaining data bytes indicated by the current DATA frame.
-
-nsresult
-SpdyStream3::WriteSegments(nsAHttpSegmentWriter *writer,
-                          uint32_t count,
-                          uint32_t *countWritten)
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(!mSegmentWriter, "segment writer in progress");
-
-  LOG3(("SpdyStream3::WriteSegments %p count=%d state=%x",
-        this, count, mUpstreamState));
-
-  mSegmentWriter = writer;
-  nsresult rv = mTransaction->WriteSegments(this, count, countWritten);
-  mSegmentWriter = nullptr;
-
-  return rv;
-}
-
-PLDHashOperator
-SpdyStream3::hdrHashEnumerate(const nsACString &key,
-                             nsAutoPtr<nsCString> &value,
-                             void *closure)
-{
-  SpdyStream3 *self = static_cast<SpdyStream3 *>(closure);
-
-  self->CompressToFrame(key);
-  self->CompressToFrame(value.get());
-  return PL_DHASH_NEXT;
-}
-
-void
-SpdyStream3::CreatePushHashKey(const nsCString &scheme,
-                               const nsCString &hostHeader,
-                               uint64_t serial,
-                               const nsCSubstring &pathInfo,
-                               nsCString &outOrigin,
-                               nsCString &outKey)
-{
-  outOrigin = scheme;
-  outOrigin.AppendLiteral("://");
-  outOrigin.Append(hostHeader);
-
-  outKey = outOrigin;
-  outKey.AppendLiteral("/[spdy3.");
-  outKey.AppendInt(serial);
-  outKey.Append(']');
-  outKey.Append(pathInfo);
-}
-
-
-nsresult
-SpdyStream3::ParseHttpRequestHeaders(const char *buf,
-                                    uint32_t avail,
-                                    uint32_t *countUsed)
-{
-  // Returns NS_OK even if the headers are incomplete
-  // set mSynFrameComplete flag if they are complete
-
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(mUpstreamState == GENERATING_SYN_STREAM);
-
-  LOG3(("SpdyStream3::ParseHttpRequestHeaders %p avail=%d state=%x",
-        this, avail, mUpstreamState));
-
-  mFlatHttpRequestHeaders.Append(buf, avail);
-
-  // We can use the simple double crlf because firefox is the
-  // only client we are parsing
-  int32_t endHeader = mFlatHttpRequestHeaders.Find("\r\n\r\n");
-
-  if (endHeader == kNotFound) {
-    // We don't have all the headers yet
-    LOG3(("SpdyStream3::ParseHttpRequestHeaders %p "
-          "Need more header bytes. Len = %d",
-          this, mFlatHttpRequestHeaders.Length()));
-    *countUsed = avail;
-    return NS_OK;
-  }
-
-  // We have recvd all the headers, trim the local
-  // buffer of the final empty line, and set countUsed to reflect
-  // the whole header has been consumed.
-  uint32_t oldLen = mFlatHttpRequestHeaders.Length();
-  mFlatHttpRequestHeaders.SetLength(endHeader + 2);
-  *countUsed = avail - (oldLen - endHeader) + 4;
-  mSynFrameComplete = 1;
-
-  nsAutoCString hostHeader;
-  nsAutoCString hashkey;
-  mTransaction->RequestHead()->GetHeader(nsHttp::Host, hostHeader);
-
-  CreatePushHashKey(nsDependentCString(mTransaction->RequestHead()->IsHTTPS() ? "https" : "http"),
-                    hostHeader, mSession->Serial(),
-                    mTransaction->RequestHead()->RequestURI(),
-                    mOrigin, hashkey);
-
-  // check the push cache for GET
-  if (mTransaction->RequestHead()->IsGet()) {
-    // from :scheme, :host, :path
-    nsILoadGroupConnectionInfo *loadGroupCI = mTransaction->LoadGroupConnectionInfo();
-    SpdyPushCache *cache = nullptr;
-    if (loadGroupCI)
-      loadGroupCI->GetSpdyPushCache(&cache);
-
-    SpdyPushedStream3 *pushedStream = nullptr;
-    // we remove the pushedstream from the push cache so that
-    // it will not be used for another GET. This does not destroy the
-    // stream itself - that is done when the transactionhash is done with it.
-    if (cache)
-      pushedStream = cache->RemovePushedStreamSpdy3(hashkey);
-
-    if (pushedStream) {
-      LOG3(("Pushed Stream Match located id=0x%X key=%s\n",
-            pushedStream->StreamID(), hashkey.get()));
-      pushedStream->SetConsumerStream(this);
-      mPushSource = pushedStream;
-      mSentFinOnData = 1;
-
-      // This stream has been activated (and thus counts against the concurrency
-      // limit intentionally), but will not be registered via
-      // RegisterStreamID (below) because of the push match. Therefore the
-      // concurrency sempahore needs to be balanced.
-      mSession->DecrementConcurrent(this);
-
-      // There is probably pushed data buffered so trigger a read manually
-      // as we can't rely on future network events to do it
-      mSession->ConnectPushedStream(this);
-      return NS_OK;
-    }
-  }
-
-  // It is now OK to assign a streamID that we are assured will
-  // be monotonically increasing amongst syn-streams on this
-  // session
-  mStreamID = mSession->RegisterStreamID(this);
-  MOZ_ASSERT(mStreamID & 1, "Spdy Stream Channel ID must be odd");
-
-  if (mStreamID >= 0x80000000) {
-    // streamID must fit in 31 bits. This is theoretically possible
-    // because stream ID assignment is asynchronous to stream creation
-    // because of the protocol requirement that the ID in syn-stream
-    // be monotonically increasing. In reality this is really not possible
-    // because new streams stop being added to a session with 0x10000000 / 2
-    // IDs still available and no race condition is going to bridge that gap,
-    // so we can be comfortable on just erroring out for correctness in that
-    // case.
-    LOG3(("Stream assigned out of range ID: 0x%X", mStreamID));
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  // Now we need to convert the flat http headers into a set
-  // of SPDY headers..  writing to mTxInlineFrame{sz}
-
-  mTxInlineFrame[0] = SpdySession3::kFlag_Control;
-  mTxInlineFrame[1] = SpdySession3::kVersion;
-  mTxInlineFrame[2] = 0;
-  mTxInlineFrame[3] = SpdySession3::CONTROL_TYPE_SYN_STREAM;
-  // 4 to 7 are length and flags, we'll fill that in later
-
-  NetworkEndian::writeUint32(mTxInlineFrame + 8, mStreamID);
-
-  // this is the associated-to field, which is not used sending
-  // from the client in the http binding
-  memset(mTxInlineFrame + 12, 0, 4);
-
-  // Priority flags are the E0 mask of byte 16.
-  // 0 is highest priority, 7 is lowest.
-  // The other 5 bits of byte 16 are unused.
-
-  if (mPriority >= nsISupportsPriority::PRIORITY_LOWEST)
-    mTxInlineFrame[16] = 7 << 5;
-  else if (mPriority <= nsISupportsPriority::PRIORITY_HIGHEST)
-    mTxInlineFrame[16] = 0 << 5;
-  else {
-    // The priority mapping relies on the unfiltered ranged to be
-    // between -20 .. +20
-    PR_STATIC_ASSERT(nsISupportsPriority::PRIORITY_LOWEST == 20);
-    PR_STATIC_ASSERT(nsISupportsPriority::PRIORITY_HIGHEST == -20);
-
-    // Add one to the priority so that values such as -10 and -11
-    // get different spdy priorities - this appears to be an important
-    // breaking line in the priorities content assigns to
-    // transactions.
-    uint8_t calculatedPriority = 3 + ((mPriority + 1) / 5);
-    MOZ_ASSERT (!(calculatedPriority & 0xf8),
-                "Calculated Priority Out Of Range");
-    mTxInlineFrame[16] = calculatedPriority << 5;
-  }
-
-  // The client cert "slot". Right now we don't send client certs
-  mTxInlineFrame[17] = 0;
-
-  nsCString versionHeader;
-  if (mTransaction->RequestHead()->Version() == NS_HTTP_VERSION_1_1)
-    versionHeader = NS_LITERAL_CSTRING("HTTP/1.1");
-  else
-    versionHeader = NS_LITERAL_CSTRING("HTTP/1.0");
-
-  // use mRequestHead() to get a sense of how big to make the hash,
-  // even though we are parsing the actual text stream because
-  // it is legit to append headers.
-  nsClassHashtable<nsCStringHashKey, nsCString>
-    hdrHash(mTransaction->RequestHead()->Headers().Count());
-
-  const char *beginBuffer = mFlatHttpRequestHeaders.BeginReading();
-
-  // need to hash all the headers together to remove duplicates, special
-  // headers, etc..
-
-  int32_t crlfIndex = mFlatHttpRequestHeaders.Find("\r\n");
-  while (true) {
-    int32_t startIndex = crlfIndex + 2;
-
-    crlfIndex = mFlatHttpRequestHeaders.Find("\r\n", false, startIndex);
-    if (crlfIndex == -1)
-      break;
-
-    int32_t colonIndex = mFlatHttpRequestHeaders.Find(":", false, startIndex,
-                                                      crlfIndex - startIndex);
-    if (colonIndex == -1)
-      break;
-
-    nsDependentCSubstring name = Substring(beginBuffer + startIndex,
-                                           beginBuffer + colonIndex);
-    // all header names are lower case in spdy
-    ToLowerCase(name);
-
-    // exclusions.. mostly from 3.2.1
-    if (name.EqualsLiteral("connection") ||
-        name.EqualsLiteral("keep-alive") ||
-        name.EqualsLiteral("host") ||
-        name.EqualsLiteral("accept-encoding") ||
-        name.EqualsLiteral("te") ||
-        name.EqualsLiteral("transfer-encoding"))
-      continue;
-
-    nsCString *val = hdrHash.Get(name);
-    if (!val) {
-      val = new nsCString();
-      hdrHash.Put(name, val);
-    }
-
-    int32_t valueIndex = colonIndex + 1;
-    while (valueIndex < crlfIndex && beginBuffer[valueIndex] == ' ')
-      ++valueIndex;
-
-    nsDependentCSubstring v = Substring(beginBuffer + valueIndex,
-                                        beginBuffer + crlfIndex);
-    if (!val->IsEmpty())
-      val->Append(static_cast<char>(0));
-    val->Append(v);
-
-    if (name.EqualsLiteral("content-length")) {
-      int64_t len;
-      if (nsHttp::ParseInt64(val->get(), nullptr, &len))
-        mRequestBodyLenRemaining = len;
-    }
-  }
-
-  mTxInlineFrameUsed = 18;
-
-  // Do not naively log the request headers here beacuse they might
-  // contain auth. The http transaction already logs the sanitized request
-  // headers at this same level so it is not necessary to do so here.
-
-  const char *methodHeader = mTransaction->RequestHead()->Method().get();
-  LOG3(("Stream method %p 0x%X %s\n", this, mStreamID, methodHeader));
-
-  // The header block length
-  uint16_t count = hdrHash.Count() + 4; /* :method, :path, :version, :host */
-  if (mTransaction->RequestHead()->IsConnect()) {
-    mRequestBodyLenRemaining = 0x0fffffffffffffffULL;
-  } else {
-    ++count; // :scheme used if not connect
-  }
-  CompressToFrame(count);
-
-  // :method, :path, :version comprise a HTTP/1 request line, so send those first
-  // to make life easy for any gateways
-  CompressToFrame(NS_LITERAL_CSTRING(":method"));
-  CompressToFrame(methodHeader, strlen(methodHeader));
-
-  CompressToFrame(NS_LITERAL_CSTRING(":path"));
-  if (!mTransaction->RequestHead()->IsConnect()) {
-    CompressToFrame(mTransaction->RequestHead()->RequestURI());
-  } else {
-    MOZ_ASSERT(mTransaction->QuerySpdyConnectTransaction());
-    mIsTunnel = true;
-    // Connect places host:port in :path. Don't use default port.
-    nsHttpConnectionInfo *ci = mTransaction->ConnectionInfo();
-    if (!ci) {
-      return NS_ERROR_UNEXPECTED;
-    }
-    nsAutoCString route;
-    route = ci->GetHost();
-    route.Append(':');
-    route.AppendInt(ci->Port());
-    CompressToFrame(route);
-  }
-
-  CompressToFrame(NS_LITERAL_CSTRING(":version"));
-  CompressToFrame(versionHeader);
-
-  CompressToFrame(NS_LITERAL_CSTRING(":host"));
-  CompressToFrame(hostHeader);
-
-  if (!mTransaction->RequestHead()->IsConnect()) {
-    // no :scheme with connect
-    CompressToFrame(NS_LITERAL_CSTRING(":scheme"));
-    CompressToFrame(nsDependentCString(mTransaction->RequestHead()->IsHTTPS() ? "https" : "http"));
-  }
-
-  hdrHash.Enumerate(hdrHashEnumerate, this);
-  CompressFlushFrame();
-
-  // 4 to 7 are length and flags, which we can now fill in
-  NetworkEndian::writeUint32(mTxInlineFrame + 1 * sizeof(uint32_t),
-                             mTxInlineFrameUsed - 8);
-
-  MOZ_ASSERT(!mTxInlineFrame[4], "Size greater than 24 bits");
-
-  // Determine whether to put the fin bit on the syn stream frame or whether
-  // to wait for a data packet to put it on.
-
-  if (mTransaction->RequestHead()->IsGet() ||
-      mTransaction->RequestHead()->IsHead()) {
-    // for GET and HEAD place the fin bit right on the
-    // syn stream packet
-
-    mSentFinOnData = 1;
-    mTxInlineFrame[4] = SpdySession3::kFlag_Data_FIN;
-  }
-  else if (mTransaction->RequestHead()->IsPost() ||
-           mTransaction->RequestHead()->IsPut() ||
-           mTransaction->RequestHead()->IsConnect() ||
-           mTransaction->RequestHead()->IsOptions()) {
-    // place fin in a data frame even for 0 length messages, I've seen
-    // the google gateway be unhappy with fin-on-syn for 0 length POST
-  }
-  else if (!mRequestBodyLenRemaining) {
-    // for other HTTP extension methods, rely on the content-length
-    // to determine whether or not to put fin on syn
-    mSentFinOnData = 1;
-    mTxInlineFrame[4] = SpdySession3::kFlag_Data_FIN;
-  }
-
-  Telemetry::Accumulate(Telemetry::SPDY_SYN_SIZE, mTxInlineFrameUsed - 18);
-
-  // The size of the input headers is approximate
-  uint32_t ratio =
-    (mTxInlineFrameUsed - 18) * 100 /
-    (11 + mTransaction->RequestHead()->RequestURI().Length() +
-     mFlatHttpRequestHeaders.Length());
-
-  Telemetry::Accumulate(Telemetry::SPDY_SYN_RATIO, ratio);
-  return NS_OK;
-}
-
-void
-SpdyStream3::AdjustInitialWindow()
-{
-  MOZ_ASSERT(mSession->PushAllowance() <= ASpdySession::kInitialRwin);
-
-  // The session initial_window is sized for serverpushed streams. When we
-  // generate a client pulled stream we want to adjust the initial window
-  // to a huge value in a pipeline with that SYN_STREAM.
-
-  // >0 even numbered IDs are pushed streams.
-  // odd numbered IDs are pulled streams.
-  // 0 is the sink for a pushed stream.
-  SpdyStream3 *stream = this;
-  if (!mStreamID) {
-    MOZ_ASSERT(mPushSource);
-    if (!mPushSource)
-      return;
-    stream = mPushSource;
-    MOZ_ASSERT(stream->mStreamID);
-    MOZ_ASSERT(!(stream->mStreamID & 1)); // is a push stream
-
-    // If the pushed stream has sent a FIN, there is no reason to update
-    // the window
-    if (stream->RecvdFin())
-      return;
-  }
-
-  // For server pushes we also want to include in the ack any data that has been
-  // buffered but unacknowledged.
-
-  // mLocalUnacked is technically 64 bits, but because it can never grow larger than
-  // our window size (which is closer to 29bits max) we know it fits comfortably in 32.
-  // However we don't really enforce that, and track it as a 64 so that broken senders
-  // can still interoperate. That means we have to be careful with this calculation.
-  uint64_t toack64 = (ASpdySession::kInitialRwin - mSession->PushAllowance()) +
-    stream->mLocalUnacked;
-  stream->mLocalUnacked = 0;
-  if (toack64 > 0x7fffffff) {
-    stream->mLocalUnacked = toack64 - 0x7fffffff;
-    toack64 = 0x7fffffff;
-  }
-  uint32_t toack = static_cast<uint32_t>(toack64);
-  if (!toack)
-    return;
-  toack = PR_htonl(toack);
-
-  EnsureBuffer(mTxInlineFrame, mTxInlineFrameUsed + 16,
-               mTxInlineFrameUsed, mTxInlineFrameSize);
-
-  unsigned char *packet = mTxInlineFrame.get() + mTxInlineFrameUsed;
-  mTxInlineFrameUsed += 16;
-
-  memset(packet, 0, 8);
-  packet[0] = SpdySession3::kFlag_Control;
-  packet[1] = SpdySession3::kVersion;
-  packet[3] = SpdySession3::CONTROL_TYPE_WINDOW_UPDATE;
-  packet[7] = 8; // 8 data bytes after 8 byte header
-
-  uint32_t id = PR_htonl(stream->mStreamID);
-  memcpy(packet + 8, &id, 4);
-  memcpy(packet + 12, &toack, 4);
-
-  stream->mLocalWindow += PR_ntohl(toack);
-  LOG3(("AdjustInitialwindow %p 0x%X %u\n",
-        this, stream->mStreamID, PR_ntohl(toack)));
-}
-
-void
-SpdyStream3::UpdateTransportReadEvents(uint32_t count)
-{
-  mTotalRead += count;
-  if (!mSocketTransport) {
-    return;
-  }
-
-  mTransaction->OnTransportStatus(mSocketTransport,
-                                  NS_NET_STATUS_RECEIVING_FROM,
-                                  mTotalRead);
-}
-
-void
-SpdyStream3::UpdateTransportSendEvents(uint32_t count)
-{
-  mTotalSent += count;
-
-  // normally on non-windows platform we use TCP autotuning for
-  // the socket buffers, and this works well (managing enough
-  // buffers for BDP while conserving memory) for HTTP even when
-  // it creates really deep queues. However this 'buffer bloat' is
-  // a problem for spdy because it ruins the low latency properties
-  // necessary for PING and cancel to work meaningfully.
-  //
-  // If this stream represents a large upload, disable autotuning for
-  // the session and cap the send buffers by default at 128KB.
-  // (10Mbit/sec @ 100ms)
-  //
-  uint32_t bufferSize = gHttpHandler->SpdySendBufferSize();
-  if ((mTotalSent > bufferSize) && !mSetTCPSocketBuffer) {
-    mSetTCPSocketBuffer = 1;
-    mSocketTransport->SetSendBufferSize(bufferSize);
-  }
-
-  if (mUpstreamState != SENDING_FIN_STREAM)
-    mTransaction->OnTransportStatus(mSocketTransport,
-                                    NS_NET_STATUS_SENDING_TO,
-                                    mTotalSent);
-
-  if (!mSentWaitingFor && !mRequestBodyLenRemaining) {
-    mSentWaitingFor = 1;
-    mTransaction->OnTransportStatus(mSocketTransport,
-                                    NS_NET_STATUS_WAITING_FOR,
-                                    0);
-  }
-}
-
-nsresult
-SpdyStream3::TransmitFrame(const char *buf,
-                           uint32_t *countUsed,
-                           bool forceCommitment)
-{
-  // If TransmitFrame returns SUCCESS than all the data is sent (or at least
-  // buffered at the session level), if it returns WOULD_BLOCK then none of
-  // the data is sent.
-
-  // You can call this function with no data and no out parameter in order to
-  // flush internal buffers that were previously blocked on writing. You can
-  // of course feed new data to it as well.
-
-  LOG3(("SpdyStream3::TransmitFrame %p inline=%d stream=%d",
-        this, mTxInlineFrameUsed, mTxStreamFrameSize));
-  if (countUsed)
-    *countUsed = 0;
-
-  if (!mTxInlineFrameUsed) {
-    MOZ_ASSERT(!buf);
-    return NS_OK;
-  }
-
-  MOZ_ASSERT(mTxInlineFrameUsed, "empty stream frame in transmit");
-  MOZ_ASSERT(mSegmentReader, "TransmitFrame with null mSegmentReader");
-  MOZ_ASSERT((buf && countUsed) || (!buf && !countUsed),
-             "TransmitFrame arguments inconsistent");
-
-  uint32_t transmittedCount;
-  nsresult rv;
-
-  // In the (relatively common) event that we have a small amount of data
-  // split between the inlineframe and the streamframe, then move the stream
-  // data into the inlineframe via copy in order to coalesce into one write.
-  // Given the interaction with ssl this is worth the small copy cost.
-  if (mTxStreamFrameSize && mTxInlineFrameUsed &&
-      mTxStreamFrameSize < SpdySession3::kDefaultBufferSize &&
-      mTxInlineFrameUsed + mTxStreamFrameSize < mTxInlineFrameSize) {
-    LOG3(("Coalesce Transmit"));
-    memcpy (mTxInlineFrame + mTxInlineFrameUsed,
-            buf, mTxStreamFrameSize);
-    if (countUsed)
-      *countUsed += mTxStreamFrameSize;
-    mTxInlineFrameUsed += mTxStreamFrameSize;
-    mTxStreamFrameSize = 0;
-  }
-
-  rv =
-    mSegmentReader->CommitToSegmentSize(mTxStreamFrameSize + mTxInlineFrameUsed,
-                                        forceCommitment);
-
-  if (rv == NS_BASE_STREAM_WOULD_BLOCK) {
-    MOZ_ASSERT(!forceCommitment, "forceCommitment with WOULD_BLOCK");
-    mSession->TransactionHasDataToWrite(this);
-  }
-  if (NS_FAILED(rv))     // this will include WOULD_BLOCK
-    return rv;
-
-  // This function calls mSegmentReader->OnReadSegment to report the actual SPDY
-  // bytes through to the SpdySession3 and then the HttpConnection which calls
-  // the socket write function. It will accept all of the inline and stream
-  // data because of the above 'commitment' even if it has to buffer
-
-  rv = mSegmentReader->OnReadSegment(reinterpret_cast<char*>(mTxInlineFrame.get()),
-                                     mTxInlineFrameUsed,
-                                     &transmittedCount);
-  LOG3(("SpdyStream3::TransmitFrame for inline session=%p "
-        "stream=%p result %x len=%d",
-        mSession, this, rv, transmittedCount));
-
-  MOZ_ASSERT(rv != NS_BASE_STREAM_WOULD_BLOCK,
-             "inconsistent inline commitment result");
-
-  if (NS_FAILED(rv))
-    return rv;
-
-  MOZ_ASSERT(transmittedCount == mTxInlineFrameUsed,
-             "inconsistent inline commitment count");
-
-  SpdySession3::LogIO(mSession, this, "Writing from Inline Buffer",
-                      reinterpret_cast<char*>(mTxInlineFrame.get()),
-                      transmittedCount);
-
-  if (mTxStreamFrameSize) {
-    if (!buf) {
-      // this cannot happen
-      MOZ_ASSERT(false, "Stream transmit with null buf argument to "
-                 "TransmitFrame()");
-      LOG(("Stream transmit with null buf argument to TransmitFrame()\n"));
-      return NS_ERROR_UNEXPECTED;
-    }
-
-    rv = mSegmentReader->OnReadSegment(buf, mTxStreamFrameSize,
-                                       &transmittedCount);
-
-    LOG3(("SpdyStream3::TransmitFrame for regular session=%p "
-          "stream=%p result %x len=%d",
-          mSession, this, rv, transmittedCount));
-
-    MOZ_ASSERT(rv != NS_BASE_STREAM_WOULD_BLOCK,
-               "inconsistent stream commitment result");
-
-    if (NS_FAILED(rv))
-      return rv;
-
-    MOZ_ASSERT(transmittedCount == mTxStreamFrameSize,
-               "inconsistent stream commitment count");
-
-    SpdySession3::LogIO(mSession, this, "Writing from Transaction Buffer",
-                       buf, transmittedCount);
-
-    *countUsed += mTxStreamFrameSize;
-  }
-
-  // calling this will trigger waiting_for if mRequestBodyLenRemaining is 0
-  UpdateTransportSendEvents(mTxInlineFrameUsed + mTxStreamFrameSize);
-
-  mTxInlineFrameUsed = 0;
-  mTxStreamFrameSize = 0;
-
-  return NS_OK;
-}
-
-void
-SpdyStream3::ChangeState(enum stateType newState)
-{
-  LOG3(("SpdyStream3::ChangeState() %p from %X to %X",
-        this, mUpstreamState, newState));
-  mUpstreamState = newState;
-  return;
-}
-
-void
-SpdyStream3::GenerateDataFrameHeader(uint32_t dataLength, bool lastFrame)
-{
-  LOG3(("SpdyStream3::GenerateDataFrameHeader %p len=%d last=%d",
-        this, dataLength, lastFrame));
-
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(!mTxInlineFrameUsed, "inline frame not empty");
-  MOZ_ASSERT(!mTxStreamFrameSize, "stream frame not empty");
-  MOZ_ASSERT(!(dataLength & 0xff000000), "datalength > 24 bits");
-
-  NetworkEndian::writeUint32(mTxInlineFrame, mStreamID);
-  NetworkEndian::writeUint32(mTxInlineFrame + 1 * sizeof(uint32_t), dataLength);
-
-  MOZ_ASSERT(!(mTxInlineFrame[0] & 0x80), "control bit set unexpectedly");
-  MOZ_ASSERT(!mTxInlineFrame[4], "flag bits set unexpectedly");
-
-  mTxInlineFrameUsed = 8;
-  mTxStreamFrameSize = dataLength;
-
-  if (lastFrame) {
-    mTxInlineFrame[4] |= SpdySession3::kFlag_Data_FIN;
-    if (dataLength)
-      mSentFinOnData = 1;
-  }
-}
-
-void
-SpdyStream3::CompressToFrame(const nsACString &str)
-{
-  CompressToFrame(str.BeginReading(), str.Length());
-}
-
-void
-SpdyStream3::CompressToFrame(const nsACString *str)
-{
-  CompressToFrame(str->BeginReading(), str->Length());
-}
-
-// Dictionary taken from
-// http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3
-
-const unsigned char SpdyStream3::kDictionary[] = {
-	0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69,   // - - - - o p t i
-	0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68,   // o n s - - - - h
-	0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70,   // e a d - - - - p
-	0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70,   // o s t - - - - p
-	0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65,   // u t - - - - d e
-	0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05,   // l e t e - - - -
-	0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,   // t r a c e - - -
-	0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00,   // - a c c e p t -
-	0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70,   // - - - a c c e p
-	0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,   // t - c h a r s e
-	0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63,   // t - - - - a c c
-	0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,   // e p t - e n c o
-	0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f,   // d i n g - - - -
-	0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c,   // a c c e p t - l
-	0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00,   // a n g u a g e -
-	0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70,   // - - - a c c e p
-	0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73,   // t - r a n g e s
-	0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00,   // - - - - a g e -
-	0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77,   // - - - a l l o w
-	0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68,   // - - - - a u t h
-	0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,   // o r i z a t i o
-	0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63,   // n - - - - c a c
-	0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,   // h e - c o n t r
-	0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f,   // o l - - - - c o
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,   // n n e c t i o n
-	0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74,   // - - - - c o n t
-	0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65,   // e n t - b a s e
-	0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74,   // - - - - c o n t
-	0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,   // e n t - e n c o
-	0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10,   // d i n g - - - -
-	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d,   // c o n t e n t -
-	0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65,   // l a n g u a g e
-	0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74,   // - - - - c o n t
-	0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67,   // e n t - l e n g
-	0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f,   // t h - - - - c o
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f,   // n t e n t - l o
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00,   // c a t i o n - -
-	0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,   // - - c o n t e n
-	0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00,   // t - m d 5 - - -
-	0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,   // - c o n t e n t
-	0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00,   // - r a n g e - -
-	0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,   // - - c o n t e n
-	0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00,   // t - t y p e - -
-	0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00,   // - - d a t e - -
-	0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00,   // - - e t a g - -
-	0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74,   // - - e x p e c t
-	0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69,   // - - - - e x p i
-	0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66,   // r e s - - - - f
-	0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68,   // r o m - - - - h
-	0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69,   // o s t - - - - i
-	0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00,   // f - m a t c h -
-	0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f,   // - - - i f - m o
-	0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73,   // d i f i e d - s
-	0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d,   // i n c e - - - -
-	0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d,   // i f - n o n e -
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00,   // m a t c h - - -
-	0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67,   // - i f - r a n g
-	0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d,   // e - - - - i f -
-	0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69,   // u n m o d i f i
-	0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65,   // e d - s i n c e
-	0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74,   // - - - - l a s t
-	0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65,   // - m o d i f i e
-	0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63,   // d - - - - l o c
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00,   // a t i o n - - -
-	0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72,   // - m a x - f o r
-	0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00,   // w a r d s - - -
-	0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00,   // - p r a g m a -
-	0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79,   // - - - p r o x y
-	0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,   // - a u t h e n t
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00,   // i c a t e - - -
-	0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61,   // - p r o x y - a
-	0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61,   // u t h o r i z a
-	0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05,   // t i o n - - - -
-	0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00,   // r a n g e - - -
-	0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72,   // - r e f e r e r
-	0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72,   // - - - - r e t r
-	0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00,   // y - a f t e r -
-	0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65,   // - - - s e r v e
-	0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00,   // r - - - - t e -
-	0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c,   // - - - t r a i l
-	0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72,   // e r - - - - t r
-	0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65,   // a n s f e r - e
-	0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00,   // n c o d i n g -
-	0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61,   // - - - u p g r a
-	0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73,   // d e - - - - u s
-	0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74,   // e r - a g e n t
-	0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79,   // - - - - v a r y
-	0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00,   // - - - - v i a -
-	0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69,   // - - - w a r n i
-	0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77,   // n g - - - - w w
-	0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e,   // w - a u t h e n
-	0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00,   // t i c a t e - -
-	0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,   // - - m e t h o d
-	0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00,   // - - - - g e t -
-	0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,   // - - - s t a t u
-	0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30,   // s - - - - 2 0 0
-	0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76,   // - O K - - - - v
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00,   // e r s i o n - -
-	0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31,   // - - H T T P - 1
-	0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72,   // - 1 - - - - u r
-	0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62,   // l - - - - p u b
-	0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73,   // l i c - - - - s
-	0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69,   // e t - c o o k i
-	0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65,   // e - - - - k e e
-	0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00,   // p - a l i v e -
-	0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69,   // - - - o r i g i
-	0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32,   // n 1 0 0 1 0 1 2
-	0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35,   // 0 1 2 0 2 2 0 5
-	0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30,   // 2 0 6 3 0 0 3 0
-	0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33,   // 2 3 0 3 3 0 4 3
-	0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37,   // 0 5 3 0 6 3 0 7
-	0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30,   // 4 0 2 4 0 5 4 0
-	0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34,   // 6 4 0 7 4 0 8 4
-	0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31,   // 0 9 4 1 0 4 1 1
-	0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31,   // 4 1 2 4 1 3 4 1
-	0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34,   // 4 4 1 5 4 1 6 4
-	0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34,   // 1 7 5 0 2 5 0 4
-	0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e,   // 5 0 5 2 0 3 - N
-	0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f,   // o n - A u t h o
-	0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65,   // r i t a t i v e
-	0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,   // - I n f o r m a
-	0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20,   // t i o n 2 0 4 -
-	0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65,   // N o - C o n t e
-	0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f,   // n t 3 0 1 - M o
-	0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d,   // v e d - P e r m
-	0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34,   // a n e n t l y 4
-	0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52,   // 0 0 - B a d - R
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30,   // e q u e s t 4 0
-	0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68,   // 1 - U n a u t h
-	0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30,   // o r i z e d 4 0
-	0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64,   // 3 - F o r b i d
-	0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e,   // d e n 4 0 4 - N
-	0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64,   // o t - F o u n d
-	0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65,   // 5 0 0 - I n t e
-	0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72,   // r n a l - S e r
-	0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f,   // v e r - E r r o
-	0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74,   // r 5 0 1 - N o t
-	0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,   // - I m p l e m e
-	0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20,   // n t e d 5 0 3 -
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20,   // S e r v i c e -
-	0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,   // U n a v a i l a
-	0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46,   // b l e J a n - F
-	0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41,   // e b - M a r - A
-	0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a,   // p r - M a y - J
-	0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41,   // u n - J u l - A
-	0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20,   // u g - S e p t -
-	0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20,   // O c t - N o v -
-	0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30,   // D e c - 0 0 - 0
-	0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e,   // 0 - 0 0 - M o n
-	0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57,   // - - T u e - - W
-	0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c,   // e d - - T h u -
-	0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61,   // - F r i - - S a
-	0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20,   // t - - S u n - -
-	0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b,   // G M T c h u n k
-	0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f,   // e d - t e x t -
-	0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61,   // h t m l - i m a
-	0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69,   // g e - p n g - i
-	0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67,   // m a g e - j p g
-	0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67,   // - i m a g e - g
-	0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,   // i f - a p p l i
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,   // c a t i o n - x
-	0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,   // m l - a p p l i
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,   // c a t i o n - x
-	0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c,   // h t m l - x m l
-	0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c,   // - t e x t - p l
-	0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74,   // a i n - t e x t
-	0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72,   // - j a v a s c r
-	0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c,   // i p t - p u b l
-	0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74,   // i c p r i v a t
-	0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65,   // e m a x - a g e
-	0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65,   // - g z i p - d e
-	0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64,   // f l a t e - s d
-	0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,   // c h c h a r s e
-	0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63,   // t - u t f - 8 c
-	0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69,   // h a r s e t - i
-	0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d,   // s o - 8 8 5 9 -
-	0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a,   // 1 - u t f - - -
-	0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e          // - e n q - 0 -
-};
-
-// This can be called N times.. 1 for syn_reply and 0->N for headers
-nsresult
-SpdyStream3::Uncompress(z_stream *context,
-                        char *blockStart,
-                        uint32_t blockLen)
-{
-  // ensure the minimum size
-  EnsureBuffer(mDecompressBuffer, SpdySession3::kDefaultBufferSize,
-               mDecompressBufferUsed, mDecompressBufferSize);
-
-  mDecompressedBytes += blockLen;
-
-  context->avail_in = blockLen;
-  context->next_in = reinterpret_cast<unsigned char *>(blockStart);
-  bool triedDictionary = false;
-
-  do {
-    context->next_out =
-      reinterpret_cast<unsigned char *>(mDecompressBuffer.get()) +
-      mDecompressBufferUsed;
-    context->avail_out = mDecompressBufferSize - mDecompressBufferUsed;
-    int zlib_rv = inflate(context, Z_NO_FLUSH);
-    LOG3(("SpdyStream3::Uncompress %p zlib_rv %d\n", this, zlib_rv));
-
-    if (zlib_rv == Z_NEED_DICT) {
-      if (triedDictionary) {
-        LOG3(("SpdyStream3::Uncompress %p Dictionary Error\n", this));
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-
-      triedDictionary = true;
-      inflateSetDictionary(context, kDictionary, sizeof(kDictionary));
-    } else if (zlib_rv == Z_DATA_ERROR) {
-      LOG3(("SpdyStream3::Uncompress %p inflate returned data err\n", this));
-      return NS_ERROR_ILLEGAL_VALUE;
-    } else  if (zlib_rv < Z_OK) { // probably Z_MEM_ERROR
-      LOG3(("SpdyStream3::Uncompress %p inflate returned %d\n", this, zlib_rv));
-      return NS_ERROR_FAILURE;
-    }
-
-    // zlib's inflate() decreases context->avail_out by the amount it places
-    // in the output buffer
-
-    mDecompressBufferUsed += mDecompressBufferSize - mDecompressBufferUsed -
-      context->avail_out;
-
-    // When there is no more output room, but input still available then
-    // increase the output space
-    if (zlib_rv == Z_OK &&
-        !context->avail_out && context->avail_in) {
-      LOG3(("SpdyStream3::Uncompress %p Large Headers - so far %d",
-            this, mDecompressBufferSize));
-      EnsureBuffer(mDecompressBuffer, mDecompressBufferSize + 4096,
-                   mDecompressBufferUsed, mDecompressBufferSize);
-    }
-  }
-  while (context->avail_in);
-  return NS_OK;
-}
-
-// mDecompressBuffer contains 0 to N uncompressed Name/Value Header blocks
-nsresult
-SpdyStream3::FindHeader(nsCString name,
-                        nsDependentCSubstring &value)
-{
-  const unsigned char *nvpair = reinterpret_cast<unsigned char *>
-    (mDecompressBuffer.get()) + 4;
-  const unsigned char *lastHeaderByte = reinterpret_cast<unsigned char *>
-    (mDecompressBuffer.get()) + mDecompressBufferUsed;
-  if (lastHeaderByte < nvpair)
-    return NS_ERROR_ILLEGAL_VALUE;
-
-  do {
-    uint32_t numPairs = NetworkEndian::readUint32(nvpair - 1 * sizeof(uint32_t));
-
-    for (uint32_t index = 0; index < numPairs; ++index) {
-      if (lastHeaderByte < nvpair + 4)
-        return NS_ERROR_ILLEGAL_VALUE;
-      uint32_t nameLen = (nvpair[0] << 24) + (nvpair[1] << 16) +
-        (nvpair[2] << 8) + nvpair[3];
-      if (lastHeaderByte < nvpair + 4 + nameLen)
-        return NS_ERROR_ILLEGAL_VALUE;
-      nsDependentCSubstring nameString =
-        Substring(reinterpret_cast<const char *>(nvpair) + 4,
-                  reinterpret_cast<const char *>(nvpair) + 4 + nameLen);
-      if (lastHeaderByte < nvpair + 8 + nameLen)
-        return NS_ERROR_ILLEGAL_VALUE;
-      uint32_t valueLen = (nvpair[4 + nameLen] << 24) + (nvpair[5 + nameLen] << 16) +
-        (nvpair[6 + nameLen] << 8) + nvpair[7 + nameLen];
-      if (lastHeaderByte < nvpair + 8 + nameLen + valueLen)
-        return NS_ERROR_ILLEGAL_VALUE;
-      if (nameString.Equals(name)) {
-        value.Assign(((char *)nvpair) + 8 + nameLen, valueLen);
-        return NS_OK;
-      }
-
-      // that pair didn't match - try the next one in this block
-      nvpair += 8 + nameLen + valueLen;
-    }
-
-    // move to the next name/value header block (if there is one) - the
-    // first pair is offset 4 bytes into it
-    nvpair += 4;
-  } while (lastHeaderByte >= nvpair);
-
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-// ConvertHeaders is used to convert the response headers
-// in a syn_reply or in 0..N headers frames that follow it into
-// HTTP/1 format
-nsresult
-SpdyStream3::ConvertHeaders(nsACString &aHeadersOut)
-{
-  // :status and :version are required.
-  nsDependentCSubstring status, version;
-  nsresult rv = FindHeader(NS_LITERAL_CSTRING(":status"),
-                           status);
-  if (NS_FAILED(rv))
-    return (rv == NS_ERROR_NOT_AVAILABLE) ? NS_ERROR_ILLEGAL_VALUE : rv;
-
-  rv = FindHeader(NS_LITERAL_CSTRING(":version"),
-                  version);
-  if (NS_FAILED(rv))
-    return (rv == NS_ERROR_NOT_AVAILABLE) ? NS_ERROR_ILLEGAL_VALUE : rv;
-
-  if (mDecompressedBytes && mDecompressBufferUsed) {
-    Telemetry::Accumulate(Telemetry::SPDY_SYN_REPLY_SIZE, mDecompressedBytes);
-    uint32_t ratio =
-      mDecompressedBytes * 100 / mDecompressBufferUsed;
-    Telemetry::Accumulate(Telemetry::SPDY_SYN_REPLY_RATIO, ratio);
-  }
-
-  aHeadersOut.Truncate();
-  aHeadersOut.SetCapacity(mDecompressBufferUsed + 64);
-
-  // Connection, Keep-Alive and chunked transfer encodings are to be
-  // removed.
-
-  // Content-Length is 'advisory'.. we will not strip it because it can
-  // create UI feedback.
-
-  aHeadersOut.Append(version);
-  aHeadersOut.Append(' ');
-  aHeadersOut.Append(status);
-  aHeadersOut.AppendLiteral("\r\n");
-
-  const unsigned char *nvpair = reinterpret_cast<unsigned char *>
-    (mDecompressBuffer.get()) + 4;
-  const unsigned char *lastHeaderByte = reinterpret_cast<unsigned char *>
-    (mDecompressBuffer.get()) + mDecompressBufferUsed;
-  if (lastHeaderByte < nvpair)
-    return NS_ERROR_ILLEGAL_VALUE;
-
-  do {
-    uint32_t numPairs = NetworkEndian::readUint32(nvpair - 1 * sizeof(uint32_t));
-
-    for (uint32_t index = 0; index < numPairs; ++index) {
-      if (lastHeaderByte < nvpair + 4)
-        return NS_ERROR_ILLEGAL_VALUE;
-
-      uint32_t nameLen = (nvpair[0] << 24) + (nvpair[1] << 16) +
-        (nvpair[2] << 8) + nvpair[3];
-      if (lastHeaderByte < nvpair + 4 + nameLen)
-        return NS_ERROR_ILLEGAL_VALUE;
-
-      nsDependentCSubstring nameString =
-        Substring(reinterpret_cast<const char *>(nvpair) + 4,
-                  reinterpret_cast<const char *>(nvpair) + 4 + nameLen);
-
-      if (lastHeaderByte < nvpair + 8 + nameLen)
-        return NS_ERROR_ILLEGAL_VALUE;
-
-      // Look for illegal characters in the nameString.
-      // This includes upper case characters and nulls (as they will
-      // break the fixup-nulls-in-value-string algorithm)
-      // Look for upper case characters in the name. They are illegal.
-      for (char *cPtr = nameString.BeginWriting();
-           cPtr && cPtr < nameString.EndWriting();
-           ++cPtr) {
-        if (*cPtr <= 'Z' && *cPtr >= 'A') {
-          nsCString toLog(nameString);
-
-          LOG3(("SpdyStream3::ConvertHeaders session=%p stream=%p "
-                "upper case response header found. [%s]\n",
-                mSession, this, toLog.get()));
-
-          return NS_ERROR_ILLEGAL_VALUE;
-        }
-
-        // check for null characters
-        if (*cPtr == '\0')
-          return NS_ERROR_ILLEGAL_VALUE;
-      }
-
-      // HTTP Chunked responses are not legal over spdy. We do not need
-      // to look for chunked specifically because it is the only HTTP
-      // allowed default encoding and we did not negotiate further encodings
-      // via TE
-      if (nameString.EqualsLiteral("transfer-encoding")) {
-        LOG3(("SpdyStream3::ConvertHeaders session=%p stream=%p "
-              "transfer-encoding found. Chunked is invalid and no TE sent.",
-              mSession, this));
-
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-
-      uint32_t valueLen =
-        (nvpair[4 + nameLen] << 24) + (nvpair[5 + nameLen] << 16) +
-        (nvpair[6 + nameLen] << 8)  +   nvpair[7 + nameLen];
-
-      if (lastHeaderByte < nvpair + 8 + nameLen + valueLen)
-        return NS_ERROR_ILLEGAL_VALUE;
-
-      // spdy transport level headers shouldn't be gatewayed into http/1
-      if (!nameString.IsEmpty() && nameString[0] != ':' &&
-          !nameString.EqualsLiteral("connection") &&
-          !nameString.EqualsLiteral("keep-alive")) {
-        nsDependentCSubstring valueString =
-          Substring(reinterpret_cast<const char *>(nvpair) + 8 + nameLen,
-                    reinterpret_cast<const char *>(nvpair) + 8 + nameLen +
-                    valueLen);
-
-        aHeadersOut.Append(nameString);
-        aHeadersOut.AppendLiteral(": ");
-
-        // expand nullptr bytes in the value string
-        for (char *cPtr = valueString.BeginWriting();
-             cPtr && cPtr < valueString.EndWriting();
-             ++cPtr) {
-          if (*cPtr != 0) {
-            aHeadersOut.Append(*cPtr);
-            continue;
-          }
-
-          // NULLs are really "\r\nhdr: "
-          aHeadersOut.AppendLiteral("\r\n");
-          aHeadersOut.Append(nameString);
-          aHeadersOut.AppendLiteral(": ");
-        }
-
-        aHeadersOut.AppendLiteral("\r\n");
-      }
-      // move to the next name/value pair in this block
-      nvpair += 8 + nameLen + valueLen;
-    }
-
-    // move to the next name/value header block (if there is one) - the
-    // first pair is offset 4 bytes into it
-    nvpair += 4;
-  } while (lastHeaderByte >= nvpair);
-
-  // The decoding went ok. Now we can customize and clean up.
-
-  aHeadersOut.AppendLiteral("X-Firefox-Spdy: 3\r\n\r\n");
-  LOG (("decoded response headers are:\n%s",
-        aHeadersOut.BeginReading()));
-
-  // The spdy formatted buffer isnt needed anymore - free it up
-  mDecompressBuffer = nullptr;
-  mDecompressBufferSize = 0;
-  mDecompressBufferUsed = 0;
-
-  if (mIsTunnel && !mPlainTextTunnel) {
-    aHeadersOut.Truncate();
-    LOG(("SpdyStream3::ConvertHeaders %p 0x%X headers removed for tunnel\n",
-         this, mStreamID));
-  }
-
-  return NS_OK;
-}
-
-void
-SpdyStream3::ExecuteCompress(uint32_t flushMode)
-{
-  // Expect mZlib->avail_in and mZlib->next_in to be set.
-  // Append the compressed version of next_in to mTxInlineFrame
-
-  do
-  {
-    uint32_t avail = mTxInlineFrameSize - mTxInlineFrameUsed;
-    if (avail < 1) {
-      EnsureBuffer(mTxInlineFrame, mTxInlineFrameSize + 2000,
-                   mTxInlineFrameUsed, mTxInlineFrameSize);
-      avail = mTxInlineFrameSize - mTxInlineFrameUsed;
-    }
-
-    mZlib->next_out = mTxInlineFrame + mTxInlineFrameUsed;
-    mZlib->avail_out = avail;
-    deflate(mZlib, flushMode);
-    mTxInlineFrameUsed += avail - mZlib->avail_out;
-  } while (mZlib->avail_in > 0 || !mZlib->avail_out);
-}
-
-void
-SpdyStream3::CompressToFrame(uint32_t data)
-{
-  // convert the data to 4 byte network byte order and write that
-  // to the compressed stream
-  unsigned char databuf[sizeof(data)];
-  NetworkEndian::writeUint32(databuf, data);
-
-  mZlib->next_in = databuf;
-  mZlib->avail_in = sizeof(databuf);
-  ExecuteCompress(Z_NO_FLUSH);
-}
-
-
-void
-SpdyStream3::CompressToFrame(const char *data, uint32_t len)
-{
-  // Format calls for a network ordered 32 bit length
-  // followed by the utf8 string
-
-  unsigned char lenbuf[sizeof(len)];
-  NetworkEndian::writeUint32(lenbuf, len);
-
-  // write out the length
-  mZlib->next_in = lenbuf;
-  mZlib->avail_in = sizeof(lenbuf);
-  ExecuteCompress(Z_NO_FLUSH);
-
-  // write out the data
-  mZlib->next_in = (unsigned char *)data;
-  mZlib->avail_in = len;
-  ExecuteCompress(Z_NO_FLUSH);
-}
-
-void
-SpdyStream3::CompressFlushFrame()
-{
-  mZlib->next_in = (unsigned char *) "";
-  mZlib->avail_in = 0;
-  ExecuteCompress(Z_SYNC_FLUSH);
-}
-
-bool
-SpdyStream3::GetFullyOpen()
-{
-  return mFullyOpen;
-}
-
-nsresult
-SpdyStream3::SetFullyOpen()
-{
-  MOZ_ASSERT(!mFullyOpen);
-  mFullyOpen = 1;
-  if (mIsTunnel) {
-    int32_t code = 0;
-    nsDependentCSubstring statusSubstring;
-    nsresult rv = FindHeader(NS_LITERAL_CSTRING(":status"), statusSubstring);
-    if (NS_SUCCEEDED(rv)) {
-      nsCString status(statusSubstring);
-      nsresult errcode;
-      code = status.ToInteger(&errcode);
-    }
-
-    LOG3(("SpdyStream3::SetFullyOpen %p Tunnel Response code %d", this, code));
-    if ((code / 100) != 2) {
-      MapStreamToPlainText();
-    }
-
-    MapStreamToHttpConnection();
-    ClearTransactionsBlockedOnTunnel();
-  }
-  return NS_OK;
-}
-
-void
-SpdyStream3::Close(nsresult reason)
-{
-  mTransaction->Close(reason);
-}
-
-void
-SpdyStream3::UpdateRemoteWindow(int32_t delta)
-{
-  int64_t oldRemoteWindow = mRemoteWindow;
-  mRemoteWindow += delta;
-  if (oldRemoteWindow <= 0 && mRemoteWindow > 0) {
-    // the window has been opened :)
-    mSession->TransactionHasDataToWrite(this);
-  }
-}
-
-//-----------------------------------------------------------------------------
-// nsAHttpSegmentReader
-//-----------------------------------------------------------------------------
-
-nsresult
-SpdyStream3::OnReadSegment(const char *buf,
-                           uint32_t count,
-                           uint32_t *countRead)
-{
-  LOG3(("SpdyStream3::OnReadSegment %p count=%d state=%x",
-        this, count, mUpstreamState));
-
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(mSegmentReader, "OnReadSegment with null mSegmentReader");
-
-  nsresult rv = NS_ERROR_UNEXPECTED;
-  uint32_t dataLength;
-
-  switch (mUpstreamState) {
-  case GENERATING_SYN_STREAM:
-    // The buffer is the HTTP request stream, including at least part of the
-    // HTTP request header. This state's job is to build a SYN_STREAM frame
-    // from the header information. count is the number of http bytes available
-    // (which may include more than the header), and in countRead we return
-    // the number of those bytes that we consume (i.e. the portion that are
-    // header bytes)
-
-    rv = ParseHttpRequestHeaders(buf, count, countRead);
-    if (NS_FAILED(rv))
-      return rv;
-    LOG3(("ParseHttpRequestHeaders %p used %d of %d. complete = %d",
-          this, *countRead, count, mSynFrameComplete));
-    if (mSynFrameComplete) {
-      AdjustInitialWindow();
-      rv = TransmitFrame(nullptr, nullptr, true);
-      if (rv == NS_BASE_STREAM_WOULD_BLOCK) {
-        // this can't happen
-        MOZ_ASSERT(false, "Transmit Frame SYN_FRAME must at least buffer data");
-        rv = NS_ERROR_UNEXPECTED;
-      }
-
-      ChangeState(GENERATING_REQUEST_BODY);
-      break;
-    }
-    MOZ_ASSERT(*countRead == count, "Header parsing not complete but unused data");
-    break;
-
-  case GENERATING_REQUEST_BODY:
-    if (mRemoteWindow <= 0) {
-      *countRead = 0;
-      LOG3(("SpdyStream3 this=%p, id 0x%X request body suspended because "
-            "remote window is %d.\n", this, mStreamID, mRemoteWindow));
-      mBlockedOnRwin = true;
-      return NS_BASE_STREAM_WOULD_BLOCK;
-    }
-    mBlockedOnRwin = false;
-
-    dataLength = std::min(count, mChunkSize);
-
-    if (dataLength > mRemoteWindow)
-      dataLength = static_cast<uint32_t>(mRemoteWindow);
-
-    LOG3(("SpdyStream3 this=%p id 0x%X remote window is %d. Chunk is %d\n",
-          this, mStreamID, mRemoteWindow, dataLength));
-    mRemoteWindow -= dataLength;
-
-    LOG3(("SpdyStream3 %p id %x request len remaining %u, "
-          "count avail %u, chunk used %u",
-          this, mStreamID, mRequestBodyLenRemaining, count, dataLength));
-    if (!dataLength && mRequestBodyLenRemaining) {
-      return NS_BASE_STREAM_WOULD_BLOCK;
-    }
-    if (dataLength > mRequestBodyLenRemaining) {
-      return NS_ERROR_UNEXPECTED;
-    }
-    mRequestBodyLenRemaining -= dataLength;
-    GenerateDataFrameHeader(dataLength, !mRequestBodyLenRemaining);
-    ChangeState(SENDING_REQUEST_BODY);
-    // NO BREAK
-
-  case SENDING_REQUEST_BODY:
-    MOZ_ASSERT(mTxInlineFrameUsed, "OnReadSegment Send Data Header 0b");
-    rv = TransmitFrame(buf, countRead, false);
-    MOZ_ASSERT(NS_FAILED(rv) || !mTxInlineFrameUsed,
-               "Transmit Frame should be all or nothing");
-
-    LOG3(("TransmitFrame() rv=%x returning %d data bytes. "
-          "Header is %d Body is %d.",
-          rv, *countRead, mTxInlineFrameUsed, mTxStreamFrameSize));
-
-    // normalize a partial write with a WOULD_BLOCK into just a partial write
-    // as some code will take WOULD_BLOCK to mean an error with nothing
-    // written (e.g. nsHttpTransaction::ReadRequestSegment()
-    if (rv == NS_BASE_STREAM_WOULD_BLOCK && *countRead)
-      rv = NS_OK;
-
-    // If that frame was all sent, look for another one
-    if (!mTxInlineFrameUsed)
-        ChangeState(GENERATING_REQUEST_BODY);
-    break;
-
-  case SENDING_FIN_STREAM:
-    MOZ_ASSERT(false, "resuming partial fin stream out of OnReadSegment");
-    break;
-
-  default:
-    MOZ_ASSERT(false, "SpdyStream3::OnReadSegment non-write state");
-    break;
-  }
-
-  return rv;
-}
-
-//-----------------------------------------------------------------------------
-// nsAHttpSegmentWriter
-//-----------------------------------------------------------------------------
-
-nsresult
-SpdyStream3::OnWriteSegment(char *buf,
-                            uint32_t count,
-                            uint32_t *countWritten)
-{
-  LOG3(("SpdyStream3::OnWriteSegment %p count=%d state=%x 0x%X\n",
-        this, count, mUpstreamState, mStreamID));
-
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-  MOZ_ASSERT(mSegmentWriter);
-
-  if (!mPushSource)
-    return mSegmentWriter->OnWriteSegment(buf, count, countWritten);
-
-  nsresult rv;
-  rv = mPushSource->GetBufferedData(buf, count, countWritten);
-  if (NS_FAILED(rv))
-    return rv;
-
-  mSession->ConnectPushedStream(this);
-  return NS_OK;
-}
-
-/// connect tunnels
-
-void
-SpdyStream3::ClearTransactionsBlockedOnTunnel()
-{
-  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
-
-  if (!mIsTunnel) {
-    return;
-  }
-  gHttpHandler->ConnMgr()->ProcessPendingQ(mTransaction->ConnectionInfo());
-}
-
-void
-SpdyStream3::MapStreamToPlainText()
-{
-  nsRefPtr<SpdyConnectTransaction> qiTrans(mTransaction->QuerySpdyConnectTransaction());
-  MOZ_ASSERT(qiTrans);
-  mPlainTextTunnel = true;
-  qiTrans->ForcePlainText();
-}
-
-void
-SpdyStream3::MapStreamToHttpConnection()
-{
-  nsRefPtr<SpdyConnectTransaction> qiTrans(mTransaction->QuerySpdyConnectTransaction());
-  MOZ_ASSERT(qiTrans);
-  qiTrans->MapStreamToHttpConnection(mSocketTransport,
-                                     mTransaction->ConnectionInfo());
-}
-
-} // namespace mozilla::net
-} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyStream3.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyStream3.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/http/SpdyStream3.h	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/http/SpdyStream3.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 mozilla_net_SpdyStream3_h
-#define mozilla_net_SpdyStream3_h
-
-#include "nsAHttpTransaction.h"
-#include "zlib.h"
-
-class nsISocketTransport;
-
-namespace mozilla { namespace net {
-
-class SpdySession3;
-class SpdyPushedStream3;
-
-class SpdyStream3 : public nsAHttpSegmentReader
-                  , public nsAHttpSegmentWriter
-{
-public:
-  NS_DECL_NSAHTTPSEGMENTREADER
-  NS_DECL_NSAHTTPSEGMENTWRITER
-
-  SpdyStream3(nsAHttpTransaction *, SpdySession3 *, int32_t);
-
-  uint32_t StreamID() { return mStreamID; }
-  SpdyPushedStream3 *PushSource() { return mPushSource; }
-
-  virtual nsresult ReadSegments(nsAHttpSegmentReader *,  uint32_t, uint32_t *);
-  virtual nsresult WriteSegments(nsAHttpSegmentWriter *, uint32_t, uint32_t *);
-  virtual bool DeferCleanupOnSuccess() { return false; }
-
-  const nsAFlatCString &Origin()   const { return mOrigin; }
-
-  bool RequestBlockedOnRead()
-  {
-    return static_cast<bool>(mRequestBlockedOnRead);
-  }
-
-  bool GetFullyOpen();
-  // returns failure if stream cannot be made ready and stream
-  // should be canceled
-  nsresult SetFullyOpen();
-
-  bool HasRegisteredID() { return mStreamID != 0; }
-
-  nsAHttpTransaction *Transaction() { return mTransaction; }
-  virtual nsILoadGroupConnectionInfo *LoadGroupConnectionInfo()
-  {
-    return mTransaction ? mTransaction->LoadGroupConnectionInfo() : nullptr;
-  }
-
-  void Close(nsresult reason);
-
-  void SetRecvdFin(bool aStatus) { mRecvdFin = aStatus ? 1 : 0; }
-  bool RecvdFin() { return mRecvdFin; }
-
-  void SetRecvdData(bool aStatus) { mReceivedData = aStatus ? 1 : 0; }
-  bool RecvdData() { return mReceivedData; }
-
-  void UpdateTransportSendEvents(uint32_t count);
-  void UpdateTransportReadEvents(uint32_t count);
-
-  // The zlib header compression dictionary defined by SPDY.
-  static const unsigned char kDictionary[1423];
-
-  nsresult Uncompress(z_stream *, char *, uint32_t);
-  nsresult ConvertHeaders(nsACString &);
-
-  void UpdateRemoteWindow(int32_t delta);
-  int64_t RemoteWindow() { return mRemoteWindow; }
-
-  void DecrementLocalWindow(uint32_t delta) {
-    mLocalWindow -= delta;
-    mLocalUnacked += delta;
-  }
-
-  void IncrementLocalWindow(uint32_t delta) {
-    mLocalWindow += delta;
-    mLocalUnacked -= delta;
-  }
-
-  uint64_t LocalUnAcked() { return mLocalUnacked; }
-  int64_t  LocalWindow()  { return mLocalWindow; }
-
-  bool     BlockedOnRwin() { return mBlockedOnRwin; }
-
-  // A pull stream has an implicit sink, a pushed stream has a sink
-  // once it is matched to a pull stream.
-  virtual bool HasSink() { return true; }
-
-  virtual ~SpdyStream3();
-
-protected:
-  nsresult FindHeader(nsCString, nsDependentCSubstring &);
-
-  static void CreatePushHashKey(const nsCString &scheme,
-                                const nsCString &hostHeader,
-                                uint64_t serial,
-                                const nsCSubstring &pathInfo,
-                                nsCString &outOrigin,
-                                nsCString &outKey);
-
-  enum stateType {
-    GENERATING_SYN_STREAM,
-    GENERATING_REQUEST_BODY,
-    SENDING_REQUEST_BODY,
-    SENDING_FIN_STREAM,
-    UPSTREAM_COMPLETE
-  };
-
-  uint32_t mStreamID;
-
-  // The session that this stream is a subset of
-  SpdySession3 *mSession;
-
-  nsCString     mOrigin;
-
-  // Each stream goes from syn_stream to upstream_complete, perhaps
-  // looping on multiple instances of generating_request_body and
-  // sending_request_body for each SPDY chunk in the upload.
-  enum stateType mUpstreamState;
-
-  // Flag is set when all http request headers have been read and ID is stable
-  uint32_t                     mSynFrameComplete     : 1;
-
-  // Flag is set when a FIN has been placed on a data or syn packet
-  // (i.e after the client has closed)
-  uint32_t                     mSentFinOnData        : 1;
-
-  void     ChangeState(enum stateType);
-
-private:
-  friend class nsAutoPtr<SpdyStream3>;
-
-  static PLDHashOperator hdrHashEnumerate(const nsACString &,
-                                          nsAutoPtr<nsCString> &,
-                                          void *);
-
-  nsresult ParseHttpRequestHeaders(const char *, uint32_t, uint32_t *);
-  void     AdjustInitialWindow();
-  nsresult TransmitFrame(const char *, uint32_t *, bool forceCommitment);
-  void     GenerateDataFrameHeader(uint32_t, bool);
-
-  void     CompressToFrame(const nsACString &);
-  void     CompressToFrame(const nsACString *);
-  void     CompressToFrame(const char *, uint32_t);
-  void     CompressToFrame(uint32_t);
-  void     CompressFlushFrame();
-  void     ExecuteCompress(uint32_t);
-
-  // The underlying HTTP transaction. This pointer is used as the key
-  // in the SpdySession3 mStreamTransactionHash so it is important to
-  // keep a reference to it as long as this stream is a member of that hash.
-  // (i.e. don't change it or release it after it is set in the ctor).
-  nsRefPtr<nsAHttpTransaction> mTransaction;
-
-  // The underlying socket transport object is needed to propogate some events
-  nsISocketTransport         *mSocketTransport;
-
-  // These are temporary state variables to hold the argument to
-  // Read/WriteSegments so it can be accessed by On(read/write)segment
-  // further up the stack.
-  nsAHttpSegmentReader        *mSegmentReader;
-  nsAHttpSegmentWriter        *mSegmentWriter;
-
-  // The quanta upstream data frames are chopped into
-  uint32_t                    mChunkSize;
-
-  // Flag is set when the HTTP processor has more data to send
-  // but has blocked in doing so.
-  uint32_t                     mRequestBlockedOnRead : 1;
-
-  // Flag is set after the response frame bearing the fin bit has
-  // been processed. (i.e. after the server has closed).
-  uint32_t                     mRecvdFin             : 1;
-
-  // Flag is set after syn reply received
-  uint32_t                     mFullyOpen            : 1;
-
-  // Flag is set after the WAITING_FOR Transport event has been generated
-  uint32_t                     mSentWaitingFor       : 1;
-
-  // Flag is set after 1st DATA frame has been passed to stream, after
-  // which additional HEADERS data is invalid
-  uint32_t                     mReceivedData         : 1;
-
-  // Flag is set after TCP send autotuning has been disabled
-  uint32_t                     mSetTCPSocketBuffer   : 1;
-
-  // The InlineFrame and associated data is used for composing control
-  // frames and data frame headers.
-  nsAutoArrayPtr<uint8_t>      mTxInlineFrame;
-  uint32_t                     mTxInlineFrameSize;
-  uint32_t                     mTxInlineFrameUsed;
-
-  // mTxStreamFrameSize tracks the progress of
-  // transmitting a request body data frame. The data frame itself
-  // is never copied into the spdy layer.
-  uint32_t                     mTxStreamFrameSize;
-
-  // Compression context and buffer for request header compression.
-  // This is a copy of SpdySession3::mUpstreamZlib because it needs
-  //  to remain the same in all streams of a session.
-  z_stream                     *mZlib;
-  nsCString                    mFlatHttpRequestHeaders;
-
-  // These are used for decompressing downstream spdy response headers
-  uint32_t             mDecompressBufferSize;
-  uint32_t             mDecompressBufferUsed;
-  uint32_t             mDecompressedBytes;
-  nsAutoArrayPtr<char> mDecompressBuffer;
-
-  // Track the content-length of a request body so that we can
-  // place the fin flag on the last data packet instead of waiting
-  // for a stream closed indication. Relying on stream close results
-  // in an extra 0-length runt packet and seems to have some interop
-  // problems with the google servers. Connect does rely on stream
-  // close by setting this to the max value.
-  int64_t                      mRequestBodyLenRemaining;
-
-  // based on nsISupportsPriority definitions
-  int32_t                      mPriority;
-
-  // mLocalWindow, mRemoteWindow, and mLocalUnacked are for flow control.
-  // *window are signed because they race conditions in asynchronous SETTINGS
-  // messages can force them temporarily negative.
-
-  // LocalWindow is how much data the server will send without getting a
-  //   window update
-  int64_t                      mLocalWindow;
-
-  // RemoteWindow is how much data the client is allowed to send without
-  //   getting a window update
-  int64_t                      mRemoteWindow;
-
-  // LocalUnacked is the number of bytes received by the client but not
-  //   yet reflected in a window update. Sending that update will increment
-  //   LocalWindow
-  uint64_t                     mLocalUnacked;
-
-  // True when sending is suspended becuase the remote flow control window is
-  //   <= 0
-  bool                         mBlockedOnRwin;
-
-  // For Progress Events
-  uint64_t                     mTotalSent;
-  uint64_t                     mTotalRead;
-
-  // For SpdyPush
-  SpdyPushedStream3 *mPushSource;
-
-/// connect tunnels
-public:
-  bool IsTunnel() { return mIsTunnel; }
-private:
-  void ClearTransactionsBlockedOnTunnel();
-  void MapStreamToPlainText();
-  void MapStreamToHttpConnection();
-
-  bool mIsTunnel;
-  bool mPlainTextTunnel;
-};
-
-}} // namespace mozilla::net
-
-#endif // mozilla_net_SpdyStream3_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/viewsource/nsViewSourceChannel.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/viewsource/nsViewSourceChannel.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/viewsource/nsViewSourceChannel.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/viewsource/nsViewSourceChannel.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -608,6 +608,21 @@
 }
 
 NS_IMETHODIMP
+nsViewSourceChannel::GetReferrerPolicy(uint32_t *aReferrerPolicy)
+{
+    return !mHttpChannel ? NS_ERROR_NULL_POINTER :
+        mHttpChannel->GetReferrerPolicy(aReferrerPolicy);
+}
+
+NS_IMETHODIMP
+nsViewSourceChannel::SetReferrerWithPolicy(nsIURI * aReferrer,
+                                           uint32_t aReferrerPolicy)
+{
+    return !mHttpChannel ? NS_ERROR_NULL_POINTER :
+        mHttpChannel->SetReferrerWithPolicy(aReferrer, aReferrerPolicy);
+}
+
+NS_IMETHODIMP
 nsViewSourceChannel::GetRequestHeader(const nsACString & aHeader,
                                       nsACString & aValue)
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/PWyciwygChannel.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/PWyciwygChannel.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/PWyciwygChannel.ipdl	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/PWyciwygChannel.ipdl	2014-11-26 21:46:05.000000000 +0000
@@ -23,6 +23,7 @@
 
   Init(URIParams     uri,
        PrincipalInfo requestingPrincipalInfo,
+       PrincipalInfo triggeringPrincipalInfo,
        uint32_t      securityFlags,
        uint32_t      contentPolicyType);
   AsyncOpen(URIParams             originalURI,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -93,25 +93,31 @@
   SerializeURI(uri, serializedUri);
 
   // propagate loadInfo
-  mozilla::ipc::PrincipalInfo principalInfo;
+  mozilla::ipc::PrincipalInfo requestingPrincipalInfo;
+  mozilla::ipc::PrincipalInfo triggeringPrincipalInfo;
   uint32_t securityFlags;
   uint32_t policyType;
   if (mLoadInfo) {
     mozilla::ipc::PrincipalToPrincipalInfo(mLoadInfo->LoadingPrincipal(),
-                                           &principalInfo);
+                                           &requestingPrincipalInfo);
+    mozilla::ipc::PrincipalToPrincipalInfo(mLoadInfo->TriggeringPrincipal(),
+                                           &triggeringPrincipalInfo);
     securityFlags = mLoadInfo->GetSecurityFlags();
     policyType = mLoadInfo->GetContentPolicyType();
   }
   else {
     // use default values if no loadInfo is provided
     mozilla::ipc::PrincipalToPrincipalInfo(nsContentUtils::GetSystemPrincipal(),
-                                           &principalInfo);
+                                           &requestingPrincipalInfo);
+    mozilla::ipc::PrincipalToPrincipalInfo(nsContentUtils::GetSystemPrincipal(),
+                                           &triggeringPrincipalInfo);
     securityFlags = nsILoadInfo::SEC_NORMAL;
     policyType = nsIContentPolicy::TYPE_OTHER;
   }
 
   SendInit(serializedUri,
-           principalInfo,
+           requestingPrincipalInfo,
+           triggeringPrincipalInfo,
            securityFlags,
            policyType);
   return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -62,6 +62,7 @@
 bool
 WyciwygChannelParent::RecvInit(const URIParams&          aURI,
                                const ipc::PrincipalInfo& aRequestingPrincipalInfo,
+                               const ipc::PrincipalInfo& aTriggeringPrincipalInfo,
                                const uint32_t&           aSecurityFlags,
                                const uint32_t&           aContentPolicyType)
 {
@@ -86,16 +87,23 @@
     return SendCancelEarly(rv);
   }
 
+  nsCOMPtr<nsIPrincipal> triggeringPrincipal =
+    mozilla::ipc::PrincipalInfoToPrincipal(aTriggeringPrincipalInfo, &rv);
+  if (NS_FAILED(rv)) {
+    return SendCancelEarly(rv);
+  }
+
   nsCOMPtr<nsIChannel> chan;
-  rv = NS_NewChannel(getter_AddRefs(chan),
-                     uri,
-                     requestingPrincipal,
-                     aSecurityFlags,
-                     aContentPolicyType,
-                     nullptr,   // loadGroup
-                     nullptr,   // aCallbacks
-                     nsIRequest::LOAD_NORMAL,
-                     ios);
+  rv = NS_NewChannelWithTriggeringPrincipal(getter_AddRefs(chan),
+                                           uri,
+                                           requestingPrincipal,
+                                           triggeringPrincipal,
+                                           aSecurityFlags,
+                                           aContentPolicyType,
+                                           nullptr,   // loadGroup
+                                           nullptr,   // aCallbacks
+                                           nsIRequest::LOAD_NORMAL,
+                                           ios);
 
   if (NS_FAILED(rv))
     return SendCancelEarly(rv);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.h	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/protocol/wyciwyg/WyciwygChannelParent.h	2014-11-26 21:46:05.000000000 +0000
@@ -37,6 +37,7 @@
 
   virtual bool RecvInit(const URIParams&          uri,
                         const ipc::PrincipalInfo& aRequestingPrincipalInfo,
+                        const ipc::PrincipalInfo& aTriggeringPrincipalInfo,
                         const uint32_t&           aSecurityFlags,
                         const uint32_t&           aContentPolicyType) MOZ_OVERRIDE;
   virtual bool RecvAsyncOpen(const URIParams& original,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/socket/nsSOCKSIOLayer.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -57,9 +57,9 @@
         SOCKS_FAILED
     };
 
-    // A buffer of 262 bytes should be enough for any request and response
+    // A buffer of 265 bytes should be enough for any request and response
     // in case of SOCKS4 as well as SOCKS5
-    static const uint32_t BUFFER_SIZE = 262;
+    static const uint32_t BUFFER_SIZE = 265;
     static const uint32_t MAX_HOSTNAME_LEN = 255;
 
 public:
@@ -99,13 +99,6 @@
     PRStatus ReadV5ConnectResponseTop();
     PRStatus ReadV5ConnectResponseBottom();
 
-    void WriteUint8(uint8_t d);
-    void WriteUint16(uint16_t d);
-    void WriteUint32(uint32_t d);
-    void WriteNetAddr(const NetAddr *addr);
-    void WriteNetPort(const NetAddr *addr);
-    void WriteString(const nsACString &str);
-
     uint8_t ReadUint8();
     uint16_t ReadUint16();
     uint32_t ReadUint32();
@@ -167,6 +160,115 @@
     mDestinationAddr.inet.port = htons(0);
 }
 
+/* Helper template class to statically check that writes to a fixed-size
+ * buffer are not going to overflow.
+ *
+ * Example usage:
+ *   uint8_t real_buf[TOTAL_SIZE];
+ *   Buffer<TOTAL_SIZE> buf(&real_buf);
+ *   auto buf2 = buf.WriteUint16(1);
+ *   auto buf3 = buf2.WriteUint8(2);
+ *
+ * It is possible to chain them, to limit the number of (error-prone)
+ * intermediate variables:
+ *   auto buf = Buffer<TOTAL_SIZE>(&real_buf)
+ *              .WriteUint16(1)
+ *              .WriteUint8(2);
+ *
+ * Debug builds assert when intermediate variables are reused:
+ *   Buffer<TOTAL_SIZE> buf(&real_buf);
+ *   auto buf2 = buf.WriteUint16(1);
+ *   auto buf3 = buf.WriteUint8(2); // Asserts
+ *
+ * Strings can be written, given an explicit maximum length.
+ *   buf.WriteString<MAX_STRING_LENGTH>(str);
+ *
+ * The Written() method returns how many bytes have been written so far:
+ *   Buffer<TOTAL_SIZE> buf(&real_buf);
+ *   auto buf2 = buf.WriteUint16(1);
+ *   auto buf3 = buf2.WriteUint8(2);
+ *   buf3.Written(); // returns 3.
+ */
+template <size_t Size>
+class Buffer
+{
+public:
+  Buffer() : mBuf(nullptr), mLength(0) {}
+
+  explicit Buffer(uint8_t* aBuf, size_t aLength=0)
+  : mBuf(aBuf), mLength(aLength) {}
+
+  template <size_t Size2>
+  Buffer(const Buffer<Size2>& aBuf) : mBuf(aBuf.mBuf), mLength(aBuf.mLength) {
+      static_assert(Size2 > Size, "Cannot cast buffer");
+  }
+
+  Buffer<Size - sizeof(uint8_t)> WriteUint8(uint8_t aValue) {
+      return Write(aValue);
+  }
+
+  Buffer<Size - sizeof(uint16_t)> WriteUint16(uint16_t aValue) {
+      return Write(aValue);
+  }
+
+  Buffer<Size - sizeof(uint32_t)> WriteUint32(uint32_t aValue) {
+      return Write(aValue);
+  }
+
+  Buffer<Size - sizeof(uint16_t)> WriteNetPort(const NetAddr* aAddr) {
+      return WriteUint16(aAddr->inet.port);
+  }
+
+  Buffer<Size - sizeof(IPv6Addr)> WriteNetAddr(const NetAddr* aAddr) {
+      if (aAddr->raw.family == AF_INET) {
+          return Write(aAddr->inet.ip);
+      } else if (aAddr->raw.family == AF_INET6) {
+          return Write(aAddr->inet6.ip.u8);
+      }
+      NS_NOTREACHED("Unknown address family");
+      return *this;
+  }
+
+  template <size_t MaxLength>
+  Buffer<Size - MaxLength> WriteString(const nsACString& aStr) {
+      if (aStr.Length() > MaxLength) {
+          return Buffer<Size - MaxLength>(nullptr);
+      }
+      return WritePtr<char, MaxLength>(aStr.Data(), aStr.Length());
+  }
+
+  size_t Written() {
+      MOZ_ASSERT(mBuf);
+      return mLength;
+  }
+
+  operator bool() { return !!mBuf; }
+private:
+  template <size_t Size2>
+  friend class Buffer;
+
+  template <typename T>
+  Buffer<Size - sizeof(T)> Write(T& aValue) {
+      return WritePtr<T, sizeof(T)>(&aValue, sizeof(T));
+  }
+
+  template <typename T, size_t Length>
+  Buffer<Size - Length> WritePtr(const T* aValue, size_t aCopyLength) {
+      static_assert(Size >= Length, "Cannot write that much");
+      MOZ_ASSERT(aCopyLength <= Length);
+      MOZ_ASSERT(mBuf);
+      memcpy(mBuf, aValue, aCopyLength);
+      Buffer<Size - Length> result(mBuf + aCopyLength, mLength + aCopyLength);
+      mBuf = nullptr;
+      mLength = 0;
+      return result;
+  }
+
+  uint8_t* mBuf;
+  size_t mLength;
+};
+
+
 void
 nsSOCKSSocketInfo::Init(int32_t version, int32_t family, const char *proxyHost, int32_t proxyPort, const char *host, uint32_t flags)
 {
@@ -454,33 +556,39 @@
              proxy_resolve? "yes" : "no"));
 
     // Send a SOCKS 4 connect request.
-    WriteUint8(0x04); // version -- 4
-    WriteUint8(0x01); // command -- connect
-    WriteNetPort(addr);
+    auto buf = Buffer<BUFFER_SIZE>(mData)
+               .WriteUint8(0x04) // version -- 4
+               .WriteUint8(0x01) // command -- connect
+               .WriteNetPort(addr);
+
+    // We don't have anything more to write after the if, so we can
+    // use a buffer with no further writes allowed.
+    Buffer<0> buf3;
     if (proxy_resolve) {
         // Add the full name, null-terminated, to the request
         // according to SOCKS 4a. A fake IP address, with the first
         // four bytes set to 0 and the last byte set to something other
         // than 0, is used to notify the proxy that this is a SOCKS 4a
         // request. This request type works for Tor and perhaps others.
-        WriteUint32(htonl(0x00000001)); // Fake IP
-        WriteUint8(0x00); // Send an emtpy username
-        if (mDestinationHost.Length() > MAX_HOSTNAME_LEN) {
+        auto buf2 = buf.WriteUint32(htonl(0x00000001)) // Fake IP
+                       .WriteUint8(0x00) // Send an emtpy username
+                       .WriteString<MAX_HOSTNAME_LEN>(mDestinationHost); // Hostname
+        if (!buf2) {
             LOGERROR(("socks4: destination host name is too long!"));
             HandshakeFinished(PR_BAD_ADDRESS_ERROR);
             return PR_FAILURE;
         }
-        WriteString(mDestinationHost); // Hostname
-        WriteUint8(0x00);
+        buf3 = buf2.WriteUint8(0x00);
     } else if (addr->raw.family == AF_INET) {
-        WriteNetAddr(addr); // Add the IPv4 address
-        WriteUint8(0x00); // Send an emtpy username
-    } else if (addr->raw.family == AF_INET6) {
-        LOGERROR(("socks: SOCKS 4 can't handle IPv6 addresses!"));
+        buf3 = buf.WriteNetAddr(addr) // Add the IPv4 address
+                  .WriteUint8(0x00); // Send an emtpy username
+    } else {
+        LOGERROR(("socks: SOCKS 4 can only handle IPv4 addresses!"));
         HandshakeFinished(PR_BAD_ADDRESS_ERROR);
         return PR_FAILURE;
     }
 
+    mDataLength = buf3.Written();
     return PR_SUCCESS;
 }
 
@@ -521,9 +629,11 @@
 
     // Send an initial SOCKS 5 greeting
     LOGDEBUG(("socks5: sending auth methods"));
-    WriteUint8(0x05); // version -- 5
-    WriteUint8(0x01); // # auth methods -- 1
-    WriteUint8(0x00); // we don't support authentication
+    mDataLength = Buffer<BUFFER_SIZE>(mData)
+                  .WriteUint8(0x05) // version -- 5
+                  .WriteUint8(0x01) // # auth methods -- 1
+                  .WriteUint8(0x00) // we don't support authentication
+                  .Written();
 
     return PR_SUCCESS;
 }
@@ -569,36 +679,41 @@
     mDataLength = 0;
     mState = SOCKS5_WRITE_CONNECT_REQUEST;
 
-    WriteUint8(0x05); // version -- 5
-    WriteUint8(0x01); // command -- connect
-    WriteUint8(0x00); // reserved
+    auto buf = Buffer<BUFFER_SIZE>(mData)
+               .WriteUint8(0x05) // version -- 5
+               .WriteUint8(0x01) // command -- connect
+               .WriteUint8(0x00); // reserved
    
+    // We're writing a net port after the if, so we need a buffer allowing
+    // to write that much.
+    Buffer<sizeof(uint16_t)> buf2;
     // Add the address to the SOCKS 5 request. SOCKS 5 supports several
     // address types, so we pick the one that works best for us.
     if (proxy_resolve) {
         // Add the host name. Only a single byte is used to store the length,
         // so we must prevent long names from being used.
-        if (mDestinationHost.Length() > MAX_HOSTNAME_LEN) {
+        buf2 = buf.WriteUint8(0x03) // addr type -- domainname
+                  .WriteUint8(mDestinationHost.Length()) // name length
+                  .WriteString<MAX_HOSTNAME_LEN>(mDestinationHost); // Hostname
+        if (!buf2) {
             LOGERROR(("socks5: destination host name is too long!"));
             HandshakeFinished(PR_BAD_ADDRESS_ERROR);
             return PR_FAILURE;
         }
-        WriteUint8(0x03); // addr type -- domainname
-        WriteUint8(mDestinationHost.Length()); // name length
-        WriteString(mDestinationHost);
     } else if (addr->raw.family == AF_INET) {
-        WriteUint8(0x01); // addr type -- IPv4
-        WriteNetAddr(addr);
+        buf2 = buf.WriteUint8(0x01) // addr type -- IPv4
+                  .WriteNetAddr(addr);
     } else if (addr->raw.family == AF_INET6) {
-        WriteUint8(0x04); // addr type -- IPv6
-        WriteNetAddr(addr);
+        buf2 = buf.WriteUint8(0x04) // addr type -- IPv6
+                  .WriteNetAddr(addr);
     } else {
         LOGERROR(("socks5: destination address of unknown type!"));
         HandshakeFinished(PR_BAD_ADDRESS_ERROR);
         return PR_FAILURE;
     }
 
-    WriteNetPort(addr); // port
+    auto buf3 = buf2.WriteNetPort(addr); // port
+    mDataLength = buf3.Written();
 
     return PR_SUCCESS;
 }
@@ -852,70 +967,6 @@
     return 0;
 }
 
-inline void
-nsSOCKSSocketInfo::WriteUint8(uint8_t v)
-{
-    NS_ABORT_IF_FALSE(mDataLength + sizeof(v) <= BUFFER_SIZE,
-                      "Can't write that much data!");
-    mData[mDataLength] = v;
-    mDataLength += sizeof(v);
-}
-
-inline void
-nsSOCKSSocketInfo::WriteUint16(uint16_t v)
-{
-    NS_ABORT_IF_FALSE(mDataLength + sizeof(v) <= BUFFER_SIZE,
-                      "Can't write that much data!");
-    memcpy(mData + mDataLength, &v, sizeof(v));
-    mDataLength += sizeof(v);
-}
-
-inline void
-nsSOCKSSocketInfo::WriteUint32(uint32_t v)
-{
-    NS_ABORT_IF_FALSE(mDataLength + sizeof(v) <= BUFFER_SIZE,
-                      "Can't write that much data!");
-    memcpy(mData + mDataLength, &v, sizeof(v));
-    mDataLength += sizeof(v);
-}
-
-void
-nsSOCKSSocketInfo::WriteNetAddr(const NetAddr *addr)
-{
-    const char *ip = nullptr;
-    uint32_t len = 0;
-
-    if (addr->raw.family == AF_INET) {
-        ip = (const char*)&addr->inet.ip;
-        len = sizeof(addr->inet.ip);
-    } else if (addr->raw.family == AF_INET6) {
-        ip = (const char*)addr->inet6.ip.u8;
-        len = sizeof(addr->inet6.ip.u8);
-    }
-
-    NS_ABORT_IF_FALSE(ip != nullptr, "Unknown address");
-    NS_ABORT_IF_FALSE(mDataLength + len <= BUFFER_SIZE,
-                      "Can't write that much data!");
- 
-    memcpy(mData + mDataLength, ip, len);
-    mDataLength += len;
-}
-
-void
-nsSOCKSSocketInfo::WriteNetPort(const NetAddr *addr)
-{
-    WriteUint16(addr->inet.port);
-}
-
-void
-nsSOCKSSocketInfo::WriteString(const nsACString &str)
-{
-    NS_ABORT_IF_FALSE(mDataLength + str.Length() <= BUFFER_SIZE,
-                      "Can't write that much data!");
-    memcpy(mData + mDataLength, str.Data(), str.Length());
-    mDataLength += str.Length();
-}
-
 inline uint8_t
 nsSOCKSSocketInfo::ReadUint8()
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/streamconv/converters/ParseFTPList.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/streamconv/converters/ParseFTPList.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/streamconv/converters/ParseFTPList.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/streamconv/converters/ParseFTPList.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -723,7 +723,7 @@
        * "07-21-00  01:19PM                52275 Name Plate.jpg"
        * "07-14-00  01:38PM              2250540 Valentineoffprank-HiRes.jpg"
       */
-      if ((numtoks >= 4) && toklen[0] == 8 && toklen[1] == 7 && 
+      if ((numtoks >= 4) && (toklen[0] == 8 || toklen[0] == 10) && toklen[1] == 7 && 
           (*tokens[2] == '<' || isdigit(*tokens[2])) )
       {
         p = tokens[0];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/head_cache2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/head_cache2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/head_cache2.js	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/head_cache2.js	2014-11-26 21:46:05.000000000 +0000
@@ -47,6 +47,8 @@
 const DONTFILL =        1 << 13;
 // Used in combination with METAONLY, don't call setValid() on the entry after metadata has been set
 const DONTSETVALID =    1 << 14;
+// Notify before checking the data, useful for proper callback ordering checks
+const NOTIFYBEFOREREAD = 1 << 15;
 
 var log_c2 = true;
 function LOG_C2(o, m)
@@ -237,6 +239,8 @@
       do_check_eq(entry.getMetaDataElement("meto"), this.workingMetadata);
       if (this.behavior & THROWAVAIL)
         this.throwAndNotify(entry);
+      if (this.behavior & NOTIFYBEFOREREAD)
+        this.goon(entry, true);
 
       var wrapper = Cc["@mozilla.org/scriptableinputstream;1"].
                     createInstance(Ci.nsIScriptableInputStream);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_auth_proxy.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_auth_proxy.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_auth_proxy.js	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_auth_proxy.js	2014-11-26 21:46:05.000000000 +0000
@@ -172,6 +172,12 @@
       // If we expect 200, the request should have succeeded
       do_check_eq(this.expectedCode == 200, request.requestSucceeded);
 
+      var cookie = "";
+      try {
+        cookie = request.getRequestHeader("Cookie");
+      } catch (e) { }
+      do_check_eq(cookie, "");
+
     } catch (e) {
       do_throw("Unexpected exception: " + e);
     }
@@ -261,6 +267,25 @@
   do_test_pending();
 }
 
+function test_proxy_407_cookie() {
+  var chan = makeChan();
+  chan.notificationCallbacks = new Requestor(FLAG_RETURN_FALSE, 0);
+  chan.setRequestHeader("X-Set-407-Cookie", "1", false);
+  listener.expectedCode = 407; // Proxy Unauthorized
+  chan.asyncOpen(listener, null);
+
+  do_test_pending();
+}
+
+function test_proxy_200_cookie() {
+  var chan = makeChan();
+  chan.notificationCallbacks = new Requestor(0, 0);
+  chan.setRequestHeader("X-Set-407-Cookie", "1", false);
+  listener.expectedCode = 200; // OK
+  chan.asyncOpen(listener, null);
+  do_test_pending();
+}
+
 function test_host_returnfalse() {
   dump("\ntest: host returnfalse\n");
   var chan = makeChan();
@@ -301,6 +326,7 @@
 }
 
 var tests = [test_proxy_returnfalse, test_proxy_wrongpw, test_all_ok,
+        test_proxy_407_cookie, test_proxy_200_cookie,
         test_host_returnfalse, test_host_wrongpw,
         test_proxy_wrongpw_host_wrongpw, test_proxy_wrongpw_host_returnfalse];
 
@@ -331,6 +357,9 @@
           "Unauthorized by HTTP proxy");
       response.setHeader("Proxy-Authenticate",
           'Basic realm="' + realm + '"', false);
+      if (metadata.hasHeader("X-Set-407-Cookie")) {
+          response.setHeader("Set-Cookie", "chewy", false);
+      }
       body = "failed";
       response.bodyOutputStream.write(body, body.length);
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_cache2-14b-concurent-readers-complete.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_cache2-14b-concurent-readers-complete.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_cache2-14b-concurent-readers-complete.js	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_cache2-14b-concurent-readers-complete.js	2014-11-26 21:46:05.000000000 +0000
@@ -14,24 +14,33 @@
   var order = 0;
 
   asyncOpenCacheEntry("http://x/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null,
-    new OpenCallback(NORMAL|COMPLETE, "x1m", "x1d", function(entry) {
-      ++order;
-      do_check_eq(order, newCacheBackEndUsed() ? 3 : 1);
-      mc.fired();
+    new OpenCallback(NORMAL|COMPLETE|NOTIFYBEFOREREAD, "x1m", "x1d", function(entry, beforeReading) {
+      if (beforeReading) {
+        ++order;
+        do_check_eq(order, newCacheBackEndUsed() ? 3 : 1);
+      } else {
+        mc.fired();
+      }
     })
   );
   asyncOpenCacheEntry("http://x/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null,
-    new OpenCallback(NORMAL, "x1m", "x1d", function(entry) {
-      ++order;
-      do_check_eq(order, newCacheBackEndUsed() ? 1 : 2);
-      mc.fired();
+    new OpenCallback(NORMAL|NOTIFYBEFOREREAD, "x1m", "x1d", function(entry, beforeReading) {
+      if (beforeReading) {
+        ++order;
+        do_check_eq(order, newCacheBackEndUsed() ? 1 : 2);
+      } else {
+        mc.fired();
+      }
     })
   );
   asyncOpenCacheEntry("http://x/", "disk", Ci.nsICacheStorage.OPEN_NORMALLY, null,
-    new OpenCallback(NORMAL, "x1m", "x1d", function(entry) {
-      ++order;
-      do_check_eq(order, newCacheBackEndUsed() ? 2 : 3);
-      mc.fired();
+    new OpenCallback(NORMAL|NOTIFYBEFOREREAD, "x1m", "x1d", function(entry, beforeReading) {
+      if (beforeReading) {
+        ++order;
+        do_check_eq(order, newCacheBackEndUsed() ? 2 : 3);
+      } else {
+        mc.fired();
+      }
     })
   );
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_http2.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_http2.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_http2.js	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_http2.js	2014-11-26 21:46:05.000000000 +0000
@@ -610,7 +610,7 @@
 
 function resetPrefs() {
   prefs.setBoolPref("network.http.spdy.enabled", spdypref);
-  prefs.setBoolPref("network.http.spdy.enabled.v3", spdy3pref);
+  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.enforce-tls-profile", tlspref);
@@ -634,7 +634,7 @@
 
   // Enable all versions of spdy to see that we auto negotiate http/2
   spdypref = prefs.getBoolPref("network.http.spdy.enabled");
-  spdy3pref = prefs.getBoolPref("network.http.spdy.enabled.v3");
+  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");
   tlspref = prefs.getBoolPref("network.http.spdy.enforce-tls-profile");
@@ -642,7 +642,7 @@
   altsvcpref2 = prefs.getBoolPref("network.http.altsvc.oe", true);
 
   prefs.setBoolPref("network.http.spdy.enabled", true);
-  prefs.setBoolPref("network.http.spdy.enabled.v3", true);
+  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.enforce-tls-profile", false);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_spdy.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_spdy.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/netwerk/test/unit/test_spdy.js	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/netwerk/test/unit/test_spdy.js	2014-11-26 21:46:05.000000000 +0000
@@ -1,4 +1,4 @@
-// test spdy/3
+// test spdy/3.1
 
 var Ci = Components.interfaces;
 var Cc = Components.classes;
@@ -25,7 +25,7 @@
 
 function checkIsSpdy(request) {
   try {
-    if (request.getResponseHeader("X-Firefox-Spdy") == "3") {
+    if (request.getResponseHeader("X-Firefox-Spdy") == "3.1") {
       if (request.getResponseHeader("X-Connection-Spdy") == "yes") {
         return true;
       }
@@ -392,7 +392,7 @@
 
 function resetPrefs() {
   prefs.setBoolPref("network.http.spdy.enabled", spdypref);
-  prefs.setBoolPref("network.http.spdy.enabled.v3", spdy3pref);
+  prefs.setBoolPref("network.http.spdy.enabled.v3-1", spdy3pref);
   prefs.setBoolPref("network.http.spdy.allow-push", spdypush);
 }
 
@@ -410,12 +410,12 @@
 
   prefs.setIntPref("network.http.speculative-parallel-limit", oldPref);
 
-  // Enable all versions of spdy to see that we auto negotiate spdy/3
+  // Enable all versions of spdy to see that we auto negotiate spdy/3.1
   spdypref = prefs.getBoolPref("network.http.spdy.enabled");
-  spdy3pref = prefs.getBoolPref("network.http.spdy.enabled.v3");
+  spdy3pref = prefs.getBoolPref("network.http.spdy.enabled.v3-1");
   spdypush = prefs.getBoolPref("network.http.spdy.allow-push");
   prefs.setBoolPref("network.http.spdy.enabled", true);
-  prefs.setBoolPref("network.http.spdy.enabled.v3", true);
+  prefs.setBoolPref("network.http.spdy.enabled.v3-1", true);
   prefs.setBoolPref("network.http.spdy.allow-push", true);
 
   loadGroup = Cc["@mozilla.org/network/load-group;1"].createInstance(Ci.nsILoadGroup);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5SpeculativeLoad.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5SpeculativeLoad.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5SpeculativeLoad.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5SpeculativeLoad.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -27,6 +27,9 @@
     case eSpeculativeLoadBase:
       aExecutor->SetSpeculationBase(mUrl);
       break;
+    case eSpeculativeLoadMetaReferrer:
+      aExecutor->SetSpeculationReferrerPolicy(mMetaReferrerPolicy);
+      break;
     case eSpeculativeLoadImage:
       aExecutor->PreloadImage(mUrl, mCrossOrigin);
       break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5SpeculativeLoad.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5SpeculativeLoad.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5SpeculativeLoad.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5SpeculativeLoad.h	2014-11-26 21:46:06.000000000 +0000
@@ -6,6 +6,7 @@
 #define nsHtml5SpeculativeLoad_h
 
 #include "nsString.h"
+#include "nsContentUtils.h"
 
 class nsHtml5TreeOpExecutor;
 
@@ -14,6 +15,7 @@
   eSpeculativeLoadUninitialized,
 #endif
   eSpeculativeLoadBase,
+  eSpeculativeLoadMetaReferrer,
   eSpeculativeLoadImage,
   eSpeculativeLoadScript,
   eSpeculativeLoadScriptFromHead,
@@ -35,6 +37,14 @@
       mUrl.Assign(aUrl);
     }
 
+    inline void InitMetaReferrerPolicy(const nsAString& aReferrerPolicy) {
+      NS_PRECONDITION(mOpCode == eSpeculativeLoadUninitialized,
+                      "Trying to reinitialize a speculative load!");
+      mOpCode = eSpeculativeLoadMetaReferrer;
+      mMetaReferrerPolicy.Assign(
+        nsContentUtils::TrimWhitespace<nsContentUtils::IsHTMLWhitespace>(aReferrerPolicy));
+    }
+
     inline void InitImage(const nsAString& aUrl,
                           const nsAString& aCrossOrigin)
     {
@@ -116,6 +126,7 @@
   private:
     eHtml5SpeculativeLoad mOpCode;
     nsString mUrl;
+    nsString mMetaReferrerPolicy;
     /**
      * If mOpCode is eSpeculativeLoadStyle or eSpeculativeLoadScript[FromHead]
      * then this is the value of the "charset" attribute. For
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5TreeBuilderCppSupplement.h	2014-11-26 21:46:06.000000000 +0000
@@ -189,6 +189,15 @@
           if (url) {
             mSpeculativeLoadQueue.AppendElement()->InitBase(*url);
           }
+        } else if (nsHtml5Atoms::meta == aName) {
+          if (nsHtml5Portability::lowerCaseLiteralEqualsIgnoreAsciiCaseString(
+                      "referrer",
+                      aAttributes->getValue(nsHtml5AttributeName::ATTR_NAME))) {
+            nsString* referrerPolicy = aAttributes->getValue(nsHtml5AttributeName::ATTR_CONTENT);
+            if (referrerPolicy) {
+              mSpeculativeLoadQueue.AppendElement()->InitMetaReferrerPolicy(*referrerPolicy);
+            }
+          }
         }
         break;
       case kNameSpaceID_SVG:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5TreeOpExecutor.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5TreeOpExecutor.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5TreeOpExecutor.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5TreeOpExecutor.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -63,6 +63,8 @@
 nsHtml5TreeOpExecutor::nsHtml5TreeOpExecutor()
   : nsHtml5DocumentBuilder(false)
   , mPreloadedURLs(23)  // Mean # of preloadable resources per page on dmoz
+  , mSpeculationReferrerPolicyWasSet(false)
+  , mSpeculationReferrerPolicy(mozilla::net::RP_Default)
 {
   // zeroing operator new for everything else
 }
@@ -903,7 +905,8 @@
     return;
   }
   mDocument->ScriptLoader()->PreloadURI(uri, aCharset, aType, aCrossOrigin,
-                                        aScriptFromHead);
+                                        aScriptFromHead,
+                                        mSpeculationReferrerPolicy);
 }
 
 void
@@ -915,7 +918,8 @@
   if (!uri) {
     return;
   }
-  mDocument->PreloadStyle(uri, aCharset, aCrossOrigin);
+  mDocument->PreloadStyle(uri, aCharset, aCrossOrigin,
+                          mSpeculationReferrerPolicy);
 }
 
 void
@@ -926,7 +930,7 @@
   if (!uri) {
     return;
   }
-  mDocument->MaybePreLoadImage(uri, aCrossOrigin);
+  mDocument->MaybePreLoadImage(uri, aCrossOrigin, mSpeculationReferrerPolicy);
 }
 
 void
@@ -952,6 +956,27 @@
   NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Failed to create a URI");
 }
 
+void
+nsHtml5TreeOpExecutor::SetSpeculationReferrerPolicy(const nsAString& aReferrerPolicy)
+{
+  ReferrerPolicy policy = mozilla::net::ReferrerPolicyFromString(aReferrerPolicy);
+
+  if (mSpeculationReferrerPolicyWasSet &&
+      policy != mSpeculationReferrerPolicy) {
+    // According to the Referrer Policy spec, if there's already been a policy
+    // set and another attempt is made to set a _different_ policy, the result
+    // is a "No Referrer" policy.
+    mSpeculationReferrerPolicy = mozilla::net::RP_No_Referrer;
+  }
+  else {
+    // Record "speculated" referrer policy locally and thread through the
+    // speculation phase.  The actual referrer policy will be set by
+    // HTMLMetaElement::BindToTree().
+    mSpeculationReferrerPolicyWasSet = true;
+    mSpeculationReferrerPolicy = policy;
+  }
+}
+
 #ifdef DEBUG_NS_HTML5_TREE_OP_EXECUTOR_FLUSH
 uint32_t nsHtml5TreeOpExecutor::sAppendBatchMaxSize = 0;
 uint32_t nsHtml5TreeOpExecutor::sAppendBatchSlotsExamined = 0;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5TreeOpExecutor.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5TreeOpExecutor.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/parser/html/nsHtml5TreeOpExecutor.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/parser/html/nsHtml5TreeOpExecutor.h	2014-11-26 21:46:06.000000000 +0000
@@ -22,6 +22,7 @@
 #include "nsHashKeys.h"
 #include "mozilla/LinkedList.h"
 #include "nsHtml5DocumentBuilder.h"
+#include "mozilla/net/ReferrerPolicy.h"
 
 class nsHtml5Parser;
 class nsHtml5TreeBuilder;
@@ -36,6 +37,7 @@
                                         public mozilla::LinkedListElement<nsHtml5TreeOpExecutor>
 {
   friend class nsHtml5FlushLoopGuard;
+  typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
 
   public:
     NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
@@ -67,6 +69,12 @@
 
     nsCOMPtr<nsIURI> mSpeculationBaseURI;
 
+    /**
+     * Need to keep track of whether the referrer policy was already set.
+     */
+    bool             mSpeculationReferrerPolicyWasSet;
+    ReferrerPolicy   mSpeculationReferrerPolicy;
+
     nsCOMPtr<nsIURI> mViewSourceBaseURI;
 
     /**
@@ -257,6 +265,8 @@
     void PreloadImage(const nsAString& aURL, const nsAString& aCrossOrigin);
 
     void SetSpeculationBase(const nsAString& aURL);
+
+    void SetSpeculationReferrerPolicy(const nsAString& aReferrerPolicy);
     
     void AddBase(const nsAString& aURL);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/bitstring.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/bitstring.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/bitstring.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/bitstring.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,4234 @@
+#!/usr/bin/env python
+# cython: profile=True
+"""
+This package defines classes that simplify bit-wise creation, manipulation and
+interpretation of data.
+
+Classes:
+
+Bits -- An immutable container for binary data.
+BitArray -- A mutable container for binary data.
+ConstBitStream -- An immutable container with streaming methods.
+BitStream -- A mutable container with streaming methods.
+
+                      Bits (base class)
+                     /    \
+ + mutating methods /      \ + streaming methods
+                   /        \
+              BitArray   ConstBitStream
+                   \        /
+                    \      /
+                     \    /
+                    BitStream
+
+Functions:
+
+pack -- Create a BitStream from a format string.
+
+Exceptions:
+
+Error -- Module exception base class.
+CreationError -- Error during creation.
+InterpretError -- Inappropriate interpretation of binary data.
+ByteAlignError -- Whole byte position or length needed.
+ReadError -- Reading or peeking past the end of a bitstring.
+
+http://python-bitstring.googlecode.com
+"""
+
+__licence__ = """
+The MIT License
+
+Copyright (c) 2006-2014 Scott Griffiths (scott@griffiths.name)
+
+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.
+"""
+
+__version__ = "3.1.3"
+
+__author__ = "Scott Griffiths"
+
+import numbers
+import copy
+import sys
+import re
+import binascii
+import mmap
+import os
+import struct
+import operator
+import collections
+
+byteorder = sys.byteorder
+
+bytealigned = False
+"""Determines whether a number of methods default to working only on byte boundaries."""
+
+# Maximum number of digits to use in __str__ and __repr__.
+MAX_CHARS = 250
+
+# Maximum size of caches used for speed optimisations.
+CACHE_SIZE = 1000
+
+class Error(Exception):
+    """Base class for errors in the bitstring module."""
+
+    def __init__(self, *params):
+        self.msg = params[0] if params else ''
+        self.params = params[1:]
+
+    def __str__(self):
+        if self.params:
+            return self.msg.format(*self.params)
+        return self.msg
+
+
+class ReadError(Error, IndexError):
+    """Reading or peeking past the end of a bitstring."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class InterpretError(Error, ValueError):
+    """Inappropriate interpretation of binary data."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class ByteAlignError(Error):
+    """Whole-byte position or length needed."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class CreationError(Error, ValueError):
+    """Inappropriate argument during bitstring creation."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class ConstByteStore(object):
+    """Stores raw bytes together with a bit offset and length.
+
+    Used internally - not part of public interface.
+    """
+
+    __slots__ = ('offset', '_rawarray', 'bitlength')
+
+    def __init__(self, data, bitlength=None, offset=None):
+        """data is either a bytearray or a MmapByteArray"""
+        self._rawarray = data
+        if offset is None:
+            offset = 0
+        if bitlength is None:
+            bitlength = 8 * len(data) - offset
+        self.offset = offset
+        self.bitlength = bitlength
+
+    def getbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        return bool(self._rawarray[byte] & (128 >> bit))
+
+    def getbyte(self, pos):
+        """Direct access to byte data."""
+        return self._rawarray[pos]
+
+    def getbyteslice(self, start, end):
+        """Direct access to byte data."""
+        c = self._rawarray[start:end]
+        return c
+
+    @property
+    def bytelength(self):
+        if not self.bitlength:
+            return 0
+        sb = self.offset // 8
+        eb = (self.offset + self.bitlength - 1) // 8
+        return eb - sb + 1
+
+    def __copy__(self):
+        return ByteStore(self._rawarray[:], self.bitlength, self.offset)
+
+    def _appendstore(self, store):
+        """Join another store on to the end of this one."""
+        if not store.bitlength:
+            return
+        # Set new array offset to the number of bits in the final byte of current array.
+        store = offsetcopy(store, (self.offset + self.bitlength) % 8)
+        if store.offset:
+            # first do the byte with the join.
+            joinval = (self._rawarray.pop() & (255 ^ (255 >> store.offset)) |
+                       (store.getbyte(0) & (255 >> store.offset)))
+            self._rawarray.append(joinval)
+            self._rawarray.extend(store._rawarray[1:])
+        else:
+            self._rawarray.extend(store._rawarray)
+        self.bitlength += store.bitlength
+
+    def _prependstore(self, store):
+        """Join another store on to the start of this one."""
+        if not store.bitlength:
+            return
+            # Set the offset of copy of store so that it's final byte
+        # ends in a position that matches the offset of self,
+        # then join self on to the end of it.
+        store = offsetcopy(store, (self.offset - store.bitlength) % 8)
+        assert (store.offset + store.bitlength) % 8 == self.offset % 8
+        bit_offset = self.offset % 8
+        if bit_offset:
+            # first do the byte with the join.
+            store.setbyte(-1, (store.getbyte(-1) & (255 ^ (255 >> bit_offset)) | \
+                               (self._rawarray[self.byteoffset] & (255 >> bit_offset))))
+            store._rawarray.extend(self._rawarray[self.byteoffset + 1: self.byteoffset + self.bytelength])
+        else:
+            store._rawarray.extend(self._rawarray[self.byteoffset: self.byteoffset + self.bytelength])
+        self._rawarray = store._rawarray
+        self.offset = store.offset
+        self.bitlength += store.bitlength
+
+    @property
+    def byteoffset(self):
+        return self.offset // 8
+
+    @property
+    def rawbytes(self):
+        return self._rawarray
+
+
+class ByteStore(ConstByteStore):
+    """Adding mutating methods to ConstByteStore
+
+    Used internally - not part of public interface.
+    """
+    __slots__ = ()
+
+    def setbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        self._rawarray[byte] |= (128 >> bit)
+
+    def unsetbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        self._rawarray[byte] &= ~(128 >> bit)
+
+    def invertbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        self._rawarray[byte] ^= (128 >> bit)
+
+    def setbyte(self, pos, value):
+        self._rawarray[pos] = value
+
+    def setbyteslice(self, start, end, value):
+        self._rawarray[start:end] = value
+
+
+def offsetcopy(s, newoffset):
+    """Return a copy of a ByteStore with the newoffset.
+
+    Not part of public interface.
+    """
+    assert 0 <= newoffset < 8
+    if not s.bitlength:
+        return copy.copy(s)
+    else:
+        if newoffset == s.offset % 8:
+            return ByteStore(s.getbyteslice(s.byteoffset, s.byteoffset + s.bytelength), s.bitlength, newoffset)
+        newdata = []
+        d = s._rawarray
+        assert newoffset != s.offset % 8
+        if newoffset < s.offset % 8:
+            # We need to shift everything left
+            shiftleft = s.offset % 8 - newoffset
+            # First deal with everything except for the final byte
+            for x in range(s.byteoffset, s.byteoffset + s.bytelength - 1):
+                newdata.append(((d[x] << shiftleft) & 0xff) +\
+                               (d[x + 1] >> (8 - shiftleft)))
+            bits_in_last_byte = (s.offset + s.bitlength) % 8
+            if not bits_in_last_byte:
+                bits_in_last_byte = 8
+            if bits_in_last_byte > shiftleft:
+                newdata.append((d[s.byteoffset + s.bytelength - 1] << shiftleft) & 0xff)
+        else: # newoffset > s._offset % 8
+            shiftright = newoffset - s.offset % 8
+            newdata.append(s.getbyte(0) >> shiftright)
+            for x in range(s.byteoffset + 1, s.byteoffset + s.bytelength):
+                newdata.append(((d[x - 1] << (8 - shiftright)) & 0xff) +\
+                               (d[x] >> shiftright))
+            bits_in_last_byte = (s.offset + s.bitlength) % 8
+            if not bits_in_last_byte:
+                bits_in_last_byte = 8
+            if bits_in_last_byte + shiftright > 8:
+                newdata.append((d[s.byteoffset + s.bytelength - 1] << (8 - shiftright)) & 0xff)
+        new_s = ByteStore(bytearray(newdata), s.bitlength, newoffset)
+        assert new_s.offset == newoffset
+        return new_s
+
+
+def equal(a, b):
+    """Return True if ByteStores a == b.
+
+    Not part of public interface.
+    """
+    # We want to return False for inequality as soon as possible, which
+    # means we get lots of special cases.
+    # First the easy one - compare lengths:
+    a_bitlength = a.bitlength
+    b_bitlength = b.bitlength
+    if a_bitlength != b_bitlength:
+        return False
+    if not a_bitlength:
+        assert b_bitlength == 0
+        return True
+    # Make 'a' the one with the smaller offset
+    if (a.offset % 8) > (b.offset % 8):
+        a, b = b, a
+    # and create some aliases
+    a_bitoff = a.offset % 8
+    b_bitoff = b.offset % 8
+    a_byteoffset = a.byteoffset
+    b_byteoffset = b.byteoffset
+    a_bytelength = a.bytelength
+    b_bytelength = b.bytelength
+    da = a._rawarray
+    db = b._rawarray
+
+    # If they are pointing to the same data, they must be equal
+    if da is db and a.offset == b.offset:
+        return True
+
+    if a_bitoff == b_bitoff:
+        bits_spare_in_last_byte = 8 - (a_bitoff + a_bitlength) % 8
+        if bits_spare_in_last_byte == 8:
+            bits_spare_in_last_byte = 0
+        # Special case for a, b contained in a single byte
+        if a_bytelength == 1:
+            a_val = ((da[a_byteoffset] << a_bitoff) & 0xff) >> (8 - a_bitlength)
+            b_val = ((db[b_byteoffset] << b_bitoff) & 0xff) >> (8 - b_bitlength)
+            return a_val == b_val
+        # Otherwise check first byte
+        if da[a_byteoffset] & (0xff >> a_bitoff) != db[b_byteoffset] & (0xff >> b_bitoff):
+            return False
+        # then everything up to the last
+        b_a_offset = b_byteoffset - a_byteoffset
+        for x in range(1 + a_byteoffset, a_byteoffset + a_bytelength - 1):
+            if da[x] != db[b_a_offset + x]:
+                return False
+        # and finally the last byte
+        return (da[a_byteoffset + a_bytelength - 1] >> bits_spare_in_last_byte ==
+                db[b_byteoffset + b_bytelength - 1] >> bits_spare_in_last_byte)
+
+    assert a_bitoff != b_bitoff
+    # This is how much we need to shift a to the right to compare with b:
+    shift = b_bitoff - a_bitoff
+    # Special case for b only one byte long
+    if b_bytelength == 1:
+        assert a_bytelength == 1
+        a_val = ((da[a_byteoffset] << a_bitoff) & 0xff) >> (8 - a_bitlength)
+        b_val = ((db[b_byteoffset] << b_bitoff) & 0xff) >> (8 - b_bitlength)
+        return a_val == b_val
+    # Special case for a only one byte long
+    if a_bytelength == 1:
+        assert b_bytelength == 2
+        a_val = ((da[a_byteoffset] << a_bitoff) & 0xff) >> (8 - a_bitlength)
+        b_val = ((db[b_byteoffset] << 8) + db[b_byteoffset + 1]) << b_bitoff
+        b_val &= 0xffff
+        b_val >>= 16 - b_bitlength
+        return a_val == b_val
+
+    # Compare first byte of b with bits from first byte of a
+    if (da[a_byteoffset] & (0xff >> a_bitoff)) >> shift != db[b_byteoffset] & (0xff >> b_bitoff):
+        return False
+    # Now compare every full byte of b with bits from 2 bytes of a
+    for x in range(1, b_bytelength - 1):
+        # Construct byte from 2 bytes in a to compare to byte in b
+        b_val = db[b_byteoffset + x]
+        a_val = ((da[a_byteoffset + x - 1] << 8) + da[a_byteoffset + x]) >> shift
+        a_val &= 0xff
+        if a_val != b_val:
+            return False
+
+    # Now check bits in final byte of b
+    final_b_bits = (b.offset + b_bitlength) % 8
+    if not final_b_bits:
+        final_b_bits = 8
+    b_val = db[b_byteoffset + b_bytelength - 1] >> (8 - final_b_bits)
+    final_a_bits = (a.offset + a_bitlength) % 8
+    if not final_a_bits:
+        final_a_bits = 8
+    if b.bytelength > a_bytelength:
+        assert b_bytelength == a_bytelength + 1
+        a_val = da[a_byteoffset + a_bytelength - 1] >> (8 - final_a_bits)
+        a_val &= 0xff >> (8 - final_b_bits)
+        return a_val == b_val
+    assert a_bytelength == b_bytelength
+    a_val = da[a_byteoffset + a_bytelength - 2] << 8
+    a_val += da[a_byteoffset + a_bytelength - 1]
+    a_val >>= (8 - final_a_bits)
+    a_val &= 0xff >> (8 - final_b_bits)
+    return a_val == b_val
+
+
+class MmapByteArray(object):
+    """Looks like a bytearray, but from an mmap.
+
+    Not part of public interface.
+    """
+
+    __slots__ = ('filemap', 'filelength', 'source', 'byteoffset', 'bytelength')
+
+    def __init__(self, source, bytelength=None, byteoffset=None):
+        self.source = source
+        source.seek(0, os.SEEK_END)
+        self.filelength = source.tell()
+        if byteoffset is None:
+            byteoffset = 0
+        if bytelength is None:
+            bytelength = self.filelength - byteoffset
+        self.byteoffset = byteoffset
+        self.bytelength = bytelength
+        self.filemap = mmap.mmap(source.fileno(), 0, access=mmap.ACCESS_READ)
+
+    def __getitem__(self, key):
+        try:
+            start = key.start
+            stop = key.stop
+        except AttributeError:
+            try:
+                assert 0 <= key < self.bytelength
+                return ord(self.filemap[key + self.byteoffset])
+            except TypeError:
+                # for Python 3
+                return self.filemap[key + self.byteoffset]
+        else:
+            if start is None:
+                start = 0
+            if stop is None:
+                stop = self.bytelength
+            assert key.step is None
+            assert 0 <= start < self.bytelength
+            assert 0 <= stop <= self.bytelength
+            s = slice(start + self.byteoffset, stop + self.byteoffset)
+            return bytearray(self.filemap.__getitem__(s))
+
+    def __len__(self):
+        return self.bytelength
+
+
+# This creates a dictionary for every possible byte with the value being
+# the key with its bits reversed.
+BYTE_REVERSAL_DICT = dict()
+
+# For Python 2.x/ 3.x coexistence
+# Yes this is very very hacky.
+try:
+    xrange
+    for i in range(256):
+        BYTE_REVERSAL_DICT[i] = chr(int("{0:08b}".format(i)[::-1], 2))
+except NameError:
+    for i in range(256):
+        BYTE_REVERSAL_DICT[i] = bytes([int("{0:08b}".format(i)[::-1], 2)])
+    from io import IOBase as file
+    xrange = range
+    basestring = str
+
+# Python 2.x octals start with '0', in Python 3 it's '0o'
+LEADING_OCT_CHARS = len(oct(1)) - 1
+
+def tidy_input_string(s):
+    """Return string made lowercase and with all whitespace removed."""
+    s = ''.join(s.split()).lower()
+    return s
+
+INIT_NAMES = ('uint', 'int', 'ue', 'se', 'sie', 'uie', 'hex', 'oct', 'bin', 'bits',
+              'uintbe', 'intbe', 'uintle', 'intle', 'uintne', 'intne',
+              'float', 'floatbe', 'floatle', 'floatne', 'bytes', 'bool', 'pad')
+
+TOKEN_RE = re.compile(r'(?P<name>' + '|'.join(INIT_NAMES) +
+                      r')((:(?P<len>[^=]+)))?(=(?P<value>.*))?$', re.IGNORECASE)
+DEFAULT_UINT = re.compile(r'(?P<len>[^=]+)?(=(?P<value>.*))?$', re.IGNORECASE)
+
+MULTIPLICATIVE_RE = re.compile(r'(?P<factor>.*)\*(?P<token>.+)')
+
+# Hex, oct or binary literals
+LITERAL_RE = re.compile(r'(?P<name>0(x|o|b))(?P<value>.+)', re.IGNORECASE)
+
+# An endianness indicator followed by one or more struct.pack codes
+STRUCT_PACK_RE = re.compile(r'(?P<endian><|>|@)?(?P<fmt>(?:\d*[bBhHlLqQfd])+)$')
+
+# A number followed by a single character struct.pack code
+STRUCT_SPLIT_RE = re.compile(r'\d*[bBhHlLqQfd]')
+
+# These replicate the struct.pack codes
+# Big-endian
+REPLACEMENTS_BE = {'b': 'intbe:8', 'B': 'uintbe:8',
+                   'h': 'intbe:16', 'H': 'uintbe:16',
+                   'l': 'intbe:32', 'L': 'uintbe:32',
+                   'q': 'intbe:64', 'Q': 'uintbe:64',
+                   'f': 'floatbe:32', 'd': 'floatbe:64'}
+# Little-endian
+REPLACEMENTS_LE = {'b': 'intle:8', 'B': 'uintle:8',
+                   'h': 'intle:16', 'H': 'uintle:16',
+                   'l': 'intle:32', 'L': 'uintle:32',
+                   'q': 'intle:64', 'Q': 'uintle:64',
+                   'f': 'floatle:32', 'd': 'floatle:64'}
+
+# Size in bytes of all the pack codes.
+PACK_CODE_SIZE = {'b': 1, 'B': 1, 'h': 2, 'H': 2, 'l': 4, 'L': 4,
+                  'q': 8, 'Q': 8, 'f': 4, 'd': 8}
+
+_tokenname_to_initialiser = {'hex': 'hex', '0x': 'hex', '0X': 'hex', 'oct': 'oct',
+                             '0o': 'oct', '0O': 'oct', 'bin': 'bin', '0b': 'bin',
+                             '0B': 'bin', 'bits': 'auto', 'bytes': 'bytes', 'pad': 'pad'}
+
+def structparser(token):
+    """Parse struct-like format string token into sub-token list."""
+    m = STRUCT_PACK_RE.match(token)
+    if not m:
+        return [token]
+    else:
+        endian = m.group('endian')
+        if endian is None:
+            return [token]
+        # Split the format string into a list of 'q', '4h' etc.
+        formatlist = re.findall(STRUCT_SPLIT_RE, m.group('fmt'))
+        # Now deal with mulitiplicative factors, 4h -> hhhh etc.
+        fmt = ''.join([f[-1] * int(f[:-1]) if len(f) != 1 else
+                       f for f in formatlist])
+        if endian == '@':
+            # Native endianness
+            if byteorder == 'little':
+                endian = '<'
+            else:
+                assert byteorder == 'big'
+                endian = '>'
+        if endian == '<':
+            tokens = [REPLACEMENTS_LE[c] for c in fmt]
+        else:
+            assert endian == '>'
+            tokens = [REPLACEMENTS_BE[c] for c in fmt]
+    return tokens
+
+def tokenparser(fmt, keys=None, token_cache={}):
+    """Divide the format string into tokens and parse them.
+
+    Return stretchy token and list of [initialiser, length, value]
+    initialiser is one of: hex, oct, bin, uint, int, se, ue, 0x, 0o, 0b etc.
+    length is None if not known, as is value.
+
+    If the token is in the keyword dictionary (keys) then it counts as a
+    special case and isn't messed with.
+
+    tokens must be of the form: [factor*][initialiser][:][length][=value]
+
+    """
+    try:
+        return token_cache[(fmt, keys)]
+    except KeyError:
+        token_key = (fmt, keys)
+    # Very inefficient expanding of brackets.
+    fmt = expand_brackets(fmt)
+    # Split tokens by ',' and remove whitespace
+    # The meta_tokens can either be ordinary single tokens or multiple
+    # struct-format token strings.
+    meta_tokens = (''.join(f.split()) for f in fmt.split(','))
+    return_values = []
+    stretchy_token = False
+    for meta_token in meta_tokens:
+        # See if it has a multiplicative factor
+        m = MULTIPLICATIVE_RE.match(meta_token)
+        if not m:
+            factor = 1
+        else:
+            factor = int(m.group('factor'))
+            meta_token = m.group('token')
+        # See if it's a struct-like format
+        tokens = structparser(meta_token)
+        ret_vals = []
+        for token in tokens:
+            if keys and token in keys:
+                # Don't bother parsing it, it's a keyword argument
+                ret_vals.append([token, None, None])
+                continue
+            value = length = None
+            if token == '':
+                continue
+            # Match literal tokens of the form 0x... 0o... and 0b...
+            m = LITERAL_RE.match(token)
+            if m:
+                name = m.group('name')
+                value = m.group('value')
+                ret_vals.append([name, length, value])
+                continue
+            # Match everything else:
+            m1 = TOKEN_RE.match(token)
+            if not m1:
+                # and if you don't specify a 'name' then the default is 'uint':
+                m2 = DEFAULT_UINT.match(token)
+                if not m2:
+                    raise ValueError("Don't understand token '{0}'.".format(token))
+            if m1:
+                name = m1.group('name')
+                length = m1.group('len')
+                if m1.group('value'):
+                    value = m1.group('value')
+            else:
+                assert m2
+                name = 'uint'
+                length = m2.group('len')
+                if m2.group('value'):
+                    value = m2.group('value')
+            if name == 'bool':
+                if length is not None:
+                    raise ValueError("You can't specify a length with bool tokens - they are always one bit.")
+                length = 1
+            if length is None and name not in ('se', 'ue', 'sie', 'uie'):
+                stretchy_token = True
+            if length is not None:
+                # Try converting length to int, otherwise check it's a key.
+                try:
+                    length = int(length)
+                    if length < 0:
+                        raise Error
+                    # For the 'bytes' token convert length to bits.
+                    if name == 'bytes':
+                        length *= 8
+                except Error:
+                    raise ValueError("Can't read a token with a negative length.")
+                except ValueError:
+                    if not keys or length not in keys:
+                        raise ValueError("Don't understand length '{0}' of token.".format(length))
+            ret_vals.append([name, length, value])
+        # This multiplies by the multiplicative factor, but this means that
+        # we can't allow keyword values as multipliers (e.g. n*uint:8).
+        # The only way to do this would be to return the factor in some fashion
+        # (we can't use the key's value here as it would mean that we couldn't
+        # sensibly continue to cache the function's results. (TODO).
+        return_values.extend(ret_vals * factor)
+    return_values = [tuple(x) for x in return_values]
+    if len(token_cache) < CACHE_SIZE:
+        token_cache[token_key] = stretchy_token, return_values
+    return stretchy_token, return_values
+
+# Looks for first number*(
+BRACKET_RE = re.compile(r'(?P<factor>\d+)\*\(')
+
+def expand_brackets(s):
+    """Remove whitespace and expand all brackets."""
+    s = ''.join(s.split())
+    while True:
+        start = s.find('(')
+        if start == -1:
+            break
+        count = 1 # Number of hanging open brackets
+        p = start + 1
+        while p < len(s):
+            if s[p] == '(':
+                count += 1
+            if s[p] == ')':
+                count -= 1
+            if not count:
+                break
+            p += 1
+        if count:
+            raise ValueError("Unbalanced parenthesis in '{0}'.".format(s))
+        if start == 0 or s[start - 1] != '*':
+            s = s[0:start] + s[start + 1:p] + s[p + 1:]
+        else:
+            m = BRACKET_RE.search(s)
+            if m:
+                factor = int(m.group('factor'))
+                matchstart = m.start('factor')
+                s = s[0:matchstart] + (factor - 1) * (s[start + 1:p] + ',') + s[start + 1:p] + s[p + 1:]
+            else:
+                raise ValueError("Failed to parse '{0}'.".format(s))
+    return s
+
+
+# This converts a single octal digit to 3 bits.
+OCT_TO_BITS = ['{0:03b}'.format(i) for i in xrange(8)]
+
+# A dictionary of number of 1 bits contained in binary representation of any byte
+BIT_COUNT = dict(zip(xrange(256), [bin(i).count('1') for i in xrange(256)]))
+
+
+class Bits(object):
+    """A container holding an immutable sequence of bits.
+
+    For a mutable container use the BitArray class instead.
+
+    Methods:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    join() -- Join bitstrings together using current bitstring.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Special methods:
+
+    Also available are the operators [], ==, !=, +, *, ~, <<, >>, &, |, ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ('_datastore')
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is mainly intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        pass
+
+    def __new__(cls, auto=None, length=None, offset=None, _cache={}, **kwargs):
+        # For instances auto-initialised with a string we intern the
+        # instance for re-use.
+        try:
+            if isinstance(auto, basestring):
+                try:
+                    return _cache[auto]
+                except KeyError:
+                    x = object.__new__(Bits)
+                    try:
+                        _, tokens = tokenparser(auto)
+                    except ValueError as e:
+                        raise CreationError(*e.args)
+                    x._datastore = ConstByteStore(bytearray(0), 0, 0)
+                    for token in tokens:
+                        x._datastore._appendstore(Bits._init_with_token(*token)._datastore)
+                    assert x._assertsanity()
+                    if len(_cache) < CACHE_SIZE:
+                        _cache[auto] = x
+                    return x
+            if isinstance(auto, Bits):
+                return auto
+        except TypeError:
+            pass
+        x = super(Bits, cls).__new__(cls)
+        x._initialise(auto, length, offset, **kwargs)
+        return x
+
+    def _initialise(self, auto, length, offset, **kwargs):
+        if length is not None and length < 0:
+            raise CreationError("bitstring length cannot be negative.")
+        if offset is not None and offset < 0:
+            raise CreationError("offset must be >= 0.")
+        if auto is not None:
+            self._initialise_from_auto(auto, length, offset)
+            return
+        if not kwargs:
+            # No initialisers, so initialise with nothing or zero bits
+            if length is not None and length != 0:
+                data = bytearray((length + 7) // 8)
+                self._setbytes_unsafe(data, length, 0)
+                return
+            self._setbytes_unsafe(bytearray(0), 0, 0)
+            return
+        k, v = kwargs.popitem()
+        try:
+            init_without_length_or_offset[k](self, v)
+            if length is not None or offset is not None:
+                raise CreationError("Cannot use length or offset with this initialiser.")
+        except KeyError:
+            try:
+                init_with_length_only[k](self, v, length)
+                if offset is not None:
+                    raise CreationError("Cannot use offset with this initialiser.")
+            except KeyError:
+                if offset is None:
+                    offset = 0
+                try:
+                    init_with_length_and_offset[k](self, v, length, offset)
+                except KeyError:
+                    raise CreationError("Unrecognised keyword '{0}' used to initialise.", k)
+
+    def _initialise_from_auto(self, auto, length, offset):
+        if offset is None:
+            offset = 0
+        self._setauto(auto, length, offset)
+        return
+
+    def __copy__(self):
+        """Return a new copy of the Bits for the copy module."""
+        # Note that if you want a new copy (different ID), use _copy instead.
+        # The copy can return self as it's immutable.
+        return self
+
+    def __lt__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __gt__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __le__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __ge__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __add__(self, bs):
+        """Concatenate bitstrings and return new bitstring.
+
+        bs -- the bitstring to append.
+
+        """
+        bs = Bits(bs)
+        if bs.len <= self.len:
+            s = self._copy()
+            s._append(bs)
+        else:
+            s = bs._copy()
+            s = self.__class__(s)
+            s._prepend(self)
+        return s
+
+    def __radd__(self, bs):
+        """Append current bitstring to bs and return new bitstring.
+
+        bs -- the string for the 'auto' initialiser that will be appended to.
+
+        """
+        bs = self._converttobitstring(bs)
+        return bs.__add__(self)
+
+    def __getitem__(self, key):
+        """Return a new bitstring representing a slice of the current bitstring.
+
+        Indices are in units of the step parameter (default 1 bit).
+        Stepping is used to specify the number of bits in each item.
+
+        >>> print BitArray('0b00110')[1:4]
+        '0b011'
+        >>> print BitArray('0x00112233')[1:3:8]
+        '0x1122'
+
+        """
+        length = self.len
+        try:
+            step = key.step if key.step is not None else 1
+        except AttributeError:
+            # single element
+            if key < 0:
+                key += length
+            if not 0 <= key < length:
+                raise IndexError("Slice index out of range.")
+            # Single bit, return True or False
+            return self._datastore.getbit(key)
+        else:
+            if step != 1:
+                # convert to binary string and use string slicing
+                bs = self.__class__()
+                bs._setbin_unsafe(self._getbin().__getitem__(key))
+                return bs
+            start, stop = 0, length
+            if key.start is not None:
+                start = key.start
+                if key.start < 0:
+                    start += stop
+            if key.stop is not None:
+                stop = key.stop
+                if key.stop < 0:
+                    stop += length
+            start = max(start, 0)
+            stop = min(stop, length)
+            if start < stop:
+                return self._slice(start, stop)
+            else:
+                return self.__class__()
+
+    def __len__(self):
+        """Return the length of the bitstring in bits."""
+        return self._getlength()
+
+    def __str__(self):
+        """Return approximate string representation of bitstring for printing.
+
+        Short strings will be given wholly in hexadecimal or binary. Longer
+        strings may be part hexadecimal and part binary. Very long strings will
+        be truncated with '...'.
+
+        """
+        length = self.len
+        if not length:
+            return ''
+        if length > MAX_CHARS * 4:
+            # Too long for hex. Truncate...
+            return ''.join(('0x', self._readhex(MAX_CHARS * 4, 0), '...'))
+        # If it's quite short and we can't do hex then use bin
+        if length < 32 and length % 4 != 0:
+            return '0b' + self.bin
+        # If we can use hex then do so
+        if not length % 4:
+            return '0x' + self.hex
+        # Otherwise first we do as much as we can in hex
+        # then add on 1, 2 or 3 bits on at the end
+        bits_at_end = length % 4
+        return ''.join(('0x', self._readhex(length - bits_at_end, 0),
+                        ', ', '0b',
+                        self._readbin(bits_at_end, length - bits_at_end)))
+
+    def __repr__(self):
+        """Return representation that could be used to recreate the bitstring.
+
+        If the returned string is too long it will be truncated. See __str__().
+
+        """
+        length = self.len
+        if isinstance(self._datastore._rawarray, MmapByteArray):
+            offsetstring = ''
+            if self._datastore.byteoffset or self._offset:
+                offsetstring = ", offset=%d" % (self._datastore._rawarray.byteoffset * 8 + self._offset)
+            lengthstring = ", length=%d" % length
+            return "{0}(filename='{1}'{2}{3})".format(self.__class__.__name__,
+                    self._datastore._rawarray.source.name, lengthstring, offsetstring)
+        else:
+            s = self.__str__()
+            lengthstring = ''
+            if s.endswith('...'):
+                lengthstring = " # length={0}".format(length)
+            return "{0}('{1}'){2}".format(self.__class__.__name__, s, lengthstring)
+
+    def __eq__(self, bs):
+        """Return True if two bitstrings have the same binary representation.
+
+        >>> BitArray('0b1110') == '0xe'
+        True
+
+        """
+        try:
+            bs = Bits(bs)
+        except TypeError:
+            return False
+        return equal(self._datastore, bs._datastore)
+
+    def __ne__(self, bs):
+        """Return False if two bitstrings have the same binary representation.
+
+        >>> BitArray('0b111') == '0x7'
+        False
+
+        """
+        return not self.__eq__(bs)
+
+    def __invert__(self):
+        """Return bitstring with every bit inverted.
+
+        Raises Error if the bitstring is empty.
+
+        """
+        if not self.len:
+            raise Error("Cannot invert empty bitstring.")
+        s = self._copy()
+        s._invert_all()
+        return s
+
+    def __lshift__(self, n):
+        """Return bitstring with bits shifted by n to the left.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        n = min(n, self.len)
+        s = self._slice(n, self.len)
+        s._append(Bits(n))
+        return s
+
+    def __rshift__(self, n):
+        """Return bitstring with bits shifted by n to the right.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        if not n:
+            return self._copy()
+        s = self.__class__(length=min(n, self.len))
+        s._append(self[:-n])
+        return s
+
+    def __mul__(self, n):
+        """Return bitstring consisting of n concatenations of self.
+
+        Called for expression of the form 'a = b*3'.
+        n -- The number of concatenations. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot multiply by a negative integer.")
+        if not n:
+            return self.__class__()
+        s = self._copy()
+        s._imul(n)
+        return s
+
+    def __rmul__(self, n):
+        """Return bitstring consisting of n concatenations of self.
+
+        Called for expressions of the form 'a = 3*b'.
+        n -- The number of concatenations. Must be >= 0.
+
+        """
+        return self.__mul__(n)
+
+    def __and__(self, bs):
+        """Bit-wise 'and' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '&' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for & operator.")
+        s = self._copy()
+        s._iand(bs)
+        return s
+
+    def __rand__(self, bs):
+        """Bit-wise 'and' between two bitstrings. Returns new bitstring.
+
+        bs -- the bitstring to '&' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        return self.__and__(bs)
+
+    def __or__(self, bs):
+        """Bit-wise 'or' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '|' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for | operator.")
+        s = self._copy()
+        s._ior(bs)
+        return s
+
+    def __ror__(self, bs):
+        """Bit-wise 'or' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '|' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        return self.__or__(bs)
+
+    def __xor__(self, bs):
+        """Bit-wise 'xor' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '^' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for ^ operator.")
+        s = self._copy()
+        s._ixor(bs)
+        return s
+
+    def __rxor__(self, bs):
+        """Bit-wise 'xor' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '^' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        return self.__xor__(bs)
+
+    def __contains__(self, bs):
+        """Return whether bs is contained in the current bitstring.
+
+        bs -- The bitstring to search for.
+
+        """
+        # Don't want to change pos
+        try:
+            pos = self._pos
+        except AttributeError:
+            pass
+        found = Bits.find(self, bs, bytealigned=False)
+        try:
+            self._pos = pos
+        except AttributeError:
+            pass
+        return bool(found)
+
+    def __hash__(self):
+        """Return an integer hash of the object."""
+        # We can't in general hash the whole bitstring (it could take hours!)
+        # So instead take some bits from the start and end.
+        if self.len <= 160:
+            # Use the whole bitstring.
+            shorter = self
+        else:
+            # Take 10 bytes from start and end
+            shorter = self[:80] + self[-80:]
+        h = 0
+        for byte in shorter.tobytes():
+            try:
+                h = (h << 4) + ord(byte)
+            except TypeError:
+                # Python 3
+                h = (h << 4) + byte
+            g = h & 0xf0000000
+            if g & (1 << 31):
+                h ^= (g >> 24)
+                h ^= g
+        return h % 1442968193
+
+    # This is only used in Python 2.x...
+    def __nonzero__(self):
+        """Return True if any bits are set to 1, otherwise return False."""
+        return self.any(True)
+
+    # ...whereas this is used in Python 3.x
+    __bool__ = __nonzero__
+
+    def _assertsanity(self):
+        """Check internal self consistency as a debugging aid."""
+        assert self.len >= 0
+        assert 0 <= self._offset, "offset={0}".format(self._offset)
+        assert (self.len + self._offset + 7) // 8 == self._datastore.bytelength + self._datastore.byteoffset
+        return True
+
+    @classmethod
+    def _init_with_token(cls, name, token_length, value):
+        if token_length is not None:
+            token_length = int(token_length)
+        if token_length == 0:
+            return cls()
+        # For pad token just return the length in zero bits
+        if name == 'pad':
+            return cls(token_length)
+
+        if value is None:
+            if token_length is None:
+                error = "Token has no value ({0}=???).".format(name)
+            else:
+                error = "Token has no value ({0}:{1}=???).".format(name, token_length)
+            raise ValueError(error)
+        try:
+            b = cls(**{_tokenname_to_initialiser[name]: value})
+        except KeyError:
+            if name in ('se', 'ue', 'sie', 'uie'):
+                b = cls(**{name: int(value)})
+            elif name in ('uint', 'int', 'uintbe', 'intbe', 'uintle', 'intle', 'uintne', 'intne'):
+                b = cls(**{name: int(value), 'length': token_length})
+            elif name in ('float', 'floatbe', 'floatle', 'floatne'):
+                b = cls(**{name: float(value), 'length': token_length})
+            elif name == 'bool':
+                if value in (1, 'True', '1'):
+                    b = cls(bool=True)
+                elif value in (0, 'False', '0'):
+                    b = cls(bool=False)
+                else:
+                    raise CreationError("bool token can only be 'True' or 'False'.")
+            else:
+                raise CreationError("Can't parse token name {0}.", name)
+        if token_length is not None and b.len != token_length:
+            msg = "Token with length {0} packed with value of length {1} ({2}:{3}={4})."
+            raise CreationError(msg, token_length, b.len, name, token_length, value)
+        return b
+
+    def _clear(self):
+        """Reset the bitstring to an empty state."""
+        self._datastore = ByteStore(bytearray(0))
+
+    def _setauto(self, s, length, offset):
+        """Set bitstring from a bitstring, file, bool, integer, iterable or string."""
+        # As s can be so many different things it's important to do the checks
+        # in the correct order, as some types are also other allowed types.
+        # So basestring must be checked before Iterable
+        # and bytes/bytearray before Iterable but after basestring!
+        if isinstance(s, Bits):
+            if length is None:
+                length = s.len - offset
+            self._setbytes_unsafe(s._datastore.rawbytes, length, s._offset + offset)
+            return
+        if isinstance(s, file):
+            if offset is None:
+                offset = 0
+            if length is None:
+                length = os.path.getsize(s.name) * 8 - offset
+            byteoffset, offset = divmod(offset, 8)
+            bytelength = (length + byteoffset * 8 + offset + 7) // 8 - byteoffset
+            m = MmapByteArray(s, bytelength, byteoffset)
+            if length + byteoffset * 8 + offset > m.filelength * 8:
+                raise CreationError("File is not long enough for specified "
+                                    "length and offset.")
+            self._datastore = ConstByteStore(m, length, offset)
+            return
+        if length is not None:
+            raise CreationError("The length keyword isn't applicable to this initialiser.")
+        if offset:
+            raise CreationError("The offset keyword isn't applicable to this initialiser.")
+        if isinstance(s, basestring):
+            bs = self._converttobitstring(s)
+            assert bs._offset == 0
+            self._setbytes_unsafe(bs._datastore.rawbytes, bs.length, 0)
+            return
+        if isinstance(s, (bytes, bytearray)):
+            self._setbytes_unsafe(bytearray(s), len(s) * 8, 0)
+            return
+        if isinstance(s, numbers.Integral):
+            # Initialise with s zero bits.
+            if s < 0:
+                msg = "Can't create bitstring of negative length {0}."
+                raise CreationError(msg, s)
+            data = bytearray((s + 7) // 8)
+            self._datastore = ByteStore(data, s, 0)
+            return
+        if isinstance(s, collections.Iterable):
+            # Evaluate each item as True or False and set bits to 1 or 0.
+            self._setbin_unsafe(''.join(str(int(bool(x))) for x in s))
+            return
+        raise TypeError("Cannot initialise bitstring from {0}.".format(type(s)))
+
+    def _setfile(self, filename, length, offset):
+        """Use file as source of bits."""
+        source = open(filename, 'rb')
+        if offset is None:
+            offset = 0
+        if length is None:
+            length = os.path.getsize(source.name) * 8 - offset
+        byteoffset, offset = divmod(offset, 8)
+        bytelength = (length + byteoffset * 8 + offset + 7) // 8 - byteoffset
+        m = MmapByteArray(source, bytelength, byteoffset)
+        if length + byteoffset * 8 + offset > m.filelength * 8:
+            raise CreationError("File is not long enough for specified "
+                                "length and offset.")
+        self._datastore = ConstByteStore(m, length, offset)
+
+    def _setbytes_safe(self, data, length=None, offset=0):
+        """Set the data from a string."""
+        data = bytearray(data)
+        if length is None:
+            # Use to the end of the data
+            length = len(data)*8 - offset
+            self._datastore = ByteStore(data, length, offset)
+        else:
+            if length + offset > len(data) * 8:
+                msg = "Not enough data present. Need {0} bits, have {1}."
+                raise CreationError(msg, length + offset, len(data) * 8)
+            if length == 0:
+                self._datastore = ByteStore(bytearray(0))
+            else:
+                self._datastore = ByteStore(data, length, offset)
+
+    def _setbytes_unsafe(self, data, length, offset):
+        """Unchecked version of _setbytes_safe."""
+        self._datastore = ByteStore(data[:], length, offset)
+        assert self._assertsanity()
+
+    def _readbytes(self, length, start):
+        """Read bytes and return them. Note that length is in bits."""
+        assert length % 8 == 0
+        assert start + length <= self.len
+        if not (start + self._offset) % 8:
+            return bytes(self._datastore.getbyteslice((start + self._offset) // 8,
+                                                      (start + self._offset + length) // 8))
+        return self._slice(start, start + length).tobytes()
+
+    def _getbytes(self):
+        """Return the data as an ordinary string."""
+        if self.len % 8:
+            raise InterpretError("Cannot interpret as bytes unambiguously - "
+                                 "not multiple of 8 bits.")
+        return self._readbytes(self.len, 0)
+
+    def _setuint(self, uint, length=None):
+        """Reset the bitstring to have given unsigned int interpretation."""
+        try:
+            if length is None:
+                # Use the whole length. Deliberately not using .len here.
+                length = self._datastore.bitlength
+        except AttributeError:
+            # bitstring doesn't have a _datastore as it hasn't been created!
+            pass
+        # TODO: All this checking code should be hoisted out of here!
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with a "
+                                "uint initialiser.")
+        if uint >= (1 << length):
+            msg = "{0} is too large an unsigned integer for a bitstring of length {1}. "\
+                  "The allowed range is [0, {2}]."
+            raise CreationError(msg, uint, length, (1 << length) - 1)
+        if uint < 0:
+            raise CreationError("uint cannot be initialsed by a negative number.")
+        s = hex(uint)[2:]
+        s = s.rstrip('L')
+        if len(s) & 1:
+            s = '0' + s
+        try:
+            data = bytes.fromhex(s)
+        except AttributeError:
+            # the Python 2.x way
+            data = binascii.unhexlify(s)
+        # Now add bytes as needed to get the right length.
+        extrabytes = ((length + 7) // 8) - len(data)
+        if extrabytes > 0:
+            data = b'\x00' * extrabytes + data
+        offset = 8 - (length % 8)
+        if offset == 8:
+            offset = 0
+        self._setbytes_unsafe(bytearray(data), length, offset)
+
+    def _readuint(self, length, start):
+        """Read bits and interpret as an unsigned int."""
+        if not length:
+            raise InterpretError("Cannot interpret a zero length bitstring "
+                                           "as an integer.")
+        offset = self._offset
+        startbyte = (start + offset) // 8
+        endbyte = (start + offset + length - 1) // 8
+
+        b = binascii.hexlify(bytes(self._datastore.getbyteslice(startbyte, endbyte + 1)))
+        assert b
+        i = int(b, 16)
+        final_bits = 8 - ((start + offset + length) % 8)
+        if final_bits != 8:
+            i >>= final_bits
+        i &= (1 << length) - 1
+        return i
+
+    def _getuint(self):
+        """Return data as an unsigned int."""
+        return self._readuint(self.len, 0)
+
+    def _setint(self, int_, length=None):
+        """Reset the bitstring to have given signed int interpretation."""
+        # If no length given, and we've previously been given a length, use it.
+        if length is None and hasattr(self, 'len') and self.len != 0:
+            length = self.len
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with an int initialiser.")
+        if int_ >= (1 << (length - 1)) or int_ < -(1 << (length - 1)):
+            raise CreationError("{0} is too large a signed integer for a bitstring of length {1}. "
+                                "The allowed range is [{2}, {3}].", int_, length, -(1 << (length - 1)),
+                                (1 << (length - 1)) - 1)
+        if int_ >= 0:
+            self._setuint(int_, length)
+            return
+        # TODO: We should decide whether to just use the _setuint, or to do the bit flipping,
+        # based upon which will be quicker. If the -ive number is less than half the maximum
+        # possible then it's probably quicker to do the bit flipping...
+
+        # Do the 2's complement thing. Add one, set to minus number, then flip bits.
+        int_ += 1
+        self._setuint(-int_, length)
+        self._invert_all()
+
+    def _readint(self, length, start):
+        """Read bits and interpret as a signed int"""
+        ui = self._readuint(length, start)
+        if not ui >> (length - 1):
+            # Top bit not set, number is positive
+            return ui
+        # Top bit is set, so number is negative
+        tmp = (~(ui - 1)) & ((1 << length) - 1)
+        return -tmp
+
+    def _getint(self):
+        """Return data as a two's complement signed int."""
+        return self._readint(self.len, 0)
+
+    def _setuintbe(self, uintbe, length=None):
+        """Set the bitstring to a big-endian unsigned int interpretation."""
+        if length is not None and length % 8 != 0:
+            raise CreationError("Big-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setuint(uintbe, length)
+
+    def _readuintbe(self, length, start):
+        """Read bits and interpret as a big-endian unsigned int."""
+        if length % 8:
+            raise InterpretError("Big-endian integers must be whole-byte. "
+                                 "Length = {0} bits.", length)
+        return self._readuint(length, start)
+
+    def _getuintbe(self):
+        """Return data as a big-endian two's complement unsigned int."""
+        return self._readuintbe(self.len, 0)
+
+    def _setintbe(self, intbe, length=None):
+        """Set bitstring to a big-endian signed int interpretation."""
+        if length is not None and length % 8 != 0:
+            raise CreationError("Big-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setint(intbe, length)
+
+    def _readintbe(self, length, start):
+        """Read bits and interpret as a big-endian signed int."""
+        if length % 8:
+            raise InterpretError("Big-endian integers must be whole-byte. "
+                                 "Length = {0} bits.", length)
+        return self._readint(length, start)
+
+    def _getintbe(self):
+        """Return data as a big-endian two's complement signed int."""
+        return self._readintbe(self.len, 0)
+
+    def _setuintle(self, uintle, length=None):
+        if length is not None and length % 8 != 0:
+            raise CreationError("Little-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setuint(uintle, length)
+        self._reversebytes(0, self.len)
+
+    def _readuintle(self, length, start):
+        """Read bits and interpret as a little-endian unsigned int."""
+        if length % 8:
+            raise InterpretError("Little-endian integers must be whole-byte. "
+                                 "Length = {0} bits.", length)
+        assert start + length <= self.len
+        absolute_pos = start + self._offset
+        startbyte, offset = divmod(absolute_pos, 8)
+        val = 0
+        if not offset:
+            endbyte = (absolute_pos + length - 1) // 8
+            chunksize = 4 # for 'L' format
+            while endbyte - chunksize + 1 >= startbyte:
+                val <<= 8 * chunksize
+                val += struct.unpack('<L', bytes(self._datastore.getbyteslice(endbyte + 1 - chunksize, endbyte + 1)))[0]
+                endbyte -= chunksize
+            for b in xrange(endbyte, startbyte - 1, -1):
+                val <<= 8
+                val += self._datastore.getbyte(b)
+        else:
+            data = self._slice(start, start + length)
+            assert data.len % 8 == 0
+            data._reversebytes(0, self.len)
+            for b in bytearray(data.bytes):
+                val <<= 8
+                val += b
+        return val
+
+    def _getuintle(self):
+        return self._readuintle(self.len, 0)
+
+    def _setintle(self, intle, length=None):
+        if length is not None and length % 8 != 0:
+            raise CreationError("Little-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setint(intle, length)
+        self._reversebytes(0, self.len)
+
+    def _readintle(self, length, start):
+        """Read bits and interpret as a little-endian signed int."""
+        ui = self._readuintle(length, start)
+        if not ui >> (length - 1):
+            # Top bit not set, number is positive
+            return ui
+        # Top bit is set, so number is negative
+        tmp = (~(ui - 1)) & ((1 << length) - 1)
+        return -tmp
+
+    def _getintle(self):
+        return self._readintle(self.len, 0)
+
+    def _setfloat(self, f, length=None):
+        # If no length given, and we've previously been given a length, use it.
+        if length is None and hasattr(self, 'len') and self.len != 0:
+            length = self.len
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with a "
+                                "float initialiser.")
+        if length == 32:
+            b = struct.pack('>f', f)
+        elif length == 64:
+            b = struct.pack('>d', f)
+        else:
+            raise CreationError("floats can only be 32 or 64 bits long, "
+                                "not {0} bits", length)
+        self._setbytes_unsafe(bytearray(b), length, 0)
+
+    def _readfloat(self, length, start):
+        """Read bits and interpret as a float."""
+        if not (start + self._offset) % 8:
+            startbyte = (start + self._offset) // 8
+            if length == 32:
+                f, = struct.unpack('>f', bytes(self._datastore.getbyteslice(startbyte, startbyte + 4)))
+            elif length == 64:
+                f, = struct.unpack('>d', bytes(self._datastore.getbyteslice(startbyte, startbyte + 8)))
+        else:
+            if length == 32:
+                f, = struct.unpack('>f', self._readbytes(32, start))
+            elif length == 64:
+                f, = struct.unpack('>d', self._readbytes(64, start))
+        try:
+            return f
+        except NameError:
+            raise InterpretError("floats can only be 32 or 64 bits long, not {0} bits", length)
+
+    def _getfloat(self):
+        """Interpret the whole bitstring as a float."""
+        return self._readfloat(self.len, 0)
+
+    def _setfloatle(self, f, length=None):
+        # If no length given, and we've previously been given a length, use it.
+        if length is None and hasattr(self, 'len') and self.len != 0:
+            length = self.len
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with a "
+                                "float initialiser.")
+        if length == 32:
+            b = struct.pack('<f', f)
+        elif length == 64:
+            b = struct.pack('<d', f)
+        else:
+            raise CreationError("floats can only be 32 or 64 bits long, "
+                                "not {0} bits", length)
+        self._setbytes_unsafe(bytearray(b), length, 0)
+
+    def _readfloatle(self, length, start):
+        """Read bits and interpret as a little-endian float."""
+        startbyte, offset = divmod(start + self._offset, 8)
+        if not offset:
+            if length == 32:
+                f, = struct.unpack('<f', bytes(self._datastore.getbyteslice(startbyte, startbyte + 4)))
+            elif length == 64:
+                f, = struct.unpack('<d', bytes(self._datastore.getbyteslice(startbyte, startbyte + 8)))
+        else:
+            if length == 32:
+                f, = struct.unpack('<f', self._readbytes(32, start))
+            elif length == 64:
+                f, = struct.unpack('<d', self._readbytes(64, start))
+        try:
+            return f
+        except NameError:
+            raise InterpretError("floats can only be 32 or 64 bits long, "
+                                 "not {0} bits", length)
+
+    def _getfloatle(self):
+        """Interpret the whole bitstring as a little-endian float."""
+        return self._readfloatle(self.len, 0)
+
+    def _setue(self, i):
+        """Initialise bitstring with unsigned exponential-Golomb code for integer i.
+
+        Raises CreationError if i < 0.
+
+        """
+        if i < 0:
+            raise CreationError("Cannot use negative initialiser for unsigned "
+                                "exponential-Golomb.")
+        if not i:
+            self._setbin_unsafe('1')
+            return
+        tmp = i + 1
+        leadingzeros = -1
+        while tmp > 0:
+            tmp >>= 1
+            leadingzeros += 1
+        remainingpart = i + 1 - (1 << leadingzeros)
+        binstring = '0' * leadingzeros + '1' + Bits(uint=remainingpart,
+                                                             length=leadingzeros).bin
+        self._setbin_unsafe(binstring)
+
+    def _readue(self, pos):
+        """Return interpretation of next bits as unsigned exponential-Golomb code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        oldpos = pos
+        try:
+            while not self[pos]:
+                pos += 1
+        except IndexError:
+            raise ReadError("Read off end of bitstring trying to read code.")
+        leadingzeros = pos - oldpos
+        codenum = (1 << leadingzeros) - 1
+        if leadingzeros > 0:
+            if pos + leadingzeros + 1 > self.len:
+                raise ReadError("Read off end of bitstring trying to read code.")
+            codenum += self._readuint(leadingzeros, pos + 1)
+            pos += leadingzeros + 1
+        else:
+            assert codenum == 0
+            pos += 1
+        return codenum, pos
+
+    def _getue(self):
+        """Return data as unsigned exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readue(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single exponential-Golomb code.")
+        return value
+
+    def _setse(self, i):
+        """Initialise bitstring with signed exponential-Golomb code for integer i."""
+        if i > 0:
+            u = (i * 2) - 1
+        else:
+            u = -2 * i
+        self._setue(u)
+
+    def _getse(self):
+        """Return data as signed exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readse(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single exponential-Golomb code.")
+        return value
+
+    def _readse(self, pos):
+        """Return interpretation of next bits as a signed exponential-Golomb code.
+
+        Advances position to after the read code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        codenum, pos = self._readue(pos)
+        m = (codenum + 1) // 2
+        if not codenum % 2:
+            return -m, pos
+        else:
+            return m, pos
+
+    def _setuie(self, i):
+        """Initialise bitstring with unsigned interleaved exponential-Golomb code for integer i.
+
+        Raises CreationError if i < 0.
+
+        """
+        if i < 0:
+            raise CreationError("Cannot use negative initialiser for unsigned "
+                                "interleaved exponential-Golomb.")
+        self._setbin_unsafe('1' if i == 0 else '0' + '0'.join(bin(i + 1)[3:]) + '1')
+
+    def _readuie(self, pos):
+        """Return interpretation of next bits as unsigned interleaved exponential-Golomb code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        try:
+            codenum = 1
+            while not self[pos]:
+                pos += 1
+                codenum <<= 1
+                codenum += self[pos]
+                pos += 1
+            pos += 1
+        except IndexError:
+            raise ReadError("Read off end of bitstring trying to read code.")
+        codenum -= 1
+        return codenum, pos
+
+    def _getuie(self):
+        """Return data as unsigned interleaved exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readuie(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single interleaved exponential-Golomb code.")
+        return value
+
+    def _setsie(self, i):
+        """Initialise bitstring with signed interleaved exponential-Golomb code for integer i."""
+        if not i:
+            self._setbin_unsafe('1')
+        else:
+            self._setuie(abs(i))
+            self._append(Bits([i < 0]))
+
+    def _getsie(self):
+        """Return data as signed interleaved exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readsie(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single interleaved exponential-Golomb code.")
+        return value
+
+    def _readsie(self, pos):
+        """Return interpretation of next bits as a signed interleaved exponential-Golomb code.
+
+        Advances position to after the read code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        codenum, pos = self._readuie(pos)
+        if not codenum:
+            return 0, pos
+        try:
+            if self[pos]:
+                return -codenum, pos + 1
+            else:
+                return codenum, pos + 1
+        except IndexError:
+            raise ReadError("Read off end of bitstring trying to read code.")
+
+    def _setbool(self, value):
+        # We deliberately don't want to have implicit conversions to bool here.
+        # If we did then it would be difficult to deal with the 'False' string.
+        if value in (1, 'True'):
+            self._setbytes_unsafe(bytearray(b'\x80'), 1, 0)
+        elif value in (0, 'False'):
+            self._setbytes_unsafe(bytearray(b'\x00'), 1, 0)
+        else:
+            raise CreationError('Cannot initialise boolean with {0}.', value)
+
+    def _getbool(self):
+        if self.length != 1:
+            msg = "For a bool interpretation a bitstring must be 1 bit long, not {0} bits."
+            raise InterpretError(msg, self.length)
+        return self[0]
+
+    def _readbool(self, pos):
+        return self[pos], pos + 1
+
+    def _setbin_safe(self, binstring):
+        """Reset the bitstring to the value given in binstring."""
+        binstring = tidy_input_string(binstring)
+        # remove any 0b if present
+        binstring = binstring.replace('0b', '')
+        self._setbin_unsafe(binstring)
+
+    def _setbin_unsafe(self, binstring):
+        """Same as _setbin_safe, but input isn't sanity checked. binstring mustn't start with '0b'."""
+        length = len(binstring)
+        # pad with zeros up to byte boundary if needed
+        boundary = ((length + 7) // 8) * 8
+        padded_binstring = binstring + '0' * (boundary - length)\
+                           if len(binstring) < boundary else binstring
+        try:
+            bytelist = [int(padded_binstring[x:x + 8], 2)
+                        for x in xrange(0, len(padded_binstring), 8)]
+        except ValueError:
+            raise CreationError("Invalid character in bin initialiser {0}.", binstring)
+        self._setbytes_unsafe(bytearray(bytelist), length, 0)
+
+    def _readbin(self, length, start):
+        """Read bits and interpret as a binary string."""
+        if not length:
+            return ''
+        # Get the byte slice containing our bit slice
+        startbyte, startoffset = divmod(start + self._offset, 8)
+        endbyte = (start + self._offset + length - 1) // 8
+        b = self._datastore.getbyteslice(startbyte, endbyte + 1)
+        # Convert to a string of '0' and '1's (via a hex string an and int!)
+        try:
+            c = "{:0{}b}".format(int(binascii.hexlify(b), 16), 8*len(b))
+        except TypeError:
+            # Hack to get Python 2.6 working
+            c = "{0:0{1}b}".format(int(binascii.hexlify(str(b)), 16), 8*len(b))
+        # Finally chop off any extra bits.
+        return c[startoffset:startoffset + length]
+
+    def _getbin(self):
+        """Return interpretation as a binary string."""
+        return self._readbin(self.len, 0)
+
+    def _setoct(self, octstring):
+        """Reset the bitstring to have the value given in octstring."""
+        octstring = tidy_input_string(octstring)
+        # remove any 0o if present
+        octstring = octstring.replace('0o', '')
+        binlist = []
+        for i in octstring:
+            try:
+                if not 0 <= int(i) < 8:
+                    raise ValueError
+                binlist.append(OCT_TO_BITS[int(i)])
+            except ValueError:
+                raise CreationError("Invalid symbol '{0}' in oct initialiser.", i)
+        self._setbin_unsafe(''.join(binlist))
+
+    def _readoct(self, length, start):
+        """Read bits and interpret as an octal string."""
+        if length % 3:
+            raise InterpretError("Cannot convert to octal unambiguously - "
+                                 "not multiple of 3 bits.")
+        if not length:
+            return ''
+        # Get main octal bit by converting from int.
+        # Strip starting 0 or 0o depending on Python version.
+        end = oct(self._readuint(length, start))[LEADING_OCT_CHARS:]
+        if end.endswith('L'):
+            end = end[:-1]
+        middle = '0' * (length // 3 - len(end))
+        return middle + end
+
+    def _getoct(self):
+        """Return interpretation as an octal string."""
+        return self._readoct(self.len, 0)
+
+    def _sethex(self, hexstring):
+        """Reset the bitstring to have the value given in hexstring."""
+        hexstring = tidy_input_string(hexstring)
+        # remove any 0x if present
+        hexstring = hexstring.replace('0x', '')
+        length = len(hexstring)
+        if length % 2:
+            hexstring += '0'
+        try:
+            try:
+                data = bytearray.fromhex(hexstring)
+            except TypeError:
+                # Python 2.6 needs a unicode string (a bug). 2.7 and 3.x work fine.
+                data = bytearray.fromhex(unicode(hexstring))
+        except ValueError:
+            raise CreationError("Invalid symbol in hex initialiser.")
+        self._setbytes_unsafe(data, length * 4, 0)
+
+    def _readhex(self, length, start):
+        """Read bits and interpret as a hex string."""
+        if length % 4:
+            raise InterpretError("Cannot convert to hex unambiguously - "
+                                           "not multiple of 4 bits.")
+        if not length:
+            return ''
+        # This monstrosity is the only thing I could get to work for both 2.6 and 3.1.
+        # TODO: Is utf-8 really what we mean here?
+        s = str(binascii.hexlify(self._slice(start, start + length).tobytes()).decode('utf-8'))
+        # If there's one nibble too many then cut it off
+        return s[:-1] if (length // 4) % 2 else s
+
+    def _gethex(self):
+        """Return the hexadecimal representation as a string prefixed with '0x'.
+
+        Raises an InterpretError if the bitstring's length is not a multiple of 4.
+
+        """
+        return self._readhex(self.len, 0)
+
+    def _getoffset(self):
+        return self._datastore.offset
+
+    def _getlength(self):
+        """Return the length of the bitstring in bits."""
+        return self._datastore.bitlength
+
+    def _ensureinmemory(self):
+        """Ensure the data is held in memory, not in a file."""
+        self._setbytes_unsafe(self._datastore.getbyteslice(0, self._datastore.bytelength),
+                              self.len, self._offset)
+
+    @classmethod
+    def _converttobitstring(cls, bs, offset=0, cache={}):
+        """Convert bs to a bitstring and return it.
+
+        offset gives the suggested bit offset of first significant
+        bit, to optimise append etc.
+
+        """
+        if isinstance(bs, Bits):
+            return bs
+        try:
+            return cache[(bs, offset)]
+        except KeyError:
+            if isinstance(bs, basestring):
+                b = cls()
+                try:
+                    _, tokens = tokenparser(bs)
+                except ValueError as e:
+                    raise CreationError(*e.args)
+                if tokens:
+                    b._append(Bits._init_with_token(*tokens[0]))
+                    b._datastore = offsetcopy(b._datastore, offset)
+                    for token in tokens[1:]:
+                        b._append(Bits._init_with_token(*token))
+                assert b._assertsanity()
+                assert b.len == 0 or b._offset == offset
+                if len(cache) < CACHE_SIZE:
+                    cache[(bs, offset)] = b
+                return b
+        except TypeError:
+            # Unhashable type
+            pass
+        return cls(bs)
+
+    def _copy(self):
+        """Create and return a new copy of the Bits (always in memory)."""
+        s_copy = self.__class__()
+        s_copy._setbytes_unsafe(self._datastore.getbyteslice(0, self._datastore.bytelength),
+                                self.len, self._offset)
+        return s_copy
+
+    def _slice(self, start, end):
+        """Used internally to get a slice, without error checking."""
+        if end == start:
+            return self.__class__()
+        offset = self._offset
+        startbyte, newoffset = divmod(start + offset, 8)
+        endbyte = (end + offset - 1) // 8
+        bs = self.__class__()
+        bs._setbytes_unsafe(self._datastore.getbyteslice(startbyte, endbyte + 1), end - start, newoffset)
+        return bs
+
+    def _readtoken(self, name, pos, length):
+        """Reads a token from the bitstring and returns the result."""
+        if length is not None and int(length) > self.length - pos:
+            raise ReadError("Reading off the end of the data. "
+                            "Tried to read {0} bits when only {1} available.".format(int(length), self.length - pos))
+        try:
+            val = name_to_read[name](self, length, pos)
+            return val, pos + length
+        except KeyError:
+            if name == 'pad':
+                return None, pos + length
+            raise ValueError("Can't parse token {0}:{1}".format(name, length))
+        except TypeError:
+            # This is for the 'ue', 'se' and 'bool' tokens. They will also return the new pos.
+            return name_to_read[name](self, pos)
+
+    def _append(self, bs):
+        """Append a bitstring to the current bitstring."""
+        self._datastore._appendstore(bs._datastore)
+
+    def _prepend(self, bs):
+        """Prepend a bitstring to the current bitstring."""
+        self._datastore._prependstore(bs._datastore)
+
+    def _reverse(self):
+        """Reverse all bits in-place."""
+        # Reverse the contents of each byte
+        n = [BYTE_REVERSAL_DICT[b] for b in self._datastore.rawbytes]
+        # Then reverse the order of the bytes
+        n.reverse()
+        # The new offset is the number of bits that were unused at the end.
+        newoffset = 8 - (self._offset + self.len) % 8
+        if newoffset == 8:
+            newoffset = 0
+        self._setbytes_unsafe(bytearray().join(n), self.length, newoffset)
+
+    def _truncatestart(self, bits):
+        """Truncate bits from the start of the bitstring."""
+        assert 0 <= bits <= self.len
+        if not bits:
+            return
+        if bits == self.len:
+            self._clear()
+            return
+        bytepos, offset = divmod(self._offset + bits, 8)
+        self._setbytes_unsafe(self._datastore.getbyteslice(bytepos, self._datastore.bytelength), self.len - bits,
+                              offset)
+        assert self._assertsanity()
+
+    def _truncateend(self, bits):
+        """Truncate bits from the end of the bitstring."""
+        assert 0 <= bits <= self.len
+        if not bits:
+            return
+        if bits == self.len:
+            self._clear()
+            return
+        newlength_in_bytes = (self._offset + self.len - bits + 7) // 8
+        self._setbytes_unsafe(self._datastore.getbyteslice(0, newlength_in_bytes), self.len - bits,
+                              self._offset)
+        assert self._assertsanity()
+
+    def _insert(self, bs, pos):
+        """Insert bs at pos."""
+        assert 0 <= pos <= self.len
+        if pos > self.len // 2:
+            # Inserting nearer end, so cut off end.
+            end = self._slice(pos, self.len)
+            self._truncateend(self.len - pos)
+            self._append(bs)
+            self._append(end)
+        else:
+            # Inserting nearer start, so cut off start.
+            start = self._slice(0, pos)
+            self._truncatestart(pos)
+            self._prepend(bs)
+            self._prepend(start)
+        try:
+            self._pos = pos + bs.len
+        except AttributeError:
+            pass
+        assert self._assertsanity()
+
+    def _overwrite(self, bs, pos):
+        """Overwrite with bs at pos."""
+        assert 0 <= pos < self.len
+        if bs is self:
+            # Just overwriting with self, so do nothing.
+            assert pos == 0
+            return
+        firstbytepos = (self._offset + pos) // 8
+        lastbytepos = (self._offset + pos + bs.len - 1) // 8
+        bytepos, bitoffset = divmod(self._offset + pos, 8)
+        if firstbytepos == lastbytepos:
+            mask = ((1 << bs.len) - 1) << (8 - bs.len - bitoffset)
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) & (~mask))
+            d = offsetcopy(bs._datastore, bitoffset)
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) | (d.getbyte(0) & mask))
+        else:
+            # Do first byte
+            mask = (1 << (8 - bitoffset)) - 1
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) & (~mask))
+            d = offsetcopy(bs._datastore, bitoffset)
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) | (d.getbyte(0) & mask))
+            # Now do all the full bytes
+            self._datastore.setbyteslice(firstbytepos + 1, lastbytepos, d.getbyteslice(1, lastbytepos - firstbytepos))
+            # and finally the last byte
+            bitsleft = (self._offset + pos + bs.len) % 8
+            if not bitsleft:
+                bitsleft = 8
+            mask = (1 << (8 - bitsleft)) - 1
+            self._datastore.setbyte(lastbytepos, self._datastore.getbyte(lastbytepos) & mask)
+            self._datastore.setbyte(lastbytepos,
+                                    self._datastore.getbyte(lastbytepos) | (d.getbyte(d.bytelength - 1) & ~mask))
+        assert self._assertsanity()
+
+    def _delete(self, bits, pos):
+        """Delete bits at pos."""
+        assert 0 <= pos <= self.len
+        assert pos + bits <= self.len
+        if not pos:
+            # Cutting bits off at the start.
+            self._truncatestart(bits)
+            return
+        if pos + bits == self.len:
+            # Cutting bits off at the end.
+            self._truncateend(bits)
+            return
+        if pos > self.len - pos - bits:
+            # More bits before cut point than after it, so do bit shifting
+            # on the final bits.
+            end = self._slice(pos + bits, self.len)
+            assert self.len - pos > 0
+            self._truncateend(self.len - pos)
+            self._append(end)
+            return
+        # More bits after the cut point than before it.
+        start = self._slice(0, pos)
+        self._truncatestart(pos + bits)
+        self._prepend(start)
+        return
+
+    def _reversebytes(self, start, end):
+        """Reverse bytes in-place."""
+        # Make the start occur on a byte boundary
+        # TODO: We could be cleverer here to avoid changing the offset.
+        newoffset = 8 - (start % 8)
+        if newoffset == 8:
+            newoffset = 0
+        self._datastore = offsetcopy(self._datastore, newoffset)
+        # Now just reverse the byte data
+        toreverse = bytearray(self._datastore.getbyteslice((newoffset + start) // 8, (newoffset + end) // 8))
+        toreverse.reverse()
+        self._datastore.setbyteslice((newoffset + start) // 8, (newoffset + end) // 8, toreverse)
+
+    def _set(self, pos):
+        """Set bit at pos to 1."""
+        assert 0 <= pos < self.len
+        self._datastore.setbit(pos)
+
+    def _unset(self, pos):
+        """Set bit at pos to 0."""
+        assert 0 <= pos < self.len
+        self._datastore.unsetbit(pos)
+
+    def _invert(self, pos):
+        """Flip bit at pos 1<->0."""
+        assert 0 <= pos < self.len
+        self._datastore.invertbit(pos)
+
+    def _invert_all(self):
+        """Invert every bit."""
+        set = self._datastore.setbyte
+        get = self._datastore.getbyte
+        for p in xrange(self._datastore.byteoffset, self._datastore.byteoffset + self._datastore.bytelength):
+            set(p, 256 + ~get(p))
+
+    def _ilshift(self, n):
+        """Shift bits by n to the left in place. Return self."""
+        assert 0 < n <= self.len
+        self._append(Bits(n))
+        self._truncatestart(n)
+        return self
+
+    def _irshift(self, n):
+        """Shift bits by n to the right in place. Return self."""
+        assert 0 < n <= self.len
+        self._prepend(Bits(n))
+        self._truncateend(n)
+        return self
+
+    def _imul(self, n):
+        """Concatenate n copies of self in place. Return self."""
+        assert n >= 0
+        if not n:
+            self._clear()
+            return self
+        m = 1
+        old_len = self.len
+        while m * 2 < n:
+            self._append(self)
+            m *= 2
+        self._append(self[0:(n - m) * old_len])
+        return self
+
+    def _inplace_logical_helper(self, bs, f):
+        """Helper function containing most of the __ior__, __iand__, __ixor__ code."""
+        # Give the two bitstrings the same offset (modulo 8)
+        self_byteoffset, self_bitoffset = divmod(self._offset, 8)
+        bs_byteoffset, bs_bitoffset = divmod(bs._offset, 8)
+        if bs_bitoffset != self_bitoffset:
+            if not self_bitoffset:
+                bs._datastore = offsetcopy(bs._datastore, 0)
+            else:
+                self._datastore = offsetcopy(self._datastore, bs_bitoffset)
+        a = self._datastore.rawbytes
+        b = bs._datastore.rawbytes
+        for i in xrange(len(a)):
+            a[i] = f(a[i + self_byteoffset], b[i + bs_byteoffset])
+        return self
+
+    def _ior(self, bs):
+        return self._inplace_logical_helper(bs, operator.ior)
+
+    def _iand(self, bs):
+        return self._inplace_logical_helper(bs, operator.iand)
+
+    def _ixor(self, bs):
+        return self._inplace_logical_helper(bs, operator.xor)
+
+    def _readbits(self, length, start):
+        """Read some bits from the bitstring and return newly constructed bitstring."""
+        return self._slice(start, start + length)
+
+    def _validate_slice(self, start, end):
+        """Validate start and end and return them as positive bit positions."""
+        if start is None:
+            start = 0
+        elif start < 0:
+            start += self.len
+        if end is None:
+            end = self.len
+        elif end < 0:
+            end += self.len
+        if not 0 <= end <= self.len:
+            raise ValueError("end is not a valid position in the bitstring.")
+        if not 0 <= start <= self.len:
+            raise ValueError("start is not a valid position in the bitstring.")
+        if end < start:
+            raise ValueError("end must not be less than start.")
+        return start, end
+
+    def unpack(self, fmt, **kwargs):
+        """Interpret the whole bitstring using fmt and return list.
+
+        fmt -- A single string or a list of strings with comma separated tokens
+               describing how to interpret the bits in the bitstring. Items
+               can also be integers, for reading new bitstring of the given length.
+        kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+                  format string will be replaced with their given value.
+
+        Raises ValueError if the format is not understood. If not enough bits
+        are available then all bits to the end of the bitstring will be used.
+
+        See the docstring for 'read' for token examples.
+
+        """
+        return self._readlist(fmt, 0, **kwargs)[0]
+
+    def _readlist(self, fmt, pos, **kwargs):
+        tokens = []
+        stretchy_token = None
+        if isinstance(fmt, basestring):
+            fmt = [fmt]
+        # Not very optimal this, but replace integers with 'bits' tokens
+        # TODO: optimise
+        for i, f in enumerate(fmt):
+            if isinstance(f, numbers.Integral):
+                fmt[i] = "bits:{0}".format(f)
+        for f_item in fmt:
+            stretchy, tkns = tokenparser(f_item, tuple(sorted(kwargs.keys())))
+            if stretchy:
+                if stretchy_token:
+                    raise Error("It's not possible to have more than one 'filler' token.")
+                stretchy_token = stretchy
+            tokens.extend(tkns)
+        if not stretchy_token:
+            lst = []
+            for name, length, _ in tokens:
+                if length in kwargs:
+                    length = kwargs[length]
+                    if name == 'bytes':
+                        length *= 8
+                if name in kwargs and length is None:
+                    # Using default 'uint' - the name is really the length.
+                    value, pos = self._readtoken('uint', pos, kwargs[name])
+                    lst.append(value)
+                    continue
+                value, pos = self._readtoken(name, pos, length)
+                if value is not None: # Don't append pad tokens
+                    lst.append(value)
+            return lst, pos
+        stretchy_token = False
+        bits_after_stretchy_token = 0
+        for token in tokens:
+            name, length, _ = token
+            if length in kwargs:
+                length = kwargs[length]
+                if name == 'bytes':
+                    length *= 8
+            if name in kwargs and length is None:
+                # Default 'uint'.
+                length = kwargs[name]
+            if stretchy_token:
+                if name in ('se', 'ue', 'sie', 'uie'):
+                    raise Error("It's not possible to parse a variable"
+                                "length token after a 'filler' token.")
+                else:
+                    if length is None:
+                        raise Error("It's not possible to have more than "
+                                    "one 'filler' token.")
+                    bits_after_stretchy_token += length
+            if length is None and name not in ('se', 'ue', 'sie', 'uie'):
+                assert not stretchy_token
+                stretchy_token = token
+        bits_left = self.len - pos
+        return_values = []
+        for token in tokens:
+            name, length, _ = token
+            if token is stretchy_token:
+                # Set length to the remaining bits
+                length = max(bits_left - bits_after_stretchy_token, 0)
+            if length in kwargs:
+                length = kwargs[length]
+                if name == 'bytes':
+                    length *= 8
+            if name in kwargs and length is None:
+                # Default 'uint'
+                length = kwargs[name]
+            if length is not None:
+                bits_left -= length
+            value, pos = self._readtoken(name, pos, length)
+            if value is not None:
+                return_values.append(value)
+        return return_values, pos
+
+    def _findbytes(self, bytes_, start, end, bytealigned):
+        """Quicker version of find when everything's whole byte
+        and byte aligned.
+
+        """
+        assert self._datastore.offset == 0
+        assert bytealigned is True
+        # Extract data bytes from bitstring to be found.
+        bytepos = (start + 7) // 8
+        found = False
+        p = bytepos
+        finalpos = end // 8
+        increment = max(1024, len(bytes_) * 10)
+        buffersize = increment + len(bytes_)
+        while p < finalpos:
+            # Read in file or from memory in overlapping chunks and search the chunks.
+            buf = bytearray(self._datastore.getbyteslice(p, min(p + buffersize, finalpos)))
+            pos = buf.find(bytes_)
+            if pos != -1:
+                found = True
+                p += pos
+                break
+            p += increment
+        if not found:
+            return ()
+        return (p * 8,)
+
+    def _findregex(self, reg_ex, start, end, bytealigned):
+        """Find first occurrence of a compiled regular expression.
+
+        Note that this doesn't support arbitrary regexes, in particular they
+        must match a known length.
+
+        """
+        p = start
+        length = len(reg_ex.pattern)
+        # We grab overlapping chunks of the binary representation and
+        # do an ordinary string search within that.
+        increment = max(4096, length * 10)
+        buffersize = increment + length
+        while p < end:
+            buf = self._readbin(min(buffersize, end - p), p)
+            # Test using regular expressions...
+            m = reg_ex.search(buf)
+            if m:
+                pos = m.start()
+            # pos = buf.find(targetbin)
+            # if pos != -1:
+                # if bytealigned then we only accept byte aligned positions.
+                if not bytealigned or (p + pos) % 8 == 0:
+                    return (p + pos,)
+                if bytealigned:
+                    # Advance to just beyond the non-byte-aligned match and try again...
+                    p += pos + 1
+                    continue
+            p += increment
+            # Not found, return empty tuple
+        return ()
+
+    def find(self, bs, start=None, end=None, bytealigned=None):
+        """Find first occurrence of substring bs.
+
+        Returns a single item tuple with the bit position if found, or an
+        empty tuple if not found. The bit position (pos property) will
+        also be set to the start of the substring if it is found.
+
+        bs -- The bitstring to find.
+        start -- The bit position to start the search. Defaults to 0.
+        end -- The bit position one past the last bit to search.
+               Defaults to self.len.
+        bytealigned -- If True the bitstring will only be
+                       found on byte boundaries.
+
+        Raises ValueError if bs is empty, if start < 0, if end > self.len or
+        if end < start.
+
+        >>> BitArray('0xc3e').find('0b1111')
+        (6,)
+
+        """
+        bs = Bits(bs)
+        if not bs.len:
+            raise ValueError("Cannot find an empty bitstring.")
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        if bytealigned and not bs.len % 8 and not self._datastore.offset:
+            p = self._findbytes(bs.bytes, start, end, bytealigned)
+        else:
+            p = self._findregex(re.compile(bs._getbin()), start, end, bytealigned)
+        # If called from a class that has a pos, set it
+        try:
+            self._pos = p[0]
+        except (AttributeError, IndexError):
+            pass
+        return p
+
+    def findall(self, bs, start=None, end=None, count=None, bytealigned=None):
+        """Find all occurrences of bs. Return generator of bit positions.
+
+        bs -- The bitstring to find.
+        start -- The bit position to start the search. Defaults to 0.
+        end -- The bit position one past the last bit to search.
+               Defaults to self.len.
+        count -- The maximum number of occurrences to find.
+        bytealigned -- If True the bitstring will only be found on
+                       byte boundaries.
+
+        Raises ValueError if bs is empty, if start < 0, if end > self.len or
+        if end < start.
+
+        Note that all occurrences of bs are found, even if they overlap.
+
+        """
+        if count is not None and count < 0:
+            raise ValueError("In findall, count must be >= 0.")
+        bs = Bits(bs)
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        c = 0
+        if bytealigned and not bs.len % 8 and not self._datastore.offset:
+            # Use the quick find method
+            f = self._findbytes
+            x = bs._getbytes()
+        else:
+            f = self._findregex
+            x = re.compile(bs._getbin())
+        while True:
+
+            p = f(x, start, end, bytealigned)
+            if not p:
+                break
+            if count is not None and c >= count:
+                return
+            c += 1
+            try:
+                self._pos = p[0]
+            except AttributeError:
+                pass
+            yield p[0]
+            if bytealigned:
+                start = p[0] + 8
+            else:
+                start = p[0] + 1
+            if start >= end:
+                break
+        return
+
+    def rfind(self, bs, start=None, end=None, bytealigned=None):
+        """Find final occurrence of substring bs.
+
+        Returns a single item tuple with the bit position if found, or an
+        empty tuple if not found. The bit position (pos property) will
+        also be set to the start of the substring if it is found.
+
+        bs -- The bitstring to find.
+        start -- The bit position to end the reverse search. Defaults to 0.
+        end -- The bit position one past the first bit to reverse search.
+               Defaults to self.len.
+        bytealigned -- If True the bitstring will only be found on byte
+                       boundaries.
+
+        Raises ValueError if bs is empty, if start < 0, if end > self.len or
+        if end < start.
+
+        """
+        bs = Bits(bs)
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        if not bs.len:
+            raise ValueError("Cannot find an empty bitstring.")
+        # Search chunks starting near the end and then moving back
+        # until we find bs.
+        increment = max(8192, bs.len * 80)
+        buffersize = min(increment + bs.len, end - start)
+        pos = max(start, end - buffersize)
+        while True:
+            found = list(self.findall(bs, start=pos, end=pos + buffersize,
+                                      bytealigned=bytealigned))
+            if not found:
+                if pos == start:
+                    return ()
+                pos = max(start, pos - increment)
+                continue
+            return (found[-1],)
+
+    def cut(self, bits, start=None, end=None, count=None):
+        """Return bitstring generator by cutting into bits sized chunks.
+
+        bits -- The size in bits of the bitstring chunks to generate.
+        start -- The bit position to start the first cut. Defaults to 0.
+        end -- The bit position one past the last bit to use in the cut.
+               Defaults to self.len.
+        count -- If specified then at most count items are generated.
+                 Default is to cut as many times as possible.
+
+        """
+        start, end = self._validate_slice(start, end)
+        if count is not None and count < 0:
+            raise ValueError("Cannot cut - count must be >= 0.")
+        if bits <= 0:
+            raise ValueError("Cannot cut - bits must be >= 0.")
+        c = 0
+        while count is None or c < count:
+            c += 1
+            nextchunk = self._slice(start, min(start + bits, end))
+            if nextchunk.len != bits:
+                return
+            assert nextchunk._assertsanity()
+            yield nextchunk
+            start += bits
+        return
+
+    def split(self, delimiter, start=None, end=None, count=None,
+              bytealigned=None):
+        """Return bitstring generator by splittling using a delimiter.
+
+        The first item returned is the initial bitstring before the delimiter,
+        which may be an empty bitstring.
+
+        delimiter -- The bitstring used as the divider.
+        start -- The bit position to start the split. Defaults to 0.
+        end -- The bit position one past the last bit to use in the split.
+               Defaults to self.len.
+        count -- If specified then at most count items are generated.
+                 Default is to split as many times as possible.
+        bytealigned -- If True splits will only occur on byte boundaries.
+
+        Raises ValueError if the delimiter is empty.
+
+        """
+        delimiter = Bits(delimiter)
+        if not delimiter.len:
+            raise ValueError("split delimiter cannot be empty.")
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        if count is not None and count < 0:
+            raise ValueError("Cannot split - count must be >= 0.")
+        if count == 0:
+            return
+        if bytealigned and not delimiter.len % 8 and not self._datastore.offset:
+            # Use the quick find method
+            f = self._findbytes
+            x = delimiter._getbytes()
+        else:
+            f = self._findregex
+            x = re.compile(delimiter._getbin())
+        found = f(x, start, end, bytealigned)
+        if not found:
+            # Initial bits are the whole bitstring being searched
+            yield self._slice(start, end)
+            return
+        # yield the bytes before the first occurrence of the delimiter, even if empty
+        yield self._slice(start, found[0])
+        startpos = pos = found[0]
+        c = 1
+        while count is None or c < count:
+            pos += delimiter.len
+            found = f(x, pos, end, bytealigned)
+            if not found:
+                # No more occurrences, so return the rest of the bitstring
+                yield self._slice(startpos, end)
+                return
+            c += 1
+            yield self._slice(startpos, found[0])
+            startpos = pos = found[0]
+        # Have generated count bitstrings, so time to quit.
+        return
+
+    def join(self, sequence):
+        """Return concatenation of bitstrings joined by self.
+
+        sequence -- A sequence of bitstrings.
+
+        """
+        s = self.__class__()
+        i = iter(sequence)
+        try:
+            s._append(Bits(next(i)))
+            while True:
+                n = next(i)
+                s._append(self)
+                s._append(Bits(n))
+        except StopIteration:
+            pass
+        return s
+
+    def tobytes(self):
+        """Return the bitstring as bytes, padding with zero bits if needed.
+
+        Up to seven zero bits will be added at the end to byte align.
+
+        """
+        d = offsetcopy(self._datastore, 0).rawbytes
+        # Need to ensure that unused bits at end are set to zero
+        unusedbits = 8 - self.len % 8
+        if unusedbits != 8:
+            d[-1] &= (0xff << unusedbits)
+        return bytes(d)
+
+    def tofile(self, f):
+        """Write the bitstring to a file object, padding with zero bits if needed.
+
+        Up to seven zero bits will be added at the end to byte align.
+
+        """
+        # If the bitstring is file based then we don't want to read it all
+        # in to memory.
+        chunksize = 1024 * 1024 # 1 MB chunks
+        if not self._offset:
+            a = 0
+            bytelen = self._datastore.bytelength
+            p = self._datastore.getbyteslice(a, min(a + chunksize, bytelen - 1))
+            while len(p) == chunksize:
+                f.write(p)
+                a += chunksize
+                p = self._datastore.getbyteslice(a, min(a + chunksize, bytelen - 1))
+            f.write(p)
+            # Now the final byte, ensuring that unused bits at end are set to 0.
+            bits_in_final_byte = self.len % 8
+            if not bits_in_final_byte:
+                bits_in_final_byte = 8
+            f.write(self[-bits_in_final_byte:].tobytes())
+        else:
+            # Really quite inefficient...
+            a = 0
+            b = a + chunksize * 8
+            while b <= self.len:
+                f.write(self._slice(a, b)._getbytes())
+                a += chunksize * 8
+                b += chunksize * 8
+            if a != self.len:
+                f.write(self._slice(a, self.len).tobytes())
+
+    def startswith(self, prefix, start=None, end=None):
+        """Return whether the current bitstring starts with prefix.
+
+        prefix -- The bitstring to search for.
+        start -- The bit position to start from. Defaults to 0.
+        end -- The bit position to end at. Defaults to self.len.
+
+        """
+        prefix = Bits(prefix)
+        start, end = self._validate_slice(start, end)
+        if end < start + prefix.len:
+            return False
+        end = start + prefix.len
+        return self._slice(start, end) == prefix
+
+    def endswith(self, suffix, start=None, end=None):
+        """Return whether the current bitstring ends with suffix.
+
+        suffix -- The bitstring to search for.
+        start -- The bit position to start from. Defaults to 0.
+        end -- The bit position to end at. Defaults to self.len.
+
+        """
+        suffix = Bits(suffix)
+        start, end = self._validate_slice(start, end)
+        if start + suffix.len > end:
+            return False
+        start = end - suffix.len
+        return self._slice(start, end) == suffix
+
+    def all(self, value, pos=None):
+        """Return True if one or many bits are all set to value.
+
+        value -- If value is True then checks for bits set to 1, otherwise
+                 checks for bits set to 0.
+        pos -- An iterable of bit positions. Negative numbers are treated in
+               the same way as slice indices. Defaults to the whole bitstring.
+
+        """
+        value = bool(value)
+        length = self.len
+        if pos is None:
+            pos = xrange(self.len)
+        for p in pos:
+            if p < 0:
+                p += length
+            if not 0 <= p < length:
+                raise IndexError("Bit position {0} out of range.".format(p))
+            if not self._datastore.getbit(p) is value:
+                return False
+        return True
+
+    def any(self, value, pos=None):
+        """Return True if any of one or many bits are set to value.
+
+        value -- If value is True then checks for bits set to 1, otherwise
+                 checks for bits set to 0.
+        pos -- An iterable of bit positions. Negative numbers are treated in
+               the same way as slice indices. Defaults to the whole bitstring.
+
+        """
+        value = bool(value)
+        length = self.len
+        if pos is None:
+            pos = xrange(self.len)
+        for p in pos:
+            if p < 0:
+                p += length
+            if not 0 <= p < length:
+                raise IndexError("Bit position {0} out of range.".format(p))
+            if self._datastore.getbit(p) is value:
+                return True
+        return False
+
+    def count(self, value):
+        """Return count of total number of either zero or one bits.
+
+        value -- If True then bits set to 1 are counted, otherwise bits set
+                 to 0 are counted.
+
+        >>> Bits('0xef').count(1)
+        7
+
+        """
+        if not self.len:
+            return 0
+        # count the number of 1s (from which it's easy to work out the 0s).
+        # Don't count the final byte yet.
+        count = sum(BIT_COUNT[self._datastore.getbyte(i)] for i in xrange(self._datastore.bytelength - 1))
+        # adjust for bits at start that aren't part of the bitstring
+        if self._offset:
+            count -= BIT_COUNT[self._datastore.getbyte(0) >> (8 - self._offset)]
+        # and count the last 1 - 8 bits at the end.
+        endbits = self._datastore.bytelength * 8 - (self._offset + self.len)
+        count += BIT_COUNT[self._datastore.getbyte(self._datastore.bytelength - 1) >> endbits]
+        return count if value else self.len - count
+
+    # Create native-endian functions as aliases depending on the byteorder
+    if byteorder == 'little':
+        _setfloatne = _setfloatle
+        _readfloatne = _readfloatle
+        _getfloatne = _getfloatle
+        _setuintne = _setuintle
+        _readuintne = _readuintle
+        _getuintne = _getuintle
+        _setintne = _setintle
+        _readintne = _readintle
+        _getintne = _getintle
+    else:
+        _setfloatne = _setfloat
+        _readfloatne = _readfloat
+        _getfloatne = _getfloat
+        _setuintne = _setuintbe
+        _readuintne = _readuintbe
+        _getuintne = _getuintbe
+        _setintne = _setintbe
+        _readintne = _readintbe
+        _getintne = _getintbe
+
+    _offset = property(_getoffset)
+
+    len = property(_getlength,
+                   doc="""The length of the bitstring in bits. Read only.
+                      """)
+    length = property(_getlength,
+                      doc="""The length of the bitstring in bits. Read only.
+                      """)
+    bool = property(_getbool,
+                    doc="""The bitstring as a bool (True or False). Read only.
+                    """)
+    hex = property(_gethex,
+                   doc="""The bitstring as a hexadecimal string. Read only.
+                   """)
+    bin = property(_getbin,
+                   doc="""The bitstring as a binary string. Read only.
+                   """)
+    oct = property(_getoct,
+                   doc="""The bitstring as an octal string. Read only.
+                   """)
+    bytes = property(_getbytes,
+                     doc="""The bitstring as a bytes object. Read only.
+                      """)
+    int = property(_getint,
+                   doc="""The bitstring as a two's complement signed int. Read only.
+                      """)
+    uint = property(_getuint,
+                    doc="""The bitstring as a two's complement unsigned int. Read only.
+                      """)
+    float = property(_getfloat,
+                     doc="""The bitstring as a floating point number. Read only.
+                      """)
+    intbe = property(_getintbe,
+                     doc="""The bitstring as a two's complement big-endian signed int. Read only.
+                      """)
+    uintbe = property(_getuintbe,
+                      doc="""The bitstring as a two's complement big-endian unsigned int. Read only.
+                      """)
+    floatbe = property(_getfloat,
+                       doc="""The bitstring as a big-endian floating point number. Read only.
+                      """)
+    intle = property(_getintle,
+                     doc="""The bitstring as a two's complement little-endian signed int. Read only.
+                      """)
+    uintle = property(_getuintle,
+                      doc="""The bitstring as a two's complement little-endian unsigned int. Read only.
+                      """)
+    floatle = property(_getfloatle,
+                       doc="""The bitstring as a little-endian floating point number. Read only.
+                      """)
+    intne = property(_getintne,
+                     doc="""The bitstring as a two's complement native-endian signed int. Read only.
+                      """)
+    uintne = property(_getuintne,
+                      doc="""The bitstring as a two's complement native-endian unsigned int. Read only.
+                      """)
+    floatne = property(_getfloatne,
+                       doc="""The bitstring as a native-endian floating point number. Read only.
+                      """)
+    ue = property(_getue,
+                  doc="""The bitstring as an unsigned exponential-Golomb code. Read only.
+                      """)
+    se = property(_getse,
+                  doc="""The bitstring as a signed exponential-Golomb code. Read only.
+                      """)
+    uie = property(_getuie,
+                   doc="""The bitstring as an unsigned interleaved exponential-Golomb code. Read only.
+                      """)
+    sie = property(_getsie,
+                   doc="""The bitstring as a signed interleaved exponential-Golomb code. Read only.
+                      """)
+
+
+# Dictionary that maps token names to the function that reads them.
+name_to_read = {'uint': Bits._readuint,
+                'uintle': Bits._readuintle,
+                'uintbe': Bits._readuintbe,
+                'uintne': Bits._readuintne,
+                'int': Bits._readint,
+                'intle': Bits._readintle,
+                'intbe': Bits._readintbe,
+                'intne': Bits._readintne,
+                'float': Bits._readfloat,
+                'floatbe': Bits._readfloat, # floatbe is a synonym for float
+                'floatle': Bits._readfloatle,
+                'floatne': Bits._readfloatne,
+                'hex': Bits._readhex,
+                'oct': Bits._readoct,
+                'bin': Bits._readbin,
+                'bits': Bits._readbits,
+                'bytes': Bits._readbytes,
+                'ue': Bits._readue,
+                'se': Bits._readse,
+                'uie': Bits._readuie,
+                'sie': Bits._readsie,
+                'bool': Bits._readbool,
+                }
+
+# Dictionaries for mapping init keywords with init functions.
+init_with_length_and_offset = {'bytes': Bits._setbytes_safe,
+                               'filename': Bits._setfile,
+                               }
+
+init_with_length_only = {'uint': Bits._setuint,
+                         'int': Bits._setint,
+                         'float': Bits._setfloat,
+                         'uintbe': Bits._setuintbe,
+                         'intbe': Bits._setintbe,
+                         'floatbe': Bits._setfloat,
+                         'uintle': Bits._setuintle,
+                         'intle': Bits._setintle,
+                         'floatle': Bits._setfloatle,
+                         'uintne': Bits._setuintne,
+                         'intne': Bits._setintne,
+                         'floatne': Bits._setfloatne,
+                         }
+
+init_without_length_or_offset = {'bin': Bits._setbin_safe,
+                                 'hex': Bits._sethex,
+                                 'oct': Bits._setoct,
+                                 'ue': Bits._setue,
+                                 'se': Bits._setse,
+                                 'uie': Bits._setuie,
+                                 'sie': Bits._setsie,
+                                 'bool': Bits._setbool,
+                                 }
+
+
+class BitArray(Bits):
+    """A container holding a mutable sequence of bits.
+
+    Subclass of the immutable Bits class. Inherits all of its
+    methods (except __hash__) and adds mutating methods.
+
+    Mutating methods:
+
+    append() -- Append a bitstring.
+    byteswap() -- Change byte endianness in-place.
+    insert() -- Insert a bitstring.
+    invert() -- Flip bit(s) between one and zero.
+    overwrite() -- Overwrite a section with a new bitstring.
+    prepend() -- Prepend a bitstring.
+    replace() -- Replace occurrences of one bitstring with another.
+    reverse() -- Reverse bits in-place.
+    rol() -- Rotate bits to the left.
+    ror() -- Rotate bits to the right.
+    set() -- Set bit(s) to 1 or 0.
+
+    Methods inherited from Bits:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    join() -- Join bitstrings together using current bitstring.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Special methods:
+
+    Mutating operators are available: [], <<=, >>=, +=, *=, &=, |= and ^=
+    in addition to the inherited [], ==, !=, +, *, ~, <<, >>, &, | and ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytepos -- The current byte position in the bitstring.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    pos -- The current bit position in the bitstring.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ()
+
+    # As BitArray objects are mutable, we shouldn't allow them to be hashed.
+    __hash__ = None
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        # For mutable BitArrays we always read in files to memory:
+        if not isinstance(self._datastore, ByteStore):
+            self._ensureinmemory()
+
+    def __new__(cls, auto=None, length=None, offset=None, **kwargs):
+        x = super(BitArray, cls).__new__(cls)
+        y = Bits.__new__(BitArray, auto, length, offset, **kwargs)
+        x._datastore = y._datastore
+        return x
+
+    def __iadd__(self, bs):
+        """Append bs to current bitstring. Return self.
+
+        bs -- the bitstring to append.
+
+        """
+        self.append(bs)
+        return self
+
+    def __copy__(self):
+        """Return a new copy of the BitArray."""
+        s_copy = BitArray()
+        if not isinstance(self._datastore, ByteStore):
+            # Let them both point to the same (invariant) array.
+            # If either gets modified then at that point they'll be read into memory.
+            s_copy._datastore = self._datastore
+        else:
+            s_copy._datastore = copy.copy(self._datastore)
+        return s_copy
+
+    def __setitem__(self, key, value):
+        """Set item or range to new value.
+
+        Indices are in units of the step parameter (default 1 bit).
+        Stepping is used to specify the number of bits in each item.
+
+        If the length of the bitstring is changed then pos will be moved
+        to after the inserted section, otherwise it will remain unchanged.
+
+        >>> s = BitArray('0xff')
+        >>> s[0:1:4] = '0xe'
+        >>> print s
+        '0xef'
+        >>> s[4:4] = '0x00'
+        >>> print s
+        '0xe00f'
+
+        """
+        try:
+            # A slice
+            start, step = 0, 1
+            if key.step is not None:
+                step = key.step
+        except AttributeError:
+            # single element
+            if key < 0:
+                key += self.len
+            if not 0 <= key < self.len:
+                raise IndexError("Slice index out of range.")
+            if isinstance(value, numbers.Integral):
+                if not value:
+                    self._unset(key)
+                    return
+                if value in (1, -1):
+                    self._set(key)
+                    return
+                raise ValueError("Cannot set a single bit with integer {0}.".format(value))
+            value = Bits(value)
+            if value.len == 1:
+                # TODO: this can't be optimal
+                if value[0]:
+                    self._set(key)
+                else:
+                    self._unset(key)
+            else:
+                self._delete(1, key)
+                self._insert(value, key)
+            return
+        else:
+            if step != 1:
+                # convert to binary string and use string slicing
+                # TODO: Horribly inefficent
+                temp = list(self._getbin())
+                v = list(Bits(value)._getbin())
+                temp.__setitem__(key, v)
+                self._setbin_unsafe(''.join(temp))
+                return
+
+            # If value is an integer then we want to set the slice to that
+            # value rather than initialise a new bitstring of that length.
+            if not isinstance(value, numbers.Integral):
+                try:
+                    # TODO: Better way than calling constructor here?
+                    value = Bits(value)
+                except TypeError:
+                    raise TypeError("Bitstring, integer or string expected. "
+                                    "Got {0}.".format(type(value)))
+            if key.start is not None:
+                start = key.start
+                if key.start < 0:
+                    start += self.len
+                if start < 0:
+                    start = 0
+            stop = self.len
+            if key.stop is not None:
+                stop = key.stop
+                if key.stop < 0:
+                    stop += self.len
+            if start > stop:
+                # The standard behaviour for lists is to just insert at the
+                # start position if stop < start and step == 1.
+                stop = start
+            if isinstance(value, numbers.Integral):
+                if value >= 0:
+                    value = self.__class__(uint=value, length=stop - start)
+                else:
+                    value = self.__class__(int=value, length=stop - start)
+            stop = min(stop, self.len)
+            start = max(start, 0)
+            start = min(start, stop)
+            if (stop - start) == value.len:
+                if not value.len:
+                    return
+                if step >= 0:
+                    self._overwrite(value, start)
+                else:
+                    self._overwrite(value.__getitem__(slice(None, None, 1)), start)
+            else:
+                # TODO: A delete then insert is wasteful - it could do unneeded shifts.
+                # Could be either overwrite + insert or overwrite + delete.
+                self._delete(stop - start, start)
+                if step >= 0:
+                    self._insert(value, start)
+                else:
+                    self._insert(value.__getitem__(slice(None, None, 1)), start)
+                # pos is now after the inserted piece.
+            return
+
+    def __delitem__(self, key):
+        """Delete item or range.
+
+        Indices are in units of the step parameter (default 1 bit).
+        Stepping is used to specify the number of bits in each item.
+
+        >>> a = BitArray('0x001122')
+        >>> del a[1:2:8]
+        >>> print a
+        0x0022
+
+        """
+        try:
+            # A slice
+            start = 0
+            step = key.step if key.step is not None else 1
+        except AttributeError:
+            # single element
+            if key < 0:
+                key += self.len
+            if not 0 <= key < self.len:
+                raise IndexError("Slice index out of range.")
+            self._delete(1, key)
+            return
+        else:
+            if step != 1:
+                # convert to binary string and use string slicing
+                # TODO: Horribly inefficent
+                temp = list(self._getbin())
+                temp.__delitem__(key)
+                self._setbin_unsafe(''.join(temp))
+                return
+            stop = key.stop
+            if key.start is not None:
+                start = key.start
+                if key.start < 0 and stop is None:
+                    start += self.len
+                if start < 0:
+                    start = 0
+            if stop is None:
+                stop = self.len
+            if start > stop:
+                return
+            stop = min(stop, self.len)
+            start = max(start, 0)
+            start = min(start, stop)
+            self._delete(stop - start, start)
+            return
+
+    def __ilshift__(self, n):
+        """Shift bits by n to the left in place. Return self.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        if not n:
+            return self
+        n = min(n, self.len)
+        return self._ilshift(n)
+
+    def __irshift__(self, n):
+        """Shift bits by n to the right in place. Return self.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        if not n:
+            return self
+        n = min(n, self.len)
+        return self._irshift(n)
+
+    def __imul__(self, n):
+        """Concatenate n copies of self in place. Return self.
+
+        Called for expressions of the form 'a *= 3'.
+        n -- The number of concatenations. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot multiply by a negative integer.")
+        return self._imul(n)
+
+    def __ior__(self, bs):
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for |= operator.")
+        return self._ior(bs)
+
+    def __iand__(self, bs):
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for &= operator.")
+        return self._iand(bs)
+
+    def __ixor__(self, bs):
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for ^= operator.")
+        return self._ixor(bs)
+
+    def replace(self, old, new, start=None, end=None, count=None,
+                bytealigned=None):
+        """Replace all occurrences of old with new in place.
+
+        Returns number of replacements made.
+
+        old -- The bitstring to replace.
+        new -- The replacement bitstring.
+        start -- Any occurrences that start before this will not be replaced.
+                 Defaults to 0.
+        end -- Any occurrences that finish after this will not be replaced.
+               Defaults to self.len.
+        count -- The maximum number of replacements to make. Defaults to
+                 replace all occurrences.
+        bytealigned -- If True replacements will only be made on byte
+                       boundaries.
+
+        Raises ValueError if old is empty or if start or end are
+        out of range.
+
+        """
+        old = Bits(old)
+        new = Bits(new)
+        if not old.len:
+            raise ValueError("Empty bitstring cannot be replaced.")
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        # Adjust count for use in split()
+        if count is not None:
+            count += 1
+        sections = self.split(old, start, end, count, bytealigned)
+        lengths = [s.len for s in sections]
+        if len(lengths) == 1:
+            # Didn't find anything to replace.
+            return 0 # no replacements done
+        if new is self:
+            # Prevent self assignment woes
+            new = copy.copy(self)
+        positions = [lengths[0] + start]
+        for l in lengths[1:-1]:
+            # Next position is the previous one plus the length of the next section.
+            positions.append(positions[-1] + l)
+        # We have all the positions that need replacements. We do them
+        # in reverse order so that they won't move around as we replace.
+        positions.reverse()
+        try:
+            # Need to calculate new pos, if this is a bitstream
+            newpos = self._pos
+            for p in positions:
+                self[p:p + old.len] = new
+            if old.len != new.len:
+                diff = new.len - old.len
+                for p in positions:
+                    if p >= newpos:
+                        continue
+                    if p + old.len <= newpos:
+                        newpos += diff
+                    else:
+                        newpos = p
+            self._pos = newpos
+        except AttributeError:
+            for p in positions:
+                self[p:p + old.len] = new
+        assert self._assertsanity()
+        return len(lengths) - 1
+
+    def insert(self, bs, pos=None):
+        """Insert bs at bit position pos.
+
+        bs -- The bitstring to insert.
+        pos -- The bit position to insert at.
+
+        Raises ValueError if pos < 0 or pos > self.len.
+
+        """
+        bs = Bits(bs)
+        if not bs.len:
+            return self
+        if bs is self:
+            bs = self.__copy__()
+        if pos is None:
+            try:
+                pos = self._pos
+            except AttributeError:
+                raise TypeError("insert require a bit position for this type.")
+        if pos < 0:
+            pos += self.len
+        if not 0 <= pos <= self.len:
+            raise ValueError("Invalid insert position.")
+        self._insert(bs, pos)
+
+    def overwrite(self, bs, pos=None):
+        """Overwrite with bs at bit position pos.
+
+        bs -- The bitstring to overwrite with.
+        pos -- The bit position to begin overwriting from.
+
+        Raises ValueError if pos < 0 or pos + bs.len > self.len
+
+        """
+        bs = Bits(bs)
+        if not bs.len:
+            return
+        if pos is None:
+            try:
+                pos = self._pos
+            except AttributeError:
+                raise TypeError("overwrite require a bit position for this type.")
+        if pos < 0:
+            pos += self.len
+        if pos < 0 or pos + bs.len > self.len:
+            raise ValueError("Overwrite exceeds boundary of bitstring.")
+        self._overwrite(bs, pos)
+        try:
+            self._pos = pos + bs.len
+        except AttributeError:
+            pass
+
+    def append(self, bs):
+        """Append a bitstring to the current bitstring.
+
+        bs -- The bitstring to append.
+
+        """
+        # The offset is a hint to make bs easily appendable.
+        bs = self._converttobitstring(bs, offset=(self.len + self._offset) % 8)
+        self._append(bs)
+
+    def prepend(self, bs):
+        """Prepend a bitstring to the current bitstring.
+
+        bs -- The bitstring to prepend.
+
+        """
+        bs = Bits(bs)
+        self._prepend(bs)
+
+    def reverse(self, start=None, end=None):
+        """Reverse bits in-place.
+
+        start -- Position of first bit to reverse. Defaults to 0.
+        end -- One past the position of the last bit to reverse.
+               Defaults to self.len.
+
+        Using on an empty bitstring will have no effect.
+
+        Raises ValueError if start < 0, end > self.len or end < start.
+
+        """
+        start, end = self._validate_slice(start, end)
+        if start == 0 and end == self.len:
+            self._reverse()
+            return
+        s = self._slice(start, end)
+        s._reverse()
+        self[start:end] = s
+
+    def set(self, value, pos=None):
+        """Set one or many bits to 1 or 0.
+
+        value -- If True bits are set to 1, otherwise they are set to 0.
+        pos -- Either a single bit position or an iterable of bit positions.
+               Negative numbers are treated in the same way as slice indices.
+               Defaults to the entire bitstring.
+
+        Raises IndexError if pos < -self.len or pos >= self.len.
+
+        """
+        f = self._set if value else self._unset
+        if pos is None:
+            pos = xrange(self.len)
+        try:
+            length = self.len
+            for p in pos:
+                if p < 0:
+                    p += length
+                if not 0 <= p < length:
+                    raise IndexError("Bit position {0} out of range.".format(p))
+                f(p)
+        except TypeError:
+            # Single pos
+            if pos < 0:
+                pos += self.len
+            if not 0 <= pos < length:
+                raise IndexError("Bit position {0} out of range.".format(pos))
+            f(pos)
+
+    def invert(self, pos=None):
+        """Invert one or many bits from 0 to 1 or vice versa.
+
+        pos -- Either a single bit position or an iterable of bit positions.
+               Negative numbers are treated in the same way as slice indices.
+
+        Raises IndexError if pos < -self.len or pos >= self.len.
+
+        """
+        if pos is None:
+            self._invert_all()
+            return
+        if not isinstance(pos, collections.Iterable):
+            pos = (pos,)
+        length = self.len
+
+        for p in pos:
+            if p < 0:
+                p += length
+            if not 0 <= p < length:
+                raise IndexError("Bit position {0} out of range.".format(p))
+            self._invert(p)
+
+    def ror(self, bits, start=None, end=None):
+        """Rotate bits to the right in-place.
+
+        bits -- The number of bits to rotate by.
+        start -- Start of slice to rotate. Defaults to 0.
+        end -- End of slice to rotate. Defaults to self.len.
+
+        Raises ValueError if bits < 0.
+
+        """
+        if not self.len:
+            raise Error("Cannot rotate an empty bitstring.")
+        if bits < 0:
+            raise ValueError("Cannot rotate right by negative amount.")
+        start, end = self._validate_slice(start, end)
+        bits %= (end - start)
+        if not bits:
+            return
+        rhs = self._slice(end - bits, end)
+        self._delete(bits, end - bits)
+        self._insert(rhs, start)
+
+    def rol(self, bits, start=None, end=None):
+        """Rotate bits to the left in-place.
+
+        bits -- The number of bits to rotate by.
+        start -- Start of slice to rotate. Defaults to 0.
+        end -- End of slice to rotate. Defaults to self.len.
+
+        Raises ValueError if bits < 0.
+
+        """
+        if not self.len:
+            raise Error("Cannot rotate an empty bitstring.")
+        if bits < 0:
+            raise ValueError("Cannot rotate left by negative amount.")
+        start, end = self._validate_slice(start, end)
+        bits %= (end - start)
+        if not bits:
+            return
+        lhs = self._slice(start, start + bits)
+        self._delete(bits, start)
+        self._insert(lhs, end - bits)
+
+    def byteswap(self, fmt=None, start=None, end=None, repeat=True):
+        """Change the endianness in-place. Return number of repeats of fmt done.
+
+        fmt -- A compact structure string, an integer number of bytes or
+               an iterable of integers. Defaults to 0, which byte reverses the
+               whole bitstring.
+        start -- Start bit position, defaults to 0.
+        end -- End bit position, defaults to self.len.
+        repeat -- If True (the default) the byte swapping pattern is repeated
+                  as much as possible.
+
+        """
+        start, end = self._validate_slice(start, end)
+        if fmt is None or fmt == 0:
+            # reverse all of the whole bytes.
+            bytesizes = [(end - start) // 8]
+        elif isinstance(fmt, numbers.Integral):
+            if fmt < 0:
+                raise ValueError("Improper byte length {0}.".format(fmt))
+            bytesizes = [fmt]
+        elif isinstance(fmt, basestring):
+            m = STRUCT_PACK_RE.match(fmt)
+            if not m:
+                raise ValueError("Cannot parse format string {0}.".format(fmt))
+            # Split the format string into a list of 'q', '4h' etc.
+            formatlist = re.findall(STRUCT_SPLIT_RE, m.group('fmt'))
+            # Now deal with multiplicative factors, 4h -> hhhh etc.
+            bytesizes = []
+            for f in formatlist:
+                if len(f) == 1:
+                    bytesizes.append(PACK_CODE_SIZE[f])
+                else:
+                    bytesizes.extend([PACK_CODE_SIZE[f[-1]]] * int(f[:-1]))
+        elif isinstance(fmt, collections.Iterable):
+            bytesizes = fmt
+            for bytesize in bytesizes:
+                if not isinstance(bytesize, numbers.Integral) or bytesize < 0:
+                    raise ValueError("Improper byte length {0}.".format(bytesize))
+        else:
+            raise TypeError("Format must be an integer, string or iterable.")
+
+        repeats = 0
+        totalbitsize = 8 * sum(bytesizes)
+        if not totalbitsize:
+            return 0
+        if repeat:
+            # Try to repeat up to the end of the bitstring.
+            finalbit = end
+        else:
+            # Just try one (set of) byteswap(s).
+            finalbit = start + totalbitsize
+        for patternend in xrange(start + totalbitsize, finalbit + 1, totalbitsize):
+            bytestart = patternend - totalbitsize
+            for bytesize in bytesizes:
+                byteend = bytestart + bytesize * 8
+                self._reversebytes(bytestart, byteend)
+                bytestart += bytesize * 8
+            repeats += 1
+        return repeats
+
+    def clear(self):
+        """Remove all bits, reset to zero length."""
+        self._clear()
+
+    def copy(self):
+        """Return a copy of the bitstring."""
+        return self._copy()
+
+    int = property(Bits._getint, Bits._setint,
+                   doc="""The bitstring as a two's complement signed int. Read and write.
+                      """)
+    uint = property(Bits._getuint, Bits._setuint,
+                    doc="""The bitstring as a two's complement unsigned int. Read and write.
+                      """)
+    float = property(Bits._getfloat, Bits._setfloat,
+                     doc="""The bitstring as a floating point number. Read and write.
+                      """)
+    intbe = property(Bits._getintbe, Bits._setintbe,
+                     doc="""The bitstring as a two's complement big-endian signed int. Read and write.
+                      """)
+    uintbe = property(Bits._getuintbe, Bits._setuintbe,
+                      doc="""The bitstring as a two's complement big-endian unsigned int. Read and write.
+                      """)
+    floatbe = property(Bits._getfloat, Bits._setfloat,
+                       doc="""The bitstring as a big-endian floating point number. Read and write.
+                      """)
+    intle = property(Bits._getintle, Bits._setintle,
+                     doc="""The bitstring as a two's complement little-endian signed int. Read and write.
+                      """)
+    uintle = property(Bits._getuintle, Bits._setuintle,
+                      doc="""The bitstring as a two's complement little-endian unsigned int. Read and write.
+                      """)
+    floatle = property(Bits._getfloatle, Bits._setfloatle,
+                       doc="""The bitstring as a little-endian floating point number. Read and write.
+                      """)
+    intne = property(Bits._getintne, Bits._setintne,
+                     doc="""The bitstring as a two's complement native-endian signed int. Read and write.
+                      """)
+    uintne = property(Bits._getuintne, Bits._setuintne,
+                      doc="""The bitstring as a two's complement native-endian unsigned int. Read and write.
+                      """)
+    floatne = property(Bits._getfloatne, Bits._setfloatne,
+                       doc="""The bitstring as a native-endian floating point number. Read and write.
+                      """)
+    ue = property(Bits._getue, Bits._setue,
+                  doc="""The bitstring as an unsigned exponential-Golomb code. Read and write.
+                      """)
+    se = property(Bits._getse, Bits._setse,
+                  doc="""The bitstring as a signed exponential-Golomb code. Read and write.
+                      """)
+    uie = property(Bits._getuie, Bits._setuie,
+                  doc="""The bitstring as an unsigned interleaved exponential-Golomb code. Read and write.
+                      """)
+    sie = property(Bits._getsie, Bits._setsie,
+                  doc="""The bitstring as a signed interleaved exponential-Golomb code. Read and write.
+                      """)
+    hex = property(Bits._gethex, Bits._sethex,
+                   doc="""The bitstring as a hexadecimal string. Read and write.
+                       """)
+    bin = property(Bits._getbin, Bits._setbin_safe,
+                   doc="""The bitstring as a binary string. Read and write.
+                       """)
+    oct = property(Bits._getoct, Bits._setoct,
+                   doc="""The bitstring as an octal string. Read and write.
+                       """)
+    bool = property(Bits._getbool, Bits._setbool,
+                    doc="""The bitstring as a bool (True or False). Read and write.
+                    """)
+    bytes = property(Bits._getbytes, Bits._setbytes_safe,
+                     doc="""The bitstring as a ordinary string. Read and write.
+                      """)
+
+
+
+class ConstBitStream(Bits):
+    """A container or stream holding an immutable sequence of bits.
+
+    For a mutable container use the BitStream class instead.
+
+    Methods inherited from Bits:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    join() -- Join bitstrings together using current bitstring.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Other methods:
+
+    bytealign() -- Align to next byte boundary.
+    peek() -- Peek at and interpret next bits as a single item.
+    peeklist() -- Peek at and interpret next bits as a list of items.
+    read() -- Read and interpret next bits as a single item.
+    readlist() -- Read and interpret next bits as a list of items.
+
+    Special methods:
+
+    Also available are the operators [], ==, !=, +, *, ~, <<, >>, &, |, ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytepos -- The current byte position in the bitstring.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    pos -- The current bit position in the bitstring.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ('_pos')
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        self._pos = 0
+
+    def __new__(cls, auto=None, length=None, offset=None, **kwargs):
+        x = super(ConstBitStream, cls).__new__(cls)
+        x._initialise(auto, length, offset, **kwargs)
+        return x
+
+    def _setbytepos(self, bytepos):
+        """Move to absolute byte-aligned position in stream."""
+        self._setbitpos(bytepos * 8)
+
+    def _getbytepos(self):
+        """Return the current position in the stream in bytes. Must be byte aligned."""
+        if self._pos % 8:
+            raise ByteAlignError("Not byte aligned in _getbytepos().")
+        return self._pos // 8
+
+    def _setbitpos(self, pos):
+        """Move to absolute postion bit in bitstream."""
+        if pos < 0:
+            raise ValueError("Bit position cannot be negative.")
+        if pos > self.len:
+            raise ValueError("Cannot seek past the end of the data.")
+        self._pos = pos
+
+    def _getbitpos(self):
+        """Return the current position in the stream in bits."""
+        return self._pos
+
+    def _clear(self):
+        Bits._clear(self)
+        self._pos = 0
+
+    def __copy__(self):
+        """Return a new copy of the ConstBitStream for the copy module."""
+        # Note that if you want a new copy (different ID), use _copy instead.
+        # The copy can use the same datastore as it's immutable.
+        s = ConstBitStream()
+        s._datastore = self._datastore
+        # Reset the bit position, don't copy it.
+        s._pos = 0
+        return s
+
+    def __add__(self, bs):
+        """Concatenate bitstrings and return new bitstring.
+
+        bs -- the bitstring to append.
+
+        """
+        s = Bits.__add__(self, bs)
+        s._pos = 0
+        return s
+
+    def read(self, fmt):
+        """Interpret next bits according to the format string and return result.
+
+        fmt -- Token string describing how to interpret the next bits.
+
+        Token examples: 'int:12'    : 12 bits as a signed integer
+                        'uint:8'    : 8 bits as an unsigned integer
+                        'float:64'  : 8 bytes as a big-endian float
+                        'intbe:16'  : 2 bytes as a big-endian signed integer
+                        'uintbe:16' : 2 bytes as a big-endian unsigned integer
+                        'intle:32'  : 4 bytes as a little-endian signed integer
+                        'uintle:32' : 4 bytes as a little-endian unsigned integer
+                        'floatle:64': 8 bytes as a little-endian float
+                        'intne:24'  : 3 bytes as a native-endian signed integer
+                        'uintne:24' : 3 bytes as a native-endian unsigned integer
+                        'floatne:32': 4 bytes as a native-endian float
+                        'hex:80'    : 80 bits as a hex string
+                        'oct:9'     : 9 bits as an octal string
+                        'bin:1'     : single bit binary string
+                        'ue'        : next bits as unsigned exp-Golomb code
+                        'se'        : next bits as signed exp-Golomb code
+                        'uie'       : next bits as unsigned interleaved exp-Golomb code
+                        'sie'       : next bits as signed interleaved exp-Golomb code
+                        'bits:5'    : 5 bits as a bitstring
+                        'bytes:10'  : 10 bytes as a bytes object
+                        'bool'      : 1 bit as a bool
+                        'pad:3'     : 3 bits of padding to ignore - returns None
+
+        fmt may also be an integer, which will be treated like the 'bits' token.
+
+        The position in the bitstring is advanced to after the read items.
+
+        Raises ReadError if not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        """
+        if isinstance(fmt, numbers.Integral):
+            if fmt < 0:
+                raise ValueError("Cannot read negative amount.")
+            if fmt > self.len - self._pos:
+                raise ReadError("Cannot read {0} bits, only {1} available.",
+                                fmt, self.len - self._pos)
+            bs = self._slice(self._pos, self._pos + fmt)
+            self._pos += fmt
+            return bs
+        p = self._pos
+        _, token = tokenparser(fmt)
+        if len(token) != 1:
+            self._pos = p
+            raise ValueError("Format string should be a single token, not {0} "
+                             "tokens - use readlist() instead.".format(len(token)))
+        name, length, _ = token[0]
+        if length is None:
+            length = self.len - self._pos
+        value, self._pos = self._readtoken(name, self._pos, length)
+        return value
+
+    def readlist(self, fmt, **kwargs):
+        """Interpret next bits according to format string(s) and return list.
+
+        fmt -- A single string or list of strings with comma separated tokens
+               describing how to interpret the next bits in the bitstring. Items
+               can also be integers, for reading new bitstring of the given length.
+        kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+                  format string will be replaced with their given value.
+
+        The position in the bitstring is advanced to after the read items.
+
+        Raises ReadError is not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        See the docstring for 'read' for token examples. 'pad' tokens are skipped
+        and not added to the returned list.
+
+        >>> h, b1, b2 = s.readlist('hex:20, bin:5, bin:3')
+        >>> i, bs1, bs2 = s.readlist(['uint:12', 10, 10])
+
+        """
+        value, self._pos = self._readlist(fmt, self._pos, **kwargs)
+        return value
+
+    def readto(self, bs, bytealigned=None):
+        """Read up to and including next occurrence of bs and return result.
+
+        bs -- The bitstring to find. An integer is not permitted.
+        bytealigned -- If True the bitstring will only be
+                       found on byte boundaries.
+
+        Raises ValueError if bs is empty.
+        Raises ReadError if bs is not found.
+
+        """
+        if isinstance(bs, numbers.Integral):
+            raise ValueError("Integers cannot be searched for")
+        bs = Bits(bs)
+        oldpos = self._pos
+        p = self.find(bs, self._pos, bytealigned=bytealigned)
+        if not p:
+            raise ReadError("Substring not found")
+        self._pos += bs.len
+        return self._slice(oldpos, self._pos)
+
+    def peek(self, fmt):
+        """Interpret next bits according to format string and return result.
+
+        fmt -- Token string describing how to interpret the next bits.
+
+        The position in the bitstring is not changed. If not enough bits are
+        available then all bits to the end of the bitstring will be used.
+
+        Raises ReadError if not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        See the docstring for 'read' for token examples.
+
+        """
+        pos_before = self._pos
+        value = self.read(fmt)
+        self._pos = pos_before
+        return value
+
+    def peeklist(self, fmt, **kwargs):
+        """Interpret next bits according to format string(s) and return list.
+
+        fmt -- One or more strings with comma separated tokens describing
+               how to interpret the next bits in the bitstring.
+        kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+                  format string will be replaced with their given value.
+
+        The position in the bitstring is not changed. If not enough bits are
+        available then all bits to the end of the bitstring will be used.
+
+        Raises ReadError if not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        See the docstring for 'read' for token examples.
+
+        """
+        pos = self._pos
+        return_values = self.readlist(fmt, **kwargs)
+        self._pos = pos
+        return return_values
+
+    def bytealign(self):
+        """Align to next byte and return number of skipped bits.
+
+        Raises ValueError if the end of the bitstring is reached before
+        aligning to the next byte.
+
+        """
+        skipped = (8 - (self._pos % 8)) % 8
+        self.pos += self._offset + skipped
+        assert self._assertsanity()
+        return skipped
+
+    pos = property(_getbitpos, _setbitpos,
+                   doc="""The position in the bitstring in bits. Read and write.
+                      """)
+    bitpos = property(_getbitpos, _setbitpos,
+                      doc="""The position in the bitstring in bits. Read and write.
+                      """)
+    bytepos = property(_getbytepos, _setbytepos,
+                       doc="""The position in the bitstring in bytes. Read and write.
+                      """)
+
+
+
+
+
+class BitStream(ConstBitStream, BitArray):
+    """A container or stream holding a mutable sequence of bits
+
+    Subclass of the ConstBitStream and BitArray classes. Inherits all of
+    their methods.
+
+    Methods:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    append() -- Append a bitstring.
+    bytealign() -- Align to next byte boundary.
+    byteswap() -- Change byte endianness in-place.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    insert() -- Insert a bitstring.
+    invert() -- Flip bit(s) between one and zero.
+    join() -- Join bitstrings together using current bitstring.
+    overwrite() -- Overwrite a section with a new bitstring.
+    peek() -- Peek at and interpret next bits as a single item.
+    peeklist() -- Peek at and interpret next bits as a list of items.
+    prepend() -- Prepend a bitstring.
+    read() -- Read and interpret next bits as a single item.
+    readlist() -- Read and interpret next bits as a list of items.
+    replace() -- Replace occurrences of one bitstring with another.
+    reverse() -- Reverse bits in-place.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    rol() -- Rotate bits to the left.
+    ror() -- Rotate bits to the right.
+    set() -- Set bit(s) to 1 or 0.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Special methods:
+
+    Mutating operators are available: [], <<=, >>=, +=, *=, &=, |= and ^=
+    in addition to [], ==, !=, +, *, ~, <<, >>, &, | and ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytepos -- The current byte position in the bitstring.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    pos -- The current bit position in the bitstring.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ()
+
+    # As BitStream objects are mutable, we shouldn't allow them to be hashed.
+    __hash__ = None
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        self._pos = 0
+        # For mutable BitStreams we always read in files to memory:
+        if not isinstance(self._datastore, ByteStore):
+            self._ensureinmemory()
+
+    def __new__(cls, auto=None, length=None, offset=None, **kwargs):
+        x = super(BitStream, cls).__new__(cls)
+        x._initialise(auto, length, offset, **kwargs)
+        return x
+
+    def __copy__(self):
+        """Return a new copy of the BitStream."""
+        s_copy = BitStream()
+        s_copy._pos = 0
+        if not isinstance(self._datastore, ByteStore):
+            # Let them both point to the same (invariant) array.
+            # If either gets modified then at that point they'll be read into memory.
+            s_copy._datastore = self._datastore
+        else:
+            s_copy._datastore = ByteStore(self._datastore._rawarray[:],
+                                          self._datastore.bitlength,
+                                          self._datastore.offset)
+        return s_copy
+
+    def prepend(self, bs):
+        """Prepend a bitstring to the current bitstring.
+
+        bs -- The bitstring to prepend.
+
+        """
+        bs = self._converttobitstring(bs)
+        self._prepend(bs)
+        self._pos += bs.len
+
+
+def pack(fmt, *values, **kwargs):
+    """Pack the values according to the format string and return a new BitStream.
+
+    fmt -- A single string or a list of strings with comma separated tokens
+           describing how to create the BitStream.
+    values -- Zero or more values to pack according to the format.
+    kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+              format string will be replaced with their given value.
+
+    Token examples: 'int:12'    : 12 bits as a signed integer
+                    'uint:8'    : 8 bits as an unsigned integer
+                    'float:64'  : 8 bytes as a big-endian float
+                    'intbe:16'  : 2 bytes as a big-endian signed integer
+                    'uintbe:16' : 2 bytes as a big-endian unsigned integer
+                    'intle:32'  : 4 bytes as a little-endian signed integer
+                    'uintle:32' : 4 bytes as a little-endian unsigned integer
+                    'floatle:64': 8 bytes as a little-endian float
+                    'intne:24'  : 3 bytes as a native-endian signed integer
+                    'uintne:24' : 3 bytes as a native-endian unsigned integer
+                    'floatne:32': 4 bytes as a native-endian float
+                    'hex:80'    : 80 bits as a hex string
+                    'oct:9'     : 9 bits as an octal string
+                    'bin:1'     : single bit binary string
+                    'ue' / 'uie': next bits as unsigned exp-Golomb code
+                    'se' / 'sie': next bits as signed exp-Golomb code
+                    'bits:5'    : 5 bits as a bitstring object
+                    'bytes:10'  : 10 bytes as a bytes object
+                    'bool'      : 1 bit as a bool
+                    'pad:3'     : 3 zero bits as padding
+
+    >>> s = pack('uint:12, bits', 100, '0xffe')
+    >>> t = pack(['bits', 'bin:3'], s, '111')
+    >>> u = pack('uint:8=a, uint:8=b, uint:55=a', a=6, b=44)
+
+    """
+    tokens = []
+    if isinstance(fmt, basestring):
+        fmt = [fmt]
+    try:
+        for f_item in fmt:
+            _, tkns = tokenparser(f_item, tuple(sorted(kwargs.keys())))
+            tokens.extend(tkns)
+    except ValueError as e:
+        raise CreationError(*e.args)
+    value_iter = iter(values)
+    s = BitStream()
+    try:
+        for name, length, value in tokens:
+            # If the value is in the kwd dictionary then it takes precedence.
+            if value in kwargs:
+                value = kwargs[value]
+            # If the length is in the kwd dictionary then use that too.
+            if length in kwargs:
+                length = kwargs[length]
+            # Also if we just have a dictionary name then we want to use it
+            if name in kwargs and length is None and value is None:
+                s.append(kwargs[name])
+                continue
+            if length is not None:
+                length = int(length)
+            if value is None and name != 'pad':
+                # Take the next value from the ones provided
+                value = next(value_iter)
+            s._append(BitStream._init_with_token(name, length, value))
+    except StopIteration:
+        raise CreationError("Not enough parameters present to pack according to the "
+                            "format. {0} values are needed.", len(tokens))
+    try:
+        next(value_iter)
+    except StopIteration:
+        # Good, we've used up all the *values.
+        return s
+    raise CreationError("Too many parameters present to pack according to the format.")
+
+
+# Aliases for backward compatibility
+ConstBitArray = Bits
+BitString = BitStream
+
+__all__ = ['ConstBitArray', 'ConstBitStream', 'BitStream', 'BitArray',
+           'Bits', 'BitString', 'pack', 'Error', 'ReadError',
+           'InterpretError', 'ByteAlignError', 'CreationError', 'bytealigned']
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/doc/bitstring_manual.pdf and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/doc/bitstring_manual.pdf differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/PKG-INFO thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/PKG-INFO
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/PKG-INFO	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,122 @@
+Metadata-Version: 1.1
+Name: bitstring
+Version: 3.1.3
+Summary: Simple construction, analysis and modification of binary data.
+Home-page: http://python-bitstring.googlecode.com
+Author: Scott Griffiths
+Author-email: scott@griffiths.name
+License: The MIT License: http://www.opensource.org/licenses/mit-license.php
+Download-URL: http://python-bitstring.googlecode.com
+Description: ================
+        bitstring module
+        ================
+        
+        **bitstring** is a pure Python module designed to help make
+        the creation and analysis of binary data as simple and natural as possible.
+        
+        Bitstrings can be constructed from integers (big and little endian), hex,
+        octal, binary, strings or files. They can be sliced, joined, reversed,
+        inserted into, overwritten, etc. with simple functions or slice notation.
+        They can also be read from, searched and replaced, and navigated in,
+        similar to a file or stream.
+        
+        bitstring is open source software, and has been released under the MIT
+        licence.
+        
+        This version supports Python 2.6 and later (including Python 3).
+        For Python 2.4 and 2.5 you should instead download version 1.0.
+        
+        Documentation
+        -------------
+        The manual for the bitstring module is available here
+        <http://packages.python.org/bitstring>. It contains a walk-through of all
+        the features and a complete reference section.
+        
+        It is also available as a PDF as part of the source download.
+        
+        Installation
+        ------------
+        If you have downloaded and unzipped the package then you need to run the
+        ``setup.py`` script with the 'install' argument::
+        
+             python setup.py install
+        
+        You may need to run this with root privileges on Unix-like systems.
+        
+        
+        If you haven't yet downloaded the package then you can just try::
+        
+             easy_install bitstring
+        
+        or ::
+        
+             pip install bitstring     
+        
+        
+        Simple Examples
+        ---------------
+        Creation::
+        
+             >>> a = BitArray(bin='00101')
+             >>> b = Bits(a_file_object)
+             >>> c = BitArray('0xff, 0b101, 0o65, uint:6=22')
+             >>> d = pack('intle:16, hex=a, 0b1', 100, a='0x34f')
+             >>> e = pack('<16h', *range(16))
+        
+        Different interpretations, slicing and concatenation::
+        
+             >>> a = BitArray('0x1af')
+             >>> a.hex, a.bin, a.uint
+             ('1af', '000110101111', 431)
+             >>> a[10:3:-1].bin
+             '1110101'
+             >>> 3*a + '0b100'
+             BitArray('0o0657056705674')
+        
+        Reading data sequentially::
+        
+             >>> b = BitStream('0x160120f')
+             >>> b.read(12).hex
+             '160'
+             >>> b.pos = 0
+             >>> b.read('uint:12')
+             352
+             >>> b.readlist('uint:12, bin:3')
+             [288, '111']
+        
+        Searching, inserting and deleting::
+        
+             >>> c = BitArray('0b00010010010010001111')   # c.hex == '0x1248f'
+             >>> c.find('0x48')
+             (8,)
+             >>> c.replace('0b001', '0xabc')
+             >>> c.insert('0b0000')
+             >>> del c[12:16]
+        
+        Unit Tests
+        ----------
+        
+        The 400+ unit tests should all pass for Python 2.6 and later.
+        
+        ----
+        
+        The bitstring module has been released as open source under the MIT License.
+        Copyright (c) 2014 Scott Griffiths
+        
+        For more information see the project's homepage on Google Code:
+        <http://python-bitstring.googlecode.com>
+        
+        
+Platform: all
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.0
+Classifier: Programming Language :: Python :: 3.1
+Classifier: Programming Language :: Python :: 3.2
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/README.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/README.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/README.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/README.txt	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,99 @@
+================
+bitstring module
+================
+
+**bitstring** is a pure Python module designed to help make
+the creation and analysis of binary data as simple and natural as possible.
+
+Bitstrings can be constructed from integers (big and little endian), hex,
+octal, binary, strings or files. They can be sliced, joined, reversed,
+inserted into, overwritten, etc. with simple functions or slice notation.
+They can also be read from, searched and replaced, and navigated in,
+similar to a file or stream.
+
+bitstring is open source software, and has been released under the MIT
+licence.
+
+This version supports Python 2.6 and later (including Python 3).
+For Python 2.4 and 2.5 you should instead download version 1.0.
+
+Documentation
+-------------
+The manual for the bitstring module is available here
+<http://packages.python.org/bitstring>. It contains a walk-through of all
+the features and a complete reference section.
+
+It is also available as a PDF as part of the source download.
+
+Installation
+------------
+If you have downloaded and unzipped the package then you need to run the
+``setup.py`` script with the 'install' argument::
+
+     python setup.py install
+
+You may need to run this with root privileges on Unix-like systems.
+
+
+If you haven't yet downloaded the package then you can just try::
+
+     easy_install bitstring
+
+or ::
+
+     pip install bitstring     
+
+
+Simple Examples
+---------------
+Creation::
+
+     >>> a = BitArray(bin='00101')
+     >>> b = Bits(a_file_object)
+     >>> c = BitArray('0xff, 0b101, 0o65, uint:6=22')
+     >>> d = pack('intle:16, hex=a, 0b1', 100, a='0x34f')
+     >>> e = pack('<16h', *range(16))
+
+Different interpretations, slicing and concatenation::
+
+     >>> a = BitArray('0x1af')
+     >>> a.hex, a.bin, a.uint
+     ('1af', '000110101111', 431)
+     >>> a[10:3:-1].bin
+     '1110101'
+     >>> 3*a + '0b100'
+     BitArray('0o0657056705674')
+
+Reading data sequentially::
+
+     >>> b = BitStream('0x160120f')
+     >>> b.read(12).hex
+     '160'
+     >>> b.pos = 0
+     >>> b.read('uint:12')
+     352
+     >>> b.readlist('uint:12, bin:3')
+     [288, '111']
+
+Searching, inserting and deleting::
+
+     >>> c = BitArray('0b00010010010010001111')   # c.hex == '0x1248f'
+     >>> c.find('0x48')
+     (8,)
+     >>> c.replace('0b001', '0xabc')
+     >>> c.insert('0b0000')
+     >>> del c[12:16]
+
+Unit Tests
+----------
+
+The 400+ unit tests should all pass for Python 2.6 and later.
+
+----
+
+The bitstring module has been released as open source under the MIT License.
+Copyright (c) 2014 Scott Griffiths
+
+For more information see the project's homepage on Google Code:
+<http://python-bitstring.googlecode.com>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/release_notes.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/release_notes.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/release_notes.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/release_notes.txt	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,1523 @@
+--------------------------------
+bitstring module version history
+--------------------------------
+
+---------------------------------------
+March 4th 2014: version 3.1.3 released
+---------------------------------------
+This is another bug fix release.
+
+* Fix for problem with prepend for bitstrings with byte offsets in their data store.
+
+---------------------------------------
+April 18th 2013: version 3.1.2 released
+---------------------------------------
+This is another bug fix release.
+
+* Fix for problem where unpacking bytes would by eight times too long
+
+---------------------------------------
+March 21st 2013: version 3.1.1 released
+---------------------------------------
+This is a bug fix release.
+
+* Fix for problem where concatenating bitstrings sometimes modified method's arguments
+
+------------------------------------------
+February 26th 2013: version 3.1.0 released
+------------------------------------------
+This is a minor release with a couple of new features and some bug fixes.
+
+New 'pad' token
+---------------
+
+This token can be used in reads and when packing/unpacking to indicate that
+you don't care about the contents of these bits. Any padding bits will just
+be skipped over when reading/unpacking or zero-filled when packing.
+
+    >>> a, b = s.readlist('pad:5, uint:3, pad:1, uint:3')
+
+Here only two items are returned in the list - the padding bits are ignored.
+
+New clear and copy convenience methods
+--------------------------------------
+
+These methods have been introduced in Python 3.3 for lists and bytearrays,
+as more obvious ways of clearing and copying, and we mirror that change here.
+
+t = s.copy() is equivalent to t = s[:], and s.clear() is equivalent to del s[:].
+
+Other changes
+-------------
+
+* Some bug fixes.
+
+-----------------------------------------
+February 7th 2012: version 3.0.2 released
+-----------------------------------------
+This is a minor update that fixes a few bugs.
+
+* Fix for subclasses of bitstring classes behaving strangely (Issue 121).
+* Fix for excessive memory usage in rare cases (Issue 120).
+* Fixes for slicing edge cases.
+
+There has also been a reorganisation of the code to return it to a single
+'bitstring.py' file rather than the package that has been used for the past
+several releases. This change shouldn't affect users directly.
+
+------------------------------------------
+November 21st 2011: version 3.0.1 released
+------------------------------------------
+This release fixed a small but very visible bug in bitstring printing.
+
+------------------------------------------
+November 21st 2011: version 3.0.0 released
+------------------------------------------
+This is a major release which breaks backward compatibility in a few places.
+
+Backwardly incompatible changes
+===============================
+
+Hex, oct and bin properties don't have leading 0x, 0o and 0b
+------------------------------------------------------------
+
+If you ask for the hex, octal or binary representations of a bitstring then
+they will no longer be prefixed with '0x', 0o' or '0b'. This was done as it
+was noticed that the first thing a lot of user code does after getting these
+representations was to cut off the first two characters before further
+processing.
+
+    >>> a = BitArray('0x123')
+    >>> a.hex, a.oct, a.bin
+    ('123', '0443', '000100100011')
+
+Previously this would have returned ('0x123', '0o0443', '0b000100100011')
+
+This change might require some recoding, but it should all be simplifications.
+
+ConstBitArray renamed to Bits
+-----------------------------
+
+Previously Bits was an alias for ConstBitStream (for backward compatibility).
+This has now changed so that Bits and BitArray loosely correspond to the
+built-in types bytes and bytearray.
+
+If you were using streaming/reading methods on a Bits object then you will
+have to change it to a ConstBitStream.
+
+The ConstBitArray name is kept as an alias for Bits.
+
+Stepping in slices has conventional meaning
+-------------------------------------------
+
+The step parameter in __getitem__, __setitem__ and __delitem__ used to act
+as a multiplier for the start and stop parameters. No one seemed to use it
+though and so it has now reverted to the convential meaning for containers.
+
+If you are using step then recoding is simple: s[a:b:c] becomes s[a*c:b*c].
+
+Some examples of the new usage:
+
+    >>> s = BitArray('0x0000')
+    s[::4] = [1, 1, 1, 1]
+    >>> s.hex
+    '8888'
+    >>> del s[8::2]
+    >>> s.hex
+    '880'
+
+
+New features
+============
+
+New readto method
+-----------------
+
+This method is a mix between a find and a read - it searches for a bitstring
+and then reads up to and including it. For example:
+
+    >>> s = ConstBitStream('0x47000102034704050647')
+    >>> s.readto('0x47', bytealigned=True)
+    BitStream('0x47')
+    >>> s.readto('0x47', bytealigned=True)
+    BitStream('0x0001020347')
+    >>> s.readto('0x47', bytealigned=True)
+    BitStream('0x04050647')
+
+pack function accepts an iterable as its format
+-----------------------------------------------
+
+Previously only a string was accepted as the format in the pack function.
+This was an oversight as it broke the symmetry between pack and unpack.
+Now you can use formats like this:
+
+    fmt = ['hex:8', 'bin:3']
+    a = pack(fmt, '47', '001')
+    a.unpack(fmt)
+
+
+--------------------------------------
+June 18th 2011: version 2.2.0 released
+--------------------------------------
+This is a minor upgrade with a couple of new features.
+
+New interleaved exponential-Golomb interpretations
+--------------------------------------------------
+
+New bit interpretations for interleaved exponential-Golomb (as used in the
+Dirac video codec) are supplied via 'uie' and 'sie':
+
+    >>> s = BitArray(uie=41)
+    >>> s.uie
+    41
+    >>> s.bin
+    '0b00010001001'
+
+These are pretty similar to the non-interleaved versions - see the manual
+for more details. Credit goes to Paul Sargent for the patch.
+
+New package-level bytealigned variable
+--------------------------------------
+
+A number of methods take a 'bytealigned' parameter to indicate that they
+should only work on byte boundaries (e.g. find, replace, split). Previously
+this parameter defaulted to 'False'. Instead it now defaults to
+'bitstring.bytealigned', which itself defaults to 'False', but can be changed
+to modify the default behaviour of the methods. For example:
+
+    >>> a = BitArray('0x00 ff 0f ff')
+    >>> a.find('0x0f')
+    (4,)    # found first not on a byte boundary
+    >>> a.find('0x0f', bytealigned=True)
+    (16,)   # forced looking only on byte boundaries
+    >>> bitstring.bytealigned = True  # Change default behaviour
+    >>> a.find('0x0f')
+    (16,)
+    >>> a.find('0x0f', bytealigned=False)
+    (4,)
+
+If you're only working with bytes then this can help avoid some errors and
+save some typing!
+
+Other changes
+-------------
+
+* Fix for Python 3.2, correcting for a change to the binascii module.
+* Fix for bool initialisation from 0 or 1.
+* Efficiency improvements, including interning strategy.
+
+------------------------------------------
+February 23rd 2011: version 2.1.1 released
+------------------------------------------
+This is a release to fix a couple of bugs that were introduced in 2.1.0.
+
+* Bug fix: Reading using the 'bytes' token had been broken (Issue 102).
+* Fixed problem using some methods on ConstBitArrays.
+* Better exception handling for tokens missing values.
+* Some performance improvements.
+
+-----------------------------------------
+January 23rd 2011: version 2.1.0 released
+-----------------------------------------
+
+New class hierarchy introduced with simpler classes
+---------------------------------------------------
+Previously there were just two classes, the immutable Bits which was the base
+class for the mutable BitString class. Both of these classes have the concept
+of a bit position, from which reads etc. take place so that the bitstring could
+be treated as if it were a file or stream.
+
+Two simpler classes have now been added which are purely bit containers and 
+don't have a bit position. These are called ConstBitArray and BitArray. As you
+can guess the former is an immutable version of the latter.
+
+The other classes have also been renamed to better reflect their capabilities.
+Instead of BitString you can use BitStream, and instead of Bits you can use
+ConstBitStream. The old names are kept as aliases for backward compatibility.
+
+The classes hierarchy is:
+
+        ConstBitArray
+           /    \
+          /      \
+    BitArray   ConstBitStream (formerly Bits)
+          \      /
+           \    /
+          BitStream (formerly BitString)
+
+
+Other changes
+-------------
+A lot of internal reorganisation has taken place since the previous version,
+most of which won't be noticed by the end user. Some things you might see are:
+
+* New package structure. Previous versions have been a single file for the
+  module and another for the unit tests. The module is now split into many
+  more files so it can't be used just by copying bitstring.py any more.
+* To run the unit tests there is now a script called runtests.py in the test
+  directory.
+* File based bitstring are now implemented in terms of an mmap. This should
+  be just an implementation detail, but unfortunately for 32-bit versions of
+  Python this creates a limit of 4GB on the files that can be used. The work
+  around is either to get a 64-bit Python, or just stick with version 2.0.
+* The ConstBitArray and ConstBitStream classes no longer copy byte data when
+  a slice or a read takes place, they just take a reference. This is mostly
+  a very nice optimisation, but there are occassions where it could have an
+  adverse effect. For example if a very large bitstring is created, a small
+  slice taken and the original deleted. The byte data from the large
+  bitstring would still be retained in memory.
+* Optimisations. Once again this version should be faster than the last.
+  The module is still pure Python but some of the reorganisation was to make
+  it more feasible to put some of the code into Cython or similar, so
+  hopefully more speed will be on the way.
+
+--------------------------------------
+July 26th 2010: version 2.0.3 released
+--------------------------------------
+* Bug fix: Using peek and read for a single bit now returns a new bitstring
+           as was intended, rather than the old behaviour of returning a bool.
+* Removed HTML docs from source archive - better to use the online version.
+
+--------------------------------------
+July 25th 2010: version 2.0.2 released
+--------------------------------------
+This is a major release, with a number of backwardly incompatible changes.
+The main change is the removal of many methods, all of which have simple
+alternatives. Other changes are quite minor but may need some recoding.
+
+There are a few new features, most of which have been made to help the
+stream-lining of the API. As always there are performance improvements and
+some API changes were made purely with future performance in mind.
+
+The backwardly incompatible changes are:
+-----------------------------------------
+* Methods removed.
+
+About half of the class methods have been removed from the API. They all have
+simple alternatives, so what remains is more powerful and easier to remember.
+The removed methods are listed here on the left, with their equivalent
+replacements on the right:
+
+s.advancebit()              ->   s.pos += 1
+s.advancebits(bits)         ->   s.pos += bits
+s.advancebyte()             ->   s.pos += 8
+s.advancebytes(bytes)       ->   s.pos += 8*bytes
+s.allunset([a, b])          ->   s.all(False, [a, b])
+s.anyunset([a, b])          ->   s.any(False, [a, b])
+s.delete(bits, pos)         ->   del s[pos:pos+bits]
+s.peekbit()                 ->   s.peek(1)
+s.peekbitlist(a, b)         ->   s.peeklist([a, b])
+s.peekbits(bits)            ->   s.peek(bits)
+s.peekbyte()                ->   s.peek(8)
+s.peekbytelist(a, b)        ->   s.peeklist([8*a, 8*b])
+s.peekbytes(bytes)          ->   s.peek(8*bytes)
+s.readbit()                 ->   s.read(1)
+s.readbitlist(a, b)         ->   s.readlist([a, b])
+s.readbits(bits)            ->   s.read(bits)
+s.readbyte()                ->   s.read(8)
+s.readbytelist(a, b)        ->   s.readlist([8*a, 8*b])
+s.readbytes(bytes)          ->   s.read(8*bytes)
+s.retreatbit()              ->   s.pos -= 1
+s.retreatbits(bits)         ->   s.pos -= bits
+s.retreatbyte()             ->   s.pos -= 8
+s.retreatbytes(bytes)       ->   s.pos -= 8*bytes
+s.reversebytes(start, end)  ->   s.byteswap(0, start, end)
+s.seek(pos)                 ->   s.pos = pos
+s.seekbyte(bytepos)         ->   s.bytepos = bytepos
+s.slice(start, end, step)   ->   s[start:end:step]
+s.tell()                    ->   s.pos
+s.tellbyte()                ->   s.bytepos
+s.truncateend(bits)         ->   del s[-bits:]
+s.truncatestart(bits)       ->   del s[:bits]
+s.unset([a, b])             ->   s.set(False, [a, b])
+
+Many of these methods have been deprecated for the last few releases, but
+there are some new removals too. Any recoding needed should be quite
+straightforward, so while I apologise for the hassle, I had to take the
+opportunity to streamline and rationalise what was becoming a bit of an
+overblown API.
+
+* set / unset methods combined.
+
+The set/unset methods have been combined in a single method, which now
+takes a boolean as its first argument:
+
+s.set([a, b])               ->   s.set(1, [a, b])
+s.unset([a, b])             ->   s.set(0, [a, b])
+s.allset([a, b])            ->   s.all(1, [a, b])
+s.allunset([a, b])          ->   s.all(0, [a, b])
+s.anyset([a, b])            ->   s.any(1, [a, b])
+s.anyunset([a, b])          ->   s.any(0, [a, b])
+
+* all / any only accept iterables.
+
+The all and any methods (previously called allset, allunset, anyset and
+anyunset) no longer accept a single bit position. The recommended way of
+testing a single bit is just to index it, for example instead of:
+
+>>> if s.all(True, i):
+
+just use
+
+>>> if s[i]:
+
+If you really want to you can of course use an iterable with a single
+element, such as 's.any(False, [i])', but it's clearer just to write
+'not s[i]'.
+
+* Exception raised on reading off end of bitstring.
+
+If a read or peek goes beyond the end of the bitstring then a ReadError
+will be raised. The previous behaviour was that the rest of the bitstring
+would be returned and no exception raised.
+
+* BitStringError renamed to Error.
+
+The base class for errors in the bitstring module is now just Error, so
+it will likely appears in your code as bitstring.Error instead of
+the rather repetitive bitstring.BitStringError.
+
+* Single bit slices and reads return a bool.
+
+A single index slice (such as s[5]) will now return a bool (i.e. True or
+False) rather than a single bit bitstring. This is partly to reflect the
+style of the bytearray type, which returns an integer for single items, but
+mostly to avoid common errors like:
+
+>>> if s[0]:
+...     do_something()
+
+While the intent of this code snippet is quite clear (i.e. do_something if
+the first bit of s is set) under the old rules s[0] would be true as long
+as s wasn't empty. That's because any one-bit bitstring was true as it was a
+non-empty container. Under the new rule s[0] is True if s starts with a '1'
+bit and False if s starts with a '0' bit.
+
+The change does not affect reads and peeks, so s.peek(1) will still return
+a single bit bitstring, which leads on to the next item...
+
+* Empty bitstrings or bitstrings with only zero bits are considered False.
+
+Previously a bitstring was False if it had no elements, otherwise it was True.
+This is standard behaviour for containers, but wasn't very useful for a container
+of just 0s and 1s. The new behaviour means that the bitstring is False if it
+has no 1 bits. This means that code like this:
+
+>>> if s.peek(1):
+...     do_something()
+
+should work as you'd expect. It also means that Bits(1000), Bits(0x00) and
+Bits('uint:12=0') are all also False. If you need to check for the emptiness of
+a bitstring then instead check the len property:
+
+if s                ->   if s.len
+if not s            ->   if not s.len
+
+* Length and offset disallowed for some initialisers.
+
+Previously you could create bitstring using expressions like:
+
+>>> s = Bits(hex='0xabcde', offset=4, length=13)
+
+This has now been disallowed, and the offset and length parameters may only
+be used when initialising with bytes or a file. To replace the old behaviour
+you could instead use
+
+>>> s = Bits(hex='0xabcde')[4:17]
+
+* Renamed 'format' parameter 'fmt'.
+
+Methods with a 'format' parameter have had it renamed to 'fmt', to prevent
+hiding the built-in 'format'. Affects methods unpack, read, peek, readlist,
+peeklist and byteswap and the pack function. 
+
+* Iterables instead of *format accepted for some methods.
+
+This means that for the affected methods (unpack, readlist and peeklist) you
+will need to use an iterable to specify multiple items. This is easier to
+show than to describe, so instead of
+
+>>> a, b, c, d = s.readlist('uint:12', 'hex:4', 'bin:7')
+
+you would instead write
+
+>>> a, b, c, d = s.readlist(['uint:12', 'hex:4', 'bin:7'])
+
+Note that you could still use the single string 'uint:12, hex:4, bin:7' if
+you preferred.
+
+* Bool auto-initialisation removed.
+
+You can no longer use True and False to initialise single bit bitstrings.
+The reasoning behind this is that as bool is a subclass of int, it really is
+bad practice to have Bits(False) be different to Bits(0) and to have Bits(True)
+different to Bits(1).
+
+If you have used bool auto-initialisation then you will have to be careful to
+replace it as the bools will now be interpreted as ints, so Bits(False) will
+be empty (a bitstring of length 0), and Bits(True) will be a single zero bit
+(a bitstring of length 1). Sorry for the confusion, but I think this will
+prevent bigger problems in the future.
+
+There are a few alternatives for creating a single bit bitstring. My favourite
+it to use a list with a single item:
+
+Bits(False)            ->   Bits([0])
+Bits(True)             ->   Bits([1])
+
+* New creation from file strategy
+
+Previously if you created a bitstring from a file, either by auto-initialising
+with a file object or using the filename parameter, the file would not be read
+into memory unless you tried to modify it, at which point the whole file would
+be read.
+
+The new behaviour depends on whether you create a Bits or a BitString from the
+file. If you create a Bits (which is immutable) then the file will never be
+read into memory. This allows very large files to be opened for examination
+even if they could never fit in memory.
+
+If however you create a BitString, the whole of the referenced file will be read
+to store in memory. If the file is very big this could take a long time, or fail,
+but the idea is that in saying you want the mutable BitString you are implicitly
+saying that you want to make changes and so (for now) we need to load it into
+memory.
+
+The new strategy is a bit more predictable in terms of performance than the old.
+The main point to remember is that if you want to open a file and don't plan to
+alter the bitstring then use the Bits class rather than BitString.
+
+Just to be clear, in neither case will the contents of the file ever be changed -
+if you want to output the modified BitString then use the tofile method, for
+example.
+
+* find and rfind return a tuple instead of a bool.
+
+If a find is unsuccessful then an empty tuple is returned (which is False in a
+boolean sense) otherwise a single item tuple with the bit position is returned
+(which is True in a boolean sense). You shouldn't need to recode unless you
+explicitly compared the result of a find to True or False, for example this
+snippet doesn't need to be altered:
+
+>>> if s.find('0x23'):
+...     print(s.bitpos)
+        
+but you could now instead use
+
+>>> found = s.find('0x23')
+>>> if found:
+...     print(found[0])
+
+The reason for returning the bit position in a tuple is so that finding at
+position zero can still be True - it's the tuple (0,) - whereas not found can
+be False - the empty tuple ().
+
+The new features in this release are:
+-------------------------------------
+* New count method.
+
+This method just counts the number of 1 or 0 bits in the bitstring.
+
+>>> s = Bits('0x31fff4')
+>>> s.count(1)
+16
+
+* read and peek methods accept integers.
+
+The read, readlist, peek and peeklist methods now accept integers as parameters
+to mean "read this many bits and return a bitstring". This has allowed a number
+of methods to be removed from this release, so for example instead of:
+
+>>> a, b, c = s.readbits(5, 6, 7)
+>>> if s.peekbit():
+...     do_something()
+
+you should write:
+
+>>> a, b, c = s.readlist([5, 6, 7])
+>>> if s.peek(1):
+...     do_something()
+
+* byteswap used to reverse all bytes.
+
+The byteswap method now allows a format specifier of 0 (the default) to signify
+that all of the whole bytes should be reversed. This means that calling just
+byteswap() is almost equivalent to the now removed bytereverse() method (a small
+difference is that byteswap won't raise an exception if the bitstring isn't a
+whole number of bytes long).
+
+* Auto initialise with bytearray or (for Python 3 only) bytes.
+
+So rather than writing:
+
+>>> a = Bits(bytes=some_bytearray)
+
+you can just write
+
+>>> a = Bits(some_bytearray)
+
+This also works for the bytes type, but only if you're using Python 3.
+For Python 2 it's not possible to distinguish between a bytes object and a
+str. For this reason this method should be used with some caution as it will
+make you code behave differently with the different major Python versions.
+
+>>> b = Bits(b'abcd\x23\x00') # Only Python 3! 
+  
+* set, invert, all and any default to whole bitstring.
+
+This means that you can for example write:
+
+>>> a = BitString(100)       # 100 zero bits
+>>> a.set(1)                 # set all bits to 1
+>>> a.all(1)                 # are all bits set to 1?
+True
+>>> a.any(0)                 # are any set to 0?
+False
+>>> a.invert()               # invert every bit
+  
+* New exception types.
+
+As well as renaming BitStringError to just Error 
+there are also new exceptions which use Error as a base class.
+
+These can be caught in preference to Error if you need finer control.
+The new exceptions sometimes also derive from built-in exceptions:
+
+ByteAlignError(Error) - whole byte position or length needed.
+
+ReadError(Error, IndexError) - reading or peeking off the end of
+the bitstring.
+
+CreationError(Error, ValueError) - inappropriate argument during
+bitstring creation.
+
+InterpretError(Error, ValueError) - inappropriate interpretation of
+binary data.
+
+
+--------------------------------------------------------------
+March 18th 2010: version 1.3.0 for Python 2.6 and 3.x released
+--------------------------------------------------------------
+New features:
+
+* byteswap method for changing endianness.
+
+Changes the endianness in-place according to a format string or
+integer(s) giving the byte pattern. See the manual for details.
+
+>>> s = BitString('0x00112233445566')
+>>> s.byteswap(2)
+3
+>>> s
+BitString('0x11003322554466')
+>>> s.byteswap('h')
+3
+>>> s
+BitString('0x00112233445566')
+>>> s.byteswap([2, 5])
+1
+>>> s
+BitString('0x11006655443322')
+
+* Multiplicative factors in bitstring creation and reading.
+
+For example:
+
+>>> s = Bits('100*0x123')
+
+* Token grouping using parenthesis.
+
+For example:
+
+>>> s = Bits('3*(uint:6=3, 0b1)')
+
+* Negative slice indices allowed.
+
+The start and end parameters of many methods may now be negative, with the
+same meaning as for negative slice indices. Affects all methods with these
+parameters.
+
+* Sequence ABCs used.
+
+The Bits class now derives from collections.Sequence, while the BitString
+class derives from collections.MutableSequence.
+
+* Keywords allowed in readlist, peeklist and unpack.
+
+Keywords for token lengths are now permitted when reading. So for example,
+you can write
+
+>>> s = bitstring.pack('4*(uint:n)', 2, 3, 4, 5, n=7)
+>>> s.unpack('4*(uint:n)', n=7)
+[2, 3, 4, 5]
+
+* start and end parameters added to rol and ror.
+
+* join function accepts other iterables.
+
+Also its parameter has changed from 'bitstringlist' to 'sequence'. This is
+technically a backward incompatibility in the unlikely event that you are
+referring to the parameter by name.
+
+* __init__ method accepts keywords.
+
+Rather than a long list of initialisers the __init__ methods now use a
+**kwargs dictionary for all initialisers except 'auto'. This should have no
+effect, except that this is a small backward incompatibility if you use
+positional arguments when initialising with anything other than auto
+(which would be rather unusual).
+
+* More optimisations.
+
+* Bug fixed in replace method (it could fail if start != 0).
+
+----------------------------------------------------------------
+January 19th 2010: version 1.2.0 for Python 2.6 and 3.x released
+----------------------------------------------------------------
+
+* New 'Bits' class.
+
+Introducing a brand new class, Bits, representing an immutable sequence of
+bits.
+
+The Bits class is the base class for the mutable BitString. The differences
+between Bits and BitStrings are:
+
+1) Bits are immutable, so once they have been created their value cannot change.
+This of course means that mutating methods (append, replace, del etc.) are not
+available for Bits.
+
+2) Bits are hashable, so they can be used in sets and as keys in dictionaries.
+
+3) Bits are potentially more efficient than BitStrings, both in terms of
+computation and memory. The current implementation is only marginally
+more efficient though - this should improve in future versions.
+
+You can switch from Bits to a BitString or vice versa by constructing a new
+object from the old.
+
+>>> s = Bits('0xabcd')
+>>> t = BitString(s)
+>>> t.append('0xe')
+>>> u = Bits(t)
+
+The relationship between Bits and BitString is supposed to loosely mirror that
+between bytes and bytearray in Python 3.
+
+* Deprecation messages turned on.
+
+A number of methods have been flagged for removal in version 2. Deprecation
+warnings will now be given, which include an alternative way to do the same
+thing. All of the deprecated methods have simpler equivalent alternatives.
+
+>>> t = s.slice(0, 2)
+__main__:1: DeprecationWarning: Call to deprecated function slice.
+Instead of 's.slice(a, b, c)' use 's[a:b:c]'.
+
+The deprecated methods are: advancebit, advancebits, advancebyte, advancebytes,
+retreatbit, retreatbits, retreatbyte, retreatbytes, tell, seek, slice, delete,
+tellbyte, seekbyte, truncatestart and truncateend.
+
+* Initialise from bool.
+
+Booleans have been added to the list of types that can 'auto'
+initialise a bitstring.
+
+>>> zerobit = BitString(False)
+>>> onebit = BitString(True)
+
+* Improved efficiency.
+
+More methods have been speeded up, in particular some deletions and insertions.
+
+* Bug fixes.
+
+A rare problem with truncating the start of bitstrings was fixed.
+
+A possible problem outputting the final byte in tofile() was fixed.
+
+-----------------------------------------------------------------
+December 22nd 2009: version 1.1.3 for Python 2.6 and 3.x released
+-----------------------------------------------------------------
+
+This version hopefully fixes an installation problem for platforms with
+case-sensitive file systems. There are no new features or other bug fixes.
+
+-----------------------------------------------------------------
+December 18th 2009: version 1.1.2 for Python 2.6 and 3.x released
+-----------------------------------------------------------------
+
+This is a minor update with (almost) no new features.
+
+* Improved efficiency.
+
+The speed of many typical operations has been increased, some substantially.
+
+* Initialise from integer.
+
+A BitString of '0' bits can be created using just an integer to give the length
+in bits. So instead of
+
+>>> s = BitString(length=100)
+
+you can write just
+
+>>> s = BitString(100)
+
+This matches the behaviour of bytearrays and (in Python 3) bytes.
+
+* A defect related to using the set / unset functions on BitStrings initialised
+from a file has been fixed.
+
+-----------------------------------------------------------------
+November 24th 2009: version 1.1.0 for Python 2.6 and 3.x released
+-----------------------------------------------------------------
+Note that this version will not work for Python 2.4 or 2.5. There may be an
+update for these Python versions some time next year, but it's not a priorty
+quite yet. Also note that only one version is now provided, which works for
+Python 2.6 and 3.x (done with the minimum of hackery!)
+
+* Improved efficiency.
+
+A fair number of functions have improved efficiency, some quite dramatically.
+
+* New bit setting and checking functions.
+
+Although these functions don't do anything that couldn't be done before, they
+do make some common use cases much more efficient. If you need to set or check
+single bits then these are the functions you need.
+
+set / unset : Set bit(s) to 1 or 0 respectively.
+allset / allunset : Check if all bits are 1 or all 0.
+anyset / anyunset : Check if any bits are 1 or any 0.
+
+>>> s = BitString(length=1000)
+>>> s.set((10, 100, 44, 12, 1))
+>>> s.allunset((2, 22, 222))
+True
+>>> s.anyset(range(7, 77))
+True
+
+* New rotate functions.
+
+ror / rol : Rotate bits to the right or left respectively.
+
+>>> s = BitString('0b100000000')
+>>> s.ror(2)
+>>> s.bin
+'0b001000000'
+>>> s.rol(5)
+>>> s.bin
+'0b000000100'
+
+* Floating point interpretations.
+
+New float initialisations and interpretations are available. These only work
+for BitStrings of length 32 or 64 bits.
+
+>>> s = BitString(float=0.2, length=64)
+>>> s.float
+0.200000000000000001
+>>> t = bitstring.pack('<3f', -0.4, 1e34, 17.0)
+>>> t.hex
+'0xcdccccbedf84f67700008841'
+
+* 'bytes' token reintroduced.
+
+This token returns a bytes object (equivalent to a str in Python 2.6).
+
+>>> s = BitString('0x010203')
+>>> s.unpack('bytes:2, bytes:1')
+['\x01\x02', '\x03']
+
+* 'uint' is now the default token type.
+
+So for example these are equivalent:
+
+a, b = s.readlist('uint:12, uint:12')
+a, b = s.readlist('12, 12')
+
+--------------------------------------------------------
+October 10th 2009: version 1.0.1 for Python 3.x released
+--------------------------------------------------------
+This is a straight port of version 1.0.0 to Python 3.
+
+For changes since the last Python 3 release read all the way down in this
+document to version 0.4.3.
+
+This version will also work for Python 2.6, but there's no advantage to using
+it over the 1.0.0 release. It won't work for anything before 2.6.
+
+-------------------------------------------------------
+October 9th 2009: version 1.0.0 for Python 2.x released
+-------------------------------------------------------
+Version 1 is here!
+
+This is the first release not to carry the 'beta' tag. It contains a couple of
+minor new features but is principally a release to fix the API. If you've been
+using an older version then you almost certainly will have to recode a bit. If
+you're not ready to do that then you may wish to delay updating.
+
+So the bad news is that there are lots of small changes to the API. The good
+news is that all the changes are pretty trivial, the new API is cleaner and
+more 'Pythonic', and that by making it version 1.0 I'm promising not to
+tweak it again for some time.
+
+** API Changes **
+
+* New read / peek functions for returning multiple items.
+
+The functions read, readbits, readbytes, peek, peekbits and peekbytes now only
+ever return a single item, never a list.
+
+The new functions readlist, readbitlist, readbytelist, peeklist, peekbitlist
+and peekbytelist can be used to read multiple items and will always return a
+list.
+
+So a line like:
+
+>>> a, b = s.read('uint:12, hex:32')
+
+becomes
+
+>>> a, b = s.readlist('uint:12, hex:32')
+
+* Renaming / removing functions.
+
+Functions have been renamed as follows:
+
+seekbit -> seek
+tellbit -> tell
+reversebits -> reverse
+deletebits -> delete
+tostring -> tobytes
+
+and a couple have been removed altogether:
+
+deletebytes - use delete instead.
+empty - use 'not s' rather than 's.empty()'.
+
+* Renaming parameters.
+
+The parameters 'startbit' and 'endbit' have been renamed 'start' and 'end'.
+This affects the functions slice, find, findall, rfind, reverse, cut and split.
+
+The parameter 'bitpos' has been renamed to 'pos'. The affects the functions
+seek, tell, insert, overwrite and delete.
+
+* Mutating methods return None rather than self.
+
+This means that you can't chain functions together so
+
+>>> s.append('0x00').prepend('0xff')
+>>> t = s.reverse()
+
+Needs to be rewritten
+
+>>> s.append('0x00')
+>>> s.prepend('0xff)
+>>> s.reverse()
+>>> t = s
+
+Affects truncatestart, truncateend, insert, overwrite, delete, append,
+prepend, reverse and reversebytes.
+
+* Properties renamed.
+
+The 'data' property has been renamed to 'bytes'. Also if the BitString is not a
+whole number of bytes then a ValueError exception will be raised when using
+'bytes' as a 'getter'.
+
+Properties 'len' and 'pos' have been added to replace 'length' and 'bitpos',
+although the longer names have not been removed so you can continue to use them
+if you prefer.
+
+* Other changes.
+
+The unpack function now always returns a list, never a single item.
+
+BitStrings are now 'unhashable', so calling hash on one or making a set will
+fail.
+
+The colon separating the token name from its length is now mandatory. So for
+example BitString('uint12=100') becomes BitString('uint:12=100').
+
+Removed support for the 'bytes' token in format strings. Instead of
+s.read('bytes:4') use s.read('bits:32').
+
+** New features **
+
+* Added endswith and startswith functions.
+
+These do much as you'd expect; they return True or False depending on whether
+the BitString starts or ends with the parameter.
+
+>>> BitString('0xef342').startswith('0b11101')
+True
+
+----------------------------------------------------------
+September 11th 2009: version 0.5.2 for Python 2.x released
+----------------------------------------------------------
+Finally some tools for dealing with endianness!
+
+* New interpretations are now available for whole-byte BitStrings that treat
+them as big, little, or native-endian.
+
+>>> big = BitString(intbe=1, length=16) # or BitString('intbe:16=1') if you prefer.
+>>> little = BitString(intle=1, length=16)
+>>> print big.hex, little.hex
+0x0001 0x0100
+>>> print big.intbe, little.intle
+1 1
+
+* 'Struct'-like compact format codes
+
+To save some typing when using pack, unpack, read and peek, compact format
+codes based on those used in the struct and array modules have been added.
+These must start with a character indicating the endianness (>, < or @ for
+big, little and native-endian), followed by characters giving the format:
+
+b 	1-byte signed int
+B 	1-byte unsigned int
+h 	2-byte signed int
+H 	2-byte unsigned int
+l 	4-byte signed int
+L 	4-byte unsigned int
+q 	8-byte signed int
+Q 	8-byte unsigned int
+
+For example:
+
+>>> s = bitstring.pack('<4h', 0, 1, 2, 3)
+
+creates a BitString with four little-endian 2-byte integers. While
+
+>>> x, y, z = s.read('>hhl')
+
+reads them back as two big-endian two-byte integers and one four-byte big
+endian integer.
+
+Of course you can combine this new format with the old ones however you like:
+
+>>> s.unpack('<h, intle:24, uint:5, bin')
+[0, 131073, 0, '0b0000000001100000000']
+
+-------------------------------------------------------
+August 26th 2009: version 0.5.1 for Python 2.x released
+-------------------------------------------------------
+
+This update introduces pack and unpack functions for creating and dissembling
+BitStrings.
+
+* New pack() and unpack() functions.
+
+The module level pack function provides a flexible new method for creating
+BitStrings. Tokens for BitString 'literals' can be used in the same way as in
+the constructor.
+
+>>> from bitstring import BitString, pack
+>>> a = pack('0b11, 0xff, 0o77, int:5=-1, se=33')
+
+You can also leave placeholders in the format, which will be filled in by
+the values provided.
+
+>>> b = pack('uint:10, hex:4', 33, 'f')
+
+Finally you can use a dictionary or keywords.
+
+>>> c = pack('bin=a, hex=b, bin=a', a='010', b='ef')
+
+The unpack function is similar to the read function except that it always
+unpacks from the start of the BitString.
+
+>>> x, y = b.unpack('uint:10, hex')
+
+If a token is given without a length (as above) then it will expand to fill the
+remaining bits in the BitString. This also now works with read() and peek().
+
+* New tostring() and tofile() functions.
+
+The tostring() function just returns the data as a string, with up to seven
+zero bits appended to byte align. The tofile() function does the same except
+writes to a file object.
+
+>>> f = open('myfile', 'wb')
+>>> BitString('0x1234ff').tofile(f)
+
+* Other changes.
+
+The use of '=' is now mandatory in 'auto' initialisers. Tokens like 'uint12 100' will
+no longer work. Also the use of a ':' before the length is encouraged, but not yet
+mandated. So the previous example should be written as 'uint:12=100'.
+
+The 'auto' initialiser will now take a file object.
+
+>>> f = open('myfile', 'rb')
+>>> s = BitString(f)
+
+-----------------------------------------------------
+July 19th 2009: version 0.5.0 for Python 2.x released
+-----------------------------------------------------
+
+This update breaks backward compatibility in a couple of areas. The only one
+you probably need to be concerned about is the change to the default for
+bytealigned in find, replace, split, etc.
+
+See the user manual for more details on each of these items.
+
+* Expanded abilities of 'auto' initialiser.
+
+More types can be initialised through the 'auto' initialiser. For example
+instead of
+
+>>> a = BitString(uint=44, length=16)
+
+you can write
+
+>>> a = BitString('uint16=44')
+
+Also, different comma-separated tokens will be joined together, e.g.
+
+>>> b = BitString('0xff') + 'int8=-5'
+
+can be written
+
+>>> b = BitString('0xff, int8=-5')
+
+* New formatted read() and peek() functions.
+
+These takes a format string similar to that used in the auto initialiser.
+If only one token is provided then a single value is returned, otherwise a
+list of values is returned.
+
+>>> start_code, width, height = s.read('hex32, uint12, uint12')
+
+is equivalent to
+
+>>> start_code = s.readbits(32).hex
+>>> width = s.readbits(12).uint
+>>> height = s.readbits(12).uint
+
+The tokens are:
+
+  int n   : n bits as an unsigned integer.
+  uint n  : n bits as a signed integer.
+  hex n   : n bits as a hexadecimal string.
+  oct n   : n bits as an octal string.
+  bin n   : n bits as a binary string.
+  ue      : next bits as an unsigned exp-Golomb.
+  se      : next bits as a signed exp-Golomb.
+  bits n  : n bits as a new BitString.
+  bytes n : n bytes as a new BitString.
+
+See the user manual for more details.
+
+* hex() and oct() functions removed.
+
+The special functions for hex() and oct() have been removed. Please use the
+hex and oct properties instead.
+
+>>> hex(s)
+
+becomes
+
+>>> s.hex
+
+* join made a member function.
+
+The join function must now be called on a BitString object, which will be
+used to join the list together. You may need to recode slightly:
+
+>>> s = bitstring.join('0x34', '0b1001', '0b1')
+
+becomes
+
+>>> s = BitString().join('0x34', '0b1001', '0b1')
+
+* More than one value allowed in readbits, readbytes, peekbits and peekbytes
+
+If you specify more than one bit or byte length then a list of BitStrings will
+be returned.
+
+>>> a, b, c = s.readbits(10, 5, 5)
+
+is equivalent to
+
+>>> a = readbits(10)
+>>> b = readbits(5)
+>>> c = readbits(5)
+
+* bytealigned defaults to False, and is at the end of the parameter list
+
+Functions that have a bytealigned paramater have changed so that it now
+defaults to False rather than True. Also its position in the parameter list
+has changed to be at the end. You may need to recode slightly (sorry!)
+
+* readue and readse functions have been removed
+
+Instead you should use the new read function with a 'ue' or 'se' token:
+
+>>> i = s.readue()
+
+becomes
+
+>>> i = s.read('ue')
+
+This is more flexible as you can read multiple items in one go, plus you can
+now also use the peek function with ue and se.
+
+* Minor bugs fixed.
+
+See the issue tracker for more details.
+
+-----------------------------------------------------
+June 15th 2009: version 0.4.3 for Python 2.x released
+-----------------------------------------------------
+
+This is a minor update. This release is the first to bundle the bitstring
+manual. This is a PDF and you can find it in the docs directory.
+
+Changes in version 0.4.3
+
+* New 'cut' function
+
+This function returns a generator for constant sized chunks of a BitString.
+
+>>> for byte in s.cut(8):
+...     do_something_with(byte)
+
+You can also specify a startbit and endbit, as well as a count, which limits
+the number of items generated:
+
+>>> first100TSPackets = list(s.cut(188*8, count=100))
+
+* 'slice' function now equivalent to __getitem__.
+
+This means that a step can also be given to the slice function so that the
+following are now the same thing, and it's just a personal preference which
+to use:
+
+>>> s1 = s[a:b:c]
+>>> s2 = s.slice(a, b, c)
+
+* findall gets a 'count' parameter.
+
+So now
+
+>>> list(a.findall(s, count=n))
+
+is equivalent to
+
+>>> list(a.findall(s))[:n]
+
+except that it won't need to generate the whole list and so is much more
+efficient.
+
+* Changes to 'split'.
+
+The split function now has a 'count' parameter rather than 'maxsplit'. This
+makes the interface closer to that for cut, replace and findall. The final item
+generated is now no longer the whole of the rest of the BitString.
+
+* A couple of minor bugs were fixed. See the issue tracker for details.
+
+----------------------------------------------------
+May 25th 2009: version 0.4.2 for Python 2.x released
+----------------------------------------------------
+
+This is a minor update, and almost doesn't break compatibility with version
+0.4.0, but with the slight exception of findall() returning a generator,
+detailed below.
+
+Changes in version 0.4.2
+
+* Stepping in slices
+
+The use of the step parameter (also known as the stride) in slices has been
+added. Its use is a little non-standard as it effectively gives a multiplicative
+factor to apply to the start and stop parameters, rather than skipping over
+bits.
+
+For example this makes it much more convenient if you want to give slices in
+terms of bytes instead of bits. Instead of writing s[a*8:b*8] you can use
+s[a:b:8].
+
+When using a step the BitString is effectively truncated to a multiple of the
+step, so s[::8] is equal to s if s is an integer number of bytes, otherwise it
+is truncated by up to 7 bits. So the final seven complete 16-bit words could be
+written as s[-7::16]
+
+Negative slices are also allowed, and should do what you'd expect. So for
+example s[::-1] returns a bit-reversed copy of s (which is similar to
+s.reversebits(), which does the same operation on s in-place). As another
+example, to get the first 10 bytes in reverse byte order you could use
+s_bytereversed = s[0:10:-8].
+
+* Removed restrictions on offset
+
+You can now specify an offset of greater than 7 bits when creating a BitString,
+and the use of offset is also now permitted when using the filename initialiser.
+This is useful when you want to create a BitString from the middle of a file
+without having to read the file into memory.
+
+>>> f = BitString(filename='reallybigfile', offset=8000000, length=32)
+
+* Integers can be assigned to slices
+
+You can now assign an integer to a slice of a BitString. If the integer doesn't
+fit in the size of slice given then a ValueError exception is raised. So this
+is now allowed and works as expected:
+
+>>> s[8:16] = 106
+
+and is equivalent to
+
+>>> s[8:16] = BitString(uint=106, length=8)
+
+* Less exceptions raised
+
+Some changes have been made to slicing so that less exceptions are raised,
+bringing the interface closer to that for lists. So for example trying to delete
+past the end of the BitString will now just delete to the end, rather than
+raising a ValueError.
+
+* Initialisation from lists and tuples
+
+A new option for the auto initialiser is to pass it a list or tuple. The items
+in the list or tuple are evaluated as booleans and the bits in the BitString are
+set to 1 for True items and 0 for False items. This can be used anywhere the
+auto initialiser can currently be used. For example:
+
+>>> a = BitString([True, 7, False, 0, ()])     # 0b11000
+>>> b = a + ['Yes', '']                        # Adds '0b10'
+>>> (True, True, False) in a
+True
+
+* Miscellany
+
+reversebits() now has optional startbit and endbit parameters.
+
+As an optimisation findall() will return a generator, rather than a list. If you
+still want the whole list then of course you can just call list() on the
+generator.
+
+Improved efficiency of rfind().
+
+A couple of minor bugs were fixed. See the issue tracker for details.
+
+-----------------------------------------------------
+April 23rd 2009: Python 3 only version 0.4.1 released
+-----------------------------------------------------
+
+This version is just a port of version 0.4.0 to Python 3. All the unit tests
+pass, but beyond that only limited ad hoc testing has been done and so it
+should be considered an experimental release. That said, the unit test
+coverage is very good - I'm just not sure if anyone even wants a Python 3
+version!
+
+---------------------------------------
+April 11th 2009: version 0.4.0 released
+---------------------------------------
+Changes in version 0.4.0
+
+* New functions
+
+Added rfind(), findall(), replace(). These do pretty much what you'd expect -
+see the docstrings or the wiki for more information.
+
+* More special functions
+
+Some missing functions were added: __repr__, __contains__, __rand__,
+__ror__, _rxor__ and __delitem__.
+
+* Miscellany
+
+A couple of small bugs were fixed (see the issue tracker).
+
+----
+
+There are some small backward incompatibilities relative to version 0.3.2:
+
+* Combined find() and findbytealigned()
+
+findbytealigned() has been removed, and becomes part of find(). The default
+start position has changed on both find() and split() to be the start of the
+BitString. You may need to recode:
+
+>>> s1.find(bs)
+>>> s2.findbytealigned(bs)
+>>> s2.split(bs)
+
+becomes
+
+>>> s1.find(bs, bytealigned=False, startbit=s1.bitpos)
+>>> s2.find(bs, startbit=s1.bitpos)  # bytealigned defaults to True
+>>> s2.split(bs, startbit=s2.bitpos)
+
+* Reading off end of BitString no longer raises exception.
+
+Previously a read or peek function that encountered the end of the BitString
+would raise a ValueError. It will now instead return the remainder of the
+BitString, which could be an empty BitString. This is closer to the file
+object interface.
+
+* Removed visibility of offset.
+
+The offset property was previously read-only, and has now been removed from
+public view altogether. As it is used internally for efficiency reasons you
+shouldn't really have needed to use it. If you do then use the _offset parameter
+instead (with caution).
+
+---------------------------------------
+March 11th 2009: version 0.3.2 released
+---------------------------------------
+Changes in version 0.3.2
+
+* Better performance
+
+A number of functions (especially find() and findbytealigned()) have been sped
+up considerably.
+
+* Bit-wise operations
+
+Added support for bit-wise AND (&), OR (|) and XOR (^). For example:
+
+>>> a = BitString('0b00111')
+>>> print a & '0b10101'
+0b00101
+
+* Miscellany
+
+Added seekbit() and seekbyte() functions. These complement the 'advance' and
+'retreat' functions, although you can still just use bitpos and bytepos
+properties directly.
+
+>>> a.seekbit(100)                   # Equivalent to a.bitpos = 100
+
+Allowed comparisons between BitString objects and strings. For example this
+will now work:
+
+>>> a = BitString('0b00001111')
+>>> a == '0x0f'
+True
+
+------------------------------------------
+February 26th 2009: version 0.3.1 released
+------------------------------------------
+Changes in version 0.3.1
+
+This version only adds features and fixes bugs relative to 0.3.0, and doesn't
+break backwards compatibility.
+
+* Octal interpretation and initialisation
+
+The oct property now joins bin and hex. Just prefix octal numbers with '0o'.
+
+>>> a = BitString('0o755')
+>>> print a.bin
+0b111101101
+
+* Simpler copying
+
+Rather than using b = copy.copy(a) to create a copy of a BitString, now you
+can just use b = BitString(a).
+
+* More special methods
+
+Lots of new special methods added, for example bit-shifting via << and >>,
+equality testing via == and !=, bit inversion (~) and concatenation using *.
+
+Also __setitem__ is now supported so BitString objects can be modified using
+standard index notation.
+
+* Proper installer
+
+Finally got round to writing the distutils script. To install just
+python setup.py install.
+
+------------------------------------------
+February 15th 2009: version 0.3.0 released
+------------------------------------------
+Changes in version 0.3.0
+
+* Simpler initialisation from binary and hexadecimal
+
+The first argument in the BitString constructor is now called auto and will
+attempt to interpret the type of a string. Prefix binary numbers with '0b'
+and hexadecimals with '0x'.
+
+>>> a = BitString('0b0')         # single zero bit
+>>> b = BitString('0xffff')      # two bytes
+
+Previously the first argument was data, so if you relied on this then you
+will need to recode:
+
+>>> a = BitString('\x00\x00\x01\xb3')   # Don't do this any more!
+
+becomes
+
+>>> a = BitString(data='\x00\x00\x01\xb3')
+
+or just
+
+>>> a = BitString('0x000001b3')
+
+This new notation can also be used in functions that take a BitString as an
+argument. For example:
+
+>>> a = BitString('0x0011') + '0xff'
+>>> a.insert('0b001', 6)
+>>> a.find('0b1111')
+
+* BitString made more mutable
+
+The functions append, deletebits, insert, overwrite, truncatestart and
+truncateend now modify the BitString that they act upon. This allows for
+cleaner and more efficient code, but you may need to rewrite slightly if you
+depended upon the old behaviour:
+
+>>> a = BitString(hex='0xffff')
+>>> a = a.append(BitString(hex='0x00'))
+>>> b = a.deletebits(10, 10)
+
+becomes:
+
+>>> a = BitString('0xffff')
+>>> a.append('0x00')
+>>> b = copy.copy(a)
+>>> b.deletebits(10, 10)
+
+Thanks to Frank Aune for suggestions in this and other areas.
+
+* Changes to printing
+
+The binary interpretation of a BitString is now prepended with '0b'. This is
+in keeping with the Python 2.6 (and 3.0) bin function. The prefix is optional
+when initialising using 'bin='.
+
+Also, if you just print a BitString with no interpretation it will pick
+something appropriate - hex if it is an integer number of bytes, otherwise
+binary. If the BitString representation is very long it will be truncated
+by '...' so it is only an approximate interpretation.
+
+>>> a = BitString('0b0011111')
+>>> print a
+0b0011111
+>>> a += '0b0'
+>>> print a
+0x3e
+
+* More convenience functions
+
+Some missing functions such as advancebit and deletebytes have been added. Also
+a number of peek functions make an appearance as have prepend and reversebits.
+See the Tutorial for more details.
+
+-----------------------------------------
+January 13th 2009: version 0.2.0 released
+-----------------------------------------
+Some fairly minor updates, not really deserving of a whole version point update.
+------------------------------------------
+December 29th 2008: version 0.1.0 released
+------------------------------------------
+First release!
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/setup.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/setup.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/setup.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/setup.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+from distutils.core import setup
+# from distutils.extension import Extension
+# from Cython.Distutils import build_ext
+import sys
+
+kwds = {'long_description': open('README.txt').read()}
+
+if sys.version_info[:2] < (2, 6):
+    raise Exception('This version of bitstring needs Python 2.6 or later. '
+                    'For Python 2.4 / 2.5 please use bitstring version 1.0 instead.')
+
+# macros = [('PYREX_WITHOUT_ASSERTIONS', None)]
+# ext_modules = [Extension('bitstring', ["bitstring.pyx"], define_macros=macros)]
+
+setup(name='bitstring',
+      version='3.1.3',
+      description='Simple construction, analysis and modification of binary data.',
+      author='Scott Griffiths',
+      author_email='scott@griffiths.name',
+      url='http://python-bitstring.googlecode.com',
+      download_url='http://python-bitstring.googlecode.com',
+      license='The MIT License: http://www.opensource.org/licenses/mit-license.php',
+      # cmdclass = {'build_ext': build_ext},
+      # ext_modules = ext_modules,
+      py_modules=['bitstring'],
+      platforms='all',
+      classifiers = [
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Operating System :: OS Independent',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.0',
+        'Programming Language :: Python :: 3.1',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+      ],
+      **kwds
+      )
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/smalltestfile thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/smalltestfile
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/smalltestfile	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/smalltestfile	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+
#Eg‰«Íď
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitarray.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitarray.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitarray.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitarray.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,310 @@
+#!/usr/bin/env python
+"""
+Unit tests for the bitarray module.
+"""
+
+import unittest
+import sys
+
+sys.path.insert(0, '..')
+import bitstring
+from bitstring import BitArray
+
+class All(unittest.TestCase):
+    def testCreationFromUint(self):
+        s = BitArray(uint=15, length=6)
+        self.assertEqual(s.bin, '001111')
+        s = BitArray(uint=0, length=1)
+        self.assertEqual(s.bin, '0')
+        s.uint = 1
+        self.assertEqual(s.uint, 1)
+        s = BitArray(length=8)
+        s.uint = 0
+        self.assertEqual(s.uint, 0)
+        s.uint = 255
+        self.assertEqual(s.uint, 255)
+        self.assertEqual(s.len, 8)
+        self.assertRaises(bitstring.CreationError, s._setuint, 256)
+
+    def testCreationFromOct(self):
+        s = BitArray(oct='7')
+        self.assertEqual(s.oct, '7')
+        self.assertEqual(s.bin, '111')
+        s.append('0o1')
+        self.assertEqual(s.bin, '111001')
+        s.oct = '12345670'
+        self.assertEqual(s.length, 24)
+        self.assertEqual(s.bin, '001010011100101110111000')
+        s = BitArray('0o123')
+        self.assertEqual(s.oct, '123')
+
+
+class NoPosAttribute(unittest.TestCase):
+    def testReplace(self):
+        s = BitArray('0b01')
+        s.replace('0b1', '0b11')
+        self.assertEqual(s, '0b011')
+
+    def testDelete(self):
+        s = BitArray('0b000000001')
+        del s[-1:]
+        self.assertEqual(s, '0b00000000')
+
+    def testInsert(self):
+        s = BitArray('0b00')
+        s.insert('0xf', 1)
+        self.assertEqual(s, '0b011110')
+
+    def testInsertParameters(self):
+        s = BitArray('0b111')
+        self.assertRaises(TypeError, s.insert, '0x4')
+
+    def testOverwrite(self):
+        s = BitArray('0b01110')
+        s.overwrite('0b000', 1)
+        self.assertEqual(s, '0b00000')
+
+    def testOverwriteParameters(self):
+        s = BitArray('0b0000')
+        self.assertRaises(TypeError, s.overwrite, '0b111')
+
+    def testPrepend(self):
+        s = BitArray('0b0')
+        s.prepend([1])
+        self.assertEqual(s, [1, 0])
+
+    def testRol(self):
+        s = BitArray('0b0001')
+        s.rol(1)
+        self.assertEqual(s, '0b0010')
+
+    def testRor(self):
+        s = BitArray('0b1000')
+        s.ror(1)
+        self.assertEqual(s, '0b0100')
+
+    def testSetItem(self):
+        s = BitArray('0b000100')
+        s[4:5] = '0xf'
+        self.assertEqual(s, '0b000111110')
+        s[0:1] = [1]
+        self.assertEqual(s, '0b100111110')
+
+
+class Bugs(unittest.TestCase):
+    def testAddingNonsense(self):
+        a = BitArray([0])
+        a += '0' # a uint of length 0 - so nothing gets added.
+        self.assertEqual(a, [0])
+        self.assertRaises(ValueError, a.__iadd__, '3')
+        self.assertRaises(ValueError, a.__iadd__, 'se')
+        self.assertRaises(ValueError, a.__iadd__, 'float:32')
+
+    def testPrependAfterCreationFromDataWithOffset(self):
+        s1 = BitArray(bytes=b'\x00\x00\x07\xff\xf0\x00', offset=21, length=15)
+        self.assertFalse(s1.any(0))
+        s1.prepend('0b0')
+        self.assertEqual(s1.bin, '0111111111111111')
+        s1.prepend('0b0')
+        self.assertEqual(s1.bin, '00111111111111111')
+
+
+class ByteAligned(unittest.TestCase):
+    def testDefault(self, defaultbytealigned=bitstring.bytealigned):
+        self.assertFalse(defaultbytealigned)
+
+    def testChangingIt(self):
+        bitstring.bytealigned = True
+        self.assertTrue(bitstring.bytealigned)
+        bitstring.bytealigned = False
+
+    def testNotByteAligned(self):
+        bitstring.bytealigned = False
+        a = BitArray('0x00 ff 0f f')
+        l = list(a.findall('0xff'))
+        self.assertEqual(l, [8, 20])
+        p = a.find('0x0f')[0]
+        self.assertEqual(p, 4)
+        p = a.rfind('0xff')[0]
+        self.assertEqual(p, 20)
+        s = list(a.split('0xff'))
+        self.assertEqual(s, ['0x00', '0xff0', '0xff'])
+        a.replace('0xff', '')
+        self.assertEqual(a, '0x000')
+
+    def testByteAligned(self):
+        bitstring.bytealigned = True
+        a = BitArray('0x00 ff 0f f')
+        l = list(a.findall('0xff'))
+        self.assertEqual(l, [8])
+        p = a.find('0x0f')[0]
+        self.assertEqual(p, 16)
+        p = a.rfind('0xff')[0]
+        self.assertEqual(p, 8)
+        s = list(a.split('0xff'))
+        self.assertEqual(s, ['0x00', '0xff0ff'])
+        a.replace('0xff', '')
+        self.assertEqual(a, '0x000ff')
+
+
+class SliceAssignment(unittest.TestCase):
+
+    def testSliceAssignmentSingleBit(self):
+        a = BitArray('0b000')
+        a[2] = '0b1'
+        self.assertEqual(a.bin, '001')
+        a[0] = BitArray(bin='1')
+        self.assertEqual(a.bin, '101')
+        a[-1] = '0b0'
+        self.assertEqual(a.bin, '100')
+        a[-3] = '0b0'
+        self.assertEqual(a.bin, '000')
+
+    def testSliceAssignmentSingleBitErrors(self):
+        a = BitArray('0b000')
+        self.assertRaises(IndexError, a.__setitem__, -4, '0b1')
+        self.assertRaises(IndexError, a.__setitem__, 3, '0b1')
+        self.assertRaises(TypeError, a.__setitem__, 1, 1.3)
+
+    def testSliceAssignmentMulipleBits(self):
+        a = BitArray('0b0')
+        a[0] = '0b110'
+        self.assertEqual(a.bin, '110')
+        a[0] = '0b000'
+        self.assertEqual(a.bin, '00010')
+        a[0:3] = '0b111'
+        self.assertEqual(a.bin, '11110')
+        a[-2:] = '0b011'
+        self.assertEqual(a.bin, '111011')
+        a[:] = '0x12345'
+        self.assertEqual(a.hex, '12345')
+        a[:] = ''
+        self.assertFalse(a)
+
+    def testSliceAssignmentMultipleBitsErrors(self):
+        a = BitArray()
+        self.assertRaises(IndexError, a.__setitem__, 0, '0b00')
+        a += '0b1'
+        a[0:2] = '0b11'
+        self.assertEqual(a, '0b11')
+
+    def testDelSliceStep(self):
+        a = BitArray(bin='100111101001001110110100101')
+        del a[::2]
+        self.assertEqual(a.bin, '0110010101100')
+        del a[3:9:3]
+        self.assertEqual(a.bin, '01101101100')
+        del a[2:7:1]
+        self.assertEqual(a.bin, '011100')
+        del a[::99]
+        self.assertEqual(a.bin, '11100')
+        del a[::1]
+        self.assertEqual(a.bin, '')
+
+    def testDelSliceNegativeStep(self):
+        a = BitArray('0b0001011101101100100110000001')
+        del a[5:23:-3]
+        self.assertEqual(a.bin, '0001011101101100100110000001')
+        del a[25:3:-3]
+        self.assertEqual(a.bin, '00011101010000100001')
+        del a[:6:-7]
+        self.assertEqual(a.bin, '000111010100010000')
+        del a[15::-2]
+        self.assertEqual(a.bin, '0010000000')
+        del a[::-1]
+        self.assertEqual(a.bin, '')
+
+    def testDelSliceErrors(self):
+        a = BitArray(10)
+        del a[5:3]
+        self.assertEqual(a, 10)
+        del a[3:5:-1]
+        self.assertEqual(a, 10)
+
+    def testDelSingleElement(self):
+        a = BitArray('0b0010011')
+        del a[-1]
+        self.assertEqual(a.bin, '001001')
+        del a[2]
+        self.assertEqual(a.bin, '00001')
+        try:
+            del a[5]
+            self.assertTrue(False)
+        except IndexError:
+            pass
+
+    def testSetSliceStep(self):
+        a = BitArray(bin='0000000000')
+        a[::2] = '0b11111'
+        self.assertEqual(a.bin, '1010101010')
+        a[4:9:3] = [0, 0]
+        self.assertEqual(a.bin, '1010001010')
+        a[7:3:-1] = [1, 1, 1, 0]
+        self.assertEqual(a.bin, '1010011110')
+        a[7:1:-2] = [0, 0, 1]
+        self.assertEqual(a.bin, '1011001010')
+        a[::-5] = [1, 1]
+        self.assertEqual(a.bin, '1011101011')
+        a[::-1] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 1]
+        self.assertEqual(a.bin, '1000000000')
+
+    def testSetSliceErrors(self):
+        a = BitArray(8)
+        try:
+            a[::3] = [1]
+            self.assertTrue(False)
+        except ValueError:
+            pass
+        class A(object): pass
+        try:
+            a[1:2] = A()
+            self.assertTrue(False)
+        except TypeError:
+            pass
+        try:
+            a[1:4:-1] = [1, 2]
+            self.assertTrue(False)
+        except ValueError:
+            pass
+
+
+class Subclassing(unittest.TestCase):
+
+    def testIsInstance(self):
+        class SubBits(BitArray): pass
+        a = SubBits()
+        self.assertTrue(isinstance(a, SubBits))
+
+    def testClassType(self):
+        class SubBits(BitArray): pass
+        self.assertEqual(SubBits().__class__, SubBits)
+
+
+class Clear(unittest.TestCase):
+
+    def testClear(self):
+        s = BitArray('0xfff')
+        s.clear()
+        self.assertEqual(s.len, 0)
+
+
+class Copy(unittest.TestCase):
+
+    def testCopyMethod(self):
+        s = BitArray(9)
+        t = s.copy()
+        self.assertEqual(s, t)
+        t[0] = True
+        self.assertEqual(t.bin, '100000000')
+        self.assertEqual(s.bin, '000000000')
+
+
+class ModifiedByAddingBug(unittest.TestCase):
+
+    def testAdding(self):
+        a = BitArray('0b0')
+        b = BitArray('0b11')
+        c = a + b
+        self.assertEqual(c, '0b011')
+        self.assertEqual(a, '0b0')
+        self.assertEqual(b, '0b11')
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bits.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bits.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bits.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bits.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,378 @@
+#!/usr/bin/env python
+
+import unittest
+import sys
+
+sys.path.insert(0, '..')
+import bitstring
+from bitstring import MmapByteArray
+from bitstring import Bits, BitArray, ConstByteStore, ByteStore
+
+class Creation(unittest.TestCase):
+    def testCreationFromBytes(self):
+        s = Bits(bytes=b'\xa0\xff')
+        self.assertEqual((s.len, s.hex), (16, 'a0ff'))
+        s = Bits(bytes=b'abc', length=0)
+        self.assertEqual(s, '')
+
+    def testCreationFromBytesErrors(self):
+        self.assertRaises(bitstring.CreationError, Bits, bytes=b'abc', length=25)
+
+    def testCreationFromDataWithOffset(self):
+        s1 = Bits(bytes=b'\x0b\x1c\x2f', offset=0, length=20)
+        s2 = Bits(bytes=b'\xa0\xb1\xC2', offset=4)
+        self.assertEqual((s2.len, s2.hex), (20, '0b1c2'))
+        self.assertEqual((s1.len, s1.hex), (20, '0b1c2'))
+        self.assertTrue(s1 == s2)
+
+    def testCreationFromHex(self):
+        s = Bits(hex='0xA0ff')
+        self.assertEqual((s.len, s.hex), (16, 'a0ff'))
+        s = Bits(hex='0x0x0X')
+        self.assertEqual((s.length, s.hex), (0, ''))
+
+    def testCreationFromHexWithWhitespace(self):
+        s = Bits(hex='  \n0 X a  4e       \r3  \n')
+        self.assertEqual(s.hex, 'a4e3')
+
+    def testCreationFromHexErrors(self):
+        self.assertRaises(bitstring.CreationError, Bits, hex='0xx0')
+        self.assertRaises(bitstring.CreationError, Bits, hex='0xX0')
+        self.assertRaises(bitstring.CreationError, Bits, hex='0Xx0')
+        self.assertRaises(bitstring.CreationError, Bits, hex='-2e')
+        # These really should fail, but it's awkward and not a big deal...
+#        self.assertRaises(bitstring.CreationError, Bits, '0x2', length=2)
+#        self.assertRaises(bitstring.CreationError, Bits, '0x3', offset=1)
+
+    def testCreationFromBin(self):
+        s = Bits(bin='1010000011111111')
+        self.assertEqual((s.length, s.hex), (16, 'a0ff'))
+        s = Bits(bin='00')[:1]
+        self.assertEqual(s.bin, '0')
+        s = Bits(bin=' 0000 \n 0001\r ')
+        self.assertEqual(s.bin, '00000001')
+
+    def testCreationFromBinWithWhitespace(self):
+        s = Bits(bin='  \r\r\n0   B    00   1 1 \t0 ')
+        self.assertEqual(s.bin, '00110')
+
+    def testCreationFromOctErrors(self):
+        s = Bits('0b00011')
+        self.assertRaises(bitstring.InterpretError, s._getoct)
+        self.assertRaises(bitstring.CreationError, s._setoct, '8')
+
+    def testCreationFromUintWithOffset(self):
+        self.assertRaises(bitstring.Error, Bits, uint=12, length=8, offset=1)
+
+    def testCreationFromUintErrors(self):
+        self.assertRaises(bitstring.CreationError, Bits, uint=-1, length=10)
+        self.assertRaises(bitstring.CreationError, Bits, uint=12)
+        self.assertRaises(bitstring.CreationError, Bits, uint=4, length=2)
+        self.assertRaises(bitstring.CreationError, Bits, uint=0, length=0)
+        self.assertRaises(bitstring.CreationError, Bits, uint=12, length=-12)
+
+    def testCreationFromInt(self):
+        s = Bits(int=0, length=4)
+        self.assertEqual(s.bin, '0000')
+        s = Bits(int=1, length=2)
+        self.assertEqual(s.bin, '01')
+        s = Bits(int=-1, length=11)
+        self.assertEqual(s.bin, '11111111111')
+        s = Bits(int=12, length=7)
+        self.assertEqual(s.int, 12)
+        s = Bits(int=-243, length=108)
+        self.assertEqual((s.int, s.length), (-243, 108))
+        for length in range(6, 10):
+            for value in range(-17, 17):
+                s = Bits(int=value, length=length)
+                self.assertEqual((s.int, s.length), (value, length))
+        s = Bits(int=10, length=8)
+
+    def testCreationFromIntErrors(self):
+        self.assertRaises(bitstring.CreationError, Bits, int=-1, length=0)
+        self.assertRaises(bitstring.CreationError, Bits, int=12)
+        self.assertRaises(bitstring.CreationError, Bits, int=4, length=3)
+        self.assertRaises(bitstring.CreationError, Bits, int=-5, length=3)
+
+    def testCreationFromSe(self):
+        for i in range(-100, 10):
+            s = Bits(se=i)
+            self.assertEqual(s.se, i)
+
+    def testCreationFromSeWithOffset(self):
+        self.assertRaises(bitstring.CreationError, Bits, se=-13, offset=1)
+
+    def testCreationFromSeErrors(self):
+        self.assertRaises(bitstring.CreationError, Bits, se=-5, length=33)
+        s = Bits(bin='001000')
+        self.assertRaises(bitstring.InterpretError, s._getse)
+
+    def testCreationFromUe(self):
+        [self.assertEqual(Bits(ue=i).ue, i) for i in range(0, 20)]
+
+    def testCreationFromUeWithOffset(self):
+        self.assertRaises(bitstring.CreationError, Bits, ue=104, offset=2)
+
+    def testCreationFromUeErrors(self):
+        self.assertRaises(bitstring.CreationError, Bits, ue=-1)
+        self.assertRaises(bitstring.CreationError, Bits, ue=1, length=12)
+        s = Bits(bin='10')
+        self.assertRaises(bitstring.InterpretError, s._getue)
+
+    def testCreationFromBool(self):
+        a = Bits('bool=1')
+        self.assertEqual(a, 'bool=1')
+        b = Bits('bool=0')
+        self.assertEqual(b, [0])
+        c = bitstring.pack('2*bool', 0, 1)
+        self.assertEqual(c, '0b01')
+
+    def testCreationKeywordError(self):
+        self.assertRaises(bitstring.CreationError, Bits, squirrel=5)
+
+    def testDataStoreType(self):
+        a = Bits('0xf')
+        self.assertEqual(type(a._datastore), bitstring.ConstByteStore)
+
+
+class Initialisation(unittest.TestCase):
+    def testEmptyInit(self):
+        a = Bits()
+        self.assertEqual(a, '')
+
+    def testNoPos(self):
+        a = Bits('0xabcdef')
+        try:
+            a.pos
+        except AttributeError:
+            pass
+        else:
+            assert False
+
+    def testFind(self):
+        a = Bits('0xabcd')
+        r = a.find('0xbc')
+        self.assertEqual(r[0], 4)
+        r = a.find('0x23462346246', bytealigned=True)
+        self.assertFalse(r)
+
+    def testRfind(self):
+        a = Bits('0b11101010010010')
+        b = a.rfind('0b010')
+        self.assertEqual(b[0], 11)
+
+    def testFindAll(self):
+        a = Bits('0b0010011')
+        b = list(a.findall([1]))
+        self.assertEqual(b, [2, 5, 6])
+
+
+class Cut(unittest.TestCase):
+    def testCut(self):
+        s = Bits(30)
+        for t in s.cut(3):
+            self.assertEqual(t, [0] * 3)
+
+
+class InterleavedExpGolomb(unittest.TestCase):
+    def testCreation(self):
+        s1 = Bits(uie=0)
+        s2 = Bits(uie=1)
+        self.assertEqual(s1, [1])
+        self.assertEqual(s2, [0, 0, 1])
+        s1 = Bits(sie=0)
+        s2 = Bits(sie=-1)
+        s3 = Bits(sie=1)
+        self.assertEqual(s1, [1])
+        self.assertEqual(s2, [0, 0, 1, 1])
+        self.assertEqual(s3, [0, 0, 1, 0])
+
+    def testCreationFromProperty(self):
+        s = BitArray()
+        s.uie = 45
+        self.assertEqual(s.uie, 45)
+        s.sie = -45
+        self.assertEqual(s.sie, -45)
+
+    def testInterpretation(self):
+        for x in range(101):
+            self.assertEqual(Bits(uie=x).uie, x)
+        for x in range(-100, 100):
+            self.assertEqual(Bits(sie=x).sie, x)
+
+    def testErrors(self):
+        for f in ['sie=100, 0b1001', '0b00', 'uie=100, 0b1001']:
+            s = Bits(f)
+            self.assertRaises(bitstring.InterpretError, s._getsie)
+            self.assertRaises(bitstring.InterpretError, s._getuie)
+        self.assertRaises(ValueError, Bits, 'uie=-10')
+
+
+class FileBased(unittest.TestCase):
+    def setUp(self):
+        self.a = Bits(filename='smalltestfile')
+        self.b = Bits(filename='smalltestfile', offset=16)
+        self.c = Bits(filename='smalltestfile', offset=20, length=16)
+        self.d = Bits(filename='smalltestfile', offset=20, length=4)
+
+    def testCreationWithOffset(self):
+        self.assertEqual(self.a, '0x0123456789abcdef')
+        self.assertEqual(self.b, '0x456789abcdef')
+        self.assertEqual(self.c, '0x5678')
+
+    def testBitOperators(self):
+        x = self.b[4:20]
+        self.assertEqual(x, '0x5678')
+        self.assertEqual((x & self.c).hex, self.c.hex)
+        self.assertEqual(self.c ^ self.b[4:20], 16)
+        self.assertEqual(self.a[23:36] | self.c[3:], self.c[3:])
+
+    def testAddition(self):
+        h = self.d + '0x1'
+        x = self.a[20:24] + self.c[-4:] + self.c[8:12]
+        self.assertEqual(x, '0x587')
+        x = self.b + x
+        self.assertEqual(x.hex, '456789abcdef587')
+        x = BitArray(x)
+        del x[12:24]
+        self.assertEqual(x, '0x456abcdef587')
+        
+class Mmap(unittest.TestCase):
+    def setUp(self):
+        self.f = open('smalltestfile', 'rb')
+
+    def tearDown(self):
+        self.f.close()
+
+    def testByteArrayEquivalence(self):
+        a = MmapByteArray(self.f)
+        self.assertEqual(a.bytelength, 8)
+        self.assertEqual(len(a), 8)
+        self.assertEqual(a[0], 0x01)
+        self.assertEqual(a[1], 0x23)
+        self.assertEqual(a[7], 0xef)
+        self.assertEqual(a[0:1], bytearray([1]))
+        self.assertEqual(a[:], bytearray([0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef]))
+        self.assertEqual(a[2:4], bytearray([0x45, 0x67]))
+
+    def testWithLength(self):
+        a = MmapByteArray(self.f, 3)
+        self.assertEqual(a[0], 0x01)
+        self.assertEqual(len(a), 3)
+
+    def testWithOffset(self):
+        a = MmapByteArray(self.f, None, 5)
+        self.assertEqual(len(a), 3)
+        self.assertEqual(a[0], 0xab)
+
+    def testWithLengthAndOffset(self):
+        a = MmapByteArray(self.f, 3, 3)
+        self.assertEqual(len(a), 3)
+        self.assertEqual(a[0], 0x67)
+        self.assertEqual(a[:], bytearray([0x67, 0x89, 0xab]))
+
+
+class Comparisons(unittest.TestCase):
+    def testUnorderable(self):
+        a = Bits(5)
+        b = Bits(5)
+        self.assertRaises(TypeError, a.__lt__, b)
+        self.assertRaises(TypeError, a.__gt__, b)
+        self.assertRaises(TypeError, a.__le__, b)
+        self.assertRaises(TypeError, a.__ge__, b)
+
+
+class Subclassing(unittest.TestCase):
+
+    def testIsInstance(self):
+        class SubBits(bitstring.Bits): pass
+        a = SubBits()
+        self.assertTrue(isinstance(a, SubBits))
+
+    def testClassType(self):
+        class SubBits(bitstring.Bits): pass
+        self.assertEqual(SubBits().__class__, SubBits)
+
+
+class LongBoolConversion(unittest.TestCase):
+
+    def testLongBool(self):
+        a = Bits(1000)
+        b = bool(a)
+        self.assertTrue(b is False)
+
+
+# Some basic tests for the private ByteStore classes
+
+class ConstByteStoreCreation(unittest.TestCase):
+
+    def testProperties(self):
+        a = ConstByteStore(bytearray(b'abc'))
+        self.assertEqual(a.bytelength, 3)
+        self.assertEqual(a.offset, 0)
+        self.assertEqual(a.bitlength, 24)
+        self.assertEqual(a._rawarray, b'abc')
+
+    def testGetBit(self):
+        a = ConstByteStore(bytearray([0x0f]))
+        self.assertEqual(a.getbit(0), False)
+        self.assertEqual(a.getbit(3), False)
+        self.assertEqual(a.getbit(4), True)
+        self.assertEqual(a.getbit(7), True)
+
+        b = ConstByteStore(bytearray([0x0f]), 7, 1)
+        self.assertEqual(b.getbit(2), False)
+        self.assertEqual(b.getbit(3), True)
+
+    def testGetByte(self):
+        a = ConstByteStore(bytearray(b'abcde'), 1, 13)
+        self.assertEqual(a.getbyte(0), 97)
+        self.assertEqual(a.getbyte(1), 98)
+        self.assertEqual(a.getbyte(4), 101)
+
+
+class PadToken(unittest.TestCase):
+
+    def testCreation(self):
+        a = Bits('pad:10')
+        self.assertEqual(a, Bits(10))
+        b = Bits('pad:0')
+        self.assertEqual(b, Bits())
+        c = Bits('0b11, pad:1, 0b111')
+        self.assertEqual(c, Bits('0b110111'))
+
+    def testPack(self):
+        s = bitstring.pack('0b11, pad:3=5, 0b1')
+        self.assertEqual(s.bin, '110001')
+        d = bitstring.pack('pad:c', c=12)
+        self.assertEqual(d, Bits(12))
+        e = bitstring.pack('0xf, uint:12, pad:1, bin, pad:4, 0b10', 0, '111')
+        self.assertEqual(e.bin, '11110000000000000111000010')
+
+    def testUnpack(self):
+        s = Bits('0b111000111')
+        x, y = s.unpack('3, pad:3, 3')
+        self.assertEqual((x, y), (7, 7))
+        x, y = s.unpack('2, pad:2, bin')
+        self.assertEqual((x, y), (3, '00111'))
+        x = s.unpack('pad:1, pad:2, pad:3')
+        self.assertEqual(x, [])
+
+
+class ModifiedByAddingBug(unittest.TestCase):
+
+    def testAdding(self):
+        a = Bits('0b0')
+        b = Bits('0b11')
+        c = a + b
+        self.assertEqual(c, '0b011')
+        self.assertEqual(a, '0b0')
+        self.assertEqual(b, '0b11')
+
+    def testAdding2(self):
+        a = Bits(100)
+        b = Bits(101)
+        c = a + b
+        self.assertEqual(a, 100)
+        self.assertEqual(b, 101)
+        self.assertEqual(c, 201)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitstore.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitstore.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitstore.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitstore.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+import unittest
+import sys
+sys.path.insert(0, '..')
+from bitstring import ByteStore, ConstByteStore, equal, offsetcopy
+
+
+class OffsetCopy(unittest.TestCase):
+    def testStraightCopy(self):
+        s = ByteStore(bytearray([10, 5, 1]), 24, 0)
+        t = offsetcopy(s, 0)
+        self.assertEqual(t._rawarray, bytearray([10, 5, 1]))
+
+    def testOffsetIncrease(self):
+        s = ByteStore(bytearray([1, 1, 1]), 24, 0)
+        t = offsetcopy(s, 4)
+        self.assertEqual(t.bitlength, 24)
+        self.assertEqual(t.offset, 4)
+        self.assertEqual(t._rawarray, bytearray([0, 16, 16, 16]))
+
+
+class Equals(unittest.TestCase):
+
+    def testBothSingleByte(self):
+        s = ByteStore(bytearray([128]), 3, 0)
+        t = ByteStore(bytearray([64]), 3, 1)
+        u = ByteStore(bytearray([32]), 3, 2)
+        self.assertTrue(equal(s, t))
+        self.assertTrue(equal(s, u))
+        self.assertTrue(equal(u, t))
+
+    def testOneSingleByte(self):
+        s = ByteStore(bytearray([1, 0]), 2, 7)
+        t = ByteStore(bytearray([64]), 2, 1)
+        self.assertTrue(equal(s, t))
+        self.assertTrue(equal(t, s))
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitstream.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitstream.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitstream.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitstream.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,3940 @@
+#!/usr/bin/env python
+
+import unittest
+import sys
+sys.path.insert(0, '..')
+import bitstring
+import copy
+import os
+import collections
+from bitstring import BitStream, ConstBitStream, pack
+from bitstring import ByteStore, offsetcopy
+
+
+class FlexibleInitialisation(unittest.TestCase):
+    def testFlexibleInitialisation(self):
+        a = BitStream('uint:8=12')
+        c = BitStream(' uint : 8 =  12')
+        self.assertTrue(a == c == BitStream(uint=12, length=8))
+        self.assertEqual(a.uint, 12)
+        a = BitStream('     int:2=  -1')
+        b = BitStream('int :2   = -1')
+        c = BitStream(' int:  2  =-1  ')
+        self.assertTrue(a == b == c == BitStream(int=-1, length=2))
+
+    def testFlexibleInitialisation2(self):
+        h = BitStream('hex=12')
+        o = BitStream('oct=33')
+        b = BitStream('bin=10')
+        self.assertEqual(h, '0x12')
+        self.assertEqual(o, '0o33')
+        self.assertEqual(b, '0b10')
+
+    def testFlexibleInitialisation3(self):
+        for s in ['se=-1', ' se = -1 ', 'se = -1']:
+            a = BitStream(s)
+            self.assertEqual(a.se, -1)
+        for s in ['ue=23', 'ue =23', 'ue = 23']:
+            a = BitStream(s)
+            self.assertEqual(a.ue, 23)
+
+    def testMultipleStringInitialisation(self):
+        a = BitStream('0b1 , 0x1')
+        self.assertEqual(a, '0b10001')
+        a = BitStream('ue=5, ue=1, se=-2')
+        self.assertEqual(a.read('ue'), 5)
+        self.assertEqual(a.read('ue'), 1)
+        self.assertEqual(a.read('se'), -2)
+        b = BitStream('uint:32 = 12, 0b11') + 'int:100=-100, 0o44'
+        self.assertEqual(b.read(32).uint, 12)
+        self.assertEqual(b.read(2).bin, '11')
+        self.assertEqual(b.read(100).int, -100)
+
+
+class Reading(unittest.TestCase):
+    def testReadBits(self):
+        s = BitStream(bytes=b'\x4d\x55')
+        self.assertEqual(s.read(4).hex, '4')
+        self.assertEqual(s.read(8).hex, 'd5')
+        self.assertEqual(s.read(1), [0])
+        self.assertEqual(s.read(3).bin, '101')
+        self.assertFalse(s.read(0))
+
+    def testReadByte(self):
+        s = BitStream(hex='4d55')
+        self.assertEqual(s.read(8).hex, '4d')
+        self.assertEqual(s.read(8).hex, '55')
+
+    def testReadBytes(self):
+        s = BitStream(hex='0x112233448811')
+        self.assertEqual(s.read(3 * 8).hex, '112233')
+        self.assertRaises(ValueError, s.read, -2 * 8)
+        s.bitpos += 1
+        self.assertEqual(s.read(2 * 8).bin, '1000100100010000')
+
+    def testReadUE(self):
+        self.assertRaises(bitstring.InterpretError, BitStream('')._getue)
+        # The numbers 0 to 8 as unsigned Exponential-Golomb codes
+        s = BitStream(bin='1 010 011 00100 00101 00110 00111 0001000 0001001')
+        self.assertEqual(s.pos, 0)
+        for i in range(9):
+            self.assertEqual(s.read('ue'), i)
+        self.assertRaises(bitstring.ReadError, s.read, 'ue')
+
+    def testReadSE(self):
+        s = BitStream(bin='010 00110 0001010 0001000 00111')
+        self.assertEqual(s.read('se'), 1)
+        self.assertEqual(s.read('se'), 3)
+        self.assertEqual(s.readlist(3 * ['se']), [5, 4, -3])
+
+
+class Find(unittest.TestCase):
+    def testFind1(self):
+        s = ConstBitStream(bin='0b0000110110000')
+        self.assertTrue(s.find(BitStream(bin='11011'), False))
+        self.assertEqual(s.bitpos, 4)
+        self.assertEqual(s.read(5).bin, '11011')
+        s.bitpos = 0
+        self.assertFalse(s.find('0b11001', False))
+
+    def testFind2(self):
+        s = BitStream(bin='0')
+        self.assertTrue(s.find(s, False))
+        self.assertEqual(s.pos, 0)
+        self.assertFalse(s.find('0b00', False))
+        self.assertRaises(ValueError, s.find, BitStream(), False)
+
+    def testFindWithOffset(self):
+        s = BitStream(hex='0x112233')[4:]
+        self.assertTrue(s.find('0x23', False))
+        self.assertEqual(s.pos, 8)
+
+    def testFindCornerCases(self):
+        s = BitStream(bin='000111000111')
+        self.assertTrue(s.find('0b000'))
+        self.assertEqual(s.pos, 0)
+        self.assertTrue(s.find('0b000'))
+        self.assertEqual(s.pos, 0)
+        self.assertTrue(s.find('0b0111000111'))
+        self.assertEqual(s.pos, 2)
+        self.assertTrue(s.find('0b000', start=2))
+        self.assertEqual(s.pos, 6)
+        self.assertTrue(s.find('0b111', start=6))
+        self.assertEqual(s.pos, 9)
+        s.pos += 2
+        self.assertTrue(s.find('0b1', start=s.pos))
+
+    def testFindBytes(self):
+        s = BitStream('0x010203040102ff')
+        self.assertFalse(s.find('0x05', bytealigned=True))
+        self.assertTrue(s.find('0x02', bytealigned=True))
+        self.assertEqual(s.read(16).hex, '0203')
+        self.assertTrue(s.find('0x02', start=s.bitpos, bytealigned=True))
+        s.read(1)
+        self.assertFalse(s.find('0x02', start=s.bitpos, bytealigned=True))
+
+    def testFindBytesAlignedCornerCases(self):
+        s = BitStream('0xff')
+        self.assertTrue(s.find(s))
+        self.assertFalse(s.find(BitStream(hex='0x12')))
+        self.assertFalse(s.find(BitStream(hex='0xffff')))
+
+    def testFindBytesBitpos(self):
+        s = BitStream(hex='0x1122334455')
+        s.pos = 2
+        s.find('0x66', bytealigned=True)
+        self.assertEqual(s.pos, 2)
+        s.pos = 38
+        s.find('0x66', bytealigned=True)
+        self.assertEqual(s.pos, 38)
+
+    def testFindByteAligned(self):
+        s = BitStream(hex='0x12345678')
+        self.assertTrue(s.find(BitStream(hex='0x56'), bytealigned=True))
+        self.assertEqual(s.bytepos, 2)
+        s.pos = 0
+        self.assertFalse(s.find(BitStream(hex='0x45'), bytealigned=True))
+        s = BitStream('0x1234')
+        s.find('0x1234')
+        self.assertTrue(s.find('0x1234'))
+        s += '0b111'
+        s.pos = 3
+        s.find('0b1', start=17, bytealigned=True)
+        self.assertFalse(s.find('0b1', start=17, bytealigned=True))
+        self.assertEqual(s.pos, 3)
+
+    def testFindByteAlignedWithOffset(self):
+        s = BitStream(hex='0x112233')[4:]
+        self.assertTrue(s.find(BitStream(hex='0x23')))
+
+    def testFindByteAlignedErrors(self):
+        s = BitStream(hex='0xffff')
+        self.assertRaises(ValueError, s.find, '')
+        self.assertRaises(ValueError, s.find, BitStream())
+
+
+class Rfind(unittest.TestCase):
+    def testRfind(self):
+        a = BitStream('0b001001001')
+        b = a.rfind('0b001')
+        self.assertEqual(b, (6,))
+        self.assertEqual(a.pos, 6)
+        big = BitStream(length=100000) + '0x12' + BitStream(length=10000)
+        found = big.rfind('0x12', bytealigned=True)
+        self.assertEqual(found, (100000,))
+        self.assertEqual(big.pos, 100000)
+
+    def testRfindByteAligned(self):
+        a = BitStream('0x8888')
+        b = a.rfind('0b1', bytealigned=True)
+        self.assertEqual(b, (8,))
+        self.assertEqual(a.pos, 8)
+
+    def testRfindStartbit(self):
+        a = BitStream('0x0000ffffff')
+        b = a.rfind('0x0000', start=1, bytealigned=True)
+        self.assertEqual(b, ())
+        self.assertEqual(a.pos, 0)
+        b = a.rfind('0x00', start=1, bytealigned=True)
+        self.assertEqual(b, (8,))
+        self.assertEqual(a.pos, 8)
+
+    def testRfindEndbit(self):
+        a = BitStream('0x000fff')
+        b = a.rfind('0b011', bytealigned=False, start=0, end=14)
+        self.assertEqual(bool(b), True)
+        b = a.rfind('0b011', False, 0, 13)
+        self.assertEqual(b, ())
+
+    def testRfindErrors(self):
+        a = BitStream('0x43234234')
+        self.assertRaises(ValueError, a.rfind, '', bytealigned=True)
+        self.assertRaises(ValueError, a.rfind, '0b1', start=-99, bytealigned=True)
+        self.assertRaises(ValueError, a.rfind, '0b1', end=33, bytealigned=True)
+        self.assertRaises(ValueError, a.rfind, '0b1', start=10, end=9, bytealigned=True)
+
+
+class Shift(unittest.TestCase):
+    def testShiftLeft(self):
+        s = BitStream('0b1010')
+        t = s << 1
+        self.assertEqual(s.bin, '1010')
+        self.assertEqual(t.bin, '0100')
+        t = t << 0
+        self.assertEqual(t, '0b0100')
+        t = t << 100
+        self.assertEqual(t.bin, '0000')
+
+    def testShiftLeftErrors(self):
+        s = BitStream()
+        self.assertRaises(ValueError, s.__lshift__, 1)
+        s = BitStream('0xf')
+        self.assertRaises(ValueError, s.__lshift__, -1)
+
+    def testShiftRight(self):
+        s = BitStream('0b1010')
+        t = s >> 1
+        self.assertEqual(s.bin, '1010')
+        self.assertEqual(t.bin, '0101')
+        q = s >> 0
+        self.assertEqual(q, '0b1010')
+        q.replace('0b1010', '')
+        s = s >> 100
+        self.assertEqual(s.bin, '0000')
+
+    def testShiftRightErrors(self):
+        s = BitStream()
+        self.assertRaises(ValueError, s.__rshift__, 1)
+        s = BitStream('0xf')
+        self.assertRaises(ValueError, s.__rshift__, -1)
+
+    def testShiftRightInPlace(self):
+        s = BitStream('0xffff')[4:12]
+        s >>= 1
+        self.assertEqual(s, '0b01111111')
+        s = BitStream('0b11011')
+        s >>= 2
+        self.assertEqual(s.bin, '00110')
+        s >>= 100000000000000
+        self.assertEqual(s.bin, '00000')
+        s = BitStream('0xff')
+        s >>= 1
+        self.assertEqual(s, '0x7f')
+        s >>= 0
+        self.assertEqual(s, '0x7f')
+
+    def testShiftRightInPlaceErrors(self):
+        s = BitStream()
+        self.assertRaises(ValueError, s.__irshift__, 1)
+        s += '0b11'
+        self.assertRaises(ValueError, s.__irshift__, -1)
+
+    def testShiftLeftInPlace(self):
+        s = BitStream('0xffff')
+        t = s[4:12]
+        t <<= 2
+        self.assertEqual(t, '0b11111100')
+        s = BitStream('0b11011')
+        s <<= 2
+        self.assertEqual(s.bin, '01100')
+        s <<= 100000000000000000000
+        self.assertEqual(s.bin, '00000')
+        s = BitStream('0xff')
+        s <<= 1
+        self.assertEqual(s, '0xfe')
+        s <<= 0
+        self.assertEqual(s, '0xfe')
+
+    def testShiftLeftInPlaceErrors(self):
+        s = BitStream()
+        self.assertRaises(ValueError, s.__ilshift__, 1)
+        s += '0b11'
+        self.assertRaises(ValueError, s.__ilshift__, -1)
+
+
+class Replace(unittest.TestCase):
+    def testReplace1(self):
+        a = BitStream('0b1')
+        n = a.replace('0b1', '0b0', bytealigned=True)
+        self.assertEqual(a.bin, '0')
+        self.assertEqual(n, 1)
+        n = a.replace('0b1', '0b0', bytealigned=True)
+        self.assertEqual(n, 0)
+
+    def testReplace2(self):
+        a = BitStream('0b00001111111')
+        n = a.replace('0b1', '0b0', bytealigned=True)
+        self.assertEqual(a.bin, '00001111011')
+        self.assertEqual(n, 1)
+        n = a.replace('0b1', '0b0', bytealigned=False)
+        self.assertEqual(a.bin, '00000000000')
+        self.assertEqual(n, 6)
+
+    def testReplace3(self):
+        a = BitStream('0b0')
+        n = a.replace('0b0', '0b110011111', bytealigned=True)
+        self.assertEqual(n, 1)
+        self.assertEqual(a.bin, '110011111')
+        n = a.replace('0b11', '', bytealigned=False)
+        self.assertEqual(n, 3)
+        self.assertEqual(a.bin, '001')
+
+    def testReplace4(self):
+        a = BitStream('0x00114723ef4732344700')
+        n = a.replace('0x47', '0x00', bytealigned=True)
+        self.assertEqual(n, 3)
+        self.assertEqual(a.hex, '00110023ef0032340000')
+        a.replace('0x00', '', bytealigned=True)
+        self.assertEqual(a.hex, '1123ef3234')
+        a.replace('0x11', '', start=1, bytealigned=True)
+        self.assertEqual(a.hex, '1123ef3234')
+        a.replace('0x11', '0xfff', end=7, bytealigned=True)
+        self.assertEqual(a.hex, '1123ef3234')
+        a.replace('0x11', '0xfff', end=8, bytealigned=True)
+        self.assertEqual(a.hex, 'fff23ef3234')
+
+    def testReplace5(self):
+        a = BitStream('0xab')
+        b = BitStream('0xcd')
+        c = BitStream('0xabef')
+        c.replace(a, b)
+        self.assertEqual(c, '0xcdef')
+        self.assertEqual(a, '0xab')
+        self.assertEqual(b, '0xcd')
+        a = BitStream('0x0011223344')
+        a.pos = 12
+        a.replace('0x11', '0xfff', bytealigned=True)
+        self.assertEqual(a.pos, 8)
+        self.assertEqual(a, '0x00fff223344')
+
+    def testReplaceWithSelf(self):
+        a = BitStream('0b11')
+        a.replace('0b1', a)
+        self.assertEqual(a, '0xf')
+        a.replace(a, a)
+        self.assertEqual(a, '0xf')
+
+    def testReplaceCount(self):
+        a = BitStream('0x223344223344223344')
+        n = a.replace('0x2', '0x0', count=0, bytealigned=True)
+        self.assertEqual(n, 0)
+        self.assertEqual(a.hex, '223344223344223344')
+        n = a.replace('0x2', '0x0', count=1, bytealigned=True)
+        self.assertEqual(n, 1)
+        self.assertEqual(a.hex, '023344223344223344')
+        n = a.replace('0x33', '', count=2, bytealigned=True)
+        self.assertEqual(n, 2)
+        self.assertEqual(a.hex, '02442244223344')
+        n = a.replace('0x44', '0x4444', count=1435, bytealigned=True)
+        self.assertEqual(n, 3)
+        self.assertEqual(a.hex, '02444422444422334444')
+
+    def testReplaceBitpos(self):
+        a = BitStream('0xff')
+        a.bitpos = 8
+        a.replace('0xff', '', bytealigned=True)
+        self.assertEqual(a.bitpos, 0)
+        a = BitStream('0b0011110001')
+        a.bitpos = 4
+        a.replace('0b1', '0b000')
+        self.assertEqual(a.bitpos, 8)
+        a = BitStream('0b1')
+        a.bitpos = 1
+        a.replace('0b1', '0b11111', bytealigned=True)
+        self.assertEqual(a.bitpos, 5)
+        a.replace('0b11', '0b0', False)
+        self.assertEqual(a.bitpos, 3)
+        a.append('0b00')
+        a.replace('0b00', '0xffff')
+        self.assertEqual(a.bitpos, 17)
+
+    def testReplaceErrors(self):
+        a = BitStream('0o123415')
+        self.assertRaises(ValueError, a.replace, '', '0o7', bytealigned=True)
+        self.assertRaises(ValueError, a.replace, '0b1', '0b1', start=-100, bytealigned=True)
+        self.assertRaises(ValueError, a.replace, '0b1', '0b1', end=19, bytealigned=True)
+
+
+class SliceAssignment(unittest.TestCase):
+
+    # TODO: Move this to another class
+    def testSetSlice(self):
+        a = BitStream()
+        a[0:0] = '0xabcdef'
+        self.assertEqual(a.bytepos, 3)
+        a[4:16] = ''
+        self.assertEqual(a, '0xaef')
+        self.assertEqual(a.bitpos, 4)
+        a[8:] = '0x00'
+        self.assertEqual(a, '0xae00')
+        self.assertEqual(a.bytepos, 2)
+        a += '0xf'
+        a[8:] = '0xe'
+        self.assertEqual(a, '0xaee')
+        self.assertEqual(a.bitpos, 12)
+        b = BitStream()
+        b[0:800] = '0xffee'
+        self.assertEqual(b, '0xffee')
+        b[4:48] = '0xeed123'
+        self.assertEqual(b, '0xfeed123')
+        b[-800:8] = '0x0000'
+        self.assertEqual(b, '0x0000ed123')
+        a = BitStream('0xabcde')
+        self.assertEqual(a[-100:-90], '')
+        self.assertEqual(a[-100:-16], '0xa')
+        a[-100:-16] = '0x0'
+        self.assertEqual(a, '0x0bcde')
+
+    def testInsertingUsingSetItem(self):
+        a = BitStream()
+        a[0:0] = '0xdeadbeef'
+        self.assertEqual(a, '0xdeadbeef')
+        self.assertEqual(a.bytepos, 4)
+        a[16:16] = '0xfeed'
+        self.assertEqual(a, '0xdeadfeedbeef')
+        self.assertEqual(a.bytepos, 4)
+        a[0:0] = '0xa'
+        self.assertEqual(a, '0xadeadfeedbeef')
+        self.assertEqual(a.bitpos, 4)
+        a.bytepos = 6
+        a[0:0] = '0xff'
+        self.assertEqual(a.bytepos, 1)
+        a[8:0] = '0x00000'
+        self.assertTrue(a.startswith('0xff00000adead'))
+
+    def testSliceAssignmentBitPos(self):
+        a = BitStream('int:64=-1')
+        a.pos = 64
+        a[0:8] = ''
+        self.assertEqual(a.pos, 0)
+        a.pos = 52
+        a[48:56] = '0x0000'
+        self.assertEqual(a.pos, 64)
+        a[10:10] = '0x0'
+        self.assertEqual(a.pos, 14)
+        a[56:68] = '0x000'
+        self.assertEqual(a.pos, 14)
+
+
+class Pack(unittest.TestCase):
+    def testPack1(self):
+        s = bitstring.pack('uint:6, bin, hex, int:6, se, ue, oct', 10, '0b110', 'ff', -1, -6, 6, '54')
+        t = BitStream('uint:6=10, 0b110, 0xff, int:6=-1, se=-6, ue=6, oct=54')
+        self.assertEqual(s, t)
+        self.assertRaises(bitstring.CreationError, pack, 'tomato', '0')
+        self.assertRaises(bitstring.CreationError, pack, 'uint', 12)
+        self.assertRaises(bitstring.CreationError, pack, 'hex', 'penguin')
+        self.assertRaises(bitstring.CreationError, pack, 'hex12', '0x12')
+
+    def testPackWithLiterals(self):
+        s = bitstring.pack('0xf')
+        self.assertEqual(s, '0xf')
+        self.assertTrue(type(s), BitStream)
+        s = pack('0b1')
+        self.assertEqual(s, '0b1')
+        s = pack('0o7')
+        self.assertEqual(s, '0o7')
+        s = pack('int:10=-1')
+        self.assertEqual(s, '0b1111111111')
+        s = pack('uint:10=1')
+        self.assertEqual(s, '0b0000000001')
+        s = pack('ue=12')
+        self.assertEqual(s.ue, 12)
+        s = pack('se=-12')
+        self.assertEqual(s.se, -12)
+        s = pack('bin=01')
+        self.assertEqual(s.bin, '01')
+        s = pack('hex=01')
+        self.assertEqual(s.hex, '01')
+        s = pack('oct=01')
+        self.assertEqual(s.oct, '01')
+
+    def testPackWithDict(self):
+        a = pack('uint:6=width, se=height', height=100, width=12)
+        w, h = a.unpack('uint:6, se')
+        self.assertEqual(w, 12)
+        self.assertEqual(h, 100)
+        d = {}
+        d['w'] = '0xf'
+        d['300'] = 423
+        d['e'] = '0b1101'
+        a = pack('int:100=300, bin=e, uint:12=300', **d)
+        x, y, z = a.unpack('int:100, bin, uint:12')
+        self.assertEqual(x, 423)
+        self.assertEqual(y, '1101')
+        self.assertEqual(z, 423)
+
+    def testPackWithDict2(self):
+        a = pack('int:5, bin:3=b, 0x3, bin=c, se=12', 10, b='0b111', c='0b1')
+        b = BitStream('int:5=10, 0b111, 0x3, 0b1, se=12')
+        self.assertEqual(a, b)
+        a = pack('bits:3=b', b=BitStream('0b101'))
+        self.assertEqual(a, '0b101')
+        a = pack('bits:24=b', b=BitStream('0x001122'))
+        self.assertEqual(a, '0x001122')
+
+    def testPackWithDict3(self):
+        s = pack('hex:4=e, hex:4=0xe, hex:4=e', e='f')
+        self.assertEqual(s, '0xfef')
+        s = pack('sep', sep='0b00')
+        self.assertEqual(s, '0b00')
+
+    def testPackWithDict4(self):
+        s = pack('hello', hello='0xf')
+        self.assertEqual(s, '0xf')
+        s = pack('x, y, x, y, x', x='0b10', y='uint:12=100')
+        t = BitStream('0b10, uint:12=100, 0b10, uint:12=100, 0b10')
+        self.assertEqual(s, t)
+        a = [1, 2, 3, 4, 5]
+        s = pack('int:8, div,' * 5, *a, **{'div': '0b1'})
+        t = BitStream('int:8=1, 0b1, int:8=2, 0b1, int:8=3, 0b1, int:8=4, 0b1, int:8=5, 0b1')
+        self.assertEqual(s, t)
+
+    def testPackWithLocals(self):
+        width = 352
+        height = 288
+        s = pack('uint:12=width, uint:12=height', **locals())
+        self.assertEqual(s, '0x160120')
+
+    def testPackWithLengthRestriction(self):
+        s = pack('bin:3', '0b000')
+        self.assertRaises(bitstring.CreationError, pack, 'bin:3', '0b0011')
+        self.assertRaises(bitstring.CreationError, pack, 'bin:3', '0b11')
+        self.assertRaises(bitstring.CreationError, pack, 'bin:3=0b0011')
+        self.assertRaises(bitstring.CreationError, pack, 'bin:3=0b11')
+
+        s = pack('hex:4', '0xf')
+        self.assertRaises(bitstring.CreationError, pack, 'hex:4', '0b111')
+        self.assertRaises(bitstring.CreationError, pack, 'hex:4', '0b11111')
+        self.assertRaises(bitstring.CreationError, pack, 'hex:8=0xf')
+
+        s = pack('oct:6', '0o77')
+        self.assertRaises(bitstring.CreationError, pack, 'oct:6', '0o1')
+        self.assertRaises(bitstring.CreationError, pack, 'oct:6', '0o111')
+        self.assertRaises(bitstring.CreationError, pack, 'oct:3', '0b1')
+        self.assertRaises(bitstring.CreationError, pack, 'oct:3=hello', hello='0o12')
+
+        s = pack('bits:3', BitStream('0b111'))
+        self.assertRaises(bitstring.CreationError, pack, 'bits:3', BitStream('0b11'))
+        self.assertRaises(bitstring.CreationError, pack, 'bits:3', BitStream('0b1111'))
+        self.assertRaises(bitstring.CreationError, pack, 'bits:12=b', b=BitStream('0b11'))
+
+    def testPackNull(self):
+        s = pack('')
+        self.assertFalse(s)
+        s = pack(',')
+        self.assertFalse(s)
+        s = pack(',,,,,0b1,,,,,,,,,,,,,0b1,,,,,,,,,,')
+        self.assertEqual(s, '0b11')
+        s = pack(',,uint:12,,bin:3,', 100, '100')
+        a, b = s.unpack(',,,uint:12,,,,bin:3,,,')
+        self.assertEqual(a, 100)
+        self.assertEqual(b, '100')
+
+    def testPackDefaultUint(self):
+        s = pack('10, 5', 1, 2)
+        a, b = s.unpack('10, 5')
+        self.assertEqual((a, b), (1, 2))
+        s = pack('10=150, 12=qee', qee=3)
+        self.assertEqual(s, 'uint:10=150, uint:12=3')
+        t = BitStream('100=5')
+        self.assertEqual(t, 'uint:100=5')
+
+    def testPackDefualtUintErrors(self):
+        self.assertRaises(bitstring.CreationError, BitStream, '5=-1')
+
+    def testPackingLongKeywordBitstring(self):
+        s = pack('bits=b', b=BitStream(128000))
+        self.assertEqual(s, BitStream(128000))
+
+    def testPackingWithListFormat(self):
+        f = ['bin', 'hex', 'uint:10']
+        a = pack(','.join(f), '00', '234', 100)
+        b = pack(f, '00', '234', 100)
+        self.assertEqual(a, b)
+
+
+class Unpack(unittest.TestCase):
+    def testUnpack1(self):
+        s = BitStream('uint:13=23, hex=e, bin=010, int:41=-554, 0o44332, se=-12, ue=4')
+        s.pos = 11
+        a, b, c, d, e, f, g = s.unpack('uint:13, hex:4, bin:3, int:41, oct:15, se, ue')
+        self.assertEqual(a, 23)
+        self.assertEqual(b, 'e')
+        self.assertEqual(c, '010')
+        self.assertEqual(d, -554)
+        self.assertEqual(e, '44332')
+        self.assertEqual(f, -12)
+        self.assertEqual(g, 4)
+        self.assertEqual(s.pos, 11)
+
+    def testUnpack2(self):
+        s = BitStream('0xff, 0b000, uint:12=100')
+        a, b, c = s.unpack('bits:8, bits, uint:12')
+        self.assertEqual(type(s), BitStream)
+        self.assertEqual(a, '0xff')
+        self.assertEqual(type(s), BitStream)
+        self.assertEqual(b, '0b000')
+        self.assertEqual(c, 100)
+        a, b = s.unpack(['bits:11', 'uint'])
+        self.assertEqual(a, '0xff, 0b000')
+        self.assertEqual(b, 100)
+
+    def testUnpackNull(self):
+        s = pack('0b1, , , 0xf,')
+        a, b = s.unpack('bin:1,,,hex:4,')
+        self.assertEqual(a, '1')
+        self.assertEqual(b, 'f')
+
+
+class FromFile(unittest.TestCase):
+    def testCreationFromFileOperations(self):
+        s = BitStream(filename='smalltestfile')
+        s.append('0xff')
+        self.assertEqual(s.hex, '0123456789abcdefff')
+
+        s = ConstBitStream(filename='smalltestfile')
+        t = BitStream('0xff') + s
+        self.assertEqual(t.hex, 'ff0123456789abcdef')
+
+        s = BitStream(filename='smalltestfile')
+        del s[:1]
+        self.assertEqual((BitStream('0b0') + s).hex, '0123456789abcdef')
+
+        s = BitStream(filename='smalltestfile')
+        del s[:7 * 8]
+        self.assertEqual(s.hex, 'ef')
+
+        s = BitStream(filename='smalltestfile')
+        s.insert('0xc', 4)
+        self.assertEqual(s.hex, '0c123456789abcdef')
+
+        s = BitStream(filename='smalltestfile')
+        s.prepend('0xf')
+        self.assertEqual(s.hex, 'f0123456789abcdef')
+
+        s = BitStream(filename='smalltestfile')
+        s.overwrite('0xaaa', 12)
+        self.assertEqual(s.hex, '012aaa6789abcdef')
+
+        s = BitStream(filename='smalltestfile')
+        s.reverse()
+        self.assertEqual(s.hex, 'f7b3d591e6a2c480')
+
+        s = BitStream(filename='smalltestfile')
+        del s[-60:]
+        self.assertEqual(s.hex, '0')
+
+        s = BitStream(filename='smalltestfile')
+        del s[:60]
+        self.assertEqual(s.hex, 'f')
+
+    def testFileProperties(self):
+        s = ConstBitStream(filename='smalltestfile')
+        self.assertEqual(s.hex, '0123456789abcdef')
+        self.assertEqual(s.uint, 81985529216486895)
+        self.assertEqual(s.int, 81985529216486895)
+        self.assertEqual(s.bin, '0000000100100011010001010110011110001001101010111100110111101111')
+        self.assertEqual(s[:-1].oct, '002215053170465363367')
+        s.bitpos = 0
+        self.assertEqual(s.read('se'), -72)
+        s.bitpos = 0
+        self.assertEqual(s.read('ue'), 144)
+        self.assertEqual(s.bytes, b'\x01\x23\x45\x67\x89\xab\xcd\xef')
+        self.assertEqual(s.tobytes(), b'\x01\x23\x45\x67\x89\xab\xcd\xef')
+
+    def testCreationFromFileWithLength(self):
+        s = ConstBitStream(filename='test.m1v', length=32)
+        self.assertEqual(s.length, 32)
+        self.assertEqual(s.hex, '000001b3')
+        s = ConstBitStream(filename='test.m1v', length=0)
+        self.assertFalse(s)
+        self.assertRaises(bitstring.CreationError, BitStream, filename='smalltestfile', length=65)
+        self.assertRaises(bitstring.CreationError, ConstBitStream, filename='smalltestfile', length=64, offset=1)
+        #        self.assertRaises(bitstring.CreationError, ConstBitStream, filename='smalltestfile', offset=65)
+        f = open('smalltestfile', 'rb')
+        #        self.assertRaises(bitstring.CreationError, ConstBitStream, auto=f, offset=65)
+        self.assertRaises(bitstring.CreationError, ConstBitStream, auto=f, length=65)
+        self.assertRaises(bitstring.CreationError, ConstBitStream, auto=f, offset=60, length=5)
+
+    def testCreationFromFileWithOffset(self):
+        a = BitStream(filename='test.m1v', offset=4)
+        self.assertEqual(a.peek(4 * 8).hex, '00001b31')
+        b = BitStream(filename='test.m1v', offset=28)
+        self.assertEqual(b.peek(8).hex, '31')
+
+    def testFileSlices(self):
+        s = BitStream(filename='smalltestfile')
+        self.assertEqual(s[-16:].hex, 'cdef')
+
+    def testCreataionFromFileErrors(self):
+        self.assertRaises(IOError, BitStream, filename='Idonotexist')
+
+    def testFindInFile(self):
+        s = BitStream(filename='test.m1v')
+        self.assertTrue(s.find('0x160120'))
+        self.assertEqual(s.bytepos, 4)
+        s3 = s.read(3 * 8)
+        self.assertEqual(s3.hex, '160120')
+        s.bytepos = 0
+        self.assertTrue(s._pos == 0)
+        self.assertTrue(s.find('0x0001b2'))
+        self.assertEqual(s.bytepos, 13)
+
+    def testHexFromFile(self):
+        s = BitStream(filename='test.m1v')
+        self.assertEqual(s[0:32].hex, '000001b3')
+        self.assertEqual(s[-32:].hex, '000001b7')
+        s.hex = '0x11'
+        self.assertEqual(s.hex, '11')
+
+    def testFileOperations(self):
+        s1 = BitStream(filename='test.m1v')
+        s2 = BitStream(filename='test.m1v')
+        self.assertEqual(s1.read(32).hex, '000001b3')
+        self.assertEqual(s2.read(32).hex, '000001b3')
+        s1.bytepos += 4
+        self.assertEqual(s1.read(8).hex, '02')
+        self.assertEqual(s2.read(5 * 8).hex, '1601208302')
+        s1.pos = s1.len
+        try:
+            s1.pos += 1
+            self.assertTrue(False)
+        except ValueError:
+            pass
+
+    def testFileBitGetting(self):
+        s = ConstBitStream(filename='smalltestfile', offset=16, length=8) # 0x45
+        b = s[1]
+        self.assertTrue(b)
+        b = s.any(0, [-1, -2, -3])
+        self.assertTrue(b)
+        b = s.all(0, [0, 1, 2])
+        self.assertFalse(b)
+
+    def testVeryLargeFiles(self):
+        # This uses an 11GB file which isn't distributed for obvious reasons
+        # and so this test won't work for anyone except me!
+        try:
+            s = ConstBitStream(filename='11GB.mkv')
+        except IOError:
+            return
+        self.assertEqual(s.len, 11743020505 * 8)
+        self.assertEqual(s[1000000000:1000000100].hex, 'bdef7335d4545f680d669ce24')
+        self.assertEqual(s[-4::8].hex, 'bbebf7a1')
+
+
+class CreationErrors(unittest.TestCase):
+    def testIncorrectBinAssignment(self):
+        s = BitStream()
+        self.assertRaises(bitstring.CreationError, s._setbin_safe, '0010020')
+
+    def testIncorrectHexAssignment(self):
+        s = BitStream()
+        self.assertRaises(bitstring.CreationError, s._sethex, '0xabcdefg')
+
+
+class Length(unittest.TestCase):
+    def testLengthZero(self):
+        self.assertEqual(BitStream('').len, 0)
+
+    def testLength(self):
+        self.assertEqual(BitStream('0x80').len, 8)
+
+    def testLengthErrors(self):
+        #TODO: Lots of new checks, for various inits which now disallow length and offset
+        pass
+        #self.assertRaises(ValueError, BitStream, bin='111', length=-1)
+        #self.assertRaises(ValueError, BitStream, bin='111', length=4)
+
+    def testOffsetLengthError(self):
+        self.assertRaises(bitstring.CreationError, BitStream, hex='0xffff', offset=-1)
+
+
+class SimpleConversions(unittest.TestCase):
+    def testConvertToUint(self):
+        self.assertEqual(BitStream('0x10').uint, 16)
+        self.assertEqual(BitStream('0b000111').uint, 7)
+
+    def testConvertToInt(self):
+        self.assertEqual(BitStream('0x10').int, 16)
+        self.assertEqual(BitStream('0b11110').int, -2)
+
+    def testConvertToHex(self):
+        self.assertEqual(BitStream(bytes=b'\x00\x12\x23\xff').hex, '001223ff')
+        s = BitStream('0b11111')
+        self.assertRaises(bitstring.InterpretError, s._gethex)
+
+
+class Empty(unittest.TestCase):
+    def testEmptyBitstring(self):
+        s = BitStream()
+        self.assertRaises(bitstring.ReadError, s.read, 1)
+        self.assertEqual(s.bin, '')
+        self.assertEqual(s.hex, '')
+        self.assertRaises(bitstring.InterpretError, s._getint)
+        self.assertRaises(bitstring.InterpretError, s._getuint)
+        self.assertFalse(s)
+
+    def testNonEmptyBitStream(self):
+        s = BitStream(bin='0')
+        self.assertFalse(not s.len)
+
+
+class Position(unittest.TestCase):
+    def testBitPosition(self):
+        s = BitStream(bytes=b'\x00\x00\x00')
+        self.assertEqual(s.bitpos, 0)
+        s.read(5)
+        self.assertEqual(s.pos, 5)
+        s.pos = s.len
+        self.assertRaises(bitstring.ReadError, s.read, 1)
+
+    def testBytePosition(self):
+        s = BitStream(bytes=b'\x00\x00\x00')
+        self.assertEqual(s.bytepos, 0)
+        s.read(10)
+        self.assertRaises(bitstring.ByteAlignError, s._getbytepos)
+        s.read(6)
+        self.assertEqual(s.bytepos, 2)
+
+    def testSeekToBit(self):
+        s = BitStream(bytes=b'\x00\x00\x00\x00\x00\x00')
+        s.bitpos = 0
+        self.assertEqual(s.bitpos, 0)
+        self.assertRaises(ValueError, s._setbitpos, -1)
+        self.assertRaises(ValueError, s._setbitpos, 6 * 8 + 1)
+        s.bitpos = 6 * 8
+        self.assertEqual(s.bitpos, 6 * 8)
+
+    def testSeekToByte(self):
+        s = BitStream(bytes=b'\x00\x00\x00\x00\x00\xab')
+        s.bytepos = 5
+        self.assertEqual(s.read(8).hex, 'ab')
+
+    def testAdvanceBitsAndBytes(self):
+        s = BitStream(bytes=b'\x00\x00\x00\x00\x00\x00\x00\x00')
+        s.pos += 5
+        self.assertEqual(s.pos, 5)
+        s.bitpos += 16
+        self.assertEqual(s.pos, 2 * 8 + 5)
+        s.pos -= 8
+        self.assertEqual(s.pos, 8 + 5)
+
+    def testRetreatBitsAndBytes(self):
+        a = BitStream(length=100)
+        a.pos = 80
+        a.bytepos -= 5
+        self.assertEqual(a.bytepos, 5)
+        a.pos -= 5
+        self.assertEqual(a.pos, 35)
+
+
+class Offset(unittest.TestCase):
+    def testOffset1(self):
+        s = BitStream(bytes=b'\x00\x1b\x3f', offset=4)
+        self.assertEqual(s.read(8).bin, '00000001')
+        self.assertEqual(s.length, 20)
+
+    def testOffset2(self):
+        s1 = BitStream(bytes=b'\xf1\x02\x04')
+        s2 = BitStream(bytes=b'\xf1\x02\x04', length=23)
+        for i in [1, 2, 3, 4, 5, 6, 7, 6, 5, 4, 3, 2, 1, 0, 7, 3, 5, 1, 4]:
+            s1._datastore = offsetcopy(s1._datastore, i)
+            self.assertEqual(s1.hex, 'f10204')
+            s2._datastore = offsetcopy(s2._datastore, i)
+            self.assertEqual(s2.bin, '11110001000000100000010')
+
+
+class Append(unittest.TestCase):
+    def testAppend(self):
+        s1 = BitStream('0b00000')
+        s1.append(BitStream(bool=True))
+        self.assertEqual(s1.bin, '000001')
+        self.assertEqual((BitStream('0x0102') + BitStream('0x0304')).hex, '01020304')
+
+    def testAppendSameBitstring(self):
+        s1 = BitStream('0xf0')[:6]
+        s1.append(s1)
+        self.assertEqual(s1.bin, '111100111100')
+
+    def testAppendWithOffset(self):
+        s = BitStream(bytes=b'\x28\x28', offset=1)
+        s.append('0b0')
+        self.assertEqual(s.hex, '5050')
+
+
+class ByteAlign(unittest.TestCase):
+    def testByteAlign(self):
+        s = BitStream(hex='0001ff23')
+        s.bytealign()
+        self.assertEqual(s.bytepos, 0)
+        s.pos += 11
+        s.bytealign()
+        self.assertEqual(s.bytepos, 2)
+        s.pos -= 10
+        s.bytealign()
+        self.assertEqual(s.bytepos, 1)
+
+    def testByteAlignWithOffset(self):
+        s = BitStream(hex='0112233')
+        s._datastore = offsetcopy(s._datastore, 3)
+        bitstoalign = s.bytealign()
+        self.assertEqual(bitstoalign, 0)
+        self.assertEqual(s.read(5).bin, '00001')
+
+    def testInsertByteAligned(self):
+        s = BitStream('0x0011')
+        s.insert(BitStream('0x22'), 8)
+        self.assertEqual(s.hex, '002211')
+        s = BitStream(0)
+        s.insert(BitStream(bin='101'), 0)
+        self.assertEqual(s.bin, '101')
+
+
+class Truncate(unittest.TestCase):
+    def testTruncateStart(self):
+        s = BitStream('0b1')
+        del s[:1]
+        self.assertFalse(s)
+        s = BitStream(hex='1234')
+        self.assertEqual(s.hex, '1234')
+        del s[:4]
+        self.assertEqual(s.hex, '234')
+        del s[:9]
+        self.assertEqual(s.bin, '100')
+        del s[:2]
+        self.assertEqual(s.bin, '0')
+        self.assertEqual(s.len, 1)
+        del s[:1]
+        self.assertFalse(s)
+
+    def testTruncateEnd(self):
+        s = BitStream('0b1')
+        del s[-1:]
+        self.assertFalse(s)
+        s = BitStream(bytes=b'\x12\x34')
+        self.assertEqual(s.hex, '1234')
+        del s[-4:]
+        self.assertEqual(s.hex, '123')
+        del s[-9:]
+        self.assertEqual(s.bin, '000')
+        del s[-3:]
+        self.assertFalse(s)
+        s = BitStream('0b001')
+        del s[:2]
+        del s[-1:]
+        self.assertFalse(s)
+
+
+class Slice(unittest.TestCase):
+    def testByteAlignedSlice(self):
+        s = BitStream(hex='0x123456')
+        self.assertEqual(s[8:16].hex, '34')
+        s = s[8:24]
+        self.assertEqual(s.len, 16)
+        self.assertEqual(s.hex, '3456')
+        s = s[0:8]
+        self.assertEqual(s.hex, '34')
+        s.hex = '0x123456'
+        self.assertEqual(s[8:24][0:8].hex, '34')
+
+    def testSlice(self):
+        s = BitStream(bin='000001111100000')
+        s1 = s[0:5]
+        s2 = s[5:10]
+        s3 = s[10:15]
+        self.assertEqual(s1.bin, '00000')
+        self.assertEqual(s2.bin, '11111')
+        self.assertEqual(s3.bin, '00000')
+
+
+class Insert(unittest.TestCase):
+    def testInsert(self):
+        s1 = BitStream(hex='0x123456')
+        s2 = BitStream(hex='0xff')
+        s1.bytepos = 1
+        s1.insert(s2)
+        self.assertEqual(s1.bytepos, 2)
+        self.assertEqual(s1.hex, '12ff3456')
+        s1.insert('0xee', 24)
+        self.assertEqual(s1.hex, '12ff34ee56')
+        self.assertEqual(s1.bitpos, 32)
+        self.assertRaises(ValueError, s1.insert, '0b1', -1000)
+        self.assertRaises(ValueError, s1.insert, '0b1', 1000)
+
+    def testInsertNull(self):
+        s = BitStream(hex='0x123').insert(BitStream(), 3)
+        self.assertEqual(s.hex, '123')
+
+    def testInsertBits(self):
+        one = BitStream(bin='1')
+        zero = BitStream(bin='0')
+        s = BitStream(bin='00')
+        s.insert(one, 0)
+        self.assertEqual(s.bin, '100')
+        s.insert(zero, 0)
+        self.assertEqual(s.bin, '0100')
+        s.insert(one, s.len)
+        self.assertEqual(s.bin, '01001')
+        s.insert(s, 2)
+        self.assertEqual(s.bin, '0101001001')
+
+
+class Resetting(unittest.TestCase):
+    def testSetHex(self):
+        s = BitStream()
+        s.hex = '0'
+        self.assertEqual(s.hex, '0')
+        s.hex = '0x010203045'
+        self.assertEqual(s.hex, '010203045')
+        self.assertRaises(bitstring.CreationError, s._sethex, '0x002g')
+
+    def testSetBin(self):
+        s = BitStream(bin="000101101")
+        self.assertEqual(s.bin, '000101101')
+        self.assertEqual(s.len, 9)
+        s.bin = '0'
+        self.assertEqual(s.bin, '0')
+        self.assertEqual(s.len, 1)
+
+    def testSetEmptyBin(self):
+        s = BitStream(hex='0x000001b3')
+        s.bin = ''
+        self.assertEqual(s.len, 0)
+        self.assertEqual(s.bin, '')
+
+    def testSetInvalidBin(self):
+        s = BitStream()
+        self.assertRaises(bitstring.CreationError, s._setbin_safe, '00102')
+
+
+class Overwriting(unittest.TestCase):
+    def testOverwriteBit(self):
+        s = BitStream(bin='0')
+        s.overwrite(BitStream(bin='1'), 0)
+        self.assertEqual(s.bin, '1')
+
+    def testOverwriteLimits(self):
+        s = BitStream(bin='0b11111')
+        s.overwrite(BitStream(bin='000'), 0)
+        self.assertEqual(s.bin, '00011')
+        s.overwrite('0b000', 2)
+        self.assertEqual(s.bin, '00000')
+
+    def testOverwriteNull(self):
+        s = BitStream(hex='342563fedec')
+        s2 = BitStream(s)
+        s.overwrite(BitStream(bin=''), 23)
+        self.assertEqual(s.bin, s2.bin)
+
+    def testOverwritePosition(self):
+        s1 = BitStream(hex='0123456')
+        s2 = BitStream(hex='ff')
+        s1.bytepos = 1
+        s1.overwrite(s2)
+        self.assertEqual((s1.hex, s1.bytepos), ('01ff456', 2))
+        s1.overwrite('0xff', 0)
+        self.assertEqual((s1.hex, s1.bytepos), ('ffff456', 1))
+
+    def testOverwriteWithSelf(self):
+        s = BitStream('0x123')
+        s.overwrite(s)
+        self.assertEqual(s, '0x123')
+
+
+class Split(unittest.TestCase):
+    def testSplitByteAlignedCornerCases(self):
+        s = BitStream()
+        bsl = s.split(BitStream(hex='0xff'))
+        self.assertEqual(next(bsl).hex, '')
+        self.assertRaises(StopIteration, next, bsl)
+        s = BitStream(hex='aabbcceeddff')
+        delimiter = BitStream()
+        bsl = s.split(delimiter)
+        self.assertRaises(ValueError, next, bsl)
+        delimiter = BitStream(hex='11')
+        bsl = s.split(delimiter)
+        self.assertEqual(next(bsl).hex, s.hex)
+
+    def testSplitByteAligned(self):
+        s = BitStream(hex='0x1234aa1234bbcc1234ffff')
+        delimiter = BitStream(hex='1234')
+        bsl = s.split(delimiter)
+        self.assertEqual([b.hex for b in bsl], ['', '1234aa', '1234bbcc', '1234ffff'])
+        self.assertEqual(s.pos, 0)
+
+    def testSplitByteAlignedWithIntialBytes(self):
+        s = BitStream(hex='aa471234fedc43 47112233 47 4723 472314')
+        delimiter = BitStream(hex='47')
+        s.find(delimiter)
+        self.assertEqual(s.bytepos, 1)
+        bsl = s.split(delimiter, start=0)
+        self.assertEqual([b.hex for b in bsl], ['aa', '471234fedc43', '47112233',
+                                                '47', '4723', '472314'])
+        self.assertEqual(s.bytepos, 1)
+
+    def testSplitByteAlignedWithOverlappingDelimiter(self):
+        s = BitStream(hex='aaffaaffaaffaaffaaff')
+        bsl = s.split(BitStream(hex='aaffaa'))
+        self.assertEqual([b.hex for b in bsl], ['', 'aaffaaff', 'aaffaaffaaff'])
+
+
+class Adding(unittest.TestCase):
+    def testAdding(self):
+        s1 = BitStream(hex='0x0102')
+        s2 = BitStream(hex='0x0304')
+        s3 = s1 + s2
+        self.assertEqual(s1.hex, '0102')
+        self.assertEqual(s2.hex, '0304')
+        self.assertEqual(s3.hex, '01020304')
+        s3 += s1
+        self.assertEqual(s3.hex, '010203040102')
+        self.assertEqual(s2[9:16].bin, '0000100')
+        self.assertEqual(s1[0:9].bin, '000000010')
+        s4 = BitStream(bin='000000010') +\
+             BitStream(bin='0000100')
+        self.assertEqual(s4.bin, '0000000100000100')
+        s2p = s2[9:16]
+        s1p = s1[0:9]
+        s5p = s1p + s2p
+        s5 = s1[0:9] + s2[9:16]
+        self.assertEqual(s5.bin, '0000000100000100')
+
+    def testMoreAdding(self):
+        s = BitStream(bin='00') + BitStream(bin='') + BitStream(bin='11')
+        self.assertEqual(s.bin, '0011')
+        s = '0b01'
+        s += BitStream('0b11')
+        self.assertEqual(s.bin, '0111')
+        s = BitStream('0x00')
+        t = BitStream('0x11')
+        s += t
+        self.assertEqual(s.hex, '0011')
+        self.assertEqual(t.hex, '11')
+        s += s
+        self.assertEqual(s.hex, '00110011')
+
+    def testRadd(self):
+        s = '0xff' + BitStream('0xee')
+        self.assertEqual(s.hex, 'ffee')
+
+
+    def testTruncateAsserts(self):
+        s = BitStream('0x001122')
+        s.bytepos = 2
+        del s[-s.len:]
+        self.assertEqual(s.bytepos, 0)
+        s.append('0x00')
+        s.append('0x1122')
+        s.bytepos = 2
+        del s[:s.len]
+        self.assertEqual(s.bytepos, 0)
+        s.append('0x00')
+
+    def testOverwriteErrors(self):
+        s = BitStream(bin='11111')
+        self.assertRaises(ValueError, s.overwrite, BitStream(bin='1'), -10)
+        self.assertRaises(ValueError, s.overwrite, BitStream(bin='1'), 6)
+        self.assertRaises(ValueError, s.overwrite, BitStream(bin='11111'), 1)
+
+    def testDeleteBits(self):
+        s = BitStream(bin='000111100000')
+        s.bitpos = 4
+        del s[4:8]
+        self.assertEqual(s.bin, '00010000')
+        del s[4:1004]
+        self.assertTrue(s.bin, '0001')
+
+    def testDeleteBitsWithPosition(self):
+        s = BitStream(bin='000111100000')
+        del s[4:8]
+        self.assertEqual(s.bin, '00010000')
+
+    def testDeleteBytes(self):
+        s = BitStream('0x00112233')
+        del s[8:8]
+        self.assertEqual(s.hex, '00112233')
+        self.assertEqual(s.pos, 0)
+        del s[8:16]
+        self.assertEqual(s.hex, '002233')
+        self.assertEqual(s.bytepos, 0)
+        del s[:24]
+        self.assertFalse(s)
+        self.assertEqual(s.pos, 0)
+
+    def testGetItemWithPositivePosition(self):
+        s = BitStream(bin='0b1011')
+        self.assertEqual(s[0], True)
+        self.assertEqual(s[1], False)
+        self.assertEqual(s[2], True)
+        self.assertEqual(s[3], True)
+        self.assertRaises(IndexError, s.__getitem__, 4)
+
+    def testGetItemWithNegativePosition(self):
+        s = BitStream(bin='1011')
+        self.assertEqual(s[-1], True)
+        self.assertEqual(s[-2], True)
+        self.assertEqual(s[-3], False)
+        self.assertEqual(s[-4], True)
+        self.assertRaises(IndexError, s.__getitem__, -5)
+
+    def testSlicing(self):
+        s = ConstBitStream(hex='0123456789')
+        self.assertEqual(s[0:8].hex, '01')
+        self.assertFalse(s[0:0])
+        self.assertFalse(s[23:20])
+        self.assertEqual(s[8:12].bin, '0010')
+        self.assertEqual(s[32:80], '0x89')
+
+    def testNegativeSlicing(self):
+        s = ConstBitStream(hex='012345678')
+        self.assertEqual(s[:-8].hex, '0123456')
+        self.assertEqual(s[-16:-8].hex, '56')
+        self.assertEqual(s[-24:].hex, '345678')
+        self.assertEqual(s[-1000:-24], '0x012')
+
+    def testLen(self):
+        s = BitStream()
+        self.assertEqual(len(s), 0)
+        s.append(BitStream(bin='001'))
+        self.assertEqual(len(s), 3)
+
+    def testJoin(self):
+        s1 = BitStream(bin='0')
+        s2 = BitStream(bin='1')
+        s3 = BitStream(bin='000')
+        s4 = BitStream(bin='111')
+        strings = [s1, s2, s1, s3, s4]
+        s = BitStream().join(strings)
+        self.assertEqual(s.bin, '010000111')
+
+    def testJoin2(self):
+        s1 = BitStream(hex='00112233445566778899aabbccddeeff')
+        s2 = BitStream(bin='0b000011')
+        bsl = [s1[0:32], s1[4:12], s2, s2, s2, s2]
+        s = ConstBitStream().join(bsl)
+        self.assertEqual(s.hex, '00112233010c30c3')
+
+        bsl = [BitStream(uint=j, length=12) for j in range(10) for i in range(10)]
+        s = BitStream().join(bsl)
+        self.assertEqual(s.length, 1200)
+
+
+    def testPos(self):
+        s = BitStream(bin='1')
+        self.assertEqual(s.bitpos, 0)
+        s.read(1)
+        self.assertEqual(s.bitpos, 1)
+
+    def testWritingData(self):
+        strings = [BitStream(bin=x) for x in ['0', '001', '0011010010', '010010', '1011']]
+        s = BitStream().join(strings)
+        s2 = BitStream(bytes=s.bytes)
+        self.assertEqual(s2.bin, '000100110100100100101011')
+        s2.append(BitStream(bin='1'))
+        s3 = BitStream(bytes=s2.tobytes())
+        self.assertEqual(s3.bin, '00010011010010010010101110000000')
+
+    def testWritingDataWithOffsets(self):
+        s1 = BitStream(bytes=b'\x10')
+        s2 = BitStream(bytes=b'\x08\x00', length=8, offset=1)
+        s3 = BitStream(bytes=b'\x04\x00', length=8, offset=2)
+        self.assertTrue(s1 == s2)
+        self.assertTrue(s2 == s3)
+        self.assertTrue(s1.bytes == s2.bytes)
+        self.assertTrue(s2.bytes == s3.bytes)
+
+    def testVariousThings1(self):
+        hexes = ['12345678', '87654321', 'ffffffffff', 'ed', '12ec']
+        bins = ['001010', '1101011', '0010000100101110110110', '11', '011']
+        bsl = []
+        for (hex, bin) in list(zip(hexes, bins)) * 5:
+            bsl.append(BitStream(hex=hex))
+            bsl.append(BitStream(bin=bin))
+        s = BitStream().join(bsl)
+        for (hex, bin) in list(zip(hexes, bins)) * 5:
+            h = s.read(4 * len(hex))
+            b = s.read(len(bin))
+            self.assertEqual(h.hex, hex)
+            self.assertEqual(b.bin, bin)
+
+    def testVariousThings2(self):
+        s1 = BitStream(hex="0x1f08")[:13]
+        self.assertEqual(s1.bin, '0001111100001')
+        s2 = BitStream(bin='0101')
+        self.assertEqual(s2.bin, '0101')
+        s1.append(s2)
+        self.assertEqual(s1.length, 17)
+        self.assertEqual(s1.bin, '00011111000010101')
+        s1 = s1[3:8]
+        self.assertEqual(s1.bin, '11111')
+
+    def testVariousThings3(self):
+        s1 = BitStream(hex='0x012480ff')[2:27]
+        s2 = s1 + s1
+        self.assertEqual(s2.length, 50)
+        s3 = s2[0:25]
+        s4 = s2[25:50]
+        self.assertEqual(s3.bin, s4.bin)
+
+    def testPeekBit(self):
+        s = BitStream(bin='01')
+        self.assertEqual(s.peek(1), [0])
+        self.assertEqual(s.peek(1), [0])
+        self.assertEqual(s.read(1), [0])
+        self.assertEqual(s.peek(1), [1])
+        self.assertEqual(s.peek(1), [1])
+
+        s = BitStream(bytes=b'\x1f', offset=3)
+        self.assertEqual(s.len, 5)
+        self.assertEqual(s.peek(5).bin, '11111')
+        self.assertEqual(s.peek(5).bin, '11111')
+        s.pos += 1
+        self.assertRaises(bitstring.ReadError, s.peek, 5)
+
+        s = BitStream(hex='001122334455')
+        self.assertEqual(s.peek(8).hex, '00')
+        self.assertEqual(s.read(8).hex, '00')
+        s.pos += 33
+        self.assertRaises(bitstring.ReadError, s.peek, 8)
+
+        s = BitStream(hex='001122334455')
+        self.assertEqual(s.peek(8 * 2).hex, '0011')
+        self.assertEqual(s.read(8 * 3).hex, '001122')
+        self.assertEqual(s.peek(8 * 3).hex, '334455')
+        self.assertRaises(bitstring.ReadError, s.peek, 25)
+
+    def testAdvanceBit(self):
+        s = BitStream(hex='0xff')
+        s.bitpos = 6
+        s.pos += 1
+        self.assertEqual(s.bitpos, 7)
+        s.bitpos += 1
+        try:
+            s.pos += 1
+            self.assertTrue(False)
+        except ValueError:
+            pass
+
+    def testAdvanceByte(self):
+        s = BitStream(hex='0x010203')
+        s.bytepos += 1
+        self.assertEqual(s.bytepos, 1)
+        s.bytepos += 1
+        self.assertEqual(s.bytepos, 2)
+        s.bytepos += 1
+        try:
+            s.bytepos += 1
+            self.assertTrue(False)
+        except ValueError:
+            pass
+
+    def testRetreatBit(self):
+        s = BitStream(hex='0xff')
+        try:
+            s.pos -= 1
+            self.assertTrue(False)
+        except ValueError:
+            pass
+        s.pos = 5
+        s.pos -= 1
+        self.assertEqual(s.pos, 4)
+
+    def testRetreatByte(self):
+        s = BitStream(hex='0x010203')
+        try:
+            s.bytepos -= 1
+            self.assertTrue(False)
+        except ValueError:
+            pass
+        s.bytepos = 3
+        s.bytepos -= 1
+        self.assertEqual(s.bytepos, 2)
+        self.assertEqual(s.read(8).hex, '03')
+
+    def testCreationByAuto(self):
+        s = BitStream('0xff')
+        self.assertEqual(s.hex, 'ff')
+        s = BitStream('0b00011')
+        self.assertEqual(s.bin, '00011')
+        self.assertRaises(bitstring.CreationError, BitStream, 'hello')
+        s1 = BitStream(bytes=b'\xf5', length=3, offset=5)
+        s2 = BitStream(s1, length=1, offset=1)
+        self.assertEqual(s2, '0b0')
+        s = BitStream(bytes=b'\xff', offset=2)
+        t = BitStream(s, offset=2)
+        self.assertEqual(t, '0b1111')
+        self.assertRaises(TypeError, BitStream, auto=1.2)
+
+    def testCreationByAuto2(self):
+        s = BitStream('bin=001')
+        self.assertEqual(s.bin, '001')
+        s = BitStream('oct=0o007')
+        self.assertEqual(s.oct, '007')
+        s = BitStream('hex=123abc')
+        self.assertEqual(s, '0x123abc')
+
+        s = BitStream('bin:2=01')
+        self.assertEqual(s, '0b01')
+        for s in ['bin:1=01', 'bits:4=0b1', 'oct:3=000', 'hex:4=0x1234']:
+            self.assertRaises(bitstring.CreationError, BitStream, s)
+
+    def testInsertUsingAuto(self):
+        s = BitStream('0xff')
+        s.insert('0x00', 4)
+        self.assertEqual(s.hex, 'f00f')
+        self.assertRaises(ValueError, s.insert, 'ff')
+
+    def testOverwriteUsingAuto(self):
+        s = BitStream('0x0110')
+        s.overwrite('0b1')
+        self.assertEqual(s.hex, '8110')
+        s.overwrite('')
+        self.assertEqual(s.hex, '8110')
+        self.assertRaises(ValueError, s.overwrite, '0bf')
+
+    def testFindUsingAuto(self):
+        s = BitStream('0b000000010100011000')
+        self.assertTrue(s.find('0b101'))
+        self.assertEqual(s.pos, 7)
+
+    def testFindbytealignedUsingAuto(self):
+        s = BitStream('0x00004700')
+        self.assertTrue(s.find('0b01000111', bytealigned=True))
+        self.assertEqual(s.bytepos, 2)
+
+    def testAppendUsingAuto(self):
+        s = BitStream('0b000')
+        s.append('0b111')
+        self.assertEqual(s.bin, '000111')
+        s.append('0b0')
+        self.assertEqual(s.bin, '0001110')
+
+    def testSplitByteAlignedUsingAuto(self):
+        s = BitStream('0x000143563200015533000123')
+        sections = s.split('0x0001')
+        self.assertEqual(next(sections).hex, '')
+        self.assertEqual(next(sections).hex, '0001435632')
+        self.assertEqual(next(sections).hex, '00015533')
+        self.assertEqual(next(sections).hex, '000123')
+        self.assertRaises(StopIteration, next, sections)
+
+    def testSplitByteAlignedWithSelf(self):
+        s = BitStream('0x1234')
+        sections = s.split(s)
+        self.assertEqual(next(sections).hex, '')
+        self.assertEqual(next(sections).hex, '1234')
+        self.assertRaises(StopIteration, next, sections)
+
+    def testPrepend(self):
+        s = BitStream('0b000')
+        s.prepend('0b11')
+        self.assertEqual(s.bin, '11000')
+        s.prepend(s)
+        self.assertEqual(s.bin, '1100011000')
+        s.prepend('')
+        self.assertEqual(s.bin, '1100011000')
+
+    def testNullSlice(self):
+        s = BitStream('0x111')
+        t = s[1:1]
+        self.assertEqual(t._datastore.bytelength, 0)
+
+    def testMultipleAutos(self):
+        s = BitStream('0xa')
+        s.prepend('0xf')
+        s.append('0xb')
+        self.assertEqual(s, '0xfab')
+        s.prepend(s)
+        s.append('0x100')
+        s.overwrite('0x5', 4)
+        self.assertEqual(s, '0xf5bfab100')
+
+    def testReverse(self):
+        s = BitStream('0b0011')
+        s.reverse()
+        self.assertEqual(s.bin, '1100')
+        s = BitStream('0b10')
+        s.reverse()
+        self.assertEqual(s.bin, '01')
+        s = BitStream()
+        s.reverse()
+        self.assertEqual(s.bin, '')
+
+    def testInitWithConcatenatedStrings(self):
+        s = BitStream('0xff 0Xee 0xd 0xcc')
+        self.assertEqual(s.hex, 'ffeedcc')
+        s = BitStream('0b0 0B111 0b001')
+        self.assertEqual(s.bin, '0111001')
+        s += '0b1' + '0B1'
+        self.assertEqual(s.bin, '011100111')
+        s = BitStream(hex='ff0xee')
+        self.assertEqual(s.hex, 'ffee')
+        s = BitStream(bin='000b0b11')
+        self.assertEqual(s.bin, '0011')
+        s = BitStream('  0o123 0O 7 0   o1')
+        self.assertEqual(s.oct, '12371')
+        s += '  0 o 332'
+        self.assertEqual(s.oct, '12371332')
+
+    def testEquals(self):
+        s1 = BitStream('0b01010101')
+        s2 = BitStream('0b01010101')
+        self.assertTrue(s1 == s2)
+        s3 = BitStream()
+        s4 = BitStream()
+        self.assertTrue(s3 == s4)
+        self.assertFalse(s3 != s4)
+        s5 = BitStream(bytes=b'\xff', offset=2, length=3)
+        s6 = BitStream('0b111')
+        self.assertTrue(s5 == s6)
+        class A(object):
+            pass
+        self.assertFalse(s5 == A())
+
+    def testLargeEquals(self):
+        s1 = BitStream(1000000)
+        s2 = BitStream(1000000)
+        s1.set(True, [-1, 55, 53214, 534211, 999999])
+        s2.set(True, [-1, 55, 53214, 534211, 999999])
+        self.assertEqual(s1, s2)
+        s1.set(True, 800000)
+        self.assertNotEqual(s1, s2)
+
+    def testNotEquals(self):
+        s1 = BitStream('0b0')
+        s2 = BitStream('0b1')
+        self.assertTrue(s1 != s2)
+        self.assertFalse(s1 != BitStream('0b0'))
+
+    def testEqualityWithAutoInitialised(self):
+        a = BitStream('0b00110111')
+        self.assertTrue(a == '0b00110111')
+        self.assertTrue(a == '0x37')
+        self.assertTrue('0b0011 0111' == a)
+        self.assertTrue('0x3 0x7' == a)
+        self.assertFalse(a == '0b11001000')
+        self.assertFalse('0x3737' == a)
+
+    def testInvertSpecialMethod(self):
+        s = BitStream('0b00011001')
+        self.assertEqual((~s).bin, '11100110')
+        self.assertEqual((~BitStream('0b0')).bin, '1')
+        self.assertEqual((~BitStream('0b1')).bin, '0')
+        self.assertTrue(~~s == s)
+
+    def testInvertBitPosition(self):
+        s = ConstBitStream('0xefef')
+        s.pos = 8
+        t = ~s
+        self.assertEqual(s.pos, 8)
+        self.assertEqual(t.pos, 0)
+
+    def testInvertSpecialMethodErrors(self):
+        s = BitStream()
+        self.assertRaises(bitstring.Error, s.__invert__)
+
+    def testJoinWithAuto(self):
+        s = BitStream().join(['0xf', '0b00', BitStream(bin='11')])
+        self.assertEqual(s, '0b11110011')
+
+    def testAutoBitStringCopy(self):
+        s = BitStream('0xabcdef')
+        t = BitStream(s)
+        self.assertEqual(t.hex, 'abcdef')
+        del s[-8:]
+        self.assertEqual(t.hex, 'abcdef')
+
+class Multiplication(unittest.TestCase):
+
+    def testMultiplication(self):
+        a = BitStream('0xff')
+        b = a * 8
+        self.assertEqual(b, '0xffffffffffffffff')
+        b = 4 * a
+        self.assertEqual(b, '0xffffffff')
+        self.assertTrue(1 * a == a * 1 == a)
+        c = a * 0
+        self.assertFalse(c)
+        a *= 3
+        self.assertEqual(a, '0xffffff')
+        a *= 0
+        self.assertFalse(a)
+        one = BitStream('0b1')
+        zero = BitStream('0b0')
+        mix = one * 2 + 3 * zero + 2 * one * 2
+        self.assertEqual(mix, '0b110001111')
+        q = BitStream()
+        q *= 143
+        self.assertFalse(q)
+        q += [True, True, False]
+        q.pos += 2
+        q *= 0
+        self.assertFalse(q)
+        self.assertEqual(q.bitpos, 0)
+
+    def testMultiplicationWithFiles(self):
+        a = BitStream(filename='test.m1v')
+        b = a.len
+        a *= 3
+        self.assertEqual(a.len, 3 * b)
+
+    def testMultiplicationErrors(self):
+        a = BitStream('0b1')
+        b = BitStream('0b0')
+        self.assertRaises(ValueError, a.__mul__, -1)
+        self.assertRaises(ValueError, a.__imul__, -1)
+        self.assertRaises(ValueError, a.__rmul__, -1)
+        self.assertRaises(TypeError, a.__mul__, 1.2)
+        self.assertRaises(TypeError, a.__rmul__, b)
+        self.assertRaises(TypeError, a.__imul__, b)
+
+    def testFileAndMemEquivalence(self):
+        a = ConstBitStream(filename='smalltestfile')
+        b = BitStream(filename='smalltestfile')
+        self.assertTrue(isinstance(a._datastore._rawarray, bitstring.MmapByteArray))
+        self.assertTrue(isinstance(b._datastore._rawarray, bytearray))
+        self.assertEqual(a._datastore.getbyte(0), b._datastore.getbyte(0))
+        self.assertEqual(a._datastore.getbyteslice(1, 5), bytearray(b._datastore.getbyteslice(1, 5)))
+
+
+class BitWise(unittest.TestCase):
+
+    def testBitwiseAnd(self):
+        a = BitStream('0b01101')
+        b = BitStream('0b00110')
+        self.assertEqual((a & b).bin, '00100')
+        self.assertEqual((a & '0b11111'), a)
+        self.assertRaises(ValueError, a.__and__, '0b1')
+        self.assertRaises(ValueError, b.__and__, '0b110111111')
+        c = BitStream('0b0011011')
+        c.pos = 4
+        d = c & '0b1111000'
+        self.assertEqual(d.pos, 0)
+        self.assertEqual(d.bin, '0011000')
+        d = '0b1111000' & c
+        self.assertEqual(d.bin, '0011000')
+
+    def testBitwiseOr(self):
+        a = BitStream('0b111001001')
+        b = BitStream('0b011100011')
+        self.assertEqual((a | b).bin, '111101011')
+        self.assertEqual((a | '0b000000000'), a)
+        self.assertRaises(ValueError, a.__or__, '0b0000')
+        self.assertRaises(ValueError, b.__or__, a + '0b1')
+        a = '0xff00' | BitStream('0x00f0')
+        self.assertEqual(a.hex, 'fff0')
+
+    def testBitwiseXor(self):
+        a = BitStream('0b111001001')
+        b = BitStream('0b011100011')
+        self.assertEqual((a ^ b).bin, '100101010')
+        self.assertEqual((a ^ '0b111100000').bin, '000101001')
+        self.assertRaises(ValueError, a.__xor__, '0b0000')
+        self.assertRaises(ValueError, b.__xor__, a + '0b1')
+        a = '0o707' ^ BitStream('0o777')
+        self.assertEqual(a.oct, '070')
+
+class Split(unittest.TestCase):
+
+    def testSplit(self):
+        a = BitStream('0b0 010100111 010100 0101 010')
+        a.pos = 20
+        subs = [i.bin for i in a.split('0b010')]
+        self.assertEqual(subs, ['0', '010100111', '010100', '0101', '010'])
+        self.assertEqual(a.pos, 20)
+
+    def testSplitCornerCases(self):
+        a = BitStream('0b000000')
+        bsl = a.split('0b1', False)
+        self.assertEqual(next(bsl), a)
+        self.assertRaises(StopIteration, next, bsl)
+        b = BitStream()
+        bsl = b.split('0b001', False)
+        self.assertFalse(next(bsl))
+        self.assertRaises(StopIteration, next, bsl)
+
+    def testSplitErrors(self):
+        a = BitStream('0b0')
+        b = a.split('', False)
+        self.assertRaises(ValueError, next, b)
+
+    def testSliceWithOffset(self):
+        a = BitStream(bytes=b'\x00\xff\x00', offset=7)
+        b = a[7:12]
+        self.assertEqual(b.bin, '11000')
+
+    def testSplitWithMaxsplit(self):
+        a = BitStream('0xaabbccbbccddbbccddee')
+        self.assertEqual(len(list(a.split('0xbb', bytealigned=True))), 4)
+        bsl = list(a.split('0xbb', count=1, bytealigned=True))
+        self.assertEqual((len(bsl), bsl[0]), (1, '0xaa'))
+        bsl = list(a.split('0xbb', count=2, bytealigned=True))
+        self.assertEqual(len(bsl), 2)
+        self.assertEqual(bsl[0], '0xaa')
+        self.assertEqual(bsl[1], '0xbbcc')
+
+    def testSplitMore(self):
+        s = BitStream('0b1100011001110110')
+        for i in range(10):
+            a = list(s.split('0b11', False, count=i))
+            b = list(s.split('0b11', False))[:i]
+            self.assertEqual(a, b)
+        b = s.split('0b11', count=-1)
+        self.assertRaises(ValueError, next, b)
+
+    def testSplitStartbit(self):
+        a = BitStream('0b0010101001000000001111')
+        bsl = a.split('0b001', bytealigned=False, start=1)
+        self.assertEqual([x.bin for x in bsl], ['010101', '001000000', '001111'])
+        b = a.split('0b001', start=-100)
+        self.assertRaises(ValueError, next, b)
+        b = a.split('0b001', start=23)
+        self.assertRaises(ValueError, next, b)
+        b = a.split('0b1', start=10, end=9)
+        self.assertRaises(ValueError, next, b)
+
+    def testSplitStartbitByteAligned(self):
+        a = BitStream('0x00ffffee')
+        bsl = list(a.split('0b111', start=9, bytealigned=True))
+        self.assertEqual([x.bin for x in bsl], ['1111111', '11111111', '11101110'])
+
+    def testSplitEndbit(self):
+        a = BitStream('0b000010001001011')
+        bsl = list(a.split('0b1', bytealigned=False, end=14))
+        self.assertEqual([x.bin for x in bsl], ['0000', '1000', '100', '10', '1'])
+        self.assertEqual(list(a[4:12].split('0b0', False)), list(a.split('0b0', start=4, end=12)))
+        # Shouldn't raise ValueError
+        bsl = list(a.split('0xffee', end=15))
+        # Whereas this one will when we call next()
+        bsl = a.split('0xffee', end=16)
+        self.assertRaises(ValueError, next, bsl)
+
+    def testSplitEndbitByteAligned(self):
+        a = BitStream('0xff00ff')[:22]
+        bsl = list(a.split('0b 0000 0000 111', end=19))
+        self.assertEqual([x.bin for x in bsl], ['11111111', '00000000111'])
+        bsl = list(a.split('0b 0000 0000 111', end=18))
+        self.assertEqual([x.bin for x in bsl], ['111111110000000011'])
+
+    def testSplitMaxSplit(self):
+        a = BitStream('0b1' * 20)
+        for i in range(10):
+            bsl = list(a.split('0b1', count=i))
+            self.assertEqual(len(bsl), i)
+
+    #######################
+
+    def testPositionInSlice(self):
+        a = BitStream('0x00ffff00')
+        a.bytepos = 2
+        b = a[8:24]
+        self.assertEqual(b.bytepos, 0)
+
+    def testFindByteAlignedWithBits(self):
+        a = BitStream('0x00112233445566778899')
+        a.find('0b0001', bytealigned=True)
+        self.assertEqual(a.bitpos, 8)
+
+    def testFindStartbitNotByteAligned(self):
+        a = BitStream('0b0010000100')
+        found = a.find('0b1', start=4)
+        self.assertEqual((found, a.bitpos), ((7,), 7))
+        found = a.find('0b1', start=2)
+        self.assertEqual((found, a.bitpos), ((2,), 2))
+        found = a.find('0b1', bytealigned=False, start=8)
+        self.assertEqual((found, a.bitpos), ((), 2))
+
+    def testFindEndbitNotByteAligned(self):
+        a = BitStream('0b0010010000')
+        found = a.find('0b1', bytealigned=False, end=2)
+        self.assertEqual((found, a.bitpos), ((), 0))
+        found = a.find('0b1', end=3)
+        self.assertEqual((found, a.bitpos), ((2,), 2))
+        found = a.find('0b1', bytealigned=False, start=3, end=5)
+        self.assertEqual((found, a.bitpos), ((), 2))
+        found = a.find('0b1', start=3, end=6)
+        self.assertEqual((found[0], a.bitpos), (5, 5))
+
+    def testFindStartbitByteAligned(self):
+        a = BitStream('0xff001122ff0011ff')
+        a.pos = 40
+        found = a.find('0x22', start=23, bytealigned=True)
+        self.assertEqual((found, a.bytepos), ((24,), 3))
+        a.bytepos = 4
+        found = a.find('0x22', start=24, bytealigned=True)
+        self.assertEqual((found, a.bytepos), ((24,), 3))
+        found = a.find('0x22', start=25, bytealigned=True)
+        self.assertEqual((found, a.pos), ((), 24))
+        found = a.find('0b111', start=40, bytealigned=True)
+        self.assertEqual((found, a.pos), ((56,), 56))
+
+    def testFindEndbitByteAligned(self):
+        a = BitStream('0xff001122ff0011ff')
+        found = a.find('0x22', end=31, bytealigned=True)
+        self.assertFalse(found)
+        self.assertEqual(a.pos, 0)
+        found = a.find('0x22', end=32, bytealigned=True)
+        self.assertTrue(found)
+        self.assertEqual(a.pos, 24)
+        self.assertEqual(found[0], 24)
+
+    def testFindStartEndbitErrors(self):
+        a = BitStream('0b00100')
+        self.assertRaises(ValueError, a.find, '0b1', bytealigned=False, start=-100)
+        self.assertRaises(ValueError, a.find, '0b1', end=6)
+        self.assertRaises(ValueError, a.find, '0b1', start=4, end=3)
+        b = BitStream('0x0011223344')
+        self.assertRaises(ValueError, a.find, '0x22', bytealigned=True, start=-100)
+        self.assertRaises(ValueError, a.find, '0x22', end=41, bytealigned=True)
+
+    def testPrependAndAppendAgain(self):
+        c = BitStream('0x1122334455667788')
+        c.bitpos = 40
+        c.prepend('0b1')
+        self.assertEqual(c.bitpos, 41)
+        c = BitStream()
+        c.prepend('0x1234')
+        self.assertEqual(c.bytepos, 2)
+        c = BitStream()
+        c.append('0x1234')
+        self.assertEqual(c.bytepos, 0)
+        s = BitStream(bytes=b'\xff\xff', offset=2)
+        self.assertEqual(s.length, 14)
+        t = BitStream(bytes=b'\x80', offset=1, length=2)
+        s.prepend(t)
+        self.assertEqual(s, '0x3fff')
+
+    def testFindAll(self):
+        a = BitStream('0b11111')
+        p = a.findall('0b1')
+        self.assertEqual(list(p), [0, 1, 2, 3, 4])
+        p = a.findall('0b11')
+        self.assertEqual(list(p), [0, 1, 2, 3])
+        p = a.findall('0b10')
+        self.assertEqual(list(p), [])
+        a = BitStream('0x4733eeff66554747335832434547')
+        p = a.findall('0x47', bytealigned=True)
+        self.assertEqual(list(p), [0, 6 * 8, 7 * 8, 13 * 8])
+        p = a.findall('0x4733', bytealigned=True)
+        self.assertEqual(list(p), [0, 7 * 8])
+        a = BitStream('0b1001001001001001001')
+        p = a.findall('0b1001', bytealigned=False)
+        self.assertEqual(list(p), [0, 3, 6, 9, 12, 15])
+        self.assertEqual(a.pos, 15)
+
+    def testFindAllGenerator(self):
+        a = BitStream('0xff1234512345ff1234ff12ff')
+        p = a.findall('0xff', bytealigned=True)
+        self.assertEqual(next(p), 0)
+        self.assertEqual(next(p), 6 * 8)
+        self.assertEqual(next(p), 9 * 8)
+        self.assertEqual(next(p), 11 * 8)
+        self.assertRaises(StopIteration, next, p)
+
+    def testFindAllCount(self):
+        s = BitStream('0b1') * 100
+        for i in [0, 1, 23]:
+            self.assertEqual(len(list(s.findall('0b1', count=i))), i)
+        b = s.findall('0b1', bytealigned=True, count=-1)
+        self.assertRaises(ValueError, next, b)
+
+    def testContains(self):
+        a = BitStream('0b1') + '0x0001dead0001'
+        self.assertTrue('0xdead' in a)
+        self.assertEqual(a.pos, 0)
+        self.assertFalse('0xfeed' in a)
+
+    def testRepr(self):
+        max = bitstring.MAX_CHARS
+        bls = ['', '0b1', '0o5', '0x43412424f41', '0b00101001010101']
+        for bs in bls:
+            a = BitStream(bs)
+            b = eval(a.__repr__())
+            self.assertTrue(a == b)
+        for f in [ConstBitStream(filename='test.m1v'),
+                  ConstBitStream(filename='test.m1v', length=17),
+                  ConstBitStream(filename='test.m1v', length=23, offset=23102)]:
+            f2 = eval(f.__repr__())
+            self.assertEqual(f._datastore._rawarray.source.name, f2._datastore._rawarray.source.name)
+            self.assertTrue(f2.tobytes() == f.tobytes())
+        a = BitStream('0b1')
+        self.assertEqual(repr(a), "BitStream('0b1')")
+        a += '0b11'
+        self.assertEqual(repr(a), "BitStream('0b111')")
+        a += '0b1'
+        self.assertEqual(repr(a), "BitStream('0xf')")
+        a *= max
+        self.assertEqual(repr(a), "BitStream('0x" + "f" * max + "')")
+        a += '0xf'
+        self.assertEqual(repr(a), "BitStream('0x" + "f" * max + "...') # length=%d" % (max * 4 + 4))
+
+    def testPrint(self):
+        s = BitStream(hex='0x00')
+        self.assertEqual('0x' + s.hex, s.__str__())
+        s = BitStream(filename='test.m1v')
+        self.assertEqual('0x' + s[0:bitstring.MAX_CHARS * 4].hex + '...', s.__str__())
+        self.assertEqual(BitStream().__str__(), '')
+        s = BitStream('0b11010')
+        self.assertEqual('0b' + s.bin, s.__str__())
+        s = BitStream('0x12345678901234567890,0b1')
+        self.assertEqual('0x12345678901234567890, 0b1', s.__str__())
+
+    def testIter(self):
+        a = BitStream('0b001010')
+        b = BitStream()
+        for bit in a:
+            b.append(ConstBitStream(bool=bit))
+        self.assertEqual(a, b)
+
+    def testDelitem(self):
+        a = BitStream('0xffee')
+        del a[0:8]
+        self.assertEqual(a.hex, 'ee')
+        del a[0:8]
+        self.assertFalse(a)
+        del a[10:12]
+        self.assertFalse(a)
+
+    def testNonZeroBitsAtStart(self):
+        a = BitStream(bytes=b'\xff', offset=2)
+        b = BitStream('0b00')
+        b += a
+        self.assertTrue(b == '0b0011 1111')
+        #self.assertEqual(a._datastore.rawbytes, b'\xff')
+        self.assertEqual(a.tobytes(), b'\xfc')
+
+    def testNonZeroBitsAtEnd(self):
+        a = BitStream(bytes=b'\xff', length=5)
+        #self.assertEqual(a._datastore.rawbytes, b'\xff')
+        b = BitStream('0b00')
+        a += b
+        self.assertTrue(a == '0b1111100')
+        self.assertEqual(a.tobytes(), b'\xf8')
+        self.assertRaises(ValueError, a._getbytes)
+
+    def testNewOffsetErrors(self):
+        self.assertRaises(bitstring.CreationError, BitStream, hex='ff', offset=-1)
+        self.assertRaises(bitstring.CreationError, BitStream, '0xffffffff', offset=33)
+
+    def testSliceStep(self):
+        a = BitStream('0x3')
+        b = a[::1]
+        self.assertEqual(a, b)
+        self.assertEqual(a[2:4:1], '0b11')
+        self.assertEqual(a[0:2:1], '0b00')
+        self.assertEqual(a[:3], '0o1')
+
+        a = BitStream('0x0011223344556677')
+        self.assertEqual(a[-8:], '0x77')
+        self.assertEqual(a[:-24], '0x0011223344')
+        self.assertEqual(a[-1000:-24], '0x0011223344')
+
+    def testInterestingSliceStep(self):
+        a = BitStream('0b0011000111')
+        self.assertEqual(a[7:3:-1], '0b1000')
+        self.assertEqual(a[9:2:-1], '0b1110001')
+        self.assertEqual(a[8:2:-2], '0b100')
+        self.assertEqual(a[100:-20:-3], '0b1010')
+        self.assertEqual(a[100:-20:-1], '0b1110001100')
+        self.assertEqual(a[10:2:-1], '0b1110001')
+        self.assertEqual(a[100:2:-1], '0b1110001')
+
+    def testInsertionOrderAndBitpos(self):
+        b = BitStream()
+        b[0:0] = '0b0'
+        b[0:0] = '0b1'
+        self.assertEqual(b, '0b10')
+        self.assertEqual(b.bitpos, 1)
+        a = BitStream()
+        a.insert('0b0')
+        a.insert('0b1')
+        self.assertEqual(a, '0b01')
+        self.assertEqual(a.bitpos, 2)
+
+    def testOverwriteOrderAndBitpos(self):
+        a = BitStream('0xff')
+        a.overwrite('0xa')
+        self.assertEqual(a, '0xaf')
+        self.assertEqual(a.bitpos, 4)
+        a.overwrite('0xb')
+        self.assertEqual(a, '0xab')
+        self.assertEqual(a.bitpos, 8)
+        self.assertRaises(ValueError, a.overwrite, '0b1')
+        a.overwrite('0xa', 4)
+        self.assertEqual(a, '0xaa')
+        self.assertEqual(a.bitpos, 8)
+        a.overwrite(a, 0)
+        self.assertEqual(a, '0xaa')
+
+    def testInitSliceWithInt(self):
+        a = BitStream(length=8)
+        a[:] = 100
+        self.assertEqual(a.uint, 100)
+        a[0] = 1
+        self.assertEqual(a.bin, '11100100')
+        a[1] = 0
+        self.assertEqual(a.bin, '10100100')
+        a[-1] = -1
+        self.assertEqual(a.bin, '10100101')
+        a[-3:] = -2
+        self.assertEqual(a.bin, '10100110')
+
+    def testInitSliceWithIntErrors(self):
+        a = BitStream('0b0000')
+        self.assertRaises(ValueError, a.__setitem__, slice(0, 4), 16)
+        self.assertRaises(ValueError, a.__setitem__, slice(0, 4), -9)
+        self.assertRaises(ValueError, a.__setitem__, 0, 2)
+        self.assertRaises(ValueError, a.__setitem__, 0, -2)
+
+    def testReverseWithSlice(self):
+        a = BitStream('0x0012ff')
+        a.reverse()
+        self.assertEqual(a, '0xff4800')
+        a.reverse(8, 16)
+        self.assertEqual(a, '0xff1200')
+        b = a[8:16]
+        b.reverse()
+        a[8:16] = b
+        self.assertEqual(a, '0xff4800')
+
+    def testReverseWithSliceErrors(self):
+        a = BitStream('0x123')
+        self.assertRaises(ValueError, a.reverse, -1, 4)
+        self.assertRaises(ValueError, a.reverse, 10, 9)
+        self.assertRaises(ValueError, a.reverse, 1, 10000)
+
+    def testInitialiseFromList(self):
+        a = BitStream([])
+        self.assertFalse(a)
+        a = BitStream([True, False, [], [0], 'hello'])
+        self.assertEqual(a, '0b10011')
+        a += []
+        self.assertEqual(a, '0b10011')
+        a += [True, False, True]
+        self.assertEqual(a, '0b10011101')
+        a.find([12, 23])
+        self.assertEqual(a.pos, 3)
+        self.assertEqual([1, 0, False, True], BitStream('0b1001'))
+        a = [True] + BitStream('0b1')
+        self.assertEqual(a, '0b11')
+
+    def testInitialiseFromTuple(self):
+        a = BitStream(())
+        self.assertFalse(a)
+        a = BitStream((0, 1, '0', '1'))
+        self.assertEqual('0b0111', a)
+        a.replace((True, True), [])
+        self.assertEqual(a, (False, True))
+
+    def testCut(self):
+        a = BitStream('0x00112233445')
+        b = list(a.cut(8))
+        self.assertEqual(b, ['0x00', '0x11', '0x22', '0x33', '0x44'])
+        b = list(a.cut(4, 8, 16))
+        self.assertEqual(b, ['0x1', '0x1'])
+        b = list(a.cut(4, 0, 44, 4))
+        self.assertEqual(b, ['0x0', '0x0', '0x1', '0x1'])
+        a = BitStream()
+        b = list(a.cut(10))
+        self.assertTrue(not b)
+
+    def testCutErrors(self):
+        a = BitStream('0b1')
+        b = a.cut(1, 1, 2)
+        self.assertRaises(ValueError, next, b)
+        b = a.cut(1, -2, 1)
+        self.assertRaises(ValueError, next, b)
+        b = a.cut(0)
+        self.assertRaises(ValueError, next, b)
+        b = a.cut(1, count=-1)
+        self.assertRaises(ValueError, next, b)
+
+    def testCutProblem(self):
+        s = BitStream('0x1234')
+        for n in list(s.cut(4)):
+            s.prepend(n)
+        self.assertEqual(s, '0x43211234')
+
+    def testJoinFunctions(self):
+        a = BitStream().join(['0xa', '0xb', '0b1111'])
+        self.assertEqual(a, '0xabf')
+        a = BitStream('0b1').join(['0b0' for i in range(10)])
+        self.assertEqual(a, '0b0101010101010101010')
+        a = BitStream('0xff').join([])
+        self.assertFalse(a)
+
+    def testAddingBitpos(self):
+        a = BitStream('0xff')
+        b = BitStream('0x00')
+        a.bitpos = b.bitpos = 8
+        c = a + b
+        self.assertEqual(c.bitpos, 0)
+
+    def testIntelligentRead1(self):
+        a = BitStream(uint=123, length=23)
+        u = a.read('uint:23')
+        self.assertEqual(u, 123)
+        self.assertEqual(a.pos, a.len)
+        b = BitStream(int=-12, length=44)
+        i = b.read('int:44')
+        self.assertEqual(i, -12)
+        self.assertEqual(b.pos, b.len)
+        u2, i2 = (a + b).readlist('uint:23, int:44')
+        self.assertEqual((u2, i2), (123, -12))
+
+    def testIntelligentRead2(self):
+        a = BitStream(ue=822)
+        u = a.read('ue')
+        self.assertEqual(u, 822)
+        self.assertEqual(a.pos, a.len)
+        b = BitStream(se=-1001)
+        s = b.read('se')
+        self.assertEqual(s, -1001)
+        self.assertEqual(b.pos, b.len)
+        s, u1, u2 = (b + 2 * a).readlist('se, ue, ue')
+        self.assertEqual((s, u1, u2), (-1001, 822, 822))
+
+    def testIntelligentRead3(self):
+        a = BitStream('0x123') + '0b11101'
+        h = a.read('hex:12')
+        self.assertEqual(h, '123')
+        b = a.read('bin: 5')
+        self.assertEqual(b, '11101')
+        c = '0b' + b + a
+        b, h = c.readlist('bin:5, hex:12')
+        self.assertEqual((b, h), ('11101', '123'))
+
+    def testIntelligentRead4(self):
+        a = BitStream('0o007')
+        o = a.read('oct:9')
+        self.assertEqual(o, '007')
+        self.assertEqual(a.pos, a.len)
+
+    def testIntelligentRead5(self):
+        a = BitStream('0x00112233')
+        c0, c1, c2 = a.readlist('bits:8, bits:8, bits:16')
+        self.assertEqual((c0, c1, c2), (BitStream('0x00'), BitStream('0x11'), BitStream('0x2233')))
+        a.pos = 0
+        c = a.read('bits:16')
+        self.assertEqual(c, BitStream('0x0011'))
+
+    def testIntelligentRead6(self):
+        a = BitStream('0b000111000')
+        b1, b2, b3 = a.readlist('bin :3, int: 3, int:3')
+        self.assertEqual(b1, '000')
+        self.assertEqual(b2, -1)
+        self.assertEqual(b3, 0)
+
+    def testIntelligentRead7(self):
+        a = BitStream('0x1234')
+        a1, a2, a3, a4 = a.readlist('bin:0, oct:0, hex:0, bits:0')
+        self.assertTrue(a1 == a2 == a3 == '')
+        self.assertFalse(a4)
+        self.assertRaises(ValueError, a.read, 'int:0')
+        self.assertRaises(ValueError, a.read, 'uint:0')
+        self.assertEqual(a.pos, 0)
+
+    def testIntelligentRead8(self):
+        a = BitStream('0x123456')
+        for t in ['hex:1', 'oct:1', 'hex4', '-5', 'fred', 'bin:-2',
+                  'uint:p', 'uint:-2', 'int:u', 'int:-3', 'ses', 'uee', '-14']:
+            self.assertRaises(ValueError, a.read, t)
+
+    def testIntelligentRead9(self):
+        a = BitStream('0xff')
+        self.assertEqual(a.read('intle'), -1)
+
+    def testFillerReads1(self):
+        s = BitStream('0x012345')
+        t = s.read('bits')
+        self.assertEqual(s, t)
+        s.pos = 0
+        a, b = s.readlist('hex:8, hex')
+        self.assertEqual(a, '01')
+        self.assertEqual(b, '2345')
+        self.assertTrue(isinstance(b, str))
+        s.bytepos = 0
+        a, b = s.readlist('bin, hex:20')
+        self.assertEqual(a, '0000')
+        self.assertEqual(b, '12345')
+        self.assertTrue(isinstance(a, str))
+
+    def testFillerReads2(self):
+        s = BitStream('0xabcdef')
+        self.assertRaises(bitstring.Error, s.readlist, 'bits, se')
+        self.assertRaises(bitstring.Error, s.readlist, 'hex:4, bits, ue, bin:4')
+        s.pos = 0
+        self.assertRaises(bitstring.Error, s.readlist, 'bin, bin')
+
+    def testIntelligentPeek(self):
+        a = BitStream('0b01, 0x43, 0o4, uint:23=2, se=5, ue=3')
+        b, c, e = a.peeklist('bin:2, hex:8, oct:3')
+        self.assertEqual((b, c, e), ('01', '43', '4'))
+        self.assertEqual(a.pos, 0)
+        a.pos = 13
+        f, g, h = a.peeklist('uint:23, se, ue')
+        self.assertEqual((f, g, h), (2, 5, 3))
+        self.assertEqual(a.pos, 13)
+
+    def testReadMultipleBits(self):
+        s = BitStream('0x123456789abcdef')
+        a, b = s.readlist([4, 4])
+        self.assertEqual(a, '0x1')
+        self.assertEqual(b, '0x2')
+        c, d, e = s.readlist([8, 16, 8])
+        self.assertEqual(c, '0x34')
+        self.assertEqual(d, '0x5678')
+        self.assertEqual(e, '0x9a')
+
+    def testPeekMultipleBits(self):
+        s = BitStream('0b1101, 0o721, 0x2234567')
+        a, b, c, d = s.peeklist([2, 1, 1, 9])
+        self.assertEqual(a, '0b11')
+        self.assertEqual(bool(b), False)
+        self.assertEqual(bool(c), True)
+        self.assertEqual(d, '0o721')
+        self.assertEqual(s.pos, 0)
+        a, b = s.peeklist([4, 9])
+        self.assertEqual(a, '0b1101')
+        self.assertEqual(b, '0o721')
+        s.pos = 13
+        a, b = s.peeklist([16, 8])
+        self.assertEqual(a, '0x2234')
+        self.assertEqual(b, '0x56')
+        self.assertEqual(s.pos, 13)
+
+    def testDifficultPrepends(self):
+        a = BitStream('0b1101011')
+        b = BitStream()
+        for i in range(10):
+            b.prepend(a)
+        self.assertEqual(b, a * 10)
+
+    def testPackingWrongNumberOfThings(self):
+        self.assertRaises(bitstring.CreationError, pack, 'bin:1')
+        self.assertRaises(bitstring.CreationError, pack, '', 100)
+
+    def testPackWithVariousKeys(self):
+        a = pack('uint10', uint10='0b1')
+        self.assertEqual(a, '0b1')
+        b = pack('0b110', **{'0b110': '0xfff'})
+        self.assertEqual(b, '0xfff')
+
+    def testPackWithVariableLength(self):
+        for i in range(1, 11):
+            a = pack('uint:n', 0, n=i)
+            self.assertEqual(a.bin, '0' * i)
+
+    def testToBytes(self):
+        a = BitStream(bytes=b'\xab\x00')
+        b = a.tobytes()
+        self.assertEqual(a.bytes, b)
+        for i in range(7):
+            del a[-1:]
+            self.assertEqual(a.tobytes(), b'\xab\x00')
+        del a[-1:]
+        self.assertEqual(a.tobytes(), b'\xab')
+
+    def testToFile(self):
+        a = BitStream('0x0000ff')[:17]
+        f = open('temp_bitstring_unit_testing_file', 'wb')
+        a.tofile(f)
+        f.close()
+        b = BitStream(filename='temp_bitstring_unit_testing_file')
+        self.assertEqual(b, '0x000080')
+
+        a = BitStream('0x911111')
+        del a[:1]
+        self.assertEqual(a + '0b0', '0x222222')
+        f = open('temp_bitstring_unit_testing_file', 'wb')
+        a.tofile(f)
+        f.close()
+        b = BitStream(filename='temp_bitstring_unit_testing_file')
+        self.assertEqual(b, '0x222222')
+        os.remove('temp_bitstring_unit_testing_file')
+
+    #def testToFileWithLargerFile(self):
+    #    a = BitStream(length=16000000)
+    #    a[1] = '0b1'
+    #    a[-2] = '0b1'
+    #    f = open('temp_bitstring_unit_testing_file' ,'wb')
+    #    a.tofile(f)
+    #    f.close()
+    #    b = BitStream(filename='temp_bitstring_unit_testing_file')
+    #    self.assertEqual(b.len, 16000000)
+    #    self.assertEqual(b[1], True)
+    #
+    #    f = open('temp_bitstring_unit_testing_file' ,'wb')
+    #    a[1:].tofile(f)
+    #    f.close()
+    #    b = BitStream(filename='temp_bitstring_unit_testing_file')
+    #    self.assertEqual(b.len, 16000000)
+    #    self.assertEqual(b[0], True)
+    #    os.remove('temp_bitstring_unit_testing_file')
+
+    def testTokenParser(self):
+        tp = bitstring.tokenparser
+        self.assertEqual(tp('hex'), (True, [('hex', None, None)]))
+        self.assertEqual(tp('hex=14'), (True, [('hex', None, '14')]))
+        self.assertEqual(tp('se'), (False, [('se', None, None)]))
+        self.assertEqual(tp('ue=12'), (False, [('ue', None, '12')]))
+        self.assertEqual(tp('0xef'), (False, [('0x', None, 'ef')]))
+        self.assertEqual(tp('uint:12'), (False, [('uint', 12, None)]))
+        self.assertEqual(tp('int:30=-1'), (False, [('int', 30, '-1')]))
+        self.assertEqual(tp('bits:10'), (False, [('bits', 10, None)]))
+        self.assertEqual(tp('bits:10'), (False, [('bits', 10, None)]))
+        self.assertEqual(tp('123'), (False, [('uint', 123, None)]))
+        self.assertEqual(tp('123'), (False, [('uint', 123, None)]))
+        self.assertRaises(ValueError, tp, 'hex12')
+        self.assertEqual(tp('hex12', ('hex12',)), (False, [('hex12', None, None)]))
+        self.assertEqual(tp('2*bits:6'), (False, [('bits', 6, None), ('bits', 6, None)]))
+
+    def testAutoFromFileObject(self):
+        with open('test.m1v', 'rb') as f:
+            s = ConstBitStream(f, offset=32, length=12)
+            self.assertEqual(s.uint, 352)
+            t = ConstBitStream('0xf') + f
+            self.assertTrue(t.startswith('0xf000001b3160'))
+            s2 = ConstBitStream(f)
+            t2 = BitStream('0xc')
+            t2.prepend(s2)
+            self.assertTrue(t2.startswith('0x000001b3'))
+            self.assertTrue(t2.endswith('0xc'))
+            with open('test.m1v', 'rb') as b:
+                u = BitStream(bytes=b.read())
+                # TODO: u == s2 is much slower than u.bytes == s2.bytes
+                self.assertEqual(u.bytes, s2.bytes)
+
+    def testFileBasedCopy(self):
+        with open('smalltestfile', 'rb') as f:
+            s = BitStream(f)
+            t = BitStream(s)
+            s.prepend('0b1')
+            self.assertEqual(s[1:], t)
+            s = BitStream(f)
+            t = copy.copy(s)
+            t.append('0b1')
+            self.assertEqual(s, t[:-1])
+
+    def testBigEndianSynonyms(self):
+        s = BitStream('0x12318276ef')
+        self.assertEqual(s.int, s.intbe)
+        self.assertEqual(s.uint, s.uintbe)
+        s = BitStream(intbe=-100, length=16)
+        self.assertEqual(s, 'int:16=-100')
+        s = BitStream(uintbe=13, length=24)
+        self.assertEqual(s, 'int:24=13')
+        s = BitStream('uintbe:32=1000')
+        self.assertEqual(s, 'uint:32=1000')
+        s = BitStream('intbe:8=2')
+        self.assertEqual(s, 'int:8=2')
+        self.assertEqual(s.read('intbe'), 2)
+        s.pos = 0
+        self.assertEqual(s.read('uintbe'), 2)
+
+    def testBigEndianSynonymErrors(self):
+        self.assertRaises(bitstring.CreationError, BitStream, uintbe=100, length=15)
+        self.assertRaises(bitstring.CreationError, BitStream, intbe=100, length=15)
+        self.assertRaises(bitstring.CreationError, BitStream, 'uintbe:17=100')
+        self.assertRaises(bitstring.CreationError, BitStream, 'intbe:7=2')
+        s = BitStream('0b1')
+        self.assertRaises(bitstring.InterpretError, s._getintbe)
+        self.assertRaises(bitstring.InterpretError, s._getuintbe)
+        self.assertRaises(ValueError, s.read, 'uintbe')
+        self.assertRaises(ValueError, s.read, 'intbe')
+
+    def testLittleEndianUint(self):
+        s = BitStream(uint=100, length=16)
+        self.assertEqual(s.uintle, 25600)
+        s = BitStream(uintle=100, length=16)
+        self.assertEqual(s.uint, 25600)
+        self.assertEqual(s.uintle, 100)
+        s.uintle += 5
+        self.assertEqual(s.uintle, 105)
+        s = BitStream('uintle:32=999')
+        self.assertEqual(s.uintle, 999)
+        s.byteswap()
+        self.assertEqual(s.uint, 999)
+        s = pack('uintle:24', 1001)
+        self.assertEqual(s.uintle, 1001)
+        self.assertEqual(s.length, 24)
+        self.assertEqual(s.read('uintle'), 1001)
+
+    def testLittleEndianInt(self):
+        s = BitStream(int=100, length=16)
+        self.assertEqual(s.intle, 25600)
+        s = BitStream(intle=100, length=16)
+        self.assertEqual(s.int, 25600)
+        self.assertEqual(s.intle, 100)
+        s.intle += 5
+        self.assertEqual(s.intle, 105)
+        s = BitStream('intle:32=999')
+        self.assertEqual(s.intle, 999)
+        s.byteswap()
+        self.assertEqual(s.int, 999)
+        s = pack('intle:24', 1001)
+        self.assertEqual(s.intle, 1001)
+        self.assertEqual(s.length, 24)
+        self.assertEqual(s.read('intle'), 1001)
+
+    def testLittleEndianErrors(self):
+        self.assertRaises(bitstring.CreationError, BitStream, 'uintle:15=10')
+        self.assertRaises(bitstring.CreationError, BitStream, 'intle:31=-999')
+        self.assertRaises(bitstring.CreationError, BitStream, uintle=100, length=15)
+        self.assertRaises(bitstring.CreationError, BitStream, intle=100, length=15)
+        s = BitStream('0xfff')
+        self.assertRaises(bitstring.InterpretError, s._getintle)
+        self.assertRaises(bitstring.InterpretError, s._getuintle)
+        self.assertRaises(ValueError, s.read, 'uintle')
+        self.assertRaises(ValueError, s.read, 'intle')
+
+    def testStructTokens1(self):
+        self.assertEqual(pack('<b', 23), BitStream('intle:8=23'))
+        self.assertEqual(pack('<B', 23), BitStream('uintle:8=23'))
+        self.assertEqual(pack('<h', 23), BitStream('intle:16=23'))
+        self.assertEqual(pack('<H', 23), BitStream('uintle:16=23'))
+        self.assertEqual(pack('<l', 23), BitStream('intle:32=23'))
+        self.assertEqual(pack('<L', 23), BitStream('uintle:32=23'))
+        self.assertEqual(pack('<q', 23), BitStream('intle:64=23'))
+        self.assertEqual(pack('<Q', 23), BitStream('uintle:64=23'))
+        self.assertEqual(pack('>b', 23), BitStream('intbe:8=23'))
+        self.assertEqual(pack('>B', 23), BitStream('uintbe:8=23'))
+        self.assertEqual(pack('>h', 23), BitStream('intbe:16=23'))
+        self.assertEqual(pack('>H', 23), BitStream('uintbe:16=23'))
+        self.assertEqual(pack('>l', 23), BitStream('intbe:32=23'))
+        self.assertEqual(pack('>L', 23), BitStream('uintbe:32=23'))
+        self.assertEqual(pack('>q', 23), BitStream('intbe:64=23'))
+        self.assertEqual(pack('>Q', 23), BitStream('uintbe:64=23'))
+        self.assertRaises(bitstring.CreationError, pack, '<B', -1)
+        self.assertRaises(bitstring.CreationError, pack, '<H', -1)
+        self.assertRaises(bitstring.CreationError, pack, '<L', -1)
+        self.assertRaises(bitstring.CreationError, pack, '<Q', -1)
+
+    def testStructTokens2(self):
+        endianness = sys.byteorder
+        sys.byteorder = 'little'
+        self.assertEqual(pack('@b', 23), BitStream('intle:8=23'))
+        self.assertEqual(pack('@B', 23), BitStream('uintle:8=23'))
+        self.assertEqual(pack('@h', 23), BitStream('intle:16=23'))
+        self.assertEqual(pack('@H', 23), BitStream('uintle:16=23'))
+        self.assertEqual(pack('@l', 23), BitStream('intle:32=23'))
+        self.assertEqual(pack('@L', 23), BitStream('uintle:32=23'))
+        self.assertEqual(pack('@q', 23), BitStream('intle:64=23'))
+        self.assertEqual(pack('@Q', 23), BitStream('uintle:64=23'))
+        sys.byteorder = 'big'
+        self.assertEqual(pack('@b', 23), BitStream('intbe:8=23'))
+        self.assertEqual(pack('@B', 23), BitStream('uintbe:8=23'))
+        self.assertEqual(pack('@h', 23), BitStream('intbe:16=23'))
+        self.assertEqual(pack('@H', 23), BitStream('uintbe:16=23'))
+        self.assertEqual(pack('@l', 23), BitStream('intbe:32=23'))
+        self.assertEqual(pack('@L', 23), BitStream('uintbe:32=23'))
+        self.assertEqual(pack('@q', 23), BitStream('intbe:64=23'))
+        self.assertEqual(pack('@Q', 23), BitStream('uintbe:64=23'))
+        sys.byteorder = endianness
+
+    def testNativeEndianness(self):
+        s = pack('@2L', 40, 40)
+        if sys.byteorder == 'little':
+            self.assertEqual(s, pack('<2L', 40, 40))
+        else:
+            self.assertEqual(sys.byteorder, 'big')
+            self.assertEqual(s, pack('>2L', 40, 40))
+
+    def testStructTokens2(self):
+        s = pack('>hhl', 1, 2, 3)
+        a, b, c = s.unpack('>hhl')
+        self.assertEqual((a, b, c), (1, 2, 3))
+        s = pack('<QL, >Q \tL', 1001, 43, 21, 9999)
+        self.assertEqual(s.unpack('<QL, >QL'), [1001, 43, 21, 9999])
+
+    def testStructTokensMultiplicativeFactors(self):
+        s = pack('<2h', 1, 2)
+        a, b = s.unpack('<2h')
+        self.assertEqual((a, b), (1, 2))
+        s = pack('<100q', *range(100))
+        self.assertEqual(s.len, 100 * 64)
+        self.assertEqual(s[44*64:45*64].uintle, 44)
+        s = pack('@L0B2h', 5, 5, 5)
+        self.assertEqual(s.unpack('@Lhh'), [5, 5, 5])
+
+    def testStructTokensErrors(self):
+        for f in ['>>q', '<>q', 'q>', '2q', 'q', '>-2q', '@a', '>int:8', '>q2']:
+            self.assertRaises(bitstring.CreationError, pack, f, 100)
+
+    def testImmutableBitStreams(self):
+        a = ConstBitStream('0x012345')
+        self.assertEqual(a, '0x012345')
+        b = BitStream('0xf') + a
+        self.assertEqual(b, '0xf012345')
+        try:
+            a.append(b)
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.prepend(b)
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a[0] = '0b1'
+            self.assertTrue(False)
+        except TypeError:
+            pass
+        try:
+            del a[5]
+            self.assertTrue(False)
+        except TypeError:
+            pass
+        try:
+            a.replace('0b1', '0b0')
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.insert('0b11', 4)
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.reverse()
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.reversebytes()
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        self.assertEqual(a, '0x012345')
+        self.assertTrue(isinstance(a, ConstBitStream))
+
+    def testReverseBytes(self):
+        a = BitStream('0x123456')
+        a.byteswap()
+        self.assertEqual(a, '0x563412')
+        b = a + '0b1'
+        b.byteswap()
+        self.assertEqual('0x123456, 0b1', b)
+        a = BitStream('0x54')
+        a.byteswap()
+        self.assertEqual(a, '0x54')
+        a = BitStream()
+        a.byteswap()
+        self.assertFalse(a)
+
+    def testReverseBytes2(self):
+        a = BitStream()
+        a.byteswap()
+        self.assertFalse(a)
+        a = BitStream('0x00112233')
+        a.byteswap(0, 0, 16)
+        self.assertEqual(a, '0x11002233')
+        a.byteswap(0, 4, 28)
+        self.assertEqual(a, '0x12302103')
+        a.byteswap(start=0, end=18)
+        self.assertEqual(a, '0x30122103')
+        self.assertRaises(ValueError, a.byteswap, 0, 10, 2)
+        self.assertRaises(ValueError, a.byteswap, 0, -4, 4)
+        self.assertRaises(ValueError, a.byteswap, 0, 24, 48)
+        a.byteswap(0, 24)
+        self.assertEqual(a, '0x30122103')
+        a.byteswap(0, 11, 11)
+        self.assertEqual(a, '0x30122103')
+
+    def testCapitalsInPack(self):
+        a = pack('A', A='0b1')
+        self.assertEqual(a, '0b1')
+        format = 'bits:4=BL_OFFT, uint:12=width, uint:12=height'
+        d = {'BL_OFFT': '0b1011', 'width': 352, 'height': 288}
+        s = bitstring.pack(format, **d)
+        self.assertEqual(s, '0b1011, uint:12=352, uint:12=288')
+        a = pack('0X0, uint:8, hex', 45, '0XABcD')
+        self.assertEqual(a, '0x0, uint:8=45, 0xabCD')
+
+    def testOtherCapitals(self):
+        a = ConstBitStream('0XABC, 0O0, 0B11')
+        self.assertEqual(a, 'hex=0Xabc, oct=0, bin=0B11')
+
+    def testEfficientOverwrite(self):
+        a = BitStream(1000000000)
+        a.overwrite([1], 123456)
+        self.assertEqual(a[123456], True)
+        a.overwrite('0xff', 1)
+        self.assertEqual(a[0:32:1], '0x7f800000')
+        b = BitStream('0xffff')
+        b.overwrite('0x0000')
+        self.assertEqual(b, '0x0000')
+        self.assertEqual(b.pos, 16)
+        c = BitStream(length=1000)
+        c.overwrite('0xaaaaaaaaaaaa', 81)
+        self.assertEqual(c[81:81 + 6 * 8], '0xaaaaaaaaaaaa')
+        self.assertEqual(len(list(c.findall('0b1'))), 24)
+        s = BitStream(length=1000)
+        s = s[5:]
+        s.overwrite('0xffffff', 500)
+        s.pos = 500
+        self.assertEqual(s.read(4 * 8), '0xffffff00')
+        s.overwrite('0xff', 502)
+        self.assertEqual(s[502:518], '0xffff')
+
+    def testPeekAndReadListErrors(self):
+        a = BitStream('0x123456')
+        self.assertRaises(ValueError, a.read, 'hex:8, hex:8')
+        self.assertRaises(ValueError, a.peek, 'hex:8, hex:8')
+        self.assertRaises(TypeError, a.read, 10, 12)
+        self.assertRaises(TypeError, a.peek, 12, 14)
+        self.assertRaises(TypeError, a.read, 8, 8)
+        self.assertRaises(TypeError, a.peek, 80, 80)
+
+    def testStartswith(self):
+        a = BitStream()
+        self.assertTrue(a.startswith(BitStream()))
+        self.assertFalse(a.startswith('0b0'))
+        a = BitStream('0x12ff')
+        self.assertTrue(a.startswith('0x1'))
+        self.assertTrue(a.startswith('0b0001001'))
+        self.assertTrue(a.startswith('0x12ff'))
+        self.assertFalse(a.startswith('0x12ff, 0b1'))
+        self.assertFalse(a.startswith('0x2'))
+
+    def testStartswithStartEnd(self):
+        s = BitStream('0x123456')
+        self.assertTrue(s.startswith('0x234', 4))
+        self.assertFalse(s.startswith('0x123', end=11))
+        self.assertTrue(s.startswith('0x123', end=12))
+        self.assertTrue(s.startswith('0x34', 8, 16))
+        self.assertFalse(s.startswith('0x34', 7, 16))
+        self.assertFalse(s.startswith('0x34', 9, 16))
+        self.assertFalse(s.startswith('0x34', 8, 15))
+
+    def testEndswith(self):
+        a = BitStream()
+        self.assertTrue(a.endswith(''))
+        self.assertFalse(a.endswith(BitStream('0b1')))
+        a = BitStream('0xf2341')
+        self.assertTrue(a.endswith('0x41'))
+        self.assertTrue(a.endswith('0b001'))
+        self.assertTrue(a.endswith('0xf2341'))
+        self.assertFalse(a.endswith('0x1f2341'))
+        self.assertFalse(a.endswith('0o34'))
+
+    def testEndswithStartEnd(self):
+        s = BitStream('0x123456')
+        self.assertTrue(s.endswith('0x234', end=16))
+        self.assertFalse(s.endswith('0x456', start=13))
+        self.assertTrue(s.endswith('0x456', start=12))
+        self.assertTrue(s.endswith('0x34', 8, 16))
+        self.assertTrue(s.endswith('0x34', 7, 16))
+        self.assertFalse(s.endswith('0x34', 9, 16))
+        self.assertFalse(s.endswith('0x34', 8, 15))
+
+    def testUnhashability(self):
+        s = BitStream('0xf')
+        self.assertRaises(TypeError, set, [s])
+        self.assertRaises(TypeError, hash, [s])
+
+    def testConstBitStreamSetCreation(self):
+        sl = [ConstBitStream(uint=i, length=7) for i in range(15)]
+        s = set(sl)
+        self.assertEqual(len(s), 15)
+        s.add(ConstBitStream('0b0000011'))
+        self.assertEqual(len(s), 15)
+        self.assertRaises(TypeError, s.add, BitStream('0b0000011'))
+
+    def testConstBitStreamFunctions(self):
+        s = ConstBitStream('0xf, 0b1')
+        self.assertEqual(type(s), ConstBitStream)
+        t = copy.copy(s)
+        self.assertEqual(type(t), ConstBitStream)
+        a = s + '0o3'
+        self.assertEqual(type(a), ConstBitStream)
+        b = a[0:4]
+        self.assertEqual(type(b), ConstBitStream)
+        b = a[4:3]
+        self.assertEqual(type(b), ConstBitStream)
+        b = a[5:2:-1]
+        self.assertEqual(type(b), ConstBitStream)
+        b = ~a
+        self.assertEqual(type(b), ConstBitStream)
+        b = a << 2
+        self.assertEqual(type(b), ConstBitStream)
+        b = a >> 2
+        self.assertEqual(type(b), ConstBitStream)
+        b = a * 2
+        self.assertEqual(type(b), ConstBitStream)
+        b = a * 0
+        self.assertEqual(type(b), ConstBitStream)
+        b = a & ~a
+        self.assertEqual(type(b), ConstBitStream)
+        b = a | ~a
+        self.assertEqual(type(b), ConstBitStream)
+        b = a ^ ~a
+        self.assertEqual(type(b), ConstBitStream)
+        b = a._slice(4, 4)
+        self.assertEqual(type(b), ConstBitStream)
+        b = a.read(4)
+        self.assertEqual(type(b), ConstBitStream)
+
+    def testConstBitStreamProperties(self):
+        a = ConstBitStream('0x123123')
+        try:
+            a.hex = '0x234'
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.oct = '0o234'
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.bin = '0b101'
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.ue = 3453
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.se = -123
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.int = 432
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.uint = 4412
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.intle = 123
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.uintle = 4412
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.intbe = 123
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.uintbe = 4412
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.intne = 123
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.uintne = 4412
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+        try:
+            a.bytes = b'hello'
+            self.assertTrue(False)
+        except AttributeError:
+            pass
+
+    def testConstBitStreamMisc(self):
+        a = ConstBitStream('0xf')
+        b = a
+        a += '0xe'
+        self.assertEqual(b, '0xf')
+        self.assertEqual(a, '0xfe')
+        c = BitStream(a)
+        self.assertEqual(a, c)
+        a = ConstBitStream('0b1')
+        a._append(a)
+        self.assertEqual(a, '0b11')
+        self.assertEqual(type(a), ConstBitStream)
+        a._prepend(a)
+        self.assertEqual(a, '0b1111')
+        self.assertEqual(type(a), ConstBitStream)
+
+    def testConstBitStreamHashibility(self):
+        a = ConstBitStream('0x1')
+        b = ConstBitStream('0x2')
+        c = ConstBitStream('0x1')
+        c.pos = 3
+        s = set((a, b, c))
+        self.assertEqual(len(s), 2)
+        self.assertEqual(hash(a), hash(c))
+
+    def testConstBitStreamCopy(self):
+        a = ConstBitStream('0xabc')
+        a.pos = 11
+        b = copy.copy(a)
+        b.pos = 4
+        self.assertEqual(id(a._datastore), id(b._datastore))
+        self.assertEqual(a.pos, 11)
+        self.assertEqual(b.pos, 4)
+
+    def testPython26stuff(self):
+        s = BitStream('0xff')
+        self.assertTrue(isinstance(s.tobytes(), bytes))
+        self.assertTrue(isinstance(s.bytes, bytes))
+
+    def testReadFromBits(self):
+        a = ConstBitStream('0xaabbccdd')
+        b = a.read(8)
+        self.assertEqual(b, '0xaa')
+        self.assertEqual(a[0:8], '0xaa')
+        self.assertEqual(a[-1], True)
+        a.pos = 0
+        self.assertEqual(a.read(4).uint, 10)
+
+
+class Set(unittest.TestCase):
+    def testSet(self):
+        a = BitStream(length=16)
+        a.set(True, 0)
+        self.assertEqual(a, '0b10000000 00000000')
+        a.set(1, 15)
+        self.assertEqual(a, '0b10000000 00000001')
+        b = a[4:12]
+        b.set(True, 1)
+        self.assertEqual(b, '0b01000000')
+        b.set(True, -1)
+        self.assertEqual(b, '0b01000001')
+        b.set(1, -8)
+        self.assertEqual(b, '0b11000001')
+        self.assertRaises(IndexError, b.set, True, -9)
+        self.assertRaises(IndexError, b.set, True, 8)
+
+    def testSetNegativeIndex(self):
+        a = BitStream(10)
+        a.set(1, -1)
+        self.assertEqual(a.bin, '0000000001')
+        a.set(1, [-1, -10])
+        self.assertEqual(a.bin, '1000000001')
+        self.assertRaises(IndexError, a.set, 1, [-11])
+
+    def testFileBasedSetUnset(self):
+        a = BitStream(filename='test.m1v')
+        a.set(True, (0, 1, 2, 3, 4))
+        self.assertEqual(a[0:32], '0xf80001b3')
+        a = BitStream(filename='test.m1v')
+        a.set(False, (28, 29, 30, 31))
+        self.assertTrue(a.startswith('0x000001b0'))
+
+    def testSetList(self):
+        a = BitStream(length=18)
+        a.set(True, range(18))
+        self.assertEqual(a.int, -1)
+        a.set(False, range(18))
+        self.assertEqual(a.int, 0)
+
+    def testUnset(self):
+        a = BitStream(length=16, int=-1)
+        a.set(False, 0)
+        self.assertEqual(~a, '0b10000000 00000000')
+        a.set(0, 15)
+        self.assertEqual(~a, '0b10000000 00000001')
+        b = a[4:12]
+        b.set(False, 1)
+        self.assertEqual(~b, '0b01000000')
+        b.set(False, -1)
+        self.assertEqual(~b, '0b01000001')
+        b.set(False, -8)
+        self.assertEqual(~b, '0b11000001')
+        self.assertRaises(IndexError, b.set, False, -9)
+        self.assertRaises(IndexError, b.set, False, 8)
+
+    def testSetWholeBitStream(self):
+        a = BitStream(14)
+        a.set(1)
+        self.assertTrue(a.all(1))
+        a.set(0)
+        self.assertTrue(a.all(0))
+
+
+class Invert(unittest.TestCase):
+    def testInvertBits(self):
+        a = BitStream('0b111000')
+        a.invert(range(a.len))
+        self.assertEqual(a, '0b000111')
+        a.invert([0, 1, -1])
+        self.assertEqual(a, '0b110110')
+
+    def testInvertWholeBitStream(self):
+        a = BitStream('0b11011')
+        a.invert()
+        self.assertEqual(a, '0b00100')
+
+    def testInvertSingleBit(self):
+        a = BitStream('0b000001')
+        a.invert(0)
+        self.assertEqual(a.bin, '100001')
+        a.invert(-1)
+        self.assertEqual(a.bin, '100000')
+
+    def testInvertErrors(self):
+        a = BitStream(10)
+        self.assertRaises(IndexError, a.invert, 10)
+        self.assertRaises(IndexError, a.invert, -11)
+        self.assertRaises(IndexError, a.invert, [1, 2, 10])
+
+
+    #######################
+
+    def testIor(self):
+        a = BitStream('0b1101001')
+        a |= '0b1110000'
+        self.assertEqual(a, '0b1111001')
+        b = a[2:]
+        c = a[1:-1]
+        b |= c
+        self.assertEqual(c, '0b11100')
+        self.assertEqual(b, '0b11101')
+
+    def testIand(self):
+        a = BitStream('0b0101010101000')
+        a &= '0b1111110000000'
+        self.assertEqual(a, '0b0101010000000')
+        s = BitStream(filename='test.m1v', offset=26, length=24)
+        s &= '0xff00ff'
+        self.assertEqual(s, '0xcc0004')
+
+    def testIxor(self):
+        a = BitStream('0b11001100110011')
+        a ^= '0b11111100000010'
+        self.assertEqual(a, '0b00110000110001')
+
+    def testLogicalInplaceErrors(self):
+        a = BitStream(4)
+        self.assertRaises(ValueError, a.__ior__, '0b111')
+        self.assertRaises(ValueError, a.__iand__, '0b111')
+        self.assertRaises(ValueError, a.__ixor__, '0b111')
+
+
+class AllAndAny(unittest.TestCase):
+    def testAll(self):
+        a = BitStream('0b0111')
+        self.assertTrue(a.all(True, (1, 3)))
+        self.assertFalse(a.all(True, (0, 1, 2)))
+        self.assertTrue(a.all(True, [-1]))
+        self.assertFalse(a.all(True, [0]))
+
+    def testFileBasedAll(self):
+        a = BitStream(filename='test.m1v')
+        self.assertTrue(a.all(True, [31]))
+        a = BitStream(filename='test.m1v')
+        self.assertTrue(a.all(False, (0, 1, 2, 3, 4)))
+
+    def testFileBasedAny(self):
+        a = BitStream(filename='test.m1v')
+        self.assertTrue(a.any(True, (31, 12)))
+        a = BitStream(filename='test.m1v')
+        self.assertTrue(a.any(False, (0, 1, 2, 3, 4)))
+
+    def testAny(self):
+        a = BitStream('0b10011011')
+        self.assertTrue(a.any(True, (1, 2, 3, 5)))
+        self.assertFalse(a.any(True, (1, 2, 5)))
+        self.assertTrue(a.any(True, (-1,)))
+        self.assertFalse(a.any(True, (1,)))
+
+    def testAllFalse(self):
+        a = BitStream('0b0010011101')
+        self.assertTrue(a.all(False, (0, 1, 3, 4)))
+        self.assertFalse(a.all(False, (0, 1, 2, 3, 4)))
+
+    def testAnyFalse(self):
+        a = BitStream('0b01001110110111111111111111111')
+        self.assertTrue(a.any(False, (4, 5, 6, 2)))
+        self.assertFalse(a.any(False, (1, 15, 20)))
+
+    def testAnyEmptyBitstring(self):
+        a = ConstBitStream()
+        self.assertFalse(a.any(True))
+        self.assertFalse(a.any(False))
+
+    def testAllEmptyBitStream(self):
+        a = ConstBitStream()
+        self.assertTrue(a.all(True))
+        self.assertTrue(a.all(False))
+
+    def testAnyWholeBitstring(self):
+        a = ConstBitStream('0xfff')
+        self.assertTrue(a.any(True))
+        self.assertFalse(a.any(False))
+
+    def testAllWholeBitstring(self):
+        a = ConstBitStream('0xfff')
+        self.assertTrue(a.all(True))
+        self.assertFalse(a.all(False))
+
+    def testErrors(self):
+        a = BitStream('0xf')
+        self.assertRaises(IndexError, a.all, True, [5])
+        self.assertRaises(IndexError, a.all, True, [-5])
+        self.assertRaises(IndexError, a.any, True, [5])
+        self.assertRaises(IndexError, a.any, True, [-5])
+
+    ###################
+
+    def testFloatInitialisation(self):
+        for f in (0.0000001, -1.0, 1.0, 0.2, -3.1415265, 1.331e32):
+            a = BitStream(float=f, length=64)
+            a.pos = 6
+            self.assertEqual(a.float, f)
+            a = BitStream('float:64=%s' % str(f))
+            a.pos = 6
+            self.assertEqual(a.float, f)
+            a = BitStream('floatbe:64=%s' % str(f))
+            a.pos = 6
+            self.assertEqual(a.floatbe, f)
+            a = BitStream('floatle:64=%s' % str(f))
+            a.pos = 6
+            self.assertEqual(a.floatle, f)
+            a = BitStream('floatne:64=%s' % str(f))
+            a.pos = 6
+            self.assertEqual(a.floatne, f)
+            b = BitStream(float=f, length=32)
+            b.pos = 6
+            self.assertAlmostEqual(b.float / f, 1.0)
+            b = BitStream('float:32=%s' % str(f))
+            b.pos = 6
+            self.assertAlmostEqual(b.float / f, 1.0)
+            b = BitStream('floatbe:32=%s' % str(f))
+            b.pos = 6
+            self.assertAlmostEqual(b.floatbe / f, 1.0)
+            b = BitStream('floatle:32=%s' % str(f))
+            b.pos = 6
+            self.assertAlmostEqual(b.floatle / f, 1.0)
+            b = BitStream('floatne:32=%s' % str(f))
+            b.pos = 6
+            self.assertAlmostEqual(b.floatne / f, 1.0)
+        a = BitStream('0x12345678')
+        a.pos = 6
+        a.float = 23
+        self.assertEqual(a.float, 23.0)
+
+    def testFloatInitStrings(self):
+        for s in ('5', '+0.0001', '-1e101', '4.', '.2', '-.65', '43.21E+32'):
+            a = BitStream('float:64=%s' % s)
+            self.assertEqual(a.float, float(s))
+
+    def testFloatPacking(self):
+        a = pack('>d', 0.01)
+        self.assertEqual(a.float, 0.01)
+        self.assertEqual(a.floatbe, 0.01)
+        a.byteswap()
+        self.assertEqual(a.floatle, 0.01)
+        b = pack('>f', 1e10)
+        self.assertAlmostEqual(b.float / 1e10, 1.0)
+        c = pack('<f', 10.3)
+        self.assertAlmostEqual(c.floatle / 10.3, 1.0)
+        d = pack('>5d', 10.0, 5.0, 2.5, 1.25, 0.1)
+        self.assertEqual(d.unpack('>5d'), [10.0, 5.0, 2.5, 1.25, 0.1])
+
+    def testFloatReading(self):
+        a = BitStream('floatle:64=12, floatbe:64=-0.01, floatne:64=3e33')
+        x, y, z = a.readlist('floatle:64, floatbe:64, floatne:64')
+        self.assertEqual(x, 12.0)
+        self.assertEqual(y, -0.01)
+        self.assertEqual(z, 3e33)
+        a = BitStream('floatle:32=12, floatbe:32=-0.01, floatne:32=3e33')
+        x, y, z = a.readlist('floatle:32, floatbe:32, floatne:32')
+        self.assertAlmostEqual(x / 12.0, 1.0)
+        self.assertAlmostEqual(y / -0.01, 1.0)
+        self.assertAlmostEqual(z / 3e33, 1.0)
+        a = BitStream('0b11, floatle:64=12, 0xfffff')
+        a.pos = 2
+        self.assertEqual(a.read('floatle:64'), 12.0)
+        b = BitStream(floatle=20, length=32)
+        b.floatle = 10.0
+        b = [0] + b
+        self.assertEqual(b[1:].floatle, 10.0)
+
+    def testNonAlignedFloatReading(self):
+        s = BitStream('0b1, float:32 = 10.0')
+        x, y = s.readlist('1, float:32')
+        self.assertEqual(y, 10.0)
+        s[1:] = 'floatle:32=20.0'
+        x, y = s.unpack('1, floatle:32')
+        self.assertEqual(y, 20.0)
+
+    def testFloatErrors(self):
+        a = BitStream('0x3')
+        self.assertRaises(bitstring.InterpretError, a._getfloat)
+        self.assertRaises(bitstring.CreationError, a._setfloat, -0.2)
+        for l in (8, 10, 12, 16, 30, 128, 200):
+            self.assertRaises(ValueError, BitStream, float=1.0, length=l)
+        self.assertRaises(bitstring.CreationError, BitStream, floatle=0.3, length=0)
+        self.assertRaises(bitstring.CreationError, BitStream, floatle=0.3, length=1)
+        self.assertRaises(bitstring.CreationError, BitStream, float=2)
+        self.assertRaises(bitstring.InterpretError, a.read, 'floatle:2')
+
+    def testReadErrorChangesPos(self):
+        a = BitStream('0x123123')
+        try:
+            a.read('10, 5')
+        except ValueError:
+            pass
+        self.assertEqual(a.pos, 0)
+
+    def testRor(self):
+        a = BitStream('0b11001')
+        a.ror(0)
+        self.assertEqual(a, '0b11001')
+        a.ror(1)
+        self.assertEqual(a, '0b11100')
+        a.ror(5)
+        self.assertEqual(a, '0b11100')
+        a.ror(101)
+        self.assertEqual(a, '0b01110')
+        a = BitStream('0b1')
+        a.ror(1000000)
+        self.assertEqual(a, '0b1')
+
+    def testRorErrors(self):
+        a = BitStream()
+        self.assertRaises(bitstring.Error, a.ror, 0)
+        a += '0b001'
+        self.assertRaises(ValueError, a.ror, -1)
+
+    def testRol(self):
+        a = BitStream('0b11001')
+        a.rol(0)
+        self.assertEqual(a, '0b11001')
+        a.rol(1)
+        self.assertEqual(a, '0b10011')
+        a.rol(5)
+        self.assertEqual(a, '0b10011')
+        a.rol(101)
+        self.assertEqual(a, '0b00111')
+        a = BitStream('0b1')
+        a.rol(1000000)
+        self.assertEqual(a, '0b1')
+
+    def testRolFromFile(self):
+        a = BitStream(filename='test.m1v')
+        l = a.len
+        a.rol(1)
+        self.assertTrue(a.startswith('0x000003'))
+        self.assertEqual(a.len, l)
+        self.assertTrue(a.endswith('0x0036e'))
+
+    def testRorFromFile(self):
+        a = BitStream(filename='test.m1v')
+        l = a.len
+        a.ror(1)
+        self.assertTrue(a.startswith('0x800000'))
+        self.assertEqual(a.len, l)
+        self.assertTrue(a.endswith('0x000db'))
+
+    def testRolErrors(self):
+        a = BitStream()
+        self.assertRaises(bitstring.Error, a.rol, 0)
+        a += '0b001'
+        self.assertRaises(ValueError, a.rol, -1)
+
+    def testBytesToken(self):
+        a = BitStream('0x010203')
+        b = a.read('bytes:1')
+        self.assertTrue(isinstance(b, bytes))
+        self.assertEqual(b, b'\x01')
+        x, y, z = a.unpack('4, bytes:2, uint')
+        self.assertEqual(x, 0)
+        self.assertEqual(y, b'\x10\x20')
+        self.assertEqual(z, 3)
+        s = pack('bytes:4', b'abcd')
+        self.assertEqual(s.bytes, b'abcd')
+
+    def testBytesTokenMoreThoroughly(self):
+        a = BitStream('0x0123456789abcdef')
+        a.pos += 16
+        self.assertEqual(a.read('bytes:1'), b'\x45')
+        self.assertEqual(a.read('bytes:3'), b'\x67\x89\xab')
+        x, y, z = a.unpack('bits:28, bytes, bits:12')
+        self.assertEqual(y, b'\x78\x9a\xbc')
+
+    def testDedicatedReadFunctions(self):
+        a = BitStream('0b11, uint:43=98798798172, 0b11111')
+        x = a._readuint(43, 2)
+        self.assertEqual(x, 98798798172)
+        self.assertEqual(a.pos, 0)
+        x = a._readint(43, 2)
+        self.assertEqual(x, 98798798172)
+        self.assertEqual(a.pos, 0)
+
+        a = BitStream('0b11, uintbe:48=98798798172, 0b11111')
+        x = a._readuintbe(48, 2)
+        self.assertEqual(x, 98798798172)
+        self.assertEqual(a.pos, 0)
+        x = a._readintbe(48, 2)
+        self.assertEqual(x, 98798798172)
+        self.assertEqual(a.pos, 0)
+
+        a = BitStream('0b111, uintle:40=123516, 0b111')
+        self.assertEqual(a._readuintle(40, 3), 123516)
+        b = BitStream('0xff, uintle:800=999, 0xffff')
+        self.assertEqual(b._readuintle(800, 8), 999)
+
+        a = BitStream('0b111, intle:48=999999999, 0b111111111111')
+        self.assertEqual(a._readintle(48, 3), 999999999)
+        b = BitStream('0xff, intle:200=918019283740918263512351235, 0xfffffff')
+        self.assertEqual(b._readintle(200, 8), 918019283740918263512351235)
+
+        a = BitStream('0b111, floatbe:64=-5.32, 0xffffffff')
+        self.assertEqual(a._readfloat(64, 3), -5.32)
+
+        a = BitStream('0b111, floatle:64=9.9998, 0b111')
+        self.assertEqual(a._readfloatle(64, 3), 9.9998)
+
+    def testAutoInitWithInt(self):
+        a = BitStream(0)
+        self.assertFalse(a)
+        a = BitStream(1)
+        self.assertEqual(a, '0b0')
+        a = BitStream(1007)
+        self.assertEqual(a, BitStream(length=1007))
+        self.assertRaises(bitstring.CreationError, BitStream, -1)
+
+        a = 6 + ConstBitStream('0b1') + 3
+        self.assertEqual(a, '0b0000001000')
+        a += 1
+        self.assertEqual(a, '0b00000010000')
+        self.assertEqual(ConstBitStream(13), 13)
+
+    def testReadingProblems(self):
+        a = BitStream('0x000001')
+        b = a.read('uint:24')
+        self.assertEqual(b, 1)
+        a.pos = 0
+        self.assertRaises(bitstring.ReadError, a.read, 'bytes:4')
+
+    def testAddVersesInPlaceAdd(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 += '0xdef'
+        self.assertEqual(a1, '0xabcdef')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 + '0x0'
+        a2 += '0xdef'
+        self.assertEqual(a2, '0xabcdef')
+        self.assertEqual(b2, '0xabcdef')
+        self.assertEqual(c2, '0xabc0')
+
+    def testAndVersesInPlaceAnd(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 &= '0xf0f'
+        self.assertEqual(a1, '0xa0c')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 & '0x00f'
+        a2 &= '0xf0f'
+        self.assertEqual(a2, '0xa0c')
+        self.assertEqual(b2, '0xa0c')
+        self.assertEqual(c2, '0x00c')
+
+    def testOrVersesInPlaceOr(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 |= '0xf0f'
+        self.assertEqual(a1, '0xfbf')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 | '0x00f'
+        a2 |= '0xf0f'
+        self.assertEqual(a2, '0xfbf')
+        self.assertEqual(b2, '0xfbf')
+        self.assertEqual(c2, '0xabf')
+
+    def testXorVersesInPlaceXor(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 ^= '0xf0f'
+        self.assertEqual(a1, '0x5b3')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 ^ '0x00f'
+        a2 ^= '0xf0f'
+        self.assertEqual(a2, '0x5b3')
+        self.assertEqual(b2, '0x5b3')
+        self.assertEqual(c2, '0xab3')
+
+    def testMulVersesInPlaceMul(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 *= 3
+        self.assertEqual(a1, '0xabcabcabc')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 * 2
+        a2 *= 3
+        self.assertEqual(a2, '0xabcabcabc')
+        self.assertEqual(b2, '0xabcabcabc')
+        self.assertEqual(c2, '0xabcabc')
+
+    def testLshiftVersesInPlaceLshift(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 <<= 4
+        self.assertEqual(a1, '0xbc0')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 << 8
+        a2 <<= 4
+        self.assertEqual(a2, '0xbc0')
+        self.assertEqual(b2, '0xbc0')
+        self.assertEqual(c2, '0xc00')
+
+    def testRshiftVersesInPlaceRshift(self):
+        a1 = ConstBitStream('0xabc')
+        b1 = a1
+        a1 >>= 4
+        self.assertEqual(a1, '0x0ab')
+        self.assertEqual(b1, '0xabc')
+
+        a2 = BitStream('0xabc')
+        b2 = a2
+        c2 = a2 >> 8
+        a2 >>= 4
+        self.assertEqual(a2, '0x0ab')
+        self.assertEqual(b2, '0x0ab')
+        self.assertEqual(c2, '0x00a')
+
+    def testAutoFromBool(self):
+        a = ConstBitStream() + True + False + True
+        self.assertEqual(a, '0b00')
+        #    self.assertEqual(a, '0b101')
+        #    b = ConstBitStream(False)
+        #    self.assertEqual(b, '0b0')
+        #    c = ConstBitStream(True)
+        #    self.assertEqual(c, '0b1')
+        #    self.assertEqual(b, False)
+        #    self.assertEqual(c, True)
+        #    self.assertEqual(b & True, False)
+
+
+class Bugs(unittest.TestCase):
+    def testBugInReplace(self):
+        s = BitStream('0x00112233')
+        l = list(s.split('0x22', start=8, bytealigned=True))
+        self.assertEqual(l, ['0x11', '0x2233'])
+        s = BitStream('0x00112233')
+        s.replace('0x22', '0xffff', start=8, bytealigned=True)
+        self.assertEqual(s, '0x0011ffff33')
+        s = BitStream('0x0123412341234')
+        s.replace('0x23', '0xf', start=9, bytealigned=True)
+        self.assertEqual(s, '0x012341f41f4')
+
+    def testTruncateStartBug(self):
+        a = BitStream('0b000000111')[2:]
+        a._truncatestart(6)
+        self.assertEqual(a, '0b1')
+
+    def testNullBits(self):
+        s = ConstBitStream(bin='')
+        t = ConstBitStream(oct='')
+        u = ConstBitStream(hex='')
+        v = ConstBitStream(bytes=b'')
+        self.assertFalse(s)
+        self.assertFalse(t)
+        self.assertFalse(u)
+        self.assertFalse(v)
+
+    def testMultiplicativeFactorsCreation(self):
+        s = BitStream('1*0b1')
+        self.assertEqual(s, '0b1')
+        s = BitStream('4*0xc')
+        self.assertEqual(s, '0xcccc')
+        s = BitStream('0b1, 0*0b0')
+        self.assertEqual(s, '0b1')
+        s = BitStream('0b1, 3*uint:8=34, 2*0o755')
+        self.assertEqual(s, '0b1, uint:8=34, uint:8=34, uint:8=34, 0o755755')
+        s = BitStream('0*0b1001010')
+        self.assertFalse(s)
+
+    def testMultiplicativeFactorsReading(self):
+        s = BitStream('0xc') * 5
+        a, b, c, d, e = s.readlist('5*4')
+        self.assertTrue(a == b == c == d == e == 12)
+        s = ConstBitStream('2*0b101, 4*uint:7=3')
+        a, b, c, d, e = s.readlist('2*bin:3, 3*uint:7')
+        self.assertTrue(a == b == '101')
+        self.assertTrue(c == d == e == 3)
+
+    def testMultiplicativeFactorsPacking(self):
+        s = pack('3*bin', '1', '001', '101')
+        self.assertEqual(s, '0b1001101')
+        s = pack('hex, 2*se=-56, 3*uint:37', '34', 1, 2, 3)
+        a, b, c, d, e, f = s.unpack('hex:8, 2*se, 3*uint:37')
+        self.assertEqual(a, '34')
+        self.assertEqual(b, -56)
+        self.assertEqual(c, -56)
+        self.assertEqual((d, e, f), (1, 2, 3))
+        # This isn't allowed yet. See comment in tokenparser.
+        #s = pack('fluffy*uint:8', *range(3), fluffy=3)
+        #a, b, c = s.readlist('2*uint:8, 1*uint:8, 0*uint:8')
+        #self.assertEqual((a, b, c), (0, 1, 2))
+
+    def testMultiplicativeFactorsUnpacking(self):
+        s = ConstBitStream('0b10111')
+        a, b, c, d = s.unpack('3*bool, bin')
+        self.assertEqual((a, b, c), (True, False, True))
+        self.assertEqual(d, '11')
+
+
+    def testPackingDefaultIntWithKeyword(self):
+        s = pack('12', 100)
+        self.assertEqual(s.unpack('12')[0], 100)
+        s = pack('oh_no_not_the_eyes=33', oh_no_not_the_eyes=17)
+        self.assertEqual(s.uint, 33)
+        self.assertEqual(s.len, 17)
+
+    def testInitFromIterable(self):
+        self.assertTrue(isinstance(range(10), collections.Iterable))
+        s = ConstBitStream(range(12))
+        self.assertEqual(s, '0x7ff')
+
+    def testFunctionNegativeIndices(self):
+        # insert
+        s = BitStream('0b0111')
+        s.insert('0b0', -1)
+        self.assertEqual(s, '0b01101')
+        self.assertRaises(ValueError, s.insert, '0b0', -1000)
+
+        # reverse
+        s.reverse(-2)
+        self.assertEqual(s, '0b01110')
+        t = BitStream('0x778899abcdef')
+        t.reverse(-12, -4)
+        self.assertEqual(t, '0x778899abc7bf')
+
+        # reversebytes
+        t.byteswap(0, -40, -16)
+        self.assertEqual(t, '0x77ab9988c7bf')
+
+        # overwrite
+        t.overwrite('0x666', -20)
+        self.assertEqual(t, '0x77ab998666bf')
+
+        # find
+        found = t.find('0x998', bytealigned=True, start=-31)
+        self.assertFalse(found)
+        found = t.find('0x998', bytealigned=True, start=-32)
+        self.assertTrue(found)
+        self.assertEqual(t.pos, 16)
+        t.pos = 0
+        found = t.find('0x988', bytealigned=True, end=-21)
+        self.assertFalse(found)
+        found = t.find('0x998', bytealigned=True, end=-20)
+        self.assertTrue(found)
+        self.assertEqual(t.pos, 16)
+
+        #findall
+        s = BitStream('0x1234151f')
+        l = list(s.findall('0x1', bytealigned=True, start=-15))
+        self.assertEqual(l, [24])
+        l = list(s.findall('0x1', bytealigned=True, start=-16))
+        self.assertEqual(l, [16, 24])
+        l = list(s.findall('0x1', bytealigned=True, end=-5))
+        self.assertEqual(l, [0, 16])
+        l = list(s.findall('0x1', bytealigned=True, end=-4))
+        self.assertEqual(l, [0, 16, 24])
+
+        # rfind
+        found = s.rfind('0x1f', end=-1)
+        self.assertFalse(found)
+        found = s.rfind('0x12', start=-31)
+        self.assertFalse(found)
+
+        # cut
+        s = BitStream('0x12345')
+        l = list(s.cut(4, start=-12, end=-4))
+        self.assertEqual(l, ['0x3', '0x4'])
+
+        # split
+        s = BitStream('0xfe0012fe1200fe')
+        l = list(s.split('0xfe', bytealigned=True, end=-1))
+        self.assertEqual(l, ['', '0xfe0012', '0xfe1200f, 0b111'])
+        l = list(s.split('0xfe', bytealigned=True, start=-8))
+        self.assertEqual(l, ['', '0xfe'])
+
+        # startswith
+        self.assertTrue(s.startswith('0x00f', start=-16))
+        self.assertTrue(s.startswith('0xfe00', end=-40))
+        self.assertFalse(s.startswith('0xfe00', end=-41))
+
+        # endswith
+        self.assertTrue(s.endswith('0x00fe', start=-16))
+        self.assertFalse(s.endswith('0x00fe', start=-15))
+        self.assertFalse(s.endswith('0x00fe', end=-1))
+        self.assertTrue(s.endswith('0x00f', end=-4))
+
+        # replace
+        s.replace('0xfe', '', end=-1)
+        self.assertEqual(s, '0x00121200fe')
+        s.replace('0x00', '', start=-24)
+        self.assertEqual(s, '0x001212fe')
+
+    def testRotateStartAndEnd(self):
+        a = BitStream('0b110100001')
+        a.rol(1, 3, 6)
+        self.assertEqual(a, '0b110001001')
+        a.ror(1, start=-4)
+        self.assertEqual(a, '0b110001100')
+        a.rol(202, end=-5)
+        self.assertEqual(a, '0b001101100')
+        a.ror(3, end=4)
+        self.assertEqual(a, '0b011001100')
+        self.assertRaises(ValueError, a.rol, 5, start=-4, end=-6)
+
+    def testByteSwapInt(self):
+        s = pack('5*uintle:16', *range(10, 15))
+        self.assertEqual(list(range(10, 15)), s.unpack('5*uintle:16'))
+        swaps = s.byteswap(2)
+        self.assertEqual(list(range(10, 15)), s.unpack('5*uintbe:16'))
+        self.assertEqual(swaps, 5)
+        s = BitStream('0xf234567f')
+        swaps = s.byteswap(1, start=4)
+        self.assertEqual(swaps, 3)
+        self.assertEqual(s, '0xf234567f')
+        s.byteswap(2, start=4)
+        self.assertEqual(s, '0xf452367f')
+        s.byteswap(2, start=4, end=-4)
+        self.assertEqual(s, '0xf234567f')
+        s.byteswap(3)
+        self.assertEqual(s, '0x5634f27f')
+        s.byteswap(2, repeat=False)
+        self.assertEqual(s, '0x3456f27f')
+        swaps = s.byteswap(5)
+        self.assertEqual(swaps, 0)
+        swaps = s.byteswap(4, repeat=False)
+        self.assertEqual(swaps, 1)
+        self.assertEqual(s, '0x7ff25634')
+
+    def testByteSwapPackCode(self):
+        s = BitStream('0x0011223344556677')
+        swaps = s.byteswap('b')
+        self.assertEqual(s, '0x0011223344556677')
+        self.assertEqual(swaps, 8)
+        swaps = s.byteswap('>3h', repeat=False)
+        self.assertEqual(s, '0x1100332255446677')
+        self.assertEqual(swaps, 1)
+
+    def testByteSwapIterable(self):
+        s = BitStream('0x0011223344556677')
+        swaps = s.byteswap(range(1, 4), repeat=False)
+        self.assertEqual(swaps, 1)
+        self.assertEqual(s, '0x0022115544336677')
+        swaps = s.byteswap([2], start=8)
+        self.assertEqual(s, '0x0011224455663377')
+        self.assertEqual(3, swaps)
+        swaps = s.byteswap([2, 3], start=4)
+        self.assertEqual(swaps, 1)
+        self.assertEqual(s, '0x0120156452463377')
+
+    def testByteSwapErrors(self):
+        s = BitStream('0x0011223344556677')
+        self.assertRaises(ValueError, s.byteswap, 'z')
+        self.assertRaises(ValueError, s.byteswap, -1)
+        self.assertRaises(ValueError, s.byteswap, [-1])
+        self.assertRaises(ValueError, s.byteswap, [1, 'e'])
+        self.assertRaises(ValueError, s.byteswap, '!h')
+        self.assertRaises(ValueError, s.byteswap, 2, start=-1000)
+        self.assertRaises(TypeError, s.byteswap, 5.4)
+
+    def testByteSwapFromFile(self):
+        s = BitStream(filename='smalltestfile')
+        swaps = s.byteswap('2bh')
+        self.assertEqual(s, '0x0123674589abefcd')
+        self.assertEqual(swaps, 2)
+
+    def testBracketExpander(self):
+        be = bitstring.expand_brackets
+        self.assertEqual(be('hello'), 'hello')
+        self.assertEqual(be('(hello)'), 'hello')
+        self.assertEqual(be('1*(hello)'), 'hello')
+        self.assertEqual(be('2*(hello)'), 'hello,hello')
+        self.assertEqual(be('1*(a, b)'), 'a,b')
+        self.assertEqual(be('2*(a, b)'), 'a,b,a,b')
+        self.assertEqual(be('2*(a), 3*(b)'), 'a,a,b,b,b')
+        self.assertEqual(be('2*(a, b, 3*(c, d), e)'), 'a,b,c,d,c,d,c,d,e,a,b,c,d,c,d,c,d,e')
+
+    def testBracketTokens(self):
+        s = BitStream('3*(0x0, 0b1)')
+        self.assertEqual(s, '0x0, 0b1, 0x0, 0b1, 0x0, 0b1')
+        s = pack('2*(uint:12, 3*(7, 6))', *range(3, 17))
+        a = s.unpack('12, 7, 6, 7, 6, 7, 6, 12, 7, 6, 7, 6, 7, 6')
+        self.assertEqual(a, list(range(3, 17)))
+        b = s.unpack('2*(12,3*(7,6))')
+        self.assertEqual(a, b)
+
+    def testPackCodeDicts(self):
+        self.assertEqual(sorted(bitstring.REPLACEMENTS_BE.keys()),
+                         sorted(bitstring.REPLACEMENTS_LE.keys()))
+        self.assertEqual(sorted(bitstring.REPLACEMENTS_BE.keys()),
+                         sorted(bitstring.PACK_CODE_SIZE.keys()))
+        for key in bitstring.PACK_CODE_SIZE:
+            be = pack(bitstring.REPLACEMENTS_BE[key], 0)
+            le = pack(bitstring.REPLACEMENTS_LE[key], 0)
+            self.assertEqual(be.len, bitstring.PACK_CODE_SIZE[key] * 8)
+            self.assertEqual(le.len, be.len)
+
+            # These tests don't compile for Python 3, so they're commented out to save me stress.
+            #def testUnicode(self):
+            #a = ConstBitStream(u'uint:12=34')
+            #self.assertEqual(a.uint, 34)
+            #a += u'0xfe'
+            #self.assertEqual(a[12:], '0xfe')
+            #a = BitStream('0x1122')
+            #c = a.byteswap(u'h')
+            #self.assertEqual(c, 1)
+            #self.assertEqual(a, u'0x2211')
+
+            #def testLongInt(self):
+            #a = BitStream(4L)
+            #self.assertEqual(a, '0b0000')
+            #a[1:3] = -1L
+            #self.assertEqual(a, '0b0110')
+            #a[0] = 1L
+            #self.assertEqual(a, '0b1110')
+            #a *= 4L
+            #self.assertEqual(a, '0xeeee')
+            #c = a.byteswap(2L)
+            #self.assertEqual(c, 1)
+            #a = BitStream('0x11223344')
+            #a.byteswap([1, 2L])
+            #self.assertEqual(a, '0x11332244')
+            #b = a*2L
+            #self.assertEqual(b, '0x1133224411332244')
+            #s = pack('uint:12', 46L)
+            #self.assertEqual(s.uint, 46)
+
+
+class UnpackWithDict(unittest.TestCase):
+    def testLengthKeywords(self):
+        a = ConstBitStream('2*13=100, 0b111')
+        x, y, z = a.unpack('n, uint:m, bin:q', n=13, m=13, q=3)
+        self.assertEqual(x, 100)
+        self.assertEqual(y, 100)
+        self.assertEqual(z, '111')
+
+    def testLengthKeywordsWithStretch(self):
+        a = ConstBitStream('0xff, 0b000, 0xf')
+        x, y, z = a.unpack('hex:a, bin, hex:b', a=8, b=4)
+        self.assertEqual(y, '000')
+
+    def testUnusedKeyword(self):
+        a = ConstBitStream('0b110')
+        x, = a.unpack('bin:3', notused=33)
+        self.assertEqual(x, '110')
+
+    def testLengthKeywordErrors(self):
+        a = pack('uint:p=33', p=12)
+        self.assertRaises(ValueError, a.unpack, 'uint:p')
+        self.assertRaises(ValueError, a.unpack, 'uint:p', p='a_string')
+
+
+class ReadWithDict(unittest.TestCase):
+    def testLengthKeywords(self):
+        s = BitStream('0x0102')
+        x, y = s.readlist('a, hex:b', a=8, b=4)
+        self.assertEqual((x, y), (1, '0'))
+        self.assertEqual(s.pos, 12)
+
+    def testBytesKeywordProblem(self):
+        s = BitStream('0x01')
+        x, = s.unpack('bytes:a', a=1)
+        self.assertEqual(x, b'\x01')
+
+        s = BitStream('0x000ff00a')
+        x, y, z = s.unpack('12, bytes:x, bits', x=2)
+        self.assertEqual((x, y, z), (0, b'\xff\x00', '0xa'))
+
+
+
+class PeekWithDict(unittest.TestCase):
+    def testLengthKeywords(self):
+        s = BitStream('0x0102')
+        x, y = s.peeklist('a, hex:b', a=8, b=4)
+        self.assertEqual((x, y), (1, '0'))
+        self.assertEqual(s.pos, 0)
+
+##class Miscellany(unittest.TestCase):
+##
+##    def testNumpyInt(self):
+##        try:
+##            import numpy
+##            a = ConstBitStream(uint=numpy.uint8(5), length=3)
+##            self.assertEqual(a.uint, 5)
+##        except ImportError:
+##            # Not to worry
+##            pass
+
+class BoolToken(unittest.TestCase):
+    def testInterpretation(self):
+        a = ConstBitStream('0b1')
+        self.assertEqual(a.bool, True)
+        self.assertEqual(a.read('bool'), True)
+        self.assertEqual(a.unpack('bool')[0], True)
+        b = ConstBitStream('0b0')
+        self.assertEqual(b.bool, False)
+        self.assertEqual(b.peek('bool'), False)
+        self.assertEqual(b.unpack('bool')[0], False)
+
+    def testPack(self):
+        a = pack('bool=True')
+        b = pack('bool=False')
+        self.assertEqual(a.bool, True)
+        self.assertEqual(b.bool, False)
+        c = pack('4*bool', False, True, 'False', 'True')
+        self.assertEqual(c, '0b0101')
+
+    def testAssignment(self):
+        a = BitStream()
+        a.bool = True
+        self.assertEqual(a.bool, True)
+        a.hex = 'ee'
+        a.bool = False
+        self.assertEqual(a.bool, False)
+        a.bool = 'False'
+        self.assertEqual(a.bool, False)
+        a.bool = 'True'
+        self.assertEqual(a.bool, True)
+        a.bool = 0
+        self.assertEqual(a.bool, False)
+        a.bool = 1
+        self.assertEqual(a.bool, True)
+
+    def testErrors(self):
+        self.assertRaises(bitstring.CreationError, pack, 'bool', 'hello')
+        self.assertRaises(bitstring.CreationError, pack, 'bool=true')
+        self.assertRaises(bitstring.CreationError, pack, 'True')
+        self.assertRaises(bitstring.CreationError, pack, 'bool', 2)
+        a = BitStream('0b11')
+        self.assertRaises(bitstring.InterpretError, a._getbool)
+        b = BitStream()
+        self.assertRaises(bitstring.InterpretError, a._getbool)
+        self.assertRaises(bitstring.CreationError, a._setbool, 'false')
+
+    def testLengthWithBoolRead(self):
+        a = ConstBitStream('0xf')
+        self.assertRaises(ValueError, a.read, 'bool:0')
+        self.assertRaises(ValueError, a.read, 'bool:1')
+        self.assertRaises(ValueError, a.read, 'bool:2')
+
+
+class ReadWithIntegers(unittest.TestCase):
+    def testReadInt(self):
+        a = ConstBitStream('0xffeedd')
+        b = a.read(8)
+        self.assertEqual(b.hex, 'ff')
+        self.assertEqual(a.pos, 8)
+        b = a.peek(8)
+        self.assertEqual(b.hex, 'ee')
+        self.assertEqual(a.pos, 8)
+        b = a.peek(1)
+        self.assertEqual(b, '0b1')
+        b = a.read(1)
+        self.assertEqual(b, '0b1')
+
+    def testReadIntList(self):
+        a = ConstBitStream('0xab, 0b110')
+        b, c = a.readlist([8, 3])
+        self.assertEqual(b.hex, 'ab')
+        self.assertEqual(c.bin, '110')
+
+
+class FileReadingStrategy(unittest.TestCase):
+    def testBitStreamIsAlwaysRead(self):
+        a = BitStream(filename='smalltestfile')
+        self.assertTrue(isinstance(a._datastore, bitstring.ByteStore))
+        f = open('smalltestfile', 'rb')
+        b = BitStream(f)
+        self.assertTrue(isinstance(b._datastore, bitstring.ByteStore))
+
+    def testBitsIsNeverRead(self):
+        a = ConstBitStream(filename='smalltestfile')
+        self.assertTrue(isinstance(a._datastore._rawarray, bitstring.MmapByteArray))
+        f = open('smalltestfile', 'rb')
+        b = ConstBitStream(f)
+        self.assertTrue(isinstance(b._datastore._rawarray, bitstring.MmapByteArray))
+
+
+class Count(unittest.TestCase):
+    def testCount(self):
+        a = ConstBitStream('0xf0f')
+        self.assertEqual(a.count(True), 8)
+        self.assertEqual(a.count(False), 4)
+
+        b = BitStream()
+        self.assertEqual(b.count(True), 0)
+        self.assertEqual(b.count(False), 0)
+
+    def testCountWithOffsetData(self):
+        a = ConstBitStream('0xff0120ff')
+        b = a[1:-1]
+        self.assertEqual(b.count(1), 16)
+        self.assertEqual(b.count(0), 14)
+
+
+class ZeroBitReads(unittest.TestCase):
+    def testInteger(self):
+        a = ConstBitStream('0x123456')
+        self.assertRaises(bitstring.InterpretError, a.read, 'uint:0')
+        self.assertRaises(bitstring.InterpretError, a.read, 'float:0')
+
+#class EfficientBitsCopies(unittest.TestCase):
+#
+#    def testBitsCopy(self):
+#        a = ConstBitStream('0xff')
+#        b = ConstBitStream(a)
+#        c = a[:]
+#        d = copy.copy(a)
+#        self.assertTrue(a._datastore is b._datastore)
+#        self.assertTrue(a._datastore is c._datastore)
+#        self.assertTrue(a._datastore is d._datastore)
+
+class InitialiseFromBytes(unittest.TestCase):
+    def testBytesBehaviour(self):
+        a = ConstBitStream(b'uint:5=2')
+        b = ConstBitStream(b'')
+        c = ConstBitStream(bytes=b'uint:5=2')
+        if b'' == '':
+            # Python 2
+            self.assertEqual(a, 'uint:5=2')
+            self.assertFalse(b)
+            self.assertEqual(c.bytes, b'uint:5=2')
+        else:
+            self.assertEqual(a.bytes, b'uint:5=2')
+            self.assertFalse(b)
+            self.assertEqual(c, b'uint:5=2')
+
+    def testBytearrayBehaviour(self):
+        a = ConstBitStream(bytearray(b'uint:5=2'))
+        b = ConstBitStream(bytearray(4))
+        c = ConstBitStream(bytes=bytearray(b'uint:5=2'))
+        self.assertEqual(a.bytes, b'uint:5=2')
+        self.assertEqual(b, '0x00000000')
+        self.assertEqual(c.bytes, b'uint:5=2')
+
+
+class CoverageCompletionTests(unittest.TestCase):
+    def testUeReadError(self):
+        s = ConstBitStream('0b000000001')
+        self.assertRaises(bitstring.ReadError, s.read, 'ue')
+
+    def testOverwriteWithSelf(self):
+        s = BitStream('0b1101')
+        s.overwrite(s)
+        self.assertEqual(s, '0b1101')
+
+
+class Subclassing(unittest.TestCase):
+
+    def testIsInstance(self):
+        class SubBits(BitStream): pass
+        a = SubBits()
+        self.assertTrue(isinstance(a, SubBits))
+
+    def testClassType(self):
+        class SubBits(BitStream): pass
+        self.assertEqual(SubBits().__class__, SubBits)
+
+
+class BytesProblems(unittest.TestCase):
+
+    def testOffsetButNoLength(self):
+        b = BitStream(bytes=b'\x00\xaa', offset=8)
+        self.assertEqual(b.hex, 'aa')
+        b = BitStream(bytes=b'\x00\xaa', offset=4)
+        self.assertEqual(b.hex, '0aa')
+
+    def testInvert(self):
+        b = BitStream(bytes=b'\x00\xaa', offset=8, length=8)
+        self.assertEqual(b.hex, 'aa')
+        b.invert()
+        self.assertEqual(b.hex, '55')
+
+    def testPrepend(self):
+        b = BitStream(bytes=b'\xaa\xbb', offset=8, length=4)
+        self.assertEqual(b.hex, 'b')
+        b.prepend('0xe')
+        self.assertEqual(b.hex, 'eb')
+        b = BitStream(bytes=b'\x00\xaa', offset=8, length=8)
+        b.prepend('0xee')
+        self.assertEqual(b.hex, 'eeaa')
+
+    def testByteSwap(self):
+        b = BitStream(bytes=b'\x01\x02\x03\x04', offset=8)
+        b.byteswap()
+        self.assertEqual(b, '0x040302')
+
+    def testBinProperty(self):
+        b = BitStream(bytes=b'\x00\xaa', offset=8, length=4)
+        self.assertEqual(b.bin, '1010')
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitstring.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitstring.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_bitstring.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_bitstring.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+"""
+Module-level unit tests.
+"""
+
+import unittest
+import sys
+sys.path.insert(0, '..')
+import bitstring
+import copy
+
+
+class ModuleData(unittest.TestCase):
+    def testVersion(self):
+        self.assertEqual(bitstring.__version__, '3.1.3')
+
+    def testAll(self):
+        exported = ['ConstBitArray', 'ConstBitStream', 'BitStream', 'BitArray',
+                    'Bits', 'BitString', 'pack', 'Error', 'ReadError',
+                    'InterpretError', 'ByteAlignError', 'CreationError', 'bytealigned']
+        self.assertEqual(set(bitstring.__all__), set(exported))
+
+    def testReverseDict(self):
+        d = bitstring.BYTE_REVERSAL_DICT
+        for i in range(256):
+            a = bitstring.Bits(uint=i, length=8)
+            b = d[i]
+            self.assertEqual(a.bin[::-1], bitstring.Bits(bytes=b).bin)
+
+    def testAliases(self):
+        self.assertTrue(bitstring.Bits is bitstring.ConstBitArray)
+        self.assertTrue(bitstring.BitStream is bitstring.BitString)
+
+
+class MemoryUsage(unittest.TestCase):
+    def testBaselineMemory(self):
+        try:
+            import pympler.asizeof.asizeof as size
+        except ImportError:
+            return
+        # These values might be platform dependent, so don't fret too much.
+        self.assertEqual(size(bitstring.ConstBitStream([0])), 64)
+        self.assertEqual(size(bitstring.Bits([0])), 64)
+        self.assertEqual(size(bitstring.BitStream([0])), 64)
+        self.assertEqual(size(bitstring.BitArray([0])), 64)
+        from bitstring.bitstore import ByteStore
+        self.assertEqual(size(ByteStore(bytearray())), 100)
+
+
+class Copy(unittest.TestCase):
+    def testConstBitArrayCopy(self):
+        import copy
+        cba = bitstring.Bits(100)
+        cba_copy = copy.copy(cba)
+        self.assertTrue(cba is cba_copy)
+
+    def testBitArrayCopy(self):
+        ba = bitstring.BitArray(100)
+        ba_copy = copy.copy(ba)
+        self.assertFalse(ba is ba_copy)
+        self.assertFalse(ba._datastore is ba_copy._datastore)
+        self.assertTrue(ba == ba_copy)
+
+    def testConstBitStreamCopy(self):
+        cbs = bitstring.ConstBitStream(100)
+        cbs.pos = 50
+        cbs_copy = copy.copy(cbs)
+        self.assertEqual(cbs_copy.pos, 0)
+        self.assertTrue(cbs._datastore is cbs_copy._datastore)
+        self.assertTrue(cbs == cbs_copy)
+
+    def testBitStreamCopy(self):
+        bs = bitstring.BitStream(100)
+        bs.pos = 50
+        bs_copy = copy.copy(bs)
+        self.assertEqual(bs_copy.pos, 0)
+        self.assertFalse(bs._datastore is bs_copy._datastore)
+        self.assertTrue(bs == bs_copy)
+
+
+class Interning(unittest.TestCase):
+    def testBits(self):
+        a = bitstring.Bits('0xf')
+        b = bitstring.Bits('0xf')
+        self.assertTrue(a is b)
+        c = bitstring.Bits('0b1111')
+        self.assertFalse(a is c)
+
+    def testCBS(self):
+        a = bitstring.ConstBitStream('0b11000')
+        b = bitstring.ConstBitStream('0b11000')
+        self.assertFalse(a is b)
+    #        self.assertTrue(a._datastore is b._datastore)
+        
+        
+        
+        
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_constbitstream.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_constbitstream.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test_constbitstream.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test_constbitstream.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+
+import unittest
+import sys
+sys.path.insert(0, '..')
+import bitstring
+from bitstring import ConstBitStream as CBS
+
+class All(unittest.TestCase):
+    def testFromFile(self):
+        s = CBS(filename='test.m1v')
+        self.assertEqual(s[0:32].hex, '000001b3')
+        self.assertEqual(s.read(8 * 4).hex, '000001b3')
+        width = s.read(12).uint
+        height = s.read(12).uint
+        self.assertEqual((width, height), (352, 288))
+
+
+class InterleavedExpGolomb(unittest.TestCase):
+    def testReading(self):
+        s = CBS(uie=333)
+        a = s.read('uie')
+        self.assertEqual(a, 333)
+        s = CBS('uie=12, sie=-9, sie=9, uie=1000000')
+        u = s.unpack('uie, 2*sie, uie')
+        self.assertEqual(u, [12, -9, 9, 1000000])
+
+    def testReadingErrors(self):
+        s = CBS(10)
+        self.assertRaises(bitstring.ReadError, s.read, 'uie')
+        self.assertEqual(s.pos, 0)
+        self.assertRaises(bitstring.ReadError, s.read, 'sie')
+        self.assertEqual(s.pos, 0)
+
+
+class ReadTo(unittest.TestCase):
+    def testByteAligned(self):
+        a = CBS('0xaabb00aa00bb')
+        b = a.readto('0x00', bytealigned=True)
+        self.assertEqual(b, '0xaabb00')
+        self.assertEqual(a.bytepos, 3)
+        b = a.readto('0xaa', bytealigned=True)
+        self.assertEqual(b, '0xaa')
+        self.assertRaises(bitstring.ReadError, a.readto, '0xcc', bytealigned=True)
+
+    def testNotAligned(self):
+        a = CBS('0b00111001001010011011')
+        a.pos = 1
+        self.assertEqual(a.readto('0b00'), '0b011100')
+        self.assertEqual(a.readto('0b110'), '0b10010100110')
+        self.assertRaises(ValueError, a.readto, '')
+
+    def testDisallowIntegers(self):
+        a = CBS('0x0f')
+        self.assertRaises(ValueError, a.readto, 4)
+
+    def testReadingLines(self):
+        s = b"This is a test\nof reading lines\nof text\n"
+        b = CBS(bytes=s)
+        n = bitstring.Bits(bytes=b'\n')
+        self.assertEqual(b.readto(n).bytes, b'This is a test\n')
+        self.assertEqual(b.readto(n).bytes, b'of reading lines\n')
+        self.assertEqual(b.readto(n).bytes, b'of text\n')
+
+
+class Subclassing(unittest.TestCase):
+
+    def testIsInstance(self):
+        class SubBits(CBS): pass
+        a = SubBits()
+        self.assertTrue(isinstance(a, SubBits))
+
+    def testClassType(self):
+        class SubBits(CBS): pass
+        self.assertEqual(SubBits().__class__, SubBits)
+
+
+class PadToken(unittest.TestCase):
+
+    def testRead(self):
+        s = CBS('0b100011110001')
+        a = s.read('pad:1')
+        self.assertEqual(a, None)
+        self.assertEqual(s.pos, 1)
+        a = s.read(3)
+        self.assertEqual(a, CBS('0b000'))
+        a = s.read('pad:0')
+        self.assertEqual(a, None)
+        self.assertEqual(s.pos, 4)
+
+    def testReadList(self):
+        s = CBS('0b10001111001')
+        t = s.readlist('pad:1, uint:3, pad:4, uint:3')
+        self.assertEqual(t, [0, 1])
+        s.pos = 0
+        t = s.readlist('pad:1, pad:5')
+        self.assertEqual(t, [])
+        self.assertEqual(s.pos, 6)
+        s.pos = 0
+        t = s.readlist('pad:1, bin, pad:4, uint:3')
+        self.assertEqual(t, ['000', 1])
+        s.pos = 0
+        t = s.readlist('pad, bin:3, pad:4, uint:3')
+        self.assertEqual(t, ['000', 1])
+
+class ReadingBytes(unittest.TestCase):
+
+    def testUnpackingBytes(self):
+        s = CBS(80)
+        t = s.unpack('bytes:1')
+        self.assertEqual(t[0], b'\x00')
+        a, b, c = s.unpack('bytes:1, bytes, bytes:2')
+        self.assertEqual(a, b'\x00')
+        self.assertEqual(b, b'\x00'*7)
+        self.assertEqual(c, b'\x00'*2)
+
+    def testUnpackingBytesWithKeywords(self):
+        s = CBS('0x55'*10)
+        t = s.unpack('pad:a, bytes:b, bytes, pad:a', a=4, b=6)
+        self.assertEqual(t, [b'\x55'*6, b'\x55'*3])
+
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/bitstring/test/test.m1v and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/bitstring/test/test.m1v differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/eme/gen-eme-voucher.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/eme/gen-eme-voucher.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/eme/gen-eme-voucher.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/eme/gen-eme-voucher.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,264 @@
+#!/usr/bin/env python3.3
+# Copyright 2014 Adobe Systems Incorporated. All Rights Reserved.
+#
+# Adobe permits you to use, modify, and distribute this file in accordance
+# with the terms of the Mozilla Public License, v 2.0 accompanying it.  If
+# 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
+
+import io, argparse,pyasn1, bitstring
+from pyasn1.codec.der import encoder, decoder
+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.
+# }
+class CodeSectionDigest(univ.Sequence):
+	componentType = namedtype.NamedTypes(
+		namedtype.NamedType('offset', univ.Integer()),
+		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
+# }
+
+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),
+		('IMAGE_FILE_MACHINE_AMD64',0x8664 )
+	)
+	subtypeSpec = univ.Enumerated.subtypeSpec + \
+				  constraint.SingleValueConstraint(0x14c, 0x8664)
+
+
+class ArchitectureDigest(univ.Sequence):
+	componentType = namedtype.NamedTypes(
+		namedtype.NamedType('cpuType', CPUType()),
+		namedtype.NamedType('cpuSubType', univ.Integer()),
+		namedtype.NamedType('CodeSegmentDigests', SetOfCodeSegmentDigest())
+	)
+
+#	 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):
+	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):
+	bits_read = 0
+	total_bits_read = 0
+
+	for item in items_in:
+		name = item[0]
+		t = item[1]
+		bits = 1 if ":" not in t else int(t[t.index(":") + 1:])
+
+		if ":" in t and t.find("bytes") >= 0:
+			bits = bits * 8
+
+		if len(item) == 2:
+			items_out[name] = stream.read(t)
+			bits_read += bits
+			total_bits_read += bits
+		elif len(item) == 3 or len(item) == 4:
+			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
+
+			# has sub-items based on length
+			items_out[name] = stream.read(t)
+			bits_read += bits
+			total_bits_read += bits
+
+			if len(item) == 4:
+				bit_length = items_out[name] * 8
+
+				if bit_length > 0:
+					sub_read, sub_total_read = parseItems(stream, sub_items, items_out)
+					bit_length -= sub_read
+					total_bits_read += sub_total_read
+
+					if bit_length > 0:
+						items_out[item[3]] = stream.read('bits:' + str(bit_length))
+						bits_read += bit_length
+						total_bits_read += bit_length
+		else:
+			raise Exception("unrecognized item" + pprint.pformat(item))
+
+	return bits_read, total_bits_read
+
+
+class SectionHeader:
+	def __init__(self, stream):
+		items = [
+			('Name', 'bytes:8'),
+			('VirtualSize', 'uintle:32'),
+			('VirtualAddress', 'uintle:32'),
+			('SizeOfRawData', 'uintle:32'),
+			('PointerToRawData', 'uintle:32'),
+			('PointerToRelocations', 'uintle:32'),
+			('PointerToLineNumber', 'uintle:32'),
+			('NumberOfRelocations', 'uintle:16'),
+			('NumberOfLineNumbers', 'uintle:16'),
+			('Characteristics', 'uintle:32')
+		]
+		self.items = {}
+		_, self.bits_read = parseItems(stream, items, self.items)
+
+		self.sectionName = self.items['Name'].decode('utf-8')
+		self.offset = self.items['PointerToRawData']
+
+
+class COFFFileHeader:
+	def __init__(self, stream):
+		items = [
+			('Machine', 'uintle:16'),
+			('NumberOfSections', 'uintle:16'),
+			('TimeDateStamp', 'uintle:32'),
+			('PointerToSymbolTable', 'uintle:32'),
+			('NumberOfSymbols', 'uintle:32'),
+			('SizeOfOptionalHeader', 'uintle:16'),
+			('Characteristics', 'uintle:16')
+		]
+		self.items = {}
+		_, self.bits_read = parseItems(stream, items, self.items)
+
+		#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
+
+		self.codeSectionHeaders.sort(key=lambda header: header.offset)
+
+
+def main():
+	parser = argparse.ArgumentParser(description='PE/COFF Parser.')
+	parser.add_argument('-input', required=True, help="File to parse.")
+	parser.add_argument('-output', required=True, help="File to write to.")
+	parser.add_argument('-verbose', action='store_true', help="Verbose output.")
+	app_args = parser.parse_args()
+
+	stream = bitstring.ConstBitStream(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
+
+	#read 4 bytes, make sure it's a PE signature.
+	signature = stream.read('uintle:32')
+	if signature != 0x00004550 :
+		return
+
+
+	archDigest = ArchitectureDigest()
+
+	codeSegmentDigests = SetOfCodeSegmentDigest()
+	codeSegmentIdx = 0
+
+	#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'])
+
+		digester = hashlib.sha256()
+		digester.update(codeSectionBytes)
+		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))
+
+		setOfDigest = SetOfCodeSectionDigest()
+		setOfDigest.setComponentByPosition(0, codeSectionDigest)
+
+		codeSegmentDigest = CodeSegmentDigest()
+		codeSegmentDigest.setComponentByName('offset', codeSectionHeader.offset)
+		codeSegmentDigest.setComponentByName('codeSectionDigests', setOfDigest)
+
+		codeSegmentDigests.setComponentByPosition(codeSegmentIdx, codeSegmentDigest)
+		codeSegmentIdx += 1
+
+	archDigest.setComponentByName('CodeSegmentDigests', codeSegmentDigests)
+
+	setOfArchDigests = SetOfArchitectureDigest()
+	setOfArchDigests.setComponentByPosition(0, archDigest)
+
+	appDigest = ApplicationDigest()
+
+	appDigest.setComponentByName('version', 1)
+	appDigest.setComponentByName('digests', setOfArchDigests)
+
+	binaryDigest = encoder.encode(appDigest)
+
+	outFile = open(app_args.output, 'wb')
+	outFile.write(binaryDigest)
+
+if __name__ == '__main__':
+	main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozboot/mozboot/bootstrap.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozboot/mozboot/bootstrap.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozboot/mozboot/bootstrap.py	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozboot/mozboot/bootstrap.py	2014-11-26 21:46:07.000000000 +0000
@@ -59,7 +59,7 @@
                     cls = UbuntuBootstrapper
             elif distro == 'Ubuntu':
                 cls = UbuntuBootstrapper
-            elif distro in ('Elementary OS', 'Elementary'):
+            elif distro in ('Elementary OS', 'Elementary', '"elementary OS"'):
                 cls = UbuntuBootstrapper
             else:
                 raise NotImplementedError('Bootstrap support for this Linux '
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/frontend/context.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/frontend/context.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/frontend/context.py	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/frontend/context.py	2014-11-26 21:46:07.000000000 +0000
@@ -501,6 +501,22 @@
         delimiters.
         """, None),
 
+    'HAS_MISC_RULE': (bool, bool,
+        """Whether this directory should be traversed in the ``misc`` tier.
+
+        Many ``libs`` rules still exist in Makefile.in files. We highly prefer
+        that these rules exist in the ``misc`` tier/target so that they can be
+        executed concurrently during tier traversal (the ``misc`` tier is
+        fully concurrent).
+
+        Presence of this variable indicates that this directory should be
+        traversed by the ``misc`` tier.
+
+        Please note that converting ``libs`` rules to the ``misc`` tier must
+        be done with care, as there are many implicit dependencies that can
+        break the build in subtle ways.
+        """, 'misc'),
+
     'FINAL_TARGET_FILES': (HierarchicalStringList, list,
         """List of files to be installed into the application directory.
 
@@ -873,7 +889,7 @@
         This is a list of files that define XPCOM interface definitions.
         Entries must be files that exist. Entries are almost certainly ``.idl``
         files.
-        """, 'libs'),
+        """, 'misc'),
 
     'XPIDL_MODULE': (unicode, unicode,
         """XPCOM Interface Definition Module Name.
@@ -975,6 +991,10 @@
         """List of manifest files defining mochitest tests.
         """, None),
 
+    'MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS': (StrictOrderingOnAppendList, list,
+        """List of manifest files defining webapprt mochitest content tests.
+        """, None),
+
     'MOCHITEST_WEBAPPRT_CHROME_MANIFESTS': (StrictOrderingOnAppendList, list,
         """List of manifest files defining webapprt mochitest chrome tests.
         """, None),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/frontend/emitter.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/frontend/emitter.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/frontend/emitter.py	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/frontend/emitter.py	2014-11-26 21:46:07.000000000 +0000
@@ -774,6 +774,7 @@
             METRO_CHROME=('metro-chrome', 'testing/mochitest', 'metro', True),
             MOCHITEST=('mochitest', 'testing/mochitest', 'tests', True),
             MOCHITEST_CHROME=('chrome', 'testing/mochitest', 'chrome', True),
+            MOCHITEST_WEBAPPRT_CONTENT=('webapprt-content', 'testing/mochitest', 'webapprtContent', True),
             MOCHITEST_WEBAPPRT_CHROME=('webapprt-chrome', 'testing/mochitest', 'webapprtChrome', True),
             WEBRTC_SIGNALLING_TEST=('steeplechase', 'steeplechase', '.', True),
             XPCSHELL_TESTS=('xpcshell', 'xpcshell', '.', True),
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/mach_commands.py	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/mach_commands.py	2014-11-26 21:46:07.000000000 +0000
@@ -666,12 +666,28 @@
         help='Output test results in a format that can be parsed by TBPL.')
     @CommandArgument('--shuffle', '-s', action='store_true',
         help='Randomize the execution order of tests.')
-    def gtest(self, shuffle, jobs, gtest_filter, tbpl_parser):
+
+    @CommandArgumentGroup('debugging')
+    @CommandArgument('--debug', action='store_true', group='debugging',
+        help='Enable the debugger. Not specifying a --debugger option will result in the default debugger being used. The following arguments have no effect without this.')
+    @CommandArgument('--debugger', default=None, type=str, group='debugging',
+        help='Name of debugger to use.')
+    @CommandArgument('--debugger-args', default=None, metavar='params', type=str,
+        group='debugging',
+        help='Command-line arguments to pass to the debugger itself; split as the Bourne shell would.')
+
+    def gtest(self, shuffle, jobs, gtest_filter, tbpl_parser, debug, debugger,
+              debugger_args):
 
         # We lazy build gtest because it's slow to link
         self._run_make(directory="testing/gtest", target='gtest', ensure_exit_code=True)
 
         app_path = self.get_binary_path('app')
+        args = [app_path, '-unittest'];
+
+        if debug:
+            args = self.prepend_debugger_args(args, debugger, debugger_args)
+
         cwd = os.path.join(self.topobjdir, '_tests', 'gtest')
 
         if not os.path.isdir(cwd):
@@ -695,7 +711,7 @@
             gtest_env[b"MOZ_TBPL_PARSER"] = b"True"
 
         if jobs == 1:
-            return self.run_process([app_path, "-unittest"],
+            return self.run_process(args=args,
                                     append_env=gtest_env,
                                     cwd=cwd,
                                     ensure_exit_code=False,
@@ -732,6 +748,43 @@
 
         return exit_code
 
+    def prepend_debugger_args(self, args, debugger, debugger_args):
+        '''
+        Given an array with program arguments, prepend arguments to run it under a
+        debugger.
+
+        :param args: The executable and arguments used to run the process normally.
+        :param debugger: The debugger to use, or empty to use the default debugger.
+        :param debugger_args: Any additional parameters to pass to the debugger.
+        '''
+
+        import mozdebug
+
+        if not debugger:
+            # No debugger name was provided. Look for the default ones on
+            # current OS.
+            debugger = mozdebug.get_default_debugger_name(mozdebug.DebuggerSearch.KeepLooking)
+
+        debuggerInfo = mozdebug.get_debugger_info(debugger, debugger_args)
+        if not debuggerInfo:
+            print("Could not find a suitable debugger in your PATH.")
+            return 1
+
+        # Parameters come from the CLI. We need to convert them before
+        # their use.
+        if debugger_args:
+            import pymake.process
+            argv, badchar = pymake.process.clinetoargv(debugger_args, os.getcwd())
+            if badchar:
+                print("The --debugger_args you passed require a real shell to parse them.")
+                print("(We can't handle the %r character.)" % (badchar,))
+                return 1
+            debugger_args = argv;
+
+        # Prepend the debugger args.
+        args = [debuggerInfo.path] + debuggerInfo.args + args
+        return args
+
 @CommandProvider
 class ClangCommands(MachCommandBase):
     @Command('clang-complete', category='devenv',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/test/frontend/data/traversal-simple/bar/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/test/frontend/data/traversal-simple/bar/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/test/frontend/data/traversal-simple/bar/moz.build	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/test/frontend/data/traversal-simple/bar/moz.build	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+HAS_MISC_RULE = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py	2014-11-26 21:46:07.000000000 +0000
@@ -98,6 +98,8 @@
         reldirs = [o.relativedir for o in objs]
         self.assertEqual(reldirs, ['', 'foo', 'foo/biz', 'bar'])
 
+        self.assertEqual(objs[3].affected_tiers, {'misc'})
+
         dirs = [o.dirs for o in objs]
         self.assertEqual(dirs, [
             [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/CHANGES thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/CHANGES
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/CHANGES	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/CHANGES	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,278 @@
+Revision 0.1.7
+--------------
+
+- License updated to vanilla BSD 2-Clause to ease package use
+  (http://opensource.org/licenses/BSD-2-Clause).
+- Test suite made discoverable by unittest/unittest2 discovery feature.
+- Fix to decoder working on indefinite length substrate -- end-of-octets
+  marker is now detected by both tag and value. Otherwise zero values may
+  interfere with end-of-octets marker.
+- Fix to decoder to fail in cases where tagFormat indicates inappropriate
+  format for the type (e.g. BOOLEAN is always PRIMITIVE, SET is always 
+  CONSTRUCTED and OCTET STRING is either of the two)
+- Fix to REAL type encoder to force primitive encoding form encoding.
+- Fix to CHOICE decoder to handle explicitly tagged, indefinite length
+  mode encoding
+- Fix to REAL type decoder to handle negative REAL values correctly. Test
+  case added.
+
+Revision 0.1.6
+--------------
+
+- The compact (valueless) way of encoding zero INTEGERs introduced in
+  0.1.5 seems to fail miserably as the world is filled with broken
+  BER decoders. So we had to back off the *encoder* for a while.
+  There's still the IntegerEncoder.supportCompactZero flag which
+  enables compact encoding form whenever it evaluates to True.
+- Report package version on debugging code initialization.
+
+Revision 0.1.5
+--------------
+
+- Documentation updated and split into chapters to better match
+  web-site contents.
+- Make prettyPrint() working for non-initialized pyasn1 data objects. It
+  used to throw an exception.
+- Fix to encoder to produce empty-payload INTEGER values for zeros
+- Fix to decoder to support empty-payload INTEGER and REAL values
+- Fix to unit test suites imports to be able to run each from
+  their current directory
+
+Revision 0.1.4
+--------------
+
+- Built-in codec debugging facility added
+- Added some more checks to ObjectIdentifier BER encoder catching
+  posible 2^8 overflow condition by two leading sub-OIDs
+- Implementations overriding the AbstractDecoder.valueDecoder method
+  changed to return the rest of substrate behind the item being processed
+  rather than the unprocessed substrate within the item (which is usually
+  empty).
+- Decoder's recursiveFlag feature generalized as a user callback function
+  which is passed an uninitialized object recovered from substrate and
+  its uninterpreted payload.
+- Catch inappropriate substrate type passed to decoder.
+- Expose tagMap/typeMap/Decoder objects at DER decoder to uniform API.
+- Obsolete __init__.MajorVersionId replaced with __init__.__version__
+  which is now in-sync with distutils.
+- Package classifiers updated.
+- The __init__.py's made non-empty (rumors are that they may be optimized 
+  out by package managers).
+- Bail out gracefully whenever Python version is older than 2.4.
+- Fix to Real codec exponent encoding (should be in 2's complement form),
+  some more test cases added.
+- Fix in Boolean truth testing built-in methods
+- Fix to substrate underrun error handling at ObjectIdentifier BER decoder
+- Fix to BER Boolean decoder that allows other pre-computed
+  values besides 0 and 1
+- Fix to leading 0x80 octet handling in DER/CER/DER ObjectIdentifier decoder.
+  See http://www.cosic.esat.kuleuven.be/publications/article-1432.pdf
+
+Revision 0.1.3
+--------------
+
+- Include class name into asn1 value constraint violation exception.
+- Fix to OctetString.prettyOut() method that looses leading zero when
+  building hex string.
+
+Revision 0.1.2
+--------------
+
+- Fix to __long__() to actually return longs on py2k
+- Fix to OctetString.__str__() workings of a non-initialized object.
+- Fix to quote initializer of OctetString.__repr__()
+- Minor fix towards ObjectIdentifier.prettyIn() reliability
+- ObjectIdentifier.__str__() is aliased to prettyPrint()
+- Exlicit repr() calls replaced with '%r'
+
+Revision 0.1.1
+--------------
+
+- Hex/bin string initializer to OctetString object reworked
+  (in a backward-incompatible manner)
+- Fixed float() infinity compatibility issue (affects 2.5 and earlier)
+- Fixed a bug/typo at Boolean CER encoder.
+- Major overhawl for Python 2.4 -- 3.2 compatibility:
+  + get rid of old-style types
+  + drop string module usage
+  + switch to rich comparation
+  + drop explicit long integer type use
+  + map()/filter() replaced with list comprehension
+  + apply() replaced with */**args
+  + switched to use 'key' sort() callback function
+  + support both __nonzero__() and __bool__() methods
+  + modified not to use py3k-incompatible exception syntax
+  + getslice() operator fully replaced with getitem()
+  + dictionary operations made 2K/3K compatible
+  + base type for encoding substrate and OctetString-based types
+    is now 'bytes' when running py3k and 'str' otherwise
+  + OctetString and derivatives now unicode compliant.
+  + OctetString now supports two python-neutral getters: asOcts() & asInts()
+  + print OctetString content in hex whenever it is not printable otherwise
+  + in test suite, implicit relative import replaced with the absolute one
+  + in test suite, string constants replaced with numerics
+
+Revision 0.0.13
+---------------
+
+- Fix to base10 normalization function that loops on univ.Real(0)
+
+Revision 0.0.13b
+----------------
+
+- ASN.1 Real type is now supported properly.
+- Objects of Constructed types now support __setitem__()
+- Set/Sequence objects can now be addressed by their field names (string index)
+  and position (integer index).
+- Typo fix to ber.SetDecoder code that prevented guided decoding operation.
+- Fix to explicitly tagged items decoding support.
+- Fix to OctetString.prettyPrint() to better handle non-printable content.
+- Fix to repr() workings of Choice objects.
+
+Revision 0.0.13a
+----------------
+
+- Major codec re-design.
+- Documentation significantly improved.
+- ASN.1 Any type is now supported.
+- All example ASN.1 modules moved to separate pyasn1-modules package.
+- Fix to initial sub-OID overflow condition detection an encoder.
+- BitString initialization value verification improved.
+- The Set/Sequence.getNameByPosition() method implemented.
+- Fix to proper behaviour of PermittedAlphabetConstraint object.
+- Fix to improper Boolean substrate handling at CER/DER decoders.
+- Changes towards performance improvement:
+  + all dict.has_key() & dict.get() invocations replaced with modern syntax
+    (this breaks compatibility with Python 2.1 and older).
+  + tag and tagset caches introduced to decoder
+  + decoder code improved to prevent unnecessary pyasn1 objects creation
+  + allow disabling components verification when setting components to
+    structured types, this is used by decoder whilst running in guided mode.
+  + BER decoder for integer values now looks up a small set of pre-computed
+    substrate values to save on decoding.
+  + a few pre-computed values configured to ObjectIdentifier BER encoder.
+  + ChoiceDecoder split-off SequenceOf one to save on unnecessary checks.
+  + replace slow hasattr()/getattr() calls with isinstance() introspection.
+  + track the number of initialized components of Constructed types to save
+    on default/optional components initialization.
+  + added a shortcut ObjectIdentifier.asTuple() to be used instead of
+    __getitem__() in hotspots.
+  + use Tag.asTuple() and pure integers at tag encoder.
+  + introduce and use in decoder the baseTagSet attribute of the built-in
+    ASN.1 types.
+
+Revision 0.0.12a
+----------------
+
+- The individual tag/length/value processing methods of 
+  encoder.AbstractItemEncoder renamed (leading underscore stripped)
+  to promote overloading in cases where partial substrate processing
+  is required.
+- The ocsp.py, ldap.py example scripts added.
+- Fix to univ.ObjectIdentifier input value handler to disallow negative
+  sub-IDs.
+
+Revision 0.0.11a
+----------------
+
+- Decoder can now treat values of unknown types as opaque OctetString.
+- Fix to Set/SetOf type decoder to handle uninitialized scalar SetOf 
+  components correctly.
+
+Revision 0.0.10a
+----------------
+
+- API versioning mechanics retired (pyasn1.v1 -> pyasn1) what makes
+  it possible to zip-import pyasn1 sources (used by egg and py2exe).
+
+Revision 0.0.9a
+---------------
+
+- Allow any non-zero values in Boolean type BER decoder, as it's in
+  accordnance with the standard.
+
+Revision 0.0.8a
+---------------
+
+- Integer.__index__() now supported (for Python 2.5+).
+- Fix to empty value encoding in BitString encoder, test case added.
+- Fix to SequenceOf decoder that prevents it skipping possible Choice
+  typed inner component.
+- Choice.getName() method added for getting currently set component
+  name.
+- OctetsString.prettyPrint() does a single str() against its value
+  eliminating an extra quotes.
+
+Revision 0.0.7a
+---------------
+
+- Large tags (>31) now supported by codecs.
+- Fix to encoder to properly handle explicitly tagged untagged items.
+- All possible value lengths (up to 256^126) now supported by encoders.
+- Fix to Tag class constructor to prevent negative IDs.
+
+Revision 0.0.6a
+---------------
+
+- Make use of setuptools.
+- Constraints derivation verification (isSuperTypeOf()/isSubTypeOf()) fixed.
+- Fix to constraints comparation logic -- can't cmp() hash values as it
+  may cause false positives due to hash conflicts.
+
+Revision 0.0.5a
+---------------
+
+- Integer BER codec reworked fixing negative values encoding bug.
+- clone() and subtype() methods of Constructed ASN.1 classes now 
+  accept optional cloneValueFlag flag which controls original value
+  inheritance. The default is *not* to inherit original value for 
+  performance reasons (this may affect backward compatibility).
+  Performance penalty may be huge on deeply nested Constructed objects
+  re-creation.
+- Base ASN.1 types (pyasn1.type.univ.*) do not have default values
+  anymore. They remain uninitialized acting as ASN.1 types. In 
+  this model, initialized ASN.1 types represent either types with
+  default value installed or a type instance.
+- Decoders' prototypes are now class instances rather than classes.
+  This is to simplify initial value installation to decoder's
+  prototype value.
+- Bugfix to BitString BER decoder (trailing bits not regarded).
+- Bugfix to Constraints use as mapping keys.
+- Bugfix to Integer & BitString clone() methods
+- Bugix to the way to distinguish Set from SetOf at CER/DER SetOfEncoder
+- Adjustments to make it running on Python 1.5.
+- In tests, substrate constants converted from hex escaped literals into
+  octals to overcome indefinite hex width issue occuring in young Python.
+- Minor performance optimization of TagSet.isSuperTagSetOf() method
+- examples/sshkey.py added
+
+Revision 0.0.4a
+---------------
+
+* Asn1ItemBase.prettyPrinter() -> *.prettyPrint()
+
+Revision 0.0.3a
+---------------
+
+* Simple ASN1 objects now hash to their Python value and don't
+  depend upon tag/constraints/etc.
+* prettyIn & prettyOut methods of SimplleAsn1Object become public
+* many syntax fixes
+
+Revision 0.0.2a
+---------------
+
+* ConstraintsIntersection.isSuperTypeOf() and 
+  ConstraintsIntersection.hasConstraint() implemented
+* Bugfix to NamedValues initialization code
+* +/- operators added to NamedValues objects
+* Integer.__abs__() & Integer.subtype() added
+* ObjectIdentifier.prettyOut() fixes
+* Allow subclass components at SequenceAndSetBase
+* AbstractConstraint.__cmp__() dropped
+* error.Asn1Error replaced with error.PyAsn1Error
+
+Revision 0.0.1a
+---------------
+
+* Initial public alpha release
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/codecs.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/codecs.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/codecs.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/codecs.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,503 @@
+<html>
+<title>
+PyASN1 codecs
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+<h3>
+2. PyASN1 Codecs
+</h3>
+
+<p>
+In ASN.1 context, 
+<a href=http://en.wikipedia.org/wiki/Codec>codec</a>
+is a program that transforms between concrete data structures and a stream
+of octets, suitable for transmission over the wire. This serialized form of
+data is sometimes called <i>substrate</i> or <i>essence</i>.
+</p>
+
+<p>
+In pyasn1 implementation, substrate takes shape of Python 3 bytes or 
+Python 2 string objects.
+</p>
+
+<p>
+One of the properties of a codec is its ability to cope with incomplete
+data and/or substrate what implies codec to be stateful. In other words, 
+when decoder runs out of substrate and data item being recovered is still 
+incomplete, stateful codec would suspend and complete data item recovery 
+whenever the rest of substrate becomes available. Similarly, stateful encoder
+would encode data items in multiple steps waiting for source data to
+arrive. Codec restartability is especially important when application deals
+with large volumes of data and/or runs on low RAM. For an interesting
+discussion on codecs options and design choices, refer to
+<a href=http://directory.apache.org/subprojects/asn1/>Apache ASN.1 project</a>
+.
+</p>
+
+<p>
+As of this writing, codecs implemented in pyasn1 are all stateless, mostly
+to keep the code simple.
+</p>
+
+<p>
+The pyasn1 package currently supports 
+<a href=http://en.wikipedia.org/wiki/Basic_encoding_rules>BER</a> codec and
+its variations -- 
+<a href=http://en.wikipedia.org/wiki/Canonical_encoding_rules>CER</a> and
+<a href=http://en.wikipedia.org/wiki/Distinguished_encoding_rules>DER</a>.
+More ASN.1 codecs are planned for implementation in the future.
+</p>
+
+<a name="2.1"></a>
+<h4>
+2.1 Encoders
+</h4>
+
+<p>
+Encoder is used for transforming pyasn1 value objects into substrate. Only
+pyasn1 value objects could be serialized, attempts to process pyasn1 type
+objects will cause encoder failure.
+</p>
+
+<p>
+The following code will create a pyasn1 Integer object and serialize it with
+BER encoder:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder
+>>> encoder.encode(univ.Integer(123456))
+b'\x02\x03\x01\xe2@'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+BER standard also defines a so-called <i>indefinite length</i> encoding form
+which makes large data items processing more memory efficient. It is mostly
+useful when encoder does not have the whole value all at once and the
+length of the value can not be determined at the beginning of encoding.
+</p>
+
+<p>
+<i>Constructed encoding</i> is another feature of BER closely related to the
+indefinite length form. In essence, a large scalar value (such as ASN.1
+character BitString type) could be chopped into smaller chunks by encoder
+and transmitted incrementally to limit memory consumption. Unlike indefinite
+length case, the length of the whole value must be known in advance when
+using constructed, definite length encoding form.
+</p>
+
+<p>
+Since pyasn1 codecs are not restartable, pyasn1 encoder may only encode data
+item all at once. However, even in this case, generating indefinite length 
+encoding may help a low-memory receiver, running a restartable decoder,
+to process a large data item.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder
+>>> encoder.encode(
+...   univ.OctetString('The quick brown fox jumps over the lazy dog'),
+...   defMode=False,
+...   maxChunkSize=8
+... )
+b'$\x80\x04\x08The quic\x04\x08k brown \x04\x08fox jump\x04\x08s over \
+t\x04\x08he lazy \x04\x03dog\x00\x00'
+>>>
+>>> encoder.encode(
+...   univ.OctetString('The quick brown fox jumps over the lazy dog'),
+...   maxChunkSize=8
+... )
+b'$7\x04\x08The quic\x04\x08k brown \x04\x08fox jump\x04\x08s over \
+t\x04\x08he lazy \x04\x03dog'
+</pre>
+</td></tr></table>
+
+<p>
+The <b>defMode</b> encoder parameter disables definite length encoding mode,
+while the optional <b>maxChunkSize</b> parameter specifies desired
+substrate chunk size that influences memory requirements at the decoder's end.
+</p>
+
+<p>
+To use CER or DER encoders one needs to explicitly import and call them - the
+APIs are all compatible.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder as ber_encoder
+>>> from pyasn1.codec.cer import encoder as cer_encoder
+>>> from pyasn1.codec.der import encoder as der_encoder
+>>> ber_encoder.encode(univ.Boolean(True))
+b'\x01\x01\x01'
+>>> cer_encoder.encode(univ.Boolean(True))
+b'\x01\x01\xff'
+>>> der_encoder.encode(univ.Boolean(True))
+b'\x01\x01\xff'
+>>>
+</pre>
+</td></tr></table>
+
+<a name="2.2"></a>
+<h4>
+2.2 Decoders
+</h4>
+
+<p>
+In the process of decoding, pyasn1 value objects are created and linked to
+each other, based on the information containted in the substrate. Thus,
+the original pyasn1 value object(s) are recovered.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> substrate = encoder.encode(univ.Boolean(True))
+>>> decoder.decode(substrate)
+(Boolean('True(1)'), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Commenting on the code snippet above, pyasn1 decoder accepts substrate
+as an argument and returns a tuple of pyasn1 value object (possibly
+a top-level one in case of constructed object) and unprocessed part
+of input substrate.
+</p>
+
+<p>
+All pyasn1 decoders can handle both definite and indefinite length
+encoding modes automatically, explicit switching into one mode
+to another is not required.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> substrate = encoder.encode(
+...   univ.OctetString('The quick brown fox jumps over the lazy dog'),
+...   defMode=False,
+...   maxChunkSize=8
+... )
+>>> decoder.decode(substrate)
+(OctetString(b'The quick brown fox jumps over the lazy dog'), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Speaking of BER/CER/DER encoding, in many situations substrate may not contain
+all necessary information needed for complete and accurate ASN.1 values
+recovery. The most obvious cases include implicitly tagged ASN.1 types
+and constrained types.
+</p>
+
+<p>
+As discussed earlier in this handbook, when an ASN.1 type is implicitly
+tagged, previous outermost tag is lost and never appears in substrate.
+If it is the base tag that gets lost, decoder is unable to pick type-specific
+value decoder at its table of built-in types, and therefore recover
+the value part, based only on the information contained in substrate. The
+approach taken by pyasn1 decoder is to use a prototype pyasn1 type object (or
+a set of them) to <i>guide</i> the decoding process by matching [possibly
+incomplete] tags recovered from substrate with those found in prototype pyasn1
+type objects (also called pyasn1 specification object further in this paper).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.codec.ber import decoder
+>>> decoder.decode(b'\x02\x01\x0c', asn1Spec=univ.Integer())
+Integer(12), b''
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Decoder would neither modify pyasn1 specification object nor use
+its current values (if it's a pyasn1 value object), but rather use it as
+a hint for choosing proper decoder and as a pattern for creating new objects:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, tag
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> i = univ.Integer(12345).subtype(
+...   implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 40)
+... )
+>>> substrate = encoder.encode(i)
+>>> substrate
+b'\x9f(\x0209'
+>>> decoder.decode(substrate)
+Traceback (most recent call last):
+...
+pyasn1.error.PyAsn1Error: 
+   TagSet(Tag(tagClass=128, tagFormat=0, tagId=40)) not in asn1Spec
+>>> decoder.decode(substrate, asn1Spec=i)
+(Integer(12345), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Notice in the example above, that an attempt to run decoder without passing
+pyasn1 specification object fails because recovered tag does not belong
+to any of the built-in types.
+</p>
+
+<p>
+Another important feature of guided decoder operation is the use of
+values constraints possibly present in pyasn1 specification object.
+To explain this, we will decode a random integer object into generic Integer
+and the constrained one.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> class DialDigit(univ.Integer):
+...   subtypeSpec = constraint.ValueRangeConstraint(0,9)
+>>> substrate = encoder.encode(univ.Integer(13))
+>>> decoder.decode(substrate)
+(Integer(13), b'')
+>>> decoder.decode(substrate, asn1Spec=DialDigit())
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ValueRangeConstraint(0, 9) failed at: 13
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Similarily to encoders, to use CER or DER decoders application has to
+explicitly import and call them - all APIs are compatible.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder as ber_encoder
+>>> substrate = ber_encoder.encode(univ.OctetString('http://pyasn1.sf.net'))
+>>>
+>>> from pyasn1.codec.ber import decoder as ber_decoder
+>>> from pyasn1.codec.cer import decoder as cer_decoder
+>>> from pyasn1.codec.der import decoder as der_decoder
+>>> 
+>>> ber_decoder.decode(substrate)
+(OctetString(b'http://pyasn1.sf.net'), b'')
+>>> cer_decoder.decode(substrate)
+(OctetString(b'http://pyasn1.sf.net'), b'')
+>>> der_decoder.decode(substrate)
+(OctetString(b'http://pyasn1.sf.net'), b'')
+>>> 
+</pre>
+</td></tr></table>
+
+<a name="2.2.1"></a>
+<h4>
+2.2.1 Decoding untagged types
+</h4>
+
+<p>
+It has already been mentioned, that ASN.1 has two "special case" types:
+CHOICE and ANY. They are different from other types in part of 
+tagging - unless these two are additionally tagged, neither of them will
+have their own tag. Therefore these types become invisible in substrate
+and can not be recovered without passing pyasn1 specification object to
+decoder.
+</p>
+
+<p>
+To explain the issue, we will first prepare a Choice object to deal with:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype
+>>> class CodeOrMessage(univ.Choice):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('code', univ.Integer()),
+...     namedtype.NamedType('message', univ.OctetString())
+...   )
+>>>
+>>> codeOrMessage = CodeOrMessage()
+>>> codeOrMessage.setComponentByName('message', 'my string value')
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ message=b'my string value'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Let's now encode this Choice object and then decode its substrate
+with and without pyasn1 specification object:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> substrate = encoder.encode(codeOrMessage)
+>>> substrate
+b'\x04\x0fmy string value'
+>>> encoder.encode(univ.OctetString('my string value'))
+b'\x04\x0fmy string value'
+>>>
+>>> decoder.decode(substrate)
+(OctetString(b'my string value'), b'')
+>>> codeOrMessage, substrate = decoder.decode(substrate, asn1Spec=CodeOrMessage())
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ message=b'my string value'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+First thing to notice in the listing above is that the substrate produced
+for our Choice value object is equivalent to the substrate for an OctetString
+object initialized to the same value. In other words, any information about
+the Choice component is absent in encoding.
+</p>
+
+<p>
+Sure enough, that kind of substrate will decode into an OctetString object,
+unless original Choice type object is passed to decoder to guide the decoding
+process.
+</p>
+
+<p>
+Similarily untagged ANY type behaves differently on decoding phase - when
+decoder bumps into an Any object in pyasn1 specification, it stops decoding
+and puts all the substrate into a new Any value object in form of an octet
+string. Concerned application could then re-run decoder with an additional,
+more exact pyasn1 specification object to recover the contents of Any
+object.
+</p>
+
+<p>
+As it was mentioned elsewhere in this paper, Any type allows for incomplete
+or changing ASN.1 specification to be handled gracefully by decoder and
+applications.
+</p>
+
+<p>
+To illustrate the working of Any type, we'll have to make the stage
+by encoding a pyasn1 object and then putting its substrate into an any
+object.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> innerSubstrate = encoder.encode(univ.Integer(1234))
+>>> innerSubstrate
+b'\x02\x02\x04\xd2'
+>>> any = univ.Any(innerSubstrate)
+>>> any
+Any(b'\x02\x02\x04\xd2')
+>>> substrate = encoder.encode(any)
+>>> substrate
+b'\x02\x02\x04\xd2'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+As with Choice type encoding, there is no traces of Any type in substrate.
+Obviously, the substrate we are dealing with, will decode into the inner
+[Integer] component, unless pyasn1 specification is given to guide the 
+decoder. Continuing previous code:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+
+>>> decoder.decode(substrate)
+(Integer(1234), b'')
+>>> any, substrate = decoder.decode(substrate, asn1Spec=univ.Any())
+>>> any
+Any(b'\x02\x02\x04\xd2')
+>>> decoder.decode(str(any))
+(Integer(1234), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Both CHOICE and ANY types are widely used in practice. Reader is welcome to
+take a look at 
+<a href=http://www.cs.auckland.ac.nz/~pgut001/pubs/x509guide.txt>
+ASN.1 specifications of X.509 applications</a> for more information.
+</p>
+
+<a name="2.2.2"></a>
+<h4>
+2.2.2 Ignoring unknown types
+</h4>
+
+<p>
+When dealing with a loosely specified ASN.1 structure, the receiving
+end may not be aware of some types present in the substrate. It may be
+convenient then to turn decoder into a recovery mode. Whilst there, decoder
+will not bail out when hit an unknown tag but rather treat it as an Any
+type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, tag
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> taggedInt = univ.Integer(12345).subtype(
+...   implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 40)
+... )
+>>> substrate = encoder.encode(taggedInt)
+>>> decoder.decode(substrate)
+Traceback (most recent call last):
+...
+pyasn1.error.PyAsn1Error: TagSet(Tag(tagClass=128, tagFormat=0, tagId=40)) not in asn1Spec
+>>>
+>>> decoder.decode.defaultErrorState = decoder.stDumpRawValue
+>>> decoder.decode(substrate)
+(Any(b'\x9f(\x0209'), '')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+It's also possible to configure a custom decoder, to handle unknown tags
+found in substrate. This can be done by means of <b>defaultRawDecoder</b>
+attribute holding a reference to type decoder object. Refer to the source
+for API details.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/constraints.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/constraints.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/constraints.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/constraints.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,436 @@
+<html>
+<title>
+PyASN1 subtype constraints
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+
+<h4>
+1.4 PyASN1 subtype constraints
+</h4>
+
+<p>
+Most ASN.1 types can correspond to an infinite set of values. To adapt to
+particular application's data model and needs, ASN.1 provides a mechanism
+for limiting the infinite set to values, that make sense in particular case.
+</p>
+
+<p>
+Imposing value constraints on an ASN.1 type can also be seen as creating
+a subtype from its base type.
+</p>
+
+<p>
+In pyasn1, constraints take shape of immutable objects capable
+of evaluating given value against constraint-specific requirements.
+Constraint object is a property of pyasn1 type. Like TagSet property,
+associated with every pyasn1 type, constraints can never be modified
+in place. The only way to modify pyasn1 type constraint is to associate
+new constraint object to a new pyasn1 type object.
+</p>
+
+<p>
+A handful of different flavors of <i>constraints</i> are defined in ASN.1.
+We will discuss them one by one in the following chapters and also explain
+how to combine and apply them to types.
+</p>
+
+<a name="1.4.1"></a>
+<h4>
+1.4.1 Single value constraint
+</h4>
+
+<p>
+This kind of constraint allows for limiting type to a finite, specified set
+of values.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+DialButton ::= OCTET STRING (
+  "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
+)
+</pre>
+</td></tr></table>
+
+<p>
+Its pyasn1 implementation would look like:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import constraint
+>>> c = constraint.SingleValueConstraint(
+  '0','1','2','3','4','5','6','7','8','9'
+)
+>>> c
+SingleValueConstraint(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+>>> c('0')
+>>> c('A')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError: 
+  SingleValueConstraint(0, 1, 2, 3, 4, 5, 6, 7, 8, 9) failed at: A
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+As can be seen in the snippet above, if a value violates the constraint, an
+exception will be thrown. A constrainted pyasn1 type object holds a
+reference to a constraint object (or their combination, as will be explained
+later) and calls it for value verification.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class DialButton(univ.OctetString):
+...   subtypeSpec = constraint.SingleValueConstraint(
+...       '0','1','2','3','4','5','6','7','8','9'
+...   )
+>>> DialButton('0')
+DialButton(b'0')
+>>> DialButton('A')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  SingleValueConstraint(0, 1, 2, 3, 4, 5, 6, 7, 8, 9) failed at: A
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Constrained pyasn1 value object can never hold a violating value.
+</p>
+
+<a name="1.4.2"></a>
+<h4>
+1.4.2 Value range constraint
+</h4>
+
+<p>
+A pair of values, compliant to a type to be constrained, denote low and upper
+bounds of allowed range of values of a type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Teenagers ::= INTEGER (13..19)
+</pre>
+</td></tr></table>
+
+<p>
+And in pyasn1 terms:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class Teenagers(univ.Integer):
+...   subtypeSpec = constraint.ValueRangeConstraint(13, 19)
+>>> Teenagers(14)
+Teenagers(14)
+>>> Teenagers(20)
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ValueRangeConstraint(13, 19) failed at: 20
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Value range constraint usually applies numeric types.
+</p>
+
+<a name="1.4.3"></a>
+<h4>
+1.4.3 Size constraint
+</h4>
+
+<p>
+It is sometimes convenient to set or limit the allowed size of a data item
+to be sent from one application to another to manage bandwidth and memory
+consumption issues. Size constraint specifies the lower and upper bounds 
+of the size of a valid value.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+TwoBits ::= BIT STRING (SIZE (2))
+</pre>
+</td></tr></table>
+
+<p>
+Express the same grammar in pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class TwoBits(univ.BitString):
+...   subtypeSpec = constraint.ValueSizeConstraint(2, 2)
+>>> TwoBits((1,1))
+TwoBits("'11'B")
+>>> TwoBits((1,1,0))
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ValueSizeConstraint(2, 2) failed at: (1, 1, 0)
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Size constraint can be applied to potentially massive values - bit or octet
+strings, SEQUENCE OF/SET OF values.
+</p>
+
+<a name="1.4.4"></a>
+<h4>
+1.4.4 Alphabet constraint
+</h4>
+
+<p>
+The permitted alphabet constraint is similar to Single value constraint
+but constraint applies to individual characters of a value. 
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MorseCode ::= PrintableString (FROM ("."|"-"|" "))
+</pre>
+</td></tr></table>
+
+<p>
+And in pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char, constraint
+>>> class MorseCode(char.PrintableString):
+...   subtypeSpec = constraint.PermittedAlphabetConstraint(".", "-", " ")
+>>> MorseCode("...---...")
+MorseCode('...---...')
+>>> MorseCode("?")
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  PermittedAlphabetConstraint(".", "-", " ") failed at: "?"
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Current implementation does not handle ranges of characters in constraint
+(FROM "A".."Z" syntax), one has to list the whole set in a range.
+</p>
+
+<a name="1.4.5"></a>
+<h4>
+1.4.5 Constraint combinations
+</h4>
+
+<p>
+Up to this moment, we used a single constraint per ASN.1 type. The standard,
+however, allows for combining multiple individual constraints into
+intersections, unions and exclusions.
+</p>
+
+<p>
+In pyasn1 data model, all of these methods of constraint combinations are
+implemented as constraint-like objects holding individual constraint (or
+combination) objects. Like terminal constraint objects, combination objects
+are capable to perform value verification at its set of enclosed constraints
+according to the logic of particular combination.
+</p>
+
+<p>
+Constraints intersection verification succeeds only if a value is
+compliant to each constraint in a set. To begin with, the following
+specification will constitute a valid telephone number:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+PhoneNumber ::= NumericString (FROM ("0".."9")) (SIZE 11)
+</pre>
+</td></tr></table>
+
+<p>
+Constraint intersection object serves the logic above:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char, constraint
+>>> class PhoneNumber(char.NumericString):
+...   subtypeSpec = constraint.ConstraintsIntersection(
+...     constraint.PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9'),
+...     constraint.ValueSizeConstraint(11, 11)
+...   )
+>>> PhoneNumber('79039343212')
+PhoneNumber('79039343212')
+>>> PhoneNumber('?9039343212')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsIntersection(
+    PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9'),
+      ValueSizeConstraint(11, 11)) failed at: 
+   PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9') failed at: "?039343212"
+>>> PhoneNumber('9343212')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsIntersection(
+    PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9'),
+      ValueSizeConstraint(11, 11)) failed at:
+  ValueSizeConstraint(10, 10) failed at: "9343212"
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Union of constraints works by making sure that a value is compliant
+to any of the constraint in a set. For instance:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+CapitalOrSmall ::= IA5String (FROM ('A','B','C') | FROM ('a','b','c'))
+</pre>
+</td></tr></table>
+
+<p>
+It's important to note, that a value must fully comply to any single
+constraint in a set. In the specification above, a value of all small or
+all capital letters is compliant, but a mix of small&capitals is not. 
+Here's its pyasn1 analogue:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char, constraint
+>>> class CapitalOrSmall(char.IA5String):
+...   subtypeSpec = constraint.ConstraintsUnion(
+...     constraint.PermittedAlphabetConstraint('A','B','C'),
+...     constraint.PermittedAlphabetConstraint('a','b','c')
+...   )
+>>> CapitalOrSmall('ABBA')
+CapitalOrSmall('ABBA')
+>>> CapitalOrSmall('abba')
+CapitalOrSmall('abba')
+>>> CapitalOrSmall('Abba')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsUnion(PermittedAlphabetConstraint('A', 'B', 'C'),
+    PermittedAlphabetConstraint('a', 'b', 'c')) failed at: failed for "Abba"
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Finally, the exclusion constraint simply negates the logic of value 
+verification at a constraint. In the following example, any integer value
+is allowed in a type but not zero.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+NoZero ::= INTEGER (ALL EXCEPT 0)
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1 the above definition would read:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class NoZero(univ.Integer):
+...   subtypeSpec = constraint.ConstraintsExclusion(
+...     constraint.SingleValueConstraint(0)
+...   )
+>>> NoZero(1)
+NoZero(1)
+>>> NoZero(0)
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsExclusion(SingleValueConstraint(0)) failed at: 0
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The depth of such a constraints tree, built with constraint combination objects
+at its nodes, has not explicit limit. Value verification is performed in a
+recursive manner till a definite solution is found.
+</p>
+
+<a name="1.5"></a>
+<h4>
+1.5 Types relationships
+</h4>
+
+<p>
+In the course of data processing in an application, it is sometimes
+convenient to figure out the type relationships between pyasn1 type or
+value objects. Formally, two things influence pyasn1 types relationship:
+<i>tag set</i> and <i>subtype constraints</i>. One pyasn1 type is considered
+to be a derivative of another if their TagSet and Constraint objects are
+a derivation of one another.
+</p>
+
+<p>
+The following example illustrates the concept (we use the same tagset but
+different constraints for simplicity):
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> i1 = univ.Integer(subtypeSpec=constraint.ValueRangeConstraint(3,8))
+>>> i2 = univ.Integer(subtypeSpec=constraint.ConstraintsIntersection(
+...    constraint.ValueRangeConstraint(3,8),
+...    constraint.ValueRangeConstraint(4,7)
+... ) )
+>>> i1.isSameTypeWith(i2)
+False
+>>> i1.isSuperTypeOf(i2)
+True
+>>> i1.isSuperTypeOf(i1)
+True
+>>> i2.isSuperTypeOf(i1)
+False
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+As can be seen in the above code snippet, there are two methods of any pyasn1
+type/value object that test types for their relationship:
+<b>isSameTypeWith</b>() and <b>isSuperTypeOf</b>(). The former is 
+self-descriptive while the latter yields true if the argument appears
+to be a pyasn1 object which has tagset and constraints derived from those
+of the object being called.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/constructed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/constructed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/constructed.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/constructed.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,377 @@
+<html>
+<title>
+PyASN1 Constructed types
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+
+<h4>
+1.3 PyASN1 Constructed types
+</h4>
+
+<p>
+Besides scalar types, ASN.1 specifies so-called constructed ones - these
+are capable of holding one or more values of other types, both scalar
+and constructed.
+</p>
+
+<p>
+In pyasn1 implementation, constructed ASN.1 types behave like 
+Python sequences, and also support additional component addressing methods,
+specific to particular constructed type.
+</p>
+
+<a name="1.3.1"></a>
+<h4>
+1.3.1 Sequence and Set types
+</h4>
+
+<p>
+The Sequence and Set types have many similar properties:
+</p>
+<ul>
+<li>they can hold any number of inner components of different types
+<li>every component has a human-friendly identifier
+<li>any component can have a default value
+<li>some components can be absent.
+</ul>
+
+<p>
+However, Sequence type guarantees the ordering of Sequence value components
+to match their declaration order. By contrast, components of the
+Set type can be ordered to best suite application's needs.
+<p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Record ::= SEQUENCE {
+  id        INTEGER,
+  room  [0] INTEGER OPTIONAL,
+  house [1] INTEGER DEFAULT 0
+}
+</pre>
+</td></tr></table>
+
+<p>
+Up to this moment, the only method we used for creating new pyasn1 types
+is Python sub-classing. With this method, a new, named Python class is created
+what mimics type derivation in ASN.1 grammar. However, ASN.1 also allows for
+defining anonymous subtypes (room and house components in the example above).
+To support anonymous subtyping in pyasn1, a cloning operation on an existing
+pyasn1 type object can be invoked what creates a new instance of original
+object with possibly modified properties.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype, tag
+>>> class Record(univ.Sequence):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('id', univ.Integer()),
+...     namedtype.OptionalNamedType(
+...       'room',
+...       univ.Integer().subtype(
+...         implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0)
+...       )
+...     ),
+...     namedtype.DefaultedNamedType(
+...       'house', 
+...       univ.Integer(0).subtype(
+...         implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1)
+...       )
+...     )
+...   )
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+All pyasn1 constructed type classes have a class attribute <b>componentType</b>
+that represent default type specification. Its value is a NamedTypes object.
+</p>
+
+<p>
+The NamedTypes class instance holds a sequence of NameType, OptionalNamedType
+or DefaultedNamedType objects which, in turn, refer to pyasn1 type objects that
+represent inner SEQUENCE components specification.
+</p>
+
+<p>
+Finally, invocation of a subtype() method of pyasn1 type objects in the code
+above returns an implicitly tagged copy of original object.
+</p>
+
+<p>
+Once a SEQUENCE or SET type is decleared with pyasn1, it can be instantiated
+and initialized (continuing the above code):
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> record = Record()
+>>> record.setComponentByName('id', 123)
+>>> print(record.prettyPrint())
+Record:
+ id=123
+>>> 
+>>> record.setComponentByPosition(1, 321)
+>>> print(record.prettyPrint())
+Record:
+ id=123
+ room=321
+>>>
+>>> record.setDefaultComponents()
+>>> print(record.prettyPrint())
+Record:
+ id=123
+ room=321
+ house=0
+</pre>
+</td></tr></table>
+
+<p>
+Inner components of pyasn1 Sequence/Set objects could be accessed using the
+following methods:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> record.getComponentByName('id')
+Integer(123)
+>>> record.getComponentByPosition(1)
+Integer(321)
+>>> record[2]
+Integer(0)
+>>> for idx in range(len(record)):
+...   print(record.getNameByPosition(idx), record.getComponentByPosition(idx))
+id 123
+room 321
+house 0
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The Set type share all the properties of Sequence type, and additionally
+support by-tag component addressing (as all Set components have distinct
+types).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype, tag
+>>> class Gamer(univ.Set):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('score', univ.Integer()),
+...     namedtype.NamedType('player', univ.OctetString()),
+...     namedtype.NamedType('id', univ.ObjectIdentifier())
+...   )
+>>> gamer = Gamer()
+>>> gamer.setComponentByType(univ.Integer().getTagSet(), 121343)
+>>> gamer.setComponentByType(univ.OctetString().getTagSet(), 'Pascal')
+>>> gamer.setComponentByType(univ.ObjectIdentifier().getTagSet(), (1,3,7,2))
+>>> print(gamer.prettyPrint())
+Gamer:
+ score=121343
+ player=b'Pascal'
+ id=1.3.7.2
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.3.2"></a>
+<h4>
+1.3.2 SequenceOf and SetOf types
+</h4>
+
+<p>
+Both, SequenceOf and SetOf types resemble an unlimited size list of components.
+All the components must be of the same type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Progression ::= SEQUENCE OF INTEGER
+
+arithmeticProgression Progression ::= { 1, 3, 5, 7 }
+</pre>
+</td></tr></table>
+
+<p>
+SequenceOf and SetOf types are expressed by the very similar pyasn1 type 
+objects. Their components can only be addressed by position and they
+both have a property of automatic resize.
+</p>
+
+<p>
+To specify inner component type, the <b>componentType</b> class attribute
+should refer to another pyasn1 type object.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> class Progression(univ.SequenceOf):
+...   componentType = univ.Integer()
+>>> arithmeticProgression = Progression()
+>>> arithmeticProgression.setComponentByPosition(1, 111)
+>>> print(arithmeticProgression.prettyPrint())
+Progression:
+-empty- 111
+>>> arithmeticProgression.setComponentByPosition(0, 100)
+>>> print(arithmeticProgression.prettyPrint())
+Progression:
+100 111
+>>>
+>>> for idx in range(len(arithmeticProgression)):
+...    arithmeticProgression.getComponentByPosition(idx)
+Integer(100)
+Integer(111)
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Any scalar or constructed pyasn1 type object can serve as an inner component.
+Missing components are prohibited in SequenceOf/SetOf value objects.
+</p>
+
+<a name="1.3.3"></a>
+<h4>
+1.3.3 Choice type
+</h4>
+
+<p>
+Values of ASN.1 CHOICE type can contain only a single value of a type from a 
+list of possible alternatives. Alternatives must be ASN.1 types with
+distinct tags for the whole structure to remain unambiguous. Unlike most
+other types, CHOICE is an untagged one, e.g. it has no base tag of its own.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+CodeOrMessage ::= CHOICE {
+  code    INTEGER,
+  message OCTET STRING
+}
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1 implementation, Choice object behaves like Set but accepts only
+a single inner component at a time. It also offers a few additional methods
+specific to its behaviour.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype
+>>> class CodeOrMessage(univ.Choice):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('code', univ.Integer()),
+...     namedtype.NamedType('message', univ.OctetString())
+...   )
+>>>
+>>> codeOrMessage = CodeOrMessage()
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+>>> codeOrMessage.setComponentByName('code', 123)
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ code=123
+>>> codeOrMessage.setComponentByName('message', 'my string value')
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ message=b'my string value'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Since there could be only a single inner component value in the pyasn1 Choice
+value object, either of the following methods could be used for fetching it
+(continuing previous code):
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> codeOrMessage.getName()
+'message'
+>>> codeOrMessage.getComponent()
+OctetString(b'my string value')
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.3.4"></a>
+<h4>
+1.3.4 Any type
+</h4>
+
+<p>
+The ASN.1 ANY type is a kind of wildcard or placeholder that matches
+any other type without knowing it in advance. Like CHOICE type, ANY
+has no base tag.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Error ::= SEQUENCE {
+  code      INTEGER,
+  parameter ANY DEFINED BY code
+}
+</pre>
+</td></tr></table>
+
+<p>
+The ANY type is frequently used in specifications, where exact type is not
+yet agreed upon between communicating parties or the number of possible
+alternatives of a type is infinite.
+Sometimes an auxiliary selector is kept around to help parties indicate
+the kind of ANY payload in effect ("code" in the example above).
+</p>
+
+<p>
+Values of the ANY type contain serialized ASN.1 value(s) in form of
+an octet string. Therefore pyasn1 Any value object share the properties of
+pyasn1 OctetString object.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> someValue = univ.Any(b'\x02\x01\x01')
+>>> someValue
+Any(b'\x02\x01\x01')
+>>> str(someValue)
+'\x02\x01\x01'
+>>> bytes(someValue)
+b'\x02\x01\x01'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Receiving application is supposed to explicitly deserialize the content of Any
+value object, possibly using auxiliary selector for figuring out its ASN.1
+type to pick appropriate decoder.
+</p>
+
+<p>
+There will be some more talk and code snippets covering Any type in the codecs
+chapters that follow.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/intro.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/intro.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/intro.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/intro.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,156 @@
+<html>
+<title>
+PyASN1 reference manual
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+
+<h3>
+PyASN1 reference manual
+</h3>
+
+<p align=right>
+<i>written by <a href=mailto:ilya@glas.net>Ilya Etingof</a>, 2011-2012</i>
+</p>
+
+<p>
+Free and open-source pyasn1 library makes it easier for programmers and
+network engineers to develop, debug and experiment with ASN.1-based protocols
+using Python programming language as a tool.
+</p>
+
+<p>
+Abstract Syntax Notation One 
+(<a href=http://en.wikipedia.org/wiki/Abstract_Syntax_Notation_1x>ASN.1</a>)
+is a set of 
+<a href=http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-X.693-0207w.zip>
+ITU standards</a> concered with provisioning instrumentation for developing
+data exchange protocols in a robust, clear and interoperabable way for
+various IT systems and applications. Most of the efforts are targeting the
+following areas:
+<ul>
+<li>Data structures: the standard introduces a collection of basic data types
+(similar to integers, bits, strings, arrays and records in a programming
+language) that can be used for defining complex, possibly nested data
+structures representing domain-specific data units.
+<li>Serialization protocols: domain-specific data units expressed in ASN.1
+types could be converted into a series of octets for storage or transmission
+over the wire and then recovered back into their structured form on the
+receiving end. This process is immune to various hardware and software
+related dependencies.
+<li>Data description language: could be used to describe particular set of
+domain-specific data structures and their relationships. Such a description
+could be passed to an ASN.1 compiler for automated generation of program
+code that represents ASN.1 data structures in language-native environment
+and handles data serialization issues.
+</ul>
+</p>
+
+<p>
+This tutorial and algorithms, implemented by pyasn1 library, are
+largely based on the information read in the book
+<a href="http://www.oss.com/asn1/dubuisson.html">
+ASN.1 - Communication between heterogeneous systems</a>
+by Olivier Dubuisson. Another relevant resource is
+<a href=ftp://ftp.rsasecurity.com/pub/pkcs/ascii/layman.asc>
+A Layman's Guide to a Subset of ASN.1, BER, and DER</a> by Burton S. Kaliski.
+It's advised to refer to these books for more in-depth knowledge on the
+subject of ASN.1.
+</p>
+
+<p>
+As of this writing, pyasn1 library implements most of standard ASN.1 data
+structures in a rather detailed and feature-rich manner. Another highly
+important capability of the library is its data serialization facilities.
+The last component of the standard - ASN.1 compiler is planned for
+implementation in the future.
+</p>
+
+</p>
+The pyasn1 library was designed to follow the pre-1995 ASN.1 specification
+(also known as X.208). Later, post 1995, revision (X.680) introduced
+significant changes most of which have not yet been supported by pyasn1.
+</p>
+
+<h3>
+Table of contents
+</h3>
+
+<p>
+<ul>
+<li><a href="scalar.html">1. Data model for ASN.1 types</a>
+<li><a href="scalar.html#1.1">1.1 Scalar types</a>
+<li><a href="scalar.html#1.1.1">1.1.1 Boolean type</a>
+<li><a href="scalar.html#1.1.2">1.1.2 Null type</a>
+<li><a href="scalar.html#1.1.3">1.1.3 Integer type</a>
+<li><a href="scalar.html#1.1.4">1.1.4 Enumerated type</a>
+<li><a href="scalar.html#1.1.5">1.1.5 Real type</a>
+<li><a href="scalar.html#1.1.6">1.1.6 Bit string type</a>
+<li><a href="scalar.html#1.1.7">1.1.7 OctetString type</a>
+<li><a href="scalar.html#1.1.8">1.1.8 ObjectIdentifier type</a>
+<li><a href="scalar.html#1.1.9">1.1.9 Character string types</a>
+<li><a href="scalar.html#1.1.10">1.1.10 Useful types</a>
+<li><a href="tagging.html">1.2 Tagging</a>
+<li><a href="constructed.html">1.3 Constructed types</a>
+<li><a href="constructed.html#1.3.1">1.3.1 Sequence and Set types</a>
+<li><a href="constructed.html#1.3.2">1.3.2 SequenceOf and SetOf types</a>
+<li><a href="constructed.html#1.3.3">1.3.3 Choice type</a>
+<li><a href="constructed.html#1.3.4">1.3.4 Any type</a>
+<li><a href="constraints.html">1.4 Subtype constraints</a>
+<li><a href="constraints.html#1.4.1">1.4.1 Single value constraint</a>
+<li><a href="constraints.html#1.4.2">1.4.2 Value range constraint</a>
+<li><a href="constraints.html#1.4.3">1.4.3 Size constraint</a>
+<li><a href="constraints.html#1.4.4">1.4.4 Alphabet constraint</a>
+<li><a href="constraints.html#1.4.5">1.4.5 Constraint combinations</a>
+<li><a href="constraints.html#1.5">1.5 Types relationships</a>
+<li><a href="codecs.html">2. Codecs</a>
+<li><a href="codecs.html#2.1">2.1 Encoders</a>
+<li><a href="codecs.html#2.2">2.2 Decoders</a>
+<li><a href="codecs.html#2.2.1">2.2.1 Decoding untagged types</a>
+<li><a href="codecs.html#2.2.2">2.2.2 Ignoring unknown types</a>
+</ul>
+
+<p>
+Although pyasn1 software is almost a decade old and used in many production
+environments, it still may have bugs and non-implemented pieces. Anyone
+who happens to run into such defect is welcome to complain to
+<a href=mailto:pyasn1-users@lists.sourceforge.net>pyasn1 mailing list</a>
+or better yet fix the issue and send
+<a href=mailto:ilya@glas.net>me</a> the patch.
+</p>
+
+<p>
+Typically, pyasn1 is used for building arbitrary protocol support into
+various applications. This involves manual translation of ASN.1 data
+structures into their pyasn1 implementations. To save time and effort,
+data structures for some of the popular protocols are pre-programmed
+and kept for further re-use in form of the
+<a href=http://sourceforge.net/projects/pyasn1/files/pyasn1-modules/>
+pyasn1-modules package</a>. For instance, many structures for PKI (X.509,
+PKCS#*, CRMF, OCSP), LDAP and SNMP are present.
+Applications authors are advised to import and use relevant modules 
+from that package whenever needed protocol structures are already 
+there. New protocol modules contributions are welcome.
+</p>
+
+<p>
+And finally, the latest pyasn1 package revision is available for free
+download from
+<a href=http://sourceforge.net/projects/pyasn1/>project home</a> and
+also from the 
+<a href=http://pypi.python.org/pypi>Python package repository</a>.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/pyasn1-tutorial.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/pyasn1-tutorial.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/pyasn1-tutorial.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/pyasn1-tutorial.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,2405 @@
+<html>
+<title>
+PyASN1 programmer's manual
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+
+<h3>
+PyASN1 programmer's manual
+</h3>
+
+<p align=right>
+<i>written by <a href=mailto:ilya@glas.net>Ilya Etingof</a>, 2011-2012</i>
+</p>
+
+<p>
+Free and open-source pyasn1 library makes it easier for programmers and
+network engineers to develop, debug and experiment with ASN.1-based protocols
+using Python programming language as a tool.
+</p>
+
+<p>
+Abstract Syntax Notation One 
+(<a href=http://en.wikipedia.org/wiki/Abstract_Syntax_Notation_1x>ASN.1</a>)
+is a set of 
+<a href=http://www.itu.int/ITU-T/studygroups/com17/languages/X.680-X.693-0207w.zip>
+ITU standards</a> concered with provisioning instrumentation for developing
+data exchange protocols in a robust, clear and interoperabable way for
+various IT systems and applications. Most of the efforts are targeting the
+following areas:
+<ul>
+<li>Data structures: the standard introduces a collection of basic data types
+(similar to integers, bits, strings, arrays and records in a programming
+language) that can be used for defining complex, possibly nested data
+structures representing domain-specific data units.
+<li>Serialization protocols: domain-specific data units expressed in ASN.1
+types could be converted into a series of octets for storage or transmission
+over the wire and then recovered back into their structured form on the
+receiving end. This process is immune to various hardware and software
+related dependencies.
+<li>Data description language: could be used to describe particular set of
+domain-specific data structures and their relationships. Such a description
+could be passed to an ASN.1 compiler for automated generation of program
+code that represents ASN.1 data structures in language-native environment
+and handles data serialization issues.
+</ul>
+</p>
+
+<p>
+This tutorial and algorithms, implemented by pyasn1 library, are
+largely based on the information read in the book
+<a href="http://www.oss.com/asn1/dubuisson.html">
+ASN.1 - Communication between heterogeneous systems</a>
+by Olivier Dubuisson. Another relevant resource is
+<a href=ftp://ftp.rsasecurity.com/pub/pkcs/ascii/layman.asc>
+A Layman's Guide to a Subset of ASN.1, BER, and DER</a> by Burton S. Kaliski.
+It's advised to refer to these books for more in-depth knowledge on the
+subject of ASN.1.
+</p>
+
+<p>
+As of this writing, pyasn1 library implements most of standard ASN.1 data
+structures in a rather detailed and feature-rich manner. Another highly
+important capability of the library is its data serialization facilities.
+The last component of the standard - ASN.1 compiler is planned for
+implementation in the future.
+</p>
+
+</p>
+The pyasn1 library was designed to follow the pre-1995 ASN.1 specification
+(also known as X.208). Later, post 1995, revision (X.680) introduced
+significant changes most of which have not yet been supported by pyasn1.
+</p>
+
+<h3>
+Table of contents
+</h3>
+
+<p>
+<ul>
+<li><a href="#1">1. Data model for ASN.1 types</a>
+<li><a href="#1.1">1.1 Scalar types</a>
+<li><a href="#1.1.1">1.1.1 Boolean type</a>
+<li><a href="#1.1.2">1.1.2 Null type</a>
+<li><a href="#1.1.3">1.1.3 Integer type</a>
+<li><a href="#1.1.4">1.1.4 Enumerated type</a>
+<li><a href="#1.1.5">1.1.5 Real type</a>
+<li><a href="#1.1.6">1.1.6 Bit string type</a>
+<li><a href="#1.1.7">1.1.7 OctetString type</a>
+<li><a href="#1.1.8">1.1.8 ObjectIdentifier type</a>
+<li><a href="#1.1.9">1.1.9 Character string types</a>
+<li><a href="#1.1.10">1.1.10 Useful types</a>
+<li><a href="#1.2">1.2 Tagging</a>
+<li><a href="#1.3">1.3 Constructed types</a>
+<li><a href="#1.3.1">1.3.1 Sequence and Set types</a>
+<li><a href="#1.3.2">1.3.2 SequenceOf and SetOf types</a>
+<li><a href="#1.3.3">1.3.3 Choice type</a>
+<li><a href="#1.3.4">1.3.4 Any type</a>
+<li><a href="#1.4">1.4 Subtype constraints</a>
+<li><a href="#1.4.1">1.4.1 Single value constraint</a>
+<li><a href="#1.4.2">1.4.2 Value range constraint</a>
+<li><a href="#1.4.3">1.4.3 Size constraint</a>
+<li><a href="#1.4.4">1.4.4 Alphabet constraint</a>
+<li><a href="#1.4.5">1.4.5 Constraint combinations</a>
+<li><a href="#1.5">1.5 Types relationships</a>
+<li><a href="#2">2. Codecs</a>
+<li><a href="#2.1">2.1 Encoders</a>
+<li><a href="#2.2">2.2 Decoders</a>
+<li><a href="#2.2.1">2.2.1 Decoding untagged types</a>
+<li><a href="#2.2.2">2.2.2 Ignoring unknown types</a>
+<li><a href="#3">3. Feedback and getting help</a>
+</ul>
+
+
+<a name="1"></a>
+<h3>
+1. Data model for ASN.1 types
+</h3>
+
+<p>
+All ASN.1 types could be categorized into two groups: scalar (also called
+simple or primitive) and constructed. The first group is populated by
+well-known types like Integer or String. Members of constructed group
+hold other types (simple or constructed) as their inner components, thus
+they are semantically close to a programming language records or lists.
+</p>
+
+<p>
+In pyasn1, all ASN.1 types and values are implemented as Python objects.
+The same pyasn1 object can represent either ASN.1 type and/or value
+depending of the presense of value initializer on object instantiation.
+We will further refer to these as <i>pyasn1 type object</i> versus <i>pyasn1
+value object</i>.
+</p>
+
+<p>
+Primitive ASN.1 types are implemented as immutable scalar objects. There values
+could be used just like corresponding native Python values (integers,
+strings/bytes etc) and freely mixed with them in expressions.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> asn1IntegerValue = univ.Integer(12)
+>>> asn1IntegerValue - 2
+10
+>>> univ.OctetString('abc') == 'abc'
+True   # Python 2
+>>> univ.OctetString(b'abc') == b'abc'
+True   # Python 3
+</pre>
+</td></tr></table>
+
+<p>
+It would be an error to perform an operation on a pyasn1 type object
+as it holds no value to deal with:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> asn1IntegerType = univ.Integer()
+>>> asn1IntegerType - 2
+...
+pyasn1.error.PyAsn1Error: No value for __coerce__()
+</pre>
+</td></tr></table>
+
+<a name="1.1"></a>
+<h4>
+1.1 Scalar types
+</h4>
+
+<p>
+In the sub-sections that follow we will explain pyasn1 mapping to those
+primitive ASN.1 types. Both, ASN.1 notation and corresponding pyasn1
+syntax will be given in each case.
+</p>
+
+<a name="1.1.1"></a>
+<h4>
+1.1.1 Boolean type
+</h4>
+
+<p>
+This is the simplest type those values could be either True or False.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; type specification
+FunFactorPresent ::= BOOLEAN
+
+;; values declaration and assignment
+pythonFunFactor FunFactorPresent ::= TRUE
+cobolFunFactor FunFactorPresent :: FALSE
+</pre>
+</td></tr></table>
+
+<p>
+And here's pyasn1 version of it:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> class FunFactorPresent(univ.Boolean): pass
+... 
+>>> pythonFunFactor = FunFactorPresent(True)
+>>> cobolFunFactor = FunFactorPresent(False)
+>>> pythonFunFactor
+FunFactorPresent('True(1)')
+>>> cobolFunFactor
+FunFactorPresent('False(0)')
+>>> pythonFunFactor == cobolFunFactor
+False
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.1.2"></a>
+<h4>
+1.1.2 Null type
+</h4>
+
+<p>
+The NULL type is sometimes used to express the absense of any information.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; type specification
+Vote ::= CHOICE {
+  agreed BOOLEAN,
+  skip NULL
+}
+</td></tr></table>
+
+;; value declaration and assignment
+myVote Vote ::= skip:NULL
+</pre>
+
+<p>
+We will explain the CHOICE type later in this paper, meanwhile the NULL
+type:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> skip = univ.Null()
+>>> skip
+Null('')
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.1.3"></a>
+<h4>
+1.1.3 Integer type
+</h4>
+
+<p>
+ASN.1 defines the values of Integer type as negative or positive of whatever
+length. This definition plays nicely with Python as the latter places no
+limit on Integers. However, some ASN.1 implementations may impose certain
+limits of integer value ranges. Keep that in mind when designing new
+data structures.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; values specification
+age-of-universe INTEGER ::= 13750000000
+mean-martian-surface-temperature INTEGER ::= -63
+</pre>
+</td></tr></table>
+
+<p>
+A rather strigntforward mapping into pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> ageOfUniverse = univ.Integer(13750000000)
+>>> ageOfUniverse
+Integer(13750000000)
+>>>
+>>> meanMartianSurfaceTemperature = univ.Integer(-63)
+>>> meanMartianSurfaceTemperature
+Integer(-63)
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+ASN.1 allows to assign human-friendly names to particular values of
+an INTEGER type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Temperature ::= INTEGER {
+  freezing(0),
+  boiling(100) 
+}
+</pre>
+</td></tr></table>
+
+<p>
+The Temperature type expressed in pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedval
+>>> class Temperature(univ.Integer):
+...   namedValues = namedval.NamedValues(('freezing', 0), ('boiling', 100))
+...
+>>> t = Temperature(0)
+>>> t
+Temperature('freezing(0)')
+>>> t + 1
+Temperature(1)
+>>> t + 100
+Temperature('boiling(100)')
+>>> t = Temperature('boiling')
+>>> t
+Temperature('boiling(100)')
+>>> Temperature('boiling') / 2
+Temperature(50)
+>>> -1 < Temperature('freezing')
+True
+>>> 47 > Temperature('boiling')
+False
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+These values labels have no effect on Integer type operations, any value
+still could be assigned to a type (information on value constraints will
+follow further in this paper).
+</p>
+
+<a name="1.1.4"></a>
+<h4>
+1.1.4 Enumerated type
+</h4>
+
+<p>
+ASN.1 Enumerated type differs from an Integer type in a number of ways.
+Most important is that its instance can only hold a value that belongs
+to a set of values specified on type declaration.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+error-status ::= ENUMERATED {
+  no-error(0),
+  authentication-error(10),
+  authorization-error(20),
+  general-failure(51)
+}
+</pre>
+</td></tr></table>
+
+<p>
+When constructing Enumerated type we will use two pyasn1 features: values
+labels (as mentioned above) and value constraint (will be described in
+more details later on).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedval, constraint
+>>> class ErrorStatus(univ.Enumerated):
+...   namedValues = namedval.NamedValues(
+...        ('no-error', 0),
+...        ('authentication-error', 10),
+...        ('authorization-error', 20),
+...        ('general-failure', 51)
+...   )
+...   subtypeSpec = univ.Enumerated.subtypeSpec + \
+...                    constraint.SingleValueConstraint(0, 10, 20, 51)
+...
+>>> errorStatus = univ.ErrorStatus('no-error')
+>>> errorStatus
+ErrorStatus('no-error(0)')
+>>> errorStatus == univ.ErrorStatus('general-failure')
+False
+>>> univ.ErrorStatus('non-existing-state')
+Traceback (most recent call last):
+...
+pyasn1.error.PyAsn1Error: Can't coerce non-existing-state into integer
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Particular integer values associated with Enumerated value states
+have no meaning. They should not be used as such or in any kind of
+math operation. Those integer values are only used by codecs to
+transfer state from one entity to another.
+</p>
+
+<a name="1.1.5"></a>
+<h4>
+1.1.5 Real type
+</h4>
+
+<p>
+Values of the Real type are a three-component tuple of mantissa, base and 
+exponent. All three are integers.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+pi ::= REAL { mantissa 314159, base 10, exponent -5 }
+</pre>
+</td></tr></table>
+
+<p>
+Corresponding pyasn1 objects can be initialized with either a three-component
+tuple or a Python float. Infinite values could be expressed in a way, 
+compatible with Python float type.
+
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> pi = univ.Real((314159, 10, -5))
+>>> pi
+Real((314159, 10,-5))
+>>> float(pi)
+3.14159
+>>> pi == univ.Real(3.14159)
+True
+>>> univ.Real('inf')
+Real('inf')
+>>> univ.Real('-inf') == float('-inf')
+True
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+If a Real object is initialized from a Python float or yielded by a math
+operation, the base is set to decimal 10 (what affects encoding).
+</p>
+
+<a name="1.1.6"></a>
+<h4>
+1.1.6 Bit string type
+</h4>
+
+<p>
+ASN.1 BIT STRING type holds opaque binary data of an arbitrarily length.
+A BIT STRING value could be initialized by either a binary (base 2) or 
+hex (base 16) value.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+public-key BIT STRING ::= '1010111011110001010110101101101
+                           1011000101010000010110101100010
+                           0110101010000111101010111111110'B
+
+signature  BIT STRING ::= 'AF01330CD932093392100B39FF00DE0'H
+</pre>
+</td></tr></table>
+
+<p>
+The pyasn1 BitString objects can initialize from native ASN.1 notation
+(base 2 or base 16 strings) or from a Python tuple of binary components.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> publicKey = univ.BitString(
+...          "'1010111011110001010110101101101"
+...          "1011000101010000010110101100010"
+...          "0110101010000111101010111111110'B"
+)
+>>> publicKey
+BitString("'10101110111100010101101011011011011000101010000010110101100010\
+0110101010000111101010111111110'B")
+>>> signature = univ.BitString(
+...          "'AF01330CD932093392100B39FF00DE0'H"
+... )
+>>> signature
+BitString("'101011110000000100110011000011001101100100110010000010010011001\
+1100100100001000000001011001110011111111100000000110111100000'B")
+>>> fingerprint = univ.BitString(
+...          (1, 0, 1, 1 ,0, 1, 1, 1, 0, 1, 0, 1)
+... )
+>>> fingerprint
+BitString("'101101110101'B")
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Another BIT STRING initialization method supported by ASN.1 notation
+is to specify only 1-th bits along with their human-friendly label
+and bit offset relative to the beginning of the bit string. With this 
+method, all not explicitly mentioned bits are doomed to be zeros.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+bit-mask  BIT STRING ::= {
+  read-flag(0),
+  write-flag(2),
+  run-flag(4)
+}
+</pre>
+</td></tr></table>
+
+<p>
+To express this in pyasn1, we will employ the named values feature (as with
+Enumeration type).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedval
+>>> class BitMask(univ.BitString):
+...   namedValues = namedval.NamedValues(
+...        ('read-flag', 0),
+...        ('write-flag', 2),
+...        ('run-flag', 4)
+... )
+>>> bitMask = BitMask('read-flag,run-flag')
+>>> bitMask
+BitMask("'10001'B")
+>>> tuple(bitMask)
+(1, 0, 0, 0, 1)
+>>> bitMask[4]
+1
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The BitString objects mimic the properties of Python tuple type in part
+of immutable sequence object protocol support.
+</p>
+
+<a name="1.1.7"></a>
+<h4>
+1.1.7 OctetString type
+</h4>
+
+<p>
+The OCTET STRING type is a confusing subject. According to ASN.1
+specification, this type is similar to BIT STRING, the major difference
+is that the former operates in 8-bit chunks of data. What is important
+to note, is that OCTET STRING was NOT designed to handle text strings - the
+standard provides many other types specialized for text content. For that
+reason, ASN.1 forbids to initialize OCTET STRING values with "quoted text
+strings", only binary or hex initializers, similar to BIT STRING ones,
+are allowed.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+thumbnail OCTET STRING ::= '1000010111101110101111000000111011'B
+thumbnail OCTET STRING ::= 'FA9823C43E43510DE3422'H
+</pre>
+</td></tr></table>
+
+<p>
+However, ASN.1 users (e.g. protocols designers) seem to ignore the original
+purpose of the OCTET STRING type - they used it for handling all kinds of
+data, including text strings.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+welcome-message OCTET STRING ::= "Welcome to ASN.1 wilderness!"
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1, we have taken a liberal approach and allowed both BIT STRING
+style and quoted text initializers for the OctetString objects. To avoid
+possible collisions, quoted text is the default initialization syntax.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> thumbnail = univ.OctetString(
+...    binValue='1000010111101110101111000000111011'
+... )
+>>> thumbnail
+OctetString(hexValue='85eebcec0')
+>>> thumbnail = univ.OctetString(
+...    hexValue='FA9823C43E43510DE3422'
+... )
+>>> thumbnail
+OctetString(hexValue='fa9823c43e4351de34220')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Most frequent usage of the OctetString class is to instantiate it with
+a text string.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> welcomeMessage = univ.OctetString('Welcome to ASN.1 wilderness!')
+>>> welcomeMessage
+OctetString(b'Welcome to ASN.1 wilderness!')
+>>> print('%s' % welcomeMessage)
+Welcome to ASN.1 wilderness!
+>>> welcomeMessage[11:16]
+OctetString(b'ASN.1')
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+OctetString objects support the immutable sequence object protocol.
+In other words, they behave like Python 3 bytes (or Python 2 strings).
+</p>
+
+<p>
+When running pyasn1 on Python 3, it's better to use the bytes objects for
+OctetString instantiation, as it's more reliable and efficient.
+</p>
+
+<p>
+Additionally, OctetString's can also be instantiated with a sequence of
+8-bit integers (ASCII codes).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> univ.OctetString((77, 101, 101, 103, 111))
+OctetString(b'Meego')
+</pre>
+</td></tr></table>
+
+<p>
+It is sometimes convenient to express OctetString instances as 8-bit
+characters (Python 3 bytes or Python 2 strings) or 8-bit integers.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> octetString = univ.OctetString('ABCDEF')
+>>> octetString.asNumbers()
+(65, 66, 67, 68, 69, 70)
+>>> octetString.asOctets()
+b'ABCDEF'
+</pre>
+</td></tr></table>
+
+<a name="1.1.8"></a>
+<h4>
+1.1.8 ObjectIdentifier type
+</h4>
+
+<p>
+Values of the OBJECT IDENTIFIER type are sequences of integers that could
+be used to identify virtually anything in the world. Various ASN.1-based
+protocols employ OBJECT IDENTIFIERs for their own identification needs.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+internet-id OBJECT IDENTIFIER ::= {
+  iso(1) identified-organization(3) dod(6) internet(1)
+}
+</pre>
+</td></tr></table>
+
+<p>
+One of the natural ways to map OBJECT IDENTIFIER type into a Python
+one is to use Python tuples of integers. So this approach is taken by
+pyasn1.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> internetId = univ.ObjectIdentifier((1, 3, 6, 1))
+>>> internetId
+ObjectIdentifier('1.3.6.1')
+>>> internetId[2]
+6
+>>> internetId[1:3]
+ObjectIdentifier('3.6')
+</pre>
+</td></tr></table>
+
+<p>
+A more human-friendly "dotted" notation is also supported.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> univ.ObjectIdentifier('1.3.6.1')
+ObjectIdentifier('1.3.6.1')
+</pre>
+</td></tr></table>
+
+<p>
+Symbolic names of the arcs of object identifier, sometimes present in
+ASN.1 specifications, are not preserved and used in pyasn1 objects.
+</p>
+
+<p>
+The ObjectIdentifier objects mimic the properties of Python tuple type in
+part of immutable sequence object protocol support.
+</p>
+
+<a name="1.1.9"></a>
+<h4>
+1.1.9 Character string types
+</h4>
+
+<p>
+ASN.1 standard introduces a diverse set of text-specific types. All of them
+were designed to handle various types of characters. Some of these types seem
+be obsolete nowdays, as their target technologies are gone. Another issue
+to be aware of is that raw OCTET STRING type is sometimes used in practice
+by ASN.1 users instead of specialized character string types, despite
+explicit prohibition imposed by ASN.1 specification.
+</p>
+
+<p>
+The two types are specific to ASN.1 are NumericString and PrintableString.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+welcome-message ::= PrintableString {
+  "Welcome to ASN.1 text types"
+}
+
+dial-pad-numbers ::= NumericString {
+  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+}
+</pre>
+</td></tr></table>
+
+<p>
+Their pyasn1 implementations are:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char
+>>> '%s' % char.PrintableString("Welcome to ASN.1 text types")
+'Welcome to ASN.1 text types'
+>>> dialPadNumbers = char.NumericString(
+      "0" "1" "2" "3" "4" "5" "6" "7" "8" "9"
+)
+>>> dialPadNumbers
+NumericString(b'0123456789')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The following types came to ASN.1 from ISO standards on character sets.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char
+>>> char.VisibleString("abc")
+VisibleString(b'abc')
+>>> char.IA5String('abc')
+IA5String(b'abc')
+>>> char.TeletexString('abc')
+TeletexString(b'abc')
+>>> char.VideotexString('abc')
+VideotexString(b'abc')
+>>> char.GraphicString('abc')
+GraphicString(b'abc')
+>>> char.GeneralString('abc')
+GeneralString(b'abc')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The last three types are relatively recent addition to the family of
+character string types: UniversalString, BMPString, UTF8String.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char
+>>> char.UniversalString("abc")
+UniversalString(b'abc')
+>>> char.BMPString('abc')
+BMPString(b'abc')
+>>> char.UTF8String('abc')
+UTF8String(b'abc')
+>>> utf8String = char.UTF8String('У попа была �обака')
+>>> utf8String
+UTF8String(b'\xd0\xa3 \xd0\xbf\xd0\xbe\xd0\xbf\xd0\xb0 \xd0\xb1\xd1\x8b\xd0\xbb\xd0\xb0 \
+\xd1\x81\xd0\xbe\xd0\xb1\xd0\xb0\xd0\xba\xd0\xb0')
+>>> print(utf8String)
+У попа была �обака
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1, all character type objects behave like Python strings. None of
+them is currently constrained in terms of valid alphabet so it's up to
+the data source to keep an eye on data validation for these types.
+</p>
+
+<a name="1.1.10"></a>
+<h4>
+1.1.10 Useful types
+</h4>
+
+<p>
+There are three so-called useful types defined in the standard:
+ObjectDescriptor, GeneralizedTime, UTCTime. They all are subtypes
+of GraphicString or VisibleString types therefore useful types are
+character string types.
+</p>
+
+<p>
+It's advised by the ASN.1 standard to have an instance of ObjectDescriptor
+type holding a human-readable description of corresponding instance of
+OBJECT IDENTIFIER type. There are no formal linkage between these instances
+and provision for ObjectDescriptor uniqueness in the standard.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import useful
+>>> descrBER = useful.ObjectDescriptor(
+      "Basic encoding of a single ASN.1 type"
+)
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+GeneralizedTime and UTCTime types are designed to hold a human-readable
+timestamp in a universal and unambiguous form. The former provides
+more flexibility in notation while the latter is more strict but has
+Y2K issues.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; Mar 8 2010 12:00:00 MSK
+moscow-time GeneralizedTime ::= "20110308120000.0"
+;; Mar 8 2010 12:00:00 UTC
+utc-time GeneralizedTime ::= "201103081200Z"
+;; Mar 8 1999 12:00:00 UTC
+utc-time UTCTime ::= "9803081200Z"
+</pre>
+</td></tr></table>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import useful
+>>> moscowTime = useful.GeneralizedTime("20110308120000.0")
+>>> utcTime = useful.UTCTime("9803081200Z")
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Despite their intended use, these types possess no special, time-related,
+handling in pyasn1. They are just printable strings.
+</p>
+
+<a name="1.2"></a>
+<h4>
+1.2 Tagging
+</h4>
+
+<p>
+In order to continue with the Constructed ASN.1 types, we will first have
+to introduce the concept of tagging (and its pyasn1 implementation), as
+some of the Constructed types rely upon the tagging feature.
+</p>
+
+<p>
+When a value is coming into an ASN.1-based system (received from a network
+or read from some storage), the receiving entity has to determine the
+type of the value to interpret and verify it accordingly.
+</p>
+
+<p>
+Historically, the first data serialization protocol introduced in
+ASN.1 was BER (Basic Encoding Rules). According to BER, any serialized
+value is packed into a triplet of (Type, Length, Value) where Type is a 
+code that identifies the value (which is called <i>tag</i> in ASN.1),
+length is the number of bytes occupied by the value in its serialized form
+and value is ASN.1 value in a form suitable for serial transmission or storage.
+</p>
+
+<p>
+For that reason almost every ASN.1 type has a tag (which is actually a
+BER type) associated with it by default.
+</p>
+
+<p>
+An ASN.1 tag could be viewed as a tuple of three numbers:
+(Class, Format, Number). While Number identifies a tag, Class component 
+is used to create scopes for Numbers. Four scopes are currently defined:
+UNIVERSAL, context-specific, APPLICATION and PRIVATE. The Format component
+is actually a one-bit flag - zero for tags associated with scalar types,
+and one for constructed types (will be discussed later on).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MyIntegerType ::= [12] INTEGER
+MyOctetString ::= [APPLICATION 0] OCTET STRING
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1, tags are implemented as immutable, tuple-like objects:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import tag
+>>> myTag = tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10)
+>>> myTag
+Tag(tagClass=128, tagFormat=0, tagId=10)
+>>> tuple(myTag)
+(128, 0, 10)
+>>> myTag[2]
+10
+>>> myTag == tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 10)
+False
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Default tag, associated with any ASN.1 type, could be extended or replaced
+to make new type distinguishable from its ancestor. The standard provides
+two modes of tag mangling - IMPLICIT and EXPLICIT.
+</p>
+
+<p>
+EXPLICIT mode works by appending new tag to the existing ones thus creating
+an ordered set of tags. This set will be considered as a whole for type
+identification and encoding purposes. Important property of EXPLICIT tagging
+mode is that it preserves base type information in encoding what makes it
+possible to completely recover type information from encoding.
+</p>
+
+<p>
+When tagging in IMPLICIT mode, the outermost existing tag is dropped and
+replaced with a new one.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MyIntegerType ::= [12] IMPLICIT INTEGER
+MyOctetString ::= [APPLICATION 0] EXPLICIT OCTET STRING
+</pre>
+</td></tr></table>
+
+<p>
+To model both modes of tagging, a specialized container TagSet object (holding
+zero, one or more Tag objects) is used in pyasn1.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import tag
+>>> tagSet = tag.TagSet(
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10), # base tag
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10)  # effective tag
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10))
+>>> tagSet.getBaseTag()
+Tag(tagClass=128, tagFormat=0, tagId=10)
+>>> tagSet = tagSet.tagExplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 20)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10), 
+       Tag(tagClass=128, tagFormat=32, tagId=20))
+>>> tagSet = tagSet.tagExplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 30)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10), 
+       Tag(tagClass=128, tagFormat=32, tagId=20), 
+       Tag(tagClass=128, tagFormat=32, tagId=30))
+>>> tagSet = tagSet.tagImplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 40)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10),
+       Tag(tagClass=128, tagFormat=32, tagId=20),
+       Tag(tagClass=128, tagFormat=32, tagId=40))
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+As a side note: the "base tag" concept (accessible through the getBaseTag()
+method) is specific to pyasn1 -- the base tag is used to identify the original
+ASN.1 type of an object in question. Base tag is never occurs in encoding
+and is mostly used internally by pyasn1 for choosing type-specific data 
+processing algorithms. The "effective tag" is the one that always appears in
+encoding and is used on tagSets comparation.
+</p>
+
+<p>
+Any two TagSet objects could be compared to see if one is a derivative
+of the other. Figuring this out is also useful in cases when a type-specific
+data processing algorithms are to be chosen.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import tag
+>>> tagSet1 = tag.TagSet(
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10) # base tag
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10) # effective tag
+... )
+>>> tagSet2 = tagSet1.tagExplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 20)
+... )
+>>> tagSet1.isSuperTagSetOf(tagSet2)
+True
+>>> tagSet2.isSuperTagSetOf(tagSet1)
+False
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+We will complete this discussion on tagging with a real-world example. The
+following ASN.1 tagged type:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MyIntegerType ::= [12] EXPLICIT INTEGER
+</pre>
+</td></tr></table>
+
+<p>
+could be expressed in pyasn1 like this:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, tag
+>>> class MyIntegerType(univ.Integer):
+...   tagSet = univ.Integer.tagSet.tagExplicitly(
+...        tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 12)
+...        )
+>>> myInteger = MyIntegerType(12345)
+>>> myInteger.getTagSet()
+TagSet(Tag(tagClass=0, tagFormat=0, tagId=2), 
+       Tag(tagClass=128, tagFormat=32, tagId=12))
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Referring to the above code, the tagSet class attribute is a property of any
+pyasn1 type object that assigns default tagSet to a pyasn1 value object. This
+default tagSet specification can be ignored and effectively replaced by some
+other tagSet value passed on object instantiation.
+</p>
+
+<p>
+It's important to understand that the tag set property of pyasn1 type/value
+object can never be modifed in place. In other words, a pyasn1 type/value
+object can never change its tags. The only way is to create a new pyasn1
+type/value object and associate different tag set with it.
+</p>
+
+
+<a name="1.3"></a>
+<h4>
+1.3 Constructed types
+</h4>
+
+<p>
+Besides scalar types, ASN.1 specifies so-called constructed ones - these
+are capable of holding one or more values of other types, both scalar
+and constructed.
+</p>
+
+<p>
+In pyasn1 implementation, constructed ASN.1 types behave like 
+Python sequences, and also support additional component addressing methods,
+specific to particular constructed type.
+</p>
+
+<a name="1.3.1"></a>
+<h4>
+1.3.1 Sequence and Set types
+</h4>
+
+<p>
+The Sequence and Set types have many similar properties:
+</p>
+<ul>
+<li>they can hold any number of inner components of different types
+<li>every component has a human-friendly identifier
+<li>any component can have a default value
+<li>some components can be absent.
+</ul>
+
+<p>
+However, Sequence type guarantees the ordering of Sequence value components
+to match their declaration order. By contrast, components of the
+Set type can be ordered to best suite application's needs.
+<p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Record ::= SEQUENCE {
+  id        INTEGER,
+  room  [0] INTEGER OPTIONAL,
+  house [1] INTEGER DEFAULT 0
+}
+</pre>
+</td></tr></table>
+
+<p>
+Up to this moment, the only method we used for creating new pyasn1 types
+is Python sub-classing. With this method, a new, named Python class is created
+what mimics type derivation in ASN.1 grammar. However, ASN.1 also allows for
+defining anonymous subtypes (room and house components in the example above).
+To support anonymous subtyping in pyasn1, a cloning operation on an existing
+pyasn1 type object can be invoked what creates a new instance of original
+object with possibly modified properties.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype, tag
+>>> class Record(univ.Sequence):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('id', univ.Integer()),
+...     namedtype.OptionalNamedType(
+...       'room',
+...       univ.Integer().subtype(implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))
+...     ),
+...     namedtype.DefaultedNamedType(
+...       'house', 
+...       univ.Integer(0).subtype(implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))
+...     )
+...   )
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+All pyasn1 constructed type classes have a class attribute <b>componentType</b>
+that represent default type specification. Its value is a NamedTypes object.
+</p>
+
+<p>
+The NamedTypes class instance holds a sequence of NameType, OptionalNamedType
+or DefaultedNamedType objects which, in turn, refer to pyasn1 type objects that
+represent inner SEQUENCE components specification.
+</p>
+
+<p>
+Finally, invocation of a subtype() method of pyasn1 type objects in the code
+above returns an implicitly tagged copy of original object.
+</p>
+
+<p>
+Once a SEQUENCE or SET type is decleared with pyasn1, it can be instantiated
+and initialized (continuing the above code):
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> record = Record()
+>>> record.setComponentByName('id', 123)
+>>> print(record.prettyPrint())
+Record:
+ id=123
+>>> 
+>>> record.setComponentByPosition(1, 321)
+>>> print(record.prettyPrint())
+Record:
+ id=123
+ room=321
+>>>
+>>> record.setDefaultComponents()
+>>> print(record.prettyPrint())
+Record:
+ id=123
+ room=321
+ house=0
+</pre>
+</td></tr></table>
+
+<p>
+Inner components of pyasn1 Sequence/Set objects could be accessed using the
+following methods:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> record.getComponentByName('id')
+Integer(123)
+>>> record.getComponentByPosition(1)
+Integer(321)
+>>> record[2]
+Integer(0)
+>>> for idx in range(len(record)):
+...   print(record.getNameByPosition(idx), record.getComponentByPosition(idx))
+id 123
+room 321
+house 0
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The Set type share all the properties of Sequence type, and additionally
+support by-tag component addressing (as all Set components have distinct
+types).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype, tag
+>>> class Gamer(univ.Set):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('score', univ.Integer()),
+...     namedtype.NamedType('player', univ.OctetString()),
+...     namedtype.NamedType('id', univ.ObjectIdentifier())
+...   )
+>>> gamer = Gamer()
+>>> gamer.setComponentByType(univ.Integer().getTagSet(), 121343)
+>>> gamer.setComponentByType(univ.OctetString().getTagSet(), 'Pascal')
+>>> gamer.setComponentByType(univ.ObjectIdentifier().getTagSet(), (1,3,7,2))
+>>> print(gamer.prettyPrint())
+Gamer:
+ score=121343
+ player=b'Pascal'
+ id=1.3.7.2
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.3.2"></a>
+<h4>
+1.3.2 SequenceOf and SetOf types
+</h4>
+
+<p>
+Both, SequenceOf and SetOf types resemble an unlimited size list of components.
+All the components must be of the same type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Progression ::= SEQUENCE OF INTEGER
+
+arithmeticProgression Progression ::= { 1, 3, 5, 7 }
+</pre>
+</td></tr></table>
+
+<p>
+SequenceOf and SetOf types are expressed by the very similar pyasn1 type 
+objects. Their components can only be addressed by position and they
+both have a property of automatic resize.
+</p>
+
+<p>
+To specify inner component type, the <b>componentType</b> class attribute
+should refer to another pyasn1 type object.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> class Progression(univ.SequenceOf):
+...   componentType = univ.Integer()
+>>> arithmeticProgression = Progression()
+>>> arithmeticProgression.setComponentByPosition(1, 111)
+>>> print(arithmeticProgression.prettyPrint())
+Progression:
+-empty- 111
+>>> arithmeticProgression.setComponentByPosition(0, 100)
+>>> print(arithmeticProgression.prettyPrint())
+Progression:
+100 111
+>>>
+>>> for idx in range(len(arithmeticProgression)):
+...    arithmeticProgression.getComponentByPosition(idx)
+Integer(100)
+Integer(111)
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Any scalar or constructed pyasn1 type object can serve as an inner component.
+Missing components are prohibited in SequenceOf/SetOf value objects.
+</p>
+
+<a name="1.3.3"></a>
+<h4>
+1.3.3 Choice type
+</h4>
+
+<p>
+Values of ASN.1 CHOICE type can contain only a single value of a type from a 
+list of possible alternatives. Alternatives must be ASN.1 types with
+distinct tags for the whole structure to remain unambiguous. Unlike most
+other types, CHOICE is an untagged one, e.g. it has no base tag of its own.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+CodeOrMessage ::= CHOICE {
+  code    INTEGER,
+  message OCTET STRING
+}
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1 implementation, Choice object behaves like Set but accepts only
+a single inner component at a time. It also offers a few additional methods
+specific to its behaviour.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype
+>>> class CodeOrMessage(univ.Choice):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('code', univ.Integer()),
+...     namedtype.NamedType('message', univ.OctetString())
+...   )
+>>>
+>>> codeOrMessage = CodeOrMessage()
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+>>> codeOrMessage.setComponentByName('code', 123)
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ code=123
+>>> codeOrMessage.setComponentByName('message', 'my string value')
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ message=b'my string value'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Since there could be only a single inner component value in the pyasn1 Choice
+value object, either of the following methods could be used for fetching it
+(continuing previous code):
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> codeOrMessage.getName()
+'message'
+>>> codeOrMessage.getComponent()
+OctetString(b'my string value')
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.3.4"></a>
+<h4>
+1.3.4 Any type
+</h4>
+
+<p>
+The ASN.1 ANY type is a kind of wildcard or placeholder that matches
+any other type without knowing it in advance. Like CHOICE type, ANY
+has no base tag.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Error ::= SEQUENCE {
+  code      INTEGER,
+  parameter ANY DEFINED BY code
+}
+</pre>
+</td></tr></table>
+
+<p>
+The ANY type is frequently used in specifications, where exact type is not
+yet agreed upon between communicating parties or the number of possible
+alternatives of a type is infinite.
+Sometimes an auxiliary selector is kept around to help parties indicate
+the kind of ANY payload in effect ("code" in the example above).
+</p>
+
+<p>
+Values of the ANY type contain serialized ASN.1 value(s) in form of
+an octet string. Therefore pyasn1 Any value object share the properties of
+pyasn1 OctetString object.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> someValue = univ.Any(b'\x02\x01\x01')
+>>> someValue
+Any(b'\x02\x01\x01')
+>>> str(someValue)
+'\x02\x01\x01'
+>>> bytes(someValue)
+b'\x02\x01\x01'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Receiving application is supposed to explicitly deserialize the content of Any
+value object, possibly using auxiliary selector for figuring out its ASN.1
+type to pick appropriate decoder.
+</p>
+
+<p>
+There will be some more talk and code snippets covering Any type in the codecs
+chapters that follow.
+</p>
+
+<a name="1.4"></a>
+<h4>
+1.4 Subtype constraints
+</h4>
+
+<p>
+Most ASN.1 types can correspond to an infinite set of values. To adapt to
+particular application's data model and needs, ASN.1 provides a mechanism
+for limiting the infinite set to values, that make sense in particular case.
+</p>
+
+<p>
+Imposing value constraints on an ASN.1 type can also be seen as creating
+a subtype from its base type.
+</p>
+
+<p>
+In pyasn1, constraints take shape of immutable objects capable
+of evaluating given value against constraint-specific requirements.
+Constraint object is a property of pyasn1 type. Like TagSet property,
+associated with every pyasn1 type, constraints can never be modified
+in place. The only way to modify pyasn1 type constraint is to associate
+new constraint object to a new pyasn1 type object.
+</p>
+
+<p>
+A handful of different flavors of <i>constraints</i> are defined in ASN.1.
+We will discuss them one by one in the following chapters and also explain
+how to combine and apply them to types.
+</p>
+
+<a name="1.4.1"></a>
+<h4>
+1.4.1 Single value constraint
+</h4>
+
+<p>
+This kind of constraint allows for limiting type to a finite, specified set
+of values.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+DialButton ::= OCTET STRING (
+  "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
+)
+</pre>
+</td></tr></table>
+
+<p>
+Its pyasn1 implementation would look like:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import constraint
+>>> c = constraint.SingleValueConstraint(
+  '0','1','2','3','4','5','6','7','8','9'
+)
+>>> c
+SingleValueConstraint(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+>>> c('0')
+>>> c('A')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError: 
+  SingleValueConstraint(0, 1, 2, 3, 4, 5, 6, 7, 8, 9) failed at: A
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+As can be seen in the snippet above, if a value violates the constraint, an
+exception will be thrown. A constrainted pyasn1 type object holds a
+reference to a constraint object (or their combination, as will be explained
+later) and calls it for value verification.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class DialButton(univ.OctetString):
+...   subtypeSpec = constraint.SingleValueConstraint(
+...       '0','1','2','3','4','5','6','7','8','9'
+...   )
+>>> DialButton('0')
+DialButton(b'0')
+>>> DialButton('A')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  SingleValueConstraint(0, 1, 2, 3, 4, 5, 6, 7, 8, 9) failed at: A
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Constrained pyasn1 value object can never hold a violating value.
+</p>
+
+<a name="1.4.2"></a>
+<h4>
+1.4.2 Value range constraint
+</h4>
+
+<p>
+A pair of values, compliant to a type to be constrained, denote low and upper
+bounds of allowed range of values of a type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Teenagers ::= INTEGER (13..19)
+</pre>
+</td></tr></table>
+
+<p>
+And in pyasn1 terms:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class Teenagers(univ.Integer):
+...   subtypeSpec = constraint.ValueRangeConstraint(13, 19)
+>>> Teenagers(14)
+Teenagers(14)
+>>> Teenagers(20)
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ValueRangeConstraint(13, 19) failed at: 20
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Value range constraint usually applies numeric types.
+</p>
+
+<a name="1.4.3"></a>
+<h4>
+1.4.3 Size constraint
+</h4>
+
+<p>
+It is sometimes convenient to set or limit the allowed size of a data item
+to be sent from one application to another to manage bandwidth and memory
+consumption issues. Size constraint specifies the lower and upper bounds 
+of the size of a valid value.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+TwoBits ::= BIT STRING (SIZE (2))
+</pre>
+</td></tr></table>
+
+<p>
+Express the same grammar in pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class TwoBits(univ.BitString):
+...   subtypeSpec = constraint.ValueSizeConstraint(2, 2)
+>>> TwoBits((1,1))
+TwoBits("'11'B")
+>>> TwoBits((1,1,0))
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ValueSizeConstraint(2, 2) failed at: (1, 1, 0)
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Size constraint can be applied to potentially massive values - bit or octet
+strings, SEQUENCE OF/SET OF values.
+</p>
+
+<a name="1.4.4"></a>
+<h4>
+1.4.4 Alphabet constraint
+</h4>
+
+<p>
+The permitted alphabet constraint is similar to Single value constraint
+but constraint applies to individual characters of a value. 
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MorseCode ::= PrintableString (FROM ("."|"-"|" "))
+</pre>
+</td></tr></table>
+
+<p>
+And in pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char, constraint
+>>> class MorseCode(char.PrintableString):
+...   subtypeSpec = constraint.PermittedAlphabetConstraint(".", "-", " ")
+>>> MorseCode("...---...")
+MorseCode('...---...')
+>>> MorseCode("?")
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  PermittedAlphabetConstraint(".", "-", " ") failed at: "?"
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Current implementation does not handle ranges of characters in constraint
+(FROM "A".."Z" syntax), one has to list the whole set in a range.
+</p>
+
+<a name="1.4.5"></a>
+<h4>
+1.4.5 Constraint combinations
+</h4>
+
+<p>
+Up to this moment, we used a single constraint per ASN.1 type. The standard,
+however, allows for combining multiple individual constraints into
+intersections, unions and exclusions.
+</p>
+
+<p>
+In pyasn1 data model, all of these methods of constraint combinations are
+implemented as constraint-like objects holding individual constraint (or
+combination) objects. Like terminal constraint objects, combination objects
+are capable to perform value verification at its set of enclosed constraints
+according to the logic of particular combination.
+</p>
+
+<p>
+Constraints intersection verification succeeds only if a value is
+compliant to each constraint in a set. To begin with, the following
+specification will constitute a valid telephone number:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+PhoneNumber ::= NumericString (FROM ("0".."9")) (SIZE 11)
+</pre>
+</td></tr></table>
+
+<p>
+Constraint intersection object serves the logic above:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char, constraint
+>>> class PhoneNumber(char.NumericString):
+...   subtypeSpec = constraint.ConstraintsIntersection(
+...     constraint.PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9'),
+...     constraint.ValueSizeConstraint(11, 11)
+...   )
+>>> PhoneNumber('79039343212')
+PhoneNumber('79039343212')
+>>> PhoneNumber('?9039343212')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsIntersection(
+    PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9'),
+      ValueSizeConstraint(11, 11)) failed at: 
+   PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9') failed at: "?039343212"
+>>> PhoneNumber('9343212')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsIntersection(
+    PermittedAlphabetConstraint('0','1','2','3','4','5','6','7','8','9'),
+      ValueSizeConstraint(11, 11)) failed at:
+  ValueSizeConstraint(10, 10) failed at: "9343212"
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Union of constraints works by making sure that a value is compliant
+to any of the constraint in a set. For instance:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+CapitalOrSmall ::= IA5String (FROM ('A','B','C') | FROM ('a','b','c'))
+</pre>
+</td></tr></table>
+
+<p>
+It's important to note, that a value must fully comply to any single
+constraint in a set. In the specification above, a value of all small or
+all capital letters is compliant, but a mix of small&capitals is not. 
+Here's its pyasn1 analogue:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char, constraint
+>>> class CapitalOrSmall(char.IA5String):
+...   subtypeSpec = constraint.ConstraintsUnion(
+...     constraint.PermittedAlphabetConstraint('A','B','C'),
+...     constraint.PermittedAlphabetConstraint('a','b','c')
+...   )
+>>> CapitalOrSmall('ABBA')
+CapitalOrSmall('ABBA')
+>>> CapitalOrSmall('abba')
+CapitalOrSmall('abba')
+>>> CapitalOrSmall('Abba')
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsUnion(PermittedAlphabetConstraint('A', 'B', 'C'),
+    PermittedAlphabetConstraint('a', 'b', 'c')) failed at: failed for "Abba"
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Finally, the exclusion constraint simply negates the logic of value 
+verification at a constraint. In the following example, any integer value
+is allowed in a type but not zero.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+NoZero ::= INTEGER (ALL EXCEPT 0)
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1 the above definition would read:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> class NoZero(univ.Integer):
+...   subtypeSpec = constraint.ConstraintsExclusion(
+...     constraint.SingleValueConstraint(0)
+...   )
+>>> NoZero(1)
+NoZero(1)
+>>> NoZero(0)
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ConstraintsExclusion(SingleValueConstraint(0)) failed at: 0
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The depth of such a constraints tree, built with constraint combination objects
+at its nodes, has not explicit limit. Value verification is performed in a
+recursive manner till a definite solution is found.
+</p>
+
+<a name="1.5"></a>
+<h4>
+1.5 Types relationships
+</h4>
+
+<p>
+In the course of data processing in an application, it is sometimes
+convenient to figure out the type relationships between pyasn1 type or
+value objects. Formally, two things influence pyasn1 types relationship:
+<i>tag set</i> and <i>subtype constraints</i>. One pyasn1 type is considered
+to be a derivative of another if their TagSet and Constraint objects are
+a derivation of one another.
+</p>
+
+<p>
+The following example illustrates the concept (we use the same tagset but
+different constraints for simplicity):
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> i1 = univ.Integer(subtypeSpec=constraint.ValueRangeConstraint(3,8))
+>>> i2 = univ.Integer(subtypeSpec=constraint.ConstraintsIntersection(
+...    constraint.ValueRangeConstraint(3,8),
+...    constraint.ValueRangeConstraint(4,7)
+... ) )
+>>> i1.isSameTypeWith(i2)
+False
+>>> i1.isSuperTypeOf(i2)
+True
+>>> i1.isSuperTypeOf(i1)
+True
+>>> i2.isSuperTypeOf(i1)
+False
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+As can be seen in the above code snippet, there are two methods of any pyasn1
+type/value object that test types for their relationship:
+<b>isSameTypeWith</b>() and <b>isSuperTypeOf</b>(). The former is 
+self-descriptive while the latter yields true if the argument appears
+to be a pyasn1 object which has tagset and constraints derived from those
+of the object being called.
+</p>
+
+<a name="2"></a>
+<h3>
+2. Codecs
+</h3>
+
+<p>
+In ASN.1 context, 
+<a href=http://en.wikipedia.org/wiki/Codec>codec</a>
+is a program that transforms between concrete data structures and a stream
+of octets, suitable for transmission over the wire. This serialized form of
+data is sometimes called <i>substrate</i> or <i>essence</i>.
+</p>
+
+<p>
+In pyasn1 implementation, substrate takes shape of Python 3 bytes or 
+Python 2 string objects.
+</p>
+
+<p>
+One of the properties of a codec is its ability to cope with incomplete
+data and/or substrate what implies codec to be stateful. In other words, 
+when decoder runs out of substrate and data item being recovered is still 
+incomplete, stateful codec would suspend and complete data item recovery 
+whenever the rest of substrate becomes available. Similarly, stateful encoder
+would encode data items in multiple steps waiting for source data to
+arrive. Codec restartability is especially important when application deals
+with large volumes of data and/or runs on low RAM. For an interesting
+discussion on codecs options and design choices, refer to
+<a href=http://directory.apache.org/subprojects/asn1/>Apache ASN.1 project</a>
+.
+</p>
+
+<p>
+As of this writing, codecs implemented in pyasn1 are all stateless, mostly
+to keep the code simple.
+</p>
+
+<p>
+The pyasn1 package currently supports 
+<a href=http://en.wikipedia.org/wiki/Basic_encoding_rules>BER</a> codec and
+its variations -- 
+<a href=http://en.wikipedia.org/wiki/Canonical_encoding_rules>CER</a> and
+<a href=http://en.wikipedia.org/wiki/Distinguished_encoding_rules>DER</a>.
+More ASN.1 codecs are planned for implementation in the future.
+</p>
+
+<a name="2.1"></a>
+<h4>
+2.1 Encoders
+</h4>
+
+<p>
+Encoder is used for transforming pyasn1 value objects into substrate. Only
+pyasn1 value objects could be serialized, attempts to process pyasn1 type
+objects will cause encoder failure.
+</p>
+
+<p>
+The following code will create a pyasn1 Integer object and serialize it with
+BER encoder:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder
+>>> encoder.encode(univ.Integer(123456))
+b'\x02\x03\x01\xe2@'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+BER standard also defines a so-called <i>indefinite length</i> encoding form
+which makes large data items processing more memory efficient. It is mostly
+useful when encoder does not have the whole value all at once and the
+length of the value can not be determined at the beginning of encoding.
+</p>
+
+<p>
+<i>Constructed encoding</i> is another feature of BER closely related to the
+indefinite length form. In essence, a large scalar value (such as ASN.1
+character BitString type) could be chopped into smaller chunks by encoder
+and transmitted incrementally to limit memory consumption. Unlike indefinite
+length case, the length of the whole value must be known in advance when
+using constructed, definite length encoding form.
+</p>
+
+<p>
+Since pyasn1 codecs are not restartable, pyasn1 encoder may only encode data
+item all at once. However, even in this case, generating indefinite length 
+encoding may help a low-memory receiver, running a restartable decoder,
+to process a large data item.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder
+>>> encoder.encode(
+...   univ.OctetString('The quick brown fox jumps over the lazy dog'),
+...   defMode=False,
+...   maxChunkSize=8
+... )
+b'$\x80\x04\x08The quic\x04\x08k brown \x04\x08fox jump\x04\x08s over \
+t\x04\x08he lazy \x04\x03dog\x00\x00'
+>>>
+>>> encoder.encode(
+...   univ.OctetString('The quick brown fox jumps over the lazy dog'),
+...   maxChunkSize=8
+... )
+b'$7\x04\x08The quic\x04\x08k brown \x04\x08fox jump\x04\x08s over \
+t\x04\x08he lazy \x04\x03dog'
+</pre>
+</td></tr></table>
+
+<p>
+The <b>defMode</b> encoder parameter disables definite length encoding mode,
+while the optional <b>maxChunkSize</b> parameter specifies desired
+substrate chunk size that influences memory requirements at the decoder's end.
+</p>
+
+<p>
+To use CER or DER encoders one needs to explicitly import and call them - the
+APIs are all compatible.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder as ber_encoder
+>>> from pyasn1.codec.cer import encoder as cer_encoder
+>>> from pyasn1.codec.der import encoder as der_encoder
+>>> ber_encoder.encode(univ.Boolean(True))
+b'\x01\x01\x01'
+>>> cer_encoder.encode(univ.Boolean(True))
+b'\x01\x01\xff'
+>>> der_encoder.encode(univ.Boolean(True))
+b'\x01\x01\xff'
+>>>
+</pre>
+</td></tr></table>
+
+<a name="2.2"></a>
+<h4>
+2.2 Decoders
+</h4>
+
+<p>
+In the process of decoding, pyasn1 value objects are created and linked to
+each other, based on the information containted in the substrate. Thus,
+the original pyasn1 value object(s) are recovered.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> substrate = encoder.encode(univ.Boolean(True))
+>>> decoder.decode(substrate)
+(Boolean('True(1)'), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Commenting on the code snippet above, pyasn1 decoder accepts substrate
+as an argument and returns a tuple of pyasn1 value object (possibly
+a top-level one in case of constructed object) and unprocessed part
+of input substrate.
+</p>
+
+<p>
+All pyasn1 decoders can handle both definite and indefinite length
+encoding modes automatically, explicit switching into one mode
+to another is not required.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> substrate = encoder.encode(
+...   univ.OctetString('The quick brown fox jumps over the lazy dog'),
+...   defMode=False,
+...   maxChunkSize=8
+... )
+>>> decoder.decode(substrate)
+(OctetString(b'The quick brown fox jumps over the lazy dog'), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Speaking of BER/CER/DER encoding, in many situations substrate may not contain
+all necessary information needed for complete and accurate ASN.1 values
+recovery. The most obvious cases include implicitly tagged ASN.1 types
+and constrained types.
+</p>
+
+<p>
+As discussed earlier in this handbook, when an ASN.1 type is implicitly
+tagged, previous outermost tag is lost and never appears in substrate.
+If it is the base tag that gets lost, decoder is unable to pick type-specific
+value decoder at its table of built-in types, and therefore recover
+the value part, based only on the information contained in substrate. The
+approach taken by pyasn1 decoder is to use a prototype pyasn1 type object (or
+a set of them) to <i>guide</i> the decoding process by matching [possibly
+incomplete] tags recovered from substrate with those found in prototype pyasn1
+type objects (also called pyasn1 specification object further in this paper).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.codec.ber import decoder
+>>> decoder.decode(b'\x02\x01\x0c', asn1Spec=univ.Integer())
+Integer(12), b''
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Decoder would neither modify pyasn1 specification object nor use
+its current values (if it's a pyasn1 value object), but rather use it as
+a hint for choosing proper decoder and as a pattern for creating new objects:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, tag
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> i = univ.Integer(12345).subtype(
+...   implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 40)
+... )
+>>> substrate = encoder.encode(i)
+>>> substrate
+b'\x9f(\x0209'
+>>> decoder.decode(substrate)
+Traceback (most recent call last):
+...
+pyasn1.error.PyAsn1Error: 
+   TagSet(Tag(tagClass=128, tagFormat=0, tagId=40)) not in asn1Spec
+>>> decoder.decode(substrate, asn1Spec=i)
+(Integer(12345), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Notice in the example above, that an attempt to run decoder without passing
+pyasn1 specification object fails because recovered tag does not belong
+to any of the built-in types.
+</p>
+
+<p>
+Another important feature of guided decoder operation is the use of
+values constraints possibly present in pyasn1 specification object.
+To explain this, we will decode a random integer object into generic Integer
+and the constrained one.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, constraint
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> class DialDigit(univ.Integer):
+...   subtypeSpec = constraint.ValueRangeConstraint(0,9)
+>>> substrate = encoder.encode(univ.Integer(13))
+>>> decoder.decode(substrate)
+(Integer(13), b'')
+>>> decoder.decode(substrate, asn1Spec=DialDigit())
+Traceback (most recent call last):
+...
+pyasn1.type.error.ValueConstraintError:
+  ValueRangeConstraint(0, 9) failed at: 13
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Similarily to encoders, to use CER or DER decoders application has to
+explicitly import and call them - all APIs are compatible.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder as ber_encoder
+>>> substrate = ber_encoder.encode(univ.OctetString('http://pyasn1.sf.net'))
+>>>
+>>> from pyasn1.codec.ber import decoder as ber_decoder
+>>> from pyasn1.codec.cer import decoder as cer_decoder
+>>> from pyasn1.codec.der import decoder as der_decoder
+>>> 
+>>> ber_decoder.decode(substrate)
+(OctetString(b'http://pyasn1.sf.net'), b'')
+>>> cer_decoder.decode(substrate)
+(OctetString(b'http://pyasn1.sf.net'), b'')
+>>> der_decoder.decode(substrate)
+(OctetString(b'http://pyasn1.sf.net'), b'')
+>>> 
+</pre>
+</td></tr></table>
+
+<a name="2.2.1"></a>
+<h4>
+2.2.1 Decoding untagged types
+</h4>
+
+<p>
+It has already been mentioned, that ASN.1 has two "special case" types:
+CHOICE and ANY. They are different from other types in part of 
+tagging - unless these two are additionally tagged, neither of them will
+have their own tag. Therefore these types become invisible in substrate
+and can not be recovered without passing pyasn1 specification object to
+decoder.
+</p>
+
+<p>
+To explain the issue, we will first prepare a Choice object to deal with:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedtype
+>>> class CodeOrMessage(univ.Choice):
+...   componentType = namedtype.NamedTypes(
+...     namedtype.NamedType('code', univ.Integer()),
+...     namedtype.NamedType('message', univ.OctetString())
+...   )
+>>>
+>>> codeOrMessage = CodeOrMessage()
+>>> codeOrMessage.setComponentByName('message', 'my string value')
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ message=b'my string value'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Let's now encode this Choice object and then decode its substrate
+with and without pyasn1 specification object:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> substrate = encoder.encode(codeOrMessage)
+>>> substrate
+b'\x04\x0fmy string value'
+>>> encoder.encode(univ.OctetString('my string value'))
+b'\x04\x0fmy string value'
+>>>
+>>> decoder.decode(substrate)
+(OctetString(b'my string value'), b'')
+>>> codeOrMessage, substrate = decoder.decode(substrate, asn1Spec=CodeOrMessage())
+>>> print(codeOrMessage.prettyPrint())
+CodeOrMessage:
+ message=b'my string value'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+First thing to notice in the listing above is that the substrate produced
+for our Choice value object is equivalent to the substrate for an OctetString
+object initialized to the same value. In other words, any information about
+the Choice component is absent in encoding.
+</p>
+
+<p>
+Sure enough, that kind of substrate will decode into an OctetString object,
+unless original Choice type object is passed to decoder to guide the decoding
+process.
+</p>
+
+<p>
+Similarily untagged ANY type behaves differently on decoding phase - when
+decoder bumps into an Any object in pyasn1 specification, it stops decoding
+and puts all the substrate into a new Any value object in form of an octet
+string. Concerned application could then re-run decoder with an additional,
+more exact pyasn1 specification object to recover the contents of Any
+object.
+</p>
+
+<p>
+As it was mentioned elsewhere in this paper, Any type allows for incomplete
+or changing ASN.1 specification to be handled gracefully by decoder and
+applications.
+</p>
+
+<p>
+To illustrate the working of Any type, we'll have to make the stage
+by encoding a pyasn1 object and then putting its substrate into an any
+object.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> innerSubstrate = encoder.encode(univ.Integer(1234))
+>>> innerSubstrate
+b'\x02\x02\x04\xd2'
+>>> any = univ.Any(innerSubstrate)
+>>> any
+Any(b'\x02\x02\x04\xd2')
+>>> substrate = encoder.encode(any)
+>>> substrate
+b'\x02\x02\x04\xd2'
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+As with Choice type encoding, there is no traces of Any type in substrate.
+Obviously, the substrate we are dealing with, will decode into the inner
+[Integer] component, unless pyasn1 specification is given to guide the 
+decoder. Continuing previous code:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> from pyasn1.codec.ber import encoder, decoder
+
+>>> decoder.decode(substrate)
+(Integer(1234), b'')
+>>> any, substrate = decoder.decode(substrate, asn1Spec=univ.Any())
+>>> any
+Any(b'\x02\x02\x04\xd2')
+>>> decoder.decode(str(any))
+(Integer(1234), b'')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Both CHOICE and ANY types are widely used in practice. Reader is welcome to
+take a look at 
+<a href=http://www.cs.auckland.ac.nz/~pgut001/pubs/x509guide.txt>
+ASN.1 specifications of X.509 applications</a> for more information.
+</p>
+
+<a name="2.2.2"></a>
+<h4>
+2.2.2 Ignoring unknown types
+</h4>
+
+<p>
+When dealing with a loosely specified ASN.1 structure, the receiving
+end may not be aware of some types present in the substrate. It may be
+convenient then to turn decoder into a recovery mode. Whilst there, decoder
+will not bail out when hit an unknown tag but rather treat it as an Any
+type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, tag
+>>> from pyasn1.codec.ber import encoder, decoder
+>>> taggedInt = univ.Integer(12345).subtype(
+...   implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 40)
+... )
+>>> substrate = encoder.encode(taggedInt)
+>>> decoder.decode(substrate)
+Traceback (most recent call last):
+...
+pyasn1.error.PyAsn1Error: TagSet(Tag(tagClass=128, tagFormat=0, tagId=40)) not in asn1Spec
+>>>
+>>> decoder.decode.defaultErrorState = decoder.stDumpRawValue
+>>> decoder.decode(substrate)
+(Any(b'\x9f(\x0209'), '')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+It's also possible to configure a custom decoder, to handle unknown tags
+found in substrate. This can be done by means of <b>defaultRawDecoder</b>
+attribute holding a reference to type decoder object. Refer to the source
+for API details.
+</p>
+
+<a name="3"></a>
+<h3>
+3. Feedback and getting help
+</h3>
+
+<p>
+Although pyasn1 software is almost a decade old and used in many production
+environments, it still may have bugs and non-implemented pieces. Anyone
+who happens to run into such defect is welcome to complain to
+<a href=mailto:pyasn1-users@lists.sourceforge.net>pyasn1 mailing list</a>
+or better yet fix the issue and send
+<a href=mailto:ilya@glas.net>me</a> the patch.
+</p>
+
+<p>
+Typically, pyasn1 is used for building arbitrary protocol support into
+various applications. This involves manual translation of ASN.1 data
+structures into their pyasn1 implementations. To save time and effort,
+data structures for some of the popular protocols are pre-programmed
+and kept for further re-use in form of the
+<a href=http://sourceforge.net/projects/pyasn1/files/pyasn1-modules/>
+pyasn1-modules package</a>. For instance, many structures for PKI (X.509,
+PKCS#*, CRMF, OCSP), LDAP and SNMP are present.
+Applications authors are advised to import and use relevant modules 
+from that package whenever needed protocol structures are already 
+there. New protocol modules contributions are welcome.
+</p>
+
+<p>
+And finally, the latest pyasn1 package revision is available for free
+download from
+<a href=http://sourceforge.net/projects/pyasn1/>project home</a> and
+also from the 
+<a href=http://pypi.python.org/pypi>Python package repository</a>.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/scalar.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/scalar.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/scalar.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/scalar.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,794 @@
+<html>
+<title>
+PyASN1 data model and scalar types
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+
+<h3>
+1. Data model for ASN.1 types
+</h3>
+
+<p>
+All ASN.1 types could be categorized into two groups: scalar (also called
+simple or primitive) and constructed. The first group is populated by
+well-known types like Integer or String. Members of constructed group
+hold other types (simple or constructed) as their inner components, thus
+they are semantically close to a programming language records or lists.
+</p>
+
+<p>
+In pyasn1, all ASN.1 types and values are implemented as Python objects.
+The same pyasn1 object can represent either ASN.1 type and/or value
+depending of the presense of value initializer on object instantiation.
+We will further refer to these as <i>pyasn1 type object</i> versus <i>pyasn1
+value object</i>.
+</p>
+
+<p>
+Primitive ASN.1 types are implemented as immutable scalar objects. There values
+could be used just like corresponding native Python values (integers,
+strings/bytes etc) and freely mixed with them in expressions.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> asn1IntegerValue = univ.Integer(12)
+>>> asn1IntegerValue - 2
+10
+>>> univ.OctetString('abc') == 'abc'
+True   # Python 2
+>>> univ.OctetString(b'abc') == b'abc'
+True   # Python 3
+</pre>
+</td></tr></table>
+
+<p>
+It would be an error to perform an operation on a pyasn1 type object
+as it holds no value to deal with:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> asn1IntegerType = univ.Integer()
+>>> asn1IntegerType - 2
+...
+pyasn1.error.PyAsn1Error: No value for __coerce__()
+</pre>
+</td></tr></table>
+
+<a name="1.1"></a>
+<h4>
+1.1 Scalar types
+</h4>
+
+<p>
+In the sub-sections that follow we will explain pyasn1 mapping to those
+primitive ASN.1 types. Both, ASN.1 notation and corresponding pyasn1
+syntax will be given in each case.
+</p>
+
+<a name="1.1.1"></a>
+<h4>
+1.1.1 Boolean type
+</h4>
+
+<p>
+This is the simplest type those values could be either True or False.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; type specification
+FunFactorPresent ::= BOOLEAN
+
+;; values declaration and assignment
+pythonFunFactor FunFactorPresent ::= TRUE
+cobolFunFactor FunFactorPresent :: FALSE
+</pre>
+</td></tr></table>
+
+<p>
+And here's pyasn1 version of it:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> class FunFactorPresent(univ.Boolean): pass
+... 
+>>> pythonFunFactor = FunFactorPresent(True)
+>>> cobolFunFactor = FunFactorPresent(False)
+>>> pythonFunFactor
+FunFactorPresent('True(1)')
+>>> cobolFunFactor
+FunFactorPresent('False(0)')
+>>> pythonFunFactor == cobolFunFactor
+False
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.1.2"></a>
+<h4>
+1.1.2 Null type
+</h4>
+
+<p>
+The NULL type is sometimes used to express the absense of any information.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; type specification
+Vote ::= CHOICE {
+  agreed BOOLEAN,
+  skip NULL
+}
+</td></tr></table>
+
+;; value declaration and assignment
+myVote Vote ::= skip:NULL
+</pre>
+
+<p>
+We will explain the CHOICE type later in this paper, meanwhile the NULL
+type:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> skip = univ.Null()
+>>> skip
+Null('')
+>>>
+</pre>
+</td></tr></table>
+
+<a name="1.1.3"></a>
+<h4>
+1.1.3 Integer type
+</h4>
+
+<p>
+ASN.1 defines the values of Integer type as negative or positive of whatever
+length. This definition plays nicely with Python as the latter places no
+limit on Integers. However, some ASN.1 implementations may impose certain
+limits of integer value ranges. Keep that in mind when designing new
+data structures.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; values specification
+age-of-universe INTEGER ::= 13750000000
+mean-martian-surface-temperature INTEGER ::= -63
+</pre>
+</td></tr></table>
+
+<p>
+A rather strigntforward mapping into pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> ageOfUniverse = univ.Integer(13750000000)
+>>> ageOfUniverse
+Integer(13750000000)
+>>>
+>>> meanMartianSurfaceTemperature = univ.Integer(-63)
+>>> meanMartianSurfaceTemperature
+Integer(-63)
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+ASN.1 allows to assign human-friendly names to particular values of
+an INTEGER type.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+Temperature ::= INTEGER {
+  freezing(0),
+  boiling(100) 
+}
+</pre>
+</td></tr></table>
+
+<p>
+The Temperature type expressed in pyasn1:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedval
+>>> class Temperature(univ.Integer):
+...   namedValues = namedval.NamedValues(('freezing', 0), ('boiling', 100))
+...
+>>> t = Temperature(0)
+>>> t
+Temperature('freezing(0)')
+>>> t + 1
+Temperature(1)
+>>> t + 100
+Temperature('boiling(100)')
+>>> t = Temperature('boiling')
+>>> t
+Temperature('boiling(100)')
+>>> Temperature('boiling') / 2
+Temperature(50)
+>>> -1 < Temperature('freezing')
+True
+>>> 47 > Temperature('boiling')
+False
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+These values labels have no effect on Integer type operations, any value
+still could be assigned to a type (information on value constraints will
+follow further in this paper).
+</p>
+
+<a name="1.1.4"></a>
+<h4>
+1.1.4 Enumerated type
+</h4>
+
+<p>
+ASN.1 Enumerated type differs from an Integer type in a number of ways.
+Most important is that its instance can only hold a value that belongs
+to a set of values specified on type declaration.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+error-status ::= ENUMERATED {
+  no-error(0),
+  authentication-error(10),
+  authorization-error(20),
+  general-failure(51)
+}
+</pre>
+</td></tr></table>
+
+<p>
+When constructing Enumerated type we will use two pyasn1 features: values
+labels (as mentioned above) and value constraint (will be described in
+more details later on).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedval, constraint
+>>> class ErrorStatus(univ.Enumerated):
+...   namedValues = namedval.NamedValues(
+...        ('no-error', 0),
+...        ('authentication-error', 10),
+...        ('authorization-error', 20),
+...        ('general-failure', 51)
+...   )
+...   subtypeSpec = univ.Enumerated.subtypeSpec + \
+...                    constraint.SingleValueConstraint(0, 10, 20, 51)
+...
+>>> errorStatus = univ.ErrorStatus('no-error')
+>>> errorStatus
+ErrorStatus('no-error(0)')
+>>> errorStatus == univ.ErrorStatus('general-failure')
+False
+>>> univ.ErrorStatus('non-existing-state')
+Traceback (most recent call last):
+...
+pyasn1.error.PyAsn1Error: Can't coerce non-existing-state into integer
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Particular integer values associated with Enumerated value states
+have no meaning. They should not be used as such or in any kind of
+math operation. Those integer values are only used by codecs to
+transfer state from one entity to another.
+</p>
+
+<a name="1.1.5"></a>
+<h4>
+1.1.5 Real type
+</h4>
+
+<p>
+Values of the Real type are a three-component tuple of mantissa, base and 
+exponent. All three are integers.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+pi ::= REAL { mantissa 314159, base 10, exponent -5 }
+</pre>
+</td></tr></table>
+
+<p>
+Corresponding pyasn1 objects can be initialized with either a three-component
+tuple or a Python float. Infinite values could be expressed in a way, 
+compatible with Python float type.
+
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> pi = univ.Real((314159, 10, -5))
+>>> pi
+Real((314159, 10,-5))
+>>> float(pi)
+3.14159
+>>> pi == univ.Real(3.14159)
+True
+>>> univ.Real('inf')
+Real('inf')
+>>> univ.Real('-inf') == float('-inf')
+True
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+If a Real object is initialized from a Python float or yielded by a math
+operation, the base is set to decimal 10 (what affects encoding).
+</p>
+
+<a name="1.1.6"></a>
+<h4>
+1.1.6 Bit string type
+</h4>
+
+<p>
+ASN.1 BIT STRING type holds opaque binary data of an arbitrarily length.
+A BIT STRING value could be initialized by either a binary (base 2) or 
+hex (base 16) value.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+public-key BIT STRING ::= '1010111011110001010110101101101
+                           1011000101010000010110101100010
+                           0110101010000111101010111111110'B
+
+signature  BIT STRING ::= 'AF01330CD932093392100B39FF00DE0'H
+</pre>
+</td></tr></table>
+
+<p>
+The pyasn1 BitString objects can initialize from native ASN.1 notation
+(base 2 or base 16 strings) or from a Python tuple of binary components.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> publicKey = univ.BitString(
+...          "'1010111011110001010110101101101"
+...          "1011000101010000010110101100010"
+...          "0110101010000111101010111111110'B"
+)
+>>> publicKey
+BitString("'10101110111100010101101011011011011000101010000010110101100010\
+0110101010000111101010111111110'B")
+>>> signature = univ.BitString(
+...          "'AF01330CD932093392100B39FF00DE0'H"
+... )
+>>> signature
+BitString("'101011110000000100110011000011001101100100110010000010010011001\
+1100100100001000000001011001110011111111100000000110111100000'B")
+>>> fingerprint = univ.BitString(
+...          (1, 0, 1, 1 ,0, 1, 1, 1, 0, 1, 0, 1)
+... )
+>>> fingerprint
+BitString("'101101110101'B")
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Another BIT STRING initialization method supported by ASN.1 notation
+is to specify only 1-th bits along with their human-friendly label
+and bit offset relative to the beginning of the bit string. With this 
+method, all not explicitly mentioned bits are doomed to be zeros.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+bit-mask  BIT STRING ::= {
+  read-flag(0),
+  write-flag(2),
+  run-flag(4)
+}
+</pre>
+</td></tr></table>
+
+<p>
+To express this in pyasn1, we will employ the named values feature (as with
+Enumeration type).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, namedval
+>>> class BitMask(univ.BitString):
+...   namedValues = namedval.NamedValues(
+...        ('read-flag', 0),
+...        ('write-flag', 2),
+...        ('run-flag', 4)
+... )
+>>> bitMask = BitMask('read-flag,run-flag')
+>>> bitMask
+BitMask("'10001'B")
+>>> tuple(bitMask)
+(1, 0, 0, 0, 1)
+>>> bitMask[4]
+1
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The BitString objects mimic the properties of Python tuple type in part
+of immutable sequence object protocol support.
+</p>
+
+<a name="1.1.7"></a>
+<h4>
+1.1.7 OctetString type
+</h4>
+
+<p>
+The OCTET STRING type is a confusing subject. According to ASN.1
+specification, this type is similar to BIT STRING, the major difference
+is that the former operates in 8-bit chunks of data. What is important
+to note, is that OCTET STRING was NOT designed to handle text strings - the
+standard provides many other types specialized for text content. For that
+reason, ASN.1 forbids to initialize OCTET STRING values with "quoted text
+strings", only binary or hex initializers, similar to BIT STRING ones,
+are allowed.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+thumbnail OCTET STRING ::= '1000010111101110101111000000111011'B
+thumbnail OCTET STRING ::= 'FA9823C43E43510DE3422'H
+</pre>
+</td></tr></table>
+
+<p>
+However, ASN.1 users (e.g. protocols designers) seem to ignore the original
+purpose of the OCTET STRING type - they used it for handling all kinds of
+data, including text strings.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+welcome-message OCTET STRING ::= "Welcome to ASN.1 wilderness!"
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1, we have taken a liberal approach and allowed both BIT STRING
+style and quoted text initializers for the OctetString objects. To avoid
+possible collisions, quoted text is the default initialization syntax.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> thumbnail = univ.OctetString(
+...    binValue='1000010111101110101111000000111011'
+... )
+>>> thumbnail
+OctetString(hexValue='85eebcec0')
+>>> thumbnail = univ.OctetString(
+...    hexValue='FA9823C43E43510DE3422'
+... )
+>>> thumbnail
+OctetString(hexValue='fa9823c43e4351de34220')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Most frequent usage of the OctetString class is to instantiate it with
+a text string.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> welcomeMessage = univ.OctetString('Welcome to ASN.1 wilderness!')
+>>> welcomeMessage
+OctetString(b'Welcome to ASN.1 wilderness!')
+>>> print('%s' % welcomeMessage)
+Welcome to ASN.1 wilderness!
+>>> welcomeMessage[11:16]
+OctetString(b'ASN.1')
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+OctetString objects support the immutable sequence object protocol.
+In other words, they behave like Python 3 bytes (or Python 2 strings).
+</p>
+
+<p>
+When running pyasn1 on Python 3, it's better to use the bytes objects for
+OctetString instantiation, as it's more reliable and efficient.
+</p>
+
+<p>
+Additionally, OctetString's can also be instantiated with a sequence of
+8-bit integers (ASCII codes).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> univ.OctetString((77, 101, 101, 103, 111))
+OctetString(b'Meego')
+</pre>
+</td></tr></table>
+
+<p>
+It is sometimes convenient to express OctetString instances as 8-bit
+characters (Python 3 bytes or Python 2 strings) or 8-bit integers.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> octetString = univ.OctetString('ABCDEF')
+>>> octetString.asNumbers()
+(65, 66, 67, 68, 69, 70)
+>>> octetString.asOctets()
+b'ABCDEF'
+</pre>
+</td></tr></table>
+
+<a name="1.1.8"></a>
+<h4>
+1.1.8 ObjectIdentifier type
+</h4>
+
+<p>
+Values of the OBJECT IDENTIFIER type are sequences of integers that could
+be used to identify virtually anything in the world. Various ASN.1-based
+protocols employ OBJECT IDENTIFIERs for their own identification needs.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+internet-id OBJECT IDENTIFIER ::= {
+  iso(1) identified-organization(3) dod(6) internet(1)
+}
+</pre>
+</td></tr></table>
+
+<p>
+One of the natural ways to map OBJECT IDENTIFIER type into a Python
+one is to use Python tuples of integers. So this approach is taken by
+pyasn1.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> internetId = univ.ObjectIdentifier((1, 3, 6, 1))
+>>> internetId
+ObjectIdentifier('1.3.6.1')
+>>> internetId[2]
+6
+>>> internetId[1:3]
+ObjectIdentifier('3.6')
+</pre>
+</td></tr></table>
+
+<p>
+A more human-friendly "dotted" notation is also supported.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ
+>>> univ.ObjectIdentifier('1.3.6.1')
+ObjectIdentifier('1.3.6.1')
+</pre>
+</td></tr></table>
+
+<p>
+Symbolic names of the arcs of object identifier, sometimes present in
+ASN.1 specifications, are not preserved and used in pyasn1 objects.
+</p>
+
+<p>
+The ObjectIdentifier objects mimic the properties of Python tuple type in
+part of immutable sequence object protocol support.
+</p>
+
+<a name="1.1.9"></a>
+<h4>
+1.1.9 Character string types
+</h4>
+
+<p>
+ASN.1 standard introduces a diverse set of text-specific types. All of them
+were designed to handle various types of characters. Some of these types seem
+be obsolete nowdays, as their target technologies are gone. Another issue
+to be aware of is that raw OCTET STRING type is sometimes used in practice
+by ASN.1 users instead of specialized character string types, despite
+explicit prohibition imposed by ASN.1 specification.
+</p>
+
+<p>
+The two types are specific to ASN.1 are NumericString and PrintableString.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+welcome-message ::= PrintableString {
+  "Welcome to ASN.1 text types"
+}
+
+dial-pad-numbers ::= NumericString {
+  "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"
+}
+</pre>
+</td></tr></table>
+
+<p>
+Their pyasn1 implementations are:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char
+>>> '%s' % char.PrintableString("Welcome to ASN.1 text types")
+'Welcome to ASN.1 text types'
+>>> dialPadNumbers = char.NumericString(
+      "0" "1" "2" "3" "4" "5" "6" "7" "8" "9"
+)
+>>> dialPadNumbers
+NumericString(b'0123456789')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The following types came to ASN.1 from ISO standards on character sets.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char
+>>> char.VisibleString("abc")
+VisibleString(b'abc')
+>>> char.IA5String('abc')
+IA5String(b'abc')
+>>> char.TeletexString('abc')
+TeletexString(b'abc')
+>>> char.VideotexString('abc')
+VideotexString(b'abc')
+>>> char.GraphicString('abc')
+GraphicString(b'abc')
+>>> char.GeneralString('abc')
+GeneralString(b'abc')
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+The last three types are relatively recent addition to the family of
+character string types: UniversalString, BMPString, UTF8String.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import char
+>>> char.UniversalString("abc")
+UniversalString(b'abc')
+>>> char.BMPString('abc')
+BMPString(b'abc')
+>>> char.UTF8String('abc')
+UTF8String(b'abc')
+>>> utf8String = char.UTF8String('У попа была �обака')
+>>> utf8String
+UTF8String(b'\xd0\xa3 \xd0\xbf\xd0\xbe\xd0\xbf\xd0\xb0 \xd0\xb1\xd1\x8b\xd0\xbb\xd0\xb0 \
+\xd1\x81\xd0\xbe\xd0\xb1\xd0\xb0\xd0\xba\xd0\xb0')
+>>> print(utf8String)
+У попа была �обака
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1, all character type objects behave like Python strings. None of
+them is currently constrained in terms of valid alphabet so it's up to
+the data source to keep an eye on data validation for these types.
+</p>
+
+<a name="1.1.10"></a>
+<h4>
+1.1.10 Useful types
+</h4>
+
+<p>
+There are three so-called useful types defined in the standard:
+ObjectDescriptor, GeneralizedTime, UTCTime. They all are subtypes
+of GraphicString or VisibleString types therefore useful types are
+character string types.
+</p>
+
+<p>
+It's advised by the ASN.1 standard to have an instance of ObjectDescriptor
+type holding a human-readable description of corresponding instance of
+OBJECT IDENTIFIER type. There are no formal linkage between these instances
+and provision for ObjectDescriptor uniqueness in the standard.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import useful
+>>> descrBER = useful.ObjectDescriptor(
+      "Basic encoding of a single ASN.1 type"
+)
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+GeneralizedTime and UTCTime types are designed to hold a human-readable
+timestamp in a universal and unambiguous form. The former provides
+more flexibility in notation while the latter is more strict but has
+Y2K issues.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+;; Mar 8 2010 12:00:00 MSK
+moscow-time GeneralizedTime ::= "20110308120000.0"
+;; Mar 8 2010 12:00:00 UTC
+utc-time GeneralizedTime ::= "201103081200Z"
+;; Mar 8 1999 12:00:00 UTC
+utc-time UTCTime ::= "9803081200Z"
+</pre>
+</td></tr></table>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import useful
+>>> moscowTime = useful.GeneralizedTime("20110308120000.0")
+>>> utcTime = useful.UTCTime("9803081200Z")
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+Despite their intended use, these types possess no special, time-related,
+handling in pyasn1. They are just printable strings.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/tagging.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/tagging.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/doc/tagging.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/doc/tagging.html	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,233 @@
+<html>
+<title>
+Tagging in PyASN1
+</title>
+<head>
+</head>
+<body>
+<center>
+<table width=60%>
+<tr>
+<td>
+<a name="1.2"></a>
+<h4>
+1.2 Tagging in PyASN1
+</h4>
+
+<p>
+In order to continue with the Constructed ASN.1 types, we will first have
+to introduce the concept of tagging (and its pyasn1 implementation), as
+some of the Constructed types rely upon the tagging feature.
+</p>
+
+<p>
+When a value is coming into an ASN.1-based system (received from a network
+or read from some storage), the receiving entity has to determine the
+type of the value to interpret and verify it accordingly.
+</p>
+
+<p>
+Historically, the first data serialization protocol introduced in
+ASN.1 was BER (Basic Encoding Rules). According to BER, any serialized
+value is packed into a triplet of (Type, Length, Value) where Type is a 
+code that identifies the value (which is called <i>tag</i> in ASN.1),
+length is the number of bytes occupied by the value in its serialized form
+and value is ASN.1 value in a form suitable for serial transmission or storage.
+</p>
+
+<p>
+For that reason almost every ASN.1 type has a tag (which is actually a
+BER type) associated with it by default.
+</p>
+
+<p>
+An ASN.1 tag could be viewed as a tuple of three numbers:
+(Class, Format, Number). While Number identifies a tag, Class component 
+is used to create scopes for Numbers. Four scopes are currently defined:
+UNIVERSAL, context-specific, APPLICATION and PRIVATE. The Format component
+is actually a one-bit flag - zero for tags associated with scalar types,
+and one for constructed types (will be discussed later on).
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MyIntegerType ::= [12] INTEGER
+MyOctetString ::= [APPLICATION 0] OCTET STRING
+</pre>
+</td></tr></table>
+
+<p>
+In pyasn1, tags are implemented as immutable, tuple-like objects:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import tag
+>>> myTag = tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10)
+>>> myTag
+Tag(tagClass=128, tagFormat=0, tagId=10)
+>>> tuple(myTag)
+(128, 0, 10)
+>>> myTag[2]
+10
+>>> myTag == tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 10)
+False
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Default tag, associated with any ASN.1 type, could be extended or replaced
+to make new type distinguishable from its ancestor. The standard provides
+two modes of tag mangling - IMPLICIT and EXPLICIT.
+</p>
+
+<p>
+EXPLICIT mode works by appending new tag to the existing ones thus creating
+an ordered set of tags. This set will be considered as a whole for type
+identification and encoding purposes. Important property of EXPLICIT tagging
+mode is that it preserves base type information in encoding what makes it
+possible to completely recover type information from encoding.
+</p>
+
+<p>
+When tagging in IMPLICIT mode, the outermost existing tag is dropped and
+replaced with a new one.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MyIntegerType ::= [12] IMPLICIT INTEGER
+MyOctetString ::= [APPLICATION 0] EXPLICIT OCTET STRING
+</pre>
+</td></tr></table>
+
+<p>
+To model both modes of tagging, a specialized container TagSet object (holding
+zero, one or more Tag objects) is used in pyasn1.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import tag
+>>> tagSet = tag.TagSet(
+...   # base tag
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10),
+...   # effective tag
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10))
+>>> tagSet.getBaseTag()
+Tag(tagClass=128, tagFormat=0, tagId=10)
+>>> tagSet = tagSet.tagExplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 20)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10), 
+       Tag(tagClass=128, tagFormat=32, tagId=20))
+>>> tagSet = tagSet.tagExplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 30)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10), 
+       Tag(tagClass=128, tagFormat=32, tagId=20), 
+       Tag(tagClass=128, tagFormat=32, tagId=30))
+>>> tagSet = tagSet.tagImplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 40)
+... )
+>>> tagSet
+TagSet(Tag(tagClass=128, tagFormat=0, tagId=10),
+       Tag(tagClass=128, tagFormat=32, tagId=20),
+       Tag(tagClass=128, tagFormat=32, tagId=40))
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+As a side note: the "base tag" concept (accessible through the getBaseTag()
+method) is specific to pyasn1 -- the base tag is used to identify the original
+ASN.1 type of an object in question. Base tag is never occurs in encoding
+and is mostly used internally by pyasn1 for choosing type-specific data 
+processing algorithms. The "effective tag" is the one that always appears in
+encoding and is used on tagSets comparation.
+</p>
+
+<p>
+Any two TagSet objects could be compared to see if one is a derivative
+of the other. Figuring this out is also useful in cases when a type-specific
+data processing algorithms are to be chosen.
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import tag
+>>> tagSet1 = tag.TagSet(
+...   # base tag
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10)
+...   # effective tag
+...   tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 10)
+... )
+>>> tagSet2 = tagSet1.tagExplicitly(
+...    tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 20)
+... )
+>>> tagSet1.isSuperTagSetOf(tagSet2)
+True
+>>> tagSet2.isSuperTagSetOf(tagSet1)
+False
+>>> 
+</pre>
+</td></tr></table>
+
+<p>
+We will complete this discussion on tagging with a real-world example. The
+following ASN.1 tagged type:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+MyIntegerType ::= [12] EXPLICIT INTEGER
+</pre>
+</td></tr></table>
+
+<p>
+could be expressed in pyasn1 like this:
+</p>
+
+<table bgcolor="lightgray" border=0 width=100%><TR><TD>
+<pre>
+>>> from pyasn1.type import univ, tag
+>>> class MyIntegerType(univ.Integer):
+...   tagSet = univ.Integer.tagSet.tagExplicitly(
+...        tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 12)
+...        )
+>>> myInteger = MyIntegerType(12345)
+>>> myInteger.getTagSet()
+TagSet(Tag(tagClass=0, tagFormat=0, tagId=2), 
+       Tag(tagClass=128, tagFormat=32, tagId=12))
+>>>
+</pre>
+</td></tr></table>
+
+<p>
+Referring to the above code, the tagSet class attribute is a property of any
+pyasn1 type object that assigns default tagSet to a pyasn1 value object. This
+default tagSet specification can be ignored and effectively replaced by some
+other tagSet value passed on object instantiation.
+</p>
+
+<p>
+It's important to understand that the tag set property of pyasn1 type/value
+object can never be modifed in place. In other words, a pyasn1 type/value
+object can never change its tags. The only way is to create a new pyasn1
+type/value object and associate different tag set with it.
+</p>
+
+<hr>
+
+</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/LICENSE thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/LICENSE
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/LICENSE	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,24 @@
+Copyright (c) 2005-2013, Ilya Etingof <ilya@glas.net>
+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.
+
+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 HOLDER 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. 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/MANIFEST.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/MANIFEST.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/MANIFEST.in	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/MANIFEST.in	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,3 @@
+include CHANGES README LICENSE THANKS TODO
+recursive-include test *.py
+recursive-include doc *.html
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/PKG-INFO thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/PKG-INFO
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/PKG-INFO	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,26 @@
+Metadata-Version: 1.0
+Name: pyasn1
+Version: 0.1.7
+Summary: ASN.1 types and codecs
+Home-page: http://sourceforge.net/projects/pyasn1/
+Author: Ilya Etingof <ilya@glas.net>
+Author-email: ilya@glas.net
+License: BSD
+Description: A pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208).
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: System Administrators
+Classifier: Intended Audience :: Telecommunications Industry
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Communications
+Classifier: Topic :: Security :: Cryptography
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/decoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/decoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/decoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/decoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,808 @@
+# BER decoder
+from pyasn1.type import tag, base, univ, char, useful, tagmap
+from pyasn1.codec.ber import eoo
+from pyasn1.compat.octets import oct2int, octs2ints, isOctetsType
+from pyasn1 import debug, error
+
+class AbstractDecoder:
+    protoComponent = None
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        raise error.PyAsn1Error('Decoder not implemented for %s' % (tagSet,))
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        raise error.PyAsn1Error('Indefinite length mode decoder not implemented for %s' % (tagSet,))
+
+class AbstractSimpleDecoder(AbstractDecoder):
+    tagFormats = (tag.tagFormatSimple,)
+    def _createComponent(self, asn1Spec, tagSet, value=None):
+        if tagSet[0][1] not in self.tagFormats:
+            raise error.PyAsn1Error('Invalid tag format %r for %r' % (tagSet[0], self.protoComponent,))
+        if asn1Spec is None:
+            return self.protoComponent.clone(value, tagSet)
+        elif value is None:
+            return asn1Spec
+        else:
+            return asn1Spec.clone(value)
+        
+class AbstractConstructedDecoder(AbstractDecoder):
+    tagFormats = (tag.tagFormatConstructed,)
+    def _createComponent(self, asn1Spec, tagSet, value=None):
+        if tagSet[0][1] not in self.tagFormats:
+            raise error.PyAsn1Error('Invalid tag format %r for %r' % (tagSet[0], self.protoComponent,))
+        if asn1Spec is None:
+            return self.protoComponent.clone(tagSet)
+        else:
+            return asn1Spec.clone()
+                                
+class EndOfOctetsDecoder(AbstractSimpleDecoder):
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        return eoo.endOfOctets, substrate[length:]
+
+class ExplicitTagDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.Any('')
+    tagFormats = (tag.tagFormatConstructed,)
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        if substrateFun:
+            return substrateFun(
+                       self._createComponent(asn1Spec, tagSet, ''),
+                       substrate, length
+                   )
+        head, tail = substrate[:length], substrate[length:]
+        value, _ = decodeFun(head, asn1Spec, tagSet, length)
+        return value, tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                             length, state, decodeFun, substrateFun):
+        if substrateFun:
+            return substrateFun(
+                       self._createComponent(asn1Spec, tagSet, ''),
+                       substrate, length
+                   )
+        value, substrate = decodeFun(substrate, asn1Spec, tagSet, length)
+        terminator, substrate = decodeFun(substrate)
+        if eoo.endOfOctets.isSameTypeWith(terminator) and \
+                terminator == eoo.endOfOctets:
+            return value, substrate
+        else:
+            raise error.PyAsn1Error('Missing end-of-octets terminator')
+
+explicitTagDecoder = ExplicitTagDecoder()
+
+class IntegerDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.Integer(0)
+    precomputedValues = {
+        '\x00':  0,
+        '\x01':  1,
+        '\x02':  2,
+        '\x03':  3,
+        '\x04':  4,
+        '\x05':  5,
+        '\x06':  6,
+        '\x07':  7,
+        '\x08':  8,
+        '\x09':  9,
+        '\xff': -1,
+        '\xfe': -2,
+        '\xfd': -3,
+        '\xfc': -4,
+        '\xfb': -5
+        }
+    
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet, length,
+                     state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        if not head:
+            return self._createComponent(asn1Spec, tagSet, 0), tail
+        if head in self.precomputedValues:
+            value = self.precomputedValues[head]
+        else:
+            firstOctet = oct2int(head[0])
+            if firstOctet & 0x80:
+                value = -1
+            else:
+                value = 0
+            for octet in head:
+                value = value << 8 | oct2int(octet)
+        return self._createComponent(asn1Spec, tagSet, value), tail
+
+class BooleanDecoder(IntegerDecoder):
+    protoComponent = univ.Boolean(0)
+    def _createComponent(self, asn1Spec, tagSet, value=None):
+        return IntegerDecoder._createComponent(self, asn1Spec, tagSet, value and 1 or 0)
+
+class BitStringDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.BitString(())
+    tagFormats = (tag.tagFormatSimple, tag.tagFormatConstructed)
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet, length,
+                     state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        if tagSet[0][1] == tag.tagFormatSimple:    # XXX what tag to check?
+            if not head:
+                raise error.PyAsn1Error('Empty substrate')
+            trailingBits = oct2int(head[0])
+            if trailingBits > 7:
+                raise error.PyAsn1Error(
+                    'Trailing bits overflow %s' % trailingBits
+                    )
+            head = head[1:]
+            lsb = p = 0; l = len(head)-1; b = ()
+            while p <= l:
+                if p == l:
+                    lsb = trailingBits
+                j = 7                    
+                o = oct2int(head[p])
+                while j >= lsb:
+                    b = b + ((o>>j)&0x01,)
+                    j = j - 1
+                p = p + 1
+            return self._createComponent(asn1Spec, tagSet, b), tail
+        r = self._createComponent(asn1Spec, tagSet, ())
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        while head:
+            component, head = decodeFun(head)
+            r = r + component
+        return r, tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                             length, state, decodeFun, substrateFun):
+        r = self._createComponent(asn1Spec, tagSet, '')
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        while substrate:
+            component, substrate = decodeFun(substrate)
+            if eoo.endOfOctets.isSameTypeWith(component) and \
+                    component == eoo.endOfOctets:
+                break
+            r = r + component
+        else:
+            raise error.SubstrateUnderrunError(
+                'No EOO seen before substrate ends'
+                )
+        return r, substrate
+
+class OctetStringDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.OctetString('')
+    tagFormats = (tag.tagFormatSimple, tag.tagFormatConstructed)
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet, length,
+                     state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        if tagSet[0][1] == tag.tagFormatSimple:    # XXX what tag to check?
+            return self._createComponent(asn1Spec, tagSet, head), tail
+        r = self._createComponent(asn1Spec, tagSet, '')
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        while head:
+            component, head = decodeFun(head)
+            r = r + component
+        return r, tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                             length, state, decodeFun, substrateFun):
+        r = self._createComponent(asn1Spec, tagSet, '')
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        while substrate:
+            component, substrate = decodeFun(substrate)
+            if eoo.endOfOctets.isSameTypeWith(component) and \
+                    component == eoo.endOfOctets:
+                break
+            r = r + component
+        else:
+            raise error.SubstrateUnderrunError(
+                'No EOO seen before substrate ends'
+                )
+        return r, substrate
+
+class NullDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.Null('')
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        r = self._createComponent(asn1Spec, tagSet)
+        if head:
+            raise error.PyAsn1Error('Unexpected %d-octet substrate for Null' % length)
+        return r, tail
+
+class ObjectIdentifierDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.ObjectIdentifier(())
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet, length,
+                     state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        if not head:
+            raise error.PyAsn1Error('Empty substrate')
+
+        # Get the first subid
+        subId = oct2int(head[0])
+        oid = divmod(subId, 40)
+
+        index = 1
+        substrateLen = len(head)
+        while index < substrateLen:
+            subId = oct2int(head[index])
+            index = index + 1
+            if subId == 128:
+                # ASN.1 spec forbids leading zeros (0x80) in sub-ID OID
+                # encoding, tolerating it opens a vulnerability.
+                # See http://www.cosic.esat.kuleuven.be/publications/article-1432.pdf page 7
+                raise error.PyAsn1Error('Invalid leading 0x80 in sub-OID')
+            elif subId > 128:
+                # Construct subid from a number of octets
+                nextSubId = subId
+                subId = 0
+                while nextSubId >= 128:
+                    subId = (subId << 7) + (nextSubId & 0x7F)
+                    if index >= substrateLen:
+                        raise error.SubstrateUnderrunError(
+                            'Short substrate for sub-OID past %s' % (oid,)
+                            )
+                    nextSubId = oct2int(head[index])
+                    index = index + 1
+                subId = (subId << 7) + nextSubId
+            oid = oid + (subId,)
+        return self._createComponent(asn1Spec, tagSet, oid), tail
+
+class RealDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.Real()
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        if not head:
+            return self._createComponent(asn1Spec, tagSet, 0.0), tail
+        fo = oct2int(head[0]); head = head[1:]
+        if fo & 0x80:  # binary enoding
+            n = (fo & 0x03) + 1
+            if n == 4:
+                n = oct2int(head[0])
+            eo, head = head[:n], head[n:]
+            if not eo or not head:
+                raise error.PyAsn1Error('Real exponent screwed')
+            e = oct2int(eo[0]) & 0x80 and -1 or 0
+            while eo:         # exponent
+                e <<= 8
+                e |= oct2int(eo[0])
+                eo = eo[1:]
+            p = 0
+            while head:  # value
+                p <<= 8
+                p |= oct2int(head[0])
+                head = head[1:]
+            if fo & 0x40:    # sign bit
+                p = -p
+            value = (p, 2, e)
+        elif fo & 0x40:  # infinite value
+            value = fo & 0x01 and '-inf' or 'inf'
+        elif fo & 0xc0 == 0:  # character encoding
+            try:
+                if fo & 0x3 == 0x1:  # NR1
+                    value = (int(head), 10, 0)
+                elif fo & 0x3 == 0x2:  # NR2
+                    value = float(head)
+                elif fo & 0x3 == 0x3:  # NR3
+                    value = float(head)
+                else:
+                    raise error.SubstrateUnderrunError(
+                        'Unknown NR (tag %s)' % fo
+                        )
+            except ValueError:
+                raise error.SubstrateUnderrunError(
+                    'Bad character Real syntax'
+                    )
+        else:
+            raise error.SubstrateUnderrunError(
+                'Unknown encoding (tag %s)' % fo
+                )
+        return self._createComponent(asn1Spec, tagSet, value), tail
+        
+class SequenceDecoder(AbstractConstructedDecoder):
+    protoComponent = univ.Sequence()
+    def _getComponentTagMap(self, r, idx):
+        try:
+            return r.getComponentTagMapNearPosition(idx)
+        except error.PyAsn1Error:
+            return
+
+    def _getComponentPositionByType(self, r, t, idx):
+        return r.getComponentPositionNearType(t, idx)
+    
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        r = self._createComponent(asn1Spec, tagSet)
+        idx = 0
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        while head:
+            asn1Spec = self._getComponentTagMap(r, idx)
+            component, head = decodeFun(head, asn1Spec)
+            idx = self._getComponentPositionByType(
+                r, component.getEffectiveTagSet(), idx
+                )
+            r.setComponentByPosition(idx, component, asn1Spec is None)
+            idx = idx + 1
+        r.setDefaultComponents()
+        r.verifySizeSpec()
+        return r, tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                             length, state, decodeFun, substrateFun):
+        r = self._createComponent(asn1Spec, tagSet)
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        idx = 0
+        while substrate:
+            asn1Spec = self._getComponentTagMap(r, idx)
+            component, substrate = decodeFun(substrate, asn1Spec)
+            if eoo.endOfOctets.isSameTypeWith(component) and \
+                    component == eoo.endOfOctets:
+                break
+            idx = self._getComponentPositionByType(
+                r, component.getEffectiveTagSet(), idx
+                )            
+            r.setComponentByPosition(idx, component, asn1Spec is None)
+            idx = idx + 1                
+        else:
+            raise error.SubstrateUnderrunError(
+                'No EOO seen before substrate ends'
+                )
+        r.setDefaultComponents()
+        r.verifySizeSpec()
+        return r, substrate
+
+class SequenceOfDecoder(AbstractConstructedDecoder):
+    protoComponent = univ.SequenceOf()    
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        r = self._createComponent(asn1Spec, tagSet)
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        asn1Spec = r.getComponentType()
+        idx = 0
+        while head:
+            component, head = decodeFun(head, asn1Spec)
+            r.setComponentByPosition(idx, component, asn1Spec is None)
+            idx = idx + 1
+        r.verifySizeSpec()
+        return r, tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                             length, state, decodeFun, substrateFun):
+        r = self._createComponent(asn1Spec, tagSet)
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        asn1Spec = r.getComponentType()
+        idx = 0
+        while substrate:
+            component, substrate = decodeFun(substrate, asn1Spec)
+            if eoo.endOfOctets.isSameTypeWith(component) and \
+                    component == eoo.endOfOctets:
+                break
+            r.setComponentByPosition(idx, component, asn1Spec is None)
+            idx = idx + 1                
+        else:
+            raise error.SubstrateUnderrunError(
+                'No EOO seen before substrate ends'
+                )
+        r.verifySizeSpec()
+        return r, substrate
+
+class SetDecoder(SequenceDecoder):
+    protoComponent = univ.Set()
+    def _getComponentTagMap(self, r, idx):
+        return r.getComponentTagMap()
+
+    def _getComponentPositionByType(self, r, t, idx):
+        nextIdx = r.getComponentPositionByType(t)
+        if nextIdx is None:
+            return idx
+        else:
+            return nextIdx
+    
+class SetOfDecoder(SequenceOfDecoder):
+    protoComponent = univ.SetOf()
+    
+class ChoiceDecoder(AbstractConstructedDecoder):
+    protoComponent = univ.Choice()
+    tagFormats = (tag.tagFormatSimple, tag.tagFormatConstructed)
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        r = self._createComponent(asn1Spec, tagSet)
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        if r.getTagSet() == tagSet: # explicitly tagged Choice
+            component, head = decodeFun(
+                head, r.getComponentTagMap()
+                )
+        else:
+            component, head = decodeFun(
+                head, r.getComponentTagMap(), tagSet, length, state
+                )
+        if isinstance(component, univ.Choice):
+            effectiveTagSet = component.getEffectiveTagSet()
+        else:
+            effectiveTagSet = component.getTagSet()
+        r.setComponentByType(effectiveTagSet, component, 0, asn1Spec is None)
+        return r, tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        r = self._createComponent(asn1Spec, tagSet)
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        if r.getTagSet() == tagSet: # explicitly tagged Choice
+            component, substrate = decodeFun(substrate, r.getComponentTagMap())
+            eooMarker, substrate = decodeFun(substrate)  # eat up EOO marker
+            if not eoo.endOfOctets.isSameTypeWith(eooMarker) or \
+                    eooMarker != eoo.endOfOctets:
+                raise error.PyAsn1Error('No EOO seen before substrate ends')
+        else:
+            component, substrate= decodeFun(
+                substrate, r.getComponentTagMap(), tagSet, length, state
+            )
+        if isinstance(component, univ.Choice):
+            effectiveTagSet = component.getEffectiveTagSet()
+        else:
+            effectiveTagSet = component.getTagSet()
+        r.setComponentByType(effectiveTagSet, component, 0, asn1Spec is None)
+        return r, substrate
+
+class AnyDecoder(AbstractSimpleDecoder):
+    protoComponent = univ.Any()
+    tagFormats = (tag.tagFormatSimple, tag.tagFormatConstructed)
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                     length, state, decodeFun, substrateFun):
+        if asn1Spec is None or \
+               asn1Spec is not None and tagSet != asn1Spec.getTagSet():
+            # untagged Any container, recover inner header substrate
+            length = length + len(fullSubstrate) - len(substrate)
+            substrate = fullSubstrate
+        if substrateFun:
+            return substrateFun(self._createComponent(asn1Spec, tagSet),
+                                substrate, length)
+        head, tail = substrate[:length], substrate[length:]
+        return self._createComponent(asn1Spec, tagSet, value=head), tail
+
+    def indefLenValueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet,
+                             length, state, decodeFun, substrateFun):
+        if asn1Spec is not None and tagSet == asn1Spec.getTagSet():
+            # tagged Any type -- consume header substrate
+            header = ''
+        else:
+            # untagged Any, recover header substrate
+            header = fullSubstrate[:-len(substrate)]
+
+        r = self._createComponent(asn1Spec, tagSet, header)
+
+        # Any components do not inherit initial tag
+        asn1Spec = self.protoComponent
+        
+        if substrateFun:
+            return substrateFun(r, substrate, length)
+        while substrate:
+            component, substrate = decodeFun(substrate, asn1Spec)
+            if eoo.endOfOctets.isSameTypeWith(component) and \
+                    component == eoo.endOfOctets:
+                break
+            r = r + component
+        else:
+            raise error.SubstrateUnderrunError(
+                'No EOO seen before substrate ends'
+                )
+        return r, substrate
+
+# character string types
+class UTF8StringDecoder(OctetStringDecoder):
+    protoComponent = char.UTF8String()
+class NumericStringDecoder(OctetStringDecoder):
+    protoComponent = char.NumericString()
+class PrintableStringDecoder(OctetStringDecoder):
+    protoComponent = char.PrintableString()
+class TeletexStringDecoder(OctetStringDecoder):
+    protoComponent = char.TeletexString()
+class VideotexStringDecoder(OctetStringDecoder):
+    protoComponent = char.VideotexString()
+class IA5StringDecoder(OctetStringDecoder):
+    protoComponent = char.IA5String()
+class GraphicStringDecoder(OctetStringDecoder):
+    protoComponent = char.GraphicString()
+class VisibleStringDecoder(OctetStringDecoder):
+    protoComponent = char.VisibleString()
+class GeneralStringDecoder(OctetStringDecoder):
+    protoComponent = char.GeneralString()
+class UniversalStringDecoder(OctetStringDecoder):
+    protoComponent = char.UniversalString()
+class BMPStringDecoder(OctetStringDecoder):
+    protoComponent = char.BMPString()
+
+# "useful" types
+class GeneralizedTimeDecoder(OctetStringDecoder):
+    protoComponent = useful.GeneralizedTime()
+class UTCTimeDecoder(OctetStringDecoder):
+    protoComponent = useful.UTCTime()
+
+tagMap = {
+    eoo.endOfOctets.tagSet: EndOfOctetsDecoder(),
+    univ.Integer.tagSet: IntegerDecoder(),
+    univ.Boolean.tagSet: BooleanDecoder(),
+    univ.BitString.tagSet: BitStringDecoder(),
+    univ.OctetString.tagSet: OctetStringDecoder(),
+    univ.Null.tagSet: NullDecoder(),
+    univ.ObjectIdentifier.tagSet: ObjectIdentifierDecoder(),
+    univ.Enumerated.tagSet: IntegerDecoder(),
+    univ.Real.tagSet: RealDecoder(),
+    univ.Sequence.tagSet: SequenceDecoder(),  # conflicts with SequenceOf
+    univ.Set.tagSet: SetDecoder(),            # conflicts with SetOf
+    univ.Choice.tagSet: ChoiceDecoder(),      # conflicts with Any
+    # character string types
+    char.UTF8String.tagSet: UTF8StringDecoder(),
+    char.NumericString.tagSet: NumericStringDecoder(),
+    char.PrintableString.tagSet: PrintableStringDecoder(),
+    char.TeletexString.tagSet: TeletexStringDecoder(),
+    char.VideotexString.tagSet: VideotexStringDecoder(),
+    char.IA5String.tagSet: IA5StringDecoder(),
+    char.GraphicString.tagSet: GraphicStringDecoder(),
+    char.VisibleString.tagSet: VisibleStringDecoder(),
+    char.GeneralString.tagSet: GeneralStringDecoder(),
+    char.UniversalString.tagSet: UniversalStringDecoder(),
+    char.BMPString.tagSet: BMPStringDecoder(),
+    # useful types
+    useful.GeneralizedTime.tagSet: GeneralizedTimeDecoder(),
+    useful.UTCTime.tagSet: UTCTimeDecoder()
+    }
+
+# Type-to-codec map for ambiguous ASN.1 types
+typeMap = {
+    univ.Set.typeId: SetDecoder(),
+    univ.SetOf.typeId: SetOfDecoder(),
+    univ.Sequence.typeId: SequenceDecoder(),
+    univ.SequenceOf.typeId: SequenceOfDecoder(),
+    univ.Choice.typeId: ChoiceDecoder(),
+    univ.Any.typeId: AnyDecoder()
+    }
+
+( stDecodeTag, stDecodeLength, stGetValueDecoder, stGetValueDecoderByAsn1Spec,
+  stGetValueDecoderByTag, stTryAsExplicitTag, stDecodeValue,
+  stDumpRawValue, stErrorCondition, stStop ) = [x for x in range(10)]
+
+class Decoder:
+    defaultErrorState = stErrorCondition
+#    defaultErrorState = stDumpRawValue
+    defaultRawDecoder = AnyDecoder()
+    def __init__(self, tagMap, typeMap={}):
+        self.__tagMap = tagMap
+        self.__typeMap = typeMap
+        self.__endOfOctetsTagSet = eoo.endOfOctets.getTagSet()
+        # Tag & TagSet objects caches
+        self.__tagCache = {}
+        self.__tagSetCache = {}
+        
+    def __call__(self, substrate, asn1Spec=None, tagSet=None,
+                 length=None, state=stDecodeTag, recursiveFlag=1,
+                 substrateFun=None):
+        if debug.logger & debug.flagDecoder:
+            debug.logger('decoder called at scope %s with state %d, working with up to %d octets of substrate: %s' % (debug.scope, state, len(substrate), debug.hexdump(substrate)))
+        fullSubstrate = substrate
+        while state != stStop:
+            if state == stDecodeTag:
+                # Decode tag
+                if not substrate:
+                    raise error.SubstrateUnderrunError(
+                        'Short octet stream on tag decoding'
+                        )
+                if not isOctetsType(substrate) and \
+                   not isinstance(substrate, univ.OctetString):
+                    raise error.PyAsn1Error('Bad octet stream type')
+                
+                firstOctet = substrate[0]
+                substrate = substrate[1:]
+                if firstOctet in self.__tagCache:
+                    lastTag = self.__tagCache[firstOctet]
+                else:
+                    t = oct2int(firstOctet)
+                    tagClass = t&0xC0
+                    tagFormat = t&0x20
+                    tagId = t&0x1F
+                    if tagId == 0x1F:
+                        tagId = 0
+                        while 1:
+                            if not substrate:
+                                raise error.SubstrateUnderrunError(
+                                    'Short octet stream on long tag decoding'
+                                    )
+                            t = oct2int(substrate[0])
+                            tagId = tagId << 7 | (t&0x7F)
+                            substrate = substrate[1:]
+                            if not t&0x80:
+                                break
+                    lastTag = tag.Tag(
+                        tagClass=tagClass, tagFormat=tagFormat, tagId=tagId
+                        )
+                    if tagId < 31:
+                        # cache short tags
+                        self.__tagCache[firstOctet] = lastTag
+                if tagSet is None:
+                    if firstOctet in self.__tagSetCache:
+                        tagSet = self.__tagSetCache[firstOctet]
+                    else:
+                        # base tag not recovered
+                        tagSet = tag.TagSet((), lastTag)
+                        if firstOctet in self.__tagCache:
+                            self.__tagSetCache[firstOctet] = tagSet
+                else:
+                    tagSet = lastTag + tagSet
+                state = stDecodeLength
+                debug.logger and debug.logger & debug.flagDecoder and debug.logger('tag decoded into %r, decoding length' % tagSet)
+            if state == stDecodeLength:
+                # Decode length
+                if not substrate:
+                     raise error.SubstrateUnderrunError(
+                         'Short octet stream on length decoding'
+                         )
+                firstOctet  = oct2int(substrate[0])
+                if firstOctet == 128:
+                    size = 1
+                    length = -1
+                elif firstOctet < 128:
+                    length, size = firstOctet, 1
+                else:
+                    size = firstOctet & 0x7F
+                    # encoded in size bytes
+                    length = 0
+                    lengthString = substrate[1:size+1]
+                    # missing check on maximum size, which shouldn't be a
+                    # problem, we can handle more than is possible
+                    if len(lengthString) != size:
+                        raise error.SubstrateUnderrunError(
+                            '%s<%s at %s' %
+                            (size, len(lengthString), tagSet)
+                            )
+                    for char in lengthString:
+                        length = (length << 8) | oct2int(char)
+                    size = size + 1
+                substrate = substrate[size:]
+                if length != -1 and len(substrate) < length:
+                    raise error.SubstrateUnderrunError(
+                        '%d-octet short' % (length - len(substrate))
+                        )
+                state = stGetValueDecoder
+                debug.logger and debug.logger & debug.flagDecoder and debug.logger('value length decoded into %d, payload substrate is: %s' % (length, debug.hexdump(length == -1 and substrate or substrate[:length])))
+            if state == stGetValueDecoder:
+                if asn1Spec is None:
+                    state = stGetValueDecoderByTag
+                else:
+                    state = stGetValueDecoderByAsn1Spec
+            #
+            # There're two ways of creating subtypes in ASN.1 what influences
+            # decoder operation. These methods are:
+            # 1) Either base types used in or no IMPLICIT tagging has been
+            #    applied on subtyping.
+            # 2) Subtype syntax drops base type information (by means of
+            #    IMPLICIT tagging.
+            # The first case allows for complete tag recovery from substrate
+            # while the second one requires original ASN.1 type spec for
+            # decoding.
+            #
+            # In either case a set of tags (tagSet) is coming from substrate
+            # in an incremental, tag-by-tag fashion (this is the case of
+            # EXPLICIT tag which is most basic). Outermost tag comes first
+            # from the wire.
+            #            
+            if state == stGetValueDecoderByTag:
+                if tagSet in self.__tagMap:
+                    concreteDecoder = self.__tagMap[tagSet]
+                else:
+                    concreteDecoder = None
+                if concreteDecoder:
+                    state = stDecodeValue
+                else:
+                    _k = tagSet[:1]
+                    if _k in self.__tagMap:
+                        concreteDecoder = self.__tagMap[_k]
+                    else:
+                        concreteDecoder = None
+                    if concreteDecoder:
+                        state = stDecodeValue
+                    else:
+                        state = stTryAsExplicitTag
+                if debug.logger and debug.logger & debug.flagDecoder:
+                    debug.logger('codec %s chosen by a built-in type, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as explicit tag'))
+                    debug.scope.push(concreteDecoder is None and '?' or concreteDecoder.protoComponent.__class__.__name__)
+            if state == stGetValueDecoderByAsn1Spec:
+                if isinstance(asn1Spec, (dict, tagmap.TagMap)):
+                    if tagSet in asn1Spec:
+                        __chosenSpec = asn1Spec[tagSet]
+                    else:
+                        __chosenSpec = None
+                    if debug.logger and debug.logger & debug.flagDecoder:
+                        debug.logger('candidate ASN.1 spec is a map of:')
+                        for t, v in asn1Spec.getPosMap().items():
+                            debug.logger('  %r -> %s' % (t, v.__class__.__name__))
+                        if asn1Spec.getNegMap():
+                            debug.logger('but neither of: ')
+                            for i in asn1Spec.getNegMap().items():
+                                debug.logger('  %r -> %s' % (t, v.__class__.__name__))
+                        debug.logger('new candidate ASN.1 spec is %s, chosen by %r' % (__chosenSpec is None and '<none>' or __chosenSpec.__class__.__name__, tagSet))
+                else:
+                    __chosenSpec = asn1Spec
+                    debug.logger and debug.logger & debug.flagDecoder and debug.logger('candidate ASN.1 spec is %s' % asn1Spec.__class__.__name__)
+                if __chosenSpec is not None and (
+                       tagSet == __chosenSpec.getTagSet() or \
+                       tagSet in __chosenSpec.getTagMap()
+                       ):
+                    # use base type for codec lookup to recover untagged types
+                    baseTagSet = __chosenSpec.baseTagSet
+                    if __chosenSpec.typeId is not None and \
+                           __chosenSpec.typeId in self.__typeMap:
+                        # ambiguous type
+                        concreteDecoder = self.__typeMap[__chosenSpec.typeId]
+                        debug.logger and debug.logger & debug.flagDecoder and debug.logger('value decoder chosen for an ambiguous type by type ID %s' % (__chosenSpec.typeId,))
+                    elif baseTagSet in self.__tagMap:
+                        # base type or tagged subtype
+                        concreteDecoder = self.__tagMap[baseTagSet]
+                        debug.logger and debug.logger & debug.flagDecoder and debug.logger('value decoder chosen by base %r' % (baseTagSet,))
+                    else:
+                        concreteDecoder = None
+                    if concreteDecoder:
+                        asn1Spec = __chosenSpec
+                        state = stDecodeValue
+                    else:
+                        state = stTryAsExplicitTag
+                elif tagSet == self.__endOfOctetsTagSet:
+                    concreteDecoder = self.__tagMap[tagSet]
+                    state = stDecodeValue
+                    debug.logger and debug.logger & debug.flagDecoder and debug.logger('end-of-octets found')
+                else:
+                    concreteDecoder = None
+                    state = stTryAsExplicitTag
+                if debug.logger and debug.logger & debug.flagDecoder:
+                    debug.logger('codec %s chosen by ASN.1 spec, decoding %s' % (state == stDecodeValue and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as explicit tag'))
+                    debug.scope.push(__chosenSpec is None and '?' or __chosenSpec.__class__.__name__)
+            if state == stTryAsExplicitTag:
+                if tagSet and \
+                       tagSet[0][1] == tag.tagFormatConstructed and \
+                       tagSet[0][0] != tag.tagClassUniversal:
+                    # Assume explicit tagging
+                    concreteDecoder = explicitTagDecoder
+                    state = stDecodeValue
+                else:                    
+                    concreteDecoder = None
+                    state = self.defaultErrorState
+                debug.logger and debug.logger & debug.flagDecoder and debug.logger('codec %s chosen, decoding %s' % (concreteDecoder and concreteDecoder.__class__.__name__ or "<none>", state == stDecodeValue and 'value' or 'as failure'))
+            if state == stDumpRawValue:
+                concreteDecoder = self.defaultRawDecoder
+                debug.logger and debug.logger & debug.flagDecoder and debug.logger('codec %s chosen, decoding value' % concreteDecoder.__class__.__name__)
+                state = stDecodeValue
+            if state == stDecodeValue:
+                if recursiveFlag == 0 and not substrateFun: # legacy
+                    substrateFun = lambda a,b,c: (a,b[:c])
+                if length == -1:  # indef length
+                    value, substrate = concreteDecoder.indefLenValueDecoder(
+                        fullSubstrate, substrate, asn1Spec, tagSet, length,
+                        stGetValueDecoder, self, substrateFun
+                        )
+                else:
+                    value, substrate = concreteDecoder.valueDecoder(
+                        fullSubstrate, substrate, asn1Spec, tagSet, length,
+                        stGetValueDecoder, self, substrateFun
+                        )
+                state = stStop
+                debug.logger and debug.logger & debug.flagDecoder and debug.logger('codec %s yields type %s, value:\n%s\n...remaining substrate is: %s' % (concreteDecoder.__class__.__name__, value.__class__.__name__, value.prettyPrint(), substrate and debug.hexdump(substrate) or '<none>'))
+            if state == stErrorCondition:
+                raise error.PyAsn1Error(
+                    '%r not in asn1Spec: %r' % (tagSet, asn1Spec)
+                    )
+        if debug.logger and debug.logger & debug.flagDecoder:
+            debug.scope.pop()
+            debug.logger('decoder left scope %s, call completed' % debug.scope)
+        return value, substrate
+            
+decode = Decoder(tagMap, typeMap)
+
+# XXX
+# non-recursive decoding; return position rather than substrate
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/encoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/encoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/encoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/encoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,353 @@
+# BER encoder
+from pyasn1.type import base, tag, univ, char, useful
+from pyasn1.codec.ber import eoo
+from pyasn1.compat.octets import int2oct, oct2int, ints2octs, null, str2octs
+from pyasn1 import debug, error
+
+class Error(Exception): pass
+
+class AbstractItemEncoder:
+    supportIndefLenMode = 1
+    def encodeTag(self, t, isConstructed):
+        tagClass, tagFormat, tagId = t.asTuple()  # this is a hotspot
+        v = tagClass | tagFormat
+        if isConstructed:
+            v = v|tag.tagFormatConstructed
+        if tagId < 31:
+            return int2oct(v|tagId)
+        else:
+            s = int2oct(tagId&0x7f)
+            tagId = tagId >> 7
+            while tagId:
+                s = int2oct(0x80|(tagId&0x7f)) + s
+                tagId = tagId >> 7
+            return int2oct(v|0x1F) + s
+
+    def encodeLength(self, length, defMode):
+        if not defMode and self.supportIndefLenMode:
+            return int2oct(0x80)
+        if length < 0x80:
+            return int2oct(length)
+        else:
+            substrate = null
+            while length:
+                substrate = int2oct(length&0xff) + substrate
+                length = length >> 8
+            substrateLen = len(substrate)
+            if substrateLen > 126:
+                raise Error('Length octets overflow (%d)' % substrateLen)
+            return int2oct(0x80 | substrateLen) + substrate
+
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        raise Error('Not implemented')
+
+    def _encodeEndOfOctets(self, encodeFun, defMode):
+        if defMode or not self.supportIndefLenMode:
+            return null
+        else:
+            return encodeFun(eoo.endOfOctets, defMode)
+        
+    def encode(self, encodeFun, value, defMode, maxChunkSize):
+        substrate, isConstructed = self.encodeValue(
+            encodeFun, value, defMode, maxChunkSize
+            )
+        tagSet = value.getTagSet()
+        if tagSet:
+            if not isConstructed:  # primitive form implies definite mode
+                defMode = 1
+            return self.encodeTag(
+                tagSet[-1], isConstructed
+                ) + self.encodeLength(
+                len(substrate), defMode
+                ) + substrate + self._encodeEndOfOctets(encodeFun, defMode)
+        else:
+            return substrate  # untagged value
+
+class EndOfOctetsEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        return null, 0
+
+class ExplicitlyTaggedItemEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        if isinstance(value, base.AbstractConstructedAsn1Item):
+            value = value.clone(tagSet=value.getTagSet()[:-1],
+                                cloneValueFlag=1)
+        else:
+            value = value.clone(tagSet=value.getTagSet()[:-1])
+        return encodeFun(value, defMode, maxChunkSize), 1
+
+explicitlyTaggedItemEncoder = ExplicitlyTaggedItemEncoder()
+
+class BooleanEncoder(AbstractItemEncoder):
+    supportIndefLenMode = 0
+    _true = ints2octs((1,))
+    _false = ints2octs((0,))
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        return value and self._true or self._false, 0
+
+class IntegerEncoder(AbstractItemEncoder):
+    supportIndefLenMode = 0
+    supportCompactZero = False
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        if value == 0:  # shortcut for zero value
+            if self.supportCompactZero:
+                # this seems to be a correct way for encoding zeros
+                return null, 0
+            else:
+                # this seems to be a widespread way for encoding zeros
+                return ints2octs((0,)), 0
+        octets = []
+        value = int(value) # to save on ops on asn1 type
+        while 1:
+            octets.insert(0, value & 0xff)
+            if value == 0 or value == -1:
+                break
+            value = value >> 8
+        if value == 0 and octets[0] & 0x80:
+            octets.insert(0, 0)
+        while len(octets) > 1 and \
+                  (octets[0] == 0 and octets[1] & 0x80 == 0 or \
+                   octets[0] == 0xff and octets[1] & 0x80 != 0):
+            del octets[0]
+        return ints2octs(octets), 0
+
+class BitStringEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        if not maxChunkSize or len(value) <= maxChunkSize*8:
+            r = {}; l = len(value); p = 0; j = 7
+            while p < l:
+                i, j = divmod(p, 8)
+                r[i] = r.get(i,0) | value[p]<<(7-j)
+                p = p + 1
+            keys = list(r); keys.sort()
+            return int2oct(7-j) + ints2octs([r[k] for k in keys]), 0
+        else:
+            pos = 0; substrate = null
+            while 1:
+                # count in octets
+                v = value.clone(value[pos*8:pos*8+maxChunkSize*8])
+                if not v:
+                    break
+                substrate = substrate + encodeFun(v, defMode, maxChunkSize)
+                pos = pos + maxChunkSize
+            return substrate, 1
+
+class OctetStringEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        if not maxChunkSize or len(value) <= maxChunkSize:
+            return value.asOctets(), 0
+        else:
+            pos = 0; substrate = null
+            while 1:
+                v = value.clone(value[pos:pos+maxChunkSize])
+                if not v:
+                    break
+                substrate = substrate + encodeFun(v, defMode, maxChunkSize)
+                pos = pos + maxChunkSize
+            return substrate, 1
+
+class NullEncoder(AbstractItemEncoder):
+    supportIndefLenMode = 0
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        return null, 0
+
+class ObjectIdentifierEncoder(AbstractItemEncoder):
+    supportIndefLenMode = 0
+    precomputedValues = {
+        (1, 3, 6, 1, 2): (43, 6, 1, 2),        
+        (1, 3, 6, 1, 4): (43, 6, 1, 4)
+        }
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):    
+        oid = value.asTuple()
+        if oid[:5] in self.precomputedValues:
+            octets = self.precomputedValues[oid[:5]]
+            index = 5
+        else:
+            if len(oid) < 2:
+                raise error.PyAsn1Error('Short OID %s' % (value,))
+
+            # Build the first twos
+            if oid[0] > 6 or oid[1] > 39 or oid[0] == 6 and oid[1] > 15:
+                raise error.PyAsn1Error(
+                    'Initial sub-ID overflow %s in OID %s' % (oid[:2], value)
+                    )
+            octets = (oid[0] * 40 + oid[1],)
+            index = 2
+
+        # Cycle through subids
+        for subid in oid[index:]:
+            if subid > -1 and subid < 128:
+                # Optimize for the common case
+                octets = octets + (subid & 0x7f,)
+            elif subid < 0 or subid > 0xFFFFFFFF:
+                raise error.PyAsn1Error(
+                    'SubId overflow %s in %s' % (subid, value)
+                    )
+            else:
+                # Pack large Sub-Object IDs
+                res = (subid & 0x7f,)
+                subid = subid >> 7
+                while subid > 0:
+                    res = (0x80 | (subid & 0x7f),) + res
+                    subid = subid >> 7 
+                # Add packed Sub-Object ID to resulted Object ID
+                octets += res
+                
+        return ints2octs(octets), 0
+
+class RealEncoder(AbstractItemEncoder):
+    supportIndefLenMode = 0
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        if value.isPlusInfinity():
+            return int2oct(0x40), 0
+        if value.isMinusInfinity():
+            return int2oct(0x41), 0
+        m, b, e = value
+        if not m:
+            return null, 0
+        if b == 10:
+            return str2octs('\x03%dE%s%d' % (m, e == 0 and '+' or '', e)), 0
+        elif b == 2:
+            fo = 0x80                 # binary enoding
+            if m < 0:
+                fo = fo | 0x40  # sign bit
+                m = -m
+            while int(m) != m: # drop floating point
+                m *= 2
+                e -= 1
+            while m & 0x1 == 0: # mantissa normalization
+                m >>= 1
+                e += 1
+            eo = null
+            while e not in (0, -1):
+                eo = int2oct(e&0xff) + eo
+                e >>= 8
+            if e == 0 and eo and oct2int(eo[0]) & 0x80:
+                eo = int2oct(0) + eo
+            n = len(eo)
+            if n > 0xff:
+                raise error.PyAsn1Error('Real exponent overflow')
+            if n == 1:
+                pass
+            elif n == 2:
+                fo |= 1
+            elif n == 3:
+                fo |= 2
+            else:
+                fo |= 3
+                eo = int2oct(n//0xff+1) + eo
+            po = null
+            while m:
+                po = int2oct(m&0xff) + po
+                m >>= 8
+            substrate = int2oct(fo) + eo + po
+            return substrate, 0
+        else:
+            raise error.PyAsn1Error('Prohibited Real base %s' % b)
+
+class SequenceEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        value.setDefaultComponents()
+        value.verifySizeSpec()
+        substrate = null; idx = len(value)
+        while idx > 0:
+            idx = idx - 1
+            if value[idx] is None:  # Optional component
+                continue
+            component = value.getDefaultComponentByPosition(idx)
+            if component is not None and component == value[idx]:
+                continue
+            substrate = encodeFun(
+                value[idx], defMode, maxChunkSize
+                ) + substrate
+        return substrate, 1
+
+class SequenceOfEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        value.verifySizeSpec()
+        substrate = null; idx = len(value)
+        while idx > 0:
+            idx = idx - 1
+            substrate = encodeFun(
+                value[idx], defMode, maxChunkSize
+                ) + substrate
+        return substrate, 1
+
+class ChoiceEncoder(AbstractItemEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        return encodeFun(value.getComponent(), defMode, maxChunkSize), 1
+
+class AnyEncoder(OctetStringEncoder):
+    def encodeValue(self, encodeFun, value, defMode, maxChunkSize):
+        return value.asOctets(), defMode == 0
+
+tagMap = {
+    eoo.endOfOctets.tagSet: EndOfOctetsEncoder(),
+    univ.Boolean.tagSet: BooleanEncoder(),
+    univ.Integer.tagSet: IntegerEncoder(),
+    univ.BitString.tagSet: BitStringEncoder(),
+    univ.OctetString.tagSet: OctetStringEncoder(),
+    univ.Null.tagSet: NullEncoder(),
+    univ.ObjectIdentifier.tagSet: ObjectIdentifierEncoder(),
+    univ.Enumerated.tagSet: IntegerEncoder(),
+    univ.Real.tagSet: RealEncoder(),
+    # Sequence & Set have same tags as SequenceOf & SetOf
+    univ.SequenceOf.tagSet: SequenceOfEncoder(),
+    univ.SetOf.tagSet: SequenceOfEncoder(),
+    univ.Choice.tagSet: ChoiceEncoder(),
+    # character string types
+    char.UTF8String.tagSet: OctetStringEncoder(),
+    char.NumericString.tagSet: OctetStringEncoder(),
+    char.PrintableString.tagSet: OctetStringEncoder(),
+    char.TeletexString.tagSet: OctetStringEncoder(),
+    char.VideotexString.tagSet: OctetStringEncoder(),
+    char.IA5String.tagSet: OctetStringEncoder(),
+    char.GraphicString.tagSet: OctetStringEncoder(),
+    char.VisibleString.tagSet: OctetStringEncoder(),
+    char.GeneralString.tagSet: OctetStringEncoder(),
+    char.UniversalString.tagSet: OctetStringEncoder(),
+    char.BMPString.tagSet: OctetStringEncoder(),
+    # useful types
+    useful.GeneralizedTime.tagSet: OctetStringEncoder(),
+    useful.UTCTime.tagSet: OctetStringEncoder()        
+    }
+
+# Type-to-codec map for ambiguous ASN.1 types
+typeMap = {
+    univ.Set.typeId: SequenceEncoder(),
+    univ.SetOf.typeId: SequenceOfEncoder(),
+    univ.Sequence.typeId: SequenceEncoder(),
+    univ.SequenceOf.typeId: SequenceOfEncoder(),
+    univ.Choice.typeId: ChoiceEncoder(),
+    univ.Any.typeId: AnyEncoder()
+    }
+
+class Encoder:
+    def __init__(self, tagMap, typeMap={}):
+        self.__tagMap = tagMap
+        self.__typeMap = typeMap
+
+    def __call__(self, value, defMode=1, maxChunkSize=0):
+        debug.logger & debug.flagEncoder and debug.logger('encoder called in %sdef mode, chunk size %s for type %s, value:\n%s' % (not defMode and 'in' or '', maxChunkSize, value.__class__.__name__, value.prettyPrint()))
+        tagSet = value.getTagSet()
+        if len(tagSet) > 1:
+            concreteEncoder = explicitlyTaggedItemEncoder
+        else:
+            if value.typeId is not None and value.typeId in self.__typeMap:
+                concreteEncoder = self.__typeMap[value.typeId]
+            elif tagSet in self.__tagMap:
+                concreteEncoder = self.__tagMap[tagSet]
+            else:
+                tagSet = value.baseTagSet
+                if tagSet in self.__tagMap:
+                    concreteEncoder = self.__tagMap[tagSet]
+                else:
+                    raise Error('No encoder for %s' % (value,))
+        debug.logger & debug.flagEncoder and debug.logger('using value codec %s chosen by %r' % (concreteEncoder.__class__.__name__, tagSet))
+        substrate = concreteEncoder.encode(
+            self, value, defMode, maxChunkSize
+            )
+        debug.logger & debug.flagEncoder and debug.logger('built %s octets of substrate: %s\nencoder completed' % (len(substrate), debug.hexdump(substrate)))
+        return substrate
+
+encode = Encoder(tagMap, typeMap)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/eoo.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/eoo.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/eoo.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/eoo.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,8 @@
+from pyasn1.type import base, tag
+
+class EndOfOctets(base.AbstractSimpleAsn1Item):
+    defaultValue = 0
+    tagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x00)
+        )
+endOfOctets = EndOfOctets()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/ber/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/ber/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/cer/decoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/cer/decoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/cer/decoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/cer/decoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,35 @@
+# CER decoder
+from pyasn1.type import univ
+from pyasn1.codec.ber import decoder
+from pyasn1.compat.octets import oct2int
+from pyasn1 import error
+
+class BooleanDecoder(decoder.AbstractSimpleDecoder):
+    protoComponent = univ.Boolean(0)
+    def valueDecoder(self, fullSubstrate, substrate, asn1Spec, tagSet, length,
+                     state, decodeFun, substrateFun):
+        head, tail = substrate[:length], substrate[length:]
+        if not head:
+            raise error.PyAsn1Error('Empty substrate')
+        byte = oct2int(head[0])
+        # CER/DER specifies encoding of TRUE as 0xFF and FALSE as 0x0, while
+        # BER allows any non-zero value as TRUE; cf. sections 8.2.2. and 11.1 
+        # in http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+        if byte == 0xff:
+            value = 1
+        elif byte == 0x00:
+            value = 0
+        else:
+            raise error.PyAsn1Error('Boolean CER violation: %s' % byte)
+        return self._createComponent(asn1Spec, tagSet, value), tail
+
+tagMap = decoder.tagMap.copy()
+tagMap.update({
+    univ.Boolean.tagSet: BooleanDecoder()
+    })
+
+typeMap = decoder.typeMap
+
+class Decoder(decoder.Decoder): pass
+
+decode = Decoder(tagMap, decoder.typeMap)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/cer/encoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/cer/encoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/cer/encoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/cer/encoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,87 @@
+# CER encoder
+from pyasn1.type import univ
+from pyasn1.codec.ber import encoder
+from pyasn1.compat.octets import int2oct, null
+
+class BooleanEncoder(encoder.IntegerEncoder):
+    def encodeValue(self, encodeFun, client, defMode, maxChunkSize):
+        if client == 0:
+            substrate = int2oct(0)
+        else:
+            substrate = int2oct(255)
+        return substrate, 0
+
+class BitStringEncoder(encoder.BitStringEncoder):
+    def encodeValue(self, encodeFun, client, defMode, maxChunkSize):
+        return encoder.BitStringEncoder.encodeValue(
+            self, encodeFun, client, defMode, 1000
+            )
+
+class OctetStringEncoder(encoder.OctetStringEncoder):
+    def encodeValue(self, encodeFun, client, defMode, maxChunkSize):
+        return encoder.OctetStringEncoder.encodeValue(
+            self, encodeFun, client, defMode, 1000
+            )
+
+# specialized RealEncoder here
+# specialized GeneralStringEncoder here
+# specialized GeneralizedTimeEncoder here
+# specialized UTCTimeEncoder here
+
+class SetOfEncoder(encoder.SequenceOfEncoder):
+    def encodeValue(self, encodeFun, client, defMode, maxChunkSize):
+        if isinstance(client, univ.SequenceAndSetBase):
+            client.setDefaultComponents()
+        client.verifySizeSpec()
+        substrate = null; idx = len(client)
+        # This is certainly a hack but how else do I distinguish SetOf
+        # from Set if they have the same tags&constraints?
+        if isinstance(client, univ.SequenceAndSetBase):
+            # Set
+            comps = []
+            while idx > 0:
+                idx = idx - 1
+                if client[idx] is None:  # Optional component
+                    continue
+                if client.getDefaultComponentByPosition(idx) == client[idx]:
+                    continue
+                comps.append(client[idx])
+            comps.sort(key=lambda x: isinstance(x, univ.Choice) and \
+                                     x.getMinTagSet() or x.getTagSet())
+            for c in comps:
+                substrate += encodeFun(c, defMode, maxChunkSize)
+        else:
+            # SetOf
+            compSubs = []
+            while idx > 0:
+                idx = idx - 1
+                compSubs.append(
+                    encodeFun(client[idx], defMode, maxChunkSize)
+                    )
+            compSubs.sort()  # perhaps padding's not needed
+            substrate = null
+            for compSub in compSubs:
+                substrate += compSub
+        return substrate, 1
+
+tagMap = encoder.tagMap.copy()
+tagMap.update({
+    univ.Boolean.tagSet: BooleanEncoder(),
+    univ.BitString.tagSet: BitStringEncoder(),
+    univ.OctetString.tagSet: OctetStringEncoder(),
+    univ.SetOf().tagSet: SetOfEncoder()  # conflcts with Set
+    })
+
+typeMap = encoder.typeMap.copy()
+typeMap.update({
+    univ.Set.typeId: SetOfEncoder(),
+    univ.SetOf.typeId: SetOfEncoder()
+    })
+
+class Encoder(encoder.Encoder):
+    def __call__(self, client, defMode=0, maxChunkSize=0):
+        return encoder.Encoder.__call__(self, client, defMode, maxChunkSize)
+
+encode = Encoder(tagMap, typeMap)
+
+# EncoderFactory queries class instance and builds a map of tags -> encoders
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/cer/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/cer/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/cer/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/cer/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/der/decoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/der/decoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/der/decoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/der/decoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,9 @@
+# DER decoder
+from pyasn1.type import univ
+from pyasn1.codec.cer import decoder
+
+tagMap = decoder.tagMap
+typeMap = decoder.typeMap
+Decoder = decoder.Decoder
+
+decode = Decoder(tagMap, typeMap)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/der/encoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/der/encoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/der/encoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/der/encoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,28 @@
+# DER encoder
+from pyasn1.type import univ
+from pyasn1.codec.cer import encoder
+
+class SetOfEncoder(encoder.SetOfEncoder):
+    def _cmpSetComponents(self, c1, c2):
+        tagSet1 = isinstance(c1, univ.Choice) and \
+                  c1.getEffectiveTagSet() or c1.getTagSet()
+        tagSet2 = isinstance(c2, univ.Choice) and \
+                  c2.getEffectiveTagSet() or c2.getTagSet()        
+        return cmp(tagSet1, tagSet2)
+
+tagMap = encoder.tagMap.copy()
+tagMap.update({
+    # Overload CER encodrs with BER ones (a bit hackerish XXX)
+    univ.BitString.tagSet: encoder.encoder.BitStringEncoder(),
+    univ.OctetString.tagSet: encoder.encoder.OctetStringEncoder(),
+    # Set & SetOf have same tags
+    univ.SetOf().tagSet: SetOfEncoder()
+    })
+
+typeMap = encoder.typeMap
+
+class Encoder(encoder.Encoder):
+    def __call__(self, client, defMode=1, maxChunkSize=0):
+        return encoder.Encoder.__call__(self, client, defMode, maxChunkSize)
+        
+encode = Encoder(tagMap, typeMap)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/der/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/der/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/der/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/der/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/codec/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/codec/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/compat/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/compat/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/compat/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/compat/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/compat/octets.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/compat/octets.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/compat/octets.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/compat/octets.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,20 @@
+from sys import version_info
+
+if version_info[0] <= 2:
+    int2oct = chr
+    ints2octs = lambda s: ''.join([ int2oct(x) for x in s ])
+    null = ''
+    oct2int = ord
+    octs2ints = lambda s: [ oct2int(x) for x in s ]
+    str2octs = lambda x: x
+    octs2str = lambda x: x
+    isOctetsType = lambda s: isinstance(s, str)
+else:
+    ints2octs = bytes
+    int2oct = lambda x: ints2octs((x,))
+    null = ints2octs()
+    oct2int = lambda x: x
+    octs2ints = lambda s: [ x for x in s ]
+    str2octs = lambda x: x.encode()
+    octs2str = lambda x: x.decode()
+    isOctetsType = lambda s: isinstance(s, bytes)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/debug.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/debug.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/debug.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/debug.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,65 @@
+import sys
+from pyasn1.compat.octets import octs2ints
+from pyasn1 import error
+from pyasn1 import __version__
+
+flagNone     = 0x0000
+flagEncoder  = 0x0001
+flagDecoder  = 0x0002
+flagAll      = 0xffff
+
+flagMap = {
+    'encoder': flagEncoder,
+    'decoder': flagDecoder,
+    'all': flagAll
+    }
+
+class Debug:
+    defaultPrinter = sys.stderr.write
+    def __init__(self, *flags):
+        self._flags = flagNone
+        self._printer = self.defaultPrinter
+        self('running pyasn1 version %s' % __version__)
+        for f in flags:
+            if f not in flagMap:
+                raise error.PyAsn1Error('bad debug flag %s' % (f,))
+            self._flags = self._flags | flagMap[f]
+            self('debug category \'%s\' enabled' % f)
+        
+    def __str__(self):
+        return 'logger %s, flags %x' % (self._printer, self._flags)
+    
+    def __call__(self, msg):
+        self._printer('DBG: %s\n' % msg)
+
+    def __and__(self, flag):
+        return self._flags & flag
+
+    def __rand__(self, flag):
+        return flag & self._flags
+
+logger = 0
+
+def setLogger(l):
+    global logger
+    logger = l
+
+def hexdump(octets):
+    return ' '.join(
+            [ '%s%.2X' % (n%16 == 0 and ('\n%.5d: ' % n) or '', x) 
+              for n,x in zip(range(len(octets)), octs2ints(octets)) ]
+        )
+
+class Scope:
+    def __init__(self):
+        self._list = []
+
+    def __str__(self): return '.'.join(self._list)
+
+    def push(self, token):
+        self._list.append(token)
+
+    def pop(self):
+        return self._list.pop()
+
+scope = Scope()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/error.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/error.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/error.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/error.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,3 @@
+class PyAsn1Error(Exception): pass
+class ValueConstraintError(PyAsn1Error): pass
+class SubstrateUnderrunError(PyAsn1Error): pass
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,8 @@
+import sys
+
+# http://www.python.org/dev/peps/pep-0396/
+__version__ = '0.1.7'
+
+if sys.version_info[:2] < (2, 4):
+  raise RuntimeError('PyASN1 requires Python 2.4 or later')
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/base.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/base.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/base.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/base.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,249 @@
+# Base classes for ASN.1 types
+import sys
+from pyasn1.type import constraint, tagmap
+from pyasn1 import error
+
+class Asn1Item: pass
+
+class Asn1ItemBase(Asn1Item):
+    # Set of tags for this ASN.1 type
+    tagSet = ()
+    
+    # A list of constraint.Constraint instances for checking values
+    subtypeSpec = constraint.ConstraintsIntersection()
+
+    # Used for ambiguous ASN.1 types identification
+    typeId = None
+    
+    def __init__(self, tagSet=None, subtypeSpec=None):
+        if tagSet is None:
+            self._tagSet = self.tagSet
+        else:
+            self._tagSet = tagSet
+        if subtypeSpec is None:
+            self._subtypeSpec = self.subtypeSpec
+        else:
+            self._subtypeSpec = subtypeSpec
+
+    def _verifySubtypeSpec(self, value, idx=None):
+        try:
+            self._subtypeSpec(value, idx)
+        except error.PyAsn1Error:
+            c, i, t = sys.exc_info()
+            raise c('%s at %s' % (i, self.__class__.__name__))
+        
+    def getSubtypeSpec(self): return self._subtypeSpec
+    
+    def getTagSet(self): return self._tagSet
+    def getEffectiveTagSet(self): return self._tagSet  # used by untagged types
+    def getTagMap(self): return tagmap.TagMap({self._tagSet: self})
+    
+    def isSameTypeWith(self, other):
+        return self is other or \
+               self._tagSet == other.getTagSet() and \
+               self._subtypeSpec == other.getSubtypeSpec()
+    def isSuperTypeOf(self, other):
+        """Returns true if argument is a ASN1 subtype of ourselves"""
+        return self._tagSet.isSuperTagSetOf(other.getTagSet()) and \
+               self._subtypeSpec.isSuperTypeOf(other.getSubtypeSpec())
+
+class __NoValue:
+    def __getattr__(self, attr):
+        raise error.PyAsn1Error('No value for %s()' % attr)
+    def __getitem__(self, i):
+        raise error.PyAsn1Error('No value')
+    
+noValue = __NoValue()
+
+# Base class for "simple" ASN.1 objects. These are immutable.
+class AbstractSimpleAsn1Item(Asn1ItemBase):    
+    defaultValue = noValue
+    def __init__(self, value=None, tagSet=None, subtypeSpec=None):
+        Asn1ItemBase.__init__(self, tagSet, subtypeSpec)
+        if value is None or value is noValue:
+            value = self.defaultValue
+        if value is None or value is noValue:
+            self.__hashedValue = value = noValue
+        else:
+            value = self.prettyIn(value)
+            self._verifySubtypeSpec(value)
+            self.__hashedValue = hash(value)
+        self._value = value
+        self._len = None
+        
+    def __repr__(self):
+        if self._value is noValue:
+            return self.__class__.__name__ + '()'
+        else:
+            return self.__class__.__name__ + '(%s)' % (self.prettyOut(self._value),)
+    def __str__(self): return str(self._value)
+    def __eq__(self, other):
+        return self is other and True or self._value == other
+    def __ne__(self, other): return self._value != other
+    def __lt__(self, other): return self._value < other
+    def __le__(self, other): return self._value <= other
+    def __gt__(self, other): return self._value > other
+    def __ge__(self, other): return self._value >= other
+    if sys.version_info[0] <= 2:
+        def __nonzero__(self): return bool(self._value)
+    else:
+        def __bool__(self): return bool(self._value)
+    def __hash__(self): return self.__hashedValue
+
+    def clone(self, value=None, tagSet=None, subtypeSpec=None):
+        if value is None and tagSet is None and subtypeSpec is None:
+            return self
+        if value is None:
+            value = self._value
+        if tagSet is None:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        return self.__class__(value, tagSet, subtypeSpec)
+
+    def subtype(self, value=None, implicitTag=None, explicitTag=None,
+                subtypeSpec=None):
+        if value is None:
+            value = self._value
+        if implicitTag is not None:
+            tagSet = self._tagSet.tagImplicitly(implicitTag)
+        elif explicitTag is not None:
+            tagSet = self._tagSet.tagExplicitly(explicitTag)
+        else:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        else:
+            subtypeSpec = subtypeSpec + self._subtypeSpec
+        return self.__class__(value, tagSet, subtypeSpec)
+
+    def prettyIn(self, value): return value
+    def prettyOut(self, value): return str(value)
+
+    def prettyPrint(self, scope=0):
+        if self._value is noValue:
+            return '<no value>'
+        else:
+            return self.prettyOut(self._value)
+
+    # XXX Compatibility stub
+    def prettyPrinter(self, scope=0): return self.prettyPrint(scope)
+    
+#
+# Constructed types:
+# * There are five of them: Sequence, SequenceOf/SetOf, Set and Choice
+# * ASN1 types and values are represened by Python class instances
+# * Value initialization is made for defaulted components only
+# * Primary method of component addressing is by-position. Data model for base
+#   type is Python sequence. Additional type-specific addressing methods
+#   may be implemented for particular types.
+# * SequenceOf and SetOf types do not implement any additional methods
+# * Sequence, Set and Choice types also implement by-identifier addressing
+# * Sequence, Set and Choice types also implement by-asn1-type (tag) addressing
+# * Sequence and Set types may include optional and defaulted
+#   components
+# * Constructed types hold a reference to component types used for value
+#   verification and ordering.
+# * Component type is a scalar type for SequenceOf/SetOf types and a list
+#   of types for Sequence/Set/Choice.
+#
+
+class AbstractConstructedAsn1Item(Asn1ItemBase):
+    componentType = None
+    sizeSpec = constraint.ConstraintsIntersection()
+    def __init__(self, componentType=None, tagSet=None,
+                 subtypeSpec=None, sizeSpec=None):
+        Asn1ItemBase.__init__(self, tagSet, subtypeSpec)
+        if componentType is None:
+            self._componentType = self.componentType
+        else:
+            self._componentType = componentType
+        if sizeSpec is None:
+            self._sizeSpec = self.sizeSpec
+        else:
+            self._sizeSpec = sizeSpec
+        self._componentValues = []
+        self._componentValuesSet = 0
+
+    def __repr__(self):
+        r = self.__class__.__name__ + '()'
+        for idx in range(len(self._componentValues)):
+            if self._componentValues[idx] is None:
+                continue
+            r = r + '.setComponentByPosition(%s, %r)' % (
+                idx, self._componentValues[idx]
+                )
+        return r
+
+    def __eq__(self, other):
+        return self is other and True or self._componentValues == other
+    def __ne__(self, other): return self._componentValues != other
+    def __lt__(self, other): return self._componentValues < other
+    def __le__(self, other): return self._componentValues <= other
+    def __gt__(self, other): return self._componentValues > other
+    def __ge__(self, other): return self._componentValues >= other
+    if sys.version_info[0] <= 2:
+        def __nonzero__(self): return bool(self._componentValues)
+    else:
+        def __bool__(self): return bool(self._componentValues)
+
+    def getComponentTagMap(self):
+        raise error.PyAsn1Error('Method not implemented')
+
+    def _cloneComponentValues(self, myClone, cloneValueFlag): pass
+
+    def clone(self, tagSet=None, subtypeSpec=None, sizeSpec=None, 
+              cloneValueFlag=None):
+        if tagSet is None:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        if sizeSpec is None:
+            sizeSpec = self._sizeSpec
+        r = self.__class__(self._componentType, tagSet, subtypeSpec, sizeSpec)
+        if cloneValueFlag:
+            self._cloneComponentValues(r, cloneValueFlag)
+        return r
+
+    def subtype(self, implicitTag=None, explicitTag=None, subtypeSpec=None,
+                sizeSpec=None, cloneValueFlag=None):
+        if implicitTag is not None:
+            tagSet = self._tagSet.tagImplicitly(implicitTag)
+        elif explicitTag is not None:
+            tagSet = self._tagSet.tagExplicitly(explicitTag)
+        else:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        else:
+            subtypeSpec = subtypeSpec + self._subtypeSpec
+        if sizeSpec is None:
+            sizeSpec = self._sizeSpec
+        else:
+            sizeSpec = sizeSpec + self._sizeSpec
+        r = self.__class__(self._componentType, tagSet, subtypeSpec, sizeSpec)
+        if cloneValueFlag:
+            self._cloneComponentValues(r, cloneValueFlag)
+        return r
+
+    def _verifyComponent(self, idx, value): pass
+
+    def verifySizeSpec(self): self._sizeSpec(self)
+
+    def getComponentByPosition(self, idx):
+        raise error.PyAsn1Error('Method not implemented')
+    def setComponentByPosition(self, idx, value, verifyConstraints=True):
+        raise error.PyAsn1Error('Method not implemented')
+
+    def getComponentType(self): return self._componentType
+
+    def __getitem__(self, idx): return self.getComponentByPosition(idx)
+    def __setitem__(self, idx, value): self.setComponentByPosition(idx, value)
+
+    def __len__(self): return len(self._componentValues)
+    
+    def clear(self):
+        self._componentValues = []
+        self._componentValuesSet = 0
+
+    def setDefaultComponents(self): pass
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/char.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/char.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/char.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/char.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,61 @@
+# ASN.1 "character string" types
+from pyasn1.type import univ, tag
+
+class UTF8String(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
+        )
+    encoding = "utf-8"
+
+class NumericString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 18)
+        )
+
+class PrintableString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 19)
+        )
+
+class TeletexString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 20)
+        )
+    
+
+class VideotexString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 21)
+        )
+
+class IA5String(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 22)
+        )
+
+class GraphicString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 25)
+        )
+
+class VisibleString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 26)
+        )
+
+class GeneralString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 27)
+        )
+
+class UniversalString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 28)
+        )
+    encoding = "utf-32-be"
+
+class BMPString(univ.OctetString):
+    tagSet = univ.OctetString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 30)
+        )
+    encoding = "utf-16-be"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/constraint.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/constraint.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/constraint.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/constraint.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,200 @@
+#
+#   ASN.1 subtype constraints classes.
+#
+#   Constraints are relatively rare, but every ASN1 object
+#   is doing checks all the time for whether they have any
+#   constraints and whether they are applicable to the object.
+#
+#   What we're going to do is define objects/functions that
+#   can be called unconditionally if they are present, and that
+#   are simply not present if there are no constraints.
+#
+#   Original concept and code by Mike C. Fletcher.
+#
+import sys
+from pyasn1.type import error
+
+class AbstractConstraint:
+    """Abstract base-class for constraint objects
+
+       Constraints should be stored in a simple sequence in the
+       namespace of their client Asn1Item sub-classes.
+    """
+    def __init__(self, *values):
+        self._valueMap = {}
+        self._setValues(values)
+        self.__hashedValues = None
+    def __call__(self, value, idx=None):
+        try:
+            self._testValue(value, idx)
+        except error.ValueConstraintError:
+            raise error.ValueConstraintError(
+               '%s failed at: \"%s\"' % (self, sys.exc_info()[1])
+            )
+    def __repr__(self):
+        return '%s(%s)' % (
+            self.__class__.__name__,
+            ', '.join([repr(x) for x in self._values])
+        )
+    def __eq__(self, other):
+        return self is other and True or self._values == other
+    def __ne__(self, other): return self._values != other
+    def __lt__(self, other): return self._values < other
+    def __le__(self, other): return self._values <= other
+    def __gt__(self, other): return self._values > other
+    def __ge__(self, other): return self._values >= other
+    if sys.version_info[0] <= 2:
+        def __nonzero__(self): return bool(self._values)
+    else:
+        def __bool__(self): return bool(self._values)
+
+    def __hash__(self):
+        if self.__hashedValues is None:
+            self.__hashedValues = hash((self.__class__.__name__, self._values))
+        return self.__hashedValues
+
+    def _setValues(self, values): self._values = values
+    def _testValue(self, value, idx):
+        raise error.ValueConstraintError(value)
+
+    # Constraints derivation logic
+    def getValueMap(self): return self._valueMap
+    def isSuperTypeOf(self, otherConstraint):
+        return self in otherConstraint.getValueMap() or \
+               otherConstraint is self or otherConstraint == self
+    def isSubTypeOf(self, otherConstraint):
+        return otherConstraint in self._valueMap or \
+               otherConstraint is self or otherConstraint == self
+
+class SingleValueConstraint(AbstractConstraint):
+    """Value must be part of defined values constraint"""
+    def _testValue(self, value, idx):
+        # XXX index vals for performance?
+        if value not in self._values:
+            raise error.ValueConstraintError(value)
+
+class ContainedSubtypeConstraint(AbstractConstraint):
+    """Value must satisfy all of defined set of constraints"""
+    def _testValue(self, value, idx):
+        for c in self._values:
+            c(value, idx)
+
+class ValueRangeConstraint(AbstractConstraint):
+    """Value must be within start and stop values (inclusive)"""
+    def _testValue(self, value, idx):
+        if value < self.start or value > self.stop:
+            raise error.ValueConstraintError(value)
+
+    def _setValues(self, values):
+        if len(values) != 2:
+            raise error.PyAsn1Error(
+                '%s: bad constraint values' % (self.__class__.__name__,)
+                )
+        self.start, self.stop = values
+        if self.start > self.stop:
+            raise error.PyAsn1Error(
+                '%s: screwed constraint values (start > stop): %s > %s' % (
+                    self.__class__.__name__,
+                    self.start, self.stop
+                )
+            )
+        AbstractConstraint._setValues(self, values)
+        
+class ValueSizeConstraint(ValueRangeConstraint):
+    """len(value) must be within start and stop values (inclusive)"""
+    def _testValue(self, value, idx):
+        l = len(value)
+        if l < self.start or l > self.stop:
+            raise error.ValueConstraintError(value)
+
+class PermittedAlphabetConstraint(SingleValueConstraint):
+    def _setValues(self, values):
+        self._values = ()
+        for v in values:
+            self._values = self._values + tuple(v)
+
+    def _testValue(self, value, idx):
+        for v in value:
+            if v not in self._values:
+                raise error.ValueConstraintError(value)
+
+# This is a bit kludgy, meaning two op modes within a single constraing
+class InnerTypeConstraint(AbstractConstraint):
+    """Value must satisfy type and presense constraints"""
+    def _testValue(self, value, idx):
+        if self.__singleTypeConstraint:
+            self.__singleTypeConstraint(value)
+        elif self.__multipleTypeConstraint:
+            if idx not in self.__multipleTypeConstraint:
+                raise error.ValueConstraintError(value)
+            constraint, status = self.__multipleTypeConstraint[idx]
+            if status == 'ABSENT':   # XXX presense is not checked!
+                raise error.ValueConstraintError(value)
+            constraint(value)
+
+    def _setValues(self, values):
+        self.__multipleTypeConstraint = {}
+        self.__singleTypeConstraint = None
+        for v in values:
+            if isinstance(v, tuple):
+                self.__multipleTypeConstraint[v[0]] = v[1], v[2]
+            else:
+                self.__singleTypeConstraint = v
+        AbstractConstraint._setValues(self, values)
+
+# Boolean ops on constraints 
+
+class ConstraintsExclusion(AbstractConstraint):
+    """Value must not fit the single constraint"""
+    def _testValue(self, value, idx):
+        try:
+            self._values[0](value, idx)
+        except error.ValueConstraintError:
+            return
+        else:
+            raise error.ValueConstraintError(value)
+
+    def _setValues(self, values):
+        if len(values) != 1:
+            raise error.PyAsn1Error('Single constraint expected')
+        AbstractConstraint._setValues(self, values)
+
+class AbstractConstraintSet(AbstractConstraint):
+    """Value must not satisfy the single constraint"""
+    def __getitem__(self, idx): return self._values[idx]
+
+    def __add__(self, value): return self.__class__(self, value)
+    def __radd__(self, value): return self.__class__(self, value)
+
+    def __len__(self): return len(self._values)
+
+    # Constraints inclusion in sets
+    
+    def _setValues(self, values):
+        self._values = values
+        for v in values:
+            self._valueMap[v] = 1
+            self._valueMap.update(v.getValueMap())
+
+class ConstraintsIntersection(AbstractConstraintSet):
+    """Value must satisfy all constraints"""
+    def _testValue(self, value, idx):
+        for v in self._values:
+            v(value, idx)
+
+class ConstraintsUnion(AbstractConstraintSet):
+    """Value must satisfy at least one constraint"""
+    def _testValue(self, value, idx):
+        for v in self._values:
+            try:
+                v(value, idx)
+            except error.ValueConstraintError:
+                pass
+            else:
+                return
+        raise error.ValueConstraintError(
+            'all of %s failed for \"%s\"' % (self._values, value)
+            )
+
+# XXX
+# add tests for type check
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/error.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/error.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/error.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/error.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,3 @@
+from pyasn1.error import PyAsn1Error
+
+class ValueConstraintError(PyAsn1Error): pass
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/namedtype.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/namedtype.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/namedtype.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/namedtype.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,132 @@
+# NamedType specification for constructed types
+import sys
+from pyasn1.type import tagmap
+from pyasn1 import error
+
+class NamedType:
+    isOptional = 0
+    isDefaulted = 0
+    def __init__(self, name, t):
+        self.__name = name; self.__type = t
+    def __repr__(self): return '%s(%s, %s)' % (
+        self.__class__.__name__, self.__name, self.__type
+        )
+    def getType(self): return self.__type
+    def getName(self): return self.__name
+    def __getitem__(self, idx):
+        if idx == 0: return self.__name
+        if idx == 1: return self.__type
+        raise IndexError()
+    
+class OptionalNamedType(NamedType):
+    isOptional = 1
+class DefaultedNamedType(NamedType):
+    isDefaulted = 1
+    
+class NamedTypes:
+    def __init__(self, *namedTypes):
+        self.__namedTypes = namedTypes
+        self.__namedTypesLen = len(self.__namedTypes)
+        self.__minTagSet = None
+        self.__tagToPosIdx = {}; self.__nameToPosIdx = {}
+        self.__tagMap = { False: None, True: None }
+        self.__ambigiousTypes = {}
+
+    def __repr__(self):
+        r = '%s(' % self.__class__.__name__
+        for n in self.__namedTypes:
+            r = r + '%r, ' % (n,)
+        return r + ')'
+    
+    def __getitem__(self, idx): return self.__namedTypes[idx]
+
+    if sys.version_info[0] <= 2:
+        def __nonzero__(self): return bool(self.__namedTypesLen)
+    else:
+        def __bool__(self): return bool(self.__namedTypesLen)
+    def __len__(self): return self.__namedTypesLen
+    
+    def getTypeByPosition(self, idx):
+        if idx < 0 or idx >= self.__namedTypesLen:
+            raise error.PyAsn1Error('Type position out of range')
+        else:
+            return self.__namedTypes[idx].getType()
+
+    def getPositionByType(self, tagSet):
+        if not self.__tagToPosIdx:
+            idx = self.__namedTypesLen
+            while idx > 0:
+                idx = idx - 1
+                tagMap = self.__namedTypes[idx].getType().getTagMap()
+                for t in tagMap.getPosMap():
+                    if t in self.__tagToPosIdx:
+                        raise error.PyAsn1Error('Duplicate type %s' % (t,))
+                    self.__tagToPosIdx[t] = idx
+        try:
+            return self.__tagToPosIdx[tagSet]
+        except KeyError:
+            raise error.PyAsn1Error('Type %s not found' % (tagSet,))
+        
+    def getNameByPosition(self, idx):
+        try:
+            return self.__namedTypes[idx].getName()
+        except IndexError:
+            raise error.PyAsn1Error('Type position out of range')
+    def getPositionByName(self, name):
+        if not self.__nameToPosIdx:
+            idx = self.__namedTypesLen
+            while idx > 0:
+                idx = idx - 1
+                n = self.__namedTypes[idx].getName()
+                if n in self.__nameToPosIdx:
+                    raise error.PyAsn1Error('Duplicate name %s' % (n,))
+                self.__nameToPosIdx[n] = idx
+        try:
+            return self.__nameToPosIdx[name]
+        except KeyError:
+            raise error.PyAsn1Error('Name %s not found' % (name,))
+
+    def __buildAmbigiousTagMap(self):
+        ambigiousTypes = ()
+        idx = self.__namedTypesLen
+        while idx > 0:
+            idx = idx - 1
+            t = self.__namedTypes[idx]
+            if t.isOptional or t.isDefaulted:
+                ambigiousTypes = (t, ) + ambigiousTypes
+            else:
+                ambigiousTypes = (t, )
+            self.__ambigiousTypes[idx] = NamedTypes(*ambigiousTypes)
+        
+    def getTagMapNearPosition(self, idx):
+        if not self.__ambigiousTypes: self.__buildAmbigiousTagMap()
+        try:
+            return self.__ambigiousTypes[idx].getTagMap()
+        except KeyError:
+            raise error.PyAsn1Error('Type position out of range')
+
+    def getPositionNearType(self, tagSet, idx):
+        if not self.__ambigiousTypes: self.__buildAmbigiousTagMap()
+        try:
+            return idx+self.__ambigiousTypes[idx].getPositionByType(tagSet)
+        except KeyError:
+            raise error.PyAsn1Error('Type position out of range')
+
+    def genMinTagSet(self):
+        if self.__minTagSet is None:
+            for t in self.__namedTypes:
+                __type = t.getType()
+                tagSet = getattr(__type,'getMinTagSet',__type.getTagSet)()
+                if self.__minTagSet is None or tagSet < self.__minTagSet:
+                    self.__minTagSet = tagSet
+        return self.__minTagSet
+    
+    def getTagMap(self, uniq=False):
+        if self.__tagMap[uniq] is None:
+            tagMap = tagmap.TagMap()
+            for nt in self.__namedTypes:
+                tagMap = tagMap.clone(
+                    nt.getType(), nt.getType().getTagMap(), uniq
+                    )
+            self.__tagMap[uniq] = tagMap
+        return self.__tagMap[uniq]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/namedval.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/namedval.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/namedval.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/namedval.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,46 @@
+# ASN.1 named integers
+from pyasn1 import error
+
+__all__ = [ 'NamedValues' ]
+
+class NamedValues:
+    def __init__(self, *namedValues):
+        self.nameToValIdx = {}; self.valToNameIdx = {}
+        self.namedValues = ()        
+        automaticVal = 1
+        for namedValue in namedValues:
+            if isinstance(namedValue, tuple):
+                name, val = namedValue
+            else:
+                name = namedValue
+                val = automaticVal
+            if name in self.nameToValIdx:
+                raise error.PyAsn1Error('Duplicate name %s' % (name,))
+            self.nameToValIdx[name] = val
+            if val in self.valToNameIdx:
+                raise error.PyAsn1Error('Duplicate value %s=%s' % (name, val))
+            self.valToNameIdx[val] = name
+            self.namedValues = self.namedValues + ((name, val),)
+            automaticVal = automaticVal + 1
+    def __str__(self): return str(self.namedValues)
+    
+    def getName(self, value):
+        if value in self.valToNameIdx:
+            return self.valToNameIdx[value]
+
+    def getValue(self, name):
+        if name in self.nameToValIdx:
+            return self.nameToValIdx[name]
+    
+    def __getitem__(self, i): return self.namedValues[i]
+    def __len__(self): return len(self.namedValues)
+
+    def __add__(self, namedValues):
+        return self.__class__(*self.namedValues + namedValues)
+    def __radd__(self, namedValues):
+        return self.__class__(*namedValues + tuple(self))
+        
+    def clone(self, *namedValues):
+        return self.__class__(*tuple(self) + namedValues)
+
+# XXX clone/subtype?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/tagmap.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/tagmap.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/tagmap.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/tagmap.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,52 @@
+from pyasn1 import error
+
+class TagMap:
+    def __init__(self, posMap={}, negMap={}, defType=None):
+        self.__posMap = posMap.copy()
+        self.__negMap = negMap.copy()
+        self.__defType = defType
+        
+    def __contains__(self, tagSet):
+        return tagSet in self.__posMap or \
+               self.__defType is not None and tagSet not in self.__negMap
+
+    def __getitem__(self, tagSet):
+        if tagSet in self.__posMap:
+            return self.__posMap[tagSet]
+        elif tagSet in self.__negMap:
+            raise error.PyAsn1Error('Key in negative map')
+        elif self.__defType is not None:
+            return self.__defType
+        else:
+            raise KeyError()
+
+    def __repr__(self):
+        s = '%r/%r' % (self.__posMap, self.__negMap)
+        if self.__defType is not None:
+            s = s + '/%r' % (self.__defType,)
+        return s
+
+    def clone(self, parentType, tagMap, uniq=False):
+        if self.__defType is not None and tagMap.getDef() is not None:
+            raise error.PyAsn1Error('Duplicate default value at %s' % (self,))
+        if tagMap.getDef() is not None:
+            defType = tagMap.getDef()
+        else:
+            defType = self.__defType
+            
+        posMap = self.__posMap.copy()
+        for k in tagMap.getPosMap():
+            if uniq and k in posMap:
+                raise error.PyAsn1Error('Duplicate positive key %s' % (k,))
+            posMap[k] = parentType
+
+        negMap = self.__negMap.copy()
+        negMap.update(tagMap.getNegMap())
+        
+        return self.__class__(
+            posMap, negMap, defType,
+            )
+
+    def getPosMap(self): return self.__posMap.copy()
+    def getNegMap(self): return self.__negMap.copy()
+    def getDef(self): return self.__defType
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/tag.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/tag.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/tag.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/tag.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,122 @@
+# ASN.1 types tags
+from operator import getitem
+from pyasn1 import error
+
+tagClassUniversal = 0x00
+tagClassApplication = 0x40
+tagClassContext = 0x80
+tagClassPrivate = 0xC0
+
+tagFormatSimple = 0x00
+tagFormatConstructed = 0x20
+
+tagCategoryImplicit = 0x01
+tagCategoryExplicit = 0x02
+tagCategoryUntagged = 0x04
+
+class Tag:
+    def __init__(self, tagClass, tagFormat, tagId):
+        if tagId < 0:
+            raise error.PyAsn1Error(
+                'Negative tag ID (%s) not allowed' % (tagId,)
+                )
+        self.__tag = (tagClass, tagFormat, tagId)
+        self.uniq = (tagClass, tagId)
+        self.__hashedUniqTag = hash(self.uniq)
+
+    def __repr__(self):
+        return '%s(tagClass=%s, tagFormat=%s, tagId=%s)' % (
+            (self.__class__.__name__,) + self.__tag
+            )
+    # These is really a hotspot -- expose public "uniq" attribute to save on
+    # function calls
+    def __eq__(self, other): return self.uniq == other.uniq
+    def __ne__(self, other): return self.uniq != other.uniq
+    def __lt__(self, other): return self.uniq < other.uniq
+    def __le__(self, other): return self.uniq <= other.uniq
+    def __gt__(self, other): return self.uniq > other.uniq
+    def __ge__(self, other): return self.uniq >= other.uniq
+    def __hash__(self): return self.__hashedUniqTag
+    def __getitem__(self, idx): return self.__tag[idx]
+    def __and__(self, otherTag):
+        (tagClass, tagFormat, tagId) = otherTag
+        return self.__class__(
+            self.__tag&tagClass, self.__tag&tagFormat, self.__tag&tagId
+            )
+    def __or__(self, otherTag):
+        (tagClass, tagFormat, tagId) = otherTag
+        return self.__class__(
+            self.__tag[0]|tagClass,
+            self.__tag[1]|tagFormat,
+            self.__tag[2]|tagId
+            )
+    def asTuple(self): return self.__tag  # __getitem__() is slow
+    
+class TagSet:
+    def __init__(self, baseTag=(), *superTags):
+        self.__baseTag = baseTag
+        self.__superTags = superTags
+        self.__hashedSuperTags = hash(superTags)
+        _uniq = ()
+        for t in superTags:
+            _uniq = _uniq + t.uniq
+        self.uniq = _uniq
+        self.__lenOfSuperTags = len(superTags)
+        
+    def __repr__(self):
+        return '%s(%s)' % (
+            self.__class__.__name__,
+            ', '.join([repr(x) for x in self.__superTags])
+            )
+
+    def __add__(self, superTag):
+        return self.__class__(
+            self.__baseTag, *self.__superTags + (superTag,)
+            )
+    def __radd__(self, superTag):
+        return self.__class__(
+            self.__baseTag, *(superTag,) + self.__superTags
+            )
+
+    def tagExplicitly(self, superTag):
+        tagClass, tagFormat, tagId = superTag
+        if tagClass == tagClassUniversal:
+            raise error.PyAsn1Error(
+                'Can\'t tag with UNIVERSAL-class tag'
+                )
+        if tagFormat != tagFormatConstructed:
+            superTag = Tag(tagClass, tagFormatConstructed, tagId)
+        return self + superTag
+
+    def tagImplicitly(self, superTag):
+        tagClass, tagFormat, tagId = superTag
+        if self.__superTags:
+            superTag = Tag(tagClass, self.__superTags[-1][1], tagId)
+        return self[:-1] + superTag
+
+    def getBaseTag(self): return self.__baseTag
+    def __getitem__(self, idx):
+        if isinstance(idx, slice):
+            return self.__class__(
+               self.__baseTag, *getitem(self.__superTags, idx)
+            )
+        return self.__superTags[idx]
+    def __eq__(self, other): return self.uniq == other.uniq
+    def __ne__(self, other): return self.uniq != other.uniq
+    def __lt__(self, other): return self.uniq < other.uniq
+    def __le__(self, other): return self.uniq <= other.uniq
+    def __gt__(self, other): return self.uniq > other.uniq
+    def __ge__(self, other): return self.uniq >= other.uniq
+    def __hash__(self): return self.__hashedSuperTags
+    def __len__(self): return self.__lenOfSuperTags
+    def isSuperTagSetOf(self, tagSet):
+        if len(tagSet) < self.__lenOfSuperTags:
+            return
+        idx = self.__lenOfSuperTags - 1
+        while idx >= 0:
+            if self.__superTags[idx] != tagSet[idx]:
+                return
+            idx = idx - 1
+        return 1
+    
+def initTagSet(tag): return TagSet(tag, tag)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/univ.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/univ.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/univ.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/univ.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,1042 @@
+# ASN.1 "universal" data types
+import operator, sys
+from pyasn1.type import base, tag, constraint, namedtype, namedval, tagmap
+from pyasn1.codec.ber import eoo
+from pyasn1.compat import octets
+from pyasn1 import error
+
+# "Simple" ASN.1 types (yet incomplete)
+
+class Integer(base.AbstractSimpleAsn1Item):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x02)
+        )
+    namedValues = namedval.NamedValues()
+    def __init__(self, value=None, tagSet=None, subtypeSpec=None,
+                 namedValues=None):
+        if namedValues is None:
+            self.__namedValues = self.namedValues
+        else:
+            self.__namedValues = namedValues
+        base.AbstractSimpleAsn1Item.__init__(
+            self, value, tagSet, subtypeSpec
+            )
+
+    def __and__(self, value): return self.clone(self._value & value)
+    def __rand__(self, value): return self.clone(value & self._value)
+    def __or__(self, value): return self.clone(self._value | value)
+    def __ror__(self, value): return self.clone(value | self._value)
+    def __xor__(self, value): return self.clone(self._value ^ value)
+    def __rxor__(self, value): return self.clone(value ^ self._value)
+    def __lshift__(self, value): return self.clone(self._value << value)
+    def __rshift__(self, value): return self.clone(self._value >> value)
+
+    def __add__(self, value): return self.clone(self._value + value)
+    def __radd__(self, value): return self.clone(value + self._value)
+    def __sub__(self, value): return self.clone(self._value - value)
+    def __rsub__(self, value): return self.clone(value - self._value)
+    def __mul__(self, value): return self.clone(self._value * value)
+    def __rmul__(self, value): return self.clone(value * self._value)
+    def __mod__(self, value): return self.clone(self._value % value)
+    def __rmod__(self, value): return self.clone(value % self._value)
+    def __pow__(self, value, modulo=None): return self.clone(pow(self._value, value, modulo))
+    def __rpow__(self, value): return self.clone(pow(value, self._value))
+
+    if sys.version_info[0] <= 2:
+        def __div__(self, value):  return self.clone(self._value // value)
+        def __rdiv__(self, value):  return self.clone(value // self._value)
+    else:
+        def __truediv__(self, value):  return self.clone(self._value / value)
+        def __rtruediv__(self, value):  return self.clone(value / self._value)
+        def __divmod__(self, value):  return self.clone(self._value // value)
+        def __rdivmod__(self, value):  return self.clone(value // self._value)
+
+        __hash__ = base.AbstractSimpleAsn1Item.__hash__
+
+    def __int__(self): return int(self._value)
+    if sys.version_info[0] <= 2:
+        def __long__(self): return long(self._value)
+    def __float__(self): return float(self._value)    
+    def __abs__(self): return abs(self._value)
+    def __index__(self): return int(self._value)
+
+    def __lt__(self, value): return self._value < value
+    def __le__(self, value): return self._value <= value
+    def __eq__(self, value): return self._value == value
+    def __ne__(self, value): return self._value != value
+    def __gt__(self, value): return self._value > value
+    def __ge__(self, value): return self._value >= value
+
+    def prettyIn(self, value):
+        if not isinstance(value, str):
+            try:
+                return int(value)
+            except:
+                raise error.PyAsn1Error(
+                    'Can\'t coerce %s into integer: %s' % (value, sys.exc_info()[1])
+                    )
+        r = self.__namedValues.getValue(value)
+        if r is not None:
+            return r
+        try:
+            return int(value)
+        except:
+            raise error.PyAsn1Error(
+                'Can\'t coerce %s into integer: %s' % (value, sys.exc_info()[1])
+                )
+
+    def prettyOut(self, value):
+        r = self.__namedValues.getName(value)
+        return r is None and str(value) or repr(r)
+
+    def getNamedValues(self): return self.__namedValues
+
+    def clone(self, value=None, tagSet=None, subtypeSpec=None,
+              namedValues=None):
+        if value is None and tagSet is None and subtypeSpec is None \
+               and namedValues is None:
+            return self
+        if value is None:
+            value = self._value
+        if tagSet is None:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        if namedValues is None:
+            namedValues = self.__namedValues
+        return self.__class__(value, tagSet, subtypeSpec, namedValues)
+
+    def subtype(self, value=None, implicitTag=None, explicitTag=None,
+                subtypeSpec=None, namedValues=None):
+        if value is None:
+            value = self._value
+        if implicitTag is not None:
+            tagSet = self._tagSet.tagImplicitly(implicitTag)
+        elif explicitTag is not None:
+            tagSet = self._tagSet.tagExplicitly(explicitTag)
+        else:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        else:
+            subtypeSpec = subtypeSpec + self._subtypeSpec
+        if namedValues is None:
+            namedValues = self.__namedValues
+        else:
+            namedValues = namedValues + self.__namedValues
+        return self.__class__(value, tagSet, subtypeSpec, namedValues)
+
+class Boolean(Integer):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x01),
+        )
+    subtypeSpec = Integer.subtypeSpec+constraint.SingleValueConstraint(0,1)
+    namedValues = Integer.namedValues.clone(('False', 0), ('True', 1))
+
+class BitString(base.AbstractSimpleAsn1Item):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x03)
+        )
+    namedValues = namedval.NamedValues()
+    def __init__(self, value=None, tagSet=None, subtypeSpec=None,
+                 namedValues=None):
+        if namedValues is None:
+            self.__namedValues = self.namedValues
+        else:
+            self.__namedValues = namedValues
+        base.AbstractSimpleAsn1Item.__init__(
+            self, value, tagSet, subtypeSpec
+            )
+
+    def clone(self, value=None, tagSet=None, subtypeSpec=None,
+              namedValues=None):
+        if value is None and tagSet is None and subtypeSpec is None \
+               and namedValues is None:
+            return self
+        if value is None:
+            value = self._value
+        if tagSet is None:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        if namedValues is None:
+            namedValues = self.__namedValues
+        return self.__class__(value, tagSet, subtypeSpec, namedValues)
+
+    def subtype(self, value=None, implicitTag=None, explicitTag=None,
+                subtypeSpec=None, namedValues=None):
+        if value is None:
+            value = self._value
+        if implicitTag is not None:
+            tagSet = self._tagSet.tagImplicitly(implicitTag)
+        elif explicitTag is not None:
+            tagSet = self._tagSet.tagExplicitly(explicitTag)
+        else:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        else:
+            subtypeSpec = subtypeSpec + self._subtypeSpec
+        if namedValues is None:
+            namedValues = self.__namedValues
+        else:
+            namedValues = namedValues + self.__namedValues
+        return self.__class__(value, tagSet, subtypeSpec, namedValues)
+
+    def __str__(self): return str(tuple(self))
+
+    # Immutable sequence object protocol
+
+    def __len__(self):
+        if self._len is None:
+            self._len = len(self._value)
+        return self._len
+    def __getitem__(self, i):
+        if isinstance(i, slice):
+            return self.clone(operator.getitem(self._value, i))
+        else:
+            return self._value[i]
+
+    def __add__(self, value): return self.clone(self._value + value)
+    def __radd__(self, value): return self.clone(value + self._value)
+    def __mul__(self, value): return self.clone(self._value * value)
+    def __rmul__(self, value): return self * value
+
+    def prettyIn(self, value):
+        r = []
+        if not value:
+            return ()
+        elif isinstance(value, str):
+            if value[0] == '\'':
+                if value[-2:] == '\'B':
+                    for v in value[1:-2]:
+                        if v == '0':
+                            r.append(0)
+                        elif v == '1':
+                            r.append(1)
+                        else:
+                            raise error.PyAsn1Error(
+                                'Non-binary BIT STRING initializer %s' % (v,)
+                                )
+                    return tuple(r)
+                elif value[-2:] == '\'H':
+                    for v in value[1:-2]:
+                        i = 4
+                        v = int(v, 16)
+                        while i:
+                            i = i - 1
+                            r.append((v>>i)&0x01)
+                    return tuple(r)
+                else:
+                    raise error.PyAsn1Error(
+                        'Bad BIT STRING value notation %s' % (value,)
+                        )                
+            else:
+                for i in value.split(','):
+                    j = self.__namedValues.getValue(i)
+                    if j is None:
+                        raise error.PyAsn1Error(
+                            'Unknown bit identifier \'%s\'' % (i,)
+                            )
+                    if j >= len(r):
+                        r.extend([0]*(j-len(r)+1))
+                    r[j] = 1
+                return tuple(r)
+        elif isinstance(value, (tuple, list)):
+            r = tuple(value)
+            for b in r:
+                if b and b != 1:
+                    raise error.PyAsn1Error(
+                        'Non-binary BitString initializer \'%s\'' % (r,)
+                        )
+            return r
+        elif isinstance(value, BitString):
+            return tuple(value)
+        else:
+            raise error.PyAsn1Error(
+                'Bad BitString initializer type \'%s\'' % (value,)
+                )
+
+    def prettyOut(self, value):
+        return '\"\'%s\'B\"' % ''.join([str(x) for x in value])
+
+class OctetString(base.AbstractSimpleAsn1Item):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x04)
+        )
+    defaultBinValue = defaultHexValue = base.noValue
+    encoding = 'us-ascii'
+    def __init__(self, value=None, tagSet=None, subtypeSpec=None,
+                 encoding=None, binValue=None, hexValue=None):
+        if encoding is None:
+            self._encoding = self.encoding
+        else:
+            self._encoding = encoding
+        if binValue is not None:
+            value = self.fromBinaryString(binValue)
+        if hexValue is not None:
+            value = self.fromHexString(hexValue)
+        if value is None or value is base.noValue:
+            value = self.defaultHexValue
+        if value is None or value is base.noValue:
+            value = self.defaultBinValue
+        self.__intValue = None
+        base.AbstractSimpleAsn1Item.__init__(self, value, tagSet, subtypeSpec)
+
+    def clone(self, value=None, tagSet=None, subtypeSpec=None,
+              encoding=None, binValue=None, hexValue=None):
+        if value is None and tagSet is None and subtypeSpec is None and \
+               encoding is None and binValue is None and hexValue is None:
+            return self
+        if value is None and binValue is None and hexValue is None:
+            value = self._value
+        if tagSet is None:
+            tagSet = self._tagSet
+        if subtypeSpec is None:
+            subtypeSpec = self._subtypeSpec
+        if encoding is None:
+            encoding = self._encoding
+        return self.__class__(
+            value, tagSet, subtypeSpec, encoding, binValue, hexValue
+            )
+   
+    if sys.version_info[0] <= 2:
+        def prettyIn(self, value):
+            if isinstance(value, str):
+                return value
+            elif isinstance(value, (tuple, list)):
+                try:
+                    return ''.join([ chr(x) for x in value ])
+                except ValueError:
+                    raise error.PyAsn1Error(
+                        'Bad OctetString initializer \'%s\'' % (value,)
+                        )                
+            else:
+                return str(value)
+    else:
+        def prettyIn(self, value):
+            if isinstance(value, bytes):
+                return value
+            elif isinstance(value, OctetString):
+                return value.asOctets()
+            elif isinstance(value, (tuple, list, map)):
+                try:
+                    return bytes(value)
+                except ValueError:
+                    raise error.PyAsn1Error(
+                        'Bad OctetString initializer \'%s\'' % (value,)
+                        )
+            else:
+                try:
+                    return str(value).encode(self._encoding)
+                except UnicodeEncodeError:
+                    raise error.PyAsn1Error(
+                        'Can\'t encode string \'%s\' with \'%s\' codec' % (value, self._encoding)
+                        )
+                        
+
+    def fromBinaryString(self, value):
+        bitNo = 8; byte = 0; r = ()
+        for v in value:
+            if bitNo:
+                bitNo = bitNo - 1
+            else:
+                bitNo = 7
+                r = r + (byte,)
+                byte = 0
+            if v == '0':
+                v = 0
+            elif v == '1':
+                v = 1
+            else:
+                raise error.PyAsn1Error(
+                    'Non-binary OCTET STRING initializer %s' % (v,)
+                    )
+            byte = byte | (v << bitNo)
+        return octets.ints2octs(r + (byte,))
+        
+    def fromHexString(self, value):            
+        r = p = ()
+        for v in value:
+            if p:
+                r = r + (int(p+v, 16),)
+                p = ()
+            else:
+                p = v
+        if p:
+            r = r + (int(p+'0', 16),)
+        return octets.ints2octs(r)
+
+    def prettyOut(self, value):
+        if sys.version_info[0] <= 2:
+            numbers = tuple([ ord(x) for x in value ])
+        else:
+            numbers = tuple(value)
+        if [ x for x in numbers if x < 32 or x > 126 ]:
+            return '0x' + ''.join([ '%.2x' % x for x in numbers ])
+        else:
+            return str(value)
+
+    def __repr__(self):
+        if self._value is base.noValue:
+            return self.__class__.__name__ + '()'
+        if [ x for x in self.asNumbers() if x < 32 or x > 126 ]:
+            return self.__class__.__name__ + '(hexValue=\'' + ''.join([ '%.2x' % x for x in self.asNumbers() ])+'\')'
+        else:
+            return self.__class__.__name__ + '(\'' + self.prettyOut(self._value) + '\')'
+                                
+    if sys.version_info[0] <= 2:
+        def __str__(self): return str(self._value)
+        def __unicode__(self):
+            return self._value.decode(self._encoding, 'ignore')
+        def asOctets(self): return self._value
+        def asNumbers(self):
+            if self.__intValue is None:
+                self.__intValue = tuple([ ord(x) for x in self._value ])
+            return self.__intValue
+    else:
+        def __str__(self): return self._value.decode(self._encoding, 'ignore')
+        def __bytes__(self): return self._value
+        def asOctets(self): return self._value
+        def asNumbers(self):
+            if self.__intValue is None:
+                self.__intValue = tuple(self._value)
+            return self.__intValue
+ 
+    # Immutable sequence object protocol
+    
+    def __len__(self):
+        if self._len is None:
+            self._len = len(self._value)
+        return self._len
+    def __getitem__(self, i):
+        if isinstance(i, slice):
+            return self.clone(operator.getitem(self._value, i))
+        else:
+            return self._value[i]
+
+    def __add__(self, value): return self.clone(self._value + self.prettyIn(value))
+    def __radd__(self, value): return self.clone(self.prettyIn(value) + self._value)
+    def __mul__(self, value): return self.clone(self._value * value)
+    def __rmul__(self, value): return self * value
+
+class Null(OctetString):
+    defaultValue = ''.encode()  # This is tightly constrained
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x05)
+        )
+    subtypeSpec = OctetString.subtypeSpec+constraint.SingleValueConstraint(''.encode())
+    
+if sys.version_info[0] <= 2:
+    intTypes = (int, long)
+else:
+    intTypes = int
+
+class ObjectIdentifier(base.AbstractSimpleAsn1Item):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x06)
+        )
+    def __add__(self, other): return self.clone(self._value + other)
+    def __radd__(self, other): return self.clone(other + self._value)
+
+    def asTuple(self): return self._value
+    
+    # Sequence object protocol
+    
+    def __len__(self):
+        if self._len is None:
+            self._len = len(self._value)
+        return self._len
+    def __getitem__(self, i):
+        if isinstance(i, slice):
+            return self.clone(
+                operator.getitem(self._value, i)
+                )
+        else:
+            return self._value[i]
+
+    def __str__(self): return self.prettyPrint()
+    
+    def index(self, suboid): return self._value.index(suboid)
+
+    def isPrefixOf(self, value):
+        """Returns true if argument OID resides deeper in the OID tree"""
+        l = len(self)
+        if l <= len(value):
+            if self._value[:l] == value[:l]:
+                return 1
+        return 0
+
+    def prettyIn(self, value):
+        """Dotted -> tuple of numerics OID converter"""
+        if isinstance(value, tuple):
+            pass
+        elif isinstance(value, ObjectIdentifier):
+            return tuple(value)        
+        elif isinstance(value, str):
+            r = []
+            for element in [ x for x in value.split('.') if x != '' ]:
+                try:
+                    r.append(int(element, 0))
+                except ValueError:
+                    raise error.PyAsn1Error(
+                        'Malformed Object ID %s at %s: %s' %
+                        (str(value), self.__class__.__name__, sys.exc_info()[1])
+                        )
+            value = tuple(r)
+        else:
+            try:
+                value = tuple(value)
+            except TypeError:
+                raise error.PyAsn1Error(
+                        'Malformed Object ID %s at %s: %s' %
+                        (str(value), self.__class__.__name__,sys.exc_info()[1])
+                        )
+
+        for x in value:
+            if not isinstance(x, intTypes) or x < 0:
+                raise error.PyAsn1Error(
+                    'Invalid sub-ID in %s at %s' % (value, self.__class__.__name__)
+                    )
+    
+        return value
+
+    def prettyOut(self, value): return '.'.join([ str(x) for x in value ])
+    
+class Real(base.AbstractSimpleAsn1Item):
+    try:
+        _plusInf = float('inf')
+        _minusInf = float('-inf')
+        _inf = (_plusInf, _minusInf)
+    except ValueError:
+        # Infinity support is platform and Python dependent
+        _plusInf = _minusInf = None
+        _inf = ()
+
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x09)
+        )
+
+    def __normalizeBase10(self, value):
+        m, b, e = value
+        while m and m % 10 == 0:
+            m = m / 10
+            e = e + 1
+        return m, b, e
+
+    def prettyIn(self, value):
+        if isinstance(value, tuple) and len(value) == 3:
+            for d in value:
+                if not isinstance(d, intTypes):
+                    raise error.PyAsn1Error(
+                        'Lame Real value syntax: %s' % (value,)
+                        )
+            if value[1] not in (2, 10):
+                raise error.PyAsn1Error(
+                    'Prohibited base for Real value: %s' % (value[1],)
+                    )
+            if value[1] == 10:
+                value = self.__normalizeBase10(value)
+            return value
+        elif isinstance(value, intTypes):
+            return self.__normalizeBase10((value, 10, 0))
+        elif isinstance(value, float):
+            if self._inf and value in self._inf:
+                return value
+            else:
+                e = 0
+                while int(value) != value:
+                    value = value * 10
+                    e = e - 1
+                return self.__normalizeBase10((int(value), 10, e))
+        elif isinstance(value, Real):
+            return tuple(value)
+        elif isinstance(value, str):  # handle infinite literal
+            try:
+                return float(value)
+            except ValueError:
+                pass
+        raise error.PyAsn1Error(
+            'Bad real value syntax: %s' % (value,)
+            )
+        
+    def prettyOut(self, value):
+        if value in self._inf:
+            return '\'%s\'' % value
+        else:
+            return str(value)
+
+    def isPlusInfinity(self): return self._value == self._plusInf
+    def isMinusInfinity(self): return self._value == self._minusInf
+    def isInfinity(self): return self._value in self._inf
+    
+    def __str__(self): return str(float(self))
+    
+    def __add__(self, value): return self.clone(float(self) + value)
+    def __radd__(self, value): return self + value
+    def __mul__(self, value): return self.clone(float(self) * value)
+    def __rmul__(self, value): return self * value
+    def __sub__(self, value): return self.clone(float(self) - value)
+    def __rsub__(self, value): return self.clone(value - float(self))
+    def __mod__(self, value): return self.clone(float(self) % value)
+    def __rmod__(self, value): return self.clone(value % float(self))
+    def __pow__(self, value, modulo=None): return self.clone(pow(float(self), value, modulo))
+    def __rpow__(self, value): return self.clone(pow(value, float(self)))
+
+    if sys.version_info[0] <= 2:
+        def __div__(self, value): return self.clone(float(self) / value)
+        def __rdiv__(self, value): return self.clone(value / float(self))
+    else:
+        def __truediv__(self, value): return self.clone(float(self) / value)
+        def __rtruediv__(self, value): return self.clone(value / float(self))
+        def __divmod__(self, value): return self.clone(float(self) // value)
+        def __rdivmod__(self, value): return self.clone(value // float(self))
+
+    def __int__(self): return int(float(self))
+    if sys.version_info[0] <= 2:
+        def __long__(self): return long(float(self))
+    def __float__(self):
+        if self._value in self._inf:
+            return self._value
+        else:
+            return float(
+                self._value[0] * pow(self._value[1], self._value[2])
+                )
+    def __abs__(self): return abs(float(self))
+
+    def __lt__(self, value): return float(self) < value
+    def __le__(self, value): return float(self) <= value
+    def __eq__(self, value): return float(self) == value
+    def __ne__(self, value): return float(self) != value
+    def __gt__(self, value): return float(self) > value
+    def __ge__(self, value): return float(self) >= value
+
+    if sys.version_info[0] <= 2:
+        def __nonzero__(self): return bool(float(self))
+    else:
+        def __bool__(self): return bool(float(self))
+        __hash__ = base.AbstractSimpleAsn1Item.__hash__
+
+    def __getitem__(self, idx):
+        if self._value in self._inf:
+            raise error.PyAsn1Error('Invalid infinite value operation')
+        else:
+            return self._value[idx]
+    
+class Enumerated(Integer):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x0A)
+        )
+
+# "Structured" ASN.1 types
+
+class SetOf(base.AbstractConstructedAsn1Item):
+    componentType = None
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x11)
+        )
+    typeId = 1
+
+    def _cloneComponentValues(self, myClone, cloneValueFlag):
+        idx = 0; l = len(self._componentValues)
+        while idx < l:
+            c = self._componentValues[idx]
+            if c is not None:
+                if isinstance(c, base.AbstractConstructedAsn1Item):
+                    myClone.setComponentByPosition(
+                        idx, c.clone(cloneValueFlag=cloneValueFlag)
+                        )
+                else:
+                    myClone.setComponentByPosition(idx, c.clone())
+            idx = idx + 1
+        
+    def _verifyComponent(self, idx, value):
+        if self._componentType is not None and \
+               not self._componentType.isSuperTypeOf(value):
+            raise error.PyAsn1Error('Component type error %s' % (value,))
+
+    def getComponentByPosition(self, idx): return self._componentValues[idx]
+    def setComponentByPosition(self, idx, value=None, verifyConstraints=True):
+        l = len(self._componentValues)
+        if idx >= l:
+            self._componentValues = self._componentValues + (idx-l+1)*[None]
+        if value is None:
+            if self._componentValues[idx] is None:
+                if self._componentType is None:
+                    raise error.PyAsn1Error('Component type not defined')
+                self._componentValues[idx] = self._componentType.clone()
+                self._componentValuesSet = self._componentValuesSet + 1
+            return self
+        elif not isinstance(value, base.Asn1Item):
+            if self._componentType is None:
+                raise error.PyAsn1Error('Component type not defined')
+            if isinstance(self._componentType, base.AbstractSimpleAsn1Item):
+                value = self._componentType.clone(value=value)
+            else:
+                raise error.PyAsn1Error('Instance value required')
+        if verifyConstraints:
+            if self._componentType is not None:
+                self._verifyComponent(idx, value)
+            self._verifySubtypeSpec(value, idx)            
+        if self._componentValues[idx] is None:
+            self._componentValuesSet = self._componentValuesSet + 1
+        self._componentValues[idx] = value
+        return self
+
+    def getComponentTagMap(self):
+        if self._componentType is not None:
+            return self._componentType.getTagMap()
+
+    def prettyPrint(self, scope=0):
+        scope = scope + 1
+        r = self.__class__.__name__ + ':\n'        
+        for idx in range(len(self._componentValues)):
+            r = r + ' '*scope
+            if self._componentValues[idx] is None:
+                r = r + '<empty>'
+            else:
+                r = r + self._componentValues[idx].prettyPrint(scope)
+        return r
+
+class SequenceOf(SetOf):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x10)
+        )
+    typeId = 2
+
+class SequenceAndSetBase(base.AbstractConstructedAsn1Item):
+    componentType = namedtype.NamedTypes()
+    def __init__(self, componentType=None, tagSet=None,
+                 subtypeSpec=None, sizeSpec=None):
+        base.AbstractConstructedAsn1Item.__init__(
+            self, componentType, tagSet, subtypeSpec, sizeSpec
+            )
+        if self._componentType is None:
+            self._componentTypeLen = 0
+        else:
+            self._componentTypeLen = len(self._componentType)
+
+    def __getitem__(self, idx):
+        if isinstance(idx, str):
+            return self.getComponentByName(idx)
+        else:
+            return base.AbstractConstructedAsn1Item.__getitem__(self, idx)
+
+    def __setitem__(self, idx, value):
+        if isinstance(idx, str):
+            self.setComponentByName(idx, value)
+        else:
+            base.AbstractConstructedAsn1Item.__setitem__(self, idx, value)
+        
+    def _cloneComponentValues(self, myClone, cloneValueFlag):
+        idx = 0; l = len(self._componentValues)
+        while idx < l:
+            c = self._componentValues[idx]
+            if c is not None:
+                if isinstance(c, base.AbstractConstructedAsn1Item):
+                    myClone.setComponentByPosition(
+                        idx, c.clone(cloneValueFlag=cloneValueFlag)
+                        )
+                else:
+                    myClone.setComponentByPosition(idx, c.clone())
+            idx = idx + 1
+
+    def _verifyComponent(self, idx, value):
+        if idx >= self._componentTypeLen:
+            raise error.PyAsn1Error(
+                'Component type error out of range'
+                )
+        t = self._componentType[idx].getType()
+        if not t.isSuperTypeOf(value):
+            raise error.PyAsn1Error('Component type error %r vs %r' % (t, value))
+
+    def getComponentByName(self, name):
+        return self.getComponentByPosition(
+            self._componentType.getPositionByName(name)
+            )
+    def setComponentByName(self, name, value=None, verifyConstraints=True):
+        return self.setComponentByPosition(
+            self._componentType.getPositionByName(name), value,
+            verifyConstraints
+            )
+
+    def getComponentByPosition(self, idx):
+        try:
+            return self._componentValues[idx]
+        except IndexError:
+            if idx < self._componentTypeLen:
+                return
+            raise
+    def setComponentByPosition(self, idx, value=None, verifyConstraints=True):
+        l = len(self._componentValues)
+        if idx >= l:
+            self._componentValues = self._componentValues + (idx-l+1)*[None]
+        if value is None:
+            if self._componentValues[idx] is None:
+                self._componentValues[idx] = self._componentType.getTypeByPosition(idx).clone()
+                self._componentValuesSet = self._componentValuesSet + 1
+            return self
+        elif not isinstance(value, base.Asn1Item):
+            t = self._componentType.getTypeByPosition(idx)
+            if isinstance(t, base.AbstractSimpleAsn1Item):
+                value = t.clone(value=value)
+            else:
+                raise error.PyAsn1Error('Instance value required')
+        if verifyConstraints:
+            if self._componentTypeLen:
+                self._verifyComponent(idx, value)
+            self._verifySubtypeSpec(value, idx)            
+        if self._componentValues[idx] is None:
+            self._componentValuesSet = self._componentValuesSet + 1
+        self._componentValues[idx] = value
+        return self
+
+    def getNameByPosition(self, idx):
+        if self._componentTypeLen:
+            return self._componentType.getNameByPosition(idx)
+
+    def getDefaultComponentByPosition(self, idx):
+        if self._componentTypeLen and self._componentType[idx].isDefaulted:
+            return self._componentType[idx].getType()
+
+    def getComponentType(self):
+        if self._componentTypeLen:
+            return self._componentType
+    
+    def setDefaultComponents(self):
+        if self._componentTypeLen == self._componentValuesSet:
+            return
+        idx = self._componentTypeLen
+        while idx:
+            idx = idx - 1
+            if self._componentType[idx].isDefaulted:
+                if self.getComponentByPosition(idx) is None:
+                    self.setComponentByPosition(idx)
+            elif not self._componentType[idx].isOptional:
+                if self.getComponentByPosition(idx) is None:
+                    raise error.PyAsn1Error(
+                        'Uninitialized component #%s at %r' % (idx, self)
+                        )
+
+    def prettyPrint(self, scope=0):
+        scope = scope + 1
+        r = self.__class__.__name__ + ':\n'
+        for idx in range(len(self._componentValues)):
+            if self._componentValues[idx] is not None:
+                r = r + ' '*scope
+                componentType = self.getComponentType()
+                if componentType is None:
+                    r = r + '<no-name>'
+                else:
+                    r = r + componentType.getNameByPosition(idx)
+                r = '%s=%s\n' % (
+                    r, self._componentValues[idx].prettyPrint(scope)
+                    )
+        return r
+
+class Sequence(SequenceAndSetBase):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x10)
+        )
+    typeId = 3
+
+    def getComponentTagMapNearPosition(self, idx):
+        if self._componentType:
+            return self._componentType.getTagMapNearPosition(idx)
+    
+    def getComponentPositionNearType(self, tagSet, idx):
+        if self._componentType:
+            return self._componentType.getPositionNearType(tagSet, idx)
+        else:
+            return idx
+    
+class Set(SequenceAndSetBase):
+    tagSet = baseTagSet = tag.initTagSet(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x11)
+        )
+    typeId = 4
+
+    def getComponent(self, innerFlag=0): return self
+    
+    def getComponentByType(self, tagSet, innerFlag=0):
+        c = self.getComponentByPosition(
+            self._componentType.getPositionByType(tagSet)
+            )
+        if innerFlag and isinstance(c, Set):
+            # get inner component by inner tagSet
+            return c.getComponent(1)
+        else:
+            # get outer component by inner tagSet
+            return c
+        
+    def setComponentByType(self, tagSet, value=None, innerFlag=0,
+                           verifyConstraints=True):
+        idx = self._componentType.getPositionByType(tagSet)
+        t = self._componentType.getTypeByPosition(idx)
+        if innerFlag:  # set inner component by inner tagSet
+            if t.getTagSet():
+                return self.setComponentByPosition(
+                    idx, value, verifyConstraints
+                    )
+            else:
+                t = self.setComponentByPosition(idx).getComponentByPosition(idx)
+                return t.setComponentByType(
+                    tagSet, value, innerFlag, verifyConstraints
+                    )
+        else:  # set outer component by inner tagSet
+            return self.setComponentByPosition(
+                idx, value, verifyConstraints
+                )
+            
+    def getComponentTagMap(self):
+        if self._componentType:
+            return self._componentType.getTagMap(True)
+
+    def getComponentPositionByType(self, tagSet):
+        if self._componentType:
+            return self._componentType.getPositionByType(tagSet)
+
+class Choice(Set):
+    tagSet = baseTagSet = tag.TagSet()  # untagged
+    sizeSpec = constraint.ConstraintsIntersection(
+        constraint.ValueSizeConstraint(1, 1)
+        )
+    typeId = 5
+    _currentIdx = None
+
+    def __eq__(self, other):
+        if self._componentValues:
+            return self._componentValues[self._currentIdx] == other
+        return NotImplemented
+    def __ne__(self, other):
+        if self._componentValues:
+            return self._componentValues[self._currentIdx] != other
+        return NotImplemented
+    def __lt__(self, other):
+        if self._componentValues:
+            return self._componentValues[self._currentIdx] < other
+        return NotImplemented
+    def __le__(self, other):
+        if self._componentValues:
+            return self._componentValues[self._currentIdx] <= other
+        return NotImplemented
+    def __gt__(self, other):
+        if self._componentValues:
+            return self._componentValues[self._currentIdx] > other
+        return NotImplemented
+    def __ge__(self, other):
+        if self._componentValues:
+            return self._componentValues[self._currentIdx] >= other
+        return NotImplemented
+    if sys.version_info[0] <= 2:
+        def __nonzero__(self): return bool(self._componentValues)
+    else:
+        def __bool__(self): return bool(self._componentValues)
+
+    def __len__(self): return self._currentIdx is not None and 1 or 0
+    
+    def verifySizeSpec(self):
+        if self._currentIdx is None:
+            raise error.PyAsn1Error('Component not chosen')
+        else:
+            self._sizeSpec(' ')
+
+    def _cloneComponentValues(self, myClone, cloneValueFlag):
+        try:
+            c = self.getComponent()
+        except error.PyAsn1Error:
+            pass
+        else:
+            if isinstance(c, Choice):
+                tagSet = c.getEffectiveTagSet()
+            else:
+                tagSet = c.getTagSet()
+            if isinstance(c, base.AbstractConstructedAsn1Item):
+                myClone.setComponentByType(
+                    tagSet, c.clone(cloneValueFlag=cloneValueFlag)
+                    )
+            else:
+                myClone.setComponentByType(tagSet, c.clone())
+
+    def setComponentByPosition(self, idx, value=None, verifyConstraints=True):
+        l = len(self._componentValues)
+        if idx >= l:
+            self._componentValues = self._componentValues + (idx-l+1)*[None]
+        if self._currentIdx is not None:
+            self._componentValues[self._currentIdx] = None
+        if value is None:
+            if self._componentValues[idx] is None:
+                self._componentValues[idx] = self._componentType.getTypeByPosition(idx).clone()
+                self._componentValuesSet = 1
+                self._currentIdx = idx
+            return self
+        elif not isinstance(value, base.Asn1Item):
+            value = self._componentType.getTypeByPosition(idx).clone(
+                value=value
+                )
+        if verifyConstraints:
+            if self._componentTypeLen:
+                self._verifyComponent(idx, value)
+            self._verifySubtypeSpec(value, idx)            
+        self._componentValues[idx] = value
+        self._currentIdx = idx
+        self._componentValuesSet = 1
+        return self
+
+    def getMinTagSet(self):
+        if self._tagSet:
+            return self._tagSet
+        else:
+            return self._componentType.genMinTagSet()
+
+    def getEffectiveTagSet(self):
+        if self._tagSet:
+            return self._tagSet
+        else:
+            c = self.getComponent()
+            if isinstance(c, Choice):
+                return c.getEffectiveTagSet()
+            else:
+                return c.getTagSet()
+
+    def getTagMap(self):
+        if self._tagSet:
+            return Set.getTagMap(self)
+        else:
+            return Set.getComponentTagMap(self)
+
+    def getComponent(self, innerFlag=0):
+        if self._currentIdx is None:
+            raise error.PyAsn1Error('Component not chosen')
+        else:
+            c = self._componentValues[self._currentIdx]
+            if innerFlag and isinstance(c, Choice):
+                return c.getComponent(innerFlag)
+            else:
+                return c
+
+    def getName(self, innerFlag=0):
+        if self._currentIdx is None:
+            raise error.PyAsn1Error('Component not chosen')
+        else:
+            if innerFlag:
+                c = self._componentValues[self._currentIdx]
+                if isinstance(c, Choice):
+                    return c.getName(innerFlag)
+            return self._componentType.getNameByPosition(self._currentIdx)
+
+    def setDefaultComponents(self): pass
+
+class Any(OctetString):
+    tagSet = baseTagSet = tag.TagSet()  # untagged
+    typeId = 6
+
+    def getTagMap(self):
+        return tagmap.TagMap(
+            { self.getTagSet(): self },
+            { eoo.endOfOctets.getTagSet(): eoo.endOfOctets },
+            self
+            )
+
+# XXX
+# coercion rules?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/useful.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/useful.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1/type/useful.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1/type/useful.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,12 @@
+# ASN.1 "useful" types
+from pyasn1.type import char, tag
+
+class GeneralizedTime(char.VisibleString):
+    tagSet = char.VisibleString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 24)
+        )
+
+class UTCTime(char.VisibleString):
+    tagSet = char.VisibleString.tagSet.tagImplicitly(
+        tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 23)
+        )
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/dependency_links.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/dependency_links.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/dependency_links.txt	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/PKG-INFO thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/PKG-INFO
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/PKG-INFO	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,26 @@
+Metadata-Version: 1.0
+Name: pyasn1
+Version: 0.1.7
+Summary: ASN.1 types and codecs
+Home-page: http://sourceforge.net/projects/pyasn1/
+Author: Ilya Etingof <ilya@glas.net>
+Author-email: ilya@glas.net
+License: BSD
+Description: A pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208).
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: System Administrators
+Classifier: Intended Audience :: Telecommunications Industry
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Communications
+Classifier: Topic :: Security :: Cryptography
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/SOURCES.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/SOURCES.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/SOURCES.txt	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,68 @@
+CHANGES
+LICENSE
+MANIFEST.in
+README
+THANKS
+TODO
+setup.py
+doc/codecs.html
+doc/constraints.html
+doc/constructed.html
+doc/intro.html
+doc/pyasn1-tutorial.html
+doc/scalar.html
+doc/tagging.html
+pyasn1/__init__.py
+pyasn1/debug.py
+pyasn1/error.py
+pyasn1.egg-info/PKG-INFO
+pyasn1.egg-info/SOURCES.txt
+pyasn1.egg-info/dependency_links.txt
+pyasn1.egg-info/top_level.txt
+pyasn1.egg-info/zip-safe
+pyasn1/codec/__init__.py
+pyasn1/codec/ber/__init__.py
+pyasn1/codec/ber/decoder.py
+pyasn1/codec/ber/encoder.py
+pyasn1/codec/ber/eoo.py
+pyasn1/codec/cer/__init__.py
+pyasn1/codec/cer/decoder.py
+pyasn1/codec/cer/encoder.py
+pyasn1/codec/der/__init__.py
+pyasn1/codec/der/decoder.py
+pyasn1/codec/der/encoder.py
+pyasn1/compat/__init__.py
+pyasn1/compat/octets.py
+pyasn1/type/__init__.py
+pyasn1/type/base.py
+pyasn1/type/char.py
+pyasn1/type/constraint.py
+pyasn1/type/error.py
+pyasn1/type/namedtype.py
+pyasn1/type/namedval.py
+pyasn1/type/tag.py
+pyasn1/type/tagmap.py
+pyasn1/type/univ.py
+pyasn1/type/useful.py
+test/__init__.py
+test/suite.py
+test/codec/__init__.py
+test/codec/suite.py
+test/codec/ber/__init__.py
+test/codec/ber/suite.py
+test/codec/ber/test_decoder.py
+test/codec/ber/test_encoder.py
+test/codec/cer/__init__.py
+test/codec/cer/suite.py
+test/codec/cer/test_decoder.py
+test/codec/cer/test_encoder.py
+test/codec/der/__init__.py
+test/codec/der/suite.py
+test/codec/der/test_decoder.py
+test/codec/der/test_encoder.py
+test/type/__init__.py
+test/type/suite.py
+test/type/test_constraint.py
+test/type/test_namedtype.py
+test/type/test_tag.py
+test/type/test_univ.py
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/top_level.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/top_level.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/top_level.txt	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+pyasn1
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/zip-safe thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/zip-safe
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/pyasn1.egg-info/zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/pyasn1.egg-info/zip-safe	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/README thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/README
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/README	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/README	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,68 @@
+
+ASN.1 library for Python
+------------------------
+
+This is an implementation of ASN.1 types and codecs in Python programming
+language. It has been first written to support particular protocol (SNMP)
+but then generalized to be suitable for a wide range of protocols
+based on ASN.1 specification.
+
+FEATURES
+--------
+
+* Generic implementation of ASN.1 types (X.208)
+* Fully standard compliant BER/CER/DER codecs
+* 100% Python, works with Python 2.4 up to Python 3.3 (beta 1)
+* MT-safe
+
+MISFEATURES
+-----------
+
+* No ASN.1 compiler (by-hand ASN.1 spec compilation into Python code required)
+* Codecs are not restartable
+
+INSTALLATION
+------------
+
+The pyasn1 package uses setuptools/distutils for installation. Thus do
+either:
+
+$ easy_install pyasn1
+
+or
+
+$ tar zxf pyasn1-0.1.3.tar.gz
+$ cd pyasn1-0.1.3
+$ python setup.py install
+$ cd test
+$ python suite.py   # run unit tests
+
+OPERATION
+---------
+
+Perhaps a typical use would involve [by-hand] compilation of your ASN.1
+specification into pyasn1-backed Python code at your application.
+
+For more information on pyasn1 APIs, please, refer to the 
+doc/pyasn1-tutorial.html file in the distribution.
+
+Also refer to example modules. Take a look at pyasn1-modules package -- maybe
+it already holds something useful to you.
+
+AVAILABILITY
+------------
+
+The pyasn1 package is distributed under terms and conditions of BSD-style
+license. See LICENSE file in the distribution. Source code is freely
+available from:
+
+http://pyasn1.sf.net
+
+
+FEEDBACK
+--------
+
+Please, send your comments and fixes to mailing lists at project web site.
+
+=-=-=
+mailto: ilya@glas.net
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/setup.cfg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/setup.cfg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/setup.cfg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/setup.cfg	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/setup.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/setup.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/setup.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/setup.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+"""ASN.1 types and codecs
+
+   A pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208).
+"""
+
+import os
+import sys
+
+classifiers = """\
+Development Status :: 5 - Production/Stable
+Environment :: Console
+Intended Audience :: Developers
+Intended Audience :: Education
+Intended Audience :: Information Technology
+Intended Audience :: Science/Research
+Intended Audience :: System Administrators
+Intended Audience :: Telecommunications Industry
+License :: OSI Approved :: BSD License
+Natural Language :: English
+Operating System :: OS Independent
+Programming Language :: Python :: 2
+Programming Language :: Python :: 3
+Topic :: Communications
+Topic :: Security :: Cryptography
+Topic :: Software Development :: Libraries :: Python Modules
+"""
+
+def howto_install_distribute():
+    print("""
+   Error: You need the distribute Python package!
+
+   It's very easy to install it, just type (as root on Linux):
+
+   wget http://python-distribute.org/distribute_setup.py
+   python distribute_setup.py
+
+   Then you could make eggs from this package.
+""")
+
+def howto_install_setuptools():
+    print("""
+   Error: You need setuptools Python package!
+
+   It's very easy to install it, just type (as root on Linux):
+
+   wget http://peak.telecommunity.com/dist/ez_setup.py
+   python ez_setup.py
+
+   Then you could make eggs from this package.
+""")
+
+try:
+    from setuptools import setup, Command
+    params = {
+        'zip_safe': True
+    }    
+except ImportError:
+    for arg in sys.argv:
+        if arg.find('egg') != -1:
+            if sys.version_info[0] > 2:
+                howto_install_distribute()
+            else:
+                howto_install_setuptools()
+            sys.exit(1)
+    from distutils.core import setup, Command
+    params = {}
+
+doclines = [ x.strip() for x in __doc__.split('\n') if x ]
+
+params.update( {
+    'name': 'pyasn1',
+    'version': open(os.path.join('pyasn1','__init__.py')).read().split('\'')[1],
+    'description': doclines[0],
+    'long_description': ' '.join(doclines[1:]),
+    'maintainer': 'Ilya Etingof <ilya@glas.net>',
+    'author': 'Ilya Etingof',
+    'author_email': 'ilya@glas.net',
+    'url': 'http://sourceforge.net/projects/pyasn1/',
+    'platforms': ['any'],
+    'classifiers': [ x for x in classifiers.split('\n') if x ],
+    'license': 'BSD',
+    'packages': [ 'pyasn1',
+                  'pyasn1.type',
+                  'pyasn1.compat',
+                  'pyasn1.codec',
+                  'pyasn1.codec.ber',
+                  'pyasn1.codec.cer',
+                  'pyasn1.codec.der' ]
+} )
+
+# handle unittest discovery feature
+if sys.version_info[0:2] < (2, 7) or \
+   sys.version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        unittest = None
+else:
+    import unittest
+
+if unittest:
+    class PyTest(Command):
+        user_options = []
+
+        def initialize_options(self): pass
+        def finalize_options(self): pass
+
+        def run(self):
+            suite = unittest.defaultTestLoader.discover('.')
+            unittest.TextTestRunner(verbosity=2).run(suite)
+
+    params['cmdclass'] = { 'test': PyTest }
+
+setup(**params)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/suite.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/suite.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/suite.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/suite.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,22 @@
+from sys import path, version_info
+from os.path import sep
+path.insert(1, path[0]+sep+'ber')
+import test_encoder, test_decoder
+from pyasn1.error import PyAsn1Error
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+suite = unittest.TestSuite()
+loader = unittest.TestLoader()
+for m in (test_encoder, test_decoder):
+    suite.addTest(loader.loadTestsFromModule(m))
+
+def runTests(): unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__': runTests()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/test_decoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/test_decoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/test_decoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/test_decoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,535 @@
+from pyasn1.type import tag, namedtype, univ
+from pyasn1.codec.ber import decoder
+from pyasn1.compat.octets import ints2octs, str2octs, null
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class LargeTagDecoderTestCase(unittest.TestCase):
+    def testLargeTag(self):
+        assert decoder.decode(ints2octs((127, 141, 245, 182, 253, 47, 3, 2, 1, 1))) == (1, null)
+
+class IntegerDecoderTestCase(unittest.TestCase):
+    def testPosInt(self):
+        assert decoder.decode(ints2octs((2, 1, 12))) == (12, null)
+    def testNegInt(self):
+        assert decoder.decode(ints2octs((2, 1, 244))) == (-12, null)
+    def testZero(self):
+        assert decoder.decode(ints2octs((2, 0))) == (0, null)
+    def testZeroLong(self):
+        assert decoder.decode(ints2octs((2, 1, 0))) == (0, null)
+    def testMinusOne(self):
+        assert decoder.decode(ints2octs((2, 1, 255))) == (-1, null)
+    def testPosLong(self):
+        assert decoder.decode(
+            ints2octs((2, 9, 0, 255, 255, 255, 255, 255, 255, 255, 255))
+            ) == (0xffffffffffffffff, null)
+    def testNegLong(self):
+        assert decoder.decode(
+            ints2octs((2, 9, 255, 0, 0, 0, 0, 0, 0, 0, 1))
+            ) == (-0xffffffffffffffff, null)
+    def testSpec(self):
+        try:
+            decoder.decode(
+                ints2octs((2, 1, 12)), asn1Spec=univ.Null()
+                ) == (12, null)
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong asn1Spec worked out'
+        assert decoder.decode(
+            ints2octs((2, 1, 12)), asn1Spec=univ.Integer()
+            ) == (12, null)
+    def testTagFormat(self):
+        try:
+            decoder.decode(ints2octs((34, 1, 12)))
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong tagFormat worked out'
+
+class BooleanDecoderTestCase(unittest.TestCase):
+    def testTrue(self):
+        assert decoder.decode(ints2octs((1, 1, 1))) == (1, null)
+    def testTrueNeg(self):
+        assert decoder.decode(ints2octs((1, 1, 255))) == (1, null)
+    def testExtraTrue(self):
+        assert decoder.decode(ints2octs((1, 1, 1, 0, 120, 50, 50))) == (1, ints2octs((0, 120, 50, 50)))
+    def testFalse(self):
+        assert decoder.decode(ints2octs((1, 1, 0))) == (0, null)
+    def testTagFormat(self):
+        try:
+            decoder.decode(ints2octs((33, 1, 1)))
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong tagFormat worked out'
+
+class BitStringDecoderTestCase(unittest.TestCase):
+    def testDefMode(self):
+        assert decoder.decode(
+            ints2octs((3, 3, 1, 169, 138))
+            ) == ((1,0,1,0,1,0,0,1,1,0,0,0,1,0,1), null)
+    def testIndefMode(self):
+        assert decoder.decode(
+            ints2octs((3, 3, 1, 169, 138))
+            ) == ((1,0,1,0,1,0,0,1,1,0,0,0,1,0,1), null)
+    def testDefModeChunked(self):
+        assert decoder.decode(
+            ints2octs((35, 8, 3, 2, 0, 169, 3, 2, 1, 138))
+            ) == ((1,0,1,0,1,0,0,1,1,0,0,0,1,0,1), null)
+    def testIndefModeChunked(self):
+        assert decoder.decode(
+            ints2octs((35, 128, 3, 2, 0, 169, 3, 2, 1, 138, 0, 0))
+            ) == ((1,0,1,0,1,0,0,1,1,0,0,0,1,0,1), null)
+    def testDefModeChunkedSubst(self):
+        assert decoder.decode(
+            ints2octs((35, 8, 3, 2, 0, 169, 3, 2, 1, 138)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((3, 2, 0, 169, 3, 2, 1, 138)), 8)
+    def testIndefModeChunkedSubst(self):
+        assert decoder.decode(
+            ints2octs((35, 128, 3, 2, 0, 169, 3, 2, 1, 138, 0, 0)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((3, 2, 0, 169, 3, 2, 1, 138, 0, 0)), -1)
+        
+class OctetStringDecoderTestCase(unittest.TestCase):
+    def testDefMode(self):
+        assert decoder.decode(
+            ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+            ) == (str2octs('Quick brown fox'), null)
+    def testIndefMode(self):
+        assert decoder.decode(
+            ints2octs((36, 128, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 0, 0))
+            ) == (str2octs('Quick brown fox'), null)
+    def testDefModeChunked(self):
+        assert decoder.decode(
+            ints2octs((36, 23, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120))
+            ) == (str2octs('Quick brown fox'), null)
+    def testIndefModeChunked(self):
+        assert decoder.decode(
+            ints2octs((36, 128, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120, 0, 0))
+            ) == (str2octs('Quick brown fox'), null)
+    def testDefModeChunkedSubst(self):
+        assert decoder.decode(
+            ints2octs((36, 23, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120)), 23)
+    def testIndefModeChunkedSubst(self):
+        assert decoder.decode(
+            ints2octs((36, 128, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120, 0, 0)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120, 0, 0)), -1)
+        
+class ExpTaggedOctetStringDecoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.o = univ.OctetString(
+            'Quick brown fox',
+            tagSet=univ.OctetString.tagSet.tagExplicitly(
+            tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 5)
+            ))
+
+    def testDefMode(self):
+        assert self.o.isSameTypeWith(decoder.decode(
+            ints2octs((101, 17, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+            )[0])
+
+    def testIndefMode(self):
+        v, s = decoder.decode(ints2octs((101, 128, 36, 128, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 0, 0, 0, 0)))
+        assert self.o.isSameTypeWith(v)
+        assert not s
+
+    def testDefModeChunked(self):
+        v, s = decoder.decode(ints2octs((101, 25, 36, 23, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120)))
+        assert self.o.isSameTypeWith(v)
+        assert not s
+
+    def testIndefModeChunked(self):
+        v, s = decoder.decode(ints2octs((101, 128, 36, 128, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120, 0, 0, 0, 0)))
+        assert self.o.isSameTypeWith(v)
+        assert not s
+
+    def testDefModeSubst(self):
+        assert decoder.decode(
+            ints2octs((101, 17, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120)), 17)
+
+    def testIndefModeSubst(self):
+        assert decoder.decode(
+            ints2octs((101, 128, 36, 128, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 0, 0, 0, 0)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((36, 128, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 0, 0, 0, 0)), -1)
+  
+class NullDecoderTestCase(unittest.TestCase):
+    def testNull(self):
+        assert decoder.decode(ints2octs((5, 0))) == (null, null)
+    def testTagFormat(self):
+        try:
+            decoder.decode(ints2octs((37, 0)))
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong tagFormat worked out'
+
+class ObjectIdentifierDecoderTestCase(unittest.TestCase):
+    def testOID(self):
+        assert decoder.decode(
+            ints2octs((6, 6, 43, 6, 0, 191, 255, 126))
+            ) == ((1,3,6,0,0xffffe), null)
+
+    def testEdges1(self):
+        assert decoder.decode(
+            ints2octs((6, 1, 255))
+            ) == ((6,15), null)
+
+    def testEdges2(self):
+        assert decoder.decode(
+            ints2octs((6, 1, 239))
+            ) == ((5,39), null)
+
+    def testEdges3(self):
+        assert decoder.decode(
+            ints2octs((6, 7, 43, 6, 143, 255, 255, 255, 127))
+            ) == ((1, 3, 6, 4294967295), null)
+
+    def testNonLeading0x80(self):
+        assert decoder.decode(
+            ints2octs((6, 5, 85, 4, 129, 128, 0)),
+            ) == ((2, 5, 4, 16384), null)
+
+    def testLeading0x80(self):
+        try:
+            decoder.decode(
+                ints2octs((6, 5, 85, 4, 128, 129, 0))
+            )
+        except PyAsn1Error:
+            pass
+        else:
+            assert 1, 'Leading 0x80 tolarated'
+
+    def testTagFormat(self):
+        try:
+            decoder.decode(ints2octs((38, 1, 239)))
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong tagFormat worked out'
+
+class RealDecoderTestCase(unittest.TestCase):
+    def testChar(self):
+        assert decoder.decode(
+            ints2octs((9, 7, 3, 49, 50, 51, 69, 49, 49))
+        ) == (univ.Real((123, 10, 11)), null)
+
+    def testBin1(self):
+        assert decoder.decode(
+            ints2octs((9, 4, 128, 245, 4, 77))
+        ) == (univ.Real((1101, 2, -11)), null)
+
+    def testBin2(self):
+        assert decoder.decode(
+            ints2octs((9, 4, 128, 11, 4, 77))
+        ) == (univ.Real((1101, 2, 11)), null)
+
+    def testBin3(self):
+        assert decoder.decode(
+            ints2octs((9, 3, 192, 10, 123))
+        ) == (univ.Real((-123, 2, 10)), null)
+
+
+    def testPlusInf(self):
+        assert decoder.decode(
+            ints2octs((9, 1, 64))
+        ) == (univ.Real('inf'), null)
+ 
+    def testMinusInf(self):
+        assert decoder.decode(
+            ints2octs((9, 1, 65))
+        ) == (univ.Real('-inf'), null)
+
+    def testEmpty(self):
+        assert decoder.decode(
+            ints2octs((9, 0))
+        ) == (univ.Real(0.0), null)
+ 
+    def testTagFormat(self):
+        try:
+            decoder.decode(ints2octs((41, 0)))
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong tagFormat worked out'
+
+class SequenceDecoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Sequence(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null(null)),
+            namedtype.NamedType('first-name', univ.OctetString(null)),
+            namedtype.NamedType('age', univ.Integer(33)),
+            ))
+        self.s.setComponentByPosition(0, univ.Null(null))
+        self.s.setComponentByPosition(1, univ.OctetString('quick brown'))
+        self.s.setComponentByPosition(2, univ.Integer(1))
+        self.s.setDefaultComponents()
+        
+    def testWithOptionalAndDefaultedDefMode(self):
+        assert decoder.decode(
+            ints2octs((48, 18, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1))
+            ) == (self.s, null)
+        
+    def testWithOptionalAndDefaultedIndefMode(self):
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0))
+            ) == (self.s, null)
+
+    def testWithOptionalAndDefaultedDefModeChunked(self):
+        assert decoder.decode(
+            ints2octs((48, 24, 5, 0, 36, 17, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 2, 1, 1))
+            ) == (self.s, null)
+
+    def testWithOptionalAndDefaultedIndefModeChunked(self):
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0))
+            ) == (self.s, null)
+
+    def testWithOptionalAndDefaultedDefModeSubst(self):
+        assert decoder.decode(
+            ints2octs((48, 18, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1)), 18)
+        
+    def testWithOptionalAndDefaultedIndefModeSubst(self):
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0)),
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((5, 0, 36, 128, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0)), -1)
+
+    def testTagFormat(self):
+        try:
+            decoder.decode(
+                ints2octs((16, 18, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1))
+            )
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'wrong tagFormat worked out'
+
+class GuidedSequenceDecoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Sequence(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null(null)),
+            namedtype.OptionalNamedType('first-name', univ.OctetString(null)),
+            namedtype.DefaultedNamedType('age', univ.Integer(33)),
+            ))
+
+    def __init(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0, univ.Null(null))
+        self.s.setDefaultComponents()
+        
+    def __initWithOptional(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0, univ.Null(null))
+        self.s.setComponentByPosition(1, univ.OctetString('quick brown'))
+        self.s.setDefaultComponents()
+
+    def __initWithDefaulted(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0, univ.Null(null))
+        self.s.setComponentByPosition(2, univ.Integer(1))
+        self.s.setDefaultComponents()
+        
+    def __initWithOptionalAndDefaulted(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0, univ.Null(null))
+        self.s.setComponentByPosition(1, univ.OctetString('quick brown'))
+        self.s.setComponentByPosition(2, univ.Integer(1))
+        self.s.setDefaultComponents()
+        
+    def testDefMode(self):
+        self.__init()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+        
+    def testIndefMode(self):
+        self.__init()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testDefModeChunked(self):
+        self.__init()
+        assert decoder.decode(
+            ints2octs((48, 2, 5, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testIndefModeChunked(self):
+        self.__init()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithOptionalDefMode(self):
+        self.__initWithOptional()
+        assert decoder.decode(
+            ints2octs((48, 15, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110)), asn1Spec=self.s
+            ) == (self.s, null)
+        
+    def testWithOptionaIndefMode(self):
+        self.__initWithOptional()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 0, 0, 0, 0)),
+            asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithOptionalDefModeChunked(self):
+        self.__initWithOptional()
+        assert decoder.decode(
+            ints2octs((48, 21, 5, 0, 36, 17, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110)),
+            asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithOptionalIndefModeChunked(self):
+        self.__initWithOptional()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 0, 0, 0, 0)),
+            asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithDefaultedDefMode(self):
+        self.__initWithDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 5, 5, 0, 2, 1, 1)), asn1Spec=self.s
+            ) == (self.s, null)
+        
+    def testWithDefaultedIndefMode(self):
+        self.__initWithDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 2, 1, 1, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithDefaultedDefModeChunked(self):
+        self.__initWithDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 5, 5, 0, 2, 1, 1)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithDefaultedIndefModeChunked(self):
+        self.__initWithDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 2, 1, 1, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithOptionalAndDefaultedDefMode(self):
+        self.__initWithOptionalAndDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 18, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1)), asn1Spec=self.s
+            ) == (self.s, null)
+        
+    def testWithOptionalAndDefaultedIndefMode(self):
+        self.__initWithOptionalAndDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithOptionalAndDefaultedDefModeChunked(self):
+        self.__initWithOptionalAndDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 24, 5, 0, 36, 17, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 2, 1, 1)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithOptionalAndDefaultedIndefModeChunked(self):
+        self.__initWithOptionalAndDefaulted()
+        assert decoder.decode(
+            ints2octs((48, 128, 5, 0, 36, 128, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+class ChoiceDecoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Choice(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null(null)),
+            namedtype.NamedType('number', univ.Integer(0)),
+            namedtype.NamedType('string', univ.OctetString())
+            ))
+
+    def testBySpec(self):
+        self.s.setComponentByPosition(0, univ.Null(null))
+        assert decoder.decode(
+            ints2octs((5, 0)), asn1Spec=self.s
+            ) == (self.s, null)
+
+    def testWithoutSpec(self):
+        self.s.setComponentByPosition(0, univ.Null(null))
+        assert decoder.decode(ints2octs((5, 0))) == (self.s, null)
+        assert decoder.decode(ints2octs((5, 0))) == (univ.Null(null), null)
+
+    def testUndefLength(self):
+        self.s.setComponentByPosition(2, univ.OctetString('abcdefgh'))
+        assert decoder.decode(ints2octs((36, 128, 4, 3, 97, 98, 99, 4, 3, 100, 101, 102, 4, 2, 103, 104, 0, 0)), asn1Spec=self.s) == (self.s, null)
+
+    def testExplicitTag(self):
+        s = self.s.subtype(explicitTag=tag.Tag(tag.tagClassContext,
+                           tag.tagFormatConstructed, 4))
+        s.setComponentByPosition(0, univ.Null(null))
+        assert decoder.decode(ints2octs((164, 2, 5, 0)), asn1Spec=s) == (s, null)
+
+    def testExplicitTagUndefLength(self):
+        s = self.s.subtype(explicitTag=tag.Tag(tag.tagClassContext,
+                           tag.tagFormatConstructed, 4))
+        s.setComponentByPosition(0, univ.Null(null))
+        assert decoder.decode(ints2octs((164, 128, 5, 0, 0, 0)), asn1Spec=s) == (s, null)
+
+class AnyDecoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Any()
+
+    def testByUntagged(self):
+        assert decoder.decode(
+            ints2octs((4, 3, 102, 111, 120)), asn1Spec=self.s
+            ) == (univ.Any('\004\003fox'), null)
+
+    def testTaggedEx(self):
+        s = univ.Any('\004\003fox').subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 4))
+        assert decoder.decode(ints2octs((164, 5, 4, 3, 102, 111, 120)), asn1Spec=s) == (s, null)
+                
+    def testTaggedIm(self):
+        s = univ.Any('\004\003fox').subtype(implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 4))
+        assert decoder.decode(ints2octs((132, 5, 4, 3, 102, 111, 120)), asn1Spec=s) == (s, null)
+
+    def testByUntaggedIndefMode(self):
+        assert decoder.decode(
+            ints2octs((4, 3, 102, 111, 120)), asn1Spec=self.s
+            ) == (univ.Any('\004\003fox'), null)
+
+    def testTaggedExIndefMode(self):
+        s = univ.Any('\004\003fox').subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 4))
+        assert decoder.decode(ints2octs((164, 128, 4, 3, 102, 111, 120, 0, 0)), asn1Spec=s) == (s, null)
+                
+    def testTaggedImIndefMode(self):
+        s = univ.Any('\004\003fox').subtype(implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 4))
+        assert decoder.decode(ints2octs((164, 128, 4, 3, 102, 111, 120, 0, 0)), asn1Spec=s) == (s, null)
+
+    def testByUntaggedSubst(self):
+        assert decoder.decode(
+            ints2octs((4, 3, 102, 111, 120)),
+            asn1Spec=self.s,
+            substrateFun=lambda a,b,c: (b,c)
+            ) == (ints2octs((4, 3, 102, 111, 120)), 5)
+
+    def testTaggedExSubst(self):
+        assert decoder.decode(
+            ints2octs((164, 5, 4, 3, 102, 111, 120)),
+            asn1Spec=self.s,
+            substrateFun=lambda a,b,c: (b,c)
+        ) == (ints2octs((164, 5, 4, 3, 102, 111, 120)), 7)
+
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/test_encoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/test_encoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/ber/test_encoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/ber/test_encoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,338 @@
+from pyasn1.type import tag, namedtype, univ
+from pyasn1.codec.ber import encoder
+from pyasn1.compat.octets import ints2octs
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class LargeTagEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.o = univ.Integer().subtype(
+            value=1, explicitTag=tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 0xdeadbeaf)
+            )
+    def testEncoder(self):
+        assert encoder.encode(self.o) == ints2octs((127, 141, 245, 182, 253, 47, 3, 2, 1, 1))
+        
+class IntegerEncoderTestCase(unittest.TestCase):
+    def testPosInt(self):
+        assert encoder.encode(univ.Integer(12)) == ints2octs((2, 1, 12))
+        
+    def testNegInt(self):
+        assert encoder.encode(univ.Integer(-12)) == ints2octs((2, 1, 244))
+        
+    def testZero(self):
+        assert encoder.encode(univ.Integer(0)) == ints2octs((2, 1, 0))
+
+    def testCompactZero(self):
+        encoder.IntegerEncoder.supportCompactZero = True
+        substrate = encoder.encode(univ.Integer(0))
+        encoder.IntegerEncoder.supportCompactZero = False
+        assert substrate == ints2octs((2, 0))
+        
+    def testMinusOne(self):
+        assert encoder.encode(univ.Integer(-1)) == ints2octs((2, 1, 255))
+        
+    def testPosLong(self):
+        assert encoder.encode(
+            univ.Integer(0xffffffffffffffff)
+            ) == ints2octs((2, 9, 0, 255, 255, 255, 255, 255, 255, 255, 255))
+        
+    def testNegLong(self):
+        assert encoder.encode(
+            univ.Integer(-0xffffffffffffffff)
+            ) == ints2octs((2, 9, 255, 0, 0, 0, 0, 0, 0, 0, 1))
+
+class BooleanEncoderTestCase(unittest.TestCase):
+    def testTrue(self):
+        assert encoder.encode(univ.Boolean(1)) == ints2octs((1, 1, 1))
+        
+    def testFalse(self):
+        assert encoder.encode(univ.Boolean(0)) == ints2octs((1, 1, 0))
+
+class BitStringEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.b = univ.BitString((1,0,1,0,1,0,0,1,1,0,0,0,1,0,1))
+        
+    def testDefMode(self):
+        assert encoder.encode(self.b) == ints2octs((3, 3, 1, 169, 138))
+        
+    def testIndefMode(self):
+        assert encoder.encode(
+            self.b, defMode=0
+            ) == ints2octs((3, 3, 1, 169, 138))
+        
+    def testDefModeChunked(self):
+        assert encoder.encode(
+            self.b, maxChunkSize=1
+            ) == ints2octs((35, 8, 3, 2, 0, 169, 3, 2, 1, 138))
+        
+    def testIndefModeChunked(self):
+        assert encoder.encode(
+            self.b, defMode=0, maxChunkSize=1
+            ) == ints2octs((35, 128, 3, 2, 0, 169, 3, 2, 1, 138, 0, 0))
+        
+    def testEmptyValue(self):
+        assert encoder.encode(univ.BitString(())) == ints2octs((3, 1, 0))
+        
+class OctetStringEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.o = univ.OctetString('Quick brown fox')
+        
+    def testDefMode(self):
+        assert encoder.encode(self.o) == ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+        
+    def testIndefMode(self):
+        assert encoder.encode(
+            self.o, defMode=0
+            ) == ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+
+    def testDefModeChunked(self):
+        assert encoder.encode(
+            self.o, maxChunkSize=4
+            ) == ints2octs((36, 23, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120))
+
+    def testIndefModeChunked(self):
+        assert encoder.encode(
+            self.o, defMode=0, maxChunkSize=4
+            ) == ints2octs((36, 128, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120, 0, 0))
+        
+class ExpTaggedOctetStringEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.o = univ.OctetString().subtype(
+            value='Quick brown fox',
+            explicitTag=tag.Tag(tag.tagClassApplication,tag.tagFormatSimple,5)
+            )
+    def testDefMode(self):
+        assert encoder.encode(self.o) == ints2octs((101, 17, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+
+    def testIndefMode(self):
+        assert encoder.encode(
+            self.o, defMode=0
+            ) == ints2octs((101, 128, 4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 0, 0))
+        
+    def testDefModeChunked(self):
+        assert encoder.encode(
+            self.o, defMode=1, maxChunkSize=4
+            ) == ints2octs((101, 25, 36, 23, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120))
+        
+    def testIndefModeChunked(self):
+        assert encoder.encode(
+            self.o, defMode=0, maxChunkSize=4
+            ) == ints2octs((101, 128, 36, 128, 4, 4, 81, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 4, 111, 119, 110, 32, 4, 3, 102, 111, 120, 0, 0, 0, 0))
+
+class NullEncoderTestCase(unittest.TestCase):
+    def testNull(self):
+        assert encoder.encode(univ.Null('')) == ints2octs((5, 0))
+
+class ObjectIdentifierEncoderTestCase(unittest.TestCase):
+    def testNull(self):
+        assert encoder.encode(
+            univ.ObjectIdentifier((1,3,6,0,0xffffe))
+            ) == ints2octs((6, 6, 43, 6, 0, 191, 255, 126))
+
+class RealEncoderTestCase(unittest.TestCase):
+    def testChar(self):
+        assert encoder.encode(
+            univ.Real((123, 10, 11))
+            ) == ints2octs((9, 7, 3, 49, 50, 51, 69, 49, 49))
+
+    def testBin1(self):
+        assert encoder.encode(
+            univ.Real((1101, 2, 11))
+            ) == ints2octs((9, 4, 128, 11, 4, 77))
+
+    def testBin2(self):
+        assert encoder.encode(
+            univ.Real((1101, 2, -11))
+            ) == ints2octs((9, 4, 128, 245, 4, 77))
+
+    def testPlusInf(self):
+        assert encoder.encode(univ.Real('inf')) == ints2octs((9, 1, 64))
+
+    def testMinusInf(self):
+        assert encoder.encode(univ.Real('-inf')) == ints2octs((9, 1, 65))
+        
+    def testZero(self):
+        assert encoder.encode(univ.Real(0)) == ints2octs((9, 0))
+        
+class SequenceEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Sequence(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null('')),
+            namedtype.OptionalNamedType('first-name', univ.OctetString('')),
+            namedtype.DefaultedNamedType('age', univ.Integer(33)),
+            ))
+
+    def __init(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0)
+        
+    def __initWithOptional(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0)
+        self.s.setComponentByPosition(1, 'quick brown')
+        
+    def __initWithDefaulted(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0)
+        self.s.setComponentByPosition(2, 1)
+        
+    def __initWithOptionalAndDefaulted(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0, univ.Null(''))
+        self.s.setComponentByPosition(1, univ.OctetString('quick brown'))
+        self.s.setComponentByPosition(2, univ.Integer(1))
+        
+    def testDefMode(self):
+        self.__init()
+        assert encoder.encode(self.s) == ints2octs((48, 2, 5, 0))
+        
+    def testIndefMode(self):
+        self.__init()
+        assert encoder.encode(
+            self.s, defMode=0
+            ) == ints2octs((48, 128, 5, 0, 0, 0))
+
+    def testDefModeChunked(self):
+        self.__init()
+        assert encoder.encode(
+            self.s, defMode=1, maxChunkSize=4
+            ) == ints2octs((48, 2, 5, 0))
+
+    def testIndefModeChunked(self):
+        self.__init()
+        assert encoder.encode(
+            self.s, defMode=0, maxChunkSize=4
+            ) == ints2octs((48, 128, 5, 0, 0, 0))
+
+    def testWithOptionalDefMode(self):
+        self.__initWithOptional()
+        assert encoder.encode(self.s) == ints2octs((48, 15, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110))
+        
+    def testWithOptionalIndefMode(self):
+        self.__initWithOptional()
+        assert encoder.encode(
+            self.s, defMode=0
+            ) == ints2octs((48, 128, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 0, 0))
+
+    def testWithOptionalDefModeChunked(self):
+        self.__initWithOptional()
+        assert encoder.encode(
+            self.s, defMode=1, maxChunkSize=4
+            ) == ints2octs((48, 21, 5, 0, 36, 17, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110))
+
+    def testWithOptionalIndefModeChunked(self):
+        self.__initWithOptional()
+        assert encoder.encode(
+            self.s, defMode=0, maxChunkSize=4
+            ) == ints2octs((48, 128, 5, 0, 36, 128, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 0, 0, 0, 0))
+
+    def testWithDefaultedDefMode(self):
+        self.__initWithDefaulted()
+        assert encoder.encode(self.s) == ints2octs((48, 5, 5, 0, 2, 1, 1))
+        
+    def testWithDefaultedIndefMode(self):
+        self.__initWithDefaulted()
+        assert encoder.encode(
+            self.s, defMode=0
+            ) == ints2octs((48, 128, 5, 0, 2, 1, 1, 0, 0))
+
+    def testWithDefaultedDefModeChunked(self):
+        self.__initWithDefaulted()
+        assert encoder.encode(
+            self.s, defMode=1, maxChunkSize=4
+            ) == ints2octs((48, 5, 5, 0, 2, 1, 1))
+
+    def testWithDefaultedIndefModeChunked(self):
+        self.__initWithDefaulted()
+        assert encoder.encode(
+            self.s, defMode=0, maxChunkSize=4
+            ) == ints2octs((48, 128, 5, 0, 2, 1, 1, 0, 0))
+
+    def testWithOptionalAndDefaultedDefMode(self):
+        self.__initWithOptionalAndDefaulted()
+        assert encoder.encode(self.s) == ints2octs((48, 18, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1))
+        
+    def testWithOptionalAndDefaultedIndefMode(self):
+        self.__initWithOptionalAndDefaulted()
+        assert encoder.encode(
+            self.s, defMode=0
+            ) == ints2octs((48, 128, 5, 0, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 2, 1, 1, 0, 0))
+
+    def testWithOptionalAndDefaultedDefModeChunked(self):
+        self.__initWithOptionalAndDefaulted()
+        assert encoder.encode(
+            self.s, defMode=1, maxChunkSize=4
+            ) == ints2octs((48, 24, 5, 0, 36, 17, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 2, 1, 1))
+
+    def testWithOptionalAndDefaultedIndefModeChunked(self):
+        self.__initWithOptionalAndDefaulted()
+        assert encoder.encode(
+            self.s, defMode=0, maxChunkSize=4
+            ) == ints2octs((48, 128, 5, 0, 36, 128, 4, 4, 113, 117, 105, 99, 4, 4, 107, 32, 98, 114, 4, 3, 111, 119, 110, 0, 0, 2, 1, 1, 0, 0))
+
+class ChoiceEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Choice(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null('')),
+            namedtype.NamedType('number', univ.Integer(0)),
+            namedtype.NamedType('string', univ.OctetString())
+            ))
+
+    def testEmpty(self):
+        try:
+            encoder.encode(self.s)
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'encoded unset choice'
+        
+    def testFilled(self):
+        self.s.setComponentByPosition(0, univ.Null(''))
+        assert encoder.encode(self.s) == ints2octs((5, 0))
+
+    def testTagged(self):
+        s = self.s.subtype(
+            explicitTag=tag.Tag(tag.tagClassContext,tag.tagFormatConstructed,4)
+        )
+        s.setComponentByPosition(0, univ.Null(''))
+        assert encoder.encode(s) == ints2octs((164, 2, 5, 0))
+
+    def testUndefLength(self):
+        self.s.setComponentByPosition(2, univ.OctetString('abcdefgh'))
+        assert encoder.encode(self.s, defMode=False, maxChunkSize=3) == ints2octs((36, 128, 4, 3, 97, 98, 99, 4, 3, 100, 101, 102, 4, 2, 103, 104, 0, 0))
+
+    def testTaggedUndefLength(self):
+        s = self.s.subtype(
+            explicitTag=tag.Tag(tag.tagClassContext,tag.tagFormatConstructed,4)
+        )
+        s.setComponentByPosition(2, univ.OctetString('abcdefgh'))
+        assert encoder.encode(s, defMode=False, maxChunkSize=3) == ints2octs((164, 128, 36, 128, 4, 3, 97, 98, 99, 4, 3, 100, 101, 102, 4, 2, 103, 104, 0, 0, 0, 0))
+
+class AnyEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Any(encoder.encode(univ.OctetString('fox')))
+        
+    def testUntagged(self):
+        assert encoder.encode(self.s) == ints2octs((4, 3, 102, 111, 120))
+            
+    def testTaggedEx(self):
+        s = self.s.subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 4)
+            )
+        assert encoder.encode(s) == ints2octs((164, 5, 4, 3, 102, 111, 120))
+
+    def testTaggedIm(self):
+        s = self.s.subtype(
+            implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 4)
+            )
+        assert encoder.encode(s) == ints2octs((132, 5, 4, 3, 102, 111, 120))
+                    
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/suite.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/suite.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/suite.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/suite.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,22 @@
+from sys import path, version_info
+from os.path import sep
+path.insert(1, path[0]+sep+'cer')
+import test_encoder, test_decoder
+from pyasn1.error import PyAsn1Error
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+suite = unittest.TestSuite()
+loader = unittest.TestLoader()
+for m in (test_encoder, test_decoder):
+    suite.addTest(loader.loadTestsFromModule(m))
+
+def runTests(): unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__': runTests()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/test_decoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/test_decoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/test_decoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/test_decoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,31 @@
+from pyasn1.type import univ
+from pyasn1.codec.cer import decoder
+from pyasn1.compat.octets import ints2octs, str2octs, null
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class BooleanDecoderTestCase(unittest.TestCase):
+    def testTrue(self):
+        assert decoder.decode(ints2octs((1, 1, 255))) == (1, null)
+    def testFalse(self):
+        assert decoder.decode(ints2octs((1, 1, 0))) == (0, null)
+        
+class OctetStringDecoderTestCase(unittest.TestCase):
+    def testShortMode(self):
+        assert decoder.decode(
+            ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120)),
+            ) == (str2octs('Quick brown fox'), null)
+    def testLongMode(self):
+        assert decoder.decode(
+            ints2octs((36, 128, 4, 130, 3, 232) + (81,)*1000 + (4, 1, 81, 0, 0))
+            ) == (str2octs('Q'*1001), null)
+
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/test_encoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/test_encoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/cer/test_encoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/cer/test_encoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,107 @@
+from pyasn1.type import namedtype, univ
+from pyasn1.codec.cer import encoder
+from pyasn1.compat.octets import ints2octs
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class BooleanEncoderTestCase(unittest.TestCase):
+    def testTrue(self):
+        assert encoder.encode(univ.Boolean(1)) == ints2octs((1, 1, 255))
+    def testFalse(self):
+        assert encoder.encode(univ.Boolean(0)) == ints2octs((1, 1, 0))
+
+class BitStringEncoderTestCase(unittest.TestCase):
+    def testShortMode(self):
+        assert encoder.encode(
+            univ.BitString((1,0)*501)
+            ) == ints2octs((3, 127, 6) + (170,) * 125 + (128,))
+
+    def testLongMode(self):
+        assert encoder.encode(
+            univ.BitString((1,0)*501)
+            ) == ints2octs((3, 127, 6) + (170,) * 125 + (128,))
+        
+class OctetStringEncoderTestCase(unittest.TestCase):
+    def testShortMode(self):
+        assert encoder.encode(
+            univ.OctetString('Quick brown fox')
+            ) == ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+    def testLongMode(self):
+        assert encoder.encode(
+            univ.OctetString('Q'*1001)
+            ) == ints2octs((36, 128, 4, 130, 3, 232) + (81,)*1000 + (4, 1, 81, 0, 0))
+        
+class SetEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        self.s = univ.Set(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null('')),
+            namedtype.OptionalNamedType('first-name', univ.OctetString('')),
+            namedtype.DefaultedNamedType('age', univ.Integer(33))
+            ))
+
+    def __init(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0)
+    def __initWithOptional(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0)
+        self.s.setComponentByPosition(1, 'quick brown')
+        
+    def __initWithDefaulted(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0)
+        self.s.setComponentByPosition(2, 1)
+        
+    def __initWithOptionalAndDefaulted(self):
+        self.s.clear()
+        self.s.setComponentByPosition(0, univ.Null(''))
+        self.s.setComponentByPosition(1, univ.OctetString('quick brown'))
+        self.s.setComponentByPosition(2, univ.Integer(1))
+        
+    def testIndefMode(self):
+        self.__init()
+        assert encoder.encode(self.s) == ints2octs((49, 128, 5, 0, 0, 0))
+
+    def testWithOptionalIndefMode(self):
+        self.__initWithOptional()
+        assert encoder.encode(
+            self.s
+            ) == ints2octs((49, 128, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 5, 0, 0, 0))
+
+    def testWithDefaultedIndefMode(self):
+        self.__initWithDefaulted()
+        assert encoder.encode(
+            self.s
+            ) == ints2octs((49, 128, 2, 1, 1, 5, 0, 0, 0))
+
+    def testWithOptionalAndDefaultedIndefMode(self):
+        self.__initWithOptionalAndDefaulted()
+        assert encoder.encode(
+            self.s
+            ) == ints2octs((49, 128, 2, 1, 1, 4, 11, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 5, 0, 0, 0))
+
+class SetWithChoiceEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        c = univ.Choice(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('actual', univ.Boolean(0))
+            ))
+        self.s = univ.Set(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null('')),
+            namedtype.NamedType('status', c)
+            ))
+
+    def testIndefMode(self):
+        self.s.setComponentByPosition(0)
+        self.s.setComponentByName('status')
+        self.s.getComponentByName('status').setComponentByPosition(0, 1)
+        assert encoder.encode(self.s) == ints2octs((49, 128, 1, 1, 255, 5, 0, 0, 0))
+
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/suite.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/suite.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/suite.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/suite.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,22 @@
+from sys import path, version_info
+from os.path import sep
+path.insert(1, path[0]+sep+'der')
+import test_encoder, test_decoder
+from pyasn1.error import PyAsn1Error
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+suite = unittest.TestSuite()
+loader = unittest.TestLoader()
+for m in (test_encoder, test_decoder):
+    suite.addTest(loader.loadTestsFromModule(m))
+
+def runTests(): unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__': runTests()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/test_decoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/test_decoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/test_decoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/test_decoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,20 @@
+from pyasn1.type import univ
+from pyasn1.codec.der import decoder
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class OctetStringDecoderTestCase(unittest.TestCase):
+    def testShortMode(self):
+        assert decoder.decode(
+            '\004\017Quick brown fox'.encode()
+            ) == ('Quick brown fox'.encode(), ''.encode())
+
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/test_encoder.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/test_encoder.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/der/test_encoder.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/der/test_encoder.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,44 @@
+from pyasn1.type import namedtype, univ
+from pyasn1.codec.der import encoder
+from pyasn1.compat.octets import ints2octs
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class OctetStringEncoderTestCase(unittest.TestCase):
+    def testShortMode(self):
+        assert encoder.encode(
+            univ.OctetString('Quick brown fox')
+            ) == ints2octs((4, 15, 81, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120))
+
+class BitStringEncoderTestCase(unittest.TestCase):
+    def testShortMode(self):
+        assert encoder.encode(
+            univ.BitString((1,))
+            ) == ints2octs((3, 2, 7, 128))
+        
+class SetWithChoiceEncoderTestCase(unittest.TestCase):
+    def setUp(self):
+        c = univ.Choice(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('name', univ.OctetString('')),
+            namedtype.NamedType('amount', univ.Integer(0))
+            ))
+        self.s = univ.Set(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('place-holder', univ.Null('')),
+            namedtype.NamedType('status', c)
+            ))
+
+    def testDefMode(self):
+        self.s.setComponentByPosition(0)
+        self.s.setComponentByName('status')
+        self.s.getComponentByName('status').setComponentByPosition(0, 'ann')
+        assert encoder.encode(self.s) == ints2octs((49, 7, 4, 3, 97, 110, 110, 5, 0))
+
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/suite.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/suite.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/codec/suite.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/codec/suite.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,29 @@
+from sys import path, version_info
+from os.path import sep
+path.insert(1, path[0]+sep+'codec'+sep+'ber')
+import ber.suite
+path.insert(1, path[0]+sep+'codec'+sep+'cer')
+import cer.suite
+path.insert(1, path[0]+sep+'codec'+sep+'der')
+import der.suite
+from pyasn1.error import PyAsn1Error
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+suite = unittest.TestSuite()
+for m in (
+    ber.suite,
+    cer.suite,
+    der.suite
+    ):
+    suite.addTest(getattr(m, 'suite'))
+
+def runTests(): unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__': runTests()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/suite.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/suite.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/suite.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/suite.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,26 @@
+from sys import path, version_info
+from os.path import sep
+path.insert(1, path[0]+sep+'type')
+import type.suite
+path.insert(1, path[0]+sep+'codec')
+import codec.suite
+from pyasn1.error import PyAsn1Error
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+suite = unittest.TestSuite()
+for m in (
+    type.suite,
+    codec.suite
+    ):
+    suite.addTest(getattr(m, 'suite'))
+
+def runTests(): unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__': runTests()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/__init__.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/__init__.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/__init__.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1 @@
+# This file is necessary to make this directory a package.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/suite.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/suite.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/suite.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/suite.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,20 @@
+import test_tag, test_constraint, test_namedtype, test_univ
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+suite = unittest.TestSuite()
+loader = unittest.TestLoader()
+for m in (test_tag, test_constraint, test_namedtype, test_univ):
+    suite.addTest(loader.loadTestsFromModule(m))
+
+def runTests(): unittest.TextTestRunner(verbosity=2).run(suite)
+
+if __name__ == '__main__': runTests()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_constraint.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_constraint.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_constraint.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_constraint.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,280 @@
+from pyasn1.type import constraint, error
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class SingleValueConstraintTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.SingleValueConstraint(1,2)
+        self.c2 = constraint.SingleValueConstraint(3,4)
+
+    def testCmp(self): assert self.c1 == self.c1, 'comparation fails'
+    def testHash(self): assert hash(self.c1) != hash(self.c2), 'hash() fails'
+    def testGoodVal(self):
+        try:
+            self.c1(1)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(4)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class ContainedSubtypeConstraintTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ContainedSubtypeConstraint(
+            constraint.SingleValueConstraint(12)
+            )
+
+    def testGoodVal(self):
+        try:
+            self.c1(12)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(4)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class ValueRangeConstraintTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ValueRangeConstraint(1,4)
+
+    def testGoodVal(self):
+        try:
+            self.c1(1)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(-5)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class ValueSizeConstraintTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ValueSizeConstraint(1,2)
+
+    def testGoodVal(self):
+        try:
+            self.c1('a')
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1('abc')
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class PermittedAlphabetConstraintTestCase(SingleValueConstraintTestCase):
+    def setUp(self):
+        self.c1 = constraint.PermittedAlphabetConstraint('A', 'B', 'C')
+        self.c2 = constraint.PermittedAlphabetConstraint('DEF')
+
+    def testGoodVal(self):
+        try:
+            self.c1('A')
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1('E')
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class ConstraintsIntersectionTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ConstraintsIntersection(
+            constraint.SingleValueConstraint(4),
+            constraint.ValueRangeConstraint(2, 4)
+            )
+
+    def testCmp1(self):
+        assert constraint.SingleValueConstraint(4) in self.c1, '__cmp__() fails'
+
+    def testCmp2(self):
+        assert constraint.SingleValueConstraint(5) not in self.c1, \
+               '__cmp__() fails'
+
+    def testCmp3(self):
+        c = constraint.ConstraintsUnion(constraint.ConstraintsIntersection(
+            constraint.SingleValueConstraint(4),
+            constraint.ValueRangeConstraint(2, 4)
+            ))
+        assert self.c1 in c, '__cmp__() fails'
+    def testCmp4(self):
+        c = constraint.ConstraintsUnion(
+            constraint.ConstraintsIntersection(constraint.SingleValueConstraint(5))
+            )
+        assert self.c1 not in c, '__cmp__() fails'
+        
+    def testGoodVal(self):
+        try:
+            self.c1(4)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(-5)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class InnerTypeConstraintTestCase(unittest.TestCase):
+    def testConst1(self):
+        c = constraint.InnerTypeConstraint(
+            constraint.SingleValueConstraint(4)
+            )
+        try:
+            c(4, 32)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+        try:
+            c(5, 32)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+    def testConst2(self):
+        c = constraint.InnerTypeConstraint(
+            (0, constraint.SingleValueConstraint(4), 'PRESENT'),
+            (1, constraint.SingleValueConstraint(4), 'ABSENT')
+            )
+        try:
+            c(4, 0)
+        except error.ValueConstraintError:
+            raise
+            assert 0, 'constraint check fails'            
+        try:
+            c(4, 1)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'            
+        try:
+            c(3, 0)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'            
+
+# Constraints compositions
+
+class ConstraintsIntersectionTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ConstraintsIntersection(
+            constraint.ValueRangeConstraint(1, 9),
+            constraint.ValueRangeConstraint(2, 5)
+            )
+
+    def testGoodVal(self):
+        try:
+            self.c1(3)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(0)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class ConstraintsUnionTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ConstraintsUnion(
+            constraint.SingleValueConstraint(5),
+            constraint.ValueRangeConstraint(1, 3)
+            )
+
+    def testGoodVal(self):
+        try:
+            self.c1(2)
+            self.c1(5)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(-5)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+class ConstraintsExclusionTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ConstraintsExclusion(
+            constraint.ValueRangeConstraint(2, 4)
+            )
+
+    def testGoodVal(self):
+        try:
+            self.c1(6)
+        except error.ValueConstraintError:
+            assert 0, 'constraint check fails'
+    def testBadVal(self):
+        try:
+            self.c1(2)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint check fails'
+
+# Constraints derivations
+
+class DirectDerivationTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.SingleValueConstraint(5)
+        self.c2 = constraint.ConstraintsUnion(
+            self.c1, constraint.ValueRangeConstraint(1, 3)
+            )
+
+    def testGoodVal(self):
+        assert self.c1.isSuperTypeOf(self.c2), 'isSuperTypeOf failed'
+        assert not self.c1.isSubTypeOf(self.c2) , 'isSubTypeOf failed'
+    def testBadVal(self):
+        assert not self.c2.isSuperTypeOf(self.c1) , 'isSuperTypeOf failed'
+        assert self.c2.isSubTypeOf(self.c1) , 'isSubTypeOf failed'
+
+class IndirectDerivationTestCase(unittest.TestCase):
+    def setUp(self):
+        self.c1 = constraint.ConstraintsIntersection(
+            constraint.ValueRangeConstraint(1, 30)
+            )
+        self.c2 = constraint.ConstraintsIntersection(
+            self.c1, constraint.ValueRangeConstraint(1, 20)
+            )
+        self.c2 = constraint.ConstraintsIntersection(
+            self.c2, constraint.ValueRangeConstraint(1, 10)
+            )
+
+    def testGoodVal(self):
+        assert self.c1.isSuperTypeOf(self.c2), 'isSuperTypeOf failed'
+        assert not self.c1.isSubTypeOf(self.c2) , 'isSubTypeOf failed'
+    def testBadVal(self):
+        assert not self.c2.isSuperTypeOf(self.c1) , 'isSuperTypeOf failed'
+        assert self.c2.isSubTypeOf(self.c1) , 'isSubTypeOf failed'
+        
+if __name__ == '__main__': unittest.main()
+
+# how to apply size constriants to constructed types?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_namedtype.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_namedtype.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_namedtype.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_namedtype.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,87 @@
+from pyasn1.type import namedtype, univ
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class NamedTypeCaseBase(unittest.TestCase):
+    def setUp(self):
+        self.e = namedtype.NamedType('age', univ.Integer())
+    def testIter(self):
+        n, t = self.e
+        assert n == 'age' or t == univ.Integer(), 'unpack fails'
+
+class NamedTypesCaseBase(unittest.TestCase):
+    def setUp(self):
+        self.e = namedtype.NamedTypes(
+            namedtype.NamedType('first-name', univ.OctetString('')),
+            namedtype.OptionalNamedType('age', univ.Integer(0)),
+            namedtype.NamedType('family-name', univ.OctetString(''))
+            )
+    def testIter(self):
+        for t in self.e:
+            break
+        else:
+            assert 0, '__getitem__() fails'
+            
+    def testGetTypeByPosition(self):
+        assert self.e.getTypeByPosition(0) == univ.OctetString(''), \
+               'getTypeByPosition() fails'
+
+    def testGetNameByPosition(self):
+        assert self.e.getNameByPosition(0) == 'first-name', \
+               'getNameByPosition() fails'
+
+    def testGetPositionByName(self):
+        assert self.e.getPositionByName('first-name') == 0, \
+               'getPositionByName() fails'
+
+    def testGetTypesNearPosition(self):
+        assert self.e.getTagMapNearPosition(0).getPosMap() == {
+            univ.OctetString.tagSet: univ.OctetString('')
+            }
+        assert self.e.getTagMapNearPosition(1).getPosMap() == {
+            univ.Integer.tagSet: univ.Integer(0),
+            univ.OctetString.tagSet: univ.OctetString('')
+            }
+        assert self.e.getTagMapNearPosition(2).getPosMap() == {
+            univ.OctetString.tagSet: univ.OctetString('')
+            }
+
+    def testGetTagMap(self):
+        assert self.e.getTagMap().getPosMap() == {
+            univ.OctetString.tagSet: univ.OctetString(''),
+            univ.Integer.tagSet: univ.Integer(0)
+            }
+
+    def testGetTagMapWithDups(self):
+        try:
+            self.e.getTagMap(1)
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'Duped types not noticed'
+        
+    def testGetPositionNearType(self):
+        assert self.e.getPositionNearType(univ.OctetString.tagSet, 0) == 0
+        assert self.e.getPositionNearType(univ.Integer.tagSet, 1) == 1
+        assert self.e.getPositionNearType(univ.OctetString.tagSet, 2) == 2
+
+class OrderedNamedTypesCaseBase(unittest.TestCase):
+    def setUp(self):
+        self.e = namedtype.NamedTypes(
+            namedtype.NamedType('first-name', univ.OctetString('')),
+            namedtype.NamedType('age', univ.Integer(0))
+            )
+            
+    def testGetTypeByPosition(self):
+        assert self.e.getTypeByPosition(0) == univ.OctetString(''), \
+               'getTypeByPosition() fails'
+
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_tag.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_tag.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_tag.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_tag.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,107 @@
+from pyasn1.type import tag
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class TagTestCaseBase(unittest.TestCase):
+    def setUp(self):
+        self.t1 = tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 3)
+        self.t2 = tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 3)
+    
+class TagCmpTestCase(TagTestCaseBase):
+    def testCmp(self):
+        assert self.t1 == self.t2, 'tag comparation fails'
+
+    def testHash(self):
+        assert hash(self.t1) == hash(self.t2), 'tag hash comparation fails'
+
+    def testSequence(self):
+        assert self.t1[0] == self.t2[0] and \
+               self.t1[1] == self.t2[1] and \
+               self.t1[2] == self.t2[2], 'tag sequence protocol fails'
+
+class TagSetTestCaseBase(unittest.TestCase):
+    def setUp(self):
+        self.ts1 = tag.initTagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
+            )
+        self.ts2 = tag.initTagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
+            )
+
+class TagSetCmpTestCase(TagSetTestCaseBase):
+    def testCmp(self):
+        assert self.ts1 == self.ts2, 'tag set comparation fails'
+
+    def testHash(self):
+        assert hash(self.ts1) == hash(self.ts2), 'tag set hash comp. fails'
+
+    def testLen(self):
+        assert len(self.ts1) == len(self.ts2), 'tag length comparation fails'
+
+class TaggingTestSuite(TagSetTestCaseBase):
+    def testImplicitTag(self):
+        t = self.ts1.tagImplicitly(
+            tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 14)
+            )
+        assert t == tag.TagSet(
+            tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 14)
+            ), 'implicit tagging went wrong'
+
+    def testExplicitTag(self):
+        t = self.ts1.tagExplicitly(
+            tag.Tag(tag.tagClassPrivate, tag.tagFormatSimple, 32)
+            )
+        assert t == tag.TagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassPrivate, tag.tagFormatConstructed, 32)
+            ), 'explicit tagging went wrong'
+
+class TagSetAddTestSuite(TagSetTestCaseBase):
+    def testAdd(self):
+        t = self.ts1 + tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 2)
+        assert t == tag.TagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 2)
+            ), 'TagSet.__add__() fails'
+
+    def testRadd(self):
+        t = tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 2) + self.ts1
+        assert t == tag.TagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassApplication, tag.tagFormatSimple, 2),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
+            ), 'TagSet.__radd__() fails'
+
+class SuperTagSetTestCase(TagSetTestCaseBase):
+    def testSuperTagCheck1(self):
+        assert self.ts1.isSuperTagSetOf(
+            tag.TagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12)
+            )), 'isSuperTagSetOf() fails'
+
+    def testSuperTagCheck2(self):
+        assert not self.ts1.isSuperTagSetOf(
+            tag.TagSet(
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 12),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 13)
+            )), 'isSuperTagSetOf() fails'
+
+    def testSuperTagCheck3(self):
+        assert self.ts1.isSuperTagSetOf(
+            tag.TagSet((), tag.Tag(tag.tagClassUniversal,
+                                   tag.tagFormatSimple, 12))
+            ), 'isSuperTagSetOf() fails'
+    
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_univ.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_univ.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/test/type/test_univ.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/test/type/test_univ.py	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,479 @@
+from pyasn1.type import univ, tag, constraint, namedtype, namedval, error
+from pyasn1.compat.octets import str2octs, ints2octs
+from pyasn1.error import PyAsn1Error
+from sys import version_info
+if version_info[0:2] < (2, 7) or \
+   version_info[0:2] in ( (3, 0), (3, 1) ):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        import unittest
+else:
+    import unittest
+
+class IntegerTestCase(unittest.TestCase):
+    def testStr(self): assert str(univ.Integer(1)) in ('1','1L'),'str() fails'
+    def testAnd(self): assert univ.Integer(1) & 0 == 0, '__and__() fails'
+    def testOr(self): assert univ.Integer(1) | 0 == 1, '__or__() fails'
+    def testXor(self): assert univ.Integer(1) ^ 0 == 1, '__xor__() fails'
+    def testRand(self): assert 0 & univ.Integer(1) == 0, '__rand__() fails'
+    def testRor(self): assert 0 | univ.Integer(1) == 1, '__ror__() fails'
+    def testRxor(self): assert 0 ^ univ.Integer(1) == 1, '__rxor__() fails'    
+    def testAdd(self): assert univ.Integer(-4) + 6 == 2, '__add__() fails'
+    def testRadd(self): assert 4 + univ.Integer(5) == 9, '__radd__() fails'
+    def testSub(self): assert univ.Integer(3) - 6 == -3, '__sub__() fails'
+    def testRsub(self): assert 6 - univ.Integer(3) == 3, '__rsub__() fails'
+    def testMul(self): assert univ.Integer(3) * -3 == -9, '__mul__() fails'
+    def testRmul(self): assert 2 * univ.Integer(3) == 6, '__rmul__() fails'
+    def testDiv(self): assert univ.Integer(3) / 2 == 1, '__div__() fails'
+    def testRdiv(self): assert 6 / univ.Integer(3) == 2, '__rdiv__() fails'
+    def testMod(self): assert univ.Integer(3) % 2 == 1, '__mod__() fails'
+    def testRmod(self): assert 4 % univ.Integer(3) == 1, '__rmod__() fails'
+    def testPow(self): assert univ.Integer(3) ** 2 == 9, '__pow__() fails'
+    def testRpow(self): assert 2 ** univ.Integer(2) == 4, '__rpow__() fails'
+    def testLshift(self): assert univ.Integer(1) << 1 == 2, '<< fails'
+    def testRshift(self): assert univ.Integer(2) >> 1 == 1, '>> fails'
+    def testInt(self): assert int(univ.Integer(3)) == 3, '__int__() fails'
+    def testLong(self): assert int(univ.Integer(8)) == 8, '__long__() fails'
+    def testFloat(self): assert float(univ.Integer(4))==4.0,'__float__() fails'
+    def testPrettyIn(self): assert univ.Integer('3') == 3, 'prettyIn() fails'
+    def testTag(self):
+        assert univ.Integer().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x02)
+            )
+    def testNamedVals(self):
+        i = univ.Integer(
+            'asn1', namedValues=univ.Integer.namedValues.clone(('asn1', 1))
+            )
+        assert i == 1, 'named val fails'
+        assert str(i) != 'asn1', 'named val __str__() fails'
+
+class BooleanTestCase(unittest.TestCase):
+    def testTruth(self):
+        assert univ.Boolean(True) and univ.Boolean(1), 'Truth initializer fails'
+    def testFalse(self):
+        assert not univ.Boolean(False) and not univ.Boolean(0), 'False initializer fails'
+    def testStr(self):
+        assert str(univ.Boolean(1)) in ('1', '1L'), 'str() fails'
+    def testTag(self):
+        assert univ.Boolean().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x01)
+            )
+    def testConstraints(self):
+        try:
+            univ.Boolean(2)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint fail'
+    def testSubtype(self):
+        assert univ.Integer().subtype(
+            value=1,
+            implicitTag=tag.Tag(tag.tagClassPrivate,tag.tagFormatSimple,2),
+            subtypeSpec=constraint.SingleValueConstraint(1,3)
+            ) == univ.Integer(
+            value=1,
+            tagSet=tag.TagSet(tag.Tag(tag.tagClassPrivate,
+                                        tag.tagFormatSimple,2)),
+            subtypeSpec=constraint.ConstraintsIntersection(constraint.SingleValueConstraint(1,3))
+            )
+
+class BitStringTestCase(unittest.TestCase):
+    def setUp(self):
+        self.b = univ.BitString(
+            namedValues=namedval.NamedValues(('Active', 0), ('Urgent', 1))
+            )
+    def testSet(self):
+        assert self.b.clone('Active') == (1,)
+        assert self.b.clone("'1010100110001010'B") == (1,0,1,0,1,0,0,1,1,0,0,0,1,0,1,0)
+        assert self.b.clone("'A98A'H") == (1,0,1,0,1,0,0,1,1,0,0,0,1,0,1,0)
+        assert self.b.clone((1,0,1)) == (1,0,1)
+    def testStr(self):
+        assert str(self.b.clone('Urgent,Active')) == '(1, 1)'
+    def testRepr(self):
+        assert repr(self.b.clone('Urgent,Active')) == 'BitString("\'11\'B")'
+    def testTag(self):
+        assert univ.BitString().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x03)
+            )
+    def testLen(self): assert len(self.b.clone("'A98A'H")) == 16
+    def testIter(self):
+        assert self.b.clone("'A98A'H")[0] == 1
+        assert self.b.clone("'A98A'H")[1] == 0
+        assert self.b.clone("'A98A'H")[2] == 1
+        
+class OctetStringTestCase(unittest.TestCase):
+    def testInit(self):
+        assert univ.OctetString(str2octs('abcd')) == str2octs('abcd'), '__init__() fails'
+    def testBinStr(self):
+        assert univ.OctetString(binValue="1000010111101110101111000000111011") == ints2octs((133, 238, 188, 14, 192)), 'bin init fails'
+    def testHexStr(self):
+        assert univ.OctetString(hexValue="FA9823C43E43510DE3422") == ints2octs((250, 152, 35, 196, 62, 67, 81, 13, 227, 66, 32)), 'hex init fails'
+    def testTuple(self):
+        assert univ.OctetString((1,2,3,4,5)) == ints2octs((1,2,3,4,5)), 'tuple init failed'
+    def testStr(self):
+        assert str(univ.OctetString('q')) == 'q', '__str__() fails'
+    def testSeq(self):
+        assert univ.OctetString('q')[0] == str2octs('q')[0],'__getitem__() fails'
+    def testAsOctets(self):
+        assert univ.OctetString('abcd').asOctets() == str2octs('abcd'), 'testAsOctets() fails'
+    def testAsInts(self):
+        assert univ.OctetString('abcd').asNumbers() == (97, 98, 99, 100), 'testAsNumbers() fails'
+
+    def testEmpty(self):
+        try:
+            str(univ.OctetString())
+        except PyAsn1Error:
+            pass
+        else:
+            assert 0, 'empty OctetString() not reported'
+            
+    def testAdd(self):
+        assert univ.OctetString('') + 'q' == str2octs('q'), '__add__() fails'
+    def testRadd(self):
+        assert 'b' + univ.OctetString('q') == str2octs('bq'), '__radd__() fails'
+    def testMul(self):
+        assert univ.OctetString('a') * 2 == str2octs('aa'), '__mul__() fails'
+    def testRmul(self):
+        assert 2 * univ.OctetString('b') == str2octs('bb'), '__rmul__() fails'
+    def testTag(self):
+        assert univ.OctetString().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x04)
+            )
+
+class Null(unittest.TestCase):
+    def testStr(self): assert str(univ.Null('')) == '', 'str() fails'
+    def testTag(self):
+        assert univ.Null().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x05)
+            )
+    def testConstraints(self):
+        try:
+            univ.Null(2)
+        except error.ValueConstraintError:
+            pass
+        else:
+            assert 0, 'constraint fail'
+
+class RealTestCase(unittest.TestCase):
+    def testStr(self): assert str(univ.Real(1.0)) == '1.0','str() fails'
+    def testRepr(self): assert repr(univ.Real(-4.1)) == 'Real((-41, 10, -1))','repr() fails'
+    def testAdd(self): assert univ.Real(-4.1) + 1.4 == -2.7, '__add__() fails'
+    def testRadd(self): assert 4 + univ.Real(0.5) == 4.5, '__radd__() fails'
+    def testSub(self): assert univ.Real(3.9) - 1.7 == 2.2, '__sub__() fails'
+    def testRsub(self): assert 6.1 - univ.Real(0.1) == 6, '__rsub__() fails'
+    def testMul(self): assert univ.Real(3.0) * -3 == -9, '__mul__() fails'
+    def testRmul(self): assert 2 * univ.Real(3.0) == 6, '__rmul__() fails'
+    def testDiv(self): assert univ.Real(3.0) / 2 == 1.5, '__div__() fails'
+    def testRdiv(self): assert 6 / univ.Real(3.0) == 2, '__rdiv__() fails'
+    def testMod(self): assert univ.Real(3.0) % 2 == 1, '__mod__() fails'
+    def testRmod(self): assert 4 % univ.Real(3.0) == 1, '__rmod__() fails'
+    def testPow(self): assert univ.Real(3.0) ** 2 == 9, '__pow__() fails'
+    def testRpow(self): assert 2 ** univ.Real(2.0) == 4, '__rpow__() fails'
+    def testInt(self): assert int(univ.Real(3.0)) == 3, '__int__() fails'
+    def testLong(self): assert int(univ.Real(8.0)) == 8, '__long__() fails'
+    def testFloat(self): assert float(univ.Real(4.0))==4.0,'__float__() fails'
+    def testPrettyIn(self): assert univ.Real((3,10,0)) == 3, 'prettyIn() fails'
+    # infinite float values
+    def testStrInf(self):
+        assert str(univ.Real('inf')) == 'inf','str() fails'
+    def testReprInf(self):
+        assert repr(univ.Real('inf')) == 'Real(\'inf\')','repr() fails'
+    def testAddInf(self):
+        assert univ.Real('inf') + 1 == float('inf'), '__add__() fails'
+    def testRaddInf(self):
+        assert 1 + univ.Real('inf') == float('inf'), '__radd__() fails'
+    def testIntInf(self):
+        try:
+            assert int(univ.Real('inf'))
+        except OverflowError:
+            pass
+        else:
+            assert 0, '__int__() fails'
+    def testLongInf(self):
+        try:
+            assert int(univ.Real('inf'))
+        except OverflowError:
+            pass
+        else:
+            assert 0, '__long__() fails'        
+        assert int(univ.Real(8.0)) == 8, '__long__() fails'
+    def testFloatInf(self):
+        assert float(univ.Real('-inf')) == float('-inf'),'__float__() fails'
+    def testPrettyInInf(self):
+        assert univ.Real(float('inf')) == float('inf'), 'prettyIn() fails'
+    def testPlusInf(self):
+        assert univ.Real('inf').isPlusInfinity(), 'isPlusInfinity failed'
+    def testMinusInf(self):
+        assert univ.Real('-inf').isMinusInfinity(), 'isMinusInfinity failed'
+
+    def testTag(self):
+        assert univ.Real().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x09)
+            )
+
+class ObjectIdentifier(unittest.TestCase):
+    def testStr(self):
+        assert str(univ.ObjectIdentifier((1,3,6))) == '1.3.6'
+    def testEq(self):
+        assert univ.ObjectIdentifier((1,3,6)) == (1,3,6), '__cmp__() fails'
+    def testAdd(self):
+        assert univ.ObjectIdentifier((1,3)) + (6,)==(1,3,6),'__add__() fails'
+    def testRadd(self):
+        assert (1,) + univ.ObjectIdentifier((3,6))==(1,3,6),'__radd__() fails'
+    def testLen(self):
+        assert len(univ.ObjectIdentifier((1,3))) == 2,'__len__() fails'
+    def testPrefix(self):
+        o = univ.ObjectIdentifier('1.3.6')
+        assert o.isPrefixOf((1,3,6)), 'isPrefixOf() fails'
+        assert o.isPrefixOf((1,3,6,1)), 'isPrefixOf() fails'
+        assert not o.isPrefixOf((1,3)), 'isPrefixOf() fails'        
+    def testInput(self):
+        assert univ.ObjectIdentifier('1.3.6')==(1,3,6),'prettyIn() fails'
+    def testTag(self):
+        assert univ.ObjectIdentifier().getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatSimple, 0x06)
+            )
+
+class SequenceOf(unittest.TestCase):
+    def setUp(self):
+        self.s1 = univ.SequenceOf(
+            componentType=univ.OctetString('')
+            )
+        self.s2 = self.s1.clone()
+    def testTag(self):
+        assert self.s1.getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x10)
+            ), 'wrong tagSet'
+    def testSeq(self):
+        self.s1.setComponentByPosition(0, univ.OctetString('abc'))
+        assert self.s1[0] == str2octs('abc'), 'set by idx fails'
+        self.s1[0] = 'cba'
+        assert self.s1[0] == str2octs('cba'), 'set by idx fails'
+    def testCmp(self):
+        self.s1.clear()
+        self.s1.setComponentByPosition(0, 'abc')
+        self.s2.clear()
+        self.s2.setComponentByPosition(0, univ.OctetString('abc'))
+        assert self.s1 == self.s2, '__cmp__() fails'
+    def testSubtypeSpec(self):
+        s = self.s1.clone(subtypeSpec=constraint.ConstraintsUnion(
+            constraint.SingleValueConstraint(str2octs('abc'))
+            ))
+        try:
+            s.setComponentByPosition(0, univ.OctetString('abc'))
+        except:
+            assert 0, 'constraint fails'
+        try:
+            s.setComponentByPosition(1, univ.OctetString('Abc'))
+        except:
+            pass
+        else:
+            assert 0, 'constraint fails'
+    def testSizeSpec(self):
+        s = self.s1.clone(sizeSpec=constraint.ConstraintsUnion(
+            constraint.ValueSizeConstraint(1,1)
+            ))
+        s.setComponentByPosition(0, univ.OctetString('abc'))
+        try:
+            s.verifySizeSpec()
+        except:
+            assert 0, 'size spec fails'
+        s.setComponentByPosition(1, univ.OctetString('abc'))
+        try:
+            s.verifySizeSpec()
+        except:
+            pass
+        else:
+            assert 0, 'size spec fails'
+    def testGetComponentTagMap(self):
+        assert self.s1.getComponentTagMap().getPosMap() == {
+            univ.OctetString.tagSet: univ.OctetString('')
+            }
+    def testSubtype(self):
+        self.s1.clear()
+        assert self.s1.subtype(
+            implicitTag=tag.Tag(tag.tagClassPrivate,tag.tagFormatSimple,2),
+            subtypeSpec=constraint.SingleValueConstraint(1,3),
+            sizeSpec=constraint.ValueSizeConstraint(0,1)
+            ) == self.s1.clone(
+            tagSet=tag.TagSet(tag.Tag(tag.tagClassPrivate,
+                                        tag.tagFormatSimple,2)),
+            subtypeSpec=constraint.ConstraintsIntersection(constraint.SingleValueConstraint(1,3)),
+            sizeSpec=constraint.ValueSizeConstraint(0,1)
+            )
+    def testClone(self):
+        self.s1.setComponentByPosition(0, univ.OctetString('abc'))
+        s = self.s1.clone()
+        assert len(s) == 0
+        s = self.s1.clone(cloneValueFlag=1)
+        assert len(s) == 1
+        assert s.getComponentByPosition(0) == self.s1.getComponentByPosition(0)
+        
+class Sequence(unittest.TestCase):
+    def setUp(self):
+        self.s1 = univ.Sequence(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('name', univ.OctetString('')),
+            namedtype.OptionalNamedType('nick', univ.OctetString('')),
+            namedtype.DefaultedNamedType('age', univ.Integer(34))
+            ))
+    def testTag(self):
+        assert self.s1.getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x10)
+            ), 'wrong tagSet'
+    def testById(self):
+        self.s1.setComponentByName('name', univ.OctetString('abc'))
+        assert self.s1.getComponentByName('name') == str2octs('abc'), 'set by name fails'
+    def testByKey(self):
+        self.s1['name'] = 'abc'
+        assert self.s1['name'] == str2octs('abc'), 'set by key fails'
+    def testGetNearPosition(self):
+        assert self.s1.getComponentTagMapNearPosition(1).getPosMap() == {
+            univ.OctetString.tagSet: univ.OctetString(''),
+            univ.Integer.tagSet: univ.Integer(34)
+            }
+        assert self.s1.getComponentPositionNearType(
+            univ.OctetString.tagSet, 1
+            ) == 1
+    def testGetDefaultComponentByPosition(self):
+        self.s1.clear()
+        assert self.s1.getDefaultComponentByPosition(0) == None
+        assert self.s1.getDefaultComponentByPosition(2) == univ.Integer(34)
+    def testSetDefaultComponents(self):
+        self.s1.clear()
+        assert self.s1.getComponentByPosition(2) == None
+        self.s1.setComponentByPosition(0, univ.OctetString('Ping'))
+        self.s1.setComponentByPosition(1, univ.OctetString('Pong'))
+        self.s1.setDefaultComponents()
+        assert self.s1.getComponentByPosition(2) == 34
+    def testClone(self):
+        self.s1.setComponentByPosition(0, univ.OctetString('abc'))
+        self.s1.setComponentByPosition(1, univ.OctetString('def'))
+        self.s1.setComponentByPosition(2, univ.Integer(123))
+        s = self.s1.clone()
+        assert s.getComponentByPosition(0) != self.s1.getComponentByPosition(0)
+        assert s.getComponentByPosition(1) != self.s1.getComponentByPosition(1)
+        assert s.getComponentByPosition(2) != self.s1.getComponentByPosition(2)
+        s = self.s1.clone(cloneValueFlag=1)
+        assert s.getComponentByPosition(0) == self.s1.getComponentByPosition(0)
+        assert s.getComponentByPosition(1) == self.s1.getComponentByPosition(1)
+        assert s.getComponentByPosition(2) == self.s1.getComponentByPosition(2)
+
+class SetOf(unittest.TestCase):
+    def setUp(self):
+        self.s1 = univ.SetOf(componentType=univ.OctetString(''))
+    def testTag(self):
+        assert self.s1.getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x11)
+            ), 'wrong tagSet'
+    def testSeq(self):
+        self.s1.setComponentByPosition(0, univ.OctetString('abc'))
+        assert self.s1[0] == str2octs('abc'), 'set by idx fails'
+        self.s1.setComponentByPosition(0, self.s1[0].clone('cba'))
+        assert self.s1[0] == str2octs('cba'), 'set by idx fails'
+
+class Set(unittest.TestCase):
+    def setUp(self):
+        self.s1 = univ.Set(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('name', univ.OctetString('')),
+            namedtype.OptionalNamedType('null', univ.Null('')),
+            namedtype.DefaultedNamedType('age', univ.Integer(34))
+            ))
+        self.s2 = self.s1.clone()
+    def testTag(self):
+        assert self.s1.getTagSet() == tag.TagSet(
+            (),
+            tag.Tag(tag.tagClassUniversal, tag.tagFormatConstructed, 0x11)
+            ), 'wrong tagSet'
+    def testByTypeWithPythonValue(self):
+        self.s1.setComponentByType(univ.OctetString.tagSet, 'abc')
+        assert self.s1.getComponentByType(
+            univ.OctetString.tagSet
+            ) == str2octs('abc'), 'set by name fails'
+    def testByTypeWithInstance(self):
+        self.s1.setComponentByType(univ.OctetString.tagSet, univ.OctetString('abc'))
+        assert self.s1.getComponentByType(
+            univ.OctetString.tagSet
+            ) == str2octs('abc'), 'set by name fails'
+    def testGetTagMap(self):
+        assert self.s1.getTagMap().getPosMap() == {
+            univ.Set.tagSet: univ.Set()
+            }
+    def testGetComponentTagMap(self):
+        assert self.s1.getComponentTagMap().getPosMap() == {
+            univ.OctetString.tagSet: univ.OctetString(''),
+            univ.Null.tagSet: univ.Null(''),
+            univ.Integer.tagSet: univ.Integer(34)
+            }
+    def testGetPositionByType(self):
+        assert self.s1.getComponentPositionByType(
+            univ.Null().getTagSet()
+            ) == 1
+
+class Choice(unittest.TestCase):
+    def setUp(self):
+        innerComp = univ.Choice(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('count', univ.Integer()),
+            namedtype.NamedType('flag', univ.Boolean())
+            ))
+        self.s1 = univ.Choice(componentType=namedtype.NamedTypes(
+            namedtype.NamedType('name', univ.OctetString()),
+            namedtype.NamedType('sex', innerComp)
+            ))
+    def testTag(self):
+        assert self.s1.getTagSet() == tag.TagSet(), 'wrong tagSet'
+    def testOuterByTypeWithPythonValue(self):
+        self.s1.setComponentByType(univ.OctetString.tagSet, 'abc')
+        assert self.s1.getComponentByType(
+            univ.OctetString.tagSet
+            ) == str2octs('abc')
+    def testOuterByTypeWithInstanceValue(self):
+        self.s1.setComponentByType(
+            univ.OctetString.tagSet, univ.OctetString('abc')
+            )
+        assert self.s1.getComponentByType(
+            univ.OctetString.tagSet
+            ) == str2octs('abc')
+    def testInnerByTypeWithPythonValue(self):
+        self.s1.setComponentByType(univ.Integer.tagSet, 123, 1)
+        assert self.s1.getComponentByType(
+            univ.Integer.tagSet, 1
+            ) == 123
+    def testInnerByTypeWithInstanceValue(self):
+        self.s1.setComponentByType(
+            univ.Integer.tagSet, univ.Integer(123), 1
+            )
+        assert self.s1.getComponentByType(
+            univ.Integer.tagSet, 1
+            ) == 123
+    def testCmp(self):
+        self.s1.setComponentByName('name', univ.OctetString('abc'))
+        assert self.s1 == str2octs('abc'), '__cmp__() fails'
+    def testGetComponent(self):
+        self.s1.setComponentByType(univ.OctetString.tagSet, 'abc')
+        assert self.s1.getComponent() == str2octs('abc'), 'getComponent() fails'
+    def testGetName(self):
+        self.s1.setComponentByType(univ.OctetString.tagSet, 'abc')
+        assert self.s1.getName() == 'name', 'getName() fails'
+    def testSetComponentByPosition(self):
+        self.s1.setComponentByPosition(0, univ.OctetString('Jim'))
+        assert self.s1 == str2octs('Jim')
+    def testClone(self):
+        self.s1.setComponentByPosition(0, univ.OctetString('abc'))
+        s = self.s1.clone()
+        assert len(s) == 0
+        s = self.s1.clone(cloneValueFlag=1)
+        assert len(s) == 1
+        assert s.getComponentByPosition(0) == self.s1.getComponentByPosition(0)
+        
+if __name__ == '__main__': unittest.main()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/THANKS thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/THANKS
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/THANKS	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/THANKS	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,4 @@
+Denis S. Otkidach
+Gregory Golberg
+Bud P. Bruegger
+Jacek Konieczny
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/TODO thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/TODO
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/python/pyasn1/TODO	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/python/pyasn1/TODO	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,36 @@
+* Specialize ASN.1 character and useful types
+* Come up with simpler API for deeply nested constructed objects
+  addressing
+
+ber.decoder:
+* suspend codec on underrun error ?
+* class-static components map (in simple type classes)
+* present subtypes ?
+* component presence check wont work at innertypeconst
+* add the rest of ASN1 types/codecs
+* type vs value, defaultValue
+
+ber.encoder:
+* Asn1Item.clone() / shallowcopy issue
+* large length encoder?
+* codec restart
+* preserve compatible API whenever stateful codec gets implemented
+* restartable vs incremental
+* plan: make a stateless univeral decoder, then convert it to restartable
+       then to incremental
+
+type.useful:
+* may need to implement prettyIn/Out
+
+type.char:
+* may need to implement constraints
+
+type.univ:
+* simpler API to constructed objects: value init, recursive
+
+type.namedtypes
+* type vs tagset name convention
+
+general:
+
+* how untagged TagSet should be initialized?
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/.reviewboardrc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/.reviewboardrc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/.reviewboardrc	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/.reviewboardrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +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/.
-
-REVIEWBOARD_URL = 'https://reviewboard.allizom.org/'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/certverifier/ExtendedValidation.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/certverifier/ExtendedValidation.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/certverifier/ExtendedValidation.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/certverifier/ExtendedValidation.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -1007,6 +1007,89 @@
     "VQQDExVRdW9WYWRpcyBSb290IENBIDIgRzM=",
     "RFc0JFuBiZs18s64KztbpybwdSg=",
     nullptr
+  },
+  {
+    // CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+    "1.3.6.1.4.1.6449.1.2.1.5.1",
+    "COMODORSACertificationAuthority",
+    SEC_OID_UNKNOWN,
+    { 0x52, 0xF0, 0xE1, 0xC4, 0xE5, 0x8E, 0xC6, 0x29, 0x29, 0x1B, 0x60,
+      0x31, 0x7F, 0x07, 0x46, 0x71, 0xB8, 0x5D, 0x7E, 0xA8, 0x0D, 0x5B,
+      0x07, 0x27, 0x34, 0x63, 0x53, 0x4B, 0x32, 0xB4, 0x02, 0x34 },
+    "MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAw"
+    "DgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkG"
+    "A1UEAxMiQ09NT0RPIFJTQSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==",
+    "TKr5yttjb+Af907YWwOGnQ==",
+    nullptr
+  },
+  {
+    // CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+    "1.3.6.1.4.1.6449.1.2.1.5.1",
+    "USERTrustRSACertificationAuthority",
+    SEC_OID_UNKNOWN,
+    { 0xE7, 0x93, 0xC9, 0xB0, 0x2F, 0xD8, 0xAA, 0x13, 0xE2, 0x1C, 0x31,
+      0x22, 0x8A, 0xCC, 0xB0, 0x81, 0x19, 0x64, 0x3B, 0x74, 0x9C, 0x89,
+      0x89, 0x64, 0xB1, 0x74, 0x6D, 0x46, 0xC3, 0xD4, 0xCB, 0xD2 },
+    "MIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxML"
+    "SmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEuMCwG"
+    "A1UEAxMlVVNFUlRydXN0IFJTQSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==",
+    "Af1tMPyjylGoG7xkDjUDLQ==",
+    nullptr
+  },
+  {
+    // CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+    "1.3.6.1.4.1.6449.1.2.1.5.1",
+    "USERTrust ECC Certification Authority",
+    SEC_OID_UNKNOWN,
+    { 0x4F, 0xF4, 0x60, 0xD5, 0x4B, 0x9C, 0x86, 0xDA, 0xBF, 0xBC, 0xFC,
+      0x57, 0x12, 0xE0, 0x40, 0x0D, 0x2B, 0xED, 0x3F, 0xBC, 0x4D, 0x4F,
+      0xBD, 0xAA, 0x86, 0xE0, 0x6A, 0xDC, 0xD2, 0xA9, 0xAD, 0x7A },
+    "MIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxML"
+    "SmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEuMCwG"
+    "A1UEAxMlVVNFUlRydXN0IEVDQyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==",
+    "XIuZxVqUxdJxVt7NiYDMJg==",
+    nullptr
+  },
+  {
+    // CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4
+    "1.3.6.1.4.1.4146.1.1",
+    "GlobalSign ECC Root CA - R4",
+    SEC_OID_UNKNOWN,
+    { 0xBE, 0xC9, 0x49, 0x11, 0xC2, 0x95, 0x56, 0x76, 0xDB, 0x6C, 0x0A,
+      0x55, 0x09, 0x86, 0xD7, 0x6E, 0x3B, 0xA0, 0x05, 0x66, 0x7C, 0x44,
+      0x2C, 0x97, 0x62, 0xB4, 0xFB, 0xB7, 0x73, 0xDE, 0x22, 0x8C },
+    "MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNDETMBEGA1UE"
+    "ChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==",
+    "KjikHJYKBN5CsiilC+g0mAI=",
+    nullptr
+  },
+  {
+    // CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5
+    "1.3.6.1.4.1.4146.1.1",
+    "GlobalSign ECC Root CA - R5",
+    SEC_OID_UNKNOWN,
+    { 0x17, 0x9F, 0xBC, 0x14, 0x8A, 0x3D, 0xD0, 0x0F, 0xD2, 0x4E, 0xA1,
+      0x34, 0x58, 0xCC, 0x43, 0xBF, 0xA7, 0xF5, 0x9C, 0x81, 0x82, 0xD7,
+      0x83, 0xA5, 0x13, 0xF6, 0xEB, 0xEC, 0x10, 0x0C, 0x89, 0x24 },
+    "MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNTETMBEGA1UE"
+    "ChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==",
+    "YFlJ4CYuu1X5CneKcflK2Gw=",
+    nullptr
+  },
+  {
+    // CN=Entrust.net Certification Authority (2048),OU=(c) 1999 Entrust.net Limited,OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.),O=Entrust.net
+    "2.16.840.1.114028.10.1.2",
+    "EntrustCA2048",
+    SEC_OID_UNKNOWN,
+    { 0x6D, 0xC4, 0x71, 0x72, 0xE0, 0x1C, 0xBC, 0xB0, 0xBF, 0x62, 0x58,
+      0x0D, 0x89, 0x5F, 0xE2, 0xB8, 0xAC, 0x9A, 0xD4, 0xF8, 0x73, 0x80,
+      0x1E, 0x0C, 0x10, 0xB9, 0xC8, 0x37, 0xD2, 0x1E, 0xB1, 0x77 },
+    "MIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3LmVudHJ1c3Qu"
+    "bmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMG"
+    "A1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50"
+    "cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp",
+    "OGPe+A==",
+    nullptr
   }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -532,7 +532,7 @@
     Result error = rv;
     if (attemptedRequest) {
       Time timeout(time);
-      if ( timeout.AddSeconds(ServerFailureDelaySeconds) != Success) {
+      if (timeout.AddSeconds(ServerFailureDelaySeconds) != Success) {
         return Result::FATAL_ERROR_LIBRARY_FAILURE; // integer overflow
       }
       rv = mOCSPCache.Put(certID, error, time, timeout);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/nsSTSPreloadList.errors thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/nsSTSPreloadList.errors
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/nsSTSPreloadList.errors	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/nsSTSPreloadList.errors	2014-11-26 21:45:44.000000000 +0000
@@ -1,4 +1,3 @@
-18f.gsa.gov: did not receive HSTS header
 admin.google.com: did not receive HSTS header (error ignored - included regardless)
 adsfund.org: could not connect to host
 airbnb.com: did not receive HSTS header
@@ -15,8 +14,7 @@
 at.search.yahoo.com: did not receive HSTS header
 au.search.yahoo.com: did not receive HSTS header
 az.search.yahoo.com: did not receive HSTS header
-azprep.us: did not receive HSTS header
-bassh.net: did not receive HSTS header
+azprep.us: could not connect to host
 bccx.com: could not connect to host
 be.search.yahoo.com: did not receive HSTS header
 bedeta.de: could not connect to host
@@ -63,6 +61,7 @@
 crypto.is: did not receive HSTS header
 csawctf.poly.edu: did not receive HSTS header
 ct.search.yahoo.com: did not receive HSTS header
+cyanogenmod.xxx: could not connect to host
 daylightcompany.com: did not receive HSTS header
 de.search.yahoo.com: did not receive HSTS header
 decibelios.li: did not receive HSTS header
@@ -89,7 +88,7 @@
 fatzebra.com.au: did not receive HSTS header
 fi.search.yahoo.com: did not receive HSTS header
 filedir.com: did not receive HSTS header
-fixingdns.com: could not connect to host
+fixingdns.com: did not receive HSTS header
 fj.search.yahoo.com: did not receive HSTS header
 fr.search.yahoo.com: did not receive HSTS header
 gamesdepartment.co.uk: did not receive HSTS header
@@ -108,6 +107,7 @@
 greplin.com: could not connect to host
 groups.google.com: did not receive HSTS header (error ignored - included regardless)
 hackerone-user-content.com: could not connect to host
+haste.ch: 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
@@ -121,6 +121,7 @@
 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
 iop.intuit.com: max-age too low: 86400
 irccloud.com: did not receive HSTS header
@@ -139,14 +140,13 @@
 liberty.lavabit.com: could not connect to host
 lifeguard.aecom.com: max-age too low: 86400
 lists.mayfirst.org: did not receive HSTS header
-logentries.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]
 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
 lt.search.yahoo.com: did not receive HSTS header
 lu.search.yahoo.com: did not receive HSTS header
 lumi.do: [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]
-luxus-russen.de: did not receive HSTS header
+luxus-russen.de: could not connect to host
 lv.search.yahoo.com: did not receive HSTS header
 m.facebook.com: did not receive HSTS header
 m.gparent.org: could not connect to host
@@ -161,6 +161,7 @@
 minikneet.nl: did not receive HSTS header
 mobilethreat.net: could not connect to host
 mobilethreatnetwork.net: could not connect to host
+mocloud.eu: [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]
 mt.search.yahoo.com: did not receive HSTS header
 mtouch.facebook.com: did not receive HSTS header
 mu.search.yahoo.com: did not receive HSTS header
@@ -170,6 +171,7 @@
 my.alfresco.com: did not receive HSTS header
 mydigipass.com: did not receive HSTS header
 mykolab.com: did not receive HSTS header
+neg9.org: did not receive HSTS header
 neonisi.com: could not connect to host
 netzpolitik.org: did not receive HSTS header
 nexth.de: could not connect to host
@@ -180,6 +182,7 @@
 no.search.yahoo.com: did not receive HSTS header
 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]
 nz.search.yahoo.com: did not receive HSTS header
 openshift.redhat.com: did not receive HSTS header
 otakurepublic.com: did not receive HSTS header
@@ -206,16 +209,17 @@
 qc.search.yahoo.com: did not receive HSTS header
 rapidresearch.me: could not connect to host
 redlatam.org: did not receive HSTS header
+redports.org: could not connect to host
 regar42.fr: could not connect to host
 research.facebook.com: did not receive HSTS header
 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
 ru.search.yahoo.com: did not receive HSTS header
 rw.search.yahoo.com: did not receive HSTS header
 sah3.net: could not connect to host
 saturngames.co.uk: did not receive HSTS header
+schreiber-netzwerk.eu: max-age too low: 0
 script.google.com: did not receive HSTS header (error ignored - included regardless)
 se.search.yahoo.com: did not receive HSTS header
 search.yahoo.com: did not receive HSTS header
@@ -235,10 +239,13 @@
 souyar.de: could not connect to host
 souyar.net: could not connect to host
 souyar.us: could not connect to host
+spdysync.com: did not receive HSTS header
+spongepowered.org: did not receive HSTS header
 spreadsheets.google.com: did not receive HSTS header (error ignored - included regardless)
 square.com: did not receive HSTS header
 ssl.google-analytics.com: did not receive HSTS header (error ignored - included regardless)
 ssl.panoramio.com: did not receive HSTS header
+staticanime.net: did not receive HSTS header
 stocktrade.de: could not connect to host
 sunshinepress.org: could not connect to host
 surfeasy.com: did not receive HSTS header
@@ -252,7 +259,6 @@
 temehu.com: did not receive HSTS header
 terrax.berlin: could not connect to host
 th.search.yahoo.com: did not receive HSTS header
-tonerjet.co.uk: could not connect to host
 touch.facebook.com: did not receive HSTS header
 tr.search.yahoo.com: did not receive HSTS header
 translate.googleapis.com: did not receive HSTS header (error ignored - included regardless)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/nsSTSPreloadList.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/nsSTSPreloadList.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/nsSTSPreloadList.inc	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/nsSTSPreloadList.inc	2014-11-26 21:45:44.000000000 +0000
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1426331489992000);
+const PRTime gPreloadListExpirationTime = INT64_C(1427541069385000);
 
 class nsSTSPreload
 {
@@ -20,6 +20,7 @@
 static const nsSTSPreload kSTSPreloadList[] = {
   { "0x0a.net", true },
   { "17hats.com", true },
+  { "18f.gsa.gov", true },
   { "1a-diamantscheiben.de", true },
   { "1a-vermessung.at", true },
   { "1a-werkstattgeraete.de", true },
@@ -36,6 +37,7 @@
   { "aiticon.com", true },
   { "aladdinschools.appspot.com", false },
   { "alexsexton.com", true },
+  { "alexyang.me", true },
   { "alpha.irccloud.com", false },
   { "andreasbreitenlohner.de", true },
   { "anetaben.nl", true },
@@ -73,10 +75,12 @@
   { "barslecht.com", true },
   { "barslecht.nl", true },
   { "baruch.me", true },
+  { "bassh.net", true },
   { "bautied.de", true },
   { "bayrisch-fuer-anfaenger.de", true },
   { "bccx.com", true },
   { "bcrook.com", false },
+  { "beamitapp.com", true },
   { "beastowner.com", true },
   { "beastowner.li", true },
   { "bedeta.de", true },
@@ -102,6 +106,7 @@
   { "blog.torproject.org", false },
   { "bodo-wolff.de", true },
   { "bohramt.de", true },
+  { "bonigo.de", true },
   { "boxcryptor.com", true },
   { "brunosouza.org", true },
   { "buddhistische-weisheiten.org", true },
@@ -119,15 +124,19 @@
   { "cdnb.co", true },
   { "celltek-server.de", false },
   { "certible.com", true },
+  { "certly.io", true },
   { "chainmonitor.com", true },
   { "check.torproject.org", false },
   { "checkout.google.com", true },
+  { "chontalpa.pw", true },
   { "chrisjean.com", true },
   { "chrome-devtools-frontend.appspot.com", true },
   { "chrome.google.com", true },
   { "chromiumcodereview.appspot.com", false },
   { "chulado.com", true },
+  { "cktennis.com", true },
   { "clapping-rhymes.com", true },
+  { "clintwilson.technology", true },
   { "cloud.google.com", true },
   { "cloudcert.org", true },
   { "cloudns.com.au", true },
@@ -151,6 +160,7 @@
   { "crowdjuris.com", true },
   { "crypto.cat", false },
   { "cryptopartyatx.org", true },
+  { "cspbuilder.info", true },
   { "cube.de", true },
   { "cujanovic.com", true },
   { "cupcake.io", true },
@@ -171,14 +181,17 @@
   { "debtkit.co.uk", true },
   { "dedimax.de", true },
   { "denh.am", true },
+  { "depechemode-live.com", true },
   { "derevtsov.com", false },
   { "derhil.de", true },
+  { "destinationbijoux.fr", true },
   { "detectify.com", false },
   { "developer.mydigipass.com", false },
   { "devh.de", true },
   { "diamante.ro", true },
   { "die-besten-weisheiten.de", true },
   { "dillonkorman.com", true },
+  { "dinamoelektrik.com", true },
   { "dist.torproject.org", false },
   { "dl.google.com", true },
   { "dlc.viasinc.com", true },
@@ -211,22 +224,24 @@
   { "errors.zenpayroll.com", false },
   { "esec.rs", true },
   { "espra.com", true },
+  { "ethack.org", true },
   { "ethitter.com", true },
   { "eurotramp.com", true },
   { "everhome.de", true },
   { "evstatus.com", true },
   { "explodie.org", true },
   { "f-droid.org", true },
+  { "fabianfischer.de", true },
   { "factor.cc", false },
   { "fairbill.com", true },
   { "faq.lookout.com", false },
+  { "fastcomcorp.net", true },
   { "fedorapeople.org", true },
   { "feedbin.com", false },
   { "ferienhaus-polchow-ruegen.de", false },
   { "fiken.no", true },
   { "firemail.io", true },
   { "fischer-its.com", true },
-  { "fixingdns.com", true },
   { "fj.simple.com", false },
   { "flamer-scene.com", true },
   { "fleximus.org", false },
@@ -253,6 +268,7 @@
   { "getssl.uz", true },
   { "giacomopelagatti.it", true },
   { "github.com", true },
+  { "gizzo.sk", true },
   { "glass.google.com", true },
   { "globuli-info.de", true },
   { "glossopnorthendafc.co.uk", true },
@@ -310,16 +326,18 @@
   { "ideaweb.de", true },
   { "ihrlotto.de", true },
   { "ilikerainbows.co.uk", true },
-  { "imouto.my", false },
+  { "imouto.my", true },
   { "in.xero.com", false },
   { "inbox.google.com", true },
-  { "inertianetworks.com", true },
+  { "inkbunny.net", true },
   { "inleaked.com", true },
   { "insouciant.org", true },
   { "irische-segenswuensche.info", true },
   { "ironfistdesign.com", true },
   { "isitchristmas.com", true },
   { "it-schwerin.de", true },
+  { "itsamurai.ru", true },
+  { "itshost.ru", true },
   { "jackyyf.com", false },
   { "janoberst.com", true },
   { "janus-engineering.de", true },
@@ -327,16 +345,19 @@
   { "jelmer.uk", true },
   { "jfreitag.de", true },
   { "jitsi.org", false },
+  { "jmedved.com", true },
   { "jonas-keidel.de", true },
   { "jonaswitmer.ch", true },
   { "jonnybarnes.uk", true },
   { "julian-kipka.de", true },
+  { "jwilsson.com", true },
   { "jwilsson.me", true },
   { "k-dev.de", true },
   { "kaheim.de", true },
   { "kardize24.pl", true },
   { "kartonmodellbau.org", true },
   { "kdex.de", true },
+  { "keepclean.me", true },
   { "keeperapp.com", true },
   { "keepersecurity.com", true },
   { "kernel-error.de", true },
@@ -349,6 +370,7 @@
   { "kinsights.com", false },
   { "kitsta.com", true },
   { "klatschreime.de", true },
+  { "klausbrinch.dk", true },
   { "klaxn.com", true },
   { "kleidertauschpartys.de", true },
   { "knowledgehook.com", true },
@@ -364,6 +386,7 @@
   { "launchkey.com", true },
   { "lavalite.de", true },
   { "lb-toner.de", true },
+  { "leonardcamacho.me", true },
   { "library.linode.com", false },
   { "liebel.org", true },
   { "limpid.nl", true },
@@ -391,7 +414,7 @@
   { "mail.de", true },
   { "mail.google.com", true },
   { "mail.yahoo.com", false },
-  { "mailbox.org", false },
+  { "mailbox.org", true },
   { "makeyourlaws.org", true },
   { "malnex.de", true },
   { "man3s.jp", true },
@@ -407,6 +430,7 @@
   { "mattmccutchen.net", true },
   { "mbp.banking.co.at", false },
   { "md5file.com", true },
+  { "mdfnet.se", true },
   { "mediacru.sh", true },
   { "medium.com", true },
   { "meetfinch.com", true },
@@ -415,7 +439,9 @@
   { "members.mayfirst.org", false },
   { "members.nearlyfreespeech.net", false },
   { "miasarafina.de", true },
+  { "michalspacek.cz", true },
   { "mig5.net", true },
+  { "mike-bland.com", true },
   { "mikewest.org", true },
   { "miku.hatsune.my", true },
   { "minez-nightswatch.com", true },
@@ -449,7 +475,6 @@
   { "myplaceonline.com", true },
   { "nachsenden.info", true },
   { "nectarleaf.com", true },
-  { "neg9.org", false },
   { "neilwynne.com", false },
   { "net-safe.info", true },
   { "netzbit.de", true },
@@ -458,11 +483,13 @@
   { "nmctest.net", true },
   { "nos-oignons.net", true },
   { "npw.net", true },
+  { "oakslighting.co.uk", true },
   { "okmx.de", true },
   { "omitech.co.uk", true },
   { "onedot.nl", true },
   { "onedrive.com", true },
   { "onedrive.live.com", false },
+  { "onsitemassageco.com", true },
   { "oplop.appspot.com", true },
   { "opsmate.com", false },
   { "optimus.io", true },
@@ -513,6 +540,7 @@
   { "prefontaine.name", true },
   { "profiles.google.com", true },
   { "projektzentrisch.de", true },
+  { "propagandism.org", true },
   { "prowhisky.de", true },
   { "pubkey.is", true },
   { "publications.qld.gov.au", false },
@@ -533,6 +561,7 @@
   { "riccy.org", true },
   { "riesenmagnete.de", true },
   { "rippleunion.com", true },
+  { "robteix.com", true },
   { "roddis.net", false },
   { "roland.io", true },
   { "romab.com", true },
@@ -550,7 +579,6 @@
   { "sandbox.mydigipass.com", false },
   { "schachburg.de", true },
   { "schokokeks.org", false },
-  { "schreiber-netzwerk.eu", true },
   { "schwarzer.it", true },
   { "sciencex.com", true },
   { "scotthelme.co.uk", true },
@@ -582,12 +610,13 @@
   { "sites.google.com", true },
   { "skydrive.live.com", false },
   { "slattery.co", true },
+  { "slevomat.cz", true },
   { "slidebatch.com", true },
   { "smartcoin.com.br", true },
   { "smartship.co.jp", true },
+  { "sour.is", true },
   { "southside-crew.com", true },
   { "spartantheatre.org", true },
-  { "spdysync.com", true },
   { "spencerbaer.com", true },
   { "spideroak.com", true },
   { "spreadsheets.google.com", true },
@@ -611,10 +640,12 @@
   { "studydrive.net", true },
   { "subrosa.io", true },
   { "suite73.org", true },
+  { "sunjaydhama.com", true },
   { "supplies24.at", true },
   { "supplies24.es", true },
   { "support.mayfirst.org", false },
   { "surkatty.org", true },
+  { "swehack.org", true },
   { "sylaps.com", true },
   { "sysctl.se", true },
   { "syss.de", true },
@@ -634,6 +665,7 @@
   { "therapynotes.com", false },
   { "theshadestore.com", true },
   { "thorncreek.net", false },
+  { "thusoy.com", true },
   { "tickopa.co.uk", true },
   { "timtaubert.de", true },
   { "tinfoilsecurity.com", false },
@@ -641,6 +673,7 @@
   { "tintenfix.net", true },
   { "tipps-fuer-den-haushalt.de", true },
   { "tittelbach.at", true },
+  { "tls.li", true },
   { "tno.io", true },
   { "tobias-kluge.de", true },
   { "tollmanz.com", true },
@@ -681,6 +714,7 @@
   { "usaa.com", false },
   { "uzstyle.com", false },
   { "vaddder.com", true },
+  { "vhost.co.id", true },
   { "viasinc.com", false },
   { "viennan.net", true },
   { "vmoagents.com", false },
@@ -692,6 +726,7 @@
   { "warrencreative.com", false },
   { "watsonhall.uk", true },
   { "webandmore.de", false },
+  { "webandwords.com.au", true },
   { "webcollect.org.uk", true },
   { "webfilings-eu-mirror.appspot.com", true },
   { "webfilings-eu.appspot.com", true },
@@ -702,6 +737,7 @@
   { "webmail.onlime.ch", false },
   { "webmail.schokokeks.org", false },
   { "websenat.de", true },
+  { "webtiles.co.uk", true },
   { "weggeweest.nl", true },
   { "welches-kinderfahrrad.de", true },
   { "wepay.com", false },
@@ -773,11 +809,13 @@
   { "xn--maraa-rta.org", true },
   { "xps2pdf.co.uk", true },
   { "y-o-w.com", true },
+  { "yoursecondphone.co", true },
   { "ypart.eu", true },
   { "z.ai", true },
   { "zenpayroll.com", false },
   { "zeplin.io", false },
   { "zeropush.com", true },
   { "zixiao.wang", true },
+  { "zlavomat.sk", true },
   { "zotero.org", true },
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/RootHashes.inc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/RootHashes.inc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/RootHashes.inc	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/RootHashes.inc	2014-11-26 21:45:44.000000000 +0000
@@ -117,6 +117,12 @@
       66 /* Bin Number */
   },
   {
+    /* GlobalSign */
+    { 0x17, 0x9F, 0xBC, 0x14, 0x8A, 0x3D, 0xD0, 0x0F, 0xD2, 0x4E, 0xA1, 0x34, 0x58, 0xCC, 0x43, 0xBF,
+      0xA7, 0xF5, 0x9C, 0x81, 0x82, 0xD7, 0x83, 0xA5, 0x13, 0xF6, 0xEB, 0xEC, 0x10, 0x0C, 0x89, 0x24 },
+      158 /* Bin Number */
+  },
+  {
     /* QuoVadis_Root_CA_3 */
     { 0x18, 0xF1, 0xFC, 0x7F, 0x20, 0x5D, 0xF8, 0xAD, 0xDD, 0xEB, 0x7F, 0xE0, 0x07, 0xDD, 0x57, 0xE3,
       0xAF, 0x37, 0x5A, 0x9C, 0x4D, 0x8D, 0x73, 0x54, 0x6B, 0xF4, 0xF1, 0xFE, 0xD1, 0xE1, 0x8D, 0x35 },
@@ -261,6 +267,12 @@
       152 /* Bin Number */
   },
   {
+    /* USERTrust_ECC_Certification_Authority */
+    { 0x4F, 0xF4, 0x60, 0xD5, 0x4B, 0x9C, 0x86, 0xDA, 0xBF, 0xBC, 0xFC, 0x57, 0x12, 0xE0, 0x40, 0x0D,
+      0x2B, 0xED, 0x3F, 0xBC, 0x4D, 0x4F, 0xBD, 0xAA, 0x86, 0xE0, 0x6A, 0xDC, 0xD2, 0xA9, 0xAD, 0x7A },
+      156 /* Bin Number */
+  },
+  {
     /* ComSign_Secured_CA */
     { 0x50, 0x79, 0x41, 0xC7, 0x44, 0x60, 0xA0, 0xB4, 0x70, 0x86, 0x22, 0x0D, 0x4E, 0x99, 0x32, 0x57,
       0x2A, 0xB5, 0xD1, 0xB5, 0xBB, 0xCB, 0x89, 0x80, 0xAB, 0x1C, 0xB1, 0x76, 0x51, 0xA8, 0x44, 0xD2 },
@@ -273,6 +285,12 @@
       118 /* Bin Number */
   },
   {
+    /* COMODO_RSA_Certification_Authority */
+    { 0x52, 0xF0, 0xE1, 0xC4, 0xE5, 0x8E, 0xC6, 0x29, 0x29, 0x1B, 0x60, 0x31, 0x7F, 0x07, 0x46, 0x71,
+      0xB8, 0x5D, 0x7E, 0xA8, 0x0D, 0x5B, 0x07, 0x27, 0x34, 0x63, 0x53, 0x4B, 0x32, 0xB4, 0x02, 0x34 },
+      154 /* Bin Number */
+  },
+  {
     /* DigiCert_Trusted_Root_G4 */
     { 0x55, 0x2F, 0x7B, 0xDC, 0xF1, 0xA7, 0xAF, 0x9E, 0x6C, 0xE6, 0x72, 0x01, 0x7F, 0x4F, 0x12, 0xAB,
       0xF7, 0x72, 0x40, 0xC7, 0x8E, 0x76, 0x1A, 0xC2, 0x03, 0xD1, 0xD9, 0xD2, 0x0A, 0xC8, 0x99, 0x88 },
@@ -663,6 +681,12 @@
       57 /* Bin Number */
   },
   {
+    /* GlobalSign */
+    { 0xBE, 0xC9, 0x49, 0x11, 0xC2, 0x95, 0x56, 0x76, 0xDB, 0x6C, 0x0A, 0x55, 0x09, 0x86, 0xD7, 0x6E,
+      0x3B, 0xA0, 0x05, 0x66, 0x7C, 0x44, 0x2C, 0x97, 0x62, 0xB4, 0xFB, 0xB7, 0x73, 0xDE, 0x22, 0x8C },
+      157 /* Bin Number */
+  },
+  {
     /* SecureSign_RootCA11 */
     { 0xBF, 0x0F, 0xEE, 0xFB, 0x9E, 0x3A, 0x58, 0x1A, 0xD5, 0xF9, 0xE9, 0xDB, 0x75, 0x89, 0x98, 0x57,
       0x43, 0xD2, 0x61, 0x08, 0x5C, 0x4D, 0x31, 0x4F, 0x6F, 0x5D, 0x72, 0x59, 0xAA, 0x42, 0x16, 0x12 },
@@ -837,6 +861,12 @@
       34 /* Bin Number */
   },
   {
+    /* USERTrust_RSA_Certification_Authority */
+    { 0xE7, 0x93, 0xC9, 0xB0, 0x2F, 0xD8, 0xAA, 0x13, 0xE2, 0x1C, 0x31, 0x22, 0x8A, 0xCC, 0xB0, 0x81,
+      0x19, 0x64, 0x3B, 0x74, 0x9C, 0x89, 0x89, 0x64, 0xB1, 0x74, 0x6D, 0x46, 0xC3, 0xD4, 0xCB, 0xD2 },
+      155 /* Bin Number */
+  },
+  {
     /* OU_certSIGN_ROOT_CA_O_certSIGN_C_RO */
     { 0xEA, 0xA9, 0x62, 0xC4, 0xFA, 0x4A, 0x6B, 0xAF, 0xEB, 0xE4, 0x15, 0x19, 0x6D, 0x35, 0x1C, 0xCD,
       0x88, 0x8D, 0x4F, 0x53, 0xF3, 0xFA, 0x8A, 0xE6, 0xD7, 0xC4, 0x66, 0xA9, 0x4E, 0x60, 0x42, 0xBB },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/StaticHPKPins.errors thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/StaticHPKPins.errors
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/StaticHPKPins.errors	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/StaticHPKPins.errors	2014-11-26 21:45:44.000000000 +0000
@@ -1,11 +1,24 @@
 Can't find hash in builtin certs for Chrome nickname RapidSSL, inserting GOOGLE_PIN_RapidSSL
 Can't find hash in builtin certs for Chrome nickname Entrust_G2, inserting GOOGLE_PIN_Entrust_G2
 Can't find hash in builtin certs for Chrome nickname Entrust_SSL, inserting GOOGLE_PIN_Entrust_SSL
+Can't find hash in builtin certs for Chrome nickname GTECyberTrustGlobalRoot, inserting GOOGLE_PIN_GTECyberTrustGlobalRoot
 Can't find hash in builtin certs for Chrome nickname Tor2web, inserting GOOGLE_PIN_Tor2web
 Can't find hash in builtin certs for Chrome nickname AlphaSSL_G2, inserting GOOGLE_PIN_AlphaSSL_G2
 Can't find hash in builtin certs for Chrome nickname CryptoCat1, inserting GOOGLE_PIN_CryptoCat1
 Can't find hash in builtin certs for Chrome nickname Libertylavabitcom, inserting GOOGLE_PIN_Libertylavabitcom
 Can't find hash in builtin certs for Chrome nickname EntrustRootEC1, inserting GOOGLE_PIN_EntrustRootEC1
 Can't find hash in builtin certs for Chrome nickname GoDaddySecure, inserting GOOGLE_PIN_GoDaddySecure
+Can't find hash in builtin certs for Chrome nickname ThawtePremiumServer, inserting GOOGLE_PIN_ThawtePremiumServer
 Can't find hash in builtin certs for Chrome nickname SymantecClass3EVG3, inserting GOOGLE_PIN_SymantecClass3EVG3
 Can't find hash in builtin certs for Chrome nickname DigiCertECCSecureServerCA, inserting GOOGLE_PIN_DigiCertECCSecureServerCA
+Writing pinset test
+Writing pinset google
+Writing pinset tor
+Writing pinset twitterCom
+Writing pinset twitterCDN
+Writing pinset tor2web
+Writing pinset cryptoCat
+Writing pinset lavabit
+Writing pinset dropbox
+Writing pinset facebook
+Writing pinset spideroak
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/StaticHPKPins.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/StaticHPKPins.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/boot/src/StaticHPKPins.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/boot/src/StaticHPKPins.h	2014-11-26 21:45:44.000000000 +0000
@@ -39,14 +39,6 @@
 static const char kAffirmTrust_Premium_ECCFingerprint[] =
   "MhmwkRT/SVo+tusAwu/qs0ACrl8KVsdnnqCHo/oDfk8=";
 
-/* America Online Root Certification Authority 1 */
-static const char kAmerica_Online_Root_Certification_Authority_1Fingerprint[] =
-  "I4SdCUkj1EpIgbY6sYXpvhWqyO8sMETZNLx/JuLSzWk=";
-
-/* America Online Root Certification Authority 2 */
-static const char kAmerica_Online_Root_Certification_Authority_2Fingerprint[] =
-  "/PfamDYD6IhiAw2WE32OEwMbrftNVsH9TKzDOfa9uyo=";
-
 /* Baltimore CyberTrust Root */
 static const char kBaltimore_CyberTrust_RootFingerprint[] =
   "Y9mvm0exBk1JoQ57f9Vm28jKo5lFm/woKcVxrYxu80o=";
@@ -139,6 +131,10 @@
 static const char kGOOGLE_PIN_Entrust_SSLFingerprint[] =
   "nsxRNo6G40YPZsKV5JQt1TCA8nseQQr/LRqp1Oa8fnw=";
 
+/* GOOGLE_PIN_GTECyberTrustGlobalRoot */
+static const char kGOOGLE_PIN_GTECyberTrustGlobalRootFingerprint[] =
+  "EGn6R6CqT4z3ERscrqNl7q7RC//zJmDe9uBhS/rnCHU=";
+
 /* GOOGLE_PIN_GoDaddySecure */
 static const char kGOOGLE_PIN_GoDaddySecureFingerprint[] =
   "MrZLZnJ6IGPkBm87lYywqu5Xal7O/ZUzmbuIdHMdlYc=";
@@ -155,14 +151,14 @@
 static const char kGOOGLE_PIN_SymantecClass3EVG3Fingerprint[] =
   "gMxWOrX4PMQesK9qFNbYBxjBfjUvlkn/vN1n+L9lE5E=";
 
+/* GOOGLE_PIN_ThawtePremiumServer */
+static const char kGOOGLE_PIN_ThawtePremiumServerFingerprint[] =
+  "9TwiBZgX3Zb0AGUWOdL4V+IQcKWavtkHlADZ9pVQaQA=";
+
 /* GOOGLE_PIN_Tor2web */
 static const char kGOOGLE_PIN_Tor2webFingerprint[] =
   "99ogQzjMuUTBkG1ZP7FME0K4kvBEti8Buzu4nZjRItM=";
 
-/* GTE CyberTrust Global Root */
-static const char kGTE_CyberTrust_Global_RootFingerprint[] =
-  "EGn6R6CqT4z3ERscrqNl7q7RC//zJmDe9uBhS/rnCHU=";
-
 /* GeoTrust Global CA */
 static const char kGeoTrust_Global_CAFingerprint[] =
   "h6801m+z8v3zbgkRHpq6L29Esgfzhj89C1SyUCOQmqU=";
@@ -223,6 +219,14 @@
 static const char kNetwork_Solutions_Certificate_AuthorityFingerprint[] =
   "MtGA7THJNVieydu7ciEjuIO1/C3BD5/KOpXXfhv8tTQ=";
 
+/* SpiderOak1 */
+static const char kSpiderOak1Fingerprint[] =
+  "UPrvFUSrp9aal5v6Rn0Jv3YJ/wU=";
+
+/* SpiderOak2 */
+static const char kSpiderOak2Fingerprint[] =
+  "D0fS/hquA6QprluciyO1hlFUAxg=";
+
 /* Starfield Class 2 CA */
 static const char kStarfield_Class_2_CAFingerprint[] =
   "FfFKxFycfaIz00eRZOgTf+Ne4POK6FgYPwhBDqgqxLQ=";
@@ -263,14 +267,6 @@
 static const char kTestSPKIFingerprint[] =
   "AAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
-/* Thawte Premium Server CA */
-static const char kThawte_Premium_Server_CAFingerprint[] =
-  "9TwiBZgX3Zb0AGUWOdL4V+IQcKWavtkHlADZ9pVQaQA=";
-
-/* Thawte Server CA */
-static const char kThawte_Server_CAFingerprint[] =
-  "nG9qEjy6pO402+zu4kyX1ziHjLQj88InOQNCT10fbdU=";
-
 /* Tor1 */
 static const char kTor1Fingerprint[] =
   "juNxSTv9UANmpC9kF5GKpmWNx3Y=";
@@ -377,12 +373,10 @@
 /* PreloadedHPKPins.json pinsets */
 static const char* kPinset_google_root_pems_sha256_Data[] = {
   kEquifax_Secure_CAFingerprint,
-  kAmerica_Online_Root_Certification_Authority_2Fingerprint,
   kComodo_Trusted_Services_rootFingerprint,
   kCOMODO_ECC_Certification_AuthorityFingerprint,
   kStartCom_Certification_AuthorityFingerprint,
   kStartCom_Certification_AuthorityFingerprint,
-  kThawte_Premium_Server_CAFingerprint,
   kCOMODO_Certification_AuthorityFingerprint,
   kVerisign_Class_3_Public_Primary_Certification_Authority___G2Fingerprint,
   kXRamp_Global_CA_RootFingerprint,
@@ -394,7 +388,6 @@
   kthawte_Primary_Root_CAFingerprint,
   kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
-  kAmerica_Online_Root_Certification_Authority_1Fingerprint,
   kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
   kEquifax_Secure_eBusiness_CA_1Fingerprint,
   kGlobalSign_Root_CAFingerprint,
@@ -427,7 +420,6 @@
   kAddTrust_External_RootFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
   kGeoTrust_Universal_CAFingerprint,
-  kThawte_Server_CAFingerprint,
   kEquifax_Secure_Global_eBusiness_CAFingerprint,
   kTC_TrustCenter_Universal_CA_IIIFingerprint,
   kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
@@ -618,7 +610,7 @@
   kVerisign_Class_3_Public_Primary_Certification_Authority___G2Fingerprint,
   kAddTrust_Low_Value_Services_RootFingerprint,
   kUTN_USERFirst_Object_Root_CAFingerprint,
-  kGTE_CyberTrust_Global_RootFingerprint,
+  kGOOGLE_PIN_GTECyberTrustGlobalRootFingerprint,
   kGeoTrust_Global_CA_2Fingerprint,
   kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
@@ -708,7 +700,7 @@
 
 static const char* kPinset_dropbox_sha256_Data[] = {
   kGOOGLE_PIN_EntrustRootEC1Fingerprint,
-  kThawte_Premium_Server_CAFingerprint,
+  kGOOGLE_PIN_ThawtePremiumServerFingerprint,
   kthawte_Primary_Root_CA___G3Fingerprint,
   kthawte_Primary_Root_CAFingerprint,
   kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
@@ -759,6 +751,28 @@
   &kPinset_facebook_sha256
 };
 
+static const char* kPinset_spideroak_sha1_Data[] = {
+  kSpiderOak2Fingerprint,
+  kSpiderOak1Fingerprint,
+};
+static const StaticFingerprints kPinset_spideroak_sha1 = {
+  sizeof(kPinset_spideroak_sha1_Data) / sizeof(const char*),
+  kPinset_spideroak_sha1_Data
+};
+
+static const char* kPinset_spideroak_sha256_Data[] = {
+  kGOOGLE_PIN_RapidSSLFingerprint,
+};
+static const StaticFingerprints kPinset_spideroak_sha256 = {
+  sizeof(kPinset_spideroak_sha256_Data) / sizeof(const char*),
+  kPinset_spideroak_sha256_Data
+};
+
+static const StaticPinset kPinset_spideroak = {
+  &kPinset_spideroak_sha1,
+  &kPinset_spideroak_sha256
+};
+
 /* Domainlist */
 struct TransportSecurityPreload {
   const char* mHost;
@@ -1078,6 +1092,7 @@
   { "security.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "services.mozilla.com", true, false, true, 6, &kPinset_mozilla_services },
   { "sites.google.com", true, false, false, -1, &kPinset_google_root_pems },
+  { "spideroak.com", true, false, false, -1, &kPinset_spideroak },
   { "spreadsheets.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "ssl.google-analytics.com", true, false, false, -1, &kPinset_google_root_pems },
   { "t.facebook.com", true, true, false, -1, &kPinset_facebook },
@@ -1121,8 +1136,8 @@
   { "ytimg.com", true, false, false, -1, &kPinset_google_root_pems },
 };
 
-// Pinning Preload List Length = 348;
+// Pinning Preload List Length = 349;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1423912295636000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1425121875578000);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/pki/resources/content/certManager.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/pki/resources/content/certManager.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/pki/resources/content/certManager.js	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/pki/resources/content/certManager.js	2014-11-26 21:45:44.000000000 +0000
@@ -386,11 +386,11 @@
     // If this is an X509 user certificate, import it as one.
 
     var isX509FileType = false;
-    var fileTypesList = gFileTypesList.split('; ');
-    for (var type in fileTypesList) {
+    var fileTypesList = gCertFileTypes.slice(1).split('; *');
+    for (var type of fileTypesList) {
       if (fp.file.path.endsWith(type)) {
         isX509FileType = true;
-  	break;
+        break;
       }
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/moz.build	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/moz.build	2014-11-26 21:45:45.000000000 +0000
@@ -77,6 +77,10 @@
     'PSMContentListener.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '/security/manager/boot/src',
+]
+
 if not CONFIG['MOZ_NO_SMART_CARDS']:
     UNIFIED_SOURCES += [
         'nsSmartCardMonitor.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/NSSErrorsService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/NSSErrorsService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/NSSErrorsService.cpp	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/NSSErrorsService.cpp	2014-11-26 21:45:45.000000000 +0000
@@ -142,6 +142,7 @@
     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:
       *aErrorClass = ERROR_CLASS_BAD_CERT;
       break;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/ScopedNSSTypes.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/ScopedNSSTypes.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/ScopedNSSTypes.h	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/ScopedNSSTypes.h	2014-11-26 21:45:45.000000000 +0000
@@ -92,6 +92,9 @@
 MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedCERTName,
                                           CERTName,
                                           CERT_DestroyName)
+MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedCERTOidSequence,
+                                          CERTOidSequence,
+                                          CERT_DestroyOidSequence)
 MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedCERTCertNicknames,
                                           CERTCertNicknames,
                                           CERT_FreeNicknames)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp	2014-11-26 21:45:45.000000000 +0000
@@ -121,12 +121,15 @@
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "PSMRunnable.h"
+#include "RootCertificateTelemetryUtils.h"
 #include "SharedSSLState.h"
 #include "nsContentUtils.h"
 #include "nsURLHelper.h"
 
 #include "ssl.h"
+#include "cert.h"
 #include "secerr.h"
+#include "secoidt.h"
 #include "secport.h"
 #include "sslerr.h"
 
@@ -306,6 +309,7 @@
     case SEC_ERROR_EXPIRED_CERTIFICATE:                return 10;
     case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY: return 11;
     case mozilla::pkix::MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA: return 12;
+    case mozilla::pkix::MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE: return 13;
   }
   NS_WARNING("Unknown certificate error code. Does MapCertErrorToProbeValue "
              "handle everything in DetermineCertOverrideErrors?");
@@ -335,6 +339,7 @@
     case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
     case SEC_ERROR_UNKNOWN_ISSUER:
     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:
     {
       collectedErrors = nsICertOverrideService::ERROR_UNTRUSTED;
@@ -810,8 +815,10 @@
 {
   CERTCertListNode* endEntityNode = CERT_LIST_HEAD(certList);
   CERTCertListNode* rootNode = CERT_LIST_TAIL(certList);
-  PR_ASSERT(endEntityNode && rootNode);
-  if (!endEntityNode || !rootNode) {
+  PR_ASSERT(!(CERT_LIST_END(endEntityNode, certList) ||
+              CERT_LIST_END(rootNode, certList)));
+  if (CERT_LIST_END(endEntityNode, certList) ||
+      CERT_LIST_END(rootNode, certList)) {
     return;
   }
   CERTCertificate* cert = endEntityNode->cert;
@@ -957,6 +964,106 @@
                                        commonNameInSubjectAltNames);
 }
 
+// Gather telemetry on whether the end-entity cert for a server has the
+// required TLS Server Authentication EKU, or any others
+void
+GatherEKUTelemetry(const ScopedCERTCertList& certList)
+{
+  CERTCertListNode* endEntityNode = CERT_LIST_HEAD(certList);
+  CERTCertListNode* rootNode = CERT_LIST_TAIL(certList);
+  PR_ASSERT(!(CERT_LIST_END(endEntityNode, certList) ||
+              CERT_LIST_END(rootNode, certList)));
+  if (CERT_LIST_END(endEntityNode, certList) ||
+      CERT_LIST_END(rootNode, certList)) {
+    return;
+  }
+  CERTCertificate* endEntityCert = endEntityNode->cert;
+
+  // Only log telemetry if the root CA is built-in
+  bool isBuiltIn = false;
+  SECStatus rv = IsCertBuiltInRoot(rootNode->cert, isBuiltIn);
+  if (rv != SECSuccess || !isBuiltIn) {
+    return;
+  }
+
+  // Find the EKU extension, if present
+  bool foundEKU = false;
+  SECOidTag oidTag;
+  CERTCertExtension* ekuExtension = nullptr;
+  for (size_t i = 0; endEntityCert->extensions[i]; i++) {
+    oidTag = SECOID_FindOIDTag(&endEntityCert->extensions[i]->id);
+    if (oidTag == SEC_OID_X509_EXT_KEY_USAGE) {
+      foundEKU = true;
+      ekuExtension = endEntityCert->extensions[i];
+    }
+  }
+
+  if (!foundEKU) {
+    Telemetry::Accumulate(Telemetry::SSL_SERVER_AUTH_EKU, 0);
+    return;
+  }
+
+  // Parse the EKU extension
+  ScopedCERTOidSequence ekuSequence(
+    CERT_DecodeOidSequence(&ekuExtension->value));
+  if (!ekuSequence) {
+    return;
+  }
+
+  // Search through the available EKUs
+  bool foundServerAuth = false;
+  bool foundOther = false;
+  for (SECItem** oids = ekuSequence->oids; oids && *oids; oids++) {
+    oidTag = SECOID_FindOIDTag(*oids);
+    if (oidTag == SEC_OID_EXT_KEY_USAGE_SERVER_AUTH) {
+      foundServerAuth = true;
+    } else {
+      foundOther = true;
+    }
+  }
+
+  // Cases 3 is included only for completeness.  It should never
+  // appear in these statistics, because CheckExtendedKeyUsage()
+  // should require the EKU extension, if present, to contain the
+  // value id_kp_serverAuth.
+  if (foundServerAuth && !foundOther) {
+    Telemetry::Accumulate(Telemetry::SSL_SERVER_AUTH_EKU, 1);
+  } else if (foundServerAuth && foundOther) {
+    Telemetry::Accumulate(Telemetry::SSL_SERVER_AUTH_EKU, 2);
+  } else if (!foundServerAuth) {
+    Telemetry::Accumulate(Telemetry::SSL_SERVER_AUTH_EKU, 3);
+  }
+}
+
+// Gathers telemetry on which CA is the root of a given cert chain.
+// If the root is a built-in root, then the telemetry makes a count
+// by root.  Roots that are not built-in are counted in one bin.
+void
+GatherRootCATelemetry(const ScopedCERTCertList& certList)
+{
+  CERTCertListNode* rootNode = CERT_LIST_TAIL(certList);
+  PR_ASSERT(rootNode);
+  if (!rootNode) {
+    return;
+  }
+
+  // Only log telemetry if the certificate list is non-empty
+  if (!CERT_LIST_END(rootNode, certList)) {
+    AccumulateTelemetryForRootCA(Telemetry::CERT_VALIDATION_SUCCESS_BY_CA,
+                                 rootNode->cert);
+  }
+}
+
+// There are various things that we want to measure about certificate
+// chains that we accept.  This is a single entry point for all of them.
+void
+GatherSuccessfulValidationTelemetry(const ScopedCERTCertList& certList)
+{
+  GatherBaselineRequirementsTelemetry(certList);
+  GatherEKUTelemetry(certList);
+  GatherRootCATelemetry(certList);
+}
+
 SECStatus
 AuthCertificate(CertVerifier& certVerifier,
                 TransportSecurityInfo* infoObject,
@@ -1001,7 +1108,8 @@
   }
 
   if (rv == SECSuccess) {
-    GatherBaselineRequirementsTelemetry(certList);
+    GatherSuccessfulValidationTelemetry(certList);
+
     // The connection may get terminated, for example, if the server requires
     // a client cert. Let's provide a minimal SSLStatus
     // to the caller that contains at least the cert and its status.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js	2014-11-14 09:37:10.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js	2014-11-26 21:45:45.000000000 +0000
@@ -63,6 +63,7 @@
   do_check_eq(histogram.counts[10], 5); // SEC_ERROR_EXPIRED_CERTIFICATE
   do_check_eq(histogram.counts[11], 2); // MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY
   do_check_eq(histogram.counts[12], 1); // MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA
+  do_check_eq(histogram.counts[13], 1); // MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE
   run_next_test();
 }
 
@@ -149,6 +150,10 @@
     clearSessionCache();
     run_next_test();
   });
+
+  add_cert_override_test("inadequate-key-size-ee.example.com",
+                         Ci.nsICertOverrideService.ERROR_UNTRUSTED,
+                         getXPCOMStatusFromNSS(MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE));
 }
 
 function add_combo_tests() {
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/cert8.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/cert8.db differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/cert9.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/cert9.db differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev_root_generate.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev_root_generate.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev_root_generate.py	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev_root_generate.py	2014-11-26 21:45:45.000000000 +0000
@@ -1,13 +1,7 @@
 #!/usr/bin/python
 
-# after runing this file you MUST modify nsIdentityinfo.cpp to change the
-# fingerprint of the evroot
-
 import tempfile, os, sys
 import random
-import pexpect
-import subprocess
-import shutil
 
 libpath = os.path.abspath('../psm_common_py')
 sys.path.append(libpath)
@@ -21,39 +15,29 @@
 CA_min_ku = "keyUsage = critical, digitalSignature, keyCertSign, cRLSign\n"
 subject_key_ident = "subjectKeyIdentifier = hash\n"
 
-def generate_root_cert(db_dir, dest_dir, prefix, ext_text):
-    serial_num = 12343299546
-    name = prefix
-    key_name = dest_dir + "/" + name + ".key"
-    os.system ("openssl genpkey -algorithm RSA -out " + key_name +
-                 " -pkeyopt rsa_keygen_bits:2048")
-
-    csr_name =  dest_dir + "/" + name + ".csr"
-    os.system ("openssl req -new -key " + key_name + " -days 3650" +
-               " -extensions v3_ca -batch -out " + csr_name +
-               " -utf8 -subj '/C=US/ST=CA/L=Mountain View" +
-               "/O=Mozilla - EV debug test CA/OU=Security Engineering" +
-               "/CN=XPCShell EV Testing (untrustworthy) CA'")
-
-    extensions_filename = db_dir + "/openssl-exts"
-    f = open(extensions_filename, 'w')
-    f.write(ext_text)
-    f.close()
-
-    cert_name =  dest_dir + "/" + name + ".der"
-    signer_key_filename = key_name
-    os.system ("openssl x509 -req -sha256 -days 3650 -in " + csr_name +
-               " -signkey " + signer_key_filename +
-               " -set_serial " + str(serial_num) +
-               " -extfile " + extensions_filename +
-               " -outform DER -out " + cert_name)
-
-    return key_name, cert_name
-
-prefix = "evroot"
-[ca_key, ca_cert] = generate_root_cert(db, dest_dir, prefix,
-                                       CA_basic_constraints +
-                                       CA_min_ku + subject_key_ident)
-CertUtils.generate_pkcs12(db, dest_dir, ca_cert, ca_key, prefix)
-print ("You now MUST modify nsIdentityinfo.cpp to ensure the xpchell debug " +
-       "certificate there matches this newly generated one\n")
+cert_name = 'evroot'
+ext_text = CA_basic_constraints + CA_min_ku + subject_key_ident
+subject_string = ('/C=US/ST=CA/L=Mountain View' +
+                  '/O=Mozilla - EV debug test CA/OU=Security Engineering' +
+                  '/CN=XPCShell EV Testing (untrustworthy) CA')
+
+# The db_dir argument of generate_cert_generic() is also set to dest_dir as
+# the .key file generated is needed by other certs.
+[ca_key, ca_cert] = CertUtils.generate_cert_generic(
+    dest_dir,
+    dest_dir,
+    random.randint(100, 40000000),
+    'rsa',
+    cert_name,
+    ext_text,
+    subject_string = subject_string)
+
+CertUtils.generate_pkcs12(db, dest_dir, ca_cert, ca_key, cert_name)
+
+# Print a blank line and the information needed to enable EV for the root
+# generated by this script.
+print
+CertUtils.print_cert_info_for_ev(ca_cert)
+print ('You now MUST update the compiled test EV root information to match ' +
+       'the EV root information printed above. In addition, certs that chain ' +
+       'up to this root in other folders will also need to be regenerated.' )
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev-valid-anypolicy-int.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev-valid-anypolicy-int.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev-valid.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/ev-valid.der differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/generate.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/generate.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/generate.py	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/generate.py	2014-11-26 21:45:45.000000000 +0000
@@ -2,9 +2,6 @@
 
 import tempfile, os, sys
 import random
-import pexpect
-import subprocess
-import shutil
 
 libpath = os.path.abspath('../psm_common_py')
 
@@ -39,34 +36,10 @@
 
 
 def import_untrusted_cert(certfile, nickname):
-    os.system("certutil -A -d . -n " + nickname + " -i " + certfile +
-              " -t ',,'")
-
-def import_cert_and_pkcs12(certfile, pkcs12file, nickname, trustflags):
-    os.system(" certutil -A -d . -n " + nickname + " -i " + certfile + " -t '" +
-              trustflags + "'")
-    child = pexpect.spawn("pk12util -i " + pkcs12file + "  -d .")
-    child.expect('Enter password for PKCS12 file:')
-    child.sendline('')
-    child.expect(pexpect.EOF)
-
-def init_nss_db():
-    nss_db_files = [ "cert8.db", "key3.db", "secmod.db" ]
-    for file in nss_db_files:
-        if os.path.isfile(file):
-            os.remove(file)
-    #now create DB
-    child = pexpect.spawn("certutil -N -d .")
-    child.expect("Enter new password:")
-    child.sendline('')
-    child.expect('Re-enter password:')
-    child.sendline('')
-    child.expect(pexpect.EOF)
-    import_cert_and_pkcs12("evroot.der", "evroot.p12", "evroot", "C,C,C")
-
+    os.system('certutil -A -d sql:%s -n %s -i %s -t ",,"' %
+              (srcdir, nickname, certfile))
 
 def generate_certs():
-    init_nss_db()
     ca_cert = 'evroot.der'
     ca_key = 'evroot.key'
     prefix = "ev-valid"
@@ -75,6 +48,11 @@
                    endentity_crl + mozilla_testing_ev_policy)
     int_ext_text = (CA_extensions + aia_prefix + "int-" + prefix + aia_suffix +
                     intermediate_crl + mozilla_testing_ev_policy)
+
+    CertUtils.init_nss_db(srcdir)
+    CertUtils.import_cert_and_pkcs12(srcdir, ca_cert, 'evroot.p12', 'evroot',
+                                     'C,C,C')
+
     [int_key, int_cert, ee_key, ee_cert] = CertUtils.generate_int_and_ee(db,
                                              srcdir,
                                              ca_key,
@@ -83,9 +61,10 @@
                                              int_ext_text,
                                              ee_ext_text,
                                              key_type)
-    pk12file = CertUtils.generate_pkcs12(db, srcdir, int_cert, int_key,
+    pk12file = CertUtils.generate_pkcs12(db, db, int_cert, int_key,
                                          "int-" + prefix)
-    import_cert_and_pkcs12(int_cert, pk12file, "int-" + prefix, ",,")
+    CertUtils.import_cert_and_pkcs12(srcdir, int_cert, pk12file,
+                                     'int-' + prefix, ',,')
     import_untrusted_cert(ee_cert, prefix)
 
     # now we generate an end entity cert with an AIA with no OCSP URL
@@ -116,9 +95,10 @@
                                              int_ext_text,
                                              ee_ext_text,
                                              key_type)
-    pk12file = CertUtils.generate_pkcs12(db, srcdir, int_cert, int_key,
+    pk12file = CertUtils.generate_pkcs12(db, db, int_cert, int_key,
                                          "int-" + prefix)
-    import_cert_and_pkcs12(int_cert, pk12file, "int-" + prefix, ",,")
+    CertUtils.import_cert_and_pkcs12(srcdir, int_cert, pk12file,
+                                     'int-' + prefix, ',,')
     import_untrusted_cert(ee_cert, prefix)
 
 
@@ -128,9 +108,10 @@
                                       'rsa',
                                       'non-evroot-ca',
                                       CA_extensions)
-    pk12file =  CertUtils.generate_pkcs12(db, srcdir, bad_ca_cert, bad_ca_key,
+    pk12file =  CertUtils.generate_pkcs12(db, db, bad_ca_cert, bad_ca_key,
                                           "non-evroot-ca")
-    import_cert_and_pkcs12(bad_ca_cert, pk12file, "non-evroot-ca", "C,C,C")
+    CertUtils.import_cert_and_pkcs12(srcdir, bad_ca_cert, pk12file,
+                                     'non-evroot-ca', 'C,C,C')
     prefix = "non-ev-root"
     ee_ext_text = (aia_prefix + prefix  + aia_suffix +
                    endentity_crl + mozilla_testing_ev_policy)
@@ -144,11 +125,10 @@
                                       int_ext_text,
                                       ee_ext_text,
                                       key_type)
-    pk12file =  CertUtils.generate_pkcs12(db, srcdir, int_cert, int_key,
+    pk12file =  CertUtils.generate_pkcs12(db, db, int_cert, int_key,
                                           "int-" + prefix)
-    import_cert_and_pkcs12(int_cert, pk12file, "int-" + prefix, ",,")
+    CertUtils.import_cert_and_pkcs12(srcdir, int_cert, pk12file,
+                                     'int-' + prefix, ',,')
     import_untrusted_cert(ee_cert, prefix)
 
-
-
 generate_certs()
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-ev-valid-anypolicy-int.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-ev-valid-anypolicy-int.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-ev-valid.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-ev-valid.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-ev-valid.p12 and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-ev-valid.p12 differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-non-ev-root.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-non-ev-root.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-non-ev-root.p12 and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/int-non-ev-root.p12 differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/key3.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/key3.db differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/key4.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/key4.db differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.p12 and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.p12 differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-url-cert.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-url-cert.der differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/pkcs11.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/pkcs11.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/pkcs11.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/pkcs11.txt	2014-11-26 21:45:45.000000000 +0000
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/home/m-c_drive/mozilla-inbound/security/manager/ssl/tests/unit/test_ev_certs' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs/secmod.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs/secmod.db differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ev_certs.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ev_certs.js	2014-11-26 21:45:45.000000000 +0000
@@ -7,6 +7,10 @@
 
 // XXX: The isDebugBuild tests you see are here because the test EV root is
 // only enabled for EV in debug builds, as a security measure. An ugly hack.
+//
+// Bug 1008316: B2G doesn't have EV enabled, so EV is not expected even in debug
+// builds.
+const gEVExpected = isDebugBuild && !("@mozilla.org/b2g-process-global;1" in Cc);
 
 do_get_profile(); // must be called before getting nsIX509CertDB
 const certdb = Cc["@mozilla.org/security/x509certdb;1"]
@@ -84,9 +88,9 @@
   add_test(function () {
     clearOCSPCache();
     let ocspResponder = start_ocsp_responder(
-                          isDebugBuild ? ["int-ev-valid", "ev-valid"]
-                                       : ["ev-valid"]);
-    check_ee_for_ev("ev-valid", isDebugBuild);
+                          gEVExpected ? ["int-ev-valid", "ev-valid"]
+                                      : ["ev-valid"]);
+    check_ee_for_ev("ev-valid", gEVExpected);
     ocspResponder.stop(run_next_test);
   });
 
@@ -95,9 +99,9 @@
     clearOCSPCache();
 
     let ocspResponder = start_ocsp_responder(
-                          isDebugBuild ? ["int-ev-valid-anypolicy-int", "ev-valid-anypolicy-int"]
-                                       : ["ev-valid-anypolicy-int"]);
-    check_ee_for_ev("ev-valid-anypolicy-int", isDebugBuild);
+                          gEVExpected ? ["int-ev-valid-anypolicy-int", "ev-valid-anypolicy-int"]
+                                      : ["ev-valid-anypolicy-int"]);
+    check_ee_for_ev("ev-valid-anypolicy-int", gEVExpected);
     ocspResponder.stop(run_next_test);
   });
 
@@ -110,10 +114,8 @@
 
   add_test(function() {
     clearOCSPCache();
-    // libpkix will attempt to validate the intermediate, which does have an
-    // OCSP URL.
-    let ocspResponder = isDebugBuild ? start_ocsp_responder(["int-ev-valid"])
-                                     : failingOCSPResponder();
+    let ocspResponder = gEVExpected ? start_ocsp_responder(["int-ev-valid"])
+                                    : failingOCSPResponder();
     check_ee_for_ev("no-ocsp-url-cert", false);
     ocspResponder.stop(run_next_test);
   });
@@ -141,9 +143,9 @@
 
     clearOCSPCache();
     let ocspResponder = start_ocsp_responder(
-                          isDebugBuild ? ["int-ev-valid", "ev-valid"]
-                                       : ["ev-valid"]);
-    check_ee_for_ev("ev-valid", isDebugBuild);
+                          gEVExpected ? ["int-ev-valid", "ev-valid"]
+                                      : ["ev-valid"]);
+    check_ee_for_ev("ev-valid", gEVExpected);
     ocspResponder.stop(run_next_test);
   });
 
@@ -164,9 +166,9 @@
   add_test(function () {
     clearOCSPCache();
     let ocspResponder = start_ocsp_responder(
-                          isDebugBuild ? ["int-ev-valid", "ev-valid"]
-                                       : ["ev-valid"]);
-    check_ee_for_ev("ev-valid", isDebugBuild);
+                          gEVExpected ? ["int-ev-valid", "ev-valid"]
+                                      : ["ev-valid"]);
+    check_ee_for_ev("ev-valid", gEVExpected);
     ocspResponder.stop(function () {
       // without net it must be able to EV verify
       let failingOcspResponder = failingOCSPResponder();
@@ -178,9 +180,9 @@
 
       let error = certdb.verifyCertNow(cert, certificateUsageSSLServer,
                                        flags, verifiedChain, hasEVPolicy);
-      do_check_eq(hasEVPolicy.value, isDebugBuild);
+      do_check_eq(hasEVPolicy.value, gEVExpected);
       do_check_eq(error,
-                  isDebugBuild ? 0 : SEC_ERROR_POLICY_VALIDATION_FAILED);
+                  gEVExpected ? 0 : SEC_ERROR_POLICY_VALIDATION_FAILED);
       failingOcspResponder.stop(run_next_test);
     });
   });
@@ -190,12 +192,12 @@
     clearOCSPCache();
     let ocspResponder = startOCSPResponder(SERVER_PORT, "www.example.com", [],
                           "test_ev_certs",
-                          isDebugBuild ? ["int-ev-valid", "ev-valid"]
-                                       : ["ev-valid"],
+                          gEVExpected ? ["int-ev-valid", "ev-valid"]
+                                      : ["ev-valid"],
                           [], [],
-                          isDebugBuild ? ["longvalidityalmostold", "good"]
-                                       : ["good"]);
-    check_ee_for_ev("ev-valid", isDebugBuild);
+                          gEVExpected ? ["longvalidityalmostold", "good"]
+                                      : ["good"]);
+    check_ee_for_ev("ev-valid", gEVExpected);
     ocspResponder.stop(run_next_test);
   });
 
@@ -212,10 +214,10 @@
                               "longvalidityalmostold"];
     let ocspResponder = startOCSPResponder(SERVER_PORT, "www.example.com", [],
                           "test_ev_certs",
-                          isDebugBuild ? debugCertNickArray : ["ev-valid"],
+                          gEVExpected ? debugCertNickArray : ["ev-valid"],
                           [], [],
-                          isDebugBuild ? debugResponseArray
-                                       : ["longvalidityalmostold"]);
+                          gEVExpected ? debugResponseArray
+                                      : ["longvalidityalmostold"]);
     check_ee_for_ev("ev-valid", false);
     ocspResponder.stop(run_next_test);
   });
@@ -229,10 +231,10 @@
                               "ancientstillvalid"];
     let ocspResponder = startOCSPResponder(SERVER_PORT, "www.example.com", [],
                           "test_ev_certs",
-                          isDebugBuild ? debugCertNickArray : ["ev-valid"],
+                          gEVExpected ? debugCertNickArray : ["ev-valid"],
                           [], [],
-                          isDebugBuild ? debugResponseArray
-                                       : ["ancientstillvalid"]);
+                          gEVExpected ? debugResponseArray
+                                      : ["ancientstillvalid"]);
     check_ee_for_ev("ev-valid", false);
     ocspResponder.stop(run_next_test);
   });
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/a.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/b.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/b.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/ca.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/cert9.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/cert9.db differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/generate.py	2014-11-26 21:45:45.000000000 +0000
@@ -22,7 +22,7 @@
     [noise_file, pwd_file] = CertUtils.init_nss_db(srcdir)
     generate_ca_cert(srcdir, srcdir, noise_file, 'ca')
     generate_child_cert(srcdir, srcdir, noise_file, 'int', 'ca', False, '')
-    ocsp_url = "http://www.example.com:8080/"
+    ocsp_url = "http://www.example.com:8888/"
     generate_child_cert(srcdir, srcdir, noise_file, "a", 'int', True, ocsp_url)
     generate_child_cert(srcdir, srcdir, noise_file, "b", 'int', True, ocsp_url)
 
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.der and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/int.der differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/key4.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method/key4.db differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/test_ocsp_fetch_method.js	2014-11-26 21:45:45.000000000 +0000
@@ -13,7 +13,7 @@
 const certdb = Cc["@mozilla.org/security/x509certdb;1"]
                  .getService(Ci.nsIX509CertDB);
 
-const SERVER_PORT = 8080;
+const SERVER_PORT = 8888;
 
 function start_ocsp_responder(expectedCertNames, expectedPaths,
                               expectedMethods) {
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/tlsserver/cert9.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/tlsserver/cert9.db differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp	2014-11-26 21:45:46.000000000 +0000
@@ -60,6 +60,7 @@
   { "nsCertTypeCriticalWithExtKeyUsage.example.com", "nsCertTypeCriticalWithExtKeyUsage" },
   { "nsCertTypeCritical.example.com", "nsCertTypeCritical" },
   { "end-entity-issued-by-v1-cert.example.com", "eeIssuedByV1Cert" },
+  { "inadequate-key-size-ee.example.com", "inadequateKeySizeEE" },
   { nullptr, nullptr }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh	2014-11-26 21:45:46.000000000 +0000
@@ -307,6 +307,7 @@
 make_INT ca-used-as-end-entity 'CN=Test Intermediate used as End-Entity' testCA "-8 ca-used-as-end-entity.example.com"
 
 make_delegated badKeysizeDelegatedSigner 'CN=Bad Keysize Delegated Responder' testCA "--extKeyUsage ocspResponder -g 1008"
+make_EE inadequateKeySizeEE 'CN=Inadequate Key Size End-Entity' testINT "inadequate-key-size-ee.example.com" "-g 1008"
 
 make_EE_with_nsCertType nsCertTypeCritical 'CN=nsCertType Critical' testCA "localhost,*.example.com" "y"
 make_EE_with_nsCertType nsCertTypeNotCritical 'CN=nsCertType Not Critical' testCA "localhost,*.example.com" "n"
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/tlsserver/key4.db and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/tlsserver/key4.db differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/ssl/tests/unit/xpcshell.ini	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/ssl/tests/unit/xpcshell.ini	2014-11-26 21:45:46.000000000 +0000
@@ -70,9 +70,6 @@
 [test_cert_signatures.js]
 [test_ev_certs.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-# Bug 1008316: Test needs modification to work on B2G
-fail-if = os == "android" || buildapp == "b2g"
 [test_getchain.js]
 [test_cert_overrides.js]
 run-sequentially = hardcoded ports
@@ -94,12 +91,8 @@
 skip-if = os == "android"
 [test_ocsp_url.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_fetch_method.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
-skip-if = os == "android"
 [test_ocsp_no_hsts_upgrade.js]
 run-sequentially = hardcoded ports
 # Bug 1009158: this test times out on Android
@@ -108,9 +101,8 @@
 [test_keysize.js]
 [test_keysize_ev.js]
 run-sequentially = hardcoded ports
-# Bug 1009158: this test times out on Android
 # Bug 1008316: B2G doesn't have EV enabled
-skip-if = os == "android" || buildapp == "b2g"
+skip-if = buildapp == "b2g"
 [test_cert_chains.js]
 run-sequentially = hardcoded ports
 # Bug 1009158: this test times out on Android
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/tools/genHPKPStaticPins.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/tools/genHPKPStaticPins.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/tools/genHPKPStaticPins.js	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/tools/genHPKPStaticPins.js	2014-11-26 21:45:46.000000000 +0000
@@ -530,7 +530,9 @@
   // Compute used pins from both Chrome's and our pinsets, so we can output
   // them later.
   let usedFingerprints = {};
+  let mozillaPins = {};
   gStaticPins.pinsets.forEach(function(pinset) {
+    mozillaPins[pinset.name] = true;
     // We aren't guaranteed to have sha1_hashes in our own JSON.
     if (pinset.sha1_hashes) {
       pinset.sha1_hashes.forEach(function(name) {
@@ -573,7 +575,12 @@
   });
   writeString("/* Chrome static pinsets */\n");
   for (let key in chromeImportedPinsets) {
-    writeFullPinset(certNameToSKD, certSKDToName, chromeImportedPinsets[key]);
+    if (mozillaPins[key]) {
+      dump("Skipping duplicate pinset " + key + "\n");
+    } else {
+      dump("Writing pinset " + key + "\n");
+      writeFullPinset(certNameToSKD, certSKDToName, chromeImportedPinsets[key]);
+    }
   }
 
   // Write the domainlist entries.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/tools/KnownRootHashes.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/tools/KnownRootHashes.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/tools/KnownRootHashes.json	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/tools/KnownRootHashes.json	2014-11-26 21:45:46.000000000 +0000
@@ -773,7 +773,32 @@
       "label": "CA______",
       "binNumber": 153,
       "sha256Fingerprint": "1vA0vZSqIz8Cl+ykJFsoOXPkR6pZDzEMd/SP34MRIlQ="
+    },
+    {
+      "label": "COMODO_RSA_Certification_Authority",
+      "binNumber": 154,
+      "sha256Fingerprint": "UvDhxOWOxikpG2AxfwdGcbhdfqgNWwcnNGNTSzK0AjQ="
+    },
+    {
+      "label": "USERTrust_RSA_Certification_Authority",
+      "binNumber": 155,
+      "sha256Fingerprint": "55PJsC/YqhPiHDEiisywgRlkO3SciYlksXRtRsPUy9I="
+    },
+    {
+      "label": "USERTrust_ECC_Certification_Authority",
+      "binNumber": 156,
+      "sha256Fingerprint": "T/Rg1Uuchtq/vPxXEuBADSvtP7xNT72qhuBq3NKprXo="
+    },
+    {
+      "label": "GlobalSign",
+      "binNumber": 157,
+      "sha256Fingerprint": "vslJEcKVVnbbbApVCYbXbjugBWZ8RCyXYrT7t3PeIow="
+    },
+    {
+      "label": "GlobalSign",
+      "binNumber": 158,
+      "sha256Fingerprint": "F5+8FIo90A/STqE0WMxDv6f1nIGC14OlE/br7BAMiSQ="
     }
   ],
-  "maxBin": 153
+  "maxBin": 158
 }
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/tools/PreloadedHPKPins.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/tools/PreloadedHPKPins.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/manager/tools/PreloadedHPKPins.json	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/manager/tools/PreloadedHPKPins.json	2014-11-26 21:45:46.000000000 +0000
@@ -58,7 +58,9 @@
       "blog.torproject.org",
       "check.torproject.org",
       "dist.torproject.org",
-      "www.torproject.org"
+      "www.torproject.org",
+      // SpiderOak
+      "spideroak.com"
     ],
     "exclude_domains" : [
       // Chrome's entry for twitter.com doesn't include subdomains, so replace
@@ -126,8 +128,8 @@
         "AffirmTrust Networking",
         "AffirmTrust Premium",
         "AffirmTrust Premium ECC",
-        "America Online Root Certification Authority 1",
-        "America Online Root Certification Authority 2",
+        // "America Online Root Certification Authority 1",
+        // "America Online Root Certification Authority 2",
         "Baltimore CyberTrust Root",
         "Comodo AAA Services root",
         "COMODO Certification Authority",
@@ -170,11 +172,11 @@
         "TC TrustCenter Class 3 CA II",
         "TC TrustCenter Universal CA I",
         "TC TrustCenter Universal CA III",
-        "Thawte Premium Server CA",
+        // "Thawte Premium Server CA",
         "thawte Primary Root CA",
         "thawte Primary Root CA - G2",
         "thawte Primary Root CA - G3",
-        "Thawte Server CA",
+        // "Thawte Server CA",
         "UTN DATACorp SGC Root CA",
         "UTN USERFirst Hardware Root CA",
         // "ValiCert Class 1 VA",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/ckfw/builtins/bfind.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/ckfw/builtins/bfind.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/ckfw/builtins/bfind.c	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/ckfw/builtins/bfind.c	2014-11-26 21:45:47.000000000 +0000
@@ -183,7 +183,16 @@
   NSSArena *arena;
   NSSCKMDFindObjects *rv = (NSSCKMDFindObjects *)NULL;
   struct builtinsFOStr *fo = (struct builtinsFOStr *)NULL;
-  builtinsInternalObject **temp = (builtinsInternalObject **)NULL;
+
+  /*
+   * 99% of the time we get 0 or 1 matches. So we start with a small
+   * stack-allocated array to hold the matches and switch to a heap-allocated
+   * array later if the number of matches exceeds STACK_BUF_LENGTH.
+   */
+  #define STACK_BUF_LENGTH 1
+  builtinsInternalObject *stackTemp[STACK_BUF_LENGTH];
+  builtinsInternalObject **temp = stackTemp;
+  PRBool tempIsHeapAllocated = PR_FALSE;
   PRUint32 i;
 
   arena = NSSArena_Create();
@@ -211,17 +220,24 @@
   rv->Next = builtins_mdFindObjects_Next;
   rv->null = (void *)NULL;
 
-  temp = nss_ZNEWARRAY((NSSArena *)NULL, builtinsInternalObject *, 
-                       nss_builtins_nObjects);
-  if( (builtinsInternalObject **)NULL == temp ) {
-    *pError = CKR_HOST_MEMORY;
-    goto loser;
-  }
-
   for( i = 0; i < nss_builtins_nObjects; i++ ) {
     builtinsInternalObject *o = (builtinsInternalObject *)&nss_builtins_data[i];
 
     if( CK_TRUE == builtins_match(pTemplate, ulAttributeCount, o) ) {
+      if( fo->n == STACK_BUF_LENGTH ) {
+        /* Switch from the small stack array to a heap-allocated array large
+         * enough to handle matches in all remaining cases. */
+        temp = nss_ZNEWARRAY((NSSArena *)NULL, builtinsInternalObject *,
+                             fo->n + nss_builtins_nObjects - i);
+        if( (builtinsInternalObject **)NULL == temp ) {
+          *pError = CKR_HOST_MEMORY;
+          goto loser;
+        }
+        tempIsHeapAllocated = PR_TRUE;
+        (void)nsslibc_memcpy(temp, stackTemp,
+                             sizeof(builtinsInternalObject *) * fo->n);
+      }
+
       temp[ fo->n ] = o;
       fo->n++;
     }
@@ -234,13 +250,17 @@
   }
 
   (void)nsslibc_memcpy(fo->objs, temp, sizeof(builtinsInternalObject *) * fo->n);
-  nss_ZFreeIf(temp);
-  temp = (builtinsInternalObject **)NULL;
+  if (tempIsHeapAllocated) {
+    nss_ZFreeIf(temp);
+    temp = (builtinsInternalObject **)NULL;
+  }
 
   return rv;
 
  loser:
-  nss_ZFreeIf(temp);
+  if (tempIsHeapAllocated) {
+    nss_ZFreeIf(temp);
+  }
   nss_ZFreeIf(fo);
   nss_ZFreeIf(rv);
   if ((NSSArena *)NULL != arena) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/ckfw/builtins/certdata.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2014-11-26 21:45:47.000000000 +0000
@@ -70,421 +70,6 @@
 CKA_LABEL UTF8 "Mozilla Builtin Roots"
 
 #
-# Certificate "GTE CyberTrust Global Root"
-#
-# Issuer: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-# Serial Number: 421 (0x1a5)
-# Subject: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-# Not Valid Before: Thu Aug 13 00:29:00 1998
-# Not Valid After : Mon Aug 13 23:59:00 2018
-# Fingerprint (MD5): CA:3D:D3:68:F1:03:5C:D0:32:FA:B8:2B:59:E8:5A:DB
-# Fingerprint (SHA1): 97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GTE CyberTrust Global Root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-\141\154\040\122\157\157\164
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-\141\154\040\122\157\157\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\002\001\245
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\002\132\060\202\001\303\002\002\001\245\060\015\006\011
-\052\206\110\206\367\015\001\001\004\005\000\060\165\061\013\060
-\011\006\003\125\004\006\023\002\125\123\061\030\060\026\006\003
-\125\004\012\023\017\107\124\105\040\103\157\162\160\157\162\141
-\164\151\157\156\061\047\060\045\006\003\125\004\013\023\036\107
-\124\105\040\103\171\142\145\162\124\162\165\163\164\040\123\157
-\154\165\164\151\157\156\163\054\040\111\156\143\056\061\043\060
-\041\006\003\125\004\003\023\032\107\124\105\040\103\171\142\145
-\162\124\162\165\163\164\040\107\154\157\142\141\154\040\122\157
-\157\164\060\036\027\015\071\070\060\070\061\063\060\060\062\071
-\060\060\132\027\015\061\070\060\070\061\063\062\063\065\071\060
-\060\132\060\165\061\013\060\011\006\003\125\004\006\023\002\125
-\123\061\030\060\026\006\003\125\004\012\023\017\107\124\105\040
-\103\157\162\160\157\162\141\164\151\157\156\061\047\060\045\006
-\003\125\004\013\023\036\107\124\105\040\103\171\142\145\162\124
-\162\165\163\164\040\123\157\154\165\164\151\157\156\163\054\040
-\111\156\143\056\061\043\060\041\006\003\125\004\003\023\032\107
-\124\105\040\103\171\142\145\162\124\162\165\163\164\040\107\154
-\157\142\141\154\040\122\157\157\164\060\201\237\060\015\006\011
-\052\206\110\206\367\015\001\001\001\005\000\003\201\215\000\060
-\201\211\002\201\201\000\225\017\240\266\360\120\234\350\172\307
-\210\315\335\027\016\056\260\224\320\033\075\016\366\224\300\212
-\224\307\006\310\220\227\310\270\144\032\172\176\154\074\123\341
-\067\050\163\140\177\262\227\123\007\237\123\371\155\130\224\322
-\257\215\155\210\147\200\346\355\262\225\317\162\061\312\245\034
-\162\272\134\002\347\144\102\347\371\251\054\326\072\015\254\215
-\102\252\044\001\071\346\234\077\001\205\127\015\130\207\105\370
-\323\205\252\223\151\046\205\160\110\200\077\022\025\307\171\264
-\037\005\057\073\142\231\002\003\001\000\001\060\015\006\011\052
-\206\110\206\367\015\001\001\004\005\000\003\201\201\000\155\353
-\033\011\351\136\331\121\333\147\042\141\244\052\074\110\167\343
-\240\174\246\336\163\242\024\003\205\075\373\253\016\060\305\203
-\026\063\201\023\010\236\173\064\116\337\100\310\164\327\271\175
-\334\364\166\125\175\233\143\124\030\351\360\352\363\134\261\331
-\213\102\036\271\300\225\116\272\372\325\342\174\365\150\141\277
-\216\354\005\227\137\133\260\327\243\205\064\304\044\247\015\017
-\225\223\357\313\224\330\236\037\235\134\205\155\307\252\256\117
-\037\042\265\315\225\255\272\247\314\371\253\013\172\177
-END
-
-# Trust for Certificate "GTE CyberTrust Global Root"
-# Issuer: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-# Serial Number: 421 (0x1a5)
-# Subject: CN=GTE CyberTrust Global Root,OU="GTE CyberTrust Solutions, Inc.",O=GTE Corporation,C=US
-# Not Valid Before: Thu Aug 13 00:29:00 1998
-# Not Valid After : Mon Aug 13 23:59:00 2018
-# Fingerprint (MD5): CA:3D:D3:68:F1:03:5C:D0:32:FA:B8:2B:59:E8:5A:DB
-# Fingerprint (SHA1): 97:81:79:50:D8:1C:96:70:CC:34:D8:09:CF:79:44:31:36:7E:F4:74
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GTE CyberTrust Global Root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\227\201\171\120\330\034\226\160\314\064\330\011\317\171\104\061
-\066\176\364\164
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\312\075\323\150\361\003\134\320\062\372\270\053\131\350\132\333
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
-\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
-\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
-\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
-\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
-\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
-\141\154\040\122\157\157\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\002\001\245
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Thawte Server CA"
-#
-# Issuer: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Serial Number: 1 (0x1)
-# Subject: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Not Valid Before: Thu Aug 01 00:00:00 1996
-# Not Valid After : Thu Dec 31 23:59:59 2020
-# Fingerprint (MD5): C5:70:C4:A2:ED:53:78:0C:C8:10:53:81:64:CB:D0:1D
-# Fingerprint (SHA1): 23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Server CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124
-\150\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061
-\046\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027
-\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141
-\167\164\145\056\143\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124
-\150\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061
-\046\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027
-\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141
-\167\164\145\056\143\157\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\023\060\202\002\174\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
-\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006\003
-\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156\163
-\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003\125
-\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151\163
-\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124\150
-\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061\046
-\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027\163
-\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141\167
-\164\145\056\143\157\155\060\036\027\015\071\066\060\070\060\061
-\060\060\060\060\060\060\132\027\015\062\060\061\062\063\061\062
-\063\065\071\065\071\132\060\201\304\061\013\060\011\006\003\125
-\004\006\023\002\132\101\061\025\060\023\006\003\125\004\010\023
-\014\127\145\163\164\145\162\156\040\103\141\160\145\061\022\060
-\020\006\003\125\004\007\023\011\103\141\160\145\040\124\157\167
-\156\061\035\060\033\006\003\125\004\012\023\024\124\150\141\167
-\164\145\040\103\157\156\163\165\154\164\151\156\147\040\143\143
-\061\050\060\046\006\003\125\004\013\023\037\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143\145
-\163\040\104\151\166\151\163\151\157\156\061\031\060\027\006\003
-\125\004\003\023\020\124\150\141\167\164\145\040\123\145\162\166
-\145\162\040\103\101\061\046\060\044\006\011\052\206\110\206\367
-\015\001\011\001\026\027\163\145\162\166\145\162\055\143\145\162
-\164\163\100\164\150\141\167\164\145\056\143\157\155\060\201\237
-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
-\201\215\000\060\201\211\002\201\201\000\323\244\120\156\310\377
-\126\153\346\317\135\266\352\014\150\165\107\242\252\302\332\204
-\045\374\250\364\107\121\332\205\265\040\164\224\206\036\017\165
-\311\351\010\141\365\006\155\060\156\025\031\002\351\122\300\142
-\333\115\231\236\342\152\014\104\070\315\376\276\343\144\011\160
-\305\376\261\153\051\266\057\111\310\073\324\047\004\045\020\227
-\057\347\220\155\300\050\102\231\327\114\103\336\303\365\041\155
-\124\237\135\303\130\341\300\344\331\133\260\270\334\264\173\337
-\066\072\302\265\146\042\022\326\207\015\002\003\001\000\001\243
-\023\060\021\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\015\006\011\052\206\110\206\367\015\001\001
-\004\005\000\003\201\201\000\007\372\114\151\134\373\225\314\106
-\356\205\203\115\041\060\216\312\331\250\157\111\032\346\332\121
-\343\140\160\154\204\141\021\241\032\310\110\076\131\103\175\117
-\225\075\241\213\267\013\142\230\172\165\212\335\210\116\116\236
-\100\333\250\314\062\164\271\157\015\306\343\263\104\013\331\212
-\157\232\051\233\231\030\050\073\321\343\100\050\232\132\074\325
-\265\347\040\033\213\312\244\253\215\351\121\331\342\114\054\131
-\251\332\271\262\165\033\366\102\362\357\307\362\030\371\211\274
-\243\377\212\043\056\160\107
-END
-
-# Trust for Certificate "Thawte Server CA"
-# Issuer: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Serial Number: 1 (0x1)
-# Subject: E=server-certs@thawte.com,CN=Thawte Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Not Valid Before: Thu Aug 01 00:00:00 1996
-# Not Valid After : Thu Dec 31 23:59:59 2020
-# Fingerprint (MD5): C5:70:C4:A2:ED:53:78:0C:C8:10:53:81:64:CB:D0:1D
-# Fingerprint (SHA1): 23:E5:94:94:51:95:F2:41:48:03:B4:D5:64:D2:A3:A3:F5:D8:8B:8C
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Server CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\043\345\224\224\121\225\362\101\110\003\264\325\144\322\243\243
-\365\330\213\214
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\305\160\304\242\355\123\170\014\310\020\123\201\144\313\320\035
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\304\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\031\060\027\006\003\125\004\003\023\020\124
-\150\141\167\164\145\040\123\145\162\166\145\162\040\103\101\061
-\046\060\044\006\011\052\206\110\206\367\015\001\011\001\026\027
-\163\145\162\166\145\162\055\143\145\162\164\163\100\164\150\141
-\167\164\145\056\143\157\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Thawte Premium Server CA"
-#
-# Issuer: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Serial Number: 1 (0x1)
-# Subject: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Not Valid Before: Thu Aug 01 00:00:00 1996
-# Not Valid After : Thu Dec 31 23:59:59 2020
-# Fingerprint (MD5): 06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A
-# Fingerprint (SHA1): 62:7F:8D:78:27:65:63:99:D2:7D:7F:90:44:C9:FE:B3:F3:3E:FA:9A
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Premium Server CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\047\060\202\002\220\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
-\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006\003
-\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156\163
-\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003\125
-\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151\163
-\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124\150
-\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145\162
-\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110\206
-\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055\163
-\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157\155
-\060\036\027\015\071\066\060\070\060\061\060\060\060\060\060\060
-\132\027\015\062\060\061\062\063\061\062\063\065\071\065\071\132
-\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-\155\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001
-\001\005\000\003\201\215\000\060\201\211\002\201\201\000\322\066
-\066\152\213\327\302\133\236\332\201\101\142\217\070\356\111\004
-\125\326\320\357\034\033\225\026\107\357\030\110\065\072\122\364
-\053\152\006\217\073\057\352\126\343\257\206\215\236\027\367\236
-\264\145\165\002\115\357\313\011\242\041\121\330\233\320\147\320
-\272\015\222\006\024\163\324\223\313\227\052\000\234\134\116\014
-\274\372\025\122\374\362\104\156\332\021\112\156\010\237\057\055
-\343\371\252\072\206\163\266\106\123\130\310\211\005\275\203\021
-\270\163\077\252\007\215\364\102\115\347\100\235\034\067\002\003
-\001\000\001\243\023\060\021\060\017\006\003\125\035\023\001\001
-\377\004\005\060\003\001\001\377\060\015\006\011\052\206\110\206
-\367\015\001\001\004\005\000\003\201\201\000\046\110\054\026\302
-\130\372\350\026\164\014\252\252\137\124\077\362\327\311\170\140
-\136\136\156\067\143\042\167\066\176\262\027\304\064\271\365\010
-\205\374\311\001\070\377\115\276\362\026\102\103\347\273\132\106
-\373\301\306\021\037\361\112\260\050\106\311\303\304\102\175\274
-\372\253\131\156\325\267\121\210\021\343\244\205\031\153\202\114
-\244\014\022\255\351\244\256\077\361\303\111\145\232\214\305\310
-\076\045\267\224\231\273\222\062\161\007\360\206\136\355\120\047
-\246\015\246\043\371\273\313\246\007\024\102
-END
-
-# Trust for Certificate "Thawte Premium Server CA"
-# Issuer: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Serial Number: 1 (0x1)
-# Subject: E=premium-server@thawte.com,CN=Thawte Premium Server CA,OU=Certification Services Division,O=Thawte Consulting cc,L=Cape Town,ST=Western Cape,C=ZA
-# Not Valid Before: Thu Aug 01 00:00:00 1996
-# Not Valid After : Thu Dec 31 23:59:59 2020
-# Fingerprint (MD5): 06:9F:69:79:16:66:90:02:1B:8C:8C:A2:C3:07:6F:3A
-# Fingerprint (SHA1): 62:7F:8D:78:27:65:63:99:D2:7D:7F:90:44:C9:FE:B3:F3:3E:FA:9A
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Premium Server CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\142\177\215\170\047\145\143\231\322\175\177\220\104\311\376\263
-\363\076\372\232
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\006\237\151\171\026\146\220\002\033\214\214\242\303\007\157\072
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\316\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\035\060\033\006
-\003\125\004\012\023\024\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\040\143\143\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\041\060\037\006\003\125\004\003\023\030\124
-\150\141\167\164\145\040\120\162\145\155\151\165\155\040\123\145
-\162\166\145\162\040\103\101\061\050\060\046\006\011\052\206\110
-\206\367\015\001\011\001\026\031\160\162\145\155\151\165\155\055
-\163\145\162\166\145\162\100\164\150\141\167\164\145\056\143\157
-\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
 # Certificate "Equifax Secure CA"
 #
 # Issuer: OU=Equifax Secure Certificate Authority,O=Equifax,C=US
@@ -1433,9 +1018,9 @@
 \002\020\175\331\376\007\317\250\036\267\020\171\147\373\247\211
 \064\306
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
@@ -2988,9 +2573,9 @@
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
 \002\001\004
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
@@ -4603,312 +4188,6 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "America Online Root Certification Authority 1"
-#
-# Issuer: CN=America Online Root Certification Authority 1,O=America Online Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=America Online Root Certification Authority 1,O=America Online Inc.,C=US
-# Not Valid Before: Tue May 28 06:00:00 2002
-# Not Valid After : Thu Nov 19 20:43:00 2037
-# Fingerprint (MD5): 14:F1:08:AD:9D:FA:64:E2:89:E7:1C:CF:A8:AD:7D:5E
-# Fingerprint (SHA1): 39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "America Online Root Certification Authority 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060
-\064\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040
-\117\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060
-\064\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040
-\117\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\244\060\202\002\214\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061\034
-\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143\141
-\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060\064
-\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040\117
-\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\040\061\060\036\027\015\060\062\060\065\062\070\060\066
-\060\060\060\060\132\027\015\063\067\061\061\061\071\062\060\064
-\063\060\060\132\060\143\061\013\060\011\006\003\125\004\006\023
-\002\125\123\061\034\060\032\006\003\125\004\012\023\023\101\155
-\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156\143
-\056\061\066\060\064\006\003\125\004\003\023\055\101\155\145\162
-\151\143\141\040\117\156\154\151\156\145\040\122\157\157\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\040\061\060\202\001\042\060\015\006
-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017
-\000\060\202\001\012\002\202\001\001\000\250\057\350\244\151\006
-\003\107\303\351\052\230\377\031\242\160\232\306\120\262\176\245
-\337\150\115\033\174\017\266\227\150\175\055\246\213\227\351\144
-\206\311\243\357\240\206\277\140\145\234\113\124\210\302\110\305
-\112\071\277\024\343\131\125\345\031\264\164\310\264\005\071\134
-\026\245\342\225\005\340\022\256\131\213\242\063\150\130\034\246
-\324\025\267\330\237\327\334\161\253\176\232\277\233\216\063\017
-\042\375\037\056\347\007\066\357\142\071\305\335\313\272\045\024
-\043\336\014\306\075\074\316\202\010\346\146\076\332\121\073\026
-\072\243\005\177\240\334\207\325\234\374\162\251\240\175\170\344
-\267\061\125\036\145\273\324\141\260\041\140\355\020\062\162\305
-\222\045\036\370\220\112\030\170\107\337\176\060\067\076\120\033
-\333\034\323\153\232\206\123\007\260\357\254\006\170\370\204\231
-\376\041\215\114\200\266\014\202\366\146\160\171\032\323\117\243
-\317\361\317\106\260\113\017\076\335\210\142\270\214\251\011\050
-\073\172\307\227\341\036\345\364\237\300\300\256\044\240\310\241
-\331\017\326\173\046\202\151\062\075\247\002\003\001\000\001\243
-\143\060\141\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\000
-\255\331\243\366\171\366\156\164\251\177\063\075\201\027\327\114
-\317\063\336\060\037\006\003\125\035\043\004\030\060\026\200\024
-\000\255\331\243\366\171\366\156\164\251\177\063\075\201\027\327
-\114\317\063\336\060\016\006\003\125\035\017\001\001\377\004\004
-\003\002\001\206\060\015\006\011\052\206\110\206\367\015\001\001
-\005\005\000\003\202\001\001\000\174\212\321\037\030\067\202\340
-\270\260\243\355\126\225\310\142\141\234\005\242\315\302\142\046
-\141\315\020\026\327\314\264\145\064\320\021\212\255\250\251\005
-\146\357\164\363\155\137\235\231\257\366\213\373\353\122\262\005
-\230\242\157\052\305\124\275\045\275\137\256\310\206\352\106\054
-\301\263\275\301\351\111\160\030\026\227\010\023\214\040\340\033
-\056\072\107\313\036\344\000\060\225\133\364\105\243\300\032\260
-\001\116\253\275\300\043\156\143\077\200\112\305\007\355\334\342
-\157\307\301\142\361\343\162\326\004\310\164\147\013\372\210\253
-\241\001\310\157\360\024\257\322\231\315\121\223\176\355\056\070
-\307\275\316\106\120\075\162\343\171\045\235\233\210\053\020\040
-\335\245\270\062\237\215\340\051\337\041\164\206\202\333\057\202
-\060\306\307\065\206\263\371\226\137\106\333\014\105\375\363\120
-\303\157\306\303\110\255\106\246\341\047\107\012\035\016\233\266
-\302\167\177\143\362\340\175\032\276\374\340\337\327\307\247\154
-\260\371\256\272\074\375\164\264\021\350\130\015\200\274\323\250
-\200\072\231\355\165\314\106\173
-END
-
-# Trust for Certificate "America Online Root Certification Authority 1"
-# Issuer: CN=America Online Root Certification Authority 1,O=America Online Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=America Online Root Certification Authority 1,O=America Online Inc.,C=US
-# Not Valid Before: Tue May 28 06:00:00 2002
-# Not Valid After : Thu Nov 19 20:43:00 2037
-# Fingerprint (MD5): 14:F1:08:AD:9D:FA:64:E2:89:E7:1C:CF:A8:AD:7D:5E
-# Fingerprint (SHA1): 39:21:C1:15:C1:5D:0E:CA:5C:CB:5B:C4:F0:7D:21:D8:05:0B:56:6A
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "America Online Root Certification Authority 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\071\041\301\025\301\135\016\312\134\313\133\304\360\175\041\330
-\005\013\126\152
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\024\361\010\255\235\372\144\342\211\347\034\317\250\255\175\136
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060
-\064\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040
-\117\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "America Online Root Certification Authority 2"
-#
-# Issuer: CN=America Online Root Certification Authority 2,O=America Online Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=America Online Root Certification Authority 2,O=America Online Inc.,C=US
-# Not Valid Before: Tue May 28 06:00:00 2002
-# Not Valid After : Tue Sep 29 14:08:00 2037
-# Fingerprint (MD5): D6:ED:3C:CA:E2:66:0F:AF:10:43:0D:77:9B:04:09:BF
-# Fingerprint (SHA1): 85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "America Online Root Certification Authority 2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060
-\064\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040
-\117\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060
-\064\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040
-\117\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\244\060\202\003\214\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061\034
-\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143\141
-\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060\064
-\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040\117
-\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\040\062\060\036\027\015\060\062\060\065\062\070\060\066
-\060\060\060\060\132\027\015\063\067\060\071\062\071\061\064\060
-\070\060\060\132\060\143\061\013\060\011\006\003\125\004\006\023
-\002\125\123\061\034\060\032\006\003\125\004\012\023\023\101\155
-\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156\143
-\056\061\066\060\064\006\003\125\004\003\023\055\101\155\145\162
-\151\143\141\040\117\156\154\151\156\145\040\122\157\157\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\040\062\060\202\002\042\060\015\006
-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017
-\000\060\202\002\012\002\202\002\001\000\314\101\105\035\351\075
-\115\020\366\214\261\101\311\340\136\313\015\267\277\107\163\323
-\360\125\115\335\306\014\372\261\146\005\152\315\170\264\334\002
-\333\116\201\363\327\247\174\161\274\165\143\240\135\343\007\014
-\110\354\045\304\003\040\364\377\016\073\022\377\233\215\341\306
-\325\033\264\155\042\343\261\333\177\041\144\257\206\274\127\042
-\052\326\107\201\127\104\202\126\123\275\206\024\001\013\374\177
-\164\244\132\256\361\272\021\265\233\130\132\200\264\067\170\011
-\063\174\062\107\003\134\304\245\203\110\364\127\126\156\201\066
-\047\030\117\354\233\050\302\324\264\327\174\014\076\014\053\337
-\312\004\327\306\216\352\130\116\250\244\245\030\034\154\105\230
-\243\101\321\055\322\307\155\215\031\361\255\171\267\201\077\275
-\006\202\047\055\020\130\005\265\170\005\271\057\333\014\153\220
-\220\176\024\131\070\273\224\044\023\345\321\235\024\337\323\202
-\115\106\360\200\071\122\062\017\343\204\262\172\103\362\136\336
-\137\077\035\335\343\262\033\240\241\052\043\003\156\056\001\025
-\207\134\246\165\165\307\227\141\276\336\206\334\324\110\333\275
-\052\277\112\125\332\350\175\120\373\264\200\027\270\224\277\001
-\075\352\332\272\174\340\130\147\027\271\130\340\210\206\106\147
-\154\235\020\107\130\062\320\065\174\171\052\220\242\132\020\021
-\043\065\255\057\314\344\112\133\247\310\047\362\203\336\136\273
-\136\167\347\350\245\156\143\302\015\135\141\320\214\322\154\132
-\041\016\312\050\243\316\052\351\225\307\110\317\226\157\035\222
-\045\310\306\306\301\301\014\005\254\046\304\322\165\322\341\052
-\147\300\075\133\245\232\353\317\173\032\250\235\024\105\345\017
-\240\232\145\336\057\050\275\316\157\224\146\203\110\051\330\352
-\145\214\257\223\331\144\237\125\127\046\277\157\313\067\061\231
-\243\140\273\034\255\211\064\062\142\270\103\041\006\162\014\241
-\134\155\106\305\372\051\317\060\336\211\334\161\133\335\266\067
-\076\337\120\365\270\007\045\046\345\274\265\376\074\002\263\267
-\370\276\103\301\207\021\224\236\043\154\027\212\270\212\047\014
-\124\107\360\251\263\300\200\214\240\047\353\035\031\343\007\216
-\167\160\312\053\364\175\166\340\170\147\002\003\001\000\001\243
-\143\060\141\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\115
-\105\301\150\070\273\163\251\151\241\040\347\355\365\042\241\043
-\024\327\236\060\037\006\003\125\035\043\004\030\060\026\200\024
-\115\105\301\150\070\273\163\251\151\241\040\347\355\365\042\241
-\043\024\327\236\060\016\006\003\125\035\017\001\001\377\004\004
-\003\002\001\206\060\015\006\011\052\206\110\206\367\015\001\001
-\005\005\000\003\202\002\001\000\147\153\006\271\137\105\073\052
-\113\063\263\346\033\153\131\116\042\314\271\267\244\045\311\247
-\304\360\124\226\013\144\363\261\130\117\136\121\374\262\227\173
-\047\145\302\345\312\347\015\014\045\173\142\343\372\237\264\207
-\267\105\106\257\203\245\227\110\214\245\275\361\026\053\233\166
-\054\172\065\140\154\021\200\227\314\251\222\122\346\053\346\151
-\355\251\370\066\055\054\167\277\141\110\321\143\013\271\133\122
-\355\030\260\103\102\042\246\261\167\256\336\151\305\315\307\034
-\241\261\245\034\020\373\030\276\032\160\335\301\222\113\276\051
-\132\235\077\065\276\345\175\121\370\125\340\045\165\043\207\036
-\134\334\272\235\260\254\263\151\333\027\203\311\367\336\014\274
-\010\334\221\236\250\320\327\025\067\163\245\065\270\374\176\305
-\104\100\006\303\353\370\042\200\134\107\316\002\343\021\237\104
-\377\375\232\062\314\175\144\121\016\353\127\046\166\072\343\036
-\042\074\302\246\066\335\031\357\247\374\022\363\046\300\131\061
-\205\114\234\330\317\337\244\314\314\051\223\377\224\155\166\134
-\023\010\227\362\355\245\013\115\335\350\311\150\016\146\323\000
-\016\063\022\133\274\225\345\062\220\250\263\306\154\203\255\167
-\356\213\176\176\261\251\253\323\341\361\266\300\261\352\210\300
-\347\323\220\351\050\222\224\173\150\173\227\052\012\147\055\205
-\002\070\020\344\003\141\324\332\045\066\307\010\130\055\241\247
-\121\257\060\012\111\365\246\151\207\007\055\104\106\166\216\052
-\345\232\073\327\030\242\374\234\070\020\314\306\073\322\265\027
-\072\157\375\256\045\275\365\162\131\144\261\164\052\070\137\030
-\114\337\317\161\004\132\066\324\277\057\231\234\350\331\272\261
-\225\346\002\113\041\241\133\325\301\117\217\256\151\155\123\333
-\001\223\265\134\036\030\335\144\132\312\030\050\076\143\004\021
-\375\034\215\000\017\270\067\337\147\212\235\146\251\002\152\221
-\377\023\312\057\135\203\274\207\223\154\334\044\121\026\004\045
-\146\372\263\331\302\272\051\276\232\110\070\202\231\364\277\073
-\112\061\031\371\277\216\041\063\024\312\117\124\137\373\316\373
-\217\161\177\375\136\031\240\017\113\221\270\304\124\274\006\260
-\105\217\046\221\242\216\376\251
-END
-
-# Trust for Certificate "America Online Root Certification Authority 2"
-# Issuer: CN=America Online Root Certification Authority 2,O=America Online Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=America Online Root Certification Authority 2,O=America Online Inc.,C=US
-# Not Valid Before: Tue May 28 06:00:00 2002
-# Not Valid After : Tue Sep 29 14:08:00 2037
-# Fingerprint (MD5): D6:ED:3C:CA:E2:66:0F:AF:10:43:0D:77:9B:04:09:BF
-# Fingerprint (SHA1): 85:B5:FF:67:9B:0C:79:96:1F:C8:6E:44:22:00:46:13:DB:17:92:84
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "America Online Root Certification Authority 2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\205\265\377\147\233\014\171\226\037\310\156\104\042\000\106\023
-\333\027\222\204
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\326\355\074\312\342\146\017\257\020\103\015\167\233\004\011\277
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\143\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\034\060\032\006\003\125\004\012\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\066\060
-\064\006\003\125\004\003\023\055\101\155\145\162\151\143\141\040
-\117\156\154\151\156\145\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
 # Certificate "Visa eCommerce Root"
 #
 # Issuer: CN=Visa eCommerce Root,OU=Visa International Service Association,O=VISA,C=US
@@ -29995,24 +29274,733 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "USERTrust-temporary-intermediate-after-1024bit-removal"
+# Certificate "COMODO RSA Certification Authority"
 #
-# Issuer: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE
-# Serial Number:5d:20:61:8e:8c:0e:b9:34:40:93:b9:b1:d8:63:95:b6
-# Subject: CN=USERTrust Legacy Secure Server CA,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
-# Not Valid Before: Tue Aug 05 00:00:00 2014
-# Not Valid After : Sun Nov 01 23:59:59 2015
-# Fingerprint (SHA-256): 92:96:6E:83:44:D2:FB:3A:28:0E:B8:60:4D:81:40:77:4C:E1:A0:57:C5:82:BE:BC:83:4D:03:02:E8:59:BC:43
-# Fingerprint (SHA1): 7C:2F:91:E2:BB:96:68:A9:C6:F6:BD:10:19:2C:6B:52:5A:1B:BA:48
+# Issuer: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Serial Number:4c:aa:f9:ca:db:63:6f:e0:1f:f7:4e:d8:5b:03:86:9d
+# Subject: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Not Valid Before: Tue Jan 19 00:00:00 2010
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (SHA-256): 52:F0:E1:C4:E5:8E:C6:29:29:1B:60:31:7F:07:46:71:B8:5D:7E:A8:0D:5B:07:27:34:63:53:4B:32:B4:02:34
+# Fingerprint (SHA1): AF:E5:D2:44:A8:D1:19:42:30:FF:47:9F:E2:F8:97:BB:CD:7A:8C:B4
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "USERTrust-temporary-intermediate-after-1024bit-removal"
+CKA_LABEL UTF8 "COMODO RSA Certification Authority"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\177\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
+\003\125\004\003\023\042\103\117\115\117\104\117\040\122\123\101
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
+\003\125\004\003\023\042\103\117\115\117\104\117\040\122\123\101
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\114\252\371\312\333\143\157\340\037\367\116\330\133\003
+\206\235
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\330\060\202\003\300\240\003\002\001\002\002\020\114
+\252\371\312\333\143\157\340\037\367\116\330\133\003\206\235\060
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\201
+\205\061\013\060\011\006\003\125\004\006\023\002\107\102\061\033
+\060\031\006\003\125\004\010\023\022\107\162\145\141\164\145\162
+\040\115\141\156\143\150\145\163\164\145\162\061\020\060\016\006
+\003\125\004\007\023\007\123\141\154\146\157\162\144\061\032\060
+\030\006\003\125\004\012\023\021\103\117\115\117\104\117\040\103
+\101\040\114\151\155\151\164\145\144\061\053\060\051\006\003\125
+\004\003\023\042\103\117\115\117\104\117\040\122\123\101\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\060\036\027\015\061\060\060\061\061\071
+\060\060\060\060\060\060\132\027\015\063\070\060\061\061\070\062
+\063\065\071\065\071\132\060\201\205\061\013\060\011\006\003\125
+\004\006\023\002\107\102\061\033\060\031\006\003\125\004\010\023
+\022\107\162\145\141\164\145\162\040\115\141\156\143\150\145\163
+\164\145\162\061\020\060\016\006\003\125\004\007\023\007\123\141
+\154\146\157\162\144\061\032\060\030\006\003\125\004\012\023\021
+\103\117\115\117\104\117\040\103\101\040\114\151\155\151\164\145
+\144\061\053\060\051\006\003\125\004\003\023\042\103\117\115\117
+\104\117\040\122\123\101\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\202
+\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\221
+\350\124\222\322\012\126\261\254\015\044\335\305\317\104\147\164
+\231\053\067\243\175\043\160\000\161\274\123\337\304\372\052\022
+\217\113\177\020\126\275\237\160\162\267\141\177\311\113\017\027
+\247\075\343\260\004\141\356\377\021\227\307\364\206\076\012\372
+\076\134\371\223\346\064\172\331\024\153\347\234\263\205\240\202
+\172\166\257\161\220\327\354\375\015\372\234\154\372\337\260\202
+\364\024\176\371\276\304\246\057\117\177\231\177\265\374\147\103
+\162\275\014\000\326\211\353\153\054\323\355\217\230\034\024\253
+\176\345\343\156\374\330\250\344\222\044\332\103\153\142\270\125
+\375\352\301\274\154\266\213\363\016\215\232\344\233\154\151\231
+\370\170\110\060\105\325\255\341\015\074\105\140\374\062\226\121
+\047\274\147\303\312\056\266\153\352\106\307\307\040\240\261\037
+\145\336\110\010\272\244\116\251\362\203\106\067\204\353\350\314
+\201\110\103\147\116\162\052\233\134\275\114\033\050\212\134\042
+\173\264\253\230\331\356\340\121\203\303\011\106\116\155\076\231
+\372\225\027\332\174\063\127\101\074\215\121\355\013\266\134\257
+\054\143\032\337\127\310\077\274\351\135\304\233\257\105\231\342
+\243\132\044\264\272\251\126\075\317\157\252\377\111\130\276\360
+\250\377\364\270\255\351\067\373\272\270\364\013\072\371\350\103
+\102\036\211\330\204\313\023\361\331\273\341\211\140\270\214\050
+\126\254\024\035\234\012\347\161\353\317\016\335\075\251\226\241
+\110\275\074\367\257\265\015\042\114\300\021\201\354\126\073\366
+\323\242\342\133\267\262\004\042\122\225\200\223\151\350\216\114
+\145\361\221\003\055\160\164\002\352\213\147\025\051\151\122\002
+\273\327\337\120\152\125\106\277\240\243\050\141\177\160\320\303
+\242\252\054\041\252\107\316\050\234\006\105\166\277\202\030\047
+\264\325\256\264\313\120\346\153\364\114\206\161\060\351\246\337
+\026\206\340\330\377\100\335\373\320\102\210\177\243\063\072\056
+\134\036\101\021\201\143\316\030\161\153\053\354\246\212\267\061
+\134\072\152\107\340\303\171\131\326\040\032\257\362\152\230\252
+\162\274\127\112\322\113\235\273\020\374\260\114\101\345\355\035
+\075\136\050\235\234\314\277\263\121\332\247\107\345\204\123\002
+\003\001\000\001\243\102\060\100\060\035\006\003\125\035\016\004
+\026\004\024\273\257\176\002\075\372\246\361\074\204\216\255\356
+\070\230\354\331\062\062\324\060\016\006\003\125\035\017\001\001
+\377\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001
+\377\004\005\060\003\001\001\377\060\015\006\011\052\206\110\206
+\367\015\001\001\014\005\000\003\202\002\001\000\012\361\325\106
+\204\267\256\121\273\154\262\115\101\024\000\223\114\234\313\345
+\300\124\317\240\045\216\002\371\375\260\242\015\365\040\230\074
+\023\055\254\126\242\260\326\176\021\222\351\056\272\236\056\232
+\162\261\275\031\104\154\141\065\242\232\264\026\022\151\132\214
+\341\327\076\244\032\350\057\003\364\256\141\035\020\033\052\244
+\213\172\305\376\005\246\341\300\326\310\376\236\256\217\053\272
+\075\231\370\330\163\011\130\106\156\246\234\364\327\047\323\225
+\332\067\203\162\034\323\163\340\242\107\231\003\070\135\325\111
+\171\000\051\034\307\354\233\040\034\007\044\151\127\170\262\071
+\374\072\204\240\265\234\174\215\277\056\223\142\047\267\071\332
+\027\030\256\275\074\011\150\377\204\233\074\325\326\013\003\343
+\127\236\024\367\321\353\117\310\275\207\043\267\266\111\103\171
+\205\134\272\353\222\013\241\306\350\150\250\114\026\261\032\231
+\012\350\123\054\222\273\241\011\030\165\014\145\250\173\313\043
+\267\032\302\050\205\303\033\377\320\053\142\357\244\173\011\221
+\230\147\214\024\001\315\150\006\152\143\041\165\003\200\210\212
+\156\201\306\205\362\251\244\055\347\364\245\044\020\107\203\312
+\315\364\215\171\130\261\006\233\347\032\052\331\235\001\327\224
+\175\355\003\112\312\360\333\350\251\001\076\365\126\231\311\036
+\216\111\075\273\345\011\271\340\117\111\222\075\026\202\100\314
+\314\131\306\346\072\355\022\056\151\074\154\225\261\375\252\035
+\173\177\206\276\036\016\062\106\373\373\023\217\165\177\114\213
+\113\106\143\376\000\064\100\160\301\303\271\241\335\246\160\342
+\004\263\101\274\351\200\221\352\144\234\172\341\042\003\251\234
+\156\157\016\145\117\154\207\207\136\363\156\240\371\165\245\233
+\100\350\123\262\047\235\112\271\300\167\041\215\377\207\362\336
+\274\214\357\027\337\267\111\013\321\362\156\060\013\032\016\116
+\166\355\021\374\365\351\126\262\175\277\307\155\012\223\214\245
+\320\300\266\035\276\072\116\224\242\327\156\154\013\302\212\174
+\372\040\363\304\344\345\315\015\250\313\221\222\261\174\205\354
+\265\024\151\146\016\202\347\315\316\310\055\246\121\177\041\301
+\065\123\205\006\112\135\237\255\273\033\137\164
+END
+
+# Trust for "COMODO RSA Certification Authority"
+# Issuer: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Serial Number:4c:aa:f9:ca:db:63:6f:e0:1f:f7:4e:d8:5b:03:86:9d
+# Subject: CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Not Valid Before: Tue Jan 19 00:00:00 2010
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (SHA-256): 52:F0:E1:C4:E5:8E:C6:29:29:1B:60:31:7F:07:46:71:B8:5D:7E:A8:0D:5B:07:27:34:63:53:4B:32:B4:02:34
+# Fingerprint (SHA1): AF:E5:D2:44:A8:D1:19:42:30:FF:47:9F:E2:F8:97:BB:CD:7A:8C:B4
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "COMODO RSA Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\257\345\322\104\250\321\031\102\060\377\107\237\342\370\227\273
+\315\172\214\264
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\033\061\260\161\100\066\314\024\066\221\255\304\076\375\354\030
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
+\003\125\004\003\023\042\103\117\115\117\104\117\040\122\123\101
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\114\252\371\312\333\143\157\340\037\367\116\330\133\003
+\206\235
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "USERTrust RSA Certification Authority"
+#
+# Issuer: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Serial Number:01:fd:6d:30:fc:a3:ca:51:a8:1b:bc:64:0e:35:03:2d
+# Subject: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Not Valid Before: Mon Feb 01 00:00:00 2010
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (SHA-256): E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2
+# Fingerprint (SHA1): 2B:8F:1B:57:33:0D:BB:A2:D0:7A:6C:51:F7:0E:E9:0D:DA:B9:AD:8E
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "USERTrust RSA Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\023\060\021\006\003\125\004\010\023\012\116\145\167\040\112
+\145\162\163\145\171\061\024\060\022\006\003\125\004\007\023\013
+\112\145\162\163\145\171\040\103\151\164\171\061\036\060\034\006
+\003\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122
+\125\123\124\040\116\145\164\167\157\162\153\061\056\060\054\006
+\003\125\004\003\023\045\125\123\105\122\124\162\165\163\164\040
+\122\123\101\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\023\060\021\006\003\125\004\010\023\012\116\145\167\040\112
+\145\162\163\145\171\061\024\060\022\006\003\125\004\007\023\013
+\112\145\162\163\145\171\040\103\151\164\171\061\036\060\034\006
+\003\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122
+\125\123\124\040\116\145\164\167\157\162\153\061\056\060\054\006
+\003\125\004\003\023\045\125\123\105\122\124\162\165\163\164\040
+\122\123\101\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\001\375\155\060\374\243\312\121\250\033\274\144\016\065
+\003\055
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\336\060\202\003\306\240\003\002\001\002\002\020\001
+\375\155\060\374\243\312\121\250\033\274\144\016\065\003\055\060
+\015\006\011\052\206\110\206\367\015\001\001\014\005\000\060\201
+\210\061\013\060\011\006\003\125\004\006\023\002\125\123\061\023
+\060\021\006\003\125\004\010\023\012\116\145\167\040\112\145\162
+\163\145\171\061\024\060\022\006\003\125\004\007\023\013\112\145
+\162\163\145\171\040\103\151\164\171\061\036\060\034\006\003\125
+\004\012\023\025\124\150\145\040\125\123\105\122\124\122\125\123
+\124\040\116\145\164\167\157\162\153\061\056\060\054\006\003\125
+\004\003\023\045\125\123\105\122\124\162\165\163\164\040\122\123
+\101\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\060\036\027\015\061\060\060
+\062\060\061\060\060\060\060\060\060\132\027\015\063\070\060\061
+\061\070\062\063\065\071\065\071\132\060\201\210\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\023\060\021\006\003\125
+\004\010\023\012\116\145\167\040\112\145\162\163\145\171\061\024
+\060\022\006\003\125\004\007\023\013\112\145\162\163\145\171\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\056\060\054\006\003\125\004\003\023\045\125
+\123\105\122\124\162\165\163\164\040\122\123\101\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\060\202\002\042\060\015\006\011\052\206\110\206
+\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002\012
+\002\202\002\001\000\200\022\145\027\066\016\303\333\010\263\320
+\254\127\015\166\355\315\047\323\114\255\120\203\141\342\252\040
+\115\011\055\144\011\334\316\211\237\314\075\251\354\366\317\301
+\334\361\323\261\326\173\067\050\021\053\107\332\071\306\274\072
+\031\264\137\246\275\175\235\243\143\102\266\166\362\251\073\053
+\221\370\342\157\320\354\026\040\220\011\076\342\350\164\311\030
+\264\221\324\142\144\333\177\243\006\361\210\030\152\220\042\074
+\274\376\023\360\207\024\173\366\344\037\216\324\344\121\306\021
+\147\106\010\121\313\206\024\124\077\274\063\376\176\154\234\377
+\026\235\030\275\121\216\065\246\247\146\310\162\147\333\041\146
+\261\324\233\170\003\300\120\072\350\314\360\334\274\236\114\376
+\257\005\226\065\037\127\132\267\377\316\371\075\267\054\266\366
+\124\335\310\347\022\072\115\256\114\212\267\134\232\264\267\040
+\075\312\177\042\064\256\176\073\150\146\001\104\347\001\116\106
+\123\233\063\140\367\224\276\123\067\220\163\103\363\062\303\123
+\357\333\252\376\164\116\151\307\153\214\140\223\336\304\307\014
+\337\341\062\256\314\223\073\121\170\225\147\213\356\075\126\376
+\014\320\151\017\033\017\363\045\046\153\063\155\367\156\107\372
+\163\103\345\176\016\245\146\261\051\174\062\204\143\125\211\304
+\015\301\223\124\060\031\023\254\323\175\067\247\353\135\072\154
+\065\134\333\101\327\022\332\251\111\013\337\330\200\212\011\223
+\142\216\265\146\317\045\210\315\204\270\261\077\244\071\017\331
+\002\236\353\022\114\225\174\363\153\005\251\136\026\203\314\270
+\147\342\350\023\235\314\133\202\323\114\263\355\133\377\336\345
+\163\254\043\073\055\000\277\065\125\164\011\111\330\111\130\032
+\177\222\066\346\121\222\016\363\046\175\034\115\027\274\311\354
+\103\046\320\277\101\137\100\251\104\104\364\231\347\127\207\236
+\120\037\127\124\250\076\375\164\143\057\261\120\145\011\346\130
+\102\056\103\032\114\264\360\045\107\131\372\004\036\223\324\046
+\106\112\120\201\262\336\276\170\267\374\147\025\341\311\127\204
+\036\017\143\326\351\142\272\326\137\125\056\352\134\306\050\010
+\004\045\071\270\016\053\251\362\114\227\034\007\077\015\122\365
+\355\357\057\202\017\002\003\001\000\001\243\102\060\100\060\035
+\006\003\125\035\016\004\026\004\024\123\171\277\132\252\053\112
+\317\124\200\341\330\233\300\235\362\262\003\146\313\060\016\006
+\003\125\035\017\001\001\377\004\004\003\002\001\006\060\017\006
+\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015
+\006\011\052\206\110\206\367\015\001\001\014\005\000\003\202\002
+\001\000\134\324\174\015\317\367\001\175\101\231\145\014\163\305
+\122\237\313\370\317\231\006\177\033\332\103\025\237\236\002\125
+\127\226\024\361\122\074\047\207\224\050\355\037\072\001\067\242
+\166\374\123\120\300\204\233\306\153\116\272\214\041\117\242\216
+\125\142\221\363\151\025\330\274\210\343\304\252\013\375\357\250
+\351\113\125\052\006\040\155\125\170\051\031\356\137\060\134\113
+\044\021\125\377\044\232\156\136\052\053\356\013\115\237\177\367
+\001\070\224\024\225\103\007\011\373\140\251\356\034\253\022\214
+\240\232\136\247\230\152\131\155\213\077\010\373\310\321\105\257
+\030\025\144\220\022\017\163\050\056\305\342\044\116\374\130\354
+\360\364\105\376\042\263\353\057\216\322\331\105\141\005\301\227
+\157\250\166\162\217\213\214\066\257\277\015\005\316\161\215\346
+\246\157\037\154\246\161\142\305\330\320\203\162\014\361\147\021
+\211\014\234\023\114\162\064\337\274\325\161\337\252\161\335\341
+\271\154\214\074\022\135\145\332\275\127\022\266\103\153\377\345
+\336\115\146\021\121\317\231\256\354\027\266\350\161\221\214\336
+\111\376\335\065\161\242\025\047\224\034\317\141\343\046\273\157
+\243\147\045\041\135\346\335\035\013\056\150\033\073\202\257\354
+\203\147\205\324\230\121\164\261\271\231\200\211\377\177\170\031
+\134\171\112\140\056\222\100\256\114\067\052\054\311\307\142\310
+\016\135\367\066\133\312\340\045\045\001\264\335\032\007\234\167
+\000\077\320\334\325\354\075\324\372\273\077\314\205\326\157\177
+\251\055\337\271\002\367\365\227\232\265\065\332\303\147\260\207
+\112\251\050\236\043\216\377\134\047\153\341\260\117\363\007\356
+\000\056\324\131\207\313\122\101\225\352\364\107\327\356\144\101
+\125\174\215\131\002\225\335\142\235\302\271\356\132\050\164\204
+\245\233\267\220\307\014\007\337\365\211\066\164\062\326\050\301
+\260\260\013\340\234\114\303\034\326\374\343\151\265\107\106\201
+\057\242\202\253\323\143\104\160\304\215\377\055\063\272\255\217
+\173\265\160\210\256\076\031\317\100\050\330\374\310\220\273\135
+\231\042\365\122\346\130\305\037\210\061\103\356\210\035\327\306
+\216\074\103\152\035\247\030\336\175\075\026\361\142\371\312\220
+\250\375
+END
+
+# Trust for "USERTrust RSA Certification Authority"
+# Issuer: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Serial Number:01:fd:6d:30:fc:a3:ca:51:a8:1b:bc:64:0e:35:03:2d
+# Subject: CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Not Valid Before: Mon Feb 01 00:00:00 2010
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (SHA-256): E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2
+# Fingerprint (SHA1): 2B:8F:1B:57:33:0D:BB:A2:D0:7A:6C:51:F7:0E:E9:0D:DA:B9:AD:8E
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "USERTrust RSA Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\053\217\033\127\063\015\273\242\320\172\154\121\367\016\351\015
+\332\271\255\216
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\033\376\151\321\221\267\031\063\243\162\250\017\341\125\345\265
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\023\060\021\006\003\125\004\010\023\012\116\145\167\040\112
+\145\162\163\145\171\061\024\060\022\006\003\125\004\007\023\013
+\112\145\162\163\145\171\040\103\151\164\171\061\036\060\034\006
+\003\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122
+\125\123\124\040\116\145\164\167\157\162\153\061\056\060\054\006
+\003\125\004\003\023\045\125\123\105\122\124\162\165\163\164\040
+\122\123\101\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\001\375\155\060\374\243\312\121\250\033\274\144\016\065
+\003\055
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "USERTrust ECC Certification Authority"
+#
+# Issuer: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Serial Number:5c:8b:99:c5:5a:94:c5:d2:71:56:de:cd:89:80:cc:26
+# Subject: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Not Valid Before: Mon Feb 01 00:00:00 2010
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (SHA-256): 4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A
+# Fingerprint (SHA1): D1:CB:CA:5D:B2:D5:2A:7F:69:3B:67:4D:E5:F0:5A:1D:0C:95:7D:F0
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "USERTrust ECC Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\023\060\021\006\003\125\004\010\023\012\116\145\167\040\112
+\145\162\163\145\171\061\024\060\022\006\003\125\004\007\023\013
+\112\145\162\163\145\171\040\103\151\164\171\061\036\060\034\006
+\003\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122
+\125\123\124\040\116\145\164\167\157\162\153\061\056\060\054\006
+\003\125\004\003\023\045\125\123\105\122\124\162\165\163\164\040
+\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\023\060\021\006\003\125\004\010\023\012\116\145\167\040\112
+\145\162\163\145\171\061\024\060\022\006\003\125\004\007\023\013
+\112\145\162\163\145\171\040\103\151\164\171\061\036\060\034\006
+\003\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122
+\125\123\124\040\116\145\164\167\157\162\153\061\056\060\054\006
+\003\125\004\003\023\045\125\123\105\122\124\162\165\163\164\040
+\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\134\213\231\305\132\224\305\322\161\126\336\315\211\200
+\314\046
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\217\060\202\002\025\240\003\002\001\002\002\020\134
+\213\231\305\132\224\305\322\161\126\336\315\211\200\314\046\060
+\012\006\010\052\206\110\316\075\004\003\003\060\201\210\061\013
+\060\011\006\003\125\004\006\023\002\125\123\061\023\060\021\006
+\003\125\004\010\023\012\116\145\167\040\112\145\162\163\145\171
+\061\024\060\022\006\003\125\004\007\023\013\112\145\162\163\145
+\171\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\056\060\054\006\003\125\004\003\023
+\045\125\123\105\122\124\162\165\163\164\040\105\103\103\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\060\036\027\015\061\060\060\062\060\061
+\060\060\060\060\060\060\132\027\015\063\070\060\061\061\070\062
+\063\065\071\065\071\132\060\201\210\061\013\060\011\006\003\125
+\004\006\023\002\125\123\061\023\060\021\006\003\125\004\010\023
+\012\116\145\167\040\112\145\162\163\145\171\061\024\060\022\006
+\003\125\004\007\023\013\112\145\162\163\145\171\040\103\151\164
+\171\061\036\060\034\006\003\125\004\012\023\025\124\150\145\040
+\125\123\105\122\124\122\125\123\124\040\116\145\164\167\157\162
+\153\061\056\060\054\006\003\125\004\003\023\045\125\123\105\122
+\124\162\165\163\164\040\105\103\103\040\103\145\162\164\151\146
+\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164
+\171\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005
+\053\201\004\000\042\003\142\000\004\032\254\124\132\251\371\150
+\043\347\172\325\044\157\123\306\132\330\113\253\306\325\266\321
+\346\163\161\256\335\234\326\014\141\375\333\240\211\003\270\005
+\024\354\127\316\356\135\077\342\041\263\316\367\324\212\171\340
+\243\203\176\055\227\320\141\304\361\231\334\045\221\143\253\177
+\060\243\264\160\342\307\241\063\234\363\277\056\134\123\261\137
+\263\175\062\177\212\064\343\171\171\243\102\060\100\060\035\006
+\003\125\035\016\004\026\004\024\072\341\011\206\324\317\031\302
+\226\166\164\111\166\334\340\065\306\143\143\232\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\012\006
+\010\052\206\110\316\075\004\003\003\003\150\000\060\145\002\060
+\066\147\241\026\010\334\344\227\000\101\035\116\276\341\143\001
+\317\073\252\102\021\144\240\235\224\071\002\021\171\134\173\035
+\372\144\271\356\026\102\263\277\212\302\011\304\354\344\261\115
+\002\061\000\351\052\141\107\214\122\112\113\116\030\160\366\326
+\104\326\156\365\203\272\155\130\275\044\331\126\110\352\357\304
+\242\106\201\210\152\072\106\321\251\233\115\311\141\332\321\135
+\127\152\030
+END
+
+# Trust for "USERTrust ECC Certification Authority"
+# Issuer: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Serial Number:5c:8b:99:c5:5a:94:c5:d2:71:56:de:cd:89:80:cc:26
+# Subject: CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US
+# Not Valid Before: Mon Feb 01 00:00:00 2010
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (SHA-256): 4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A
+# Fingerprint (SHA1): D1:CB:CA:5D:B2:D5:2A:7F:69:3B:67:4D:E5:F0:5A:1D:0C:95:7D:F0
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "USERTrust ECC Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\321\313\312\135\262\325\052\177\151\073\147\115\345\360\132\035
+\014\225\175\360
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\372\150\274\331\265\177\255\375\311\035\006\203\050\314\044\301
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\210\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\023\060\021\006\003\125\004\010\023\012\116\145\167\040\112
+\145\162\163\145\171\061\024\060\022\006\003\125\004\007\023\013
+\112\145\162\163\145\171\040\103\151\164\171\061\036\060\034\006
+\003\125\004\012\023\025\124\150\145\040\125\123\105\122\124\122
+\125\123\124\040\116\145\164\167\157\162\153\061\056\060\054\006
+\003\125\004\003\023\045\125\123\105\122\124\162\165\163\164\040
+\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\134\213\231\305\132\224\305\322\161\126\336\315\211\200
+\314\046
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "GlobalSign ECC Root CA - R4"
+#
+# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4
+# Serial Number:2a:38:a4:1c:96:0a:04:de:42:b2:28:a5:0b:e8:34:98:02
+# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4
+# Not Valid Before: Tue Nov 13 00:00:00 2012
+# Not Valid After : Tue Jan 19 03:14:07 2038
+# Fingerprint (SHA-256): BE:C9:49:11:C2:95:56:76:DB:6C:0A:55:09:86:D7:6E:3B:A0:05:66:7C:44:2C:97:62:B4:FB:B7:73:DE:22:8C
+# Fingerprint (SHA1): 69:69:56:2E:40:80:F4:24:A1:E7:19:9F:14:BA:F3:EE:58:AB:6A:BB
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "GlobalSign ECC Root CA - R4"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157
+\142\141\154\123\151\147\156\040\105\103\103\040\122\157\157\164
+\040\103\101\040\055\040\122\064\061\023\060\021\006\003\125\004
+\012\023\012\107\154\157\142\141\154\123\151\147\156\061\023\060
+\021\006\003\125\004\003\023\012\107\154\157\142\141\154\123\151
+\147\156
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157
+\142\141\154\123\151\147\156\040\105\103\103\040\122\157\157\164
+\040\103\101\040\055\040\122\064\061\023\060\021\006\003\125\004
+\012\023\012\107\154\157\142\141\154\123\151\147\156\061\023\060
+\021\006\003\125\004\003\023\012\107\154\157\142\141\154\123\151
+\147\156
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\052\070\244\034\226\012\004\336\102\262\050\245\013\350
+\064\230\002
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\001\341\060\202\001\207\240\003\002\001\002\002\021\052
+\070\244\034\226\012\004\336\102\262\050\245\013\350\064\230\002
+\060\012\006\010\052\206\110\316\075\004\003\002\060\120\061\044
+\060\042\006\003\125\004\013\023\033\107\154\157\142\141\154\123
+\151\147\156\040\105\103\103\040\122\157\157\164\040\103\101\040
+\055\040\122\064\061\023\060\021\006\003\125\004\012\023\012\107
+\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125
+\004\003\023\012\107\154\157\142\141\154\123\151\147\156\060\036
+\027\015\061\062\061\061\061\063\060\060\060\060\060\060\132\027
+\015\063\070\060\061\061\071\060\063\061\064\060\067\132\060\120
+\061\044\060\042\006\003\125\004\013\023\033\107\154\157\142\141
+\154\123\151\147\156\040\105\103\103\040\122\157\157\164\040\103
+\101\040\055\040\122\064\061\023\060\021\006\003\125\004\012\023
+\012\107\154\157\142\141\154\123\151\147\156\061\023\060\021\006
+\003\125\004\003\023\012\107\154\157\142\141\154\123\151\147\156
+\060\131\060\023\006\007\052\206\110\316\075\002\001\006\010\052
+\206\110\316\075\003\001\007\003\102\000\004\270\306\171\323\217
+\154\045\016\237\056\071\031\034\003\244\256\232\345\071\007\011
+\026\312\143\261\271\206\370\212\127\301\127\316\102\372\163\241
+\367\145\102\377\036\301\000\262\156\163\016\377\307\041\345\030
+\244\252\331\161\077\250\324\271\316\214\035\243\102\060\100\060
+\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060
+\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
+\060\035\006\003\125\035\016\004\026\004\024\124\260\173\255\105
+\270\342\100\177\373\012\156\373\276\063\311\074\243\204\325\060
+\012\006\010\052\206\110\316\075\004\003\002\003\110\000\060\105
+\002\041\000\334\222\241\240\023\246\317\003\260\346\304\041\227
+\220\372\024\127\055\003\354\356\074\323\156\312\250\154\166\274
+\242\336\273\002\040\047\250\205\047\065\233\126\306\243\362\107
+\322\267\156\033\002\000\027\252\147\246\025\221\336\372\224\354
+\173\013\370\237\204
+END
+
+# Trust for "GlobalSign ECC Root CA - R4"
+# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4
+# Serial Number:2a:38:a4:1c:96:0a:04:de:42:b2:28:a5:0b:e8:34:98:02
+# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R4
+# Not Valid Before: Tue Nov 13 00:00:00 2012
+# Not Valid After : Tue Jan 19 03:14:07 2038
+# Fingerprint (SHA-256): BE:C9:49:11:C2:95:56:76:DB:6C:0A:55:09:86:D7:6E:3B:A0:05:66:7C:44:2C:97:62:B4:FB:B7:73:DE:22:8C
+# Fingerprint (SHA1): 69:69:56:2E:40:80:F4:24:A1:E7:19:9F:14:BA:F3:EE:58:AB:6A:BB
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "GlobalSign ECC Root CA - R4"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\151\151\126\056\100\200\364\044\241\347\031\237\024\272\363\356
+\130\253\152\273
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\040\360\047\150\321\176\240\235\016\346\052\312\337\134\211\216
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157
+\142\141\154\123\151\147\156\040\105\103\103\040\122\157\157\164
+\040\103\101\040\055\040\122\064\061\023\060\021\006\003\125\004
+\012\023\012\107\154\157\142\141\154\123\151\147\156\061\023\060
+\021\006\003\125\004\003\023\012\107\154\157\142\141\154\123\151
+\147\156
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\052\070\244\034\226\012\004\336\102\262\050\245\013\350
+\064\230\002
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "GlobalSign ECC Root CA - R5"
+#
+# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5
+# Serial Number:60:59:49:e0:26:2e:bb:55:f9:0a:77:8a:71:f9:4a:d8:6c
+# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5
+# Not Valid Before: Tue Nov 13 00:00:00 2012
+# Not Valid After : Tue Jan 19 03:14:07 2038
+# Fingerprint (SHA-256): 17:9F:BC:14:8A:3D:D0:0F:D2:4E:A1:34:58:CC:43:BF:A7:F5:9C:81:82:D7:83:A5:13:F6:EB:EC:10:0C:89:24
+# Fingerprint (SHA1): 1F:24:C6:30:CD:A4:18:EF:20:69:FF:AD:4F:DD:5F:46:3A:1B:69:AA
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "GlobalSign ECC Root CA - R5"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157
+\142\141\154\123\151\147\156\040\105\103\103\040\122\157\157\164
+\040\103\101\040\055\040\122\065\061\023\060\021\006\003\125\004
+\012\023\012\107\154\157\142\141\154\123\151\147\156\061\023\060
+\021\006\003\125\004\003\023\012\107\154\157\142\141\154\123\151
+\147\156
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157
+\142\141\154\123\151\147\156\040\105\103\103\040\122\157\157\164
+\040\103\101\040\055\040\122\065\061\023\060\021\006\003\125\004
+\012\023\012\107\154\157\142\141\154\123\151\147\156\061\023\060
+\021\006\003\125\004\003\023\012\107\154\157\142\141\154\123\151
+\147\156
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\140\131\111\340\046\056\273\125\371\012\167\212\161\371
+\112\330\154
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\036\060\202\001\244\240\003\002\001\002\002\021\140
+\131\111\340\046\056\273\125\371\012\167\212\161\371\112\330\154
+\060\012\006\010\052\206\110\316\075\004\003\003\060\120\061\044
+\060\042\006\003\125\004\013\023\033\107\154\157\142\141\154\123
+\151\147\156\040\105\103\103\040\122\157\157\164\040\103\101\040
+\055\040\122\065\061\023\060\021\006\003\125\004\012\023\012\107
+\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125
+\004\003\023\012\107\154\157\142\141\154\123\151\147\156\060\036
+\027\015\061\062\061\061\061\063\060\060\060\060\060\060\132\027
+\015\063\070\060\061\061\071\060\063\061\064\060\067\132\060\120
+\061\044\060\042\006\003\125\004\013\023\033\107\154\157\142\141
+\154\123\151\147\156\040\105\103\103\040\122\157\157\164\040\103
+\101\040\055\040\122\065\061\023\060\021\006\003\125\004\012\023
+\012\107\154\157\142\141\154\123\151\147\156\061\023\060\021\006
+\003\125\004\003\023\012\107\154\157\142\141\154\123\151\147\156
+\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005\053
+\201\004\000\042\003\142\000\004\107\105\016\226\373\175\135\277
+\351\071\321\041\370\237\013\266\325\173\036\222\072\110\131\034
+\360\142\061\055\300\172\050\376\032\247\134\263\266\314\227\347
+\105\324\130\372\321\167\155\103\242\300\207\145\064\012\037\172
+\335\353\074\063\241\305\235\115\244\157\101\225\070\177\311\036
+\204\353\321\236\111\222\207\224\207\014\072\205\112\146\237\235
+\131\223\115\227\141\006\206\112\243\102\060\100\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006
+\003\125\035\016\004\026\004\024\075\346\051\110\233\352\007\312
+\041\104\112\046\336\156\336\322\203\320\237\131\060\012\006\010
+\052\206\110\316\075\004\003\003\003\150\000\060\145\002\061\000
+\345\151\022\311\156\333\306\061\272\011\101\341\227\370\373\375
+\232\342\175\022\311\355\174\144\323\313\005\045\213\126\331\240
+\347\136\135\116\013\203\234\133\166\051\240\011\046\041\152\142
+\002\060\161\322\265\217\134\352\073\341\170\011\205\250\165\222
+\073\310\134\375\110\357\015\164\042\250\010\342\156\305\111\316
+\307\014\274\247\141\151\361\367\073\341\052\313\371\053\363\146
+\220\067
+END
+
+# Trust for "GlobalSign ECC Root CA - R5"
+# Issuer: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5
+# Serial Number:60:59:49:e0:26:2e:bb:55:f9:0a:77:8a:71:f9:4a:d8:6c
+# Subject: CN=GlobalSign,O=GlobalSign,OU=GlobalSign ECC Root CA - R5
+# Not Valid Before: Tue Nov 13 00:00:00 2012
+# Not Valid After : Tue Jan 19 03:14:07 2038
+# Fingerprint (SHA-256): 17:9F:BC:14:8A:3D:D0:0F:D2:4E:A1:34:58:CC:43:BF:A7:F5:9C:81:82:D7:83:A5:13:F6:EB:EC:10:0C:89:24
+# Fingerprint (SHA1): 1F:24:C6:30:CD:A4:18:EF:20:69:FF:AD:4F:DD:5F:46:3A:1B:69:AA
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "GlobalSign ECC Root CA - R5"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\037\044\306\060\315\244\030\357\040\151\377\255\117\335\137\106
+\072\033\151\252
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\237\255\073\034\002\036\212\272\027\164\070\201\014\242\274\010
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\120\061\044\060\042\006\003\125\004\013\023\033\107\154\157
+\142\141\154\123\151\147\156\040\105\103\103\040\122\157\157\164
+\040\103\101\040\055\040\122\065\061\023\060\021\006\003\125\004
+\012\023\012\107\154\157\142\141\154\123\151\147\156\061\023\060
+\021\006\003\125\004\003\023\012\107\154\157\142\141\154\123\151
+\147\156
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\140\131\111\340\046\056\273\125\371\012\167\212\161\371
+\112\330\154
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "USERTrust-temporary-intermediate-after-1024bit-removal"
+#
+# Issuer: CN=AddTrust External CA Root,OU=AddTrust External TTP Network,O=AddTrust AB,C=SE
+# Serial Number:5d:20:61:8e:8c:0e:b9:34:40:93:b9:b1:d8:63:95:b6
+# Subject: CN=USERTrust Legacy Secure Server CA,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US
+# Not Valid Before: Tue Aug 05 00:00:00 2014
+# Not Valid After : Sun Nov 01 23:59:59 2015
+# Fingerprint (SHA-256): 92:96:6E:83:44:D2:FB:3A:28:0E:B8:60:4D:81:40:77:4C:E1:A0:57:C5:82:BE:BC:83:4D:03:02:E8:59:BC:43
+# Fingerprint (SHA1): 7C:2F:91:E2:BB:96:68:A9:C6:F6:BD:10:19:2C:6B:52:5A:1B:BA:48
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "USERTrust-temporary-intermediate-after-1024bit-removal"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\177\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
 \006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
 \040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
 \124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
@@ -30149,5 +30137,186 @@
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "VeriSign-C3SSA-G2-temporary-intermediate-after-1024bit-removal"
+#
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
+# Serial Number:2f:00:6e:cd:17:70:66:e7:5f:a3:82:0a:79:1f:05:ae
+# Subject: CN=VeriSign Class 3 Secure Server CA - G2,OU=Terms of use at https://www.verisign.com/rpa (c)09,OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
+# Not Valid Before: Thu Mar 26 00:00:00 2009
+# Not Valid After : Sun Mar 24 23:59:59 2019
+# Fingerprint (SHA-256): 0A:41:51:D5:E5:8B:84:B8:AC:E5:3A:5C:12:12:2A:C9:59:CD:69:91:FB:B3:8E:99:B5:76:C0:AB:DA:C3:58:14
+# Fingerprint (SHA1): 76:44:59:78:1B:AC:B0:47:63:A5:D0:A1:58:91:65:26:1F:29:8E:3B
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "VeriSign-C3SSA-G2-temporary-intermediate-after-1024bit-removal"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\265\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
+\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
+\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
+\163\164\040\116\145\164\167\157\162\153\061\073\060\071\006\003
+\125\004\013\023\062\124\145\162\155\163\040\157\146\040\165\163
+\145\040\141\164\040\150\164\164\160\163\072\057\057\167\167\167
+\056\166\145\162\151\163\151\147\156\056\143\157\155\057\162\160
+\141\040\050\143\051\060\071\061\057\060\055\006\003\125\004\003
+\023\046\126\145\162\151\123\151\147\156\040\103\154\141\163\163
+\040\063\040\123\145\143\165\162\145\040\123\145\162\166\145\162
+\040\103\101\040\055\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
+\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
+\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
+\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
+\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145
+\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
+\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
+\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
+\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
+\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\040\055\040\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\057\000\156\315\027\160\146\347\137\243\202\012\171\037
+\005\256
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\071\060\202\004\041\240\003\002\001\002\002\020\057
+\000\156\315\027\160\146\347\137\243\202\012\171\037\005\256\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\312\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027
+\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147
+\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013
+\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164
+\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004
+\013\023\061\050\143\051\040\062\060\060\066\040\126\145\162\151
+\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162
+\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040
+\157\156\154\171\061\105\060\103\006\003\125\004\003\023\074\126
+\145\162\151\123\151\147\156\040\103\154\141\163\163\040\063\040
+\120\165\142\154\151\143\040\120\162\151\155\141\162\171\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\065\060\036\027\015\060
+\071\060\063\062\066\060\060\060\060\060\060\132\027\015\061\071
+\060\063\062\064\062\063\065\071\065\071\132\060\201\265\061\013
+\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006
+\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040
+\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126
+\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145
+\164\167\157\162\153\061\073\060\071\006\003\125\004\013\023\062
+\124\145\162\155\163\040\157\146\040\165\163\145\040\141\164\040
+\150\164\164\160\163\072\057\057\167\167\167\056\166\145\162\151
+\163\151\147\156\056\143\157\155\057\162\160\141\040\050\143\051
+\060\071\061\057\060\055\006\003\125\004\003\023\046\126\145\162
+\151\123\151\147\156\040\103\154\141\163\163\040\063\040\123\145
+\143\165\162\145\040\123\145\162\166\145\162\040\103\101\040\055
+\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
+\202\001\001\000\324\126\217\127\073\067\050\246\100\143\322\225
+\325\005\164\332\265\031\152\226\326\161\127\057\342\300\064\214
+\240\225\263\214\341\067\044\363\056\355\103\105\005\216\211\327
+\372\332\112\265\370\076\215\116\307\371\111\120\105\067\100\237
+\164\252\240\121\125\141\361\140\204\211\245\236\200\215\057\260
+\041\252\105\202\304\317\264\024\177\107\025\040\050\202\260\150
+\022\300\256\134\007\327\366\131\314\313\142\126\134\115\111\377
+\046\210\253\124\121\072\057\112\332\016\230\342\211\162\271\374
+\367\150\074\304\037\071\172\313\027\201\363\014\255\017\334\141
+\142\033\020\013\004\036\051\030\161\136\142\313\103\336\276\061
+\272\161\002\031\116\046\251\121\332\214\144\151\003\336\234\375
+\175\375\173\141\274\374\204\174\210\134\264\303\173\355\137\053
+\106\022\361\375\000\001\232\213\133\351\243\005\056\217\056\133
+\336\363\033\170\370\146\221\010\300\136\316\325\260\066\312\324
+\250\173\240\175\371\060\172\277\370\335\031\121\053\040\272\376
+\247\317\241\116\260\147\365\200\252\053\203\056\322\216\124\211
+\216\036\051\013\002\003\001\000\001\243\202\001\054\060\202\001
+\050\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001
+\001\377\002\001\000\060\016\006\003\125\035\017\001\001\377\004
+\004\003\002\001\006\060\051\006\003\125\035\021\004\042\060\040
+\244\036\060\034\061\032\060\030\006\003\125\004\003\023\021\103
+\154\141\163\163\063\103\101\062\060\064\070\055\061\055\065\062
+\060\035\006\003\125\035\016\004\026\004\024\245\357\013\021\316
+\300\101\003\243\112\145\220\110\262\034\340\127\055\175\107\060
+\146\006\003\125\035\040\004\137\060\135\060\133\006\013\140\206
+\110\001\206\370\105\001\007\027\003\060\114\060\043\006\010\053
+\006\001\005\005\007\002\001\026\027\150\164\164\160\163\072\057
+\057\144\056\163\171\155\143\142\056\143\157\155\057\143\160\163
+\060\045\006\010\053\006\001\005\005\007\002\002\060\031\032\027
+\150\164\164\160\163\072\057\057\144\056\163\171\155\143\142\056
+\143\157\155\057\162\160\141\060\057\006\003\125\035\037\004\050
+\060\046\060\044\240\042\240\040\206\036\150\164\164\160\072\057
+\057\163\056\163\171\155\143\142\056\143\157\155\057\160\143\141
+\063\055\147\065\056\143\162\154\060\037\006\003\125\035\043\004
+\030\060\026\200\024\177\323\145\247\302\335\354\273\360\060\011
+\363\103\071\372\002\257\063\061\063\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\202\001\001\000\053\216\024
+\314\354\206\010\140\067\213\154\145\211\045\041\336\057\122\242
+\007\236\130\323\263\026\170\001\231\121\225\264\023\167\314\167
+\335\013\134\201\067\326\276\366\142\326\004\067\013\030\163\232
+\323\366\301\242\036\155\234\273\214\021\346\076\022\136\007\137
+\013\203\134\164\002\340\120\364\261\046\033\155\306\350\351\277
+\115\271\001\025\031\354\120\232\371\021\360\201\130\103\054\115
+\021\100\263\132\106\010\246\136\163\241\210\022\065\214\377\003
+\072\275\326\235\372\347\334\226\271\032\144\076\304\375\331\012
+\266\145\236\272\245\250\130\374\073\042\360\242\127\356\212\127
+\107\234\167\307\045\341\254\064\005\115\363\202\176\101\043\272
+\264\127\363\347\306\001\145\327\115\211\231\034\151\115\136\170
+\366\353\162\161\075\262\304\225\001\237\135\014\267\057\045\246
+\134\171\101\357\236\304\147\074\241\235\177\161\072\320\225\227
+\354\170\102\164\230\156\276\076\150\114\127\074\250\223\101\207
+\013\344\271\257\221\373\120\114\014\272\300\044\047\321\025\333
+\145\110\041\012\057\327\334\176\240\314\145\176\171
+END
+
+# Trust for "VeriSign-C3SSA-G2-temporary-intermediate-after-1024bit-removal"
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
+# Serial Number:2f:00:6e:cd:17:70:66:e7:5f:a3:82:0a:79:1f:05:ae
+# Subject: CN=VeriSign Class 3 Secure Server CA - G2,OU=Terms of use at https://www.verisign.com/rpa (c)09,OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
+# Not Valid Before: Thu Mar 26 00:00:00 2009
+# Not Valid After : Sun Mar 24 23:59:59 2019
+# Fingerprint (SHA-256): 0A:41:51:D5:E5:8B:84:B8:AC:E5:3A:5C:12:12:2A:C9:59:CD:69:91:FB:B3:8E:99:B5:76:C0:AB:DA:C3:58:14
+# Fingerprint (SHA1): 76:44:59:78:1B:AC:B0:47:63:A5:D0:A1:58:91:65:26:1F:29:8E:3B
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "VeriSign-C3SSA-G2-temporary-intermediate-after-1024bit-removal"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\166\104\131\170\033\254\260\107\143\245\320\241\130\221\145\046
+\037\051\216\073
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\277\022\155\372\174\325\133\046\171\072\215\252\021\357\057\134
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
+\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
+\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
+\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
+\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145
+\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
+\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
+\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
+\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
+\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\040\055\040\107\065
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\057\000\156\315\027\160\146\347\137\243\202\012\171\037
+\005\256
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h	2014-11-14 09:37:12.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h	2014-11-26 21:45:47.000000000 +0000
@@ -45,8 +45,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION "2.1"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 2
+#define NSS_BUILTINS_LIBRARY_VERSION "2.2"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/pki3hack.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/pki3hack.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/pki3hack.c	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/pki3hack.c	2014-11-26 21:45:48.000000000 +0000
@@ -247,27 +247,28 @@
 }
 
 NSS_IMPLEMENT PRStatus
-nssPKIX509_GetIssuerAndSerialFromDER(NSSDER *der, NSSArena *arena, 
+nssPKIX509_GetIssuerAndSerialFromDER(NSSDER *der,
                                      NSSDER *issuer, NSSDER *serial)
 {
-    SECStatus secrv;
-    SECItem derCert;
+    SECItem derCert   = { 0 };
     SECItem derIssuer = { 0 };
     SECItem derSerial = { 0 };
-    SECITEM_FROM_NSSITEM(&derCert, der);
-    secrv = CERT_SerialNumberFromDERCert(&derCert, &derSerial);
+    SECStatus secrv;
+    derCert.data = (unsigned char *)der->data;
+    derCert.len = der->size;
+    secrv = CERT_IssuerNameFromDERCert(&derCert, &derIssuer);
     if (secrv != SECSuccess) {
 	return PR_FAILURE;
     }
-    (void)nssItem_Create(arena, serial, derSerial.len, derSerial.data);
-    secrv = CERT_IssuerNameFromDERCert(&derCert, &derIssuer);
+    secrv = CERT_SerialNumberFromDERCert(&derCert, &derSerial);
     if (secrv != SECSuccess) {
 	PORT_Free(derSerial.data);
 	return PR_FAILURE;
     }
-    (void)nssItem_Create(arena, issuer, derIssuer.len, derIssuer.data);
-    PORT_Free(derSerial.data);
-    PORT_Free(derIssuer.data);
+    issuer->data = derIssuer.data;
+    issuer->size = derIssuer.len;
+    serial->data = derSerial.data;
+    serial->size = derSerial.len;
     return PR_SUCCESS;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/pki3hack.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/pki3hack.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/pki3hack.h	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/pki3hack.h	2014-11-26 21:45:48.000000000 +0000
@@ -77,7 +77,7 @@
 STAN_ChangeCertTrust(CERTCertificate *cc, CERTCertTrust *trust);
 
 NSS_EXTERN PRStatus
-nssPKIX509_GetIssuerAndSerialFromDER(NSSDER *der, NSSArena *arena, 
+nssPKIX509_GetIssuerAndSerialFromDER(NSSDER *der,
                                      NSSDER *issuer, NSSDER *serial);
 
 NSS_EXTERN char *
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/pkistore.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/pkistore.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/pkistore.c	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/pkistore.c	2014-11-26 21:45:48.000000000 +0000
@@ -23,6 +23,7 @@
 #endif /* PKISTORE_H */
 
 #include "cert.h"
+#include "pki3hack.h"
 
 #include "prbit.h"
 
@@ -554,33 +555,6 @@
     return rvCert;
 }
 
-static PRStatus
-issuer_and_serial_from_encoding (
-  NSSBER *encoding, 
-  NSSDER *issuer, 
-  NSSDER *serial
-)
-{
-    SECItem derCert, derIssuer, derSerial;
-    SECStatus secrv;
-    derCert.data = (unsigned char *)encoding->data;
-    derCert.len = encoding->size;
-    secrv = CERT_IssuerNameFromDERCert(&derCert, &derIssuer);
-    if (secrv != SECSuccess) {
-	return PR_FAILURE;
-    }
-    secrv = CERT_SerialNumberFromDERCert(&derCert, &derSerial);
-    if (secrv != SECSuccess) {
-	PORT_Free(derIssuer.data);
-	return PR_FAILURE;
-    }
-    issuer->data = derIssuer.data;
-    issuer->size = derIssuer.len;
-    serial->data = derSerial.data;
-    serial->size = derSerial.len;
-    return PR_SUCCESS;
-}
-
 NSS_IMPLEMENT NSSCertificate *
 nssCertificateStore_FindCertificateByEncodedCertificate (
   nssCertificateStore *store,
@@ -590,7 +564,7 @@
     PRStatus nssrv = PR_FAILURE;
     NSSDER issuer, serial;
     NSSCertificate *rvCert = NULL;
-    nssrv = issuer_and_serial_from_encoding(encoding, &issuer, &serial);
+    nssrv = nssPKIX509_GetIssuerAndSerialFromDER(encoding, &issuer, &serial);
     if (nssrv != PR_SUCCESS) {
 	return NULL;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/tdcache.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/tdcache.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/tdcache.c	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/tdcache.c	2014-11-26 21:45:48.000000000 +0000
@@ -1046,32 +1046,6 @@
     return rvCert;
 }
 
-static PRStatus
-issuer_and_serial_from_encoding (
-  NSSBER *encoding, 
-  NSSDER *issuer, 
-  NSSDER *serial
-)
-{
-    SECItem derCert, derIssuer, derSerial;
-    SECStatus secrv;
-    derCert.data = (unsigned char *)encoding->data;
-    derCert.len = encoding->size;
-    secrv = CERT_IssuerNameFromDERCert(&derCert, &derIssuer);
-    if (secrv != SECSuccess) {
-	return PR_FAILURE;
-    }
-    secrv = CERT_SerialNumberFromDERCert(&derCert, &derSerial);
-    if (secrv != SECSuccess) {
-	return PR_FAILURE;
-    }
-    issuer->data = derIssuer.data;
-    issuer->size = derIssuer.len;
-    serial->data = derSerial.data;
-    serial->size = derSerial.len;
-    return PR_SUCCESS;
-}
-
 /*
  * Look for a specific cert in the cache
  */
@@ -1084,7 +1058,7 @@
     PRStatus nssrv = PR_FAILURE;
     NSSDER issuer, serial;
     NSSCertificate *rvCert;
-    nssrv = issuer_and_serial_from_encoding(der, &issuer, &serial);
+    nssrv = nssPKIX509_GetIssuerAndSerialFromDER(der, &issuer, &serial);
     if (nssrv != PR_SUCCESS) {
 	return NULL;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/trustdomain.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/trustdomain.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/pki/trustdomain.c	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/pki/trustdomain.c	2014-11-26 21:45:48.000000000 +0000
@@ -831,20 +831,16 @@
     NSSCertificate *rvCert = NULL;
     NSSDER issuer = { 0 };
     NSSDER serial = { 0 };
-    NSSArena *arena = nssArena_Create();
-    if (!arena) {
-	return (NSSCertificate *)NULL;
-    }
     /* XXX this is not generic...  will any cert crack into issuer/serial? */
-    status = nssPKIX509_GetIssuerAndSerialFromDER(ber, arena, &issuer, &serial);
+    status = nssPKIX509_GetIssuerAndSerialFromDER(ber, &issuer, &serial);
     if (status != PR_SUCCESS) {
-	goto finish;
+	return NULL;
     }
     rvCert = nssTrustDomain_FindCertificateByIssuerAndSerialNumber(td,
                                                                    &issuer,
                                                                    &serial);
-finish:
-    nssArena_Destroy(arena);
+    PORT_Free(issuer.data);
+    PORT_Free(serial.data);
     return rvCert;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/util/quickder.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/util/quickder.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/lib/util/quickder.c	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/lib/util/quickder.c	2014-11-26 21:45:48.000000000 +0000
@@ -16,55 +16,110 @@
  */
 
 static unsigned char* definite_length_decoder(const unsigned char *buf,
-                                              const unsigned int length,
-                                              unsigned int *data_length,
+                                              const unsigned int buf_length,
+                                              unsigned int *out_data_length,
                                               PRBool includeTag)
 {
     unsigned char tag;
-    unsigned int used_length= 0;
-    unsigned int data_len;
+    unsigned int used_length = 0;
+    unsigned int data_length = 0;
+    unsigned char length_field_len = 0;
+    unsigned char byte;
+    unsigned int i;
 
-    if (used_length >= length)
+    if (used_length >= buf_length)
     {
+        /* Tag field was not found! */
         return NULL;
     }
     tag = buf[used_length++];
 
-    /* blow out when we come to the end */
     if (tag == 0)
     {
+        /* End-of-contents octects should not be present in DER because
+           DER doesn't use the indefinite length form. */
         return NULL;
     }
 
-    if (used_length >= length)
+    if ((tag & 0x1F) == 0x1F)
     {
+        /* High tag number (a tag number > 30) is not supported */
         return NULL;
     }
-    data_len = buf[used_length++];
 
-    if (data_len&0x80)
+    if (used_length >= buf_length)
     {
-        int  len_count = data_len & 0x7f;
+        /* Length field was not found! */
+        return NULL;
+    }
+    byte = buf[used_length++];
 
-        data_len = 0;
+    if (!(byte & 0x80))
+    {
+        /* Short form: The high bit is not set. */
+        data_length = byte; /* clarity; we're returning a 32-bit int. */
+    }
+    else
+    {
+        /* Long form. Extract the field length */
+        length_field_len = byte & 0x7F;
+        if (length_field_len == 0)
+        {
+            /* DER doesn't use the indefinite length form. */
+            return NULL;
+        }
 
-        while (len_count-- > 0)
+        if (length_field_len > sizeof(data_length))
         {
-            if (used_length >= length)
+            /* We don't support an extended length field  longer than
+               4 bytes (2^32) */
+            return NULL;
+        }
+
+        if (length_field_len > (buf_length - used_length))
+        {
+            /* Extended length field was not found */
+            return NULL;
+        }
+
+        /* Iterate across the extended length field */
+        for (i = 0; i < length_field_len; i++)
+        {
+            byte = buf[used_length++];
+            data_length = (data_length << 8) | byte;
+
+            if (i == 0)
             {
-                return NULL;
+                PRBool too_long = PR_FALSE;
+                if (length_field_len == 1)
+                {
+                    too_long = ((byte & 0x80) == 0); /* Short form suffices */
+                }
+                else
+                {
+                    too_long = (byte == 0); /* This zero byte can be omitted */
+                }
+                if (too_long)
+                {
+                    /* The length is longer than needed. */
+                    return NULL;
+                }
             }
-            data_len = (data_len << 8) | buf[used_length++];
         }
     }
 
-    if (data_len > (length-used_length) )
+    if (data_length > (buf_length - used_length))
     {
+        /* The decoded length exceeds the available buffer */
         return NULL;
     }
-    if (includeTag) data_len += used_length;
 
-    *data_length = data_len;
+    if (includeTag)
+    {
+        data_length += used_length;
+    }
+
+    *out_data_length = data_length;
     return ((unsigned char*)buf + (includeTag ? 0 : used_length));
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/TAG-INFO thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/TAG-INFO
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/nss/TAG-INFO	2014-11-14 09:37:11.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/nss/TAG-INFO	2014-11-26 21:45:46.000000000 +0000
@@ -1 +1 @@
-NSS_3_18_BETA1
+NSS_3_18_BETA3
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/pkix/include/pkix/pkix.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/pkix/include/pkix/pkix.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/pkix/include/pkix/pkix.h	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/pkix/include/pkix/pkix.h	2014-11-26 21:45:49.000000000 +0000
@@ -113,8 +113,9 @@
 // good, unknown, or revoked responses that verify correctly are considered
 // trustworthy. If the response is not trustworthy, thisUpdate will be 0.
 // Similarly, the optional parameter validThrough will be the time through
-// which the encoded response is considered trustworthy (that is, if a response had a
-// thisUpdate time of validThrough, it would be considered trustworthy).
+// which the encoded response is considered trustworthy (that is, as long as
+// the given time at which to validate is less than or equal to validThrough,
+// the response will be considered trustworthy).
 Result VerifyEncodedOCSPResponse(TrustDomain& trustDomain,
                                  const CertID& certID, Time time,
                                  uint16_t maxLifetimeInDays,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/pkix/lib/pkixocsp.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/pkix/lib/pkixocsp.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/pkix/lib/pkixocsp.cpp	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/pkix/lib/pkixocsp.cpp	2014-11-26 21:45:49.000000000 +0000
@@ -630,12 +630,15 @@
     }
   }
 
-  Time timeMinusSlop(context.time);
-  rv = timeMinusSlop.SubtractSeconds(SLOP_SECONDS);
+  // Add some slop to hopefully handle clock-skew.
+  Time notAfterPlusSlop(notAfter);
+  rv = notAfterPlusSlop.AddSeconds(SLOP_SECONDS);
   if (rv != Success) {
-    return rv;
+    // This could only happen if we're dealing with times beyond the year
+    // 10,000AD.
+    return Result::ERROR_OCSP_FUTURE_RESPONSE;
   }
-  if (timeMinusSlop > notAfter) {
+  if (context.time > notAfterPlusSlop) {
     context.expired = true;
   }
 
@@ -650,7 +653,7 @@
     *context.thisUpdate = thisUpdate;
   }
   if (context.validThrough) {
-    *context.validThrough = notAfter;
+    *context.validThrough = notAfterPlusSlop;
   }
 
   return Success;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp	2014-11-14 09:37:13.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp	2014-11-26 21:45:49.000000000 +0000
@@ -382,6 +382,65 @@
   ASSERT_FALSE(expired);
 }
 
+// Added for bug 1079436. The output variable validThrough represents the
+// latest time for which VerifyEncodedOCSPResponse will succeed, which is
+// different from the nextUpdate time in the OCSP response due to the slop we
+// add for time comparisons to deal with clock skew.
+TEST_F(pkixocsp_VerifyEncodedResponse_successful, check_validThrough)
+{
+  ByteString responseString(
+               CreateEncodedOCSPSuccessfulResponse(
+                         OCSPResponseContext::good, *endEntityCertID, byKey,
+                         *rootKeyPair, oneDayBeforeNow,
+                         oneDayBeforeNow, &oneDayAfterNow,
+                         sha256WithRSAEncryption));
+  Time validThrough(Time::uninitialized);
+  {
+    Input response;
+    ASSERT_EQ(Success,
+              response.Init(responseString.data(), responseString.length()));
+    bool expired;
+    ASSERT_EQ(Success,
+              VerifyEncodedOCSPResponse(trustDomain, *endEntityCertID,
+                                        Now(), END_ENTITY_MAX_LIFETIME_IN_DAYS,
+                                        response, expired, nullptr,
+                                        &validThrough));
+    ASSERT_FALSE(expired);
+    // The response was created to be valid until one day after now, so the
+    // value we got for validThrough should be after that.
+    Time oneDayAfterNowAsPKIXTime(TimeFromEpochInSeconds(oneDayAfterNow));
+    ASSERT_TRUE(validThrough > oneDayAfterNowAsPKIXTime);
+  }
+  {
+    Input response;
+    ASSERT_EQ(Success,
+              response.Init(responseString.data(), responseString.length()));
+    bool expired;
+    // Given validThrough from a previous verification, this response should be
+    // valid through that time.
+    ASSERT_EQ(Success,
+              VerifyEncodedOCSPResponse(trustDomain, *endEntityCertID,
+                                        validThrough, END_ENTITY_MAX_LIFETIME_IN_DAYS,
+                                        response, expired));
+    ASSERT_FALSE(expired);
+  }
+  {
+    Time noLongerValid(validThrough);
+    ASSERT_EQ(Success, noLongerValid.AddSeconds(1));
+    Input response;
+    ASSERT_EQ(Success,
+              response.Init(responseString.data(), responseString.length()));
+    bool expired;
+    // The verification time is now after when the response will be considered
+    // valid.
+    ASSERT_EQ(Result::ERROR_OCSP_OLD_RESPONSE,
+              VerifyEncodedOCSPResponse(trustDomain, *endEntityCertID,
+                                        noLongerValid, END_ENTITY_MAX_LIFETIME_IN_DAYS,
+                                        response, expired));
+    ASSERT_TRUE(expired);
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // indirect responses (signed by a delegated OCSP responder cert)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/common/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/common/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/common/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/common/moz.build	2014-11-26 21:45:49.000000000 +0000
@@ -0,0 +1,24 @@
+# -*- Mode: python; python-indent: 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/.
+
+FAIL_ON_WARNINGS = True
+
+EXPORTS.mozilla += [
+    'SandboxInfo.h',
+]
+
+SOURCES += [
+    'SandboxInfo.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/security/sandbox/chromium'
+]
+
+if CONFIG['OS_TARGET'] == 'Android':
+    FINAL_LIBRARY = 'mozsandbox'
+else:
+    FINAL_LIBRARY = 'xul'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/common/SandboxInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/common/SandboxInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/common/SandboxInfo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/common/SandboxInfo.cpp	2014-11-26 21:45:49.000000000 +0000
@@ -0,0 +1,58 @@
+/* -*- 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 "SandboxInfo.h"
+
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/prctl.h>
+
+#include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/NullPtr.h"
+
+namespace mozilla {
+
+/* static */
+const SandboxInfo SandboxInfo::sSingleton = SandboxInfo();
+
+SandboxInfo::SandboxInfo() {
+  int flags = 0;
+  static_assert(sizeof(flags) >= sizeof(Flags), "enum Flags fits in an int");
+
+  // Allow simulating the absence of seccomp-bpf support, for testing.
+  if (!getenv("MOZ_FAKE_NO_SANDBOX")) {
+    // Determine whether seccomp-bpf is supported by trying to
+    // enable it with an invalid pointer for the filter.  This will
+    // fail with EFAULT if supported and EINVAL if not, without
+    // changing the process's state.
+    if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, nullptr) != -1) {
+      MOZ_CRASH("prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, nullptr)"
+                " didn't fail");
+    }
+    if (errno == EFAULT) {
+      flags |= kHasSeccompBPF;
+    }
+  }
+
+#ifdef MOZ_CONTENT_SANDBOX
+  if (!getenv("MOZ_DISABLE_CONTENT_SANDBOX")) {
+    flags |= kEnabledForContent;
+  }
+#endif
+#ifdef MOZ_GMP_SANDBOX
+  if (!getenv("MOZ_DISABLE_GMP_SANDBOX")) {
+    flags |= kEnabledForMedia;
+  }
+#endif
+  if (getenv("MOZ_SANDBOX_VERBOSE")) {
+    flags |= kVerbose;
+  }
+
+  mFlags = static_cast<Flags>(flags);
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/common/SandboxInfo.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/common/SandboxInfo.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/common/SandboxInfo.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/common/SandboxInfo.h	2014-11-26 21:45:49.000000000 +0000
@@ -0,0 +1,57 @@
+/* -*- 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_SandboxInfo_h
+#define mozilla_SandboxInfo_h
+
+#include "mozilla/Types.h"
+
+// Information on what parts of sandboxing are enabled in this build
+// and/or supported by the system.
+
+namespace mozilla {
+
+class SandboxInfo {
+public:
+  // No need to prevent copying; this is essentially just a const int.
+  SandboxInfo(const SandboxInfo& aOther) : mFlags(aOther.mFlags) { }
+
+  // Flags are checked at initializer time; this returns them.
+  static const SandboxInfo& Get() { return sSingleton; }
+
+  enum Flags {
+    // System call filtering; kernel config option CONFIG_SECCOMP_FILTER.
+    kHasSeccompBPF     = 1 << 0,
+    // Config flag MOZ_CONTENT_SANDBOX; env var MOZ_DISABLE_CONTENT_SANDBOX.
+    kEnabledForContent = 1 << 1,
+    // Config flag MOZ_GMP_SANDBOX; env var MOZ_DISABLE_GMP_SANDBOX.
+    kEnabledForMedia   = 1 << 2,
+    // Env var MOZ_SANDBOX_VERBOSE.
+    kVerbose           = 1 << 3,
+  };
+
+  bool Test(Flags aFlag) const { return (mFlags & aFlag) == aFlag; }
+
+  // Returns true if SetContentProcessSandbox may be called.
+  bool CanSandboxContent() const
+  {
+    return !Test(kEnabledForContent) || Test(kHasSeccompBPF);
+  }
+
+  // Returns true if SetMediaPluginSandbox may be called.
+  bool CanSandboxMedia() const
+  {
+    return !Test(kEnabledForMedia) || Test(kHasSeccompBPF);
+  }
+private:
+  enum Flags mFlags;
+  static MOZ_EXPORT const SandboxInfo sSingleton;
+  SandboxInfo();
+};
+
+} // namespace mozilla
+
+#endif // mozilla_SandboxInfo_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/glue/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/glue/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/glue/moz.build	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/glue/moz.build	2014-11-26 21:45:49.000000000 +0000
@@ -14,8 +14,9 @@
     '/security/sandbox/linux',
 ]
 
-USE_LIBS += [
-    'mozsandbox',
-]
+if CONFIG['OS_TARGET'] == 'Android':
+    USE_LIBS += [
+        'mozsandbox',
+    ]
 
 FINAL_LIBRARY = 'xul'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/glue/SandboxCrash.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/glue/SandboxCrash.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/glue/SandboxCrash.cpp	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/glue/SandboxCrash.cpp	2014-11-26 21:45:49.000000000 +0000
@@ -131,4 +131,8 @@
   gSandboxCrashFunc = SandboxCrash;
 }
 
+#ifndef ANDROID
+SandboxCrashFunc gSandboxCrashFunc;
+#endif
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/moz.build	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/moz.build	2014-11-26 21:45:49.000000000 +0000
@@ -6,7 +6,10 @@
 
 FAIL_ON_WARNINGS = True
 
-SharedLibrary('mozsandbox')
+if CONFIG['OS_TARGET'] == 'Android':
+    SharedLibrary('mozsandbox')
+else:
+    Library('mozsandbox')
 
 EXPORTS.mozilla += [
     'Sandbox.h',
@@ -43,5 +46,6 @@
     ]
 
 DIRS += [
+    'common',
     'glue',
 ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/Sandbox.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/Sandbox.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/Sandbox.cpp	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/Sandbox.cpp	2014-11-26 21:45:49.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include "mozilla/Atomics.h"
 #include "mozilla/NullPtr.h"
+#include "mozilla/SandboxInfo.h"
 #include "mozilla/unused.h"
 
 #if defined(ANDROID)
@@ -59,7 +60,9 @@
 
 namespace mozilla {
 
+#ifdef ANDROID
 SandboxCrashFunc gSandboxCrashFunc;
+#endif
 
 #ifdef MOZ_GMP_SANDBOX
 // For media plugins, we can start the sandbox before we dlopen the
@@ -69,49 +72,6 @@
 static const char *gMediaPluginFilePath;
 #endif
 
-struct SandboxFlags {
-  bool isSupported;
-#ifdef MOZ_CONTENT_SANDBOX
-  bool isDisabledForContent;
-#endif
-#ifdef MOZ_GMP_SANDBOX
-  bool isDisabledForGMP;
-#endif
-
-  SandboxFlags() {
-    // Allow simulating the absence of seccomp-bpf support, for testing.
-    if (getenv("MOZ_FAKE_NO_SANDBOX")) {
-      isSupported = false;
-    } else {
-      // Determine whether seccomp-bpf is supported by trying to
-      // enable it with an invalid pointer for the filter.  This will
-      // fail with EFAULT if supported and EINVAL if not, without
-      // changing the process's state.
-      if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, nullptr) != -1) {
-        MOZ_CRASH("prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, nullptr)"
-                  " didn't fail");
-      }
-      isSupported = errno == EFAULT;
-    }
-#ifdef MOZ_CONTENT_SANDBOX
-    isDisabledForContent = getenv("MOZ_DISABLE_CONTENT_SANDBOX");
-#endif
-#ifdef MOZ_GMP_SANDBOX
-    isDisabledForGMP = getenv("MOZ_DISABLE_GMP_SANDBOX");
-#endif
-  }
-};
-
-static const SandboxFlags gSandboxFlags;
-
-SandboxFeatureFlags
-GetSandboxFeatureFlags()
-{
-  return gSandboxFlags.isSupported
-    ? kSandboxFeatureSeccompBPF
-    : static_cast<SandboxFeatureFlags>(0);
-}
-
 /**
  * This is the SIGSYS handler function. It is used to report to the user
  * which system call has been denied by Seccomp.
@@ -319,7 +279,7 @@
   DIR *taskdp;
   struct dirent *de;
   SandboxFilter filter(&sSetSandboxFilter, aType,
-                       getenv("MOZ_SANDBOX_VERBOSE"));
+                       SandboxInfo::Get().Test(SandboxInfo::kVerbose));
 
   static_assert(sizeof(mozilla::Atomic<int>) == sizeof(int),
                 "mozilla::Atomic<int> isn't represented by an int");
@@ -477,19 +437,12 @@
 void
 SetContentProcessSandbox()
 {
-  if (gSandboxFlags.isDisabledForContent) {
+  if (!SandboxInfo::Get().Test(SandboxInfo::kEnabledForContent)) {
     return;
   }
 
   SetCurrentProcessSandbox(kSandboxContentProcess);
 }
-
-SandboxStatus
-ContentProcessSandboxStatus()
-{
-  return gSandboxFlags.isDisabledForContent ? kSandboxingDisabled :
-    gSandboxFlags.isSupported ? kSandboxingSupported : kSandboxingWouldFail;
-}
 #endif // MOZ_CONTENT_SANDBOX
 
 #ifdef MOZ_GMP_SANDBOX
@@ -507,7 +460,7 @@
 void
 SetMediaPluginSandbox(const char *aFilePath)
 {
-  if (gSandboxFlags.isDisabledForGMP) {
+  if (!SandboxInfo::Get().Test(SandboxInfo::kEnabledForMedia)) {
     return;
   }
 
@@ -523,13 +476,6 @@
   // Finally, start the sandbox.
   SetCurrentProcessSandbox(kSandboxMediaPlugin);
 }
-
-SandboxStatus
-MediaPluginSandboxStatus()
-{
-  return gSandboxFlags.isDisabledForGMP ? kSandboxingDisabled :
-    gSandboxFlags.isSupported ? kSandboxingSupported : kSandboxingWouldFail;
-}
 #endif // MOZ_GMP_SANDBOX
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/Sandbox.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/Sandbox.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/Sandbox.h	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/Sandbox.h	2014-11-26 21:45:49.000000000 +0000
@@ -9,57 +9,32 @@
 
 #include "mozilla/Types.h"
 
-namespace mozilla {
-
-// Whether a given type of sandboxing is available, and why not:
-enum SandboxStatus {
-  // Sandboxing is enabled in Gecko but not available on this system;
-  // trying to start the sandbox will crash:
-  kSandboxingWouldFail,
-  // Sandboxing is enabled in Gecko and is available:
-  kSandboxingSupported,
-  // Sandboxing is disabled, either at compile-time or at run-time;
-  // trying to start the sandbox is a no-op:
-  kSandboxingDisabled,
-};
+// This defines the entry points for a content process to start
+// sandboxing itself.  See also common/SandboxInfo.h for what parts of
+// sandboxing are enabled/supported.
+
+#ifdef ANDROID
+// Defined in libmozsandbox and referenced by linking against it.
+#define MOZ_SANDBOX_EXPORT MOZ_EXPORT
+#else
+// Defined in plugin-container and referenced by libraries it loads.
+#define MOZ_SANDBOX_EXPORT MOZ_EXPORT __attribute__((weak))
+#endif
 
+namespace mozilla {
 
 #ifdef MOZ_CONTENT_SANDBOX
-// Disabled by setting env var MOZ_DISABLE_CONTENT_SANDBOX.
-MOZ_EXPORT SandboxStatus ContentProcessSandboxStatus();
-MOZ_EXPORT void SetContentProcessSandbox();
-#else
-static inline SandboxStatus ContentProcessSandboxStatus()
-{
-  return kSandboxingDisabled;
-}
-static inline void SetContentProcessSandbox()
-{
-}
+// Call only if SandboxInfo::CanSandboxContent() returns true.
+// (No-op if MOZ_DISABLE_CONTENT_SANDBOX is set.)
+MOZ_SANDBOX_EXPORT void SetContentProcessSandbox();
 #endif
 
 #ifdef MOZ_GMP_SANDBOX
-// Disabled by setting env var MOZ_DISABLE_GMP_SANDBOX.
-MOZ_EXPORT SandboxStatus MediaPluginSandboxStatus();
-MOZ_EXPORT void SetMediaPluginSandbox(const char *aFilePath);
-#else
-static inline SandboxStatus MediaPluginSandboxStatus()
-{
-  return kSandboxingDisabled;
-}
-static inline void SetMediaPluginSandbox()
-{
-}
+// Call only if SandboxInfo::CanSandboxMedia() returns true.
+// (No-op if MOZ_DISABLE_GMP_SANDBOX is set.)
+MOZ_SANDBOX_EXPORT void SetMediaPluginSandbox(const char *aFilePath);
 #endif
 
-// System-level security features which are relevant to our sandboxing
-// and which aren't available on all Linux systems supported by Gecko.
-enum SandboxFeatureFlags {
-  kSandboxFeatureSeccompBPF = 1 << 0,
-};
-
-MOZ_EXPORT SandboxFeatureFlags GetSandboxFeatureFlags();
-
 } // namespace mozilla
 
 #endif // mozilla_Sandbox_h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/SandboxInternal.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/SandboxInternal.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/security/sandbox/linux/SandboxInternal.h	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/security/sandbox/linux/SandboxInternal.h	2014-11-26 21:45:49.000000000 +0000
@@ -7,15 +7,18 @@
 #ifndef mozilla_SandboxInternal_h
 #define mozilla_SandboxInternal_h
 
-// The code in Sandbox.cpp can't link against libxul, where
-// SandboxCrash.cpp lives, so it has to use a callback, defined here.
-
 #include <signal.h>
 
 #include "mozilla/Types.h"
 
 namespace mozilla {
 
+// SandboxCrash() has to be in libxul to use internal interfaces, but
+// its caller in the sandbox code is elsewhere:
+// * Desktop: defined in libxul; referenced in plugin-container.
+// * Mobile: defined in libmozsandbox; referenced in libxul.
+// See also bug 1101170.
+
 typedef void (*SandboxCrashFunc)(int, siginfo_t*, void*);
 extern MOZ_EXPORT SandboxCrashFunc gSandboxCrashFunc;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/hawkclient.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/hawkclient.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/hawkclient.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/hawkclient.js	2014-11-26 21:45:49.000000000 +0000
@@ -262,7 +262,7 @@
     };
 
     let request = this.newHAWKAuthenticatedRESTRequest(uri, credentials, extra);
-    if (method == "post" || method == "put") {
+    if (method == "post" || method == "put" || method == "patch") {
       request[method](payloadObj, onComplete);
     } else {
       request[method](onComplete);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/hawkrequest.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/hawkrequest.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/hawkrequest.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/hawkrequest.js	2014-11-26 21:45:49.000000000 +0000
@@ -67,7 +67,7 @@
 
   dispatch: function dispatch(method, data, onComplete, onProgress) {
     let contentType = "text/plain";
-    if (method == "POST" || method == "PUT") {
+    if (method == "POST" || method == "PUT" || method == "PATCH") {
       contentType = "application/json";
     }
     if (this.credentials) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/rest.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/rest.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/rest.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/rest.js	2014-11-26 21:45:49.000000000 +0000
@@ -208,6 +208,23 @@
   },
 
   /**
+   * Perform an HTTP PATCH.
+   *
+   * @param data
+   *        Data to be used as the request body. If this isn't a string
+   *        it will be JSONified automatically.
+   * @param onComplete
+   *        Short-circuit way to set the 'onComplete' method. Optional.
+   * @param onProgress
+   *        Short-circuit way to set the 'onProgress' method. Optional.
+   *
+   * @return the request object.
+   */
+  patch: function patch(data, onComplete, onProgress) {
+    return this.dispatch("PATCH", data, onComplete, onProgress);
+  },
+
+  /**
    * Perform an HTTP PUT.
    *
    * @param data
@@ -307,7 +324,7 @@
     }
 
     // Set HTTP request body.
-    if (method == "PUT" || method == "POST") {
+    if (method == "PUT" || method == "POST" || method == "PATCH") {
       // Convert non-string bodies into JSON.
       if (typeof data != "string") {
         data = JSON.stringify(data);
@@ -366,7 +383,7 @@
                                      Cr.NS_ERROR_NET_TIMEOUT);
     if (!this.onComplete) {
       this._log.error("Unexpected error: onComplete not defined in " +
-                      "abortTimeout.")
+                      "abortTimeout.");
       return;
     }
     this.onComplete(error);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/tests/unit/test_hawkclient.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/tests/unit/test_hawkclient.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/tests/unit/test_hawkclient.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/tests/unit/test_hawkclient.js	2014-11-26 21:45:49.000000000 +0000
@@ -66,9 +66,7 @@
   yield deferredStop(server);
 });
 
-add_task(function test_authenticated_post_request() {
-  let method = "POST";
-
+function check_authenticated_request(method) {
   let server = httpd_setup({"/foo": (request, response) => {
       do_check_true(request.hasHeader("Authorization"));
 
@@ -86,6 +84,18 @@
   do_check_eq("bar", result.foo);
 
   yield deferredStop(server);
+}
+
+add_task(function test_authenticated_post_request() {
+  check_authenticated_request("POST");
+});
+
+add_task(function test_authenticated_put_request() {
+  check_authenticated_request("PUT");
+});
+
+add_task(function test_authenticated_patch_request() {
+  check_authenticated_request("PATCH");
 });
 
 add_task(function test_credentials_optional() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/tests/unit/test_restrequest.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/tests/unit/test_restrequest.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/tests/unit/test_restrequest.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/tests/unit/test_restrequest.js	2014-11-26 21:45:49.000000000 +0000
@@ -271,9 +271,10 @@
 });
 
 /**
- * Test HTTP PUT with a simple string argument and default Content-Type.
+ * Used for testing PATCH/PUT/POST methods.
  */
-add_test(function test_put() {
+function check_posting_data(method) {
+  let funcName = method.toLowerCase();
   let handler = httpd_handler(200, "OK", "Got it!");
   let server = httpd_setup({"/resource": handler});
 
@@ -299,7 +300,7 @@
     do_check_eq(this.response.status, 200);
     do_check_eq(this.response.body, "Got it!");
 
-    do_check_eq(handler.request.method, "PUT");
+    do_check_eq(handler.request.method, method);
     do_check_eq(handler.request.body, "Hullo?");
     do_check_eq(handler.request.getHeader("Content-Type"), "text/plain");
 
@@ -311,61 +312,33 @@
     });
   };
 
-  do_check_eq(request.put("Hullo?", onComplete, onProgress), request);
+  do_check_eq(request[funcName]("Hullo?", onComplete, onProgress), request);
   do_check_eq(request.status, request.SENT);
-  do_check_eq(request.method, "PUT");
+  do_check_eq(request.method, method);
   do_check_throws(function () {
-    request.put("Hai!");
+    request[funcName]("Hai!");
   });
+}
+
+/**
+ * Test HTTP PATCH with a simple string argument and default Content-Type.
+ */
+add_test(function test_patch() {
+  check_posting_data("PATCH");
+});
+
+/**
+ * Test HTTP PUT with a simple string argument and default Content-Type.
+ */
+add_test(function test_put() {
+  check_posting_data("PUT");
 });
 
 /**
  * Test HTTP POST with a simple string argument and default Content-Type.
  */
 add_test(function test_post() {
-  let handler = httpd_handler(200, "OK", "Got it!");
-  let server = httpd_setup({"/resource": handler});
-
-  let request = new RESTRequest(server.baseURI + "/resource");
-  do_check_eq(request.status, request.NOT_SENT);
-
-  request.onProgress = request.onComplete = function () {
-    do_throw("This function should have been overwritten!");
-  };
-
-  let onProgress_called = false;
-  function onProgress() {
-    onProgress_called = true;
-    do_check_eq(this.status, request.IN_PROGRESS);
-    do_check_true(this.response.body.length > 0);
-  };
-
-  function onComplete(error) {
-    do_check_eq(error, null);
-
-    do_check_eq(this.status, this.COMPLETED);
-    do_check_true(this.response.success);
-    do_check_eq(this.response.status, 200);
-    do_check_eq(this.response.body, "Got it!");
-
-    do_check_eq(handler.request.method, "POST");
-    do_check_eq(handler.request.body, "Hullo?");
-    do_check_eq(handler.request.getHeader("Content-Type"), "text/plain");
-
-    do_check_true(onProgress_called);
-    CommonUtils.nextTick(function () {
-      do_check_eq(request.onComplete, null);
-      do_check_eq(request.onProgress, null);
-      server.stop(run_next_test);
-    });
-  };
-
-  do_check_eq(request.post("Hullo?", onComplete, onProgress), request);
-  do_check_eq(request.status, request.SENT);
-  do_check_eq(request.method, "POST");
-  do_check_throws(function () {
-    request.post("Hai!");
-  });
+  check_posting_data("POST");
 });
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/tests/unit/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/tests/unit/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/common/tests/unit/xpcshell.ini	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/common/tests/unit/xpcshell.ini	2014-11-26 21:45:49.000000000 +0000
@@ -28,7 +28,6 @@
 [test_bagheera_server.js]
 [test_bagheera_client.js]
 [test_hawkclient.js]
-run-if = fxaccounts # This test imports some FxAccounts modules.
 [test_hawkrequest.js]
 [test_observers.js]
 [test_restrequest.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/modules/engines/bookmarks.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/modules/engines/bookmarks.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/modules/engines/bookmarks.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/modules/engines/bookmarks.js	2014-11-26 21:45:49.000000000 +0000
@@ -202,6 +202,7 @@
   _storeObj: BookmarksStore,
   _trackerObj: BookmarksTracker,
   version: 2,
+  _defaultSort: "index",
 
   syncPriority: 4,
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/modules/engines/clients.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/modules/engines/clients.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/modules/engines/clients.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/modules/engines/clients.js	2014-11-26 21:45:49.000000000 +0000
@@ -29,7 +29,11 @@
   ttl: CLIENTS_TTL
 };
 
-Utils.deferGetSet(ClientsRec, "cleartext", ["name", "type", "commands", "version", "protocols"]);
+Utils.deferGetSet(ClientsRec,
+                  "cleartext",
+                  ["name", "type", "commands",
+                   "version", "protocols",
+                   "formfactor", "os", "appPackage", "application", "device"]);
 
 
 this.ClientEngine = function ClientEngine(service) {
@@ -100,6 +104,11 @@
   },
   set localID(value) Svc.Prefs.set("client.GUID", value),
 
+  get brandName() {
+    let brand = new StringBundle("chrome://branding/locale/brand.properties");
+    return brand.get("brandShortName");
+  },
+
   get localName() {
     let localName = Svc.Prefs.get("client.name", "");
     if (localName != "")
@@ -111,9 +120,8 @@
     let user = env.get("USER") || env.get("USERNAME") ||
                Svc.Prefs.get("account") || Svc.Prefs.get("username");
 
+    let brandName = this.brandName;
     let appName;
-    let brand = new StringBundle("chrome://branding/locale/brand.properties");
-    let brandName = brand.get("brandShortName");
     try {
       let syncStrings = new StringBundle("chrome://browser/locale/sync.properties");
       appName = syncStrings.getFormattedString("sync.defaultAccountApplication", [brandName]);
@@ -412,9 +420,18 @@
       record.commands = this.engine.localCommands;
       record.version = Services.appinfo.version;
       record.protocols = SUPPORTED_PROTOCOL_VERSIONS;
-    }
-    else
+
+      // Optional fields.
+      record.os = Services.appinfo.OS;             // "Darwin"
+      record.appPackage = Services.appinfo.ID;
+      record.application = this.engine.brandName   // "Nightly"
+
+      // We can't compute these yet.
+      // record.device = "";            // Bug 1100723
+      // record.formfactor = "";        // Bug 1100722
+    } else {
       record.cleartext = this._remoteClients[id];
+    }
 
     return record;
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/modules/engines.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/modules/engines.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/modules/engines.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/modules/engines.js	2014-11-26 21:45:49.000000000 +0000
@@ -702,6 +702,9 @@
   _recordObj: CryptoWrapper,
   version: 1,
 
+  // Which sortindex to use when retrieving records for this engine.
+  _defaultSort: undefined,
+
   // A relative priority to use when computing an order
   // for engines to be synced. Higher-priority engines
   // (lower numbers) are synced first.
@@ -929,6 +932,10 @@
       newitems = this._itemSource();
     }
 
+    if (this._defaultSort) {
+      newitems.sort = this._defaultSort;
+    }
+
     if (isMobile) {
       batchSize = MOBILE_BATCH_SIZE;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/tests/unit/test_clients_engine.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/tests/unit/test_clients_engine.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/services/sync/tests/unit/test_clients_engine.js	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/services/sync/tests/unit/test_clients_engine.js	2014-11-26 21:45:49.000000000 +0000
@@ -577,6 +577,32 @@
   do_check_true(engine.processIncomingCommands());
 });
 
+add_test(function test_optional_client_fields() {
+  _("Ensure that we produce records with the fields added in Bug 1097222.");
+
+  const SUPPORTED_PROTOCOL_VERSIONS = ["1.1", "1.5"];
+  let local = engine._store.createRecord(engine.localID, "clients");
+  do_check_eq(local.name, engine.localName);
+  do_check_eq(local.type, engine.localType);
+  do_check_eq(local.version, Services.appinfo.version);
+  do_check_array_eq(local.protocols, SUPPORTED_PROTOCOL_VERSIONS);
+
+  // Optional fields.
+  // Make sure they're what they ought to be...
+  do_check_eq(local.os, Services.appinfo.OS);
+  do_check_eq(local.appPackage, Services.appinfo.ID);
+
+  // ... and also that they're non-empty.
+  do_check_true(!!local.os);
+  do_check_true(!!local.appPackage);
+  do_check_true(!!local.application);
+
+  // We don't currently populate device or formfactor.
+  // See Bug 1100722, Bug 1100723.
+
+  run_next_test();
+});
+
 function run_test() {
   initTestLogging("Trace");
   Log.repository.getLogger("Sync.Engine.Clients").level = Log.Level.Trace;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/config/mozharness/android_arm_config.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/config/mozharness/android_arm_config.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/config/mozharness/android_arm_config.py	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/config/mozharness/android_arm_config.py	2014-11-26 21:45:50.000000000 +0000
@@ -6,17 +6,85 @@
     "suite_definitions": {
         "mochitest": {
             "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
             "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
                 "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
-                "--quiet", "--log-raw=%(raw_log_file)s"
+                "--quiet", "--log-raw=%(raw_log_file)s",
+                # Bug 1064002 - Land once mozharness changes land
+                #"--total-chunks=16",
+                #"--run-only-tests=android23.json",
+            ],
+        },
+        # Bug 1064002 - Not yet in use
+        "mochitest-gl": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
+                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
+                "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
+                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
+                "--quiet", "--log-raw=%(raw_log_file)s",
+                "--total-chunks=2",
+                "--test-manifest=gl.json",
+            ],
+        },
+        # Bug 1064002 - Not yet in use
+        "robocop": {
+            "run_filename": "runtestsremote.py",
+            "testsdir": "mochitest",
+            "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
+                "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
+                "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
+                "--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
+                "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
+                "--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
+                "--quiet", "--log-raw=%(raw_log_file)s",
+                "--total-chunks=4",
+                "--robocop-path=../..",
+                "--robocop-ids=fennec_ids.txt",
+                "--robocop=robocop.ini",
             ],
         },
         "reftest": {
             "run_filename": "remotereftest.py",
+            "testsdir": "reftest",
+            "options": [ "--app=%(app)s", "--ignore-window-size",
+                "--bootstrap",
+                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s",
+                "--devicePort=%(device_port)s", "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components",
+                "--symbols-path=%(symbols_path)s",
+                # Bug 1064002 - Land once mozharness changes land
+                #"--total-chunks=16",
+                #"tests/layout/reftests/reftest.list",
+            ],
+        },
+        # Bug 1064002 - Not yet in use
+        "crashtest": {
+            "run_filename": "remotereftest.py",
+            "testsdir": "reftest",
+            "options": [ "--app=%(app)s", "--ignore-window-size",
+                "--bootstrap",
+                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
+                "--utility-path=%(utility_path)s", "--deviceIP=%(device_ip)s",
+                "--devicePort=%(device_port)s", "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components",
+                "--symbols-path=%(symbols_path)s",
+                "--total-chunks=2",
+                "tests/testing/crashtest/crashtests.list",
+            ],
+        },
+        # Bug 1064002 - Not yet in use
+        "jsreftest": {
+            "run_filename": "remotereftest.py",
+            "testsdir": "reftest",
             "options": [ "--app=%(app)s", "--ignore-window-size",
                 "--bootstrap",
                 "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
@@ -24,16 +92,22 @@
                 "--devicePort=%(device_port)s", "--http-port=%(http_port)s",
                 "--ssl-port=%(ssl_port)s", "--httpd-path", "reftest/components",
                 "--symbols-path=%(symbols_path)s",
+                "../jsreftest/tests/jstests.list",
+                "--total-chunks=6",
+                "--extra-profile-file=jsreftest/tests/user.js",
             ],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
+            "testsdir": "xpcshell",
             "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
                 "--apk=%(installer_path)s", "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
                 "--manifest=tests/xpcshell.ini",
-                "--log-raw=%(raw_log_file)s",
+                # Bug 1064002 - Land once mozharness changes land
+                #"--log-raw=%(raw_log_file)s",
+                #"--total-chunks=3",
             ],
         },
     }, # end suite_definitions
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/config/mozharness/marionette.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/config/mozharness/marionette.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/config/mozharness/marionette.py	2014-11-14 09:37:14.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/config/mozharness/marionette.py	2014-11-26 21:45:50.000000000 +0000
@@ -8,6 +8,7 @@
         "--log-raw=%(raw_log_file)s",
         "--binary=%(binary)s",
         "--address=%(address)s",
+        "--symbols-path=%(symbols_path)s",
     ],
     "marionette_emulator_options": [
         "--type=%(type)s",
@@ -15,6 +16,7 @@
         "--logcat-dir=%(logcat_dir)s",
         "--emulator=%(emulator)s",
         "--homedir=%(homedir)s",
+        "--symbols-path=%(symbols_path)s",
     ],
     "webapi_emulator_options": [
         "--type=%(type)s",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/actions.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/actions.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/actions.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/actions.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,46 @@
+Actions
+=======
+
+.. py:currentmodule:: marionette
+
+Action Sequences
+----------------
+
+:class:`Actions` are designed as a way to simulate user input as closely as possible
+on a touch device like a smart phone. A common operation is to tap the screen
+and drag your finger to another part of the screen and lift it off.
+
+This can be simulated using an Action::
+
+    from marionette import Actions
+
+    start_element = marionette.find_element('id', 'start')
+    end_element = marionette.find_element('id', 'end')
+
+    action = Actions(marionette)
+    action.press(start_element).wait(1).move(end_element).release()
+    action.perform()
+
+This will simulate pressing an element, waiting for one second, moving the
+finger over to another element and then lifting the finger off the screen. The
+wait is optional in this case, but can be useful for simulating delays typical
+to a users behaviour.
+
+Multi-Action Sequences
+----------------------
+
+Sometimes it may be necessary to simulate multiple actions at the same time.
+For example a user may be dragging one finger while tapping another. This is
+where :class:`MultiActions` come in. MultiActions are simply a way of combining
+two or more actions together and performing them all at the same time::
+
+    action1 = Actions(marionette)
+    action1.press(start_element).move(end_element).release()
+
+    action2 = Actions(marionette)
+    action2.press(another_element).wait(1).release()
+
+    multi = MultiActions(marionette)
+    multi.add(action1)
+    multi.add(action2)
+    multi.perform()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/debug.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/debug.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/debug.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/debug.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,54 @@
+Debugging
+=========
+
+.. py:currentmodule:: marionette
+
+Sometimes when working with Marionette you'll run into unexpected behaviour and
+need to do some debugging. This page outlines some of the Marionette methods
+that can be useful to you.
+
+Please note that the best tools for debugging are the `ones that ship with
+Gecko`_. This page doesn't describe how to use those with Marionette. Also see
+a related topic about `using the debugger with Marionette`_ on MDN.
+
+.. _ones that ship with Gecko: https://developer.mozilla.org/en-US/docs/Tools
+.. _using the debugger with Marionette: https://developer.mozilla.org/en-US/docs/Marionette/Debugging
+
+
+Storing Logs on the Server
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+By calling `~Marionette.log` it is possible to store a message on the server.
+Logs can later be retrieved using `~Marionette.get_logs`. For example::
+
+    try:
+        marionette.log("Sending a click event") # logged at INFO level
+        elem.click()
+    except:
+        marionette.log("Something went wrong!", "ERROR")
+
+    print(marionette.get_logs())
+
+Disclaimer: Example for illustrative purposes only, don't actually hide
+tracebacks like that!
+
+
+Seeing What's on the Page
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes it's difficult to tell what is actually on the page that is being
+manipulated. Either because it happens too fast, the window isn't big enough or
+you are manipulating a remote server! There are two methods that can help you
+out. The first is `~Marionette.screenshot`::
+
+    marionette.screenshot() # takes screenshot of entire frame
+    elem = marionette.find_element(By.ID, 'some-div')
+    marionette.screenshot(elem) # takes a screenshot of only the given element
+
+Sometimes you just want to see the DOM layout. You can do this with the
+`~Marionette.page_source` property. Note that the page source depends on the
+context you are in::
+
+    print(marionette.page_source)
+    marionette.set_context('chrome')
+    print(marionette.page_source)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/findelement.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/findelement.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/findelement.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/findelement.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,126 @@
+Finding Elements
+================
+.. py:currentmodule:: marionette
+
+One of the most common and yet often most difficult tasks in Marionette is
+finding a DOM element on a webpage or in the chrome UI. Marionette provides
+several different search strategies to use when finding elements. All search
+strategies work with both :func:`~Marionette.find_element` and
+:func:`~Marionette.find_elements`, though some strategies are not implemented
+in chrome scope.
+
+In the event that more than one element is matched by the query,
+:func:`~Marionette.find_element` will only return the first element found. In
+the event that no elements are matched by the query,
+:func:`~Marionette.find_element` will raise `NoSuchElementException` while
+:func:`~Marionette.find_elements` will return an empty list.
+
+Search Strategies
+-----------------
+
+Search strategies are defined in the :class:`By` class::
+
+    from marionette import By
+    print(By.ID)
+
+The strategies are:
+
+* `id` - The easiest way to find an element is to refer to its id directly::
+
+        container = client.find_element(By.ID, 'container')
+
+* `class name` - To find elements belonging to a certain class, use `class name`::
+
+        buttons = client.find_elements(By.CLASS_NAME, 'button')
+
+* `css selector` - It's also possible to find elements using a `css selector`_::
+
+        container_buttons = client.find_elements(By.CSS_SELECTOR, '#container .buttons')
+
+* `name` - Find elements by their name attribute (not implemented in chrome
+  scope)::
+
+        form = client.find_element(By.NAME, 'signup')
+
+* `tag name` - To find all the elements with a given tag, use `tag name`::
+
+        paragraphs = client.find_elements(By.TAG_NAME, 'p')
+
+* `link text` - A convenience strategy for finding link elements by their
+  innerHTML (not implemented in chrome scope)::
+
+        link = client.find_element(By.LINK_TEXT, 'Click me!')
+
+* `partial link text` - Same as `link text` except substrings of the innerHTML
+  are matched (not implemented in chrome scope)::
+
+        link = client.find_element(By.PARTIAL_LINK_TEXT, 'Clic')
+
+* `xpath` - Find elements using an xpath_ query::
+
+        elem = client.find_element(By.XPATH, './/*[@id="foobar"')
+
+.. _css selector: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors
+.. _xpath: https://developer.mozilla.org/en-US/docs/Web/XPath
+
+
+
+Chaining Searches
+-----------------
+
+In addition to the methods on the Marionette object, HTMLElement objects also
+provide :func:`~HTMLElement.find_element` and :func:`~HTMLElement.find_elements`
+methods. The difference is that only child nodes of the element will be searched.
+Consider the following html snippet::
+
+    <div id="content">
+        <span id="main"></span>
+    </div>
+    <div id="footer"></div>
+
+Doing the following will work::
+
+    client.find_element(By.ID, 'container').find_element(By.ID, 'main')
+
+But this will raise a `NoSuchElementException`::
+
+    client.find_element(By.ID, 'container').find_element(By.ID, 'footer')
+
+
+Finding Anonymous Nodes
+-----------------------
+
+When working in chrome scope, for example manipulating the Firefox user
+interface, you may run into something called an anonymous node.
+
+Firefox uses a markup language called XUL_ for its interface. XUL is similar
+to HTML in that it has a DOM and tags that render controls on the display. One
+ability of XUL is to create re-useable widgets that are made up out of several
+smaller XUL elements. These widgets can be bound to the DOM using something
+called the `XML binding language (XBL)`_.
+
+The end result is that the DOM sees the widget as a single entity. It doesn't
+know anything about how that widget is made up. All of the smaller XUL elements
+that make up the widget are called `anonymous content`_. It is not possible to
+query such elements using traditional DOM methods like `getElementById`.
+
+Marionette provides two special strategies used for finding anonymous content.
+Unlike normal elements, anonymous nodes can only be seen by their parent. So
+it's necessary to first find the parent element and then search for the
+anonymous children from there.
+
+* `anon` - Finds all anonymous children of the element, there is no search term
+  so `None` must be passed in::
+
+    anon_children = client.find_element('id', 'parent').find_elements('anon', None)
+
+* `anon attribute` - Find an anonymous child based on an attribute. An
+  unofficial convention is for anonymous nodes to have an
+  `anonid` attribute::
+
+    anon_child = client.find_element('id', 'parent').find_element('anon attribute', {'anonid': 'container'})
+
+
+.. _XUL: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XUL
+.. _XML binding language (XBL): https://developer.mozilla.org/en-US/docs/XBL
+.. _anonymous content: https://developer.mozilla.org/en-US/docs/XBL/XBL_1.0_Reference/Anonymous_Content
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/landing.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/landing.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/landing.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/landing.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,13 @@
+Advanced Topics
+===============
+
+Here are a collection of articles explaining some of the more complicated
+aspects of Marionette.
+
+.. toctree::
+ :maxdepth: 1
+
+ findelement
+ stale
+ actions
+ debug
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/stale.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/stale.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/advanced/stale.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/advanced/stale.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,71 @@
+Dealing with Stale Elements
+===========================
+.. py:currentmodule:: marionette
+
+Marionette does not keep a live representation of the DOM saved. All it can do
+is send commands to the Marionette server which queries the DOM on the client's
+behalf. References to elements are also not passed from server to client. A
+unique id is generated for each element that gets referenced and a mapping of
+id to element object is stored on the server. When commands such as
+:func:`~HTMLElement.click()` are run, the client sends the element's id along
+with the command. The server looks up the proper DOM element in its reference
+table and executes the command on it.
+
+In practice this means that the DOM can change state and Marionette will never
+know until it sends another query. For example, look at the following HTML::
+
+    <head>
+    <script type=text/javascript>
+        function addDiv() {
+           var div = document.createElement("div");
+           document.getElementById("container").appendChild(div);
+        }
+    </script>
+    </head>
+
+    <body>
+        <div id="container">
+        </div>
+        <input id="button" type=button onclick="addDiv();">
+    </body>
+
+Care needs to be taken as the DOM is being modified after the page has loaded.
+The following code has a race condition::
+
+    button = client.find_element('id', 'button')
+    button.click()
+    assert len(client.find_elements('css selector', '#container div')) > 0
+
+
+Explicit Waiting and Expected Conditions
+----------------------------------------
+
+To avoid the above scenario, manual synchronisation is needed. Waits are used
+to pause program execution until a given condition is true. This is a useful
+technique to employ when documents load new content or change after
+``Document.readyState``'s value changes to "complete".
+
+The :class:`Wait` helper class provided by Marionette avoids some of the
+caveats of ``time.sleep(n)``. It will return immediately once the provided
+condition evaluates to true.
+
+To avoid the race condition in the above example, one could do::
+
+    button = client.find_element('id', 'button')
+    button.click()
+
+    def find_divs():
+        return client.find_elements('css selector', '#container div')
+
+    divs = Wait(client).until(find_divs)
+    assert len(divs) > 0
+
+This avoids the race condition. Because finding elements is a common condition
+to wait for, it is built in to Marionette. Instead of the above, you could
+write::
+
+    button = client.find_element('id', 'button')
+    button.click()
+    assert len(Wait(client).until(expected.elements_present('css selector', '#container div'))) > 0
+
+For a full list of built-in conditions, see :mod:`~marionette.expected`.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/basics.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/basics.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/basics.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/basics.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,185 @@
+.. py:currentmodule:: marionette
+
+Marionette Python Client
+========================
+
+The Marionette python client library allows you to remotely control a
+Gecko-based browser or device which is running a Marionette_
+server. This includes desktop Firefox and FirefoxOS (support for
+Firefox for Android is planned, but not yet fully implemented).
+
+The Marionette server is built directly into Gecko and can be started by
+passing in a command line option to Gecko, or by using a Marionette-enabled
+build. The server listens for connections from various clients. Clients can
+then control Gecko by sending commands to the server.
+
+This is the official python client for Marionette. There also exists a
+`NodeJS client`_ maintained by the Firefox OS automation team.
+
+.. _Marionette: https://developer.mozilla.org/en-US/docs/Marionette
+.. _NodeJS client: https://github.com/mozilla-b2g/marionette-js-client
+
+Getting the Client
+------------------
+
+The python client is officially supported. To install it, first make sure you
+have `pip installed`_ then run:
+
+.. parsed-literal::
+   pip install marionette_client
+
+It's highly recommended to use virtualenv_ when installing Marionette to avoid
+package conflicts and other general nastiness.
+
+You should now be ready to start using Marionette. The best way to learn is to
+play around with it. Start a `Marionette-enabled instance of Firefox`_, fire up
+a python shell and follow along with the
+:doc:`interactive tutorial <interactive>`!
+
+.. _pip installed: https://pip.pypa.io/en/latest/installing.html
+.. _virtualenv: http://virtualenv.readthedocs.org/en/latest/
+.. _Marionette-enabled instance of Firefox: https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/Builds
+
+Using the Client for Testing
+----------------------------
+
+Please visit the `Marionette Tests`_ section on MDN for information regarding
+testing with Marionette.
+
+.. _Marionette Tests: https://developer.mozilla.org/en/Marionette/Tests
+
+Session Management
+------------------
+A session is a single instance of a Marionette client connected to a Marionette
+server. Before you can start executing commands, you need to start a session
+with :func:`start_session() <Marionette.start_session>`:
+
+.. parsed-literal::
+   client = Marionette('localhost', port=2828)
+   client.start_session()
+
+This returns a session id and an object listing the capabilities of the
+Marionette server. For example, a server running on a Firefox OS device will
+have the ability to rotate the window, while a server running from Firefox
+won't. It's also possible to access the capabilities using the
+:attr:`~Marionette.session_capabilities` attribute. After finishing with a
+session, you can delete it with :func:`~Marionette.delete_session()`. Note that
+this will also happen automatically when the Marionette object is garbage
+collected.
+
+Context Management
+------------------
+Commands can only be executed in a single window, frame and scope at a time. In
+order to run commands elsewhere, it's necessary to explicitly switch to the
+appropriate context.
+
+Use :func:`~Marionette.switch_to_window` to execute commands in the context of a
+new window:
+
+.. parsed-literal::
+   original_window = client.current_window_handle
+   for handle in client.window_handles:
+       if handle != original_window:
+           client.switch_to_window(handle)
+           print("Switched to window with '{}' loaded.".format(client.get_url()))
+   client.switch_to_window(original_window)
+
+Similarly, use :func:`~Marionette.switch_to_frame` to execute commands in the
+context of a new frame (e.g an <iframe> element):
+
+.. parsed-literal::
+   iframe = client.find_element(By.TAG_NAME, 'iframe')
+   client.switch_to_frame(iframe)
+   assert iframe == client.get_active_frame()
+
+Finally Marionette can switch between `chrome` and `content` scope. Chrome is a
+privileged scope where you can access things like the Firefox UI itself or the
+system app in Firefox OS. Content scope is where things like webpages or normal
+Firefox OS apps live. You can switch between `chrome` and `content` using the
+:func:`~Marionette.set_context` and :func:`~Marionette.using_context` functions:
+
+.. parsed-literal::
+   client.set_context(client.CONTEXT_CONTENT)
+   # content scope
+   with client.using_context(client.CONTEXT_CHROME):
+       #chrome scope
+       ... do stuff ...
+   # content scope restored
+
+
+Navigation
+----------
+
+Use :func:`~Marionette.navigate` to open a new website. It's also possible to
+move through the back/forward cache using :func:`~Marionette.go_forward` and
+:func:`~Marionette.go_back` respectively. To retrieve the currently
+open website, use :func:`~Marionette.get_url`:
+
+.. parsed-literal::
+   url = 'http://mozilla.org'
+   client.navigate(url)
+   client.go_back()
+   client.go_forward()
+   assert client.get_url() == url
+
+
+DOM Elements
+------------
+
+In order to inspect or manipulate actual DOM elements, they must first be found
+using the :func:`~Marionette.find_element` or :func:`~Marionette.find_elements`
+methods:
+
+.. parsed-literal::
+   from marionette import HTMLElement
+   element = client.find_element(By.ID, 'my-id')
+   assert type(element) == HTMLElement
+   elements = client.find_elements(By.TAG_NAME, 'a')
+   assert type(elements) == list
+
+For a full list of valid search strategies, see :doc:`advanced/findelement`.
+
+Now that an element has been found, it's possible to manipulate it:
+
+.. parsed-literal::
+   element.click()
+   element.send_keys('hello!')
+   print(element.get_attribute('style'))
+
+For the full list of possible commands, see the :class:`HTMLElement`
+reference.
+
+Be warned that a reference to an element object can become stale if it was
+modified or removed from the document. See :doc:`advanced/stale` for tips
+on working around this limitation.
+
+Script Execution
+----------------
+
+Sometimes Marionette's provided APIs just aren't enough and it is necessary to
+run arbitrary javascript. This is accomplished with the
+:func:`~Marionette.execute_script` and :func:`~Marionette.execute_async_script`
+functions. They accomplish what their names suggest, the former executes some
+synchronous JavaScript, while the latter provides a callback mechanism for
+running asynchronous JavaScript:
+
+.. parsed-literal::
+   result = client.execute_script("return arguments[0] + arguments[1];",
+                                  script_args=[2, 3])
+   assert result == 5
+
+The async method works the same way, except it won't return until a special
+`marionetteScriptFinished()` function is called:
+
+.. parsed-literal::
+   result = client.execute_async_script("""
+       setTimeout(function() {
+         marionetteScriptFinished("all done");
+       }, arguments[0]);
+   """, script_args=[1000])
+   assert result == "all done"
+
+Beware that running asynchronous scripts can potentially hang the program
+indefinitely if they are not written properly. It is generally a good idea to
+set a script timeout using :func:`~Marionette.set_script_timeout` and handling
+`ScriptTimeoutException`.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/conf.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/conf.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/conf.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/conf.py	2014-11-26 21:45:50.000000000 +0000
@@ -95,8 +95,20 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
+
 html_theme = 'default'
 
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:
+    try:
+        import sphinx_rtd_theme
+        html_theme = 'sphinx_rtd_theme'
+        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+    except ImportError:
+        pass
+
+
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/index.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/index.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/index.rst	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/index.rst	2014-11-26 21:45:50.000000000 +0000
@@ -1,220 +1,16 @@
-.. Marionette Python Client documentation master file, created by
-   sphinx-quickstart on Tue Aug  6 13:54:46 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Marionette Python Client
-========================
-
-The Marionette python client library allows you to remotely control a
-Gecko-based browser or device which is running a Marionette_
-server. This includes desktop Firefox and FirefoxOS (support for
-Firefox for Android is planned, but not yet fully implemented).
-
-.. _Marionette: https://developer.mozilla.org/en-US/docs/Marionette
-
-Getting Started
----------------
-
-Getting the Client
-^^^^^^^^^^^^^^^^^^
-
-We officially support a python client. The latest supported version of
-the client is available on pypi_, so you can download it via pip.
-This client should be used within a virtual environment to ensure that
-your environment is pristine:
-
-.. parsed-literal::
-
-   virtualenv venv
-   source venv/bin/activate
-   pip install marionette_client
-
-.. _pypi: https://pypi.python.org/pypi/marionette_client/
-
-Using the Client Interactively
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Once you installed the client and have Marionette running, you can fire
-up your favourite interactive python environment and start playing with
-Marionette. Let's use a typical python shell:
-
-.. parsed-literal::
-
-   python
-
-First, import Marionette:
-
-.. parsed-literal::
-   from marionette import Marionette
-
-Now create the client for this session. Assuming you're using the default
-port on a Marionette instance running locally:
-
-.. parsed-literal::
-
-   client = Marionette(host='localhost', port=2828)
-   client.start_session()
-
-This will return some id representing your session id. Now that you've
-established a connection, let's start doing interesting things:
-
-.. parsed-literal::
-
-   client.execute_script("alert('o hai there!');")
-
-You should now see this alert pop up! How exciting! Okay, let's do
-something practical. Close the dialog and try this:
-
-.. parsed-literal::
-
-   client.navigate("http://www.mozilla.org")
-
-Now you're at mozilla.org! You can even verify it using the following:
-
-.. parsed-literal::
-   client.get_url()
-
-You can even find an element and click on it. Let's say you want to get
-the first link:
-
-.. parsed-literal::
-   first_link = client.find_element("tag name", "a")
-
-first_link now holds a reference to the first link on the page. You can click it:
-
-.. parsed-literal::
-   first_link.click()
-
-Using the Client for Testing
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Please visit, our `Marionette Tests`_ section for information regarding testing.
-
-.. _Marionette Tests: https://developer.mozilla.org/en/Marionette/Tests
-
-.. automodule:: marionette
-
-Marionette Objects
-------------------
-.. autoclass:: Marionette
-
-Session Management
-^^^^^^^^^^^^^^^^^^
-.. automethod:: Marionette.start_session
-.. automethod:: Marionette.delete_session
-.. autoattribute:: Marionette.session_capabilities
-.. automethod:: Marionette.get_cookie
-.. automethod:: Marionette.get_cookies
-.. automethod:: Marionette.add_cookie
-.. automethod:: Marionette.delete_all_cookies
-
-Context Management
-^^^^^^^^^^^^^^^^^^
-.. autoattribute:: Marionette.current_window_handle
-.. autoattribute:: Marionette.window_handles
-.. automethod:: Marionette.set_context
-.. automethod:: Marionette.switch_to_frame
-.. automethod:: Marionette.switch_to_window
-.. automethod:: Marionette.get_active_frame
-.. automethod:: Marionette.close
-
-Navigation Methods
-^^^^^^^^^^^^^^^^^^
-.. autoattribute:: Marionette.title
-.. automethod:: Marionette.navigate
-.. automethod:: Marionette.get_url
-.. automethod:: Marionette.go_back
-.. automethod:: Marionette.go_forward
-.. automethod:: Marionette.refresh
-.. automethod:: Marionette.absolute_url
-.. automethod:: Marionette.get_window_type
-
-DOM Element Methods
-^^^^^^^^^^^^^^^^^^^
-.. automethod:: Marionette.set_search_timeout
-.. automethod:: Marionette.find_element
-.. automethod:: Marionette.find_elements
-
-Script Execution
-^^^^^^^^^^^^^^^^
-.. automethod:: Marionette.execute_script
-.. automethod:: Marionette.execute_async_script
-.. automethod:: Marionette.set_script_timeout
-
-Debugging
-^^^^^^^^^
-.. autoattribute:: Marionette.page_source
-.. automethod:: Marionette.log
-.. automethod:: Marionette.get_logs
-.. automethod:: Marionette.screenshot
-
-Querying and Modifying Document Content
----------------------------------------
-.. autoclass:: HTMLElement
-   :members:
-
-.. autoclass:: DateTimeValue
-   :members:
-
-Action Objects
---------------
-
-Action Sequences
-^^^^^^^^^^^^^^^^
-.. autoclass:: Actions
-   :members:
-
-Multi-action Sequences
-^^^^^^^^^^^^^^^^^^^^^^
-.. autoclass:: MultiActions
-   :members:
-
-Explicit Waiting and Expected Conditions
-----------------------------------------
-
-Waits are used to pause program execution
-until a given condition is true.
-This is a useful technique to employ
-when documents load new content or change
-after ``Document.readyState``'s value changes to "complete".
-
-Because Marionette returns control to the user
-when the document is completely loaded,
-any subsequent interaction with elements
-are subject to manual synchronisation.
-The reason for this is that Marionette
-does not keep a direct representation of the DOM,
-but instead exposes a way for the user to
-query the browser's DOM state.
-
-The `Wait` helper class provided by Marionette
-avoids some of the caveats of ``time.sleep(n)``,
-which sets the condition to an exact time period to wait.
-It will return immediately
-once the provided condition evaluates to true.
-
-In addition to writing your own custom conditions
-you can combine `Wait`
-with a number of ready-made expected conditions
-that are listed below.
-
-Waits
-^^^^^
-.. autoclass:: marionette.wait.Wait
-   :members:
-   :special-members:
-.. autoattribute marionette.wait.DEFAULT_TIMEOUT
-.. autoattribute marionette.wait.DEFAULT_INTERVAL
-
-Expected Conditions
-^^^^^^^^^^^^^^^^^^^
-.. automodule:: marionette.expected
-   :members:
+.. include:: basics.rst
 
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
+
+.. toctree::
+ :hidden:
+
+ Getting Started <basics>
+ Interactive Tutorial <interactive>
+ advanced/landing
+ reference
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/interactive.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/interactive.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/interactive.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/interactive.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,55 @@
+Using the Client Interactively
+==============================
+
+Once you installed the client and have Marionette running, you can fire
+up your favourite interactive python environment and start playing with
+Marionette. Let's use a typical python shell:
+
+.. parsed-literal::
+
+   python
+
+First, import Marionette:
+
+.. parsed-literal::
+   from marionette import Marionette
+
+Now create the client for this session. Assuming you're using the default
+port on a Marionette instance running locally:
+
+.. parsed-literal::
+
+   client = Marionette(host='localhost', port=2828)
+   client.start_session()
+
+This will return some id representing your session id. Now that you've
+established a connection, let's start doing interesting things:
+
+.. parsed-literal::
+
+   client.execute_script("alert('o hai there!');")
+
+You should now see this alert pop up! How exciting! Okay, let's do
+something practical. Close the dialog and try this:
+
+.. parsed-literal::
+
+   client.navigate("http://www.mozilla.org")
+
+Now you're at mozilla.org! You can even verify it using the following:
+
+.. parsed-literal::
+   client.get_url()
+
+You can even find an element and click on it. Let's say you want to get
+the first link:
+
+.. parsed-literal::
+   from marionette import By
+   first_link = client.find_element(By.TAG_NAME, "a")
+
+first_link now holds a reference to the first link on the page. You can click it:
+
+.. parsed-literal::
+   first_link.click()
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/reference.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/reference.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/docs/reference.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/docs/reference.rst	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,43 @@
+=============
+API Reference
+=============
+.. py:currentmodule:: marionette
+
+Marionette
+----------
+.. autoclass:: Marionette
+   :members:
+
+HTMLElement
+-----------
+.. autoclass:: HTMLElement
+   :members:
+
+DateTimeValue
+-------------
+.. autoclass:: DateTimeValue
+   :members:
+
+Actions
+-------
+.. autoclass:: Actions
+   :members:
+
+MultiActions
+------------
+.. autoclass:: MultiActions
+   :members:
+
+Wait
+----
+
+.. autoclass:: Wait
+   :members:
+   :special-members:
+.. autoattribute marionette.wait.DEFAULT_TIMEOUT
+.. autoattribute marionette.wait.DEFAULT_INTERVAL
+
+Built-in Conditions
+^^^^^^^^^^^^^^^^^^^
+.. automodule:: marionette.expected
+   :members:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/errors.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/errors.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/errors.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/errors.py	2014-11-26 21:45:50.000000000 +0000
@@ -31,6 +31,7 @@
     INVALID_RESPONSE = 53
     FRAME_SEND_NOT_INITIALIZED_ERROR = 54
     FRAME_SEND_FAILURE_ERROR = 55
+    FRAME_NOT_RESPONDING = 56
     UNSUPPORTED_OPERATION = 405
     MARIONETTE_ERROR = 500
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/geckoinstance.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/geckoinstance.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/geckoinstance.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/geckoinstance.py	2014-11-26 21:45:50.000000000 +0000
@@ -6,6 +6,7 @@
 import errno
 import platform
 import os
+import sys
 import time
 
 from mozprofile import Profile
@@ -15,7 +16,6 @@
 class GeckoInstance(object):
 
     required_prefs = {"marionette.defaultPrefs.enabled": True,
-                      "marionette.defaultPrefs.port": 2828,
                       "marionette.logging": True,
                       "startup.homepage_welcome_url": "about:blank",
                       "browser.shell.checkDefaultBrowser": False,
@@ -44,6 +44,7 @@
 
     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 not self.profile_path:
@@ -53,35 +54,44 @@
             profile_args["path_from"] = self.profile_path
             profile = Profile.clone(**profile_args)
 
-        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 = {
+            '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()
 
@@ -95,9 +105,7 @@
             cmdargs=['-no-remote', '-marionette'] + self.app_args,
             env=env,
             symbols_path=self.symbols_path,
-            process_args={
-                'processOutputLine': [NullOutput()],
-                'logfile': self.gecko_log})
+            process_args=process_args)
         self.runner.start()
 
     def close(self):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/gestures.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/gestures.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/gestures.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/gestures.py	2014-11-26 21:45:50.000000000 +0000
@@ -69,3 +69,15 @@
     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-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/marionette.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/marionette.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/marionette.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/marionette.py	2014-11-26 21:45:50.000000000 +0000
@@ -4,12 +4,10 @@
 
 import base64
 import ConfigParser
-import datetime
 import json
 import os
 import socket
 import StringIO
-import time
 import traceback
 import warnings
 
@@ -587,24 +585,9 @@
             s.close()
 
     def wait_for_port(self, timeout=60):
-        starttime = datetime.datetime.now()
-        poll_interval = 0.1
-        while datetime.datetime.now() - starttime < datetime.timedelta(seconds=timeout):
-            sock = None
-            try:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.connect((self.host, self.port))
-                data = sock.recv(16)
-                sock.close()
-                if ':' in data:
-                    return True
-            except socket.error:
-                pass
-            finally:
-                if sock:
-                    sock.close()
-            time.sleep(poll_interval)
-        return False
+        return MarionetteTransport.wait_for_port(self.host,
+                                                 self.port,
+                                                 timeout=timeout)
 
     @do_crash_check
     def _send_message(self, command, response_key="ok", **kwargs):
@@ -814,15 +797,17 @@
         '''
         return "%s%s" % (self.baseurl, relative_url)
 
-    def start_session(self, desired_capabilities=None, session_id=None):
+    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.
 
-        :params desired_capabilities: An optional dict of desired
+        :param desired_capabilities: An optional dict of desired
             capabilities.  This is currently ignored.
+        :param timeout: Timeout in seconds for the server to be ready.
 
         :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
@@ -1313,7 +1298,7 @@
         :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", "css selector", "link text" and
+                       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
@@ -1340,7 +1325,7 @@
         :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", "css selector", "link text" and
+                       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
@@ -1599,3 +1584,13 @@
         """
 
         return self._send_message("maximizeWindow", "ok")
+
+    def set_frame_timeout(self, timeout):
+        """ Set the OOP frame timeout value in ms. When focus is on a
+        remote frame, if the heartbeat pong is not received within this
+        specified value, the frame will timeout.
+
+        :param timeout: The frame timeout value in ms.
+        """
+
+        return self._send_message("setFrameTimeout", "ok", ms=timeout)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/runner/base.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/runner/base.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/runner/base.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/runner/base.py	2014-11-26 21:45:50.000000000 +0000
@@ -332,7 +332,7 @@
                         help='xml output')
         self.add_option('--testvars',
                         dest='testvars',
-                        action='store',
+                        action='append',
                         help='path to a json file with any test data required')
         self.add_option('--tree',
                         dest='tree',
@@ -379,7 +379,8 @@
                         help="Define the path to store log file. If the path is"
                              " a directory, the real log file will be created"
                              " given the format gecko-(timestamp).log. If it is"
-                             " a file, if will be used directly. Default: 'gecko.log'")
+                             " a file, if will be used directly. '-' may be passed"
+                             " to write to stdout. Default: './gecko.log'")
         self.add_option('--logger-name',
                         dest='logger_name',
                         action='store',
@@ -473,7 +474,6 @@
         self.logcat_stdout = logcat_stdout
         self.xml_output = xml_output
         self.repeat = repeat
-        self.testvars = {}
         self.test_kwargs = kwargs
         self.tree = tree
         self.type = type
@@ -514,17 +514,29 @@
 
         self.result_callbacks.append(gather_debug)
 
-        if testvars:
-            if not os.path.exists(testvars):
-                raise IOError('--testvars file does not exist')
-
-            try:
-                with open(testvars) as f:
-                    self.testvars = json.loads(f.read())
-            except ValueError as e:
-                json_path = os.path.abspath(testvars)
-                raise Exception("JSON file (%s) is not properly "
-                                "formatted: %s" % (json_path, e.message))
+        def update(d, u):
+            """ Update a dictionary that may contain nested dictionaries. """
+            for k, v in u.iteritems():
+                o = d.get(k, {})
+                if isinstance(v, dict) and isinstance(o, dict):
+                    d[k] = update(d.get(k, {}), v)
+                else:
+                    d[k] = u[k]
+            return d
+
+        self.testvars = {}
+        if testvars is not None:
+            for path in list(testvars):
+                if not os.path.exists(path):
+                    raise IOError('--testvars file %s does not exist' % path)
+                try:
+                    with open(path) as f:
+                        self.testvars = update(self.testvars,
+                                               json.loads(f.read()))
+                except ValueError as e:
+                    raise Exception("JSON file (%s) is not properly "
+                                    "formatted: %s" % (os.path.abspath(path),
+                                                       e.message))
 
         # set up test handlers
         self.test_handlers = []
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py	2014-11-26 21:45:50.000000000 +0000
@@ -29,6 +29,12 @@
         self.assertEqual(HTMLElement, type(found_el))
         self.assertEqual(el, found_el)
 
+    def test_that_we_can_find_elements_from_css_selectors(self):
+        el = self.marionette.execute_script("return window.document.getElementById('textInput');")
+        found_el = self.marionette.find_element(By.CSS_SELECTOR, "#textInput")
+        self.assertEqual(HTMLElement, type(found_el))
+        self.assertEqual(el, found_el)
+
     def test_child_element(self):
         el = self.marionette.find_element(By.ID, "textInput")
         parent = self.marionette.find_element(By.ID, "things")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py	2014-11-26 21:45:50.000000000 +0000
@@ -5,7 +5,7 @@
 from marionette_test import MarionetteTestCase
 from marionette import HTMLElement
 from by import By
-from errors import NoSuchElementException
+from errors import NoSuchElementException, InvalidSelectorException
 
 
 class TestElements(MarionetteTestCase):
@@ -154,3 +154,8 @@
         fbody = self.marionette.find_element(By.TAG_NAME, 'body')
         abody = self.marionette.get_active_element()
         self.assertEqual(fbody, abody)
+
+    def test_throws_error_when_trying_to_use_invalid_selector_type(self):
+        test_html = self.marionette.absolute_url("test.html")
+        self.marionette.navigate(test_html)
+        self.assertRaises(InvalidSelectorException, self.marionette.find_element, "Brie Search Type", "doesn't matter")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py	2014-11-26 21:45:50.000000000 +0000
@@ -14,6 +14,10 @@
         self.assertNotEqual("about:blank", self.marionette.execute_script("return window.location.href;"))
         self.assertEqual("Marionette Test", self.marionette.title)
 
+    def test_navigate_chrome_error(self):
+        with self.marionette.using_context("chrome"):
+            self.assertRaises(MarionetteException, self.marionette.navigate, "about:blank")
+
     def test_getUrl(self):
         test_html = self.marionette.absolute_url("test.html")
         self.marionette.navigate(test_html)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_set_frame_timeout.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_set_frame_timeout.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_set_frame_timeout.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_set_frame_timeout.py	2014-11-26 21:45:50.000000000 +0000
@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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_test import MarionetteTestCase
+
+class TestSetFrameTimeout(MarionetteTestCase):
+
+    def test_set_valid_frame_timeout(self):
+        self.marionette.set_frame_timeout(10000)
+
+    def test_set_invalid_frame_timeout(self):
+        with self.assertRaisesRegexp(MarionetteException, "Not a number"):
+            self.marionette.set_frame_timeout("timeout")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py	2014-11-26 21:45:50.000000000 +0000
@@ -27,6 +27,14 @@
             SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
             """)
 
+        with self.marionette.using_context('chrome'):
+            self.multi_process_browser = self.marionette.execute_script("""
+                try {
+                  return Services.appinfo.browserTabsRemoteAutostart;
+                } catch (e) {
+                  return false;
+                }""")
+
     def test_remote_frame(self):
         self.marionette.navigate(self.marionette.absolute_url("test.html"))
         self.marionette.execute_script("SpecialPowers.addPermission('browser', true, document)")
@@ -71,7 +79,8 @@
         main_process = self.marionette.execute_script("""
             return SpecialPowers.isMainProcess();
             """)
-        self.assertTrue(main_process)
+        should_be_main_process = not self.multi_process_browser
+        self.assertEqual(main_process, should_be_main_process)
         self.marionette.switch_to_frame(self.marionette.find_element("id",
                                                                      "remote_iframe"))
         main_process = self.marionette.execute_script("""
@@ -102,7 +111,8 @@
         main_process = self.marionette.execute_script("""
             return SpecialPowers.isMainProcess();
             """)
-        self.assertTrue(main_process)
+        should_be_main_process = not self.multi_process_browser
+        self.assertEqual(main_process, should_be_main_process)
         self.marionette.switch_to_frame(0)
         main_process = self.marionette.execute_script("""
             return SpecialPowers.isMainProcess();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/unit-tests.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/unit-tests.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/tests/unit/unit-tests.ini	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/tests/unit/unit-tests.ini	2014-11-26 21:45:50.000000000 +0000
@@ -133,4 +133,5 @@
 [test_set_window_size.py]
 b2g = false
 skip-if = os == "linux" # Bug 1085717
+[test_set_frame_timeout.py]
 [test_with_using_context.py]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/wait.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/wait.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/wait.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/wait.py	2014-11-26 21:45:50.000000000 +0000
@@ -125,7 +125,7 @@
             except self.exceptions as e:
                 last_exc = sys.exc_info()
 
-            if isinstance(rv, bool) and not rv:
+            if not rv:
                 self.clock.sleep(self.interval)
                 continue
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/www/test_windows.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/www/test_windows.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/marionette/www/test_windows.html	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/marionette/www/test_windows.html	2014-11-26 21:45:50.000000000 +0000
@@ -8,7 +8,7 @@
     <title>XHTML Test Page</title>
 </head>
 <body>
-    <p><a href="resultPage.html" onClick='javascript:window.open("resultPage.html",null, "menubar=0,location=1,resizable=1,scrollbars=1,status=0,dialog=1,width=700,height=375");' name="windowOne">Open new window</a></p>
+    <p><a href="resultPage.html" onClick='javascript:window.open("resultPage.html",null, "menubar=0,location=1,resizable=1,scrollbars=1,status=0,width=700,height=375");' name="windowOne">Open new window</a></p>
 </body>
 </html>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/requirements.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/requirements.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/client/requirements.txt	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/client/requirements.txt	2014-11-26 21:45:50.000000000 +0000
@@ -1,4 +1,4 @@
-marionette-transport == 0.3
+marionette-transport == 0.4
 manifestparser
 mozhttpd >= 0.5
 mozinfo >= 0.7
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/mach_commands.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/mach_commands.py	2014-11-26 21:45:50.000000000 +0000
@@ -128,6 +128,8 @@
         help='Test type, usually one of: browser, b2g, b2g-qemu.')
     @CommandArgument('--profile',
         help='Path to gecko profile to use.')
+    @CommandArgument('--gecko-log',
+        help='Path to gecko log file, or "-" for stdout.')
     @CommandArgument('tests', nargs='*', metavar='TESTS',
         help='Path to test(s) to run.')
     def run_marionette_test(self, tests, **kwargs):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-elements.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-elements.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-elements.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-elements.js	2014-11-26 21:45:50.000000000 +0000
@@ -293,7 +293,7 @@
     let startNode = (values.element != undefined) ?
                     this.getKnownElement(values.element, win) : win.document;
     if (this.elementStrategies.indexOf(values.using) < 0) {
-      throw new ElementException("No such strategy.", 17, null);
+      throw new ElementException("No such strategy.", 32, null);
     }
     let found = all ? this.findElements(values.using, values.value, win.document, startNode) :
                       this.findElement(values.using, values.value, win.document, startNode);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-frame-manager.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-frame-manager.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-frame-manager.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-frame-manager.js	2014-11-26 21:45:50.000000000 +0000
@@ -108,6 +108,16 @@
     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
 
+    // Grab the app name
+    let appName = null;
+    try {
+      appName = oopFrame.getAttribute("mozapp");
+    }
+    catch(e) {
+      appName = "mozapp name unavailable";
+      logger.info("Error getting mozapp: " + e.result)
+    }
+
     // 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++) {
@@ -133,7 +143,7 @@
         }
 
         mm.sendAsyncMessage("Marionette:restart", {});
-        return oopFrame.id;
+        return [oopFrame.id, appName];
       }
     }
 
@@ -150,7 +160,7 @@
 
     aFrame.specialPowersObserver = new specialpowers.SpecialPowersObserver();
     aFrame.specialPowersObserver.init(mm);
-    return oopFrame.id;
+    return [oopFrame.id, appName];
   },
 
   /*
@@ -166,6 +176,22 @@
     this.handledModal = false;
   },
 
+  /*
+   *  Remove specified frame from the remote frames list
+   */
+  removeRemoteFrame: function FM_removeRemoteFrame(frameId) {
+    logger.info("Deleting frame from remote frames list: " + frameId);
+    startLen = remoteFrames.length;
+    for (let i = 0; i < remoteFrames.length; i++) {
+      if (remoteFrames[i].frameId == frameId) {
+       remoteFrames.splice(i, 1);
+      }
+    }
+    if (remoteFrames.length == startLen) {
+     logger.info("Frame not found in remote frames list");
+    }
+  },
+
   /**
    * This function removes any SpecialPowersObservers from OOP frames.
    */
@@ -205,9 +231,11 @@
     messageManager.addWeakMessageListener("Marionette:addCookie", this.server);
     messageManager.addWeakMessageListener("Marionette:getVisibleCookies", this.server);
     messageManager.addWeakMessageListener("Marionette:deleteCookie", this.server);
+    messageManager.addWeakMessageListener("Marionette:pong", this.server);
     messageManager.addWeakMessageListener("MarionetteFrame:handleModal", this);
     messageManager.addWeakMessageListener("MarionetteFrame:getCurrentFrameId", this);
     messageManager.addWeakMessageListener("MarionetteFrame:getInterruptedState", this);
+    messageManager.addWeakMessageListener("Marionette:startHeartbeat", this.server);
   },
 
   /**
@@ -236,8 +264,10 @@
     messageManager.removeWeakMessageListener("Marionette:addCookie", this.server);
     messageManager.removeWeakMessageListener("Marionette:getVisibleCookies", this.server);
     messageManager.removeWeakMessageListener("Marionette:deleteCookie", this.server);
+    messageManager.removeWeakMessageListener("Marionette:pong", this.server);
     messageManager.removeWeakMessageListener("MarionetteFrame:handleModal", this);
     messageManager.removeWeakMessageListener("MarionetteFrame:getCurrentFrameId", this);
+    messageManager.removeWeakMessageListener("Marionette:startHeartbeat", this.server);
   },
 
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-listener.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-listener.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-listener.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-listener.js	2014-11-26 21:45:50.000000000 +0000
@@ -188,6 +188,7 @@
   addMessageListenerId("Marionette:getCookies", getCookies);
   addMessageListenerId("Marionette:deleteAllCookies", deleteAllCookies);
   addMessageListenerId("Marionette:deleteCookie", deleteCookie);
+  addMessageListenerId("Marionette:ping", ping);
 }
 
 /**
@@ -290,6 +291,7 @@
   removeMessageListenerId("Marionette:getCookies", getCookies);
   removeMessageListenerId("Marionette:deleteAllCookies", deleteAllCookies);
   removeMessageListenerId("Marionette:deleteCookie", deleteCookie);
+  removeMessageListenerId("Marionette:ping", ping);
   if (isB2G) {
     content.removeEventListener("mozbrowsershowmodalprompt", modalHandler, false);
   }
@@ -1287,6 +1289,8 @@
       if (curFrame.document.readyState == "complete") {
         removeEventListener("DOMContentLoaded", onDOMContentLoaded, false);
         sendOk(command_id);
+        // Restart the OOP frame heartbeat now that the URL is loaded
+        sendToServer("Marionette:startHeartbeat");
       }
       else if (curFrame.document.readyState == "interactive" &&
                errorRegex.exec(curFrame.document.baseURI)) {
@@ -1918,6 +1922,13 @@
                msg.json.command_id);
 }
 
+/**
+ * Received heartbeat ping
+ */
+function ping(msg) {
+  sendToServer("Marionette:pong", {}, msg.json.command_id);
+}
+
 // emulator callbacks
 let _emu_cb_id = 0;
 let _emu_cbs = {};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-server.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-server.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/marionette-server.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/marionette-server.js	2014-11-26 21:45:50.000000000 +0000
@@ -98,18 +98,14 @@
   this.code = 54;
   this.frame = frame;
   this.message = "Error sending message to frame (NS_ERROR_NOT_INITIALIZED)";
-  this.toString = function() {
-    return this.message + " " + this.frame + "; frame has closed.";
-  }
+  this.errMsg = this.message + " " + this.frame + "; frame has closed.";
 }
 
 function FrameSendFailureError(frame) {
   this.code = 55;
   this.frame = frame;
   this.message = "Error sending message to frame (NS_ERROR_FAILURE)";
-  this.toString = function() {
-    return this.message + " " + this.frame + "; frame not responding.";
-  }
+  this.errMsg = this.message + " " + this.frame + "; frame not responding.";
 }
 
 /**
@@ -155,6 +151,11 @@
   this.currentFrameElement = null;
   this.testName = null;
   this.mozBrowserClose = null;
+  this.frameHeartbeatTimer = null;
+  this.frameHeartbeatLastPong = null;
+  this.frameHeartbeatLastApp = null;
+  this.frameHeartbeatExceptionPending = false;
+  this.frameTimeout = 5000; // default, set with setFrameTimeout
   this.oopFrameId = null; // frame ID of current remote frame, used for mozbrowserclose events
   this.sessionCapabilities = {
     // Mandated capabilities
@@ -243,11 +244,21 @@
    * @param object values
    *        Object to send to the listener
    */
-  sendAsync: function MDA_sendAsync(name, values, commandId, ignoreFailure) {
+  sendAsync: function MDA_sendAsync(name, values, commandId, ignoreFailure, throwError) {
     let success = true;
     if (commandId) {
       values.command_id = commandId;
     }
+    if (typeof(throwError) !== "boolean") {
+      throwError = false;
+    }
+    if (this.frameHeartbeatExceptionPending) {
+      // Previous frame was not responding; send exception indicating have switched to system frame
+      this.frameHeartbeatExceptionPending = false;
+      let errorTxt = "Frame not responding (" + this.frameHeartbeatLastApp + "), switching to root frame";
+      this.sendError(errorTxt, 56, null, this.command_id);
+      return false;
+    }
     if (this.curBrowser.frameManager.currentRemoteFrame !== null) {
       try {
         this.messageManager.sendAsyncMessage(
@@ -268,7 +279,12 @@
               break;
           }
           let code = error.hasOwnProperty('code') ? e.code : 500;
-          this.sendError(error.toString(), code, error.stack, commandId);
+          if (throwError == false) {
+            this.sendError(error.toString(), code, error.stack, commandId);
+          }
+          else {
+            throw {message:"sendAsync failed: " + error.hasOwnProperty('type'), code, stack:null};
+          }
         }
       }
     }
@@ -481,16 +497,32 @@
    *        True if this is the first time we're talking to this browser
    */
   whenBrowserStarted: function MDA_whenBrowserStarted(win, newSession) {
+    utils.window = win;
+
     try {
+      let mm = win.window.messageManager;
+      if (!newSession) {
+        // Loading the frame script corresponds to a situation we need to
+        // return to the server. If the messageManager is a message broadcaster
+        // with no children, we don't have a hope of coming back from this call,
+        // so send the ack here. Otherwise, make a note of how many child scripts
+        // will be loaded so we known when it's safe to return.
+        if (mm.childCount === 0) {
+          this.sendOk(this.command_id);
+        } else {
+          this.curBrowser.frameRegsPending = mm.childCount;
+        }
+      }
+
       if (!Services.prefs.getBoolPref("marionette.contentListener") || !newSession) {
-        this.curBrowser.loadFrameScript(FRAME_SCRIPT, win);
+        mm.loadFrameScript(FRAME_SCRIPT, true, true);
+        Services.prefs.setBoolPref("marionette.contentListener", true);
       }
     }
     catch (e) {
       //there may not always be a content process
       logger.info("could not load listener into content for page: " + win.location.href);
     }
-    utils.window = win;
   },
 
   /**
@@ -708,6 +740,10 @@
     else {
       this.context = context;
       this.sendOk(this.command_id);
+      // Stop the OOP frame heartbeat if switched into chrome
+      if (context == "chrome") {
+        this.stopHeartbeat();
+      }
     }
   },
 
@@ -1163,10 +1199,22 @@
     if (this.context != "chrome") {
       aRequest.command_id = command_id;
       aRequest.parameters.pageTimeout = this.pageTimeout;
+      // stop OOP frame heartbeat if it's running, so it won't timeout during URL load
+      this.stopHeartbeat();
       this.sendAsync("get", aRequest.parameters, command_id);
       return;
     }
 
+    // At least on desktop, navigating in chrome scope does not
+    // correspond to something a user can do, and leaves marionette
+    // and the browser in an unusable state. Return a generic error insted.
+    // TODO: Error codes need to be refined as a part of bug 1100545 and
+    // bug 945729.
+    if (appName == "Firefox") {
+      sendError("Cannot navigate in chrome context", 13, null, command_id);
+      return;
+    }
+
     this.getCurrentWindow().location.href = aRequest.parameters.url;
     let checkTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
     let start = new Date().getTime();
@@ -1395,8 +1443,8 @@
         else {
           utils.window = foundWin;
           this.curBrowser = this.browsers[winId];
+          this.sendOk(command_id);
         }
-        this.sendOk(command_id);
         return;
       }
     }
@@ -1445,7 +1493,6 @@
         this.sendError("Error loading page", 13, null, command_id);
         return;
       }
-
       checkTimer.initWithCallback(checkLoad.bind(this), 100, Ci.nsITimer.TYPE_ONE_SHOT);
     }
     if (this.context == "chrome") {
@@ -2301,6 +2348,7 @@
    */
   deleteSession: function MDA_deleteSession() {
     let command_id = this.command_id = this.getCommandId();
+    this.stopHeartbeat();
     try {
       this.sessionTearDown();
     }
@@ -2616,6 +2664,22 @@
   },
 
   /**
+   * Sets the OOP frame timeout value (ms)
+   */
+  setFrameTimeout: function MDA_setFrameTimeout(aRequest) {
+    this.command_id = this.getCommandId();
+    let timeout = parseInt(aRequest.parameters.ms);
+    if (isNaN(timeout)) {
+      this.sendError("Not a number", 500, null, this.command_id);
+      return;
+    }
+    else {
+      this.frameTimeout = timeout;
+    }
+    this.sendOk(this.command_id);
+  },
+
+  /**
    * Helper function to convert an outerWindowID into a UID that Marionette
    * tracks.
    */
@@ -2625,6 +2689,54 @@
   },
 
   /**
+   * Start the OOP frame heartbeat
+   */
+  startHeartbeat: function MDA_startHeartbeat() {
+    this.frameHeartbeatLastPong = new Date().getTime();
+    function pulse() {
+      let noResponse = false;
+      let now = new Date().getTime();
+      let elapsed = now - this.frameHeartbeatLastPong;
+      try {
+        if (elapsed > this.frameTimeout) {
+          throw {message:null, code:56, stack:null};
+        }
+        let result = this.sendAsync("ping", {}, this.command_id, false, true);
+        if (result == false) {
+          throw {message:null, code:56, stack:null};
+        }
+      }
+      catch (e) {
+        let lastApp = this.frameHeartbeatLastApp ? this.frameHeartbeatLastApp : "undefined";
+        this.stopHeartbeat();
+        this.curBrowser.frameManager.removeRemoteFrame(this.curBrowser.frameManager.currentRemoteFrame.frameId);
+        this.switchToGlobalMessageManager();
+        // If there is an active request, send back an exception now, otherwise wait until next request
+        if (this.command_id) {
+          let errorTxt = "Frame not responding (" + lastApp + "), switching to root frame";
+          this.sendError(errorTxt, e.code, e.stack, this.command_id);
+        }
+        else {
+          this.frameHeartbeatExceptionPending = true;
+        }
+        return;
+      }
+    }
+    this.frameHeartbeatTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    this.frameHeartbeatTimer.initWithCallback(pulse.bind(this), 500, Ci.nsITimer.TYPE_REPEATING_PRECISE_CAN_SKIP);
+  },
+
+  /**
+   * Stop the OOP frame heartbeat
+   */
+  stopHeartbeat: function MDA_stopHeartbeat() {
+    if (this.frameHeartbeatTimer !== null) {
+      this.frameHeartbeatTimer.cancel();
+      this.frameHeartbeatTimer = null;
+    }
+  },
+
+  /**
    * Receives all messages from content messageManager
    */
   receiveMessage: function MDA_receiveMessage(message) {
@@ -2660,7 +2772,7 @@
         this.sendToClient(message.json, -1);
         break;
       case "Marionette:switchToFrame":
-        this.oopFrameId = this.curBrowser.frameManager.switchToFrame(message);
+        [this.oopFrameId, this.frameHeartbeatLastApp] = this.curBrowser.frameManager.switchToFrame(message);
         this.messageManager = this.curBrowser.frameManager.currentRemoteFrame.messageManager.get();
         break;
       case "Marionette:switchToModalOrigin":
@@ -2681,6 +2793,7 @@
           }
           this.currentFrameElement = message.json.frameValue;
         }
+        this.stopHeartbeat();
         break;
       case "Marionette:getVisibleCookies":
         let [currentPath, host] = message.json.value;
@@ -2744,6 +2857,7 @@
           // is from a remote frame.
           this.curBrowser.frameManager.currentRemoteFrame.targetFrameId = this.generateFrameId(message.json.value);
           this.sendOk(this.command_id);
+          this.startHeartbeat();
         }
 
         let browserType;
@@ -2777,6 +2891,16 @@
             this.newSessionCommandId = null;
           }
         }
+        if (this.curBrowser.frameRegsPending) {
+          if (this.curBrowser.frameRegsPending > 0) {
+            this.curBrowser.frameRegsPending -= 1;
+          }
+          if (this.curBrowser.frameRegsPending === 0) {
+            // In case of a freshly registered window, we're responsible here
+            // for sending the ack.
+            this.sendOk(this.command_id);
+          }
+        }
         return [reg, mainContent];
       case "Marionette:emitTouchEvent":
         let globalMessageManager = Cc["@mozilla.org/globalmessagemanager;1"]
@@ -2784,6 +2908,12 @@
         globalMessageManager.broadcastAsyncMessage(
           "MarionetteMainListener:emitTouchEvent", message.json);
         return;
+      case "Marionette:pong":
+        this.frameHeartbeatLastPong = new Date().getTime();
+        break;
+      case "Marionette:startHeartbeat":
+        this.startHeartbeat();
+        break;
     }
   }
 };
@@ -2867,7 +2997,8 @@
   "setScreenOrientation": MarionetteServerConnection.prototype.setScreenOrientation,
   "getWindowSize": MarionetteServerConnection.prototype.getWindowSize,
   "setWindowSize": MarionetteServerConnection.prototype.setWindowSize,
-  "maximizeWindow": MarionetteServerConnection.prototype.maximizeWindow
+  "maximizeWindow": MarionetteServerConnection.prototype.maximizeWindow,
+  "setFrameTimeout": MarionetteServerConnection.prototype.setFrameTimeout
 };
 
 /**
@@ -2889,7 +3020,7 @@
   this.startPage = "about:blank";
   this.mainContentId = null; // used in B2G to identify the homescreen content page
   this.newSession = true; //used to set curFrameId upon new session
-  this.elementManager = new ElementManager([SELECTOR, NAME, LINK_TEXT, PARTIAL_LINK_TEXT]);
+  this.elementManager = new ElementManager([NAME, LINK_TEXT, PARTIAL_LINK_TEXT]);
   this.setBrowser(win);
   this.frameManager = new FrameManager(server); //We should have one FM per BO so that we can handle modals in each Browser
 
@@ -2956,19 +3087,6 @@
   },
 
   /**
-   * Loads content listeners if we don't already have them
-   *
-   * @param string script
-   *        path of script to load
-   * @param nsIDOMWindow frame
-   *        frame to load the script in
-   */
-  loadFrameScript: function BO_loadFrameScript(script, frame) {
-    frame.window.messageManager.loadFrameScript(script, true, true);
-    Services.prefs.setBoolPref("marionette.contentListener", true);
-  },
-
-  /**
    * Registers a new frame, and sets its current frame id to this frame
    * if it is not already assigned, and if a) we already have a session
    * or b) we're starting a new session and it is the right start frame.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/transport/marionette_transport/transport.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/transport/marionette_transport/transport.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/transport/marionette_transport/transport.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/transport/marionette_transport/transport.py	2014-11-26 21:45:50.000000000 +0000
@@ -2,9 +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/.
 
+import datetime
 import errno
 import json
 import socket
+import time
 
 
 class MarionetteTransport(object):
@@ -107,3 +109,25 @@
         if self.sock:
             self.sock.close()
         self.sock = None
+
+    @staticmethod
+    def wait_for_port(host, port, timeout=60):
+        """ Wait for the specified Marionette host/port to be available."""
+        starttime = datetime.datetime.now()
+        poll_interval = 0.1
+        while datetime.datetime.now() - starttime < datetime.timedelta(seconds=timeout):
+            sock = None
+            try:
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.connect((host, port))
+                data = sock.recv(16)
+                sock.close()
+                if ':' in data:
+                    return True
+            except socket.error:
+                pass
+            finally:
+                if sock:
+                    sock.close()
+            time.sleep(poll_interval)
+        return False
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/transport/setup.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/transport/setup.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/marionette/transport/setup.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/marionette/transport/setup.py	2014-11-26 21:45:50.000000000 +0000
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3'
+version = '0.4'
 
 long_description = \
 """Marionette_ is a Mozilla project to enable remote automation in Gecko-based
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/chunkifyTests.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/chunkifyTests.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/chunkifyTests.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/chunkifyTests.js	2014-11-26 21:45:50.000000000 +0000
@@ -80,6 +80,8 @@
     var test_path;
     if ((tests[i] instanceof Object) && ('test' in tests[i])) {
       test_path = tests[i]['test']['url'];
+    } else if ((tests[i] instanceof Object) && ('url' in tests[i])) {
+      test_path = tests[i]['url'];
     } else {
       test_path = tests[i];
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/jetpack-addon-harness.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/jetpack-addon-harness.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/jetpack-addon-harness.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/jetpack-addon-harness.js	2014-11-26 21:45:50.000000000 +0000
@@ -47,6 +47,9 @@
               logLevel: "verbose",
               format: "tbpl",
             },
+            console: {
+              logLevel: "info",
+            },
           }
           setPrefs("extensions." + install.addon.id + ".sdk", options);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/jetpack-package-harness.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/jetpack-package-harness.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/jetpack-package-harness.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/jetpack-package-harness.js	2014-11-26 21:45:50.000000000 +0000
@@ -156,6 +156,9 @@
           logLevel: "verbose",
           format: "tbpl",
         },
+        console: {
+          logLevel: "info",
+        },
       }
       setPrefs("extensions." + TEST_ID + ".sdk", options);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/mochitest_options.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/mochitest_options.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/mochitest_options.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/mochitest_options.py	2014-11-26 21:45:50.000000000 +0000
@@ -9,7 +9,6 @@
 import os
 import tempfile
 
-from automationutils import addCommonOptions
 from mozprofile import DEFAULT_PORTS
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -435,6 +434,35 @@
           "dest": "gmp_path",
           "help": "Path to fake GMP plugin. Will be deduced from the binary if not passed.",
         }],
+        [["--xre-path"],
+        { "action": "store",
+          "type": "string", 
+          "dest": "xrePath",
+          "default": None,    # individual scripts will set a sane default
+          "help": "absolute path to directory containing XRE (probably xulrunner)",
+        }],
+        [["--symbols-path"],
+        { "action": "store", 
+          "type": "string", 
+          "dest": "symbolsPath",
+          "default": None,
+          "help": "absolute path to directory containing breakpad symbols, or the URL of a zip file containing symbols",
+        }],
+        [["--debugger"],
+        { "action": "store", 
+          "dest": "debugger",
+          "help": "use the given debugger to launch the application",
+        }],
+        [["--debugger-args"],
+        { "action": "store",
+          "dest": "debuggerArgs",
+          "help": "pass the given args to the debugger _before_ the application on the command line",
+        }],
+        [["--debugger-interactive"],
+        { "action": "store_true",
+          "dest": "debuggerInteractive",
+          "help": "prevents the test harness from redirecting stdout and stderr for interactive debuggers",
+        }],
     ]
 
     def __init__(self, **kwargs):
@@ -446,7 +474,6 @@
             if "default" in value and isinstance(value["default"], list):
                 value["default"] = []
             self.add_option(*option, **value)
-        addCommonOptions(self)
         self.set_usage(self.__doc__)
 
     def verifyOptions(self, options, mochitest):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/redirect.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/redirect.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/redirect.html	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/redirect.html	2014-11-26 21:45:50.000000000 +0000
@@ -17,9 +17,20 @@
       document.dispatchEvent(event);
     }
 
-    function onLoad() {
+    function redirectToHarness()
+    {
       redirect("chrome://mochikit/content/harness.xul");
     }
+
+    function onLoad() {
+      // Wait for MozAfterPaint, since the listener in browser-test.js is not
+      // added until then.
+      window.addEventListener("MozAfterPaint", function testOnMozAfterPaint() {
+        window.removeEventListener("MozAfterPaint", testOnMozAfterPaint);
+        setTimeout(redirectToHarness, 0);
+      });
+
+    }
   </script>
 </head>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/runtests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/runtests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/runtests.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/runtests.py	2014-11-26 21:45:50.000000000 +0000
@@ -515,6 +515,8 @@
         self.urlOpts.append("timeout=%d" % options.timeout)
       if options.closeWhenDone:
         self.urlOpts.append("closeWhenDone=1")
+      if options.webapprtContent:
+        self.urlOpts.append("testRoot=webapprtContent")
       if options.logFile:
         self.urlOpts.append("logFile=" + encodeURIComponent(options.logFile))
         self.urlOpts.append("fileLevel=" + encodeURIComponent(options.fileLevel))
@@ -575,6 +577,8 @@
       return "a11y"
     elif options.webapprtChrome:
       return "webapprt-chrome"
+    elif options.webapprtContent:
+      return "webapprt-content"
     else:
       return "mochitest"
 
@@ -630,6 +634,8 @@
         self.testRoot = 'a11y'
       elif options.webapprtChrome:
         self.testRoot = 'webapprtChrome'
+      elif options.webapprtContent:
+        self.testRoot = 'webapprtContent'
       elif options.chrome:
         self.testRoot = 'chrome'
       else:
@@ -1705,6 +1711,10 @@
 
     self.setTestRoot(options)
 
+    # Until we have all green, this only runs on bc* jobs (not dt* jobs)
+    if options.browserChrome and not options.subsuite:
+      options.runByDir = True
+
     if not options.runByDir:
       return self.runMochitests(options, onLaunch)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html	2014-11-26 21:45:50.000000000 +0000
@@ -156,6 +156,9 @@
       check = false;
       window.addEventListener("compositionend", function() { check = true; }, false);
       synthesizeComposition({ type: "compositionend", data: "a" });
+      is(check, false, 'synthesizeComposition() should not dispatch compositionend');
+
+      synthesizeComposition({ type: "compositioncommit", data: "a" });
       is(check, true, 'synthesizeComposition() should dispatch compositionend');
 
       var querySelectedText = synthesizeQuerySelectedText();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js	2014-11-26 21:45:50.000000000 +0000
@@ -305,12 +305,13 @@
     var pressure = ("pressure" in aEvent) ? aEvent.pressure : 0;
     var inputSource = ("inputSource" in aEvent) ? aEvent.inputSource : 0;
     var synthesized = ("isSynthesized" in aEvent) ? aEvent.isSynthesized : true;
+    var isPrimary = ("isPrimary" in aEvent) ? aEvent.isPrimary : false;
 
     if (("type" in aEvent) && aEvent.type) {
       defaultPrevented = utils.sendPointerEventToWindow(aEvent.type, left, top, button,
                                                         clickCount, modifiers, false,
                                                         pressure, inputSource,
-                                                        synthesized);
+                                                        synthesized, 0, 0, 0, 0, isPrimary);
     }
     else {
       utils.sendPointerEventToWindow("pointerdown", left, top, button, clickCount, modifiers, false, pressure, inputSource);
@@ -870,12 +871,13 @@
  *
  * @param aEvent               The composition event information.  This must
  *                             have |type| member.  The value must be
- *                             "compositionstart" or "compositionend".
+ *                             "compositionstart", "compositionend",
+ *                             "compositioncommitasis" or "compositioncommit".
  *                             And also this may have |data| and |locale| which
  *                             would be used for the value of each property of
- *                             the composition event.  Note that the data would
- *                             be ignored if the event type were
- *                             "compositionstart".
+ *                             the composition event.  Note that the |data| is
+ *                             ignored if the event type is "compositionstart"
+ *                             or "compositioncommitasis".
  * @param aWindow              Optional (If null, current |window| will be used)
  */
 function synthesizeComposition(aEvent, aWindow)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/tests/SimpleTest/setup.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/tests/SimpleTest/setup.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mochitest/tests/SimpleTest/setup.js	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mochitest/tests/SimpleTest/setup.js	2014-11-26 21:45:50.000000000 +0000
@@ -76,6 +76,8 @@
   params.testPrefix = "chrome://mochitests/content/chrome/";
 } else if (params.testRoot == "a11y") {
   params.testPrefix = "chrome://mochitests/content/a11y/";
+} else if (params.testRoot == "webapprtContent") {
+  params.testPrefix = "/webapprtContent/";
 } else {
   params.testPrefix = "/tests/";
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/docs/_static/structured_example.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/docs/_static/structured_example.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/docs/_static/structured_example.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/docs/_static/structured_example.py	2014-11-26 21:45:50.000000000 +0000
@@ -3,7 +3,7 @@
 import traceback
 import types
 
-from mozlog.structured import structuredlog, commandline
+from mozlog.structured import commandline, get_default_logger
 
 class TestAssertion(Exception):
     pass
@@ -35,8 +35,8 @@
     assert_equals(2 + 2, 5)
 
 class TestRunner(object):
-    def __init__(self, logger):
-        self.logger = logger
+    def __init__(self):
+        self.logger = get_default_logger(component='TestRunner')
 
     def gather_tests(self):
         for item in globals().itervalues():
@@ -81,7 +81,7 @@
 
     logger = commandline.setup_logging("structured-example", args, {"raw": sys.stdout})
 
-    runner = TestRunner(logger)
+    runner = TestRunner()
     try:
         runner.run()
     except:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py	2014-11-26 21:45:50.000000000 +0000
@@ -637,7 +637,7 @@
                 raise DMError("bad status for device %s: %s" % (self._deviceSerial, deviceStatus))
 
         # Check to see if we can connect to device and run a simple command
-        if self._checkCmd(["shell", "echo"]) is None:
+        if not self._checkCmd(["shell", "echo"]) == 0:
             raise DMError("unable to connect to device")
 
     def _checkForRoot(self):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozinstall/mozinstall/mozinstall.py	2014-11-26 21:45:50.000000000 +0000
@@ -237,7 +237,7 @@
 
     """
     try:
-        proc = subprocess.Popen('hdiutil attach %s' % src,
+        proc = subprocess.Popen('hdiutil attach -nobrowse -noautoopen %s' % src,
                                 shell=True,
                                 stdout=subprocess.PIPE)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/mozlog/structured/commandline.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/mozlog/structured/commandline.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/mozlog/structured/commandline.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/mozlog/structured/commandline.py	2014-11-26 21:45:50.000000000 +0000
@@ -76,8 +76,10 @@
                              help=help_str)
         for optname, (cls, help_str, formatters, action) in fmt_options.iteritems():
             for fmt in formatters:
-                group.add_option("--log-%s-%s" % (fmt, optname), action=action,
-                                 help=help_str, default=None)
+                # make sure fmt wasn't removed from log_formatters
+                if fmt in log_formatters:
+                    group.add_option("--log-%s-%s" % (fmt, optname), action=action,
+                                     help=help_str, default=None)
         parser.add_option_group(group)
     else:
         group = parser.add_argument_group(group_name,
@@ -88,8 +90,10 @@
 
         for optname, (cls, help_str, formatters, action) in fmt_options.iteritems():
             for fmt in formatters:
-                group.add_argument("--log-%s-%s" % (fmt, optname), action=action,
-                                   help=help_str, default=None)
+                # make sure fmt wasn't removed from log_formatters
+                if fmt in log_formatters:
+                    group.add_argument("--log-%s-%s" % (fmt, optname), action=action,
+                                       help=help_str, default=None)
 
 
 def setup_handlers(logger, formatters, formatter_options):
@@ -124,7 +128,7 @@
     Configure a structuredlogger based on command line arguments.
 
     The created structuredlogger will also be set as the default logger, and
-    can be retrieved with :py:func:`get_default_logger`.
+    can be retrieved with :py:func:`~mozlog.structured.structuredlog.get_default_logger`.
 
     :param suite: The name of the testsuite being run
     :param args: A dictionary of {argument_name:value} produced from
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/mozlog/structured/structuredlog.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/mozlog/structured/structuredlog.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/mozlog/structured/structuredlog.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/mozlog/structured/structuredlog.py	2014-11-26 21:45:50.000000000 +0000
@@ -79,6 +79,10 @@
 
     It can then be retrieved with :py:func:`get_default_logger`
 
+    Note that :py:func:`~mozlog.structured.commandline.setup_logging` will
+    set a default logger for you, so there should be no need to call this
+    function if you're using setting up logging that way (recommended).
+
     :param default_logger: The logger to set to default.
     """
     global _default_logger_name
@@ -97,7 +101,11 @@
         self.handlers = []
         self.running_tests = set()
         self.suite_started = False
+        self.component_states = {}
 
+class ComponentState(object):
+    def __init__(self):
+        self.filter_ = None
 
 class StructuredLogger(object):
     _lock = Lock()
@@ -116,9 +124,11 @@
             if name not in self._logger_states:
                 self._logger_states[name] = LoggerState()
 
-    @property
-    def _state(self):
-        return self._logger_states[self.name]
+            if component not in self._logger_states[name].component_states:
+                self._logger_states[name].component_states[component] = ComponentState()
+
+        self._state = self._logger_states[name]
+        self._component_state = self._state.component_states[component]
 
     def add_handler(self, handler):
         """Add a handler to the current logger"""
@@ -137,6 +147,14 @@
         message is logged from this logger"""
         return self._state.handlers
 
+    @property
+    def component_filter(self):
+        return self._component_state.filter_
+
+    @component_filter.setter
+    def component_filter(self, value):
+        self._component_state.filter_ = value
+
     def log_raw(self, raw_data):
         if "action" not in raw_data:
             raise ValueError
@@ -166,6 +184,11 @@
 
     def _handle_log(self, data):
         with self._lock:
+            if self.component_filter:
+                data = self.component_filter(data)
+                if data is None:
+                    return
+
             for handler in self.handlers:
                 handler(data)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/setup.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/setup.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/setup.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/setup.py	2014-11-26 21:45:50.000000000 +0000
@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 
 PACKAGE_NAME = 'mozlog'
-PACKAGE_VERSION = '2.7'
+PACKAGE_VERSION = '2.8'
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/tests/test_structured.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/tests/test_structured.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozlog/tests/test_structured.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozlog/tests/test_structured.py	2014-11-26 21:45:50.000000000 +0000
@@ -30,6 +30,10 @@
     def last_item(self):
         return self.items[-1]
 
+    @property
+    def empty(self):
+        return not self.items
+
 
 class BaseStructuredTest(unittest.TestCase):
     def setUp(self):
@@ -365,7 +369,7 @@
                                 "message": "line 4"})
 
 
-class TestTypeconversions(BaseStructuredTest):
+class TestTypeConversions(BaseStructuredTest):
     def test_raw(self):
         self.logger.log_raw({"action":"suite_start", "tests":[1], "time": "1234"})
         self.assert_log_equals({"action": "suite_start",
@@ -434,6 +438,82 @@
         self.logger.suite_end()
 
 
+class TestComponentFilter(BaseStructuredTest):
+    def test_filter_component(self):
+        component_logger = structuredlog.StructuredLogger(self.logger.name,
+                                                          "test_component")
+        component_logger.component_filter = handlers.LogLevelFilter(lambda x:x, "info")
+
+        self.logger.debug("Test")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log",
+                                "level": "DEBUG",
+                                "message": "Test"})
+        self.assertTrue(self.handler.empty)
+
+        component_logger.info("Test 1")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log",
+                                "level": "INFO",
+                                "message": "Test 1",
+                                "component": "test_component"})
+
+        component_logger.debug("Test 2")
+        self.assertTrue(self.handler.empty)
+
+        component_logger.component_filter = None
+
+        component_logger.debug("Test 3")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log",
+                                "level": "DEBUG",
+                                "message": "Test 3",
+                                "component": "test_component"})
+
+    def test_filter_default_component(self):
+        component_logger = structuredlog.StructuredLogger(self.logger.name,
+                                                          "test_component")
+
+        self.logger.debug("Test")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log",
+                                "level": "DEBUG",
+                                "message": "Test"})
+
+        self.logger.component_filter = handlers.LogLevelFilter(lambda x:x, "info")
+
+        self.logger.debug("Test 1")
+        self.assertTrue(self.handler.empty)
+
+        component_logger.debug("Test 2")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log",
+                                "level": "DEBUG",
+                                "message": "Test 2",
+                                "component": "test_component"})
+
+        self.logger.component_filter = None
+
+        self.logger.debug("Test 3")
+        self.assertFalse(self.handler.empty)
+        self.assert_log_equals({"action": "log",
+                                "level": "DEBUG",
+                                "message": "Test 3"})
+
+    def test_filter_message_mutuate(self):
+        def filter_mutate(msg):
+            if msg["action"] == "log":
+                msg["message"] = "FILTERED! %s" % msg["message"]
+            return msg
+
+        self.logger.component_filter = filter_mutate
+        self.logger.debug("Test")
+        self.assert_log_equals({"action": "log",
+                                "level": "DEBUG",
+                                "message": "FILTERED! Test"})
+        self.logger.component_filter = None
+
+
 class FormatterTest(unittest.TestCase):
 
     def setUp(self):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py	2014-11-14 09:37:15.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py	2014-11-26 21:45:50.000000000 +0000
@@ -363,6 +363,7 @@
                         if errcode == winprocess.ERROR_ABANDONED_WAIT_0:
                             # Then something has killed the port, break the loop
                             print >> sys.stderr, "IO Completion Port unexpectedly closed"
+                            self._process_events.put({self.pid: 'FINISHED'})
                             break
                         elif errcode == winprocess.WAIT_TIMEOUT:
                             # Timeouts are expected, just keep on polling
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozharness/mozharness.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozharness/mozharness.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozharness/mozharness.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozharness/mozharness.json	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,4 @@
+{
+    "repo": "https://hg.mozilla.org/build/mozharness",
+    "revision": "production"
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozharness/README.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozharness/README.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/mozharness/README.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/mozharness/README.txt	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,2 @@
+mozharness.json is a manifest file that is currently only used on try.
+It allows you to lock mozharness to a repository and a revision.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/talos/talos.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/talos/talos.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/talos/talos.json	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/talos/talos.json	2014-11-26 21:45:51.000000000 +0000
@@ -1,11 +1,11 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.e4a77270a43a.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.f3179facd945.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "2bdbc49134c4"
+        "talos_revision": "f3179facd945"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/docs/usage.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/docs/usage.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/docs/usage.rst	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/docs/usage.rst	2014-11-26 21:45:51.000000000 +0000
@@ -28,21 +28,21 @@
   pip install -e ./
 
 In addition to the dependencies installed by pip, wptrunner requires
-a copy of the web-platform-tests. This can be located anywhere on
-the filesystem, but the easiest option is to put it in a sibling
-directory of the wptrunner checkout called `tests`::
+a copy of the web-platform-tests repository. That can be located
+anywhere on the filesystem, but the easiest option is to put it within
+the wptrunner checkout directory, as a subdirectory named ``tests``::
 
   git clone https://github.com/w3c/web-platform-tests.git tests
 
-It is also necessary to generate the ``MANIFEST.json`` file for the
-web-platform-tests. It is recommended to put this file in a separate
-directory called ``meta``::
+It is also necessary to generate a web-platform-tests ``MANIFEST.json``
+file. It's recommended to put that within the wptrunner
+checkout directory, in a subdirectory named ``meta``::
 
   mkdir meta
-  cd web-platform-tests
+  cd tests
   python tools/scripts/manifest.py ../meta/MANIFEST.json
 
-This file needs to be regenerated every time that the
+The ``MANIFEST.json`` file needs to be regenerated each time the
 web-platform-tests checkout is updated. To aid with the update process
 there is a tool called ``wptupdate``, which is described in
 :ref:`wptupdate-label`.
@@ -50,35 +50,93 @@
 Running the Tests
 -----------------
 
-A test run is started using the ``wptrunner`` command. By default this
-assumes that tests are in a subdirectory of the current directory
-called ``tests`` and the metadata is in a subdirectory called
-``meta``. These defaults can be changed using either a command line
-flag or a configuration file.
-
-To specify the browser product to test against, use the ``--product``
-flag. If no product is specified, the default is ``firefox`` which
-tests Firefox desktop. ``wptrunner --help`` can be used to see a list
-of supported products. Note that this does not take account of the
-products for which the correct dependencies have been installed.
-
-Depending on the product, further arguments may be required. For
-example when testing desktop browsers ``--binary`` is commonly needed
-to specify the path to the browser executable. So a complete command
-line for running tests on firefox desktop might be::
-
-  wptrunner --product=firefox --binary=/usr/bin/firefox
-
-It is also possible to run multiple browser instances in parallel to
-speed up the testing process. This is achieved through the
-``--processes=N`` argument e.g. ``--processes=6`` would attempt to run
-6 browser instances in parallel. Note that behaviour in this mode is
-necessarily less deterministic than with ``--processes=1`` (the
-default) so there may be more noise in the test results.
+A test run is started using the ``wptrunner`` command.  The command
+takes multiple options, of which the following are most significant:
 
-Further help can be obtained from::
+``--product`` (defaults to `firefox`)
+  The product to test against: `b2g`, `chrome`, `firefox`, or `servo`.
 
-  wptrunner --help
+``--binary`` (required)
+  The path to a binary file for the product (browser) to test against.
+
+``--metadata`` (required only when not `using default paths`_)
+  The path to a directory containing test metadata. [#]_
+
+``--tests`` (required only when not `using default paths`_)
+  The path to a directory containing a web-platform-tests checkout.
+
+``--prefs-root`` (required only when testing a Firefox binary)
+  The path to a directory containing Firefox test-harness preferences. [#]_
+
+.. [#] The ``--metadata`` path is to a directory that contains:
+
+  * a ``MANIFEST.json`` file (the web-platform-tests documentation has
+    instructions on generating this file)
+  * (optionally) any expectation files (see :ref:`wptupdate-label`)
+
+.. [#] Example ``--prefs-root`` value: ``~/mozilla-central/testing/profiles``.
+
+There are also a variety of other command-line options available; use
+``--help`` to list them.
+
+The following examples show how to start wptrunner with various options.
+
+------------------
+Starting wptrunner
+------------------
+
+To test a Firefox Nightly build in an OS X environment, you might start
+wptrunner using something similar to the following example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+    --binary=~/mozilla-central/obj-x86_64-apple-darwin14.0.0/dist/Nightly.app/Contents/MacOS/firefox \
+    --prefs-root=~/mozilla-central/testing/profiles
+
+And to test a Chromium build in an OS X environment, you might start
+wptrunner using something similar to the following example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+    --binary=~/chromium/src/out/Release/Chromium.app/Contents/MacOS/Chromium \
+    --product=chrome
+
+--------------------
+Running test subsets
+--------------------
+
+To restrict a test run just to tests in a particular web-platform-tests
+subdirectory, use ``--include`` with the directory name; for example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+    --binary=/path/to/firefox --prefs-root=/path/to/testing/profiles \
+    --include=dom
+
+-------------------
+Running in parallel
+-------------------
+
+To speed up the testing process, use the ``--processes`` option to have
+wptrunner run multiple browser instances in parallel. For example, to
+have wptrunner attempt to run tests against with six browser instances
+in parallel, specify ``--processes=6``. But note that behaviour in this
+mode is necessarily less deterministic than with ``--processes=1`` (the
+default), so there may be more noise in the test results.
+
+-------------------
+Using default paths
+-------------------
+
+The (otherwise-required) ``--tests`` and ``--metadata`` command-line
+options/flags be omitted if any configuration file is found that
+contains a section specifying the ``tests`` and ``metadata`` keys.
+
+See the `Configuration File`_ section for more information about
+configuration files, including information about their expected
+locations.
+
+The content of the ``wptrunner.default.ini`` default configuration file
+makes wptrunner look for tests (that is, a web-platform-tests checkout)
+as a subdirectory of the current directory named ``tests``, and for
+metadata files in a subdirectory of the current directory named ``meta``.
 
 Output
 ------
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/README.rst thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/README.rst
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/README.rst	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/README.rst	2014-11-26 21:45:51.000000000 +0000
@@ -1,11 +1,9 @@
-web-platform-tests Harness
-==========================
+wptrunner: A web-platform-tests harness
+=======================================
 
-This harness is designed for running the W3C web-platform-tests
-`testsuite_`.
+wptrunner is a harness for running the W3C `web-platform-tests testsuite`_.
 
-The code hasn't been merged to master yet, but when it is the
-documentation below might be quite relevant.
+.. contents::
 
 Installation
 ~~~~~~~~~~~~
@@ -18,18 +16,88 @@
 Running the Tests
 ~~~~~~~~~~~~~~~~~
 
-After installation the command `wptrunner` should be avaliable to run
-the tests. This takes two arguments; the path to the metadata
-directory containing expectation files (see below) and a MANIFEST.json
-file (see the web-platform-tests documentation for isntructions on
-generating this file), and the path to the web-platform-tests
-checkout::
+After installation, the command ``wptrunner`` should be available to run
+the tests.
 
-  wptrunner /path/to/metadata /path/to/tests
+The ``wptrunner`` command  takes multiple options, of which the
+following are most significant:
 
-There are also a variety of other options available; use `--help` to
+``--product`` (defaults to `firefox`)
+  The product to test against: `b2g`, `chrome`, `firefox`, or `servo`.
+
+``--binary`` (required)
+  The path to a binary file for the product (browser) to test against.
+
+``--metadata`` (required)
+  The path to a directory containing test metadata. [#]_
+
+``--tests`` (required)
+  The path to a directory containing a web-platform-tests checkout.
+
+``--prefs-root`` (required only when testing a Firefox binary)
+  The path to a directory containing Firefox test-harness preferences. [#]_
+
+.. [#] The ``--metadata`` path is to a directory that contains:
+
+  * a ``MANIFEST.json`` file (the web-platform-tests documentation has
+    instructions on generating this file); and
+  * (optionally) any expectation files (see below)
+
+.. [#] Example ``--prefs-root`` value: ``~/mozilla-central/testing/profiles``.
+
+There are also a variety of other options available; use ``--help`` to
 list them.
 
+-------------------------------
+Example: How to start wptrunner
+-------------------------------
+
+To test a Firefox Nightly build in an OS X environment, you might start
+wptrunner using something similar to the following example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  --binary=~/mozilla-central/obj-x86_64-apple-darwin14.0.0/dist/Nightly.app/Contents/MacOS/firefox \
+  --prefs-root=~/mozilla-central/testing/profiles
+
+And to test a Chromium build in an OS X environment, you might start
+wptrunner using something similar to the following example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  --binary=~/chromium/src/out/Release/Chromium.app/Contents/MacOS/Chromium \
+  --product=chrome
+
+-------------------------------------
+Example: How to run a subset of tests
+-------------------------------------
+
+To restrict a test run just to tests in a particular web-platform-tests
+subdirectory, use ``--include`` with the directory name; for example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  --binary=/path/to/firefox --prefs-root=/path/to/testing/profiles \
+  --include=dom
+
+Output
+~~~~~~
+
+By default wptrunner just dumps its entire output as raw JSON messages
+to stdout. This is convenient for piping into other tools, but not ideal
+for humans reading the output.
+
+As an alternative, you can use the ``--log-mach`` option, which provides
+output in a reasonable format for humans. The option requires a value:
+either the path for a file to write the `mach`-formatted output to, or
+"`-`" (a hyphen) to write the `mach`-formatted output to stdout.
+
+When using ``--log-mach``, output of the full raw JSON log is still
+available, from the ``--log-raw`` option. So to output the full raw JSON
+log to a file and a human-readable summary to stdout, you might start
+wptrunner using something similar to the following example::
+
+  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  --binary=/path/to/firefox --prefs-root=/path/to/testing/profiles
+  --log-raw=output.log --log-mach=-
+
 Expectation Data
 ~~~~~~~~~~~~~~~~
 
@@ -153,4 +221,4 @@
 `refurl`
   The reference url for reftests.
 
-_testsuite: https://github.com/w3c/web-platform-tests
+.. _`web-platform-tests testsuite`: https://github.com/w3c/web-platform-tests
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/setup.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/setup.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/setup.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/setup.py	2014-11-26 21:45:51.000000000 +0000
@@ -12,7 +12,7 @@
 here = os.path.split(__file__)[0]
 
 PACKAGE_NAME = 'wptrunner'
-PACKAGE_VERSION = '1.4'
+PACKAGE_VERSION = '1.7'
 
 # Dependencies
 with open(os.path.join(here, "requirements.txt")) as f:
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/browsers/b2g_setup/certtest_app.zip and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/browsers/b2g_setup/certtest_app.zip differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/config.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/config.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/config.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/config.py	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
 import ConfigParser
 import os
 import sys
+from collections import OrderedDict
 
 here = os.path.split(__file__)[0]
 
@@ -13,11 +14,12 @@
         self.base_path = base_path
         dict.__init__(self, *args, **kwargs)
 
-    def get_path(self, key):
-        pwd = os.path.abspath(os.path.curdir)
+    def get_path(self, key, default=None):
+        if key not in self:
+            return default
         path = self[key]
         os.path.expanduser(path)
-        return os.path.join(self.base_path, path)
+        return os.path.abspath(os.path.join(self.base_path, path))
 
 def read(config_path):
     config_path = os.path.abspath(config_path)
@@ -28,7 +30,7 @@
 
     subns = {"pwd": os.path.abspath(os.path.curdir)}
 
-    rv = {}
+    rv = OrderedDict()
     for section in parser.sections():
         rv[section] = ConfigDict(config_root)
         for key in parser.options(section):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/executors/executorservo.py	2014-11-26 21:45:51.000000000 +0000
@@ -33,7 +33,8 @@
 
 
         self.proc = ProcessHandler(self.command,
-                                   processOutputLine=[self.on_output])
+                                   processOutputLine=[self.on_output],
+                                   onFinish=self.on_finish)
         self.proc.run()
 
         timeout = test.timeout * self.timeout_multiplier
@@ -41,13 +42,12 @@
         # Now wait to get the output we expect, or until we reach the timeout
         self.result_flag.wait(timeout + 5)
 
-        if self.result_flag.is_set():
-            assert self.result_data is not None
+        if self.result_flag.is_set() and self.result_data is not None:
             self.result_data["test"] = test.url
             result = self.convert_result(test, self.result_data)
             self.proc.kill()
         else:
-            if self.proc.pid is None:
+            if self.proc.proc.poll() is not None:
                 result = (test.result_cls("CRASH", None), [])
             else:
                 self.proc.kill()
@@ -67,3 +67,6 @@
                 self.logger.process_output(self.proc.pid,
                                            line,
                                            " ".join(self.command))
+
+    def on_finish(self):
+        self.result_flag.set()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/manifestexpected.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/manifestexpected.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/manifestexpected.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/manifestexpected.py	2014-11-26 21:45:51.000000000 +0000
@@ -2,6 +2,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/.
 
+import os
+import urlparse
+
 from wptmanifest.backends import static
 from wptmanifest.backends.static import ManifestItem
 
@@ -27,21 +30,25 @@
 
 
 class ExpectedManifest(ManifestItem):
-    def __init__(self, name, test_path):
+    def __init__(self, name, test_path, url_base):
         """Object representing all the tests in a particular manifest
 
         :param name: Name of the AST Node associated with this object.
                      Should always be None since this should always be associated with
                      the root node of the AST.
         :param test_path: Path of the test file associated with this manifest.
+        :param url_base: Base url for serving the tests in this manifest
         """
         if name is not None:
             raise ValueError("ExpectedManifest should represent the root node")
         if test_path is None:
             raise ValueError("ExpectedManifest requires a test path")
+        if url_base is None:
+            raise ValueError("ExpectedManifest requires a base url")
         ManifestItem.__init__(self, name)
         self.child_map = {}
         self.test_path = test_path
+        self.url_base = url_base
 
     def append(self, child):
         """Add a test to the manifest"""
@@ -60,6 +67,11 @@
         :param test_id: ID of the test to return."""
         return self.child_map.get(test_id)
 
+    @property
+    def url(self):
+        return urlparse.urljoin(self.url_base,
+                                "/".join(self.test_path.split(os.path.sep)))
+
 
 class TestNode(ManifestItem):
     def __init__(self, name):
@@ -89,9 +101,7 @@
 
     @property
     def id(self):
-        components = self.parent.test_path.split("/")[:-1]
-        components.append(self.name)
-        url = "/" + "/".join(components)
+        url = urlparse.urljoin(self.parent.url, self.name)
         if self.test_type == "reftest":
             return (url, self.get("reftype"), self.get("refurl"))
         else:
@@ -134,12 +144,13 @@
         return True
 
 
-def get_manifest(metadata_root, test_path, run_info):
+def get_manifest(metadata_root, test_path, url_base, run_info):
     """Get the ExpectedManifest for a particular test path, or None if there is no
     metadata stored for that test path.
 
     :param metadata_root: Absolute path to the root of the metadata directory
     :param test_path: Path to the test(s) relative to the test root
+    :param url_base: Base url for serving the tests in this manifest
     :param run_info: Dictionary of properties of the test run for which the expectation
                      values should be computed.
     """
@@ -148,6 +159,7 @@
         with open(manifest_path) as f:
             return static.compile(f, run_info,
                                   data_cls_getter=data_cls_getter,
-                                  test_path=test_path)
+                                  test_path=test_path,
+                                  url_base=url_base)
     except IOError:
         return None
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/manifestupdate.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/manifestupdate.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/manifestupdate.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/manifestupdate.py	2014-11-26 21:45:51.000000000 +0000
@@ -3,6 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
+import urlparse
 from collections import namedtuple, defaultdict
 
 from wptmanifest.node import (DataNode, ConditionalNode, BinaryExpressionNode,
@@ -48,18 +49,21 @@
 
 
 class ExpectedManifest(ManifestItem):
-    def __init__(self, node, test_path=None):
+    def __init__(self, node, test_path=None, url_base=None):
         """Object representing all the tests in a particular manifest
 
         :param node: AST Node associated with this object. If this is None,
                      a new AST is created to associate with this manifest.
         :param test_path: Path of the test file associated with this manifest.
+        :param url_base: Base url for serving the tests in this manifest
         """
         if node is None:
             node = DataNode(None)
         ManifestItem.__init__(self, node)
         self.child_map = {}
         self.test_path = test_path
+        self.url_base = url_base
+        assert self.url_base is not None
         self.modified = False
 
     def append(self, child):
@@ -87,6 +91,10 @@
 
         return test_id in self.child_map
 
+    @property
+    def url(self):
+        return urlparse.urljoin(self.url_base,
+                                "/".join(self.test_path.split(os.path.sep)))
 
 class TestNode(ManifestItem):
     def __init__(self, node):
@@ -141,10 +149,7 @@
     @property
     def id(self):
         """The id of the test represented by this TestNode"""
-
-        components = self.parent.test_path.split(os.path.sep)[:-1]
-        components.append(self.name)
-        url = "/" + "/".join(components)
+        url = urlparse.urljoin(self.parent.url, self.name)
         if self.test_type == "reftest":
             return (url, self.get("reftype", None), self.get("refurl", None))
         else:
@@ -404,22 +409,24 @@
     return root
 
 
-def get_manifest(metadata_root, test_path):
+def get_manifest(metadata_root, test_path, url_base):
     """Get the ExpectedManifest for a particular test path, or None if there is no
     metadata stored for that test path.
 
     :param metadata_root: Absolute path to the root of the metadata directory
     :param test_path: Path to the test(s) relative to the test root
+    :param url_base: Base url for serving the tests in this manifest
     """
     manifest_path = expected.expected_path(metadata_root, test_path)
     try:
         with open(manifest_path) as f:
-            return compile(f, test_path)
+            return compile(f, test_path, url_base)
     except IOError:
         return None
 
 
-def compile(manifest_file, test_path):
+def compile(manifest_file, test_path, url_base):
     return conditional.compile(manifest_file,
                                data_cls_getter=data_cls_getter,
-                               test_path=test_path)
+                               test_path=test_path,
+                               url_base=url_base)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/metadata.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/metadata.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/metadata.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/metadata.py	2014-11-26 21:45:51.000000000 +0000
@@ -15,6 +15,7 @@
 
 import expected
 import manifestupdate
+import testloader
 import wptmanifest
 import wpttest
 from vcs import git
@@ -23,56 +24,50 @@
 logger = structuredlog.StructuredLogger("web-platform-tests")
 
 
-def manifest_path(metadata_root):
-    return os.path.join(metadata_root, "MANIFEST.json")
+def load_test_manifests(serve_root, test_paths):
+    do_delayed_imports(serve_root)
+    manifest_loader = testloader.ManifestLoader(test_paths, False)
+    return manifest_loader.load()
 
 
-def load_test_manifest(test_root, metadata_root):
-    do_test_relative_imports(test_root)
-    return manifest.load(manifest_path(metadata_root))
-
-
-def update_manifest(git_root, metadata_root):
-    manifest.setup_git(git_root)
-    # Create an entirely new manifest
-    new_manifest = manifest.Manifest(None)
-    manifest.update(new_manifest)
-    manifest.write(new_manifest, manifest_path(metadata_root))
-    return new_manifest
-
-
-def update_expected(test_root, metadata_root, log_file_names, rev_old=None, rev_new="HEAD",
-                    ignore_existing=False, sync_root=None):
+def update_expected(test_paths, serve_root, log_file_names,
+                    rev_old=None, rev_new="HEAD", ignore_existing=False,
+                    sync_root=None):
     """Update the metadata files for web-platform-tests based on
     the results obtained in a previous run"""
 
-    manifest = load_test_manifest(test_root, metadata_root)
+    manifests = load_test_manifests(serve_root, test_paths)
+
+    change_data = {}
 
     if sync_root is not None:
         if rev_old is not None:
-            rev_old = git("rev-parse", rev_old, repo=test_root).strip()
-        rev_new = git("rev-parse", rev_new, repo=test_root).strip()
+            rev_old = git("rev-parse", rev_old, repo=sync_root).strip()
+        rev_new = git("rev-parse", rev_new, repo=sync_root).strip()
 
-    if rev_old is not None:
-        change_data = load_change_data(rev_old, rev_new, repo=test_root)
-    else:
-        change_data = {}
+        if rev_old is not None:
+            change_data = load_change_data(rev_old, rev_new, repo=sync_root)
 
-    expected_map = update_from_logs(metadata_root, manifest, *log_file_names,
-                                    ignore_existing=ignore_existing)
 
-    write_changes(metadata_root, expected_map)
+    expected_map_by_manifest = update_from_logs(manifests,
+                                                *log_file_names,
+                                                ignore_existing=ignore_existing)
+
+    for test_manifest, expected_map in expected_map_by_manifest.iteritems():
+        url_base = manifests[test_manifest]["url_base"]
+        metadata_path = test_paths[url_base]["metadata_path"]
+        write_changes(metadata_path, expected_map)
 
     results_changed = [item.test_path for item in expected_map.itervalues() if item.modified]
 
-    return unexpected_changes(change_data, results_changed)
+    return unexpected_changes(manifests, change_data, results_changed)
 
 
-def do_test_relative_imports(test_root):
+def do_delayed_imports(serve_root):
     global manifest
 
-    sys.path.insert(0, os.path.join(test_root))
-    sys.path.insert(0, os.path.join(test_root, "tools", "scripts"))
+    sys.path.insert(0, os.path.join(serve_root))
+    sys.path.insert(0, os.path.join(serve_root, "tools", "scripts"))
     import manifest
 
 
@@ -105,8 +100,20 @@
     return rv
 
 
-def unexpected_changes(change_data, files_changed):
-    return [fn for fn in files_changed if change_data.get(fn) != "M"]
+def unexpected_changes(manifests, change_data, files_changed):
+    files_changed = set(files_changed)
+
+    root_manifest = None
+    for manifest, paths in manifests.iteritems():
+        if paths["url_base"] == "/":
+            root_manifest = manifest
+            break
+    else:
+        return []
+
+    rv = []
+
+    return [fn for fn, tests in root_manifest if fn in files_changed and change_data.get(fn) != "M"]
 
 # For each testrun
 # Load all files and scan for the suite_start entry
@@ -122,20 +129,30 @@
 #   Check if all the RHS values are the same; if so collapse the conditionals
 
 
-def update_from_logs(metadata_path, manifest, *log_filenames, **kwargs):
+def update_from_logs(manifests, *log_filenames, **kwargs):
     ignore_existing = kwargs.pop("ignore_existing", False)
 
-    expected_map, id_path_map = create_test_tree(metadata_path, manifest)
-    updater = ExpectedUpdater(expected_map, id_path_map, ignore_existing=ignore_existing)
+    expected_map = {}
+    id_test_map = {}
+
+    for test_manifest, paths in manifests.iteritems():
+        expected_map_manifest, id_path_map_manifest = create_test_tree(paths["metadata_path"],
+                                                                       test_manifest)
+        expected_map[test_manifest] = expected_map_manifest
+        id_test_map.update(id_path_map_manifest)
+
+    updater = ExpectedUpdater(manifests, expected_map, id_test_map,
+                              ignore_existing=ignore_existing)
     for log_filename in log_filenames:
         with open(log_filename) as f:
             updater.update_from_log(f)
 
-    for tree in expected_map.itervalues():
-        for test in tree.iterchildren():
-            for subtest in test.iterchildren():
-                subtest.coalesce_expected()
-            test.coalesce_expected()
+    for manifest_expected in expected_map.itervalues():
+        for tree in manifest_expected.itervalues():
+            for test in tree.iterchildren():
+                for subtest in test.iterchildren():
+                    subtest.coalesce_expected()
+                test.coalesce_expected()
 
     return expected_map
 
@@ -170,7 +187,8 @@
 
 
 class ExpectedUpdater(object):
-    def __init__(self, expected_tree, id_path_map, ignore_existing=False):
+    def __init__(self, test_manifests, expected_tree, id_path_map, ignore_existing=False):
+        self.test_manifests = test_manifests
         self.expected_tree = expected_tree
         self.id_path_map = id_path_map
         self.ignore_existing = ignore_existing
@@ -200,15 +218,16 @@
     def test_start(self, data):
         test_id = self.test_id(data["test"])
         try:
-            test = self.expected_tree[self.id_path_map[test_id]].get_test(test_id)
+            test_manifest, test = self.id_path_map[test_id]
+            expected_node = self.expected_tree[test_manifest][test].get_test(test_id)
         except KeyError:
             print "Test not found %s, skipping" % test_id
             return
-        self.test_cache[test_id] = test
+        self.test_cache[test_id] = expected_node
 
         if test_id not in self.tests_visited:
             if self.ignore_existing:
-                test.clear_expected()
+                expected_node.clear_expected()
             self.tests_visited[test_id] = set()
 
     def test_status(self, data):
@@ -247,34 +266,34 @@
         del self.test_cache[test_id]
 
 
-def create_test_tree(metadata_path, manifest):
+def create_test_tree(metadata_path, test_manifest):
     expected_map = {}
-    test_id_path_map = {}
+    id_test_map = {}
     exclude_types = frozenset(["stub", "helper", "manual"])
     include_types = set(manifest.item_types) ^ exclude_types
-    for test_path, tests in manifest.itertypes(*include_types):
-
-        expected_data = load_expected(metadata_path, test_path, tests)
+    for test_path, tests in test_manifest.itertypes(*include_types):
+        expected_data = load_expected(test_manifest, metadata_path, test_path, tests)
         if expected_data is None:
-            expected_data = create_expected(test_path, tests)
-
-        expected_map[test_path] = expected_data
+            expected_data = create_expected(test_manifest, test_path, tests)
 
         for test in tests:
-            test_id_path_map[test.id] = test_path
+            id_test_map[test.id] = (test_manifest, test)
+            expected_map[test] = expected_data
 
-    return expected_map, test_id_path_map
+    return expected_map, id_test_map
 
 
-def create_expected(test_path, tests):
-    expected = manifestupdate.ExpectedManifest(None, test_path)
+def create_expected(test_manifest, test_path, tests):
+    expected = manifestupdate.ExpectedManifest(None, test_path, test_manifest.url_base)
     for test in tests:
         expected.append(manifestupdate.TestNode.create(test.item_type, test.id))
     return expected
 
 
-def load_expected(metadata_path, test_path, tests):
-    expected_manifest = manifestupdate.get_manifest(metadata_path, test_path)
+def load_expected(test_manifest, metadata_path, test_path, tests):
+    expected_manifest = manifestupdate.get_manifest(metadata_path,
+                                                    test_path,
+                                                    test_manifest.url_base)
     if expected_manifest is None:
         return
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/testloader.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/testloader.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/testloader.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/testloader.py	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,421 @@
+import os
+import urlparse
+from abc import ABCMeta, abstractmethod
+from Queue import Empty
+from collections import defaultdict, OrderedDict
+from multiprocessing import Queue
+
+import manifestinclude
+import manifestexpected
+import wpttest
+from mozlog import structured
+
+manifest = None
+
+def do_delayed_imports():
+    # This relies on an already loaded module having set the sys.path correctly :(
+    global manifest
+    import manifest
+
+class TestChunker(object):
+    def __init__(self, total_chunks, chunk_number):
+        self.total_chunks = total_chunks
+        self.chunk_number = chunk_number
+        assert self.chunk_number <= self.total_chunks
+
+    def __call__(self, manifest):
+        raise NotImplementedError
+
+
+class Unchunked(TestChunker):
+    def __init__(self, *args, **kwargs):
+        TestChunker.__init__(self, *args, **kwargs)
+        assert self.total_chunks == 1
+
+    def __call__(self, manifest):
+        for item in manifest:
+            yield item
+
+
+class HashChunker(TestChunker):
+    def __call__(self):
+        chunk_index = self.chunk_number - 1
+        for test_path, tests in manifest:
+            if hash(test_path) % self.total_chunks == chunk_index:
+                yield test_path, tests
+
+
+class EqualTimeChunker(TestChunker):
+    """Chunker that uses the test timeout as a proxy for the running time of the test"""
+
+    def _get_chunk(self, manifest_items):
+        # For each directory containing tests, calculate the maximum execution time after running all
+        # the tests in that directory. Then work out the index into the manifest corresponding to the
+        # directories at fractions of m/N of the running time where m=1..N-1 and N is the total number
+        # of chunks. Return an array of these indicies
+
+        total_time = 0
+        by_dir = OrderedDict()
+
+        class PathData(object):
+            def __init__(self, path):
+                self.path = path
+                self.time = 0
+                self.tests = []
+
+        class Chunk(object):
+            def __init__(self):
+                self.paths = []
+                self.tests = []
+                self.time = 0
+
+            def append(self, path_data):
+                self.paths.append(path_data.path)
+                self.tests.extend(path_data.tests)
+                self.time += path_data.time
+
+        class ChunkList(object):
+            def __init__(self, total_time, n_chunks):
+                self.total_time = total_time
+                self.n_chunks = n_chunks
+
+                self.remaining_chunks = n_chunks
+
+                self.chunks = []
+
+                self.update_time_per_chunk()
+
+            def __iter__(self):
+                for item in self.chunks:
+                    yield item
+
+            def __getitem__(self, i):
+                return self.chunks[i]
+
+            def sort_chunks(self):
+                self.chunks = sorted(self.chunks, key=lambda x:x.paths[0])
+
+            def get_tests(self, chunk_number):
+                return self[chunk_number - 1].tests
+
+            def append(self, chunk):
+                if len(self.chunks) == self.n_chunks:
+                    raise ValueError("Tried to create more than %n chunks" % self.n_chunks)
+                self.chunks.append(chunk)
+                self.remaining_chunks -= 1
+
+            @property
+            def current_chunk(self):
+                if self.chunks:
+                    return self.chunks[-1]
+
+            def update_time_per_chunk(self):
+                self.time_per_chunk = (self.total_time - sum(item.time for item in self)) / self.remaining_chunks
+
+            def create(self):
+                rv = Chunk()
+                self.append(rv)
+                return rv
+
+            def add_path(self, path_data):
+                sum_time = self.current_chunk.time + path_data.time
+                if sum_time > self.time_per_chunk and self.remaining_chunks > 0:
+                    overshoot = sum_time - self.time_per_chunk
+                    undershoot = self.time_per_chunk - self.current_chunk.time
+                    if overshoot < undershoot:
+                        self.create()
+                        self.current_chunk.append(path_data)
+                    else:
+                        self.current_chunk.append(path_data)
+                        self.create()
+                else:
+                    self.current_chunk.append(path_data)
+
+        for i, (test_path, tests) in enumerate(manifest_items):
+            test_dir = tuple(os.path.split(test_path)[0].split(os.path.sep)[:3])
+
+            if not test_dir in by_dir:
+                by_dir[test_dir] = PathData(test_dir)
+
+            data = by_dir[test_dir]
+            time = sum(wpttest.DEFAULT_TIMEOUT if test.timeout !=
+                       "long" else wpttest.LONG_TIMEOUT for test in tests)
+            data.time += time
+            data.tests.append((test_path, tests))
+
+            total_time += time
+
+        chunk_list = ChunkList(total_time, self.total_chunks)
+
+        if len(by_dir) < self.total_chunks:
+            raise ValueError("Tried to split into %i chunks, but only %i subdirectories included" % (
+                self.total_chunks, len(by_dir)))
+
+        # Put any individual dirs with a time greater than the time per chunk into their own
+        # chunk
+        while True:
+            to_remove = []
+            for path_data in by_dir.itervalues():
+                if path_data.time > chunk_list.time_per_chunk:
+                    to_remove.append(path_data)
+            if to_remove:
+                for path_data in to_remove:
+                    chunk = chunk_list.create()
+                    chunk.append(path_data)
+                    del by_dir[path_data.path]
+                chunk_list.update_time_per_chunk()
+            else:
+                break
+
+        chunk = chunk_list.create()
+        for path_data in by_dir.itervalues():
+            chunk_list.add_path(path_data)
+
+        assert len(chunk_list.chunks) == self.total_chunks, len(chunk_list.chunks)
+        assert sum(item.time for item in chunk_list) == chunk_list.total_time
+
+        chunk_list.sort_chunks()
+
+        return chunk_list.get_tests(self.chunk_number)
+
+    def __call__(self, manifest_iter):
+        manifest = list(manifest_iter)
+        tests = self._get_chunk(manifest)
+        for item in tests:
+            yield item
+
+
+class TestFilter(object):
+    def __init__(self, include=None, exclude=None, manifest_path=None):
+        if manifest_path is not None and include is None:
+            self.manifest = manifestinclude.get_manifest(manifest_path)
+        else:
+            self.manifest = manifestinclude.IncludeManifest.create()
+
+        if include is not None:
+            self.manifest.set("skip", "true")
+            for item in include:
+                self.manifest.add_include(item)
+
+        if exclude is not None:
+            for item in exclude:
+                self.manifest.add_exclude(item)
+
+    def __call__(self, manifest_iter):
+        for test_path, tests in manifest_iter:
+            include_tests = set()
+            for test in tests:
+                if self.manifest.include(test):
+                    include_tests.add(test)
+
+            if include_tests:
+                yield test_path, include_tests
+
+
+class ManifestLoader(object):
+
+    def __init__(self, test_paths, force_manifest_update=False):
+        do_delayed_imports()
+        self.test_paths = test_paths
+        self.force_manifest_update = force_manifest_update
+        self.logger = structured.get_default_logger()
+        if self.logger is None:
+            self.logger = structured.structuredlog.StructuredLogger("ManifestLoader")
+
+    def load(self):
+        rv = {}
+        for url_base, paths in self.test_paths.iteritems():
+            manifest_file = self.load_manifest(url_base=url_base,
+                                               **paths)
+            path_data = {"url_base": url_base}
+            path_data.update(paths)
+            rv[manifest_file] = path_data
+        return rv
+
+    def create_manifest(self, manifest_path, tests_path, url_base="/"):
+        self.logger.info("Creating test manifest %s" % manifest_path)
+        manifest_file = manifest.Manifest(None, url_base)
+        manifest.update(tests_path, url_base, manifest_file)
+        manifest.write(manifest_file, manifest_path)
+
+    def load_manifest(self, tests_path, metadata_path, url_base="/"):
+        manifest_path = os.path.join(metadata_path, "MANIFEST.json")
+        if (not os.path.exists(manifest_path) or
+            self.force_manifest_update):
+            self.create_manifest(manifest_path, tests_path, url_base)
+        manifest_file = manifest.load(manifest_path)
+        if manifest_file.url_base != url_base:
+            self.logger.info("Updating url_base in manifest from %s to %s" % (manifest_file.url_base,
+                                                                              url_base))
+            manifest_file.url_base = url_base
+            manifest.write(manifest_file, manifest_path)
+
+        return manifest_file
+
+class TestLoader(object):
+    def __init__(self,
+                 test_paths,
+                 test_types,
+                 test_filter,
+                 run_info,
+                 chunk_type="none",
+                 total_chunks=1,
+                 chunk_number=1,
+                 force_manifest_update=False):
+
+        self.test_paths = test_paths
+        self.test_types = test_types
+        self.test_filter = test_filter
+        self.run_info = run_info
+        self.manifests = ManifestLoader(test_paths, force_manifest_update).load()
+        self.tests = None
+        self.disabled_tests = None
+
+        self.chunk_type = chunk_type
+        self.total_chunks = total_chunks
+        self.chunk_number = chunk_number
+
+        self.chunker = {"none": Unchunked,
+                        "hash": HashChunker,
+                        "equal_time": EqualTimeChunker}[chunk_type](total_chunks,
+                                                                    chunk_number)
+
+        self._test_ids = None
+        self._load_tests()
+
+    @property
+    def test_ids(self):
+        if self._test_ids is None:
+            self._test_ids = []
+            for test_dict in [self.disabled_tests, self.tests]:
+                for test_type in self.test_types:
+                    self._test_ids += [item.id for item in test_dict[test_type]]
+        return self._test_ids
+
+    def get_test(self, manifest_test, expected_file):
+        if expected_file is not None:
+            expected = expected_file.get_test(manifest_test.id)
+        else:
+            expected = None
+        return wpttest.from_manifest(manifest_test, expected)
+
+    def load_expected_manifest(self, test_manifest, metadata_path, test_path):
+        return manifestexpected.get_manifest(metadata_path, test_path, test_manifest.url_base, self.run_info)
+
+    def iter_tests(self):
+        manifest_items = []
+
+        for manifest in self.manifests.keys():
+            manifest_items.extend(self.test_filter(manifest.itertypes(*self.test_types)))
+
+        if self.chunker is not None:
+            manifest_items = self.chunker(manifest_items)
+
+        for test_path, tests in manifest_items:
+            manifest_file = iter(tests).next().manifest
+            metadata_path = self.manifests[manifest_file]["metadata_path"]
+            expected_file = self.load_expected_manifest(manifest_file, metadata_path, test_path)
+
+            for manifest_test in tests:
+                test = self.get_test(manifest_test, expected_file)
+                test_type = manifest_test.item_type
+                yield test_path, test_type, test
+
+    def _load_tests(self):
+        """Read in the tests from the manifest file and add them to a queue"""
+        tests = {"enabled":defaultdict(list),
+                 "disabled":defaultdict(list)}
+
+        for test_path, test_type, test in self.iter_tests():
+            key = "enabled" if not test.disabled() else "disabled"
+            tests[key][test_type].append(test)
+
+        self.tests = tests["enabled"]
+        self.disabled_tests = tests["disabled"]
+
+    def groups(self, test_types, chunk_type="none", total_chunks=1, chunk_number=1):
+        groups = set()
+
+        for test_type in test_types:
+            for test in self.tests[test_type]:
+                group = test.url.split("/")[1]
+                groups.add(group)
+
+        return groups
+
+
+class TestSource(object):
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def queue_tests(self, test_queue):
+        pass
+
+    @abstractmethod
+    def requeue_test(self, test):
+        pass
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args, **kwargs):
+        pass
+
+
+class SingleTestSource(TestSource):
+    def __init__(self, test_queue):
+        self.test_queue = test_queue
+
+    @classmethod
+    def queue_tests(cls, test_queue, test_type, tests):
+        for test in tests[test_type]:
+            test_queue.put(test)
+
+    def get_queue(self):
+        if self.test_queue.empty():
+            return None
+        return self.test_queue
+
+    def requeue_test(self, test):
+        self.test_queue.put(test)
+
+class PathGroupedSource(TestSource):
+    def __init__(self, test_queue):
+        self.test_queue = test_queue
+        self.current_queue = None
+
+    @classmethod
+    def queue_tests(cls, test_queue, test_type, tests, depth=None):
+        if depth is True:
+            depth = None
+
+        prev_path = None
+        group = None
+
+        for test in tests[test_type]:
+            path = urlparse.urlsplit(test.url).path.split("/")[1:-1][:depth]
+            if path != prev_path:
+                group = []
+                test_queue.put(group)
+                prev_path = path
+
+            group.append(test)
+
+    def get_queue(self):
+        if not self.current_queue or self.current_queue.empty():
+            try:
+                data = self.test_queue.get(block=True, timeout=1)
+                self.current_queue = Queue()
+                for item in data:
+                    self.current_queue.put(item)
+            except Empty:
+                return None
+
+        return self.current_queue
+
+    def requeue_test(self, test):
+        self.current_queue.put(test)
+
+    def __exit__(self, *args, **kwargs):
+        if self.current_queue:
+            self.current_queue.close()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/testrunner.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/testrunner.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/testrunner.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/testrunner.py	2014-11-26 21:45:51.000000000 +0000
@@ -359,7 +359,7 @@
         """Callback when we can't connect to the browser via
         marionette for some reason"""
         self.init_fail_count += 1
-        self.logger.error("Init failed %i" % self.init_fail_count)
+        self.logger.warning("Init failed %i" % self.init_fail_count)
         self.init_timer.cancel()
         if self.init_fail_count < self.max_init_fails:
             self.restart_runner()
@@ -537,17 +537,28 @@
         self.test_type = test_type
         self.tests = tests
         self.kwargs = kwargs
+        self.queue = None
 
     def __enter__(self):
+        if not self.tests[self.test_type]:
+            return None
+
         self.queue = Queue()
-        self.test_source_cls.queue_tests(self.queue,
-                                         self.test_type,
-                                         self.tests,
-                                         **self.kwargs)
+        has_tests = self.test_source_cls.queue_tests(self.queue,
+                                                     self.test_type,
+                                                     self.tests,
+                                                     **self.kwargs)
+        # There is a race condition that means sometimes we continue
+        # before the tests have been written to the underlying pipe.
+        # Polling the pipe for data here avoids that
+        self.queue._reader.poll(10)
+        assert not self.queue.empty()
         return self.queue
 
     def __exit__(self, *args, **kwargs):
-        self.queue.close()
+        if self.queue is not None:
+            self.queue.close()
+            self.queue = None
 
 
 class ManagerGroup(object):
@@ -586,6 +597,9 @@
                                     tests,
                                     **self.test_source_kwargs)
         with self.test_queue as test_queue:
+            if test_queue is None:
+                self.logger.info("No %s tests to run" % test_type)
+                return
             for _ in range(self.size):
                 manager = TestRunnerManager(self.suite_name,
                                             test_queue,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/update.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/update.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/update.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/update.py	2014-11-26 21:45:51.000000000 +0000
@@ -9,12 +9,17 @@
 import traceback
 import uuid
 
+from mozlog.structured import commandline
+
 import vcs
 from vcs import git, hg
 manifest = None
 import metadata
+import testloader
 import wptcommandline
 
+logger = None
+
 base_path = os.path.abspath(os.path.split(__file__)[0])
 
 bsd_license = """W3C 3-clause BSD License
@@ -48,14 +53,23 @@
 POSSIBILITY OF SUCH DAMAGE.
 """
 
-def do_test_relative_imports(test_root):
-    global manifest
 
-    sys.path.insert(0, os.path.join(test_root))
-    sys.path.insert(0, os.path.join(test_root, "tools", "scripts"))
+def do_delayed_imports(serve_root):
+    global manifest
+    sys.path.insert(0, os.path.join(serve_root, "tools", "scripts"))
     import manifest
 
 
+def setup_logging(args, defaults):
+    global logger
+    logger = commandline.setup_logging("web-platform-tests-update", args, defaults)
+
+    for name in args.keys():
+        if name.startswith("log_"):
+            args.pop(name)
+
+    return logger
+
 class RepositoryError(Exception):
     pass
 
@@ -311,16 +325,23 @@
 def sync_tests(paths, local_tree, wpt, bug):
     wpt.update()
 
+    do_delayed_imports(paths["sync"])
+
     try:
         #bug.comment("Updating to %s" % wpt.rev)
-        initial_manifest = metadata.load_test_manifest(paths["sync"], paths["metadata"])
-        wpt.copy_work_tree(paths["test"])
-        new_manifest = metadata.update_manifest(paths["sync"], paths["metadata"])
+        sync_paths = {"/": {"tests_path": paths["sync"],
+                            "metadata_path": paths["sync_dest"]["metadata_path"]}}
+
+        manifest_loader = testloader.ManifestLoader(sync_paths)
+        initial_manifests = manifest_loader.load()
+        wpt.copy_work_tree(paths["sync_dest"]["tests_path"])
 
         local_tree.create_patch("web-platform-tests_update_%s" % wpt.rev,
                                 "Update web-platform-tests to revision %s" % wpt.rev)
-        local_tree.add_new(os.path.relpath(paths["test"], local_tree.root))
-        local_tree.update_patch(include=[paths["test"], paths["metadata"]])
+        local_tree.add_new(os.path.relpath(paths["sync_dest"]["tests_path"],
+                                           local_tree.root))
+        local_tree.update_patch(include=[paths["sync_dest"]["tests_path"],
+                                         paths["sync_dest"]["metadata_path"]])
     except Exception as e:
         #bug.comment("Update failed with error:\n %s" % traceback.format_exc())
         sys.stderr.write(traceback.format_exc())
@@ -328,7 +349,7 @@
     finally:
         pass  # wpt.clean()
 
-    return initial_manifest, new_manifest
+    return initial_manifests
 
 
 def update_metadata(paths, local_tree, initial_rev, bug, log_files, ignore_existing,
@@ -346,8 +367,8 @@
         except subprocess.CalledProcessError:
             # Patch with that name already exists, probably
             pass
-        needs_human = metadata.update_expected(paths["test"],
-                                               paths["metadata"],
+        needs_human = metadata.update_expected(paths["test_paths"],
+                                               paths["serve"],
                                                log_files,
                                                rev_old=initial_rev,
                                                ignore_existing=ignore_existing,
@@ -358,8 +379,11 @@
             pass
 
         if not local_tree.is_clean():
-            local_tree.add_new(os.path.relpath(paths["metadata"], local_tree.root))
-            local_tree.update_patch(include=[paths["metadata"]])
+            metadata_paths = [manifest_path["metadata_path"]
+                              for manifest_path in paths["test_paths"].itervalues()]
+            for path in metadata_paths:
+                local_tree.add_new(os.path.relpath(path, local_tree.root))
+            local_tree.update_patch(include=metadata_paths)
 
     except Exception as e:
         #bug.comment("Update failed with error:\n %s" % traceback.format_exc())
@@ -370,14 +394,18 @@
 def run_update(**kwargs):
     config = kwargs["config"]
 
-    paths = {"test": kwargs["tests_root"],
-             "metadata": kwargs["metadata_root"]}
+    paths = {}
+    paths["test_paths"] = kwargs["test_paths"]
 
     if kwargs["sync"]:
+        paths["sync_dest"] = kwargs["test_paths"]["/"]
         paths["sync"] = kwargs["sync_path"]
 
-    for path in paths.itervalues():
-        ensure_exists(path)
+
+    paths["serve"] = kwargs["serve_root"] if kwargs["serve_root"] else paths["test_paths"]["/"]["tests_path"]
+
+#    for path in paths.itervalues():
+#        ensure_exists(path)
 
     if not kwargs["sync"] and not kwargs["run_log"]:
         print """Nothing to do.
@@ -412,8 +440,12 @@
         wpt_repo = WebPlatformTests(config["web-platform-tests"]["remote_url"],
                                     paths["sync"],
                                     rev=rev)
-        initial_manifest, new_manifest = sync_tests(paths, local_tree, wpt_repo, bug)
-        initial_rev = initial_manifest.rev
+        initial_manifests = sync_tests(paths, local_tree, wpt_repo, bug)
+        initial_rev = None
+        for manifest, path_data in initial_manifests.iteritems():
+            if path_data["url_base"] == "/":
+                initial_rev = manifest.rev
+                break
 
     if kwargs["run_log"]:
         update_metadata(paths,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/vcs.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/vcs.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/vcs.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/vcs.py	2014-11-26 21:45:51.000000000 +0000
@@ -5,9 +5,15 @@
 import subprocess
 from functools import partial
 
+from mozlog.structured import get_default_logger
+
+logger = None
 
 def vcs(bin_name):
     def inner(command, *args, **kwargs):
+        global logger
+        if logger is None:
+            logger = get_default_logger("vcs")
         repo = kwargs.pop("repo", None)
         if kwargs:
             raise TypeError, kwargs
@@ -19,12 +25,11 @@
             proc_kwargs["cwd"] = repo
 
         command_line = [bin_name, command] + args
-        print " ".join(command_line)
+        logger.debug(" ".join(command_line))
         try:
             return subprocess.check_output(command_line, **proc_kwargs)
         except subprocess.CalledProcessError as e:
-            print proc_kwargs
-            print e.output
+            logger.error(e.output)
             raise
     return inner
 
@@ -41,5 +46,4 @@
         rv = git("rev-parse", "--show-cdup", repo=path)
     except subprocess.CalledProcessError:
         return False
-    print rv
     return rv == "\n"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/wptcommandline.py	2014-11-26 21:45:51.000000000 +0000
@@ -3,8 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import argparse
+import ast
 import os
 import sys
+from collections import OrderedDict
 
 import config
 
@@ -48,11 +50,20 @@
     parser.add_argument("--metadata", action="store", type=abs_path, dest="metadata_root",
                         help="Path to the folder containing test metadata"),
     parser.add_argument("--tests", action="store", type=abs_path, dest="tests_root",
-                        help="Path to web-platform-tests"),
+                        help="Path to test files"),
     parser.add_argument("--prefs-root", dest="prefs_root", action="store", type=abs_path,
                         help="Path to the folder containing browser prefs"),
-    parser.add_argument("--config", action="store", type=abs_path,
+    parser.add_argument("--serve-root", action="store", type=abs_path, dest="serve_root",
+                        help="Path to web-platform-tests checkout containing serve.py and manifest.py"
+                        " (defaults to test_root)")
+    parser.add_argument("--run-info", action="store", type=abs_path,
+                        help="Path to directory containing extra json files to add to run info")
+    parser.add_argument("--config", action="store", type=abs_path, dest="config",
                         help="Path to config file")
+
+    parser.add_argument("--manifest-update", action="store_true", default=False,
+                        help="Force regeneration of the test manifest")
+
     parser.add_argument("--binary", action="store",
                         type=abs_path, help="Binary to run tests against")
     parser.add_argument("--test-types", action="store",
@@ -118,12 +129,16 @@
 
 def set_from_config(kwargs):
     if kwargs["config"] is None:
-        kwargs["config"] = config.path()
+        config_path = config.path()
+    else:
+        config_path = kwargs["config"]
 
-    kwargs["config"] = config.read(kwargs["config"])
+    kwargs["config_path"] = config_path
+    kwargs["config"] = config.read(kwargs["config_path"])
 
-    keys = {"paths": [("tests", "tests_root", True),
-                      ("metadata", "metadata_root", True)],
+    keys = {"paths": [("serve", "serve_root", True),
+                      ("prefs", "prefs_root", True),
+                      ("run_info", "run_info", True)],
             "web-platform-tests": [("remote_url", "remote_url", False),
                                    ("branch", "branch", False),
                                    ("sync_path", "sync_path", True)]}
@@ -132,28 +147,69 @@
         for config_value, kw_value, is_path in values:
             if kw_value in kwargs and kwargs[kw_value] is None:
                 if not is_path:
-                    new_value = kwargs["config"].get(section, {}).get(config_value, None)
+                    new_value = kwargs["config"].get(section, {}).get(config_value)
                 else:
                     new_value = kwargs["config"].get(section, {}).get_path(config_value)
                 kwargs[kw_value] = new_value
 
+    kwargs["test_paths"] = get_test_paths(kwargs["config"])
+
+    if kwargs["tests_root"]:
+        if "/" not in kwargs["test_paths"]:
+            kwargs["test_paths"]["/"] = {}
+        kwargs["test_paths"]["/"]["tests_path"] = kwargs["tests_root"]
+
+    if kwargs["metadata_root"]:
+        if "/" not in kwargs["test_paths"]:
+            kwargs["test_paths"]["/"] = {}
+        kwargs["test_paths"]["/"]["metadata_path"] = kwargs["metadata_root"]
+
+def get_test_paths(config):
+    # Set up test_paths
+    test_paths = OrderedDict()
+
+    for section in config.iterkeys():
+        if section.startswith("manifest:"):
+            manifest_opts = config.get(section)
+            url_base = manifest_opts.get("url_base", "/")
+            test_paths[url_base] = {
+                "tests_path": manifest_opts.get_path("tests"),
+                "metadata_path": manifest_opts.get_path("metadata")}
+
+    return test_paths
+
+
 
 def check_args(kwargs):
-    from mozrunner import cli
+    from mozrunner import debugger_arguments
 
     set_from_config(kwargs)
 
-    for key in ["tests_root", "metadata_root"]:
-        name = key.split("_", 1)[0]
-        path = kwargs[key]
-
-        if not os.path.exists(path):
-            print "Fatal: %s path %s does not exist" % (name, path)
+    for test_paths in kwargs["test_paths"].itervalues():
+        if not ("tests_path" in test_paths and
+                "metadata_path" in test_paths):
+            print "Fatal: must specify both a test path and metadata path"
             sys.exit(1)
+        for key, path in test_paths.iteritems():
+            name = key.split("_", 1)[0]
 
-        if not os.path.isdir(path):
-            print "Fatal: %s path %s is not a directory" % (name, path)
-            sys.exit(1)
+            if not os.path.exists(path):
+                print "Fatal: %s path %s does not exist" % (name, path)
+                sys.exit(1)
+
+            if not os.path.isdir(path):
+                print "Fatal: %s path %s is not a directory" % (name, path)
+                sys.exit(1)
+
+    if kwargs["serve_root"] is None:
+        if "/" in kwargs["test_paths"]:
+            kwargs["serve_root"] = kwargs["test_paths"]["/"]["tests_path"]
+    else:
+        print >> sys.stderr, "Unable to determine server root path"
+        sys.exit(1)
+
+    if kwargs["run_info"] is None:
+        kwargs["run_info"] = kwargs["config_path"]
 
     if kwargs["this_chunk"] > 1:
         require_arg(kwargs, "total_chunks", lambda x: x >= kwargs["this_chunk"])
@@ -165,8 +221,8 @@
             kwargs["chunk_type"] = "none"
 
     if kwargs["debugger"] is not None:
-        debug_args, interactive = cli.debugger_arguments(kwargs["debugger"],
-                                                         kwargs["debugger_args"])
+        debug_args, interactive = debugger_arguments(kwargs["debugger"],
+                                                     kwargs["debugger_args"])
         if interactive:
             require_arg(kwargs, "processes", lambda x: x == 1)
             kwargs["no_capture_stdio"] = True
@@ -187,17 +243,20 @@
 def create_parser_update():
     parser = argparse.ArgumentParser("web-platform-tests-update",
                                      description="Update script for web-platform-tests tests.")
+    parser.add_argument("--config", action="store", type=abs_path, help="Path to config file")
     parser.add_argument("--metadata", action="store", type=abs_path, dest="metadata_root",
                         help="Path to the folder containing test metadata"),
     parser.add_argument("--tests", action="store", type=abs_path, dest="tests_root",
                         help="Path to web-platform-tests"),
     parser.add_argument("--sync-path", action="store", type=abs_path,
                         help="Path to store git checkout of web-platform-tests during update"),
+    parser.add_argument("--serve-root", action="store", type=abs_path, dest="serve_root",
+                        help="Path to web-platform-tests checkout containing serve.py and manifest.py"
+                        " (defaults to test_root)")
     parser.add_argument("--remote_url", action="store",
                         help="URL of web-platfrom-tests repository to sync against"),
     parser.add_argument("--branch", action="store", type=abs_path,
                         help="Remote branch to sync against")
-    parser.add_argument("--config", action="store", type=abs_path, help="Path to config file")
     parser.add_argument("--rev", action="store", help="Revision to sync to")
     parser.add_argument("--no-check-clean", action="store_true", default=False,
                         help="Don't check the working directory is clean before updating")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/wptrunner.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/wptrunner.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/harness/wptrunner/wptrunner.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/harness/wptrunner/wptrunner.py	2014-11-26 21:45:51.000000000 +0000
@@ -15,15 +15,14 @@
 import urlparse
 from Queue import Empty
 from StringIO import StringIO
-from abc import ABCMeta, abstractmethod
-from collections import defaultdict, OrderedDict
+
 from multiprocessing import Queue
 
-from mozlog.structured import commandline, stdadapter
+from mozlog.structured import (commandline, stdadapter, get_default_logger,
+                               structuredlog, handlers, formatters)
 
-import manifestexpected
-import manifestinclude
 import products
+import testloader
 import wptcommandline
 import wpttest
 from testrunner import ManagerGroup
@@ -68,11 +67,11 @@
     logging.root = stdadapter.std_logging_adapter(logging.root)
 
 
-def do_test_relative_imports(test_root):
+def do_delayed_imports(serve_root):
     global serve, manifest
 
-    sys.path.insert(0, os.path.join(test_root))
-    sys.path.insert(0, os.path.join(test_root, "tools", "scripts"))
+    sys.path.insert(0, os.path.join(serve_root))
+    sys.path.insert(0, os.path.join(serve_root, "tools", "scripts"))
     failed = None
     try:
         import serve
@@ -86,18 +85,43 @@
     if failed:
         logger.critical(
             "Failed to import %s. Ensure that tests path %s contains web-platform-tests" %
-            (failed, test_root))
+            (failed, serve_root))
         sys.exit(1)
 
+
 class TestEnvironmentError(Exception):
     pass
 
 
+class LogLevelRewriter(object):
+    """Filter that replaces log messages at specified levels with messages
+    at a different level.
+
+    This can be used to e.g. downgrade log messages from ERROR to WARNING
+    in some component where ERRORs are not critical.
+
+    :param inner: Handler to use for messages that pass this filter
+    :param from_levels: List of levels which should be affected
+    :param to_level: Log level to set for the affected messages
+    """
+    def __init__(self, inner, from_levels, to_level):
+        self.inner = inner
+        self.from_levels = [item.upper() for item in from_levels]
+        self.to_level = to_level.upper()
+
+    def __call__(self, data):
+        if data["action"] == "log" and data["level"].upper() in self.from_levels:
+            data = data.copy()
+            data["level"] = self.to_level
+        return self.inner(data)
+
+
 class TestEnvironment(object):
-    def __init__(self, test_path, options):
+    def __init__(self, serve_path, test_paths, options):
         """Context manager that owns the test environment i.e. the http and
         websockets servers"""
-        self.test_path = test_path
+        self.serve_path = serve_path
+        self.test_paths = test_paths
         self.server = None
         self.config = None
         self.external_config = None
@@ -108,11 +132,10 @@
 
     def __enter__(self):
         self.copy_required_files()
-
+        self.setup_server_logging()
+        self.setup_routes()
         self.config = self.load_config()
         serve.set_computed_defaults(self.config)
-
-        serve.logger = serve.default_logger("info")
         self.external_config, self.servers = serve.start(self.config)
         return self
 
@@ -123,7 +146,7 @@
                 server.kill()
 
     def load_config(self):
-        default_config_path = os.path.join(self.test_path, "config.default.json")
+        default_config_path = os.path.join(self.serve_path, "config.default.json")
         local_config_path = os.path.join(here, "config.json")
 
         with open(default_config_path) as f:
@@ -135,13 +158,53 @@
 
         local_config["external_host"] = self.options.get("external_host", None)
 
-        return serve.merge_json(default_config, local_config)
+        config = serve.merge_json(default_config, local_config)
+        config["doc_root"] = self.serve_path
+
+        return config
+
+    def setup_server_logging(self):
+        server_logger = get_default_logger(component="wptserve")
+        assert server_logger is not None
+        log_filter = handlers.LogLevelFilter(lambda x:x, "info")
+        # Downgrade errors to warnings for the server
+        log_filter = LogLevelRewriter(log_filter, ["error"], "warning")
+        server_logger.component_filter = log_filter
+
+        serve.logger = server_logger
+        #Set as the default logger for wptserve
+        serve.set_logger(server_logger)
+
+    def setup_routes(self):
+        for url, paths in self.test_paths.iteritems():
+            if url == "/":
+                continue
+
+            path = paths["tests_path"]
+            url = "/%s/" % url.strip("/")
+
+            for (method,
+                 suffix,
+                 handler_cls) in [(serve.any_method,
+                                   b"*.py",
+                                   serve.handlers.PythonScriptHandler),
+                                  (b"GET",
+                                   "*.asis",
+                                   serve.handlers.AsIsHandler),
+                                  (b"GET",
+                                   "*",
+                                   serve.handlers.FileHandler)]:
+                route = (method, b"%s%s" % (str(url), str(suffix)), handler_cls(path, url_base=url))
+                serve.routes.insert(-3, route)
+
+        if "/" not in self.test_paths:
+            serve.routes = serve.routes[:-3]
 
     def copy_required_files(self):
         logger.info("Placing required files in server environment.")
         for source, destination, copy_if_exists in self.required_files:
             source_path = os.path.join(here, source)
-            dest_path = os.path.join(self.test_path, destination, os.path.split(source)[1])
+            dest_path = os.path.join(self.serve_path, destination, os.path.split(source)[1])
             dest_exists = os.path.exists(dest_path)
             if not dest_exists or copy_if_exists:
                 if dest_exists:
@@ -177,369 +240,6 @@
                 os.rename(path + ".orig", path)
 
 
-class TestChunker(object):
-    def __init__(self, total_chunks, chunk_number):
-        self.total_chunks = total_chunks
-        self.chunk_number = chunk_number
-        assert self.chunk_number <= self.total_chunks
-
-    def __call__(self, manifest):
-        raise NotImplementedError
-
-
-class Unchunked(TestChunker):
-    def __init__(self, *args, **kwargs):
-        TestChunker.__init__(self, *args, **kwargs)
-        assert self.total_chunks == 1
-
-    def __call__(self, manifest):
-        for item in manifest:
-            yield item
-
-
-class HashChunker(TestChunker):
-    def __call__(self):
-        chunk_index = self.chunk_number - 1
-        for test_path, tests in manifest:
-            if hash(test_path) % self.total_chunks == chunk_index:
-                yield test_path, tests
-
-
-class EqualTimeChunker(TestChunker):
-    """Chunker that uses the test timeout as a proxy for the running time of the test"""
-
-    def _get_chunk(self, manifest_items):
-        # For each directory containing tests, calculate the maximum execution time after running all
-        # the tests in that directory. Then work out the index into the manifest corresponding to the
-        # directories at fractions of m/N of the running time where m=1..N-1 and N is the total number
-        # of chunks. Return an array of these indicies
-
-        total_time = 0
-        by_dir = OrderedDict()
-
-        class PathData(object):
-            def __init__(self, path):
-                self.path = path
-                self.time = 0
-                self.tests = []
-
-        class Chunk(object):
-            def __init__(self):
-                self.paths = []
-                self.tests = []
-                self.time = 0
-
-            def append(self, path_data):
-                self.paths.append(path_data.path)
-                self.tests.extend(path_data.tests)
-                self.time += path_data.time
-
-        class ChunkList(object):
-            def __init__(self, total_time, n_chunks):
-                self.total_time = total_time
-                self.n_chunks = n_chunks
-
-                self.remaining_chunks = n_chunks
-
-                self.chunks = []
-
-                self.update_time_per_chunk()
-
-            def __iter__(self):
-                for item in self.chunks:
-                    yield item
-
-            def __getitem__(self, i):
-                return self.chunks[i]
-
-            def sort_chunks(self):
-                self.chunks = sorted(self.chunks, key=lambda x:x.paths[0])
-
-            def get_tests(self, chunk_number):
-                return self[chunk_number - 1].tests
-
-            def append(self, chunk):
-                if len(self.chunks) == self.n_chunks:
-                    raise ValueError("Tried to create more than %n chunks" % self.n_chunks)
-                self.chunks.append(chunk)
-                self.remaining_chunks -= 1
-
-            @property
-            def current_chunk(self):
-                if self.chunks:
-                    return self.chunks[-1]
-
-            def update_time_per_chunk(self):
-                self.time_per_chunk = (self.total_time - sum(item.time for item in self)) / self.remaining_chunks
-
-            def create(self):
-                rv = Chunk()
-                self.append(rv)
-                return rv
-
-            def add_path(self, path_data):
-                sum_time = self.current_chunk.time + path_data.time
-                if sum_time > self.time_per_chunk and self.remaining_chunks > 0:
-                    overshoot = sum_time - self.time_per_chunk
-                    undershoot = self.time_per_chunk - self.current_chunk.time
-                    if overshoot < undershoot:
-                        self.create()
-                        self.current_chunk.append(path_data)
-                    else:
-                        self.current_chunk.append(path_data)
-                        self.create()
-                else:
-                    self.current_chunk.append(path_data)
-
-        for i, (test_path, tests) in enumerate(manifest_items):
-            test_dir = tuple(os.path.split(test_path)[0].split(os.path.sep)[:3])
-
-            if not test_dir in by_dir:
-                by_dir[test_dir] = PathData(test_dir)
-
-            data = by_dir[test_dir]
-            time = sum(wpttest.DEFAULT_TIMEOUT if test.timeout !=
-                       "long" else wpttest.LONG_TIMEOUT for test in tests)
-            data.time += time
-            data.tests.append((test_path, tests))
-
-            total_time += time
-
-        chunk_list = ChunkList(total_time, self.total_chunks)
-
-        if len(by_dir) < self.total_chunks:
-            raise ValueError("Tried to split into %i chunks, but only %i subdirectories included" % (
-                self.total_chunks, len(by_dir)))
-
-        # Put any individual dirs with a time greater than the time per chunk into their own
-        # chunk
-        while True:
-            to_remove = []
-            for path_data in by_dir.itervalues():
-                if path_data.time > chunk_list.time_per_chunk:
-                    to_remove.append(path_data)
-            if to_remove:
-                for path_data in to_remove:
-                    chunk = chunk_list.create()
-                    chunk.append(path_data)
-                    del by_dir[path_data.path]
-                chunk_list.update_time_per_chunk()
-            else:
-                break
-
-        chunk = chunk_list.create()
-        for path_data in by_dir.itervalues():
-            chunk_list.add_path(path_data)
-
-        assert len(chunk_list.chunks) == self.total_chunks, len(chunk_list.chunks)
-        assert sum(item.time for item in chunk_list) == chunk_list.total_time
-
-        chunk_list.sort_chunks()
-
-        return chunk_list.get_tests(self.chunk_number)
-
-    def __call__(self, manifest_iter):
-        manifest = list(manifest_iter)
-        tests = self._get_chunk(manifest)
-        for item in tests:
-            yield item
-
-
-class TestFilter(object):
-    def __init__(self, include=None, exclude=None, manifest_path=None):
-        if manifest_path is not None and include is None:
-            self.manifest = manifestinclude.get_manifest(manifest_path)
-        else:
-            self.manifest = manifestinclude.IncludeManifest.create()
-
-        if include is not None:
-            self.manifest.set("skip", "true")
-            for item in include:
-                self.manifest.add_include(item)
-
-        if exclude is not None:
-            for item in exclude:
-                self.manifest.add_exclude(item)
-
-    def __call__(self, manifest_iter):
-        for test_path, tests in manifest_iter:
-            include_tests = set()
-            for test in tests:
-                if self.manifest.include(test):
-                    include_tests.add(test)
-
-            if include_tests:
-                yield test_path, include_tests
-
-
-class TestLoader(object):
-    def __init__(self, tests_root, metadata_root, test_types, test_filter, run_info,
-                 chunk_type="none", total_chunks=1, chunk_number=1):
-        self.tests_root = tests_root
-        self.metadata_root = metadata_root
-        self.test_types = test_types
-        self.test_filter = test_filter
-        self.run_info = run_info
-        self.manifest_path = os.path.join(self.metadata_root, "MANIFEST.json")
-        self.manifest = self.load_manifest()
-        self.tests = None
-        self.disabled_tests = None
-
-        self.chunk_type = chunk_type
-        self.total_chunks = total_chunks
-        self.chunk_number = chunk_number
-
-        self.chunker = {"none": Unchunked,
-                        "hash": HashChunker,
-                        "equal_time": EqualTimeChunker}[chunk_type](total_chunks,
-                                                                    chunk_number)
-
-        self._test_ids = None
-        self._load_tests()
-
-    @property
-    def test_ids(self):
-        if self._test_ids is None:
-            self._test_ids = []
-            for test_dict in [self.disabled_tests, self.tests]:
-                for test_type in self.test_types:
-                    self._test_ids += [item.id for item in test_dict[test_type]]
-        return self._test_ids
-
-    def create_manifest(self):
-        logger.info("Creating test manifest")
-        manifest.setup_git(self.tests_root)
-        manifest_file = manifest.Manifest(None)
-        manifest.update(manifest_file)
-        manifest.write(manifest_file, self.manifest_path)
-
-    def load_manifest(self):
-        if not os.path.exists(self.manifest_path):
-            self.create_manifest()
-        return manifest.load(self.manifest_path)
-
-    def get_test(self, manifest_test, expected_file):
-        if expected_file is not None:
-            expected = expected_file.get_test(manifest_test.id)
-        else:
-            expected = None
-        return wpttest.from_manifest(manifest_test, expected)
-
-    def load_expected_manifest(self, test_path):
-        return manifestexpected.get_manifest(self.metadata_root, test_path, self.run_info)
-
-    def iter_tests(self):
-        manifest_items = self.test_filter(self.manifest.itertypes(*self.test_types))
-
-        if self.chunker is not None:
-            manifest_items = self.chunker(manifest_items)
-
-        for test_path, tests in manifest_items:
-            expected_file = self.load_expected_manifest(test_path)
-            for manifest_test in tests:
-                test = self.get_test(manifest_test, expected_file)
-                test_type = manifest_test.item_type
-                yield test_path, test_type, test
-
-    def _load_tests(self):
-        """Read in the tests from the manifest file and add them to a queue"""
-        tests = {"enabled":defaultdict(list),
-                 "disabled":defaultdict(list)}
-
-        for test_path, test_type, test in self.iter_tests():
-            key = "enabled" if not test.disabled() else "disabled"
-            tests[key][test_type].append(test)
-
-        self.tests = tests["enabled"]
-        self.disabled_tests = tests["disabled"]
-
-    def groups(self, test_types, chunk_type="none", total_chunks=1, chunk_number=1):
-        groups = set()
-
-        for test_type in test_types:
-            for test in self.tests[test_type]:
-                group = test.url.split("/")[1]
-                groups.add(group)
-
-        return groups
-
-
-class TestSource(object):
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def queue_tests(self, test_queue):
-        pass
-
-    @abstractmethod
-    def requeue_test(self, test):
-        pass
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        pass
-
-
-class SingleTestSource(TestSource):
-    def __init__(self, test_queue):
-        self.test_queue = test_queue
-
-    @classmethod
-    def queue_tests(cls, test_queue, test_type, tests):
-        for test in tests[test_type]:
-            test_queue.put(test)
-
-    def get_queue(self):
-        if self.test_queue.empty():
-            return None
-        return self.test_queue
-
-    def requeue_test(self, test):
-        self.test_queue.put(test)
-
-class PathGroupedSource(TestSource):
-    def __init__(self, test_queue):
-        self.test_queue = test_queue
-        self.current_queue = None
-
-    @classmethod
-    def queue_tests(cls, test_queue, test_type, tests, depth=None):
-        if depth is True:
-            depth = None
-
-        prev_path = None
-        group = None
-
-        for test in tests[test_type]:
-            path = urlparse.urlsplit(test.url).path.split("/")[1:-1][:depth]
-            if path != prev_path:
-                group = []
-                test_queue.put(group)
-                prev_path = path
-
-            group.append(test)
-
-    def get_queue(self):
-        if not self.current_queue or self.current_queue.empty():
-            try:
-                data = self.test_queue.get(block=True, timeout=1)
-                self.current_queue = Queue()
-                for item in data:
-                    self.current_queue.put(item)
-            except Empty:
-                return None
-
-        return self.current_queue
-
-    def requeue_test(self, test):
-        self.current_queue.put(test)
-
-    def __exit__(self, *args, **kwargs):
-        if self.current_queue:
-            self.current_queue.close()
-
 class LogThread(threading.Thread):
     def __init__(self, queue, logger, level):
         self.queue = queue
@@ -584,25 +284,30 @@
     def flush(self):
         pass
 
+def list_test_groups(serve_root, test_paths, test_types, product, **kwargs):
 
-def list_test_groups(tests_root, metadata_root, test_types, product, **kwargs):
-    do_test_relative_imports(tests_root)
+    do_delayed_imports(serve_root)
 
-    run_info = wpttest.get_run_info(metadata_root, product, debug=False)
-    test_filter = TestFilter(include=kwargs["include"], exclude=kwargs["exclude"],
-                             manifest_path=kwargs["include_manifest"])
-    test_loader = TestLoader(tests_root, metadata_root, test_types, test_filter, run_info)
+    run_info = wpttest.get_run_info(kwargs["run_info"], product, debug=False)
+    test_filter = testloader.TestFilter(include=kwargs["include"],
+                                        exclude=kwargs["exclude"],
+                                        manifest_path=kwargs["include_manifest"])
+    test_loader = testloader.TestLoader(test_paths,
+                                        test_types,
+                                        test_filter,
+                                        run_info)
 
-    for item in sorted(test_loader.groups()):
+    for item in sorted(test_loader.groups(test_types)):
         print item
 
-
-def list_disabled(tests_root, metadata_root, test_types, product, **kwargs):
-    do_test_relative_imports(tests_root)
-
+def list_disabled(serve_root, test_paths, test_types, product, **kwargs):
+    do_delayed_imports(serve_root)
     rv = []
-    run_info = wpttest.get_run_info(metadata_root, product, debug=False)
-    test_loader = TestLoader(tests_root, metadata_root, test_types, TestFilter(), run_info)
+    run_info = wpttest.get_run_info(kwargs["run_info"], product, debug=False)
+    test_loader = testloader.TestLoader(test_paths,
+                                        test_types,
+                                        testloader.TestFilter(),
+                                        run_info)
 
     for test_type, tests in test_loader.disabled_tests.iteritems():
         for test in tests:
@@ -610,7 +315,7 @@
     print json.dumps(rv, indent=2)
 
 
-def run_tests(config, tests_root, metadata_root, product, **kwargs):
+def run_tests(config, serve_root, test_paths, product, **kwargs):
     logging_queue = None
     logging_thread = None
     original_stdio = (sys.stdout, sys.stderr)
@@ -624,9 +329,9 @@
             sys.stderr = LoggingWrapper(logging_queue, prefix="STDERR")
             logging_thread.start()
 
-        do_test_relative_imports(tests_root)
+        do_delayed_imports(serve_root)
 
-        run_info = wpttest.get_run_info(metadata_root, product, debug=False)
+        run_info = wpttest.get_run_info(kwargs["run_info"], product, debug=False)
 
         (check_args,
          browser_cls, get_browser_kwargs,
@@ -642,29 +347,31 @@
         if "test_loader" in kwargs:
             test_loader = kwargs["test_loader"]
         else:
-            test_filter = TestFilter(include=kwargs["include"],
-                                     exclude=kwargs["exclude"],
-                                     manifest_path=kwargs["include_manifest"])
-            test_loader = TestLoader(tests_root,
-                                     metadata_root,
-                                     kwargs["test_types"],
-                                     test_filter,
-                                     run_info,
-                                     kwargs["chunk_type"],
-                                     kwargs["total_chunks"],
-                                     kwargs["this_chunk"])
+            test_filter = testloader.TestFilter(include=kwargs["include"],
+                                                exclude=kwargs["exclude"],
+                                                manifest_path=kwargs["include_manifest"])
+            test_loader = testloader.TestLoader(test_paths,
+                                                kwargs["test_types"],
+                                                test_filter,
+                                                run_info,
+                                                kwargs["chunk_type"],
+                                                kwargs["total_chunks"],
+                                                kwargs["this_chunk"],
+                                                kwargs["manifest_update"])
 
         if kwargs["run_by_dir"] is False:
-            test_source_cls = SingleTestSource
+            test_source_cls = testloader.SingleTestSource
             test_source_kwargs = {}
         else:
             # A value of None indicates infinite depth
-            test_source_cls = PathGroupedSource
+            test_source_cls = testloader.PathGroupedSource
             test_source_kwargs = {"depth": kwargs["run_by_dir"]}
 
         logger.info("Using %i client processes" % kwargs["processes"])
 
-        with TestEnvironment(tests_root, env_options) as test_environment:
+        with TestEnvironment(serve_root,
+                             test_paths,
+                             env_options) as test_environment:
             try:
                 test_environment.ensure_started()
             except TestEnvironmentError as e:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mach_commands.py	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mach_commands.py	2014-11-26 21:45:51.000000000 +0000
@@ -74,6 +74,7 @@
             kwargs["config"] = os.path.join(self.topsrcdir, 'testing', 'web-platform', 'wptrunner.ini')
 
         wptcommandline.set_from_config(kwargs)
+        update.setup_logging(kwargs, {"mach": sys.stdout})
 
         update.run_update(**kwargs)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/Makefile.in	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/Makefile.in	2014-11-26 21:45:51.000000000 +0000
@@ -1,32 +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/.
-WPT_TESTS = \
-  tests \
-  $(NULL)
-
-WPT_METADATA = \
-  meta \
-  $(NULL)
-
-
-_DEST_DIR = $(DEPTH)/_tests/web-platform
 PKG_STAGE = $(DIST)/test-stage
 
-WEBPLATFORM_FILES = \
-  runtests.py \
-  wptrunner.ini \
-  $(NULL)
-WEBPLATFORM_DEST = $(_DEST_DIR)
-INSTALL_TARGETS += WEBPLATFORM
-
-libs::
-	$(INSTALL) $(topsrcdir)/testing/web-platform/harness/wptrunner $(_DEST_DIR)
-libs:: $(WPT_TESTS)
-	$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)
-libs:: $(WPT_METADATA)
-	$(INSTALL) $(foreach f,$^,"$f") $(_DEST_DIR)
-
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/web-platform
 	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/web-platform
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -9,4 +9,5 @@
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -9,4 +9,5 @@
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -9,4 +9,5 @@
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -7,4 +7,5 @@
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.selfintersect.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.selfintersect.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.selfintersect.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.selfintersect.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.3.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.3.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.3.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.3.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -7,4 +7,5 @@
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.6.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.6.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.6.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.rect.zero.6.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,5 +15,6 @@
       if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): PASS
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.scale2.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.scale2.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.scale2.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.scale2.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -7,4 +7,5 @@
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): FAIL
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/dom/interfaces.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/dom/interfaces.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/dom/interfaces.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/dom/interfaces.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -351,3 +351,6 @@
   [Attr interface: attribute textContent]
     expected: FAIL
 
+  [Attr interface: attribute nodeValue]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/dom/nodes/Document-createElementNS.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/dom/nodes/Document-createElementNS.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/dom/nodes/Document-createElementNS.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/dom/nodes/Document-createElementNS.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -3,3 +3,6 @@
   [Invalid Name: \xcc\x80foo]
     expected: FAIL
 
+  [createElementNS test 6: null,"\xcc\x80foo","INVALID_CHARACTER_ERR"]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/dom/nodes/DOMImplementation-createDocument.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/dom/nodes/DOMImplementation-createDocument.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/dom/nodes/DOMImplementation-createDocument.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/dom/nodes/DOMImplementation-createDocument.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,8 @@
+[DOMImplementation-createDocument.html]
+  type: testharness
+  [createDocument test 6: null,"\xcc\x80foo",null,"INVALID_CHARACTER_ERR"]
+    expected: FAIL
+
+  [createDocument test 172: metadata for null,null,DocumentType node]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/addEventListener.optional.useCapture.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/addEventListener.optional.useCapture.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/addEventListener.optional.useCapture.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/addEventListener.optional.useCapture.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,3 @@
+[addEventListener.optional.useCapture.html]
+  type: testharness
+  expected: TIMEOUT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/dispatchEvent.return.value.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/dispatchEvent.return.value.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/dispatchEvent.return.value.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/approved/dispatchEvent.return.value.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,3 @@
+[dispatchEvent.return.value.html]
+  type: testharness
+  expected: TIMEOUT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,3 @@
+[addEventListener.optional.useCapture.html]
+  type: testharness
+  expected: TIMEOUT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,3 @@
+[dispatchEvent.return.value.html]
+  type: testharness
+  expected: TIMEOUT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/eventsource/eventsource-constructor-document-domain.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/eventsource/eventsource-constructor-document-domain.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/eventsource/eventsource-constructor-document-domain.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/eventsource/eventsource-constructor-document-domain.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,3 +1,10 @@
 [eventsource-constructor-document-domain.htm]
   type: testharness
-  expected: TIMEOUT
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    TIMEOUT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/hr-time/test_cross_frame_start.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/hr-time/test_cross_frame_start.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/hr-time/test_cross_frame_start.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/hr-time/test_cross_frame_start.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,4 +1,4 @@
 [test_cross_frame_start.html]
   type: testharness
   disabled:
-    if os == "win" and version == "5.1.2600": https://bugzilla.mozilla.org/show_bug.cgi?id=1090543
+    if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1090543
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -8,6 +8,7 @@
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [pushState must not be allowed to create cross-origin URLs (about:blank)]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -8,6 +8,7 @@
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [replaceState must not be allowed to create cross-origin URLs (about:blank)]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/documents/dom-tree-accessors/document.title-07.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -3,3 +3,6 @@
   [Document.title and DOMImplementation.createHTMLDocument 6]
     expected: FAIL
 
+  [createHTMLDocument test 6: "foo\\f\\fbar baz","foo\\f\\fbar baz","foo bar baz"]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/documents/resource-metadata-management/document-cookie.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/documents/resource-metadata-management/document-cookie.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/documents/resource-metadata-management/document-cookie.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/documents/resource-metadata-management/document-cookie.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -2,3 +2,4 @@
   type: testharness
   [getting cookie for a cookie-averse document returns empty string, setting does nothing]
     expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -78,9 +78,6 @@
   [Document interface: attribute commands]
     expected: FAIL
 
-  [Document interface: attribute onreadystatechange]
-    expected: FAIL
-
   [Document interface: attribute fgColor]
     expected: FAIL
 
@@ -132,12 +129,6 @@
   [Document interface: attribute ondragexit]
     expected: FAIL
 
-  [Document interface: attribute onmouseenter]
-    expected: FAIL
-
-  [Document interface: attribute onmouseleave]
-    expected: FAIL
-
   [Document interface: attribute onmousewheel]
     expected: FAIL
 
@@ -636,12 +627,6 @@
   [HTMLElement interface: attribute ondragexit]
     expected: FAIL
 
-  [HTMLElement interface: attribute onmouseenter]
-    expected: FAIL
-
-  [HTMLElement interface: attribute onmouseleave]
-    expected: FAIL
-
   [HTMLElement interface: attribute onmousewheel]
     expected: FAIL
 
@@ -2214,9 +2199,6 @@
   [CanvasRenderingContext2D interface: attribute currentTransform]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: operation resetTransform()]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: attribute imageSmoothingEnabled]
     expected: FAIL
 
@@ -2295,9 +2277,6 @@
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "currentTransform" with the proper type (6)]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "resetTransform" with the proper type (12)]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "imageSmoothingEnabled" with the proper type (15)]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/reflection-obsolete.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/reflection-obsolete.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/dom/reflection-obsolete.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/dom/reflection-obsolete.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1281,3 +1281,303 @@
   [font.tabIndex: IDL set to -2147483648 followed by IDL get]
     expected: FAIL
 
+  [marquee.hspace: setAttribute() to "\\t7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\\v7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\\f7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to " 7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xc2\xa07" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xef\xbb\xbf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\\n7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\\r7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\xa87" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\xa97" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe1\x9a\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe1\xa0\x8e7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x817" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x827" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x837" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x847" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x857" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x867" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x877" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x887" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x897" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\x8a7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe2\x80\xaf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.hspace: setAttribute() to "\xe3\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\\t7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\\v7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\\f7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to " 7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xc2\xa07" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xef\xbb\xbf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\\n7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\\r7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\xa87" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\xa97" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe1\x9a\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe1\xa0\x8e7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x817" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x827" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x837" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x847" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x857" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x867" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x877" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x887" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x897" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\x8a7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe2\x80\xaf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollAmount: setAttribute() to "\xe3\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\\t7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\\v7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\\f7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to " 7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xc2\xa07" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xef\xbb\xbf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\\n7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\\r7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\xa87" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\xa97" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe1\x9a\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe1\xa0\x8e7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x817" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x827" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x837" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x847" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x857" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x867" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x877" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x887" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x897" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\x8a7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe2\x80\xaf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.scrollDelay: setAttribute() to "\xe3\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\\t7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\\v7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\\f7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to " 7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xc2\xa07" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xef\xbb\xbf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\\n7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\\r7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\xa87" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\xa97" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe1\x9a\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe1\xa0\x8e7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x807" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x817" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x827" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x837" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x847" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x857" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x867" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x877" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x887" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x897" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\x8a7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe2\x80\xaf7" followed by IDL get]
+    expected: FAIL
+
+  [marquee.vspace: setAttribute() to "\xe3\x80\x807" followed by IDL get]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -48,6 +48,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <embed src>]
     expected:
@@ -58,6 +59,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <object data>]
     expected:
@@ -68,6 +70,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <input src>]
     expected:
@@ -78,6 +81,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video>]
     expected:
@@ -88,6 +92,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video><source>]
     expected:
@@ -98,6 +103,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio>]
     expected:
@@ -108,6 +114,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio><source>]
     expected:
@@ -118,4 +125,5 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -52,6 +52,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <embed src>]
     expected:
@@ -62,6 +63,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <object data>]
     expected:
@@ -72,6 +74,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <input src>]
     expected:
@@ -82,6 +85,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video>]
     expected:
@@ -92,6 +96,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video><source>]
     expected:
@@ -102,6 +107,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio>]
     expected:
@@ -112,6 +118,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio><source>]
     expected:
@@ -122,4 +129,5 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -48,6 +48,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <embed src>]
     expected:
@@ -58,6 +59,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <object data>]
     expected:
@@ -68,6 +70,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <input src>]
     expected:
@@ -78,6 +81,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video>]
     expected:
@@ -88,6 +92,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video><source>]
     expected:
@@ -98,6 +103,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio>]
     expected:
@@ -108,6 +114,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio><source>]
     expected:
@@ -118,4 +125,5 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -123,6 +123,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading image <embed src>]
@@ -134,6 +135,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading image <object data>]
@@ -145,6 +147,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading image <input src>]
@@ -156,6 +159,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading image <video poster>]
@@ -170,6 +174,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading video <video><source>]
@@ -181,6 +186,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading video <audio>]
@@ -192,6 +198,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading video <audio><source>]
@@ -203,6 +210,7 @@
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
       FAIL
 
   [loading webvtt <track>]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -123,6 +123,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <embed src>]
     expected:
@@ -133,6 +134,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <object data>]
     expected:
@@ -143,6 +145,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading image <input src>]
     expected:
@@ -153,6 +156,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video>]
     expected:
@@ -163,6 +167,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <video><source>]
     expected:
@@ -173,6 +178,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio>]
     expected:
@@ -183,6 +189,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [loading video <audio><source>]
     expected:
@@ -193,6 +200,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): TIMEOUT
       if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
 
   [EventSource#url]
     expected: FAIL
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/embedded-content/media-elements/video_loop_base.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/embedded-content/media-elements/video_loop_base.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/embedded-content/media-elements/video_loop_base.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/embedded-content/media-elements/video_loop_base.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,4 +1,4 @@
 [video_loop_base.html]
   type: testharness
   disabled:
-    if os == "win" and version == "5.1.2600": https://bugzilla.mozilla.org/show_bug.cgi?id=1090547
+    if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1090547
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[iframe_javascript_url_01.htm]
+  type: testharness
+  [javascript: URL creating a document in an about:blank iframe]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,7 +1,6 @@
 [selection.html]
   type: testharness
   expected:
-    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): TIMEOUT
   [test SelectionStart offset for input]
     expected: FAIL
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -16,4 +16,5 @@
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
     FAIL
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -16,4 +16,5 @@
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): PASS
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): PASS
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
     FAIL
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_index5.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_index5.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_index5.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_index5.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,5 +1,9 @@
 [idbcursor_delete_index5.htm]
   type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
   [IDBCursor.delete() - index - throw InvalidStateError when the cursor is being iterated]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore4.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore4.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore4.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore4.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBCursor.delete() - object store - throw InvalidStateError caused by object store been deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore5.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore5.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore5.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_delete_objectstore5.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,5 +1,8 @@
 [idbcursor_delete_objectstore5.htm]
   type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
   [IDBCursor.delete() - object store - throw InvalidStateError when the cursor is being iterated]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index4.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index4.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index4.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index4.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBCursor.update() - index - attempt to modify a record when object store been deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index5.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index5.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index5.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_index5.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[idbcursor_update_index5.htm]
+  type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore5.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore5.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore5.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore5.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBCursor.update() - object store - attempt to  modify a record when object store been deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore6.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore6.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore6.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbcursor_update_objectstore6.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[idbcursor_update_objectstore6.htm]
+  type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get6.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get6.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get6.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get6.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBIndex.get() - throw InvalidStateError when the index is deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get7.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get7.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get7.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_get7.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[idbindex_get7.htm]
+  type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_getKey6.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_getKey6.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_getKey6.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_getKey6.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBIndex.getKey() - throw InvalidStateError when the index is deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor2.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor2.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor2.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor2.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[idbindex_openCursor2.htm]
+  type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openCursor.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBIndex.openCursor() - throw InvalidStateError when the index is deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor2.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor2.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor2.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor2.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -5,6 +5,7 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [IDBIndex.openKeyCursor() - throw InvalidStateError when the index is deleted]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor3.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor3.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor3.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbindex_openKeyCursor3.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[idbindex_openKeyCursor3.htm]
+  type: testharness
+  expected:
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbobjectstore_deleted.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbobjectstore_deleted.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/IndexedDB/idbobjectstore_deleted.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/IndexedDB/idbobjectstore_deleted.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -4,6 +4,8 @@
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
   [Attempting to use deleted IDBObjectStore]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/MANIFEST.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/MANIFEST.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/MANIFEST.json	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/MANIFEST.json	2014-11-26 21:45:51.000000000 +0000
@@ -2,8799 +2,6814 @@
   "items": {
     "helper": [
       {
-        "path": "2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm",
-        "url": "2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm"
+        "url": "/2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm"
       },
       {
-        "path": "2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm",
-        "url": "2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm"
+        "url": "/2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm"
       },
       {
-        "path": "2dcontext/clear-100x50.png",
         "url": "/2dcontext/clear-100x50.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.copy.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-out.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-over.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.lighter.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.lighter.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-atop.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-over.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.xor.png",
         "url": "/2dcontext/compositing/2d.composite.canvas.xor.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.copy.png",
         "url": "/2dcontext/compositing/2d.composite.image.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.image.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.image.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-out.png",
         "url": "/2dcontext/compositing/2d.composite.image.destination-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-over.png",
         "url": "/2dcontext/compositing/2d.composite.image.destination-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.lighter.png",
         "url": "/2dcontext/compositing/2d.composite.image.lighter.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-atop.png",
         "url": "/2dcontext/compositing/2d.composite.image.source-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.image.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.image.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-over.png",
         "url": "/2dcontext/compositing/2d.composite.image.source-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.xor.png",
         "url": "/2dcontext/compositing/2d.composite.image.xor.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.copy.png",
         "url": "/2dcontext/compositing/2d.composite.solid.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-out.png",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-over.png",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.lighter.png",
         "url": "/2dcontext/compositing/2d.composite.solid.lighter.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-atop.png",
         "url": "/2dcontext/compositing/2d.composite.solid.source-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.solid.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.solid.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-over.png",
         "url": "/2dcontext/compositing/2d.composite.solid.source-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.xor.png",
         "url": "/2dcontext/compositing/2d.composite.solid.xor.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.copy.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-out.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-over.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.lighter.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.lighter.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-atop.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-over.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-over.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.xor.png",
         "url": "/2dcontext/compositing/2d.composite.transparent.xor.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.copy.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.copy.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.copy.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.copy.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.copy.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.destination-atop.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.destination-atop.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.destination-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.destination-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.source-in.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.source-in.png"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.source-out.png",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.source-out.png"
       },
       {
-        "path": "2dcontext/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm",
-        "url": "2dcontext/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm"
+        "url": "/2dcontext/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm"
       },
       {
-        "path": "2dcontext/conformance-requirements/2d.coordinatespace.png",
         "url": "/2dcontext/conformance-requirements/2d.coordinatespace.png"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/clear-100x50.png",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/clear-100x50.png"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex3.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex3.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex6.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex6.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.html4.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.html4.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colour.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colour.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.current.png",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.current.png"
       },
       {
-        "path": "2dcontext/green-100x50.png",
         "url": "/2dcontext/green-100x50.png"
       },
       {
-        "path": "2dcontext/line-styles/canvas_linestyles_linecap_001-ref.htm",
-        "url": "2dcontext/line-styles/canvas_linestyles_linecap_001-ref.htm"
+        "url": "/2dcontext/line-styles/canvas_linestyles_linecap_001-ref.htm"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.overlap.png",
         "url": "/2dcontext/path-objects/2d.path.fill.overlap.png"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.overlap.png",
         "url": "/2dcontext/path-objects/2d.path.stroke.overlap.png"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.alpha.png",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.alpha.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.2.png",
         "url": "/2dcontext/shadows/2d.shadow.alpha.2.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.3.png",
         "url": "/2dcontext/shadows/2d.shadow.alpha.3.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.4.png",
         "url": "/2dcontext/shadows/2d.shadow.alpha.4.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.5.png",
         "url": "/2dcontext/shadows/2d.shadow.alpha.5.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.blur.high.png",
         "url": "/2dcontext/shadows/2d.shadow.blur.high.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.blur.low.png",
         "url": "/2dcontext/shadows/2d.shadow.blur.low.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.canvas.alpha.png",
         "url": "/2dcontext/shadows/2d.shadow.canvas.alpha.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.gradient.alpha.png",
         "url": "/2dcontext/shadows/2d.shadow.gradient.alpha.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.alpha.png",
         "url": "/2dcontext/shadows/2d.shadow.image.alpha.png"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.pattern.alpha.png",
         "url": "/2dcontext/shadows/2d.shadow.pattern.alpha.png"
       },
       {
-        "path": "2dcontext/shadows/canvas_shadows_002-ref.htm",
-        "url": "2dcontext/shadows/canvas_shadows_002-ref.htm"
+        "url": "/2dcontext/shadows/canvas_shadows_002-ref.htm"
       },
       {
-        "path": "2dcontext/the-canvas-state/canvas_state_restore_001-ref.htm",
-        "url": "2dcontext/the-canvas-state/canvas_state_restore_001-ref.htm"
+        "url": "/2dcontext/the-canvas-state/canvas_state_restore_001-ref.htm"
       },
       {
-        "path": "2dcontext/tools/LICENSE.txt",
         "url": "/2dcontext/tools/LICENSE.txt"
       },
       {
-        "path": "2dcontext/tools/gentest.py",
         "url": "/2dcontext/tools/gentest.py"
       },
       {
-        "path": "2dcontext/tools/name2dir.yaml",
         "url": "/2dcontext/tools/name2dir.yaml"
       },
       {
-        "path": "2dcontext/tools/spec.yaml",
         "url": "/2dcontext/tools/spec.yaml"
       },
       {
-        "path": "2dcontext/tools/specextract.py",
         "url": "/2dcontext/tools/specextract.py"
       },
       {
-        "path": "2dcontext/tools/templates.yaml",
         "url": "/2dcontext/tools/templates.yaml"
       },
       {
-        "path": "2dcontext/tools/tests.yaml",
         "url": "/2dcontext/tools/tests.yaml"
       },
       {
-        "path": "2dcontext/tools/tests2d.yaml",
         "url": "/2dcontext/tools/tests2d.yaml"
       },
       {
-        "path": "2dcontext/tools/tests2dtext.yaml",
         "url": "/2dcontext/tools/tests2dtext.yaml"
       },
       {
-        "path": "2dcontext/transformations/canvas_transformations_scale_001-ref.htm",
-        "url": "2dcontext/transformations/canvas_transformations_scale_001-ref.htm"
+        "url": "/2dcontext/transformations/canvas_transformations_scale_001-ref.htm"
       },
       {
-        "path": "DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml",
         "url": "/DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml",
         "url": "/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/support/16kb.js",
         "url": "/DOMEvents/tests/submissions/Microsoft/support/16kb.js"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/support/InvalidBitMap.png",
         "url": "/DOMEvents/tests/submissions/Microsoft/support/InvalidBitMap.png"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/support/iepreview.png",
         "url": "/DOMEvents/tests/submissions/Microsoft/support/iepreview.png"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/support/navigate.js",
         "url": "/DOMEvents/tests/submissions/Microsoft/support/navigate.js"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/support/style01.css",
         "url": "/DOMEvents/tests/submissions/Microsoft/support/style01.css"
       },
       {
-        "path": "FileAPI/FileReader-interface/support/blue-100x100.png",
         "url": "/FileAPI/FileReader-interface/support/blue-100x100.png"
       },
       {
-        "path": "FileAPI/filelist-section/support/upload.txt",
         "url": "/FileAPI/filelist-section/support/upload.txt"
       },
       {
-        "path": "FileAPI/filelist-section/support/upload.zip",
         "url": "/FileAPI/filelist-section/support/upload.zip"
       },
       {
-        "path": "FileAPI/support/Blob.js",
         "url": "/FileAPI/support/Blob.js"
       },
       {
-        "path": "FileAPI/support/upload.txt",
         "url": "/FileAPI/support/upload.txt"
       },
       {
-        "path": "IndexedDB/README.md",
         "url": "/IndexedDB/README.md"
       },
       {
-        "path": "IndexedDB/idbworker.js",
         "url": "/IndexedDB/idbworker.js"
       },
       {
-        "path": "IndexedDB/support.js",
         "url": "/IndexedDB/support.js"
       },
       {
-        "path": "WebCryptoAPI/README.md",
         "url": "/WebCryptoAPI/README.md"
       },
       {
-        "path": "WebIDL/testable_assertions.txt",
         "url": "/WebIDL/testable_assertions.txt"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/enum.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/enum.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/module.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/module.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/nonnullableany.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/nonnullableany.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/nonnullableobjects.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/nonnullableobjects.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/raises.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/raises.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/scopedname.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/scopedname.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/sequenceAsAttribute.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/sequenceAsAttribute.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/special-omittable.widl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/special-omittable.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/invalid/idl/stringconstants.idl",
         "url": "/WebIDL/tests/submissions/W3C/invalid/idl/stringconstants.idl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/readme.txt",
         "url": "/WebIDL/tests/submissions/W3C/readme.txt"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/allowany.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/allowany.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/array.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/array.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/attributes.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/attributes.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/callback.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/callback.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/caller.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/caller.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/constants.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/constants.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/constructor.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/constructor.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/dictionary-inherits.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/dictionary-inherits.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/dictionary.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/dictionary.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/documentation-dos.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/documentation-dos.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/documentation.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/documentation.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/enum.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/enum.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/equivalent-decl.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/equivalent-decl.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/exception-inheritance.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/exception-inheritance.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/exception.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/exception.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/getter-setter.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/getter-setter.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/identifier-qualified-names.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/identifier-qualified-names.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/implements.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/implements.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/indexed-properties.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/indexed-properties.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/inherits-getter.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/inherits-getter.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/interface-inherits.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/interface-inherits.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/iterator.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/iterator.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/namedconstructor.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/namedconstructor.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/nointerfaceobject.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/nointerfaceobject.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/nullable.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/nullable.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/nullableobjects.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/nullableobjects.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/operation-optional-arg.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/operation-optional-arg.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/overloading.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/overloading.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/overridebuiltins.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/overridebuiltins.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/partial-interface.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/partial-interface.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/primitives.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/primitives.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/prototyperoot.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/prototyperoot.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/putforwards.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/putforwards.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/reg-operations.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/reg-operations.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/replaceable.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/replaceable.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/sequence.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/sequence.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/serializer.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/serializer.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/static.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/static.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/stringifier-attribute.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/stringifier-attribute.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/stringifier-custom.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/stringifier-custom.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/stringifier.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/stringifier.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/treatasnull.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/treatasnull.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/treatasundefined.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/treatasundefined.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/typedef.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/typedef.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/typesuffixes.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/typesuffixes.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/uniontype.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/uniontype.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/idl/variadic-operations.widl",
         "url": "/WebIDL/tests/submissions/W3C/valid/idl/variadic-operations.widl"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/allowany.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/allowany.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/array.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/array.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/attributes.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/attributes.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/callback.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/callback.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/caller.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/caller.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/constants.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/constants.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/constructor.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/constructor.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/dictionary-inherits.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/dictionary-inherits.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/dictionary.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/dictionary.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/documentation-dos.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/documentation-dos.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/documentation.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/documentation.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/enum.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/enum.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/equivalent-decl.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/equivalent-decl.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/exception-inheritance.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/exception-inheritance.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/exception.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/exception.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/getter-setter.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/getter-setter.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/identifier-qualified-names.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/identifier-qualified-names.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/implements.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/implements.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/indexed-properties.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/indexed-properties.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/inherits-getter.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/inherits-getter.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/interface-inherits.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/interface-inherits.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/iterator.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/iterator.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/module.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/module.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/namedconstructor.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/namedconstructor.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/namespaceobject.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/namespaceobject.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/nointerfaceobject.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/nointerfaceobject.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/nullable.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/nullable.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/nullableobjects.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/nullableobjects.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/operation-optional-arg.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/operation-optional-arg.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/overloading.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/overloading.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/overridebuiltins.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/overridebuiltins.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/partial-interface.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/partial-interface.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/primitives.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/primitives.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/prototyperoot.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/prototyperoot.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/putforwards.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/putforwards.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/reg-operations.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/reg-operations.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/replaceable.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/replaceable.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/sequence.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/sequence.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/serializer.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/serializer.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/special-omittable.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/special-omittable.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/static.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/static.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/stringifier-attribute.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/stringifier-attribute.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/stringifier-custom.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/stringifier-custom.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/stringifier.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/stringifier.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/treatasnull.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/treatasnull.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/treatasundefined.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/treatasundefined.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/typedef.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/typedef.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/typesuffixes.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/typesuffixes.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/uniontype.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/uniontype.widlprocxml"
       },
       {
-        "path": "WebIDL/tests/submissions/W3C/valid/xml/variadic-operations.widlprocxml",
         "url": "/WebIDL/tests/submissions/W3C/valid/xml/variadic-operations.widlprocxml"
       },
       {
-        "path": "XMLHttpRequest/folder.txt",
         "url": "/XMLHttpRequest/folder.txt"
       },
       {
-        "path": "XMLHttpRequest/readme.txt",
         "url": "/XMLHttpRequest/readme.txt"
       },
       {
-        "path": "XMLHttpRequest/resources/accept-language.py",
         "url": "/XMLHttpRequest/resources/accept-language.py"
       },
       {
-        "path": "XMLHttpRequest/resources/accept.py",
         "url": "/XMLHttpRequest/resources/accept.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth1/auth.py",
         "url": "/XMLHttpRequest/resources/auth1/auth.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth2/auth.py",
         "url": "/XMLHttpRequest/resources/auth2/auth.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth2/corsenabled.py",
         "url": "/XMLHttpRequest/resources/auth2/corsenabled.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth3/auth.py",
         "url": "/XMLHttpRequest/resources/auth3/auth.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth4/auth.py",
         "url": "/XMLHttpRequest/resources/auth4/auth.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth5/auth.py",
         "url": "/XMLHttpRequest/resources/auth5/auth.py"
       },
       {
-        "path": "XMLHttpRequest/resources/auth6/auth.py",
         "url": "/XMLHttpRequest/resources/auth6/auth.py"
       },
       {
-        "path": "XMLHttpRequest/resources/authentication.py",
         "url": "/XMLHttpRequest/resources/authentication.py"
       },
       {
-        "path": "XMLHttpRequest/resources/chunked.py",
         "url": "/XMLHttpRequest/resources/chunked.py"
       },
       {
-        "path": "XMLHttpRequest/resources/conditional.py",
         "url": "/XMLHttpRequest/resources/conditional.py"
       },
       {
-        "path": "XMLHttpRequest/resources/content.py",
         "url": "/XMLHttpRequest/resources/content.py"
       },
       {
-        "path": "XMLHttpRequest/resources/corsenabled.py",
         "url": "/XMLHttpRequest/resources/corsenabled.py"
       },
       {
-        "path": "XMLHttpRequest/resources/delay.py",
         "url": "/XMLHttpRequest/resources/delay.py"
       },
       {
-        "path": "XMLHttpRequest/resources/folder.txt",
         "url": "/XMLHttpRequest/resources/folder.txt"
       },
       {
-        "path": "XMLHttpRequest/resources/form.py",
         "url": "/XMLHttpRequest/resources/form.py"
       },
       {
-        "path": "XMLHttpRequest/resources/gzip.py",
         "url": "/XMLHttpRequest/resources/gzip.py"
       },
       {
-        "path": "XMLHttpRequest/resources/headers.py",
         "url": "/XMLHttpRequest/resources/headers.py"
       },
       {
-        "path": "XMLHttpRequest/resources/image.gif",
         "url": "/XMLHttpRequest/resources/image.gif"
       },
       {
-        "path": "XMLHttpRequest/resources/infinite-redirects.py",
         "url": "/XMLHttpRequest/resources/infinite-redirects.py"
       },
       {
-        "path": "XMLHttpRequest/resources/inspect-headers.py",
         "url": "/XMLHttpRequest/resources/inspect-headers.py"
       },
       {
-        "path": "XMLHttpRequest/resources/invalid-utf8-html.py",
         "url": "/XMLHttpRequest/resources/invalid-utf8-html.py"
       },
       {
-        "path": "XMLHttpRequest/resources/nocors/folder.txt",
         "url": "/XMLHttpRequest/resources/nocors/folder.txt"
       },
       {
-        "path": "XMLHttpRequest/resources/redirect.py",
         "url": "/XMLHttpRequest/resources/redirect.py"
       },
       {
-        "path": "XMLHttpRequest/resources/requri.py",
         "url": "/XMLHttpRequest/resources/requri.py"
       },
       {
-        "path": "XMLHttpRequest/resources/shift-jis-html.py",
         "url": "/XMLHttpRequest/resources/shift-jis-html.py"
       },
       {
-        "path": "XMLHttpRequest/resources/status.py",
         "url": "/XMLHttpRequest/resources/status.py"
       },
       {
-        "path": "XMLHttpRequest/resources/trickle.py",
         "url": "/XMLHttpRequest/resources/trickle.py"
       },
       {
-        "path": "XMLHttpRequest/resources/upload.py",
         "url": "/XMLHttpRequest/resources/upload.py"
       },
       {
-        "path": "XMLHttpRequest/resources/well-formed.xml",
         "url": "/XMLHttpRequest/resources/well-formed.xml"
       },
       {
-        "path": "XMLHttpRequest/resources/win-1252-xml.py",
         "url": "/XMLHttpRequest/resources/win-1252-xml.py"
       },
       {
-        "path": "XMLHttpRequest/resources/workerxhr-origin-referrer.js",
         "url": "/XMLHttpRequest/resources/workerxhr-origin-referrer.js"
       },
       {
-        "path": "XMLHttpRequest/resources/workerxhr-simple.js",
         "url": "/XMLHttpRequest/resources/workerxhr-simple.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-aborted.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-abortedonmain.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-overridesexpires.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-runner.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-simple.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-synconmain.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-synconworker.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout-twice.js"
       },
       {
-        "path": "XMLHttpRequest/resources/xmlhttprequest-timeout.js",
         "url": "/XMLHttpRequest/resources/xmlhttprequest-timeout.js"
       },
       {
-        "path": "XMLHttpRequest/resources/zlib.py",
         "url": "/XMLHttpRequest/resources/zlib.py"
       },
       {
-        "path": "ambient-light/DeviceLightEvent_tests.js",
         "url": "/ambient-light/DeviceLightEvent_tests.js"
       },
       {
-        "path": "app-uri/README.md",
         "url": "/app-uri/README.md"
       },
       {
-        "path": "app-uri/resources/ExamPLE/mmY/sth.txt",
         "url": "/app-uri/resources/ExamPLE/mmY/sth.txt"
       },
       {
-        "path": "app-uri/resources/ImaGes/{{a}}/Test_1/$a/sth34!.png",
         "url": "/app-uri/resources/ImaGes/{{a}}/Test_1/$a/sth34!.png"
       },
       {
-        "path": "app-uri/resources/ImaGes/~t/{!a}/corrupted_file.png",
         "url": "/app-uri/resources/ImaGes/~t/{!a}/corrupted_file.png"
       },
       {
-        "path": "app-uri/resources/ImaGes/~t/{!a}/~sth.png",
         "url": "/app-uri/resources/ImaGes/~t/{!a}/~sth.png"
       },
       {
-        "path": "app-uri/resources/icons/w3c-128.png",
         "url": "/app-uri/resources/icons/w3c-128.png"
       },
       {
-        "path": "app-uri/resources/icons/w3c-16.png",
         "url": "/app-uri/resources/icons/w3c-16.png"
       },
       {
-        "path": "app-uri/resources/icons/w3c-48.png",
         "url": "/app-uri/resources/icons/w3c-48.png"
       },
       {
-        "path": "app-uri/resources/idlharness.js",
         "url": "/app-uri/resources/idlharness.js"
       },
       {
-        "path": "app-uri/resources/testharness.css",
         "url": "/app-uri/resources/testharness.css"
       },
       {
-        "path": "app-uri/resources/testharness.js",
         "url": "/app-uri/resources/testharness.js"
       },
       {
-        "path": "app-uri/resources/testharnessreport.js",
         "url": "/app-uri/resources/testharnessreport.js"
       },
       {
-        "path": "battery-status/battery-interface.js",
         "url": "/battery-status/battery-interface.js"
       },
       {
-        "path": "battery-status/countdown.js",
         "url": "/battery-status/countdown.js"
       },
       {
-        "path": "battery-status/prime.js",
         "url": "/battery-status/prime.js"
       },
       {
-        "path": "content-security-policy/README.css",
         "url": "/content-security-policy/README.css"
       },
       {
-        "path": "content-security-policy/generic/generic-0_10.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_10.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_10_1.sub.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_10_1.sub.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_2.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_2.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_2_2.sub.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_2_2.sub.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_2_3.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_2_3.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_8.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_8.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_8_1.sub.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_8_1.sub.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/generic-0_9.sub.html.sub.headers",
         "url": "/content-security-policy/generic/generic-0_9.sub.html.sub.headers"
       },
       {
-        "path": "content-security-policy/generic/negativeTests.js",
         "url": "/content-security-policy/generic/negativeTests.js"
       },
       {
-        "path": "content-security-policy/generic/positiveTest.js",
         "url": "/content-security-policy/generic/positiveTest.js"
       },
       {
-        "path": "content-security-policy/generic/unreached.js",
         "url": "/content-security-policy/generic/unreached.js"
       },
       {
-        "path": "content-security-policy/generic/wildcardHostTest.js",
         "url": "/content-security-policy/generic/wildcardHostTest.js"
       },
       {
-        "path": "content-security-policy/generic/wildcardHostTestFailure.js",
         "url": "/content-security-policy/generic/wildcardHostTestFailure.js"
       },
       {
-        "path": "content-security-policy/generic/wildcardHostTestSuceeds.js",
         "url": "/content-security-policy/generic/wildcardHostTestSuceeds.js"
       },
       {
-        "path": "content-security-policy/generic/wildcardPortTest.js",
         "url": "/content-security-policy/generic/wildcardPortTest.js"
       },
       {
-        "path": "content-security-policy/generic/wildcardPortTestSuceeds.js",
         "url": "/content-security-policy/generic/wildcardPortTestSuceeds.js"
       },
       {
-        "path": "content-security-policy/object-src/object-src-2_1.html.sub.headers",
         "url": "/content-security-policy/object-src/object-src-2_1.html.sub.headers"
       },
       {
-        "path": "content-security-policy/object-src/object-src-2_2.html.sub.headers",
         "url": "/content-security-policy/object-src/object-src-2_2.html.sub.headers"
       },
       {
-        "path": "content-security-policy/script-src/addInlineTestsWithDOMManipulation.js",
         "url": "/content-security-policy/script-src/addInlineTestsWithDOMManipulation.js"
       },
       {
-        "path": "content-security-policy/script-src/inlineSuccessTest.js",
         "url": "/content-security-policy/script-src/inlineSuccessTest.js"
       },
       {
-        "path": "content-security-policy/script-src/inlineTests.js",
         "url": "/content-security-policy/script-src/inlineTests.js"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_1.html.sub.headers",
         "url": "/content-security-policy/script-src/script-src-1_1.html.sub.headers"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_2_1.html.sub.headers",
         "url": "/content-security-policy/script-src/script-src-1_2_1.html.sub.headers"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_3.html.sub.headers",
         "url": "/content-security-policy/script-src/script-src-1_3.html.sub.headers"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_4.html.sub.headers",
         "url": "/content-security-policy/script-src/script-src-1_4.html.sub.headers"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_1.html.sub.headers",
         "url": "/content-security-policy/style-src/style-src-3_1.html.sub.headers"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_2.html.sub.headers",
         "url": "/content-security-policy/style-src/style-src-3_2.html.sub.headers"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_4-import.css",
         "url": "/content-security-policy/style-src/style-src-3_4-import.css"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_4.css",
         "url": "/content-security-policy/style-src/style-src-3_4.css"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_4.html.sub.headers",
         "url": "/content-security-policy/style-src/style-src-3_4.html.sub.headers"
       },
       {
-        "path": "content-security-policy/support/checkReport.sub.js",
         "url": "/content-security-policy/support/checkReport.sub.js"
       },
       {
-        "path": "content-security-policy/support/media/flash.swf",
         "url": "/content-security-policy/support/media/flash.swf"
       },
       {
-        "path": "content-security-policy/support/report.py",
         "url": "/content-security-policy/support/report.py"
       },
       {
-        "path": "cors/resources/checkandremove.py",
         "url": "/cors/resources/checkandremove.py"
       },
       {
-        "path": "cors/resources/cors-cookie.py",
         "url": "/cors/resources/cors-cookie.py"
       },
       {
-        "path": "cors/resources/cors-headers.asis",
         "url": "/cors/resources/cors-headers.asis"
       },
       {
-        "path": "cors/resources/cors-makeheader.py",
         "url": "/cors/resources/cors-makeheader.py"
       },
       {
-        "path": "cors/resources/preflight.py",
         "url": "/cors/resources/preflight.py"
       },
       {
-        "path": "cors/resources/status.py",
         "url": "/cors/resources/status.py"
       },
       {
-        "path": "cors/support.js",
         "url": "/cors/support.js"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html",
-        "url": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html"
+        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html",
-        "url": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html"
+        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html",
-        "url": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html"
+        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html",
-        "url": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html"
+        "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html"
       },
       {
-        "path": "custom-elements/testcommon.js",
         "url": "/custom-elements/testcommon.js"
       },
       {
-        "path": "docs/configuration.md",
         "url": "/docs/configuration.md"
       },
       {
-        "path": "docs/css-metadata.md",
         "url": "/docs/css-metadata.md"
       },
       {
-        "path": "docs/css-naming.md",
         "url": "/docs/css-naming.md"
       },
       {
-        "path": "docs/css-user-styles.md",
         "url": "/docs/css-user-styles.md"
       },
       {
-        "path": "docs/github-101.md",
         "url": "/docs/github-101.md"
       },
       {
-        "path": "docs/manual-test.md",
         "url": "/docs/manual-test.md"
       },
       {
-        "path": "docs/reftests.md",
         "url": "/docs/reftests.md"
       },
       {
-        "path": "docs/review-checklist.md",
         "url": "/docs/review-checklist.md"
       },
       {
-        "path": "docs/review-process.md",
         "url": "/docs/review-process.md"
       },
       {
-        "path": "docs/running_tests.md",
         "url": "/docs/running_tests.md"
       },
       {
-        "path": "docs/submission-process.md",
         "url": "/docs/submission-process.md"
       },
       {
-        "path": "docs/test-format-guidelines.md",
         "url": "/docs/test-format-guidelines.md"
       },
       {
-        "path": "docs/test-style-guidelines.md",
         "url": "/docs/test-style-guidelines.md"
       },
       {
-        "path": "docs/test-templates.md",
         "url": "/docs/test-templates.md"
       },
       {
-        "path": "dom/common.js",
         "url": "/dom/common.js"
       },
       {
-        "path": "dom/constants.js",
         "url": "/dom/constants.js"
       },
       {
-        "path": "dom/nodes/ChildNode-remove.js",
         "url": "/dom/nodes/ChildNode-remove.js"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/blob.txt",
         "url": "/dom/nodes/Document-contentType/resources/blob.txt"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/blob.xml",
         "url": "/dom/nodes/Document-contentType/resources/blob.xml"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/lib.js",
         "url": "/dom/nodes/Document-contentType/resources/lib.js"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/style.css",
         "url": "/dom/nodes/Document-contentType/resources/style.css"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/t.bmp",
         "url": "/dom/nodes/Document-contentType/resources/t.bmp"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/t.gif",
         "url": "/dom/nodes/Document-contentType/resources/t.gif"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/t.jpg",
         "url": "/dom/nodes/Document-contentType/resources/t.jpg"
       },
       {
-        "path": "dom/nodes/Document-contentType/resources/t.png",
         "url": "/dom/nodes/Document-contentType/resources/t.png"
       },
       {
-        "path": "dom/nodes/Document-contentType/support/contenttype_setter.py",
         "url": "/dom/nodes/Document-contentType/support/contenttype_setter.py"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/bare_svg.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/bare_svg.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/empty.svg",
         "url": "/dom/nodes/Document-createElement-namespace-tests/empty.svg"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/empty.xhtml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/empty.xhtml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/empty.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/empty.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/generate.py",
         "url": "/dom/nodes/Document-createElement-namespace-tests/generate.py"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/mathml.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/mathml.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/minimal_html.svg",
         "url": "/dom/nodes/Document-createElement-namespace-tests/minimal_html.svg"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/minimal_html.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/minimal_html.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/svg.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/svg.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/xhtml.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/xhtml.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml",
         "url": "/dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction.js",
+        "url": "/dom/nodes/Document-createElementNS.js"
+      },
+      {
+        "url": "/dom/nodes/Document-createEvent.js"
+      },
+      {
         "url": "/dom/nodes/Document-createProcessingInstruction.js"
       },
       {
-        "path": "dom/nodes/Node-contains.xml",
         "url": "/dom/nodes/Node-contains.xml"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.js",
         "url": "/dom/nodes/ParentNode-querySelector-All.js"
       },
       {
-        "path": "dom/nodes/attributes.js",
         "url": "/dom/nodes/attributes.js"
       },
       {
-        "path": "dom/nodes/case.js",
         "url": "/dom/nodes/case.js"
       },
       {
-        "path": "dom/nodes/creators.js",
         "url": "/dom/nodes/creators.js"
       },
       {
-        "path": "dom/nodes/encoding.py",
         "url": "/dom/nodes/encoding.py"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-10.xml",
         "url": "/dom/nodes/getElementsByClassName-10.xml"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-11.xml",
         "url": "/dom/nodes/getElementsByClassName-11.xml"
       },
       {
-        "path": "dom/nodes/mutationobservers.js",
         "url": "/dom/nodes/mutationobservers.js"
       },
       {
-        "path": "dom/nodes/productions.js",
         "url": "/dom/nodes/productions.js"
       },
       {
-        "path": "dom/nodes/selectors.js",
         "url": "/dom/nodes/selectors.js"
       },
       {
-        "path": "dom/traversal/traversal-support.js",
         "url": "/dom/traversal/traversal-support.js"
       },
       {
-        "path": "dom/traversal/unfinished/001.xml",
         "url": "/dom/traversal/unfinished/001.xml"
       },
       {
-        "path": "dom/traversal/unfinished/002.xml",
         "url": "/dom/traversal/unfinished/002.xml"
       },
       {
-        "path": "dom/traversal/unfinished/003.xml",
         "url": "/dom/traversal/unfinished/003.xml"
       },
       {
-        "path": "dom/traversal/unfinished/004.xml",
         "url": "/dom/traversal/unfinished/004.xml"
       },
       {
-        "path": "dom/traversal/unfinished/005.xml",
         "url": "/dom/traversal/unfinished/005.xml"
       },
       {
-        "path": "dom/traversal/unfinished/006.xml",
         "url": "/dom/traversal/unfinished/006.xml"
       },
       {
-        "path": "dom/traversal/unfinished/007.xml",
         "url": "/dom/traversal/unfinished/007.xml"
       },
       {
-        "path": "dom/traversal/unfinished/008.xml",
         "url": "/dom/traversal/unfinished/008.xml"
       },
       {
-        "path": "dom/traversal/unfinished/009.xml",
         "url": "/dom/traversal/unfinished/009.xml"
       },
       {
-        "path": "dom/traversal/unfinished/010.xml",
         "url": "/dom/traversal/unfinished/010.xml"
       },
       {
-        "path": "dom/traversal/unfinished/TODO",
         "url": "/dom/traversal/unfinished/TODO"
       },
       {
-        "path": "eventsource/README.md",
         "url": "/eventsource/README.md"
       },
       {
-        "path": "eventsource/resources/accept.event_stream",
         "url": "/eventsource/resources/accept.event_stream"
       },
       {
-        "path": "eventsource/resources/cache-control.event_stream",
         "url": "/eventsource/resources/cache-control.event_stream"
       },
       {
-        "path": "eventsource/resources/cors-cookie.py",
         "url": "/eventsource/resources/cors-cookie.py"
       },
       {
-        "path": "eventsource/resources/cors.py",
         "url": "/eventsource/resources/cors.py"
       },
       {
-        "path": "eventsource/resources/last-event-id.py",
         "url": "/eventsource/resources/last-event-id.py"
       },
       {
-        "path": "eventsource/resources/message.py",
         "url": "/eventsource/resources/message.py"
       },
       {
-        "path": "eventsource/resources/message2.py",
         "url": "/eventsource/resources/message2.py"
       },
       {
-        "path": "eventsource/resources/reconnect-fail.py",
         "url": "/eventsource/resources/reconnect-fail.py"
       },
       {
-        "path": "eventsource/resources/status-error.py",
         "url": "/eventsource/resources/status-error.py"
       },
       {
-        "path": "eventsource/resources/status-reconnect.py",
         "url": "/eventsource/resources/status-reconnect.py"
       },
       {
-        "path": "ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-local.dtd",
         "url": "/ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-local.dtd"
       },
       {
-        "path": "ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-1.xhtml",
         "url": "/ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-1.xhtml"
       },
       {
-        "path": "ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-2.xhtml",
         "url": "/ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-2.xhtml"
       },
       {
-        "path": "ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-3.xhtml",
         "url": "/ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-3.xhtml"
       },
       {
-        "path": "fonts/CanvasTest.sfd",
         "url": "/fonts/CanvasTest.sfd"
       },
       {
-        "path": "fonts/CanvasTest.ttf",
         "url": "/fonts/CanvasTest.ttf"
       },
       {
-        "path": "geolocation-API/support.js",
         "url": "/geolocation-API/support.js"
       },
       {
-        "path": "html-imports/html-link-element/resources/hello.css",
         "url": "/html-imports/html-link-element/resources/hello.css"
       },
       {
-        "path": "html-longdesc/picture.png",
         "url": "/html-longdesc/picture.png"
       },
       {
-        "path": "html-longdesc/rebased/picture2.png",
         "url": "/html-longdesc/rebased/picture2.png"
       },
       {
-        "path": "html-media-capture/support/upload.txt",
         "url": "/html-media-capture/support/upload.txt"
       },
       {
-        "path": "html/browsers/browsing-the-web/history-traversal/contains.json",
         "url": "/html/browsers/browsing-the-web/history-traversal/contains.json"
       },
       {
-        "path": "html/browsers/browsing-the-web/unloading-documents/contains.json",
         "url": "/html/browsers/browsing-the-web/unloading-documents/contains.json"
       },
       {
-        "path": "html/browsers/history/the-location-interface/contains.json",
         "url": "/html/browsers/history/the-location-interface/contains.json"
       },
       {
-        "path": "html/browsers/offline/changestonetworkingmodel/original-id.json",
         "url": "/html/browsers/offline/changestonetworkingmodel/original-id.json"
       },
       {
-        "path": "html/browsers/offline/introduction-4/contains.json",
         "url": "/html/browsers/offline/introduction-4/contains.json"
       },
       {
-        "path": "html/browsers/offline/manifests/contains.json",
         "url": "/html/browsers/offline/manifests/contains.json"
       },
       {
-        "path": "html/browsers/offline/resources/css/clock.css",
         "url": "/html/browsers/offline/resources/css/clock.css"
       },
       {
-        "path": "html/browsers/offline/resources/css/offline.css",
         "url": "/html/browsers/offline/resources/css/offline.css"
       },
       {
-        "path": "html/browsers/offline/resources/css/online.css",
         "url": "/html/browsers/offline/resources/css/online.css"
       },
       {
-        "path": "html/browsers/offline/resources/css/result.css",
         "url": "/html/browsers/offline/resources/css/result.css"
       },
       {
-        "path": "html/browsers/offline/resources/js/clock.js",
         "url": "/html/browsers/offline/resources/js/clock.js"
       },
       {
-        "path": "html/browsers/offline/resources/manifest/clock.manifest",
         "url": "/html/browsers/offline/resources/manifest/clock.manifest"
       },
       {
-        "path": "html/browsers/offline/resources/manifest/section_empty.manifest",
         "url": "/html/browsers/offline/resources/manifest/section_empty.manifest"
       },
       {
-        "path": "html/browsers/offline/resources/manifest/section_many.manifest",
         "url": "/html/browsers/offline/resources/manifest/section_many.manifest"
       },
       {
-        "path": "html/browsers/offline/resources/manifest/url_check.manifest",
         "url": "/html/browsers/offline/resources/manifest/url_check.manifest"
       },
       {
-        "path": "html/browsers/windows/auxiliary-browsing-contexts/contains.json",
         "url": "/html/browsers/windows/auxiliary-browsing-contexts/contains.json"
       },
       {
-        "path": "html/browsers/windows/nested-browsing-contexts/contains.json",
         "url": "/html/browsers/windows/nested-browsing-contexts/contains.json"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-lastModified.html.headers",
         "url": "/html/dom/documents/resource-metadata-management/document-lastModified.html.headers"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/005.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/005.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/006.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/006.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/007.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/007.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/008-1.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/008-1.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/008.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/008.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/010-1.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/010-1.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/010.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/010.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/011-1.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/011-1.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/011.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/011.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/012.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/012.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/013.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/013.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_005.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_005.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/nested-document-write-external.js",
         "url": "/html/dom/dynamic-markup-insertion/document-write/nested-document-write-external.js"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/original-id.json",
         "url": "/html/dom/dynamic-markup-insertion/document-write/original-id.json"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-writeln/original-id.json",
         "url": "/html/dom/dynamic-markup-insertion/document-writeln/original-id.json"
       },
       {
-        "path": "html/dom/elements-embedded.js",
         "url": "/html/dom/elements-embedded.js"
       },
       {
-        "path": "html/dom/elements-forms.js",
         "url": "/html/dom/elements-forms.js"
       },
       {
-        "path": "html/dom/elements-grouping.js",
         "url": "/html/dom/elements-grouping.js"
       },
       {
-        "path": "html/dom/elements-metadata.js",
         "url": "/html/dom/elements-metadata.js"
       },
       {
-        "path": "html/dom/elements-microdata.js",
         "url": "/html/dom/elements-microdata.js"
       },
       {
-        "path": "html/dom/elements-misc.js",
         "url": "/html/dom/elements-misc.js"
       },
       {
-        "path": "html/dom/elements-obsolete.js",
         "url": "/html/dom/elements-obsolete.js"
       },
       {
-        "path": "html/dom/elements-sections.js",
         "url": "/html/dom/elements-sections.js"
       },
       {
-        "path": "html/dom/elements-tabular.js",
         "url": "/html/dom/elements-tabular.js"
       },
       {
-        "path": "html/dom/elements-text.js",
         "url": "/html/dom/elements-text.js"
       },
       {
-        "path": "html/dom/elements/content-models/contains.json",
         "url": "/html/dom/elements/content-models/contains.json"
       },
       {
-        "path": "html/dom/elements/element-definitions/contains.json",
         "url": "/html/dom/elements/element-definitions/contains.json"
       },
       {
-        "path": "html/dom/elements/global-attributes/contains.json",
         "url": "/html/dom/elements/global-attributes/contains.json"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-EN-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-EN-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-EN-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-EN-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-EN-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-N-EN-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-N-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-N-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-N-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-N-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-isolate-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-isolate-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-isolate-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html",
-        "url": "html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html"
+        "url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/lang-xmllang-01-ref.html",
-        "url": "html/dom/elements/global-attributes/lang-xmllang-01-ref.html"
+        "url": "/html/dom/elements/global-attributes/lang-xmllang-01-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/lang-xyzzy-ref.html",
-        "url": "html/dom/elements/global-attributes/lang-xyzzy-ref.html"
+        "url": "/html/dom/elements/global-attributes/lang-xyzzy-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/style-01-ref.html",
-        "url": "html/dom/elements/global-attributes/style-01-ref.html"
+        "url": "/html/dom/elements/global-attributes/style-01-ref.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-003.html.headers",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-003.html.headers"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-005.html.headers",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-005.html.headers"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-006.html.headers",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-006.html.headers"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-009.html.headers",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-009.html.headers"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-011.html.headers",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-011.html.headers"
       },
       {
-        "path": "html/dom/elements/wai-aria/README.md",
         "url": "/html/dom/elements/wai-aria/README.md"
       },
       {
-        "path": "html/dom/elements/wai-aria/contains.json",
         "url": "/html/dom/elements/wai-aria/contains.json"
       },
       {
-        "path": "html/dom/new-harness.js",
         "url": "/html/dom/new-harness.js"
       },
       {
-        "path": "html/dom/original-harness.js",
         "url": "/html/dom/original-harness.js"
       },
       {
-        "path": "html/dom/reflection.js",
         "url": "/html/dom/reflection.js"
       },
       {
-        "path": "html/editing/dnd/README",
         "url": "/html/editing/dnd/README"
       },
       {
-        "path": "html/editing/dnd/file/fail.txt",
         "url": "/html/editing/dnd/file/fail.txt"
       },
       {
-        "path": "html/editing/dnd/microdata/test",
         "url": "/html/editing/dnd/microdata/test"
       },
       {
-        "path": "html/editing/dnd/platform/interrupt/fail.txt",
         "url": "/html/editing/dnd/platform/interrupt/fail.txt"
       },
       {
-        "path": "html/editing/dnd/platform/interrupt/file1.txt",
         "url": "/html/editing/dnd/platform/interrupt/file1.txt"
       },
       {
-        "path": "html/editing/dnd/platform/interrupt/file2.txt",
         "url": "/html/editing/dnd/platform/interrupt/file2.txt"
       },
       {
-        "path": "html/editing/dnd/platform/interrupt/pass.txt",
         "url": "/html/editing/dnd/platform/interrupt/pass.txt"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/click-to-activate.js",
         "url": "/html/editing/dnd/platform/plugin/click-to-activate.js"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/dragndrop.swf",
         "url": "/html/editing/dnd/platform/plugin/dragndrop.swf"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/dragndropleavedeactivate.swf",
         "url": "/html/editing/dnd/platform/plugin/dragndropleavedeactivate.swf"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/swfsources/dragndrop.hx",
         "url": "/html/editing/dnd/platform/plugin/swfsources/dragndrop.hx"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/swfsources/dragndrop.hxml",
         "url": "/html/editing/dnd/platform/plugin/swfsources/dragndrop.hxml"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/swfsources/mouseup.hx",
         "url": "/html/editing/dnd/platform/plugin/swfsources/mouseup.hx"
       },
       {
-        "path": "html/editing/dnd/platform/plugin/swfsources/mouseup.hxml",
         "url": "/html/editing/dnd/platform/plugin/swfsources/mouseup.hxml"
       },
       {
-        "path": "html/editing/dnd/resources/100x100-navy.png",
         "url": "/html/editing/dnd/resources/100x100-navy.png"
       },
       {
-        "path": "html/editing/dnd/resources/1x1-transparent.gif",
         "url": "/html/editing/dnd/resources/1x1-transparent.gif"
       },
       {
-        "path": "html/editing/dnd/resources/boxnavy.swf",
         "url": "/html/editing/dnd/resources/boxnavy.swf"
       },
       {
-        "path": "html/editing/dnd/resources/circle.png",
         "url": "/html/editing/dnd/resources/circle.png"
       },
       {
-        "path": "html/editing/dnd/resources/crossorigin.sub.js",
         "url": "/html/editing/dnd/resources/crossorigin.sub.js"
       },
       {
-        "path": "html/editing/dnd/resources/fail.png",
         "url": "/html/editing/dnd/resources/fail.png"
       },
       {
-        "path": "html/editing/dnd/resources/pass.png",
         "url": "/html/editing/dnd/resources/pass.png"
       },
       {
-        "path": "html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/original-id.json",
         "url": "/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/original-id.json"
       },
       {
-        "path": "html/editing/the-hidden-attribute/hidden-1-ref.html",
-        "url": "html/editing/the-hidden-attribute/hidden-1-ref.html"
+        "url": "/html/editing/the-hidden-attribute/hidden-1-ref.html"
       },
       {
-        "path": "html/editing/the-hidden-attribute/hidden-2-ref.svg",
-        "url": "html/editing/the-hidden-attribute/hidden-2-ref.svg"
+        "url": "/html/editing/the-hidden-attribute/hidden-2-ref.svg"
       },
       {
-        "path": "html/iana/application-x-www-form-urlencoded/original-id.json",
         "url": "/html/iana/application-x-www-form-urlencoded/original-id.json"
       },
       {
-        "path": "html/iana/application-xhtml-xml/original-id.json",
         "url": "/html/iana/application-xhtml-xml/original-id.json"
       },
       {
-        "path": "html/iana/multipart-x-mixed-replace/original-id.json",
         "url": "/html/iana/multipart-x-mixed-replace/original-id.json"
       },
       {
-        "path": "html/iana/text-cache-manifest/original-id.json",
         "url": "/html/iana/text-cache-manifest/original-id.json"
       },
       {
-        "path": "html/iana/text-html/original-id.json",
         "url": "/html/iana/text-html/original-id.json"
       },
       {
-        "path": "html/iana/web-scheme-prefix/original-id.json",
         "url": "/html/iana/web-scheme-prefix/original-id.json"
       },
       {
-        "path": "html/infrastructure/common-dom-interfaces/collections/contains.json",
         "url": "/html/infrastructure/common-dom-interfaces/collections/contains.json"
       },
       {
-        "path": "html/infrastructure/common-microsyntaxes/dates-and-times/contains.json",
         "url": "/html/infrastructure/common-microsyntaxes/dates-and-times/contains.json"
       },
       {
-        "path": "html/infrastructure/common-microsyntaxes/numbers/contains.json",
         "url": "/html/infrastructure/common-microsyntaxes/numbers/contains.json"
       },
       {
-        "path": "html/infrastructure/terminology/plugins/sample.txt",
         "url": "/html/infrastructure/terminology/plugins/sample.txt"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/css-tmpl.py",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/css-tmpl.py"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/manifest.py",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/manifest.py"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/page-using-manifest.py",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/page-using-manifest.py"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py",
         "url": "/html/infrastructure/urls/resolving-urls/query-encoding/resources/stash.py"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/original-id.json",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/original-id.json"
       },
       {
-        "path": "html/rendering/interactive-media/links-forms-and-navigation/original-id.json",
         "url": "/html/rendering/interactive-media/links-forms-and-navigation/original-id.json"
       },
       {
-        "path": "html/rendering/non-replaced-elements/flow-content-0/figure-ref.html",
-        "url": "html/rendering/non-replaced-elements/flow-content-0/figure-ref.html"
+        "url": "/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-border-1-ref.html",
-        "url": "html/rendering/non-replaced-elements/tables/table-border-1-ref.html"
+        "url": "/html/rendering/non-replaced-elements/tables/table-border-1-ref.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-border-2-ref.html",
-        "url": "html/rendering/non-replaced-elements/tables/table-border-2-ref.html"
+        "url": "/html/rendering/non-replaced-elements/tables/table-border-2-ref.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-layout-ref.html",
-        "url": "html/rendering/non-replaced-elements/tables/table-layout-ref.html"
+        "url": "/html/rendering/non-replaced-elements/tables/table-layout-ref.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html",
-        "url": "html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html"
+        "url": "/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html"
       },
       {
-        "path": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml",
-        "url": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml"
+        "url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml"
       },
       {
-        "path": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml",
-        "url": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml"
+        "url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml"
       },
       {
-        "path": "html/rendering/replaced-elements/images/space-ref.html",
-        "url": "html/rendering/replaced-elements/images/space-ref.html"
+        "url": "/html/rendering/replaced-elements/images/space-ref.html"
       },
       {
-        "path": "html/rendering/replaced-elements/resources/svg-sizing.js",
         "url": "/html/rendering/replaced-elements/resources/svg-sizing.js"
       },
       {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-embedded-sizing.js",
         "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-embedded-sizing.js"
       },
       {
-        "path": "html/rendering/replaced-elements/svg-inline-sizing/svg-inline.js",
         "url": "/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.js"
       },
       {
-        "path": "html/rendering/replaced-elements/tools/gen-svgsizing-tests.py",
         "url": "/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py"
       },
       {
-        "path": "html/semantics/document-metadata/styling/support/alternate.css",
         "url": "/html/semantics/document-metadata/styling/support/alternate.css"
       },
       {
-        "path": "html/semantics/document-metadata/styling/support/emptytitle.css",
         "url": "/html/semantics/document-metadata/styling/support/emptytitle.css"
       },
       {
-        "path": "html/semantics/document-metadata/styling/support/normal.css",
         "url": "/html/semantics/document-metadata/styling/support/normal.css"
       },
       {
-        "path": "html/semantics/document-metadata/styling/support/notitle.css",
         "url": "/html/semantics/document-metadata/styling/support/notitle.css"
       },
       {
-        "path": "html/semantics/document-metadata/styling/support/unmatch.css",
         "url": "/html/semantics/document-metadata/styling/support/unmatch.css"
       },
       {
-        "path": "html/semantics/document-metadata/the-meta-element/contains.json",
         "url": "/html/semantics/document-metadata/the-meta-element/contains.json"
       },
       {
-        "path": "html/semantics/embedded-content/image-maps/contains.json",
         "url": "/html/semantics/embedded-content/image-maps/contains.json"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/contains.json",
         "url": "/html/semantics/embedded-content/media-elements/contains.json"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/delayed-broken-video.py",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/delayed-broken-video.py"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/support/common.js"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/support/cors-tester.py",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/support/cors-tester.py"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/resources/track.de.vtt",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/resources/track.de.vtt"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/resources/track.en.vtt",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/resources/track.en.vtt"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/resources/track.fr.vtt",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/resources/track.fr.vtt"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/resources/track.vtt",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/resources/track.vtt"
       },
       {
-        "path": "html/semantics/embedded-content/the-audio-element/audio_content-ref.htm",
-        "url": "html/semantics/embedded-content/the-audio-element/audio_content-ref.htm"
+        "url": "/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/contains.json",
         "url": "/html/semantics/embedded-content/the-canvas-element/contains.json"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.colour.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.colour.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.different.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.different.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.path.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.path.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.same.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.same.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.default.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.default.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.get.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.get.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.removed.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.set.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.set.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.style.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.style.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.png"
       },
       {
-        "path": "html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html",
-        "url": "html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html"
+        "url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/3.jpg",
         "url": "/html/semantics/embedded-content/the-img-element/3.jpg"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/brokenimg.jpg",
         "url": "/html/semantics/embedded-content/the-img-element/brokenimg.jpg"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/contains.json",
         "url": "/html/semantics/embedded-content/the-img-element/contains.json"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/image-1.jpg",
         "url": "/html/semantics/embedded-content/the-img-element/image-1.jpg"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/srcset/common.js",
         "url": "/html/semantics/embedded-content/the-img-element/srcset/common.js"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_content-ref.htm",
-        "url": "html/semantics/embedded-content/the-video-element/video_content-ref.htm"
+        "url": "/html/semantics/embedded-content/the-video-element/video_content-ref.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm",
-        "url": "html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm"
+        "url": "/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html",
-        "url": "html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html"
+        "url": "/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html"
       },
       {
-        "path": "html/semantics/forms/attributes-common-to-form-controls/contains.json",
         "url": "/html/semantics/forms/attributes-common-to-form-controls/contains.json"
       },
       {
-        "path": "html/semantics/forms/constraints/contains.json",
         "url": "/html/semantics/forms/constraints/contains.json"
       },
       {
-        "path": "html/semantics/forms/constraints/support/validator.js",
         "url": "/html/semantics/forms/constraints/support/validator.js"
       },
       {
-        "path": "html/semantics/forms/form-control-infrastructure/contains.json",
         "url": "/html/semantics/forms/form-control-infrastructure/contains.json"
       },
       {
-        "path": "html/semantics/forms/form-submission-0/contains.json",
         "url": "/html/semantics/forms/form-submission-0/contains.json"
       },
       {
-        "path": "html/semantics/forms/introduction-1/contains.json",
         "url": "/html/semantics/forms/introduction-1/contains.json"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/original-id.json",
         "url": "/html/semantics/forms/textfieldselection/original-id.json"
       },
       {
-        "path": "html/semantics/forms/the-input-element/contains.json",
         "url": "/html/semantics/forms/the-input-element/contains.json"
       },
       {
-        "path": "html/semantics/forms/the-input-element/image01-ref.html",
-        "url": "html/semantics/forms/the-input-element/image01-ref.html"
+        "url": "/html/semantics/forms/the-input-element/image01-ref.html"
       },
       {
-        "path": "html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html",
-        "url": "html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html"
+        "url": "/html/semantics/forms/the-option-element/option-label-value.js"
       },
       {
-        "path": "html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html",
-        "url": "html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html"
+        "url": "/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html",
-        "url": "html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html"
+        "url": "/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html",
-        "url": "html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html"
+        "url": "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html"
+        "url": "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/reversed-1-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/reversed-1-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/reversed-2-ref.html",
-        "url": "html/semantics/grouping-content/the-ol-element/reversed-2-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/reversed-1-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html",
-        "url": "html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html"
+        "url": "/html/semantics/grouping-content/the-ol-element/reversed-2-ref.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html",
-        "url": "html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html"
+        "url": "/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html"
+      },
+      {
+        "url": "/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html"
       },
       {
-        "path": "html/semantics/interactive-elements/commands/contains.json",
         "url": "/html/semantics/interactive-elements/commands/contains.json"
       },
       {
-        "path": "html/semantics/interactive-elements/the-dialog-element/contains.json",
         "url": "/html/semantics/interactive-elements/the-dialog-element/contains.json"
       },
       {
-        "path": "html/semantics/interactive-elements/the-menu-element/contains.json",
         "url": "/html/semantics/interactive-elements/the-menu-element/contains.json"
       },
       {
-        "path": "html/semantics/interfaces.js",
         "url": "/html/semantics/interfaces.js"
       },
       {
-        "path": "html/semantics/links/downloading-resources/contains.json",
         "url": "/html/semantics/links/downloading-resources/contains.json"
       },
       {
-        "path": "html/semantics/links/linktypes/contains.json",
         "url": "/html/semantics/links/linktypes/contains.json"
       },
       {
-        "path": "html/semantics/links/linktypes/original-id.json",
         "url": "/html/semantics/links/linktypes/original-id.json"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/contains.json",
         "url": "/html/semantics/scripting-1/the-script-element/contains.json"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/log.py",
         "url": "/html/semantics/scripting-1/the-script-element/log.py"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html",
-        "url": "html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html"
+        "url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/testcommon.js",
         "url": "/html/semantics/scripting-1/the-template-element/testcommon.js"
       },
       {
-        "path": "html/semantics/sections/headings-and-sections/contains.json",
         "url": "/html/semantics/sections/headings-and-sections/contains.json"
       },
       {
-        "path": "html/semantics/sections/the-h1-h2-h3-h4-h5-and-h6-elements/original-id.json",
         "url": "/html/semantics/sections/the-h1-h2-h3-h4-h5-and-h6-elements/original-id.json"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/utils.js",
         "url": "/html/semantics/selectors/pseudo-classes/utils.js"
       },
       {
-        "path": "html/semantics/tabular-data/processing-model-1/contains.json",
         "url": "/html/semantics/tabular-data/processing-model-1/contains.json"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/contains.json",
         "url": "/html/semantics/tabular-data/the-table-element/contains.json"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html",
-        "url": "html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html",
-        "url": "html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html",
-        "url": "html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html",
-        "url": "html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html"
+        "url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/support/encodingtests-1.css",
         "url": "/html/syntax/parsing-html-fragments/support/encodingtests-1.css"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/support/encodingtests-15-inverse.css",
         "url": "/html/syntax/parsing-html-fragments/support/encodingtests-15-inverse.css"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/support/encodingtests-15.css",
         "url": "/html/syntax/parsing-html-fragments/support/encodingtests-15.css"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/support/encodingtests-utf8.css",
         "url": "/html/syntax/parsing-html-fragments/support/encodingtests-utf8.css"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-034.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-037.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html.headers"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-038.html.headers",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html.headers"
       },
       {
-        "path": "html/syntax/parsing/README",
         "url": "/html/syntax/parsing/README"
       },
       {
-        "path": "html/syntax/parsing/common.js",
         "url": "/html/syntax/parsing/common.js"
       },
       {
-        "path": "html/syntax/parsing/contains.json",
         "url": "/html/syntax/parsing/contains.json"
       },
       {
-        "path": "html/syntax/parsing/named-character-references-data.js",
         "url": "/html/syntax/parsing/named-character-references-data.js"
       },
       {
-        "path": "html/syntax/parsing/template.js",
         "url": "/html/syntax/parsing/template.js"
       },
       {
-        "path": "html/syntax/parsing/test.js",
         "url": "/html/syntax/parsing/test.js"
       },
       {
-        "path": "html/syntax/writing/elements-0/contains.json",
         "url": "/html/syntax/writing/elements-0/contains.json"
       },
       {
-        "path": "html/syntax/writing/text/contains.json",
         "url": "/html/syntax/writing/text/contains.json"
       },
       {
-        "path": "html/webappapis/scripting/event-loops/contains.json",
         "url": "/html/webappapis/scripting/event-loops/contains.json"
       },
       {
-        "path": "html/webappapis/scripting/events/contains.json",
         "url": "/html/webappapis/scripting/events/contains.json"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/contains.json",
         "url": "/html/webappapis/scripting/processing-model-2/contains.json"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js",
         "url": "/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js",
         "url": "/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/support/syntax-error.js",
         "url": "/html/webappapis/scripting/processing-model-2/support/syntax-error.js"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js",
         "url": "/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js",
         "url": "/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js"
       },
       {
-        "path": "html/webappapis/scripting/processing-model-2/support/undefined-variable.js",
         "url": "/html/webappapis/scripting/processing-model-2/support/undefined-variable.js"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/contains.json",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/contains.json"
       },
       {
-        "path": "http/content_length.html.headers",
         "url": "/http/content_length.html.headers"
       },
       {
-        "path": "images/anim-gr.gif",
         "url": "/images/anim-gr.gif"
       },
       {
-        "path": "images/anim-gr.png",
         "url": "/images/anim-gr.png"
       },
       {
-        "path": "images/anim-poster-gr.png",
         "url": "/images/anim-poster-gr.png"
       },
       {
-        "path": "images/background.png",
         "url": "/images/background.png"
       },
       {
-        "path": "images/black-rectangle.png",
         "url": "/images/black-rectangle.png"
       },
       {
-        "path": "images/blue-area.png",
         "url": "/images/blue-area.png"
       },
       {
-        "path": "images/blue-border.png",
         "url": "/images/blue-border.png"
       },
       {
-        "path": "images/blue.png",
         "url": "/images/blue.png"
       },
       {
-        "path": "images/broken.png",
         "url": "/images/broken.png"
       },
       {
-        "path": "images/canvas-line.png",
         "url": "/images/canvas-line.png"
       },
       {
-        "path": "images/fail.gif",
         "url": "/images/fail.gif"
       },
       {
-        "path": "images/ggrr-256x256.png",
         "url": "/images/ggrr-256x256.png"
       },
       {
-        "path": "images/green-100x50.png",
         "url": "/images/green-100x50.png"
       },
       {
-        "path": "images/green-16x16.png",
         "url": "/images/green-16x16.png"
       },
       {
-        "path": "images/green-1x1.png",
         "url": "/images/green-1x1.png"
       },
       {
-        "path": "images/green-256x256.png",
         "url": "/images/green-256x256.png"
       },
       {
-        "path": "images/green-2x2.png",
         "url": "/images/green-2x2.png"
       },
       {
-        "path": "images/green.png",
         "url": "/images/green.png"
       },
       {
-        "path": "images/grgr-256x256.png",
         "url": "/images/grgr-256x256.png"
       },
       {
-        "path": "images/movie_300_frame_0.png",
         "url": "/images/movie_300_frame_0.png"
       },
       {
-        "path": "images/red-16x16.png",
         "url": "/images/red-16x16.png"
       },
       {
-        "path": "images/red.png",
         "url": "/images/red.png"
       },
       {
-        "path": "images/redtransparent.png",
         "url": "/images/redtransparent.png"
       },
       {
-        "path": "images/rgrg-256x256.png",
         "url": "/images/rgrg-256x256.png"
       },
       {
-        "path": "images/rrgg-256x256.png",
         "url": "/images/rrgg-256x256.png"
       },
       {
-        "path": "images/smiley.png",
         "url": "/images/smiley.png"
       },
       {
-        "path": "images/threecolors.png",
         "url": "/images/threecolors.png"
       },
       {
-        "path": "images/transparent.png",
         "url": "/images/transparent.png"
       },
       {
-        "path": "images/transparent50.png",
         "url": "/images/transparent50.png"
       },
       {
-        "path": "images/yellow.png",
         "url": "/images/yellow.png"
       },
       {
-        "path": "images/yellow75.png",
         "url": "/images/yellow75.png"
       },
       {
-        "path": "js/builtins/Math.maxmin.js",
         "url": "/js/builtins/Math.maxmin.js"
       },
       {
-        "path": "media-source/import_tests.sh",
         "url": "/media-source/import_tests.sh"
       },
       {
-        "path": "media-source/manifest.txt",
         "url": "/media-source/manifest.txt"
       },
       {
-        "path": "media-source/mediasource-config-changes.js",
         "url": "/media-source/mediasource-config-changes.js"
       },
       {
-        "path": "media-source/mediasource-util.js",
         "url": "/media-source/mediasource-util.js"
       },
       {
-        "path": "media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json",
         "url": "/media-source/mp4/test-a-128k-44100Hz-1ch-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-a-128k-44100Hz-1ch.mp4",
         "url": "/media-source/mp4/test-a-128k-44100Hz-1ch.mp4"
       },
       {
-        "path": "media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json",
         "url": "/media-source/mp4/test-a-192k-44100Hz-1ch-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-a-192k-44100Hz-1ch.mp4",
         "url": "/media-source/mp4/test-a-192k-44100Hz-1ch.mp4"
       },
       {
-        "path": "media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json",
         "url": "/media-source/mp4/test-v-128k-320x240-24fps-8kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4",
         "url": "/media-source/mp4/test-v-128k-320x240-24fps-8kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-v-128k-320x240-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-v-128k-320x240-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-v-128k-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-v-128k-640x480-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json",
         "url": "/media-source/mp4/test-v-256k-320x240-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4",
         "url": "/media-source/mp4/test-v-256k-320x240-30fps-10kfr.mp4"
       },
       {
-        "path": "media-source/mp4/test.mp4",
         "url": "/media-source/mp4/test.mp4"
       },
       {
-        "path": "media-source/webm/test-a-128k-44100Hz-1ch-manifest.json",
         "url": "/media-source/webm/test-a-128k-44100Hz-1ch-manifest.json"
       },
       {
-        "path": "media-source/webm/test-a-128k-44100Hz-1ch.webm",
         "url": "/media-source/webm/test-a-128k-44100Hz-1ch.webm"
       },
       {
-        "path": "media-source/webm/test-a-192k-44100Hz-1ch-manifest.json",
         "url": "/media-source/webm/test-a-192k-44100Hz-1ch-manifest.json"
       },
       {
-        "path": "media-source/webm/test-a-192k-44100Hz-1ch.webm",
         "url": "/media-source/webm/test-a-192k-44100Hz-1ch.webm"
       },
       {
-        "path": "media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm",
         "url": "/media-source/webm/test-av-384k-44100Hz-1ch-320x240-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm",
         "url": "/media-source/webm/test-av-384k-44100Hz-1ch-640x480-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm",
         "url": "/media-source/webm/test-av-448k-44100Hz-1ch-640x480-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm",
         "url": "/media-source/webm/test-av-640k-44100Hz-1ch-640x480-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json",
         "url": "/media-source/webm/test-v-128k-320x240-24fps-8kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-v-128k-320x240-24fps-8kfr.webm",
         "url": "/media-source/webm/test-v-128k-320x240-24fps-8kfr.webm"
       },
       {
-        "path": "media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-v-128k-320x240-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-v-128k-320x240-30fps-10kfr.webm",
         "url": "/media-source/webm/test-v-128k-320x240-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-v-128k-640x480-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-v-128k-640x480-30fps-10kfr.webm",
         "url": "/media-source/webm/test-v-128k-640x480-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json",
         "url": "/media-source/webm/test-v-256k-320x240-30fps-10kfr-manifest.json"
       },
       {
-        "path": "media-source/webm/test-v-256k-320x240-30fps-10kfr.webm",
         "url": "/media-source/webm/test-v-256k-320x240-30fps-10kfr.webm"
       },
       {
-        "path": "media-source/webm/test-vp8-vorbis-webvtt.webm",
         "url": "/media-source/webm/test-vp8-vorbis-webvtt.webm"
       },
       {
-        "path": "media-source/webm/test.webm",
         "url": "/media-source/webm/test.webm"
       },
       {
-        "path": "media/A4.mp4",
         "url": "/media/A4.mp4"
       },
       {
-        "path": "media/A4.ogv",
         "url": "/media/A4.ogv"
       },
       {
-        "path": "media/green-at-15.mp4",
         "url": "/media/green-at-15.mp4"
       },
       {
-        "path": "media/green-at-15.ogv",
         "url": "/media/green-at-15.ogv"
       },
       {
-        "path": "media/movie_300.mp4",
         "url": "/media/movie_300.mp4"
       },
       {
-        "path": "media/movie_300.ogv",
         "url": "/media/movie_300.ogv"
       },
       {
-        "path": "media/movie_5.mp4",
         "url": "/media/movie_5.mp4"
       },
       {
-        "path": "media/movie_5.ogv",
         "url": "/media/movie_5.ogv"
       },
       {
-        "path": "media/poster.png",
         "url": "/media/poster.png"
       },
       {
-        "path": "media/sound_5.mp3",
         "url": "/media/sound_5.mp3"
       },
       {
-        "path": "media/sound_5.oga",
         "url": "/media/sound_5.oga"
       },
       {
-        "path": "media/white.mp4",
         "url": "/media/white.mp4"
       },
       {
-        "path": "media/white.webm",
         "url": "/media/white.webm"
       },
       {
-        "path": "microdata/encoding-microdata/names-the-itemprop-attribute/original-id.json",
         "url": "/microdata/encoding-microdata/names-the-itemprop-attribute/original-id.json"
       },
       {
-        "path": "navigation-timing/resources/webperftestharness.js",
         "url": "/navigation-timing/resources/webperftestharness.js"
       },
       {
-        "path": "notifications/README.md",
         "url": "/notifications/README.md"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/contents/Session_History/css/result.css",
         "url": "/old-tests/submission/Infraware/Session_History/contents/Session_History/css/result.css"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/resources/WebIDLParser.js",
         "url": "/old-tests/submission/Infraware/Session_History/resources/WebIDLParser.js"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/resources/idlharness.js",
         "url": "/old-tests/submission/Infraware/Session_History/resources/idlharness.js"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/resources/readme.md",
         "url": "/old-tests/submission/Infraware/Session_History/resources/readme.md"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/resources/testharness.css",
         "url": "/old-tests/submission/Infraware/Session_History/resources/testharness.css"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/resources/testharness.js",
         "url": "/old-tests/submission/Infraware/Session_History/resources/testharness.js"
       },
       {
-        "path": "old-tests/submission/Infraware/Session_History/resources/testharnessreport.js",
         "url": "/old-tests/submission/Infraware/Session_History/resources/testharnessreport.js"
       },
       {
-        "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_support.js",
         "url": "/old-tests/submission/Microsoft/dragdrop/dragdrop_support.js"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/blue-area.png",
         "url": "/old-tests/submission/Microsoft/images/blue-area.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/blue-border.png",
         "url": "/old-tests/submission/Microsoft/images/blue-border.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/blue.png",
         "url": "/old-tests/submission/Microsoft/images/blue.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/fail.gif",
         "url": "/old-tests/submission/Microsoft/images/fail.gif"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/movie_300_frame_0.png",
         "url": "/old-tests/submission/Microsoft/images/movie_300_frame_0.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/poster.png",
         "url": "/old-tests/submission/Microsoft/images/poster.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/poster_blue.png",
         "url": "/old-tests/submission/Microsoft/images/poster_blue.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/poster_green.png",
         "url": "/old-tests/submission/Microsoft/images/poster_green.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/images/poster_red.png",
         "url": "/old-tests/submission/Microsoft/images/poster_red.png"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox.pdf",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox.pdf"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_helper.js",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_helper.js"
       },
       {
-        "path": "old-tests/submission/Microsoft/structuredclone/echo.js",
         "url": "/old-tests/submission/Microsoft/structuredclone/echo.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/css/background.css",
         "url": "/old-tests/submission/Opera/script_scheduling/css/background.css"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/css/import.css",
         "url": "/old-tests/submission/Opera/script_scheduling/css/import.css"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/count-script-tags.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/count-script-tags.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/find-body.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/find-body.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/find-foo.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/find-foo.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-1.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-1.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-10.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-10.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-11.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-11.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-12.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-12.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-2.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-2.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-3.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-3.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-4.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-4.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-5.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-5.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-6.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-6.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-7.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-7.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-8.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-8.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/scripts/include-9.js",
         "url": "/old-tests/submission/Opera/script_scheduling/scripts/include-9.js"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/testlib/testlib.js",
         "url": "/old-tests/submission/Opera/script_scheduling/testlib/testlib.js"
       },
       {
-        "path": "old-tests/submission/migration.txt",
         "url": "/old-tests/submission/migration.txt"
       },
       {
-        "path": "page-visibility/resources/pagevistestharness.js",
         "url": "/page-visibility/resources/pagevistestharness.js"
       },
       {
-        "path": "pointerevents/README.md",
         "url": "/pointerevents/README.md"
       },
       {
-        "path": "pointerevents/pointerevent_styles.css",
         "url": "/pointerevents/pointerevent_styles.css"
       },
       {
-        "path": "pointerevents/pointerevent_support.js",
         "url": "/pointerevents/pointerevent_support.js"
       },
       {
-        "path": "progress-events/tests/submissions/Samsung/resources/img.jpg",
         "url": "/progress-events/tests/submissions/Samsung/resources/img.jpg"
       },
       {
-        "path": "progress-events/tests/submissions/Samsung/resources/no-content-length.py",
         "url": "/progress-events/tests/submissions/Samsung/resources/no-content-length.py"
       },
       {
-        "path": "proximity/DeviceProximityEvent_tests.js",
         "url": "/proximity/DeviceProximityEvent_tests.js"
       },
       {
-        "path": "proximity/UserProximityEvent_tests.js",
         "url": "/proximity/UserProximityEvent_tests.js"
       },
       {
-        "path": "quirks-mode/font-element-text-decoration-color/001-ref.html",
-        "url": "quirks-mode/font-element-text-decoration-color/001-ref.html"
+        "url": "/quirks-mode/font-element-text-decoration-color/001-ref.html"
       },
       {
-        "path": "resource-timing/resources/resource_timing_test0.css",
         "url": "/resource-timing/resources/resource_timing_test0.css"
       },
       {
-        "path": "resource-timing/resources/resource_timing_test0.js",
         "url": "/resource-timing/resources/resource_timing_test0.js"
       },
       {
-        "path": "resource-timing/resources/resource_timing_test0.png",
         "url": "/resource-timing/resources/resource_timing_test0.png"
       },
       {
-        "path": "resource-timing/resources/resource_timing_test0.xml",
         "url": "/resource-timing/resources/resource_timing_test0.xml"
       },
       {
-        "path": "resource-timing/resources/webperftestharness.js",
         "url": "/resource-timing/resources/webperftestharness.js"
       },
       {
-        "path": "resource-timing/test_resource_timing.js",
         "url": "/resource-timing/test_resource_timing.js"
       },
       {
-        "path": "selectors-api/tests/submissions/Opera/level2-lib.js",
         "url": "/selectors-api/tests/submissions/Opera/level2-lib.js"
       },
       {
-        "path": "service-workers/specgen.json",
         "url": "/service-workers/specgen.json"
       },
       {
-        "path": "shadow-dom/LICENSE",
         "url": "/shadow-dom/LICENSE"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html",
-        "url": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html"
+        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html",
-        "url": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html"
+        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html",
-        "url": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html"
+        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html",
-        "url": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html"
+        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html",
-        "url": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html"
+        "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001-ref.html",
-        "url": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001-ref.html"
+        "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-002-ref.html",
-        "url": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-002-ref.html"
+        "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-002-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html",
-        "url": "shadow-dom/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html"
+        "url": "/shadow-dom/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/reprojection/reprojection-001-ref.html",
-        "url": "shadow-dom/shadow-trees/reprojection/reprojection-001-ref.html"
+        "url": "/shadow-dom/shadow-trees/reprojection/reprojection-001-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/reprojection/reprojection-002-ref.html",
-        "url": "shadow-dom/shadow-trees/reprojection/reprojection-002-ref.html"
+        "url": "/shadow-dom/shadow-trees/reprojection/reprojection-002-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/shadow-root-001-ref.html",
-        "url": "shadow-dom/shadow-trees/shadow-root-001-ref.html"
+        "url": "/shadow-dom/shadow-trees/shadow-root-001-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/shadow-root-002-ref.html",
-        "url": "shadow-dom/shadow-trees/shadow-root-002-ref.html"
+        "url": "/shadow-dom/shadow-trees/shadow-root-002-ref.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/text-decoration-001-ref.html",
-        "url": "shadow-dom/shadow-trees/text-decoration-001-ref.html"
+        "url": "/shadow-dom/shadow-trees/text-decoration-001-ref.html"
       },
       {
-        "path": "shadow-dom/styles/not-apply-in-shadow-root-001-ref.html",
-        "url": "shadow-dom/styles/not-apply-in-shadow-root-001-ref.html"
+        "url": "/shadow-dom/styles/not-apply-in-shadow-root-001-ref.html"
       },
       {
-        "path": "shadow-dom/testcommon.js",
         "url": "/shadow-dom/testcommon.js"
       },
       {
-        "path": "touch-events/multi-touch-interactions.js",
         "url": "/touch-events/multi-touch-interactions.js"
       },
       {
-        "path": "url/README.md",
         "url": "/url/README.md"
       },
       {
-        "path": "url/urltestdata.txt",
         "url": "/url/urltestdata.txt"
       },
       {
-        "path": "url/urltestparser.js",
         "url": "/url/urltestparser.js"
       },
       {
-        "path": "user-timing/resources/webperftestharness.js",
         "url": "/user-timing/resources/webperftestharness.js"
       },
       {
-        "path": "user-timing/resources/webperftestharnessextension.js",
         "url": "/user-timing/resources/webperftestharnessextension.js"
       },
       {
-        "path": "web-animations/README.md",
         "url": "/web-animations/README.md"
       },
       {
-        "path": "webaudio/README.md",
+        "url": "/web-animations/testcommon.js"
+      },
+      {
         "url": "/webaudio/README.md"
       },
       {
-        "path": "webaudio/js/buffer-loader.js",
         "url": "/webaudio/js/buffer-loader.js"
       },
       {
-        "path": "webaudio/js/helpers.js",
         "url": "/webaudio/js/helpers.js"
       },
       {
-        "path": "webaudio/js/lodash.js",
         "url": "/webaudio/js/lodash.js"
       },
       {
-        "path": "webaudio/js/vendor-prefixes.js",
         "url": "/webaudio/js/vendor-prefixes.js"
       },
       {
-        "path": "webaudio/refresh_idl.rb",
         "url": "/webaudio/refresh_idl.rb"
       },
       {
-        "path": "webaudio/resources/sin_440Hz_-6dBFS_1s.wav",
         "url": "/webaudio/resources/sin_440Hz_-6dBFS_1s.wav"
       },
       {
-        "path": "webaudio/the-audio-api/the-gainnode-interface/gain-expected.wav",
         "url": "/webaudio/the-audio-api/the-gainnode-interface/gain-expected.wav"
       },
       {
-        "path": "webdriver/README.md",
         "url": "/webdriver/README.md"
       },
       {
-        "path": "webdriver/base_test.py",
         "url": "/webdriver/base_test.py"
       },
       {
-        "path": "webdriver/cookie/__init__.py",
         "url": "/webdriver/cookie/__init__.py"
       },
       {
-        "path": "webdriver/element_location/__init__.py",
         "url": "/webdriver/element_location/__init__.py"
       },
       {
-        "path": "webdriver/element_state/__init__.py",
         "url": "/webdriver/element_state/__init__.py"
       },
       {
-        "path": "webdriver/javascript/__init__.py",
         "url": "/webdriver/javascript/__init__.py"
       },
       {
-        "path": "webdriver/modal/__init__.py",
         "url": "/webdriver/modal/__init__.py"
       },
       {
-        "path": "webdriver/navigation/__init__.py",
         "url": "/webdriver/navigation/__init__.py"
       },
       {
-        "path": "webdriver/navigation/res/self-signed.key",
         "url": "/webdriver/navigation/res/self-signed.key"
       },
       {
-        "path": "webdriver/network.py",
         "url": "/webdriver/network.py"
       },
       {
-        "path": "webdriver/runtests.py",
         "url": "/webdriver/runtests.py"
       },
       {
-        "path": "webdriver/timeouts/__init__.py",
         "url": "/webdriver/timeouts/__init__.py"
       },
       {
-        "path": "webdriver/user_input/__init__.py",
         "url": "/webdriver/user_input/__init__.py"
       },
       {
-        "path": "webdriver/webdriver.cfg",
         "url": "/webdriver/webdriver.cfg"
       },
       {
-        "path": "webdriver/webserver.py",
-        "url": "/webdriver/webserver.py"
-      },
-      {
-        "path": "webgl/common.js",
         "url": "/webgl/common.js"
       },
       {
-        "path": "webmessaging/README.md",
         "url": "/webmessaging/README.md"
       },
       {
-        "path": "webmessaging/without-ports/025-1.js",
         "url": "/webmessaging/without-ports/025-1.js"
       },
       {
-        "path": "websockets/README.md",
         "url": "/websockets/README.md"
       },
       {
-        "path": "websockets/constants.js",
         "url": "/websockets/constants.js"
       },
       {
-        "path": "websockets/cookies/support/set-cookie.py",
         "url": "/websockets/cookies/support/set-cookie.py"
       },
       {
-        "path": "websockets/handlers/echo-cookie_wsh.py",
         "url": "/websockets/handlers/echo-cookie_wsh.py"
       },
       {
-        "path": "websockets/handlers/echo-query_v13_wsh.py",
         "url": "/websockets/handlers/echo-query_v13_wsh.py"
       },
       {
-        "path": "websockets/handlers/echo-query_wsh.py",
         "url": "/websockets/handlers/echo-query_wsh.py"
       },
       {
-        "path": "websockets/handlers/echo_close_data_wsh.py",
         "url": "/websockets/handlers/echo_close_data_wsh.py"
       },
       {
-        "path": "websockets/handlers/echo_exit_wsh.py",
         "url": "/websockets/handlers/echo_exit_wsh.py"
       },
       {
-        "path": "websockets/handlers/echo_raw_wsh.py",
         "url": "/websockets/handlers/echo_raw_wsh.py"
       },
       {
-        "path": "websockets/handlers/echo_wsh.py",
         "url": "/websockets/handlers/echo_wsh.py"
       },
       {
-        "path": "websockets/handlers/empty-message_wsh.py",
         "url": "/websockets/handlers/empty-message_wsh.py"
       },
       {
-        "path": "websockets/handlers/handshake_no_protocol_wsh.py",
         "url": "/websockets/handlers/handshake_no_protocol_wsh.py"
       },
       {
-        "path": "websockets/handlers/handshake_protocol_wsh.py",
         "url": "/websockets/handlers/handshake_protocol_wsh.py"
       },
       {
-        "path": "websockets/handlers/handshake_sleep_1_wsh.py",
         "url": "/websockets/handlers/handshake_sleep_1_wsh.py"
       },
       {
-        "path": "websockets/handlers/invalid_wsh.py",
         "url": "/websockets/handlers/invalid_wsh.py"
       },
       {
-        "path": "websockets/handlers/origin_wsh.py",
         "url": "/websockets/handlers/origin_wsh.py"
       },
       {
-        "path": "websockets/handlers/protocol_array_wsh.py",
         "url": "/websockets/handlers/protocol_array_wsh.py"
       },
       {
-        "path": "websockets/handlers/protocol_wsh.py",
         "url": "/websockets/handlers/protocol_wsh.py"
       },
       {
-        "path": "websockets/handlers/set-cookie_http_wsh.py",
         "url": "/websockets/handlers/set-cookie_http_wsh.py"
       },
       {
-        "path": "websockets/handlers/set-cookie_wsh.py",
         "url": "/websockets/handlers/set-cookie_wsh.py"
       },
       {
-        "path": "websockets/handlers/simple_handshake_wsh.py",
         "url": "/websockets/handlers/simple_handshake_wsh.py"
       },
       {
-        "path": "websockets/handlers/sleep_10_v13_wsh.py",
         "url": "/websockets/handlers/sleep_10_v13_wsh.py"
       },
       {
-        "path": "websockets/handlers/wrong_accept_key_wsh.py",
         "url": "/websockets/handlers/wrong_accept_key_wsh.py"
       },
       {
-        "path": "websockets/security/check.py",
         "url": "/websockets/security/check.py"
       },
       {
-        "path": "websockets/websocket.js",
         "url": "/websockets/websocket.js"
       },
       {
-        "path": "webstorage/README.md",
         "url": "/webstorage/README.md"
       },
       {
-        "path": "webstorage/storage_builtins.js",
         "url": "/webstorage/storage_builtins.js"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_end-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_end-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_end-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_middle-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_50-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_50-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_50-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_gt_50-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_gt_50-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_gt_50-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50_size_gt_maximum_size-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50_size_gt_maximum_size-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50_size_gt_maximum_size-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_middle_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_start-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_start-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_start-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/basic-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/basic-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/basic-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely_all_cues_have_same_timestamp.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/support/9_cues_overlapping_completely_all_cues_have_same_timestamp.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/support/single_quote.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/support/single_quote.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/support/size_90.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/support/size_90.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/support/size_99.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/support/size_99.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/support/test.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/support/test.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/media/background.gif",
         "url": "/webvtt/rendering/cues-with-video/processing-model/media/background.gif"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/repaint-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/repaint-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/repaint-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/size_50-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/size_50-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/size_50-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_completely_move_up.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_completely_move_up.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_down.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_down.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_up.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/2_cues_overlapping_partially_move_up.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_end.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_end.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_end_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_end_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_middle.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_middle.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_middle_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_middle_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_50.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_50.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_gt_50.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_gt_50.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_lt_50.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_lt_50.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_lt_50_size_gt_maximum_size.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_middle_position_lt_50_size_gt_maximum_size.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_start.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_start.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/align_start_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/align_start_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/bidi_ruby.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/bidi_ruby.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/bold_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/bold_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/bold_with_2_timestamps.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/bold_with_2_timestamps.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/bold_with_timestamp.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/bold_with_timestamp.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/class_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/class_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/class_with_2_timestamps.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/class_with_2_timestamps.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/class_with_timestamp.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/class_with_timestamp.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/cue_with_id.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/cue_with_id.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/decode_escaped_entities.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/decode_escaped_entities.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/foo.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/foo.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/foo_c_bar.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/foo_c_bar.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/foo_space_space_bar_LF_baz.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/foo_space_space_bar_LF_baz.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/italic_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/italic_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/italic_with_2_timestamps.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/italic_with_2_timestamps.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/italic_with_timestamp.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/italic_with_timestamp.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_-2_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_-2_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_0.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_0.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_1_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_1_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_50_percent.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_50_percent.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap_move_up.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_integer_and_percent_overlap_move_up.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap_move_up.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/line_percent_and_integer_overlap_move_up.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/one_line_cue_plus_wrapped_cue.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/one_line_cue_plus_wrapped_cue.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/size_50.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/size_50.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_bold.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_bold.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_bold_with_class.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_bold_with_class.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_class.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_class.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_class_with_class.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_class_with_class.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_italic.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_italic.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_italic_with_class.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_italic_with_class.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_two_voices.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_two_voices.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_underline.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_underline.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_underline_with_class.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_underline_with_class.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_voice.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_voice.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/test_voice_with_class.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/test_voice_with_class.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/too_many_cues.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/too_many_cues_wrapped.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/too_many_cues_wrapped.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u002E_LF_u05D0.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u002E_LF_u05D0.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u002E_u2028_u05D0.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2028_u05D0.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u002E_u2029_u05D0.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u002E_u2029_u05D0.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u0041_first.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u0041_first.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u05D0_first.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u05D0_first.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u0628_first.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u0628_first.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/u06E9_no_strong_dir.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/u06E9_no_strong_dir.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/underline_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/underline_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/underline_with_2_timestamps.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/underline_with_2_timestamps.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/underline_with_timestamp.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/underline_with_timestamp.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/very_long_cue.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/very_long_cue.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/voice_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/voice_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/voice_with_2_timestamps.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/voice_with_2_timestamps.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/voice_with_timestamp.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/voice_with_timestamp.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/white-spaces.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/white-spaces.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long_size_20.vtt",
         "url": "/webvtt/rendering/cues-with-video/processing-model/support/white-spaces_long_size_20.vtt"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html",
-        "url": "webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html"
+        "url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/buildtests.py",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/buildtests.py"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/common.js",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/common.js"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/entities.dat",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/entities.dat"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/tags.dat",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/tags.dat"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/timestamps.dat",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/timestamps.dat"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/tree-building.dat",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/dat/tree-building.dat"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/arrows.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/arrows.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/cue-counts.json",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/cue-counts.json"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-garbage.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-garbage.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-space.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-space.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-tab.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-tab.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-timings.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/header-timings.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/ids.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/ids.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/newlines.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/newlines.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/no-signature.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/no-signature.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/nulls.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/nulls.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/omitted-hours.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/omitted-hours.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-align.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-align.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-line.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-line.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-multiple.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-multiple.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-position.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-position.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-size.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-size.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-vertical.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/settings-vertical.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-bom.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-bom.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-formfeed.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-formfeed.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-lowercase.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-lowercase.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-no-newline.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-no-newline.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-null.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-null.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-space-no-newline.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-space-no-newline.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-space.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-space.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-tab-no-newline.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-tab-no-newline.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-tab.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-tab.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-timings.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-timings.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-too-short.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-too-short.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-two-boms.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-two-boms.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-websrt.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/signature-websrt.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/space-chars.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/space-chars.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-60.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-60.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-garbage.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-garbage.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-negative.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-negative.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-too-long.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-too-long.vtt"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-too-short.vtt",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/support/timings-too-short.vtt"
       },
       {
-        "path": "workers/README.md",
         "url": "/workers/README.md"
       },
       {
-        "path": "workers/constructors/SharedWorker/1",
         "url": "/workers/constructors/SharedWorker/1"
       },
       {
-        "path": "workers/constructors/SharedWorker/null",
         "url": "/workers/constructors/SharedWorker/null"
       },
       {
-        "path": "workers/constructors/SharedWorker/undefined",
         "url": "/workers/constructors/SharedWorker/undefined"
       },
       {
-        "path": "workers/constructors/Worker/1",
         "url": "/workers/constructors/Worker/1"
       },
       {
-        "path": "workers/constructors/Worker/null",
         "url": "/workers/constructors/Worker/null"
       },
       {
-        "path": "workers/constructors/Worker/undefined",
         "url": "/workers/constructors/Worker/undefined"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.js",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.js"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/helper-redirect.py",
         "url": "/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/post-location-members.js",
         "url": "/workers/interfaces/WorkerGlobalScope/location/post-location-members.js"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/1",
         "url": "/workers/interfaces/WorkerUtils/importScripts/1"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/null",
         "url": "/workers/interfaces/WorkerUtils/importScripts/null"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/undefined",
         "url": "/workers/interfaces/WorkerUtils/importScripts/undefined"
       },
       {
-        "path": "workers/non-automated/application-cache-dedicated.js",
         "url": "/workers/non-automated/application-cache-dedicated.js"
       },
       {
-        "path": "workers/non-automated/cache.manifest",
         "url": "/workers/non-automated/cache.manifest"
       },
       {
-        "path": "workers/non-automated/infinite-nested.js",
         "url": "/workers/non-automated/infinite-nested.js"
       },
       {
-        "path": "workers/non-automated/infinite-sibling-and-nested.js",
         "url": "/workers/non-automated/infinite-sibling-and-nested.js"
       },
       {
-        "path": "workers/non-automated/infinite-sibling.js",
         "url": "/workers/non-automated/infinite-sibling.js"
       },
       {
-        "path": "workers/non-automated/post-a-1.js",
         "url": "/workers/non-automated/post-a-1.js"
       },
       {
-        "path": "workers/semantics/encodings/001.html.headers",
         "url": "/workers/semantics/encodings/001.html.headers"
       },
       {
-        "path": "workers/semantics/encodings/002.html.headers",
         "url": "/workers/semantics/encodings/002.html.headers"
       },
       {
-        "path": "workers/semantics/encodings/003-1.py",
         "url": "/workers/semantics/encodings/003-1.py"
       },
       {
-        "path": "workers/semantics/multiple-workers/004-2.js",
         "url": "/workers/semantics/multiple-workers/004-2.js"
       },
       {
-        "path": "workers/semantics/multiple-workers/006-1.js",
         "url": "/workers/semantics/multiple-workers/006-1.js"
       },
       {
-        "path": "workers/semantics/structured-clone/common.js",
         "url": "/workers/semantics/structured-clone/common.js"
       },
       {
-        "path": "workers/semantics/structured-clone/dedicated.js",
         "url": "/workers/semantics/structured-clone/dedicated.js"
       },
       {
-        "path": "workers/semantics/structured-clone/shared.js",
         "url": "/workers/semantics/structured-clone/shared.js"
       },
       {
-        "path": "workers/semantics/structured-clone/worker-common.js",
         "url": "/workers/semantics/structured-clone/worker-common.js"
       },
       {
-        "path": "workers/semantics/xhr/001-1.xml",
         "url": "/workers/semantics/xhr/001-1.xml"
       },
       {
-        "path": "workers/semantics/xhr/support/001-1.xml",
         "url": "/workers/semantics/xhr/support/001-1.xml"
       },
       {
-        "path": "workers/semantics/xhr/support/005-1.js",
         "url": "/workers/semantics/xhr/support/005-1.js"
       },
       {
-        "path": "workers/semantics/xhr/support/006-1.js",
         "url": "/workers/semantics/xhr/support/006-1.js"
       },
       {
-        "path": "workers/support/ErrorEvent.js",
         "url": "/workers/support/ErrorEvent.js"
       },
       {
-        "path": "workers/support/EventListener.js",
         "url": "/workers/support/EventListener.js"
       },
       {
-        "path": "workers/support/ImportScripts.js",
         "url": "/workers/support/ImportScripts.js"
       },
       {
-        "path": "workers/support/ImportScriptsNetworkErr.js",
         "url": "/workers/support/ImportScriptsNetworkErr.js"
       },
       {
-        "path": "workers/support/Timer.js",
         "url": "/workers/support/Timer.js"
       },
       {
-        "path": "workers/support/WorkerBasic.js",
         "url": "/workers/support/WorkerBasic.js"
       },
       {
-        "path": "workers/support/WorkerClose.js",
         "url": "/workers/support/WorkerClose.js"
       },
       {
-        "path": "workers/support/WorkerDataCloneErr.js",
         "url": "/workers/support/WorkerDataCloneErr.js"
       },
       {
-        "path": "workers/support/WorkerLocation.js",
         "url": "/workers/support/WorkerLocation.js"
       },
       {
-        "path": "workers/support/WorkerNavigator.js",
         "url": "/workers/support/WorkerNavigator.js"
       },
       {
-        "path": "workers/support/WorkerNested.js",
         "url": "/workers/support/WorkerNested.js"
       },
       {
-        "path": "workers/support/WorkerTerminate.js",
         "url": "/workers/support/WorkerTerminate.js"
       },
       {
-        "path": "workers/support/WorkerText.txt",
         "url": "/workers/support/WorkerText.txt"
       },
       {
-        "path": "workers/support/XMLHttpRequest.js",
         "url": "/workers/support/XMLHttpRequest.js"
       },
       {
-        "path": "workers/support/XMLHttpRequest.txt",
         "url": "/workers/support/XMLHttpRequest.txt"
       },
       {
-        "path": "workers/workers.js",
         "url": "/workers/workers.js"
       }
     ],
     "manual": [
       {
-        "path": "2dcontext/conformance-requirements/2d.coordinatespace-manual.html",
         "url": "/2dcontext/conformance-requirements/2d.coordinatespace-manual.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.kern.consistent-manual.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.kern.consistent-manual.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.blur.high-manual.html",
         "url": "/2dcontext/shadows/2d.shadow.blur.high-manual.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.blur.low-manual.html",
         "url": "/2dcontext/shadows/2d.shadow.blur.low-manual.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_file-manual.html",
         "url": "/FileAPI/FileReader-interface/filereader_file-manual.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_file_img-manual.html",
         "url": "/FileAPI/FileReader-interface/filereader_file_img-manual.html"
       },
       {
-        "path": "FileAPI/filelist-section/filelist_multiple_selected_files-manual.html",
         "url": "/FileAPI/filelist-section/filelist_multiple_selected_files-manual.html"
       },
       {
-        "path": "FileAPI/filelist-section/filelist_selected_file-manual.html",
         "url": "/FileAPI/filelist-section/filelist_selected_file-manual.html"
       },
       {
-        "path": "FileAPI/idlharness-manual.html",
         "url": "/FileAPI/idlharness-manual.html"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-existing-session-manual.htm",
         "url": "/XMLHttpRequest/send-authentication-existing-session-manual.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-prompt-2-manual.htm",
         "url": "/XMLHttpRequest/send-authentication-prompt-2-manual.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-prompt-manual.htm",
         "url": "/XMLHttpRequest/send-authentication-prompt-manual.htm"
       },
       {
-        "path": "battery-status/battery-charging-manual.html",
         "url": "/battery-status/battery-charging-manual.html"
       },
       {
-        "path": "battery-status/battery-created-manual.html",
         "url": "/battery-status/battery-created-manual.html"
       },
       {
-        "path": "battery-status/battery-discharging-manual.html",
         "url": "/battery-status/battery-discharging-manual.html"
       },
       {
-        "path": "battery-status/battery-full-manual.html",
         "url": "/battery-status/battery-full-manual.html"
       },
       {
-        "path": "battery-status/battery-plugged-in-manual.html",
         "url": "/battery-status/battery-plugged-in-manual.html"
       },
       {
-        "path": "battery-status/battery-unplugged-manual.html",
         "url": "/battery-status/battery-unplugged-manual.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_permission-manual.html",
         "url": "/geolocation-API/getCurrentPosition_permission-manual.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_permission_allow-manual.html",
         "url": "/geolocation-API/getCurrentPosition_permission_allow-manual.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_permission_deny-manual.html",
         "url": "/geolocation-API/getCurrentPosition_permission_deny-manual.html"
       },
       {
-        "path": "geolocation-API/watchPosition_permission-manual.html",
         "url": "/geolocation-API/watchPosition_permission-manual.html"
       },
       {
-        "path": "html-longdesc/data-uri-image-data-uri-description-manual.html",
         "url": "/html-longdesc/data-uri-image-data-uri-description-manual.html"
       },
       {
-        "path": "html-longdesc/data-uri-image-external-description-fragment-manual.html",
         "url": "/html-longdesc/data-uri-image-external-description-fragment-manual.html"
       },
       {
-        "path": "html-longdesc/data-uri-image-external-description-manual.html",
         "url": "/html-longdesc/data-uri-image-external-description-manual.html"
       },
       {
-        "path": "html-longdesc/data-uri-image-internal-description-manual.html",
         "url": "/html-longdesc/data-uri-image-internal-description-manual.html"
       },
       {
-        "path": "html-longdesc/empty-image-data-uri-description-manual.html",
         "url": "/html-longdesc/empty-image-data-uri-description-manual.html"
       },
       {
-        "path": "html-longdesc/empty-image-external-description-fragment-manual.html",
         "url": "/html-longdesc/empty-image-external-description-fragment-manual.html"
       },
       {
-        "path": "html-longdesc/empty-image-external-description-manual.html",
         "url": "/html-longdesc/empty-image-external-description-manual.html"
       },
       {
-        "path": "html-longdesc/empty-image-internal-description-manual.html",
         "url": "/html-longdesc/empty-image-internal-description-manual.html"
       },
       {
-        "path": "html-longdesc/empty-longdesc-manual.html",
         "url": "/html-longdesc/empty-longdesc-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-data-uri-description-girt-by-spaces-manual.html",
         "url": "/html-longdesc/external-image-data-uri-description-girt-by-spaces-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-data-uri-description-manual.html",
         "url": "/html-longdesc/external-image-data-uri-description-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-external-description-fragment-girt-by-spaces-manual.html",
         "url": "/html-longdesc/external-image-external-description-fragment-girt-by-spaces-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-external-description-fragment-manual.html",
         "url": "/html-longdesc/external-image-external-description-fragment-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-external-description-girt-by-spaces-manual.html",
         "url": "/html-longdesc/external-image-external-description-girt-by-spaces-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-external-description-manual.html",
         "url": "/html-longdesc/external-image-external-description-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-internal-description-girt-by-spaces-manual.html",
         "url": "/html-longdesc/external-image-internal-description-girt-by-spaces-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-internal-description-manual.html",
         "url": "/html-longdesc/external-image-internal-description-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-with-absolute-base-external-description-manual.html",
         "url": "/html-longdesc/external-image-with-absolute-base-external-description-manual.html"
       },
       {
-        "path": "html-longdesc/external-image-with-relative-base-external-description-manual.html",
         "url": "/html-longdesc/external-image-with-relative-base-external-description-manual.html"
       },
       {
-        "path": "html-longdesc/fail-fragment-pointer-manual.html",
         "url": "/html-longdesc/fail-fragment-pointer-manual.html"
       },
       {
-        "path": "html-longdesc/iframe-discoverability-manual.html",
         "url": "/html-longdesc/iframe-discoverability-manual.html"
       },
       {
-        "path": "html-longdesc/invalid-longdesc-manual.html",
         "url": "/html-longdesc/invalid-longdesc-manual.html"
       },
       {
-        "path": "html-longdesc/reflected-changing-longdesc-manual.html",
         "url": "/html-longdesc/reflected-changing-longdesc-manual.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_status_checking-manual.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_checking-manual.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_status_downloading-manual.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_downloading-manual.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_status_obsolete-manual.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_obsolete-manual.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_status_updateready-manual.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_updateready-manual.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_swapcache-manual.html",
         "url": "/html/browsers/offline/application-cache-api/api_swapcache-manual.html"
       },
       {
-        "path": "html/browsers/offline/browser-state/navigator_online_event-manual.html",
         "url": "/html/browsers/offline/browser-state/navigator_online_event-manual.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_downloading-manual.html",
         "url": "/html/browsers/offline/introduction-4/event_downloading-manual.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_error-manual.html",
         "url": "/html/browsers/offline/introduction-4/event_error-manual.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_obsolete-manual.html",
         "url": "/html/browsers/offline/introduction-4/event_obsolete-manual.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_updateready-manual.html",
         "url": "/html/browsers/offline/introduction-4/event_updateready-manual.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_updateready_swapcache-manual.html",
         "url": "/html/browsers/offline/introduction-4/event_updateready_swapcache-manual.html"
       },
       {
-        "path": "html/browsers/offline/manifest_main_empty-manual.html",
         "url": "/html/browsers/offline/manifest_main_empty-manual.html"
       },
       {
-        "path": "html/browsers/offline/manifest_notchanged_online-manual.html",
         "url": "/html/browsers/offline/manifest_notchanged_online-manual.html"
       },
       {
-        "path": "html/browsers/offline/manifest_section_empty-manual.html",
         "url": "/html/browsers/offline/manifest_section_empty-manual.html"
       },
       {
-        "path": "html/browsers/offline/manifest_section_many-manual.html",
         "url": "/html/browsers/offline/manifest_section_many-manual.html"
       },
       {
-        "path": "html/browsers/offline/section_network_offline-manual.html",
         "url": "/html/browsers/offline/section_network_offline-manual.html"
       },
       {
-        "path": "html/browsers/offline/section_network_online-manual.html",
         "url": "/html/browsers/offline/section_network_online-manual.html"
       },
       {
-        "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-locationbar-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-locationbar-manual.html"
       },
       {
-        "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-menubar-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-menubar-manual.html"
       },
       {
-        "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-personalbar-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-personalbar-manual.html"
       },
       {
-        "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-scrollbars-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-scrollbars-manual.html"
       },
       {
-        "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-statusbar-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-statusbar-manual.html"
       },
       {
-        "path": "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-toolbar-manual.html",
         "url": "/html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-toolbar-manual.html"
       },
       {
-        "path": "html/editing/dnd/datastore/015-manual.html",
         "url": "/html/editing/dnd/datastore/015-manual.html"
       },
       {
-        "path": "html/editing/dnd/events/events-cross-document-suite-manual.html",
         "url": "/html/editing/dnd/events/events-cross-document-suite-manual.html"
       },
       {
-        "path": "html/editing/dnd/events/events-file-suite-manual.html",
         "url": "/html/editing/dnd/events/events-file-suite-manual.html"
       },
       {
-        "path": "html/editing/dnd/events/events-suite-manual.html",
         "url": "/html/editing/dnd/events/events-suite-manual.html"
       },
       {
-        "path": "html/editing/dnd/synthetic/005-manual.html",
         "url": "/html/editing/dnd/synthetic/005-manual.html"
       },
       {
-        "path": "html/editing/dnd/synthetic/006-manual.html",
         "url": "/html/editing/dnd/synthetic/006-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/001-manual.html",
         "url": "/html/editing/dnd/target-origin/001-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/002-manual.html",
         "url": "/html/editing/dnd/target-origin/002-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/003-manual.html",
         "url": "/html/editing/dnd/target-origin/003-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/004-manual.html",
         "url": "/html/editing/dnd/target-origin/004-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/005-manual.html",
         "url": "/html/editing/dnd/target-origin/005-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/006-manual.html",
         "url": "/html/editing/dnd/target-origin/006-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/007-manual.html",
         "url": "/html/editing/dnd/target-origin/007-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/008-manual.html",
         "url": "/html/editing/dnd/target-origin/008-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/009-manual.html",
         "url": "/html/editing/dnd/target-origin/009-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/010-manual.html",
         "url": "/html/editing/dnd/target-origin/010-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/011-manual.html",
         "url": "/html/editing/dnd/target-origin/011-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/012-manual.html",
         "url": "/html/editing/dnd/target-origin/012-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/013-manual.html",
         "url": "/html/editing/dnd/target-origin/013-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/101-manual.html",
         "url": "/html/editing/dnd/target-origin/101-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/102-manual.html",
         "url": "/html/editing/dnd/target-origin/102-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/103-manual.html",
         "url": "/html/editing/dnd/target-origin/103-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/104-manual.html",
         "url": "/html/editing/dnd/target-origin/104-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/105-manual.html",
         "url": "/html/editing/dnd/target-origin/105-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/106-manual.html",
         "url": "/html/editing/dnd/target-origin/106-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/107-manual.html",
         "url": "/html/editing/dnd/target-origin/107-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/108-manual.html",
         "url": "/html/editing/dnd/target-origin/108-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/109-manual.html",
         "url": "/html/editing/dnd/target-origin/109-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/110-manual.html",
         "url": "/html/editing/dnd/target-origin/110-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/111-manual.html",
         "url": "/html/editing/dnd/target-origin/111-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/112-manual.html",
         "url": "/html/editing/dnd/target-origin/112-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/113-manual.html",
         "url": "/html/editing/dnd/target-origin/113-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/114-manual.html",
         "url": "/html/editing/dnd/target-origin/114-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/115-manual.html",
         "url": "/html/editing/dnd/target-origin/115-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/116-manual.html",
         "url": "/html/editing/dnd/target-origin/116-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/117-manual.html",
         "url": "/html/editing/dnd/target-origin/117-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/118-manual.html",
         "url": "/html/editing/dnd/target-origin/118-manual.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/201-manual.html",
         "url": "/html/editing/dnd/target-origin/201-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dragevent-interface/dragevent-manual.html",
         "url": "/html/editing/dnd/the-dragevent-interface/dragevent-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html"
       },
       {
-        "path": "html/editing/focus/focus-01-manual.html",
         "url": "/html/editing/focus/focus-01-manual.html"
       },
       {
-        "path": "html/editing/focus/focus-02-manual.html",
         "url": "/html/editing/focus/focus-02-manual.html"
       },
       {
-        "path": "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative-manual.html",
         "url": "/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative-manual.html"
       },
       {
-        "path": "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order-manual.html",
         "url": "/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order-manual.html"
       },
       {
-        "path": "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive-manual.html",
         "url": "/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive-manual.html"
       },
       {
-        "path": "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero-manual.html",
         "url": "/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero-manual.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_controls_present-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_loop_current_media_controller-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_loop_current_media_controller-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_muted_present-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-beforeunload-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-beforeunload-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-dialogs-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-dialogs-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-print-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/stable-state-print-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_controls_present-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/video_controls_present-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_loop_current_media_controller-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/video_loop_current_media_controller-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_muted_present-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/video_muted_present-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_volume_silent-manual.html",
         "url": "/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.png",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.png"
       },
       {
-        "path": "html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html",
         "url": "/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/file-manual.html",
         "url": "/html/semantics/forms/the-input-element/file-manual.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-li-element/grouping-li-novalue-MANUAL.html",
         "url": "/html/semantics/grouping-content/the-li-element/grouping-li-novalue-MANUAL.html"
       },
       {
-        "path": "mediacapture-streams/mediastreams-as-media-elements/video-assignment-manual.html",
         "url": "/mediacapture-streams/mediastreams-as-media-elements/video-assignment-manual.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/mediastream-id-manual.html",
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-id-manual.html"
       },
       {
-        "path": "notifications/Notification-requestPermission-denied-manual.html",
         "url": "/notifications/Notification-requestPermission-denied-manual.html"
       },
       {
-        "path": "notifications/Notification-requestPermission-granted-manual.html",
         "url": "/notifications/Notification-requestPermission-granted-manual.html"
       },
       {
-        "path": "notifications/notification-body-basic-manual.html",
         "url": "/notifications/notification-body-basic-manual.html"
       },
       {
-        "path": "notifications/notification-body-empty-manual.html",
         "url": "/notifications/notification-body-empty-manual.html"
       },
       {
-        "path": "notifications/notification-close-manual.html",
         "url": "/notifications/notification-close-manual.html"
       },
       {
-        "path": "notifications/notification-dir-auto-manual.html",
         "url": "/notifications/notification-dir-auto-manual.html"
       },
       {
-        "path": "notifications/notification-dir-ltr-manual.html",
         "url": "/notifications/notification-dir-ltr-manual.html"
       },
       {
-        "path": "notifications/notification-dir-rtl-manual.html",
         "url": "/notifications/notification-dir-rtl-manual.html"
       },
       {
-        "path": "notifications/notification-icon-basic-manual.html",
         "url": "/notifications/notification-icon-basic-manual.html"
       },
       {
-        "path": "notifications/notification-icon-empty-manual.html",
         "url": "/notifications/notification-icon-empty-manual.html"
       },
       {
-        "path": "notifications/notification-tag-different-manual.html",
         "url": "/notifications/notification-tag-different-manual.html"
       },
       {
-        "path": "notifications/notification-tag-same-manual.html",
         "url": "/notifications/notification-tag-same-manual.html"
       },
       {
-        "path": "page-visibility/test_minimize-manual.html",
         "url": "/page-visibility/test_minimize-manual.html"
       },
       {
-        "path": "page-visibility/test_tab_state_change-manual.html",
         "url": "/page-visibility/test_tab_state_change-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_button_attribute_mouse-manual.html",
         "url": "/pointerevents/pointerevent_button_attribute_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_capture_mouse-manual.html",
         "url": "/pointerevents/pointerevent_capture_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_capture_suppressing_mouse-manual.html",
         "url": "/pointerevents/pointerevent_capture_suppressing_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html",
         "url": "/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_gotpointercapture_before_first_pointerevent-manual.html",
         "url": "/pointerevents/pointerevent_gotpointercapture_before_first_pointerevent-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_lostpointercapture_is_first-manual.html",
+        "url": "/pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html"
+      },
+      {
         "url": "/pointerevents/pointerevent_lostpointercapture_is_first-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointercancel_touch-manual.html",
         "url": "/pointerevents/pointerevent_pointercancel_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerdown-manual.html",
         "url": "/pointerevents/pointerevent_pointerdown-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerenter-manual.html",
         "url": "/pointerevents/pointerevent_pointerenter-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerenter_does_not_bubble-manual.html",
         "url": "/pointerevents/pointerevent_pointerenter_does_not_bubble-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerenter_nohover-manual.html",
         "url": "/pointerevents/pointerevent_pointerenter_nohover-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerleave_descendant_over-manual.html",
+        "url": "/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual.html"
+      },
+      {
+        "url": "/pointerevents/pointerevent_pointerleave_after_pointerup_nohover-manual.html"
+      },
+      {
         "url": "/pointerevents/pointerevent_pointerleave_descendant_over-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerleave_descendants-manual.html",
         "url": "/pointerevents/pointerevent_pointerleave_descendants-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerleave_does_not_bubble-manual.html",
         "url": "/pointerevents/pointerevent_pointerleave_does_not_bubble-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerleave_mouse-manual.html",
         "url": "/pointerevents/pointerevent_pointerleave_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerleave_pen-manual.html",
         "url": "/pointerevents/pointerevent_pointerleave_pen-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerleave_touch-manual.html",
         "url": "/pointerevents/pointerevent_pointerleave_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointermove-manual.html",
         "url": "/pointerevents/pointerevent_pointermove-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown-manual.html",
         "url": "/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointermove_pointertype-manual.html",
         "url": "/pointerevents/pointerevent_pointermove_pointertype-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerout-manual.html",
         "url": "/pointerevents/pointerevent_pointerout-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerout_received_once-manual.html",
+        "url": "/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual.html"
+      },
+      {
+        "url": "/pointerevents/pointerevent_pointerout_after_pointerup_nohover-manual.html"
+      },
+      {
+        "url": "/pointerevents/pointerevent_pointerout_pen-manual.html"
+      },
+      {
         "url": "/pointerevents/pointerevent_pointerout_received_once-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerover-manual.html",
         "url": "/pointerevents/pointerevent_pointerover-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointertype_mouse-manual.html",
         "url": "/pointerevents/pointerevent_pointertype_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointertype_pen-manual.html",
         "url": "/pointerevents/pointerevent_pointertype_pen-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointertype_touch-manual.html",
         "url": "/pointerevents/pointerevent_pointertype_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerup-manual.html",
         "url": "/pointerevents/pointerevent_pointerup-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerup_isprimary_same_as_pointerdown-manual.html",
         "url": "/pointerevents/pointerevent_pointerup_isprimary_same_as_pointerdown-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_pointerup_pointertype-manual.html",
         "url": "/pointerevents/pointerevent_pointerup_pointertype-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_releasepointercapture_events_to_original_target-manual.html",
         "url": "/pointerevents/pointerevent_releasepointercapture_events_to_original_target-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_releasepointercapture_invalid_pointerid-manual.html",
         "url": "/pointerevents/pointerevent_releasepointercapture_invalid_pointerid-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html",
         "url": "/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html",
         "url": "/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html",
+        "url": "/pointerevents/pointerevent_setpointercapture_disconnected-manual.html"
+      },
+      {
         "url": "/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_setpointercapture_invalid_pointerid-manual.html",
         "url": "/pointerevents/pointerevent_setpointercapture_invalid_pointerid-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html",
         "url": "/pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-auto-css_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-auto-css_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-button-test_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-button-test_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-keyboard-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-keyboard-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-mouse-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-mouse-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-none-css_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-none-css_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-pan-x-pan-y_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-span-test_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-span-test_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-svg-test_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-table-test_touch-manual.html",
         "url": "/pointerevents/pointerevent_touch-action-table-test_touch-manual.html"
       },
       {
-        "path": "touch-events/multi-touch-interactions-manual.html",
         "url": "/touch-events/multi-touch-interactions-manual.html"
       },
       {
-        "path": "touch-events/multi-touch-interfaces-manual.html",
         "url": "/touch-events/multi-touch-interfaces-manual.html"
       },
       {
-        "path": "touch-events/single-touch-manual.html",
         "url": "/touch-events/single-touch-manual.html"
       },
       {
-        "path": "vibration/cancel-when-hidden-manual.html",
         "url": "/vibration/cancel-when-hidden-manual.html"
       },
       {
-        "path": "vibration/cancel-with-0-manual.html",
         "url": "/vibration/cancel-with-0-manual.html"
       },
       {
-        "path": "vibration/cancel-with-array-0-manual.html",
         "url": "/vibration/cancel-with-array-0-manual.html"
       },
       {
-        "path": "vibration/cancel-with-empty-array-manual.html",
         "url": "/vibration/cancel-with-empty-array-manual.html"
       },
       {
-        "path": "vibration/cancel-with-new-manual.html",
         "url": "/vibration/cancel-with-new-manual.html"
       },
       {
-        "path": "vibration/pattern-array-extra-manual.html",
         "url": "/vibration/pattern-array-extra-manual.html"
       },
       {
-        "path": "vibration/pattern-array-manual.html",
         "url": "/vibration/pattern-array-manual.html"
       },
       {
-        "path": "vibration/simple-array-manual.html",
+        "url": "/vibration/pattern-array-with-0-manual.html"
+      },
+      {
         "url": "/vibration/simple-array-manual.html"
       },
       {
-        "path": "vibration/simple-scalar-manual.html",
         "url": "/vibration/simple-scalar-manual.html"
       }
     ],
     "reftest": [
       {
-        "path": "2dcontext/building-paths/canvas_complexshapes_arcto_001.htm",
+        "ref_type": "!=",
+        "ref_url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element-notref.html",
+        "url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html"
+      },
+      {
         "ref_type": "==",
         "ref_url": "/2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm",
         "url": "/2dcontext/building-paths/canvas_complexshapes_arcto_001.htm"
       },
       {
-        "path": "2dcontext/building-paths/canvas_complexshapes_beziercurveto_001.htm",
         "ref_type": "==",
         "ref_url": "/2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm",
         "url": "/2dcontext/building-paths/canvas_complexshapes_beziercurveto_001.htm"
       },
       {
-        "path": "2dcontext/compositing/canvas_compositing_globalcompositeoperation_001.htm",
         "ref_type": "==",
         "ref_url": "/2dcontext/compositing/canvas_compositing_globalcompositeoperation_001-ref.htm",
         "url": "/2dcontext/compositing/canvas_compositing_globalcompositeoperation_001.htm"
       },
       {
-        "path": "2dcontext/line-styles/canvas_linestyles_linecap_001.htm",
         "ref_type": "==",
         "ref_url": "/2dcontext/line-styles/canvas_linestyles_linecap_001-ref.htm",
         "url": "/2dcontext/line-styles/canvas_linestyles_linecap_001.htm"
       },
       {
-        "path": "2dcontext/shadows/canvas_shadows_002.htm",
         "ref_type": "==",
         "ref_url": "/2dcontext/shadows/canvas_shadows_002-ref.htm",
         "url": "/2dcontext/shadows/canvas_shadows_002.htm"
       },
       {
-        "path": "2dcontext/the-canvas-state/canvas_state_restore_001.htm",
         "ref_type": "==",
         "ref_url": "/2dcontext/the-canvas-state/canvas_state_restore_001-ref.htm",
         "url": "/2dcontext/the-canvas-state/canvas_state_restore_001.htm"
       },
       {
-        "path": "2dcontext/transformations/canvas_transformations_scale_001.htm",
         "ref_type": "==",
         "ref_url": "/2dcontext/transformations/canvas_transformations_scale_001-ref.htm",
         "url": "/2dcontext/transformations/canvas_transformations_scale_001.htm"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html",
         "ref_type": "==",
         "ref_url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag-ref.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-custom-tag.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html",
         "ref_type": "==",
         "ref_url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag-ref.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-custom-tag.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html",
         "ref_type": "==",
         "ref_url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension-ref.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-registered-type-extension.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html",
         "ref_type": "==",
         "ref_url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension-ref.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-css-test-type-extension.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-EN-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-EN-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-EN-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-EN-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-EN-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-N-EN-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-EN-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-N-EN-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-EN.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-N-EN.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-N-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-N-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-N-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-N-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-N-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-script-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-script-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-script-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-script-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-style-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-style-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-style-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-style-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-EN-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-EN-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-EN-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-EN-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-EN.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-N-EN.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-N-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-N-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-N-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-L.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-N-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-input-script-R.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-input-script-R.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-isolate.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-isolate-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-isolate.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-pre-N-EN.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-pre-N-EN-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-pre-mixed.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-pre-mixed-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-pre-mixed.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-textarea-N-EN-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-mixed.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-textarea-mixed-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed-ref.html",
         "url": "/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/lang-xmllang-01.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/lang-xmllang-01-ref.html",
         "url": "/html/dom/elements/global-attributes/lang-xmllang-01.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/lang-xyzzy.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/lang-xyzzy-ref.html",
         "url": "/html/dom/elements/global-attributes/lang-xyzzy.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/style-01.html",
         "ref_type": "==",
         "ref_url": "/html/dom/elements/global-attributes/style-01-ref.html",
         "url": "/html/dom/elements/global-attributes/style-01.html"
       },
       {
-        "path": "html/editing/the-hidden-attribute/hidden-2.svg",
         "ref_type": "==",
         "ref_url": "/html/editing/the-hidden-attribute/hidden-2-ref.svg",
         "url": "/html/editing/the-hidden-attribute/hidden-2.svg"
       },
       {
-        "path": "html/rendering/non-replaced-elements/flow-content-0/figure.html",
         "ref_type": "==",
         "ref_url": "/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html",
         "url": "/html/rendering/non-replaced-elements/flow-content-0/figure.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-border-1.html",
         "ref_type": "==",
         "ref_url": "/html/rendering/non-replaced-elements/tables/table-border-1-ref.html",
         "url": "/html/rendering/non-replaced-elements/tables/table-border-1.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-border-2.html",
         "ref_type": "==",
         "ref_url": "/html/rendering/non-replaced-elements/tables/table-border-2-ref.html",
         "url": "/html/rendering/non-replaced-elements/tables/table-border-2.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-layout.html",
         "ref_type": "==",
         "ref_url": "/html/rendering/non-replaced-elements/tables/table-layout-ref.html",
         "url": "/html/rendering/non-replaced-elements/tables/table-layout.html"
       },
       {
-        "path": "html/rendering/non-replaced-elements/tables/table-width-150percent.html",
         "ref_type": "==",
         "ref_url": "/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html",
         "url": "/html/rendering/non-replaced-elements/tables/table-width-150percent.html"
       },
       {
-        "path": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml",
         "ref_type": "==",
         "ref_url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border-ref.xhtml",
         "url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img_border_percent.xhtml"
       },
       {
-        "path": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_perc.xhtml",
         "ref_type": "==",
         "ref_url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml",
         "url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_perc.xhtml"
       },
       {
-        "path": "html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_pixel.xhtml",
         "ref_type": "==",
         "ref_url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border-ref.xhtml",
         "url": "/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/object_border_pixel.xhtml"
       },
       {
-        "path": "html/rendering/replaced-elements/images/space.html",
         "ref_type": "==",
         "ref_url": "/html/rendering/replaced-elements/images/space-ref.html",
         "url": "/html/rendering/replaced-elements/images/space.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-audio-element/audio_001.htm",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm",
         "url": "/html/semantics/embedded-content/the-audio-element/audio_001.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-audio-element/audio_002.htm",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-audio-element/audio_content-ref.htm",
         "url": "/html/semantics/embedded-content/the-audio-element/audio_002.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html",
         "url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html",
         "url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html",
         "url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-ref.html",
         "url": "/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_content_image.htm",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-video-element/video_content-ref.htm",
         "url": "/html/semantics/embedded-content/the-video-element/video_content_image.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_content_text.htm",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-video-element/video_content-ref.htm",
         "url": "/html/semantics/embedded-content/the-video-element/video_content_text.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm",
         "url": "/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-video-element/video_dynamic_poster-ref.htm",
         "url": "/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video_initially_paused.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html",
         "url": "/html/semantics/embedded-content/the-video-element/video_initially_paused.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/image01.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/forms/the-input-element/image01-ref.html",
         "url": "/html/semantics/forms/the-input-element/image01.html"
       },
       {
-        "path": "html/semantics/forms/the-textarea-element/textarea-newline-bidi.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html",
         "url": "/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html",
         "url": "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html",
         "url": "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/reversed-2.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-ol-element/reversed-2-ref.html",
         "url": "/html/semantics/grouping-content/the-ol-element/reversed-2.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html",
         "url": "/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html",
         "url": "/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-002.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-002.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-003.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-001-ref.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-the-css-user-agent-style-sheet/css-user-agent-style-sheet-test-003.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdo-element/bdo-child.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdo-element/bdo-override.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-bdo-element/bidi-001.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-bdo-element/bidi-001-ref.html",
         "url": "/html/semantics/text-level-semantics/the-bdo-element/bidi-001.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors-ref.html",
         "url": "/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-br-element/br-bidi.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html",
         "url": "/html/semantics/text-level-semantics/the-br-element/br-bidi.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-wbr-element/wbr-element.html",
-        "ref_type": "!=",
-        "ref_url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element-notref.html",
-        "url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html"
-      },
-      {
-        "path": "html/semantics/text-level-semantics/the-wbr-element/wbr-element.html",
         "ref_type": "==",
         "ref_url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element-ref.html",
         "url": "/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002-ref.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003-ref.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-003.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004-ref.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-004.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005-ref.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-005.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006-ref.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees-006.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001-ref.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-002.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-002-ref.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/nested-shadow-trees/nested_tree_reftest.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/nested-shadow-trees/nested_tree_reftest-ref.html",
         "url": "/shadow-dom/shadow-trees/nested-shadow-trees/nested_tree_reftest.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/reprojection/reprojection-001.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/reprojection/reprojection-001-ref.html",
         "url": "/shadow-dom/shadow-trees/reprojection/reprojection-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/reprojection/reprojection-002.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/reprojection/reprojection-002-ref.html",
         "url": "/shadow-dom/shadow-trees/reprojection/reprojection-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/shadow-root-001.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/shadow-root-001-ref.html",
         "url": "/shadow-dom/shadow-trees/shadow-root-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/shadow-root-002.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/shadow-root-002-ref.html",
         "url": "/shadow-dom/shadow-trees/shadow-root-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/text-decoration-001.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/shadow-trees/text-decoration-001-ref.html",
         "url": "/shadow-dom/shadow-trees/text-decoration-001.html"
       },
       {
-        "path": "shadow-dom/styles/not-apply-in-shadow-root-001.html",
         "ref_type": "==",
         "ref_url": "/shadow-dom/styles/not-apply-in-shadow-root-001-ref.html",
         "url": "/shadow-dom/styles/not-apply-in-shadow-root-001.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_up.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/2_tracks.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/2_tracks.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/3_tracks.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/3_tracks.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_end.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_end-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_end.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_end_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_end_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_middle-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_50.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_50-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_50.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_gt_50.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_gt_50-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_gt_50.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50_size_gt_maximum_size.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50_size_gt_maximum_size-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_position_lt_50_size_gt_maximum_size.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_middle_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_middle_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_start.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_start-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_start.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/align_start_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/align_start_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/basic.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/basic-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/basic.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_LF_u05D0.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2028_u05D0.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u002E_u2029_u05D0.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u05D0_first.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u0628_first.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/bidi/u06E9_no_strong_dir.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/cue_too_long.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/cue_too_long-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/cue_too_long.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/decode_escaped_entities.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_align_position_line_size_while_paused.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_line.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_cue_text_while_paused.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/dom_override_remove_cue_while_paused.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/enable_controls_reposition.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/9_cues_overlapping_completely_all_cues_have_same_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/media_404_omit_subtitles.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/media_height_19.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/media_height_19.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/single_quote-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/single_quote.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/size_90.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/size_90-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/size_90.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/evil/size_99.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/evil/size_99-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/evil/size_99.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_-2_wrapped_cue_grow_upwards.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_0_is_top-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_0_is_top.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_1_wrapped_cue_grow_downwards.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_50_percent.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_50_percent-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_50_percent.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_integer_and_percent_mixed_overlap_move_up.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/line_percent_and_integer_mixed_overlap_move_up.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/media_height400_with_controls.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/media_with_controls.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/media_with_controls-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/media_with_controls.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/one_line_cue_plus_wrapped_cue.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/repaint.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/repaint-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/repaint.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/background_shorthand_css_relative_url.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/inherit_values_from_media_element.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline_underline_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_underline.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_nowrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
-        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html",
-        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html"
+        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html",
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html",
         "ref_type": "==",
-        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-ref.html",
-        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre.html"
+        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped-ref.html",
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_shorthand_css_relative_url.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_animation_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_color.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_namespace.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_past.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_transition_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_nowrap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_with_class_object_specific_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_animation_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_color.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_future.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_timestamp_past.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_transition_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_nowrap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_with_class_object_specific_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hex.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_hsla.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/color_rgba.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/cue_func_selector_single_colon.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/id_color.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/inherit_values_from_media_element.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_animation_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_color.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_namespace.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_future.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_timestamp_past.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_transition_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_nowrap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_with_class_object_specific_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_allowed_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_namespace.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/root_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_overline_underline_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-decoration_underline.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/type_selector_root.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_animation_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_color.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_namespace.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_future.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_timestamp_past.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_transition_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_nowrap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_with_class_object_specific_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_animation_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_background_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_color.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_font_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_properties.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_outline_shorthand.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-decoration_line-through.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_text-shadow.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_future.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_timestamp_past.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_transition_with_timestamp.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_voice_attribute.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_nowrap.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_with_class_object_specific_selector.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_normal_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_nowrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-line_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html",
         "ref_type": "==",
-        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html",
-        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html"
+        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html",
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html",
         "ref_type": "==",
-        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-ref.html",
-        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html"
+        "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped-ref.html",
+        "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre-wrap_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/inherit_as_default_value_inherits_values_from_media_element.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/underline_object_default_font-style.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/size_50.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/size_50-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/size_50.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/too_many_cues.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html"
       },
       {
-        "path": "webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html",
         "ref_type": "==",
         "ref_url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped-ref.html",
         "url": "/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html"
@@ -8802,14313 +6817,10807 @@
     ],
     "stub": [
       {
-        "path": "service-workers/stub-3.1-service-worker-obj.html",
         "url": "/service-workers/stub-3.1-service-worker-obj.html"
       },
       {
-        "path": "service-workers/stub-3.1.1-service-worker-scope.html",
         "url": "/service-workers/stub-3.1.1-service-worker-scope.html"
       },
       {
-        "path": "service-workers/stub-3.1.2-service-worker-url.html",
         "url": "/service-workers/stub-3.1.2-service-worker-url.html"
       },
       {
-        "path": "service-workers/stub-3.1.3-service-worker-state.html",
         "url": "/service-workers/stub-3.1.3-service-worker-state.html"
       },
       {
-        "path": "service-workers/stub-3.1.4-service-worker-on-state-change.html",
         "url": "/service-workers/stub-3.1.4-service-worker-on-state-change.html"
       },
       {
-        "path": "service-workers/stub-3.2-navigator-service-worker.html",
         "url": "/service-workers/stub-3.2-navigator-service-worker.html"
       },
       {
-        "path": "service-workers/stub-3.2.1-navigator-service-worker-installing.html",
         "url": "/service-workers/stub-3.2.1-navigator-service-worker-installing.html"
       },
       {
-        "path": "service-workers/stub-3.2.10-navigator-service-worker-oncontrollerchange.html",
         "url": "/service-workers/stub-3.2.10-navigator-service-worker-oncontrollerchange.html"
       },
       {
-        "path": "service-workers/stub-3.2.11-navigator-service-worker-onreloadpage.html",
         "url": "/service-workers/stub-3.2.11-navigator-service-worker-onreloadpage.html"
       },
       {
-        "path": "service-workers/stub-3.2.12-navigator-service-worker-onerror.html",
         "url": "/service-workers/stub-3.2.12-navigator-service-worker-onerror.html"
       },
       {
-        "path": "service-workers/stub-3.2.2-navigator-service-worker-waiting.html",
         "url": "/service-workers/stub-3.2.2-navigator-service-worker-waiting.html"
       },
       {
-        "path": "service-workers/stub-3.2.3-navigator-service-worker-active.html",
         "url": "/service-workers/stub-3.2.3-navigator-service-worker-active.html"
       },
       {
-        "path": "service-workers/stub-3.2.4-navigator-service-worker-controller.html",
         "url": "/service-workers/stub-3.2.4-navigator-service-worker-controller.html"
       },
       {
-        "path": "service-workers/stub-3.2.5-navigator-service-worker-ready.html",
         "url": "/service-workers/stub-3.2.5-navigator-service-worker-ready.html"
       },
       {
-        "path": "service-workers/stub-3.2.6-navigator-service-worker-getAll.html",
         "url": "/service-workers/stub-3.2.6-navigator-service-worker-getAll.html"
       },
       {
-        "path": "service-workers/stub-3.2.7-navigator-service-worker-register.html",
         "url": "/service-workers/stub-3.2.7-navigator-service-worker-register.html"
       },
       {
-        "path": "service-workers/stub-3.2.8-navigator-service-worker-unregister.html",
         "url": "/service-workers/stub-3.2.8-navigator-service-worker-unregister.html"
       },
       {
-        "path": "service-workers/stub-3.2.9-navigator-service-worker-onupdatefound.html",
         "url": "/service-workers/stub-3.2.9-navigator-service-worker-onupdatefound.html"
       },
       {
-        "path": "service-workers/stub-4.1-service-worker-global-scope.html",
         "url": "/service-workers/stub-4.1-service-worker-global-scope.html"
       },
       {
-        "path": "service-workers/stub-4.1.1-service-worker-global-scope-caches.html",
         "url": "/service-workers/stub-4.1.1-service-worker-global-scope-caches.html"
       },
       {
-        "path": "service-workers/stub-4.1.2-service-worker-global-scope-clients.html",
         "url": "/service-workers/stub-4.1.2-service-worker-global-scope-clients.html"
       },
       {
-        "path": "service-workers/stub-4.1.3-service-worker-global-scope-scope.html",
         "url": "/service-workers/stub-4.1.3-service-worker-global-scope-scope.html"
       },
       {
-        "path": "service-workers/stub-4.1.4-service-worker-global-scope-fetch.html",
         "url": "/service-workers/stub-4.1.4-service-worker-global-scope-fetch.html"
       },
       {
-        "path": "service-workers/stub-4.1.5-service-worker-global-scope-update.html",
         "url": "/service-workers/stub-4.1.5-service-worker-global-scope-update.html"
       },
       {
-        "path": "service-workers/stub-4.1.6-service-worker-global-scope-unregister.html",
         "url": "/service-workers/stub-4.1.6-service-worker-global-scope-unregister.html"
       },
       {
-        "path": "service-workers/stub-4.1.7-service-worker-global-scope-onmessage.html",
         "url": "/service-workers/stub-4.1.7-service-worker-global-scope-onmessage.html"
       },
       {
-        "path": "service-workers/stub-4.2-client.html",
         "url": "/service-workers/stub-4.2-client.html"
       },
       {
-        "path": "service-workers/stub-4.3-service-worker-clients.html",
         "url": "/service-workers/stub-4.3-service-worker-clients.html"
       },
       {
-        "path": "service-workers/stub-4.3.1-get-serviced-method.html",
         "url": "/service-workers/stub-4.3.1-get-serviced-method.html"
       },
       {
-        "path": "service-workers/stub-4.3.2-reloadall-method.html",
         "url": "/service-workers/stub-4.3.2-reloadall-method.html"
       },
       {
-        "path": "service-workers/stub-4.4-request-objects.html",
         "url": "/service-workers/stub-4.4-request-objects.html"
       },
       {
-        "path": "service-workers/stub-4.5-response-objects.html",
         "url": "/service-workers/stub-4.5-response-objects.html"
       },
       {
-        "path": "service-workers/stub-4.5.2-response.html",
         "url": "/service-workers/stub-4.5.2-response.html"
       },
       {
-        "path": "service-workers/stub-4.5.4-opaque-response.html",
         "url": "/service-workers/stub-4.5.4-opaque-response.html"
       },
       {
-        "path": "service-workers/stub-4.6-cache-objects.html",
         "url": "/service-workers/stub-4.6-cache-objects.html"
       },
       {
-        "path": "service-workers/stub-4.6.1-cache-lifetimes.html",
         "url": "/service-workers/stub-4.6.1-cache-lifetimes.html"
       },
       {
-        "path": "service-workers/stub-4.6.2-cache.html",
         "url": "/service-workers/stub-4.6.2-cache.html"
       },
       {
-        "path": "service-workers/stub-4.6.3-cache-storage.html",
         "url": "/service-workers/stub-4.6.3-cache-storage.html"
       },
       {
-        "path": "service-workers/stub-4.7.1-install-phase-event.html",
         "url": "/service-workers/stub-4.7.1-install-phase-event.html"
       },
       {
-        "path": "service-workers/stub-4.7.1.1-wait-until-method.html",
         "url": "/service-workers/stub-4.7.1.1-wait-until-method.html"
       },
       {
-        "path": "service-workers/stub-4.7.2-install-event.html",
         "url": "/service-workers/stub-4.7.2-install-event.html"
       },
       {
-        "path": "service-workers/stub-4.7.2.1-install-event-section.html",
         "url": "/service-workers/stub-4.7.2.1-install-event-section.html"
       },
       {
-        "path": "service-workers/stub-4.7.2.2-replace-method.html",
         "url": "/service-workers/stub-4.7.2.2-replace-method.html"
       },
       {
-        "path": "service-workers/stub-4.7.3-activate-event.html",
         "url": "/service-workers/stub-4.7.3-activate-event.html"
       },
       {
-        "path": "service-workers/stub-4.7.4.1-fetch-event-section.html",
         "url": "/service-workers/stub-4.7.4.1-fetch-event-section.html"
       },
       {
-        "path": "service-workers/stub-4.7.4.2-respond-with-method.html",
         "url": "/service-workers/stub-4.7.4.2-respond-with-method.html"
       },
       {
-        "path": "service-workers/stub-4.7.4.3-default-method.html",
         "url": "/service-workers/stub-4.7.4.3-default-method.html"
       },
       {
-        "path": "service-workers/stub-4.7.4.4-is-reload-attribute.html",
         "url": "/service-workers/stub-4.7.4.4-is-reload-attribute.html"
       },
       {
-        "path": "service-workers/stub-5.1-origin-relativity.html",
         "url": "/service-workers/stub-5.1-origin-relativity.html"
       },
       {
-        "path": "service-workers/stub-5.2-cross-origin-resources.html",
         "url": "/service-workers/stub-5.2-cross-origin-resources.html"
       }
     ],
     "testharness": [
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.copy.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-out.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.destination-over.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.destination-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.lighter.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.lighter.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-atop.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.source-over.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.source-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.canvas.xor.html",
         "url": "/2dcontext/compositing/2d.composite.canvas.xor.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.copy.html",
         "url": "/2dcontext/compositing/2d.composite.clip.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.clip.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.clip.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.destination-out.html",
         "url": "/2dcontext/compositing/2d.composite.clip.destination-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.destination-over.html",
         "url": "/2dcontext/compositing/2d.composite.clip.destination-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.lighter.html",
         "url": "/2dcontext/compositing/2d.composite.clip.lighter.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.source-atop.html",
         "url": "/2dcontext/compositing/2d.composite.clip.source-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.clip.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.clip.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.source-over.html",
         "url": "/2dcontext/compositing/2d.composite.clip.source-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.clip.xor.html",
         "url": "/2dcontext/compositing/2d.composite.clip.xor.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.canvas.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.canvas.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.canvaspattern.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.canvaspattern.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.default.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.default.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.fill.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.fill.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.image.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.image.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.imagepattern.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.imagepattern.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.invalid.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.invalid.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.globalAlpha.range.html",
         "url": "/2dcontext/compositing/2d.composite.globalAlpha.range.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.copy.html",
         "url": "/2dcontext/compositing/2d.composite.image.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.image.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.image.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-out.html",
         "url": "/2dcontext/compositing/2d.composite.image.destination-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.destination-over.html",
         "url": "/2dcontext/compositing/2d.composite.image.destination-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.lighter.html",
         "url": "/2dcontext/compositing/2d.composite.image.lighter.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-atop.html",
         "url": "/2dcontext/compositing/2d.composite.image.source-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.image.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.image.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.source-over.html",
         "url": "/2dcontext/compositing/2d.composite.image.source-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.image.xor.html",
         "url": "/2dcontext/compositing/2d.composite.image.xor.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.casesensitive.html",
         "url": "/2dcontext/compositing/2d.composite.operation.casesensitive.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.clear.html",
         "url": "/2dcontext/compositing/2d.composite.operation.clear.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.darker.html",
         "url": "/2dcontext/compositing/2d.composite.operation.darker.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.default.html",
         "url": "/2dcontext/compositing/2d.composite.operation.default.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.get.html",
         "url": "/2dcontext/compositing/2d.composite.operation.get.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.highlight.html",
         "url": "/2dcontext/compositing/2d.composite.operation.highlight.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.nullsuffix.html",
         "url": "/2dcontext/compositing/2d.composite.operation.nullsuffix.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.over.html",
         "url": "/2dcontext/compositing/2d.composite.operation.over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.operation.unrecognised.html",
         "url": "/2dcontext/compositing/2d.composite.operation.unrecognised.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.copy.html",
         "url": "/2dcontext/compositing/2d.composite.solid.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-out.html",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.destination-over.html",
         "url": "/2dcontext/compositing/2d.composite.solid.destination-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.lighter.html",
         "url": "/2dcontext/compositing/2d.composite.solid.lighter.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-atop.html",
         "url": "/2dcontext/compositing/2d.composite.solid.source-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.solid.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.solid.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.source-over.html",
         "url": "/2dcontext/compositing/2d.composite.solid.source-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.solid.xor.html",
         "url": "/2dcontext/compositing/2d.composite.solid.xor.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.copy.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-out.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.destination-over.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.destination-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.lighter.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.lighter.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-atop.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.source-over.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.source-over.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.transparent.xor.html",
         "url": "/2dcontext/compositing/2d.composite.transparent.xor.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.copy.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.fill.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.fill.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.copy.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.image.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.image.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.copy.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.nocontext.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.nocontext.source-out.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.copy.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.copy.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.destination-atop.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.destination-atop.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.destination-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.destination-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.source-in.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.source-in.html"
       },
       {
-        "path": "2dcontext/compositing/2d.composite.uncovered.pattern.source-out.html",
         "url": "/2dcontext/compositing/2d.composite.uncovered.pattern.source-out.html"
       },
       {
-        "path": "2dcontext/conformance-requirements/2d.missingargs.html",
         "url": "/2dcontext/conformance-requirements/2d.missingargs.html"
       },
       {
-        "path": "2dcontext/conformance-requirements/2d.type.delete.html",
         "url": "/2dcontext/conformance-requirements/2d.type.delete.html"
       },
       {
-        "path": "2dcontext/conformance-requirements/2d.voidreturn.html",
         "url": "/2dcontext/conformance-requirements/2d.voidreturn.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.3arg.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.3arg.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.5arg.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.5arg.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.alpha.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.alpha.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.animated.apng.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.animated.apng.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.animated.gif.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.animated.gif.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.canvas.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.canvas.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.clip.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.clip.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.composite.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.composite.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.floatsource.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.floatsource.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.emptysrc.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.emptysrc.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.immediate.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.immediate.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.nosrc.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.nosrc.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.reload.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.reload.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.removedsrc.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.incomplete.removedsrc.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativedest.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativedest.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativedir.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativedir.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativesource.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativesource.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.nowrap.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.nowrap.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.null.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.null.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.path.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.path.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.self.1.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.self.1.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.self.2.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.self.2.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.svg.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.svg.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.transform.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.transform.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.html"
       },
       {
-        "path": "2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html",
         "url": "/2dcontext/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/canvas_focus_drawCustomFocusRing_001.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/canvas_focus_drawCustomFocusRing_001.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_001.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_002.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_002.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_003.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_003.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_004.html"
       },
       {
-        "path": "2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html",
         "url": "/2dcontext/drawing-paths-to-the-canvas/drawFocusIfNeeded_005.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.path.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.path.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.path.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.path.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html"
       },
       {
-        "path": "2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html",
         "url": "/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.center.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.center.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.end.ltr.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.end.ltr.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.end.rtl.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.end.rtl.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.left.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.left.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.right.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.right.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.start.ltr.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.start.ltr.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.start.rtl.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.align.start.rtl.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.baseline.alphabetic.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.baseline.alphabetic.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.bound.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.bound.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.fontface.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.negative.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.small.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.zero.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.unaffected.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.repeat.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.space.basic.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.space.basic.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.space.collapse.nonspace.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.space.collapse.nonspace.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.unaffected.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.unaffected.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.measure.width.basic.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.measure.width.basic.html"
       },
       {
-        "path": "2dcontext/drawing-text-to-the-canvas/2d.text.measure.width.empty.html",
         "url": "/2dcontext/drawing-text-to-the-canvas/2d.text.measure.width.empty.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.default.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.default.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.get.semitransparent.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.get.solid.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.get.solid.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.get.transparent.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.get.transparent.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.invalidstring.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.invalidstring.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.invalidtype.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.invalidtype.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.basic.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.basic.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.changed.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.changed.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.current.removed.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hex6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsl-clamp-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.hsla-clamp-6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.html4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.html4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex7.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex8.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsl-6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hsla-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.name-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-7.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-7.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-6.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-6.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-7.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-7.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-clamp-5.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-eof.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-num.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgb-percent.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-clamp-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-eof.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-num-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-percent.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.rgba-solid-4.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.svg-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.system.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.system.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.fillStyle.parse.transparent-2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.empty.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.empty.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.alpha.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colour.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colour.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.multiple.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.outside.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.outside.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.solid.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.solid.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.vertical.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fill.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillRect.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.fillText.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.stroke.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeRect.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.zerosize.strokeText.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.linear.nonfinite.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.linear.transform.1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.linear.transform.1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.linear.transform.2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.linear.transform.2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.linear.transform.3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.linear.transform.3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.compare.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.compare.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.crosscanvas.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.current.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.current.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.invalidcolour.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.invalidoffset.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.return.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.return.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.type.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.type.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.object.update.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.object.update.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.behind.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.beside.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.bottom.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.cylinder.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.front.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.front.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.shape2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.top.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.cone.top.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.equal.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.inside1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.inside1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.inside2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.inside2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.inside3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.inside3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.negative.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.negative.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.nonfinite.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.outside3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.touch3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.transform.1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.transform.1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.transform.2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.transform.2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.gradient.radial.transform.3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.gradient.radial.transform.3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.animated.gif.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.animated.gif.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.basic.canvas.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.basic.canvas.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.basic.image.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.basic.image.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.basic.nocontext.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.basic.nocontext.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.basic.type.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.basic.type.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.basic.zerocanvas.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.crosscanvas.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.crosscanvas.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.emptysrc.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.emptysrc.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.immediate.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.immediate.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.nosrc.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.nosrc.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.reload.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.reload.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.removedsrc.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.incomplete.removedsrc.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.null.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.null.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.string.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.string.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.image.undefined.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.image.undefined.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.modify.canvas1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.modify.canvas1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.modify.canvas2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.modify.canvas2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.modify.image1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.modify.image1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.modify.image2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.modify.image2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.orientation.canvas.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.coord2.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.coord3.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.case.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.case.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.empty.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.empty.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.null.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.null.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.nullsuffix.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.undefined.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.undefined.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.unrecognised.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.pattern.repeat.unrecognisednull.html"
       },
       {
-        "path": "2dcontext/fill-and-stroke-styles/2d.strokeStyle.default.html",
         "url": "/2dcontext/fill-and-stroke-styles/2d.strokeStyle.default.html"
       },
       {
-        "path": "2dcontext/hit-regions/addHitRegions-NotSupportedError-01.html",
         "url": "/2dcontext/hit-regions/addHitRegions-NotSupportedError-01.html"
       },
       {
-        "path": "2dcontext/hit-regions/hitregions-members-exist.html",
         "url": "/2dcontext/hit-regions/hitregions-members-exist.html"
       },
       {
-        "path": "2dcontext/image-smoothing/imagesmoothing.html",
         "url": "/2dcontext/image-smoothing/imagesmoothing.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.butt.html",
         "url": "/2dcontext/line-styles/2d.line.cap.butt.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.closed.html",
         "url": "/2dcontext/line-styles/2d.line.cap.closed.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.invalid.html",
         "url": "/2dcontext/line-styles/2d.line.cap.invalid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.open.html",
         "url": "/2dcontext/line-styles/2d.line.cap.open.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.round.html",
         "url": "/2dcontext/line-styles/2d.line.cap.round.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.square.html",
         "url": "/2dcontext/line-styles/2d.line.cap.square.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cap.valid.html",
         "url": "/2dcontext/line-styles/2d.line.cap.valid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.cross.html",
         "url": "/2dcontext/line-styles/2d.line.cross.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.defaults.html",
         "url": "/2dcontext/line-styles/2d.line.defaults.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.bevel.html",
         "url": "/2dcontext/line-styles/2d.line.join.bevel.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.closed.html",
         "url": "/2dcontext/line-styles/2d.line.join.closed.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.invalid.html",
         "url": "/2dcontext/line-styles/2d.line.join.invalid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.miter.html",
         "url": "/2dcontext/line-styles/2d.line.join.miter.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.open.html",
         "url": "/2dcontext/line-styles/2d.line.join.open.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.parallel.html",
         "url": "/2dcontext/line-styles/2d.line.join.parallel.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.round.html",
         "url": "/2dcontext/line-styles/2d.line.join.round.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.join.valid.html",
         "url": "/2dcontext/line-styles/2d.line.join.valid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.acute.html",
         "url": "/2dcontext/line-styles/2d.line.miter.acute.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.exceeded.html",
         "url": "/2dcontext/line-styles/2d.line.miter.exceeded.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.invalid.html",
         "url": "/2dcontext/line-styles/2d.line.miter.invalid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.lineedge.html",
         "url": "/2dcontext/line-styles/2d.line.miter.lineedge.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.obtuse.html",
         "url": "/2dcontext/line-styles/2d.line.miter.obtuse.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.rightangle.html",
         "url": "/2dcontext/line-styles/2d.line.miter.rightangle.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.valid.html",
         "url": "/2dcontext/line-styles/2d.line.miter.valid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.miter.within.html",
         "url": "/2dcontext/line-styles/2d.line.miter.within.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.union.html",
         "url": "/2dcontext/line-styles/2d.line.union.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.width.basic.html",
         "url": "/2dcontext/line-styles/2d.line.width.basic.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.width.invalid.html",
         "url": "/2dcontext/line-styles/2d.line.width.invalid.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.width.scaledefault.html",
         "url": "/2dcontext/line-styles/2d.line.width.scaledefault.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.width.transformed.html",
         "url": "/2dcontext/line-styles/2d.line.width.transformed.html"
       },
       {
-        "path": "2dcontext/line-styles/2d.line.width.valid.html",
         "url": "/2dcontext/line-styles/2d.line.width.valid.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.angle.1.html",
         "url": "/2dcontext/path-objects/2d.path.arc.angle.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.angle.2.html",
         "url": "/2dcontext/path-objects/2d.path.arc.angle.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.angle.3.html",
         "url": "/2dcontext/path-objects/2d.path.arc.angle.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.angle.4.html",
         "url": "/2dcontext/path-objects/2d.path.arc.angle.4.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.angle.5.html",
         "url": "/2dcontext/path-objects/2d.path.arc.angle.5.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.angle.6.html",
         "url": "/2dcontext/path-objects/2d.path.arc.angle.6.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.default.html",
         "url": "/2dcontext/path-objects/2d.path.arc.default.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.empty.html",
         "url": "/2dcontext/path-objects/2d.path.arc.empty.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.end.html",
         "url": "/2dcontext/path-objects/2d.path.arc.end.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.negative.html",
         "url": "/2dcontext/path-objects/2d.path.arc.negative.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.nonempty.html",
         "url": "/2dcontext/path-objects/2d.path.arc.nonempty.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.arc.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.scale.1.html",
         "url": "/2dcontext/path-objects/2d.path.arc.scale.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.scale.2.html",
         "url": "/2dcontext/path-objects/2d.path.arc.scale.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.selfintersect.1.html",
         "url": "/2dcontext/path-objects/2d.path.arc.selfintersect.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.selfintersect.2.html",
         "url": "/2dcontext/path-objects/2d.path.arc.selfintersect.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.shape.1.html",
         "url": "/2dcontext/path-objects/2d.path.arc.shape.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.shape.2.html",
         "url": "/2dcontext/path-objects/2d.path.arc.shape.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.shape.3.html",
         "url": "/2dcontext/path-objects/2d.path.arc.shape.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.shape.4.html",
         "url": "/2dcontext/path-objects/2d.path.arc.shape.4.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.shape.5.html",
         "url": "/2dcontext/path-objects/2d.path.arc.shape.5.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.twopie.1.html",
         "url": "/2dcontext/path-objects/2d.path.arc.twopie.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.twopie.2.html",
         "url": "/2dcontext/path-objects/2d.path.arc.twopie.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.twopie.3.html",
         "url": "/2dcontext/path-objects/2d.path.arc.twopie.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.twopie.4.html",
         "url": "/2dcontext/path-objects/2d.path.arc.twopie.4.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.zero.1.html",
         "url": "/2dcontext/path-objects/2d.path.arc.zero.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.zero.2.html",
         "url": "/2dcontext/path-objects/2d.path.arc.zero.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arc.zeroradius.html",
         "url": "/2dcontext/path-objects/2d.path.arc.zeroradius.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.coincide.1.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.coincide.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.coincide.2.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.coincide.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.collinear.1.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.collinear.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.collinear.2.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.collinear.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.collinear.3.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.collinear.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.ensuresubpath.1.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.ensuresubpath.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.ensuresubpath.2.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.ensuresubpath.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.negative.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.negative.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.scale.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.scale.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.shape.curve1.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.shape.curve1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.shape.curve2.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.shape.curve2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.shape.end.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.shape.end.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.shape.start.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.shape.start.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.transformation.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.transformation.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.zero.1.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.zero.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.arcTo.zero.2.html",
         "url": "/2dcontext/path-objects/2d.path.arcTo.zero.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.beginPath.html",
         "url": "/2dcontext/path-objects/2d.path.beginPath.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.bezierCurveTo.basic.html",
         "url": "/2dcontext/path-objects/2d.path.bezierCurveTo.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html",
         "url": "/2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html",
         "url": "/2dcontext/path-objects/2d.path.bezierCurveTo.ensuresubpath.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.bezierCurveTo.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.bezierCurveTo.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.bezierCurveTo.scaled.html",
         "url": "/2dcontext/path-objects/2d.path.bezierCurveTo.scaled.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.bezierCurveTo.shape.html",
         "url": "/2dcontext/path-objects/2d.path.bezierCurveTo.shape.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.basic.1.html",
         "url": "/2dcontext/path-objects/2d.path.clip.basic.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.basic.2.html",
         "url": "/2dcontext/path-objects/2d.path.clip.basic.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.empty.html",
         "url": "/2dcontext/path-objects/2d.path.clip.empty.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.intersect.html",
         "url": "/2dcontext/path-objects/2d.path.clip.intersect.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.unaffected.html",
         "url": "/2dcontext/path-objects/2d.path.clip.unaffected.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.winding.1.html",
         "url": "/2dcontext/path-objects/2d.path.clip.winding.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.clip.winding.2.html",
         "url": "/2dcontext/path-objects/2d.path.clip.winding.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.closePath.empty.html",
         "url": "/2dcontext/path-objects/2d.path.closePath.empty.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.closePath.newline.html",
         "url": "/2dcontext/path-objects/2d.path.closePath.newline.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.closePath.nextpoint.html",
         "url": "/2dcontext/path-objects/2d.path.closePath.nextpoint.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.closed.basic.html",
         "url": "/2dcontext/path-objects/2d.path.fill.closed.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.closed.unaffected.html",
         "url": "/2dcontext/path-objects/2d.path.fill.closed.unaffected.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.overlap.html",
         "url": "/2dcontext/path-objects/2d.path.fill.overlap.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.winding.add.html",
         "url": "/2dcontext/path-objects/2d.path.fill.winding.add.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.winding.subtract.1.html",
         "url": "/2dcontext/path-objects/2d.path.fill.winding.subtract.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.winding.subtract.2.html",
         "url": "/2dcontext/path-objects/2d.path.fill.winding.subtract.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.fill.winding.subtract.3.html",
         "url": "/2dcontext/path-objects/2d.path.fill.winding.subtract.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.initial.html",
         "url": "/2dcontext/path-objects/2d.path.initial.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.arc.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.arc.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.basic.1.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.basic.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.basic.2.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.basic.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.bezier.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.bezier.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.bigarc.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.bigarc.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.edge.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.edge.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.empty.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.empty.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.outside.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.outside.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.subpath.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.subpath.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.transform.1.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.transform.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.transform.2.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.transform.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.transform.3.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.transform.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.transform.4.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.transform.4.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.unclosed.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.unclosed.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.isPointInPath.winding.html",
         "url": "/2dcontext/path-objects/2d.path.isPointInPath.winding.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.lineTo.basic.html",
         "url": "/2dcontext/path-objects/2d.path.lineTo.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.lineTo.ensuresubpath.1.html",
         "url": "/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.lineTo.ensuresubpath.2.html",
         "url": "/2dcontext/path-objects/2d.path.lineTo.ensuresubpath.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.lineTo.nextpoint.html",
         "url": "/2dcontext/path-objects/2d.path.lineTo.nextpoint.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.lineTo.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.lineTo.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.moveTo.basic.html",
         "url": "/2dcontext/path-objects/2d.path.moveTo.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.moveTo.multiple.html",
         "url": "/2dcontext/path-objects/2d.path.moveTo.multiple.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.moveTo.newsubpath.html",
         "url": "/2dcontext/path-objects/2d.path.moveTo.newsubpath.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.moveTo.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.moveTo.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.quadraticCurveTo.basic.html",
         "url": "/2dcontext/path-objects/2d.path.quadraticCurveTo.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html",
         "url": "/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html",
         "url": "/2dcontext/path-objects/2d.path.quadraticCurveTo.ensuresubpath.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.quadraticCurveTo.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.quadraticCurveTo.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.quadraticCurveTo.scaled.html",
         "url": "/2dcontext/path-objects/2d.path.quadraticCurveTo.scaled.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.quadraticCurveTo.shape.html",
         "url": "/2dcontext/path-objects/2d.path.quadraticCurveTo.shape.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.basic.html",
         "url": "/2dcontext/path-objects/2d.path.rect.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.closed.html",
         "url": "/2dcontext/path-objects/2d.path.rect.closed.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.end.1.html",
         "url": "/2dcontext/path-objects/2d.path.rect.end.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.end.2.html",
         "url": "/2dcontext/path-objects/2d.path.rect.end.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.negative.html",
         "url": "/2dcontext/path-objects/2d.path.rect.negative.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.newsubpath.html",
         "url": "/2dcontext/path-objects/2d.path.rect.newsubpath.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.nonfinite.html",
         "url": "/2dcontext/path-objects/2d.path.rect.nonfinite.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.selfintersect.html",
         "url": "/2dcontext/path-objects/2d.path.rect.selfintersect.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.winding.html",
         "url": "/2dcontext/path-objects/2d.path.rect.winding.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.zero.1.html",
         "url": "/2dcontext/path-objects/2d.path.rect.zero.1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.zero.2.html",
         "url": "/2dcontext/path-objects/2d.path.rect.zero.2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.zero.3.html",
         "url": "/2dcontext/path-objects/2d.path.rect.zero.3.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.zero.4.html",
         "url": "/2dcontext/path-objects/2d.path.rect.zero.4.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.zero.5.html",
         "url": "/2dcontext/path-objects/2d.path.rect.zero.5.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.rect.zero.6.html",
         "url": "/2dcontext/path-objects/2d.path.rect.zero.6.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.empty.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.empty.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.overlap.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.overlap.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.prune.arc.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.prune.arc.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.prune.closed.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.prune.closed.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.prune.corner.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.prune.corner.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.prune.curve.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.prune.curve.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.prune.line.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.prune.line.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.prune.rect.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.prune.rect.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.scale1.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.scale1.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.scale2.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.scale2.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.skew.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.skew.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.unaffected.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.unaffected.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.stroke.union.html",
         "url": "/2dcontext/path-objects/2d.path.stroke.union.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.transformation.basic.html",
         "url": "/2dcontext/path-objects/2d.path.transformation.basic.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.transformation.changing.html",
         "url": "/2dcontext/path-objects/2d.path.transformation.changing.html"
       },
       {
-        "path": "2dcontext/path-objects/2d.path.transformation.multiple.html",
         "url": "/2dcontext/path-objects/2d.path.transformation.multiple.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create1.basic.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create1.basic.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create1.initial.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create1.initial.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create1.this.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create1.this.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create1.type.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create1.type.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create1.zero.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create1.zero.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.basic.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.basic.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.initial.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.initial.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.large.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.large.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.negative.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.negative.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.nonfinite.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.nonfinite.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.round.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.round.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.this.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.this.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.tiny.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.tiny.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.type.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.type.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.create2.zero.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.create2.zero.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.basic.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.basic.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.clamp.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.clamp.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.length.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.length.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.nonfinite.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.nonfinite.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.nonpremul.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.nonpremul.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.order.alpha.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.order.alpha.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.order.cols.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.order.cols.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.order.rgb.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.order.rgb.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.order.rows.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.order.rows.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.range.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.range.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.source.negative.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.source.negative.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.source.outside.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.source.outside.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.source.size.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.source.size.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.tiny.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.tiny.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.type.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.type.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.unaffected.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.unaffected.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.get.zero.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.get.zero.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.clamp.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.clamp.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.ctor.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.ctor.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.nan.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.nan.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.properties.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.properties.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.readonly.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.readonly.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.round.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.round.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.set.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.set.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.string.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.string.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.object.undefined.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.object.undefined.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.alpha.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.alpha.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.basic.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.basic.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.clip.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.clip.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.created.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.created.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.cross.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.cross.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.dirty.negative.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.dirty.negative.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.dirty.outside.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.dirty.outside.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.dirty.rect1.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.dirty.rect1.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.dirty.rect2.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.dirty.rect2.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.dirty.zero.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.dirty.zero.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.modified.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.modified.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.nonfinite.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.nonfinite.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.null.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.null.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.path.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.path.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.unaffected.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.unaffected.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.unchanged.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.unchanged.html"
       },
       {
-        "path": "2dcontext/pixel-manipulation/2d.imageData.put.wrongtype.html",
         "url": "/2dcontext/pixel-manipulation/2d.imageData.put.wrongtype.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.1.html",
         "url": "/2dcontext/shadows/2d.shadow.alpha.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.2.html",
         "url": "/2dcontext/shadows/2d.shadow.alpha.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.3.html",
         "url": "/2dcontext/shadows/2d.shadow.alpha.3.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.4.html",
         "url": "/2dcontext/shadows/2d.shadow.alpha.4.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.alpha.5.html",
         "url": "/2dcontext/shadows/2d.shadow.alpha.5.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowBlur.initial.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowBlur.initial.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowBlur.invalid.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowBlur.invalid.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowBlur.valid.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowBlur.valid.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowColor.initial.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowColor.initial.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowColor.invalid.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowColor.invalid.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowColor.valid.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowColor.valid.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowOffset.initial.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowOffset.initial.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowOffset.invalid.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowOffset.invalid.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.attributes.shadowOffset.valid.html",
         "url": "/2dcontext/shadows/2d.shadow.attributes.shadowOffset.valid.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.canvas.alpha.html",
         "url": "/2dcontext/shadows/2d.shadow.canvas.alpha.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.canvas.basic.html",
         "url": "/2dcontext/shadows/2d.shadow.canvas.basic.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.canvas.transparent.1.html",
         "url": "/2dcontext/shadows/2d.shadow.canvas.transparent.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.canvas.transparent.2.html",
         "url": "/2dcontext/shadows/2d.shadow.canvas.transparent.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.clip.1.html",
         "url": "/2dcontext/shadows/2d.shadow.clip.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.clip.2.html",
         "url": "/2dcontext/shadows/2d.shadow.clip.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.clip.3.html",
         "url": "/2dcontext/shadows/2d.shadow.clip.3.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.composite.1.html",
         "url": "/2dcontext/shadows/2d.shadow.composite.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.composite.2.html",
         "url": "/2dcontext/shadows/2d.shadow.composite.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.composite.3.html",
         "url": "/2dcontext/shadows/2d.shadow.composite.3.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.enable.blur.html",
         "url": "/2dcontext/shadows/2d.shadow.enable.blur.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.enable.off.1.html",
         "url": "/2dcontext/shadows/2d.shadow.enable.off.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.enable.off.2.html",
         "url": "/2dcontext/shadows/2d.shadow.enable.off.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.enable.x.html",
         "url": "/2dcontext/shadows/2d.shadow.enable.x.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.enable.y.html",
         "url": "/2dcontext/shadows/2d.shadow.enable.y.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.gradient.alpha.html",
         "url": "/2dcontext/shadows/2d.shadow.gradient.alpha.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.gradient.basic.html",
         "url": "/2dcontext/shadows/2d.shadow.gradient.basic.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.gradient.transparent.1.html",
         "url": "/2dcontext/shadows/2d.shadow.gradient.transparent.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.gradient.transparent.2.html",
         "url": "/2dcontext/shadows/2d.shadow.gradient.transparent.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.alpha.html",
         "url": "/2dcontext/shadows/2d.shadow.image.alpha.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.basic.html",
         "url": "/2dcontext/shadows/2d.shadow.image.basic.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.scale.html",
         "url": "/2dcontext/shadows/2d.shadow.image.scale.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.section.html",
         "url": "/2dcontext/shadows/2d.shadow.image.section.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.transparent.1.html",
         "url": "/2dcontext/shadows/2d.shadow.image.transparent.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.image.transparent.2.html",
         "url": "/2dcontext/shadows/2d.shadow.image.transparent.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.offset.negativeX.html",
         "url": "/2dcontext/shadows/2d.shadow.offset.negativeX.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.offset.negativeY.html",
         "url": "/2dcontext/shadows/2d.shadow.offset.negativeY.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.offset.positiveX.html",
         "url": "/2dcontext/shadows/2d.shadow.offset.positiveX.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.offset.positiveY.html",
         "url": "/2dcontext/shadows/2d.shadow.offset.positiveY.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.outside.html",
         "url": "/2dcontext/shadows/2d.shadow.outside.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.pattern.alpha.html",
         "url": "/2dcontext/shadows/2d.shadow.pattern.alpha.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.pattern.basic.html",
         "url": "/2dcontext/shadows/2d.shadow.pattern.basic.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.pattern.transparent.1.html",
         "url": "/2dcontext/shadows/2d.shadow.pattern.transparent.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.pattern.transparent.2.html",
         "url": "/2dcontext/shadows/2d.shadow.pattern.transparent.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.stroke.basic.html",
         "url": "/2dcontext/shadows/2d.shadow.stroke.basic.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.stroke.cap.1.html",
         "url": "/2dcontext/shadows/2d.shadow.stroke.cap.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.stroke.cap.2.html",
         "url": "/2dcontext/shadows/2d.shadow.stroke.cap.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.stroke.join.1.html",
         "url": "/2dcontext/shadows/2d.shadow.stroke.join.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.stroke.join.2.html",
         "url": "/2dcontext/shadows/2d.shadow.stroke.join.2.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.stroke.join.3.html",
         "url": "/2dcontext/shadows/2d.shadow.stroke.join.3.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.transform.1.html",
         "url": "/2dcontext/shadows/2d.shadow.transform.1.html"
       },
       {
-        "path": "2dcontext/shadows/2d.shadow.transform.2.html",
         "url": "/2dcontext/shadows/2d.shadow.transform.2.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.align.default.html",
         "url": "/2dcontext/text-styles/2d.text.align.default.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.align.invalid.html",
         "url": "/2dcontext/text-styles/2d.text.align.invalid.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.align.valid.html",
         "url": "/2dcontext/text-styles/2d.text.align.valid.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.baseline.default.html",
         "url": "/2dcontext/text-styles/2d.text.baseline.default.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.baseline.invalid.html",
         "url": "/2dcontext/text-styles/2d.text.baseline.invalid.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.baseline.valid.html",
         "url": "/2dcontext/text-styles/2d.text.baseline.valid.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.baseline.bottom.html",
         "url": "/2dcontext/text-styles/2d.text.draw.baseline.bottom.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.baseline.hanging.html",
         "url": "/2dcontext/text-styles/2d.text.draw.baseline.hanging.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.baseline.ideographic.html",
         "url": "/2dcontext/text-styles/2d.text.draw.baseline.ideographic.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.baseline.middle.html",
         "url": "/2dcontext/text-styles/2d.text.draw.baseline.middle.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.baseline.top.html",
         "url": "/2dcontext/text-styles/2d.text.draw.baseline.top.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.space.collapse.end.html",
         "url": "/2dcontext/text-styles/2d.text.draw.space.collapse.end.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.space.collapse.other.html",
         "url": "/2dcontext/text-styles/2d.text.draw.space.collapse.other.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.space.collapse.space.html",
         "url": "/2dcontext/text-styles/2d.text.draw.space.collapse.space.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.draw.space.collapse.start.html",
         "url": "/2dcontext/text-styles/2d.text.draw.space.collapse.start.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.default.html",
         "url": "/2dcontext/text-styles/2d.text.font.default.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.parse.basic.html",
         "url": "/2dcontext/text-styles/2d.text.font.parse.basic.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.parse.complex.html",
         "url": "/2dcontext/text-styles/2d.text.font.parse.complex.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.parse.invalid.html",
         "url": "/2dcontext/text-styles/2d.text.font.parse.invalid.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.parse.size.percentage.default.html",
         "url": "/2dcontext/text-styles/2d.text.font.parse.size.percentage.default.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.parse.size.percentage.html",
         "url": "/2dcontext/text-styles/2d.text.font.parse.size.percentage.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.font.parse.system.html",
         "url": "/2dcontext/text-styles/2d.text.font.parse.system.html"
       },
       {
-        "path": "2dcontext/text-styles/2d.text.measure.width.space.html",
         "url": "/2dcontext/text-styles/2d.text.measure.width.space.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.bitmap.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.bitmap.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.clip.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.clip.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.fillStyle.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.fillStyle.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.font.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.font.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.globalAlpha.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.globalAlpha.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.lineCap.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.lineCap.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.lineJoin.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.lineJoin.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.lineWidth.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.lineWidth.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.miterLimit.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.miterLimit.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.path.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.path.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.shadowBlur.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.shadowBlur.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.shadowColor.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.shadowColor.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.shadowOffsetX.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.shadowOffsetX.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.shadowOffsetY.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.shadowOffsetY.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.stack.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.stack.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.stackdepth.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.stackdepth.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.strokeStyle.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.strokeStyle.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.textAlign.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.textAlign.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.textBaseline.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.textBaseline.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.transformation.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.transformation.html"
       },
       {
-        "path": "2dcontext/the-canvas-state/2d.state.saverestore.underflow.html",
         "url": "/2dcontext/the-canvas-state/2d.state.saverestore.underflow.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.order.html",
         "url": "/2dcontext/transformations/2d.transformation.order.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.rotate.direction.html",
         "url": "/2dcontext/transformations/2d.transformation.rotate.direction.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.rotate.nonfinite.html",
         "url": "/2dcontext/transformations/2d.transformation.rotate.nonfinite.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.rotate.radians.html",
         "url": "/2dcontext/transformations/2d.transformation.rotate.radians.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.rotate.wrap.html",
         "url": "/2dcontext/transformations/2d.transformation.rotate.wrap.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.rotate.wrapnegative.html",
         "url": "/2dcontext/transformations/2d.transformation.rotate.wrapnegative.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.rotate.zero.html",
         "url": "/2dcontext/transformations/2d.transformation.rotate.zero.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.scale.basic.html",
         "url": "/2dcontext/transformations/2d.transformation.scale.basic.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.scale.large.html",
         "url": "/2dcontext/transformations/2d.transformation.scale.large.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.scale.multiple.html",
         "url": "/2dcontext/transformations/2d.transformation.scale.multiple.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.scale.negative.html",
         "url": "/2dcontext/transformations/2d.transformation.scale.negative.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.scale.nonfinite.html",
         "url": "/2dcontext/transformations/2d.transformation.scale.nonfinite.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.scale.zero.html",
         "url": "/2dcontext/transformations/2d.transformation.scale.zero.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.setTransform.multiple.html",
         "url": "/2dcontext/transformations/2d.transformation.setTransform.multiple.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.setTransform.nonfinite.html",
         "url": "/2dcontext/transformations/2d.transformation.setTransform.nonfinite.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.setTransform.skewed.html",
         "url": "/2dcontext/transformations/2d.transformation.setTransform.skewed.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.transform.identity.html",
         "url": "/2dcontext/transformations/2d.transformation.transform.identity.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.transform.multiply.html",
         "url": "/2dcontext/transformations/2d.transformation.transform.multiply.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.transform.nonfinite.html",
         "url": "/2dcontext/transformations/2d.transformation.transform.nonfinite.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.transform.skewed.html",
         "url": "/2dcontext/transformations/2d.transformation.transform.skewed.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.translate.basic.html",
         "url": "/2dcontext/transformations/2d.transformation.translate.basic.html"
       },
       {
-        "path": "2dcontext/transformations/2d.transformation.translate.nonfinite.html",
         "url": "/2dcontext/transformations/2d.transformation.translate.nonfinite.html"
       },
       {
-        "path": "DOMEvents/ClickFakeEvent.nondocument.html",
         "url": "/DOMEvents/ClickFakeEvent.nondocument.html"
       },
       {
-        "path": "DOMEvents/event-phases-order.html",
         "url": "/DOMEvents/event-phases-order.html"
       },
       {
-        "path": "DOMEvents/tests/approved/DOM.event.flow.html",
         "url": "/DOMEvents/tests/approved/DOM.event.flow.html"
       },
       {
-        "path": "DOMEvents/tests/approved/Determined.candidate.EventListeners.html",
         "url": "/DOMEvents/tests/approved/Determined.candidate.EventListeners.html"
       },
       {
-        "path": "DOMEvents/tests/approved/Event.bubbles.false.html",
         "url": "/DOMEvents/tests/approved/Event.bubbles.false.html"
       },
       {
-        "path": "DOMEvents/tests/approved/EventListener.dispatch.new.event.html",
         "url": "/DOMEvents/tests/approved/EventListener.dispatch.new.event.html"
       },
       {
-        "path": "DOMEvents/tests/approved/EventListener.eventHandler.html",
         "url": "/DOMEvents/tests/approved/EventListener.eventHandler.html"
       },
       {
-        "path": "DOMEvents/tests/approved/EventObject.after.dispatchEvent.html",
         "url": "/DOMEvents/tests/approved/EventObject.after.dispatchEvent.html"
       },
       {
-        "path": "DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html",
         "url": "/DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html"
       },
       {
-        "path": "DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html",
         "url": "/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html"
       },
       {
-        "path": "DOMEvents/tests/approved/Propagation.path.target.moved.html",
         "url": "/DOMEvents/tests/approved/Propagation.path.target.moved.html"
       },
       {
-        "path": "DOMEvents/tests/approved/Propagation.path.target.removed.html",
         "url": "/DOMEvents/tests/approved/Propagation.path.target.removed.html"
       },
       {
-        "path": "DOMEvents/tests/approved/addEventListener.optional.useCapture.html",
         "url": "/DOMEvents/tests/approved/addEventListener.optional.useCapture.html"
       },
       {
-        "path": "DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html",
-        "url": "/DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html"
-      },
-      {
-        "path": "DOMEvents/tests/approved/dispatchEvent.click.checkbox.html",
         "url": "/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html"
       },
       {
-        "path": "DOMEvents/tests/approved/dispatchEvent.return.value.html",
         "url": "/DOMEvents/tests/approved/dispatchEvent.return.value.html"
       },
       {
-        "path": "DOMEvents/tests/approved/domnodeinserted.html",
         "url": "/DOMEvents/tests/approved/domnodeinserted.html"
       },
       {
-        "path": "DOMEvents/tests/approved/stopImmediatePropagation.effect.html",
         "url": "/DOMEvents/tests/approved/stopImmediatePropagation.effect.html"
       },
       {
-        "path": "DOMEvents/tests/approved/stopPropagation.deferred.effect.html",
         "url": "/DOMEvents/tests/approved/stopPropagation.deferred.effect.html"
       },
       {
-        "path": "DOMEvents/tests/approved/stopPropagation.dispatchEvent.html",
         "url": "/DOMEvents/tests/approved/stopPropagation.dispatchEvent.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/Event.bubbles.false.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/Event.bubbles.false.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html",
-        "url": "/DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html"
-      },
-      {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html"
       },
       {
-        "path": "DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.dispatchEvent.html",
         "url": "/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.dispatchEvent.html"
       },
       {
-        "path": "DOMEvents/throwing-in-listener-and-window-error-event.html",
         "url": "/DOMEvents/throwing-in-listener-and-window-error-event.html"
       },
       {
-        "path": "DOMEvents/throwing-in-listener-when-all-have-not-run-yet.html",
         "url": "/DOMEvents/throwing-in-listener-when-all-have-not-run-yet.html"
       },
       {
-        "path": "FileAPI/Blob-XHR-revoke.html",
         "url": "/FileAPI/Blob-XHR-revoke.html"
       },
       {
-        "path": "FileAPI/Blob-close.html",
         "url": "/FileAPI/Blob-close.html"
       },
       {
-        "path": "FileAPI/Blob-constructor.html",
         "url": "/FileAPI/Blob-constructor.html"
       },
       {
-        "path": "FileAPI/Blob-slice.html",
         "url": "/FileAPI/Blob-slice.html"
       },
       {
-        "path": "FileAPI/File-constructor.html",
         "url": "/FileAPI/File-constructor.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_abort.html",
         "url": "/FileAPI/FileReader-interface/filereader_abort.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_error.html",
         "url": "/FileAPI/FileReader-interface/filereader_error.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_readAsArrayBuffer.html",
         "url": "/FileAPI/FileReader-interface/filereader_readAsArrayBuffer.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_readAsDataURL.html",
         "url": "/FileAPI/FileReader-interface/filereader_readAsDataURL.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_readAsText.html",
         "url": "/FileAPI/FileReader-interface/filereader_readAsText.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_readystate.html",
         "url": "/FileAPI/FileReader-interface/filereader_readystate.html"
       },
       {
-        "path": "FileAPI/FileReader-interface/filereader_result.html",
         "url": "/FileAPI/FileReader-interface/filereader_result.html"
       },
       {
-        "path": "FileAPI/FileReader/Determining-Encoding.html",
         "url": "/FileAPI/FileReader/Determining-Encoding.html"
       },
       {
-        "path": "FileAPI/filelist-section/filelist.html",
         "url": "/FileAPI/filelist-section/filelist.html"
       },
       {
-        "path": "FileAPI/historical.html",
         "url": "/FileAPI/historical.html"
       },
       {
-        "path": "FileAPI/idlharness.html",
         "url": "/FileAPI/idlharness.html"
       },
       {
-        "path": "IndexedDB/abort-in-initial-upgradeneeded.html",
         "url": "/IndexedDB/abort-in-initial-upgradeneeded.html"
       },
       {
-        "path": "IndexedDB/close-in-upgradeneeded.html",
         "url": "/IndexedDB/close-in-upgradeneeded.html"
       },
       {
-        "path": "IndexedDB/cursor-overloads.htm",
         "url": "/IndexedDB/cursor-overloads.htm"
       },
       {
-        "path": "IndexedDB/idb_webworkers.htm",
         "url": "/IndexedDB/idb_webworkers.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-advance-continue-async.htm",
         "url": "/IndexedDB/idbcursor-advance-continue-async.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-advance-invalid.htm",
         "url": "/IndexedDB/idbcursor-advance-invalid.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-advance.htm",
         "url": "/IndexedDB/idbcursor-advance.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-continue.htm",
         "url": "/IndexedDB/idbcursor-continue.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-direction-index-keyrange.htm",
         "url": "/IndexedDB/idbcursor-direction-index-keyrange.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-direction-index.htm",
         "url": "/IndexedDB/idbcursor-direction-index.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-direction-objectstore-keyrange.htm",
         "url": "/IndexedDB/idbcursor-direction-objectstore-keyrange.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-direction-objectstore.htm",
         "url": "/IndexedDB/idbcursor-direction-objectstore.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-direction.htm",
         "url": "/IndexedDB/idbcursor-direction.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-key.htm",
         "url": "/IndexedDB/idbcursor-key.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-primarykey.htm",
         "url": "/IndexedDB/idbcursor-primarykey.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-reused.htm",
         "url": "/IndexedDB/idbcursor-reused.htm"
       },
       {
-        "path": "IndexedDB/idbcursor-source.htm",
         "url": "/IndexedDB/idbcursor-source.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index.htm",
         "url": "/IndexedDB/idbcursor_advance_index.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index2.htm",
         "url": "/IndexedDB/idbcursor_advance_index2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index3.htm",
         "url": "/IndexedDB/idbcursor_advance_index3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index5.htm",
         "url": "/IndexedDB/idbcursor_advance_index5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index6.htm",
         "url": "/IndexedDB/idbcursor_advance_index6.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index7.htm",
         "url": "/IndexedDB/idbcursor_advance_index7.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index8.htm",
         "url": "/IndexedDB/idbcursor_advance_index8.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_index9.htm",
         "url": "/IndexedDB/idbcursor_advance_index9.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_objectstore.htm",
         "url": "/IndexedDB/idbcursor_advance_objectstore.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_objectstore2.htm",
         "url": "/IndexedDB/idbcursor_advance_objectstore2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_objectstore3.htm",
         "url": "/IndexedDB/idbcursor_advance_objectstore3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_objectstore4.htm",
         "url": "/IndexedDB/idbcursor_advance_objectstore4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_advance_objectstore5.htm",
         "url": "/IndexedDB/idbcursor_advance_objectstore5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index.htm",
         "url": "/IndexedDB/idbcursor_continue_index.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index2.htm",
         "url": "/IndexedDB/idbcursor_continue_index2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index3.htm",
         "url": "/IndexedDB/idbcursor_continue_index3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index4.htm",
         "url": "/IndexedDB/idbcursor_continue_index4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index5.htm",
         "url": "/IndexedDB/idbcursor_continue_index5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index6.htm",
         "url": "/IndexedDB/idbcursor_continue_index6.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index7.htm",
         "url": "/IndexedDB/idbcursor_continue_index7.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_index8.htm",
         "url": "/IndexedDB/idbcursor_continue_index8.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_invalid.htm",
         "url": "/IndexedDB/idbcursor_continue_invalid.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_objectstore.htm",
         "url": "/IndexedDB/idbcursor_continue_objectstore.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_objectstore2.htm",
         "url": "/IndexedDB/idbcursor_continue_objectstore2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_objectstore3.htm",
         "url": "/IndexedDB/idbcursor_continue_objectstore3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_objectstore4.htm",
         "url": "/IndexedDB/idbcursor_continue_objectstore4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_objectstore5.htm",
         "url": "/IndexedDB/idbcursor_continue_objectstore5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_continue_objectstore6.htm",
         "url": "/IndexedDB/idbcursor_continue_objectstore6.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_index.htm",
         "url": "/IndexedDB/idbcursor_delete_index.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_index2.htm",
         "url": "/IndexedDB/idbcursor_delete_index2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_index3.htm",
         "url": "/IndexedDB/idbcursor_delete_index3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_index4.htm",
         "url": "/IndexedDB/idbcursor_delete_index4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_index5.htm",
         "url": "/IndexedDB/idbcursor_delete_index5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_objectstore.htm",
         "url": "/IndexedDB/idbcursor_delete_objectstore.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_objectstore2.htm",
         "url": "/IndexedDB/idbcursor_delete_objectstore2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_objectstore3.htm",
         "url": "/IndexedDB/idbcursor_delete_objectstore3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_objectstore4.htm",
         "url": "/IndexedDB/idbcursor_delete_objectstore4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_delete_objectstore5.htm",
         "url": "/IndexedDB/idbcursor_delete_objectstore5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_iterating.htm",
         "url": "/IndexedDB/idbcursor_iterating.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_iterating_index.htm",
         "url": "/IndexedDB/idbcursor_iterating_index.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_iterating_index2.htm",
         "url": "/IndexedDB/idbcursor_iterating_index2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_iterating_objectstore.htm",
         "url": "/IndexedDB/idbcursor_iterating_objectstore.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_iterating_objectstore2.htm",
         "url": "/IndexedDB/idbcursor_iterating_objectstore2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index.htm",
         "url": "/IndexedDB/idbcursor_update_index.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index2.htm",
         "url": "/IndexedDB/idbcursor_update_index2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index3.htm",
         "url": "/IndexedDB/idbcursor_update_index3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index4.htm",
         "url": "/IndexedDB/idbcursor_update_index4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index5.htm",
         "url": "/IndexedDB/idbcursor_update_index5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index6.htm",
         "url": "/IndexedDB/idbcursor_update_index6.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_index7.htm",
         "url": "/IndexedDB/idbcursor_update_index7.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore2.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore2.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore3.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore3.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore4.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore4.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore5.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore5.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore6.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore6.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore7.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore7.htm"
       },
       {
-        "path": "IndexedDB/idbcursor_update_objectstore8.htm",
         "url": "/IndexedDB/idbcursor_update_objectstore8.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_close.htm",
         "url": "/IndexedDB/idbdatabase_close.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_close2.htm",
         "url": "/IndexedDB/idbdatabase_close2.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore-createIndex-emptyname.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore-createIndex-emptyname.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore10-1000ends.htm",
-        "timeout": "long",
-        "url": "/IndexedDB/idbdatabase_createObjectStore10-1000ends.htm"
-      },
-      {
-        "path": "IndexedDB/idbdatabase_createObjectStore10-emptyname.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore10-emptyname.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore11.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore11.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore2.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore2.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore3.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore3.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore4.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore4.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore5.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore5.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore6.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore6.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore7.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore7.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore8-parameters.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore8-parameters.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_createObjectStore9-invalidparameters.htm",
         "url": "/IndexedDB/idbdatabase_createObjectStore9-invalidparameters.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_deleteObjectStore.htm",
         "url": "/IndexedDB/idbdatabase_deleteObjectStore.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_deleteObjectStore2.htm",
         "url": "/IndexedDB/idbdatabase_deleteObjectStore2.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_deleteObjectStore3.htm",
         "url": "/IndexedDB/idbdatabase_deleteObjectStore3.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_deleteObjectStore4-not_reused.htm",
         "url": "/IndexedDB/idbdatabase_deleteObjectStore4-not_reused.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_transaction.htm",
         "url": "/IndexedDB/idbdatabase_transaction.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_transaction2.htm",
         "url": "/IndexedDB/idbdatabase_transaction2.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_transaction3.htm",
         "url": "/IndexedDB/idbdatabase_transaction3.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_transaction4.htm",
         "url": "/IndexedDB/idbdatabase_transaction4.htm"
       },
       {
-        "path": "IndexedDB/idbdatabase_transaction5.htm",
         "url": "/IndexedDB/idbdatabase_transaction5.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_cmp.htm",
         "url": "/IndexedDB/idbfactory_cmp.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_cmp2.htm",
         "url": "/IndexedDB/idbfactory_cmp2.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_deleteDatabase.htm",
         "url": "/IndexedDB/idbfactory_deleteDatabase.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_deleteDatabase2.htm",
         "url": "/IndexedDB/idbfactory_deleteDatabase2.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_deleteDatabase3.htm",
         "url": "/IndexedDB/idbfactory_deleteDatabase3.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_deleteDatabase4.htm",
         "url": "/IndexedDB/idbfactory_deleteDatabase4.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open.htm",
         "url": "/IndexedDB/idbfactory_open.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open10.htm",
         "url": "/IndexedDB/idbfactory_open10.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open11.htm",
         "url": "/IndexedDB/idbfactory_open11.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open12.htm",
         "url": "/IndexedDB/idbfactory_open12.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open2.htm",
         "url": "/IndexedDB/idbfactory_open2.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open3.htm",
         "url": "/IndexedDB/idbfactory_open3.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open4.htm",
         "url": "/IndexedDB/idbfactory_open4.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open5.htm",
         "url": "/IndexedDB/idbfactory_open5.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open6.htm",
         "url": "/IndexedDB/idbfactory_open6.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open7.htm",
         "url": "/IndexedDB/idbfactory_open7.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open8.htm",
         "url": "/IndexedDB/idbfactory_open8.htm"
       },
       {
-        "path": "IndexedDB/idbfactory_open9.htm",
         "url": "/IndexedDB/idbfactory_open9.htm"
       },
       {
-        "path": "IndexedDB/idbindex-multientry-arraykeypath.htm",
         "url": "/IndexedDB/idbindex-multientry-arraykeypath.htm"
       },
       {
-        "path": "IndexedDB/idbindex-multientry-big.htm",
         "url": "/IndexedDB/idbindex-multientry-big.htm"
       },
       {
-        "path": "IndexedDB/idbindex-multientry.htm",
         "url": "/IndexedDB/idbindex-multientry.htm"
       },
       {
-        "path": "IndexedDB/idbindex_count.htm",
         "url": "/IndexedDB/idbindex_count.htm"
       },
       {
-        "path": "IndexedDB/idbindex_count2.htm",
         "url": "/IndexedDB/idbindex_count2.htm"
       },
       {
-        "path": "IndexedDB/idbindex_count3.htm",
         "url": "/IndexedDB/idbindex_count3.htm"
       },
       {
-        "path": "IndexedDB/idbindex_count4.htm",
         "url": "/IndexedDB/idbindex_count4.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get.htm",
         "url": "/IndexedDB/idbindex_get.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get2.htm",
         "url": "/IndexedDB/idbindex_get2.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get3.htm",
         "url": "/IndexedDB/idbindex_get3.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get4.htm",
         "url": "/IndexedDB/idbindex_get4.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get5.htm",
         "url": "/IndexedDB/idbindex_get5.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get6.htm",
         "url": "/IndexedDB/idbindex_get6.htm"
       },
       {
-        "path": "IndexedDB/idbindex_get7.htm",
         "url": "/IndexedDB/idbindex_get7.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey.htm",
         "url": "/IndexedDB/idbindex_getKey.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey2.htm",
         "url": "/IndexedDB/idbindex_getKey2.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey3.htm",
         "url": "/IndexedDB/idbindex_getKey3.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey4.htm",
         "url": "/IndexedDB/idbindex_getKey4.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey5.htm",
         "url": "/IndexedDB/idbindex_getKey5.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey6.htm",
         "url": "/IndexedDB/idbindex_getKey6.htm"
       },
       {
-        "path": "IndexedDB/idbindex_getKey7.htm",
         "url": "/IndexedDB/idbindex_getKey7.htm"
       },
       {
-        "path": "IndexedDB/idbindex_indexNames.htm",
         "url": "/IndexedDB/idbindex_indexNames.htm"
       },
       {
-        "path": "IndexedDB/idbindex_openCursor.htm",
         "url": "/IndexedDB/idbindex_openCursor.htm"
       },
       {
-        "path": "IndexedDB/idbindex_openCursor2.htm",
         "url": "/IndexedDB/idbindex_openCursor2.htm"
       },
       {
-        "path": "IndexedDB/idbindex_openKeyCursor.htm",
         "url": "/IndexedDB/idbindex_openKeyCursor.htm"
       },
       {
-        "path": "IndexedDB/idbindex_openKeyCursor2.htm",
         "url": "/IndexedDB/idbindex_openKeyCursor2.htm"
       },
       {
-        "path": "IndexedDB/idbindex_openKeyCursor3.htm",
         "url": "/IndexedDB/idbindex_openKeyCursor3.htm"
       },
       {
-        "path": "IndexedDB/idbkeyrange.htm",
         "url": "/IndexedDB/idbkeyrange.htm"
       },
       {
-        "path": "IndexedDB/idbkeyrange_incorrect.htm",
         "url": "/IndexedDB/idbkeyrange_incorrect.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add.htm",
         "url": "/IndexedDB/idbobjectstore_add.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add10.htm",
         "url": "/IndexedDB/idbobjectstore_add10.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add11.htm",
         "url": "/IndexedDB/idbobjectstore_add11.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add12.htm",
         "url": "/IndexedDB/idbobjectstore_add12.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add13.htm",
         "url": "/IndexedDB/idbobjectstore_add13.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add14.htm",
         "url": "/IndexedDB/idbobjectstore_add14.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add15.htm",
         "url": "/IndexedDB/idbobjectstore_add15.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add16.htm",
         "url": "/IndexedDB/idbobjectstore_add16.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add2.htm",
         "url": "/IndexedDB/idbobjectstore_add2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add3.htm",
         "url": "/IndexedDB/idbobjectstore_add3.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add4.htm",
         "url": "/IndexedDB/idbobjectstore_add4.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add5.htm",
         "url": "/IndexedDB/idbobjectstore_add5.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add6.htm",
         "url": "/IndexedDB/idbobjectstore_add6.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add7.htm",
         "url": "/IndexedDB/idbobjectstore_add7.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add8.htm",
         "url": "/IndexedDB/idbobjectstore_add8.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_add9.htm",
         "url": "/IndexedDB/idbobjectstore_add9.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_clear.htm",
         "url": "/IndexedDB/idbobjectstore_clear.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_clear2.htm",
         "url": "/IndexedDB/idbobjectstore_clear2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_clear3.htm",
         "url": "/IndexedDB/idbobjectstore_clear3.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_clear4.htm",
         "url": "/IndexedDB/idbobjectstore_clear4.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_count.htm",
         "url": "/IndexedDB/idbobjectstore_count.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_count2.htm",
         "url": "/IndexedDB/idbobjectstore_count2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_count3.htm",
         "url": "/IndexedDB/idbobjectstore_count3.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_count4.htm",
         "url": "/IndexedDB/idbobjectstore_count4.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex10.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex10.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex11.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex11.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex12.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex12.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex13.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex13.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex2.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm",
-        "timeout": "long",
-        "url": "/IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm"
-      },
-      {
-        "path": "IndexedDB/idbobjectstore_createIndex4-deleteIndex-event_order.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex4-deleteIndex-event_order.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex5-emptykeypath.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex5-emptykeypath.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex6-event_order.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex6-event_order.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex7-event_order.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex7-event_order.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_createIndex8-valid_keys.htm",
-        "timeout": "long",
-        "url": "/IndexedDB/idbobjectstore_createIndex8-valid_keys.htm"
-      },
-      {
-        "path": "IndexedDB/idbobjectstore_createIndex9-emptyname.htm",
         "url": "/IndexedDB/idbobjectstore_createIndex9-emptyname.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete.htm",
         "url": "/IndexedDB/idbobjectstore_delete.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete2.htm",
         "url": "/IndexedDB/idbobjectstore_delete2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete3.htm",
         "url": "/IndexedDB/idbobjectstore_delete3.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete4.htm",
         "url": "/IndexedDB/idbobjectstore_delete4.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete5.htm",
         "url": "/IndexedDB/idbobjectstore_delete5.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete6.htm",
         "url": "/IndexedDB/idbobjectstore_delete6.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_delete7.htm",
         "url": "/IndexedDB/idbobjectstore_delete7.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_deleteIndex.htm",
         "url": "/IndexedDB/idbobjectstore_deleteIndex.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_deleted.htm",
         "url": "/IndexedDB/idbobjectstore_deleted.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_get.htm",
         "url": "/IndexedDB/idbobjectstore_get.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_get2.htm",
         "url": "/IndexedDB/idbobjectstore_get2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_get3.htm",
         "url": "/IndexedDB/idbobjectstore_get3.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_get4.htm",
         "url": "/IndexedDB/idbobjectstore_get4.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_get5.htm",
         "url": "/IndexedDB/idbobjectstore_get5.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_index.htm",
         "url": "/IndexedDB/idbobjectstore_index.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_openCursor.htm",
         "url": "/IndexedDB/idbobjectstore_openCursor.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_openCursor_invalid.htm",
         "url": "/IndexedDB/idbobjectstore_openCursor_invalid.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put.htm",
         "url": "/IndexedDB/idbobjectstore_put.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put10.htm",
         "url": "/IndexedDB/idbobjectstore_put10.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put11.htm",
         "url": "/IndexedDB/idbobjectstore_put11.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put12.htm",
         "url": "/IndexedDB/idbobjectstore_put12.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put13.htm",
         "url": "/IndexedDB/idbobjectstore_put13.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put14.htm",
         "url": "/IndexedDB/idbobjectstore_put14.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put15.htm",
         "url": "/IndexedDB/idbobjectstore_put15.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put16.htm",
         "url": "/IndexedDB/idbobjectstore_put16.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put2.htm",
         "url": "/IndexedDB/idbobjectstore_put2.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put3.htm",
         "url": "/IndexedDB/idbobjectstore_put3.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put4.htm",
         "url": "/IndexedDB/idbobjectstore_put4.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put5.htm",
         "url": "/IndexedDB/idbobjectstore_put5.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put6.htm",
         "url": "/IndexedDB/idbobjectstore_put6.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put7.htm",
         "url": "/IndexedDB/idbobjectstore_put7.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put8.htm",
         "url": "/IndexedDB/idbobjectstore_put8.htm"
       },
       {
-        "path": "IndexedDB/idbobjectstore_put9.htm",
         "url": "/IndexedDB/idbobjectstore_put9.htm"
       },
       {
-        "path": "IndexedDB/idbtransaction-oncomplete.htm",
         "url": "/IndexedDB/idbtransaction-oncomplete.htm"
       },
       {
-        "path": "IndexedDB/idbtransaction.htm",
         "url": "/IndexedDB/idbtransaction.htm"
       },
       {
-        "path": "IndexedDB/idbtransaction_abort.htm",
         "url": "/IndexedDB/idbtransaction_abort.htm"
       },
       {
-        "path": "IndexedDB/idbversionchangeevent.htm",
         "url": "/IndexedDB/idbversionchangeevent.htm"
       },
       {
-        "path": "IndexedDB/index_sort_order.htm",
         "url": "/IndexedDB/index_sort_order.htm"
       },
       {
-        "path": "IndexedDB/interfaces.htm",
         "url": "/IndexedDB/interfaces.htm"
       },
       {
-        "path": "IndexedDB/interfaces.html",
         "url": "/IndexedDB/interfaces.html"
       },
       {
-        "path": "IndexedDB/key_invalid.htm",
         "url": "/IndexedDB/key_invalid.htm"
       },
       {
-        "path": "IndexedDB/key_valid.html",
         "url": "/IndexedDB/key_valid.html"
       },
       {
-        "path": "IndexedDB/keygenerator-constrainterror.htm",
         "url": "/IndexedDB/keygenerator-constrainterror.htm"
       },
       {
-        "path": "IndexedDB/keygenerator-overflow.htm",
         "url": "/IndexedDB/keygenerator-overflow.htm"
       },
       {
-        "path": "IndexedDB/keygenerator.htm",
         "url": "/IndexedDB/keygenerator.htm"
       },
       {
-        "path": "IndexedDB/keyorder.htm",
         "url": "/IndexedDB/keyorder.htm"
       },
       {
-        "path": "IndexedDB/keypath.htm",
         "url": "/IndexedDB/keypath.htm"
       },
       {
-        "path": "IndexedDB/keypath_invalid.htm",
         "url": "/IndexedDB/keypath_invalid.htm"
       },
       {
-        "path": "IndexedDB/keypath_maxsize.htm",
-        "timeout": "long",
-        "url": "/IndexedDB/keypath_maxsize.htm"
-      },
-      {
-        "path": "IndexedDB/list_ordering.htm",
         "url": "/IndexedDB/list_ordering.htm"
       },
       {
-        "path": "IndexedDB/objectstore_keyorder.htm",
         "url": "/IndexedDB/objectstore_keyorder.htm"
       },
       {
-        "path": "IndexedDB/request_bubble-and-capture.htm",
         "url": "/IndexedDB/request_bubble-and-capture.htm"
       },
       {
-        "path": "IndexedDB/string-list-ordering.htm",
         "url": "/IndexedDB/string-list-ordering.htm"
       },
       {
-        "path": "IndexedDB/transaction-create_in_versionchange.htm",
         "url": "/IndexedDB/transaction-create_in_versionchange.htm"
       },
       {
-        "path": "IndexedDB/transaction-lifetime-blocked.htm",
         "url": "/IndexedDB/transaction-lifetime-blocked.htm"
       },
       {
-        "path": "IndexedDB/transaction-lifetime.htm",
         "url": "/IndexedDB/transaction-lifetime.htm"
       },
       {
-        "path": "IndexedDB/transaction-requestqueue.htm",
         "url": "/IndexedDB/transaction-requestqueue.htm"
       },
       {
-        "path": "IndexedDB/transaction_bubble-and-capture.htm",
         "url": "/IndexedDB/transaction_bubble-and-capture.htm"
       },
       {
-        "path": "IndexedDB/value.htm",
         "url": "/IndexedDB/value.htm"
       },
       {
-        "path": "IndexedDB/value_recursive.htm",
         "url": "/IndexedDB/value_recursive.htm"
       },
       {
-        "path": "IndexedDB/writer-starvation.htm",
-        "timeout": "long",
-        "url": "/IndexedDB/writer-starvation.htm"
-      },
-      {
-        "path": "XMLHttpRequest/FormData-append.html",
         "url": "/XMLHttpRequest/FormData-append.html"
       },
       {
-        "path": "XMLHttpRequest/abort-after-receive.htm",
         "url": "/XMLHttpRequest/abort-after-receive.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-after-send.htm",
         "url": "/XMLHttpRequest/abort-after-send.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-after-stop.htm",
         "url": "/XMLHttpRequest/abort-after-stop.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-after-timeout.htm",
         "url": "/XMLHttpRequest/abort-after-timeout.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-during-done.htm",
         "url": "/XMLHttpRequest/abort-during-done.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-during-open.htm",
         "url": "/XMLHttpRequest/abort-during-open.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-during-unsent.htm",
         "url": "/XMLHttpRequest/abort-during-unsent.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-during-upload.htm",
         "url": "/XMLHttpRequest/abort-during-upload.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-event-abort.htm",
         "url": "/XMLHttpRequest/abort-event-abort.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-event-listeners.htm",
         "url": "/XMLHttpRequest/abort-event-listeners.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-event-loadend.htm",
         "url": "/XMLHttpRequest/abort-event-loadend.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-event-order.htm",
         "url": "/XMLHttpRequest/abort-event-order.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-upload-event-abort.htm",
         "url": "/XMLHttpRequest/abort-upload-event-abort.htm"
       },
       {
-        "path": "XMLHttpRequest/abort-upload-event-loadend.htm",
         "url": "/XMLHttpRequest/abort-upload-event-loadend.htm"
       },
       {
-        "path": "XMLHttpRequest/anonymous-mode-unsupported.htm",
         "url": "/XMLHttpRequest/anonymous-mode-unsupported.htm"
       },
       {
-        "path": "XMLHttpRequest/data-uri.htm",
         "url": "/XMLHttpRequest/data-uri.htm"
       },
       {
-        "path": "XMLHttpRequest/event-abort.htm",
         "url": "/XMLHttpRequest/event-abort.htm"
       },
       {
-        "path": "XMLHttpRequest/event-load.htm",
         "url": "/XMLHttpRequest/event-load.htm"
       },
       {
-        "path": "XMLHttpRequest/event-loadend.htm",
         "url": "/XMLHttpRequest/event-loadend.htm"
       },
       {
-        "path": "XMLHttpRequest/event-loadstart.htm",
         "url": "/XMLHttpRequest/event-loadstart.htm"
       },
       {
-        "path": "XMLHttpRequest/event-progress.htm",
         "url": "/XMLHttpRequest/event-progress.htm"
       },
       {
-        "path": "XMLHttpRequest/event-readystatechange-loaded.htm",
         "url": "/XMLHttpRequest/event-readystatechange-loaded.htm"
       },
       {
-        "path": "XMLHttpRequest/event-timeout.htm",
         "url": "/XMLHttpRequest/event-timeout.htm"
       },
       {
-        "path": "XMLHttpRequest/event-upload-progress.htm",
+        "url": "/XMLHttpRequest/event-upload-progress-crossorigin.sub.htm"
+      },
+      {
         "url": "/XMLHttpRequest/event-upload-progress.htm"
       },
       {
-        "path": "XMLHttpRequest/formdata-blob.htm",
         "url": "/XMLHttpRequest/formdata-blob.htm"
       },
       {
-        "path": "XMLHttpRequest/formdata.htm",
         "url": "/XMLHttpRequest/formdata.htm"
       },
       {
-        "path": "XMLHttpRequest/getallresponseheaders-cookies.htm",
         "url": "/XMLHttpRequest/getallresponseheaders-cookies.htm"
       },
       {
-        "path": "XMLHttpRequest/getallresponseheaders-status.htm",
         "url": "/XMLHttpRequest/getallresponseheaders-status.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-case-insensitive.htm",
         "url": "/XMLHttpRequest/getresponseheader-case-insensitive.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-chunked-trailer.htm",
         "url": "/XMLHttpRequest/getresponseheader-chunked-trailer.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-cookies-and-more.htm",
         "url": "/XMLHttpRequest/getresponseheader-cookies-and-more.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-error-state.htm",
         "url": "/XMLHttpRequest/getresponseheader-error-state.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-server-date.htm",
         "url": "/XMLHttpRequest/getresponseheader-server-date.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-special-characters.htm",
         "url": "/XMLHttpRequest/getresponseheader-special-characters.htm"
       },
       {
-        "path": "XMLHttpRequest/getresponseheader-unsent-opened-state.htm",
         "url": "/XMLHttpRequest/getresponseheader-unsent-opened-state.htm"
       },
       {
-        "path": "XMLHttpRequest/interfaces.html",
         "url": "/XMLHttpRequest/interfaces.html"
       },
       {
-        "path": "XMLHttpRequest/open-after-abort.htm",
         "url": "/XMLHttpRequest/open-after-abort.htm"
       },
       {
-        "path": "XMLHttpRequest/open-after-setrequestheader.htm",
         "url": "/XMLHttpRequest/open-after-setrequestheader.htm"
       },
       {
-        "path": "XMLHttpRequest/open-method-bogus.htm",
         "url": "/XMLHttpRequest/open-method-bogus.htm"
       },
       {
-        "path": "XMLHttpRequest/open-method-case-insensitive.htm",
         "url": "/XMLHttpRequest/open-method-case-insensitive.htm"
       },
       {
-        "path": "XMLHttpRequest/open-method-case-sensitive.htm",
         "url": "/XMLHttpRequest/open-method-case-sensitive.htm"
       },
       {
-        "path": "XMLHttpRequest/open-method-insecure.htm",
         "url": "/XMLHttpRequest/open-method-insecure.htm"
       },
       {
-        "path": "XMLHttpRequest/open-method-responsetype-set-sync.htm",
         "url": "/XMLHttpRequest/open-method-responsetype-set-sync.htm"
       },
       {
-        "path": "XMLHttpRequest/open-open-send.htm",
         "url": "/XMLHttpRequest/open-open-send.htm"
       },
       {
-        "path": "XMLHttpRequest/open-open-sync-send.htm",
         "url": "/XMLHttpRequest/open-open-sync-send.htm"
       },
       {
-        "path": "XMLHttpRequest/open-referer.htm",
         "url": "/XMLHttpRequest/open-referer.htm"
       },
       {
-        "path": "XMLHttpRequest/open-send-open.htm",
         "url": "/XMLHttpRequest/open-send-open.htm"
       },
       {
-        "path": "XMLHttpRequest/open-sync-open-send.htm",
         "url": "/XMLHttpRequest/open-sync-open-send.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-about-blank-window.htm",
         "url": "/XMLHttpRequest/open-url-about-blank-window.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-base-inserted-after-open.htm",
         "url": "/XMLHttpRequest/open-url-base-inserted-after-open.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-base-inserted.htm",
         "url": "/XMLHttpRequest/open-url-base-inserted.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-base.htm",
         "url": "/XMLHttpRequest/open-url-base.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-bogus.htm",
         "url": "/XMLHttpRequest/open-url-bogus.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-encoding.htm",
         "url": "/XMLHttpRequest/open-url-encoding.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-fragment.htm",
         "url": "/XMLHttpRequest/open-url-fragment.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-javascript-window-2.htm",
         "url": "/XMLHttpRequest/open-url-javascript-window-2.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-javascript-window.htm",
         "url": "/XMLHttpRequest/open-url-javascript-window.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-multi-window-2.htm",
         "url": "/XMLHttpRequest/open-url-multi-window-2.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-multi-window-3.htm",
         "url": "/XMLHttpRequest/open-url-multi-window-3.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-multi-window-4.htm",
         "url": "/XMLHttpRequest/open-url-multi-window-4.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-multi-window-5.htm",
         "url": "/XMLHttpRequest/open-url-multi-window-5.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-multi-window.htm",
         "url": "/XMLHttpRequest/open-url-multi-window.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-worker-origin.htm",
         "url": "/XMLHttpRequest/open-url-worker-origin.htm"
       },
       {
-        "path": "XMLHttpRequest/open-url-worker-simple.htm",
         "url": "/XMLHttpRequest/open-url-worker-simple.htm"
       },
       {
-        "path": "XMLHttpRequest/open-user-password-non-same-origin.htm",
         "url": "/XMLHttpRequest/open-user-password-non-same-origin.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-done-state.htm",
         "url": "/XMLHttpRequest/overridemimetype-done-state.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm",
         "url": "/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-invalid-mime-type.htm",
         "url": "/XMLHttpRequest/overridemimetype-invalid-mime-type.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-loading-state.htm",
         "url": "/XMLHttpRequest/overridemimetype-loading-state.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm",
         "url": "/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-open-state-force-xml.htm",
         "url": "/XMLHttpRequest/overridemimetype-open-state-force-xml.htm"
       },
       {
-        "path": "XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm",
         "url": "/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm"
       },
       {
-        "path": "XMLHttpRequest/progress-events-response-data-gzip.htm",
-        "timeout": "long",
-        "url": "/XMLHttpRequest/progress-events-response-data-gzip.htm"
-      },
-      {
-        "path": "XMLHttpRequest/response-data-arraybuffer.htm",
         "url": "/XMLHttpRequest/response-data-arraybuffer.htm"
       },
       {
-        "path": "XMLHttpRequest/response-data-blob.htm",
         "url": "/XMLHttpRequest/response-data-blob.htm"
       },
       {
-        "path": "XMLHttpRequest/response-data-deflate.htm",
         "url": "/XMLHttpRequest/response-data-deflate.htm"
       },
       {
-        "path": "XMLHttpRequest/response-data-gzip.htm",
         "url": "/XMLHttpRequest/response-data-gzip.htm"
       },
       {
-        "path": "XMLHttpRequest/response-data-progress.htm",
         "url": "/XMLHttpRequest/response-data-progress.htm"
       },
       {
-        "path": "XMLHttpRequest/response-invalid-responsetype.htm",
         "url": "/XMLHttpRequest/response-invalid-responsetype.htm"
       },
       {
-        "path": "XMLHttpRequest/response-json.htm",
         "url": "/XMLHttpRequest/response-json.htm"
       },
       {
-        "path": "XMLHttpRequest/responsetext-decoding.htm",
         "url": "/XMLHttpRequest/responsetext-decoding.htm"
       },
       {
-        "path": "XMLHttpRequest/responsetype.html",
         "url": "/XMLHttpRequest/responsetype.html"
       },
       {
-        "path": "XMLHttpRequest/responsexml-basic.htm",
         "url": "/XMLHttpRequest/responsexml-basic.htm"
       },
       {
-        "path": "XMLHttpRequest/responsexml-document-properties.htm",
         "url": "/XMLHttpRequest/responsexml-document-properties.htm"
       },
       {
-        "path": "XMLHttpRequest/responsexml-media-type.htm",
         "url": "/XMLHttpRequest/responsexml-media-type.htm"
       },
       {
-        "path": "XMLHttpRequest/responsexml-non-document-types.htm",
         "url": "/XMLHttpRequest/responsexml-non-document-types.htm"
       },
       {
-        "path": "XMLHttpRequest/responsexml-non-well-formed.htm",
         "url": "/XMLHttpRequest/responsexml-non-well-formed.htm"
       },
       {
-        "path": "XMLHttpRequest/send-accept-language.htm",
         "url": "/XMLHttpRequest/send-accept-language.htm"
       },
       {
-        "path": "XMLHttpRequest/send-accept.htm",
         "url": "/XMLHttpRequest/send-accept.htm"
       },
       {
-        "path": "XMLHttpRequest/send-after-setting-document-domain.htm",
         "url": "/XMLHttpRequest/send-after-setting-document-domain.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm",
         "url": "/XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-basic-cors.htm",
         "url": "/XMLHttpRequest/send-authentication-basic-cors.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-basic-repeat-no-args.htm",
         "url": "/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm",
         "url": "/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-basic-setrequestheader.htm",
         "url": "/XMLHttpRequest/send-authentication-basic-setrequestheader.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-basic.htm",
         "url": "/XMLHttpRequest/send-authentication-basic.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-competing-names-passwords.htm",
         "url": "/XMLHttpRequest/send-authentication-competing-names-passwords.htm"
       },
       {
-        "path": "XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm",
         "url": "/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm"
       },
       {
-        "path": "XMLHttpRequest/send-conditional.htm",
         "url": "/XMLHttpRequest/send-conditional.htm"
       },
       {
-        "path": "XMLHttpRequest/send-content-type-charset.htm",
         "url": "/XMLHttpRequest/send-content-type-charset.htm"
       },
       {
-        "path": "XMLHttpRequest/send-content-type-string.htm",
         "url": "/XMLHttpRequest/send-content-type-string.htm"
       },
       {
-        "path": "XMLHttpRequest/send-data-arraybuffer.htm",
         "url": "/XMLHttpRequest/send-data-arraybuffer.htm"
       },
       {
-        "path": "XMLHttpRequest/send-data-blob.htm",
         "url": "/XMLHttpRequest/send-data-blob.htm"
       },
       {
-        "path": "XMLHttpRequest/send-data-formdata.htm",
         "url": "/XMLHttpRequest/send-data-formdata.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-basic.htm",
         "url": "/XMLHttpRequest/send-entity-body-basic.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-document-bogus.htm",
         "url": "/XMLHttpRequest/send-entity-body-document-bogus.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-document.htm",
         "url": "/XMLHttpRequest/send-entity-body-document.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-empty.htm",
         "url": "/XMLHttpRequest/send-entity-body-empty.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-get-head-async.htm",
         "url": "/XMLHttpRequest/send-entity-body-get-head-async.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-get-head.htm",
         "url": "/XMLHttpRequest/send-entity-body-get-head.htm"
       },
       {
-        "path": "XMLHttpRequest/send-entity-body-none.htm",
         "url": "/XMLHttpRequest/send-entity-body-none.htm"
       },
       {
-        "path": "XMLHttpRequest/send-network-error-async-events.sub.htm",
         "url": "/XMLHttpRequest/send-network-error-async-events.sub.htm"
       },
       {
-        "path": "XMLHttpRequest/send-network-error-sync-events.sub.htm",
         "url": "/XMLHttpRequest/send-network-error-sync-events.sub.htm"
       },
       {
-        "path": "XMLHttpRequest/send-no-response-event-loadend.htm",
         "url": "/XMLHttpRequest/send-no-response-event-loadend.htm"
       },
       {
-        "path": "XMLHttpRequest/send-no-response-event-loadstart.htm",
         "url": "/XMLHttpRequest/send-no-response-event-loadstart.htm"
       },
       {
-        "path": "XMLHttpRequest/send-no-response-event-order.htm",
         "url": "/XMLHttpRequest/send-no-response-event-order.htm"
       },
       {
-        "path": "XMLHttpRequest/send-non-same-origin.sub.htm",
         "url": "/XMLHttpRequest/send-non-same-origin.sub.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect-bogus-sync.htm",
         "url": "/XMLHttpRequest/send-redirect-bogus-sync.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect-bogus.htm",
-        "timeout": "long",
-        "url": "/XMLHttpRequest/send-redirect-bogus.htm"
-      },
-      {
-        "path": "XMLHttpRequest/send-redirect-infinite-sync.htm",
         "url": "/XMLHttpRequest/send-redirect-infinite-sync.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect-infinite.htm",
         "url": "/XMLHttpRequest/send-redirect-infinite.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect-no-location.htm",
         "url": "/XMLHttpRequest/send-redirect-no-location.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect-to-cors.htm",
         "url": "/XMLHttpRequest/send-redirect-to-cors.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect-to-non-cors.htm",
         "url": "/XMLHttpRequest/send-redirect-to-non-cors.htm"
       },
       {
-        "path": "XMLHttpRequest/send-redirect.htm",
         "url": "/XMLHttpRequest/send-redirect.htm"
       },
       {
-        "path": "XMLHttpRequest/send-response-event-order.htm",
         "url": "/XMLHttpRequest/send-response-event-order.htm"
       },
       {
-        "path": "XMLHttpRequest/send-response-upload-event-loadend.htm",
         "url": "/XMLHttpRequest/send-response-upload-event-loadend.htm"
       },
       {
-        "path": "XMLHttpRequest/send-response-upload-event-loadstart.htm",
         "url": "/XMLHttpRequest/send-response-upload-event-loadstart.htm"
       },
       {
-        "path": "XMLHttpRequest/send-response-upload-event-progress.htm",
         "url": "/XMLHttpRequest/send-response-upload-event-progress.htm"
       },
       {
-        "path": "XMLHttpRequest/send-send.htm",
         "url": "/XMLHttpRequest/send-send.htm"
       },
       {
-        "path": "XMLHttpRequest/send-sync-blocks-async.htm",
         "url": "/XMLHttpRequest/send-sync-blocks-async.htm"
       },
       {
-        "path": "XMLHttpRequest/send-sync-no-response-event-load.htm",
         "url": "/XMLHttpRequest/send-sync-no-response-event-load.htm"
       },
       {
-        "path": "XMLHttpRequest/send-sync-no-response-event-loadend.htm",
         "url": "/XMLHttpRequest/send-sync-no-response-event-loadend.htm"
       },
       {
-        "path": "XMLHttpRequest/send-sync-no-response-event-order.htm",
         "url": "/XMLHttpRequest/send-sync-no-response-event-order.htm"
       },
       {
-        "path": "XMLHttpRequest/send-sync-response-event-order.htm",
         "url": "/XMLHttpRequest/send-sync-response-event-order.htm"
       },
       {
-        "path": "XMLHttpRequest/send-sync-timeout.htm",
         "url": "/XMLHttpRequest/send-sync-timeout.htm"
       },
       {
-        "path": "XMLHttpRequest/send-timeout-events.htm",
         "url": "/XMLHttpRequest/send-timeout-events.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-after-send.htm",
         "url": "/XMLHttpRequest/setrequestheader-after-send.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-allow-empty-value.htm",
         "url": "/XMLHttpRequest/setrequestheader-allow-empty-value.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-before-open.htm",
         "url": "/XMLHttpRequest/setrequestheader-before-open.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-bogus-name.htm",
         "url": "/XMLHttpRequest/setrequestheader-bogus-name.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-bogus-value.htm",
         "url": "/XMLHttpRequest/setrequestheader-bogus-value.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-case-insensitive.htm",
         "url": "/XMLHttpRequest/setrequestheader-case-insensitive.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-header-allowed.htm",
         "url": "/XMLHttpRequest/setrequestheader-header-allowed.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-header-forbidden.htm",
         "url": "/XMLHttpRequest/setrequestheader-header-forbidden.htm"
       },
       {
-        "path": "XMLHttpRequest/setrequestheader-invalid-arguments.htm",
-        "url": "/XMLHttpRequest/setrequestheader-invalid-arguments.htm"
-      },
-      {
-        "path": "XMLHttpRequest/setrequestheader-open-setrequestheader.htm",
         "url": "/XMLHttpRequest/setrequestheader-open-setrequestheader.htm"
       },
       {
-        "path": "XMLHttpRequest/status-async.htm",
         "url": "/XMLHttpRequest/status-async.htm"
       },
       {
-        "path": "XMLHttpRequest/status-basic.htm",
         "url": "/XMLHttpRequest/status-basic.htm"
       },
       {
-        "path": "XMLHttpRequest/status-error.htm",
         "url": "/XMLHttpRequest/status-error.htm"
       },
       {
-        "path": "XMLHttpRequest/timeout-cors-async.htm",
         "url": "/XMLHttpRequest/timeout-cors-async.htm"
       },
       {
-        "path": "XMLHttpRequest/timeout-sync.htm",
         "url": "/XMLHttpRequest/timeout-sync.htm"
       },
       {
-        "path": "XMLHttpRequest/withcredentials-set.htm",
         "url": "/XMLHttpRequest/withcredentials-set.htm"
       },
       {
-        "path": "XMLHttpRequest/withcredentials-wrong-state.htm",
         "url": "/XMLHttpRequest/withcredentials-wrong-state.htm"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-basic.htm",
         "url": "/XMLHttpRequest/xmlhttprequest-basic.htm"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-eventtarget.htm",
         "url": "/XMLHttpRequest/xmlhttprequest-eventtarget.htm"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-network-error-sync.htm",
         "url": "/XMLHttpRequest/xmlhttprequest-network-error-sync.htm"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-network-error.htm",
         "url": "/XMLHttpRequest/xmlhttprequest-network-error.htm"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-aborted.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-aborted.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-overrides.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-overrides.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-simple.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-simple.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-synconmain.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-twice.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-twice.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html",
         "url": "/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html"
       },
       {
-        "path": "XMLHttpRequest/xmlhttprequest-unsent.htm",
         "url": "/XMLHttpRequest/xmlhttprequest-unsent.htm"
       },
       {
-        "path": "ambient-light/AmbientLight_tests.html",
-        "timeout": "long",
-        "url": "/ambient-light/AmbientLight_tests.html"
-      },
-      {
-        "path": "ambient-light/idlharness.html",
         "url": "/ambient-light/idlharness.html"
       },
       {
-        "path": "animation-timing/callback-invoked.html",
         "url": "/animation-timing/callback-invoked.html"
       },
       {
-        "path": "animation-timing/cancel-invoked.html",
         "url": "/animation-timing/cancel-invoked.html"
       },
       {
-        "path": "animation-timing/idlharness.html",
         "url": "/animation-timing/idlharness.html"
       },
       {
-        "path": "battery-status/battery-interface-idlharness.html",
         "url": "/battery-status/battery-interface-idlharness.html"
       },
       {
-        "path": "battery-status/battery-interface.html",
         "url": "/battery-status/battery-interface.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_10.html",
         "url": "/content-security-policy/generic/generic-0_10.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_10_1.sub.html",
         "url": "/content-security-policy/generic/generic-0_10_1.sub.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_2.html",
         "url": "/content-security-policy/generic/generic-0_2.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_2_2.sub.html",
         "url": "/content-security-policy/generic/generic-0_2_2.sub.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_2_3.html",
         "url": "/content-security-policy/generic/generic-0_2_3.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_8.html",
         "url": "/content-security-policy/generic/generic-0_8.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_8_1.sub.html",
         "url": "/content-security-policy/generic/generic-0_8_1.sub.html"
       },
       {
-        "path": "content-security-policy/generic/generic-0_9.sub.html",
         "url": "/content-security-policy/generic/generic-0_9.sub.html"
       },
       {
-        "path": "content-security-policy/object-src/object-src-2_1.html",
         "url": "/content-security-policy/object-src/object-src-2_1.html"
       },
       {
-        "path": "content-security-policy/object-src/object-src-2_2.html",
         "url": "/content-security-policy/object-src/object-src-2_2.html"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_1.html",
         "url": "/content-security-policy/script-src/script-src-1_1.html"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_2_1.html",
         "url": "/content-security-policy/script-src/script-src-1_2_1.html"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_3.html",
         "url": "/content-security-policy/script-src/script-src-1_3.html"
       },
       {
-        "path": "content-security-policy/script-src/script-src-1_4.html",
         "url": "/content-security-policy/script-src/script-src-1_4.html"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_1.html",
         "url": "/content-security-policy/style-src/style-src-3_1.html"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_2.html",
         "url": "/content-security-policy/style-src/style-src-3_2.html"
       },
       {
-        "path": "content-security-policy/style-src/style-src-3_4.html",
         "url": "/content-security-policy/style-src/style-src-3_4.html"
       },
       {
-        "path": "cors/allow-headers.htm",
         "url": "/cors/allow-headers.htm"
       },
       {
-        "path": "cors/basic.htm",
         "url": "/cors/basic.htm"
       },
       {
-        "path": "cors/credentials-flag.htm",
         "url": "/cors/credentials-flag.htm"
       },
       {
-        "path": "cors/late-upload-events.htm",
         "url": "/cors/late-upload-events.htm"
       },
       {
-        "path": "cors/origin.htm",
         "url": "/cors/origin.htm"
       },
       {
-        "path": "cors/preflight-cache.htm",
         "url": "/cors/preflight-cache.htm"
       },
       {
-        "path": "cors/redirect-origin.htm",
         "url": "/cors/redirect-origin.htm"
       },
       {
-        "path": "cors/redirect-preflight-2.htm",
         "url": "/cors/redirect-preflight-2.htm"
       },
       {
-        "path": "cors/redirect-preflight.htm",
         "url": "/cors/redirect-preflight.htm"
       },
       {
-        "path": "cors/redirect-userinfo.htm",
         "url": "/cors/redirect-userinfo.htm"
       },
       {
-        "path": "cors/remote-origin.htm",
         "url": "/cors/remote-origin.htm"
       },
       {
-        "path": "cors/request-headers.htm",
         "url": "/cors/request-headers.htm"
       },
       {
-        "path": "cors/response-headers.htm",
         "url": "/cors/response-headers.htm"
       },
       {
-        "path": "cors/simple-requests.htm",
         "url": "/cors/simple-requests.htm"
       },
       {
-        "path": "cors/status-async.htm",
-        "timeout": "long",
-        "url": "/cors/status-async.htm"
-      },
-      {
-        "path": "cors/status-preflight.htm",
         "url": "/cors/status-preflight.htm"
       },
       {
-        "path": "cors/status.htm",
         "url": "/cors/status.htm"
       },
       {
-        "path": "custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html",
         "url": "/custom-elements/concepts/custom-elements-type-allowed-chars-first-char.html"
       },
       {
-        "path": "custom-elements/concepts/custom-elements-type-allowed-chars.html",
         "url": "/custom-elements/concepts/custom-elements-type-allowed-chars.html"
       },
       {
-        "path": "custom-elements/concepts/custom-elements-type-naming.html",
         "url": "/custom-elements/concepts/custom-elements-type-naming.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/new-registry-test.html",
         "url": "/custom-elements/creating-and-passing-registries/new-registry-test.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/no-registry-test.html",
         "url": "/custom-elements/creating-and-passing-registries/no-registry-test.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/share-registry-create-document.html",
         "url": "/custom-elements/creating-and-passing-registries/share-registry-create-document.html"
       },
       {
-        "path": "custom-elements/creating-and-passing-registries/share-registry-import-document.html",
         "url": "/custom-elements/creating-and-passing-registries/share-registry-import-document.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html",
         "url": "/custom-elements/custom-element-lifecycle/enqueuing-and-invoking-callbacks/invoke-callbacks.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-move-element-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attached-callback-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-change-attribute-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-remove-attribute-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/attribute-changed-callback-set-attribute-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-element-prototype-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-order-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/created-callback-invocation-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-move-element-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-no-browsing-context-test.html"
       },
       {
-        "path": "custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html",
         "url": "/custom-elements/custom-element-lifecycle/types-of-callbacks/detached-callback-with-browsing-context-test.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/changing-is-attribute.html",
         "url": "/custom-elements/instantiating-custom-elements/changing-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-is-attribute.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-local-name.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-namespace.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-namespace.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-node-document.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-node-document.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-constructor-prototype.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-constructor-prototype.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-prototype.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-prototype.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-type-is-attribute.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-type-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/custom-element-type-local-name.html",
         "url": "/custom-elements/instantiating-custom-elements/custom-element-type-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-interface-type-is-a-type-extension.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-is-attribute.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-is-attribute.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-namespace.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-namespace.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-is-a-type.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-is-a-type.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-unresolved.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-extension-unresolved.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-is-a-local-name.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/create-element-type-is-a-local-name.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element-ns.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element-ns.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element.html",
         "url": "/custom-elements/instantiating-custom-elements/extensions-to-document-interface/created-callback-create-element.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/non-configurable-constructor-property.html",
         "url": "/custom-elements/instantiating-custom-elements/non-configurable-constructor-property.html"
       },
       {
-        "path": "custom-elements/instantiating-custom-elements/prototype-is-interface-prototype-object.html",
         "url": "/custom-elements/instantiating-custom-elements/prototype-is-interface-prototype-object.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-default-namespace.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-default-namespace.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-duplicate-definition.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-duplicate-definition.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-invalid-type.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-invalid-type.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-local-name-lowercased.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-local-name-lowercased.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-name-is-null.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-name-is-null.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-no-interface-for-name.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-no-interface-for-name.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace-name-is-null.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace-name-is-null.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-svg-namespace.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/definition-construction-algorithm-type-name-lowercased.html",
         "url": "/custom-elements/registering-custom-elements/definition-construction-algorithm-type-name-lowercased.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/element-registration-algorithm-no-registry.html",
         "url": "/custom-elements/registering-custom-elements/element-registration-algorithm-no-registry.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-name.html",
         "url": "/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-name.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-prototype.html",
         "url": "/custom-elements/registering-custom-elements/extensions-to-document-interface/custom-element-prototype.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector-all.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-element-pseudoclass/unresolved-element-pseudoclass-matching-query-selector.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-elements-interface-html-element.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-elements-interface-html-element.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-elements-interface-html-unknown-element.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-elements-interface-html-unknown-element.html"
       },
       {
-        "path": "custom-elements/registering-custom-elements/unresolved-elements-interface-svg-element.html",
         "url": "/custom-elements/registering-custom-elements/unresolved-elements-interface-svg-element.html"
       },
       {
-        "path": "dom/collections/HTMLCollection-empty-name.html",
         "url": "/dom/collections/HTMLCollection-empty-name.html"
       },
       {
-        "path": "dom/errors/DOMException-constants.html",
         "url": "/dom/errors/DOMException-constants.html"
       },
       {
-        "path": "dom/errors/exceptions.html",
         "url": "/dom/errors/exceptions.html"
       },
       {
-        "path": "dom/events/Event-constants.html",
         "url": "/dom/events/Event-constants.html"
       },
       {
-        "path": "dom/events/Event-constructors.html",
         "url": "/dom/events/Event-constructors.html"
       },
       {
-        "path": "dom/events/Event-defaultPrevented.html",
         "url": "/dom/events/Event-defaultPrevented.html"
       },
       {
-        "path": "dom/events/Event-initEvent.html",
         "url": "/dom/events/Event-initEvent.html"
       },
       {
-        "path": "dom/events/Event-propagation.html",
         "url": "/dom/events/Event-propagation.html"
       },
       {
-        "path": "dom/events/Event-type.html",
+        "url": "/dom/events/Event-type-empty.html"
+      },
+      {
         "url": "/dom/events/Event-type.html"
       },
       {
-        "path": "dom/events/EventTarget-addEventListener.html",
         "url": "/dom/events/EventTarget-addEventListener.html"
       },
       {
-        "path": "dom/events/EventTarget-dispatchEvent.html",
         "url": "/dom/events/EventTarget-dispatchEvent.html"
       },
       {
-        "path": "dom/events/EventTarget-removeEventListener.html",
         "url": "/dom/events/EventTarget-removeEventListener.html"
       },
       {
-        "path": "dom/events/ProgressEvent.html",
         "url": "/dom/events/ProgressEvent.html"
       },
       {
-        "path": "dom/historical.html",
         "url": "/dom/historical.html"
       },
       {
-        "path": "dom/interface-objects.html",
         "url": "/dom/interface-objects.html"
       },
       {
-        "path": "dom/interfaces.html",
         "url": "/dom/interfaces.html"
       },
       {
-        "path": "dom/lists/DOMTokenList-stringifier.html",
         "url": "/dom/lists/DOMTokenList-stringifier.html"
       },
       {
-        "path": "dom/nodes/CharacterData-appendData.html",
         "url": "/dom/nodes/CharacterData-appendData.html"
       },
       {
-        "path": "dom/nodes/CharacterData-deleteData.html",
         "url": "/dom/nodes/CharacterData-deleteData.html"
       },
       {
-        "path": "dom/nodes/CharacterData-insertData.html",
         "url": "/dom/nodes/CharacterData-insertData.html"
       },
       {
-        "path": "dom/nodes/CharacterData-remove.html",
         "url": "/dom/nodes/CharacterData-remove.html"
       },
       {
-        "path": "dom/nodes/CharacterData-replaceData.html",
         "url": "/dom/nodes/CharacterData-replaceData.html"
       },
       {
-        "path": "dom/nodes/Comment-constructor.html",
         "url": "/dom/nodes/Comment-constructor.html"
       },
       {
-        "path": "dom/nodes/DOMImplementation-createDocument.html",
         "url": "/dom/nodes/DOMImplementation-createDocument.html"
       },
       {
-        "path": "dom/nodes/DOMImplementation-createDocumentType.html",
         "url": "/dom/nodes/DOMImplementation-createDocumentType.html"
       },
       {
-        "path": "dom/nodes/DOMImplementation-createHTMLDocument.html",
         "url": "/dom/nodes/DOMImplementation-createHTMLDocument.html"
       },
       {
-        "path": "dom/nodes/DOMImplementation-hasFeature.html",
         "url": "/dom/nodes/DOMImplementation-hasFeature.html"
       },
       {
-        "path": "dom/nodes/Document-adoptNode.html",
         "url": "/dom/nodes/Document-adoptNode.html"
       },
       {
-        "path": "dom/nodes/Document-characterSet-normalization.html",
-        "timeout": "long",
-        "url": "/dom/nodes/Document-characterSet-normalization.html"
-      },
-      {
-        "path": "dom/nodes/Document-constructor.html",
         "url": "/dom/nodes/Document-constructor.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_bmp.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_bmp.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_css.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_css.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_gif.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_gif.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_html.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_html.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_jpg.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_jpg.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_mimeheader_03.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_03.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_png.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_png.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_txt.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_txt.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/contenttype_xml.html",
         "url": "/dom/nodes/Document-contentType/contentType/contenttype_xml.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/createDocument.html",
         "url": "/dom/nodes/Document-contentType/contentType/createDocument.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/createHTMLDocument.html",
         "url": "/dom/nodes/Document-contentType/contentType/createHTMLDocument.html"
       },
       {
-        "path": "dom/nodes/Document-contentType/contentType/xhr_responseType_document.html",
         "url": "/dom/nodes/Document-contentType/contentType/xhr_responseType_document.html"
       },
       {
-        "path": "dom/nodes/Document-createComment.html",
+        "url": "/dom/nodes/Document-createAttribute.html"
+      },
+      {
         "url": "/dom/nodes/Document-createComment.html"
       },
       {
-        "path": "dom/nodes/Document-createElement-namespace.html",
         "url": "/dom/nodes/Document-createElement-namespace.html"
       },
       {
-        "path": "dom/nodes/Document-createElement.html",
         "url": "/dom/nodes/Document-createElement.html"
       },
       {
-        "path": "dom/nodes/Document-createElementNS.html",
         "url": "/dom/nodes/Document-createElementNS.html"
       },
       {
-        "path": "dom/nodes/Document-createEvent.html",
         "url": "/dom/nodes/Document-createEvent.html"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction-literal-1.xhtml",
-        "url": "/dom/nodes/Document-createProcessingInstruction-literal-1.xhtml"
-      },
-      {
-        "path": "dom/nodes/Document-createProcessingInstruction-literal-2.xhtml",
-        "url": "/dom/nodes/Document-createProcessingInstruction-literal-2.xhtml"
-      },
-      {
-        "path": "dom/nodes/Document-createProcessingInstruction.html",
         "url": "/dom/nodes/Document-createProcessingInstruction.html"
       },
       {
-        "path": "dom/nodes/Document-createProcessingInstruction.xhtml",
         "url": "/dom/nodes/Document-createProcessingInstruction.xhtml"
       },
       {
-        "path": "dom/nodes/Document-createTreeWalker.html",
         "url": "/dom/nodes/Document-createTreeWalker.html"
       },
       {
-        "path": "dom/nodes/Document-doctype.html",
         "url": "/dom/nodes/Document-doctype.html"
       },
       {
-        "path": "dom/nodes/Document-getElementById.html",
         "url": "/dom/nodes/Document-getElementById.html"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagName.html",
         "url": "/dom/nodes/Document-getElementsByTagName.html"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagName.xhtml",
         "url": "/dom/nodes/Document-getElementsByTagName.xhtml"
       },
       {
-        "path": "dom/nodes/Document-getElementsByTagNameNS.html",
         "url": "/dom/nodes/Document-getElementsByTagNameNS.html"
       },
       {
-        "path": "dom/nodes/Document-importNode.html",
+        "url": "/dom/nodes/Document-implementation.html"
+      },
+      {
         "url": "/dom/nodes/Document-importNode.html"
       },
       {
-        "path": "dom/nodes/DocumentType-remove.html",
+        "url": "/dom/nodes/DocumentType-literal.html"
+      },
+      {
+        "url": "/dom/nodes/DocumentType-literal.xhtml"
+      },
+      {
         "url": "/dom/nodes/DocumentType-remove.html"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.html",
         "url": "/dom/nodes/Element-childElement-null.html"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.svg",
         "url": "/dom/nodes/Element-childElement-null.svg"
       },
       {
-        "path": "dom/nodes/Element-childElement-null.xhtml",
         "url": "/dom/nodes/Element-childElement-null.xhtml"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-add.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.svg",
         "url": "/dom/nodes/Element-childElementCount-dynamic-add.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-add.xhtml",
         "url": "/dom/nodes/Element-childElementCount-dynamic-add.xhtml"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.html",
         "url": "/dom/nodes/Element-childElementCount-dynamic-remove.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.svg",
         "url": "/dom/nodes/Element-childElementCount-dynamic-remove.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-dynamic-remove.xhtml",
         "url": "/dom/nodes/Element-childElementCount-dynamic-remove.xhtml"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.html",
         "url": "/dom/nodes/Element-childElementCount-nochild.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.svg",
         "url": "/dom/nodes/Element-childElementCount-nochild.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount-nochild.xhtml",
         "url": "/dom/nodes/Element-childElementCount-nochild.xhtml"
       },
       {
-        "path": "dom/nodes/Element-childElementCount.html",
         "url": "/dom/nodes/Element-childElementCount.html"
       },
       {
-        "path": "dom/nodes/Element-childElementCount.svg",
         "url": "/dom/nodes/Element-childElementCount.svg"
       },
       {
-        "path": "dom/nodes/Element-childElementCount.xhtml",
         "url": "/dom/nodes/Element-childElementCount.xhtml"
       },
       {
-        "path": "dom/nodes/Element-children.html",
         "url": "/dom/nodes/Element-children.html"
       },
       {
-        "path": "dom/nodes/Element-classlist.html",
         "url": "/dom/nodes/Element-classlist.html"
       },
       {
-        "path": "dom/nodes/Element-closest.html",
         "url": "/dom/nodes/Element-closest.html"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-entity.svg",
         "url": "/dom/nodes/Element-firstElementChild-entity.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-entity.xhtml",
         "url": "/dom/nodes/Element-firstElementChild-entity.xhtml"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.html",
         "url": "/dom/nodes/Element-firstElementChild-namespace.html"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.svg",
         "url": "/dom/nodes/Element-firstElementChild-namespace.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild-namespace.xhtml",
         "url": "/dom/nodes/Element-firstElementChild-namespace.xhtml"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild.html",
         "url": "/dom/nodes/Element-firstElementChild.html"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild.svg",
         "url": "/dom/nodes/Element-firstElementChild.svg"
       },
       {
-        "path": "dom/nodes/Element-firstElementChild.xhtml",
         "url": "/dom/nodes/Element-firstElementChild.xhtml"
       },
       {
-        "path": "dom/nodes/Element-getElementsByClassName.html",
         "url": "/dom/nodes/Element-getElementsByClassName.html"
       },
       {
-        "path": "dom/nodes/Element-lastElementChild.html",
         "url": "/dom/nodes/Element-lastElementChild.html"
       },
       {
-        "path": "dom/nodes/Element-lastElementChild.svg",
         "url": "/dom/nodes/Element-lastElementChild.svg"
       },
       {
-        "path": "dom/nodes/Element-lastElementChild.xhtml",
         "url": "/dom/nodes/Element-lastElementChild.xhtml"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.html",
         "url": "/dom/nodes/Element-nextElementSibling.html"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.svg",
         "url": "/dom/nodes/Element-nextElementSibling.svg"
       },
       {
-        "path": "dom/nodes/Element-nextElementSibling.xhtml",
         "url": "/dom/nodes/Element-nextElementSibling.xhtml"
       },
       {
-        "path": "dom/nodes/Element-previousElementSibling.html",
         "url": "/dom/nodes/Element-previousElementSibling.html"
       },
       {
-        "path": "dom/nodes/Element-previousElementSibling.svg",
         "url": "/dom/nodes/Element-previousElementSibling.svg"
       },
       {
-        "path": "dom/nodes/Element-previousElementSibling.xhtml",
         "url": "/dom/nodes/Element-previousElementSibling.xhtml"
       },
       {
-        "path": "dom/nodes/Element-remove.html",
         "url": "/dom/nodes/Element-remove.html"
       },
       {
-        "path": "dom/nodes/Element-removeAttributeNS.html",
         "url": "/dom/nodes/Element-removeAttributeNS.html"
       },
       {
-        "path": "dom/nodes/Element-siblingElement-null.html",
         "url": "/dom/nodes/Element-siblingElement-null.html"
       },
       {
-        "path": "dom/nodes/Element-siblingElement-null.svg",
         "url": "/dom/nodes/Element-siblingElement-null.svg"
       },
       {
-        "path": "dom/nodes/Element-siblingElement-null.xhtml",
         "url": "/dom/nodes/Element-siblingElement-null.xhtml"
       },
       {
-        "path": "dom/nodes/Element-tagName.html",
         "url": "/dom/nodes/Element-tagName.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-attributes.html",
         "url": "/dom/nodes/MutationObserver-attributes.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-characterData.html",
         "url": "/dom/nodes/MutationObserver-characterData.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-childList.html",
         "url": "/dom/nodes/MutationObserver-childList.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-disconnect.html",
         "url": "/dom/nodes/MutationObserver-disconnect.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-document.html",
         "url": "/dom/nodes/MutationObserver-document.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-inner-outer.html",
         "url": "/dom/nodes/MutationObserver-inner-outer.html"
       },
       {
-        "path": "dom/nodes/MutationObserver-takeRecords.html",
         "url": "/dom/nodes/MutationObserver-takeRecords.html"
       },
       {
-        "path": "dom/nodes/Node-appendChild.html",
         "url": "/dom/nodes/Node-appendChild.html"
       },
       {
-        "path": "dom/nodes/Node-childNodes.html",
         "url": "/dom/nodes/Node-childNodes.html"
       },
       {
-        "path": "dom/nodes/Node-cloneNode.html",
         "url": "/dom/nodes/Node-cloneNode.html"
       },
       {
-        "path": "dom/nodes/Node-compareDocumentPosition.html",
         "url": "/dom/nodes/Node-compareDocumentPosition.html"
       },
       {
-        "path": "dom/nodes/Node-constants.html",
         "url": "/dom/nodes/Node-constants.html"
       },
       {
-        "path": "dom/nodes/Node-contains.html",
         "url": "/dom/nodes/Node-contains.html"
       },
       {
-        "path": "dom/nodes/Node-insertBefore.html",
         "url": "/dom/nodes/Node-insertBefore.html"
       },
       {
-        "path": "dom/nodes/Node-isEqualNode.xhtml",
         "url": "/dom/nodes/Node-isEqualNode.xhtml"
       },
       {
-        "path": "dom/nodes/Node-lookupPrefix.xhtml",
         "url": "/dom/nodes/Node-lookupPrefix.xhtml"
       },
       {
-        "path": "dom/nodes/Node-nodeName.html",
         "url": "/dom/nodes/Node-nodeName.html"
       },
       {
-        "path": "dom/nodes/Node-nodeName.xhtml",
         "url": "/dom/nodes/Node-nodeName.xhtml"
       },
       {
-        "path": "dom/nodes/Node-nodeValue.html",
         "url": "/dom/nodes/Node-nodeValue.html"
       },
       {
-        "path": "dom/nodes/Node-normalize.html",
         "url": "/dom/nodes/Node-normalize.html"
       },
       {
-        "path": "dom/nodes/Node-parentElement.html",
         "url": "/dom/nodes/Node-parentElement.html"
       },
       {
-        "path": "dom/nodes/Node-parentNode.html",
         "url": "/dom/nodes/Node-parentNode.html"
       },
       {
-        "path": "dom/nodes/Node-properties.html",
         "url": "/dom/nodes/Node-properties.html"
       },
       {
-        "path": "dom/nodes/Node-removeChild.html",
         "url": "/dom/nodes/Node-removeChild.html"
       },
       {
-        "path": "dom/nodes/Node-replaceChild.html",
         "url": "/dom/nodes/Node-replaceChild.html"
       },
       {
-        "path": "dom/nodes/Node-textContent.html",
         "url": "/dom/nodes/Node-textContent.html"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.html",
         "url": "/dom/nodes/ParentNode-querySelector-All.html"
       },
       {
-        "path": "dom/nodes/ParentNode-querySelector-All.xht",
         "url": "/dom/nodes/ParentNode-querySelector-All.xht"
       },
       {
-        "path": "dom/nodes/attributes.html",
+        "url": "/dom/nodes/ProcessingInstruction-literal-1.xhtml"
+      },
+      {
+        "url": "/dom/nodes/ProcessingInstruction-literal-2.xhtml"
+      },
+      {
         "url": "/dom/nodes/attributes.html"
       },
       {
-        "path": "dom/nodes/case.html",
         "url": "/dom/nodes/case.html"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-01.htm",
         "url": "/dom/nodes/getElementsByClassName-01.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-02.htm",
         "url": "/dom/nodes/getElementsByClassName-02.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-03.htm",
         "url": "/dom/nodes/getElementsByClassName-03.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-04.htm",
         "url": "/dom/nodes/getElementsByClassName-04.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-05.htm",
         "url": "/dom/nodes/getElementsByClassName-05.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-06.htm",
         "url": "/dom/nodes/getElementsByClassName-06.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-07.htm",
         "url": "/dom/nodes/getElementsByClassName-07.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-08.htm",
         "url": "/dom/nodes/getElementsByClassName-08.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-09.htm",
         "url": "/dom/nodes/getElementsByClassName-09.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-12.htm",
         "url": "/dom/nodes/getElementsByClassName-12.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-13.htm",
         "url": "/dom/nodes/getElementsByClassName-13.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-14.htm",
         "url": "/dom/nodes/getElementsByClassName-14.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-15.htm",
         "url": "/dom/nodes/getElementsByClassName-15.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-16.htm",
         "url": "/dom/nodes/getElementsByClassName-16.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-17.htm",
         "url": "/dom/nodes/getElementsByClassName-17.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-18.htm",
         "url": "/dom/nodes/getElementsByClassName-18.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-19.htm",
         "url": "/dom/nodes/getElementsByClassName-19.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-20.htm",
         "url": "/dom/nodes/getElementsByClassName-20.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-21.htm",
         "url": "/dom/nodes/getElementsByClassName-21.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-22.htm",
         "url": "/dom/nodes/getElementsByClassName-22.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-23.htm",
         "url": "/dom/nodes/getElementsByClassName-23.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-24.htm",
         "url": "/dom/nodes/getElementsByClassName-24.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-25.htm",
         "url": "/dom/nodes/getElementsByClassName-25.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-26.htm",
         "url": "/dom/nodes/getElementsByClassName-26.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-27.htm",
         "url": "/dom/nodes/getElementsByClassName-27.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-28.htm",
         "url": "/dom/nodes/getElementsByClassName-28.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-29.htm",
         "url": "/dom/nodes/getElementsByClassName-29.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-30.htm",
         "url": "/dom/nodes/getElementsByClassName-30.htm"
       },
       {
-        "path": "dom/nodes/getElementsByClassName-31.htm",
         "url": "/dom/nodes/getElementsByClassName-31.htm"
       },
       {
-        "path": "dom/ranges/Range-attributes.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-attributes.html"
-      },
-      {
-        "path": "dom/ranges/Range-cloneContents.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-cloneContents.html"
-      },
-      {
-        "path": "dom/ranges/Range-cloneRange.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-cloneRange.html"
-      },
-      {
-        "path": "dom/ranges/Range-collapse.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-collapse.html"
-      },
-      {
-        "path": "dom/ranges/Range-commonAncestorContainer-2.html",
         "url": "/dom/ranges/Range-commonAncestorContainer-2.html"
       },
       {
-        "path": "dom/ranges/Range-commonAncestorContainer.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-commonAncestorContainer.html"
-      },
-      {
-        "path": "dom/ranges/Range-compareBoundaryPoints.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-compareBoundaryPoints.html"
-      },
-      {
-        "path": "dom/ranges/Range-comparePoint-2.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-comparePoint-2.html"
-      },
-      {
-        "path": "dom/ranges/Range-comparePoint.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-comparePoint.html"
-      },
-      {
-        "path": "dom/ranges/Range-deleteContents.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-deleteContents.html"
-      },
-      {
-        "path": "dom/ranges/Range-detach.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-detach.html"
-      },
-      {
-        "path": "dom/ranges/Range-extractContents.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-extractContents.html"
-      },
-      {
-        "path": "dom/ranges/Range-insertNode.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-insertNode.html"
-      },
-      {
-        "path": "dom/ranges/Range-intersectsNode-binding.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-intersectsNode-binding.html"
-      },
-      {
-        "path": "dom/ranges/Range-intersectsNode.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-intersectsNode.html"
-      },
-      {
-        "path": "dom/ranges/Range-isPointInRange.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-isPointInRange.html"
-      },
-      {
-        "path": "dom/ranges/Range-mutations.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-mutations.html"
-      },
-      {
-        "path": "dom/ranges/Range-selectNode.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-selectNode.html"
-      },
-      {
-        "path": "dom/ranges/Range-set.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-set.html"
-      },
-      {
-        "path": "dom/ranges/Range-surroundContents.html",
-        "timeout": "long",
-        "url": "/dom/ranges/Range-surroundContents.html"
-      },
-      {
-        "path": "dom/traversal/NodeFilter-constants.html",
         "url": "/dom/traversal/NodeFilter-constants.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-acceptNode-filter.html",
         "url": "/dom/traversal/TreeWalker-acceptNode-filter.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-basic.html",
         "url": "/dom/traversal/TreeWalker-basic.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-currentNode.html",
         "url": "/dom/traversal/TreeWalker-currentNode.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-previousNodeLastChildReject.html",
         "url": "/dom/traversal/TreeWalker-previousNodeLastChildReject.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-previousSiblingLastChildSkip.html",
         "url": "/dom/traversal/TreeWalker-previousSiblingLastChildSkip.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-traversal-reject.html",
         "url": "/dom/traversal/TreeWalker-traversal-reject.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-traversal-skip-most.html",
         "url": "/dom/traversal/TreeWalker-traversal-skip-most.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-traversal-skip.html",
         "url": "/dom/traversal/TreeWalker-traversal-skip.html"
       },
       {
-        "path": "dom/traversal/TreeWalker-walking-outside-a-tree.html",
         "url": "/dom/traversal/TreeWalker-walking-outside-a-tree.html"
       },
       {
-        "path": "domparsing/insert-adjacent.html",
         "url": "/domparsing/insert-adjacent.html"
       },
       {
-        "path": "domxpath/001.html",
         "url": "/domxpath/001.html"
       },
       {
-        "path": "domxpath/002.html",
         "url": "/domxpath/002.html"
       },
       {
-        "path": "domxpath/evaluator-constructor.html",
         "url": "/domxpath/evaluator-constructor.html"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-close.htm",
         "url": "/eventsource/dedicated-worker/eventsource-close.htm"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm",
-        "timeout": "long",
-        "url": "/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm"
-      },
-      {
-        "path": "eventsource/dedicated-worker/eventsource-constructor-url-bogus.htm",
         "url": "/eventsource/dedicated-worker/eventsource-constructor-url-bogus.htm"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-eventtarget.htm",
         "url": "/eventsource/dedicated-worker/eventsource-eventtarget.htm"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-onmesage.htm",
         "url": "/eventsource/dedicated-worker/eventsource-onmesage.htm"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-onopen.htm",
         "url": "/eventsource/dedicated-worker/eventsource-onopen.htm"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-prototype.htm",
         "url": "/eventsource/dedicated-worker/eventsource-prototype.htm"
       },
       {
-        "path": "eventsource/dedicated-worker/eventsource-url.htm",
         "url": "/eventsource/dedicated-worker/eventsource-url.htm"
       },
       {
-        "path": "eventsource/event-data.html",
         "url": "/eventsource/event-data.html"
       },
       {
-        "path": "eventsource/eventsource-close.htm",
         "url": "/eventsource/eventsource-close.htm"
       },
       {
-        "path": "eventsource/eventsource-constructor-document-domain.htm",
         "url": "/eventsource/eventsource-constructor-document-domain.htm"
       },
       {
-        "path": "eventsource/eventsource-constructor-non-same-origin.htm",
-        "timeout": "long",
-        "url": "/eventsource/eventsource-constructor-non-same-origin.htm"
-      },
-      {
-        "path": "eventsource/eventsource-constructor-stringify.htm",
         "url": "/eventsource/eventsource-constructor-stringify.htm"
       },
       {
-        "path": "eventsource/eventsource-constructor-url-bogus.htm",
         "url": "/eventsource/eventsource-constructor-url-bogus.htm"
       },
       {
-        "path": "eventsource/eventsource-constructor-url-multi-window.htm",
         "url": "/eventsource/eventsource-constructor-url-multi-window.htm"
       },
       {
-        "path": "eventsource/eventsource-cross-origin.htm",
         "url": "/eventsource/eventsource-cross-origin.htm"
       },
       {
-        "path": "eventsource/eventsource-eventtarget.htm",
         "url": "/eventsource/eventsource-eventtarget.htm"
       },
       {
-        "path": "eventsource/eventsource-onmessage.htm",
         "url": "/eventsource/eventsource-onmessage.htm"
       },
       {
-        "path": "eventsource/eventsource-onopen.htm",
         "url": "/eventsource/eventsource-onopen.htm"
       },
       {
-        "path": "eventsource/eventsource-prototype.htm",
         "url": "/eventsource/eventsource-prototype.htm"
       },
       {
-        "path": "eventsource/eventsource-reconnect.htm",
         "url": "/eventsource/eventsource-reconnect.htm"
       },
       {
-        "path": "eventsource/eventsource-request-cancellation.htm",
         "url": "/eventsource/eventsource-request-cancellation.htm"
       },
       {
-        "path": "eventsource/eventsource-url.htm",
         "url": "/eventsource/eventsource-url.htm"
       },
       {
-        "path": "eventsource/format-bom-2.htm",
         "url": "/eventsource/format-bom-2.htm"
       },
       {
-        "path": "eventsource/format-bom.htm",
         "url": "/eventsource/format-bom.htm"
       },
       {
-        "path": "eventsource/format-comments.htm",
         "url": "/eventsource/format-comments.htm"
       },
       {
-        "path": "eventsource/format-data-before-final-empty-line.htm",
         "url": "/eventsource/format-data-before-final-empty-line.htm"
       },
       {
-        "path": "eventsource/format-field-data.htm",
         "url": "/eventsource/format-field-data.htm"
       },
       {
-        "path": "eventsource/format-field-event-empty.htm",
         "url": "/eventsource/format-field-event-empty.htm"
       },
       {
-        "path": "eventsource/format-field-event.htm",
         "url": "/eventsource/format-field-event.htm"
       },
       {
-        "path": "eventsource/format-field-id-2.htm",
         "url": "/eventsource/format-field-id-2.htm"
       },
       {
-        "path": "eventsource/format-field-id.htm",
         "url": "/eventsource/format-field-id.htm"
       },
       {
-        "path": "eventsource/format-field-parsing.htm",
         "url": "/eventsource/format-field-parsing.htm"
       },
       {
-        "path": "eventsource/format-field-retry-bogus.htm",
         "url": "/eventsource/format-field-retry-bogus.htm"
       },
       {
-        "path": "eventsource/format-field-retry-empty.htm",
         "url": "/eventsource/format-field-retry-empty.htm"
       },
       {
-        "path": "eventsource/format-field-retry.htm",
         "url": "/eventsource/format-field-retry.htm"
       },
       {
-        "path": "eventsource/format-field-unknown.htm",
         "url": "/eventsource/format-field-unknown.htm"
       },
       {
-        "path": "eventsource/format-leading-space.htm",
         "url": "/eventsource/format-leading-space.htm"
       },
       {
-        "path": "eventsource/format-mime-bogus.htm",
         "url": "/eventsource/format-mime-bogus.htm"
       },
       {
-        "path": "eventsource/format-mime-trailing-semicolon.htm",
         "url": "/eventsource/format-mime-trailing-semicolon.htm"
       },
       {
-        "path": "eventsource/format-mime-valid-bogus.htm",
         "url": "/eventsource/format-mime-valid-bogus.htm"
       },
       {
-        "path": "eventsource/format-newlines.htm",
         "url": "/eventsource/format-newlines.htm"
       },
       {
-        "path": "eventsource/format-null-character.html",
         "url": "/eventsource/format-null-character.html"
       },
       {
-        "path": "eventsource/format-utf-8.htm",
         "url": "/eventsource/format-utf-8.htm"
       },
       {
-        "path": "eventsource/interfaces.html",
         "url": "/eventsource/interfaces.html"
       },
       {
-        "path": "eventsource/request-accept.htm",
         "url": "/eventsource/request-accept.htm"
       },
       {
-        "path": "eventsource/request-cache-control.htm",
         "url": "/eventsource/request-cache-control.htm"
       },
       {
-        "path": "eventsource/request-credentials.htm",
         "url": "/eventsource/request-credentials.htm"
       },
       {
-        "path": "eventsource/request-redirect.htm",
         "url": "/eventsource/request-redirect.htm"
       },
       {
-        "path": "eventsource/request-status-error.htm",
         "url": "/eventsource/request-status-error.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-close.htm",
         "url": "/eventsource/shared-worker/eventsource-close.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-constructor-non-same-origin.htm",
-        "timeout": "long",
-        "url": "/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm"
-      },
-      {
-        "path": "eventsource/shared-worker/eventsource-constructor-url-bogus.htm",
         "url": "/eventsource/shared-worker/eventsource-constructor-url-bogus.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-eventtarget.htm",
         "url": "/eventsource/shared-worker/eventsource-eventtarget.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-onmesage.htm",
         "url": "/eventsource/shared-worker/eventsource-onmesage.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-onopen.htm",
         "url": "/eventsource/shared-worker/eventsource-onopen.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-prototype.htm",
         "url": "/eventsource/shared-worker/eventsource-prototype.htm"
       },
       {
-        "path": "eventsource/shared-worker/eventsource-url.htm",
         "url": "/eventsource/shared-worker/eventsource-url.htm"
       },
       {
-        "path": "ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-1.html",
         "url": "/ext-xhtml-pubid/the-xhtml-syntax/parsing-xhtml-documents/xhtml-pubid-1.html"
       },
       {
-        "path": "geolocation-API/PositionOptions.html",
         "url": "/geolocation-API/PositionOptions.html"
       },
       {
-        "path": "geolocation-API/clearWatch_TypeError.html",
         "url": "/geolocation-API/clearWatch_TypeError.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_IDL.html",
         "url": "/geolocation-API/getCurrentPosition_IDL.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_TypeError.html",
         "url": "/geolocation-API/getCurrentPosition_TypeError.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_permission_allow.html",
         "url": "/geolocation-API/getCurrentPosition_permission_allow.html"
       },
       {
-        "path": "geolocation-API/getCurrentPosition_permission_deny.html",
         "url": "/geolocation-API/getCurrentPosition_permission_deny.html"
       },
       {
-        "path": "geolocation-API/interfaces.html",
         "url": "/geolocation-API/interfaces.html"
       },
       {
-        "path": "geolocation-API/watchPosition_TypeError.html",
         "url": "/geolocation-API/watchPosition_TypeError.html"
       },
       {
-        "path": "geolocation-API/watchPosition_permission_deny.html",
         "url": "/geolocation-API/watchPosition_permission_deny.html"
       },
       {
-        "path": "hr-time/basic.html",
         "url": "/hr-time/basic.html"
       },
       {
-        "path": "hr-time/idlharness.html",
         "url": "/hr-time/idlharness.html"
       },
       {
-        "path": "hr-time/monotonic-clock.html",
         "url": "/hr-time/monotonic-clock.html"
       },
       {
-        "path": "hr-time/test_cross_frame_start.html",
         "url": "/hr-time/test_cross_frame_start.html"
       },
       {
-        "path": "html-imports/document/document-method-changes.html",
         "url": "/html-imports/document/document-method-changes.html"
       },
       {
-        "path": "html-imports/fetching/already-in-import-map.html",
         "url": "/html-imports/fetching/already-in-import-map.html"
       },
       {
-        "path": "html-imports/fetching/loading-attempt.html",
         "url": "/html-imports/fetching/loading-attempt.html"
       },
       {
-        "path": "html-imports/html-link-element/import-attribute.html",
         "url": "/html-imports/html-link-element/import-attribute.html"
       },
       {
-        "path": "html-media-capture/capture_fallback_file_upload.html",
         "url": "/html-media-capture/capture_fallback_file_upload.html"
       },
       {
-        "path": "html-media-capture/capture_reflect.html",
         "url": "/html-media-capture/capture_reflect.html"
       },
       {
-        "path": "html-media-capture/idlharness.html",
         "url": "/html-media-capture/idlharness.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/read-media/pageload-image.html",
         "url": "/html/browsers/browsing-the-web/read-media/pageload-image.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/read-media/pageload-video.html",
         "url": "/html/browsers/browsing-the-web/read-media/pageload-video.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/read-text/load-text-plain.html",
         "url": "/html/browsers/browsing-the-web/read-text/load-text-plain.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/unloading-documents/001.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/001.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/unloading-documents/002.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/002.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/unloading-documents/003.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/003.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/unloading-documents/004.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/004.html"
       },
       {
-        "path": "html/browsers/browsing-the-web/unloading-documents/005.html",
         "url": "/html/browsers/browsing-the-web/unloading-documents/005.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/001.html",
         "url": "/html/browsers/history/the-history-interface/001.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/002.html",
         "url": "/html/browsers/history/the-history-interface/002.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/003.html",
         "url": "/html/browsers/history/the-history-interface/003.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/004.html",
         "url": "/html/browsers/history/the-history-interface/004.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/005.html",
         "url": "/html/browsers/history/the-history-interface/005.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/006.html",
         "url": "/html/browsers/history/the-history-interface/006.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/007.html",
-        "timeout": "long",
-        "url": "/html/browsers/history/the-history-interface/007.html"
-      },
-      {
-        "path": "html/browsers/history/the-history-interface/008.html",
         "url": "/html/browsers/history/the-history-interface/008.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/009.html",
         "url": "/html/browsers/history/the-history-interface/009.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/010.html",
         "url": "/html/browsers/history/the-history-interface/010.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/011.html",
         "url": "/html/browsers/history/the-history-interface/011.html"
       },
       {
-        "path": "html/browsers/history/the-history-interface/012.html",
         "url": "/html/browsers/history/the-history-interface/012.html"
       },
       {
-        "path": "html/browsers/history/the-location-interface/location-stringifier.html",
         "url": "/html/browsers/history/the-location-interface/location-stringifier.html"
       },
       {
-        "path": "html/browsers/history/the-location-interface/security_location_0.sub.htm",
         "url": "/html/browsers/history/the-location-interface/security_location_0.sub.htm"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_status_idle.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_idle.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_status_uncached.html",
         "url": "/html/browsers/offline/application-cache-api/api_status_uncached.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_swapcache_error.html",
         "url": "/html/browsers/offline/application-cache-api/api_swapcache_error.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_update.html",
         "url": "/html/browsers/offline/application-cache-api/api_update.html"
       },
       {
-        "path": "html/browsers/offline/application-cache-api/api_update_error.html",
         "url": "/html/browsers/offline/application-cache-api/api_update_error.html"
       },
       {
-        "path": "html/browsers/offline/browser-state/navigator_online_online.html",
         "url": "/html/browsers/offline/browser-state/navigator_online_online.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_cached.html",
         "url": "/html/browsers/offline/introduction-4/event_cached.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_checking.html",
         "url": "/html/browsers/offline/introduction-4/event_checking.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_noupdate.html",
         "url": "/html/browsers/offline/introduction-4/event_noupdate.html"
       },
       {
-        "path": "html/browsers/offline/introduction-4/event_progress.html",
         "url": "/html/browsers/offline/introduction-4/event_progress.html"
       },
       {
-        "path": "html/browsers/offline/manifest_url_check.html",
         "url": "/html/browsers/offline/manifest_url_check.html"
       },
       {
-        "path": "html/browsers/origin/cross-origin-objects/cross-origin-objects.html",
-        "timeout": "long",
-        "url": "/html/browsers/origin/cross-origin-objects/cross-origin-objects.html"
-      },
-      {
-        "path": "html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html",
         "url": "/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html"
       },
       {
-        "path": "html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-02.html",
         "url": "/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-02.html"
       },
       {
-        "path": "html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html",
         "url": "/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-03.html"
       },
       {
-        "path": "html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html",
         "url": "/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html"
       },
       {
-        "path": "html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html",
         "url": "/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html"
       },
       {
-        "path": "html/browsers/the-window-object/security-window/window-security.sub.html",
         "url": "/html/browsers/the-window-object/security-window/window-security.sub.html"
       },
       {
-        "path": "html/browsers/the-window-object/window-aliases.html",
         "url": "/html/browsers/the-window-object/window-aliases.html"
       },
       {
-        "path": "html/browsers/the-window-object/window-indexed-properties-strict.html",
         "url": "/html/browsers/the-window-object/window-indexed-properties-strict.html"
       },
       {
-        "path": "html/browsers/the-window-object/window-indexed-properties.html",
         "url": "/html/browsers/the-window-object/window-indexed-properties.html"
       },
       {
-        "path": "html/browsers/the-window-object/window-named-properties.html",
         "url": "/html/browsers/the-window-object/window-named-properties.html"
       },
       {
-        "path": "html/browsers/the-window-object/window-properties.html",
         "url": "/html/browsers/the-window-object/window-properties.html"
       },
       {
-        "path": "html/browsers/the-window-object/window-prototype-chain.html",
         "url": "/html/browsers/the-window-object/window-prototype-chain.html"
       },
       {
-        "path": "html/browsers/windows/browsing-context-first-created.xhtml",
         "url": "/html/browsers/windows/browsing-context-first-created.xhtml"
       },
       {
-        "path": "html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html",
         "url": "/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html"
       },
       {
-        "path": "html/browsers/windows/browsing-context-names/browsing-context-choose-parent.html",
         "url": "/html/browsers/windows/browsing-context-names/browsing-context-choose-parent.html"
       },
       {
-        "path": "html/browsers/windows/browsing-context-names/browsing-context-choose-self-1.html",
         "url": "/html/browsers/windows/browsing-context-names/browsing-context-choose-self-1.html"
       },
       {
-        "path": "html/browsers/windows/browsing-context-names/browsing-context-choose-self-2.html",
         "url": "/html/browsers/windows/browsing-context-names/browsing-context-choose-self-2.html"
       },
       {
-        "path": "html/browsers/windows/browsing-context-names/browsing-context-default-name.html",
         "url": "/html/browsers/windows/browsing-context-names/browsing-context-default-name.html"
       },
       {
-        "path": "html/browsers/windows/nested-browsing-contexts/frameElement.sub.html",
         "url": "/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.body-getter.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.body-getter.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.body-setter-01.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.body-setter-01.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.forms.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.forms.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html",
+        "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html"
+      },
+      {
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.head-01.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.head-01.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.head-02.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.head-02.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.images.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.images.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-01.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-01.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-02.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-02.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-03.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-03.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-04.xhtml",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-04.xhtml"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-05.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-05.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-06.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-06.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-07.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-07.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/document.title-08.html",
         "url": "/html/dom/documents/dom-tree-accessors/document.title-08.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/nameditem-01.html",
         "url": "/html/dom/documents/dom-tree-accessors/nameditem-01.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/nameditem-02.html",
         "url": "/html/dom/documents/dom-tree-accessors/nameditem-02.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/nameditem-03.html",
         "url": "/html/dom/documents/dom-tree-accessors/nameditem-03.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/nameditem-04.html",
         "url": "/html/dom/documents/dom-tree-accessors/nameditem-04.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/nameditem-05.html",
         "url": "/html/dom/documents/dom-tree-accessors/nameditem-05.html"
       },
       {
-        "path": "html/dom/documents/dom-tree-accessors/nameditem-06.html",
         "url": "/html/dom/documents/dom-tree-accessors/nameditem-06.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-compatmode-01.html",
         "url": "/html/dom/documents/resource-metadata-management/document-compatmode-01.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-compatmode-02.html",
         "url": "/html/dom/documents/resource-metadata-management/document-compatmode-02.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-compatmode-03.html",
         "url": "/html/dom/documents/resource-metadata-management/document-compatmode-03.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml",
         "url": "/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml",
         "url": "/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml",
         "url": "/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-cookie.html",
         "url": "/html/dom/documents/resource-metadata-management/document-cookie.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-lastModified-01.html",
         "url": "/html/dom/documents/resource-metadata-management/document-lastModified-01.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-lastModified.html",
         "url": "/html/dom/documents/resource-metadata-management/document-lastModified.html"
       },
       {
-        "path": "html/dom/documents/resource-metadata-management/document-readyState.html",
         "url": "/html/dom/documents/resource-metadata-management/document-readyState.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml",
         "url": "/html/dom/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/001.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/001.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/002.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/002.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/003.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/003.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/004.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/004.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/005.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/005.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/006.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/006.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/007.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/007.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/008.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/008.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/009.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/009.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/010.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/010.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/011.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/011.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/012.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/012.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/013.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/013.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/014.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/014.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/015.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/015.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/016.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/016.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/017.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/017.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/018.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/018.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/019.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/019.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/020.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/020.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/021.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/021.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/022.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/022.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/023.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/023.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/024.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/024.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/025.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/025.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/026.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/026.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/027.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/027.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/028.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/028.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/029.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/029.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/030.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/030.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/031.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/031.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/032.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/032.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/033.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/033.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/034.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/034.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/035.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/035.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/036.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/036.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/037.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/037.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/038.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/038.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/039.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/039.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/040.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/040.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/041.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/041.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/042.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/042.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/043.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/043.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/044.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/044.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/045.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/045.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/046.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/046.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/047.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/047.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/048.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/048.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/049.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/049.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/050.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/050.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/051.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/051.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml",
         "url": "/html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/document.write-02.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/document.write-02.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_001.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_001.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_002.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_002.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_003.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_003.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_004.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_004.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_005.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_005.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_006.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_006.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_007.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_007.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_008.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_008.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_009.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_009.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/iframe_010.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/iframe_010.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_001.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_001.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_002.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_002.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_003.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_003.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_004.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_004.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_005.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_005.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_006.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_006.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_007.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_007.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_008.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_008.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_009.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_009.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_010.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_010.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_011.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_011.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_012.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_012.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-write/script_013.html",
         "url": "/html/dom/dynamic-markup-insertion/document-write/script_013.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml",
         "url": "/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/document-writeln/document.writeln-02.html",
         "url": "/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-02.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/001.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/001.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/002.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/002.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/004.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/004.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/005.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/005.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/006.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/006.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/007.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/007.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/008.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/008.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/009.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/009.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/011.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/011.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/012.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/012.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/013.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/013.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/014.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/014.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/015.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/015.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/016.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/016.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html"
       },
       {
-        "path": "html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html",
         "url": "/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html"
       },
       {
-        "path": "html/dom/elements/elements-in-the-dom/unknown-element.html",
         "url": "/html/dom/elements/elements-in-the-dom/unknown-element.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/classlist-nonstring.html",
         "url": "/html/dom/elements/global-attributes/classlist-nonstring.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/data_unicode_attr.html",
         "url": "/html/dom/elements/global-attributes/data_unicode_attr.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dataset-delete.html",
         "url": "/html/dom/elements/global-attributes/dataset-delete.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dataset-enumeration.html",
         "url": "/html/dom/elements/global-attributes/dataset-enumeration.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dataset-get.html",
         "url": "/html/dom/elements/global-attributes/dataset-get.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dataset-prototype.html",
         "url": "/html/dom/elements/global-attributes/dataset-prototype.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dataset-set.html",
         "url": "/html/dom/elements/global-attributes/dataset-set.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/dataset.html",
         "url": "/html/dom/elements/global-attributes/dataset.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/document-dir.html",
         "url": "/html/dom/elements/global-attributes/document-dir.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/id-attribute.html",
         "url": "/html/dom/elements/global-attributes/id-attribute.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/id-name-specialcase.html",
         "url": "/html/dom/elements/global-attributes/id-name-specialcase.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/id-name.html",
         "url": "/html/dom/elements/global-attributes/id-name.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-001.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-001.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-002.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-002.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-003.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-003.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-004.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-004.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-005.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-005.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-006.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-006.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-007.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-007.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-008.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-008.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-009.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-009.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-lang-attribute-010.html",
         "url": "/html/dom/elements/global-attributes/the-lang-attribute-010.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-translate-attribute-007.html",
         "url": "/html/dom/elements/global-attributes/the-translate-attribute-007.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-translate-attribute-008.html",
         "url": "/html/dom/elements/global-attributes/the-translate-attribute-008.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-translate-attribute-009.html",
         "url": "/html/dom/elements/global-attributes/the-translate-attribute-009.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-translate-attribute-010.html",
         "url": "/html/dom/elements/global-attributes/the-translate-attribute-010.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-translate-attribute-011.html",
         "url": "/html/dom/elements/global-attributes/the-translate-attribute-011.html"
       },
       {
-        "path": "html/dom/elements/global-attributes/the-translate-attribute-012.html",
         "url": "/html/dom/elements/global-attributes/the-translate-attribute-012.html"
       },
       {
-        "path": "html/dom/interfaces.html",
-        "timeout": "long",
-        "url": "/html/dom/interfaces.html"
-      },
-      {
-        "path": "html/dom/reflection-embedded.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-embedded.html"
-      },
-      {
-        "path": "html/dom/reflection-forms.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-forms.html"
-      },
-      {
-        "path": "html/dom/reflection-grouping.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-grouping.html"
-      },
-      {
-        "path": "html/dom/reflection-metadata.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-metadata.html"
-      },
-      {
-        "path": "html/dom/reflection-misc.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-misc.html"
-      },
-      {
-        "path": "html/dom/reflection-obsolete.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-obsolete.html"
-      },
-      {
-        "path": "html/dom/reflection-sections.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-sections.html"
-      },
-      {
-        "path": "html/dom/reflection-tabular.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-tabular.html"
-      },
-      {
-        "path": "html/dom/reflection-text.html",
-        "timeout": "long",
-        "url": "/html/dom/reflection-text.html"
-      },
-      {
-        "path": "html/editing/dnd/dom/draggable.html",
         "url": "/html/editing/dnd/dom/draggable.html"
       },
       {
-        "path": "html/editing/dnd/dom/events.html",
         "url": "/html/editing/dnd/dom/events.html"
       },
       {
-        "path": "html/editing/dnd/dom/specials.html",
         "url": "/html/editing/dnd/dom/specials.html"
       },
       {
-        "path": "html/editing/dnd/synthetic/001.html",
         "url": "/html/editing/dnd/synthetic/001.html"
       },
       {
-        "path": "html/editing/dnd/target-origin/202.html",
         "url": "/html/editing/dnd/target-origin/202.html"
       },
       {
-        "path": "html/editing/dnd/the-draggable-attribute/draggable_attribute.html",
         "url": "/html/editing/dnd/the-draggable-attribute/draggable_attribute.html"
       },
       {
-        "path": "html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html",
         "url": "/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html"
       },
       {
-        "path": "html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html",
         "url": "/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html"
       },
       {
-        "path": "html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html",
         "url": "/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html"
       },
       {
-        "path": "html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html",
         "url": "/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html"
       },
       {
-        "path": "html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html",
         "url": "/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html"
       },
       {
-        "path": "html/editing/focus/document-level-focus-apis/document-level-apis.html",
         "url": "/html/editing/focus/document-level-focus-apis/document-level-apis.html"
       },
       {
-        "path": "html/editing/focus/focus-management/focus-events.html",
         "url": "/html/editing/focus/focus-management/focus-events.html"
       },
       {
-        "path": "html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html",
         "url": "/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html"
       },
       {
-        "path": "html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html",
         "url": "/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html"
       },
       {
-        "path": "html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html",
         "url": "/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html"
       },
       {
-        "path": "html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html",
         "url": "/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html"
       },
       {
-        "path": "html/infrastructure/common-dom-interfaces/collections/radionodelist.html",
         "url": "/html/infrastructure/common-dom-interfaces/collections/radionodelist.html"
       },
       {
-        "path": "html/infrastructure/conformance-requirements/extensibility/foreign.html",
         "url": "/html/infrastructure/conformance-requirements/extensibility/foreign.html"
       },
       {
-        "path": "html/infrastructure/terminology/plugins/text-plain.html",
         "url": "/html/infrastructure/terminology/plugins/text-plain.html"
       },
       {
-        "path": "html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.xhtml",
         "url": "/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.xhtml"
       },
       {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html",
-        "timeout": "long",
-        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html"
-      },
-      {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html",
-        "timeout": "long",
-        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html"
-      },
-      {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html",
-        "timeout": "long",
-        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html"
-      },
-      {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html",
-        "timeout": "long",
-        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html"
-      },
-      {
-        "path": "html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html",
-        "timeout": "long",
-        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html"
-      },
-      {
-        "path": "html/infrastructure/urls/terminology-0/document-base-url.html",
         "url": "/html/infrastructure/urls/terminology-0/document-base-url.html"
       },
       {
-        "path": "html/infrastructure/urls/terminology-0/multiple-base.sub.html",
         "url": "/html/infrastructure/urls/terminology-0/multiple-base.sub.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/nothing.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/nothing.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html",
         "url": "/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html"
       },
       {
-        "path": "html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html",
         "url": "/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html"
       },
       {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html",
-        "timeout": "long",
-        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html"
-      },
-      {
-        "path": "html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html",
         "url": "/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html"
       },
       {
-        "path": "html/semantics/disabled-elements/disabledElement.html",
         "url": "/html/semantics/disabled-elements/disabledElement.html"
       },
       {
-        "path": "html/semantics/document-metadata/styling/LinkStyle.html",
         "url": "/html/semantics/document-metadata/styling/LinkStyle.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-base-element/base_href_empty.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_href_empty.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-base-element/base_href_specified.sub.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-base-element/base_href_unspecified.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_href_unspecified.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-base-element/base_multiple.html",
         "url": "/html/semantics/document-metadata/the-base-element/base_multiple.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-link-element/link-rellist.html",
         "url": "/html/semantics/document-metadata/the-link-element/link-rellist.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-link-element/link-style-error-01.html",
         "url": "/html/semantics/document-metadata/the-link-element/link-style-error-01.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html",
         "url": "/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-style-element/style-error-01.html",
         "url": "/html/semantics/document-metadata/the-style-element/style-error-01.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-style-element/style_disabled.html",
         "url": "/html/semantics/document-metadata/the-style-element/style_disabled.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-style-element/style_events.html",
         "url": "/html/semantics/document-metadata/the-style-element/style_events.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-style-element/style_media.html",
         "url": "/html/semantics/document-metadata/the-style-element/style_media.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-style-element/style_scoped.html",
         "url": "/html/semantics/document-metadata/the-style-element/style_scoped.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-title-element/title.text-01.html",
         "url": "/html/semantics/document-metadata/the-title-element/title.text-01.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-title-element/title.text-02.xhtml",
         "url": "/html/semantics/document-metadata/the-title-element/title.text-02.xhtml"
       },
       {
-        "path": "html/semantics/document-metadata/the-title-element/title.text-03.html",
         "url": "/html/semantics/document-metadata/the-title-element/title.text-03.html"
       },
       {
-        "path": "html/semantics/document-metadata/the-title-element/title.text-04.xhtml",
         "url": "/html/semantics/document-metadata/the-title-element/title.text-04.xhtml"
       },
       {
-        "path": "html/semantics/edits/the-del-element/del_effect.html",
         "url": "/html/semantics/edits/the-del-element/del_effect.html"
       },
       {
-        "path": "html/semantics/edits/the-ins-element/ins_effect.html",
         "url": "/html/semantics/edits/the-ins-element/ins_effect.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/audio_loop_base.html",
-        "timeout": "long",
-        "url": "/html/semantics/embedded-content/media-elements/audio_loop_base.html"
-      },
-      {
-        "path": "html/semantics/embedded-content/media-elements/audio_volume_check.html",
         "url": "/html/semantics/embedded-content/media-elements/audio_volume_check.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/error-codes/error.html",
         "url": "/html/semantics/embedded-content/media-elements/error-codes/error.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_canplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_canplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_canplaythrough.html",
         "url": "/html/semantics/embedded-content/media-elements/event_canplaythrough.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_loadeddata.html",
         "url": "/html/semantics/embedded-content/media-elements/event_loadeddata.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_loadedmetadata.html",
         "url": "/html/semantics/embedded-content/media-elements/event_loadedmetadata.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_loadstart.html",
         "url": "/html/semantics/embedded-content/media-elements/event_loadstart.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html",
         "url": "/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html",
         "url": "/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html",
         "url": "/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html",
         "url": "/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_pause.html",
         "url": "/html/semantics/embedded-content/media-elements/event_pause.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_pause_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_play.html",
         "url": "/html/semantics/embedded-content/media-elements/event_play.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_play_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_play_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_playing.html",
         "url": "/html/semantics/embedded-content/media-elements/event_playing.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_playing_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_progress.html",
         "url": "/html/semantics/embedded-content/media-elements/event_progress.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_progress_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_timeupdate.html",
         "url": "/html/semantics/embedded-content/media-elements/event_timeupdate.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/event_volumechange.html",
         "url": "/html/semantics/embedded-content/media-elements/event_volumechange.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/historical.html",
         "url": "/html/semantics/embedded-content/media-elements/historical.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/addTextTrack.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLMediaElement/textTracks.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/default.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/kind.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/label.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/readyState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/src.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/srclang.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/HTMLElement/HTMLTrackElement/track.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/activeCues.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/addCue.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/constants.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/cues.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/kind.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/label.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/language.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/mode.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/oncuechange.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrack/removeCue.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/endTime.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/id.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onenter.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/onexit.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/pauseOnExit.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/startTime.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCue/track.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getCueById.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/getter.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackCueList/length.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getTrackById.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/getter.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/length.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onaddtrack.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TextTrackList/onremovetrack.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/constructor.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html",
         "url": "/html/semantics/embedded-content/media-elements/interfaces/TrackEvent/createEvent.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/autoplay-overrides-preload.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-removes-queued-error-event.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-moved.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-addEventListener.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-no-listener.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-no-listener.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-remove-onerror.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor-no-src.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-audio-constructor.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-in-sync-event.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-fragment-into-document.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-fragment-into-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-document.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-parent-into-document.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-parent-into-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-div.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-div.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-namespace.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-in-namespace.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-networkState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-load.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-play.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-in-namespace.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-in-namespace.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-networkState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-control.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-br.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-source.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-insert-text.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source-after.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-source.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-pointer-remove-text.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-source.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-remove-src.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html",
         "url": "/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-source-media.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html",
         "url": "/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/mime-types/canPlayType.html",
         "url": "/html/semantics/embedded-content/media-elements/mime-types/canPlayType.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/networkState_during_loadstart.html",
         "url": "/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/networkState_during_progress.html",
         "url": "/html/semantics/embedded-content/media-elements/networkState_during_progress.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/networkState_initial.html",
         "url": "/html/semantics/embedded-content/media-elements/networkState_initial.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html",
         "url": "/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/currentTime.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/duration.html",
         "url": "/html/semantics/embedded-content/media-elements/offsets-into-the-media-resource/duration.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/paused_false_during_play.html",
         "url": "/html/semantics/embedded-content/media-elements/paused_false_during_play.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/paused_true_during_pause.html",
         "url": "/html/semantics/embedded-content/media-elements/paused_true_during_pause.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html",
         "url": "/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-to-other-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html",
         "url": "/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-move-within-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html",
         "url": "/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document-networkState.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html",
         "url": "/html/semantics/embedded-content/media-elements/playing-the-media-resource/pause-remove-from-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html",
         "url": "/html/semantics/embedded-content/media-elements/playing-the-media-resource/play-in-detached-document.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html",
         "url": "/html/semantics/embedded-content/media-elements/playing-the-media-resource/playbackRate.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/ready-states/autoplay.html",
         "url": "/html/semantics/embedded-content/media-elements/ready-states/autoplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/readyState_during_canplay.html",
         "url": "/html/semantics/embedded-content/media-elements/readyState_during_canplay.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html",
         "url": "/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html",
         "url": "/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html",
         "url": "/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/readyState_during_playing.html",
         "url": "/html/semantics/embedded-content/media-elements/readyState_during_playing.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/readyState_initial.html",
         "url": "/html/semantics/embedded-content/media-elements/readyState_initial.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html",
         "url": "/html/semantics/embedded-content/media-elements/seeking/seek-to-currentTime.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm",
         "url": "/html/semantics/embedded-content/media-elements/seeking/seek-to-max-value.htm"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm",
         "url": "/html/semantics/embedded-content/media-elements/seeking/seek-to-negative-time.htm"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html",
         "url": "/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/synchronising-multiple-media-elements/media-controllers/task-source.html",
         "url": "/html/semantics/embedded-content/media-elements/synchronising-multiple-media-elements/media-controllers/task-source.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cloneNode.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cloneNode.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/003.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/003.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/004.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/004.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/005.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/005.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/006.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/006.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/007.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/007.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/008.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/008.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/009.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/009.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/010.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/010.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/011.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/011.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/012.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/012.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/013.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/013.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/014.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/014.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/015.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/015.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/016.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/016.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/017.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/017.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/018.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/018.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/019.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/019.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/020.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/020.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/021.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/021.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/022.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/022.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/023.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/023.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/024.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/024.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/025.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/025.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/026.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/026.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/027.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/027.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/028.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/028.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/029.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/029.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/030.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/030.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/031.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/031.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/032.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/032.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/033.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/033.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/034.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/034.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/035.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/035.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/036.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/036.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/037.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/037.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/038.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/038.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/039.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/039.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/040.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/040.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/041.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/041.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/042.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/042.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/043.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/043.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/044.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/044.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/045.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/045.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/cors/046.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/cors/046.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/src-clear-cues.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/src-clear-cues.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html",
         "url": "/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/user-interface/muted.html",
         "url": "/html/semantics/embedded-content/media-elements/user-interface/muted.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/video_loop_base.html",
-        "timeout": "long",
-        "url": "/html/semantics/embedded-content/media-elements/video_loop_base.html"
-      },
-      {
-        "path": "html/semantics/embedded-content/media-elements/video_volume_check.html",
         "url": "/html/semantics/embedded-content/media-elements/video_volume_check.html"
       },
       {
-        "path": "html/semantics/embedded-content/media-elements/volume_nonfinite.html",
         "url": "/html/semantics/embedded-content/media-elements/volume_nonfinite.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-area-element/area-stringifier.html",
         "url": "/html/semantics/embedded-content/the-area-element/area-stringifier.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-audio-element/audio_constructor.html",
         "url": "/html/semantics/embedded-content/the-audio-element/audio_constructor.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.type.exists.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.type.extend.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/2d.type.replace.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.casesensitive.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.emptystring.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.emptystring.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/fallback.basic.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/fallback.basic.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/fallback.multiple.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/fallback.nested.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/fallback.nested.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.colour.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.colour.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.different.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.path.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.same.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.dataURI.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.dataURI.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.drawImage.image.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.create.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.create.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.cross.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/security.reset.sub.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/security.reset.sub.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.default.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/size.attributes.style.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.default.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.png.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/type.delete.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/type.delete.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/type.exists.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/type.exists.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/type.extend.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/type.extend.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/type.name.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/type.name.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/type.prototype.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/type.prototype.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-canvas-element/type.replace.html",
         "url": "/html/semantics/embedded-content/the-canvas-element/type.replace.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-embed-element/embed-dimension.html",
         "url": "/html/semantics/embedded-content/the-embed-element/embed-dimension.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html",
+        "url": "/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm"
+      },
+      {
         "url": "/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html",
+        "url": "/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html"
+      },
+      {
+        "url": "/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html"
+      },
+      {
+        "url": "/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html"
+      },
+      {
+        "url": "/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html"
+      },
+      {
         "url": "/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/current-pixel-density/error.html",
         "url": "/html/semantics/embedded-content/the-img-element/current-pixel-density/error.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/img.complete.html",
         "url": "/html/semantics/embedded-content/the-img-element/img.complete.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/relevant-mutations.html",
         "url": "/html/semantics/embedded-content/the-img-element/relevant-mutations.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html",
         "url": "/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html",
         "url": "/html/semantics/embedded-content/the-img-element/srcset/parse-a-srcset-attribute.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html",
         "url": "/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-img-element/update-the-source-set.html",
         "url": "/html/semantics/embedded-content/the-img-element/update-the-source-set.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-object-element/object-attributes.html",
         "url": "/html/semantics/embedded-content/the-object-element/object-attributes.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-object-element/object-events.html",
         "url": "/html/semantics/embedded-content/the-object-element/object-events.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-object-element/object-fallback.html",
         "url": "/html/semantics/embedded-content/the-object-element/object-fallback.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-object-element/object-handler.html",
         "url": "/html/semantics/embedded-content/the-object-element/object-handler.html"
       },
       {
-        "path": "html/semantics/embedded-content/the-video-element/video-tabindex.html",
         "url": "/html/semantics/embedded-content/the-video-element/video-tabindex.html"
       },
       {
-        "path": "html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html",
         "url": "/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html"
       },
       {
-        "path": "html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html",
         "url": "/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html"
       },
       {
-        "path": "html/semantics/forms/attributes-common-to-form-controls/formaction.html",
         "url": "/html/semantics/forms/attributes-common-to-form-controls/formaction.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-checkValidity.html",
         "url": "/html/semantics/forms/constraints/form-validation-checkValidity.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-reportValidity.html",
         "url": "/html/semantics/forms/constraints/form-validation-reportValidity.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validate.html",
         "url": "/html/semantics/forms/constraints/form-validation-validate.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-badInput.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-badInput.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-customError.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-customError.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-patternMismatch.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-stepMismatch.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-tooLong.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-tooLong.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-tooShort.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-tooShort.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-typeMismatch.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-valid.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-valid.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-validity-valueMissing.html",
         "url": "/html/semantics/forms/constraints/form-validation-validity-valueMissing.html"
       },
       {
-        "path": "html/semantics/forms/constraints/form-validation-willValidate.html",
         "url": "/html/semantics/forms/constraints/form-validation-willValidate.html"
       },
       {
-        "path": "html/semantics/forms/constraints/inputwillvalidate.html",
         "url": "/html/semantics/forms/constraints/inputwillvalidate.html"
       },
       {
-        "path": "html/semantics/forms/resetting-a-form/reset-form.html",
         "url": "/html/semantics/forms/resetting-a-form/reset-form.html"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/select-event.html",
         "url": "/html/semantics/forms/textfieldselection/select-event.html"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/selection-not-application-textarea.html",
         "url": "/html/semantics/forms/textfieldselection/selection-not-application-textarea.html"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/selection-not-application.html",
         "url": "/html/semantics/forms/textfieldselection/selection-not-application.html"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/selection.html",
         "url": "/html/semantics/forms/textfieldselection/selection.html"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html",
         "url": "/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html"
       },
       {
-        "path": "html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html",
         "url": "/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html"
       },
       {
-        "path": "html/semantics/forms/the-button-element/button-events.html",
         "url": "/html/semantics/forms/the-button-element/button-events.html"
       },
       {
-        "path": "html/semantics/forms/the-button-element/button-validation.html",
         "url": "/html/semantics/forms/the-button-element/button-validation.html"
       },
       {
-        "path": "html/semantics/forms/the-datalist-element/datalistelement.html",
-        "url": "/html/semantics/forms/the-datalist-element/datalistelement.html"
-      },
-      {
-        "path": "html/semantics/forms/the-datalist-element/datalistoptions.html",
         "url": "/html/semantics/forms/the-datalist-element/datalistoptions.html"
       },
       {
-        "path": "html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html",
         "url": "/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html"
       },
       {
-        "path": "html/semantics/forms/the-fieldset-element/disabled.html",
         "url": "/html/semantics/forms/the-fieldset-element/disabled.html"
       },
       {
-        "path": "html/semantics/forms/the-form-element/form-autocomplete.html",
         "url": "/html/semantics/forms/the-form-element/form-autocomplete.html"
       },
       {
-        "path": "html/semantics/forms/the-form-element/form-elements-interfaces-01.html",
         "url": "/html/semantics/forms/the-form-element/form-elements-interfaces-01.html"
       },
       {
-        "path": "html/semantics/forms/the-form-element/form-elements-matches.html",
         "url": "/html/semantics/forms/the-form-element/form-elements-matches.html"
       },
       {
-        "path": "html/semantics/forms/the-form-element/form-elements-nameditem-01.html",
         "url": "/html/semantics/forms/the-form-element/form-elements-nameditem-01.html"
       },
       {
-        "path": "html/semantics/forms/the-form-element/form-elements-nameditem-02.html",
         "url": "/html/semantics/forms/the-form-element/form-elements-nameditem-02.html"
       },
       {
-        "path": "html/semantics/forms/the-form-element/form-nameditem.html",
         "url": "/html/semantics/forms/the-form-element/form-nameditem.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/button.html",
         "url": "/html/semantics/forms/the-input-element/button.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/checkbox.html",
         "url": "/html/semantics/forms/the-input-element/checkbox.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/checked.xhtml",
         "url": "/html/semantics/forms/the-input-element/checked.xhtml"
       },
       {
-        "path": "html/semantics/forms/the-input-element/color.html",
         "url": "/html/semantics/forms/the-input-element/color.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/date.html",
         "url": "/html/semantics/forms/the-input-element/date.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/datetime-2.html",
         "url": "/html/semantics/forms/the-input-element/datetime-2.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/datetime-local.html",
         "url": "/html/semantics/forms/the-input-element/datetime-local.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/datetime.html",
         "url": "/html/semantics/forms/the-input-element/datetime.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/email.html",
         "url": "/html/semantics/forms/the-input-element/email.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/hidden.html",
         "url": "/html/semantics/forms/the-input-element/hidden.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/input-textselection-01.html",
         "url": "/html/semantics/forms/the-input-element/input-textselection-01.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/input-type-button.html",
         "url": "/html/semantics/forms/the-input-element/input-type-button.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/input-type-checkbox.html",
         "url": "/html/semantics/forms/the-input-element/input-type-checkbox.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/month.html",
         "url": "/html/semantics/forms/the-input-element/month.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/number.html",
         "url": "/html/semantics/forms/the-input-element/number.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/password.html",
         "url": "/html/semantics/forms/the-input-element/password.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/pattern_attribute.html",
         "url": "/html/semantics/forms/the-input-element/pattern_attribute.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/radio-groupname-case.html",
         "url": "/html/semantics/forms/the-input-element/radio-groupname-case.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/radio.html",
         "url": "/html/semantics/forms/the-input-element/radio.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/range-2.html",
         "url": "/html/semantics/forms/the-input-element/range-2.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/range.html",
         "url": "/html/semantics/forms/the-input-element/range.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/required_attribute.html",
         "url": "/html/semantics/forms/the-input-element/required_attribute.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/reset.html",
         "url": "/html/semantics/forms/the-input-element/reset.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/search_input.html",
         "url": "/html/semantics/forms/the-input-element/search_input.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/telephone.html",
         "url": "/html/semantics/forms/the-input-element/telephone.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/text.html",
         "url": "/html/semantics/forms/the-input-element/text.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/time-2.html",
         "url": "/html/semantics/forms/the-input-element/time-2.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/time.html",
         "url": "/html/semantics/forms/the-input-element/time.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/type-change-state.html",
         "url": "/html/semantics/forms/the-input-element/type-change-state.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/url.html",
         "url": "/html/semantics/forms/the-input-element/url.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/valueMode.html",
         "url": "/html/semantics/forms/the-input-element/valueMode.html"
       },
       {
-        "path": "html/semantics/forms/the-input-element/week.html",
         "url": "/html/semantics/forms/the-input-element/week.html"
       },
       {
-        "path": "html/semantics/forms/the-label-element/label-attributes.html",
         "url": "/html/semantics/forms/the-label-element/label-attributes.html"
       },
       {
-        "path": "html/semantics/forms/the-label-element/labelable-elements.html",
         "url": "/html/semantics/forms/the-label-element/labelable-elements.html"
       },
       {
-        "path": "html/semantics/forms/the-meter-element/meter.html",
         "url": "/html/semantics/forms/the-meter-element/meter.html"
       },
       {
-        "path": "html/semantics/forms/the-option-element/option-text-backslash.html",
+        "url": "/html/semantics/forms/the-option-element/option-label.html"
+      },
+      {
         "url": "/html/semantics/forms/the-option-element/option-text-backslash.html"
       },
       {
-        "path": "html/semantics/forms/the-option-element/option-text-recurse.html",
+        "url": "/html/semantics/forms/the-option-element/option-text-label.html"
+      },
+      {
         "url": "/html/semantics/forms/the-option-element/option-text-recurse.html"
       },
       {
-        "path": "html/semantics/forms/the-option-element/option-text-spaces.html",
         "url": "/html/semantics/forms/the-option-element/option-text-spaces.html"
       },
       {
-        "path": "html/semantics/forms/the-output-element/output.html",
+        "url": "/html/semantics/forms/the-option-element/option-value.html"
+      },
+      {
         "url": "/html/semantics/forms/the-output-element/output.html"
       },
       {
-        "path": "html/semantics/forms/the-progress-element/progress-2.html",
         "url": "/html/semantics/forms/the-progress-element/progress-2.html"
       },
       {
-        "path": "html/semantics/forms/the-progress-element/progress.html",
         "url": "/html/semantics/forms/the-progress-element/progress.html"
       },
       {
-        "path": "html/semantics/forms/the-select-element/select-named-getter.html",
         "url": "/html/semantics/forms/the-select-element/select-named-getter.html"
       },
       {
-        "path": "html/semantics/forms/the-select-element/select-remove.html",
         "url": "/html/semantics/forms/the-select-element/select-remove.html"
       },
       {
-        "path": "html/semantics/forms/the-textarea-element/textarea-type.html",
         "url": "/html/semantics/forms/the-textarea-element/textarea-type.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-blockquote-element/grouping-blockquote.sub.html",
         "url": "/html/semantics/grouping-content/the-blockquote-element/grouping-blockquote.sub.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-dd-element/grouping-dd.html",
         "url": "/html/semantics/grouping-content/the-dd-element/grouping-dd.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-div-element/grouping-div.html",
         "url": "/html/semantics/grouping-content/the-div-element/grouping-div.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-dl-element/grouping-dl.html",
         "url": "/html/semantics/grouping-content/the-dl-element/grouping-dl.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-dt-element/grouping-dt.html",
         "url": "/html/semantics/grouping-content/the-dt-element/grouping-dt.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html",
         "url": "/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-figure-element/grouping-figure.html",
         "url": "/html/semantics/grouping-content/the-figure-element/grouping-figure.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-hr-element/grouping-hr.html",
         "url": "/html/semantics/grouping-content/the-hr-element/grouping-hr.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-li-element/grouping-li.html",
         "url": "/html/semantics/grouping-content/the-li-element/grouping-li.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/grouping-ol.html",
         "url": "/html/semantics/grouping-content/the-ol-element/grouping-ol.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html",
         "url": "/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html",
         "url": "/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-p-element/grouping-p.html",
         "url": "/html/semantics/grouping-content/the-p-element/grouping-p.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-pre-element/grouping-pre.html",
         "url": "/html/semantics/grouping-content/the-pre-element/grouping-pre.html"
       },
       {
-        "path": "html/semantics/grouping-content/the-ul-element/grouping-ul.html",
         "url": "/html/semantics/grouping-content/the-ul-element/grouping-ul.html"
       },
       {
-        "path": "html/semantics/interactive-elements/the-details-element/toggleEvent.html",
         "url": "/html/semantics/interactive-elements/the-details-element/toggleEvent.html"
       },
       {
-        "path": "html/semantics/interactive-elements/the-dialog-element/dialog-close.html",
         "url": "/html/semantics/interactive-elements/the-dialog-element/dialog-close.html"
       },
       {
-        "path": "html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html",
         "url": "/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html"
       },
       {
-        "path": "html/semantics/interfaces.html",
         "url": "/html/semantics/interfaces.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_001.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_001.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_002.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_002.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_003.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_003.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_004.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_004.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_005.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_005.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_006.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_006.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_007.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_007.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_008.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_008.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_009.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_009.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_010.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_010.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/async_011.htm",
         "url": "/html/semantics/scripting-1/the-script-element/async_011.htm"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-before-after-events.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-before-after-events.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-for-event.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-event.xhtml",
         "url": "/html/semantics/scripting-1/the-script-element/script-for-event.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-for-onload.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-for-onload.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-language-type.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-language-type.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-languages-01.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-languages-01.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-languages-02.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-languages-02.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-noembed-noframes-iframe.xhtml",
         "url": "/html/semantics/scripting-1/the-script-element/script-noembed-noframes-iframe.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-onload-string.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-onload-string.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-text.html",
         "url": "/html/semantics/scripting-1/the-script-element/script-text.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-script-element/script-text.xhtml",
         "url": "/html/semantics/scripting-1/the-script-element/script-text.xhtml"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/node-document.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-parsing-xhtml-documents/template-child-nodes.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-serializing-xhtml-documents/outerhtml.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/template-clone-children.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/template-clone-children.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/templates-copy-document-owner.html",
         "url": "/html/semantics/scripting-1/the-template-element/additions-to-the-steps-to-clone-a-node/templates-copy-document-owner.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-document-type.html",
         "url": "/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-document-type.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-001.html",
         "url": "/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-001.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-002.html",
         "url": "/html/semantics/scripting-1/the-template-element/definitions/template-contents-owner-test-002.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/definitions/template-contents.html",
         "url": "/html/semantics/scripting-1/the-template-element/definitions/template-contents.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/innerhtml-on-templates/innerhtml.html",
         "url": "/html/semantics/scripting-1/the-template-element/innerhtml-on-templates/innerhtml.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/serializing-html-templates/outerhtml.html",
         "url": "/html/semantics/scripting-1/the-template-element/serializing-html-templates/outerhtml.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/content-attribute.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/content-attribute.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/node-document-changes.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/node-document-changes.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/template-content-node-document.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/template-content-node-document.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/template-content.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/template-content.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/template-descendant-body.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/template-descendant-body.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/template-descendant-frameset.html"
       },
       {
-        "path": "html/semantics/scripting-1/the-template-element/template-element/template-descendant-head.html",
         "url": "/html/semantics/scripting-1/the-template-element/template-element/template-descendant-head.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/checked.html",
         "url": "/html/semantics/selectors/pseudo-classes/checked.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/default.html",
         "url": "/html/semantics/selectors/pseudo-classes/default.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/dir.html",
         "url": "/html/semantics/selectors/pseudo-classes/dir.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/dir01.html",
         "url": "/html/semantics/selectors/pseudo-classes/dir01.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/disabled.html",
         "url": "/html/semantics/selectors/pseudo-classes/disabled.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/enabled.html",
         "url": "/html/semantics/selectors/pseudo-classes/enabled.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/focus.html",
         "url": "/html/semantics/selectors/pseudo-classes/focus.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/indeterminate.html",
         "url": "/html/semantics/selectors/pseudo-classes/indeterminate.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/inrange-outofrange.html",
         "url": "/html/semantics/selectors/pseudo-classes/inrange-outofrange.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/link.html",
         "url": "/html/semantics/selectors/pseudo-classes/link.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/readwrite-readonly.html",
         "url": "/html/semantics/selectors/pseudo-classes/readwrite-readonly.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/required-optional.html",
         "url": "/html/semantics/selectors/pseudo-classes/required-optional.html"
       },
       {
-        "path": "html/semantics/selectors/pseudo-classes/valid-invalid.html",
         "url": "/html/semantics/selectors/pseudo-classes/valid-invalid.html"
       },
       {
-        "path": "html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html",
         "url": "/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-caption-element/caption_001.html",
         "url": "/html/semantics/tabular-data/the-caption-element/caption_001.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/caption-methods.html",
         "url": "/html/semantics/tabular-data/the-table-element/caption-methods.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/createTBody.html",
         "url": "/html/semantics/tabular-data/the-table-element/createTBody.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/insertRow-method-01.html",
         "url": "/html/semantics/tabular-data/the-table-element/insertRow-method-01.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/insertRow-method-02.html",
         "url": "/html/semantics/tabular-data/the-table-element/insertRow-method-02.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/tBodies.html",
         "url": "/html/semantics/tabular-data/the-table-element/tBodies.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/table-insertRow.html",
         "url": "/html/semantics/tabular-data/the-table-element/table-insertRow.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-table-element/table-rows.html",
         "url": "/html/semantics/tabular-data/the-table-element/table-rows.html"
       },
       {
-        "path": "html/semantics/tabular-data/the-tr-element/rowIndex.html",
         "url": "/html/semantics/tabular-data/the-tr-element/rowIndex.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-a-element/a-stringifier.html",
         "url": "/html/semantics/text-level-semantics/the-a-element/a-stringifier.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html",
         "url": "/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html",
         "url": "/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html"
       },
       {
-        "path": "html/semantics/text-level-semantics/the-time-element/001.html",
         "url": "/html/semantics/text-level-semantics/the-time-element/001.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-001.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-003.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-004.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-007.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-009.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-015.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-016.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-018.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-030.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-034.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-037.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html"
       },
       {
-        "path": "html/syntax/parsing-html-fragments/the-input-byte-stream-038.html",
         "url": "/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html"
       },
       {
-        "path": "html/syntax/parsing/Document.getElementsByTagName-foreign-01.html",
         "url": "/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html"
       },
       {
-        "path": "html/syntax/parsing/Document.getElementsByTagName-foreign-02.html",
         "url": "/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html"
       },
       {
-        "path": "html/syntax/parsing/Element.getElementsByTagName-foreign-01.html",
         "url": "/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html"
       },
       {
-        "path": "html/syntax/parsing/Element.getElementsByTagName-foreign-02.html",
         "url": "/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_adoption01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_adoption01.html"
+        "url": "/html/syntax/parsing/math-parse01.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_adoption02.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_adoption02.html"
+        "url": "/html/syntax/parsing/math-parse03.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_comments01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_comments01.html"
+        "url": "/html/syntax/parsing/named-character-references.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_doctype01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_doctype01.html"
+        "url": "/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_domjs-unsafe.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_domjs-unsafe.html"
+        "url": "/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_entities01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_entities01.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_entities02.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_entities02.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_html5test-com.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_html5test-com.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_inbody01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_inbody01.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_innerHTML_tests4.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_innerHTML_tests4.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_innerHTML_tests6.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_innerHTML_tests6.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_innerHTML_tests7.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_innerHTML_tests7.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_isindex.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_isindex.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_main-element.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_main-element.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_pending-spec-changes.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_pending-spec-changes.html"
+        "url": "/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_plain-text-unsafe.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_plain-text-unsafe.html"
+        "url": "/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_scriptdata01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_scriptdata01.html"
+        "url": "/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_scripted_adoption01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_scripted_adoption01.html"
+        "url": "/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_scripted_ark.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_scripted_ark.html"
+        "url": "/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_scripted_webkit01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_scripted_webkit01.html"
+        "url": "/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tables01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tables01.html"
+        "url": "/html/syntax/serializing-html-fragments/outerHTML.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_template.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_template.html"
+        "url": "/html/webappapis/atob/base64.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests1.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests1.html"
+        "url": "/html/webappapis/scripting/events/body-onload.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests10.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests10.html"
+        "url": "/html/webappapis/scripting/events/event-handler-javascript.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests11.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests11.html"
+        "url": "/html/webappapis/scripting/events/event-handler-spec-example.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests12.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests12.html"
+        "url": "/html/webappapis/scripting/processing-model-2/addEventListener.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests14.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests14.html"
+        "url": "/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests15.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests15.html"
+        "url": "/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests16.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests16.html"
+        "url": "/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests17.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests17.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests18.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests18.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests19.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests19.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests2.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests2.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-data-url.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests20.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests20.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests21.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests21.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests22.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests22.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests23.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests23.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests24.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests24.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests25.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests25.html"
+        "url": "/html/webappapis/scripting/processing-model-2/compile-error.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests26.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests26.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests3.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests3.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests5.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests5.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests6.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests6.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests7.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests7.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests8.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests8.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tests9.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tests9.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_tricky01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_tricky01.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_webkit01.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_webkit01.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html"
       },
       {
-        "path": "html/syntax/parsing/html5lib_webkit02.html",
-        "timeout": "long",
-        "url": "/html/syntax/parsing/html5lib_webkit02.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html"
       },
       {
-        "path": "html/syntax/parsing/math-parse01.html",
-        "url": "/html/syntax/parsing/math-parse01.html"
+        "url": "/html/webappapis/scripting/processing-model-2/runtime-error.html"
       },
       {
-        "path": "html/syntax/parsing/math-parse03.html",
-        "url": "/html/syntax/parsing/math-parse03.html"
+        "url": "/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html"
       },
       {
-        "path": "html/syntax/parsing/named-character-references.html",
-        "url": "/html/syntax/parsing/named-character-references.html"
+        "url": "/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html",
-        "url": "/html/syntax/parsing/template/additions-to-foster-parenting/template-is-a-foster-parent-element.html"
+        "url": "/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html",
-        "url": "/html/syntax/parsing/template/additions-to-foster-parenting/template-is-not-a-foster-parent-element.html"
+        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content.html"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/generating-of-implied-end-tags.html"
+        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/001.xhtml"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-body-token.html"
+        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/002.xhtml"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html"
+        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/003.xhtml"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html"
+        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/004.xhtml"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html"
+        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/005.xhtml"
       },
       {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-body.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/start-tag-html.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/template-end-tag-without-start-one.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-frameset-insertion-mode/end-tag-frameset.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/generating-of-implied-end-tags.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-head-insertion-mode/template-end-tag-without-start-one.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html",
-        "url": "/html/syntax/parsing/template/additions-to-the-in-table-insertion-mode/end-tag-table.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html",
-        "url": "/html/syntax/parsing/template/appending-to-a-template/template-child-nodes.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html",
-        "url": "/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html",
-        "url": "/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html",
-        "url": "/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html"
-      },
-      {
-        "path": "html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html",
-        "url": "/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html"
-      },
-      {
-        "path": "html/syntax/serializing-html-fragments/outerHTML.html",
-        "url": "/html/syntax/serializing-html-fragments/outerHTML.html"
-      },
-      {
-        "path": "html/webappapis/atob/base64.html",
-        "url": "/html/webappapis/atob/base64.html"
-      },
-      {
-        "path": "html/webappapis/scripting/events/body-onload.html",
-        "url": "/html/webappapis/scripting/events/body-onload.html"
-      },
-      {
-        "path": "html/webappapis/scripting/events/event-handler-javascript.html",
-        "url": "/html/webappapis/scripting/events/event-handler-javascript.html"
-      },
-      {
-        "path": "html/webappapis/scripting/events/event-handler-spec-example.html",
-        "url": "/html/webappapis/scripting/events/event-handler-spec-example.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/addEventListener.html",
-        "url": "/html/webappapis/scripting/processing-model-2/addEventListener.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html",
-        "url": "/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html",
-        "url": "/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html",
-        "url": "/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setInterval.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-data-url.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-data-url.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-attribute.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-body-onerror.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error-same-origin.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/compile-error.html",
-        "url": "/html/webappapis/scripting/processing-model-2/compile-error.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setInterval.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-data-url.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/runtime-error.html",
-        "url": "/html/webappapis/scripting/processing-model-2/runtime-error.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html",
-        "url": "/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html",
-        "url": "/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html"
-      },
-      {
-        "path": "html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html",
-        "url": "/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content.html",
-        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content.html"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content/001.xhtml",
-        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/001.xhtml"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content/002.xhtml",
-        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/002.xhtml"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content/003.xhtml",
-        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/003.xhtml"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content/004.xhtml",
-        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/004.xhtml"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content/005.xhtml",
-        "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/005.xhtml"
-      },
-      {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/content/006.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/content/006.xhtml"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.html",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.html"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/001.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/001.xhtml"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/002.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/002.xhtml"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/003.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/003.xhtml"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/004.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/004.xhtml"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/005.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/005.xhtml"
       },
       {
-        "path": "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/006.xhtml",
         "url": "/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol/006.xhtml"
       },
       {
-        "path": "html/webappapis/timers/evil-spec-example.html",
         "url": "/html/webappapis/timers/evil-spec-example.html"
       },
       {
-        "path": "http/content_length.html",
         "url": "/http/content_length.html"
       },
       {
-        "path": "js/builtins/Array.DefineOwnProperty.html",
         "url": "/js/builtins/Array.DefineOwnProperty.html"
       },
       {
-        "path": "js/builtins/Array.prototype.join-order.html",
         "url": "/js/builtins/Array.prototype.join-order.html"
       },
       {
-        "path": "js/builtins/Math.max.html",
         "url": "/js/builtins/Math.max.html"
       },
       {
-        "path": "js/builtins/Math.min.html",
         "url": "/js/builtins/Math.min.html"
       },
       {
-        "path": "js/builtins/Object.prototype.hasOwnProperty-order.html",
         "url": "/js/builtins/Object.prototype.hasOwnProperty-order.html"
       },
       {
-        "path": "js/builtins/WeakMap.prototype-properties.html",
         "url": "/js/builtins/WeakMap.prototype-properties.html"
       },
       {
-        "path": "media-source/SourceBuffer-abort-readyState.html",
         "url": "/media-source/SourceBuffer-abort-readyState.html"
       },
       {
-        "path": "media-source/SourceBuffer-abort-removed.html",
         "url": "/media-source/SourceBuffer-abort-removed.html"
       },
       {
-        "path": "media-source/SourceBuffer-abort-updating.html",
         "url": "/media-source/SourceBuffer-abort-updating.html"
       },
       {
-        "path": "media-source/SourceBuffer-abort.html",
         "url": "/media-source/SourceBuffer-abort.html"
       },
       {
-        "path": "media-source/URL-createObjectURL-null.html",
         "url": "/media-source/URL-createObjectURL-null.html"
       },
       {
-        "path": "media-source/URL-createObjectURL-revoke.html",
         "url": "/media-source/URL-createObjectURL-revoke.html"
       },
       {
-        "path": "media-source/URL-createObjectURL.html",
         "url": "/media-source/URL-createObjectURL.html"
       },
       {
-        "path": "media-source/interfaces.html",
         "url": "/media-source/interfaces.html"
       },
       {
-        "path": "media-source/mediasource-addsourcebuffer.html",
         "url": "/media-source/mediasource-addsourcebuffer.html"
       },
       {
-        "path": "media-source/mediasource-append-buffer.html",
         "url": "/media-source/mediasource-append-buffer.html"
       },
       {
-        "path": "media-source/mediasource-appendwindow.html",
         "url": "/media-source/mediasource-appendwindow.html"
       },
       {
-        "path": "media-source/mediasource-buffered.html",
         "url": "/media-source/mediasource-buffered.html"
       },
       {
-        "path": "media-source/mediasource-closed.html",
         "url": "/media-source/mediasource-closed.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-a-bitrate.html",
         "url": "/media-source/mediasource-config-change-mp4-a-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-av-audio-bitrate.html",
         "url": "/media-source/mediasource-config-change-mp4-av-audio-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-av-framesize.html",
         "url": "/media-source/mediasource-config-change-mp4-av-framesize.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-av-video-bitrate.html",
         "url": "/media-source/mediasource-config-change-mp4-av-video-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-v-bitrate.html",
         "url": "/media-source/mediasource-config-change-mp4-v-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-v-framerate.html",
         "url": "/media-source/mediasource-config-change-mp4-v-framerate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-mp4-v-framesize.html",
         "url": "/media-source/mediasource-config-change-mp4-v-framesize.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-a-bitrate.html",
         "url": "/media-source/mediasource-config-change-webm-a-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-av-audio-bitrate.html",
         "url": "/media-source/mediasource-config-change-webm-av-audio-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-av-framesize.html",
         "url": "/media-source/mediasource-config-change-webm-av-framesize.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-av-video-bitrate.html",
         "url": "/media-source/mediasource-config-change-webm-av-video-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-v-bitrate.html",
         "url": "/media-source/mediasource-config-change-webm-v-bitrate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-v-framerate.html",
         "url": "/media-source/mediasource-config-change-webm-v-framerate.html"
       },
       {
-        "path": "media-source/mediasource-config-change-webm-v-framesize.html",
         "url": "/media-source/mediasource-config-change-webm-v-framesize.html"
       },
       {
-        "path": "media-source/mediasource-duration.html",
         "url": "/media-source/mediasource-duration.html"
       },
       {
-        "path": "media-source/mediasource-endofstream-invaliderror.html",
         "url": "/media-source/mediasource-endofstream-invaliderror.html"
       },
       {
-        "path": "media-source/mediasource-getvideoplaybackquality.html",
         "url": "/media-source/mediasource-getvideoplaybackquality.html"
       },
       {
-        "path": "media-source/mediasource-is-type-supported.html",
         "url": "/media-source/mediasource-is-type-supported.html"
       },
       {
-        "path": "media-source/mediasource-multiple-attach.html",
         "url": "/media-source/mediasource-multiple-attach.html"
       },
       {
-        "path": "media-source/mediasource-play-then-seek-back.html",
         "url": "/media-source/mediasource-play-then-seek-back.html"
       },
       {
-        "path": "media-source/mediasource-play.html",
         "url": "/media-source/mediasource-play.html"
       },
       {
-        "path": "media-source/mediasource-redundant-seek.html",
         "url": "/media-source/mediasource-redundant-seek.html"
       },
       {
-        "path": "media-source/mediasource-remove.html",
         "url": "/media-source/mediasource-remove.html"
       },
       {
-        "path": "media-source/mediasource-seek-beyond-duration.html",
         "url": "/media-source/mediasource-seek-beyond-duration.html"
       },
       {
-        "path": "media-source/mediasource-seek-during-pending-seek.html",
         "url": "/media-source/mediasource-seek-during-pending-seek.html"
       },
       {
-        "path": "media-source/mediasource-sourcebuffer-mode.html",
         "url": "/media-source/mediasource-sourcebuffer-mode.html"
       },
       {
-        "path": "media-source/mediasource-sourcebufferlist.html",
         "url": "/media-source/mediasource-sourcebufferlist.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/api-present.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/api-present.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/deny.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/deny.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/empty-option-param.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/empty-option-param.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-impossible-constraint.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-impossible-constraint.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-optional-constraint.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-optional-constraint.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-trivial-constraint.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/getusermedia-trivial-constraint.html"
       },
       {
-        "path": "mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/unknownkey-option-param.html",
         "url": "/mediacapture-streams/obtaining-local-multimedia-content/navigatorusermedia/unknownkey-option-param.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/introduction/disabled-audio-silence.html",
         "url": "/mediacapture-streams/stream-api/introduction/disabled-audio-silence.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/introduction/disabled-video-black.html",
         "url": "/mediacapture-streams/stream-api/introduction/disabled-video-black.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/audio.html",
         "url": "/mediacapture-streams/stream-api/mediastream/audio.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/mediastream-addtrack.html",
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-addtrack.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/mediastream-finished-add.html",
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-finished-add.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/mediastream-gettrackid.html",
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-gettrackid.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/mediastream-idl.html",
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-idl.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/mediastream-removetrack.html",
         "url": "/mediacapture-streams/stream-api/mediastream/mediastream-removetrack.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/stream-ended.html",
         "url": "/mediacapture-streams/stream-api/mediastream/stream-ended.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastream/video.html",
         "url": "/mediacapture-streams/stream-api/mediastream/video.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-end.html",
         "url": "/mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-end.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-id.html",
         "url": "/mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-id.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-init.html",
         "url": "/mediacapture-streams/stream-api/mediastreamtrack/mediastreamtrack-init.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/video-and-audio-tracks/audiostreamtrack.html",
         "url": "/mediacapture-streams/stream-api/video-and-audio-tracks/audiostreamtrack.html"
       },
       {
-        "path": "mediacapture-streams/stream-api/video-and-audio-tracks/videostreamtrack.html",
         "url": "/mediacapture-streams/stream-api/video-and-audio-tracks/videostreamtrack.html"
       },
       {
-        "path": "microdata/microdata-dom-api/001.html",
         "url": "/microdata/microdata-dom-api/001.html"
       },
       {
-        "path": "navigation-timing/idlharness.html",
         "url": "/navigation-timing/idlharness.html"
       },
       {
-        "path": "navigation-timing/test_document_open.html",
         "url": "/navigation-timing/test_document_open.html"
       },
       {
-        "path": "navigation-timing/test_document_readiness_exist.html",
         "url": "/navigation-timing/test_document_readiness_exist.html"
       },
       {
-        "path": "navigation-timing/test_navigate_within_document.html",
         "url": "/navigation-timing/test_navigate_within_document.html"
       },
       {
-        "path": "navigation-timing/test_navigation_attributes_exist.html",
         "url": "/navigation-timing/test_navigation_attributes_exist.html"
       },
       {
-        "path": "navigation-timing/test_navigation_redirectCount_none.html",
         "url": "/navigation-timing/test_navigation_redirectCount_none.html"
       },
       {
-        "path": "navigation-timing/test_navigation_type_backforward.html",
         "url": "/navigation-timing/test_navigation_type_backforward.html"
       },
       {
-        "path": "navigation-timing/test_navigation_type_enums.html",
         "url": "/navigation-timing/test_navigation_type_enums.html"
       },
       {
-        "path": "navigation-timing/test_navigation_type_reload.html",
         "url": "/navigation-timing/test_navigation_type_reload.html"
       },
       {
-        "path": "navigation-timing/test_no_previous_document.html",
         "url": "/navigation-timing/test_no_previous_document.html"
       },
       {
-        "path": "navigation-timing/test_performance_attributes_exist.html",
         "url": "/navigation-timing/test_performance_attributes_exist.html"
       },
       {
-        "path": "navigation-timing/test_performance_attributes_exist_in_object.html",
         "url": "/navigation-timing/test_performance_attributes_exist_in_object.html"
       },
       {
-        "path": "navigation-timing/test_readwrite.html",
         "url": "/navigation-timing/test_readwrite.html"
       },
       {
-        "path": "navigation-timing/test_timing_attributes_exist.html",
         "url": "/navigation-timing/test_timing_attributes_exist.html"
       },
       {
-        "path": "navigation-timing/test_timing_attributes_order.html",
         "url": "/navigation-timing/test_timing_attributes_order.html"
       },
       {
-        "path": "navigation-timing/test_timing_client_redirect.html",
         "url": "/navigation-timing/test_timing_client_redirect.html"
       },
       {
-        "path": "navigation-timing/test_timing_reload.html",
         "url": "/navigation-timing/test_timing_reload.html"
       },
       {
-        "path": "navigation-timing/test_timing_server_redirect.html",
         "url": "/navigation-timing/test_timing_server_redirect.html"
       },
       {
-        "path": "navigation-timing/test_timing_xserver_redirect.html",
         "url": "/navigation-timing/test_timing_xserver_redirect.html"
       },
       {
-        "path": "navigation-timing/test_unique_performance_objects.html",
         "url": "/navigation-timing/test_unique_performance_objects.html"
       },
       {
-        "path": "notifications/Notification-permission.html",
         "url": "/notifications/Notification-permission.html"
       },
       {
-        "path": "notifications/event-onshow.html",
         "url": "/notifications/event-onshow.html"
       },
       {
-        "path": "notifications/interfaces.html",
         "url": "/notifications/interfaces.html"
       },
       {
-        "path": "notifications/notification-constructor-basic.html",
         "url": "/notifications/notification-constructor-basic.html"
       },
       {
-        "path": "notifications/notification-constructor-invalid.html",
         "url": "/notifications/notification-constructor-invalid.html"
       },
       {
-        "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_004.htm",
         "url": "/old-tests/submission/Microsoft/dragdrop/dragdrop_004.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_005.htm",
         "url": "/old-tests/submission/Microsoft/dragdrop/dragdrop_005.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_006.htm",
         "url": "/old-tests/submission/Microsoft/dragdrop/dragdrop_006.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_007.htm",
         "url": "/old-tests/submission/Microsoft/dragdrop/dragdrop_007.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/dragdrop/dragdrop_008.htm",
         "url": "/old-tests/submission/Microsoft/dragdrop/dragdrop_008.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/history/history_000.htm",
         "url": "/old-tests/submission/Microsoft/history/history_000.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_001.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_001.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_002.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_002.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_005.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_005.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_011.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_011.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_012.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_012.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_013.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_013.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_014.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_014.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_015.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_015.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_016.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_016.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_017.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_017.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_018.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_018.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_019.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_019.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_023.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_023.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_024.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_024.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_025.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_025.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_026.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_026.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_027.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_027.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_028.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_028.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_029.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_029.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_030.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_030.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_031.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_031.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/sandbox/sandbox_032.htm",
         "url": "/old-tests/submission/Microsoft/sandbox/sandbox_032.htm"
       },
       {
-        "path": "old-tests/submission/Microsoft/structuredclone/structuredclone_0.html",
         "url": "/old-tests/submission/Microsoft/structuredclone/structuredclone_0.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/001.html",
         "url": "/old-tests/submission/Opera/script_scheduling/001.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/002.html",
         "url": "/old-tests/submission/Opera/script_scheduling/002.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/003.html",
         "url": "/old-tests/submission/Opera/script_scheduling/003.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/004.html",
         "url": "/old-tests/submission/Opera/script_scheduling/004.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/005.html",
         "url": "/old-tests/submission/Opera/script_scheduling/005.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/006.html",
         "url": "/old-tests/submission/Opera/script_scheduling/006.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/007.html",
         "url": "/old-tests/submission/Opera/script_scheduling/007.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/008.html",
         "url": "/old-tests/submission/Opera/script_scheduling/008.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/009.html",
         "url": "/old-tests/submission/Opera/script_scheduling/009.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/010.html",
         "url": "/old-tests/submission/Opera/script_scheduling/010.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/011.html",
         "url": "/old-tests/submission/Opera/script_scheduling/011.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/012.html",
         "url": "/old-tests/submission/Opera/script_scheduling/012.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/013.html",
         "url": "/old-tests/submission/Opera/script_scheduling/013.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/014.html",
         "url": "/old-tests/submission/Opera/script_scheduling/014.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/015.html",
         "url": "/old-tests/submission/Opera/script_scheduling/015.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/015a.html",
         "url": "/old-tests/submission/Opera/script_scheduling/015a.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/016.html",
         "url": "/old-tests/submission/Opera/script_scheduling/016.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/017.html",
         "url": "/old-tests/submission/Opera/script_scheduling/017.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/018.html",
         "url": "/old-tests/submission/Opera/script_scheduling/018.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/019.html",
         "url": "/old-tests/submission/Opera/script_scheduling/019.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/020.html",
         "url": "/old-tests/submission/Opera/script_scheduling/020.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/021.html",
         "url": "/old-tests/submission/Opera/script_scheduling/021.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/022.html",
         "url": "/old-tests/submission/Opera/script_scheduling/022.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/023.html",
         "url": "/old-tests/submission/Opera/script_scheduling/023.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/024.html",
         "url": "/old-tests/submission/Opera/script_scheduling/024.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/025.html",
         "url": "/old-tests/submission/Opera/script_scheduling/025.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/026.html",
         "url": "/old-tests/submission/Opera/script_scheduling/026.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/027.html",
         "url": "/old-tests/submission/Opera/script_scheduling/027.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/028.html",
         "url": "/old-tests/submission/Opera/script_scheduling/028.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/029.html",
         "url": "/old-tests/submission/Opera/script_scheduling/029.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/030.html",
         "url": "/old-tests/submission/Opera/script_scheduling/030.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/031.html",
         "url": "/old-tests/submission/Opera/script_scheduling/031.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/032.html",
         "url": "/old-tests/submission/Opera/script_scheduling/032.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/033.html",
         "url": "/old-tests/submission/Opera/script_scheduling/033.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/034.html",
         "url": "/old-tests/submission/Opera/script_scheduling/034.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/035.html",
         "url": "/old-tests/submission/Opera/script_scheduling/035.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/036.html",
         "url": "/old-tests/submission/Opera/script_scheduling/036.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/037.html",
         "url": "/old-tests/submission/Opera/script_scheduling/037.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/038.html",
         "url": "/old-tests/submission/Opera/script_scheduling/038.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/039.html",
         "url": "/old-tests/submission/Opera/script_scheduling/039.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/040.html",
         "url": "/old-tests/submission/Opera/script_scheduling/040.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/041.html",
         "url": "/old-tests/submission/Opera/script_scheduling/041.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/042.html",
         "url": "/old-tests/submission/Opera/script_scheduling/042.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/043.html",
         "url": "/old-tests/submission/Opera/script_scheduling/043.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/044.html",
         "url": "/old-tests/submission/Opera/script_scheduling/044.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/045.html",
         "url": "/old-tests/submission/Opera/script_scheduling/045.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/046.html",
         "url": "/old-tests/submission/Opera/script_scheduling/046.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/047.html",
         "url": "/old-tests/submission/Opera/script_scheduling/047.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/048.html",
         "url": "/old-tests/submission/Opera/script_scheduling/048.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/049.html",
         "url": "/old-tests/submission/Opera/script_scheduling/049.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/050.html",
         "url": "/old-tests/submission/Opera/script_scheduling/050.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/051.html",
         "url": "/old-tests/submission/Opera/script_scheduling/051.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/052.html",
         "url": "/old-tests/submission/Opera/script_scheduling/052.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/053.html",
         "url": "/old-tests/submission/Opera/script_scheduling/053.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/054.html",
         "url": "/old-tests/submission/Opera/script_scheduling/054.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/055.html",
         "url": "/old-tests/submission/Opera/script_scheduling/055.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/056.html",
         "url": "/old-tests/submission/Opera/script_scheduling/056.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/057.html",
         "url": "/old-tests/submission/Opera/script_scheduling/057.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/058.html",
         "url": "/old-tests/submission/Opera/script_scheduling/058.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/059.html",
         "url": "/old-tests/submission/Opera/script_scheduling/059.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/060.html",
         "url": "/old-tests/submission/Opera/script_scheduling/060.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/061.html",
         "url": "/old-tests/submission/Opera/script_scheduling/061.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/062.html",
         "url": "/old-tests/submission/Opera/script_scheduling/062.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/063.html",
         "url": "/old-tests/submission/Opera/script_scheduling/063.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/064.html",
         "url": "/old-tests/submission/Opera/script_scheduling/064.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/065.html",
         "url": "/old-tests/submission/Opera/script_scheduling/065.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/066.html",
         "url": "/old-tests/submission/Opera/script_scheduling/066.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/067.html",
         "url": "/old-tests/submission/Opera/script_scheduling/067.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/068.html",
         "url": "/old-tests/submission/Opera/script_scheduling/068.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/069.html",
         "url": "/old-tests/submission/Opera/script_scheduling/069.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/070.html",
         "url": "/old-tests/submission/Opera/script_scheduling/070.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/071.html",
         "url": "/old-tests/submission/Opera/script_scheduling/071.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/072.html",
         "url": "/old-tests/submission/Opera/script_scheduling/072.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/073.html",
         "url": "/old-tests/submission/Opera/script_scheduling/073.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/074.html",
         "url": "/old-tests/submission/Opera/script_scheduling/074.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/075.html",
         "url": "/old-tests/submission/Opera/script_scheduling/075.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/076.html",
         "url": "/old-tests/submission/Opera/script_scheduling/076.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/077.html",
         "url": "/old-tests/submission/Opera/script_scheduling/077.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/078.html",
         "url": "/old-tests/submission/Opera/script_scheduling/078.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/079.html",
         "url": "/old-tests/submission/Opera/script_scheduling/079.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/080.html",
         "url": "/old-tests/submission/Opera/script_scheduling/080.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/081.html",
         "url": "/old-tests/submission/Opera/script_scheduling/081.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/082.html",
         "url": "/old-tests/submission/Opera/script_scheduling/082.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/083.html",
         "url": "/old-tests/submission/Opera/script_scheduling/083.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/084.html",
         "url": "/old-tests/submission/Opera/script_scheduling/084.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/085.html",
         "url": "/old-tests/submission/Opera/script_scheduling/085.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/086.html",
         "url": "/old-tests/submission/Opera/script_scheduling/086.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/087.html",
         "url": "/old-tests/submission/Opera/script_scheduling/087.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/088.html",
         "url": "/old-tests/submission/Opera/script_scheduling/088.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/089.html",
         "url": "/old-tests/submission/Opera/script_scheduling/089.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/090.html",
         "url": "/old-tests/submission/Opera/script_scheduling/090.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/091.html",
         "url": "/old-tests/submission/Opera/script_scheduling/091.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/092.html",
         "url": "/old-tests/submission/Opera/script_scheduling/092.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/094.html",
         "url": "/old-tests/submission/Opera/script_scheduling/094.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/095.html",
         "url": "/old-tests/submission/Opera/script_scheduling/095.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/096.html",
         "url": "/old-tests/submission/Opera/script_scheduling/096.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/097.html",
         "url": "/old-tests/submission/Opera/script_scheduling/097.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/098.html",
         "url": "/old-tests/submission/Opera/script_scheduling/098.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/099.html",
         "url": "/old-tests/submission/Opera/script_scheduling/099.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/100.html",
         "url": "/old-tests/submission/Opera/script_scheduling/100.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/101.html",
         "url": "/old-tests/submission/Opera/script_scheduling/101.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/103.html",
         "url": "/old-tests/submission/Opera/script_scheduling/103.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/104.html",
         "url": "/old-tests/submission/Opera/script_scheduling/104.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/105.html",
         "url": "/old-tests/submission/Opera/script_scheduling/105.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/106.html",
         "url": "/old-tests/submission/Opera/script_scheduling/106.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/107.html",
         "url": "/old-tests/submission/Opera/script_scheduling/107.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/108.html",
         "url": "/old-tests/submission/Opera/script_scheduling/108.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/109.html",
         "url": "/old-tests/submission/Opera/script_scheduling/109.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/110.html",
         "url": "/old-tests/submission/Opera/script_scheduling/110.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/111.html",
         "url": "/old-tests/submission/Opera/script_scheduling/111.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/112.html",
         "url": "/old-tests/submission/Opera/script_scheduling/112.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/113.html",
         "url": "/old-tests/submission/Opera/script_scheduling/113.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/114.html",
         "url": "/old-tests/submission/Opera/script_scheduling/114.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/115.html",
         "url": "/old-tests/submission/Opera/script_scheduling/115.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/116.html",
         "url": "/old-tests/submission/Opera/script_scheduling/116.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/117.html",
         "url": "/old-tests/submission/Opera/script_scheduling/117.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/118.html",
         "url": "/old-tests/submission/Opera/script_scheduling/118.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/119.html",
         "url": "/old-tests/submission/Opera/script_scheduling/119.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/120.html",
         "url": "/old-tests/submission/Opera/script_scheduling/120.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/121.html",
         "url": "/old-tests/submission/Opera/script_scheduling/121.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/122.html",
         "url": "/old-tests/submission/Opera/script_scheduling/122.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/123.html",
         "url": "/old-tests/submission/Opera/script_scheduling/123.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/124.html",
         "url": "/old-tests/submission/Opera/script_scheduling/124.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/125.html",
         "url": "/old-tests/submission/Opera/script_scheduling/125.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/126.html",
         "url": "/old-tests/submission/Opera/script_scheduling/126.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/127.html",
         "url": "/old-tests/submission/Opera/script_scheduling/127.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/128.html",
         "url": "/old-tests/submission/Opera/script_scheduling/128.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/129.html",
         "url": "/old-tests/submission/Opera/script_scheduling/129.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/130.html",
         "url": "/old-tests/submission/Opera/script_scheduling/130.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/131.html",
         "url": "/old-tests/submission/Opera/script_scheduling/131.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/132.html",
         "url": "/old-tests/submission/Opera/script_scheduling/132.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/133.html",
         "url": "/old-tests/submission/Opera/script_scheduling/133.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/134.html",
         "url": "/old-tests/submission/Opera/script_scheduling/134.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/135.html",
         "url": "/old-tests/submission/Opera/script_scheduling/135.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/136.html",
         "url": "/old-tests/submission/Opera/script_scheduling/136.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/137.html",
         "url": "/old-tests/submission/Opera/script_scheduling/137.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/138.html",
         "url": "/old-tests/submission/Opera/script_scheduling/138.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/139.html",
         "url": "/old-tests/submission/Opera/script_scheduling/139.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/140.html",
         "url": "/old-tests/submission/Opera/script_scheduling/140.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/141.html",
         "url": "/old-tests/submission/Opera/script_scheduling/141.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/142.html",
         "url": "/old-tests/submission/Opera/script_scheduling/142.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/143.html",
         "url": "/old-tests/submission/Opera/script_scheduling/143.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/144.html",
         "url": "/old-tests/submission/Opera/script_scheduling/144.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/145.html",
         "url": "/old-tests/submission/Opera/script_scheduling/145.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/146.html",
         "url": "/old-tests/submission/Opera/script_scheduling/146.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/147.html",
         "url": "/old-tests/submission/Opera/script_scheduling/147.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/148.html",
         "url": "/old-tests/submission/Opera/script_scheduling/148.html"
       },
       {
-        "path": "old-tests/submission/Opera/script_scheduling/149.html",
         "url": "/old-tests/submission/Opera/script_scheduling/149.html"
       },
       {
-        "path": "page-visibility/idlharness.html",
         "url": "/page-visibility/idlharness.html"
       },
       {
-        "path": "page-visibility/test_attributes_exist.html",
         "url": "/page-visibility/test_attributes_exist.html"
       },
       {
-        "path": "page-visibility/test_child_document.html",
         "url": "/page-visibility/test_child_document.html"
       },
       {
-        "path": "page-visibility/test_default_view.html",
         "url": "/page-visibility/test_default_view.html"
       },
       {
-        "path": "page-visibility/test_read_only.html",
         "url": "/page-visibility/test_read_only.html"
       },
       {
-        "path": "performance-timeline/idlharness.html",
         "url": "/performance-timeline/idlharness.html"
       },
       {
-        "path": "pointerevents/pointerevent_constructor.html",
         "url": "/pointerevents/pointerevent_constructor.html"
       },
       {
-        "path": "pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html",
-        "url": "/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html",
-        "url": "/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html",
-        "url": "/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_pointerout_after_pointercancel_touch.html",
-        "url": "/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_pointerout_after_pointerup_nohover.html",
-        "url": "/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_pointerout_pen.html",
-        "url": "/pointerevents/pointerevent_pointerout_pen.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_setpointercapture_disconnected.html",
-        "url": "/pointerevents/pointerevent_setpointercapture_disconnected.html"
-      },
-      {
-        "path": "pointerevents/pointerevent_touch-action-illegal.html",
         "url": "/pointerevents/pointerevent_touch-action-illegal.html"
       },
       {
-        "path": "pointerevents/pointerevent_touch-action-verification.html",
         "url": "/pointerevents/pointerevent_touch-action-verification.html"
       },
       {
-        "path": "pointerlock/constructor.html",
         "url": "/pointerlock/constructor.html"
       },
       {
-        "path": "pointerlock/idlharness.html",
         "url": "/pointerlock/idlharness.html"
       },
       {
-        "path": "progress-events/constructor.html",
         "url": "/progress-events/constructor.html"
       },
       {
-        "path": "progress-events/interface.html",
         "url": "/progress-events/interface.html"
       },
       {
-        "path": "progress-events/tests/submissions/Samsung/firing-events-http-content-length.html",
         "url": "/progress-events/tests/submissions/Samsung/firing-events-http-content-length.html"
       },
       {
-        "path": "progress-events/tests/submissions/Samsung/firing-events-http-no-content-length.html",
         "url": "/progress-events/tests/submissions/Samsung/firing-events-http-no-content-length.html"
       },
       {
-        "path": "progress-events/tests/submissions/Samsung/security-consideration.sub.html",
         "url": "/progress-events/tests/submissions/Samsung/security-consideration.sub.html"
       },
       {
-        "path": "proximity/DeviceProximityEvent_tests.html",
         "url": "/proximity/DeviceProximityEvent_tests.html"
       },
       {
-        "path": "proximity/UserProximityEvent_tests.html",
         "url": "/proximity/UserProximityEvent_tests.html"
       },
       {
-        "path": "proximity/idlharness.html",
         "url": "/proximity/idlharness.html"
       },
       {
-        "path": "quirks-mode/blocks-ignore-line-height.html",
         "url": "/quirks-mode/blocks-ignore-line-height.html"
       },
       {
-        "path": "quirks-mode/hashless-hex-color.html",
         "url": "/quirks-mode/hashless-hex-color.html"
       },
       {
-        "path": "quirks-mode/line-height-calculation.html",
         "url": "/quirks-mode/line-height-calculation.html"
       },
       {
-        "path": "quirks-mode/percentage-height-calculation.html",
         "url": "/quirks-mode/percentage-height-calculation.html"
       },
       {
-        "path": "quirks-mode/table-cell-nowrap-minimum-width-calculation.html",
         "url": "/quirks-mode/table-cell-nowrap-minimum-width-calculation.html"
       },
       {
-        "path": "quirks-mode/table-cell-width-calculation.html",
         "url": "/quirks-mode/table-cell-width-calculation.html"
       },
       {
-        "path": "quirks-mode/unitless-length.html",
         "url": "/quirks-mode/unitless-length.html"
       },
       {
-        "path": "resource-timing/test_resource_timing.html",
         "url": "/resource-timing/test_resource_timing.html"
       },
       {
-        "path": "selectors-api/tests/submissions/Opera/level2-baseline.html",
         "url": "/selectors-api/tests/submissions/Opera/level2-baseline.html"
       },
       {
-        "path": "selectors/attribute-selectors/attribute-case/cssom.html",
         "url": "/selectors/attribute-selectors/attribute-case/cssom.html"
       },
       {
-        "path": "selectors/attribute-selectors/attribute-case/semantics.html",
         "url": "/selectors/attribute-selectors/attribute-case/semantics.html"
       },
       {
-        "path": "selectors/attribute-selectors/attribute-case/syntax.html",
         "url": "/selectors/attribute-selectors/attribute-case/syntax.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-005.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-005.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/elements-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/elements-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/non-element-nodes-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/non-element-nodes-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-003.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-003.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-event-interface/event-path-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-event-interface/event-path-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/extensions-to-event-interface/event-path-002.html",
         "url": "/shadow-dom/elements-and-dom-objects/extensions-to-event-interface/event-path-002.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/activeElement-confirm-return-null.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-014.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-014.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html",
         "url": "/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-content-html-element/test-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-content-html-element/test-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-content-html-element/test-002.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-content-html-element/test-002.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-content-html-element/test-003.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-content-html-element/test-003.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-content-html-element/test-004.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-content-html-element/test-004.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-content-html-element/test-005.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-content-html-element/test-005.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-content-html-element/test-006.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-content-html-element/test-006.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-001.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-001.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-002.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-002.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-003.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-003.html"
       },
       {
-        "path": "shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-004.html",
         "url": "/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-004.html"
       },
       {
-        "path": "shadow-dom/events/event-dispatch/test-001.html",
         "url": "/shadow-dom/events/event-dispatch/test-001.html"
       },
       {
-        "path": "shadow-dom/events/event-dispatch/test-002.html",
         "url": "/shadow-dom/events/event-dispatch/test-002.html"
       },
       {
-        "path": "shadow-dom/events/event-dispatch/test-003.html",
         "url": "/shadow-dom/events/event-dispatch/test-003.html"
       },
       {
-        "path": "shadow-dom/events/event-retargeting/test-001.html",
         "url": "/shadow-dom/events/event-retargeting/test-001.html"
       },
       {
-        "path": "shadow-dom/events/event-retargeting/test-002.html",
         "url": "/shadow-dom/events/event-retargeting/test-002.html"
       },
       {
-        "path": "shadow-dom/events/event-retargeting/test-003.html",
         "url": "/shadow-dom/events/event-retargeting/test-003.html"
       },
       {
-        "path": "shadow-dom/events/event-retargeting/test-004.html",
         "url": "/shadow-dom/events/event-retargeting/test-004.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-001.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-001.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-002.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-002.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-003.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-003.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-004.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-004.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-005.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-005.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-006.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-006.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-007.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-007.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-008.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-008.html"
       },
       {
-        "path": "shadow-dom/events/events-that-are-always-stopped/test-009.html",
         "url": "/shadow-dom/events/events-that-are-always-stopped/test-009.html"
       },
       {
-        "path": "shadow-dom/events/retargeting-focus-events/test-001.html",
         "url": "/shadow-dom/events/retargeting-focus-events/test-001.html"
       },
       {
-        "path": "shadow-dom/events/retargeting-focus-events/test-002.html",
         "url": "/shadow-dom/events/retargeting-focus-events/test-002.html"
       },
       {
-        "path": "shadow-dom/events/retargeting-focus-events/test-003.html",
         "url": "/shadow-dom/events/retargeting-focus-events/test-003.html"
       },
       {
-        "path": "shadow-dom/events/retargeting-relatedtarget/test-001.html",
         "url": "/shadow-dom/events/retargeting-relatedtarget/test-001.html"
       },
       {
-        "path": "shadow-dom/events/retargeting-relatedtarget/test-002.html",
         "url": "/shadow-dom/events/retargeting-relatedtarget/test-002.html"
       },
       {
-        "path": "shadow-dom/events/retargeting-relatedtarget/test-003.html",
         "url": "/shadow-dom/events/retargeting-relatedtarget/test-003.html"
       },
       {
-        "path": "shadow-dom/events/test-001.html",
         "url": "/shadow-dom/events/test-001.html"
       },
       {
-        "path": "shadow-dom/html-elements-and-their-shadow-trees/test-001.html",
         "url": "/shadow-dom/html-elements-and-their-shadow-trees/test-001.html"
       },
       {
-        "path": "shadow-dom/html-elements-and-their-shadow-trees/test-002.html",
         "url": "/shadow-dom/html-elements-and-their-shadow-trees/test-002.html"
       },
       {
-        "path": "shadow-dom/html-elements-and-their-shadow-trees/test-003.html",
         "url": "/shadow-dom/html-elements-and-their-shadow-trees/test-003.html"
       },
       {
-        "path": "shadow-dom/html-elements-and-their-shadow-trees/test-004.html",
         "url": "/shadow-dom/html-elements-and-their-shadow-trees/test-004.html"
       },
       {
-        "path": "shadow-dom/html-elements-in-shadow-trees/html-forms/test-001.html",
         "url": "/shadow-dom/html-elements-in-shadow-trees/html-forms/test-001.html"
       },
       {
-        "path": "shadow-dom/html-elements-in-shadow-trees/html-forms/test-002.html",
         "url": "/shadow-dom/html-elements-in-shadow-trees/html-forms/test-002.html"
       },
       {
-        "path": "shadow-dom/html-elements-in-shadow-trees/html-forms/test-003.html",
         "url": "/shadow-dom/html-elements-in-shadow-trees/html-forms/test-003.html"
       },
       {
-        "path": "shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-001.html",
         "url": "/shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-001.html"
       },
       {
-        "path": "shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-002.html",
         "url": "/shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/composition/test-001.html",
         "url": "/shadow-dom/shadow-trees/composition/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/content-pseudo-element/test-001.html",
         "url": "/shadow-dom/shadow-trees/content-pseudo-element/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/content-pseudo-element/test-002.html",
         "url": "/shadow-dom/shadow-trees/content-pseudo-element/test-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html",
         "url": "/shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html",
         "url": "/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-003.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/distribution-003.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/test-003.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-003.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/test-004.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-004.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/lower-boundary-encapsulation/test-005.html",
         "url": "/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-005.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/nested-shadow-trees/test-001.html",
         "url": "/shadow-dom/shadow-trees/nested-shadow-trees/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/rendering-shadow-trees/test-001.html",
         "url": "/shadow-dom/shadow-trees/rendering-shadow-trees/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/reprojection/test-001.html",
         "url": "/shadow-dom/shadow-trees/reprojection/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-001.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-002.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-003.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-003.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-004.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-004.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-005.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-005.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html",
         "url": "/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-002.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/dom-tree-accessors-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/ownerdocument-001.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/ownerdocument-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/ownerdocument-002.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/ownerdocument-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/selectors-api-001.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/selectors-api-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/selectors-api-002.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/selectors-api-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/shadow-root-001.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/shadow-root-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/test-005.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-005.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/test-007.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-007.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/test-009.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-009.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/test-011.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-011.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/window-named-properties-002.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/window-named-properties-002.html"
       },
       {
-        "path": "shadow-dom/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html",
         "url": "/shadow-dom/shadow-trees/upper-boundary-encapsulation/window-named-properties-003.html"
       },
       {
-        "path": "shadow-dom/styles/css-variables/test-001.html",
         "url": "/shadow-dom/styles/css-variables/test-001.html"
       },
       {
-        "path": "shadow-dom/styles/deep-combinator/deep-combinator-001.html",
         "url": "/shadow-dom/styles/deep-combinator/deep-combinator-001.html"
       },
       {
-        "path": "shadow-dom/styles/shadow-pseudoelement/shadow-pseudoelement-001.html",
         "url": "/shadow-dom/styles/shadow-pseudoelement/shadow-pseudoelement-001.html"
       },
       {
-        "path": "shadow-dom/styles/test-001.html",
         "url": "/shadow-dom/styles/test-001.html"
       },
       {
-        "path": "shadow-dom/styles/test-002.html",
         "url": "/shadow-dom/styles/test-002.html"
       },
       {
-        "path": "shadow-dom/styles/test-003.html",
         "url": "/shadow-dom/styles/test-003.html"
       },
       {
-        "path": "shadow-dom/styles/test-005.html",
         "url": "/shadow-dom/styles/test-005.html"
       },
       {
-        "path": "shadow-dom/styles/test-007.html",
         "url": "/shadow-dom/styles/test-007.html"
       },
       {
-        "path": "shadow-dom/styles/test-008.html",
         "url": "/shadow-dom/styles/test-008.html"
       },
       {
-        "path": "shadow-dom/styles/test-009.html",
         "url": "/shadow-dom/styles/test-009.html"
       },
       {
-        "path": "shadow-dom/styles/test-010.html",
         "url": "/shadow-dom/styles/test-010.html"
       },
       {
-        "path": "shadow-dom/user-interaction/active-element/test-001.html",
         "url": "/shadow-dom/user-interaction/active-element/test-001.html"
       },
       {
-        "path": "shadow-dom/user-interaction/active-element/test-002.html",
         "url": "/shadow-dom/user-interaction/active-element/test-002.html"
       },
       {
-        "path": "shadow-dom/user-interaction/editing/inheritance-of-content-editable-001.html",
         "url": "/shadow-dom/user-interaction/editing/inheritance-of-content-editable-001.html"
       },
       {
-        "path": "shadow-dom/user-interaction/focus-navigation/test-001.html",
         "url": "/shadow-dom/user-interaction/focus-navigation/test-001.html"
       },
       {
-        "path": "shadow-dom/user-interaction/focus-navigation/test-002.html",
         "url": "/shadow-dom/user-interaction/focus-navigation/test-002.html"
       },
       {
-        "path": "shadow-dom/user-interaction/focus-navigation/test-003.html",
         "url": "/shadow-dom/user-interaction/focus-navigation/test-003.html"
       },
       {
-        "path": "shadow-dom/user-interaction/focus-navigation/test-004.html",
         "url": "/shadow-dom/user-interaction/focus-navigation/test-004.html"
       },
       {
-        "path": "shadow-dom/user-interaction/ranges-and-selections/test-001.html",
         "url": "/shadow-dom/user-interaction/ranges-and-selections/test-001.html"
       },
       {
-        "path": "shadow-dom/user-interaction/ranges-and-selections/test-002.html",
         "url": "/shadow-dom/user-interaction/ranges-and-selections/test-002.html"
       },
       {
-        "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
       },
       {
-        "path": "typedarrays/ArrayBuffer_constructor.html",
         "url": "/typedarrays/ArrayBuffer_constructor.html"
       },
       {
-        "path": "typedarrays/ArrayBuffer_properties.html",
         "url": "/typedarrays/ArrayBuffer_properties.html"
       },
       {
-        "path": "typedarrays/Uint8ClampedArray_constructor.html",
         "url": "/typedarrays/Uint8ClampedArray_constructor.html"
       },
       {
-        "path": "typedarrays/Uint8ClampedArray_length.html",
         "url": "/typedarrays/Uint8ClampedArray_length.html"
       },
       {
-        "path": "typedarrays/Uint8ClampedArray_setter_getter.html",
         "url": "/typedarrays/Uint8ClampedArray_setter_getter.html"
       },
       {
-        "path": "typedarrays/Uint8ClampedArray_subarray.html",
         "url": "/typedarrays/Uint8ClampedArray_subarray.html"
       },
       {
-        "path": "typedarrays/constructors.html",
         "url": "/typedarrays/constructors.html"
       },
       {
-        "path": "url/a-element.html",
         "url": "/url/a-element.html"
       },
       {
-        "path": "url/a-element.xhtml",
         "url": "/url/a-element.xhtml"
       },
       {
-        "path": "url/interfaces.html",
         "url": "/url/interfaces.html"
       },
       {
-        "path": "user-timing/idlharness.html",
         "url": "/user-timing/idlharness.html"
       },
       {
-        "path": "user-timing/test_user_timing_clear_marks.html",
         "url": "/user-timing/test_user_timing_clear_marks.html"
       },
       {
-        "path": "user-timing/test_user_timing_clear_measures.html",
         "url": "/user-timing/test_user_timing_clear_measures.html"
       },
       {
-        "path": "user-timing/test_user_timing_entry_type.html",
         "url": "/user-timing/test_user_timing_entry_type.html"
       },
       {
-        "path": "user-timing/test_user_timing_exists.html",
         "url": "/user-timing/test_user_timing_exists.html"
       },
       {
-        "path": "user-timing/test_user_timing_mark.html",
         "url": "/user-timing/test_user_timing_mark.html"
       },
       {
-        "path": "user-timing/test_user_timing_mark_and_measure_exception_when_invoke_without_parameter.html",
         "url": "/user-timing/test_user_timing_mark_and_measure_exception_when_invoke_without_parameter.html"
       },
       {
-        "path": "user-timing/test_user_timing_mark_exceptions.html",
         "url": "/user-timing/test_user_timing_mark_exceptions.html"
       },
       {
-        "path": "user-timing/test_user_timing_mark_with_name_of_navigation_timing_optional_attribute.html",
         "url": "/user-timing/test_user_timing_mark_with_name_of_navigation_timing_optional_attribute.html"
       },
       {
-        "path": "user-timing/test_user_timing_measure.html",
         "url": "/user-timing/test_user_timing_measure.html"
       },
       {
-        "path": "user-timing/test_user_timing_measure_exceptions.html",
         "url": "/user-timing/test_user_timing_measure_exceptions.html"
       },
       {
-        "path": "user-timing/test_user_timing_measure_navigation_timing.html",
         "url": "/user-timing/test_user_timing_measure_navigation_timing.html"
       },
       {
-        "path": "vibration/api-is-present.html",
         "url": "/vibration/api-is-present.html"
       },
       {
-        "path": "vibration/invalid-values.html",
         "url": "/vibration/invalid-values.html"
       },
       {
-        "path": "vibration/silent-ignore.html",
         "url": "/vibration/silent-ignore.html"
       },
       {
-        "path": "web-animations/animation-timeline/animation-timeline.html",
-        "url": "/web-animations/animation-timeline/animation-timeline.html"
+        "url": "/web-animations/animation-node/animation-node-after.html"
+      },
+      {
+        "url": "/web-animations/animation-node/animation-node-before.html"
       },
       {
-        "path": "web-animations/animation-timeline/idlharness.html",
-        "url": "/web-animations/animation-timeline/idlharness.html"
+        "url": "/web-animations/animation-node/animation-node-remove.html"
+      },
+      {
+        "url": "/web-animations/animation-node/animation-node-replace.html"
+      },
+      {
+        "url": "/web-animations/animation-node/idlharness.html"
       },
       {
-        "path": "webaudio/the-audio-api/the-audiobuffer-interface/idl-test.html",
         "url": "/webaudio/the-audio-api/the-audiobuffer-interface/idl-test.html"
       },
       {
-        "path": "webaudio/the-audio-api/the-audiodestinationnode-interface/idl-test.html",
         "url": "/webaudio/the-audio-api/the-audiodestinationnode-interface/idl-test.html"
       },
       {
-        "path": "webaudio/the-audio-api/the-delaynode-interface/idl-test.html",
         "url": "/webaudio/the-audio-api/the-delaynode-interface/idl-test.html"
       },
       {
-        "path": "webaudio/the-audio-api/the-gainnode-interface/idl-test.html",
         "url": "/webaudio/the-audio-api/the-gainnode-interface/idl-test.html"
       },
       {
-        "path": "webaudio/the-audio-api/the-gainnode-interface/test.html",
         "url": "/webaudio/the-audio-api/the-gainnode-interface/test.html"
       },
       {
-        "path": "webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html",
         "url": "/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html"
       },
       {
-        "path": "webgl/bufferSubData.html",
         "url": "/webgl/bufferSubData.html"
       },
       {
-        "path": "webgl/compressedTexImage2D.html",
         "url": "/webgl/compressedTexImage2D.html"
       },
       {
-        "path": "webgl/compressedTexSubImage2D.html",
         "url": "/webgl/compressedTexSubImage2D.html"
       },
       {
-        "path": "webgl/texImage2D.html",
         "url": "/webgl/texImage2D.html"
       },
       {
-        "path": "webgl/texSubImage2D.html",
         "url": "/webgl/texSubImage2D.html"
       },
       {
-        "path": "webgl/uniformMatrixNfv.html",
         "url": "/webgl/uniformMatrixNfv.html"
       },
       {
-        "path": "webmessaging/Channel_MessagePort_initial_disabled.htm",
         "url": "/webmessaging/Channel_MessagePort_initial_disabled.htm"
       },
       {
-        "path": "webmessaging/Channel_MessagePort_onmessage_start.htm",
         "url": "/webmessaging/Channel_MessagePort_onmessage_start.htm"
       },
       {
-        "path": "webmessaging/Channel_postMessage_DataCloneErr.htm",
         "url": "/webmessaging/Channel_postMessage_DataCloneErr.htm"
       },
       {
-        "path": "webmessaging/Channel_postMessage_clone_port.htm",
         "url": "/webmessaging/Channel_postMessage_clone_port.htm"
       },
       {
-        "path": "webmessaging/Channel_postMessage_clone_port_error.htm",
         "url": "/webmessaging/Channel_postMessage_clone_port_error.htm"
       },
       {
-        "path": "webmessaging/Channel_postMessage_event_properties.htm",
         "url": "/webmessaging/Channel_postMessage_event_properties.htm"
       },
       {
-        "path": "webmessaging/Channel_postMessage_ports_readonly_array.htm",
         "url": "/webmessaging/Channel_postMessage_ports_readonly_array.htm"
       },
       {
-        "path": "webmessaging/Channel_postMessage_target_source.htm",
         "url": "/webmessaging/Channel_postMessage_target_source.htm"
       },
       {
-        "path": "webmessaging/MessageEvent_properties.htm",
         "url": "/webmessaging/MessageEvent_properties.htm"
       },
       {
-        "path": "webmessaging/Transferred_objects_unusable.sub.htm",
         "url": "/webmessaging/Transferred_objects_unusable.sub.htm"
       },
       {
-        "path": "webmessaging/event.data.sub.htm",
         "url": "/webmessaging/event.data.sub.htm"
       },
       {
-        "path": "webmessaging/event.origin.sub.htm",
         "url": "/webmessaging/event.origin.sub.htm"
       },
       {
-        "path": "webmessaging/event.ports.sub.htm",
         "url": "/webmessaging/event.ports.sub.htm"
       },
       {
-        "path": "webmessaging/event.source.htm",
         "url": "/webmessaging/event.source.htm"
       },
       {
-        "path": "webmessaging/event.source.xorigin.sub.htm",
         "url": "/webmessaging/event.source.xorigin.sub.htm"
       },
       {
-        "path": "webmessaging/message-channels/001.html",
         "url": "/webmessaging/message-channels/001.html"
       },
       {
-        "path": "webmessaging/message-channels/002.html",
         "url": "/webmessaging/message-channels/002.html"
       },
       {
-        "path": "webmessaging/message-channels/003.html",
         "url": "/webmessaging/message-channels/003.html"
       },
       {
-        "path": "webmessaging/message-channels/004.html",
         "url": "/webmessaging/message-channels/004.html"
       },
       {
-        "path": "webmessaging/postMessage_ArrayBuffer.sub.htm",
         "url": "/webmessaging/postMessage_ArrayBuffer.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_Date.sub.htm",
         "url": "/webmessaging/postMessage_Date.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_Document.htm",
         "url": "/webmessaging/postMessage_Document.htm"
       },
       {
-        "path": "webmessaging/postMessage_Function.htm",
         "url": "/webmessaging/postMessage_Function.htm"
       },
       {
-        "path": "webmessaging/postMessage_MessagePorts_sorigin.htm",
         "url": "/webmessaging/postMessage_MessagePorts_sorigin.htm"
       },
       {
-        "path": "webmessaging/postMessage_MessagePorts_xorigin.sub.htm",
         "url": "/webmessaging/postMessage_MessagePorts_xorigin.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_arrays.sub.htm",
         "url": "/webmessaging/postMessage_arrays.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_asterisk_xorigin.sub.htm",
         "url": "/webmessaging/postMessage_asterisk_xorigin.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_dup_transfer_objects.htm",
         "url": "/webmessaging/postMessage_dup_transfer_objects.htm"
       },
       {
-        "path": "webmessaging/postMessage_invalid_targetOrigin.htm",
         "url": "/webmessaging/postMessage_invalid_targetOrigin.htm"
       },
       {
-        "path": "webmessaging/postMessage_objects.sub.htm",
         "url": "/webmessaging/postMessage_objects.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_origin_mismatch.sub.htm",
         "url": "/webmessaging/postMessage_origin_mismatch.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_origin_mismatch_xorigin.sub.htm",
         "url": "/webmessaging/postMessage_origin_mismatch_xorigin.sub.htm"
       },
       {
-        "path": "webmessaging/postMessage_solidus_sorigin.htm",
         "url": "/webmessaging/postMessage_solidus_sorigin.htm"
       },
       {
-        "path": "webmessaging/postMessage_solidus_xorigin.sub.htm",
         "url": "/webmessaging/postMessage_solidus_xorigin.sub.htm"
       },
       {
-        "path": "webmessaging/with-ports/001.html",
         "url": "/webmessaging/with-ports/001.html"
       },
       {
-        "path": "webmessaging/with-ports/002.html",
         "url": "/webmessaging/with-ports/002.html"
       },
       {
-        "path": "webmessaging/with-ports/003.html",
         "url": "/webmessaging/with-ports/003.html"
       },
       {
-        "path": "webmessaging/with-ports/004.html",
         "url": "/webmessaging/with-ports/004.html"
       },
       {
-        "path": "webmessaging/with-ports/005.html",
         "url": "/webmessaging/with-ports/005.html"
       },
       {
-        "path": "webmessaging/with-ports/006.html",
         "url": "/webmessaging/with-ports/006.html"
       },
       {
-        "path": "webmessaging/with-ports/007.html",
         "url": "/webmessaging/with-ports/007.html"
       },
       {
-        "path": "webmessaging/with-ports/010.html",
         "url": "/webmessaging/with-ports/010.html"
       },
       {
-        "path": "webmessaging/with-ports/011.html",
         "url": "/webmessaging/with-ports/011.html"
       },
       {
-        "path": "webmessaging/with-ports/012.html",
         "url": "/webmessaging/with-ports/012.html"
       },
       {
-        "path": "webmessaging/with-ports/013.html",
         "url": "/webmessaging/with-ports/013.html"
       },
       {
-        "path": "webmessaging/with-ports/014.html",
         "url": "/webmessaging/with-ports/014.html"
       },
       {
-        "path": "webmessaging/with-ports/015.html",
         "url": "/webmessaging/with-ports/015.html"
       },
       {
-        "path": "webmessaging/with-ports/016.html",
         "url": "/webmessaging/with-ports/016.html"
       },
       {
-        "path": "webmessaging/with-ports/017.html",
         "url": "/webmessaging/with-ports/017.html"
       },
       {
-        "path": "webmessaging/with-ports/018.html",
         "url": "/webmessaging/with-ports/018.html"
       },
       {
-        "path": "webmessaging/with-ports/019.html",
         "url": "/webmessaging/with-ports/019.html"
       },
       {
-        "path": "webmessaging/with-ports/020.html",
         "url": "/webmessaging/with-ports/020.html"
       },
       {
-        "path": "webmessaging/with-ports/021.html",
         "url": "/webmessaging/with-ports/021.html"
       },
       {
-        "path": "webmessaging/with-ports/023.html",
         "url": "/webmessaging/with-ports/023.html"
       },
       {
-        "path": "webmessaging/with-ports/024.html",
         "url": "/webmessaging/with-ports/024.html"
       },
       {
-        "path": "webmessaging/with-ports/025.html",
         "url": "/webmessaging/with-ports/025.html"
       },
       {
-        "path": "webmessaging/with-ports/026.html",
         "url": "/webmessaging/with-ports/026.html"
       },
       {
-        "path": "webmessaging/with-ports/027.html",
         "url": "/webmessaging/with-ports/027.html"
       },
       {
-        "path": "webmessaging/without-ports/001.html",
         "url": "/webmessaging/without-ports/001.html"
       },
       {
-        "path": "webmessaging/without-ports/002.html",
         "url": "/webmessaging/without-ports/002.html"
       },
       {
-        "path": "webmessaging/without-ports/003.html",
         "url": "/webmessaging/without-ports/003.html"
       },
       {
-        "path": "webmessaging/without-ports/004.html",
         "url": "/webmessaging/without-ports/004.html"
       },
       {
-        "path": "webmessaging/without-ports/005.html",
         "url": "/webmessaging/without-ports/005.html"
       },
       {
-        "path": "webmessaging/without-ports/006.html",
         "url": "/webmessaging/without-ports/006.html"
       },
       {
-        "path": "webmessaging/without-ports/007.html",
         "url": "/webmessaging/without-ports/007.html"
       },
       {
-        "path": "webmessaging/without-ports/008.html",
         "url": "/webmessaging/without-ports/008.html"
       },
       {
-        "path": "webmessaging/without-ports/009.html",
         "url": "/webmessaging/without-ports/009.html"
       },
       {
-        "path": "webmessaging/without-ports/010.html",
         "url": "/webmessaging/without-ports/010.html"
       },
       {
-        "path": "webmessaging/without-ports/011.html",
         "url": "/webmessaging/without-ports/011.html"
       },
       {
-        "path": "webmessaging/without-ports/012.html",
         "url": "/webmessaging/without-ports/012.html"
       },
       {
-        "path": "webmessaging/without-ports/013.html",
         "url": "/webmessaging/without-ports/013.html"
       },
       {
-        "path": "webmessaging/without-ports/014.html",
         "url": "/webmessaging/without-ports/014.html"
       },
       {
-        "path": "webmessaging/without-ports/015.html",
         "url": "/webmessaging/without-ports/015.html"
       },
       {
-        "path": "webmessaging/without-ports/016.html",
         "url": "/webmessaging/without-ports/016.html"
       },
       {
-        "path": "webmessaging/without-ports/017.html",
         "url": "/webmessaging/without-ports/017.html"
       },
       {
-        "path": "webmessaging/without-ports/018.html",
         "url": "/webmessaging/without-ports/018.html"
       },
       {
-        "path": "webmessaging/without-ports/019.html",
         "url": "/webmessaging/without-ports/019.html"
       },
       {
-        "path": "webmessaging/without-ports/020.html",
         "url": "/webmessaging/without-ports/020.html"
       },
       {
-        "path": "webmessaging/without-ports/021.html",
         "url": "/webmessaging/without-ports/021.html"
       },
       {
-        "path": "webmessaging/without-ports/023.html",
         "url": "/webmessaging/without-ports/023.html"
       },
       {
-        "path": "webmessaging/without-ports/024.html",
         "url": "/webmessaging/without-ports/024.html"
       },
       {
-        "path": "webmessaging/without-ports/025.html",
         "url": "/webmessaging/without-ports/025.html"
       },
       {
-        "path": "webmessaging/without-ports/026.html",
         "url": "/webmessaging/without-ports/026.html"
       },
       {
-        "path": "webmessaging/without-ports/027.html",
         "url": "/webmessaging/without-ports/027.html"
       },
       {
-        "path": "webmessaging/without-ports/028.html",
         "url": "/webmessaging/without-ports/028.html"
       },
       {
-        "path": "webrtc/simplecall.html",
         "url": "/webrtc/simplecall.html"
       },
       {
-        "path": "websockets/Close-0.htm",
         "url": "/websockets/Close-0.htm"
       },
       {
-        "path": "websockets/Close-1000-reason.htm",
         "url": "/websockets/Close-1000-reason.htm"
       },
       {
-        "path": "websockets/Close-1000.htm",
         "url": "/websockets/Close-1000.htm"
       },
       {
-        "path": "websockets/Close-NaN.htm",
         "url": "/websockets/Close-NaN.htm"
       },
       {
-        "path": "websockets/Close-Reason-124Bytes.htm",
         "url": "/websockets/Close-Reason-124Bytes.htm"
       },
       {
-        "path": "websockets/Close-null.htm",
         "url": "/websockets/Close-null.htm"
       },
       {
-        "path": "websockets/Close-reason-unpaired-surrogates.htm",
         "url": "/websockets/Close-reason-unpaired-surrogates.htm"
       },
       {
-        "path": "websockets/Close-string.htm",
         "url": "/websockets/Close-string.htm"
       },
       {
-        "path": "websockets/Close-undefined.htm",
         "url": "/websockets/Close-undefined.htm"
       },
       {
-        "path": "websockets/Create-Secure-blocked-port.htm",
         "url": "/websockets/Create-Secure-blocked-port.htm"
       },
       {
-        "path": "websockets/Create-Secure-extensions-empty.htm",
         "url": "/websockets/Create-Secure-extensions-empty.htm"
       },
       {
-        "path": "websockets/Create-Secure-url-with-space.htm",
         "url": "/websockets/Create-Secure-url-with-space.htm"
       },
       {
-        "path": "websockets/Create-Secure-valid-url-array-protocols.htm",
         "url": "/websockets/Create-Secure-valid-url-array-protocols.htm"
       },
       {
-        "path": "websockets/Create-Secure-valid-url-binaryType-blob.htm",
         "url": "/websockets/Create-Secure-valid-url-binaryType-blob.htm"
       },
       {
-        "path": "websockets/Create-Secure-valid-url-protocol-setCorrectly.htm",
         "url": "/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm"
       },
       {
-        "path": "websockets/Create-Secure-valid-url-protocol-string.htm",
         "url": "/websockets/Create-Secure-valid-url-protocol-string.htm"
       },
       {
-        "path": "websockets/Create-Secure-valid-url.htm",
         "url": "/websockets/Create-Secure-valid-url.htm"
       },
       {
-        "path": "websockets/Create-Secure-verify-url-set-non-default-port.htm",
         "url": "/websockets/Create-Secure-verify-url-set-non-default-port.htm"
       },
       {
-        "path": "websockets/Create-invalid-urls.htm",
         "url": "/websockets/Create-invalid-urls.htm"
       },
       {
-        "path": "websockets/Create-non-absolute-url.htm",
         "url": "/websockets/Create-non-absolute-url.htm"
       },
       {
-        "path": "websockets/Create-nonAscii-protocol-string.htm",
         "url": "/websockets/Create-nonAscii-protocol-string.htm"
       },
       {
-        "path": "websockets/Create-protocol-with-space.htm",
         "url": "/websockets/Create-protocol-with-space.htm"
       },
       {
-        "path": "websockets/Create-protocols-repeated.htm",
         "url": "/websockets/Create-protocols-repeated.htm"
       },
       {
-        "path": "websockets/Create-valid-url-array-protocols.htm",
         "url": "/websockets/Create-valid-url-array-protocols.htm"
       },
       {
-        "path": "websockets/Create-valid-url-protocol-empty.htm",
         "url": "/websockets/Create-valid-url-protocol-empty.htm"
       },
       {
-        "path": "websockets/Create-valid-url-protocol.htm",
         "url": "/websockets/Create-valid-url-protocol.htm"
       },
       {
-        "path": "websockets/Create-valid-url.htm",
         "url": "/websockets/Create-valid-url.htm"
       },
       {
-        "path": "websockets/Create-verify-url-set-non-default-port.htm",
         "url": "/websockets/Create-verify-url-set-non-default-port.htm"
       },
       {
-        "path": "websockets/Create-wrong-scheme.htm",
         "url": "/websockets/Create-wrong-scheme.htm"
       },
       {
-        "path": "websockets/Secure-Close-0.htm",
         "url": "/websockets/Secure-Close-0.htm"
       },
       {
-        "path": "websockets/Secure-Close-1000-reason.htm",
         "url": "/websockets/Secure-Close-1000-reason.htm"
       },
       {
-        "path": "websockets/Secure-Close-1000-verify-code.htm",
         "url": "/websockets/Secure-Close-1000-verify-code.htm"
       },
       {
-        "path": "websockets/Secure-Close-1000.htm",
         "url": "/websockets/Secure-Close-1000.htm"
       },
       {
-        "path": "websockets/Secure-Close-1005-verify-code.htm",
         "url": "/websockets/Secure-Close-1005-verify-code.htm"
       },
       {
-        "path": "websockets/Secure-Close-1005.htm",
         "url": "/websockets/Secure-Close-1005.htm"
       },
       {
-        "path": "websockets/Secure-Close-2999-reason.htm",
         "url": "/websockets/Secure-Close-2999-reason.htm"
       },
       {
-        "path": "websockets/Secure-Close-3000-reason.htm",
         "url": "/websockets/Secure-Close-3000-reason.htm"
       },
       {
-        "path": "websockets/Secure-Close-3000-verify-code.htm",
         "url": "/websockets/Secure-Close-3000-verify-code.htm"
       },
       {
-        "path": "websockets/Secure-Close-4999-reason.htm",
         "url": "/websockets/Secure-Close-4999-reason.htm"
       },
       {
-        "path": "websockets/Secure-Close-NaN.htm",
         "url": "/websockets/Secure-Close-NaN.htm"
       },
       {
-        "path": "websockets/Secure-Close-Reason-124Bytes.htm",
         "url": "/websockets/Secure-Close-Reason-124Bytes.htm"
       },
       {
-        "path": "websockets/Secure-Close-Reason-Unpaired-surrogates.htm",
         "url": "/websockets/Secure-Close-Reason-Unpaired-surrogates.htm"
       },
       {
-        "path": "websockets/Secure-Close-null.htm",
         "url": "/websockets/Secure-Close-null.htm"
       },
       {
-        "path": "websockets/Secure-Close-onlyReason.htm",
         "url": "/websockets/Secure-Close-onlyReason.htm"
       },
       {
-        "path": "websockets/Secure-Close-readyState-Closed.htm",
         "url": "/websockets/Secure-Close-readyState-Closed.htm"
       },
       {
-        "path": "websockets/Secure-Close-readyState-Closing.htm",
         "url": "/websockets/Secure-Close-readyState-Closing.htm"
       },
       {
-        "path": "websockets/Secure-Close-server-initiated-close.htm",
         "url": "/websockets/Secure-Close-server-initiated-close.htm"
       },
       {
-        "path": "websockets/Secure-Close-string.htm",
         "url": "/websockets/Secure-Close-string.htm"
       },
       {
-        "path": "websockets/Secure-Close-undefined.htm",
         "url": "/websockets/Secure-Close-undefined.htm"
       },
       {
-        "path": "websockets/Secure-Send-65K-data.htm",
         "url": "/websockets/Secure-Send-65K-data.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-65K-arraybuffer.htm",
         "url": "/websockets/Secure-Send-binary-65K-arraybuffer.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybuffer.htm",
         "url": "/websockets/Secure-Send-binary-arraybuffer.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-float32.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-float32.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-float64.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-float64.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-int32.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-int32.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm",
         "url": "/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm"
       },
       {
-        "path": "websockets/Secure-Send-binary-blob.htm",
         "url": "/websockets/Secure-Send-binary-blob.htm"
       },
       {
-        "path": "websockets/Secure-Send-data.htm",
         "url": "/websockets/Secure-Send-data.htm"
       },
       {
-        "path": "websockets/Secure-Send-null.htm",
         "url": "/websockets/Secure-Send-null.htm"
       },
       {
-        "path": "websockets/Secure-Send-paired-surrogates.htm",
         "url": "/websockets/Secure-Send-paired-surrogates.htm"
       },
       {
-        "path": "websockets/Secure-Send-unicode-data.htm",
         "url": "/websockets/Secure-Send-unicode-data.htm"
       },
       {
-        "path": "websockets/Secure-Send-unpaired-surrogates.htm",
         "url": "/websockets/Secure-Send-unpaired-surrogates.htm"
       },
       {
-        "path": "websockets/Send-0byte-data.htm",
         "url": "/websockets/Send-0byte-data.htm"
       },
       {
-        "path": "websockets/Send-65K-data.htm",
         "url": "/websockets/Send-65K-data.htm"
       },
       {
-        "path": "websockets/Send-Unpaired-Surrogates.htm",
         "url": "/websockets/Send-Unpaired-Surrogates.htm"
       },
       {
-        "path": "websockets/Send-before-open.htm",
         "url": "/websockets/Send-before-open.htm"
       },
       {
-        "path": "websockets/Send-binary-65K-arraybuffer.htm",
         "url": "/websockets/Send-binary-65K-arraybuffer.htm"
       },
       {
-        "path": "websockets/Send-binary-arraybuffer.htm",
         "url": "/websockets/Send-binary-arraybuffer.htm"
       },
       {
-        "path": "websockets/Send-binary-arraybufferview-int16-offset.htm",
         "url": "/websockets/Send-binary-arraybufferview-int16-offset.htm"
       },
       {
-        "path": "websockets/Send-binary-arraybufferview-int8.htm",
         "url": "/websockets/Send-binary-arraybufferview-int8.htm"
       },
       {
-        "path": "websockets/Send-binary-blob.htm",
         "url": "/websockets/Send-binary-blob.htm"
       },
       {
-        "path": "websockets/Send-data.htm",
         "url": "/websockets/Send-data.htm"
       },
       {
-        "path": "websockets/Send-null.htm",
         "url": "/websockets/Send-null.htm"
       },
       {
-        "path": "websockets/Send-paired-surrogates.htm",
         "url": "/websockets/Send-paired-surrogates.htm"
       },
       {
-        "path": "websockets/Send-unicode-data.htm",
         "url": "/websockets/Send-unicode-data.htm"
       },
       {
-        "path": "websockets/binary/001.html",
         "url": "/websockets/binary/001.html"
       },
       {
-        "path": "websockets/binary/002.html",
-        "timeout": "long",
-        "url": "/websockets/binary/002.html"
-      },
-      {
-        "path": "websockets/binary/004.html",
-        "timeout": "long",
-        "url": "/websockets/binary/004.html"
-      },
-      {
-        "path": "websockets/binary/005.html",
         "url": "/websockets/binary/005.html"
       },
       {
-        "path": "websockets/binaryType-wrong-value.htm",
         "url": "/websockets/binaryType-wrong-value.htm"
       },
       {
-        "path": "websockets/closing-handshake/002.html",
         "url": "/websockets/closing-handshake/002.html"
       },
       {
-        "path": "websockets/closing-handshake/003.html",
         "url": "/websockets/closing-handshake/003.html"
       },
       {
-        "path": "websockets/closing-handshake/004.html",
         "url": "/websockets/closing-handshake/004.html"
       },
       {
-        "path": "websockets/constructor.html",
         "url": "/websockets/constructor.html"
       },
       {
-        "path": "websockets/constructor/001.html",
         "url": "/websockets/constructor/001.html"
       },
       {
-        "path": "websockets/constructor/002.html",
         "url": "/websockets/constructor/002.html"
       },
       {
-        "path": "websockets/constructor/004.html",
         "url": "/websockets/constructor/004.html"
       },
       {
-        "path": "websockets/constructor/005.html",
         "url": "/websockets/constructor/005.html"
       },
       {
-        "path": "websockets/constructor/006.html",
         "url": "/websockets/constructor/006.html"
       },
       {
-        "path": "websockets/constructor/007.html",
         "url": "/websockets/constructor/007.html"
       },
       {
-        "path": "websockets/constructor/008.html",
         "url": "/websockets/constructor/008.html"
       },
       {
-        "path": "websockets/constructor/009.html",
         "url": "/websockets/constructor/009.html"
       },
       {
-        "path": "websockets/constructor/010.html",
         "url": "/websockets/constructor/010.html"
       },
       {
-        "path": "websockets/constructor/011.html",
         "url": "/websockets/constructor/011.html"
       },
       {
-        "path": "websockets/constructor/012.html",
         "url": "/websockets/constructor/012.html"
       },
       {
-        "path": "websockets/constructor/013.html",
-        "timeout": "long",
-        "url": "/websockets/constructor/013.html"
-      },
-      {
-        "path": "websockets/constructor/014.html",
         "url": "/websockets/constructor/014.html"
       },
       {
-        "path": "websockets/constructor/016.html",
         "url": "/websockets/constructor/016.html"
       },
       {
-        "path": "websockets/constructor/017.html",
         "url": "/websockets/constructor/017.html"
       },
       {
-        "path": "websockets/constructor/018.html",
         "url": "/websockets/constructor/018.html"
       },
       {
-        "path": "websockets/constructor/019.html",
         "url": "/websockets/constructor/019.html"
       },
       {
-        "path": "websockets/constructor/020.html",
         "url": "/websockets/constructor/020.html"
       },
       {
-        "path": "websockets/constructor/021.html",
         "url": "/websockets/constructor/021.html"
       },
       {
-        "path": "websockets/constructor/022.html",
         "url": "/websockets/constructor/022.html"
       },
       {
-        "path": "websockets/cookies/001.html",
         "url": "/websockets/cookies/001.html"
       },
       {
-        "path": "websockets/cookies/002.html",
         "url": "/websockets/cookies/002.html"
       },
       {
-        "path": "websockets/cookies/003.html",
         "url": "/websockets/cookies/003.html"
       },
       {
-        "path": "websockets/cookies/004.html",
         "url": "/websockets/cookies/004.html"
       },
       {
-        "path": "websockets/cookies/005.html",
-        "timeout": "long",
-        "url": "/websockets/cookies/005.html"
-      },
-      {
-        "path": "websockets/cookies/006.html",
         "url": "/websockets/cookies/006.html"
       },
       {
-        "path": "websockets/cookies/007.html",
-        "timeout": "long",
-        "url": "/websockets/cookies/007.html"
-      },
-      {
-        "path": "websockets/eventhandlers.html",
         "url": "/websockets/eventhandlers.html"
       },
       {
-        "path": "websockets/interfaces.html",
         "url": "/websockets/interfaces.html"
       },
       {
-        "path": "websockets/interfaces/CloseEvent/clean-close.html",
         "url": "/websockets/interfaces/CloseEvent/clean-close.html"
       },
       {
-        "path": "websockets/interfaces/CloseEvent/constructor.html",
         "url": "/websockets/interfaces/CloseEvent/constructor.html"
       },
       {
-        "path": "websockets/interfaces/CloseEvent/historical.html",
         "url": "/websockets/interfaces/CloseEvent/historical.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-arraybuffer.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-blob.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-getter.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-defineProperty-setter.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-deleting.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-getting.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-initial.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html",
-        "timeout": "long",
-        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html"
-      },
-      {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-readonly.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html",
         "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-unicode.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/close/close-basic.html",
         "url": "/websockets/interfaces/WebSocket/close/close-basic.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/close/close-connecting.html",
-        "timeout": "long",
-        "url": "/websockets/interfaces/WebSocket/close/close-connecting.html"
-      },
-      {
-        "path": "websockets/interfaces/WebSocket/close/close-multiple.html",
         "url": "/websockets/interfaces/WebSocket/close/close-multiple.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/close/close-nested.html",
         "url": "/websockets/interfaces/WebSocket/close/close-nested.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/close/close-replace.html",
         "url": "/websockets/interfaces/WebSocket/close/close-replace.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/close/close-return.html",
         "url": "/websockets/interfaces/WebSocket/close/close-return.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/constants/001.html",
         "url": "/websockets/interfaces/WebSocket/constants/001.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/constants/002.html",
         "url": "/websockets/interfaces/WebSocket/constants/002.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/constants/003.html",
         "url": "/websockets/interfaces/WebSocket/constants/003.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/constants/004.html",
         "url": "/websockets/interfaces/WebSocket/constants/004.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/constants/005.html",
         "url": "/websockets/interfaces/WebSocket/constants/005.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/constants/006.html",
         "url": "/websockets/interfaces/WebSocket/constants/006.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/001.html",
         "url": "/websockets/interfaces/WebSocket/events/001.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/002.html",
         "url": "/websockets/interfaces/WebSocket/events/002.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/003.html",
         "url": "/websockets/interfaces/WebSocket/events/003.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/004.html",
         "url": "/websockets/interfaces/WebSocket/events/004.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/006.html",
         "url": "/websockets/interfaces/WebSocket/events/006.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/007.html",
         "url": "/websockets/interfaces/WebSocket/events/007.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/008.html",
         "url": "/websockets/interfaces/WebSocket/events/008.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/009.html",
         "url": "/websockets/interfaces/WebSocket/events/009.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/010.html",
         "url": "/websockets/interfaces/WebSocket/events/010.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/011.html",
         "url": "/websockets/interfaces/WebSocket/events/011.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/012.html",
         "url": "/websockets/interfaces/WebSocket/events/012.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/013.html",
         "url": "/websockets/interfaces/WebSocket/events/013.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/014.html",
         "url": "/websockets/interfaces/WebSocket/events/014.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/015.html",
         "url": "/websockets/interfaces/WebSocket/events/015.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/016.html",
         "url": "/websockets/interfaces/WebSocket/events/016.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/017.html",
         "url": "/websockets/interfaces/WebSocket/events/017.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/018.html",
         "url": "/websockets/interfaces/WebSocket/events/018.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/019.html",
         "url": "/websockets/interfaces/WebSocket/events/019.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/events/020.html",
         "url": "/websockets/interfaces/WebSocket/events/020.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/extensions/001.html",
         "url": "/websockets/interfaces/WebSocket/extensions/001.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/protocol/protocol-initial.html",
         "url": "/websockets/interfaces/WebSocket/protocol/protocol-initial.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/001.html",
         "url": "/websockets/interfaces/WebSocket/readyState/001.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/002.html",
         "url": "/websockets/interfaces/WebSocket/readyState/002.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/003.html",
         "url": "/websockets/interfaces/WebSocket/readyState/003.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/004.html",
         "url": "/websockets/interfaces/WebSocket/readyState/004.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/005.html",
         "url": "/websockets/interfaces/WebSocket/readyState/005.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/006.html",
         "url": "/websockets/interfaces/WebSocket/readyState/006.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/007.html",
         "url": "/websockets/interfaces/WebSocket/readyState/007.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/readyState/008.html",
         "url": "/websockets/interfaces/WebSocket/readyState/008.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/001.html",
         "url": "/websockets/interfaces/WebSocket/send/001.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/002.html",
         "url": "/websockets/interfaces/WebSocket/send/002.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/003.html",
         "url": "/websockets/interfaces/WebSocket/send/003.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/004.html",
         "url": "/websockets/interfaces/WebSocket/send/004.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/005.html",
         "url": "/websockets/interfaces/WebSocket/send/005.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/006.html",
         "url": "/websockets/interfaces/WebSocket/send/006.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/007.html",
         "url": "/websockets/interfaces/WebSocket/send/007.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/008.html",
         "url": "/websockets/interfaces/WebSocket/send/008.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/009.html",
         "url": "/websockets/interfaces/WebSocket/send/009.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/010.html",
         "url": "/websockets/interfaces/WebSocket/send/010.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/011.html",
         "url": "/websockets/interfaces/WebSocket/send/011.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/send/012.html",
         "url": "/websockets/interfaces/WebSocket/send/012.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/url/001.html",
         "url": "/websockets/interfaces/WebSocket/url/001.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/url/002.html",
         "url": "/websockets/interfaces/WebSocket/url/002.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/url/003.html",
         "url": "/websockets/interfaces/WebSocket/url/003.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/url/004.html",
         "url": "/websockets/interfaces/WebSocket/url/004.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/url/005.html",
         "url": "/websockets/interfaces/WebSocket/url/005.html"
       },
       {
-        "path": "websockets/interfaces/WebSocket/url/006.html",
         "url": "/websockets/interfaces/WebSocket/url/006.html"
       },
       {
-        "path": "websockets/keeping-connection-open/001.html",
-        "timeout": "long",
-        "url": "/websockets/keeping-connection-open/001.html"
-      },
-      {
-        "path": "websockets/opening-handshake/001.html",
         "url": "/websockets/opening-handshake/001.html"
       },
       {
-        "path": "websockets/opening-handshake/002.html",
-        "timeout": "long",
-        "url": "/websockets/opening-handshake/002.html"
-      },
-      {
-        "path": "websockets/opening-handshake/003.html",
         "url": "/websockets/opening-handshake/003.html"
       },
       {
-        "path": "websockets/opening-handshake/005.html",
         "url": "/websockets/opening-handshake/005.html"
       },
       {
-        "path": "websockets/security/001.html",
         "url": "/websockets/security/001.html"
       },
       {
-        "path": "websockets/security/002.html",
         "url": "/websockets/security/002.html"
       },
       {
-        "path": "websockets/unload-a-document/001.html",
         "url": "/websockets/unload-a-document/001.html"
       },
       {
-        "path": "websockets/unload-a-document/002.html",
-        "timeout": "long",
-        "url": "/websockets/unload-a-document/002.html"
-      },
-      {
-        "path": "websockets/unload-a-document/003.html",
         "url": "/websockets/unload-a-document/003.html"
       },
       {
-        "path": "websockets/unload-a-document/004.html",
-        "timeout": "long",
-        "url": "/websockets/unload-a-document/004.html"
-      },
-      {
-        "path": "websockets/unload-a-document/005.html",
-        "timeout": "long",
-        "url": "/websockets/unload-a-document/005.html"
-      },
-      {
-        "path": "webstorage/event_constructor.html",
         "url": "/webstorage/event_constructor.html"
       },
       {
-        "path": "webstorage/event_constructor_js.html",
         "url": "/webstorage/event_constructor_js.html"
       },
       {
-        "path": "webstorage/event_local_key.html",
         "url": "/webstorage/event_local_key.html"
       },
       {
-        "path": "webstorage/event_local_newvalue.html",
         "url": "/webstorage/event_local_newvalue.html"
       },
       {
-        "path": "webstorage/event_local_oldvalue.html",
         "url": "/webstorage/event_local_oldvalue.html"
       },
       {
-        "path": "webstorage/event_local_storagearea.html",
         "url": "/webstorage/event_local_storagearea.html"
       },
       {
-        "path": "webstorage/event_local_storageeventinit.html",
         "url": "/webstorage/event_local_storageeventinit.html"
       },
       {
-        "path": "webstorage/event_local_url.html",
         "url": "/webstorage/event_local_url.html"
       },
       {
-        "path": "webstorage/event_session_key.html",
         "url": "/webstorage/event_session_key.html"
       },
       {
-        "path": "webstorage/event_session_newvalue.html",
         "url": "/webstorage/event_session_newvalue.html"
       },
       {
-        "path": "webstorage/event_session_oldvalue.html",
         "url": "/webstorage/event_session_oldvalue.html"
       },
       {
-        "path": "webstorage/event_session_storagearea.html",
         "url": "/webstorage/event_session_storagearea.html"
       },
       {
-        "path": "webstorage/event_session_storageeventinit.html",
         "url": "/webstorage/event_session_storageeventinit.html"
       },
       {
-        "path": "webstorage/event_session_url.html",
         "url": "/webstorage/event_session_url.html"
       },
       {
-        "path": "webstorage/idlharness.html",
         "url": "/webstorage/idlharness.html"
       },
       {
-        "path": "webstorage/missing_arguments.html",
         "url": "/webstorage/missing_arguments.html"
       },
       {
-        "path": "webstorage/storage_local_builtins.html",
         "url": "/webstorage/storage_local_builtins.html"
       },
       {
-        "path": "webstorage/storage_local_clear.html",
         "url": "/webstorage/storage_local_clear.html"
       },
       {
-        "path": "webstorage/storage_local_clear_js.html",
         "url": "/webstorage/storage_local_clear_js.html"
       },
       {
-        "path": "webstorage/storage_local_getitem.html",
         "url": "/webstorage/storage_local_getitem.html"
       },
       {
-        "path": "webstorage/storage_local_getitem_js.html",
         "url": "/webstorage/storage_local_getitem_js.html"
       },
       {
-        "path": "webstorage/storage_local_in_js.html",
         "url": "/webstorage/storage_local_in_js.html"
       },
       {
-        "path": "webstorage/storage_local_index_js.html",
         "url": "/webstorage/storage_local_index_js.html"
       },
       {
-        "path": "webstorage/storage_local_key.html",
         "url": "/webstorage/storage_local_key.html"
       },
       {
-        "path": "webstorage/storage_local_length.html",
         "url": "/webstorage/storage_local_length.html"
       },
       {
-        "path": "webstorage/storage_local_length_js.html",
         "url": "/webstorage/storage_local_length_js.html"
       },
       {
-        "path": "webstorage/storage_local_removeitem.html",
         "url": "/webstorage/storage_local_removeitem.html"
       },
       {
-        "path": "webstorage/storage_local_removeitem_js.html",
         "url": "/webstorage/storage_local_removeitem_js.html"
       },
       {
-        "path": "webstorage/storage_local_security.html",
         "url": "/webstorage/storage_local_security.html"
       },
       {
-        "path": "webstorage/storage_local_setitem.html",
         "url": "/webstorage/storage_local_setitem.html"
       },
       {
-        "path": "webstorage/storage_local_setitem_js.html",
         "url": "/webstorage/storage_local_setitem_js.html"
       },
       {
-        "path": "webstorage/storage_local_setitem_quotaexceedederr.html",
         "url": "/webstorage/storage_local_setitem_quotaexceedederr.html"
       },
       {
-        "path": "webstorage/storage_session_builtins.html",
         "url": "/webstorage/storage_session_builtins.html"
       },
       {
-        "path": "webstorage/storage_session_clear.html",
         "url": "/webstorage/storage_session_clear.html"
       },
       {
-        "path": "webstorage/storage_session_clear_js.html",
         "url": "/webstorage/storage_session_clear_js.html"
       },
       {
-        "path": "webstorage/storage_session_getitem.html",
         "url": "/webstorage/storage_session_getitem.html"
       },
       {
-        "path": "webstorage/storage_session_getitem_js.html",
         "url": "/webstorage/storage_session_getitem_js.html"
       },
       {
-        "path": "webstorage/storage_session_in_js.html",
         "url": "/webstorage/storage_session_in_js.html"
       },
       {
-        "path": "webstorage/storage_session_index_js.html",
         "url": "/webstorage/storage_session_index_js.html"
       },
       {
-        "path": "webstorage/storage_session_key.html",
         "url": "/webstorage/storage_session_key.html"
       },
       {
-        "path": "webstorage/storage_session_length.html",
         "url": "/webstorage/storage_session_length.html"
       },
       {
-        "path": "webstorage/storage_session_length_js.html",
         "url": "/webstorage/storage_session_length_js.html"
       },
       {
-        "path": "webstorage/storage_session_removeitem.html",
         "url": "/webstorage/storage_session_removeitem.html"
       },
       {
-        "path": "webstorage/storage_session_removeitem_js.html",
         "url": "/webstorage/storage_session_removeitem_js.html"
       },
       {
-        "path": "webstorage/storage_session_setitem.html",
         "url": "/webstorage/storage_session_setitem.html"
       },
       {
-        "path": "webstorage/storage_session_setitem_js.html",
         "url": "/webstorage/storage_session_setitem_js.html"
       },
       {
-        "path": "webstorage/storage_session_setitem_quotaexceedederr.html",
         "url": "/webstorage/storage_session_setitem_quotaexceedederr.html"
       },
       {
-        "path": "webvtt/interfaces.html",
         "url": "/webvtt/interfaces.html"
       },
       {
-        "path": "webvtt/webvtt-api-for-browsers/vttcue-interface/align.html",
         "url": "/webvtt/webvtt-api-for-browsers/vttcue-interface/align.html"
       },
       {
-        "path": "webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html",
         "url": "/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html"
       },
       {
-        "path": "webvtt/webvtt-api-for-browsers/vttcue-interface/line.html",
         "url": "/webvtt/webvtt-api-for-browsers/vttcue-interface/line.html"
       },
       {
-        "path": "webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html",
         "url": "/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html"
       },
       {
-        "path": "webvtt/webvtt-api-for-browsers/vttcue-interface/text.html",
         "url": "/webvtt/webvtt-api-for-browsers/vttcue-interface/text.html"
       },
       {
-        "path": "webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html",
         "url": "/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/entities.html",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/entities.html"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/tags.html",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/tags.html"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/timestamps.html",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/timestamps.html"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/tree-building.html",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/tree-building.html"
       },
       {
-        "path": "webvtt/webvtt-file-format-parsing/webvtt-file-parsing/001.html",
         "url": "/webvtt/webvtt-file-format-parsing/webvtt-file-parsing/001.html"
       },
       {
-        "path": "workers/MessagePort_initial_disabled.htm",
         "url": "/workers/MessagePort_initial_disabled.htm"
       },
       {
-        "path": "workers/MessagePort_onmessage_start.htm",
         "url": "/workers/MessagePort_onmessage_start.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_ErrorEvent_colno.htm",
         "url": "/workers/WorkerGlobalScope_ErrorEvent_colno.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_ErrorEvent_filename.htm",
         "url": "/workers/WorkerGlobalScope_ErrorEvent_filename.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_ErrorEvent_lineno.htm",
         "url": "/workers/WorkerGlobalScope_ErrorEvent_lineno.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_ErrorEvent_message.htm",
         "url": "/workers/WorkerGlobalScope_ErrorEvent_message.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_EventTarget.htm",
         "url": "/workers/WorkerGlobalScope_EventTarget.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_XMLHttpRequest.htm",
         "url": "/workers/WorkerGlobalScope_XMLHttpRequest.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_addEventListener.htm",
         "url": "/workers/WorkerGlobalScope_addEventListener.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_close.htm",
         "url": "/workers/WorkerGlobalScope_close.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_importScripts.htm",
         "url": "/workers/WorkerGlobalScope_importScripts.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_importScripts_NetworkErr.htm",
         "url": "/workers/WorkerGlobalScope_importScripts_NetworkErr.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_nested_Worker.htm",
         "url": "/workers/WorkerGlobalScope_nested_Worker.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_removeEventListener.htm",
         "url": "/workers/WorkerGlobalScope_removeEventListener.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_setInterval.htm",
         "url": "/workers/WorkerGlobalScope_setInterval.htm"
       },
       {
-        "path": "workers/WorkerGlobalScope_setTimeout.htm",
         "url": "/workers/WorkerGlobalScope_setTimeout.htm"
       },
       {
-        "path": "workers/WorkerLocation.htm",
         "url": "/workers/WorkerLocation.htm"
       },
       {
-        "path": "workers/WorkerLocation_hash.htm",
         "url": "/workers/WorkerLocation_hash.htm"
       },
       {
-        "path": "workers/WorkerLocation_hash_encoding.htm",
         "url": "/workers/WorkerLocation_hash_encoding.htm"
       },
       {
-        "path": "workers/WorkerLocation_hash_nonexist.htm",
         "url": "/workers/WorkerLocation_hash_nonexist.htm"
       },
       {
-        "path": "workers/WorkerLocation_host.htm",
         "url": "/workers/WorkerLocation_host.htm"
       },
       {
-        "path": "workers/WorkerLocation_hostname.htm",
         "url": "/workers/WorkerLocation_hostname.htm"
       },
       {
-        "path": "workers/WorkerLocation_href.htm",
         "url": "/workers/WorkerLocation_href.htm"
       },
       {
-        "path": "workers/WorkerLocation_pathname.htm",
         "url": "/workers/WorkerLocation_pathname.htm"
       },
       {
-        "path": "workers/WorkerLocation_port.htm",
         "url": "/workers/WorkerLocation_port.htm"
       },
       {
-        "path": "workers/WorkerLocation_protocol.htm",
         "url": "/workers/WorkerLocation_protocol.htm"
       },
       {
-        "path": "workers/WorkerLocation_search.htm",
         "url": "/workers/WorkerLocation_search.htm"
       },
       {
-        "path": "workers/WorkerLocation_search_empty.htm",
         "url": "/workers/WorkerLocation_search_empty.htm"
       },
       {
-        "path": "workers/WorkerLocation_search_fragment.htm",
         "url": "/workers/WorkerLocation_search_fragment.htm"
       },
       {
-        "path": "workers/WorkerLocation_search_nonexist.htm",
         "url": "/workers/WorkerLocation_search_nonexist.htm"
       },
       {
-        "path": "workers/WorkerNavigator_appName.htm",
         "url": "/workers/WorkerNavigator_appName.htm"
       },
       {
-        "path": "workers/WorkerNavigator_appVersion.htm",
         "url": "/workers/WorkerNavigator_appVersion.htm"
       },
       {
-        "path": "workers/WorkerNavigator_onLine.htm",
         "url": "/workers/WorkerNavigator_onLine.htm"
       },
       {
-        "path": "workers/WorkerNavigator_platform.htm",
         "url": "/workers/WorkerNavigator_platform.htm"
       },
       {
-        "path": "workers/WorkerNavigator_userAgent.htm",
         "url": "/workers/WorkerNavigator_userAgent.htm"
       },
       {
-        "path": "workers/Worker_ErrorEvent_filename.htm",
         "url": "/workers/Worker_ErrorEvent_filename.htm"
       },
       {
-        "path": "workers/Worker_ErrorEvent_lineno.htm",
         "url": "/workers/Worker_ErrorEvent_lineno.htm"
       },
       {
-        "path": "workers/Worker_ErrorEvent_message.htm",
         "url": "/workers/Worker_ErrorEvent_message.htm"
       },
       {
-        "path": "workers/Worker_ErrorEvent_type.htm",
         "url": "/workers/Worker_ErrorEvent_type.htm"
       },
       {
-        "path": "workers/Worker_basic.htm",
         "url": "/workers/Worker_basic.htm"
       },
       {
-        "path": "workers/Worker_cross_origin_security_err.htm",
         "url": "/workers/Worker_cross_origin_security_err.htm"
       },
       {
-        "path": "workers/Worker_dispatchEvent_ErrorEvent.htm",
         "url": "/workers/Worker_dispatchEvent_ErrorEvent.htm"
       },
       {
-        "path": "workers/Worker_script_mimetype.htm",
         "url": "/workers/Worker_script_mimetype.htm"
       },
       {
-        "path": "workers/Worker_terminate_event_queue.htm",
         "url": "/workers/Worker_terminate_event_queue.htm"
       },
       {
-        "path": "workers/constructors/SharedWorker/connect-event.html",
         "url": "/workers/constructors/SharedWorker/connect-event.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/dummy-name.html",
         "url": "/workers/constructors/SharedWorker/dummy-name.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/dummy-shared-worker.html",
         "url": "/workers/constructors/SharedWorker/dummy-shared-worker.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/empty-name.html",
         "url": "/workers/constructors/SharedWorker/empty-name.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/global-members.html",
         "url": "/workers/constructors/SharedWorker/global-members.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/interface-objects.html",
         "url": "/workers/constructors/SharedWorker/interface-objects.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/name.html",
         "url": "/workers/constructors/SharedWorker/name.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/no-arguments-ctor.html",
         "url": "/workers/constructors/SharedWorker/no-arguments-ctor.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/null-arguments.html",
         "url": "/workers/constructors/SharedWorker/null-arguments.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/number-arguments.html",
         "url": "/workers/constructors/SharedWorker/number-arguments.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/port-onmessage.html",
         "url": "/workers/constructors/SharedWorker/port-onmessage.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/port-properties.html",
         "url": "/workers/constructors/SharedWorker/port-properties.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/port-readonly.html",
         "url": "/workers/constructors/SharedWorker/port-readonly.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/same-origin.html",
         "url": "/workers/constructors/SharedWorker/same-origin.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/setting-port-members.html",
         "url": "/workers/constructors/SharedWorker/setting-port-members.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/undefined-arguments.html",
         "url": "/workers/constructors/SharedWorker/undefined-arguments.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/unexpected-global-properties.html",
         "url": "/workers/constructors/SharedWorker/unexpected-global-properties.html"
       },
       {
-        "path": "workers/constructors/SharedWorker/unresolvable-url.html",
         "url": "/workers/constructors/SharedWorker/unresolvable-url.html"
       },
       {
-        "path": "workers/constructors/Worker/AbstractWorker.onerror.html",
         "url": "/workers/constructors/Worker/AbstractWorker.onerror.html"
       },
       {
-        "path": "workers/constructors/Worker/DedicatedWorkerGlobalScope-members.html",
         "url": "/workers/constructors/Worker/DedicatedWorkerGlobalScope-members.html"
       },
       {
-        "path": "workers/constructors/Worker/ctor-1.html",
         "url": "/workers/constructors/Worker/ctor-1.html"
       },
       {
-        "path": "workers/constructors/Worker/ctor-null.html",
         "url": "/workers/constructors/Worker/ctor-null.html"
       },
       {
-        "path": "workers/constructors/Worker/ctor-undefined.html",
         "url": "/workers/constructors/Worker/ctor-undefined.html"
       },
       {
-        "path": "workers/constructors/Worker/expected-self-properties.html",
         "url": "/workers/constructors/Worker/expected-self-properties.html"
       },
       {
-        "path": "workers/constructors/Worker/no-arguments-ctor.html",
         "url": "/workers/constructors/Worker/no-arguments-ctor.html"
       },
       {
-        "path": "workers/constructors/Worker/resolve-empty-string.html",
         "url": "/workers/constructors/Worker/resolve-empty-string.html"
       },
       {
-        "path": "workers/constructors/Worker/same-origin.html",
         "url": "/workers/constructors/Worker/same-origin.html"
       },
       {
-        "path": "workers/constructors/Worker/terminate.html",
         "url": "/workers/constructors/Worker/terminate.html"
       },
       {
-        "path": "workers/constructors/Worker/unexpected-self-properties.html",
         "url": "/workers/constructors/Worker/unexpected-self-properties.html"
       },
       {
-        "path": "workers/constructors/Worker/unresolvable-url.html",
         "url": "/workers/constructors/Worker/unresolvable-url.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/onmessage.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/onmessage.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/imagedata-cloned-canvas-in-array.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/message-event.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/return-value.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/return-value.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null-in-array.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.html",
+        "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html"
+      },
+      {
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/setting-postMessage.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-imagedata.html"
       },
       {
-        "path": "workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.html",
         "url": "/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/structured-clone-message.html"
       },
       {
-        "path": "workers/interfaces/SharedWorkerGlobalScope/name/getting.html",
         "url": "/workers/interfaces/SharedWorkerGlobalScope/name/getting.html"
       },
       {
-        "path": "workers/interfaces/SharedWorkerGlobalScope/name/setting.html",
         "url": "/workers/interfaces/SharedWorkerGlobalScope/name/setting.html"
       },
       {
-        "path": "workers/interfaces/SharedWorkerGlobalScope/onconnect.html",
         "url": "/workers/interfaces/SharedWorkerGlobalScope/onconnect.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/close/incoming-message.html",
         "url": "/workers/interfaces/WorkerGlobalScope/close/incoming-message.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/close/sending-messages.html",
         "url": "/workers/interfaces/WorkerGlobalScope/close/sending-messages.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/close/setInterval.html",
         "url": "/workers/interfaces/WorkerGlobalScope/close/setInterval.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/close/setTimeout.html",
         "url": "/workers/interfaces/WorkerGlobalScope/close/setTimeout.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/members.html",
         "url": "/workers/interfaces/WorkerGlobalScope/location/members.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/redirect.html",
         "url": "/workers/interfaces/WorkerGlobalScope/location/redirect.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/returns-same-object.html",
         "url": "/workers/interfaces/WorkerGlobalScope/location/returns-same-object.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/setting-members.html",
         "url": "/workers/interfaces/WorkerGlobalScope/location/setting-members.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html",
         "url": "/workers/interfaces/WorkerGlobalScope/location/worker-separate-file.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html",
         "url": "/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/onerror/handled.html",
         "url": "/workers/interfaces/WorkerGlobalScope/onerror/handled.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/onerror/not-handled.html",
         "url": "/workers/interfaces/WorkerGlobalScope/onerror/not-handled.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html",
         "url": "/workers/interfaces/WorkerGlobalScope/onerror/propagate-to-window-onerror.html"
       },
       {
-        "path": "workers/interfaces/WorkerGlobalScope/self.html",
         "url": "/workers/interfaces/WorkerGlobalScope/self.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/WindowTimers/001.html",
         "url": "/workers/interfaces/WorkerUtils/WindowTimers/001.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/WindowTimers/002.html",
         "url": "/workers/interfaces/WorkerUtils/WindowTimers/002.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/WindowTimers/003.html",
         "url": "/workers/interfaces/WorkerUtils/WindowTimers/003.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/WindowTimers/004.html",
         "url": "/workers/interfaces/WorkerUtils/WindowTimers/004.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/001.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/001.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/002.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/002.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/003.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/003.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/004.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/004.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/005.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/005.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/006.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/006.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/007.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/007.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/008.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/008.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/009.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/009.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/010.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/010.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/011.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/011.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/importScripts/012.html",
         "url": "/workers/interfaces/WorkerUtils/importScripts/012.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/001.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/001.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/002.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/002.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/003.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/003.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/004.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/004.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/005.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/005.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/006.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/006.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/007.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/007.html"
       },
       {
-        "path": "workers/interfaces/WorkerUtils/navigator/language.html",
         "url": "/workers/interfaces/WorkerUtils/navigator/language.html"
       },
       {
-        "path": "workers/postMessage_DataCloneErr.htm",
         "url": "/workers/postMessage_DataCloneErr.htm"
       },
       {
-        "path": "workers/postMessage_clone_port.htm",
         "url": "/workers/postMessage_clone_port.htm"
       },
       {
-        "path": "workers/postMessage_clone_port_error.htm",
         "url": "/workers/postMessage_clone_port_error.htm"
       },
       {
-        "path": "workers/postMessage_event_properties.htm",
         "url": "/workers/postMessage_event_properties.htm"
       },
       {
-        "path": "workers/postMessage_ports_readonly_array.htm",
         "url": "/workers/postMessage_ports_readonly_array.htm"
       },
       {
-        "path": "workers/postMessage_target_source.htm",
         "url": "/workers/postMessage_target_source.htm"
       },
       {
-        "path": "workers/semantics/encodings/001.html",
         "url": "/workers/semantics/encodings/001.html"
       },
       {
-        "path": "workers/semantics/encodings/002.html",
         "url": "/workers/semantics/encodings/002.html"
       },
       {
-        "path": "workers/semantics/encodings/003.html",
         "url": "/workers/semantics/encodings/003.html"
       },
       {
-        "path": "workers/semantics/encodings/004.html",
         "url": "/workers/semantics/encodings/004.html"
       },
       {
-        "path": "workers/semantics/interface-objects/001.html",
         "url": "/workers/semantics/interface-objects/001.html"
       },
       {
-        "path": "workers/semantics/interface-objects/002.html",
         "url": "/workers/semantics/interface-objects/002.html"
       },
       {
-        "path": "workers/semantics/interface-objects/003.html",
         "url": "/workers/semantics/interface-objects/003.html"
       },
       {
-        "path": "workers/semantics/interface-objects/004.html",
         "url": "/workers/semantics/interface-objects/004.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/001.html",
         "url": "/workers/semantics/multiple-workers/001.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/002.html",
         "url": "/workers/semantics/multiple-workers/002.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/003.html",
         "url": "/workers/semantics/multiple-workers/003.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/004.html",
         "url": "/workers/semantics/multiple-workers/004.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/005.html",
         "url": "/workers/semantics/multiple-workers/005.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/006.html",
         "url": "/workers/semantics/multiple-workers/006.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/007.html",
         "url": "/workers/semantics/multiple-workers/007.html"
       },
       {
-        "path": "workers/semantics/multiple-workers/008.html",
         "url": "/workers/semantics/multiple-workers/008.html"
       },
       {
-        "path": "workers/semantics/navigation/001.html",
         "url": "/workers/semantics/navigation/001.html"
       },
       {
-        "path": "workers/semantics/navigation/002.html",
         "url": "/workers/semantics/navigation/002.html"
       },
       {
-        "path": "workers/semantics/reporting-errors/001.html",
         "url": "/workers/semantics/reporting-errors/001.html"
       },
       {
-        "path": "workers/semantics/reporting-errors/002.html",
         "url": "/workers/semantics/reporting-errors/002.html"
       },
       {
-        "path": "workers/semantics/reporting-errors/003.html",
         "url": "/workers/semantics/reporting-errors/003.html"
       },
       {
-        "path": "workers/semantics/reporting-errors/004.html",
         "url": "/workers/semantics/reporting-errors/004.html"
       },
       {
-        "path": "workers/semantics/run-a-worker/001.html",
         "url": "/workers/semantics/run-a-worker/001.html"
       },
       {
-        "path": "workers/semantics/run-a-worker/002.html",
         "url": "/workers/semantics/run-a-worker/002.html"
       },
       {
-        "path": "workers/semantics/run-a-worker/003.html",
         "url": "/workers/semantics/run-a-worker/003.html"
       },
       {
-        "path": "workers/semantics/structured-clone/dedicated.html",
         "url": "/workers/semantics/structured-clone/dedicated.html"
       },
       {
-        "path": "workers/semantics/structured-clone/shared.html",
         "url": "/workers/semantics/structured-clone/shared.html"
       },
       {
-        "path": "workers/semantics/xhr/001.html",
         "url": "/workers/semantics/xhr/001.html"
       },
       {
-        "path": "workers/semantics/xhr/002.html",
         "url": "/workers/semantics/xhr/002.html"
       },
       {
-        "path": "workers/semantics/xhr/003.html",
         "url": "/workers/semantics/xhr/003.html"
       },
       {
-        "path": "workers/semantics/xhr/004.html",
         "url": "/workers/semantics/xhr/004.html"
       },
       {
-        "path": "workers/semantics/xhr/005.html",
         "url": "/workers/semantics/xhr/005.html"
       },
       {
-        "path": "workers/semantics/xhr/006.html",
         "url": "/workers/semantics/xhr/006.html"
-      }
-    ],
-    "wdspec": [
+      },
       {
-        "path": "webdriver/cookie/cookie_test.py"
+        "timeout": "long",
+        "url": "/IndexedDB/idbdatabase_createObjectStore10-1000ends.htm"
       },
       {
-        "path": "webdriver/ecmascript/ecmascript_test.py"
+        "timeout": "long",
+        "url": "/IndexedDB/idbobjectstore_createIndex3-usable-right-away.htm"
       },
       {
-        "path": "webdriver/element_location/element_location_test.py"
+        "timeout": "long",
+        "url": "/IndexedDB/idbobjectstore_createIndex8-valid_keys.htm"
       },
       {
-        "path": "webdriver/element_state/method_test.py"
+        "timeout": "long",
+        "url": "/IndexedDB/keypath_maxsize.htm"
       },
       {
-        "path": "webdriver/element_state/visibility_test.py"
+        "timeout": "long",
+        "url": "/IndexedDB/writer-starvation.htm"
       },
       {
-        "path": "webdriver/javascript/execute_script_test.py"
+        "timeout": "long",
+        "url": "/XMLHttpRequest/progress-events-response-data-gzip.htm"
       },
       {
-        "path": "webdriver/modal/alerts_quit_test.py"
+        "timeout": "long",
+        "url": "/XMLHttpRequest/send-redirect-bogus.htm"
       },
       {
-        "path": "webdriver/modal/alerts_test.py"
+        "timeout": "long",
+        "url": "/ambient-light/AmbientLight_tests.html"
       },
       {
-        "path": "webdriver/navigation/auth_tests.py"
+        "timeout": "long",
+        "url": "/cors/status-async.htm"
       },
       {
-        "path": "webdriver/navigation/forward.py"
+        "timeout": "long",
+        "url": "/dom/nodes/Document-characterSet-normalization.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-attributes.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-cloneContents.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-cloneRange.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-collapse.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-commonAncestorContainer.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-compareBoundaryPoints.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-comparePoint-2.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-comparePoint.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-deleteContents.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-detach.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-extractContents.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-insertNode.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-intersectsNode-binding.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-intersectsNode.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-isPointInRange.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-mutations.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-selectNode.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-set.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/ranges/Range-surroundContents.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/traversal/NodeIterator-removal.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/dom/traversal/NodeIterator.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/eventsource/dedicated-worker/eventsource-constructor-non-same-origin.htm"
+      },
+      {
+        "timeout": "long",
+        "url": "/eventsource/eventsource-constructor-non-same-origin.htm"
+      },
+      {
+        "timeout": "long",
+        "url": "/eventsource/shared-worker/eventsource-constructor-non-same-origin.htm"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/browsers/history/the-history-interface/007.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/browsers/origin/cross-origin-objects/cross-origin-objects.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/interfaces.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-embedded.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-forms.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-grouping.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-metadata.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-misc.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-obsolete.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-sections.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-tabular.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/dom/reflection-text.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/semantics/embedded-content/media-elements/audio_loop_base.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/semantics/embedded-content/media-elements/video_loop_base.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_adoption01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_adoption02.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_comments01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_doctype01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_domjs-unsafe.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_entities01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_entities02.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_html5test-com.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_inbody01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_innerHTML_tests4.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_innerHTML_tests6.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_innerHTML_tests7.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_innerHTML_tests_innerHTML_1.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_isindex.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_main-element.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_pending-spec-changes-plain-text-unsafe.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_pending-spec-changes.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_plain-text-unsafe.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_scriptdata01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_scripted_adoption01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_scripted_ark.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_scripted_webkit01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tables01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_template.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests1.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests10.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests11.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests12.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests14.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests15.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests16.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests17.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests18.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests19.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests2.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests20.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests21.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests22.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests23.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests24.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests25.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests26.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests3.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests5.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests6.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests7.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests8.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tests9.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_tricky01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_webkit01.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/html/syntax/parsing/html5lib_webkit02.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/binary/002.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/binary/004.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/constructor/013.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/cookies/005.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/cookies/007.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/interfaces/WebSocket/bufferedAmount/bufferedAmount-large.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/interfaces/WebSocket/close/close-connecting.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/keeping-connection-open/001.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/opening-handshake/002.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/unload-a-document/002.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/unload-a-document/004.html"
+      },
+      {
+        "timeout": "long",
+        "url": "/websockets/unload-a-document/005.html"
+      }
+    ],
+    "wdspec": [
+      {
+        "path": "webdriver/cookie/cookie_test.py"
+      },
+      {
+        "path": "webdriver/ecmascript/ecmascript_test.py"
+      },
+      {
+        "path": "webdriver/element_location/element_location_test.py"
+      },
+      {
+        "path": "webdriver/element_state/method_test.py"
+      },
+      {
+        "path": "webdriver/element_state/visibility_test.py"
+      },
+      {
+        "path": "webdriver/javascript/execute_script_test.py"
+      },
+      {
+        "path": "webdriver/modal/alerts_quit_test.py"
+      },
+      {
+        "path": "webdriver/modal/alerts_test.py"
+      },
+      {
+        "path": "webdriver/navigation/auth_tests.py"
+      },
+      {
+        "path": "webdriver/navigation/forward.py"
       },
       {
         "path": "webdriver/navigation/forwardToNothing.py"
@@ -23133,6 +17642,10 @@
       }
     ]
   },
-  "local_changes": [],
-  "rev": "1b45197f111e5bb65607d89f7d385883849d005d"
+  "local_changes": {
+    "deleted": [],
+    "items": {}
+  },
+  "rev": "9840b559b10e05f659932a835c11832db9e01c42",
+  "url_base": "/"
 }
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-duration.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-duration.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-duration.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-duration.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -2,13 +2,13 @@
   type: testharness
   expected: TIMEOUT
   [Test seek starts on duration truncation below currentTime]
-    expected: TIMEOUT
+    disabled: TIMEOUT or FAIL https://bugzilla.mozilla.org/show_bug.cgi?id=1085247
 
   [Test appendBuffer completes previous seek to truncated duration]
-    disabled: TIMEOUT or FAIL https://bugzilla.mozilla.org/show_bug.cgi?id=1066467
+    disabled: TIMEOUT or FAIL https://bugzilla.mozilla.org/show_bug.cgi?id=1085247
 
   [Test endOfStream completes previous seek to truncated duration]
-    expected: TIMEOUT
+    disabled: TIMEOUT or FAIL https://bugzilla.mozilla.org/show_bug.cgi?id=1085247
 
   [Test setting same duration multiple times does not fire duplicate durationchange]
     expected: FAIL
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,9 +1,6 @@
 [mediasource-remove.html]
   type: testharness
   expected: TIMEOUT
-  [Test remove transitioning readyState from \'ended\' to \'open\'.]
-    expected: FAIL
-
   [Test removing all appended data.]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-seek-beyond-duration.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,7 +1,6 @@
 [mediasource-seek-beyond-duration.html]
   type: testharness
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
-
   [Test seeking beyond updated media duration.]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/mediasource-seek-during-pending-seek.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,7 +1,6 @@
 [mediasource-seek-during-pending-seek.html]
   type: testharness
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
-
   [Test seeking to a new location before transitioning beyond HAVE_METADATA.]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1093945
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/media-source/SourceBuffer-abort-readyState.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,9 +1,5 @@
 [SourceBuffer-abort-readyState.html]
   type: testharness
-  expected: TIMEOUT
-  [SourceBuffer#abort() (video/webm; codecs="vorbis,vp8") : If the readyState attribute of the parent media source is not in the "open" state then throw an INVALID_STATE_ERR exception and abort these steps.]
-    expected: TIMEOUT
-
   [SourceBuffer#abort() (video/mp4) : If the readyState attribute of the parent media source is not in the "open" state then throw an INVALID_STATE_ERR exception and abort these steps.]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/old-tests/submission/Opera/script_scheduling/031.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/old-tests/submission/Opera/script_scheduling/031.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/old-tests/submission/Opera/script_scheduling/031.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/old-tests/submission/Opera/script_scheduling/031.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -2,4 +2,3 @@
   type: testharness
   disabled:
     if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1090625
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_constructor.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_constructor.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_constructor.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_constructor.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,3 +1,6 @@
 [pointerevent_constructor.html]
   type: testharness
   expected: TIMEOUT
+  [PointerEvent constructor]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_lostpointercapture_for_disconnected_node.html]
-  type: testharness
-  expected: TIMEOUT
-  [lostpointercapture event received]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_pointerleave_after_pointercancel_touch.html]
-  type: testharness
-  expected: TIMEOUT
-  [pointerleave event received]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_pointerleave_after_pointerup_nohover.html]
-  type: testharness
-  expected: TIMEOUT
-  [pointerleave event received]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_pointerout_after_pointercancel_touch.html]
-  type: testharness
-  expected: TIMEOUT
-  [pointerout event received]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_pointerout_after_pointerup_nohover.html]
-  type: testharness
-  expected: TIMEOUT
-  [pointerout event received]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_pen.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_pen.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_pen.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_pointerout_pen.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_pointerout_pen.html]
-  type: testharness
-  expected: TIMEOUT
-  [pointerout event received]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_disconnected.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_disconnected.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_disconnected.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_disconnected.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[pointerevent_setpointercapture_disconnected.html]
-  type: testharness
-  expected: TIMEOUT
-  [setPointerCapture: DOMException InvalidStateError]
-    expected: NOTRUN
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/progress-events/interface.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/progress-events/interface.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/progress-events/interface.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/progress-events/interface.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -0,0 +1,5 @@
+[interface.html]
+  type: testharness
+  [The ProgressEvent interface]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,3 +1,5 @@
 [test_resource_timing.html]
   type: testharness
-  disabled: 1079837
+  [PerformanceEntry has correct name, initiatorType, startTime, and duration (link)]
+    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1079837
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/selectors-api/tests/submissions/Opera/level2-baseline.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/selectors-api/tests/submissions/Opera/level2-baseline.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/selectors-api/tests/submissions/Opera/level2-baseline.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/selectors-api/tests/submissions/Opera/level2-baseline.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,5 +1,6 @@
 [level2-baseline.html]
   type: testharness
+  expected: TIMEOUT
   [Document supports find]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/url/a-element.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/url/a-element.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/url/a-element.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/url/a-element.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -333,3 +333,18 @@
   [Parsing: <http://[google.com\]> against <http://other.com/>]
     expected: FAIL
 
+  [Parsing: <#\xce\xb2> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://192.0x00A80001> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://192.168.0.257> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://\xef\xbc\x90\xef\xbc\xb8\xef\xbd\x83\xef\xbc\x90\xef\xbc\x8e\xef\xbc\x90\xef\xbc\x92\xef\xbc\x95\xef\xbc\x90\xef\xbc\x8e\xef\xbc\x90\xef\xbc\x91> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <x> against <test:test>]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/url/a-element.xhtml.ini	2014-11-26 21:45:52.000000000 +0000
@@ -132,6 +132,7 @@
       if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): PASS
       if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): PASS
       if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): PASS
+      if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): PASS
       FAIL
 
   [Parsing: <  File:c|////foo\\bar.html> against <file:///tmp/mock/path>]
@@ -356,3 +357,18 @@
   [Parsing: <http://[google.com\]> against <http://other.com/>]
     expected: FAIL
 
+  [Parsing: <#\xce\xb2> against <http://example.org/foo/bar>]
+    expected: FAIL
+
+  [Parsing: <http://192.0x00A80001> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <http://192.168.0.257> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <http://\xef\xbc\x90\xef\xbc\xb8\xef\xbd\x83\xef\xbc\x90\xef\xbc\x8e\xef\xbc\x90\xef\xbc\x92\xef\xbc\x95\xef\xbc\x90\xef\xbc\x8e\xef\xbc\x90\xef\xbc\x91> against <http://other.com/>]
+    expected: FAIL
+
+  [Parsing: <x> against <test:test>]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/url/interfaces.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/url/interfaces.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/url/interfaces.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/url/interfaces.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -1,11 +1,17 @@
 [interfaces.html]
   type: testharness
-  [URL interface: operation domainToASCII(ScalarValueString)]
+  [URL interface: operation domainToASCII(USVString)]
     expected: FAIL
 
-  [URL interface: operation domainToUnicode(ScalarValueString)]
+  [URL interface: operation domainToUnicode(USVString)]
     expected: FAIL
 
   [URLSearchParams interface: existence and properties of interface object]
     expected: FAIL
 
+  [URL interface: operation domainToASCII(ScalarValueString)]
+    expected: FAIL
+
+  [URL interface: operation domainToUnicode(ScalarValueString)]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-after.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-after.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-after.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-after.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,50 @@
+[animation-node-after.html]
+  type: testharness
+  [AnimationNode.after() does nothing if the node has no parent animation group. HierarchyRequestError is not thrown in call node.after(null)]
+    expected: FAIL
+
+  [AnimationNode.after() does nothing if the node has no parent animation group. No HierarchyRequestError is thrown if the node is inserted after itself]
+    expected: FAIL
+
+  [AnimationNode.after() does nothing if there is no parent animation group]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if node is inserted after itself]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if direct parent is inserted after the node]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if an inclusive ancestor is inserted after the node]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if an inclusive ancestor is inserted after the node. Test several arguments in after() call]
+    expected: FAIL
+
+  [AnimationNode.after() inserts nodes after this node]
+    expected: FAIL
+
+  [AnimationNode.after() inserts nodes after this node. Inserted node is on the same level in the tree]
+    expected: FAIL
+
+  [Test AnimationNode.after() inserts node after this node even if inserted node is already after this one]
+    expected: FAIL
+
+  [Test AnimationNode.after() inserts node after this node. The previous position of the inserted node is deeper in the tree than current node]
+    expected: FAIL
+
+  [Test AnimationNode.after() inserts node after this node. The previous position of the inserted node is shallower in the tree than current node, but not ancestor]
+    expected: FAIL
+
+  [Test AnimationNode.after() inserts several nodes after this node]
+    expected: FAIL
+
+  [Test AnimationNode.after() inserts several nodes after this node, duplicate nodes are ignored]
+    expected: FAIL
+
+  [Test AnimationNode.after() inserts several nodes after this node, check insertion order]
+    expected: FAIL
+
+  [Test AnimationNode.after() disassociates the inserted node from the player, if node is directly associated with a player]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-before.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-before.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-before.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-before.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,50 @@
+[animation-node-before.html]
+  type: testharness
+  [AnimationNode.before() does nothing if the node has no parent animation group. HierarchyRequestError is not thrown in call node.before(null)]
+    expected: FAIL
+
+  [AnimationNode.before() does nothing if the node has no parent animation group. No HierarchyRequestError is thrown if the node is inserted before itself]
+    expected: FAIL
+
+  [AnimationNode.before() does nothing if there is no parent animation group]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if node is inserted before itself]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if direct parent is inserted before the node]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if an inclusive ancestor is inserted before the node]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if an inclusive ancestor is inserted before the node. Test several arguments in before() call]
+    expected: FAIL
+
+  [AnimationNode.before() inserts nodes before this node]
+    expected: FAIL
+
+  [AnimationNode.before() inserts nodes before this node. Inserted node is on the same level in the tree]
+    expected: FAIL
+
+  [Test AnimationNode.before() inserts node before this node even if inserted node is already before this one]
+    expected: FAIL
+
+  [Test AnimationNode.before() inserts node before this node. The previous position of the inserted node is deeper in the tree than current node]
+    expected: FAIL
+
+  [Test AnimationNode.before() inserts node before this node. The previous position of the inserted node is shallower in the tree than current node, but not ancestor]
+    expected: FAIL
+
+  [Test AnimationNode.before() inserts several nodes before this node]
+    expected: FAIL
+
+  [Test AnimationNode.before() inserts several nodes before this node, duplicate nodes are ignored]
+    expected: FAIL
+
+  [Test AnimationNode.before() inserts several nodes before this node, check insertion order]
+    expected: FAIL
+
+  [Test AnimationNode.before() disassociates the inserted node from the player, if node is directly associated with a player]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-remove.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-remove.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-remove.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-remove.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,29 @@
+[animation-node-remove.html]
+  type: testharness
+  [AnimationNode.remove() does nothing for standalone node]
+    expected: FAIL
+
+  [AnimationNode.remove() removes node from the parent animation group. Removed node is the only node in the tree]
+    expected: FAIL
+
+  [AnimationNode.remove() removes node from the parent animation group. Remove the first node in the group]
+    expected: FAIL
+
+  [AnimationNode.remove() removes node from the parent animation group. Remove the last node in the group]
+    expected: FAIL
+
+  [AnimationNode.remove() removes node from the parent animation group. Remove node from the middle of the group]
+    expected: FAIL
+
+  [Test removing a node that has children]
+    expected: FAIL
+
+  [AnimationNode.remove() disassociates the node from player, if node is directly associated with a player]
+    expected: FAIL
+
+  [AnimationNode.remove() keeps parent direct association with the player]
+    expected: FAIL
+
+  [AnimationNode.remove() on the root of a non-trivial tree does not change child structure]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-replace.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-replace.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-replace.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/animation-node-replace.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,53 @@
+[animation-node-replace.html]
+  type: testharness
+  [AnimationNode.replace(null) does nothing if node has no parent animation group]
+    expected: FAIL
+
+  [AnimationNode.replace() does nothing if node has no parent animation group. HierarchyRequestError is not thrown if the node is replacing itself]
+    expected: FAIL
+
+  [AnimationNode.replace() does nothing if node has no parent animation group]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if the node replaces itself]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if the node is replaced by its parent]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if the node is replaced by its inclusive ancestor]
+    expected: FAIL
+
+  [HierarchyRequestError is thrown if node is replaced by its inclusive ancestor. Test several arguments in replace() call]
+    expected: FAIL
+
+  [AnimationNode.replace() without arguments removes the node from the parent animation group]
+    expected: FAIL
+
+  [AnimationNode.replace() removes the node from its parent animation group]
+    expected: FAIL
+
+  [AnimationNode.replace(next sibling) removes the node from its parent animation group]
+    expected: FAIL
+
+  [AnimationNode.replace() replaces node in the parent animation group]
+    expected: FAIL
+
+  [Test AnimationNode.replace() replaces given node. The previous position of the replacement node is deeper in the tree than the current node]
+    expected: FAIL
+
+  [Test AnimationNode.replace() replaces given node. The previous position of the replacement node is shallower in the tree than current node, but is not an ancestor]
+    expected: FAIL
+
+  [Test AnimationNode.replace() replaces given node. Test several arguments]
+    expected: FAIL
+
+  [Test AnimationNode.replace() replaces given node by several nodes, duplicate nodes are ignored]
+    expected: FAIL
+
+  [Test AnimationNode.replace() replaces given node by several nodes, check replacement order]
+    expected: FAIL
+
+  [Test AnimationNode.replace() disassociates the inserted node from the player, if node is directly associated with a player]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/idlharness.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/idlharness.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-node/idlharness.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-node/idlharness.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,3 @@
+[idlharness.html]
+  type: testharness
+  expected: ERROR
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-timeline/animation-timeline.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-timeline/animation-timeline.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/web-animations/animation-timeline/animation-timeline.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/web-animations/animation-timeline/animation-timeline.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[animation-timeline.html]
-  type: testharness
-  [document.timeline.currentTime value tests]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/Close-reason-unpaired-surrogates.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/Close-reason-unpaired-surrogates.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/Close-reason-unpaired-surrogates.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/Close-reason-unpaired-surrogates.htm.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,5 @@
+[Close-reason-unpaired-surrogates.htm]
+  type: testharness
+  [W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/constructor/009.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/constructor/009.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/constructor/009.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/constructor/009.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -3,3 +3,5 @@
   expected:
     if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/constructor/014.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/constructor/014.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/constructor/014.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/constructor/014.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -1,4 +1,4 @@
 [014.html]
   type: testharness
   disabled:
-    if os == "win" and version == "5.1.2600": https://bugzilla.mozilla.org/show_bug.cgi?id=1090198
+    if (os == "win") and (version == "5.1.2600"): https://bugzilla.mozilla.org/show_bug.cgi?id=1090198
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/002.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/002.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/002.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/002.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,4 @@
+[002.html]
+  type: testharness
+  expected:
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/003.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/003.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/003.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/003.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -2,3 +2,4 @@
   type: testharness
   expected:
     if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/004.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/004.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/004.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/004.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -2,4 +2,3 @@
   type: testharness
   expected:
     if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/005.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/005.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/005.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/005.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -3,3 +3,5 @@
   expected:
     if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/006.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/006.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/006.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/constants/006.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -1,4 +1,4 @@
 [006.html]
   type: testharness
   expected:
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/002.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/002.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/002.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/002.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -2,3 +2,5 @@
   type: testharness
   expected:
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/003.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/003.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/003.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/003.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -3,7 +3,5 @@
   expected:
     if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
-    if debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
     if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/011.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/011.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/011.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/011.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -2,4 +2,4 @@
   type: testharness
   expected:
     if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): CRASH
-    if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/012.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/012.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/012.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/012.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -3,4 +3,3 @@
   expected:
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "mac") and (version == "OS X 10.9") and (processor == "x86_64") and (bits == 64): CRASH
-    if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/013.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/013.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/013.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/013.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -2,6 +2,7 @@
   type: testharness
   expected:
     if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
   [onclose]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/014.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/014.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/014.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/014.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -2,3 +2,4 @@
   type: testharness
   expected:
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/015.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/015.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/015.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/events/015.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -3,3 +3,4 @@
   expected:
     if debug and (os == "mac") and (version == "OS X 10.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/send/005.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/send/005.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/send/005.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/websockets/interfaces/WebSocket/send/005.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -3,3 +3,5 @@
   expected:
     if debug and (os == "mac") and (version == "OS X 10.6.8") and (processor == "x86_64") and (bits == 64): CRASH
     if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86") and (bits == 32): CRASH
+    if debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): CRASH
+    if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): CRASH
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,5 @@
+[audio_has_no_subtitles.html]
+  type: reftest
+  reftype: ==
+  refurl: /webvtt/rendering/cues-with-video/processing-model/audio_has_no_subtitles-ref.html
+  expected: TIMEOUT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html.ini	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,5 @@
+[event-ports-dedicated.html]
+  type: testharness
+  [e.ports in dedicated worker]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html.ini	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[second-argument-null.html]
-  type: testharness
-  [Using null in postMessage\'s second argument]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/Worker_cross_origin_security_err.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/Worker_cross_origin_security_err.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/Worker_cross_origin_security_err.htm.ini	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/Worker_cross_origin_security_err.htm.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[Worker_cross_origin_security_err.htm]
-  type: testharness
-  [Test Description: Throw a SECURITY_ERR exception when origin of the worker script URL and origin URL are not same.]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/Worker_dispatchEvent_ErrorEvent.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/Worker_dispatchEvent_ErrorEvent.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/workers/Worker_dispatchEvent_ErrorEvent.htm.ini	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/workers/Worker_dispatchEvent_ErrorEvent.htm.ini	2014-11-26 21:45:52.000000000 +0000
@@ -1,6 +1,5 @@
 [Worker_dispatchEvent_ErrorEvent.htm]
   type: testharness
-  expected: ERROR
   [Test Description: ErrorEvent.initErrorEvent() and Worker.dispatchEvent()]
     expected: NOTRUN
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/getresponseheader-chunked-trailer.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/getresponseheader-chunked-trailer.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/getresponseheader-chunked-trailer.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/getresponseheader-chunked-trailer.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,6 +1,5 @@
 [getresponseheader-chunked-trailer.htm]
   type: testharness
-  expected: TIMEOUT
   [XMLHttpRequest: getResponseHeader() and HTTP trailer]
-    expected: TIMEOUT
+    expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini	2014-11-26 21:45:51.000000000 +0000
@@ -15,9 +15,6 @@
   [XMLHttpRequest interface: new XMLHttpRequest() must inherit property "statusText" with the proper type (16)]
     expected: FAIL
 
-  [FormData interface: existence and properties of interface object]
-    expected: FAIL
-
   [FormData interface: operation delete(DOMString)]
     expected: FAIL
 
@@ -108,3 +105,66 @@
   [FormData interface: calling set(DOMString,DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
+  [XMLHttpRequest interface: operation open(ByteString,USVString,boolean,USVString,USVString)]
+    expected: FAIL
+
+  [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
+
+  [ProgressEvent interface: existence and properties of interface object]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[send-authentication-basic-repeat-no-args.htm]
-  type: testharness
-  [XMLHttpRequest: send() - "Basic" authenticated requests with user name and password passed to open() in first request, without in second]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-setrequestheader.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-setrequestheader.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-setrequestheader.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/send-authentication-basic-setrequestheader.htm.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[send-authentication-basic-setrequestheader.htm]
-  type: testharness
-  [XMLHttpRequest: send() - "Basic" authenticated request using setRequestHeader()]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-name.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-name.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-name.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-name.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -3,3 +3,9 @@
   [XMLHttpRequest: setRequestHeader() name argument checks 17]
     expected: FAIL
 
+  [setRequestHeader should throw with header name "\xef\xbe\x83\xef\xbd\xbd\xef\xbe\x84".]
+    expected: FAIL
+
+  [setRequestHeader should throw with header name "X-\xef\xbe\x83\xef\xbd\xbd\xef\xbe\x84".]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-value.htm.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-value.htm.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-value.htm.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/setrequestheader-bogus-value.htm.ini	2014-11-26 21:45:51.000000000 +0000
@@ -1,8 +1,5 @@
 [setrequestheader-bogus-value.htm]
   type: testharness
-  [XMLHttpRequest: setRequestHeader() value argument checks]
-    expected: FAIL
-
-  [XMLHttpRequest: setRequestHeader() value argument checks 1]
+  [XMLHttpRequest: setRequestHeader() value argument checks 2]
     expected: FAIL
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/meta/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini	2014-11-14 09:37:16.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/meta/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[xmlhttprequest-timeout-overridesexpires.html]
-  type: testharness
-  [Timeout test: timeout set to expired value before load fires, original timeout at 1000, reset at 400 to 300]
-    expected:
-      if debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
-      if debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/moz.build	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/moz.build	2014-11-26 21:45:52.000000000 +0000
@@ -4,3 +4,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/.
 
+TEST_HARNESS_FILES['web-platform'] += [
+    'harness/**',
+    'meta/**',
+    'mozilla/**',
+    'outbound/**',
+    'runtests.py',
+    'tests/**',
+    'wptrunner.ini'
+]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mozilla/meta/MANIFEST.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mozilla/meta/MANIFEST.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mozilla/meta/MANIFEST.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mozilla/meta/MANIFEST.json	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,16 @@
+{
+  "items": {
+    "helper": [],
+    "manual": [],
+    "reftest": [],
+    "stub": [],
+    "testharness": [],
+    "wdspec": []
+  },
+  "local_changes": {
+    "deleted": [],
+    "items": {}
+  },
+  "rev": null,
+  "url_base": "/_mozilla/"
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mozilla/README thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mozilla/README
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mozilla/README	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mozilla/README	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,4 @@
+This directory is intended for web-platform-tests that currently
+cannot be upstreamed for some reason (e.g. because they depend on
+gecko-specific APIs). When run they are mounted on the server under
+/_mozilla/.
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mozilla/tests/placeholder thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mozilla/tests/placeholder
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/mozilla/tests/placeholder	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/mozilla/tests/placeholder	2014-11-26 21:45:52.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/.
+
+This is a placeholder file to ensure that this directory remains
+in source control and test packages even when it is otherwise empty.
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/outbound/meta/MANIFEST.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/outbound/meta/MANIFEST.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/outbound/meta/MANIFEST.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/outbound/meta/MANIFEST.json	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,16 @@
+{
+  "items": {
+    "helper": [],
+    "manual": [],
+    "reftest": [],
+    "stub": [],
+    "testharness": [],
+    "wdspec": []
+  },
+  "local_changes": {
+    "deleted": [],
+    "items": {}
+  },
+  "rev": null,
+  "url_base": "/_outbound/"
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/outbound/README thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/outbound/README
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/outbound/README	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/outbound/README	2014-11-26 21:45:52.000000000 +0000
@@ -0,0 +1,7 @@
+This directory is intended for web-platform-tests that should be
+upstreamed. The intent is to make this an automatic process, however
+that does not work yet.
+
+ When run they are mounted on the server under /_outbound/. Note that
+this will change when the tests are upstreamed, so using absolute URLs
+in tests should be avoided where possible.
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/outbound/tests/placeholder thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/outbound/tests/placeholder
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/outbound/tests/placeholder	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/outbound/tests/placeholder	2014-11-26 21:45:52.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/.
+
+This is a placeholder file to ensure that this directory remains
+in source control and test packages even when it is otherwise empty.
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/runtests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/runtests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/runtests.py	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/runtests.py	2014-11-26 21:45:52.000000000 +0000
@@ -4,8 +4,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/.
 
+import os
 import sys
 
+here = os.path.split(os.path.abspath(__file__))[0]
+sys.path.insert(0, os.path.join(here, "harness"))
+
 from wptrunner import wptrunner
 
 if __name__ == "__main__":
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/docs/running_tests.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/docs/running_tests.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/docs/running_tests.md	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/docs/running_tests.md	2014-11-26 21:45:56.000000000 +0000
@@ -22,7 +22,7 @@
 ## By Automating the Browser
 
 For automated test running designed to be robust enough to use in a CI
-environment, the [wptrunner](http://github.com/wptrunner) test runner
+environment, the [wptrunner](http://github.com/w3c/wptrunner) test runner
 can be used. This is a test runner written in Python and designed to
 control the browser from the outside using some remote control
 protocol such as WebDriver. This allows it to handle cases such as the
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/common.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/common.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/common.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/common.js	2014-11-26 21:45:56.000000000 +0000
@@ -5,7 +5,6 @@
 
 // Everything is done in functions in this test harness, so we have to declare
 // all the variables before use to make sure they can be reused.
-var selection;
 var testDiv, paras, detachedDiv, detachedPara1, detachedPara2,
 	foreignDoc, foreignPara1, foreignPara2, xmlDoc, xmlElement,
 	detachedXmlElement, detachedTextNode, foreignTextNode,
@@ -17,7 +16,6 @@
 var testRangesShort, testRanges, testPoints, testNodesShort, testNodes;
 
 function setupRangeTests() {
-	selection = getSelection();
 	testDiv = document.querySelector("#test");
 	if (testDiv) {
 		testDiv.parentNode.removeChild(testDiv);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/errors/DOMException-constants.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/errors/DOMException-constants.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/errors/DOMException-constants.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/errors/DOMException-constants.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>DOMException constants</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#domexception">
-<link rel=help href="http://dev.w3.org/2006/webapi/WebIDL/#es-exception-constants">
+<link rel=help href="https://dom.spec.whatwg.org/#domexception">
+<link rel=help href="https://heycam.github.io/webidl/#es-exception-constants">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-dispatch-omitted-capture.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-dispatch-omitted-capture.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-dispatch-omitted-capture.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-dispatch-omitted-capture.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>EventTarget.addEventListener: capture argument omitted</title>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener">
+<link rel="help" href="https://dom.spec.whatwg.org/#concept-event-dispatch">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<table id="table" border="1" style="display: none">
+    <tbody id="table-body">
+    <tr id="table-row">
+        <td id="table-cell">Shady Grove</td>
+        <td>Aeolian</td>
+    </tr>
+    <tr id="parent">
+        <td id="target">Over the river, Charlie</td>
+        <td>Dorian</td>
+    </tr>
+    </tbody>
+</table>
+<script>
+test(function() {
+    var event_type = "foo";
+    var target = document.getElementById("target");
+    var targets = [
+        target,
+        document.getElementById("parent"),
+        document.getElementById("table-body"),
+        document.getElementById("table"),
+        document.body,
+        document.documentElement,
+        document,
+        window
+    ];
+    var phases = [
+        Event.AT_TARGET,
+        Event.BUBBLING_PHASE,
+        Event.BUBBLING_PHASE,
+        Event.BUBBLING_PHASE,
+        Event.BUBBLING_PHASE,
+        Event.BUBBLING_PHASE,
+        Event.BUBBLING_PHASE,
+        Event.BUBBLING_PHASE
+    ];
+
+    var actual_targets = [], actual_phases = [];
+    var test_event = function(evt) {
+        actual_targets.push(evt.currentTarget);
+        actual_phases.push(evt.eventPhase);
+    }
+
+    for (var i = 0; i < targets.length; i++) {
+        targets[i].addEventListener(event_type, test_event);
+    }
+
+    var evt = document.createEvent("Event");
+    evt.initEvent(event_type, true, true);
+
+    target.dispatchEvent(evt);
+
+    for (var i = 0; i < targets.length; i++) {
+        targets[i].removeEventListener(event_type, test_event);
+    }
+
+    target.dispatchEvent(evt);
+
+    assert_array_equals(actual_targets, targets, "targets");
+    assert_array_equals(actual_phases, phases, "phases");
+}, "EventTarget.addEventListener with the capture argument omitted");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-initEvent.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-initEvent.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-initEvent.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-initEvent.html	2014-11-26 21:45:56.000000000 +0000
@@ -102,4 +102,20 @@
 
   this.done()
 }, "Calling initEvent must unset the stop propagation flag.")
+
+async_test(function() {
+  var e = document.createEvent("Event")
+  e.initEvent("type", false, false)
+
+  var target = document.createElement("div")
+  target.addEventListener("type", this.step_func(function() {
+    e.initEvent("type2", true, true);
+    assert_equals(e.type, "type", "initEvent type setter should short-circuit");
+    assert_false(e.bubbles, "initEvent bubbles setter should short-circuit");
+    assert_false(e.cancelable, "initEvent cancelable setter should short-circuit");
+  }), false)
+  assert_equals(target.dispatchEvent(e), true, "dispatchEvent must return true")
+
+  this.done()
+}, "Calling initEvent during propagation.")
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-addEventListener.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-addEventListener.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-addEventListener.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-addEventListener.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>EventTarget.addEventListener</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,9 +3,10 @@
 <title>EventTarget.dispatchEvent</title>
 <link rel="author" title="Olli Pettay" href="mailto:Olli.Pettay@gmail.com">
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://dom.spec.whatwg.org/#dom-eventtarget-dispatchevent">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-eventtarget-dispatchevent">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/dom/nodes/Document-createEvent.js"></script>
 <div id="log"></div>
 <script>
 setup({
@@ -13,10 +14,16 @@
 })
 
 test(function() {
-  var e = document.createEvent("Event")
-  assert_equals(e.type, "", "Event type should be empty string before initialization")
-  assert_throws("InvalidStateError", function() { document.dispatchEvent(e) })
-}, "If the event's initialized flag is not set, an InvalidStateError must be thrown.")
+  assert_throws(new TypeError(), function() { document.dispatchEvent(null) })
+}, "Calling dispatchEvent(null).")
+
+aliases.forEach(function(alias) {
+  test(function() {
+    var e = document.createEvent(alias[0])
+    assert_equals(e.type, "", "Event type should be empty string before initialization")
+    assert_throws("InvalidStateError", function() { document.dispatchEvent(e) })
+  }, "If the event's initialized flag is not set, an InvalidStateError must be thrown (" + alias [0] + ").")
+})
 
 var dispatch_dispatch = async_test("If the event's dispatch flag is set, an InvalidStateError must be thrown.")
 dispatch_dispatch.step(function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent-returnvalue.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent-returnvalue.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent-returnvalue.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-dispatchEvent-returnvalue.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>EventTarget.dispatchEvent: return value</title>
+<link rel="help" href="https://dom.spec.whatwg.org/#concept-event-dispatch">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-event-preventdefault">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-event-defaultprevented">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<table id="table" border="1" style="display: none">
+    <tbody id="table-body">
+    <tr id="table-row">
+        <td id="table-cell">Shady Grove</td>
+        <td>Aeolian</td>
+    </tr>
+    <tr id="parent">
+        <td id="target">Over the river, Charlie</td>
+        <td>Dorian</td>
+    </tr>
+    </tbody>
+</table>
+<script>
+test(function() {
+    var event_type = "foo";
+    var target = document.getElementById("target");
+    var parent = document.getElementById("parent");
+    var default_prevented;
+
+    parent.addEventListener(event_type, function(e) {}, true);
+    target.addEventListener(event_type, function(e) {
+        evt.preventDefault();
+        default_prevented = evt.defaultPrevented;
+    }, true);
+    target.addEventListener(event_type, function(e) {}, true);
+
+    var evt = document.createEvent("Event");
+    evt.initEvent(event_type, true, true);
+
+    assert_true(parent.dispatchEvent(evt));
+    assert_false(target.dispatchEvent(evt));
+    assert_true(default_prevented);
+}, "Return value of EventTarget.dispatchEvent.");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-removeEventListener.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-removeEventListener.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/EventTarget-removeEventListener.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/EventTarget-removeEventListener.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>EventTarget.removeEventListener</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-type-empty.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-type-empty.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-type-empty.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-type-empty.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Event.type set to the empty string</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-event-type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+function do_test(t, e) {
+  assert_equals(e.type, "", "type");
+  assert_equals(e.bubbles, false, "bubbles");
+  assert_equals(e.cancelable, false, "cancelable");
+
+  var target = document.createElement("div");
+  var handled = false;
+  target.addEventListener("", t.step_func(function(e) {
+    handled = true;
+  }));
+  assert_true(target.dispatchEvent(e));
+  assert_true(handled);
+}
+
+async_test(function() {
+  var e = document.createEvent("Event");
+  e.initEvent("", false, false);
+  do_test(this, e);
+  this.done();
+}, "initEvent");
+
+async_test(function() {
+  var e = new Event("");
+  do_test(this, e);
+  this.done();
+}, "Constructor");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-type.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-type.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/events/Event-type.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/events/Event-type.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Event.type</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://dom.spec.whatwg.org/#dom-event-type">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-event-type">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/interfaces.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/interfaces.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/interfaces.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/interfaces.html	2014-11-26 21:45:56.000000000 +0000
@@ -360,7 +360,8 @@
   readonly attribute DOMString localName;
   readonly attribute DOMString name;
            attribute DOMString value;
-           attribute DOMString textContent; // alias of .value
+           attribute DOMString nodeValue; // legacy alias of .value
+           attribute DOMString textContent; // legacy alias of .value
 
   readonly attribute Element? ownerElement;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/lists/DOMTokenList-stringifier.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/lists/DOMTokenList-stringifier.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/lists/DOMTokenList-stringifier.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/lists/DOMTokenList-stringifier.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>DOMTokenList stringifier</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-domtokenlist-stringifier">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-domtokenlist-stringifier">
 <link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/attributes.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/attributes.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/attributes.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/attributes.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Attributes tests</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#attr">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-setattribute">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-setattributens">
+<link rel=help href="https://dom.spec.whatwg.org/#attr">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-setattribute">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-setattributens">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="attributes.js"></script>
@@ -25,7 +25,6 @@
   assert_throws(new TypeError(), function() { attr.appendChild(null) })
   assert_equals(attr.value, "pass")
   assert_false("childNodes" in attr, "Should not have childNodes")
-  assert_false("textContent" in attr, "Should not have textContent")
 }, "AttrExodus")
 
 // setAttribute exhaustive tests
@@ -353,4 +352,37 @@
   el.removeAttributeNS("", "foo")
   el.removeAttributeNS("xx", "foo")
 }, "First set attribute is returned with mapped attribute set later")
+
+test(function() {
+  var el = document.createElementNS("http://www.example.com", "foo")
+  el.setAttribute("A", "test")
+  assert_equals(el.hasAttribute("A"), true, "hasAttribute()")
+  assert_equals(el.hasAttributeNS("", "A"), true, "el.hasAttributeNS(\"\")")
+  assert_equals(el.hasAttributeNS(null, "A"), true, "el.hasAttributeNS(null)")
+  assert_equals(el.hasAttributeNS(undefined, "A"), true, "el.hasAttributeNS(undefined)")
+  assert_equals(el.hasAttributeNS("foo", "A"), false, "el.hasAttributeNS(\"foo\")")
+
+  assert_equals(el.getAttribute("A"), "test", "getAttribute()")
+  assert_equals(el.getAttributeNS("", "A"), "test", "el.getAttributeNS(\"\")")
+  assert_equals(el.getAttributeNS(null, "A"), "test", "el.getAttributeNS(null)")
+  assert_equals(el.getAttributeNS(undefined, "A"), "test", "el.getAttributeNS(undefined)")
+  assert_equals(el.getAttributeNS("foo", "A"), null, "el.getAttributeNS(\"foo\")")
+}, "Non-HTML element with upper-case attribute")
+
+test(function() {
+  var el = document.createElement("div")
+  el.setAttribute("pre:fix", "value 1")
+  el.setAttribute("fix", "value 2")
+
+  var prefixed = el.attributes[0]
+  assert_equals(prefixed.localName, "pre:fix", "prefixed local name")
+  assert_equals(prefixed.namespaceURI, null, "prefixed namespace")
+
+  var unprefixed = el.attributes[1]
+  assert_equals(unprefixed.localName, "fix", "unprefixed local name")
+  assert_equals(unprefixed.namespaceURI, null, "unprefixed namespace")
+
+  el.removeAttributeNS(null, "pre:fix")
+  assert_equals(el.attributes[0], unprefixed)
+}, "Attribute with prefix in local name")
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/attributes.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/attributes.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/attributes.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/attributes.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,14 +1,17 @@
 function attr_is(attr, v, ln, ns, p, n) {
   assert_equals(attr.value, v)
+  assert_equals(attr.nodeValue, v)
+  assert_equals(attr.textContent, v)
   assert_equals(attr.localName, ln)
   assert_equals(attr.namespaceURI, ns)
   assert_equals(attr.prefix, p)
   assert_equals(attr.name, n)
+  assert_equals(attr.specified, true)
 }
 
 function attributes_are(el, l) {
   for (var i = 0, il = l.length; i < il; i++) {
     attr_is(el.attributes[i], l[i][1], l[i][0], (l[i].length < 3) ? null : l[i][2], null, l[i][0])
-//    assert_equals(el.attributes[i].ownerElement, el)
+    assert_equals(el.attributes[i].ownerElement, el)
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/case.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/case.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/case.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/case.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Tests for case-sensitivity in APIs</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createelement">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createelementns">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementsbytagname">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementsbytagnamens">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-setattribute">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-setattributens">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-hasattribute">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-hasattributens">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-getelementsbytagname">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-getelementsbytagnamens">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createelement">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createelementns">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-getelementsbytagname">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-getelementsbytagnamens">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-setattribute">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-setattributens">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-hasattribute">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-hasattributens">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-getelementsbytagname">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-getelementsbytagnamens">
 <script>var is_html = true;</script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-appendData.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-appendData.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-appendData.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-appendData.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>CharacterData.appendData</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-appenddata">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-appenddata">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-deleteData.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-deleteData.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-deleteData.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-deleteData.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>CharacterData.deleteData</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-deletedata">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-deletedata">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-insertData.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-insertData.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-insertData.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-insertData.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>CharacterData.insertData</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-insertdata">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-insertdata">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-remove.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-remove.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-remove.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-remove.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>CharacterData.remove</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-childnode-remove">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-childnode-remove">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="ChildNode-remove.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-replaceData.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-replaceData.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-replaceData.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/CharacterData-replaceData.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>CharacterData.replaceData</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-replacedata">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-replacedata">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Comment-constructor.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Comment-constructor.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Comment-constructor.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Comment-constructor.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,84 +1,11 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Comment constructor</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-comment">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-comment">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="Comment-Text-constructor.js"></script>
 <div id="log"></div>
 <script>
-test(function() {
-  var comment = new Comment();
-  assert_equals(Object.getPrototypeOf(comment),
-                Comment.prototype, "Prototype chain: Comment");
-  assert_equals(Object.getPrototypeOf(Object.getPrototypeOf(comment)),
-                CharacterData.prototype, "Prototype chain: CharacterData");
-  assert_equals(Object.getPrototypeOf(Object.getPrototypeOf(Object.getPrototypeOf(comment))),
-                Node.prototype, "Prototype chain: Node");
-}, "new Comment(): prototype chain");
-
-test(function() {
-  var comment = new Comment();
-  assert_true(comment instanceof Node, "Should be a Node");
-  assert_true(comment instanceof CharacterData, "Should be a CharacterData");
-  assert_true(comment instanceof Comment, "Should be a Comment");
-}, "new Comment(): instanceof");
-
-test(function() {
-  var comment = new Comment();
-  assert_equals(comment.data, "");
-  assert_equals(comment.nodeValue, "");
-  assert_equals(comment.ownerDocument, document);
-}, "new Comment(): no arguments");
-
-var arguments = [
-  [undefined, ""],
-  [null, "null"],
-  [42, "42"],
-  ["", ""],
-  ["-", "-"],
-  ["--", "--"],
-  ["-->", "-->"],
-  ["<!--", "<!--"],
-  ["\u0000", "\u0000"],
-  ["\u0000test", "\u0000test"],
-  ["&amp;", "&amp;"],
-];
-
-arguments.forEach(function(a) {
-  var argument = a[0], expected = a[1];
-  test(function() {
-    var comment = new Comment(argument);
-    assert_equals(comment.data, expected);
-    assert_equals(comment.nodeValue, expected);
-    assert_equals(comment.ownerDocument, document);
-  }, "new Comment(): " + format_value(argument));
-});
-
-test(function() {
-  var called = [];
-  var comment = new Comment({
-    toString: function() {
-      called.push("first");
-      return "text";
-    }
-  }, {
-    toString: function() {
-      called.push("second");
-      assert_unreached("Should not look at the second argument.");
-    }
-  });
-  assert_equals(comment.data, "text");
-  assert_equals(comment.nodeValue, "text");
-  assert_equals(comment.ownerDocument, document);
-  assert_array_equals(called, ["first"]);
-}, "new Comment(): two arguments")
-
-async_test("new Comment() should get the correct ownerDocument across globals").step(function() {
-  var iframe = document.createElement("iframe");
-  iframe.onload = this.step_func_done(function() {
-    var comment = new iframe.contentWindow.Comment();
-    assert_equals(comment.ownerDocument, iframe.contentDocument);
-  });
-  document.body.appendChild(iframe);
-});
+test_constructor("Comment");
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Comment-Text-constructor.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Comment-Text-constructor.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Comment-Text-constructor.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Comment-Text-constructor.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,77 @@
+function test_constructor(ctor) {
+  test(function() {
+    var object = new window[ctor]();
+    assert_equals(Object.getPrototypeOf(object),
+                  window[ctor].prototype, "Prototype chain: " + ctor);
+    assert_equals(Object.getPrototypeOf(Object.getPrototypeOf(object)),
+                  CharacterData.prototype, "Prototype chain: CharacterData");
+    assert_equals(Object.getPrototypeOf(Object.getPrototypeOf(Object.getPrototypeOf(object))),
+                  Node.prototype, "Prototype chain: Node");
+  }, "new " + ctor + "(): prototype chain");
+
+  test(function() {
+    var object = new window[ctor]();
+    assert_true(object instanceof Node, "Should be a Node");
+    assert_true(object instanceof CharacterData, "Should be a CharacterData");
+    assert_true(object instanceof window[ctor], "Should be a " + ctor);
+  }, "new " + ctor + "(): instanceof");
+
+  test(function() {
+    var object = new window[ctor]();
+    assert_equals(object.data, "");
+    assert_equals(object.nodeValue, "");
+    assert_equals(object.ownerDocument, document);
+  }, "new " + ctor + "(): no arguments");
+
+  var arguments = [
+    [undefined, ""],
+    [null, "null"],
+    [42, "42"],
+    ["", ""],
+    ["-", "-"],
+    ["--", "--"],
+    ["-->", "-->"],
+    ["<!--", "<!--"],
+    ["\u0000", "\u0000"],
+    ["\u0000test", "\u0000test"],
+    ["&amp;", "&amp;"],
+  ];
+
+  arguments.forEach(function(a) {
+    var argument = a[0], expected = a[1];
+    test(function() {
+      var object = new window[ctor](argument);
+      assert_equals(object.data, expected);
+      assert_equals(object.nodeValue, expected);
+      assert_equals(object.ownerDocument, document);
+    }, "new " + ctor + "(): " + format_value(argument));
+  });
+
+  test(function() {
+    var called = [];
+    var object = new window[ctor]({
+      toString: function() {
+        called.push("first");
+        return "text";
+      }
+    }, {
+      toString: function() {
+        called.push("second");
+        assert_unreached("Should not look at the second argument.");
+      }
+    });
+    assert_equals(object.data, "text");
+    assert_equals(object.nodeValue, "text");
+    assert_equals(object.ownerDocument, document);
+    assert_array_equals(called, ["first"]);
+  }, "new " + ctor + "(): two arguments")
+
+  async_test("new " + ctor + "() should get the correct ownerDocument across globals").step(function() {
+    var iframe = document.createElement("iframe");
+    iframe.onload = this.step_func_done(function() {
+      var object = new iframe.contentWindow[ctor]();
+      assert_equals(object.ownerDocument, iframe.contentDocument);
+    });
+    document.body.appendChild(iframe);
+  });
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-adoptNode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-adoptNode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-adoptNode.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-adoptNode.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Document.adoptNode</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document-adoptnode">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-adoptnode">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html	2014-11-26 21:45:56.000000000 +0000
@@ -16,7 +16,7 @@
     "utf-8",
     "utf8",
     // As we use <meta>, utf-16 will map to utf-8 per
-    // https://html.spec.whatwg.org/multipage/syntax.html#documentEncoding
+    // https://html.spec.whatwg.org/multipage/#documentEncoding
     "utf-16",
     "utf-16le",
     "utf-16be",
@@ -202,7 +202,7 @@
     "windows-1252",
     "x-cp1252",
     // As we use <meta>, x-user-defined will map to windows-1252 per
-    // https://html.spec.whatwg.org/multipage/syntax.html#documentEncoding
+    // https://html.spec.whatwg.org/multipage/#documentEncoding
     "x-user-defined"
   ],
   "windows-1253": [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-constructor.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-constructor.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-constructor.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-constructor.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,7 +3,7 @@
 <!-- Using windows-1252 to ensure that new Document() doesn't inherit utf-8
      from the parent document. -->
 <title>Document constructor</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createAttribute.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createAttribute.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createAttribute.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createAttribute.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,26 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Document.createAttribute</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=attributes.js></script>
+<script src=productions.js></script>
+<div id=log>
+<script>
+invalid_names.forEach(function(name) {
+  test(function() {
+    assert_throws("INVALID_CHARACTER_ERR", function() {
+      document.createAttribute(name, "test");
+    });
+  }, "createAttribute(" + format_value(name) + ")");
+});
+
+var tests = ["title", "TITLE", null, undefined];
+tests.forEach(function(name) {
+  test(function() {
+    var attribute = document.createAttribute(name);
+    attr_is(attribute, "", String(name), null, null, String(name));
+    assert_equals(attribute.ownerElement, null);
+  }, "createAttribute(" + format_value(name) + ")");
+});
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment-createTextNode.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment-createTextNode.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment-createTextNode.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment-createTextNode.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,22 @@
+function test_create(method, iface, nodeType, nodeName) {
+  ["\u000b", "a -- b", "a-", "-b", null, undefined].forEach(function(value) {
+    test(function() {
+      var c = document[method](value);
+      var expected = String(value);
+      assert_true(c instanceof iface);
+      assert_true(c instanceof CharacterData);
+      assert_true(c instanceof Node);
+      assert_equals(c.ownerDocument, document);
+      assert_equals(c.data, expected, "data");
+      assert_equals(c.nodeValue, expected, "nodeValue");
+      assert_equals(c.textContent, expected, "textContent");
+      assert_equals(c.length, expected.length);
+      assert_equals(c.nodeType, nodeType);
+      assert_equals(c.nodeName, nodeName);
+      assert_equals(c.hasChildNodes(), false);
+      assert_equals(c.childNodes.length, 0);
+      assert_equals(c.firstChild, null);
+      assert_equals(c.lastChild, null);
+    }, method + "(" + format_value(value) + ")");
+  });
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createComment.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,40 +1,21 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.createComment</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createcomment">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-ownerdocument">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-nodevalue">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-textcontent">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-length">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-nodetype">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-haschildnodes">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-childnodes">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-firstchild">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-lastchild">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createcomment">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-ownerdocument">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-nodevalue">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-textcontent">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-length">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-nodetype">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-haschildnodes">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-childnodes">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-firstchild">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-lastchild">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="Document-createComment-createTextNode.js"></script>
 <div id="log"></div>
 <script>
-test(function() {
-  ["\u000b", "a -- b", "a-", "-b", null, undefined].forEach(function(value) {
-    test(function() {
-      var c = document.createComment(value);
-      var expected = String(value);
-      assert_true(c instanceof Comment);
-      assert_true(c instanceof Node);
-      assert_equals(c.ownerDocument, document);
-      assert_equals(c.data, expected, "data");
-      assert_equals(c.nodeValue, expected, "nodeValue");
-      assert_equals(c.textContent, expected, "textContent");
-      assert_equals(c.length, expected.length);
-      assert_equals(c.nodeType, 8);
-      assert_equals(c.nodeName, "#comment");
-      assert_equals(c.hasChildNodes(), false);
-      assert_equals(c.childNodes.length, 0);
-      assert_equals(c.firstChild, null);
-      assert_equals(c.lastChild, null);
-    }, "createComment(" + format_value(value) + ")");
-  });
-});
+test_create("createComment", Comment, 8, "#comment");
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createElement.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createElement.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createElement.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createElement.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.createElement</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createelement">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-localname">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-tagname">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-prefix">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-namespaceuri">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createelement">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-localname">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-tagname">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-prefix">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-element-namespaceuri">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,54 +1,62 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.createElementNS</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document-createelementns">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createelementns">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="Document-createElementNS.js"></script>
 <div id="log"></div>
 <script>
 test(function() {
-  var invalidNames = [
-    "",
-    "1foo",
-    "\u0300foo",
-    "}foo",
-    "f}oo",
-    "foo}",
-    "\ufffffoo",
-    "f\uffffoo",
-    "foo\uffff",
-    "<foo",
-    "foo>",
-    "<foo>",
-    "f<oo"
-  ],
-  invalidNSQNameCombinations = [
-    [undefined, ":foo"],
-    [undefined, "foo:"],
-    [undefined, "foo:foo"],
-    [null, ":foo"],
-    [null, "foo:"],
-    [null, "foo:foo"],
-    ["", ":foo"],
-    ["", "foo:"],
-    ["", "foo:foo"],
-    ["http://oops/", "xml:foo"],
-    ["http://oops/", "xmlns"],
-    ["http://oops/", "xmlns:foo"],
-    ["http://www.w3.org/2000/xmlns/", "xml:foo"],
-    ["http://www.w3.org/2000/xmlns/", "foo:xmlns"]
-  ];
+  var tests = createElementNS_tests.concat([
+    /* Arrays with three elements:
+     *   the namespace argument
+     *   the qualifiedName argument
+     *   the expected exception, or null if none
+     */
+    ["", "", "INVALID_CHARACTER_ERR"],
+    [null, null, null],
+    [null, "", "INVALID_CHARACTER_ERR"],
+    [undefined, null, null],
+    [undefined, undefined, null],
+    [undefined, "", "INVALID_CHARACTER_ERR"],
+    ["http://example.com/", null, null],
+    ["http://example.com/", "", "INVALID_CHARACTER_ERR"],
+    ["/", null, null],
+    ["/", "", "INVALID_CHARACTER_ERR"],
+    ["http://www.w3.org/XML/1998/namespace", null, null],
+    ["http://www.w3.org/XML/1998/namespace", "", "INVALID_CHARACTER_ERR"],
+    ["http://www.w3.org/2000/xmlns/", null, "NAMESPACE_ERR"],
+    ["http://www.w3.org/2000/xmlns/", "", "INVALID_CHARACTER_ERR"],
+    ["foo:", null, null],
+    ["foo:", "", "INVALID_CHARACTER_ERR"],
+  ])
 
-  invalidNames.forEach(function(name) {
+  tests.forEach(function(t, i) {
     test(function() {
-      assert_throws("INVALID_CHARACTER_ERR", function() { document.createElementNS("", name) });
-    }, "Invalid Name: " + name)
-  })
-
-  invalidNSQNameCombinations.forEach(function(a) {
-    test(function() {
-      assert_throws("NAMESPACE_ERR", function() { document.createElementNS(a[0], a[1]) });
-    }, "Invalid namespace " + a[0] + " and QName " + a[1])
+      var namespace = t[0], qualifiedName = t[1], expected = t[2]
+      if (expected != null) {
+        assert_throws(expected, function() { document.createElementNS(namespace, qualifiedName) })
+      } else {
+        var element = document.createElementNS(namespace, qualifiedName)
+        assert_not_equals(element, null)
+        assert_equals(element.nodeType, Node.ELEMENT_NODE)
+        assert_equals(element.nodeType, element.ELEMENT_NODE)
+        assert_equals(element.nodeValue, null)
+        assert_equals(element.ownerDocument, document)
+        var qualified = String(qualifiedName), names = []
+        if (qualified.indexOf(":") >= 0) {
+          names = qualified.split(":", 2)
+        } else {
+          names = [null, qualified]
+        }
+        assert_equals(element.prefix, names[0])
+        assert_equals(element.localName, names[1])
+        assert_equals(element.tagName, qualified)
+        assert_equals(element.nodeName, qualified)
+        assert_equals(element.namespaceURI, namespace === undefined ? null : namespace)
+      }
+    }, "createElementNS test " + i + ": " + t.map(function(el) { return format_value(el) }))
   })
 })
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createElementNS.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,162 @@
+var createElementNS_tests = [
+  /* Arrays with three elements:
+   *   the namespace argument
+   *   the qualifiedName argument
+   *   the expected exception, or null if none
+   */
+  [null, undefined, null],
+  [null, "foo", null],
+  [null, "1foo", "INVALID_CHARACTER_ERR"],
+  [null, "f1oo", null],
+  [null, "foo1", null],
+  [null, "1foo", "INVALID_CHARACTER_ERR"],
+  [null, "\u0300foo", "INVALID_CHARACTER_ERR"],
+  [null, "}foo", "INVALID_CHARACTER_ERR"],
+  [null, "f}oo", "INVALID_CHARACTER_ERR"],
+  [null, "foo}", "INVALID_CHARACTER_ERR"],
+  [null, "\uFFFFfoo", "INVALID_CHARACTER_ERR"],
+  [null, "f\uFFFFoo", "INVALID_CHARACTER_ERR"],
+  [null, "foo\uFFFF", "INVALID_CHARACTER_ERR"],
+  [null, "<foo", "INVALID_CHARACTER_ERR"],
+  [null, "foo>", "INVALID_CHARACTER_ERR"],
+  [null, "<foo>", "INVALID_CHARACTER_ERR"],
+  [null, "f<oo", "INVALID_CHARACTER_ERR"],
+  [null, "^^", "INVALID_CHARACTER_ERR"],
+  [null, ":foo", "NAMESPACE_ERR"],
+  [null, "f:oo", "NAMESPACE_ERR"],
+  [null, "foo:", "NAMESPACE_ERR"],
+  [null, ":", "NAMESPACE_ERR"],
+  [null, "xml", null],
+  [null, "xmlns", "NAMESPACE_ERR"],
+  [null, "xmlfoo", null],
+  [null, "xml:foo", "NAMESPACE_ERR"],
+  [null, "xmlns:foo", "NAMESPACE_ERR"],
+  [null, "xmlfoo:bar", "NAMESPACE_ERR"],
+  [null, "null:xml", "NAMESPACE_ERR"],
+  ["", ":foo", "NAMESPACE_ERR"],
+  ["", "f:oo", "NAMESPACE_ERR"],
+  ["", "foo:", "NAMESPACE_ERR"],
+  [undefined, undefined, null],
+  [undefined, "foo", null],
+  [undefined, "1foo", "INVALID_CHARACTER_ERR"],
+  [undefined, "f1oo", null],
+  [undefined, "foo1", null],
+  [undefined, ":foo", "NAMESPACE_ERR"],
+  [undefined, "f:oo", "NAMESPACE_ERR"],
+  [undefined, "foo:", "NAMESPACE_ERR"],
+  [undefined, "xml", null],
+  [undefined, "xmlns", "NAMESPACE_ERR"],
+  [undefined, "xmlfoo", null],
+  [undefined, "xml:foo", "NAMESPACE_ERR"],
+  [undefined, "xmlns:foo", "NAMESPACE_ERR"],
+  [undefined, "xmlfoo:bar", "NAMESPACE_ERR"],
+  ["http://example.com/", "foo", null],
+  ["http://example.com/", "1foo", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "f1oo", null],
+  ["http://example.com/", "foo1", null],
+  ["http://example.com/", ":foo", "NAMESPACE_ERR"],
+  ["http://example.com/", "f:oo", null],
+  ["http://example.com/", "foo:", "NAMESPACE_ERR"],
+  ["http://example.com/", "_:_", null],
+  ["http://example.com/", "_:h0", null],
+  ["http://example.com/", "_:test", null],
+  ["http://example.com/", "l_:_", null],
+  ["http://example.com/", "ns:_0", null],
+  ["http://example.com/", "ns:a0", null],
+  ["http://example.com/", "ns0:test", null],
+  ["http://example.com/", "a.b:c", null],
+  ["http://example.com/", "a-b:c", null],
+  ["http://example.com/", "a-b:c", null],
+  ["http://example.com/", "xml", null],
+  ["http://example.com/", "xmlns", "NAMESPACE_ERR"],
+  ["http://example.com/", "XMLNS", null],
+  ["http://example.com/", "xmlfoo", null],
+  ["http://example.com/", "xml:foo", "NAMESPACE_ERR"],
+  ["http://example.com/", "XML:foo", null],
+  ["http://example.com/", "xmlns:foo", "NAMESPACE_ERR"],
+  ["http://example.com/", "XMLNS:foo", null],
+  ["http://example.com/", "xmlfoo:bar", null],
+  ["http://example.com/", "prefix::local", "NAMESPACE_ERR"],
+  ["http://example.com/", "namespaceURI:{", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:}", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:~", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:'", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:!", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:@", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:#", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:$", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:%", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:^", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:&", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:*", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:(", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:)", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:+", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:=", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:[", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:]", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:\\", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:/", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:;", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:`", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:<", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:>", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:,", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:a ", "INVALID_CHARACTER_ERR"],
+  ["http://example.com/", "namespaceURI:\"", "INVALID_CHARACTER_ERR"],
+  ["/", "foo", null],
+  ["/", "1foo", "INVALID_CHARACTER_ERR"],
+  ["/", "f1oo", null],
+  ["/", "foo1", null],
+  ["/", ":foo", "NAMESPACE_ERR"],
+  ["/", "f:oo", null],
+  ["/", "foo:", "NAMESPACE_ERR"],
+  ["/", "xml", null],
+  ["/", "xmlns", "NAMESPACE_ERR"],
+  ["/", "xmlfoo", null],
+  ["/", "xml:foo", "NAMESPACE_ERR"],
+  ["/", "xmlns:foo", "NAMESPACE_ERR"],
+  ["/", "xmlfoo:bar", null],
+  ["http://www.w3.org/XML/1998/namespace", "foo", null],
+  ["http://www.w3.org/XML/1998/namespace", "1foo", "INVALID_CHARACTER_ERR"],
+  ["http://www.w3.org/XML/1998/namespace", "f1oo", null],
+  ["http://www.w3.org/XML/1998/namespace", "foo1", null],
+  ["http://www.w3.org/XML/1998/namespace", ":foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/XML/1998/namespace", "f:oo", null],
+  ["http://www.w3.org/XML/1998/namespace", "foo:", "NAMESPACE_ERR"],
+  ["http://www.w3.org/XML/1998/namespace", "xml", null],
+  ["http://www.w3.org/XML/1998/namespace", "xmlns", "NAMESPACE_ERR"],
+  ["http://www.w3.org/XML/1998/namespace", "xmlfoo", null],
+  ["http://www.w3.org/XML/1998/namespace", "xml:foo", null],
+  ["http://www.w3.org/XML/1998/namespace", "xmlns:foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/XML/1998/namespace", "xmlfoo:bar", null],
+  ["http://www.w3.org/XML/1998/namespaces", "xml:foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/xml/1998/namespace", "xml:foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "1foo", "INVALID_CHARACTER_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "f1oo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "foo1", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", ":foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "f:oo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "foo:", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "xml", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "xmlns", null],
+  ["http://www.w3.org/2000/xmlns/", "xmlfoo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "xml:foo", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "xmlns:foo", null],
+  ["http://www.w3.org/2000/xmlns/", "xmlfoo:bar", "NAMESPACE_ERR"],
+  ["http://www.w3.org/2000/xmlns/", "foo:xmlns", "NAMESPACE_ERR"],
+  ["foo:", "foo", null],
+  ["foo:", "1foo", "INVALID_CHARACTER_ERR"],
+  ["foo:", "f1oo", null],
+  ["foo:", "foo1", null],
+  ["foo:", ":foo", "NAMESPACE_ERR"],
+  ["foo:", "f:oo", null],
+  ["foo:", "foo:", "NAMESPACE_ERR"],
+  ["foo:", "xml", null],
+  ["foo:", "xmlns", "NAMESPACE_ERR"],
+  ["foo:", "xmlfoo", null],
+  ["foo:", "xml:foo", "NAMESPACE_ERR"],
+  ["foo:", "xmlns:foo", "NAMESPACE_ERR"],
+  ["foo:", "xmlfoo:bar", null],
+]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.createEvent</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document-createevent">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createevent">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="Document-createEvent.js"></script>
 <div id="log"></div>
 <script>
 function testAlias(arg, iface) {
@@ -32,16 +33,7 @@
                   "isTrusted should be initialized to false");
   }, "createEvent('" + arg + "') should be initialized correctly.");
 }
-[
-  ["CustomEvent", "CustomEvent"],
-  ["Event", "Event"],
-  ["Events", "Event"],
-  ["HTMLEvents", "Event"],
-  ["MouseEvent", "MouseEvent"],
-  ["MouseEvents", "MouseEvent"],
-  ["UIEvent", "UIEvent"],
-  ["UIEvents", "UIEvent"]
-].forEach(function(alias) {
+aliases.forEach(function(alias) {
   testAlias(alias[0], alias[1]);
   testAlias(alias[0].toLowerCase(), alias[1]);
   testAlias(alias[0].toUpperCase(), alias[1]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createEvent.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,14 @@
+var aliases = [
+  ["CustomEvent", "CustomEvent"],
+  ["Event", "Event"],
+  ["Events", "Event"],
+  ["HTMLEvents", "Event"],
+  ["KeyboardEvent", "KeyboardEvent"],
+  ["KeyEvents", "KeyboardEvent"],
+  ["MessageEvent", "MessageEvent"],
+  ["MouseEvent", "MouseEvent"],
+  ["MouseEvents", "MouseEvent"],
+  ["TouchEvent", "TouchEvent"],
+  ["UIEvent", "UIEvent"],
+  ["UIEvents", "UIEvent"]
+];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.createProcessingInstruction in HTML documents</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createprocessinginstruction">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-processinginstruction-target">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-ownerdocument">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createprocessinginstruction">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-processinginstruction-target">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-ownerdocument">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-1.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-1.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-1.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>&lt;?xml?> is not a ProcessingInstruction</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="log"/>
-<script>
-test(function() {
-  assert_equals(document.firstChild, document.documentElement)
-})
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-2.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-2.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-2.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction-literal-2.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<?xml-stylesheet href="support/style.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>ProcessingInstruction literals</title>
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-processinginstruction-target"/>
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id="log"/>
-<script>
-test(function() {
-  var pienc = document.firstChild;
-  assert_true(pienc instanceof ProcessingInstruction)
-  assert_equals(pienc.target, "xml-stylesheet")
-  assert_equals(pienc.data, 'href="support/style.css" type="text/css"')
-})
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createProcessingInstruction.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -1,10 +1,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Document.createProcessingInstruction in XML documents</title>
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createprocessinginstruction"/>
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-processinginstruction-target"/>
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-characterdata-data"/>
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-ownerdocument"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-document-createprocessinginstruction"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-processinginstruction-target"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-characterdata-data"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-node-ownerdocument"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createTextNode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createTextNode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-createTextNode.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-createTextNode.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Document.createTextNode</title>
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createtextnode">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-ownerdocument">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-data">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-nodevalue">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-textcontent">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-characterdata-length">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-nodetype">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-haschildnodes">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-childnodes">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-firstchild">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-lastchild">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="Document-createComment-createTextNode.js"></script>
+<div id="log"></div>
+<script>
+test_create("createTextNode", Text, 3, "#text");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-doctype.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-doctype.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-doctype.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-doctype.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Document.doctype</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document-doctype">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-doctype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementById.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementById.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementById.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementById.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Document.getElementById</title>
 <link rel="author" title="Tetsuharu OHZEKI" href="mailto:saneyuki.snyk@gmail.com">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementbyid">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-getelementbyid">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <body>
@@ -53,7 +53,7 @@
     gBody.removeChild(test);
     var removed = document.getElementById(TEST_ID);
     // `document.getElementById()` returns `null` if there is none.
-    // http://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
+    // https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
     assert_equals(removed, null, "should not get removed element.");
   }, "Document.getElementById with a script-inserted element");
 
@@ -288,6 +288,18 @@
 
   }, "where insertion order and tree order don't match");
 
+  test(function() {
+    var TEST_ID = "test14";
+    var a = document.createElement("a");
+    var b = document.createElement("b");
+    a.appendChild(b);
+    b.id = TEST_ID;
+    assert_equals(document.getElementById(TEST_ID), null);
+
+    gBody.appendChild(a);
+    assert_equals(document.getElementById(TEST_ID), b);
+  }, "Inserting an id by inserting its parent node");
+
   // TODO:
   // id attribute in a namespace
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagName.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.getElementsByTagName</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementsbytagname">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-getelementsbytagname">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagNameNS.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagNameNS.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagNameNS.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-getElementsByTagNameNS.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.getElementsByTagNameNS</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementsbytagnamens">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-getelementsbytagnamens">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
@@ -127,4 +127,10 @@
   get_elements(document);
   assert_array_equals(actual, expected);
 }, "getElementsByTagNameNS('*', '*')")
+
+test(function() {
+  assert_array_equals(document.getElementsByTagNameNS("**", "*"), []);
+  assert_array_equals(document.getElementsByTagNameNS(null, "0"), []);
+  assert_array_equals(document.getElementsByTagNameNS(null, "div"), []);
+}, "Empty lists")
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-implementation.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-implementation.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-implementation.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-implementation.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Document.implementation</title>
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-implementation">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var implementation = document.implementation;
+  assert_true(implementation instanceof DOMImplementation,
+              "implementation should implement DOMImplementation");
+  assert_equals(document.implementation, implementation);
+}, "Getting implementation off the same document");
+
+test(function() {
+  var doc = document.implementation.createHTMLDocument();
+  assert_not_equals(document.implementation, doc.implementation);
+}, "Getting implementation off different documents");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-importNode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-importNode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Document-importNode.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Document-importNode.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Document.importNode</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-importnode">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-importnode">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "STAFF" "staffNS.dtd">
+<title>DocumentType literals</title>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-documenttype-name">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-documenttype-publicid">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-documenttype-systemid">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var doctype = document.firstChild;
+  assert_true(doctype instanceof DocumentType)
+  assert_equals(doctype.name, "html")
+  assert_equals(doctype.publicId, 'STAFF')
+  assert_equals(doctype.systemId, 'staffNS.dtd')
+})
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-literal.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "STAFF" "staffNS.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>DocumentType literals</title>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-documenttype-name"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-documenttype-publicid"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-documenttype-systemid"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+test(function() {
+  var doctype = document.firstChild;
+  assert_true(doctype instanceof DocumentType)
+  assert_equals(doctype.name, "html")
+  assert_equals(doctype.publicId, 'STAFF')
+  assert_equals(doctype.systemId, 'staffNS.dtd')
+})
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-remove.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-remove.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-remove.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DocumentType-remove.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>DocumentType.remove</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-childnode-remove">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-childnode-remove">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="ChildNode-remove.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocument.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,17 +1,20 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>DOMImplementation.createDocument(namespace, qualifiedName, doctype)</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-domimplementation-createdocument">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-createelementns">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-nodetype">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-documentelement">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-doctype">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-domimplementation-createdocument">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-createelementns">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-nodetype">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-documentelement">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-doctype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="Document-createElementNS.js"></script>
 <div id="log"></div>
 <script>
 test(function() {
-  var tests = [
+  var tests = createElementNS_tests.map(function(t) {
+    return [t[0], t[1], null, t[2]]
+  }).concat([
     /* Arrays with four elements:
      *   the namespace argument
      *   the qualifiedName argument
@@ -20,112 +23,20 @@
      */
     [null, null, false, new TypeError()],
     [null, null, null, null],
-    [null, undefined, null, null],
     [null, "", null, null],
-    [null, "foo", null, null],
-    [null, "1foo", null, "INVALID_CHARACTER_ERR"],
-    [null, "f1oo", null, null],
-    [null, "foo1", null, null],
-    [null, ":foo", null, "NAMESPACE_ERR"],
-    [null, "f:oo", null, "NAMESPACE_ERR"],
-    [null, "foo:", null, "NAMESPACE_ERR"],
-    [null, "xml", null, null],
-    [null, "xmlns", null, "NAMESPACE_ERR"],
-    [null, "xmlfoo", null, null],
-    [null, "xml:foo", null, "NAMESPACE_ERR"],
-    [null, "xmlns:foo", null, "NAMESPACE_ERR"],
-    [null, "xmlfoo:bar", null, "NAMESPACE_ERR"],
     [undefined, null, undefined, null],
     [undefined, undefined, undefined, null],
     [undefined, "", undefined, null],
-    [undefined, "foo", undefined, null],
-    [undefined, "1foo", undefined, "INVALID_CHARACTER_ERR"],
-    [undefined, "f1oo", undefined, null],
-    [undefined, "foo1", undefined, null],
-    [undefined, ":foo", undefined, "NAMESPACE_ERR"],
-    [undefined, "f:oo", undefined, "NAMESPACE_ERR"],
-    [undefined, "foo:", undefined, "NAMESPACE_ERR"],
-    [undefined, "xml", undefined, null],
-    [undefined, "xmlns", undefined, "NAMESPACE_ERR"],
-    [undefined, "xmlfoo", undefined, null],
-    [undefined, "xml:foo", undefined, "NAMESPACE_ERR"],
-    [undefined, "xmlns:foo", undefined, "NAMESPACE_ERR"],
-    [undefined, "xmlfoo:bar", undefined, "NAMESPACE_ERR"],
     ["http://example.com/", null, null, null],
     ["http://example.com/", "", null, null],
-    ["http://example.com/", "foo", null, null],
-    ["http://example.com/", "1foo", null, "INVALID_CHARACTER_ERR"],
-    ["http://example.com/", "f1oo", null, null],
-    ["http://example.com/", "foo1", null, null],
-    ["http://example.com/", ":foo", null, "NAMESPACE_ERR"],
-    ["http://example.com/", "f:oo", null, null],
-    ["http://example.com/", "foo:", null, "NAMESPACE_ERR"],
-    ["http://example.com/", "xml", null, null],
-    ["http://example.com/", "xmlns", null, "NAMESPACE_ERR"],
-    ["http://example.com/", "xmlfoo", null, null],
-    ["http://example.com/", "xml:foo", null, "NAMESPACE_ERR"],
-    ["http://example.com/", "xmlns:foo", null, "NAMESPACE_ERR"],
-    ["http://example.com/", "xmlfoo:bar", null, null],
     ["/", null, null, null],
     ["/", "", null, null],
-    ["/", "foo", null, null],
-    ["/", "1foo", null, "INVALID_CHARACTER_ERR"],
-    ["/", "f1oo", null, null],
-    ["/", "foo1", null, null],
-    ["/", ":foo", null, "NAMESPACE_ERR"],
-    ["/", "f:oo", null, null],
-    ["/", "foo:", null, "NAMESPACE_ERR"],
-    ["/", "xml", null, null],
-    ["/", "xmlns", null, "NAMESPACE_ERR"],
-    ["/", "xmlfoo", null, null],
-    ["/", "xml:foo", null, "NAMESPACE_ERR"],
-    ["/", "xmlns:foo", null, "NAMESPACE_ERR"],
-    ["/", "xmlfoo:bar", null, null],
     ["http://www.w3.org/XML/1998/namespace", null, null, null],
     ["http://www.w3.org/XML/1998/namespace", "", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "foo", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "1foo", null, "INVALID_CHARACTER_ERR"],
-    ["http://www.w3.org/XML/1998/namespace", "f1oo", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "foo1", null, null],
-    ["http://www.w3.org/XML/1998/namespace", ":foo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/XML/1998/namespace", "f:oo", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "foo:", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/XML/1998/namespace", "xml", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "xmlns", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/XML/1998/namespace", "xmlfoo", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "xml:foo", null, null],
-    ["http://www.w3.org/XML/1998/namespace", "xmlns:foo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/XML/1998/namespace", "xmlfoo:bar", null, null],
     ["http://www.w3.org/2000/xmlns/", null, null, null],
     ["http://www.w3.org/2000/xmlns/", "", null, null],
-    ["http://www.w3.org/2000/xmlns/", "foo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "1foo", null, "INVALID_CHARACTER_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "f1oo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "foo1", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", ":foo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "f:oo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "foo:", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "xml", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "xmlns", null, null],
-    ["http://www.w3.org/2000/xmlns/", "xmlfoo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "xml:foo", null, "NAMESPACE_ERR"],
-    ["http://www.w3.org/2000/xmlns/", "xmlns:foo", null, null],
-    ["http://www.w3.org/2000/xmlns/", "xmlfoo:bar", null, "NAMESPACE_ERR"],
     ["foo:", null, null, null],
     ["foo:", "", null, null],
-    ["foo:", "foo", null, null],
-    ["foo:", "1foo", null, "INVALID_CHARACTER_ERR"],
-    ["foo:", "f1oo", null, null],
-    ["foo:", "foo1", null, null],
-    ["foo:", ":foo", null, "NAMESPACE_ERR"],
-    ["foo:", "f:oo", null, null],
-    ["foo:", "foo:", null, "NAMESPACE_ERR"],
-    ["foo:", "xml", null, null],
-    ["foo:", "xmlns", null, "NAMESPACE_ERR"],
-    ["foo:", "xmlfoo", null, null],
-    ["foo:", "xml:foo", null, "NAMESPACE_ERR"],
-    ["foo:", "xmlns:foo", null, "NAMESPACE_ERR"],
-    ["foo:", "xmlfoo:bar", null, null],
     [null, null, document.implementation.createDocumentType("foo", "", ""), null],
     [null, null, document.doctype, null], // This causes a horrible WebKit bug (now fixed in trunk).
     [null, null, function() {
@@ -146,17 +57,19 @@
     [null, "foo", document.implementation.createDocumentType("foo", "", ""), null],
     ["foo", null, document.implementation.createDocumentType("foo", "", ""), null],
     ["foo", "bar", document.implementation.createDocumentType("foo", "", ""), null],
-  ]
+  ])
 
   tests.forEach(function(t, i) {
+    var namespace = t[0], qualifiedName = t[1], doctype = t[2], expected = t[3]
     test(function() {
-      var namespace = t[0], qualifiedName = t[1], doctype = t[2], expected = t[3]
       if (expected != null) {
         assert_throws(expected, function() { document.implementation.createDocument(namespace, qualifiedName, doctype) })
       } else {
         var doc = document.implementation.createDocument(namespace, qualifiedName, doctype)
         assert_equals(doc.nodeType, Node.DOCUMENT_NODE)
         assert_equals(doc.nodeType, doc.DOCUMENT_NODE)
+        assert_equals(doc.nodeName, "#document")
+        assert_equals(doc.nodeValue, null)
         var omitRootElement = qualifiedName === null || String(qualifiedName) === ""
         if (omitRootElement) {
           assert_equals(doc.documentElement, null)
@@ -184,6 +97,20 @@
         assert_equals(doc.childNodes.length, !omitRootElement + !!doctype)
       }
     }, "createDocument test " + i + ": " + t.map(function(el) { return format_value(el) }))
+
+    if (expected === null) {
+      test(function() {
+        var doc = document.implementation.createDocument(namespace, qualifiedName, doctype)
+        assert_equals(doc.compatMode, "CSS1Compat")
+        // XXX Spec says "utf-8", browsers do "UTF-8".
+        assert_equals(doc.characterSet.toUpperCase(), "UTF-8")
+        assert_equals(doc.contentType, "application/xml")
+        assert_equals(doc.URL, "about:blank")
+        assert_equals(doc.documentURI, "about:blank")
+        assert_equals(doc.createElement("DIV").localName, "DIV");
+      }, "createDocument test " + i + ": metadata for " +
+      [namespace, qualifiedName, doctype].map(function(el) { return format_value(el) }))
+    }
   })
 })
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocumentType.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocumentType.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocumentType.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createDocumentType.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,46 +1,109 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>DOMImplementation.createDocumentType(qualifiedName, publicId, systemId)</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-domimplementation-createdocumenttype">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-documenttype-name">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-documenttype-publicid">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-documenttype-systemid">
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-ownerdocument">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-domimplementation-createdocumenttype">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-documenttype-name">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-documenttype-publicid">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-documenttype-systemid">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-ownerdocument">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
 test(function() {
   var tests = [
-        ["foo", "", "", null],
-        ["1foo", "", "", "INVALID_CHARACTER_ERR"],
-        ["foo1", "", "", null],
-        ["f1oo", "", "", null],
-        ["@foo", "", "", "INVALID_CHARACTER_ERR"],
-        ["foo@", "", "", "INVALID_CHARACTER_ERR"],
-        ["f@oo", "", "", "INVALID_CHARACTER_ERR"],
-        ["f:oo", "", "", null],
-        [":foo", "", "", "NAMESPACE_ERR"],
-        ["foo:", "", "", "NAMESPACE_ERR"],
-        ["foo", "foo", "", null],
-        ["foo", "", "foo", null],
-        ["foo", "f'oo", "", null],
-        ["foo", "", "f'oo", null],
-        ["foo", 'f"oo', "", null],
-        ["foo", "", 'f"oo', null],
-        ["foo", "f'o\"o", "", null],
-        ["foo", "", "f'o\"o", null],
-        ["foo", "foo>", "", null],
-        ["foo", "", "foo>", null]
-     ]
+    ["", "", "", "INVALID_CHARACTER_ERR"],
+    ["test:root", "1234", "", null],
+    ["test:root", "1234", "test", null],
+    ["test:root", "test", "", null],
+    ["test:root", "test", "test", null],
+    ["_:_", "", "", null],
+    ["_:h0", "", "", null],
+    ["_:test", "", "", null],
+    ["_:_.", "", "", null],
+    ["_:a-", "", "", null],
+    ["l_:_", "", "", null],
+    ["ns:_0", "", "", null],
+    ["ns:a0", "", "", null],
+    ["ns0:test", "", "", null],
+    ["ns:EEE.", "", "", null],
+    ["ns:_-", "", "", null],
+    ["a.b:c", "", "", null],
+    ["a-b:c.j", "", "", null],
+    ["a-b:c", "", "", null],
+    ["foo", "", "", null],
+    ["1foo", "", "", "INVALID_CHARACTER_ERR"],
+    ["foo1", "", "", null],
+    ["f1oo", "", "", null],
+    ["@foo", "", "", "INVALID_CHARACTER_ERR"],
+    ["foo@", "", "", "INVALID_CHARACTER_ERR"],
+    ["f@oo", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:{", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:}", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:~", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:'", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:!", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:@", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:#", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:$", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:%", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:^", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:&", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:*", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:(", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:)", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:+", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:=", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:[", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:]", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:\\", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:/", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:;", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:`", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:<", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:>", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:,", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:a ", "", "", "INVALID_CHARACTER_ERR"],
+    ["edi:\"", "", "", "INVALID_CHARACTER_ERR"],
+    ["{", "", "", "INVALID_CHARACTER_ERR"],
+    ["}", "", "", "INVALID_CHARACTER_ERR"],
+    ["'", "", "", "INVALID_CHARACTER_ERR"],
+    ["~", "", "", "INVALID_CHARACTER_ERR"],
+    ["`", "", "", "INVALID_CHARACTER_ERR"],
+    ["@", "", "", "INVALID_CHARACTER_ERR"],
+    ["#", "", "", "INVALID_CHARACTER_ERR"],
+    ["$", "", "", "INVALID_CHARACTER_ERR"],
+    ["%", "", "", "INVALID_CHARACTER_ERR"],
+    ["^", "", "", "INVALID_CHARACTER_ERR"],
+    ["&", "", "", "INVALID_CHARACTER_ERR"],
+    ["*", "", "", "INVALID_CHARACTER_ERR"],
+    ["(", "", "", "INVALID_CHARACTER_ERR"],
+    [")", "", "", "INVALID_CHARACTER_ERR"],
+    ["f:oo", "", "", null],
+    [":foo", "", "", "NAMESPACE_ERR"],
+    ["foo:", "", "", "NAMESPACE_ERR"],
+    ["prefix::local", "", "", "NAMESPACE_ERR"],
+    ["foo", "foo", "", null],
+    ["foo", "", "foo", null],
+    ["foo", "f'oo", "", null],
+    ["foo", "", "f'oo", null],
+    ["foo", 'f"oo', "", null],
+    ["foo", "", 'f"oo', null],
+    ["foo", "f'o\"o", "", null],
+    ["foo", "", "f'o\"o", null],
+    ["foo", "foo>", "", null],
+    ["foo", "", "foo>", null]
+  ]
 
   var doc = document.implementation.createHTMLDocument("title");
   var doTest = function(aDocument, aQualifiedName, aPublicId, aSystemId) {
     var doctype = aDocument.implementation.createDocumentType(aQualifiedName, aPublicId, aSystemId);
     assert_equals(doctype.name, aQualifiedName, "name")
+    assert_equals(doctype.nodeName, aQualifiedName, "nodeName")
     assert_equals(doctype.publicId, aPublicId, "publicId")
     assert_equals(doctype.systemId, aSystemId, "systemId")
     assert_equals(doctype.ownerDocument, aDocument, "ownerDocument")
+    assert_equals(doctype.nodeValue, null, "nodeValue")
   }
   tests.forEach(function(t) {
     var qualifiedName = t[0], publicId = t[1], systemId = t[2], expected = t[3]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,55 +3,65 @@
 <!-- Using windows-1252 to ensure that DOMImplementation.createHTMLDocument()
      doesn't inherit utf-8 from the parent document. -->
 <title>DOMImplementation.createHTMLDocument</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument">
-<link rel=help href="http://dom.spec.whatwg.org/#dom-documenttype-name">
-<link rel=help href="http://dom.spec.whatwg.org/#dom-documenttype-publicid">
-<link rel=help href="http://dom.spec.whatwg.org/#dom-documenttype-systemid">
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document-documentelement">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-documenttype-name">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-documenttype-publicid">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-documenttype-systemid">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-documentelement">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="DOMImplementation-createHTMLDocument.js"></script>
 <div id="log"></div>
 <script>
-function checkDoc(title, expectedtitle, normalizedtitle) {
-  test(function() {
-    var doc = document.implementation.createHTMLDocument(title);
-    assert_equals(doc.doctype.name, "html")
-    assert_equals(doc.doctype.publicId, "")
-    assert_equals(doc.doctype.systemId, "")
-    assert_equals(doc.documentElement.localName, "html")
-    assert_equals(doc.documentElement.firstChild.localName, "head")
-    if (title !== undefined) {
-      assert_equals(doc.documentElement.firstChild.childNodes.length, 1)
-      assert_equals(doc.documentElement.firstChild.firstChild.localName, "title")
-      assert_equals(doc.documentElement.firstChild.firstChild.firstChild.data,
-                    expectedtitle)
-    } else {
-      assert_equals(doc.documentElement.firstChild.childNodes.length, 0)
-    }
-    assert_equals(doc.documentElement.lastChild.localName, "body")
-    assert_equals(doc.documentElement.lastChild.childNodes.length, 0)
-  })
-}
-checkDoc("", "", "")
-checkDoc(null, "null", "null")
-checkDoc(undefined, "", "")
-checkDoc("foo  bar baz", "foo  bar baz", "foo bar baz")
-checkDoc("foo\t\tbar baz", "foo\t\tbar baz", "foo bar baz")
-checkDoc("foo\n\nbar baz", "foo\n\nbar baz", "foo bar baz")
-checkDoc("foo\f\fbar baz", "foo\f\fbar baz", "foo bar baz")
-checkDoc("foo\r\rbar baz", "foo\r\rbar baz", "foo bar baz")
+createHTMLDocuments(function(doc, expectedtitle, normalizedtitle) {
+  assert_true(doc instanceof Document, "Should be a Document")
+  assert_true(doc instanceof Node, "Should be a Node")
+  assert_equals(doc.childNodes.length, 2,
+                "Document should have two child nodes")
 
-test(function() {
-  var doc = document.implementation.createHTMLDocument();
-    assert_equals(doc.doctype.name, "html")
-    assert_equals(doc.doctype.publicId, "")
-    assert_equals(doc.doctype.systemId, "")
-    assert_equals(doc.documentElement.localName, "html")
-    assert_equals(doc.documentElement.firstChild.localName, "head")
-    assert_equals(doc.documentElement.firstChild.childNodes.length, 0)
-    assert_equals(doc.documentElement.lastChild.localName, "body")
-    assert_equals(doc.documentElement.lastChild.childNodes.length, 0)
-}, "Missing title argument");
+  var doctype = doc.doctype
+  assert_true(doctype instanceof DocumentType,
+              "Doctype should be a DocumentType")
+  assert_true(doctype instanceof Node, "Doctype should be a Node")
+  assert_equals(doctype.name, "html")
+  assert_equals(doctype.publicId, "")
+  assert_equals(doctype.systemId, "")
+
+  var documentElement = doc.documentElement
+  assert_true(documentElement instanceof HTMLHtmlElement,
+              "Document element should be a HTMLHtmlElement")
+  assert_equals(documentElement.childNodes.length, 2,
+                "Document element should have two child nodes")
+  assert_equals(documentElement.localName, "html")
+  assert_equals(documentElement.tagName, "HTML")
+
+  var head = documentElement.firstChild
+  assert_true(head instanceof HTMLHeadElement,
+              "Head should be a HTMLHeadElement")
+  assert_equals(head.localName, "head")
+  assert_equals(head.tagName, "HEAD")
+
+  if (expectedtitle !== undefined) {
+    assert_equals(head.childNodes.length, 1)
+
+    var title = head.firstChild
+    assert_true(title instanceof HTMLTitleElement,
+                "Title should be a HTMLTitleElement")
+    assert_equals(title.localName, "title")
+    assert_equals(title.tagName, "TITLE")
+    assert_equals(title.childNodes.length, 1)
+    assert_equals(title.firstChild.data, expectedtitle)
+  } else {
+    assert_equals(head.childNodes.length, 0)
+  }
+
+  var body = documentElement.lastChild
+  assert_true(body instanceof HTMLBodyElement,
+              "Body should be a HTMLBodyElement")
+  assert_equals(body.localName, "body")
+  assert_equals(body.tagName, "BODY")
+  assert_equals(body.childNodes.length, 0)
+})
 
 test(function() {
   var doc = document.implementation.createHTMLDocument("test");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-createHTMLDocument.js	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,25 @@
+function createHTMLDocuments(checkDoc) {
+  var tests = [
+    ["", "", ""],
+    [null, "null", "null"],
+    [undefined, undefined, ""],
+    ["foo  bar baz", "foo  bar baz", "foo bar baz"],
+    ["foo\t\tbar baz", "foo\t\tbar baz", "foo bar baz"],
+    ["foo\n\nbar baz", "foo\n\nbar baz", "foo bar baz"],
+    ["foo\f\fbar baz", "foo\f\fbar baz", "foo bar baz"],
+    ["foo\r\rbar baz", "foo\r\rbar baz", "foo bar baz"],
+  ]
+
+  tests.forEach(function(t, i) {
+    var title = t[0], expectedtitle = t[1], normalizedtitle = t[2]
+    test(function() {
+      var doc = document.implementation.createHTMLDocument(title);
+      checkDoc(doc, expectedtitle, normalizedtitle)
+    }, "createHTMLDocument test " + i + ": " + t.map(function(el) { return format_value(el) }))
+  })
+
+  test(function() {
+    var doc = document.implementation.createHTMLDocument();
+    checkDoc(doc, undefined, "")
+  }, "Missing title argument");
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-hasFeature.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-hasFeature.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-hasFeature.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/DOMImplementation-hasFeature.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>DOMImplementation.hasFeature(feature, version)</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-domimplementation-hasfeature">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-domimplementation-hasfeature">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Element-classlist.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Element-classlist.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Element-classlist.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Element-classlist.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html>
 	<head class="test test">
 		<title class=" ">Element.classList in case-sensitive documents</title>
-		<link rel="help" href="http://dom.spec.whatwg.org/#concept-class">
+		<link rel="help" href="https://dom.spec.whatwg.org/#concept-class">
 		<script type="text/javascript" src="/resources/testharness.js"></script>
 		<script type="text/javascript" src="/resources/testharnessreport.js"></script>
 		<style type="text/css">
@@ -31,7 +31,7 @@
 	assert_not_equals( getComputedStyle(elem,null).fontStyle, 'italic', 'critical test; required by the testsuite' );
 }, 'CSS .foo selectors must not match elements without any class');
 test(function () {
-	assert_equals( secondelem.classList.length, 1, 'duplicates in initial string should be removed per http://dom.spec.whatwg.org/#concept-class' );
+	assert_equals( secondelem.classList.length, 1, 'duplicates in initial string should be removed per https://dom.spec.whatwg.org/#concept-class' );
 	assert_equals( secondelem.classList.item(0), 'test' );
 	assert_true( secondelem.classList.contains('test') );
 }, 'classList must be correct for an element that has classes');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Element-remove.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Element-remove.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Element-remove.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Element-remove.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Element.remove</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-childnode-remove">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-childnode-remove">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="ChildNode-remove.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Element-tagName.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Element-tagName.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Element-tagName.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Element-tagName.html	2014-11-26 21:45:56.000000000 +0000
@@ -10,6 +10,7 @@
   assert_equals(document.createElementNS(HTMLNS, "i").tagName, "I")
   assert_equals(document.createElementNS(HTMLNS, "x:b").tagName, "X:B")
 }, "tagName should upper-case for HTML elements in HTML documents.")
+
 test(function() {
   var SVGNS = "http://www.w3.org/2000/svg"
   assert_equals(document.createElementNS(SVGNS, "svg").tagName, "svg")
@@ -17,6 +18,7 @@
   assert_equals(document.createElementNS(SVGNS, "s:svg").tagName, "s:svg")
   assert_equals(document.createElementNS(SVGNS, "s:SVG").tagName, "s:SVG")
 }, "tagName should not upper-case for SVG elements in HTML documents.")
+
 test(function() {
   if ("DOMParser" in window) {
     var xmlel = new DOMParser()
@@ -27,4 +29,22 @@
     assert_equals(htmlel.tagName, "DIV", "tagName should be uppercase in HTML")
   }
 }, "tagName should be updated when changing ownerDocument")
+
+test(function() {
+  var xmlel = document.implementation
+    .createDocument("http://www.w3.org/1999/xhtml", "div", null)
+    .documentElement;
+  assert_equals(xmlel.tagName, "div", "tagName should be lowercase in XML")
+  var htmlel = document.importNode(xmlel, true)
+  assert_equals(htmlel.tagName, "DIV", "tagName should be uppercase in HTML")
+}, "tagName should be updated when changing ownerDocument (createDocument without prefix)")
+
+test(function() {
+  var xmlel = document.implementation
+    .createDocument("http://www.w3.org/1999/xhtml", "foo:div", null)
+    .documentElement;
+  assert_equals(xmlel.tagName, "foo:div", "tagName should be lowercase in XML")
+  var htmlel = document.importNode(xmlel, true)
+  assert_equals(htmlel.tagName, "FOO:DIV", "tagName should be uppercase in HTML")
+}, "tagName should be updated when changing ownerDocument (createDocument with prefix)")
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-19.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-19.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-19.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-19.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
     <title>getElementsByClassName</title>
     <meta content="get elements in document" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-20.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-20.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-20.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-20.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="get elements in document then add element to collection" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-21.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-21.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-21.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-21.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="delete element from collection" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-22.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-22.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-22.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-22.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="move item in collection order" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-23.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-23.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-23.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-23.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="multiple defined classes" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-24.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-24.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-24.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-24.htm	2014-11-26 21:45:56.000000000 +0000
@@ -3,7 +3,7 @@
         <meta charset='utf-8'>
         <title>getElementsByClassName</title>
         <meta content="handle unicode chars" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-25.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-25.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-25.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-25.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="verify spacing is handled correctly" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-26.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-26.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-26.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-26.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="multiple class attributes" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-27.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-27.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-27.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-27.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="generic element listed" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-28.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-28.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-28.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-28.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
         <title>getElementsByClassName</title>
         <meta content="generic element listed" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-29.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-29.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-29.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-29.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html><head>
     <title>getElementsByClassName</title>
     <meta content="get class from children of element" name="description">
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-30.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-30.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-30.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-30.htm	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
         <style class="foo"></style>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link href="http://www.w3.org/TR/domcore/#dom-document-getelementsbyclassname" rel="help">
+    <link href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname" rel="help">
 </head>
     <body class="foo">
     <div id='log'></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-31.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-31.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-31.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/getElementsByClassName-31.htm	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <html class=foo>
 <meta charset=utf-8>
 <title>getElementsByClassName across documents</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-document-getelementsbyclassname">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-appendChild.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-appendChild.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-appendChild.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-appendChild.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Node.appendChild</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-appendchild">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-appendchild">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-childNodes.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-childNodes.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-childNodes.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-childNodes.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Node.childNodes</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-node-childnodes">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-childnodes">
 <link rel=author title="Tim Taubert" href="mailto:ttaubert@mozilla.com">
 <link rel=author title="Ms2ger" href="mailto:Ms2ger@gmail.com">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-cloneNode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-cloneNode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-cloneNode.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-cloneNode.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,27 +1,51 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Node.cloneNode</title>
-<link rel=help href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-node-clonenode">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-clonenode">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
 <script>
+function assert_equal_node(nodeA, nodeB) {
+  assert_equals(nodeB.nodeType, nodeA.nodeType, "nodeType");
+  assert_equals(nodeB.nodeName, nodeA.nodeName, "nodeName");
+
+  if (nodeA.nodeType === Node.ELEMENT_NODE) {
+    assert_equals(nodeB.prefix, nodeA.prefix);
+    assert_equals(nodeB.namespaceURI, nodeA.namespaceURI);
+    assert_equals(nodeB.localName, nodeA.localName);
+    assert_equals(nodeB.tagName, nodeA.tagName);
+    assert_not_equals(nodeB.attributes != nodeA.attributes);
+    assert_equals(nodeB.attributes.length, nodeA.attributes.length);
+    for (var i = 0, il = nodeA.attributes.length; i < il; ++i) {
+      assert_not_equals(nodeB.attributes[i], nodeA.attributes[i]);
+      assert_equals(nodeB.attributes[i].name, nodeA.attributes[i].name);
+      assert_equals(nodeB.attributes[i].prefix, nodeA.attributes[i].prefix);
+      assert_equals(nodeB.attributes[i].namespaceURI, nodeA.attributes[i].namespaceURI);
+      assert_equals(nodeB.attributes[i].value, nodeA.attributes[i].value);
+    }
+  }
+}
+
 test(function() {
   var el = document.createElement("foo");
   el.appendChild(document.createElement("bar"));
   el.setAttribute("a", "b");
   el.setAttribute("c", "d");
   var c = el.cloneNode(false);
-  assert_true(c.attributes != el.attributes);
-  assert_true(c.attributes !== el.attributes);
-  assert_equals(c.attributes.length, el.attributes.length);
-  for (var i = 0, il = el.attributes.length; i < il; ++i) {
-    assert_not_equals(c.attributes[i], el.attributes[i]);
-    assert_equals(c.attributes[i].name, el.attributes[i].name);
-    assert_equals(c.attributes[i].prefix, el.attributes[i].prefix);
-    assert_equals(c.attributes[i].namespaceURI, el.attributes[i].namespaceURI);
-    assert_equals(c.attributes[i].value, el.attributes[i].value);
-  }
+  assert_equal_node(el, c);
   assert_equals(c.childNodes.length, 0);
-})
+}, "Unprefixed HTML element")
+
+test(function() {
+  var el = document.createElementNS("http://www.w3.org/1999/xhtml", "foo:div");
+  var c = el.cloneNode(false);
+  assert_equal_node(el, c);
+}, "Prefixed HTML element")
+
+test(function() {
+  var el = document.createElementNS("http://www.example.com/", "foo:div");
+  var c = el.cloneNode(false);
+  assert_equal_node(el, c);
+}, "Prefixed non-HTML element")
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-nodeValue.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-nodeValue.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Node-nodeValue.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Node-nodeValue.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Node.nodeValue</title>
-<link rel=help href="http://dom.spec.whatwg.org/#dom-node-nodevalue">
+<link rel=help href="https://dom.spec.whatwg.org/#dom-node-nodevalue">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
@@ -61,4 +61,11 @@
   the_frag.nodeValue = "foo";
   assert_equals(the_frag.nodeValue, null);
 }, "DocumentFragment.nodeValue");
+
+test(function() {
+  var the_doctype = document.doctype;
+  assert_equals(the_doctype.nodeValue, null);
+  the_doctype.nodeValue = "foo";
+  assert_equals(the_doctype.nodeValue, null);
+}, "DocumentType.nodeValue");
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-1.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-1.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-1.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-1.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>&lt;?xml?> is not a ProcessingInstruction</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+test(function() {
+  assert_equals(document.firstChild, document.documentElement)
+})
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-2.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-2.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-2.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/ProcessingInstruction-literal-2.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml-stylesheet href="support/style.css" type="text/css"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>ProcessingInstruction literals</title>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-processinginstruction-target"/>
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-characterdata-data"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"/>
+<script>
+test(function() {
+  var pienc = document.firstChild;
+  assert_true(pienc instanceof ProcessingInstruction)
+  assert_equals(pienc.target, "xml-stylesheet")
+  assert_equals(pienc.data, 'href="support/style.css" type="text/css"')
+})
+</script>
+</body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/productions.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/productions.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/productions.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/productions.js	2014-11-26 21:45:56.000000000 +0000
@@ -1,3 +1,3 @@
-var invalid_names = ["\\", "'", '"', "0", "0:a"] // XXX
+var invalid_names = ["", "invalid^Name", "\\", "'", '"', "0", "0:a"] // XXX
 var valid_names = ["x", ":", "a:0"]
 var invalid_qnames = [":a", "b:", "x:y:z"] // XXX
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Text-constructor.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Text-constructor.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/nodes/Text-constructor.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/nodes/Text-constructor.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Text constructor</title>
+<link rel=help href="https://dom.spec.whatwg.org/#dom-text">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="Comment-Text-constructor.js"></script>
+<div id="log"></div>
+<script>
+test_constructor("Text");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,177 @@
+<!doctype html>
+<title>NodeIterator tests</title>
+<link rel="author" title="Aryeh Gregor" href=ayg@aryeh.name>
+<meta name=timeout content=long>
+<div id=log></div>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=../common.js></script>
+<script>
+"use strict";
+
+test(function() {
+  var iter = document.createNodeIterator(document);
+  iter.detach();
+  iter.detach();
+}, "detach() should be a no-op");
+
+test(function() {
+  var iter = document.createNodeIterator(document);
+  assert_equals(iter.whatToShow, 0xFFFFFFFF, "whatToShow");
+  assert_equals(iter.filter, null, "filter");
+}, "createNodeIterator() parameter defaults");
+
+test(function() {
+  var iter = document.createNodeIterator(document, NodeFilter.SHOW_ALL,
+                                        function() { throw {name: "failed"} });
+  assert_throws({name: "failed"}, function() { iter.nextNode() });
+}, "Propagate exception from filter function");
+
+function testIterator(root, whatToShow, filter) {
+  var iter = document.createNodeIterator(root, whatToShow, filter);
+
+  assert_equals(iter.root, root, ".root");
+  assert_equals(iter.referenceNode, root, "Initial .referenceNode");
+  assert_equals(iter.pointerBeforeReferenceNode, true,
+                ".pointerBeforeReferenceNode");
+  assert_equals(iter.whatToShow, whatToShow, ".whatToShow");
+  assert_equals(iter.filter, filter, ".filter");
+
+  var expectedReferenceNode = root;
+  var expectedBeforeNode = true;
+  // "Let node be the value of the referenceNode attribute."
+  var node = root;
+  // "Let before node be the value of the pointerBeforeReferenceNode
+  // attribute."
+  var beforeNode = true;
+  var i = 1;
+  // Each loop iteration runs nextNode() once.
+  while (node) {
+    do {
+      if (!beforeNode) {
+        // "If before node is false, let node be the first node following node
+        // in the iterator collection. If there is no such node return null."
+        node = nextNode(node);
+        if (!isInclusiveDescendant(node, root)) {
+          node = null;
+          break;
+        }
+      } else {
+        // "If before node is true, set it to false."
+        beforeNode = false;
+      }
+      // "Filter node and let result be the return value.
+      //
+      // "If result is FILTER_ACCEPT, go to the next step in the overall set of
+      // steps.
+      //
+      // "Otherwise, run these substeps again."
+      if (!((1 << (node.nodeType - 1)) & whatToShow)
+          || (filter && filter(node) != NodeFilter.FILTER_ACCEPT)) {
+        continue;
+      }
+
+      // "Set the referenceNode attribute to node, set the
+      // pointerBeforeReferenceNode attribute to before node, and return node."
+      expectedReferenceNode = node;
+      expectedBeforeNode = beforeNode;
+
+      break;
+    } while (true);
+
+    assert_equals(iter.nextNode(), node, ".nextNode() " + i + " time(s)");
+    assert_equals(iter.referenceNode, expectedReferenceNode,
+                  ".referenceNode after nextNode() " + i + " time(s)");
+    assert_equals(iter.pointerBeforeReferenceNode, expectedBeforeNode,
+             ".pointerBeforeReferenceNode after nextNode() " + i + " time(s)");
+
+    i++;
+  }
+
+  // Same but for previousNode() (mostly copy-pasted, oh well)
+  var iter = document.createNodeIterator(root, whatToShow, filter);
+
+  var expectedReferenceNode = root;
+  var expectedBeforeNode = true;
+  // "Let node be the value of the referenceNode attribute."
+  var node = root;
+  // "Let before node be the value of the pointerBeforeReferenceNode
+  // attribute."
+  var beforeNode = true;
+  var i = 1;
+  // Each loop iteration runs previousNode() once.
+  while (node) {
+    do {
+      if (beforeNode) {
+        // "If before node is true, let node be the first node preceding node
+        // in the iterator collection. If there is no such node return null."
+        node = previousNode(node);
+        if (!isInclusiveDescendant(node, root)) {
+          node = null;
+          break;
+        }
+      } else {
+        // "If before node is false, set it to true."
+        beforeNode = true;
+      }
+      // "Filter node and let result be the return value.
+      //
+      // "If result is FILTER_ACCEPT, go to the next step in the overall set of
+      // steps.
+      //
+      // "Otherwise, run these substeps again."
+      if (!((1 << (node.nodeType - 1)) & whatToShow)
+          || (filter && filter(node) != NodeFilter.FILTER_ACCEPT)) {
+        continue;
+      }
+
+      // "Set the referenceNode attribute to node, set the
+      // pointerBeforeReferenceNode attribute to before node, and return node."
+      expectedReferenceNode = node;
+      expectedBeforeNode = beforeNode;
+
+      break;
+    } while (true);
+
+    assert_equals(iter.previousNode(), node, ".previousNode() " + i + " time(s)");
+    assert_equals(iter.referenceNode, expectedReferenceNode,
+                  ".referenceNode after previousNode() " + i + " time(s)");
+    assert_equals(iter.pointerBeforeReferenceNode, expectedBeforeNode,
+         ".pointerBeforeReferenceNode after previousNode() " + i + " time(s)");
+
+    i++;
+  }
+}
+
+var whatToShows = [
+  "0",
+  "0xFFFFFFFF",
+  "NodeFilter.SHOW_ELEMENT",
+  "NodeFilter.SHOW_ATTRIBUTE",
+  "NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_DOCUMENT",
+];
+
+var callbacks = [
+  "null",
+  "(function(node) { return true })",
+  "(function(node) { return false })",
+  "(function(node) { return node.nodeName[0] == '#' })",
+];
+
+var tests = [];
+for (var i = 0; i < testNodes.length; i++) {
+  for (var j = 0; j < whatToShows.length; j++) {
+    for (var k = 0; k < callbacks.length; k++) {
+      tests.push([
+        "document.createNodeIterator(" + testNodes[i]
+          + ", " + whatToShows[j] + ", " + callbacks[k] + ")",
+        eval(testNodes[i]), eval(whatToShows[j]), eval(callbacks[k])
+      ]);
+    }
+  }
+}
+
+generate_tests(testIterator, tests);
+
+testDiv.style.display = "none";
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator-removal.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator-removal.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator-removal.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/dom/traversal/NodeIterator-removal.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,100 @@
+<!doctype html>
+<title>NodeIterator removal tests</title>
+<link rel="author" title="Aryeh Gregor" href=ayg@aryeh.name>
+<meta name=timeout content=long>
+<div id=log></div>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=../common.js></script>
+<script>
+"use strict";
+
+for (var i = 0; i < testNodes.length; i++) {
+  var node = eval(testNodes[i]);
+  if (!node.parentNode) {
+    // Nothing to test
+    continue;
+  }
+  test(function() {
+    var iters = [];
+    var descs = [];
+    var expectedReferenceNodes = [];
+    var expectedPointers = [];
+
+    for (var j = 0; j < testNodes.length; j++) {
+      var root = eval(testNodes[j]);
+      // Add all distinct iterators with this root, calling nextNode()
+      // repeatedly until it winds up with the same iterator.
+      for (var k = 0; ; k++) {
+        var iter = document.createNodeIterator(root);
+        for (var l = 0; l < k; l++) {
+          iter.nextNode();
+        }
+        if (k && iter.referenceNode == iters[iters.length - 1].referenceNode
+            && iter.pointerBeforeReferenceNode
+               == iters[iters.length - 1].pointerBeforeReferenceNode) {
+          break;
+        } else {
+          iters.push(iter);
+          descs.push("document.createNodeIterator(" + testNodes[j]
+            + ") advanced " + k + " times");
+          expectedReferenceNodes.push(iter.referenceNode);
+          expectedPointers.push(iter.pointerBeforeReferenceNode);
+
+          var idx = iters.length - 1;
+
+          // "If the node is root or is not an inclusive ancestor of the
+          // referenceNode attribute value, terminate these steps."
+          //
+          // We also have to rule out the case where node is an ancestor of
+          // root, which is implicitly handled by the spec since such a node
+          // was not part of the iterator collection to start with.
+          if (isInclusiveAncestor(node, root)
+              || !isInclusiveAncestor(node, iter.referenceNode)) {
+            continue;
+          }
+
+          // "If the pointerBeforeReferenceNode attribute value is false, set
+          // the referenceNode attribute to the first node preceding the node
+          // that is being removed, and terminate these steps."
+          if (!iter.pointerBeforeReferenceNode) {
+            expectedReferenceNodes[idx] = previousNode(node);
+            continue;
+          }
+
+          // "If there is a node following the last inclusive descendant of the
+          // node that is being removed, set the referenceNode attribute to the
+          // first such node, and terminate these steps."
+          var next = nextNodeDescendants(node);
+          if (next) {
+            expectedReferenceNodes[idx] = next;
+            continue;
+          }
+
+          // "Set the referenceNode attribute to the first node preceding the
+          // node that is being removed and set the pointerBeforeReferenceNode
+          // attribute to false."
+          expectedReferenceNodes[idx] = previousNode(node);
+          expectedPointers[idx] = false;
+        }
+      }
+    }
+
+    var oldParent = node.parentNode;
+    var oldSibling = node.nextSibling;
+    oldParent.removeChild(node);
+
+    for (var j = 0; j < iters.length; j++) {
+      var iter = iters[j];
+      assert_equals(iter.referenceNode, expectedReferenceNodes[j],
+                    ".referenceNode of " + descs[j]);
+      assert_equals(iter.pointerBeforeReferenceNode, expectedPointers[j],
+                    ".pointerBeforeReferenceNode of " + descs[j]);
+    }
+
+    oldParent.insertBefore(node, oldSibling);
+  }, "Test removing node " + testNodes[i]);
+}
+
+testDiv.style.display = "none";
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/init-event-while-dispatching.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/init-event-while-dispatching.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/init-event-while-dispatching.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/init-event-while-dispatching.html	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Re-initializing events while dispatching them</title>
+<link rel="author" title="Josh Matthews" href="mailto:josh@joshmatthews.net">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+var events = {
+  'KeyboardEvent': {
+    'constructor': function() { return new KeyboardEvent("type", {key: "A"}); },
+    'init': function(ev) { ev.initKeyboardEvent("type2", true, true, null, "a", 1, "", true, "") },
+    'check': function(ev) {
+       assert_equals(ev.key, "A", "initKeyboardEvent key setter should short-circuit");
+       assert_false(ev.repeat, "initKeyboardEvent repeat setter should short-circuit");
+       assert_equals(ev.location, 0, "initKeyboardEvent location setter should short-circuit");
+     }
+  },
+  'MouseEvent': {
+    'constructor': function() { return new MouseEvent("type"); },
+    'init': function(ev) { ev.initMouseEvent("type2", true, true, null, 0, 1, 1, 1, 1, true, true, true, true, 1, null) },
+    'check': function(ev) {
+      assert_equals(ev.screenX, 0, "initMouseEvent screenX setter should short-circuit");
+      assert_equals(ev.screenY, 0, "initMouseEvent screenY setter should short-circuit");
+      assert_equals(ev.clientX, 0, "initMouseEvent clientX setter should short-circuit");
+      assert_equals(ev.clientY, 0, "initMouseEvent clientY setter should short-circuit");
+      assert_false(ev.ctrlKey, "initMouseEvent ctrlKey setter should short-circuit");
+      assert_false(ev.altKey, "initMouseEvent altKey setter should short-circuit");
+      assert_false(ev.shiftKey, "initMouseEvent shiftKey setter should short-circuit");
+      assert_false(ev.metaKey, "initMouseEvent metaKey setter should short-circuit");
+      assert_equals(ev.button, 0, "initMouseEvent button setter should short-circuit");
+    }
+  },
+  'CustomEvent': {
+    'constructor': function() { return new CustomEvent("type") },
+    'init': function(ev) { ev.initCustomEvent("type2", true, true, 1) },
+    'check': function(ev) {
+      assert_equals(ev.detail, null, "initCustomEvent detail setter should short-circuit");
+    }
+  },
+  'UIEvent': {
+    'constructor': function() { return new UIEvent("type") },
+    'init': function(ev) { ev.initUIEvent("type2", true, true, window, 1) },
+    'check': function(ev) {
+      assert_equals(ev.view, null, "initUIEvent view setter should short-circuit");
+      assert_equals(ev.detail, 0, "initUIEvent detail setter should short-circuit");
+    }
+  },
+  'Event': {
+    'constructor': function() { return new Event("type") },
+    'init': function(ev) { ev.initEvent("type2", true, true) },
+    'check': function(ev) {
+      assert_equals(ev.bubbles, false, "initEvent bubbles setter should short-circuit");
+      assert_equals(ev.cancelable, false, "initEvent cancelable setter should short-circuit");
+      assert_equals(ev.type, "type", "initEvent type setter should short-circuit");
+    }
+  }
+};
+
+var names = Object.keys(events);
+for (var i = 0; i < names.length; i++) {
+  var t = async_test("Calling init" + names[i] + " while dispatching.");
+  t.step(function() {
+    var e = events[names[i]].constructor();
+
+    var target = document.createElement("div")
+    target.addEventListener("type", t.step_func(function() {
+      events[names[i]].init(e);
+
+      var o = e;
+      while ((o = Object.getPrototypeOf(o))) {
+        if (!(o.constructor.name in events)) {
+          break;
+        }
+        events[o.constructor.name].check(e);
+      }
+    }), false);
+
+    assert_equals(target.dispatchEvent(e), true, "dispatchEvent must return true")
+  });
+  t.done();
+}
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/addEventListener.optional.useCapture.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/addEventListener.optional.useCapture.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/addEventListener.optional.useCapture.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/addEventListener.optional.useCapture.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> addEventListener() optional parameter: useCapture </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">    
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-        
-<script>
-    var EVENT = "foo";    
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent"); 
-    var TBODY = document.getElementById("table-body");
-    var TABLE = document.getElementById("table");
-    var BODY = document.body;
-    var HTML = document.documentElement;                
-    var CurrentTargets = [TARGET, PARENT, TBODY, TABLE, BODY, HTML, document, window];
-    var ExpectResult = CurrentTargets;
-    var ActualResult = [];
-    var ExpectPhases = [2,3,3,3,3,3,3,3];
-    var ActualPhases = [];
-
-    var description = "Test Description: " + 
-                      "useCapture is an optional parameter for EventTarget.addEventListener and EventTarget.removeEventListener. " + 
-                      "If it is not provided, both methods must behave as if useCapture were specified to be false.";
-    
-    var EventHandlers = [ function(evt){ TestEvent(evt, 0); }, function(evt){ TestEvent(evt, 1); } ]
-
-    test(function()
-    {
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].addEventListener(EVENT, TestEvent);
-        }
-        
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-        
-        TARGET.dispatchEvent(evt);
-        
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].removeEventListener(EVENT, TestEvent);
-        }
-
-        TARGET.dispatchEvent(evt);
-
-        assert_array_equals(ActualResult, ExpectResult, "ActualResult");
-        assert_array_equals(ActualPhases, ExpectPhases, "ActualPhases");
-        
-    }, description);
-         
-    function TestEvent(evt, i)
-    {
-        ActualResult.push(evt.currentTarget);         
-        ActualPhases.push(evt.eventPhase);
-    }
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> createEvent() DOMException.NOT_SUPPORTED_ERR </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<script>
-    var description = "Test Description: " + 
-                      "createEvent - DOMException NOT_SUPPORTED_ERR raises if the implementation " +
-                      "does not support the Event interface requested.";
-    
-    test(function()
-    {
-        assert_throws("NOT_SUPPORTED_ERR", function()
-        {
-            document.createEvent("foo");
-        });
-    }, description);
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.return.value.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.return.value.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.return.value.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/approved/dispatchEvent.return.value.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> dispatchEvent() return value and Event.preventDefault() </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">    
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-        
-<script>
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent");
-    var DefaultPrevented = false;
-
-    var description = "Test Description: " + 
-                      "dispatchEvent() return value indicates whether any of the listeners which handled the event called " +  
-                      "Event.preventDefault(). If Event.preventDefault() was called the returned value must be false, else " +  
-                      "it must be true.";
-
-    test(function()
-    {
-        PARENT.addEventListener(EVENT, function(e){TestEvent(e, 0)}, true);
-        TARGET.addEventListener(EVENT, function(e){TestEvent(e, 1)}, true);
-        TARGET.addEventListener(EVENT, function(e){TestEvent(e, 2)}, true);
-        
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);            
-        
-        var ReturnValue1 = PARENT.dispatchEvent(evt);
-        var ReturnValue2 = TARGET.dispatchEvent(evt);
-
-        assert_array_equals([DefaultPrevented, ReturnValue1, ReturnValue2], [true, true, false]);
-
-    }, description);
-         
-    function TestEvent(evt, i)
-    {
-        if (1 == i)
-        {
-            evt.preventDefault();
-            DefaultPrevented = evt.defaultPrevented;
-        }
-    }
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> addEventListener() optional parameter: useCapture </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-
-<script>
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent");
-    var TBODY = document.getElementById("table-body");
-    var TABLE = document.getElementById("table");
-    var BODY = document.body;
-    var HTML = document.documentElement;
-    var CurrentTargets = [TARGET, PARENT, TBODY, TABLE, BODY, HTML, document, window];
-    var ExpectResult = CurrentTargets;
-    var ActualResult = [];
-    var ExpectPhases = [2,3,3,3,3,3,3,3];
-    var ActualPhases = [];
-
-    var description = "Test Description: " +
-                      "useCapture is an optional parameter for EventTarget.addEventListener and EventTarget.removeEventListener. " +
-                      "If it is not provided, both methods must behave as if useCapture were specified to be false.";
-
-    var EventHandlers = [ function(evt){ TestEvent(evt, 0); }, function(evt){ TestEvent(evt, 1); } ]
-
-    test(function()
-    {
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].addEventListener(EVENT, TestEvent);
-        }
-
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-
-        TARGET.dispatchEvent(evt);
-
-        for (var i=0; i < CurrentTargets.length; i++)
-        {
-            CurrentTargets[i].removeEventListener(EVENT, TestEvent);
-        }
-
-        TARGET.dispatchEvent(evt);
-
-        assert_array_equals(ActualResult, ExpectResult, "ActualResult");
-        assert_array_equals(ActualPhases, ExpectPhases, "ActualPhases");
-
-    }, description);
-
-    function TestEvent(evt, i)
-    {
-        ActualResult.push(evt.currentTarget);
-        ActualPhases.push(evt.eventPhase);
-    }
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> createEvent() DOMException.NOT_SUPPORTED_ERR </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<script>
-
-    var description = "Test Description: " +
-                      "createEvent - DOMException NOT_SUPPORTED_ERR raises if the implementation " +
-                      "does not support the Event interface requested.";
-
-    test(function()
-    {
-        assert_throws("NOT_SUPPORTED_ERR", function()
-        {
-            document.createEvent("foo");
-        });
-    }, description);
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title> dispatchEvent() return value and Event.preventDefault() </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id=log></div>
-
-<table id="table" border="1" style="display: none">
-    <tbody id="table-body">
-    <tr id="table-row">
-        <td id="table-cell">Shady Grove</td>
-        <td>Aeolian</td>
-    </tr>
-    <tr id="parent">
-        <td id="target">Over the river, Charlie</td>
-        <td>Dorian</td>
-    </tr>
-    </tbody>
-</table>
-
-<script>
-
-    var EVENT = "foo";
-    var TARGET = document.getElementById("target");
-    var PARENT = document.getElementById("parent");
-    var DefaultPrevented = false;
-
-    var description = "Test Description: " +
-                      "dispatchEvent() return value indicates whether any of the listeners which handled the event called " +
-                      "Event.preventDefault(). If Event.preventDefault() was called the returned value must be false, else " +
-                      "it must be true.";
-
-    test(function()
-    {
-        PARENT.addEventListener(EVENT, function(e){TestEvent(e, 0)}, true);
-        TARGET.addEventListener(EVENT, function(e){TestEvent(e, 1)}, true);
-        TARGET.addEventListener(EVENT, function(e){TestEvent(e, 2)}, true);
-
-        var evt = document.createEvent("Event");
-        evt.initEvent(EVENT, true, true);
-
-        var ReturnValue1 = PARENT.dispatchEvent(evt);
-        var ReturnValue2 = TARGET.dispatchEvent(evt);
-
-        assert_array_equals([DefaultPrevented, ReturnValue1, ReturnValue2], [true, true, false]);
-
-    }, description);
-
-    function TestEvent(evt, i)
-    {
-        if (1 == i)
-        {
-            evt.preventDefault();
-            DefaultPrevented = evt.defaultPrevented;
-        }
-    }
-</script>
-</body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title id='desc'> DOMException.NOT_SUPPORTED_ERR and createEvent() </title>
-        <script type="text/javascript">
-            var PassTest = function()
-            {
-                document.getElementById("testresult").firstChild.data = "PASS";
-            }
-
-            var FailTest = function()
-            {
-                document.getElementById("testresult").firstChild.data = "FAIL";
-            }
-
-            window.onload = function()
-            {
-                try
-                {
-                    var evt = document.createEvent("foo");
-                }
-                catch(ex)
-                {
-                    if ((undefined != ex.code) && (ex instanceof DOMException) && (DOMException.NOT_SUPPORTED_ERR == ex.code))
-                    {
-                        PassTest();
-                    }
-                    else
-                    {
-                        FailTest();
-                    }
-                }
-            }
-        </script>
-    </head>
-    <body>
-        <h3>DOM Events</h3>
-        <h4>
-            Test Description: createEvent - DOMException NOT_SUPPORTED_ERR raises if the implementation
-            does not support the Event interface requested.
-        </h4>
-
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id='testresult'>FAIL</div>
-    </body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/gb18030-encoder.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/gb18030-encoder.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/gb18030-encoder.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/gb18030-encoder.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset=gb18030> <!-- if the server overrides this, it is stupid, as this is a testsuite -->
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+ function encode(input, output, desc) {
+   test(function() {
+     var a = document.createElement("a") // <a> uses document encoding for URL's query
+     a.href = "https://example.com/?" + input
+     assert_equals(a.search.substr(1), output) // remove leading "?"
+   }, "gb18030 encoder: " + desc)
+ }
+
+ encode("s", "s", "very basic")
+ encode("\u20AC", "%A2%E3", "Euro")
+ encode("\u4E02", "%81@", "character")
+ encode("\uE4C6", "%A1@", "PUA")
+ encode("\uE4C5", "%FE%FE", "PUA #2")
+ encode("\ud83d\udca9", "%949%DA3", "poo")
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/gbk-encoder.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/gbk-encoder.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/gbk-encoder.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/gbk-encoder.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset=gbk> <!-- if the server overrides this, it is stupid, as this is a testsuite -->
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+ function encode(input, output, desc) {
+   test(function() {
+     var a = document.createElement("a") // <a> uses document encoding for URL's query
+     a.href = "https://example.com/?" + input
+     assert_equals(a.search.substr(1), output) // remove leading "?"
+   }, "gbk encoder: " + desc)
+ }
+
+ encode("s", "s", "very basic")
+ encode("\u20AC", "%80", "Euro")
+ encode("\u4E02", "%81@", "character")
+ encode("\uE4C6", "%A1@", "PUA")
+ encode("\uE4C5", "%FE%FE", "PUA #2")
+ encode("\ud83d\udca9", "%26%23128169%3B", "poo")
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-decoder.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-decoder.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-decoder.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-decoder.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+ function decode(input, output, desc) {
+   test(function() {
+     var d = new TextDecoder("iso-2022-jp"),
+         buffer = new ArrayBuffer(input.length),
+         view = new Int8Array(buffer)
+     for(var i = 0, l = input.length; i < l; i++) {
+       view[i] = input[i]
+     }
+     assert_equals(d.decode(view), output)
+   }, "iso-2022-jp decoder: " + desc)
+ }
+ decode([0x1b, 0x24], "ďż˝$", "Error ESC")
+ decode([0x1b, 0x24, 0x50], "ďż˝$P", "Error ESC, character")
+ decode([0x1b, 0x28, 0x42, 0x50], "�P", "ASCII ESC, character")
+ decode([0x1b, 0x28, 0x42, 0x1b, 0x28, 0x42, 0x50], "��P", "Double ASCII ESC, character")
+ decode([0x50, 0x1b, 0x28, 0x42, 0x50], "PP", "character, ASCII ESC, character")
+ decode([0x5C, 0x5D, 0x7E], "\\]~", "characters")
+ decode([0x0D, 0x0E, 0x0F, 0x10], "\x0D��\x10", "SO / SI")
+
+ decode([0x1b, 0x28, 0x4A, 0x5C, 0x5D, 0x7E], "¥]‾", "Roman ESC, characters")
+ decode([0x1b, 0x28, 0x4A, 0x0D, 0x0E, 0x0F, 0x10], "\x0D��\x10", "Roman ESC, SO / SI")
+ decode([0x1b, 0x28, 0x4A, 0x1b, 0x1b, 0x28, 0x49, 0x50], "��", "Roman ESC, error ESC, Katakana ESC")
+
+ decode([0x1b, 0x28, 0x49, 0x50], "�", "Katakana ESC, character")
+ decode([0x1b, 0x28, 0x49, 0x1b, 0x24, 0x40, 0x50, 0x50], "�佩", "Katakana ESC, multibyte ESC, character")
+ decode([0x1b, 0x28, 0x49, 0x1b, 0x50], "��", "Katakana ESC, error ESC, character")
+ decode([0x1b, 0x28, 0x49, 0x1b, 0x24, 0x50], "�､�", "Katakana ESC, error ESC #2, character")
+ decode([0x1b, 0x28, 0x49, 0x50, 0x1b, 0x28, 0x49, 0x50], "��", "Katakana ESC, character, Katakana ESC, character")
+ decode([0x1b, 0x28, 0x49, 0x0D, 0x0E, 0x0F, 0x10], "����", "Katakana ESC, SO / SI")
+
+ decode([0x1b, 0x24, 0x40, 0x50, 0x50], "佩", "Multibyte ESC, character")
+ decode([0x1b, 0x24, 0x42, 0x50, 0x50], "佩", "Multibyte ESC #2, character")
+ decode([0x1b, 0x24, 0x42, 0x1b, 0x50, 0x50], "�佩", "Multibyte ESC, error ESC, character")
+ decode([0x1b, 0x24, 0x40, 0x1b, 0x24, 0x40], "ďż˝", "Double multibyte ESC")
+ decode([0x1b, 0x24, 0x40, 0x1b, 0x24, 0x40, 0x50, 0x50], "�佩", "Double multibyte ESC, character")
+ decode([0x1b, 0x24, 0x40, 0x1b, 0x24, 0x42, 0x50, 0x50], "�佩", "Double multibyte ESC #2, character")
+ decode([0x1b, 0x24, 0x40, 0x1b, 0x24, 0x50, 0x50], "���", "Multibyte ESC, error ESC #2, character")
+
+ decode([0x1b, 0x24, 0x40, 0x50, 0x1b, 0x24, 0x40, 0x50, 0x50], "�佩", "Multibyte ESC, single byte, multibyte ESC, character")
+ decode([0x1b, 0x24, 0x40, 0x20, 0x50], "��", "Multibyte ESC, lead error byte")
+ decode([0x1b, 0x24, 0x40, 0x50, 0x20], "ďż˝", "Multibyte ESC, trail error byte")
+
+ decode([0x50, 0x1b], "Pďż˝", "character, error ESC")
+ decode([0x50, 0x1b, 0x24], "Pďż˝$", "character, error ESC #2")
+ decode([0x50, 0x1b, 0x50], "P�P", "character, error ESC #3")
+ decode([0x50, 0x1b, 0x28, 0x42], "P", "character, ASCII ESC")
+ decode([0x50, 0x1b, 0x28, 0x4A], "P", "character, Roman ESC")
+ decode([0x50, 0x1b, 0x28, 0x49], "P", "character, Katakana ESC")
+ decode([0x50, 0x1b, 0x24, 0x40], "P", "character, Multibyte ESC")
+ decode([0x50, 0x1b, 0x24, 0x42], "P", "character, Multibyte ESC #2")
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/iso-2022-jp-encoder.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,18 @@
+<!doctype html>
+<meta charset=iso-2022-jp> <!-- if the server overrides this, it is stupid, as this is a testsuite -->
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+ function encode(input, output, desc) {
+   test(function() {
+     var a = document.createElement("a") // <a> uses document encoding for URL's query
+     a.href = "https://example.com/?" + input
+     assert_equals(a.search.substr(1), output) // remove leading "?"
+   }, "iso-2022-jp encoder: " + desc)
+ }
+
+ encode("s", "s", "very basic")
+ encode("\u00A5\u203Es\\\uFF90\u4F69", "%1B(J\\~s%1B(B\\%1B$B%_PP%1B(B", "basics")
+ encode("\x0E\x0F\x1Bx", "%0E%0F%1Bx", "SO/SI ESC")
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/resources/single-byte-raw.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/resources/single-byte-raw.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/resources/single-byte-raw.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/resources/single-byte-raw.py	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,3 @@
+def main(request, response):
+  response.headers.set("Content-Type", "text/plain;charset=" + request.GET.first("label"))
+  response.content = "".join(chr(byte) for byte in xrange(255))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/single-byte-decoder.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/single-byte-decoder.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/encoding/single-byte-decoder.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/encoding/single-byte-decoder.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,176 @@
+<!doctype html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+ // https://encoding.spec.whatwg.org/encodings.json
+ var singleByteEncodings = [{
+   "labels": [ "866", "cp866", "csibm866", "ibm866" ],
+   "name": "ibm866"
+ },{
+   "labels": [ "csisolatin2", "iso-8859-2", "iso-ir-101", "iso8859-2", "iso88592", "iso_8859-2", "iso_8859-2:1987", "l2", "latin2" ],
+   "name": "iso-8859-2"
+ },{
+   "labels": [ "csisolatin3", "iso-8859-3", "iso-ir-109", "iso8859-3", "iso88593", "iso_8859-3", "iso_8859-3:1988", "l3", "latin3" ],
+   "name": "iso-8859-3"
+ },{
+   "labels": [ "csisolatin4", "iso-8859-4", "iso-ir-110", "iso8859-4", "iso88594", "iso_8859-4", "iso_8859-4:1988", "l4", "latin4" ],
+   "name": "iso-8859-4"
+ },{
+   "labels": [ "csisolatincyrillic", "cyrillic", "iso-8859-5", "iso-ir-144", "iso8859-5", "iso88595", "iso_8859-5", "iso_8859-5:1988" ],
+   "name": "iso-8859-5"
+ },{
+   "labels": [ "arabic", "asmo-708", "csiso88596e", "csiso88596i", "csisolatinarabic", "ecma-114", "iso-8859-6", "iso-8859-6-e", "iso-8859-6-i", "iso-ir-127", "iso8859-6", "iso88596", "iso_8859-6", "iso_8859-6:1987" ],
+   "name": "iso-8859-6"
+ },{
+   "labels": [ "csisolatingreek", "ecma-118", "elot_928", "greek", "greek8", "iso-8859-7", "iso-ir-126", "iso8859-7", "iso88597", "iso_8859-7", "iso_8859-7:1987", "sun_eu_greek" ],
+   "name": "iso-8859-7"
+ },{
+   "labels": [ "csiso88598e", "csisolatinhebrew", "hebrew", "iso-8859-8", "iso-8859-8-e", "iso-ir-138", "iso8859-8", "iso88598", "iso_8859-8", "iso_8859-8:1988", "visual" ],
+   "name": "iso-8859-8"
+ },{
+   "labels": [ "csiso88598i", "iso-8859-8-i", "logical" ],
+   "name": "iso-8859-8-i"
+ },{
+   "labels": [ "csisolatin6", "iso-8859-10", "iso-ir-157", "iso8859-10", "iso885910", "l6", "latin6" ],
+   "name": "iso-8859-10"
+ },{
+   "labels": [ "iso-8859-13", "iso8859-13", "iso885913" ],
+   "name": "iso-8859-13"
+ },{
+   "labels": [ "iso-8859-14", "iso8859-14", "iso885914" ],
+   "name": "iso-8859-14"
+ },{
+   "labels": [ "csisolatin9", "iso-8859-15", "iso8859-15", "iso885915", "iso_8859-15", "l9" ],
+   "name": "iso-8859-15"
+ },{
+   "labels": [ "iso-8859-16" ],
+   "name": "iso-8859-16"
+ },{
+   "labels": [ "cskoi8r", "koi", "koi8", "koi8-r", "koi8_r" ],
+   "name": "koi8-r"
+ },{
+   "labels": [ "koi8-u" ],
+   "name": "koi8-u"
+ },{
+   "labels": [ "csmacintosh", "mac", "macintosh", "x-mac-roman" ],
+   "name": "macintosh"
+ },{
+   "labels": [ "dos-874", "iso-8859-11", "iso8859-11", "iso885911", "tis-620", "windows-874" ],
+   "name": "windows-874"
+ },{
+   "labels": [ "cp1250", "windows-1250", "x-cp1250" ],
+   "name": "windows-1250"
+ },{
+   "labels": [ "cp1251", "windows-1251", "x-cp1251" ],
+   "name": "windows-1251"
+ },{
+   "labels": [ "ansi_x3.4-1968", "ascii", "cp1252", "cp819", "csisolatin1", "ibm819", "iso-8859-1", "iso-ir-100", "iso8859-1", "iso88591", "iso_8859-1", "iso_8859-1:1987", "l1", "latin1", "us-ascii", "windows-1252", "x-cp1252" ],
+   "name": "windows-1252"
+ },{
+   "labels": [ "cp1253", "windows-1253", "x-cp1253" ],
+   "name": "windows-1253"
+ },{
+   "labels": [ "cp1254", "csisolatin5", "iso-8859-9", "iso-ir-148", "iso8859-9", "iso88599", "iso_8859-9", "iso_8859-9:1989", "l5", "latin5", "windows-1254", "x-cp1254" ],
+   "name": "windows-1254"
+ },{
+   "labels": [ "cp1255", "windows-1255", "x-cp1255" ],
+   "name": "windows-1255"
+ },{
+   "labels": [ "cp1256", "windows-1256", "x-cp1256" ],
+   "name": "windows-1256"
+ },{
+   "labels": [ "cp1257", "windows-1257", "x-cp1257" ],
+   "name": "windows-1257"
+ },{
+   "labels": [ "cp1258", "windows-1258", "x-cp1258" ],
+   "name": "windows-1258"
+ },{
+   "labels": [ "x-mac-cyrillic", "x-mac-ukrainian" ],
+   "name": "x-mac-cyrillic"
+ }],
+ // https://encoding.spec.whatwg.org/indexes.json
+     singleByteIndexes = {
+   "ibm866":[1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,9617,9618,9619,9474,9508,9569,9570,9558,9557,9571,9553,9559,9565,9564,9563,9488,9492,9524,9516,9500,9472,9532,9566,9567,9562,9556,9577,9574,9568,9552,9580,9575,9576,9572,9573,9561,9560,9554,9555,9579,9578,9496,9484,9608,9604,9612,9616,9600,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1025,1105,1028,1108,1031,1111,1038,1118,176,8729,183,8730,8470,164,9632,160],
+   "iso-8859-2":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,728,321,164,317,346,167,168,352,350,356,377,173,381,379,176,261,731,322,180,318,347,711,184,353,351,357,378,733,382,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729],
+   "iso-8859-3":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,294,728,163,164,null,292,167,168,304,350,286,308,173,null,379,176,295,178,179,180,181,293,183,184,305,351,287,309,189,null,380,192,193,194,null,196,266,264,199,200,201,202,203,204,205,206,207,null,209,210,211,212,288,214,215,284,217,218,219,220,364,348,223,224,225,226,null,228,267,265,231,232,233,234,235,236,237,238,239,null,241,242,243,244,289,246,247,285,249,250,251,252,365,349,729],
+   "iso-8859-4":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,312,342,164,296,315,167,168,352,274,290,358,173,381,175,176,261,731,343,180,297,316,711,184,353,275,291,359,330,382,331,256,193,194,195,196,197,198,302,268,201,280,203,278,205,206,298,272,325,332,310,212,213,214,215,216,370,218,219,220,360,362,223,257,225,226,227,228,229,230,303,269,233,281,235,279,237,238,299,273,326,333,311,244,245,246,247,248,371,250,251,252,361,363,729],
+   "iso-8859-5":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,173,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,8470,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,167,1118,1119],
+   "iso-8859-6":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,null,null,null,164,null,null,null,null,null,null,null,1548,173,null,null,null,null,null,null,null,null,null,null,null,null,null,1563,null,null,null,1567,null,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,null,null,null,null,null,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,null,null,null,null,null,null,null,null,null,null,null,null,null],
+   "iso-8859-7":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,8216,8217,163,8364,8367,166,167,168,169,890,171,172,173,null,8213,176,177,178,179,900,901,902,183,904,905,906,187,908,189,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,null,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,null],
+   "iso-8859-8":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,null,162,163,164,165,166,167,168,169,215,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,247,187,188,189,190,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,null,null,null,8215,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,null,null,8206,8207,null],
+   "iso-8859-10":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,274,290,298,296,310,167,315,272,352,358,381,173,362,330,176,261,275,291,299,297,311,183,316,273,353,359,382,8213,363,331,256,193,194,195,196,197,198,302,268,201,280,203,278,205,206,207,208,325,332,211,212,213,214,360,216,370,218,219,220,221,222,223,257,225,226,227,228,229,230,303,269,233,281,235,279,237,238,239,240,326,333,243,244,245,246,361,248,371,250,251,252,253,254,312],
+   "iso-8859-13":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,8221,162,163,164,8222,166,167,216,169,342,171,172,173,174,198,176,177,178,179,8220,181,182,183,248,185,343,187,188,189,190,230,260,302,256,262,196,197,280,274,268,201,377,278,290,310,298,315,352,323,325,211,332,213,214,215,370,321,346,362,220,379,381,223,261,303,257,263,228,229,281,275,269,233,378,279,291,311,299,316,353,324,326,243,333,245,246,247,371,322,347,363,252,380,382,8217],
+   "iso-8859-14":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,7682,7683,163,266,267,7690,167,7808,169,7810,7691,7922,173,174,376,7710,7711,288,289,7744,7745,182,7766,7809,7767,7811,7776,7923,7812,7813,7777,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,372,209,210,211,212,213,214,7786,216,217,218,219,220,221,374,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,373,241,242,243,244,245,246,7787,248,249,250,251,252,253,375,255],
+   "iso-8859-15":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,8364,165,352,167,353,169,170,171,172,173,174,175,176,177,178,179,381,181,182,183,382,185,186,187,338,339,376,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,253,254,255],
+   "iso-8859-16":[128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,260,261,321,8364,8222,352,167,353,169,536,171,377,173,378,379,176,177,268,322,381,8221,182,183,382,269,537,187,338,339,376,380,192,193,194,258,196,262,198,199,200,201,202,203,204,205,206,207,272,323,210,211,212,336,214,346,368,217,218,219,220,280,538,223,224,225,226,259,228,263,230,231,232,233,234,235,236,237,238,239,273,324,242,243,244,337,246,347,369,249,250,251,252,281,539,255],
+   "koi8-r":[9472,9474,9484,9488,9492,9496,9500,9508,9516,9524,9532,9600,9604,9608,9612,9616,9617,9618,9619,8992,9632,8729,8730,8776,8804,8805,160,8993,176,178,183,247,9552,9553,9554,1105,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568,9569,1025,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,169,1102,1072,1073,1094,1076,1077,1092,1075,1093,1080,1081,1082,1083,1084,1085,1086,1087,1103,1088,1089,1090,1091,1078,1074,1100,1099,1079,1096,1101,1097,1095,1098,1070,1040,1041,1062,1044,1045,1060,1043,1061,1048,1049,1050,1051,1052,1053,1054,1055,1071,1056,1057,1058,1059,1046,1042,1068,1067,1047,1064,1069,1065,1063,1066],
+   "koi8-u":[9472,9474,9484,9488,9492,9496,9500,9508,9516,9524,9532,9600,9604,9608,9612,9616,9617,9618,9619,8992,9632,8729,8730,8776,8804,8805,160,8993,176,178,183,247,9552,9553,9554,1105,1108,9556,1110,1111,9559,9560,9561,9562,9563,1169,9565,9566,9567,9568,9569,1025,1028,9571,1030,1031,9574,9575,9576,9577,9578,1168,9580,169,1102,1072,1073,1094,1076,1077,1092,1075,1093,1080,1081,1082,1083,1084,1085,1086,1087,1103,1088,1089,1090,1091,1078,1074,1100,1099,1079,1096,1101,1097,1095,1098,1070,1040,1041,1062,1044,1045,1060,1043,1061,1048,1049,1050,1051,1052,1053,1054,1055,1071,1056,1057,1058,1059,1046,1042,1068,1067,1047,1064,1069,1065,1063,1066],
+   "macintosh":[196,197,199,201,209,214,220,225,224,226,228,227,229,231,233,232,234,235,237,236,238,239,241,243,242,244,246,245,250,249,251,252,8224,176,162,163,167,8226,182,223,174,169,8482,180,168,8800,198,216,8734,177,8804,8805,165,181,8706,8721,8719,960,8747,170,186,937,230,248,191,161,172,8730,402,8776,8710,171,187,8230,160,192,195,213,338,339,8211,8212,8220,8221,8216,8217,247,9674,255,376,8260,8364,8249,8250,64257,64258,8225,183,8218,8222,8240,194,202,193,203,200,205,206,207,204,211,212,63743,210,218,219,217,305,710,732,175,728,729,730,184,733,731,711],
+   "windows-874":[8364,129,130,131,132,8230,134,135,136,137,138,139,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,152,153,154,155,156,157,158,159,160,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,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,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,null,null,null,null,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,3657,3658,3659,3660,3661,3662,3663,3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,null,null,null,null],
+   "windows-1250":[8364,129,8218,131,8222,8230,8224,8225,136,8240,352,8249,346,356,381,377,144,8216,8217,8220,8221,8226,8211,8212,152,8482,353,8250,347,357,382,378,160,711,728,321,164,260,166,167,168,169,350,171,172,173,174,379,176,177,731,322,180,181,182,183,184,261,351,187,317,733,318,380,340,193,194,258,196,313,262,199,268,201,280,203,282,205,206,270,272,323,327,211,212,336,214,215,344,366,218,368,220,221,354,223,341,225,226,259,228,314,263,231,269,233,281,235,283,237,238,271,273,324,328,243,244,337,246,247,345,367,250,369,252,253,355,729],
+   "windows-1251":[1026,1027,8218,1107,8222,8230,8224,8225,8364,8240,1033,8249,1034,1036,1035,1039,1106,8216,8217,8220,8221,8226,8211,8212,152,8482,1113,8250,1114,1116,1115,1119,160,1038,1118,1032,164,1168,166,167,1025,169,1028,171,172,173,174,1031,176,177,1030,1110,1169,181,182,183,1105,8470,1108,187,1112,1029,1109,1111,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103],
+   "windows-1252":[8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,381,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,382,376,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,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,253,254,255],
+   "windows-1253":[8364,129,8218,402,8222,8230,8224,8225,136,8240,138,8249,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,152,8482,154,8250,156,157,158,159,160,901,902,163,164,165,166,167,168,169,null,171,172,173,174,8213,176,177,178,179,900,181,182,183,904,905,906,187,908,189,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,null,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,null],
+   "windows-1254":[8364,129,8218,402,8222,8230,8224,8225,710,8240,352,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,353,8250,339,157,158,376,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,198,199,200,201,202,203,204,205,206,207,286,209,210,211,212,213,214,215,216,217,218,219,220,304,350,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,287,241,242,243,244,245,246,247,248,249,250,251,252,305,351,255],
+   "windows-1255":[8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,140,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,156,157,158,159,160,161,162,163,8362,165,166,167,168,169,215,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,247,187,188,189,190,191,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,null,1467,1468,1469,1470,1471,1472,1473,1474,1475,1520,1521,1522,1523,1524,null,null,null,null,null,null,null,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,null,null,8206,8207,null],
+   "windows-1256":[8364,1662,8218,402,8222,8230,8224,8225,710,8240,1657,8249,338,1670,1688,1672,1711,8216,8217,8220,8221,8226,8211,8212,1705,8482,1681,8250,339,8204,8205,1722,160,1548,162,163,164,165,166,167,168,169,1726,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,1563,187,188,189,190,1567,1729,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,215,1591,1592,1593,1594,1600,1601,1602,1603,224,1604,226,1605,1606,1607,1608,231,232,233,234,235,1609,1610,238,239,1611,1612,1613,1614,244,1615,1616,247,1617,249,1618,251,252,8206,8207,1746],
+   "windows-1257":[8364,129,8218,131,8222,8230,8224,8225,136,8240,138,8249,140,168,711,184,144,8216,8217,8220,8221,8226,8211,8212,152,8482,154,8250,156,175,731,159,160,null,162,163,164,null,166,167,216,169,342,171,172,173,174,198,176,177,178,179,180,181,182,183,248,185,343,187,188,189,190,230,260,302,256,262,196,197,280,274,268,201,377,278,290,310,298,315,352,323,325,211,332,213,214,215,370,321,346,362,220,379,381,223,261,303,257,263,228,229,281,275,269,233,378,279,291,311,299,316,353,324,326,243,333,245,246,247,371,322,347,363,252,380,382,729],
+   "windows-1258":[8364,129,8218,402,8222,8230,8224,8225,710,8240,138,8249,338,141,142,143,144,8216,8217,8220,8221,8226,8211,8212,732,8482,154,8250,339,157,158,376,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,258,196,197,198,199,200,201,202,203,768,205,206,207,272,209,777,211,212,416,214,215,216,217,218,219,220,431,771,223,224,225,226,259,228,229,230,231,232,233,234,235,769,237,238,239,273,241,803,243,244,417,246,247,248,249,250,251,252,432,8363,255],
+   "x-mac-cyrillic":[1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,8224,176,1168,163,167,8226,182,1030,174,169,8482,1026,1106,8800,1027,1107,8734,177,8804,8805,1110,181,1169,1032,1028,1108,1031,1111,1033,1113,1034,1114,1112,1029,172,8730,402,8776,8710,171,187,8230,160,1035,1115,1036,1116,1109,8211,8212,8220,8221,8216,8217,247,8222,1038,1118,1039,1119,8470,1025,1105,1103,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,8364]
+ }
+
+ // For TextDecoder tests
+ var buffer = ArrayBuffer(255),
+     view = Uint8Array(buffer)
+ for(var i = 0, l = view.byteLength; i < l; i++) {
+   view[i] = i
+ }
+
+ // For XMLHttpRequest and TextDecoder tests
+ function assert_decode(data, encoding) {
+   if(encoding == "iso-8859-8-i") {
+     encoding = "iso-8859-8"
+   }
+   for(var i = 0, l = data.length; i < l; i++) {
+     var cp = data.charCodeAt(i),
+         expectedCp = (i < 0x80) ? i : singleByteIndexes[encoding][i-0x80]
+     if(expectedCp == null) {
+       expectedCp = 0xFFFD
+     }
+     assert_equals(cp, expectedCp, encoding + ":" + i)
+   }
+ }
+
+ // Setting up all the tests
+ for(var i = 0, l = singleByteEncodings.length; i < l; i++) {
+   var encoding = singleByteEncodings[i]
+   for(var ii = 0, ll = encoding.labels.length; ii < ll; ii++) {
+     var label = encoding.labels[ii]
+
+     async_test(function(t) {
+       var xhr = new XMLHttpRequest,
+           name = encoding.name // need scoped variable
+       xhr.open("GET", "resources/single-byte-raw.py?label=" + label)
+       xhr.send(null)
+       xhr.onload = t.step_func_done(function() { assert_decode(xhr.responseText, name) })
+     }, encoding.name + ": " + label + " (XMLHttpRequest)")
+
+     test(function() {
+       var d = new TextDecoder(label),
+           data = d.decode(view)
+       assert_equals(d.encoding, encoding.name)
+       assert_decode(data, encoding.name)
+     }, encoding.name + ": " + label + " (TextDecoder)")
+
+     async_test(function(t) {
+       var frame = document.createElement("iframe"),
+           name = encoding.name
+       frame.src = "resources/single-byte-raw.py?label=" + label
+       frame.onload = t.step_func_done(function() { assert_equals(frame.contentDocument.characterSet, name) })
+       t.add_cleanup(function() { document.body.removeChild(frame) })
+       document.body.appendChild(frame)
+     }, encoding.name + ": " + label + " (document.characterSet)")
+   }
+ }
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-image.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-image.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-image.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-image.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
   <title>Media documents: image</title>
   <link rel="author" title="Michael Ventnor" href="mailto:mventnor@mozilla.com">
   <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-  <link rel="help" href="http://www.whatwg.org/html/#read-media">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#read-media">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-video.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-video.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-video.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-media/pageload-video.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
   <title>Media documents: video</title>
   <link rel="author" title="Michael Ventnor" href="mailto:mventnor@mozilla.com">
   <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-  <link rel="help" href="http://www.whatwg.org/html/#read-media">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#read-media">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-text/load-text-plain.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-text/load-text-plain.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-text/load-text-plain.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/read-text/load-text-plain.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Page load processing model for text files</title>
 <link rel="author" title="Ms2ger" href="ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#read-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#read-text">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/location-stringifier.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/location-stringifier.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/location-stringifier.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/location-stringifier.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Location stringifier</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://heycam.github.io/webidl/#es-stringifier">
+<link rel="help" href="https://heycam.github.io/webidl/#es-stringifier">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=/common/stringifiers.js></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/security_location_0.sub.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/security_location_0.sub.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/security_location_0.sub.htm	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/history/the-location-interface/security_location_0.sub.htm	2014-11-26 21:45:56.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Location interface Security</title>
     <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-    <link rel="help" href="http://www.w3.org/TR/html5/browsers.html#security-location" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#security-location" />
     <meta name="assert" content="access location object from different origins doesn't raise SECURITY_ERR exception" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,8 +3,8 @@
 <meta name="timeout" content="long">
 <title>Cross-origin behavior of Window and Location</title>
 <link rel="author" title="Bobby Holley (:bholley)" href="bobbyholley@gmail.com">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#security-window">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#security-location">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#security-window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#security-location">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/accessing-other-browsing-contexts/indexed-browsing-contexts-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: the browsing contexts must be sorted in the order that their containers were inserted into the Document</title>
 <link rel="author" title="Intel" href="http://www.intel.com/" />
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#accessing-other-browsing-contexts" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/browsers.html#accessing-other-browsing-contexts" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/named-objects.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: Named access on the Window object</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#named-access-on-the-window-object">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/browsers.html#named-access-on-the-window-object">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/named-access-on-the-window-object/window-null-names.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,9 +2,9 @@
 <meta charset=utf-8>
 <title>Named access with null characters</title>
 <link rel="author" title="Ms2ger" href="ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#window">
-<link rel="help" href="http://www.whatwg.org/html/#dom-window-nameditem">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#named-properties-object">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-window-nameditem">
+<link rel="help" href="https://heycam.github.io/webidl/#named-properties-object">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/security-window/window-security.sub.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/security-window/window-security.sub.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/security-window/window-security.sub.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/security-window/window-security.sub.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,12 +2,12 @@
 <meta charset="utf-8">
 <title>HTML Test: Window Security</title>
 <link rel="author" title="Intel" href="http://www.intel.com/" />
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#the-window-object" />
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#timers" />
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#atob" />
-<link rel="help" href="http://www.whatwg.org/html/#windowsessionstorage" />
-<link rel="help" href="http://www.whatwg.org/html/#windowlocalstorage" />
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#window" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/browsers.html#the-window-object" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/timers.html#timers" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/webappapis.html#atob" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowsessionstorage" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowlocalstorage" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/browsers.html#window" />
 <link rel="help" href="http://dev.w3.org/csswg/cssom/#extensions-to-the-window-interface" />
 <link rel="help" href="http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface" />
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-aliases.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-aliases.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-aliases.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-aliases.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,9 +2,9 @@
 <meta charset=utf-8>
 <title>Aliases of the window object</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-window">
-<link rel="help" href="http://www.whatwg.org/html/#dom-frames">
-<link rel="help" href="http://www.whatwg.org/html/#dom-self">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-frames">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-self">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,10 +2,10 @@
 <meta charset=utf-8>
 <title>Indexed properties of the window object (non-strict mode)</title>
 <link rel="author" title="Ms2ger" href="ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#window">
-<link rel="help" href="http://www.whatwg.org/html/#dom-window-item">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#getownproperty">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#defineownproperty">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-window-item">
+<link rel="help" href="https://heycam.github.io/webidl/#getownproperty">
+<link rel="help" href="https://heycam.github.io/webidl/#defineownproperty">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties-strict.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties-strict.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties-strict.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-indexed-properties-strict.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,10 +2,10 @@
 <meta charset=utf-8>
 <title>Indexed properties of the window object (strict mode)</title>
 <link rel="author" title="Ms2ger" href="ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#window">
-<link rel="help" href="http://www.whatwg.org/html/#dom-window-item">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#getownproperty">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#defineownproperty">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-window-item">
+<link rel="help" href="https://heycam.github.io/webidl/#getownproperty">
+<link rel="help" href="https://heycam.github.io/webidl/#defineownproperty">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-named-properties.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-named-properties.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-named-properties.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-named-properties.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,9 +3,9 @@
 <title>Changes to named properties of the window object</title>
 <link rel="author" title="Ms2ger" href="ms2ger@gmail.com">
 <link rel="author" title="Boris Zbarsky" href="bzbarsky@mit.edu">
-<link rel="help" href="http://www.whatwg.org/html/#window">
-<link rel="help" href="http://www.whatwg.org/html/#dom-window-nameditem">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#named-properties-object">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-window-nameditem">
+<link rel="help" href="https://heycam.github.io/webidl/#named-properties-object">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-properties.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-properties.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-properties.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-properties.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,15 +3,15 @@
 <title>Properties of the window object</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
 <link rel="help" href="http://ecma-international.org/ecma-262/5.1/#sec-15.1">
-<link rel="help" href="http://heycam.github.io/webidl/#interface-prototype-object">
-<link rel="help" href="http://heycam.github.io/webidl/#es-attributes">
-<link rel="help" href="http://heycam.github.io/webidl/#es-operations">
-<link rel="help" href="http://dom.spec.whatwg.org/#eventtarget">
-<link rel="help" href="http://www.whatwg.org/html/#window">
-<link rel="help" href="http://www.whatwg.org/html/#windowtimers">
-<link rel="help" href="http://www.whatwg.org/html/#windowbase64">
-<link rel="help" href="http://www.whatwg.org/html/#windowsessionstorage">
-<link rel="help" href="http://www.whatwg.org/html/#windowlocalstorage">
+<link rel="help" href="https://heycam.github.io/webidl/#interface-prototype-object">
+<link rel="help" href="https://heycam.github.io/webidl/#es-attributes">
+<link rel="help" href="https://heycam.github.io/webidl/#es-operations">
+<link rel="help" href="https://dom.spec.whatwg.org/#eventtarget">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowtimers">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowbase64">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowsessionstorage">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#windowlocalstorage">
 <link rel="help" href="https://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#dom-window-getselection">
 <link rel="help" href="http://dev.w3.org/csswg/cssom/#widl-def-Window">
 <link rel="help" href="http://dev.w3.org/csswg/cssom-view/#widl-def-Window">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-prototype-chain.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-prototype-chain.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-prototype-chain.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/browsers/the-window-object/window-prototype-chain.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,10 +2,10 @@
 <meta charset=utf-8>
 <title>Prototype chain of the window object</title>
 <link rel="author" title="Ms2ger" href="ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#window">
-<link rel="help" href="http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#eventtarget">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#interface-prototype-object">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#named-properties-object">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#window">
+<link rel="help" href="https://dom.spec.whatwg.org/#eventtarget">
+<link rel="help" href="https://heycam.github.io/webidl/#interface-prototype-object">
+<link rel="help" href="https://heycam.github.io/webidl/#named-properties-object">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-getter.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <title>Document.body</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-body">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-body">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script>
-</script>
 <div id="log"></div>
 <script>
 function createDocument() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.body-setter-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>Setting document.body to incorrect values</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-body">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#es-interface">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-body">
+<link rel="help" href="https://heycam.github.io/webidl/#es-interface">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.embeds-document.plugins-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document.embeds and document.plugins</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-embeds">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-plugins">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-embeds">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-plugins">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Document.getElementsByClassName-null-undef.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>getElementsByClassName and null/undefined</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-getelementsbyclassname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-getelementsbyclassname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByClassName-same.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Calling getElementsByClassName with the same argument</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-getelementsbyclassname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-getelementsbyclassname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>getElementsByName and case</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-case.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>getElementsByName and case</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>getElementsByName and ids</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-id.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>getElementsByName and ids</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-interface.html	2014-11-26 21:45:56.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>Document.getElementsByName: interfaces</title>
+<link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  var collection = document.getElementsByName("name");
+  assert_class_string(collection, "NodeList");
+  assert_true(collection instanceof NodeList, "Should be a NodeList");
+  assert_false(collection instanceof HTMLCollection,
+               "Should not be a HTMLCollection");
+});
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>getElementsByName and foreign namespaces</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-namespace.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>getElementsByName and foreign namespaces</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>getElementsByName and newly introduced HTML elements</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-newelements.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>getElementsByName and newly introduced HTML elements</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Calling getElementsByName with null and undefined</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="help" href="https://heycam.github.io/webidl/#es-DOMString">
 <link rel="help" href="http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf#page=57">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-null-undef.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>Calling getElementsByName with null and undefined</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-getelementsbyname"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname"/>
 <link rel="help" href="https://heycam.github.io/webidl/#es-DOMString"/>
 <link rel="help" href="http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf#page=57"/>
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>getElementsByName and the param element</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-param.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>getElementsByName and the param element</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Calling getElementsByName with the same argument</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-getelementsbyname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-getelementsbyname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>document.head</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-head">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-head">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-02.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.head-02.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>document.head</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-head">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-head">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>document.title with head blown away</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#document.title">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-02.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>document.title with head blown away</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#document.title"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-03.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-03.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title> document.title  and space normalization  </title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#document.title">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-04.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title> document.title  and space normalization  </title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#document.title"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title"/>
 <link rel="stylesheet" href="/resources/testharness.css"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-05.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-05.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-05.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-05.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>document.title and White_Space characters</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#document.title">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-06.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-06.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-06.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-06.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>document.title and the empty string</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#document.title">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title">
 <meta name="assert" content="On setting document.title to the empty string, no text node must be created.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-07.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-07.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-07.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-07.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,25 +2,10 @@
 <title>Document.title and DOMImplementation.createHTMLDocument</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/dom/nodes/DOMImplementation-createHTMLDocument.js"></script>
 <div id="log"></div>
 <script>
-function checkDoc(title, expectedtitle, normalizedtitle) {
-  test(function() {
-    var doc = document.implementation.createHTMLDocument(title);
-    assert_equals(doc.title, normalizedtitle)
-  })
-}
-checkDoc("", "", "")
-checkDoc(null, "null", "null")
-checkDoc(undefined, "", "")
-checkDoc("foo  bar baz", "foo  bar baz", "foo bar baz")
-checkDoc("foo\t\tbar baz", "foo\t\tbar baz", "foo bar baz")
-checkDoc("foo\n\nbar baz", "foo\n\nbar baz", "foo bar baz")
-checkDoc("foo\f\fbar baz", "foo\f\fbar baz", "foo bar baz")
-checkDoc("foo\r\rbar baz", "foo\r\rbar baz", "foo bar baz")
-
-test(function() {
-  var doc = document.implementation.createHTMLDocument()
-  assert_equals(doc.title, "")
-}, "Missing title argument");
+createHTMLDocuments(function(doc, expectedtitle, normalizedtitle) {
+  assert_equals(doc.title, normalizedtitle)
+})
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-08.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-08.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-08.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/document.title-08.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/#document.title">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.title">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/Element.getElementsByClassName-null-undef.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>getElementsByClassName and null/undefined</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-getelementsbyclassname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-getelementsbyclassname">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Named items: img id &amp; name</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-nameditem">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-nameditem">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-02.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Named items: iframes</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-nameditem">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-nameditem">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-03.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-03.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Named items: applets</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-nameditem">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-nameditem">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-04.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Named items: forms</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-nameditem">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-nameditem">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-05.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Named items: embeds</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-nameditem">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-nameditem">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/dom-tree-accessors/nameditem-06.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Named items: imgs</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-nameditem">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-nameditem">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>document.compatMode: Standards</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-compatmode">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-compatmode">
 <body>
 <div id="log"></div>
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-02.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <title>document.compatMode: Almost standards</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-compatmode">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-compatmode">
 <body>
 <div id="log"></div>
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-03.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,6 +1,6 @@
 <title>document.compatMode: Quirks</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-compatmode">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-compatmode">
 <body>
 <div id="log"></div>
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-04.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
 <title>document.compatMode: Standards</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-compatmode"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-compatmode"/>
 </head>
 <body>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-05.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <head>
 <title>document.compatMode: Standards</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-compatmode"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-compatmode"/>
 </head>
 <body>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-compatmode-06.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>document.compatMode: Standards</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-compatmode"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-compatmode"/>
 </head>
 <body>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-cookie.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-cookie.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-cookie.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-cookie.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>document.cookie</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#resource-metadata-management">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#resource-metadata-management">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>document.lastModified</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#resource-metadata-management">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#resource-metadata-management">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-readyState.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-readyState.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-readyState.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-readyState.html	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>document.readyState</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#resource-metadata-management">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#resource-metadata-management">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
@@ -22,8 +22,7 @@
     t2.done();
   });
 
-  var states = [document.readyState],
-  loop = true;
+  var states = [document.readyState];
   document.onreadystatechange = t3.step_func(function(){
     states.push(document.readyState);
     if (document.readyState === "complete") {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/closing-the-input-stream/document.close-01.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>document.close in XHTML</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#closing-the-input-stream"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#closing-the-input-stream"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>document.write in XHTML</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#document.write%28%29"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.write%28%29"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-02.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-write/document.write-02.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document.write and null/undefined</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-write%28%29">
-<link rel="help" href="http://www.whatwg.org/html5/#documents-in-the-dom">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-write%28%29">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#documents-in-the-dom">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-01.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>document.writeln in XHTML</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#document.writeln%28%29"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document.writeln%28%29"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-02.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/document-writeln/document.writeln-02.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document.writeln and null/undefined</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-writeln%28%29">
-<link rel="help" href="http://www.whatwg.org/html5/#documents-in-the-dom">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-writeln%28%29">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#documents-in-the-dom">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-01.xhtml	2014-11-26 21:45:56.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>document.open in XHTML</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#opening-the-input-stream"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#opening-the-input-stream"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-02.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>document.open with three arguments</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-open">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-open">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>document.open and singleton replacement</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-open">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-open">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/elements-in-the-dom/unknown-element.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/elements-in-the-dom/unknown-element.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/elements-in-the-dom/unknown-element.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/elements-in-the-dom/unknown-element.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>HTMLUnknownElement</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#htmlunknownelement">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#htmlunknownelement">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/classlist-nonstring.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/classlist-nonstring.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/classlist-nonstring.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/classlist-nonstring.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <title>classList: non-string contains</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#classes">
-<link rel="help" href="http://www.whatwg.org/html5/#domtokenlist">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#es-DOMString">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#classes">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#domtokenlist">
+<link rel="help" href="https://heycam.github.io/webidl/#es-DOMString">
 <link rel="help" href="http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf#page=57">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring bdi elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring bdi elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring bdi elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-bdi-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring bdi elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir_auto-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-dir-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text while ignoring contained elements with an explicit dir of their own.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, including text within contained elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, including text within contained elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, including text within contained elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, including text within contained elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant script elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant script elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant script elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-script-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant script elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant style elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant style elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant style elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-style-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant style elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant textarea elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant textarea elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant textarea elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-contained-textarea-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of descendant text while ignoring descendant textarea elements.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-EN-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-EN-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value, or to LTR if there is no such
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value, or to LTR if there is no such
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-EN-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-N-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-EN-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value, or to LTR if there is no such
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value, or to LTR if there is no such
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-EN-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-N-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-input-script-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,7 @@
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction of an input element is set according to
       the first strong character of its value.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, but the element behaves externally as a neutral character.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-isolate-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, but the element behaves externally as a neutral character.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, ignoring neutrals and numbers.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, ignoring neutrals and numbers.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-EN-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-L-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-N-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-mixed.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-pre-mixed-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-between-Rs.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-pre-N-between-Rs-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-pre-N-EN.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-pre-N-EN-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-R-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-mixed.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-textarea-mixed-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-between-Rs.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-textarea-N-between-Rs-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-N-EN.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-textarea-N-EN-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-mixed.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-textarea-script-mixed-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-textarea-script-N-between-Rs-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-EN.html	2014-11-26 21:45:56.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="dir_auto-textarea-script-N-EN-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-dir-attribute" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute" />
     <link rel="help" href="http://dev.w3.org/csswg/css3-writing-modes/#unicode-bidi0" />
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/document-dir.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/document-dir.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/document-dir.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/document-dir.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html dir="LTR">
 <title>document.dir</title>
-<link rel="help" href="http://www.whatwg.org/html/#dom-document-dir">
-<link rel="help" href="http://www.whatwg.org/html/#reflect">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-dir">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#reflect">
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-attribute.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-attribute.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-attribute.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-attribute.html	2014-11-26 21:45:56.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
 <title>The id attribute</title>
 <meta charset=utf8>
-<link rel="help" href="http://www.w3.org/TR/html5/global-attributes.html#the-id-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-id-attribute">
 <style>
 
 #abcd {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-name.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-name.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-name.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/id-name.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>id and name attributes and getElementById</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-id-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-id-attribute">
 <link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Languages</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-lang-and-xml:lang-attributes">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes">
 <link tel="help" href="http://www.w3.org/TR/CSS2/selector.html#lang">
 <meta name="flags" content="css21">
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xmllang-01-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Languages</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-lang-and-xml:lang-attributes">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes">
 <link tel="help" href="http://www.w3.org/TR/CSS2/selector.html#lang">
 <meta name="flags" content="css21">
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xyzzy.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xyzzy.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xyzzy.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/lang-xyzzy.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Invalid languages</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-lang-and-xml:lang-attributes">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes">
 <link tel="help" href="http://www.w3.org/TR/CSS2/selector.html#lang">
 <meta name="flags" content="css21">
 <style>:lang(xyzzy) { color: green; }</style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>The style attribute</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-style-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-attribute">
 <link rel="help" href="http://www.w3.org/TR/css-style-attr/#syntax">
 <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order">
 <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#specificity">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01-ref.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/style-01-ref.html	2014-11-26 21:45:56.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>The style attribute</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-style-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-attribute">
 <link rel="help" href="http://www.w3.org/TR/css-style-attr/#syntax">
 <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#cascading-order">
 <link rel="help" href="http://www.w3.org/TR/CSS21/cascade.html#specificity">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-001.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-001.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>lang attribute in html tag</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-002.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-002.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>xml:lang attribute in html tag</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-003.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>HTTP header</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-004.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-004.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-004.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-004.html	2014-11-26 21:45:56.000000000 +0000
@@ -5,7 +5,7 @@
  <meta http-equiv="Content-Language" content="ko" >
 <title>pragma-set default</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-005.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>HTTP header and html lang</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-006.html	2014-11-26 21:45:56.000000000 +0000
@@ -5,7 +5,7 @@
  <meta http-equiv="Content-Language" content="ko" >
 <title>HTTP header and meta element</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-007.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-007.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-007.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-007.html	2014-11-26 21:45:56.000000000 +0000
@@ -5,7 +5,7 @@
  <meta http-equiv="Content-Language" content="zh" >
 <title>html lang and meta elements</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-008.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-008.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-008.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-008.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>lang="..." vs lang=""</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-009.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>lang="" vs HTTP</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-010.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-010.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-010.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-lang-attribute-010.html	2014-11-26 21:45:56.000000000 +0000
@@ -5,7 +5,7 @@
  <meta http-equiv="Content-Language" content="ko" >
 <title>lang="" vs meta Content-Language</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-lang-and-xml:lang-attributes'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-lang-and-xml:lang-attributes'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-007.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-007.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-007.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-007.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>no translate attribute</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-translate-attribute'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-translate-attribute'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type='text/css'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-008.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-008.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-008.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-008.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>translate=yes</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-translate-attribute'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-translate-attribute'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type='text/css'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-009.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-009.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-009.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-009.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>translate=no</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-translate-attribute'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-translate-attribute'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type='text/css'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-010.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-010.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-010.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-010.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>translate inherits no</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-translate-attribute'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-translate-attribute'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type='text/css'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-011.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-011.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-011.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-011.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>translate=yes inside translate=no</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-translate-attribute'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-translate-attribute'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type='text/css'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-012.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-012.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-012.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements/global-attributes/the-translate-attribute-012.html	2014-11-26 21:45:56.000000000 +0000
@@ -4,7 +4,7 @@
 <meta charset="utf-8"/>
 <title>translate=""</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/dom.html#the-translate-attribute'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-translate-attribute'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style type='text/css'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements-embedded.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements-embedded.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements-embedded.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements-embedded.js	2014-11-26 21:45:56.000000000 +0000
@@ -8,7 +8,8 @@
 		crossOrigin: {type: "enum", keywords: ["", "anonymous", "use-credentials"]},
 		useMap: "string",
 		isMap: "boolean",
-		// TODO: width/height reflect for setting, but not for getting.
+		width: {type: "unsigned long", customGetter: true},
+		height: {type: "unsigned long", customGetter: true},
 
 		// Obsolete
 		name: "string",
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements-forms.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements-forms.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/elements-forms.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/elements-forms.js	2014-11-26 21:45:56.000000000 +0000
@@ -51,7 +51,7 @@
 		placeholder: "string",
 		readOnly: "boolean",
 		required: "boolean",
-		// http://www.whatwg.org/html/#attr-input-size
+		// https://html.spec.whatwg.org/multipage/#attr-input-size
 		size: {type: "limited unsigned long", defaultVal: 20},
 		src: "url",
 		step: "string",
@@ -97,7 +97,9 @@
 	},
 	option: {
 		disabled: "boolean",
+		label: {type: "string", customGetter: true},
 		defaultSelected: {type: "boolean", domAttrName: "selected"},
+		value: {type: "string", customGetter: true},
 	},
 	textarea: {
 		// TODO: autocomplete is special.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/interfaces.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/interfaces.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/interfaces.html	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/interfaces.html	2014-11-26 21:45:56.000000000 +0000
@@ -3193,6 +3193,7 @@
 }, {explicit_done:true});
 window.onload = function() {
 	idlArray.add_objects({
+		NodeList: ['document.getElementsByName("name")'],
 		HTMLAllCollection: ['document.all'],
 		HTMLFormControlsCollection: ['document.createElement("form").elements'],
 		RadioNodeList: [],
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/reflection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/reflection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/dom/reflection.js	2014-11-14 09:37:21.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/dom/reflection.js	2014-11-26 21:45:56.000000000 +0000
@@ -153,12 +153,6 @@
  * TODO: Test IDL sets of integer types to out-of-range or other weird values.
  * WebIDL says to wrap, but I'm not sure offhand if that's what we want.
  *
- * TODO: Check the parsing of leading whitespace of all sorts for numeric
- * types.  The spec is currently wrong, so I've commented all those tests out:
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=12296
- * http://www.w3.org/Bugs/Public/show_bug.cgi?id=12220
- * Will fix and uncomment once the bugs are resolved.
- *
  * TODO: tokenlist, settable tokenlist, limited
  */
 
@@ -328,17 +322,13 @@
         "domTests": [-36, -1, 0, 1, maxInt, minInt, maxInt + 1, minInt - 1,
                      maxUnsigned, maxUnsigned + 1, "", "-1", "-0", "0", "1",
                      " " + binaryString + " foo ",
-                     // Test various different whitespace.  The spec currently says only
-                     // 20, 9, A, C, and D are whitespace.  JavaScript includes many
-                     // more, including all Zs characters in Unicode 3.0.0.  All the
-                     // following should parse as 0 if the character is recognized as
-                     // whitespace, 7 otherwise.  But the spec is wrong (see TODO
-                     // above), so these are commented out for now.
-                     //"\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
-                     //"\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
-                     //"\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
-                     //"\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
-                     //"\u30007",
+                     // Test various different whitespace. Only 20, 9, A, C,
+                     // and D are whitespace.
+                     "\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
+                     "\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
+                     "\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
+                     "\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
+                     "\u30007",
                      undefined, 1.5, true, false, {"test": 6}, NaN, +Infinity,
                      -Infinity, "\0",
                      {toString:function() {return 2;}, valueOf: null},
@@ -373,11 +363,11 @@
         "domTests": [minInt - 1, minInt, -36, -1, -0, 0, 1, maxInt, maxInt + 1,
                      maxUnsigned, maxUnsigned + 1, "", "-1", "-0", "0", "1",
                      " " + binaryString + " foo ",
-                     //"\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
-                     //"\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
-                     //"\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
-                     //"\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
-                     //"\u30007",
+                     "\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
+                     "\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
+                     "\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
+                     "\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
+                     "\u30007",
                      undefined, 1.5, true, false, {"test": 6}, NaN, +Infinity,
                      -Infinity, "\0",
                      {toString:function() {return 2;}, valueOf: null},
@@ -409,11 +399,11 @@
         "defaultVal": 0,
         "domTests": [minInt - 1, minInt, -36,  -1,   0, 1, 257, maxInt,
                      maxInt + 1, maxUnsigned, maxUnsigned + 1, "", "-1", "-0", "0", "1",
-                     //"\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
-                     //"\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
-                     //"\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
-                     //"\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
-                     //"\u30007",
+                     "\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
+                     "\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
+                     "\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
+                     "\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
+                     "\u30007",
                      " " + binaryString + " foo ", undefined, 1.5, true, false,
                      {"test": 6}, NaN, +Infinity, -Infinity, "\0",
                      {toString:function() {return 2;}, valueOf: null},
@@ -450,11 +440,11 @@
         "defaultVal": 1,
         "domTests": [minInt - 1, minInt, -36,  -1,   0,    1, maxInt,
                      maxInt + 1, maxUnsigned, maxUnsigned + 1, "", "-1", "-0", "0", "1",
-                     //"\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
-                     //"\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
-                     //"\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
-                     //"\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
-                     //"\u30007",
+                     "\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
+                     "\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
+                     "\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
+                     "\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
+                     "\u30007",
                      " " + binaryString + " foo ", undefined, 1.5, true, false,
                      {"test": 6}, NaN, +Infinity, -Infinity, "\0",
                      {toString:function() {return 2;}, valueOf: null},
@@ -499,11 +489,11 @@
         "defaultVal": 0.0,
         "domTests": [minInt - 1, minInt, -36, -1, 0, 1, maxInt,
             maxInt + 1, maxUnsigned, maxUnsigned + 1, "",
-            //"\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
-            //"\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
-            //"\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
-            //"\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
-            //"\u30007",
+            "\u00097", "\u000B7", "\u000C7", "\u00207", "\u00A07", "\uFEFF7",
+            "\u000A7", "\u000D7", "\u20287", "\u20297", "\u16807", "\u180E7",
+            "\u20007", "\u20017", "\u20027", "\u20037", "\u20047", "\u20057",
+            "\u20067", "\u20077", "\u20087", "\u20097", "\u200A7", "\u202F7",
+            "\u30007",
             " " + binaryString + " foo ", undefined, 1.5, true, false,
             {"test": 6}, NaN, +Infinity, -Infinity, "\0",
             {toString:function() {return 2;}, valueOf: null},
@@ -511,11 +501,11 @@
         "domExpected": [minInt - 1, minInt, -36, -1, 0, 1, maxInt,
                         maxInt + 1, maxUnsigned, maxUnsigned + 1, null,
                         // Leading whitespace tests
-                        //7, null, 7, 7, null, null,
-                        //7, 7, null, null, null, null,
-                        //null, null, null, null, null, null,
-                        //null, null, null, null, null, null,
-                        //null,
+                        7, null, 7, 7, null, null,
+                        7, 7, null, null, null, null,
+                        null, null, null, null, null, null,
+                        null, null, null, null, null, null,
+                        null,
                         // End leading whitespace tests
                         null, null, 1.5, null, null,
                         null, null, null, null, null,
@@ -695,31 +685,28 @@
         idlIdlExpected = idlIdlExpected.filter(function(element, index, array) { return idlIdlExpected[index] < 1000; });
     }
 
-    for (var i = 0; i < domTests.length; i++) {
-        if (domExpected[i] === null) {
-            // If you follow all the complicated logic here, you'll find that
-            // this will only happen if there's no expected value at all (like
-            // for tabIndex, where the default is too complicated).  So skip
-            // the test.
-            continue;
-        }
-        try {
-            domObj.setAttribute(domName, domTests[i]);
-            // setAttribute() followed by getAttribute() should always return
-            // the same thing.  TODO: Except that null should be cast to "" not
-            // "null", but that's not specced, so let's just not test it.
-            if (domTests[i] !== null) {
-                ReflectionHarness.test(domObj.getAttribute(domName), domTests[i] + "", "setAttribute() to " + ReflectionHarness.stringRep(domTests[i]) + " followed by getAttribute()");
+    if (!data.customGetter) {
+        for (var i = 0; i < domTests.length; i++) {
+            if (domExpected[i] === null) {
+                // If you follow all the complicated logic here, you'll find that
+                // this will only happen if there's no expected value at all (like
+                // for tabIndex, where the default is too complicated).  So skip
+                // the test.
+                continue;
             }
-            ReflectionHarness.test(idlObj[idlName], domExpected[i], "setAttribute() to " + ReflectionHarness.stringRep(domTests[i]) + " followed by IDL get");
-            if (ReflectionHarness.catchUnexpectedExceptions) {
-                ReflectionHarness.success();
-            }
-        } catch (err) {
-            if (ReflectionHarness.catchUnexpectedExceptions) {
-                ReflectionHarness.failure("Exception thrown during tests with setAttribute() to " + ReflectionHarness.stringRep(domTests[i]));
-            } else {
-                throw err;
+            try {
+                domObj.setAttribute(domName, domTests[i]);
+                ReflectionHarness.test(domObj.getAttribute(domName), domTests[i] + "", "setAttribute() to " + ReflectionHarness.stringRep(domTests[i]) + " followed by getAttribute()");
+                ReflectionHarness.test(idlObj[idlName], domExpected[i], "setAttribute() to " + ReflectionHarness.stringRep(domTests[i]) + " followed by IDL get");
+                if (ReflectionHarness.catchUnexpectedExceptions) {
+                    ReflectionHarness.success();
+                }
+            } catch (err) {
+                if (ReflectionHarness.catchUnexpectedExceptions) {
+                    ReflectionHarness.failure("Exception thrown during tests with setAttribute() to " + ReflectionHarness.stringRep(domTests[i]));
+                } else {
+                    throw err;
+                }
             }
         }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dragevent-interface/dragevent-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: DragEvent</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#dndevents'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#dndevents'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-draggable-attribute/draggable_attribute.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: draggable_attribute</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.whatwg.org/html/#the-draggable-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-draggable-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src='/html/semantics/interfaces.js'></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_file_type-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_data_item_file_type</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_file-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_data_item_kind_file</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_kind_string-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_data_item_kind_string</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_data_item_string_type-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_data_item_string_type</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <meta name="flags" content="may">
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element_dbcs-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_inputbox_element_dbcs</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_inputbox_element-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_inputbox_element</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_link_element-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_element_link</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_COpy-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_case_insensitive_COpy</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_linK-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_case_insensitive_linK</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_String_-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_case_insensitive_String</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_case_insensitive_STRING-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_case_insensitive_STRING</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_copy-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_copy</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_foo-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_foo</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_link-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_link</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_move-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_move</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_bar_move-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_multiple_values_foo_bar_move</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_foo_link-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_multiple_values_foo_link</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_multiple_values_move_copy-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_multiple_values_move_copy</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_not_specified-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_not_specified</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/dnd/the-dropzone-attribute/dropzone_attribute_value_unordered_unique_space_separated-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset='utf-8'>
     <title>HTML Test: dropzone_attribute_value_unordered_unique_space_separated</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
-    <link rel='help' href='http://www.w3.org/html/wg/drafts/html/CR/editing.html#the-dropzone-attribute'>
+    <link rel='help' href='https://html.spec.whatwg.org/multipage/#the-dropzone-attribute'>
     <script src='/resources/testharness.js'></script>
     <script src='/resources/testharnessreport.js'></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>contentEditable setter: invalid value</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#contenteditable">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#contenteditable">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
  <head>
   <title>Editing: contentEditable attribute test</title>
   <link rel="author" title="Baidu" href="mailto: guopengcheng@baidu.com"/>
-  <link rel="help" href="http://www.w3.org/TR/html5/editing.html#contenteditable"/>
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#contenteditable"/>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/making-entire-documents-editable-the-designmode-idl-attribute/user-interaction-editing-designMode.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
  <head>
   <title>Editing: designMode attribute test</title>
   <link rel="author" title="Baidu" href="mailto: guopengcheng@baidu.com"/>
-  <link rel="help" href="http://www.w3.org/TR/html5/editing.html#making-entire-documents-editable:-the-designmode-idl-attribute"/>
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#making-entire-documents-editable:-the-designmode-idl-attribute"/>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/editing-0/spelling-and-grammar-checking/user-interaction-editing-spellcheck.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
  <head>
   <title>Editing: spellcheck attribute test</title>
   <link rel="author" title="Baidu" href="mailto: guopengcheng@baidu.com"/>
-  <link rel="help" href="http://www.w3.org/TR/html5/editing-apis.html#spelling-and-grammar-checking"/>
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#spelling-and-grammar-checking"/>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
  </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/document-level-focus-apis/document-level-apis.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/document-level-focus-apis/document-level-apis.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/document-level-focus-apis/document-level-apis.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/document-level-focus-apis/document-level-apis.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - document-level APIs</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#document-level-focus-apis">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#document-level-focus-apis">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/focus-01-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/focus-01-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/focus-01-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/focus-01-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - key events</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#focus">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#focus">
 <meta assert="flag" content="interact">
 <meta assert="assert" content="Check if the key events received by document are targeted at the element when it is focused">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/focus-02-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/focus-02-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/focus-02-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/focus-02-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - key events</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#focus">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#focus">
 <meta assert="flag" content="interact">
 <meta assert="assert" content="Check if the key events received by document are targeted at the element when no element is focused">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/focus-management/focus-events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/focus-management/focus-events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/focus-management/focus-events.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/focus-management/focus-events.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Focus management</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#focus-management">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#focus-management">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-default-value.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - default value of tabindex</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#sequential-focus-navigation-and-the-tabindex-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#sequential-focus-navigation-and-the-tabindex-attribute">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-negative-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - negative tabindex</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#sequential-focus-navigation-and-the-tabindex-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#sequential-focus-navigation-and-the-tabindex-attribute">
 <meta assert="flag" content="interact">
 <meta assert="assert" content="Check if the tabindex attribute controls whether an element is supposed to be focusable">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - the sequential focus navigation order</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#sequential-focus-navigation-and-the-tabindex-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#sequential-focus-navigation-and-the-tabindex-attribute">
 <meta assert="flag" content="interact">
 <meta assert="assert" content="Check the sequential focus navigation order">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-positive-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - positive tabindex</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#sequential-focus-navigation-and-the-tabindex-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#sequential-focus-navigation-and-the-tabindex-attribute">
 <meta assert="flag" content="interact">
 <meta assert="assert" content="Check if the tabindex attribute controls whether an element is supposed to be focusable">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-zero-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
 <meta charset="utf-8">
 <title>HTML Test: focus - zero tabindex</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/editing.html#sequential-focus-navigation-and-the-tabindex-attribute">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#sequential-focus-navigation-and-the-tabindex-attribute">
 <meta assert="flag" content="interact">
 <meta assert="assert" content="Check if the tabindex attribute controls whether an element is supposed to be focusable">
 <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1a.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1a.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1a.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1a.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <p>This line should be visible.
 <p hidden>This line should not be visible.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1b.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1b.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1b.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1b.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <style>
 p { display: none; }
 [hidden] { display: block; }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1c.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1c.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1c.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1c.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <p hidden>This line should be visible.
 <p>This line should not be visible.
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1d.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1d.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1d.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1d.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <p hidden>This line should be visible.
 <p>This line should not be visible.
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1e.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1e.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1e.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1e.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <style>
 p { display: block; }
 </style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1f.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1f.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1f.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1f.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <style>
 p { display: block !important; }
 </style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1g.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1g.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1g.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-1g.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>The hidden attribute</title>
 <link rel=author title=Ms2ger href=mailto:Ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html/#the-hidden-attribute>
-<link rel=help href=http://www.whatwg.org/html/#hidden-elements>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-hidden-attribute>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#hidden-elements>
 <p>This line should be visible.
 <p hidden=hidden>This line should not be visible.
 <p hidden=blue>This line should not be visible.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-2.svg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-2.svg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-2.svg	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/editing/the-hidden-attribute/hidden-2.svg	2014-11-26 21:45:57.000000000 +0000
@@ -3,9 +3,9 @@
   <link xmlns="http://www.w3.org/1999/xhtml" rel="author" title="Ms2ger"
         href="mailto:Ms2ger@gmail.com"/>
   <link xmlns="http://www.w3.org/1999/xhtml" rel="help"
-        href="http://www.whatwg.org/html/#the-hidden-attribute"/>
+        href="https://html.spec.whatwg.org/multipage/#the-hidden-attribute"/>
   <link xmlns="http://www.w3.org/1999/xhtml" rel="help"
-        href="http://www.whatwg.org/html/#hidden-elements"/>
+        href="https://html.spec.whatwg.org/multipage/#hidden-elements"/>
 </metadata>
 <rect hidden="" height="20" width="20"/>
 </svg>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: the HTMLFormControlsCollection interface</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#htmlformcontrolscollection">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/common-dom-interfaces.html#htmlformcontrolscollection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmloptionscollection.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <title>HTMLOptionsCollection</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="http://www.w3.org/TR/html5/common-dom-interfaces.html#htmloptionscollection-0">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#htmloptionscollection-0">
 <select id=a>
   <option>1</option>
   <option>2</option>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/radionodelist.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: the RadioNodeList interface</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#radionodelist">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/common-dom-interfaces.html#radionodelist">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/conformance-requirements/extensibility/foreign.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/conformance-requirements/extensibility/foreign.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/conformance-requirements/extensibility/foreign.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/conformance-requirements/extensibility/foreign.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8" foo='bar'>
     <title id='title' foo='bar'>Foreign content</title>
     <link rel="author" title="Philippe Le Hegaret" href="mailto:plh@w3.org"  foo='bar'>
-    <link rel="help" href="http://www.w3.org/TR/html5/infrastructure.html#extensibility"  foo='bar'>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#extensibility"  foo='bar'>
     <script src="/resources/testharness.js"  foo='bar'></script>
     <script src="/resources/testharnessreport.js" foo='bar'></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/terminology/plugins/text-plain.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/terminology/plugins/text-plain.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/terminology/plugins/text-plain.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/terminology/plugins/text-plain.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title id='title'>Media Types</title>
     <link rel="author" title="Philippe Le Hegaret" href="mailto:plh@w3.org"/>
-    <link rel="help" href="http://www.w3.org/TR/html5/infrastructure.html#plugins"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#plugins"/>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.xhtml	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/urls/dynamic-changes-to-base-urls/dynamic-urls.sub.xhtml	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
   <head>
     <title>HTML Test: Dynamic changes to base URLs</title>
     <link rel="author" title="Intel" href="http://www.intel.com/"/>
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/infrastructure.html#dynamic-changes-to-base-urls" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dynamic-changes-to-base-urls" />
     <script src="/resources/testharness.js" id="s1"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js	2014-11-26 21:45:57.000000000 +0000
@@ -48,7 +48,7 @@
 
   // background attribute, check with getComputedStyle
   function test_background(tag) {
-    var spec_url = 'http://www.whatwg.org/specs/web-apps/current-work/multipage/rendering.html';
+    var spec_url = 'https://html.spec.whatwg.org/multipage/multipage/rendering.html';
     spec_url += tag == 'body' ? '#the-page' : '#tables';
     test(function() {
       var elm = document.createElement(tag);
@@ -81,7 +81,7 @@
       var got = elm[idlAttr];
       assert_true(got.indexOf(expected_current) > -1, msg(expected_current, got));
     }, 'Getting <'+tag+'>.'+idlAttr + (multiple ? ' (multiple URLs)' : ''),
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes'});
   }
 
   ('iframe src, a href, base href, link href, img src, embed src, object data, track src, video src, audio src, input src, form action, ' +
@@ -120,7 +120,7 @@
       elm.click();
       // check that navigation succeeded by ...??? XXX
     }, 'follow hyperlink <'+tag+' href>',
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#following-hyperlinks'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/links.html#following-hyperlinks'});
   }
 
   'a, area, link'.split(', ').forEach(function(str) {
@@ -143,7 +143,7 @@
       // check that the right URL was requested for the ping
       poll_for_stash(this, uuid, expected_current);
     }, 'hyperlink auditing <'+tag+' ping>',
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#hyperlink-auditing'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/links.html#hyperlink-auditing'});
   }
 
   'a, area'.split(', ').forEach(function(str) {
@@ -169,7 +169,7 @@
       assert_equals(got, expected_current);
     });
   }, 'meta refresh',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#attr-meta-http-equiv-refresh'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/semantics.html#attr-meta-http-equiv-refresh'});
 
   // loading html (or actually svg to support <embed>)
   function test_load_nested_browsing_context(tag, attr, spec_url) {
@@ -191,10 +191,10 @@
   }
 
   spec_url_load_nested_browsing_context = {
-    frame:'http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#process-the-frame-attributes',
-    iframe:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-iframe-element.html#process-the-iframe-attributes',
-    object:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-iframe-element.html#the-object-element',
-    embed:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-iframe-element.html#the-embed-element-setup-steps'
+    frame:'https://html.spec.whatwg.org/multipage/multipage/obsolete.html#process-the-frame-attributes',
+    iframe:'https://html.spec.whatwg.org/multipage/multipage/the-iframe-element.html#process-the-iframe-attributes',
+    object:'https://html.spec.whatwg.org/multipage/multipage/the-iframe-element.html#the-object-element',
+    embed:'https://html.spec.whatwg.org/multipage/multipage/the-iframe-element.html#the-embed-element-setup-steps'
   };
 
   'frame src, iframe src, object data, embed src'.split(', ').forEach(function(str) {
@@ -217,8 +217,8 @@
       assert_equals(elm.sheet.cssRules[0].style.content, '"'+expected_current+'"', 'sheet.cssRules[0].style.content');
     });
   }, 'loading css <link>',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#the-link-element',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#styling']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/semantics.html#the-link-element',
+         'https://html.spec.whatwg.org/multipage/multipage/semantics.html#styling']});
 
   // loading js
   async_test(function() {
@@ -229,7 +229,7 @@
       assert_equals(window.test_load_js_got, expected_current);
     });
   }, 'loading js <script>',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/scripting-1.html#prepare-a-script'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/scripting-1.html#prepare-a-script'});
 
   // loading image
   function test_load_image(tag, attr, spec_url) {
@@ -279,11 +279,11 @@
   })();
 
   var spec_url_load_image = {
-    img:'http://www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content-1.html#update-the-image-data',
-    embed:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-iframe-element.html#the-embed-element-setup-steps',
-    object:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-iframe-element.html#the-object-element',
-    input:'http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#image-button-state-(type=image)',
-    video:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#poster-frame'
+    img:'https://html.spec.whatwg.org/multipage/multipage/embedded-content-1.html#update-the-image-data',
+    embed:'https://html.spec.whatwg.org/multipage/multipage/the-iframe-element.html#the-embed-element-setup-steps',
+    object:'https://html.spec.whatwg.org/multipage/multipage/the-iframe-element.html#the-object-element',
+    input:'https://html.spec.whatwg.org/multipage/multipage/states-of-the-type-attribute.html#image-button-state-(type=image)',
+    video:'https://html.spec.whatwg.org/multipage/multipage/the-video-element.html#poster-frame'
   };
 
   'img src, embed src, object data, input src, video poster'.split(', ').forEach(function(str) {
@@ -327,7 +327,7 @@
         assert_equals(got, query_to_video_duration[expected_current], msg(expected_current, video_duration_to_query[got]));
       });
     }, 'loading video <'+tag+'>' + (use_source_element ? '<source>' : ''),
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#concept-media-load-algorithm'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/the-video-element.html#concept-media-load-algorithm'});
   }
 
   var query_to_video_duration = {
@@ -363,7 +363,7 @@
       assert_equals(got, expected_current);
     });
   }, 'loading webvtt <track>',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#track-url'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/the-video-element.html#track-url'});
 
   // XXX downloading seems hard to automate
   // <a href download>
@@ -405,7 +405,7 @@
         assert_equals(got, expected_current);
       });
     }, 'submit form <'+tag+' '+attr+'>',
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#concept-form-submit'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/association-of-controls-and-forms.html#concept-form-submit'});
   }
 
   'form action, input formaction, button formaction'.split(', ').forEach(function(str) {
@@ -431,9 +431,9 @@
       assert_true(got_a_href.indexOf(expected_current) > -1, msg(expected_current, got_a_href), 'a.href');
     });
   }, '<base href>',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#set-the-frozen-base-url',
-  'http://dom.spec.whatwg.org/#dom-node-baseuri',
-  'http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-a-element']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/semantics.html#set-the-frozen-base-url',
+  'https://dom.spec.whatwg.org/#dom-node-baseuri',
+  'https://html.spec.whatwg.org/multipage/multipage/text-level-semantics.html#the-a-element']});
 
   // XXX itemid is exposed in JSON drag-and-drop but seems hard to automate
 
@@ -447,7 +447,7 @@
       assert_not_equals(got, undefined, 'itemValue not supported');
       assert_true(got.indexOf(expected_current) > -1, msg(expected_current, got));
     }, 'microdata values <'+tag+' '+attr+'>',
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html#concept-property-value'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/microdata.html#concept-property-value'});
   }
 
   'audio src, embed src, iframe src, img src, source src, track src, video src, a href, area href, link href, object data'.split(', ').forEach(function(str) {
@@ -464,7 +464,7 @@
       assert_equals(e.data, expected_current);
     });
   }, 'Worker constructor',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-worker'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-worker'});
 
   // SharedWorker()
   async_test(function() {
@@ -473,7 +473,7 @@
       assert_equals(e.data, expected_current);
     });
   }, 'SharedWorker constructor',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-sharedworker'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-sharedworker'});
 
   // EventSource()
   async_test(function() {
@@ -485,7 +485,7 @@
       assert_equals(e.data, expected_current);
     });
   }, 'EventSource constructor',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html#dom-eventsource'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/comms.html#dom-eventsource'});
 
   // EventSource#url
   test(function() {
@@ -494,7 +494,7 @@
     var got = source.url;
     assert_true(source.url.indexOf(expected_current) > -1, msg(expected_current, got));
   }, 'EventSource#url',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html#dom-eventsource'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/comms.html#dom-eventsource'});
 
   // XMLDocument#load()
   async_test(function() {
@@ -504,7 +504,7 @@
       assert_equals(doc.documentElement.textContent, expected_current);
     });
   }, 'XMLDocument#load()',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/dom.html#dom-xmldocument-load'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/dom.html#dom-xmldocument-load'});
 
   // window.open
   async_test(function() {
@@ -524,7 +524,7 @@
       }
     });
   }, 'window.open()',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#dom-open'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/browsers.html#dom-open'});
 
   // location
   function test_location(func, desc) {
@@ -543,7 +543,7 @@
         }
       });
     }, desc,
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/history.html#the-location-interface'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/history.html#the-location-interface'});
   }
   [[function(win, input) { win.location = input; }, "location [PutForwards]"],
    [function(win, input) { win.location.assign(input); }, "location.assign()"],
@@ -572,7 +572,7 @@
       }
     });
   }, 'location.search',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/history.html#the-location-interface',
+  {help:['https://html.spec.whatwg.org/multipage/multipage/history.html#the-location-interface',
          'http://url.spec.whatwg.org/#dom-url-search']});
 
   // a.search, area.search
@@ -587,7 +587,7 @@
       var got_search = elm.search;
       assert_true(got_search.indexOf(expected_current) > -1, 'getting .search '+msg(expected_current, got_search));
     }, '<'+tag+'>.search',
-    {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-'+tag+'-element',
+    {help:['https://html.spec.whatwg.org/multipage/multipage/text-level-semantics.html#the-'+tag+'-element',
            'http://url.spec.whatwg.org/#dom-url-search']});
   }
   'a, area'.split(', ').forEach(function(str) {
@@ -611,7 +611,7 @@
         assert_equals(got.indexOf('/resources/resources/'), -1, 'url was resolved against the iframe\'s URL instead of the settings object\'s API base URL');
       });
     }, 'history.'+prop,
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/history.html#dom-history-'+prop.toLowerCase()});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/history.html#dom-history-'+prop.toLowerCase()});
   }
 
   'pushState, replaceState'.split(', ').forEach(function(str) {
@@ -692,7 +692,7 @@
     });
     xhr.send();
   }, 'XMLHttpRequest#open()',
-  {help:'http://xhr.spec.whatwg.org/#the-open()-method'});
+  {help:'https://xhr.spec.whatwg.org/#the-open()-method'});
 
   // in a worker
   async_test(function() {
@@ -701,8 +701,8 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'importScripts() in a dedicated worker',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#set-up-a-worker-script-settings-object',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-workerglobalscope-importscripts']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/workers.html#set-up-a-worker-script-settings-object',
+         'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-workerglobalscope-importscripts']});
 
   async_test(function() {
     var worker = new Worker(input_url_worker_worker);
@@ -710,8 +710,8 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'Worker() in a dedicated worker',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#set-up-a-worker-script-settings-object',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-worker']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/workers.html#set-up-a-worker-script-settings-object',
+         'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-worker']});
 
   async_test(function() {
     var worker = new Worker(input_url_worker_sharedworker);
@@ -719,8 +719,8 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'SharedWorker() in a dedicated worker',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#set-up-a-worker-script-settings-object',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-sharedworker']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/workers.html#set-up-a-worker-script-settings-object',
+         'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-sharedworker']});
 
   async_test(function() {
     var worker = new SharedWorker(input_url_sharedworker_importScripts);
@@ -728,8 +728,8 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'importScripts() in a shared worker',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#set-up-a-worker-script-settings-object',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-workerglobalscope-importscripts']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/workers.html#set-up-a-worker-script-settings-object',
+         'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-workerglobalscope-importscripts']});
 
   async_test(function() {
     var worker = new SharedWorker(input_url_sharedworker_worker);
@@ -737,8 +737,8 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'Worker() in a shared worker',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#set-up-a-worker-script-settings-object',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-worker']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/workers.html#set-up-a-worker-script-settings-object',
+         'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-worker']});
 
   async_test(function() {
     var worker = new SharedWorker(input_url_sharedworker_sharedworker);
@@ -746,8 +746,8 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'SharedWorker() in a shared worker',
-  {help:['http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#set-up-a-worker-script-settings-object',
-         'http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#dom-sharedworker']});
+  {help:['https://html.spec.whatwg.org/multipage/multipage/workers.html#set-up-a-worker-script-settings-object',
+         'https://html.spec.whatwg.org/multipage/multipage/workers.html#dom-sharedworker']});
 
   // WebSocket()
   async_test(function(){
@@ -759,7 +759,7 @@
       assert_equals(e.data, expected_utf8);
     });
   }, 'WebSocket constructor',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/network.html#parse-a-websocket-url\'s-components'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/network.html#parse-a-websocket-url\'s-components'});
 
   // WebSocket#url
   test(function(){
@@ -768,7 +768,7 @@
     var got = ws.url;
     assert_true(ws.url.indexOf(expected_utf8) > -1, msg(expected_utf8, got));
   }, 'WebSocket#url',
-  {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/network.html#dom-websocket-url'});
+  {help:'https://html.spec.whatwg.org/multipage/multipage/network.html#dom-websocket-url'});
 
   // Parsing cache manifest
   function test_cache_manifest(mode) {
@@ -782,7 +782,7 @@
       });
       poll_for_stash(this, uuid, expected_utf8);
     }, 'Parsing cache manifest (' + mode + ')',
-    {help:'http://www.whatwg.org/specs/web-apps/current-work/multipage/offline.html#parse-a-manifest'});
+    {help:'https://html.spec.whatwg.org/multipage/multipage/offline.html#parse-a-manifest'});
   }
 
   'CACHE, FALLBACK, NETWORK'.split(', ').forEach(function(str) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document: fg/bg/link/vlink/alink-color</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-fgcolor">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-body-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-fgcolor">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-body-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document: fg/bg/link/vlink/alink-color</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-fgcolor">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-body-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-fgcolor">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-body-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document: fg/bg/link/vlink/alink-color</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-fgcolor">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-body-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-fgcolor">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-body-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>document: fg/bg/link/vlink/alink-color</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-document-fgcolor">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-body-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-document-fgcolor">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-body-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>HTMLHeadingElement: obsolete attribute reflecting</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-hx-align">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#es-DOMString">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-hx-align">
+<link rel="help" href="https://heycam.github.io/webidl/#es-DOMString">
 <link rel="help" href="http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf#page=57">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>event and htmlFor IDL attributes of HTMLScriptElement</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-script-event">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-script-htmlfor">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-script-event">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-script-htmlfor">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-down-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-direction-down</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="assert" content="Check if the marquee direction is from top to bottom">
 <p>Test passes if the text "Test Marquee" moves from top to bottom.</p>
 <marquee direction="down">Test Marquee</marquee>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-left-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-direction-left</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="assert" content="Check if the marquee direction is from right to left">
 <p>Test passes if the text "Test Marquee" moves from right to left.</p>
 <marquee direction="left">Test Marquee</marquee>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-right-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-direction-right</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="assert" content="Check if the marquee direction is from left to right">
 <p>Test passes if the text "Test Marquee" moves from left to right.</p>
 <marquee direction="right">Test Marquee</marquee>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-direction-up-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-direction-up</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="assert" content="Check if the marquee direction is from bottom to top">
 <p>Test passes if the text "Test Marquee" moves from bottom to top.</p>
 <marquee direction="up">Test Marquee</marquee>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-events.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-events</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-loop.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-loop</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount-effect.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-scrollamount-effect</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="assert" content="Check the effect of scrollamount attribute">
 <p>Test passes if the text "Test2" moves faster than the text "Test1".</p>
 <marquee id="test1">Test1</marquee>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrollamount.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-scrollamount</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-scrolldelay.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-scrolldelay</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-start.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-start</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="flags" content="interact">
 <meta name="assert" content="Check the start operation of HTMLMarqueeElement interface">
 <h2>Steps:</h2>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/obsolete/requirements-for-implementations/the-marquee-element-0/marquee-stop.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: marquee-stop</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/obsolete.html#the-marquee-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/obsolete.html#the-marquee-element">
 <meta name="flags" content="interact">
 <meta name="assert" content="Check the stop operation of HTMLMarqueeElement interface">
 <h2>Steps:</h2>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>The figure element</title>
 <link rel=author title=Ms2ger href=ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html5/#the-figure-element>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-figure-element>
 <figure>
 <figcaption>Caption</figcaption>
 Figure
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>The figure element</title>
 <link rel=author title=Ms2ger href=ms2ger@gmail.com>
-<link rel=help href=http://www.whatwg.org/html5/#the-figure-element>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#the-figure-element>
 <style>
 body > div { margin: 1em 40px; }
 </style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-auto.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-fixed.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-iframe-percentage.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-auto.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-fixed.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-img-percentage.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-auto.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-fixed.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-percentage.html	2014-11-26 21:45:57.000000000 +0000
@@ -19,8 +19,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html	2014-11-26 21:45:57.000000000 +0000
@@ -16,8 +16,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/rendering/replaced-elements/tools/gen-svgsizing-tests.py	2014-11-26 21:45:57.000000000 +0000
@@ -23,8 +23,8 @@
     </style>
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width">
     <link rel="help" href="http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-height">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#replaced-elements">
-    <link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/#attr-dim-width">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#replaced-elements">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-dim-width">
     <link rel="help" href="http://www.w3.org/TR/SVG/coords.html#ViewportSpace">
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/disabled-elements/disabledElement.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/disabled-elements/disabledElement.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/disabled-elements/disabledElement.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/disabled-elements/disabledElement.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Disabled elements</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.whatwg.org/html/#disabled-elements">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#disabled-elements">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/styling/LinkStyle.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/styling/LinkStyle.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/styling/LinkStyle.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/styling/LinkStyle.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>HTML Test: Styling</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#styling">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#styling">
     <link id="style1" rel="text" title="Intel" href="./support/unmatch.css">
     <link id="style2" rel="alternate stylesheet" type="text/css" title="" href="./support/emptytitle.css">
     <link id="style3" rel="alternate stylesheet" type="text/css" href="./support/notitle.css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_empty.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_empty.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_empty.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_empty.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: base_href_empty</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-base-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-base-element">
 <base id="base" href="" target="_blank">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_specified.sub.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: base_href_specified</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-base-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-base-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <base id="base" href="http://{{domains[www]}}:{{ports[http][0]}}">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_href_unspecified.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: base_href_unspecified</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-base-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-base-element">
 <base id="base" target="_blank">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_multiple.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_multiple.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_multiple.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-base-element/base_multiple.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: base_multiple</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-base-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-base-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <body onload="on_load()">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-rellist.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-rellist.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-rellist.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-rellist.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <title>link.relList: non-string contains</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-link-element">
-<link rel="help" href="http://www.whatwg.org/html5/#domtokenlist">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#ecmascript-binding">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-link-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#domtokenlist">
+<link rel="help" href="https://heycam.github.io/webidl/#ecmascript-binding">
 <link rel="help" href="http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf#page=57">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>link: error events</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-link-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-link-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-meta-element/the-lang-attribute-012.html	2014-11-26 21:45:57.000000000 +0000
@@ -5,7 +5,7 @@
  <meta http-equiv="Content-Language" content="ko,zh,ja" >
 <title>Multiple languages in Content-Language meta element</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/document-metadata.html#pragma-directives'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#pragma-directives'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='dom'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_disabled.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_disabled.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_disabled.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_disabled.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>HTML Test: The style should not be applied if it is disabled</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-style-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style-error-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style-error-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style-error-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style-error-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>style: error events</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#the-style-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_events.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_events.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>HTML Test: The style events</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-style-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_media.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_media.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_media.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_media.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <title>HTML Test: The style information must be applied to the environment specified by the media attribute</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#attr-style-media">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-style-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-style-media">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_scoped.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_scoped.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_scoped.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-style-element/style_scoped.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <title>HTML Test: The scoped attribute must apply the style information only to its parent element</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#attr-style-scoped">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/document-metadata.html#the-style-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-style-scoped">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-style-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>title.text with comment and element children.</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-title-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-title-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-02.xhtml	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>title.text with comment and element children.</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-title-text"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-title-text"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-03.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-03.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title> title.text  and space normalization  </title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-title-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-title-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/document-metadata/the-title-element/title.text-04.xhtml	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title> title.text  and space normalization  </title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com"/>
-<link rel="help" href="http://www.whatwg.org/html5/#dom-title-text"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-title-text"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/edits/the-del-element/del_effect.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/edits/the-del-element/del_effect.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/edits/the-del-element/del_effect.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/edits/the-del-element/del_effect.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=UTF-8>
 <title>HTML Test: Text in the del element should be 'line-through'</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/TR/2012/CR-html5-20121217/edits.html#the-del-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-del-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/edits/the-ins-element/ins_effect.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/edits/the-ins-element/ins_effect.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/edits/the-ins-element/ins_effect.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/edits/the-ins-element/ins_effect.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=UTF-8>
 <title>HTML Test: Text in the ins element should be 'underline'</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/TR/2012/CR-html5-20121217/edits.html#the-ins-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ins-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_controls_present-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_controls_present.html</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-controls" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-controls" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the controls attribute is present in the audio element that expecting the user agent exposes a controller user interface" />
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_base.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_base.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_base.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_base.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_loop_base</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-loop" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-loop" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if audio.loop is set to true that expecting the seeking event is fired more than once" />
     <meta name=timeout content=long>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_current_media_controller-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_current_media_controller-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_current_media_controller-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_loop_current_media_controller-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_loop_current_media_controller</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-loop" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-loop" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the audio element has a current media controller that expecting the loop attribute has no effect" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_overriding_volume-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_muted_overriding_volume</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-muted" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-muted" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the muted attribute is present in the audio element with volume is set to loudest that expecting the user hears no sound" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_muted_present-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_muted_present</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-muted" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-muted" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the muted attribute is present in the audio element that expecting the user hears no sound" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_check.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_check.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_check.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_check.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_volume_check</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-volume" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-volume" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check that audio.volume returns the value of the muted content attribute" />
     <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_loudest-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_volume_loudest</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-volume" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-volume" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the volume attribute is set to 1.0 as loudest in the audio element that expecting the user hears sound loudly" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/audio_volume_silent-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Audio Test: audio_volume_silent</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-volume" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-volume" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the volume attribute is set to 0.0 as silent in the audio element that expecting the user hears no sound" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_canplaythrough_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_loadstart_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_canplaythrough.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_pause_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_playing_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_play_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_progress_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_loadstart.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#dom-media-networkstate">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#dom-media-networkstate">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_during_progress.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#dom-media-networkstate">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#dom-media-networkstate">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_initial.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_initial.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_initial.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/networkState_initial.html	2014-11-26 21:45:57.000000000 +0000
@@ -6,7 +6,7 @@
   <script src="/resources/testharnessreport.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#dom-media-networkstate">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#dom-media-networkstate">spec reference</a></p>
   <audio id="a">
   </audio>
   <video id="v">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_false_during_play.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/paused_true_during_pause.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" controls>
   </audio>
   <video id="v" controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/preload_reflects_none_autoplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -6,7 +6,7 @@
   <script src="/resources/testharnessreport.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#dom-media-preload">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#dom-media-preload">spec reference</a></p>
   <audio id="audio" autoplay preload="none">
   </audio>
   <video id="video" autoplay preload="none">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplay.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_during_playing.html	2014-11-26 21:45:57.000000000 +0000
@@ -7,7 +7,7 @@
   <script src="/common/media.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#mediaevents">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#mediaevents">spec reference</a></p>
   <audio id="a" autoplay controls>
   </audio>
   <video id="v" autoplay controls>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_initial.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_initial.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_initial.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/readyState_initial.html	2014-11-26 21:45:57.000000000 +0000
@@ -6,7 +6,7 @@
   <script src="/resources/testharnessreport.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#dom-media-networkstate">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#dom-media-networkstate">spec reference</a></p>
   <audio id="a">
   </audio>
   <video id="v">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/src_reflects_attribute_not_source_elements.html	2014-11-26 21:45:57.000000000 +0000
@@ -6,7 +6,7 @@
   <script src="/resources/testharnessreport.js"></script>
  </head>
  <body>
-  <p><a href="http://dev.w3.org/html5/spec/Overview.html#dom-media-src">spec reference</a></p>
+  <p><a href="https://html.spec.whatwg.org/multipage/#dom-media-src">spec reference</a></p>
   <audio id="audio" src="foo">
    <source src="barbaz" />
   </audio>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-api-texttracks.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Track element - text tracks API test</title>
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#text-track-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#text-track-api">
 <link rel="author" title="Hyunjin Cho">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_controls_present-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_controls_present.html</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-controls" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-controls" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the controls attribute is present in the video element that expecting the user agent exposes a controller user interface" />
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_base.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_base.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_base.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_base.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_loop_base</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-loop" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-loop" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if video.loop is set to true that expecting the seeking event is fired more than once" />
     <meta name=timeout content=long>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_current_media_controller-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_current_media_controller-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_current_media_controller-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_loop_current_media_controller-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_loop_current_media_controller</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-loop" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-loop" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the video element has a current media controller that expecting the loop attribute has no effect" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_overriding_volume-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_muted_overriding_volume</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-muted" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-muted" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the muted attribute is present in the video element with volume is set to loudest that expecting the user hears no sound" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_muted_present-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_muted_present</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-muted" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-muted" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the muted attribute is present in the video element that expecting the user hears no sound" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_check.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_check.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_check.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_check.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_volume_check</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-volume" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-volume" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check that video.volume returns the value of the muted content attribute" />
     <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_loudest-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_volume_loudest</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-volume" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-volume" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the volume attribute is set to 1.0 as loudest in the video element that expecting the user hears sound loudly" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/media-elements/video_volume_silent-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Video Test: video_volume_silent</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/single-page.html#dom-media-volume" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-volume" />
     <meta name="flags" content="" />
     <meta name="assert" content="Check if the volume attribute is set to 0.0 as silent in the video element that expecting the user hears no sound" />
     <script src="/common/media.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-area-element/area-stringifier.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-area-element/area-stringifier.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-area-element/area-stringifier.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-area-element/area-stringifier.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>HTMLAreaElement stringifier</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://heycam.github.io/webidl/#es-stringifier">
+<link rel="help" href="https://heycam.github.io/webidl/#es-stringifier">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=/common/stringifiers.js></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_001.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_001.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_001.htm	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_001.htm	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
   <title>HTML5 Media Elements: Content inside the 'audio' element is not shown to the user (image).</title>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
   <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-  <link rel="help" href="http://www.w3.org/TR/html5/video.html#audio" />
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#audio" />
   <link rel="match" href="audio_content-ref.htm" />
   <meta name="assert" content="Content inside the 'audio' element is not shown to the user (image)." />
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_002.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_002.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_002.htm	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-audio-element/audio_002.htm	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
   <title>HTML5 Media Elements: Content inside the 'audio' element is not shown to the user.</title>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
   <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-  <link rel="help" href="http://www.w3.org/TR/html5/video.html#audio" />
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#audio" />
   <link rel="match" href="audio_content-ref.htm" />
   <meta name="assert" content="Content inside the 'audio' element is not shown to the user." />
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html	2014-11-26 21:45:57.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>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-dimension.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: dimension</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#the-embed-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-embed-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: The embed element without src and type attributes represents nothing</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#the-embed-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-embed-element">
 <link rel="match" href="embed-represent-nothing-ref.html">
 <meta name="assert" content="Check if the embed element without src and type attributes represents nothing">
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-02.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: The embed element represents nothing when its type and src attributs are removed</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#the-embed-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-embed-element">
 <link rel="match" href="embed-represent-nothing-ref.html">
 <meta name="assert" content="Check if the embed element represents nothing when its src and type attributes are removed">
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-03.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: The embed element represents nothing when it has a media ancestor</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#the-embed-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-embed-element">
 <link rel="match" href="embed-represent-nothing-ref.html">
 <meta name="assert" content="Check if the embed element represents nothing when it has a media ancestor">
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-embed-element/embed-represent-nothing-04.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: The embed element represents nothing when it has an object ancestor</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#the-embed-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-embed-element">
 <link rel="match" href="embed-represent-nothing-ref.html">
 <meta name="assert" content="Check if the embed element represents nothing when it has a object ancestor that is not showing its fallback content">
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_javascript_url_01.htm	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,55 @@
+<!DOCTYPE html><html><head><title>javascript: URL creating a document in an about:blank iframe</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-iframe-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/embedded-content.html#process-the-iframe-attributes">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#process-the-iframe-attributes">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log">FAILED (test did not run)</div>
+
+<iframe src="about:blank" name="ifr1"></iframe>
+<iframe src="" name="ifr2"></iframe>
+<iframe src="./" name="ifr3"></iframe>
+
+<script>
+var test = async_test();
+var results = {};
+var expected = {
+    ifr1:{url:"about:blank", sameDom: true},
+    ifr2:{url:"about:blank", sameDom: true},
+    ifr3:{url: location.href.replace(/\/[^\/]*$/, '/'), sameDom: true },
+    ifr4:{url:"about:blank", sameDom: true}
+}
+
+var js_url = 'javascript:"<html><script>var sameDom = false; try{var cn = top.document.body.className;sameDom = true;}catch(e){}; parent.postMessage( {url: document.URL, name: name, sameDom: sameDom}, \'*\')<\/script><body><p>JS-generated document</p></body></<html>";'
+window.addEventListener('message', function(e){
+    var ifr = e.data.name;
+    results[ifr] = e.data;
+    test.step(function(){
+        assert_equals(results[ifr].url, expected[ifr].url);
+        assert_equals(results[ifr].sameDom, expected[ifr].sameDom);
+    }, 'Testing URL and details of IFRAME ' + ifr);
+    if(Object.keys(results).length === Object.keys(expected).length){
+        test.done();
+    }
+}, false);
+
+var ifr = document.createElement('iframe');
+ifr.name = 'ifr4';
+document.body.appendChild(ifr);
+
+window.onload = function () {
+    for (var i = 0, frame, frames = document.getElementsByTagName('iframe'); frame = frames[i]; i++) {
+        try{
+            frame.src = js_url;
+        }catch(e){
+            results[frame.name] = 'Exception on setting!';
+        }
+    };
+}
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="uft-8">
 <title>HTML Test: iframe_sandbox_allow_scripts</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#attr-iframe-sandbox">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#the-iframe-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>moving modified IFRAME in document (original page about:blank, DOM modification)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://html.spec.whatwg.org/#iframe-load-event-steps">
+<iframe src="about:blank"></iframe>
+<div id="target"></div>
+<script>
+onload = function() {
+  var ifr = document.getElementsByTagName('iframe')[0];
+  ifr.contentDocument.body.appendChild(ifr.contentDocument.createElement('p')).textContent = 'Modified document';
+  setTimeout(function() {
+    ifr.onload = function() {
+      assert_equals(ifr.contentDocument.body.textContent.indexOf('Modified'), -1);
+      done();
+    };
+    document.getElementById('target').appendChild(ifr);
+  }, 100);
+}
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>moving modified IFRAME in document (original page about:blank, document.write modification)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://html.spec.whatwg.org/#iframe-load-event-steps">
+<iframe src="about:blank"></iframe>
+<div id="target"></div>
+<script>
+onload = function() {
+  var ifr = document.getElementsByTagName('iframe')[0];
+  ifr.contentDocument.open();
+  ifr.contentDocument.write('Modified document');
+  ifr.contentDocument.close();
+  setTimeout(function() {
+    ifr.onload = function() {
+        assert_equals(ifr.contentDocument.body.textContent.indexOf('Modified'), -1);
+        done();
+    };
+    document.getElementById('target').appendChild(ifr);
+  }, 100);
+}
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_03.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>moving modified IFRAME in document (original page from server, DOM modification)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://html.spec.whatwg.org/#iframe-load-event-steps">
+<iframe src="support/blank.htm"></iframe>
+<div id="target"></div>
+<script>
+onload = function() {
+  var ifr = document.getElementsByTagName('iframe')[0];
+  ifr.contentDocument.body.appendChild(ifr.contentDocument.createElement('p')).textContent = 'Modified document';
+  setTimeout(function() {
+    ifr.onload = function() {
+      assert_equals(ifr.contentDocument.body.textContent.indexOf('Modified'), -1);
+      done();
+    };
+    document.getElementById('target').appendChild(ifr);
+  }, 100);
+}
+</script>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>moving modified IFRAME in document (original page from server, document.write modification)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://html.spec.whatwg.org/#iframe-load-event-steps">
+<iframe src="support/blank.htm"></iframe>
+<div id="target"></div>
+<script>
+onload = function(){
+  var ifr = document.getElementsByTagName('iframe')[0];
+  ifr.contentDocument.open();
+  ifr.contentDocument.write('Modified document');
+  ifr.contentDocument.close();
+  setTimeout(function() {
+    ifr.onload = function () {
+      assert_equals(ifr.contentDocument.body.textContent.indexOf('Modified'), -1);
+      done();
+    };
+    document.getElementById('target').appendChild(ifr);
+  }, 100);
+}
+</script>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm	2014-11-26 21:45:57.000000000 +0000
@@ -0,0 +1 @@
+<html></html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/img.complete.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/img.complete.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/img.complete.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-img-element/img.complete.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <title>DOM img complete Test</title>
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <link rel="author" title="Anselm Hannemann" href="http://anselm-hannemann.com/" />
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/embedded-content-0.html#dom-img-complete" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-img-complete" />
 <meta name="assert" content="Tests the complete status of the img-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -44,7 +44,7 @@
     t.done();
   });
 
-  // http://www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content-1.html#update-the-image-data
+  // https://html.spec.whatwg.org/multipage/multipage/embedded-content-1.html#update-the-image-data
   // says to "await a stable state" before fetching so we use a separate <script>
   imageInstance.src = 'image-1.jpg?pipe=trickle(d1)&nocache=' + Math.random(); // make sure the image isn't in cache
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_image.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_image.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_image.htm	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_image.htm	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <title>HTML5 Media Elements: Content inside the 'video' element is not shown to the user.</title>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
     <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-    <link rel="help" href="http://www.w3.org/TR/html5/video.html#video" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#video" />
     <link rel="match" href="video_content-ref.htm" />
     <meta name="assert" content="Content inside the 'video' element is not shown to the user (image)." />
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_text.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_text.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_text.htm	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_content_text.htm	2014-11-26 21:45:57.000000000 +0000
@@ -4,7 +4,7 @@
     <title>HTML5 Media Elements: Content inside the 'video' element is not shown to the user.</title>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
     <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-    <link rel="help" href="http://www.w3.org/TR/html5/video.html#video" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#video" />
     <link rel="match" href="video_content-ref.htm" />
     <meta name="assert" content="Content inside the 'video' element is not shown to the user." />
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=UTF-8>
 <title>The 'HTMLVideoElement' interface supports setting 'poster' to an absolute URL</title>
 <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
-<link rel="help" href="http://www.whatwg.org/html/#dom-video-poster">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-video-poster">
 <link rel="match" href="video_dynamic_poster-ref.htm">
 <meta name="assert" content="The 'HTMLVideoElement' interface supports setting 'poster' to an absolute URL">
 <video id="video0">Your browser does not support video.</video>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=UTF-8>
 <title>The 'HTMLVideoElement' interface supports setting 'poster' to a relative URL</title>
 <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
-<link rel="help" href="http://www.whatwg.org/html/#dom-video-poster">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-video-poster">
 <link rel="match" href="video_dynamic_poster-ref.htm">
 <meta name="assert" content="The 'HTMLVideoElement' interface supports setting 'poster' to a relative URL">
 <video id="video0">Your browser does not support video.</video>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=UTF-8>
 <title>Video elements should initially be paused</title>
 <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
-<link rel="help" href="http://www.whatwg.org/html/#dom-media-paused">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-paused">
 <script src="/common/media.js"></script>
 <style>
 div#video {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video_initially_paused-ref.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=UTF-8>
 <title>Video elements should initially be paused</title>
 <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
-<link rel="help" href="http://www.whatwg.org/html/#dom-media-paused">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-media-paused">
 <script src="/common/media.js"></script>
 <p>The following video element should be paused. (All clocks at zero).</p>
 <img src='/images/movie_300_frame_0.png'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video-tabindex.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video-tabindex.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video-tabindex.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-video-element/video-tabindex.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>tabindex on video elements</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#video">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#video">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Submitting element directionality: the dirname attribute</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#submitting-element-directionality:-the-dirname-attribute">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#submitting-element-directionality:-the-dirname-attribute">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/dirname-rtl-manual.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Submitting element directionality: the dirname attribute (rtl)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#submitting-element-directionality:-the-dirname-attribute">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#submitting-element-directionality:-the-dirname-attribute">
 <form action="dirname-rtl-manual.html" method=get>
   <p><label>Comment: <input type=text name="comment" dirname="comment.dir" required></label></p>
   <p><button type=submit>Post Comment</button></p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formAction_document_address.html	2014-11-26 21:45:57.000000000 +0000
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <title>HTML Test: formAction_document_address</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/TR/html5/forms.html#dom-fs-formaction">
-    <link rel="help" href="http://www.w3.org/TR/html5/dom.html#the-document's-address">
-    <link rel="help" href="http://www.w3.org/TR/html5/forms.html#the-button-element">
-    <link rel="help" href="http://www.w3.org/TR/html5/forms.html#the-input-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-fs-formaction">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-document's-address">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-button-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
     <meta name="assert" content="On getting the formAction IDL attribute, when the content attribute is missing or its value is the empty string, the document's address must be returned instead.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/attributes-common-to-form-controls/formaction.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
         <title>formaction on button element</title>
         <meta content="text/html; charset=UTF-8" http-equiv="content-type">
         <meta content="formaction on button element" name="description">
-    <link href="http://www.w3.org/TR/html5/forms.html#dom-fs-formaction" rel="help">
+    <link href="https://html.spec.whatwg.org/multipage/#dom-fs-formaction" rel="help">
 </head>
     <body>
         <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-checkValidity.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-checkValidity.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-checkValidity.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-checkValidity.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.checkValidity()</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-cva-checkvalidity">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-cva-checkvalidity">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-reportValidity.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-reportValidity.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-reportValidity.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-reportValidity.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.reportValidity()</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-cva-reportvalidity">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-cva-reportvalidity">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validate.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validate.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>Constraint validation</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#constraint-validation">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#constraint-validation">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-badInput.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-badInput.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-badInput.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-badInput.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.badInput</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#suffering-from-bad-input">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/association-of-controls-and-forms.html#suffering-from-bad-input">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/the-button-element.html#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-customError.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-customError.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-customError.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-customError.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.customError</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-customerror">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-customerror">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-patternMismatch.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.patternMismatch</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-patternmismatch">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-patternmismatch">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.rangeOverflow</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-rangeoverflow">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-rangeoverflow">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.rangeUnderflow</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-rangeunderflow">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-rangeunderflow">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.patternMismatch</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-stepmismatch">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-stepmismatch">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooLong.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.tooLong</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-toolong">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-toolong">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-tooShort.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.tooShort</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#suffering-from-being-too-short">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#suffering-from-being-too-short">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-typeMismatch.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.typeMismatch</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-typemismatch">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-typemismatch">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valid.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valid.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valid.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valid.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.valid</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-valid">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-valid">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-validity-valueMissing.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.validity.valueMissing</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-validitystate-valuemissing">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-validitystate-valuemissing">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-willValidate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-willValidate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-willValidate.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/form-validation-willValidate.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>The constraint validation API Test: element.willValidate</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-cva-willvalidate">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#the-constraint-validation-api">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-cva-willvalidate">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-constraint-validation-api">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/validator.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/inputwillvalidate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/inputwillvalidate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/inputwillvalidate.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/constraints/inputwillvalidate.html	2014-11-26 21:45:57.000000000 +0000
@@ -3,7 +3,7 @@
     <title>willValidate property on the input element</title>
     <meta content="text/html; charset=UTF-8" http-equiv="content-type">
     <meta content="willValidate property on the input element" name="description">
-    <link href="http://www.w3.org/TR/html5/forms.html#dom-cva-willvalidate" rel="help">
+    <link href="https://html.spec.whatwg.org/multipage/#dom-cva-willvalidate" rel="help">
   </head>
   <body>
     <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/resetting-a-form/reset-form.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/resetting-a-form/reset-form.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/resetting-a-form/reset-form.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/resetting-a-form/reset-form.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset="utf-8">
 <title>HTML Test: Resetting a form</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/TR/html51/forms.html#concept-form-reset">
-<link rel="help" href="http://www.w3.org/TR/html51/forms.html#category-reset">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#concept-form-reset">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#category-reset">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>text field selection: select()</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#textFieldSelection">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#textFieldSelection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <title>test if select() API returns correct attributes</title>
 <meta charset="UTF-8">
 <link rel="author" title="Koji Tashiro" href="mailto:koji.tashiro@gmail.com">
-<link rel="help" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#textFieldSelection">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/multipage/association-of-controls-and-forms.html#textFieldSelection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>text field selection</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#textFieldSelection">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#textFieldSelection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>text field selection (textarea)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#textFieldSelection">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#textFieldSelection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setRangeText.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>text field selection: setRangeText</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#textFieldSelection">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#textFieldSelection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/textfieldselection/textfieldselection-setSelectionRange.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>Test of text field setSelectionRange</title>
 <link rel="author" title="Takeharu.Oshida" href="mailto:georgeosddev@gmail.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/forms.html#dom-textarea/input-setselectionrange">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-textarea/input-setselectionrange">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-events.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-events.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: Button - events</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/TR/html51/forms.html#the-button-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-button-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-validation.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-validation.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-validation.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-button-element/button-validation.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>button element validation</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel="help" href="www.w3.org/html/wg/drafts/html/master/#the-button-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-button-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistelement.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistelement.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistelement.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistelement.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-    <title>datalist element</title>
-    <meta content="text/html; charset=UTF-8" http-equiv="content-type">
-    <meta content="datalist element" name="description">
-    <link href="http://www.w3.org/TR/html5/forms.html#the-datalist-element" rel="help">
-  </head>
-  <body>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <div id="log"></div>
-
-    <datalist id="datalist1" style="display: none">
-      <option>1</option>
-      <option>2</option>
-      <option>3</option>
-      <option>4</option>
-    </datalist>
-
-    <script type="text/javascript">
-      test(function() {assert_true(document.getElementsByTagName("datalist")[0] instanceof HTMLDataListElement)}, "HTMLDataListElement support");
-      test(function() {assert_equals(document.getElementsByTagName("datalist")[0].options.item(0), document.getElementsByTagName("option")[0])}, "HTMLDataListElement options item collection support");
-    </script>
-
-</body></html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistoptions.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistoptions.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistoptions.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-datalist-element/datalistoptions.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Datalist element options</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.whatwg.org/html/#the-datalist-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-datalist-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
@@ -26,14 +26,15 @@
     var datalist = document.getElementById('numbers'),
         labels = [],
         values = [];
-    assert_equals(datalist.options.length, 3, "The datalist has 3 options. Disabled and empty value options aren't taken into account");
+    assert_equals(datalist.options.length, 5);
 
     for (var i = 0, len = datalist.options.length; i < len; i++) {
+      assert_equals(datalist.options[i], datalist.options.item(i));
       labels.push(datalist.options[i].label);
       values.push(datalist.options[i].value);
     }
-    assert_array_equals(labels, ["zero", "one", "two"]);
-    assert_array_equals(values, ["0", "1", "2"]);
+    assert_array_equals(labels, ["zero", "one", "two", "three", ""]);
+    assert_array_equals(values, ["0", "1", "2", "3", ""]);
   }, "options label/value");
 
   test(function(){
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/disabled.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/disabled.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/disabled.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/disabled.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>Fieldset disabled</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel="help" href="http://www.whatwg.org/html/#the-fieldset-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-fieldset-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>HTML Test: HTMLFieldSetElement interface</title>
 <link rel="author" title="Intel" href="http://www.intel.com/">
-<link rel="help" href="http://www.w3.org/TR/html51/forms.html#the-fieldset-element">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-fieldset-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-autocomplete.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-autocomplete.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-autocomplete.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-autocomplete.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset=utf-8>
 <title>form autocomplete attribute</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-form-element">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#attr-fe-autocomplete">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-form-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#attr-fe-autocomplete">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-interfaces-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>form.elements: interfaces</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-form-elements">
-<link rel="help" href="http://www.whatwg.org/html5/#htmlformcontrolscollection">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-form-elements">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#htmlformcontrolscollection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-matches.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-matches.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-matches.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-matches.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>form.elements: matches</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-form-elements">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-form-elements">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-01.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>form.elements: namedItem</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-form-elements">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-form-elements">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-form-element/form-elements-nameditem-02.html	2014-11-26 21:45:57.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>form.elements: parsing</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-form-elements">
-<link rel="help" href="http://www.whatwg.org/html5/#parsing-main-intr">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-form-elements">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#parsing-main-intr">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/button.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/button.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/button.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/button.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>input type button</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#button-state-(type=button)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#button-state-(type=button)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/checkbox.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/checkbox.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/checkbox.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/checkbox.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>input type checkbox</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/forms.html#checkbox-state-(type=checkbox)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#checkbox-state-(type=checkbox)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/color.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/color.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/color.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/color.html	2014-11-26 21:45:57.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset=utf-8>
 <title>Form input type=color</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#colors">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#color-state-(type=color)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/common-microsyntaxes.html#colors">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/states-of-the-type-attribute.html#color-state-(type=color)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/date.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/date.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/date.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/date.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,8 +3,8 @@
   <head>
     <title>Inputs Date</title>
     <link rel="author" title="Morishita Hiromitsu" href="mailto:hero@asterisk-works.jp">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/forms.html#date-state-(type=date)">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/infrastructure.html#dates-and-times">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#date-state-(type=date)">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dates-and-times">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-2.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset=utf-8>
 <title>Form input type=datetime</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#global-dates-and-times">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#local-date-and-time-state-(type=datetime)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/common-microsyntaxes.html#global-dates-and-times">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/states-of-the-type-attribute.html#local-date-and-time-state-(type=datetime)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime.html	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
     <meta name=viewport content="width=device-width, maximum-scale=1.0, user-scalable=no" />
     <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
     <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
-    <link rel="help" href="http://www.w3.org/TR/html5/the-input-element.html#the-input-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -25,79 +25,79 @@
 
   <script type="text/javascript">
     test(function() {assert_equals(document.getElementsByTagName("input")[0].type, "date")}, "date type support on input element", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
     test(function() {assert_equals(document.getElementsByTagName("input")[0].value, "2011-12-01")}, "[date] The value must be a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-value" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
     test(function() {assert_equals(document.getElementsByTagName("input")[0].min, "2011-12-01")}, "[date] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
     test(function() {assert_equals(document.getElementsByTagName("input")[0].max, "2011-12-31")}, "[date] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
     test(function() {assert_equals(document.getElementsByTagName("input")[0].step, "5")}, "[date] The step attribute must be expressed in seconds", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-step" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[0].stepUp) == "function")}, "[date] stepUp method support on input 'date' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepup" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[0].stepDown) == "function")}, "[date] stepDown method support on input 'date' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepdown" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
 
     test(function() {assert_equals(document.getElementsByTagName("input")[1].type, "time")}, "[time] time type support on input element", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
     test(function() {assert_equals(document.getElementsByTagName("input")[1].value, "12:00")}, "[time] The value must be a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-value" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
     test(function() {assert_equals(document.getElementsByTagName("input")[1].min, "11:30")}, "[time] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
     test(function() {assert_equals(document.getElementsByTagName("input")[1].max, "14:00")}, "[time] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
     test(function() {assert_equals(document.getElementsByTagName("input")[1].step, "600")}, "[time] The step attribute must be expressed in seconds", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-step" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[1].stepUp) == "function")}, "[time] stepUp method support on input 'time' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepup" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[1].stepDown) == "function")}, "[time] stepDown method support on input 'time' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepdown" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
 
     test(function() {assert_equals(document.getElementsByTagName("input")[2].type, "datetime")}, "datetime type support on input element", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
     test(function() {assert_equals(document.getElementsByTagName("input")[2].value, "2011-12-01T12:00Z")}, "[datetime] The must be a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-value" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
     test(function() {assert_equals(document.getElementsByTagName("input")[2].min, "2011-12-01T12:00Z")}, "[datetime] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
     test(function() {assert_equals(document.getElementsByTagName("input")[2].max, "2011-12-31T22:00Z")}, "[datetime] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
     test(function() {assert_equals(document.getElementsByTagName("input")[2].step, "7200")}, "[datetime] The step attribute must be expressed in seconds", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-step" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[2].stepUp) == "function")}, "[datetime] stepUp method support on input 'datetime' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepup" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[2].stepDown) == "function")}, "[datetime] stepDown method support on input 'datetime' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepdown" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
 
     test(function() {assert_equals(document.getElementsByTagName("input")[3].type, "month")}, "month type support on input element", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
     test(function() {assert_equals(document.getElementsByTagName("input")[3].value, "2011-01")}, "[month] The value must be a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-value" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
     test(function() {assert_equals(document.getElementsByTagName("input")[3].min, "2011-01")}, "[month] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
     test(function() {assert_equals(document.getElementsByTagName("input")[3].max, "2011-12")}, "[month] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
     test(function() {assert_equals(document.getElementsByTagName("input")[3].step, "2")}, "[month] The step attribute must be expressed in seconds", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-step" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[3].stepUp) == "function")}, "[month] stepUp method support on input 'month' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepup" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[3].stepDown) == "function")}, "[month] stepDown method support on input 'month' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepdown" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
 
     test(function() {assert_equals(document.getElementsByTagName("input")[4].type, "week")}, "week type support on input element", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
     test(function() {assert_equals(document.getElementsByTagName("input")[4].value, "2011-W40")}, "[week] The value must be a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-value" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
     test(function() {assert_equals(document.getElementsByTagName("input")[4].min, "2011-W20")}, "[week] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
     test(function() {assert_equals(document.getElementsByTagName("input")[4].max, "2011-W50")}, "[week] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
     test(function() {assert_equals(document.getElementsByTagName("input")[4].step, "2")}, "[week] The step attribute must be expressed in seconds", {
-      "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-step" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[4].stepUp) == "function")}, "[week] stepUp method support on input 'week' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepup" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
     test(function() {assert_true(typeof(document.getElementsByTagName("input")[4].stepDown) == "function")}, "[week] stepDown method support on input 'week' element", {
-      "help" : "http://www.w3.org/TR/html5/common-input-element-apis.html#dom-input-stepdown" });
+      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
 
   </script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-local.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-local.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-local.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/datetime-local.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset=utf-8>
 <title>Form input type=datetime-local</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#local-dates-and-times">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#local-date-and-time-state-(type=datetime-local)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/common-microsyntaxes.html#local-dates-and-times">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/states-of-the-type-attribute.html#local-date-and-time-state-(type=datetime-local)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/email.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/email.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/email.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/email.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <title>Input Email</title>
 <link rel="author" title="Kazuki Kanamori" href="mailto:yogurito@gmail.com">
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/#e-mail-state-(type=email)">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#e-mail-state-(type=email)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <input type="email" id="single_email" value="user@example.com"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/file-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/file-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/file-manual.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/file-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>input type file</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#file-upload-state-(type=file)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#file-upload-state-(type=file)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/hidden.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/hidden.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/hidden.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/hidden.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Hidden input element</title>
     <link rel="author" title="Kinuko Yasuda" href="mailto:kinuko@chromium.org">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#hidden-state-(type=hidden)">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#hidden-state-(type=hidden)">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/image01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/image01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/image01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/image01.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,6 +2,6 @@
 <meta charset=utf-8>
 <title>input type image</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#image-button-state-(type=image)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#image-button-state-(type=image)">
 <link rel="match" href="image01-ref.html">
 <input type=image id=image src="/media/poster.png">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-textselection-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-textselection-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-textselection-01.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-textselection-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>The selection interface members</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#textFieldSelection">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#textFieldSelection">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-button.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-button.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-button.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-button.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>input type button</title>
 <link rel="author" title="Takeharu.Oshida" href="mailto:georgeosddev@gmail.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/forms.html#button-state-(type=button)">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#button-state-(type=button)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-checkbox.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-checkbox.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-checkbox.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/input-type-checkbox.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 <title>input type checkbox</title>
 <link rel="author" title="Gary Gao" href="mailto:angrytoast@gmail.com">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/forms.html#checkbox-state-(type=checkbox)">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#checkbox-state-(type=checkbox)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/month.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/month.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/month.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/month.html	2014-11-26 21:45:58.000000000 +0000
@@ -5,8 +5,8 @@
     <link rel="author" title="Morishita Hiromitsu" href="mailto:hero@asterisk-works.jp">
     <link rel="author" title="kaseijin" href="mailto:pcmkas@gmail.com">
     <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/infrastructure.html#months">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/forms.html#month-state-(type=month)">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#months">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#month-state-(type=month)">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/number.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/number.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/number.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/number.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Form input type=number</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#password-state-(type=number)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#password-state-(type=number)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/password.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/password.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/password.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/password.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Password input element</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#password-state-%28type=password%29">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#password-state-%28type=password%29">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/pattern_attribute.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/pattern_attribute.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/pattern_attribute.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/pattern_attribute.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <meta name=viewport content="width=device-width, maximum-scale=1.0, user-scalable=no" />
 	  <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
 	  <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
-	  <link rel="help" href="http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-pattern">
+	  <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-input-pattern">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/radio.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>input type radio</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#radio-button-state-(type=radio)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#radio-button-state-(type=radio)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/range.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/range.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/range.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/range.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
     <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
     <link rel="author" title="Tomoyuki SHIMIZU" href="mailto:tomoyuki.labs@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/html5/the-input-element.html#the-input-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -47,7 +47,7 @@
         },
         "range type support on input element",
         {
-          "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type"
         }
       );
 
@@ -57,7 +57,7 @@
         },
         "min attribute support on input element",
         {
-          "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min"
         }
       );
 
@@ -67,7 +67,7 @@
         },
         "max attribute support on input element",
         {
-          "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max"
         }
       );
 
@@ -79,7 +79,7 @@
         },
         "Illegal value of min attribute",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -88,7 +88,7 @@
           assert_equals(document.getElementById('illegal_min_and_max').max, "100")
         },
         "Illegal value of max attribute",
-        { "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)" }
+        { "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)" }
       );
 
       test(
@@ -97,7 +97,7 @@
         },
         "Converting an illegal string to the default value",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -106,7 +106,7 @@
           assert_equals(document.getElementById('illegal_value_and_step').step, "1")
         },
         "Converting an illegal string to the default step",
-        { "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)" }
+        { "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)" }
       );
 
       test(
@@ -115,7 +115,7 @@
         },
         "the value is set to min when a smaller value than min attribute is given",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -125,7 +125,7 @@
         },
         "the value is set to max when a larger value than max attribute is given",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -134,7 +134,7 @@
           assert_equals(document.getElementById('empty_attributes').min, "0")
         },
         "default value of min attribute in input type=range",
-        { "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-min" }
+        { "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" }
       );
 
       test(
@@ -143,7 +143,7 @@
         },
         "default value of max attribute in input type=range",
         {
-          "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-max"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max"
         }
       );
 
@@ -153,7 +153,7 @@
         },
         "default value when min and max attributes are given (= min plus half the difference between min and max)",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -163,7 +163,7 @@
         },
         "default value with step control when both min and max attributes are given",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -174,7 +174,7 @@
         },
         "default value when both min and max attributes are given, while min > max",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -184,7 +184,7 @@
         },
         "The default step scale factor is 1, unless min attribute has non-integer value",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -194,7 +194,7 @@
         },
         "Step scale factor behavior when min attribute has integer value but max attribute is non-integer ",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)" }
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)" }
       );
 
       test(
@@ -203,7 +203,7 @@
         },
         "The default scale factor is 1 even if step attribute is explicitly set to non-integer value, unless min attribute has non-integer value",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -213,7 +213,7 @@
         },
         "Solving the step mismatch",
         {
-          "help" : "http://www.w3.org/TR/html5/forms.html#range-state-(type=range)"
+          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
         }
       );
 
@@ -226,7 +226,7 @@
         },
         "Performing stepUp()",
         {
-          "help" : "http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-input-stepup"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup"
         }
       );
 
@@ -239,7 +239,7 @@
         },
         "Performing stepDown()",
         {
-          "help" : "http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-input-stepdown"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown"
         }
       );
 
@@ -253,7 +253,7 @@
         },
         "Performing stepUp() beyond the value of the max attribute",
         {
-          "help" : "http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-input-stepup"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup"
         }
       );
 
@@ -265,7 +265,7 @@
           e.stepDown(2);
           assert_equals(e.value, "3")
         }, "Performing stepDown() beyond the value of the min attribute", {
-          "help" : "http://www.w3.org/html/wg/drafts/html/master/forms.html#dom-input-stepdown"
+          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown"
         }
       );
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/required_attribute.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/required_attribute.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/required_attribute.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/required_attribute.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <meta name=viewport content="width=device-width, maximum-scale=1.0, user-scalable=no" />
 	  <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
 	  <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
-	  <link rel="help" href="http://www.w3.org/TR/html5/common-input-element-attributes.html#attr-input-required">
+	  <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-input-required">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/reset.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/reset.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/reset.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/reset.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>input type reset</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#reset-button-state-(type=reset)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#reset-button-state-(type=reset)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/search_input.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/search_input.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/search_input.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/search_input.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
      <meta name=viewport content="width=device-width, maximum-scale=1.0, user-scalable=no" />
  	  <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
  	  <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
-	  <link rel="help" href="http://www.w3.org/TR/html5/the-input-element.html#the-input-element">
+	  <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
    <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -24,9 +24,9 @@
 
 
 		test(function() {assert_equals(document.getElementsByTagName("input")[0].type, "search")}, "search type support on input element", {
-		  "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-type" });
+		  "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
 		test(function() {assert_equals(document.getElementsByTagName("input")[0].placeholder, "Search...")}, "placeholder attribute support on input element", {
-		  "help" : "http://www.w3.org/TR/html5/the-input-element.html#dom-input-placeholder" });
+		  "help" : "https://html.spec.whatwg.org/multipage/#dom-input-placeholder" });
 
 	</script>
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/telephone.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/telephone.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/telephone.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/telephone.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
 	<title>Input tel</title>
 	<link rel="author" title="Kazuki Kanamori" href="mailto:yogurito@gmail.com">
-	<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#telephone-state-(type=tel)">
+	<link rel="help" href="https://html.spec.whatwg.org/multipage/#telephone-state-(type=tel)">
 	<script src="/resources/testharness.js"></script>
 	<script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/text.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/text.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/text.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/text.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>Text input element</title>
     <link rel="author" title="Kinuko Yasuda" href="mailto:kinuko@chromium.org">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#text-(type=text)-state-and-search-state-(type=search)">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#text-(type=text)-state-and-search-state-(type=search)">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time-2.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset=utf-8>
 <title>Form input type=time</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#times">
-<link rel=help href="http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#time-state-(type=time)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/common-microsyntaxes.html#times">
+<link rel=help href="https://html.spec.whatwg.org/multipage/multipage/states-of-the-type-attribute.html#time-state-(type=time)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/time.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
   <head>
     <title>Input Time</title>
      <meta name=viewport content="width=device-width, maximum-scale=1.0, user-scalable=no" />
-	  <link rel="help" href="http://www.w3.org/TR/html5/the-input-element.html#the-input-element">
+	  <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
    <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/type-change-state.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/type-change-state.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/type-change-state.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/type-change-state.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Input element's type attribute changes state</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-input-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-input-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/url.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/url.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/url.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/url.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
 	<title>Input url</title>
 	<link rel="author" title="Hyeonseok Shin" href="mailto:hyeonseok@gmail.com">
-	<link rel="help" href="http://www.w3.org/html/wg/drafts/html/master/forms.html#url-state-%28type=url%29">
+	<link rel="help" href="https://html.spec.whatwg.org/multipage/#url-state-%28type=url%29">
 	<script src="/resources/testharness.js"></script>
 	<script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/week.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/week.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/week.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/week.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,8 +2,8 @@
 <meta charset=utf-8>
 <title>Form input type=week</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/CR/infrastructure.html#weeks">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/CR/forms.html#week-state-(type=week)">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#weeks">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#week-state-(type=week)">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-meter-element/meter.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-meter-element/meter.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-meter-element/meter.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-meter-element/meter.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <title>The meter element</title>
     <link rel="author" title="Tomoyuki SHIMIZU" href="mailto:tomoyuki.labs@gmail.com">
     <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-    <link rel="help" href="http://www.w3.org/TR/html5/forms.html#the-meter-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-meter-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,12 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>HTMLOptionElement.label</title>
+<link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#dom-option-label">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src=option-label-value.js></script>
+<div id=log></div>
+<script>
+test_option("label")
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label-value.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label-value.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label-value.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-label-value.js	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,82 @@
+function test_option(member) {
+  test(function() {
+    var option = document.createElement("option");
+    assert_equals(option[member], "");
+  }, "No children, no " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.setAttribute(member, "")
+    assert_equals(option[member], "");
+  }, "No children, empty " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.setAttribute(member, member)
+    assert_equals(option[member], member);
+  }, "No children, " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.setAttributeNS("http://www.example.com/", member, member)
+    assert_equals(option[member], "");
+  }, "No children, namespaced " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    assert_equals(option[member], "child");
+  }, "Single child, no " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.setAttribute(member, "")
+    assert_equals(option[member], "");
+  }, "Single child, empty " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.setAttribute(member, member)
+    assert_equals(option[member], member);
+  }, "Single child, " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.setAttributeNS("http://www.example.com/", member, member)
+    assert_equals(option[member], "child");
+  }, "Single child, namespaced " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.appendChild(document.createTextNode(" node "));
+    assert_equals(option[member], "child node");
+  }, "Two children, no " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.appendChild(document.createTextNode(" node "));
+    option.setAttribute(member, "")
+    assert_equals(option[member], "");
+  }, "Two children, empty " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.appendChild(document.createTextNode(" node "));
+    option.setAttribute(member, member)
+    assert_equals(option[member], member);
+  }, "Two children, " + member);
+
+  test(function() {
+    var option = document.createElement("option");
+    option.appendChild(document.createTextNode(" child "));
+    option.appendChild(document.createTextNode(" node "));
+    option.setAttributeNS("http://www.example.com/", member, member)
+    assert_equals(option[member], "child node");
+  }, "Two children, namespaced " + member);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-label.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-label.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-label.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-label.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>HTMLOptionElement.text</title>
+<link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#dom-option-text">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+test(function() {
+  var option = document.createElement("option");
+  option.setAttribute("label", "label");
+  option.textContent = "text";
+  assert_equals(option.text, "text");
+}, "Option with non-empty label.");
+
+test(function() {
+  var option = document.createElement("option");
+  option.setAttribute("label", "");
+  option.textContent = "text";
+  assert_equals(option.text, "text");
+}, "Option with empty label.");
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>HTMLOptionElement.text</title>
 <link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
-<link rel=help href="http://www.whatwg.org/html/#dom-option-text">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#dom-option-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-spaces.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-spaces.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-spaces.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-spaces.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>HTMLOptionElement.text</title>
 <link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
-<link rel=help href="http://www.whatwg.org/html/#dom-option-text">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#dom-option-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-value.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-value.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-value.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-option-element/option-value.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,12 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>HTMLOptionElement.value</title>
+<link rel=author title=Ms2ger href="mailto:Ms2ger@gmail.com">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#dom-option-label">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src=option-label-value.js></script>
+<div id=log></div>
+<script>
+test_option("value")
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-output-element/output.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-output-element/output.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-output-element/output.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-output-element/output.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>The output element</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-output-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-output-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress-2.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <title>Progress Element Tests</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <link rel="author" title="Microsoft" href="http://www.microsoft.com" />
-    <link rel="help" href="http://www.whatwg.org/html/#the-progress-element" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-progress-element" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-progress-element/progress.html	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
 
     <link rel="author" title="dan smith" href="mailto:XX1011@gmail.com">
     <link rel="author" title="Tomoyuki SHIMIZU" href="mailto:tomoyuki.labs@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/html5/forms.html#the-progress-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-progress-element">
 
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-select-element/select-remove.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-select-element/select-remove.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-select-element/select-remove.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-select-element/select-remove.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,9 +2,9 @@
 <meta charset=utf-8>
 <title>HTMLSelectElement.remove</title>
 <link rel="author" title="Ms2ger" href="Ms2ger@gmail.com">
-<link rel="help" href="http://dom.spec.whatwg.org/#dom-childnode-remove">
-<link rel="help" href="http://www.whatwg.org/html/#dom-select-remove">
-<link rel="help" href="http://www.whatwg.org/html/#dom-htmloptionscollection-remove">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-childnode-remove">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-select-remove">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-htmloptionscollection-remove">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Amir E. Aharoni" href="mailto:amir.aharoni@mail.huji.ac.il"/>
     <link rel="author" title="Eyal Sela" href="mailto:eyal@post.isoc.org.il"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-textarea-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-textarea-element"/>
     <meta name="assert"
       content="A newline in a textarea element, and in its raw value, should separate paragraphs for the purposes of the Unicode bidirectional algorithm."/>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-newline-bidi-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
     <link rel="author" title="Amir E. Aharoni" href="mailto:amir.aharoni@mail.huji.ac.il"/>
     <link rel="author" title="Eyal Sela" href="mailto:eyal@post.isoc.org.il"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-textarea-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-textarea-element"/>
   </head>
   <body>
     <div class="instructions"><p>Test passes if the rightmost character in the first line below is a full stop and to the left of it is a Hebrew letter.</p></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-type.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-type.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-type.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/textarea-type.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>The type IDL attribute</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-textarea-type">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-textarea-type">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="test">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1a.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>Dynamic manipulation of textarea.wrap</title>
-<link rel=help href=http://www.whatwg.org/html5/#dom-textarea-wrap>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#dom-textarea-wrap>
 <link rel=author title=Ms2ger href=mailto:ms2ger@gmail.com>
 <textarea wrap=off cols=20>01234567890 01234567890 01234567890</textarea>
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1b.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>Dynamic manipulation of textarea.wrap</title>
-<link rel=help href=http://www.whatwg.org/html5/#dom-textarea-wrap>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#dom-textarea-wrap>
 <link rel=author title=Ms2ger href=mailto:ms2ger@gmail.com>
 <textarea wrap=off cols=20>01234567890 01234567890 01234567890</textarea>
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/forms/the-textarea-element/wrap-reflect-1-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <title>Dynamic manipulation of textarea.wrap</title>
-<link rel=help href=http://www.whatwg.org/html5/#dom-textarea-wrap>
+<link rel=help href=https://html.spec.whatwg.org/multipage/#dom-textarea-wrap>
 <link rel=author title=Ms2ger href=mailto:ms2ger@gmail.com>
 <textarea wrap=soft cols=20>01234567890 01234567890 01234567890</textarea>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-blockquote-element/grouping-blockquote.sub.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-blockquote-element/grouping-blockquote.sub.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-blockquote-element/grouping-blockquote.sub.html	2014-11-14 09:37:22.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-blockquote-element/grouping-blockquote.sub.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the blockquote element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-blockquote-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-blockquote-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dd-element/grouping-dd.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the dd element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-dd-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dd-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-div-element/grouping-div.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-div-element/grouping-div.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-div-element/grouping-div.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-div-element/grouping-div.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>The div element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-div-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-div-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dl-element/grouping-dl.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the dl element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-dl-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dl-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-dt-element/grouping-dt.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the dl element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-dt-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dt-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figcaption-element/grouping-figcaption.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the figcaption element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-figcaption-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-figcaption-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-figure-element/grouping-figure.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the figure element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-figure-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-figure-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-hr-element/grouping-hr.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the hr element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-hr-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-hr-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>li element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-li-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-li-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -128,7 +128,7 @@
             assert_own_property(testLI,"value", "li should have a 'value' attribute");
         }, "li should have a 'value' attribute");
 
-        // "The [value] attribute has no default value" so, per http://www.w3.org/html/wg/drafts/html/CR/single-page.html#reflect,
+        // "The [value] attribute has no default value" so, per https://html.spec.whatwg.org/multipage/#reflect,
         // the default when unspecified is 0
         testList = document.querySelectorAll("#unordered li, #basic li");
         test(function() {
@@ -139,7 +139,7 @@
 
         // "If the value attribute is present, user agents must parse it as an integer, in order to determine the attribute's value.
         //  If the attribute's value cannot be converted to a number, the attribute must be treated as if it was absent."
-        // Per http://www.w3.org/html/wg/drafts/html/CR/single-page.html#collect-a-sequence-of-characters,
+        // Per https://html.spec.whatwg.org/multipage/#collect-a-sequence-of-characters,
         //    an integer is parsed by collecting as many digits as possible and then aborting at the first
         //    non-digit character after the first digit (otherwise, with no beginning digit, it's just an error)
         // and:  "The value IDL attribute must reflect the value of the value content attribute."
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-MANUAL.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-MANUAL.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-MANUAL.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-novalue-MANUAL.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Body Element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/single-page.html#the-body-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-body-element">
     <meta name="flags" content="interact" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>li element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-li-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-li-element">
     <link rel="match" href="grouping-li-reftest-001-ref.html" />
     <meta name="assert" content="The value attribute has no effect when applied to a li element whose parent is a non-ol element." />
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-001-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>li element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-li-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-li-element">
     <link rel="match" href="grouping-li-reftest-001.html" />
     <meta name="assert" content="The value attribute has no effect when applied to a li element whose parent is a non-ol element." />
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>li element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-li-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-li-element">
     <link rel="match" href="grouping-li-reftest-002-ref.html" />
     <meta name="assert" content="li elements with ol parents have ordinal values." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-002-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>li element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-li-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-li-element">
     <link rel="match" href="grouping-li-reftest-002-ref.html" />
     <meta name="assert" content="li elements with ol parents have ordinal values." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-rev-reftest-001-ref.html" />
     <meta name="assert" content="OL's reversed attribute creates a descending list." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-rev-reftest-001-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-rev-reftest-001.html" />
     <meta name="assert" content="OL's reversed attribute creates a descending list." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-start-reftest-001-ref.html" />
     <meta name="assert" content="Sequences produced by calculated values for LI elements within OL match spec's expectations (part one)." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-001-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-start-reftest-001.html" />
     <meta name="assert" content="Sequences produced by calculated values for LI elements within OL match spec's expectations. (part one)" />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-start-reftest-002-ref.html" />
     <meta name="assert" content="Sequences produced by calculated values for LI elements within OL match spec's expectations. (part two)" />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-start-reftest-002-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-start-reftest-002.html" />
     <meta name="assert" content="Sequences produced by calculated values for LI elements within OL match spec's expectations. (part two)" />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-type-reftest-001-ref.html" />
     <meta name="assert" content="OL's type attribute defaults to decimal state." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-001-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-type-reftest-001.html" />
     <meta name="assert" content="OL's type attribute defaults to decimal state." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-type-reftest-002-ref.html" />
     <meta name="assert" content="List items are rendered consistently with the state of the type attribute." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-002-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-type-reftest-002.html" />
     <meta name="assert" content="List items are rendered consistently with the state of the type attribute." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-type-reftest-003-ref.html" />
     <meta name="assert" content="OL's type attribute defaults to decimal state." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/grouping-ol-type-reftest-003-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>ol element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ol-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
     <link rel="match" href="grouping-ol-type-reftest-003.html" />
     <meta name="assert" content="OL's type attribute defaults to decimal state." />
     <style type="text/css">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-1.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
   <title>ol.start - reflection test</title>
   <link rel="author" title="Shiki Okasaka" href="http://shiki.esrille.com/">
   <link rel="author" title="Esrille Inc." href="http://www.esrille.com/">
-  <link rel="help" href="http://www.w3.org/TR/html5/grouping-content.html#the-ol-element">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
   <meta name="assert" content="This test checks that the start IDL attribute reflects the respective content attribute of the same name.">
   <link rel="stylesheet" href="/resources/testharness.css">
   <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ol-element/ol.start-reflection-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
   <title>ol.start - reflection test</title>
   <link rel="author" title="Shiki Okasaka" href="http://shiki.esrille.com/">
   <link rel="author" title="Esrille Inc." href="http://www.esrille.com/">
-  <link rel="help" href="http://www.w3.org/TR/html5/grouping-content.html#the-ol-element">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ol-element">
   <meta name="assert" content="This test checks that the start IDL attribute reflects the respective content attribute of the same name.">
   <link rel="stylesheet" href="/resources/testharness.css">
   <script src="/resources/testharness.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-p-element/grouping-p.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-p-element/grouping-p.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-p-element/grouping-p.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-p-element/grouping-p.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the p element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-p-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-p-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the pre element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-pre-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-pre-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>pre element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-pre-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-pre-element">
     <link rel="match" href="grouping-pre-reftest-001-ref.html" />
     <meta name="assert" content="Newlines within pre elements separate paragraphs for the purposes of BIDI." />
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/grouping-pre-reftest-001-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>pre element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-pre-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-pre-element">
     <link rel="match" href="grouping-pre-reftest-001.html" />
     <meta name="assert" content="Newlines within pre elements separate paragraphs for the purposes of BIDI." />
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Amir E. Aharoni" href="mailto:amir.aharoni@mail.huji.ac.il"/>
     <link rel="author" title="Eyal Sela" href="mailto:eyal@post.isoc.org.il"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-pre-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-pre-element"/>
     <meta name="assert"
       content="A newline in a pre element should separate paragraphs for the purposes of the Unicode bidirectional algorithm."/>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-pre-element/pre-newline-bidi-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
     <link rel="author" title="Amir E. Aharoni" href="mailto:amir.aharoni@mail.huji.ac.il"/>
     <link rel="author" title="Eyal Sela" href="mailto:eyal@post.isoc.org.il"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-pre-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-pre-element"/>
   </head>
   <body>
     <div class="instructions"><p>Test passes if the rightmost character in the first line below is a full stop and to the left of it is a Hebrew letter.</p></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/grouping-content/the-ul-element/grouping-ul.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>the ul element</title>
     <link rel="author" title="dzenana" href="mailto:dzenana.trenutak@gmail.com">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/grouping-content.html#the-ul-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-ul-element">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>The details element</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-details-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-details-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-close.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>dialog element: close()</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-dialog-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-dialog-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interactive-elements/the-dialog-element/dialog-showModal.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>dialog element: showModal()</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-dialog-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-dialog-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interfaces.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interfaces.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/interfaces.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/interfaces.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <title>Test of interfaces</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#host-objects">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/">
+<link rel="help" href="https://heycam.github.io/webidl/#host-objects">
 <link rel="help" href="http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-262.pdf#page=96">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_001.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_001.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_001.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_001.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test checks the Async property on a dynamically-created script element. By default it should be true." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#dom-script-async"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-script-async"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_002.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_002.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_002.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_002.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures changes to the 'async' attribute are reflected in the async property." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#dom-script-async"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-script-async"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_003.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_003.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_003.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_003.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures an async script does not block the parser while downloading." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#attr-script-async"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-script-async"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_004.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_004.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_004.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_004.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures an async script executes as soon as possible after a download is complete." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#attr-script-async"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-script-async"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_005.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_005.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_005.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_005.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures a script element with both async and defer set should execute asynchronously." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#attr-script-async"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-script-async"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_006.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_006.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_006.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_006.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures a dynamically created external script executes asynchronously." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#force-async"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#force-async"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_007.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_007.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_007.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_007.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures Ordered async script execution when script.async == false" />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#script-processing-src-sync"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#script-processing-src-sync"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_008.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_008.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_008.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_008.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures an async script element's execution delays the window's load event." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/the-end.html#delay-the-load-event"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#delay-the-load-event"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_009.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_009.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_009.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_009.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures Document.write() silently fails from an Async script." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#execute-the-script-block"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#execute-the-script-block"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_010.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_010.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_010.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_010.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="This test ensures that an async script still executes if it is removed from a markup before the download is complete. The other two scripts that come after it in insertion order should execute as well." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#execute-the-script-block"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#execute-the-script-block"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_011.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_011.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_011.htm	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/async_011.htm	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
         <meta description="An empty parser-inserted script element should return async=true." />
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://dev.w3.org/html5/spec/scripting-1.html#prepare-a-script"/>
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/#prepare-a-script"/>
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-before-after-events.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-before-after-events.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-before-after-events.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-before-after-events.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>script beforescriptexecute/afterscriptexecute events</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#the-script-element">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-script-element">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-onload.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-onload.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-onload.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-onload.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <title>Script for and onload attributes</title>
 <link rel="author" title="Matheus Kerschbaum" href="mailto:matjk7@gmail.com">
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#prepare-a-script">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#prepare-a-script">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Script @type: unknown parameters</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#scriptingLanguages">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#scriptingLanguages">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-02.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-languages-02.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Script @type: JavaScript types</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#scriptingLanguages">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#scriptingLanguages">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-language-type.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-language-type.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-language-type.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-language-type.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>Script: combinations of @type and @language</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#prepare-a-script">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#prepare-a-script">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>HTMLScriptElement.text</title>
-<link rel=help href="http://whatwg.org/html/#dom-script-text">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#dom-script-text">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-text.xhtml	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>HTMLScriptElement.text</title>
-<link rel="help" href="http://whatwg.org/html/#dom-script-text"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-script-text"/>
 <script src="/resources/testharness.js"/>
 <script src="/resources/testharnessreport.js"/>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-template-element/testcommon.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-template-element/testcommon.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-template-element/testcommon.js	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-template-element/testcommon.js	2014-11-26 21:45:58.000000000 +0000
@@ -30,7 +30,7 @@
         'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source',
         'track', 'wbr' ];
 
-// http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#form-associated-element
+// https://html.spec.whatwg.org/multipage/multipage/forms.html#form-associated-element
 var HTML5_FORM_ASSOCIATED_ELEMENTS = [ 'button', 'fieldset', 'input', 'keygen',
         'label', 'object', 'output', 'select', 'textarea' ];
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/checked.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/checked.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/checked.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/checked.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:checked)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/default.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/default.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/default.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/default.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:default)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir01.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=iso-8859-8 id=meta>
 <title id=title>Selector: pseudo-classes (:dir(ltr), :dir(rtl)) in iso-8859-8 documents</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js" id=script1></script>
 <script src="/resources/testharnessreport.js" id=script2></script>
 <script src="utils.js" id=script3></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/dir.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8 id=meta>
 <title id=title>Selector: pseudo-classes (:dir(ltr), :dir(rtl))</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js" id=script1></script>
 <script src="/resources/testharnessreport.js" id=script2></script>
 <script src="utils.js" id=script3></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/disabled.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/disabled.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/disabled.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/disabled.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:disabled)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/enabled.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/enabled.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/enabled.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/enabled.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:enabled)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/focus.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/focus.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/focus.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/focus.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:focus)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/indeterminate.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:indeterminate)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/inrange-outofrange.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:in-range, :out-of-range)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/link.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/link.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/link.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/link.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:link)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <link rel=stylesheet href="/resources/testharness.css" id=link3>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:read-write, :read-only)</title>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/required-optional.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/required-optional.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/required-optional.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/required-optional.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:required, :optional)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/valid-invalid.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/valid-invalid.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/valid-invalid.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/selectors/pseudo-classes/valid-invalid.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Selector: pseudo-classes (:valid, :invalid)</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org" id=link1>
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#pseudo-classes" id=link2>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#pseudo-classes" id=link2>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="utils.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-caption-element/caption_001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-caption-element/caption_001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-caption-element/caption_001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-caption-element/caption_001.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <title>HTML5 Table API Tests</title>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
     <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-    <link rel="help" href="http://www.w3.org/TR/html5/tabular-data.html#the-caption-element" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-caption-element" />
   </head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/caption-methods.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/caption-methods.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/caption-methods.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/caption-methods.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,9 +3,9 @@
 <head>
 	<title>Creating and deleting captions</title>
 	<link rel="author" title="Erika Navara" href="mailto:edoyle@microsoft.com">
-	<link rel="help" href="http://www.w3.org/TR/html5/tabular-data.html#the-table-element" />
-	<link rel="help" href="http://www.w3.org/TR/html5/tabular-data.html#dom-table-createcaption" />
-	<link rel="help" href="http://www.w3.org/TR/html5/tabular-data.html#dom-table-deletecaption" />
+	<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-table-element" />
+	<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-table-createcaption" />
+	<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-table-deletecaption" />
 	<script src="/resources/testharness.js"></script>
 	<script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>insertRow(): INDEX_SIZE_ERR</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-table-insertrow">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-table-insertrow">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/tabular-data/the-table-element/insertRow-method-02.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>insertRow(): Empty table</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-table-insertrow">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-table-insertrow">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a-stringifier.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>HTMLAnchorElement stringifier</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://heycam.github.io/webidl/#es-stringifier">
+<link rel="help" href="https://heycam.github.io/webidl/#es-stringifier">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=/common/stringifiers.js></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>HTMLAnchorElement.text getting</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-a-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-a-text">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.text-setter-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>HTMLAnchorElement.text setting</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html5/#dom-a-text">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-a-text">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-auto-dir-default.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-auto-dir-default-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'The dir global attribute defaults to auto on this element (it never inherits from the parent
       element like with other elements).'"/>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-missing-pdf.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-missing-pdf-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-nested.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-nested-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-number.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-number-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-separate.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-separate-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-1.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element" />
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-another-bdi-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com" />
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element" />
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-1.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-following-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-1.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-letter-preceding-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-1.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="Shai Berger" href="mailto:shai@platonix.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-number-following-2.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-to-number-following-2-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-to-surrounding-run.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-to-surrounding-run-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-neutral-wrapped-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the paragraph-level
       container that a bdi element finds itself within, the bdi element must be treated
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdi-element/bdi-paragraph-level-container.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="bdi-paragraph-level-container-ref.html"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-bdi-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdi-element"/>
     <meta name="assert" content="
       'For the purposes of applying the bidirectional algorithm to the contents of a bdi element,
       user agents must treat the element as a paragraph-level container.'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-child.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>HTML Test: bdo - text directionality formatting control for its children</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/text-level-semantics.html#the-bdo-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdo-element">
     <link rel="match" href="bidi-001-ref.html">
     <meta name="assert" content="Check if the bdo element represents explicit text directionality formatting control for its children.">
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-ltr.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>HTML Test: The value 'ltr' of dir attribute specifies a left-to-right override</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/text-level-semantics.html#the-bdo-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdo-element">
     <link rel="match" href="bidi-001-ref.html">
     <meta name="assert" content="Check if the value ltr of dir attribute specifies a left-to-right override">
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-bdo-element/bdo-override.html	2014-11-26 21:45:58.000000000 +0000
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>HTML Test: bdo - override the Unicode bidirectional algorithm</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/html/wg/drafts/html/CR/text-level-semantics.html#the-bdo-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-bdo-element">
     <link rel="match" href="bidi-001-ref.html">
     <meta name="assert" content="Check if authors could override the Unicode bidirectional algorithm
         by explicitly specifying a direction override of bdo element">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi.html	2014-11-26 21:45:58.000000000 +0000
@@ -7,7 +7,7 @@
     <link rel="author" title="Amir E. Aharoni" href="mailto:amir.aharoni@mail.huji.ac.il"/>
     <link rel="author" title="Eyal Sela" href="mailto:eyal@post.isoc.org.il"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-br-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-br-element"/>
     <meta name="assert"
       content="A br element should separate paragraphs for the purposes of the Unicode bidirectional algorithm."/>
   </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-in-inline-ancestors.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="reference" href="br-bidi-in-inline-ancestors-ref.html" />
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-br-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-br-element"/>
     <link rel="help" href="http://www.w3.org/TR/css3-writing-modes/#unicode-bidi" />
     <meta name="assert" content="
       'A br element should separate paragraphs for the purposes of the Unicode bidirectional
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-br-element/br-bidi-ref.html	2014-11-26 21:45:58.000000000 +0000
@@ -5,7 +5,7 @@
     <link rel="author" title="Amir E. Aharoni" href="mailto:amir.aharoni@mail.huji.ac.il"/>
     <link rel="author" title="Eyal Sela" href="mailto:eyal@post.isoc.org.il"/>
     <link rel="author" title="Aharon Lanin" href="mailto:aharon@google.com"/>
-    <link rel="help" href="http://dev.w3.org/html5/spec/Overview.html#the-br-element"/>
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-br-element"/>
   </head>
   <body>
     <div class="instructions"><p>Test passes if the rightmost character in the first line below is a full stop and to the left of it is a Hebrew letter.</p></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-time-element/001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-time-element/001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-time-element/001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-time-element/001.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
 		<style>
 #time { visibility: hidden; }
 		</style>
-		<link rel="help" href="http://www.whatwg.org/html/#the-time-element">
+		<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-time-element">
 		<script src="/resources/testharness.js"></script>
 		<script src="/resources/testharnessreport.js"></script>
 	</head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/semantics/text-level-semantics/the-wbr-element/wbr-element.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>The wbr element</title>
 <link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="http://www.w3.org/html/wg/drafts/html/master/#rendering">
+<link rel=help href="https://html.spec.whatwg.org/multipage/#rendering">
 <link rel="reference" href="wbr-element-ref.html" />
 <link rel="mismatch" href="wbr-element-notref.html" />
 <meta name="flags" content="ahem">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,8 +2,8 @@
 <title>document.getElementsByTagName and foreign parser-inserted
 elements</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementsbytagname">
-<link rel="help" href="http://www.whatwg.org/html/#parsing">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-document-getelementsbytagname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#parsing">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Document.getElementsByTagName-foreign-02.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>getElementsByTagName and font</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-document-getelementsbytagname">
-<link rel="help" href="http://www.whatwg.org/html/#parsing">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-document-getelementsbytagname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#parsing">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-01.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>getElementsByTagName and font</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-getelementsbytagname">
-<link rel="help" href="http://www.whatwg.org/html/#parsing">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-element-getelementsbytagname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#parsing">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/Element.getElementsByTagName-foreign-02.html	2014-11-26 21:45:58.000000000 +0000
@@ -1,8 +1,8 @@
 <!doctype html>
 <title>getElementsByTagName and font</title>
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-element-getelementsbytagname">
-<link rel="help" href="http://www.whatwg.org/html/#parsing">
+<link rel="help" href="https://dom.spec.whatwg.org/#dom-element-getelementsbytagname">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#parsing">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-frameset-token.html	2014-11-26 21:45:58.000000000 +0000
@@ -19,7 +19,7 @@
  * According to http://www.w3.org/TR/2013/WD-html-templates-20130214/#template-contents-insertion-mode
  * when parser is in "template content" mode and meets <frameset> tag it should be switched to
  * "in body" insertion mode.
- * According to http://www.w3.org/html/wg/drafts/html/master/syntax.html#parsing-main-inbody
+ * According to https://html.spec.whatwg.org/multipage/#parsing-main-inbody
  * this token (FRAMESET) should be ignored
  */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-head-token.html	2014-11-26 21:45:58.000000000 +0000
@@ -19,7 +19,7 @@
  * According to http://www.w3.org/TR/2013/WD-html-templates-20130214/#template-contents-insertion-mode
  * when parser is in "template content" mode and meets <head> tag it should be switched to
  * "in body" insertion mode.
- * According to http://www.w3.org/html/wg/drafts/html/master/syntax.html#parsing-main-inbody
+ * According to https://html.spec.whatwg.org/multipage/#parsing-main-inbody
  * this token (HEAD) should be ignored
  */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing/template/additions-to-the-in-body-insertion-mode/ignore-html-token.html	2014-11-26 21:45:58.000000000 +0000
@@ -19,7 +19,7 @@
  * According to http://www.w3.org/TR/2013/WD-html-templates-20130214/#template-contents-insertion-mode
  * when parser is in "template content" mode and meets <html> tag it should be switched to
  * "in body" insertion mode.
- * According to http://www.w3.org/html/wg/drafts/html/master/syntax.html#parsing-main-inbody
+ * According to https://html.spec.whatwg.org/multipage/#parsing-main-inbody
  * this token (HTML) should be ignored
  */
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-001.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
   <title>HTTP charset</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-003.html differ
Binary files /tmp/vyS4zUifeA/thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html and /tmp/TR1sH7LEm2/thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-004.html differ
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-007.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>meta content attribute</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-009.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta charset="iso-8859-15"> <title>meta charset attribute</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
   <title>No encoding declaration</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta http-equiv="content-type" content="text/html;charset=iso-8859-1" > <title>HTTP vs meta content</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-018.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta charset="iso-8859-1" > <title>HTTP vs meta charset</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-030.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta charset="iso-8859-15" ><meta http-equiv="content-type" content="text/html;charset=iso-8859-1" > <title>meta charset, then meta content</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-034.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
   <title>HTTP vs UTF-8 BOM</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-037.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>UTF-8 BOM vs meta content</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/parsing-html-fragments/the-input-byte-stream-038.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
  <meta charset="iso-8859-15"> <title>UTF-8 BOM vs meta charset</title>
 <link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
+<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='http'>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/serializing-html-fragments/outerHTML.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/serializing-html-fragments/outerHTML.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/syntax/serializing-html-fragments/outerHTML.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/syntax/serializing-html-fragments/outerHTML.html	2014-11-26 21:45:58.000000000 +0000
@@ -3,7 +3,7 @@
   <head>
     <title>HTML Test: element.outerHTML to verify HTML fragment serialization algorithm</title>
     <link rel="author" title="Intel" href="http://www.intel.com/">
-    <link rel="help" href="http://www.w3.org/TR/2012/CR-html5-20121217/syntax.html#html-fragment-serialization-algorithm">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#html-fragment-serialization-algorithm">
     <link rel="help" href="https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-outerHTML">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/events/body-onload.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/events/body-onload.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/events/body-onload.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/events/body-onload.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <title>HTMLBodyElement.onload</title>
 <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu">
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#handler-window-onload">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#handler-window-onload">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,13 +6,13 @@
   <script src="/resources/testharnessreport.js"></script>
   <!--
 
-    In http://dev.w3.org/html5/spec/webappapis.html#creating-scripts ,
+    In https://html.spec.whatwg.org/multipage/#creating-scripts ,
     step 3 describes parsing the script, and step 5 says:
       # Otherwise, report the error using the onerror event handler of
       # the script's global object. If the error is still not handled
       # after this, then the error may be reported to the user.
     which links to
-    http://dev.w3.org/html5/spec/webappapis.html#report-the-error ,
+    https://html.spec.whatwg.org/multipage/#report-the-error ,
     which describes what to do when onerror is a Function.
 
     -->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
   <script src="/resources/testharnessreport.js"></script>
   <!--
 
-    http://www.w3.org/TR/html5/webappapis.html#runtime-script-errors
+    https://html.spec.whatwg.org/multipage/#runtime-script-errors
     says what to do for uncaught runtime script errors, and just below
     describes what to do when onerror is a Function.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html	2014-11-26 21:45:58.000000000 +0000
@@ -6,7 +6,7 @@
   <script src="/resources/testharnessreport.js"></script>
   <!--
 
-    http://www.w3.org/TR/html5/webappapis.html#runtime-script-errors
+    https://html.spec.whatwg.org/multipage/#runtime-script-errors
     says what to do for uncaught runtime script errors, and just below
     describes what to do when onerror is a Function.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-indexed.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset=utf-8>
 <title>Test for lack of indexed getter on Navigator</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#the-navigator-object">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-navigator-object">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/timers/evil-spec-example.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/timers/evil-spec-example.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/html/webappapis/timers/evil-spec-example.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/html/webappapis/timers/evil-spec-example.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,8 +2,8 @@
 <title>Interaction of setTimeout and WebIDL</title>
 <link rel="author" title="Ian Hickson" href="mailto:ian@hixie.ch">
 <link rel="author" title="Ms2ger" href="mailto:ms2ger@gmail.com">
-<link rel="help" href="http://www.whatwg.org/html/#dom-windowtimers-settimeout">
-<link rel="help" href="http://dev.w3.org/2006/webapi/WebIDL/#es-operations">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-windowtimers-settimeout">
+<link rel="help" href="https://heycam.github.io/webidl/#es-operations">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort.html	2014-11-26 21:45:58.000000000 +0000
@@ -10,40 +10,24 @@
 <div id="log"></div>
 
 <script>
-var video = document.createElement('video');
 var mimes = ['video/webm; codecs="vorbis,vp8"', 'video/mp4'];
 
-//check the browser supports the MIME used in this test
-function isTypeSupported(mime) {
-    if(!MediaSource.isTypeSupported(mime)) {
-        this.step(function() {
-            assert_unreached("Browser doesn't support the MIME used in this test: " + mime);
-        });
-        this.done();
-        return false;
-    }
-    return true;
-}
-function mediaTest(mime) {
-    async_test(function(t) {
-        if(!isTypeSupported.bind(t)(mime)) {
-            return;
-        }
+mimes.forEach(function(mime) {
+    async_test(function() {
+        assert_true(MediaSource.isTypeSupported(mime),
+                    "Browser doesn't support the MIME used in this test: " + mime);
+
         var mediaSource = new MediaSource();
-        mediaSource.addEventListener('sourceopen', function(e) {
+        mediaSource.addEventListener('sourceopen', this.step_func_done(function(e) {
             var sourceBuffer = mediaSource.addSourceBuffer(mime);
             sourceBuffer.abort();
-            t.step(function() {
-                assert_equals(sourceBuffer.appendWindowStart, 0);
-                assert_equals(sourceBuffer.appendWindowEnd, Number.POSITIVE_INFINITY);
-            });
-            t.done();
-        });
+            assert_equals(sourceBuffer.appendWindowStart, 0);
+            assert_equals(sourceBuffer.appendWindowEnd, Number.POSITIVE_INFINITY);
+        }));
+
+        var video = document.createElement('video');
         video.src = window.URL.createObjectURL(mediaSource);
     }, 'SourceBuffer#abort() (' + mime + '): Check the values of appendWindowStart and appendWindowEnd.');
-}
-mimes.forEach(function(mime) {
-    mediaTest(mime);
 });
 </script>
 </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-readyState.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-readyState.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-readyState.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-readyState.html	2014-11-26 21:45:58.000000000 +0000
@@ -10,7 +10,6 @@
 <div id="log"></div>
 
 <script>
-var video = document.createElement('video');
 var contents = {'/media/white.webm': 'video/webm; codecs="vorbis,vp8"',
                 '/media/white.mp4' : 'video/mp4'};
 
@@ -49,13 +48,15 @@
             mediaSource.addEventListener('sourceopen', function(e) {
                 sourceBuffer = mediaSource.addSourceBuffer(mime);
                 mediaSource.endOfStream();
+                assert_equals(mediaSource.readyState, 'ended',
+                              'mediaSource.readyState is "ended" after endOfStream()');
             });
-            mediaSource.addEventListener('sourceclose', function(e) {
+            mediaSource.addEventListener('sourceended', t.step_func_done(function(e) {
                 assert_throws({name: 'InvalidStateError'}, function() {
                     sourceBuffer.abort();
                 });
-                t.done();
-            });
+            }));
+            var video = document.createElement('video');
             video.src = window.URL.createObjectURL(mediaSource);
         });
     }, 'SourceBuffer#abort() (' + mime + ') : If the readyState attribute ' +
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-removed.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-removed.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-removed.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-removed.html	2014-11-26 21:45:58.000000000 +0000
@@ -10,7 +10,6 @@
 <div id="log"></div>
 
 <script>
-var video = document.createElement('video');
 var mimes = ['video/webm; codecs="vorbis,vp8"', 'video/mp4'];
 
 //check the browser supports the MIME used in this test
@@ -30,18 +29,16 @@
             return;
         }
         var mediaSource = new MediaSource();
-        mediaSource.addEventListener('sourceopen', function(e) {
+        mediaSource.addEventListener('sourceopen', t.step_func_done(function(e) {
             var sourceBuffer = mediaSource.addSourceBuffer(mime);
             mediaSource.removeSourceBuffer(sourceBuffer);
-            t.step(function() {
-                assert_throws({name: 'InvalidStateError'},
-                              function() {
-                                  sourceBuffer.abort();
-                              },
-                              'SourceBuffer#abort() after removing the SourceBuffer object');
-            });
-            t.done();
-        }, false);
+            assert_throws({name: 'InvalidStateError'},
+                          function() {
+                              sourceBuffer.abort();
+                          },
+                          'SourceBuffer#abort() after removing the SourceBuffer object');
+        }), false);
+        var video = document.createElement('video');
         video.src = window.URL.createObjectURL(mediaSource);
     }, 'SourceBuffer#abort (' + mime + ') : ' +
        'if this object has been removed from the sourceBuffers attribute of the parent media source, ' +
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-updating.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-updating.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-updating.html	2014-11-14 09:37:23.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/media-source/SourceBuffer-abort-updating.html	2014-11-26 21:45:58.000000000 +0000
@@ -10,7 +10,6 @@
 <div id="log"></div>
 
 <script>
-var video = document.createElement('video');
 var contents = {'/media/white.webm': 'video/webm; codecs="vorbis,vp8"',
                 '/media/white.mp4' : 'video/mp4'};
 
@@ -47,26 +46,22 @@
             var mediaSource = new MediaSource();
             var num_updateend = 0;
             var events = [];
-            mediaSource.addEventListener('sourceopen', function(e) {
+            mediaSource.addEventListener('sourceopen', t.step_func(function(e) {
                 var sourceBuffer = mediaSource.addSourceBuffer(mime);
-                t.step(function() {
-                    assert_equals(sourceBuffer.updating, false);
-                });
-                sourceBuffer.addEventListener('updatestart', function(e) {
+                assert_equals(sourceBuffer.updating, false);
+                sourceBuffer.addEventListener('updatestart', t.step_func(function(e) {
                     events.push('updatestart');
                     //abort when sourceBuffer#updating is true
                     sourceBuffer.abort();
 
-                    t.step(function() {
-                        assert_equals(sourceBuffer.updating, false,
-                                      'Check updating value after calling abort.');
-                        assert_equals(sourceBuffer.appendWindowStart, 0);
-                        assert_equals(sourceBuffer.appendWindowEnd, Number.POSITIVE_INFINITY);
-                    });
-                });
-                sourceBuffer.addEventListener('update', function(e) {
+                    assert_equals(sourceBuffer.updating, false,
+                                  'Check updating value after calling abort.');
+                    assert_equals(sourceBuffer.appendWindowStart, 0);
+                    assert_equals(sourceBuffer.appendWindowEnd, Number.POSITIVE_INFINITY);
+                }));
+                sourceBuffer.addEventListener('update', t.step_func(function(e) {
                     assert_unreached("Can't touch this");
-                });
+                }));
                 sourceBuffer.addEventListener('updateend', function(e) {
                     events.push('updateend');
                     mediaSource.endOfStream();
@@ -74,19 +69,17 @@
                 sourceBuffer.addEventListener('abort', function(e) {
                     events.push('abort');
                 });
-                sourceBuffer.addEventListener('error', function(e) {
+                sourceBuffer.addEventListener('error', t.step_func(function(e) {
                     assert_unreached("Can't touch this");
-                });
+                }));
                 sourceBuffer.appendBuffer(data);
-            });
-            mediaSource.addEventListener('sourceended', function(e) {
-                t.step(function() {
-                    assert_array_equals(events,
-                                        ['updatestart', 'abort', 'updateend'],
-                                        'Check the sequence of fired events.');
-                });
-                t.done();
-            });
+            }));
+            mediaSource.addEventListener('sourceended', t.step_func_done(function(e) {
+                assert_array_equals(events,
+                                    ['updatestart', 'abort', 'updateend'],
+                                    'Check the sequence of fired events.');
+            }));
+            var video = document.createElement('video');
             video.src = window.URL.createObjectURL(mediaSource);
         });
     }, 'SourceBuffer#abort() (' + mime + ') : Check the algorithm when the updating attribute is true.');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_button_attribute_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_button_attribute_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_button_attribute_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_button_attribute_mouse-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -30,13 +30,12 @@
                 // If pointerType is "mouse" and no mouse button is depressed, then the button attribute of the pointermove event must be -1 and the buttons attribute must be 0.
                 // TA: 5.8
                 on_event(target0, "pointerover", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     if(event.pointerType != "mouse") {
                         alert("Use mouse for this test please!");
                         return;
                     }
                     if (eventTested == false) {
-                        detected_pointertypes[event.pointerType] = true;
-
                         test(function() {
                             assert_true(event.button == -1, "If mouse buttons are released button attribute is -1")
                         }, "If mouse buttons are released button attribute is -1");
@@ -52,7 +51,6 @@
         <h1>Pointer Events button attribute test for mouse test</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_mouse-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -37,6 +37,9 @@
             var ownEventForTheCapturedTargetGot = false;
             var count=0;
 
+            var detected_pointertypes = {};
+            add_completion_callback(showPointerTypes);
+
             var target0 = document.getElementById('target0');
             var target1 = document.getElementById('target1');
             var captureButton = document.getElementById('btnCapture');
@@ -71,6 +74,7 @@
                 var test_pointermove1 = async_test("pointerover event for purple rectangle received")
 
                 on_event(target0, "pointermove", function (event) {
+                    detected_pointertypes[ event.pointerType ] = true;
                     if(!pointermoveNoCaptureGot0) {
                         test_pointermove0.done();
                         log("pointermove", document.getElementById('target0'));
@@ -120,7 +124,9 @@
             }
         </script>
         <h1>Pointer Events Capture Test</h1>
-        <div id="complete-notice"></div>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
         <div id="log"></div>
     </body>
 </html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -36,6 +36,9 @@
             var isRelatedTargetValueTested = false;
             var count = 0;
 
+            var detected_pointertypes = {};
+            add_completion_callback(showPointerTypes);
+
             var target0 = document.getElementById('target0');
             var target1 = document.getElementById('target1');
             var captureButton = document.getElementById('btnCapture');
@@ -79,6 +82,7 @@
 
             function run() {
                 on_event(target0, "pointerover", function (event) {
+                    detected_pointertypes[ event.pointerType ] = true;
                     log("pointerover", target0);
                     if(isPointerCapture) {
                         test_pointerover_capture.done();
@@ -163,7 +167,9 @@
             }
         </script>
         <h1>Pointer Events Capture Test</h1>
-        <div id="complete-notice"></div>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
         <div id="log"></div>
     </body>
 </html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -105,6 +105,7 @@
                 });
 
                 on_event(target0, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
                     if(!styleIsChanged) {
                         var before = document.getElementById('target0').style.touchAction;
 
@@ -116,7 +117,6 @@
                             assert_true(before != after, "touch-action was changed");
                         }, "touch-action was changed");
 
-                        detected_pointertypes[event.pointerType] = true;
                         styleIsChanged = true;
                     }
                 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_constructor.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_constructor.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_constructor.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_constructor.html	2014-11-26 21:45:58.000000000 +0000
@@ -68,9 +68,10 @@
                     ["default isPrimary", event.isPrimary, false]
                 ]);
             });
-            
-            if(typeof(PointerEvent) != "undefined") {
-                try { 
+
+            test(function() {
+                assert_not_equals(window.PointerEvent, undefined);
+
                 pointerEventCustom = new PointerEvent("pointerover",
                 {bubbles: testBubbles,
                 cancelable: testCancelable,
@@ -92,10 +93,7 @@
                 pointerEventDefault = new PointerEvent("pointerout");
                 target0.dispatchEvent(pointerEventDefault);
                 done();
-                }catch(e) {
-                    assert_unreached("Construction and dispatching of PointerEvent failed");
-                }
-            }
+            }, "PointerEvent constructor");
         }
     </script>
     <div id="complete-notice">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_gotpointercapture_before_first_pointerevent-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_gotpointercapture_before_first_pointerevent-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_gotpointercapture_before_first_pointerevent-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_gotpointercapture_before_first_pointerevent-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("gotpointercapture event"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -54,8 +54,6 @@
                                 assert_false(eventRcvd, "no other events should be received before gotpointercapture." + eventsRcvd_str);
                                 assert_equals(event.pointerId, pointerdown_event.pointerId, "pointerID is same for pointerdown and gotpointercapture");
                             });
-
-                            detected_pointertypes[event.pointerType] = true;
                         }
                         else {
                             if (pointerdown_event.pointerId === event.pointerId) {
@@ -70,6 +68,7 @@
 
                 // set pointer capture
                 on_event(target0, "pointerdown", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     pointerdown_event = event;
                     listener.setPointerCapture(event.pointerId);
                     isWaiting = true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Lostpointercapture fires on document when target is removed</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <script src="pointerevent_support.js"></script>
-    </head>
-    <body>
-        <h1>Pointer Events - lostpointercapture when capturing element is removed</h1>
-        <h4>
-            Test Description:
-            This test checks if lostpointercapture is fired at the document when the capturing node is removed from the document.
-            Complete the folowing actions:
-            <ol>
-                <li>Press and hold left mouse button over "Set Capture" button. "gotpointercapture" should be logged inside of the black rectangle.
-                <li>"lostpointercapture" should be logged inside of the black rectangle after a short delay.
-            </ol>
-        </h4>
-        <div id="target0"></div>
-        <div id="target1" style="background:black; color:white"></div>
-        <br>
-        <input type="button" id="btnCapture" value="Set Capture">
-        <script type='text/javascript'>
-            var isDisconnected = false;
-            var count = 0;
-
-            var target0 = document.getElementById('target0');
-            var target1 = document.getElementById('target1');
-            var captureButton = document.getElementById('btnCapture');
-
-            var test_lostpointercapture = async_test("lostpointercapture event received");
-
-            window.onload = function() {
-                on_event(captureButton, 'pointerdown', function(e) {
-                    sPointerCapture(e);
-                });
-
-                on_event(target0, 'gotpointercapture', function(e) {
-                    log("gotpointercapture", target1);
-                    setTimeout(function() {
-                        isDisconnected = true;
-                        target0.parentNode.removeChild(target0);
-                    }, 250);
-                });
-
-                on_event(target0, 'lostpointercapture', function(e) {
-                    log("lostpointercapture on element", target1);
-                    test(function() {
-                        // TA: 11.3
-                        assert_unreached("lostpointercapture must be fired on the document, not the capturing element");
-                    }, "lostpointercapture must not be dispatched on the disconnected node");
-                });
-
-                on_event(document, 'lostpointercapture', function(e) {
-                    log("lostpointercapture on document", target1);
-                    test(function() {
-                        // TA: 11.3
-                        assert_true(isDisconnected, "lostpointercapture must be fired on the document");
-
-                    }, "lostpointercapture is dispatched on the document");
-                    test_lostpointercapture.done();
-                });
-            }
-        </script>
-        <h1>Pointer Events Capture Test</h1>
-        <div id="complete-notice">
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,78 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Lostpointercapture fires on document when target is removed</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="pointerevent_support.js"></script>
+    </head>
+    <body>
+        <h1>Pointer Events - lostpointercapture when capturing element is removed</h1>
+        <h4>
+            Test Description:
+            This test checks if lostpointercapture is fired at the document when the capturing node is removed from the document.
+            Complete the following actions:
+            <ol>
+                <li>Press and hold left mouse button over "Set Capture" button. "gotpointercapture" should be logged inside of the black rectangle.
+                <li>"lostpointercapture" should be logged inside of the black rectangle after a short delay.
+            </ol>
+        </h4>
+        <div id="target0"></div>
+        <div id="target1" style="background:black; color:white"></div>
+        <br>
+        <input type="button" id="btnCapture" value="Set Capture">
+        <script type='text/javascript'>
+            var isDisconnected = false;
+            var count = 0;
+
+            var detected_pointertypes = {};
+            add_completion_callback(showPointerTypes);
+
+            var target0 = document.getElementById('target0');
+            var target1 = document.getElementById('target1');
+            var captureButton = document.getElementById('btnCapture');
+
+            var test_lostpointercapture = async_test("lostpointercapture event received");
+
+            window.onload = function() {
+                on_event(captureButton, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    sPointerCapture(event);
+                });
+
+                on_event(target0, 'gotpointercapture', function(e) {
+                    log("gotpointercapture", target1);
+                    setTimeout(function() {
+                        isDisconnected = true;
+                        target0.parentNode.removeChild(target0);
+                    }, 250);
+                });
+
+                on_event(target0, 'lostpointercapture', function(e) {
+                    log("lostpointercapture on element", target1);
+                    test(function() {
+                        // TA: 11.3
+                        assert_unreached("lostpointercapture must be fired on the document, not the capturing element");
+                    }, "lostpointercapture must not be dispatched on the disconnected node");
+                });
+
+                on_event(document, 'lostpointercapture', function(e) {
+                    log("lostpointercapture on document", target1);
+                    test(function() {
+                        // TA: 11.3
+                        assert_true(isDisconnected, "lostpointercapture must be fired on the document");
+
+                    }, "lostpointercapture is dispatched on the document");
+                    test_lostpointercapture.done();
+                });
+            }
+        </script>
+        <h1>Pointer Events Capture Test</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_is_first-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_is_first-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_is_first-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_lostpointercapture_is_first-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -2,18 +2,19 @@
 <html>
     <head>
         <title>Lostpointercapture triggers first and asynchronously</title>
+        <meta name="assert" content="TA11.1: After pointer capture is released for a pointer, and prior to any subsequent events for the pointer, the lostpointercapture event must be dispatched to the element from which pointer capture was removed; TA11.2: lostpointercapture must be dispatched asynchronously.">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="pointerevent_support.js"></script>
     </head>
-    <body>
+    <body onload="run()">
         <h1>Pointer Events capture test - lostpointercapture order</h1>
         <h4>
             Test Description:
             This test checks if lostpointercapture is handled asynchronously and prior to all subsequent events.
-            Complete the folowing actions:
+            Complete the following actions:
             <ol>
                 <li>Press and hold left mouse button over "Set Capture" button. "gotpointercapture" should be logged inside of the black rectangle
                 <li>"lostpointercapture" should be logged inside of the black rectangle after a short delay
@@ -24,121 +25,86 @@
         <br>
         <input type="button" id="btnCapture" value="Set Capture">
         <script type='text/javascript'>
+            var detected_pointertypes = {};
+            var detected_pointerEvents = new Array();
+            var pointerdown_event = null;
+
+            var test_pointerEvent = async_test("lostpointercapture is dispatched prior to subsequent events"); // set up test harness
+
             var isPointerCapture = false;
             var count=0;
 
-            var pointeroverReceived, pointeroutReceived,
-                pointermoveReceived, pointerdownReceived,
-                pointerupReceived, pointerleaveReceived,
-                pointerenterReceived;
-
             var testStarted = false;
+            var eventRcvd = false;
             var isAsync = false;
 
+            add_completion_callback(showPointerTypes);
+
             var target0 = document.getElementById('target0');
-            var target1 = document.getElementById('target1');
             var captureButton = document.getElementById('btnCapture');
 
-            window.onload = function() {
-
-                on_event(captureButton, 'pointerdown', function(e) {
+            function run() {
+                on_event(captureButton, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    pointerdown_event = event;
                     if(isPointerCapture == false) {
                         isPointerCapture = true;
                         captureButton.value = 'Release Capture';
-                        sPointerCapture(e);
-                        setTimeout(function() {
-                            pointeroverReceived = false;
-                            pointeroutReceived = false;
-                            pointermoveReceived = false;
-                            pointerdownReceived = false;
-                            pointerupReceived = false;
-                            pointerleaveReceived = false;
-                            pointerenterReceived = false;
-                            rPointerCapture(e);
-                            isAsync = true;
-                        });
+                        sPointerCapture(event);
                     }
-                 });
-
-                on_event(target0, 'gotpointercapture', function(e) {
-                    log("gotpointercapture", document.getElementById('target0'));
                 });
 
-                on_event(target0, 'lostpointercapture', function(e) {
-                    log("lostpointercapture", document.getElementById('target0'));
-                    captureButton.value = 'Set Capture';
-                    isPointerCapture = false;
-
-                    testStarted = false;
-
-                    test(function() {
-                        // TA: 11.2
-                        assert_true(isAsync, "lostpointercapture must be fired asynchronously");
-
-                        assert_true((pointeroverReceived == false)&&
-                        (pointeroutReceived == false)&&
-                        (pointerdownReceived == false)&&
-                        (pointerupReceived == false)&&
-                        (pointermoveReceived ==false)&&
-                        (pointerenterReceived == false)&&
-                        (pointerleaveReceived == false)
-                        , "lostpointercapture is dispatched prior to subsequent events");
-                    }, "lostpointercapture is dispatched prior to subsequent events");
-                });
-
-                run();
-            }
-
-            function run() {
                 // After pointer capture is released for a pointer, and prior to any subsequent events for the pointer,
                 // the lostpointercapture event must be dispatched to the element from which pointer capture was removed.
                 // TA: 11.1
-                on_event(target0, "pointerover", function (event) {
-                    if(testStarted == true) {
-                        pointeroverReceived = true;
-                    }
-                });
-
-                on_event(target0, "pointerout", function (event) {
-                    if(testStarted == true) {
-                        pointeroutReceived = true;
-                    }
-                });
-
-                on_event(target0, "pointerdown", function (event) {
-                    if(testStarted == true) {
-                        pointerdownReceived = true;
-                    }
-                });
-
-                on_event(target0, "pointerup", function (event) {
-                    if(testStarted == true) {
-                        pointerupReceived = true;
-                    }
-                    testStarted = true;
-                });
-
-                on_event(target0, "pointermove", function (event) {
-                    if(testStarted == true) {
-                        pointermoveReceived = true;
-                    }
-                });
-
-                on_event(target0, "pointerenter", function (event) {
-                    if(testStarted == true) {
-                        pointerenterReceived = true;
-                    }
-                });
-
-                on_event(target0, "pointerleave", function (event) {
-                    if(testStarted == true) {
-                        pointerleaveReceived = true;
-                    }
-                });
+                // listen to all events
+                for (var i = 0; i < All_Pointer_Events.length; i++) {
+                    on_event(target0, All_Pointer_Events[i], function (event) {
+                        // if the event was gotpointercapture, just log it and return
+                        if (event.type == "gotpointercapture") {
+                            testStarted = true;
+                            rPointerCapture(event);
+                            isAsync = true;
+                            log("gotpointercapture", target0);
+                            return;
+                        }
+                        else if (event.type == "lostpointercapture") {
+                            log("lostpointercapture", target0);
+                            captureButton.value = 'Set Capture';
+                            isPointerCapture = false;
+
+                            // TA: 11.2
+                            test_pointerEvent.step(function () {
+                                assert_true(isAsync, "lostpointercapture must be fired asynchronously");
+                             });
+
+                            // if any events have been received with same pointerId before lostpointercapture, then fail
+                            var eventsRcvd_str = "";
+                            if (eventRcvd) {
+                                eventsRcvd_str = "Events received before lostpointercapture: ";
+                                for (var i = 0; i < detected_pointerEvents.length; i++) {
+                                    eventsRcvd_str += detected_pointerEvents[i] + ", ";
+                                }
+                            }
+                            test_pointerEvent.step(function () {
+                                assert_false(eventRcvd, "no other events should be received before lostpointercapture." + eventsRcvd_str);
+                                assert_equals(event.pointerId, pointerdown_event.pointerId, "pointerID is same for pointerdown and lostpointercapture");
+                            });
+                            test_pointerEvent.done(); // complete test
+                        }
+                        else {
+                            if (testStarted && pointerdown_event != null && pointerdown_event.pointerId === event.pointerId) {
+                                detected_pointerEvents.push(event.type);
+                                eventRcvd = true;
+                            }
+                        }
+                    });
+                }
             }
         </script>
         <h1>Pointer Events Capture Test</h1>
         <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointercancel_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointercancel_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointercancel_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointercancel_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -13,9 +13,9 @@
         <h1>pointercancel test</h1>
         <h3>Warning: this test works properly only for devices that have touchscreen</h3>
         <h4>
-		Test Description: This test checks if pointercancel event triggers.
-		<p>Start touch over the black rectangle and then move your finger to scroll the page.</p>
-		</h4>
+        Test Description: This test checks if pointercancel event triggers.
+        <p>Start touch over the black rectangle and then move your finger to scroll the page.</p>
+        </h4>
         <p>
         <div id="target0" style="background: black"></div>
         <script>
@@ -71,7 +71,6 @@
         <h1>Pointer Events pointercancel Tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerdown-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerdown-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerdown-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerdown-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -17,7 +17,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerdown event received");
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -27,10 +27,9 @@
                 var pointerover_event;
 
                 on_event(target0, "pointerover", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     pointerover_event = event;
                     check_PointerEvent(event);
-
-                    detected_pointertypes[event.pointerType] = true;
                 });
 
                 on_event(target0, "pointerdown", function (event) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_does_not_bubble-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_does_not_bubble-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_does_not_bubble-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_does_not_bubble-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerEnter event does not bubble"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -30,11 +30,9 @@
 
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
-                        assert_equals(event.type, "pointerenter", "pointer event received" + event.type);
+                        assert_equals(event.type, "pointerenter", "pointer event received: " + event.type);
                         assert_false(event.bubbles, "pointerenter event.bubbles should be false: " + event.bubbles);
                     });
-
-                    detected_pointertypes[event.pointerType] = true;
                 });
                 on_event(target0, "pointerout", function (event) {
                     test_pointerEvent.step(function () {
@@ -45,6 +43,7 @@
 
                 // parent
                 on_event(parent0, "pointerenter", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.step(function () {
                         assert_equals(event.target.id, "parent0", "Recieved " + event.type + " in parent for " + event.target.id);
                     });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerenter event"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -23,11 +23,11 @@
                 var target0 = document.getElementById("target0");
 
                 on_event(target0, "pointerenter", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.type, "pointerenter", "pointer event received: " + event.type);
                     });
-                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.done(); // complete test
                 });
             }
@@ -45,7 +45,7 @@
         <div id="complete-notice">
             <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_nohover-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_nohover-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_nohover-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerenter_nohover-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -16,7 +16,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerenter event"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -31,7 +31,7 @@
                     if(event.pointerType == 'touch') {
                         check_PointerEvent(event);
                         test_pointerEvent.step(function () {
-                            assert_equals(event.type, "pointerdown", "pointer event received" + event.type);
+                            assert_equals(event.type, "pointerdown", "pointer event received: " + event.type);
                             assert_true(f_pointerenter_rcvd, "pointerenter event should have been received before pointerdown");
                             assert_equals(event.pointerType, pointerenter_event.pointerType, "pointerType is same for pointerenter and pointerdown");
                             assert_equals(event.isPrimary, pointerenter_event.isPrimary, "isPrimary is same for pointerenter and pointerdown");
@@ -41,14 +41,14 @@
                 });
 
                 on_event(target0, "pointerenter", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     if(event.pointerType == 'touch') {
                         pointerenter_event = event;
                         check_PointerEvent(event);
                         test_pointerEvent.step(function () {
-                            assert_equals(event.type, "pointerenter", "pointer event received" + event.type);
+                            assert_equals(event.type, "pointerenter", "pointer event received: " + event.type);
                         });
                         f_pointerenter_rcvd = true;
-                        detected_pointertypes[event.pointerType] = true;
                     }
                 });
             }
@@ -68,7 +68,6 @@
         <div id="complete-notice">
             <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type?</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>pointerleave after pointercancel</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-    </head>
-    <body class="scrollable" onload="run()">
-        <h2>pointerleave after pointercancel</h2>
-        <h4>Test Description: This test checks if pointerleave event triggers after pointercancel. Start touch on the black rectangle and move your touch to scroll in any direction. </h4>
-        <p>Note: this test is for touch devices only</p>
-        <div id="target0"></div>
-        <script>
-            var test_pointerleave = async_test("pointerleave event received");
-            // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callback function will reference the test_pointerEvent object and
-            // will fail unless the async_test is created with the var name "test_pointerEvent".
-            add_completion_callback(showPointerTypes);
-
-            var eventTested = false;
-            var pointercancel_event = null;
-            var detected_pointertypes = {};
-
-            function run() {
-                var target0 = document.getElementById("target0");
-
-                on_event(target0, "pointercancel", function (event) {
-                    pointercancel_event = event;
-                });
-
-                // After firing the pointercancel event the pointerleave event must be dispatched.
-                // TA: 4.3.1
-                on_event(target0, "pointerleave", function (event) {
-                    if(event.pointerType == 'touch') {
-                        detected_pointertypes[event.pointerType] = true;
-                        if(pointercancel_event != null) {
-                            if(eventTested == false) {
-                                test_pointerleave.step(function() {
-                                    assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerleave");
-                                    assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerleave");
-                                });
-                                eventTested = true;
-                                test_pointerleave.done();
-                            }
-                        }
-                        else {
-                            test_pointerleave.step(function() {
-                                assert_unreached("pointerleave received before pointercancel");
-                            }, "pointerleave received before pointercancel");
-                        }
-                    }
-                });
-            }
-
-        </script>
-        <h1>Pointer Events pointerleave tests</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,66 @@
+<!doctype html>
+<html>
+    <head>
+        <title>pointerleave after pointercancel</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+    </head>
+    <body class="scrollable" onload="run()">
+        <h2>pointerleave after pointercancel</h2>
+        <h4>Test Description: This test checks if pointerleave event triggers after pointercancel. Start touch on the black rectangle and move your touch to scroll in any direction. </h4>
+        <p>Note: this test is for touch devices only</p>
+        <div id="target0"></div>
+        <script>
+            var test_pointerleave = async_test("pointerleave event received");
+            // showPointerTypes is defined in pointerevent_support.js
+            // Requirements: the callback function will reference the test_pointerEvent object and
+            // will fail unless the async_test is created with the var name "test_pointerEvent".
+            add_completion_callback(showPointerTypes);
+
+            var eventTested = false;
+            var pointercancel_event = null;
+            var detected_pointertypes = {};
+
+            function run() {
+                var target0 = document.getElementById("target0");
+
+                on_event(target0, "pointercancel", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    pointercancel_event = event;
+                });
+
+                // After firing the pointercancel event the pointerleave event must be dispatched.
+                // TA: 4.3.1
+                on_event(target0, "pointerleave", function (event) {
+                    if(event.pointerType == 'touch') {
+                        if(pointercancel_event != null) {
+                            if(eventTested == false) {
+                                test_pointerleave.step(function() {
+                                    assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerleave");
+                                    assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerleave");
+                                });
+                                eventTested = true;
+                                test_pointerleave.done();
+                            }
+                        }
+                        else {
+                            test_pointerleave.step(function() {
+                                assert_unreached("pointerleave received before pointercancel");
+                            }, "pointerleave received before pointercancel");
+                        }
+                    }
+                });
+            }
+
+        </script>
+        <h1>Pointer Events pointerleave tests</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>pointerleave after pointerup</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-    </head>
-    <body onload="run()">
-        <h2>pointerleave after pointerup</h2>
-        <h4>Test Description: This test checks if pointerleave event triggers for devices that don't support hover. Tap the black rectangle. </h4>
-        <p>Note: this test is only for devices that do not support hover.</p>
-        <div id="target0"></div>
-        <script>
-            var test_pointerleave = async_test("pointerleave event received");
-            // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callback function will reference the test_pointerEvent object and
-            // will fail unless the async_test is created with the var name "test_pointerEvent".
-            add_completion_callback(showPointerTypes);
-
-            var eventTested = false;
-            var isPointerupReceived = false;
-            var pointerup_event = null;
-            var detected_pointertypes = {};
-
-            function run() {
-                var target0 = document.getElementById("target0");
-
-                on_event(target0, "pointerup", function (event) {
-                    pointerup_event = event;
-                });
-
-                // For input devices that do not support hover, a pointerleave event must follow the pointerup event.
-                // TA: 3.6
-                on_event(target0, "pointerleave", function (event) {
-                    if(event.pointerType == 'touch') {
-                        detected_pointertypes[event.pointerType] = true;
-                        if(pointerup_event != null) {
-                            if(eventTested == false) {
-                                eventTested = true;
-                                test_pointerleave.step(function() {
-                                    assert_equals(event.pointerType, pointerup_event.pointerType, "pointerType is same for pointerup and pointerleave");
-                                    assert_equals(event.isPrimary, pointerup_event.isPrimary, "isPrimary is same for pointerup and pointerleave");
-                                });
-                                test_pointerleave.done();
-                            }
-                        }
-                        else {
-                            test_pointerleave.step(function() {
-                                assert_unreached("pointerleave received before pointerup");
-                            }, "pointerleave received before pointerup");
-                        }
-                    }
-                });
-            }
-
-        </script>
-        <h1>Pointer Events pointerleave tests</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_after_pointerup_nohover-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,67 @@
+<!doctype html>
+<html>
+    <head>
+        <title>pointerleave after pointerup</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+    </head>
+    <body onload="run()">
+        <h2>pointerleave after pointerup</h2>
+        <h4>Test Description: This test checks if pointerleave event triggers for devices that don't support hover. Tap the black rectangle. </h4>
+        <p>Note: this test is only for devices that do not support hover.</p>
+        <div id="target0"></div>
+        <script>
+            var test_pointerleave = async_test("pointerleave event received");
+            // showPointerTypes is defined in pointerevent_support.js
+            // Requirements: the callback function will reference the test_pointerEvent object and
+            // will fail unless the async_test is created with the var name "test_pointerEvent".
+            add_completion_callback(showPointerTypes);
+
+            var eventTested = false;
+            var isPointerupReceived = false;
+            var pointerup_event = null;
+            var detected_pointertypes = {};
+
+            function run() {
+                var target0 = document.getElementById("target0");
+
+                on_event(target0, "pointerup", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    pointerup_event = event;
+                });
+
+                // For input devices that do not support hover, a pointerleave event must follow the pointerup event.
+                // TA: 3.6
+                on_event(target0, "pointerleave", function (event) {
+                    if(event.pointerType == 'touch') {
+                        if(pointerup_event != null) {
+                            if(eventTested == false) {
+                                eventTested = true;
+                                test_pointerleave.step(function() {
+                                    assert_equals(event.pointerType, pointerup_event.pointerType, "pointerType is same for pointerup and pointerleave");
+                                    assert_equals(event.isPrimary, pointerup_event.isPrimary, "isPrimary is same for pointerup and pointerleave");
+                                });
+                                test_pointerleave.done();
+                            }
+                        }
+                        else {
+                            test_pointerleave.step(function() {
+                                assert_unreached("pointerleave received before pointerup");
+                            }, "pointerleave received before pointerup");
+                        }
+                    }
+                });
+            }
+
+        </script>
+        <h1>Pointer Events pointerleave tests</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendant_over-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendant_over-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendant_over-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendant_over-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -54,7 +54,7 @@
         <h1>Pointer Events pointerleave tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendants-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendants-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendants-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_descendants-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -36,8 +36,6 @@
                 // TA: 9.1
                 on_event(target0, "pointerleave", function (event) {
                     if (eventTested == false) {
-                        detected_pointertypes[event.pointerType] = true;
-
                         test_pointerleave.done();
                         eventTested = true;
                     }
@@ -47,7 +45,7 @@
         <h1>Pointer Events pointerleave tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_does_not_bubble-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_does_not_bubble-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_does_not_bubble-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_does_not_bubble-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerLeave event does not bubble"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -24,13 +24,12 @@
                 var parent0 = document.getElementById("parent0");
 
                 on_event(target0, "pointerleave", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.type, "pointerleave", "pointer event received: " + event.type);
                         assert_false(event.bubbles, "pointerleave event.bubbles should be false: " + event.bubbles);
                     });
-
-                    detected_pointertypes[event.pointerType] = true;
                 });
 
                 on_event(parent0, "pointerleave", function (event) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_mouse-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerleave event"); // set up test harness;
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -23,12 +23,12 @@
                 var target0 = document.getElementById("target0");
 
                 on_event(target0, "pointerleave", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.pointerType, "mouse", "Test should be run using a mouse as input.");
                         assert_equals(event.type, "pointerleave", "The " + event.type + " event was received.");
                     });
-                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.done(); // complete test
                 });
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_pen-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_pen-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_pen-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_pen-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerleave event"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -23,6 +23,7 @@
                 var target0 = document.getElementById("target0");
 
                 on_event(target0, "pointerleave", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.pointerType, "pen", "Test should be run using a pen as input");
@@ -33,7 +34,6 @@
                             (event.clientY < target0.getBoundingClientRect().bottom),
                             "pointerleave should be received inside of target bounds");
                     });
-                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.done(); // complete test
                 });
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerleave_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerleave event");
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -23,12 +23,12 @@
                 var target0 = document.getElementById("target0");
 
                 on_event(target0, "pointerleave", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.pointerType, "touch", "Test should be run using touch input");
                         assert_equals(event.type, "pointerleave", "The " + event.type + " event received");
                     });
-                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.done(); // complete test
                 });
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_isprimary_same_as_pointerdown-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -63,6 +63,7 @@
         <div id="complete-notice">
             <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -22,14 +22,12 @@
 
             function run() {
                 var target0 = document.getElementById("target0");
-                
 
                 // When a pointer changes coordinates, the pointermove event must be dispatched.
                 // TA: 5.3
                 on_event(target0, "pointermove", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     if (eventTested == false) {
-                        detected_pointertypes[event.pointerType] = true;
-
                         test_pointermove.done();
                         eventTested = true;
                     }
@@ -39,7 +37,7 @@
         <h1>Pointer Events pointermove Tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="javascript:location.reload()">run the tests again</a> with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_pointertype-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_pointertype-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_pointertype-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointermove_pointertype-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -57,7 +57,7 @@
         <h1>Pointer Events pointerType conservation tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="javascript:location.reload()">run the tests again</a> with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>pointerout</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-    </head>
-    <body class="scrollable" onload="run()">
-        <h2>pointerout</h2>
-        <h4>Test Description: This test checks if pointerout event triggers after pointercancel. Start touch on the black rectangle and move your touch to scroll in any direction. </h4>
-        <p>Note: this test is for touch devices only</p>
-        <div id="target0"></div>
-        <script>
-            var test_pointerout = async_test("pointerout event received");
-            // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callback function will reference the test_pointerEvent object and
-            // will fail unless the async_test is created with the var name "test_pointerEvent".
-            add_completion_callback(showPointerTypes);
-
-            var eventTested = false;
-            var pointercancel_event = null;
-            var detected_pointertypes = {};
-
-            function run() {
-                var target0 = document.getElementById("target0");
-
-                on_event(target0, "pointercancel", function (event) {
-                    pointercancel_event = event;
-                });
-
-                // After firing the pointercancel event the pointerout event must be dispatched.
-                // TA: 4.3
-                on_event(target0, "pointerout", function (event) {
-                    if(event.pointerType == 'touch') {
-                        detected_pointertypes[event.pointerType] = true;
-                        if(pointercancel_event != null) {
-                            if (eventTested == false) {
-                                test_pointerout.step(function() {
-                                    assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerout");
-                                    assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerout");
-                                });
-                                eventTested = true;
-                                test_pointerout.done();
-                            }
-                        }
-                        else {
-                            test_pointerout.step(function() {
-                                assert_true(false,
-                                "pointercancel received before pointerout");
-                            }, "pointercancel received before pointerout");
-                        }
-                    }
-                });
-            }
-
-        </script>
-        <h1>Pointer Events pointerout tests</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,67 @@
+<!doctype html>
+<html>
+    <head>
+        <title>pointerout</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+    </head>
+    <body class="scrollable" onload="run()">
+        <h2>pointerout</h2>
+        <h4>Test Description: This test checks if pointerout event triggers after pointercancel. Start touch on the black rectangle and move your touch to scroll in any direction. </h4>
+        <p>Note: this test is for touch devices only</p>
+        <div id="target0"></div>
+        <script>
+            var test_pointerout = async_test("pointerout event received");
+            // showPointerTypes is defined in pointerevent_support.js
+            // Requirements: the callback function will reference the test_pointerEvent object and
+            // will fail unless the async_test is created with the var name "test_pointerEvent".
+            add_completion_callback(showPointerTypes);
+
+            var eventTested = false;
+            var pointercancel_event = null;
+            var detected_pointertypes = {};
+
+            function run() {
+                var target0 = document.getElementById("target0");
+
+                on_event(target0, "pointercancel", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    pointercancel_event = event;
+                });
+
+                // After firing the pointercancel event the pointerout event must be dispatched.
+                // TA: 4.3
+                on_event(target0, "pointerout", function (event) {
+                    if(event.pointerType == 'touch') {
+                        if(pointercancel_event != null) {
+                            if (eventTested == false) {
+                                test_pointerout.step(function() {
+                                    assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerout");
+                                    assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerout");
+                                });
+                                eventTested = true;
+                                test_pointerout.done();
+                            }
+                        }
+                        else {
+                            test_pointerout.step(function() {
+                                assert_true(false,
+                                "pointercancel received before pointerout");
+                            }, "pointercancel received before pointerout");
+                        }
+                    }
+                });
+            }
+
+        </script>
+        <h1>Pointer Events pointerout tests</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>pointerout</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-    </head>
-    <body onload="run()">
-        <h2>pointerout</h2>
-        <h4>Test Description: This test checks if pointerout event triggers for devices that don't support hover. Tap the black rectangle. </h4>
-        <p>Note: this test is only for devices that do not support hover.</p>
-        <div id="target0"></div>
-        <script>
-            var test_pointerout = async_test("pointerout event received");
-            // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
-            // will fail unless the async_test is created with the var name "test_pointerEvent".
-            add_completion_callback(showPointerTypes);
-
-            var eventTested = false;
-            var pointerup_event = null;
-            var detected_pointertypes = {};
-
-            function run() {
-                var target0 = document.getElementById("target0");
-
-                on_event(target0, "pointerup", function (event) {
-                    pointerup_event = event;
-                });
-
-                // For input devices that do not support hover, a pointerout event must follow the pointerup event.
-                // TA: 3.6
-                on_event(target0, "pointerout", function (event) {
-                    if(event.pointerType == 'touch') {
-                        detected_pointertypes[event.pointerType] = true;
-                        if(pointerup_event != null) {
-                            if(eventTested == false) {
-                                test_pointerout.step(function() {
-                                    assert_equals(event.pointerType, pointerup_event.pointerType, "pointerType is same for pointerup and pointerout");
-                                    assert_equals(event.isPrimary, pointerup_event.isPrimary, "isPrimary is same for pointerup and pointerout");
-                                });
-                                eventTested = true;
-                                test_pointerout.done();
-                            }
-                        }
-                        else {
-                            test_pointerout.step(function() {
-                                assert_true(false,
-                                "pointerup received before pointerout");
-                            }, "pointerup received before pointerout");
-                        }
-                    }
-                });
-            }
-
-        </script>
-        <h1>Pointer Events pointerout tests</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_after_pointerup_nohover-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,67 @@
+<!doctype html>
+<html>
+    <head>
+        <title>pointerout</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+    </head>
+    <body onload="run()">
+        <h2>pointerout</h2>
+        <h4>Test Description: This test checks if pointerout event triggers for devices that don't support hover. Tap the black rectangle. </h4>
+        <p>Note: this test is only for devices that do not support hover.</p>
+        <div id="target0"></div>
+        <script>
+            var test_pointerout = async_test("pointerout event received");
+            // showPointerTypes is defined in pointerevent_support.js
+            // Requirements: the callback function will reference the test_pointerEvent object and
+            // will fail unless the async_test is created with the var name "test_pointerEvent".
+            add_completion_callback(showPointerTypes);
+
+            var eventTested = false;
+            var pointerup_event = null;
+            var detected_pointertypes = {};
+
+            function run() {
+                var target0 = document.getElementById("target0");
+
+                on_event(target0, "pointerup", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    pointerup_event = event;
+                });
+
+                // For input devices that do not support hover, a pointerout event must follow the pointerup event.
+                // TA: 3.6
+                on_event(target0, "pointerout", function (event) {
+                    if(event.pointerType == 'touch') {
+                        if(pointerup_event != null) {
+                            if(eventTested == false) {
+                                test_pointerout.step(function() {
+                                    assert_equals(event.pointerType, pointerup_event.pointerType, "pointerType is same for pointerup and pointerout");
+                                    assert_equals(event.isPrimary, pointerup_event.isPrimary, "isPrimary is same for pointerup and pointerout");
+                                });
+                                eventTested = true;
+                                test_pointerout.done();
+                            }
+                        }
+                        else {
+                            test_pointerout.step(function() {
+                                assert_true(false,
+                                "pointerup received before pointerout");
+                            }, "pointerup received before pointerout");
+                        }
+                    }
+                });
+            }
+
+        </script>
+        <h1>Pointer Events pointerout tests</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -16,7 +16,7 @@
         <script>
             var test_pointerEvent = async_test("pointerout event received");
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -27,8 +27,8 @@
                 var target0 = document.getElementById("target0");
 
                 on_event(target0, "pointerout", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     if (eventTested == false) {
-                        detected_pointertypes[event.pointerType] = true;
                         eventTested = true;
                         check_PointerEvent(event);
                         test_pointerEvent.done();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>pointerout</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-    </head>
-    <body onload="run()">
-        <h2>pointerout</h2>
-        <h4>Test Description: This test checks if pointerout event triggers for pen. Place your pen over the black rectangle and then pull the pen out of the digitizer's detectable range. </h4>
-        <p>Note: this test is for devices that support hover - for pen only</p>
-        <div id="target0"></div>
-        <script>
-            var test_pointerout = async_test("pointerout event received");
-            // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callback function will reference the test_pointerEvent object and
-            // will fail unless the async_test is created with the var name "test_pointerEvent".
-            add_completion_callback(showPointerTypes);
-
-            var eventTested = false;
-            var isPointerupReceived = false;
-            var detected_pointertypes = {};
-
-            function run() {
-                var target0 = document.getElementById("target0");
-
-                // When a pen stylus leaves the hover range detectable by the digitizer the pointerout event must be dispatched. 
-                // TA: 7.2
-                on_event(target0, "pointerout", function (event) {
-                    if(event.pointerType == 'pen') {
-                        if (eventTested == false) {
-                            detected_pointertypes[event.pointerType] = true;
-                            eventTested = true;
-                            test_pointerout.done();
-                        }
-                    }
-                    else {
-                        test_pointerout.step(function() {
-                            assert_true(false,
-                            "you have to use pen for this test");
-                        }, "you have to use pen for this test");
-                    }
-                });
-            }
-
-        </script>
-        <h1>Pointer Events pointerout tests</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_pen-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+    <head>
+        <title>pointerout</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+    </head>
+    <body onload="run()">
+        <h2>pointerout</h2>
+        <h4>Test Description: This test checks if pointerout event triggers for pen. Place your pen over the black rectangle and then pull the pen out of the digitizer's detectable range. </h4>
+        <p>Note: this test is for devices that support hover - for pen only</p>
+        <div id="target0"></div>
+        <script>
+            var test_pointerout = async_test("pointerout event received");
+            // showPointerTypes is defined in pointerevent_support.js
+            // Requirements: the callback function will reference the test_pointerEvent object and
+            // will fail unless the async_test is created with the var name "test_pointerEvent".
+            add_completion_callback(showPointerTypes);
+
+            var eventTested = false;
+            var isPointerupReceived = false;
+            var detected_pointertypes = {};
+
+            function run() {
+                var target0 = document.getElementById("target0");
+
+                // When a pen stylus leaves the hover range detectable by the digitizer the pointerout event must be dispatched. 
+                // TA: 7.2
+                on_event(target0, "pointerout", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    if(event.pointerType == 'pen') {
+                        if (eventTested == false) {
+                            eventTested = true;
+                            test_pointerout.done();
+                        }
+                    }
+                    else {
+                        test_pointerout.step(function() {
+                            assert_true(false,
+                            "you have to use pen for this test");
+                        }, "you have to use pen for this test");
+                    }
+                });
+            }
+
+        </script>
+        <h1>Pointer Events pointerout tests</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_received_once-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_received_once-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_received_once-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerout_received_once-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -48,7 +48,7 @@
         <h1>Pointer Events pointerout received once test</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerover-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerover-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerover-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerover-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -15,7 +15,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerover is dispatched"); // set up test harness;
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
@@ -23,12 +23,11 @@
                 var target0 = document.getElementById("target0");
 
                 on_event(target0, "pointerover", function (event) {
+                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.step(function () {
                         check_PointerEvent(event);
                         assert_equals(event.type, "pointerover", "Pointer Event received");
                     });
-
-                    detected_pointertypes[event.pointerType] = true;
                     test_pointerEvent.done(); // complete test
                 });
             }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_mouse-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -17,18 +17,17 @@
             var eventTested = false;
 
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
             function eventHandler(event) {
+                detected_pointertypes[event.pointerType] = true;
                 if(!eventTested) {
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.pointerType, "mouse", "Verify event.pointerType is 'mouse'.");
                     });
-                    detected_pointertypes[event.pointerType] = true;
-
                     eventTested = true;
                 }
                 if (event.type == "pointerup") {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_pen-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_pen-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_pen-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_pen-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -16,17 +16,17 @@
             var test_pointerEvent = async_test("pointer event has pointerType as pen"); // set up test harness
             var eventTested = false;
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
             function eventHandler(event) {
+                detected_pointertypes[event.pointerType] = true;
                 if(!eventTested) {
                     check_PointerEvent(event);
                     test_pointerEvent.step(function () {
                         assert_equals(event.pointerType, "pen", "Verify event.pointerType is 'pen'.");
                     });
-                    detected_pointertypes[event.pointerType] = true;
                     eventTested = true;
                 }
                 if (event.type == "pointerup") {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointertype_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -14,33 +14,33 @@
         <script type="text/javascript">
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointer event has pointerType as touch"); // set up test harness
-			var eventTested = false;
+            var eventTested = false;
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
             function eventHandler(event) {
-				if(!eventTested) {
-					check_PointerEvent(event);
-					test_pointerEvent.step(function () {
-						assert_equals(event.pointerType, "touch", "Verify event.pointerType is 'touch'.");
-					});
-					detected_pointertypes[event.pointerType] = true;
-					eventTested = true;
-				}
-				if (event.type == "pointerup") {
-					test_pointerEvent.done(); // complete test
-				}
-			}
+                detected_pointertypes[event.pointerType] = true;
+                if(!eventTested) {
+                    check_PointerEvent(event);
+                    test_pointerEvent.step(function () {
+                        assert_equals(event.pointerType, "touch", "Verify event.pointerType is 'touch'.");
+                    });
+                    eventTested = true;
+                }
+                if (event.type == "pointerup") {
+                    test_pointerEvent.done(); // complete test
+                }
+            }
 
             function run() {
-				var target0 = document.getElementById("target0");
+                var target0 = document.getElementById("target0");
 
-				// listen for all events.
-				for (var i = 0; i < All_Pointer_Events.length; i++) {
-					on_event(target0, All_Pointer_Events[i], eventHandler);
-				}
+                // listen for all events.
+                for (var i = 0; i < All_Pointer_Events.length; i++) {
+                    on_event(target0, All_Pointer_Events[i], eventHandler);
+                }
             }
         </script>
     </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_isprimary_same_as_pointerdown-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_isprimary_same_as_pointerdown-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_isprimary_same_as_pointerdown-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_isprimary_same_as_pointerdown-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -56,6 +56,7 @@
         <div id="complete-notice">
             <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -17,7 +17,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointerup event received");
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_pointertype-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_pointertype-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_pointertype-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_pointerup_pointertype-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -57,7 +57,7 @@
         <h1>Pointer Events pointerType conservation tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="javascript:location.reload()">run the tests again</a> with a different pointer type?</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_invalid_pointerid-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -17,7 +17,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("releasePointerCapture: DOMException InvalidPointerId"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -11,7 +11,7 @@
     <body class="scrollable">
         <h1>Pointer Events Capture Test - release capture on pointercancel</h1>
         <h4>
-            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the folowing actions:
+            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the following actions:
             <ol>
                 <li> Touch black rectangle and do not release your touch
                 <li> Move your touch to scroll the page. "lostpointercapture" should be logged inside of the black rectangle immediately after "pointercancel"
@@ -65,7 +65,6 @@
         <div id="complete-notice">
             <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_releasepointercapture_onpointerup_mouse-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -11,7 +11,7 @@
     <body>
         <h1>Pointer Events Capture Test - release capture on pointerup</h1>
         <h4>
-            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the folowing actions:
+            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the following actions:
             <ol>
                 <li> Press and hold left mouse button over "Set Capture" button
                 <li> Release left mouse button anywhere over the document. "lostpointercapture" should be logged inside of the black rectangle immediately after "pointerup"
@@ -73,7 +73,6 @@
         <div id="complete-notice">
             <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>setPointerCapture() throws on disconnected node</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <script src="pointerevent_support.js"></script>
-        <script type="text/javascript">
-            var test_setPointerCapture = async_test("setPointerCapture: DOMException InvalidStateError");
-
-            function run() {
-                var target0 = document.getElementById("target0");
-                var target1 = document.getElementById("target1");
-
-                target1.parentNode.removeChild(target1);
-
-                on_event(target0, "pointerdown", function (event) {
-                    try {
-                        target1.setPointerCapture(event.pointerId);
-
-                        test_setPointerCapture.step(function() {
-                            assert_unreached("DOMException: InvalidStateError should have been thrown.");
-                        });
-                    } catch (e) {
-                        // TA: 13.4
-                        test_setPointerCapture.step(function() {
-                            assert_equals(e.name, "InvalidStateError", "DOMException should be InvalidStateError");
-                        });
-                    }
-                    test_setPointerCapture.done();
-                });
-            }
-        </script>
-    </head>
-    <body onload="run()">
-        <h1>Pointer Event: DOMException InvalidStateError</h1>
-        <h4>Test Description:
-            When the setPointerCapture method is invoked, if the target node does not participate in its ownerDocument's tree, a DOMException with the name InvalidStateError must be thrown.
-        </h4>
-        <br>
-        <div id="target0">
-            Use the mouse, touch or pen to contact this box.
-        </div>
-        <div id="target1"></div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_disconnected-manual.html	2014-11-26 21:45:58.000000000 +0000
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+    <head>
+        <title>setPointerCapture() throws on disconnected node</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="pointerevent_support.js"></script>
+        <script type="text/javascript">
+            var test_setPointerCapture = async_test("setPointerCapture: DOMException InvalidStateError");
+
+            function run() {
+
+                var detected_pointertypes = {};
+                add_completion_callback(showPointerTypes);
+
+                var target0 = document.getElementById("target0");
+                var target1 = document.getElementById("target1");
+
+                target1.parentNode.removeChild(target1);
+
+                on_event(target0, "pointerdown", function (event) {
+                    detected_pointertypes[ event.pointerType ] = true;
+                    try {
+                        target1.setPointerCapture(event.pointerId);
+
+                        test_setPointerCapture.step(function() {
+                            assert_unreached("DOMException: InvalidStateError should have been thrown.");
+                        });
+                    } catch (e) {
+                        // TA: 13.4
+                        test_setPointerCapture.step(function() {
+                            assert_equals(e.name, "InvalidStateError", "DOMException should be InvalidStateError");
+                        });
+                    }
+                    test_setPointerCapture.done();
+                });
+            }
+        </script>
+    </head>
+    <body onload="run()">
+        <h1>Pointer Event: DOMException InvalidStateError</h1>
+        <h4>Test Description:
+            When the setPointerCapture method is invoked, if the target node does not participate in its ownerDocument's tree, a DOMException with the name InvalidStateError must be thrown.
+        </h4>
+        <br>
+        <div id="target0">
+            Use the mouse, touch or pen to contact this box.
+        </div>
+        <div id="target1"></div>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -52,7 +52,6 @@
         <h1>Pointer Events setPointerCapture Tests</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_invalid_pointerid-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -16,7 +16,7 @@
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("setPointerCapture: DOMException InvalidPointerId"); // set up test harness
             // showPointerTypes is defined in pointerevent_support.js
-            // Requirements: the callbakc function will reference the test_pointerEvent object and
+            // Requirements: the callback function will reference the test_pointerEvent object and
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_setpointercapture_relatedtarget-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -11,11 +11,11 @@
     <body>
         <h1>Pointer Events Capture Test - capture and relatedTarget</h1>
         <h4>
-            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the folowing actions:
+            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the following actions:
             <ol>
                 <li> Put your mouse over the lower rectangle. pointerover should be received for the purple rectangle
                 <li> Press and hold left mouse button over "Set Capture" button
-                <li> Put your mouse over the lower rectangle. pointerover should be received for the black rectangle
+                <li> Put your mouse over the upper rectangle. pointerover should be received for the black rectangle
                 <li> Release left mouse button to complete the test.
             </ol>
         </h4>
@@ -31,6 +31,9 @@
             var isPointeroverGot = false;
             var count=0;
 
+            var detected_pointertypes = {};
+            add_completion_callback(showPointerTypes);
+
             var target0 = document.getElementById('target0');
             var target1 = document.getElementById('target1');
             var captureButton = document.getElementById('btnCapture');
@@ -76,6 +79,7 @@
                 });
 
                 on_event(target1, "pointerover", function (event) {
+                    detected_pointertypes[ event.pointerType ] = true;
                     if(!isPointeroverGot) {
                         test(function() {
                             assert_true(isPointerCapture==false, "pointerover shouldn't trigger for this target when capture is enabled");
@@ -88,6 +92,9 @@
         </script>
         <h1>Pointer Events Capture Test</h1>
         <div id="complete-notice">
+            <p>Test complete: Scroll to Summary to view Pass/Fail Results.</p>
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_support.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_support.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_support.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_support.js	2014-11-26 21:45:59.000000000 +0000
@@ -167,25 +167,4 @@
     }
     catch(e) {
     }
-}
-
-// declare the follwoing variables to use this function: previousPointerX, previousPointerY, currentPointerX, currentPointerY;
-// init previousPointerX, previousPointerY before calling of the function; in "pointerdown" event handler for example
-function checkDirection(testToStep, isVertical, currentMoveCount, moveCountToPass, delta, event) {
-    if(!isVertical) {
-        if(currentMoveCount > moveCountToPass / 2) { // avoid immediate triggering while vertical scroll is still performed
-                testToStep.step( function() {
-                currentPointerY = event.clientY;
-                assert_approx_equals(previousPointerY, currentPointerY, delta, "scroll move was along horisontal line: ");
-                previousPointerY = currentPointerY;
-            });
-        }
-    }
-    else {
-        testToStep.step( function() {
-            currentPointerX = event.clientX;
-            assert_approx_equals(previousPointerX, currentPointerX, delta, "scroll move was along vertical line: ");
-            previousPointerX = currentPointerX;
-        });
-    }
-}
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-button-test_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-button-test_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-button-test_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-button-test_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -57,7 +57,6 @@
                 yScr0 = target0.scrollTop;
 
                 on_event(btnComplete, 'click', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
                     test_touchaction_button.step(function() {
                         assert_equals(target0.scrollLeft, 0, "button scroll x offset should be 0 in the end of the test");
                         assert_equals(target0.scrollTop, 0, "button scroll y offset should be 0 in the end of the test");
@@ -67,6 +66,10 @@
                     updateDescriptionComplete();
                 });
 
+                on_event(btnComplete, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                });
+
                 on_event(target0, 'scroll', function(event) {
                     if(isFirstPart) {
                         xScr1 = target0.scrollLeft;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: parent > child: auto > child: none</title>
+        <meta name="assert" content="TA15.5 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent, Child: `auto`, Grand-Child: `none`">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -18,7 +19,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: no panning.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: no panning.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div class="scroller" id="target0">
             <div>
@@ -78,45 +79,28 @@
                 </div>
             </div>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
-
-            var moveCount = 0;
-            var moveDelta = 10;
-            var countToPass = 100;
-            var isFirstScroll = true;
-            // these variables are necessary to use checkDirection() function below
-            var previousPointerX, previousPointerY, currentPointerX, currentPointerY;
-
             add_completion_callback(showPointerTypes);
 
             var test_touchaction = async_test("touch-action attribute test");
 
             function run() {
                 var target0 = document.getElementById("target0");
-
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                    previousPointerX = event.clientX;
-                    previousPointerY = event.clientY;
-                });
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if touch-action attribute works properly for embedded divs
                 // Scrollable-Parent, Child: `auto`, Grand-Child: `none`
                 // TA: 15.5
-                on_event(target0, 'pointermove', function(event) {
-                    checkDirection(test_touchaction, isFirstScroll, moveCount, countToPass, moveDelta, event);
-
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                        if(!isFirstScroll) {
-                            test_touchaction.done();
-                            updateDescriptionComplete();
-                        }
-                        moveCount = 0;
-                        isFirstScroll = false;
-                    }
+                on_event(btnComplete, 'click', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
 
                 on_event(target0, 'scroll', function(event) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: child: none</title>
+        <meta name="assert" content="TA15.9 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent, Child: `none`">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -15,7 +16,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: no panning</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: no panning</h4>
         <p>Note: this test is for touch-devices only</p>
         <div class="scroller" id="target0">
             <div>
@@ -73,45 +74,28 @@
                 <p>Lorem ipsum dolor sit amet...</p>
             </div>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
-
-            var moveCount = 0;
-            var countToPass = 100;
-			var moveDelta = 10;
-            var isFirstScroll = true;
-            // these variables are necessary to use checkDirection() function below
-            var previousPointerX, previousPointerY, currentPointerX, currentPointerY;
-
             add_completion_callback(showPointerTypes);
 
             var test_touchaction = async_test("touch-action attribute test");
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if touch-action attribute works properly for embedded divs
                 //
-                // TA: 15.
-                on_event(target0, 'pointermove', function(event) {
-                    checkDirection(test_touchaction, isFirstScroll, moveCount, countToPass, moveDelta, event);
-
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                        if(!isFirstScroll) {
-                            test_touchaction.done();
-                            updateDescriptionComplete();
-                        }
-                        moveCount = 0;
-                        isFirstScroll = false;
-                    }
-                });
-
-                on_event(target0, 'pointerdown', function(event) {
+                // TA: 15.9
+                on_event(btnComplete, 'click', function(event) {
                     detected_pointertypes[event.pointerType] = true;
-                    previousPointerX = event.clientX;
-                    previousPointerY = event.clientY;
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
 
                 on_event(target0, 'scroll', function(event) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: parent > child: pan-x > child: pan-x</title>
+        <meta name="assert" content="TA15.6 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent, Child: `pan-x`, Grand-Child: `pan-x`">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -18,7 +19,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: only pans in x direction.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: only pans in x direction.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div class="scroller" id="target0">
             <div>
@@ -78,64 +79,27 @@
                 </div>
             </div>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
-
-            var xCount = 0;
-            var moveCount = 0;
-            var countToPass = 100;
-            var moveDelta = 10;
-            var xScr0, yScr0, xScr1, yScr1;
-            var yMoveReceived = false;
-            // these variables are necessary to use checkDirection() function below
-            var previousPointerX, previousPointerY, currentPointerX, currentPointerY;
-
+            var test_touchaction = async_test("touch-action attribute test");
             add_completion_callback(showPointerTypes);
 
             function run() {
                 var target0 = document.getElementById("target0");
-
-                var test_touchaction = async_test("touch-action attribute test");
-
-                xScr0 = target0.scrollLeft;
-                yScr0 = target0.scrollTop;
-
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                    previousPointerX = event.clientX;
-                    previousPointerY = event.clientY;
-                });
-
-                on_event(target0, 'pointermove', function(event) {
-                    checkDirection(test_touchaction, true, moveCount, countToPass, moveDelta, event);
-
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                        yMoveReceived = true;
-                    }
-                });
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if touch-action attribute works properly for embedded divs
                 //
-                // TA: 15.
-                on_event(target0, 'scroll', function(event) {
-                    xScr1 = target0.scrollLeft;
-                    yScr1 = target0.scrollTop;
-
-                    if(xScr1 != xScr0) {
-                        xCount++;
-                        xScr0 = xScr1;
-                    }
-
-                    if(yScr1 != yScr0) {
-                        test_touchaction.step(failOnScroll, "y-scroll received while pan-x is set");
-                    }
-
-                    if(xCount >= countToPass && yMoveReceived) {
-                        test_touchaction.done();
-                        updateDescriptionComplete();
-                    }
+                // TA: 15.6
+                on_event(btnComplete, 'click', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    test_touchaction.step(function() {
+                        assert_not_equals(target0.scrollLeft, 0, "scroll x offset should not be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
             }
         </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: parent > child: pan-x > child: pan-y</title>
+        <meta name="assert" content="TA15.13 - Touch action inherits child 'pan-x' -> child 'pan-y' test">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -18,7 +19,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: no panning/zooming/etc.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: no panning/zooming/etc.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div class="scroller" id="target0">
             <div>
@@ -78,14 +79,8 @@
                 </div>
             </div>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
-            var moveCount = 0;
-            var countToPass = 100;
-            var moveDelta = 10;
-            var isFirstScroll = true;
-            // these variables are necessary to use checkDirection() function below
-            var previousPointerX, previousPointerY, currentPointerX, currentPointerY;
-
             var detected_pointertypes = {};
             add_completion_callback(showPointerTypes);
 
@@ -93,29 +88,19 @@
 
             function run() {
                 var target0 = document.getElementById("target0");
-
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                    previousPointerX = event.clientX;
-                    previousPointerY = event.clientY;
-                });
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if touch-action attribute works properly for embedded divs
                 // Scrollable-Parent, Child: `pan-x`, Grand-Child: `pan-y`
-                // TA: 15.6
-                on_event(target0, 'pointermove', function(event) {
-                    checkDirection(test_touchaction, isFirstScroll, moveCount, countToPass, moveDelta, event);
-
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                        if(!isFirstScroll) {
-                            test_touchaction.done();
-                            updateDescriptionComplete();
-                        }
-                        moveCount = 0;
-                        isFirstScroll = false;
-                    }
+                // TA: 15.13
+                on_event(btnComplete, 'click', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
 
                 on_event(target0, 'scroll', function(event) {
@@ -126,7 +111,6 @@
         <h1>behaviour: none</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: inherit from parent: none</title>
+        <meta name="assert" content="TA15.8 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent: `none` Child: `auto`">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -15,7 +16,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: no panning</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: no panning</h4>
         <p>Note: this test is for touch-devices only</p>
         <div class="scroller" id="target0">
             <div>
@@ -73,44 +74,28 @@
                 <p>Lorem ipsum dolor sit amet...</p>
             </div>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
-
-            var moveCount = 0;
-            var moveDelta = 10;
-            var isFirstScroll = true;
-            var countToPass = 100;
-            // these variables are necessary to use checkDirection() function below
-            var previousPointerX, previousPointerY, currentPointerX, currentPointerY;
-
             add_completion_callback(showPointerTypes);
 
             var test_touchaction = async_test("touch-action attribute test");
 
             function run() {
                 var target0 = document.getElementById("target0");
-
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                    previousPointerX = event.clientX;
-                    previousPointerY = event.clientY;
-                });
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if touch-action attribute works properly for embedded divs
                 //
-                // TA: 15.
-                on_event(target0, 'pointermove', function(event) {
-                    checkDirection(test_touchaction, isFirstScroll, moveCount, countToPass, moveDelta, event);
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                        if(!isFirstScroll) {
-                            test_touchaction.done();
-                            updateDescriptionComplete();
-                        }
-                        moveCount = 0;
-                        isFirstScroll = false;
-                    }
+                // TA: 15.8
+                on_event(btnComplete, 'click', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
 
                 on_event(target0, 'scroll', function(event) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-keyboard-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-keyboard-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-keyboard-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-keyboard-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -74,14 +74,11 @@
             <p>Lorem ipsum dolor sit amet...</p>
         </div>
         <script type='text/javascript'>
-            var detected_pointertypes = {};
 
             var xScrollIsReceived = false;
             var yScrollIsReceived = false;
             var xScr0, yScr0, xScr1, yScr1;
 
-            add_completion_callback(showPointerTypes);
-
             function run() {
                 var target0 = document.getElementById("target0");
 
@@ -92,10 +89,6 @@
 
                 target0.focus();
 
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                });
-
                 on_event(target0, 'scroll', function(event) {
                     xScr1 = target0.scrollLeft;
                     yScr1 = target0.scrollTop;
@@ -125,7 +118,6 @@
         </script>
         <h1>touch-action: none</h1>
         <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-none-css_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-none-css_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-none-css_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-none-css_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: none</title>
+        <meta name="assert" content="TA15.2 - With `touch-action: none` on a swiped or click/dragged element, `pointerdown+(optional pointermove)+pointerup` must be dispatched.">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -17,7 +18,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: no panning/zooming/etc.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: no panning/zooming/etc.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div id="target0">
             <p>
@@ -73,35 +74,27 @@
             <p>Lorem ipsum dolor sit amet...</p>
             <p>Lorem ipsum dolor sit amet...</p>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
 
-            var moveCount = 0;
-            var countToPass = 100;
-            var isFirstScroll = true;
-
             var test_touchaction = async_test("touch-action attribute test");
             add_completion_callback(showPointerTypes);
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if "touch-action: none" attribute works properly
                 //TA: 15.2
-                on_event(target0, 'pointermove', function(event) {
+                on_event(btnComplete, 'click', function(event) {
                     detected_pointertypes[event.pointerType] = true;
-
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                        if(!isFirstScroll)
-                        {
-                            updateDescriptionComplete();
-                            test_touchaction.done();
-                        }
-                        moveCount = 0;
-                        isFirstScroll = false;
-                    }
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
 
                 on_event(target0, 'scroll', function(event) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: pan-x</title>
+        <meta name="assert" content="TA15.3 - With `touch-action: pan-x` on a swiped or click/dragged element, only panning on the x-axis should be possible.">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -17,7 +18,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: only pans in x direction.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: only pans in x direction.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div id="target0">
             <p>
@@ -73,54 +74,26 @@
             <p>Lorem ipsum dolor sit amet...</p>
             <p>Lorem ipsum dolor sit amet...</p>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
-
-            var xCount = 0;
-            var moveCount = 0;
-            var countToPass = 50;
-            var xScr0, yScr0, xScr1, yScr1;
-
+            var test_touchaction = async_test("touch-action attribute test");
             add_completion_callback(showPointerTypes);
 
             function run() {
                 var target0 = document.getElementById("target0");
-
-                var test_touchaction = async_test("touch-action attribute test");
-
-                xScr0 = target0.scrollLeft;
-                yScr0 = target0.scrollTop;
-
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                });
-
-                on_event(target0, 'pointermove', function(event) {
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionNextStep();
-                    }
-                });
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if "touch-action: pan-x" attribute works properly
                 //TA: 15.3
-                on_event(target0, 'scroll', function(event) {
-                    xScr1 = target0.scrollLeft;
-                    yScr1 = target0.scrollTop;
-
-                    if(xScr1 != xScr0) {
-                        xCount++;
-                        xScr0 = xScr1;
-                    }
-
-                    if(yScr1 != yScr0) {
-                        test_touchaction.step(failOnScroll, "y-scroll received while pan-x is set");
-                    }
-
-                    if(xCount >= countToPass) {
-                        test_touchaction.done();
-                        updateDescriptionComplete();
-                    }
+                on_event(btnComplete, 'click', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    test_touchaction.step(function() {
+                        assert_not_equals(target0.scrollLeft, 0, "scroll x offset should not be 0 in the end of the test");
+                        assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
             }
         </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: parent > child: pan-x pan-y > child: pan-y</title>
+        <meta name="assert" content="TA15.17 - Touch action 'pan-x pan-y' 'pan-y' test">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -18,7 +19,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: no panning/zooming/etc.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: only pans in y direction.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div class="scroller" id="target0">
             <div>
@@ -76,59 +77,34 @@
                 </div>
             </div>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
-            var yCount = 0;
-            var moveCount = 0;
-            var countToPass = 50;
-            var xScr0, yScr0, xScr1, yScr1;
-
             var detected_pointertypes = {};
-
             add_completion_callback(showPointerTypes);
 
             var test_touchaction = async_test("touch-action attribute test");
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var btnComplete = document.getElementById("btnComplete");
 
-                xScr0 = target0.scrollLeft;
-                yScr0 = target0.scrollTop;
-
-                on_event(target0, 'pointerdown', function(event) {
+                // Check if touch-action attribute works properly for embedded divs
+                //
+                // TA: 15.17
+                on_event(btnComplete, 'click', function(event) {
                     detected_pointertypes[event.pointerType] = true;
-                });
-
-                on_event(target0, 'pointermove', function(event) {
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        test_touchaction.done();
-                        updateDescriptionComplete();
-                    }
-                });
-
-                on_event(target0, 'scroll', function(event) {
-                    xScr1 = target0.scrollLeft;
-                    yScr1 = target0.scrollTop;
-
-                    if(yScr1 != yScr0) {
-                        yCount++;
-                        yScr0 = yScr1;
-                    }
-
-                    if(xScr1 != xScr0) {
-                        test_touchaction.step(failOnScroll, "x-scroll received while pan-y is set");
-                    }
-
-                    if(yCount >= countToPass) {
-                        updateDescriptionNextStep();
-                    }
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_not_equals(target0.scrollTop, 0, "scroll y offset should not be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
             }
         </script>
         <h1>behaviour: pan-y</h1>
         <div id="complete-notice">
             <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Would you like to <a href="#">run the tests again</a> with a different pointer type?</p>
         </div>
         <div id="log"></div>
     </body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: pan-y</title>
+        <meta name="assert" content="TA15.4 - With `touch-action: pan-y` on a swiped or click/dragged element, only panning in the y-axis should be possible.">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
@@ -17,7 +18,7 @@
     </head>
     <body onload="run()">
         <h1>Pointer Events touch-action attribute support</h1>
-        <h4 id="desc">Test Description: Try to scroll text DOWN. Wait for description update. Expected: only pans in y direction.</h4>
+        <h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT. Tap Complete button under the rectangle when done. Expected: only pans in y direction.</h4>
         <p>Note: this test is for touch-devices only</p>
         <div id="target0">
             <p>
@@ -73,54 +74,26 @@
             <p>Lorem ipsum dolor sit amet...</p>
             <p>Lorem ipsum dolor sit amet...</p>
         </div>
+        <input type="button" id="btnComplete" value="Complete test">
         <script type='text/javascript'>
             var detected_pointertypes = {};
-
-            var yCount = 0;
-            var moveCount = 0;
-            var countToPass = 50;
-            var xScr0, yScr0, xScr1, yScr1;
-
+            var test_touchaction = async_test("touch-action attribute test");
             add_completion_callback(showPointerTypes);
 
             function run() {
                 var target0 = document.getElementById("target0");
-
-                var test_touchaction = async_test("touch-action attribute test");
-
-                xScr0 = target0.scrollLeft;
-                yScr0 = target0.scrollTop;
-
-                on_event(target0, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
-                });
-
-                on_event(target0, 'pointermove', function(event) {
-                    moveCount++;
-                    if(moveCount >= countToPass) {
-                        updateDescriptionComplete();
-                    }
-                });
+                var btnComplete = document.getElementById("btnComplete");
 
                 // Check if "touch-action: pan-y" attribute works properly
                 //TA: 15.4
-                on_event(target0, 'scroll', function(event) {
-                    xScr1 = target0.scrollLeft;
-                    yScr1 = target0.scrollTop;
-
-                    if(yScr1 != yScr0) {
-                        yCount++;
-                        yScr0 = yScr1;
-                    }
-
-                    if(xScr1 != xScr0) {
-                        test_touchaction.step(failOnScroll, "x-scroll received while pan-y is set");
-                    }
-
-                    if(yCount >= countToPass) {
-                        test_touchaction.done();
-                        updateDescriptionNextStep();
-                    }
+                on_event(btnComplete, 'click', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                    test_touchaction.step(function() {
+                        assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
+                        assert_not_equals(target0.scrollTop, 0, "scroll y offset should not be 0 in the end of the test");
+                    });
+                    test_touchaction.done();
+                    updateDescriptionComplete();
                 });
             }
         </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-span-test_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-span-test_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-span-test_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-span-test_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -60,7 +60,6 @@
                 yScr0 = target0.scrollTop;
 
                 on_event(btnComplete, 'click', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
                     test_touchaction_span.step(function() {
                         assert_not_equals(target0.scrollLeft, 0, "span scroll x offset should not be 0 in the end of the test");
                         assert_not_equals(target0.scrollTop, 0, "span scroll y offset should not be 0 in the end of the test");
@@ -70,6 +69,10 @@
                     updateDescriptionComplete();
                 });
 
+                on_event(btnComplete, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                });
+
                 on_event(target0, 'scroll', function(event) {
                     if(isFirstPart) {
                         xScr1 = target0.scrollLeft;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -50,8 +50,7 @@
                 xScr0 = target0.scrollLeft;
                 yScr0 = target0.scrollTop;
 
-                on_event(btnComplete, 'pointerdown', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
+                on_event(btnComplete, 'click', function(event) {
                     test_touchaction_svg.step(function() {
                         assert_equals(target0.scrollLeft, 0, "SVG scroll x offset should be 0 in the end of the test");
                         assert_equals(target0.scrollTop, 0, "SVG scroll y offset should be 0 in the end of the test");
@@ -60,6 +59,10 @@
                     updateDescriptionComplete();
                 });
 
+                on_event(btnComplete, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                });
+
                 on_event(target0, 'scroll', function(event) {
                     if(isFirstPart) {
                         xScr1 = target0.scrollLeft;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-table-test_touch-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-table-test_touch-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-table-test_touch-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/pointerevents/pointerevent_touch-action-table-test_touch-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -72,7 +72,6 @@
                 yScr0 = target0.scrollTop;
 
                 on_event(btnComplete, 'click', function(event) {
-                    detected_pointertypes[event.pointerType] = true;
                     test_touchaction_cell.step(function() {
                         assert_equals(target0.scrollLeft, 0, "table scroll x offset should be 0 in the end of the test");
                         assert_equals(target0.scrollTop, 0, "table scroll y offset should be 0 in the end of the test");
@@ -82,6 +81,10 @@
                     updateDescriptionComplete();
                 });
 
+                on_event(btnComplete, 'pointerdown', function(event) {
+                    detected_pointertypes[event.pointerType] = true;
+                });
+
                 on_event(target0, 'scroll', function(event) {
                     if(isFirstPart) {
                         xScr1 = target0.scrollLeft;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/progress-events/tests/submissions/Samsung/resources/no-content-length.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/progress-events/tests/submissions/Samsung/resources/no-content-length.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/progress-events/tests/submissions/Samsung/resources/no-content-length.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/progress-events/tests/submissions/Samsung/resources/no-content-length.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,5 +1,5 @@
 def main(request, response):
-    response.headers.extend([('Transfer-Encoding', 'chunked'),
+    response.headers.update([('Transfer-Encoding', 'chunked'),
                              ('Content-Type', 'text/html'),
                              ('Connection', 'keep-alive')])
     response.write_status_headers()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resources/idlharness.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resources/idlharness.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resources/idlharness.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resources/idlharness.js	2014-11-26 21:45:59.000000000 +0000
@@ -426,6 +426,9 @@
             return;
 
         case "DOMString":
+        case "ByteString":
+        case "USVString":
+            // TODO: https://github.com/w3c/testharness.js/issues/92
             assert_equals(typeof value, "string");
             return;
 
@@ -1026,15 +1029,15 @@
 
     if (!this.is_callback()) {
         test(function() {
-            // This function tests WebIDL as of 2013-08-25.
-            // http://dev.w3.org/2006/webapi/WebIDL/#es-interface-call
+            // This function tests WebIDL as of 2014-10-25.
+            // https://heycam.github.io/webidl/#es-interface-call
 
             assert_own_property(window, this.name,
                                 "window does not have own property " + format_value(this.name));
 
             // "Interface objects for non-callback interfaces MUST have a
             // property named “length” with attributes { [[Writable]]: false,
-            // [[Enumerable]]: false, [[Configurable]]: false } whose value is
+            // [[Enumerable]]: false, [[Configurable]]: true } whose value is
             // a Number."
             assert_own_property(window[this.name], "length");
             var desc = Object.getOwnPropertyDescriptor(window[this.name], "length");
@@ -1042,7 +1045,7 @@
             assert_false("set" in desc, this.name + ".length has setter");
             assert_false(desc.writable, this.name + ".length is writable");
             assert_false(desc.enumerable, this.name + ".length is enumerable");
-            assert_false(desc.configurable, this.name + ".length is configurable");
+            assert_true(desc.configurable, this.name + ".length is not configurable");
 
             var constructors = this.extAttrs
                 .filter(function(attr) { return attr.name == "Constructor"; });
@@ -1266,10 +1269,14 @@
                 "The prototype object must have a property " +
                 format_value(member.name));
 
-            // TODO: Needs to test for LenientThis.
-            assert_throws(new TypeError(), function() {
-                window[this.name].prototype[member.name];
-            }.bind(this), "getting property on prototype object must throw TypeError");
+            if (!member.has_extended_attribute("LenientThis")) {
+                assert_throws(new TypeError(), function() {
+                    window[this.name].prototype[member.name];
+                }.bind(this), "getting property on prototype object must throw TypeError");
+            } else {
+                assert_equals(window[this.name].prototype[member.name], undefined,
+                              "getting property on prototype object must return undefined");
+            }
             do_interface_attribute_asserts(window[this.name].prototype, member);
         }
     }.bind(this), this.name + " interface: attribute " + member.name);
@@ -1705,11 +1712,14 @@
     // value 0."
     assert_equals(typeof desc.get, "function", "getter must be Function");
     assert_equals(desc.get.length, 0, "getter length must be 0");
-    // TODO: Account for LenientThis
-    assert_throws(new TypeError(), function()
-    {
-        desc.get.call({});
-    }.bind(this), "calling getter on wrong object type must throw TypeError");
+    if (!member.has_extended_attribute("LenientThis")) {
+        assert_throws(new TypeError(), function() {
+            desc.get.call({});
+        }.bind(this), "calling getter on wrong object type must throw TypeError");
+    } else {
+        assert_equals(desc.get.call({}), undefined,
+                      "calling getter on wrong object type must return undefined");
+    }
 
     // TODO: Test calling setter on the interface prototype (should throw
     // TypeError in most cases).
@@ -1731,6 +1741,14 @@
     {
         assert_equals(typeof desc.set, "function", "setter must be function for PutForwards, Replaceable, or non-readonly attributes");
         assert_equals(desc.set.length, 1, "setter length must be 1");
+        if (!member.has_extended_attribute("LenientThis")) {
+            assert_throws(new TypeError(), function() {
+                desc.set.call({});
+            }.bind(this), "calling setter on wrong object type must throw TypeError");
+        } else {
+            assert_equals(desc.set.call({}), undefined,
+                          "calling setter on wrong object type must return undefined");
+        }
     }
 }
 //@}
@@ -1783,6 +1801,8 @@
             return 7;
 
         case "DOMString":
+        case "ByteString":
+        case "USVString":
             return "foo";
 
         case "object":
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resources/readme.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resources/readme.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resources/readme.md	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resources/readme.md	2014-11-26 21:45:59.000000000 +0000
@@ -16,7 +16,8 @@
 
 ## Full documentation ##
 
-Full documentation of the API is kept in the source of testharness.js.
+Full user documentation for the API is in the
+[docs/api.md](https://github.com/w3c/testharness.js/blob/master/docs/api.md) file.
 
 You can also read a tutorial on 
 [Using testharness.js](http://darobin.github.com/test-harness-tutorial/docs/using-testharness.html).
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resources/testharness.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resources/testharness.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resources/testharness.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resources/testharness.js	2014-11-26 21:45:59.000000000 +0000
@@ -10,7 +10,7 @@
 [3] http://www.w3.org/2004/10/27-testcases
 */
 
-/* Documentation is in docs/testharness.md */
+/* Documentation is in docs/api.md */
 
 (function ()
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resource-timing/test_resource_timing.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resource-timing/test_resource_timing.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/resource-timing/test_resource_timing.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/resource-timing/test_resource_timing.js	2014-11-26 21:45:59.000000000 +0000
@@ -115,9 +115,10 @@
     function inner() {
         for(var i=0; i<document.styleSheets.length; i++) {
             var sheet = document.styleSheets[i];
-            console.log(sheet.href);;
-            if (sheet.href === expected_entry.name) {
-                resource_load(expected_entry);
+            if (sheet.href === expected_entry.name && sheet.cssRules.length > 0) {
+                setTimeout(function() {
+                    resource_load(expected_entry);
+                }, 200);
                 return;
             }
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>Selectors-API Level 2 Test Suite: HTML with Selectors Level 3</title>
+<!-- Selectors API Test Suite Version 3 -->
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/dom/nodes/selectors.js"></script>
+<script src="level2-lib.js"></script>
+<script src="Element-matches.js"></script>
+<style>iframe { visibility: hidden; position: absolute; }</style>
+
+<div id="log">This test requires JavaScript.</div>
+
+<script>
+var docType  = "html"; // Only run tests suitable for HTML
+
+var frame = document.createElement("iframe"),
+    doc;
+
+frame.onload = init;
+frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
+document.body.appendChild(frame);
+
+function init() {
+  /*
+   * This test suite tests Selectors API methods in 4 different contexts:
+   * 1. Document node
+   * 2. In-document Element node
+   * 3. Detached Element node (an element with no parent, not in the document)
+   * 4. Document Fragment node
+   *
+   * For each context, the following tests are run:
+   *
+   * The interface check tests ensure that each type of node exposes the Selectors API methods.
+   *
+   * The matches() tests are run
+   * All the selectors tested for both the valid and invalid selector tests are found in selectors.js.
+   * See comments in that file for documentation of the format used.
+   *
+   * The level2-lib.js file contains all the common test functions for running each of the aforementioned tests
+   */
+
+  // Prepare the nodes for testing
+  doc = frame.contentDocument;                 // Document Node tests
+
+  var element = doc.getElementById("root");   // In-document Element Node tests
+
+  //Setup the namespace tests
+  setupSpecialElements(element);
+
+  var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
+                                               // Element tests, but after running the Document tests. This
+                                               // tests that no elements that are not descendants of element
+                                               // are selected.
+
+  traverse(outOfScope, function(elem) {        // Annotate each element as being a clone; used for verifying
+    elem.setAttribute("data-clone", "");     // that none of these elements ever match.
+  });
+
+
+  var detached = element.cloneNode(true);     // Detached Element Node tests
+
+  var fragment = doc.createDocumentFragment(); // Fragment Node tests
+  fragment.appendChild(element.cloneNode(true));
+
+  // Setup Tests
+  interfaceCheckMatches("Document", doc);
+  interfaceCheckMatches("Detached Element", detached);
+  interfaceCheckMatches("Fragment", fragment);
+  interfaceCheckMatches("In-document Element", element);
+
+  runSpecialMatchesTests("DIV Element", element);
+  runSpecialMatchesTests("NULL Element", document.createElement("null"));
+  runSpecialMatchesTests("UNDEFINED Element", document.createElement("undefined"));
+
+  runInvalidSelectorTestMatches("Document", doc, invalidSelectors);
+  runInvalidSelectorTestMatches("Detached Element", detached, invalidSelectors);
+  runInvalidSelectorTestMatches("Fragment", fragment, invalidSelectors);
+  runInvalidSelectorTestMatches("In-document Element", element, invalidSelectors);
+
+  runMatchesTest("In-document", doc, validSelectors, "html");
+  runMatchesTest("Detached", detached, validSelectors, "html");
+  runMatchesTest("Fragment", fragment, validSelectors, "html");
+
+  runMatchesTest("In-document", doc, scopedSelectors, "html");
+}
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/Element-matches.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,127 @@
+/*
+ * Check that the matches() method exists on the given Node
+ */
+function interfaceCheckMatches(type, obj) {
+  if (obj.nodeType === obj.ELEMENT_NODE) {
+    test(function() {
+      assert_idl_attribute(obj, "matches", type + " supports matches");
+    }, type + " supports matches")
+  }
+}
+
+function runSpecialMatchesTests(type, element) {
+  test(function() { // 1
+    if (element.tagName.toLowerCase() === "null") {
+      assert_true(element.matches(null), "An element with the tag name '" + element.tagName.toLowerCase() + "' should match.");
+    } else {
+      assert_false(element.matches(null), "An element with the tag name '" + element.tagName.toLowerCase() + "' should not match.");
+    }
+  }, type + ".matches(null)")
+
+  test(function() { // 2
+    if (element.tagName.toLowerCase() === "undefined") {
+      assert_true(element.matches(undefined), "An element with the tag name '" + element.tagName.toLowerCase() + "' should match.");
+    } else {
+      assert_false(element.matches(undefined), "An element with the tag name '" + element.tagName.toLowerCase() + "' should not match.");
+    }
+  }, type + ".matches(undefined)")
+
+  test(function() { // 3
+    assert_throws(TypeError(), function() {
+      element.matches();
+    }, "This should throw a TypeError.")
+  }, type + ".matches no parameter")
+}
+
+/*
+ * Execute queries with the specified invalid selectors for matches()
+ * Only run these tests when errors are expected. Don't run for valid selector tests.
+ */
+function runInvalidSelectorTestMatches(type, root, selectors) {
+  if (root.nodeType === root.ELEMENT_NODE) {
+    for (var i = 0; i < selectors.length; i++) {
+      var s = selectors[i];
+      var n = s["name"];
+      var q = s["selector"];
+
+      test(function() {
+        assert_throws("SyntaxError", function() {
+          root.matches(q)
+        })
+      }, type + ".matches: " + n + ": " + q);
+    }
+  }
+}
+
+function runMatchesTest(type, root, selectors, docType) {
+  var nodeType = getNodeType(root);
+
+  for (var i = 0; i < selectors.length; i++) {
+    var s = selectors[i];
+    var n = s["name"];
+    var q = s["selector"];
+    var e = s["expect"];
+    var u = s["unexpected"];
+
+    var ctx = s["ctx"];
+    var ref = s["ref"];
+
+    if ((!s["exclude"] || (s["exclude"].indexOf(nodeType) === -1 && s["exclude"].indexOf(docType) === -1))
+     && (s["testType"] & TEST_MATCH) ) {
+
+      if (ctx && !ref) {
+        test(function() {
+          var j, element, refNode;
+          for (j = 0; j < e.length; j++) {
+            element = root.querySelector("#" + e[j]);
+            refNode = root.querySelector(ctx);
+            assert_true(element.matches(q, refNode), "The element #" + e[j] + " should match the selector.")
+          }
+
+          if (u) {
+            for (j = 0; j < u.length; j++) {
+              element = root.querySelector("#" + u[j]);
+              refNode = root.querySelector(ctx);
+              assert_false(element.matches(q, refNode), "The element #" + u[j] + " should not match the selector.")
+            }
+          }
+        }, type + " Element.matches: " + n + " (with refNode Element): " + q);
+      }
+
+      if (ref) {
+        test(function() {
+          var j, element, refNodes;
+          for (j = 0; j < e.length; j++) {
+            element = root.querySelector("#" + e[j]);
+            refNodes = root.querySelectorAll(ref);
+            assert_true(element.matches(q, refNodes), "The element #" + e[j] + " should match the selector.")
+          }
+
+          if (u) {
+            for (j = 0; j < u.length; j++) {
+              element = root.querySelector("#" + u[j]);
+              refNodes = root.querySelectorAll(ref);
+              assert_false(element.matches(q, refNodes), "The element #" + u[j] + " should not match the selector.")
+            }
+          }
+        }, type + " Element.matches: " + n + " (with refNodes NodeList): " + q);
+      }
+
+      if (!ctx && !ref) {
+        test(function() {
+          for (var j = 0; j < e.length; j++) {
+            var element = root.querySelector("#" + e[j]);
+            assert_true(element.matches(q), "The element #" + e[j] + " should match the selector.")
+          }
+
+          if (u) {
+            for (j = 0; j < u.length; j++) {
+              element = root.querySelector("#" + u[j]);
+              assert_false(element.matches(q), "The element #" + u[j] + " should not match the selector.")
+            }
+          }
+        }, type + " Element.matches: " + n + " (with no refNodes): " + q);
+      }
+    }
+  }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-baseline.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-baseline.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-baseline.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-baseline.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-<!DOCTYPE html>
-<meta charset="UTF-8">
-<title>Selectors-API Level 2 Test Suite: HTML with Selectors Level 3</title>
-<!-- Selectors API Test Suite Version 3 -->
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/dom/nodes/selectors.js"></script>
-<script src="level2-lib.js"></script>
-<style>iframe { visibility: hidden; position: absolute; }</style>
-
-<div id="log">This test requires JavaScript.</div>
-
-<script>
-var testType = TEST_FIND | TEST_MATCH;
-var docType  = "html"; // Only run tests suitable for HTML
-
-var frame = document.createElement("iframe"),
-    doc;
-
-frame.onload = init;
-frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
-document.body.appendChild(frame);
-
-function init() {
-  /*
-   * This test suite tests Selectors API methods in 4 different contexts:
-   * 1. Document node
-   * 2. In-document Element node
-   * 3. Detached Element node (an element with no parent, not in the document)
-   * 4. Document Fragment node
-   *
-   * For each context, the following tests are run:
-   *
-   * The interface check tests ensure that each type of node exposes the Selectors API methods.
-   *
-   * The matches() tests are run
-   * All the selectors tested for both the valid and invalid selector tests are found in selectors.js.
-   * See comments in that file for documentation of the format used.
-   *
-   * The level2-lib.js file contains all the common test functions for running each of the aforementioned tests
-   */
-
-  // Prepare the nodes for testing
-  doc = frame.contentDocument;                 // Document Node tests
-
-  var element = doc.getElementById("root");   // In-document Element Node tests
-
-  //Setup the namespace tests
-  setupSpecialElements(element);
-
-  var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
-                                               // Element tests, but after running the Document tests. This
-                                               // tests that no elements that are not descendants of element
-                                               // are selected.
-
-  traverse(outOfScope, function(elem) {        // Annotate each element as being a clone; used for verifying
-    elem.setAttribute("data-clone", "");     // that none of these elements ever match.
-  });
-
-
-  var detached = element.cloneNode(true);     // Detached Element Node tests
-
-  var fragment = doc.createDocumentFragment(); // Fragment Node tests
-  fragment.appendChild(element.cloneNode(true));
-
-  // Setup Tests
-  interfaceCheck("Document", doc, testType);
-  interfaceCheck("Detached Element", detached, testType);
-  interfaceCheck("Fragment", fragment, testType);
-  interfaceCheck("In-document Element", element, testType);
-
-  runSpecialSelectorTests("Document", doc);
-  runSpecialSelectorTests("Detached Element", detached);
-  runSpecialSelectorTests("Fragment", fragment);
-  runSpecialSelectorTests("In-document Element", element);
-
-  runSpecialMatchesTests("DIV Element", element);
-  runSpecialMatchesTests("NULL Element", document.createElement("null"));
-  runSpecialMatchesTests("UNDEFINED Element", document.createElement("undefined"));
-
-  verifyStaticList("Document", doc);
-  verifyStaticList("Detached Element", detached);
-  verifyStaticList("Fragment", fragment);
-  verifyStaticList("In-document Element", element);
-
-  runInvalidSelectorTest("Document", doc, invalidSelectors);
-  runInvalidSelectorTest("Detached Element", detached, invalidSelectors);
-  runInvalidSelectorTest("Fragment", fragment, invalidSelectors);
-  runInvalidSelectorTest("In-document Element", element, invalidSelectors);
-
-  runMatchesTest("In-document", doc, validSelectors, testType, "html");
-  runMatchesTest("Detached", detached, validSelectors, testType, "html");
-  runMatchesTest("Fragment", fragment, validSelectors, testType, "html");
-
-  runMatchesTest("In-document", doc, scopedSelectors, testType, "html");
-
-  runValidSelectorTest("In-document", doc, scopedSelectors, testType, "html");
-}
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-lib.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-lib.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-lib.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/level2-lib.js	2014-11-26 21:45:59.000000000 +0000
@@ -47,403 +47,14 @@
   parent.appendChild(noNS);
 }
 
-/*
- * Check that the find, findAll and matches() methods exist on the given Node
- */
-function interfaceCheck(type, obj) {
-  test(function() {
-    var q = typeof obj.find === "function";
-    assert_true(q, type + " supports find.");
-  }, type + " supports find")
-
-  test(function() {
-    var qa = typeof obj.findAll === "function";
-    assert_true( qa, type + " supports findAll.");
-  }, type + " supports findAll")
-
-  if (obj.nodeType === obj.ELEMENT_NODE) {
-    test(function() {
-      assert_idl_attribute(obj, "matches", type + " supports matches");
-    }, type + " supports matches")
-  }
-}
-
-/*
- * Verify that the NodeList returned by findAll is static and and that a new list is created after
- * each call. A static list should not be affected by subsequent changes to the DOM.
- */
-function verifyStaticList(type, root) {
-  var pre, post, preLength;
-
-  test(function() {
-    pre = root.findAll("div");
-    preLength = pre.length;
-
-    var div = doc.createElement("div");
-    (root.body || root).appendChild(div);
-
-    assert_equals(pre.length, preLength, "The length of the NodeList should not change.")
-  }, type + ": static NodeList")
-
-  test(function() {
-    post = root.findAll("div"),
-    assert_equals(post.length, preLength + 1, "The length of the new NodeList should be 1 more than the previous list.")
-  }, type + ": new NodeList")
-}
-
-/*
- * Verify handling of special values for the selector parameter, including stringification of
- * null and undefined, and the handling of the empty string.
- */
-function runSpecialSelectorTests(type, root) {
-  test(function() { // 1
-    assert_equals(root.findAll(null).length, 1, "This should find one element with the tag name 'NULL'.");
-  }, type + ".findAll null")
-
-  test(function() { // 2
-    assert_equals(root.findAll(undefined).length, 1, "This should find one elements with the tag name 'UNDEFINED'.");
-  }, type + ".findAll undefined")
-
-  test(function() { // 3
-    assert_throws(TypeError(), function() {
-      root.findAll();
-    }, "This should throw a TypeError.")
-  }, type + ".findAll no parameter")
-
-  test(function() { // 4
-    var elm = root.find(null)
-    assert_not_equals(elm, null, "This should find an element.");
-    assert_equals(elm.tagName.toUpperCase(), "NULL", "The tag name should be 'NULL'.")
-  }, type + ".find null")
-
-  test(function() { // 5
-    var elm = root.find(undefined)
-    assert_not_equals(elm, undefined, "This should find an element.");
-    assert_equals(elm.tagName.toUpperCase(), "UNDEFINED", "The tag name should be 'UNDEFINED'.")
-  }, type + ".find undefined")
-
-  test(function() { // 6
-    assert_throws(TypeError(), function() {
-      root.find();
-    }, "This should throw a TypeError.")
-  }, type + ".find no parameter.")
-
-  test(function() { // 7
-    result = root.findAll("*");
-    var i = 0;
-    traverse(root, function(elem) {
-      if (elem !== root) {
-        assert_equals(elem, result[i++], "The result in index " + i + " should be in tree order.")
-      }
-    })
-  }, type + ".findAll tree order");
-}
-
-function runSpecialMatchesTests(type, element) {
-  test(function() { // 1
-    if (element.tagName.toLowerCase() === "null") {
-      assert_true(element.matches(null), "An element with the tag name '" + element.tagName.toLowerCase() + "' should match.");
-    } else {
-      assert_false(element.matches(null), "An element with the tag name '" + element.tagName.toLowerCase() + "' should not match.");
-    }
-  }, type + ".matches(null)")
-
-  test(function() { // 2
-    if (element.tagName.toLowerCase() === "undefined") {
-      assert_true(element.matches(undefined), "An element with the tag name '" + element.tagName.toLowerCase() + "' should match.");
-    } else {
-      assert_false(element.matches(undefined), "An element with the tag name '" + element.tagName.toLowerCase() + "' should not match.");
-    }
-  }, type + ".matches(undefined)")
-
-  test(function() { // 3
-    assert_throws(TypeError(), function() {
-      element.matches();
-    }, "This should throw a TypeError.")
-  }, type + ".matches no parameter")
-}
-
-/*
- * Execute queries with the specified valid selectors for both find() and findAll()
- * Only run these tests when results are expected. Don't run for syntax error tests.
- *
- * Where testType is TEST_FIND_BASELINE or TEST_FIND_ADDITIONAL:
- *
- * context.findAll(selector, refNodes)
- * context.findAll(selector)        // Only if refNodes is not specified
- * root.findAll(selector, context)  // Only if refNodes is not specified
- * root.findAll(selector, refNodes) // Only if context is not specified
- * root.findAll(selector)           // Only if neither context nor refNodes is specified
- *
- * Where testType is TEST_QSA_BASELINE or TEST_QSA_ADDITIONAL
- *
- * context.querySelectorAll(selector) // Only if refNodes is not specified
- * root.querySelectorAll(selector)    // Only if neither context nor refNodes is specified
- *
- * Equivalent tests will be run for .find() as well.
- * Note: Do not specify a testType of TEST_QSA_* where either implied :scope or explicit refNodes
- * are required.
- */
-function runValidSelectorTest(type, root, selectors, testType, docType) {
-  var nodeType = getNodeType(root);
-
-  for (var i = 0; i < selectors.length; i++) {
-    var s = selectors[i];
-    var n = s["name"];
-    var q = s["selector"];
-    var e = s["expect"];
-
-    var ctx = s["ctx"];
-    var ref = s["ref"];
-
-    if (!s["exclude"] || (s["exclude"].indexOf(nodeType) === -1 && s["exclude"].indexOf(docType) === -1)) {
-      //console.log("Running tests " + nodeType + ": " + s["testType"] + "&" + testType + "=" + (s["testType"] & testType) + ": " + JSON.stringify(s))
-      var foundall, found, context, refNodes, refArray;
-
-      if (s["testType"] & testType & (TEST_FIND)) {
-
-
-        /*
-         * If ctx and ref are specified:
-         * context.findAll(selector, refNodes)
-         * context.find(selector, refNodes)
-         */
-        if (ctx && ref) {
-          context = root.querySelector(ctx);
-          refNodes = root.querySelectorAll(ref);
-          refArray = Array.prototype.slice.call(refNodes, 0);
-
-          test(function() {
-            foundall = context.findAll(q, refNodes);
-            verifyNodeList(foundall, expect);
-          }, type + " [Context Element].findAll: " + n + " (with refNodes NodeList): " + q);
-
-          test(function() {
-            foundall = context.findAll(q, refArray);
-            verifyNodeList(foundall, expect);
-          }, type + " [Context Element].findAll: " + n + " (with refNodes Array): " + q);
-
-          test(function() {
-            found = context.find(q, refNodes);
-            verifyElement(found, foundall, expect)
-          }, type + " [Context Element].find: " + n + " (with refNodes NodeList): " + q);
-
-          test(function() {
-            found = context.find(q, refArray);
-            verifyElement(found, foundall, expect)
-          }, type + " [Context Element].find: " + n + " (with refNodes Array): " + q);
-        }
-
-
-        /*
-         * If ctx is specified, ref is not:
-         * context.findAll(selector)
-         * context.find(selector)
-         * root.findAll(selector, context)
-         * root.find(selector, context)
-         */
-        if (ctx && !ref) {
-          context = root.querySelector(ctx);
-
-          test(function() {
-            foundall = context.findAll(q);
-            verifyNodeList(foundall, expect);
-          }, type + " [Context Element].findAll: " + n + " (with no refNodes): " + q);
-
-          test(function() {
-            found = context.find(q);
-            verifyElement(found, foundall, expect)
-          }, type + " [Context Element].find: " + n + " (with no refNodes): " + q);
-
-          test(function() {
-            foundall = root.findAll(q, context);
-            verifyNodeList(foundall, expect);
-          }, type + " [Root Node].findAll: " + n + " (with refNode Element): " + q);
-
-          test(function() {
-            foundall = root.find(q, context);
-            verifyElement(found, foundall, expect);
-          }, type + " [Root Node].find: " + n + " (with refNode Element): " + q);
-        }
-
-        /*
-         * If ref is specified, ctx is not:
-         * root.findAll(selector, refNodes)
-         * root.find(selector, refNodes)
-         */
-        if (!ctx && ref) {
-          refNodes = root.querySelectorAll(ref);
-          refArray = Array.prototype.slice.call(refNodes, 0);
-
-          test(function() {
-            foundall = root.findAll(q, refNodes);
-            verifyNodeList(foundall, expect);
-          }, type + " [Root Node].findAll: " + n + " (with refNodes NodeList): " + q);
-
-          test(function() {
-            foundall = root.findAll(q, refArray);
-            verifyNodeList(foundall, expect);
-          }, type + " [Root Node].findAll: " + n + " (with refNodes Array): " + q);
-
-          test(function() {
-            found = root.find(q, refNodes);
-            verifyElement(found, foundall, expect);
-          }, type + " [Root Node].find: " + n + " (with refNodes NodeList): " + q);
-
-          test(function() {
-            found = root.find(q, refArray);
-            verifyElement(found, foundall, expect);
-          }, type + " [Root Node].find: " + n + " (with refNodes Array): " + q);
-        }
-
-        /*
-         * If neither ctx nor ref is specified:
-         * root.findAll(selector)
-         * root.find(selector)
-         */
-        if (!ctx && !ref) {
-          test(function() {
-            foundall = root.findAll(q);
-            verifyNodeList(foundall, expect);
-          }, type + ".findAll: " + n + " (with no refNodes): " + q);
-
-          test(function() {
-            found = root.find(q);
-            verifyElement(found, foundall, expect);
-          }, type + ".find: " + n + " (with no refNodes): " + q);
-        }
-      }
-
-      if (s["testType"] & testType & (TEST_QSA)) {
-        if (ctx && !ref) {
-           // context.querySelectorAll(selector) // Only if refNodes is not specified
-        }
-
-        if (!ctx && !ref) {
-          // root.querySelectorAll(selector)    // Only if neither context nor refNodes is specified
-        }
-      }
-    } else {
-      //console.log("Excluding for " + nodeType + ": " + s["testType"] + "&" + testType + "=" + (s["testType"] & testType) + ": " + JSON.stringify(s))
-    }
-  }
-}
-
-/*
- * Execute queries with the specified invalid selectors for both find() and findAll()
- * Only run these tests when errors are expected. Don't run for valid selector tests.
- */
-function runInvalidSelectorTest(type, root, selectors) {
-  for (var i = 0; i < selectors.length; i++) {
-    var s = selectors[i];
-    var n = s["name"];
-    var q = s["selector"];
-
-    test(function() {
-      assert_throws("SyntaxError", function() {
-        root.find(q)
-      })
-    }, type + ".find: " + n + ": " + q);
-
-    test(function() {
-      assert_throws("SyntaxError", function() {
-        root.findAll(q)
-      })
-    }, type + ".findAll: " + n + ": " + q);
-
-    if (root.nodeType === root.ELEMENT_NODE) {
-      test(function() {
-        assert_throws("SyntaxError", function() {
-          root.matches(q)
-        })
-      }, type + ".matches: " + n + ": " + q);
-    }
-  }
-}
-
-function runMatchesTest(type, root, selectors, testType, docType) {
-  var nodeType = getNodeType(root);
-
-  for (var i = 0; i < selectors.length; i++) {
-    var s = selectors[i];
-    var n = s["name"];
-    var q = s["selector"];
-    var e = s["expect"];
-    var u = s["unexpected"];
-
-    var ctx = s["ctx"];
-    var ref = s["ref"];
-
-    if ((!s["exclude"] || (s["exclude"].indexOf(nodeType) === -1 && s["exclude"].indexOf(docType) === -1))
-     && (s["testType"] & testType & (TEST_MATCH)) ) {
-
-      if (ctx && !ref) {
-        test(function() {
-          var j, element, refNode;
-          for (j = 0; j < e.length; j++) {
-            element = root.querySelector("#" + e[j]);
-            refNode = root.querySelector(ctx);
-            assert_true(element.matches(q, refNode), "The element #" + e[j] + " should match the selector.")
-          }
-
-          if (u) {
-            for (j = 0; j < u.length; j++) {
-              element = root.querySelector("#" + u[j]);
-              refNode = root.querySelector(ctx);
-              assert_false(element.matches(q, refNode), "The element #" + u[j] + " should not match the selector.")
-            }
-          }
-        }, type + " Element.matches: " + n + " (with refNode Element): " + q);
-      }
-
-      if (ref) {
-        test(function() {
-          var j, element, refNodes;
-          for (j = 0; j < e.length; j++) {
-            element = root.querySelector("#" + e[j]);
-            refNodes = root.querySelectorAll(ref);
-            assert_true(element.matches(q, refNodes), "The element #" + e[j] + " should match the selector.")
-          }
-
-          if (u) {
-            for (j = 0; j < u.length; j++) {
-              element = root.querySelector("#" + u[j]);
-              refNodes = root.querySelectorAll(ref);
-              assert_false(element.matches(q, refNodes), "The element #" + u[j] + " should not match the selector.")
-            }
-          }
-        }, type + " Element.matches: " + n + " (with refNodes NodeList): " + q);
-      }
-
-      if (!ctx && !ref) {
-        test(function() {
-          for (var j = 0; j < e.length; j++) {
-            var element = root.querySelector("#" + e[j]);
-            assert_true(element.matches(q), "The element #" + e[j] + " should match the selector.")
-          }
-
-          if (u) {
-            for (j = 0; j < u.length; j++) {
-              element = root.querySelector("#" + u[j]);
-              assert_false(element.matches(q), "The element #" + u[j] + " should not match the selector.")
-            }
-          }
-        }, type + " Element.matches: " + n + " (with no refNodes): " + q);
-      }
-    }
-  }
-}
-
-
 function traverse(elem, fn) {
   if (elem.nodeType === elem.ELEMENT_NODE) {
     fn(elem);
-
-    elem = elem.firstChild;
-    while (elem) {
-      traverse(elem, fn);
-      elem = elem.nextSibling;
-    }
+  }
+  elem = elem.firstChild;
+  while (elem) {
+    traverse(elem, fn);
+    elem = elem.nextSibling;
   }
 }
 
@@ -460,25 +71,3 @@
       return "unknown"; // This should never happen.
   }
 }
-
-function verifyNodeList(resultAll, expect) {
-  assert_not_equals(resultAll, null, "The method should not return null.");
-  assert_equals(resultAll.length, e.length, "The method should return the expected number of matches.");
-
-  for (var i = 0; i < e.length; i++) {
-    assert_not_equals(resultAll[i], null, "The item in index " + i + " should not be null.")
-    assert_equals(resultAll[i].getAttribute("id"), e[i], "The item in index " + i + " should have the expected ID.");
-    assert_false(resultAll[i].hasAttribute("data-clone"), "This should not be a cloned element.");
-  }
-}
-
-function verifyElement(result, resultAll, expect) {
-  if (expect.length > 0) {
-    assert_not_equals(result, null, "The method should return a match.")
-    assert_equals(found.getAttribute("id"), e[0], "The method should return the first match.");
-    assert_equals(result, resultAll[0], "The result should match the first item from querySelectorAll.");
-    assert_false(found.hasAttribute("data-clone"), "This should not be annotated as a cloned element.");
-  } else {
-    assert_equals(result, null, "The method should not match anything.");
-  }
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>Selectors-API Level 2 Test Suite: HTML with Selectors Level 3</title>
+<!-- Selectors API Test Suite Version 3 -->
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/dom/nodes/selectors.js"></script>
+<script src="level2-lib.js"></script>
+<script src="ParentNode-find-findAll.js"></script>
+<style>iframe { visibility: hidden; position: absolute; }</style>
+
+<div id="log">This test requires JavaScript.</div>
+
+<script>
+var docType  = "html"; // Only run tests suitable for HTML
+
+var frame = document.createElement("iframe"),
+    doc;
+
+frame.onload = init;
+frame.src = "/dom/nodes/ParentNode-querySelector-All-content.html#target";
+document.body.appendChild(frame);
+
+function init() {
+  /*
+   * This test suite tests Selectors API methods in 4 different contexts:
+   * 1. Document node
+   * 2. In-document Element node
+   * 3. Detached Element node (an element with no parent, not in the document)
+   * 4. Document Fragment node
+   *
+   * For each context, the following tests are run:
+   *
+   * The interface check tests ensure that each type of node exposes the Selectors API methods.
+   *
+   * The matches() tests are run
+   * All the selectors tested for both the valid and invalid selector tests are found in selectors.js.
+   * See comments in that file for documentation of the format used.
+   *
+   * The level2-lib.js file contains all the common test functions for running each of the aforementioned tests
+   */
+
+  // Prepare the nodes for testing
+  doc = frame.contentDocument;                 // Document Node tests
+
+  var element = doc.getElementById("root");   // In-document Element Node tests
+
+  //Setup the namespace tests
+  setupSpecialElements(element);
+
+  var outOfScope = element.cloneNode(true);   // Append this to the body before running the in-document
+                                               // Element tests, but after running the Document tests. This
+                                               // tests that no elements that are not descendants of element
+                                               // are selected.
+
+  traverse(outOfScope, function(elem) {        // Annotate each element as being a clone; used for verifying
+    elem.setAttribute("data-clone", "");     // that none of these elements ever match.
+  });
+
+
+  var detached = element.cloneNode(true);     // Detached Element Node tests
+
+  var fragment = doc.createDocumentFragment(); // Fragment Node tests
+  fragment.appendChild(element.cloneNode(true));
+
+  // Setup Tests
+  interfaceCheckFind("Document", doc);
+  interfaceCheckFind("Detached Element", detached);
+  interfaceCheckFind("Fragment", fragment);
+  interfaceCheckFind("In-document Element", element);
+
+  runSpecialSelectorTests("Document", doc);
+  runSpecialSelectorTests("Detached Element", detached);
+  runSpecialSelectorTests("Fragment", fragment);
+  runSpecialSelectorTests("In-document Element", element);
+
+  verifyStaticList("Document", doc);
+  verifyStaticList("Detached Element", detached);
+  verifyStaticList("Fragment", fragment);
+  verifyStaticList("In-document Element", element);
+
+  runInvalidSelectorTestFind("Document", doc, invalidSelectors);
+  runInvalidSelectorTestFind("Detached Element", detached, invalidSelectors);
+  runInvalidSelectorTestFind("Fragment", fragment, invalidSelectors);
+  runInvalidSelectorTestFind("In-document Element", element, invalidSelectors);
+
+  runValidSelectorTest("In-document", doc, scopedSelectors, "html");
+}
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/selectors-api/tests/submissions/Opera/ParentNode-find-findAll.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,278 @@
+/*
+ * Check that the find and findAll methods exist on the given Node
+ */
+function interfaceCheckFind(type, obj) {
+  test(function() {
+    var q = typeof obj.find === "function";
+    assert_true(q, type + " supports find.");
+  }, type + " supports find")
+
+  test(function() {
+    var qa = typeof obj.findAll === "function";
+    assert_true( qa, type + " supports findAll.");
+  }, type + " supports findAll")
+}
+
+/*
+ * Verify that the NodeList returned by findAll is static and and that a new list is created after
+ * each call. A static list should not be affected by subsequent changes to the DOM.
+ */
+function verifyStaticList(type, root) {
+  var pre, post, preLength;
+
+  test(function() {
+    pre = root.findAll("div");
+    preLength = pre.length;
+
+    var div = doc.createElement("div");
+    (root.body || root).appendChild(div);
+
+    assert_equals(pre.length, preLength, "The length of the NodeList should not change.")
+  }, type + ": static NodeList")
+
+  test(function() {
+    post = root.findAll("div"),
+    assert_equals(post.length, preLength + 1, "The length of the new NodeList should be 1 more than the previous list.")
+  }, type + ": new NodeList")
+}
+
+/*
+ * Verify handling of special values for the selector parameter, including stringification of
+ * null and undefined, and the handling of the empty string.
+ */
+function runSpecialSelectorTests(type, root) {
+  test(function() { // 1
+    assert_equals(root.findAll(null).length, 1, "This should find one element with the tag name 'NULL'.");
+  }, type + ".findAll null")
+
+  test(function() { // 2
+    assert_equals(root.findAll(undefined).length, 1, "This should find one elements with the tag name 'UNDEFINED'.");
+  }, type + ".findAll undefined")
+
+  test(function() { // 3
+    assert_throws(TypeError(), function() {
+      root.findAll();
+    }, "This should throw a TypeError.")
+  }, type + ".findAll no parameter")
+
+  test(function() { // 4
+    var elm = root.find(null)
+    assert_not_equals(elm, null, "This should find an element.");
+    assert_equals(elm.tagName.toUpperCase(), "NULL", "The tag name should be 'NULL'.")
+  }, type + ".find null")
+
+  test(function() { // 5
+    var elm = root.find(undefined)
+    assert_not_equals(elm, undefined, "This should find an element.");
+    assert_equals(elm.tagName.toUpperCase(), "UNDEFINED", "The tag name should be 'UNDEFINED'.")
+  }, type + ".find undefined")
+
+  test(function() { // 6
+    assert_throws(TypeError(), function() {
+      root.find();
+    }, "This should throw a TypeError.")
+  }, type + ".find no parameter.")
+
+  test(function() { // 7
+    result = root.findAll("*");
+    var i = 0;
+    traverse(root, function(elem) {
+      if (elem !== root) {
+        assert_equals(elem, result[i++], "The result in index " + i + " should be in tree order.")
+      }
+    })
+  }, type + ".findAll tree order");
+}
+
+/*
+ * Execute queries with the specified valid selectors for both find() and findAll()
+ * Only run these tests when results are expected. Don't run for syntax error tests.
+ *
+ * context.findAll(selector, refNodes)
+ * context.findAll(selector)        // Only if refNodes is not specified
+ * root.findAll(selector, context)  // Only if refNodes is not specified
+ * root.findAll(selector, refNodes) // Only if context is not specified
+ * root.findAll(selector)           // Only if neither context nor refNodes is specified
+ *
+ * Equivalent tests will be run for .find() as well.
+ */
+function runValidSelectorTest(type, root, selectors, docType) {
+  var nodeType = getNodeType(root);
+
+  for (var i = 0; i < selectors.length; i++) {
+    var s = selectors[i];
+    var n = s["name"];
+    var q = s["selector"];
+    var e = s["expect"];
+
+    var ctx = s["ctx"];
+    var ref = s["ref"];
+
+    if (!s["exclude"] || (s["exclude"].indexOf(nodeType) === -1 && s["exclude"].indexOf(docType) === -1)) {
+      //console.log("Running tests " + nodeType + ": " + s["testType"] + "&" + testType + "=" + (s["testType"] & testType) + ": " + JSON.stringify(s))
+      var foundall, found, context, refNodes, refArray;
+
+      if (s["testType"] & TEST_FIND) {
+
+
+        /*
+         * If ctx and ref are specified:
+         * context.findAll(selector, refNodes)
+         * context.find(selector, refNodes)
+         */
+        if (ctx && ref) {
+          context = root.querySelector(ctx);
+          refNodes = root.querySelectorAll(ref);
+          refArray = Array.prototype.slice.call(refNodes, 0);
+
+          test(function() {
+            foundall = context.findAll(q, refNodes);
+            verifyNodeList(foundall, expect);
+          }, type + " [Context Element].findAll: " + n + " (with refNodes NodeList): " + q);
+
+          test(function() {
+            foundall = context.findAll(q, refArray);
+            verifyNodeList(foundall, expect);
+          }, type + " [Context Element].findAll: " + n + " (with refNodes Array): " + q);
+
+          test(function() {
+            found = context.find(q, refNodes);
+            verifyElement(found, foundall, expect)
+          }, type + " [Context Element].find: " + n + " (with refNodes NodeList): " + q);
+
+          test(function() {
+            found = context.find(q, refArray);
+            verifyElement(found, foundall, expect)
+          }, type + " [Context Element].find: " + n + " (with refNodes Array): " + q);
+        }
+
+
+        /*
+         * If ctx is specified, ref is not:
+         * context.findAll(selector)
+         * context.find(selector)
+         * root.findAll(selector, context)
+         * root.find(selector, context)
+         */
+        if (ctx && !ref) {
+          context = root.querySelector(ctx);
+
+          test(function() {
+            foundall = context.findAll(q);
+            verifyNodeList(foundall, expect);
+          }, type + " [Context Element].findAll: " + n + " (with no refNodes): " + q);
+
+          test(function() {
+            found = context.find(q);
+            verifyElement(found, foundall, expect)
+          }, type + " [Context Element].find: " + n + " (with no refNodes): " + q);
+
+          test(function() {
+            foundall = root.findAll(q, context);
+            verifyNodeList(foundall, expect);
+          }, type + " [Root Node].findAll: " + n + " (with refNode Element): " + q);
+
+          test(function() {
+            foundall = root.find(q, context);
+            verifyElement(found, foundall, expect);
+          }, type + " [Root Node].find: " + n + " (with refNode Element): " + q);
+        }
+
+        /*
+         * If ref is specified, ctx is not:
+         * root.findAll(selector, refNodes)
+         * root.find(selector, refNodes)
+         */
+        if (!ctx && ref) {
+          refNodes = root.querySelectorAll(ref);
+          refArray = Array.prototype.slice.call(refNodes, 0);
+
+          test(function() {
+            foundall = root.findAll(q, refNodes);
+            verifyNodeList(foundall, expect);
+          }, type + " [Root Node].findAll: " + n + " (with refNodes NodeList): " + q);
+
+          test(function() {
+            foundall = root.findAll(q, refArray);
+            verifyNodeList(foundall, expect);
+          }, type + " [Root Node].findAll: " + n + " (with refNodes Array): " + q);
+
+          test(function() {
+            found = root.find(q, refNodes);
+            verifyElement(found, foundall, expect);
+          }, type + " [Root Node].find: " + n + " (with refNodes NodeList): " + q);
+
+          test(function() {
+            found = root.find(q, refArray);
+            verifyElement(found, foundall, expect);
+          }, type + " [Root Node].find: " + n + " (with refNodes Array): " + q);
+        }
+
+        /*
+         * If neither ctx nor ref is specified:
+         * root.findAll(selector)
+         * root.find(selector)
+         */
+        if (!ctx && !ref) {
+          test(function() {
+            foundall = root.findAll(q);
+            verifyNodeList(foundall, expect);
+          }, type + ".findAll: " + n + " (with no refNodes): " + q);
+
+          test(function() {
+            found = root.find(q);
+            verifyElement(found, foundall, expect);
+          }, type + ".find: " + n + " (with no refNodes): " + q);
+        }
+      }
+    } else {
+      //console.log("Excluding for " + nodeType + ": " + s["testType"] + "&" + testType + "=" + (s["testType"] & testType) + ": " + JSON.stringify(s))
+    }
+  }
+}
+
+/*
+ * Execute queries with the specified invalid selectors for both find() and findAll()
+ * Only run these tests when errors are expected. Don't run for valid selector tests.
+ */
+function runInvalidSelectorTestFind(type, root, selectors) {
+  for (var i = 0; i < selectors.length; i++) {
+    var s = selectors[i];
+    var n = s["name"];
+    var q = s["selector"];
+
+    test(function() {
+      assert_throws("SyntaxError", function() {
+        root.find(q)
+      })
+    }, type + ".find: " + n + ": " + q);
+
+    test(function() {
+      assert_throws("SyntaxError", function() {
+        root.findAll(q)
+      })
+    }, type + ".findAll: " + n + ": " + q);
+  }
+}
+
+function verifyNodeList(resultAll, expect) {
+  assert_not_equals(resultAll, null, "The method should not return null.");
+  assert_equals(resultAll.length, e.length, "The method should return the expected number of matches.");
+
+  for (var i = 0; i < e.length; i++) {
+    assert_not_equals(resultAll[i], null, "The item in index " + i + " should not be null.")
+    assert_equals(resultAll[i].getAttribute("id"), e[i], "The item in index " + i + " should have the expected ID.");
+    assert_false(resultAll[i].hasAttribute("data-clone"), "This should not be a cloned element.");
+  }
+}
+
+function verifyElement(result, resultAll, expect) {
+  if (expect.length > 0) {
+    assert_not_equals(result, null, "The method should return a match.")
+    assert_equals(found.getAttribute("id"), e[0], "The method should return the first match.");
+    assert_equals(result, resultAll[0], "The result should match the first item from querySelectorAll.");
+    assert_false(found.hasAttribute("data-clone"), "This should not be annotated as a cloned element.");
+  } else {
+    assert_equals(result, null, "The method should not match anything.");
+  }
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/serve.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/serve.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/serve.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/serve.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,7 +1,6 @@
  # -*- coding: utf-8 -*-
 import argparse
 import json
-import logging
 import os
 import signal
 import socket
@@ -19,6 +18,8 @@
 sys.path.insert(1, os.path.join(repo_root, "tools", "wptserve"))
 from wptserve import server as wptserve, handlers
 from wptserve.router import any_method
+from wptserve.logger import set_logger
+
 sys.path.insert(1, os.path.join(repo_root, "tools", "pywebsocket", "src"))
 from mod_pywebsocket import standalone as pywebsocket
 
@@ -39,12 +40,12 @@
               u"天気�良�日",
               u"élève"]
 
-logger = None
-
-def default_logger(level):
+def setup_logger(level):
+    import logging
+    global logger
     logger = logging.getLogger("web-platform-tests")
     logging.basicConfig(level=getattr(logging, level.upper()))
-    return logger
+    set_logger(logger)
 
 def open_socket(port):
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -323,12 +324,10 @@
     return rv
 
 def main():
-    global logger
-
     config = load_config("config.default.json",
                          "config.json")
 
-    logger = default_logger(config["log_level"])
+    setup_logger(config["log_level"])
 
     config_, servers = start(config)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/runner/update_manifest.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/runner/update_manifest.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/runner/update_manifest.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/runner/update_manifest.py	2014-11-26 21:45:59.000000000 +0000
@@ -10,9 +10,9 @@
 import manifest
 
 def main(request, response):
-    manifest_path = os.path.join(root, "MANIFEST.json")
-    manifest.update_manifest(root, **{"rebuild": False,
-                                      "local_changes": True,
-                                      "path": manifest_path})
+    path = os.path.join(root, "MANIFEST.json")
+    manifest_file = manifest.load(path)
+    manifest.update(root, "/", manifest_file)
+    manifest.write(manifest_file, path)
 
     return [("Content-Type", "application/json")], json.dumps({"url": "/MANIFEST.json"})
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/scripts/manifest.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/scripts/manifest.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/scripts/manifest.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/scripts/manifest.py	2014-11-26 21:45:59.000000000 +0000
@@ -9,6 +9,8 @@
 import sys
 import urlparse
 
+from StringIO import StringIO
+from abc import ABCMeta, abstractmethod, abstractproperty
 from collections import defaultdict
 from fnmatch import fnmatch
 
@@ -20,10 +22,8 @@
     return git
 
 
-def setup_git(repo_path):
-    assert os.path.exists(os.path.join(repo_path, ".git"))
-    global git
-    git = get_git_func(repo_path)
+def is_git_repo(tests_root):
+    return os.path.exists(os.path.join(tests_root, ".git"))
 
 
 _repo_root = None
@@ -36,79 +36,130 @@
 
 
 manifest_name = "MANIFEST.json"
-exclude_php_hack = True
 ref_suffixes = ["_ref", "-ref"]
 wd_pattern = "*.py"
 blacklist = ["/", "/tools/", "/resources/", "/common/", "/conformance-checkers/"]
 
+
 logging.basicConfig()
 logger = logging.getLogger("manifest")
 logger.setLevel(logging.DEBUG)
 
 
+def rel_path_to_url(rel_path, url_base="/"):
+    assert not os.path.isabs(rel_path)
+    if url_base[0] != "/":
+        url_base = "/" + url_base
+    if url_base[-1] != "/":
+        url_base += "/"
+    return url_base + rel_path.replace(os.sep, "/")
+
+
+def url_to_rel_path(url, url_base):
+    url_path = urlparse.urlsplit(url).path
+    if not url_path.startswith(url_base):
+        raise ValueError, url
+    url_path = url_path[len(url_base):]
+    return url_path
+
+
+def is_blacklisted(url):
+    for item in blacklist:
+        if item == "/":
+            if "/" not in url[1:]:
+                return True
+        elif url.startswith(item):
+            return True
+    return False
+
+
 class ManifestItem(object):
+    __metaclass__ = ABCMeta
+
     item_type = None
 
-    def __init__(self, path):
-        self.path = path
+    def __init__(self):
+        self.manifest = None
 
-    def _key(self):
-        return self.item_type, self.path
+    @abstractmethod
+    def key(self):
+        pass
 
     def __eq__(self, other):
-        if not hasattr(other, "_key"):
+        if not hasattr(other, "key"):
             return False
-        return self._key() == other._key()
+        return self.key() == other.key()
 
     def __hash__(self):
-        return hash(self._key())
+        return hash(self.key())
 
+    @abstractmethod
     def to_json(self):
-        return {"path": self.path}
+        raise NotImplementedError
 
     @classmethod
-    def from_json(self, obj):
+    def from_json(self, manifest, obj):
         raise NotImplementedError
 
-    @property
+    @abstractproperty
     def id(self):
-        raise NotImplementedError
+        pass
 
-class TestharnessTest(ManifestItem):
-    item_type = "testharness"
 
-    def __init__(self, path, url, timeout=None):
-        ManifestItem.__init__(self, path)
+class URLManifestItem(ManifestItem):
+    def __init__(self, url, url_base="/"):
+        ManifestItem.__init__(self)
         self.url = url
-        self.timeout = timeout
+        self.url_base = url_base
 
     @property
     def id(self):
         return self.url
 
+    def key(self):
+        return self.item_type, self.url
+
+    @property
+    def path(self):
+        return url_to_rel_path(self.url, self.url_base)
+
     def to_json(self):
-        rv = ManifestItem.to_json(self)
-        rv.update({"url": self.url})
-        if self.timeout:
+        rv = {"url": self.url}
+        return rv
+
+    @classmethod
+    def from_json(cls, manifest, obj):
+        return cls(obj["url"],
+                   url_base=manifest.url_base)
+
+
+class TestharnessTest(URLManifestItem):
+    item_type = "testharness"
+
+    def __init__(self, url, url_base="/", timeout=None):
+        URLManifestItem.__init__(self, url, url_base=url_base)
+        self.timeout = timeout
+
+    def to_json(self):
+        rv = {"url": self.url}
+        if self.timeout is not None:
             rv["timeout"] = self.timeout
         return rv
 
     @classmethod
-    def from_json(cls, obj):
-        return cls(obj["path"],
-                   obj["url"],
+    def from_json(cls, manifest, obj):
+        return cls(obj["url"],
+                   url_base=manifest.url_base,
                    timeout=obj.get("timeout"))
 
 
-class RefTest(ManifestItem):
+class RefTest(URLManifestItem):
     item_type = "reftest"
 
-    def __init__(self, path, url, ref_url, ref_type,
-                 timeout=None):
+    def __init__(self, url, ref_url, ref_type, url_base="/", timeout=None):
+        URLManifestItem.__init__(self, url, url_base=url_base)
         if ref_type not in ["==", "!="]:
             raise ValueError, "Unrecognised ref_type %s" % ref_type
-        ManifestItem.__init__(self, path)
-        self.url = url
         self.ref_url = ref_url
         self.ref_type = ref_type
         self.timeout = timeout
@@ -117,191 +168,257 @@
     def id(self):
         return (self.url, self.ref_type, self.ref_url)
 
-    def _key(self):
+    def key(self):
         return self.item_type, self.url, self.ref_type, self.ref_url
 
     def to_json(self):
-        rv = ManifestItem.to_json(self)
-        rv.update({"url": self.url,
-                   "ref_type": self.ref_type,
-                   "ref_url": self.ref_url})
-        if self.timeout:
+        rv = {"url": self.url,
+              "ref_type": self.ref_type,
+              "ref_url": self.ref_url}
+        if self.timeout is not None:
             rv["timeout"] = self.timeout
         return rv
 
     @classmethod
-    def from_json(cls, obj):
-        return cls(obj["path"], obj["url"], obj["ref_url"], obj["ref_type"],
+    def from_json(cls, manifest, obj):
+        return cls(obj["url"],
+                   obj["ref_url"],
+                   obj["ref_type"],
+                   url_base=manifest.url_base,
                    timeout=obj.get("timeout"))
 
 
-class ManualTest(ManifestItem):
+class ManualTest(URLManifestItem):
     item_type = "manual"
 
-    def __init__(self, path, url):
-        ManifestItem.__init__(self, path)
-        self.url = url
-
-    @property
-    def id(self):
-        return self.url
-
-    def to_json(self):
-        rv = ManifestItem.to_json(self)
-        rv.update({"url": self.url})
-        return rv
-
-    @classmethod
-    def from_json(cls, obj):
-        return cls(obj["path"], obj["url"])
-
-
-class Stub(ManifestItem):
+class Stub(URLManifestItem):
     item_type = "stub"
 
-    def __init__(self, path, url):
-        ManifestItem.__init__(self, path)
-        self.url = url
-
-    @property
-    def id(self):
-        return self.url
-
-    def to_json(self):
-        rv = ManifestItem.to_json(self)
-        rv.update({"url": self.url})
-        return rv
-
-    @classmethod
-    def from_json(cls, obj):
-        return cls(obj["path"], obj["url"])
-
-
-class Helper(ManifestItem):
+class Helper(URLManifestItem):
     item_type = "helper"
 
-    def __init__(self, path, url):
-        ManifestItem.__init__(self, path)
-        self.url = url
+class WebdriverSpecTest(ManifestItem):
+    item_type = "wdspec"
+
+    def __init__(self, path):
+        ManifestItem.__init__(self)
+        self.path = path
 
     @property
     def id(self):
-        return self.url
+        return self.path
 
     def to_json(self):
-        rv = ManifestItem.to_json(self)
-        rv.update({"url": self.url})
-        return rv
-
-    @classmethod
-    def from_json(cls, obj):
-        return cls(obj["path"], obj["url"])
-
-
-class WebdriverSpecTest(ManifestItem):
-    item_type = "wdspec"
+        return {"path": self.path}
 
-    @property
-    def id(self):
+    def key(self):
         return self.path
 
     @classmethod
-    def from_json(cls, obj):
-        return cls(obj["path"])
+    def from_json(cls, manifest, obj):
+        return cls(path=obj["path"])
 
 
 class ManifestError(Exception):
     pass
 
+item_types = ["testharness", "reftest", "manual", "helper", "stub", "wdspec"]
 
 class Manifest(object):
-    def __init__(self, git_rev):
-        self.item_types = [
-            "testharness", "reftest", "manual", "helper", "stub", "wdspec"]
+    def __init__(self, git_rev=None, url_base="/"):
+        # Dict of item_type: {path: set(manifest_items)}
         self._data = dict((item_type, defaultdict(set))
-                          for item_type in self.item_types)
+                          for item_type in item_types)
         self.rev = git_rev
-        self.local_changes = LocalChanges()
+        self.url_base = url_base
+        self.local_changes = LocalChanges(self)
+
+    def _included_items(self, include_types=None):
+        if include_types is None:
+            include_types = item_types
+
+        for item_type in include_types:
+            paths = self._data[item_type].copy()
+            for local_types, local_paths in self.local_changes.itertypes(item_type):
+                for path, items in local_paths.iteritems():
+                    paths[path] = items
+                for path in self.local_changes.iterdeleted():
+                    del paths[path]
+
+            yield item_type, paths
 
     def contains_path(self, path):
-        return any(path in item for item in self._data.itervalues())
+        return any(path in paths for _, paths in self._included_items())
 
     def add(self, item):
         self._data[item.item_type][item.path].add(item)
+        item.manifest = self
 
     def extend(self, items):
         for item in items:
             self.add(item)
 
     def remove_path(self, path):
-        for item_type in self.item_types:
+        for item_type in item_types:
             if path in self._data[item_type]:
                 del self._data[item_type][path]
 
     def itertypes(self, *types):
-        for item_type in types:
-            for item in sorted(self._data[item_type].items()):
+        if not types:
+            types = None
+        for item_type, items in self._included_items(types):
+            for item in sorted(items.items()):
                 yield item
 
     def __iter__(self):
-        for item_type in self.item_types:
-            for item in self._data[item_type].iteritems():
-                yield item
+        for item in self.itertypes():
+            yield item
 
-    def __getitem__(self, key):
-        for items in self._data.itervalues():
-            if key in items:
-                return items[key]
+    def __getitem__(self, path):
+        for _, paths in self._data._included_items():
+            if path in paths:
+                return paths[path]
         raise KeyError
 
+    def update(self,
+               tests_root,
+               url_base,
+               new_rev,
+               committed_changes=None,
+               local_changes=None):
+
+        if local_changes is None:
+            local_changes = {}
+
+        if committed_changes is not None:
+            for rel_path, status in committed_changes:
+                self.remove_path(rel_path)
+                if status == "modified":
+                    use_committed = rel_path in local_changes
+                    manifest_items = get_manifest_items(tests_root,
+                                                        rel_path,
+                                                        url_base,
+                                                        use_committed=use_committed)
+                    self.extend(manifest_items)
+
+        self.local_changes = LocalChanges(self)
+        for rel_path, status in local_changes.iteritems():
+            if status == "modified":
+                items = set(get_manifest_items(tests_root,
+                                               rel_path,
+                                               url_base,
+                                               use_committed=False))
+                self.local_changes.extend(items)
+            else:
+                self.local_changes.add_deleted(path)
+
+        self.rev = new_rev
+        self.url_base = url_base
+
     def to_json(self):
-        items = defaultdict(list)
-        for test_path, tests in self.itertypes(*self.item_types):
-            for test in tests:
-                items[test.item_type].append(test.to_json())
-
-        rv = {"rev":self.rev,
-              "local_changes":self.local_changes.to_json(),
-              "items":items}
+        out_items = {
+            item_type: sorted(
+                test.to_json()
+                for _, tests in items.iteritems()
+                for test in tests
+            )
+            for item_type, items in self._data.iteritems()
+        }
+
+        rv = {"url_base": self.url_base,
+              "rev": self.rev,
+              "local_changes": self.local_changes.to_json(),
+              "items": out_items}
         return rv
 
     @classmethod
     def from_json(cls, obj):
-        self = cls(obj["rev"])
+        self = cls(git_rev=obj["rev"],
+                   url_base=obj.get("url_base", "/"))
         if not hasattr(obj, "iteritems"):
             raise ManifestError
 
-        item_classes = {"testharness":TestharnessTest,
-                        "reftest":RefTest,
-                        "manual":ManualTest,
-                        "helper":Helper,
+        item_classes = {"testharness": TestharnessTest,
+                        "reftest": RefTest,
+                        "manual": ManualTest,
+                        "helper": Helper,
                         "stub": Stub,
                         "wdspec": WebdriverSpecTest}
 
         for k, values in obj["items"].iteritems():
-            if k not in self.item_types:
+            if k not in item_types:
                 raise ManifestError
             for v in values:
-                manifest_item = item_classes[k].from_json(v)
+                manifest_item = item_classes[k].from_json(self, v)
                 self.add(manifest_item)
-        self.local_changes = LocalChanges.from_json(obj["local_changes"])
+        self.local_changes = LocalChanges.from_json(self, obj["local_changes"])
         return self
 
+class LocalChanges(object):
+    def __init__(self, manifest):
+        self.manifest = manifest
+        self._data = dict((item_type, defaultdict(set)) for item_type in item_types)
+        self._deleted = set()
 
-class LocalChanges(dict):
-    def __setitem__(self, path, status):
-        if status not in ["A", "M", "D"]:
-            raise ValueError, "Unrecognised status %s for path %s" % (status, path)
-        dict.__setitem__(self, path, status)
+    def add(self, item):
+        self._data[item.item_type][item.path].add(item)
+        item.manifest = self.manifest
+
+    def extend(self, items):
+        for item in items:
+            self.add(item)
+
+    def add_deleted(self, path):
+        self._deleted.add(path)
+
+    def is_deleted(self, path):
+        return path in self._deleted
+
+    def itertypes(self, *types):
+        for item_type in types:
+            yield item_type, self._data[item_type]
+
+    def iterdeleted(self):
+        for item in self._deleted:
+            yield item
+
+    def __getitem__(self, item_type):
+        return self._data[item_type]
 
     def to_json(self):
-        return [(self[item], item) for item in sorted(self.keys())]
+        rv = {"items": defaultdict(dict),
+              "deleted": []}
+
+        rv["deleted"].extend(self._deleted)
+
+        for test_type, paths in self._data.iteritems():
+            for path, tests in paths.iteritems():
+                rv["items"][test_type][path] = [test.to_json() for test in tests]
+
+        return rv
 
     @classmethod
-    def from_json(cls, obj):
-        self = cls()
-        for status, path in obj:
-            self[path] = status
+    def from_json(cls, url_base, obj):
+        self = cls(url_base)
+        if not hasattr(obj, "iteritems"):
+            raise ManifestError
+
+        item_classes = {"testharness": TestharnessTest,
+                        "reftest": RefTest,
+                        "manual": ManualTest,
+                        "helper": Helper,
+                        "stub": Stub,
+                        "wdspec": WebdriverSpecTest}
+
+        for test_type, paths in obj["items"].iteritems():
+            for path, tests in paths.iteritems():
+                for test in tests:
+                    manifest_item = item_classes[test_type].from_json(self.manifest, test)
+                    self.add(manifest_item)
+
+        for item in obj["deleted"]:
+            self.add_deleted(item)
+
         return self
 
 
@@ -342,17 +459,33 @@
     return match_links, mismatch_links
 
 
-def get_manifest_items(rel_path):
-    if rel_path.endswith(os.path.sep):
+def get_file(base_path, rel_path, use_committed):
+    if use_committed:
+        blob = git("show", "HEAD:%s" % rel_path)
+        file_obj = ContextManagerStringIO(blob)
+    else:
+        path = os.path.join(base_path, rel_path)
+        file_obj = open(path)
+    return file_obj
+
+class ContextManagerStringIO(StringIO):
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args, **kwargs):
+        self.close()
+
+def get_manifest_items(tests_root, rel_path, url_base, use_committed=False):
+    if os.path.isdir(rel_path):
         return []
 
-    url = "/" + rel_path.replace(os.sep, "/")
+    url = rel_path_to_url(rel_path, url_base)
+    path = os.path.join(tests_root, rel_path)
 
-    path = os.path.join(get_repo_root(), rel_path)
-    if not os.path.exists(path):
+    if not use_committed and not os.path.exists(path):
         return []
 
-    base_path, filename = os.path.split(path)
+    dir_path, filename = os.path.split(path)
     name, ext = os.path.splitext(filename)
     rel_dir_tree = rel_path.split(os.path.sep)
 
@@ -361,29 +494,25 @@
     if filename.startswith("MANIFEST") or filename.startswith("."):
         return []
 
-    for item in blacklist:
-        if item == "/":
-            if "/" not in url[1:]:
-                return []
-        elif url.startswith(item):
-            return []
+    if is_blacklisted(url):
+        return []
 
     if name.startswith("stub-"):
-        return [Stub(rel_path, url)]
+        return [Stub(url)]
 
     if name.lower().endswith("-manual"):
-        return [ManualTest(rel_path, url)]
+        return [ManualTest(url)]
 
     ref_list = []
 
     for suffix in ref_suffixes:
         if name.endswith(suffix):
-            return [Helper(rel_path, rel_path)]
-        elif os.path.exists(os.path.join(base_path, name + suffix + ext)):
+            return [Helper(url)]
+        elif os.path.exists(os.path.join(dir_path, name + suffix + ext)):
             ref_url, ref_ext = url.rsplit(".", 1)
             ref_url = ref_url + suffix + ext
             #Need to check if this is the right reftype
-            ref_list = [RefTest(rel_path, url, ref_url, "==")]
+            ref_list = [RefTest(url, ref_url, "==")]
 
     # wdspec tests are in subdirectories of /webdriver excluding __init__.py
     # files.
@@ -396,21 +525,15 @@
     if file_markup_type:
         timeout = None
 
-        if exclude_php_hack:
-            php_re =re.compile("\.php")
-            with open(path) as f:
-                text = f.read()
-                if php_re.findall(text):
-                    return []
-
         parser = {"html":lambda x:html5lib.parse(x, treebuilder="etree"),
                   "xhtml":ElementTree.parse,
                   "svg":ElementTree.parse}[file_markup_type]
-        try:
-            with open(path) as f:
+
+        with get_file(tests_root, rel_path, use_committed) as f:
+            try:
                 tree = parser(f)
-        except:
-            return [Helper(rel_path, url)]
+            except:
+                return [Helper(url)]
 
         if hasattr(tree, "getroot"):
             root = tree.getroot()
@@ -427,98 +550,182 @@
                     pass
 
         if get_testharness_scripts(root):
-            return [TestharnessTest(rel_path, url, timeout=timeout)]
+            return [TestharnessTest(url, timeout=timeout)]
         else:
             match_links, mismatch_links = get_reference_links(root)
             for item in match_links + mismatch_links:
                 ref_url = urlparse.urljoin(url, item.attrib["href"])
                 ref_type = "==" if item.attrib["rel"] == "match" else "!="
-                reftest = RefTest(rel_path, url, ref_url, ref_type, timeout=timeout)
+                reftest = RefTest(url, ref_url, ref_type, timeout=timeout)
                 if reftest not in ref_list:
                     ref_list.append(reftest)
             return ref_list
 
-    return [Helper(rel_path, url)]
+    return [Helper(url)]
 
 
 def abs_path(path):
     return os.path.abspath(path)
 
 
-def get_repo_paths():
-    data = git("ls-tree", "--name-only", "--full-tree", "-r", "HEAD")
-    return [item for item in data.split("\n") if not item.endswith(os.path.sep)]
+def chunks(data, n):
+    for i in range(0, len(data) - 1, n):
+        yield data[i:i+n]
 
 
-def get_committed_changes(base_rev):
-    if base_rev is None:
-        logger.debug("Adding all changesets to the manifest")
-        return [("A", item) for item in get_repo_paths()]
-    else:
-        logger.debug("Updating the manifest from %s to %s" % (base_rev, get_current_rev()))
-        data  = git("diff", "--name-status", base_rev)
-        return [line.split("\t", 1) for line in data.split("\n") if line]
-
-
-def has_local_changes():
-    return git("status", "--porcelain", "--ignore-submodules=untracked").strip() != ""
-
-
-def get_local_changes():
-    #This doesn't account for whole directories that have been added
-    data  = git("status", "--porcelain", "--ignore-submodules=all")
-    rv = LocalChanges()
-    for line in data.split("\n"):
-        line = line.strip()
-        if not line:
-            continue
-        status, path = line.split(" ", 1)
-        if path.endswith(os.path.sep):
-            logger.warning("Ignoring added directory %s" % path)
-            continue
-        if status == "??":
-            status = "A"
-        elif status == "R":
-            old_path, path = tuple(item.strip() for item in path.split("->"))
-            rv[old_path] = "D"
-            status = "A"
-        elif status == "MM":
-            status = "M"
-        rv[path] = status
-    return rv
-
-
-def sync_urls(manifest, updated_files):
-    for status, path in updated_files:
-        if status in ("D", "M"):
-            manifest.remove_path(path)
-        if status in ("A", "M"):
-            manifest.extend(get_manifest_items(path))
-
-
-def sync_local_changes(manifest, local_changes):
-    if local_changes:
-        logger.info("Working directory not clean, adding local changes")
-    prev_local_changes = manifest.local_changes
-    all_paths = get_repo_paths()
-
-    for path, status in prev_local_changes.iteritems():
-        print status, path, path in local_changes
-        if path not in local_changes:
-            # If a path was previously marked as deleted but is now back
-            # we need to readd it to the manifest
-            if status == "D" and path in all_paths:
-                local_changes[path] = "A"
-            # If a path was previously marked as added but is now
-            # not then we need to remove it from the manifest
-            elif status == "A" and path not in all_paths:
-                local_changes[path] = "D"
+class TestTree(object):
+    def __init__(self, tests_root, url_base):
+        self.tests_root = tests_root
+        self.url_base = url_base
+
+    def current_rev(self):
+        pass
+
+    def local_changes(self):
+        pass
+
+    def comitted_changes(self, base_rev=None):
+        pass
 
-    sync_urls(manifest, ((status, path) for path, status in local_changes.iteritems()))
 
+class GitTree(TestTree):
+    def __init__(self, tests_root, url_base):
+        TestTree.__init__(self, tests_root, url_base)
+        self.git = self.setup_git()
 
-def get_current_rev():
-    return git("rev-parse", "HEAD").strip()
+    def setup_git(self):
+        assert is_git_repo(self.tests_root)
+        return get_git_func(self.tests_root)
+
+    def current_rev(self):
+        return self.git("rev-parse", "HEAD").strip()
+
+    def local_changes(self, path=None):
+        # -z is stable like --porcelain; see the git status documentation for details
+        cmd = ["status", "-z", "--ignore-submodules=all"]
+        if path is not None:
+            cmd.extend(["--", path])
+
+        rv = {}
+
+        data = self.git(*cmd)
+        if data == "":
+            return rv
+
+        assert data[-1] == "\0"
+        f = StringIO(data)
+
+        while f.tell() < len(data):
+            # First two bytes are the status in the stage (index) and working tree, respectively
+            staged = f.read(1)
+            worktree = f.read(1)
+            assert f.read(1) == " "
+
+            if staged == "R":
+                # When a file is renamed, there are two files, the source and the destination
+                files = 2
+            else:
+                files = 1
+
+            filenames = []
+
+            for i in range(files):
+                filenames.append("")
+                char = f.read(1)
+                while char != "\0":
+                    filenames[-1] += char
+                    char = f.read(1)
+
+            if not is_blacklisted(rel_path_to_url(filenames[0], self.url_base)):
+                rv.update(self.local_status(staged, worktree, filenames))
+
+        return rv
+
+    def committed_changes(self, base_rev=None):
+        if base_rev is None:
+            logger.debug("Adding all changesets to the manifest")
+            return [(item, "modified") for item in self.paths()]
+
+        logger.debug("Updating the manifest from %s to %s" % (base_rev, self.current_rev()))
+        rv = []
+        data  = self.git("diff", "-z", "--name-status", base_rev + "..HEAD")
+        items = data.split("\0")
+        for status, filename in chunks(items, 2):
+            if is_blacklisted(rel_path_to_url(filename, self.url_base)):
+                continue
+            if status == "D":
+                rv.append((filename, "deleted"))
+            else:
+                rv.append((filename, "modified"))
+        return rv
+
+    def paths(self):
+        data = self.git("ls-tree", "--name-only", "--full-tree", "-r", "HEAD")
+        return [item for item in data.split("\n") if not item.endswith(os.path.sep)]
+
+    def local_status(self, staged, worktree, filenames):
+        # Convert the complex range of statuses that git can have to two values
+        # we care about; "modified" and "deleted" and return a dictionary mapping
+        # filenames to statuses
+
+        rv = {}
+
+        if (staged, worktree) in [("D", "D"), ("A", "U"), ("U", "D"), ("U", "A"),
+                                  ("D", "U"), ("A", "A"), ("U", "U")]:
+            raise Exception("Can't operate on tree containing unmerged paths")
+
+        if staged == "R":
+            assert len(filenames) == 2
+            dest, src = filenames
+            rv[dest] = "modified"
+            rv[src] = "deleted"
+        else:
+            assert len(filenames) == 1
+
+            filename = filenames[0]
+
+            if staged == "D" or worktree == "D":
+                # Actually if something is deleted in the index but present in the worktree
+                # it will get included by having a status of both "D " and "??".
+                # It isn't clear whether that's a bug
+                rv[filename] = "deleted"
+            elif staged == "?" and worktree == "?":
+                # A new file. If it's a directory, recurse into it
+                if os.path.isdir(os.path.join(self.tests_root, filename)):
+                    rv.update(self.local_changes(filename))
+                else:
+                    rv[filename] = "modified"
+            else:
+                rv[filename] = "modified"
+
+        return rv
+
+class NoVCSTree(TestTree):
+    """Subclass that doesn't depend on git but assumes that all changes are comitted"""
+
+    ignore = ["*.py[c|0]", "*~", "#*"]
+
+    def current_rev(self):
+        return None
+
+    def local_changes(self):
+        return None
+
+    def committed_changes(self, base_rev=None):
+        if base_rev is not None:
+            raise ValueError("Tried to update a tree with no VCS against a base_rev")
+
+        rv = []
+        for dir_path, dir_names, filenames in os.walk(self.tests_root):
+            for filename in filenames:
+                if any(fnmatch(filename, pattern) for pattern in self.ignore):
+                    continue
+                rel_path = os.path.relpath(os.path.join(dir_path, filename),
+                                           self.tests_root)
+                if is_blacklisted(rel_path_to_url(rel_path, self.url_base)):
+                    continue
+                rv.append((rel_path, "modified"))
+        return rv
 
 
 def load(manifest_path):
@@ -535,7 +742,7 @@
     return manifest
 
 
-def update(manifest):
+def update(tests_root, url_base, manifest, ignore_local=False):
     global ElementTree
     global html5lib
 
@@ -546,10 +753,21 @@
 
     import html5lib
 
-    sync_urls(manifest, get_committed_changes(manifest.rev))
-    sync_local_changes(manifest, get_local_changes())
+    if is_git_repo(tests_root):
+        tests_tree = GitTree(tests_root, url_base)
+    else:
+        tests_tree = NoVCSTree(tests_root, url_base)
 
-    manifest.rev = get_current_rev()
+    if not ignore_local:
+        local_changes = tests_tree.local_changes()
+    else:
+        local_changes = None
+
+    manifest.update(tests_root,
+                    url_base,
+                    tests_tree.current_rev(),
+                    tests_tree.committed_changes(manifest.rev),
+                    local_changes)
 
 
 def write(manifest, manifest_path):
@@ -557,43 +775,51 @@
         json.dump(manifest.to_json(), f, sort_keys=True, indent=2, separators=(',', ': '))
 
 
-def update_manifest(repo_path, **kwargs):
-    setup_git(repo_path)
+def update_from_cli(**kwargs):
+    tests_root = kwargs["tests_root"]
+    path = kwargs["path"]
+    assert tests_root is not None
     if not kwargs.get("rebuild", False):
-        manifest = load(kwargs["path"])
+        manifest = load(path)
     else:
         manifest = Manifest(None)
-    if has_local_changes() and not kwargs.get("local_changes", False):
-        logger.info("Not writing manifest because working directory is not clean.")
-    else:
-        logger.info("Updating manifest")
-        update(manifest)
-        write(manifest, kwargs["path"])
+
+    logger.info("Updating manifest")
+    update(tests_root,
+           kwargs["url_base"],
+           manifest,
+           ignore_local=kwargs.get("ignore_local", False))
+    write(manifest, path)
+
+
+def abs_path(path):
+    return os.path.abspath(os.path.expanduser(path))
 
 
 def create_parser():
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "-p", "--path", default=os.path.join(get_repo_root(), "MANIFEST.json"),
-        help="path to manifest file")
+        "-p", "--path", type=abs_path, help="Path to manifest file.")
+    parser.add_argument(
+        "--tests-root", type=abs_path, help="Path to root of tests.")
     parser.add_argument(
         "-r", "--rebuild", action="store_true", default=False,
-        help="force a full rebuild of the manifest rather than updating "
-        "incrementally")
+        help="Force a full rebuild of the manifest.")
     parser.add_argument(
-        "-c", "--experimental-include-local-changes", action="store_true", default=False,
-        help="include local changes in the manifest rather than just committed "
-             "changes (experimental)")
+        "--ignore-local", action="store_true", default=False,
+        help="Don't include uncommitted local changes in the manifest.")
+    parser.add_argument(
+        "--url-base", action="store", default="/",
+        help="Base url to use as the mount point for tests in this manifest.")
     return parser
 
 if __name__ == "__main__":
-    try:
-        get_repo_root()
-    except subprocess.CalledProcessError:
-        print "Script must be inside a web-platform-tests git clone."
-        sys.exit(1)
     opts = create_parser().parse_args()
-    update_manifest(get_repo_root(),
-                    path=opts.path,
-                    rebuild=opts.rebuild,
-                    local_changes=opts.experimental_include_local_changes)
+
+    if opts.tests_root is None:
+        opts.tests_root = get_repo_root()
+
+    if opts.path is None:
+        opts.path = os.path.join(opts.tests_root, "MANIFEST.json")
+
+    update_from_cli(**vars(opts))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/searchcontext.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/searchcontext.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/searchcontext.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/searchcontext.py	2014-11-26 21:45:59.000000000 +0000
@@ -11,14 +11,6 @@
         """Find all elements matching a css selector."""
         return self._find_elements('css selector', selector)
 
-    def find_element_by_id(self, id):
-        """Find the first element with the given id."""
-        return self._find_element('id', id)
-
-    def find_elements_by_id(self, id):
-        """Find all elements with the given id."""
-        return self._find_elements('id', id)
-
     def find_element_by_link_text(self, text):
         """Find the first link with the given text."""
         return self._find_element('link text', text)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/webelement.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/webelement.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/webelement.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/webdriver/webdriver/webelement.py	2014-11-26 21:45:59.000000000 +0000
@@ -28,10 +28,16 @@
         """Get the value of an element property or attribute."""
         return self.execute('GET', '/attribute/%s' % name, 'getElementAttribute')
 
-    def get_text(self):
+    @property
+    def text(self):
         """Get the visible text for this element."""
         return self.execute('GET', '/text', 'text')
 
+    @property
+    def tag_name(self):
+        """Get the tag name for this element"""
+        return self.execute('GET', '/name', 'getElementTagName')
+
     def click(self):
         """Click on this element."""
         return self.execute('POST', '/click', 'click')
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,6 +1,5 @@
 import cgi
 import json
-import logging
 import os
 import traceback
 import urllib
@@ -9,14 +8,13 @@
 from constants import content_types
 from pipes import Pipeline, template
 from ranges import RangeParser
+from request import Authentication
 from response import MultipartContent
 from utils import HTTPException
 
-logger = logging.getLogger("wptserve")
-
 __all__ = ["file_handler", "python_script_handler",
            "FunctionHandler", "handler", "json_handler",
-           "as_is_handler", "ErrorHandler"]
+           "as_is_handler", "ErrorHandler", "BasicAuthHandler"]
 
 
 def guess_content_type(path):
@@ -27,9 +25,34 @@
     return "application/octet-stream"
 
 
+
+def filesystem_path(base_path, request, url_base="/"):
+    if base_path is None:
+        base_path = request.doc_root
+
+    path = request.url_parts.path
+
+    if path.startswith(url_base):
+        path = path[len(url_base):]
+
+    if ".." in path:
+        raise HTTPException(404)
+
+    new_path = os.path.join(base_path, path)
+
+    # Otherwise setting path to / allows access outside the root directory
+    if not new_path.startswith(base_path):
+        raise HTTPException(404)
+
+    return new_path
+
 class DirectoryHandler(object):
+    def __init__(self, base_path=None, url_base="/"):
+        self.base_path = base_path
+        self.url_base = url_base
+
     def __call__(self, request, response):
-        path = request.filesystem_path
+        path = filesystem_path(self.base_path, request, self.url_base)
 
         assert os.path.isdir(path)
 
@@ -45,8 +68,13 @@
        "items": "\n".join(self.list_items(request, path))}
 
     def list_items(self, request, path):
+        # TODO: this won't actually list all routes, only the
+        # ones that correspond to a real filesystem path. It's
+        # not possible to list every route that will match
+        # something, but it should be possible to at least list the
+        # statically defined ones
         base_path = request.url_parts.path
-        filesystem_base = request.filesystem_path
+
         if not base_path.endswith("/"):
             base_path += "/"
         if base_path != "/":
@@ -55,7 +83,7 @@
                    {"link": link, "name": ".."})
         for item in sorted(os.listdir(path)):
             link = cgi.escape(urllib.quote(item))
-            if os.path.isdir(os.path.join(filesystem_base, item)):
+            if os.path.isdir(os.path.join(path, item)):
                 link += "/"
                 class_ = "dir"
             else:
@@ -68,11 +96,16 @@
 
 
 class FileHandler(object):
+    def __init__(self, base_path=None, url_base="/"):
+        self.base_path = base_path
+        self.url_base = url_base
+        self.directory_handler = DirectoryHandler(self.base_path)
+
     def __call__(self, request, response):
-        path = request.filesystem_path
+        path = filesystem_path(self.base_path, request, self.url_base)
 
         if os.path.isdir(path):
-            return directory_handler(request, response)
+            return self.directory_handler(request, response)
         try:
             #This is probably racy with some other process trying to change the file
             file_size = os.stat(path).st_size
@@ -123,7 +156,8 @@
         except IOError:
             return []
         else:
-            data = template(request, data)
+            if use_sub:
+                data = template(request, data)
             return [tuple(item.strip() for item in line.split(":", 1))
                     for line in data.splitlines() if line]
 
@@ -167,26 +201,32 @@
 file_handler = FileHandler()
 
 
-def python_script_handler(request, response):
-    path = request.filesystem_path
+class PythonScriptHandler(object):
+    def __init__(self, base_path=None, url_base="/"):
+        self.base_path = base_path
+        self.url_base = url_base
 
-    try:
-        environ = {"__file__": path}
-        execfile(path, environ, environ)
-        if "main" in environ:
-            handler = FunctionHandler(environ["main"])
-            handler(request, response)
-        else:
-            raise HTTPException(500)
-    except IOError:
-        raise HTTPException(404)
+    def __call__(self, request, response):
+        path = filesystem_path(self.base_path, request, self.url_base)
 
+        try:
+            environ = {"__file__": path}
+            execfile(path, environ, environ)
+            if "main" in environ:
+                handler = FunctionHandler(environ["main"])
+                handler(request, response)
+            else:
+                raise HTTPException(500, "No main function in script %s" % path)
+        except IOError:
+            raise HTTPException(404)
+
+python_script_handler = PythonScriptHandler()
 
 def FunctionHandler(func):
     def inner(request, response):
         try:
             rv = func(request, response)
-        except:
+        except Exception:
             msg = traceback.format_exc()
             raise HTTPException(500, message=msg)
         if rv is not None:
@@ -226,15 +266,50 @@
     return FunctionHandler(inner)
 
 
-def as_is_handler(request, response):
-    path = request.filesystem_path
-    try:
-        with open(path) as f:
-            response.writer.write_content(f.read())
-        response.close_connection = True
-    except IOError:
-        raise HTTPException(404)
+class AsIsHandler(object):
+    def __init__(self, base_path=None, url_base="/"):
+        self.base_path = base_path
+        self.url_base = url_base
+
+    def __call__(self, request, response):
+        path = filesystem_path(self.base_path, request, self.url_base)
+
+        try:
+            with open(path) as f:
+                response.writer.write_content(f.read())
+            response.close_connection = True
+        except IOError:
+            raise HTTPException(404)
+
+as_is_handler = AsIsHandler()
+
+class BasicAuthHandler(object):
+    def __init__(self, handler, user, password):
+        """
+         A Basic Auth handler
+
+         :Args:
+         - handler: a secondary handler for the request after authentication is successful (example file_handler)
+         - user: string of the valid user name or None if any / all credentials are allowed
+         - password: string of the password required
+        """
+        self.user = user
+        self.password = password
+        self.handler = handler
+
+    def __call__(self, request, response):
+        if "authorization" not in request.headers:
+            response.status = 401
+            response.headers.set("WWW-Authenticate", "Basic")
+            return response
+        else:
+            auth = Authentication(request.headers)
+            if self.user is not None and (self.user != auth.username or self.password != auth.password):
+                response.set_error(403, "Invalid username or password")
+                return response
+            return self.handler(request, response)
 
+basic_auth_handler = BasicAuthHandler(file_handler, None, None)
 
 class ErrorHandler(object):
     def __init__(self, status):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/logger.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/logger.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/logger.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/logger.py	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,29 @@
+class NoOpLogger(object):
+    def critical(self, msg):
+        pass
+
+    def error(self, msg):
+        pass
+
+    def info(self, msg):
+        pass
+
+    def warning(self, msg):
+        pass
+
+    def debug(self, msg):
+        pass
+
+logger = NoOpLogger()
+_set_logger = False
+
+def set_logger(new_logger):
+    global _set_logger
+    if _set_logger:
+        raise Exception("Logger must be set at most once")
+    global logger
+    logger = new_logger
+    _set_logger = True
+
+def get_logger():
+    return logger
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/pipes.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/pipes.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/pipes.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/pipes.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,14 +1,11 @@
 from cgi import escape
 import gzip as gzip_module
-import logging
 import re
 import time
 import types
 import uuid
 from cStringIO import StringIO
 
-logger = logging.getLogger("wptserve")
-
 
 def resolve_content(response):
     rv = "".join(item for item in response.iter_content())
@@ -289,7 +286,7 @@
         token = token[1:-1]
         try:
             token = int(token)
-        except:
+        except ValueError:
             token = unicode(token, "utf8")
         return ("index", token)
 
@@ -311,9 +308,9 @@
 
     def __getitem__(self, key):
         try:
-          return self.params.first(key)
+            return self.params.first(key)
         except KeyError:
-          return ""
+            return ""
 
 
 @pipe()
@@ -442,7 +439,7 @@
 
     out = StringIO()
     with gzip_module.GzipFile(fileobj=out, mode="w") as f:
-      f.write(content)
+        f.write(content)
     response.content = out.getvalue()
 
     response.headers.set("Content-Length", len(response.content))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/request.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/request.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/request.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/request.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,8 +1,6 @@
 import base64
 import cgi
 import Cookie
-import logging
-import os
 import StringIO
 import tempfile
 import urlparse
@@ -10,7 +8,6 @@
 import stash
 from utils import HTTPException
 
-logger = logging.getLogger("wptserve")
 missing = object()
 
 
@@ -173,10 +170,6 @@
 
     Request path as it appears in the HTTP request.
 
-    .. attribute:: filesystem_path
-
-    Request path resolved relative to the document root.
-
     .. attribute:: url
 
     Absolute URL for the request.
@@ -275,7 +268,6 @@
         self._POST = None
         self._cookies = None
         self._auth = None
-        self._filesystem_path = None
 
         self.server = Server(self)
 
@@ -338,20 +330,6 @@
             self._auth = Authentication(self.headers)
         return self._auth
 
-    @property
-    def filesystem_path(self):
-        if self._filesystem_path is None:
-            path = self.url_parts.path
-            if path.startswith("/"):
-                path = path[1:]
-
-            if ".." in path:
-                raise HTTPException(500)
-
-            self._filesystem_path = os.path.join(self.doc_root, path)
-        logger.debug(self._filesystem_path)
-        return self._filesystem_path
-
 
 class RequestHeaders(dict):
     """Dictionary-like API for accessing request headers."""
@@ -393,7 +371,7 @@
         a list"""
         try:
             return dict.__getitem__(self, key.lower())
-        except:
+        except KeyError:
             if default is not missing:
                 return default
             else:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/response.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/response.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/response.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/response.py	2014-11-26 21:45:59.000000000 +0000
@@ -2,17 +2,15 @@
 from datetime import datetime, timedelta
 import Cookie
 import json
-import logging
 import types
 import uuid
 import socket
 
 from constants import response_codes
+from logger import get_logger
 
-logger = logging.getLogger("wptserve")
 missing = object()
 
-
 class Response(object):
     """Object representing the response to a HTTP request
 
@@ -77,6 +75,8 @@
         self.headers = ResponseHeaders()
         self.content = []
 
+        self.logger = get_logger()
+
     @property
     def status(self):
         return self._status
@@ -213,7 +213,7 @@
                         ("Content-Length", len(data))]
         self.content = data
         if code == 500:
-            logger.error(message)
+            self.logger.error(message)
 
 
 class MultipartContent(object):
@@ -403,7 +403,7 @@
             self.write_default_headers()
 
         self.write("\r\n")
-        if not "content-length" in self._headers_seen:
+        if "content-length" not in self._headers_seen:
             self._response.close_connection = True
         if not self._response.explicit_flush:
             self.flush()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/router.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/router.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/router.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/router.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,10 +1,8 @@
 import itertools
-import logging
 import re
 import types
 
-logger = logging.getLogger("wptserve")
-logger.setLevel(logging.DEBUG)
+from logger import get_logger
 
 any_method = object()
 
@@ -51,6 +49,8 @@
         for token in tokens:
             re_parts.append(func_map[token[0]](token))
 
+        if self.star_seen:
+            re_parts.append(")")
         re_parts.append("$")
 
         return re.compile("".join(re_parts))
@@ -70,7 +70,7 @@
         if self.star_seen:
             raise ValueError("Star seen after star in regexp")
         self.star_seen = True
-        return "(.*)"
+        return "(.*"
 
 def compile_path_match(route_pattern):
     """tokens: / or literal or match or *"""
@@ -97,6 +97,7 @@
     def __init__(self, doc_root, routes):
         self.doc_root = doc_root
         self.routes = []
+        self.logger = get_logger()
         for route in reversed(routes):
             self.register(*route)
 
@@ -111,7 +112,8 @@
                              a request path matches this route. Match patterns
                              consist of either literal text, match groups,
                              denoted {name}, which match any character except /,
-                             and, at most one \*, which matches any character.
+                             and, at most one \*, which matches and character and
+                             creates a match group to the end of the string.
                              If there is no leading "/" on the pattern, this is
                              automatically implied. For example::
 
@@ -120,23 +122,24 @@
                             Would match `/api/test/data.json` or
                             `/api/test/test2/data.json`, but not `/api/test/data.py`.
 
-                            The match groups, and anything matching the * are made
-                            available in the request object as a dictionary through
-                            the route_match property. For example, given the route
-                            pattern above and the path `/api/test/data.json`, the
-                            route_match property would contain::
+                            The match groups are made available in the request object
+                            as a dictionary through the route_match property. For
+                            example, given the route pattern above and the path
+                            `/api/test/data.json`, the route_match property would
+                            contain::
 
-                                {"resource": "test", "*": "data"}
+                                {"resource": "test", "*": "data.json"}
 
         :param handler: Function that will be called to process matching
                         requests. This must take two parameters, the request
                         object and the response object.
+
         """
         if type(methods) in types.StringTypes or methods is any_method:
             methods = [methods]
         for method in methods:
             self.routes.append((method, compile_path_match(path), handler))
-            logger.debug("Route pattern: %s" % self.routes[-1][1].pattern)
+            self.logger.debug("Route pattern: %s" % self.routes[-1][1].pattern)
 
     def get_handler(self, request):
         """Get a handler for a request or None if there is no handler.
@@ -154,7 +157,7 @@
                         name = handler.__name__
                     else:
                         name = handler.__class__.__name__
-                    logger.debug("Found handler %s" % name)
+                    self.logger.debug("Found handler %s" % name)
 
                     match_parts = m.groupdict().copy()
                     if len(match_parts) < len(m.groups()):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/server.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/server.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/server.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/tools/wptserve/wptserve/server.py	2014-11-26 21:45:59.000000000 +0000
@@ -1,6 +1,5 @@
 import BaseHTTPServer
 import errno
-import logging
 import os
 import re
 import socket
@@ -12,16 +11,14 @@
 import types
 import urlparse
 
+import routes as default_routes
+from logger import get_logger
 from request import Server, Request
 from response import Response
 from router import Router
-import routes as default_routes
 from utils import HTTPException
 
 
-logger = logging.getLogger("wptserve")
-logger.setLevel(logging.DEBUG)
-
 """HTTP server designed for testing purposes.
 
 The server is designed to provide flexibility in the way that
@@ -67,6 +64,7 @@
         self.rules = {}
         for rule in reversed(rules):
             self.register(*rule)
+        self.logger = get_logger()
 
     def register(self, methods, input_path, output_path):
         """Register a rewrite rule.
@@ -95,7 +93,7 @@
         if split_url.path in self.rules:
             methods, destination = self.rules[split_url.path]
             if "*" in methods or request_handler.command in methods:
-                logger.debug("Rewriting request path %s to %s" %
+                self.logger.debug("Rewriting request path %s to %s" %
                              (request_handler.path, destination))
                 new_url = list(split_url)
                 new_url[2] = destination
@@ -106,12 +104,13 @@
 class WebTestServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
     allow_reuse_address = True
     acceptable_errors = (errno.EPIPE, errno.ECONNABORTED)
+    request_queue_size = 2000
 
     # Ensure that we don't hang on shutdown waiting for requests
     daemon_threads = True
 
-    def __init__(self, server_address, RequestHandlerClass, router, rewriter, bind_hostname, config=None,
-                 use_ssl=False, certificate=None, **kwargs):
+    def __init__(self, server_address, RequestHandlerClass, router, rewriter, bind_hostname,
+                 config=None, use_ssl=False, key_file=None, certificate=None, **kwargs):
         """Server for HTTP(s) Requests
 
         :param server_address: tuple of (server_name, port)
@@ -130,7 +129,9 @@
 
         :param use_ssl: Boolean indicating whether the server should use SSL
 
-        :param certificate: Certificate to use if SSL is enabled.
+        :param key_file: Path to key file to use if SSL is enabled.
+
+        :param certificate: Path to certificate to use if SSL is enabled.
 
         :param bind_hostname True to bind the server to both the hostname and
                              port specified in the server_address parameter.
@@ -141,6 +142,7 @@
         self.rewriter = rewriter
 
         self.scheme = "https" if use_ssl else "http"
+        self.logger = get_logger()
 
         if bind_hostname:
             hostname_port = server_address
@@ -153,13 +155,14 @@
         if config is not None:
             Server.config = config
         else:
-            logger.debug("Using default configuration")
+            self.logger.debug("Using default configuration")
             Server.config = {"host": server_address[0],
                              "domains": {"": server_address[0]},
                              "ports": {"http": [self.server_address[1]]}}
 
         if use_ssl:
             self.socket = ssl.wrap_socket(self.socket,
+                                          keyfile=key_file,
                                           certfile=certificate,
                                           server_side=True)
 
@@ -174,7 +177,7 @@
              error.errno in self.acceptable_errors)):
             pass  # remote hang up before the result is sent
         else:
-            logger.error(traceback.format_exc())
+            self.logger.error(traceback.format_exc())
 
 
 class WebTestRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
@@ -184,6 +187,7 @@
 
     def handle_one_request(self):
         response = None
+        logger = get_logger()
         try:
             self.close_connection = False
             request_line_is_valid = self.get_request_line()
@@ -217,12 +221,16 @@
                     response.set_error(e.code, e.message)
                 except Exception as e:
                     if e.message:
-                        err = e.message
+                        err = [e.message]
                     else:
-                        err = traceback.format_exc()
-                    response.set_error(500, err)
-            logger.info("%i %s %s (%s) %i" % (response.status[0], request.method,
-                                         request.request_path, request.headers.get('Referer'), request.raw_input.length))
+                        err = []
+                        err.append(traceback.format_exc())
+                    response.set_error(500, "\n".join(err))
+            logger.debug("%i %s %s (%s) %i" % (response.status[0],
+                                               request.method,
+                                               request.request_path,
+                                               request.headers.get('Referer'),
+                                               request.raw_input.length))
 
             if not response.writer.content_written:
                 response.write()
@@ -257,10 +265,10 @@
             self.close_connection = True
             return False
         if len(self.raw_requestline) > 65536:
-                self.requestline = ''
-                self.request_version = ''
-                self.command = ''
-                return False
+            self.requestline = ''
+            self.request_version = ''
+            self.command = ''
+            return False
         if not self.raw_requestline:
             self.close_connection = True
         return True
@@ -273,7 +281,8 @@
     :param server_cls: Class to use for the server (default depends on ssl vs non-ssl)
     :param handler_cls: Class to use for the RequestHandler
     :param use_ssl: Use a SSL server if no explicit server_cls is supplied
-    :param certificate: Certificate file to use if ssl is enabled
+    :param key_file: Path to key file to use if ssl is enabled
+    :param certificate: Path to certificate file to use if ssl is enabled
     :param router_cls: Router class to use when matching URLs to handlers
     :param doc_root: Document root for serving files
     :param routes: List of routes with which to initialize the router
@@ -315,7 +324,7 @@
     """
     def __init__(self, host="127.0.0.1", port=8000,
                  server_cls=None, handler_cls=WebTestRequestHandler,
-                 use_ssl=False, certificate=None, router_cls=Router,
+                 use_ssl=False, key_file=None, certificate=None, router_cls=Router,
                  doc_root=os.curdir, routes=None,
                  rewriter_cls=RequestRewriter, bind_hostname=True, rewrites=None,
                  config=None):
@@ -329,11 +338,14 @@
         self.rewriter = rewriter_cls(rewrites if rewrites is not None else [])
 
         self.use_ssl = use_ssl
+        self.logger = get_logger()
 
         if server_cls is None:
             server_cls = WebTestServer
 
         if use_ssl:
+            if key_file is not None:
+                assert os.path.exists(key_file)
             assert certificate is not None and os.path.exists(certificate)
 
         try:
@@ -344,12 +356,13 @@
                                     config=config,
                                     bind_hostname=bind_hostname,
                                     use_ssl=use_ssl,
+                                    key_file=key_file,
                                     certificate=certificate)
             self.started = False
 
             _host, self.port = self.httpd.socket.getsockname()
         except Exception:
-            logger.error('Init failed! You may need to modify your hosts file. Refer to README.md.');
+            self.logger.error('Init failed! You may need to modify your hosts file. Refer to README.md.');
             raise
 
     def start(self, block=False):
@@ -357,7 +370,7 @@
 
         :param block: True to run the server on the current thread, blocking,
                       False to run on a separate thread."""
-        logger.info("Starting http server on %s:%s" % (self.host, self.port))
+        self.logger.info("Starting http server on %s:%s" % (self.host, self.port))
         self.started = True
         if block:
             self.httpd.serve_forever()
@@ -378,7 +391,7 @@
                 self.httpd.server_close()
                 self.server_thread.join()
                 self.server_thread = None
-                logger.info("Stopped http server on %s:%s" % (self.host, self.port))
+                self.logger.info("Stopped http server on %s:%s" % (self.host, self.port))
             except AttributeError:
                 pass
             self.started = False
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/url/urltestdata.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/url/urltestdata.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/url/urltestdata.txt	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/url/urltestdata.txt	2014-11-26 21:45:59.000000000 +0000
@@ -27,10 +27,10 @@
 :/  s:http h:example.org p:/foo/:/
 :\\  s:http h:example.org p:/foo/:/
 :#  s:http h:example.org p:/foo/: f:#
-#  s:http h:example.org p:/foo/bar f:#
-#/  s:http h:example.org p:/foo/bar f:#/
-#\\  s:http h:example.org p:/foo/bar f:#\\
-#;?  s:http h:example.org p:/foo/bar f:#;?
+\#  s:http h:example.org p:/foo/bar f:#
+\#/  s:http h:example.org p:/foo/bar f:#/
+\#\\  s:http h:example.org p:/foo/bar f:#\\
+\#;?  s:http h:example.org p:/foo/bar f:#;?
 ?  s:http h:example.org p:/foo/bar q:?
 /  s:http h:example.org p:/
 :23  s:http h:example.org p:/foo/:23
@@ -91,13 +91,21 @@
 /a/\s/c  s:http h:example.org p:/a/%20/c
 /a%2fc  s:http h:example.org p:/a%2fc
 /a/%2f/c  s:http h:example.org p:/a/%2f/c
-#\u03B2  s:http h:example.org p:/foo/bar f:#\u03B2
+\#\u03B2  s:http h:example.org p:/foo/bar f:#%CE%B2
 data:text/html,test#test  s:data p:text/html,test f:#test
 
 # Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/file.html
+
+# Basic canonicalization, uppercase should be converted to lowercase
 file:c:\\foo\\bar.html file:///tmp/mock/path s:file p:/c:/foo/bar.html
+
+# Spaces should fail
 \s\sFile:c|////foo\\bar.html  s:file p:/c:////foo/bar.html
+
+# This should fail
 C|/foo/bar  s:file p:/C:/foo/bar
+
+# This should fail
 /C|\\foo\\bar  s:file p:/C:/foo/bar
 //C|/foo/bar  s:file p:/C:/foo/bar
 //server/file  s:file h:server p:/file
@@ -158,7 +166,7 @@
 http://www.google.com/foo?bar=baz#\s\u00BB  s:http h:www.google.com p:/foo q:?bar=baz f:#\s%C2%BB
 http://[www.google.com]/
 http://www.google.com  s:http h:www.google.com p:/
-http://192.0x00A80001  s:http h:192.0x00a80001 p:/
+http://192.0x00A80001  s:http h:192.168.0.1 p:/
 http://www/foo%2Ehtml  s:http h:www p:/foo%2Ehtml
 http://www/foo/%2E/html  s:http h:www p:/foo/html
 http://user:pass@/
@@ -251,23 +259,38 @@
 //www.example2.com  s:http h:www.example2.com p:/
 
 # Based on http://trac.webkit.org/browser/trunk/LayoutTests/fast/url/host.html
+
+# Basic canonicalization, uppercase should be converted to lowercase
 http://ExAmPlE.CoM http://other.com/ s:http p:/ h:example.com
+
+# Spaces should fail
 http://example\sexample.com
+
+# This should fail
 http://Goo%20\sgoo%7C|.com
 
 # U+3000 is mapped to U+0020 (space) which is disallowed
 http://GOO\u00a0\u3000goo.com
 
+# Other types of space (no-break, zero-width, zero-width-no-break) are
+# name-prepped away to nothing.
 # U+200B, U+2060, and U+FEFF, are ignored
 http://GOO\u200b\u2060\ufeffgoo.com  s:http p:/ h:googoo.com
 
+# Ideographic full stop (full-width period for Chinese, etc.) should be
+# treated as a dot.
 # U+3002 is mapped to U+002E (dot)
 http://www.foo\u3002bar.com  s:http p:/ h:www.foo.bar.com
 
+# Invalid unicode characters should fail...
 # U+FDD0 is disallowed; %ef%b7%90 is U+FDD0
 http://\ufdd0zyx.com
+
+# ...This is the same as previous but escaped.
 http://%ef%b7%90zyx.com
 
+# Test name prepping, fullwidth input should be converted to ASCII and NOT
+# IDN-ized. This is "Go" in fullwidth UTF-8/UTF-16.
 http://\uff27\uff4f.com  s:http p:/ h:go.com
 
 # URL spec forbids the following.
@@ -279,7 +302,7 @@
 http://\uff05\uff10\uff10.com
 http://%ef%bc%85%ef%bc%90%ef%bc%90.com
 
-# Basic IDN support
+# Basic IDN support, UTF-8 and UTF-16 input should be converted to IDN
 http://\u4f60\u597d\u4f60\u597d  s:http p:/ h:xn--6qqa088eba
 
 # Invalid escaped characters should fail and the percents should be
@@ -290,10 +313,11 @@
 http://%25
 http://hello%00
 
+# Escaped numbers should be treated like IP addresses if they are.
 # No special handling for IPv4 or IPv4-like URLs
-http://%30%78%63%30%2e%30%32%35%30.01  s:http p:/ h:127.0.0.1
+http://%30%78%63%30%2e%30%32%35%30.01  s:http p:/ h:192.168.0.1
 http://%30%78%63%30%2e%30%32%35%30.01%2e  s:http p:/ h:0xc0.0250.01.
-http://192.168.0.257  s:http p:/ h:192.168.0.257
+http://192.168.0.257
 
 # Invalid escaping should trigger the regular host error handling.
 http://%3g%78%63%30%2e%30%32%35%30%2E.01
@@ -302,8 +326,15 @@
 # spaces escaped.
 http://192.168.0.1\shello
 
-# Mapped to "0xc0.0250.01"
-http://\uff10\uff38\uff43\uff10\uff0e\uff10\uff12\uff15\uff10\uff0e\uff10\uff11  s:http p:/ h:0xc0.0250.01
+# Fullwidth and escaped UTF-8 fullwidth should still be treated as IP.
+# These are "0Xc0.0250.01" in fullwidth.
+http://\uff10\uff38\uff43\uff10\uff0e\uff10\uff12\uff15\uff10\uff0e\uff10\uff11  s:http p:/ h:192.168.0.1
 
 # Broken IPv6
 http://[google.com]
+
+# Misc Unicode
+http://foo:\uD83D\uDCA9@example.com/bar  s:http h:example.com p:/bar u:foo pass:%F0%9F%92%A9
+
+# resolving a relative reference against an unknown scheme results in an error
+x test:test
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/url/urltestparser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/url/urltestparser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/url/urltestparser.js	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/url/urltestparser.js	2014-11-26 21:45:59.000000000 +0000
@@ -1,6 +1,6 @@
 function URLTestParser(input) {
   var relativeSchemes = ["ftp", "file", "gopher", "http", "https", "ws", "wss"],
-      tokenMap = { "\\": "\\", n: "\n", r: "\r", s: " ", t: "\t", f: "\f" }
+      tokenMap = { "\\": "\\", "#": "#", n: "\n", r: "\r", s: " ", t: "\t", f: "\f" }
       resultMap = { s: "scheme", u: "username", pass: "password", h: "host", port: "port", p: "path", q: "query", f: "fragment" },
       results = []
   function Test() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/vibration/pattern-array-with-0-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/vibration/pattern-array-with-0-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/vibration/pattern-array-with-0-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/vibration/pattern-array-with-0-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>Vibration API: test a pattern array with 0ms vibration and still to vibrate()</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/vibration/#vibration-interface'>
+<meta name='flags' content='interact'>
+<style>
+  button {
+    height: 100px;
+    width:  100px;
+  }
+</style>
+
+<h1>Description</h1>
+<p>
+   After hitting the button below, your device must vibrate continuously for about two seconds, once.
+</p>
+<button id='vib'>Vibrate!</button>
+<div id='log'></div>
+<script src='/common/vendor-prefix.js' data-prefixed-objects='[{"ancestors":["navigator"], "name":"vibrate"}]'></script>
+<script>
+  document.getElementById("vib").onclick = function () {
+    navigator.vibrate([0, 0, 2000]);
+  };
+</script>
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/vibration/simple-array-manual.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/vibration/simple-array-manual.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/vibration/simple-array-manual.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/vibration/simple-array-manual.html	2014-11-26 21:45:59.000000000 +0000
@@ -5,8 +5,6 @@
     <title>Vibration API: test a simple array parameter to vibrate()</title>
     <link rel='author' title='Robin Berjon' href='mailto:robin@berjon.com'/>
     <link rel='help' href='http://www.w3.org/TR/vibration/#methods'/>
-    <meta name='flags' content='dom, interact'/>
-    <link rel='stylesheet' href='/resources/testharness.css' media='all'/>
   </head>
   <body>
     <h1>Description</h1>
@@ -15,20 +13,11 @@
     </p>
     <button id='vib'>Vibrate!</button>
     <div id='log'></div>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
     <script src='/common/vendor-prefix.js' data-prefixed-objects='[{"ancestors":["navigator"], "name":"vibrate"}]'></script>
     <script>
-      if (undefined !== navigator.vibrate) {
-          setup({explicit_done:true});
-          var t = async_test("Tests that vibrate returns true");
-
-          document.getElementById("vib").onclick = t.step_func(function () {
-              assert_true(navigator.vibrate([2000]), "vibrate() returns a boolean");
-              t.done();
-              done();
-          }, "Calling vibrate returns true");
-      }
+      document.getElementById("vib").onclick = function () {
+        navigator.vibrate([2000]);
+      };
     </script>
   </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-after.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-after.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-after.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-after.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,420 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>AnimationNode after() method tests</title>
+<meta name="assert" content="Inserts nodes after this animation node">
+<link rel="help" href="http://w3c.github.io/web-animations/#dom-animationnode-after">
+<link rel="help" href="http://w3c.github.io/web-animations/#insert-children">
+<link rel="help" href="http://w3c.github.io/web-animations/#remove-an-animation-node">
+<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
+<link rel="author" title="Aleksei Yu. Semenov" href="mailto:a.semenov@unipro.ru">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<link rel="stylesheet" href="/resources/testharness.css">
+<body>
+<div id="log"></div>
+<script>
+// Test step 1. If there is no parent animation group, terminate these steps.
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        try {
+            node.after(null);
+        } catch(e) {
+            assert_unreached(type(node) + '.after(null) throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.after() does nothing if the node has no parent animation group. ' +
+    'HierarchyRequestError is not thrown in call node.after(null)');
+
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        try {
+            node.after(node);
+        } catch(e) {
+            assert_unreached(type(node) + '.after() throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.after() does nothing if the node has no parent animation group. ' +
+    'No HierarchyRequestError is thrown if the node is inserted after itself');
+
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    var node2 = newAnimation(createDiv(this));
+    nodes.forEach(function(node1) {
+        node1.after(node2);
+
+        assert_equals(node1.nextSibling, null, type(node1) + '.after() should do nothing ' +
+            'if the node has no parent animation group');
+        assert_equals(node2.previousSibling, null, type(node1) + '.after() should do nothing ' +
+            'if the node has no parent animation group');
+    });
+}, 'AnimationNode.after() does nothing if there is no parent animation group');
+
+// Test step 2. If any of the animation nodes in nodes is an inclusive ancestor of this animation node throw a HierarchyRequestError exception and terminate these steps.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.after(node);
+            }, type(node) + '.after() should throw HierarchyRequestError ' +
+                'if inserting node after itself');
+            assert_equals(node.parent, parent, type(node) + '.after() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent.children, [node], type(node) + '.after() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if node is inserted after itself');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.after(parent);
+            }, type(node) + '.after() should throw HierarchyRequestError ' +
+                'if inserting node\'s parent');
+            assert_equals(node.parent, parent, type(node) + '.after() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent.children, [node], type(node) + '.after() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if direct parent is inserted after the node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent1 = new parentCtor([node]);
+            var parent2 = new parentCtor([parent1]);
+            var parent3 = new parentCtor([parent2]);
+            var parent4 = new parentCtor([parent3]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.after(parent3);
+            }, type(node) + '.after() should throw HierarchyRequestError ' +
+                'if inserting node\'s ancestor');
+            assert_equals(node.parent, parent1, type(node) + '.after() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent1.children, [node], type(node) + '.after() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+            assert_equals(parent3.parent, parent4, type(node) + '.after() should not change ' +
+                'parent attribute of inserted node before throwing HierarchyRequestError');
+            assert_array_equals(parent4.children, [parent3], type(node) + '.after() ' +
+                'should not change inserted node parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if an inclusive ancestor is inserted after the node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([parent1]);
+            var parent3 = new parentCtor([parent2]);
+            var parent4 = new parentCtor([parent3]);
+            var parent5 = new ParentCtor([node3]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node1.after(node3, parent3);
+            }, type(node1) + '.after() should throw HierarchyRequestError ' +
+                'if inserting node\'s parent');
+            assert_equals(node1.parent, parent1, type(node1) + '.after() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent1.children, [node1, node2], type(node1) + '.after() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+            assert_equals(parent3.parent, parent4, type(node1) + '.after() should not change ' +
+                'parent attribute of inserted node before throwing HierarchyRequestError');
+            assert_array_equals(parent4.children, [parent3], type(node1) + '.after() ' +
+                'should not change inserted node parent children before throwing HierarchyRequestError');
+            assert_equals(node3.parent, parent5, type(node1) + '.after() should not change ' +
+                'parent attribute of inserted node before throwing HierarchyRequestError');
+            assert_array_equals(parent5.children, [node3], type(node1) + '.after() ' +
+                'should not change inserted node parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if an inclusive ancestor is inserted after the node. ' +
+    'Test several arguments in after() call');
+
+// Test step 3 and 4.
+// 3. Let reference child be the next sibling of this animation node not in nodes.
+// 4. Insert nodes before reference child.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+
+            node1.after(node2);
+
+            assert_equals(node2.previousSibling, node1, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node2.parent, parent, 'Node should be inserted into the tree');
+            assert_equals(node1.nextSibling, node2, 'Node should be inserted into the tree ' +
+                'after this node');
+            assert_equals(parent.children, [node1, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'AnimationNode.after() inserts nodes after this node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.after(node1);
+
+            assert_equals(node2.previousSibling, null, type(node2) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node2.nextSibling, node1, 'Node should be inserted into the tree ' +
+                'after this node');
+            assert_equals(node1.previousSibling, node2, type(node2) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node1.nextSibling, null, 'Node should be inserted into the tree ' +
+                'after this node');
+            assert_equals(parent.children, [node2, node1], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'AnimationNode.after() inserts nodes after this node. Inserted node is on the same ' +
+    'level in the tree');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node1.after(node2);
+
+            assert_equals(node1.nextSibling, node2, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node2.previousSibling, node1, 'Node should be inserted into the tree ' +
+                'after this node');
+            assert_equals(parent.children, [node1, node2], parentCtor.name +
+                '.children should not be changed');
+        });
+    });
+}, 'Test AnimationNode.after() inserts node after this node even if inserted ' +
+    'node is already after this one');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node3) {
+            var node1 = newAnimation(createDiv(test));
+            var node2 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([node3, parent1, node4]);
+
+            node3.after(node1);
+
+            assert_equals(node1.nextSibling, parent1, type(node3) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node1.parent, parent2, 'Parent group of the inserted node should be changed');
+            assert_equals(node1.previousSibling, node3, 'Node should be inserted into the tree ' +
+                'after this node');
+
+            assert_equals(node3.nextSibling, node1, type(node3) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(parent1.previousSibling, node1, type(node3) + '.after() should insert ' +
+                'nodes after this node');
+
+            assert_equals(node2.previousSibling, null, 'Inserted node should be removed from its ' +
+                'previous position in the tree');
+            assert_array_equals(parent1.children, [node2], 'Inserted node should be removed from its ' +
+                'previous position in the tree');
+            assert_array_equals(parent2.children, [node1, node3, parent1, node4], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.after() inserts node after this node. The previous position ' +
+    'of the inserted node is deeper in the tree than current node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([node3, parent1, node4]);
+
+            node1.after(node4);
+
+            assert_equals(node4.nextSibling, node2, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.parent, parent1, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node1, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+
+            assert_equals(node1.nextSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node2.previousSibling, node4, 'Node should be inserted into the tree ' +
+                'after this node');
+
+            assert_equals(parent1.nextSibling, null, 'Inserted node should be removed from its ' +
+                'previous position in the tree');
+            assert_array_equals(parent1.children, [node1, node4, node2], parentCtor.name +
+                '.children should be updated');
+            assert_array_equals(parent2.children, [node3, parent1], 'Inserted node should be ' +
+                'removed from its previous position in the tree');
+        });
+    });
+}, 'Test AnimationNode.after() inserts node after this node. The previous position ' +
+    'of the inserted node is shallower in the tree than current node, but not ancestor');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node1.after(node3, node4);
+
+            assert_equals(node1.nextSibling, node3, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.previousSibling, node1, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.nextSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node3, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.nextSibling, node2, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node2.previousSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_array_equals(parent.children, [node1, node3, node4, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.after() inserts several nodes after this node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node1.after(node3, node4, node3, node4);
+
+            assert_equals(node1.nextSibling, node3, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.previousSibling, node1, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.nextSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node3, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.nextSibling, node2, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node2.previousSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_array_equals(parent.children, [node1, node3, node4, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.after() inserts several nodes after this node, duplicate nodes are ignored');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node1.after(node3, node4, node3);
+
+            assert_equals(node1.nextSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.previousSibling, node1, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.nextSibling, node3, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node3.previousSibling, node4, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.nextSibling, node2, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node2.previousSibling, node3, type(node1) + '.after() should insert ' +
+                'nodes after this node');
+            assert_array_equals(parent.children, [node1, node4, node3, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.after() inserts several nodes after this node, check insertion order');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+            var player = document.timeline.play(node2);
+
+            assert_equals(player.source, node2, 'The node should be associated with its player');
+            node1.after(node2);
+            assert_equals(player.source, null, 'The node should be disassociated from its player');
+        });
+    });
+}, 'Test AnimationNode.after() disassociates the inserted node from the player, ' +
+    'if node is directly associated with a player');
+</script>
+</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-before.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-before.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-before.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-before.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,419 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>AnimationNode before() method tests</title>
+<meta name="assert" content="Inserts nodes before this animation node.">
+<link rel="help" href="http://w3c.github.io/web-animations/#dom-animationnode-before">
+<link rel="help" href="http://w3c.github.io/web-animations/#insert-children">
+<link rel="help" href="http://w3c.github.io/web-animations/#remove-an-animation-node">
+<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
+<link rel="author" title="Aleksei Yu. Semenov" href="mailto:a.semenov@unipro.ru">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<link rel="stylesheet" href="/resources/testharness.css">
+<body>
+<div id="log"></div>
+<script>
+// Test step 1. If there is no parent animation group, terminate these steps.
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        try {
+            node.before(null);
+        } catch(e) {
+            assert_unreached(type(node) + '.before(null) throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.before() does nothing if the node has no parent animation group. ' +
+    'HierarchyRequestError is not thrown in call node.before(null)');
+
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        try {
+            node.before(node);
+        } catch(e) {
+            assert_unreached(type(node) + '.before() throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.before() does nothing if the node has no parent animation group. ' +
+    'No HierarchyRequestError is thrown if the node is inserted before itself');
+
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    var node2 = newAnimation(createDiv(this));
+    nodes.forEach(function(node1) {
+        node1.before(node2);
+
+        assert_equals(node1.nextSibling, null, type(node1) + '.before() should do nothing ' +
+            'if the node has no parent animation group');
+        assert_equals(node2.previousSibling, null, type(node1) + '.before() should do nothing ' +
+            'if the node has no parent animation group');
+    });
+}, 'AnimationNode.before() does nothing if there is no parent animation group');
+
+// Test step 2. If any of the animation nodes in nodes is an inclusive ancestor of this animation node throw a HierarchyRequestError exception and terminate these steps.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.before(node);
+            }, type(node) + '.before() should throw HierarchyRequestError ' +
+                'if inserting node before itself');
+            assert_equals(node.parent, parent, type(node) + '.before() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent.children, [node], type(node) + '.before() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+
+        });
+    });
+}, 'HierarchyRequestError is thrown if node is inserted before itself');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.before(parent);
+            }, type(node) + '.before() should throw HierarchyRequestError ' +
+                'if inserting node\'s parent');
+            assert_equals(node.parent, parent, type(node) + '.before() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent.children, [node], type(node) + '.before() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if direct parent is inserted before the node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent1 = new parentCtor([node]);
+            var parent2 = new parentCtor([parent1]);
+            var parent3 = new parentCtor([parent2]);
+            var parent4 = new parentCtor([parent3]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.before(parent4);
+            }, type(node) + '.before() should throw HierarchyRequestError ' +
+                'if inserting node\'s ancestor');
+            assert_equals(node.parent, parent1, type(node) + '.before() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent1.children, [node], type(node) + '.before() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+            assert_equals(parent3.parent, parent4, type(node) + '.before() should not change ' +
+                'parent attribute of inserted node before throwing HierarchyRequestError');
+            assert_array_equals(parent4.children, [parent3], type(node) + '.before() ' +
+                'should not change inserted node parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if an inclusive ancestor is inserted before the node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([parent1]);
+            var parent3 = new parentCtor([parent2]);
+            var parent4 = new parentCtor([parent3]);
+            var parent5 = new ParentCtor([node3]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node1.before(node3, parent3);
+            }, type(node1) + '.before() should throw HierarchyRequestError ' +
+                'if inserting node\'s parent');
+            assert_equals(node1.parent, parent1, type(node1) + '.before() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent1.children, [node1, node2], type(node1) + '.before() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+            assert_equals(parent3.parent, parent4, type(node1) + '.before() should not change ' +
+                'parent attribute of inserted node before throwing HierarchyRequestError');
+            assert_array_equals(parent4.children, [parent3], type(node1) + '.before() ' +
+                'should not change inserted node parent children before throwing HierarchyRequestError');
+            assert_equals(node3.parent, parent5, type(node1) + '.before() should not change ' +
+                'parent attribute of inserted node before throwing HierarchyRequestError');
+            assert_array_equals(parent5.children, [node3], type(node1) + '.before() ' +
+                'should not change inserted node parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if an inclusive ancestor is inserted before the node. ' +
+    'Test several arguments in before() call');
+
+// Test step 3. Insert nodes before this animation node.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+
+            node1.before(node2);
+
+            assert_equals(node1.previousSibling, node2, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node2.parent, parent, 'Node should be inserted into the tree');
+            assert_equals(node2.nextSibling, node1, 'Node should be inserted into the tree ' +
+                'before this node');
+            assert_equals(parent.children, [node2, node1], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'AnimationNode.before() inserts nodes before this node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node1.before(node2);
+
+            assert_equals(node2.previousSibling, null, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node2.nextSibling, node1, 'Node should be inserted into the tree ' +
+                'before this node');
+            assert_equals(node1.previousSibling, node2, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node1.nextSibling, null, 'Node should be inserted into the tree ' +
+                'before this node');
+            assert_equals(parent.children, [node2, node1], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'AnimationNode.before() inserts nodes before this node. Inserted node is on the same ' +
+    'level in the tree');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.before(node1);
+
+            assert_equals(node1.nextSibling, node2, type(node2) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node2.previousSibling, node1, 'Node should be inserted into the tree ' +
+                'before this node');
+            assert_equals(parent.children, [node1, node2], parentCtor.name +
+                '.children should not be changed');
+        });
+    });
+}, 'Test AnimationNode.before() inserts node before this node even if inserted ' +
+    'node is already before this one');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node4) {
+            var node1 = newAnimation(createDiv(test));
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([node3, parent1, node4]);
+
+            node4.before(node1);
+
+            assert_equals(node1.nextSibling, parent1, type(node4) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node1.parent, parent2, 'Parent group of the inserted node should be changed');
+            assert_equals(node1.previousSibling, parent1, 'Node should be inserted into the tree ' +
+                'before this node');
+
+            assert_equals(parent1.nextSibling, node1, type(node4) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.previousSibling, node1, type(node4) + '.before() should insert ' +
+                'nodes before this node');
+
+            assert_equals(node2.previousSibling, null, 'Inserted node should be removed from its ' +
+                'previous position in the tree');
+            assert_array_equals(parent1.children, [node2], 'Inserted node should be removed from its ' +
+                'previous position in the tree');
+            assert_array_equals(parent2.children, [node3, parent1, node1, node4], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.before() inserts node before this node. The previous position ' +
+    'of the inserted node is deeper in the tree than current node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([node3, parent1, node4]);
+
+            node2.before(node4);
+
+            assert_equals(node4.nextSibling, node2, type(node2) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.parent, parent1, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node1, type(node2) + '.before() should insert ' +
+                'nodes before this node');
+
+            assert_equals(node1.nextSibling, node4, type(node2) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node2.previousSibling, node4, 'Node should be inserted into the tree ' +
+                'before this node');
+
+            assert_equals(parent1.nextSibling, null, 'Inserted node should be removed from its ' +
+                'previous position in the tree');
+            assert_array_equals(parent1.children, [node1, node4, node2], parentCtor.name +
+                '.children should be updated');
+            assert_array_equals(parent2.children, [node3, parent1], 'Inserted node should be ' +
+                'removed from its previous position in the tree');
+        });
+    });
+}, 'Test AnimationNode.before() inserts node before this node. The previous position ' +
+    'of the inserted node is shallower in the tree than current node, but not ancestor');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.before(node3, node4);
+
+            assert_equals(node1.nextSibling, node3, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.previousSibling, node1, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.nextSibling, node4, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node3, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.nextSibling, node2, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node2.previousSibling, node4, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_array_equals(parent.children, [node1, node3, node4, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.before() inserts several nodes before this node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.before(node3, node4, node3, node4);
+
+            assert_equals(node1.nextSibling, node3, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.previousSibling, node1, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.nextSibling, node4, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node3, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.nextSibling, node2, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node2.previousSibling, node4, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_array_equals(parent.children, [node1, node3, node4, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.before() inserts several nodes before this node, duplicate nodes are ignored');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.before(node3, node4, node3);
+
+            assert_equals(node1.nextSibling, node4, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.previousSibling, node1, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.nextSibling, node3, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node3.previousSibling, node4, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.nextSibling, node2, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node2.previousSibling, node3, type(node1) + '.before() should insert ' +
+                'nodes before this node');
+            assert_array_equals(parent.children, [node1, node4, node3, node2], parentCtor.name +
+                '.children should be updated');
+        });
+    });
+}, 'Test AnimationNode.before() inserts several nodes before this node, check insertion order');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+            var player = document.timeline.play(node2);
+
+            assert_equals(player.source, node2, 'The node should be associated with its player');
+            node1.before(node2);
+            assert_equals(player.source, null, 'The node should be disassociated from its player');
+        });
+    });
+}, 'Test AnimationNode.before() disassociates the inserted node from the player, ' +
+    'if node is directly associated with a player');
+</script>
+</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-remove.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-remove.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-remove.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-remove.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,240 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>AnimationNode remove() method tests</title>
+<meta name="assert" content="Removes this animation node from its parent animation group or player">
+<link rel="help" href="http://w3c.github.io/web-animations/#dom-animationnode-remove">
+<link rel="help" href="http://w3c.github.io/web-animations/#remove-an-animation-node">
+<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
+<link rel="author" title="Aleksei Yu. Semenov" href="mailto:a.semenov@unipro.ru">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<link rel="stylesheet" href="/resources/testharness.css">
+<body>
+<div id="log"></div>
+<script>
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        node.remove();
+
+        assert_equals(node.parent, null, type(node) + ' node parent attribute should be null');
+    });
+}, 'AnimationNode.remove() does nothing for standalone node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+            node.remove();
+
+            assert_array_equals(parent.children, [], type(node) +
+                ' node should be removed from the parent ' + parentCtor.name);
+            assert_equals(node.parent, null, type(node) +
+                ' node parent attribute should be updated');
+        });
+    });
+}, 'AnimationNode.remove() removes node from the parent animation group. ' +
+    'Removed node is the only node in the tree');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node1.remove();
+
+            assert_array_equals(parent.children, [node2], type(node1) +
+                ' node should be removed from the parent ' + parentCtor.name);
+            assert_equals(parent.firstChild, node2, 'Parent ' + parentCtor.name +
+                ' firstChild attribute should be updated');
+            assert_equals(node1.parent, null, 'Removed ' + type(node1) +
+                ' node parent attribute should be updated');
+            assert_equals(node1.nextSibling, null, 'Removed ' + type(node1) +
+                ' node nextSibling attribute should be updated');
+            assert_equals(node2.previousSibling, null,
+                'Remaining node previousSibling attribute should be updated');
+        });
+    });
+}, 'AnimationNode.remove() removes node from the parent animation group. ' +
+    'Remove the first node in the group');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.remove();
+
+            assert_array_equals(parent.children, [node1], type(node2) +
+                ' node should be removed from the parent ' + parentCtor.name);
+            assert_equals(parent.lastChild, node1, 'Parent ' + parentCtor.name +
+                ' lastChild attribute should be updated');
+            assert_equals(node2.parent, null, 'Removed ' + type(node2) +
+                ' node parent attribute should be updated');
+            assert_equals(node1.nextSibling, null,
+                'Remaining node nextSibling attribute should be updated');
+            assert_equals(node2.previousSibling, null, 'Removed ' + type(node2) +
+                ' node previousSibling attribute should be updated');
+        });
+    });
+}, 'AnimationNode.remove() removes node from the parent animation group. ' +
+    'Remove the last node in the group');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2, node3]);
+
+            node2.remove();
+
+            assert_array_equals(parent.children, [node1, node3], type(node2) +
+                ' node should be removed from the parent ' + parentCtor.name);
+            assert_equals(node2.parent, null, 'Removed ' + type(node2) +
+                ' node parent attribute should be updated');
+            assert_equals(node2.nextSibling, null, 'Removed ' + type(node2) +
+                ' node nextSibling attribute should be updated');
+            assert_equals(node2.previousSibling, null, 'Removed ' + type(node2) +
+                ' node previousSibling attribute should be updated');
+            assert_equals(node1.nextSibling, node3,
+                'Remaining node nextSibling attribute should be updated');
+            assert_equals(node3.previousSibling, node1,
+                'Remaining node previousSibling attribute should be updated');
+        });
+    });
+}, 'AnimationNode.remove() removes node from the parent animation group. ' +
+    'Remove node from the middle of the group');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        parents.forEach(function(nodeCtor) {
+            var node1 = newAnimation(createDiv(test));
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = new nodeCtor([node1, node2]);
+            var node5 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node3, node4, node5]);
+
+            node4.remove();
+
+            assert_array_equals(node4.children, [node1, node2], 'Removed ' +
+                type(node4) + ' node children should not be changed');
+            assert_array_equals(parent.children, [node3, node5], type(node4) +
+                ' node should be removed from the parent ' + parentCtor.name);
+            assert_equals(node4.parent, null, 'Removed ' + type(node2) +
+                ' node parent attribute should be updated');
+            assert_equals(node4.nextSibling, null, 'Removed ' + type(node2) +
+                ' node nextSibling attribute should be updated');
+            assert_equals(node4.previousSibling, null, 'Removed ' + type(node2) +
+                ' node previousSibling attribute should be updated');
+            assert_equals(node3.nextSibling, node5,
+                'Remaining node nextSibling attribute should be updated');
+            assert_equals(node5.previousSibling, node3,
+                'Remaining node previousSibling attribute should be updated');
+        });
+    });
+}, 'Test removing a node that has children');
+
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        var player = document.timeline.play(node);
+        node.remove();
+
+        assert_equals(player.source, null, type(node) +
+            ' node should be disassociated from the player');
+    });
+}, 'AnimationNode.remove() disassociates the node from player, ' +
+    'if node is directly associated with a player');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2, node3]);
+            var player = document.timeline.play(parent);
+
+            node2.remove();
+
+            assert_equals(player.source, parent, type(node2) +
+                ' parent node should remain associated with the player');
+        });
+    });
+}, 'AnimationNode.remove() keeps parent direct association with the player');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        parents.forEach(function(nodeCtor) {
+            var node1 = newAnimation(createDiv(test));
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var node5 = new parentCtor([node4]);
+            var group1 = new AnimationGroup([node3, node5]);
+            var node6 = newAnimation(createDiv(test));
+            var node7 = new parentCtor([node6]);
+            var node8 = newAnimation(createDiv(test));
+            var sequence1 = new AnimationSequence([node7,node8]);
+            var node9 = new nodeCtor([node1, group1, node2, sequence1]);
+            var node10 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node9, node10]);
+
+            node9.remove();
+
+            assert_equals(node9.parent, null, 'Removed ' + type(node9) +
+                ' node parent attribute should be updated');
+            assert_array_equals(node9.children, [node1, group1, node2, sequence1],
+                'Removed ' + type(node9) + ' node children should not be changed');
+            for (var i = 0; i < node9.children.length; i++) {
+                assert_equals(node9.children[i].parent, node9, 'Removed ' + type(node9) +
+                    ' node children parent attribute should not be changed for child ' + i);
+            }
+            assert_array_equals(group1.children, [node3, node5],
+                'Removed ' + type(node9) + ' node grand children should not be changed');
+            for (var i = 0; i < group1.children.length; i++) {
+                assert_equals(group1.children[i].parent, group1, 'Removed ' + type(node9) +
+                    ' node grand children parent attribute should not be changed for child ' + i);
+            }
+            assert_array_equals(sequence1.children, [node7,node8],
+                'Removed ' + type(node9) + ' node grand children should not be changed');
+            for (var i = 0; i < sequence1.children.length; i++) {
+                assert_equals(sequence1.children[i].parent, sequence1, 'Removed ' + type(node9) +
+                    ' node grand children parent attribute should not be changed for child ' + i);
+            }
+            assert_array_equals(node5.children, [node4],
+                'Removed ' + type(node9) + ' node grand children should not be changed');
+            assert_equals(node4.parent, node5, 'Removed ' + type(node9) +
+                ' node grand children parent attribute should not be changed');
+            assert_array_equals(node7.children, [node6],
+                'Removed ' + type(node9) + ' node grand children should not be changed');
+            assert_equals(node6.parent, node7, 'Removed ' + type(node9) +
+                ' node grand children parent attribute should not be changed');
+        });
+    });
+}, 'AnimationNode.remove() on the root of a non-trivial tree does not change child structure');
+</script>
+</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-replace.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-replace.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-replace.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/animation-node-replace.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,445 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>AnimationNode replace() method tests</title>
+<meta name="assert" content="Replaces this AnimationNode with the passed in nodes parameter">
+<link rel="help" href="http://w3c.github.io/web-animations/#dom-animationnode-replace">
+<link rel="help" href="http://w3c.github.io/web-animations/#remove-an-animation-node">
+<link rel="help" href="http://w3c.github.io/web-animations/#insert-children">
+<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
+<link rel="author" title="Aleksei Yu. Semenov" href="mailto:a.semenov@unipro.ru">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../testcommon.js"></script>
+<link rel="stylesheet" href="/resources/testharness.css">
+<body>
+<div id="log"></div>
+<script>
+// Step 1. If there is no parent animation group, terminate these steps.
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        try {
+            node.replace(null);
+        } catch(e) {
+            assert_unreached(type(node) + '.replace(null) throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.replace(null) does nothing if node has no parent animation group');
+
+test(function() {
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node) {
+        try {
+            node.replace(node);
+        } catch(e) {
+            assert_unreached(type(node) + '.replace(node) throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.replace() does nothing if node has no parent animation group. ' +
+    'HierarchyRequestError is not thrown if the node is replacing itself');
+
+test(function() {
+    var test = this;
+    var nodes = [newAnimation(createDiv(this)), new AnimationGroup([]), new AnimationSequence([])];
+    nodes.forEach(function(node1) {
+        var node2 = newAnimation(createDiv(test));
+
+        try {
+            node1.replace(node2);
+        } catch(e) {
+            assert_unreached(type(node1) + '.replace() throws unexpected exception: ' + e);
+        }
+    });
+}, 'AnimationNode.replace() does nothing if node has no parent animation group');
+
+// Step 2. If any of the animation nodes in nodes is an inclusive ancestor
+// of the parent animation group throw a HierarchyRequestError exception and terminate these steps.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.replace(node);
+            }, 'HierarchyRequestError should be thrown if ' + type(node) +
+                ' replaces itself');
+            assert_equals(node.parent, parent, type(node) + '.replace() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent.children, [node], type(node) + '.replace() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if the node replaces itself');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.replace(parent);
+            }, 'HierarchyRequestError should be thrown if ' + type(node) +
+                ' is replaced by its parent ' + parentCtor.name);
+            assert_equals(node.parent, parent, type(node) + '.replace() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent.children, [node], type(node) + '.replace() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if the node is replaced by its parent');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent1 = new parentCtor([node]);
+            var parent2 = new parentCtor([parent1]);
+            var parent3 = new parentCtor([parent2]);
+            var parent4 = new parentCtor([parent3]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node.replace(parent3);
+            }, 'HierarchyRequestError should be thrown if ' + type(node) +
+                ' is replaced by its inclusive ancestor' + parentCtor.name);
+            assert_equals(node.parent, parent1, type(node) + '.replace() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent1.children, [node], type(node) + '.replace() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+            assert_equals(parent3.parent, parent4, type(node) + '.replace() should not change ' +
+                'parent attribute of replacement node before throwing HierarchyRequestError');
+            assert_array_equals(parent4.children, [parent3], type(node) + '.replace() ' +
+                'should not change replacement node parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if the node is replaced by its inclusive ancestor');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var parent1 = new parentCtor([node1]);
+            var parent2 = new parentCtor([parent1]);
+            var parent3 = new parentCtor([parent2]);
+            var parent4 = new parentCtor([parent3]);
+            var node2 = newAnimation(createDiv(test));
+            var parent5 = new parentCtor([node2]);
+
+            assert_throws('HierarchyRequestError', function() {
+                node1.replace(node2, parent3);
+            }, 'HierarchyRequestError should be thrown if ' + type(node1) +
+                ' is replaced by its inclusive ancestor' + parentCtor.name);
+            assert_equals(node1.parent, parent1, type(node1) + '.replace() should not change ' +
+                'parent attribute before throwing HierarchyRequestError');
+            assert_array_equals(parent1.children, [node1], type(node1) + '.replace() ' +
+                'should not change parent children before throwing HierarchyRequestError');
+            assert_equals(parent3.parent, parent4, type(node1) + '.replace() should not change ' +
+                'parent attribute of replacement node before throwing HierarchyRequestError');
+            assert_array_equals(parent4.children, [parent3], type(node1) + '.replace() ' +
+                'should not change replacement node parent children before throwing HierarchyRequestError');
+            assert_equals(node2.parent, parent5, type(node1) + '.replace() should not change ' +
+                'parent attribute of replacement node before throwing HierarchyRequestError');
+            assert_array_equals(parent5.children, [node2], type(node1) + '.replace() ' +
+                'should not change replacement node parent children before throwing HierarchyRequestError');
+        });
+    });
+}, 'HierarchyRequestError is thrown if node is replaced by its inclusive ancestor. ' +
+    'Test several arguments in replace() call');
+
+// Step 3. Let reference child be the next sibling of this animation node not in nodes.
+// Step 4. Remove this animation node from its parent animation group.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node) {
+            var parent = new parentCtor([node]);
+
+            node.replace();
+
+            assert_array_equals(parent.children, [], type(node) +
+                ' node should be removed from parent ' + parentCtor.name);
+            assert_equals(node.parent, null, type(node) +
+                ' node parent attribute should be updated');
+        });
+    });
+}, 'AnimationNode.replace() without arguments removes the node from the parent ' +
+    'animation group');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+
+            node1.replace(node2);
+
+            assert_array_equals(parent.children, [node2], type(node1) +
+                ' node should be removed its parent group');
+            assert_equals(node1.parent, null, type(node1) +
+                ' node should be removed from its parent group');
+            assert_equals(node1.previousSibling, null, type(node1) +
+                ' node previousSibling attribute should be updated');
+            assert_equals(node1.nextSibling, null, type(node1) +
+                ' node nextSibling attribute should be updated');
+        });
+    });
+}, 'AnimationNode.replace() removes the node from its parent animation group');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2, node3]);
+
+            node2.replace(node3);
+
+            assert_array_equals(parent.children, [node1,node3], type(node2) +
+                ' node should be removed from parent ' + parentCtor.name);
+            assert_equals(node2.parent, null, type(node2) +
+                ' node parent attribute should be updated');
+            assert_equals(node2.nextSibling, null, type(node2) +
+                ' node nextSibling attribute should be updated');
+            assert_equals(node2.previousSibling, null, type(node2) +
+                ' node previousSibling attribute should be updated');
+            assert_equals(node1.nextSibling, node3,
+                'Sibling node nextSibling attribute should be updated');
+            assert_equals(node3.previousSibling, node1,
+                'Sibling node previousSibling attribute should be updated');
+        });
+    });
+}, 'AnimationNode.replace(next sibling) removes the node from its parent ' +
+    'animation group');
+
+// Step 5. Insert nodes before reference child.
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+
+            node1.replace(node2);
+
+            assert_array_equals(parent.children, [node2], type(node1) +
+                ' node should be replaced');
+            assert_equals(node2.parent, parent,
+                'Replacement node should be assigned to a parent group');
+        });
+    });
+}, 'AnimationNode.replace() replaces node in the parent animation group');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node4) {
+            var node1 = newAnimation(createDiv(test));
+            var node2 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([node3, parent1, node4]);
+
+            node4.replace(node1);
+
+            assert_array_equals(parent1.children, [node2],
+                'Replacement node should be removed from its previous position in the tree');
+            assert_array_equals(parent2.children, [node3, parent1, node1],
+                'Replacement node should be inserted into the new position');
+            assert_equals(node1.parent, parent2, 'Inserted node parent group should be assigned');
+            assert_equals(node1.previousSibling, parent1,
+                'Inserted node previousSibling attribute should be updated');
+            assert_equals(node1.nextSibling, null,
+                'Inserted node nextSibling attribute should be updated');
+
+            assert_equals(node4.parent, null, 'Node should be removed from its parent group');
+            assert_equals(node4.previousSibling, null,
+                'Replaced node previousSibling attribute should be updated');
+            assert_equals(node4.nextSibling, null,
+                'Replaced node nextSibling attribute should be updated');
+        });
+    });
+}, 'Test AnimationNode.replace() replaces given node. The previous position ' +
+    'of the replacement node is deeper in the tree than the current node');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent1 = new parentCtor([node1, node2]);
+            var parent2 = new parentCtor([node3, parent1, node4]);
+
+            node2.replace(node4);
+
+            assert_array_equals(parent1.children, [node1, node4],
+                'Replacement node should be inserted to the new position');
+            assert_array_equals(parent2.children, [node3, parent1],
+                'Replacement node should be removed from its previous position in the tree');
+            assert_equals(node4.parent, parent1, 'Inserted node parent group should be changed');
+            assert_equals(node4.previousSibling, node1,
+                'Inserted node previousSibling attribute should be updated');
+            assert_equals(node1.nextSibling, node4,
+                'Inserted node sibling nextSibling attribute should be updated');
+
+            assert_equals(node2.parent, null, 'Replaced node parent group should be changed');
+            assert_equals(node2.previousSibling, null,
+                'Replaced node previousSibling attribute should be updated');
+            assert_equals(node2.nextSibling, null, 'Replaced node nextSibling attribute ' +
+                'should be updated');
+        });
+    });
+}, 'Test AnimationNode.replace() replaces given node. The previous position ' +
+    'of the replacement node is shallower in the tree than current node, but is not an ancestor');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.replace(node3, node4);
+
+            assert_array_equals(parent.children, [node1, node3, node4], type(node2) + '.replace() ' +
+                'should replace the current node by ones passed in arguments');
+            assert_equals(node1.nextSibling, node3, 'nextSibling attribute should be updated');
+            assert_equals(node3.previousSibling, node1, 'Inserted node previousSibling attribute ' +
+                'should be updated');
+            assert_equals(node3.nextSibling, node4, 'Inserted node nextSibling attribute ' +
+                'should be updated');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node3, 'Inserted node previousSibling attribute ' +
+                'should be updated');
+            assert_equals(node4.nextSibling, null, 'Inserted node nextSibling attribute ' +
+                'should be updated');
+            assert_equals(node4.parent, parent, 'Parent group of the second inserted node ' +
+                'should be changed');
+            assert_equals(node2.parent, null, 'Replaced node parent group should be changed');
+            assert_equals(node2.previousSibling, null,
+                'Replaced node previousSibling attribute should be updated');
+            assert_equals(node2.nextSibling, null, 'Replaced node nextSibling attribute ' +
+                'should be updated');
+        });
+    });
+}, 'Test AnimationNode.replace() replaces given node. Test several arguments');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.replace(node3, node4, node3, node4);
+
+            assert_array_equals(parent.children, [node1, node3, node4], type(node2) + '.replace() ' +
+                'should replace the current node by ones passed in arguments');
+            assert_equals(node1.nextSibling, node3, 'nextSibling attribute should be updated');
+            assert_equals(node3.previousSibling, node1, 'Inserted node previousSibling attribute ' +
+                'should be updated');
+            assert_equals(node3.nextSibling, node4, 'Inserted node nextSibling attribute ' +
+                'should be updated');
+            assert_equals(node3.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node4.previousSibling, node3, 'Inserted node previousSibling attribute ' +
+                'should be updated');
+            assert_equals(node4.nextSibling, null, 'Inserted node nextSibling attribute ' +
+                'should be updated');
+            assert_equals(node4.parent, parent, 'Parent group of the second inserted node ' +
+                'should be changed');
+            assert_equals(node2.parent, null, 'Replaced node parent group should be changed');
+            assert_equals(node2.previousSibling, null,
+                'Replaced node previousSibling attribute should be updated');
+            assert_equals(node2.nextSibling, null, 'Replaced node nextSibling attribute ' +
+                'should be updated');
+        });
+    });
+}, 'Test AnimationNode.replace() replaces given node by several nodes, duplicate nodes are ignored');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node2) {
+            var node1 = newAnimation(createDiv(test));
+            var node3 = newAnimation(createDiv(test));
+            var node4 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1, node2]);
+
+            node2.replace(node3, node4, node3);
+
+            assert_array_equals(parent.children, [node1, node4, node3], type(node2) + '.replace() ' +
+                'should replace the current node by ones passed in arguments');
+            assert_equals(node1.nextSibling, node4, 'nextSibling attribute should be updated');
+            assert_equals(node4.previousSibling, node1, 'Inserted node previousSibling attribute ' +
+                'should be updated');
+            assert_equals(node4.nextSibling, node3, 'Inserted node nextSibling attribute ' +
+                'should be updated');
+            assert_equals(node4.parent, parent, 'Parent group of the inserted node should be changed');
+            assert_equals(node3.previousSibling, node4, 'Inserted node previousSibling attribute ' +
+                'should be updated');
+            assert_equals(node3.nextSibling, null, 'Inserted node nextSibling attribute ' +
+                'should be updated');
+            assert_equals(node3.parent, parent, 'Parent group of the second inserted node ' +
+                'should be changed');
+            assert_equals(node2.parent, null, 'Replaced node parent group should be changed');
+            assert_equals(node2.previousSibling, null,
+                'Replaced node previousSibling attribute should be updated');
+            assert_equals(node2.nextSibling, null, 'Replaced node nextSibling attribute ' +
+                'should be updated');
+        });
+    });
+}, 'Test AnimationNode.replace() replaces given node by several nodes, check replacement order');
+
+test(function() {
+    var test = this;
+    var parents = [AnimationGroup, AnimationSequence];
+    parents.forEach(function(parentCtor) {
+        var nodes = [newAnimation(createDiv(test)), new AnimationGroup([]), new AnimationSequence([])];
+        nodes.forEach(function(node1) {
+            var node2 = newAnimation(createDiv(test));
+            var parent = new parentCtor([node1]);
+            var player = document.timeline.play(node2);
+
+            assert_equals(player.source, node2, 'The node should be associated with its player');
+            node1.replace(node2);
+            assert_equals(player.source, null, 'The node should be disassociated from its player');
+        });
+    });
+}, 'Test AnimationNode.replace() disassociates the inserted node from the player, ' +
+    'if node is directly associated with a player');
+</script>
+</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/idlharness.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/idlharness.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-node/idlharness.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-node/idlharness.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,54 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>AnimationNode IDL tests</title>
+<link rel="author" title="Sergey G. Grekhov" href="mailto:sgrekhov@unipro.ru">
+<link rel="author" title="Aleksei Yu. Semenov" href="mailto:a.semenov@unipro.ru">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/webidl2/lib/webidl2.js"></script>
+<script src="/resources/idlharness.js"></script>
+<body>
+<div id="log"></div>
+<div id="target"></div>
+<script type="text/plain" id="untested-IDL">
+interface AnimationPlayer {
+};
+
+interface AnimationTiming {
+};
+
+interface ComputedTimingProperties {
+};
+
+interface AnimationGroup {
+};
+</script>
+<script type="text/plain" id="AnimationNode-IDL">
+interface AnimationNode {
+    // Timing
+    readonly attribute AnimationTiming          timing;
+    readonly attribute ComputedTimingProperties computedTiming;
+
+    // Timing hierarchy
+    readonly attribute AnimationGroup?          parent;
+    readonly attribute AnimationNode?           previousSibling;
+    readonly attribute AnimationNode?           nextSibling;
+    void before (AnimationNode... nodes);
+    void after (AnimationNode... nodes);
+    void replace (AnimationNode... nodes);
+    void remove ();
+};
+</script>
+<script>
+'use strict';
+
+var target = document.getElementById('target');
+var node = new Animation(target, [], 5);
+
+var idlArray = new IdlArray();
+idlArray.add_untested_idls(document.getElementById('untested-IDL').textContent);
+idlArray.add_idls(document.getElementById('AnimationNode-IDL').textContent);
+idlArray.add_objects( { AnimationNode: ['node'] } );
+idlArray.test();
+</script>
+</body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-timeline/animation-timeline.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-timeline/animation-timeline.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-timeline/animation-timeline.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-timeline/animation-timeline.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>Web Animations API: AnimationTimeline tests</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<iframe src="data:text/html;charset=utf-8," width="10" height="10" id="iframe"></iframe>
-<script>
-'use strict';
-
-test(function() {
-  assert_equals(document.timeline, document.timeline,
-    'document.timeline returns the same object every time');
-  var iframe = document.getElementById('iframe');
-  assert_not_equals(document.timeline, iframe.contentDocument.timeline,
-    'document.timeline returns a different object for each document');
-  assert_not_equals(iframe.contentDocument.timeline, null,
-    'document.timeline on an iframe is not null');
-},
-'document.timeline identity tests',
-{
-  help:   'http://dev.w3.org/fxtf/web-animations/#the-document-timeline',
-  assert: [ 'Each document has a timeline called the document timeline' ],
-  author: 'Brian Birtles'
-});
-
-async_test(function(t) {
-  assert_true(document.timeline.currentTime > 0,
-    'document.timeline.currentTime is positive');
-  // document.timeline.currentTime should be set even before document
-  // load fires. We expect this code to be run before document load and hence
-  // the above assertion is sufficient.
-  // If the following assertion fails, this test needs to be redesigned.
-  assert_true(document.readyState !== 'complete',
-    'Test is running prior to document load');
-
-  // Test that the document timeline's current time is measured from
-  // navigationStart.
-  //
-  // We can't just compare document.timeline.currentTime to
-  // window.performance.now() because currentTime is only updated on a sample
-  // so we use requestAnimationFrame instead.
-  window.requestAnimationFrame(t.step_func(function(rafTime) {
-    assert_equals(document.timeline.currentTime, rafTime,
-                  'document.timeline.currentTime matches' +
-                  ' requestAnimationFrame time');
-    t.done();
-  }));
-},
-'document.timeline.currentTime value tests',
-{
-  help: [
-    'http://dev.w3.org/fxtf/web-animations/#the-global-clock',
-    'http://dev.w3.org/fxtf/web-animations/#the-document-timeline'
-  ],
-  assert: [
-    'The global clock is a source of monotonically increasing time values',
-    'The time values of the document timeline are calculated as a fixed' +
-    ' offset from the global clock',
-    'the zero time corresponds to the navigationStart moment',
-    'the time value of each document timeline must be equal to the time ' +
-    'passed to animation frame request callbacks for that browsing context'
-  ],
-  author: 'Brian Birtles'
-});
-
-async_test(function(t) {
-  var valueAtStart = document.timeline.currentTime;
-  var timeAtStart = window.performance.now();
-  while (window.performance.now() - timeAtStart < 100) {
-    // Wait 100ms
-  }
-  assert_equals(document.timeline.currentTime, valueAtStart,
-    'document.timeline.currentTime does not change within a script block');
-  window.requestAnimationFrame(t.step_func(function() {
-    assert_true(document.timeline.currentTime > valueAtStart,
-      'document.timeline.currentTime increases between script blocks');
-    t.done();
-  }));
-},
-'document.timeline.currentTime liveness tests',
-{
-  help: 'http://dev.w3.org/fxtf/web-animations/#script-execution-and-live-updates-to-the-model',
-  assert: [ 'The value returned by the currentTime attribute of a' +
-            ' document timeline will not change within a script block' ],
-  author: 'Brian Birtles'
-});
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-timeline/idlharness.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-timeline/idlharness.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/animation-timeline/idlharness.html	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/animation-timeline/idlharness.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>Web Animations API: AnimationTimeline tests</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>
-<div id="log"></div>
-<script type="text/plain" id="AnimationTimeline-IDL">
-interface AnimationTimeline {
-  readonly attribute double? currentTime;
-};
-</script>
-<script>
-'use strict';
-
-var idlArray;
-test(function() {
-  idlArray = new IdlArray();
-  idlArray.add_idls(
-    document.getElementById('AnimationTimeline-IDL').textContent);
-  idlArray.add_objects( { AnimationTimeline: ['document.timeline'] } );
-});
-idlArray.test();
-
-</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/README.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/README.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/README.md	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/README.md	2014-11-26 21:45:59.000000000 +0000
@@ -1,4 +1,4 @@
 Web Animations Tests
 ====================
 
-Specification: http://dev.w3.org/fxtf/web-animations/
+Specification: http://w3c.github.io/web-animations/
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/testcommon.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/testcommon.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/web-animations/testcommon.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/web-animations/testcommon.js	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+Distributed under both the W3C Test Suite License [1] and the W3C
+3-clause BSD License [2]. To contribute to a W3C Test Suite, see the
+policies and contribution forms [3].
+
+[1] http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
+[2] http://www.w3.org/Consortium/Legal/2008/03-bsd-license
+[3] http://www.w3.org/2004/10/27-testcases
+ */
+
+"use strict";
+
+var ANIMATION_END_TIME = 1000;
+var ANIMATION_TOP_DEFAULT = 300;
+var ANIMATION_TOP_0 = 10;
+var ANIMATION_TOP_0_5 = 100;
+var ANIMATION_TOP_1 = 200;
+
+var KEYFRAMES = [ {
+    top : ANIMATION_TOP_0 + 'px',
+    offset : 0
+}, {
+    top : ANIMATION_TOP_0_5 + 'px',
+    offset : 1 / 2
+}, {
+    top : ANIMATION_TOP_1 + 'px',
+    offset : 1
+} ];
+
+// creates new animation for given target
+function newAnimation(animationTarget) {
+    animationTarget.style.top = ANIMATION_TOP_DEFAULT + 'px';
+    return new Animation(animationTarget, KEYFRAMES, ANIMATION_END_TIME);
+}
+
+// creates div element, appends it to the document body and
+// add removing of the created element to test cleanup
+function createDiv(test, doc) {
+    if (!doc) {
+        doc = document;
+    }
+    var div = doc.createElement('div');
+    doc.body.appendChild(div);
+    test.add_cleanup(function() {
+        removeElement(div);
+    });
+    return div;
+}
+
+// Removes element
+function removeElement(element) {
+    element.parentNode.removeChild(element);
+}
+
+// Returns the type name of given object
+function type(object) {
+    return Object.prototype.toString.call(object).slice(8, -1);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/base_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/base_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/base_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/base_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,13 +4,13 @@
 import sys
 import unittest
 
-from webserver import Httpd
 from network import get_lan_ip
 
 repo_root = os.path.abspath(os.path.join(__file__, "../.."))
 sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
+sys.path.insert(1, os.path.join(repo_root, "tools", "wptserve"))
+from wptserve import server
 from webdriver.driver import WebDriver
-from webdriver import exceptions, wait
 
 
 class WebDriverBaseTest(unittest.TestCase):
@@ -18,8 +18,9 @@
     def setUpClass(cls):
         cls.driver = create_driver()
 
-        cls.webserver = Httpd(host=get_lan_ip())
+        cls.webserver = server.WebTestHttpd(host=get_lan_ip())
         cls.webserver.start()
+        cls.webserver.where_is = cls.webserver.get_url
 
     @classmethod
     def tearDownClass(cls):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/cookie/cookie_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/cookie/cookie_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/cookie/cookie_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/cookie/cookie_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions
 
 
 class CookieTest(base_test.WebDriverBaseTest):
@@ -44,7 +45,7 @@
             self.driver.add_cookie({ 'name': invalid_name, 'value': value })
             self.fail( 'should have thrown exceptions.' )
 
-        except UnableToSetCookieException:
+        except exceptions.UnableToSetCookieException:
             pass
         except exceptions.InvalidCookieDomainException:
             pass
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/element_location/element_location_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/element_location/element_location_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/element_location/element_location_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/element_location/element_location_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -7,19 +7,14 @@
 
 
 class ElementLocationTest(base_test.WebDriverBaseTest):
-    def test_find_element_by_id(self):
-        self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
-        e = self.driver.find_element_by_id("id")
-        self.assertEquals("id", e.text)
-
     def test_find_element_by_name(self):
         self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
-        e = self.driver.find_element_by_name("name")
+        e = self.driver.find_element_by_css("*[name='name']")
         self.assertEquals("name", e.text)
 
     def test_find_element_by_css_selector(self):
         self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
-        e = self.driver.find_element_by_css_selector("#id")
+        e = self.driver.find_element_by_css("#id")
         self.assertEquals("id", e.text)
 
     def test_find_element_by_link_text(self):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/element_state/visibility_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/element_state/visibility_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/element_state/visibility_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/element_state/visibility_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions
 
 
 class NaturalNonVisibleElementsTest(base_test.WebDriverBaseTest):
@@ -24,8 +25,8 @@
 
     def test_zero_sized_element_is_shown_if_decendant_has_size(self):
         self.driver.get(self.webserver.where_is("element_state/res/zero-sized-element-with-sizable-decendant.html"))
-        parent = self.driver.find_element_by_id("parent")
-        child = self.driver.find_element_by_id("child")
+        parent = self.driver.find_element_by_css("#parent")
+        child = self.driver.find_element_by_css("#child")
 
         self.assertTrue(parent.is_displayed())
         self.assertTrue(child.is_displayed())
@@ -53,7 +54,7 @@
         children = self.driver.find_elements_by_css(".child")
         assert all(child.is_displayed() for child in children)
 
-        parent = self.driver.find_element_by_id("parent")
+        parent = self.driver.find_element_by_css("#parent")
         assert parent.is_displayed()
 
     def test_element_hidden_by_overflow_x_is_not_visible(self):
@@ -65,8 +66,8 @@
 
         for page in pages:
             self.driver.get(self.webserver.where_is(page))
-            right = self.driver.find_element_by_id("right")
-            bottom_right = self.driver.find_element_by_id("bottom-right")
+            right = self.driver.find_element_by_css("#right")
+            bottom_right = self.driver.find_element_by_css("#bottom-right")
 
             self.assertFalse(right.is_displayed())
             self.assertFalse(bottom_right.is_displayed())
@@ -80,8 +81,8 @@
 
         for page in pages:
             self.driver.get(self.webserver.where_is(page))
-            bottom = self.driver.find_element_by_id("bottom")
-            bottom_right = self.driver.find_element_by_id("bottom-right")
+            bottom = self.driver.find_element_by_css("#bottom")
+            bottom_right = self.driver.find_element_by_css("#bottom-right")
 
             self.assertFalse(bottom.is_displayed())
             self.assertFalse(bottom_right.is_displayed())
@@ -113,21 +114,21 @@
 
     def test_element_hidden_by_other_element(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-hidden-by-other-element.html"))
-        overlay = self.driver.find_element_by_id("overlay")
-        hidden = self.driver.find_element_by_id("hidden")
+        overlay = self.driver.find_element_by_css("#overlay")
+        hidden = self.driver.find_element_by_css("#hidden")
 
         self.assertTrue(overlay.is_displayed())
         self.assertFalse(hidden.is_displayed())
 
     def test_element_partially_hidden_by_other_element(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-partially-hidden-by-other-element.html"))
-        partial = self.driver.find_element_by_id("partial")
+        partial = self.driver.find_element_by_css("#partial")
         self.assertTrue(partial.is_displayed())
 
     def test_element_hidden_by_z_index(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-hidden-by-z-index.html"))
-        overlay = self.driver.find_element_by_id("overlay")
-        hidden = self.driver.find_element_by_id("hidden")
+        overlay = self.driver.find_element_by_css("#overlay")
+        hidden = self.driver.find_element_by_css("#hidden")
 
         self.assertTrue(overlay.is_displayed())
         self.assertFalse(hidden.is_displayed())
@@ -139,8 +140,8 @@
 
     def test_element_moved_behind_other_element_by_transform(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-moved-behind-other-element-by-transform.html"))
-        overlay = self.driver.find_element_by_id("overlay")
-        hidden = self.driver.find_element_by_id("hidden")
+        overlay = self.driver.find_element_by_css("#overlay")
+        hidden = self.driver.find_element_by_css("#hidden")
 
         self.assertTrue(overlay.is_displayed())
         self.assertFalse(hidden.is_displayed())
@@ -167,7 +168,7 @@
 
     def test_element_with_same_color_as_parent_background(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-same-color-as-parent-background.html"))
-        hidden = self.driver.find_element_by_id("hidden")
+        hidden = self.driver.find_element_by_css("#hidden")
         self.assertFalse(hidden.is_displayed())
 
 
@@ -203,35 +204,35 @@
 
     def test_display_none_hides_child_node(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-child.html"))
-        parent = self.driver.find_element_by_id("parent")
-        child = self.driver.find_element_by_id("child")
+        parent = self.driver.find_element_by_css("#parent")
+        child = self.driver.find_element_by_css("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_display_none_hides_child_node_link(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-child-link.html"))
-        child = self.driver.find_element_by_id("child")
+        child = self.driver.find_element_by_css("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_hides_child_node_paragraph(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-child-paragraph.html"))
-        child = self.driver.find_element_by_id("child")
+        child = self.driver.find_element_by_css("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_on_parent_takes_presedence(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-parent-presedence.html"))
-        child = self.driver.find_element_by_id("child")
+        child = self.driver.find_element_by_css("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_on_parent_takes_presedence_over_visibility_visible(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-parent-presedence-visibility.html"))
-        child = self.driver.find_element_by_id("child")
+        child = self.driver.find_element_by_css("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_hidden_dynamically(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-dynamic.html"))
-        hidden = self.driver.find_element_by_id("hidden")
+        hidden = self.driver.find_element_by_css("#hidden")
         self.assertFalse(hidden.is_displayed())
 
 
@@ -248,34 +249,34 @@
 
     def test_visibility_hidden_hides_child_node(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child.html"))
-        parent = self.driver.find_element_by_id("parent")
-        child = self.driver.find_element_by_id("child")
+        parent = self.driver.find_element_by_css("#parent")
+        child = self.driver.find_element_by_css("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_visibility_hidden_hides_child_node_link(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child-link.html"))
-        parent = self.driver.find_element_by_id("parent")
-        child = self.driver.find_element_by_id("child")
+        parent = self.driver.find_element_by_css("#parent")
+        child = self.driver.find_element_by_css("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_visibility_hidden_hides_child_node_paragraph(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child-paragraph.html"))
-        parent = self.driver.find_element_by_id("parent")
-        child = self.driver.find_element_by_id("child")
+        parent = self.driver.find_element_by_css("#parent")
+        child = self.driver.find_element_by_css("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
-    def test_visibility_hidden_on_child_takes_presedence(self):
+    def test_visibility_hidden_on_child_takes_precedence(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child-presedence.html"))
-        child = self.driver.find_element_by_id("child")
+        child = self.driver.find_element_by_css("#child")
         self.assertTrue(child.is_displayed())
 
-    def test_visibility_hidden_on_parent_takes_presedence_over_display_block(self):
+    def test_visibility_hidden_on_parent_takes_precedence_over_display_block(self):
         pass
 
     def test_visibility_hidden_set_dynamically(self):
@@ -283,12 +284,12 @@
 
     def test_should_show_element_not_visible_with_hidden_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/hidden.html"))
-        singleHidden = self.driver.find_element('id', 'singleHidden')
+        singleHidden = self.driver.find_element_by_css('#singleHidden')
         self.assertFalse(singleHidden.is_displayed())
 
     def test_should_show_element_not_visible_when_parent_element_has_hidden_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/hidden.html"))
-        child = self.driver.find_element('id', 'child')
+        child = self.driver.find_element_by_css('#child')
         self.assertFalse(child.is_displayed())
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions, wait
 
 
 class AlertsQuitTest(base_test.WebDriverBaseTest):
@@ -12,7 +13,7 @@
         self.driver.get(self.webserver.where_is('modal/res/alerts.html'))
 
     def test_can_quit_when_an_alert_is_present(self):
-        self.driver.find_element_by_id('alert').click()
+        self.driver.find_element_by_css('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         self.driver.quit()
         with self.assertRaises(Exception):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/modal/alerts_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/modal/alerts_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/modal/alerts_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/modal/alerts_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions, wait
 
 
 class AlertsTest(base_test.WebDriverBaseTest):
@@ -19,39 +20,39 @@
 
     # Alerts
     def test_should_allow_user_to_accept_an_alert(self):
-        self.driver.find_element_by_id('alert').click()
+        self.driver.find_element_by_css('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
         self.driver.get_current_url()
 
     def test_should_allow_user_to_accept_an_alert_with_no_text(self):
-        self.driver.find_element_by_id('empty-alert').click()
+        self.driver.find_element_by_css('#empty-alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
         self.driver.get_current_url()
 
     def test_should_allow_user_to_dismiss_an_alert(self):
-        self.driver.find_element_by_id('alert').click()
+        self.driver.find_element_by_css('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
         self.driver.get_current_url()
 
     def test_should_allow_user_to_get_text_of_an_alert(self):
-        self.driver.find_element_by_id('alert').click()
+        self.driver.find_element_by_css('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         value = alert.get_text()
         alert.accept()
         self.assertEquals('cheese', value)
 
     def test_setting_the_value_of_an_alert_throws(self):
-        self.driver.find_element_by_id('alert').click()
+        self.driver.find_element_by_css('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
 	with self.assertRaises(exceptions.ElementNotVisibleException):
 	    alert.send_keys('cheese')
         alert.accept()
 
     def test_alert_should_not_allow_additional_commands_if_dismissed(self):
-        self.driver.find_element_by_id('alert').click()
+        self.driver.find_element_by_css('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
         with self.assertRaises(exceptions.NoSuchAlertException):
@@ -59,79 +60,79 @@
 
     # Prompts
     def test_should_allow_user_to_accept_a_prompt(self):
-        self.driver.find_element_by_id('prompt').click()
+        self.driver.find_element_by_css('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == '')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == '')
 
     def test_should_allow_user_to_dismiss_a_prompt(self):
-        self.driver.find_element_by_id('prompt').click()
+        self.driver.find_element_by_css('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == 'null')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'null')
 
     def test_should_allow_user_to_set_the_value_of_a_prompt(self):
-        self.driver.find_element_by_id('prompt').click()
+        self.driver.find_element_by_css('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.send_keys('cheese')
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == 'cheese')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'cheese')
 
     def test_should_allow_user_to_get_text_of_a_prompt(self):
-        self.driver.find_element_by_id('prompt').click()
+        self.driver.find_element_by_css('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         value = alert.get_text()
         alert.accept()
         self.assertEquals('Enter something', value)
 
     def test_prompt_should_not_allow_additional_commands_if_dismissed(self):
-        self.driver.find_element_by_id('prompt').click()
+        self.driver.find_element_by_css('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
         with self.assertRaises(exceptions.NoSuchAlertException):
             alert.get_text()
 
     def test_prompt_should_use_default_value_if_no_keys_sent(self):
-        self.driver.find_element_by_id('prompt-with-default').click()
+        self.driver.find_element_by_css('#prompt-with-default').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == 'This is a default value')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'This is a default value')
 
     def test_prompt_should_have_null_value_if_dismissed(self):
-        self.driver.find_element_by_id('prompt-with-default').click()
+        self.driver.find_element_by_css('#prompt-with-default').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == 'null')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'null')
 
     # Confirmations
     def test_should_allow_user_to_accept_a_confirm(self):
-        self.driver.find_element_by_id('confirm').click()
+        self.driver.find_element_by_css('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == 'true')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'true')
 
     def test_should_allow_user_to_dismiss_a_confirm(self):
-        self.driver.find_element_by_id('confirm').click()
+        self.driver.find_element_by_css('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.wait.until(lambda x: x.find_element_by_id('text').get_text() == 'false')
+        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'false')
 
     def test_setting_the_value_of_a_confirm_throws(self):
-        self.driver.find_element_by_id('confirm').click()
+        self.driver.find_element_by_css('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         with self.assertRaises(exceptions.ElementNotVisibleException):
             alert.send_keys('cheese')
         alert.accept()
 
     def test_should_allow_user_to_get_text_of_a_confirm(self):
-        self.driver.find_element_by_id('confirm').click()
+        self.driver.find_element_by_css('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         value = alert.get_text()
         alert.accept()
         self.assertEquals('cheese', value)
 
     def test_confirm_should_not_allow_additional_commands_if_dismissed(self):
-        self.driver.find_element_by_id('confirm').click()
+        self.driver.find_element_by_css('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
         with self.assertRaises(exceptions.NoSuchAlertException):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/auth_tests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/auth_tests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/auth_tests.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/auth_tests.py	2014-11-26 21:45:59.000000000 +0000
@@ -5,8 +5,10 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webserver import Httpd
-
+from webdriver import exceptions
+from wptserve import server
+from wptserve.router import any_method
+from wptserve.handlers import basic_auth_handler
 
 class WebDriverAuthTest(unittest.TestCase):
 
@@ -15,16 +17,7 @@
     @classmethod
     def setUpClass(cls):
         cls.driver = base_test.create_driver()
-
-        def basic_response_func( request, *args ):
-            return (401, {"WWW-Authenticate" : "Basic"}, None)
-
-        basic_auth_handler = { 'method': 'GET',
-                               'path' : '/navigation/auth_required_basic',
-                               'function' : basic_response_func }
-        urlhandlers = [ basic_auth_handler ]
-
-        cls.webserver = Httpd( urlhandlers=urlhandlers )
+        cls.webserver = server.WebTestHttpd(routes=[(any_method, "*", basic_auth_handler)])
         cls.webserver.start()
 
     @classmethod
@@ -34,7 +27,7 @@
 
     # Test that when 401 is seen by browser, a WebDriver response is still sent
     def test_response_401_auth_basic(self):
-        page = self.webserver.where_is('navigation/auth_required_basic')
+        page = self.webserver.get_url('navigation/res/authenticated.html')
         self.driver.set_page_load_timeout(5)
         try:
             self.driver.get( page )
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/forward.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/forward.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/forward.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/forward.py	2014-11-26 21:45:59.000000000 +0000
@@ -11,12 +11,12 @@
     def test_forward(self):
         self.driver.get(self.webserver.where_is('navigation/res/forwardStart.html'))
         self.driver.get(self.webserver.where_is('navigation/res/forwardNext.html'))
-        nextbody = self.driver.find_element_by_css("body").get_text()
+        nextbody = self.driver.find_element_by_css("body").text
         self.driver.go_back()
-        currbody = self.driver.find_element_by_css("body").get_text()
+        currbody = self.driver.find_element_by_css("body").text
         self.assertNotEqual(nextbody, currbody)
         self.driver.go_forward()
-        currbody = self.driver.find_element_by_css("body").get_text()
+        currbody = self.driver.find_element_by_css("body").text
         self.assertEqual(nextbody, currbody)
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py	2014-11-26 21:45:59.000000000 +0000
@@ -10,9 +10,9 @@
     # Get a static page that must be the same upon refresh
     def test_forwardToNothing(self):
         self.driver.get(self.webserver.where_is('navigation/forwardStart.html'))
-        body = self.driver.find_element_by_css("body").get_text()
+        body = self.driver.find_element_by_css("body").text
         self.driver.go_forward()
-        currbody = self.driver.find_element_by_css("body").get_text()
+        currbody = self.driver.find_element_by_css("body").text
         self.assertEqual(body, currbody)
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/refresh-page.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/refresh-page.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/refresh-page.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/refresh-page.py	2014-11-26 21:45:59.000000000 +0000
@@ -10,16 +10,16 @@
     # Get a static page that must be the same upon refresh
     def test_refreshPage(self):
         self.driver.get(self.webserver.where_is('navigation/res/refreshPageStatic.html'))
-        body = self.driver.find_element_by_css("body").get_text()
+        body = self.driver.find_element_by_css("body").text
         self.driver.execute_script("document.getElementById('body').innerHTML=''")
         self.driver.refresh()
-        newbody = self.driver.find_element_by_css("body").get_text()
+        newbody = self.driver.find_element_by_css("body").text
         self.assertEqual(body, newbody)
 
         self.driver.get(self.webserver.where_is('navigation/res/refreshPageDynamic.html'))
-        body = self.driver.find_element_by_css("body").get_text()
+        body = self.driver.find_element_by_css("body").text
         self.driver.refresh()
-        newbody = self.driver.find_element_by_css("body").get_text()
+        newbody = self.driver.find_element_by_css("body").text
         self.assertNotEqual(body, newbody)
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/res/authenticated.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/res/authenticated.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/navigation/res/authenticated.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/navigation/res/authenticated.html	2014-11-26 21:45:59.000000000 +0000
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+
+<title>authentication successful</title>
+<h1>You're in!</h1>
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/README.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/README.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/README.md	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/README.md	2014-11-26 21:45:59.000000000 +0000
@@ -7,24 +7,9 @@
 
 ## How to run the tests
 
-1. It is highly recommended that you use a virtual Python environment.
-   This allows you to safely make changes to your Python environment
-   for WebDriver tests without affecting other software projects on
-   your system.
-   Install it using either `<sudo> easy_install virtualenv`, `<sudo> pip
-   install virtualenv`, or `<sudo> apt-get install python-virtualenv`
-2. Create and enter the directory for your Python virtual environment. This 
-   directory can be anywhere. It is recommended that you keep it separate
-   from the webdriver tests folder, to avoid confusion with source control
-2a. Go to the directory where you store Python virtual environments. 
-   For example `cd ~; mkdir python-virtualenv; cd python-virtualenv`
-2b. Create a virtual env configuration and directory: `virtualenv webdriver-tests`
-2c. Enter the directory: `cd webdriver-tests`
-3. `source bin/activate` to activate the local Python installation
-4. Install Selenium: `pip install selenium` or `easy_install selenium`
-5. Go to the WebDriver tests: `cd _WEBDRIVER_TEST_ROOT_`
-6. Run the tests: `python runtests.py`
-7. Run the test against a different config specified in webdriver.cfg:
+1. Go to the WebDriver tests: `cd _WEBDRIVER_TEST_ROOT_`
+2. Run the tests: `python runtests.py`
+3. Run the test against a different config specified in webdriver.cfg:
    `WD_BROWSER=chrome python runtests.py`
 
 To be run a specific test file you can just run `python test_file.py`
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions
 
 
 class ImplicitWaitsTests(base_test.WebDriverBaseTest):
@@ -11,15 +12,15 @@
         self.driver.get(self.webserver.where_is('timeouts/res/implicit_waits_tests.html'))
 
     def test_find_element_by_id(self):
-        add = self.driver.find_element_by_id("adder")
-        self.driver.implicitly_wait(3)
+        add = self.driver.find_element_by_css("#adder")
+        self.driver.set_implicit_timeout(3)
         add.click()
-        self.driver.find_element_by_id("box0")  # All is well if this doesn't throw.
+        self.driver.find_element_by_css("#box0")  # All is well if this doesn't throw.
 
     def test_should_still_fail_to_find_an_element_when_implicit_waits_are_enabled(self):
-        self.driver.implicitly_wait(0.5)
+        self.driver.set_implicit_timeout(0.5)
         try:
-            self.driver.find_element_by_id("box0")
+            self.driver.find_element_by_css("#box0")
             self.fail("Expected NoSuchElementException to have been thrown")
         except exceptions.NoSuchElementException as e:
             pass
@@ -27,10 +28,10 @@
             self.fail("Expected NoSuchElementException but got " + str(e))
 
     def test_should_return_after_first_attempt_to_find_one_after_disabling_implicit_waits(self):
-        self.driver.implicitly_wait(3)
-        self.driver.implicitly_wait(0)
+        self.driver.set_implicit_timeout(3)
+        self.driver.set_implicit_timeout(0)
         try:
-            self.driver.find_element_by_id("box0")
+            self.driver.find_element_by_css("#box0")
             self.fail("Expected NoSuchElementException to have been thrown")
         except exceptions.NoSuchElementException as e:
             pass
@@ -38,24 +39,24 @@
             self.fail("Expected NoSuchElementException but got " + str(e))
 
     def test_should_implicitly_wait_until_at_least_one_element_is_found_when_searching_for_many(self):
-        add = self.driver.find_element_by_id("adder")
-        self.driver.implicitly_wait(2)
+        add = self.driver.find_element_by_css("#adder")
+        self.driver.set_implicit_timeout(2)
         add.click()
         add.click()
-        elements = self.driver.find_elements_by_class_name("redbox")
+        elements = self.driver.find_elements_by_css(".redbox")
         self.assertTrue(len(elements) >= 1)
 
     def test_should_still_fail_to_find_an_element_by_class_when_implicit_waits_are_enabled(self):
-        self.driver.implicitly_wait(0.5)
-        elements = self.driver.find_elements_by_class_name("redbox")
+        self.driver.set_implicit_timeout(0.5)
+        elements = self.driver.find_elements_by_css(".redbox")
         self.assertEqual(0, len(elements))
 
     def test_should_return_after_first_attempt_to_find_many_after_disabling_implicit_waits(self):
-        add = self.driver.find_element_by_id("adder")
-        self.driver.implicitly_wait(1.1)
-        self.driver.implicitly_wait(0)
+        add = self.driver.find_element_by_css("#adder")
+        self.driver.set_implicit_timeout(1.1)
+        self.driver.set_implicit_timeout(0)
         add.click()
-        elements = self.driver.find_elements_by_class_name("redbox")
+        elements = self.driver.find_elements_by_css(".redbox")
         self.assertEqual(0, len(elements))
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py	2014-11-26 21:45:59.000000000 +0000
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions
 
 
 class PageLoadTimeoutTest(base_test.WebDriverBaseTest):
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/user_input/clear_test.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/user_input/clear_test.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/user_input/clear_test.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/user_input/clear_test.py	2014-11-26 21:45:59.000000000 +0000
@@ -6,44 +6,45 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from webdriver import exceptions
 
 
 class ElementClearTest(base_test.WebDriverBaseTest):
     def test_writable_text_input_element_should_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_writable_input_page.html"))
-        e = self.driver.find_element_by_id("writableTextInput")
+        e = self.driver.find_element_by_css("#writableTextInput")
         e.clear()
         self.assertEquals("", e.get_attribute("value"))
 
     def test_disabled_text_input_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_disabled_input_page.html"))
-        e = self.driver.find_element_by_id("disabledTextInput")
+        e = self.driver.find_element_by_css("#disabledTextInput")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_read_only_text_input_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_readonly_input_page.html"))
-        e = self.driver.find_element_by_id("readOnlyTextInput")
+        e = self.driver.find_element_by_css("#readOnlyTextInput")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_writable_text_area_element_should_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_writable_textarea_page.html"))
-        e = self.driver.find_element_by_id("writableTextArea")
+        e = self.driver.find_element_by_css("#writableTextArea")
         e.clear()
         self.assertEquals("", e.get_attribute("value"))
 
     def test_disabled_text_area_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_disabled_textarea_page.html"))
-        e = self.driver.find_element_by_id("disabledTextArea")
+        e = self.driver.find_element_by_css("#disabledTextArea")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_read_only_text_input_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_readonly_textarea_page.html"))
-        e = self.driver.find_element_by_id("readOnlyTextArea")
+        e = self.driver.find_element_by_css("#readOnlyTextArea")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_content_editable_area_should_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_contenteditable_page.html"))
-        e = self.driver.find_element_by_id("contentEditableElement")
+        e = self.driver.find_element_by_css("#contentEditableElement")
         e.clear()
         self.assertEquals("", e.text)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/webdriver.cfg thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/webdriver.cfg
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/webdriver.cfg	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/webdriver.cfg	2014-11-26 21:45:59.000000000 +0000
@@ -24,3 +24,8 @@
 [ios-driver]
 capabilities: {"browserName": "iphone"}
 mode: compatibility
+
+[blackberry]
+url: http://169.254.0.1:1338
+capabilities: {"browserName": "blackberry"}
+mode: compatibility
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/webserver.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/webserver.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/webdriver/webserver.py	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/webdriver/webserver.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-#!/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/.
-
-import BaseHTTPServer
-import SimpleHTTPServer
-import errno
-import logging
-import threading
-import posixpath
-import socket
-import sys
-import os
-import urllib
-import urlparse
-import re
-import time
-from SocketServer import ThreadingMixIn
-
-class EasyServer(ThreadingMixIn, BaseHTTPServer.HTTPServer):
-    allow_reuse_address = True
-    acceptable_errors = (errno.EPIPE, errno.ECONNABORTED)
-
-    def handle_error(self, request, client_address):
-        error = sys.exc_value
-
-        if ((isinstance(error, socket.error) and
-             isinstance(error.args, tuple) and
-             error.args[0] in self.acceptable_errors)
-            or
-            (isinstance(error, IOError) and
-             error.errno in self.acceptable_errors)):
-            pass  # remote hang up before the result is sent
-        else:
-            logging.error(error)
-
-
-class Request(object):
-    """Details of a request."""
-
-    # attributes from urlsplit that this class also sets
-    uri_attrs = ('scheme', 'netloc', 'path', 'query', 'fragment')
-
-    def __init__(self, uri, headers, rfile=None):
-        self.uri = uri
-        self.headers = headers
-        parsed = urlparse.urlsplit(uri)
-        for i, attr in enumerate(self.uri_attrs):
-            setattr(self, attr, parsed[i])
-        try:
-            body_len = int(self.headers.get('Content-length', 0))
-        except ValueError:
-            body_len = 0
-        if body_len and rfile:
-            self.body = rfile.read(body_len)
-        else:
-            self.body = None
-
-
-class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
-
-    docroot = os.getcwd() # current working directory at time of import
-    proxy_host_dirs = False
-    request_log = []
-    log_requests = False
-    request = None
-
-    def _try_handler(self, method):
-        if self.log_requests:
-            self.request_log.append({ 'method': method,
-                                      'path': self.request.path,
-                                      'time': time.time() })
-
-        handlers = [handler for handler in self.urlhandlers
-                    if handler['method'] == method]
-        for handler in handlers:
-            m = re.match(handler['path'], self.request.path)
-            if m:
-                (response_code, headerdict, data) = \
-                    handler['function'](self.request, *m.groups())
-                self.send_response(response_code)
-                for (keyword, value) in headerdict.iteritems():
-                    self.send_header(keyword, value)
-                self.end_headers()
-                self.wfile.write(data)
-
-                return True
-
-        return False
-
-    def parse_request(self):
-        retval = SimpleHTTPServer.SimpleHTTPRequestHandler.parse_request(self)
-        self.request = Request(self.path, self.headers, self.rfile)
-        return retval
-
-    def do_GET(self):
-        if not self._try_handler('GET'):
-            if self.path == '/navigation/redirect':
-                self.send_response(301)
-                self.send_header('Location', '/navigation/res/empty.html')
-                self.end_headers()
-            elif self.docroot:
-                # don't include query string and fragment, and prepend
-                # host directory if required.
-                if self.request.netloc and self.proxy_host_dirs:
-                    self.path = '/' + self.request.netloc + \
-                        self.request.path
-                else:
-                    self.path = self.request.path
-                SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
-            else:
-                self.send_response(404)
-                self.end_headers()
-                self.wfile.write('')
-
-    def do_POST(self):
-        # if we don't have a match, we always fall through to 404 (this may
-        # not be "technically" correct if we have a local file at the same
-        # path as the resource but... meh)
-        if not self._try_handler('POST'):
-            self.send_response(404)
-            self.end_headers()
-            self.wfile.write('')
-
-    def do_DEL(self):
-        # if we don't have a match, we always fall through to 404 (this may
-        # not be "technically" correct if we have a local file at the same
-        # path as the resource but... meh)
-        if not self._try_handler('DEL'):
-            self.send_response(404)
-            self.end_headers()
-            self.wfile.write('')
-
-    def translate_path(self, path):
-        # this is taken from SimpleHTTPRequestHandler.translate_path(),
-        # except we serve from self.docroot instead of os.getcwd(), and
-        # parse_request()/do_GET() have already stripped the query string and
-        # fragment and mangled the path for proxying, if required.
-        path = posixpath.normpath(urllib.unquote(self.path))
-        words = path.split('/')
-        words = filter(None, words)
-        path = self.docroot
-        for word in words:
-            drive, word = os.path.splitdrive(word)
-            head, word = os.path.split(word)
-            if word in (os.curdir, os.pardir): continue
-            path = os.path.join(path, word)
-        return path
-
-
-    # I found on my local network that calls to this were timing out
-    # I believe all of these calls are from log_message
-    def address_string(self):
-        return "a.b.c.d"
-
-    # This produces a LOT of noise
-    def log_message(self, format, *args):
-        pass
-
-
-class Httpd(object):
-    """
-    Very basic HTTP server class. Takes a docroot (path on the filesystem)
-    and a set of urlhandler dictionaries of the form:
-
-    {
-      'method': HTTP method (string): GET, POST, or DEL,
-      'path': PATH_INFO (regular expression string),
-      'function': function of form fn(arg1, arg2, arg3, ..., request)
-    }
-
-    and serves HTTP. For each request, MozHttpd will either return a file
-    off the docroot, or dispatch to a handler function (if both path and
-    method match).
-
-    Note that one of docroot or urlhandlers may be None (in which case no
-    local files or handlers, respectively, will be used). If both docroot or
-    urlhandlers are None then MozHttpd will default to serving just the local
-    directory.
-
-    MozHttpd also handles proxy requests (i.e. with a full URI on the request
-    line).  By default files are served from docroot according to the request
-    URI's path component, but if proxy_host_dirs is True, files are served
-    from <self.docroot>/<host>/.
-
-    For example, the request "GET http://foo.bar/dir/file.html" would
-    (assuming no handlers match) serve <docroot>/dir/file.html if
-    proxy_host_dirs is False, or <docroot>/foo.bar/dir/file.html if it is
-    True.
-    """
-
-    def __init__(self, host="127.0.0.1", port=8888, docroot=None,
-                 urlhandlers=None, proxy_host_dirs=False, log_requests=False):
-        self.host = host
-        self.port = int(port)
-        self.docroot = docroot
-        if not urlhandlers and not docroot:
-            self.docroot = os.getcwd()
-        self.proxy_host_dirs = proxy_host_dirs
-        self.httpd = None
-        self.urlhandlers = urlhandlers or []
-        self.log_requests = log_requests
-        self.request_log = []
-
-        class RequestHandlerInstance(RequestHandler):
-            docroot = self.docroot
-            urlhandlers = self.urlhandlers
-            proxy_host_dirs = self.proxy_host_dirs
-            request_log = self.request_log
-            log_requests = self.log_requests
-
-        self.handler_class = RequestHandlerInstance
-
-    def start(self, block=False):
-        """
-        Start the server.  If block is True, the call will not return.
-        If block is False, the server will be started on a separate thread that
-        can be terminated by a call to .stop()
-        """
-        self.httpd = EasyServer((self.host, self.port), self.handler_class)
-        if block:
-            self.httpd.serve_forever()
-        else:
-            self.server = threading.Thread(target=self.httpd.serve_forever)
-            self.server.setDaemon(True) # don't hang on exit
-            self.server.start()
-
-    def stop(self):
-        if self.httpd:
-            ### FIXME: There is no shutdown() method in Python 2.4...
-            try:
-                self.httpd.shutdown()
-            except AttributeError:
-                pass
-        self.httpd = None
-
-    __del__ = stop
-
-    def where_is(self, path):
-        return "http://%s:%d/%s" % (self.host, self.port, path)
-
-
-def main(args=sys.argv[1:]):
-
-    # parse command line options
-    from optparse import OptionParser
-    parser = OptionParser()
-    parser.add_option('-p', '--port', dest='port',
-                      type="int", default=8888,
-                      help="port to run the server on [DEFAULT: %default]")
-    parser.add_option('-H', '--host', dest='host',
-                      default='127.0.0.1',
-                      help="host [DEFAULT: %default]")
-    parser.add_option('-i', '--external-ip', action="store_true",
-                      dest='external_ip', default=False,
-                      help="find and use external ip for host")
-    parser.add_option('-d', '--docroot', dest='docroot',
-                      default=os.getcwd(),
-                      help="directory to serve files from [DEFAULT: %default]")
-    options, args = parser.parse_args(args)
-    if args:
-        parser.error("mozhttpd does not take any arguments")
-
-    host = options.host
-
-    # create the server
-    server = Httpd(host=host, port=options.port, docroot=options.docroot)
-
-    print "Serving '%s' at %s:%s" % (server.docroot, server.host, server.port)
-    server.start(block=True)
-
-if __name__ == '__main__':
-    main()
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/websockets/Close-reason-unpaired-surrogates.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/websockets/Close-reason-unpaired-surrogates.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/websockets/Close-reason-unpaired-surrogates.htm	2014-11-14 09:37:24.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/websockets/Close-reason-unpaired-surrogates.htm	2014-11-26 21:45:59.000000000 +0000
@@ -15,6 +15,7 @@
 
         var wsocket = CreateWebSocket(false, false, false);
         var isOpenCalled = false;
+        var replacementChar = "\uFFFD";
         var reason = "\uD807";
 
         wsocket.addEventListener('open', testOpen.step_func(function (evt) {
@@ -25,6 +26,7 @@
 
         wsocket.addEventListener('close', testClose.step_func(function (evt) {
             assert_true(isOpenCalled, "WebSocket connection should be opened");
+            assert_equals(evt.reason, replacementChar, "reason replaced with replacement character");
             testClose.done();
         }), true);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/websockets/Secure-Close-Reason-Unpaired-surrogates.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/websockets/Secure-Close-Reason-Unpaired-surrogates.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/websockets/Secure-Close-Reason-Unpaired-surrogates.htm	2014-11-14 09:37:25.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/websockets/Secure-Close-Reason-Unpaired-surrogates.htm	2014-11-26 21:45:59.000000000 +0000
@@ -15,6 +15,7 @@
 
         var wsocket = CreateWebSocket(true, false, false);
         var isOpenCalled = false;
+        var replacementChar = "\uFFFD";
         var reason = "\uD807";
 
         wsocket.addEventListener('open', testOpen.step_func(function (evt) {
@@ -25,6 +26,7 @@
 
         wsocket.addEventListener('close', testClose.step_func(function (evt) {
             assert_true(isOpenCalled, "WebSocket connection should be opened");
+            assert_equals(evt.reason, replacementChar, "reason replaced with replacement character");
             testClose.done();
         }), true);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/event-ports-dedicated.html	2014-11-26 21:46:00.000000000 +0000
@@ -1,6 +1,6 @@
 <!--
 onmessage = function(e) {
-  postMessage(e.ports === null);
+  postMessage(e.ports instanceof Array && e.ports.length === 0);
 }
 /*
 -->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-null.html	2014-11-26 21:46:00.000000000 +0000
@@ -2,7 +2,7 @@
 try {
   postMessage(1, null);
 } catch(e) {
-  postMessage(''+e);
+  postMessage(e instanceof TypeError);
 }
 /*
 -->
@@ -15,11 +15,11 @@
 (async_test()).step(function() {
   var worker = new Worker('#');
   worker.onmessage = this.step_func(function(e) {
-    assert_equals(e.data, 1);
+    assert_true(e.data);
     this.done();
   });
 });
 </script>
 <!--
 */
-//-->
\ No newline at end of file
+//-->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/interfaces/DedicatedWorkerGlobalScope/postMessage/second-argument-undefined.html	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,25 @@
+<!--
+try {
+  postMessage(1, undefined);
+} catch(e) {
+  postMessage(''+e);
+}
+/*
+-->
+<!doctype html>
+<title>Using undefined in postMessage's second argument</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+(async_test()).step(function() {
+  var worker = new Worker('#');
+  worker.onmessage = this.step_func(function(e) {
+    assert_equals(e.data, 1);
+    this.done();
+  });
+});
+</script>
+<!--
+*/
+//-->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/common.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/common.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/common.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/common.js	2014-11-26 21:46:00.000000000 +0000
@@ -25,7 +25,7 @@
   if (test_obj)
     test_obj.done();
 }
-function compare_Array(callback) {
+function compare_Array(callback, callback_is_async) {
   return function(actual, input, test_obj) {
     if (typeof actual === 'string')
       assert_unreached(actual);
@@ -33,12 +33,12 @@
     assert_not_equals(actual, input);
     assert_equals(actual.length, input.length, 'length');
     callback(actual, input);
-    if (test_obj)
+    if (test_obj && !callback_is_async)
       test_obj.done();
   }
 }
 
-function compare_Object(callback) {
+function compare_Object(callback, callback_is_async) {
   return function(actual, input, test_obj) {
     if (typeof actual === 'string')
       assert_unreached(actual);
@@ -46,15 +46,15 @@
     assert_false(actual instanceof Array, 'instanceof Array');
     assert_not_equals(actual, input);
     callback(actual, input);
-    if (test_obj)
+    if (test_obj && !callback_is_async)
       test_obj.done();
   }
 }
 
-function enumerate_props(compare_func) {
+function enumerate_props(compare_func, test_obj) {
   return function(actual, input) {
     for (var x in input) {
-      compare_func(actual[x], input[x]);
+      compare_func(actual[x], input[x], test_obj);
     }
   };
 }
@@ -339,41 +339,41 @@
 check('Blob NUL', func_Blob_NUL, compare_Blob);
 
 async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_basic)], compare_Array(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, [test_obj.step(func_Blob_basic)], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Array Blob object, Blob basic');
 async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xD800]))], compare_Array(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xD800]))], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Array Blob object, Blob unpaired high surrogate (invalid utf-8)');
 async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xDC00]))], compare_Array(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xDC00]))], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Array Blob object, Blob unpaired low surrogate (invalid utf-8)');
 async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xD800, 0xDC00]))], compare_Array(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xD800, 0xDC00]))], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Array Blob object, Blob paired surrogates (invalid utf-8)');
 async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_empty)], compare_Array(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, [test_obj.step(func_Blob_empty)], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Array Blob object, Blob empty');
 async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_NUL)], compare_Array(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, [test_obj.step(func_Blob_NUL)], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Array Blob object, Blob NUL');
 
 async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_basic)}, compare_Object(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, {'x':test_obj.step(func_Blob_basic)}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Object Blob object, Blob basic');
 async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xD800]))}, compare_Object(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xD800]))}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Object Blob object, Blob unpaired high surrogate (invalid utf-8)');
 async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xDC00]))}, compare_Object(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xDC00]))}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Object Blob object, Blob unpaired low surrogate (invalid utf-8)');
 async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xD800, 0xDC00]))}, compare_Object(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xD800, 0xDC00]))}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Object Blob object, Blob paired surrogates (invalid utf-8)');
 async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_empty)}, compare_Object(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, {'x':test_obj.step(func_Blob_empty)}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Object Blob object, Blob empty');
 async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_NUL)}, compare_Object(enumerate_props(compare_Blob)), test_obj);
+  check(test_obj.name, {'x':test_obj.step(func_Blob_NUL)}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
 }, 'Object Blob object, Blob NUL');
 
 function compare_File(actual, input, test_obj) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/worker-common.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/worker-common.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/worker-common.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/semantics/structured-clone/worker-common.js	2014-11-26 21:46:00.000000000 +0000
@@ -9,8 +9,9 @@
   return true;
 }
 
-function check_Blob(msg, input, port, expect_File) {
+function check_Blob(msg, input, port, expect_File, orig_input) {
   expect_File = !!expect_File;
+  orig_input = orig_input || input;
   try {
     var expected;
     switch (msg) {
@@ -64,7 +65,7 @@
               check_true(view.getUint8(i) === expected[i], 'view.getUint8('+i+') === expected['+i+']')
             }
             if (log.length === 0) {
-              port.postMessage(input);
+              port.postMessage(orig_input);
             } else {
               port.postMessage('FAIL '+log);
             }
@@ -724,7 +725,7 @@
       case 'Array Blob object, Blob NUL':
         if (check_true(input instanceof Array, 'input instanceof Array') &&
             check_true(input.length === 1, 'input.length === 1')) {
-          check_Blob(msg.substr('Array Blob object, '.length), input[0], port);
+          check_Blob(msg.substr('Array Blob object, '.length), input[0], port, false, input);
           // no postMessage or close here, check_Blob takes care of that
         }
         break;
@@ -742,7 +743,7 @@
               i++;
             }
             if (check_true(i === 1, 'i === 1')) {
-              check_Blob(msg.substr('Object Blob object, '.length), input['x'], port);
+              check_Blob(msg.substr('Object Blob object, '.length), input['x'], port, false, input);
               // no postMessage or close here, check_Blob takes care of that
             }
           }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/Worker_cross_origin_security_err.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/Worker_cross_origin_security_err.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/Worker_cross_origin_security_err.htm	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/Worker_cross_origin_security_err.htm	2014-11-26 21:46:00.000000000 +0000
@@ -8,15 +8,15 @@
 <body>
 <div id=log></div>
 <script>
-    
+
     var description = "Test Description: Throw a SECURITY_ERR exception when origin of the "
                     + "worker script URL and origin URL are not same.";
-                  
+
     test(function()
     {
         assert_throws("SECURITY_ERR", function()
         {
-            var worker = new Worker("data://./support/WorkerBasic.js");
+            var worker = new Worker("ftp://example.org/support/WorkerBasic.js");
         });
     }, description);
 </script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/workers/Worker_dispatchEvent_ErrorEvent.htm	2014-11-26 21:46:00.000000000 +0000
@@ -1,44 +1,55 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title> ErrorEvent.initErrorEvent() and Worker.dispatchEvent() </title>
+<title> ErrorEvent and Worker.dispatchEvent() </title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
 <div id=log></div>
 <script>
-    
+
     var EVENT = "error";
     var FILENAME = './support/ErrorEvent.js';
     var MESSAGE = 'Hello Worker';
     var LINENO = 5;
-    var description = "ErrorEvent.initErrorEvent() and Worker.dispatchEvent()";
-    
+    var COLNO = 6;
+    var ERROR = new Error("test");
+    var description = "ErrorEvent and Worker.dispatchEvent()";
+
     var t = async_test("Test Description: " + description);
 
-    var worker = new Worker(FILENAME);
-    
-    worker.addEventListener(EVENT, t.step_func(TestErrorEvent), true);
-    
-    var evt = document.createEvent("ErrorEvent");
-
-    evt.initErrorEvent(EVENT,    /* type */
-                       true,     /* bubbles */
-                       true,     /* cancelable */
-                       MESSAGE,  /* message */
-                       FILENAME, /* filename */
-                       LINENO    /* lineno */ );
-                       
-    worker.dispatchEvent(evt);
-    
-    function TestErrorEvent(evt)
-    {
-        var ExpectedResult = [EVENT, MESSAGE, FILENAME, LINENO];
-        var ActualResult = [evt.type, evt.message, evt.filename, evt.lineno];
-        assert_array_equals(ActualResult, ExpectedResult);
-        t.done();
-    }
+    t.step(function() {
+        var worker = new Worker(FILENAME);
+
+        worker.addEventListener(EVENT, t.step_func(TestErrorEvent), true);
+
+        var evt = new ErrorEvent(EVENT, {bubbles:true, cancelable:true, message:MESSAGE, filename:FILENAME, lineno:LINENO, colno:COLNO, error:ERROR});
+
+        worker.dispatchEvent(evt);
+
+        function TestErrorEvent(evt)
+        {
+            assert_equals(evt.type, EVENT, 'type');
+            assert_equals(evt.message, MESSAGE, 'message');
+            assert_equals(evt.filename, FILENAME, 'filename');
+            assert_equals(evt.lineno, LINENO, 'lineno');
+            assert_equals(evt.colno, COLNO, 'colno');
+            assert_equals(evt.error, ERROR, 'error');
+            t.done();
+        }
+    });
+
+    test(function() {
+        assert_throws("NotSupportedError", function() {
+            document.createEvent("ErrorEvent");
+        }, "should not be supported");
+    }, "document.createEvent('ErrorEvent')");
+
+    test(function() {
+        var evt = new ErrorEvent("error");
+        assert_false("initErrorEvent" in evt, "should not be supported");
+    }, "initErrorEvent");
 </script>
 </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-receive.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-receive.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-receive.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-receive.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: abort() after successful receive should not fire "abort" event</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]"/>
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-send.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-send.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-send.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-send.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,14 +4,14 @@
     <title>XMLHttpRequest: abort() after send()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[1] following-sibling::ol/li[3] following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[1] following-sibling::ol/li[4]/ol/li[3] following-sibling::ol/li[4]/ol/li[4] following-sibling::ol/li[4]/ol/li[5] following-sibling::ol/li[4]/ol/li[6] following-sibling::ol/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol/li[2]" />
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[1] following-sibling::ol/li[3] following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[1] following-sibling::ol/li[4]/ol/li[3] following-sibling::ol/li[4]/ol/li[4] following-sibling::ol/li[4]/ol/li[5] following-sibling::ol/li[4]/ol/li[6] following-sibling::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="following::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[1] following::dd[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-stop.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-stop.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-stop.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-stop.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: abort event should fire when stop() method is used</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[3] following::dt[3]/following::dd[1]/p"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[3] following::dt[3]/following::dd[1]/p"/>
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-timeout.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-timeout.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-timeout.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-after-timeout.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: abort() after a timeout should not fire "abort" event</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]"/>
 </head>
 <body>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-done.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-done.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-done.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-done.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: abort() during DONE</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-open.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-open.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-open.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-open.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: abort() during OPEN</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-unsent.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-unsent.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-unsent.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-unsent.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: abort() during UNSENT</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[5]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-upload.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-upload.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-upload.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-during-upload.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: abort() while sending data</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7] following-sibling::ol/li[4]/ol/li[7]/ol/li[2] following-sibling::ol/li[4]/ol/li[7]/ol/li[3] following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[1] following::ul[1]/li[2]/ol[1]/li[2] following::ul[1]/li[2]/ol[1]/li[3] following::ul[1]/li[2]/ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7] following-sibling::ol/li[4]/ol/li[7]/ol/li[2] following-sibling::ol/li[4]/ol/li[7]/ol/li[3] following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[1] following::ul[1]/li[2]/ol[1]/li[2] following::ul[1]/li[2]/ol[1]/li[3] following::ul[1]/li[2]/ol[1]/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-abort.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-abort.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-abort.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-abort.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[5]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The abort() method: do not fire abort event in OPENED state when send() flag is unset. send() throws after abort().</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-listeners.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-listeners.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-listeners.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-listeners.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: abort() should not reset event listeners</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[6] following-sibling::ol/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[6] following-sibling::ol/li[7]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-loadend.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-loadend.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-loadend.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-loadend.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[6]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[6]"/>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The abort() method: Fire a progress event named loadend</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-order.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-order.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-order.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-event-order.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[3] following-sibling::ol/li[4]/ol/li[5] following-sibling::ol/li[4]/ol/li[6] following-sibling::ol/li[4]/ol/li[7]/ol/li[3] following-sibling::ol/li[4]/ol/li[7]/ol/li[4] following-sibling::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[3] following-sibling::ol/li[4]/ol/li[5] following-sibling::ol/li[4]/ol/li[6] following-sibling::ol/li[4]/ol/li[7]/ol/li[3] following-sibling::ol/li[4]/ol/li[7]/ol/li[4] following-sibling::ol/li[5]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The abort() method: abort and loadend events</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-abort.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-abort.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-abort.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-abort.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[3]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-loadend.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-loadend.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-loadend.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/abort-upload-event-loadend.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/data-uri.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/data-uri.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/data-uri.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/data-uri.htm	2014-11-26 21:45:53.000000000 +0000
@@ -3,8 +3,8 @@
 <title>XMLHttpRequest: data uri</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#data:-urls-and-http" data-tested-assertations="following::ul/li[1] following::ul/li[2] following::ul/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ul/li[10]/dl/dt[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#data:-urls-and-http" data-tested-assertations="following::ul/li[1] following::ul/li[2] following::ul/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ul/li[10]/dl/dt[2]" />
 <div id="log"></div>
 
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-abort.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-abort.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-abort.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-abort.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <title>XMLHttpRequest: abort event</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onabort" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-abort" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-abort" data-tested-assertations="following::ol//ol//ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onabort" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-abort" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-abort" data-tested-assertations="following::ol//ol//ol/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadend.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadend.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadend.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadend.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,11 +4,11 @@
     <title>XMLHttpRequest: loadend event</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="/following-sibling::ol/li[10]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="/following-sibling::ol/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol[1]/li[7]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-load.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-load.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-load.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-load.htm	2014-11-26 21:45:53.000000000 +0000
@@ -3,10 +3,10 @@
 <title>XMLHttpRequest: The send() method: Fire an event named load (synchronous flag is unset)</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onload" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-load" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onload" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-load" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol/li[6]" />
 <div id="log"></div>
 
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadstart.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadstart.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadstart.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-loadstart.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <title>XMLHttpRequest: loadstart event</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-progress.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-progress.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-progress.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-progress.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,11 +4,11 @@
 <title>XMLHttpRequest: The send() method: Fire a progress event named progress (synchronous flag is unset)</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onprogress" data-tested-assertations="../.." />
-<link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-progress" data-tested-assertations="../.." />
-<link rel="help" href="http://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::*//a[contains(@href,'#make-progress-notifications')]" />
-<link rel="help" href="http://xhr.spec.whatwg.org/#make-progress-notifications" data-tested-assertations=".." />
-<link rel="help" href="http://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::li[5]" />
+<link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
+<link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-progress" data-tested-assertations="../.." />
+<link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::*//a[contains(@href,'#make-progress-notifications')]" />
+<link rel="help" href="https://xhr.spec.whatwg.org/#make-progress-notifications" data-tested-assertations=".." />
+<link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::li[5]" />
 <div id="log"></div>
 <script>
   var test = async_test();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-readystatechange-loaded.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-readystatechange-loaded.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-readystatechange-loaded.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-readystatechange-loaded.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,9 +5,9 @@
     <title>XMLHttpRequest: the LOADING state change should only happen once</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[10]/dt[1]">
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[7] following::a[contains(@href,'#switch-loading')]/..">
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-loading" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]">
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[10]/dt[1]">
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[7] following::a[contains(@href,'#switch-loading')]/..">
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-loading" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]">
 </head>
 
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-timeout.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-timeout.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-timeout.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-timeout.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,11 +4,11 @@
     <title>XMLHttpRequest: timeout event</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-ontimeout" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-timeout" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#timeout-error" data-tested-assertations=".." />
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-timeout" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress-crossorigin.sub.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress-crossorigin.sub.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress-crossorigin.sub.htm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress-crossorigin.sub.htm	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,26 @@
+<!doctype html>
+<html lang=en>
+<meta charset=utf-8>
+<title>XMLHttpRequest: upload progress event for cross-origin requests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::*//a[contains(@href,'#make-upload-progress-notifications')] following::ol[1]/li[8]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations=".. ../following::ul/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-upload" data-tested-assertations=".." />
+
+<div id="log"></div>
+<script>
+  var test = async_test();
+  test.step(function() {
+    var client = new XMLHttpRequest();
+    client.upload.onprogress = test.step_func(function() {
+      test.done();
+    });
+    client.onload = test.step_func(function() {
+      assert_unreached("onprogress not called.");
+    });
+    client.open("POST", "http://{{domains[www2]}}:{{ports[http][0]}}/XMLHttpRequest/resources/corsenabled.py");
+    client.send("This is a test string.");
+  });
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/event-upload-progress.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,10 +4,10 @@
 <title>XMLHttpRequest: upload progress event</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onprogress" data-tested-assertations="../.." />
-    <link rel="help" href="http://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::*//a[contains(@href,'#make-upload-progress-notifications')] following::ol[1]/li[8]" />
-    <link rel="help" href="http://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations=".. ../following::ul/li[1]" />
-    <link rel="help" href="http://xhr.spec.whatwg.org/#dom-xmlhttprequest-upload" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::*//a[contains(@href,'#make-upload-progress-notifications')] following::ol[1]/li[8]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations=".. ../following::ul/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-upload" data-tested-assertations=".." />
 
 <div id="log"></div>
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/FormData-append.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/FormData-append.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/FormData-append.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/FormData-append.html	2014-11-26 21:45:53.000000000 +0000
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>FormData.append</title>
-<link rel=help href=http://xhr.spec.whatwg.org/#dom-formdata-append>
+<link rel=help href=https://xhr.spec.whatwg.org/#dom-formdata-append>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <div id=log></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata-blob.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata-blob.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata-blob.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata-blob.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,11 +4,11 @@
 <title>XMLHttpRequest: upload formdata with blob</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#interface-formdata" data-tested-assertations="following::P[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-formdata" data-tested-assertations="following::P[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-formdata-append" data-tested-assertations=".. following::P[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-formdata-append" data-tested-assertations="following::P[2] following::UL[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-FormData" data-tested-assertations="following::DD[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#interface-formdata" data-tested-assertations="following::P[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata" data-tested-assertations="following::P[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-append" data-tested-assertations=".. following::P[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-append" data-tested-assertations="following::P[2] following::UL[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-FormData" data-tested-assertations="following::DD[1]" />
 <div id="log"></div>
 <script>
   function do_test (name, fd, expected) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/formdata.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,10 +4,10 @@
 <title>XMLHttpRequest: upload formdata</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#interface-formdata" data-tested-assertations="following::P[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-formdata" data-tested-assertations=".. following::P[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-formdata-append" data-tested-assertations=".. following::UL[1]/LI[1] following::UL[1]/LI[2] following::UL[1]/LI[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-FormData" data-tested-assertations="following::DD[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#interface-formdata" data-tested-assertations="following::P[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata" data-tested-assertations=".. following::P[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-formdata-append" data-tested-assertations=".. following::UL[1]/LI[1] following::UL[1]/LI[2] following::UL[1]/LI[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-FormData" data-tested-assertations="following::DD[1]" />
 <div id="log"></div>
 <form id="form">
   <input type="hidden" name="key" value="value">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-cookies.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-cookies.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-cookies.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-cookies.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getAllResponseHeaders() excludes cookies</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="/following::OL[1]/LI[1] /following::OL[1]/LI[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="/following::OL[1]/LI[1] /following::OL[1]/LI[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-status.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-status.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-status.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getallresponseheaders-status.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getAllResponseHeaders() excludes status</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="/following::OL[1]/LI[1] /following::OL[1]/LI[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getallresponseheaders" data-tested-assertations="/following::OL[1]/LI[1] /following::OL[1]/LI[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-case-insensitive.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-case-insensitive.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-case-insensitive.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-case-insensitive.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() case-insensitive matching</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::OL[1]/LI[4] following::OL[1]/LI[5] following::OL[1]/LI[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::OL[1]/LI[4] following::OL[1]/LI[5] following::OL[1]/LI[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() and HTTP trailer</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[4] /following::OL[1]/LI[5] /following::OL[1]/LI[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[4] /following::OL[1]/LI[5] /following::OL[1]/LI[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-cookies-and-more.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() custom/non-existent headers and cookies</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[5] following::OL[1]/LI[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[5] following::OL[1]/LI[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-error-state.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-error-state.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-error-state.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-error-state.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() in error state (failing cross-origin test)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::OL[1]/LI[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="following::OL[1]/LI[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-server-date.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-server-date.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-server-date.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-server-date.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() server and date</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[4] /following::OL[1]/LI[5] /following::OL[1]/LI[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[4] /following::OL[1]/LI[5] /following::OL[1]/LI[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-special-characters.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-special-characters.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-special-characters.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-special-characters.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() funny characters</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[5] /following::OL[1]/LI[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[5] /following::OL[1]/LI[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/getresponseheader-unsent-opened-state.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: getResponseHeader() in unsent, opened states</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-getresponseheader" data-tested-assertations="/following::OL[1]/LI[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/interfaces.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/interfaces.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/interfaces.html	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/interfaces.html	2014-11-26 21:45:53.000000000 +0000
@@ -10,9 +10,42 @@
 <div id=log></div>
 
 <script type=text/plain class=untested>
+[Constructor(DOMString type, optional EventInit eventInitDict)/*,
+ Exposed=(Window,Worker)*/]
+interface Event {
+  readonly attribute DOMString type;
+  readonly attribute EventTarget? target;
+  readonly attribute EventTarget? currentTarget;
+
+  const unsigned short NONE = 0;
+  const unsigned short CAPTURING_PHASE = 1;
+  const unsigned short AT_TARGET = 2;
+  const unsigned short BUBBLING_PHASE = 3;
+  readonly attribute unsigned short eventPhase;
+
+  void stopPropagation();
+  void stopImmediatePropagation();
+
+  readonly attribute boolean bubbles;
+  readonly attribute boolean cancelable;
+  void preventDefault();
+  readonly attribute boolean defaultPrevented;
+
+  [Unforgeable] readonly attribute boolean isTrusted;
+  readonly attribute DOMTimeStamp timeStamp;
+
+  void initEvent(DOMString type, boolean bubbles, boolean cancelable);
+};
+
+dictionary EventInit {
+  boolean bubbles = false;
+  boolean cancelable = false;
+};
+
+/*[Exposed=(Window,Worker)]*/
 interface EventTarget {
-  void addEventListener(DOMString type, EventListener? callback, optional boolean capture /* = false */);
-  void removeEventListener(DOMString type, EventListener? callback, optional boolean capture /* = false */);
+  void addEventListener(DOMString type, EventListener? callback, optional boolean capture = false);
+  void removeEventListener(DOMString type, EventListener? callback, optional boolean capture = false);
   boolean dispatchEvent(Event event);
 };
 </script>
@@ -22,7 +55,8 @@
 typedef EventHandlerNonNull? EventHandler;
 </script>
 <script type=text/plain>
-[NoInterfaceObject]
+[NoInterfaceObject/*,
+ Exposed=(Window,Worker)*/]
 interface XMLHttpRequestEventTarget : EventTarget {
   // event handlers
   attribute EventHandler onloadstart;
@@ -34,6 +68,7 @@
   attribute EventHandler onloadend;
 };
 
+/*[Exposed=(Window,Worker)]*/
 interface XMLHttpRequestUpload : XMLHttpRequestEventTarget {
 };
 
@@ -46,7 +81,8 @@
   "text"
 };
 
-[Constructor]
+[Constructor/*,
+ Exposed=(Window,Worker)*/]
 interface XMLHttpRequest : XMLHttpRequestEventTarget {
   // event handler
   attribute EventHandler onreadystatechange;
@@ -60,16 +96,17 @@
   readonly attribute unsigned short readyState;
 
   // request
-  void open(ByteString method, /*[EnsureUTF16]*/ DOMString url);
-  void open(ByteString method, /*[EnsureUTF16]*/ DOMString url, boolean async, optional /*[EnsureUTF16]*/ DOMString? username = null, optional /*[EnsureUTF16]*/ DOMString? password = null);
+  void open(ByteString method, USVString url);
+  void open(ByteString method, USVString url, boolean async, optional USVString? username = null, optional USVString? password = null);
   void setRequestHeader(ByteString name, ByteString value);
            attribute unsigned long timeout;
            attribute boolean withCredentials;
   readonly attribute XMLHttpRequestUpload upload;
-  void send(optional (ArrayBufferView or Blob or Document or /*[EnsureUTF16]*/ DOMString or FormData or URLSearchParams)? data = null);
+  void send(optional (Document or BodyInit)? body = null);
   void abort();
 
   // response
+  readonly attribute USVString responseURL;
   readonly attribute unsigned short status;
   readonly attribute ByteString statusText;
   ByteString? getResponseHeader(ByteString name);
@@ -77,19 +114,38 @@
   void overrideMimeType(DOMString mime);
            attribute XMLHttpRequestResponseType responseType;
   readonly attribute any response;
-  readonly attribute DOMString responseText;
-  readonly attribute Document? responseXML;
+  readonly attribute USVString responseText;
+  [Exposed=Window] readonly attribute Document? responseXML;
 };
 
+typedef (File or USVString) FormDataEntryValue;
+
+[Constructor(optional HTMLFormElement form)/*,
+ Exposed=(Window,Worker)*/]
 interface FormData {
-  void append(/*[EnsureUTF16]*/ DOMString name, Blob value, optional /*[EnsureUTF16]*/ DOMString filename);
-  void append(/*[EnsureUTF16]*/ DOMString name, /*[EnsureUTF16]*/ DOMString value);
-  void delete(/*[EnsureUTF16]*/ DOMString name);
-  FormDataEntryValue? get(/*[EnsureUTF16]*/ DOMString name);
-  sequence<FormDataEntryValue> getAll(/*[EnsureUTF16]*/ DOMString name);
-  boolean has(/*[EnsureUTF16]*/ DOMString name);
-  void set(/*[EnsureUTF16]*/ DOMString name, Blob value, optional /*[EnsureUTF16]*/ DOMString filename);
-  void set(/*[EnsureUTF16]*/ DOMString name, /*[EnsureUTF16]*/ 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>;*/
+};
+
+[Constructor(DOMString type, optional ProgressEventInit eventInitDict)/*,
+ Exposed=(Window,Worker)*/]
+interface ProgressEvent : Event {
+  readonly attribute boolean lengthComputable;
+  readonly attribute unsigned long long loaded;
+  readonly attribute unsigned long long total;
+};
+
+dictionary ProgressEventInit : EventInit {
+  boolean lengthComputable = false;
+  unsigned long long loaded = 0;
+  unsigned long long total = 0;
 };
 </script>
 <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-abort.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-abort.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-abort.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-abort.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() after abort()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[15] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[15] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-setrequestheader.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-setrequestheader.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-setrequestheader.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-after-setrequestheader.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() after setRequestHeader()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[4]" />
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-bogus.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-bogus.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-bogus.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-bogus.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - bogus methods</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-insensitive.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-insensitive.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-insensitive.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-insensitive.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - case-insensitive methods test</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[5]" />
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-sensitive.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-sensitive.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-sensitive.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-case-sensitive.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - case-sensitive methods test</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[5]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-insecure.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-insecure.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-insecure.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-insecure.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - "insecure" methods</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[5] following::ol/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[5] following::ol/li[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-responsetype-set-sync.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-responsetype-set-sync.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-responsetype-set-sync.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-method-responsetype-set-sync.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() sync request not allowed if responseType is set</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[4]" />
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-send.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-send.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-send.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-send.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - open() - send()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[1] following::ol/li[14]/ul/li[2] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[1] following::ol/li[14]/ul/li[2] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-sync-send.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-sync-send.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-sync-send.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-open-sync-send.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - open() (sync) - send()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[1] following::ol/li[14]/ul/li[2] following::ol/li[14]/ul/li[3] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[1] following::ol/li[14]/ul/li[2] following::ol/li[14]/ul/li[3] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-referer.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-referer.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-referer.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-referer.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - value of Referer header</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="/following::ol[1]/li[2]/ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="/following::ol[1]/li[2]/ol[1]/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-send-open.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-send-open.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-send-open.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-send-open.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - send() - open()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[1] following::ol/li[14]/ul/li[2] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[14]/ul/li[1] following::ol/li[14]/ul/li[2] following::ol/li[15]/ol/li[1] following::ol/li[15]/ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-sync-open-send.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-sync-open-send.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-sync-open-send.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-sync-open-send.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,12 +4,12 @@
     <title>XMLHttpRequest: open() (sync) - send() - open()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[14]/ul/li[1] following::ol[1]/li[14]/ul/li[2] following::ol[1]/li[14]/ul/li[3] following::ol[1]/li[15]/ol/li[1] following::ol[1]/li[15]/ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol[1]/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol[1]/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getallresponseheaders()-method" data-tested-assertations="following::ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[14]/ul/li[1] following::ol[1]/li[14]/ul/li[2] following::ol[1]/li[14]/ul/li[3] following::ol[1]/li[15]/ol/li[1] following::ol[1]/li[15]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getallresponseheaders()-method" data-tested-assertations="following::ol[1]/li[1]" />
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-about-blank-window.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-about-blank-window.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-about-blank-window.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-about-blank-window.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <title>XMLHttpRequest: open() resolving URLs (about:blank iframe)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#concept-xmlhttprequest-document" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#concept-xmlhttprequest-document" data-tested-assertations=".." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <base href="./resources/">
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted-after-open.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted-after-open.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted-after-open.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted-after-open.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: open() resolving URLs - insert &lt;base> after open()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-base-inserted.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: open() resolving URLs - insert &lt;base></title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[2]/ol/li[2] following::ol/li[7] following::ol/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-bogus.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-bogus.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-bogus.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-bogus.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - bogus URLs</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[7] following::ol/li[8]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[7] following::ol/li[8]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-encoding.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-encoding.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-encoding.htm	2014-11-14 09:37:17.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-encoding.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <title>XMLHttpRequest: open() - URL encoding</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[7] following::ol/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[7] following::ol/li[14]/ul/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-fragment.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-fragment.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-fragment.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-fragment.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() resolving URLs - fragment identifier</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[7]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window-2.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window-2.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window-2.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window-2.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - resolving URLs (javascript: &lt;iframe>; 2)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[2] following::ol[1]/li[7] following::ol[1]/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[2] following::ol[1]/li[7] following::ol[1]/li[14]/ul/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-javascript-window.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - resolving URLs (javascript: &lt;iframe>; 1)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[2] following::ol[1]/li[7] following::ol[1]/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[2] following::ol[1]/li[7] following::ol[1]/li[14]/ul/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-2.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-2.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-2.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-2.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() resolving URLs (multi-Window; 2; evil)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-5.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-5.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-5.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-5.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() resolving URLs (multi-Window; 5)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() resolving URLs (multi-Window; 1)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[2] following::ol[1]/li[7] following::ol[1]/li[14]/ul/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[2] following::ol[1]/li[7] following::ol[1]/li[14]/ul/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-origin.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-origin.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-origin.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-origin.htm	2014-11-26 21:45:53.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[3]/ol[1]/li[1] following::OL[1]/LI[3]/ol[1]/li[2] following::OL[1]/LI[3]/ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[3]/ol[1]/li[1] following::OL[1]/LI[3]/ol[1]/li[2] following::OL[1]/LI[3]/ol[1]/li[3]" />
 </head>
 <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-simple.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-simple.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-simple.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-url-worker-simple.htm	2014-11-26 21:45:53.000000000 +0000
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[3]/ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[3]/ol[1]/li[1]" />
 </head>
 <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-user-password-non-same-origin.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-user-password-non-same-origin.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/open-user-password-non-same-origin.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/open-user-password-non-same-origin.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: open() - user/pass argument and non same-origin URL doesn't throw</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[9]/ol/li[1] following::ol/li[9]/ol/li[2] following::ol/li[15]/ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[9]/ol/li[1] following::ol/li[9]/ol/li[2] following::ol/li[15]/ol/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-done-state.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-done-state.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-done-state.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-done-state.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1] /following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1] /following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-invalid-mime-type.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-loading-state.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-loading-state.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-loading-state.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-loading-state.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-open-state-force-xml.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[3] /following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/progress-events-response-data-gzip.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/progress-events-response-data-gzip.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/progress-events-response-data-gzip.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/progress-events-response-data-gzip.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://www.w3.org/TR/progress-events/#firing-events-using-the-progressevent-interface-for-http" data-tested-assertations="following::p[contains(text(),'content-encodings')]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#firing-events-using-the-progressevent-interface-for-http" data-tested-assertations="following::p[contains(text(),'content-encodings')]" />
     <!-- TODO: find better spec reference when https://www.w3.org/Bugs/Public/show_bug.cgi?id=25587 is fixed -->
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth1/auth.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth1/auth.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth1/auth.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth1/auth.py	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth2/auth.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth2/auth.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth2/auth.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth2/auth.py	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth3/auth.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth3/auth.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth3/auth.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth3/auth.py	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth4/auth.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth4/auth.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth4/auth.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/auth4/auth.py	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/chunked.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/chunked.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/chunked.py	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/chunked.py	2014-11-26 21:45:53.000000000 +0000
@@ -7,7 +7,7 @@
     response.headers.set("Transfer-Encoding", "chunked");
     response.headers.set("Trailer", "X-Test-Me");
     response.headers.set("Content-Type", "text/plain");
-    response.writer.flush()
+    response.write_status_headers()
 
     for value in chunks:
         response.writer.write("%d\r\n" % len(value))
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js	2014-11-26 21:45:53.000000000 +0000
@@ -1,5 +1,5 @@
 /* Test adapted from Alex Vincent's XHR2 timeout tests, written for Mozilla.
-   https://hg.mozilla.org/mozilla-central/file/tip/dom/base/test/
+   https://hg.mozilla.org/mozilla-central/file/tip/content/base/test/
    Released into the public domain or under BSD, according to
    https://bugzilla.mozilla.org/show_bug.cgi?id=525816#c86
 */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-arraybuffer.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-arraybuffer.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-arraybuffer.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-arraybuffer.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute" data-tested-assertations="following::ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following::a[contains(@href,'#arraybuffer-response-entity-body')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="following::a[contains(@href,'#arraybuffer-response-entity-body')]/.." />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The response attribute: ArrayBuffer data</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-blob.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-blob.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-blob.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-blob.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute"  data-tested-assertations="following::ol[1]/li[4]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::a[contains(@href,'#blob-response-entity-body')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute"  data-tested-assertations="following::ol[1]/li[4]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute"  data-tested-assertations="following::a[contains(@href,'#blob-response-entity-body')]/.." />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The response attribute: Blob data</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-progress.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-progress.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-progress.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-data-progress.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,10 +5,10 @@
     <title>XMLHttpRequest: progress events grow response body size</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-progress-notifications')]/.. following::a[contains(@href,'#make-progress-notifications')]/../following:p[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#make-progress-notifications" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onprogress" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-progress" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-progress-notifications')]/.. following::a[contains(@href,'#make-progress-notifications')]/../following:p[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-progress-notifications" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-progress" data-tested-assertations="/../.." />
 </head>
 
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-invalid-responsetype.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-invalid-responsetype.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-invalid-responsetype.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-invalid-responsetype.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: response is plain text if responseType is set to an invalid string</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following::dd[2]/ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute" data-tested-assertations="following::ol[1]/li[4]" /><!-- Not quite - but this is handled in WebIDL, not the XHR spec -->
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="following::dd[2]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute" data-tested-assertations="following::ol[1]/li[4]" /><!-- Not quite - but this is handled in WebIDL, not the XHR spec -->
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-json.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-json.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/response-json.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/response-json.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,9 +5,9 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-        <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute" data-tested-assertations="following::OL[1]/LI[4]" />
-        <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following::dt[2]/dt[4] following::dt[2]/dt[4]/following::dd[1]" />
-        <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#json-response-entity-body" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2] following::ol[1]/li[3]" />
+        <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute" data-tested-assertations="following::OL[1]/LI[4]" />
+        <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="following::dt[2]/dt[4] following::dt[2]/dt[4]/following::dd[1]" />
+        <link rel="help" href="https://xhr.spec.whatwg.org/#json-response-entity-body" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2] following::ol[1]/li[3]" />
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetext-decoding.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetext-decoding.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetext-decoding.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetext-decoding.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: responseText decoding</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#text-response-entity-body" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#text-response-entity-body" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[5]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetype.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetype.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetype.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsetype.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,7 +3,7 @@
 <title>XMLHttpRequest.responseType</title>
 <link rel="author" title="Mathias Bynens" href="http://mathiasbynens.be/">
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="http://xhr.spec.whatwg.org/#the-responsetype-attribute">
+<link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-basic.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-basic.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-basic.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-basic.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: responseXML basic test</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#document-response-entity-body" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[6] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#document-response-entity-body" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[6] following::ol[1]/li[10]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-document-properties.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-document-properties.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-document-properties.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-document-properties.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: responseXML document properties</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#document-response-entity-body" data-tested-assertations="following::ol[1]/li[6] following::ol[1]/li[7] following::ol[1]/li[8] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#document-response-entity-body" data-tested-assertations="following::ol[1]/li[6] following::ol[1]/li[7] following::ol[1]/li[8] following::ol[1]/li[10]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-media-type.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-media-type.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-media-type.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-media-type.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: responseXML MIME type tests</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#document-response-entity-body" data-tested-assertations="following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#document-response-entity-body" data-tested-assertations="following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[10]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-document-types.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-document-types.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-document-types.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-document-types.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <title>XMLHttpRequest: responseXML/responseText on other responseType</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute" data-tested-assertations="following::ol[1]/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-well-formed.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-well-formed.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-well-formed.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/responsexml-non-well-formed.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: responseXML non well-formed tests</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#document-response-entity-body" data-tested-assertations="following::ol[1]/li[6] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#document-response-entity-body" data-tested-assertations="following::ol[1]/li[6] following::ol[1]/li[10]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Accept</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(text(),'*/*')]/.. following::code[contains(text(),'Accept')]/.. following::code[contains(text(),'Accept')]/../following::ul[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(text(),'*/*')]/.. following::code[contains(text(),'Accept')]/.. following::code[contains(text(),'Accept')]/../following::ul[1]/li[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept-language.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept-language.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept-language.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-accept-language.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Accept-Language</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(text(),'Accept-Language')]/.. following::code[contains(text(),'Accept-Language')]/../following::ul[1]/li[1] following::code[contains(text(),'Accept-Language')]/../following::ul[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(text(),'Accept-Language')]/.. following::code[contains(text(),'Accept-Language')]/../following::ul[1]/li[1] following::code[contains(text(),'Accept-Language')]/../following::ul[1]/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-after-setting-document-domain.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-after-setting-document-domain.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-after-setting-document-domain.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-after-setting-document-domain.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- The spec doesn't seem to explicitly cover this case (as of June 2013) -->
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[2]/ol[1]/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: send() - "Basic" authenticated CORS requests with user name and password passed to open() (asserts failure)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-cors-not-enabled.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-repeat-no-args.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader-existing-session.htm	2014-11-26 21:45:53.000000000 +0000
@@ -6,8 +6,8 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- These spec references do not make much sense simply because the spec doesn't say very much about this.. -->
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-basic-setrequestheader.htm	2014-11-26 21:45:53.000000000 +0000
@@ -6,8 +6,8 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- These spec references do not make much sense simply because the spec doesn't say very much about this.. -->
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-competing-names-passwords.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />  </head>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[9]/ol[1]/li[1] following::ol[1]/li[9]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />  </head>
   <body>
     <div id="log"></div>
     <script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm	2014-11-26 21:45:53.000000000 +0000
@@ -6,8 +6,8 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- These spec references do not make much sense simply because the spec doesn't say very much about this.. -->
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="following::ol[1]/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-existing-session-manual.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-existing-session-manual.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-existing-session-manual.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-existing-session-manual.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <p>Please follow these steps to complete the test:</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-2-manual.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-2-manual.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-2-manual.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-2-manual.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: WWW-Authenticate challenge when user,pass are not passed to open()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <p>Please follow these steps to complete the test:</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-manual.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-manual.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-manual.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-authentication-prompt-manual.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - "Basic" authentication gets 401 response</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(@title,'http-authorization')]/.." />
   </head>
   <body>
     <p>Please follow these steps to complete the test:</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-conditional.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-conditional.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-conditional.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-conditional.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - conditional requests</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::code[contains(text(),'Modified')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::code[contains(text(),'Modified')]/.." />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-charset.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-charset.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-charset.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-charset.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: send() - charset parameter of Content-Type</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[4]/p/code[contains(text(),'Content-Type')]/.. following::ol[1]/li[4]/p/code[contains(text(),'Content-Type')]/../following-sibling::p" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-a-string" data-tested-assertations="following::p[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[4]/p/code[contains(text(),'Content-Type')]/.. following::ol[1]/li[4]/p/code[contains(text(),'Content-Type')]/../following-sibling::p" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-a-string" data-tested-assertations="following::p[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-string.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-string.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-string.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-content-type-string.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Content-Type</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-document" data-tested-assertations="following::p[1] following::p[2] following::p[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-document" data-tested-assertations="following::p[1] following::p[2] following::p[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-arraybuffer.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-arraybuffer.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-arraybuffer.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-arraybuffer.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method"  data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[1]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method"  data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[1]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: ArrayBuffer data</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-blob.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-blob.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-blob.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-blob.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[2]/p[3]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetype-attribute"  data-tested-assertations="following::ol[1]/li[4]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::a[contains(@href,'#blob-response-entity-body')]/.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[2]/p[3]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetype-attribute"  data-tested-assertations="following::ol[1]/li[4]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute"  data-tested-assertations="following::a[contains(@href,'#blob-response-entity-body')]/.."/>
 
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-es-object.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-es-object.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-es-object.htm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-es-object.htm	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,61 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>XMLHttpRequest: passing objects to send()</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol/li[4]" />
+<link rel="help" href="https://heycam.github.io/webidl/#es-union" data-tested-assertations="following::ol/li[16]" />
+
+<div id="log"></div>
+
+<script>
+  function do_test(obj, expected, name) {
+    var test = async_test(name)
+    test.step(function() {
+      var client = new XMLHttpRequest()
+      client.onload = test.step_func(function () {
+        assert_equals(client.responseText, expected)
+        test.done()
+      });
+      client.open('POST', 'resources/content.py')
+      if (expected.exception) {
+        assert_throws(expected.exception, function(){client.send(obj)})
+        test.done()
+      } else {
+        client.send(obj)
+      }
+    });
+  }
+
+  do_test({}, '[object Object]', 'sending a plain empty object')
+  do_test(Math, '[object Math]', 'sending the ES Math object')
+  do_test(new XMLHttpRequest, '[object XMLHttpRequest]', 'sending a new XHR instance')
+  do_test({toString:function(){}}, 'undefined', 'sending object that stringifies to undefined')
+  do_test({toString:function(){return null}}, 'null', 'sending object that stringifies to null')
+  var ancestor = {toString: function(){
+    var ar=[]
+    for (var prop in this) {
+      if (this.hasOwnProperty(prop)) {
+        ar.push(prop+'='+this[prop])
+      }
+    };
+    return ar.join('&')
+  }};
+
+  var myObj = Object.create(ancestor, {foo:{value:1, enumerable: true},  bar:{value:'foo', enumerable:true}})
+  do_test(myObj, 'foo=1&bar=foo', 'object that stringifies to query string')
+
+  var myFakeJSON = {a:'a', b:'b', toString:function(){ return JSON.stringify(this, function(key, val){ return key ==='toString'?undefined:val; }) }}
+  do_test(myFakeJSON, '{"a":"a","b":"b"}', 'object that stringifies to JSON string')
+
+  var myFakeDoc1 = {valueOf:function(){return document}}
+  do_test(myFakeDoc1, '[object Object]', 'object whose valueOf() returns a document - ignore valueOf(), stringify')
+
+  var myFakeDoc2 = {toString:function(){return document}}
+  do_test(myFakeDoc2, {exception:new TypeError()}, 'object whose toString() returns a document, expected to throw')
+
+  var myThrower = {toString:function(){throw {name:'FooError', message:'bar'}}}
+  do_test(myThrower, {exception:{name:'FooError'}}, 'object whose toString() throws, expected to throw')
+
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-formdata.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-formdata.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-formdata.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-formdata.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#interface-formdata" data-tested-assertations="following::*[contains(@id,'dom-formdata')]/following::ol[1]/li[1] following::*[contains(@id,'dom-formdata')]/following::ol[1]/li[3] following::*[contains(@id,'dom-formdata-append')]/following::ul[1]/li[1] following::*[contains(@id,'dom-formdata-append')]/following::ul[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[4]/dl[1]/dd[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#interface-formdata" data-tested-assertations="following::*[contains(@id,'dom-formdata')]/following::ol[1]/li[1] following::*[contains(@id,'dom-formdata')]/following::ol[1]/li[3] following::*[contains(@id,'dom-formdata-append')]/following::ul[1]/li[1] following::*[contains(@id,'dom-formdata-append')]/following::ul[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute"  data-tested-assertations="following::ol[1]/li[3]"/>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XmlHttpRequest: The send() method: FormData data</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-unexpected-tostring.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-unexpected-tostring.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-unexpected-tostring.htm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-data-unexpected-tostring.htm	2014-11-26 21:45:53.000000000 +0000
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>XMLHttpRequest: passing objects that interfere with the XHR instance to send()</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol/li[4]" />
+<link rel="help" href="https://heycam.github.io/webidl/#es-union" data-tested-assertations="following::ol/li[16]" />
+
+
+<div id="log"></div>
+
+<script>
+  var test1 = async_test('abort() called from data stringification')
+  test1.step(function() {
+    var client = new XMLHttpRequest()
+    var objAbortsOnStringification = {toString:function(){
+      client.abort();
+    }}
+    client.open('POST', 'resources/content.py')
+    assert_throws("InvalidStateError", function(){
+      client.send(objAbortsOnStringification)
+    })
+    test1.done()
+  });
+
+  var test2 = async_test('open() called from data stringification')
+  test2.step(function() {
+    var client = new XMLHttpRequest()
+    var objOpensOnStringification = {toString:function(){
+      client.open('POST', 'resources/status.py?text=second_open_wins');
+    }}
+    client.onloadend = test2.step_func(function(){
+      assert_equals(client.statusText, 'second_open_wins')
+      test2.done()
+    })
+    client.open('POST', 'resources/status.py?text=first_open_wins')
+    client.send(objOpensOnStringification)
+  });
+
+  var test3 = async_test('send() called from data stringification')
+  test3.step(function() {
+    var client = new XMLHttpRequest()
+    var objSendsOnStringification = {toString:function(){
+      client.send('bomb!');
+    }}
+    client.onload = test3.step_func(function(){
+      assert_equals(client.responseText, 'bomb!')
+      test3.done()
+    })
+    client.open('POST', 'resources/content.py')
+    assert_throws('InvalidStateError', function(){
+      client.send(objSendsOnStringification)
+    })
+  });
+
+
+</script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-basic.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-basic.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-basic.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-basic.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: send() - data argument</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="/following::ol/li[4]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-a-string" data-tested-assertations="/following::dd" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="/following::ol/li[4]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-a-string" data-tested-assertations="/following::dd" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document-bogus.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document-bogus.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document-bogus.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document-bogus.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - unserializable Document</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-document" data-tested-assertations="following::p[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-document" data-tested-assertations="following::p[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-document.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="/following::ol/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-document" data-tested-assertations="/following::dd" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="/following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-document" data-tested-assertations="/following::dd" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-empty.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-empty.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-empty.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-empty.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: send("") - empty entity body</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[7]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-XMLHttpRequest-send-a-string" data-tested-assertations="following::p[1] following::p[2] following::p[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-XMLHttpRequest-send-a-string" data-tested-assertations="following::p[1] following::p[2] following::p[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head-async.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head-async.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head-async.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head-async.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - non-empty data argument and GET/HEAD - async, no upload events should fire</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-        <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[7] following::OL[1]/LI[8]" />  
+        <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[7] following::OL[1]/LI[8]" />  
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-get-head.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - non-empty data argument and GET/HEAD</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-        <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[7]" />  
+        <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::OL[1]/LI[3] following::OL[1]/LI[7]" />  
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-none.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-none.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-none.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-entity-body-none.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send(null) - no entity body</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[7]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-async-events.sub.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-async-events.sub.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-async-events.sub.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-async-events.sub.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onerror" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[9]/ol/li[2] following::ol[1]/li[9]/ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[4] following::dd[4]/p" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7] following::ol[1]/li[7]/ol/li[3] following::ol[1]/li[7]/ol/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onerror" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[9]/ol/li[2] following::ol[1]/li[9]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[4] following::dd[4]/p" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#network-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7] following::ol[1]/li[7]/ol/li[3] following::ol[1]/li[7]/ol/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XmlHttpRequest: The send() method: Fire a progress event named error when Network error happens (synchronous flag is unset)</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-sync-events.sub.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-sync-events.sub.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-sync-events.sub.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-network-error-sync-events.sub.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[4] following::dd[4]/p" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[4] following::dd[4]/p" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#network-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[5]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set)</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-non-same-origin.sub.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-non-same-origin.sub.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-non-same-origin.sub.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-non-same-origin.sub.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,8 +5,8 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <base href="http://{{domains[www2]}}:{{ports[http][0]}}">
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#cross-origin-request-steps" data-tested-assertations="/following::DL[2]/DT[1] /following::DL[2]/DD[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#cross-origin-request-event-rules" data-tested-assertations="/following::DL[1]/DT[2] /following::DL[1]/DD[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#cross-origin-request-steps" data-tested-assertations="/following::DL[2]/DT[1] /following::DL[2]/DD[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#cross-origin-request-event-rules" data-tested-assertations="/following::DL[1]/DT[2] /following::DL[1]/DD[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadend.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadend.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadend.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadend.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: Fire a progress event named loadend (no response entity body)</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[10] /following-sibling::ol/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[10] /following-sibling::ol/li[10]" />
 </head>
 
 <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadstart.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadstart.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadstart.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-loadstart.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="/../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="/following-sibling::ol/li[9]/ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="/following-sibling::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="/../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="/following-sibling::ol/li[9]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="/following-sibling::ol/li[1]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: Fire a progress event named loadstart (no response entity body and the state is LOADING)</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-order.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-order.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-order.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-no-response-event-order.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[10] following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following-sibling::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[10] following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="following-sibling::ol/li[1]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: event order when there is no response entity body</title>
@@ -26,7 +26,7 @@
             var expect = ["loadstart", 4, "load", "loadend"];
             var actual = [];
 
-            xhr.onreadystatechange = function()
+            xhr.onreadystatechange = test.step_func(function()
             {
                 test.step(function()
                 {
@@ -39,24 +39,19 @@
                         actual.push(xhr.readyState);
                     }
                 });
-            };
+            });
 
-            xhr.onloadstart        = function(e){ actual.push(e.type); };
-            xhr.onload             = function(e){ actual.push(e.type); };
-            xhr.onloadend          = function(e){ actual.push(e.type); VerifyResult()};
-
-            xhr.upload.onloadstart = function(e){ assert_unreached('upload.'+e.type); };
-            xhr.upload.onload      = function(e){ assert_unreached('upload.'+e.type); };
-            xhr.upload.onloadend   = function(e){ assert_unreached('upload.'+e.type); };
-
-            function VerifyResult()
-            {
-                test.step(function()
-                {
-                    assert_array_equals(actual, expect);
-                    test.done();
-                });
-            };
+            xhr.onloadstart        = test.step_func(function(e){ actual.push(e.type); });
+            xhr.onload             = test.step_func(function(e){ actual.push(e.type); });
+            xhr.onloadend          = test.step_func(function(e){
+                actual.push(e.type);
+                assert_array_equals(actual, expect);
+                test.done();
+            });
+
+            xhr.upload.onloadstart = test.step_func(function(e){ assert_unreached('upload.'+e.type); });
+            xhr.upload.onload      = test.step_func(function(e){ assert_unreached('upload.'+e.type); });
+            xhr.upload.onloadend   = test.step_func(function(e){ assert_unreached('upload.'+e.type); });
 
             xhr.open("POST", "./resources/content.py", true);
             xhr.send();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <meta name=timeout content=long>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus-sync.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus-sync.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus-sync.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-bogus-sync.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Redirects (bogus Location header; sync)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Redirects (basics)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,11 +4,11 @@
     <title>XMLHttpRequest: send() - Redirects (infinite loop)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onerror" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/p[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onerror" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/p[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#network-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite-sync.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite-sync.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite-sync.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-infinite-sync.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <title>XMLHttpRequest: send() - Redirects (infinite loop; sync)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/p[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/p[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#network-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[5]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-no-location.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-no-location.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-no-location.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-no-location.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Redirects (no Location header)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2]" />
     <!-- 
       NOTE: the XHR spec does not really handle this scenario. It's handled in the Fetch spec:
       "If response's headers do not contain a header whose name is Location, return response."
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-cors.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-cors.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-cors.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-cors.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Redirect to CORS-enabled resource</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-non-cors.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-non-cors.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-non-cors.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-redirect-to-non-cors.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-event-order.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-event-order.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-event-order.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-event-order.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2] following-sibling::ol/li[9]/ol/li[3] following::a[contains(@href,'#make-upload-progress-notifications')]/.. following::a[contains(@href,'#make-progress-notifications')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[1] following::ul[1]/li[2]/ol[1]/li[2] following::ul[1]/li[2]/ol[1]/li[3] following::ul[1]/li[2]/ol[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#make-progress-notifications" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[5] following::ol[1]/li[6] following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]/ol/li[2] following-sibling::ol/li[9]/ol/li[3] following::a[contains(@href,'#make-upload-progress-notifications')]/.. following::a[contains(@href,'#make-progress-notifications')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[1] following::ul[1]/li[2]/ol[1]/li[2] following::ul[1]/li[2]/ol[1]/li[3] following::ul[1]/li[2]/ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-progress-notifications" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[5] following::ol[1]/li[6] following::ol[1]/li[7]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: event order when synchronous flag is unset</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadend.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadend.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadend.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadend.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-upload-progress-notifications')]/.. following::ol[1]/li[8]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[2]/ol[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-upload-progress-notifications')]/.. following::ol[1]/li[8]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[2]/ol[1]/li[4]" />
 
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadstart.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadstart.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadstart.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-loadstart.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol[1]/li[8] following-sibling::ol/li[9]/ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol[1]/li[8] following-sibling::ol/li[9]/ol/li[3]" />
 
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-progress.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-progress.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-progress.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-response-upload-event-progress.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onprogress" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-progress" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-upload-progress-notifications')]/.. following::ol[1]/li[8]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[2]/ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onprogress" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-progress" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::a[contains(@href,'#make-upload-progress-notifications')]/.. following::ol[1]/li[8]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#make-upload-progress-notifications" data-tested-assertations="following::ul[1]/li[2]/ol[1]/li[2]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: Fire a progress event named progress on the XMLHttpRequestUpload (synchronous flag is unset)</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-send.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-send.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-send.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-send.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: send() - send()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol/li[2]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-blocks-async.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-blocks-async.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-blocks-async.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-blocks-async.htm	2014-11-26 21:45:53.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
     <!-- This behaviour is not explicitly spelled out in the spec.
     It does say "queue tasks" under the "if the synchronous flag is unset" header in point 10 of the "send" algorithm.. -->
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol/li[10]/dl/dd/dl/dd[2]/p[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[10]/dl/dd/dl/dd[2]/p[3]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: sync requests should block events on pending async requests</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-loadend.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol/li[1] following::ol/li[7]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="/following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol/li[1] following::ol/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="/following::ol/li[3]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: Fire an event named loadend (no response entity body and the synchronous flag is set)</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-load.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-load.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-load.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-load.htm	2014-11-26 21:45:53.000000000 +0000
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onload" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-load" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol/li[1] following::ol/li[6]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="/following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onload" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-load" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol/li[1] following::ol/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="/following::ol/li[3]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: Fire an event named load (no response entity body and the synchronous flag is set)</title>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-order.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-order.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-order.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-no-response-event-order.htm	2014-11-26 21:45:53.000000000 +0000
@@ -2,15 +2,15 @@
 <html>
 <head>
     <title>XMLHttpRequest: The send() method: event order when synchronous flag is set and there is no response entity body</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol[1]/li[9]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#same-origin-request-steps" data-tested-assertations="following::DL[1]/DT[1]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol[1]/li[9]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#same-origin-request-steps" data-tested-assertations="following::DL[1]/DT[1]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="following::ol/li[3]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-response-event-order.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-response-event-order.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-response-event-order.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-response-event-order.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,15 +4,15 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: event order when synchronous flag is set</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onloadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadstart" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-loadend" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#same-origin-request-steps" data-tested-assertations="following::DL[1]/DT[1]"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#switch-done" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onloadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadstart" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-loadend" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following-sibling::ol/li[9]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#same-origin-request-steps" data-tested-assertations="following::DL[1]/DT[1]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[11] following::a[contains(@href,'#switch-done')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#switch-done" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[3] following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-response-attribute" data-tested-assertations="following::ol/li[3]" />
 </head>
 
 <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-timeout.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-timeout.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-timeout.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-sync-timeout.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: timeout during sync send() should not run</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method"/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#same-origin-request-steps" data-tested-assertations="following::DL[1]/DT[1]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#same-origin-request-steps" data-tested-assertations="following::DL[1]/DT[1]"/>
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-timeout-events.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-timeout-events.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/send-timeout-events.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/send-timeout-events.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,10 +4,10 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <title>XMLHttpRequest: The send() method: timeout is not 0 </title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[5] following::a[contains(@href,'#timeout-error')]/.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#timeout-error" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]/ol/li[3] following::ol[1]/li[7]/ol/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dt[5] following::a[contains(@href,'#timeout-error')]/.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[6] following::ol[1]/li[7]/ol/li[3] following::ol[1]/li[7]/ol/li[4] following::ol[1]/li[9] following::ol[1]/li[10]" />
 </head>
 
 <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-after-send.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-after-send.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-after-send.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-after-send.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() after send()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[2]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[2]" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-allow-empty-value.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() - empty header</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[4]/p[contains(@class,'note')] /following::ol/li[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[4]/p[contains(@class,'note')] /following::ol/li[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-before-open.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-before-open.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-before-open.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-before-open.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() before open()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="following::ol/li[1]" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-name.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,37 +5,44 @@
     <meta charset="utf-8">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[3]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[3]" />
   </head>
   <body>
     <div id="log"></div>
+<!--
+       CHAR           = <any US-ASCII character (octets 0 - 127)>
+       CTL            = <any US-ASCII control character
+                        (octets 0 - 31) and DEL (127)>
+       SP             = <US-ASCII SP, space (32)>
+       HT             = <US-ASCII HT, horizontal-tab (9)>
+       token          = 1*<any CHAR except CTLs or separators>
+       separators     = "(" | ")" | "<" | ">" | "@"
+                      | "," | ";" | ":" | "\" | <">
+                      | "/" | "[" | "]" | "?" | "="
+                      | "{" | "}" | SP | HT
+       field-name     = token
+-->
     <script>
       function try_name(name) {
         test(function() {
           var client = new XMLHttpRequest()
           client.open("GET", "...")
           assert_throws("SyntaxError", function() { client.setRequestHeader(name, 'x-value') })
-        })
+        }, "setRequestHeader should throw with header name " + format_value(invalid_headers[i]) + ".")
       }
-      try_name("")
-      try_name("t\rt")
-      try_name("t\nt")
-      try_name("t: t")
-      try_name("t:t")
-      try_name("t<t")
-      try_name("t t")
-      try_name(" tt")
-      try_name(":tt")
-      try_name("\ttt")
-      try_name("\vtt")
-      try_name("t\0t")
-      try_name("t\"t")
-      try_name("t,t")
-      try_name("t;t")
-      try_name("()[]{}")
-      try_name("a?B")
-      try_name("X-�ｽﾄ")
-      try_name("a=B")
+      var invalid_headers = ["(", ")", "<", ">", "@", ",", ";", ":", "\\",
+                             "\"", "/", "[", "]", "?", "=", "{", "}", " ",
+                             /* HT already tested in the loop below */
+                             "\u007f", "�ｽﾄ", "", "t\rt", "t\nt", "t: t", "t:t",
+                             "t<t", "t t", " tt", ":tt", "\ttt", "\vtt", "t\0t",
+                             "t\"t", "t,t", "t;t", "()[]{}", "a?B", "X-�ｽﾄ", "a=B"]
+      for (var i = 0; i < 32; ++i) {
+        invalid_headers.push(String.fromCharCode(i))
+      }
+      for (var i = 0; i < invalid_headers.length; ++i) {
+        try_name(invalid_headers[i])
+      }
+
     </script>
   </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-value.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-value.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-value.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-bogus-value.htm	2014-11-26 21:45:53.000000000 +0000
@@ -5,7 +5,7 @@
     <title>XMLHttpRequest: setRequestHeader() value argument checks</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[4]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
@@ -14,19 +14,18 @@
         test(function() {
           var client = new XMLHttpRequest()
           client.open("GET", "...")
-          // Older versions of the XHR spec use SyntaxError here, however,
-          // TypeError is the right error for this test per https://www.w3.org/Bugs/Public/show_bug.cgi?id=23346
-          assert_throws(new TypeError(), function() { client.setRequestHeader("x-test", value) }, ' given value ' + value+', ')
+          assert_throws("SyntaxError", function() { client.setRequestHeader("x-test", value) }, ' given value ' + value+', ')
         })
       }
       try_value("t\rt")
       try_value("t\nt")
       try_value("�ｽﾄ")
+
       test(function() {
         var client = new XMLHttpRequest()
         client.open("GET", "...")
         assert_throws(new TypeError(), function() { client.setRequestHeader("x-test") })
-      })
+      }, 'Omitted value argument')
     </script>
   </body>
 </html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-case-insensitive.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-case-insensitive.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-case-insensitive.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-case-insensitive.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() - headers that differ in case</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[6] /following::ol/li[7]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[6] /following::ol/li[7]" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-allowed.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-allowed.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-allowed.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-allowed.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() - headers that are allowed</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[6] /following::ol/li[7]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[6] /following::ol/li[7]" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-forbidden.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-forbidden.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-forbidden.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-header-forbidden.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() - headers that are forbidden</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[5]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[5]" />  
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-invalid-arguments.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-invalid-arguments.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-invalid-arguments.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-invalid-arguments.htm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>XMLHttpRequest: setRequestHeader() with invalid arguments</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-<!--
-       CHAR           = <any US-ASCII character (octets 0 - 127)>
-       CTL            = <any US-ASCII control character
-                        (octets 0 - 31) and DEL (127)>
-       SP             = <US-ASCII SP, space (32)>
-       HT             = <US-ASCII HT, horizontal-tab (9)>
-       token          = 1*<any CHAR except CTLs or separators>
-       separators     = "(" | ")" | "<" | ">" | "@"
-                      | "," | ";" | ":" | "\" | <">
-                      | "/" | "[" | "]" | "?" | "="
-                      | "{" | "}" | SP | HT
-       field-name     = token
--->
-    <script>
-      var invalid_headers = ["(", ")", "<", ">", "@", ",", ";", ":", "\\",
-                             "\"", "/", "[", "]", "?", "=", "{", "}", " ",
-                             /* HT already tested in the loop below */
-                             "\u007f"]
-      for (var i = 0; i < 32; ++i) {
-        invalid_headers.push(String.fromCharCode(i))
-      }
-      for (var i = 0; i < invalid_headers.length; ++i) {
-        test(function() {
-          assert_throws("SyntaxError", function() {
-            var client = new XMLHttpRequest()
-            client.open("GET", "../common/text-plain.txt")
-            client.setRequestHeader(invalid_headers[i], "test")
-          })
-        }, "setRequestHeader should throw with header " +
-           format_value(invalid_headers[i]) + ".")
-      }
-    </script>
-  </body>
-</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/setrequestheader-open-setrequestheader.htm	2014-11-26 21:45:53.000000000 +0000
@@ -6,8 +6,8 @@
   <title>XMLHttpRequest: setRequestHeader() and open()</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::OL[1]/LI[14]/ul[1]/li[4]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-setrequestheader()-method" data-tested-assertations="following::OL[1]/LI[6] following::ol[1]/li[7]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::OL[1]/LI[14]/ul[1]/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="following::OL[1]/LI[6] following::ol[1]/li[7]" />
 </head>
 <body>
     <p id="log"></p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/status-async.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/status-async.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/status-async.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/status-async.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,10 +4,10 @@
     <title>XMLHttpRequest: status/statusText - various responses</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol/li[1] following::ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol/li[1] following::ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getresponseheader()-method" data-tested-assertations="following::ol/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol/li[1] following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol/li[1] following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getresponseheader()-method" data-tested-assertations="following::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/status-basic.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/status-basic.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/status-basic.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/status-basic.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,10 +4,10 @@
     <title>XMLHttpRequest: status/statusText - various responses</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getresponseheader()-method" data-tested-assertations="following::ol/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getresponseheader()-method" data-tested-assertations="following::ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[4]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/status-error.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/status-error.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/status-error.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/status-error.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: status error handling</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#handler-xhr-onerror" data-tested-assertations="../.." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="/following::ol/li[3]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-onerror" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="/following::ol/li[3]" />  
   </head>
   <body>
     <p>This shouldn't be tested inside a tunnel.</p>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-cors-async.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-cors-async.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-cors-async.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-cors-async.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,11 +4,11 @@
     <title>XMLHttpRequest: timeout event and cross-origin request</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#cross-origin-request-event-rules" data-tested-assertations="following::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[4] following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#cross-origin-request-event-rules" data-tested-assertations="following::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-sync.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-sync.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-sync.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/timeout-sync.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,8 +4,8 @@
     <title>XMLHttpRequest: timeout not allowed for sync requests</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following::ol/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[10]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-set.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-set.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-set.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-set.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setting withCredentials and reading value back</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-withcredentials-attribute" data-tested-assertations="following::ol/li[5]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-withcredentials-attribute" data-tested-assertations="following::ol/li[5]" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-wrong-state.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-wrong-state.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-wrong-state.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/withcredentials-wrong-state.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setting withCredentials when not in UNSENT, OPENED state</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-withcredentials-attribute" data-tested-assertations="following::ol/li[1] following::ol/li[2]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-withcredentials-attribute" data-tested-assertations="following::ol/li[1] following::ol/li[2]" />  
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-basic.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-basic.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-basic.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-basic.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,9 +4,9 @@
     <title>XMLHttpRequest: prototype and members</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest" data-tested-assertations="following::ol/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#xmlhttprequest" data-tested-assertations="." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#states" data-tested-assertations="following::dfn[2] following::dfn[3] following::dfn[4] following::dfn[5] following::dfn[6]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest" data-tested-assertations="following::ol/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#xmlhttprequest" data-tested-assertations="." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#states" data-tested-assertations="following::dfn[2] following::dfn[3] following::dfn[4] following::dfn[5] following::dfn[6]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-eventtarget.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: implements EventTarget</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#xmlhttprequesteventtarget" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#xmlhttprequesteventtarget" data-tested-assertations=".." />
     <!-- Obviously, most of the stuff actually being tested here is covered in the DOM events spec, not in the XHR spec -->
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,13 +4,13 @@
     <title>XMLHttpRequest: members during network errors</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getresponseheader()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getallresponseheaders()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/ol/li[1] following::dl[1]/dd[2]/ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getresponseheader()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getallresponseheaders()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
 
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-network-error-sync.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,15 +4,15 @@
     <title>XMLHttpRequest: members during network errors (sync)</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/p[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#network-error" data-tested-assertations=".." />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#request-error" data-tested-assertations="following::ol[1]/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getresponseheader()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getallresponseheaders()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following::dl[1]/dt[2] following::dl[1]/dd[2]/p[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#network-error" data-tested-assertations=".." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getresponseheader()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getallresponseheaders()-method" data-tested-assertations="following::ol[1]/li[1] following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol[1]/li[2] following::ol[1]/li[3]" />
   </head>
   <body>
     <div id="log"></div>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-aborted.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,14 +3,14 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#abort-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-abort" data-tested-assertations="../.." />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-timeout" data-tested-assertations="../.." />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#abort-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-abort" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-timeout" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,10 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[5]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#abort-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-abort" data-tested-assertations="../.." />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#abort-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-abort" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol/li[9]"/>
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-overrides.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,10 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-simple.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-synconmain.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,8 +3,8 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[1]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-open()-method" data-tested-assertations="following::ol[1]/li[10]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol[1]/li[10]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-twice.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,13 +3,13 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" />
     <link rel="stylesheet" href="/resources/testharness.css" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="resources/xmlhttprequest-timeout.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,14 +3,14 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests in Worker</title>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[5]" />
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#abort-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-abort" data-tested-assertations="../.." />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#event-xhr-timeout" data-tested-assertations="../.." />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4] following-sibling::ol/li[4]/ol/li[5]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following-sibling::ol/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#abort-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-abort" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#event-xhr-timeout" data-tested-assertations="../.." />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests in Worker</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,10 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests in Worker</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests in Worker</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-synconworker.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests in Worker</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html	2014-11-26 21:45:53.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
     <meta charset="utf-8" />
     <title>XHR2 Timeout Property Tests in Worker</title>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#timeout-error" data-tested-assertations=".."/>
-    <link rel="help" href="http://www.w3.org/TR/XMLHttpRequest/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
-    <link rel="help" href="http://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-timeout-attribute" data-tested-assertations="following::ol[1]/li[2]" />
+    <link rel="help" href="https://xhr.spec.whatwg.org/#handler-xhr-ontimeout" data-tested-assertations="../.."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#timeout-error" data-tested-assertations=".."/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#request-error" data-tested-assertations="following::ol[1]/li[9]"/>
+    <link rel="help" href="https://xhr.spec.whatwg.org/#infrastructure-for-the-send()-method" data-tested-assertations="following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/.. following-sibling::dl//code[contains(@title,'dom-XMLHttpRequest-timeout')]/../following-sibling::dd following::dt[1] following::dd[1]" />
     <link rel="stylesheet" href="/resources/testharness.css" />
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-unsent.htm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-unsent.htm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-unsent.htm	2014-11-14 09:37:18.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/tests/XMLHttpRequest/xmlhttprequest-unsent.htm	2014-11-26 21:45:53.000000000 +0000
@@ -4,15 +4,15 @@
     <title>XMLHttpRequest: members during UNSENT</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-unsent" data-tested-assertations=".. following::dd" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-setrequestheader" data-tested-assertations="following::ol/li[1]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-send()-method" data-tested-assertations="following::ol/li[1]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-status-attribute" data-tested-assertations="following::ol/li[1]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-statustext-attribute" data-tested-assertations="following::ol/li[1]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getresponseheader()-method" data-tested-assertations="following::ol/li[1]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-getallresponseheaders()-method" data-tested-assertations="following::ol/li[1]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsetext-attribute" data-tested-assertations="following::ol/li[2]" />  
-    <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-responsexml-attribute" data-tested-assertations="following::ol/li[2]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-unsent" data-tested-assertations=".. following::dd" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#dom-xmlhttprequest-setrequestheader" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-send()-method" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-status-attribute" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-statustext-attribute" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getresponseheader()-method" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-getallresponseheaders()-method" data-tested-assertations="following::ol/li[1]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsetext-attribute" data-tested-assertations="following::ol/li[2]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-responsexml-attribute" data-tested-assertations="following::ol/li[2]" />  
     
   </head>
   <body>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/wptrunner.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/wptrunner.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/web-platform/wptrunner.ini	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/web-platform/wptrunner.ini	2014-11-26 21:46:00.000000000 +0000
@@ -7,5 +7,20 @@
 sync_path = sync
 
 [paths]
+prefs = ../profiles
+run_info = .
+
+[manifest:upstream]
 tests = tests
 metadata = meta
+url_base = /
+
+[manifest:outbound]
+tests = outbound/tests
+metadata = outbound/meta
+url_base = /_outbound/
+
+[manifest:mozilla]
+tests = mozilla/tests
+metadata = mozilla/meta
+url_base = /_mozilla/
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/client.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/client.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/client.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/client.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,231 @@
+var spdy = require('../spdy');
+var assert = require('assert');
+var util = require('util');
+var net = require('net');
+var https = require('https');
+var EventEmitter = require('events').EventEmitter;
+
+var proto = {};
+
+function instantiate(base) {
+  function Agent(options) {
+    base.call(this, options);
+
+    if (!this.options.spdy)
+      this.options.spdy = {};
+
+    this._init();
+
+    // Hack for node.js v0.10
+    this.createConnection = proto.createConnection;
+
+    // No chunked encoding
+    this.keepAlive = false;
+  };
+  util.inherits(Agent, base);
+
+  // Copy prototype methods
+  Object.keys(proto).forEach(function(key) {
+    this[key] = proto[key];
+  }, Agent.prototype);
+
+  return Agent;
+};
+
+proto._init = function init() {
+  var self = this;
+
+  var state = {};
+  // Find super's `createConnection` method
+  var createConnection;
+  var cons = this.constructor.super_;
+  do {
+    createConnection = cons.prototype.createConnection;
+
+    if (cons.super_ === EventEmitter || !cons.super_)
+      break;
+    cons = cons.super_;
+  } while (!createConnection);
+
+  if (!createConnection)
+    createConnection = this.createConnection || net.createConnection;
+
+  // TODO(indutny): Think about falling back to http/https
+  var socket = createConnection.call(this, util._extend({
+    NPNProtocols: ['spdy/3.1', 'spdy/3', 'spdy/2'],
+    ALPNProtocols: ['spdy/3.1', 'spdy/3', 'spdy/2']
+  }, this.options));
+  state.socket = socket;
+
+  // Header compression is disabled by default in clients to prevent CRIME
+  // attacks. Don't enable it unless you know what you're doing.
+  if (this.options.spdy.headerCompression !== true)
+    this.options.spdy.headerCompression = false;
+
+  // Create SPDY connection using newly created socket
+  var connection = new spdy.Connection(socket,
+                                       util._extend(this.options.spdy, {
+    isServer: false
+  }));
+  state.connection = connection;
+
+  connection.on('error', function(err) {
+    self.emit('error', err);
+  });
+
+  // Select SPDY version
+  if (this.options.spdy.ssl !== false && !this.options.spdy.version) {
+    // SSL, wait for NPN or ALPN to happen
+    socket.once('secureConnect', function() {
+      var selectedProtocol = socket.npnProtocol || socket.alpnProtocol;
+      if (selectedProtocol === 'spdy/2')
+        connection._setVersion(2);
+      else if (selectedProtocol === 'spdy/3')
+        connection._setVersion(3);
+      else if (selectedProtocol === 'spdy/3.1')
+        connection._setVersion(3.1);
+      else
+        socket.emit('error', new Error('No supported SPDY version'));
+    });
+  } else {
+    // No SSL, use fixed version
+    connection._setVersion(this.options.spdy.version || 3);
+  }
+
+  // Destroy PUSH streams until the listener will be added
+  connection.on('stream', function(stream) {
+    stream.on('error', function() {});
+    stream.destroy();
+  });
+  state.pushServer = null;
+
+  this.on('newListener', this._onNewListener.bind(this));
+  this.on('removeListener', this._onRemoveListener.bind(this));
+
+  // Client has odd-numbered stream ids
+  state.id = 1;
+  this._spdyState = state;
+};
+
+//
+// ### function onNewListener (type, listener)
+// #### @type {String} Event type
+// #### @listener {Function} Listener callback
+//
+proto._onNewListener = function onNewListener(type, listener) {
+  if (type !== 'push')
+    return;
+
+  var state = this._spdyState;
+  if (state.pushServer)
+    return state.pushServer.on('translated-request', listener);
+
+  state.pushServer = require('http').createServer(listener);
+  state.connection.removeAllListeners('stream');
+  state.connection.on('stream', function(stream) {
+    state.pushServer.emit('connection', stream);
+  });
+
+  state.pushServer.on('request', function(req) {
+    // Populate trailing headers
+    req.connection.on('headers', function(headers) {
+      Object.keys(headers).forEach(function(key) {
+        req.trailers[key] = headers[key];
+      });
+      req.emit('trailers', headers);
+    });
+
+    this.emit('translated-request', req);
+  });
+};
+
+//
+// ### function onRemoveListener (type, listener)
+// #### @type {String} Event type
+// #### @listener {Function} Listener callback
+//
+proto._onRemoveListener = function onRemoveListener(type, listener) {
+  if (type !== 'push')
+    return;
+
+  var state = this._spdyState;
+  if (!state.pushServer)
+    return;
+
+  state.pushServer.removeListener('translated-request', listener);
+};
+
+//
+// ### function createConnection (options)
+//
+proto.createConnection = function createConnection(options) {
+  if (!options)
+    options = {};
+
+  var state = this._spdyState;
+  var stream = new spdy.Stream(state.connection, {
+    id: state.id,
+    priority: options.priority || 7,
+    client: true,
+    decompress: options.spdy.decompress == undefined ? true :
+                                                       options.spdy.decompress
+  });
+  state.id += 2;
+  state.connection._addStream(stream);
+
+  return stream;
+};
+
+//
+// ### function close (callback)
+// #### @callback {Function}
+// Close underlying socket and terminate all streams
+//
+proto.close = function close(callback) {
+  this._spdyState.socket.destroySoon();
+  if (callback)
+    this._spdyState.socket.once('close', callback);
+};
+
+//
+// ### function ping (callback)
+// #### @callback {Function}
+// Send PING frame and invoke callback once received it back
+//
+proto.ping = function ping(callback) {
+  return this._spdyState.connection.ping(callback);
+};
+
+//
+// Default Agent
+//
+exports.Agent = instantiate(https.Agent);
+
+//
+// ### function create (base, options)
+// #### @base {Function} (optional) base server class (https.Server)
+// #### @options {Object} tls server options
+// @constructor wrapper
+//
+exports.create = function create(base, options) {
+  var agent;
+  if (typeof base === 'function') {
+    agent = instantiate(base);
+  } else {
+    agent = exports.Agent;
+
+    options = base;
+    base = null;
+  }
+
+  // Instantiate http server if `ssl: false`
+  if (!base &&
+      options &&
+      options.spdy &&
+      options.spdy.plain &&
+      options.spdy.ssl === false) {
+    return exports.create(require('http').Agent, options);
+  }
+
+  return new agent(options);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/connection.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/connection.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/connection.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/connection.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,644 @@
+var util = require('util');
+var assert = require('assert');
+var spdy = require('../spdy');
+var constants = spdy.protocol.constants;
+
+var Stream = spdy.Stream;
+
+//
+// ### function Connection (socket, state, server)
+// #### @socket {net.Socket} server's connection
+// #### @options {Object} Connection options
+// #### @server {net.Server} server
+// Abstract connection @constructor
+//
+function Connection(socket, options, server) {
+  process.EventEmitter.call(this);
+
+  var state = {};
+  this._spdyState = state;
+
+  // NOTE: There's a big trick here. Connection is used as a `this` argument
+  // to the wrapped `connection` event listener.
+  // socket end doesn't necessarly mean connection drop
+  this.httpAllowHalfOpen = true;
+
+  // Socket timeout
+  this.timeout = server && server.timeout || 0;
+
+  // Defaults
+  state.maxStreams = options.maxStreams || Infinity;
+  state.initialSinkSize = constants.DEFAULT_WINDOW;
+  state.initialWindowSize = options.windowSize || 1 << 20;
+  state.autoSpdy31 = options.autoSpdy31;
+
+  // Connection-level flow control
+  state.sinkSize = state.initialSinkSize;
+  state.windowSize = constants.DEFAULT_WINDOW;
+
+  // Interleaving configuration
+  state.maxChunk = options.maxChunk === undefined ? 8 * 1024 : options.maxChunk;
+
+  // Various state info
+  state.closed = false;
+  state.pool = spdy.zlibpool.create(options.headerCompression);
+  state.counters = {
+    pushCount: 0,
+    streamCount: 0
+  };
+  state.socketBuffering = false;
+
+  state.version = null;
+  state.deflate = null;
+  state.inflate = null;
+
+  // Init streams list
+  state.isServer = options.isServer;
+  state.streams = {};
+  state.streamCount = 0;
+  state.lastId = 0;
+  state.pushId = 0;
+  state.pingId = state.isServer ? 0 : 1;
+  state.pings = {};
+  state.goaway = false;
+
+  // X-Forwarded feature
+  state.xForward = null;
+
+  // Initialize scheduler
+  state.scheduler = spdy.scheduler.create(this);
+
+  // Create parser and hole for framer
+  state.parser = spdy.protocol.parser.create(this);
+  state.framer = spdy.protocol.framer.create();
+
+  // Lock data
+  state.locked = false;
+  state.lockQueue = [];
+
+  this.socket = socket;
+  this.encrypted = socket.encrypted;
+  this.readable = true;
+  this.writable = true;
+
+  this._init();
+}
+util.inherits(Connection, process.EventEmitter);
+exports.Connection = Connection;
+
+Connection.prototype._init = function init() {
+  var self = this;
+  var state = this._spdyState;
+  var pool = state.pool;
+  var pair = null;
+  var sentSettings = false;
+
+  // Initialize parser
+  this._spdyState.parser.on('frame', this._handleFrame.bind(this));
+
+  this._spdyState.parser.on('version', function onversion(version) {
+    var prev = state.version;
+    var framer = state.framer;
+
+    state.version = version;
+
+    // Ignore transition to 3.1
+    if (!prev) {
+      pair = pool.get('spdy/' + version);
+      state.deflate = pair.deflate;
+      state.inflate = pair.inflate;
+      framer.setCompression(pair.deflate, pair.inflate);
+    }
+    framer.setVersion(version);
+
+    // Send settings frame (once)
+    if (!sentSettings) {
+      sentSettings = true;
+      framer.settingsFrame({
+        maxStreams: state.maxStreams,
+        windowSize: state.initialWindowSize
+      }, function(err, frame) {
+        if (err)
+          return self.emit('error', err);
+        self.write(frame);
+      });
+
+      // Send WINDOW_UPDATE for 3.1
+      self._sendWindowUpdate(true);
+    }
+  });
+
+  // Propagate parser errors
+  state.parser.on('error', function onParserError(err) {
+    self.emit('error', err);
+  });
+
+  this.socket.pipe(state.parser);
+
+  // 2 minutes socket timeout
+  this.socket.setTimeout(this.timeout);
+  this.socket.once('timeout', function ontimeout() {
+    self.socket.destroy();
+  });
+
+  // Allow high-level api to catch socket errors
+  this.socket.on('error', function onSocketError(e) {
+    self.emit('error', e);
+  });
+
+  this.socket.once('close', function onclose() {
+    var err = new Error('socket hang up');
+    err.code = 'ECONNRESET';
+    self._destroyStreams(err);
+    self.emit('close');
+
+    state.closed = true;
+    if (pair)
+      pool.put(pair);
+  });
+
+  // Do not allow half-open connections
+  this.socket.allowHalfOpen = false;
+
+  if (spdy.utils.isLegacy) {
+    this.socket.on('drain', function ondrain() {
+      self.emit('drain');
+    });
+  }
+
+  // for both legacy and non-legacy, when our socket is ready for writes again,
+  //   drain the sinks in case they were queuing due to socketBuffering.
+  this.socket.on('drain', function () {
+    state.socketBuffering = false;
+    Object.keys(state.streams).forEach(function(id) {
+      state.streams[id]._drainSink(0);
+    });
+  });
+};
+
+//
+// ### function handleFrame (frame)
+// #### @frame {Object} SPDY frame
+//
+Connection.prototype._handleFrame = function handleFrame(frame) {
+  var state = this._spdyState;
+
+  if (state.closed)
+    return;
+
+  var stream;
+
+  // Create new stream
+  if (frame.type === 'SYN_STREAM') {
+    stream = this._handleSynStream(frame);
+  } else {
+    if (frame.id !== undefined) {
+      // Load created one
+      stream = state.streams[frame.id];
+
+      // Fail if not found
+      if (stream === undefined &&
+          !(frame.type === 'WINDOW_UPDATE' && frame.id === 0)) {
+        if (frame.type === 'RST_STREAM')
+          return;
+        this._rst(frame.id, constants.rst.INVALID_STREAM);
+        return;
+      }
+    }
+
+    // Emit 'data' event
+    if (frame.type === 'DATA') {
+      this._handleData(stream, frame);
+    // Reply for client stream
+    } else if (frame.type === 'SYN_REPLY') {
+      // If stream not client - send RST
+      if (!stream._spdyState.isClient) {
+        this._rst(frame.id, constants.rst.PROTOCOL_ERROR);
+        return;
+      }
+
+      stream._handleResponse(frame);
+
+    // Destroy stream if we were asked to do this
+    } else if (frame.type === 'RST_STREAM') {
+      stream._spdyState.rstCode = 0;
+      stream._spdyState.closedBy.us = true;
+      stream._spdyState.closedBy.them = true;
+
+      // Emit error on destroy
+      var err = new Error('Received rst: ' + frame.status);
+      err.code = 'RST_STREAM';
+      err.status = frame.status;
+      stream.destroy(err);
+    // Respond with same PING
+    } else if (frame.type === 'PING') {
+      this._handlePing(frame.pingId);
+    } else if (frame.type === 'SETTINGS') {
+      this._setDefaultWindow(frame.settings);
+    } else if (frame.type === 'GOAWAY') {
+      state.goaway = frame.lastId;
+      this.writable = false;
+    } else if (frame.type === 'WINDOW_UPDATE') {
+      if (stream)
+        stream._drainSink(frame.delta);
+      else
+        this._drainSink(frame.delta);
+    } else if (frame.type === 'HEADERS') {
+      stream.emit('headers', frame.headers);
+    } else if (frame.type === 'X_FORWARDED') {
+      state.xForward = frame.host;
+    } else {
+      console.error('Unknown type: ', frame.type);
+    }
+  }
+
+  // Handle half-closed
+  if (frame.fin) {
+    // Don't allow to close stream twice
+    if (stream._spdyState.closedBy.them) {
+      stream._spdyState.rstCode = constants.rst.PROTOCOL_ERROR;
+      stream.emit('error', 'Already half-closed');
+    } else {
+      stream._spdyState.closedBy.them = true;
+
+      // Receive FIN
+      stream._recvEnd();
+
+      stream._handleClose();
+    }
+  }
+};
+
+//
+// ### function handleSynStream (frame)
+// #### @frame {Object} SPDY frame
+//
+Connection.prototype._handleSynStream = function handleSynStream(frame) {
+  var state = this._spdyState;
+  var associated;
+
+  if (state.goaway && state.goaway < frame.id)
+    return this._rst(frame.id, constants.rst.REFUSED_STREAM);
+
+  // PUSH stream
+  if (!state.isServer) {
+    // Incorrect frame id
+    if (frame.id % 2 === 1 || frame.associated % 2 === 0)
+      return this._rst(frame.id, constants.rst.PROTOCOL_ERROR);
+
+    associated = state.streams[frame.associated];
+
+    // Fail if not found
+    if (associated === undefined) {
+      if (frame.type === 'RST_STREAM')
+        return;
+      this._rst(frame.id, constants.rst.INVALID_STREAM);
+      return;
+    }
+  }
+
+  var stream = new Stream(this, frame);
+  this._addStream(stream);
+
+  // Associate streams
+  if (associated) {
+    stream.associated = associated;
+  }
+
+  // TODO(indutny) handle stream limit
+  this.emit('stream', stream);
+  stream._start(frame.url, frame.headers);
+
+  return stream;
+};
+
+//
+// ### function _handleData (stream, frame)
+// #### @stream {Stream} SPDY Stream
+// #### @frame {Object} SPDY frame
+//
+Connection.prototype._handleData = function handleData(stream, frame) {
+  var state = this._spdyState;
+
+  if (frame.data.length > 0) {
+    if (stream._spdyState.closedBy.them) {
+      stream._spdyState.rstCode = constants.rst.PROTOCOL_ERROR;
+      stream.emit('error', 'Writing to half-closed stream');
+    } else {
+      // Connection-level flow control
+      state.windowSize -= frame.data.length;
+      this._sendWindowUpdate();
+      stream._recv(frame.data);
+    }
+  }
+};
+
+//
+// ### function sendWindowUpdate (force)
+// #### @force {Boolean} send even if windowSize is positive
+// Send WINDOW_UPDATE if needed
+//
+Connection.prototype._sendWindowUpdate = function sendWindowUpdate(force) {
+  var state = this._spdyState;
+
+  if (state.version < 3.1 && (!state.isServer || !state.autoSpdy31) ||
+      state.windowSize > state.initialWindowSize / 2 && !force) {
+    return;
+  }
+
+  var self = this;
+  var delta = state.initialWindowSize - state.windowSize;
+  if (delta === 0)
+    return;
+
+  state.windowSize += delta;
+  state.framer.windowUpdateFrame(0, delta, function(err, frame) {
+    if (err)
+      return self.emit('error', err);
+    self.write(frame);
+  });
+};
+
+//
+// ### function _drainSink (delta)
+// #### @delta {Number} WINDOW_UPDATE delta value
+//
+Connection.prototype._drainSink = function drainSink(delta) {
+  var state = this._spdyState;
+
+  // Switch to 3.1
+  if (state.version !== 3.1) {
+    this._setVersion(3.1);
+    this._sendWindowUpdate();
+  }
+
+  state.sinkSize += delta;
+
+  if (state.sinkSize <= 0)
+    return;
+
+  this.emit('drain');
+
+  // Try to write all pending data to the socket
+  Object.keys(state.streams).forEach(function(id) {
+    state.streams[id]._drainSink(0);
+  });
+};
+
+//
+// ### function setVersion (version)
+// #### @version {Number} Protocol version
+// Set protocol version to use
+//
+Connection.prototype._setVersion = function setVersion(version) {
+  this._spdyState.parser.setVersion(version);
+};
+
+//
+// ### function addStream (stream)
+// #### @stream {Stream}
+//
+Connection.prototype._addStream = function addStream(stream) {
+  var state = this._spdyState;
+  var id = stream._spdyState.id;
+  if (state.streams[id])
+    return;
+  state.streams[id] = stream;
+
+  // Update lastId
+  state.lastId = Math.max(state.lastId, id);
+
+  var isClient = id % 2 == 1;
+  if (isClient && state.isServer || !isClient && !state.isServer)
+    state.streamCount++;
+};
+
+//
+// ### function removeStream (stream)
+// #### @stream {Stream}
+//
+Connection.prototype._removeStream = function removeStream(stream) {
+  var state = this._spdyState;
+  var id = stream._spdyState.id;
+  if (!state.streams[id])
+    return;
+
+  delete state.streams[id];
+
+  var isClient = id % 2 == 1;
+  if (isClient && state.isServer || !isClient && !state.isServer)
+    state.streamCount--;
+
+  if (!state.isServer &&
+      state.goaway &&
+      state.streamCount === 0 &&
+      this.socket) {
+    this.socket.destroySoon();
+  }
+};
+
+//
+// ### function destroyStreams (err)
+// #### @err {Error} *optional*
+// Destroys all active streams
+//
+Connection.prototype._destroyStreams = function destroyStreams(err) {
+  var state = this._spdyState;
+  var streams = state.streams;
+  state.streams = {};
+  state.streamCount = 0;
+  Object.keys(streams).forEach(function(id) {
+    streams[id].destroy();
+  });
+};
+
+//
+// ### function _rst (streamId, code, extra)
+// #### @streamId {Number}
+// #### @code {Number}
+// #### @extra {String}
+// Send RST frame
+//
+Connection.prototype._rst = function rst(streamId, code, extra) {
+  var self = this;
+  this._spdyState.framer.rstFrame(streamId, code, extra, function(err, frame) {
+    if (err)
+      return self.emit('error', err);
+    self.write(frame);
+  });
+};
+
+//
+// ### function lock (callback)
+// #### @callback {Function} continuation callback
+// Acquire lock
+//
+Connection.prototype._lock = function lock(callback) {
+  if (!callback)
+    return;
+
+  var state = this._spdyState;
+  if (state.locked) {
+    state.lockQueue.push(callback);
+  } else {
+    state.locked = true;
+    callback(null);
+  }
+};
+
+//
+// ### function unlock ()
+// Release lock and call all buffered callbacks
+//
+Connection.prototype._unlock = function unlock() {
+  var state = this._spdyState;
+  if (state.locked) {
+    if (state.lockQueue.length) {
+      var cb = state.lockQueue.shift();
+      cb(null);
+    } else {
+      state.locked = false;
+    }
+  }
+};
+
+//
+// ### function write (data, encoding)
+// #### @data {String|Buffer} data
+// #### @encoding {String} (optional) encoding
+// Writes data to socket
+//
+Connection.prototype.write = function write(data, encoding) {
+  if (this.socket.writable) {
+    var wroteThrough = this.socket.write(data, encoding);
+    // if write returns false, the socket layer is buffering the data, so let's
+    //   set a flag that we can use to create some backpressure
+    if (!wroteThrough)
+      this._spdyState.socketBuffering = true;
+    return wroteThrough;
+  }
+};
+
+//
+// ### function _setDefaultWindow (settings)
+// #### @settings {Object}
+// Update the default transfer window -- in the connection and in the
+// active streams
+//
+Connection.prototype._setDefaultWindow = function _setDefaultWindow(settings) {
+  if (!settings)
+    return;
+  if (!settings.initial_window_size ||
+      settings.initial_window_size.persisted) {
+    return;
+  }
+  var state = this._spdyState;
+  state.initialSinkSize = settings.initial_window_size.value;
+
+  Object.keys(state.streams).forEach(function(id) {
+    state.streams[id]._updateSinkSize(settings.initial_window_size.value);
+  });
+};
+
+//
+// ### function handlePing (id)
+// #### @id {Number} PING id
+//
+Connection.prototype._handlePing = function handlePing(id) {
+  var self = this;
+  var state = this._spdyState;
+
+  var ours = state.isServer && (id % 2 === 0) ||
+             !state.isServer && (id % 2 === 1);
+
+  // Handle incoming PING
+  if (!ours) {
+    state.framer.pingFrame(id, function(err, frame) {
+      if (err)
+        return self.emit('error', err);
+      self.write(frame);
+    });
+    return;
+  }
+
+  // Handle reply PING
+  if (!state.pings[id])
+    return;
+  var ping = state.pings[id];
+  delete state.pings[id];
+
+  if (ping.cb)
+    ping.cb(null);
+};
+
+//
+// ### function ping (callback)
+// #### @callback {Function}
+// Send PING frame and invoke callback once received it back
+//
+Connection.prototype.ping = function ping(callback) {
+  var self = this;
+  var state = this._spdyState;
+  var id = state.pingId;
+
+  state.pingId += 2;
+
+  state.framer.pingFrame(id, function(err, frame) {
+    if (err)
+      return self.emit('error', err);
+
+    state.pings[id] = { cb: callback };
+    self.write(frame);
+  });
+};
+
+//
+// ### function getCounter (name)
+// #### @name {String} Counter name
+// Get counter value
+//
+Connection.prototype.getCounter = function getCounter(name) {
+  return this._spdyState.counters[name];
+};
+
+//
+// ### function cork ()
+// Accumulate data before writing out
+//
+Connection.prototype.cork = function cork() {
+  if (this.socket && this.socket.cork)
+    this.socket.cork();
+};
+
+//
+// ### function uncork ()
+// Write out accumulated data
+//
+Connection.prototype.uncork = function uncork() {
+  if (this.socket && this.socket.uncork)
+    this.socket.uncork();
+};
+
+Connection.prototype.end = function end() {
+  var self = this;
+  var state = this._spdyState;
+
+  state.framer.goawayFrame(state.lastId,
+                           constants.goaway.OK,
+                           function(err, frame) {
+    if (err)
+      return self.emit('error', err);
+
+    self.write(frame, function() {
+      state.goaway = state.lastId;
+
+      // Destroy socket if there are no streams
+      if (!state.isServer &&
+          state.goaway &&
+          state.streamCount === 0 &&
+          self.socket) {
+        self.socket.destroySoon();
+      }
+    });
+  });
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/parser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/parser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/parser.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/parser.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,235 +0,0 @@
-var parser = exports;
-
-var spdy = require('../spdy'),
-    util = require('util'),
-    stream = require('stream'),
-    Buffer = require('buffer').Buffer;
-
-var legacy = !stream.Duplex;
-
-if (legacy) {
-  var DuplexStream = stream;
-} else {
-  var DuplexStream = stream.Duplex;
-}
-
-//
-// ### function Parser (connection)
-// #### @connection {spdy.Connection} connection
-// SPDY protocol frames parser's @constructor
-//
-function Parser(connection) {
-  DuplexStream.call(this);
-
-  this.drained = true;
-  this.paused = false;
-  this.buffer = [];
-  this.buffered = 0;
-  this.waiting = 8;
-
-  this.state = { type: 'frame-head' };
-  this.socket = connection.socket;
-  this.connection = connection;
-  this.framer = null;
-
-  this.connection = connection;
-
-  if (legacy) {
-    this.readable = this.writable = true;
-  }
-}
-util.inherits(Parser, DuplexStream);
-
-//
-// ### function create (connection)
-// #### @connection {spdy.Connection} connection
-// @constructor wrapper
-//
-parser.create = function create(connection) {
-  return new Parser(connection);
-};
-
-//
-// ### function destroy ()
-// Just a stub.
-//
-Parser.prototype.destroy = function destroy() {
-};
-
-//
-// ### function _write (data, encoding, cb)
-// #### @data {Buffer} chunk of data
-// #### @encoding {Null} encoding
-// #### @cb {Function} callback
-// Writes or buffers data to parser
-//
-Parser.prototype._write = function write(data, encoding, cb) {
-  // Legacy compatibility
-  if (!cb) cb = function() {};
-
-  if (data !== undefined) {
-    // Buffer data
-    this.buffer.push(data);
-    this.buffered += data.length;
-  }
-
-  // Notify caller about state (for piping)
-  if (this.paused) return false;
-
-  // We shall not do anything until we get all expected data
-  if (this.buffered < this.waiting) return cb();
-
-  // Mark parser as not drained
-  if (data !== undefined) this.drained = false;
-
-  var self = this,
-      buffer = new Buffer(this.waiting),
-      sliced = 0,
-      offset = 0;
-
-  while (this.waiting > offset && sliced < this.buffer.length) {
-    var chunk = this.buffer[sliced++],
-        overmatched = false;
-
-    // Copy chunk into `buffer`
-    if (chunk.length > this.waiting - offset) {
-      chunk.copy(buffer, offset, 0, this.waiting - offset);
-
-      this.buffer[--sliced] = chunk.slice(this.waiting - offset);
-      this.buffered += this.buffer[sliced].length;
-
-      overmatched = true;
-    } else {
-      chunk.copy(buffer, offset);
-    }
-
-    // Move offset and decrease amount of buffered data
-    offset += chunk.length;
-    this.buffered -= chunk.length;
-
-    if (overmatched) break;
-  }
-
-  // Remove used buffers
-  this.buffer = this.buffer.slice(sliced);
-
-  // Executed parser for buffered data
-  this.paused = true;
-  this.execute(this.state, buffer, function (err, waiting) {
-    // And unpause once execution finished
-    self.paused = false;
-
-    // Propagate errors
-    if (err) {
-      cb();
-      return self.emit('error', err);
-    }
-
-    // Set new `waiting`
-    self.waiting = waiting;
-
-    if (self.waiting <= self.buffered) {
-      self._write(undefined, null, cb);
-    } else {
-      process.nextTick(function() {
-        if (self.drained) return;
-
-        // Mark parser as drained
-        self.drained = true;
-        self.emit('drain');
-      });
-
-      cb();
-    }
-  });
-};
-
-if (legacy) {
-  //
-  // ### function write (data, encoding, cb)
-  // #### @data {Buffer} chunk of data
-  // #### @encoding {Null} encoding
-  // #### @cb {Function} callback
-  // Legacy method
-  //
-  Parser.prototype.write = Parser.prototype._write;
-
-  //
-  // ### function end ()
-  // Stream's end() implementation
-  //
-  Parser.prototype.end = function end() {
-    this.emit('end');
-  };
-}
-
-//
-// ### function createFramer (version)
-// #### @version {Number} Protocol version, either 2 or 3
-// Sets framer instance on Parser's instance
-//
-Parser.prototype.createFramer = function createFramer(version) {
-  if (spdy.protocol[version]) {
-    this.emit('version', version);
-
-    this.framer = new spdy.protocol[version].Framer(
-      spdy.utils.zwrap(this.connection._deflate),
-      spdy.utils.zwrap(this.connection._inflate)
-    );
-
-    // Propagate framer to connection
-    this.connection._framer = this.framer;
-    this.emit('framer', this.framer);
-  } else {
-    this.emit(
-      'error',
-      new Error('Unknown protocol version requested: ' + version)
-    );
-  }
-};
-
-//
-// ### function execute (state, data, callback)
-// #### @state {Object} Parser's state
-// #### @data {Buffer} Incoming data
-// #### @callback {Function} continuation callback
-// Parse buffered data
-//
-Parser.prototype.execute = function execute(state, data, callback) {
-  if (state.type === 'frame-head') {
-    var header = state.header = spdy.protocol.generic.parseHeader(data);
-
-    // Lazily create framer
-    if (!this.framer && header.control) {
-      this.createFramer(header.version);
-    }
-
-    state.type = 'frame-body';
-    callback(null, header.length);
-  } else if (state.type === 'frame-body') {
-    var self = this;
-
-    // Data frame
-    if (!state.header.control) {
-      return onFrame(null, {
-        type: 'DATA',
-        id: state.header.id,
-        fin: (state.header.flags & 0x01) === 0x01,
-        compressed: (state.header.flags & 0x02) === 0x02,
-        data: data
-      });
-    } else {
-    // Control frame
-      this.framer.execute(state.header, data, onFrame);
-    }
-
-    function onFrame(err, frame) {
-      if (err) return callback(err);
-
-      self.emit('frame', frame);
-
-      state.type = 'frame-head';
-      callback(null, 8);
-    };
-  }
-};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/constants.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/constants.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/constants.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/constants.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,35 @@
+exports.rst = {
+  PROTOCOL_ERROR: 1,
+  INVALID_STREAM: 2,
+  REFUSED_STREAM: 3,
+  UNSUPPORTED_VERSION: 4,
+  CANCEL: 5,
+  INTERNAL_ERROR: 6,
+  FLOW_CONTROL_ERROR: 7,
+  STREAM_IN_USE: 8,
+  STREAM_ALREADY_CLOSED: 9,
+  INVALID_CREDENTIALS: 10,
+  FRAME_TOO_LARGE: 11
+};
+
+exports.settings = {
+  FLAG_SETTINGS_PERSIST_VALUE: 1,
+  FLAG_SETTINGS_PERSISTED: 2,
+
+  SETTINGS_UPLOAD_BANDWIDTH: 1,
+  SETTINGS_DOWNLOAD_BANDWIDTH: 2,
+  SETTINGS_ROUND_TRIP_TIME: 3,
+  SETTINGS_MAX_CONCURRENT_STREAMS: 4,
+  SETTINGS_CURRENT_CWND: 5,
+  SETTINGS_DOWNLOAD_RETRANS_RATE: 6,
+  SETTINGS_INITIAL_WINDOW_SIZE: 7,
+  SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE: 8
+};
+
+exports.DEFAULT_WINDOW = 64 * 1024;
+
+exports.goaway = {
+  OK: 0,
+  PROTOCOL_ERROR: 1,
+  INTERNAL_ERROR: 2
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/dictionary.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/dictionary.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/dictionary.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/dictionary.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,203 @@
+var Buffer = require('buffer').Buffer;
+
+var dictionary = {};
+module.exports = dictionary;
+
+dictionary[2] = new Buffer([
+  'optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-',
+  'languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi',
+  'f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser',
+  '-agent10010120020120220320420520630030130230330430530630740040140240340440',
+  '5406407408409410411412413414415416417500501502503504505accept-rangesageeta',
+  'glocationproxy-authenticatepublicretry-afterservervarywarningwww-authentic',
+  'ateallowcontent-basecontent-encodingcache-controlconnectiondatetrailertran',
+  'sfer-encodingupgradeviawarningcontent-languagecontent-lengthcontent-locati',
+  'oncontent-md5content-rangecontent-typeetagexpireslast-modifiedset-cookieMo',
+  'ndayTuesdayWednesdayThursdayFridaySaturdaySundayJanFebMarAprMayJunJulAugSe',
+  'pOctNovDecchunkedtext/htmlimage/pngimage/jpgimage/gifapplication/xmlapplic',
+  'ation/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1',
+  '.1statusversionurl\x00'
+].join(''));
+
+dictionary[3] = new Buffer([
+  0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69,  // ....opti
+  0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68,  // ons....h
+  0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70,  // ead....p
+  0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70,  // ost....p
+  0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65,  // ut....de
+  0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05,  // lete....
+  0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,  // trace...
+  0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00,  // .accept.
+  0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70,  // ...accep
+  0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,  // t-charse
+  0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63,  // t....acc
+  0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,  // ept-enco
+  0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f,  // ding....
+  0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c,  // accept-l
+  0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00,  // anguage.
+  0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70,  // ...accep
+  0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73,  // t-ranges
+  0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00,  // ....age.
+  0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77,  // ...allow
+  0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68,  // ....auth
+  0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,  // orizatio
+  0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63,  // n....cac
+  0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,  // he-contr
+  0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f,  // ol....co
+  0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,  // nnection
+  0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74,  // ....cont
+  0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65,  // ent-base
+  0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74,  // ....cont
+  0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,  // ent-enco
+  0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10,  // ding....
+  0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d,  // content-
+  0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65,  // language
+  0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74,  // ....cont
+  0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67,  // ent-leng
+  0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f,  // th....co
+  0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f,  // ntent-lo
+  0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00,  // cation..
+  0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,  // ..conten
+  0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00,  // t-md5...
+  0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,  // .content
+  0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00,  // -range..
+  0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,  // ..conten
+  0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00,  // t-type..
+  0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00,  // ..date..
+  0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00,  // ..etag..
+  0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74,  // ..expect
+  0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69,  // ....expi
+  0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66,  // res....f
+  0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68,  // rom....h
+  0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69,  // ost....i
+  0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00,  // f-match.
+  0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f,  // ...if-mo
+  0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73,  // dified-s
+  0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d,  // ince....
+  0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d,  // if-none-
+  0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00,  // match...
+  0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67,  // .if-rang
+  0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d,  // e....if-
+  0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69,  // unmodifi
+  0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65,  // ed-since
+  0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74,  // ....last
+  0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65,  // -modifie
+  0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63,  // d....loc
+  0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00,  // ation...
+  0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72,  // .max-for
+  0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00,  // wards...
+  0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00,  // .pragma.
+  0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79,  // ...proxy
+  0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,  // -authent
+  0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00,  // icate...
+  0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61,  // .proxy-a
+  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61,  // uthoriza
+  0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05,  // tion....
+  0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00,  // range...
+  0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72,  // .referer
+  0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72,  // ....retr
+  0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00,  // y-after.
+  0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65,  // ...serve
+  0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00,  // r....te.
+  0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c,  // ...trail
+  0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72,  // er....tr
+  0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65,  // ansfer-e
+  0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00,  // ncoding.
+  0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61,  // ...upgra
+  0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73,  // de....us
+  0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74,  // er-agent
+  0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79,  // ....vary
+  0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00,  // ....via.
+  0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69,  // ...warni
+  0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77,  // ng....ww
+  0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e,  // w-authen
+  0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00,  // ticate..
+  0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,  // ..method
+  0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00,  // ....get.
+  0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,  // ...statu
+  0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30,  // s....200
+  0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76,  // .OK....v
+  0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00,  // ersion..
+  0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31,  // ..HTTP.1
+  0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72,  // .1....ur
+  0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62,  // l....pub
+  0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73,  // lic....s
+  0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69,  // et-cooki
+  0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65,  // e....kee
+  0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00,  // p-alive.
+  0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69,  // ...origi
+  0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32,  // n1001012
+  0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35,  // 01202205
+  0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30,  // 20630030
+  0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33,  // 23033043
+  0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37,  // 05306307
+  0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30,  // 40240540
+  0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34,  // 64074084
+  0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31,  // 09410411
+  0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31,  // 41241341
+  0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34,  // 44154164
+  0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34,  // 17502504
+  0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e,  // 505203.N
+  0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f,  // on-Autho
+  0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65,  // ritative
+  0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,  // .Informa
+  0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20,  // tion204.
+  0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65,  // No.Conte
+  0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f,  // nt301.Mo
+  0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d,  // ved.Perm
+  0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34,  // anently4
+  0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52,  // 00.Bad.R
+  0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30,  // equest40
+  0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68,  // 1.Unauth
+  0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30,  // orized40
+  0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64,  // 3.Forbid
+  0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e,  // den404.N
+  0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64,  // ot.Found
+  0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65,  // 500.Inte
+  0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72,  // rnal.Ser
+  0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f,  // ver.Erro
+  0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74,  // r501.Not
+  0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,  // .Impleme
+  0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20,  // nted503.
+  0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20,  // Service.
+  0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,  // Unavaila
+  0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46,  // bleJan.F
+  0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41,  // eb.Mar.A
+  0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a,  // pr.May.J
+  0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41,  // un.Jul.A
+  0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20,  // ug.Sept.
+  0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20,  // Oct.Nov.
+  0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30,  // Dec.00.0
+  0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e,  // 0.00.Mon
+  0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57,  // ..Tue..W
+  0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c,  // ed..Thu.
+  0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61,  // .Fri..Sa
+  0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20,  // t..Sun..
+  0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b,  // GMTchunk
+  0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f,  // ed.text.
+  0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61,  // html.ima
+  0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69,  // ge.png.i
+  0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67,  // mage.jpg
+  0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67,  // .image.g
+  0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,  // if.appli
+  0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,  // cation.x
+  0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,  // ml.appli
+  0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,  // cation.x
+  0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c,  // html.xml
+  0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c,  // .text.pl
+  0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74,  // ain.text
+  0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72,  // .javascr
+  0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c,  // ipt.publ
+  0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74,  // icprivat
+  0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65,  // emax-age
+  0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65,  // .gzip.de
+  0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64,  // flate.sd
+  0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,  // chcharse
+  0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63,  // t.utf-8c
+  0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69,  // harset.i
+  0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d,  // so-8859-
+  0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a,  // 1.utf-..
+  0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e         // .enq.0.
+]);
+
+dictionary[3.1] = dictionary[3];
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/framer.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/framer.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/framer.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/framer.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,495 @@
+var spdy = require('../../spdy');
+var util = require('util');
+var Buffer = require('buffer').Buffer;
+var EventEmitter = require('events').EventEmitter;
+var constants = require('./').constants;
+
+function Framer() {
+  EventEmitter.call(this);
+
+  this.version = null;
+  this.deflate = null;
+  this.inflate = null;
+  this.debug = false;
+};
+util.inherits(Framer, EventEmitter);
+module.exports = Framer;
+
+Framer.create = function create(version, deflate, inflate) {
+  return new Framer(version, deflate, inflate);
+};
+
+//
+// ### function setCompression (deflate, inflate)
+// #### @deflate {Deflate}
+// #### @inflate {Inflate}
+// Set framer compression
+//
+Framer.prototype.setCompression = function setCompresion(deflate, inflate) {
+  this.deflate = spdy.utils.zwrap(deflate);
+  this.inflate = spdy.utils.zwrap(inflate);
+};
+
+
+//
+// ### function setCompression (deflate, inflate)
+// #### @deflate {Deflate}
+// #### @inflate {Inflate}
+// Set framer compression
+//
+Framer.prototype.setVersion = function setVersion(version) {
+  this.version = version;
+  this.emit('version');
+};
+
+//
+// internal, converts object into spdy dictionary
+//
+Framer.prototype.headersToDict = function headersToDict(headers, preprocess) {
+  function stringify(value) {
+    if (value !== undefined) {
+      if (Array.isArray(value)) {
+        return value.join('\x00');
+      } else if (typeof value === 'string') {
+        return value;
+      } else {
+        return value.toString();
+      }
+    } else {
+      return '';
+    }
+  }
+
+  // Lower case of all headers keys
+  var loweredHeaders = {};
+  Object.keys(headers || {}).map(function(key) {
+    loweredHeaders[key.toLowerCase()] = headers[key];
+  });
+
+  // Allow outer code to add custom headers or remove something
+  if (preprocess)
+    preprocess(loweredHeaders);
+
+  // Transform object into kv pairs
+  var size = this.version === 2 ? 2 : 4,
+      len = size,
+      pairs = Object.keys(loweredHeaders).filter(function(key) {
+        var lkey = key.toLowerCase();
+        return lkey !== 'connection' && lkey !== 'keep-alive' &&
+               lkey !== 'proxy-connection' && lkey !== 'transfer-encoding';
+      }).map(function(key) {
+        var klen = Buffer.byteLength(key),
+            value = stringify(loweredHeaders[key]),
+            vlen = Buffer.byteLength(value);
+
+        len += size * 2 + klen + vlen;
+        return [klen, key, vlen, value];
+      }),
+      result = new Buffer(len);
+
+  if (this.version === 2)
+    result.writeUInt16BE(pairs.length, 0, true);
+  else
+    result.writeUInt32BE(pairs.length, 0, true);
+
+  var offset = size;
+  pairs.forEach(function(pair) {
+    // Write key length
+    if (this.version === 2)
+      result.writeUInt16BE(pair[0], offset, true);
+    else
+      result.writeUInt32BE(pair[0], offset, true);
+    // Write key
+    result.write(pair[1], offset + size);
+
+    offset += pair[0] + size;
+
+    // Write value length
+    if (this.version === 2)
+      result.writeUInt16BE(pair[2], offset, true);
+    else
+      result.writeUInt32BE(pair[2], offset, true);
+    // Write value
+    result.write(pair[3], offset + size);
+
+    offset += pair[2] + size;
+  }, this);
+
+  return result;
+};
+
+Framer.prototype._synFrame = function _synFrame(type,
+                                                id,
+                                                assoc,
+                                                priority,
+                                                dict,
+                                                callback) {
+  var self = this;
+
+  // Compress headers
+  this.deflate(dict, function (err, chunks, size) {
+    if (err)
+      return callback(err);
+
+    var offset = type === 'SYN_STREAM' ? 18 : self.version === 2 ? 14 : 12,
+        total = offset - 8 + size,
+        frame = new Buffer(offset + size);
+
+    // Control + Version
+    frame.writeUInt16BE(0x8000 | self.version, 0, true);
+    // Type
+    frame.writeUInt16BE(type === 'SYN_STREAM' ? 1 : 2, 2, true);
+    // Size
+    frame.writeUInt32BE(total & 0x00ffffff, 4, true);
+    // Stream ID
+    frame.writeUInt32BE(id & 0x7fffffff, 8, true);
+
+    if (type === 'SYN_STREAM') {
+      // Unidirectional
+      if (assoc !== 0)
+        frame[4] = 2;
+
+      // Associated Stream-ID
+      frame.writeUInt32BE(assoc & 0x7fffffff, 12, true);
+
+      // Priority
+      var priorityValue;
+      if (self.version === 2)
+        priorityValue = Math.max(Math.min(priority, 3), 0) << 6;
+      else
+        priorityValue = Math.max(Math.min(priority, 7), 0) << 5;
+      frame.writeUInt8(priorityValue, 16, true);
+    }
+
+    for (var i = 0; i < chunks.length; i++) {
+      chunks[i].copy(frame, offset);
+      offset += chunks[i].length;
+    }
+
+    callback(null, frame);
+  });
+};
+
+//
+// ### function replyFrame (id, code, reason, headers, callback)
+// #### @id {Number} Stream ID
+// #### @code {Number} HTTP Status Code
+// #### @reason {String} (optional)
+// #### @headers {Object|Array} (optional) HTTP headers
+// #### @callback {Function} Continuation function
+// Sends SYN_REPLY frame
+//
+Framer.prototype.replyFrame = function replyFrame(id,
+                                                  code,
+                                                  reason,
+                                                  headers,
+                                                  callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.replyFrame(id, code, reason, headers, callback);
+    });
+  }
+
+  var self = this;
+  var dict = this.headersToDict(headers, function(headers) {
+    if (self.version === 2) {
+      headers.status = code + ' ' + reason;
+      headers.version = 'HTTP/1.1';
+    } else {
+      headers[':status'] = code + ' ' + reason;
+      headers[':version'] = 'HTTP/1.1';
+    }
+  });
+
+
+  this._synFrame('SYN_REPLY', id, null, 0, dict, callback);
+};
+
+//
+// ### function streamFrame (id, assoc, headers, callback)
+// #### @id {Number} stream id
+// #### @assoc {Number} associated stream id
+// #### @meta {Object} meta headers ( method, scheme, url, version )
+// #### @headers {Object} stream headers
+// #### @callback {Function} continuation callback
+// Create SYN_STREAM frame
+// (needed for server push and testing)
+//
+Framer.prototype.streamFrame = function streamFrame(id,
+                                                    assoc,
+                                                    meta,
+                                                    headers,
+                                                    callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.streamFrame(id, assoc, meta, headers, callback);
+    });
+  }
+
+  var self = this;
+  var dict = this.headersToDict(headers, function(headers) {
+    if (self.version === 2) {
+      if (meta.status)
+        headers.status = meta.status;
+      headers.version = meta.version || 'HTTP/1.1';
+      headers.url = meta.url;
+      if (meta.method)
+        headers.method = meta.method;
+    } else {
+      if (meta.status)
+        headers[':status'] = meta.status;
+      headers[':version'] = meta.version || 'HTTP/1.1';
+      headers[':path'] = meta.path || meta.url;
+      headers[':scheme'] = meta.scheme || 'https';
+      headers[':host'] = meta.host;
+      if (meta.method)
+        headers[':method'] = meta.method;
+    }
+  });
+
+  this._synFrame('SYN_STREAM', id, assoc, meta.priority, dict, callback);
+};
+
+//
+// ### function headersFrame (id, headers, callback)
+// #### @id {Number} Stream id
+// #### @headers {Object} Headers
+// #### @callback {Function}
+// Sends HEADERS frame
+//
+Framer.prototype.headersFrame = function headersFrame(id, headers, callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.headersFrame(id, headers, callback);
+    });
+  }
+
+  var self = this;
+  var dict = this.headersToDict(headers, function(headers) {});
+
+  this.deflate(dict, function (err, chunks, size) {
+    if (err)
+      return callback(err);
+
+    var offset = self.version === 2 ? 14 : 12,
+        total = offset - 8 + size,
+        frame = new Buffer(offset + size);
+
+    // Control + Version
+    frame.writeUInt16BE(0x8000 | self.version, 0, true);
+    // Type
+    frame.writeUInt16BE(8, 2, true);
+    // Length
+    frame.writeUInt32BE(total & 0x00ffffff, 4, true);
+    // Stream ID
+    frame.writeUInt32BE(id & 0x7fffffff, 8, true);
+
+    // Copy chunks
+    for (var i = 0; i < chunks.length; i++) {
+      chunks[i].copy(frame, offset);
+      offset += chunks[i].length;
+    }
+
+    callback(null, frame);
+  });
+};
+
+//
+// ### function dataFrame (id, fin, data, callback)
+// #### @id {Number} Stream id
+// #### @fin {Bool} Is this data frame last frame
+// #### @data {Buffer} Response data
+// #### @callback {Function}
+// Sends DATA frame
+//
+Framer.prototype.dataFrame = function dataFrame(id, fin, data, callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.dataFrame(id, fin, data, callback);
+    });
+  }
+
+  if (!fin && !data.length)
+    return callback(null, []);
+
+  var frame = new Buffer(8 + data.length);
+
+  frame.writeUInt32BE(id & 0x7fffffff, 0, true);
+  frame.writeUInt32BE(data.length & 0x00ffffff, 4, true);
+  frame.writeUInt8(fin ? 0x01 : 0x0, 4, true);
+
+  if (data.length)
+    data.copy(frame, 8);
+
+  return callback(null, frame);
+};
+
+//
+// ### function pingFrame (id)
+// #### @id {Number} Ping ID
+// Sends PING frame
+//
+Framer.prototype.pingFrame = function pingFrame(id, callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.pingFrame(id, callback);
+    });
+  }
+
+  var header = new Buffer(12);
+
+  // Version and type
+  header.writeUInt32BE(0x80000006 | (this.version << 16), 0, true);
+  // Length
+  header.writeUInt32BE(0x00000004, 4, true);
+  // ID
+  header.writeUInt32BE(id, 8, true);
+
+  return callback(null, header);
+};
+
+//
+// ### function rstFrame (id, code, extra, callback)
+// #### @id {Number} Stream ID
+// #### @code {Number} RST Code
+// #### @extra {String} Extra debugging info
+// #### @callback {Function}
+// Sends PING frame
+//
+Framer.prototype.rstFrame = function rstFrame(id, code, extra, callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.rstFrame(id, code, extra, callback);
+    });
+  }
+
+  var header = new Buffer(16 +
+                          (this.debug ? Buffer.byteLength(extra || '') : 0));
+
+  // Version and type
+  header.writeUInt32BE(0x80000003 | (this.version << 16), 0, true);
+  // Length
+  header.writeUInt32BE(0x00000008, 4, true);
+  // Stream ID
+  header.writeUInt32BE(id & 0x7fffffff, 8, true);
+  // Status Code
+  header.writeUInt32BE(code, 12, true);
+
+  // Extra debugging information
+  if (this.debug && extra)
+    header.write(extra, 16);
+
+  return callback(null, header);
+};
+
+//
+// ### function settingsFrame (options, callback)
+// #### @options {Object} settings frame options
+// #### @callback {Function}
+// Sends SETTINGS frame with MAX_CONCURRENT_STREAMS and initial window
+//
+Framer.prototype.settingsFrame = function settingsFrame(options, callback) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.settingsFrame(options, callback);
+    });
+  }
+
+  var settings,
+      key = this.version === 2 ? '2/' + options.maxStreams :
+                                 '3/' + options.maxStreams + ':' +
+                                     options.windowSize;
+
+  if (!(settings = Framer.settingsCache[key])) {
+    var params = [];
+    if (isFinite(options.maxStreams)) {
+      params.push({
+        key: constants.settings.SETTINGS_MAX_CONCURRENT_STREAMS,
+        value: options.maxStreams
+      });
+    }
+    if (this.version > 2) {
+      params.push({
+        key: constants.settings.SETTINGS_INITIAL_WINDOW_SIZE,
+        value: options.windowSize
+      });
+    }
+
+    settings = new Buffer(12 + 8 * params.length);
+
+    // Version and type
+    settings.writeUInt32BE(0x80000004 | (this.version << 16), 0, true);
+    // Length
+    settings.writeUInt32BE((4 + 8 * params.length) & 0x00FFFFFF, 4, true);
+    // Count of entries
+    settings.writeUInt32BE(params.length, 8, true);
+
+    var offset = 12;
+    params.forEach(function(param) {
+      var flag = constants.settings.FLAG_SETTINGS_PERSIST_VALUE << 24;
+
+      if (this.version === 2)
+        settings.writeUInt32LE(flag | param.key, offset, true);
+      else
+        settings.writeUInt32BE(flag | param.key, offset, true);
+      offset += 4;
+      settings.writeUInt32BE(param.value & 0x7fffffff, offset, true);
+      offset += 4;
+    }, this);
+
+    Framer.settingsCache[key] = settings;
+  }
+
+  return callback(null, settings);
+};
+Framer.settingsCache = {};
+
+//
+// ### function windowUpdateFrame (id)
+// #### @id {Buffer} WindowUpdate ID
+// Sends WINDOW_UPDATE frame
+//
+Framer.prototype.windowUpdateFrame = function windowUpdateFrame(id, delta, cb) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.windowUpdateFrame(id, delta, cb);
+    });
+  }
+
+  var header = new Buffer(16);
+
+  // Version and type
+  header.writeUInt32BE(0x80000009 | (this.version << 16), 0, true);
+  // Length
+  header.writeUInt32BE(0x00000008, 4, true);
+  // ID
+  header.writeUInt32BE(id & 0x7fffffff, 8, true);
+  // Delta
+  if (delta > 0)
+    header.writeUInt32BE(delta & 0x7fffffff, 12, true);
+  else
+    header.writeUInt32BE(delta, 12, true);
+
+  return cb(null, header);
+};
+
+Framer.prototype.goawayFrame = function goawayFrame(lastId, status, cb) {
+  if (!this.version) {
+    return this.on('version', function() {
+      this.goawayFrame(lastId, status, cb);
+    });
+  }
+
+  var header = new Buffer(16);
+
+  // Version and type
+  header.writeUInt32BE(0x80000007 | (this.version << 16), 0, true);
+  // Length
+  header.writeUInt32BE(0x00000008, 4, true);
+  // Last-good-stream-ID
+  header.writeUInt32BE(lastId & 0x7fffffff, 8, true);
+  // Status
+  header.writeUInt32BE(status, 12, true);
+
+  return cb(null, header);
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/generic.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/generic.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/generic.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/generic.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-//
-// ### function parseHeader (data)
-// ### @data {Buffer} incoming data
-// Returns parsed SPDY frame header
-//
-exports.parseHeader = function parseHeader(data) {
-  var header = {
-    control: (data.readUInt8(0) & 0x80) === 0x80 ? true : false,
-    version: null,
-    type: null,
-    id: null,
-    flags: data.readUInt8(4),
-    length: data.readUInt32BE(4) & 0x00ffffff
-  };
-
-  if (header.control) {
-    header.version = data.readUInt16BE(0) & 0x7fff;
-    header.type = data.readUInt16BE(2);
-  } else {
-    header.id = data.readUInt32BE(0) & 0x7fffffff;
-  }
-
-  return header;
-};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/index.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/index.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/index.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/index.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,4 @@
+exports.dictionary = require('./dictionary');
+exports.constants = require('./constants');
+exports.parser = require('./parser');
+exports.framer = require('./framer');
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/parser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/parser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/parser.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/parser.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,565 @@
+var parser = exports;
+
+var spdy = require('../../spdy'),
+    utils = spdy.utils,
+    util = require('util'),
+    stream = require('stream'),
+    Buffer = require('buffer').Buffer;
+
+var legacy = !stream.Duplex;
+
+if (legacy) {
+  var DuplexStream = stream;
+} else {
+  var DuplexStream = stream.Duplex;
+}
+
+//
+// ### function Parser (connection)
+// #### @connection {spdy.Connection} connection
+// SPDY protocol frames parser's @constructor
+//
+function Parser(connection) {
+  DuplexStream.call(this);
+
+  this.paused = false;
+  this.buffer = [];
+  this.buffered = 0;
+  this.waiting = 8;
+
+  this.state = { type: 'frame-head' };
+  this.socket = connection.socket;
+  this.connection = connection;
+
+  this.version = null;
+  this.deflate = null;
+  this.inflate = null;
+
+  this.connection = connection;
+
+  if (legacy) {
+    this.readable = this.writable = true;
+  }
+}
+util.inherits(Parser, DuplexStream);
+
+//
+// ### function create (connection)
+// #### @connection {spdy.Connection} connection
+// @constructor wrapper
+//
+parser.create = function create(connection) {
+  return new Parser(connection);
+};
+
+//
+// ### function destroy ()
+// Just a stub.
+//
+Parser.prototype.destroy = function destroy() {
+};
+
+//
+// ### function _write (data, encoding, cb)
+// #### @data {Buffer} chunk of data
+// #### @encoding {Null} encoding
+// #### @cb {Function} callback
+// Writes or buffers data to parser
+//
+Parser.prototype._write = function write(data, encoding, cb) {
+  // Legacy compatibility
+  if (!cb) cb = function() {};
+
+  if (data !== undefined) {
+    // Buffer data
+    this.buffer.push(data);
+    this.buffered += data.length;
+  }
+
+  // Notify caller about state (for piping)
+  if (this.paused) {
+    this.needDrain = true;
+    cb();
+    return false;
+  }
+
+  // We shall not do anything until we get all expected data
+  if (this.buffered < this.waiting) {
+    if (this.needDrain) {
+      // Mark parser as drained
+      this.needDrain = false;
+      this.emit('drain');
+    }
+
+    cb();
+    return;
+  }
+
+  var self = this,
+      buffer = new Buffer(this.waiting),
+      sliced = 0,
+      offset = 0;
+
+  while (this.waiting > offset && sliced < this.buffer.length) {
+    var chunk = this.buffer[sliced++],
+        overmatched = false;
+
+    // Copy chunk into `buffer`
+    if (chunk.length > this.waiting - offset) {
+      chunk.copy(buffer, offset, 0, this.waiting - offset);
+
+      this.buffer[--sliced] = chunk.slice(this.waiting - offset);
+      this.buffered += this.buffer[sliced].length;
+
+      overmatched = true;
+    } else {
+      chunk.copy(buffer, offset);
+    }
+
+    // Move offset and decrease amount of buffered data
+    offset += chunk.length;
+    this.buffered -= chunk.length;
+
+    if (overmatched) break;
+  }
+
+  // Remove used buffers
+  this.buffer = this.buffer.slice(sliced);
+
+  // Executed parser for buffered data
+  this.paused = true;
+  var sync = true;
+  this.execute(this.state, buffer, function (err, waiting) {
+    // Propagate errors
+    if (err) {
+      // And unpause once execution finished
+      self.paused = false;
+
+      cb();
+      return self.emit('error', err);
+    }
+
+    // Set new `waiting`
+    self.waiting = waiting;
+
+    if (sync) {
+      utils.nextTick(function() {
+        // Unpause right before entering new `_write()` call
+        self.paused = false;
+        self._write(undefined, null, cb);
+      });
+    } else {
+      // Unpause right before entering new `_write()` call
+      self.paused = false;
+      self._write(undefined, null, cb);
+    }
+  });
+  sync = false;
+};
+
+if (legacy) {
+  //
+  // ### function write (data, encoding, cb)
+  // #### @data {Buffer} chunk of data
+  // #### @encoding {Null} encoding
+  // #### @cb {Function} callback
+  // Legacy method
+  //
+  Parser.prototype.write = Parser.prototype._write;
+
+  //
+  // ### function end ()
+  // Stream's end() implementation
+  //
+  Parser.prototype.end = function end() {
+    this.emit('end');
+  };
+}
+
+//
+// ### function setVersion (version)
+// #### @version {Number} Protocol version
+// Set protocol version to use
+//
+Parser.prototype.setVersion = function setVersion(version) {
+  this.version = version;
+  this.emit('version', version);
+  this.deflate = spdy.utils.zwrap(this.connection._spdyState.deflate);
+  this.inflate = spdy.utils.zwrap(this.connection._spdyState.inflate);
+};
+
+//
+// ### function execute (state, data, callback)
+// #### @state {Object} Parser's state
+// #### @data {Buffer} Incoming data
+// #### @callback {Function} continuation callback
+// Parse buffered data
+//
+Parser.prototype.execute = function execute(state, data, callback) {
+  if (state.type === 'frame-head') {
+    var header = state.header = this.parseHeader(data);
+
+    if (this.version === null && header.control) {
+      if (header.version !== 2 && header.version !== 3) {
+        return callback(new Error('Unsupported spdy version: ' +
+                                  header.version));
+      }
+      this.setVersion(header.version);
+    }
+
+    state.type = 'frame-body';
+    callback(null, header.length);
+  } else if (state.type === 'frame-body') {
+    var self = this;
+
+    // Data frame
+    if (!state.header.control) {
+      return onFrame(null, {
+        type: 'DATA',
+        id: state.header.id,
+        fin: (state.header.flags & 0x01) === 0x01,
+        compressed: (state.header.flags & 0x02) === 0x02,
+        data: data
+      });
+    } else {
+      // Control frame
+      this.parseBody(state.header, data, onFrame);
+    }
+
+    function onFrame(err, frame) {
+      if (err) return callback(err);
+
+      self.emit('frame', frame);
+
+      state.type = 'frame-head';
+      callback(null, 8);
+    };
+  }
+};
+
+
+//
+// ### function parseHeader (data)
+// ### @data {Buffer} incoming data
+// Returns parsed SPDY frame header
+//
+Parser.prototype.parseHeader = function parseHeader(data) {
+  var header = {
+    control: (data.readUInt8(0) & 0x80) === 0x80 ? true : false,
+    version: null,
+    type: null,
+    id: null,
+    flags: data.readUInt8(4),
+    length: data.readUInt32BE(4) & 0x00ffffff
+  };
+
+  if (header.control) {
+    header.version = data.readUInt16BE(0) & 0x7fff;
+    header.type = data.readUInt16BE(2);
+  } else {
+    header.id = data.readUInt32BE(0) & 0x7fffffff;
+  }
+
+  return header;
+};
+
+
+//
+// ### function execute (header, body, callback)
+// #### @header {Object} Frame headers
+// #### @body {Buffer} Frame's body
+// #### @callback {Function} Continuation callback
+// Parse frame (decompress data and create streams)
+//
+Parser.prototype.parseBody = function parseBody(header, body, callback) {
+  // SYN_STREAM or SYN_REPLY
+  if (header.type === 0x01 || header.type === 0x02)
+    this.parseSynHead(header.type, header.flags, body, callback);
+  // RST_STREAM
+  else if (header.type === 0x03)
+    this.parseRst(body, callback);
+  // SETTINGS
+  else if (header.type === 0x04)
+    this.parseSettings(body, callback);
+  else if (header.type === 0x05)
+    callback(null, { type: 'NOOP' });
+  // PING
+  else if (header.type === 0x06)
+    this.parsePing(body, callback);
+  // GOAWAY
+  else if (header.type === 0x07)
+    this.parseGoaway(body, callback);
+  // HEADERS
+  else if (header.type === 0x08)
+    this.parseHeaders(body, callback);
+  // WINDOW_UPDATE
+  else if (header.type === 0x09)
+    this.parseWindowUpdate(body, callback);
+  // X-FORWARDED
+  else if (header.type === 0xf000)
+    this.parseXForwarded(body, callback);
+  else
+    callback(null, { type: 'unknown: ' + header.type, body: body });
+};
+
+
+//
+// ### function parseSynHead (type, flags, data)
+// #### @type {Number} Frame type
+// #### @flags {Number} Frame flags
+// #### @data {Buffer} input data
+// Returns parsed syn_* frame's head
+//
+Parser.prototype.parseSynHead = function parseSynHead(type,
+                                                      flags,
+                                                      data,
+                                                      callback) {
+  var stream = type === 0x01;
+  var offset = stream ? 10 : this.version === 2 ? 6 : 4;
+
+  if (data.length < offset)
+    return callback(new Error('SynHead OOB'));
+
+  var kvs = data.slice(offset);
+  this.parseKVs(kvs, function(err, headers) {
+    if (err)
+      return callback(err);
+
+    if (stream === 'SYN_STREAM' &&
+        (!headers.method || !(headers.path || headers.url))) {
+      return callback(new Error('Missing `:method` and/or `:path` header'));
+    }
+
+    callback(null, {
+      type: stream ? 'SYN_STREAM' : 'SYN_REPLY',
+      id: data.readUInt32BE(0, true) & 0x7fffffff,
+      associated: stream ? data.readUInt32BE(4, true) & 0x7fffffff : 0,
+      priority: stream ? data[8] >> 5 : 0,
+      fin: (flags & 0x01) === 0x01,
+      unidir: (flags & 0x02) === 0x02,
+      headers: headers,
+      url: headers.path || headers.url || ''
+    });
+  });
+};
+
+
+//
+// ### function parseHeaders (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse HEADERS
+//
+Parser.prototype.parseHeaders = function parseHeaders(data, callback) {
+  var offset = this.version === 2 ? 6 : 4;
+  if (data.length < offset)
+    return callback(new Error('HEADERS OOB'));
+
+  var streamId = data.readUInt32BE(0, true) & 0x7fffffff;
+
+  this.parseKVs(data.slice(offset), function(err, headers) {
+    if (err)
+      return callback(err);
+
+    callback(null, {
+      type: 'HEADERS',
+      id: streamId,
+      headers: headers
+    });
+  });
+};
+
+
+//
+// ### function parseKVs (pairs, callback)
+// #### @pairs {Buffer} header pairs
+// #### @callback {Function} continuation
+// Returns hashmap of parsed headers
+//
+Parser.prototype.parseKVs = function parseKVs(pairs, callback) {
+  var self = this;
+  this.inflate(pairs, function(err, chunks, length) {
+    if (err)
+      return callback(err);
+
+    var pairs = Buffer.concat(chunks, length);
+
+    var size = self.version === 2 ? 2 : 4;
+    if (pairs.length < size)
+      return callback(new Error('KV OOB'));
+
+    var count = size === 2 ? pairs.readUInt16BE(0, true) :
+                             pairs.readUInt32BE(0, true),
+        headers = {};
+
+    pairs = pairs.slice(size);
+
+    function readString() {
+      if (pairs.length < size)
+        return null;
+      var len = size === 2 ? pairs.readUInt16BE(0, true) :
+                             pairs.readUInt32BE(0, true);
+
+      if (pairs.length < size + len) {
+        return null;
+      }
+      var value = pairs.slice(size, size + len);
+
+      pairs = pairs.slice(size + len);
+
+      return value.toString();
+    }
+
+    while(count > 0) {
+      var key = readString(),
+          value = readString();
+
+      if (key === null || value === null)
+        return callback(new Error('Headers OOB'));
+
+      if (self.version >= 3)
+        headers[key.replace(/^:/, '')] = value;
+      else
+        headers[key] = value;
+      count--;
+    }
+
+    callback(null, headers);
+  });
+};
+
+
+//
+// ### function parseRst (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse RST
+//
+Parser.prototype.parseRst = function parseRst(data, callback) {
+  if (data.length < 8)
+    return callback(new Error('RST OOB'));
+
+  callback(null, {
+    type: 'RST_STREAM',
+    id: data.readUInt32BE(0, true) & 0x7fffffff,
+    status: data.readUInt32BE(4, true),
+    extra: data.length > 8 ? data.slice(8) : null
+  });
+};
+
+
+//
+// ### function parseSettings (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse SETTINGS
+//
+Parser.prototype.parseSettings = function parseSettings(data, callback) {
+  if (data.length < 4)
+    return callback(new Error('SETTINGS OOB'));
+
+  var settings = {},
+      number = data.readUInt32BE(0, true),
+      idMap = {
+        1: 'upload_bandwidth',
+        2: 'download_bandwidth',
+        3: 'round_trip_time',
+        4: 'max_concurrent_streams',
+        5: 'current_cwnd',
+        6: 'download_retrans_rate',
+        7: 'initial_window_size',
+        8: 'client_certificate_vector_size'
+      };
+
+  if (data.length < 4 + number * 8)
+    return callback(new Error('SETTINGS OOB#2'));
+
+  for (var i = 0; i < number; i++) {
+    var id = (this.version === 2 ? data.readUInt32LE(4 + i * 8, true) :
+                                   data.readUInt32BE(4 + i * 8, true)),
+        flags = (id >> 24) & 0xff;
+    id = id & 0xffffff;
+
+    var name = idMap[id];
+
+    settings[id] = settings[name] = {
+      persist: !!(flags & 0x1),
+      persisted: !!(flags & 0x2),
+      value: data.readUInt32BE(8 + (i*8), true)
+    };
+  }
+
+  callback(null, {
+    type: 'SETTINGS',
+    settings: settings
+  });
+};
+
+
+//
+// ### function parseGoaway (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse PING
+//
+Parser.prototype.parsePing = function parsePing(body, callback) {
+  if (body.length < 4)
+    return callback(new Error('PING OOB'));
+  callback(null, { type: 'PING', pingId: body.readUInt32BE(0, true) });
+};
+
+
+//
+// ### function parseGoaway (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse GOAWAY
+//
+Parser.prototype.parseGoaway = function parseGoaway(data, callback) {
+  if (data.length < 4)
+    return callback(new Error('GOAWAY OOB'));
+
+  callback(null, {
+    type: 'GOAWAY',
+    lastId: data.readUInt32BE(0, true) & 0x7fffffff
+  });
+};
+
+
+//
+// ### function parseWindowUpdate (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse WINDOW_UPDATE
+//
+Parser.prototype.parseWindowUpdate = function parseWindowUpdate(data, callback) {
+  if (data.length < 8)
+    return callback(new Error('WINDOW_UPDATE OOB'));
+
+  callback(null, {
+    type: 'WINDOW_UPDATE',
+    id: data.readUInt32BE(0, true) & 0x7fffffff,
+    delta: data.readUInt32BE(4, true) & 0x7fffffff
+  });
+};
+
+
+//
+// ### function parseXForwarded (data, callback)
+// #### @data {Buffer} input data
+// #### @callback {Function} continuation
+// Parse X_FORWARDED
+//
+Parser.prototype.parseXForwarded = function parseXForwarded(data, callback) {
+  if (data.length < 4)
+    return callback(new Error('X_FORWARDED OOB'));
+
+  var len = data.readUInt32BE(0, true);
+  if (len + 4 > data.length)
+    return callback(new Error('X_FORWARDED host length OOB'));
+
+  callback(null, {
+    type: 'X_FORWARDED',
+    host: data.slice(4, 4 + len).toString()
+  });
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/dictionary.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/dictionary.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/dictionary.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/dictionary.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-exports.dictionary = new Buffer([
-  'optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-',
-  'languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi',
-  'f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser',
-  '-agent10010120020120220320420520630030130230330430530630740040140240340440',
-  '5406407408409410411412413414415416417500501502503504505accept-rangesageeta',
-  'glocationproxy-authenticatepublicretry-afterservervarywarningwww-authentic',
-  'ateallowcontent-basecontent-encodingcache-controlconnectiondatetrailertran',
-  'sfer-encodingupgradeviawarningcontent-languagecontent-lengthcontent-locati',
-  'oncontent-md5content-rangecontent-typeetagexpireslast-modifiedset-cookieMo',
-  'ndayTuesdayWednesdayThursdayFridaySaturdaySundayJanFebMarAprMayJunJulAugSe',
-  'pOctNovDecchunkedtext/htmlimage/pngimage/jpgimage/gifapplication/xmlapplic',
-  'ation/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1',
-  '.1statusversionurl\x00'
-].join(''));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/framer.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/framer.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/framer.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/framer.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,286 +0,0 @@
-var framer = exports;
-
-var spdy = require('../../../spdy'),
-    Buffer = require('buffer').Buffer,
-    protocol = require('./');
-
-//
-// ### function Framer (deflate, inflate)
-// #### @deflate {zlib.Deflate} Deflate stream
-// #### @inflate {zlib.Inflate} Inflate stream
-// Framer constructor
-//
-function Framer(deflate, inflate) {
-  this.version = 2;
-  this.deflate = deflate;
-  this.inflate = inflate;
-}
-exports.Framer = Framer;
-
-
-//
-// ### function execute (header, body, callback)
-// #### @header {Object} Frame headers
-// #### @body {Buffer} Frame's body
-// #### @callback {Function} Continuation callback
-// Parse frame (decompress data and create streams)
-//
-Framer.prototype.execute = function execute(header, body, callback) {
-  // SYN_STREAM or SYN_REPLY
-  if (header.type === 0x01 || header.type === 0x02) {
-    var frame = protocol.parseSynHead(header.type, header.flags, body);
-
-    body = body.slice(frame._offset);
-
-    this.inflate(body, function(err, chunks, length) {
-      if (err) return callback(err);
-
-      var pairs = new Buffer(length);
-      for (var i = 0, offset = 0; i < chunks.length; i++) {
-        chunks[i].copy(pairs, offset);
-        offset += chunks[i].length;
-      }
-
-      frame.headers = protocol.parseHeaders(pairs);
-      frame.url = frame.headers.url || '';
-
-      callback(null, frame);
-    });
-  // RST_STREAM
-  } else if (header.type === 0x03) {
-    callback(null, protocol.parseRst(body));
-  // SETTINGS
-  } else if (header.type === 0x04) {
-    callback(null, { type: 'SETTINGS' });
-  } else if (header.type === 0x05) {
-    callback(null, { type: 'NOOP' });
-  // PING
-  } else if (header.type === 0x06) {
-    callback(null, { type: 'PING', pingId: body });
-  // GOAWAY
-  } else if (header.type === 0x07) {
-    callback(null, protocol.parseGoaway(body));
-  } else {
-    callback(null, { type: 'unknown: ' + header.type, body: body });
-  }
-};
-
-//
-// internal, converts object into spdy dictionary
-//
-function headersToDict(headers, preprocess) {
-  function stringify(value) {
-    if (value !== undefined) {
-      if (Array.isArray(value)) {
-        return value.join('\x00');
-      } else if (typeof value === 'string') {
-        return value;
-      } else {
-        return value.toString();
-      }
-    } else {
-      return '';
-    }
-  }
-
-  // Lower case of all headers keys
-  var loweredHeaders = {};
-  Object.keys(headers || {}).map(function(key) {
-    loweredHeaders[key.toLowerCase()] = headers[key];
-  });
-
-  // Allow outer code to add custom headers or remove something
-  if (preprocess) preprocess(loweredHeaders);
-
-  // Transform object into kv pairs
-  var len = 2,
-      pairs = Object.keys(loweredHeaders).filter(function(key) {
-        var lkey = key.toLowerCase();
-        return lkey !== 'connection' && lkey !== 'keep-alive' &&
-               lkey !== 'proxy-connection' && lkey !== 'transfer-encoding';
-      }).map(function(key) {
-        var klen = Buffer.byteLength(key),
-            value = stringify(loweredHeaders[key]),
-            vlen = Buffer.byteLength(value);
-
-        len += 4 + klen + vlen;
-        return [klen, key, vlen, value];
-      }),
-      result = new Buffer(len);
-
-  result.writeUInt16BE(pairs.length, 0, true);
-
-  var offset = 2;
-  pairs.forEach(function(pair) {
-    // Write key length
-    result.writeUInt16BE(pair[0], offset, true);
-    // Write key
-    result.write(pair[1], offset + 2);
-
-    offset += pair[0] + 2;
-
-    // Write value length
-    result.writeUInt16BE(pair[2], offset, true);
-    // Write value
-    result.write(pair[3], offset + 2);
-
-    offset += pair[2] + 2;
-  });
-
-  return result;
-};
-
-Framer.prototype._synFrame = function _synFrame(type, id, assoc, priority, dict,
-                                                callback) {
-  // Compress headers
-  this.deflate(dict, function (err, chunks, size) {
-    if (err) return callback(err);
-
-    var offset = type === 'SYN_STREAM' ? 18 : 14,
-        total = (type === 'SYN_STREAM' ? 10 : 6) + size,
-        frame = new Buffer(offset + size);;
-
-    frame.writeUInt16BE(0x8002, 0, true); // Control + Version
-    frame.writeUInt16BE(type === 'SYN_STREAM' ? 1 : 2, 2, true); // type
-    frame.writeUInt32BE(total & 0x00ffffff, 4, true); // No flag support
-    frame.writeUInt32BE(id & 0x7fffffff, 8, true); // Stream-ID
-
-    if (type === 'SYN_STREAM') {
-      frame[4] = 2;
-      frame.writeUInt32BE(assoc & 0x7fffffff, 12, true); // Stream-ID
-    }
-
-    frame.writeUInt8(priority & 0x3, 16, true); // Priority
-
-    for (var i = 0; i < chunks.length; i++) {
-      chunks[i].copy(frame, offset);
-      offset += chunks[i].length;
-    }
-
-    callback(null, frame);
-  });
-};
-
-//
-// ### function replyFrame (id, code, reason, headers, callback)
-// #### @id {Number} Stream ID
-// #### @code {Number} HTTP Status Code
-// #### @reason {String} (optional)
-// #### @headers {Object|Array} (optional) HTTP headers
-// #### @callback {Function} Continuation function
-// Sends SYN_REPLY frame
-//
-Framer.prototype.replyFrame = function replyFrame(id, code, reason, headers,
-                                                  callback) {
-  var dict = headersToDict(headers, function(headers) {
-    headers.status = code + ' ' + reason;
-    headers.version = 'HTTP/1.1';
-  });
-
-  this._synFrame('SYN_REPLY', id, null, 0, dict, callback);
-};
-
-//
-// ### function streamFrame (id, assoc, headers, callback)
-// #### @id {Number} stream id
-// #### @assoc {Number} associated stream id
-// #### @meta {Object} meta headers ( method, scheme, url, version )
-// #### @headers {Object} stream headers
-// #### @callback {Function} continuation callback
-// Create SYN_STREAM frame
-// (needed for server push and testing)
-//
-Framer.prototype.streamFrame = function streamFrame(id, assoc, meta, headers,
-                                                    callback) {
-  var dict = headersToDict(headers, function(headers) {
-    headers.status = 200;
-    headers.version = 'HTTP/1.1';
-    headers.url = meta.url;
-  });
-
-  this._synFrame('SYN_STREAM', id, assoc, meta.priority, dict, callback);
-};
-
-//
-// ### function dataFrame (id, fin, data)
-// #### @id {Number} Stream id
-// #### @fin {Bool} Is this data frame last frame
-// #### @data {Buffer} Response data
-// Sends DATA frame
-//
-Framer.prototype.dataFrame = function dataFrame(id, fin, data) {
-  if (!fin && !data.length) return [];
-
-  var frame = new Buffer(8 + data.length);
-
-  frame.writeUInt32BE(id & 0x7fffffff, 0, true);
-  frame.writeUInt32BE(data.length & 0x00ffffff, 4, true);
-  frame.writeUInt8(fin ? 0x01 : 0x0, 4, true);
-
-  if (data.length) data.copy(frame, 8);
-
-  return frame;
-};
-
-//
-// ### function pingFrame (id)
-// #### @id {Buffer} Ping ID
-// Sends PING frame
-//
-Framer.prototype.pingFrame = function pingFrame(id) {
-  var header = new Buffer(12);
-
-  header.writeUInt32BE(0x80020006, 0, true); // Version and type
-  header.writeUInt32BE(0x00000004, 4, true); // Length
-  id.copy(header, 8, 0, 4); // ID
-
-  return header;
-};
-
-//
-// ### function rstFrame (id, code)
-// #### @id {Number} Stream ID
-// #### @code {NUmber} RST Code
-// Sends PING frame
-//
-Framer.prototype.rstFrame = function rstFrame(id, code) {
-  var header;
-
-  if (!(header = Framer.rstCache[code])) {
-    header = new Buffer(16);
-
-    header.writeUInt32BE(0x80020003, 0, true); // Version and type
-    header.writeUInt32BE(0x00000008, 4, true); // Length
-    header.writeUInt32BE(id & 0x7fffffff, 8, true); // Stream ID
-    header.writeUInt32BE(code, 12, true); // Status Code
-
-    Framer.rstCache[code] = header;
-  }
-
-  return header;
-};
-Framer.rstCache = {};
-
-//
-// ### function settingsFrame (options)
-// #### @options {Object} settings frame options
-// Sends SETTINGS frame with MAX_CONCURRENT_STREAMS
-//
-Framer.prototype.settingsFrame = function settingsFrame(options) {
-  var settings;
-
-  if (!(settings = Framer.settingsCache[options.maxStreams])) {
-    settings = new Buffer(20);
-
-    settings.writeUInt32BE(0x80020004, 0, true); // Version and type
-    settings.writeUInt32BE(0x0000000C, 4, true); // length
-    settings.writeUInt32BE(0x00000001, 8, true); // Count of entries
-    settings.writeUInt32LE(0x01000004, 12, true); // Entry ID and Persist flag
-    settings.writeUInt32BE(options.maxStreams, 16, true);
-
-    Framer.settingsCache[options.maxStreams] = settings;
-  }
-
-  return settings;
-};
-Framer.settingsCache = {};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/index.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/index.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/index.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/index.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-var v2;
-
-try {
-  v2 = require('./protocol.node');
-} catch (e) {
-  v2 = require('./protocol.js');
-}
-module.exports = v2;
-
-v2.Framer = require('./framer').Framer;
-
-v2.dictionary = require('./dictionary').dictionary;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/protocol.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/protocol.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/protocol.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v2/protocol.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-var protocol = exports;
-
-//
-// ### function parseSynHead (type, flags, data)
-// #### @type {Number} Frame type
-// #### @flags {Number} Frame flags
-// #### @data {Buffer} input data
-// Returns parsed syn_* frame's head
-//
-protocol.parseSynHead = function parseSynHead(type, flags, data) {
-  var stream = type === 0x01;
-
-  return {
-    type: stream ? 'SYN_STREAM' : 'SYN_REPLY',
-    id: data.readUInt32BE(0, true) & 0x7fffffff,
-    version: 2,
-    associated: stream ? data.readUInt32BE(4, true) & 0x7fffffff : 0,
-    priority: stream ? data[8] >> 6 : 0,
-    fin: (flags & 0x01) === 0x01,
-    unidir: (flags & 0x02) === 0x02,
-    _offset: stream ? 10 : 6
-  };
-};
-
-//
-// ### function parseHeaders (pairs)
-// #### @pairs {Buffer} header pairs
-// Returns hashmap of parsed headers
-//
-protocol.parseHeaders = function parseHeaders(pairs) {
-  var count = pairs.readUInt16BE(0, true),
-      headers = {};
-
-  pairs = pairs.slice(2);
-
-  function readString() {
-    var len = pairs.readUInt16BE(0, true),
-        value = pairs.slice(2, 2 + len);
-
-    pairs = pairs.slice(2 + len);
-
-    return value.toString();
-  }
-
-  while(count > 0) {
-    headers[readString()] = readString();
-    count--;
-  }
-
-  return headers;
-};
-
-//
-// ### function parsesRst frame
-protocol.parseRst = function parseRst(data) {
-  return {
-    type: 'RST_STREAM',
-    id: data.readUInt32BE(0, true) & 0x7fffffff,
-    status: data.readUInt32BE(4, true)
-  };
-};
-
-protocol.parseGoaway = function parseGoaway(data) {
-  return {
-    type: 'GOAWAY',
-    lastId: data.readUInt32BE(0, true) & 0x7fffffff
-  };
-};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/dictionary.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/dictionary.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/dictionary.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/dictionary.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-exports.dictionary = new Buffer([
-	0x00, 0x00, 0x00, 0x07, 0x6f, 0x70, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, 0x04, 0x68,
-	0x65, 0x61, 0x64, 0x00, 0x00, 0x00, 0x04, 0x70,
-	0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x03, 0x70,
-	0x75, 0x74, 0x00, 0x00, 0x00, 0x06, 0x64, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x00, 0x00, 0x00, 0x05,
-	0x74, 0x72, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
-	0x06, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x00,
-	0x00, 0x00, 0x0e, 0x61, 0x63, 0x63, 0x65, 0x70,
-	0x74, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,
-	0x74, 0x00, 0x00, 0x00, 0x0f, 0x61, 0x63, 0x63,
-	0x65, 0x70, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,
-	0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x0f,
-	0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x6c,
-	0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x00,
-	0x00, 0x00, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70,
-	0x74, 0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73,
-	0x00, 0x00, 0x00, 0x03, 0x61, 0x67, 0x65, 0x00,
-	0x00, 0x00, 0x05, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
-	0x00, 0x00, 0x00, 0x0d, 0x61, 0x75, 0x74, 0x68,
-	0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x00, 0x00, 0x00, 0x0d, 0x63, 0x61, 0x63,
-	0x68, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x00, 0x00, 0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65,
-	0x00, 0x00, 0x00, 0x10, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x2d, 0x65, 0x6e, 0x63, 0x6f,
-	0x64, 0x69, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x10,
-	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d,
-	0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65,
-	0x00, 0x00, 0x00, 0x0e, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x6e, 0x67,
-	0x74, 0x68, 0x00, 0x00, 0x00, 0x10, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x6c, 0x6f,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00,
-	0x00, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x2d, 0x6d, 0x64, 0x35, 0x00, 0x00, 0x00,
-	0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x2d, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00,
-	0x00, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x00, 0x00,
-	0x00, 0x04, 0x64, 0x61, 0x74, 0x65, 0x00, 0x00,
-	0x00, 0x04, 0x65, 0x74, 0x61, 0x67, 0x00, 0x00,
-	0x00, 0x06, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74,
-	0x00, 0x00, 0x00, 0x07, 0x65, 0x78, 0x70, 0x69,
-	0x72, 0x65, 0x73, 0x00, 0x00, 0x00, 0x04, 0x66,
-	0x72, 0x6f, 0x6d, 0x00, 0x00, 0x00, 0x04, 0x68,
-	0x6f, 0x73, 0x74, 0x00, 0x00, 0x00, 0x08, 0x69,
-	0x66, 0x2d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x00,
-	0x00, 0x00, 0x11, 0x69, 0x66, 0x2d, 0x6d, 0x6f,
-	0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2d, 0x73,
-	0x69, 0x6e, 0x63, 0x65, 0x00, 0x00, 0x00, 0x0d,
-	0x69, 0x66, 0x2d, 0x6e, 0x6f, 0x6e, 0x65, 0x2d,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x00, 0x00, 0x00,
-	0x08, 0x69, 0x66, 0x2d, 0x72, 0x61, 0x6e, 0x67,
-	0x65, 0x00, 0x00, 0x00, 0x13, 0x69, 0x66, 0x2d,
-	0x75, 0x6e, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69,
-	0x65, 0x64, 0x2d, 0x73, 0x69, 0x6e, 0x63, 0x65,
-	0x00, 0x00, 0x00, 0x0d, 0x6c, 0x61, 0x73, 0x74,
-	0x2d, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65,
-	0x64, 0x00, 0x00, 0x00, 0x08, 0x6c, 0x6f, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00,
-	0x0c, 0x6d, 0x61, 0x78, 0x2d, 0x66, 0x6f, 0x72,
-	0x77, 0x61, 0x72, 0x64, 0x73, 0x00, 0x00, 0x00,
-	0x06, 0x70, 0x72, 0x61, 0x67, 0x6d, 0x61, 0x00,
-	0x00, 0x00, 0x12, 0x70, 0x72, 0x6f, 0x78, 0x79,
-	0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00, 0x00,
-	0x13, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2d, 0x61,
-	0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x05,
-	0x72, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x00, 0x00,
-	0x07, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72,
-	0x00, 0x00, 0x00, 0x0b, 0x72, 0x65, 0x74, 0x72,
-	0x79, 0x2d, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00,
-	0x00, 0x00, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x00, 0x00, 0x00, 0x02, 0x74, 0x65, 0x00,
-	0x00, 0x00, 0x07, 0x74, 0x72, 0x61, 0x69, 0x6c,
-	0x65, 0x72, 0x00, 0x00, 0x00, 0x11, 0x74, 0x72,
-	0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2d, 0x65,
-	0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x00,
-	0x00, 0x00, 0x07, 0x75, 0x70, 0x67, 0x72, 0x61,
-	0x64, 0x65, 0x00, 0x00, 0x00, 0x0a, 0x75, 0x73,
-	0x65, 0x72, 0x2d, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x00, 0x00, 0x00, 0x04, 0x76, 0x61, 0x72, 0x79,
-	0x00, 0x00, 0x00, 0x03, 0x76, 0x69, 0x61, 0x00,
-	0x00, 0x00, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69,
-	0x6e, 0x67, 0x00, 0x00, 0x00, 0x10, 0x77, 0x77,
-	0x77, 0x2d, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e,
-	0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x00,
-	0x00, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-	0x00, 0x00, 0x00, 0x03, 0x67, 0x65, 0x74, 0x00,
-	0x00, 0x00, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x00, 0x00, 0x00, 0x06, 0x32, 0x30, 0x30,
-	0x20, 0x4f, 0x4b, 0x00, 0x00, 0x00, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x00,
-	0x00, 0x08, 0x48, 0x54, 0x54, 0x50, 0x2f, 0x31,
-	0x2e, 0x31, 0x00, 0x00, 0x00, 0x03, 0x75, 0x72,
-	0x6c, 0x00, 0x00, 0x00, 0x06, 0x70, 0x75, 0x62,
-	0x6c, 0x69, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x73,
-	0x65, 0x74, 0x2d, 0x63, 0x6f, 0x6f, 0x6b, 0x69,
-	0x65, 0x00, 0x00, 0x00, 0x0a, 0x6b, 0x65, 0x65,
-	0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x00,
-	0x00, 0x00, 0x06, 0x6f, 0x72, 0x69, 0x67, 0x69,
-	0x6e, 0x31, 0x30, 0x30, 0x31, 0x30, 0x31, 0x32,
-	0x30, 0x31, 0x32, 0x30, 0x32, 0x32, 0x30, 0x35,
-	0x32, 0x30, 0x36, 0x33, 0x30, 0x30, 0x33, 0x30,
-	0x32, 0x33, 0x30, 0x33, 0x33, 0x30, 0x34, 0x33,
-	0x30, 0x35, 0x33, 0x30, 0x36, 0x33, 0x30, 0x37,
-	0x34, 0x30, 0x32, 0x34, 0x30, 0x35, 0x34, 0x30,
-	0x36, 0x34, 0x30, 0x37, 0x34, 0x30, 0x38, 0x34,
-	0x30, 0x39, 0x34, 0x31, 0x30, 0x34, 0x31, 0x31,
-	0x34, 0x31, 0x32, 0x34, 0x31, 0x33, 0x34, 0x31,
-	0x34, 0x34, 0x31, 0x35, 0x34, 0x31, 0x36, 0x34,
-	0x31, 0x37, 0x35, 0x30, 0x32, 0x35, 0x30, 0x34,
-	0x35, 0x30, 0x35, 0x32, 0x30, 0x33, 0x20, 0x4e,
-	0x6f, 0x6e, 0x2d, 0x41, 0x75, 0x74, 0x68, 0x6f,
-	0x72, 0x69, 0x74, 0x61, 0x74, 0x69, 0x76, 0x65,
-	0x20, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x32, 0x30, 0x34, 0x20,
-	0x4e, 0x6f, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x33, 0x30, 0x31, 0x20, 0x4d, 0x6f,
-	0x76, 0x65, 0x64, 0x20, 0x50, 0x65, 0x72, 0x6d,
-	0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x34,
-	0x30, 0x30, 0x20, 0x42, 0x61, 0x64, 0x20, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x34, 0x30,
-	0x31, 0x20, 0x55, 0x6e, 0x61, 0x75, 0x74, 0x68,
-	0x6f, 0x72, 0x69, 0x7a, 0x65, 0x64, 0x34, 0x30,
-	0x33, 0x20, 0x46, 0x6f, 0x72, 0x62, 0x69, 0x64,
-	0x64, 0x65, 0x6e, 0x34, 0x30, 0x34, 0x20, 0x4e,
-	0x6f, 0x74, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64,
-	0x35, 0x30, 0x30, 0x20, 0x49, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x20, 0x53, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x20, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x35, 0x30, 0x31, 0x20, 0x4e, 0x6f, 0x74,
-	0x20, 0x49, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x65, 0x64, 0x35, 0x30, 0x33, 0x20,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20,
-	0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
-	0x62, 0x6c, 0x65, 0x4a, 0x61, 0x6e, 0x20, 0x46,
-	0x65, 0x62, 0x20, 0x4d, 0x61, 0x72, 0x20, 0x41,
-	0x70, 0x72, 0x20, 0x4d, 0x61, 0x79, 0x20, 0x4a,
-	0x75, 0x6e, 0x20, 0x4a, 0x75, 0x6c, 0x20, 0x41,
-	0x75, 0x67, 0x20, 0x53, 0x65, 0x70, 0x74, 0x20,
-	0x4f, 0x63, 0x74, 0x20, 0x4e, 0x6f, 0x76, 0x20,
-	0x44, 0x65, 0x63, 0x20, 0x30, 0x30, 0x3a, 0x30,
-	0x30, 0x3a, 0x30, 0x30, 0x20, 0x4d, 0x6f, 0x6e,
-	0x2c, 0x20, 0x54, 0x75, 0x65, 0x2c, 0x20, 0x57,
-	0x65, 0x64, 0x2c, 0x20, 0x54, 0x68, 0x75, 0x2c,
-	0x20, 0x46, 0x72, 0x69, 0x2c, 0x20, 0x53, 0x61,
-	0x74, 0x2c, 0x20, 0x53, 0x75, 0x6e, 0x2c, 0x20,
-	0x47, 0x4d, 0x54, 0x63, 0x68, 0x75, 0x6e, 0x6b,
-	0x65, 0x64, 0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f,
-	0x68, 0x74, 0x6d, 0x6c, 0x2c, 0x69, 0x6d, 0x61,
-	0x67, 0x65, 0x2f, 0x70, 0x6e, 0x67, 0x2c, 0x69,
-	0x6d, 0x61, 0x67, 0x65, 0x2f, 0x6a, 0x70, 0x67,
-	0x2c, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x67,
-	0x69, 0x66, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,
-	0x6d, 0x6c, 0x2c, 0x61, 0x70, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x78,
-	0x68, 0x74, 0x6d, 0x6c, 0x2b, 0x78, 0x6d, 0x6c,
-	0x2c, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c,
-	0x61, 0x69, 0x6e, 0x2c, 0x74, 0x65, 0x78, 0x74,
-	0x2f, 0x6a, 0x61, 0x76, 0x61, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2c, 0x70, 0x75, 0x62, 0x6c,
-	0x69, 0x63, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74,
-	0x65, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65,
-	0x3d, 0x67, 0x7a, 0x69, 0x70, 0x2c, 0x64, 0x65,
-	0x66, 0x6c, 0x61, 0x74, 0x65, 0x2c, 0x73, 0x64,
-	0x63, 0x68, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65,
-	0x74, 0x3d, 0x75, 0x74, 0x66, 0x2d, 0x38, 0x63,
-	0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x3d, 0x69,
-	0x73, 0x6f, 0x2d, 0x38, 0x38, 0x35, 0x39, 0x2d,
-	0x31, 0x2c, 0x75, 0x74, 0x66, 0x2d, 0x2c, 0x2a,
-	0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e
-]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/framer.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/framer.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/framer.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/framer.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,335 +0,0 @@
-var framer = exports;
-
-var spdy = require('../../../spdy'),
-    Buffer = require('buffer').Buffer,
-    protocol = require('./');
-
-//
-// ### function Framer (deflate, inflate)
-// #### @deflate {zlib.Deflate} Deflate stream
-// #### @inflate {zlib.Inflate} Inflate stream
-// Framer constructor
-//
-function Framer(deflate, inflate) {
-  this.version = 3;
-  this.deflate = deflate;
-  this.inflate = inflate;
-}
-exports.Framer = Framer;
-
-//
-// ### function execute (header, body, callback)
-// #### @header {Object} Frame headers
-// #### @body {Buffer} Frame's body
-// #### @callback {Function} Continuation callback
-// Parse frame (decompress data and create streams)
-//
-Framer.prototype.execute = function execute(header, body, callback) {
-  // SYN_STREAM or SYN_REPLY
-  if (header.type === 0x01 || header.type === 0x02) {
-    var frame = protocol.parseSynHead(header.type, header.flags, body);
-
-    body = body.slice(frame._offset);
-
-    this.inflate(body, function(err, chunks, length) {
-      if (err) return callback(err);
-
-      var pairs = new Buffer(length);
-      for (var i = 0, offset = 0; i < chunks.length; i++) {
-        chunks[i].copy(pairs, offset);
-        offset += chunks[i].length;
-      }
-
-      frame.headers = protocol.parseHeaders(pairs);
-      frame.url = frame.headers.path || '';
-
-      callback(null, frame);
-    });
-  // RST_STREAM
-  } else if (header.type === 0x03) {
-    callback(null, protocol.parseRst(body));
-  // SETTINGS
-  } else if (header.type === 0x04) {
-    callback(null, protocol.parseSettings(body));
-  } else if (header.type === 0x05) {
-    callback(null, { type: 'NOOP' });
-  // PING
-  } else if (header.type === 0x06) {
-    callback(null, { type: 'PING', pingId: body });
-  // GOAWAY
-  } else if (header.type === 0x07) {
-    callback(null, protocol.parseGoaway(body));
-  } else if (header.type === 0x09) {
-    callback(null, protocol.parseWindowUpdate(body));
-  } else {
-    callback(null, { type: 'unknown: ' + header.type, body: body });
-  }
-};
-
-//
-// internal, converts object into spdy dictionary
-//
-function headersToDict(headers, preprocess) {
-  function stringify(value) {
-    if (value !== undefined) {
-      if (Array.isArray(value)) {
-        return value.join('\x00');
-      } else if (typeof value === 'string') {
-        return value;
-      } else {
-        return value.toString();
-      }
-    } else {
-      return '';
-    }
-  }
-
-  // Lower case of all headers keys
-  var loweredHeaders = {};
-  Object.keys(headers || {}).map(function(key) {
-    loweredHeaders[key.toLowerCase()] = headers[key];
-  });
-
-  // Allow outer code to add custom headers or remove something
-  if (preprocess) preprocess(loweredHeaders);
-
-  // Transform object into kv pairs
-  var len = 4,
-      pairs = Object.keys(loweredHeaders).filter(function(key) {
-        var lkey = key.toLowerCase();
-        return lkey !== 'connection' && lkey !== 'keep-alive' &&
-               lkey !== 'proxy-connection' && lkey !== 'transfer-encoding';
-      }).map(function(key) {
-        var klen = Buffer.byteLength(key),
-            value = stringify(loweredHeaders[key]),
-            vlen = Buffer.byteLength(value);
-
-        len += 8 + klen + vlen;
-        return [klen, key, vlen, value];
-      }),
-      result = new Buffer(len);
-
-  result.writeUInt32BE(pairs.length, 0, true);
-
-  var offset = 4;
-  pairs.forEach(function(pair) {
-    // Write key length
-    result.writeUInt32BE(pair[0], offset, true);
-    // Write key
-    result.write(pair[1], offset + 4);
-
-    offset += pair[0] + 4;
-
-    // Write value length
-    result.writeUInt32BE(pair[2], offset, true);
-    // Write value
-    result.write(pair[3], offset + 4);
-
-    offset += pair[2] + 4;
-  });
-
-  return result;
-};
-
-Framer.prototype._synFrame = function _synFrame(type, id, assoc, priority, dict,
-                                                callback) {
-  // Compress headers
-  this.deflate(dict, function (err, chunks, size) {
-    if (err) return callback(err);
-
-    var offset = type === 'SYN_STREAM' ? 18 : 12,
-        total = (type === 'SYN_STREAM' ? 10 : 4) + size,
-        frame = new Buffer(offset + size);;
-
-    frame.writeUInt16BE(0x8003, 0, true); // Control + Version
-    frame.writeUInt16BE(type === 'SYN_STREAM' ? 1 : 2, 2, true); // type
-    frame.writeUInt32BE(total & 0x00ffffff, 4, true); // No flag support
-    frame.writeUInt32BE(id & 0x7fffffff, 8, true); // Stream-ID
-
-    if (type === 'SYN_STREAM') {
-      frame[4] = 2;
-      frame.writeUInt32BE(assoc & 0x7fffffff, 12, true); // Stream-ID
-    }
-
-    frame.writeUInt8(priority & 0x7, 16, true); // Priority
-
-    for (var i = 0; i < chunks.length; i++) {
-      chunks[i].copy(frame, offset);
-      offset += chunks[i].length;
-    }
-
-    callback(null, frame);
-  });
-};
-
-//
-// ### function replyFrame (id, code, reason, headers, callback)
-// #### @id {Number} Stream ID
-// #### @code {Number} HTTP Status Code
-// #### @reason {String} (optional)
-// #### @headers {Object|Array} (optional) HTTP headers
-// #### @callback {Function} Continuation function
-// Sends SYN_REPLY frame
-//
-Framer.prototype.replyFrame = function replyFrame(id, code, reason, headers,
-                                                  callback) {
-  var dict = headersToDict(headers, function(headers) {
-    headers[':status'] = code + ' ' + reason;
-    headers[':version'] = 'HTTP/1.1';
-  });
-
-  this._synFrame('SYN_REPLY', id, null, 0, dict, callback);
-};
-
-//
-// ### function streamFrame (id, assoc, headers, callback)
-// #### @id {Number} stream id
-// #### @assoc {Number} associated stream id
-// #### @meta {Object} meta headers ( method, scheme, url, version )
-// #### @headers {Object} stream headers
-// #### @callback {Function} continuation callback
-// Create SYN_STREAM frame
-// (needed for server push and testing)
-//
-Framer.prototype.streamFrame = function streamFrame(id, assoc, meta, headers,
-                                                    callback) {
-  var dict = headersToDict(headers, function(headers) {
-    headers[':status'] = 200;
-    headers[':version'] = meta.version || 'HTTP/1.1';
-    headers[':path'] = meta.path;
-    headers[':scheme'] = meta.scheme || 'https';
-    headers[':host'] = meta.host;
-  });
-
-  this._synFrame('SYN_STREAM', id, assoc, meta.priority, dict, callback);
-};
-
-//
-// ### function dataFrame (id, fin, data)
-// #### @id {Number} Stream id
-// #### @fin {Bool} Is this data frame last frame
-// #### @data {Buffer} Response data
-// Sends DATA frame
-//
-Framer.prototype.dataFrame = function dataFrame(id, fin, data) {
-  if (!fin && !data.length) return [];
-
-  var frame = new Buffer(8 + data.length);
-
-  frame.writeUInt32BE(id & 0x7fffffff, 0, true);
-  frame.writeUInt32BE(data.length & 0x00ffffff, 4, true);
-  frame.writeUInt8(fin ? 0x01 : 0x0, 4, true);
-
-  if (data.length) data.copy(frame, 8);
-
-  return frame;
-};
-
-//
-// ### function pingFrame (id)
-// #### @id {Buffer} Ping ID
-// Sends PING frame
-//
-Framer.prototype.pingFrame = function pingFrame(id) {
-  var header = new Buffer(12);
-
-  header.writeUInt32BE(0x80030006, 0, true); // Version and type
-  header.writeUInt32BE(0x00000004, 4, true); // Length
-  id.copy(header, 8, 0, 4); // ID
-
-  return header;
-};
-
-//
-// ### function rstFrame (id, code)
-// #### @id {Number} Stream ID
-// #### @code {NUmber} RST Code
-// Sends PING frame
-//
-Framer.prototype.rstFrame = function rstFrame(id, code) {
-  var header;
-
-  if (!(header = Framer.rstCache[code])) {
-    header = new Buffer(16);
-
-    header.writeUInt32BE(0x80030003, 0, true); // Version and type
-    header.writeUInt32BE(0x00000008, 4, true); // Length
-    header.writeUInt32BE(id & 0x7fffffff, 8, true); // Stream ID
-    header.writeUInt32BE(code, 12, true); // Status Code
-
-    Framer.rstCache[code] = header;
-  }
-
-  return header;
-};
-Framer.rstCache = {};
-
-//
-// ### function settingsFrame (options)
-// #### @options {Object} settings frame options
-// Sends SETTINGS frame with MAX_CONCURRENT_STREAMS and initial window
-//
-Framer.prototype.settingsFrame = function settingsFrame(options) {
-  var settings,
-      key = options.maxStreams + ':' + options.windowSize;
-
-  if (!(settings = Framer.settingsCache[key])) {
-    settings = new Buffer(28);
-
-    settings.writeUInt32BE(0x80030004, 0, true); // Version and type
-    settings.writeUInt32BE((4 + 8 * 2) & 0x00FFFFFF, 4, true); // length
-    settings.writeUInt32BE(0x00000002, 8, true); // Count of entries
-
-    settings.writeUInt32BE(0x01000004, 12, true); // Entry ID and Persist flag
-    settings.writeUInt32BE(options.maxStreams & 0x7fffffff, 16, true);
-
-    settings.writeUInt32BE(0x01000007, 20, true); // Entry ID and Persist flag
-    settings.writeUInt32BE(options.windowSize & 0x7fffffff, 24, true);
-
-    Framer.settingsCache[key] = settings;
-  }
-
-  return settings;
-};
-Framer.settingsCache = {};
-
-//
-// ### function windowSizeFrame (size)
-// #### @size {Number} data transfer window size
-// Sends SETTINGS frame with window size
-//
-Framer.prototype.windowSizeFrame = function windowSizeFrame(size) {
-  var settings;
-
-  if (!(settings = Framer.windowSizeCache[size])) {
-    settings = new Buffer(20);
-
-    settings.writeUInt32BE(0x80030004, 0, true); // Version and type
-    settings.writeUInt32BE((4 + 8) & 0x00FFFFFF, 4, true); // length
-    settings.writeUInt32BE(0x00000001, 8, true); // Count of entries
-
-    settings.writeUInt32BE(0x01000007, 12, true); // Entry ID and Persist flag
-    settings.writeUInt32BE(size & 0x7fffffff, 16, true); // Window Size (KB)
-
-    Framer.windowSizeCache[size] = settings;
-  }
-
-  return settings;
-};
-Framer.windowSizeCache = {};
-
-//
-// ### function windowUpdateFrame (id)
-// #### @id {Buffer} WindowUpdate ID
-// Sends WINDOW_UPDATE frame
-//
-Framer.prototype.windowUpdateFrame = function windowUpdateFrame(id, delta) {
-  var header = new Buffer(16);
-
-  header.writeUInt32BE(0x80030009, 0, true); // Version and type
-  header.writeUInt32BE(0x00000008, 4, true); // Length
-  header.writeUInt32BE(id & 0x7fffffff, 8, true); // ID
-  header.writeUInt32BE(delta & 0x7fffffff, 12, true); // delta
-
-  return header;
-};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/index.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/index.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/index.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/index.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-var v3;
-
-try {
-  v3 = require('./protocol.node');
-} catch (e) {
-  v3 = require('./protocol.js');
-}
-module.exports = v3;
-
-v3.Framer = require('./framer').Framer;
-
-v3.dictionary = require('./dictionary').dictionary;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/protocol.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/protocol.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/protocol.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/protocol/v3/protocol.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-var protocol = exports;
-
-//
-// ### function parseSynHead (type, flags, data)
-// #### @type {Number} Frame type
-// #### @flags {Number} Frame flags
-// #### @data {Buffer} input data
-// Returns parsed syn_* frame's head
-//
-protocol.parseSynHead = function parseSynHead(type, flags, data) {
-  var stream = type === 0x01;
-
-  return {
-    type: stream ? 'SYN_STREAM' : 'SYN_REPLY',
-    id: data.readUInt32BE(0, true) & 0x7fffffff,
-    version: 3,
-    associated: stream ? data.readUInt32BE(4, true) & 0x7fffffff : 0,
-    priority: stream ? data[8] >> 5 : 0,
-    fin: (flags & 0x01) === 0x01,
-    unidir: (flags & 0x02) === 0x02,
-    _offset: stream ? 10 : 4
-  };
-};
-
-//
-// ### function parseHeaders (pairs)
-// #### @pairs {Buffer} header pairs
-// Returns hashmap of parsed headers
-//
-protocol.parseHeaders = function parseHeaders(pairs) {
-  var count = pairs.readUInt32BE(0, true),
-      headers = {};
-
-  pairs = pairs.slice(4);
-
-  function readString() {
-    var len = pairs.readUInt32BE(0, true),
-        value = pairs.slice(4, 4 + len);
-
-    pairs = pairs.slice(4 + len);
-
-    return value.toString();
-  }
-
-  while(count > 0) {
-    headers[readString().replace(/^:/, '')] = readString();
-    count--;
-  }
-
-  return headers;
-};
-
-//
-// ### function parsesRst frame
-protocol.parseRst = function parseRst(data) {
-  return {
-    type: 'RST_STREAM',
-    id: data.readUInt32BE(0, true) & 0x7fffffff,
-    status: data.readUInt32BE(4, true)
-  };
-};
-
-protocol.parseSettings = function parseSettings(data) {
-  var settings = {},
-      number = data.readUInt32BE(0, true),
-      idMap = {
-        1: 'upload_bandwidth',
-        2: 'download_bandwidth',
-        3: 'round_trip_time',
-        4: 'max_concurrent_streams',
-        5: 'current_cwnd',
-        6: 'download_retrans_rate',
-        7: 'initial_window_size',
-        8: 'client_certificate_vector_size'
-      };
-
-  for (var i=0; i<number; i++) {
-    var id = data.readUInt32BE(4 + (i*8), true) & 0x00ffffff,
-        flags = data.readUInt8(4 + (i*8), true),
-        name = idMap[id];
-    settings[id] = settings[name] = {
-      persist: !!(flags & 0x1),
-      persisted: !!(flags & 0x2),
-      value: data.readUInt32BE(8 + (i*8), true)
-    };
-  }
-
-  return {
-    type: 'SETTINGS',
-    settings: settings
-  };
-};
-
-protocol.parseGoaway = function parseGoaway(data) {
-  return {
-    type: 'GOAWAY',
-    lastId: data.readUInt32BE(0, true) & 0x7fffffff
-  };
-};
-
-protocol.parseWindowUpdate = function parseWindowUpdate(data) {
-  var ret = {
-    type: 'WINDOW_UPDATE',
-    id: data.readUInt32BE(0, true) & 0x7fffffff,
-    delta: data.readUInt32BE(4, true) & 0x7fffffff
-  };
-
-  return ret;
-};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/response.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/response.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/response.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/response.js	2014-11-26 21:46:00.000000000 +0000
@@ -1,5 +1,7 @@
 var spdy = require('../spdy'),
+    utils = spdy.utils,
     http = require('http'),
+    Stream = require('stream').Stream,
     res = http.ServerResponse.prototype;
 
 //
@@ -7,10 +9,9 @@
 // Copy pasted from lib/http.js
 // (added lowercase)
 //
-exports._renderHeaders = function() {
-  if (this._header) {
+exports._renderHeaders = function renderHeaders() {
+  if (this._header)
     throw new Error("Can't render headers after they are sent to the client.");
-  }
 
   var keys = Object.keys(this._headerNames);
   for (var i = 0, l = keys.length; i < l; i++) {
@@ -27,11 +28,12 @@
 // .writeHead() wrapper
 // (Sorry, copy pasted from lib/http.js)
 //
-exports.writeHead = function(statusCode) {
-  if (this._headerSent) return;
+exports.writeHead = function writeHead(statusCode) {
+  if (this._headerSent)
+    return;
   this._headerSent = true;
 
-  var reasonPhrase, headers, headerIndex;
+  var reasonPhrase, headers = {}, headerIndex;
 
   if (typeof arguments[1] == 'string') {
     reasonPhrase = arguments[1];
@@ -52,7 +54,8 @@
     var keys = Object.keys(obj);
     for (var i = 0; i < keys.length; i++) {
       var k = keys[i];
-      if (k) headers[k] = obj[k];
+      if (k)
+        headers[k] = obj[k];
     }
   } else if (this._headers) {
     // only progressive api is used
@@ -66,19 +69,37 @@
   this._header = '';
 
   // Do not send data to new connections after GOAWAY
-  if (this.socket._isGoaway()) return;
+  if (this.socket._isGoaway())
+    return;
+
+  // Date header
+  if (this.sendDate === true) {
+    if (headers === undefined)
+      headers = {};
+    if (headers.date === undefined)
+      headers.date = new Date().toUTCString();
+  }
 
   this.socket._lock(function() {
     var socket = this;
 
-    this._framer.replyFrame(
-      this.id,
+    this._spdyState.framer.replyFrame(
+      this._spdyState.id,
       statusCode,
       reasonPhrase,
       headers,
       function (err, frame) {
-        // TODO: Handle err
+        if (err) {
+          socket._unlock();
+          socket.emit('error', err);
+          return;
+        }
+
+        socket.connection.cork();
         socket.connection.write(frame);
+        utils.nextTick(function() {
+          socket.connection.uncork();
+        });
         socket._unlock();
       }
     );
@@ -86,6 +107,20 @@
 };
 
 //
+// ### function end (data, encoding, cb)
+// #### @data {Buffer|String} (optional) data
+// #### @encoding {String} (optional) string encoding
+// #### @cb {Function}
+// Send final data
+//
+exports.end = function end(data, encoding, cb) {
+  if (this.socket)
+    this.socket._spdyState.ending = true;
+
+  this.constructor.prototype.end.call(this, data, encoding, cb);
+};
+
+//
 // ### function push (url, headers, callback)
 // #### @url {String} absolute or relative url (from root anyway)
 // #### @headers {Object} response headers
@@ -93,27 +128,49 @@
 // Initiates push stream
 //
 exports.push = function push(url, headers, priority, callback) {
-  if (this.socket._destroyed) {
-    return callback(Error('Can\'t open push stream, parent socket destroyed'));
-  }
+  var socket = this.socket;
 
   if (!callback && typeof priority === 'function') {
     callback = priority;
-    priority = 0;
+    priority = null;
   }
+  if (!priority && typeof priority !== 'number')
+    priority = 7;
 
-  if (!callback) callback = function() {};
+  if (!callback)
+    callback = function() {};
 
-  this.socket._lock(function() {
-    var socket = this,
-        id = socket.connection.pushId += 2,
-        scheme = this._frame.headers.scheme,
-        host = this._frame.headers.host || 'localhost',
-        fullUrl = /^\//.test(url) ? scheme + '://' + host + url : url;
+  if (!socket || socket._destroyed) {
+    var stub = new Stream();
+    var err = Error('Can\'t open push stream, parent socket destroyed');
+    utils.nextTick(function() {
+      if (stub.listeners('error').length !== 0)
+        stub.emit('error', err);
+      callback(err);
+    });
+    return stub;
+  }
+
+  var id = socket.connection._spdyState.pushId += 2,
+      scheme = socket._spdyState.scheme,
+      host = headers.host || socket._spdyState.host || 'localhost',
+      fullUrl = /^\//.test(url) ? scheme + '://' + host + url : url;
+
+  var stream = new spdy.Stream(socket.connection, {
+    type: 'SYN_STREAM',
+    id: id,
+    associated: socket._spdyState.id,
+    priority: priority,
+    headers: {}
+  });
 
-    this._framer.streamFrame(
+  stream.associated = socket;
+  socket.connection._addStream(stream);
+
+  socket._lock(function() {
+    this._spdyState.framer.streamFrame(
       id,
-      this.id,
+      this._spdyState.id,
       {
         method: 'GET',
         path: url,
@@ -121,32 +178,32 @@
         scheme: scheme,
         host: host,
         version: 'HTTP/1.1',
-        priority: priority || 0
+        priority: priority,
+        status: 200
       },
       headers,
       function(err, frame) {
         if (err) {
           socket._unlock();
-          callback(err);
+          if (callback)
+            callback(err);
+          stream.destroy(err);
+          return;
         } else {
+          socket.connection.cork();
           socket.connection.write(frame);
-          socket._unlock();
-
-          var stream = new spdy.server.Stream(socket.connection, {
-            type: 'SYN_STREAM',
-            push: true,
-            id: id,
-            assoc: socket.id,
-            priority: 0,
-            headers: {}
+          utils.nextTick(function() {
+            socket.connection.uncork();
           });
+          socket._unlock();
+        }
 
-          socket.connection.streams[id] = stream;
-          socket.pushes.push(stream);
-
+        stream.emit('acknowledge');
+        if (callback)
           callback(null, stream);
-        }
       }
     );
   });
+
+  return stream;
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/scheduler.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/scheduler.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/scheduler.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/scheduler.js	2014-11-26 21:46:00.000000000 +0000
@@ -1,3 +1,5 @@
+var spdy = require('../spdy');
+var utils = spdy.utils;
 var scheduler = exports;
 
 //
@@ -8,7 +10,10 @@
 function Scheduler(connection) {
   this.connection = connection;
   this.priorities = [[], [], [], [], [], [], [], []];
-  this._tickListener = null;
+  this._tickListener = this._tickListener.bind(this);
+  this._tickListening = false;
+  this._tickCallbacks = [];
+  this._corked = false;
 }
 
 //
@@ -26,35 +31,71 @@
 // Use stream priority to invoke callbacks in right order
 //
 Scheduler.prototype.schedule = function schedule(stream, data) {
-  this.priorities[stream.priority].push(data);
+  // Ignore data from destroyed stream
+  if (stream._spdyState.destroyed)
+    return;
+  this.scheduleLast(stream, data);
+};
+
+//
+// ### function scheduleLast (stream, data)
+// #### @stream {spdy.Stream} Source stream
+// #### @data {Buffer} data to write on tick
+// Use stream priority to invoke callbacks in right order
+//
+Scheduler.prototype.scheduleLast = function scheduleLast(stream, data) {
+  var priority = stream._spdyState.priority;
+  priority = Math.min(priority, 7);
+  priority = Math.max(priority, 0);
+  this.priorities[priority].push(data);
+};
+
+//
+// ### function tickListener ()
+//
+Scheduler.prototype._tickListener = function tickListener() {
+  var priorities = this.priorities;
+  var tickCallbacks = this._tickCallbacks;
+
+  this._tickListening = false;
+  this.priorities = [[], [], [], [], [], [], [], []];
+  this._tickCallbacks = [];
+
+  // Run all priorities
+  for (var i = 0; i < 8; i++)
+    for (var j = 0; j < priorities[i].length; j++)
+      this.connection.write(priorities[i][j]);
+
+  // Invoke callbacks
+  for (var i = 0; i < tickCallbacks.length; i++)
+    tickCallbacks[i]();
+  if (this._corked) {
+    this.connection.uncork();
+    if (this._tickListening)
+      this.connection.cork();
+    else
+      this._corked = false;
+  }
 };
 
 //
 // ### function tick ()
 // Add .nextTick callback if not already present
 //
-Scheduler.prototype.tick = function tick() {
-  if (this._tickListener !== null) return;
-  var self = this;
-  this._tickListener = function() {
-    var priorities = self.priorities;
-
-    self._tickListener = null;
-    self.priorities = [[], [], [], [], [], [], [], []];
-
-    // Run all priorities
-    for (var i = 0; i < 8; i++) {
-      for (var j = 0; j < priorities[i].length; j++) {
-        self.connection.write(
-          priorities[i][j]
-        );
-      }
-    }
-  };
-
-  if (this.connection.parser.drained) {
-    process.nextTick(this._tickListener);
+Scheduler.prototype.tick = function tick(cb) {
+  if (cb)
+    this._tickCallbacks.push(cb);
+  if (this._tickListening)
+    return;
+  this._tickListening = true;
+
+  if (!this._corked) {
+    this.connection.cork();
+    this._corked = true;
+  }
+  if (!this.connection._spdyState.parser.needDrain) {
+    utils.nextTick(this._tickListener);
   } else {
-    this.connection.parser.once('drain', this._tickListener);
+    this.connection._spdyState.parser.once('drain', this._tickListener);
   }
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/server.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/server.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/server.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/server.js	2014-11-26 21:46:00.000000000 +0000
@@ -1,19 +1,8 @@
 var spdy = require('../spdy'),
     util = require('util'),
-    https = require('https'),
-    stream = require('stream'),
-    Buffer = require('buffer').Buffer;
-
-var crlf = new Buffer('\r\n');
-var last_frag = new Buffer('0\r\n\r\n');
-
-var legacy = !stream.Duplex;
-
-if (legacy) {
-  var DuplexStream = stream;
-} else {
-  var DuplexStream = stream.Duplex;
-}
+    https = require('https');
+
+var Connection = spdy.Connection;
 
 //
 // ### function instantiate (HTTPSServer)
@@ -59,30 +48,38 @@
   var state = {};
   this._spdyState = state;
 
-  if (!options) options = {};
-  if (!options.maxStreams) options.maxStreams = 100;
-  if (!options.sinkSize) {
-    options.sinkSize = 1 << 16;
-  }
-  if (!options.windowSize) {
-    options.windowSize = 1 << 20; // 1mb
-  }
+  if (!options)
+    options = {};
+
+  // Copy user supplied options
+  options = util._extend({}, options);
+
+  var supportedProtocols = [
+    'spdy/3.1', 'spdy/3', 'spdy/2',
+    'http/1.1', 'http/1.0'
+  ];
+  options.NPNProtocols = supportedProtocols;
+  options.ALPNProtocols = supportedProtocols;
+  options.isServer = true;
+
+  // Header compression is enabled by default in servers, in contrast to clients
+  // where it is disabled to prevent CRIME attacks.
+  // See: https://groups.google.com/d/msg/spdy-dev/6mVYRv-lbuc/qGcW2ldOpt8J
+  if (options.headerCompression !== false)
+    options.headerCompression = true;
 
-  options.NPNProtocols = ['spdy/3', 'spdy/2', 'http/1.1', 'http/1.0'];
-  options.ALPNProtocols = ['spdy/3', 'spdy/2', 'http/1.1', 'http/1.0'];
   state.options = options;
   state.reqHandler = handler;
 
-  if (options.plain && !options.ssl) {
+  if (options.plain && !options.ssl)
     base.call(this, handler);
-  } else {
+  else
     base.call(this, options, handler);
-  }
 
-  // Use https if NPN is not supported
-  if (!process.features.tls_npn && !process.features.tls_alpn && !options.debug && !options.plain) {
+  // Use https if neither NPN or ALPN is supported
+  if (!process.features.tls_npn && !process.features.tls_alpn &&
+      !options.debug && !options.plain)
     return;
-  }
 };
 
 //
@@ -98,15 +95,19 @@
                                                           'secureConnection',
       handler = this.listeners(event)[0];
 
-  state.pool = spdy.zlibpool.create();
   state.handler = handler;
 
   this.removeAllListeners(event);
 
-  // Normal mode, use NPN to fallback to HTTPS
-  if (!state.options.plain) {
+  // 2 minutes default timeout
+  if (state.options.timeout !== undefined)
+    this.timeout = state.options.timeout;
+  else
+    this.timeout = this.timeout || 2 * 60 * 1000;
+
+  // Normal mode, use NPN or ALPN to fallback to HTTPS
+  if (!state.options.plain)
     return this.on(event, this._onConnection.bind(this));
-  }
 
   // In case of plain connection, we must fallback to HTTPS if first byte
   // is not equal to 0x80.
@@ -115,20 +116,21 @@
         _emit = socket.emit;
 
     // Add 'data' listener, otherwise 'data' events won't be emitted
-    if (legacy) {
+    if (spdy.utils.isLegacy) {
       function ondata() {};
       socket.once('data', ondata);
     }
 
     // 2 minutes timeout, as http.js does by default
-    socket.setTimeout(self.timeout || 2 * 60 * 1000);
+    socket.setTimeout(self.timeout);
 
     socket.emit = function emit(event, data) {
       history.push(Array.prototype.slice.call(arguments));
 
       if (event === 'data') {
         // Legacy
-        onFirstByte.call(socket, data);
+        if (spdy.utils.isLegacy)
+          onFirstByte.call(socket, data);
       } else if (event === 'readable') {
         // Streams
         onReadable.call(socket);
@@ -144,6 +146,8 @@
     function fail() {
       socket.emit = _emit;
       history = null;
+      socket.removeListener('readable', onReadable);
+
       try {
         socket.destroy();
       } catch (e) {
@@ -154,25 +158,27 @@
       var copy = history.slice();
       history = null;
 
-      if (legacy) socket.removeListener('data', ondata);
+      socket.removeListener('readable', onReadable);
+      if (spdy.utils.isLegacy)
+        socket.removeListener('data', ondata);
       socket.emit = _emit;
       for (var i = 0; i < copy.length; i++) {
-        socket.emit.apply(socket, copy[i]);
-        if (copy[i][0] === 'end') {
-          if (socket.onend) socket.onend();
-        }
+        if (copy[i][0] !== 'data' || spdy.utils.isLegacy)
+          socket.emit.apply(socket, copy[i]);
+        if (copy[i][0] === 'end' && socket.onend)
+          socket.onend();
       }
     }
 
     function onFirstByte(data) {
       // Ignore empty packets
-      if (data.length === 0) return;
+      if (data.length === 0)
+        return;
 
-      if (data[0] === 0x80) {
+      if (data[0] === 0x80)
         self._onConnection(socket);
-      } else  {
+      else
         handler.call(self, socket);
-      }
 
       // Fire events
       restore();
@@ -181,16 +187,16 @@
       // so there're no need to call it manually
     };
 
-    if (!legacy) {
-      // Hack to make streams2 work properly
+    // Hack to make streams2 work properly
+    if (!spdy.utils.isLegacy)
       socket.on('readable', onReadable);
-    }
 
     function onReadable() {
       var data = socket.read(1);
 
       // Ignore empty packets
-      if (!data) return;
+      if (!data)
+        return;
       socket.removeListener('readable', onReadable);
 
       // `.unshift()` emits `readable` event. Thus `emit` method should
@@ -200,18 +206,18 @@
       // Put packet back where it was before
       socket.unshift(data);
 
-      if (data[0] === 0x80) {
+      if (data[0] === 0x80)
         self._onConnection(socket);
-      } else  {
+      else
         handler.call(self, socket);
-      }
 
       // Fire events
       restore();
 
       if (socket.ondata) {
         data = socket.read(socket._readableState.length);
-        if (data) socket.ondata(data, 0, data.length);
+        if (data)
+          socket.ondata(data, 0, data.length);
       }
     }
   });
@@ -234,15 +240,21 @@
   }
 
   // Wrap incoming socket into abstract class
-  var connection = new Connection(socket, state.pool, state.options);
+  var connection = new Connection(socket, state.options, this);
+  if (selectedProtocol === 'spdy/3.1')
+    connection._setVersion(3.1);
+  else if (selectedProtocol === 'spdy/3')
+    connection._setVersion(3);
+  else if (selectedProtocol === 'spdy/2')
+    connection._setVersion(2);
 
   // Emulate each stream like connection
   connection.on('stream', state.handler);
 
   connection.on('connect', function onconnect(req, socket) {
-    socket.streamID = req.streamID = req.socket.id;
+    socket.streamID = req.streamID = req.socket._spdyState.id;
     socket.isSpdy = req.isSpdy = true;
-    socket.spdyVersion = req.spdyVersion = req.socket.version;
+    socket.spdyVersion = req.spdyVersion = req.socket._spdyState.framer.version;
 
     socket.once('finish', function onfinish() {
       req.connection.end();
@@ -252,25 +264,36 @@
   });
 
   connection.on('request', function onrequest(req, res) {
+    // Copy extension methods
     res._renderHeaders = spdy.response._renderHeaders;
     res.writeHead = spdy.response.writeHead;
+    res.end = spdy.response.end;
     res.push = spdy.response.push;
-    res.streamID = req.streamID = req.socket.id;
-    res.spdyVersion = req.spdyVersion = req.socket.version;
+    res.streamID = req.streamID = req.socket._spdyState.id;
+    res.spdyVersion = req.spdyVersion = req.socket._spdyState.framer.version;
     res.isSpdy = req.isSpdy = true;
+    res.addTrailers = function addTrailers(headers) {
+      res.socket.sendHeaders(headers);
+    };
+
+    // Make sure that keep-alive won't apply to the response
+    res._last = true;
 
     // Chunked encoding is not supported in SPDY
     res.useChunkedEncodingByDefault = false;
 
-    res.once('finish', function onfinish() {
-      req.connection.end();
+    // Populate trailing headers
+    req.connection.on('headers', function(headers) {
+      Object.keys(headers).forEach(function(key) {
+        req.trailers[key] = headers[key];
+      });
+      req.emit('trailers', headers);
     });
 
     self.emit('request', req, res);
   });
 
   connection.on('error', function onerror(e) {
-    console.log('[secureConnection] error ' + e);
     socket.destroy(e.errno === 'EPIPE' ? undefined : e);
   });
 };
@@ -298,632 +321,9 @@
     base = null;
   }
 
-  return new server(options, requestListener);
-};
-
-//
-// ### function Connection (socket, pool, options)
-// #### @socket {net.Socket} server's connection
-// #### @pool {spdy.ZlibPool} zlib pool
-// #### @options {Object} server's options
-// Abstract connection @constructor
-//
-function Connection(socket, pool, options) {
-  process.EventEmitter.call(this);
-
-  var self = this;
-
-  this._closed = false;
-
-  this.pool = pool;
-  var pair = null;
-
-  this._deflate = null;
-  this._inflate = null;
-
-  this.encrypted = socket.encrypted;
-
-  // Init streams list
-  this.streams = {};
-  this.streamsCount = 0;
-  this.pushId = 0;
-  this._goaway = false;
-
-  this._framer = null;
-
-  // Data transfer window defaults to 64kb
-  this.windowSize = options.windowSize;
-  this.sinkSize = options.sinkSize;
-
-  // Initialize scheduler
-  this.scheduler = spdy.scheduler.create(this);
-
-  // Store socket and pipe it to parser
-  this.socket = socket;
-
-  // Initialize parser
-  this.parser = spdy.parser.create(this);
-  this.parser.on('frame', function (frame) {
-    if (this._closed) return;
-
-    var stream;
-
-    // Create new stream
-    if (frame.type === 'SYN_STREAM') {
-      self.streamsCount++;
-
-      stream = self.streams[frame.id] = new Stream(self, frame);
-
-      // If we reached stream limit
-      if (self.streamsCount > options.maxStreams) {
-        stream.once('error', function onerror() {});
-        // REFUSED_STREAM
-        stream._rstCode = 3;
-        stream.destroy(true);
-      } else {
-        self.emit('stream', stream);
-
-        stream._init();
-      }
-    } else {
-      if (frame.id) {
-        // Load created one
-        stream = self.streams[frame.id];
-
-        // Fail if not found
-        if (stream === undefined) {
-          if (frame.type === 'RST_STREAM') return;
-          self.write(self._framer.rstFrame(frame.id, 2));
-          return;
-        }
-      }
-
-      // Emit 'data' event
-      if (frame.type === 'DATA') {
-        if (frame.data.length > 0){
-          if (stream._closedBy.client) {
-            stream._rstCode = 2;
-            stream.emit('error', 'Writing to half-closed stream');
-          } else {
-            stream._recv(frame.data);
-          }
-        }
-      // Destroy stream if we was asked to do this
-      } else if (frame.type === 'RST_STREAM') {
-        stream._rstCode = 0;
-        if (frame.status === 5) {
-          // If client "cancels" connection - close stream and
-          // all associated push streams without error
-          stream.pushes.forEach(function(stream) {
-            stream.close();
-          });
-          stream.close();
-        } else {
-          // Emit error on destroy
-          stream.destroy(new Error('Received rst: ' + frame.status));
-        }
-      // Respond with same PING
-      } else if (frame.type === 'PING') {
-        self.write(self._framer.pingFrame(frame.pingId));
-      } else if (frame.type === 'SETTINGS') {
-        self._setDefaultWindow(frame.settings);
-      } else if (frame.type === 'GOAWAY') {
-        self._goaway = frame.lastId;
-      } else if (frame.type === 'WINDOW_UPDATE') {
-        stream._drainSink(frame.delta);
-      } else {
-        console.error('Unknown type: ', frame.type);
-      }
-    }
-
-    // Handle half-closed
-    if (frame.fin) {
-      // Don't allow to close stream twice
-      if (stream._closedBy.client) {
-        stream._rstCode = 2;
-        stream.emit('error', 'Already half-closed');
-      } else {
-        stream._closedBy.client = true;
-
-        // Emulate last chunked fragment
-        if (stream._forceChunked) {
-          stream._recv(last_frag, true);
-        }
-
-        stream._handleClose();
-      }
-    }
-  });
-
-  this.parser.on('version', function onversion(version) {
-    if (!pair) {
-      pair = pool.get('spdy/' + version);
-      self._deflate = pair.deflate;
-      self._inflate = pair.inflate;
-    }
-  });
-
-  this.parser.on('framer', function onframer(framer) {
-    // Generate custom settings frame and send
-    self.write(framer.settingsFrame(options));
-  });
-
-  // Propagate parser errors
-  this.parser.on('error', function onParserError(err) {
-    self.emit('error', err);
-  });
-
-  socket.pipe(this.parser);
-
-  // 2 minutes socket timeout
-  socket.setTimeout(2 * 60 * 1000);
-  socket.once('timeout', function ontimeout() {
-    socket.destroy();
-  });
-
-  // Allow high-level api to catch socket errors
-  socket.on('error', function onSocketError(e) {
-    self.emit('error', e);
-  });
-
-  socket.once('close', function onclose() {
-    self._closed = true;
-    if (pair) pool.put(pair);
-  });
-
-  if (legacy) {
-    socket.on('drain', function ondrain() {
-      self.emit('drain');
-    });
-  }
-}
-util.inherits(Connection, process.EventEmitter);
-exports.Connection = Connection;
-
-//
-// ### function write (data, encoding)
-// #### @data {String|Buffer} data
-// #### @encoding {String} (optional) encoding
-// Writes data to socket
-//
-Connection.prototype.write = function write(data, encoding) {
-  if (this.socket.writable) {
-    return this.socket.write(data, encoding);
-  }
-};
-
-//
-// ### function _setDefaultWindow (settings)
-// #### @settings {Object}
-// Update the default transfer window -- in the connection and in the
-// active streams
-//
-Connection.prototype._setDefaultWindow = function _setDefaultWindow(settings) {
-  if (!settings) return;
-  if (!settings.initial_window_size ||
-      settings.initial_window_size.persisted) {
-    return;
-  }
-
-  this.sinkSize = settings.initial_window_size.value;
-
-  Object.keys(this.streams).forEach(function(id) {
-    this.streams[id]._updateSinkSize(settings.initial_window_size.value);
-  }, this);
-};
-
-//
-// ### function Stream (connection, frame)
-// #### @connection {Connection} SPDY Connection
-// #### @frame {Object} SYN_STREAM data
-// Abstract stream @constructor
-//
-function Stream(connection, frame) {
-  DuplexStream.call(this);
-
-  this.connection = connection;
-  this.socket = connection.socket;
-  this.encrypted = connection.encrypted;
-  this._framer = connection._framer;
-  this._initialized = false;
-
-  // Should chunked encoding be forced
-  this._forceChunked = false;
-
-  this.ondata = this.onend = null;
-
-  // RST_STREAM code if any
-  this._rstCode = 1;
-  this._destroyed = false;
-
-  this._closedBy = {
-    client: false,
-    server: false
-  };
-
-  // Lock data
-  this._locked = false;
-  this._lockBuffer = [];
-
-  // Store id
-  this.id = frame.id;
-  this.version = frame.version;
-
-  // Store priority
-  this.priority = frame.priority;
-
-  // Array of push streams associated to that one
-  this.pushes = [];
-
-  // How much data can be sent TO client before next WINDOW_UPDATE
-  this._sinkSize = connection.sinkSize;
-  this._initialSinkSize = connection.sinkSize;
-
-  // When data needs to be send, but window is too small for it - it'll be
-  // queued in this buffer
-  this._sinkBuffer = [];
-
-  // How much data can be sent BY client before next WINDOW_UPDATE
-  this._initialWindowSize = connection.windowSize;
-  this._windowSize = connection.windowSize;
-
-  // Create compression streams
-  this._deflate = connection._deflate;
-  this._inflate = connection._inflate;
-
-  // Store headers
-  this.headers = frame.headers;
-  this.url = frame.url;
-
-  this._frame = frame;
-
-  if (legacy) {
-    this.readable = this.writable = true;
-  }
-
-  // Call .onend()
-  this.once('end', function() {
-    var self = this;
-    process.nextTick(function() {
-      if (self.onend) self.onend();
-    });
-  });
-
-  // Handle half-close
-  this.once('finish', function() {
-    this._writeData(true, []);
-    this._closedBy.server = true;
-    if (this._sinkBuffer.length !== 0) return;
-    this._handleClose();
-  });
-};
-util.inherits(Stream, DuplexStream);
-exports.Stream = Stream;
-
-if (legacy) {
-  Stream.prototype.pause = function pause() {};
-  Stream.prototype.resume = function resume() {};
-}
-
-//
-// ### function _isGoaway ()
-// Returns true if any writes to that stream should be ignored
-//
-Stream.prototype._isGoaway = function _isGoaway() {
-  return this.connection._goaway && this.id > this.connection._goaway;
-};
+  // Instantiate http server if `ssl: false`
+  if (!base && options && options.plain && options.ssl === false)
+    return exports.create(require('http').Server, options, requestListener);
 
-//
-// ### function init ()
-// Initialize stream, internal
-//
-Stream.prototype._init = function init() {
-  var headers = this.headers,
-      req = [headers.method + ' ' + this.url + ' ' + headers.version];
-
-  Object.keys(headers).forEach(function (key) {
-    if (key !== 'method' && key !== 'url' && key !== 'version' &&
-        key !== 'scheme') {
-      req.push(key + ': ' + headers[key]);
-    }
-  });
-
-  // Force chunked encoding
-  if (!headers['content-length'] && !headers['transfer-encoding']) {
-    req.push('Transfer-Encoding: chunked');
-    this._forceChunked = true;
-  }
-
-  // Add '\r\n\r\n'
-  req.push('', '');
-
-  req = new Buffer(req.join('\r\n'));
-
-  this._recv(req, true);
-  this._initialized = true;
-};
-
-//
-// ### function lock (callback)
-// #### @callback {Function} continuation callback
-// Acquire lock
-//
-Stream.prototype._lock = function lock(callback) {
-  if (!callback) return;
-
-  if (this._locked) {
-    this._lockBuffer.push(callback);
-  } else {
-    this._locked = true;
-    callback.call(this, null);
-  }
-};
-
-//
-// ### function unlock ()
-// Release lock and call all buffered callbacks
-//
-Stream.prototype._unlock = function unlock() {
-  if (this._locked) {
-    this._locked = false;
-    this._lock(this._lockBuffer.shift());
-  }
-};
-
-//
-// ### function setTimeout ()
-// TODO: use timers.enroll, timers.active, timers.unenroll
-//
-Stream.prototype.setTimeout = function setTimeout(time) {};
-
-//
-// ### function _handleClose ()
-// Close stream if it was closed by both server and client
-//
-Stream.prototype._handleClose = function _handleClose() {
-  if (this._closedBy.client && this._closedBy.server) {
-    this.close();
-  }
-};
-
-//
-// ### function close ()
-// Destroys stream
-//
-Stream.prototype.close = function close() {
-  this.destroy();
-};
-
-//
-// ### function destroy (error)
-// #### @error {Error} (optional) error
-// Destroys stream
-//
-Stream.prototype.destroy = function destroy(error) {
-  if (this._destroyed) return;
-  this._destroyed = true;
-
-  delete this.connection.streams[this.id];
-  if (this.id % 2 === 1) {
-    this.connection.streamsCount--;
-  }
-
-  // If stream is not finished, RST frame should be sent to notify client
-  // about sudden stream termination.
-  if (error || !this._closedBy.server) {
-    // REFUSED_STREAM if terminated before 'finish' event
-    if (!this._closedBy.server) this._rstCode = 3;
-
-    if (this._rstCode) {
-      this._lock(function() {
-        this.connection.scheduler.schedule(
-          this,
-          this._framer.rstFrame(this.id, this._rstCode));
-        this.connection.scheduler.tick();
-
-        this._unlock();
-      });
-    }
-  }
-
-  if (legacy) {
-    this.emit('end');
-  } else {
-    this.push(null);
-  }
-
-  if (error) this.emit('error', error);
-
-  var self = this;
-  process.nextTick(function() {
-    self.emit('close', !!error);
-  });
-};
-
-Stream.prototype.destroySoon = function destroySoon(error) {
-  return this.destroy(error);
-};
-
-Stream.prototype._drainSink = function _drainSink(size) {
-  var oldBuffer = this._sinkBuffer;
-  this._sinkBuffer = [];
-
-  this._sinkSize += size;
-
-  for (var i = 0; i < oldBuffer.length; i++) {
-    this._writeData(oldBuffer[i][0], oldBuffer[i][1], oldBuffer[i][2]);
-  }
-
-  // Handle half-close
-  if (this._sinkBuffer.length === 0 && this._closedBy.server) {
-    this._handleClose();
-  }
-
-  if (legacy) this.emit('drain');
-};
-
-//
-// ### function _writeData (fin, buffer, cb)
-// #### @fin {Boolean}
-// #### @buffer {Buffer}
-// #### @cb {Function} **optional**
-// Internal function
-//
-Stream.prototype._writeData = function _writeData(fin, buffer, cb) {
-  if (this._framer.version === 3) {
-    // Window was exhausted, queue data
-    if (this._sinkSize <= 0) {
-      this._sinkBuffer.push([fin, buffer, cb]);
-      return false;
-    }
-
-    var len = Math.min(this._sinkSize, buffer.length);
-    this._sinkSize -= len;
-
-    // Only partial write is possible, queue rest for later
-    if (len < buffer.length) {
-      this._sinkBuffer.push([fin, buffer.slice(len)]);
-      buffer = buffer.slice(0, len);
-      fin = false;
-    }
-  }
-
-  this._lock(function() {
-    var stream = this,
-        frame = this._framer.dataFrame(this.id, fin, buffer);
-
-    stream.connection.scheduler.schedule(stream, frame);
-    stream.connection.scheduler.tick();
-
-    this._unlock();
-
-    if (cb) cb();
-  });
-
-  return true;
-};
-
-//
-// ### function write (data, encoding)
-// #### @data {Buffer|String} data
-// #### @encoding {String} data encoding
-// Writes data to connection
-//
-Stream.prototype._write = function write(data, encoding, cb) {
-  // Do not send data to new connections after GOAWAY
-  if (this._isGoaway()) {
-    if (cb) cb();
-    return false;
-  }
-
-  return this._writeData(false, data, cb);
-};
-
-if (legacy) {
-  Stream.prototype.write = function write(data, encoding, cb) {
-    if (!Buffer.isBuffer(data)) {
-      return this._write(new Buffer(data, encoding), null, cb);
-    } else {
-      return this._write(data, encoding, cb);
-    }
-  };
-
-  //
-  // ### function end (data)
-  // #### @data {Buffer|String} (optional) data to write before ending stream
-  // #### @encoding {String} (optional) string encoding
-  // Send FIN data frame
-  //
-  Stream.prototype.end = function end(data, encoding) {
-    // Do not send data to new connections after GOAWAY
-    if (this._isGoaway()) return;
-
-    if (data) this.write(data, encoding);
-    this.emit('finish');
-  };
-}
-
-//
-// ### function _recv (data)
-// #### @data {Buffer} buffer to receive
-// #### @chunked {Boolean}
-// (internal)
-//
-Stream.prototype._recv = function _recv(data, chunked) {
-  // Update window if exhausted
-  if (!chunked && this._framer.version >= 3 && this._initialized) {
-    this._windowSize -= data.length;
-
-    if (this._windowSize <= 0) {
-      var delta = this._initialWindowSize - this._windowSize;
-      this._windowSize += delta;
-      this.connection.write(this._framer.windowUpdateFrame(this.id, delta));
-    }
-  }
-
-  // Emulate chunked encoding
-  if (this._forceChunked && !chunked) {
-    // Zero-chunks are treated as end, do not emit them
-    if (data.length === 0) return;
-
-    this._recv(new Buffer(data.length.toString(16)), true);
-    this._recv(crlf, true);
-    this._recv(data, true);
-    this._recv(crlf, true);
-    return;
-  }
-
-  if (legacy) {
-    var self = this;
-    process.nextTick(function() {
-      self.emit('data', data);
-      if (self.ondata) {
-        self.ondata(data, 0, data.length);
-      }
-    });
-  } else {
-    // Right now, http module expects socket to be working in streams1 mode.
-    if (this.ondata) {
-      this.ondata(data, 0, data.length);
-    } else {
-      this.push(data);
-    }
-  }
-};
-
-//
-// ### function _read (bytes, cb)
-// #### @bytes {Number} number of bytes to read
-// Streams2 API
-//
-Stream.prototype._read = function read(bytes) {
-  // NOP
-};
-
-//
-// ### function _updateSinkSize (size)
-// #### @size {Integer}
-// Update the internal data transfer window
-//
-Stream.prototype._updateSinkSize = function _updateSinkSize(size) {
-  var diff = size - this._initialSinkSize;
-
-  this._initialSinkSize = size;
-  this._drainSink(diff);
-};
-
-//
-// `net` compatibility layer
-// (Copy pasted from lib/tls.js from node.js)
-//
-Stream.prototype.address = function address() {
-  return this.socket && this.socket.address();
+  return new server(options, requestListener);
 };
-
-Stream.prototype.__defineGetter__('remoteAddress', function remoteAddress() {
-  return this.socket && this.socket.remoteAddress;
-});
-
-Stream.prototype.__defineGetter__('remotePort', function remotePort() {
-  return this.socket && this.socket.remotePort;
-});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/stream.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/stream.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/stream.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/stream.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,1152 @@
+var spdy = require('../spdy');
+var zlib = require('zlib');
+var utils = spdy.utils;
+var assert = require('assert');
+var util = require('util');
+var stream = require('stream');
+var Buffer = require('buffer').Buffer;
+var constants = spdy.protocol.constants;
+
+if (!/^v(0\.10|0\.8|0\.9)\./.test(process.version))
+  var httpCommon = require('_http_common');
+
+
+//
+// ### function Stream (connection, options)
+// #### @connection {Connection} SPDY Connection
+// #### @options {Object} Stream options
+// Abstract stream @constructor
+//
+function Stream(connection, options) {
+  var self = this;
+
+  utils.DuplexStream.call(this);
+
+  this.connection = connection;
+  this.socket = connection.socket;
+  this.encrypted = connection.encrypted;
+  this.associated = null;
+
+  // 0.10 hack
+  this._handle = {
+    readStop: function() { self._readStop() },
+    readStart: function() { self._readStart() }
+  };
+
+  var state = {};
+  this._spdyState = state;
+  state.timeout = connection.timeout;
+  state.timeoutTimer = null;
+  state.framer = connection._spdyState.framer;
+  state.initialized = false;
+  state.ending = false;
+  state.ended = false;
+  state.paused = false;
+  state.finishAttached = false;
+  state.decompress = options.decompress;
+  state.decompressor = null;
+
+  // Store id
+  state.id = options.id;
+  state.associated = options.associated;
+  state.headers = options.headers || {};
+  if (connection._spdyState.xForward !== null)
+    state.headers['x-forwarded-for'] = connection._spdyState.xForward;
+
+  // Increment counters
+  state.isPush = !connection._spdyState.isServer && state.associated;
+  connection._spdyState.counters.streamCount++;
+  if (state.isPush)
+    connection._spdyState.counters.pushCount++;
+
+  // Useful for PUSH streams
+  state.scheme = state.headers.scheme;
+  state.host = state.headers.host;
+
+  if (state.isPush && state.headers['content-encoding']) {
+    var compression = state.headers['content-encoding'];
+
+    // If compression was requested - setup decompressor
+    if (compression === 'gzip' || compression === 'deflate')
+      this._setupDecompressor(compression);
+  }
+
+  // True if inside chunked write
+  state.chunkedWrite = false;
+
+  // Store options
+  state.options = options;
+  state.isClient = !!options.client;
+  state.parseRequest = !!options.client;
+
+  // RST_STREAM code if any
+  state.rstCode = constants.rst.PROTOCOL_ERROR;
+  state.destroyed = false;
+
+  state.closedBy = {
+    them: false,
+    us: false
+  };
+
+  // Store priority
+  state.priority = options.priority;
+
+  // How much data can be sent TO client before next WINDOW_UPDATE
+  state.sinkSize = connection._spdyState.initialSinkSize;
+  state.initialSinkSize = state.sinkSize;
+
+  // When data needs to be send, but window is too small for it - it'll be
+  // queued in this buffer
+  state.sinkBuffer = [];
+  state.sinkDraining = false;
+
+  // How much data can be sent BY client before next WINDOW_UPDATE
+  state.windowSize = connection._spdyState.initialWindowSize;
+  state.initialWindowSize = state.windowSize;
+
+  this._init();
+};
+util.inherits(Stream, utils.DuplexStream);
+exports.Stream = Stream;
+
+// Parser lookup methods
+Stream.prototype._parserHeadersComplete = function parserHeadersComplete() {
+  if (this.parser)
+    return this.parser.onHeadersComplete || this.parser[1];
+};
+
+Stream.prototype._parserBody = function parserBody() {
+  if (this.parser)
+    return this.parser.onBody || this.parser[2];
+};
+
+Stream.prototype._parserMessageComplete = function parserMessageComplete() {
+  if (this.parser)
+    return this.parser.onMessageComplete || this.parser[3];
+};
+
+//
+// ### function init ()
+// Initialize stream
+//
+Stream.prototype._init = function init() {
+  var state = this._spdyState;
+
+  this.setTimeout();
+  this.ondata = this.onend = null;
+
+  if (utils.isLegacy)
+    this.readable = this.writable = true;
+
+  // Call .onend()
+  this.once('end', function() {
+    var self = this;
+    utils.nextTick(function() {
+      var onHeadersComplete = self._parserHeadersComplete();
+      if (!onHeadersComplete && self.onend)
+        self.onend();
+    });
+  });
+
+  // Handle half-close
+  this.once('finish', function onfinish() {
+    if (state.chunkedWrite)
+      return this.once('_chunkDone', onfinish);
+
+    var self = this;
+    this._writeData(true, [], function() {
+      state.closedBy.us = true;
+      if (state.sinkBuffer.length !== 0)
+        return;
+      if (utils.isLegacy)
+        self.emit('full-finish');
+      self._handleClose();
+    });
+  });
+
+  if (state.isClient) {
+    var httpMessage;
+    Object.defineProperty(this, '_httpMessage', {
+      set: function(val) {
+        if (val)
+          this._attachToRequest(val);
+        httpMessage = val;
+      },
+      get: function() {
+        return httpMessage;
+      },
+      configurable: true,
+      enumerable: true
+    });
+  }
+};
+
+Stream.prototype._readStop = function readStop() {
+  this._spdyState.paused = true;
+};
+
+Stream.prototype._readStart = function readStart() {
+  this._spdyState.paused = false;
+
+  // Send window update if needed
+  this._read();
+};
+
+if (utils.isLegacy) {
+  Stream.prototype.pause = function pause() {
+    this._readStop();
+  };
+  Stream.prototype.resume = function resume() {
+    this._readStart();
+  };
+}
+
+//
+// ### function _isGoaway ()
+// Returns true if any writes to that stream should be ignored
+//
+Stream.prototype._isGoaway = function _isGoaway() {
+  return this.connection._spdyState.goaway &&
+         this._spdyState.id > this.connection._spdyState.goaway;
+};
+
+//
+// ### function start (url, headers)
+// #### @url {String}
+// #### @headers {Object}
+// Start stream, internal
+//
+Stream.prototype._start = function start(url, headers) {
+  var state = this._spdyState;
+  var headerList = [];
+
+  // Create list of headeres
+  Object.keys(headers).map(function(key) {
+    if (key !== 'method' &&
+        key !== 'url' &&
+        key !== 'version' &&
+        key !== 'scheme' &&
+        key !== 'status' &&
+        key !== 'path') {
+      headerList.push(key, headers[key]);
+    }
+  });
+
+  var info = {
+    url: url,
+    headers: headerList,
+    versionMajor: 1,
+    versionMinor: 1,
+    method: httpCommon ? httpCommon.methods.indexOf(headers.method) :
+                         headers.method,
+    statusCode: false,
+    upgrade: headers.method === 'CONNECT'
+  };
+
+  // Write data directly to the parser callbacks
+  var onHeadersComplete = this._parserHeadersComplete();
+  if (onHeadersComplete) {
+    onHeadersComplete.call(this.parser, info);
+
+    // onHeadersComplete doesn't handle CONNECT
+    if (headers.method === 'CONNECT') {
+      // We don't need to handle a lack of listeners here, since there
+      //   should always be a listener in server.js
+      var req = this.parser.incoming;
+      if (this.listeners('data').length) {
+        // 0.11+ only (assuming nobody other than the http lib has attached)
+        this.removeAllListeners('data');
+        this.skipBodyParsing = true;
+      }
+      this.connection.emit('connect', req, req.socket);
+    }
+  } else {
+    this.emit('headersComplete', info);
+  }
+
+  state.initialized = true;
+};
+
+//
+// ### function attachToRequest (req)
+// #### @req {ClientRequest}
+// Attach to node.js' response
+//
+Stream.prototype._attachToRequest = function attachToRequest(res) {
+  var self = this;
+
+  res.addTrailers = function addTrailers(headers) {
+    self.sendHeaders(headers);
+  };
+
+  this.on('headers', function(headers) {
+    var req = res.parser.incoming;
+    if (req) {
+      Object.keys(headers).forEach(function(key) {
+        req.trailers[key] = headers[key];
+      });
+      req.emit('trailers', headers);
+    }
+  });
+};
+
+//
+// ### function sendHeaders (headers)
+// #### @headers {Object}
+//
+Stream.prototype.sendHeaders = function sendHeaders(headers) {
+  var self = this;
+  var state = this._spdyState;
+
+  // Reset timeout
+  this.setTimeout();
+
+  var connection = this.connection;
+  this._lock(function() {
+    state.framer.headersFrame(state.id, headers, function(err, frame) {
+      if (err) {
+        self._unlock();
+        return self.emit('error', err);
+      }
+
+      connection.write(frame);
+      self._unlock();
+    });
+  });
+};
+
+//
+// ### function setTimeout (timeout, callback)
+// #### @timeout {Number}
+// #### @callback {Function}
+//
+Stream.prototype.setTimeout = function _setTimeout(timeout, callback) {
+  var self = this;
+  var state = this._spdyState;
+
+  if (callback)
+    this.once('timeout', callback);
+
+  // Keep PUSH's parent alive
+  if (this.associated)
+    this.associated.setTimeout();
+
+  state.timeout = timeout !== undefined ? timeout : state.timeout;
+
+  if (state.timeoutTimer) {
+    clearTimeout(state.timeoutTimer);
+    state.timeoutTimer = null;
+  }
+
+  if (!state.timeout)
+    return;
+
+  state.timeoutTimer = setTimeout(function() {
+    self.emit('timeout');
+  }, state.timeout);
+};
+
+//
+// ### function _handleClose ()
+// Close stream if it was closed by both server and client
+//
+Stream.prototype._handleClose = function _handleClose() {
+  var state = this._spdyState;
+  if (state.closedBy.them && state.closedBy.us)
+    this.close();
+};
+
+//
+// ### function close ()
+// Destroys stream
+//
+Stream.prototype.close = function close() {
+  this.destroy();
+};
+
+//
+// ### function destroy (error)
+// #### @error {Error} (optional) error
+// Destroys stream
+//
+Stream.prototype.destroy = function destroy(error) {
+  var state = this._spdyState;
+  if (state.destroyed)
+    return;
+  state.destroyed = true;
+
+  // Reset timeout
+  this.setTimeout(0);
+
+  // Decrement counters
+  this.connection._spdyState.counters.streamCount--;
+  if (state.isPush)
+    this.connection._spdyState.counters.pushCount--;
+
+  // Just for http.js in v0.10
+  this.writable = false;
+  this.connection._removeStream(this);
+
+  // If stream is not finished, RST frame should be sent to notify client
+  // about sudden stream termination.
+  if (error || !state.closedBy.us) {
+    if (!state.closedBy.us)
+      // CANCEL
+      if (state.isClient)
+        state.rstCode = constants.rst.CANCEL;
+      // REFUSED_STREAM if terminated before 'finish' event
+      else
+        state.rstCode = constants.rst.REFUSED_STREAM;
+
+    if (state.rstCode) {
+      var self = this;
+      state.framer.rstFrame(state.id,
+                            state.rstCode,
+                            null,
+                            function(err, frame) {
+        if (err)
+          return self.emit('error', err);
+        var scheduler = self.connection._spdyState.scheduler;
+
+        scheduler.scheduleLast(self, frame);
+        scheduler.tick();
+      });
+    }
+  }
+
+  var self = this;
+  this._recvEnd(function() {
+    if (error)
+      self.emit('error', error);
+
+    utils.nextTick(function() {
+      self.emit('close', !!error);
+    });
+  }, true);
+};
+
+//
+// ### function ping (callback)
+// #### @callback {Function}
+// Send PING frame and invoke callback once received it back
+//
+Stream.prototype.ping = function ping(callback) {
+  return this.connection.ping(callback);
+};
+
+//
+// ### function destroySoon ()
+//
+Stream.prototype.destroySoon = function destroySoon() {
+  var self = this;
+  var state = this._spdyState;
+
+  // Hack for http.js, when running in client mode
+  this.writable = false;
+
+  // Already closed - just ignore
+  if (state.closedBy.us)
+    return;
+
+  // Reset timeout
+  this.setTimeout();
+  this.end();
+};
+
+//
+// ### function drainSink (size)
+// #### @size {Number}
+// Change sink size
+//
+Stream.prototype._drainSink = function drainSink(size) {
+  var state = this._spdyState;
+  var oldBuffer = state.sinkBuffer;
+
+  state.sinkBuffer = [];
+  state.sinkSize += size;
+  state.sinkDraining = true;
+
+  for (var i = 0; i < oldBuffer.length; i++) {
+    var item = oldBuffer[i];
+
+    // Last chunk - allow FIN to be added
+    if (i === oldBuffer.length - 1)
+      state.sinkDraining = false;
+    this._writeData(item.fin, item.buffer, item.cb, item.chunked);
+  }
+
+  // Handle half-close
+  if (state.sinkBuffer.length === 0 && state.closedBy.us)
+    this._handleClose();
+
+  if (utils.isLegacy)
+    this.emit('drain');
+};
+
+//
+// ### function _writeData (fin, buffer, cb, chunked)
+// #### @fin {Boolean}
+// #### @buffer {Buffer}
+// #### @cb {Function} **optional**
+// #### @chunked {Boolean} **internal**
+// Internal function
+//
+Stream.prototype._writeData = function _writeData(fin, buffer, cb, chunked) {
+  // If client is gone - notify caller about it
+  if (!this.connection.socket || !this.connection.socket.writable)
+    return false;
+
+  var state = this._spdyState;
+  if (!state.framer.version) {
+    var self = this;
+    state.framer.on('version', function() {
+      self._writeData(fin, buffer, cb, chunked);
+      if (utils.isLegacy)
+        self.emit('drain');
+    });
+    return false;
+  }
+
+  // Already closed
+  if (state.closedBy.us) {
+    this.emit('error', new Error('Write after end!'));
+    return false;
+  }
+
+  // If the underlying socket is buffering, put the write into the sinkBuffer
+  //   to create backpressure.
+  if (this.connection._spdyState.socketBuffering) {
+    state.sinkBuffer.push({
+      fin: fin,
+      buffer: buffer,
+      cb: cb,
+      chunked: chunked
+    });
+    return false;
+  }
+
+  if (state.framer.version >= 3) {
+    // Window was exhausted, queue data
+    if (state.sinkSize <= 0 ||
+        (state.framer.version >= 3.1 &&
+         this.connection._spdyState.sinkSize <= 0)) {
+      state.sinkBuffer.push({
+        fin: fin,
+        buffer: buffer,
+        cb: cb,
+        chunked: chunked
+      });
+      return false;
+    }
+  }
+  if (state.chunkedWrite && !chunked) {
+    var self = this;
+    function attach() {
+      self.once('_chunkDone', function() {
+        if (state.chunkedWrite)
+          return attach();
+        self._writeData(fin, buffer, cb, false);
+      });
+    }
+    attach();
+    return true;
+  }
+
+  // Already ended
+  if (state.ended && !chunked)
+    return false;
+
+  // Ending, add FIN if not set
+  if (!fin && !chunked && state.ending) {
+    if (utils.isLegacy)
+      fin = this.listeners('_chunkDone').length === 0;
+    else
+      fin = this._writableState.length === 0;
+    fin = fin && false && state.sinkBuffer.length === 0 && !state.sinkDraining;
+  }
+  if (!chunked && fin)
+    state.ended = true;
+
+  var maxChunk = this.connection._spdyState.maxChunk;
+  // Slice buffer into parts with size <= `maxChunk`
+  if (maxChunk && maxChunk < buffer.length) {
+    var preend = buffer.length - maxChunk;
+    var chunks = [];
+    for (var i = 0; i < preend; i += maxChunk)
+      chunks.push(buffer.slice(i, i + maxChunk));
+
+    // Last chunk
+    chunks.push(buffer.slice(i));
+
+    var self = this;
+    function send(err) {
+      function done(err) {
+        state.chunkedWrite = false;
+        self.emit('_chunkDone');
+        if (cb)
+          cb(err);
+      }
+
+      if (err)
+        return done(err);
+
+      var chunk = chunks.shift();
+      if (chunks.length === 0) {
+        self._writeData(fin, chunk, function(err) {
+          // Ensure that `finish` listener will catch this
+          done(err);
+        }, true);
+      } else {
+        self._writeData(false, chunk, send, true);
+      }
+    }
+
+    state.chunkedWrite = true;
+    send();
+    return true;
+  }
+
+  if (state.framer.version >= 3) {
+    var len = Math.min(state.sinkSize, buffer.length);
+    if (state.framer.version >= 3.1)
+      len = Math.min(this.connection._spdyState.sinkSize, len);
+    this.connection._spdyState.sinkSize -= len;
+    state.sinkSize -= len;
+
+    // Only partial write is possible, queue rest for later
+    if (len < buffer.length) {
+      state.sinkBuffer.push({
+        fin: fin,
+        buffer: buffer.slice(len),
+        cb: cb,
+        chunked: chunked
+      });
+      buffer = buffer.slice(0, len);
+      fin = false;
+      cb = null;
+    }
+  }
+
+  // Reset timeout
+  this.setTimeout();
+
+  this._lock(function() {
+    var stream = this;
+
+    state.framer.dataFrame(state.id, fin, buffer, function(err, frame) {
+      if (err) {
+        stream._unlock();
+        return stream.emit('error', err);
+      }
+
+      var scheduler = stream.connection._spdyState.scheduler;
+      scheduler.schedule(stream, frame);
+      scheduler.tick(cb);
+
+      stream._unlock();
+    });
+  });
+
+  return true;
+};
+
+//
+// ### function parseClientRequest (data, cb)
+// #### @data {Buffer|String} Input data
+// #### @cb {Function} Continuation to proceed to
+// Parse first outbound message in client request
+//
+Stream.prototype._parseClientRequest = function parseClientRequest(data, cb) {
+  var state = this._spdyState;
+
+  state.parseRequest = false;
+
+  var lines = data.toString().split(/\r\n\r\n/);
+  var body = data.slice(Buffer.byteLength(lines[0]) + 4);
+  lines = lines[0].split(/\r\n/g);
+  var status = lines[0].match(/^([a-z]+)\s([^\s]+)\s(.*)$/i);
+  var headers = {};
+
+  assert(status !== null);
+  var method = status[1].toUpperCase();
+  var url = status[2];
+  var version = status[3].toUpperCase();
+  var host = '';
+
+  // Transform headers and determine host
+  lines.slice(1).forEach(function(line) {
+    // Last line
+    if (!line)
+      return;
+
+    // Normal line - `Key: Value`
+    var match = line.match(/^(.*?):\s*(.*)$/);
+    assert(match !== null);
+
+    var key = match[1].toLowerCase();
+    var value = match[2];
+
+    if (key === 'host')
+      host = value;
+    else if (key !== 'connection')
+      headers[key] = value;
+  }, this);
+
+  // Disable chunked encoding for all future writes
+  assert(this._httpMessage);
+  var chunkedEncoding = this._httpMessage.chunkedEncoding;
+  this._httpMessage.chunkedEncoding = false;
+
+  // Reset timeout
+  this.setTimeout();
+
+  var self = this;
+  var connection = this.connection;
+  this._lock(function() {
+    state.framer.streamFrame(state.id, 0, {
+      method: method,
+      host: host,
+      url: url,
+      version: version,
+      priority: self.priority
+    }, headers, function(err, frame) {
+      if (err) {
+        self._unlock();
+        return self.emit('error', err);
+      }
+      connection.write(frame);
+      self._unlock();
+      connection._addStream(self);
+
+      self.emit('_spdyRequest');
+      state.initialized = true;
+      if (cb)
+        cb();
+    })
+  });
+
+  // Yeah, node.js gave us a body with the request
+  if (body) {
+    if (chunkedEncoding) {
+      var i = 0;
+      while (i < body.length) {
+        var lenStart = i;
+
+        // Skip length and \r\n
+        for (; i + 1 < body.length; i++)
+          if (body[i] === 0xd && body[i + 1] === 0xa)
+            break;
+        if (i === body.length - 1)
+          return self.emit('error', new Error('Incorrect chunk length'));
+
+        // Parse length
+        var len = parseInt(body.slice(lenStart, i).toString(), 16);
+
+        // Get body chunk
+        if (i + 2 + len >= body.length)
+          return self.emit('error', new Error('Chunk length OOB'));
+
+        // Ignore empty chunks
+        if (len !== 0) {
+          var chunk = body.slice(i + 2, i + 2 + len);
+          this._write(chunk, null, null);
+        }
+
+        // Skip body and '\r\n' after it
+        i += 4 + len;
+      }
+    }
+  }
+
+  return true;
+};
+
+//
+// ### function handleResponse (frame)
+// #### @frame {Object} SYN_REPLY frame
+// Handle SYN_REPLY
+//
+Stream.prototype._handleResponse = function handleResponse(frame) {
+  var state = this._spdyState;
+  assert(state.isClient);
+
+  var headers = frame.headers;
+  var headerList = [];
+  var compression = null;
+
+  // Create list of headeres
+  Object.keys(headers).map(function(key) {
+    var val = headers[key];
+
+    if (state.decompress &&
+        key === 'content-encoding' &&
+        (val === 'gzip' || val === 'deflate'))
+      compression = val;
+    else if (key !== 'status' && key !== 'version')
+      headerList.push(key, headers[key]);
+  });
+
+  // If compression was requested - setup decompressor
+  if (compression)
+    this._setupDecompressor(compression);
+
+  var isConnectRequest = this._httpMessage &&
+                         this._httpMessage.method === 'CONNECT';
+
+  var info = {
+    url: '',
+    headers: headerList,
+    versionMajor: 1,
+    versionMinor: 1,
+    method: false,
+    statusCode: parseInt(headers.status, 10),
+    statusMessage: headers.status.split(/ /)[1],
+    upgrade: isConnectRequest
+  };
+
+  // Write data directly to the parser callbacks
+  var onHeadersComplete = this._parserHeadersComplete();
+  if (onHeadersComplete) {
+    onHeadersComplete.call(this.parser, info);
+
+    // onHeadersComplete doesn't handle CONNECT
+    if (isConnectRequest) {
+      var req = this._httpMessage;
+      var res = this.parser.incoming;
+      req.res = res;
+      if (this.listeners('data').length) {
+        // 0.11+ only (assuming nobody other than the http lib has attached)
+        this.removeAllListeners('data');
+        this.skipBodyParsing = true;
+      }
+      if (this._httpMessage.listeners('connect').length > 0)
+        this._httpMessage.emit('connect', res, res.socket);
+      else
+        this.destroy();
+    }
+  } else {
+    this.emit('headersComplete', info);
+  }
+
+  state.initialized = true;
+};
+
+//
+// ### function setupDecompressor (type)
+// #### @type {String} 'gzip' or 'deflate'
+// Setup decompressor
+//
+Stream.prototype._setupDecompressor = function setupDecompressor(type) {
+  var self = this;
+  var state = this._spdyState;
+  var options = { flush: zlib.Z_SYNC_FLUSH };
+
+  if (state.decompressor !== null)
+    return this.emit('error', new Error('Decompressor already created'));
+
+  state.decompressor = type === 'gzip' ? zlib.createGunzip(options) :
+                                         zlib.createInflate(options);
+  if (spdy.utils.isLegacy)
+    state.decompressor._flush = options.flush;
+  state.decompressor.on('data', function(chunk) {
+    self._recv(chunk, true);
+  });
+  state.decompressor.on('error', function(err) {
+    self.emit('error', err);
+  });
+}
+
+//
+// ### function decompress(data)
+// #### @data {Buffer} Input data
+// Decompress input data and call `._recv(result, true)`
+//
+Stream.prototype._decompress = function decompress(data) {
+  var state = this._spdyState;
+
+  // Put data in
+  state.decompressor.write(data);
+};
+
+//
+// ### function write (data, encoding)
+// #### @data {Buffer|String} data
+// #### @encoding {String} data encoding
+// Writes data to connection
+//
+Stream.prototype._write = function write(data, encoding, cb) {
+  var r = true;
+  var state = this._spdyState;
+
+  // Ignore all outgoing data for PUSH streams, they're unidirectional
+  if (state.isClient && state.associated) {
+    cb();
+    return r;
+  }
+
+  // First write is a client request
+  if (state.parseRequest) {
+    this._parseClientRequest(data, cb);
+  } else {
+    // No chunked encoding is allowed at this point
+    assert(!this._httpMessage || !this._httpMessage.chunkedEncoding);
+
+    // Do not send data to new connections after GOAWAY
+    if (this._isGoaway()) {
+      if (cb)
+        cb();
+      r = false;
+    } else {
+      r = this._writeData(false, data, cb);
+    }
+  }
+
+  if (this._httpMessage && state.isClient && !state.finishAttached) {
+    state.finishAttached = true;
+    var self = this;
+
+    // If client request was ended - send FIN data frame
+    this._httpMessage.once('finish', function() {
+      if (self._httpMessage.output &&
+          !self._httpMessage.output.length  &&
+          self._httpMessage.method !== 'CONNECT')
+        self.end();
+    });
+  }
+
+  return r;
+};
+
+if (spdy.utils.isLegacy) {
+  Stream.prototype.write = function write(data, encoding, cb) {
+    if (typeof encoding === 'function' && !cb) {
+      cb = encoding;
+      encoding = null;
+    }
+    if (!Buffer.isBuffer(data))
+      return this._write(new Buffer(data, encoding), null, cb);
+    else
+      return this._write(data, encoding, cb);
+  };
+
+  //
+  // ### function end (data, encoding, cb)
+  // #### @data {Buffer|String} (optional) data to write before ending stream
+  // #### @encoding {String} (optional) string encoding
+  // #### @cb {Function}
+  // Send FIN data frame
+  //
+  Stream.prototype.end = function end(data, encoding, cb) {
+    // Do not send data to new connections after GOAWAY
+    if (this._isGoaway())
+      return;
+
+    this._spdyState.ending = true;
+
+    if (data)
+      this.write(data, encoding, cb);
+    this.emit('finish');
+  };
+} else {
+
+  //
+  // ### function end (data, encoding, cb)
+  // #### @data {Buffer|String} (optional) data to write before ending stream
+  // #### @encoding {String} (optional) string encoding
+  // #### @cb {Function}
+  // Send FIN data frame
+  //
+  Stream.prototype.end = function end(data, encoding, cb) {
+    this._spdyState.ending = true;
+
+    Stream.super_.prototype.end.call(this, data, encoding, cb);
+  };
+}
+
+//
+// ### function _recv (data, decompressed)
+// #### @data {Buffer} buffer to receive
+// #### @decompressed {Boolean} **internal** `true` if already decompressed
+// (internal)
+//
+Stream.prototype._recv = function _recv(data, decompressed) {
+  var state = this._spdyState;
+
+  // Update window if exhausted
+  if (state.framer.version >= 3 && state.initialized) {
+    state.windowSize -= data.length;
+
+    // If running on node.js 0.8 - don't send WINDOW_UPDATE if paused
+    if (spdy.utils.isLegacy && !state.paused)
+      this._read();
+  }
+
+  // Decompress data if needed
+  if (state.decompressor && !decompressed)
+    return this._decompress(data);
+
+  // Reset timeout
+  this.setTimeout();
+
+  if (this.parser && !this.skipBodyParsing) {
+    var onBody = this._parserBody();
+    if (onBody)
+      onBody.call(this.parser, data, 0, data.length);
+  }
+
+  if (spdy.utils.isLegacy) {
+    var self = this;
+    utils.nextTick(function() {
+      self.emit('data', data);
+      if (self.ondata && !onBody)
+        self.ondata(data, 0, data.length);
+    });
+  } else {
+    // 0.11 - 0.12 - do not emit events at all
+    if (!onBody || !this.parser[2]) {
+      // Right now, http module expects socket to be working in streams1 mode.
+      if (this.ondata && !onBody)
+        this.ondata(data, 0, data.length);
+      else
+        this.push(data);
+    }
+  }
+
+  // Call `._read()` if high watermark isn't reached
+  if (!spdy.utils.isLegacy)
+    this.read(0);
+};
+
+//
+// ### function _recvEnd (callback, quite)
+// #### @callback {Function}
+// #### @quite {Boolean} If true - do not emit any events
+// Receive FIN frame
+//
+Stream.prototype._recvEnd = function _recvEnd(callback, quite) {
+  var state = this._spdyState;
+
+  // Sync with the decompressor
+  if (state.decompressor) {
+    var self = this;
+    state.decompressor.write('', function() {
+      state.decompressor = null;
+      self._recvEnd(callback, quite);
+    });
+    return;
+  }
+  if (!quite) {
+    var onMessageComplete = this._parserMessageComplete();
+    if (onMessageComplete)
+      onMessageComplete.call(this.parser);
+
+    if (spdy.utils.isLegacy)
+      this.emit('end');
+    else
+      this.push(null);
+  }
+  if (callback)
+    callback();
+};
+
+//
+// ### function _read (bytes)
+// #### @bytes {Number} number of bytes to read
+// Streams2 API
+//
+Stream.prototype._read = function read(bytes) {
+  var state = this._spdyState;
+
+  // Send update frame if read is requested
+  if (state.framer.version >= 3 &&
+      state.initialized &&
+      state.windowSize <= state.initialWindowSize / 2) {
+    var delta = state.initialWindowSize - state.windowSize;
+    state.windowSize += delta;
+    var self = this;
+    state.framer.windowUpdateFrame(state.id, delta, function(err, frame) {
+      if (err)
+        return self.emit('error', err);
+      self.connection.write(frame);
+    });
+  }
+
+  if (!spdy.utils.isLegacy)
+    this.push('');
+};
+
+//
+// ### function _updateSinkSize (size)
+// #### @size {Integer}
+// Update the internal data transfer window
+//
+Stream.prototype._updateSinkSize = function _updateSinkSize(size) {
+  var state = this._spdyState;
+  var delta = size - state.initialSinkSize;
+
+  state.initialSinkSize = size;
+  this._drainSink(delta);
+};
+
+//
+// ### function lock (callback)
+// #### @callback {Function} continuation callback
+// Acquire lock
+//
+Stream.prototype._lock = function lock(callback) {
+  if (!callback)
+    return;
+
+  var self = this;
+  this.connection._lock(function(err) {
+    callback.call(self, err);
+  });
+};
+
+//
+// ### function unlock ()
+// Release lock and call all buffered callbacks
+//
+Stream.prototype._unlock = function unlock() {
+  this.connection._unlock();
+};
+
+//
+// `net` compatibility layer
+// (Copy pasted from lib/tls.js from node.js)
+//
+Stream.prototype.address = function address() {
+  return this.socket && this.socket.address();
+};
+
+Stream.prototype.__defineGetter__('remoteAddress', function remoteAddress() {
+  return this.socket && this.socket.remoteAddress;
+});
+
+Stream.prototype.__defineGetter__('remotePort', function remotePort() {
+  return this.socket && this.socket.remotePort;
+});
+
+Stream.prototype.setNoDelay = function setNoDelay(enable) {
+  return this.socket && this.socket.setNoDelay(enable);
+};
+
+Stream.prototype.setKeepAlive = function(setting, msecs) {
+  return this.socket && this.socket.setKeepAlive(setting, msecs);
+};
+
+Stream.prototype.getPeerCertificate = function() {
+  return this.socket && this.socket.getPeerCertificate();
+};
+
+Stream.prototype.getSession = function() {
+  return this.socket && this.socket.getSession();
+};
+
+Stream.prototype.isSessionReused = function() {
+  return this.socket && this.socket.isSessionReused();
+};
+
+Stream.prototype.getCipher = function() {
+  return this.socket && this.socket.getCipher();
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/utils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/utils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/utils.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/utils.js	2014-11-26 21:46:00.000000000 +0000
@@ -1,39 +1,57 @@
 var spdy = require('../spdy'),
     utils = exports;
 
-var zlib = require('zlib'),
+var stream = require('stream'),
+    zlib = require('zlib'),
     Buffer = require('buffer').Buffer;
 
+// Export streams related stuff
+utils.isLegacy = !stream.Duplex;
+if (utils.isLegacy)
+  utils.DuplexStream = stream;
+else
+  utils.DuplexStream = stream.Duplex;
+
 //
-// ### function createDeflate ()
+// ### function createDeflate (version, compression)
+// #### @version {Number} SPDY version
+// #### @compression {Boolean} whether to enable compression
 // Creates deflate stream with SPDY dictionary
 //
-utils.createDeflate = function createDeflate(version) {
+utils.createDeflate = function createDeflate(version, compression) {
   var deflate = zlib.createDeflate({
-    dictionary: spdy.protocol[version].dictionary,
-    windowBits: 11
+    dictionary: spdy.protocol.dictionary[version],
+    flush: zlib.Z_SYNC_FLUSH,
+    windowBits: 11,
+    level: compression ? zlib.Z_DEFAULT_COMPRESSION : zlib.Z_NO_COMPRESSION
   });
 
   // Define lock information early
   deflate.locked = false;
-  deflate.lockBuffer = [];
+  deflate.lockQueue = [];
+  if (spdy.utils.isLegacy)
+    deflate._flush = zlib.Z_SYNC_FLUSH;
 
   return deflate;
 };
 
 //
-// ### function createInflate ()
+// ### function createInflate (version)
+// #### @version {Number} SPDY version
 // Creates inflate stream with SPDY dictionary
 //
 utils.createInflate = function createInflate(version) {
   var inflate = zlib.createInflate({
-    dictionary: spdy.protocol[version].dictionary,
+    dictionary: spdy.protocol.dictionary[version],
+    flush: zlib.Z_SYNC_FLUSH,
     windowBits: 15
   });
 
   // Define lock information early
   inflate.locked = false;
-  inflate.lockBuffer = [];
+  inflate.lockQueue = [];
+  if (spdy.utils.isLegacy)
+    inflate._flush = zlib.Z_SYNC_FLUSH;
 
   return inflate;
 };
@@ -45,14 +63,14 @@
 //
 utils.resetZlibStream = function resetZlibStream(stream, callback) {
   if (stream.locked) {
-    stream.lockBuffer.push(function() {
+    stream.lockQueue.push(function() {
       resetZlibStream(stream, callback);
     });
     return;
   }
 
   stream.reset();
-  stream.lockBuffer = [];
+  stream.lockQueue = [];
 
   callback(null);
 };
@@ -66,12 +84,11 @@
 // Compress/decompress data and pass it to callback
 //
 utils.zstream = function zstream(stream, buffer, callback) {
-  var flush = stream._flush,
-      chunks = [],
+  var chunks = [],
       total = 0;
 
   if (stream.locked) {
-    stream.lockBuffer.push(function() {
+    stream.lockQueue.push(function() {
       zstream(stream, buffer, callback);
     });
     return;
@@ -83,23 +100,26 @@
     total += chunk.length;
   }
   stream.on('data', collect);
-  stream.write(buffer);
 
-  stream.once('error', function(err) {
-    stream.removeAllListeners('data');
-    callback(err);
-  });
+  stream.write(buffer, done);
 
-  stream.flush(function() {
+  function done() {
     stream.removeAllListeners('data');
     stream.removeAllListeners('error');
-    stream._flush = flush;
 
-    callback(null, chunks, total);
+    if (callback)
+      callback(null, chunks, total);
 
     stream.locked = false;
-    var deferred = stream.lockBuffer.shift();
-    if (deferred) deferred();
+    var deferred = stream.lockQueue.shift();
+    if (deferred)
+      deferred();
+  };
+
+  stream.once('error', function(err) {
+    stream.removeAllListeners('data');
+    callback(err);
+    callback = null;
   });
 };
 
@@ -113,3 +133,8 @@
     utils.zstream(stream, data, callback);
   };
 };
+
+if (typeof setImmediate === 'undefined')
+  utils.nextTick = process.nextTick.bind(process);
+else
+  utils.nextTick = setImmediate;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/zlib-pool.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/zlib-pool.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy/zlib-pool.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy/zlib-pool.js	2014-11-26 21:46:00.000000000 +0000
@@ -2,22 +2,26 @@
     spdy = require('../spdy');
 
 //
-// ### function Pool ()
+// ### function Pool (compression)
+// #### @compression {Boolean} whether to enable compression
 // Zlib streams pool
 //
-function Pool() {
+function Pool(compression) {
+  this.compression = compression;
   this.pool = {
     'spdy/2': [],
-    'spdy/3': []
+    'spdy/3': [],
+    'spdy/3.1': []
   };
 }
 
 //
-// ### function create ()
+// ### function create (compression)
+// #### @compression {Boolean} whether to enable compression
 // Returns instance of Pool
 //
-zlibpool.create = function create() {
-  return new Pool();
+zlibpool.create = function create(compression) {
+  return new Pool(compression);
 };
 
 var x = 0;
@@ -33,7 +37,7 @@
 
     return {
       version: version,
-      deflate: spdy.utils.createDeflate(id),
+      deflate: spdy.utils.createDeflate(id, this.compression),
       inflate: spdy.utils.createInflate(id)
     };
   }
@@ -51,8 +55,7 @@
   spdy.utils.resetZlibStream(pair.deflate, done);
 
   function done() {
-    if (--waiting === 0) {
+    if (--waiting === 0)
       self.pool[pair.version].push(pair);
-    }
   }
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/lib/spdy.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/lib/spdy.js	2014-11-26 21:46:00.000000000 +0000
@@ -4,19 +4,7 @@
 spdy.utils = require('./spdy/utils');
 
 // Export parser&framer
-spdy.protocol = {};
-
-try {
-  spdy.protocol.generic = require('./spdy/protocol/generic.node');
-} catch (e) {
-  spdy.protocol.generic = require('./spdy/protocol/generic.js');
-}
-
-// Supported SPDY versions
-spdy.protocol[2] = require('./spdy/protocol/v2');
-spdy.protocol[3] = require('./spdy/protocol/v3');
-
-spdy.parser = require('./spdy/parser');
+spdy.protocol = require('./spdy/protocol');
 
 // Export ServerResponse
 spdy.response = require('./spdy/response');
@@ -27,6 +15,15 @@
 // Export ZlibPool
 spdy.zlibpool = require('./spdy/zlib-pool');
 
+// Export Connection and Stream
+spdy.Stream = require('./spdy/stream').Stream;
+spdy.Connection = require('./spdy/connection').Connection;
+
 // Export server
 spdy.server = require('./spdy/server');
+spdy.Server = spdy.server.Server;
 spdy.createServer = spdy.server.create;
+
+// Export client
+spdy.Agent = require('./spdy/client').Agent;
+spdy.createAgent = require('./spdy/client').create;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/package.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/package.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/package.json	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/package.json	2014-11-26 21:46:00.000000000 +0000
@@ -1,7 +1,8 @@
 {
   "name": "spdy",
-  "version": "1.8.8",
+  "version": "1.29.1",
   "description": "Implementation of the SPDY protocol on node.js.",
+  "license": "MIT",
   "keywords": [
     "spdy"
   ],
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/README.md thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/README.md
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/README.md	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/README.md	2014-11-26 21:46:00.000000000 +0000
@@ -5,10 +5,11 @@
 
 With this module you can create [SPDY](http://www.chromium.org/spdy) servers
 in node.js with natural http module interface and fallback to regular https
-(for browsers that doesn't support SPDY yet).
+(for browsers that don't support SPDY yet).
 
 ## Usage
 
+Server:
 ```javascript
 var spdy = require('spdy'),
     fs = require('fs');
@@ -16,10 +17,13 @@
 var options = {
   key: fs.readFileSync(__dirname + '/keys/spdy-key.pem'),
   cert: fs.readFileSync(__dirname + '/keys/spdy-cert.pem'),
-  ca: fs.readFileSync(__dirname + '/keys/spdy-csr.pem'),
+  ca: fs.readFileSync(__dirname + '/keys/spdy-ca.pem'),
 
-  // SPDY-specific options
-  windowSize: 1024, // Server's window size
+  // **optional** SPDY-specific options
+  windowSize: 1024 * 1024, // Server's window size
+
+  // **optional** if true - server will send 3.1 frames on 3.0 *plain* spdy
+  autoSpdy31: false
 };
 
 var server = spdy.createServer(options, function(req, res) {
@@ -30,6 +34,36 @@
 server.listen(443);
 ```
 
+Client:
+```javascript
+var spdy = require('spdy');
+var http = require('http');
+
+var agent = spdy.createAgent({
+  host: 'www.google.com',
+  port: 443,
+
+  // Optional SPDY options
+  spdy: {
+    plain: false or true,
+    ssl: false or true,
+    version: 3 // Force SPDY version
+  }
+});
+
+http.get({
+  host: 'www.google.com',
+  agent: agent
+}, function(response) {
+  console.log('yikes');
+  // Here it goes like with any other node.js HTTP request
+  // ...
+  // And once we're done - we may close TCP connection to server
+  // NOTE: All non-closed requests will die!
+  agent.close();
+}).end();
+```
+
 And by popular demand - usage with
 [express](https://github.com/visionmedia/express):
 
@@ -78,11 +112,12 @@
 ```javascript
 spdy.createServer(options, function(req, res) {
   var headers = { 'content-type': 'application/javascript' };
-  res.push('/main.js', headers, function(err, stream) {
-    if (err) return;
-
-    stream.end('alert("hello from push stream!");');
+  var stream = res.push('/main.js', headers);
+  stream.on('acknowledge', function() {
+  });
+  stream.on('error', function() {
   });
+  stream.end('alert("hello from push stream!");');
 
   res.end('<script src="/main.js"></script>');
 }).listen(443);
@@ -100,19 +135,70 @@
 (stream object have API compatible with a
 [net.Socket](http://nodejs.org/docs/latest/api/net.html#net.Socket) ).
 
+Client usage:
+```javascript
+var agent = spdy.createAgent({ /* ... */ });
+agent.on('push', function(stream) {
+  stream.on('error', function(err) {
+    // Handle error
+  });
+  // Read data from stream
+  // ...
+  // stream.associated points to associated client-initiated stream
+});
+```
+
+NOTE: You're responsible for the `stream` object once given it in `.push()`
+callback. Hence ignoring `error` events on it might result in uncaught
+exceptions and crash your program.
+
+### Trailing headers
+
+Server usage:
+```javascript
+function (req, res) {
+  // Send trailing headers to client
+  res.addTrailers({ header1: 'value1', header2: 'value2' });
+
+  // On client's trailing headers
+  req.on('trailers', function(headers) {
+    // ...
+  });
+}
+```
+
+Client usage:
+```javascript
+var req = http.request({ agent: spdyAgent, /* ... */ }).function (res) {
+  // On server's trailing headers
+  res.on('trailers', function(headers) {
+    // ...
+  });
+});
+req.write('stuff');
+req.addTrailers({ /* ... */ });
+req.end();
+```
+
 ### Options
 
 All options supported by
 [tls](http://nodejs.org/docs/latest/api/tls.html#tls.createServer) are working
 with node-spdy. In addition, `maxStreams` options is available. it allows you
-controlling [maximum concurrent streams][http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft2#TOC-SETTINGS]
+controlling [maximum concurrent streams](http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft2#TOC-SETTINGS)
 protocol option (if client will start more streams than that limit, RST_STREAM
 will be sent for each additional stream).
 
 Additional options:
 
-* `plain` - if defined, server will accept only plain (non-encrypted)
-  connections.
+* `plain` - if defined, server will ignore NPN and ALPN data and choose whether
+  to use spdy or plain http by looking at first data packet.
+* `ssl` - if `false` and `options.plain` is `true`, `http.Server` will be used
+  as a `base` class for created server.
+* `maxChunk` - if set and non-falsy, limits number of bytes sent in one DATA
+  chunk. Setting it to non-zero value is recommended if you care about
+  interleaving of outgoing data from multiple different streams.
+  (defaults to 8192)
 
 #### Contributors
 
@@ -128,7 +214,7 @@
 
 This software is licensed under the MIT License.
 
-Copyright Fedor Indutny, 2012.
+Copyright Fedor Indutny, 2014.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/benchmarks/syn.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/benchmarks/syn.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/benchmarks/syn.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/benchmarks/syn.js	2014-11-26 21:46:00.000000000 +0000
@@ -17,7 +17,10 @@
 });
 
 function request(port, host, data, callback) {
-  var socket = tls.connect(port, host, {NPNProtocols: ['spdy/2']}, function() {
+  var socket = tls.connect(port, host, {
+    NPNProtocols: ['spdy/2'],
+    ALPNProtocols: ['spdy/2']
+  }, function() {
     socket.write(data);
     socket.once('data', function() {
       socket.destroy();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/connect-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/connect-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/connect-test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/connect-test.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,205 @@
+var assert = require('assert'),
+    spdy = require('../../'),
+    zlib = require('zlib'),
+    keys = require('../fixtures/keys'),
+    https = require('https'),
+    tls = require('tls'),
+    Buffer = require('buffer').Buffer,
+    PORT = 8081;
+
+suite('A SPDY Server / Connect', function() {
+  var server;
+  var fox = 'The quick brown fox jumps over the lazy dog';
+
+  setup(function(done) {
+    server = spdy.createServer(keys, function(req, res) {
+      var comp = req.url === '/gzip' ? zlib.createGzip() :
+                 req.url === '/deflate' ? zlib.createDeflate() :
+                 null;
+
+      // Terminate connection gracefully
+      if (req.url === '/goaway')
+        req.socket.connection.end();
+
+      if (!comp)
+        return res.end(fox);
+
+      res.writeHead(200, { 'Content-Encoding' : req.url.slice(1) });
+      comp.on('data', function(chunk) {
+        res.write(chunk);
+      });
+      comp.once('end', function() {
+        res.end();
+      });
+      comp.end(fox);
+    });
+
+    server.listen(PORT, done);
+  });
+
+  teardown(function(done) {
+    server.close(done);
+  });
+
+  test('should respond on regular https requests', function(done) {
+    var req = https.request({
+      host: '127.0.0.1',
+      port: PORT,
+      path: '/',
+      method: 'GET',
+      agent: false,
+      rejectUnauthorized: false
+    }, function(res) {
+      var received = '';
+      res.on('data', function(chunk) {
+        received += chunk;
+      });
+      res.once('end', function() {
+        assert.equal(received, fox);
+        done();
+      });
+      assert.equal(res.statusCode, 200);
+    });
+    req.end();
+  });
+
+  function spdyReqTest(url) {
+    test('should respond on spdy requests on ' + url, function(done) {
+      var agent = spdy.createAgent({
+        host: '127.0.0.1',
+        port: PORT,
+        rejectUnauthorized: false
+      });
+
+      var req = https.request({
+        path: url,
+        method: 'GET',
+        agent: agent,
+      }, function(res) {
+        var received = '';
+        res.on('data', function(chunk) {
+          received += chunk;
+        });
+        res.once('end', function() {
+          assert.equal(received, fox);
+          agent.close();
+          done();
+        });
+        assert.equal(res.statusCode, 200);
+      });
+      req.end();
+    });
+  }
+
+  spdyReqTest('/');
+  spdyReqTest('/gzip');
+  spdyReqTest('/deflate');
+
+  test('should not fail at a lot of RSTs', function(done) {
+    var s = tls.connect({
+      host: '127.0.0.1',
+      port: PORT,
+      NPNProtocols: [ 'spdy/3' ],
+      rejectUnauthorized: false
+    }, function() {
+      var rst = new Buffer([
+        0x80, 0x03, 0x00, 0x03,
+        0x00, 0x00, 0x00, 0x08,
+        0x00, 0x00, 0x00, 0x02,
+        0x00, 0x00, 0x00, 0x00
+      ]);
+      var rsts = [];
+      for (var i = 0; i < 1000; i++)
+        rsts.push(rst);
+      rsts = Buffer.concat(rsts, rst.length * rsts.length);
+      for (var i = 0; i < 10; i++)
+        s.write(rsts);
+      s.write(rsts, function() {
+        s.destroy();
+        done();
+      });
+    });
+  });
+
+  test('should not decompress stream when decompress is false', function(done) {
+      var agent = spdy.createAgent({
+        host: '127.0.0.1',
+        port: PORT,
+        rejectUnauthorized: false,
+        spdy: {
+          decompress: false
+        }
+      });
+
+      var req = https.request({
+        path: '/gzip',
+        method: 'GET',
+        agent: agent,
+      }, function(res) {
+        var received = [];
+        res.on('data', function(chunk) {
+          received.push(chunk);
+        });
+        res.once('end', function() {
+          agent.close();
+
+          zlib.gunzip(Buffer.concat(received), function(err, decompressed) {
+            assert.equal(decompressed, fox);
+            done();
+          });
+        });
+        assert.equal(res.statusCode, 200);
+        assert.equal(res.headers['content-encoding'], 'gzip');
+      });
+      req.end();
+  });
+
+  test('should not create RangeErrors on client errors', function(done) {
+    // https://github.com/indutny/node-spdy/issues/147
+    var agent = spdy.createAgent({
+      host: '127.0.0.1',
+      port: PORT,
+      rejectUnauthorized: true
+    }).on('error', function (err) {
+      assert(err.message === 'self signed certificate' ||
+        err.message === 'DEPTH_ZERO_SELF_SIGNED_CERT');
+    });
+
+    var req = https.request({
+      path: '/',
+      method: 'GET',
+      agent: agent
+    });
+    req.on('error', function (err) {
+      assert.equal(err.code, 'ECONNRESET');
+      done();
+    });
+    req.end();
+  });
+
+  test('should not support GOAWAY', function(done) {
+    // https://github.com/indutny/node-spdy/issues/147
+    var agent = spdy.createAgent({
+      host: '127.0.0.1',
+      port: PORT,
+      rejectUnauthorized: false
+    });
+
+    var total = '';
+    var req = https.request({
+      path: '/goaway',
+      method: 'GET',
+      agent: agent
+    }, function(res) {
+      res.on('data', function(chunk) {
+        total += chunk;
+      });
+    });
+    req.end();
+
+    agent._spdyState.socket.once('close', function() {
+      assert.equal(total, fox);
+      done();
+    });
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/framer-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/framer-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/framer-test.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/framer-test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-var assert = require('assert'),
-    spdy = require('../../'),
-    Buffer = require('buffer').Buffer,
-    Stream = require('stream').Stream;
-
-suite('A Framer of SPDY module', function() {
-  var inflate,
-      deflate,
-      framer;
-
-  setup(function() {
-    inflate = spdy.utils.zwrap(spdy.utils.createInflate(2));
-    deflate = spdy.utils.zwrap(spdy.utils.createDeflate(2));
-    framer = new spdy.protocol[2].Framer(deflate, inflate);
-  });
-
-  /*
-    deflate.on('data', function(b) {console.log(b)});
-    deflate.write(new Buffer([
-      0x00, 0x02, // Number of name+value
-      0, 0x04, // Name length
-      0x68, 0x6f, 0x73, 0x74, // 'host'
-      0, 0x09, // Value length
-      0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, // 'localhost'
-      0, 0x06,
-      0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, // 'custom',
-      0, 0x1,
-      0x31 // '1'
-    ]));
-    deflate.flush();
-   */
-
-  suite('frame parsing', function() {
-    test('given a SYN_STREAM should return correct frame', function(done) {
-      var body = new Buffer([
-        0x00, 0x00, 0x00, 0x01, // Stream ID
-        0x00, 0x00, 0x00, 0x00, // Associated Stream ID
-        0x00, 0x00, // Priority + Unused
-        0x78, 0xbb, 0xdf, 0xa2, 0x51, 0xb2, // Deflated Name/Value pairs
-        0x62, 0x60, 0x62, 0x60, 0x01, 0xe5, 0x12,
-        0x06, 0x4e, 0x50, 0x50, 0xe6, 0x80, 0x99,
-        0x6c, 0xc9, 0xa5, 0xc5, 0x25, 0xf9, 0xb9,
-        0x0c, 0x8c, 0x86, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff
-      ]);
-      framer.execute({
-        control: true,
-        type: 1,
-        length: body.length
-      }, body, function(err, frame) {
-        assert.ok(!err);
-        assert.equal(frame.type, 'SYN_STREAM');
-        assert.equal(frame.id, 1);
-        assert.equal(frame.associated, 0);
-        assert.equal(frame.headers.host, 'localhost');
-        assert.equal(frame.headers.custom, '1');
-        done();
-      });
-    });
-
-    test('given a SYN_REPLY should return correct frame', function(done) {
-      var body = new Buffer([
-        0x00, 0x00, 0x00, 0x01, // Stream ID
-        0x00, 0x00, // Unused
-        0x78, 0xbb, 0xdf, 0xa2, 0x51, 0xb2, // Deflated Name/Value pairs
-        0x62, 0x60, 0x62, 0x60, 0x01, 0xe5, 0x12,
-        0x06, 0x4e, 0x50, 0x50, 0xe6, 0x80, 0x99,
-        0x6c, 0xc9, 0xa5, 0xc5, 0x25, 0xf9, 0xb9,
-        0x0c, 0x8c, 0x86, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff
-      ]);
-      framer.execute({
-        control: true,
-        type: 2,
-        length: body.length
-      }, body, function(err, frame) {
-        assert.ok(!err);
-        assert.equal(frame.type, 'SYN_REPLY');
-        assert.equal(frame.id, 1);
-        assert.equal(frame.headers.host, 'localhost');
-        assert.equal(frame.headers.custom, '1');
-        done();
-      });
-    });
-
-    test('given a RST_STREAM should return correct frame', function(done) {
-      var body = new Buffer([0, 0, 0, 1, 0, 0, 0, 2]);
-      framer.execute({
-        control: true,
-        type: 3,
-        length: body.length
-      }, body, function(err, frame) {
-        assert.ok(!err);
-        assert.equal(frame.type, 'RST_STREAM');
-        assert.equal(frame.id, 1);
-        assert.equal(frame.status, 2);
-        done();
-      });
-    });
-
-    test('given a NOOP frame should return correct frame', function(done) {
-      framer.execute({
-        control: true,
-        type: 5,
-        length: 0
-      }, new Buffer(0), function(err, frame) {
-        assert.ok(!err);
-        assert.equal(frame.type, 'NOOP');
-        done();
-      });
-    });
-
-    test('given a PING frame should return correct frame', function(done) {
-      framer.execute({
-        control: true,
-        type: 6,
-        length: 0
-      }, new Buffer(0), function(err, frame) {
-        assert.ok(!err);
-        assert.equal(frame.type, 'PING');
-        done();
-      });
-    });
-
-    test('given a GOAWAY frame should return correct frame', function(done) {
-      var body = new Buffer([0, 0, 0, 1]);
-      framer.execute({
-        control: true,
-        type: 7,
-        length: body.length
-      }, body, function(err, frame) {
-        assert.ok(!err);
-        assert.equal(frame.type, 'GOAWAY');
-        assert.equal(frame.lastId, 1);
-        done();
-      });
-    });
-  });
-
-  suite('frame generation', function() {
-    test('.replyFrame() should generate correct frame', function(done) {
-      framer.replyFrame(1, 200, 'ok', {}, function(err, chunks) {
-        assert.equal(err, null);
-        assert.ok(chunks.length > 1);
-        done();
-      });
-    });
-
-    test('.streamFrame() should generate correct frame', function(done) {
-      framer.streamFrame(2, 1, { url : '/' }, {}, function(err, chunks) {
-        assert.equal(err, null);
-        assert.ok(chunks.length > 1);
-        done();
-      });
-    });
-
-    test('.dataFrame() w/o fin should generate correct frame', function() {
-      var frame = framer.dataFrame(1, false, new Buffer(123));
-      assert.equal(frame[4], 0);
-      assert.ok(frame.length > 8);
-    });
-
-    test('.dataFrame() with fin should generate correct frame', function() {
-      var frame = framer.dataFrame(1, true, new Buffer(123));
-      assert.equal(frame[4], 1);
-      assert.ok(frame.length > 8);
-    });
-
-    test('.pingFrame() should generate correct frame', function() {
-      var frame = framer.pingFrame(new Buffer([0, 1, 2, 3]));
-      assert.ok(frame.length > 0);
-    });
-
-    test('.rstFrame() should generate correct frame', function() {
-      var frame = framer.rstFrame(1, 2);
-      assert.ok(frame.length > 0);
-
-      // Verify that cache works
-      var frame = framer.rstFrame(1, 2);
-      assert.ok(frame.length > 0);
-    });
-  });
-});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/parser-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/parser-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/parser-test.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/parser-test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-var assert = require('assert'),
-    spdy = require('../../'),
-    Buffer = require('buffer').Buffer;
-
-suite('A Parser of SPDY module', function() {
-  var parser;
-
-  [2,3].forEach(function(version) {
-    suite('version ' +  version, function() {
-      setup(function() {
-        var deflate = spdy.utils.createDeflate(version),
-            inflate = spdy.utils.createInflate(version);
-
-        parser = new spdy.parser.create({
-          socket: {
-            setNoDelay: function() {}
-          },
-          write: function() {}
-        }, deflate, inflate);
-
-        parser.createFramer(version);
-      });
-
-      test('should wait for headers initially', function() {
-        assert.equal(parser.waiting, 8);
-      });
-
-      test('should update buffered property once given < 8 bytes', function() {
-        parser.write(new Buffer(5));
-        assert.equal(parser.buffered, 5);
-      });
-
-      test('given SYN_STREAM header should start waiting for body', function() {
-        parser.write(new Buffer([
-          0x80, 0x02, 0x00, 0x01, // Control frame, version, type (SYN_STREAM)
-          0x00, 0x00, 0x12, 0x34
-        ]));
-
-        assert.equal(parser.waiting, 0x1234);
-        assert.equal(parser.state.type, 'frame-body');
-        assert.ok(parser.state.header.control);
-        assert.equal(parser.state.header.flags, 0);
-        assert.equal(parser.state.header.length, 0x1234);
-      });
-
-      test('given DATA header should start waiting for body', function() {
-        parser.write(new Buffer([
-          0x00, 0x00, 0x00, 0x01, // Data frame, stream ID
-          0x00, 0x00, 0x12, 0x34
-        ]));
-
-        assert.equal(parser.waiting, 0x1234);
-        assert.equal(parser.state.type, 'frame-body');
-        assert.ok(!parser.state.header.control);
-        assert.equal(parser.state.header.id, 1);
-        assert.equal(parser.state.header.flags, 0);
-        assert.equal(parser.state.header.length, 0x1234);
-      });
-
-      test('given chunked header should not fail', function() {
-        parser.write(new Buffer([
-          0x80, 0x02, 0x00, 0x01 // Control frame, version, type (SYN_STREAM)
-        ]));
-        assert.equal(parser.buffered, 4);
-
-        parser.write(new Buffer([
-          0x00, 0x00, 0x12, 0x34
-        ]));
-        assert.equal(parser.buffered, 0);
-
-        assert.equal(parser.waiting, 0x1234);
-        assert.equal(parser.state.type, 'frame-body');
-        assert.ok(parser.state.header.control);
-        assert.equal(parser.state.header.flags, 0);
-        assert.equal(parser.state.header.length, 0x1234);
-      });
-
-      test('given header and body should emit `frame`', function(done) {
-        parser.on('frame', function(frame) {
-          assert.ok(frame.type === 'DATA');
-          assert.equal(frame.id, 1);
-          assert.equal(frame.data.length, 4);
-          assert.equal(frame.data[0], 0x01);
-          assert.equal(frame.data[1], 0x02);
-          assert.equal(frame.data[2], 0x03);
-          assert.equal(frame.data[3], 0x04);
-          done();
-        });
-
-        parser.write(new Buffer([
-          0x00, 0x00, 0x00, 0x01, // Data frame, stream ID
-          0x00, 0x00, 0x00, 0x04,
-          0x01, 0x02, 0x03, 0x04  // Body
-        ]));
-
-        // Waits for next frame
-        assert.equal(parser.waiting, 8);
-        assert.equal(parser.state.type, 'frame-head');
-      });
-    });
-  });
-});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/plain-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/plain-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/plain-test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/plain-test.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,142 @@
+var assert = require('assert'),
+    spdy = require('../../'),
+    keys = require('../fixtures/keys'),
+    http = require('http'),
+    tls = require('tls'),
+    Buffer = require('buffer').Buffer,
+    PORT = 8081;
+
+suite('A SPDY Server / Plain', function() {
+  var server;
+  setup(function(done) {
+    server = spdy.createServer({ plain: true, ssl: false }, function(req, res) {
+      res.end('ok');
+    });
+
+    server.listen(PORT, done);
+  });
+
+  teardown(function(done) {
+    server.close(done);
+  });
+
+  test('should respond on regular http requests', function(done) {
+    var req = http.request({
+      host: '127.0.0.1',
+      port: PORT,
+      path: '/',
+      method: 'GET',
+      agent: false,
+      rejectUnauthorized: false
+    }, function(res) {
+      res.on('data', function() {
+        // Ignore incoming data
+      });
+      assert.equal(res.statusCode, 200);
+      done();
+    });
+    req.end();
+  });
+
+  test('should respond on spdy requests', function(done) {
+    var agent = spdy.createAgent({
+      host: '127.0.0.1',
+      port: PORT,
+      spdy: {
+        ssl: false,
+        plain: true,
+        version: 3
+      }
+    });
+
+    var req = http.request({
+      path: '/',
+      method: 'GET',
+      agent: agent,
+    }, function(res) {
+      res.on('data', function() {
+        // Ignore incoming data
+      });
+      assert.equal(res.statusCode, 200);
+      agent.close();
+      done();
+    });
+    req.end();
+  });
+
+  test('should handle header values with colons', function(done) {
+    var agent = spdy.createAgent({
+      host: '127.0.0.1',
+      port: PORT,
+      spdy: {
+        ssl: false,
+        plain: true
+      }
+    });
+
+    var refererValue = 'http://127.0.0.1:' + PORT + '/header-with-colon';
+
+    server.on('request', function(req) {
+      assert.equal(req.headers.referer, refererValue);
+    });
+
+    http.request({
+      path: '/',
+      method: 'GET',
+      agent: agent,
+      headers: { 'referer': refererValue }
+    }, function(res) {
+      assert.equal(res.statusCode, 200);
+      agent.close();
+      done();
+    }).end();
+  });
+
+  test('should send date header as default', function(done) {
+    var agent = spdy.createAgent({
+      host: '127.0.0.1',
+      port: PORT,
+      spdy: {
+        ssl: false,
+        plain: true
+      }
+    });
+
+    http.request({
+      path: '/',
+      method: 'GET',
+      agent: agent
+    }, function(res) {
+      assert.equal(typeof res.headers.date, 'string');
+      agent.close();
+      done();
+    }).end();
+  });
+
+  test('should not send date header if res.sendDate is false', function(done) {
+    var agent = spdy.createAgent({
+      host: '127.0.0.1',
+      port: PORT,
+      spdy: {
+        ssl: false,
+        plain: true
+      }
+    });
+
+    server.removeAllListeners('request');
+    server.on('request', function(req, res) {
+      res.sendDate = false;
+      res.end('ok');
+    });
+
+    http.request({
+      path: '/',
+      method: 'GET',
+      agent: agent
+    }, function(res) {
+      assert.equal(typeof res.headers.date, 'undefined');
+      agent.close();
+      done();
+    }).end();
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/proxy-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/proxy-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/proxy-test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/proxy-test.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,70 @@
+var assert = require('assert'),
+    https = require('https'),
+    spdy = require('../../'),
+    keys = require('../fixtures/keys'),
+    net = require('net'),
+    url = require('url'),
+    PORT = 8081;
+
+suite('A SPDY server / Proxy', function() {
+  test('should emit connect event on CONNECT requests', function(done) {
+    var proxyServer = spdy.createServer(keys);
+    proxyServer.on('connect', function(req, socket) {
+      var srvUrl = url.parse('http://' + req.url);
+      var srvSocket = net.connect(srvUrl.port, srvUrl.hostname, function() {
+        socket._lock(function() {
+          var headers = {
+            'Connection': 'keep-alive',
+            'Proxy-Agent': 'SPDY Proxy'
+          }
+          socket._spdyState.framer.replyFrame(
+            socket._spdyState.id, 200, "Connection Established", headers,
+            function (err, frame) {
+              socket.connection.write(frame);
+              socket._unlock();
+              srvSocket.pipe(socket);
+              socket.pipe(srvSocket);
+            }
+          );
+        });
+      });
+    });
+
+    proxyServer.listen(PORT, '127.0.0.1', function() {
+      var spdyAgent = spdy.createAgent({
+        host: '127.0.0.1',
+        port: PORT,
+        rejectUnauthorized: false
+      });
+
+      var options = {
+        method: 'CONNECT',
+        path: 'www.google.com:80',
+        agent: spdyAgent
+      };
+
+      var req = https.request(options);
+      req.end();
+
+      req.on('connect', function(res, socket) {
+        var googlePage = "";
+        socket.write('GET / HTTP/1.1\r\n' +
+                     'Host: www.google.com:80\r\n' +
+                     'Connection: close\r\n' +
+                     '\r\n');
+
+        socket.on('data', function(chunk) {
+          googlePage = googlePage + chunk.toString();
+        });
+
+        socket.on('end', function() {
+          assert.notEqual(googlePage.search('google'), -1,
+            "Google page should contain string 'google'");
+          spdyAgent.close(function() {
+            proxyServer.close(done);
+          });
+        });
+      });
+    });
+  });
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/server-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/server-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/server-test.js	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/server-test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-var assert = require('assert'),
-    spdy = require('../../'),
-    keys = require('../fixtures/keys'),
-    https = require('https'),
-    tls = require('tls'),request
-    Buffer = require('buffer').Buffer;
-
-suite('A SPDY Server', function() {
-  var server;
-  setup(function(done) {
-    server = spdy.createServer(keys, function(req, res) {
-      res.end('ok');
-    });
-
-    server.listen(8081, done);
-  });
-
-  teardown(function(done) {
-    server.once('close', done);
-    server.close();
-  });
-
-  test('should respond on regular https requests', function(done) {
-    https.request({
-      host: 'localhost',
-      port: 8081,
-      path: '/',
-      method: 'GET',
-      agent: false,
-      rejectUnauthorized: false
-    }, function(res) {
-      assert.equal(res.statusCode, 200);
-      done();
-    }).end();
-  });
-
-  test('should respond on spdy requests', function(done) {
-    var socket = tls.connect(
-      8081,
-      'localhost',
-      { NPNProtocols: ['spdy/2'], rejectUnauthorized: false },
-      function() {
-        var deflate = spdy.utils.createDeflate(2),
-            chunks = [],
-            length = 0;
-
-        deflate.on('data', function(chunk) {
-          chunks.push(chunk);
-          length += chunk.length;
-        });
-
-        // Deflate headers
-        deflate.write(new Buffer([
-          0x00, 0x04, // method, url, version = 3 fields
-          0x00, 0x06,
-          0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, // method
-          0x00, 0x03,
-          0x47, 0x45, 0x54, // get
-          0x00, 0x03,
-          0x75, 0x72, 0x6c, // url
-          0x00, 0x01,
-          0x2f, // '/'
-          0x00, 0x07,
-          0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, // version
-          0x00, 0x08,
-          0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, // HTTP/1.1
-          0x00, 0x04,
-          0x68, 0x6f, 0x73, 0x74, // host
-          0x00, 0x09,
-          0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74 //localhost
-        ]));
-
-        deflate.flush(function() {
-          // StreamID + Associated StreamID
-          length += 10;
-
-          // Headers
-          socket.write(new Buffer([
-            0x80, 0x02, 0x00, 0x01, // Control, Version, SYN_STREAM
-            0x00, 0x00, 0x00, length, // Flags, length (1 byte in this case)
-            0x00, 0x00, 0x00, 0x01, // StreamID
-            0x00, 0x00, 0x00, 0x00, // Associated StreamID
-            0x00, 0x00 // Priority + Unused
-          ]));
-
-          // Write compressed headers
-          chunks.forEach(function(chunk) {
-            socket.write(chunk);
-          });
-        });
-
-        var response = new Buffer(85),
-            offset = 0;
-
-        socket.on('data', function(chunk) {
-          assert.ok(offset + chunk.length <= 85);
-
-          chunk.copy(response, offset);
-          offset += chunk.length;
-
-          if (offset === 85) {
-            var frames = [];
-
-            offset = 0;
-            while (offset < response.length) {
-              var len = (response.readUInt32BE(offset + 4) & 0x00ffffff) + 8;
-              frames.push(response.slice(offset, offset + len));
-
-              offset += len;
-            }
-
-            // SYN_STREAM frame
-            assert.ok(frames.some(function(frame) {
-              return frame[0] === 0x80 && // Control frame
-                     frame[1] === 0x02 && // Version
-                     frame.readUInt16BE(2) === 0x0002 && // SYN_STREAM
-                     frame.readUInt32BE(8) === 0x0001; // StreamID
-            }));
-
-            // Data frames
-            assert.ok(frames.some(function(frame) {
-              return frame[0] === 0x00 && // Data frame
-                     frame.readUInt32BE(0) === 0x0001 && // StreamID
-                     frame.slice(8).toString() === 'ok';
-            }));
-
-            socket.destroy();
-          }
-        });
-
-        socket.on('close', function() {
-          done();
-        });
-      }
-    );
-
-    socket.on('error', function(err) {
-      console.error('Socket error: ' + err);
-    });
-
-    server.on('request', function(req, res) {
-      assert.equal(req.url, '/');
-      assert.equal(req.method, 'GET');
-      res.end('ok');
-    });
-  });
-});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/stream-test.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/stream-test.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/node-spdy/test/unit/stream-test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/node-spdy/test/unit/stream-test.js	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,371 @@
+var assert = require('assert'),
+    zlib = require('zlib'),
+    spdy = require('../../'),
+    keys = require('../fixtures/keys'),
+    https = require('https'),
+    util = require('util'),
+    Buffer = require('buffer').Buffer,
+    PORT = 8081;
+
+suite('A SPDY Server / Stream', function() {
+  var server;
+  var agent;
+  var pair = null;
+
+  suite('normal', function() {
+    run({});
+  });
+  suite('maxChunk = false', function() {
+    run({ maxChunk: false });
+  });
+
+  function run(options) {
+    setup(function(done) {
+      var waiting = 2;
+      pair = { server: null, client: null };
+
+      server = spdy.createServer(util._extend(keys, options),
+                                 function(req, res) {
+        assert.equal(req.method, 'POST');
+        pair.server = { req: req, res: res };
+
+        // Just to remove junk from stream's buffer
+        if (spdy.utils.isLegacy)
+          req.once('data', function(data) {
+            assert.equal(data.toString(), 'shame');
+            if (--waiting === 0)
+              done();
+          });
+        else
+          req.once('readable', function() {
+            assert.equal(req.read().toString(), 'shame');
+            if (--waiting === 0)
+              done();
+          });
+
+        res.writeHead(200);
+      });
+
+      server.listen(PORT, function() {
+        agent = spdy.createAgent({
+          host: '127.0.0.1',
+          port: PORT,
+          rejectUnauthorized: false
+        });
+
+        pair.client = {
+          req: https.request({
+            path: '/',
+            method: 'POST',
+            agent: agent
+          }, function(res) {
+            pair.client.res = res;
+            if (--waiting === 0)
+              done();
+          }),
+          res: null
+        };
+        pair.client.req.write('shame');
+      });
+    });
+
+    teardown(function(done) {
+      pair = null;
+      agent.close(function() {
+        server.close(done);
+      });
+    });
+
+    test('should support PING from client', function(done) {
+      agent.ping(done);
+    });
+
+    test('should support PING from server', function(done) {
+      pair.server.res.socket.ping(done);
+    });
+
+    test('piping a lot of data', function(done) {
+      var big = new Buffer(2 * 1024 * 1024);
+      for (var i = 0; i < big.length; i++)
+        big[i] = ~~(Math.random() * 256);
+
+      var offset = 0;
+      if (spdy.utils.isLegacy) {
+        pair.client.res.on('data', function(chunk) {
+          for (var i = 0; i < chunk.length; i++) {
+            assert(i + offset < big.length);
+            assert.equal(big[i + offset], chunk[i]);
+          }
+          offset += i;
+        });
+      } else {
+        pair.client.res.on('readable', function() {
+          var bigEcho = pair.client.res.read(big.length);
+          if (bigEcho) {
+            assert.equal(big.length, bigEcho.length);
+            for (var i = 0; i < big.length; i += 256) {
+              assert.equal(big.slice(i, i + 256).toString('hex'),
+                           bigEcho.slice(i, i + 256).toString('hex'));
+            }
+            offset += bigEcho.length;
+          }
+        });
+      }
+      pair.client.res.on('end', function() {
+        assert.equal(offset, big.length);
+        done();
+      });
+
+      pair.server.req.pipe(pair.server.res);
+      pair.client.req.end(big);
+    });
+
+    test('destroy in the middle', function(done) {
+      var big = new Buffer(2 * 1024 * 1024);
+      for (var i = 0; i < big.length; i++)
+        big[i] = ~~(Math.random() * 256);
+
+      var offset = 0;
+      pair.server.req.on('data', function(chunk) {
+        for (var i = 0; i < chunk.length; i++) {
+          assert(i + offset < big.length);
+          assert.equal(big[i + offset], chunk[i]);
+        }
+        offset += i;
+      });
+
+      pair.server.req.on('close', function() {
+        assert(offset < big.length);
+        done();
+      });
+
+      pair.client.req.write(big.slice(0, big.length >> 1));
+      pair.client.req.write(big.slice(big.length >> 1));
+      pair.client.req.socket.destroy();
+    });
+
+    test('destroySoon in the middle', function(done) {
+      var big = new Buffer(2 * 1024 * 1024);
+      for (var i = 0; i < big.length; i++)
+        big[i] = ~~(Math.random() * 256);
+
+      var offset = 0;
+      pair.server.req.on('data', function(chunk) {
+        for (var i = 0; i < chunk.length; i++) {
+          assert(i + offset < big.length);
+          assert.equal(big[i + offset], chunk[i]);
+        }
+        offset += i;
+      });
+
+      pair.server.req.on('end', function() {
+        assert.equal(offset, big.length);
+        done();
+      });
+
+      pair.client.req.write(big.slice(0, big.length >> 1));
+      pair.client.req.write(big.slice(big.length >> 1));
+      pair.client.req.socket.destroySoon();
+    });
+
+    test('ending', function(done) {
+      var data = '';
+      pair.server.req.on('data', function(chunk) {
+        data += chunk;
+      });
+
+      pair.server.req.on('end', function() {
+        assert.equal(data, 'hello');
+        pair.server.res.end();
+        done();
+      });
+
+      pair.client.req.end('hello');
+    });
+
+    test('trailing headers from client', function(done) {
+      pair.server.req.once('trailers', function(headers) {
+        assert.equal(headers.wtf, 'yes');
+        assert.equal(pair.server.req.trailers.wtf, 'yes');
+        done();
+      });
+      pair.client.req.addTrailers({ wtf: 'yes' });
+    });
+
+    test('trailing headers from server', function(done) {
+      pair.client.res.once('trailers', function(headers) {
+        assert.equal(headers.wtf, 'yes');
+        assert.equal(pair.client.res.trailers.wtf, 'yes');
+        done();
+      });
+      pair.server.res.addTrailers({ wtf: 'yes' });
+    });
+
+    test('push stream', function(done) {
+      agent.once('push', function(req) {
+        var gotTrailers = false;
+        assert.equal(req.headers.wtf, 'true');
+
+        var chunks = '';
+        req.once('data', function(chunk) {
+          chunks += chunk;
+        });
+        req.once('trailers', function(trailers) {
+          assert.equal(trailers.ok, 'yes');
+          gotTrailers = true;
+        });
+        req.once('end', function() {
+          assert(gotTrailers);
+          assert.equal(req.trailers.ok, 'yes');
+          assert.equal(chunks, 'yes, wtf');
+          done();
+        });
+      });
+
+      pair.server.res.push('/wtf', { wtf: true }, function(err, stream) {
+        assert(!err);
+        stream.on('error', function(err) {
+          throw err;
+        });
+        stream.sendHeaders({ ok: 'yes' });
+        stream.end('yes, wtf');
+      });
+    });
+
+    test('push stream with compression', function(done) {
+      agent.once('push', function(req) {
+        req.once('data', function(chunk) {
+          assert.equal(chunk.toString(), 'yes, wtf');
+          done();
+        });
+      });
+      pair.server.res.push('/wtf', {
+        'Content-Encoding': 'gzip'
+      }, function(err, stream) {
+        assert(!err);
+        stream.on('error', function(err) {
+          throw err;
+        });
+        var gzip = zlib.createGzip();
+        gzip.on('data', function(data) {
+          stream.write(data);
+        });
+        gzip.on('end', function() {
+          stream.end();
+        });
+        gzip.end('yes, wtf');
+      });
+    });
+
+    test('push stream - big chunks', function(done) {
+      var count = 10;
+      var chunk = new Buffer(256 * 1024 - 7);
+      for (var i = 0; i < chunk.length; i++)
+        chunk[i] = ~~(Math.random() * 256);
+
+      agent.once('push', function(req) {
+        assert.equal(req.headers.wtf, 'true');
+        var offset = 0;
+        var total = 0;
+        req.on('data', function(data) {
+          for (var i = 0; i < data.length; i++) {
+            assert.equal(data[i],
+                         chunk[(offset + i) % chunk.length],
+                         'Mismatch at: ' + (offset + i));
+          }
+          offset = (offset + i) % chunk.length;
+          total += i;
+        });
+        req.once('end', function() {
+          assert.equal(total, count * chunk.length);
+          done();
+        });
+      });
+
+      pair.server.res.push('/wtf', { wtf: true }, function(err, stream) {
+        assert(!err);
+        stream.on('error', function(err) {
+          throw err;
+        });
+
+        function start(count) {
+          if (count === 1)
+            return stream.end(chunk);
+          stream.write(chunk);
+          setTimeout(function() {
+            start(count - 1);
+          }, 5);
+        }
+        start(count);
+      });
+    });
+
+    test('push stream - early close', function(done) {
+      agent.once('push', function(req) {
+        var chunks = '';
+        req.on('data', function(chunk) {
+          chunks += chunk;
+        });
+        req.once('end', function() {
+          assert.equal(chunks, 'yes, wtf');
+          done();
+        });
+      });
+      var stream = pair.server.res.push('/wtf', {});
+      pair.client.res.on('data', function() {});
+      pair.client.res.once('end', function() {
+        stream.end('yes, wtf');
+      });
+      pair.client.req.end();
+      pair.server.res.end();
+    });
+
+    test('timing out', function(done) {
+      var data = '';
+
+      pair.server.req.socket.setTimeout(300);
+      pair.client.req.on('error', function() {
+        done();
+      });
+    });
+
+    test('timing out after write', function(done) {
+      var data = '';
+      var chunks = 0;
+
+      pair.server.req.socket.setTimeout(150);
+      setTimeout(function() {
+        pair.server.res.write('ok1');
+        setTimeout(function() {
+          pair.server.res.write('ok2');
+        }, 100);
+      }, 100);
+
+      pair.client.res.on('data', function(chunk) {
+        chunk = chunk.toString();
+        assert(chunks === 0 && chunk === 'ok1' ||
+               chunks === 1 && chunk === 'ok2');
+        chunks++;
+      });
+
+      pair.client.req.on('error', function() {
+        assert.equal(chunks, 2);
+        done();
+      });
+    });
+
+    test('req[spdyVersion/streamID]', function(done) {
+      var data = '';
+      assert.equal(pair.server.req.spdyVersion, 3.1);
+      assert(pair.server.req.streamID > 0);
+
+      pair.server.req.resume();
+      pair.server.req.on('end', function() {
+        pair.server.res.end();
+        done();
+      });
+
+      pair.client.req.end();
+    });
+  }
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/runxpcshelltests.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/runxpcshelltests.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/runxpcshelltests.py	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/runxpcshelltests.py	2014-11-26 21:46:00.000000000 +0000
@@ -39,7 +39,6 @@
     HAVE_PSUTIL = False
 
 from automation import Automation
-from automationutils import addCommonOptions
 
 HARNESS_TIMEOUT = 5 * 60
 
@@ -1359,8 +1358,6 @@
     def __init__(self):
         """Process command line arguments and call runTests() to do the real work."""
         OptionParser.__init__(self)
-
-        addCommonOptions(self)
         self.add_option("--app-path",
                         type="string", dest="appPath", default=None,
                         help="application directory (as opposed to XRE directory)")
@@ -1417,6 +1414,26 @@
         self.add_option("--failure-manifest", dest="failureManifest",
                         action="store",
                         help="path to file where failure manifest will be written.")
+        self.add_option("--xre-path",
+                        action = "store", type = "string", dest = "xrePath",
+                        # individual scripts will set a sane default
+                        default = None,
+                        help = "absolute path to directory containing XRE (probably xulrunner)")
+        self.add_option("--symbols-path",
+                        action = "store", type = "string", dest = "symbolsPath",
+                        default = None,
+                        help = "absolute path to directory containing breakpad symbols, or the URL of a zip file containing symbols")
+        self.add_option("--debugger",
+                        action = "store", dest = "debugger",
+                        help = "use the given debugger to launch the application")
+        self.add_option("--debugger-args",
+                        action = "store", dest = "debuggerArgs",
+                        help = "pass the given args to the debugger _before_ "
+                           "the application on the command line")
+        self.add_option("--debugger-interactive",
+                        action = "store_true", dest = "debuggerInteractive",
+                        help = "prevents the test harness from redirecting "
+                          "stdout and stderr for interactive debuggers")
 
 def main():
     parser = XPCShellOptions()
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/selftest.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/selftest.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/testing/xpcshell/selftest.py	2014-11-14 09:37:26.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/testing/xpcshell/selftest.py	2014-11-26 21:46:00.000000000 +0000
@@ -76,7 +76,8 @@
 
 add_test(function test_child_assert () {
   do_load_child_test_harness();
-  sendCommand("Assert.ok(true);");
+  do_test_pending("test child assertion");
+  sendCommand("Assert.ok(true);", do_test_finished);
   run_next_test();
 });
 '''
@@ -470,7 +471,8 @@
     def testChild(self):
         """
         Checks that calling do_load_child_test_harness without run_test_in_child
-        results in a usable test state.
+        results in a usable test state. This test has a spurious failure when
+        run using |mach python-test|. See bug 1103226.
         """
         self.writeFile("test_child_assertions.js", CHILD_HARNESS_SIMPLE)
         self.writeManifest(["test_child_assertions.js"])
@@ -508,6 +510,8 @@
 
         self.assertTestResult(True, verbose=True)
 
+    @unittest.skipIf('MOZ_AUTOMATION' in os.environ,
+                     'Timeout code path occasionally times out (bug 1098121)')
     def testHangingTimeout(self):
         """
         Check that a test that never finishes results in the correct error log.
@@ -889,4 +893,4 @@
         self.assertInLog("Throwing an error to force displaying the log")
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main(verbosity=3)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/RemoteAddonsChild.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/RemoteAddonsChild.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/RemoteAddonsChild.jsm	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/RemoteAddonsChild.jsm	2014-11-26 21:46:00.000000000 +0000
@@ -325,8 +325,8 @@
       this._instances[contractID] = instance;
       registrar.registerFactory(this._classID, this._classDescription, contractID, instance);
     } else {
+      registrar.unregisterFactory(this._classID, this._instances[contractID]);
       delete this._instances[contractID];
-      registerFactory.unregisterFactory(this._classID, this);
     }
   },
 };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/RemoteAddonsParent.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/RemoteAddonsParent.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/RemoteAddonsParent.jsm	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/RemoteAddonsParent.jsm	2014-11-26 21:46:00.000000000 +0000
@@ -109,20 +109,16 @@
                .getService(Ci.nsIMessageBroadcaster);
     ppmm.addMessageListener("Addons:ContentPolicy:Run", this);
 
-    this._policies = [];
+    this._policies = new Map();
   },
 
-  addContentPolicy: function(cid) {
-    this._policies.push(cid);
+  addContentPolicy: function(name, cid) {
+    this._policies.set(name, cid);
     NotificationTracker.add(["content-policy"]);
   },
 
-  removeContentPolicy: function(cid) {
-    let index = this._policies.lastIndexOf(cid);
-    if (index > -1) {
-      this._policies.splice(index, 1);
-    }
-
+  removeContentPolicy: function(name) {
+    this._policies.delete(name);
     NotificationTracker.remove(["content-policy"]);
   },
 
@@ -135,8 +131,14 @@
   },
 
   shouldLoad: function(aData, aObjects) {
-    for (let policyCID of this._policies) {
-      let policy = Cc[policyCID].getService(Ci.nsIContentPolicy);
+    for (let policyCID of this._policies.values()) {
+      let policy;
+      try {
+        policy = Cc[policyCID].getService(Ci.nsIContentPolicy);
+      } catch (e) {
+        // Current Gecko behavior is to ignore entries that don't QI.
+        continue;
+      }
       try {
         let contentLocation = BrowserUtils.makeURI(aData.contentLocation);
         let requestOrigin = aData.requestOrigin ? BrowserUtils.makeURI(aData.requestOrigin) : null;
@@ -167,7 +169,7 @@
 CategoryManagerInterposition.methods.addCategoryEntry =
   function(addon, target, category, entry, value, persist, replace) {
     if (category == "content-policy") {
-      ContentPolicyParent.addContentPolicy(entry);
+      ContentPolicyParent.addContentPolicy(entry, value);
     }
 
     target.addCategoryEntry(category, entry, value, persist, replace);
@@ -382,7 +384,7 @@
       // Check if |target| is somewhere on the patch from the
       // <tabbrowser> up to the root element.
       let window = target.ownerDocument.defaultView;
-      if (target.contains(window.gBrowser)) {
+      if (window && target.contains(window.gBrowser)) {
         return window;
       }
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/tests/addon/bootstrap.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/tests/addon/bootstrap.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/tests/addon/bootstrap.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/tests/addon/bootstrap.js	2014-11-26 21:46:00.000000000 +0000
@@ -3,6 +3,7 @@
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/BrowserUtils.jsm");
 
 const baseURL = "http://mochi.test:8888/browser/" +
   "toolkit/components/addoncompat/tests/browser/";
@@ -232,6 +233,31 @@
   });
 }
 
+// Test for bug 1095305. We just want to make sure that loading some
+// unprivileged content from an add-on package doesn't crash.
+function testAddonContent()
+{
+  let chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
+    .getService(Components.interfaces.nsIChromeRegistry);
+  let base = chromeRegistry.convertChromeURL(BrowserUtils.makeURI("chrome://addonshim1/content/"));
+
+  let res = Services.io.getProtocolHandler("resource")
+    .QueryInterface(Ci.nsIResProtocolHandler);
+  res.setSubstitution("addonshim1", base);
+
+  return new Promise(function(resolve, reject) {
+    const url = "resource://addonshim1/page.html";
+    let tab = gBrowser.addTab(url);
+    let browser = tab.linkedBrowser;
+    addLoadListener(browser, function handler() {
+      gBrowser.removeTab(tab);
+      res.setSubstitution("addonshim1", null);
+
+      resolve();
+    });
+  });
+}
+
 function runTests(win, funcs)
 {
   ok = funcs.ok;
@@ -245,7 +271,8 @@
     then(testListeners).
     then(testCapturing).
     then(testObserver).
-    then(testSandbox);
+    then(testSandbox).
+    then(testAddonContent);
 }
 
 /*
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/tests/addon/chrome.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/tests/addon/chrome.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/tests/addon/chrome.manifest	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/tests/addon/chrome.manifest	2014-11-26 21:46:00.000000000 +0000
@@ -1 +1 @@
-content addonshim1 content/
\ No newline at end of file
+content addonshim1 content/
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/tests/addon/content/page.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/tests/addon/content/page.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/addoncompat/tests/addon/content/page.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/addoncompat/tests/addon/content/page.html	2014-11-26 21:46:00.000000000 +0000
@@ -0,0 +1,2 @@
+<html>
+</html>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/alerts/nsAlertsService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/alerts/nsAlertsService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/alerts/nsAlertsService.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/alerts/nsAlertsService.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -100,10 +100,12 @@
   nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID));
   nsresult rv;
   if (sysAlerts) {
-    return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
-                                            aAlertCookie, aAlertListener, aAlertName,
-                                            aBidi, aLang, aData,
-                                            IPC::Principal(aPrincipal));
+    rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
+                                          aAlertCookie, aAlertListener, aAlertName,
+                                          aBidi, aLang, aData,
+                                          IPC::Principal(aPrincipal));
+    if (NS_SUCCEEDED(rv))
+      return NS_OK;
   }
 
   if (!ShouldShowAlert()) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/build/nsToolkitCompsModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/build/nsToolkitCompsModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/build/nsToolkitCompsModule.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/build/nsToolkitCompsModule.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -4,7 +4,6 @@
 
 #include "mozilla/ModuleUtils.h"
 #include "nsAppStartup.h"
-#include "nsTerminator.h"
 #include "nsUserInfo.h"
 #include "nsToolkitCompsCID.h"
 #include "nsFindService.h"
@@ -44,12 +43,23 @@
 #include "NativeFileWatcherNotSupported.h"
 #endif // (XP_WIN)
 
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+#define MOZ_HAS_TERMINATOR
+#endif
+
+#if defined(MOZ_HAS_TERMINATOR)
+#include "nsTerminator.h"
+#endif
+
 using namespace mozilla;
 
 /////////////////////////////////////////////////////////////////////////////
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppStartup, Init)
+
+#if defined(MOZ_HAS_TERMINATOR)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTerminator)
+#endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService)
@@ -105,7 +115,9 @@
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(AddonPathService, AddonPathService::GetInstance)
 
 NS_DEFINE_NAMED_CID(NS_TOOLKIT_APPSTARTUP_CID);
+#if defined(MOZ_HAS_TERMINATOR)
 NS_DEFINE_NAMED_CID(NS_TOOLKIT_TERMINATOR_CID);
+#endif
 NS_DEFINE_NAMED_CID(NS_USERINFO_CID);
 NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID);
 #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -134,7 +146,9 @@
 
 static const Module::CIDEntry kToolkitCIDs[] = {
   { &kNS_TOOLKIT_APPSTARTUP_CID, false, nullptr, nsAppStartupConstructor },
+#if defined(MOZ_HAS_TERMINATOR)
   { &kNS_TOOLKIT_TERMINATOR_CID, false, nullptr, nsTerminatorConstructor },
+#endif
   { &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor },
   { &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor },
 #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
@@ -165,7 +179,9 @@
 
 static const Module::ContractIDEntry kToolkitContracts[] = {
   { NS_APPSTARTUP_CONTRACTID, &kNS_TOOLKIT_APPSTARTUP_CID },
+#if defined(MOZ_HAS_TERMINATOR)
   { NS_TOOLKIT_TERMINATOR_CONTRACTID, &kNS_TOOLKIT_TERMINATOR_CID },
+#endif
   { NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID },
   { NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
 #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/nsDownloadManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/nsDownloadManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/nsDownloadManager.cpp	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/nsDownloadManager.cpp	2014-11-26 21:46:00.000000000 +0000
@@ -37,6 +37,8 @@
 #include "nsEmbedCID.h"
 #include "nsToolkitCompsCID.h"
 
+#include "mozilla/net/ReferrerPolicy.h"
+
 #include "SQLFunctions.h"
 
 #include "mozilla/Preferences.h"
@@ -1859,7 +1861,10 @@
   dl->mCancelable = wbp;
   (void)wbp->SetProgressListener(dl);
 
-  rv = wbp->SavePrivacyAwareURI(dl->mSource, nullptr, nullptr, nullptr, nullptr,
+  // referrer policy can be anything since referrer is nullptr
+  rv = wbp->SavePrivacyAwareURI(dl->mSource, nullptr,
+                                nullptr, mozilla::net::RP_Default,
+                                nullptr, nullptr,
                                 dl->mTarget, dl->mPrivate);
   if (NS_FAILED(rv)) {
     dl->mCancelable = nullptr;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/head_download_manager.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/head_download_manager.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/head_download_manager.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/head_download_manager.js	2014-11-26 21:46:00.000000000 +0000
@@ -113,7 +113,7 @@
   aParams.runBeforeStart.call(undefined, dl);
 
   persist.progressListener = dl.QueryInterface(Ci.nsIWebProgressListener);
-  persist.savePrivacyAwareURI(dl.source, null, null, null, null, dl.targetFile,
+  persist.savePrivacyAwareURI(dl.source, null, null, 0, null, null, dl.targetFile,
                               aParams.isPrivate);
 
   return dl;
@@ -230,4 +230,4 @@
     return true;
   }
   return false;
-}
\ No newline at end of file
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_bug_420230.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_bug_420230.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_bug_420230.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_bug_420230.js	2014-11-26 21:46:00.000000000 +0000
@@ -40,7 +40,7 @@
                             Math.round(Date.now() * 1000), null, persist, false);
 
     persist.progressListener = dl.QueryInterface(Ci.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_offline_support.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_offline_support.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_offline_support.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_offline_support.js	2014-11-26 21:46:00.000000000 +0000
@@ -152,7 +152,7 @@
                           createURI(destFile), null, null,
                           Math.round(Date.now() * 1000), null, persist, false);
   persist.progressListener = dl.QueryInterface(nsIWPL);
-  persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+  persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
   // Mark as pending, so clear this when we actually finish the download
   do_test_pending();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_resume.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_resume.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_resume.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_resume.js	2014-11-26 21:46:00.000000000 +0000
@@ -131,7 +131,7 @@
                           createURI(destFile), null, null,
                           Math.round(Date.now() * 1000), null, persist, false);
   persist.progressListener = dl.QueryInterface(nsIWPL);
-  persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+  persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
   // Mark as pending, so clear this when we actually finish the download
   do_test_pending();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_sleep_wake.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_sleep_wake.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/downloads/test/unit/test_sleep_wake.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/downloads/test/unit/test_sleep_wake.js	2014-11-26 21:46:00.000000000 +0000
@@ -152,7 +152,7 @@
                           createURI(destFile), null, null,
                           Math.round(Date.now() * 1000), null, persist, false);
   persist.progressListener = dl.QueryInterface(nsIWPL);
-  persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+  persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
   // Mark as pending, so clear this when we actually finish the download
   do_test_pending();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/jsdownloads/src/DownloadCore.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/jsdownloads/src/DownloadCore.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/jsdownloads/src/DownloadCore.jsm	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/jsdownloads/src/DownloadCore.jsm	2014-11-26 21:46:00.000000000 +0000
@@ -477,6 +477,16 @@
         // Update the download error, unless a new attempt already started. The
         // change in the status property is notified in the finally block.
         if (this._currentAttempt == currentAttempt || !this._currentAttempt) {
+          if (!(ex instanceof DownloadError)) {
+            let properties = {innerException: ex};
+
+            if (ex.message) {
+              properties.message = ex.message;
+            }
+
+            ex = new DownloadError(properties);
+          }
+
           this.error = ex;
         }
         throw ex;
@@ -910,8 +920,8 @@
       serializable.saver = saver;
     }
 
-    if (this.error && ("message" in this.error)) {
-      serializable.error = { message: this.error.message };
+    if (this.error) {
+      serializable.errorObj = this.error.toSerializable();
     }
 
     if (this.startTime) {
@@ -919,8 +929,8 @@
     }
 
     // These are serialized unless they are false, null, or empty strings.
-    for (let property of kSerializableDownloadProperties) {
-      if (property != "error" && property != "startTime" && this[property]) {
+    for (let property of kPlainSerializableDownloadProperties) {
+      if (this[property]) {
         serializable[property] = this[property];
       }
     }
@@ -953,10 +963,9 @@
 /**
  * Defines which properties of the Download object are serializable.
  */
-const kSerializableDownloadProperties = [
+const kPlainSerializableDownloadProperties = [
   "succeeded",
   "canceled",
-  "error",
   "totalBytes",
   "hasPartialData",
   "tryToKeepPartialData",
@@ -1011,17 +1020,30 @@
     download.startTime = new Date(time);
   }
 
-  for (let property of kSerializableDownloadProperties) {
+  // If 'errorObj' is present it will take precedence over the 'error' property.
+  // 'error' is a legacy property only containing message, which is insufficient
+  // to represent all of the error information.
+  //
+  // Instead of just replacing 'error' we use a new 'errorObj' so that previous
+  // versions will keep it as an unknown property.
+  if ("errorObj" in aSerializable) {
+    download.error = DownloadError.fromSerializable(aSerializable.errorObj);
+  } else if ("error" in aSerializable) {
+    download.error = aSerializable.error;
+  }
+
+  for (let property of kPlainSerializableDownloadProperties) {
     if (property in aSerializable) {
       download[property] = aSerializable[property];
     }
   }
 
   deserializeUnknownProperties(download, aSerializable, property =>
-    kSerializableDownloadProperties.indexOf(property) == -1 &&
+    kPlainSerializableDownloadProperties.indexOf(property) == -1 &&
     property != "startTime" &&
     property != "source" &&
     property != "target" &&
+    property != "error" &&
     property != "saver");
 
   return download;
@@ -1263,6 +1285,10 @@
     this.becauseBlocked = true;
   }
 
+  if (aProperties.innerException) {
+    this.innerException = aProperties.innerException;
+  }
+
   this.stack = new Error().stack;
 }
 
@@ -1301,6 +1327,56 @@
    * and may be malware.
    */
   becauseBlockedByReputationCheck: false,
+
+  /**
+   * If this DownloadError was caused by an exception this property will
+   * contain the original exception. This will not be serialized when saving
+   * to the store.
+   */
+  innerException: null,
+
+  /**
+   * Returns a static representation of the current object state.
+   *
+   * @return A JavaScript object that can be serialized to JSON.
+   */
+  toSerializable: function ()
+  {
+    let serializable = {
+      result: this.result,
+      message: this.message,
+      becauseSourceFailed: this.becauseSourceFailed,
+      becauseTargetFailed: this.becauseTargetFailed,
+      becauseBlocked: this.becauseBlocked,
+      becauseBlockedByParentalControls: this.becauseBlockedByParentalControls,
+      becauseBlockedByReputationCheck: this.becauseBlockedByReputationCheck,
+    };
+
+    serializeUnknownProperties(this, serializable);
+    return serializable;
+  },
+};
+
+/**
+ * Creates a new DownloadError object from its serializable representation.
+ *
+ * @param aSerializable
+ *        Serializable representation of a DownloadError object.
+ *
+ * @return The newly created DownloadError object.
+ */
+this.DownloadError.fromSerializable = function (aSerializable) {
+  let e = new DownloadError(aSerializable);
+  deserializeUnknownProperties(e, aSerializable, property =>
+    property != "result" &&
+    property != "message" &&
+    property != "becauseSourceFailed" &&
+    property != "becauseTargetFailed" &&
+    property != "becauseBlocked" &&
+    property != "becauseBlockedByParentalControls" &&
+    property != "becauseBlockedByReputationCheck");
+
+  return e;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/jsdownloads/test/unit/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/jsdownloads/test/unit/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/jsdownloads/test/unit/head.js	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/jsdownloads/test/unit/head.js	2014-11-26 21:46:00.000000000 +0000
@@ -391,7 +391,7 @@
     persist.progressListener = transfer;
 
     // Start the actual download process.
-    persist.savePrivacyAwareURI(sourceURI, null, null, null, null, targetFile,
+    persist.savePrivacyAwareURI(sourceURI, null, null, 0, null, null, targetFile,
                                 isPrivate);
   }.bind(this)).then(null, do_report_unexpected_exception);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/moz.build	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/moz.build	2014-11-26 21:46:00.000000000 +0000
@@ -45,7 +45,6 @@
     'startup',
     'statusfilter',
     'telemetry',
-    'terminator',
     'thumbnails',
     'typeaheadfind',
     'urlformatter',
@@ -86,6 +85,9 @@
 if CONFIG['MOZ_CAPTIVEDETECT']:
     DIRS += ['captivedetect']
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk" and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+    DIRS += ['terminator']
+
 DIRS += ['build']
 
 EXTRA_COMPONENTS += [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm	2014-11-26 21:46:00.000000000 +0000
@@ -619,39 +619,6 @@
   },
 
   /**
-   * Read a number of bytes from the file and into a buffer.
-   *
-   * @param {Typed array | C pointer} buffer This buffer will be
-   * modified by another thread. Using this buffer before the |read|
-   * operation has completed is a BAD IDEA.
-   * @param {JSON} options
-   *
-   * @return {promise}
-   * @resolves {number} The number of bytes effectively read.
-   * @rejects {OS.File.Error}
-   */
-  readTo: function readTo(buffer, options = {}) {
-    // If |buffer| is a typed array and there is no |bytes| options, we
-    // need to extract the |byteLength| now, as it will be lost by
-    // communication.
-    // Options might be a nullish value, so better check for that before using
-    // the |in| operator.
-    if (isTypedArray(buffer) && !(options && "bytes" in options)) {
-      // Preserve reference to option |outExecutionDuration|, if it is passed.
-      options = clone(options, ["outExecutionDuration"]);
-      options.bytes = buffer.byteLength;
-    }
-    // Note: Type.void_t.out_ptr.toMsg ensures that
-    // - the buffer is effectively shared (not neutered) between both
-    //   threads;
-    // - we take care of any |byteOffset|.
-    return Scheduler.post("File_prototype_readTo",
-      [this._fdmsg,
-       Type.void_t.out_ptr.toMsg(buffer),
-       options],
-       buffer/*Ensure that |buffer| is not gc-ed*/);
-  },
-  /**
    * Write bytes from a buffer to this file.
    *
    * Note that, by default, this function may perform several I/O
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/modules/osfile_shared_front.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/modules/osfile_shared_front.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/modules/osfile_shared_front.jsm	2014-11-14 09:37:27.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/modules/osfile_shared_front.jsm	2014-11-26 21:46:00.000000000 +0000
@@ -52,43 +52,22 @@
   /**
    * Read bytes from this file to a new buffer.
    *
-   * @param {number=} bytes If unspecified, read all the remaining bytes from
-   * this file. If specified, read |bytes| bytes, or less if the file does notclone
-   * contain that many bytes.
+   * @param {number=} maybeBytes (deprecated, please use options.bytes)
    * @param {JSON} options
    * @return {Uint8Array} An array containing the bytes read.
    */
-  read: function read(bytes, options = {}) {
-    options = clone(options);
-    options.bytes = bytes == null ? this.stat().size : bytes;
-    let buffer = new Uint8Array(options.bytes);
-    let size = this.readTo(buffer, options);
-    if (size == options.bytes) {
-      return buffer;
+  read: function read(maybeBytes, options = {}) {
+    if (typeof maybeBytes === "object") {
+    // Caller has skipped `maybeBytes` and provided an options object.
+      options = clone(maybeBytes);
+      maybeBytes = null;
     } else {
-      return buffer.subarray(0, size);
+      options = clone(options || {});
     }
-  },
-
-  /**
-   * Read bytes from this file to an existing buffer.
-   *
-   * Note that, by default, this function may perform several I/O
-   * operations to ensure that the buffer is as full as possible.
-   *
-   * @param {Typed Array | C pointer} buffer The buffer in which to
-   * store the bytes. The buffer must be large enough to
-   * accomodate |bytes| bytes.
-   * @param {*=} options Optionally, an object that may contain the
-   * following fields:
-   * - {number} bytes The number of |bytes| to write from the buffer. If
-   * unspecified, this is |buffer.byteLength|. Note that |bytes| is required
-   * if |buffer| is a C pointer.
-   *
-   * @return {number} The number of bytes actually read, which may be
-   * less than |bytes| if the file did not contain that many bytes left.
-   */
-  readTo: function readTo(buffer, options = {}) {
+    if(!("bytes" in options)) {
+      options.bytes = maybeBytes == null ? this.stat().size : maybeBytes;
+    }
+    let buffer = new Uint8Array(options.bytes);
     let {ptr, bytes} = SharedAll.normalizeToPointer(buffer, options.bytes);
     let pos = 0;
     while (pos < bytes) {
@@ -99,8 +78,11 @@
       pos += chunkSize;
       ptr = SharedAll.offsetBy(ptr, chunkSize);
     }
-
-    return pos;
+    if (pos == options.bytes) {
+      return buffer;
+    } else {
+      return buffer.subarray(0, pos);
+    }
   },
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js	2014-11-26 21:46:00.000000000 +0000
@@ -152,7 +152,6 @@
     yield test_stat();
     yield test_debug();
     yield test_info_features_detect();
-    yield test_read_write();
     yield test_position();
     yield test_iter();
     yield test_exists();
@@ -221,62 +220,6 @@
 });
 
 /**
- * Test OS.File.prototype.{read, readTo, write}
- */
-let test_read_write = maketest("read_write", function read_write(test) {
-  return Task.spawn(function() {
-    // Test readTo/write
-    let currentDir = yield OS.File.getCurrentDirectory();
-    let pathSource = OS.Path.join(currentDir, EXISTING_FILE);
-    let pathDest = OS.Path.join(OS.Constants.Path.tmpDir,
-      "osfile async test.tmp");
-
-    let fileSource = yield OS.File.open(pathSource);
-    test.info("Input file opened");
-    let fileDest = yield OS.File.open(pathDest,
-      { truncate: true, read: true, write: true});
-    test.info("Output file opened");
-
-    let stat = yield fileSource.stat();
-    test.info("Input stat worked");
-    let size = stat.size;
-    let array = new Uint8Array(size);
-
-    try {
-      test.info("Now calling readTo");
-      let readLength = yield fileSource.readTo(array);
-      test.info("ReadTo worked");
-      test.is(readLength, size, "ReadTo got all bytes");
-      let writeLength = yield fileDest.write(array);
-      test.info("Write worked");
-      test.is(writeLength, size, "Write wrote all bytes");
-
-      // Test read
-      yield fileSource.setPosition(0);
-      let readAllResult = yield fileSource.read();
-      test.info("ReadAll worked");
-      test.is(readAllResult.length, size, "ReadAll read all bytes");
-      test.is(Array.prototype.join.call(readAllResult),
-              Array.prototype.join.call(array),
-              "ReadAll result is correct");
-    } finally {
-      // Close stuff
-      yield fileSource.close();
-      yield fileDest.close();
-      test.info("Files are closed");
-    }
-
-    stat = yield OS.File.stat(pathDest);
-    test.is(stat.size, size, "Both files have the same size");
-    yield reference_compare_files(pathSource, pathDest, test);
-
-    // Cleanup.
-    OS.File.remove(pathDest);
-  });
-});
-
-
-/**
  * Test file.{getPosition, setPosition}
  */
 let test_position = maketest("position", function position(test) {
@@ -284,13 +227,8 @@
     let file = yield OS.File.open(EXISTING_FILE);
 
     try {
-      let stat = yield file.stat();
-      test.info("Obtained file length");
-
-      let view = new Uint8Array(stat.size);
-      yield file.readTo(view);
+      let view = yield file.read();
       test.info("First batch of content read");
-
       let CHUNK_SIZE = 178;// An arbitrary number of bytes to read from the file
       let pos = yield file.getPosition();
       test.info("Obtained position");
@@ -299,8 +237,7 @@
       test.info("Changed position");
       test.is(pos, view.byteLength - CHUNK_SIZE, "setPosition returned the correct position");
 
-      let view2 = new Uint8Array(CHUNK_SIZE);
-      yield file.readTo(view2);
+      let view2 = yield file.read();
       test.info("Read the end of the file");
       for (let i = 0; i < CHUNK_SIZE; ++i) {
         if (view2[i] != view[i + view.byteLength - CHUNK_SIZE]) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/tests/mochi/worker_test_osfile_front.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/tests/mochi/worker_test_osfile_front.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/tests/mochi/worker_test_osfile_front.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/tests/mochi/worker_test_osfile_front.js	2014-11-26 21:46:00.000000000 +0000
@@ -27,7 +27,6 @@
     test_open_non_existing_file();
     test_flush_open_file();
     test_copy_existing_file();
-    test_readall_writeall_file();
     test_position();
     test_move_file();
     test_iter_dir();
@@ -184,190 +183,6 @@
   info(test + ": Comparison complete");
 }
 
-function test_readall_writeall_file()
-{
-  let src_file_name =
-    OS.Path.join("chrome", "toolkit", "components", "osfile", "tests", "mochi",
-                 "worker_test_osfile_front.js");
-  let tmp_file_name =
-    OS.Path.join(OS.Constants.Path.tmpDir, "test_osfile_front.tmp");
-  info("Starting test_readall_writeall_file");
-
-  // read, ArrayBuffer
-
-  let source = OS.File.open(src_file_name);
-  let dest = OS.File.open(tmp_file_name, {write: true, trunc:true});
-  let size = source.stat().size;
-
-  let buf = new Uint8Array(size);
-  let readResult = source.readTo(buf);
-  is(readResult, size, "test_readall_writeall_file: read the right number of bytes");
-
-  dest.write(buf);
-
-  info("test_readall_writeall_file: copy complete (manual allocation)");
-  source.close();
-  dest.close();
-
-  compare_files("test_readall_writeall_file (manual allocation)", src_file_name, tmp_file_name);
-  OS.File.remove(tmp_file_name);
-
-  // read, C buffer
-  source = OS.File.open(src_file_name);
-  dest = OS.File.open(tmp_file_name, {write: true, trunc:true});
-  buf = new ArrayBuffer(size);
-  let ptr = OS.Shared.Type.voidptr_t.implementation(buf);
-  readResult = source.readTo(ptr, {bytes: size});
-  is(readResult, size, "test_readall_writeall_file: read the right number of bytes (C buffer)");
-
-  dest.write(ptr, {bytes: size});
-
-  info("test_readall_writeall_file: copy complete (C buffer)");
-  source.close();
-  dest.close();
-
-  compare_files("test_readall_writeall_file (C buffer)", src_file_name, tmp_file_name);
-  OS.File.remove(tmp_file_name);
-
-  // read/write, C buffer, missing |bytes| option
-  source = OS.File.open(src_file_name);
-  dest = OS.File.open(tmp_file_name, {write: true, trunc:true});
-  let exn = should_throw(function() { source.readTo(ptr); });
-  ok(exn != null && exn instanceof TypeError, "test_readall_writeall_file: read with C pointer and without bytes fails with the correct error");
-  exn = should_throw(function() { dest.write(ptr); });
-  ok(exn != null && exn instanceof TypeError, "test_readall_writeall_file: write with C pointer and without bytes fails with the correct error");
-
-  source.close();
-  dest.close();
-
-  // readTo, ArrayBuffer + offset
-  let OFFSET = 12;
-  let LEFT = size - OFFSET;
-  buf = new ArrayBuffer(size);
-  let offset_view = new Uint8Array(buf, OFFSET);
-  source = OS.File.open(src_file_name);
-  dest = OS.File.open(tmp_file_name, {write: true, trunc:true});
-
-  readResult = source.readTo(offset_view);
-  is(readResult, LEFT, "test_readall_writeall_file: read the right number of bytes (with offset)");
-
-  dest.write(offset_view);
-  is(dest.stat().size, LEFT, "test_readall_writeall_file: wrote the right number of bytes (with offset)");
-
-  info("test_readall_writeall_file: copy complete (with offset)");
-  source.close();
-  dest.close();
-
-  compare_files("test_readall_writeall_file (with offset)", src_file_name, tmp_file_name, LEFT);
-  OS.File.remove(tmp_file_name);
-
-  // read
-  buf = new Uint8Array(size);
-  source = OS.File.open(src_file_name);
-  dest = OS.File.open(tmp_file_name, {write: true, trunc:true});
-
-  readResult = source.read();
-  is(readResult.length, size, "test_readall_writeall_file: read the right number of bytes (auto allocation)");
-
-  dest.write(readResult);
-
-  info("test_readall_writeall_file: copy complete (auto allocation)");
-  source.close();
-  dest.close();
-
-  compare_files("test_readall_writeall_file (auto allocation)", src_file_name, tmp_file_name);
-  OS.File.remove(tmp_file_name);
-
-  // File.readAll
-  readResult = OS.File.read(src_file_name);
-  is(readResult.length, size, "test_readall_writeall_file: read the right number of bytes (OS.File.readAll)");
- 
-  // File.writeAtomic on top of nothing
-  OS.File.writeAtomic(tmp_file_name, readResult,
-    {tmpPath: tmp_file_name + ".tmp"});
-  try {
-    let stat = OS.File.stat(tmp_file_name);
-    info("readAll + writeAtomic created a file");
-    is(stat.size, size, "readAll + writeAtomic created a file of the right size");
-  } catch (x) {
-    ok(false, "readAll + writeAtomic somehow failed");
-    if(x.becauseNoSuchFile) {
-      ok(false, "readAll + writeAtomic did not create file");
-    }
-  }
-  compare_files("test_readall_writeall_file (OS.File.readAll + writeAtomic)",
-                src_file_name, tmp_file_name);
-  exn = null;
-  try {
-    let stat = OS.File.stat(tmp_file_name + ".tmp");
-  } catch (x) {
-    exn = x;
-  }
-  ok(!!exn, "readAll + writeAtomic cleaned up after itself");
-
-  // File.writeAtomic on top of existing file
-  // Remove content and set arbitrary size, to avoid potential false negatives
-  dest = OS.File.open(tmp_file_name, {write: true, trunc:true});
-  dest.setPosition(1234);
-  dest.close();
-
-  OS.File.writeAtomic(tmp_file_name, readResult,
-    {tmpPath: tmp_file_name + ".tmp"});
-  compare_files("test_readall_writeall_file (OS.File.readAll + writeAtomic 2)",
-                src_file_name, tmp_file_name);
-
-  // File.writeAtomic on top of existing file but without overwritten the file
-  exn = null;
-  try {
-    let view = new Uint8Array(readResult.buffer, 10, 200);
-    OS.File.writeAtomic(tmp_file_name, view,
-      { tmpPath: tmp_file_name + ".tmp", noOverwrite: true});
-  } catch (x) {
-    exn = x;
-  }
-  ok(exn && exn instanceof OS.File.Error && exn.becauseExists, "writeAtomic fails if file already exists with noOverwrite option");
-  // Check file was not overwritten.
-  compare_files("test_readall_writeall_file (OS.File.readAll + writeAtomic check file was not overwritten)",
-                src_file_name, tmp_file_name);
-
-  // Ensure that File.writeAtomic fails if no temporary file name is provided
-  // (FIXME: Remove this test as part of bug 793660)
-
-  exn = null;
-  try {
-    OS.File.writeAtomic(tmp_file_name, readResult.buffer,
-      {bytes: readResult.length});
-  } catch (x) {
-    exn = x;
-  }
-  ok(!!exn && exn instanceof TypeError, "writeAtomic fails if tmpPath is not provided");
-
-  // Check that writeAtomic fails when destination path is undefined
-  exn = null;
-  try {
-    let path = undefined;
-    let options = {tmpPath: tmp_file_name};
-    OS.File.writeAtomic(path, readResult.buffer, options);
-  } catch (x) {
-    exn = x;
-  }
-  ok(!!exn && exn instanceof TypeError, "writeAtomic fails if path is undefined");
-
-  // Check that writeAtomic fails when destination path is an empty string
-  exn = null;
-  try {
-    let path = "";
-    let options = {tmpPath: tmp_file_name};
-    OS.File.writeAtomic(path, readResult.buffer, options);
-  } catch (x) {
-    exn = x;
-  }
-  ok(!!exn && exn instanceof TypeError, "writeAtomic fails if path is an empty string");
-
-  // Cleanup.
-  OS.File.remove(tmp_file_name);
-}
-
 /**
  * Test that copying a file using |copy| works.
  */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_bytes.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_bytes.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_bytes.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_async_bytes.js	2014-11-26 21:46:00.000000000 +0000
@@ -9,7 +9,7 @@
 }
 
 /**
- * Test to ensure that {bytes:} in options to |readTo| and |write| are correctly
+ * Test to ensure that {bytes:} in options to |write| is correctly
  * preserved.
  */
 add_task(function* test_bytes() {
@@ -23,12 +23,7 @@
       yield file.write(new Uint8Array(2048), {bytes: 1024});
       do_check_eq((yield file.stat()).size, 1024);
 
-      // 2. Test same for |readTo|.
-      yield file.setPosition(0, OS.File.POS_START);
-      let read = yield file.readTo(new Uint8Array(1024), {bytes: 512});
-      do_check_eq(read, 512);
-
-      // 3. Test that passing nullish values for |options| still works.
+      // 2. Test that passing nullish values for |options| still works.
       yield file.setPosition(0, OS.File.POS_END);
       yield file.write(new Uint8Array(1024), null);
       yield file.write(new Uint8Array(1024), undefined);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/Bookmarks.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/Bookmarks.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/Bookmarks.jsm	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/Bookmarks.jsm	2014-11-26 21:46:01.000000000 +0000
@@ -94,7 +94,7 @@
   TYPE_SEPARATOR: 3,
 
   /**
-   * Default index used to append a bookmark-item at the end of a folder. 
+   * Default index used to append a bookmark-item at the end of a folder.
    * This should stay consistent with nsINavBookmarksService.idl
    */
   DEFAULT_INDEX: -1,
@@ -238,7 +238,7 @@
     let updateInfo = validateBookmarkObject(info,
       { guid: { required: true }
       , index: { requiredIf: b => b.hasOwnProperty("parentGuid")
-               , validIf: b => b.index >= 0 }
+               , validIf: b => b.index >= 0 || b.index == this.DEFAULT_INDEX }
       , parentGuid: { requiredIf: b => b.hasOwnProperty("index") }
       });
 
@@ -307,9 +307,15 @@
         // the same container.  Thus we know it exists.
         if (!parent)
           parent = yield fetchBookmark({ guid: item.parentGuid });
-        // Set index in the appending case.
-        if (updateInfo.index > parent._childCount)
-          updateInfo.index = parent._childCount;
+
+        if (updateInfo.index >= parent._childCount ||
+            updateInfo.index == this.DEFAULT_INDEX) {
+           updateInfo.index = parent._childCount;
+
+          // Fix the index when moving within the same container.
+          if (parent.guid == item.parentGuid)
+             updateInfo.index--;
+        }
       }
 
       let updatedItem = yield updateBookmark(updateInfo, item, parent);
@@ -364,14 +370,14 @@
                                              updatedItem.guid,
                                              updatedItem.parentGuid ]);
       }
-      // If the item was move, notify onItemMoved.
+      // If the item was moved, notify onItemMoved.
       if (item.parentGuid != updatedItem.parentGuid ||
           item.index != updatedItem.index) {
         notify(observers, "onItemMoved", [ updatedItem._id, item._parentId,
                                            item.index, updatedItem._parentId,
                                            updatedItem.index, updatedItem.type,
                                            updatedItem.guid, item.parentGuid,
-                                           updatedItem.newParentGuid ]);
+                                           updatedItem.parentGuid ]);
       }
 
       // Remove non-enumerable properties.
@@ -975,8 +981,10 @@
      LEFT JOIN moz_keywords k ON k.id = b.keyword_id
      LEFT JOIN moz_places h ON h.id = b.fk
      WHERE h.url = :url
+     AND _grandParentId <> :tags_folder
      ORDER BY b.lastModified DESC
-    `, { url: info.url.href });
+    `, { url: info.url.href,
+         tags_folder: PlacesUtils.tagsFolderId });
 
   return rows.length ? rowsToItemsArray(rows) : null;
 }
@@ -1158,7 +1166,7 @@
     }
 
     return item;
-  });  
+  });
 }
 
 /**
@@ -1267,7 +1275,7 @@
     }
   }
   if (required.size > 0)
-    throw new Error(`The following properties were expected: ${[...required].join(", ")}`); 
+    throw new Error(`The following properties were expected: ${[...required].join(", ")}`);
   return normalizedInput;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/History.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/History.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/History.jsm	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/History.jsm	2014-11-26 21:46:01.000000000 +0000
@@ -65,6 +65,8 @@
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
+                                  "resource://gre/modules/AsyncShutdown.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
@@ -83,6 +85,21 @@
 Cu.importGlobalProperties(["URL"]);
 
 /**
+ * Whenever we update or remove numerous pages, it is preferable
+ * to yield time to the main thread every so often to avoid janking.
+ * This constant determines the maximal number of notifications we
+ * may emit before we yield.
+ */
+const NOTIFICATION_CHUNK_SIZE = 300;
+
+/**
+ * Private shutdown barrier blocked by ongoing operations.
+ */
+XPCOMUtils.defineLazyGetter(this, "operationsBarrier", () =>
+  new AsyncShutdown.Barrier("Sqlite.jsm: wait until all connections are closed")
+);
+
+/**
  * Shared connection
  */
 XPCOMUtils.defineLazyGetter(this, "DBConnPromised",
@@ -90,8 +107,19 @@
     Sqlite.wrapStorageConnection({ connection: PlacesUtils.history.DBConnection } )
           .then(db => {
       try {
-        Sqlite.shutdown.addBlocker("Places History.jsm: Closing database wrapper",
-                                   () => db.close());
+        Sqlite.shutdown.addBlocker(
+          "Places History.jsm: Closing database wrapper",
+          Task.async(function*() {
+            yield operationsBarrier.wait();
+            gIsClosed = true;
+            yield db.close();
+          }),
+          () => ({
+            fetchState: () => ({
+              isClosed: gIsClosed,
+              operations: operationsBarrier.state,
+            })
+          }));
       } catch (ex) {
         // It's too late to block shutdown of Sqlite, so close the connection
         // immediately.
@@ -103,6 +131,34 @@
   })
 );
 
+/**
+ * `true` once this module has been shutdown.
+ */
+let gIsClosed = false;
+function ensureModuleIsOpen() {
+  if (gIsClosed) {
+    throw new Error("History.jsm has been shutdown");
+  }
+}
+
+/**
+ * Sends a bookmarks notification through the given observers.
+ *
+ * @param observers
+ *        array of nsINavBookmarkObserver objects.
+ * @param notification
+ *        the notification name.
+ * @param args
+ *        array of arguments to pass to the notification.
+ */
+function notify(observers, notification, args) {
+  for (let observer of observers) {
+    try {
+      observer[notification](...args);
+    } catch (ex) {}
+  }
+}
+
 this.History = Object.freeze({
   /**
    * Fetch the available information for one page.
@@ -209,6 +265,8 @@
    *       is an empty array.
    */
   remove: function (pages, onResult = null) {
+    ensureModuleIsOpen();
+
     // Normalize and type-check arguments
     if (Array.isArray(pages)) {
       if (pages.length == 0) {
@@ -230,6 +288,8 @@
         urls.push(normalized.href);
       }
     }
+    let normalizedPages = {guids: guids, urls: urls};
+
     // At this stage, we know that either `guids` is not-empty
     // or `urls` is not-empty.
 
@@ -237,8 +297,29 @@
       throw new TypeError("Invalid function: " + onResult);
     }
 
-    // Now perform queries
-    return remove({guids: guids, urls: urls}, onResult);
+    return Task.spawn(function*() {
+      let promise = remove(normalizedPages, onResult);
+
+      operationsBarrier.client.addBlocker(
+        "History.remove",
+        promise,
+        {
+          // In case of crash, we do not want to upload information on
+          // which urls are being cleared, for privacy reasons. GUIDs
+          // are safe wrt privacy, but useless.
+          fetchState: () => ({
+            guids: guids.length,
+            urls: normalizedPages.urls.map(u => u.protocol),
+          })
+        });
+
+      try {
+        return (yield promise);
+      } finally {
+        // Cleanup the barrier.
+        operationsBarrier.client.removeBlocker(promise);
+      }
+    });
   },
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/mozIAsyncLivemarks.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/mozIAsyncLivemarks.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/mozIAsyncLivemarks.idl	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/mozIAsyncLivemarks.idl	2014-11-26 21:46:01.000000000 +0000
@@ -101,7 +101,7 @@
                     in mozILivemark aLivemark);
 };
 
-[scriptable, uuid(6e40d5b1-ce48-4458-8b68-6bee17d30ef3)]
+[scriptable, uuid(E52B2273-729D-4EBC-A039-E9CD9E18FF86)]
 interface mozILivemarkInfo : nsISupports
 {
   /**
@@ -130,6 +130,11 @@
   readonly attribute long index;
 
   /**
+   * Time this livemark was created.
+   */
+  readonly attribute PRTime dateAdded;
+
+  /**
    * Time this livemark's details were last modified.  Doesn't track changes to
    * the livemark contents.
    */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsINavBookmarksService.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsINavBookmarksService.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsINavBookmarksService.idl	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsINavBookmarksService.idl	2014-11-26 21:46:01.000000000 +0000
@@ -113,8 +113,7 @@
    *        For certain properties, this is set to the new value of the
    *        property (see the list below).
    * @param aLastModified
-   *        If lastModified changed, this parameter is the new value, otherwise
-   *        it's set to 0.
+   *        The updated last-modified value.
    * @param aItemType
    *        The type of the item to be removed (see TYPE_* constants below).
    * @param aParentId
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsINavHistoryService.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsINavHistoryService.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsINavHistoryService.idl	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsINavHistoryService.idl	2014-11-26 21:46:01.000000000 +0000
@@ -1176,7 +1176,7 @@
   nsINavHistoryQueryOptions clone();
 };
 
-[scriptable, uuid(47f7b08b-71e0-492e-a2be-9a9fbfc75250)]
+[scriptable, uuid(8a1f527e-c9d7-4a51-bf0c-d86f0379b701)]
 interface nsINavHistoryService : nsISupports
 {
   /**
@@ -1374,6 +1374,12 @@
   void removeObserver(in nsINavHistoryObserver observer);
 
   /**
+   * Gets an array of registered nsINavHistoryObserver objects.
+   */
+  void getObservers([optional] out unsigned long count,
+                    [retval, array, size_is(count)] out nsINavHistoryObserver observers);
+
+  /**
    * Runs the passed callback in batch mode. Use this when a lot of things
    * are about to change. Calls can be nested, observers will only be
    * notified when all batches begin/end.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsLivemarkService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsLivemarkService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsLivemarkService.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsLivemarkService.js	2014-11-26 21:46:01.000000000 +0000
@@ -80,7 +80,8 @@
                 AND n.name = ${aAnnoParam}`;
     }
 
-    return `SELECT b.id, b.title, b.parent, b.position, b.guid, b.lastModified,
+    return `SELECT b.id, b.title, b.parent, b.position, b.guid,
+                   b.dateAdded, b.lastModified,
                    ( ${getAnnoSQLFragment(":feedURI_anno")} ) AS feedURI,
                    ( ${getAnnoSQLFragment(":siteURI_anno")} ) AS siteURI
             FROM moz_bookmarks b
@@ -106,6 +107,7 @@
                          title: row.getResultByName("title"),
                          parentId: row.getResultByName("parent"),
                          index: row.getResultByName("position"),
+                         dateAdded: row.getResultByName("dateAdded"),
                          lastModified: row.getResultByName("lastModified"),
                          feedURI: NetUtil.newURI(row.getResultByName("feedURI")),
                          siteURI: siteURL ? NetUtil.newURI(siteURL) : null });
@@ -202,11 +204,15 @@
                               , feedURI:      aLivemarkInfo.feedURI
                               , siteURI:      aLivemarkInfo.siteURI
                               , guid:         aLivemarkInfo.guid
+                              , dateAdded:    aLivemarkInfo.dateAdded
                               , lastModified: aLivemarkInfo.lastModified
                               });
       if (this._itemAdded && this._itemAdded.id == livemark.id) {
         livemark.index = this._itemAdded.index;
         livemark.guid = this._itemAdded.guid;
+        if (!aLivemarkInfo.dateAdded) {
+          livemark.dateAdded = this._itemAdded.dateAdded;
+        }
         if (!aLivemarkInfo.lastModified) {
           livemark.lastModified = this._itemAdded.lastModified;
         }
@@ -411,6 +417,7 @@
       this._itemAdded = { id: aItemId
                         , guid: aGUID
                         , index: aIndex
+                        , dateAdded: aDateAdded
                         , lastModified: aDateAdded
                         };
     }
@@ -422,11 +429,15 @@
     if (aItemType == Ci.nsINavBookmarksService.TYPE_FOLDER) {
       if (this._itemAdded && this._itemAdded.id == aItemId) {
         this._itemAdded.lastModified = aLastModified;
-     }
+      }
       if (aItemId in this._livemarks) {
         if (aProperty == "title") {
           this._livemarks[aItemId].title = aValue;
         }
+        else if (aProperty == "dateAdded") {
+          this._livemark[aItemId].dateAdded = parseInt(aValue, 10);
+        }
+
         this._livemarks[aItemId].lastModified = aLastModified;
       }
     }
@@ -526,8 +537,8 @@
   this._nodes = new Map();
 
   this._guid = "";
+  this._dateAdded = 0;
   this._lastModified = 0;
-
   this.loadGroup = null;
   this.feedURI = null;
   this.siteURI = null;
@@ -539,6 +550,7 @@
     this.guid = aLivemarkInfo.guid;
     this.feedURI = aLivemarkInfo.feedURI;
     this.siteURI = aLivemarkInfo.siteURI;
+    this.dateAdded = aLivemarkInfo.dateAdded;
     this.lastModified = aLivemarkInfo.lastModified;
   }
   else {
@@ -551,6 +563,10 @@
     if (aLivemarkInfo.siteURI) {
       this.writeSiteURI(aLivemarkInfo.siteURI);
     }
+    if (aLivemarkInfo.dateAdded) {
+      this.dateAdded = aLivemarkInfo.dateAdded;
+      PlacesUtils.bookmarks.setItemDateAdded(this.id, this.dateAdded);
+    }
     // Last modified time must be the last change.
     if (aLivemarkInfo.lastModified) {
       this.lastModified = aLivemarkInfo.lastModified;
@@ -614,16 +630,13 @@
     this.siteURI = aSiteURI;
   },
 
-  set guid(aGUID) {
-    this._guid = aGUID;
-    return aGUID;
-  },
+  set guid(aGUID) this._guid = aGUID,
   get guid() this._guid,
 
-  set lastModified(aLastModified) {
-    this._lastModified = aLastModified;
-    return aLastModified;
-  },
+  set dateAdded(aDateAdded) this._dateAdded = aDateAdded,
+  get dateAdded() this._dateAdded,
+
+  set lastModified(aLastModified) this._lastModified = aLastModified,
   get lastModified() this._lastModified,
 
   /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavBookmarks.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavBookmarks.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavBookmarks.cpp	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavBookmarks.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -19,8 +19,6 @@
 
 #include "GeckoProfiler.h"
 
-#define BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_LENGTH 32
-
 using namespace mozilla;
 
 // These columns sit to the right of the kGetInfoIndex_* columns.
@@ -40,25 +38,6 @@
 
 namespace {
 
-struct keywordSearchData
-{
-  int64_t itemId;
-  nsString keyword;
-};
-
-PLDHashOperator
-SearchBookmarkForKeyword(nsTrimInt64HashKey::KeyType aKey,
-                         const nsString aValue,
-                         void* aUserArg)
-{
-  keywordSearchData* data = reinterpret_cast<keywordSearchData*>(aUserArg);
-  if (data->keyword.Equals(aValue)) {
-    data->itemId = aKey;
-    return PL_DHASH_STOP;
-  }
-  return PL_DHASH_NEXT;
-}
-
 template<typename Method, typename DataType>
 class AsyncGetBookmarksForURI : public AsyncStatementCallback
 {
@@ -143,8 +122,6 @@
   , mCanNotify(false)
   , mCacheObservers("bookmark-observers")
   , mBatching(false)
-  , mBookmarkToKeywordHash(BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_LENGTH)
-  , mBookmarkToKeywordHashInitialized(false)
 {
   NS_ASSERTION(!gBookmarksService,
                "Attempting to create two instances of the service!");
@@ -646,7 +623,7 @@
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
-    rv = UpdateKeywordsHashForRemovedBookmark(aItemId);
+    rv = removeOrphanKeywords();
     NS_ENSURE_SUCCESS(rv, rv);
 
     // A broken url should not interrupt the removal process.
@@ -1119,7 +1096,7 @@
         NS_ENSURE_SUCCESS(rv, rv);
       }
 
-      rv = UpdateKeywordsHashForRemovedBookmark(child.id);
+      rv = removeOrphanKeywords();
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
@@ -2255,39 +2232,23 @@
 
 
 nsresult
-nsNavBookmarks::UpdateKeywordsHashForRemovedBookmark(int64_t aItemId)
+nsNavBookmarks::removeOrphanKeywords()
 {
-  nsAutoString keyword;
-  if (NS_SUCCEEDED(GetKeywordForBookmark(aItemId, keyword)) &&
-      !keyword.IsEmpty()) {
-    nsresult rv = EnsureKeywordsHash();
-    NS_ENSURE_SUCCESS(rv, rv);
-    mBookmarkToKeywordHash.Remove(aItemId);
-
-    // If the keyword is unused, remove it from the database.
-    keywordSearchData searchData;
-    searchData.keyword.Assign(keyword);
-    searchData.itemId = -1;
-    mBookmarkToKeywordHash.EnumerateRead(SearchBookmarkForKeyword, &searchData);
-    if (searchData.itemId == -1) {
-      nsCOMPtr<mozIStorageAsyncStatement> stmt = mDB->GetAsyncStatement(
-        "DELETE FROM moz_keywords "
-        "WHERE keyword = :keyword "
-        "AND NOT EXISTS ( "
-          "SELECT id "
-          "FROM moz_bookmarks "
-          "WHERE keyword_id = moz_keywords.id "
-        ")"
-      );
-      NS_ENSURE_STATE(stmt);
+  // If the keyword is unused, remove it from the database.
+  nsCOMPtr<mozIStorageAsyncStatement> stmt = mDB->GetAsyncStatement(
+    "DELETE FROM moz_keywords "
+    "WHERE NOT EXISTS ( "
+      "SELECT id "
+      "FROM moz_bookmarks "
+      "WHERE keyword_id = moz_keywords.id "
+    ")"
+  );
+  NS_ENSURE_STATE(stmt);
+
+  nsCOMPtr<mozIStoragePendingStatement> pendingStmt;
+  nsresult rv = stmt->ExecuteAsync(nullptr, getter_AddRefs(pendingStmt));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
-      NS_ENSURE_SUCCESS(rv, rv);
-      nsCOMPtr<mozIStoragePendingStatement> pendingStmt;
-      rv = stmt->ExecuteAsync(nullptr, getter_AddRefs(pendingStmt));
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
   return NS_OK;
 }
 
@@ -2303,9 +2264,6 @@
   nsresult rv = FetchItemInfo(aBookmarkId, bookmark);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = EnsureKeywordsHash();
-  NS_ENSURE_SUCCESS(rv, rv);
-
   // Shortcuts are always lowercased internally.
   nsAutoString keyword(aUserCasedKeyword);
   ToLowerCase(keyword);
@@ -2331,8 +2289,6 @@
   mozStorageStatementScoper updateBookmarkScoper(updateBookmarkStmt);
 
   if (keyword.IsEmpty()) {
-    // Remove keyword association from the hash.
-    mBookmarkToKeywordHash.Remove(bookmark.id);
     rv = updateBookmarkStmt->BindNullByName(NS_LITERAL_CSTRING("keyword"));
   }
    else {
@@ -2350,10 +2306,6 @@
     rv = newKeywordStmt->Execute();
     NS_ENSURE_SUCCESS(rv, rv);
 
-    // Add new keyword association to the hash, removing the old one if needed.
-    if (!oldKeyword.IsEmpty())
-      mBookmarkToKeywordHash.Remove(bookmark.id);
-    mBookmarkToKeywordHash.Put(bookmark.id, keyword);
     rv = updateBookmarkStmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
   }
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2411,12 +2363,12 @@
   rv = stmt->ExecuteStep(&hasMore);
   if (NS_FAILED(rv) || !hasMore) {
     aKeyword.SetIsVoid(true);
-    return NS_OK; // not found: return void keyword string
+    return NS_OK;
   }
 
-  // found, get the keyword
   rv = stmt->GetString(0, aKeyword);
   NS_ENSURE_SUCCESS(rv, rv);
+
   return NS_OK;
 }
 
@@ -2427,17 +2379,29 @@
   NS_ENSURE_ARG_MIN(aBookmarkId, 1);
   aKeyword.Truncate(0);
 
-  nsresult rv = EnsureKeywordsHash();
+  nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+    "/* do not warn (bug no) - there is no index on keyword_id) */ "
+    "SELECT k.keyword "
+    "FROM moz_bookmarks b "
+    "JOIN moz_keywords k ON k.id = b.keyword_id "
+    "WHERE b.id = :id "
+  );
+  NS_ENSURE_STATE(stmt);
+  mozStorageStatementScoper scoper(stmt);
+
+  nsresult rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("id"), aBookmarkId);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsAutoString keyword;
-  if (!mBookmarkToKeywordHash.Get(aBookmarkId, &keyword)) {
+  bool hasMore = false;
+  rv = stmt->ExecuteStep(&hasMore);
+  if (NS_FAILED(rv) || !hasMore) {
     aKeyword.SetIsVoid(true);
-  }
-  else {
-    aKeyword.Assign(keyword);
+    return NS_OK;
   }
 
+  rv = stmt->GetString(0, aKeyword);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   return NS_OK;
 }
 
@@ -2454,52 +2418,32 @@
   nsAutoString keyword(aUserCasedKeyword);
   ToLowerCase(keyword);
 
-  nsresult rv = EnsureKeywordsHash();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  keywordSearchData searchData;
-  searchData.keyword.Assign(keyword);
-  searchData.itemId = -1;
-  mBookmarkToKeywordHash.EnumerateRead(SearchBookmarkForKeyword, &searchData);
-
-  if (searchData.itemId == -1) {
-    // Not found.
-    return NS_OK;
-  }
+  nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+    "/* do not warn (bug no) - there is no index on keyword_id) */ "
+    "SELECT url FROM moz_keywords k "
+    "JOIN moz_bookmarks b ON b.keyword_id = k.id "
+    "JOIN moz_places h ON b.fk = h.id "
+    "WHERE k.keyword = :keyword "
+    "ORDER BY b.dateAdded DESC"
+  );
+  NS_ENSURE_STATE(stmt);
+  mozStorageStatementScoper scoper(stmt);
 
-  rv = GetBookmarkURI(searchData.itemId, aURI);
+  nsresult rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return NS_OK;
-}
-
-
-nsresult
-nsNavBookmarks::EnsureKeywordsHash() {
-  if (mBookmarkToKeywordHashInitialized) {
+  bool hasMore = false;
+  rv = stmt->ExecuteStep(&hasMore);
+  if (NS_FAILED(rv) || !hasMore) {
     return NS_OK;
   }
-  mBookmarkToKeywordHashInitialized = true;
 
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mDB->MainConn()->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT b.id, k.keyword "
-    "FROM moz_bookmarks b "
-    "JOIN moz_keywords k ON k.id = b.keyword_id "
-  ), getter_AddRefs(stmt));
+  nsCString url;
+  rv = stmt->GetUTF8String(0, url);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  bool hasMore;
-  while (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
-    int64_t itemId;
-    rv = stmt->GetInt64(0, &itemId);
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsAutoString keyword;
-    rv = stmt->GetString(1, keyword);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    mBookmarkToKeywordHash.Put(itemId, keyword);
-  }
+  rv = NS_NewURI(aURI, url);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavBookmarks.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavBookmarks.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavBookmarks.h	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavBookmarks.h	2014-11-26 21:46:01.000000000 +0000
@@ -210,6 +210,11 @@
   nsresult GetDescendantFolders(int64_t aFolderId,
                                 nsTArray<int64_t>& aDescendantFoldersArray);
 
+  static const int32_t kGetChildrenIndex_Guid;
+  static const int32_t kGetChildrenIndex_Position;
+  static const int32_t kGetChildrenIndex_Type;
+  static const int32_t kGetChildrenIndex_PlaceID;
+
 private:
   static nsNavBookmarks* gBookmarksService;
 
@@ -356,11 +361,6 @@
 
   int64_t RecursiveFindRedirectedBookmark(int64_t aPlaceId);
 
-  static const int32_t kGetChildrenIndex_Position;
-  static const int32_t kGetChildrenIndex_Type;
-  static const int32_t kGetChildrenIndex_PlaceID;
-  static const int32_t kGetChildrenIndex_Guid;
-
   class RemoveFolderTransaction MOZ_FINAL : public nsITransaction {
   public:
     explicit RemoveFolderTransaction(int64_t aID) : mID(aID) {}
@@ -422,20 +422,9 @@
   bool mBatching;
 
   /**
-   * Always call EnsureKeywordsHash() and check it for errors before actually
-   * using the hash.  Internal keyword methods are already doing that.
-   */
-  nsresult EnsureKeywordsHash();
-  nsDataHashtable<nsTrimInt64HashKey, nsString> mBookmarkToKeywordHash;
-  bool mBookmarkToKeywordHashInitialized;
-
-  /**
-   * This function must be called every time a bookmark is removed.
-   *
-   * @param aURI
-   *        Uri to test.
+   * Removes orphan keywords.
    */
-  nsresult UpdateKeywordsHashForRemovedBookmark(int64_t aItemId);
+  nsresult removeOrphanKeywords();
 };
 
 #endif // nsNavBookmarks_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavHistory.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavHistory.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavHistory.cpp	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavHistory.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -1512,7 +1512,8 @@
           "SELECT b2.fk, h.url, COALESCE(b2.title, h.title) AS page_title, "
             "h.rev_host, h.visit_count, h.last_visit_date, f.url, b2.id, "
             "b2.dateAdded, b2.lastModified, b2.parent, ") +
-            tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency, h.hidden, h.guid "
+            tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency, h.hidden, h.guid, "
+            "b2.guid, b2.position, b2.type, b2.fk "
           "FROM moz_bookmarks b2 "
           "JOIN (SELECT b.fk "
                 "FROM moz_bookmarks b "
@@ -1536,7 +1537,8 @@
           "SELECT b.fk, h.url, COALESCE(b.title, h.title) AS page_title, "
             "h.rev_host, h.visit_count, h.last_visit_date, f.url, b.id, "
             "b.dateAdded, b.lastModified, b.parent, ") +
-            tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency, h.hidden, h.guid "
+            tagsSqlFragment + NS_LITERAL_CSTRING(", h.frecency, h.hidden, h.guid,"
+            "b.guid, b.position, b.type, b.fk "
           "FROM moz_bookmarks b "
           "JOIN moz_places h ON b.fk = h.id "
           "LEFT OUTER JOIN moz_favicons f ON h.favicon_id = f.id "
@@ -2237,9 +2239,6 @@
   return NS_OK;
 }
 
-
-// nsNavHistory::AddObserver
-
 NS_IMETHODIMP
 nsNavHistory::AddObserver(nsINavHistoryObserver* aObserver, bool aOwnsWeak)
 {
@@ -2249,9 +2248,6 @@
   return mObservers.AppendWeakElement(aObserver, aOwnsWeak);
 }
 
-
-// nsNavHistory::RemoveObserver
-
 NS_IMETHODIMP
 nsNavHistory::RemoveObserver(nsINavHistoryObserver* aObserver)
 {
@@ -2261,7 +2257,51 @@
   return mObservers.RemoveWeakElement(aObserver);
 }
 
-// nsNavHistory::BeginUpdateBatch
+NS_IMETHODIMP
+nsNavHistory::GetObservers(uint32_t* _count,
+                           nsINavHistoryObserver*** _observers)
+{
+  NS_ENSURE_ARG_POINTER(_count);
+  NS_ENSURE_ARG_POINTER(_observers);
+
+  *_count = 0;
+  *_observers = nullptr;
+
+  // Clear any cached value, cause it's very likely the consumer has made
+  // changes to history and is now trying to notify them.
+  mDaysOfHistory = -1;
+
+  if (!mCanNotify)
+    return NS_OK;
+
+  nsCOMArray<nsINavHistoryObserver> observers;
+
+  // First add the category cache observers.
+  mCacheObservers.GetEntries(observers);
+
+  // Then add the other observers.
+  for (uint32_t i = 0; i < mObservers.Length(); ++i) {
+    const nsCOMPtr<nsINavHistoryObserver> &observer = mObservers.ElementAt(i);
+    // Skip nullified weak observers.
+    if (observer)
+      observers.AppendElement(observer);
+  }
+
+  if (observers.Count() == 0)
+    return NS_OK;
+
+  *_observers = static_cast<nsINavHistoryObserver**>
+    (nsMemory::Alloc(observers.Count() * sizeof(nsINavHistoryObserver*)));
+  NS_ENSURE_TRUE(*_observers, NS_ERROR_OUT_OF_MEMORY);
+
+  *_count = observers.Count();
+  for (uint32_t i = 0; i < *_count; ++i) {
+    NS_ADDREF((*_observers)[i] = observers[i]);
+  }
+
+  return NS_OK;
+}
+
 // See RunInBatchMode
 nsresult
 nsNavHistory::BeginUpdateBatch()
@@ -3864,36 +3904,40 @@
   }
 
   if (IsQueryURI(url)) {
-    // special case "place:" URIs: turn them into containers
+    // Special case "place:" URIs: turn them into containers.
+    nsRefPtr<nsNavHistoryResultNode> resultNode;
+    rv = QueryRowToResult(itemId, url, title, accessCount, time, favicon,
+                          getter_AddRefs(resultNode));
+    NS_ENSURE_SUCCESS(rv,rv);
 
-    // We should never expose the history title for query nodes if the
-    // bookmark-item's title is set to null (the history title may be the
-    // query string without the place: prefix). Thus we call getItemTitle
-    // explicitly. Doing this in the SQL query would be less performant since
-    // it should be done for all results rather than only for queries.
     if (itemId != -1) {
+      rv = aRow->GetUTF8String(nsNavBookmarks::kGetChildrenIndex_Guid,
+                               resultNode->mBookmarkGuid);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      // We should never expose the history title for query nodes if the
+      // bookmark-item's title is set to null (the history title may be the
+      // query string without the place: prefix). Thus we call getItemTitle
+      // explicitly. Doing this in the SQL query would be less performant since
+      // it should be done for all results rather than only for queries.
       nsNavBookmarks *bookmarks = nsNavBookmarks::GetBookmarksService();
       NS_ENSURE_TRUE(bookmarks, NS_ERROR_OUT_OF_MEMORY);
 
-      rv = bookmarks->GetItemTitle(itemId, title);
+      rv = bookmarks->GetItemTitle(itemId, resultNode->mTitle);
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
-    nsRefPtr<nsNavHistoryResultNode> resultNode;
-    rv = QueryRowToResult(itemId, url, title, accessCount, time, favicon,
-                          getter_AddRefs(resultNode));
-    NS_ENSURE_SUCCESS(rv,rv);
-
-    if (aOptions->ResultType() == nsNavHistoryQueryOptions::RESULTS_AS_TAG_QUERY) {
+    if (itemId != -1 ||
+        aOptions->ResultType() == nsNavHistoryQueryOptions::RESULTS_AS_TAG_QUERY) {
       // RESULTS_AS_TAG_QUERY has date columns
       resultNode->mDateAdded = aRow->AsInt64(kGetInfoIndex_ItemDateAdded);
       resultNode->mLastModified = aRow->AsInt64(kGetInfoIndex_ItemLastModified);
-    }
-    else if (resultNode->IsFolder()) {
-      // If it's a simple folder node (i.e. a shortcut to another folder), apply
-      // our options for it. However, if the parent type was tag query, we do not
-      // apply them, because it would not yield any results.
-      resultNode->GetAsContainer()->mOptions = aOptions;
+      if (resultNode->IsFolder()) {
+        // If it's a simple folder node (i.e. a shortcut to another folder), apply
+        // our options for it. However, if the parent type was tag query, we do not
+        // apply them, because it would not yield any results.
+        resultNode->GetAsContainer()->mOptions = aOptions;
+      }
     }
 
     resultNode.forget(aResult);
@@ -3908,6 +3952,10 @@
       resultNode->mFolderId = parentId;
       resultNode->mDateAdded = aRow->AsInt64(kGetInfoIndex_ItemDateAdded);
       resultNode->mLastModified = aRow->AsInt64(kGetInfoIndex_ItemLastModified);
+
+      rv = aRow->GetUTF8String(nsNavBookmarks::kGetChildrenIndex_Guid,
+                               resultNode->mBookmarkGuid);
+      NS_ENSURE_SUCCESS(rv, rv);
     }
 
     resultNode->mFrecency = aRow->AsInt32(kGetInfoIndex_Frecency);
@@ -4097,7 +4145,8 @@
       "SELECT b.fk, h.url, COALESCE(b.title, h.title), "
              "h.rev_host, h.visit_count, h.last_visit_date, f.url, b.id, "
              "b.dateAdded, b.lastModified, b.parent, "
-             ) + tagsFragment + NS_LITERAL_CSTRING(", h.frecency, h.hidden, h.guid "
+             ) + tagsFragment + NS_LITERAL_CSTRING(", h.frecency, h.hidden, h.guid, "
+             "b.guid, b.position, b.type, b.fk "
       "FROM moz_bookmarks b "
       "JOIN moz_places h ON b.fk = h.id "
       "LEFT JOIN moz_favicons f ON h.favicon_id = f.id "
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavHistoryResult.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavHistoryResult.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsNavHistoryResult.cpp	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsNavHistoryResult.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -3584,6 +3584,9 @@
     node = new nsNavHistorySeparatorResultNode();
     NS_ENSURE_TRUE(node, NS_ERROR_OUT_OF_MEMORY);
     node->mItemId = aItemId;
+    node->mBookmarkGuid = aGUID;
+    node->mDateAdded = aDateAdded;
+    node->mLastModified = aDateAdded;
   }
 
   node->mBookmarkIndex = aIndex;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsPlacesAutoComplete.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsPlacesAutoComplete.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/nsPlacesAutoComplete.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/nsPlacesAutoComplete.js	2014-11-26 21:46:01.000000000 +0000
@@ -12,6 +12,8 @@
                                   "resource://gre/modules/TelemetryStopwatch.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Constants
@@ -201,7 +203,6 @@
   }
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 //// AutoCompleteStatementCallbackWrapper class
 
@@ -497,8 +498,9 @@
     this._currentSearchString =
       fixupSearchText(this._originalSearchString.toLowerCase());
 
-    let searchParamParts = aSearchParam.split(" ");
-    this._enableActions = searchParamParts.indexOf("enable-actions") != -1;
+    let params = new Set(aSearchParam.split(" "));
+    this._enableActions = params.has("enable-actions");
+    this._disablePrivateActions = params.has("disable-private-actions");
 
     this._listener = aListener;
     let result = Cc["@mozilla.org/autocomplete/simple-result;1"].
@@ -1044,20 +1046,19 @@
     let query = this._getSuggestionPrefQuery();
 
     // Bind the needed parameters to the query so consumers can use it.
-    let (params = query.params) {
-      params.parent = PlacesUtils.tagsFolderId;
-      params.query_type = kQueryTypeFiltered;
-      params.matchBehavior = aMatchBehavior;
-      params.searchBehavior = this._behavior;
-
-      // We only want to search the tokens that we are left with - not the
-      // original search string.
-      params.searchString = aTokens.join(" ");
-
-      // Limit the query to the the maximum number of desired results.
-      // This way we can avoid doing more work than needed.
-      params.maxResults = this._maxRichResults;
-    }
+    let params = query.params;
+    params.parent = PlacesUtils.tagsFolderId;
+    params.query_type = kQueryTypeFiltered;
+    params.matchBehavior = aMatchBehavior;
+    params.searchBehavior = this._behavior;
+
+    // We only want to search the tokens that we are left with - not the
+    // original search string.
+    params.searchString = aTokens.join(" ");
+
+    // Limit the query to the the maximum number of desired results.
+    // This way we can avoid doing more work than needed.
+    params.maxResults = this._maxRichResults;
 
     return query;
   },
@@ -1067,15 +1068,15 @@
     let query = this._openPagesQuery;
 
     // Bind the needed parameters to the query so consumers can use it.
-    let (params = query.params) {
-      params.query_type = kQueryTypeFiltered;
-      params.matchBehavior = this._matchBehavior;
-      params.searchBehavior = this._behavior;
-      // We only want to search the tokens that we are left with - not the
-      // original search string.
-      params.searchString = aTokens.join(" ");
-      params.maxResults = this._maxRichResults;
-    }
+    let params = query.params;
+    params.query_type = kQueryTypeFiltered;
+    params.matchBehavior = this._matchBehavior;
+    params.searchBehavior = this._behavior;
+
+    // We only want to search the tokens that we are left with - not the
+    // original search string.
+    params.searchString = aTokens.join(" ");
+    params.maxResults = this._maxRichResults;
 
     return query;
   },
@@ -1104,11 +1105,10 @@
     let keyword = aTokens[0];
 
     let query = this._keywordQuery;
-    let (params = query.params) {
-      params.keyword = keyword;
-      params.query_string = queryString;
-      params.query_type = kQueryTypeKeyword;
-    }
+    let params = query.params;
+    params.keyword = keyword;
+    params.query_string = queryString;
+    params.query_type = kQueryTypeKeyword;
 
     return query;
   },
@@ -1126,13 +1126,12 @@
     }
 
     let query = this._adaptiveQuery;
-    let (params = query.params) {
-      params.parent = PlacesUtils.tagsFolderId;
-      params.search_string = this._currentSearchString;
-      params.query_type = kQueryTypeFiltered;
-      params.matchBehavior = aMatchBehavior;
-      params.searchBehavior = this._behavior;
-    }
+    let params = query.params;
+    params.parent = PlacesUtils.tagsFolderId;
+    params.search_string = this._currentSearchString;
+    params.query_type = kQueryTypeFiltered;
+    params.matchBehavior = aMatchBehavior;
+    params.searchBehavior = this._behavior;
 
     return query;
   },
@@ -1295,8 +1294,14 @@
    */
   _hasBehavior: function PAC_hasBehavior(aType)
   {
-    return (this._behavior &
-            Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()]);
+    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
+
+    if (this._disablePrivateActions &&
+        behavior == Ci.mozIPlacesAutoComplete.BEHAVIOR_OPENPAGE) {
+      return false;
+    }
+
+    return this._behavior & behavior;
   },
 
   /**
@@ -1451,74 +1456,76 @@
 
     this._listener = aListener;
 
-    // Don't autoFill if the search term is recognized as a keyword, otherwise
-    // it will override default keywords behavior.  Note that keywords are
-    // hashed on first use, so while the first query may delay a little bit,
-    // next ones will just hit the memory hash.
-    if (this._currentSearchString.length == 0 || !this._db ||
-        PlacesUtils.bookmarks.getURIForKeyword(this._currentSearchString)) {
-      this._finishSearch();
-      return;
-    }
+    Task.spawn(function* () {
+      // Don't autoFill if the search term is recognized as a keyword, otherwise
+      // it will override default keywords behavior.  Note that keywords are
+      // hashed on first use, so while the first query may delay a little bit,
+      // next ones will just hit the memory hash.
+      if (this._currentSearchString.length == 0 || !this._db ||
+          (yield PlacesUtils.promiseHrefAndPostDataForKeyword(this._currentSearchString)).href) {
+        this._finishSearch();
+        return;
+      }
 
-    // Don't try to autofill if the search term includes any whitespace.
-    // This may confuse completeDefaultIndex cause the AUTOCOMPLETE_MATCH
-    // tokenizer ends up trimming the search string and returning a value
-    // that doesn't match it, or is even shorter.
-    if (/\s/.test(this._currentSearchString)) {
-      this._finishSearch();
-      return;
-    }
+      // Don't try to autofill if the search term includes any whitespace.
+      // This may confuse completeDefaultIndex cause the AUTOCOMPLETE_MATCH
+      // tokenizer ends up trimming the search string and returning a value
+      // that doesn't match it, or is even shorter.
+      if (/\s/.test(this._currentSearchString)) {
+        this._finishSearch();
+        return;
+      }
 
-    // Hosts have no "/" in them.
-    let lastSlashIndex = this._currentSearchString.lastIndexOf("/");
+      // Hosts have no "/" in them.
+      let lastSlashIndex = this._currentSearchString.lastIndexOf("/");
 
-    // Search only URLs if there's a slash in the search string...
-    if (lastSlashIndex != -1) {
-      // ...but not if it's exactly at the end of the search string.
-      if (lastSlashIndex < this._currentSearchString.length - 1)
-        this._queryURL();
-      else
-        this._finishSearch();
-      return;
-    }
+      // Search only URLs if there's a slash in the search string...
+      if (lastSlashIndex != -1) {
+        // ...but not if it's exactly at the end of the search string.
+        if (lastSlashIndex < this._currentSearchString.length - 1)
+          this._queryURL();
+        else
+          this._finishSearch();
+        return;
+      }
 
-    // Do a synchronous search on the table of hosts.
-    let query = this._hostQuery;
-    query.params.search_string = this._currentSearchString.toLowerCase();
-    // This is just to measure the delay to reach the UI, not the query time.
-    TelemetryStopwatch.start(DOMAIN_QUERY_TELEMETRY);
-    let ac = this;
-    let wrapper = new AutoCompleteStatementCallbackWrapper(this, {
-      handleResult: function (aResultSet) {
-        let row = aResultSet.getNextRow();
-        let trimmedHost = row.getResultByIndex(0);
-        let untrimmedHost = row.getResultByIndex(1);
-        // If the untrimmed value doesn't preserve the user's input just
-        // ignore it and complete to the found host.
-        if (untrimmedHost &&
-            !untrimmedHost.toLowerCase().contains(ac._originalSearchString.toLowerCase())) {
-          untrimmedHost = null;
-        }
+      // Do a synchronous search on the table of hosts.
+      let query = this._hostQuery;
+      query.params.search_string = this._currentSearchString.toLowerCase();
+      // This is just to measure the delay to reach the UI, not the query time.
+      TelemetryStopwatch.start(DOMAIN_QUERY_TELEMETRY);
+      let ac = this;
+      let wrapper = new AutoCompleteStatementCallbackWrapper(this, {
+        handleResult: function (aResultSet) {
+          let row = aResultSet.getNextRow();
+          let trimmedHost = row.getResultByIndex(0);
+          let untrimmedHost = row.getResultByIndex(1);
+          // If the untrimmed value doesn't preserve the user's input just
+          // ignore it and complete to the found host.
+          if (untrimmedHost &&
+              !untrimmedHost.toLowerCase().contains(ac._originalSearchString.toLowerCase())) {
+            untrimmedHost = null;
+          }
 
-        ac._result.appendMatch(ac._strippedPrefix + trimmedHost, "", "", "", untrimmedHost);
+          ac._result.appendMatch(ac._strippedPrefix + trimmedHost, "", "", "", untrimmedHost);
 
-        // handleCompletion() will cause the result listener to be called, and
-        // will display the result in the UI.
-      },
-
-      handleError: function (aError) {
-        Components.utils.reportError(
-          "URL Inline Complete: An async statement encountered an " +
-          "error: " + aError.result + ", '" + aError.message + "'");
-      },
-
-      handleCompletion: function (aReason) {
-        TelemetryStopwatch.finish(DOMAIN_QUERY_TELEMETRY);
-        ac._finishSearch();
-      }
-    }, this._db);
-    this._pendingQuery = wrapper.executeAsync([query]);
+          // handleCompletion() will cause the result listener to be called, and
+          // will display the result in the UI.
+        },
+
+        handleError: function (aError) {
+          Components.utils.reportError(
+            "URL Inline Complete: An async statement encountered an " +
+            "error: " + aError.result + ", '" + aError.message + "'");
+        },
+
+        handleCompletion: function (aReason) {
+          TelemetryStopwatch.finish(DOMAIN_QUERY_TELEMETRY);
+          ac._finishSearch();
+        }
+      }, this._db);
+      this._pendingQuery = wrapper.executeAsync([query]);
+    }.bind(this));
   },
 
   /**
@@ -1539,13 +1546,12 @@
     // Within the standard autocomplete query, we only search the beginning
     // of URLs for 1 result.
     let query = this._urlQuery;
-    let (params = query.params) {
-      params.matchBehavior = MATCH_BEGINNING_CASE_SENSITIVE;
-      params.searchBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_HISTORY |
-                               Ci.mozIPlacesAutoComplete.BEHAVIOR_TYPED |
-                               Ci.mozIPlacesAutoComplete.BEHAVIOR_URL;
-      params.searchString = this._currentSearchString;
-    }
+    let params = query.params;
+    params.matchBehavior = MATCH_BEGINNING_CASE_SENSITIVE;
+    params.searchBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_HISTORY |
+                             Ci.mozIPlacesAutoComplete.BEHAVIOR_TYPED |
+                             Ci.mozIPlacesAutoComplete.BEHAVIOR_URL;
+    params.searchString = this._currentSearchString;
 
     // Execute the query.
     let ac = this;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/PlacesTransactions.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/PlacesTransactions.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/PlacesTransactions.jsm	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/PlacesTransactions.jsm	2014-11-26 21:46:01.000000000 +0000
@@ -67,7 +67,8 @@
  *            a live bookmark is associated.
  *  - tag - a string.
  *  - tags: an array of strings.
- *  - guid, parentGuid, newParentGuid: a valid places GUID string.
+ *  - guid, parentGuid, newParentGuid: a valid Places GUID string.
+ *  - guids: an array of valid Places GUID strings.
  *  - title: a string
  *  - index, newIndex: the position of an item in its containing folder,
  *    starting from 0.
@@ -463,7 +464,6 @@
   get promise() this._promise
 };
 
-
 let TransactionsManager = {
   // See the documentation at the top of this file. |transact| calls are not
   // serialized with |batch| calls.
@@ -869,6 +869,7 @@
                                    PlacesUtils.bookmarks.DEFAULT_INDEX);
 DefineTransaction.defineInputProps(["annotation"],
                                    DefineTransaction.annotationObjectValidate);
+DefineTransaction.defineArrayInputProp("guids", "guid");
 DefineTransaction.defineArrayInputProp("urls", "url");
 DefineTransaction.defineArrayInputProp("tags", "tag");
 DefineTransaction.defineArrayInputProp("annotations", "annotation");
@@ -1269,29 +1270,40 @@
  *
  * Required Input Properties: guid, annotationObject
  */
-PT.Annotate = DefineTransaction(["guid", "annotations"]);
+PT.Annotate = DefineTransaction(["guids", "annotations"]);
 PT.Annotate.prototype = {
-  execute: function* (aGuid, aNewAnnos) {
-    let itemId = yield PlacesUtils.promiseItemId(aGuid);
-    let currentAnnos = PlacesUtils.getAnnotationsForItem(itemId);
-    let undoAnnos = [];
-    for (let newAnno of aNewAnnos) {
-      let currentAnno = currentAnnos.find( a => a.name == newAnno.name );
-      if (!!currentAnno) {
-        undoAnnos.push(currentAnno);
-      }
-      else {
-        // An unset value removes the annotation.
-        undoAnnos.push({ name: newAnno.name });
+  *execute(aGuids, aNewAnnos) {
+    let undoAnnosForItem = new Map(); // itemId => undoAnnos;
+    for (let guid of aGuids) {
+      let itemId = yield PlacesUtils.promiseItemId(guid);
+      let currentAnnos = PlacesUtils.getAnnotationsForItem(itemId);
+
+      let undoAnnos = [];
+      for (let newAnno of aNewAnnos) {
+        let currentAnno = currentAnnos.find(a => a.name == newAnno.name);
+        if (!!currentAnno) {
+          undoAnnos.push(currentAnno);
+        }
+        else {
+          // An unset value removes the annotation.
+          undoAnnos.push({ name: newAnno.name });
+        }
       }
+      undoAnnosForItem.set(itemId, undoAnnos);
+
+      PlacesUtils.setAnnotationsForItem(itemId, aNewAnnos);
     }
 
-    PlacesUtils.setAnnotationsForItem(itemId, aNewAnnos);
-    this.undo = () => {
-      PlacesUtils.setAnnotationsForItem(itemId, undoAnnos);
+    this.undo = function() {
+      for (let [itemId, undoAnnos] of undoAnnosForItem) {
+        PlacesUtils.setAnnotationsForItem(itemId, undoAnnos);
+      }
     };
-    this.redo = () => {
-      PlacesUtils.setAnnotationsForItem(itemId, aNewAnnos);
+    this.redo = function* () {
+      for (let guid of aGuids) {
+        let itemId = yield PlacesUtils.promiseItemId(guid);
+        PlacesUtils.setAnnotationsForItem(itemId, aNewAnnos);
+      }
     };
   }
 };
@@ -1384,28 +1396,61 @@
 /**
  * Transaction for removing an item (any type).
  *
- * Required Input Properties: guid.
+ * Required Input Properties: guids.
  */
-PT.Remove = DefineTransaction(["guid"]);
+PT.Remove = DefineTransaction(["guids"]);
 PT.Remove.prototype = {
-  execute: function* (aGuid) {
-    const bms = PlacesUtils.bookmarks;
-
-    let itemInfo = null;
-    try {
-      itemInfo = yield PlacesUtils.promiseBookmarksTree(aGuid);
+  *execute(aGuids) {
+    function promiseBookmarksTree(guid) {
+      try {
+        return PlacesUtils.promiseBookmarksTree(guid);
+      }
+      catch(ex) {
+        throw new Error("Failed to get info for the specified item (guid: " +
+                        guid + "). Ex: " + ex);
+      }
     }
-    catch(ex) {
-      throw new Error("Failed to get info for the specified item (guid: " +
-                      aGuid + "). Ex: " + ex);
+    let toRestore = [for (guid of aGuids) yield promiseBookmarksTree(guid)];
+
+    let removeThem = Task.async(function* () {
+      for (let guid of aGuids) {
+        PlacesUtils.bookmarks.removeItem(yield PlacesUtils.promiseItemId(guid));
+      }
+    });
+    yield removeThem();
+
+    this.undo = Task.async(function* () {
+      for (let info of toRestore) {
+        yield createItemsFromBookmarksTree(info, true);
+      }
+    });
+    this.redo = removeThem;
+  }
+};
+
+/**
+ * Transactions for removing all bookmarks for one or more urls.
+ *
+ * Required Input Properties: urls.
+ */
+PT.RemoveBookmarksForUrls = DefineTransaction(["urls"]);
+PT.RemoveBookmarksForUrls.prototype = {
+  *execute(aUrls) {
+    let guids = [];
+    for (let url of aUrls) {
+      yield PlacesUtils.bookmarks.fetch({ url }, info => {
+        guids.push(info.guid);
+      });
     }
-    PlacesUtils.bookmarks.removeItem(yield PlacesUtils.promiseItemId(aGuid));
-    this.undo = createItemsFromBookmarksTree.bind(null, itemInfo, true);
+    let removeTxn = TransactionsHistory.getRawTransaction(PT.Remove(guids));
+    yield removeTxn.execute();
+    this.undo = removeTxn.undo.bind(removeTxn);
+    this.redo = removeTxn.redo.bind(removeTxn);
   }
 };
 
 /**
- * Transaction for tagging a URI.
+ * Transaction for tagging urls.
  *
  * Required Input Properties: urls, tags.
  */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/PlacesUtils.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/PlacesUtils.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/PlacesUtils.jsm	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/PlacesUtils.jsm	2014-11-26 21:46:01.000000000 +0000
@@ -835,6 +835,17 @@
   },
 
   /**
+   * Gets the href and the post data for a given keyword, if any.
+   *
+   * @param keyword
+   *        The string keyword to look for.
+   * @return {Promise}
+   * @resolves to a { href, postData } object. Both properties evaluate to null
+   *           if no keyword is found.
+   */
+  promiseHrefAndPostDataForKeyword(keyword) KeywordsCache.promiseEntry(keyword),
+
+  /**
    * Get the URI (and any associated POST data) for a given keyword.
    * @param aKeyword string keyword
    * @returns an array containing a string URL and a string of POST data
@@ -1965,6 +1976,114 @@
   }
 };
 
+// Cache of bookmarks keywords, used to quickly resolve keyword => URL requests.
+let KeywordsCache = {
+  /**
+   * Initializes the cache.
+   * Every method should check _initialized and, if false, yield _initialize().
+   */
+  _initialized: false,
+  _initialize: Task.async(function* () {
+    // First populate the cache...
+    yield this._reloadCache();
+
+    // ...then observe changes to keep the cache up-to-date.
+    PlacesUtils.bookmarks.addObserver(this, false);
+    PlacesUtils.registerShutdownFunction(() => {
+      PlacesUtils.bookmarks.removeObserver(this);
+    });
+
+    this._initialized = true;
+  }),
+
+  // nsINavBookmarkObserver
+  // Manually updating the cache would be tricky because some notifications
+  // don't report the original bookmark url and we also keep urls sorted by
+  // last modified.  Since changing a keyword-ed bookmark is a rare event,
+  // it's easier to reload the cache.
+  onItemChanged(itemId, property, isAnno, val, lastModified, type,
+                parentId, guid, parentGuid) {
+    if (property == "keyword" || property == this.POST_DATA_ANNO ||
+        this._keywordedGuids.has(guid)) {
+      // Since this cache is used in hot paths, it should be readily available
+      // as fast as possible.
+      this._reloadCache().catch(Cu.reportError);
+    }
+  },
+  onItemRemoved(itemId, parentId, index, type, uri, guid, parentGuid) {
+    if (this._keywordedGuids.has(guid)) {
+      // Since this cache is used in hot paths, it should be readily available
+      // as fast as possible.
+      this._reloadCache().catch(Cu.reportError);
+    }
+  },
+  QueryInterface: XPCOMUtils.generateQI([ Ci.nsINavBookmarkObserver ]),
+  __noSuchMethod__() {}, // Catch all remaining onItem* methods.
+
+  // Maps an { href, postData } object to each keyword.
+  // Even if a keyword may be associated to multiple URLs, only the last
+  // modified bookmark href is retained here.
+  _urlDataForKeyword: null,
+  // Tracks GUIDs having a keyword.
+  _keywordedGuids: null,
+
+  /**
+   * Reloads the cache.
+   */
+  _reloadPromise: null,
+  _reloadCache() {
+    return this._reloadPromise = Task.spawn(function* () {
+      let db = yield PlacesUtils.promiseDBConnection();
+      let rows = yield db.execute(
+        `/* do not warn (bug no) - there is no index on keyword_id */
+         SELECT b.id, b.guid, h.url, k.keyword FROM moz_bookmarks b
+         JOIN moz_places h ON h.id = b.fk
+         JOIN moz_keywords k ON k.id = b.keyword_id
+         ORDER BY b.lastModified DESC
+        `);
+
+      this._urlDataForKeyword = new Map();
+      this._keywordedGuids = new Set();
+
+      for (let row of rows) {
+        let guid = row.getResultByName("guid");
+        this._keywordedGuids.add(guid);
+
+        let keyword = row.getResultByName("keyword");
+        // Only keep the most recent href.
+        let urlData = this._urlDataForKeyword.get(keyword);
+        if (urlData)
+          continue;
+
+        let id = row.getResultByName("id");
+        let href = row.getResultByName("url");
+        let postData = PlacesUtils.getPostDataForBookmark(id);
+        this._urlDataForKeyword.set(keyword, { href, postData });
+      }
+    }.bind(this)).then(() => {
+      this._reloadPromise = null;
+    });
+  },
+
+  /**
+   * Fetches a { href, postData } entry for the given keyword.
+   *
+   * @param keyword
+   *        The keyword to look for.
+   * @return {promise}
+   * @resolves when the fetching is complete.
+   */
+  promiseEntry: Task.async(function* (keyword) {
+    // We could yield regardless and do the checks internally, but that would
+    // waste at least a couple ticks and this can be used on hot paths.
+    if (!this._initialized)
+      yield this._initialize();
+    if (this._reloadPromise)
+      yield this._reloadPromise;
+    return this._urlDataForKeyword.get(keyword) || { href: null, postData: null };
+  }),
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 //// Transactions handlers.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_fetch.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_fetch.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_fetch.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_fetch.js	2014-11-26 21:46:01.000000000 +0000
@@ -255,6 +255,9 @@
                                                  title: "a bookmark" });
   checkBookmarkObject(bm1);
 
+  // Also ensure that fecth-by-url excludes the tags folder.
+  PlacesUtils.tagging.tagURI(uri(bm1.url.href), ["Test Tag"]);
+
   let bm2 = yield PlacesUtils.bookmarks.fetch({ url: bm1.url },
                                               gAccumulator.callback);
   checkBookmarkObject(bm2);
@@ -293,6 +296,9 @@
   Assert.equal(gAccumulator.results.length, 2);
   gAccumulator.results.forEach(checkBookmarkObject);
   Assert.deepEqual(gAccumulator.results[0], bm5);
+
+  // cleanup
+  PlacesUtils.tagging.untagURI(uri(bm1.url.href), ["Test Tag"]);
 });
 
 add_task(function* fetch_bykeyword_nonexisting() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_notifications.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_notifications.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_notifications.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_notifications.js	2014-11-26 21:46:01.000000000 +0000
@@ -111,10 +111,6 @@
                                   tag.url, null, tag.dateAdded,
                                   tag.guid, tag.parentGuid ] },
                    { name: "onItemChanged",
-                     arguments: [ tagId, "tags", false, "",
-                                  tag.lastModified, tag.type, tagParentId,
-                                  tag.guid, tag.parentGuid ] },
-                   { name: "onItemChanged",
                      arguments: [ itemId, "tags", false, "",
                                   bm.lastModified, bm.type, parentId,
                                   bm.guid, bm.parentGuid ] }
@@ -188,6 +184,65 @@
                                   bm.parentGuid ] }
                  ]);
 });
+
+add_task(function* update_move_same_folder() {
+  // Ensure there are at least two items in place (others test do so for us,
+  // but we don't have to depend on that).
+  let sep = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_SEPARATOR,
+                                                 parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  let bm = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                url: new URL("http://move.example.com/") });
+  let bmItemId = yield PlacesUtils.promiseItemId(bm.guid);
+  let bmParentId = yield PlacesUtils.promiseItemId(bm.parentGuid);
+  let bmOldIndex = bm.index;
+
+  let observer = expectNotifications();
+  bm = yield PlacesUtils.bookmarks.update({ guid: bm.guid,
+                                            parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                            index: 0 });
+  Assert.equal(bm.index, 0);
+  observer.check([ { name: "onItemMoved",
+                     arguments: [ bmItemId, bmParentId, bmOldIndex, bmParentId, bm.index,
+                                  bm.type, bm.guid, bm.parentGuid, bm.parentGuid ] }
+                 ]);
+
+  // Test that we get the right index for DEFAULT_INDEX input.
+  bmOldIndex = 0;
+  observer = expectNotifications();
+  bm = yield PlacesUtils.bookmarks.update({ guid: bm.guid,
+                                            parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                            index: PlacesUtils.bookmarks.DEFAULT_INDEX });
+  Assert.ok(bm.index > 0);
+  observer.check([ { name: "onItemMoved",
+                     arguments: [ bmItemId, bmParentId, bmOldIndex, bmParentId, bm.index,
+                                  bm.type, bm.guid, bm.parentGuid, bm.parentGuid ] }
+                 ]);
+});
+
+add_task(function* update_move_different_folder() {
+  let bm = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                url: new URL("http://move.example.com/") });
+  let folder = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_FOLDER,
+                                                    parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  let bmItemId = yield PlacesUtils.promiseItemId(bm.guid);
+  let bmOldParentId = PlacesUtils.unfiledBookmarksFolderId;
+  let bmOldIndex = bm.index;
+
+  let observer = expectNotifications();
+  bm = yield PlacesUtils.bookmarks.update({ guid: bm.guid,
+                                            parentGuid: folder.guid,
+                                            index: PlacesUtils.bookmarks.DEFAULT_INDEX });
+  Assert.equal(bm.index, 0);
+  let bmNewParentId = yield PlacesUtils.promiseItemId(folder.guid);
+  observer.check([ { name: "onItemMoved",
+                     arguments: [ bmItemId, bmOldParentId, bmOldIndex, bmNewParentId,
+                                  bm.index, bm.type, bm.guid,
+                                  PlacesUtils.bookmarks.unfiledGuid,
+                                  bm.parentGuid ] }
+                 ]);
+});
 
 add_task(function* remove_bookmark() {
   let bm = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_update.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_update.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_update.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/bookmarks/test_bookmarks_update.js	2014-11-26 21:46:01.000000000 +0000
@@ -402,6 +402,71 @@
   Assert.equal(descendant.index, 1);
 });
 
+add_task(function* update_move_append() {
+  let folder_a =
+    yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                         type: PlacesUtils.bookmarks.TYPE_FOLDER });
+  checkBookmarkObject(folder_a);
+  let folder_b =
+    yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                         type: PlacesUtils.bookmarks.TYPE_FOLDER });
+  checkBookmarkObject(folder_b);
+
+  /* folder_a: [sep_1, sep_2, sep_3], folder_b: [] */
+  let sep_1 = yield PlacesUtils.bookmarks.insert({ parentGuid: folder_a.guid,
+                                                   type: PlacesUtils.bookmarks.TYPE_SEPARATOR });
+  checkBookmarkObject(sep_1);
+  let sep_2 = yield PlacesUtils.bookmarks.insert({ parentGuid: folder_a.guid,
+                                                   type: PlacesUtils.bookmarks.TYPE_SEPARATOR });
+  checkBookmarkObject(sep_2);
+  let sep_3 = yield PlacesUtils.bookmarks.insert({ parentGuid: folder_a.guid,
+                                                   type: PlacesUtils.bookmarks.TYPE_SEPARATOR });
+  checkBookmarkObject(sep_3);
+
+  function ensurePosition(info, parentGuid, index) {
+    checkBookmarkObject(info);
+    Assert.equal(info.parentGuid, parentGuid);
+    Assert.equal(info.index, index);
+  }
+
+  // folder_a: [sep_2, sep_3, sep_1], folder_b: []
+  sep_1.index = PlacesUtils.bookmarks.DEFAULT_INDEX;
+  // Note sep_1 includes parentGuid even though we're not moving the item to
+  // another folder
+  sep_1 = yield PlacesUtils.bookmarks.update(sep_1);
+  ensurePosition(sep_1, folder_a.guid, 2);
+  sep_2 = yield PlacesUtils.bookmarks.fetch(sep_2.guid);
+  ensurePosition(sep_2, folder_a.guid, 0);
+  sep_3 = yield PlacesUtils.bookmarks.fetch(sep_3.guid);
+  ensurePosition(sep_3, folder_a.guid, 1);
+  sep_1 = yield PlacesUtils.bookmarks.fetch(sep_1.guid);
+  ensurePosition(sep_1, folder_a.guid, 2);
+
+  // folder_a: [sep_2, sep_1], folder_b: [sep_3]
+  sep_3.index = PlacesUtils.bookmarks.DEFAULT_INDEX;
+  sep_3.parentGuid = folder_b.guid;
+  sep_3 = yield PlacesUtils.bookmarks.update(sep_3);
+  ensurePosition(sep_3, folder_b.guid, 0);
+  sep_2 = yield PlacesUtils.bookmarks.fetch(sep_2.guid);
+  ensurePosition(sep_2, folder_a.guid, 0);
+  sep_1 = yield PlacesUtils.bookmarks.fetch(sep_1.guid);
+  ensurePosition(sep_1, folder_a.guid, 1);
+  sep_3 = yield PlacesUtils.bookmarks.fetch(sep_3.guid);
+  ensurePosition(sep_3, folder_b.guid, 0);
+
+  // folder_a: [sep_1], folder_b: [sep_3, sep_2]
+  sep_2.index = Number.MAX_SAFE_INTEGER;
+  sep_2.parentGuid = folder_b.guid;
+  sep_2 = yield PlacesUtils.bookmarks.update(sep_2);
+  ensurePosition(sep_2, folder_b.guid, 1);
+  sep_1 = yield PlacesUtils.bookmarks.fetch(sep_1.guid);
+  ensurePosition(sep_1, folder_a.guid, 0);
+  sep_3 = yield PlacesUtils.bookmarks.fetch(sep_3.guid);
+  ensurePosition(sep_3, folder_b.guid, 0);
+  sep_2 = yield PlacesUtils.bookmarks.fetch(sep_2.guid);
+  ensurePosition(sep_2, folder_b.guid, 1);
+});
+
 function run_test() {
   run_next_test();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/browser/browser_bug248970.js	2014-11-26 21:46:01.000000000 +0000
@@ -29,10 +29,6 @@
 
   yield promiseClearHistory();
 
-  // History database should be empty
-  is(PlacesUtils.history.hasHistoryEntries, false,
-     "History database should be empty");
-
    // Ensure we wait for the default bookmarks import.
   let bookmarksDeferred = Promise.defer();
   waitForCondition(() => {
@@ -53,10 +49,6 @@
     { uri: visitedURIs[7], transition: TRANSITION_DOWNLOAD }
   ]);
 
-  // History database should have entries
-  is(PlacesUtils.history.hasHistoryEntries, true,
-     "History database should have entries");
-
   placeItemsCount += 7;
   // We added 7 new items to history.
   is(getPlacesItemsCount(), placeItemsCount,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/history/head_history.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/history/head_history.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/history/head_history.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/history/head_history.js	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,19 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* 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/. */
+
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cr = Components.results;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+// Import common head.
+let (commonFile = do_get_file("../head_common.js", false)) {
+  let uri = Services.io.newFileURI(commonFile);
+  Services.scriptloader.loadSubScript(uri.spec, this);
+};
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/history/test_remove.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/history/test_remove.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/history/test_remove.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/history/test_remove.js	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,342 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* 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/. */
+
+// Tests for `History.remove`, as implemented in History.jsm
+
+"use strict";
+
+Cu.importGlobalProperties(["URL"]);
+
+
+// Test removing a single page
+add_task(function* test_remove_single() {
+  let WITNESS_URI = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());
+  yield promiseAddVisits(WITNESS_URI);
+  Assert.ok(page_in_database(WITNESS_URI));
+
+  let remover = Task.async(function*(name, filter, options) {
+    do_print(name);
+    do_print(JSON.stringify(options));
+    do_print("Setting up visit");
+
+    let uri = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());
+    let title = "Visit " + Math.random();
+    yield promiseAddVisits({uri: uri, title: title});
+    Assert.ok(visits_in_database(uri), "History entry created");
+
+    let removeArg = yield filter(uri);
+
+    if (options.addBookmark) {
+      PlacesUtils.bookmarks.insertBookmark(
+        PlacesUtils.unfiledBookmarksFolderId,
+        uri,
+        PlacesUtils.bookmarks.DEFAULT_INDEX,
+        "test bookmark");
+    }
+
+    let shouldRemove = !options.addBookmark;
+    let observer;
+    let promiseObserved = new Promise((resolve, reject) => {
+      observer = {
+        onBeginUpdateBatch: function() {},
+        onEndUpdateBatch: function() {},
+        onVisit: function(uri) {
+          reject(new Error("Unexpected call to onVisit " + uri.spec));
+        },
+        onTitleChanged: function(uri) {
+          reject(new Error("Unexpected call to onTitleChanged " + uri.spec));
+        },
+        onClearHistory: function() {
+          reject("Unexpected call to onClearHistory");
+        },
+        onPageChanged: function(uri) {
+          reject(new Error("Unexpected call to onPageChanged " + uri.spec));
+        },
+        onFrecencyChanged: function(aURI) {
+          try {
+            Assert.ok(!shouldRemove, "Observing onFrecencyChanged");
+            Assert.equal(aURI.spec, uri.spec, "Observing effect on the right uri");
+          } finally {
+            resolve();
+          }
+        },
+        onManyFrecenciesChanged: function() {
+          try {
+            Assert.ok(!shouldRemove, "Observing onManyFrecenciesChanged");
+          } finally {
+            resolve();
+          }
+        },
+        onDeleteURI: function(aURI) {
+          try {
+            Assert.ok(shouldRemove, "Observing onDeleteURI");
+            Assert.equal(aURI.spec, uri.spec, "Observing effect on the right uri");
+          } finally {
+            resolve();
+          }
+        },
+        onDeleteVisits: function(aURI) {
+          Assert.equal(aURI.spec, uri.spec, "Observing onDeleteVisits on the right uri");
+        }
+      };
+    });
+    PlacesUtils.history.addObserver(observer, false);
+
+    do_print("Performing removal");
+    let removed = false;
+    if (options.useCallback) {
+      let onRowCalled = false;
+      removed = yield PlacesUtils.history.remove(removeArg, page => {
+        Assert.equal(onRowCalled, false, "Callback has not been called yet");
+        onRowCalled = true;
+        Assert.equal(page.url.href, uri.spec, "Callback provides the correct url");
+        Assert.equal(page.guid, do_get_guid_for_uri(uri), "Callback provides the correct guid");
+        Assert.equal(page.title, title, "Callback provides the correct title");
+        Assert.equal(page.frecency, frecencyForUrl(uri), "Callback provides the correct frecency");
+      });
+      Assert.ok(onRowCalled, "Callback has been called");
+    } else {
+      removed = yield PlacesUtils.history.remove(removeArg);
+    }
+
+    yield promiseObserved;
+    PlacesUtils.history.removeObserver(observer);
+
+    Assert.equal(visits_in_database(uri), 0, "History entry has disappeared");
+    Assert.notEqual(visits_in_database(WITNESS_URI), 0, "Witness URI still has visits");
+    Assert.notEqual(page_in_database(WITNESS_URI), 0, "Witness URI is still here");
+    if (shouldRemove) {
+      Assert.ok(removed, "Something was removed");
+      Assert.equal(page_in_database(uri), 0, "Page has disappeared");
+    } else {
+      Assert.ok(!removed, "The page was not removed, as there was a bookmark");
+      Assert.notEqual(page_in_database(uri), 0, "The page is still present");
+    }
+  });
+
+  try {
+    for (let useCallback of [false, true]) {
+      for (let addBookmark of [false, true]) {
+        let options = { useCallback: useCallback, addBookmark: addBookmark };
+        yield remover("Testing History.remove() with a single URI", x => x, options);
+        yield remover("Testing History.remove() with a single string url", x => x.spec, options);
+        yield remover("Testing History.remove() with a single string guid", x => do_get_guid_for_uri(x), options);
+        yield remover("Testing History.remove() with a single URI in an array", x => [x], options);
+        yield remover("Testing History.remove() with a single string url in an array", x => [x.spec], options);
+        yield remover("Testing History.remove() with a single string guid in an array", x => [do_get_guid_for_uri(x)], options);
+      }
+    }
+  } finally {
+    yield promiseClearHistory();
+  }
+  return;
+});
+
+// Test removing a list of pages
+add_task(function* test_remove_many() {
+  const SIZE = 10;
+
+  do_print("Adding a witness page");
+  let WITNESS_URI = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());;
+  yield promiseAddVisits(WITNESS_URI);
+  Assert.ok(page_in_database(WITNESS_URI), "Witness page added");
+
+  do_print("Generating samples");
+  let pages = [];
+  for (let i = 0; i < SIZE; ++i) {
+    let uri = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove?sample=" + i + "&salt=" + Math.random());
+    let title = "Visit " + i + ", " + Math.random();
+    let hasBookmark = i % 3 == 0;
+    let resolve;
+    let page = {
+      uri: uri,
+      title: title,
+      hasBookmark: hasBookmark,
+      // `true` once `onResult` has been called for this page
+      onResultCalled: false,
+      // `true` once `onDeleteVisits` has been called for this page
+      onDeleteVisitsCalled: false,
+      // `true` once `onFrecencyChangedCalled` has been called for this page
+      onFrecencyChangedCalled: false,
+      // `true` once `onDeleteURI` has been called for this page
+      onDeleteURICalled: false,
+    };
+    do_print("Pushing: " + uri.spec);
+    pages.push(page);
+
+    yield promiseAddVisits(page);
+    page.guid = do_get_guid_for_uri(uri);
+    if (hasBookmark) {
+      PlacesUtils.bookmarks.insertBookmark(
+        PlacesUtils.unfiledBookmarksFolderId,
+        uri,
+        PlacesUtils.bookmarks.DEFAULT_INDEX,
+        "test bookmark " + i);
+    }
+    Assert.ok(page_in_database(uri), "Page added");
+  }
+
+  do_print("Mixing key types and introducing dangling keys");
+  let keys = [];
+  for (let i = 0; i < SIZE; ++i) {
+    if (i % 4 == 0) {
+      keys.push(pages[i].uri);
+      keys.push(NetUtil.newURI("http://example.org/dangling/nsIURI/" + i));
+    } else if (i % 4 == 1) {
+      keys.push(new URL(pages[i].uri.spec));
+      keys.push(new URL("http://example.org/dangling/URL/" + i));
+    } else if (i % 4 == 2) {
+      keys.push(pages[i].uri.spec);
+      keys.push("http://example.org/dangling/stringuri/" + i);
+    } else {
+      keys.push(pages[i].guid);
+      keys.push(("guid_" + i + "_01234567890").substr(0, 12));
+    }
+  }
+
+  let observer = {
+    onBeginUpdateBatch: function() {},
+    onEndUpdateBatch: function() {},
+    onVisit: function(aURI) {
+      Assert.ok(false, "Unexpected call to onVisit " + aURI.spec);
+    },
+    onTitleChanged: function(aURI) {
+      Assert.ok(false, "Unexpected call to onTitleChanged " + aURI.spec);
+    },
+    onClearHistory: function() {
+      Assert.ok(false, "Unexpected call to onClearHistory");
+    },
+    onPageChanged: function(aURI) {
+      Assert.ok(false, "Unexpected call to onPageChanged " + aURI.spec);
+    },
+    onFrecencyChanged: function(aURI) {
+      let origin = pages.find(x =>  x.uri.spec == aURI.spec);
+      Assert.ok(origin);
+      Assert.ok(origin.hasBookmark, "Observing onFrecencyChanged on a page with a bookmark");
+      origin.onFrecencyChangedCalled = true;
+      // We do not make sure that `origin.onFrecencyChangedCalled` is `false`, as 
+    },
+    onManyFrecenciesChanged: function() {
+      Assert.ok(false, "Observing onManyFrecenciesChanges, this is most likely correct but not covered by this test");
+    },
+    onDeleteURI: function(aURI) {
+      let origin = pages.find(x => x.uri.spec == aURI.spec);
+      Assert.ok(origin);
+      Assert.ok(!origin.hasBookmark, "Observing onDeleteURI on a page without a bookmark");
+      Assert.ok(!origin.onDeleteURICalled, "Observing onDeleteURI for the first time");
+      origin.onDeleteURICalled = true;
+    },
+    onDeleteVisits: function(aURI) {
+      let origin = pages.find(x => x.uri.spec == aURI.spec);
+      Assert.ok(origin);
+      Assert.ok(!origin.onDeleteVisitsCalled, "Observing onDeleteVisits for the first time");
+      origin.onDeleteVisitsCalled = true;
+    }
+  };
+  PlacesUtils.history.addObserver(observer, false);
+
+  do_print("Removing the pages and checking the callbacks");
+  let removed = yield PlacesUtils.history.remove(keys, page => {
+    let origin = pages.find(candidate => candidate.uri.spec == page.url.href);
+
+    Assert.ok(origin, "onResult has a valid page");
+    Assert.ok(!origin.onResultCalled, "onResult has not seen this page yet");
+    origin.onResultCalled = true;
+    Assert.equal(page.guid, origin.guid, "onResult has the right guid");
+    Assert.equal(page.title, origin.title, "onResult has the right title");
+  });
+  Assert.ok(removed, "Something was removed");
+
+  PlacesUtils.history.removeObserver(observer);
+
+  do_print("Checking out results");
+  // By now the observers should have been called.
+  for (let i = 0; i < pages.length; ++i) {
+    let page = pages[i];
+    do_print("Page: " + i);
+    Assert.ok(page.onResultCalled, "We have reached the page from the callback");
+    Assert.ok(visits_in_database(page.uri) == 0, "History entry has disappeared");
+    Assert.equal(page_in_database(page.uri) != 0, page.hasBookmark, "Page is present only if it also has bookmarks");
+    Assert.equal(page.onFrecencyChangedCalled, page.onDeleteVisitsCalled, "onDeleteVisits was called iff onFrecencyChanged was called");
+    Assert.ok(page.onFrecencyChangedCalled ^ page.onDeleteURICalled, "Either onFrecencyChanged or onDeleteURI was called");
+  }
+
+  Assert.notEqual(visits_in_database(WITNESS_URI), 0, "Witness URI still has visits");
+  Assert.notEqual(page_in_database(WITNESS_URI), 0, "Witness URI is still here");
+
+  do_print("Cleaning up");
+  yield promiseClearHistory();
+
+});
+
+// Test the various error cases
+add_task(function* test_error_cases() {
+  Assert.throws(
+    () =>  PlacesUtils.history.remove(),
+    /TypeError: Invalid url/,
+    "History.remove with no argument should throw a TypeError"
+  );
+  Assert.throws(
+    () =>  PlacesUtils.history.remove(null),
+    /TypeError: Invalid url/,
+    "History.remove with `null` should throw a TypeError"
+  );
+  Assert.throws(
+    () =>  PlacesUtils.history.remove(undefined),
+    /TypeError: Invalid url/,
+    "History.remove with `undefined` should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove("not a guid, obviously"),
+    /TypeError: .* is not a valid URL/,
+    "History.remove with an ill-formed guid/url argument should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove({"not the kind of object we know how to handle": true}),
+    /TypeError: Invalid url/,
+    "History.remove with an unexpected object should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove([]),
+    /TypeError: Expected at least one page/,
+    "History.remove with an empty array should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove([null]),
+    /TypeError: Invalid url or guid/,
+    "History.remove with an array containing null should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove(["http://example.org", "not a guid, obviously"]),
+    /TypeError: .* is not a valid URL/,
+    "History.remove with an array containing an ill-formed guid/url argument should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove(["0123456789ab"/*valid guid*/, null]),
+    /TypeError: Invalid url or guid: null/,
+    "History.remove with an array containing a guid and a second argument that is null should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove(["http://example.org", {"not the kind of object we know how to handle": true}]),
+    /TypeError: Invalid url/,
+    "History.remove with an array containing an unexpected objecgt should throw a TypeError"
+  );
+  Assert.throws(
+    () => PlacesUtils.history.remove("http://example.org", "not a function, obviously"),
+    /TypeError: Invalid function/,
+    "History.remove with a second argument that is not a function argument should throw a TypeError"
+  );
+  try {
+    PlacesUtils.history.remove("http://example.org/I/have/clearly/not/been/added", null);
+    Assert.ok(true, "History.remove should ignore `null` as a second argument");
+  } catch (ex) {
+    Assert.ok(false, "History.remove should ignore `null` as a second argument");
+  }
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/history/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/history/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/history/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/history/xpcshell.ini	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,5 @@
+[DEFAULT]
+head = head_history.js
+tail =
+
+[test_remove.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/moz.build	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/moz.build	2014-11-26 21:46:01.000000000 +0000
@@ -6,17 +6,21 @@
 
 TEST_DIRS += ['cpp']
 
+TESTING_JS_MODULES += [
+    'PlacesTestUtils.jsm',
+]
+
 XPCSHELL_TESTS_MANIFESTS += [
     'autocomplete/xpcshell.ini',
     'bookmarks/xpcshell.ini',
     'expiration/xpcshell.ini',
     'favicons/xpcshell.ini',
+    'history/xpcshell.ini',
     'inline/xpcshell.ini',
     'migration/xpcshell.ini',
     'network/xpcshell.ini',
     'queries/xpcshell.ini',
     'unifiedcomplete/xpcshell.ini',
-    'unit/history/xpcshell.ini',
     'unit/xpcshell.ini',
     'xpcshell.ini',
 ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/PlacesTestUtils.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/PlacesTestUtils.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/PlacesTestUtils.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/PlacesTestUtils.jsm	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,76 @@
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "PlacesTestUtils",
+];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
+
+
+this.PlacesTestUtils = Object.freeze({
+  /**
+   * Asynchronously adds visits to a page.
+   *
+   * @param aPlaceInfo
+   *        Can be an nsIURI, in such a case a single LINK visit will be added.
+   *        Otherwise can be an object describing the visit to add, or an array
+   *        of these objects:
+   *          { uri: nsIURI of the page,
+   *            [optional] transition: one of the TRANSITION_* from nsINavHistoryService,
+   *            [optional] title: title of the page,
+   *            [optional] visitDate: visit date in microseconds from the epoch
+   *            [optional] referrer: nsIURI of the referrer for this visit
+   *          }
+   *
+   * @return {Promise}
+   * @resolves When all visits have been added successfully.
+   * @rejects JavaScript exception.
+   */
+  addVisits(placeInfo) {
+    return new Promise((resolve, reject) => {
+      let places = [];
+      if (placeInfo instanceof Ci.nsIURI) {
+        places.push({ uri: placeInfo });
+      }
+      else if (Array.isArray(placeInfo)) {
+        places = places.concat(placeInfo);
+      } else {
+        places.push(placeInfo)
+      }
+
+      // Create mozIVisitInfo for each entry.
+      let now = Date.now();
+      for (let place of places) {
+        if (typeof place.title != "string") {
+          place.title = "test visit for " + place.uri.spec;
+        }
+        place.visits = [{
+          transitionType: place.transition === undefined ? Ci.nsINavHistoryService.TRANSITION_LINK
+                                                             : place.transition,
+          visitDate: place.visitDate || (now++) * 1000,
+          referrerURI: place.referrer
+        }];
+      }
+
+      PlacesUtils.asyncHistory.updatePlaces(
+        places,
+        {
+          handleError: function AAV_handleError(resultCode, placeInfo) {
+            let ex = new Components.Exception("Unexpected error in adding visits.",
+                                              resultCode);
+            reject(ex);
+          },
+          handleResult: function () {},
+          handleCompletion: function UP_handleCompletion() {
+            resolve();
+          }
+        }
+      );
+    });
+  },
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_avoid_middle_complete.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_avoid_middle_complete.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_avoid_middle_complete.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_avoid_middle_complete.js	2014-11-26 21:46:01.000000000 +0000
@@ -31,6 +31,7 @@
 });
 
 add_task(function* test_searchEngine_autofill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("CakeSearch", "", "", "",
                                        "GET", "http://cake.search/");
   let engine = Services.search.getEngineByName("CakeSearch");
@@ -48,6 +49,7 @@
 });
 
 add_task(function* test_searchEngine_prefix_space_noautofill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("CupcakeSearch", "", "", "",
                                        "GET", "http://cupcake.search/");
   let engine = Services.search.getEngineByName("CupcakeSearch");
@@ -65,6 +67,7 @@
 });
 
 add_task(function* test_searchEngine_trailing_space_noautofill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("BaconSearch", "", "", "",
                                        "GET", "http://bacon.search/");
   let engine = Services.search.getEngineByName("BaconSearch");
@@ -82,6 +85,7 @@
 });
 
 add_task(function* test_searchEngine_www_noautofill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("HamSearch", "", "", "",
                                        "GET", "http://ham.search/");
   let engine = Services.search.getEngineByName("HamSearch");
@@ -99,6 +103,7 @@
 });
 
 add_task(function* test_searchEngine_different_scheme_noautofill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("PieSearch", "", "", "",
                                        "GET", "https://pie.search/");
   let engine = Services.search.getEngineByName("PieSearch");
@@ -116,6 +121,7 @@
 });
 
 add_task(function* test_searchEngine_matching_prefix_autofill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("BeanSearch", "", "", "",
                                        "GET", "http://www.bean.search/");
   let engine = Services.search.getEngineByName("BeanSearch");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_searchEngine_host.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_searchEngine_host.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_searchEngine_host.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_searchEngine_host.js	2014-11-26 21:46:01.000000000 +0000
@@ -38,6 +38,7 @@
 
 
 add_task(function* test_searchEngine_autoFill() {
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", true);
   Services.search.addEngineWithDetails("MySearchEngine", "", "", "",
                                        "GET", "http://my.search.com/");
   let engine = Services.search.getEngineByName("MySearchEngine");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_swap_protocol.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_swap_protocol.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_swap_protocol.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_swap_protocol.js	2014-11-26 21:46:01.000000000 +0000
@@ -40,6 +40,7 @@
 
   // Disable autoFill to avoid handling the first result.
   Services.prefs.setBoolPref("browser.urlbar.autoFill", "false");
+  Services.prefs.setBoolPref("browser.urlbar.autoFill.searchEngines", false);
 
   do_log_info("http://www.site matches all site");
   yield check_autocomplete({
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_tabmatches.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_tabmatches.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unifiedcomplete/test_tabmatches.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unifiedcomplete/test_tabmatches.js	2014-11-26 21:46:01.000000000 +0000
@@ -60,6 +60,23 @@
                { uri: makeActionURI("switchtab", {url: "http://xyz.net/"}), title: "xyz.net - we're better than ABC", style: [ "action", "switchtab" ] } ]
   });
 
+  do_log_info("three results, no tab matches (disable-private-actions)");
+  yield check_autocomplete({
+    search: "abc",
+    searchParam: "enable-actions disable-private-actions",
+    matches: [ { uri: makeActionURI("searchengine", {engineName: "MozSearch", input: "abc", searchQuery: "abc"}), title: "MozSearch", style: [ "action", "searchengine" ] },
+               { uri: uri1, title: "ABC rocks", style: [ "favicon" ] },
+               { uri: uri2, title: "xyz.net - we're better than ABC", style: [ "favicon" ] } ]
+  });
+
+  do_log_info("two results (actions disabled)");
+  yield check_autocomplete({
+    search: "abc",
+    searchParam: "",
+    matches: [ { uri: uri1, title: "ABC rocks", style: [ "favicon" ] },
+               { uri: uri2, title: "xyz.net - we're better than ABC", style: [ "favicon" ] } ]
+  });
+
   do_log_info("three results, no tab matches");
   removeOpenPages(uri1, 1);
   removeOpenPages(uri2, 6);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/history/head_history.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/history/head_history.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/history/head_history.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/history/head_history.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* 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/. */
-
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-const Cr = Components.results;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm");
-
-// Import common head.
-let (commonFile = do_get_file("../../head_common.js", false)) {
-  let uri = Services.io.newFileURI(commonFile);
-  Services.scriptloader.loadSubScript(uri.spec, this);
-};
-
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/history/test_remove.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/history/test_remove.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/history/test_remove.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/history/test_remove.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,342 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* 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/. */
-
-// Tests for `History.remove`, as implemented in History.jsm
-
-"use strict";
-
-Cu.importGlobalProperties(["URL"]);
-
-
-// Test removing a single page
-add_task(function* test_remove_single() {
-  let WITNESS_URI = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());
-  yield promiseAddVisits(WITNESS_URI);
-  Assert.ok(page_in_database(WITNESS_URI));
-
-  let remover = Task.async(function*(name, filter, options) {
-    do_print(name);
-    do_print(JSON.stringify(options));
-    do_print("Setting up visit");
-
-    let uri = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());
-    let title = "Visit " + Math.random();
-    yield promiseAddVisits({uri: uri, title: title});
-    Assert.ok(visits_in_database(uri), "History entry created");
-
-    let removeArg = yield filter(uri);
-
-    if (options.addBookmark) {
-      PlacesUtils.bookmarks.insertBookmark(
-        PlacesUtils.unfiledBookmarksFolderId,
-        uri,
-        PlacesUtils.bookmarks.DEFAULT_INDEX,
-        "test bookmark");
-    }
-
-    let shouldRemove = !options.addBookmark;
-    let observer;
-    let promiseObserved = new Promise((resolve, reject) => {
-      observer = {
-        onBeginUpdateBatch: function() {},
-        onEndUpdateBatch: function() {},
-        onVisit: function(uri) {
-          reject(new Error("Unexpected call to onVisit " + uri.spec));
-        },
-        onTitleChanged: function(uri) {
-          reject(new Error("Unexpected call to onTitleChanged " + uri.spec));
-        },
-        onClearHistory: function() {
-          reject("Unexpected call to onClearHistory");
-        },
-        onPageChanged: function(uri) {
-          reject(new Error("Unexpected call to onPageChanged " + uri.spec));
-        },
-        onFrecencyChanged: function(aURI) {
-          try {
-            Assert.ok(!shouldRemove, "Observing onFrecencyChanged");
-            Assert.equal(aURI.spec, uri.spec, "Observing effect on the right uri");
-          } finally {
-            resolve();
-          }
-        },
-        onManyFrecenciesChanged: function() {
-          try {
-            Assert.ok(!shouldRemove, "Observing onManyFrecenciesChanged");
-          } finally {
-            resolve();
-          }
-        },
-        onDeleteURI: function(aURI) {
-          try {
-            Assert.ok(shouldRemove, "Observing onDeleteURI");
-            Assert.equal(aURI.spec, uri.spec, "Observing effect on the right uri");
-          } finally {
-            resolve();
-          }
-        },
-        onDeleteVisits: function(aURI) {
-          Assert.equal(aURI.spec, uri.spec, "Observing onDeleteVisits on the right uri");
-        }
-      };
-    });
-    PlacesUtils.history.addObserver(observer, false);
-
-    do_print("Performing removal");
-    let removed = false;
-    if (options.useCallback) {
-      let onRowCalled = false;
-      removed = yield PlacesUtils.history.remove(removeArg, page => {
-        Assert.equal(onRowCalled, false, "Callback has not been called yet");
-        onRowCalled = true;
-        Assert.equal(page.url.href, uri.spec, "Callback provides the correct url");
-        Assert.equal(page.guid, do_get_guid_for_uri(uri), "Callback provides the correct guid");
-        Assert.equal(page.title, title, "Callback provides the correct title");
-        Assert.equal(page.frecency, frecencyForUrl(uri), "Callback provides the correct frecency");
-      });
-      Assert.ok(onRowCalled, "Callback has been called");
-    } else {
-      removed = yield PlacesUtils.history.remove(removeArg);
-    }
-
-    yield promiseObserved;
-    PlacesUtils.history.removeObserver(observer);
-
-    Assert.equal(visits_in_database(uri), 0, "History entry has disappeared");
-    Assert.notEqual(visits_in_database(WITNESS_URI), 0, "Witness URI still has visits");
-    Assert.notEqual(page_in_database(WITNESS_URI), 0, "Witness URI is still here");
-    if (shouldRemove) {
-      Assert.ok(removed, "Something was removed");
-      Assert.equal(page_in_database(uri), 0, "Page has disappeared");
-    } else {
-      Assert.ok(!removed, "The page was not removed, as there was a bookmark");
-      Assert.notEqual(page_in_database(uri), 0, "The page is still present");
-    }
-  });
-
-  try {
-    for (let useCallback of [false, true]) {
-      for (let addBookmark of [false, true]) {
-        let options = { useCallback: useCallback, addBookmark: addBookmark };
-        yield remover("Testing History.remove() with a single URI", x => x, options);
-        yield remover("Testing History.remove() with a single string url", x => x.spec, options);
-        yield remover("Testing History.remove() with a single string guid", x => do_get_guid_for_uri(x), options);
-        yield remover("Testing History.remove() with a single URI in an array", x => [x], options);
-        yield remover("Testing History.remove() with a single string url in an array", x => [x.spec], options);
-        yield remover("Testing History.remove() with a single string guid in an array", x => [do_get_guid_for_uri(x)], options);
-      }
-    }
-  } finally {
-    yield promiseClearHistory();
-  }
-  return;
-});
-
-// Test removing a list of pages
-add_task(function* test_remove_many() {
-  const SIZE = 10;
-
-  do_print("Adding a witness page");
-  let WITNESS_URI = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove/" + Math.random());;
-  yield promiseAddVisits(WITNESS_URI);
-  Assert.ok(page_in_database(WITNESS_URI), "Witness page added");
-
-  do_print("Generating samples");
-  let pages = [];
-  for (let i = 0; i < SIZE; ++i) {
-    let uri = NetUtil.newURI("http://mozilla.com/test_browserhistory/test_remove?sample=" + i + "&salt=" + Math.random());
-    let title = "Visit " + i + ", " + Math.random();
-    let hasBookmark = i % 3 == 0;
-    let resolve;
-    let page = {
-      uri: uri,
-      title: title,
-      hasBookmark: hasBookmark,
-      // `true` once `onResult` has been called for this page
-      onResultCalled: false,
-      // `true` once `onDeleteVisits` has been called for this page
-      onDeleteVisitsCalled: false,
-      // `true` once `onFrecencyChangedCalled` has been called for this page
-      onFrecencyChangedCalled: false,
-      // `true` once `onDeleteURI` has been called for this page
-      onDeleteURICalled: false,
-    };
-    do_print("Pushing: " + uri.spec);
-    pages.push(page);
-
-    yield promiseAddVisits(page);
-    page.guid = do_get_guid_for_uri(uri);
-    if (hasBookmark) {
-      PlacesUtils.bookmarks.insertBookmark(
-        PlacesUtils.unfiledBookmarksFolderId,
-        uri,
-        PlacesUtils.bookmarks.DEFAULT_INDEX,
-        "test bookmark " + i);
-    }
-    Assert.ok(page_in_database(uri), "Page added");
-  }
-
-  do_print("Mixing key types and introducing dangling keys");
-  let keys = [];
-  for (let i = 0; i < SIZE; ++i) {
-    if (i % 4 == 0) {
-      keys.push(pages[i].uri);
-      keys.push(NetUtil.newURI("http://example.org/dangling/nsIURI/" + i));
-    } else if (i % 4 == 1) {
-      keys.push(new URL(pages[i].uri.spec));
-      keys.push(new URL("http://example.org/dangling/URL/" + i));
-    } else if (i % 4 == 2) {
-      keys.push(pages[i].uri.spec);
-      keys.push("http://example.org/dangling/stringuri/" + i);
-    } else {
-      keys.push(pages[i].guid);
-      keys.push(("guid_" + i + "_01234567890").substr(0, 12));
-    }
-  }
-
-  let observer = {
-    onBeginUpdateBatch: function() {},
-    onEndUpdateBatch: function() {},
-    onVisit: function(aURI) {
-      Assert.ok(false, "Unexpected call to onVisit " + aURI.spec);
-    },
-    onTitleChanged: function(aURI) {
-      Assert.ok(false, "Unexpected call to onTitleChanged " + aURI.spec);
-    },
-    onClearHistory: function() {
-      Assert.ok(false, "Unexpected call to onClearHistory");
-    },
-    onPageChanged: function(aURI) {
-      Assert.ok(false, "Unexpected call to onPageChanged " + aURI.spec);
-    },
-    onFrecencyChanged: function(aURI) {
-      let origin = pages.find(x =>  x.uri.spec == aURI.spec);
-      Assert.ok(origin);
-      Assert.ok(origin.hasBookmark, "Observing onFrecencyChanged on a page with a bookmark");
-      origin.onFrecencyChangedCalled = true;
-      // We do not make sure that `origin.onFrecencyChangedCalled` is `false`, as 
-    },
-    onManyFrecenciesChanged: function() {
-      Assert.ok(false, "Observing onManyFrecenciesChanges, this is most likely correct but not covered by this test");
-    },
-    onDeleteURI: function(aURI) {
-      let origin = pages.find(x => x.uri.spec == aURI.spec);
-      Assert.ok(origin);
-      Assert.ok(!origin.hasBookmark, "Observing onDeleteURI on a page without a bookmark");
-      Assert.ok(!origin.onDeleteURICalled, "Observing onDeleteURI for the first time");
-      origin.onDeleteURICalled = true;
-    },
-    onDeleteVisits: function(aURI) {
-      let origin = pages.find(x => x.uri.spec == aURI.spec);
-      Assert.ok(origin);
-      Assert.ok(!origin.onDeleteVisitsCalled, "Observing onDeleteVisits for the first time");
-      origin.onDeleteVisitsCalled = true;
-    }
-  };
-  PlacesUtils.history.addObserver(observer, false);
-
-  do_print("Removing the pages and checking the callbacks");
-  let removed = yield PlacesUtils.history.remove(keys, page => {
-    let origin = pages.find(candidate => candidate.uri.spec == page.url.href);
-
-    Assert.ok(origin, "onResult has a valid page");
-    Assert.ok(!origin.onResultCalled, "onResult has not seen this page yet");
-    origin.onResultCalled = true;
-    Assert.equal(page.guid, origin.guid, "onResult has the right guid");
-    Assert.equal(page.title, origin.title, "onResult has the right title");
-  });
-  Assert.ok(removed, "Something was removed");
-
-  PlacesUtils.history.removeObserver(observer);
-
-  do_print("Checking out results");
-  // By now the observers should have been called.
-  for (let i = 0; i < pages.length; ++i) {
-    let page = pages[i];
-    do_print("Page: " + i);
-    Assert.ok(page.onResultCalled, "We have reached the page from the callback");
-    Assert.ok(visits_in_database(page.uri) == 0, "History entry has disappeared");
-    Assert.equal(page_in_database(page.uri) != 0, page.hasBookmark, "Page is present only if it also has bookmarks");
-    Assert.equal(page.onFrecencyChangedCalled, page.onDeleteVisitsCalled, "onDeleteVisits was called iff onFrecencyChanged was called");
-    Assert.ok(page.onFrecencyChangedCalled ^ page.onDeleteURICalled, "Either onFrecencyChanged or onDeleteURI was called");
-  }
-
-  Assert.notEqual(visits_in_database(WITNESS_URI), 0, "Witness URI still has visits");
-  Assert.notEqual(page_in_database(WITNESS_URI), 0, "Witness URI is still here");
-
-  do_print("Cleaning up");
-  yield promiseClearHistory();
-
-});
-
-// Test the various error cases
-add_task(function* test_error_cases() {
-  Assert.throws(
-    () =>  PlacesUtils.history.remove(),
-    /TypeError: Invalid url/,
-    "History.remove with no argument should throw a TypeError"
-  );
-  Assert.throws(
-    () =>  PlacesUtils.history.remove(null),
-    /TypeError: Invalid url/,
-    "History.remove with `null` should throw a TypeError"
-  );
-  Assert.throws(
-    () =>  PlacesUtils.history.remove(undefined),
-    /TypeError: Invalid url/,
-    "History.remove with `undefined` should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove("not a guid, obviously"),
-    /TypeError: .* is not a valid URL/,
-    "History.remove with an ill-formed guid/url argument should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove({"not the kind of object we know how to handle": true}),
-    /TypeError: Invalid url/,
-    "History.remove with an unexpected object should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove([]),
-    /TypeError: Expected at least one page/,
-    "History.remove with an empty array should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove([null]),
-    /TypeError: Invalid url or guid/,
-    "History.remove with an array containing null should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove(["http://example.org", "not a guid, obviously"]),
-    /TypeError: .* is not a valid URL/,
-    "History.remove with an array containing an ill-formed guid/url argument should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove(["0123456789ab"/*valid guid*/, null]),
-    /TypeError: Invalid url or guid: null/,
-    "History.remove with an array containing a guid and a second argument that is null should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove(["http://example.org", {"not the kind of object we know how to handle": true}]),
-    /TypeError: Invalid url/,
-    "History.remove with an array containing an unexpected objecgt should throw a TypeError"
-  );
-  Assert.throws(
-    () => PlacesUtils.history.remove("http://example.org", "not a function, obviously"),
-    /TypeError: Invalid function/,
-    "History.remove with a second argument that is not a function argument should throw a TypeError"
-  );
-  try {
-    PlacesUtils.history.remove("http://example.org/I/have/clearly/not/been/added", null);
-    Assert.ok(true, "History.remove should ignore `null` as a second argument");
-  } catch (ex) {
-    Assert.ok(false, "History.remove should ignore `null` as a second argument");
-  }
-});
-
-function run_test() {
-  run_next_test();
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/history/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/history/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/history/xpcshell.ini	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/history/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[DEFAULT]
-head = head_history.js
-tail =
-
-[test_remove.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/nsDummyObserver.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/nsDummyObserver.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/nsDummyObserver.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/nsDummyObserver.js	2014-11-26 21:46:01.000000000 +0000
@@ -3,15 +3,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 // Dummy boomark/history observer
 function DummyObserver() {
-  let os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.notifyObservers(null, "dummy-observer-created", null);
+  Services.obs.notifyObservers(null, "dummy-observer-created", null);
 }
 
 DummyObserver.prototype = {
@@ -19,9 +18,7 @@
   onBeginUpdateBatch: function () {},
   onEndUpdateBatch: function () {},
   onVisit: function (aURI, aVisitID, aTime, aSessionID, aReferringID, aTransitionType) {
-    let os = Cc["@mozilla.org/observer-service;1"].
-             getService(Ci.nsIObserverService);
-    os.notifyObservers(null, "dummy-observer-visited", null);
+    Services.obs.notifyObservers(null, "dummy-observer-visited", null);
   },
   onTitleChanged: function () {},
   onDeleteURI: function () {},
@@ -33,9 +30,7 @@
   //onBeginUpdateBatch: function() {},
   //onEndUpdateBatch: function() {},
   onItemAdded: function(aItemId, aParentId, aIndex, aItemType, aURI) {
-    let os = Cc["@mozilla.org/observer-service;1"].
-             getService(Ci.nsIObserverService);
-    os.notifyObservers(null, "dummy-observer-item-added", null);
+    Services.obs.notifyObservers(null, "dummy-observer-item-added", null);
   },
   onItemChanged: function () {},
   onItemRemoved: function() {},
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_1085291.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_1085291.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_1085291.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_1085291.js	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,42 @@
+add_task(function* () {
+  // test that nodes inserted by incremental update for bookmarks of all types
+  // have the extra bookmark properties (bookmarkGuid, dateAdded, lastModified).
+
+  // getFolderContents opens the root node.
+  let root = PlacesUtils.getFolderContents(PlacesUtils.toolbarFolderId).root;
+
+  function* insertAndTest(bmInfo) {
+    bmInfo = yield PlacesUtils.bookmarks.insert(bmInfo);
+    let node = root.getChild(root.childCount - 1);
+    Assert.equal(node.bookmarkGuid, bmInfo.guid);
+    Assert.equal(node.dateAdded, bmInfo.dateAdded * 1000);
+    Assert.equal(node.lastModified, bmInfo.lastModified * 1000);
+  }
+
+  // Normal bookmark.
+  yield insertAndTest({ parentGuid: root.bookmarkGuid
+                      , type: PlacesUtils.bookmarks.TYPE_BOOKMARK
+                      , title: "Test Bookmark"
+                      , url: "http://test.url.tld" });
+
+  // place: query
+  yield insertAndTest({ parentGuid: root.bookmarkGuid
+                      , type: PlacesUtils.bookmarks.TYPE_BOOKMARK
+                      , title: "Test Query"
+                      , url: "place:folder=BOOKMARKS_MENU" });
+
+  // folder
+  yield insertAndTest({ parentGuid: root.bookmarkGuid
+                      , type: PlacesUtils.bookmarks.TYPE_FOLDER
+                      , title: "Test Folder" });
+
+  // separator
+  yield insertAndTest({ parentGuid: root.bookmarkGuid
+                      , type: PlacesUtils.bookmarks.TYPE_SEPARATOR });
+
+  root.containerOpen = false;
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_async_transactions.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_async_transactions.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_async_transactions.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_async_transactions.js	2014-11-26 21:46:01.000000000 +0000
@@ -4,10 +4,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/. */
 
-const bmsvc   = PlacesUtils.bookmarks;
-const tagssvc = PlacesUtils.tagging;
-const annosvc = PlacesUtils.annotations;
-const PT      = PlacesTransactions;
+const bmsvc    = PlacesUtils.bookmarks;
+const tagssvc  = PlacesUtils.tagging;
+const annosvc  = PlacesUtils.annotations;
+const PT       = PlacesTransactions;
+const rootGuid = PlacesUtils.bookmarks.rootGuid;
 
 Components.utils.importGlobalProperties(["URL"]);
 
@@ -106,9 +107,6 @@
 // index at which items should begin
 let bmStartIndex = 0;
 
-// get bookmarks root id
-let root = PlacesUtils.bookmarksMenuFolderId;
-
 function run_test() {
   bmsvc.addObserver(observer, false);
   do_register_cleanup(function () {
@@ -248,9 +246,8 @@
   do_check_true(aTags.every( t => tagsSet.indexOf(t) != -1 ));
 }
 
-function* createTestFolderInfo(aTitle = "Test Folder") {
-  return { parentGuid: yield PlacesUtils.promiseItemGuid(root)
-         , title: "Test Folder" };
+function createTestFolderInfo(aTitle = "Test Folder") {
+  return { parentGuid: rootGuid, title: "Test Folder" };
 }
 
 function isLivemarkTree(aTree) {
@@ -315,10 +312,12 @@
     yield ensureLivemarkCreatedByAddLivemark(aNew.guid);
 }
 
-function* ensureBookmarksTreeRestoredCorrectly(aOriginalBookmarksTree) {
-  let restoredTree =
-    yield PlacesUtils.promiseBookmarksTree(aOriginalBookmarksTree.guid);
-  yield ensureEqualBookmarksTrees(aOriginalBookmarksTree, restoredTree);
+function* ensureBookmarksTreeRestoredCorrectly(...aOriginalBookmarksTrees) {
+  for (let originalTree of aOriginalBookmarksTrees) {
+    let restoredTree =
+      yield PlacesUtils.promiseBookmarksTree(originalTree.guid);
+    yield ensureEqualBookmarksTrees(originalTree, restoredTree);
+  }
 }
 
 function* ensureNonExistent(...aGuids) {
@@ -338,7 +337,7 @@
     ensureUndoState(txns, undoPosition);
   }
 
-  let txn_a = PT.NewFolder(yield createTestFolderInfo());
+  let txn_a = PT.NewFolder(createTestFolderInfo());
   yield txn_a.transact();
   ensureUndoState([[txn_a]], 0);
   yield ensureTransactThrowsFor(txn_a);
@@ -351,7 +350,7 @@
   ensureUndoState();
   ensureTransactThrowsFor(txn_a);
 
-  let txn_b = PT.NewFolder(yield createTestFolderInfo());
+  let txn_b = PT.NewFolder(createTestFolderInfo());
   yield PT.batch(function* () {
     try {
       yield txn_a.transact();
@@ -375,7 +374,7 @@
 
 add_task(function* test_new_folder_with_annotation() {
   const ANNO = { name: "TestAnno", value: "TestValue" };
-  let folder_info = yield createTestFolderInfo();
+  let folder_info = createTestFolderInfo();
   folder_info.index = bmStartIndex;
   folder_info.annotations = [ANNO];
   ensureUndoState();
@@ -410,7 +409,7 @@
 });
 
 add_task(function* test_new_bookmark() {
-  let bm_info = { parentGuid: yield PlacesUtils.promiseItemGuid(root)
+  let bm_info = { parentGuid: rootGuid
                 , url:        NetUtil.newURI("http://test_create_item.com")
                 , index:      bmStartIndex
                 , title:      "Test creating an item" };
@@ -447,7 +446,7 @@
 });
 
 add_task(function* test_merge_create_folder_and_item() {
-  let folder_info = yield createTestFolderInfo();
+  let folder_info = createTestFolderInfo();
   let bm_info = { url: NetUtil.newURI("http://test_create_item_to_folder.com")
                 , title: "Test Bookmark"
                 , index: bmStartIndex };
@@ -485,7 +484,7 @@
 });
 
 add_task(function* test_move_items_to_folder() {
-  let folder_a_info = yield createTestFolderInfo("Folder A");
+  let folder_a_info = createTestFolderInfo("Folder A");
   let bkm_a_info = { url: new URL("http://test_move_items.com")
                    , title: "Bookmark A" };
   let bkm_b_info = { url: NetUtil.newURI("http://test_move_items.com")
@@ -541,7 +540,7 @@
   ensureUndoState([[bkm_b_txn, bkm_a_txn, folder_a_txn]], 0);
 
   // Test moving items between folders.
-  let folder_b_info = yield createTestFolderInfo("Folder B");
+  let folder_b_info = createTestFolderInfo("Folder B");
   let folder_b_txn = PT.NewFolder(folder_b_info);
   folder_b_info.guid = yield folder_b_txn.transact();
   ensureUndoState([ [folder_b_txn]
@@ -595,7 +594,7 @@
 });
 
 add_task(function* test_remove_folder() {
-  let folder_level_1_info = yield createTestFolderInfo("Folder Level 1");
+  let folder_level_1_info = createTestFolderInfo("Folder Level 1");
   let folder_level_2_info = { title: "Folder Level 2" };
   let [folder_level_1_txn,
        folder_level_2_txn] = yield PT.batch(function* () {
@@ -688,7 +687,7 @@
       , POST_DATA = "post_data"
       , ANNO = { name: "TestAnno", value: "TestAnnoValue" };
 
-  let folder_info = yield createTestFolderInfo();
+  let folder_info = createTestFolderInfo();
   folder_info.guid = yield PT.NewFolder(folder_info).transact();
   let ensureTags = ensureTagsForURI.bind(null, testURI);
 
@@ -803,7 +802,7 @@
 });
 
 add_task(function* test_creating_and_removing_a_separator() {
-  let folder_info = yield createTestFolderInfo();
+  let folder_info = createTestFolderInfo();
   let separator_info = {};
   let undoEntries = [];
 
@@ -872,7 +871,7 @@
 add_task(function* test_add_and_remove_livemark() {
   let createLivemarkTxn = PT.NewLivemark(
     { feedUrl: NetUtil.newURI("http://test.remove.livemark")
-    , parentGuid: yield PlacesUtils.promiseItemGuid(root)
+    , parentGuid: rootGuid
     , title: "Test Remove Livemark" });
   let guid = yield createLivemarkTxn.transact();
   let originalInfo = yield PlacesUtils.promiseBookmarksTree(guid);
@@ -913,7 +912,7 @@
 });
 
 add_task(function* test_edit_title() {
-  let bm_info = { parentGuid: yield PlacesUtils.promiseItemGuid(root)
+  let bm_info = { parentGuid: rootGuid
                 , url:        NetUtil.newURI("http://test_create_item.com")
                 , title:      "Original Title" };
 
@@ -951,10 +950,7 @@
 add_task(function* test_edit_url() {
   let oldURI = NetUtil.newURI("http://old.test_editing_item_uri.com/");
   let newURI = NetUtil.newURI("http://new.test_editing_item_uri.com/");
-  let bm_info = { parentGuid: yield PlacesUtils.promiseItemGuid(root)
-                , url:        oldURI
-                , tags:       ["TestTag"]};
-
+  let bm_info = { parentGuid: rootGuid, url: oldURI, tags: ["TestTag"] };
   function ensureURIAndTags(aPreChangeURI, aPostChangeURI, aOLdURITagsPreserved) {
     ensureItemsChanged({ guid: bm_info.guid
                        , property: "uri"
@@ -1016,8 +1012,8 @@
 });
 
 add_task(function* test_edit_keyword() {
-  let bm_info = { parentGuid: yield PlacesUtils.promiseItemGuid(root)
-                , url:        NetUtil.newURI("http://test.edit.keyword") };
+  let bm_info = { parentGuid: rootGuid
+                , url: NetUtil.newURI("http://test.edit.keyword") };
   const KEYWORD = "test_keyword";
   bm_info.guid = yield PT.NewBookmark(bm_info).transact();
   function ensureKeywordChange(aCurrentKeyword = "") {
@@ -1054,9 +1050,9 @@
 add_task(function* test_tag_uri() {
   // This also tests passing uri specs.
   let bm_info_a = { url: "http://bookmarked.uri"
-                  , parentGuid: yield PlacesUtils.promiseItemGuid(root) };
+                  , parentGuid: rootGuid };
   let bm_info_b = { url: NetUtil.newURI("http://bookmarked2.uri")
-                  , parentGuid: yield PlacesUtils.promiseItemGuid(root) };
+                  , parentGuid: rootGuid };
   let unbookmarked_uri = NetUtil.newURI("http://un.bookmarked.uri");
 
   function* promiseIsBookmarked(aURI) {
@@ -1128,10 +1124,10 @@
 
 add_task(function* test_untag_uri() {
   let bm_info_a = { url: NetUtil.newURI("http://bookmarked.uri")
-                  , parentGuid: yield PlacesUtils.promiseItemGuid(root)
+                  , parentGuid: rootGuid
                   , tags: ["A", "B"] };
   let bm_info_b = { url: NetUtil.newURI("http://bookmarked2.uri")
-                  , parentGuid: yield PlacesUtils.promiseItemGuid(root)
+                  , parentGuid: rootGuid
                   , tag: "B" };
 
   yield PT.batch(function* () {
@@ -1206,7 +1202,7 @@
 
 add_task(function* test_annotate() {
   let bm_info = { url: NetUtil.newURI("http://test.item.annotation")
-                , parentGuid: yield PlacesUtils.promiseItemGuid(root) };
+                , parentGuid: rootGuid };
   let anno_info = { name: "TestAnno", value: "TestValue" };
   function ensureAnnoState(aSet) {
     ensureAnnotationsSet(bm_info.guid,
@@ -1248,7 +1244,7 @@
 });
 
 add_task(function* test_annotate_multiple() {
-  let guid = yield PT.NewFolder(yield createTestFolderInfo()).transact();
+  let guid = yield PT.NewFolder(createTestFolderInfo()).transact();
   let itemId = yield PlacesUtils.promiseItemId(guid);
 
   function AnnoObj(aName, aValue) {
@@ -1302,7 +1298,7 @@
 });
 
 add_task(function* test_sort_folder_by_name() {
-  let folder_info = yield createTestFolderInfo();
+  let folder_info = createTestFolderInfo();
 
   let url = NetUtil.newURI("http://sort.by.name/");
   let preSep =  [{ title: i, url } for (i of ["3","2","1"])];
@@ -1349,7 +1345,7 @@
 add_task(function* test_livemark_txns() {
   let livemark_info =
     { feedUrl: NetUtil.newURI("http://test.feed.uri")
-    , parentGuid: yield PlacesUtils.promiseItemGuid(root)
+    , parentGuid: rootGuid
     , title: "Test Livemark" };
   function ensureLivemarkAdded() {
     ensureItemsAdded({ guid:       livemark_info.guid
@@ -1396,11 +1392,9 @@
 });
 
 add_task(function* test_copy() {
-  let rootGuid = yield PlacesUtils.promiseItemGuid(root);
-
   function* duplicate_and_test(aOriginalGuid) {
-    yield duplicateGuid =
-      yield PT.Copy({ guid: aOriginalGuid, newParentGuid: rootGuid }).transact();
+    let txn = PT.Copy({ guid: aOriginalGuid, newParentGuid: rootGuid });
+    yield duplicateGuid = yield txn.transact();
     let originalInfo = yield PlacesUtils.promiseBookmarksTree(aOriginalGuid);
     let duplicateInfo = yield PlacesUtils.promiseBookmarksTree(duplicateGuid);
     yield ensureEqualBookmarksTrees(originalInfo, duplicateInfo, false);
@@ -1436,9 +1430,9 @@
   let sepTxn = PT.NewSeparator({ parentGuid: rootGuid, index: 1 });
   let livemarkTxn = PT.NewLivemark(
     { feedUrl: new URL("http://test.feed.uri")
-    , parentGuid: yield PlacesUtils.promiseItemGuid(root)
+    , parentGuid: rootGuid
     , title: "Test Livemark", index: 1 });
-  let emptyFolderTxn = PT.NewFolder(yield createTestFolderInfo());
+  let emptyFolderTxn = PT.NewFolder(createTestFolderInfo());
   for (let txn of [livemarkTxn, sepTxn, emptyFolderTxn]) {
     let guid = yield txn.transact();
     yield duplicate_and_test(guid);
@@ -1446,8 +1440,7 @@
 
   // Test duplicating a folder having some contents.
   let filledFolderGuid = yield PT.batch(function *() {
-    let folderGuid =
-      yield PT.NewFolder(yield createTestFolderInfo()).transact();
+    let folderGuid = yield PT.NewFolder(createTestFolderInfo()).transact();
     let nestedFolderGuid =
       yield PT.NewFolder({ parentGuid: folderGuid
                          , title: "Nested Folder" }).transact();
@@ -1469,9 +1462,7 @@
 });
 
 add_task(function* test_array_input_for_batch() {
-  let rootGuid = yield PlacesUtils.promiseItemGuid(root);
-
-  let folderTxn = PT.NewFolder(yield createTestFolderInfo());
+  let folderTxn = PT.NewFolder(createTestFolderInfo());
   let folderGuid = yield folderTxn.transact();
 
   let sep1_txn = PT.NewSeparator({ parentGuid: folderGuid });
@@ -1503,9 +1494,7 @@
 });
 
 add_task(function* test_copy_excluding_annotations() {
-  let rootGuid = yield PlacesUtils.promiseItemGuid(root);
-
-  let folderInfo = yield createTestFolderInfo();
+  let folderInfo = createTestFolderInfo();
   let anno = n => { return { name: n, value: 1 } };
   folderInfo.annotations = [anno("a"), anno("b"), anno("c")];
   let folderGuid = yield PT.NewFolder(folderInfo).transact();
@@ -1539,7 +1528,6 @@
 });
 
 add_task(function* test_invalid_uri_spec_throws() {
-  let rootGuid = yield PlacesUtils.promiseItemGuid(root);
   Assert.throws(() =>
     PT.NewBookmark({ parentGuid: rootGuid
                    , url:        "invalid uri spec"
@@ -1551,3 +1539,120 @@
     PT.Tag({ tag: "TheTag"
            , urls: ["about:blank", "invalid uri spec"] }));
 });
+
+add_task(function* test_annotate_multiple_items() {
+  let parentGuid = rootGuid;
+  let guids = [
+    yield PT.NewBookmark({ url: "about:blank", parentGuid }).transact(),
+    yield PT.NewFolder({ title: "Test Folder", parentGuid }).transact()];
+
+  let annotation = { name: "TestAnno", value: "TestValue" };
+  yield PT.Annotate({ guids, annotation }).transact();
+
+  function *ensureAnnoSet() {
+    for (let guid of guids) {
+      let itemId = yield PlacesUtils.promiseItemId(guid);
+      Assert.equal(annosvc.getItemAnnotation(itemId, annotation.name),
+                   annotation.value);
+    }
+  }
+  function *ensureAnnoUnset() {
+    for (let guid of guids) {
+      let itemId = yield PlacesUtils.promiseItemId(guid);
+      Assert.ok(!annosvc.itemHasAnnotation(itemId, annotation.name));
+    }
+  }
+
+  yield ensureAnnoSet();
+  yield PT.undo();
+  yield ensureAnnoUnset();
+  yield PT.redo();
+  yield ensureAnnoSet();
+  yield PT.undo();
+  yield ensureAnnoUnset();
+
+  // Cleanup
+  yield PT.undo();
+  yield PT.undo();
+  yield ensureNonExistent(...guids);
+  yield PT.clearTransactionsHistory();
+  observer.reset();
+});
+
+add_task(function* test_remove_multiple() {
+  let guids = [];
+  yield PT.batch(function* () {
+    let folderGuid = yield PT.NewFolder({ title: "Test Folder"
+                                        , parentGuid: rootGuid }).transact();
+    let nestedFolderGuid =
+      yield PT.NewFolder({ title: "Nested Test Folder"
+                         , parentGuid: folderGuid }).transact();
+    let nestedSepGuid = yield PT.NewSeparator(nestedFolderGuid).transact();
+
+    guids.push(folderGuid);
+
+    let bmGuid =
+      yield PT.NewBookmark({ url: new URL("http://test.bookmark.removed")
+                           , parentGuid: rootGuid }).transact();
+    guids.push(bmGuid);
+  });
+
+  let originalInfos = [for (guid of guids)
+                       yield PlacesUtils.promiseBookmarksTree(guid)];
+
+  yield PT.Remove(guids).transact();
+  yield ensureNonExistent(...guids);
+  yield PT.undo();
+  yield ensureBookmarksTreeRestoredCorrectly(...originalInfos);
+  yield PT.redo();
+  yield ensureNonExistent(...guids);
+  yield PT.undo();
+  yield ensureBookmarksTreeRestoredCorrectly(...originalInfos);
+
+  // Undo the New* transactions batch.
+  yield PT.undo();
+  yield ensureNonExistent(...guids);
+
+  // Redo it.
+  yield PT.redo();
+  yield ensureBookmarksTreeRestoredCorrectly(...originalInfos);
+
+  // Redo remove.
+  yield PT.redo();
+  yield ensureNonExistent(...guids);
+
+  // Cleanup
+  yield PT.clearTransactionsHistory();
+  observer.reset();
+});
+
+add_task(function* test_remove_bookmarks_for_urls() {
+  let urls = [new URL("http://test.url.1"), new URL("http://test.url.2")];
+  let guids = [];
+  yield PT.batch(function* () {
+    for (let url of urls) {
+      for (let title of ["test title a", "test title b"]) {
+        let txn = PT.NewBookmark({ url, title, parentGuid: rootGuid });
+        guids.push(yield txn.transact());
+      }
+    }
+  });
+
+  let originalInfos = [for (guid of guids)
+                       yield PlacesUtils.promiseBookmarksTree(guid)];
+
+  yield PT.RemoveBookmarksForUrls(urls).transact();
+  yield ensureNonExistent(...guids);
+  yield PT.undo();
+  yield ensureBookmarksTreeRestoredCorrectly(...originalInfos);
+  yield PT.redo();
+  yield ensureNonExistent(...guids);
+  yield PT.undo();
+  yield ensureBookmarksTreeRestoredCorrectly(...originalInfos);
+
+  // Cleanup.
+  yield PT.redo();
+  yield ensureNonExistent(...guids);
+  yield PT.clearTransactionsHistory();
+  observer.reset();
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_browserhistory.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_browserhistory.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_browserhistory.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_browserhistory.js	2014-11-26 21:46:01.000000000 +0000
@@ -7,67 +7,59 @@
 const TEST_URI = NetUtil.newURI("http://mozilla.com/");
 const TEST_SUBDOMAIN_URI = NetUtil.newURI("http://foobar.mozilla.com/");
 
-add_test(function test_addPage()
-{
-  promiseAddVisits(TEST_URI).then(function () {
-    do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
-    run_next_test();
-  });
+add_task(function* test_addPage() {
+  yield promiseAddVisits(TEST_URI);
+  do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
 });
 
-add_test(function test_removePage()
-{
+add_task(function* test_removePage() {
   PlacesUtils.bhistory.removePage(TEST_URI);
   do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
-  run_next_test();
 });
 
-add_test(function test_removePages()
-{
+add_task(function* test_removePages() {
   let pages = [];
   for (let i = 0; i < 8; i++) {
     pages.push(NetUtil.newURI(TEST_URI.spec + i));
   }
 
-  promiseAddVisits(pages.map(function (uri) ({ uri: uri }))).then(function () {
-    // Bookmarked item should not be removed from moz_places.
-    const ANNO_INDEX = 1;
-    const ANNO_NAME = "testAnno";
-    const ANNO_VALUE = "foo";
-    const BOOKMARK_INDEX = 2;
-    PlacesUtils.annotations.setPageAnnotation(pages[ANNO_INDEX],
-                                              ANNO_NAME, ANNO_VALUE, 0,
-                                              Ci.nsIAnnotationService.EXPIRE_NEVER);
-    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                         pages[BOOKMARK_INDEX],
-                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                         "test bookmark");
-    PlacesUtils.annotations.setPageAnnotation(pages[BOOKMARK_INDEX],
-                                              ANNO_NAME, ANNO_VALUE, 0,
-                                              Ci.nsIAnnotationService.EXPIRE_NEVER);
-  
-    PlacesUtils.bhistory.removePages(pages, pages.length);
-    do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
-  
-    // Check that the bookmark and its annotation still exist.
-    do_check_true(PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.unfiledBookmarksFolderId, 0) > 0);
-    do_check_eq(PlacesUtils.annotations.getPageAnnotation(pages[BOOKMARK_INDEX], ANNO_NAME),
-                ANNO_VALUE);
-  
-    // Check the annotation on the non-bookmarked page does not exist anymore.
-    try {
-      PlacesUtils.annotations.getPageAnnotation(pages[ANNO_INDEX], ANNO_NAME);
-      do_throw("did not expire expire_never anno on a not bookmarked item");
-    } catch(ex) {}
-  
-    // Cleanup.
-    PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
-    promiseClearHistory().then(run_next_test);
-  });
+  yield promiseAddVisits(pages.map(function (uri) ({ uri: uri })));
+  // Bookmarked item should not be removed from moz_places.
+  const ANNO_INDEX = 1;
+  const ANNO_NAME = "testAnno";
+  const ANNO_VALUE = "foo";
+  const BOOKMARK_INDEX = 2;
+  PlacesUtils.annotations.setPageAnnotation(pages[ANNO_INDEX],
+                                            ANNO_NAME, ANNO_VALUE, 0,
+                                            Ci.nsIAnnotationService.EXPIRE_NEVER);
+  PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                       pages[BOOKMARK_INDEX],
+                                       PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                       "test bookmark");
+  PlacesUtils.annotations.setPageAnnotation(pages[BOOKMARK_INDEX],
+                                            ANNO_NAME, ANNO_VALUE, 0,
+                                            Ci.nsIAnnotationService.EXPIRE_NEVER);
+
+  PlacesUtils.bhistory.removePages(pages, pages.length);
+  do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
+
+  // Check that the bookmark and its annotation still exist.
+  do_check_true(PlacesUtils.bookmarks.getIdForItemAt(PlacesUtils.unfiledBookmarksFolderId, 0) > 0);
+  do_check_eq(PlacesUtils.annotations.getPageAnnotation(pages[BOOKMARK_INDEX], ANNO_NAME),
+              ANNO_VALUE);
+
+  // Check the annotation on the non-bookmarked page does not exist anymore.
+  try {
+    PlacesUtils.annotations.getPageAnnotation(pages[ANNO_INDEX], ANNO_NAME);
+    do_throw("did not expire expire_never anno on a not bookmarked item");
+  } catch(ex) {}
+
+  // Cleanup.
+  PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
+  yield promiseClearHistory();
 });
 
-add_test(function test_removePagesByTimeframe()
-{
+add_task(function* test_removePagesByTimeframe() {
   let visits = [];
   let startDate = Date.now() * 1000;
   for (let i = 0; i < 10; i++) {
@@ -77,49 +69,61 @@
     });
   }
 
-  promiseAddVisits(visits).then(function () {
-    // Delete all pages except the first and the last.
-    PlacesUtils.bhistory.removePagesByTimeframe(startDate + 1, startDate + 8);
-  
-    // Check that we have removed the correct pages.
-    for (let i = 0; i < 10; i++) {
-      do_check_eq(page_in_database(NetUtil.newURI(TEST_URI.spec + i)) == 0,
-                  i > 0 && i < 9);
-    }
-  
-    // Clear remaining items and check that all pages have been removed.
-    PlacesUtils.bhistory.removePagesByTimeframe(startDate, startDate + 9);
-    do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
-    run_next_test();
-  });
+  yield promiseAddVisits(visits);
+
+  // Delete all pages except the first and the last.
+  PlacesUtils.bhistory.removePagesByTimeframe(startDate + 1, startDate + 8);
+
+  // Check that we have removed the correct pages.
+  for (let i = 0; i < 10; i++) {
+    do_check_eq(page_in_database(NetUtil.newURI(TEST_URI.spec + i)) == 0,
+                i > 0 && i < 9);
+  }
+
+  // Clear remaining items and check that all pages have been removed.
+  PlacesUtils.bhistory.removePagesByTimeframe(startDate, startDate + 9);
+  do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
 });
 
-add_test(function test_removePagesFromHost()
-{
-  promiseAddVisits(TEST_URI).then(function () {
-    PlacesUtils.bhistory.removePagesFromHost("mozilla.com", true);
-    do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
-    run_next_test();
-  });
+add_task(function* test_removePagesFromHost() {
+  yield promiseAddVisits(TEST_URI);
+  PlacesUtils.bhistory.removePagesFromHost("mozilla.com", true);
+  do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
 });
 
-add_test(function test_removePagesFromHost_keepSubdomains()
-{
-  promiseAddVisits([{ uri: TEST_URI }, { uri: TEST_SUBDOMAIN_URI }]).then(function () {
-    PlacesUtils.bhistory.removePagesFromHost("mozilla.com", false);
-    do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
-    run_next_test();
-  });
+add_task(function* test_removePagesFromHost_keepSubdomains() {
+  yield promiseAddVisits([{ uri: TEST_URI }, { uri: TEST_SUBDOMAIN_URI }]);
+  PlacesUtils.bhistory.removePagesFromHost("mozilla.com", false);
+  do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
 });
 
-add_test(function test_removeAllPages()
-{
+add_task(function* test_removeAllPages() {
   PlacesUtils.bhistory.removeAllPages();
   do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
-  run_next_test();
 });
 
-function run_test()
-{
+add_task(function* test_getObservers() {
+  // Ensure that getObservers() invalidates the hasHistoryEntries cache.
+  yield promiseAddVisits(TEST_URI);
+  do_check_eq(1, PlacesUtils.history.hasHistoryEntries);
+  // This is just for testing purposes, never do it.
+  return new Promise((resolve, reject) => {
+    DBConn().executeSimpleSQLAsync("DELETE FROM moz_historyvisits", {
+      handleError: function(error) {
+        reject(error);
+      },
+      handleResult: function(result) {
+      },
+      handleCompletion: function(result) {
+        // Just invoking getObservers should be enough to invalidate the cache.
+        PlacesUtils.history.getObservers();
+        do_check_eq(0, PlacesUtils.history.hasHistoryEntries);
+        resolve();
+      }
+    });
+  });
+});
+
+function run_test() {
   run_next_test();
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_history_catobs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_history_catobs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_history_catobs.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_history_catobs.js	2014-11-26 21:46:01.000000000 +0000
@@ -1,46 +1,55 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// Get services.
-let os = Cc["@mozilla.org/observer-service;1"].
-         getService(Ci.nsIObserverService);
-
-let gDummyCreated = false;
-let gDummyVisited = false;
-
-let observer = {
-  observe: function(subject, topic, data) {
-    if (topic == "dummy-observer-created")
-      gDummyCreated = true;
-    else if (topic == "dummy-observer-visited")
-      gDummyVisited = true;
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
-  ])
-};
-
-function verify() {
-  do_check_true(gDummyCreated);
-  do_check_true(gDummyVisited);
-  do_test_finished();
-}
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 
-// main
 function run_test() {
+  run_next_test();
+}
+
+add_task(function* () {
   do_load_manifest("nsDummyObserver.manifest");
 
-  os.addObserver(observer, "dummy-observer-created", true);
-  os.addObserver(observer, "dummy-observer-visited", true);
+  let dummyCreated = false;
+  let dummyReceivedOnVisit = false;
 
-  do_test_pending();
+  Services.obs.addObserver(function created() {
+    Services.obs.removeObserver(created, "dummy-observer-created");
+    dummyCreated = true;
+  }, "dummy-observer-created", false);
+  Services.obs.addObserver(function visited() {
+    Services.obs.removeObserver(visited, "dummy-observer-visited");
+    dummyReceivedOnVisit = true;
+  }, "dummy-observer-visited", false);
+
+  let initialObservers = PlacesUtils.history.getObservers();
+
+  // Add a common observer, it should be invoked after the category observer.
+  let notificationsPromised = new Promise((resolve, reject) => {
+    PlacesUtils.history.addObserver({
+      __proto__: NavHistoryObserver.prototype,
+      onVisit() {
+        let observers = PlacesUtils.history.getObservers();
+        Assert.equal(observers.length, initialObservers.length + 1);
+
+        // Check the common observer is the last one.
+        for (let i = 0; i < initialObservers.length; ++i) {
+          Assert.equal(initialObservers[i], observers[i]);
+        }
+
+        PlacesUtils.history.removeObserver(this);
+        observers = PlacesUtils.history.getObservers();
+        Assert.equal(observers.length, initialObservers.length);
+
+        // Check the category observer has been invoked before this one.
+        Assert.ok(dummyCreated);
+        Assert.ok(dummyReceivedOnVisit);
+        resolve();
+      }
+    }, false);
+  });
 
-  // Add a visit
-  promiseAddVisits(uri("http://typed.mozilla.org")).then(
-            function () do_timeout(1000, verify));
-}
+  // Add a visit.
+  yield promiseAddVisits(uri("http://typed.mozilla.org"));
+
+  yield notificationsPromised;
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_mozIAsyncLivemarks.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_mozIAsyncLivemarks.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_mozIAsyncLivemarks.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_mozIAsyncLivemarks.js	2014-11-26 21:46:01.000000000 +0000
@@ -192,6 +192,7 @@
   do_check_eq(livemark.parentId, PlacesUtils.unfiledBookmarksFolderId);
   do_check_eq(livemark.index, PlacesUtils.bookmarks.getItemIndex(livemark.id));
   do_check_eq(livemark.lastModified, PlacesUtils.bookmarks.getItemLastModified(livemark.id));
+  do_check_eq(livemark.dateAdded, PlacesUtils.bookmarks.getItemDateAdded(livemark.id));
   do_check_true(livemark.feedURI.equals(FEED_URI));
   do_check_eq(livemark.siteURI, null);
 });
@@ -211,6 +212,7 @@
   do_check_eq(livemark.title, "test");
   do_check_eq(livemark.parentId, PlacesUtils.unfiledBookmarksFolderId);
   do_check_eq(livemark.index, PlacesUtils.bookmarks.getItemIndex(livemark.id));
+  do_check_eq(livemark.dateAdded, PlacesUtils.bookmarks.getItemDateAdded(livemark.id));
   do_check_eq(livemark.lastModified, PlacesUtils.bookmarks.getItemLastModified(livemark.id));
   do_check_true(livemark.feedURI.equals(FEED_URI));
   do_check_true(livemark.siteURI.equals(SITE_URI));
@@ -287,6 +289,18 @@
   checkLivemark(livemark);
 });
 
+add_task(function* test_addLivemark_dateAdded_succeeds() {
+  let dateAdded = new Date("2013-03-01T01:10:00") * 1000;
+  let livemark = yield PlacesUtils.livemarks.addLivemark(
+    { title: "test"
+    , parentId: PlacesUtils.unfiledBookmarksFolderId
+    , index: PlacesUtils.bookmarks.DEFAULT_INDEX
+    , feedURI: FEED_URI
+    , dateAdded
+    });
+  do_check_eq(livemark.dateAdded, dateAdded);
+});
+
 add_task(function test_addLivemark_lastModified_succeeds()
 {
   let now = Date.now() * 1000;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_null_interfaces.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_null_interfaces.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_null_interfaces.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_null_interfaces.js	2014-11-26 21:46:01.000000000 +0000
@@ -13,7 +13,7 @@
 let testServices = [
   ["browser/nav-history-service;1", "nsINavHistoryService",
     ["queryStringToQueries", "removePagesByTimeframe", "removePagesFromHost",
-     "removeVisitsByTimeframe"]],
+     "removeVisitsByTimeframe", "getObservers"]],
   ["browser/nav-bookmarks-service;1","nsINavBookmarksService",
     ["createFolder", "getObservers"]],
   ["browser/livemark-service;2","mozIAsyncLivemarks", ["reloadLivemarks"]],
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_PlacesUtils_promiseHrefAndPostDataForKeyword.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_PlacesUtils_promiseHrefAndPostDataForKeyword.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/test_PlacesUtils_promiseHrefAndPostDataForKeyword.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/test_PlacesUtils_promiseHrefAndPostDataForKeyword.js	2014-11-26 21:46:01.000000000 +0000
@@ -0,0 +1,117 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+add_task(function* test_no_keyword() {
+  Assert.deepEqual({ href: null, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should not exist");
+});
+
+add_task(function* test_add_remove() {
+  let item1 = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                   parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                   url: "http://example1.com/",
+                                                   keyword: "test" });
+  Assert.deepEqual({ href: item1.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item1.url.href);
+
+  // Add a second url for the same keyword, since it's newer it should be
+  // returned.
+  let item2 = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                   parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                   url: "http://example2.com/",
+                                                   keyword: "test" });
+  Assert.deepEqual({ href: item2.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item2.url.href);
+
+  // Now remove item2, should return item1 again.
+  yield PlacesUtils.bookmarks.remove(item2);
+  Assert.deepEqual({ href: item1.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item1.url.href);
+
+  // Now remove item1, should return null again.
+  yield PlacesUtils.bookmarks.remove(item1);
+  Assert.deepEqual({ href: null, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should not exist");
+});
+
+add_task(function* test_change_url() {
+  let item = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                  parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                  url: "http://example.com/",
+                                                  keyword: "test" });
+  Assert.deepEqual({ href: item.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item.url.href);
+
+  // Change the bookmark url.
+  let updatedItem = yield PlacesUtils.bookmarks.update({ guid: item.guid,
+                                                         url: "http://example2.com" });
+  Assert.deepEqual({ href: updatedItem.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + updatedItem.url.href);
+  yield PlacesUtils.bookmarks.remove(updatedItem);
+});
+
+add_task(function* test_change_keyword() {
+  let item = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                  parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                  url: "http://example.com/",
+                                                  keyword: "test" });
+  Assert.deepEqual({ href: item.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item.url.href);
+
+  // Change the bookmark keywprd.
+  let updatedItem = yield PlacesUtils.bookmarks.update({ guid: item.guid,
+                                                         keyword: "test2" });
+  Assert.deepEqual({ href: null, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should not exist");
+  Assert.deepEqual({ href: updatedItem.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test2")),
+                   "Keyword 'test' should point to " + updatedItem.url.href);
+
+  // Remove the bookmark keyword.
+  updatedItem = yield PlacesUtils.bookmarks.update({ guid: item.guid,
+                                                     keyword: "" });
+  Assert.deepEqual({ href: null, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should not exist");
+  Assert.deepEqual({ href: null, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test2")),
+                   "Keyword 'test' should not exist");
+  yield PlacesUtils.bookmarks.remove(updatedItem);
+});
+
+add_task(function* test_postData() {
+  let item1 = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                   parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                   url: "http://example1.com/",
+                                                   keyword: "test" });
+  let itemId1 = yield PlacesUtils.promiseItemId(item1.guid);
+  PlacesUtils.setPostDataForBookmark(itemId1, "testData");
+  Assert.deepEqual({ href: item1.url.href, postData: "testData" },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item1.url.href);
+
+  // Add a second url for the same keyword, but without postData.
+  let item2 = yield PlacesUtils.bookmarks.insert({ type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                   parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                   url: "http://example2.com/",
+                                                   keyword: "test" });
+  Assert.deepEqual({ href: item2.url.href, postData: null },
+                   (yield PlacesUtils.promiseHrefAndPostDataForKeyword("test")),
+                   "Keyword 'test' should point to " + item2.url.href);
+
+  yield PlacesUtils.bookmarks.remove(item1);
+  yield PlacesUtils.bookmarks.remove(item2);
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/tests/unit/xpcshell.ini	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/tests/unit/xpcshell.ini	2014-11-26 21:46:01.000000000 +0000
@@ -55,6 +55,7 @@
 [test_485442_crash_bug_nsNavHistoryQuery_GetUri.js]
 [test_486978_sort_by_date_queries.js]
 [test_536081.js]
+[test_1085291.js]
 [test_adaptive.js]
 # Bug 676989: test hangs consistently on Android
 skip-if = os == "android"
@@ -119,6 +120,7 @@
 [test_PlacesSearchAutocompleteProvider.js]
 [test_PlacesUtils_asyncGetBookmarkIds.js]
 [test_PlacesUtils_lazyobservers.js]
+[test_PlacesUtils_promiseHrefAndPostDataForKeyword.js]
 [test_placesTxn.js]
 [test_preventive_maintenance.js]
 # Bug 676989: test hangs consistently on Android
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/UnifiedComplete.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/UnifiedComplete.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/places/UnifiedComplete.js	2014-11-14 09:37:28.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/places/UnifiedComplete.js	2014-11-26 21:46:01.000000000 +0000
@@ -17,7 +17,7 @@
 const PREF_ENABLED =                [ "autocomplete.enabled",   true ];
 const PREF_AUTOFILL =               [ "autoFill",               true ];
 const PREF_AUTOFILL_TYPED =         [ "autoFill.typed",         true ];
-const PREF_AUTOFILL_SEARCHENGINES = [ "autoFill.searchEngines", true ];
+const PREF_AUTOFILL_SEARCHENGINES = [ "autoFill.searchEngines", false ];
 const PREF_RESTYLESEARCHES        = [ "restyleSearches",        false ];
 const PREF_DELAY =                  [ "delay",                  50 ];
 const PREF_BEHAVIOR =               [ "matchBehavior", MATCH_BOUNDARY_ANYWHERE ];
@@ -568,7 +568,10 @@
   // Set the default behavior for this search.
   this._behavior = this._searchString ? Prefs.defaultBehavior
                                       : Prefs.emptySearchDefaultBehavior;
-  this._enableActions = searchParam.split(" ").indexOf("enable-actions") != -1;
+
+  let params = new Set(searchParam.split(" "));
+  this._enableActions = params.has("enable-actions");
+  this._disablePrivateActions = params.has("disable-private-actions");
 
   this._searchTokens =
     this.filterTokens(getUnfilteredSearchTokens(this._searchString));
@@ -630,8 +633,14 @@
    * @return true if the behavior is set, false otherwise.
    */
   hasBehavior: function (type) {
-    return this._behavior &
-           Ci.mozIPlacesAutoComplete["BEHAVIOR_" + type.toUpperCase()];
+    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + type.toUpperCase()];
+
+    if (this._disablePrivateActions &&
+        behavior == Ci.mozIPlacesAutoComplete.BEHAVIOR_OPENPAGE) {
+      return false;
+    }
+
+    return this._behavior & behavior;
   },
 
   /**
@@ -768,7 +777,7 @@
     let hasFirstResult = false;
 
     if (this._searchTokens.length > 0 &&
-        PlacesUtils.bookmarks.getURIForKeyword(this._searchTokens[0])) {
+        (yield PlacesUtils.promiseHrefAndPostDataForKeyword(this._searchTokens[0])).href) {
       // This may be a keyword of a bookmark.
       queries.unshift(this._keywordQuery);
       hasFirstResult = true;
@@ -964,7 +973,6 @@
       comment: match.engineName,
       icon: match.iconUrl,
       style: "action searchengine",
-      finalCompleteValue: this._trimmedOriginalSearchString,
       frecency: FRECENCY_SEARCHENGINES_DEFAULT,
     });
   },
@@ -1017,7 +1025,6 @@
       value: value,
       comment: uri.spec,
       style: "action visiturl",
-      finalCompleteValue: this._originalSearchString,
       frecency: 0,
     };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/printing/content/printUtils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/printing/content/printUtils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/printing/content/printUtils.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/printing/content/printUtils.js	2014-11-26 21:46:01.000000000 +0000
@@ -147,7 +147,7 @@
       aWindow = window.content;
     }
 
-    if (Cu.isCrossProcessWrapper(aWindow)) {
+    if (Components.utils.isCrossProcessWrapper(aWindow)) {
       if (!aBrowser) {
         throw new Error("PrintUtils.print expects a remote browser passed as " +
                         "an argument if the content window is a CPOW.");
@@ -155,9 +155,9 @@
     } else {
       // For content windows coming from non-remote browsers, the browser can
       // be resolved as the chromeEventHandler.
-      aBrowser = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                        .getInterface(Ci.nsIWebNavigation)
-                        .QueryInterface(Ci.nsIDocShell)
+      aBrowser = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                        .getInterface(Components.interfaces.nsIWebNavigation)
+                        .QueryInterface(Components.interfaces.nsIDocShell)
                         .chromeEventHandler;
     }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/satchel/nsFormFillController.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/satchel/nsFormFillController.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/satchel/nsFormFillController.cpp	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/satchel/nsFormFillController.cpp	2014-11-26 21:46:01.000000000 +0000
@@ -36,6 +36,7 @@
 #include "nsIDOMNSEditableElement.h"
 #include "nsContentUtils.h"
 #include "nsILoadContext.h"
+#include "nsIFrame.h"
 
 using namespace mozilla::dom;
 
@@ -948,6 +949,36 @@
   case nsIDOMKeyEvent::DOM_VK_DOWN:
   case nsIDOMKeyEvent::DOM_VK_LEFT:
   case nsIDOMKeyEvent::DOM_VK_RIGHT:
+    {
+      // Get the writing-mode of the relevant input element,
+      // so that we can remap arrow keys if necessary.
+      mozilla::WritingMode wm;
+      if (mFocusedInputNode && mFocusedInputNode->IsElement()) {
+        mozilla::dom::Element *elem = mFocusedInputNode->AsElement();
+        nsIFrame *frame = elem->GetPrimaryFrame();
+        if (frame) {
+          wm = frame->GetWritingMode();
+        }
+      }
+      if (wm.IsVertical()) {
+        switch (k) {
+        case nsIDOMKeyEvent::DOM_VK_LEFT:
+          k = wm.IsVerticalLR() ? nsIDOMKeyEvent::DOM_VK_UP
+                                : nsIDOMKeyEvent::DOM_VK_DOWN;
+          break;
+        case nsIDOMKeyEvent::DOM_VK_RIGHT:
+          k = wm.IsVerticalLR() ? nsIDOMKeyEvent::DOM_VK_DOWN
+                                : nsIDOMKeyEvent::DOM_VK_UP;
+          break;
+        case nsIDOMKeyEvent::DOM_VK_UP:
+          k = nsIDOMKeyEvent::DOM_VK_LEFT;
+          break;
+        case nsIDOMKeyEvent::DOM_VK_DOWN:
+          k = nsIDOMKeyEvent::DOM_VK_RIGHT;
+          break;
+        }
+      }
+    }
     mController->HandleKeyNavigation(k, &cancel);
     break;
   case nsIDOMKeyEvent::DOM_VK_ESCAPE:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/search/nsSearchService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/search/nsSearchService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/search/nsSearchService.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/search/nsSearchService.js	2014-11-26 21:46:01.000000000 +0000
@@ -3793,16 +3793,23 @@
       }
     }
 
-    // Array for the remaining engines, alphabetically sorted
-    var alphaEngines = [];
+    // Array for the remaining engines, alphabetically sorted.
+    let alphaEngines = [];
 
     for each (engine in this._engines) {
       if (!(engine.name in addedEngines))
         alphaEngines.push(this._engines[engine.name]);
     }
-    alphaEngines = alphaEngines.sort(function (a, b) {
-                                       return a.name.localeCompare(b.name);
-                                     });
+
+    let locale = Cc["@mozilla.org/intl/nslocaleservice;1"]
+                   .getService(Ci.nsILocaleService)
+                   .newLocale(getLocale());
+    let collation = Cc["@mozilla.org/intl/collation-factory;1"]
+                      .createInstance(Ci.nsICollationFactory)
+                      .CreateCollation(locale);
+    const strength = Ci.nsICollation.kCollationCaseInsensitiveAscii;
+    let comparator = (a, b) => collation.compareString(strength, a.name, b.name);
+    alphaEngines.sort(comparator);
     return this.__sortedEngines = this.__sortedEngines.concat(alphaEngines);
   },
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/search/nsSearchSuggestions.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/search/nsSearchSuggestions.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/search/nsSearchSuggestions.js	2014-11-14 09:37:29.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/search/nsSearchSuggestions.js	2014-11-26 21:46:01.000000000 +0000
@@ -86,13 +86,17 @@
    */
   onResultsReady: function(searchString, results, comments, formHistoryResult) {
     if (this._listener) {
+      // Create a copy of the results array to use as labels, since
+      // FormAutoCompleteResult doesn't like being passed the same array
+      // for both.
+      let labels = results.slice();
       let result = new FormAutoCompleteResult(
           searchString,
           Ci.nsIAutoCompleteResult.RESULT_SUCCESS,
           0,
           "",
           results,
-          results,
+          labels,
           comments,
           formHistoryResult);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/telemetry/Histograms.json thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/telemetry/Histograms.json
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/telemetry/Histograms.json	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/telemetry/Histograms.json	2014-11-26 21:46:01.000000000 +0000
@@ -322,7 +322,7 @@
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 10,
-    "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach, DestructuringForIn, LegacyGenerator, ExpressionClosure"
+    "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach=0, DestructuringForIn=1, LegacyGenerator=2, ExpressionClosure=3, LetBlock=4, LetExpression=5"
   },
   "TELEMETRY_PING": {
     "expires_in_version": "default",
@@ -3512,6 +3512,13 @@
     "n_buckets": 30,
     "description": "Average paint duration during any tab open/close animation (excluding tabstrip scroll)"
   },
+  "FX_REFRESH_DRIVER_FRAME_DELAY_MS": {
+    "expires_in_version": "default",
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": 50,
+    "description": "Delay in ms between the target and the actual handling time of the frame at refresh driver"
+  },
   "FX_TAB_SWITCH_UPDATE_MS": {
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
     "expires_in_version": "40",
@@ -6555,6 +6562,12 @@
     "n_buckets": 10,
     "description": "How many permanent certificate overrides a user has stored."
   },
+  "SSL_SERVER_AUTH_EKU": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": 10,
+    "description": "Presence of of the Server Authenticaton EKU in accepted SSL server certificates (0=No EKU, 1=EKU present and has id_kp_serverAuth, 2=EKU present and has id_kp_serverAuth as well as some other EKU, 3=EKU present but does not contain id_kp_serverAuth)"
+  },
   "TELEMETRY_TEST_EXPIRED": {
     "expires_in_version": "4.0a1",
     "kind": "flag",
@@ -6594,6 +6607,12 @@
     "n_buckets": 10,
     "extended_statistics_ok": true
   },
+  "CERT_VALIDATION_SUCCESS_BY_CA": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": 256,
+    "description": "Successful SSL server cert validations by CA (see RootHashes.inc for names of CAs)"
+  },
   "CERT_PINNING_FAILURES_BY_CA": {
     "alert_emails": ["pinning@mozilla.org"],
     "expires_in_version": "never",
@@ -6775,6 +6794,34 @@
     "n_buckets": 10,
     "description": "Sidebar showing: seconds that the sidebar has been opened"
   },
+  "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": 65,
+    "n_buckets": 10,
+    "description": "Duration of shutdown phase quit-application, as measured by the shutdown terminator, in seconds of activity"
+  },
+  "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": 65,
+    "n_buckets": 10,
+    "description": "Duration of shutdown phase profile-change-teardown, as measured by the shutdown terminator, in seconds of activity"
+  },
+  "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": 65,
+    "n_buckets": 10,
+    "description": "Duration of shutdown phase xpcom-will-shutdown, as measured by the shutdown terminator, in seconds of activity"
+  },
+  "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": 65,
+    "n_buckets": 10,
+    "description": "Duration of shutdown phase profile-before-change, as measured by the shutdown terminator, in seconds of activity"
+  },
   "BR_9_2_1_SUBJECT_ALT_NAMES": {
     "expires_in_version": "never",
     "kind": "enumerated",
@@ -6833,5 +6880,16 @@
     "expires_in_version": "40",
     "kind": "boolean",
     "description": "Whether the e10s pref was set but it was blocked from running due to blacklisted conditions"
+  },
+  "ONBEFOREUNLOAD_PROMPT_ACTION" : {
+    "expires_in_version": "45",
+    "kind": "enumerated",
+    "n_values": 3,
+    "description": "What button a user clicked in an onbeforeunload prompt.  (Stay on Page = 0, Leave Page = 1, prompt aborted = 2)"
+  },
+  "ONBEFOREUNLOAD_PROMPT_COUNT" : {
+    "expires_in_version": "45",
+    "kind": "count",
+    "description": "How many onbeforeunload prompts has the user encountered in their session?"
   }
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/moz.build	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/moz.build	2014-11-26 21:46:02.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/.
 
+XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+
 SOURCES += [
     'nsTerminator.cpp',
 ]
@@ -13,6 +15,7 @@
 ]
 
 EXTRA_COMPONENTS += [
+    'nsTerminatorTelemetry.js',
     'terminator.manifest',
 ]
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/nsTerminator.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/nsTerminator.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/nsTerminator.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/nsTerminator.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -18,8 +18,14 @@
 #include "nsTerminator.h"
 
 #include "prthread.h"
+#include "prmon.h"
+#include "plstr.h"
+#include "prio.h"
+
 #include "nsString.h"
 #include "nsServiceManagerUtils.h"
+#include "nsDirectoryServiceUtils.h"
+#include "nsAppDirectoryServiceDefs.h"
 
 #include "nsIObserverService.h"
 #include "nsIPrefService.h"
@@ -28,11 +34,14 @@
 #endif
 
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/MemoryChecking.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"
+#include "mozilla/Telemetry.h"
 
 // Normally, the number of milliseconds that AsyncShutdown waits until
 // it decides to crash is specified as a preference. We use the
@@ -51,29 +60,76 @@
 
 namespace {
 
-/**
- * Set to `true` by the main thread whenever we pass a shutdown phase,
- * which means that the shutdown is still ongoing. Reset to `false` by
- * the Terminator thread, once it has acknowledged the progress.
- */
-Atomic<bool> gProgress(false);
+// Utility function: create a thread that is non-joinable,
+// does not prevent the process from terminating, is never
+// cooperatively scheduled, and uses a default stack size.
+PRThread* CreateSystemThread(void (*start)(void* arg),
+                             void* arg)
+{
+  PRThread* thread = PR_CreateThread(
+    PR_SYSTEM_THREAD, /* This thread will not prevent the process from terminating */
+    start,
+    arg,
+    PR_PRIORITY_LOW,
+    PR_GLOBAL_THREAD /* Make sure that the thread is never cooperatively scheduled */,
+    PR_UNJOINABLE_THREAD,
+    0 /* Use default stack size */
+  );
+  MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(thread); // This pointer will never be deallocated.
+  return thread;
+}
+
+
+////////////////////////////////////////////
+//
+// The watchdog
+//
+// This nspr thread is in charge of crashing the process if any stage of shutdown
+// lasts more than some predefined duration. As a side-effect, it measures the
+// duration of each stage of shutdown.
+//
+
+// The heartbeat of the operation.
+//
+// Main thread:
+//
+// * Whenever a shutdown step has been completed, the main thread
+// swaps gHeartbeat to 0 to mark that the shutdown process is still
+// progressing. The value swapped away indicates the number of ticks
+// it took for the shutdown step to advance.
+//
+// Watchdog thread:
+//
+// * Every tick, the watchdog thread increments gHearbeat atomically.
+//
+// A note about precision:
+// Since gHeartbeat is generally reset to 0 between two ticks, this means
+// that gHeartbeat stays at 0 less than one tick. Consequently, values
+// extracted from gHeartbeat must be considered rounded up.
+Atomic<uint32_t> gHeartbeat(0);
 
 struct Options {
-  int32_t crashAfterMS;
+  /**
+   * How many ticks before we should crash the process.
+   */
+  uint32_t crashAfterTicks;
 };
 
+/**
+ * Entry point for the watchdog thread
+ */
 void
-Run(void* arg)
+RunWatchdog(void* arg)
 {
   PR_SetCurrentThreadName("Shutdown Hang Terminator");
 
   // Let's copy and deallocate options, that's one less leak to worry
   // about.
   UniquePtr<Options> options((Options*)arg);
-  int32_t crashAfterMS = options->crashAfterMS;
+  uint32_t crashAfterTicks = options->crashAfterTicks;
   options = nullptr;
 
-  int32_t timeToLive = crashAfterMS;
+  const uint32_t timeToLive = crashAfterTicks;
   while (true) {
     //
     // We do not want to sleep for the entire duration,
@@ -86,14 +142,8 @@
     // more reasonable.
     //
     PR_Sleep(TICK_DURATION);
-    if (gProgress.exchange(false)) {
-      // We have passed at least one shutdown phase while waiting.
-      // Shutdown is still alive, reset the countdown.
-      timeToLive = crashAfterMS;
-      continue;
-    }
-    timeToLive -= TICK_DURATION;
-    if (timeToLive >= 0) {
+
+    if (gHeartbeat++ < timeToLive) {
       continue;
     }
 
@@ -102,20 +152,177 @@
   }
 }
 
-} // anonymous namespace
+////////////////////////////////////////////
+//
+// Writer thread
+//
+// This nspr thread is in charge of writing to disk statistics produced by the
+// watchdog thread and collected by the main thread. Note that we use a nspr
+// thread rather than usual XPCOM I/O simply because we outlive XPCOM and its
+// threads.
+//
+
+// Utility class, used by UniquePtr<> to close nspr files.
+class PR_CloseDelete
+{
+public:
+  MOZ_CONSTEXPR PR_CloseDelete() {}
+
+  PR_CloseDelete(const PR_CloseDelete& aOther)
+  {}
 
-static char const *const sObserverTopics[] = {
-  "quit-application",
-  "profile-change-teardown",
-  "profile-before-change",
-  "xpcom-will-shutdown",
-  "xpcom-shutdown",
+  void operator()(PRFileDesc* aPtr) const
+  {
+    PR_Close(aPtr);
+  }
 };
 
+//
+// Communication between the main thread and the writer thread.
+//
+// Main thread:
+//
+// * Whenever a shutdown step has been completed, the main thread
+// obtains the number of ticks from the watchdog threads, builds
+// a string representing all the data gathered so far, places
+// this string in `gWriteData`, and wakes up the writer thread
+// using `gWriteReady`. If `gWriteData` already contained a non-null
+// pointer, this means that the writer thread is lagging behind the
+// main thread, and the main thread cleans up the memory.
+//
+// Writer thread:
+//
+// * When awake, the writer thread swaps `gWriteData` to nullptr. If
+// `gWriteData` contained data to write, the . If so, the writer
+// thread writes the data to a file named "ShutdownDuration.json.tmp",
+// then moves that file to "ShutdownDuration.json" and cleans up the
+// data. If `gWriteData` contains a nullptr, the writer goes to sleep
+// until it is awkened using `gWriteReady`.
+//
+//
+// The data written by the writer thread will be read by another
+// module upon the next restart and fed to Telemetry.
+//
+Atomic<nsCString*> gWriteData(nullptr);
+PRMonitor* gWriteReady = nullptr;
+
+void RunWriter(void* arg)
+{
+  PR_SetCurrentThreadName("Shutdown Statistics Writer");
+
+  MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(arg);
+  // Shutdown will generally complete before we have a chance to
+  // deallocate. This is not a leak.
+
+  // Setup destinationPath and tmpFilePath
+
+  nsCString destinationPath(static_cast<char*>(arg));
+  nsAutoCString tmpFilePath;
+  tmpFilePath.Append(destinationPath);
+  tmpFilePath.AppendLiteral(".tmp");
+
+  // Cleanup any file leftover from a previous run
+  unused << PR_Delete(tmpFilePath.get());
+  unused << PR_Delete(destinationPath.get());
+
+  while (true) {
+    //
+    // Check whether we have received data from the main thread.
+    //
+    // We perform the check before waiting on `gWriteReady` as we may
+    // have received data while we were busy writing.
+    //
+    // Also note that gWriteData may have been modified several times
+    // since we last checked. That's ok, we are not losing any important
+    // data (since we keep adding data), and we are not leaking memory
+    // (since the main thread deallocates any data that hasn't been
+    // consumed by the writer thread).
+    //
+    UniquePtr<nsCString> data(gWriteData.exchange(nullptr));
+    if (!data) {
+      // Data is not available yet.
+      // Wait until the main thread provides it.
+      PR_EnterMonitor(gWriteReady);
+      PR_Wait(gWriteReady, PR_INTERVAL_NO_TIMEOUT);
+      PR_ExitMonitor(gWriteReady);
+      continue;
+    }
+
+    MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(data.get());
+    // Shutdown may complete before we have a chance to deallocate.
+    // This is not a leak.
+
+    //
+    // Write to a temporary file
+    //
+    // In case of any error, we simply give up. Since the data is
+    // hardly critical, we don't want to spend too much effort
+    // salvaging it.
+    //
+    UniquePtr<PRFileDesc, PR_CloseDelete>
+      tmpFileDesc(PR_Open(tmpFilePath.get(),
+                          PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE,
+                          00600));
+
+    // Shutdown may complete before we have a chance to close the file.
+    // This is not a leak.
+    MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(tmpFileDesc.get());
+
+    if (tmpFileDesc == nullptr) {
+      break;
+    }
+    if (PR_Write(tmpFileDesc.get(), data->get(), data->Length()) == -1) {
+      break;
+    }
+    tmpFileDesc.reset();
+
+    //
+    // Rename on top of destination file.
+    //
+    // This is not sufficient to guarantee that the destination file
+    // will be written correctly, but, again, we don't care enough
+    // about the data to make more efforts.
+    //
+    if (PR_Rename(tmpFilePath.get(), destinationPath.get()) != PR_SUCCESS) {
+      break;
+    }
+  }
+}
+
+/**
+ * A step during shutdown.
+ *
+ * Shutdown is divided in steps, which all map to an observer
+ * notification. The duration of a step is defined as the number of
+ * ticks between the time we receive a notification and the next one.
+ */
+struct ShutdownStep
+{
+  char const* const mTopic;
+  int mTicks;
+
+  MOZ_CONSTEXPR ShutdownStep(const char *const topic)
+    : mTopic(topic)
+    , mTicks(-1)
+  {}
+
+};
+
+static ShutdownStep sShutdownSteps[] = {
+  ShutdownStep("quit-application"),
+  ShutdownStep("profile-change-teardown"),
+  ShutdownStep("profile-before-change"),
+  ShutdownStep("xpcom-will-shutdown"),
+  ShutdownStep("xpcom-shutdown"),
+};
+
+} // anonymous namespace
+
 NS_IMPL_ISUPPORTS(nsTerminator, nsIObserver)
 
 nsTerminator::nsTerminator()
   : mInitialized(false)
+  , mCurrentStep(-1)
 {
 }
 
@@ -128,45 +335,92 @@
     return NS_ERROR_UNEXPECTED;
   }
 
-  for (size_t i = 0; i < ArrayLength(sObserverTopics); ++i) {
-    DebugOnly<nsresult> rv = os->AddObserver(this, sObserverTopics[i], false);
+  for (size_t i = 0; i < ArrayLength(sShutdownSteps); ++i) {
+    DebugOnly<nsresult> rv = os->AddObserver(this, sShutdownSteps[i].mTopic, false);
 #if defined(DEBUG)
     NS_WARN_IF(NS_FAILED(rv));
 #endif // defined(DEBUG)
   }
+
   return NS_OK;
 }
 
-// Actually launch the thread. This takes place at the first sign of shutdown.
+// Actually launch these threads. This takes place at the first sign of shutdown.
 void
-nsTerminator::Start() {
-  // Determine how long we need to wait
+nsTerminator::Start()
+{
+  MOZ_ASSERT(!mInitialized);
+  StartWatchdog();
+  StartWriter();
+  mInitialized = true;
+}
 
+// Prepare, allocate and start the watchdog thread.
+// By design, it will never finish, nor be deallocated.
+void
+nsTerminator::StartWatchdog()
+{
   int32_t crashAfterMS =
     Preferences::GetInt("toolkit.asyncshutdown.crash_timeout",
                         FALLBACK_ASYNCSHUTDOWN_CRASH_AFTER_MS);
+  // Ignore negative values
+  if (crashAfterMS <= 0) {
+    crashAfterMS = FALLBACK_ASYNCSHUTDOWN_CRASH_AFTER_MS;
+  }
 
   // Add a little padding, to ensure that we do not crash before
   // AsyncShutdown.
-  crashAfterMS += ADDITIONAL_WAIT_BEFORE_CRASH_MS;
+  if (crashAfterMS > INT32_MAX - ADDITIONAL_WAIT_BEFORE_CRASH_MS) {
+    // Defend against overflow
+    crashAfterMS = INT32_MAX;
+  } else {
+    crashAfterMS += ADDITIONAL_WAIT_BEFORE_CRASH_MS;
+  }
 
   UniquePtr<Options> options(new Options());
-  options->crashAfterMS = crashAfterMS;
+  options->crashAfterTicks = crashAfterMS / TICK_DURATION;
 
-  // Allocate and start the thread.
-  // By design, it will never finish, nor be deallocated.
-  DebugOnly<PRThread*> thread = PR_CreateThread(
-    PR_SYSTEM_THREAD, /* This thread will not prevent the process from terminating */
-    Run,
-    options.release(),
-    PR_PRIORITY_LOW,
-    PR_GLOBAL_THREAD /* Make sure that the thread is never cooperatively scheduled */,
-    PR_UNJOINABLE_THREAD,
-    0 /* Use default stack size */
-  );
+  DebugOnly<PRThread*> watchdogThread = CreateSystemThread(RunWatchdog,
+                                                options.release());
+  MOZ_ASSERT(watchdogThread);
+}
 
-  MOZ_ASSERT(thread);
-  mInitialized = true;
+// Prepare, allocate and start the writer thread. By design, it will never
+// finish, nor be deallocated. In case of error, we degrade
+// gracefully to not writing Telemetry data.
+void
+nsTerminator::StartWriter()
+{
+
+  if (!Telemetry::CanRecord()) {
+    return;
+  }
+  nsCOMPtr<nsIFile> profLD;
+  nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR,
+                                       getter_AddRefs(profLD));
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  rv = profLD->Append(NS_LITERAL_STRING("ShutdownDuration.json"));
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  nsAutoString path;
+  rv = profLD->GetPath(path);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  gWriteReady = PR_NewMonitor();
+  MOZ_LSAN_INTENTIONALLY_LEAK_OBJECT(gWriteReady); // We will never deallocate this object
+  PRThread* writerThread = CreateSystemThread(RunWriter,
+                                              ToNewUTF8String(path));
+
+  if (!writerThread) {
+    return;
+  }
 }
 
 NS_IMETHODIMP
@@ -185,19 +439,101 @@
     Start();
   }
 
-  // Inform the thread that we have advanced by one phase.
-  gProgress.exchange(true);
-
-#if defined(MOZ_CRASHREPORTER)
-  // In case of crash, we wish to know where in shutdown we are
-  unused << CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("ShutdownProgress"),
-                                               nsAutoCString(aTopic));
-#endif // defined(MOZ_CRASH_REPORTER)
+  UpdateHeartbeat(aTopic);
+  UpdateTelemetry();
+  UpdateCrashReport(aTopic);
 
+  // Perform a little cleanup
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   MOZ_RELEASE_ASSERT(os);
   (void)os->RemoveObserver(this, aTopic);
+
   return NS_OK;
 }
 
+void
+nsTerminator::UpdateHeartbeat(const char* aTopic)
+{
+  // Reset the clock, find out how long the current phase has lasted.
+  uint32_t ticks = gHeartbeat.exchange(0);
+  if (mCurrentStep > 0) {
+    sShutdownSteps[mCurrentStep].mTicks = ticks;
+  }
+
+  // Find out where we now are in the current shutdown.
+  // Don't assume that shutdown takes place in the expected order.
+  int nextStep = -1;
+  for (size_t i = 0; i < ArrayLength(sShutdownSteps); ++i) {
+    if (strcmp(sShutdownSteps[i].mTopic, aTopic) == 0) {
+      nextStep = i;
+      break;
+    }
+  }
+  MOZ_ASSERT(nextStep != -1);
+  mCurrentStep = nextStep;
+}
+
+void
+nsTerminator::UpdateTelemetry()
+{
+  if (!Telemetry::CanRecord() || !gWriteReady) {
+    return;
+  }
+
+  //
+  // We need Telemetry data on the effective duration of each step,
+  // to be able to tune the time-to-crash of each of both the
+  // Terminator and AsyncShutdown. However, at this stage, it is too
+  // late to record such data into Telemetry, so we write it to disk
+  // and read it upon the next startup.
+  //
+
+  // Build JSON.
+  UniquePtr<nsCString> telemetryData(new nsCString());
+  telemetryData->AppendLiteral("{");
+  size_t fields = 0;
+  for (size_t i = 0; i < ArrayLength(sShutdownSteps); ++i) {
+    if (sShutdownSteps[i].mTicks < 0) {
+      // Ignore this field.
+      continue;
+    }
+    if (fields++ > 0) {
+      telemetryData->Append(", ");
+    }
+    telemetryData->AppendLiteral("\"");
+    telemetryData->Append(sShutdownSteps[i].mTopic);
+    telemetryData->AppendLiteral("\": ");
+    telemetryData->AppendInt(sShutdownSteps[i].mTicks);
+  }
+  telemetryData->AppendLiteral("}");
+
+  if (fields == 0) {
+    // Nothing to write
+      return;
+  }
+
+  //
+  // Send data to the worker thread.
+  //
+  delete gWriteData.exchange(telemetryData.release()); // Clear any data that hasn't been written yet
+
+  // In case the worker thread was sleeping, wake it up.
+  PR_EnterMonitor(gWriteReady);
+  PR_Notify(gWriteReady);
+  PR_ExitMonitor(gWriteReady);
+}
+
+void
+nsTerminator::UpdateCrashReport(const char* aTopic)
+{
+#if defined(MOZ_CRASHREPORTER)
+  // In case of crash, we wish to know where in shutdown we are
+  nsAutoCString report(aTopic);
+
+  unused << CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("ShutdownProgress"),
+                                               report);
+#endif // defined(MOZ_CRASH_REPORTER)
+}
+
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/nsTerminator.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/nsTerminator.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/nsTerminator.h	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/nsTerminator.h	2014-11-26 21:46:02.000000000 +0000
@@ -22,10 +22,17 @@
 private:
   nsresult SelfInit();
   void Start();
+  void StartWatchdog();
+  void StartWriter();
+
+  void UpdateHeartbeat(const char* aTopic);
+  void UpdateTelemetry();
+  void UpdateCrashReport(const char* aTopic);
 
   ~nsTerminator() {}
 
   bool mInitialized;
+  int32_t mCurrentStep;
 };
 
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/nsTerminatorTelemetry.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/nsTerminatorTelemetry.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/nsTerminatorTelemetry.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/nsTerminatorTelemetry.js	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,105 @@
+/* -*- 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";
+
+/**
+ * Read the data saved by nsTerminator during shutdown and feed it to the
+ * relevant telemetry histograms.
+ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const Cr = Components.results;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "OS",
+  "resource://gre/modules/osfile.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+  "resource://gre/modules/Promise.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+  "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "setTimeout",
+  "resource://gre/modules/Timer.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+  "resource://gre/modules/Services.jsm");
+
+function nsTerminatorTelemetry() {}
+
+let HISTOGRAMS = {
+  "quit-application": "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
+  "profile-change-teardown": "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
+  "profile-before-change":  "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
+  "xpcom-will-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
+};
+
+nsTerminatorTelemetry.prototype = {
+  classID: Components.ID("{3f78ada1-cba2-442a-82dd-d5fb300ddea7}"),
+
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(nsTerminatorTelemetry),
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsISupports
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIObserver
+
+  observe: function DS_observe(aSubject, aTopic, aData)
+  {
+    Task.spawn(function*() {
+      //
+      // This data is hardly critical, reading it can wait for a few seconds.
+      //
+      yield new Promise(resolve => setTimeout(resolve, 3000));
+
+      let PATH = OS.Path.join(OS.Constants.Path.localProfileDir,
+        "ShutdownDuration.json");
+      let raw;
+      try {
+        raw = yield OS.File.read(PATH, { encoding: "utf-8" });
+      } catch (ex if ex.becauseNoSuchFile) {
+        return;
+      }
+      // Let other errors be reported by Promise's error-reporting.
+
+      // Clean up
+      OS.File.remove(PATH);
+      OS.File.remove(PATH + ".tmp");
+
+      let data = JSON.parse(raw);
+      for (let k of Object.keys(data)) {
+        let id = HISTOGRAMS[k];
+        try {
+          let histogram = Services.telemetry.getHistogramById(id);
+          if (!histogram) {
+            throw new Error("Unknown histogram " + id);
+          }
+
+          histogram.add(Number.parseInt(data[k]));
+        } catch (ex) {
+          // Make sure that the error is reported and causes test failures,
+          // but otherwise, ignore it.
+          Promise.reject(ex);
+          continue;
+        }
+      }
+
+      // Inform observers that we are done.
+      Services.obs.notifyObservers(null,
+        "shutdown-terminator-telemetry-updated",
+        "");
+    });
+  },
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Module
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsTerminatorTelemetry]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/terminator.manifest thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/terminator.manifest
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/terminator.manifest	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/terminator.manifest	2014-11-26 21:46:02.000000000 +0000
@@ -1,2 +1,5 @@
 category profile-after-change nsTerminator @mozilla.org/toolkit/shutdown-terminator;1
 
+component {3f78ada1-cba2-442a-82dd-d5fb300ddea7} nsTerminatorTelemetry.js
+contract @mozilla.org/toolkit/shutdown-terminator-telemetry;1 {3f78ada1-cba2-442a-82dd-d5fb300ddea7}
+category profile-after-change nsTerminatorTelemetry @mozilla.org/toolkit/shutdown-terminator-telemetry;1
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_record.js	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,108 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+
+// Test that the Shutdown Terminator records durations correctly
+
+const Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://gre/modules/osfile.jsm", this);
+Cu.import("resource://gre/modules/Timer.jsm", this);
+Cu.import("resource://gre/modules/Task.jsm", this);
+
+let {Path, File, Constants} = OS;
+
+let PATH;
+let PATH_TMP;
+let terminator;
+
+add_task(function* init() {
+  do_get_profile();
+  PATH = Path.join(Constants.Path.localProfileDir, "ShutdownDuration.json");
+  PATH_TMP = PATH + ".tmp";
+
+  // Initialize the terminator
+  // (normally, this is done through the manifest file, but xpcshell
+  // doesn't take them into account).
+  do_print("Initializing the Terminator");
+  terminator = Cc["@mozilla.org/toolkit/shutdown-terminator;1"].
+    createInstance(Ci.nsIObserver);
+  terminator.observe(null, "profile-after-change", null);
+});
+
+let promiseShutdownDurationData = Task.async(function*() {
+  // Wait until PATH exists.
+  // Timeout if it is never created.
+  do_print("Waiting for file creation: " + PATH);
+  while (true) {
+    if ((yield OS.File.exists(PATH))) {
+      break;
+    }
+
+    do_print("The file does not exist yet. Waiting 1 second.");
+    yield new Promise(resolve => setTimeout(resolve, 1000));
+  }
+
+  do_print("The file has been created");
+  let raw = yield OS.File.read(PATH, { encoding: "utf-8"} );
+  do_print(raw);
+  return JSON.parse(raw);
+});
+
+add_task(function* test_record() {
+  let PHASE0 = "profile-change-teardown";
+  let PHASE1 = "profile-before-change";
+  let PHASE2 = "xpcom-will-shutdown";
+  let t0 = Date.now();
+
+  do_print("Starting shutdown");
+  terminator.observe(null, "profile-change-teardown", null);
+
+  do_print("Moving to next phase");
+  terminator.observe(null, PHASE1, null);
+
+  let data = yield promiseShutdownDurationData();
+
+  let t1 = Date.now();
+
+  Assert.ok(PHASE0 in data, "The file contains the expected key");
+  let duration = data[PHASE0];
+  Assert.equal(typeof duration, "number");
+  Assert.ok(duration >= 0, "Duration is a non-negative number");
+  Assert.ok(duration <= Math.ceil((t1 - t0) / 1000) + 1,
+    "Duration is reasonable");
+
+  Assert.equal(Object.keys(data).length, 1, "Data does not contain other durations");
+
+  do_print("Cleaning up and moving to next phase");
+  yield File.remove(PATH);
+  yield File.remove(PATH_TMP);
+
+  do_print("Waiting at least one tick");
+  let WAIT_MS = 2000;
+  yield new Promise(resolve => setTimeout(resolve, WAIT_MS));
+
+  terminator.observe(null, PHASE2, null);
+  data = yield promiseShutdownDurationData();
+
+  let t2 = Date.now();
+
+  Assert.equal(Object.keys(data).sort().join(", "),
+               [PHASE0, PHASE1].sort().join(", "),
+               "The file contains the expected keys");
+  Assert.equal(data[PHASE0], duration, "Duration of phase 0 hasn't changed");
+  let duration2 = data[PHASE1];
+  Assert.equal(typeof duration2, "number");
+  Assert.ok(duration2 >= WAIT_MS / 2000, "We have waited at least " + (WAIT_MS / 2000) + " ticks");
+  Assert.ok(duration2 <= Math.ceil((t2 - t1) / 1000) + 1,
+    "Duration is reasonable");
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/tests/xpcshell/test_terminator_reload.js	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,85 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+
+// Test that the Shutdown Terminator reloads durations correctly
+
+const Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/Services.jsm", this);
+Cu.import("resource://gre/modules/osfile.jsm", this);
+Cu.import("resource://gre/modules/Timer.jsm", this);
+Cu.import("resource://gre/modules/Task.jsm", this);
+
+let {Path, File, Constants} = OS;
+
+let PATH;
+
+let HISTOGRAMS = {
+  "quit-application": "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
+  "profile-change-teardown": "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
+  "profile-before-change":  "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
+  "xpcom-will-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
+};
+
+add_task(function* init() {
+  do_get_profile();
+  PATH = Path.join(Constants.Path.localProfileDir, "ShutdownDuration.json");
+});
+
+add_task(function* test_reload() {
+  do_print("Forging data");
+  let data = {};
+  let telemetrySnapshots = Services.telemetry.histogramSnapshots;
+  let i = 0;
+  for (let k of Object.keys(HISTOGRAMS)) {
+    let id = HISTOGRAMS[k];
+    data[k] = i++;
+    Assert.equal(telemetrySnapshots[id] || undefined, undefined, "Histogram " + id + " is empty");
+  }
+
+
+  yield OS.File.writeAtomic(PATH, JSON.stringify(data));
+
+  const TOPIC = "shutdown-terminator-telemetry-updated";
+
+  let wait = new Promise(resolve =>
+    Services.obs.addObserver(
+      function observer() {
+        do_print("Telemetry has been updated");
+        Services.obs.removeObserver(observer, TOPIC);
+        resolve();
+      },
+      TOPIC,
+      false));
+
+  do_print("Starting nsTerminatorTelemetry");
+  let tt = Cc["@mozilla.org/toolkit/shutdown-terminator-telemetry;1"].
+    createInstance(Ci.nsIObserver);
+  tt.observe(null, "profile-after-change", "");
+
+  do_print("Waiting until telemetry is updated");
+  // Now wait until Telemetry is updated
+  yield wait;
+
+  telemetrySnapshots = Services.telemetry.histogramSnapshots;
+  for (let k of Object.keys(HISTOGRAMS)) {
+    let id = HISTOGRAMS[k];
+    do_print("Testing histogram " + id);
+    let snapshot = telemetrySnapshots[id];
+    let count = 0;
+    for (let x of snapshot.counts) {
+      count += x;
+    }
+    Assert.equal(count, 1, "We have added one item");
+  }
+
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/tests/xpcshell/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/terminator/tests/xpcshell/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/terminator/tests/xpcshell/xpcshell.ini	2014-11-26 21:46:02.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+head=
+tail=
+
+[test_terminator_record.js]
+[test_terminator_reload.js]
+skip-if = (os == "android" || appname == "b2g")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/Classifier.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/Classifier.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/Classifier.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/Classifier.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -11,7 +11,6 @@
 #include "nsIInputStream.h"
 #include "nsISeekableStream.h"
 #include "nsIFile.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Telemetry.h"
 #include "prlog.h"
 
@@ -182,19 +181,17 @@
   nsTArray<nsCString> tables;
   ActiveTables(tables);
   for (uint32_t i = 0; i < tables.Length(); i++) {
-    nsAutoPtr<HashStore> store(new HashStore(tables[i], mStoreDirectory));
-    if (!store)
-      continue;
+    HashStore store(tables[i], mStoreDirectory);
 
-    nsresult rv = store->Open();
+    nsresult rv = store.Open();
     if (NS_FAILED(rv))
       continue;
 
-    aResult.Append(store->TableName());
+    aResult.Append(store.TableName());
     aResult.Append(';');
 
-    ChunkSet &adds = store->AddChunks();
-    ChunkSet &subs = store->SubChunks();
+    ChunkSet &adds = store.AddChunks();
+    ChunkSet &subs = store.SubChunks();
 
     if (adds.Length() > 0) {
       aResult.AppendLiteral("a:");
@@ -401,15 +398,13 @@
   ScanStoreDir(foundTables);
 
   for (uint32_t i = 0; i < foundTables.Length(); i++) {
-    nsAutoPtr<HashStore> store(new HashStore(nsCString(foundTables[i]), mStoreDirectory));
-    if (!store)
-      return NS_ERROR_OUT_OF_MEMORY;
+    HashStore store(nsCString(foundTables[i]), mStoreDirectory);
 
-    nsresult rv = store->Open();
+    nsresult rv = store.Open();
     if (NS_FAILED(rv))
       continue;
 
-    LookupCache *lookupCache = GetLookupCache(store->TableName());
+    LookupCache *lookupCache = GetLookupCache(store.TableName());
     if (!lookupCache) {
       continue;
     }
@@ -417,14 +412,14 @@
     if (!lookupCache->IsPrimed())
       continue;
 
-    const ChunkSet &adds = store->AddChunks();
-    const ChunkSet &subs = store->SubChunks();
+    const ChunkSet &adds = store.AddChunks();
+    const ChunkSet &subs = store.SubChunks();
 
     if (adds.Length() == 0 && subs.Length() == 0)
       continue;
 
-    LOG(("Active table: %s", store->TableName().get()));
-    mActiveTablesCache.AppendElement(store->TableName());
+    LOG(("Active table: %s", store.TableName().get()));
+    mActiveTablesCache.AppendElement(store.TableName());
   }
 
   return NS_OK;
@@ -574,11 +569,7 @@
 {
   LOG(("Classifier::ApplyTableUpdates(%s)", PromiseFlatCString(aTable).get()));
 
-  nsAutoPtr<HashStore> store(new HashStore(aTable, mStoreDirectory));
-
-  if (!store) {
-    return NS_ERROR_FAILURE;
-  }
+  HashStore store(aTable, mStoreDirectory);
 
   // take the quick exit if there is no valid update for us
   // (common case)
@@ -586,7 +577,7 @@
 
   for (uint32_t i = 0; i < aUpdates->Length(); i++) {
     TableUpdate *update = aUpdates->ElementAt(i);
-    if (!update || !update->TableName().Equals(store->TableName()))
+    if (!update || !update->TableName().Equals(store.TableName()))
       continue;
     if (update->Empty()) {
       aUpdates->ElementAt(i) = nullptr;
@@ -601,20 +592,20 @@
     return NS_OK;
   }
 
-  nsresult rv = store->Open();
+  nsresult rv = store.Open();
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = store->BeginUpdate();
+  rv = store.BeginUpdate();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Read the part of the store that is (only) in the cache
-  LookupCache *prefixSet = GetLookupCache(store->TableName());
+  LookupCache *prefixSet = GetLookupCache(store.TableName());
   if (!prefixSet) {
     return NS_ERROR_FAILURE;
   }
-  nsTArray<uint32_t> AddPrefixHashes;
-  rv = prefixSet->GetPrefixes(&AddPrefixHashes);
+  FallibleTArray<uint32_t> AddPrefixHashes;
+  rv = prefixSet->GetPrefixes(AddPrefixHashes);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = store->AugmentAdds(AddPrefixHashes);
+  rv = store.AugmentAdds(AddPrefixHashes);
   NS_ENSURE_SUCCESS(rv, rv);
   AddPrefixHashes.Clear();
 
@@ -624,15 +615,15 @@
 
   for (uint32_t i = 0; i < aUpdates->Length(); i++) {
     TableUpdate *update = aUpdates->ElementAt(i);
-    if (!update || !update->TableName().Equals(store->TableName()))
+    if (!update || !update->TableName().Equals(store.TableName()))
       continue;
 
-    rv = store->ApplyUpdate(*update);
+    rv = store.ApplyUpdate(*update);
     NS_ENSURE_SUCCESS(rv, rv);
 
     applied++;
 
-    LOG(("Applied update to table %s:", store->TableName().get()));
+    LOG(("Applied update to table %s:", store.TableName().get()));
     LOG(("  %d add chunks", update->AddChunks().Length()));
     LOG(("  %d add prefixes", update->AddPrefixes().Length()));
     LOG(("  %d add completions", update->AddCompletes().Length()));
@@ -657,30 +648,30 @@
     delete update;
   }
 
-  LOG(("Applied %d update(s) to %s.", applied, store->TableName().get()));
+  LOG(("Applied %d update(s) to %s.", applied, store.TableName().get()));
 
-  rv = store->Rebuild();
+  rv = store.Rebuild();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Not an update with Completes, clear all completes data.
   if (!hasCompletes) {
-    store->ClearCompletes();
+    store.ClearCompletes();
   }
 
-  LOG(("Table %s now has:", store->TableName().get()));
-  LOG(("  %d add chunks", store->AddChunks().Length()));
-  LOG(("  %d add prefixes", store->AddPrefixes().Length()));
-  LOG(("  %d add completions", store->AddCompletes().Length()));
-  LOG(("  %d sub chunks", store->SubChunks().Length()));
-  LOG(("  %d sub prefixes", store->SubPrefixes().Length()));
-  LOG(("  %d sub completions", store->SubCompletes().Length()));
+  LOG(("Table %s now has:", store.TableName().get()));
+  LOG(("  %d add chunks", store.AddChunks().Length()));
+  LOG(("  %d add prefixes", store.AddPrefixes().Length()));
+  LOG(("  %d add completions", store.AddCompletes().Length()));
+  LOG(("  %d sub chunks", store.SubChunks().Length()));
+  LOG(("  %d sub prefixes", store.SubPrefixes().Length()));
+  LOG(("  %d sub completions", store.SubCompletes().Length()));
 
-  rv = store->WriteFile();
+  rv = store.WriteFile();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // At this point the store is updated and written out to disk, but
   // the data is still in memory.  Build our quick-lookup table here.
-  rv = prefixSet->Build(store->AddPrefixes(), store->AddCompletes());
+  rv = prefixSet->Build(store.AddPrefixes(), store.AddCompletes());
   NS_ENSURE_SUCCESS(rv, rv);
 
 #if defined(DEBUG) && defined(PR_LOGGING)
@@ -691,8 +682,8 @@
 
   if (updateFreshness) {
     int64_t now = (PR_Now() / PR_USEC_PER_SEC);
-    LOG(("Successfully updated %s", store->TableName().get()));
-    mTableFreshness.Put(store->TableName(), now);
+    LOG(("Successfully updated %s", store.TableName().get()));
+    mTableFreshness.Put(store.TableName(), now);
   }
 
   return NS_OK;
@@ -734,8 +725,8 @@
     return NS_ERROR_FAILURE;
   }
 
-  nsTArray<uint32_t> prefixes;
-  nsresult rv = cache->GetPrefixes(&prefixes);
+  FallibleTArray<uint32_t> prefixes;
+  nsresult rv = cache->GetPrefixes(prefixes);
   NS_ENSURE_SUCCESS(rv, rv);
 
   size_t idx = prefixes.BinaryIndexOf(aPrefix.ToUint32());
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/HashStore.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/HashStore.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/HashStore.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/HashStore.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -30,7 +30,6 @@
 
 
 #include "HashStore.h"
-#include "nsAutoPtr.h"
 #include "nsICryptoHash.h"
 #include "nsISeekableStream.h"
 #include "nsIStreamConverterService.h"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/LookupCache.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/LookupCache.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/LookupCache.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/LookupCache.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -684,24 +684,14 @@
 }
 
 nsresult
-LookupCache::GetPrefixes(nsTArray<uint32_t>* aAddPrefixes)
+LookupCache::GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes)
 {
   if (!mPrimed) {
     // This can happen if its a new table, so no error.
     LOG(("GetPrefixes from empty LookupCache"));
     return NS_OK;
   }
-  uint32_t cnt;
-  uint32_t *arr;
-  nsresult rv = mPrefixSet->GetPrefixes(&cnt, &arr);
-  NS_ENSURE_SUCCESS(rv, rv);
-  bool appendOk = aAddPrefixes->AppendElements(arr, cnt);
-  nsMemory::Free(arr);
-  if (appendOk) {
-    return NS_OK;
-  } else {
-    return NS_ERROR_FAILURE;
-  }
+  return mPrefixSet->GetPrefixesNative(aAddPrefixes);
 }
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/LookupCache.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/LookupCache.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/LookupCache.h	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/LookupCache.h	2014-11-26 21:46:02.000000000 +0000
@@ -9,7 +9,6 @@
 #include "Entries.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
 #include "nsIFileStreams.h"
@@ -99,7 +98,7 @@
   // This will Clear() the passed arrays when done.
   nsresult Build(AddPrefixArray& aAddPrefixes,
                  AddCompleteArray& aAddCompletes);
-  nsresult GetPrefixes(nsTArray<uint32_t>* aAddPrefixes);
+  nsresult GetPrefixes(FallibleTArray<uint32_t>& aAddPrefixes);
   void ClearCompleteCache();
 
 #if DEBUG && defined(PR_LOGGING)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js	2014-11-26 21:46:02.000000000 +0000
@@ -176,7 +176,7 @@
     this._requests.push({
       partialHash: aPartialHash,
       callback: aCallback,
-      responses: [],
+      responses: []
     });
   },
 
@@ -223,6 +223,10 @@
     let channel = Services.io.newChannelFromURI(uri);
     channel.loadFlags = loadFlags;
 
+    // Disable keepalive.
+    let httpChannel = channel.QueryInterface(Ci.nsIHttpChannel);
+    httpChannel.setRequestHeader("Connection", "close", false);
+
     this._channel = channel;
 
     let body = this.buildRequest();
@@ -365,6 +369,7 @@
       request.callback.completionFinished(Cr.NS_OK);
     }
   },
+
   notifyFailure: function HCR_notifyFailure(aStatus) {
     dump("hashcompleter: notifying failure\n");
     for (let i = 0; i < this._requests.length; i++) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -4,7 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsPrintfCString.h"
@@ -12,13 +11,11 @@
 #include "nsString.h"
 #include "nsUrlClassifierPrefixSet.h"
 #include "nsIUrlClassifierPrefixSet.h"
-#include "nsIRandomGenerator.h"
 #include "nsIFile.h"
 #include "nsToolkitCompsCID.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Mutex.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/FileUtils.h"
 #include "prlog.h"
@@ -140,18 +137,12 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsUrlClassifierPrefixSet::GetPrefixes(uint32_t* aCount,
-                                      uint32_t** aPrefixes)
+nsresult
+nsUrlClassifierPrefixSet::GetPrefixesNative(FallibleTArray<uint32_t>& outArray)
 {
-  NS_ENSURE_ARG_POINTER(aCount);
-  *aCount = 0;
-  NS_ENSURE_ARG_POINTER(aPrefixes);
-  *aPrefixes = nullptr;
-
-  uint64_t itemCount = mTotalPrefixes;
-  uint32_t* prefixArray = static_cast<uint32_t*>(nsMemory::Alloc(itemCount * sizeof(uint32_t)));
-  NS_ENSURE_TRUE(prefixArray, NS_ERROR_OUT_OF_MEMORY);
+  if (!outArray.SetLength(mTotalPrefixes)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
 
   uint32_t prefixIdxLength = mIndexPrefixes.Length();
   uint32_t prefixCnt = 0;
@@ -159,14 +150,37 @@
   for (uint32_t i = 0; i < prefixIdxLength; i++) {
     uint32_t prefix = mIndexPrefixes[i];
 
-    prefixArray[prefixCnt++] = prefix;
+    outArray[prefixCnt++] = prefix;
     for (uint32_t j = 0; j < mIndexDeltas[i].Length(); j++) {
       prefix += mIndexDeltas[i][j];
-      prefixArray[prefixCnt++] = prefix;
+      outArray[prefixCnt++] = prefix;
     }
   }
 
-  NS_ASSERTION(itemCount == prefixCnt, "Lengths are inconsistent");
+  NS_ASSERTION(mTotalPrefixes == prefixCnt, "Lengths are inconsistent");
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlClassifierPrefixSet::GetPrefixes(uint32_t* aCount,
+                                      uint32_t** aPrefixes)
+{
+  NS_ENSURE_ARG_POINTER(aCount);
+  *aCount = 0;
+  NS_ENSURE_ARG_POINTER(aPrefixes);
+  *aPrefixes = nullptr;
+
+  FallibleTArray<uint32_t> prefixes;
+  nsresult rv = GetPrefixesNative(prefixes);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  uint64_t itemCount = prefixes.Length();
+  uint32_t* prefixArray = static_cast<uint32_t*>(nsMemory::Alloc(itemCount * sizeof(uint32_t)));
+  NS_ENSURE_TRUE(prefixArray, NS_ERROR_OUT_OF_MEMORY);
+
+  memcpy(prefixArray, prefixes.Elements(), sizeof(uint32_t) * itemCount);
 
   *aCount = itemCount;
   *aPrefixes = prefixArray;
@@ -300,7 +314,7 @@
     nsTArray<uint32_t> indexStarts;
     indexStarts.SetLength(indexSize);
     mIndexPrefixes.SetLength(indexSize);
-    mIndexDeltas.Clear();
+    mIndexDeltas.SetLength(indexSize);
 
     mTotalPrefixes = indexSize;
 
@@ -313,7 +327,6 @@
       return NS_ERROR_FILE_CORRUPTED;
     }
     for (uint32_t i = 0; i < indexSize; i++) {
-      mIndexDeltas.AppendElement();
       uint32_t numInDelta = i == indexSize - 1 ? deltaSize - indexStarts[i]
                                : indexStarts[i + 1] - indexStarts[i];
       if (numInDelta > 0) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.h	2014-11-26 21:46:02.000000000 +0000
@@ -16,8 +16,6 @@
 #include "nsTArray.h"
 #include "nsToolkitCompsCID.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/CondVar.h"
 #include "mozilla/FileUtils.h"
 #include "mozilla/Atomics.h"
 
@@ -36,6 +34,7 @@
   NS_IMETHOD LoadFromFile(nsIFile* aFile);
   NS_IMETHOD StoreToFile(nsIFile* aFile);
 
+  nsresult GetPrefixesNative(FallibleTArray<uint32_t>& outArray);
   size_t SizeInMemory() { return mMemoryInUse; };
 
   NS_DECL_THREADSAFE_ISUPPORTS
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -120,17 +120,25 @@
   if ((NS_SUCCEEDED(aUpdateUrl->SchemeIs("file", &match)) && match) ||
       (NS_SUCCEEDED(aUpdateUrl->SchemeIs("data", &match)) && match)) {
     mChannel->SetContentType(NS_LITERAL_CSTRING("application/vnd.google.safebrowsing-update"));
+  } else {
+    // We assume everything else is an HTTP request.
+
+    // Disable keepalive.
+    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Connection"), NS_LITERAL_CSTRING("close"), false);
+    NS_ENSURE_SUCCESS(rv, rv);
   }
 
-   // Create a custom LoadContext for SafeBrowsing, so we can use callbacks on
-   // the channel to query the appId which allows separation of safebrowsing
-   // cookies in a separate jar.
+  // Create a custom LoadContext for SafeBrowsing, so we can use callbacks on
+  // the channel to query the appId which allows separation of safebrowsing
+  // cookies in a separate jar.
   nsCOMPtr<nsIInterfaceRequestor> sbContext =
     new mozilla::LoadContext(NECKO_SAFEBROWSING_APP_ID);
   rv = mChannel->SetNotificationCallbacks(sbContext);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Make the request
+  // Make the request.
   rv = mChannel->AsyncOpen(this, nullptr);
   NS_ENSURE_SUCCESS(rv, rv);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp	2014-11-26 21:46:02.000000000 +0000
@@ -284,7 +284,7 @@
   // Pull the chunk out of the pending stream data.
   nsAutoCString chunk;
   chunk.Assign(Substring(mPending, 0, mChunkState.length));
-  mPending = Substring(mPending, mChunkState.length);
+  mPending.Cut(0, mChunkState.length);
 
   *aDone = false;
   mState = PROTOCOL_STATE_CONTROL;
@@ -590,14 +590,14 @@
 }
 
 bool
-ProtocolParser::NextLine(nsACString& line)
+ProtocolParser::NextLine(nsACString& aLine)
 {
   int32_t newline = mPending.FindChar('\n');
   if (newline == kNotFound) {
     return false;
   }
-  line.Assign(Substring(mPending, 0, newline));
-  mPending = Substring(mPending, newline + 1);
+  aLine.Assign(Substring(mPending, 0, newline));
+  mPending.Cut(0, newline + 1);
   return true;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js	2014-11-14 09:37:30.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/url-classifier/tests/unit/test_hashcompleter.js	2014-11-26 21:46:02.000000000 +0000
@@ -220,8 +220,8 @@
   server = new HttpServer();
   server.registerPathHandler(SERVER_PATH, hashCompleterServer);
 
-  const SERVER_PORT = 8080;
-  server.start(SERVER_PORT);
+  server.start(-1);
+  const SERVER_PORT = server.identity.primaryPort;
 
   gethashUrl = "http://localhost:" + SERVER_PORT + SERVER_PATH;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/viewsource/test/test_428653.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/viewsource/test/test_428653.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/components/viewsource/test/test_428653.xul	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/components/viewsource/test/test_428653.xul	2014-11-26 21:46:02.000000000 +0000
@@ -17,8 +17,9 @@
   <script type="application/javascript">
   <![CDATA[
   /*
-  Test that we can't call the content browser's document.open() either via
-  wrappedJSObject (SafeJSObjectWrapper) or not.
+  Test that we can't call the content browser's document.open() over Xrays.
+  See the security checks in nsHTMLDocument::Open, which make sure that the
+  entry global's principal matches that of the document.
   */
   SimpleTest.waitForExplicitFinish();
   
@@ -37,14 +38,8 @@
     }
     is(opened, false, "Shouldn't have opened document");
 
-    try {
-      doc.wrappedJSObject.open("text/html", "replace");
-      opened = true;
-    } catch (e) {
-      is(e.name, "SecurityError",
-         "Unxpected exception via wrappedJSObject")
-    }
-    is(opened, false, "Shouldn't have opened document via wrappedJSObject");
+    doc.wrappedJSObject.open("text/html", "replace");
+    ok(true, "Should be able to open document via Xray Waiver");
 
     SimpleTest.finish();
   });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/aboutTelemetry.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/aboutTelemetry.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/aboutTelemetry.css	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/aboutTelemetry.css	2014-11-26 21:46:02.000000000 +0000
@@ -122,6 +122,7 @@
   padding: 15px;
   position: relative; /* required for position:absolute of the contained .copy-node */
   display: block;
+  overflow: hidden;
 }
 
 .keyed-histogram-title {
@@ -131,7 +132,6 @@
   font-weight: bold;
   font-size: 120%;
   white-space: nowrap;
-  overflow: hidden;
 }
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/browser-child.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/browser-child.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/browser-child.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/browser-child.js	2014-11-26 21:46:02.000000000 +0000
@@ -38,9 +38,22 @@
 
 let WebProgressListener = {
   init: function() {
+    this._filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
+                     .createInstance(Ci.nsIWebProgress);
+    this._filter.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_ALL);
+
+    let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIWebProgress);
+    webProgress.addProgressListener(this._filter, Ci.nsIWebProgress.NOTIFY_ALL);
+  },
+
+  uninit() {
     let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
                               .getInterface(Ci.nsIWebProgress);
-    webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_ALL);
+    webProgress.removeProgressListener(this._filter);
+
+    this._filter.removeProgressListener(this);
+    this._filter = null;
   },
 
   _requestSpec: function (aRequest, aPropertyName) {
@@ -50,21 +63,37 @@
   },
 
   _setupJSON: function setupJSON(aWebProgress, aRequest) {
+    if (aWebProgress) {
+      aWebProgress = {
+        isTopLevel: aWebProgress.isTopLevel,
+        isLoadingDocument: aWebProgress.isLoadingDocument,
+        loadType: aWebProgress.loadType
+      };
+    }
+
     return {
-      isTopLevel: aWebProgress.isTopLevel,
-      isLoadingDocument: aWebProgress.isLoadingDocument,
+      webProgress: aWebProgress || null,
       requestURI: this._requestSpec(aRequest, "URI"),
       originalRequestURI: this._requestSpec(aRequest, "originalURI"),
-      loadType: aWebProgress.loadType,
       documentContentType: content.document && content.document.contentType
     };
   },
 
   _setupObjects: function setupObjects(aWebProgress) {
+    let domWindow;
+    try {
+      domWindow = aWebProgress && aWebProgress.DOMWindow;
+    } catch (e) {
+      // If nsDocShell::Destroy has already been called, then we'll
+      // get NS_NOINTERFACE when trying to get the DOM window. Ignore
+      // that here.
+      domWindow = null;
+    }
+
     return {
       contentWindow: content,
       // DOMWindow is not necessarily the content-window with subframes.
-      DOMWindow: aWebProgress.DOMWindow
+      DOMWindow: domWindow
     };
   },
 
@@ -92,7 +121,7 @@
     json.canGoBack = docShell.canGoBack;
     json.canGoForward = docShell.canGoForward;
 
-    if (json.isTopLevel) {
+    if (aWebProgress && aWebProgress.isTopLevel) {
       json.documentURI = content.document.documentURIObject.spec;
       json.charset = content.document.characterSet;
       json.mayEnableCharacterEncodingMenu = docShell.mayEnableCharacterEncodingMenu;
@@ -134,6 +163,9 @@
 };
 
 WebProgressListener.init();
+addEventListener("unload", () => {
+  WebProgressListener.uninit();
+});
 
 let WebNavigation =  {
   init: function() {
@@ -406,16 +438,10 @@
 
 // The AddonsChild needs to be rooted so that it stays alive as long as
 // the tab.
-let AddonsChild;
-if (Services.appinfo.browserTabsRemoteAutostart) {
-  // Currently, the addon shims are only supported when autostarting
-  // with remote tabs.
-  AddonsChild = RemoteAddonsChild.init(this);
-
-  addEventListener("unload", () => {
-    RemoteAddonsChild.uninit(AddonsChild);
-  });
-}
+let AddonsChild = RemoteAddonsChild.init(this);
+addEventListener("unload", () => {
+  RemoteAddonsChild.uninit(AddonsChild);
+});
 
 addMessageListener("NetworkPrioritizer:AdjustPriority", (msg) => {
   let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/contentAreaUtils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/contentAreaUtils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/contentAreaUtils.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/contentAreaUtils.js	2014-11-26 21:46:02.000000000 +0000
@@ -423,8 +423,9 @@
                                     .getInterface(Components.interfaces.nsIWebNavigation)
                                     .QueryInterface(Components.interfaces.nsILoadContext);
     persist.saveURI(persistArgs.sourceURI,
-                    persistArgs.sourceCacheKey, persistArgs.sourceReferrer, persistArgs.sourcePostData, null,
-                    targetFileURL, privacyContext);
+                    persistArgs.sourceCacheKey, persistArgs.sourceReferrer,
+                    Ci.nsIHttpChannel.REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE,
+                    persistArgs.sourcePostData, null, targetFileURL, privacyContext);
   }
 }
 
@@ -713,31 +714,34 @@
   // The corresponding filter string for a specific content type.
   var filterString;
 
-  // XXX all the cases that are handled explicitly here MUST be handled
-  // in GetSaveModeForContentType to return a non-fileonly filter.
-  switch (aContentType) {
-  case "text/html":
-    bundleName   = "WebPageHTMLOnlyFilter";
-    filterString = "*.htm; *.html";
-    break;
-
-  case "application/xhtml+xml":
-    bundleName   = "WebPageXHTMLOnlyFilter";
-    filterString = "*.xht; *.xhtml";
-    break;
-
-  case "image/svg+xml":
-    bundleName   = "WebPageSVGOnlyFilter";
-    filterString = "*.svg; *.svgz";
-    break;
-
-  case "text/xml":
-  case "application/xml":
-    bundleName   = "WebPageXMLOnlyFilter";
-    filterString = "*.xml";
-    break;
+  // Every case where GetSaveModeForContentType can return non-FILEONLY
+  // modes must be handled here.
+  if (aSaveMode != SAVEMODE_FILEONLY) {
+    switch (aContentType) {
+    case "text/html":
+      bundleName   = "WebPageHTMLOnlyFilter";
+      filterString = "*.htm; *.html";
+      break;
+
+    case "application/xhtml+xml":
+      bundleName   = "WebPageXHTMLOnlyFilter";
+      filterString = "*.xht; *.xhtml";
+      break;
+
+    case "image/svg+xml":
+      bundleName   = "WebPageSVGOnlyFilter";
+      filterString = "*.svg; *.svgz";
+      break;
+
+    case "text/xml":
+    case "application/xml":
+      bundleName   = "WebPageXMLOnlyFilter";
+      filterString = "*.xml";
+      break;
+    }
+  }
 
-  default:
+  if (!bundleName) {
     if (aSaveMode != SAVEMODE_FILEONLY)
       throw "Invalid save mode for type '" + aContentType + "'";
 
@@ -758,8 +762,6 @@
       if (extString)
         aFilePicker.appendFilter(mimeInfo.description, extString);
     }
-
-    break;
   }
 
   if (aSaveMode & SAVEMODE_COMPLETE_DOM) {
@@ -1063,8 +1065,9 @@
 
 function GetSaveModeForContentType(aContentType, aDocument)
 {
-  // We can only save a complete page if we have a loaded document
-  if (!aDocument)
+  // We can only save a complete page if we have a loaded document,
+  // and it's not a CPOW -- nsWebBrowserPersist needs a real document.
+  if (!aDocument || Components.utils.isCrossProcessWrapper(aDocument))
     return SAVEMODE_FILEONLY;
 
   // Find the possible save modes using the provided content type
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/globalOverlay.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/globalOverlay.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/globalOverlay.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/globalOverlay.js	2014-11-26 21:46:02.000000000 +0000
@@ -148,34 +148,6 @@
   }
 }
 
-function visitLink(aEvent) {
-  var node = aEvent.target;
-  while (node.nodeType != Node.ELEMENT_NODE)
-    node = node.parentNode;
-  var url = node.getAttribute("link");
-  if (!url)
-    return;
-
-  var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
-                              .getService(Components.interfaces.nsIExternalProtocolService);
-  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                            .getService(Components.interfaces.nsIIOService);
-  var uri = ioService.newURI(url, null, null);
-
-  // if the scheme is not an exposed protocol, then opening this link
-  // should be deferred to the system's external protocol handler
-  if (protocolSvc.isExposedProtocol(uri.scheme)) {
-    var win = window.top;
-    if (win instanceof Components.interfaces.nsIDOMChromeWindow) {
-      while (win.opener && !win.opener.closed)
-        win = win.opener;
-    }
-    win.open(uri.spec);
-  }
-  else
-    protocolSvc.loadUrl(uri);
-}
-
 function setTooltipText(aID, aTooltipText)
 {
   var element = document.getElementById(aID);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/browser/browser_default_image_filename.js	2014-11-26 21:46:02.000000000 +0000
@@ -22,7 +22,7 @@
     executeSoon(function () {
       document.addEventListener("popupshown", contextMenuOpened);
 
-      var img = gBrowser.contentDocument.getElementsByClassName("decoded")[0];
+      var img = gBrowser.contentDocument.getElementsByTagName("img")[0];
       EventUtils.synthesizeMouseAtCenter(img,
                                          { type: "contextmenu", button: 2 },
                                          gBrowser.contentWindow);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js	2014-11-26 21:46:02.000000000 +0000
@@ -118,17 +118,7 @@
     { description: "compositionend should open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "Mo",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 2, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "Mo" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_RETURN", { type: "keyup" }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
@@ -169,17 +159,7 @@
     { description: "compositionend should research the result and open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "zi",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 2, "length": 0 }
-          });
-        synthesizeComposition({ type: "compositionend", data: "zi" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_RETURN", { type: "keyup" }, aWindow);
       }, popup: true, value: "Mozi", searchString: "Mozi"
     },
@@ -234,17 +214,7 @@
     { description: "cancled compositionend should reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 0, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "" }, aWindow);
+        synthesizeComposition({ type: "compositioncommit", data: "" }, aWindow);
         synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
       }, popup: true, value: "Mozi", searchString: "Mozi"
     },
@@ -302,17 +272,7 @@
     { description: "canceled compositionend should seach the result with the latest value",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 0, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
@@ -375,17 +335,7 @@
     { description: "canceled compositionend shouldn't open the popup if it was closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 0, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
       }, popup: false, value: "", searchString: ""
     },
@@ -448,17 +398,7 @@
     { description: "canceled compositionend should open the popup if it was opened",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 0, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
       }, popup: true, value: "", searchString: ""
     },
@@ -524,17 +464,7 @@
     { description: "canceled compositionend shouldn't open the popup if the popup was closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 0, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
@@ -582,17 +512,7 @@
     { description: "compositionend should open the popup (completeDefaultIndex is true)",
       completeDefaultIndex: true,
       execute: function (aWindow) {
-        synthesizeCompositionChange(
-          { "composition":
-            { "string": "Mo",
-              "clauses":
-              [
-                { "length": 0, "attr": 0 }
-              ]
-            },
-            "caret": { "start": 2, "length": 0 }
-          }, aWindow);
-        synthesizeComposition({ type: "compositionend", data: "Mo" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
         synthesizeKey("VK_RETURN", { type: "keyup" }, aWindow);
       }, popup: true, value: "Mozilla", searchString: "Mo"
     },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/chrome/findbar_window.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/chrome/findbar_window.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/chrome/findbar_window.xul	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/chrome/findbar_window.xul	2014-11-26 21:46:02.000000000 +0000
@@ -259,17 +259,7 @@
       ok(gBrowser.contentWindow.getSelection().toString().toLowerCase() != searchStr,
          "testNormalFindWithComposition: text shouldn't be found during composition");
 
-      synthesizeCompositionChange(
-        { "composition":
-          { "string": searchStr,
-            "clauses":
-            [
-              { "length": 0, "attr": 0 }
-            ]
-          },
-          "caret": { "start": searchStr.length, "length": 0 }
-        });
-      synthesizeComposition({ type: "compositionend", data: searchStr });
+      synthesizeComposition({ type: "compositioncommitasis" });
 
       ok(gBrowser.contentWindow.getSelection().toString().toLowerCase() == searchStr,
          "testNormalFindWithComposition: text should be found after committing composition");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/chrome/window_panel.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/chrome/window_panel.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/tests/chrome/window_panel.xul	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/tests/chrome/window_panel.xul	2014-11-26 21:46:02.000000000 +0000
@@ -196,7 +196,7 @@
       if (navigator.platform.indexOf("Linux") < 0) {
         ok(panelrect.top >= 210 - mozInnerScreenY + 10, testname + "top greater");
       }
-      ok(panelrect.top <= 210 - mozInnerScreenY + 30, testname + "top less");
+      ok(panelrect.top <= 210 - mozInnerScreenY + 32, testname + "top less");
       is(panelrect.width, 120, testname + "width");
       is(panelrect.height, 40, testname + "height");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/widgets/autocomplete.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/widgets/autocomplete.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/content/widgets/autocomplete.xml	2014-11-14 09:37:31.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/content/widgets/autocomplete.xml	2014-11-26 21:46:02.000000000 +0000
@@ -564,15 +564,22 @@
           onEvent: function() {}
         })
       ]]></field>
+
+      <method name="onInput">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (!this.mIgnoreInput && this.mController.input == this) {
+            this.valueIsTyped = true;
+            this.mController.handleText();
+          }
+          this.resetActionType();
+        ]]></body>
+      </method>
     </implementation>
 
     <handlers>
       <handler event="input"><![CDATA[
-        if (!this.mIgnoreInput && this.mController.input == this) {
-          this.valueIsTyped = true;
-          this.mController.handleText();
-        }
-        this.resetActionType();
+        this.onInput(event);
       ]]></handler>
 
       <handler event="keypress" phase="capturing"
@@ -1122,7 +1129,7 @@
           // Process maxRows per chunk to improve performance and user experience
           for (let i = 0; i < this.maxRows; i++) {
             if (this._currentIndex >= matchCount)
-              return;
+              break;
 
             var item;
 
@@ -1134,9 +1141,6 @@
               getService(Components.interfaces.nsITextToSubURI).
               unEscapeURIForUI("UTF-8", controller.getValueAt(this._currentIndex));
 
-            if (typeof this.input.trimValue == "function")
-              url = this.input.trimValue(url);
-
             if (this._currentIndex < existingItemsCount) {
               // re-use the existing item
               item = this.richlistbox.childNodes[this._currentIndex];
@@ -1178,8 +1182,14 @@
             this._currentIndex++;
           }
 
-          // yield after each batch of items so that typing the url bar is responsive
-          setTimeout(function (self) { self._appendCurrentResult(); }, 0, this);
+          if (typeof this.onResultsAdded == "function")
+            this.onResultsAdded();
+
+          if (this._currentIndex < matchCount) {
+            // yield after each batch of items so that typing the url bar is
+            // responsive
+            setTimeout(function (self) { self._appendCurrentResult(); }, 0, this);
+          }
         ]]>
         </body>
       </method>
@@ -1362,8 +1372,10 @@
           }
 
           // Sort the regions by start position then end position
-          regions = regions.sort(function(a, b) let (start = a[0] - b[0])
-            start == 0 ? a[1] - b[1] : start);
+          regions = regions.sort((a, b) => {
+            let start = a[0] - b[0];
+            return (start == 0) ? a[1] - b[1] : start;
+          });
 
           // Generate the boundary indices from each region
           let start = 0;
@@ -1564,6 +1576,12 @@
           let title = this.getAttribute("title");
           let type = this.getAttribute("type");
 
+          let displayUrl = url;
+
+          let input = this.parentNode.parentNode.input;
+          if (typeof input.trimValue == "function")
+            displayUrl = input.trimValue(url);
+
           let emphasiseTitle = true;
           let emphasiseUrl = true;
 
@@ -1589,7 +1607,7 @@
             this.setAttribute("actiontype", action.type);
 
             if (action.type == "switchtab") {
-              url = action.params.url;
+              displayUrl = action.params.url;
               let desc = this._stringBundle.GetStringFromName("switchToTab");
               this._setUpDescription(this._action, desc, true);
             } else if (action.type == "searchengine") {
@@ -1611,11 +1629,11 @@
               }
             } else if (action.type == "visiturl") {
               emphasiseUrl = false;
-              url = action.params.url;
+              displayUrl = action.params.url;
 
               let sourceStr = this._stringBundle.GetStringFromName("visitURL");
               title = this._generateEmphasisPairs(sourceStr, [
-                                                    [trimURL(url), true],
+                                                    [displayUrl, true],
                                                   ]);
             }
 
@@ -1632,7 +1650,7 @@
 
             let searchEngine = "";
             [title, searchEngine] = title.split(TITLE_SEARCH_ENGINE_SEPARATOR);
-            url = this._stringBundle.formatStringFromName("searchWithEngine", [searchEngine], 1);
+            displayUrl = this._stringBundle.formatStringFromName("searchWithEngine", [searchEngine], 1);
 
             // Remove the "search" substring so that the correct style, if any,
             // is applied below.
@@ -1645,7 +1663,7 @@
 
             let sourceStr = this._stringBundle.GetStringFromName("visitURL");
             title = this._generateEmphasisPairs(sourceStr, [
-                                                 [trimURL(url), true],
+                                                 [displayUrl, true],
                                                 ]);
 
             types.delete("autofill");
@@ -1715,9 +1733,16 @@
           this._typeImage.className = "ac-type-icon" +
             (type ? " ac-result-type-" + type : "");
 
-          // Show the url as the title if we don't have a title
-          if (title == "")
-            title = url;
+          // Show the domain as the title if we don't have a title.
+          if (title == "") {
+            title = displayUrl;
+            try {
+              let uri = Services.io.newURI(url, null, null);
+              // Not all valid URLs have a domain.
+              if (uri.host)
+                title = uri.host;
+            } catch (e) {}
+          }
 
           // Emphasize the matching search terms for the description
           if (Array.isArray(title))
@@ -1725,7 +1750,7 @@
           else
             this._setUpDescription(this._title, title, !emphasiseTitle);
 
-          this._setUpDescription(this._url, url, !emphasiseUrl);
+          this._setUpDescription(this._url, displayUrl, !emphasiseUrl);
 
           // Set up overflow on a timeout because the contents of the box
           // might not have a width yet even though we just changed them
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/crashreporter/test/unit/test_crash_terminator.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/crashreporter/test/unit/test_crash_terminator.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/crashreporter/test/unit/test_crash_terminator.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/crashreporter/test/unit/test_crash_terminator.js	2014-11-26 21:46:03.000000000 +0000
@@ -21,6 +21,7 @@
   // Inform the terminator that shutdown has started
   // Pick an arbitrary notification
   terminator.observe(null, "xpcom-will-shutdown", null);
+  terminator.observe(null, "profile-before-change", null);
 
   dump("Waiting (actively) for the crash\n");
   while(true) {
@@ -30,7 +31,8 @@
 
 
 function after_crash(mdump, extra) {
-  Assert.equal(extra.ShutdownProgress, "xpcom-will-shutdown");
+  do_print("Crash signature: " + JSON.stringify(extra, null, "\t"));
+  Assert.equal(extra.ShutdownProgress, "profile-before-change");
 }
 
 function run_test() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/DevToolsUtils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/DevToolsUtils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/DevToolsUtils.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/DevToolsUtils.js	2014-11-26 21:46:03.000000000 +0000
@@ -86,11 +86,10 @@
       if (aName) {
         who += " " + aName;
       }
-      exports.reportException(who, ex);
+      return exports.reportException(who, ex);
     }
   }
 }
-
 /**
  * Interleaves two arrays element by element, returning the combined array, like
  * a zip. In the case of arrays with different sizes, undefined values will be
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/gcli/commands/screenshot.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/gcli/commands/screenshot.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/gcli/commands/screenshot.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/gcli/commands/screenshot.js	2014-11-26 21:46:03.000000000 +0000
@@ -229,7 +229,7 @@
                                Persist.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
 
         let source = ioService.newURI(data, "UTF8", null);
-        persist.saveURI(source, null, null, null, null, file, loadContext);
+        persist.saveURI(source, null, null, 0, null, null, file, loadContext);
 
         div.textContent = gcli.lookup("screenshotSavedToFile") + " \"" + filename +
                           "\"";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/LayoutHelpers.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/LayoutHelpers.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/LayoutHelpers.jsm	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/LayoutHelpers.jsm	2014-11-26 21:46:03.000000000 +0000
@@ -50,7 +50,7 @@
     }
 
     let [xOffset, yOffset] = this.getFrameOffsets(node);
-    let scale = this.calculateScale(node);
+    let scale = LayoutHelpers.getCurrentZoom(node);
 
     return {
       p1: {
@@ -91,19 +91,6 @@
   },
 
   /**
-   * Get the current zoom factor applied to the container window of a given node
-   * @param {DOMNode}
-   *        The node for which the zoom factor should be calculated
-   * @return {Number}
-   */
-  calculateScale: function(node) {
-    let win = node.ownerDocument.defaultView;
-    let winUtils = win.QueryInterface(Ci.nsIInterfaceRequestor)
-                      .getInterface(Ci.nsIDOMWindowUtils);
-    return winUtils.fullZoom;
-  },
-
-  /**
    * Compute the absolute position and the dimensions of a node, relativalely
    * to the root window.
    *
@@ -411,7 +398,7 @@
     let xOffset = 0;
     let yOffset = 0;
     let frameWin = node.ownerDocument.defaultView;
-    let scale = this.calculateScale(node);
+    let scale = LayoutHelpers.getCurrentZoom(node);
 
     while (true) {
       // Are we in the top-level window?
@@ -454,7 +441,7 @@
       return;
     }
 
-    let scale = this.calculateScale(node);
+    let scale = LayoutHelpers.getCurrentZoom(node);
 
     // Find out the offset of the node in its current frame
     let offsetLeft = 0;
@@ -607,3 +594,25 @@
   // is not native anonymous
   return parent.shadowRoot && parent.shadowRoot.contains(node);
 };
+
+/**
+ * Get the current zoom factor applied to the container window of a given node.
+ * Container windows are used as a weakmap key to store the corresponding
+ * nsIDOMWindowUtils instance to avoid querying it every time.
+ *
+ * @param {DOMNode} The node for which the zoom factor should be calculated
+ * @return {Number}
+ */
+let windowUtils = new WeakMap;
+LayoutHelpers.getCurrentZoom = function(node, map = z=>z) {
+  let win = node.ownerDocument.defaultView;
+  let utils = windowUtils.get(win);
+  if (utils) {
+    return utils.fullZoom;
+  }
+
+  utils = win.QueryInterface(Ci.nsIInterfaceRequestor)
+             .getInterface(Ci.nsIDOMWindowUtils);
+  windowUtils.set(win, utils);
+  return utils.fullZoom;
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/Loader.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/Loader.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/Loader.jsm	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/Loader.jsm	2014-11-26 21:46:03.000000000 +0000
@@ -269,7 +269,9 @@
    * @see setProvider
    */
   require: function() {
-    this._chooseProvider();
+    if (!this._provider) {
+      this._chooseProvider();
+    }
     return this.require.apply(this, arguments);
   },
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/actor-registry.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/actor-registry.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/actor-registry.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/actor-registry.js	2014-11-26 21:46:03.000000000 +0000
@@ -0,0 +1,153 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 protocol = require("devtools/server/protocol");
+const { method, custom, Arg, Option, RetVal } = protocol;
+
+const { Cu, CC, components } = require("chrome");
+const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
+const Services = require("Services");
+const { DebuggerServer } = require("devtools/server/main");
+const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
+
+/**
+ * The ActorActor gives you a handle to an actor you've dynamically
+ * registered and allows you to unregister it.
+ */
+const ActorActor = protocol.ActorClass({
+  typeName: "actorActor",
+
+  initialize: function (conn, options) {
+    protocol.Actor.prototype.initialize.call(this, conn);
+
+    this.options = options;
+  },
+
+  unregister: method(function () {
+    if (this.options.tab) {
+      DebuggerServer.removeTabActor(this.options);
+    }
+
+    if (this.options.global) {
+      DebuggerServer.removeGlobalActor(this.options);
+    }
+  }, {
+    request: {},
+    response: {}
+  })
+});
+
+const ActorActorFront = protocol.FrontClass(ActorActor, {
+  initialize: function (client, form) {
+    protocol.Front.prototype.initialize.call(this, client, form);
+  }
+});
+
+exports.ActorActorFront = ActorActorFront;
+
+/*
+ * The ActorRegistryActor allows clients to define new actors on the
+ * server. This is particularly useful for addons.
+ */
+const ActorRegistryActor = protocol.ActorClass({
+  typeName: "actorRegistry",
+
+  initialize: function (conn) {
+    protocol.Actor.prototype.initialize.call(this, conn);
+  },
+
+  registerActor: method(function (sourceText, fileName, options) {
+    const principal = CC("@mozilla.org/systemprincipal;1", "nsIPrincipal")();
+    const sandbox = Cu.Sandbox(principal);
+    const exports = sandbox.exports = {};
+    sandbox.require = require;
+
+    Cu.evalInSandbox(sourceText, sandbox, "1.8", fileName, 1);
+
+    let { prefix, constructor, type } = options;
+
+    if (type.global) {
+      DebuggerServer.addGlobalActor({
+        constructorName: constructor,
+        constructorFun: sandbox[constructor]
+      }, prefix);
+    }
+
+    if (type.tab) {
+      DebuggerServer.addTabActor({
+        constructorName: constructor,
+        constructorFun: sandbox[constructor]
+      }, prefix);
+    }
+
+    return ActorActor(this.conn, {
+      name: constructor,
+      tab: type.tab,
+      global: type.global
+    });
+  }, {
+    request: {
+      sourceText: Arg(0, "string"),
+      filename: Arg(1, "string"),
+      options: Arg(2, "json")
+    },
+
+    response: {
+      actorActor: RetVal("actorActor")
+    }
+  })
+});
+
+exports.ActorRegistryActor = ActorRegistryActor;
+
+function request(uri) {
+  return new Promise((resolve, reject) => {
+    try {
+      uri = Services.io.newURI(uri, null, null);
+    } catch (e) {
+      reject(e);
+    }
+
+    if (uri.scheme != "resource") {
+      reject(new Error(
+        "Can only register actors whose URI scheme is 'resource'."));
+    }
+
+    NetUtil.asyncFetch(uri, (stream, status, req) => {
+      if (!components.isSuccessCode(status)) {
+        reject(new Error("Request failed with status code = "
+                         + status
+                         + " after NetUtil.asyncFetch for url = "
+                         + uri));
+        return;
+      }
+
+      let source = NetUtil.readInputStreamToString(stream, stream.available());
+      stream.close();
+      resolve(source);
+    });
+  });
+}
+
+const ActorRegistryFront = protocol.FrontClass(ActorRegistryActor, {
+  initialize: function (client, form) {
+    protocol.Front.prototype.initialize.call(this, client,
+      { actor: form.actorRegistryActor });
+
+    this.manage(this);
+  },
+
+  registerActor: custom(function (uri, options) {
+    return request(uri, options)
+      .then(sourceText => {
+        return this._registerActor(sourceText, uri, options);
+      });
+  }, {
+    impl: "_registerActor"
+  })
+});
+exports.ActorRegistryFront = ActorRegistryFront;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/common.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/common.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/common.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/common.js	2014-11-26 21:46:03.000000000 +0000
@@ -33,35 +33,44 @@
   // By default the actor name will also be used for the actorID prefix.
   this._prefix = prefix;
   if (typeof(options) != "function") {
-    // Lazy actor definition, where options contains all the information
-    // required to load the actor lazily.
-    this._getConstructor = function () {
-      // Load the module
-      let mod;
-      try {
-        mod = require(options.id);
-      } catch(e) {
-        throw new Error("Unable to load actor module '" + options.id + "'.\n" +
-                        e.message + "\n" + e.stack + "\n");
-      }
-      // Fetch the actor constructor
-      let c = mod[options.constructorName];
-      if (!c) {
-        throw new Error("Unable to find actor constructor named '" +
-                        options.constructorName + "'. (Is it exported?)");
-      }
-      return c;
-    };
+    // actors definition registered by actorRegistryActor
+    if (options.constructorFun) {
+      this._getConstructor = () => options.constructorFun;
+    } else {
+      // Lazy actor definition, where options contains all the information
+      // required to load the actor lazily.
+      this._getConstructor = function () {
+        // Load the module
+        let mod;
+        try {
+          mod = require(options.id);
+        } catch(e) {
+          throw new Error("Unable to load actor module '" + options.id + "'.\n" +
+                          e.message + "\n" + e.stack + "\n");
+        }
+        // Fetch the actor constructor
+        let c = mod[options.constructorName];
+        if (!c) {
+          throw new Error("Unable to find actor constructor named '" +
+                          options.constructorName + "'. (Is it exported?)");
+        }
+        return c;
+      };
+    }
+    // Exposes `name` attribute in order to allow removeXXXActor to match
+    // the actor by its actor constructor name.
+    this.name = options.constructorName;
   } else {
     // Old actor case, where options is a function that is the actor constructor.
     this._getConstructor = () => options;
     // Exposes `name` attribute in order to allow removeXXXActor to match
-    // the actor by its actor contructor name.
+    // the actor by its actor constructor name.
     this.name = options.name;
+
     // For old actors, we allow the use of a different prefix for actorID
     // than for listTabs actor names, by fetching a prefix on the actor prototype.
     // (Used by ChromeDebuggerActor)
-    if (options.prototype.actorPrefix) {
+    if (options.prototype && options.prototype.actorPrefix) {
       this._prefix = options.prototype.actorPrefix;
     }
   }
@@ -79,9 +88,9 @@
  *
  * ObservedActorFactory fakes the following actors attributes:
  *   actorPrefix (string) Used by ActorPool.addActor to compute the actor id
- *   actorID (string) Set by ActorPool.addActor just after being instanciated
+ *   actorID (string) Set by ActorPool.addActor just after being instantiated
  *   registeredPool (object) Set by ActorPool.addActor just after being
- *                           instanciated
+ *                           instantiated
  * And exposes the following method:
  *   createActor (function) Instantiate an actor that is going to replace
  *                          this factory in the actor pool.
@@ -123,7 +132,7 @@
  * |aPool|.
  *
  * The root actor and the tab actor use this to instantiate actors that other
- * parts of the browser have specified with DebuggerServer.addTabActor antd
+ * parts of the browser have specified with DebuggerServer.addTabActor and
  * DebuggerServer.addGlobalActor.
  *
  * @param aFactories
@@ -158,11 +167,16 @@
       // Register another factory, but this time specific to this connection.
       // It creates a fake actor that looks like an regular actor in the pool,
       // but without actually instantiating the actor.
-      // It will only be instanciated on the first request made to the actor.
+      // It will only be instantiated on the first request made to the actor.
       actor = aFactories[name].createObservedActorFactory(this.conn, this);
       this._extraActors[name] = actor;
     }
-    aPool.addActor(actor);
+
+    // If the actor already exists in the pool, it may have been instantiated,
+    // so make sure not to overwrite it by a non-instantiated version.
+    if (!aPool.has(actor.actorID)) {
+      aPool.addActor(actor);
+    }
   }
 }
 
@@ -270,7 +284,13 @@
       actor.disconnect();
     }
     this._cleanups = {};
-  }
+  },
+
+  forEach: function(callback) {
+    for (let name in this._actors) {
+      callback(this._actors[name]);
+    }
+  },
 }
 
 exports.ActorPool = ActorPool;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/device.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/device.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/device.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/device.js	2014-11-26 21:46:03.000000000 +0000
@@ -69,7 +69,6 @@
 
     let appInfo = Services.appinfo;
     let win = Services.wm.getMostRecentWindow(DebuggerServer.chromeWindowType);
-    let utils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
 
     desc = {
       appid: appInfo.ID,
@@ -83,19 +82,22 @@
       geckobuildid: appInfo.platformBuildID,
       geckoversion: appInfo.platformVersion,
       changeset: this._getAppIniString("App", "SourceStamp"),
-      useragent: win.navigator.userAgent,
       locale: Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global"),
       os: null,
       hardware: "unknown",
       processor: appInfo.XPCOMABI.split("-")[0],
       compiler: appInfo.XPCOMABI.split("-")[1],
-      dpi: utils.displayDPI,
       brandName: null,
       channel: null,
       profile: null,
-      width: win.screen.width,
-      height: win.screen.height
     };
+    if (win) {
+      let utils = win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
+      desc.dpi = utils.displayDPI;
+      desc.useragent = win.navigator.userAgent;
+      desc.width = win.screen.width;
+      desc.height = win.screen.height;
+    }
 
     // Profile
     let profd = Services.dirsvc.get("ProfD", Ci.nsILocalFile);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/highlighter.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/highlighter.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/highlighter.css	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/highlighter.css	2014-11-26 21:46:03.000000000 +0000
@@ -26,7 +26,7 @@
 
 /* Box model highlighter */
 
-:-moz-native-anonymous .box-model-container {
+:-moz-native-anonymous .box-model-regions {
   opacity: 0.4;
 }
 
@@ -103,7 +103,7 @@
 
   height: 0;
   width: 0;
-  border: 14px solid hsl(210,2%,22%);
+  border: 14px solid hsl(214,13%,24%);
   border-left-color: transparent;
   border-right-color: transparent;
 }
@@ -170,3 +170,11 @@
   stroke-dasharray: 5 3;
   stroke-width: 2;
 }
+
+/* Rect highlighter */
+
+:-moz-native-anonymous .highlighted-rect {
+  position: absolute;
+  background: #80d4ff;
+  opacity: 0.8;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/highlighter.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/highlighter.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/highlighter.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/highlighter.js	2014-11-26 21:46:03.000000000 +0000
@@ -48,7 +48,8 @@
 let HIGHLIGHTER_CLASSES = exports.HIGHLIGHTER_CLASSES = {
   "BoxModelHighlighter": BoxModelHighlighter,
   "CssTransformHighlighter": CssTransformHighlighter,
-  "SelectorHighlighter": SelectorHighlighter
+  "SelectorHighlighter": SelectorHighlighter,
+  "RectHighlighter": RectHighlighter
 };
 
 /**
@@ -343,7 +344,17 @@
   },
 
   /**
-   * Display the highlighter on a given NodeActor.
+   * Show the highlighter.
+   * This calls through to the highlighter instance's |show(node, options)|
+   * method.
+   *
+   * Most custom highlighters are made to highlight DOM nodes, hence the first
+   * NodeActor argument (NodeActor as in toolkit/devtools/server/actor/inspector).
+   * Note however that some highlighters use this argument merely as a context
+   * node: the RectHighlighter for instance uses it to calculate the absolute
+   * position of the provided rect. The SelectHighlighter uses it as a base node
+   * to run the provided CSS selector on.
+   *
    * @param NodeActor The node to be highlighted
    * @param Object Options for the custom highlighter
    */
@@ -487,6 +498,40 @@
       return null;
     }
     return this._content;
+  },
+
+  /**
+   * The canvasFrame anonymous content container gets zoomed in/out with the
+   * page. If this is unwanted, i.e. if you want the inserted element to remain
+   * unzoomed, then this method can be used.
+   *
+   * Consumers of the CanvasFrameAnonymousContentHelper should call this method,
+   * it isn't executed automatically. Typically, AutoRefreshHighlighter can call
+   * it when _update is executed.
+   *
+   * The matching element will be scaled down or up by 1/zoomLevel (using css
+   * transform) to cancel the current zoom. The element's width and height
+   * styles will also be set according to the scale. Finally, the element's
+   * position will be set as absolute.
+   *
+   * Note that if the matching element already has an inline style attribute, it
+   * *won't* be preserved.
+   *
+   * @param {DOMNode} node This node is used to determine which container window
+   * should be used to read the current zoom value.
+   * @param {String} id The ID of the root element inserted with this API.
+   */
+  scaleRootElement: function(node, id) {
+    let zoom = LayoutHelpers.getCurrentZoom(node);
+    let value = "position:absolute;width:100%;height:100%;";
+
+    if (zoom !== 1) {
+      value = "position:absolute;";
+      value += "transform-origin:top left;transform:scale(" + (1/zoom) + ");";
+      value += "width:" + (100*zoom) + "%;height:" + (100*zoom) + "%;";
+    }
+
+    this.setAttributeForElement(id, "style", value);
   }
 };
 
@@ -688,35 +733,36 @@
  *
  * Structure:
  * <div class="highlighter-container">
- *   <svg class="box-model-root" hidden="true">
- *     <g class="box-model-container">
- *       <polygon class="box-model-margin" points="317,122 747,36 747,181 317,267" />
- *       <polygon class="box-model-border" points="317,128 747,42 747,161 317,247" />
- *       <polygon class="box-model-padding" points="323,127 747,42 747,161 323,246" />
- *       <polygon class="box-model-content" points="335,137 735,57 735,152 335,232" />
- *     </g>
- *     <line class="box-model-guide-top" x1="0" y1="592" x2="99999" y2="592" />
- *     <line class="box-model-guide-right" x1="735" y1="0" x2="735" y2="99999" />
- *     <line class="box-model-guide-bottom" x1="0" y1="612" x2="99999" y2="612" />
- *     <line class="box-model-guide-left" x1="334" y1="0" x2="334" y2="99999" />
- *   </svg>
- *   <div class="highlighter-nodeinfobar-container">
- *     <div class="highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-top" />
- *     <div class="highlighter-nodeinfobar">
- *       <div class="highlighter-nodeinfobar-text" align="center" flex="1">
- *         <span class="highlighter-nodeinfobar-tagname">Node name</span>
- *         <span class="highlighter-nodeinfobar-id">Node id</span>
- *         <span class="highlighter-nodeinfobar-classes">.someClass</span>
- *         <span class="highlighter-nodeinfobar-pseudo-classes">:hover</span>
+ *   <div class="box-model-root">
+ *     <svg class="box-model-elements" hidden="true">
+ *       <g class="box-model-regions">
+ *         <polygon class="box-model-margin" points="..." />
+ *         <polygon class="box-model-border" points="..." />
+ *         <polygon class="box-model-padding" points="..." />
+ *         <polygon class="box-model-content" points="..." />
+ *       </g>
+ *       <line class="box-model-guide-top" x1="..." y1="..." x2="..." y2="..." />
+ *       <line class="box-model-guide-right" x1="..." y1="..." x2="..." y2="..." />
+ *       <line class="box-model-guide-bottom" x1="..." y1="..." x2="..." y2="..." />
+ *       <line class="box-model-guide-left" x1="..." y1="..." x2="..." y2="..." />
+ *     </svg>
+ *     <div class="box-model-nodeinfobar-container">
+ *       <div class="box-model-nodeinfobar-arrow highlighter-nodeinfobar-arrow-top" />
+ *       <div class="box-model-nodeinfobar">
+ *         <div class="box-model-nodeinfobar-text" align="center">
+ *           <span class="box-model-nodeinfobar-tagname">Node name</span>
+ *           <span class="box-model-nodeinfobar-id">Node id</span>
+ *           <span class="box-model-nodeinfobar-classes">.someClass</span>
+ *           <span class="box-model-nodeinfobar-pseudo-classes">:hover</span>
+ *         </div>
  *       </div>
+ *       <div class="box-model-nodeinfobar-arrow box-model-nodeinfobar-arrow-bottom"/>
  *     </div>
- *     <div class="highlighter-nodeinfobar-arrow highlighter-nodeinfobar-arrow-bottom"/>
  *   </div>
  * </div>
  */
 function BoxModelHighlighter(tabActor) {
   AutoRefreshHighlighter.call(this, tabActor);
-  EventEmitter.decorate(this);
 
   this.markup = new CanvasFrameAnonymousContentHelper(this.tabActor,
     this._buildMarkup.bind(this));
@@ -753,102 +799,142 @@
     let highlighterContainer = doc.createElement("div");
     highlighterContainer.className = "highlighter-container";
 
+    // Build the root wrapper, used to adapt to the page zoom.
+    let rootWrapper = createNode(this.win, {
+      parent: highlighterContainer,
+      attributes: {
+        "id": "root",
+        "class": "root"
+      },
+      prefix: this.ID_CLASS_PREFIX
+    });
+
     // Building the SVG element with its polygons and lines
 
-    let svgRoot = this._createSVGNode("svg", highlighterContainer, {
-      "id": "root",
-      "class": "root",
-      "width": "100%",
-      "height": "100%",
-      "style": "width:100%;height:100%;",
-      "hidden": "true"
+    let svg = createSVGNode(this.win, {
+      nodeType: "svg",
+      parent: rootWrapper,
+      attributes: {
+        "id": "elements",
+        "width": "100%",
+        "height": "100%",
+        "style": "width:100%;height:100%;",
+        "hidden": "true"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
-    let boxModelContainer = this._createSVGNode("g", svgRoot, {
-      "class": "container"
+    let regions = createSVGNode(this.win, {
+      nodeType: "g",
+      parent: svg,
+      attributes: {
+        "class": "regions"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
     for (let region of BOX_MODEL_REGIONS) {
-      this._createSVGNode("polygon", boxModelContainer, {
-        "class": region,
-        "id": region
+      createSVGNode(this.win, {
+        nodeType: "polygon",
+        parent: regions,
+        attributes: {
+          "class": region,
+          "id": region
+        },
+        prefix: this.ID_CLASS_PREFIX
       });
     }
 
     for (let side of BOX_MODEL_SIDES) {
-      this._createSVGNode("line", svgRoot, {
-        "class": "guide-" + side,
-        "id": "guide-" + side,
-        "stroke-width": GUIDE_STROKE_WIDTH
+      createSVGNode(this.win, {
+        nodeType: "line",
+        parent: svg,
+        attributes: {
+          "class": "guide-" + side,
+          "id": "guide-" + side,
+          "stroke-width": GUIDE_STROKE_WIDTH
+        },
+        prefix: this.ID_CLASS_PREFIX
       });
     }
 
-    highlighterContainer.appendChild(svgRoot);
-
     // Building the nodeinfo bar markup
 
-    let infobarContainer = this._createNode("div", highlighterContainer, {
-      "class": "nodeinfobar-container",
-      "id": "nodeinfobar-container",
-      "position": "top",
-      "hidden": "true"
+    let infobarContainer = createNode(this.win, {
+      parent: rootWrapper,
+      attributes: {
+        "class": "nodeinfobar-container",
+        "id": "nodeinfobar-container",
+        "position": "top",
+        "hidden": "true"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
-    let nodeInfobar = this._createNode("div", infobarContainer, {
-      "class": "nodeinfobar"
+    let nodeInfobar = createNode(this.win, {
+      parent: infobarContainer,
+      attributes: {
+        "class": "nodeinfobar"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
-    let texthbox = this._createNode("div", nodeInfobar, {
-      "class": "nodeinfobar-text"
+    let texthbox = createNode(this.win, {
+      parent: nodeInfobar,
+      attributes: {
+        "class": "nodeinfobar-text"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createNode("span", texthbox, {
-      "class": "nodeinfobar-tagname",
-      "id": "nodeinfobar-tagname"
+    createNode(this.win, {
+      nodeType: "span",
+      parent: texthbox,
+      attributes: {
+        "class": "nodeinfobar-tagname",
+        "id": "nodeinfobar-tagname"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createNode("span", texthbox, {
-      "class": "nodeinfobar-id",
-      "id": "nodeinfobar-id"
+    createNode(this.win, {
+      nodeType: "span",
+      parent: texthbox,
+      attributes: {
+        "class": "nodeinfobar-id",
+        "id": "nodeinfobar-id"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createNode("span", texthbox, {
-      "class": "nodeinfobar-classes",
-      "id": "nodeinfobar-classes"
+    createNode(this.win, {
+      nodeType: "span",
+      parent: texthbox,
+      attributes: {
+        "class": "nodeinfobar-classes",
+        "id": "nodeinfobar-classes"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createNode("span", texthbox, {
-      "class": "nodeinfobar-pseudo-classes",
-      "id": "nodeinfobar-pseudo-classes"
+    createNode(this.win, {
+      nodeType: "span",
+      parent: texthbox,
+      attributes: {
+        "class": "nodeinfobar-pseudo-classes",
+        "id": "nodeinfobar-pseudo-classes"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createNode("span", texthbox, {
-      "class": "nodeinfobar-dimensions",
-      "id": "nodeinfobar-dimensions"
+    createNode(this.win, {
+      nodeType: "span",
+      parent: texthbox,
+      attributes: {
+        "class": "nodeinfobar-dimensions",
+        "id": "nodeinfobar-dimensions"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
     return highlighterContainer;
   },
 
-  _createSVGNode: function(nodeType, parent, attributes={}) {
-    return this._createNode(nodeType, parent, attributes, SVG_NS);
-  },
-
-  _createNode: function(nodeType, parent, attributes={}, namespace=null) {
-    let node;
-    if (namespace) {
-      node = this.win.document.createElementNS(namespace, nodeType);
-    } else {
-      node = this.win.document.createElement(nodeType);
-    }
-
-    for (let name in attributes) {
-      let value = attributes[name];
-      if (name === "class" || name === "id") {
-        value = this.ID_CLASS_PREFIX + value
-      }
-      node.setAttribute(name, value);
-    }
-
-    parent.appendChild(node);
-    return node;
-  },
-
   /**
    * Destroy the nodes. Remove listeners.
    */
@@ -941,15 +1027,15 @@
    * Hide the box model
    */
   _hideBoxModel: function() {
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "root", "hidden",
-      "true");
+    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "elements",
+      "hidden", "true");
   },
 
   /**
    * Show the box model
    */
   _showBoxModel: function() {
-    this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + "root",
+    this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + "elements",
       "hidden");
   },
 
@@ -991,6 +1077,10 @@
         }
       }
 
+      // Un-zoom the root wrapper if the page was zoomed.
+      let rootId = this.ID_CLASS_PREFIX + "root";
+      this.markup.scaleRootElement(this.currentNode, rootId);
+
       return true;
     }
 
@@ -1244,76 +1334,103 @@
   _buildMarkup: function() {
     let doc = this.win.document;
 
-    let container = doc.createElement("div");
-    container.className = "highlighter-container";
+    let container = createNode(this.win, {
+      attributes: {
+        "class": "highlighter-container"
+      }
+    });
 
-    let svgRoot = this._createSVGNode("svg", container, {
-      "class": "root",
-      "id": "root",
-      "hidden": "true",
-      "width": "100%",
-      "height": "100%"
+    // The root wrapper is used to unzoom the highlighter when needed.
+    let rootWrapper = createNode(this.win, {
+      parent: container,
+      attributes: {
+        "id": "root",
+        "class": "root"
+      },
+      prefix: this.ID_CLASS_PREFIX
+    });
+
+    let svg = createSVGNode(this.win, {
+      nodeType: "svg",
+      parent: rootWrapper,
+      attributes: {
+        "id": "elements",
+        "hidden": "true",
+        "width": "100%",
+        "height": "100%"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
     // Add a marker tag to the svg root for the arrow tip
     this.markerId = "arrow-marker-" + MARKER_COUNTER;
     MARKER_COUNTER ++;
-    let marker = this._createSVGNode("marker", svgRoot, {
-      "id": this.markerId,
-      "markerWidth": "10",
-      "markerHeight": "5",
-      "orient": "auto",
-      "markerUnits": "strokeWidth",
-      "refX": "10",
-      "refY": "5",
-      "viewBox": "0 0 10 10",
+    let marker = createSVGNode(this.win, {
+      nodeType: "marker",
+      parent: svg,
+      attributes: {
+        "id": this.markerId,
+        "markerWidth": "10",
+        "markerHeight": "5",
+        "orient": "auto",
+        "markerUnits": "strokeWidth",
+        "refX": "10",
+        "refY": "5",
+        "viewBox": "0 0 10 10"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createSVGNode("path", marker, {
-      "d": "M 0 0 L 10 5 L 0 10 z",
-      "fill": "#08C"
+    createSVGNode(this.win, {
+      nodeType: "path",
+      parent: marker,
+      attributes: {
+        "d": "M 0 0 L 10 5 L 0 10 z",
+        "fill": "#08C"
+      }
     });
 
-    let shapesGroup = this._createSVGNode("g", svgRoot);
+    let shapesGroup = createSVGNode(this.win, {
+      nodeType: "g",
+      parent: svg
+    });
 
     // Create the 2 polygons (transformed and untransformed)
-    this._createSVGNode("polygon", shapesGroup, {
-      "id": "untransformed",
-      "class": "untransformed"
+    createSVGNode(this.win, {
+      nodeType: "polygon",
+      parent: shapesGroup,
+      attributes: {
+        "id": "untransformed",
+        "class": "untransformed"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
-    this._createSVGNode("polygon", shapesGroup, {
-      "id": "transformed",
-      "class": "transformed"
+    createSVGNode(this.win, {
+      nodeType: "polygon",
+      parent: shapesGroup,
+      attributes: {
+        "id": "transformed",
+        "class": "transformed"
+      },
+      prefix: this.ID_CLASS_PREFIX
     });
 
     // Create the arrows
     for (let nb of ["1", "2", "3", "4"]) {
-      this._createSVGNode("line", shapesGroup, {
-        "id": "line" + nb,
-        "class": "line",
-        "marker-end": "url(#" + this.markerId + ")"
+      createSVGNode(this.win, {
+        nodeType: "line",
+        parent: shapesGroup,
+        attributes: {
+          "id": "line" + nb,
+          "class": "line",
+          "marker-end": "url(#" + this.markerId + ")"
+        },
+        prefix: this.ID_CLASS_PREFIX
       });
     }
 
-    container.appendChild(svgRoot);
-
     return container;
   },
 
-  _createSVGNode: function(nodeType, parent, attributes={}) {
-    let node = this.win.document.createElementNS(SVG_NS, nodeType);
-
-    for (let name in attributes) {
-      let value = attributes[name];
-      if (name === "class" || name === "id") {
-        value = this.ID_CLASS_PREFIX + value
-      }
-      node.setAttribute(name, value);
-    }
-
-    parent.appendChild(node);
-    return node;
-  },
-
   /**
    * Destroy the nodes. Remove listeners.
    */
@@ -1390,6 +1507,9 @@
       this._setLinePoints(untransformedQuad["p" + nb], quad["p" + nb], "line" + nb);
     }
 
+    // Adapt to the current zoom
+    this.markup.scaleRootElement(this.currentNode, this.ID_CLASS_PREFIX + "root");
+
     this._showShapes();
   },
 
@@ -1401,11 +1521,13 @@
   },
 
   _hideShapes: function() {
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "root", "hidden", "true");
+    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "elements",
+      "hidden", "true");
   },
 
   _showShapes: function() {
-    this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + "root", "hidden");
+    this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + "elements",
+      "hidden");
   }
 });
 
@@ -1473,6 +1595,86 @@
 };
 
 /**
+ * The RectHighlighter is a class that draws a rectangle highlighter at specific
+ * coordinates.
+ * It does *not* highlight DOM nodes, but rects.
+ * It also does *not* update dynamically, it only highlights a rect and remains
+ * there as long as it is shown.
+ */
+function RectHighlighter(tabActor) {
+  this.win = tabActor.window;
+  this.layoutHelpers = new LayoutHelpers(this.win);
+  this.markup = new CanvasFrameAnonymousContentHelper(tabActor,
+    this._buildMarkup.bind(this));
+}
+
+RectHighlighter.prototype = {
+  _buildMarkup: function() {
+    let doc = this.win.document;
+
+    let container = doc.createElement("div");
+    container.className = "highlighter-container";
+    container.innerHTML = '<div id="highlighted-rect" ' +
+                          'class="highlighted-rect" hidden="true">';
+
+    return container;
+  },
+
+  destroy: function() {
+    this.win = null;
+    this.layoutHelpers = null;
+    this.markup.destroy();
+  },
+
+  _hasValidOptions: function(options) {
+    let isValidNb = n => typeof n === "number" && n >= 0 && isFinite(n);
+    return options && options.rect &&
+           isValidNb(options.rect.x) &&
+           isValidNb(options.rect.y) &&
+           options.rect.width && isValidNb(options.rect.width) &&
+           options.rect.height && isValidNb(options.rect.height);
+  },
+
+  /**
+   * @param {DOMNode} node The highlighter rect is relatively positioned to the
+   * viewport this node is in. Using the provided node, the highligther will get
+   * the parent documentElement and use it as context to position the
+   * highlighter correctly.
+   * @param {Object} options Accepts the following options:
+   * - rect: mandatory object that should have the x, y, width, height properties
+   * - fill: optional fill color for the rect
+   */
+  show: function(node, options) {
+    if (!this._hasValidOptions(options) || !node || !node.ownerDocument) {
+      this.hide();
+      return;
+    }
+
+    let contextNode = node.ownerDocument.documentElement;
+
+    // Caculate the absolute rect based on the context node's adjusted quads.
+    let {bounds} = this.layoutHelpers.getAdjustedQuads(contextNode);
+    let x = "left:" + (bounds.x + options.rect.x) + "px;";
+    let y = "top:" + (bounds.y + options.rect.y) + "px;";
+    let width = "width:" + options.rect.width + "px;";
+    let height = "height:" + options.rect.height + "px;";
+
+    let style = x + y + width + height;
+    if (options.fill) {
+      style += "background:" + options.fill + ";";
+    }
+
+    // Set the coordinates of the highlighter and show it
+    this.markup.setAttributeForElement("highlighted-rect", "style", style);
+    this.markup.removeAttributeForElement("highlighted-rect", "hidden");
+  },
+
+  hide: function() {
+    this.markup.setAttributeForElement("highlighted-rect", "hidden", "true");
+  }
+};
+
+/**
  * The SimpleOutlineHighlighter is a class that has the same API than the
  * BoxModelHighlighter, but adds a pseudo-class on the target element itself
  * to draw a simple css outline around the element.
@@ -1565,6 +1767,63 @@
   return tabActor.window.document.documentElement.namespaceURI === XUL_NS;
 }
 
+/**
+ * Helper function that creates SVG DOM nodes.
+ * @param {Window} This window's document will be used to create the element
+ * @param {Object} Options for the node include:
+ * - nodeType: the type of node, defaults to "box".
+ * - attributes: a {name:value} object to be used as attributes for the node.
+ * - prefix: a string that will be used to prefix the values of the id and class
+ *   attributes.
+ * - parent: if provided, the newly created element will be appended to this
+ *   node.
+ */
+function createSVGNode(win, options) {
+  if (!options.nodeType) {
+    options.nodeType = "box";
+  }
+  options.namespace = SVG_NS;
+  return createNode(win, options);
+}
+
+/**
+ * Helper function that creates DOM nodes.
+ * @param {Window} This window's document will be used to create the element
+ * @param {Object} Options for the node include:
+ * - nodeType: the type of node, defaults to "div".
+ * - namespace: if passed, doc.createElementNS will be used instead of
+ *   doc.creatElement.
+ * - attributes: a {name:value} object to be used as attributes for the node.
+ * - prefix: a string that will be used to prefix the values of the id and class
+ *   attributes.
+ * - parent: if provided, the newly created element will be appended to this
+ *   node.
+ */
+function createNode(win, options) {
+  let type = options.nodeType || "div";
+
+  let node;
+  if (options.namespace) {
+    node = win.document.createElementNS(options.namespace, type);
+  } else {
+    node = win.document.createElement(type);
+  }
+
+  for (let name in options.attributes || {}) {
+    let value = options.attributes[name];
+    if (options.prefix && (name === "class" || name === "id")) {
+      value = options.prefix + value
+    }
+    node.setAttribute(name, value);
+  }
+
+  if (options.parent) {
+    options.parent.appendChild(node);
+  }
+
+  return node;
+}
+
 XPCOMUtils.defineLazyGetter(this, "DOMUtils", function () {
   return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils)
 });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/inspector.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/inspector.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/inspector.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/inspector.js	2014-11-26 21:46:03.000000000 +0000
@@ -56,6 +56,7 @@
 const {Arg, Option, method, RetVal, types} = protocol;
 const {LongStringActor, ShortLongString} = require("devtools/server/actors/string");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
 const object = require("sdk/util/object");
 const events = require("sdk/event/core");
 const {Unknown} = require("sdk/platform/xpcom");
@@ -1041,14 +1042,7 @@
    */
   items: method(function(start=0, end=this.nodeList.length) {
     let items = [this.walker._ref(item) for (item of Array.prototype.slice.call(this.nodeList, start, end))];
-    let newParents = new Set();
-    for (let item of items) {
-      this.walker.ensurePathToRoot(item, newParents);
-    }
-    return {
-      nodes: items,
-      newParents: [node for (node of newParents)]
-    }
+    return this.walker.attachElements(items);
   }, {
     request: {
       start: Arg(0, "nullable:number"),
@@ -1298,12 +1292,43 @@
   cancelPick: method(function() {}),
   highlight: method(function(node) {}, {request: {node: Arg(0, "nullable:domnode")}}),
 
+  /**
+   * Ensures that the node is attached and it can be accessed from the root.
+   *
+   * @param {(Node|NodeActor)} nodes The nodes
+   * @return {Object} An object compatible with the disconnectedNode type.
+   */
   attachElement: function(node) {
-    node = this._ref(node);
-    let newParents = this.ensurePathToRoot(node);
+    let { nodes, newParents } = this.attachElements([node]);
     return {
-      node: node,
-      newParents: [parent for (parent of newParents)]
+      node: nodes[0],
+      newParents: newParents
+    };
+  },
+
+  /**
+   * Ensures that the nodes are attached and they can be accessed from the root.
+   *
+   * @param {(Node[]|NodeActor[])} nodes The nodes
+   * @return {Object} An object compatible with the disconnectedNodeArray type.
+   */
+  attachElements: function(nodes) {
+    let nodeActors = [];
+    let newParents = new Set();
+    for (let node of nodes) {
+      // Be sure we deal with NodeActor only.
+      if (!(node instanceof NodeActor))
+        node = this._ref(node);
+
+      this.ensurePathToRoot(node, newParents);
+      // If nodes may be an array of raw nodes, we're sure to only have
+      // NodeActors with the following array.
+      nodeActors.push(node);
+    }
+
+    return {
+      nodes: nodeActors,
+      newParents: [...newParents]
     };
   },
 
@@ -2053,7 +2078,28 @@
   }),
 
   /**
+   * Set a node's innerHTML property.
+   *
+   * @param {NodeActor} node The node.
+   * @param {string} value The piece of HTML content.
+   */
+  setInnerHTML: method(function(node, value) {
+    let rawNode = node.rawNode;
+    if (rawNode.nodeType !== rawNode.ownerDocument.ELEMENT_NODE)
+      throw new Error("Can only change innerHTML to element nodes");
+    rawNode.innerHTML = value;
+  }, {
+    request: {
+      node: Arg(0, "domnode"),
+      value: Arg(1, "string"),
+    },
+    response: {}
+  }),
+
+  /**
    * Get a node's outerHTML property.
+   *
+   * @param {NodeActor} node The node.
    */
   outerHTML: method(function(node) {
     return LongStringActor(this.conn, node.rawNode.outerHTML);
@@ -2068,6 +2114,9 @@
 
   /**
    * Set a node's outerHTML property.
+   *
+   * @param {NodeActor} node The node.
+   * @param {string} value The piece of HTML content.
    */
   setOuterHTML: method(function(node, value) {
     let parsedDOM = DOMParser.parseFromString(value, "text/html");
@@ -2116,27 +2165,104 @@
   }, {
     request: {
       node: Arg(0, "domnode"),
-      value: Arg(1),
+      value: Arg(1, "string"),
     },
     response: {}
   }),
 
   /**
+   * Insert adjacent HTML to a node.
+   *
+   * @param {Node} node
+   * @param {string} position One of "beforeBegin", "afterBegin", "beforeEnd",
+   *                          "afterEnd" (see Element.insertAdjacentHTML).
+   * @param {string} value The HTML content.
+   */
+  insertAdjacentHTML: method(function(node, position, value) {
+    let rawNode = node.rawNode;
+    // Don't insert anything adjacent to the document element,
+    // the head or the body.
+    if (node.isDocumentElement()) {
+      throw new Error("Can't insert adjacent element to the root.");
+    }
+
+    let isInsertAsSibling = position === "beforeBegin" ||
+      position === "afterEnd";
+    if ((rawNode.tagName === "BODY" || rawNode.tagName === "HEAD") &&
+      isInsertAsSibling) {
+      throw new Error("Can't insert element before or after the body " +
+        "or the head.");
+    }
+
+    let rawParentNode = rawNode.parentNode;
+    if (!rawParentNode && isInsertAsSibling) {
+      throw new Error("Can't insert as sibling without parent node.");
+    }
+
+    // We can't use insertAdjacentHTML, because we want to return the nodes
+    // being created (so the front can remove them if the user undoes
+    // the change). So instead, use Range.createContextualFragment().
+    let range = rawNode.ownerDocument.createRange();
+    if (position === "beforeBegin" || position === "afterEnd") {
+      range.selectNode(rawNode);
+    } else {
+      range.selectNodeContents(rawNode);
+    }
+    let docFrag = range.createContextualFragment(value);
+    let newRawNodes = Array.from(docFrag.childNodes);
+    switch (position) {
+      case "beforeBegin":
+        rawParentNode.insertBefore(docFrag, rawNode);
+        break;
+      case "afterEnd":
+        // Note: if the second argument is null, rawParentNode.insertBefore
+        // behaves like rawParentNode.appendChild.
+        rawParentNode.insertBefore(docFrag, rawNode.nextSibling);
+      case "afterBegin":
+        rawNode.insertBefore(docFrag, rawNode.firstChild);
+        break;
+      case "beforeEnd":
+        rawNode.appendChild(docFrag);
+        break;
+      default:
+        throw new Error('Invalid position value. Must be either ' +
+          '"beforeBegin", "beforeEnd", "afterBegin" or "afterEnd".');
+    }
+
+    return this.attachElements(newRawNodes);
+  }, {
+    request: {
+      node: Arg(0, "domnode"),
+      position: Arg(1, "string"),
+      value: Arg(2, "string")
+    },
+    response: RetVal("disconnectedNodeArray")
+  }),
+
+  /**
+   * Test whether a node is a document or a document element.
+   *
+   * @param {NodeActor} node The node to remove.
+   * @return {boolean} True if the node is a document or a document element.
+   */
+  isDocumentOrDocumentElementNode: function(node) {
+      return ((node.rawNode.ownerDocument &&
+        node.rawNode.ownerDocument.documentElement === this.rawNode) ||
+        node.rawNode.nodeType === Ci.nsIDOMNode.DOCUMENT_NODE);
+  },
+
+  /**
    * Removes a node from its parent node.
    *
+   * @param {NodeActor} node The node to remove.
    * @returns The node's nextSibling before it was removed.
    */
   removeNode: method(function(node) {
-    if ((node.rawNode.ownerDocument &&
-         node.rawNode.ownerDocument.documentElement === this.rawNode) ||
-         node.rawNode.nodeType === Ci.nsIDOMNode.DOCUMENT_NODE) {
+    if (this.isDocumentOrDocumentElementNode(node))
       throw Error("Cannot remove document or document elements.");
-    }
     let nextSibling = this.nextSibling(node);
-    if (node.rawNode.parentNode) {
-      node.rawNode.parentNode.removeChild(node.rawNode);
-      // Mutation events will take care of the rest.
-    }
+    node.rawNode.remove();
+    // Mutation events will take care of the rest.
     return nextSibling;
   }, {
     request: {
@@ -2148,6 +2274,29 @@
   }),
 
   /**
+   * Removes an array of nodes from their parent node.
+   *
+   * @param {NodeActor[]} nodes The nodes to remove.
+   */
+  removeNodes: method(function(nodes) {
+    // Check that all nodes are valid before processing the removals.
+    for (let node of nodes) {
+      if (this.isDocumentOrDocumentElementNode(node))
+        throw Error("Cannot remove document or document elements.");
+    }
+
+    for (let node of nodes) {
+      node.rawNode.remove();
+      // Mutation events will take care of the rest.
+    }
+  }, {
+    request: {
+      node: Arg(0, "array:domnode")
+    },
+    response: {}
+  }),
+
+  /**
    * Insert a node into the DOM.
    */
   insertBefore: method(function(node, parent, sibling) {
@@ -2876,7 +3025,18 @@
       walkerActor._orphaned.add(this.conn._transport._serverConnection.getActor(top.actorID));
     }
     return returnNode;
-  }
+  },
+
+  removeNode: protocol.custom(Task.async(function* (node) {
+    let previousSibling = yield this.previousSibling(node);
+    let nextSibling = yield this._removeNode(node);
+    return {
+      previousSibling: previousSibling,
+      nextSibling: nextSibling,
+    };
+  }), {
+    impl: "_removeNode"
+  }),
 });
 
 /**
@@ -3224,10 +3384,9 @@
   }
 };
 
-function isXULDocument(doc) {
-  return doc &&
-         doc.documentElement &&
-         doc.documentElement.namespaceURI === XUL_NS;
+function isXULElement(el) {
+  return el &&
+         el.namespaceURI === XUL_NS;
 }
 
 /**
@@ -3247,7 +3406,7 @@
   //   2) ::before/::after - we do want this to show in the walker so
   //      they can be inspected.
   if (LayoutHelpers.isNativeAnonymous(aNode) &&
-      !isXULDocument(aNode.ownerDocument) &&
+      !isXULElement(aNode.parentNode) &&
       (
         aNode.nodeName !== "_moz_generated_content_before" &&
         aNode.nodeName !== "_moz_generated_content_after")
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/root.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/root.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/root.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/root.js	2014-11-26 21:46:03.000000000 +0000
@@ -119,7 +119,11 @@
 
   traits: {
     sources: true,
+    // Whether the inspector actor allows modifying outer HTML.
     editOuterHTML: true,
+    // Whether the inspector actor allows modifying innerHTML and inserting
+    // adjacent HTML.
+    pasteHTML: true,
     // Whether the server-side highlighter actor exists and can be used to
     // remotely highlight nodes (see server/actors/highlighter.js)
     highlightable: true,
@@ -128,7 +132,8 @@
     customHighlighters: [
       "BoxModelHighlighter",
       "CssTransformHighlighter",
-      "SelectorHighlighter"
+      "SelectorHighlighter",
+      "RectHighlighter"
     ],
     // Whether the inspector actor implements the getImageDataFromURL
     // method that returns data-uris for image URLs. This is used for image
@@ -280,14 +285,12 @@
         newActorPool.addActor(tabActor);
         tabActorList.push(tabActor);
       }
-
       /* DebuggerServer.addGlobalActor support: create actors. */
       if (!this._globalActorPool) {
         this._globalActorPool = new ActorPool(this.conn);
-        this._createExtraActors(this._parameters.globalActorFactories, this._globalActorPool);
         this.conn.addActorPool(this._globalActorPool);
       }
-
+      this._createExtraActors(this._parameters.globalActorFactories, this._globalActorPool);
       /*
        * Drop the old actorID -> actor map. Actors that still mattered were
        * added to the new map; others will go away.
@@ -436,7 +439,7 @@
    * is here because the Style Editor and Inspector share style sheet actors.
    *
    * @param DOMStyleSheet styleSheet
-   *        The style sheet to creat an actor for.
+   *        The style sheet to create an actor for.
    * @return StyleSheetActor actor
    *         The actor for this style sheet.
    *
@@ -451,7 +454,28 @@
     this._globalActorPool.addActor(actor);
 
     return actor;
-  }
+  },
+
+  /**
+   * Remove the extra actor (added by DebuggerServer.addGlobalActor or
+   * DebuggerServer.addTabActor) name |aName|.
+   */
+  removeActorByName: function(aName) {
+    if (aName in this._extraActors) {
+      const actor = this._extraActors[aName];
+      if (this._globalActorPool.has(actor)) {
+        this._globalActorPool.removeActor(actor);
+      }
+      if (this._tabActorPool) {
+        // Iterate over TabActor instances to also remove tab actors
+        // created during listTabs for each document.
+        this._tabActorPool.forEach(tab => {
+          tab.removeActorByName(aName);
+        });
+      }
+      delete this._extraActors[aName];
+    }
+   }
 };
 
 RootActor.prototype.requestTypes = {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/timeline.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/timeline.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/timeline.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/timeline.js	2014-11-26 21:46:03.000000000 +0000
@@ -158,7 +158,6 @@
     }
 
     if (markers.length > 0) {
-      this._postProcessMarkers(markers);
       events.emit(this, "markers", markers, endTime);
     }
     if (this._memoryActor) {
@@ -174,25 +173,6 @@
   },
 
   /**
-   * Some markers need post processing.
-   * We will eventually do that platform side: bug 1069661
-   */
-  _postProcessMarkers: function(m) {
-    m.forEach(m => {
-      // A marker named "ConsoleTime:foobar" needs
-      // to be renamed "ConsoleTime".
-      let split = m.name.match(/ConsoleTime:(.*)/);
-      if (split && split.length > 0) {
-        if (!m.detail) {
-          m.detail = {}
-        }
-        m.detail.causeName = split[1];
-        m.name = "ConsoleTime";
-      }
-    });
-  },
-
-  /**
    * Are we recording profile markers currently?
    */
   isRecording: method(function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/webbrowser.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/webbrowser.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/webbrowser.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/webbrowser.js	2014-11-26 21:46:03.000000000 +0000
@@ -856,7 +856,7 @@
   _appendExtraActors: appendExtraActors,
 
   /**
-   * Does the actual work of attching to a tab.
+   * Does the actual work of attaching to a tab.
    */
   _attach: function BTA_attach() {
     if (this._attached) {
@@ -1512,7 +1512,7 @@
    * is here because the Style Editor and Inspector share style sheet actors.
    *
    * @param DOMStyleSheet styleSheet
-   *        The style sheet to creat an actor for.
+   *        The style sheet to create an actor for.
    * @return StyleSheetActor actor
    *         The actor for this style sheet.
    *
@@ -1527,7 +1527,17 @@
     this._tabPool.addActor(actor);
 
     return actor;
-  }
+  },
+
+  removeActorByName: function BTA_removeActor(aName) {
+    if (aName in this._extraActors) {
+      const actor = this._extraActors[aName];
+      if (this._tabActorPool.has(actor)) {
+        this._tabActorPool.removeActor(actor);
+      }
+      delete this._extraActors[aName];
+    }
+  },
 };
 
 /**
@@ -1550,7 +1560,7 @@
  * <browser> tab. Most of the implementation comes from TabActor.
  *
  * @param aConnection DebuggerServerConnection
- *        The conection to the client.
+ *        The connection to the client.
  * @param aBrowser browser
  *        The browser instance that contains this tab.
  * @param aTabBrowser tabbrowser
@@ -1801,6 +1811,11 @@
       url: this.url,
       debuggable: this._addon.isDebuggable,
       consoleActor: this._consoleActor.actorID,
+
+      traits: {
+        highlightable: false,
+        networkMonitor: false,
+      },
     };
   },
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/webconsole.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/webconsole.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/actors/webconsole.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/actors/webconsole.js	2014-11-26 21:46:03.000000000 +0000
@@ -787,7 +787,7 @@
       result: resultGrip,
       timestamp: timestamp,
       exception: errorGrip,
-      exceptionMessage: errorMessage,
+      exceptionMessage: this._createStringGrip(errorMessage),
       helperResult: helperResult,
     };
   },
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/main.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/main.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/main.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/main.js	2014-11-26 21:46:03.000000000 +0000
@@ -324,7 +324,7 @@
    *        - constructor (string):
    *          the name of the exported symbol to be used as the actor
    *          constructor.
-   *        - type (a dictionnary of booleans with following attribute names):
+   *        - type (a dictionary of booleans with following attribute names):
    *          - "global"
    *            registers a global actor instance, if true.
    *            A global actor has the root actor as its parent.
@@ -347,7 +347,7 @@
         throw new Error("Lazy actor definition for '" + id + "' requires a string 'constructor' option.");
       }
       if (!("global" in type) && !("tab" in type)) {
-        throw new Error("Lazy actor definition for '" + id + "' requires a dictionnary 'type' option whose attributes can be 'global' or 'tab'.");
+        throw new Error("Lazy actor definition for '" + id + "' requires a dictionary 'type' option whose attributes can be 'global' or 'tab'.");
       }
       let name = prefix + "Actor";
       let mod = {
@@ -433,6 +433,11 @@
         constructor: "PreferenceActor",
         type: { global: true }
       });
+      this.registerModule("devtools/server/actors/actor-registry", {
+        prefix: "actorRegistry",
+        constructor: "ActorRegistryActor",
+        type: { global: true }
+      });
     }
 
     this.registerModule("devtools/server/actors/webapps", {
@@ -979,6 +984,8 @@
   /**
    * Unregisters the handler for the specified tab-scoped request type.
    * This may be used for example by add-ons when shutting down or upgrading.
+   * When unregistering an existing tab actor remove related tab factory
+   * as well as all existing instances of the actor.
    *
    * @param aActor function, object
    *      In case of function:
@@ -992,6 +999,9 @@
       if ((handler.name && handler.name == aActor.name) ||
           (handler.id && handler.id == aActor.id)) {
         delete DebuggerServer.tabActorFactories[name];
+        for (let connID of Object.getOwnPropertyNames(this._connections)) {
+          this._connections[connID].rootActor.removeActorByName(name);
+        }
       }
     }
   },
@@ -1033,6 +1043,8 @@
   /**
    * Unregisters the handler for the specified browser-scoped request type.
    * This may be used for example by add-ons when shutting down or upgrading.
+   * When unregistering an existing global actor remove related global factory
+   * as well as all existing instances of the actor.
    *
    * @param aActor function, object
    *      In case of function:
@@ -1046,6 +1058,9 @@
       if ((handler.name && handler.name == aActor.name) ||
           (handler.id && handler.id == aActor.id)) {
         delete DebuggerServer.globalActorFactories[name];
+        for (let connID of Object.getOwnPropertyNames(this._connections)) {
+          this._connections[connID].rootActor.removeActorByName(name);
+        }
       }
     }
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/moz.build	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/moz.build	2014-11-26 21:46:03.000000000 +0000
@@ -33,6 +33,7 @@
 ]
 
 EXTRA_JS_MODULES.devtools.server.actors += [
+    'actors/actor-registry.js',
     'actors/call-watcher.js',
     'actors/canvas.js',
     'actors/child-process.js',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html	2014-11-26 21:46:04.000000000 +0000
@@ -17,6 +17,7 @@
     Components.utils.import("resource://gre/modules/Promise.jsm", {});
   const {InspectorFront} =
     devtools.require("devtools/server/actors/inspector");
+  const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
   Services.prefs.setBoolPref("dom.webcomponents.enabled", true);
   SimpleTest.waitForExplicitFinish();
@@ -42,6 +43,20 @@
     });
   });
 
+  addAsyncTest(function* testXBLAnonymousInHTMLDocument() {
+    info ("Testing XBL anonymous in an HTML document.");
+    let rawToolbarbutton = gInspectee.createElementNS(XUL_NS, "toolbarbutton");
+    gInspectee.documentElement.appendChild(rawToolbarbutton);
+
+    let toolbarbutton = yield gWalker.querySelector(gWalker.rootNode, "toolbarbutton");
+    let children = yield gWalker.children(toolbarbutton);
+
+    is (toolbarbutton.numChildren, 3, "XBL content is visible even in HTML doc");
+    is (children.nodes.length, 3, "XBL content is returned even in HTML doc");
+
+    runNextTest();
+  });
+
   addAsyncTest(function* testNativeAnonymous() {
     info ("Testing native anonymous content with walker.");
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html	2014-11-26 21:46:04.000000000 +0000
@@ -28,6 +28,12 @@
   return assertOwnershipTrees(gWalker);
 }
 
+function ignoreNode(node) {
+  // Duplicate the walker logic to skip blank nodes...
+  return node.nodeType === Components.interfaces.nsIDOMNode.TEXT_NODE &&
+    !/[^\s]/.test(node.nodeValue);
+}
+
 addTest(function setup() {
   let url = document.getElementById("inspectorContent").href;
   attachURL(url, function(err, client, tab, doc) {
@@ -48,11 +54,15 @@
   let longlistID = null;
 
   let nextSibling = gInspectee.querySelector("#longlist").nextSibling;
-  // Duplicate the walker logic to skip blank nodes...
-  while (nextSibling && nextSibling.nodeType === Components.interfaces.nsIDOMNode.TEXT_NODE && !/[^\s]/.exec(nextSibling.nodeValue)) {
+  while (nextSibling && ignoreNode(nextSibling)) {
     nextSibling = nextSibling.nextSibling;
   }
 
+  let previousSibling = gInspectee.querySelector("#longlist").previousSibling;
+  while (previousSibling && ignoreNode(previousSibling)) {
+    previousSibling = previousSibling.previousSibling;
+  }
+
   promiseDone(gWalker.querySelector(gWalker.rootNode, "#longlist").then(listFront => {
     longlist = listFront;
     longlistID = longlist.actorID;
@@ -62,13 +72,14 @@
     originalOwnershipSize = assertOwnership();
     ok(originalOwnershipSize > 26, "Should have at least 26 items in our ownership tree");
     return gWalker.removeNode(longlist);
-  }).then(nextSiblingFront => {
-    is(nextSiblingFront.rawNode(), nextSibling, "Should have returned the next sibling.");
+  }).then(siblings => {
+    is(siblings.previousSibling.rawNode(), previousSibling, "Should have returned the previous sibling.");
+    is(siblings.nextSibling.rawNode(), nextSibling, "Should have returned the next sibling.");
     return waitForMutation(gWalker, isChildList);
   }).then(() => {
-    // Our ownership size should now be 26 fewer (we forgot about #longlist + 26 children, but learned about #longlist's next sibling)
+    // Our ownership size should now be 25 fewer (we forgot about #longlist + 26 children, but learned about #longlist's prev/next sibling)
     let newOwnershipSize = assertOwnership();
-    is(newOwnershipSize, originalOwnershipSize - 26, "Ownership tree should have dropped by 27 nodes");
+    is(newOwnershipSize, originalOwnershipSize - 25, "Ownership tree should have dropped by 25 nodes");
     // Now verify that some nodes have gone away
     return checkMissing(gClient, longlistID);
   }).then(runNextTest));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/hello-actor.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/hello-actor.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/hello-actor.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/hello-actor.js	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,15 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const protocol = require("devtools/server/protocol");
+
+const HelloActor = protocol.ActorClass({
+  typeName: "helloActor",
+
+  hello: protocol.method(function () {
+    return;
+  }, {
+    request: {},
+    response: {}
+  })
+});
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/registertestactors-02.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/registertestactors-02.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/registertestactors-02.js	2014-11-14 09:37:33.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/registertestactors-02.js	2014-11-26 21:46:04.000000000 +0000
@@ -9,5 +9,7 @@
 }
 
 exports.unregister = function(handle) {
+  handle.removeTabActor(Actor);
+  handle.removeGlobalActor(Actor);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/test_actor-registry-actor.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/test_actor-registry-actor.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/test_actor-registry-actor.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/test_actor-registry-actor.js	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,80 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Check that you can register new actors via the ActorRegistrationActor.
+ */
+
+var gClient;
+var gRegistryFront;
+var gActorFront;
+var gOldPref;
+
+const { ActorRegistryFront } = devtools.require("devtools/server/actors/actor-registry");
+
+function run_test()
+{
+  gOldPref = Services.prefs.getBoolPref("devtools.debugger.forbid-certified-apps");
+  Services.prefs.setBoolPref("devtools.debugger.forbid-certified-apps", false);
+  initTestDebuggerServer();
+  DebuggerServer.addBrowserActors();
+  gClient = new DebuggerClient(DebuggerServer.connectPipe());
+  gClient.connect(getRegistry);
+  do_test_pending();
+}
+
+function getRegistry() {
+  gClient.listTabs((response) => {
+    gRegistryFront = ActorRegistryFront(gClient, response);
+    registerNewActor();
+  });
+}
+
+function registerNewActor() {
+  let options = {
+    prefix: "helloActor",
+    constructor: "HelloActor",
+    type: { global: true }
+  };
+
+  gRegistryFront
+    .registerActor("resource://test/hello-actor.js", options)
+    .then(actorFront => gActorFront = actorFront)
+    .then(talkToNewActor)
+    .then(null, e => {
+      DevToolsUtils.reportException("registerNewActor", e)
+      do_check_true(false);
+    });
+}
+
+function talkToNewActor() {
+  gClient.listTabs(({ helloActor }) => {
+    do_check_true(!!helloActor);
+    gClient.request({
+      to: helloActor,
+      type: "hello"
+    }, response => {
+      do_check_true(!response.error);
+      unregisterNewActor();
+    });
+  });
+}
+
+function unregisterNewActor() {
+  gActorFront
+    .unregister()
+    .then(testActorIsUnregistered)
+    .then(null, e => {
+      DevToolsUtils.reportException("registerNewActor", e)
+      do_check_true(false);
+    });
+}
+
+function testActorIsUnregistered() {
+  gClient.listTabs(({ helloActor }) => {
+    do_check_true(!helloActor);
+
+    Services.prefs.setBoolPref("devtools.debugger.forbid-certified-apps", gOldPref);
+    finishClient(gClient);
+  });
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/testactors.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/testactors.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/testactors.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/testactors.js	2014-11-26 21:46:04.000000000 +0000
@@ -52,8 +52,11 @@
 
 function createRootActor(aConnection)
 {
-  let root = new RootActor(aConnection,
-                           { tabList: new TestTabList(aConnection) });
+  let root = new RootActor(aConnection, {
+    tabList: new TestTabList(aConnection),
+    globalActorFactories: DebuggerServer.globalActorFactories,
+  });
+
   root.applicationType = "xpcshell-tests";
   return root;
 }
@@ -126,6 +129,14 @@
     return {};
   },
 
+  removeActorByName: function(aName) {
+    const actor = this._extraActors[aName];
+    if (this._tabActorPool) {
+      this._tabActorPool.removeActor(actor);
+    }
+    delete this._extraActors[aName];
+  },
+
   /* Support for DebuggerServer.addTabActor. */
   _createExtraActors: createExtraActors,
   _appendExtraActors: appendExtraActors
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini	2014-11-26 21:46:04.000000000 +0000
@@ -16,7 +16,9 @@
   sourcemapped.js
   testactors.js
   tracerlocations.js
+  hello-actor.js
 
+[test_actor-registry-actor.js]
 [test_nesting-01.js]
 [test_nesting-02.js]
 [test_nesting-03.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/tests/unit/test_require.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/tests/unit/test_require.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/tests/unit/test_require.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/tests/unit/test_require.js	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,20 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test devtools.require
+
+// Ensure that DevtoolsLoader.require doesn't spawn multiple
+// loader/modules when early cached
+function testBug1091706() {
+  let loader = new DevToolsLoader();
+  let require = loader.require;
+
+  let color1 = require("devtools/css-color");
+  let color2 = require("devtools/css-color");
+
+  do_check_true(color1 === color2);
+}
+
+function run_test() {
+  testBug1091706();
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/tests/unit/xpcshell.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/tests/unit/xpcshell.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/tests/unit/xpcshell.ini	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/tests/unit/xpcshell.ini	2014-11-26 21:46:04.000000000 +0000
@@ -12,3 +12,4 @@
 [test_async-utils.js]
 [test_consoleID.js]
 [test_require_lazy.js]
+[test_require.js]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/webconsole/test/test_throw.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/webconsole/test/test_throw.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/devtools/webconsole/test/test_throw.html	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/devtools/webconsole/test/test_throw.html	2014-11-26 21:46:04.000000000 +0000
@@ -55,6 +55,9 @@
       is(aResponse.exception.initial, shortedString,
         "exception.initial for throw longString"
       );
+      is(aResponse.exceptionMessage.initial, shortedString,
+        "exceptionMessage.initial for throw longString"
+      );
       nextTest();
     });
   });
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/library/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/library/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/library/moz.build	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/library/moz.build	2014-11-26 21:46:04.000000000 +0000
@@ -111,11 +111,6 @@
         'sandboxbroker',
     ]
 
-if CONFIG['MOZ_DMD']:
-    USE_LIBS += [
-        'dmd',
-    ]
-
 USE_LIBS += [
     'gkmedias',
     'mozalloc',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/PopupNotifications.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/PopupNotifications.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/PopupNotifications.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/PopupNotifications.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -314,29 +314,26 @@
     let notifications = this._getNotificationsForBrowser(browser);
     notifications.push(notification);
 
-    let isActive = this._isActiveBrowser(browser);
+    let isActiveBrowser = this._isActiveBrowser(browser);
     let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
-    if (isActive && fm.activeWindow == this.window) {
-      // show panel now
-      this._update(notifications, notification.anchorElement, true);
-    } else {
-      // Otherwise, update() will display the notification the next time the
-      // relevant tab/window is selected.
+    let isActiveWindow = fm.activeWindow == this.window;
 
-      // If the tab is selected but the window is in the background, let the OS
-      // tell the user that there's a notification waiting in that window.
-      // At some point we might want to do something about background tabs here
-      // too. When the user switches to this window, we'll show the panel if
-      // this browser is a tab (thus showing the anchor icon). For
-      // non-tabbrowser browsers, we need to make the icon visible now or the
-      // user will not be able to open the panel.
-      if (!notification.dismissed && isActive) {
-        this.window.getAttention();
+    if (isActiveBrowser) {
+      if (isActiveWindow) {
+        // show panel now
+        this._update(notifications, notification.anchorElement, true);
+      } else {
+        // indicate attention and update the icon if necessary
+        if (!notification.dismissed) {
+          this.window.getAttention();
+        }
         if (notification.anchorElement.parentNode != this.iconBox) {
           this._updateAnchorIcon(notifications, notification.anchorElement);
         }
+        this._notify("backgroundShow");
       }
 
+    } else {
       // Notify observers that we're not showing the popup (useful for testing)
       this._notify("backgroundShow");
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/Preferences.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/Preferences.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/Preferences.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/Preferences.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -10,6 +10,7 @@
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 
 // The minimum and maximum integers that can be set as preferences.
 // The range of valid values is narrower than the range of valid JS values
@@ -20,365 +21,359 @@
 
 this.Preferences =
   function Preferences(args) {
+    this._cachedPrefBranch = null;
     if (isObject(args)) {
       if (args.branch)
-        this._prefBranch = args.branch;
+        this._branchStr = args.branch;
       if (args.defaultBranch)
         this._defaultBranch = args.defaultBranch;
       if (args.privacyContext)
         this._privacyContext = args.privacyContext;
     }
     else if (args)
-      this._prefBranch = args;
-}
+      this._branchStr = args;
+  };
 
-Preferences.prototype = {
-  /**
-   * Get the value of a pref, if any; otherwise return the default value.
-   *
-   * @param   prefName  {String|Array}
-   *          the pref to get, or an array of prefs to get
-   *
-   * @param   defaultValue
-   *          the default value, if any, for prefs that don't have one
-   *
-   * @param   valueType
-   *          the XPCOM interface of the pref's complex value type, if any
-   *
-   * @returns the value of the pref, if any; otherwise the default value
-   */
-  get: function(prefName, defaultValue, valueType = Ci.nsISupportsString) {
-    if (Array.isArray(prefName))
-      return prefName.map(function(v) this.get(v, defaultValue), this);
+/**
+ * Get the value of a pref, if any; otherwise return the default value.
+ *
+ * @param   prefName  {String|Array}
+ *          the pref to get, or an array of prefs to get
+ *
+ * @param   defaultValue
+ *          the default value, if any, for prefs that don't have one
+ *
+ * @param   valueType
+ *          the XPCOM interface of the pref's complex value type, if any
+ *
+ * @returns the value of the pref, if any; otherwise the default value
+ */
+Preferences.get = function(prefName, defaultValue, valueType = Ci.nsISupportsString) {
+  if (Array.isArray(prefName))
+    return prefName.map(function(v) this.get(v, defaultValue), this);
 
-    return this._get(prefName, defaultValue, valueType);
-  },
+  return this._get(prefName, defaultValue, valueType);
+};
 
-  _get: function(prefName, defaultValue, valueType) {
-    switch (this._prefSvc.getPrefType(prefName)) {
-      case Ci.nsIPrefBranch.PREF_STRING:
-        return this._prefSvc.getComplexValue(prefName, valueType).data;
-
-      case Ci.nsIPrefBranch.PREF_INT:
-        return this._prefSvc.getIntPref(prefName);
-
-      case Ci.nsIPrefBranch.PREF_BOOL:
-        return this._prefSvc.getBoolPref(prefName);
-
-      case Ci.nsIPrefBranch.PREF_INVALID:
-        return defaultValue;
-
-      default:
-        // This should never happen.
-        throw "Error getting pref " + prefName + "; its value's type is " +
-              this._prefSvc.getPrefType(prefName) + ", which I don't know " +
-              "how to handle.";
-    }
-  },
+Preferences._get = function(prefName, defaultValue, valueType) {
+  switch (this._prefBranch.getPrefType(prefName)) {
+    case Ci.nsIPrefBranch.PREF_STRING:
+      return this._prefBranch.getComplexValue(prefName, valueType).data;
+
+    case Ci.nsIPrefBranch.PREF_INT:
+      return this._prefBranch.getIntPref(prefName);
+
+    case Ci.nsIPrefBranch.PREF_BOOL:
+      return this._prefBranch.getBoolPref(prefName);
+
+    case Ci.nsIPrefBranch.PREF_INVALID:
+      return defaultValue;
+
+    default:
+      // This should never happen.
+      throw "Error getting pref " + prefName + "; its value's type is " +
+            this._prefBranch.getPrefType(prefName) + ", which I don't " +
+            "know how to handle.";
+  }
+};
 
-  /**
-   * Set a preference to a value.
-   *
-   * You can set multiple prefs by passing an object as the only parameter.
-   * In that case, this method will treat the properties of the object
-   * as preferences to set, where each property name is the name of a pref
-   * and its corresponding property value is the value of the pref.
-   *
-   * @param   prefName  {String|Object}
-   *          the name of the pref to set; or an object containing a set
-   *          of prefs to set
-   *
-   * @param   prefValue {String|Number|Boolean}
-   *          the value to which to set the pref
-   *
-   * Note: Preferences cannot store non-integer numbers or numbers outside
-   * the signed 32-bit range -(2^31-1) to 2^31-1, If you have such a number,
-   * store it as a string by calling toString() on the number before passing
-   * it to this method, i.e.:
-   *   Preferences.set("pi", 3.14159.toString())
-   *   Preferences.set("big", Math.pow(2, 31).toString()).
-   */
-  set: function(prefName, prefValue) {
-    if (isObject(prefName)) {
-      for (let [name, value] in Iterator(prefName))
-        this.set(name, value);
-      return;
-    }
+/**
+ * Set a preference to a value.
+ *
+ * You can set multiple prefs by passing an object as the only parameter.
+ * In that case, this method will treat the properties of the object
+ * as preferences to set, where each property name is the name of a pref
+ * and its corresponding property value is the value of the pref.
+ *
+ * @param   prefName  {String|Object}
+ *          the name of the pref to set; or an object containing a set
+ *          of prefs to set
+ *
+ * @param   prefValue {String|Number|Boolean}
+ *          the value to which to set the pref
+ *
+ * Note: Preferences cannot store non-integer numbers or numbers outside
+ * the signed 32-bit range -(2^31-1) to 2^31-1, If you have such a number,
+ * store it as a string by calling toString() on the number before passing
+ * it to this method, i.e.:
+ *   Preferences.set("pi", 3.14159.toString())
+ *   Preferences.set("big", Math.pow(2, 31).toString()).
+ */
+Preferences.set = function(prefName, prefValue) {
+  if (isObject(prefName)) {
+    for (let [name, value] in Iterator(prefName))
+      this.set(name, value);
+    return;
+  }
 
-    this._set(prefName, prefValue);
-  },
+  this._set(prefName, prefValue);
+};
 
-  _set: function(prefName, prefValue) {
-    let prefType;
-    if (typeof prefValue != "undefined" && prefValue != null)
-      prefType = prefValue.constructor.name;
-
-    switch (prefType) {
-      case "String":
-        {
-          let string = Cc["@mozilla.org/supports-string;1"].
-                       createInstance(Ci.nsISupportsString);
-          string.data = prefValue;
-          this._prefSvc.setComplexValue(prefName, Ci.nsISupportsString, string);
-        }
-        break;
-
-      case "Number":
-        // We throw if the number is outside the range, since the result
-        // will never be what the consumer wanted to store, but we only warn
-        // if the number is non-integer, since the consumer might not mind
-        // the loss of precision.
-        if (prefValue > MAX_INT || prefValue < MIN_INT)
-          throw("you cannot set the " + prefName + " pref to the number " +
-                prefValue + ", as number pref values must be in the signed " +
-                "32-bit integer range -(2^31-1) to 2^31-1.  To store numbers " +
-                "outside that range, store them as strings.");
-        this._prefSvc.setIntPref(prefName, prefValue);
-        if (prefValue % 1 != 0)
-          Cu.reportError("Warning: setting the " + prefName + " pref to the " +
-                         "non-integer number " + prefValue + " converted it " +
-                         "to the integer number " + this.get(prefName) +
-                         "; to retain fractional precision, store non-integer " +
-                         "numbers as strings.");
-        break;
-
-      case "Boolean":
-        this._prefSvc.setBoolPref(prefName, prefValue);
-        break;
-
-      default:
-        throw "can't set pref " + prefName + " to value '" + prefValue +
-              "'; it isn't a String, Number, or Boolean";
-    }
-  },
+Preferences._set = function(prefName, prefValue) {
+  let prefType;
+  if (typeof prefValue != "undefined" && prefValue != null)
+    prefType = prefValue.constructor.name;
+
+  switch (prefType) {
+    case "String":
+      {
+        let str = Cc["@mozilla.org/supports-string;1"].
+                     createInstance(Ci.nsISupportsString);
+        str.data = prefValue;
+        this._prefBranch.setComplexValue(prefName, Ci.nsISupportsString, str);
+      }
+      break;
+
+    case "Number":
+      // We throw if the number is outside the range, since the result
+      // will never be what the consumer wanted to store, but we only warn
+      // if the number is non-integer, since the consumer might not mind
+      // the loss of precision.
+      if (prefValue > MAX_INT || prefValue < MIN_INT)
+        throw("you cannot set the " + prefName + " pref to the number " +
+              prefValue + ", as number pref values must be in the signed " +
+              "32-bit integer range -(2^31-1) to 2^31-1.  To store numbers " +
+              "outside that range, store them as strings.");
+      this._prefBranch.setIntPref(prefName, prefValue);
+      if (prefValue % 1 != 0)
+        Cu.reportError("Warning: setting the " + prefName + " pref to the " +
+                       "non-integer number " + prefValue + " converted it " +
+                       "to the integer number " + this.get(prefName) +
+                       "; to retain fractional precision, store non-integer " +
+                       "numbers as strings.");
+      break;
+
+    case "Boolean":
+      this._prefBranch.setBoolPref(prefName, prefValue);
+      break;
+
+    default:
+      throw "can't set pref " + prefName + " to value '" + prefValue +
+            "'; it isn't a String, Number, or Boolean";
+  }
+};
 
-  /**
-   * Whether or not the given pref has a value.  This is different from isSet
-   * because it returns true whether the value of the pref is a default value
-   * or a user-set value, while isSet only returns true if the value
-   * is a user-set value.
-   *
-   * @param   prefName  {String|Array}
-   *          the pref to check, or an array of prefs to check
-   *
-   * @returns {Boolean|Array}
-   *          whether or not the pref has a value; or, if the caller provided
-   *          an array of pref names, an array of booleans indicating whether
-   *          or not the prefs have values
-   */
-  has: function(prefName) {
-    if (Array.isArray(prefName))
-      return prefName.map(this.has, this);
+/**
+ * Whether or not the given pref has a value.  This is different from isSet
+ * because it returns true whether the value of the pref is a default value
+ * or a user-set value, while isSet only returns true if the value
+ * is a user-set value.
+ *
+ * @param   prefName  {String|Array}
+ *          the pref to check, or an array of prefs to check
+ *
+ * @returns {Boolean|Array}
+ *          whether or not the pref has a value; or, if the caller provided
+ *          an array of pref names, an array of booleans indicating whether
+ *          or not the prefs have values
+ */
+Preferences.has = function(prefName) {
+  if (Array.isArray(prefName))
+    return prefName.map(this.has, this);
 
-    return this._has(prefName);
-  },
+  return (this._prefBranch.getPrefType(prefName) != Ci.nsIPrefBranch.PREF_INVALID);
+};
 
-  _has: function(prefName) {
-    return (this._prefSvc.getPrefType(prefName) != Ci.nsIPrefBranch.PREF_INVALID);
-  },
+/**
+ * Whether or not the given pref has a user-set value.  This is different
+ * from |has| because it returns true only if the value of the pref is a user-
+ * set value, while |has| returns true if the value of the pref is a default
+ * value or a user-set value.
+ *
+ * @param   prefName  {String|Array}
+ *          the pref to check, or an array of prefs to check
+ *
+ * @returns {Boolean|Array}
+ *          whether or not the pref has a user-set value; or, if the caller
+ *          provided an array of pref names, an array of booleans indicating
+ *          whether or not the prefs have user-set values
+ */
+Preferences.isSet = function(prefName) {
+  if (Array.isArray(prefName))
+    return prefName.map(this.isSet, this);
 
-  /**
-   * Whether or not the given pref has a user-set value.  This is different
-   * from |has| because it returns true only if the value of the pref is a user-
-   * set value, while |has| returns true if the value of the pref is a default
-   * value or a user-set value.
-   *
-   * @param   prefName  {String|Array}
-   *          the pref to check, or an array of prefs to check
-   *
-   * @returns {Boolean|Array}
-   *          whether or not the pref has a user-set value; or, if the caller
-   *          provided an array of pref names, an array of booleans indicating
-   *          whether or not the prefs have user-set values
-   */
-  isSet: function(prefName) {
-    if (Array.isArray(prefName))
-      return prefName.map(this.isSet, this);
+  return (this.has(prefName) && this._prefBranch.prefHasUserValue(prefName));
+},
 
-    return (this.has(prefName) && this._prefSvc.prefHasUserValue(prefName));
-  },
+/**
+ * Whether or not the given pref has a user-set value. Use isSet instead,
+ * which is equivalent.
+ * @deprecated
+ */
+Preferences.modified = function(prefName) { return this.isSet(prefName) },
+
+Preferences.reset = function(prefName) {
+  if (Array.isArray(prefName)) {
+    prefName.map(function(v) this.reset(v), this);
+    return;
+  }
 
-  /**
-   * Whether or not the given pref has a user-set value. Use isSet instead,
-   * which is equivalent.
-   * @deprecated
-   */
-  modified: function(prefName) { return this.isSet(prefName) },
-
-  reset: function(prefName) {
-    if (Array.isArray(prefName)) {
-      prefName.map(function(v) this.reset(v), this);
-      return;
-    }
+  this._prefBranch.clearUserPref(prefName);
+};
 
-    this._prefSvc.clearUserPref(prefName);
-  },
+/**
+ * Lock a pref so it can't be changed.
+ *
+ * @param   prefName  {String|Array}
+ *          the pref to lock, or an array of prefs to lock
+ */
+Preferences.lock = function(prefName) {
+  if (Array.isArray(prefName))
+    prefName.map(this.lock, this);
 
-  /**
-   * Lock a pref so it can't be changed.
-   *
-   * @param   prefName  {String|Array}
-   *          the pref to lock, or an array of prefs to lock
-   */
-  lock: function(prefName) {
-    if (Array.isArray(prefName))
-      prefName.map(this.lock, this);
+  this._prefBranch.lockPref(prefName);
+};
 
-    this._prefSvc.lockPref(prefName);
-  },
+/**
+ * Unlock a pref so it can be changed.
+ *
+ * @param   prefName  {String|Array}
+ *          the pref to lock, or an array of prefs to lock
+ */
+Preferences.unlock = function(prefName) {
+  if (Array.isArray(prefName))
+    prefName.map(this.unlock, this);
 
-  /**
-   * Unlock a pref so it can be changed.
-   *
-   * @param   prefName  {String|Array}
-   *          the pref to lock, or an array of prefs to lock
-   */
-  unlock: function(prefName) {
-    if (Array.isArray(prefName))
-      prefName.map(this.unlock, this);
+  this._prefBranch.unlockPref(prefName);
+};
 
-    this._prefSvc.unlockPref(prefName);
-  },
+/**
+ * Whether or not the given pref is locked against changes.
+ *
+ * @param   prefName  {String|Array}
+ *          the pref to check, or an array of prefs to check
+ *
+ * @returns {Boolean|Array}
+ *          whether or not the pref has a user-set value; or, if the caller
+ *          provided an array of pref names, an array of booleans indicating
+ *          whether or not the prefs have user-set values
+ */
+Preferences.locked = function(prefName) {
+  if (Array.isArray(prefName))
+    return prefName.map(this.locked, this);
 
-  /**
-   * Whether or not the given pref is locked against changes.
-   *
-   * @param   prefName  {String|Array}
-   *          the pref to check, or an array of prefs to check
-   *
-   * @returns {Boolean|Array}
-   *          whether or not the pref has a user-set value; or, if the caller
-   *          provided an array of pref names, an array of booleans indicating
-   *          whether or not the prefs have user-set values
-   */
-  locked: function(prefName) {
-    if (Array.isArray(prefName))
-      return prefName.map(this.locked, this);
+  return this._prefBranch.prefIsLocked(prefName);
+};
 
-    return this._prefSvc.prefIsLocked(prefName);
-  },
+/**
+ * Start observing a pref.
+ *
+ * The callback can be a function or any object that implements nsIObserver.
+ * When the callback is a function and thisObject is provided, it gets called
+ * as a method of thisObject.
+ *
+ * @param   prefName    {String}
+ *          the name of the pref to observe
+ *
+ * @param   callback    {Function|Object}
+ *          the code to notify when the pref changes;
+ *
+ * @param   thisObject  {Object}  [optional]
+ *          the object to use as |this| when calling a Function callback;
+ *
+ * @returns the wrapped observer
+ */
+Preferences.observe = function(prefName, callback, thisObject) {
+  let fullPrefName = this._branchStr + (prefName || "");
+
+  let observer = new PrefObserver(fullPrefName, callback, thisObject);
+  Preferences._prefBranch.addObserver(fullPrefName, observer, true);
+  observers.push(observer);
 
-  /**
-   * Start observing a pref.
-   *
-   * The callback can be a function or any object that implements nsIObserver.
-   * When the callback is a function and thisObject is provided, it gets called
-   * as a method of thisObject.
-   *
-   * @param   prefName    {String}
-   *          the name of the pref to observe
-   *
-   * @param   callback    {Function|Object}
-   *          the code to notify when the pref changes;
-   *
-   * @param   thisObject  {Object}  [optional]
-   *          the object to use as |this| when calling a Function callback;
-   *
-   * @returns the wrapped observer
-   */
-  observe: function(prefName, callback, thisObject) {
-    let fullPrefName = this._prefBranch + (prefName || "");
-
-    let observer = new PrefObserver(fullPrefName, callback, thisObject);
-    Preferences._prefSvc.addObserver(fullPrefName, observer, true);
-    observers.push(observer);
+  return observer;
+};
 
-    return observer;
-  },
+/**
+ * Stop observing a pref.
+ *
+ * You must call this method with the same prefName, callback, and thisObject
+ * with which you originally registered the observer.  However, you don't have
+ * to call this method on the same exact instance of Preferences; you can call
+ * it on any instance.  For example, the following code first starts and then
+ * stops observing the "foo.bar.baz" preference:
+ *
+ *   let observer = function() {...};
+ *   Preferences.observe("foo.bar.baz", observer);
+ *   new Preferences("foo.bar.").ignore("baz", observer);
+ *
+ * @param   prefName    {String}
+ *          the name of the pref being observed
+ *
+ * @param   callback    {Function|Object}
+ *          the code being notified when the pref changes
+ *
+ * @param   thisObject  {Object}  [optional]
+ *          the object being used as |this| when calling a Function callback
+ */
+Preferences.ignore = function(prefName, callback, thisObject) {
+  let fullPrefName = this._branchStr + (prefName || "");
+
+  // This seems fairly inefficient, but I'm not sure how much better we can
+  // make it.  We could index by fullBranch, but we can't index by callback
+  // or thisObject, as far as I know, since the keys to JavaScript hashes
+  // (a.k.a. objects) can apparently only be primitive values.
+  let [observer] = observers.filter(function(v) v.prefName   == fullPrefName &&
+                                                v.callback   == callback &&
+                                                v.thisObject == thisObject);
+
+  if (observer) {
+    Preferences._prefBranch.removeObserver(fullPrefName, observer);
+    observers.splice(observers.indexOf(observer), 1);
+  }
+};
 
-  /**
-   * Stop observing a pref.
-   *
-   * You must call this method with the same prefName, callback, and thisObject
-   * with which you originally registered the observer.  However, you don't have
-   * to call this method on the same exact instance of Preferences; you can call
-   * it on any instance.  For example, the following code first starts and then
-   * stops observing the "foo.bar.baz" preference:
-   *
-   *   let observer = function() {...};
-   *   Preferences.observe("foo.bar.baz", observer);
-   *   new Preferences("foo.bar.").ignore("baz", observer);
-   *
-   * @param   prefName    {String}
-   *          the name of the pref being observed
-   *
-   * @param   callback    {Function|Object}
-   *          the code being notified when the pref changes
-   *
-   * @param   thisObject  {Object}  [optional]
-   *          the object being used as |this| when calling a Function callback
-   */
-  ignore: function(prefName, callback, thisObject) {
-    let fullPrefName = this._prefBranch + (prefName || "");
-
-    // This seems fairly inefficient, but I'm not sure how much better we can
-    // make it.  We could index by fullBranch, but we can't index by callback
-    // or thisObject, as far as I know, since the keys to JavaScript hashes
-    // (a.k.a. objects) can apparently only be primitive values.
-    let [observer] = observers.filter(function(v) v.prefName   == fullPrefName &&
-                                                  v.callback   == callback &&
-                                                  v.thisObject == thisObject);
-
-    if (observer) {
-      Preferences._prefSvc.removeObserver(fullPrefName, observer);
-      observers.splice(observers.indexOf(observer), 1);
-    }
-  },
+Preferences.resetBranch = function(prefBranch = "") {
+  try {
+    this._prefBranch.resetBranch(prefBranch);
+  }
+  catch(ex) {
+    // The current implementation of nsIPrefBranch in Mozilla
+    // doesn't implement resetBranch, so we do it ourselves.
+    if (ex.result == Cr.NS_ERROR_NOT_IMPLEMENTED)
+      this.reset(this._prefBranch.getChildList(prefBranch, []));
+    else
+      throw ex;
+  }
+},
 
-  resetBranch: function(prefBranch = "") {
-    try {
-      this._prefSvc.resetBranch(prefBranch);
-    }
-    catch(ex) {
-      // The current implementation of nsIPrefBranch in Mozilla
-      // doesn't implement resetBranch, so we do it ourselves.
-      if (ex.result == Cr.NS_ERROR_NOT_IMPLEMENTED)
-        this.reset(this._prefSvc.getChildList(prefBranch, []));
-      else
-        throw ex;
-    }
-  },
+/**
+ * A string identifying the branch of the preferences tree to which this
+ * instance provides access.
+ * @private
+ */
+Preferences._branchStr = "";
 
-  /**
-   * The branch of the preferences tree to which this instance provides access.
-   * @private
-   */
-  _prefBranch: "",
-
-  /**
-   * Preferences Service
-   * @private
-   */
-  get _prefSvc() {
-    let prefSvc = Cc["@mozilla.org/preferences-service;1"]
-                  .getService(Ci.nsIPrefService);
-    if (this._defaultBranch) {
-      prefSvc = prefSvc.getDefaultBranch(this._prefBranch);
-    } else {
-      prefSvc = prefSvc.getBranch(this._prefBranch);
-    }
+/**
+ * The cached preferences branch object this instance encapsulates, or null.
+ * Do not use!  Use _prefBranch below instead.
+ * @private
+ */
+Preferences._cachedPrefBranch = null;
 
-    this.__defineGetter__("_prefSvc", function() prefSvc);
-    return this._prefSvc;
+/**
+ * The preferences branch object for this instance.
+ * @private
+ */
+Object.defineProperty(Preferences, "_prefBranch",
+{
+  get: function _prefBranch() {
+    if (!this._cachedPrefBranch) {
+      let prefSvc = Services.prefs;
+      this._cachedPrefBranch = this._defaultBranch ?
+                               prefSvc.getDefaultBranch(this._branchStr) :
+                               prefSvc.getBranch(this._branchStr);
+    }
+    return this._cachedPrefBranch;
   },
-
-  /**
-   * IO Service
-   * @private
-   */
-  get _ioSvc() {
-    let ioSvc = Cc["@mozilla.org/network/io-service;1"].
-                getService(Ci.nsIIOService);
-    this.__defineGetter__("_ioSvc", function() ioSvc);
-    return this._ioSvc;
-  }
-
-};
-
-// Give the constructor the same prototype as its instances, so users can access
-// preferences directly via the constructor without having to create an instance
-// first.
-Preferences.__proto__ = Preferences.prototype;
+  enumerable: true,
+  configurable: true
+});
+
+// Constructor-based access (Preferences.get(...) and set) is preferred over
+// instance-based access (new Preferences().get(...) and set) and when using the
+// root preferences branch, as it's desirable not to allocate the extra object.
+// But both forms are acceptable.
+Preferences.prototype = Preferences;
 
 /**
  * A cache of pref observers.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/PromiseUtils.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/PromiseUtils.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/PromiseUtils.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/PromiseUtils.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -50,5 +50,47 @@
         clearTimeout(id);
       }, delay);
     });
-  }
+  },
+
+  /*
+   * Creates a new pending Promise and provide methods to resolve and reject this Promise.
+   *
+   * @return {Deferred} an object consisting of a pending Promise "promise"
+   * and methods "resolve" and "reject" to change its state.
+   */
+  defer : function() {
+    return new Deferred();
+  },
+}
+
+/**
+ * The definition of Deferred object which is returned by PromiseUtils.defer(),
+ * It contains a Promise and methods to resolve/reject it.
+ */
+function Deferred() {
+  /* A method to resolve the associated Promise with the value passed.
+   * If the promise is already settled it does nothing.
+   *
+   * @param {anything} value : This value is used to resolve the promise
+   * If the value is a Promise then the associated promise assumes the state
+   * of Promise passed as value.
+   */
+  this.resolve = null;
+
+  /* A method to reject the assocaited Promise with the value passed.
+   * If the promise is already settled it does nothing.
+   *
+   * @param {anything} reason: The reason for the rejection of the Promise.
+   * Generally its an Error object. If however a Promise is passed, then the Promise
+   * itself will be the reason for rejection no matter the state of the Promise.
+   */
+  this.reject = null;
+
+  /* A newly created Pomise object.
+   * Initially in pending state.
+   */
+  this.promise = new Promise((resolve, reject) => {
+    this.resolve = resolve;
+    this.reject = reject;
+  });
 }
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/RemoteWebProgress.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/RemoteWebProgress.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/RemoteWebProgress.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/RemoteWebProgress.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -139,11 +139,20 @@
     let json = aMessage.json;
     let objects = aMessage.objects;
 
+    let webProgress = null;
+    let isTopLevel = json.webProgress && json.webProgress.isTopLevel;
     // The top-level WebProgress is always the same, but because we don't
-    // really have a concept of subframes/content we always creat a new object
+    // really have a concept of subframes/content we always create a new object
     // for those.
-    let webProgress = json.isTopLevel ? this._topLevelWebProgress
-                                      : new RemoteWebProgress(this, false);
+    if (json.webProgress) {
+      webProgress = isTopLevel ? this._topLevelWebProgress
+                               : new RemoteWebProgress(this, false);
+
+      // Update the actual WebProgress fields.
+      webProgress._isLoadingDocument = json.webProgress.isLoadingDocument;
+      webProgress._DOMWindow = objects.DOMWindow;
+      webProgress._loadType = json.webProgress.loadType;
+    }
 
     // The WebProgressRequest object however is always dynamic.
     let request = null;
@@ -152,12 +161,7 @@
                                              json.originalRequestURI);
     }
 
-    // Update the actual WebProgress fields.
-    webProgress._isLoadingDocument = json.isLoadingDocument;
-    webProgress._DOMWindow = objects.DOMWindow;
-    webProgress._loadType = json.loadType;
-
-    if (json.isTopLevel) {
+    if (isTopLevel) {
       this._browser._contentWindow = objects.contentWindow;
       this._browser._documentContentType = json.documentContentType;
     }
@@ -175,7 +179,7 @@
       this._browser.webNavigation.canGoBack = json.canGoBack;
       this._browser.webNavigation.canGoForward = json.canGoForward;
 
-      if (json.isTopLevel) {
+      if (isTopLevel) {
         this._browser.webNavigation._currentURI = location;
         this._browser._characterSet = json.charset;
         this._browser._documentURI = newURI(json.documentURI);
@@ -190,7 +194,7 @@
     case "Content:SecurityChange":
       let [status, state] = this._fixSSLStatusAndState(json.status, json.state);
 
-      if (json.isTopLevel) {
+      if (isTopLevel) {
         // Invoking this getter triggers the generation of the underlying object,
         // which we need to access with ._securityUI, because .securityUI returns
         // a wrapper that makes _update inaccessible.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/tests/xpcshell/test_PromiseUtils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/tests/xpcshell/test_PromiseUtils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/modules/tests/xpcshell/test_PromiseUtils.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/modules/tests/xpcshell/test_PromiseUtils.js	2014-11-26 21:46:04.000000000 +0000
@@ -11,6 +11,10 @@
   run_next_test();
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
+// Tests for PromiseUtils.resolveOrTimeout()
+///////////////////////////////////////////////////////////////////////////////////////////
+
 /* Tests for the case when arguments to resolveOrTimeout
  * are not of correct type */
 add_task(function* test_wrong_arguments() {
@@ -75,4 +79,97 @@
   yield Assert.rejects(PromiseUtils.resolveOrTimeout(p, 200, () => {
     throw new Error("Rejection threw an Error");
   }), /Rejection threw an Error/, "Rejection threw an error");
+});
+
+///////////////////////////////////////////////////////////////////////////////////////
+// Tests for PromiseUtils.defer()
+///////////////////////////////////////////////////////////////////////////////////////
+
+/* Tests for checking the resolve method of the Deferred object
+ * returned by PromiseUtils.defer() */
+add_task(function* test_resolve_string() {
+  let def = PromiseUtils.defer();
+  let expected = "The promise is resolved " + Math.random();
+  def.resolve(expected);
+  let result = yield def.promise;
+  Assert.equal(result, expected, "def.resolve() resolves the promise");
+});
+
+/* Test for the case when undefined is passed to the resolve method
+ * of the Deferred object */
+add_task(function* test_resolve_undefined() {
+  let def = PromiseUtils.defer();
+  def.resolve();
+  let result = yield def.promise;
+  Assert.equal(result, undefined, "resolve works with undefined as well");
+});
+
+/* Test when a pending promise is passed to the resolve method
+ * of the Deferred object */
+add_task(function* test_resolve_pending_promise() {
+  let def = PromiseUtils.defer();
+  let expected = 100 + Math.random();
+  let p = new Promise((resolve, reject) => {
+    setTimeout(() => resolve(expected), 100);
+  });
+  def.resolve(p);
+  let result = yield def.promise;
+  Assert.equal(result, expected, "def.promise assumed the state of the passed promise");
+});
+
+/* Test when a resovled promise is passed
+ * to the resolve method of the Deferred object */
+add_task(function* test_resolve_resolved_promise() {
+  let def = PromiseUtils.defer();
+  let expected = "Yeah resolved" + Math.random();
+  let p = new Promise((resolve, reject) => resolve(expected));
+  def.resolve(p);
+  let result = yield def.promise;
+  Assert.equal(result, expected, "Resolved promise is passed to the resolve method");
+});
+
+/* Test for the case when a rejected promise is
+ * passed to the resolve method */
+add_task(function* test_resolve_rejected_promise() {
+  let def = PromiseUtils.defer();
+  let p = new Promise((resolve, reject) => reject(new Error("There its an rejection")));
+  def.resolve(p);
+  yield Assert.rejects(def.promise, /There its an rejection/, "Settled rejection promise passed to the resolve method");
+});
+
+/* Test for the checking the reject method of
+ * the Deferred object returned by PromiseUtils.defer() */
+add_task(function* test_reject_Error() {
+  let def = PromiseUtils.defer();
+  def.reject(new Error("This one rejects"));
+  yield Assert.rejects(def.promise, /This one rejects/, "reject method with Error for rejection");
+});
+
+/* Test for the case when a pending Promise is passed to
+ * the reject method of Deferred object */
+add_task(function* test_reject_pending_promise() {
+  let def = PromiseUtils.defer();
+  let p = new Promise((resolve, reject) => {
+    setTimeout(() => resolve(100), 100);
+  });
+  def.reject(p);
+  yield Assert.rejects(def.promise, Promise, "Rejection with a pending promise uses the passed promise itself as the reason of rejection");
+});
+
+/* Test for the case when a resolved Promise
+ * is passed to the reject method */
+add_task(function* test_reject_resolved_promise() {
+  let def = PromiseUtils.defer();
+  let p = new Promise((resolve, reject) => resolve("This resolved"));
+  def.reject(p);
+  yield Assert.rejects(def.promise, Promise, "Rejection with a resolved promise uses the passed promise itself as the reason of rejection");
+});
+
+/* Test for the case when a rejected Promise is
+ * passed to the reject method */
+add_task(function* test_reject_resolved_promise() {
+  let def = PromiseUtils.defer();
+  let p = new Promise((resolve, reject) => reject(new Error("This on rejects")));
+  def.reject(p);
+  yield Assert.rejects(def.promise, Promise, "Rejection with a rejected promise uses the passed promise itself as the reason of rejection");
 });
\ No newline at end of file
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul	2014-11-26 21:46:04.000000000 +0000
@@ -135,7 +135,7 @@
     tr.init(src, target, "test download", null, Math.round(Date.now() * 1000),
             null, persist, false);
     persist.progressListener = tr;
-    persist.saveURI(src, null, null, null, null, destFile);
+    persist.saveURI(src, null, null, 0, null, null, destFile);
   }
 
   // First, we clear out the database
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/downloads/tests/chrome/test_space_key_pauses_resumes.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/downloads/tests/chrome/test_space_key_pauses_resumes.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/downloads/tests/chrome/test_space_key_pauses_resumes.xul	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/downloads/tests/chrome/test_space_key_pauses_resumes.xul	2014-11-26 21:46:04.000000000 +0000
@@ -114,7 +114,7 @@
                                .QueryInterface(Ci.nsILoadContext);
 
     persist.progressListener = dl.QueryInterface(Ci.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, privacyContext);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, privacyContext);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/downloads/tests/chrome/utils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/downloads/tests/chrome/utils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/downloads/tests/chrome/utils.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/downloads/tests/chrome/utils.js	2014-11-26 21:46:04.000000000 +0000
@@ -85,7 +85,7 @@
                                .QueryInterface(Ci.nsILoadContext);
 
     persist.progressListener = dl.QueryInterface(Ci.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, privacyContext);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, privacyContext);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/moz.build	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/moz.build	2014-11-26 21:46:04.000000000 +0000
@@ -14,9 +14,6 @@
     'SpellCheckDictionaryBootstrap.js',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] in ['browser']:
-      DEFINES['HAVE_SHIMS'] = True
-
 # Don't ship unused providers on Android
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     EXTRA_JS_MODULES.addons += [
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/OpenH264Provider.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -27,6 +27,7 @@
 const SEC_IN_A_DAY              = 24 * 60 * 60;
 
 const EME_PREF_ENABLED         = "media.eme.enabled";
+const NS_GRE_BIN_DIR           = "GreBinD";
 const CLEARKEY_PLUGIN_ID       = "gmp-clearkey";
 const CLEARKEY_VERSION         = "0.1";
 
@@ -283,7 +284,8 @@
 
     if (Preferences.get(EME_PREF_ENABLED, false)) {
       try {
-        gmpService.addPluginDirectory(OS.Path.join(OS.Constants.Path.libDir,
+        let greBinDir = Services.dirsvc.get(NS_GRE_BIN_DIR, Ci.nsILocalFile);
+        gmpService.addPluginDirectory(OS.Path.join(greBinDir.path,
                                                    CLEARKEY_PLUGIN_ID,
                                                    CLEARKEY_VERSION));
       } catch (e) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -84,6 +84,7 @@
 const PREF_INSTALL_DISTRO_ADDONS      = "extensions.installDistroAddons";
 const PREF_BRANCH_INSTALLED_ADDON     = "extensions.installedDistroAddon.";
 const PREF_SHOWN_SELECTION_UI         = "extensions.shownSelectionUI";
+const PREF_INTERPOSITION_ENABLED      = "extensions.interposition.enabled";
 
 const PREF_EM_MIN_COMPAT_APP_VERSION      = "extensions.minCompatibleAppVersion";
 const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion";
@@ -4282,13 +4283,11 @@
 
     let principal = Cc["@mozilla.org/systemprincipal;1"].
                     createInstance(Ci.nsIPrincipal);
-#if defined(NIGHTLY_BUILD) && defined(HAVE_SHIMS)
-    if (!aMultiprocessCompatible) {
+    if (!aMultiprocessCompatible && Preferences.get(PREF_INTERPOSITION_ENABLED, false)) {
       let interposition = Cc["@mozilla.org/addons/multiprocess-shims;1"].
         getService(Ci.nsIAddonInterposition);
       Cu.setAddonInterposition(aId, interposition);
     }
-#endif
 
     if (!aFile.exists()) {
       this.bootstrapScopes[aId] =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/XPIProviderUtils.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/internal/XPIProviderUtils.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/internal/XPIProviderUtils.js	2014-11-26 21:46:04.000000000 +0000
@@ -38,7 +38,7 @@
 const FILE_XPI_ADDONS_LIST            = "extensions.ini";
 
 // The value for this is in Makefile.in
-#expand const DB_SCHEMA                       = __MOZ_EXTENSIONS_DB_SCHEMA__;
+#expand const DB_SCHEMA               = __MOZ_EXTENSIONS_DB_SCHEMA__;
 
 // The last version of DB_SCHEMA implemented in SQLITE
 const LAST_SQLITE_DB_SCHEMA           = 14;
@@ -47,7 +47,6 @@
 const PREF_EM_ENABLED_ADDONS          = "extensions.enabledAddons";
 const PREF_EM_DSS_ENABLED             = "extensions.dss.enabled";
 
-
 // Properties that only exist in the database
 const DB_METADATA        = ["syncGUID",
                             "installDate",
@@ -211,7 +210,6 @@
   }
 }
 
-
 /**
  * A helper function to log an SQL error.
  *
@@ -252,7 +250,6 @@
   }
 }
 
-
 /**
  * Copies properties from one object to another. If no target object is passed
  * a new object will be created and returned.
@@ -543,13 +540,14 @@
         cstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"].
                 createInstance(Components.interfaces.nsIConverterInputStream);
         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);
+
         readTimer.done();
         this.parseDB(data, aRebuildOnError);
       }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/LightweightThemeManager.jsm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/LightweightThemeManager.jsm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/LightweightThemeManager.jsm	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/LightweightThemeManager.jsm	2014-11-26 21:46:04.000000000 +0000
@@ -771,7 +771,9 @@
 
   persist.progressListener = new _persistProgressListener(successCallback);
 
-  persist.saveURI(sourceURI, null, null, null, null, targetURI, null);
+  persist.saveURI(sourceURI, null,
+                  null, Ci.nsIHttpChannel.REFERRER_POLICY_NO_REFERRER_WHEN_DOWNGRADE,
+                  null, null, targetURI, null);
 }
 
 function _persistProgressListener(successCallback) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js	2014-11-26 21:46:04.000000000 +0000
@@ -763,22 +763,24 @@
       fstream.init(file, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0);
       cstream.init(fstream, "UTF-8", 0, 0);
 
-      let (str = {}) {
-        let 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
-          text += str.value;
-        } while (read != 0);
-      }
+      do {
+        read = cstream.readString(0xffffffff, str); // read as much as we can and put it in str.value
+        text += str.value;
+      } while (read != 0);
     } catch (e) {
       LOG("Blocklist::_loadBlocklistFromFile: Failed to load XML file " + e);
     } finally {
-      cstream.close();
-      fstream.close();
+      if (cstream)
+        cstream.close();
+      if (fstream)
+        fstream.close();
     }
 
-    text && this._loadBlocklistFromString(text);
+    if (text)
+        this._loadBlocklistFromString(text);
   },
 
   _isBlocklistLoaded: function() {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug586574.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug586574.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug586574.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug586574.js	2014-11-26 21:46:04.000000000 +0000
@@ -21,15 +21,10 @@
 var gResetToAutomatic;
 var gResetToManual;
 
-// Remember and restore preferences for this test, and make sure
-// we don't accidentally start a background update while the prefs
+// Make sure we don't accidentally start a background update while the prefs
 // are enabled.
 disableBackgroundUpdateTimer();
-var updatesEnabled = Services.prefs.getBoolPref(PREF_UPDATE_ENABLED);
-var autoDefault = Services.prefs.getBoolPref(PREF_AUTOUPDATE_DEFAULT);
 registerCleanupFunction(() => {
-  Services.prefs.setBoolPref(PREF_UPDATE_ENABLED, updatesEnabled);
-  Services.prefs.setBoolPref(PREF_AUTOUPDATE_DEFAULT, autoDefault);
   enableBackgroundUpdateTimer();
 });
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/test/browser/head.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/test/browser/head.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/extensions/test/browser/head.js	2014-11-14 09:37:34.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/extensions/test/browser/head.js	2014-11-26 21:46:04.000000000 +0000
@@ -65,6 +65,8 @@
                      {name: "extensions.webservice.discoverURL"},
                      {name: "extensions.update.url"},
                      {name: "extensions.update.background.url"},
+                     {name: "extensions.update.enabled"},
+                     {name: "extensions.update.autoUpdateDefault"},
                      {name: "extensions.getAddons.get.url"},
                      {name: "extensions.getAddons.getWithPerformance.url"},
                      {name: "extensions.getAddons.search.browseURL"},
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/make-eme.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/make-eme.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/make-eme.mk	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/make-eme.mk	2014-11-26 21:46:04.000000000 +0000
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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_DIR)/toolkit/mozapps/installer/signing.mk
+
+ifdef MOZ_SIGN_CMD
+  ifeq ($(OS_ARCH),WINNT)
+    MAKE_SIGN_EME_VOUCHER := $(PYTHON) $(topsrcdir)/python/eme/gen-eme-voucher.py -input $(DIST)/bin/plugin-container.exe -output $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/voucher.bin && \
+      $(MOZ_SIGN_CMD) -f emevoucher "$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/voucher.bin"
+  endif
+endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/packager.mk thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/packager.mk
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/packager.mk	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/packager.mk	2014-11-26 21:46:04.000000000 +0000
@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/package-name.mk
+include $(MOZILLA_DIR)/toolkit/mozapps/installer/make-eme.mk
 
 # This is how we create the binary packages we release to the public.
 
@@ -39,7 +40,7 @@
 _APPNAME = $(MOZ_MACBUNDLE_NAME)
 endif
 ifndef _BINPATH
-_BINPATH = /$(_APPNAME)/Contents/Resources
+_BINPATH = /$(_APPNAME)/Contents/MacOS
 endif # _BINPATH
 ifdef UNIVERSAL_BINARY
 STAGEPATH = universal/
@@ -708,6 +709,7 @@
 		$(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
+	$(MAKE_SIGN_EME_VOUCHER)
 ifndef LIBXUL_SDK
 ifdef MOZ_PACKAGE_JSSHELL
 # Package JavaScript Shell
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/packager.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/packager.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/packager.py	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/packager.py	2014-11-26 21:46:04.000000000 +0000
@@ -32,6 +32,7 @@
 from StringIO import StringIO
 import subprocess
 import platform
+import mozinfo
 
 # List of libraries to shlibsign.
 SIGN_LIBS = [
@@ -294,11 +295,11 @@
     elif 'MOZ_OMNIJAR' in defines:
         del defines['MOZ_OMNIJAR']
 
-    binpath = ''
-    if 'BINPATH' in defines:
-        binpath = SimpleManifestSink.normalize_path(defines['BINPATH'])
-    while binpath.startswith('/'):
-        binpath = binpath[1:]
+    respath = ''
+    if 'RESPATH' in defines:
+        respath = SimpleManifestSink.normalize_path(defines['RESPATH'])
+    while respath.startswith('/'):
+        respath = respath[1:]
 
     if args.unify:
         def is_native(path):
@@ -349,18 +350,19 @@
             removals_in.name = args.removals
             removals = RemovedFiles(copier)
             preprocess(removals_in, removals, defines)
-            copier.add(mozpack.path.join(binpath, 'removed-files'), removals)
+            copier.add(mozpack.path.join(respath, 'removed-files'), removals)
 
     # shlibsign libraries
     if launcher.can_launch():
-        for lib in SIGN_LIBS:
-            libbase = mozpack.path.join(binpath, '%s%s') \
-                % (buildconfig.substs['DLL_PREFIX'], lib)
-            libname = '%s%s' % (libbase, buildconfig.substs['DLL_SUFFIX'])
-            if copier.contains(libname):
-                copier.add(libbase + '.chk',
-                           LibSignFile(os.path.join(args.destination,
-                                                    libname)))
+        if not mozinfo.isMac:
+            for lib in SIGN_LIBS:
+                libbase = mozpack.path.join(respath, '%s%s') \
+                    % (buildconfig.substs['DLL_PREFIX'], lib)
+                libname = '%s%s' % (libbase, buildconfig.substs['DLL_SUFFIX'])
+                if copier.contains(libname):
+                    copier.add(libbase + '.chk',
+                               LibSignFile(os.path.join(args.destination,
+                                                        libname)))
 
     # Setup preloading
     if args.jarlog and os.path.exists(args.jarlog):
@@ -393,7 +395,7 @@
 
     copier.copy(args.destination)
     generate_precomplete(os.path.normpath(os.path.join(args.destination,
-                                                       binpath)))
+                                                       respath)))
 
 
 if __name__ == '__main__':
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh	2014-11-26 21:46:04.000000000 +0000
@@ -4332,11 +4332,7 @@
 !macroend
 
 /**
- * Parses the uninstall.log for the stub installer on install to first remove a
- * previous installation's files prior to installing.
- *
- * When modifying this macro be aware that LineFind uses all registers except
- * $R0-$R3 so be cautious. Callers of this macro are not affected.
+ * Parses the precomplete file to remove an installation's files and directories.
  *
  * @param   _PROGRESSBAR
  *          The progress bar to update using PBM_STEPIT. Can also be "false" if
@@ -4345,125 +4341,181 @@
  *          The install step counter to increment. The variable specified in
  *          this parameter is also updated. Can also be "false" if a counter
  *          isn't needed.
- *
- * $R2 = _INSTALL_STEP_COUNTER
- * $R3 = _PROGRESSBAR
+ * $R2 = false if all files were deleted or moved to the tobedeleted directory.
+ *       true if file(s) could not be moved to the tobedeleted directory.
+ * $R3 = Path to temporary precomplete file.
+ * $R4 = File handle for the temporary precomplete file.
+ * $R5 = String returned from FileRead.
+ * $R6 = First seven characters of the string returned from FileRead.
+ * $R7 = Temporary file path used to rename files that are in use.
+ * $R8 = _PROGRESSBAR
+ * $R9 = _INSTALL_STEP_COUNTER
  */
-!macro OnStubInstallUninstall
+!macro RemovePrecompleteEntries
 
-  !ifndef OnStubInstallUninstall
-    !insertmacro GetParent
-    !insertmacro LineFind
-    !insertmacro TrimNewLines
+  !ifndef ${_MOZFUNC_UN}RemovePrecompleteEntries
+    !define _MOZFUNC_UN_TMP ${_MOZFUNC_UN}
+    !insertmacro ${_MOZFUNC_UN_TMP}GetParent
+    !insertmacro ${_MOZFUNC_UN_TMP}TrimNewLines
+    !insertmacro ${_MOZFUNC_UN_TMP}WordReplace
+    !undef _MOZFUNC_UN
+    !define _MOZFUNC_UN ${_MOZFUNC_UN_TMP}
+    !undef _MOZFUNC_UN_TMP
 
     !verbose push
     !verbose ${_MOZFUNC_VERBOSE}
-    !define OnStubInstallUninstall "!insertmacro OnStubInstallUninstallCall"
+    !define ${_MOZFUNC_UN}RemovePrecompleteEntries "!insertmacro ${_MOZFUNC_UN}RemovePrecompleteEntriesCall"
 
-    Function OnStubInstallUninstall
-      Exch $R2
+    Function ${_MOZFUNC_UN}RemovePrecompleteEntries
+      Exch $R9
       Exch 1
-      Exch $R3
-      Push $R9
-      Push $R8
+      Exch $R8
       Push $R7
       Push $R6
       Push $R5
       Push $R4
-      Push $R1
-      Push $R0
-      Push $TmpVal
+      Push $R3
+      Push $R2
 
-      IfFileExists "$INSTDIR\uninstall\uninstall.log" +1 end
+      ${If} ${FileExists} "$INSTDIR\precomplete"
+        StrCpy $R2 "false"
 
-      ; Copy the uninstall log file to a temporary file
-      GetTempFileName $TmpVal
-      CopyFiles /SILENT /FILESONLY "$INSTDIR\uninstall\uninstall.log" "$TmpVal"
+        RmDir /r "$INSTDIR\${TO_BE_DELETED}"
+        CreateDirectory "$INSTDIR\${TO_BE_DELETED}"
+        GetTempFileName $R3 "$INSTDIR\${TO_BE_DELETED}"
+        Delete "$R3"
+        Rename "$INSTDIR\precomplete" "$R3"
 
-      CreateDirectory "$INSTDIR\${TO_BE_DELETED}"
+        ClearErrors
+        ; Rename and then remove files
+        FileOpen $R4 "$R3" r
+        ${Do}
+          FileRead $R4 $R5
+          ${If} ${Errors}
+            ${Break}
+          ${EndIf}
 
-      ; Delete files
-      ${LineFind} "$TmpVal" "/NUL" "1:-1" "StubRemoveFilesCallback"
+          ${${_MOZFUNC_UN}TrimNewLines} "$R5" $R5
+          ; Replace all occurrences of "/" with "\".
+          ${${_MOZFUNC_UN}WordReplace} "$R5" "/" "\" "+" $R5
+
+          ; Copy the first 7 chars
+          StrCpy $R6 "$R5" 7
+          ${If} "$R6" == "remove "
+            ; Copy the string starting after the 8th char
+            StrCpy $R5 "$R5" "" 8
+            ; Copy all but the last char to remove the double quote.
+            StrCpy $R5 "$R5" -1
+            ${If} ${FileExists} "$INSTDIR\$R5"
+              ${Unless} "$R9" == "false"
+                IntOp $R9 $R9 + 2
+              ${EndUnless}
+              ${Unless} "$R8" == "false"
+                SendMessage $R8 ${PBM_STEPIT} 0 0
+                SendMessage $R8 ${PBM_STEPIT} 0 0
+              ${EndUnless}
 
-      ; Delete the temporary uninstall log file
-      Delete /REBOOTOK "$TmpVal"
+              ClearErrors
+              Delete "$INSTDIR\$R5"
+              ${If} ${Errors}
+                GetTempFileName $R7 "$INSTDIR\${TO_BE_DELETED}"
+                Delete "$R7"
+                ClearErrors
+                Rename "$INSTDIR\$R5" "$R7"
+                ${Unless} ${Errors}
+                  Delete /REBOOTOK "$R7"
+
+                  ClearErrors
+                ${EndUnless}
+!ifdef __UNINSTALL__
+                ${If} ${Errors}
+                  Delete /REBOOTOK "$INSTDIR\$R5"
+                  StrCpy $R2 "true"
+                  ClearErrors
+                ${EndIf}
+!endif
+              ${EndIf}
+            ${EndIf}
+          ${ElseIf} "$R6" == "rmdir $\""
+            ; Copy the string starting after the 7th char.
+            StrCpy $R5 "$R5" "" 7
+            ; Copy all but the last two chars to remove the slash and the double quote.
+            StrCpy $R5 "$R5" -2
+            ${If} ${FileExists} "$INSTDIR\$R5"
+              ; Ignore directory removal errors
+              RmDir "$INSTDIR\$R5"
+              ClearErrors
+            ${EndIf}
+          ${EndIf}
+        ${Loop}
+        FileClose $R4
 
-      RmDir /r /REBOOTOK "$INSTDIR\${TO_BE_DELETED}"
+        ; Delete the temporary precomplete file
+        Delete /REBOOTOK "$R3"
+
+        RmDir /r /REBOOTOK "$INSTDIR\${TO_BE_DELETED}"
+
+        ${If} ${RebootFlag}
+        ${AndIf} "$R2" == "false"
+          ; Clear the reboot flag if all files were deleted or moved to the
+          ; tobedeleted directory.
+          SetRebootFlag false
+        ${EndIf}
+      ${EndIf}
 
-      end:
       ClearErrors
 
-      Pop $TmpVal
-      Pop $R0
-      Pop $R1
+      Pop $R2
+      Pop $R3
       Pop $R4
       Pop $R5
       Pop $R6
       Pop $R7
-      Pop $R8
-      Pop $R9
-      Exch $R3
+      Exch $R8
       Exch 1
-      Exch $R2
-    FunctionEnd
-
-    Function StubRemoveFilesCallback
-      ${TrimNewLines} "$R9" $R9
-      StrCpy $R1 "$R9" 5       ; Copy the first five chars
-
-      StrCmp "$R1" "File:" +1 end
-      StrCpy $R9 "$R9" "" 6    ; Copy string starting after the 6th char
-      StrCpy $R0 "$R9" 1       ; Copy the first char
-
-      StrCmp "$R0" "\" +1 end  ; If this isn't a relative path goto end
-      StrCmp "$R9" "\MapiProxy_InUse.dll" end +1 ; Skip the MapiProxy_InUse.dll
-      StrCmp "$R9" "\mozMapi32_InUse.dll" end +1 ; Skip the mozMapi32_InUse.dll
-
-      StrCpy $R1 "$INSTDIR$R9" ; Copy the install dir path and suffix it with the string
-      IfFileExists "$R1" +1 end
-
-      ${Unless} "$R2" == "false"
-        IntOp $R2 $R2 + 2
-      ${EndIf}
-      ${Unless} "$R3" == "false"
-        SendMessage $R3 ${PBM_STEPIT} 0 0
-        SendMessage $R3 ${PBM_STEPIT} 0 0
-      ${EndIf}
-
-      ClearErrors
-      Delete "$R1"
-      ${Unless} ${Errors}
-        Goto end
-      ${EndUnless}
-
-      GetTempFileName $R0 "$INSTDIR\${TO_BE_DELETED}"
-      Delete "$R0"
-      ClearErrors
-      Rename "$R1" "$R0"
-      ${If} ${Errors}
-        Delete /REBOOTOK "$R1"
-      ${EndUnless}
-
-      end:
-      ClearErrors
-
-      Push 0
+      Exch $R9
     FunctionEnd
 
     !verbose pop
   !endif
 !macroend
 
-!macro OnStubInstallUninstallCall _PROGRESSBAR _INSTALL_STEP_COUNTER
+!macro RemovePrecompleteEntriesCall _PROGRESSBAR _INSTALL_STEP_COUNTER
   !verbose push
   Push "${_PROGRESSBAR}"
   Push "${_INSTALL_STEP_COUNTER}"
   !verbose ${_MOZFUNC_VERBOSE}
-  Call OnStubInstallUninstall
+  Call RemovePrecompleteEntries
+  Pop ${_INSTALL_STEP_COUNTER}
+  !verbose pop
+!macroend
+
+!macro un.RemovePrecompleteEntriesCall _PROGRESSBAR _INSTALL_STEP_COUNTER
+  !verbose push
+  !verbose ${_MOZFUNC_VERBOSE}
+  Push "${_PROGRESSBAR}"
+  Push "${_INSTALL_STEP_COUNTER}"
+  Call un.RemovePrecompleteEntries
   Pop ${_INSTALL_STEP_COUNTER}
+  Pop $0
   !verbose pop
 !macroend
 
+!macro un.RemovePrecompleteEntries
+  !ifndef un.RemovePrecompleteEntries
+    !verbose push
+    !verbose ${_MOZFUNC_VERBOSE}
+    !undef _MOZFUNC_UN
+    !define _MOZFUNC_UN "un."
+
+    !insertmacro RemovePrecompleteEntries
+
+    !undef _MOZFUNC_UN
+    !define _MOZFUNC_UN
+    !verbose pop
+  !endif
+!macroend
+
 /**
  * Parses the uninstall.log to unregister dll's, remove files, and remove
  * empty directories for this installation.
@@ -5675,8 +5727,6 @@
       Delete "$INSTDIR\updates.xml"
       Delete "$INSTDIR\active-update.xml"
 
-      RmDir /r "$INSTDIR\distribution"
-
       ; Remove files from the uninstall directory.
       ${If} ${FileExists} "$INSTDIR\uninstall"
         Delete "$INSTDIR\uninstall\*wizard*"
@@ -6061,8 +6111,10 @@
         ${LogMsg} "OS Name    : Windows 7"
       ${ElseIf} ${IsWin8}
         ${LogMsg} "OS Name    : Windows 8"
-      ${ElseIf} ${AtLeastWin8}
-        ${LogMsg} "OS Name    : Above Windows 8"
+      ${ElseIf} ${IsWin8.1}
+        ${LogMsg} "OS Name    : Windows 8.1"
+      ${ElseIf} ${AtLeastWin8.1}
+        ${LogMsg} "OS Name    : Above Windows 8.1"
       ${Else}
         ${LogMsg} "OS Name    : Unable to detect"
       ${EndIf}
@@ -7717,8 +7769,8 @@
  * System::Call "kernel32::GetTickCount()l .s"
  * Pop $varname
  *
- * _START_TICK_COUNT    
- * _FINISH_TICK_COUNT   
+ * _START_TICK_COUNT
+ * _FINISH_TICK_COUNT
  * _RES_ELAPSED_SECONDS return value - elapsed time between _START_TICK_COUNT
  *                      and _FINISH_TICK_COUNT in seconds.
  */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/update/common/updatedefines.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/update/common/updatedefines.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/update/common/updatedefines.h	2014-11-14 09:37:35.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/update/common/updatedefines.h	2014-11-26 21:46:05.000000000 +0000
@@ -51,7 +51,7 @@
 // multiple nulls in a string is fine and this approach is simpler (possibly
 // faster) than calculating the string length to place the null terminator and
 // truncates the string as _snprintf and _snwprintf do on other platforms.
-static int mysnprintf(char* dest, size_t count, const char* fmt, ...)
+static inline int mysnprintf(char* dest, size_t count, const char* fmt, ...)
 {
   size_t _count = count - 1;
   va_list varargs;
@@ -62,7 +62,7 @@
   return result;
 }
 #define snprintf mysnprintf
-static int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, ...)
+static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, ...)
 {
   size_t _count = count - 1;
   va_list varargs;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js	2014-11-26 21:46:05.000000000 +0000
@@ -15,16 +15,11 @@
 
 // MOZ_APP_BASENAME is not optional for tests.
 const MOZ_APP_BASENAME = "@MOZ_APP_BASENAME@";
+const APP_BIN_SUFFIX = "@BIN_SUFFIX@";
 
 const APP_INFO_NAME = "XPCShell";
 const APP_INFO_VENDOR = "Mozilla";
 
-#ifdef XP_UNIX
-const APP_BIN_SUFFIX = "-bin";
-#else
-const APP_BIN_SUFFIX = "@BIN_SUFFIX@";
-#endif
-
 #ifdef XP_WIN
 const IS_WIN = true;
 #else
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/moz.build	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/moz.build	2014-11-26 21:46:05.000000000 +0000
@@ -5,7 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
+    'nsAlertsIconListener.cpp',
     'nsGnomeModule.cpp',
+    'nsSystemAlertsService.cpp',
 ]
 
 if CONFIG['MOZ_ENABLE_GCONF']:
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -51,6 +51,21 @@
   NS_RELEASE(alert);
 }
 
+static GdkPixbuf*
+GetPixbufFromImgRequest(imgIRequest* aRequest)
+{
+  nsCOMPtr<imgIContainer> image;
+  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
+  if (NS_FAILED(rv)) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
+    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
+
+  return imgToPixbuf->ConvertImageToPixbuf(image);
+}
+
 NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver,
                   nsIObserver, nsISupportsWeakReference)
 
@@ -93,60 +108,58 @@
 nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData)
 {
   if (aType == imgINotificationObserver::LOAD_COMPLETE) {
-    return OnStopRequest(aRequest);
+    return OnLoadComplete(aRequest);
   }
 
   if (aType == imgINotificationObserver::FRAME_COMPLETE) {
-    return OnStopFrame(aRequest);
+    return OnFrameComplete(aRequest);
   }
 
   return NS_OK;
 }
 
 nsresult
-nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest)
+nsAlertsIconListener::OnLoadComplete(imgIRequest* aRequest)
 {
+  NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!");
+
   uint32_t imgStatus = imgIRequest::STATUS_ERROR;
   nsresult rv = aRequest->GetImageStatus(&imgStatus);
   NS_ENSURE_SUCCESS(rv, rv);
   if ((imgStatus & imgIRequest::STATUS_ERROR) && !mLoadedFrame) {
     // We have an error getting the image. Display the notification with no icon.
     ShowAlert(nullptr);
-  }
 
-  if (mIconRequest) {
+    // Cancel any pending request
     mIconRequest->Cancel(NS_BINDING_ABORTED);
     mIconRequest = nullptr;
   }
+
   return NS_OK;
 }
 
 nsresult
-nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest)
+nsAlertsIconListener::OnFrameComplete(imgIRequest* aRequest)
 {
-  if (aRequest != mIconRequest)
-    return NS_ERROR_FAILURE;
+  NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!");
 
   if (mLoadedFrame)
     return NS_OK; // only use one frame
 
-  nsCOMPtr<imgIContainer> image;
-  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
-    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
-
-  GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image);
-  if (!imagePixbuf)
-    return NS_ERROR_FAILURE;
+  GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest);
+  if (!imagePixbuf) {
+    ShowAlert(nullptr);
+  } else {
+    ShowAlert(imagePixbuf);
+    g_object_unref(imagePixbuf);
+  }
 
-  ShowAlert(imagePixbuf);
+  mLoadedFrame = true;
 
-  g_object_unref(imagePixbuf);
+  // Cancel any pending request (multipart image loading/decoding for instance)
+  mIconRequest->Cancel(NS_BINDING_ABORTED);
+  mIconRequest = nullptr;
 
-  mLoadedFrame = true;
   return NS_OK;
 }
 
@@ -180,6 +193,9 @@
   mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE);
   gboolean result = notify_notification_show(mNotification, nullptr);
 
+  if (result && mAlertListener)
+    mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get());
+
   return result ? NS_OK : NS_ERROR_FAILURE;
 }
 
@@ -201,9 +217,16 @@
   if (!il)
     return ShowAlert(nullptr);
 
-  return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr,
-                            this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
-                            nullptr, getter_AddRefs(mIconRequest));
+  nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr,
+                                   NS_LITERAL_STRING("default"), nullptr, nullptr,
+                                   this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
+                                   0 /* use default */, getter_AddRefs(mIconRequest));
+  if (NS_FAILED(rv))
+    return rv;
+
+  mIconRequest->StartDecoding();
+
+  return NS_OK;
 }
 
 void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsAlertsIconListener.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsAlertsIconListener.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsAlertsIconListener.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsAlertsIconListener.h	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,89 @@
+/* -*- 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 nsAlertsIconListener_h__
+#define nsAlertsIconListener_h__
+
+#include "nsCOMPtr.h"
+#include "imgINotificationObserver.h"
+#include "nsStringAPI.h"
+#include "nsIObserver.h"
+#include "nsWeakReference.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+class imgIRequest;
+
+struct NotifyNotification;
+
+class nsAlertsIconListener : public imgINotificationObserver,
+                             public nsIObserver,
+                             public nsSupportsWeakReference
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGINOTIFICATIONOBSERVER
+  NS_DECL_NSIOBSERVER
+
+  nsAlertsIconListener();
+
+  nsresult InitAlertAsync(const nsAString & aImageUrl,
+                          const nsAString & aAlertTitle, 
+                          const nsAString & aAlertText,
+                          bool aAlertTextClickable,
+                          const nsAString & aAlertCookie,
+                          nsIObserver * aAlertListener);
+
+  void SendCallback();
+  void SendClosed();
+
+protected:
+  virtual ~nsAlertsIconListener();
+
+  nsresult OnLoadComplete(imgIRequest* aRequest);
+  nsresult OnFrameComplete(imgIRequest* aRequest);
+
+  /**
+   * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols
+   * is that notify_notification_new takes three arguments in libnotify.so.4 and
+   * four in libnotify.so.1.
+   * Passing the fourth argument as NULL is binary compatible.
+   */
+  typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer);
+  typedef bool (*notify_is_initted_t)(void);
+  typedef bool (*notify_init_t)(const char*);
+  typedef GList* (*notify_get_server_caps_t)(void);
+  typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*);
+  typedef bool (*notify_notification_show_t)(void*, char*);
+  typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*);
+  typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc);
+
+  nsCOMPtr<imgIRequest> mIconRequest;
+  nsCString mAlertTitle;
+  nsCString mAlertText;
+
+  nsCOMPtr<nsIObserver> mAlertListener;
+  nsString mAlertCookie;
+
+  bool mLoadedFrame;
+  bool mAlertHasAction;
+
+  static void* libNotifyHandle;
+  static bool libNotifyNotAvail;
+  static notify_is_initted_t notify_is_initted;
+  static notify_init_t notify_init;
+  static notify_get_server_caps_t notify_get_server_caps;
+  static notify_notification_new_t notify_notification_new;
+  static notify_notification_show_t notify_notification_show;
+  static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf;
+  static notify_notification_add_action_t notify_notification_add_action;
+  NotifyNotification* mNotification;
+  gulong mClosureHandler;
+
+  nsresult StartRequest(const nsAString & aImageUrl);
+  nsresult ShowAlert(GdkPixbuf* aPixbuf);
+};
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsGnomeModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsGnomeModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsGnomeModule.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsGnomeModule.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -22,6 +22,8 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
 #endif
+#include "nsSystemAlertsService.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
 
 #ifdef MOZ_ENABLE_GCONF
 NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
@@ -33,6 +35,7 @@
 NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
 #endif
+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
 
 static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
 #ifdef MOZ_ENABLE_GCONF
@@ -45,6 +48,7 @@
   { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor },
   { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
 #endif
+  { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
   { nullptr }
 };
 
@@ -59,6 +63,7 @@
   { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID },
   { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
 #endif
+  { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
   { nullptr }
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,54 @@
+/* -*- 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 "nsXULAppAPI.h"
+#include "nsSystemAlertsService.h"
+#include "nsAlertsIconListener.h"
+#include "nsAutoPtr.h"
+
+NS_IMPL_ADDREF(nsSystemAlertsService)
+NS_IMPL_RELEASE(nsSystemAlertsService)
+
+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
+   NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
+NS_INTERFACE_MAP_END_THREADSAFE
+
+nsSystemAlertsService::nsSystemAlertsService()
+{
+}
+
+nsSystemAlertsService::~nsSystemAlertsService()
+{}
+
+nsresult
+nsSystemAlertsService::Init()
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, 
+                                                           const nsAString & aAlertText, bool aAlertTextClickable,
+                                                           const nsAString & aAlertCookie,
+                                                           nsIObserver * aAlertListener,
+                                                           const nsAString & aAlertName,
+                                                           const nsAString & aBidi,
+                                                           const nsAString & aLang,
+                                                           const nsAString & aData,
+                                                           nsIPrincipal * aPrincipal)
+{
+  nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
+  if (!alertListener)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
+                                       aAlertCookie, aAlertListener);
+}
+
+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName,
+                                                nsIPrincipal* aPrincipal)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsSystemAlertsService.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsSystemAlertsService.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/system/gnome/nsSystemAlertsService.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/system/gnome/nsSystemAlertsService.h	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,27 @@
+/* -*- 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 nsSystemAlertsService_h__
+#define nsSystemAlertsService_h__
+
+#include "nsIAlertsService.h"
+#include "nsCOMPtr.h"
+
+class nsSystemAlertsService : public nsIAlertsService
+{
+public:
+  NS_DECL_NSIALERTSSERVICE
+  NS_DECL_ISUPPORTS
+
+  nsSystemAlertsService();
+
+  nsresult Init();
+
+protected:
+  virtual ~nsSystemAlertsService();
+
+};
+
+#endif /* nsSystemAlertsService_h__ */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/osx/global/media/TopLevelImageDocument.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/osx/global/media/TopLevelImageDocument.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/osx/global/media/TopLevelImageDocument.css	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/osx/global/media/TopLevelImageDocument.css	2014-11-26 21:46:05.000000000 +0000
@@ -10,7 +10,7 @@
     background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
   }
 
-  img.decoded {
+  img.transparent {
     background: hsl(0,0%,90%) url("chrome://global/skin/media/imagedoc-lightnoise.png");
     color: #222;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/osx/global/toolbar.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/osx/global/toolbar.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/osx/global/toolbar.css	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/osx/global/toolbar.css	2014-11-26 21:46:05.000000000 +0000
@@ -14,7 +14,7 @@
 toolbar:-moz-lwtheme {
   -moz-appearance: none;
   background: none;
-  border-style: none;
+  border-color: transparent;
 }
 
 menubar {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/windows/global/media/TopLevelImageDocument.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/windows/global/media/TopLevelImageDocument.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/windows/global/media/TopLevelImageDocument.css	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/windows/global/media/TopLevelImageDocument.css	2014-11-26 21:46:05.000000000 +0000
@@ -10,7 +10,7 @@
     background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
   }
 
-  img.decoded {
+  img.transparent {
     background: hsl(0,0%,90%) url("chrome://global/skin/media/imagedoc-lightnoise.png");
     color: #222;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/windows/global/menu.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/windows/global/menu.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/windows/global/menu.css	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/windows/global/menu.css	2014-11-26 21:46:05.000000000 +0000
@@ -127,7 +127,7 @@
 
 menubar > menu:-moz-lwtheme {
   -moz-appearance: none;
-  border-style: none;
+  border-color: transparent;
 }
 
 menubar > menu:-moz-lwtheme:not([disabled="true"]) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/windows/global/toolbar.css thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/windows/global/toolbar.css
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/themes/windows/global/toolbar.css	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/themes/windows/global/toolbar.css	2014-11-26 21:46:05.000000000 +0000
@@ -43,7 +43,7 @@
 toolbar:-moz-lwtheme {
   -moz-appearance: none;
   background: none;
-  border-style: none;
+  border-color: transparent;
 }
 
 /* ::::: toolbar decorations ::::: */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/moz.build	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/moz.build	2014-11-26 21:46:05.000000000 +0000
@@ -105,9 +105,6 @@
 
 MSVC_ENABLE_PGO = True
 
-if CONFIG['MOZ_BUILD_APP'] in ['browser']:
-      DEFINES['HAVE_SHIMS'] = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsAppRunner.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsAppRunner.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsAppRunner.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsAppRunner.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -2984,7 +2984,7 @@
 
   StartupTimeline::Record(StartupTimeline::MAIN);
 
-  if (ChaosMode::isActive()) {
+  if (ChaosMode::isActive(ChaosMode::Any)) {
     printf_stderr("*** You are running in chaos test mode. See ChaosMode.h. ***\n");
   }
 
@@ -4613,42 +4613,24 @@
   }
 #endif
 
-#if defined(XP_WIN) || defined(XP_MACOSX)
+#if defined(XP_MACOSX)
   // If for any reason we suspect acceleration will be disabled, disabled
-  // e10s auto start. (bug 1068199) THIS IS A TEMPORARY WORKAROUND.
+  // e10s auto start on mac.
   if (gBrowserTabsRemoteAutostart) {
     // Check prefs
     bool accelDisabled = Preferences::GetBool("layers.acceleration.disabled", false) &&
                          !Preferences::GetBool("layers.acceleration.force-enabled", false);
 
-#if defined(XP_MACOSX)
     accelDisabled = accelDisabled || !nsCocoaFeatures::AccelerateByDefault();
-#endif
 
     // Check for blocked drivers
     if (!accelDisabled) {
       nsCOMPtr<nsIGfxInfo> gfxInfo = do_GetService("@mozilla.org/gfx/info;1");
       if (gfxInfo) {
         int32_t status;
-#if defined(XP_WIN)
-        long flagsToCheck[4] = {
-          nsIGfxInfo::FEATURE_DIRECT3D_9_LAYERS,
-          nsIGfxInfo::FEATURE_DIRECT3D_10_LAYERS,
-          nsIGfxInfo::FEATURE_DIRECT3D_10_1_LAYERS,
-          nsIGfxInfo::FEATURE_DIRECT3D_11_LAYERS
-        };
-#elif defined(XP_MACOSX)
-        long flagsToCheck[1] = {
-          nsIGfxInfo::FEATURE_OPENGL_LAYERS
-        };
-#endif
-        for (unsigned int idx = 0; idx < ArrayLength(flagsToCheck); idx++) {
-          if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(flagsToCheck[idx], &status))) {
-            if (status != nsIGfxInfo::FEATURE_STATUS_OK) {
-              accelDisabled = true;
-              break;
-            }
-          }
+        if (NS_SUCCEEDED(gfxInfo->GetFeatureStatus(nsIGfxInfo::FEATURE_OPENGL_LAYERS, &status)) &&
+            status != nsIGfxInfo::FEATURE_STATUS_OK) {
+          accelDisabled = true;
         }
       }
     }
@@ -4666,7 +4648,7 @@
       LogE10sBlockedReason("Hardware acceleration is disabled");
     }
   }
-#endif
+#endif // defined(XP_MACOSX)
 
   mozilla::Telemetry::Accumulate(mozilla::Telemetry::E10S_AUTOSTART, gBrowserTabsRemoteAutostart);
   if (Preferences::GetBool("browser.enabledE10SFromPrompt", false)) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsEmbedFunctions.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsEmbedFunctions.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsEmbedFunctions.cpp	2014-11-14 09:37:36.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsEmbedFunctions.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -71,6 +71,7 @@
 #include "mozilla/ipc/XPCShellEnvironment.h"
 
 #include "GMPProcessChild.h"
+#include "GMPLoader.h"
 
 #include "GeckoProfiler.h"
 
@@ -104,6 +105,10 @@
 using mozilla::dom::ContentParent;
 using mozilla::dom::ContentChild;
 
+using mozilla::gmp::GMPLoader;
+using mozilla::gmp::CreateGMPLoader;
+using mozilla::gmp::GMPProcessChild;
+
 using mozilla::ipc::TestShellParent;
 using mozilla::ipc::TestShellCommandParent;
 using mozilla::ipc::XPCShellEnvironment;
@@ -288,12 +293,25 @@
 
 nsresult
 XRE_InitChildProcess(int aArgc,
-                     char* aArgv[])
+                     char* aArgv[],
+                     GMPLoader* aGMPLoader)
 {
   NS_ENSURE_ARG_MIN(aArgc, 2);
   NS_ENSURE_ARG_POINTER(aArgv);
   NS_ENSURE_ARG_POINTER(aArgv[0]);
 
+#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.
+  GMPProcessChild::SetGMPLoader(aGMPLoader);
+#else
+  // On Fennec, the GMPLoader's code resides inside XUL (because for the time
+  // being GMPLoader relies upon NSPR, which we can't use in plugin-container
+  // on Android), so we create it here inside XUL and pass it to the GMP code.
+  nsAutoPtr<GMPLoader> loader(CreateGMPLoader(nullptr));
+  GMPProcessChild::SetGMPLoader(loader);
+#endif
+
 #if defined(XP_WIN)
   // From the --attach-console support in nsNativeAppSupportWin.cpp, but
   // here we are a content child process, so we always attempt to attach
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsWindowsWMain.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsWindowsWMain.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsWindowsWMain.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsWindowsWMain.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -16,6 +16,10 @@
 #include "nsSetDllDirectory.h"
 #endif
 
+#if defined(MOZ_METRO) || defined(__GNUC__)
+#define XRE_DONT_SUPPORT_XPSP2
+#endif
+
 #ifndef XRE_DONT_SUPPORT_XPSP2
 #include "WindowsCrtPatch.h"
 #endif
@@ -80,7 +84,7 @@
 
 int wmain(int argc, WCHAR **argv)
 {
-#if !defined(XRE_DONT_SUPPORT_XPSP2) && !defined(MOZ_METRO)
+#if !defined(XRE_DONT_SUPPORT_XPSP2)
   WindowsCrtPatch::Init();
 #endif
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsXREDirProvider.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsXREDirProvider.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/toolkit/xre/nsXREDirProvider.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/toolkit/xre/nsXREDirProvider.cpp	2014-11-26 21:46:05.000000000 +0000
@@ -551,7 +551,9 @@
 static void
 RegisterExtensionInterpositions(nsINIParser &parser)
 {
-#if defined(NIGHTLY_BUILD) && defined(HAVE_SHIMS)
+  if (!mozilla::Preferences::GetBool("extensions.interposition.enabled", false))
+    return;
+
   nsCOMPtr<nsIAddonInterposition> interposition =
     do_GetService("@mozilla.org/addons/multiprocess-shims;1");
 
@@ -570,7 +572,6 @@
       continue;
   }
   while (true);
-#endif
 }
 
 static void
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/bloatview/bloatdiff.pl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/bloatview/bloatdiff.pl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/bloatview/bloatdiff.pl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/bloatview/bloatdiff.pl	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,372 @@
+#!/usr/bin/perl -w
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+################################################################################
+
+sub usage() {
+    print <<EOUSAGE;
+# bloatdiff.pl - munges the output from
+#   XPCOM_MEM_BLOAT_LOG=1 
+#   firefox-bin -P default resource:///res/bloatcycle.html
+# so that it does some summary and stats stuff.
+#
+# To show leak test results for a set of changes, do something like this:
+#
+#   XPCOM_MEM_BLOAT_LOG=1
+#   firefox-bin -P default resource:///res/bloatcycle.html > a.out
+#     **make change**
+#   firefox-bin -P default resource:///res/bloatcycle.html > b.out
+#   bloatdiff.pl a.out b.out
+
+EOUSAGE
+}
+
+$OLDFILE = $ARGV[0];
+$NEWFILE = $ARGV[1];
+#$LABEL   = $ARGV[2];
+
+if (!$OLDFILE or
+    ! -e $OLDFILE or 
+    -z $OLDFILE) {
+    print "\nError: Previous log file not specified, does not exist, or is empty.\n\n";
+    &usage();
+    exit 1;
+}
+
+if (!$NEWFILE or
+    ! -e $NEWFILE or 
+    -z $NEWFILE) {
+    print "\nError: Current log file not specified, does not exist, or is empty.\n\n";
+    &usage();
+    exit 1;
+}
+
+sub processFile {
+    my ($filename, $map, $prevMap) = @_;
+    open(FH, $filename);
+    while (<FH>) {
+        if (m{
+              ^\s*(\d+)\s          # Line number
+              ([\w:]+)\s+          # Name
+              (-?\d+)\s+           # Size
+              (-?\d+)\s+           # Leaked
+              (-?\d+)\s+           # Objects Total
+              (-?\d+)\s+           # Objects Rem
+              \(\s*(-?[\d.]+)\s+   # Objects Mean
+                 \+/-\s+
+              ([\w.]+)\)\s+        # Objects StdDev
+              (-?\d+)\s+           # Reference Total
+              (-?\d+)\s+           # Reference Rem
+              \(\s*(-?[\d.]+)\s+   # Reference Mean
+                 \+/-\s+
+              ([\w\.]+)\)          # Reference StdDev
+             }x) {
+          $$map{$2} = { name => $2,
+                        size => $3,
+                        leaked => $4,
+                        objTotal => $5,
+                        objRem => $6,
+                        objMean => $7,
+                        objStdDev => $8,
+                        refTotal => $9,
+                        refRem => $10,
+                        refMean => $11,
+                        refStdDev => $12,
+                        bloat => $3 * $5 # size * objTotal
+                      };
+        } else {
+#            print "failed to parse: $_\n";
+        }
+    }
+    close(FH);
+}
+
+%oldMap = ();
+processFile($OLDFILE, \%oldMap);
+
+%newMap = ();
+processFile($NEWFILE, \%newMap);
+
+################################################################################
+
+$inf = 9999999.99;
+
+sub getLeaksDelta {
+    my ($key) = @_;
+    my $oldLeaks = $oldMap{$key}{leaked} || 0;
+    my $newLeaks = $newMap{$key}{leaked};
+    my $percentLeaks = 0;
+    if ($oldLeaks == 0) {
+        if ($newLeaks != 0) {
+            # there weren't any leaks before, but now there are!
+            $percentLeaks = $inf;
+        }
+    }
+    else {
+        $percentLeaks = ($newLeaks - $oldLeaks) / $oldLeaks * 100;
+    }
+    # else we had no record of this class before
+    return ($newLeaks - $oldLeaks, $percentLeaks);
+}
+    
+################################################################################
+
+sub getBloatDelta {
+    my ($key) = @_;
+    my $newBloat = $newMap{$key}{bloat};
+    my $percentBloat = 0;
+    my $oldSize = $oldMap{$key}{size} || 0;
+    my $oldTotal = $oldMap{$key}{objTotal} || 0;
+    my $oldBloat = $oldTotal * $oldSize;
+    if ($oldBloat == 0) {
+        if ($newBloat != 0) {
+            # this class wasn't used before, but now it is
+            $percentBloat = $inf;
+        }
+    }
+    else {
+        $percentBloat = ($newBloat - $oldBloat) / $oldBloat * 100;
+    }
+    # else we had no record of this class before
+    return ($newBloat - $oldBloat, $percentBloat);
+}
+
+################################################################################
+
+foreach $key (keys %newMap) {
+    my ($newLeaks, $percentLeaks) = getLeaksDelta($key);
+    my ($newBloat, $percentBloat) = getBloatDelta($key);
+    $newMap{$key}{leakDelta} = $newLeaks;
+    $newMap{$key}{leakPercent} = $percentLeaks;
+    $newMap{$key}{bloatDelta} = $newBloat;
+    $newMap{$key}{bloatPercent} = $percentBloat;
+}
+
+################################################################################
+
+# Print a value of bytes out in a reasonable
+# KB, MB, or GB form.  Copied from build-seamonkey-util.pl, sorry.  -mcafee
+sub PrintSize($) {
+
+    # print a number with 3 significant figures
+    sub PrintNum($) {
+        my ($num) = @_;
+        my $rv;
+        if ($num < 1) {
+            $rv = sprintf "%.3f", ($num);
+        } elsif ($num < 10) {
+            $rv = sprintf "%.2f", ($num);
+        } elsif ($num < 100) {
+            $rv = sprintf "%.1f", ($num);
+        } else {
+            $rv = sprintf "%d", ($num);
+        }
+    }
+
+    my ($size) = @_;
+    my $rv;
+    if ($size > 1000000000) {
+        $rv = PrintNum($size / 1000000000.0) . "G";
+    } elsif ($size > 1000000) {
+        $rv = PrintNum($size / 1000000.0) . "M";
+    } elsif ($size > 1000) {
+        $rv = PrintNum($size / 1000.0) . "K";
+    } else {
+        $rv = PrintNum($size);
+    }
+}
+
+
+print "Bloat/Leak Delta Report\n";
+print "--------------------------------------------------------------------------------------\n";
+print "Current file:  $NEWFILE\n";
+print "Previous file: $OLDFILE\n";
+print "----------------------------------------------leaks------leaks%------bloat------bloat%\n";
+
+    if (! $newMap{"TOTAL"} or 
+        ! $newMap{"TOTAL"}{bloat}) {
+        # It's OK if leaked or leakPercent are 0 (in fact, that would be good).
+        # If bloatPercent is zero, it is also OK, because we may have just had
+        # two runs exactly the same or with no new bloat.
+        print "\nError: unable to calculate bloat/leak data.\n";
+        print "There is no data present.\n\n";
+        print "HINT - Did your test run complete successfully?\n";
+        print "HINT - Are you pointing at the right log files?\n\n";
+        &usage();
+        exit 1;
+    }
+
+printf "%-40s %10s %10.2f%% %10s %10.2f%%\n",
+       ("TOTAL",
+        $newMap{"TOTAL"}{leaked}, $newMap{"TOTAL"}{leakPercent},
+        $newMap{"TOTAL"}{bloat}, $newMap{"TOTAL"}{bloatPercent});
+
+################################################################################
+
+sub percentStr {
+    my ($p) = @_;
+    if ($p == $inf) {
+        return "-";
+    }
+    else {
+        return sprintf "%10.2f%%", $p;
+    }
+}
+
+# NEW LEAKS
+@keys = sort { $newMap{$b}{leakPercent} <=> $newMap{$a}{leakPercent} } keys %newMap;
+my $needsHeading = 1;
+my $total = 0;
+foreach $key (@keys) {
+    my $percentLeaks = $newMap{$key}{leakPercent};
+    my $leaks = $newMap{$key}{leaked};
+    if ($percentLeaks > 0 && $key !~ /TOTAL/) {
+        if ($needsHeading) {
+            printf "--NEW-LEAKS-----------------------------------leaks------leaks%%-----------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
+        $total += $leaks;
+    }
+}
+if (!$needsHeading) {
+    printf "%-40s %10s\n", ("TOTAL", $total);
+}
+
+# FIXED LEAKS
+@keys = sort { $newMap{$b}{leakPercent} <=> $newMap{$a}{leakPercent} } keys %newMap;
+$needsHeading = 1;
+$total = 0;
+foreach $key (@keys) {
+    my $percentLeaks = $newMap{$key}{leakPercent};
+    my $leaks = $newMap{$key}{leaked};
+    if ($percentLeaks < 0 && $key !~ /TOTAL/) {
+        if ($needsHeading) {
+            printf "--FIXED-LEAKS---------------------------------leaks------leaks%%-----------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
+        $total += $leaks;
+    }
+}
+if (!$needsHeading) {
+    printf "%-40s %10s\n", ("TOTAL", $total);
+}
+
+# NEW BLOAT
+@keys = sort { $newMap{$b}{bloatPercent} <=> $newMap{$a}{bloatPercent} } keys %newMap;
+$needsHeading = 1;
+$total = 0;
+foreach $key (@keys) {
+    my $percentBloat = $newMap{$key}{bloatPercent};
+    my $bloat = $newMap{$key}{bloat};
+    if ($percentBloat > 0  && $key !~ /TOTAL/) {
+        if ($needsHeading) {
+            printf "--NEW-BLOAT-----------------------------------bloat------bloat%%-----------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $bloat, percentStr($percentBloat));
+        $total += $bloat;
+    }
+}
+if (!$needsHeading) {
+    printf "%-40s %10s\n", ("TOTAL", $total);
+}
+
+# ALL LEAKS
+@keys = sort { $newMap{$b}{leaked} <=> $newMap{$a}{leaked} } keys %newMap;
+$needsHeading = 1;
+$total = 0;
+foreach $key (@keys) {
+    my $leaks = $newMap{$key}{leaked};
+    my $percentLeaks = $newMap{$key}{leakPercent};
+    if ($leaks > 0) {
+        if ($needsHeading) {
+            printf "--ALL-LEAKS-----------------------------------leaks------leaks%%-----------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
+        if ($key !~ /TOTAL/) {
+            $total += $leaks;
+        }
+    }
+}
+if (!$needsHeading) {
+#    printf "%-40s %10s\n", ("TOTAL", $total);
+}
+
+# ALL BLOAT
+@keys = sort { $newMap{$b}{bloat} <=> $newMap{$a}{bloat} } keys %newMap;
+$needsHeading = 1;
+$total = 0;
+foreach $key (@keys) {
+    my $bloat = $newMap{$key}{bloat};
+    my $percentBloat = $newMap{$key}{bloatPercent};
+    if ($bloat > 0) {
+        if ($needsHeading) {
+            printf "--ALL-BLOAT-----------------------------------bloat------bloat%%-----------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $bloat, percentStr($percentBloat));
+        if ($key !~ /TOTAL/) {
+            $total += $bloat;
+        }
+    }
+}
+if (!$needsHeading) {
+#    printf "%-40s %10s\n", ("TOTAL", $total);
+}
+
+# NEW CLASSES
+@keys = sort { $newMap{$b}{bloatDelta} <=> $newMap{$a}{bloatDelta} } keys %newMap;
+$needsHeading = 1;
+my $ltotal = 0;
+my $btotal = 0;
+foreach $key (@keys) {
+    my $leaks = $newMap{$key}{leaked};
+    my $bloat = $newMap{$key}{bloat};
+    my $percentBloat = $newMap{$key}{bloatPercent};
+    if ($percentBloat == $inf && $key !~ /TOTAL/) {
+        if ($needsHeading) {
+            printf "--CLASSES-NOT-REPORTED-LAST-TIME--------------leaks------bloat------------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $leaks, $bloat);
+        if ($key !~ /TOTAL/) {
+            $ltotal += $leaks;
+            $btotal += $bloat;
+        }
+    }
+}
+if (!$needsHeading) {
+    printf "%-40s %10s %10s\n", ("TOTAL", $ltotal, $btotal);
+}
+
+# OLD CLASSES
+@keys = sort { ($oldMap{$b}{bloat} || 0) <=> ($oldMap{$a}{bloat} || 0) } keys %oldMap;
+$needsHeading = 1;
+$ltotal = 0;
+$btotal = 0;
+foreach $key (@keys) {
+    if (!defined($newMap{$key})) {
+        my $leaks = $oldMap{$key}{leaked};
+        my $bloat = $oldMap{$key}{bloat};
+        if ($needsHeading) {
+            printf "--CLASSES-THAT-WENT-AWAY----------------------leaks------bloat------------------------\n";
+            $needsHeading = 0;
+        }
+        printf "%-40s %10s %10s\n", ($key, $leaks, $bloat);
+        if ($key !~ /TOTAL/) {
+            $ltotal += $leaks;
+            $btotal += $bloat;
+        }
+    }
+}
+if (!$needsHeading) {
+    printf "%-40s %10s %10s\n", ("TOTAL", $ltotal, $btotal);
+}
+
+print "--------------------------------------------------------------------------------------\n";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/bloatview/bloattable.pl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/bloatview/bloattable.pl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/bloatview/bloattable.pl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/bloatview/bloattable.pl	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,590 @@
+#!/usr/bin/perl -w
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# bloattable [-debug] [-source] [-byte n|-obj n|-ref n] <file1> <file2> ... <filen> > <html-file>
+#
+# file1, file2, ... filen should be successive BloatView files generated from the same run.
+# Summarize them in an HTML table.  Output the HTML to the standard output.
+#
+# If -debug is set, create a slightly larger html file which is more suitable for debugging this script.
+# If -source is set, create an html file that prints the html source as the output
+# If -byte n, -obj n, or -ref n is given, make the page default to showing byte, object, or reference statistics,
+#    respectively, and sort by the nth column (n is zero-based, so the first column has n==0).
+#
+# See http://lxr.mozilla.org/mozilla/source/xpcom/doc/MemoryTools.html
+
+use 5.004;
+use strict;
+use diagnostics;
+use File::Basename;
+use Getopt::Long;
+
+# The generated HTML is almost entirely generated by a script.  Only the <HTML>, <HEAD>, and <BODY> elements are explicit
+# because a <SCRIPT> element cannot officially be a direct descendant of an <HTML> element.
+# The script itself is almost all generated by an eval of a large string.  This allows the script to reproduce itself
+# when making a new page using document.write's.  Re-sorting the page causes it to regenerate itself in this way.
+
+
+
+# Return the file's modification date.
+sub fileModDate($) {
+	my ($pathName) = @_;
+	my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) =
+		stat $pathName or die "Can't stat '$pathName'";
+	return $mtime;
+}
+
+
+sub fileCoreName($) {
+	my ($pathName) = @_;
+	my $fileName = basename($pathName, "");
+	$fileName =~ s/\..*//;
+	return $fileName;
+}
+
+
+# Convert a raw string into a single-quoted JavaScript string.
+sub singleQuoteString($) {
+	local ($_) = @_;
+	s/\\/\\\\/g;
+	s/'/\\'/g;
+	s/\n/\\n/g;
+	s/<\//<\\\//g;
+	return "'$_'";
+}
+
+
+# Convert a raw string into a double-quoted JavaScript string.
+sub doubleQuoteString($) {
+	local ($_) = @_;
+	s/\\/\\\\/g;
+	s/"/\\"/g;
+	s/\n/\\n/g;
+	s/<\//<\\\//g;
+	return "\"$_\"";
+}
+
+
+# Quote special HTML characters in the string.
+sub quoteHTML($) {
+	local ($_) = @_;
+	s/\&/&amp;/g;
+	s/</&lt;/g;
+	s/>/&gt;/g;
+	s/ /&nbsp;/g;
+	s/\n/<BR>\n/g;
+	return $_;
+}
+
+
+# Write the generated page to the standard output.
+# The script source code is read from this file past the __END__ marker
+# @$scriptData is the JavaScript source for the tables passed to JavaScript.  Each entry is one line of JavaScript.
+# @$persistentScriptData is the same as @scriptData, but persists when the page reloads itself.
+# If $debug is true, generate the script directly instead of having it eval itself.
+# If $source is true, generate a script that displays the page's source instead of the page itself.
+sub generate(\@\@$$$$) {
+	my ($scriptData, $persistentScriptData, $debug, $source, $showMode, $sortColumn) = @_;
+
+	my @scriptSource = <DATA>;
+	chomp @scriptSource;
+	print <<'EOS';
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+<HEAD>
+<SCRIPT type="text/javascript">
+EOS
+
+	foreach (@$scriptData) {print "$_\n";}
+	print "\n";
+
+	print "var srcArray = [\n";
+	my @quotedScriptSource = map {
+		my $line = $_;
+		$line =~ s/^\s+//g;
+		# $line =~ s/^\/\/SOURCE\s+//g if $source;
+		$line =~ s/^\/\/.*//g;
+		$line =~ s/\s+$//g;
+		$line eq "" ? () : $line
+	} @$persistentScriptData, @scriptSource;
+	my $lastQuotedLine = pop @quotedScriptSource;
+	foreach (@quotedScriptSource) {print doubleQuoteString($_), ",\n";}
+	print doubleQuoteString($lastQuotedLine), "];\n\n";
+
+	if ($debug) {
+		push @quotedScriptSource, $lastQuotedLine;
+		foreach (@quotedScriptSource) {
+			s/<\//<\\\//g;	# This fails if a regexp ends with a '<'.  Oh well....
+			print "$_\n";
+		}
+		print "\n";
+	} else {
+		print "eval(srcArray.join(\"\\n\"));\n\n";
+	}
+	print "showMode = $showMode;\n";
+	print "sortColumn = $sortColumn;\n";
+	if ($source) {
+		print <<'EOS';
+function writeQuotedHTML(s) {
+	document.write(quoteHTML(s.toString()).replace(/\n/g, '<BR>\n'));
+}
+
+var quotingDocument = {
+  write: function () {
+		for (var i = 0; i < arguments.length; i++)
+			writeQuotedHTML(arguments[i]);
+	},
+  writeln: function () {
+		for (var i = 0; i < arguments.length; i++)
+			writeQuotedHTML(arguments[i]);
+		document.writeln('<BR>');
+	}
+};
+EOS
+	} else {
+		print "showHead(document);\n";
+	}
+	print "</SCRIPT>\n";
+	print "</HEAD>\n\n";
+	print "<BODY>\n";
+	if ($source) {
+		print "<P><TT>";
+		print quoteHTML "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n";
+		print quoteHTML "<HTML>\n";
+		print quoteHTML "<HEAD>\n";
+		print "<SCRIPT type=\"text/javascript\">showHead(quotingDocument);</SCRIPT>\n";
+		print quoteHTML "</HEAD>\n\n";
+		print quoteHTML "<BODY>\n";
+		print "<SCRIPT type=\"text/javascript\">showBody(quotingDocument);</SCRIPT>\n";
+		print quoteHTML "</BODY>\n";
+		print quoteHTML "</HTML>\n";
+		print "</TT></P>\n";
+	} else {
+		print "<SCRIPT type=\"text/javascript\">showBody(document);</SCRIPT>\n";
+	}
+	print "</BODY>\n";
+	print "</HTML>\n";
+}
+
+
+
+# Read the bloat file into hash table $h.  The hash table is indexed by class names;
+# each entry is a list with the following elements:
+#	bytesAlloc		Total number of bytes allocated
+#	bytesNet		Total number of bytes allocated but not deallocated
+#	objectsAlloc	Total number of objects allocated
+#	objectsNet		Total number of objects allocated but not deallocated
+#	refsAlloc		Total number of references AddRef'd
+#	refsNet			Total number of references AddRef'd but not Released
+# Except for TOTAL, all hash table entries refer to mutually exclusive data.
+# $sizes is a hash table indexed by class names.  Each entry of that table contains the class's instance size.
+sub readBloatFile($\%\%) {
+	my ($file, $h, $sizes) = @_;
+	local $_;	# Needed for 'while (<FILE>)' below.
+
+	my $readSomething = 0;
+	open FILE, $file;
+	while (<FILE>) {
+		if (my ($name, $size, $bytesNet, $objectsAlloc, $objectsNet, $refsAlloc, $refsNet) =
+			   /^\s*(?:\d+)\s+([\w:]+)\s+(\d+)\s+(-?\d+)\s+(\d+)\s+(-?\d+)\s*\([^()]*\)\s*(\d+)\s+(-?\d+)\s*\([^()]*\)\s*$/) {
+			my $bytesAlloc;
+			if ($name eq "TOTAL") {
+				$size = "undefined";
+				$bytesAlloc = "undefined";
+			} else {
+				$bytesAlloc = $objectsAlloc * $size;
+				if ($bytesNet != $objectsNet * $size) {
+					print STDERR "In '$file', class $name bytesNet != objectsNet * size: $bytesNet != $objectsNet * $size\n";
+				}
+			}
+			print STDERR "Duplicate entry $name in '$file'\n" if $$h{$name};
+			$$h{$name} = [$bytesAlloc, $bytesNet, $objectsAlloc, $objectsNet, $refsAlloc, $refsNet];
+			
+			my $oldSize = $$sizes{$name};
+			print STDERR "Mismatch of sizes of class $name: $oldSize and $size\n" if defined($oldSize) && $size ne $oldSize;
+			$$sizes{$name} = $size;
+			$readSomething = 1;
+		} elsif (/^\s*(?:\d+)\s+([\w:]+)\s/) {
+			print STDERR "Unable to parse '$file' line: $_";
+		}
+	}
+	close FILE;
+	print STDERR "No data in '$file'\n" unless $readSomething;
+	return $h;
+}
+
+
+my %sizes;			# <class-name> => <instance-size>
+my %tables;			# <file-name> => <bloat-table>; see readBloatFile for format of <bloat-table>
+
+# Generate the JavaScript source code for the row named $c.  $l can contain the initial entries of the row.
+sub genTableRowSource($$) {
+	my ($l, $c) = @_;
+	my $lastE;
+	foreach (@ARGV) {
+		my $e = $tables{$_}{$c};
+		if (defined($lastE) && !defined($e)) {
+			$e = [0,0,0,0,0,0];
+			print STDERR "Class $c is defined in an earlier file but not in '$_'\n";
+		}
+		if (defined $e) {
+			if (defined $lastE) {
+				for (my $i = 0; $i <= $#$e; $i++) {
+					my $n = $$e[$i];
+					$l .= ($n eq "undefined" ? "undefined" : $n - $$lastE[$i]) . ",";
+				}
+				$l .= " ";
+			} else {
+				$l .= join(",", @$e) . ", ";
+			}
+			$lastE = $e;
+		} else {
+			$l .= "0,0,0,0,0,0, ";
+		}
+	}
+	$l .= join(",", @$lastE);
+	return "[$l]";
+}
+
+
+
+my $debug;
+my $source;
+my $showMode;
+my $sortColumn;
+my @modeOptions;
+
+GetOptions("debug" => \$debug, "source" => \$source, "byte=i" => \$modeOptions[0], "obj=i" => \$modeOptions[1], "ref=i" => \$modeOptions[2]);
+for (my $i = 0; $i != 3; $i++) {
+	my $modeOption = $modeOptions[$i];
+	if ($modeOption) {
+		die "Only one of -byte, -obj, or -ref may be given" if defined $showMode;
+		my $nFileColumns = scalar(@ARGV) + 1;
+		die "-byte, -obj, or -ref column number out of range" if $modeOption < 0 || $modeOption >= 2 + 2*$nFileColumns;
+		$showMode = $i;
+		if ($modeOption >= 2) {
+			$modeOption -= 2;
+			$sortColumn = 2 + $showMode*2;
+			if ($modeOption >= $nFileColumns) {
+				$sortColumn++;
+				$modeOption -= $nFileColumns;
+			}
+			$sortColumn += $modeOption*6;
+		} else {
+			$sortColumn = $modeOption;
+		}
+	}
+}
+unless (defined $showMode) {
+	$showMode = 0;
+	$sortColumn = 0;
+}
+
+# Read all of the bloat files.
+foreach (@ARGV) {
+	unless ($tables{$_}) {
+		my $f = $_;
+		my %table;
+		
+		readBloatFile $_, %table, %sizes;
+		$tables{$_} = \%table;
+	}
+}
+die "No input" unless %sizes;
+
+my @scriptData;	# JavaScript source for the tables passed to JavaScript.  Each entry is one line of JavaScript.
+my @persistentScriptData;	# Same as @scriptData, but persists the page reloads itself.
+
+# Print a list of bloat file names.
+push @persistentScriptData, "var nFiles = " . scalar(@ARGV) . ";";
+push @persistentScriptData, "var fileTags = [" . join(", ", map {singleQuoteString substr(fileCoreName($_), -10)} @ARGV) . "];";
+push @persistentScriptData, "var fileNames = [" . join(", ", map {singleQuoteString $_} @ARGV) . "];";
+push @persistentScriptData, "var fileDates = [" . join(", ", map {singleQuoteString localtime fileModDate $_} @ARGV) . "];";
+
+# Print the bloat tables.
+push @persistentScriptData, "var totals = " . genTableRowSource('"TOTAL", undefined, ', "TOTAL") . ";";
+push @scriptData, "var classTables = [";
+delete $sizes{"TOTAL"};
+my @classes = sort(keys %sizes);
+for (my $i = 0; $i <= $#classes; $i++) {
+	my $c = $classes[$i];
+	push @scriptData, genTableRowSource(doubleQuoteString($c).", ".$sizes{$c}.", ", $c) . ($i == $#classes ? "];" : ",");
+}
+
+generate(@scriptData, @persistentScriptData, $debug, $source, $showMode, $sortColumn);
+1;
+
+
+# The source of the eval'd JavaScript follows.
+# Comments starting with // that are alone on a line are stripped by the Perl script.
+__END__
+
+// showMode: 0=bytes, 1=objects, 2=references
+var showMode;
+var modeName;
+var modeNameUpper;
+
+var sortColumn;
+
+// Sort according to the sortColumn.  Column 0 is sorted alphabetically in ascending order.
+// All other columns are sorted numerically in descending order, with column 0 used for a secondary sort.
+// Undefined is always listed last.
+function sortCompare(x, y) {
+	if (sortColumn) {
+		var xc = x[sortColumn];
+		var yc = y[sortColumn];
+		if (xc < yc || xc === undefined && yc !== undefined) return 1;
+		if (yc < xc || yc === undefined && xc !== undefined) return -1;
+	}
+	
+	var x0 = x[0];
+	var y0 = y[0];
+	if (x0 > y0 || x0 === undefined && y0 !== undefined) return 1;
+	if (y0 > x0 || y0 === undefined && x0 !== undefined) return -1;
+	return 0;
+}
+
+
+// Quote special HTML characters in the string.
+function quoteHTML(s) {
+	s = s.replace(/&/g, '&amp;');
+	// Can't use /</g because HTML interprets '</g' as ending the script!
+	s = s.replace(/\x3C/g, '&lt;');
+	s = s.replace(/>/g, '&gt;');
+	s = s.replace(/ /g, '&nbsp;');
+	return s;
+}
+
+
+function writeFileTable(d) {
+	d.writeln('<TABLE border=1 cellspacing=1 cellpadding=0>');
+	d.writeln('<TR>\n<TH>Name</TH>\n<TH>File</TH>\n<TH>Date</TH>\n</TR>');
+	for (var i = 0; i < nFiles; i++)
+		d.writeln('<TR>\n<TD>'+quoteHTML(fileTags[i])+'</TD>\n<TD><TT>'+quoteHTML(fileNames[i])+'</TT></TD>\n<TD>'+quoteHTML(fileDates[i])+'</TD>\n</TR>');
+	d.writeln('</TABLE>');
+}
+
+
+function writeReloadLink(d, column, s, rowspan) {
+	d.write(rowspan == 1 ? '<TH>' : '<TH rowspan='+rowspan+'>');
+	if (column != sortColumn)
+		d.write('<A href="javascript:reloadSelf('+column+','+showMode+')">');
+	d.write(s);
+	if (column != sortColumn)
+		d.write('</A>');
+	d.writeln('</TH>');
+}
+
+function writeClassTableRow(d, row, base, modeName) {
+	if (modeName) {
+		d.writeln('<TR>\n<TH>'+modeName+'</TH>');
+	} else {
+		d.writeln('<TR>\n<TD><A href="javascript:showRowDetail(\''+row[0]+'\')">'+quoteHTML(row[0])+'</A></TD>');
+		var v = row[1];
+		d.writeln('<TD class=num>'+(v === undefined ? '' : v)+'</TD>');
+	}
+	for (var i = 0; i != 2; i++) {
+		var c = base + i;
+		for (var j = 0; j <= nFiles; j++) {
+			v = row[c];
+			var style = 'num';
+			if (j != nFiles)
+				if (v > 0) {
+					style = 'pos';
+					v = '+'+v;
+				} else
+					style = 'neg';
+			d.writeln('<TD class='+style+'>'+(v === undefined ? '' : v)+'</TD>');
+			c += 6;
+		}
+	}
+	d.writeln('</TR>');
+}
+
+function writeClassTable(d) {
+	var base = 2 + showMode*2;
+
+	// Make a copy because a sort is destructive.
+	var table = classTables.concat();
+	table.sort(sortCompare);
+
+	d.writeln('<TABLE border=1 cellspacing=1 cellpadding=0>');
+
+	d.writeln('<TR>');
+	writeReloadLink(d, 0, 'Class Name', 2);
+	writeReloadLink(d, 1, 'Instance<BR>Size', 2);
+	d.writeln('<TH colspan='+(nFiles+1)+'>'+modeNameUpper+'s allocated</TH>');
+	d.writeln('<TH colspan='+(nFiles+1)+'>'+modeNameUpper+'s allocated but not freed</TH>\n</TR>');
+	d.writeln('<TR>');
+	for (var i = 0; i != 2; i++) {
+		var c = base + i;
+		for (var j = 0; j <= nFiles; j++) {
+			writeReloadLink(d, c, j == nFiles ? 'Total' : quoteHTML(fileTags[j]), 1);
+			c += 6;
+		}
+	}
+	d.writeln('</TR>');
+
+	writeClassTableRow(d, totals, base, 0);
+	for (var r = 0; r < table.length; r++)
+		writeClassTableRow(d, table[r], base, 0);
+
+	d.writeln('</TABLE>');
+}
+
+
+var modeNames = ["byte", "object", "reference"];
+var modeNamesUpper = ["Byte", "Object", "Reference"];
+var styleSheet = '<STYLE type="TEXT/CSS">\n'+
+	'BODY {background-color: #FFFFFF; color: #000000}\n'+
+	'.num {text-align: right}\n'+
+	'.pos {text-align: right; color: #CC0000}\n'+
+	'.neg {text-align: right; color: #009900}\n'+
+	'</STYLE>';
+
+
+function showHead(d) {
+	modeName = modeNames[showMode];
+	modeNameUpper = modeNamesUpper[showMode];
+	d.writeln('<TITLE>'+modeNameUpper+' Bloats</TITLE>');
+	d.writeln(styleSheet);
+}
+
+function showBody(d) {
+	d.writeln('<H1>'+modeNameUpper+' Bloats</H1>');
+	writeFileTable(d);
+	d.write('<FORM>');
+	for (var i = 0; i != 3; i++)
+		if (i != showMode) {
+			var newSortColumn = sortColumn;
+			if (sortColumn >= 2)
+				newSortColumn = sortColumn + (i-showMode)*2;
+			d.write('<INPUT type="button" value="Show '+modeNamesUpper[i]+'s" onClick="reloadSelf('+newSortColumn+','+i+')">');
+		}
+	d.writeln('</FORM>');
+	d.writeln('<P>The numbers do not include <CODE>malloc</CODE>\'d data such as string contents.</P>');
+	d.writeln('<P>Click on a column heading to sort by that column. Click on a class name to see details for that class.</P>');
+	writeClassTable(d);
+}
+
+
+function showRowDetail(rowName) {
+	var row;
+	var i;
+
+	if (rowName == "TOTAL")
+		row = totals;
+	else {
+		for (i = 0; i < classTables.length; i++)
+			if (rowName == classTables[i][0]) {
+				row = classTables[i];
+				break;
+			}
+	}
+	if (row) {
+		var w = window.open("", "ClassTableRowDetails");
+		var d = w.document;
+		d.open();
+		d.writeln('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">');
+		d.writeln('<HTML>\n<HEAD>\n<TITLE>'+quoteHTML(rowName)+' bloat details</TITLE>');
+		d.writeln(styleSheet);
+		d.writeln('</HEAD>\n\n<BODY>');
+		d.writeln('<H2>'+quoteHTML(rowName)+'</H2>');
+		if (row[1] !== undefined)
+			d.writeln('<P>Each instance has '+row[1]+' bytes.</P>');
+
+		d.writeln('<TABLE border=1 cellspacing=1 cellpadding=0>');
+		d.writeln('<TR>\n<TH></TH>\n<TH colspan='+(nFiles+1)+'>Allocated</TH>');
+		d.writeln('<TH colspan='+(nFiles+1)+'>Allocated but not freed</TH>\n</TR>');
+		d.writeln('<TR>\n<TH></TH>');
+		for (i = 0; i != 2; i++)
+			for (var j = 0; j <= nFiles; j++)
+				d.writeln('<TH>'+(j == nFiles ? 'Total' : quoteHTML(fileTags[j]))+'</TH>');
+		d.writeln('</TR>');
+
+		for (i = 0; i != 3; i++)
+			writeClassTableRow(d, row, 2+i*2, modeNamesUpper[i]+'s');
+
+		d.writeln('</TABLE>\n</BODY>\n</HTML>');
+		d.close();
+	}
+	return undefined;
+}
+
+
+function stringSource(s) {
+	s = s.replace(/\\/g, '\\\\');
+	s = s.replace(/"/g, '\\"');
+	s = s.replace(/<\//g, '<\\/');
+	return '"'+s+'"';
+}
+
+function reloadSelf(n,m) {
+	// Need to cache these because globals go away on document.open().
+	var sa = srcArray;
+	var ss = stringSource;
+	var ct = classTables;
+	var i;
+
+	document.open();
+	// Uncomment this and comment the document.open() line above to see the reloaded page's source.
+	//var w = window.open("", "NewDoc");
+	//var d = w.document;
+	//var document = new Object;
+	//document.write = function () {
+	//	for (var i = 0; i < arguments.length; i++) {
+	//		var s = arguments[i].toString();
+	//		s = s.replace(/&/g, '&amp;');
+	//		s = s.replace(/\x3C/g, '&lt;');
+	//		s = s.replace(/>/g, '&gt;');
+	//		s = s.replace(/ /g, '&nbsp;');
+	//		d.write(s);
+	//	}
+	//};
+	//document.writeln = function () {
+	//	for (var i = 0; i < arguments.length; i++) {
+	//		var s = arguments[i].toString();
+	//		s = s.replace(/&/g, '&amp;');
+	//		s = s.replace(/\x3C/g, '&lt;');
+	//		s = s.replace(/>/g, '&gt;');
+	//		s = s.replace(/ /g, '&nbsp;');
+	//		d.write(s);
+	//	}
+	//	d.writeln('<BR>');
+	//};
+
+	document.writeln('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">');
+	document.writeln('<HTML>\n<HEAD>\n<SCRIPT type="text/javascript">');
+
+	// Manually copy non-persistent script data
+	if (!ct.length)
+		document.writeln('var classTables = [];');
+	else {
+		document.writeln('var classTables = [');
+		for (i = 0; i < ct.length; i++) {
+			var row = ct[i];
+			document.write('[' + ss(row[0]));
+			for (var j = 1; j < row.length; j++)
+				document.write(',' + row[j]);
+			document.writeln(']' + (i == ct.length-1 ? '];' : ','));
+		}
+	}
+
+	document.writeln('var srcArray = [');
+	for (i = 0; i < sa.length; i++) {
+		document.write(ss(sa[i]));
+		if (i != sa.length-1)
+			document.writeln(',');
+	}
+	document.writeln('];');
+	document.writeln('eval(srcArray.join("\\n"));');
+	document.writeln('showMode = '+m+';');
+	document.writeln('sortColumn = '+n+';');
+	document.writeln('showHead(document);');
+	document.writeln('</SCRIPT>\n</HEAD>\n\n<BODY>\n<SCRIPT type="text/javascript">showBody(document);</SCRIPT>\n</BODY>\n</HTML>');
+	document.close();
+	return undefined;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mach_commands.py	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mach_commands.py	2014-11-26 21:46:05.000000000 +0000
@@ -293,25 +293,6 @@
 
 
 @CommandProvider
-class ReviewboardToolsProvider(MachCommandBase):
-    @Command('rbt', category='devenv',
-        description='Run Reviewboard Tools')
-    @CommandArgument('args', nargs='...', help='Arguments to rbt tool')
-    def rbt(self, args):
-        if not args:
-            args = ['help']
-
-        self._activate_virtualenv()
-        self.virtualenv_manager.install_pip_package('RBTools==0.6')
-
-        from rbtools.commands.main import main
-
-        # main() doesn't accept arguments and instead reads from sys.argv. So,
-        # we fake it out.
-        sys.argv = ['rbt'] + args
-        return main()
-
-@CommandProvider
 class FormatProvider(MachCommandBase):
     @Command('clang-format', category='misc',
         description='Run clang-format on current changes')
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/memory/bloattable.pl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/memory/bloattable.pl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/memory/bloattable.pl	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/memory/bloattable.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,590 +0,0 @@
-#!/usr/bin/perl -w
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# bloattable [-debug] [-source] [-byte n|-obj n|-ref n] <file1> <file2> ... <filen> > <html-file>
-#
-# file1, file2, ... filen should be successive BloatView files generated from the same run.
-# Summarize them in an HTML table.  Output the HTML to the standard output.
-#
-# If -debug is set, create a slightly larger html file which is more suitable for debugging this script.
-# If -source is set, create an html file that prints the html source as the output
-# If -byte n, -obj n, or -ref n is given, make the page default to showing byte, object, or reference statistics,
-#    respectively, and sort by the nth column (n is zero-based, so the first column has n==0).
-#
-# See http://lxr.mozilla.org/mozilla/source/xpcom/doc/MemoryTools.html
-
-use 5.004;
-use strict;
-use diagnostics;
-use File::Basename;
-use Getopt::Long;
-
-# The generated HTML is almost entirely generated by a script.  Only the <HTML>, <HEAD>, and <BODY> elements are explicit
-# because a <SCRIPT> element cannot officially be a direct descendant of an <HTML> element.
-# The script itself is almost all generated by an eval of a large string.  This allows the script to reproduce itself
-# when making a new page using document.write's.  Re-sorting the page causes it to regenerate itself in this way.
-
-
-
-# Return the file's modification date.
-sub fileModDate($) {
-	my ($pathName) = @_;
-	my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) =
-		stat $pathName or die "Can't stat '$pathName'";
-	return $mtime;
-}
-
-
-sub fileCoreName($) {
-	my ($pathName) = @_;
-	my $fileName = basename($pathName, "");
-	$fileName =~ s/\..*//;
-	return $fileName;
-}
-
-
-# Convert a raw string into a single-quoted JavaScript string.
-sub singleQuoteString($) {
-	local ($_) = @_;
-	s/\\/\\\\/g;
-	s/'/\\'/g;
-	s/\n/\\n/g;
-	s/<\//<\\\//g;
-	return "'$_'";
-}
-
-
-# Convert a raw string into a double-quoted JavaScript string.
-sub doubleQuoteString($) {
-	local ($_) = @_;
-	s/\\/\\\\/g;
-	s/"/\\"/g;
-	s/\n/\\n/g;
-	s/<\//<\\\//g;
-	return "\"$_\"";
-}
-
-
-# Quote special HTML characters in the string.
-sub quoteHTML($) {
-	local ($_) = @_;
-	s/\&/&amp;/g;
-	s/</&lt;/g;
-	s/>/&gt;/g;
-	s/ /&nbsp;/g;
-	s/\n/<BR>\n/g;
-	return $_;
-}
-
-
-# Write the generated page to the standard output.
-# The script source code is read from this file past the __END__ marker
-# @$scriptData is the JavaScript source for the tables passed to JavaScript.  Each entry is one line of JavaScript.
-# @$persistentScriptData is the same as @scriptData, but persists when the page reloads itself.
-# If $debug is true, generate the script directly instead of having it eval itself.
-# If $source is true, generate a script that displays the page's source instead of the page itself.
-sub generate(\@\@$$$$) {
-	my ($scriptData, $persistentScriptData, $debug, $source, $showMode, $sortColumn) = @_;
-
-	my @scriptSource = <DATA>;
-	chomp @scriptSource;
-	print <<'EOS';
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<SCRIPT type="text/javascript">
-EOS
-
-	foreach (@$scriptData) {print "$_\n";}
-	print "\n";
-
-	print "var srcArray = [\n";
-	my @quotedScriptSource = map {
-		my $line = $_;
-		$line =~ s/^\s+//g;
-		# $line =~ s/^\/\/SOURCE\s+//g if $source;
-		$line =~ s/^\/\/.*//g;
-		$line =~ s/\s+$//g;
-		$line eq "" ? () : $line
-	} @$persistentScriptData, @scriptSource;
-	my $lastQuotedLine = pop @quotedScriptSource;
-	foreach (@quotedScriptSource) {print doubleQuoteString($_), ",\n";}
-	print doubleQuoteString($lastQuotedLine), "];\n\n";
-
-	if ($debug) {
-		push @quotedScriptSource, $lastQuotedLine;
-		foreach (@quotedScriptSource) {
-			s/<\//<\\\//g;	# This fails if a regexp ends with a '<'.  Oh well....
-			print "$_\n";
-		}
-		print "\n";
-	} else {
-		print "eval(srcArray.join(\"\\n\"));\n\n";
-	}
-	print "showMode = $showMode;\n";
-	print "sortColumn = $sortColumn;\n";
-	if ($source) {
-		print <<'EOS';
-function writeQuotedHTML(s) {
-	document.write(quoteHTML(s.toString()).replace(/\n/g, '<BR>\n'));
-}
-
-var quotingDocument = {
-  write: function () {
-		for (var i = 0; i < arguments.length; i++)
-			writeQuotedHTML(arguments[i]);
-	},
-  writeln: function () {
-		for (var i = 0; i < arguments.length; i++)
-			writeQuotedHTML(arguments[i]);
-		document.writeln('<BR>');
-	}
-};
-EOS
-	} else {
-		print "showHead(document);\n";
-	}
-	print "</SCRIPT>\n";
-	print "</HEAD>\n\n";
-	print "<BODY>\n";
-	if ($source) {
-		print "<P><TT>";
-		print quoteHTML "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n";
-		print quoteHTML "<HTML>\n";
-		print quoteHTML "<HEAD>\n";
-		print "<SCRIPT type=\"text/javascript\">showHead(quotingDocument);</SCRIPT>\n";
-		print quoteHTML "</HEAD>\n\n";
-		print quoteHTML "<BODY>\n";
-		print "<SCRIPT type=\"text/javascript\">showBody(quotingDocument);</SCRIPT>\n";
-		print quoteHTML "</BODY>\n";
-		print quoteHTML "</HTML>\n";
-		print "</TT></P>\n";
-	} else {
-		print "<SCRIPT type=\"text/javascript\">showBody(document);</SCRIPT>\n";
-	}
-	print "</BODY>\n";
-	print "</HTML>\n";
-}
-
-
-
-# Read the bloat file into hash table $h.  The hash table is indexed by class names;
-# each entry is a list with the following elements:
-#	bytesAlloc		Total number of bytes allocated
-#	bytesNet		Total number of bytes allocated but not deallocated
-#	objectsAlloc	Total number of objects allocated
-#	objectsNet		Total number of objects allocated but not deallocated
-#	refsAlloc		Total number of references AddRef'd
-#	refsNet			Total number of references AddRef'd but not Released
-# Except for TOTAL, all hash table entries refer to mutually exclusive data.
-# $sizes is a hash table indexed by class names.  Each entry of that table contains the class's instance size.
-sub readBloatFile($\%\%) {
-	my ($file, $h, $sizes) = @_;
-	local $_;	# Needed for 'while (<FILE>)' below.
-
-	my $readSomething = 0;
-	open FILE, $file;
-	while (<FILE>) {
-		if (my ($name, $size, $bytesNet, $objectsAlloc, $objectsNet, $refsAlloc, $refsNet) =
-			   /^\s*(?:\d+)\s+([\w:]+)\s+(\d+)\s+(-?\d+)\s+(\d+)\s+(-?\d+)\s*\([^()]*\)\s*(\d+)\s+(-?\d+)\s*\([^()]*\)\s*$/) {
-			my $bytesAlloc;
-			if ($name eq "TOTAL") {
-				$size = "undefined";
-				$bytesAlloc = "undefined";
-			} else {
-				$bytesAlloc = $objectsAlloc * $size;
-				if ($bytesNet != $objectsNet * $size) {
-					print STDERR "In '$file', class $name bytesNet != objectsNet * size: $bytesNet != $objectsNet * $size\n";
-				}
-			}
-			print STDERR "Duplicate entry $name in '$file'\n" if $$h{$name};
-			$$h{$name} = [$bytesAlloc, $bytesNet, $objectsAlloc, $objectsNet, $refsAlloc, $refsNet];
-			
-			my $oldSize = $$sizes{$name};
-			print STDERR "Mismatch of sizes of class $name: $oldSize and $size\n" if defined($oldSize) && $size ne $oldSize;
-			$$sizes{$name} = $size;
-			$readSomething = 1;
-		} elsif (/^\s*(?:\d+)\s+([\w:]+)\s/) {
-			print STDERR "Unable to parse '$file' line: $_";
-		}
-	}
-	close FILE;
-	print STDERR "No data in '$file'\n" unless $readSomething;
-	return $h;
-}
-
-
-my %sizes;			# <class-name> => <instance-size>
-my %tables;			# <file-name> => <bloat-table>; see readBloatFile for format of <bloat-table>
-
-# Generate the JavaScript source code for the row named $c.  $l can contain the initial entries of the row.
-sub genTableRowSource($$) {
-	my ($l, $c) = @_;
-	my $lastE;
-	foreach (@ARGV) {
-		my $e = $tables{$_}{$c};
-		if (defined($lastE) && !defined($e)) {
-			$e = [0,0,0,0,0,0];
-			print STDERR "Class $c is defined in an earlier file but not in '$_'\n";
-		}
-		if (defined $e) {
-			if (defined $lastE) {
-				for (my $i = 0; $i <= $#$e; $i++) {
-					my $n = $$e[$i];
-					$l .= ($n eq "undefined" ? "undefined" : $n - $$lastE[$i]) . ",";
-				}
-				$l .= " ";
-			} else {
-				$l .= join(",", @$e) . ", ";
-			}
-			$lastE = $e;
-		} else {
-			$l .= "0,0,0,0,0,0, ";
-		}
-	}
-	$l .= join(",", @$lastE);
-	return "[$l]";
-}
-
-
-
-my $debug;
-my $source;
-my $showMode;
-my $sortColumn;
-my @modeOptions;
-
-GetOptions("debug" => \$debug, "source" => \$source, "byte=i" => \$modeOptions[0], "obj=i" => \$modeOptions[1], "ref=i" => \$modeOptions[2]);
-for (my $i = 0; $i != 3; $i++) {
-	my $modeOption = $modeOptions[$i];
-	if ($modeOption) {
-		die "Only one of -byte, -obj, or -ref may be given" if defined $showMode;
-		my $nFileColumns = scalar(@ARGV) + 1;
-		die "-byte, -obj, or -ref column number out of range" if $modeOption < 0 || $modeOption >= 2 + 2*$nFileColumns;
-		$showMode = $i;
-		if ($modeOption >= 2) {
-			$modeOption -= 2;
-			$sortColumn = 2 + $showMode*2;
-			if ($modeOption >= $nFileColumns) {
-				$sortColumn++;
-				$modeOption -= $nFileColumns;
-			}
-			$sortColumn += $modeOption*6;
-		} else {
-			$sortColumn = $modeOption;
-		}
-	}
-}
-unless (defined $showMode) {
-	$showMode = 0;
-	$sortColumn = 0;
-}
-
-# Read all of the bloat files.
-foreach (@ARGV) {
-	unless ($tables{$_}) {
-		my $f = $_;
-		my %table;
-		
-		readBloatFile $_, %table, %sizes;
-		$tables{$_} = \%table;
-	}
-}
-die "No input" unless %sizes;
-
-my @scriptData;	# JavaScript source for the tables passed to JavaScript.  Each entry is one line of JavaScript.
-my @persistentScriptData;	# Same as @scriptData, but persists the page reloads itself.
-
-# Print a list of bloat file names.
-push @persistentScriptData, "var nFiles = " . scalar(@ARGV) . ";";
-push @persistentScriptData, "var fileTags = [" . join(", ", map {singleQuoteString substr(fileCoreName($_), -10)} @ARGV) . "];";
-push @persistentScriptData, "var fileNames = [" . join(", ", map {singleQuoteString $_} @ARGV) . "];";
-push @persistentScriptData, "var fileDates = [" . join(", ", map {singleQuoteString localtime fileModDate $_} @ARGV) . "];";
-
-# Print the bloat tables.
-push @persistentScriptData, "var totals = " . genTableRowSource('"TOTAL", undefined, ', "TOTAL") . ";";
-push @scriptData, "var classTables = [";
-delete $sizes{"TOTAL"};
-my @classes = sort(keys %sizes);
-for (my $i = 0; $i <= $#classes; $i++) {
-	my $c = $classes[$i];
-	push @scriptData, genTableRowSource(doubleQuoteString($c).", ".$sizes{$c}.", ", $c) . ($i == $#classes ? "];" : ",");
-}
-
-generate(@scriptData, @persistentScriptData, $debug, $source, $showMode, $sortColumn);
-1;
-
-
-# The source of the eval'd JavaScript follows.
-# Comments starting with // that are alone on a line are stripped by the Perl script.
-__END__
-
-// showMode: 0=bytes, 1=objects, 2=references
-var showMode;
-var modeName;
-var modeNameUpper;
-
-var sortColumn;
-
-// Sort according to the sortColumn.  Column 0 is sorted alphabetically in ascending order.
-// All other columns are sorted numerically in descending order, with column 0 used for a secondary sort.
-// Undefined is always listed last.
-function sortCompare(x, y) {
-	if (sortColumn) {
-		var xc = x[sortColumn];
-		var yc = y[sortColumn];
-		if (xc < yc || xc === undefined && yc !== undefined) return 1;
-		if (yc < xc || yc === undefined && xc !== undefined) return -1;
-	}
-	
-	var x0 = x[0];
-	var y0 = y[0];
-	if (x0 > y0 || x0 === undefined && y0 !== undefined) return 1;
-	if (y0 > x0 || y0 === undefined && x0 !== undefined) return -1;
-	return 0;
-}
-
-
-// Quote special HTML characters in the string.
-function quoteHTML(s) {
-	s = s.replace(/&/g, '&amp;');
-	// Can't use /</g because HTML interprets '</g' as ending the script!
-	s = s.replace(/\x3C/g, '&lt;');
-	s = s.replace(/>/g, '&gt;');
-	s = s.replace(/ /g, '&nbsp;');
-	return s;
-}
-
-
-function writeFileTable(d) {
-	d.writeln('<TABLE border=1 cellspacing=1 cellpadding=0>');
-	d.writeln('<TR>\n<TH>Name</TH>\n<TH>File</TH>\n<TH>Date</TH>\n</TR>');
-	for (var i = 0; i < nFiles; i++)
-		d.writeln('<TR>\n<TD>'+quoteHTML(fileTags[i])+'</TD>\n<TD><TT>'+quoteHTML(fileNames[i])+'</TT></TD>\n<TD>'+quoteHTML(fileDates[i])+'</TD>\n</TR>');
-	d.writeln('</TABLE>');
-}
-
-
-function writeReloadLink(d, column, s, rowspan) {
-	d.write(rowspan == 1 ? '<TH>' : '<TH rowspan='+rowspan+'>');
-	if (column != sortColumn)
-		d.write('<A href="javascript:reloadSelf('+column+','+showMode+')">');
-	d.write(s);
-	if (column != sortColumn)
-		d.write('</A>');
-	d.writeln('</TH>');
-}
-
-function writeClassTableRow(d, row, base, modeName) {
-	if (modeName) {
-		d.writeln('<TR>\n<TH>'+modeName+'</TH>');
-	} else {
-		d.writeln('<TR>\n<TD><A href="javascript:showRowDetail(\''+row[0]+'\')">'+quoteHTML(row[0])+'</A></TD>');
-		var v = row[1];
-		d.writeln('<TD class=num>'+(v === undefined ? '' : v)+'</TD>');
-	}
-	for (var i = 0; i != 2; i++) {
-		var c = base + i;
-		for (var j = 0; j <= nFiles; j++) {
-			v = row[c];
-			var style = 'num';
-			if (j != nFiles)
-				if (v > 0) {
-					style = 'pos';
-					v = '+'+v;
-				} else
-					style = 'neg';
-			d.writeln('<TD class='+style+'>'+(v === undefined ? '' : v)+'</TD>');
-			c += 6;
-		}
-	}
-	d.writeln('</TR>');
-}
-
-function writeClassTable(d) {
-	var base = 2 + showMode*2;
-
-	// Make a copy because a sort is destructive.
-	var table = classTables.concat();
-	table.sort(sortCompare);
-
-	d.writeln('<TABLE border=1 cellspacing=1 cellpadding=0>');
-
-	d.writeln('<TR>');
-	writeReloadLink(d, 0, 'Class Name', 2);
-	writeReloadLink(d, 1, 'Instance<BR>Size', 2);
-	d.writeln('<TH colspan='+(nFiles+1)+'>'+modeNameUpper+'s allocated</TH>');
-	d.writeln('<TH colspan='+(nFiles+1)+'>'+modeNameUpper+'s allocated but not freed</TH>\n</TR>');
-	d.writeln('<TR>');
-	for (var i = 0; i != 2; i++) {
-		var c = base + i;
-		for (var j = 0; j <= nFiles; j++) {
-			writeReloadLink(d, c, j == nFiles ? 'Total' : quoteHTML(fileTags[j]), 1);
-			c += 6;
-		}
-	}
-	d.writeln('</TR>');
-
-	writeClassTableRow(d, totals, base, 0);
-	for (var r = 0; r < table.length; r++)
-		writeClassTableRow(d, table[r], base, 0);
-
-	d.writeln('</TABLE>');
-}
-
-
-var modeNames = ["byte", "object", "reference"];
-var modeNamesUpper = ["Byte", "Object", "Reference"];
-var styleSheet = '<STYLE type="TEXT/CSS">\n'+
-	'BODY {background-color: #FFFFFF; color: #000000}\n'+
-	'.num {text-align: right}\n'+
-	'.pos {text-align: right; color: #CC0000}\n'+
-	'.neg {text-align: right; color: #009900}\n'+
-	'</STYLE>';
-
-
-function showHead(d) {
-	modeName = modeNames[showMode];
-	modeNameUpper = modeNamesUpper[showMode];
-	d.writeln('<TITLE>'+modeNameUpper+' Bloats</TITLE>');
-	d.writeln(styleSheet);
-}
-
-function showBody(d) {
-	d.writeln('<H1>'+modeNameUpper+' Bloats</H1>');
-	writeFileTable(d);
-	d.write('<FORM>');
-	for (var i = 0; i != 3; i++)
-		if (i != showMode) {
-			var newSortColumn = sortColumn;
-			if (sortColumn >= 2)
-				newSortColumn = sortColumn + (i-showMode)*2;
-			d.write('<INPUT type="button" value="Show '+modeNamesUpper[i]+'s" onClick="reloadSelf('+newSortColumn+','+i+')">');
-		}
-	d.writeln('</FORM>');
-	d.writeln('<P>The numbers do not include <CODE>malloc</CODE>\'d data such as string contents.</P>');
-	d.writeln('<P>Click on a column heading to sort by that column. Click on a class name to see details for that class.</P>');
-	writeClassTable(d);
-}
-
-
-function showRowDetail(rowName) {
-	var row;
-	var i;
-
-	if (rowName == "TOTAL")
-		row = totals;
-	else {
-		for (i = 0; i < classTables.length; i++)
-			if (rowName == classTables[i][0]) {
-				row = classTables[i];
-				break;
-			}
-	}
-	if (row) {
-		var w = window.open("", "ClassTableRowDetails");
-		var d = w.document;
-		d.open();
-		d.writeln('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">');
-		d.writeln('<HTML>\n<HEAD>\n<TITLE>'+quoteHTML(rowName)+' bloat details</TITLE>');
-		d.writeln(styleSheet);
-		d.writeln('</HEAD>\n\n<BODY>');
-		d.writeln('<H2>'+quoteHTML(rowName)+'</H2>');
-		if (row[1] !== undefined)
-			d.writeln('<P>Each instance has '+row[1]+' bytes.</P>');
-
-		d.writeln('<TABLE border=1 cellspacing=1 cellpadding=0>');
-		d.writeln('<TR>\n<TH></TH>\n<TH colspan='+(nFiles+1)+'>Allocated</TH>');
-		d.writeln('<TH colspan='+(nFiles+1)+'>Allocated but not freed</TH>\n</TR>');
-		d.writeln('<TR>\n<TH></TH>');
-		for (i = 0; i != 2; i++)
-			for (var j = 0; j <= nFiles; j++)
-				d.writeln('<TH>'+(j == nFiles ? 'Total' : quoteHTML(fileTags[j]))+'</TH>');
-		d.writeln('</TR>');
-
-		for (i = 0; i != 3; i++)
-			writeClassTableRow(d, row, 2+i*2, modeNamesUpper[i]+'s');
-
-		d.writeln('</TABLE>\n</BODY>\n</HTML>');
-		d.close();
-	}
-	return undefined;
-}
-
-
-function stringSource(s) {
-	s = s.replace(/\\/g, '\\\\');
-	s = s.replace(/"/g, '\\"');
-	s = s.replace(/<\//g, '<\\/');
-	return '"'+s+'"';
-}
-
-function reloadSelf(n,m) {
-	// Need to cache these because globals go away on document.open().
-	var sa = srcArray;
-	var ss = stringSource;
-	var ct = classTables;
-	var i;
-
-	document.open();
-	// Uncomment this and comment the document.open() line above to see the reloaded page's source.
-	//var w = window.open("", "NewDoc");
-	//var d = w.document;
-	//var document = new Object;
-	//document.write = function () {
-	//	for (var i = 0; i < arguments.length; i++) {
-	//		var s = arguments[i].toString();
-	//		s = s.replace(/&/g, '&amp;');
-	//		s = s.replace(/\x3C/g, '&lt;');
-	//		s = s.replace(/>/g, '&gt;');
-	//		s = s.replace(/ /g, '&nbsp;');
-	//		d.write(s);
-	//	}
-	//};
-	//document.writeln = function () {
-	//	for (var i = 0; i < arguments.length; i++) {
-	//		var s = arguments[i].toString();
-	//		s = s.replace(/&/g, '&amp;');
-	//		s = s.replace(/\x3C/g, '&lt;');
-	//		s = s.replace(/>/g, '&gt;');
-	//		s = s.replace(/ /g, '&nbsp;');
-	//		d.write(s);
-	//	}
-	//	d.writeln('<BR>');
-	//};
-
-	document.writeln('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">');
-	document.writeln('<HTML>\n<HEAD>\n<SCRIPT type="text/javascript">');
-
-	// Manually copy non-persistent script data
-	if (!ct.length)
-		document.writeln('var classTables = [];');
-	else {
-		document.writeln('var classTables = [');
-		for (i = 0; i < ct.length; i++) {
-			var row = ct[i];
-			document.write('[' + ss(row[0]));
-			for (var j = 1; j < row.length; j++)
-				document.write(',' + row[j]);
-			document.writeln(']' + (i == ct.length-1 ? '];' : ','));
-		}
-	}
-
-	document.writeln('var srcArray = [');
-	for (i = 0; i < sa.length; i++) {
-		document.write(ss(sa[i]));
-		if (i != sa.length-1)
-			document.writeln(',');
-	}
-	document.writeln('];');
-	document.writeln('eval(srcArray.join("\\n"));');
-	document.writeln('showMode = '+m+';');
-	document.writeln('sortColumn = '+n+';');
-	document.writeln('showHead(document);');
-	document.writeln('</SCRIPT>\n</HEAD>\n\n<BODY>\n<SCRIPT type="text/javascript">showBody(document);</SCRIPT>\n</BODY>\n</HTML>');
-	document.close();
-	return undefined;
-}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mercurial/hgsetup/update.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mercurial/hgsetup/update.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mercurial/hgsetup/update.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mercurial/hgsetup/update.py	2014-11-26 21:46:05.000000000 +0000
@@ -0,0 +1,93 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 __future__ import unicode_literals
+
+import errno
+import os
+import which
+
+from configobj import ConfigObjError
+
+from mozversioncontrol.repoupdate import update_mercurial_repo
+
+from .config import (
+    HgIncludeException,
+    MercurialConfig,
+    HOST_FINGERPRINTS,
+)
+
+FINISHED = '''
+Your Mercurial recommended extensions are now up to date!
+'''.lstrip()
+
+
+class MercurialUpdater(object):
+
+    def __init__(self, state_dir):
+        self.state_dir = os.path.normpath(state_dir)
+        self.ext_dir = os.path.join(self.state_dir, 'mercurial', 'extensions')
+        self.vcs_tools_dir = os.path.join(self.state_dir, 'version-control-tools')
+
+    def update_all(self, config_paths):
+        try:
+            os.makedirs(self.ext_dir)
+        except OSError as e:
+            if e.errno != errno.EEXIST:
+                raise
+
+        try:
+            hg = which.which('hg')
+        except which.WhichError as e:
+            print(e)
+            print('Try running |mach bootstrap| to ensure your environment is '
+                'up to date.')
+            return 1
+
+        try:
+            c = MercurialConfig(config_paths)
+        except ConfigObjError as e:
+            print('Error importing existing Mercurial config!\n')
+            for error in e.errors:
+                print(error.message)
+
+            return 1
+        except HgIncludeException as e:
+            print(e.message)
+
+            return 1
+
+        if 'mqext' in c.extensions:
+            self.update_mercurial_repo(
+                hg,
+                'https://bitbucket.org/sfink/mqext',
+                os.path.join(self.ext_dir, 'mqext'),
+                'default',
+                'Ensuring mqext is up to date...')
+
+        if os.path.isdir(self.vcs_tools_dir):
+            self.update_mercurial_repo(
+                hg,
+                'https://hg.mozilla.org/hgcustom/version-control-tools',
+                self.vcs_tools_dir,
+                'default',
+                'Ensuring version-control-tools is up to date...')
+        print(FINISHED)
+        return 0
+
+    def update_mercurial_repo(self, hg, url, dest, branch, msg):
+        # We always pass the host fingerprints that we "know" to be canonical
+        # because the existing config may have outdated fingerprints and this
+        # may cause Mercurial to abort.
+        return self._update_repo(hg, url, dest, branch, msg,
+            update_mercurial_repo, hostfingerprints=HOST_FINGERPRINTS)
+
+    def _update_repo(self, binary, url, dest, branch, msg, fn, *args, **kwargs):
+        print('=' * 80)
+        print(msg)
+        try:
+            fn(binary, url, dest, branch, *args, **kwargs)
+        finally:
+            print('=' * 80)
+            print('')
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mercurial/hgsetup/wizard.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mercurial/hgsetup/wizard.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mercurial/hgsetup/wizard.py	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mercurial/hgsetup/wizard.py	2014-11-26 21:46:05.000000000 +0000
@@ -17,14 +17,10 @@
 from StringIO import StringIO
 
 from mozversioncontrol import get_hg_version
-from mozversioncontrol.repoupdate import (
-    update_mercurial_repo,
-    update_git_repo,
-)
 
+from .update import MercurialUpdater
 from .config import (
     HgIncludeException,
-    HOST_FINGERPRINTS,
     MercurialConfig,
 )
 
@@ -172,6 +168,7 @@
         self.ext_dir = os.path.join(self.state_dir, 'mercurial', 'extensions')
         self.vcs_tools_dir = os.path.join(self.state_dir, 'version-control-tools')
         self.update_vcs_tools = False
+        self.updater = MercurialUpdater(state_dir)
 
     def run(self, config_paths):
         try:
@@ -282,7 +279,7 @@
                                            os.path.join(self.ext_dir, 'mqext'))
 
             if 'mqext' in c.extensions:
-                self.update_mercurial_repo(
+                self.updater.update_mercurial_repo(
                     hg,
                     'https://bitbucket.org/sfink/mqext',
                     os.path.join(self.ext_dir, 'mqext'),
@@ -323,7 +320,7 @@
                 c.set_bugzilla_credentials(bzuser, bzpass)
 
         if self.update_vcs_tools:
-            self.update_mercurial_repo(
+            self.updater.update_mercurial_repo(
                 hg,
                 'https://hg.mozilla.org/hgcustom/version-control-tools',
                 self.vcs_tools_dir,
@@ -402,25 +399,6 @@
             self.update_vcs_tools = True
         c.activate_extension(name, path)
 
-    def update_mercurial_repo(self, hg, url, dest, branch, msg):
-        # We always pass the host fingerprints that we "know" to be canonical
-        # because the existing config may have outdated fingerprints and this
-        # may cause Mercurial to abort.
-        return self._update_repo(hg, url, dest, branch, msg,
-            update_mercurial_repo, hostfingerprints=HOST_FINGERPRINTS)
-
-    def update_git_repo(self, git, url, dest, ref, msg):
-        return self._update_repo(git, url, dest, ref, msg, update_git_repo)
-
-    def _update_repo(self, binary, url, dest, branch, msg, fn, *args, **kwargs):
-        print('=' * 80)
-        print(msg)
-        try:
-            fn(binary, url, dest, branch, *args, **kwargs)
-        finally:
-            print('=' * 80)
-            print('')
-
     def _prompt(self, msg, allow_empty=False):
         print(msg)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mercurial/mach_commands.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mercurial/mach_commands.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/mercurial/mach_commands.py	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/mercurial/mach_commands.py	2014-11-26 21:46:05.000000000 +0000
@@ -9,6 +9,7 @@
 
 from mach.decorators import (
     CommandProvider,
+    CommandArgument,
     Command,
 )
 
@@ -20,16 +21,25 @@
 
     @Command('mercurial-setup', category='devenv',
         description='Help configure Mercurial for optimal development.')
-    def mercurial_bootstrap(self):
+    @CommandArgument('-u', '--update-only', action='store_true',
+        help='Only update recommended extensions, don\'t run the wizard.')
+    def mercurial_bootstrap(self, update_only=False):
         sys.path.append(os.path.dirname(__file__))
 
-        from hgsetup.wizard import MercurialSetupWizard
 
-        wizard = MercurialSetupWizard(self._context.state_dir)
         config_paths = ['~/.hgrc']
         if sys.platform in ('win32', 'cygwin'):
-          config_paths.insert(0, '~/mercurial.ini')
-        result = wizard.run(map(os.path.expanduser, config_paths))
+            config_paths.insert(0, '~/mercurial.ini')
+        config_paths = map(os.path.expanduser, config_paths)
+
+        if update_only:
+            from hgsetup.update import MercurialUpdater
+            updater = MercurialUpdater(self._context.state_dir)
+            result = updater.update_all(map(os.path.expanduser, config_paths))
+        else:
+            from hgsetup.wizard import MercurialSetupWizard
+            wizard = MercurialSetupWizard(self._context.state_dir)
+            result = wizard.run(map(os.path.expanduser, config_paths))
 
         # Touch a file so we can periodically prompt to update extensions.
         state_path = os.path.join(self._context.state_dir,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/GeckoTaskTracer.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/GeckoTaskTracer.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/GeckoTaskTracer.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/GeckoTaskTracer.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -37,6 +37,7 @@
 static bool sIsLoggingStarted = false;
 
 static TimeStamp sStartTime;
+static const char sJSLabelPrefix[] = "#tt#";
 
 namespace {
 
@@ -98,8 +99,25 @@
   info->mCurTraceSourceType = aType;
   info->mCurTaskId = newId;
 
+  int* namePtr;
+#define SOURCE_EVENT_NAME(type)         \
+  case SourceEventType::type:           \
+  {                                     \
+    static int CreateSourceEvent##type; \
+    namePtr = &CreateSourceEvent##type; \
+    break;                              \
+  }
+
+  switch (aType) {
+#include "SourceEventTypeMap.h"
+    default:
+      MOZ_CRASH(false);
+  };
+#undef CREATE_SOURCE_EVENT_NAME
+
   // Log a fake dispatch and start for this source event.
-  LogDispatch(newId, newId,newId, aType);
+  LogDispatch(newId, newId, newId, aType);
+  LogVirtualTablePtr(newId, newId, namePtr);
   LogBegin(newId, newId);
 }
 
@@ -402,5 +420,11 @@
   return result;
 }
 
+const char*
+GetJSLabelPrefix()
+{
+  return sJSLabelPrefix;
+}
+
 } // namespace tasktracer
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/GeckoTaskTracer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/GeckoTaskTracer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/GeckoTaskTracer.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/GeckoTaskTracer.h	2014-11-26 21:46:06.000000000 +0000
@@ -44,13 +44,13 @@
 class FakeTracedTask;
 
 enum SourceEventType {
-  UNKNOWN = 0,
-  TOUCH,
-  MOUSE,
-  KEY,
-  BLUETOOTH,
-  UNIXSOCKET,
-  WIFI
+  Unknown = 0,
+  Touch,
+  Mouse,
+  Key,
+  Bluetooth,
+  Unixsocket,
+  Wifi
 };
 
 class AutoSourceEvent
@@ -83,6 +83,8 @@
 // where nsThread and base::thread release themselves.
 void FreeTraceInfo();
 
+const char* GetJSLabelPrefix();
+
 } // namespace tasktracer
 } // namespace mozilla.
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/GeckoTaskTracerImpl.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/GeckoTaskTracerImpl.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/GeckoTaskTracerImpl.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/GeckoTaskTracerImpl.h	2014-11-26 21:46:06.000000000 +0000
@@ -23,8 +23,8 @@
     , mCurTaskId(0)
     , mSavedCurTraceSourceId(0)
     , mSavedCurTaskId(0)
-    , mCurTraceSourceType(UNKNOWN)
-    , mSavedCurTraceSourceType(UNKNOWN)
+    , mCurTraceSourceType(Unknown)
+    , mSavedCurTraceSourceType(Unknown)
     , mThreadId(aThreadId)
     , mLastUniqueTaskId(0)
     , mStartLogging(aStartLogging)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/moz.build	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -28,6 +28,7 @@
         'JSStreamWriter.cpp',
         'nsProfiler.cpp',
         'nsProfilerFactory.cpp',
+        'nsProfilerStartParams.cpp',
         'platform.cpp',
         'ProfileEntry.cpp',
         'ProfilerBacktrace.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/nsIProfiler.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/nsIProfiler.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/nsIProfiler.idl	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/nsIProfiler.idl	2014-11-26 21:46:06.000000000 +0000
@@ -5,6 +5,13 @@
  
 #include "nsISupports.idl"
 
+%{C++
+template<class T> class nsTArray;
+class nsCString;
+%}
+
+[ref] native StringArrayRef(const nsTArray<nsCString>);
+
 [scriptable, uuid(f7f3709c-04a9-45c6-8e34-40f762654a78)]
 interface nsIProfiler : nsISupports
 {
@@ -37,3 +44,17 @@
   AString getSharedLibraryInformation();
 };
 
+/**
+ * Start-up parameters for subprocesses are passed through nsIObserverService,
+ * which, unfortunately, means we need to implement nsISupports in order to
+ * go through it.
+ */
+[uuid(0a175ba7-8fcf-4ce9-9c4b-ccc6272f4425)]
+interface nsIProfilerStartParams : nsISupports
+{
+  attribute uint32_t entries;
+  attribute double interval;
+
+  [noscript, notxpcom, nostdcall] StringArrayRef getFeatures();
+  [noscript, notxpcom, nostdcall] StringArrayRef getThreadFilterNames();
+};
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/nsProfilerStartParams.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/nsProfilerStartParams.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/nsProfilerStartParams.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/nsProfilerStartParams.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsProfilerStartParams.h"
+
+NS_IMPL_ISUPPORTS(nsProfilerStartParams, nsIProfilerStartParams)
+
+nsProfilerStartParams::nsProfilerStartParams(uint32_t aEntries,
+                                             double aInterval,
+                                             const nsTArray<nsCString>& aFeatures,
+                                             const nsTArray<nsCString>& aThreadFilterNames) :
+  mEntries(aEntries),
+  mInterval(aInterval),
+  mFeatures(aFeatures),
+  mThreadFilterNames(aThreadFilterNames)
+{
+}
+
+nsProfilerStartParams::~nsProfilerStartParams()
+{
+}
+
+NS_IMETHODIMP
+nsProfilerStartParams::GetEntries(uint32_t* aEntries)
+{
+  NS_ENSURE_ARG_POINTER(aEntries);
+  *aEntries = mEntries;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsProfilerStartParams::SetEntries(uint32_t aEntries)
+{
+  NS_ENSURE_ARG(aEntries);
+  mEntries = aEntries;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsProfilerStartParams::GetInterval(double* aInterval)
+{
+  NS_ENSURE_ARG_POINTER(aInterval);
+  *aInterval = mInterval;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsProfilerStartParams::SetInterval(double aInterval)
+{
+  NS_ENSURE_ARG(aInterval);
+  mInterval = aInterval;
+  return NS_OK;
+}
+
+const nsTArray<nsCString>&
+nsProfilerStartParams::GetFeatures()
+{
+  return mFeatures;
+}
+
+const nsTArray<nsCString>&
+nsProfilerStartParams::GetThreadFilterNames()
+{
+  return mThreadFilterNames;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/nsProfilerStartParams.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/nsProfilerStartParams.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/nsProfilerStartParams.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/nsProfilerStartParams.h	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef _NSPROFILERSTARTPARAMS_H_
+#define _NSPROFILERSTARTPARAMS_H_
+
+#include "nsIProfiler.h"
+#include "nsString.h"
+#include "nsTArray.h"
+
+class nsProfilerStartParams : public nsIProfilerStartParams
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIPROFILERSTARTPARAMS
+
+  nsProfilerStartParams(uint32_t aEntries,
+                        double aInterval,
+                        const nsTArray<nsCString>& aFeatures,
+                        const nsTArray<nsCString>& aThreadFilterNames);
+
+private:
+  virtual ~nsProfilerStartParams();
+  uint32_t mEntries;
+  double mInterval;
+  nsTArray<nsCString> mFeatures;
+  nsTArray<nsCString> mThreadFilterNames;
+};
+
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/platform.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/platform.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/platform.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/platform.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsIObserverService.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
+#include "nsProfilerStartParams.h"
 #include "mozilla/Services.h"
 #include "nsThreadUtils.h"
 #include "ProfilerMarkers.h"
@@ -238,11 +239,6 @@
 
     bool req2 = PR_GetEnv("MOZ_PROFILER_NEW") != nullptr; // Has v2 been requested?
 
-    bool elfhackd = false;
-#   if defined(USE_ELF_HACK)
-    bool elfhackd = true;
-#   endif
-
     if (req2 && allow2) {
       version = 2;
       LOG("------------------- MOZ_PROFILER_NEW set -------------------");
@@ -250,10 +246,6 @@
       version = 1;
       LOG("--------------- MOZ_PROFILER_NEW requested, ----------------");
       LOG("---------- but is not available on this platform -----------");
-    } else if (req2 && elfhackd) {
-      version = 1;
-      LOG("--------------- MOZ_PROFILER_NEW requested, ----------------");
-      LOG("--- but this build was not done with --disable-elf-hack ----");
     } else {
       version = 1;
       LOG("----------------- MOZ_PROFILER_NEW not set -----------------");
@@ -789,8 +781,24 @@
 
   if (Sampler::CanNotifyObservers()) {
     nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
-    if (os)
-      os->NotifyObservers(nullptr, "profiler-started", nullptr);
+    if (os) {
+      nsTArray<nsCString> featuresArray;
+      nsTArray<nsCString> threadNameFiltersArray;
+
+      for (size_t i = 0; i < aFeatureCount; ++i) {
+        featuresArray.AppendElement(aFeatures[i]);
+      }
+
+      for (size_t i = 0; i < aFilterCount; ++i) {
+        threadNameFiltersArray.AppendElement(aThreadNameFilters[i]);
+      }
+
+      nsCOMPtr<nsIProfilerStartParams> params =
+        new nsProfilerStartParams(aProfileEntries, aInterval, featuresArray,
+                                  threadNameFiltersArray);
+
+      os->NotifyObservers(params, "profiler-started", nullptr);
+    }
   }
 
   LOG("END   mozilla_sampler_start");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/platform.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/platform.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/platform.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/platform.h	2014-11-26 21:46:06.000000000 +0000
@@ -420,6 +420,9 @@
   void SetPendingDelete();
   bool IsPendingDelete() const { return mPendingDelete; }
 
+#ifdef MOZ_NUWA_PROCESS
+  void SetThreadId(int aThreadId) { mThreadId = aThreadId; }
+#endif
 
   /**
    * May be null for the main thread if the profiler was started during startup
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/platform-linux.cc thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/platform-linux.cc
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/platform-linux.cc	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/platform-linux.cc	2014-11-26 21:46:06.000000000 +0000
@@ -252,15 +252,9 @@
   }
 }
 
-// If the Nuwa process is enabled, we need to use the wrapper of tgkill() to
-// perform the mapping of thread ID.
-#ifdef MOZ_NUWA_PROCESS
-extern "C" MFBT_API int tgkill(pid_t tgid, pid_t tid, int signalno);
-#else
 int tgkill(pid_t tgid, pid_t tid, int signalno) {
   return syscall(SYS_tgkill, tgid, tid, signalno);
 }
-#endif
 
 class PlatformData : public Malloced {
  public:
@@ -447,6 +441,18 @@
   }
 }
 
+#ifdef MOZ_NUWA_PROCESS
+static void
+UpdateThreadId(void* aThreadInfo) {
+  ThreadInfo* info = static_cast<ThreadInfo*>(aThreadInfo);
+  // Note that this function is called during thread recreation. Only the thread
+  // calling this method is running. We can't try to acquire
+  // Sampler::sRegisteredThreadsMutex because it could be held by another
+  // thread.
+  info->SetThreadId(gettid());
+}
+#endif
+
 bool Sampler::RegisterCurrentThread(const char* aName,
                                     PseudoStack* aPseudoStack,
                                     bool aIsMainThread, void* stackTop)
@@ -478,6 +484,20 @@
 
   sRegisteredThreads->push_back(info);
 
+#ifdef MOZ_NUWA_PROCESS
+  if (IsNuwaProcess()) {
+    if (info->IsMainThread()) {
+      // Main thread isn't a marked thread. Register UpdateThreadId() to
+      // NuwaAddConstructor(), which runs before all other threads are
+      // recreated.
+      NuwaAddConstructor(UpdateThreadId, info);
+    } else {
+      // Register UpdateThreadInfo() to be run when the thread is recreated.
+      NuwaAddThreadConstructor(UpdateThreadId, info);
+    }
+  }
+#endif
+
   uwt__register_thread_for_profiling(stackTop);
   return true;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/ProfileEntry.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/ProfileEntry.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/ProfileEntry.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/ProfileEntry.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -323,6 +323,10 @@
     if (XRE_GetProcessType() == GeckoProcessType_Plugin) {
       // TODO Add the proper plugin name
       b.NameValue("name", "Plugin");
+    } else if (XRE_GetProcessType() == GeckoProcessType_Content) {
+      // This isn't going to really help once we have multiple content
+      // processes, but it'll do for now.
+      b.NameValue("name", "Content");
     } else {
       b.NameValue("name", Name());
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/SourceEventTypeMap.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/SourceEventTypeMap.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/SourceEventTypeMap.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/SourceEventTypeMap.h	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+SOURCE_EVENT_NAME(Unknown)
+SOURCE_EVENT_NAME(Touch)
+SOURCE_EVENT_NAME(Mouse)
+SOURCE_EVENT_NAME(Key)
+SOURCE_EVENT_NAME(Bluetooth)
+SOURCE_EVENT_NAME(Unixsocket)
+SOURCE_EVENT_NAME(Wifi)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/TracedTaskCommon.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/TracedTaskCommon.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/profiler/TracedTaskCommon.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/profiler/TracedTaskCommon.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -12,7 +12,7 @@
 
 TracedTaskCommon::TracedTaskCommon()
   : mSourceEventId(0)
-  , mSourceEventType(SourceEventType::UNKNOWN)
+  , mSourceEventType(SourceEventType::Unknown)
 {
   Init();
 }
@@ -52,7 +52,7 @@
   }
 
   info->mCurTraceSourceId = 0;
-  info->mCurTraceSourceType = SourceEventType::UNKNOWN;
+  info->mCurTraceSourceType = SourceEventType::Unknown;
   info->mCurTaskId = 0;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/rb/bloatdiff.pl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/rb/bloatdiff.pl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/rb/bloatdiff.pl	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/rb/bloatdiff.pl	1970-01-01 00:00:00.000000000 +0000
@@ -1,372 +0,0 @@
-#!/usr/bin/perl -w
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-################################################################################
-
-sub usage() {
-    print <<EOUSAGE;
-# bloatdiff.pl - munges the output from
-#   XPCOM_MEM_BLOAT_LOG=1 
-#   firefox-bin -P default resource:///res/bloatcycle.html
-# so that it does some summary and stats stuff.
-#
-# To show leak test results for a set of changes, do something like this:
-#
-#   XPCOM_MEM_BLOAT_LOG=1
-#   firefox-bin -P default resource:///res/bloatcycle.html > a.out
-#     **make change**
-#   firefox-bin -P default resource:///res/bloatcycle.html > b.out
-#   bloatdiff.pl a.out b.out
-
-EOUSAGE
-}
-
-$OLDFILE = $ARGV[0];
-$NEWFILE = $ARGV[1];
-#$LABEL   = $ARGV[2];
-
-if (!$OLDFILE or
-    ! -e $OLDFILE or 
-    -z $OLDFILE) {
-    print "\nError: Previous log file not specified, does not exist, or is empty.\n\n";
-    &usage();
-    exit 1;
-}
-
-if (!$NEWFILE or
-    ! -e $NEWFILE or 
-    -z $NEWFILE) {
-    print "\nError: Current log file not specified, does not exist, or is empty.\n\n";
-    &usage();
-    exit 1;
-}
-
-sub processFile {
-    my ($filename, $map, $prevMap) = @_;
-    open(FH, $filename);
-    while (<FH>) {
-        if (m{
-              ^\s*(\d+)\s          # Line number
-              ([\w:]+)\s+          # Name
-              (-?\d+)\s+           # Size
-              (-?\d+)\s+           # Leaked
-              (-?\d+)\s+           # Objects Total
-              (-?\d+)\s+           # Objects Rem
-              \(\s*(-?[\d.]+)\s+   # Objects Mean
-                 \+/-\s+
-              ([\w.]+)\)\s+        # Objects StdDev
-              (-?\d+)\s+           # Reference Total
-              (-?\d+)\s+           # Reference Rem
-              \(\s*(-?[\d.]+)\s+   # Reference Mean
-                 \+/-\s+
-              ([\w\.]+)\)          # Reference StdDev
-             }x) {
-          $$map{$2} = { name => $2,
-                        size => $3,
-                        leaked => $4,
-                        objTotal => $5,
-                        objRem => $6,
-                        objMean => $7,
-                        objStdDev => $8,
-                        refTotal => $9,
-                        refRem => $10,
-                        refMean => $11,
-                        refStdDev => $12,
-                        bloat => $3 * $5 # size * objTotal
-                      };
-        } else {
-#            print "failed to parse: $_\n";
-        }
-    }
-    close(FH);
-}
-
-%oldMap = ();
-processFile($OLDFILE, \%oldMap);
-
-%newMap = ();
-processFile($NEWFILE, \%newMap);
-
-################################################################################
-
-$inf = 9999999.99;
-
-sub getLeaksDelta {
-    my ($key) = @_;
-    my $oldLeaks = $oldMap{$key}{leaked} || 0;
-    my $newLeaks = $newMap{$key}{leaked};
-    my $percentLeaks = 0;
-    if ($oldLeaks == 0) {
-        if ($newLeaks != 0) {
-            # there weren't any leaks before, but now there are!
-            $percentLeaks = $inf;
-        }
-    }
-    else {
-        $percentLeaks = ($newLeaks - $oldLeaks) / $oldLeaks * 100;
-    }
-    # else we had no record of this class before
-    return ($newLeaks - $oldLeaks, $percentLeaks);
-}
-    
-################################################################################
-
-sub getBloatDelta {
-    my ($key) = @_;
-    my $newBloat = $newMap{$key}{bloat};
-    my $percentBloat = 0;
-    my $oldSize = $oldMap{$key}{size} || 0;
-    my $oldTotal = $oldMap{$key}{objTotal} || 0;
-    my $oldBloat = $oldTotal * $oldSize;
-    if ($oldBloat == 0) {
-        if ($newBloat != 0) {
-            # this class wasn't used before, but now it is
-            $percentBloat = $inf;
-        }
-    }
-    else {
-        $percentBloat = ($newBloat - $oldBloat) / $oldBloat * 100;
-    }
-    # else we had no record of this class before
-    return ($newBloat - $oldBloat, $percentBloat);
-}
-
-################################################################################
-
-foreach $key (keys %newMap) {
-    my ($newLeaks, $percentLeaks) = getLeaksDelta($key);
-    my ($newBloat, $percentBloat) = getBloatDelta($key);
-    $newMap{$key}{leakDelta} = $newLeaks;
-    $newMap{$key}{leakPercent} = $percentLeaks;
-    $newMap{$key}{bloatDelta} = $newBloat;
-    $newMap{$key}{bloatPercent} = $percentBloat;
-}
-
-################################################################################
-
-# Print a value of bytes out in a reasonable
-# KB, MB, or GB form.  Copied from build-seamonkey-util.pl, sorry.  -mcafee
-sub PrintSize($) {
-
-    # print a number with 3 significant figures
-    sub PrintNum($) {
-        my ($num) = @_;
-        my $rv;
-        if ($num < 1) {
-            $rv = sprintf "%.3f", ($num);
-        } elsif ($num < 10) {
-            $rv = sprintf "%.2f", ($num);
-        } elsif ($num < 100) {
-            $rv = sprintf "%.1f", ($num);
-        } else {
-            $rv = sprintf "%d", ($num);
-        }
-    }
-
-    my ($size) = @_;
-    my $rv;
-    if ($size > 1000000000) {
-        $rv = PrintNum($size / 1000000000.0) . "G";
-    } elsif ($size > 1000000) {
-        $rv = PrintNum($size / 1000000.0) . "M";
-    } elsif ($size > 1000) {
-        $rv = PrintNum($size / 1000.0) . "K";
-    } else {
-        $rv = PrintNum($size);
-    }
-}
-
-
-print "Bloat/Leak Delta Report\n";
-print "--------------------------------------------------------------------------------------\n";
-print "Current file:  $NEWFILE\n";
-print "Previous file: $OLDFILE\n";
-print "----------------------------------------------leaks------leaks%------bloat------bloat%\n";
-
-    if (! $newMap{"TOTAL"} or 
-        ! $newMap{"TOTAL"}{bloat}) {
-        # It's OK if leaked or leakPercent are 0 (in fact, that would be good).
-        # If bloatPercent is zero, it is also OK, because we may have just had
-        # two runs exactly the same or with no new bloat.
-        print "\nError: unable to calculate bloat/leak data.\n";
-        print "There is no data present.\n\n";
-        print "HINT - Did your test run complete successfully?\n";
-        print "HINT - Are you pointing at the right log files?\n\n";
-        &usage();
-        exit 1;
-    }
-
-printf "%-40s %10s %10.2f%% %10s %10.2f%%\n",
-       ("TOTAL",
-        $newMap{"TOTAL"}{leaked}, $newMap{"TOTAL"}{leakPercent},
-        $newMap{"TOTAL"}{bloat}, $newMap{"TOTAL"}{bloatPercent});
-
-################################################################################
-
-sub percentStr {
-    my ($p) = @_;
-    if ($p == $inf) {
-        return "-";
-    }
-    else {
-        return sprintf "%10.2f%%", $p;
-    }
-}
-
-# NEW LEAKS
-@keys = sort { $newMap{$b}{leakPercent} <=> $newMap{$a}{leakPercent} } keys %newMap;
-my $needsHeading = 1;
-my $total = 0;
-foreach $key (@keys) {
-    my $percentLeaks = $newMap{$key}{leakPercent};
-    my $leaks = $newMap{$key}{leaked};
-    if ($percentLeaks > 0 && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--NEW-LEAKS-----------------------------------leaks------leaks%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
-        $total += $leaks;
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# FIXED LEAKS
-@keys = sort { $newMap{$b}{leakPercent} <=> $newMap{$a}{leakPercent} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $percentLeaks = $newMap{$key}{leakPercent};
-    my $leaks = $newMap{$key}{leaked};
-    if ($percentLeaks < 0 && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--FIXED-LEAKS---------------------------------leaks------leaks%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
-        $total += $leaks;
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# NEW BLOAT
-@keys = sort { $newMap{$b}{bloatPercent} <=> $newMap{$a}{bloatPercent} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $percentBloat = $newMap{$key}{bloatPercent};
-    my $bloat = $newMap{$key}{bloat};
-    if ($percentBloat > 0  && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--NEW-BLOAT-----------------------------------bloat------bloat%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $bloat, percentStr($percentBloat));
-        $total += $bloat;
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# ALL LEAKS
-@keys = sort { $newMap{$b}{leaked} <=> $newMap{$a}{leaked} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $leaks = $newMap{$key}{leaked};
-    my $percentLeaks = $newMap{$key}{leakPercent};
-    if ($leaks > 0) {
-        if ($needsHeading) {
-            printf "--ALL-LEAKS-----------------------------------leaks------leaks%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, percentStr($percentLeaks));
-        if ($key !~ /TOTAL/) {
-            $total += $leaks;
-        }
-    }
-}
-if (!$needsHeading) {
-#    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# ALL BLOAT
-@keys = sort { $newMap{$b}{bloat} <=> $newMap{$a}{bloat} } keys %newMap;
-$needsHeading = 1;
-$total = 0;
-foreach $key (@keys) {
-    my $bloat = $newMap{$key}{bloat};
-    my $percentBloat = $newMap{$key}{bloatPercent};
-    if ($bloat > 0) {
-        if ($needsHeading) {
-            printf "--ALL-BLOAT-----------------------------------bloat------bloat%%-----------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $bloat, percentStr($percentBloat));
-        if ($key !~ /TOTAL/) {
-            $total += $bloat;
-        }
-    }
-}
-if (!$needsHeading) {
-#    printf "%-40s %10s\n", ("TOTAL", $total);
-}
-
-# NEW CLASSES
-@keys = sort { $newMap{$b}{bloatDelta} <=> $newMap{$a}{bloatDelta} } keys %newMap;
-$needsHeading = 1;
-my $ltotal = 0;
-my $btotal = 0;
-foreach $key (@keys) {
-    my $leaks = $newMap{$key}{leaked};
-    my $bloat = $newMap{$key}{bloat};
-    my $percentBloat = $newMap{$key}{bloatPercent};
-    if ($percentBloat == $inf && $key !~ /TOTAL/) {
-        if ($needsHeading) {
-            printf "--CLASSES-NOT-REPORTED-LAST-TIME--------------leaks------bloat------------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, $bloat);
-        if ($key !~ /TOTAL/) {
-            $ltotal += $leaks;
-            $btotal += $bloat;
-        }
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s %10s\n", ("TOTAL", $ltotal, $btotal);
-}
-
-# OLD CLASSES
-@keys = sort { ($oldMap{$b}{bloat} || 0) <=> ($oldMap{$a}{bloat} || 0) } keys %oldMap;
-$needsHeading = 1;
-$ltotal = 0;
-$btotal = 0;
-foreach $key (@keys) {
-    if (!defined($newMap{$key})) {
-        my $leaks = $oldMap{$key}{leaked};
-        my $bloat = $oldMap{$key}{bloat};
-        if ($needsHeading) {
-            printf "--CLASSES-THAT-WENT-AWAY----------------------leaks------bloat------------------------\n";
-            $needsHeading = 0;
-        }
-        printf "%-40s %10s %10s\n", ($key, $leaks, $bloat);
-        if ($key !~ /TOTAL/) {
-            $ltotal += $leaks;
-            $btotal += $bloat;
-        }
-    }
-}
-if (!$needsHeading) {
-    printf "%-40s %10s %10s\n", ("TOTAL", $ltotal, $btotal);
-}
-
-print "--------------------------------------------------------------------------------------\n";
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/rb/README thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/rb/README
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/tools/rb/README	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/tools/rb/README	2014-11-26 21:46:06.000000000 +0000
@@ -1,5 +1,6 @@
 This is the Refcount Balancer.  See
-http://www.mozilla.org/performance/refcnt-balancer.html for documentation.
+https://developer.mozilla.org/en-US/docs/Mozilla/Performance/Refcount_tracing_and_balancing
+for documentation.
 
 Previous CVS history for the perl scripts is available at:
 http://www.mozilla.org/webtools/bonsai/cvslog.cgi?file=mozilla-org/html/performance/find-leakers.pl&rev=&root=/cvsroot/
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/moz.build	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -84,6 +84,9 @@
         'android/nsMIMEInfoAndroid.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+    SOURCES += [
+        'unix/nsMIMEInfoQt.cpp',
+    ]
     UNIFIED_SOURCES += [
         'unix/nsGNOMERegistry.cpp',
         'unix/nsMIMEInfoUnix.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 3; 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/. */
+
+#ifdef MOZ_WIDGET_QT
+#include <QDesktopServices>
+#include <QUrl>
+#include <QString>
+#include <QStringList>
+#endif
+
+#include "nsMIMEInfoQt.h"
+#include "nsIURI.h"
+#include "nsStringGlue.h"
+
+nsresult
+nsMIMEInfoQt::LoadUriInternal(nsIURI * aURI)
+{
+#ifdef MOZ_WIDGET_QT
+  nsAutoCString spec;
+  aURI->GetAsciiSpec(spec);
+  if (QDesktopServices::openUrl(QUrl(spec.get()))) {
+    return NS_OK;
+  }
+#endif
+
+  return NS_ERROR_FAILURE;
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/unix/nsMIMEInfoQt.h	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 3; 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 nsMIMEInfoQt_h_
+#define nsMIMEInfoQt_h_
+
+#include "nsCOMPtr.h"
+
+class nsIURI;
+
+class nsMIMEInfoQt
+{
+public:
+  static nsresult LoadUriInternal(nsIURI * aURI);
+};
+
+#endif // nsMIMEInfoQt_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -5,9 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef MOZ_WIDGET_QT
-#include <QDesktopServices>
-#include <QUrl>
-#include <QString>
 #if (MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
 #include "nsContentHandlerApp.h"
@@ -24,6 +21,9 @@
 #ifdef MOZ_ENABLE_DBUS
 #include "nsDBusHandlerApp.h"
 #endif
+#ifdef MOZ_WIDGET_QT
+#include "nsMIMEInfoQt.h"
+#endif
 
 nsresult
 nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
@@ -32,11 +32,7 @@
 
 #ifdef MOZ_WIDGET_QT
   if (NS_FAILED(rv)) {
-    nsAutoCString spec;
-    aURI->GetAsciiSpec(spec);
-    if (QDesktopServices::openUrl(QUrl(spec.get()))) {
-      rv = NS_OK;
-    }
+    rv = nsMIMEInfoQt::LoadUriInternal(aURI);
   }
 #endif
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/prefetch/nsOfflineCacheUpdateService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/prefetch/nsOfflineCacheUpdateService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/prefetch/nsOfflineCacheUpdateService.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/prefetch/nsOfflineCacheUpdateService.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -45,7 +45,7 @@
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeOwner.h"
-#include "mozilla/dom/TabChild.h"
+#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "nsContentUtils.h"
 #include "mozilla/unused.h"
@@ -747,8 +747,7 @@
     nsresult rv;
 
     if (GeckoProcessType_Default != XRE_GetProcessType()) {
-        TabChild* child = TabChild::GetFrom(aWindow);
-        NS_ENSURE_TRUE(child, NS_ERROR_FAILURE);
+        ContentChild* child = ContentChild::GetSingleton();
 
         if (!child->SendSetOfflinePermission(IPC::Principal(aPrincipal))) {
             return NS_ERROR_FAILURE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/prefetch/OfflineCacheUpdateChild.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/prefetch/OfflineCacheUpdateChild.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/prefetch/OfflineCacheUpdateChild.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/prefetch/OfflineCacheUpdateChild.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -34,6 +34,7 @@
 using namespace mozilla::ipc;
 using namespace mozilla::net;
 using mozilla::dom::TabChild;
+using mozilla::dom::ContentChild;
 
 #if defined(PR_LOGGING)
 //
@@ -433,10 +434,11 @@
     // Need to addref ourself here, because the IPC stack doesn't hold
     // a reference to us. Will be released in RecvFinish() that identifies 
     // the work has been done.
-    child->SendPOfflineCacheUpdateConstructor(this, manifestURI, documentURI,
-                                              stickDocument);
+    ContentChild::GetSingleton()->SendPOfflineCacheUpdateConstructor(
+        this, manifestURI, documentURI,
+        stickDocument, child->GetTabId());
 
-    // TabChild::DeallocPOfflineCacheUpdate will release this.
+    // ContentChild::DeallocPOfflineCacheUpdate will release this.
     NS_ADDREF_THIS();
 
     return NS_OK;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/prefetch/POfflineCacheUpdate.ipdl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/prefetch/POfflineCacheUpdate.ipdl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/uriloader/prefetch/POfflineCacheUpdate.ipdl	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/uriloader/prefetch/POfflineCacheUpdate.ipdl	2014-11-26 21:46:06.000000000 +0000
@@ -5,7 +5,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 protocol PBrowser;
+include protocol PContent;
 
 namespace mozilla {
 namespace docshell {
@@ -13,7 +13,7 @@
 //-------------------------------------------------------------------
 protocol POfflineCacheUpdate
 {
-  manager PBrowser;
+  manager PContent;
 
 parent:
   __delete__();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/view/nsView.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/view/nsView.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/view/nsView.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/view/nsView.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -337,14 +337,14 @@
   // only two scales are 1.0 or 2.0, and so the quantization doesn't actually
   // cause problems anyhow).
   // In the case of a mismatch, fall back to scaling based on the dev context's
-  // unscaledAppUnitsPerDevPixel value. On platforms where the device-pixel
+  // AppUnitsPerDevPixelAtUnitFullZoom value. On platforms where the device-pixel
   // scale is uniform across all displays (currently all except OS X), we'll
   // always use the precise value from mWindow->GetDefaultScale here.
   CSSToLayoutDeviceScale scale = widget->GetDefaultScale();
-  if (NSToIntRound(60.0 / scale.scale) == dx->UnscaledAppUnitsPerDevPixel()) {
+  if (NSToIntRound(60.0 / scale.scale) == dx->AppUnitsPerDevPixelAtUnitFullZoom()) {
     invScale = 1.0 / scale.scale;
   } else {
-    invScale = dx->UnscaledAppUnitsPerDevPixel() / 60.0;
+    invScale = dx->AppUnitsPerDevPixelAtUnitFullZoom() / 60.0;
   }
 
   if (changedPos) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/content/mochitest.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/content/mochitest.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/content/mochitest.js	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/content/mochitest.js	2014-11-26 21:46:06.000000000 +0000
@@ -20,7 +20,7 @@
 
 Cu.import("resource://gre/modules/Webapps.jsm");
 
-becomeWebapp("http://mochi.test:8888/tests/webapprt/test/content/test.webapp",
+becomeWebapp("http://mochi.test:8888/webapprtContent/webapprt/test/content/test.webapp",
              undefined, function onBecome() {
   if (window.arguments && window.arguments[0]) {
     let testUrl = window.arguments[0].QueryInterface(Ci.nsIPropertyBag2).get("url");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties	2014-11-26 21:46:06.000000000 +0000
@@ -30,6 +30,6 @@
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
-cspFrameAncestorBlocked=This application tried to access a resource that has a content security policy that prevents it from being embedded in this way.
+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.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/moz.build	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -37,7 +37,7 @@
     'test/chrome/downloads/webapprt.ini',
     'test/chrome/webapprt.ini',
 ]
-MOCHITEST_MANIFESTS += ['test/content/mochitest.ini']
+MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS += ['test/content/webapprt.ini']
 
 # Place webapprt resources in a separate app dir
 DIST_SUBDIR = 'webapprt'
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/test/content/mochitest.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/test/content/mochitest.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/test/content/mochitest.ini	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/test/content/mochitest.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-[DEFAULT]
-skip-if = buildapp == 'b2g'
-support-files =
-  test.webapp
-  test.webapp^headers^
-
-[webapprt_sample.html]
-[webapprt_indexeddb.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/test/content/webapprt.ini thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/test/content/webapprt.ini
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/webapprt/test/content/webapprt.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/webapprt/test/content/webapprt.ini	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,8 @@
+[DEFAULT]
+skip-if = buildapp == 'b2g'
+support-files =
+  test.webapp
+  test.webapp^headers^
+
+[webapprt_sample.html]
+[webapprt_indexeddb.html]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/AndroidBridge.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/AndroidBridge.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/AndroidBridge.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/AndroidBridge.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -41,7 +41,9 @@
 #include "nsContentUtils.h"
 #include "nsIScriptError.h"
 #include "nsIHttpChannel.h"
-#include "GeneratedSDKWrappers.h"
+
+#include "MediaCodec.h"
+#include "SurfaceTexture.h"
 
 using namespace mozilla;
 using namespace mozilla::widget::android;
@@ -222,8 +224,11 @@
     InitAndroidJavaWrappers(jEnv);
 
     if (mAPIVersion >= 16 /* Jelly Bean */) {
-        // We only use this for MediaCodec right now
-        InitSDKStubs(jEnv);
+        sdk::InitMediaCodecStubs(jEnv);
+    }
+
+    if (mAPIVersion >= 14 /* ICS */) {
+        sdk::InitSurfaceTextureStubs(jEnv);
     }
 
     // jEnv should NOT be cached here by anything -- the jEnv here
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/AndroidJavaWrappers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/AndroidJavaWrappers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/AndroidJavaWrappers.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/AndroidJavaWrappers.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -11,7 +11,6 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/TouchEvents.h"
-#include "GeneratedSDKWrappers.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/Makefile.in	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+annotation_processor_jar_files := $(DEPTH)/build/annotationProcessors/annotationProcessors.jar:$(ANDROID_TOOLS)/lib/lint.jar:$(ANDROID_TOOLS)/lib/lint-checks.jar
+
+sdk_processor := \
+  $(JAVA) \
+  -Dcom.android.tools.lint.bindir='$(ANDROID_TOOLS)' \
+  -classpath $(annotation_processor_jar_files) \
+  org.mozilla.gecko.annotationProcessors.SDKProcessor
+
+# For the benefit of readers: the following pattern rule says that,
+# for example, MediaCodec.cpp and MediaCodec.h can be produced from
+# MediaCodec-classes.txt.  This formulation invokes the SDK processor
+# at most once.
+
+%.cpp %.h: $(ANDROID_SDK)/android.jar %-classes.txt
+	$(sdk_processor) $(ANDROID_SDK)/android.jar $(srcdir)/$*-classes.txt $(CURDIR) $* 16
+
+# We'd like these to be defined in a future GENERATED_EXPORTS list.
+bindings_exports_FILES := \
+  MediaCodec.h \
+  SurfaceTexture.h \
+  $(NULL)
+bindings_exports_DEST = $(DIST)/include
+bindings_exports_TARGET := export
+INSTALL_TARGETS += bindings_exports
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/MediaCodec-classes.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/MediaCodec-classes.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/MediaCodec-classes.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/MediaCodec-classes.txt	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,3 @@
+android.media.MediaCodec
+android.media.MediaCodec$BufferInfo
+android.media.MediaFormat
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,35 @@
+# -*- 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/.
+
+# List of stems to generate .cpp and .h files for.  To add a stem, add it to
+# this list and ensure that $(stem)-classes.txt exists in this directory.
+generated = [
+    'MediaCodec',
+    'SurfaceTexture',
+]
+
+GENERATED_SOURCES += [stem + '.cpp' for stem in generated]
+
+# We'd like to add these to a future GENERATED_EXPORTS list, but for now we mark
+# them as generated here and manually install them in Makefile.in.
+GENERATED_FILES += [stem + '.h' for stem in generated]
+
+# There is an unfortunate race condition when using GENERATED_SOURCES and
+# pattern rules (see Makefile.in) that manifests itself as a VPATH resolution
+# conflict: MediaCodec.o looks for MediaCodec.cpp and $(CURDIR)/MediaCodec.cpp,
+# and the pattern rule is matched but doesn't resolve both sources, causing a
+# failure.  Adding the GENERATED_SOURCES to GENERATED_FILES causes the sources
+# to be built at export time, which is before MediaCodec.o needs them; and by
+# the time MediaCodec.o is built, the source is in place and the VPATH
+# resolution works as expected.
+GENERATED_FILES += GENERATED_SOURCES
+
+FAIL_ON_WARNINGS = True
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/widget/android',
+]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/SurfaceTexture-classes.txt thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/SurfaceTexture-classes.txt
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/bindings/SurfaceTexture-classes.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/bindings/SurfaceTexture-classes.txt	2014-11-26 21:46:06.000000000 +0000
@@ -0,0 +1,2 @@
+android.graphics.SurfaceTexture
+android.view.Surface
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedJNIWrappers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedJNIWrappers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedJNIWrappers.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedJNIWrappers.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -13,11 +13,9 @@
 namespace android {
 jclass DownloadsIntegration::mDownloadsIntegrationClass = 0;
 jmethodID DownloadsIntegration::jScanMedia = 0;
-void DownloadsIntegration::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mDownloadsIntegrationClass = getClassGlobalRef("org/mozilla/gecko/DownloadsIntegration");
-    jScanMedia = getStaticMethod("scanMedia", "(Ljava/lang/String;Ljava/lang/String;)V");
+void DownloadsIntegration::InitStubs(JNIEnv *env) {
+    mDownloadsIntegrationClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/DownloadsIntegration");
+    jScanMedia = AndroidBridge::GetStaticMethodID(env, mDownloadsIntegrationClass, "scanMedia", "(Ljava/lang/String;Ljava/lang/String;)V");
 }
 
 DownloadsIntegration* DownloadsIntegration::Wrap(jobject obj) {
@@ -124,92 +122,90 @@
 jmethodID GeckoAppShell::jUnregisterSurfaceTextureFrameListener = 0;
 jmethodID GeckoAppShell::jVibrate1 = 0;
 jmethodID GeckoAppShell::jVibrateA = 0;
-void GeckoAppShell::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mGeckoAppShellClass = getClassGlobalRef("org/mozilla/gecko/GeckoAppShell");
-    jAcknowledgeEvent = getStaticMethod("acknowledgeEvent", "()V");
-    jAddPluginViewWrapper = getStaticMethod("addPluginView", "(Landroid/view/View;FFFFZ)V");
-    jAlertsProgressListener_OnProgress = getStaticMethod("alertsProgressListener_OnProgress", "(Ljava/lang/String;JJLjava/lang/String;)V");
-    jCancelVibrate = getStaticMethod("cancelVibrate", "()V");
-    jCheckURIVisited = getStaticMethod("checkUriVisited", "(Ljava/lang/String;)V");
-    jClearMessageList = getStaticMethod("clearMessageList", "(I)V");
-    jCloseCamera = getStaticMethod("closeCamera", "()V");
-    jCloseNotification = getStaticMethod("closeNotification", "(Ljava/lang/String;)V");
-    jConnectionGetMimeType = getStaticMethod("connectionGetMimeType", "(Ljava/net/URLConnection;)Ljava/lang/String;");
-    jCreateInputStream = getStaticMethod("createInputStream", "(Ljava/net/URLConnection;)Ljava/io/InputStream;");
-    jCreateMessageListWrapper = getStaticMethod("createMessageList", "(JJ[Ljava/lang/String;ILjava/lang/String;ZZJZI)V");
-    jCreateShortcut = getStaticMethod("createShortcut", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-    jDeleteMessageWrapper = getStaticMethod("deleteMessage", "(II)V");
-    jDisableBatteryNotifications = getStaticMethod("disableBatteryNotifications", "()V");
-    jDisableNetworkNotifications = getStaticMethod("disableNetworkNotifications", "()V");
-    jDisableScreenOrientationNotifications = getStaticMethod("disableScreenOrientationNotifications", "()V");
-    jDisableSensor = getStaticMethod("disableSensor", "(I)V");
-    jEnableBatteryNotifications = getStaticMethod("enableBatteryNotifications", "()V");
-    jEnableLocation = getStaticMethod("enableLocation", "(Z)V");
-    jEnableLocationHighAccuracy = getStaticMethod("enableLocationHighAccuracy", "(Z)V");
-    jEnableNetworkNotifications = getStaticMethod("enableNetworkNotifications", "()V");
-    jEnableScreenOrientationNotifications = getStaticMethod("enableScreenOrientationNotifications", "()V");
-    jEnableSensor = getStaticMethod("enableSensor", "(I)V");
-    jGamepadAdded = getStaticMethod("gamepadAdded", "(II)V");
-    jGetConnection = getStaticMethod("getConnection", "(Ljava/lang/String;)Ljava/net/URLConnection;");
-    jGetContext = getStaticMethod("getContext", "()Landroid/content/Context;");
-    jGetCurrentBatteryInformationWrapper = getStaticMethod("getCurrentBatteryInformation", "()[D");
-    jGetCurrentNetworkInformationWrapper = getStaticMethod("getCurrentNetworkInformation", "()[D");
-    jGetDensity = getStaticMethod("getDensity", "()F");
-    jGetDpiWrapper = getStaticMethod("getDpi", "()I");
-    jGetExtensionFromMimeTypeWrapper = getStaticMethod("getExtensionFromMimeType", "(Ljava/lang/String;)Ljava/lang/String;");
-    jGetExternalPublicDirectory = getStaticMethod("getExternalPublicDirectory", "(Ljava/lang/String;)Ljava/lang/String;");
-    jGetHandlersForMimeTypeWrapper = getStaticMethod("getHandlersForMimeType", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;");
-    jGetHandlersForURLWrapper = getStaticMethod("getHandlersForURL", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;");
-    jGetIconForExtensionWrapper = getStaticMethod("getIconForExtension", "(Ljava/lang/String;I)[B");
-    jGetMessageWrapper = getStaticMethod("getMessage", "(II)V");
-    jGetMimeTypeFromExtensionsWrapper = getStaticMethod("getMimeTypeFromExtensions", "(Ljava/lang/String;)Ljava/lang/String;");
-    jGetNextMessageInListWrapper = getStaticMethod("getNextMessageInList", "(II)V");
-    jGetProxyForURIWrapper = getStaticMethod("getProxyForURI", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
-    jGetScreenDepthWrapper = getStaticMethod("getScreenDepth", "()I");
-    jGetScreenOrientationWrapper = getStaticMethod("getScreenOrientation", "()S");
-    jGetShowPasswordSetting = getStaticMethod("getShowPasswordSetting", "()Z");
-    jGetSystemColoursWrapper = getStaticMethod("getSystemColors", "()[I");
-    jHandleGeckoMessageWrapper = getStaticMethod("handleGeckoMessage", "(Lorg/mozilla/gecko/util/NativeJSContainer;)V");
-    jHandleUncaughtException = getStaticMethod("handleUncaughtException", "(Ljava/lang/Thread;Ljava/lang/Throwable;)V");
-    jHideProgressDialog = getStaticMethod("hideProgressDialog", "()V");
-    jInitCameraWrapper = getStaticMethod("initCamera", "(Ljava/lang/String;III)[I");
-    jIsNetworkLinkKnown = getStaticMethod("isNetworkLinkKnown", "()Z");
-    jIsNetworkLinkUp = getStaticMethod("isNetworkLinkUp", "()Z");
-    jIsTablet = getStaticMethod("isTablet", "()Z");
-    jKillAnyZombies = getStaticMethod("killAnyZombies", "()V");
-    jLoadPluginClass = getStaticMethod("loadPluginClass", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;");
-    jLockScreenOrientation = getStaticMethod("lockScreenOrientation", "(I)V");
-    jMarkURIVisited = getStaticMethod("markUriVisited", "(Ljava/lang/String;)V");
-    jMoveTaskToBack = getStaticMethod("moveTaskToBack", "()V");
-    jNetworkLinkType = getStaticMethod("networkLinkType", "()I");
-    jNotifyDefaultPrevented = getStaticMethod("notifyDefaultPrevented", "(Z)V");
-    jNotifyIME = getStaticMethod("notifyIME", "(I)V");
-    jNotifyIMEChange = getStaticMethod("notifyIMEChange", "(Ljava/lang/String;III)V");
-    jNotifyIMEContext = getStaticMethod("notifyIMEContext", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-    jNotifyWakeLockChanged = getStaticMethod("notifyWakeLockChanged", "(Ljava/lang/String;Ljava/lang/String;)V");
-    jNotifyXreExit = getStaticMethod("onXreExit", "()V");
-    jOpenUriExternal = getStaticMethod("openUriExternal", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z");
-    jPerformHapticFeedback = getStaticMethod("performHapticFeedback", "(Z)V");
-    jPumpMessageLoop = getStaticMethod("pumpMessageLoop", "()Z");
-    jRegisterSurfaceTextureFrameListener = getStaticMethod("registerSurfaceTextureFrameListener", "(Ljava/lang/Object;I)V");
-    jRemovePluginView = getStaticMethod("removePluginView", "(Landroid/view/View;Z)V");
-    jRequestUiThreadCallback = getStaticMethod("requestUiThreadCallback", "(J)V");
-    jScheduleRestart = getStaticMethod("scheduleRestart", "()V");
-    jSendMessageWrapper = getStaticMethod("sendMessage", "(Ljava/lang/String;Ljava/lang/String;I)V");
-    jSetFullScreen = getStaticMethod("setFullScreen", "(Z)V");
-    jSetKeepScreenOn = getStaticMethod("setKeepScreenOn", "(Z)V");
-    jSetURITitle = getStaticMethod("setUriTitle", "(Ljava/lang/String;Ljava/lang/String;)V");
-    jShowAlertNotificationWrapper = getStaticMethod("showAlertNotification", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-    jShowInputMethodPicker = getStaticMethod("showInputMethodPicker", "()V");
-    jStartMonitoringGamepad = getStaticMethod("startMonitoringGamepad", "()V");
-    jStopMonitoringGamepad = getStaticMethod("stopMonitoringGamepad", "()V");
-    jUnlockProfile = getStaticMethod("unlockProfile", "()Z");
-    jUnlockScreenOrientation = getStaticMethod("unlockScreenOrientation", "()V");
-    jUnregisterSurfaceTextureFrameListener = getStaticMethod("unregisterSurfaceTextureFrameListener", "(Ljava/lang/Object;)V");
-    jVibrate1 = getStaticMethod("vibrate", "(J)V");
-    jVibrateA = getStaticMethod("vibrate", "([JI)V");
+void GeckoAppShell::InitStubs(JNIEnv *env) {
+    mGeckoAppShellClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/GeckoAppShell");
+    jAcknowledgeEvent = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "acknowledgeEvent", "()V");
+    jAddPluginViewWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "addPluginView", "(Landroid/view/View;FFFFZ)V");
+    jAlertsProgressListener_OnProgress = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "alertsProgressListener_OnProgress", "(Ljava/lang/String;JJLjava/lang/String;)V");
+    jCancelVibrate = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "cancelVibrate", "()V");
+    jCheckURIVisited = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "checkUriVisited", "(Ljava/lang/String;)V");
+    jClearMessageList = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "clearMessageList", "(I)V");
+    jCloseCamera = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "closeCamera", "()V");
+    jCloseNotification = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "closeNotification", "(Ljava/lang/String;)V");
+    jConnectionGetMimeType = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "connectionGetMimeType", "(Ljava/net/URLConnection;)Ljava/lang/String;");
+    jCreateInputStream = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "createInputStream", "(Ljava/net/URLConnection;)Ljava/io/InputStream;");
+    jCreateMessageListWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "createMessageList", "(JJ[Ljava/lang/String;ILjava/lang/String;ZZJZI)V");
+    jCreateShortcut = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "createShortcut", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+    jDeleteMessageWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "deleteMessage", "(II)V");
+    jDisableBatteryNotifications = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "disableBatteryNotifications", "()V");
+    jDisableNetworkNotifications = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "disableNetworkNotifications", "()V");
+    jDisableScreenOrientationNotifications = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "disableScreenOrientationNotifications", "()V");
+    jDisableSensor = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "disableSensor", "(I)V");
+    jEnableBatteryNotifications = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "enableBatteryNotifications", "()V");
+    jEnableLocation = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "enableLocation", "(Z)V");
+    jEnableLocationHighAccuracy = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "enableLocationHighAccuracy", "(Z)V");
+    jEnableNetworkNotifications = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "enableNetworkNotifications", "()V");
+    jEnableScreenOrientationNotifications = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "enableScreenOrientationNotifications", "()V");
+    jEnableSensor = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "enableSensor", "(I)V");
+    jGamepadAdded = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "gamepadAdded", "(II)V");
+    jGetConnection = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getConnection", "(Ljava/lang/String;)Ljava/net/URLConnection;");
+    jGetContext = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getContext", "()Landroid/content/Context;");
+    jGetCurrentBatteryInformationWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getCurrentBatteryInformation", "()[D");
+    jGetCurrentNetworkInformationWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getCurrentNetworkInformation", "()[D");
+    jGetDensity = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getDensity", "()F");
+    jGetDpiWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getDpi", "()I");
+    jGetExtensionFromMimeTypeWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getExtensionFromMimeType", "(Ljava/lang/String;)Ljava/lang/String;");
+    jGetExternalPublicDirectory = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getExternalPublicDirectory", "(Ljava/lang/String;)Ljava/lang/String;");
+    jGetHandlersForMimeTypeWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getHandlersForMimeType", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;");
+    jGetHandlersForURLWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getHandlersForURL", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;");
+    jGetIconForExtensionWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getIconForExtension", "(Ljava/lang/String;I)[B");
+    jGetMessageWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getMessage", "(II)V");
+    jGetMimeTypeFromExtensionsWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getMimeTypeFromExtensions", "(Ljava/lang/String;)Ljava/lang/String;");
+    jGetNextMessageInListWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getNextMessageInList", "(II)V");
+    jGetProxyForURIWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getProxyForURI", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;");
+    jGetScreenDepthWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getScreenDepth", "()I");
+    jGetScreenOrientationWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getScreenOrientation", "()S");
+    jGetShowPasswordSetting = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getShowPasswordSetting", "()Z");
+    jGetSystemColoursWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "getSystemColors", "()[I");
+    jHandleGeckoMessageWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "handleGeckoMessage", "(Lorg/mozilla/gecko/util/NativeJSContainer;)V");
+    jHandleUncaughtException = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "handleUncaughtException", "(Ljava/lang/Thread;Ljava/lang/Throwable;)V");
+    jHideProgressDialog = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "hideProgressDialog", "()V");
+    jInitCameraWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "initCamera", "(Ljava/lang/String;III)[I");
+    jIsNetworkLinkKnown = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "isNetworkLinkKnown", "()Z");
+    jIsNetworkLinkUp = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "isNetworkLinkUp", "()Z");
+    jIsTablet = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "isTablet", "()Z");
+    jKillAnyZombies = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "killAnyZombies", "()V");
+    jLoadPluginClass = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "loadPluginClass", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;");
+    jLockScreenOrientation = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "lockScreenOrientation", "(I)V");
+    jMarkURIVisited = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "markUriVisited", "(Ljava/lang/String;)V");
+    jMoveTaskToBack = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "moveTaskToBack", "()V");
+    jNetworkLinkType = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "networkLinkType", "()I");
+    jNotifyDefaultPrevented = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "notifyDefaultPrevented", "(Z)V");
+    jNotifyIME = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "notifyIME", "(I)V");
+    jNotifyIMEChange = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "notifyIMEChange", "(Ljava/lang/String;III)V");
+    jNotifyIMEContext = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "notifyIMEContext", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+    jNotifyWakeLockChanged = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "notifyWakeLockChanged", "(Ljava/lang/String;Ljava/lang/String;)V");
+    jNotifyXreExit = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "onXreExit", "()V");
+    jOpenUriExternal = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "openUriExternal", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z");
+    jPerformHapticFeedback = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "performHapticFeedback", "(Z)V");
+    jPumpMessageLoop = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "pumpMessageLoop", "()Z");
+    jRegisterSurfaceTextureFrameListener = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "registerSurfaceTextureFrameListener", "(Ljava/lang/Object;I)V");
+    jRemovePluginView = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "removePluginView", "(Landroid/view/View;Z)V");
+    jRequestUiThreadCallback = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "requestUiThreadCallback", "(J)V");
+    jScheduleRestart = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "scheduleRestart", "()V");
+    jSendMessageWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "sendMessage", "(Ljava/lang/String;Ljava/lang/String;I)V");
+    jSetFullScreen = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "setFullScreen", "(Z)V");
+    jSetKeepScreenOn = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "setKeepScreenOn", "(Z)V");
+    jSetURITitle = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "setUriTitle", "(Ljava/lang/String;Ljava/lang/String;)V");
+    jShowAlertNotificationWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "showAlertNotification", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+    jShowInputMethodPicker = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "showInputMethodPicker", "()V");
+    jStartMonitoringGamepad = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "startMonitoringGamepad", "()V");
+    jStopMonitoringGamepad = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "stopMonitoringGamepad", "()V");
+    jUnlockProfile = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "unlockProfile", "()Z");
+    jUnlockScreenOrientation = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "unlockScreenOrientation", "()V");
+    jUnregisterSurfaceTextureFrameListener = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "unregisterSurfaceTextureFrameListener", "(Ljava/lang/Object;)V");
+    jVibrate1 = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "vibrate", "(J)V");
+    jVibrateA = AndroidBridge::GetStaticMethodID(env, mGeckoAppShellClass, "vibrate", "([JI)V");
 }
 
 GeckoAppShell* GeckoAppShell::Wrap(jobject obj) {
@@ -1342,17 +1338,15 @@
 jmethodID GeckoJavaSampler::jStartJavaProfiling = 0;
 jmethodID GeckoJavaSampler::jStopJavaProfiling = 0;
 jmethodID GeckoJavaSampler::jUnpauseJavaProfiling = 0;
-void GeckoJavaSampler::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mGeckoJavaSamplerClass = getClassGlobalRef("org/mozilla/gecko/GeckoJavaSampler");
-    jGetFrameNameJavaProfilingWrapper = getStaticMethod("getFrameName", "(III)Ljava/lang/String;");
-    jGetSampleTimeJavaProfiling = getStaticMethod("getSampleTime", "(II)D");
-    jGetThreadNameJavaProfilingWrapper = getStaticMethod("getThreadName", "(I)Ljava/lang/String;");
-    jPauseJavaProfiling = getStaticMethod("pause", "()V");
-    jStartJavaProfiling = getStaticMethod("start", "(II)V");
-    jStopJavaProfiling = getStaticMethod("stop", "()V");
-    jUnpauseJavaProfiling = getStaticMethod("unpause", "()V");
+void GeckoJavaSampler::InitStubs(JNIEnv *env) {
+    mGeckoJavaSamplerClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/GeckoJavaSampler");
+    jGetFrameNameJavaProfilingWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "getFrameName", "(III)Ljava/lang/String;");
+    jGetSampleTimeJavaProfiling = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "getSampleTime", "(II)D");
+    jGetThreadNameJavaProfilingWrapper = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "getThreadName", "(I)Ljava/lang/String;");
+    jPauseJavaProfiling = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "pause", "()V");
+    jStartJavaProfiling = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "start", "(II)V");
+    jStopJavaProfiling = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "stop", "()V");
+    jUnpauseJavaProfiling = AndroidBridge::GetStaticMethodID(env, mGeckoJavaSamplerClass, "unpause", "()V");
 }
 
 GeckoJavaSampler* GeckoJavaSampler::Wrap(jobject obj) {
@@ -1457,13 +1451,11 @@
 jmethodID RestrictedProfiles::jGetUserRestrictions = 0;
 jmethodID RestrictedProfiles::jIsAllowed = 0;
 jmethodID RestrictedProfiles::jIsUserRestricted = 0;
-void RestrictedProfiles::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mRestrictedProfilesClass = getClassGlobalRef("org/mozilla/gecko/RestrictedProfiles");
-    jGetUserRestrictions = getStaticMethod("getUserRestrictions", "()Ljava/lang/String;");
-    jIsAllowed = getStaticMethod("isAllowed", "(ILjava/lang/String;)Z");
-    jIsUserRestricted = getStaticMethod("isUserRestricted", "()Z");
+void RestrictedProfiles::InitStubs(JNIEnv *env) {
+    mRestrictedProfilesClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/RestrictedProfiles");
+    jGetUserRestrictions = AndroidBridge::GetStaticMethodID(env, mRestrictedProfilesClass, "getUserRestrictions", "()Ljava/lang/String;");
+    jIsAllowed = AndroidBridge::GetStaticMethodID(env, mRestrictedProfilesClass, "isAllowed", "(ILjava/lang/String;)Z");
+    jIsUserRestricted = AndroidBridge::GetStaticMethodID(env, mRestrictedProfilesClass, "isUserRestricted", "()Z");
 }
 
 RestrictedProfiles* RestrictedProfiles::Wrap(jobject obj) {
@@ -1519,15 +1511,13 @@
 jfieldID SurfaceBits::jformat = 0;
 jfieldID SurfaceBits::jheight = 0;
 jfieldID SurfaceBits::jwidth = 0;
-void SurfaceBits::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mSurfaceBitsClass = getClassGlobalRef("org/mozilla/gecko/SurfaceBits");
-    jSurfaceBits = getMethod("<init>", "()V");
-    jbuffer = getField("buffer", "Ljava/nio/ByteBuffer;");
-    jformat = getField("format", "I");
-    jheight = getField("height", "I");
-    jwidth = getField("width", "I");
+void SurfaceBits::InitStubs(JNIEnv *env) {
+    mSurfaceBitsClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/SurfaceBits");
+    jSurfaceBits = AndroidBridge::GetMethodID(env, mSurfaceBitsClass, "<init>", "()V");
+    jbuffer = AndroidBridge::GetFieldID(env, mSurfaceBitsClass, "buffer", "Ljava/nio/ByteBuffer;");
+    jformat = AndroidBridge::GetFieldID(env, mSurfaceBitsClass, "format", "I");
+    jheight = AndroidBridge::GetFieldID(env, mSurfaceBitsClass, "height", "I");
+    jwidth = AndroidBridge::GetFieldID(env, mSurfaceBitsClass, "width", "I");
 }
 
 SurfaceBits* SurfaceBits::Wrap(jobject obj) {
@@ -1589,11 +1579,9 @@
 }
 jclass ThumbnailHelper::mThumbnailHelperClass = 0;
 jmethodID ThumbnailHelper::jSendThumbnail = 0;
-void ThumbnailHelper::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mThumbnailHelperClass = getClassGlobalRef("org/mozilla/gecko/ThumbnailHelper");
-    jSendThumbnail = getStaticMethod("notifyThumbnail", "(Ljava/nio/ByteBuffer;IZZ)V");
+void ThumbnailHelper::InitStubs(JNIEnv *env) {
+    mThumbnailHelperClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/ThumbnailHelper");
+    jSendThumbnail = AndroidBridge::GetStaticMethodID(env, mThumbnailHelperClass, "notifyThumbnail", "(Ljava/nio/ByteBuffer;IZZ)V");
 }
 
 ThumbnailHelper* ThumbnailHelper::Wrap(jobject obj) {
@@ -1624,13 +1612,11 @@
 jmethodID DisplayPortMetrics::jDisplayPortMetrics = 0;
 jfieldID DisplayPortMetrics::jMPosition = 0;
 jfieldID DisplayPortMetrics::jResolution = 0;
-void DisplayPortMetrics::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mDisplayPortMetricsClass = getClassGlobalRef("org/mozilla/gecko/gfx/DisplayPortMetrics");
-    jDisplayPortMetrics = getMethod("<init>", "(FFFFF)V");
-    jMPosition = getField("mPosition", "Landroid/graphics/RectF;");
-    jResolution = getField("resolution", "F");
+void DisplayPortMetrics::InitStubs(JNIEnv *env) {
+    mDisplayPortMetricsClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/DisplayPortMetrics");
+    jDisplayPortMetrics = AndroidBridge::GetMethodID(env, mDisplayPortMetricsClass, "<init>", "(FFFFF)V");
+    jMPosition = AndroidBridge::GetFieldID(env, mDisplayPortMetricsClass, "mPosition", "Landroid/graphics/RectF;");
+    jResolution = AndroidBridge::GetFieldID(env, mDisplayPortMetricsClass, "resolution", "F");
 }
 
 DisplayPortMetrics* DisplayPortMetrics::Wrap(jobject obj) {
@@ -1669,11 +1655,9 @@
 }
 jclass GLController::mGLControllerClass = 0;
 jmethodID GLController::jCreateEGLSurfaceForCompositorWrapper = 0;
-void GLController::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mGLControllerClass = getClassGlobalRef("org/mozilla/gecko/gfx/GLController");
-    jCreateEGLSurfaceForCompositorWrapper = getMethod("createEGLSurfaceForCompositor", "()Ljavax/microedition/khronos/egl/EGLSurface;");
+void GLController::InitStubs(JNIEnv *env) {
+    mGLControllerClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/GLController");
+    jCreateEGLSurfaceForCompositorWrapper = AndroidBridge::GetMethodID(env, mGLControllerClass, "createEGLSurfaceForCompositor", "()Ljavax/microedition/khronos/egl/EGLSurface;");
 }
 
 GLController* GLController::Wrap(jobject obj) {
@@ -1707,21 +1691,19 @@
 jmethodID GeckoLayerClient::jSetPageRect = 0;
 jmethodID GeckoLayerClient::jSyncFrameMetrics = 0;
 jmethodID GeckoLayerClient::jSyncViewportInfo = 0;
-void GeckoLayerClient::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mGeckoLayerClientClass = getClassGlobalRef("org/mozilla/gecko/gfx/GeckoLayerClient");
-    jActivateProgram = getMethod("activateProgram", "()V");
-    jContentDocumentChanged = getMethod("contentDocumentChanged", "()V");
-    jCreateFrame = getMethod("createFrame", "()Lorg/mozilla/gecko/gfx/LayerRenderer$Frame;");
-    jDeactivateProgramAndRestoreState = getMethod("deactivateProgramAndRestoreState", "(ZIIII)V");
-    jGetDisplayPort = getMethod("getDisplayPort", "(ZZILorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)Lorg/mozilla/gecko/gfx/DisplayPortMetrics;");
-    jIsContentDocumentDisplayed = getMethod("isContentDocumentDisplayed", "()Z");
-    jProgressiveUpdateCallback = getMethod("progressiveUpdateCallback", "(ZFFFFFZ)Lorg/mozilla/gecko/gfx/ProgressiveUpdateData;");
-    jSetFirstPaintViewport = getMethod("setFirstPaintViewport", "(FFFFFFF)V");
-    jSetPageRect = getMethod("setPageRect", "(FFFF)V");
-    jSyncFrameMetrics = getMethod("syncFrameMetrics", "(FFFFFFFZIIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;");
-    jSyncViewportInfo = getMethod("syncViewportInfo", "(IIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;");
+void GeckoLayerClient::InitStubs(JNIEnv *env) {
+    mGeckoLayerClientClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/GeckoLayerClient");
+    jActivateProgram = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "activateProgram", "()V");
+    jContentDocumentChanged = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "contentDocumentChanged", "()V");
+    jCreateFrame = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "createFrame", "()Lorg/mozilla/gecko/gfx/LayerRenderer$Frame;");
+    jDeactivateProgramAndRestoreState = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "deactivateProgramAndRestoreState", "(ZIIII)V");
+    jGetDisplayPort = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "getDisplayPort", "(ZZILorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)Lorg/mozilla/gecko/gfx/DisplayPortMetrics;");
+    jIsContentDocumentDisplayed = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "isContentDocumentDisplayed", "()Z");
+    jProgressiveUpdateCallback = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "progressiveUpdateCallback", "(ZFFFFFZ)Lorg/mozilla/gecko/gfx/ProgressiveUpdateData;");
+    jSetFirstPaintViewport = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "setFirstPaintViewport", "(FFFFFFF)V");
+    jSetPageRect = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "setPageRect", "(FFFF)V");
+    jSyncFrameMetrics = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "syncFrameMetrics", "(FFFFFFFZIIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;");
+    jSyncViewportInfo = AndroidBridge::GetMethodID(env, mGeckoLayerClientClass, "syncViewportInfo", "(IIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;");
 }
 
 GeckoLayerClient* GeckoLayerClient::Wrap(jobject obj) {
@@ -1931,11 +1913,9 @@
 }
 jclass ImmutableViewportMetrics::mImmutableViewportMetricsClass = 0;
 jmethodID ImmutableViewportMetrics::jImmutableViewportMetrics = 0;
-void ImmutableViewportMetrics::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mImmutableViewportMetricsClass = getClassGlobalRef("org/mozilla/gecko/gfx/ImmutableViewportMetrics");
-    jImmutableViewportMetrics = getMethod("<init>", "(FFFFFFFFFFFFF)V");
+void ImmutableViewportMetrics::InitStubs(JNIEnv *env) {
+    mImmutableViewportMetricsClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/ImmutableViewportMetrics");
+    jImmutableViewportMetrics = AndroidBridge::GetMethodID(env, mImmutableViewportMetricsClass, "<init>", "(FFFFFFFFFFFFF)V");
 }
 
 ImmutableViewportMetrics* ImmutableViewportMetrics::Wrap(jobject obj) {
@@ -1972,11 +1952,9 @@
 }
 jclass LayerView::mLayerViewClass = 0;
 jmethodID LayerView::jRegisterCompositorWrapper = 0;
-void LayerView::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mLayerViewClass = getClassGlobalRef("org/mozilla/gecko/gfx/LayerView");
-    jRegisterCompositorWrapper = getStaticMethod("registerCxxCompositor", "()Lorg/mozilla/gecko/gfx/GLController;");
+void LayerView::InitStubs(JNIEnv *env) {
+    mLayerViewClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/LayerView");
+    jRegisterCompositorWrapper = AndroidBridge::GetStaticMethodID(env, mLayerViewClass, "registerCxxCompositor", "()Lorg/mozilla/gecko/gfx/GLController;");
 }
 
 LayerView* LayerView::Wrap(jobject obj) {
@@ -2000,11 +1978,9 @@
 }
 jclass NativePanZoomController::mNativePanZoomControllerClass = 0;
 jmethodID NativePanZoomController::jRequestContentRepaintWrapper = 0;
-void NativePanZoomController::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mNativePanZoomControllerClass = getClassGlobalRef("org/mozilla/gecko/gfx/NativePanZoomController");
-    jRequestContentRepaintWrapper = getMethod("requestContentRepaint", "(FFFFF)V");
+void NativePanZoomController::InitStubs(JNIEnv *env) {
+    mNativePanZoomControllerClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/NativePanZoomController");
+    jRequestContentRepaintWrapper = AndroidBridge::GetMethodID(env, mNativePanZoomControllerClass, "requestContentRepaint", "(FFFFF)V");
 }
 
 NativePanZoomController* NativePanZoomController::Wrap(jobject obj) {
@@ -2039,16 +2015,14 @@
 jfieldID ProgressiveUpdateData::jscale = 0;
 jfieldID ProgressiveUpdateData::jx = 0;
 jfieldID ProgressiveUpdateData::jy = 0;
-void ProgressiveUpdateData::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mProgressiveUpdateDataClass = getClassGlobalRef("org/mozilla/gecko/gfx/ProgressiveUpdateData");
-    jProgressiveUpdateData = getMethod("<init>", "()V");
-    jsetViewport = getMethod("setViewport", "(Lorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)V");
-    jabort = getField("abort", "Z");
-    jscale = getField("scale", "F");
-    jx = getField("x", "F");
-    jy = getField("y", "F");
+void ProgressiveUpdateData::InitStubs(JNIEnv *env) {
+    mProgressiveUpdateDataClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/ProgressiveUpdateData");
+    jProgressiveUpdateData = AndroidBridge::GetMethodID(env, mProgressiveUpdateDataClass, "<init>", "()V");
+    jsetViewport = AndroidBridge::GetMethodID(env, mProgressiveUpdateDataClass, "setViewport", "(Lorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)V");
+    jabort = AndroidBridge::GetFieldID(env, mProgressiveUpdateDataClass, "abort", "Z");
+    jscale = AndroidBridge::GetFieldID(env, mProgressiveUpdateDataClass, "scale", "F");
+    jx = AndroidBridge::GetFieldID(env, mProgressiveUpdateDataClass, "x", "F");
+    jy = AndroidBridge::GetFieldID(env, mProgressiveUpdateDataClass, "y", "F");
 }
 
 ProgressiveUpdateData* ProgressiveUpdateData::Wrap(jobject obj) {
@@ -2131,20 +2105,18 @@
 jfieldID ViewTransform::jscale = 0;
 jfieldID ViewTransform::jx = 0;
 jfieldID ViewTransform::jy = 0;
-void ViewTransform::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mViewTransformClass = getClassGlobalRef("org/mozilla/gecko/gfx/ViewTransform");
-    jViewTransform = getMethod("<init>", "(FFF)V");
-    jfixedLayerMarginBottom = getField("fixedLayerMarginBottom", "F");
-    jfixedLayerMarginLeft = getField("fixedLayerMarginLeft", "F");
-    jfixedLayerMarginRight = getField("fixedLayerMarginRight", "F");
-    jfixedLayerMarginTop = getField("fixedLayerMarginTop", "F");
-    joffsetX = getField("offsetX", "F");
-    joffsetY = getField("offsetY", "F");
-    jscale = getField("scale", "F");
-    jx = getField("x", "F");
-    jy = getField("y", "F");
+void ViewTransform::InitStubs(JNIEnv *env) {
+    mViewTransformClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/gfx/ViewTransform");
+    jViewTransform = AndroidBridge::GetMethodID(env, mViewTransformClass, "<init>", "(FFF)V");
+    jfixedLayerMarginBottom = AndroidBridge::GetFieldID(env, mViewTransformClass, "fixedLayerMarginBottom", "F");
+    jfixedLayerMarginLeft = AndroidBridge::GetFieldID(env, mViewTransformClass, "fixedLayerMarginLeft", "F");
+    jfixedLayerMarginRight = AndroidBridge::GetFieldID(env, mViewTransformClass, "fixedLayerMarginRight", "F");
+    jfixedLayerMarginTop = AndroidBridge::GetFieldID(env, mViewTransformClass, "fixedLayerMarginTop", "F");
+    joffsetX = AndroidBridge::GetFieldID(env, mViewTransformClass, "offsetX", "F");
+    joffsetY = AndroidBridge::GetFieldID(env, mViewTransformClass, "offsetY", "F");
+    jscale = AndroidBridge::GetFieldID(env, mViewTransformClass, "scale", "F");
+    jx = AndroidBridge::GetFieldID(env, mViewTransformClass, "x", "F");
+    jy = AndroidBridge::GetFieldID(env, mViewTransformClass, "y", "F");
 }
 
 ViewTransform* ViewTransform::Wrap(jobject obj) {
@@ -2261,11 +2233,9 @@
 }
 jclass NativeZip::mNativeZipClass = 0;
 jmethodID NativeZip::jCreateInputStream = 0;
-void NativeZip::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mNativeZipClass = getClassGlobalRef("org/mozilla/gecko/mozglue/NativeZip");
-    jCreateInputStream = getMethod("createInputStream", "(Ljava/nio/ByteBuffer;I)Ljava/io/InputStream;");
+void NativeZip::InitStubs(JNIEnv *env) {
+    mNativeZipClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/mozglue/NativeZip");
+    jCreateInputStream = AndroidBridge::GetMethodID(env, mNativeZipClass, "createInputStream", "(Ljava/nio/ByteBuffer;I)Ljava/io/InputStream;");
 }
 
 NativeZip* NativeZip::Wrap(jobject obj) {
@@ -2293,15 +2263,13 @@
 jmethodID MatrixBlobCursor::jAddRow = 0;
 jmethodID MatrixBlobCursor::jAddRow1 = 0;
 jmethodID MatrixBlobCursor::jAddRow2 = 0;
-void MatrixBlobCursor::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mMatrixBlobCursorClass = getClassGlobalRef("org/mozilla/gecko/sqlite/MatrixBlobCursor");
-    jMatrixBlobCursor = getMethod("<init>", "([Ljava/lang/String;)V");
-    jMatrixBlobCursor0 = getMethod("<init>", "([Ljava/lang/String;I)V");
-    jAddRow = getMethod("addRow", "(Ljava/lang/Iterable;)V");
-    jAddRow1 = getMethod("addRow", "(Ljava/util/ArrayList;I)V");
-    jAddRow2 = getMethod("addRow", "([Ljava/lang/Object;)V");
+void MatrixBlobCursor::InitStubs(JNIEnv *env) {
+    mMatrixBlobCursorClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/sqlite/MatrixBlobCursor");
+    jMatrixBlobCursor = AndroidBridge::GetMethodID(env, mMatrixBlobCursorClass, "<init>", "([Ljava/lang/String;)V");
+    jMatrixBlobCursor0 = AndroidBridge::GetMethodID(env, mMatrixBlobCursorClass, "<init>", "([Ljava/lang/String;I)V");
+    jAddRow = AndroidBridge::GetMethodID(env, mMatrixBlobCursorClass, "addRow", "(Ljava/lang/Iterable;)V");
+    jAddRow1 = AndroidBridge::GetMethodID(env, mMatrixBlobCursorClass, "addRow", "(Ljava/util/ArrayList;I)V");
+    jAddRow2 = AndroidBridge::GetMethodID(env, mMatrixBlobCursorClass, "addRow", "([Ljava/lang/Object;)V");
 }
 
 MatrixBlobCursor* MatrixBlobCursor::Wrap(jobject obj) {
@@ -2372,13 +2340,11 @@
 jmethodID SQLiteBridgeException::jSQLiteBridgeException = 0;
 jmethodID SQLiteBridgeException::jSQLiteBridgeException0 = 0;
 jfieldID SQLiteBridgeException::jserialVersionUID = 0;
-void SQLiteBridgeException::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mSQLiteBridgeExceptionClass = getClassGlobalRef("org/mozilla/gecko/sqlite/SQLiteBridgeException");
-    jSQLiteBridgeException = getMethod("<init>", "()V");
-    jSQLiteBridgeException0 = getMethod("<init>", "(Ljava/lang/String;)V");
-    jserialVersionUID = getStaticField("serialVersionUID", "J");
+void SQLiteBridgeException::InitStubs(JNIEnv *env) {
+    mSQLiteBridgeExceptionClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/sqlite/SQLiteBridgeException");
+    jSQLiteBridgeException = AndroidBridge::GetMethodID(env, mSQLiteBridgeExceptionClass, "<init>", "()V");
+    jSQLiteBridgeException0 = AndroidBridge::GetMethodID(env, mSQLiteBridgeExceptionClass, "<init>", "(Ljava/lang/String;)V");
+    jserialVersionUID = AndroidBridge::GetStaticFieldID(env, mSQLiteBridgeExceptionClass, "serialVersionUID", "J");
 }
 
 SQLiteBridgeException* SQLiteBridgeException::Wrap(jobject obj) {
@@ -2421,14 +2387,12 @@
 jmethodID Clipboard::jGetClipboardTextWrapper = 0;
 jmethodID Clipboard::jHasText = 0;
 jmethodID Clipboard::jSetClipboardText = 0;
-void Clipboard::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mClipboardClass = getClassGlobalRef("org/mozilla/gecko/util/Clipboard");
-    jClearText = getStaticMethod("clearText", "()V");
-    jGetClipboardTextWrapper = getStaticMethod("getText", "()Ljava/lang/String;");
-    jHasText = getStaticMethod("hasText", "()Z");
-    jSetClipboardText = getStaticMethod("setText", "(Ljava/lang/CharSequence;)V");
+void Clipboard::InitStubs(JNIEnv *env) {
+    mClipboardClass = AndroidBridge::GetClassGlobalRef(env, "org/mozilla/gecko/util/Clipboard");
+    jClearText = AndroidBridge::GetStaticMethodID(env, mClipboardClass, "clearText", "()V");
+    jGetClipboardTextWrapper = AndroidBridge::GetStaticMethodID(env, mClipboardClass, "getText", "()Ljava/lang/String;");
+    jHasText = AndroidBridge::GetStaticMethodID(env, mClipboardClass, "hasText", "()Z");
+    jSetClipboardText = AndroidBridge::GetStaticMethodID(env, mClipboardClass, "setText", "(Ljava/lang/CharSequence;)V");
 }
 
 Clipboard* Clipboard::Wrap(jobject obj) {
@@ -2490,25 +2454,25 @@
     env->PopLocalFrame(nullptr);
 }
 
-void InitStubs(JNIEnv *jEnv) {
-    DownloadsIntegration::InitStubs(jEnv);
-    GeckoAppShell::InitStubs(jEnv);
-    GeckoJavaSampler::InitStubs(jEnv);
-    RestrictedProfiles::InitStubs(jEnv);
-    SurfaceBits::InitStubs(jEnv);
-    ThumbnailHelper::InitStubs(jEnv);
-    DisplayPortMetrics::InitStubs(jEnv);
-    GLController::InitStubs(jEnv);
-    GeckoLayerClient::InitStubs(jEnv);
-    ImmutableViewportMetrics::InitStubs(jEnv);
-    LayerView::InitStubs(jEnv);
-    NativePanZoomController::InitStubs(jEnv);
-    ProgressiveUpdateData::InitStubs(jEnv);
-    ViewTransform::InitStubs(jEnv);
-    NativeZip::InitStubs(jEnv);
-    MatrixBlobCursor::InitStubs(jEnv);
-    SQLiteBridgeException::InitStubs(jEnv);
-    Clipboard::InitStubs(jEnv);
+void InitStubs(JNIEnv *env) {
+    DownloadsIntegration::InitStubs(env);
+    GeckoAppShell::InitStubs(env);
+    GeckoJavaSampler::InitStubs(env);
+    RestrictedProfiles::InitStubs(env);
+    SurfaceBits::InitStubs(env);
+    ThumbnailHelper::InitStubs(env);
+    DisplayPortMetrics::InitStubs(env);
+    GLController::InitStubs(env);
+    GeckoLayerClient::InitStubs(env);
+    ImmutableViewportMetrics::InitStubs(env);
+    LayerView::InitStubs(env);
+    NativePanZoomController::InitStubs(env);
+    ProgressiveUpdateData::InitStubs(env);
+    ViewTransform::InitStubs(env);
+    NativeZip::InitStubs(env);
+    MatrixBlobCursor::InitStubs(env);
+    SQLiteBridgeException::InitStubs(env);
+    Clipboard::InitStubs(env);
 }
 } /* android */
 } /* widget */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedJNIWrappers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedJNIWrappers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedJNIWrappers.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedJNIWrappers.h	2014-11-26 21:46:06.000000000 +0000
@@ -12,11 +12,11 @@
 namespace mozilla {
 namespace widget {
 namespace android {
-void InitStubs(JNIEnv *jEnv);
+void InitStubs(JNIEnv *env);
 
 class DownloadsIntegration : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static DownloadsIntegration* Wrap(jobject obj);
     DownloadsIntegration(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static void ScanMedia(const nsAString& a0, const nsAString& a1);
@@ -28,7 +28,7 @@
 
 class GeckoAppShell : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static GeckoAppShell* Wrap(jobject obj);
     GeckoAppShell(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static void AcknowledgeEvent();
@@ -202,7 +202,7 @@
 
 class GeckoJavaSampler : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static GeckoJavaSampler* Wrap(jobject obj);
     GeckoJavaSampler(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static jstring GetFrameNameJavaProfilingWrapper(int32_t a0, int32_t a1, int32_t a2);
@@ -226,7 +226,7 @@
 
 class RestrictedProfiles : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static RestrictedProfiles* Wrap(jobject obj);
     RestrictedProfiles(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static jstring GetUserRestrictions();
@@ -242,7 +242,7 @@
 
 class SurfaceBits : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static SurfaceBits* Wrap(jobject obj);
     SurfaceBits(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     SurfaceBits();
@@ -265,7 +265,7 @@
 
 class ThumbnailHelper : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static ThumbnailHelper* Wrap(jobject obj);
     ThumbnailHelper(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static void SendThumbnail(jobject a0, int32_t a1, bool a2, bool a3);
@@ -277,7 +277,7 @@
 
 class DisplayPortMetrics : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static DisplayPortMetrics* Wrap(jobject obj);
     DisplayPortMetrics(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     DisplayPortMetrics(jfloat a0, jfloat a1, jfloat a2, jfloat a3, jfloat a4);
@@ -293,7 +293,7 @@
 
 class GLController : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static GLController* Wrap(jobject obj);
     GLController(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     jobject CreateEGLSurfaceForCompositorWrapper();
@@ -305,7 +305,7 @@
 
 class GeckoLayerClient : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static GeckoLayerClient* Wrap(jobject obj);
     GeckoLayerClient(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     void ActivateProgram();
@@ -337,7 +337,7 @@
 
 class ImmutableViewportMetrics : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static ImmutableViewportMetrics* Wrap(jobject obj);
     ImmutableViewportMetrics(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     ImmutableViewportMetrics(jfloat a0, jfloat a1, jfloat a2, jfloat a3, jfloat a4, jfloat a5, jfloat a6, jfloat a7, jfloat a8, jfloat a9, jfloat a10, jfloat a11, jfloat a12);
@@ -349,7 +349,7 @@
 
 class LayerView : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static LayerView* Wrap(jobject obj);
     LayerView(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static jobject RegisterCompositorWrapper();
@@ -361,7 +361,7 @@
 
 class NativePanZoomController : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static NativePanZoomController* Wrap(jobject obj);
     NativePanZoomController(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     void RequestContentRepaintWrapper(jfloat a0, jfloat a1, jfloat a2, jfloat a3, jfloat a4);
@@ -373,7 +373,7 @@
 
 class ProgressiveUpdateData : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static ProgressiveUpdateData* Wrap(jobject obj);
     ProgressiveUpdateData(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     ProgressiveUpdateData();
@@ -398,7 +398,7 @@
 
 class ViewTransform : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static ViewTransform* Wrap(jobject obj);
     ViewTransform(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     ViewTransform(jfloat a0, jfloat a1, jfloat a2);
@@ -437,7 +437,7 @@
 
 class NativeZip : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static NativeZip* Wrap(jobject obj);
     NativeZip(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     jobject CreateInputStream(jobject a0, int32_t a1);
@@ -449,7 +449,7 @@
 
 class MatrixBlobCursor : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static MatrixBlobCursor* Wrap(jobject obj);
     MatrixBlobCursor(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     MatrixBlobCursor(jobjectArray a0);
@@ -469,7 +469,7 @@
 
 class SQLiteBridgeException : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static SQLiteBridgeException* Wrap(jobject obj);
     SQLiteBridgeException(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     SQLiteBridgeException();
@@ -484,7 +484,7 @@
 
 class Clipboard : public AutoGlobalWrappedJavaObject {
 public:
-    static void InitStubs(JNIEnv *jEnv);
+    static void InitStubs(JNIEnv *env);
     static Clipboard* Wrap(jobject obj);
     Clipboard(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
     static void ClearText();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedSDKWrappers.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedSDKWrappers.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedSDKWrappers.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedSDKWrappers.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1877 +0,0 @@
-// GENERATED CODE
-// Generated by the Java program at /build/jarClassProcessors at compile time from
-// a given set of jars and a set of requested methods. To update, change the annotations
-// on the corresponding Java methods and rerun the build. Manually updating this file
-// will cause your build to fail.
-
-#include "GeneratedSDKWrappers.h"
-#include "AndroidBridgeUtilities.h"
-#include "nsXPCOMStrings.h"
-#include "AndroidBridge.h"
-#include "nsDebug.h"
-
-namespace mozilla {
-namespace widget {
-namespace android {
-jclass MediaCodec::mMediaCodecClass = 0;
-jmethodID MediaCodec::jConfigure = 0;
-jmethodID MediaCodec::jCreateByCodecName = 0;
-jmethodID MediaCodec::jCreateDecoderByType = 0;
-jmethodID MediaCodec::jCreateEncoderByType = 0;
-jmethodID MediaCodec::jDequeueInputBuffer = 0;
-jmethodID MediaCodec::jDequeueOutputBuffer = 0;
-jmethodID MediaCodec::jFinalize = 0;
-jmethodID MediaCodec::jFlush = 0;
-jmethodID MediaCodec::jGetInputBuffers = 0;
-jmethodID MediaCodec::jGetOutputBuffers = 0;
-jmethodID MediaCodec::jGetOutputFormat = 0;
-jmethodID MediaCodec::jQueueInputBuffer = 0;
-jmethodID MediaCodec::jQueueSecureInputBuffer = 0;
-jmethodID MediaCodec::jRelease = 0;
-jmethodID MediaCodec::jReleaseOutputBuffer = 0;
-jmethodID MediaCodec::jSetVideoScalingMode = 0;
-jmethodID MediaCodec::jStart = 0;
-jmethodID MediaCodec::jStop = 0;
-jfieldID MediaCodec::jBUFFER_FLAG_CODEC_CONFIG = 0;
-jfieldID MediaCodec::jBUFFER_FLAG_END_OF_STREAM = 0;
-jfieldID MediaCodec::jBUFFER_FLAG_SYNC_FRAME = 0;
-jfieldID MediaCodec::jCONFIGURE_FLAG_ENCODE = 0;
-jfieldID MediaCodec::jCRYPTO_MODE_AES_CTR = 0;
-jfieldID MediaCodec::jCRYPTO_MODE_UNENCRYPTED = 0;
-jfieldID MediaCodec::jINFO_OUTPUT_BUFFERS_CHANGED = 0;
-jfieldID MediaCodec::jINFO_OUTPUT_FORMAT_CHANGED = 0;
-jfieldID MediaCodec::jINFO_TRY_AGAIN_LATER = 0;
-jfieldID MediaCodec::jVIDEO_SCALING_MODE_SCALE_TO_FIT = 0;
-jfieldID MediaCodec::jVIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 0;
-void MediaCodec::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mMediaCodecClass = getClassGlobalRef("android/media/MediaCodec");
-    jConfigure = getMethod("configure", "(Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V");
-    jCreateByCodecName = getStaticMethod("createByCodecName", "(Ljava/lang/String;)Landroid/media/MediaCodec;");
-    jCreateDecoderByType = getStaticMethod("createDecoderByType", "(Ljava/lang/String;)Landroid/media/MediaCodec;");
-    jCreateEncoderByType = getStaticMethod("createEncoderByType", "(Ljava/lang/String;)Landroid/media/MediaCodec;");
-    jDequeueInputBuffer = getMethod("dequeueInputBuffer", "(J)I");
-    jDequeueOutputBuffer = getMethod("dequeueOutputBuffer", "(Landroid/media/MediaCodec$BufferInfo;J)I");
-    jFinalize = getMethod("finalize", "()V");
-    jFlush = getMethod("flush", "()V");
-    jGetInputBuffers = getMethod("getInputBuffers", "()[Ljava/nio/ByteBuffer;");
-    jGetOutputBuffers = getMethod("getOutputBuffers", "()[Ljava/nio/ByteBuffer;");
-    jGetOutputFormat = getMethod("getOutputFormat", "()Landroid/media/MediaFormat;");
-    jQueueInputBuffer = getMethod("queueInputBuffer", "(IIIJI)V");
-    jQueueSecureInputBuffer = getMethod("queueSecureInputBuffer", "(IILandroid/media/MediaCodec$CryptoInfo;JI)V");
-    jRelease = getMethod("release", "()V");
-    jReleaseOutputBuffer = getMethod("releaseOutputBuffer", "(IZ)V");
-    jSetVideoScalingMode = getMethod("setVideoScalingMode", "(I)V");
-    jStart = getMethod("start", "()V");
-    jStop = getMethod("stop", "()V");
-    jBUFFER_FLAG_CODEC_CONFIG = getStaticField("BUFFER_FLAG_CODEC_CONFIG", "I");
-    jBUFFER_FLAG_END_OF_STREAM = getStaticField("BUFFER_FLAG_END_OF_STREAM", "I");
-    jBUFFER_FLAG_SYNC_FRAME = getStaticField("BUFFER_FLAG_SYNC_FRAME", "I");
-    jCONFIGURE_FLAG_ENCODE = getStaticField("CONFIGURE_FLAG_ENCODE", "I");
-    jCRYPTO_MODE_AES_CTR = getStaticField("CRYPTO_MODE_AES_CTR", "I");
-    jCRYPTO_MODE_UNENCRYPTED = getStaticField("CRYPTO_MODE_UNENCRYPTED", "I");
-    jINFO_OUTPUT_BUFFERS_CHANGED = getStaticField("INFO_OUTPUT_BUFFERS_CHANGED", "I");
-    jINFO_OUTPUT_FORMAT_CHANGED = getStaticField("INFO_OUTPUT_FORMAT_CHANGED", "I");
-    jINFO_TRY_AGAIN_LATER = getStaticField("INFO_TRY_AGAIN_LATER", "I");
-    jVIDEO_SCALING_MODE_SCALE_TO_FIT = getStaticField("VIDEO_SCALING_MODE_SCALE_TO_FIT", "I");
-    jVIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = getStaticField("VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING", "I");
-}
-
-MediaCodec* MediaCodec::Wrap(jobject obj) {
-    JNIEnv *env = GetJNIForThread();
-    MediaCodec* ret = new MediaCodec(obj, env);
-    env->DeleteLocalRef(obj);
-    return ret;
-}
-
-bool MediaCodec::Configure(jobject a0, jobject a1, jobject a2, int32_t a3) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(3) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[4];
-    args[0].l = a0;
-    args[1].l = a1;
-    args[2].l = a2;
-    args[3].i = a3;
-
-    env->CallVoidMethodA(wrapped_obj, jConfigure, args);
-    if (env->ExceptionCheck()) {
-        env->ExceptionClear();
-        env->PopLocalFrame(nullptr);
-        return false;
-    }
-    env->PopLocalFrame(nullptr);
-    return true;
-}
-
-jobject MediaCodec::CreateByCodecName(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    jobject temp = env->CallStaticObjectMethod(mMediaCodecClass, jCreateByCodecName, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject MediaCodec::CreateDecoderByType(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    jobject temp = env->CallStaticObjectMethod(mMediaCodecClass, jCreateDecoderByType, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject MediaCodec::CreateEncoderByType(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    jobject temp = env->CallStaticObjectMethod(mMediaCodecClass, jCreateEncoderByType, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-int32_t MediaCodec::DequeueInputBuffer(int64_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jDequeueInputBuffer, a0);
-    if (env->ExceptionCheck()) {
-        env->ExceptionClear();
-        env->PopLocalFrame(nullptr);
-        return MEDIACODEC_EXCEPTION_INDEX;
-    }
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int32_t MediaCodec::DequeueOutputBuffer(jobject a0, int64_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jDequeueOutputBuffer, a0, a1);
-    if (env->ExceptionCheck()) {
-        env->ExceptionClear();
-        env->PopLocalFrame(nullptr);
-        return MEDIACODEC_EXCEPTION_INDEX;
-    }
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-void MediaCodec::Finalize() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jFinalize);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaCodec::Flush() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jFlush);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-jobjectArray MediaCodec::GetInputBuffers() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jGetInputBuffers);
-    AndroidBridge::HandleUncaughtException(env);
-    jobjectArray ret = static_cast<jobjectArray>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobjectArray MediaCodec::GetOutputBuffers() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jGetOutputBuffers);
-    AndroidBridge::HandleUncaughtException(env);
-    jobjectArray ret = static_cast<jobjectArray>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject MediaCodec::GetOutputFormat() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jGetOutputFormat);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-void MediaCodec::QueueInputBuffer(int32_t a0, int32_t a1, int32_t a2, int64_t a3, int32_t a4) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(5) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[5];
-    args[0].i = a0;
-    args[1].i = a1;
-    args[2].i = a2;
-    args[3].j = a3;
-    args[4].i = a4;
-
-    env->CallVoidMethodA(wrapped_obj, jQueueInputBuffer, args);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaCodec::QueueSecureInputBuffer(int32_t a0, int32_t a1, jobject a2, int64_t a3, int32_t a4) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[5];
-    args[0].i = a0;
-    args[1].i = a1;
-    args[2].l = a2;
-    args[3].j = a3;
-    args[4].i = a4;
-
-    env->CallVoidMethodA(wrapped_obj, jQueueSecureInputBuffer, args);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaCodec::Release() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jRelease);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaCodec::ReleaseOutputBuffer(int32_t a0, bool a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jReleaseOutputBuffer, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaCodec::SetVideoScalingMode(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jSetVideoScalingMode, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-bool MediaCodec::Start() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jStart);
-    if (env->ExceptionCheck()) {
-        env->ExceptionClear();
-        env->PopLocalFrame(nullptr);
-        return false;
-    }
-    env->PopLocalFrame(nullptr);
-    return true;
-}
-
-void MediaCodec::Stop() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, jStop);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-int32_t MediaCodec::getBUFFER_FLAG_CODEC_CONFIG() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jBUFFER_FLAG_CODEC_CONFIG);
-}
-
-int32_t MediaCodec::getBUFFER_FLAG_END_OF_STREAM() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jBUFFER_FLAG_END_OF_STREAM);
-}
-
-int32_t MediaCodec::getBUFFER_FLAG_SYNC_FRAME() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jBUFFER_FLAG_SYNC_FRAME);
-}
-
-int32_t MediaCodec::getCONFIGURE_FLAG_ENCODE() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jCONFIGURE_FLAG_ENCODE);
-}
-
-int32_t MediaCodec::getCRYPTO_MODE_AES_CTR() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jCRYPTO_MODE_AES_CTR);
-}
-
-int32_t MediaCodec::getCRYPTO_MODE_UNENCRYPTED() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jCRYPTO_MODE_UNENCRYPTED);
-}
-
-int32_t MediaCodec::getINFO_OUTPUT_BUFFERS_CHANGED() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jINFO_OUTPUT_BUFFERS_CHANGED);
-}
-
-int32_t MediaCodec::getINFO_OUTPUT_FORMAT_CHANGED() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jINFO_OUTPUT_FORMAT_CHANGED);
-}
-
-int32_t MediaCodec::getINFO_TRY_AGAIN_LATER() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jINFO_TRY_AGAIN_LATER);
-}
-
-int32_t MediaCodec::getVIDEO_SCALING_MODE_SCALE_TO_FIT() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jVIDEO_SCALING_MODE_SCALE_TO_FIT);
-}
-
-int32_t MediaCodec::getVIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetStaticIntField(mMediaCodecClass, jVIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
-}
-jclass MediaFormat::mMediaFormatClass = 0;
-jmethodID MediaFormat::jMediaFormat = 0;
-jmethodID MediaFormat::jContainsKey = 0;
-jmethodID MediaFormat::jCreateAudioFormat = 0;
-jmethodID MediaFormat::jCreateVideoFormat = 0;
-jmethodID MediaFormat::jGetByteBuffer = 0;
-jmethodID MediaFormat::jGetFloat = 0;
-jmethodID MediaFormat::jGetInteger = 0;
-jmethodID MediaFormat::jGetLong = 0;
-jmethodID MediaFormat::jGetString = 0;
-jmethodID MediaFormat::jSetByteBuffer = 0;
-jmethodID MediaFormat::jSetFloat = 0;
-jmethodID MediaFormat::jSetInteger = 0;
-jmethodID MediaFormat::jSetLong = 0;
-jmethodID MediaFormat::jSetString = 0;
-jmethodID MediaFormat::jToString = 0;
-jfieldID MediaFormat::jKEY_AAC_PROFILE = 0;
-jfieldID MediaFormat::jKEY_BIT_RATE = 0;
-jfieldID MediaFormat::jKEY_CHANNEL_COUNT = 0;
-jfieldID MediaFormat::jKEY_CHANNEL_MASK = 0;
-jfieldID MediaFormat::jKEY_COLOR_FORMAT = 0;
-jfieldID MediaFormat::jKEY_DURATION = 0;
-jfieldID MediaFormat::jKEY_FLAC_COMPRESSION_LEVEL = 0;
-jfieldID MediaFormat::jKEY_FRAME_RATE = 0;
-jfieldID MediaFormat::jKEY_HEIGHT = 0;
-jfieldID MediaFormat::jKEY_IS_ADTS = 0;
-jfieldID MediaFormat::jKEY_I_FRAME_INTERVAL = 0;
-jfieldID MediaFormat::jKEY_MAX_INPUT_SIZE = 0;
-jfieldID MediaFormat::jKEY_MIME = 0;
-jfieldID MediaFormat::jKEY_SAMPLE_RATE = 0;
-jfieldID MediaFormat::jKEY_WIDTH = 0;
-void MediaFormat::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mMediaFormatClass = getClassGlobalRef("android/media/MediaFormat");
-    jMediaFormat = getMethod("<init>", "()V");
-    jContainsKey = getMethod("containsKey", "(Ljava/lang/String;)Z");
-    jCreateAudioFormat = getStaticMethod("createAudioFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;");
-    jCreateVideoFormat = getStaticMethod("createVideoFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;");
-    jGetByteBuffer = getMethod("getByteBuffer", "(Ljava/lang/String;)Ljava/nio/ByteBuffer;");
-    jGetFloat = getMethod("getFloat", "(Ljava/lang/String;)F");
-    jGetInteger = getMethod("getInteger", "(Ljava/lang/String;)I");
-    jGetLong = getMethod("getLong", "(Ljava/lang/String;)J");
-    jGetString = getMethod("getString", "(Ljava/lang/String;)Ljava/lang/String;");
-    jSetByteBuffer = getMethod("setByteBuffer", "(Ljava/lang/String;Ljava/nio/ByteBuffer;)V");
-    jSetFloat = getMethod("setFloat", "(Ljava/lang/String;F)V");
-    jSetInteger = getMethod("setInteger", "(Ljava/lang/String;I)V");
-    jSetLong = getMethod("setLong", "(Ljava/lang/String;J)V");
-    jSetString = getMethod("setString", "(Ljava/lang/String;Ljava/lang/String;)V");
-    jToString = getMethod("toString", "()Ljava/lang/String;");
-    jKEY_AAC_PROFILE = getStaticField("KEY_AAC_PROFILE", "Ljava/lang/String;");
-    jKEY_BIT_RATE = getStaticField("KEY_BIT_RATE", "Ljava/lang/String;");
-    jKEY_CHANNEL_COUNT = getStaticField("KEY_CHANNEL_COUNT", "Ljava/lang/String;");
-    jKEY_CHANNEL_MASK = getStaticField("KEY_CHANNEL_MASK", "Ljava/lang/String;");
-    jKEY_COLOR_FORMAT = getStaticField("KEY_COLOR_FORMAT", "Ljava/lang/String;");
-    jKEY_DURATION = getStaticField("KEY_DURATION", "Ljava/lang/String;");
-    jKEY_FLAC_COMPRESSION_LEVEL = getStaticField("KEY_FLAC_COMPRESSION_LEVEL", "Ljava/lang/String;");
-    jKEY_FRAME_RATE = getStaticField("KEY_FRAME_RATE", "Ljava/lang/String;");
-    jKEY_HEIGHT = getStaticField("KEY_HEIGHT", "Ljava/lang/String;");
-    jKEY_IS_ADTS = getStaticField("KEY_IS_ADTS", "Ljava/lang/String;");
-    jKEY_I_FRAME_INTERVAL = getStaticField("KEY_I_FRAME_INTERVAL", "Ljava/lang/String;");
-    jKEY_MAX_INPUT_SIZE = getStaticField("KEY_MAX_INPUT_SIZE", "Ljava/lang/String;");
-    jKEY_MIME = getStaticField("KEY_MIME", "Ljava/lang/String;");
-    jKEY_SAMPLE_RATE = getStaticField("KEY_SAMPLE_RATE", "Ljava/lang/String;");
-    jKEY_WIDTH = getStaticField("KEY_WIDTH", "Ljava/lang/String;");
-}
-
-MediaFormat* MediaFormat::Wrap(jobject obj) {
-    JNIEnv *env = GetJNIForThread();
-    MediaFormat* ret = new MediaFormat(obj, env);
-    env->DeleteLocalRef(obj);
-    return ret;
-}
-
-MediaFormat::MediaFormat() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    Init(env->NewObject(mMediaFormatClass, jMediaFormat), env);
-    env->PopLocalFrame(nullptr);
-}
-
-bool MediaFormat::ContainsKey(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    bool temp = env->CallBooleanMethod(wrapped_obj, jContainsKey, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jobject MediaFormat::CreateAudioFormat(const nsAString& a0, int32_t a1, int32_t a2) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[3];
-    args[0].l = AndroidBridge::NewJavaString(env, a0);
-    args[1].i = a1;
-    args[2].i = a2;
-
-    jobject temp = env->CallStaticObjectMethodA(mMediaFormatClass, jCreateAudioFormat, args);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject MediaFormat::CreateVideoFormat(const nsAString& a0, int32_t a1, int32_t a2) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[3];
-    args[0].l = AndroidBridge::NewJavaString(env, a0);
-    args[1].i = a1;
-    args[2].i = a2;
-
-    jobject temp = env->CallStaticObjectMethodA(mMediaFormatClass, jCreateVideoFormat, args);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject MediaFormat::GetByteBuffer(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jGetByteBuffer, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jfloat MediaFormat::GetFloat(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    jfloat temp = env->CallFloatMethod(wrapped_obj, jGetFloat, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int32_t MediaFormat::GetInteger(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jGetInteger, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int64_t MediaFormat::GetLong(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    int64_t temp = env->CallLongMethod(wrapped_obj, jGetLong, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jstring MediaFormat::GetString(const nsAString& a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jGetString, j0);
-    AndroidBridge::HandleUncaughtException(env);
-    jstring ret = static_cast<jstring>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-void MediaFormat::SetByteBuffer(const nsAString& a0, jobject a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    env->CallVoidMethod(wrapped_obj, jSetByteBuffer, j0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaFormat::SetFloat(const nsAString& a0, jfloat a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    env->CallVoidMethod(wrapped_obj, jSetFloat, j0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaFormat::SetInteger(const nsAString& a0, int32_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    env->CallVoidMethod(wrapped_obj, jSetInteger, j0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaFormat::SetLong(const nsAString& a0, int64_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-
-    env->CallVoidMethod(wrapped_obj, jSetLong, j0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-void MediaFormat::SetString(const nsAString& a0, const nsAString& a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jstring j0 = AndroidBridge::NewJavaString(env, a0);
-    jstring j1 = AndroidBridge::NewJavaString(env, a1);
-
-    env->CallVoidMethod(wrapped_obj, jSetString, j0, j1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-jstring MediaFormat::ToString() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jToString);
-    AndroidBridge::HandleUncaughtException(env);
-    jstring ret = static_cast<jstring>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jstring MediaFormat::getKEY_AAC_PROFILE() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_AAC_PROFILE));
-}
-
-jstring MediaFormat::getKEY_BIT_RATE() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_BIT_RATE));
-}
-
-jstring MediaFormat::getKEY_CHANNEL_COUNT() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_CHANNEL_COUNT));
-}
-
-jstring MediaFormat::getKEY_CHANNEL_MASK() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_CHANNEL_MASK));
-}
-
-jstring MediaFormat::getKEY_COLOR_FORMAT() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_COLOR_FORMAT));
-}
-
-jstring MediaFormat::getKEY_DURATION() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_DURATION));
-}
-
-jstring MediaFormat::getKEY_FLAC_COMPRESSION_LEVEL() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_FLAC_COMPRESSION_LEVEL));
-}
-
-jstring MediaFormat::getKEY_FRAME_RATE() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_FRAME_RATE));
-}
-
-jstring MediaFormat::getKEY_HEIGHT() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_HEIGHT));
-}
-
-jstring MediaFormat::getKEY_IS_ADTS() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_IS_ADTS));
-}
-
-jstring MediaFormat::getKEY_I_FRAME_INTERVAL() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_I_FRAME_INTERVAL));
-}
-
-jstring MediaFormat::getKEY_MAX_INPUT_SIZE() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_MAX_INPUT_SIZE));
-}
-
-jstring MediaFormat::getKEY_MIME() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_MIME));
-}
-
-jstring MediaFormat::getKEY_SAMPLE_RATE() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_SAMPLE_RATE));
-}
-
-jstring MediaFormat::getKEY_WIDTH() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jstring>(env->GetStaticObjectField(mMediaFormatClass, jKEY_WIDTH));
-}
-jclass ByteBuffer::mByteBufferClass = 0;
-jmethodID ByteBuffer::j_get = 0;
-jmethodID ByteBuffer::j_put = 0;
-jmethodID ByteBuffer::jAllocate = 0;
-jmethodID ByteBuffer::jAllocateDirect = 0;
-jmethodID ByteBuffer::jArray = 0;
-jmethodID ByteBuffer::jArray1 = 0;
-jmethodID ByteBuffer::jArrayOffset = 0;
-jmethodID ByteBuffer::jAsCharBuffer = 0;
-jmethodID ByteBuffer::jAsDoubleBuffer = 0;
-jmethodID ByteBuffer::jAsFloatBuffer = 0;
-jmethodID ByteBuffer::jAsIntBuffer = 0;
-jmethodID ByteBuffer::jAsLongBuffer = 0;
-jmethodID ByteBuffer::jAsReadOnlyBuffer = 0;
-jmethodID ByteBuffer::jAsShortBuffer = 0;
-jmethodID ByteBuffer::jCompact = 0;
-jmethodID ByteBuffer::jCompareTo = 0;
-jmethodID ByteBuffer::jCompareTo1 = 0;
-jmethodID ByteBuffer::jDuplicate = 0;
-jmethodID ByteBuffer::jEquals = 0;
-jmethodID ByteBuffer::jGet = 0;
-jmethodID ByteBuffer::jGet1 = 0;
-jmethodID ByteBuffer::jGet10 = 0;
-jmethodID ByteBuffer::jGet11 = 0;
-jmethodID ByteBuffer::jGetChar = 0;
-jmethodID ByteBuffer::jGetChar1 = 0;
-jmethodID ByteBuffer::jGetDouble = 0;
-jmethodID ByteBuffer::jGetDouble1 = 0;
-jmethodID ByteBuffer::jGetFloat = 0;
-jmethodID ByteBuffer::jGetFloat1 = 0;
-jmethodID ByteBuffer::jGetInt = 0;
-jmethodID ByteBuffer::jGetInt1 = 0;
-jmethodID ByteBuffer::jGetLong = 0;
-jmethodID ByteBuffer::jGetLong1 = 0;
-jmethodID ByteBuffer::jGetShort = 0;
-jmethodID ByteBuffer::jGetShort1 = 0;
-jmethodID ByteBuffer::jHasArray = 0;
-jmethodID ByteBuffer::jHashCode = 0;
-jmethodID ByteBuffer::jIsDirect = 0;
-jmethodID ByteBuffer::jOrder = 0;
-jmethodID ByteBuffer::jOrder1 = 0;
-jmethodID ByteBuffer::jPut = 0;
-jmethodID ByteBuffer::jPut1 = 0;
-jmethodID ByteBuffer::jPut12 = 0;
-jmethodID ByteBuffer::jPut13 = 0;
-jmethodID ByteBuffer::jPut14 = 0;
-jmethodID ByteBuffer::jPutChar = 0;
-jmethodID ByteBuffer::jPutChar1 = 0;
-jmethodID ByteBuffer::jPutDouble = 0;
-jmethodID ByteBuffer::jPutDouble1 = 0;
-jmethodID ByteBuffer::jPutFloat = 0;
-jmethodID ByteBuffer::jPutFloat1 = 0;
-jmethodID ByteBuffer::jPutInt = 0;
-jmethodID ByteBuffer::jPutInt1 = 0;
-jmethodID ByteBuffer::jPutLong = 0;
-jmethodID ByteBuffer::jPutLong1 = 0;
-jmethodID ByteBuffer::jPutShort = 0;
-jmethodID ByteBuffer::jPutShort1 = 0;
-jmethodID ByteBuffer::jSlice = 0;
-jmethodID ByteBuffer::jToString = 0;
-jmethodID ByteBuffer::jWrap = 0;
-jmethodID ByteBuffer::jWrap1 = 0;
-jfieldID ByteBuffer::jBigEndian = 0;
-jfieldID ByteBuffer::jHb = 0;
-jfieldID ByteBuffer::jIsReadOnly = 0;
-jfieldID ByteBuffer::jNativeByteOrder = 0;
-jfieldID ByteBuffer::jOffset = 0;
-void ByteBuffer::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mByteBufferClass = getClassGlobalRef("java/nio/ByteBuffer");
-    //j_get = getMethod("_get", "(I)B");
-    //j_put = getMethod("_put", "(IB)V");
-    jAllocate = getStaticMethod("allocate", "(I)Ljava/nio/ByteBuffer;");
-    jAllocateDirect = getStaticMethod("allocateDirect", "(I)Ljava/nio/ByteBuffer;");
-    jArray = getMethod("array", "()Ljava/lang/Object;");
-    jArray1 = getMethod("array", "()[B");
-    jArrayOffset = getMethod("arrayOffset", "()I");
-    jAsCharBuffer = getMethod("asCharBuffer", "()Ljava/nio/CharBuffer;");
-    jAsDoubleBuffer = getMethod("asDoubleBuffer", "()Ljava/nio/DoubleBuffer;");
-    jAsFloatBuffer = getMethod("asFloatBuffer", "()Ljava/nio/FloatBuffer;");
-    jAsIntBuffer = getMethod("asIntBuffer", "()Ljava/nio/IntBuffer;");
-    jAsLongBuffer = getMethod("asLongBuffer", "()Ljava/nio/LongBuffer;");
-    jAsReadOnlyBuffer = getMethod("asReadOnlyBuffer", "()Ljava/nio/ByteBuffer;");
-    jAsShortBuffer = getMethod("asShortBuffer", "()Ljava/nio/ShortBuffer;");
-    jCompact = getMethod("compact", "()Ljava/nio/ByteBuffer;");
-    jCompareTo = getMethod("compareTo", "(Ljava/lang/Object;)I");
-    jCompareTo1 = getMethod("compareTo", "(Ljava/nio/ByteBuffer;)I");
-    jDuplicate = getMethod("duplicate", "()Ljava/nio/ByteBuffer;");
-    jEquals = getMethod("equals", "(Ljava/lang/Object;)Z");
-    jGet = getMethod("get", "()B");
-    jGet1 = getMethod("get", "(I)B");
-    jGet10 = getMethod("get", "([B)Ljava/nio/ByteBuffer;");
-    jGet11 = getMethod("get", "([BII)Ljava/nio/ByteBuffer;");
-    jGetChar = getMethod("getChar", "()C");
-    jGetChar1 = getMethod("getChar", "(I)C");
-    jGetDouble = getMethod("getDouble", "()D");
-    jGetDouble1 = getMethod("getDouble", "(I)D");
-    jGetFloat = getMethod("getFloat", "()F");
-    jGetFloat1 = getMethod("getFloat", "(I)F");
-    jGetInt = getMethod("getInt", "()I");
-    jGetInt1 = getMethod("getInt", "(I)I");
-    jGetLong = getMethod("getLong", "()J");
-    jGetLong1 = getMethod("getLong", "(I)J");
-    jGetShort = getMethod("getShort", "()S");
-    jGetShort1 = getMethod("getShort", "(I)S");
-    jHasArray = getMethod("hasArray", "()Z");
-    jHashCode = getMethod("hashCode", "()I");
-    jIsDirect = getMethod("isDirect", "()Z");
-    jOrder = getMethod("order", "()Ljava/nio/ByteOrder;");
-    jOrder1 = getMethod("order", "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;");
-    jPut = getMethod("put", "(B)Ljava/nio/ByteBuffer;");
-    jPut1 = getMethod("put", "(IB)Ljava/nio/ByteBuffer;");
-    jPut12 = getMethod("put", "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;");
-    jPut13 = getMethod("put", "([B)Ljava/nio/ByteBuffer;");
-    jPut14 = getMethod("put", "([BII)Ljava/nio/ByteBuffer;");
-    jPutChar = getMethod("putChar", "(C)Ljava/nio/ByteBuffer;");
-    jPutChar1 = getMethod("putChar", "(IC)Ljava/nio/ByteBuffer;");
-    jPutDouble = getMethod("putDouble", "(D)Ljava/nio/ByteBuffer;");
-    jPutDouble1 = getMethod("putDouble", "(ID)Ljava/nio/ByteBuffer;");
-    jPutFloat = getMethod("putFloat", "(F)Ljava/nio/ByteBuffer;");
-    jPutFloat1 = getMethod("putFloat", "(IF)Ljava/nio/ByteBuffer;");
-    jPutInt = getMethod("putInt", "(I)Ljava/nio/ByteBuffer;");
-    jPutInt1 = getMethod("putInt", "(II)Ljava/nio/ByteBuffer;");
-    jPutLong = getMethod("putLong", "(IJ)Ljava/nio/ByteBuffer;");
-    jPutLong1 = getMethod("putLong", "(J)Ljava/nio/ByteBuffer;");
-    jPutShort = getMethod("putShort", "(IS)Ljava/nio/ByteBuffer;");
-    jPutShort1 = getMethod("putShort", "(S)Ljava/nio/ByteBuffer;");
-    jSlice = getMethod("slice", "()Ljava/nio/ByteBuffer;");
-    jToString = getMethod("toString", "()Ljava/lang/String;");
-    jWrap = getStaticMethod("wrap", "([B)Ljava/nio/ByteBuffer;");
-    jWrap1 = getStaticMethod("wrap", "([BII)Ljava/nio/ByteBuffer;");
-    /*
-    jBigEndian = getField("bigEndian", "Z");
-    jHb = getField("hb", "[B");
-    jIsReadOnly = getField("isReadOnly", "Z");
-    jNativeByteOrder = getField("nativeByteOrder", "Z");
-    jOffset = getField("offset", "I");
-  */
-}
-
-ByteBuffer* ByteBuffer::Wrap(jobject obj) {
-    JNIEnv *env = GetJNIForThread();
-    ByteBuffer* ret = new ByteBuffer(obj, env);
-    env->DeleteLocalRef(obj);
-    return ret;
-}
-
-int8_t ByteBuffer::_get(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int8_t temp = env->CallByteMethod(wrapped_obj, j_get, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-void ByteBuffer::_put(int32_t a0, int8_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    env->CallVoidMethod(wrapped_obj, j_put, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-jobject ByteBuffer::Allocate(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallStaticObjectMethod(mByteBufferClass, jAllocate, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AllocateDirect(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallStaticObjectMethod(mByteBufferClass, jAllocateDirect, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Array() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jArray);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jbyteArray ByteBuffer::Array1() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jArray1);
-    AndroidBridge::HandleUncaughtException(env);
-    jbyteArray ret = static_cast<jbyteArray>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-int32_t ByteBuffer::ArrayOffset() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jArrayOffset);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jstring ByteBuffer::AsCharBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsCharBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jstring ret = static_cast<jstring>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AsDoubleBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsDoubleBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AsFloatBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsFloatBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AsIntBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsIntBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AsLongBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsLongBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AsReadOnlyBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsReadOnlyBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::AsShortBuffer() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jAsShortBuffer);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Compact() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jCompact);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-int32_t ByteBuffer::CompareTo(jobject a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jCompareTo, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int32_t ByteBuffer::CompareTo1(jobject a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jCompareTo1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jobject ByteBuffer::Duplicate() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jDuplicate);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-bool ByteBuffer::Equals(jobject a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    bool temp = env->CallBooleanMethod(wrapped_obj, jEquals, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int8_t ByteBuffer::Get() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int8_t temp = env->CallByteMethod(wrapped_obj, jGet);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int8_t ByteBuffer::Get1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int8_t temp = env->CallByteMethod(wrapped_obj, jGet1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jobject ByteBuffer::Get1(jbyteArray a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jGet10, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Get1(jbyteArray a0, int32_t a1, int32_t a2) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[3];
-    args[0].l = a0;
-    args[1].i = a1;
-    args[2].i = a2;
-
-    jobject temp = env->CallObjectMethodA(wrapped_obj, jGet11, args);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-uint16_t ByteBuffer::GetChar() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    uint16_t temp = env->CallCharMethod(wrapped_obj, jGetChar);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-uint16_t ByteBuffer::GetChar1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    uint16_t temp = env->CallCharMethod(wrapped_obj, jGetChar1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jdouble ByteBuffer::GetDouble() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jdouble temp = env->CallDoubleMethod(wrapped_obj, jGetDouble);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jdouble ByteBuffer::GetDouble1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jdouble temp = env->CallDoubleMethod(wrapped_obj, jGetDouble1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jfloat ByteBuffer::GetFloat() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jfloat temp = env->CallFloatMethod(wrapped_obj, jGetFloat);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jfloat ByteBuffer::GetFloat1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jfloat temp = env->CallFloatMethod(wrapped_obj, jGetFloat1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int32_t ByteBuffer::GetInt() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jGetInt);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int32_t ByteBuffer::GetInt1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jGetInt1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int64_t ByteBuffer::GetLong() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int64_t temp = env->CallLongMethod(wrapped_obj, jGetLong);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int64_t ByteBuffer::GetLong1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int64_t temp = env->CallLongMethod(wrapped_obj, jGetLong1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int16_t ByteBuffer::GetShort() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int16_t temp = env->CallShortMethod(wrapped_obj, jGetShort);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int16_t ByteBuffer::GetShort1(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int16_t temp = env->CallShortMethod(wrapped_obj, jGetShort1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-bool ByteBuffer::HasArray() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    bool temp = env->CallBooleanMethod(wrapped_obj, jHasArray);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-int32_t ByteBuffer::HashCode() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    int32_t temp = env->CallIntMethod(wrapped_obj, jHashCode);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-bool ByteBuffer::IsDirect() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    bool temp = env->CallBooleanMethod(wrapped_obj, jIsDirect);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-    return temp;
-}
-
-jobject ByteBuffer::Order() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jOrder);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Order1(jobject a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jOrder1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Put(int8_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPut, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Put1(int32_t a0, int8_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPut1, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Put1(jobject a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPut12, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Put1(jbyteArray a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPut13, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Put1(jbyteArray a0, int32_t a1, int32_t a2) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[3];
-    args[0].l = a0;
-    args[1].i = a1;
-    args[2].i = a2;
-
-    jobject temp = env->CallObjectMethodA(wrapped_obj, jPut14, args);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutChar(uint16_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutChar, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutChar1(int32_t a0, uint16_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutChar1, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutDouble(jdouble a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutDouble, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutDouble1(int32_t a0, jdouble a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutDouble1, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutFloat(jfloat a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutFloat, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutFloat1(int32_t a0, jfloat a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutFloat1, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutInt(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutInt, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutInt1(int32_t a0, int32_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutInt1, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutLong(int32_t a0, int64_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutLong, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutLong1(int64_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutLong1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutShort(int32_t a0, int16_t a1) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutShort, a0, a1);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::PutShort1(int16_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jPutShort1, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Slice() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jSlice);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jstring ByteBuffer::ToString() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(1) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallObjectMethod(wrapped_obj, jToString);
-    AndroidBridge::HandleUncaughtException(env);
-    jstring ret = static_cast<jstring>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Wrap1(jbyteArray a0) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jobject temp = env->CallStaticObjectMethod(mByteBufferClass, jWrap, a0);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-jobject ByteBuffer::Wrap2(jbyteArray a0, int32_t a1, int32_t a2) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(2) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[3];
-    args[0].l = a0;
-    args[1].i = a1;
-    args[2].i = a2;
-
-    jobject temp = env->CallStaticObjectMethodA(mByteBufferClass, jWrap1, args);
-    AndroidBridge::HandleUncaughtException(env);
-    jobject ret = static_cast<jobject>(env->PopLocalFrame(temp));
-    return ret;
-}
-
-bool ByteBuffer::getBigEndian() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetBooleanField(wrapped_obj, jBigEndian);
-}
-
-void ByteBuffer::setBigEndian(bool a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetBooleanField(wrapped_obj, jBigEndian, a0);
-}
-
-jbyteArray ByteBuffer::getHb() {
-    JNIEnv *env = GetJNIForThread();
-    return static_cast<jbyteArray>(env->GetObjectField(wrapped_obj, jHb));
-}
-
-bool ByteBuffer::getIsReadOnly() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetBooleanField(wrapped_obj, jIsReadOnly);
-}
-
-void ByteBuffer::setIsReadOnly(bool a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetBooleanField(wrapped_obj, jIsReadOnly, a0);
-}
-
-bool ByteBuffer::getNativeByteOrder() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetBooleanField(wrapped_obj, jNativeByteOrder);
-}
-
-void ByteBuffer::setNativeByteOrder(bool a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetBooleanField(wrapped_obj, jNativeByteOrder, a0);
-}
-
-int32_t ByteBuffer::getOffset() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetIntField(wrapped_obj, jOffset);
-}
-
-jclass BufferInfo::mBufferInfoClass = 0;
-jmethodID BufferInfo::jBufferInfo = 0;
-jmethodID BufferInfo::jSet = 0;
-jfieldID BufferInfo::jFlags = 0;
-jfieldID BufferInfo::jOffset = 0;
-jfieldID BufferInfo::jPresentationTimeUs = 0;
-jfieldID BufferInfo::jSize = 0;
-void BufferInfo::InitStubs(JNIEnv *jEnv) {
-    initInit();
-
-    mBufferInfoClass = getClassGlobalRef("android/media/MediaCodec$BufferInfo");
-    jBufferInfo = getMethod("<init>", "()V");
-    jSet = getMethod("set", "(IIJI)V");
-    jFlags = getField("flags", "I");
-    jOffset = getField("offset", "I");
-    jPresentationTimeUs = getField("presentationTimeUs", "J");
-    jSize = getField("size", "I");
-}
-
-BufferInfo* BufferInfo::Wrap(jobject obj) {
-    JNIEnv *env = GetJNIForThread();
-    BufferInfo* ret = new BufferInfo(obj, env);
-    env->DeleteLocalRef(obj);
-    return ret;
-}
-
-BufferInfo::BufferInfo() {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    Init(env->NewObject(mBufferInfoClass, jBufferInfo), env);
-    env->PopLocalFrame(nullptr);
-}
-
-void BufferInfo::Set(int32_t a0, int32_t a1, int64_t a2, int32_t a3) {
-    JNIEnv *env = GetJNIForThread();
-    if (env->PushLocalFrame(0) != 0) {
-        AndroidBridge::HandleUncaughtException(env);
-        MOZ_CRASH("Exception should have caused crash.");
-    }
-
-    jvalue args[4];
-    args[0].i = a0;
-    args[1].i = a1;
-    args[2].j = a2;
-    args[3].i = a3;
-
-    env->CallVoidMethodA(wrapped_obj, jSet, args);
-    AndroidBridge::HandleUncaughtException(env);
-    env->PopLocalFrame(nullptr);
-}
-
-int32_t BufferInfo::getFlags() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetIntField(wrapped_obj, jFlags);
-}
-
-void BufferInfo::setFlags(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetIntField(wrapped_obj, jFlags, a0);
-}
-
-int32_t BufferInfo::getOffset() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetIntField(wrapped_obj, jOffset);
-}
-
-void BufferInfo::setOffset(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetIntField(wrapped_obj, jOffset, a0);
-}
-
-int64_t BufferInfo::getPresentationTimeUs() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetLongField(wrapped_obj, jPresentationTimeUs);
-}
-
-void BufferInfo::setPresentationTimeUs(int64_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetLongField(wrapped_obj, jPresentationTimeUs, a0);
-}
-
-int32_t BufferInfo::getSize() {
-    JNIEnv *env = GetJNIForThread();
-    return env->GetIntField(wrapped_obj, jSize);
-}
-
-void BufferInfo::setSize(int32_t a0) {
-    JNIEnv *env = GetJNIForThread();
-    env->SetIntField(wrapped_obj, jSize, a0);
-}
-
-void InitSDKStubs(JNIEnv *jEnv) {
-    MediaCodec::InitStubs(jEnv);
-    MediaFormat::InitStubs(jEnv);
-    ByteBuffer::InitStubs(jEnv);
-    BufferInfo::InitStubs(jEnv);
-}
-} /* android */
-} /* widget */
-} /* mozilla */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedSDKWrappers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedSDKWrappers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/GeneratedSDKWrappers.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/GeneratedSDKWrappers.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,335 +0,0 @@
-// GENERATED CODE
-
-// NOTE: This code has been doctored. The JarClassProcessor is still a work in progress,
-// and so additions and deletions have been made to make this file valid.
-
-// Generated by the Java program at /build/jarClassProcessors at compile time from
-// a given set of jars and a set of requested methods. To update, change the annotations
-// on the corresponding Java methods and rerun the build. Manually updating this file
-// will cause your build to fail.
-
-#ifndef GeneratedSDKWrappers_h__
-#define GeneratedSDKWrappers_h__
-
-#include "nsXPCOMStrings.h"
-#include "AndroidJavaWrappers.h"
-
-namespace mozilla {
-namespace widget {
-namespace android {
-
-#define MEDIACODEC_EXCEPTION_INDEX -255
-
-void InitSDKStubs(JNIEnv *jEnv);
-
-class MediaCodec : public AutoGlobalWrappedJavaObject {
-public:
-    static void InitStubs(JNIEnv *jEnv);
-    static MediaCodec* Wrap(jobject obj);
-    MediaCodec(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
-    bool Configure(jobject a0, jobject a1, jobject a2, int32_t a3);
-    static jobject CreateByCodecName(const nsAString& a0);
-    static jobject CreateDecoderByType(const nsAString& a0);
-    static jobject CreateEncoderByType(const nsAString& a0);
-    int32_t DequeueInputBuffer(int64_t a0);
-    int32_t DequeueOutputBuffer(jobject a0, int64_t a1);
-    void Finalize();
-    void Flush();
-    jobjectArray GetInputBuffers();
-    jobjectArray GetOutputBuffers();
-    jobject GetOutputFormat();
-    void QueueInputBuffer(int32_t a0, int32_t a1, int32_t a2, int64_t a3, int32_t a4);
-    void QueueSecureInputBuffer(int32_t a0, int32_t a1, jobject a2, int64_t a3, int32_t a4);
-    void Release();
-    void ReleaseOutputBuffer(int32_t a0, bool a1);
-    void SetVideoScalingMode(int32_t a0);
-    bool Start();
-    void Stop();
-    static int32_t getBUFFER_FLAG_CODEC_CONFIG();
-    static int32_t getBUFFER_FLAG_END_OF_STREAM();
-    static int32_t getBUFFER_FLAG_SYNC_FRAME();
-    static int32_t getCONFIGURE_FLAG_ENCODE();
-    static int32_t getCRYPTO_MODE_AES_CTR();
-    static int32_t getCRYPTO_MODE_UNENCRYPTED();
-    static int32_t getINFO_OUTPUT_BUFFERS_CHANGED();
-    static int32_t getINFO_OUTPUT_FORMAT_CHANGED();
-    static int32_t getINFO_TRY_AGAIN_LATER();
-    static int32_t getVIDEO_SCALING_MODE_SCALE_TO_FIT();
-    static int32_t getVIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING();
-    MediaCodec() : AutoGlobalWrappedJavaObject() {};
-protected:
-    static jclass mMediaCodecClass;
-    static jmethodID jConfigure;
-    static jmethodID jCreateByCodecName;
-    static jmethodID jCreateDecoderByType;
-    static jmethodID jCreateEncoderByType;
-    static jmethodID jDequeueInputBuffer;
-    static jmethodID jDequeueOutputBuffer;
-    static jmethodID jFinalize;
-    static jmethodID jFlush;
-    static jmethodID jGetInputBuffers;
-    static jmethodID jGetOutputBuffers;
-    static jmethodID jGetOutputFormat;
-    static jmethodID jQueueInputBuffer;
-    static jmethodID jQueueSecureInputBuffer;
-    static jmethodID jRelease;
-    static jmethodID jReleaseOutputBuffer;
-    static jmethodID jSetVideoScalingMode;
-    static jmethodID jStart;
-    static jmethodID jStop;
-    static jfieldID jBUFFER_FLAG_CODEC_CONFIG;
-    static jfieldID jBUFFER_FLAG_END_OF_STREAM;
-    static jfieldID jBUFFER_FLAG_SYNC_FRAME;
-    static jfieldID jCONFIGURE_FLAG_ENCODE;
-    static jfieldID jCRYPTO_MODE_AES_CTR;
-    static jfieldID jCRYPTO_MODE_UNENCRYPTED;
-    static jfieldID jINFO_OUTPUT_BUFFERS_CHANGED;
-    static jfieldID jINFO_OUTPUT_FORMAT_CHANGED;
-    static jfieldID jINFO_TRY_AGAIN_LATER;
-    static jfieldID jVIDEO_SCALING_MODE_SCALE_TO_FIT;
-    static jfieldID jVIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING;
-};
-
-class MediaFormat : public AutoGlobalWrappedJavaObject {
-public:
-    static void InitStubs(JNIEnv *jEnv);
-    static MediaFormat* Wrap(jobject obj);
-    MediaFormat(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
-    MediaFormat();
-    bool ContainsKey(const nsAString& a0);
-    static jobject CreateAudioFormat(const nsAString& a0, int32_t a1, int32_t a2);
-    static jobject CreateVideoFormat(const nsAString& a0, int32_t a1, int32_t a2);
-    jobject GetByteBuffer(const nsAString& a0);
-    jfloat GetFloat(const nsAString& a0);
-    int32_t GetInteger(const nsAString& a0);
-    int64_t GetLong(const nsAString& a0);
-    jstring GetString(const nsAString& a0);
-    void SetByteBuffer(const nsAString& a0, jobject a1);
-    void SetFloat(const nsAString& a0, jfloat a1);
-    void SetInteger(const nsAString& a0, int32_t a1);
-    void SetLong(const nsAString& a0, int64_t a1);
-    void SetString(const nsAString& a0, const nsAString& a1);
-    jstring ToString();
-    static jstring getKEY_AAC_PROFILE();
-    static jstring getKEY_BIT_RATE();
-    static jstring getKEY_CHANNEL_COUNT();
-    static jstring getKEY_CHANNEL_MASK();
-    static jstring getKEY_COLOR_FORMAT();
-    static jstring getKEY_DURATION();
-    static jstring getKEY_FLAC_COMPRESSION_LEVEL();
-    static jstring getKEY_FRAME_RATE();
-    static jstring getKEY_HEIGHT();
-    static jstring getKEY_IS_ADTS();
-    static jstring getKEY_I_FRAME_INTERVAL();
-    static jstring getKEY_MAX_INPUT_SIZE();
-    static jstring getKEY_MIME();
-    static jstring getKEY_SAMPLE_RATE();
-    static jstring getKEY_WIDTH();
-protected:
-    static jclass mMediaFormatClass;
-    static jmethodID jMediaFormat;
-    static jmethodID jContainsKey;
-    static jmethodID jCreateAudioFormat;
-    static jmethodID jCreateVideoFormat;
-    static jmethodID jGetByteBuffer;
-    static jmethodID jGetFloat;
-    static jmethodID jGetInteger;
-    static jmethodID jGetLong;
-    static jmethodID jGetString;
-    static jmethodID jSetByteBuffer;
-    static jmethodID jSetFloat;
-    static jmethodID jSetInteger;
-    static jmethodID jSetLong;
-    static jmethodID jSetString;
-    static jmethodID jToString;
-    static jfieldID jKEY_AAC_PROFILE;
-    static jfieldID jKEY_BIT_RATE;
-    static jfieldID jKEY_CHANNEL_COUNT;
-    static jfieldID jKEY_CHANNEL_MASK;
-    static jfieldID jKEY_COLOR_FORMAT;
-    static jfieldID jKEY_DURATION;
-    static jfieldID jKEY_FLAC_COMPRESSION_LEVEL;
-    static jfieldID jKEY_FRAME_RATE;
-    static jfieldID jKEY_HEIGHT;
-    static jfieldID jKEY_IS_ADTS;
-    static jfieldID jKEY_I_FRAME_INTERVAL;
-    static jfieldID jKEY_MAX_INPUT_SIZE;
-    static jfieldID jKEY_MIME;
-    static jfieldID jKEY_SAMPLE_RATE;
-    static jfieldID jKEY_WIDTH;
-};
-
-class ByteBuffer : public AutoGlobalWrappedJavaObject {
-public:
-    static void InitStubs(JNIEnv *jEnv);
-    static ByteBuffer* Wrap(jobject obj);
-    ByteBuffer(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
-    int8_t _get(int32_t a0);
-    void _put(int32_t a0, int8_t a1);
-    static jobject Allocate(int32_t a0);
-    static jobject AllocateDirect(int32_t a0);
-    jobject Array();
-    jbyteArray Array1();
-    int32_t ArrayOffset();
-    jstring AsCharBuffer();
-    jobject AsDoubleBuffer();
-    jobject AsFloatBuffer();
-    jobject AsIntBuffer();
-    jobject AsLongBuffer();
-    jobject AsReadOnlyBuffer();
-    jobject AsShortBuffer();
-    jobject Compact();
-    int32_t CompareTo(jobject a0);
-    int32_t CompareTo1(jobject a0);
-    jobject Duplicate();
-    bool Equals(jobject a0);
-    int8_t Get();
-    int8_t Get1(int32_t a0);
-    jobject Get1(jbyteArray a0);
-    jobject Get1(jbyteArray a0, int32_t a1, int32_t a2);
-    uint16_t GetChar();
-    uint16_t GetChar1(int32_t a0);
-    jdouble GetDouble();
-    jdouble GetDouble1(int32_t a0);
-    jfloat GetFloat();
-    jfloat GetFloat1(int32_t a0);
-    int32_t GetInt();
-    int32_t GetInt1(int32_t a0);
-    int64_t GetLong();
-    int64_t GetLong1(int32_t a0);
-    int16_t GetShort();
-    int16_t GetShort1(int32_t a0);
-    bool HasArray();
-    int32_t HashCode();
-    bool IsDirect();
-    jobject Order();
-    jobject Order1(jobject a0);
-    jobject Put(int8_t a0);
-    jobject Put1(int32_t a0, int8_t a1);
-    jobject Put1(jobject a0);
-    jobject Put1(jbyteArray a0);
-    jobject Put1(jbyteArray a0, int32_t a1, int32_t a2);
-    jobject PutChar(uint16_t a0);
-    jobject PutChar1(int32_t a0, uint16_t a1);
-    jobject PutDouble(jdouble a0);
-    jobject PutDouble1(int32_t a0, jdouble a1);
-    jobject PutFloat(jfloat a0);
-    jobject PutFloat1(int32_t a0, jfloat a1);
-    jobject PutInt(int32_t a0);
-    jobject PutInt1(int32_t a0, int32_t a1);
-    jobject PutLong(int32_t a0, int64_t a1);
-    jobject PutLong1(int64_t a0);
-    jobject PutShort(int32_t a0, int16_t a1);
-    jobject PutShort1(int16_t a0);
-    jobject Slice();
-    jstring ToString();
-    static jobject Wrap1(jbyteArray a0);
-    static jobject Wrap2(jbyteArray a0, int32_t a1, int32_t a2);
-    bool getBigEndian();
-    void setBigEndian(bool a0);
-    jbyteArray getHb();
-    bool getIsReadOnly();
-    void setIsReadOnly(bool a0);
-    bool getNativeByteOrder();
-    void setNativeByteOrder(bool a0);
-    int32_t getOffset();
-    ByteBuffer() : AutoGlobalWrappedJavaObject() {};
-protected:
-    static jclass mByteBufferClass;
-    static jmethodID j_get;
-    static jmethodID j_put;
-    static jmethodID jAllocate;
-    static jmethodID jAllocateDirect;
-    static jmethodID jArray;
-    static jmethodID jArray1;
-    static jmethodID jArrayOffset;
-    static jmethodID jAsCharBuffer;
-    static jmethodID jAsDoubleBuffer;
-    static jmethodID jAsFloatBuffer;
-    static jmethodID jAsIntBuffer;
-    static jmethodID jAsLongBuffer;
-    static jmethodID jAsReadOnlyBuffer;
-    static jmethodID jAsShortBuffer;
-    static jmethodID jCompact;
-    static jmethodID jCompareTo;
-    static jmethodID jCompareTo1;
-    static jmethodID jDuplicate;
-    static jmethodID jEquals;
-    static jmethodID jGet;
-    static jmethodID jGet1;
-    static jmethodID jGet10;
-    static jmethodID jGet11;
-    static jmethodID jGetChar;
-    static jmethodID jGetChar1;
-    static jmethodID jGetDouble;
-    static jmethodID jGetDouble1;
-    static jmethodID jGetFloat;
-    static jmethodID jGetFloat1;
-    static jmethodID jGetInt;
-    static jmethodID jGetInt1;
-    static jmethodID jGetLong;
-    static jmethodID jGetLong1;
-    static jmethodID jGetShort;
-    static jmethodID jGetShort1;
-    static jmethodID jHasArray;
-    static jmethodID jHashCode;
-    static jmethodID jIsDirect;
-    static jmethodID jOrder;
-    static jmethodID jOrder1;
-    static jmethodID jPut;
-    static jmethodID jPut1;
-    static jmethodID jPut12;
-    static jmethodID jPut13;
-    static jmethodID jPut14;
-    static jmethodID jPutChar;
-    static jmethodID jPutChar1;
-    static jmethodID jPutDouble;
-    static jmethodID jPutDouble1;
-    static jmethodID jPutFloat;
-    static jmethodID jPutFloat1;
-    static jmethodID jPutInt;
-    static jmethodID jPutInt1;
-    static jmethodID jPutLong;
-    static jmethodID jPutLong1;
-    static jmethodID jPutShort;
-    static jmethodID jPutShort1;
-    static jmethodID jSlice;
-    static jmethodID jToString;
-    static jmethodID jWrap;
-    static jmethodID jWrap1;
-    static jfieldID jBigEndian;
-    static jfieldID jHb;
-    static jfieldID jIsReadOnly;
-    static jfieldID jNativeByteOrder;
-    static jfieldID jOffset;
-};
-
-class BufferInfo : public AutoGlobalWrappedJavaObject {
-public:
-    static void InitStubs(JNIEnv *jEnv);
-    static BufferInfo* Wrap(jobject obj);
-    BufferInfo(jobject obj, JNIEnv* env) : AutoGlobalWrappedJavaObject(obj, env) {};
-    BufferInfo();
-    void Set(int32_t a0, int32_t a1, int64_t a2, int32_t a3);
-    int32_t getFlags();
-    void setFlags(int32_t a0);
-    int32_t getOffset();
-    void setOffset(int32_t a0);
-    int64_t getPresentationTimeUs();
-    void setPresentationTimeUs(int64_t a0);
-    int32_t getSize();
-    void setSize(int32_t a0);
-protected:
-    static jclass mBufferInfoClass;
-    static jmethodID jBufferInfo;
-    static jmethodID jSet;
-    static jfieldID jFlags;
-    static jfieldID jOffset;
-    static jfieldID jPresentationTimeUs;
-    static jfieldID jSize;
-};
-
-} /* android */
-} /* widget */
-} /* mozilla */
-#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/moz.build	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/moz.build	2014-11-26 21:46:06.000000000 +0000
@@ -4,6 +4,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/.
 
+DIRS += [
+    'bindings',
+]
+
 XPIDL_SOURCES += [
     'nsIAndroidBridge.idl',
 ]
@@ -15,7 +19,6 @@
     'AndroidJavaWrappers.h',
     'AndroidJNIWrapper.h',
     'GeneratedJNIWrappers.h',
-    'GeneratedSDKWrappers.h',
 ]
 
 SOURCES += [
@@ -27,7 +30,6 @@
     'AndroidJNIWrapper.cpp',
     'APZCCallbackHandler.cpp',
     'GeneratedJNIWrappers.cpp',
-    'GeneratedSDKWrappers.cpp',
     'GfxInfo.cpp',
     'NativeJSContainer.cpp',
     'nsAndroidProtocolHandler.cpp',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/nsWindow.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/nsWindow.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/nsWindow.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/nsWindow.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -675,7 +675,8 @@
             MOZ_ASSERT(!mIMEComposing);
             mIMEComposing = true;
             break;
-        case NS_COMPOSITION_END:
+        case NS_COMPOSITION_COMMIT_AS_IS:
+        case NS_COMPOSITION_COMMIT:
             MOZ_ASSERT(mIMEComposing);
             mIMEComposing = false;
             mIMEComposingStart = -1;
@@ -692,7 +693,7 @@
 }
 
 NS_IMETHODIMP
-nsWindow::MakeFullScreen(bool aFullScreen)
+nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen*)
 {
     mozilla::widget::android::GeckoAppShell::SetFullScreen(aFullScreen);
     return NS_OK;
@@ -1718,15 +1719,11 @@
     AutoIMEMask selMask(mIMEMaskSelectionUpdate);
     AutoIMEMask textMask(mIMEMaskTextUpdate);
 
-    WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
+    WidgetCompositionEvent compositionCommitEvent(true,
+                                                  NS_COMPOSITION_COMMIT_AS_IS,
                                                   this);
-    InitEvent(compositionChangeEvent, nullptr);
-    compositionChangeEvent.mData = mIMEComposingText;
-    DispatchEvent(&compositionChangeEvent);
-
-    WidgetCompositionEvent compEndEvent(true, NS_COMPOSITION_END, this);
-    InitEvent(compEndEvent, nullptr);
-    DispatchEvent(&compEndEvent);
+    InitEvent(compositionCommitEvent, nullptr);
+    DispatchEvent(&compositionCommitEvent);
 }
 
 void
@@ -1878,10 +1875,11 @@
             // Don't end composition when composing text.
             if (ae->Action() != AndroidGeckoEvent::IME_COMPOSE_TEXT)
             {
-                WidgetCompositionEvent event(true, NS_COMPOSITION_END, this);
-                InitEvent(event, nullptr);
-                event.mData = ae->Characters();
-                DispatchEvent(&event);
+                WidgetCompositionEvent compositionCommitEvent(
+                                           true, NS_COMPOSITION_COMMIT, this);
+                InitEvent(compositionCommitEvent, nullptr);
+                compositionCommitEvent.mData = ae->Characters();
+                DispatchEvent(&compositionCommitEvent);
             }
 
             FlushIMEChanges();
@@ -2083,15 +2081,12 @@
             if (mIMEComposing) {
                 nsRefPtr<nsWindow> kungFuDeathGrip(this);
 
-                WidgetCompositionEvent compositionChangeEvent(
-                                         true, NS_COMPOSITION_CHANGE, this);
-                InitEvent(compositionChangeEvent, nullptr);
-                DispatchEvent(&compositionChangeEvent);
-
-                WidgetCompositionEvent compositionEndEvent(
-                                         true, NS_COMPOSITION_END, this);
-                InitEvent(compositionEndEvent, nullptr);
-                DispatchEvent(&compositionEndEvent);
+                WidgetCompositionEvent compositionCommitEvent(
+                                         true, NS_COMPOSITION_COMMIT, this);
+                InitEvent(compositionCommitEvent, nullptr);
+                // Dispatch it with empty mData value for canceling the
+                // composition
+                DispatchEvent(&compositionCommitEvent);
             }
 
             mozilla::widget::android::GeckoAppShell::NotifyIME(REQUEST_TO_CANCEL_COMPOSITION);
@@ -2369,7 +2364,9 @@
         return;
     }
 
-    gl::GLContext* gl = static_cast<CompositorOGL*>(aManager->GetCompositor())->gl();
+    CompositorOGL *compositor = static_cast<CompositorOGL*>(aManager->GetCompositor());
+    compositor->ResetProgram();
+    gl::GLContext* gl = compositor->gl();
     bool scissorEnabled = gl->fIsEnabled(LOCAL_GL_SCISSOR_TEST);
     GLint scissorRect[4];
     gl->fGetIntegerv(LOCAL_GL_SCISSOR_BOX, scissorRect);
@@ -2398,7 +2395,9 @@
 
     mozilla::widget::android::GeckoLayerClient* client = AndroidBridge::Bridge()->GetLayerClient();
 
-    gl::GLContext* gl = static_cast<CompositorOGL*>(aManager->GetCompositor())->gl();
+    CompositorOGL *compositor = static_cast<CompositorOGL*>(aManager->GetCompositor());
+    compositor->ResetProgram();
+    gl::GLContext* gl = compositor->gl();
     bool scissorEnabled = gl->fIsEnabled(LOCAL_GL_SCISSOR_TEST);
     GLint scissorRect[4];
     gl->fGetIntegerv(LOCAL_GL_SCISSOR_BOX, scissorRect);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/nsWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/nsWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/android/nsWindow.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/android/nsWindow.h	2014-11-26 21:46:06.000000000 +0000
@@ -104,7 +104,7 @@
     NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
                              nsEventStatus& aStatus);
     nsEventStatus DispatchEvent(mozilla::WidgetGUIEvent* aEvent);
-    NS_IMETHOD MakeFullScreen(bool aFullScreen);
+    NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr);
     NS_IMETHOD SetWindowClass(const nsAString& xulWinType);
 
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/BasicEvents.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/BasicEvents.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/BasicEvents.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/BasicEvents.h	2014-11-26 21:46:06.000000000 +0000
@@ -176,6 +176,9 @@
 // composition events
 #define NS_COMPOSITION_EVENT_START    2200
 #define NS_COMPOSITION_START          (NS_COMPOSITION_EVENT_START)
+// NS_COMPOSITION_END is the message for DOM compositionend event.
+// This event should NOT be dispatched from widget if NS_COMPOSITION_COMMIT
+// is available.
 #define NS_COMPOSITION_END            (NS_COMPOSITION_EVENT_START + 1)
 // NS_COMPOSITION_UPDATE is the message for DOM compositionupdate event.
 // This event should NOT be dispatched from widget since it will be dispatched
@@ -187,6 +190,19 @@
 // composition string isn't changed but the ranges are changed.  This causes
 // a DOM "text" event which is a non-standard DOM event.
 #define NS_COMPOSITION_CHANGE         (NS_COMPOSITION_EVENT_START + 3)
+// NS_COMPOSITION_COMMIT_AS_IS is the message for representing a commit of
+// composition string.  TextComposition will commit composition with the
+// last data.  TextComposition will dispatch this event to the DOM tree as
+// NS_COMPOSITION_CHANGE without clause information.  After that,
+// NS_COMPOSITION_END will be dispatched automatically.
+// Its mData and mRanges should be empty and nullptr.
+#define NS_COMPOSITION_COMMIT_AS_IS   (NS_COMPOSITION_EVENT_START + 4)
+// NS_COMPOSITION_COMMIT is the message for representing a commit of
+// composition string with its mData value.  TextComposition will dispatch this
+// event to the DOM tree as NS_COMPOSITION_CHANGE without clause information.
+// After that, NS_COMPOSITION_END will be dispatched automatically.
+// Its mRanges should be nullptr.
+#define NS_COMPOSITION_COMMIT         (NS_COMPOSITION_EVENT_START + 5)
 
 // UI events
 #define NS_UI_EVENT_START          2500
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/GfxInfo.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/GfxInfo.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/GfxInfo.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/GfxInfo.h	2014-11-26 21:46:06.000000000 +0000
@@ -9,6 +9,7 @@
 #define __mozilla_widget_GfxInfo_h__
 
 #include "GfxInfoBase.h"
+#include "nsIGfxInfo2.h"
 
 #include "nsString.h"
 
@@ -50,10 +51,11 @@
 
   virtual nsresult Init();
 
-#ifdef DEBUG
   NS_DECL_ISUPPORTS_INHERITED
+#ifdef DEBUG
   NS_DECL_NSIGFXINFODEBUG
 #endif
+  NS_DECL_NSIGFXINFO2
 
   virtual uint32_t OperatingSystemVersion() MOZ_OVERRIDE { return mOSXVersion; }
 
@@ -71,6 +73,7 @@
 private:
 
   void GetDeviceInfo();
+  void GetSelectedCityInfo();
   void AddCrashReportAnnotations();
 
   nsString mAdapterRAMString;
@@ -82,6 +85,8 @@
   nsString mAdapterVendorID;
   nsString mAdapterDeviceID;
 
+  nsString mCountryCode;
+
   uint32_t mOSXVersion;
 };
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/GfxInfo.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/GfxInfo.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/GfxInfo.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/GfxInfo.mm	2014-11-26 21:46:06.000000000 +0000
@@ -34,7 +34,9 @@
 using namespace mozilla::widget;
 
 #ifdef DEBUG
-NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug)
+NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfo2, nsIGfxInfoDebug)
+#else
+NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfo2)
 #endif
 
 GfxInfo::GfxInfo()
@@ -96,6 +98,20 @@
   }
 }
 
+void
+GfxInfo::GetSelectedCityInfo()
+{
+  NSDictionary* selected_city =
+    [[NSUserDefaults standardUserDefaults]
+      objectForKey:@"com.apple.preferences.timezone.selected_city"];
+  NSString *countryCode = (NSString *)
+    [selected_city objectForKey:@"CountryCode"];
+  const char *countryCodeUTF8 = [countryCode UTF8String];
+  if (countryCodeUTF8) {
+    AppendUTF8toUTF16(countryCodeUTF8, mCountryCode);
+  }
+}
+
 nsresult
 GfxInfo::Init()
 {
@@ -107,6 +123,8 @@
 
   GetDeviceInfo();
 
+  GetSelectedCityInfo();
+
   AddCrashReportAnnotations();
 
   mOSXVersion = nsCocoaFeatures::OSXVersion();
@@ -266,6 +284,15 @@
   return NS_ERROR_FAILURE;
 }
 
+/* interface nsIGfxInfo2 */
+/* readonly attribute DOMString countryCode; */
+NS_IMETHODIMP
+GfxInfo::GetCountryCode(nsAString & aCountryCode)
+{
+  aCountryCode = mCountryCode;
+  return NS_OK;
+}
+
 void
 GfxInfo::AddCrashReportAnnotations()
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/NativeKeyBindings.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/NativeKeyBindings.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/NativeKeyBindings.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/NativeKeyBindings.mm	2014-11-26 21:46:06.000000000 +0000
@@ -282,7 +282,7 @@
 
     PR_LOG(gNativeKeyBindingsLog, PR_LOG_ALWAYS,
       ("%p NativeKeyBindings::KeyPress, command=%s",
-       this, geckoCommand));
+       this, WidgetKeyboardEvent::GetCommandStr(geckoCommand)));
 
     // Execute the Gecko command
     aCallback(geckoCommand, aCallbackData);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsAppShell.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsAppShell.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsAppShell.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsAppShell.h	2014-11-26 21:46:06.000000000 +0000
@@ -5,7 +5,7 @@
 
 /*
  * Runs the main native Cocoa run loop, interrupting it as needed to process
- * Gecko events.  
+ * Gecko events.
  */
 
 #ifndef nsAppShell_h_
@@ -30,7 +30,7 @@
 {
 public:
   NS_IMETHOD ResumeNative(void);
-	
+
   nsAppShell();
 
   nsresult Init();
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsAppShell.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsAppShell.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsAppShell.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsAppShell.mm	2014-11-26 21:46:06.000000000 +0000
@@ -87,7 +87,7 @@
     }
     return NS_OK;
   }
-};
+}; // MacWakeLockListener
 
 // defined in nsCocoaWindow.mm
 extern int32_t             gXULModalLevel;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsChildView.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsChildView.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsChildView.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsChildView.h	2014-11-26 21:46:06.000000000 +0000
@@ -504,6 +504,13 @@
                       const mozilla::WidgetKeyboardEvent& aEvent,
                       DoCommandCallback aCallback,
                       void* aCallbackData) MOZ_OVERRIDE;
+  bool ExecuteNativeKeyBindingRemapped(
+                      NativeKeyBindingsType aType,
+                      const mozilla::WidgetKeyboardEvent& aEvent,
+                      DoCommandCallback aCallback,
+                      void* aCallbackData,
+                      uint32_t aGeckoKeyCode,
+                      uint32_t aCocoaKeyCode);
   virtual nsIMEUpdatePreference GetIMEUpdatePreference() MOZ_OVERRIDE;
   NS_IMETHOD        GetToggledKeyState(uint32_t aKeyCode,
                                        bool* aLEDState);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsChildView.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsChildView.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsChildView.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsChildView.mm	2014-11-26 21:46:06.000000000 +0000
@@ -225,6 +225,10 @@
 - (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect forMove:(BOOL)aForMove forUnderTitlebar:(BOOL)aForUnderTitlebar;
 @end
 
+@interface NSWindow(NSWindowShouldZoomOnDoubleClick)
++ (BOOL)_shouldZoomOnDoubleClick; // present on 10.7 and above
+@end
+
 // Starting with 10.7 the bottom corners of all windows are rounded.
 // Unfortunately, the standard rounding that OS X applies to OpenGL views
 // does not use anti-aliasing and looks very crude. Since we want a smooth,
@@ -375,6 +379,10 @@
   {
     return mProjMatrix;
   }
+  virtual void ActivateProgram(ShaderProgramOGL *aProg) MOZ_OVERRIDE
+  {
+    mGLContext->fUseProgram(aProg->GetProgram());
+  }
   virtual void BindAndDrawQuad(ShaderProgramOGL *aProg,
                                const gfx::Rect& aLayerRect,
                                const gfx::Rect& aTextureRect) MOZ_OVERRIDE;
@@ -2030,12 +2038,96 @@
   return mTextInputHandler->AttachNativeKeyEvent(aEvent);
 }
 
+bool
+nsChildView::ExecuteNativeKeyBindingRemapped(NativeKeyBindingsType aType,
+                                             const WidgetKeyboardEvent& aEvent,
+                                             DoCommandCallback aCallback,
+                                             void* aCallbackData,
+                                             uint32_t aGeckoKeyCode,
+                                             uint32_t aCocoaKeyCode)
+{
+  NSEvent *originalEvent = reinterpret_cast<NSEvent*>(aEvent.mNativeKeyEvent);
+
+  WidgetKeyboardEvent modifiedEvent(aEvent);
+  modifiedEvent.keyCode = aGeckoKeyCode;
+
+  unichar ch = nsCocoaUtils::ConvertGeckoKeyCodeToMacCharCode(aGeckoKeyCode);
+  NSString *chars =
+    [[[NSString alloc] initWithCharacters:&ch length:1] autorelease];
+
+  modifiedEvent.mNativeKeyEvent =
+    [NSEvent keyEventWithType:[originalEvent type]
+                     location:[originalEvent locationInWindow]
+                modifierFlags:[originalEvent modifierFlags]
+                    timestamp:[originalEvent timestamp]
+                 windowNumber:[originalEvent windowNumber]
+                      context:[originalEvent context]
+                   characters:chars
+  charactersIgnoringModifiers:chars
+                    isARepeat:[originalEvent isARepeat]
+                      keyCode:aCocoaKeyCode];
+
+  NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
+  return keyBindings->Execute(modifiedEvent, aCallback, aCallbackData);
+}
+
 NS_IMETHODIMP_(bool)
 nsChildView::ExecuteNativeKeyBinding(NativeKeyBindingsType aType,
                                      const WidgetKeyboardEvent& aEvent,
                                      DoCommandCallback aCallback,
                                      void* aCallbackData)
 {
+  // If the key is a cursor-movement arrow, and the current selection has
+  // vertical writing-mode, we'll remap so that the movement command
+  // generated (in terms of characters/lines) will be appropriate for
+  // the physical direction of the arrow.
+  if (aEvent.keyCode >= nsIDOMKeyEvent::DOM_VK_LEFT &&
+      aEvent.keyCode <= nsIDOMKeyEvent::DOM_VK_DOWN) {
+    WidgetQueryContentEvent query(true, NS_QUERY_SELECTED_TEXT, this);
+    DispatchWindowEvent(query);
+
+    if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) {
+      uint32_t geckoKey = 0;
+      uint32_t cocoaKey = 0;
+
+      switch (aEvent.keyCode) {
+      case nsIDOMKeyEvent::DOM_VK_LEFT:
+        if (query.mReply.mWritingMode.IsVerticalLR()) {
+          geckoKey = nsIDOMKeyEvent::DOM_VK_UP;
+          cocoaKey = kVK_UpArrow;
+        } else {
+          geckoKey = nsIDOMKeyEvent::DOM_VK_DOWN;
+          cocoaKey = kVK_DownArrow;
+        }
+        break;
+
+      case nsIDOMKeyEvent::DOM_VK_RIGHT:
+        if (query.mReply.mWritingMode.IsVerticalLR()) {
+          geckoKey = nsIDOMKeyEvent::DOM_VK_DOWN;
+          cocoaKey = kVK_DownArrow;
+        } else {
+          geckoKey = nsIDOMKeyEvent::DOM_VK_UP;
+          cocoaKey = kVK_UpArrow;
+        }
+        break;
+
+      case nsIDOMKeyEvent::DOM_VK_UP:
+        geckoKey = nsIDOMKeyEvent::DOM_VK_LEFT;
+        cocoaKey = kVK_LeftArrow;
+        break;
+
+      case nsIDOMKeyEvent::DOM_VK_DOWN:
+        geckoKey = nsIDOMKeyEvent::DOM_VK_RIGHT;
+        cocoaKey = kVK_RightArrow;
+        break;
+      }
+
+      return ExecuteNativeKeyBindingRemapped(aType, aEvent, aCallback,
+                                             aCallbackData,
+                                             geckoKey, cocoaKey);
+    }
+  }
+
   NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
   return keyBindings->Execute(aEvent, aCallback, aCallbackData);
 }
@@ -2956,7 +3048,7 @@
 
   aManager->gl()->fBindTexture(LOCAL_GL_TEXTURE_RECTANGLE_ARB, mTexture);
 
-  program->Activate();
+  aManager->ActivateProgram(program);
   program->SetProjectionMatrix(aManager->GetProjMatrix());
   program->SetLayerTransform(Matrix4x4(aTransform).PostTranslate(aLocation.x, aLocation.y, 0));
   program->SetTextureTransform(gfx::Matrix4x4());
@@ -4884,13 +4976,15 @@
   LayoutDeviceIntPoint pos = geckoEvent.refPoint;
   if (!defaultPrevented && [theEvent clickCount] == 2 &&
       mGeckoChild->GetDraggableRegion().Contains(pos.x, pos.y) &&
-      [self shouldMinimizeOnTitlebarDoubleClick] &&
       [[self window] isKindOfClass:[ToolbarWindow class]] &&
       (locationInTitlebar < [(ToolbarWindow*)[self window] titlebarHeight] ||
        locationInTitlebar < [(ToolbarWindow*)[self window] unifiedToolbarHeight])) {
-
-    NSButton *minimizeButton = [[self window] standardWindowButton:NSWindowMiniaturizeButton];
-    [minimizeButton performClick:self];
+    if ([self shouldZoomOnDoubleClick]) {
+      [[self window] performZoom:nil];
+    } else if ([self shouldMinimizeOnTitlebarDoubleClick]) {
+      NSButton *minimizeButton = [[self window] standardWindowButton:NSWindowMiniaturizeButton];
+      [minimizeButton performClick:self];
+    }
   }
 
   // If our mouse-up event's location is over some other object (as might
@@ -5631,6 +5725,14 @@
   return mTextInputHandler->HasMarkedText();
 }
 
+- (BOOL)shouldZoomOnDoubleClick
+{
+  if ([NSWindow respondsToSelector:@selector(_shouldZoomOnDoubleClick)]) {
+    return [NSWindow _shouldZoomOnDoubleClick];
+  }
+  return nsCocoaFeatures::OnYosemiteOrLater();
+}
+
 - (BOOL)shouldMinimizeOnTitlebarDoubleClick
 {
   NSString *MDAppleMiniaturizeOnDoubleClickKey =
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaFeatures.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaFeatures.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaFeatures.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaFeatures.h	2014-11-26 21:46:06.000000000 +0000
@@ -21,12 +21,11 @@
   static bool SupportCoreAnimationPlugins();
   static bool AccelerateByDefault();
 
+  static bool IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix=0);
+
 private:
   static void InitializeVersionNumbers();
 
   static int32_t mOSXVersion;
-  static int32_t mOSXVersionMajor;
-  static int32_t mOSXVersionMinor;
-  static int32_t mOSXVersionBugFix;
 };
 #endif // nsCocoaFeatures_h_
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaFeatures.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaFeatures.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaFeatures.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaFeatures.mm	2014-11-26 21:46:06.000000000 +0000
@@ -3,7 +3,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// This file makes some assumptions about the versions of OS X.
+// Instead of making it work major version 11 right now,
+// we will wait until that happens and worry about it then.
+// There are MOZ_ASSERTs to remind us to do that.
+// We are assuming that the minor version is less than 16.
+// There are MOZ_ASSERTs for that as well.
+
+// The formula for the version integer based on OS X version 10.minor.bugfix is
+// 0x1000 + (minor << 4) + bugifix.  See AssembleVersion() below.
+
 #define MAC_OS_X_VERSION_MASK      0x0000FFFF
+#define MAC_OS_X_VERSION_10_0_HEX  0x00001000
 #define MAC_OS_X_VERSION_10_6_HEX  0x00001060
 #define MAC_OS_X_VERSION_10_7_HEX  0x00001070
 #define MAC_OS_X_VERSION_10_8_HEX  0x00001080
@@ -18,9 +29,31 @@
 #import <Cocoa/Cocoa.h>
 
 int32_t nsCocoaFeatures::mOSXVersion = 0;
-int32_t nsCocoaFeatures::mOSXVersionMajor = 0;
-int32_t nsCocoaFeatures::mOSXVersionMinor = 0;
-int32_t nsCocoaFeatures::mOSXVersionBugFix = 0;
+
+inline int32_t AssembleVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix)
+{
+    MOZ_ASSERT(aMajor == 10);
+    return MAC_OS_X_VERSION_10_0_HEX + (aMinor << 4) + aBugFix;
+}
+
+inline int32_t ExtractMajorVersion(int32_t aVersion)
+{
+    MOZ_ASSERT((aVersion & MAC_OS_X_VERSION_MASK) == aVersion);
+    MOZ_ASSERT((aVersion & MAC_OS_X_VERSION_10_0_HEX) == MAC_OS_X_VERSION_10_0_HEX);
+    return 10;
+}
+
+inline int32_t ExtractMinorVersion(int32_t aVersion)
+{
+    MOZ_ASSERT((aVersion & MAC_OS_X_VERSION_MASK) == aVersion);
+    return (aVersion & 0xF0) >> 4;
+}
+
+inline int32_t ExtractBugFixVersion(int32_t aVersion)
+{
+    MOZ_ASSERT((aVersion & MAC_OS_X_VERSION_MASK) == aVersion);
+    return aVersion & 0x0F;
+}
 
 static int intAtStringIndex(NSArray *array, int index)
 {
@@ -46,6 +79,30 @@
     }
 }
 
+static int32_t GetFullVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix)
+{
+    int32_t osxVersion;
+    if (aMajor < 10) {
+        aMajor = 10;
+        NS_ERROR("Couldn't determine OS X version, assuming 10.6");
+        osxVersion = MAC_OS_X_VERSION_10_6_HEX;
+    } else if (aMinor < 6) {
+        aMinor = 6;
+        NS_ERROR("OS X version too old, assuming 10.6");
+        osxVersion = MAC_OS_X_VERSION_10_6_HEX;
+    } else {
+        MOZ_ASSERT(aMajor == 10);
+        MOZ_ASSERT(aMinor < 16);
+        MOZ_ASSERT(aBugFix >= 0);
+        MOZ_ASSERT(aBugFix < 16);
+        osxVersion = AssembleVersion(aMajor, aMinor, aBugFix);
+    }
+    MOZ_ASSERT(aMajor == ExtractMajorVersion(osxVersion));
+    MOZ_ASSERT(aMinor == ExtractMinorVersion(osxVersion));
+    MOZ_ASSERT(aBugFix == ExtractBugFixVersion(osxVersion));
+    return osxVersion;
+}
+
 /*static*/ void
 nsCocoaFeatures::InitializeVersionNumbers()
 {
@@ -57,25 +114,7 @@
 
     int major, minor, bugfix;
     GetSystemVersion(major, minor, bugfix);
-
-    mOSXVersionMajor = major;
-    mOSXVersionMinor = minor;
-    mOSXVersionBugFix = bugfix;
-
-    if (major < 10) {
-        NS_ERROR("Couldn't determine OS X version, assuming 10.6");
-        mOSXVersion = MAC_OS_X_VERSION_10_6_HEX;
-        mOSXVersionMajor = 10;
-        mOSXVersionMinor = 6;
-        mOSXVersionBugFix = 0;
-    } else if (minor < 6) {
-        NS_ERROR("OS X version too old, assuming 10.6");
-        mOSXVersion = MAC_OS_X_VERSION_10_6_HEX;
-        mOSXVersionMinor = 6;
-        mOSXVersionBugFix = 0;
-    } else {
-        mOSXVersion = 0x1000 + (minor << 4);
-    }
+    mOSXVersion = GetFullVersion(major, minor, bugfix);
 
     NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -83,7 +122,10 @@
 /* static */ int32_t
 nsCocoaFeatures::OSXVersion()
 {
+    // Don't let this be called while we're first setting the value...
+    MOZ_ASSERT((mOSXVersion & MAC_OS_X_VERSION_MASK) >= 0);
     if (!mOSXVersion) {
+        mOSXVersion = -1;
         InitializeVersionNumbers();
     }
     return mOSXVersion;
@@ -92,28 +134,20 @@
 /* static */ int32_t
 nsCocoaFeatures::OSXVersionMajor()
 {
-    if (!mOSXVersion) {
-        InitializeVersionNumbers();
-    }
-    return mOSXVersionMajor;
+    MOZ_ASSERT((OSXVersion() & MAC_OS_X_VERSION_10_0_HEX) == MAC_OS_X_VERSION_10_0_HEX);
+    return 10;
 }
 
 /* static */ int32_t
 nsCocoaFeatures::OSXVersionMinor()
 {
-    if (!mOSXVersion) {
-        InitializeVersionNumbers();
-    }
-    return mOSXVersionMinor;
+    return ExtractMinorVersion(OSXVersion());
 }
 
 /* static */ int32_t
 nsCocoaFeatures::OSXVersionBugFix()
 {
-    if (!mOSXVersion) {
-        InitializeVersionNumbers();
-    }
-    return mOSXVersionBugFix;
+    return ExtractBugFixVersion(OSXVersion());
 }
 
 /* static */ bool
@@ -151,8 +185,11 @@
 /* static */ bool
 nsCocoaFeatures::AccelerateByDefault()
 {
-    return !(OSXVersionMajor() == 10 &&
-             OSXVersionMinor() == 6 &&
-             OSXVersionBugFix() <= 2);
+    return IsAtLeastVersion(10, 6, 3);
 }
 
+/* static */ bool
+nsCocoaFeatures::IsAtLeastVersion(int32_t aMajor, int32_t aMinor, int32_t aBugFix)
+{
+    return OSXVersion() >= GetFullVersion(aMajor, aMinor, aBugFix);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaWindow.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaWindow.h	2014-11-26 21:46:06.000000000 +0000
@@ -275,7 +275,7 @@
     NS_IMETHOD              SetSizeMode(int32_t aMode);
     NS_IMETHOD              HideWindowChrome(bool aShouldHide);
     void                    EnteredFullScreen(bool aFullScreen);
-    NS_IMETHOD              MakeFullScreen(bool aFullScreen);
+    NS_IMETHOD              MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr);
     NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint);
     NS_IMETHOD              Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint);
     NS_IMETHOD              GetClientBounds(nsIntRect &aRect);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaWindow.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaWindow.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsCocoaWindow.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsCocoaWindow.mm	2014-11-26 21:46:06.000000000 +0000
@@ -1280,7 +1280,7 @@
   DispatchSizeModeEvent();
 }
 
-NS_METHOD nsCocoaWindow::MakeFullScreen(bool aFullScreen)
+NS_METHOD nsCocoaWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
@@ -2579,6 +2579,13 @@
  - (void)_setNeedsDisplayInRect:(NSRect)aRect;
 @end
 
+// This method is on NSThemeFrame starting with 10.10, but since NSThemeFrame
+// is not a public class, we declare the method on NSView instead. We only have
+// this declaration in order to avoid compiler warnings.
+@interface NSView(PrivateAddKnownSubviewMethod)
+ - (void)_addKnownSubview:(NSView*)aView positioned:(NSWindowOrderingMode)place relativeTo:(NSView*)otherView;
+@end
+
 @interface BaseWindow(Private)
 - (void)removeTrackingArea;
 - (void)cursorUpdated:(NSEvent*)aEvent;
@@ -2947,7 +2954,13 @@
   // to be under the window buttons.
   NSView* frameView = [aView superview];
   [aView removeFromSuperview];
-  [frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
+  if ([frameView respondsToSelector:@selector(_addKnownSubview:positioned:relativeTo:)]) {
+    // 10.10 prints a warning when we call addSubview on the frame view, so we
+    // silence the warning by calling a private method instead.
+    [frameView _addKnownSubview:aView positioned:NSWindowBelow relativeTo:nil];
+  } else {
+    [frameView addSubview:aView positioned:NSWindowBelow relativeTo:nil];
+  }
 }
 
 - (NSArray*)titlebarControls
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsMenuItemIconX.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsMenuItemIconX.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsMenuItemIconX.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsMenuItemIconX.h	2014-11-26 21:46:06.000000000 +0000
@@ -52,7 +52,7 @@
   void Destroy();
 
 protected:
-  nsresult OnStopFrame(imgIRequest* aRequest);
+  nsresult OnFrameComplete(imgIRequest* aRequest);
 
   nsCOMPtr<nsIContent>      mContent;
   nsRefPtr<imgRequestProxy> mIconRequest;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsMenuItemIconX.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsMenuItemIconX.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsMenuItemIconX.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsMenuItemIconX.mm	2014-11-26 21:46:06.000000000 +0000
@@ -306,7 +306,9 @@
       [mNativeMenuItem setImage:sPlaceholderIconImage];
   }
 
-  nsresult rv = loader->LoadImage(aIconURI, nullptr, nullptr, nullptr, loadGroup, this,
+  nsresult rv = loader->LoadImage(aIconURI, nullptr, nullptr,
+                                  mozilla::net::RP_Default,
+                                  nullptr, loadGroup, this,
                                   nullptr, nsIRequest::LOAD_NORMAL, nullptr,
                                   nsIContentPolicy::TYPE_IMAGE, EmptyString(),
                                   getter_AddRefs(mIconRequest));
@@ -325,10 +327,12 @@
 //
 
 NS_IMETHODIMP
-nsMenuItemIconX::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData)
+nsMenuItemIconX::Notify(imgIRequest* aRequest,
+                        int32_t aType,
+                        const nsIntRect* aData)
 {
   if (aType == imgINotificationObserver::FRAME_COMPLETE) {
-    return OnStopFrame(aRequest);
+    return OnFrameComplete(aRequest);
   }
 
   if (aType == imgINotificationObserver::DECODE_COMPLETE) {
@@ -342,7 +346,7 @@
 }
 
 nsresult
-nsMenuItemIconX::OnStopFrame(imgIRequest*    aRequest)
+nsMenuItemIconX::OnFrameComplete(imgIRequest* aRequest)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsNativeThemeCocoa.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsNativeThemeCocoa.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/nsNativeThemeCocoa.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/nsNativeThemeCocoa.mm	2014-11-26 21:46:06.000000000 +0000
@@ -1095,10 +1095,7 @@
   // On 10.6 and at least on 10.7.0, Apple doesn’t seem to have implemented all
   // keys and values used on 10.7.5 and later. We can however draw menu icons
   // on earlier OS versions by using different keys/values.
-  BOOL otherKeysAndValues = !nsCocoaFeatures::OnLionOrLater() ||
-                            (nsCocoaFeatures::OSXVersionMajor() == 10 &&
-                             nsCocoaFeatures::OSXVersionMinor() == 7 &&
-                             nsCocoaFeatures::OSXVersionBugFix() < 5);
+  BOOL otherKeysAndValues = !nsCocoaFeatures::IsAtLeastVersion(10,7,5);
 
   // 2 states combined with 2 different backgroundTypeKeys on earlier versions.
   NSString* state = isDisabled ? @"disabled" :
@@ -2292,7 +2289,7 @@
 IsHiDPIContext(nsPresContext* aContext)
 {
   return nsPresContext::AppUnitsPerCSSPixel() >=
-    2 * aContext->DeviceContext()->UnscaledAppUnitsPerDevPixel();
+    2 * aContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/OSXNotificationCenter.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/OSXNotificationCenter.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/OSXNotificationCenter.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/OSXNotificationCenter.mm	2014-11-26 21:46:06.000000000 +0000
@@ -243,7 +243,9 @@
       nsCOMPtr<nsIURI> imageUri;
       NS_NewURI(getter_AddRefs(imageUri), aImageUrl);
       if (imageUri) {
-        nsresult rv = il->LoadImage(imageUri, nullptr, nullptr, aPrincipal, nullptr,
+        nsresult rv = il->LoadImage(imageUri, nullptr, nullptr,
+                                    mozilla::net::RP_Default,
+                                    aPrincipal, nullptr,
                                     this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
                                     nsIContentPolicy::TYPE_IMAGE, EmptyString(),
                                     getter_AddRefs(osxni->mIconRequest));
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/TextInputHandler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/TextInputHandler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/TextInputHandler.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/TextInputHandler.h	2014-11-26 21:46:06.000000000 +0000
@@ -853,13 +853,19 @@
    * @param aAttrString           An NSAttributedString instance which indicates
    *                              current composition string.
    * @param aSelectedRange        Current selected range (or caret position).
-   * @param aDoCommit             TRUE if the composition string should be
-   *                              committed.  Otherwise, FALSE.
    */
   bool DispatchCompositionChangeEvent(const nsString& aText,
                                       NSAttributedString* aAttrString,
-                                      NSRange& aSelectedRange,
-                                      bool aDoCommit);
+                                      NSRange& aSelectedRange);
+
+  /**
+   * DispatchCompositionCommitEvent() dispatches a compositioncommit event or
+   * compositioncommitasis event.  If aCommitString is null, dispatches
+   * compositioncommitasis event.  I.e., if aCommitString is null, this
+   * commits the composition with the last data.  Otherwise, commits the
+   * composition with aCommitString value.
+   */
+  bool DispatchCompositionCommitEvent(const nsAString* aCommitString = nullptr);
 
   /**
    * SetMarkedText() is a handler of setMarkedText of NSTextInput.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/TextInputHandler.mm thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/TextInputHandler.mm
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/cocoa/TextInputHandler.mm	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/cocoa/TextInputHandler.mm	2014-11-26 21:46:06.000000000 +0000
@@ -2691,18 +2691,17 @@
 bool
 IMEInputHandler::DispatchCompositionChangeEvent(const nsString& aText,
                                                 NSAttributedString* aAttrString,
-                                                NSRange& aSelectedRange,
-                                                bool aDoCommit)
+                                                NSRange& aSelectedRange)
 {
   PR_LOG(gLog, PR_LOG_ALWAYS,
     ("%p IMEInputHandler::DispatchCompositionChangeEvent, "
      "aText=\"%s\", aAttrString=\"%s\", "
      "aSelectedRange={ location=%llu, length=%llu }, "
-     "aDoCommit=%s, Destroyed()=%s",
+     "Destroyed()=%s",
      this, NS_ConvertUTF16toUTF8(aText).get(),
      GetCharacters([aAttrString string]),
      aSelectedRange.location, aSelectedRange.length,
-     TrueOrFalse(aDoCommit), TrueOrFalse(Destroyed())));
+     TrueOrFalse(Destroyed())));
 
   NS_ENSURE_TRUE(!Destroyed(), false);
 
@@ -2712,14 +2711,37 @@
                                                 mWidget);
   compositionChangeEvent.time = PR_IntervalNow();
   compositionChangeEvent.mData = aText;
-  if (!aDoCommit) {
-    compositionChangeEvent.mRanges =
-      CreateTextRangeArray(aAttrString, aSelectedRange);
-  }
-  mLastDispatchedCompositionString = compositionChangeEvent.mData;
+  compositionChangeEvent.mRanges =
+    CreateTextRangeArray(aAttrString, aSelectedRange);
   return DispatchEvent(compositionChangeEvent);
 }
 
+bool
+IMEInputHandler::DispatchCompositionCommitEvent(const nsAString* aCommitString)
+{
+  PR_LOG(gLog, PR_LOG_ALWAYS,
+    ("%p IMEInputHandler::DispatchCompositionCommitEvent, "
+     "aCommitString=0x%p (\"%s\"), Destroyed()=%s",
+     this, aCommitString,
+     aCommitString ? NS_ConvertUTF16toUTF8(*aCommitString).get() : "",
+     TrueOrFalse(Destroyed())));
+
+  if (NS_WARN_IF(Destroyed())) {
+    return false;
+  }
+
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
+  uint32_t message =
+    aCommitString ? NS_COMPOSITION_COMMIT : NS_COMPOSITION_COMMIT_AS_IS;
+  WidgetCompositionEvent compositionCommitEvent(true, message, mWidget);
+  compositionCommitEvent.time = PR_IntervalNow();
+  if (aCommitString) {
+    compositionCommitEvent.mData = *aCommitString;
+  }
+  return DispatchEvent(compositionCommitEvent);
+}
+
 void
 IMEInputHandler::InitCompositionEvent(WidgetCompositionEvent& aCompositionEvent)
 {
@@ -2758,11 +2780,7 @@
   if (IsIMEComposing() && aReplacementRange &&
       aReplacementRange->location != NSNotFound &&
       !NSEqualRanges(MarkedRange(), *aReplacementRange)) {
-    NSString* latestStr =
-      nsCocoaUtils::ToNSString(mLastDispatchedCompositionString);
-    NSAttributedString* attrLatestStr =
-      [[[NSAttributedString alloc] initWithString:latestStr] autorelease];
-    InsertTextAsCommittingComposition(attrLatestStr, nullptr);
+    DispatchCompositionCommitEvent();
     if (Destroyed()) {
       PR_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
@@ -2770,6 +2788,7 @@
          this));
       return;
     }
+    OnEndIMEComposition();
   }
 
   nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
@@ -2801,25 +2820,11 @@
     OnStartIMEComposition();
   }
 
-  NSRange range = NSMakeRange(0, str.Length());
-  DispatchCompositionChangeEvent(str, aAttrString, range, true);
+  DispatchCompositionCommitEvent(&str);
   if (Destroyed()) {
     PR_LOG(gLog, PR_LOG_ALWAYS,
       ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-       "destroyed by compositionchange event", this));
-    return;
-  }
-
-  OnUpdateIMEComposition([aAttrString string]);
-
-  WidgetCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
-  InitCompositionEvent(compEnd);
-  compEnd.mData = mLastDispatchedCompositionString;
-  DispatchEvent(compEnd);
-  if (Destroyed()) {
-    PR_LOG(gLog, PR_LOG_ALWAYS,
-      ("%p IMEInputHandler::InsertTextAsCommittingComposition, "
-       "destroyed by compositionend event", this));
+       "destroyed by compositioncommit event", this));
     return;
   }
 
@@ -2862,13 +2867,9 @@
   if (IsIMEComposing() && aReplacementRange &&
       aReplacementRange->location != NSNotFound &&
       !NSEqualRanges(MarkedRange(), *aReplacementRange)) {
-    NSString* latestStr =
-      nsCocoaUtils::ToNSString(mLastDispatchedCompositionString);
-    NSAttributedString* attrLatestStr =
-      [[[NSAttributedString alloc] initWithString:latestStr] autorelease];
     bool ignoreIMECommit = mIgnoreIMECommit;
     mIgnoreIMECommit = false;
-    InsertTextAsCommittingComposition(attrLatestStr, nullptr);
+    DispatchCompositionCommitEvent();
     mIgnoreIMECommit = ignoreIMECommit;
     if (Destroyed()) {
       PR_LOG(gLog, PR_LOG_ALWAYS,
@@ -2877,6 +2878,7 @@
          this));
       return;
     }
+    OnEndIMEComposition();
   }
 
   nsString str;
@@ -2908,32 +2910,32 @@
     OnStartIMEComposition();
   }
 
-  if (IsIMEComposing()) {
+  if (!IsIMEComposing()) {
+    return;
+  }
+
+  if (!str.IsEmpty()) {
     OnUpdateIMEComposition([aAttrString string]);
 
-    bool doCommit = str.IsEmpty();
-    DispatchCompositionChangeEvent(str, aAttrString, aSelectedRange, doCommit);
+    DispatchCompositionChangeEvent(str, aAttrString, aSelectedRange);
     if (Destroyed()) {
       PR_LOG(gLog, PR_LOG_ALWAYS,
         ("%p IMEInputHandler::SetMarkedText, "
          "destroyed by compositionchange event", this));
-      return;
     }
+    return;
+  }
 
-    if (doCommit) {
-      WidgetCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
-      InitCompositionEvent(compEnd);
-      compEnd.mData = mLastDispatchedCompositionString;
-      DispatchEvent(compEnd);
-      if (Destroyed()) {
-        PR_LOG(gLog, PR_LOG_ALWAYS,
-          ("%p IMEInputHandler::SetMarkedText, "
-           "destroyed by compositionend event", this));
-        return;
-      }
-      OnEndIMEComposition();
-    }
+  // If the composition string becomes empty string, we should commit
+  // current composition.
+  DispatchCompositionCommitEvent(&EmptyString());
+  if (Destroyed()) {
+    PR_LOG(gLog, PR_LOG_ALWAYS,
+      ("%p IMEInputHandler::SetMarkedText, "
+       "destroyed by compositioncommit event", this));
+    return;
   }
+  OnEndIMEComposition();
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
@@ -3335,8 +3337,6 @@
   NS_ASSERTION(!mIsIMEComposing, "There is a composition already");
   mIsIMEComposing = true;
 
-  mLastDispatchedCompositionString.Truncate();
-
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
@@ -3380,8 +3380,6 @@
     mIMECompositionString = nullptr;
   }
 
-  mLastDispatchedCompositionString.Truncate();
-
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/EventForwards.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/EventForwards.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/EventForwards.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/EventForwards.h	2014-11-26 21:46:06.000000000 +0000
@@ -102,6 +102,7 @@
 #undef NS_ROOT_EVENT_CLASS
 
 // BasicEvents.h
+struct BaseEventFlags;
 struct EventFlags;
 
 // TextEvents.h
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/GfxInfoBase.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/GfxInfoBase.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/GfxInfoBase.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/GfxInfoBase.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -90,7 +90,11 @@
 using namespace mozilla::widget;
 using namespace mozilla;
 
+#ifdef XP_MACOSX
+NS_IMPL_ISUPPORTS(GfxInfoBase, nsIGfxInfo, nsIGfxInfo2, nsIObserver, nsISupportsWeakReference)
+#else
 NS_IMPL_ISUPPORTS(GfxInfoBase, nsIGfxInfo, nsIObserver, nsISupportsWeakReference)
+#endif
 
 #define BLACKLIST_PREF_BRANCH "gfx.blacklist."
 #define SUGGESTED_VERSION_PREF BLACKLIST_PREF_BRANCH "suggested-driver-version"
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/GfxInfoBase.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/GfxInfoBase.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/GfxInfoBase.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/GfxInfoBase.h	2014-11-26 21:46:06.000000000 +0000
@@ -9,6 +9,9 @@
 #define __mozilla_widget_GfxInfoBase_h__
 
 #include "nsIGfxInfo.h"
+#ifdef XP_MACOSX
+#include "nsIGfxInfo2.h"
+#endif
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
@@ -25,6 +28,9 @@
 namespace widget {  
 
 class GfxInfoBase : public nsIGfxInfo,
+#ifdef XP_MACOSX
+                    public nsIGfxInfo2,
+#endif
                     public nsIObserver,
                     public nsSupportsWeakReference
 #ifdef DEBUG
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/GfxInfoWebGL.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/GfxInfoWebGL.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/GfxInfoWebGL.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/GfxInfoWebGL.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -29,7 +29,7 @@
   else return NS_ERROR_INVALID_ARG;
 
   nsCOMPtr<nsIDOMWebGLRenderingContext> webgl =
-    do_CreateInstance("@mozilla.org/content/canvas-rendering-context;1?id=experimental-webgl");
+    do_CreateInstance("@mozilla.org/content/canvas-rendering-context;1?id=webgl");
   if (!webgl)
     return NS_ERROR_NOT_AVAILABLE;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/GeckoTouchDispatcher.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/GeckoTouchDispatcher.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/GeckoTouchDispatcher.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/GeckoTouchDispatcher.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -53,8 +53,6 @@
 GeckoTouchDispatcher::GeckoTouchDispatcher()
   : mTouchQueueLock("GeckoTouchDispatcher::mTouchQueueLock")
   , mTouchEventsFiltered(false)
-  , mTouchTimeDiff(0)
-  , mLastTouchTime(TimeStamp::Now())
 {
   // Since GeckoTouchDispatcher is initialized when input is initialized
   // and reads gfxPrefs, it is the first thing to touch gfxPrefs.
@@ -69,7 +67,7 @@
                        gfxPrefs::HardwareVsyncEnabled();
   mVsyncAdjust = TimeDuration::FromMilliseconds(gfxPrefs::TouchVsyncSampleAdjust());
   mMaxPredict = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleMaxPredict());
-  mMinResampleTime = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleMinTime());
+  mOldTouchThreshold = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleOldTouchThreshold());
   mDelayedVsyncThreshold = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleVsyncDelayThreshold());
   sTouchDispatcher = this;
   ClearOnShutdown(&sTouchDispatcher);
@@ -147,8 +145,6 @@
     MutexAutoLock lock(mTouchQueueLock);
     if (mResamplingEnabled) {
       mTouchMoveEvents.push_back(aTouch);
-      mTouchTimeDiff = aEventTime - mLastTouchTime;
-      mLastTouchTime = aEventTime;
       return;
     }
 
@@ -178,19 +174,17 @@
 
     if (mResamplingEnabled) {
       int touchCount = mTouchMoveEvents.size();
-      // Both aVsynctime and mLastTouchTime are uint64_t
-      // Need to store as a signed int.
-      TimeDuration vsyncTouchDiff = aVsyncTime - mLastTouchTime;
-      bool resample = (touchCount > 1) &&
-        (vsyncTouchDiff > mMinResampleTime);
+      TimeDuration vsyncTouchDiff = aVsyncTime - mTouchMoveEvents.back().mTimeStamp;
       // The delay threshold is a positive pref, but we're testing to see if the
       // vsync time is delayed from the touch, so add a negative sign.
       bool isDelayedVsyncEvent = vsyncTouchDiff < -mDelayedVsyncThreshold;
+      bool isOldTouch = vsyncTouchDiff > mOldTouchThreshold;
+      bool resample = (touchCount > 1) && !isDelayedVsyncEvent && !isOldTouch;
 
       if (!resample) {
         touchMove = mTouchMoveEvents.back();
         mTouchMoveEvents.clear();
-        if (!isDelayedVsyncEvent) {
+        if (!isDelayedVsyncEvent && !isOldTouch) {
           mTouchMoveEvents.push_back(touchMove);
         }
       } else {
@@ -300,10 +294,11 @@
   mTouchMoveEvents.push_back(currentTouch);
 
   TimeStamp sampleTime = aVsyncTime - mVsyncAdjust;
+  TimeDuration touchDiff = currentTouch.mTimeStamp - baseTouch.mTimeStamp;
 
-  if (mLastTouchTime < sampleTime) {
-    TimeDuration maxResampleTime = std::min(mTouchTimeDiff / 2, mMaxPredict);
-    TimeStamp maxTimestamp = mLastTouchTime + maxResampleTime;
+  if (currentTouch.mTimeStamp < sampleTime) {
+    TimeDuration maxResampleTime = std::min(touchDiff / 2, mMaxPredict);
+    TimeStamp maxTimestamp = currentTouch.mTimeStamp + maxResampleTime;
     if (sampleTime > maxTimestamp) {
       sampleTime = maxTimestamp;
       #ifdef LOG_RESAMPLE_DATA
@@ -312,7 +307,7 @@
     }
   }
 
-  ResampleTouch(aOutTouch, baseTouch, currentTouch, sampleTime - (mLastTouchTime - mTouchTimeDiff), mTouchTimeDiff);
+  ResampleTouch(aOutTouch, baseTouch, currentTouch, sampleTime - baseTouch.mTimeStamp, touchDiff);
 
   // Both mTimeStamp and mTime are being updated to sampleTime here.
   // mTime needs to be updated using a delta since TimeStamp doesn't
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/GeckoTouchDispatcher.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/GeckoTouchDispatcher.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/GeckoTouchDispatcher.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/GeckoTouchDispatcher.h	2014-11-26 21:46:06.000000000 +0000
@@ -73,14 +73,11 @@
   // resample
   TimeDuration mMinResampleTime;
 
-  // The time difference between the last two touch move events
-  TimeDuration mTouchTimeDiff;
-
-  // The system time at which the last touch event occured
-  TimeStamp mLastTouchTime;
-
   // Threshold if a vsync event runs too far behind touch events
   TimeDuration mDelayedVsyncThreshold;
+
+  // How far ahead can vsync events get ahead of touch events.
+  TimeDuration mOldTouchThreshold;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/HwcComposer2D.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/HwcComposer2D.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/HwcComposer2D.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/HwcComposer2D.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -29,12 +29,6 @@
 #include "mozilla/StaticPtr.h"
 #include "cutils/properties.h"
 #include "gfx2DGlue.h"
-#include "GeckoTouchDispatcher.h"
-
-#ifdef MOZ_ENABLE_PROFILER_SPS
-#include "GeckoProfiler.h"
-#include "ProfilerMarkers.h"
-#endif
 
 #if ANDROID_VERSION >= 17
 #include "libdisplay/FramebufferSurface.h"
@@ -237,19 +231,12 @@
 void
 HwcComposer2D::Vsync(int aDisplay, nsecs_t aVsyncTimestamp)
 {
-    TimeStamp vsyncTime = mozilla::TimeStamp(aVsyncTimestamp);
+    TimeStamp vsyncTime = mozilla::TimeStamp::FromSystemTime(aVsyncTimestamp);
     nsecs_t vsyncInterval = aVsyncTimestamp - mLastVsyncTime;
     if (vsyncInterval < 16000000 || vsyncInterval > 17000000) {
       LOGE("Non-uniform vsync interval: %lld\n", vsyncInterval);
     }
     mLastVsyncTime = aVsyncTimestamp;
-
-#ifdef MOZ_ENABLE_PROFILER_SPS
-    if (profiler_is_active()) {
-        CompositorParent::PostInsertVsyncProfilerMarker(vsyncTime);
-    }
-#endif
-
     VsyncDispatcher::GetInstance()->NotifyVsync(vsyncTime);
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/libdisplay/FramebufferSurface.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -49,17 +49,20 @@
  * This implements the (main) framebuffer management. This class
  * was adapted from the version in SurfaceFlinger
  */
-FramebufferSurface::FramebufferSurface(int disp, uint32_t width, uint32_t height, uint32_t format,
-        sp<BufferQueue>& bq) :
+FramebufferSurface::FramebufferSurface(int disp,
+                                       uint32_t width,
+                                       uint32_t height,
+                                       uint32_t format,
+                                       const sp<StreamConsumer>& sc)
 #if ANDROID_VERSION >= 19
-    ConsumerBase(bq, true),
+    : ConsumerBase(sc, true)
 #else
-    ConsumerBase(bq),
+    : ConsumerBase(sc)
 #endif
-    mDisplayType(disp),
-    mCurrentBufferSlot(-1),
-    mCurrentBuffer(0),
-    lastHandle(0)
+    , mDisplayType(disp)
+    , mCurrentBufferSlot(-1)
+    , mCurrentBuffer(0)
+    , lastHandle(0)
 {
     mName = "FramebufferSurface";
 
@@ -113,7 +116,7 @@
         err = releaseBufferLocked(mCurrentBufferSlot, EGL_NO_DISPLAY,
                 EGL_NO_SYNC_KHR);
 #endif
-        if (err != NO_ERROR && err != BufferQueue::STALE_BUFFER_SLOT) {
+        if (err != NO_ERROR && err != StreamConsumer::STALE_BUFFER_SLOT) {
             ALOGE("error releasing buffer: %s (%d)", strerror(-err), err);
             return err;
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/libdisplay/FramebufferSurface.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/libdisplay/FramebufferSurface.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/libdisplay/FramebufferSurface.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/libdisplay/FramebufferSurface.h	2014-11-26 21:46:06.000000000 +0000
@@ -30,11 +30,17 @@
 class String8;
 class HWComposer;
 
+#if ANDROID_VERSION >= 21
+typedef IGraphicBufferConsumer StreamConsumer;
+#else
+typedef BufferQueue StreamConsumer;
+#endif
+
 // ---------------------------------------------------------------------------
 
 class FramebufferSurface : public ConsumerBase {
 public:
-    FramebufferSurface(int disp, uint32_t width, uint32_t height, uint32_t format, sp<BufferQueue>& bq);
+    FramebufferSurface(int disp, uint32_t width, uint32_t height, uint32_t format, const sp<StreamConsumer>& sc);
 
     bool isUpdateOnDemand() const { return false; }
     status_t setUpdateRectangle(const Rect& updateRect);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/libdisplay/GonkDisplayJB.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -106,22 +106,33 @@
     mAlloc = new GraphicBufferAlloc();
 
     status_t error;
-
-#if ANDROID_VERSION >= 19
-    sp<BufferQueue> bq = new BufferQueue(mAlloc);
+#if ANDROID_VERSION >= 21
+    sp<IGraphicBufferProducer> producer;
+    sp<IGraphicBufferConsumer> consumer;
+    BufferQueue::createBufferQueue(&producer, &consumer, mAlloc);
+#elif ANDROID_VERSION >= 19
+    sp<BufferQueue> consumer = new BufferQueue(mAlloc);
+    sp<IGraphicBufferProducer> producer = consumer;
+#elif ANDROID_VERSION >= 18
+    sp<BufferQueue> consumer = new BufferQueue(true, mAlloc);
+    sp<IGraphicBufferProducer> producer = consumer;
 #else
-    sp<BufferQueue> bq = new BufferQueue(true, mAlloc);
+    sp<BufferQueue> consumer = new BufferQueue(true, mAlloc);
 #endif
-    mFBSurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, bq);
+    mFBSurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, consumer);
 
 #if ANDROID_VERSION == 17
-    sp<SurfaceTextureClient> stc = new SurfaceTextureClient(static_cast<sp<ISurfaceTexture> >(mFBSurface->getBufferQueue()));
+    sp<SurfaceTextureClient> stc = new SurfaceTextureClient(
+        static_cast<sp<ISurfaceTexture> >(mFBSurface->getBufferQueue()));
 #else
-    sp<Surface> stc = new Surface(static_cast<sp<IGraphicBufferProducer> >(bq));
+    sp<Surface> stc = new Surface(producer);
 #endif
     mSTClient = stc;
     mSTClient->perform(mSTClient.get(), NATIVE_WINDOW_SET_BUFFER_COUNT, 2);
-    mSTClient->perform(mSTClient.get(), NATIVE_WINDOW_SET_USAGE, GRALLOC_USAGE_HW_FB | GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER);
+    mSTClient->perform(mSTClient.get(), NATIVE_WINDOW_SET_USAGE,
+                                        GRALLOC_USAGE_HW_FB |
+                                        GRALLOC_USAGE_HW_RENDER |
+                                        GRALLOC_USAGE_HW_COMPOSER);
 
     mList = (hwc_display_contents_1_t *)malloc(sizeof(*mList) + (sizeof(hwc_layer_1_t)*2));
     if (mHwc)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/nsAppShell.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/nsAppShell.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/nsAppShell.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/nsAppShell.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -715,7 +715,7 @@
     int32_t action = args->action & AMOTION_EVENT_ACTION_MASK;
     int touchCount = args->pointerCount;
     MOZ_ASSERT(touchCount <= MAX_POINTERS);
-    TimeStamp timestamp = TimeStamp(args->eventTime);
+    TimeStamp timestamp = mozilla::TimeStamp::FromSystemTime(args->eventTime);
     Modifiers modifiers = getDOMModifiers(args->metaState);
 
     MultiTouchInput::MultiTouchType touchType = MultiTouchInput::MULTITOUCH_CANCEL;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/nsWindow.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/nsWindow.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/nsWindow.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/nsWindow.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -455,7 +455,7 @@
 }
 
 NS_IMETHODIMP
-nsWindow::MakeFullScreen(bool aFullScreen)
+nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen*)
 {
     if (mWindowType != eWindowType_toplevel) {
         // Ignore fullscreen request for non-toplevel windows.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/nsWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/nsWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gonk/nsWindow.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gonk/nsWindow.h	2014-11-26 21:46:06.000000000 +0000
@@ -95,7 +95,7 @@
     }
     NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent);
 
-    NS_IMETHOD MakeFullScreen(bool aFullScreen) /*MOZ_OVERRIDE*/;
+    NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr) /*MOZ_OVERRIDE*/;
 
     virtual mozilla::TemporaryRef<mozilla::gfx::DrawTarget>
         StartRemoteDrawing() MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/mozgtk/mozgtk.c thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/mozgtk/mozgtk.c
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/mozgtk/mozgtk.c	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/mozgtk/mozgtk.c	2014-11-26 21:46:07.000000000 +0000
@@ -121,6 +121,7 @@
 STUB(gdk_x11_screen_get_xscreen)
 STUB(gdk_x11_visual_get_xvisual)
 STUB(gdk_x11_window_lookup_for_display)
+STUB(gdk_x11_window_set_user_time)
 STUB(gdk_x11_xatom_to_atom)
 STUB(gtk_accel_label_new)
 STUB(gtk_alignment_get_type)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsGtkIMModule.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsGtkIMModule.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsGtkIMModule.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsGtkIMModule.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -369,8 +369,7 @@
                 // IM.  For compromising this issue, we should dispatch
                 // compositionend event, however, we don't need to reset IM
                 // actually.
-                DispatchCompositionEventsForCommit(activeContext,
-                                                   EmptyString());
+                DispatchCompositionCommitEvent(activeContext, &EmptyString());
                 filterThisEvent = false;
             }
         } else {
@@ -749,7 +748,7 @@
     }
 
     // Be aware, widget can be gone
-    DispatchCompositionEventsForCommit(aContext, mDispatchedCompositionString);
+    DispatchCompositionCommitEvent(aContext);
 }
 
 /* static */
@@ -921,7 +920,7 @@
 
     NS_ConvertUTF8toUTF16 str(commitString);
     // Be aware, widget can be gone
-    DispatchCompositionEventsForCommit(aContext, str);
+    DispatchCompositionCommitEvent(aContext, &str);
 }
 
 void
@@ -1096,14 +1095,15 @@
 }
 
 bool
-nsGtkIMModule::DispatchCompositionEventsForCommit(
+nsGtkIMModule::DispatchCompositionCommitEvent(
                    GtkIMContext* aContext,
-                   const nsAString& aCommitString)
+                   const nsAString* aCommitString)
 {
     PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
-        ("GtkIMModule(%p): DispatchCompositionEventsForCommit, aContext=%p, "
-         "aCommitString=\"%s\"",
-         this, aContext, NS_ConvertUTF16toUTF8(aCommitString).get()));
+        ("GtkIMModule(%p): DispatchCompositionCommitEvent, aContext=%p, "
+         "aCommitString=%p, (\"%s\")",
+         this, aContext, aCommitString,
+         aCommitString ? NS_ConvertUTF16toUTF8(*aCommitString).get() : ""));
 
     if (!mLastFocusedWindow) {
         PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
@@ -1112,7 +1112,7 @@
     }
 
     if (!IsComposing()) {
-        if (aCommitString.IsEmpty()) {
+        if (!aCommitString || aCommitString->IsEmpty()) {
             PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    FAILED, there is no composition and empty commit "
                  "string"));
@@ -1128,56 +1128,28 @@
 
     nsRefPtr<nsWindow> lastFocusedWindow(mLastFocusedWindow);
 
-    // First, dispatch a compositionchange event for committing with
-    // aCommitString.
-    mCompositionState =
-        eCompositionState_CommitCompositionChangeEventDispatched;
-
-    WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
-                                                  mLastFocusedWindow);
-    InitEvent(compositionChangeEvent);
-    compositionChangeEvent.mData = aCommitString;
-
-    nsEventStatus status = nsEventStatus_eIgnore;
-    mLastFocusedWindow->DispatchEvent(&compositionChangeEvent, status);
-
-    if (!IsComposing()) {
-        PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
-            ("    FAILED, there is no composition during dispatching "
-             "a compositionchange event for committing the composition"));
-        if (lastFocusedWindow->IsDestroyed() ||
-            lastFocusedWindow != mLastFocusedWindow) {
-            PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
-                ("    NOTE, the focused widget was destroyed/changed by "
-                 "compositionchange event"));
-            return false;
-        }
-        return true;
-    }
-
-    // Next, forget current composition before dispatching a composionend event.
+    uint32_t message = aCommitString ? NS_COMPOSITION_COMMIT :
+                                       NS_COMPOSITION_COMMIT_AS_IS;
     mCompositionState = eCompositionState_NotComposing;
     mCompositionStart = UINT32_MAX;
     mCompositionTargetOffset = UINT32_MAX;
     mDispatchedCompositionString.Truncate();
 
-    // Finally, dispatch a compositionend event if it's possible.
-    if (!lastFocusedWindow->IsDestroyed() &&
-        lastFocusedWindow == mLastFocusedWindow) {
-        WidgetCompositionEvent compositionEndEvent(true, NS_COMPOSITION_END,
-                                                   mLastFocusedWindow);
-        InitEvent(compositionEndEvent);
-        compositionEndEvent.mData = aCommitString;
-
-        status = nsEventStatus_eIgnore;
-        mLastFocusedWindow->DispatchEvent(&compositionEndEvent, status);
+    WidgetCompositionEvent compositionCommitEvent(true, message,
+                                                  mLastFocusedWindow);
+    InitEvent(compositionCommitEvent);
+    if (message == NS_COMPOSITION_COMMIT) {
+        compositionCommitEvent.mData = *aCommitString;
     }
 
+    nsEventStatus status = nsEventStatus_eIgnore;
+    mLastFocusedWindow->DispatchEvent(&compositionCommitEvent, status);
+
     if (lastFocusedWindow->IsDestroyed() ||
         lastFocusedWindow != mLastFocusedWindow) {
         PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
             ("    NOTE, the focused widget was destroyed/changed by "
-             "compositionend event"));
+             "compositioncommit event"));
         return false;
     }
 
@@ -1493,7 +1465,7 @@
     bool editorHadCompositionString = EditorHasCompositionString();
     if (wasComposing) {
         selOffset = mCompositionStart;
-        if (!DispatchCompositionEventsForCommit(aContext, mSelectedString)) {
+        if (!DispatchCompositionCommitEvent(aContext, &mSelectedString)) {
             PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
                 ("    FAILED, quitting from DeletText"));
             return NS_ERROR_FAILURE;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsGtkIMModule.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsGtkIMModule.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsGtkIMModule.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsGtkIMModule.h	2014-11-26 21:46:07.000000000 +0000
@@ -128,8 +128,7 @@
     enum eCompositionState {
         eCompositionState_NotComposing,
         eCompositionState_CompositionStartDispatched,
-        eCompositionState_CompositionChangeEventDispatched,
-        eCompositionState_CommitCompositionChangeEventDispatched
+        eCompositionState_CompositionChangeEventDispatched
     };
     eCompositionState mCompositionState;
 
@@ -164,8 +163,6 @@
                 return "CompositionStartDispatched";
             case eCompositionState_CompositionChangeEventDispatched:
                 return "CompositionChangeEventDispatched";
-            case eCompositionState_CommitCompositionChangeEventDispatched:
-                return "CommitCompositionChangeEventDispatched";
             default:
                 return "InvaildState";
         }
@@ -317,7 +314,7 @@
      *    FALSE, callers cannot continue the composition.
      *      - DispatchCompositionStart
      *      - DispatchCompositionChangeEvent
-     *      - DispatchCompositionEventsForCommit
+     *      - DispatchCompositionCommitEvent
      */
 
     /**
@@ -341,17 +338,19 @@
                                         const nsAString& aCompositionString);
 
     /**
-     * Dispatches a compositionchange event for committing the composition
-     * string and a compositionend event.
+     * Dispatches a compositioncommit event or compositioncommitasis event.
      *
      * @param aContext              A GtkIMContext which is being handled.
-     * @param aCommitString         The string which the composition is
-     *                              committed with.
+     * @param aCommitString         If this is nullptr, the composition will
+     *                              be committed with last dispatched data.
+     *                              Otherwise, the composition will be
+     *                              committed with this value.
      * @return                      true if the focused widget is neither
      *                              destroyed nor changed.  Otherwise, false.
      */
-    bool DispatchCompositionEventsForCommit(GtkIMContext* aContext,
-                                            const nsAString& aCommitString);
+    bool DispatchCompositionCommitEvent(
+             GtkIMContext* aContext,
+             const nsAString* aCommitString = nullptr);
 };
 
 #endif // __nsGtkIMModule_h__
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsWindow.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsWindow.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsWindow.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsWindow.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -1295,13 +1295,7 @@
     }
 
     if (sn_launchee_context_get_id_has_timestamp(ctx)) {
-        PRLibrary* gtkLibrary;
-        SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc)
-            PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", &gtkLibrary);
-        if (setUserTimeFunc) {
-            setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx));
-            PR_UnloadLibrary(gtkLibrary);
-        }
+        gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx));
     }
 
     sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow));
@@ -4710,7 +4704,7 @@
 }
 
 NS_IMETHODIMP
-nsWindow::MakeFullScreen(bool aFullScreen)
+nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
 {
     LOG(("nsWindow::MakeFullScreen [%p] aFullScreen %d\n",
          (void *)this, aFullScreen));
@@ -6011,12 +6005,79 @@
     return updatePreference;
 }
 
+bool
+nsWindow::ExecuteNativeKeyBindingRemapped(NativeKeyBindingsType aType,
+                                          const WidgetKeyboardEvent& aEvent,
+                                          DoCommandCallback aCallback,
+                                          void* aCallbackData,
+                                          uint32_t aGeckoKeyCode,
+                                          uint32_t aNativeKeyCode)
+{
+    WidgetKeyboardEvent modifiedEvent(aEvent);
+    modifiedEvent.keyCode = aGeckoKeyCode;
+    static_cast<GdkEventKey*>(modifiedEvent.mNativeKeyEvent)->keyval =
+        aNativeKeyCode;
+
+    NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
+    return keyBindings->Execute(modifiedEvent, aCallback, aCallbackData);
+}
+
 NS_IMETHODIMP_(bool)
 nsWindow::ExecuteNativeKeyBinding(NativeKeyBindingsType aType,
                                   const WidgetKeyboardEvent& aEvent,
                                   DoCommandCallback aCallback,
                                   void* aCallbackData)
 {
+    if (aEvent.keyCode >= nsIDOMKeyEvent::DOM_VK_LEFT &&
+        aEvent.keyCode <= nsIDOMKeyEvent::DOM_VK_DOWN) {
+
+        // Check if we're targeting content with vertical writing mode,
+        // and if so remap the arrow keys.
+        WidgetQueryContentEvent query(true, NS_QUERY_SELECTED_TEXT, this);
+        nsEventStatus status;
+        DispatchEvent(&query, status);
+
+        if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) {
+            uint32_t geckoCode = 0;
+            uint32_t gdkCode = 0;
+            switch (aEvent.keyCode) {
+            case nsIDOMKeyEvent::DOM_VK_LEFT:
+                if (query.mReply.mWritingMode.IsVerticalLR()) {
+                    geckoCode = nsIDOMKeyEvent::DOM_VK_UP;
+                    gdkCode = GDK_Up;
+                } else {
+                    geckoCode = nsIDOMKeyEvent::DOM_VK_DOWN;
+                    gdkCode = GDK_Down;
+                }
+                break;
+
+            case nsIDOMKeyEvent::DOM_VK_RIGHT:
+                if (query.mReply.mWritingMode.IsVerticalLR()) {
+                    geckoCode = nsIDOMKeyEvent::DOM_VK_DOWN;
+                    gdkCode = GDK_Down;
+                } else {
+                    geckoCode = nsIDOMKeyEvent::DOM_VK_UP;
+                    gdkCode = GDK_Up;
+                }
+                break;
+
+            case nsIDOMKeyEvent::DOM_VK_UP:
+                geckoCode = nsIDOMKeyEvent::DOM_VK_LEFT;
+                gdkCode = GDK_Left;
+                break;
+
+            case nsIDOMKeyEvent::DOM_VK_DOWN:
+                geckoCode = nsIDOMKeyEvent::DOM_VK_RIGHT;
+                gdkCode = GDK_Right;
+                break;
+            }
+
+            return ExecuteNativeKeyBindingRemapped(aType, aEvent, aCallback,
+                                                   aCallbackData,
+                                                   geckoCode, gdkCode);
+        }
+    }
+
     NativeKeyBindings* keyBindings = NativeKeyBindings::GetInstance(aType);
     return keyBindings->Execute(aEvent, aCallback, aCallbackData);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/gtk/nsWindow.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/gtk/nsWindow.h	2014-11-26 21:46:07.000000000 +0000
@@ -146,7 +146,7 @@
                                            bool aIntersectWithExisting) MOZ_OVERRIDE;
     virtual bool       HasPendingInputEvent();
 
-    NS_IMETHOD         MakeFullScreen(bool aFullScreen);
+    NS_IMETHOD         MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr);
     NS_IMETHOD         HideWindowChrome(bool aShouldHide);
 
     /**
@@ -263,6 +263,13 @@
                                       const InputContextAction& aAction);
     NS_IMETHOD_(InputContext) GetInputContext();
     virtual nsIMEUpdatePreference GetIMEUpdatePreference();
+    bool ExecuteNativeKeyBindingRemapped(
+                        NativeKeyBindingsType aType,
+                        const mozilla::WidgetKeyboardEvent& aEvent,
+                        DoCommandCallback aCallback,
+                        void* aCallbackData,
+                        uint32_t aGeckoKeyCode,
+                        uint32_t aNativeKeyCode);
     NS_IMETHOD_(bool) ExecuteNativeKeyBinding(
                         NativeKeyBindingsType aType,
                         const mozilla::WidgetKeyboardEvent& aEvent,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/InputData.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/InputData.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/InputData.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/InputData.h	2014-11-26 21:46:06.000000000 +0000
@@ -27,13 +27,15 @@
   MULTITOUCH_INPUT,
   PANGESTURE_INPUT,
   PINCHGESTURE_INPUT,
-  TAPGESTURE_INPUT
+  TAPGESTURE_INPUT,
+  SCROLLWHEEL_INPUT
 };
 
 class MultiTouchInput;
 class PanGestureInput;
 class PinchGestureInput;
 class TapGestureInput;
+class ScrollWheelInput;
 
 // This looks unnecessary now, but as we add more and more classes that derive
 // from InputType (eventually probably almost as many as *Events.h has), it
@@ -72,6 +74,7 @@
   INPUTDATA_AS_CHILD_TYPE(PanGestureInput, PANGESTURE_INPUT)
   INPUTDATA_AS_CHILD_TYPE(PinchGestureInput, PINCHGESTURE_INPUT)
   INPUTDATA_AS_CHILD_TYPE(TapGestureInput, TAPGESTURE_INPUT)
+  INPUTDATA_AS_CHILD_TYPE(ScrollWheelInput, SCROLLWHEEL_INPUT)
 
   InputData()
   {
@@ -431,6 +434,60 @@
   ParentLayerPoint mLocalPoint;
 };
 
+// Encapsulation class for scroll-wheel events. These are generated by mice
+// with physical scroll wheels, and on Windows by most touchpads when using
+// scroll gestures.
+class ScrollWheelInput : public InputData
+{
+public:
+  enum ScrollDeltaType
+  {
+    // There are three kinds of scroll delta modes in Gecko: "page", "line" and
+    // "pixel". For apz, we currently only support "line" mode.
+    SCROLLDELTA_LINE
+  };
+
+  enum ScrollMode
+  {
+    SCROLLMODE_INSTANT,
+    SCROLLMODE_SMOOTH
+  };
+
+  ScrollWheelInput(uint32_t aTime,
+                   TimeStamp aTimeStamp,
+                   Modifiers aModifiers,
+                   ScrollMode aScrollMode,
+                   ScrollDeltaType aDeltaType,
+                   const ScreenPoint& aOrigin,
+                   double aDeltaX,
+                   double aDeltaY)
+   : InputData(SCROLLWHEEL_INPUT, aTime, aTimeStamp, aModifiers),
+     mDeltaType(aDeltaType),
+     mScrollMode(aScrollMode),
+     mOrigin(aOrigin),
+     mDeltaX(aDeltaX),
+     mDeltaY(aDeltaY)
+  {}
+
+  ScrollDeltaType mDeltaType;
+  ScrollMode mScrollMode;
+  ScreenPoint mOrigin;
+
+  // Deltas are in units corresponding to the delta type. For line deltas, they
+  // are the number of line units to scroll. The number of device pixels for a
+  // horizontal and vertical line unit are in FrameMetrics::mLineScrollAmount.
+  //
+  // The horizontal (X) delta is > 0 for scrolling right and < 0 for scrolling
+  // left. The vertical (Y) delta is < 0 for scrolling up and > 0 for
+  // scrolling down.
+  double mDeltaX;
+  double mDeltaY;
+
+  // The location of the scroll in local coordinates. This is set and used by
+  // APZ.
+  ParentLayerPoint mLocalOrigin;
+};
+
 }
 
 #endif // InputData_h__
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/moz.build	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/moz.build	2014-11-26 21:46:07.000000000 +0000
@@ -29,6 +29,7 @@
     ]
 elif toolkit == 'cocoa':
     XPIDL_SOURCES += [
+        'nsIGfxInfo2.idl',
         'nsIMacDockSupport.idl',
         'nsIMacWebAppUtils.idl',
         'nsIStandaloneNativeMenu.idl',
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsBaseDragService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsBaseDragService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsBaseDragService.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsBaseDragService.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -648,7 +648,7 @@
 nsBaseDragService::ConvertToUnscaledDevPixels(nsPresContext* aPresContext,
                                               int32_t* aScreenX, int32_t* aScreenY)
 {
-  int32_t adj = aPresContext->DeviceContext()->UnscaledAppUnitsPerDevPixel();
+  int32_t adj = aPresContext->DeviceContext()->AppUnitsPerDevPixelAtUnitFullZoom();
   *aScreenX = nsPresContext::CSSPixelsToAppUnits(*aScreenX) / adj;
   *aScreenY = nsPresContext::CSSPixelsToAppUnits(*aScreenY) / adj;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsBaseWidget.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsBaseWidget.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsBaseWidget.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsBaseWidget.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -42,7 +42,6 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/MouseEvents.h"
 #include "GLConsts.h"
-#include "LayerScope.h"
 #include "mozilla/unused.h"
 
 #ifdef ACCESSIBILITY
@@ -172,8 +171,6 @@
 
 void nsBaseWidget::DestroyCompositor()
 {
-  LayerScope::DeInit();
-
   if (mCompositorChild) {
     mCompositorChild->SendWillStop();
     mCompositorChild->Destroy();
@@ -741,7 +738,7 @@
 // Put the window into full-screen mode
 //
 //-------------------------------------------------------------------------
-NS_IMETHODIMP nsBaseWidget::MakeFullScreen(bool aFullScreen)
+NS_IMETHODIMP nsBaseWidget::MakeFullScreen(bool aFullScreen, nsIScreen* aScreen)
 {
   HideWindowChrome(aFullScreen);
 
@@ -761,12 +758,16 @@
     screenManager = do_GetService("@mozilla.org/gfx/screenmanager;1");
     NS_ASSERTION(screenManager, "Unable to grab screenManager.");
     if (screenManager) {
-      nsCOMPtr<nsIScreen> screen;
-      screenManager->ScreenForRect(mOriginalBounds->x,
-                                   mOriginalBounds->y,
-                                   mOriginalBounds->width,
-                                   mOriginalBounds->height,
-                                   getter_AddRefs(screen));
+      nsCOMPtr<nsIScreen> screen = aScreen;
+      if (!screen) {
+        // no screen was passed in, use the one that the window is on
+        screenManager->ScreenForRect(mOriginalBounds->x,
+                                     mOriginalBounds->y,
+                                     mOriginalBounds->width,
+                                     mOriginalBounds->height,
+                                     getter_AddRefs(screen));
+      }
+
       if (screen) {
         int32_t left, top, width, height;
         if (NS_SUCCEEDED(screen->GetRectDisplayPix(&left, &top, &width, &height))) {
@@ -937,9 +938,6 @@
     return;
   }
 
-  // Initialize LayerScope on the main thread.
-  LayerScope::Init();
-
   mCompositorParent = NewCompositorParent(aWidth, aHeight);
   MessageChannel *parentChannel = mCompositorParent->GetIPCChannel();
   nsRefPtr<ClientLayerManager> lm = new ClientLayerManager(this);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsBaseWidget.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsBaseWidget.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsBaseWidget.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsBaseWidget.h	2014-11-26 21:46:07.000000000 +0000
@@ -127,7 +127,7 @@
   virtual void            SetShowsFullScreenButton(bool aShow) {}
   virtual void            SetWindowAnimationType(WindowAnimationType aType) {}
   NS_IMETHOD              HideWindowChrome(bool aShouldHide);
-  NS_IMETHOD              MakeFullScreen(bool aFullScreen);
+  NS_IMETHOD              MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr);
   virtual nsDeviceContext* GetDeviceContext();
   virtual LayerManager*   GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
                                           LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsFilePickerProxy.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsFilePickerProxy.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsFilePickerProxy.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsFilePickerProxy.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -136,8 +136,13 @@
 {
   mCallback = aCallback;
 
-  SendOpen(mSelectedType, mAddToRecentDocs, mDefault,
-           mDefaultExtension, mFilters, mFilterNames);
+  nsString displayDirectory;
+  if (mDisplayDirectory) {
+    mDisplayDirectory->GetPath(displayDirectory);
+  }
+
+  SendOpen(mSelectedType, mAddToRecentDocs, mDefault, mDefaultExtension,
+           mFilters, mFilterNames, displayDirectory);
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsIGfxInfo2.idl thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsIGfxInfo2.idl
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsIGfxInfo2.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsIGfxInfo2.idl	2014-11-26 21:46:07.000000000 +0000
@@ -0,0 +1,24 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+/**
+ * nsIGfxInfo2 is a separately implemented extension of nsIGfxInfo, to
+ * allow us (in effect) to tack things onto the nsIGfxInfo interface
+ * without changing it.
+ */
+
+[scriptable, uuid(9C8D8F44-6D52-45AA-8921-734EF4DF5DFE)]
+interface nsIGfxInfo2 : nsISupports
+{
+  /**
+   * Not really Gfx-related.  Here for convenience,
+   * possibly only temporarily.  See bug 1102295.
+   */
+  readonly attribute DOMString countryCode;
+};
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsIWidget.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsIWidget.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/nsIWidget.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/nsIWidget.h	2014-11-26 21:46:07.000000000 +0000
@@ -33,6 +33,7 @@
 class   ViewWrapper;
 class   nsIWidgetListener;
 class   nsIntRegion;
+class   nsIScreen;
 
 namespace mozilla {
 namespace dom {
@@ -1405,9 +1406,12 @@
 
     /**
      * Put the toplevel window into or out of fullscreen mode.
-     *
+     * If aTargetScreen is given, attempt to go fullscreen on that screen,
+     * if possible.  (If not, it behaves as if aTargetScreen is null.)
+     * If !aFullScreen, aTargetScreen is ignored.
+     * aTargetScreen support is currently only implemented on Windows.
      */
-    NS_IMETHOD MakeFullScreen(bool aFullScreen) = 0;
+    NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr) = 0;
 
     /**
      * Invalidate a specified rect for a widget so that it will be repainted
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/PuppetWidget.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/PuppetWidget.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/PuppetWidget.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/PuppetWidget.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -331,7 +331,8 @@
     aStatus = mAttachedWidgetListener->HandleEvent(event, mUseAttachedEvents);
   }
 
-  if (event->message == NS_COMPOSITION_END) {
+  if (event->mClass == eCompositionEventClass &&
+      event->AsCompositionEvent()->CausesDOMCompositionEndEvent()) {
     mIMEComposing = false;
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/moz.build	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/moz.build	2014-11-26 21:46:07.000000000 +0000
@@ -42,7 +42,7 @@
 
 if CONFIG['MOZ_X11']:
     LOCAL_INCLUDES += [
-        '../shared/x11',
+        '../x11',
     ]
 
 #DEFINES['DEBUG_WIDGETS'] = True
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/nsPrintSettingsQt.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/nsPrintSettingsQt.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/nsPrintSettingsQt.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/nsPrintSettingsQt.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -291,15 +291,9 @@
 NS_IMETHODIMP
 nsPrintSettingsQt::GetPaperName(char16_t** aPaperName)
 {
-    PR_STATIC_ASSERT(sizeof(indexToPaperName)/
-        sizeof(char*) == QPrinter::NPageSize);
-    PR_STATIC_ASSERT(sizeof(indexToQtPaperEnum)/
-        sizeof(QPrinter::PageSize) == QPrinter::NPageSize);
-
     QPrinter::PaperSize size = mQPrinter->paperSize();
     QString name(indexToPaperName[size]);
-    *aPaperName = ToNewUnicode(nsDependentString
-        ((const char16_t*)name.constData()));
+    *aPaperName = ToNewUnicode(nsDependentString((const char16_t*)name.constData()));
     return NS_OK;
 }
 
@@ -307,7 +301,7 @@
 nsPrintSettingsQt::SetPaperName(const char16_t* aPaperName)
 {
     QString ref((QChar*)aPaperName, NS_strlen(aPaperName));
-    for (uint32_t i = 0; i < QPrinter::NPageSize; i++)
+    for (uint32_t i = 0; i < sizeof(indexToPaperName)/sizeof(char*); i++)
     {
         if (ref == QString(indexToPaperName[i])) {
             mQPrinter->setPageSize(indexToQtPaperEnum[i]);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/nsWindow.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/nsWindow.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/nsWindow.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/nsWindow.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -732,7 +732,7 @@
 }
 
 NS_IMETHODIMP
-nsWindow::MakeFullScreen(bool aFullScreen)
+nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen*)
 {
     NS_ENSURE_TRUE(mWidget, NS_ERROR_FAILURE);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/nsWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/nsWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/qt/nsWindow.h	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/qt/nsWindow.h	2014-11-26 21:46:07.000000000 +0000
@@ -134,7 +134,7 @@
     }
     NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent);
 
-    NS_IMETHOD MakeFullScreen(bool aFullScreen);
+    NS_IMETHOD MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen = nullptr);
     virtual mozilla::layers::LayerManager*
         GetLayerManager(PLayerTransactionChild* aShadowManager = nullptr,
                         LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/test_assign_event_data.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/test_assign_event_data.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/test_assign_event_data.html	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/test_assign_event_data.html	2014-11-26 21:46:07.000000000 +0000
@@ -186,16 +186,7 @@
         "caret": { "start": 1, "length": 0 }
       });
       synthesizeKey("a", { type: "keyup" });
-      synthesizeCompositionChange({ "composition":
-        { "string": "\u306D",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 1, "length": 0 }
-      });
-      synthesizeComposition({ type: "compositionend", data: "\u732B" });
+      synthesizeComposition({ type: "compositioncommitasis" });
     },
     canRun: function () {
       return true;
@@ -218,16 +209,7 @@
         "caret": { "start": 1, "length": 0 }
       });
       synthesizeKey("VK_RETURN", { type: "keydown" });
-      synthesizeCompositionChange({ "composition":
-        { "string": "\u306D",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 1, "length": 0 }
-      });
-      synthesizeComposition({ type: "compositionend", data: "\u732B" });
+      synthesizeComposition({ type: "compositioncommitasis" });
       synthesizeKey("VK_RETURN", { type: "keyup" });
     },
     canRun: function () {
@@ -288,16 +270,7 @@
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeCompositionChange({ "composition":
-        { "string": "\u306D",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 1, "length": 0 }
-      });
-      synthesizeComposition({ type: "compositionend", data: "\u732B" });
+      synthesizeComposition({ type: "compositioncommit", data: "\u306D" });
     },
     canRun: function () {
       return true;
@@ -310,16 +283,7 @@
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeComposition({ type: "compositionstart" });
-      synthesizeCompositionChange({ "composition":
-        { "string": "\u30E9\u30FC\u30E1\u30F3",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 4, "length": 0 }
-      });
-      synthesizeComposition({ type: "compositionend", data: "\u30E9\u30FC\u30E1\u30F3" });
+      synthesizeComposition({ type: "compositioncommit", data: "\u30E9\u30FC\u30E1\u30F3" });
     },
     canRun: function () {
       return true;
@@ -363,16 +327,7 @@
   { description: "InternalEditorInputEvent (input at committing)",
     targetID: "input-text", eventType: "input",
     dispatchEvent: function () {
-      synthesizeCompositionChange({ "composition":
-        { "string": "\u30E9\u30FC\u30E1\u30F3",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 4, "length": 0 }
-      });
-      synthesizeComposition({ type: "compositionend", data: "\u30E9\u30FC\u30E1\u30F3" });
+      synthesizeComposition({ type: "compositioncommitasis" });
     },
     canRun: function () {
       return true;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/test_imestate.html thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/test_imestate.html
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/test_imestate.html	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/test_imestate.html	2014-11-26 21:46:07.000000000 +0000
@@ -1266,18 +1266,7 @@
      description + "#3 IME isn't enabled on HTML editor");
 
   // cancel the composition
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 0, "length": 0 }
-    });
-
-  synthesizeComposition({ type: "compositionend", data: "" });
+  synthesizeComposition({ type: "compositioncommit", data: "" });
 
   container.removeAttribute("contenteditable");
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/test_input_events_on_deactive_window.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/test_input_events_on_deactive_window.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/test_input_events_on_deactive_window.xul	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/test_input_events_on_deactive_window.xul	2014-11-26 21:46:07.000000000 +0000
@@ -195,17 +195,8 @@
        "query selected text event returns wrong selected text");
     clear();
     // commit composition
-    synthesizeCompositionChange(
-      { "composition":
-        { "string": "\u3089",
-          "clauses":
-          [
-            { "length": 0, "attr": 0 }
-          ]
-        },
-        "caret": { "start": 1, "length": 0 }
-      });
-    checkCompositionEvents(false, false, false, false, "commit composition");
+    synthesizeComposition({ type: "compositioncommitasis" });
+    checkCompositionEvents(false, true, false, true, "commit composition as is");
     queryText = synthesizeQueryTextContent(0, 100);
     ok(queryText, "query text event result is null after commit");
     if (!queryText) {
@@ -232,9 +223,6 @@
     is(querySelectedText.text, "",
        "query selected text event returns wrong selected text after commit");
     clear();
-    // end composition
-    synthesizeComposition({ type: "compositionend", data: "\u3089" });
-    checkCompositionEvents(false, true, false, true, "compositionend");
   }
 
   textarea.removeEventListener("keydown", onEvent, false);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/window_composition_text_querycontent.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/window_composition_text_querycontent.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/tests/window_composition_text_querycontent.xul	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/tests/window_composition_text_querycontent.xul	2014-11-26 21:46:07.000000000 +0000
@@ -230,19 +230,7 @@
     });
 
   // commit
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u732B",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
-  // end composition
-  synthesizeComposition({ type: "compositionend", data: "\u732B" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   // start composition
   synthesizeComposition({ type: "compositionstart" });
@@ -260,19 +248,7 @@
     });
 
   // cancel the composition
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 0, "length": 0 }
-    });
-
-  // end composition
-  synthesizeComposition({ type: "compositionend", data: "" });
+  synthesizeComposition({ type: "compositioncommit", data: "" });
 
   // start composition
   synthesizeComposition({ type: "compositionstart" });
@@ -325,19 +301,7 @@
     });
 
   // commit
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u5A18",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
-  // end composition
-  synthesizeComposition({ type: "compositionend", data: "\u5A18" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   synthesizeKey(" ", {});
   synthesizeKey("m", {});
@@ -433,19 +397,7 @@
     });
 
   // commit
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u5996\u602a",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 2, "length": 0 }
-    });
-
-  // end composition
-  synthesizeComposition({ type: "compositionend", data: "\u5996\u602a" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   synthesizeKey("VK_BACK_SPACE", {});
   synthesizeKey("VK_BACK_SPACE", {});
@@ -614,6 +566,343 @@
   }
 }
 
+function runCompositionCommitAsIsTest()
+{
+  textarea.focus();
+
+  var result = {};
+  function clearResult()
+  {
+    result = { compositionupdate: false, compositionend: false, text: false, input: false }
+  }
+
+  function handler(aEvent)
+  {
+    result[aEvent.type] = true;
+  }
+
+  textarea.addEventListener("compositionupdate", handler, true);
+  textarea.addEventListener("compositionend", handler, true);
+  textarea.addEventListener("input", handler, true);
+  textarea.addEventListener("text", handler, true);
+
+  // compositioncommitasis with composing string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitAsIsTest: textarea doesn't have composition string #1");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommitasis" });
+
+  is(result.compositionupdate, false, "runCompositionCommitAsIsTest: compositionupdate shouldn't be fired after dispatching compositioncommitasis #1");
+  is(result.compositionend, true, "runCompositionCommitAsIsTest: compositionend should be fired after dispatching compositioncommitasis #1");
+  is(result.text, true, "runCompositionCommitAsIsTest: text should be fired after dispatching compositioncommitasis because it's dispatched when there is composing string #1");
+  is(result.input, true, "runCompositionCommitAsIsTest: input should be fired after dispatching compositioncommitasis #1");
+  is(textarea.value, "\u3042", "runCompositionCommitAsIsTest: textarea doesn't have committed string #1");
+
+  // compositioncommitasis with committed string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitAsIsTest: textarea doesn't have composition string #2");
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 0, "attr": 0 }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitAsIsTest: textarea doesn't have committed string #2");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommitasis" });
+
+  is(result.compositionupdate, false, "runCompositionCommitAsIsTest: compositionupdate shouldn't be fired after dispatching compositioncommitasis #2");
+  is(result.compositionend, true, "runCompositionCommitAsIsTest: compositionend should be fired after dispatching compositioncommitasis #2");
+  is(result.text, false, "runCompositionCommitAsIsTest: text shouldn't be fired after dispatching compositioncommitasis because it's dispatched when there is already committed string #2");
+  is(result.input, true, "runCompositionCommitAsIsTest: input should be fired after dispatching compositioncommitasis #2");
+  is(textarea.value, "\u3042", "runCompositionCommitAsIsTest: textarea doesn't have committed string #2");
+
+  // compositioncommitasis with committed string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitAsIsTest: textarea doesn't have composition string #3");
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "",
+        "clauses":
+        [
+          { "length": 0, "attr": 0 }
+        ]
+      },
+      "caret": { "start": 0, "length": 0 }
+    });
+  is(textarea.value, "", "runCompositionCommitAsIsTest: textarea has non-empty composition string #3");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommitasis" });
+
+  is(result.compositionupdate, false, "runCompositionCommitAsIsTest: compositionupdate shouldn't be fired after dispatching compositioncommitasis #3");
+  is(result.compositionend, true, "runCompositionCommitAsIsTest: compositionend should be fired after dispatching compositioncommitasis #3");
+  is(result.text, false, "runCompositionCommitAsIsTest: text shouldn't be fired after dispatching compositioncommitasis because it's dispatched when there is empty composition string #3");
+  is(result.input, true, "runCompositionCommitAsIsTest: input should be fired after dispatching compositioncommitasis #3");
+  is(textarea.value, "", "runCompositionCommitAsIsTest: textarea doesn't have committed string #3");
+
+  textarea.removeEventListener("compositionupdate", handler, true);
+  textarea.removeEventListener("compositionend", handler, true);
+  textarea.removeEventListener("input", handler, true);
+  textarea.removeEventListener("text", handler, true);
+}
+
+function runCompositionCommitTest()
+{
+  textarea.focus();
+
+  var result = {};
+  function clearResult()
+  {
+    result = { compositionupdate: false, compositionend: false, text: false, input: false }
+  }
+
+  function handler(aEvent)
+  {
+    result[aEvent.type] = true;
+  }
+
+  textarea.addEventListener("compositionupdate", handler, true);
+  textarea.addEventListener("compositionend", handler, true);
+  textarea.addEventListener("input", handler, true);
+  textarea.addEventListener("text", handler, true);
+
+  // compositioncommit with different composing string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #1");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "\u3043" });
+
+  is(result.compositionupdate, true, "runCompositionCommitTest: compositionupdate should be fired after dispatching compositioncommit #1");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #1");
+  is(result.text, true, "runCompositionCommitTest: text should be fired after dispatching compositioncommit because it's dispatched when there is compoing string #1");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #1");
+  is(textarea.value, "\u3043", "runCompositionCommitTest: textarea doesn't have committed string #1");
+
+  // compositioncommit with different committed string when there is already committed string
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #2");
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 0, "attr": 0 }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have committed string #2");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "\u3043" });
+
+  is(result.compositionupdate, true, "runCompositionCommitTest: compositionupdate should be fired after dispatching compositioncommit #2");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #2");
+  is(result.text, true, "runCompositionCommitTest: text should be fired after dispatching compositioncommit #2");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #2");
+  is(textarea.value, "\u3043", "runCompositionCommitTest: textarea doesn't have committed string #2");
+
+  // compositioncommit with empty composition string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #3");
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "",
+        "clauses":
+        [
+          { "length": 0, "attr": 0 }
+        ]
+      },
+      "caret": { "start": 0, "length": 0 }
+    });
+  is(textarea.value, "", "runCompositionCommitTest: textarea has non-empty composition string #3");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "\u3043" });
+
+  is(result.compositionupdate, true, "runCompositionCommitTest: compositionupdate should be fired after dispatching compositioncommit #3");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #3");
+  is(result.text, true, "runCompositionCommitTest: text should be fired after dispatching compositioncommit #3");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #3");
+  is(textarea.value, "\u3043", "runCompositionCommitTest: textarea doesn't have committed string #3");
+
+  // compositioncommit with non-empty composition string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #4");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "" });
+
+  is(result.compositionupdate, true, "runCompositionCommitTest: compositionupdate should be fired after dispatching compositioncommit #4");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #4");
+  is(result.text, true, "runCompositionCommitTest: text should be fired after dispatching compositioncommit #4");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #4");
+  is(textarea.value, "", "runCompositionCommitTest: textarea should be empty #4");
+
+  // compositioncommit immediately after compositionstart
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "\u3042" });
+
+  is(result.compositionupdate, true, "runCompositionCommitTest: compositionupdate should be fired after dispatching compositioncommit #5");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #5");
+  is(result.text, true, "runCompositionCommitTest: text should be fired after dispatching compositioncommit #5");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #5");
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea should be empty #5");
+
+  // compositioncommit with same composition string.
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #5");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "\u3042" });
+
+  is(result.compositionupdate, false, "runCompositionCommitTest: compositionupdate shouldn't be fired after dispatching compositioncommit #5");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #5");
+  is(result.text, true, "runCompositionCommitTest: text should be fired after dispatching compositioncommit because there was composition string #5");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #5");
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea should have committed string #5");
+
+  // compositioncommit with same composition string when there is committed string
+  textarea.value = "";
+  synthesizeComposition({ type: "compositionstart" });
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 1, "attr": COMPOSITION_ATTR_RAWINPUT }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #6");
+
+  synthesizeCompositionChange(
+    { "composition":
+      { "string": "\u3042",
+        "clauses":
+        [
+          { "length": 0, "attr": 0 }
+        ]
+      },
+      "caret": { "start": 1, "length": 0 }
+    });
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea doesn't have composition string #6");
+
+  clearResult();
+  synthesizeComposition({ type: "compositioncommit", data: "\u3042" });
+
+  is(result.compositionupdate, false, "runCompositionCommitTest: compositionupdate shouldn't be fired after dispatching compositioncommit #6");
+  is(result.compositionend, true, "runCompositionCommitTest: compositionend should be fired after dispatching compositioncommit #6");
+  is(result.text, false, "runCompositionCommitTest: text shouldn't be fired after dispatching compositioncommit because there was already committed string #6");
+  is(result.input, true, "runCompositionCommitTest: input should be fired after dispatching compositioncommit #6");
+  is(textarea.value, "\u3042", "runCompositionCommitTest: textarea should have committed string #6");
+
+  textarea.removeEventListener("compositionupdate", handler, true);
+  textarea.removeEventListener("compositionend", handler, true);
+  textarea.removeEventListener("input", handler, true);
+  textarea.removeEventListener("text", handler, true);
+}
+
 function runCompositionTest()
 {
   textarea.value = "";
@@ -978,16 +1267,7 @@
   }
 
   // commit the composition string
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 8, "length": 0 }
-    });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046",
                     "runCompositionTest", "#1-13") ||
@@ -995,9 +1275,6 @@
     return;
   }
 
-  synthesizeComposition({ type: "compositionend",
-                          data: "\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046" });
-
   var textRect3 = synthesizeQueryTextRect(0, 1);
   var textRect4 = synthesizeQueryTextRect(1, 1);
 
@@ -1084,16 +1361,7 @@
   }
 
   // commit the composition string
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u3058\u3087\u3046",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 3, "length": 0 }
-    });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u3055\u884C\u3053\u3046\u3058\u3087\u3046",
                     "runCompositionTest", "#2-4") ||
@@ -1101,8 +1369,6 @@
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u3058\u3087\u3046" });
-
   // set selection
   var selectionSetTest = synthesizeSelectionSet(4, 7, false);
   ok(selectionSetTest, "runCompositionTest: selectionSetTest failed");
@@ -1168,18 +1434,7 @@
   }
 
   // cancel the composition
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 0, "length": 0 }
-    });
-
-  synthesizeComposition({ type: "compositionend", data: "" });
+  synthesizeComposition({ type: "compositioncommit", data: "" });
 
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3",
                     "runCompositionTest", "#3-5") ||
@@ -1226,31 +1481,13 @@
     return;
   }
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u6700",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
+  synthesizeComposition({ type: "compositioncommit", data: "\u6700" });
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u6700",
                     "runCompositionTest", "#4-3") ||
       !checkSelection(5, "", "runCompositionTest", "#4-3")) {
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u6700" });
-
-  if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u6700",
-                    "runCompositionTest", "#4-4") ||
-      !checkSelection(5, "", "runCompositionTest", "#4-4")) {
-    return;
-  }
-
   // testing the canceling case
   synthesizeComposition({ type: "compositionstart" });
 
@@ -1271,16 +1508,7 @@
     return;
   }
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 0, "length": 0 }
-    });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u6700",
                     "runCompositionTest", "#4-6") ||
@@ -1288,14 +1516,6 @@
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u6700" });
-
-  if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u6700",
-                    "runCompositionTest", "#4-7") ||
-      !checkSelection(5, "", "runCompositionTest", "#4-7")) {
-    return;
-  }
-
   // testing whether the empty composition string deletes selected string.
   synthesizeKey("VK_LEFT", { shiftKey: true });
 
@@ -1318,31 +1538,13 @@
     return;
   }
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u9AD8",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
+  synthesizeComposition({ type: "compositioncommit", data: "\u9AD8" });
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u9AD8",
                     "runCompositionTest", "#4-9") ||
       !checkSelection(5, "", "runCompositionTest", "#4-9")) {
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u9AD8" });
-
-  if (!checkContent("\u30E9\u30FC\u30E1\u30F3\u9AD8",
-                    "runCompositionTest", "#4-10") ||
-      !checkSelection(5, "", "runCompositionTest", "#4-10")) {
-    return;
-  }
-
   synthesizeKey("VK_BACK_SPACE", {});
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3",
                     "runCompositionTest", "#4-11") ||
@@ -1388,31 +1590,13 @@
     return;
   }
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 0, "length": 0 }
-    });
-
+  synthesizeComposition({ type: "compositioncommitasis" });
   if (!checkContent("\u30E9\u30FC\u30E1\u30F3",
                     "runCompositionTest", "#5-3") ||
       !checkSelection(4, "", "runCompositionTest", "#5-3")) {
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u9AD8" });
-
-  if (!checkContent("\u30E9\u30FC\u30E1\u30F3",
-                    "runCompositionTest", "#5-4") ||
-      !checkSelection(4, "", "runCompositionTest", "#5-4")) {
-    return;
-  }
-
   // Undo tests for the testcases for bug 23558 and bug 271815
   synthesizeKey("Z", { accelKey: true });
 
@@ -1639,18 +1823,7 @@
      kDescription + "value of input element wasn't modified (input) #2");
 
   // text event shouldn't cause composition update, e.g., at committing.
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u3089\u30FC",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 2, "length": 0 }
-    });
-
-  synthesizeComposition({ type: "compositionend", data: "\u3089\u30FC" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   is(windowEventCounts["compositionstart"], 1,
      kDescription + "compositionstart has been handled more than once by window #3");
@@ -1702,18 +1875,7 @@
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u3089",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
-  synthesizeComposition({ type: "compositionend", data: "\u3089" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   is(windowEventCounts["compositionstart"], 1,
      kDescription + "compositionstart hasn't been handled by window #4");
@@ -1782,18 +1944,7 @@
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u306D",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
-  synthesizeComposition({ type: "compositionend", data: "\u306D" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   is(windowEventCounts["compositionstart"], 1,
      kDescription + "compositionstart hasn't been handled by window #5");
@@ -1864,18 +2015,7 @@
       "caret": { "start": 1, "length": 0 }
     });
 
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u306E",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
-  synthesizeComposition({ type: "compositionend", data: "\u306E" });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   is(windowEventCounts["compositionstart"], 1,
      kDescription + "compositionstart hasn't been handled by window #6");
@@ -2741,23 +2881,32 @@
     }
   }
 
+  function onComposition(aEvent)
+  {
+    if (aEvent.type == "compositionstart") {
+      expectedIsComposing = true;
+    } else if (aEvent.type == "compositionend") {
+      expectedIsComposing = false;
+    }
+  }
+
   textarea.addEventListener("keydown", eventHandler, true);
   textarea.addEventListener("keypress", eventHandler, true);
   textarea.addEventListener("keyup", eventHandler, true);
   textarea.addEventListener("input", eventHandler, true);
+  textarea.addEventListener("compositionstart", onComposition, true);
+  textarea.addEventListener("compositionend", onComposition, true);
 
   textarea.focus();
   textarea.value = "";
 
   // XXX These cases shouldn't occur in actual native key events because we
   //     don't dispatch key events while composition (bug 354358).
-  expectedIsComposing = false;
   description = "events before dispatching compositionstart";
   synthesizeKey("VK_LEFT", {});
 
   synthesizeKey("a", { type: "keydown" });
   synthesizeComposition({ type: "compositionstart" });
-  expectedIsComposing = true;
   description = "events after dispatching compositionstart";
   synthesizeCompositionChange(
     { "composition":
@@ -2776,28 +2925,20 @@
 
   description = "events for committing composition string";
   synthesizeKey("VK_RETURN", { type: "keydown" });
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u3042",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
+
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   // input event will be fired by synthesizing compositionend event.
   // Then, its isComposing should be false.
-  expectedIsComposing = false;
-  description = "events after dispatching compositionend";
-  synthesizeComposition({ type: "compositionend" });
+  description = "events after dispatching compositioncommitasis";
   synthesizeKey("VK_RETURN", { type: "keyup" });
 
   textarea.removeEventListener("keydown", eventHandler, true);
   textarea.removeEventListener("keypress", eventHandler, true);
   textarea.removeEventListener("keyup", eventHandler, true);
   textarea.removeEventListener("input", eventHandler, true);
+  textarea.removeEventListener("compositionstart", onComposition, true);
+  textarea.removeEventListener("compositionend", onComposition, true);
 
   textarea.value = "";
 }
@@ -2972,24 +3113,12 @@
   }
 
   // commit them
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u5909\u8EAB",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 2, "length": 0 }
-    });
-
+  synthesizeComposition({ type: "compositioncommitasis" });
   if (!checkContent("\u5909\u8EAB", aTestName, "#1-4") ||
       !checkSelection(2, "", aTestName, "#1-4")) {
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u5909\u8EAB" });
-
   is(aFocusedEditor.value, "\u5909\u8EAB",
      aTestName + ": composition isn't in the focused editor");
   if (aFocusedEditor.value != "\u5909\u8EAB") {
@@ -3261,25 +3390,12 @@
   }
 
   // commit the composition string
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 6, "length": 0 }
-    });
-
+  synthesizeComposition({ type: "compositioncommitasis" });
   if (!checkContent("\u30E9", kDesc, "#1-11") ||
       !checkSelection(1, "", kDesc, "#1-11")) {
     return;
   }
 
-  synthesizeComposition({ type: "compositionend",
-                          data: "\u30E9\u30FC\u30E1\u30F3\u6700\u9AD8" });
-
   // restart composition
   synthesizeComposition({ type: "compositionstart" });
 
@@ -3301,24 +3417,12 @@
   }
 
   // commit the composition string
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u3058",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
-
+  synthesizeComposition({ type: "compositioncommit", data: "\u3058" });
   if (!checkContent("\u30E9", kDesc, "#2-2") ||
       !checkSelection(1 + 0, "", kDesc, "#2-2")) {
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u3058" });
-
   // Undo
   synthesizeKey("Z", {accelKey: true});
 
@@ -3375,16 +3479,7 @@
   }
 
   // commit the composition string
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u9B54",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 1, "length": 0 }
-    });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   // The input text must be discarded. Then, the caret position shouldn't be
   // updated from its position at compositionstart.
@@ -3393,8 +3488,6 @@
     return;
   }
 
-  synthesizeComposition({ type: "compositionend", data: "\u9B54" });
-
   // start composition
   synthesizeComposition({ type: "compositionstart" });
 
@@ -3416,23 +3509,12 @@
   }
 
   // commit the composition string
-  synthesizeCompositionChange(
-    { "composition":
-      { "string": "\u9B54\u6CD5",
-        "clauses":
-        [
-          { "length": 0, "attr": 0 }
-        ]
-      },
-      "caret": { "start": 2, "length": 0 }
-    });
+  synthesizeComposition({ type: "compositioncommitasis" });
 
   if (!checkContent("X", kDesc, "#5-2") ||
       !checkSelection(0, "", kDesc, "#5-2")) {
     return;
   }
-
-  synthesizeComposition({ type: "compositionend", data: "\u9B54\u6CD5" });
 }
 
 function runTest()
@@ -3440,6 +3522,8 @@
   textareaInFrame = iframe.contentDocument.getElementById("textarea");
 
   runUndoRedoTest();
+  runCompositionCommitAsIsTest();
+  runCompositionCommitTest();
   runCompositionTest();
   runCompositionEventTest();
   runCharAtPointTest(textarea, "textarea in the document");
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/TextEvents.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/TextEvents.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/TextEvents.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/TextEvents.h	2014-11-26 21:46:06.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsRect.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
+#include "WritingModes.h"
 
 /******************************************************************************
  * virtual keycode values
@@ -341,6 +342,20 @@
   {
     return mRanges ? mRanges->Length() : 0;
   }
+
+  bool CausesDOMTextEvent() const
+  {
+    return message == NS_COMPOSITION_CHANGE ||
+           message == NS_COMPOSITION_COMMIT ||
+           message == NS_COMPOSITION_COMMIT_AS_IS;
+  }
+
+  bool CausesDOMCompositionEndEvent() const
+  {
+    return message == NS_COMPOSITION_END ||
+           message == NS_COMPOSITION_COMMIT ||
+           message == NS_COMPOSITION_COMMIT_AS_IS;
+  }
 };
 
 /******************************************************************************
@@ -455,6 +470,8 @@
     bool mHasSelection;
     // true if DOM element under mouse belongs to widget
     bool mWidgetIsHit;
+    // mozilla::WritingMode value at the end (focus) of the selection
+    mozilla::WritingMode mWritingMode;
     // used by NS_QUERY_SELECTION_AS_TRANSFERABLE
     nsCOMPtr<nsITransferable> mTransferable;
   } mReply;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/VsyncDispatcher.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/VsyncDispatcher.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/VsyncDispatcher.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/VsyncDispatcher.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -8,6 +8,11 @@
 #include "mozilla/layers/CompositorParent.h"
 #include "gfxPrefs.h"
 
+#ifdef MOZ_ENABLE_PROFILER_SPS
+#include "GeckoProfiler.h"
+#include "ProfilerMarkers.h"
+#endif
+
 #ifdef MOZ_WIDGET_GONK
 #include "GeckoTouchDispatcher.h"
 #endif
@@ -42,6 +47,12 @@
 }
 
 void
+VsyncDispatcher::SetVsyncSource(VsyncSource* aVsyncSource)
+{
+  mVsyncSource = aVsyncSource;
+}
+
+void
 VsyncDispatcher::DispatchTouchEvents(bool aNotifiedCompositors, TimeStamp aVsyncTime)
 {
   // Touch events can sometimes start a composite, so make sure we dispatch touches
@@ -57,6 +68,12 @@
 VsyncDispatcher::NotifyVsync(TimeStamp aVsyncTimestamp)
 {
   bool notifiedCompositors = false;
+#ifdef MOZ_ENABLE_PROFILER_SPS
+    if (profiler_is_active()) {
+        CompositorParent::PostInsertVsyncProfilerMarker(aVsyncTimestamp);
+    }
+#endif
+
   if (gfxPrefs::VsyncAlignedCompositor()) {
     MutexAutoLock lock(mCompositorObserverLock);
     notifiedCompositors = NotifyVsyncObservers(aVsyncTimestamp, mCompositorObservers);
@@ -88,7 +105,7 @@
 void
 VsyncDispatcher::RemoveCompositorVsyncObserver(VsyncObserver* aVsyncObserver)
 {
-  MOZ_ASSERT(CompositorParent::IsInCompositorThread());
+  MOZ_ASSERT(CompositorParent::IsInCompositorThread() || NS_IsMainThread());
   MutexAutoLock lock(mCompositorObserverLock);
   if (mCompositorObservers.Contains(aVsyncObserver)) {
     mCompositorObservers.RemoveElement(aVsyncObserver);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/VsyncDispatcher.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/VsyncDispatcher.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/VsyncDispatcher.h	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/VsyncDispatcher.h	2014-11-26 21:46:06.000000000 +0000
@@ -21,6 +21,19 @@
 class CompositorVsyncObserver;
 }
 
+// Controls how and when to enable/disable vsync.
+class VsyncSource
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VsyncSource)
+  virtual void EnableVsync() = 0;
+  virtual void DisableVsync() = 0;
+  virtual bool IsVsyncEnabled() = 0;
+
+protected:
+  virtual ~VsyncSource() {}
+}; // VsyncSource
+
 class VsyncObserver
 {
   // Must be destroyed on main thread since the compositor is as well
@@ -34,7 +47,7 @@
 protected:
   VsyncObserver() {}
   virtual ~VsyncObserver() {}
-};
+}; // VsyncObserver
 
 // VsyncDispatcher is used to dispatch vsync events to the registered observers.
 class VsyncDispatcher
@@ -44,7 +57,13 @@
 public:
   static VsyncDispatcher* GetInstance();
   // Called on the vsync thread when a hardware vsync occurs
+  // The aVsyncTimestamp can mean different things depending on the platform:
+  // b2g - The vsync timestamp of the previous frame that was just displayed
+  // OSX - The vsync timestamp of the upcoming frame
+  // TODO: Windows / Linux. DOCUMENT THIS WHEN IMPLEMENTING ON THOSE PLATFORMS
+  // Android: TODO
   void NotifyVsync(TimeStamp aVsyncTimestamp);
+  void SetVsyncSource(VsyncSource* aVsyncSource);
 
   // Compositor vsync observers must be added/removed on the compositor thread
   void AddCompositorVsyncObserver(VsyncObserver* aVsyncObserver);
@@ -61,7 +80,8 @@
   // Can have multiple compositors. On desktop, this is 1 compositor per window
   Mutex mCompositorObserverLock;
   nsTArray<nsRefPtr<VsyncObserver>> mCompositorObservers;
-};
+  nsRefPtr<VsyncSource> mVsyncSource;
+}; // VsyncDispatcher
 
 } // namespace mozilla
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/WidgetEventImpl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/WidgetEventImpl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/WidgetEventImpl.cpp	2014-11-14 09:37:37.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/WidgetEventImpl.cpp	2014-11-26 21:46:06.000000000 +0000
@@ -140,6 +140,8 @@
     case NS_COMPOSITION_END:
     case NS_COMPOSITION_UPDATE:
     case NS_COMPOSITION_CHANGE:
+    case NS_COMPOSITION_COMMIT_AS_IS:
+    case NS_COMPOSITION_COMMIT:
       return true;
     default:
       return false;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/GfxInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/GfxInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/GfxInfo.cpp	2014-11-14 09:37:38.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/GfxInfo.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -194,17 +194,6 @@
   return retval;
 }
 
-// The driver ID is a string like PCI\VEN_15AD&DEV_0405&SUBSYS_040515AD, possibly
-// followed by &REV_XXXX.  We uppercase the string, and strip the &REV_ part
-// from it, if found.
-static void normalizeDriverId(nsString& driverid) {
-  ToUpperCase(driverid);
-  int32_t rev = driverid.Find(NS_LITERAL_CSTRING("&REV_"));
-  if (rev != -1) {
-    driverid.Cut(rev, driverid.Length());
-  }
-}
-
 // The device ID is a string like PCI\VEN_15AD&DEV_0405&SUBSYS_040515AD
 // this function is used to extract the id's out of it
 uint32_t
@@ -966,6 +955,13 @@
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMAX3000, V(7,15,10,1666));
     IMPLEMENT_INTEL_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7, IntelGMAX4500HD, V(7,15,10,1666));
 
+    // Bug 1074378
+    APPEND_TO_DRIVER_BLOCKLIST(DRIVER_OS_WINDOWS_7,
+      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorIntel),
+      (GfxDeviceFamily*) GfxDriverInfo::GetDeviceFamily(IntelGMAX4500HD),
+      GfxDriverInfo::allFeatures, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
+      DRIVER_EQUAL, V(8,15,10,1749), "8.15.10.2342");
+
     /* OpenGL on any Intel hardware is discouraged */
     APPEND_TO_DRIVER_BLOCKLIST2( DRIVER_OS_ALL,
       (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorIntel), GfxDriverInfo::allDevices,
@@ -1013,12 +1009,6 @@
       nsIGfxInfo::FEATURE_DIRECT2D, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
       DRIVER_BETWEEN_INCLUSIVE_START, V(14,1,0,0), V(14,2,0,0), "ATI Catalyst 14.6+");
 
-    // Disable D2D on some ATI drivers which don't support dxgi keyed mutex correctly (bug 1089183)
-    APPEND_TO_DRIVER_BLOCKLIST_RANGE( DRIVER_OS_ALL,
-        (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorATI), GfxDriverInfo::allDevices,
-      nsIGfxInfo::FEATURE_DIRECT2D, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
-      DRIVER_BETWEEN_INCLUSIVE_START, V(8,653,0,0), V(8,691,0,0), "ATI Catalyst 14.6+");
-
     /* Disable D3D9 layers on NVIDIA 6100/6150/6200 series due to glitches
      * whilst scrolling. See bugs: 612007, 644787 & 645872.
      */
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsIMM32Handler.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsIMM32Handler.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsIMM32Handler.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsIMM32Handler.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -489,12 +489,7 @@
      NS_ConvertUTF16toUTF8(mCompositionString).get(),
      mCompositionString.IsEmpty() ? "" : ", but canceling it..."));
 
-  mCompositionString.Truncate();
-
-  nsIMEContext IMEContext(aWindow->GetWindowHandle());
-  DispatchCompositionChangeEvent(aWindow, IMEContext, false);
-
-  HandleEndComposition(aWindow);
+  HandleEndComposition(aWindow, &EmptyString());
 
   return true;
 }
@@ -953,7 +948,6 @@
   }
 
   mCompositionStart = selection.mReply.mOffset;
-  mLastDispatchedCompositionString.Truncate();
 
   WidgetCompositionEvent event(true, NS_COMPOSITION_START, aWindow);
   aWindow->InitEvent(event, &point);
@@ -1012,13 +1006,12 @@
       HandleStartComposition(aWindow, aIMEContext);
     }
 
-    GetCompositionString(aIMEContext, GCS_RESULTSTR);
+    GetCompositionString(aIMEContext, GCS_RESULTSTR, mCompositionString);
 
     PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, GCS_RESULTSTR\n"));
 
-    DispatchCompositionChangeEvent(aWindow, aIMEContext, false);
-    HandleEndComposition(aWindow);
+    HandleEndComposition(aWindow, &mCompositionString);
 
     if (!IS_COMPOSING_LPARAM(lParam)) {
       return ShouldDrawCompositionStringOurselves();
@@ -1039,27 +1032,31 @@
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
     ("IMM32: HandleComposition, GCS_COMPSTR\n"));
 
-  GetCompositionString(aIMEContext, GCS_COMPSTR);
+  nsAutoString previousCompositionString(mCompositionString);
+  GetCompositionString(aIMEContext, GCS_COMPSTR, mCompositionString);
 
   if (!IS_COMPOSING_LPARAM(lParam)) {
     PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: HandleComposition, lParam doesn't indicate composing, "
-       "mCompositionString=\"%s\", mLastDispatchedCompositionString=\"%s\"",
+       "mCompositionString=\"%s\", previousCompositionString=\"%s\"",
        NS_ConvertUTF16toUTF8(mCompositionString).get(),
-       NS_ConvertUTF16toUTF8(mLastDispatchedCompositionString).get()));
+       NS_ConvertUTF16toUTF8(previousCompositionString).get()));
 
     // If composition string isn't changed, we can trust the lParam.
     // So, we need to do nothing.
-    if (mLastDispatchedCompositionString == mCompositionString) {
+    if (previousCompositionString == mCompositionString) {
       return ShouldDrawCompositionStringOurselves();
     }
 
     // IME may send WM_IME_COMPOSITION without composing lParam values
     // when composition string becomes empty (e.g., using Backspace key).
     // If composition string is empty, we should dispatch a compositionchange
-    // event with empty string.
+    // event with empty string and clear the clause information.
     if (mCompositionString.IsEmpty()) {
-      DispatchCompositionChangeEvent(aWindow, aIMEContext, false);
+      mClauseArray.Clear();
+      mAttributeArray.Clear();
+      mCursorPosition = 0;
+      DispatchCompositionChangeEvent(aWindow, aIMEContext);
       return ShouldDrawCompositionStringOurselves();
     }
 
@@ -1205,7 +1202,8 @@
 }
 
 void
-nsIMM32Handler::HandleEndComposition(nsWindow* aWindow)
+nsIMM32Handler::HandleEndComposition(nsWindow* aWindow,
+                                     const nsAString* aCommitString)
 {
   NS_PRECONDITION(mIsComposing,
     "HandleEndComposition is called but mIsComposing is FALSE");
@@ -1213,23 +1211,26 @@
     "HandleComposition should not be called when a plug-in has focus");
 
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: HandleEndComposition\n"));
-
-  WidgetCompositionEvent event(true, NS_COMPOSITION_END, aWindow);
-  nsIntPoint point(0, 0);
+    ("IMM32: HandleEndComposition(aWindow=0x%p, aCommitString=0x%p (\"%s\"))",
+     aWindow, aCommitString,
+     aCommitString ? NS_ConvertUTF16toUTF8(*aCommitString).get() : ""));
 
   if (mNativeCaretIsCreated) {
     ::DestroyCaret();
     mNativeCaretIsCreated = false;
   }
 
-  aWindow->InitEvent(event, &point);
-  // The last dispatched composition string must be the committed string.
-  event.mData = mLastDispatchedCompositionString;
-  aWindow->DispatchWindowEvent(&event);
+  uint32_t message =
+    aCommitString ? NS_COMPOSITION_COMMIT : NS_COMPOSITION_COMMIT_AS_IS;
+  WidgetCompositionEvent compositionCommitEvent(true, message, aWindow);
+  nsIntPoint point(0, 0);
+  aWindow->InitEvent(compositionCommitEvent, &point);
+  if (aCommitString) {
+    compositionCommitEvent.mData = *aCommitString;
+  }
+  aWindow->DispatchWindowEvent(&compositionCommitEvent);
   mIsComposing = false;
   mComposingWindow = nullptr;
-  mLastDispatchedCompositionString.Truncate();
 }
 
 static void
@@ -1513,7 +1514,6 @@
     nsIMEContext IMEContext(mComposingWindow->GetWindowHandle());
     NS_ASSERTION(IMEContext.IsValid(), "IME context must be valid");
 
-    DispatchCompositionChangeEvent(mComposingWindow, IMEContext, false);
     HandleEndComposition(mComposingWindow);
     return true;
   }
@@ -1567,18 +1567,15 @@
 
 void
 nsIMM32Handler::DispatchCompositionChangeEvent(nsWindow* aWindow,
-                                               const nsIMEContext &aIMEContext,
-                                               bool aCheckAttr)
+                                               const nsIMEContext& aIMEContext)
 {
   NS_ASSERTION(mIsComposing, "conflict state");
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: DispatchCompositionChangeEvent, aCheckAttr=%s\n",
-     aCheckAttr ? "TRUE": "FALSE"));
+    ("IMM32: DispatchCompositionChangeEvent"));
 
-  // If we don't need to draw composition string ourselves and this is not
-  // commit event (i.e., under composing), we don't need to fire
-  // compositionchange event during composing.
-  if (aCheckAttr && !ShouldDrawCompositionStringOurselves()) {
+  // If we don't need to draw composition string ourselves, we don't need to
+  // fire compositionchange event during composing.
+  if (!ShouldDrawCompositionStringOurselves()) {
     // But we need to adjust composition window pos and native caret pos, here.
     SetIMERelatedWindowsPos(aWindow, aIMEContext);
     return;
@@ -1592,11 +1589,8 @@
 
   aWindow->InitEvent(event, &point);
 
-  if (aCheckAttr) {
-    event.mRanges = CreateTextRangeArray();
-  }
-
-  event.mData = mLastDispatchedCompositionString = mCompositionString;
+  event.mRanges = CreateTextRangeArray();
+  event.mData = mCompositionString;
 
   aWindow->DispatchWindowEvent(&event);
 
@@ -1619,7 +1613,9 @@
   nsRefPtr<TextRangeArray> textRangeArray = new TextRangeArray();
 
   TextRange range;
-  if (mClauseArray.Length() == 0) {
+  if (mCompositionString.IsEmpty()) {
+    // Don't append clause information if composition string is empty.
+  } else if (mClauseArray.Length() == 0) {
     // Some IMEs don't return clause array information, then, we assume that
     // all characters in the composition string are in one clause.
     range.mStartOffset = 0;
@@ -1684,12 +1680,16 @@
 
 void
 nsIMM32Handler::GetCompositionString(const nsIMEContext &aIMEContext,
-                                     DWORD aIndex)
+                                     DWORD aIndex,
+                                     nsAString& aCompositionString) const
 {
+  aCompositionString.Truncate();
+
   // Retrieve the size of the required output buffer.
   long lRtn = ::ImmGetCompositionStringW(aIMEContext.get(), aIndex, nullptr, 0);
   if (lRtn < 0 ||
-      !mCompositionString.SetLength((lRtn / sizeof(WCHAR)) + 1, mozilla::fallible_t())) {
+      !aCompositionString.SetLength((lRtn / sizeof(WCHAR)) + 1,
+                                    mozilla::fallible_t())) {
     PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
       ("IMM32: GetCompositionString, FAILED by OOM\n"));
     return; // Error or out of memory.
@@ -1697,13 +1697,13 @@
 
   // Actually retrieve the composition string information.
   lRtn = ::ImmGetCompositionStringW(aIMEContext.get(), aIndex,
-                                    (LPVOID)mCompositionString.BeginWriting(),
+                                    (LPVOID)aCompositionString.BeginWriting(),
                                     lRtn + sizeof(WCHAR));
-  mCompositionString.SetLength(lRtn / sizeof(WCHAR));
+  aCompositionString.SetLength(lRtn / sizeof(WCHAR));
 
   PR_LOG(gIMM32Log, PR_LOG_ALWAYS,
-    ("IMM32: GetCompositionString, SUCCEEDED mCompositionString=\"%s\"\n",
-     NS_ConvertUTF16toUTF8(mCompositionString).get()));
+    ("IMM32: GetCompositionString, SUCCEEDED aCompositionString=\"%s\"\n",
+     NS_ConvertUTF16toUTF8(aCompositionString).get()));
 }
 
 bool
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsIMM32Handler.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsIMM32Handler.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsIMM32Handler.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsIMM32Handler.h	2014-11-26 21:46:07.000000000 +0000
@@ -227,7 +227,10 @@
                               const nsIMEContext &aIMEContext);
   bool HandleComposition(nsWindow* aWindow, const nsIMEContext &aIMEContext,
                            LPARAM lParam);
-  void HandleEndComposition(nsWindow* aWindow);
+  // If aCommitString is null, this commits composition with the latest
+  // dispatched data.  Otherwise, commits composition with the value.
+  void HandleEndComposition(nsWindow* aWindow,
+                            const nsAString* aCommitString = nullptr);
   bool HandleReconvert(nsWindow* aWindow, LPARAM lParam, LRESULT *oResult);
   bool HandleQueryCharPosition(nsWindow* aWindow, LPARAM lParam,
                                  LRESULT *oResult);
@@ -276,7 +279,9 @@
                                           uint32_t aOffset,
                                           nsIntRect &aCharRect);
   bool GetCaretRect(nsWindow* aWindow, nsIntRect &aCaretRect);
-  void GetCompositionString(const nsIMEContext &aIMEContext, DWORD aIndex);
+  void GetCompositionString(const nsIMEContext &aIMEContext,
+                            DWORD aIndex,
+                            nsAString& aCompositionString) const;
   /**
    *  Get the current target clause of composition string.
    *  If there are one or more characters whose attribute is ATTR_TARGET_*,
@@ -290,9 +295,18 @@
    *  in the composition string, you need to subtract mCompositionStart from it.
    */
   bool GetTargetClauseRange(uint32_t *aOffset, uint32_t *aLength = nullptr);
+
+  /**
+   * DispatchCompositionChangeEvent() dispatches NS_COMPOSITION_CHANGE event
+   * with clause information (it'll be retrieved by CreateTextRangeArray()).
+   * I.e., this should be called only during composing.  If a composition is
+   * being committed, only HandleCompositionEnd() should be called.
+   *
+   * @param aWindow     The window which has the composition.
+   * @param aIMEContext Native IME context which has the composition.
+   */
   void DispatchCompositionChangeEvent(nsWindow* aWindow,
-                                      const nsIMEContext &aIMEContext,
-                                      bool aCheckAttr = true);
+                                      const nsIMEContext& aIMEContext);
   already_AddRefed<mozilla::TextRangeArray> CreateTextRangeArray();
 
   nsresult EnsureClauseArray(int32_t aCount);
@@ -335,7 +349,6 @@
 
   nsWindow* mComposingWindow;
   nsString  mCompositionString;
-  nsString  mLastDispatchedCompositionString;
   InfallibleTArray<uint32_t> mClauseArray;
   InfallibleTArray<uint8_t> mAttributeArray;
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsTextStore.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsTextStore.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsTextStore.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsTextStore.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -1674,24 +1674,12 @@
 
         PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
                ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
-                "dispatching compositionchange event...", this));
-        WidgetCompositionEvent compositionChange(true, NS_COMPOSITION_CHANGE,
+                "dispatching compositioncommit event...", this));
+        WidgetCompositionEvent compositionCommit(true, NS_COMPOSITION_COMMIT,
                                                  mWidget);
-        mWidget->InitEvent(compositionChange);
-        compositionChange.mData = action.mData;
-        mWidget->DispatchWindowEvent(&compositionChange);
-        if (!mWidget || mWidget->Destroyed()) {
-          break;
-        }
-
-        PR_LOG(sTextStoreLog, PR_LOG_DEBUG,
-               ("TSF: 0x%p   nsTextStore::FlushPendingActions(), "
-                "dispatching compositionend event...", this));
-        WidgetCompositionEvent compositionEnd(true, NS_COMPOSITION_END,
-                                              mWidget);
-        compositionEnd.mData = compositionChange.mData;
-        mWidget->InitEvent(compositionEnd);
-        mWidget->DispatchWindowEvent(&compositionEnd);
+        mWidget->InitEvent(compositionCommit);
+        compositionCommit.mData = action.mData;
+        mWidget->DispatchWindowEvent(&compositionCommit);
         if (!mWidget || mWidget->Destroyed()) {
           break;
         }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsToolkit.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsToolkit.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsToolkit.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsToolkit.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -33,6 +33,8 @@
   }
 }
 
+MouseTrailer*       nsToolkit::gMouseTrailer;
+
 //-------------------------------------------------------------------------
 //
 // constructor
@@ -46,6 +48,8 @@
     nsToolkit::Startup(GetModuleHandle(nullptr));
 #endif
 
+    gMouseTrailer = &mMouseTrailer;
+
     if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Desktop) {
       mD3D9Timer = do_CreateInstance("@mozilla.org/timer;1");
       mD3D9Timer->InitWithFuncCallback(::StartAllowingD3D9,
@@ -64,6 +68,7 @@
 nsToolkit::~nsToolkit()
 {
     MOZ_COUNT_DTOR(nsToolkit);
+    gMouseTrailer = nullptr;
 }
 
 void
@@ -105,3 +110,126 @@
 
   return gToolkit;
 }
+
+
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+MouseTrailer::MouseTrailer() : mMouseTrailerWindow(nullptr), mCaptureWindow(nullptr),
+  mIsInCaptureMode(false), mEnabled(true)
+{
+}
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+MouseTrailer::~MouseTrailer()
+{
+  DestroyTimer();
+}
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+void MouseTrailer::SetMouseTrailerWindow(HWND aWnd) 
+{
+  if (mMouseTrailerWindow != aWnd && mTimer) {
+    // Make sure TimerProc is fired at least once for the old window
+    TimerProc(nullptr, nullptr);
+  }
+  mMouseTrailerWindow = aWnd;
+  CreateTimer();
+}
+
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+void MouseTrailer::SetCaptureWindow(HWND aWnd) 
+{ 
+  mCaptureWindow = aWnd;
+  if (mCaptureWindow) {
+    mIsInCaptureMode = true;
+  }
+}
+
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+nsresult MouseTrailer::CreateTimer()
+{
+  if (mTimer || !mEnabled) {
+    return NS_OK;
+  } 
+
+  nsresult rv;
+  mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return mTimer->InitWithFuncCallback(TimerProc, nullptr, 200,
+                                      nsITimer::TYPE_REPEATING_SLACK);
+}
+
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+void MouseTrailer::DestroyTimer()
+{
+  if (mTimer) {
+    mTimer->Cancel();
+    mTimer = nullptr;
+  }
+}
+
+//-------------------------------------------------------------------------
+//
+//
+//-------------------------------------------------------------------------
+void MouseTrailer::TimerProc(nsITimer* aTimer, void* aClosure)
+{
+  MouseTrailer *mtrailer = nsToolkit::gMouseTrailer;
+  NS_ASSERTION(mtrailer, "MouseTrailer still firing after deletion!");
+
+  // Check to see if we are in mouse capture mode,
+  // Once capture ends we could still get back one more timer event.
+  // Capture could end outside our window.
+  // Also, for some reason when the mouse is on the frame it thinks that
+  // it is inside the window that is being captured.
+  if (mtrailer->mCaptureWindow) {
+    if (mtrailer->mCaptureWindow != mtrailer->mMouseTrailerWindow) {
+      return;
+    }
+  } else {
+    if (mtrailer->mIsInCaptureMode) {
+      // mMouseTrailerWindow could be bad from rolling over the frame, so clear 
+      // it if we were capturing and now this is the first timer callback 
+      // since we canceled the capture
+      mtrailer->mMouseTrailerWindow = nullptr;
+      mtrailer->mIsInCaptureMode = false;
+      return;
+    }
+  }
+
+  if (mtrailer->mMouseTrailerWindow && ::IsWindow(mtrailer->mMouseTrailerWindow)) {
+    POINT mp;
+    DWORD pos = ::GetMessagePos();
+    mp.x = GET_X_LPARAM(pos);
+    mp.y = GET_Y_LPARAM(pos);
+    HWND mouseWnd = ::WindowFromPoint(mp);
+    if (mtrailer->mMouseTrailerWindow != mouseWnd) {
+      // Notify someone that a mouse exit happened.
+      PostMessage(mtrailer->mMouseTrailerWindow, WM_MOUSELEAVE, 0, 0);
+
+      // we are out of this window, destroy timer
+      mtrailer->DestroyTimer();
+      mtrailer->mMouseTrailerWindow = nullptr;
+    }
+  } else {
+    mtrailer->DestroyTimer();
+    mtrailer->mMouseTrailerWindow = nullptr;
+  }
+}
+
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsToolkit.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsToolkit.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsToolkit.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsToolkit.h	2014-11-26 21:46:07.000000000 +0000
@@ -21,6 +21,41 @@
 #endif
 
 /**
+ * Makes sure exit/enter mouse messages are always dispatched.
+ * In the case where the mouse has exited the outer most window the
+ * only way to tell if it has exited is to set a timer and look at the
+ * mouse pointer to see if it is within the outer most window.
+ */ 
+
+class MouseTrailer 
+{
+public:
+    HWND                  GetMouseTrailerWindow() { return mMouseTrailerWindow; }
+    HWND                  GetCaptureWindow() { return mCaptureWindow; }
+
+    void                  SetMouseTrailerWindow(HWND aWnd);
+    void                  SetCaptureWindow(HWND aWnd);
+    void                  Disable() { mEnabled = false; DestroyTimer(); }
+    void                  Enable() { mEnabled = true; CreateTimer(); }
+    void                  DestroyTimer();
+
+                          MouseTrailer();
+                          ~MouseTrailer();
+private:
+
+    nsresult              CreateTimer();
+
+    static void           TimerProc(nsITimer* aTimer, void* aClosure);
+
+    // Information for mouse enter/exit events
+    HWND                  mMouseTrailerWindow;
+    HWND                  mCaptureWindow;
+    bool                  mIsInCaptureMode;
+    bool                  mEnabled;
+    nsCOMPtr<nsITimer>    mTimer;
+};
+
+/**
  * Wrapper around the thread running the message pump.
  * The toolkit abstraction is necessary because the message pump must
  * execute within the same thread that created the widget under Win32.
@@ -38,6 +73,7 @@
     static nsToolkit* GetToolkit();
 
     static HINSTANCE mDllInstance;
+    static MouseTrailer *gMouseTrailer;
 
     static void Startup(HMODULE hModule);
     static void Shutdown();
@@ -47,6 +83,7 @@
     static nsToolkit* gToolkit;
 
     nsCOMPtr<nsITimer> mD3D9Timer;
+    MouseTrailer mMouseTrailer;
 };
 
 #endif  // TOOLKIT_H
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsWindow.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsWindow.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsWindow.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsWindow.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -186,6 +186,9 @@
 #define SM_CONVERTIBLESLATEMODE 0x2003
 #endif
 
+#include "mozilla/layers/CompositorParent.h"
+#include "InputData.h"
+
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::gfx;
@@ -353,6 +356,7 @@
   mUnicodeWidget        = true;
   mDisplayPanFeedback   = false;
   mTouchWindow          = false;
+  mFutureMarginsToUse   = false;
   mCustomNonClient      = false;
   mHideChrome           = false;
   mFullscreenMode       = false;
@@ -2848,7 +2852,7 @@
 }
 
 NS_IMETHODIMP
-nsWindow::MakeFullScreen(bool aFullScreen)
+nsWindow::MakeFullScreen(bool aFullScreen, nsIScreen* aTargetScreen)
 {
   // taskbarInfo will be nullptr pre Windows 7 until Bug 680227 is resolved.
   nsCOMPtr<nsIWinTaskbar> taskbarInfo =
@@ -2878,7 +2882,7 @@
   // Will call hide chrome, reposition window. Note this will
   // also cache dimensions for restoration, so it should only
   // be called once per fullscreen request.
-  nsresult rv = nsBaseWidget::MakeFullScreen(aFullScreen);
+  nsresult rv = nsBaseWidget::MakeFullScreen(aFullScreen, aTargetScreen);
 
   if (visible) {
     Show(true);
@@ -3139,20 +3143,19 @@
 
 NS_METHOD nsWindow::CaptureMouse(bool aCapture)
 {
-  TRACKMOUSEEVENT mTrack;
-  mTrack.cbSize = sizeof(TRACKMOUSEEVENT);
-  mTrack.dwFlags = TME_LEAVE;
-  mTrack.dwHoverTime = 0;
+  if (!nsToolkit::gMouseTrailer) {
+    NS_ERROR("nsWindow::CaptureMouse called after nsToolkit destroyed");
+    return NS_OK;
+  }
+
   if (aCapture) {
-    mTrack.hwndTrack = mWnd;
+    nsToolkit::gMouseTrailer->SetCaptureWindow(mWnd);
     ::SetCapture(mWnd);
   } else {
-    mTrack.hwndTrack = nullptr;
+    nsToolkit::gMouseTrailer->SetCaptureWindow(nullptr);
     ::ReleaseCapture();
   }
   sIsInMouseCapture = aCapture;
-  // Requests WM_MOUSELEAVE events for this window.
-  TrackMouseEvent(&mTrack);
   return NS_OK;
 }
 
@@ -3737,10 +3740,50 @@
   return ConvertStatus(status);
 }
 
-bool nsWindow::DispatchScrollEvent(WidgetGUIEvent* event)
+nsEventStatus nsWindow::MaybeDispatchAsyncWheelEvent(WidgetGUIEvent* aEvent)
+{
+  if (aEvent->mClass != eWheelEventClass) {
+    return nsEventStatus_eIgnore;
+  }
+
+  WidgetWheelEvent* event = aEvent->AsWheelEvent();
+
+  // Otherwise, scroll-zoom won't work.
+  if (event->IsControl()) {
+    return nsEventStatus_eIgnore;
+  }
+
+
+  // Other scrolling modes aren't supported yet.
+  if (event->deltaMode != nsIDOMWheelEvent::DOM_DELTA_LINE) {
+    return nsEventStatus_eIgnore;
+  }
+
+  ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT;
+  if (Preferences::GetBool("general.smoothScroll"))
+    scrollMode = ScrollWheelInput::SCROLLMODE_SMOOTH;
+
+  ScreenPoint origin(event->refPoint.x, event->refPoint.y);
+  ScrollWheelInput input(event->time, event->timeStamp, 0,
+                         scrollMode,
+                         ScrollWheelInput::SCROLLDELTA_LINE,
+                         origin,
+                         event->lineOrPageDeltaX,
+                         event->lineOrPageDeltaY);
+
+  ScrollableLayerGuid ignoreGuid;
+  return mAPZC->ReceiveInputEvent(input, &ignoreGuid, nullptr);
+}
+
+bool nsWindow::DispatchScrollEvent(WidgetGUIEvent* aEvent)
 {
+  if (mAPZC) {
+    if (MaybeDispatchAsyncWheelEvent(aEvent) == nsEventStatus_eConsumeNoDefault)
+      return true;
+  }
+
   nsEventStatus status;
-  DispatchEvent(event, status);
+  DispatchEvent(aEvent, status);
   return ConvertStatus(status);
 }
 
@@ -4018,7 +4061,12 @@
 
   // call the event callback
   if (mWidgetListener) {
+    if (nsToolkit::gMouseTrailer)
+      nsToolkit::gMouseTrailer->Disable();
     if (aEventType == NS_MOUSE_MOVE) {
+      if (nsToolkit::gMouseTrailer && !sIsInMouseCapture) {
+        nsToolkit::gMouseTrailer->SetMouseTrailerWindow(mWnd);
+      }
       nsIntRect rect;
       GetBounds(rect);
       rect.x = 0;
@@ -4049,6 +4097,9 @@
 
     result = DispatchWindowEvent(&event);
 
+    if (nsToolkit::gMouseTrailer)
+      nsToolkit::gMouseTrailer->Enable();
+
     // Release the widget with NS_IF_RELEASE() just in case
     // the context menu key code in EventListenerManager::HandleEvent()
     // released it already.
@@ -6584,6 +6635,16 @@
 
   IMEHandler::OnDestroyWindow(this);
 
+  // Turn off mouse trails if enabled.
+  MouseTrailer* mtrailer = nsToolkit::gMouseTrailer;
+  if (mtrailer) {
+    if (mtrailer->GetMouseTrailerWindow() == mWnd)
+      mtrailer->DestroyTimer();
+
+    if (mtrailer->GetCaptureWindow() == mWnd)
+      mtrailer->SetCaptureWindow(nullptr);
+  }
+
   // Free GDI window class objects
   if (mBrush) {
     VERIFY(::DeleteObject(mBrush));
@@ -7655,6 +7716,19 @@
   }
 }
 
+CompositorParent* nsWindow::NewCompositorParent(int aSurfaceWidth,
+                                                int aSurfaceHeight)
+{
+  CompositorParent *compositor = new CompositorParent(this, false, aSurfaceWidth, aSurfaceHeight);
+
+  if (gfxPrefs::AsyncPanZoomEnabled()) {
+    mAPZC = CompositorParent::GetAPZCTreeManager(compositor->RootLayerTreeId());
+    APZCTreeManager::SetDPI(GetDPI());
+  }
+
+  return compositor;
+}
+
 /**************************************************************
  **************************************************************
  **
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsWindowGfx.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsWindowGfx.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsWindowGfx.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsWindowGfx.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -379,8 +379,6 @@
             gfxPlatform::GetPlatform()->CreateDrawTargetForSurface(targetSurface,
                                                                    IntSize(paintRect.right - paintRect.left,
                                                                    paintRect.bottom - paintRect.top));
-          nsRefPtr<gfxContext> thebesContext = new gfxContext(dt);
-
           // don't need to double buffer with anything but GDI
           BufferMode doubleBuffering = mozilla::layers::BufferMode::BUFFER_NONE;
           if (IsRenderMode(gfxWindowsPlatform::RENDER_GDI) ||
@@ -396,9 +394,8 @@
               case eTransparencyTransparent:
                 // If we're rendering with translucency, we're going to be
                 // rendering the whole window; make sure we clear it first
-                thebesContext->SetOperator(gfxContext::OPERATOR_CLEAR);
-                thebesContext->Paint();
-                thebesContext->SetOperator(gfxContext::OPERATOR_OVER);
+                dt->ClearRect(Rect(0.f, 0.f,
+                                   dt->GetSize().width, dt->GetSize().height));
                 break;
             }
 #else
@@ -406,6 +403,8 @@
 #endif
           }
 
+          nsRefPtr<gfxContext> thebesContext = new gfxContext(dt);
+
           {
             AutoLayerManagerSetup
                 setupLayerManager(this, thebesContext, doubleBuffering);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsWindow.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsWindow.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/widget/windows/nsWindow.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/widget/windows/nsWindow.h	2014-11-26 21:46:07.000000000 +0000
@@ -40,10 +40,9 @@
 #endif
 
 #include "nsUXThemeData.h"
-
 #include "nsIDOMMouseEvent.h"
-
 #include "nsIIdleServiceInternal.h"
+#include "mozilla/layers/APZCTreeManager.h"
 
 /**
  * Forward class definitions
@@ -75,6 +74,8 @@
   typedef mozilla::widget::TaskbarWindowPreview TaskbarWindowPreview;
   typedef mozilla::widget::NativeKey NativeKey;
   typedef mozilla::widget::MSGResult MSGResult;
+  typedef mozilla::layers::APZCTreeManager APZCTreeManager;
+
 public:
   nsWindow();
 
@@ -90,6 +91,7 @@
   virtual bool DispatchScrollEvent(mozilla::WidgetGUIEvent* aEvent) MOZ_OVERRIDE;
   virtual nsWindowBase* GetParentWindowBase(bool aIncludeOwner) MOZ_OVERRIDE;
   virtual bool IsTopLevelWidget() MOZ_OVERRIDE { return mIsTopWidgetWindow; }
+  virtual CompositorParent* NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight) MOZ_OVERRIDE;
 
   // nsIWidget interface
   NS_IMETHOD              Create(nsIWidget *aParent,
@@ -127,7 +129,7 @@
                                     uint32_t aHotspotX, uint32_t aHotspotY);
   NS_IMETHOD              SetCursor(nsCursor aCursor);
   virtual nsresult        ConfigureChildren(const nsTArray<Configuration>& aConfigurations);
-  NS_IMETHOD              MakeFullScreen(bool aFullScreen);
+  NS_IMETHOD              MakeFullScreen(bool aFullScreen, nsIScreen* aScreen = nullptr);
   NS_IMETHOD              HideWindowChrome(bool aShouldHide);
   NS_IMETHOD              Invalidate(bool aEraseBackground = false,
                                      bool aUpdateNCArea = false,
@@ -390,6 +392,8 @@
   void                    OnWindowPosChanging(LPWINDOWPOS& info);
   void                    OnSysColorChanged();
 
+  nsEventStatus           MaybeDispatchAsyncWheelEvent(mozilla::WidgetGUIEvent* aEvent);
+
   /**
    * Function that registers when the user has been active (used for detecting
    * when the user is idle).
@@ -591,6 +595,8 @@
 
   static bool sNeedsToInitMouseWheelSettings;
   static void InitMouseWheelScrollData();
+
+  nsRefPtr<APZCTreeManager> mAPZC;
 };
 
 /**
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/ErrorList.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/ErrorList.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/ErrorList.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/ErrorList.h	2014-11-26 21:46:07.000000000 +0000
@@ -631,6 +631,7 @@
   /* ======================================================================= */
 #define MODULE NS_ERROR_MODULE_SECURITY
   /* Error code for CSP */
+  ERROR(NS_ERROR_CSP_FORM_ACTION_VIOLATION,        FAILURE(98)),
   ERROR(NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION,     FAILURE(99)),
 
   /* CMS specific nsresult error codes.  Note: the numbers used here correspond
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsConsoleService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsConsoleService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsConsoleService.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsConsoleService.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -31,6 +31,11 @@
 #include <windows.h>
 #endif
 
+#ifdef MOZ_TASK_TRACER
+#include "GeckoTaskTracer.h"
+using namespace mozilla::tasktracer;
+#endif
+
 using namespace mozilla;
 
 NS_IMPL_ADDREF(nsConsoleService)
@@ -246,6 +251,17 @@
       OutputDebugStringW(msg.get());
     }
 #endif
+#ifdef MOZ_TASK_TRACER
+    {
+      nsCString msg;
+      aMessage->ToString(msg);
+      int prefixPos = msg.Find(GetJSLabelPrefix());
+      if (prefixPos >= 0) {
+        nsDependentCSubstring submsg(msg, prefixPos);
+        AddLabel("%s", submsg.BeginReading());
+      }
+    }
+#endif
 
     /*
      * If there's already a message in the slot we're about to replace,
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsMemoryInfoDumper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsMemoryInfoDumper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsMemoryInfoDumper.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsMemoryInfoDumper.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -760,6 +760,8 @@
 }
 
 #ifdef MOZ_DMD
+dmd::DMDFuncs::Singleton dmd::DMDFuncs::sSingleton;
+
 nsresult
 nsMemoryInfoDumper::OpenDMDFile(const nsAString& aIdentifier, int aPid,
                                 FILE** aOutFile)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsMemoryReporterManager.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsMemoryReporterManager.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsMemoryReporterManager.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsMemoryReporterManager.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -952,8 +952,8 @@
            sizes.mStackTraceTable,
            "Memory used by DMD's stack trace table.");
 
-    REPORT("explicit/dmd/block-table",
-           sizes.mBlockTable,
+    REPORT("explicit/dmd/live-block-table",
+           sizes.mLiveBlockTable,
            "Memory used by DMD's live block table.");
 
 #undef REPORT
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsSystemInfo.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsSystemInfo.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsSystemInfo.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsSystemInfo.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -45,7 +45,7 @@
 #endif
 
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
-#include "mozilla/Sandbox.h"
+#include "mozilla/SandboxInfo.h"
 #endif
 
 // Slot for NS_InitXPCOM2 to pass information to nsSystemInfo::Init.
@@ -357,20 +357,19 @@
 #endif
 
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
-  SandboxFeatureFlags sandboxFlags = GetSandboxFeatureFlags();
+  SandboxInfo sandInfo = SandboxInfo::Get();
+
   SetPropertyAsBool(NS_LITERAL_STRING("hasSeccompBPF"),
-                    sandboxFlags & kSandboxFeatureSeccompBPF);
+                    sandInfo.Test(SandboxInfo::kHasSeccompBPF));
 
-  SandboxStatus sandboxContent = ContentProcessSandboxStatus();
-  if (sandboxContent != kSandboxingDisabled) {
+  if (sandInfo.Test(SandboxInfo::kEnabledForContent)) {
     SetPropertyAsBool(NS_LITERAL_STRING("canSandboxContent"),
-                      sandboxContent != kSandboxingWouldFail);
+                      sandInfo.CanSandboxContent());
   }
 
-  SandboxStatus sandboxMedia = MediaPluginSandboxStatus();
-  if (sandboxMedia != kSandboxingDisabled) {
+  if (sandInfo.Test(SandboxInfo::kEnabledForMedia)) {
     SetPropertyAsBool(NS_LITERAL_STRING("canSandboxMedia"),
-                      sandboxMedia != kSandboxingWouldFail);
+                      sandInfo.CanSandboxMedia());
   }
 #endif // XP_LINUX && MOZ_SANDBOX
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsWindowsHelpers.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsWindowsHelpers.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/base/nsWindowsHelpers.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/base/nsWindowsHelpers.h	2014-11-26 21:46:07.000000000 +0000
@@ -127,7 +127,7 @@
 
 namespace {
 
-bool
+bool inline
 IsRunningInWindowsMetro()
 {
   static bool alreadyChecked = false;
@@ -157,7 +157,7 @@
   return isMetro;
 }
 
-HMODULE
+HMODULE inline
 LoadLibrarySystem32(LPCWSTR aModule)
 {
   WCHAR systemPath[MAX_PATH + 1] = { L'\0' };
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/nsXULAppAPI.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/nsXULAppAPI.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/nsXULAppAPI.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/nsXULAppAPI.h	2014-11-26 21:46:07.000000000 +0000
@@ -393,9 +393,16 @@
         XRE_SetRemoteExceptionHandler, (const char* aPipe))
 #endif
 
+namespace mozilla {
+namespace gmp {
+class GMPLoader;
+} // namespace gmp
+} // namepsace mozilla
+
 XRE_API(nsresult,
         XRE_InitChildProcess, (int aArgc,
-                               char* aArgv[]))
+                               char* aArgv[],
+                               mozilla::gmp::GMPLoader* aGMPLoader))
 
 XRE_API(GeckoProcessType,
         XRE_GetProcessType, ())
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposerBase.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposerBase.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposerBase.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposerBase.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -6,23 +6,27 @@
 
 #include "mozilla/Mutex.h"
 #include "mozilla/Scoped.h"
+#include "mozilla/UniquePtr.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "PoisonIOInterposer.h"
 
+#ifdef MOZ_REPLACE_MALLOC
+#include "replace_malloc_bridge.h"
+#endif
+
 // Auxiliary method to convert file descriptors to ids
 #if defined(XP_WIN32)
 #include <io.h>
 inline intptr_t
-FileDescriptorToID(int aFd)
+FileDescriptorToHandle(int aFd)
 {
   return _get_osfhandle(aFd);
 }
 #else
 inline intptr_t
-FileDescriptorToID(int aFd)
+FileDescriptorToHandle(int aFd)
 {
   return aFd;
 }
@@ -75,18 +79,133 @@
   Lock = nullptr;
 }
 
-// Return a vector used to hold the IDs of the current debug files. On unix
+// The ChunkedList<T> class implements, at the high level, a non-iterable
+// list of instances of T. Its goal is to be somehow minimalist for the
+// use case of storing the debug files handles here, with the property of
+// not requiring a lock to look up whether it contains a specific value.
+// It is also chunked in blocks of chunk_size bytes so that its
+// initialization doesn't require a memory allocation, while keeping the
+// possibility to increase its size as necessary. Note that chunks are
+// never deallocated (except in the destructor).
+// All operations are essentially O(N) but N is not expected to be large
+// enough to matter.
+template <typename T, size_t chunk_size=64>
+class ChunkedList {
+  struct ListChunk {
+    static const size_t kLength = \
+      (chunk_size - sizeof(ListChunk*)) / sizeof(mozilla::Atomic<T>);
+
+    mozilla::Atomic<T> mElements[kLength];
+    mozilla::UniquePtr<ListChunk> mNext;
+
+    ListChunk() : mNext(nullptr) {}
+  };
+
+  ListChunk mList;
+  mozilla::Atomic<size_t> mLength;
+
+public:
+  ChunkedList() : mLength(0) {}
+
+  ~ChunkedList() {
+    // There can be writes happening after this destructor runs, so keep
+    // the list contents and don't reset mLength. But if there are more
+    // elements left than the first chunk can hold, then all hell breaks
+    // loose for any write that would happen after that because any extra
+    // chunk would be deallocated, so just crash in that case.
+    MOZ_RELEASE_ASSERT(mLength <= ListChunk::kLength);
+  }
+
+  // Add an element at the end of the last chunk of the list. Create a new
+  // chunk if there is not enough room.
+  // This is not thread-safe with another thread calling Add or Remove.
+  void Add(T aValue)
+  {
+    ListChunk *list = &mList;
+    size_t position = mLength;
+    for (; position >= ListChunk::kLength; position -= ListChunk::kLength) {
+      if (!list->mNext) {
+        list->mNext.reset(new ListChunk());
+      }
+      list = list->mNext.get();
+    }
+    // Use an order of operations that ensures any racing Contains call
+    // can't be hurt.
+    list->mElements[position] = aValue;
+    mLength++;
+  }
+
+  // Remove an element from the list by replacing it with the last element
+  // of the list, and then shrinking the list.
+  // This is not thread-safe with another thread calling Add or Remove.
+  void Remove(T aValue)
+  {
+    if (!mLength) {
+      return;
+    }
+    ListChunk *list = &mList;
+    size_t last = mLength - 1;
+    do {
+      size_t position = 0;
+      // Look for an element matching the given value.
+      for (; position < ListChunk::kLength; position++) {
+        if (aValue == list->mElements[position]) {
+          ListChunk *last_list = list;
+          // Look for the last element in the list, starting from where we are
+          // instead of starting over.
+          for (; last >= ListChunk::kLength; last -= ListChunk::kLength) {
+            last_list = last_list->mNext.get();
+          }
+          // Use an order of operations that ensures any racing Contains call
+          // can't be hurt.
+          T value = last_list->mElements[last];
+          list->mElements[position] = value;
+          mLength--;
+          return;
+        }
+      }
+      last -= ListChunk::kLength;
+      list = list->mNext.get();
+    } while (list);
+  }
+
+  // Returns whether the list contains the given value. It is meant to be safe
+  // to use without locking, with the tradeoff of being not entirely accurate
+  // if another thread adds or removes an element while this function runs.
+  bool Contains(T aValue)
+  {
+    ListChunk *list = &mList;
+    // Fix the range of the lookup to whatever the list length is when the
+    // function is called.
+    size_t length = mLength;
+    do {
+      size_t list_length = ListChunk::kLength;
+      list_length = std::min(list_length, length);
+      for (size_t position = 0; position < list_length; position++) {
+        if (aValue == list->mElements[position]) {
+          return true;
+        }
+      }
+      length -= ListChunk::kLength;
+      list = list->mNext.get();
+    } while (list);
+
+    return false;
+  }
+};
+
+typedef ChunkedList<intptr_t> FdList;
+
+// Return a list used to hold the IDs of the current debug files. On unix
 // an ID is a file descriptor. On Windows it is a file HANDLE.
-std::vector<intptr_t>*
+FdList&
 getDebugFileIDs()
 {
-  PR_ASSERT_CURRENT_THREAD_OWNS_LOCK(DebugFilesAutoLock::getDebugFileIDsLock());
-  // We have to use new as some write happen during static destructors
-  // so an static std::vector might be destroyed while we still need it.
-  static std::vector<intptr_t>* DebugFileIDs = new std::vector<intptr_t>();
+  static FdList DebugFileIDs;
   return DebugFileIDs;
 }
 
+
 } // anonymous namespace
 
 namespace mozilla {
@@ -96,40 +215,26 @@
 bool
 IsDebugFile(intptr_t aFileID)
 {
-  DebugFilesAutoLock lockedScope;
-
-  std::vector<intptr_t>& Vec = *getDebugFileIDs();
-  return std::find(Vec.begin(), Vec.end(), aFileID) != Vec.end();
+  return getDebugFileIDs().Contains(aFileID);
 }
 
-// Clean-up for the registered debug files.
-// We should probably make sure all debug files are unregistered instead.
-// But as the poison IO interposer is used for late-write checks we're not
-// disabling it at any point yet. So Really no need for this.
-//
-// void ClearDebugFileRegister() {
-//   PRLock *Lock;
-//   {
-//     DebugFilesAutoLock lockedScope;
-//     delete getDebugFileIDs();
-//     Lock = DebugFilesAutoLock::getDebugFileIDsLock();
-//     DebugFilesAutoLock::Clear();
-//   }
-//   PR_DestroyLock(Lock);
-// }
-
 } // namespace mozilla
 
 extern "C" {
 
 void
-MozillaRegisterDebugFD(int aFd)
+MozillaRegisterDebugHandle(intptr_t aHandle)
 {
-  intptr_t fileId = FileDescriptorToID(aFd);
   DebugFilesAutoLock lockedScope;
-  std::vector<intptr_t>& Vec = *getDebugFileIDs();
-  MOZ_ASSERT(std::find(Vec.begin(), Vec.end(), fileId) == Vec.end());
-  Vec.push_back(fileId);
+  FdList& DebugFileIDs = getDebugFileIDs();
+  MOZ_ASSERT(!DebugFileIDs.Contains(aHandle));
+  DebugFileIDs.Add(aHandle);
+}
+
+void
+MozillaRegisterDebugFD(int aFd)
+{
+  MozillaRegisterDebugHandle(FileDescriptorToHandle(aFd));
 }
 
 void
@@ -143,15 +248,18 @@
 }
 
 void
-MozillaUnRegisterDebugFD(int aFd)
+MozillaUnRegisterDebugHandle(intptr_t aHandle)
 {
   DebugFilesAutoLock lockedScope;
-  intptr_t fileId = FileDescriptorToID(aFd);
-  std::vector<intptr_t>& Vec = *getDebugFileIDs();
-  std::vector<intptr_t>::iterator i =
-    std::find(Vec.begin(), Vec.end(), fileId);
-  MOZ_ASSERT(i != Vec.end());
-  Vec.erase(i);
+  FdList& DebugFileIDs = getDebugFileIDs();
+  MOZ_ASSERT(DebugFileIDs.Contains(aHandle));
+  DebugFileIDs.Remove(aHandle);
+}
+
+void
+MozillaUnRegisterDebugFD(int aFd)
+{
+  MozillaUnRegisterDebugHandle(FileDescriptorToHandle(aFd));
 }
 
 void
@@ -166,3 +274,17 @@
 }
 
 }  // extern "C"
+
+#ifdef MOZ_REPLACE_MALLOC
+void
+DebugFdRegistry::RegisterHandle(intptr_t aHandle)
+{
+  MozillaRegisterDebugHandle(aHandle);
+}
+
+void
+DebugFdRegistry::UnRegisterHandle(intptr_t aHandle)
+{
+  MozillaUnRegisterDebugHandle(aHandle);
+}
+#endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposer.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposer.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposer.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposer.h	2014-11-26 21:46:07.000000000 +0000
@@ -12,12 +12,22 @@
 
 MOZ_BEGIN_EXTERN_C
 
+/** Register file handle to be ignored by poisoning IO interposer. This function
+ * and the corresponding UnRegister function are necessary for exchange of handles
+ * between binaries not using the same CRT on Windows (which happens when one of
+ * them links the static CRT). In such cases, giving file descriptors or FILEs
+ * doesn't work because _get_osfhandle fails with "invalid parameter". */
+void MozillaRegisterDebugHandle(intptr_t aHandle);
+
 /** Register file descriptor to be ignored by poisoning IO interposer */
 void MozillaRegisterDebugFD(int aFd);
 
 /** Register file to be ignored by poisoning IO interposer */
 void MozillaRegisterDebugFILE(FILE* aFile);
 
+/** Unregister file handle from being ignored by poisoning IO interposer */
+void MozillaUnRegisterDebugHandle(intptr_t aHandle);
+
 /** Unregister file descriptor from being ignored by poisoning IO interposer */
 void MozillaUnRegisterDebugFD(int aFd);
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposerMac.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposerMac.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposerMac.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposerMac.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -32,6 +32,10 @@
 #include <dlfcn.h>
 #include <fcntl.h>
 
+#ifdef MOZ_REPLACE_MALLOC
+#include "replace_malloc_bridge.h"
+#endif
+
 namespace {
 
 using namespace mozilla;
@@ -342,6 +346,14 @@
   MozillaRegisterDebugFD(1);
   MozillaRegisterDebugFD(2);
 
+#ifdef MOZ_REPLACE_MALLOC
+  // The contract with InitDebugFd is that the given registry can be used
+  // at any moment, so the instance needs to persist longer than the scope
+  // of this functions.
+  static DebugFdRegistry registry;
+  ReplaceMalloc::InitDebugFd(registry);
+#endif
+
   for (int i = 0; i < NumFunctions; ++i) {
     FuncData* d = Functions[i];
     if (!d->Function) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposerWin.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposerWin.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/build/PoisonIOInterposerWin.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/build/PoisonIOInterposerWin.cpp	2014-11-26 21:46:07.000000000 +0000
@@ -23,6 +23,10 @@
 #include "nsWindowsDllInterceptor.h"
 #include "plstr.h"
 
+#ifdef MOZ_REPLACE_MALLOC
+#include "replace_malloc_bridge.h"
+#endif
+
 using namespace mozilla;
 
 namespace {
@@ -443,6 +447,14 @@
   MozillaRegisterDebugFD(1);
   MozillaRegisterDebugFD(2);
 
+#ifdef MOZ_REPLACE_MALLOC
+  // The contract with InitDebugFd is that the given registry can be used
+  // at any moment, so the instance needs to persist longer than the scope
+  // of this functions.
+  static DebugFdRegistry registry;
+  ReplaceMalloc::InitDebugFd(registry);
+#endif
+
   // Initialize dll interceptor and add hooks
   sNtDllInterceptor.Init("ntdll.dll");
   sNtDllInterceptor.AddHook(
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/ds/TimeStamp.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/ds/TimeStamp.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/ds/TimeStamp.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/ds/TimeStamp.h	2014-11-26 21:46:07.000000000 +0000
@@ -387,11 +387,20 @@
   MOZ_CONSTEXPR TimeStamp() : mValue(0) {}
   // Default copy-constructor and assignment are OK
 
-#ifdef MOZ_WIDGET_GONK
-  TimeStamp(int64_t aAndroidTime) : mValue(aAndroidTime)
+  /**
+   * The system timestamps are the same as the TimeStamp
+   * retrieved by mozilla::TimeStamp. Since we need this for
+   * vsync timestamps, we enable the creation of mozilla::TimeStamps
+   * on platforms that support vsync aligned refresh drivers / compositors
+   * Verified true as of Nov 7, 2014: B2G and OS X
+   * UNTESTED ON OTHER PLATFORMS
+   */
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_COCOA)
+  static TimeStamp FromSystemTime(int64_t aSystemTime)
   {
-    static_assert(sizeof(aAndroidTime) == sizeof(TimeStampValue),
-                  "Android timestamp should be same units as TimeStampValue");
+    static_assert(sizeof(aSystemTime) == sizeof(TimeStampValue),
+                  "System timestamp should be same units as TimeStampValue");
+    return TimeStamp(aSystemTime);
   }
 #endif
 
@@ -508,17 +517,13 @@
   }
   bool operator==(const TimeStamp& aOther) const
   {
-    // Maybe it's ok to check == with null timestamps?
-    MOZ_ASSERT(!IsNull() && "Cannot compute with a null value");
-    MOZ_ASSERT(!aOther.IsNull(), "Cannot compute with aOther null value");
-    return mValue == aOther.mValue;
+    return IsNull()
+           ? aOther.IsNull()
+           : !aOther.IsNull() && mValue == aOther.mValue;
   }
   bool operator!=(const TimeStamp& aOther) const
   {
-    // Maybe it's ok to check != with null timestamps?
-    MOZ_ASSERT(!IsNull(), "Cannot compute with a null value");
-    MOZ_ASSERT(!aOther.IsNull(), "Cannot compute with aOther null value");
-    return mValue != aOther.mValue;
+    return !(*this == aOther);
   }
 
   // Comparing TimeStamps for equality should be discouraged. Adding
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/glue/nsCycleCollectionParticipant.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/glue/nsCycleCollectionParticipant.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/glue/nsCycleCollectionParticipant.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/glue/nsCycleCollectionParticipant.h	2014-11-26 21:46:08.000000000 +0000
@@ -713,6 +713,29 @@
   };                                                                           \
   static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
 
+#define NS_DECL_CYCLE_COLLECTION_SKIPPABLE_NATIVE_CLASS(_class)                \
+  void DeleteCycleCollectable(void)                                            \
+  {                                                                            \
+    delete this;                                                               \
+  }                                                                            \
+  class NS_CYCLE_COLLECTION_INNERCLASS                                         \
+   : public nsCycleCollectionParticipant                                       \
+  {                                                                            \
+  public:                                                                      \
+    MOZ_CONSTEXPR NS_CYCLE_COLLECTION_INNERCLASS ()                            \
+    : nsCycleCollectionParticipant(true) {}                                    \
+  private:                                                                     \
+    NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS_BODY(_class)                         \
+    NS_IMETHOD_(bool) CanSkipReal(void *p, bool aRemovingAllowed);             \
+    NS_IMETHOD_(bool) CanSkipInCCReal(void *p);                                \
+    NS_IMETHOD_(bool) CanSkipThisReal(void *p);                                \
+    static nsCycleCollectionParticipant* GetParticipant()                      \
+    {                                                                          \
+      return &_class::NS_CYCLE_COLLECTION_INNERNAME;                           \
+    }                                                                          \
+  };                                                                           \
+  static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME;
+
 #define NS_DECL_CYCLE_COLLECTION_SKIPPABLE_NATIVE_CLASS_WITH_CUSTOM_DELETE(_class) \
 class NS_CYCLE_COLLECTION_INNERCLASS                                           \
  : public nsCycleCollectionParticipant                                         \
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/glue/nsTArray.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/glue/nsTArray.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/glue/nsTArray.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/glue/nsTArray.h	2014-11-26 21:46:08.000000000 +0000
@@ -2003,6 +2003,13 @@
   {
   }
 
+  template<typename Allocator>
+  self_type& operator=(const nsTArray_Impl<E, Allocator>& other)
+  {
+    Base::operator=(other);
+    return *this;
+  }
+
   operator const AutoFallibleTArray<E, N>&() const
   {
     return *reinterpret_cast<const AutoFallibleTArray<E, N>*>(this);
@@ -2033,6 +2040,13 @@
   {
   }
 
+  template<typename Allocator>
+  self_type& operator=(const nsTArray_Impl<E, Allocator>& other)
+  {
+    Base::operator=(other);
+    return *this;
+  }
+
   operator const nsAutoTArray<E, N>&() const
   {
     return *reinterpret_cast<const nsAutoTArray<E, N>*>(this);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/glue/pldhash.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/glue/pldhash.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/glue/pldhash.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/glue/pldhash.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -707,7 +707,7 @@
   uint32_t i = 0;
   bool didRemove = false;
 
-  if (ChaosMode::isActive()) {
+  if (ChaosMode::isActive(ChaosMode::HashTableIteration)) {
     // Start iterating at a random point in the hashtable. It would be
     // even more chaotic to iterate in fully random order, but that's a lot
     // more work.
@@ -855,7 +855,7 @@
   uint32_t tableSize = capacity * mTable->EntrySize();
   char* entryLimit = mEntryAddr + tableSize;
 
-  if (ChaosMode::isActive()) {
+  if (ChaosMode::isActive(ChaosMode::HashTableIteration)) {
     // Start iterating at a random point in the hashtable. It would be
     // even more chaotic to iterate in fully random order, but that's a lot
     // more work.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/idl-parser/header.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/idl-parser/header.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/idl-parser/header.py	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/idl-parser/header.py	2014-11-26 21:46:08.000000000 +0000
@@ -400,6 +400,8 @@
 
     for member in iface.members:
         if isinstance(member, xpidl.Attribute):
+            if member.infallible:
+                fd.write("\\\n  using %s::%s; " % (iface.name, attributeNativeName(member, True)))
             fd.write("\\\n  %s MOZ_OVERRIDE; " % attributeAsNative(member, True))
             if not member.readonly:
                 fd.write("\\\n  %s MOZ_OVERRIDE; " % attributeAsNative(member, False))
@@ -412,11 +414,13 @@
 
     fd.write(iface_forward % names)
 
-    def emitTemplate(tmpl, tmpl_notxpcom=None):
+    def emitTemplate(forward_infallible, tmpl, tmpl_notxpcom=None):
         if tmpl_notxpcom == None:
             tmpl_notxpcom = tmpl
         for member in iface.members:
             if isinstance(member, xpidl.Attribute):
+                if forward_infallible and member.infallible:
+                    fd.write("\\\n  using %s::%s; " % (iface.name, attributeNativeName(member, True)))
                 fd.write(tmpl % {'asNative': attributeAsNative(member, True),
                                  'nativeName': attributeNativeName(member, True),
                                  'paramList': attributeParamNames(member)})
@@ -438,14 +442,16 @@
         elif not member.kind in ('attribute', 'method'):
             fd.write('\\')
 
-    emitTemplate("\\\n  %(asNative)s MOZ_OVERRIDE { return _to %(nativeName)s(%(paramList)s); } ")
+    emitTemplate(True,
+                 "\\\n  %(asNative)s MOZ_OVERRIDE { return _to %(nativeName)s(%(paramList)s); } ")
 
     fd.write(iface_forward_safe % names)
 
     # Don't try to safely forward notxpcom functions, because we have no
     # sensible default error return.  Instead, the caller will have to
     # implement them.
-    emitTemplate("\\\n  %(asNative)s MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->%(nativeName)s(%(paramList)s); } ",
+    emitTemplate(False,
+                 "\\\n  %(asNative)s MOZ_OVERRIDE { return !_to ? NS_ERROR_NULL_POINTER : _to->%(nativeName)s(%(paramList)s); } ",
                  "\\\n  %(asNative)s MOZ_OVERRIDE; ")
 
     fd.write(iface_template_prolog % names)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/io/FileUtilsWin.h thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/io/FileUtilsWin.h
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/io/FileUtilsWin.h	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/io/FileUtilsWin.h	2014-11-26 21:46:08.000000000 +0000
@@ -21,7 +21,7 @@
   auto inputPath = PromiseFlatString(aDosPath);
   // Try to get the long path, or else get the required length of the long path
   DWORD longPathLen = GetLongPathNameW(inputPath.get(),
-                                       aDosPath.BeginWriting(),
+                                       reinterpret_cast<wchar_t*>(aDosPath.BeginWriting()),
                                        aDosPathOriginalLen);
   if (longPathLen == 0) {
     return false;
@@ -33,7 +33,7 @@
   }
   // Now we have a large enough buffer, get the actual string
   longPathLen = GetLongPathNameW(inputPath.get(),
-                                 aDosPath.BeginWriting(), aDosPath.Length());
+                                 reinterpret_cast<wchar_t*>(aDosPath.BeginWriting()), aDosPath.Length());
   if (longPathLen == 0) {
     return false;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/io/nsLocalFileUnix.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/io/nsLocalFileUnix.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/io/nsLocalFileUnix.cpp	2014-11-14 09:37:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/io/nsLocalFileUnix.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
 
+#include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -1407,10 +1408,9 @@
 #endif
       && dq.dqb_bhardlimit) {
     int64_t QuotaSpaceAvailable = 0;
-    if (dq.dqb_bhardlimit > dq.dqb_curspace) {
-      QuotaSpaceAvailable =
-        int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curspace));
-    }
+    // dqb_bhardlimit is count of BLOCK_SIZE blocks, dqb_curspace is bytes
+    if ((BLOCK_SIZE * dq.dqb_bhardlimit) > dq.dqb_curspace)
+      QuotaSpaceAvailable = int64_t(BLOCK_SIZE * dq.dqb_bhardlimit - dq.dqb_curspace);
     if (QuotaSpaceAvailable < *aDiskSpaceAvailable) {
       *aDiskSpaceAvailable = QuotaSpaceAvailable;
     }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/tests/moz.build thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/tests/moz.build
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/tests/moz.build	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/tests/moz.build	2014-11-26 21:46:08.000000000 +0000
@@ -122,8 +122,3 @@
 RESOURCE_FILES += [
     'test.properties',
 ]
-
-if CONFIG['MOZ_DMD']:
-    USE_LIBS += [
-        'dmd'
-    ]
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/tests/TestDeadlockDetectorScalability.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/tests/TestDeadlockDetectorScalability.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/tests/TestDeadlockDetectorScalability.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/tests/TestDeadlockDetectorScalability.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -4,6 +4,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/. */
 
+// Avoid DMD-specific parts of MOZ_DEFINE_MALLOC_SIZE_OF
+#undef MOZ_DMD
+
 #include "TestHarness.h"
 #include "nsIMemoryReporter.h"
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/nsEventQueue.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/nsEventQueue.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/nsEventQueue.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/nsEventQueue.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -90,7 +90,7 @@
   // Avoid calling AddRef+Release while holding our monitor.
   nsRefPtr<nsIRunnable> event(aRunnable);
 
-  if (ChaosMode::isActive()) {
+  if (ChaosMode::isActive(ChaosMode::ThreadScheduling)) {
     // With probability 0.5, yield so other threads have a chance to
     // dispatch events to this queue first.
     if (ChaosMode::randomUint32LessThan(2)) {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/nsThread.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/nsThread.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/nsThread.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/nsThread.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -285,7 +285,7 @@
 static void
 SetupCurrentThreadForChaosMode()
 {
-  if (!ChaosMode::isActive()) {
+  if (!ChaosMode::isActive(ChaosMode::ThreadScheduling)) {
     return;
   }
 
@@ -888,7 +888,7 @@
     pri = PR_PRIORITY_NORMAL;
   }
   // If chaos mode is active, retain the randomly chosen priority
-  if (!ChaosMode::isActive()) {
+  if (!ChaosMode::isActive(ChaosMode::ThreadScheduling)) {
     PR_SetThreadPriority(mThread, pri);
   }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/nsTimerImpl.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/nsTimerImpl.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/nsTimerImpl.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/nsTimerImpl.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -13,6 +13,9 @@
 #include "pratom.h"
 #include "GeckoProfiler.h"
 #include "mozilla/Atomics.h"
+#ifdef MOZ_NUWA_PROCESS
+#include "ipc/Nuwa.h"
+#endif
 
 using mozilla::Atomic;
 using mozilla::TimeDuration;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/ThreadStackHelper.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/ThreadStackHelper.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/ThreadStackHelper.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/ThreadStackHelper.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -38,6 +38,10 @@
 #include "processor/stackwalker_arm.h"
 #endif
 
+#if defined(MOZ_VALGRIND)
+# include <valgrind/valgrind.h>
+#endif
+
 #include <string.h>
 #include <vector>
 
@@ -260,6 +264,14 @@
   MOZ_ALWAYS_TRUE(::ResumeThread(mThreadID) != DWORD(-1));
 
 #elif defined(XP_MACOSX)
+# if defined(MOZ_VALGRIND) && defined(RUNNING_ON_VALGRIND)
+  if (RUNNING_ON_VALGRIND) {
+    /* thread_suspend and thread_resume sometimes hang runs on Valgrind,
+       for unknown reasons.  So, just avoid them.  See bug 1100911. */
+    return;
+  }
+# endif
+
   if (::thread_suspend(mThreadID) != KERN_SUCCESS) {
     MOZ_ASSERT(false);
     return;
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/TimerThread.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/TimerThread.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xpcom/threads/TimerThread.cpp	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xpcom/threads/TimerThread.cpp	2014-11-26 21:46:08.000000000 +0000
@@ -237,7 +237,7 @@
     if (mSleeping) {
       // Sleep for 0.1 seconds while not firing timers.
       uint32_t milliseconds = 100;
-      if (ChaosMode::isActive()) {
+      if (ChaosMode::isActive(ChaosMode::TimerScheduling)) {
         milliseconds = ChaosMode::randomUint32LessThan(200);
       }
       waitFor = PR_MillisecondsToInterval(milliseconds);
@@ -324,7 +324,7 @@
         // interval is so small we should not wait at all).
         double microseconds = (timeout - now).ToMilliseconds() * 1000;
 
-        if (ChaosMode::isActive()) {
+        if (ChaosMode::isActive(ChaosMode::TimerScheduling)) {
           // The mean value of sFractions must be 1 to ensure that
           // the average of a long sequence of timeouts converges to the
           // actual sum of their times.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xulrunner/app/install_app.py thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xulrunner/app/install_app.py
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/mozilla/xulrunner/app/install_app.py	2014-11-14 09:37:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/mozilla/xulrunner/app/install_app.py	2014-11-26 21:46:08.000000000 +0000
@@ -38,7 +38,7 @@
         return leafName + ".exe"
 
 elif sys.platform == "darwin":
-    xulrunnerStubName = "xulrunner"
+    xulrunnerStubName = "xulrunner-stub"
 
     def installApp(appLocation, installDir, appName, greDir):
         zipApp, iniparser, appName = validateArguments(appLocation, installDir, appName, greDir)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/browser/browser-prefs.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/browser/browser-prefs.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/browser/browser-prefs.js	2014-11-14 09:36:41.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/browser/browser-prefs.js	2014-11-26 21:45:01.000000000 +0000
@@ -718,6 +718,8 @@
 pref("privacy.sanitize.sanitizeOnShutdown", false);
 pref("privacy.sanitize.promptOnSanitize", true);
 
+pref("privacy.warn_tracking_content", true);
+
 // Show XUL error pages instead of alerts for errors
 pref("browser.xul.error_pages.enabled", true);
 pref("browser.xul.error_pages.expert_bad_cert", false);
@@ -948,6 +950,7 @@
 pref("services.sync.prefs.sync.privacy.sanitize.promptOnSanitize", true);
 pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true);
 pref("services.sync.prefs.sync.privacy.trackingprotection.enabled", true);
+pref("services.sync.prefs.sync.privacy.warn_tracking_content", true);
 pref("services.sync.prefs.sync.security.OCSP.enabled", true);
 pref("services.sync.prefs.sync.security.OCSP.require", true);
 pref("services.sync.prefs.sync.security.default_personal_cert", true);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/bindings/notification.xml thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/bindings/notification.xml
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/bindings/notification.xml	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/bindings/notification.xml	2014-11-26 21:44:57.000000000 +0000
@@ -90,7 +90,6 @@
       <method name="onDocumentChange">
         <body>
           <![CDATA[
-            this.missingPlugins = null;
             this.crashNotified = false;
             this.clickToPlayPluginsActivated = false;
             this.clickToPlayTypes = Set();
@@ -127,11 +126,12 @@
         <body>
           <![CDATA[
             if (aState < 0)
-              aState = lastState;
+              aState = this.lastState;
             const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
             var pref = "security.warn_leaving_secure";
             var message = "EnterInsecureMessage";
             var priority = this.PRIORITY_WARNING_LOW;
+            var pane = "ssl_pane";
             var buttons = [];
             if (aState & nsIWebProgressListener.STATE_IS_SECURE) {
               pref = "security.warn_entering_secure";
@@ -153,7 +153,7 @@
               pref = "security.warn_mixed_active_content";
               message = "BlockedActiveContentMessage";
               priority = this.PRIORITY_INFO_LOW;
-              lastState = aState & ~nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT;
+              this.lastState = aState & ~nsIWebProgressListener.STATE_BLOCKED_MIXED_ACTIVE_CONTENT;
               const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
               buttons = [{
                 label: this._stringBundle.GetStringFromName("SecurityKeepBlocking.label"),
@@ -166,6 +166,38 @@
                               nsIWebNavigation.LOAD_FLAGS_ALLOW_MIXED_CONTENT |
                               nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE)
               }];
+            } else if (aState & nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT &&
+                this._prefs.getBoolPref("privacy.warn_tracking_content")) {
+              pref = "privacy.warn_tracking_content";
+              message = "TrackingContentMessage";
+              priority = this.PRIORITY_WARNING_LOW;
+              pane = "security_pane";
+            } else if (aState & nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT &&
+                this._prefs.getBoolPref("privacy.warn_tracking_content")) {
+              pref = "privacy.warn_tracking_content";
+              message = "BlockedTrackingContentMessage";
+              priority = this.PRIORITY_INFO_LOW;
+              pane = "security_pane";
+              if (!this.usePrivateBrowsing) {
+                this.lastState = aState & ~nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT;
+                buttons = [{
+                  label: this._stringBundle.GetStringFromName("SecurityKeepBlocking.label"),
+                  accessKey: this._stringBundle.GetStringFromName("SecurityKeepBlocking.accesskey"),
+                  callback: this.onSecurityChange.bind(this, null, null, -1)
+                }, {
+                  label: this._stringBundle.GetStringFromName("SecurityUnblock.label"),
+                  accessKey: this._stringBundle.GetStringFromName("SecurityUnblock.accesskey"),
+                  callback: () => {
+                    const nsIPermissionManager = Components.interfaces.nsIPermissionManager;
+                    Components.classes["@mozilla.org/permissionmanager;1"]
+                              .getService(nsIPermissionManager)
+                              .add(this.activeBrowser.currentURI,
+                                   "trackingprotection",
+                                   nsIPermissionManager.ALLOW_ACTION);
+                    this.reloadPage();
+                  }
+                }];
+              }
             } else if (aState & nsIWebProgressListener.STATE_LOADED_MIXED_DISPLAY_CONTENT &&
                 this._prefs.getBoolPref("security.warn_mixed_display_content")) {
               pref = "security.warn_mixed_display_content";
@@ -195,7 +227,7 @@
                 label: this._stringBundle.GetStringFromName("SecurityPreferences.label"),
                 accessKey: this._stringBundle.GetStringFromName("SecurityPreferences.accesskey"),
                 callback: function() {
-                  goPreferences("ssl_pane");
+                  goPreferences(pane);
                   return true;
                 }
               });
@@ -374,31 +406,31 @@
 
               case "addon-install-blocked":
                 var installInfo = aSubject.QueryInterface(Components.interfaces.amIWebInstallInfo);
-                if (installInfo.originator.top == browser.contentWindow)
+                if (installInfo.browser == browser)
                   this.addonInstallBlocked(installInfo);
                 break;
 
               case "addon-install-complete":
                 var installInfo = aSubject.QueryInterface(Components.interfaces.amIWebInstallInfo);
-                if (installInfo.originator.top == browser.contentWindow)
+                if (installInfo.browser == browser)
                   this.addonInstallComplete(installInfo);
                 break;
 
               case "addon-install-disabled":
                 var installInfo = aSubject.QueryInterface(Components.interfaces.amIWebInstallInfo);
-                if (installInfo.originator.top == browser.contentWindow)
+                if (installInfo.browser == browser)
                   this.addonInstallDisabled(installInfo);
                 break;
 
               case "addon-install-failed":
                 var installInfo = aSubject.QueryInterface(Components.interfaces.amIWebInstallInfo);
-                if (installInfo.originator.top == browser.contentWindow)
+                if (installInfo.browser == browser)
                   this.addonInstallFailed(installInfo);
                 break;
 
               case "addon-install-started":
                 var installInfo = aSubject.QueryInterface(Components.interfaces.amIWebInstallInfo);
-                if (installInfo.originator.top == browser.contentWindow)
+                if (installInfo.browser == browser)
                   this.addonInstallStarted(installInfo);
                 break;
 
@@ -508,11 +540,6 @@
         </body>
       </method>
 
-      <field name="_missingPlugins">null</field>
-      <property name="missingPlugins"
-                onget="return this._missingPlugins || (this._missingPlugins = new Map());"
-                onset="return this._missingPlugins = val;"/>
-
       <field name="CrashSubmit">null</field>
 
       <field name="crashNotified">false</field>
@@ -572,10 +599,6 @@
         <parameter name="aPref"/>
         <body>
           <![CDATA[
-            // Save information on the plugin to give to the plugin finder.
-            var pluginInfo = this.getPluginInfo(aPlugin);
-            this.missingPlugins.set(pluginInfo.mimetype, pluginInfo);
-
             // Show the in-content UI if it's not too big. The crashed plugin handler already does this.
             var overlay = this.getPluginUI(aPlugin, "main");
             aPlugin.addEventListener("overflow", this);
@@ -1007,16 +1030,6 @@
         </body>
       </method>
 
-      <method name="installMissingPlugins">
-        <body>
-          <![CDATA[
-            window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                              "", "chrome,centerscreen,resizable=yes",
-                              {plugins: this.missingPlugins, browser: this.activeBrowser});
-          ]]>
-        </body>
-      </method>
-
       <method name="playSoundForBlockedPopup">
         <body>
           <![CDATA[
@@ -1719,7 +1732,6 @@
 
       <method name="addonInstallCancelled">
         <parameter name="installInfo"/>
-        <parameter name="sourceURI"/>
         <body>
           <![CDATA[
             var tmp = {};
@@ -1734,9 +1746,9 @@
               callback: function() {
                 var weblistener = Components.classes["@mozilla.org/addons/web-install-listener;1"]
                                             .getService(Components.interfaces.amIWebInstallListener);
-                if (weblistener.onWebInstallRequested(installInfo.originator, sourceURI,
+                if (weblistener.onWebInstallRequested(installInfo.browser, installInfo.originatingURI,
                                                       installInfo.installs, installInfo.installs.length)) {
-                  installs.forEach(function(aInstall) {
+                  installInfo.installs.forEach(function(aInstall) {
                     aInstall.install();
                   });
                 }
@@ -1897,7 +1909,6 @@
                 }))
               return;
 
-            var sourceURI = installInfo.originator.document.documentURIObject;
             Components.utils.import("resource://gre/modules/PluralForm.jsm", tmp);
             var notificationName = "addon-install-started";
             var messageString = this._stringBundle.GetStringFromName("addonDownloading");
@@ -1906,7 +1917,7 @@
               label: this._stringBundle.GetStringFromName("addonDownloadCancelButton"),
               accessKey: this._stringBundle.GetStringFromName("addonDownloadCancelButton.accesskey"),
               popup: null,
-              callback: this.addonInstallCancelled.bind(this, installInfo, sourceURI)
+              callback: this.addonInstallCancelled.bind(this, installInfo)
             }];
             var priority = this.PRIORITY_INFO_MEDIUM;
             var box = this.appendNotification(messageString, notificationName,
@@ -2164,28 +2175,19 @@
           var notification, message, buttons, pref;
           switch (plugin.pluginFallbackType) {
             case nsIObjectLoadingContent.PLUGIN_UNSUPPORTED:
-              // For broken non-object plugin tags, register a click handler so
-              // that the user can click the plugin replacement to get the new
-              // plugin. Object tags can, and often do, deal with that
-              // themselves, so don't stomp on the page developer's toes.
-              if (!(plugin instanceof HTMLObjectElement)) {
-                // We don't yet check to see if there's actually an installer available.
-                var installStatus = this.getPluginUI(plugin, "installStatus");
-                installStatus.setAttribute("status", "ready");
-                var iconStatus = this.getPluginUI(plugin, "icon");
-                iconStatus.setAttribute("status", "ready");
-                var installLink = this.getPluginUI(plugin, "installPluginLink");
-                this.addLinkClickCallback(installLink, installMissingPlugins);
-              }
-
               notification = "missing-plugins";
               message = this._stringBundle.GetStringFromName("missingpluginsMessage.title");
-              buttons = [{
-                label: this._stringBundle.GetStringFromName("missingpluginsMessage.button.label"),
-                accessKey: this._stringBundle.GetStringFromName("missingpluginsMessage.button.accesskey"),
-                popup: null,
-                callback: this.installMissingPlugins.bind(this)
-              }];
+              if ("goPreferences" in window) {
+                buttons = [{
+                  label: this._stringBundle.GetStringFromName("popupWarningButton"),
+                  accessKey: this._stringBundle.GetStringFromName("popupWarningButton.accesskey"),
+                  popup: null,
+                  callback: function() {
+                    goPreferences("scripts_pane");
+                    return true;
+                  }
+                }];
+              }
               break;
 
             case nsIObjectLoadingContent.PLUGIN_DISABLED:
@@ -2217,11 +2219,6 @@
                 accessKey: this._stringBundle.GetStringFromName("blockedpluginsMessage.infoButton.accesskey"),
                 popup: null,
                 callback: this.openURLPref.bind(this, "extensions.blocklist.detailsURL")
-              }, {
-                label: this._stringBundle.GetStringFromName("blockedpluginsMessage.searchButton.label"),
-                accessKey: this._stringBundle.GetStringFromName("blockedpluginsMessage.searchButton.accesskey"),
-                popup: null,
-                callback: this.installMissingPlugins.bind(this)
               }];
               break;
 
@@ -2445,20 +2442,6 @@
         ]]>
       </handler>
 
-      <handler event="NewPluginInstalled" phase="capturing">
-        <![CDATA[
-          this.missingPlugins = null;
-
-          // clean up the UI after a new plugin has been installed.
-          var notification = this.getNotificationWithValue("missing-plugins");
-          if (notification)
-            this.removeNotification(notification);
-
-          // reload the browser to make the new plugin show.
-          this.activeBrowser.reload();
-        ]]>
-      </handler>
-
       <handler event="MozApplicationManifest" phase="capturing">
         <![CDATA[
           if (!this._prefs.getBoolPref("browser.offline-apps.notify"))
@@ -2954,7 +2937,6 @@
 
       <method name="addonInstallCancelled">
         <parameter name="installInfo"/>
-        <parameter name="sourceURI"/>
         <body>
           <![CDATA[
             var tmp = {};
@@ -2968,9 +2950,9 @@
               callback: function() {
                 var weblistener = Components.classes["@mozilla.org/addons/web-install-listener;1"]
                                             .getService(Components.interfaces.amIWebInstallListener);
-                if (weblistener.onWebInstallRequested(installInfo.originator, sourceURI,
+                if (weblistener.onWebInstallRequested(installInfo.browser, installInfo.originatingURI,
                                                       installInfo.installs, installInfo.installs.length)) {
-                  installs.forEach(function(aInstall) {
+                  installInfo.installs.forEach(function(aInstall) {
                     aInstall.install();
                   });
                 }
@@ -3137,14 +3119,13 @@
                 }))
               return;
 
-            var sourceURI = installInfo.originator.document.documentURIObject;
             Components.utils.import("resource://gre/modules/PluralForm.jsm", tmp);
             var messageString = this._stringBundle.GetStringFromName("addonDownloading");
             messageString = tmp.PluralForm.get(installInfo.installs.length, messageString);
             var action = {
               label: this._stringBundle.GetStringFromName("addonDownloadCancelButton"),
               accessKey: this._stringBundle.GetStringFromName("addonDownloadCancelButton.accesskey"),
-              callback: this.addonInstallCancelled.bind(this, installInfo, sourceURI)
+              callback: this.addonInstallCancelled.bind(this, installInfo)
             };
             var options = {
               installInfo: installInfo
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/dataman/dataman.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/dataman/dataman.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/dataman/dataman.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/dataman/dataman.js	2014-11-26 21:44:57.000000000 +0000
@@ -1285,7 +1285,7 @@
       let permTypes = ["allowXULXBL", "cookie", "geo", "image", "indexedDB",
                        "install", "object", "offline-app", "password",
                        "plugins", "popup", "script", "sts/use", "sts/subd",
-                       "stylesheet"];
+                       "stylesheet", "trackingprotection"];
       for (let i = 0; i < permTypes.length; i++) {
         let typeDesc = permTypes[i];
         try {
@@ -1361,6 +1361,8 @@
         if (Services.prefs.getBoolPref("dom.disable_open_during_load"))
           return Services.perms.DENY_ACTION;
         return Services.perms.ALLOW_ACTION;
+      case "trackingprotection":
+        return Services.perms.DENY_ACTION;
     }
     try {
       // Look for an nsContentBlocker permission
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_action_keys_respect_focus.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_action_keys_respect_focus.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_action_keys_respect_focus.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_action_keys_respect_focus.xul	2014-11-26 21:44:57.000000000 +0000
@@ -204,7 +204,7 @@
                             Math.round(Date.now() * 1000), null, persist, false);
 
     persist.progressListener = dl.QueryInterface(Components.interfaces.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_delete_key_cancels.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_delete_key_cancels.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_delete_key_cancels.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_delete_key_cancels.xul	2014-11-26 21:44:57.000000000 +0000
@@ -150,7 +150,7 @@
                             Math.round(Date.now() * 1000), null, persist, false);
 
     persist.progressListener = dl.QueryInterface(Components.interfaces.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_enter_dblclick_opens.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_enter_dblclick_opens.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_enter_dblclick_opens.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_enter_dblclick_opens.xul	2014-11-26 21:44:57.000000000 +0000
@@ -172,7 +172,7 @@
                             Math.round(Date.now() * 1000), null, persist, false);
 
     persist.progressListener = dl.QueryInterface(Components.interfaces.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_space_key_pauses_resumes.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_space_key_pauses_resumes.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_space_key_pauses_resumes.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_space_key_pauses_resumes.xul	2014-11-26 21:44:57.000000000 +0000
@@ -171,7 +171,7 @@
                             Math.round(Date.now() * 1000), null, persist, false);
 
     persist.progressListener = dl.QueryInterface(Components.interfaces.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_space_key_retries.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_space_key_retries.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/tests/chrome/test_space_key_retries.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/tests/chrome/test_space_key_retries.xul	2014-11-26 21:44:57.000000000 +0000
@@ -148,7 +148,7 @@
                             Math.round(Date.now() * 1000), null, persist, false);
 
     persist.progressListener = dl.QueryInterface(Components.interfaces.nsIWebProgressListener);
-    persist.saveURI(dl.source, null, null, null, null, dl.targetFile, null);
+    persist.saveURI(dl.source, null, null, 0, null, null, dl.targetFile, null);
 
     return dl;
   }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/uploadProgress.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/uploadProgress.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/downloads/uploadProgress.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/downloads/uploadProgress.js	2014-11-26 21:44:57.000000000 +0000
@@ -45,7 +45,7 @@
   document.getElementById("source").value =
       gBundle.getFormattedString("fromSource", [gSource.file.leafName]);
   gPersist.progressListener = gProgressListener;
-  gPersist.saveURI(gSource, null, null, null, null, gTarget, null);
+  gPersist.saveURI(gSource, null, null, 0, null, null, gTarget, null);
   document.documentElement.getButton("cancel").focus();
 }
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/pref/pref-cache.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/pref/pref-cache.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/pref/pref-cache.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/pref/pref-cache.js	2014-11-26 21:44:57.000000000 +0000
@@ -8,9 +8,7 @@
 
 function Startup()
 {
-  Components.classes["@mozilla.org/netwerk/cache-storage-service;1"]
-            .getService(Components.interfaces.nsICacheStorageService)
-            .asyncGetDiskConsumption(CacheObserver);
+  updateActualCacheSize();
 }
 
 // Needs to be global because the cache service only keeps a weak reference.
@@ -103,3 +101,9 @@
   return enabled;
 }
 
+function updateActualCacheSize()
+{
+  Components.classes["@mozilla.org/netwerk/cache-storage-service;1"]
+            .getService(Components.interfaces.nsICacheStorageService)
+            .asyncGetDiskConsumption(CacheObserver);
+}
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/pref/pref-security.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/pref/pref-security.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/pref/pref-security.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/pref/pref-security.js	2014-11-26 21:44:57.000000000 +0000
@@ -5,5 +5,11 @@
 
 function Startup()
 {
-  // intentionally left empty for soon-ish use
+  var prefTrackProtect = document.getElementById("privacy.trackingprotection.enabled");
+  SetWarnTrackEnabled(prefTrackProtect.value);
+}
+
+function SetWarnTrackEnabled(aEnable)
+{
+  EnableElementById("warnTrackContent", aEnable, false);
 }
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/pref/pref-security.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/pref/pref-security.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/pref/pref-security.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/pref/pref-security.xul	2014-11-26 21:44:57.000000000 +0000
@@ -21,6 +21,10 @@
                   type="bool"/>
       <preference id="privacy.trackingprotection.enabled"
                   name="privacy.trackingprotection.enabled"
+                  type="bool"
+                  onchange="SetWarnTrackEnabled(this.value);"/>
+      <preference id="privacy.warn_tracking_content"
+                  name="privacy.warn_tracking_content"
                   type="bool"/>
 
       <!-- Location Aware Browsing -->
@@ -50,6 +54,11 @@
                 label="&trackProtect.label;"
                 accesskey="&trackProtect.accesskey;"
                 preference="privacy.trackingprotection.enabled"/>
+      <checkbox id="warnTrackContent"
+                class="indent"
+                label="&warnTrackContent.label;"
+                accesskey="&warnTrackContent.accesskey;"
+                preference="privacy.warn_tracking_content"/>
     </groupbox>
 
     <!-- REMOVE #ifndef once bug 903439 is fixed -->
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/src/nsSuiteGlue.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/src/nsSuiteGlue.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/common/src/nsSuiteGlue.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/common/src/nsSuiteGlue.js	2014-11-26 21:44:57.000000000 +0000
@@ -678,7 +678,7 @@
   {
     const NS_SHELLSERVICE_CID = "@mozilla.org/suite/shell-service;1";
     if (NS_SHELLSERVICE_CID in Components.classes) try {
-      const nsIShellService = Components.interfaces.nsIShellService;
+      var nsIShellService = Components.interfaces.nsIShellService;
 
       var shellService = Components.classes[NS_SHELLSERVICE_CID]
                                    .getService(nsIShellService);
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/installer/Makefile.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/installer/Makefile.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/installer/Makefile.in	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/installer/Makefile.in	2014-11-26 21:44:57.000000000 +0000
@@ -157,6 +157,13 @@
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+RESPATH = $(_APPNAME)/Contents/Resources
+else
+RESPATH = $(BINPATH)
+endif
+DEFINES += -DRESPATH=$(RESPATH)
+
 AB = $(firstword $(subst -, ,$(AB_CD)))
 DEFINES += -DAB=$(AB)
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/installer/package-manifest.in thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/installer/package-manifest.in
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/installer/package-manifest.in	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/installer/package-manifest.in	2014-11-26 21:44:57.000000000 +0000
@@ -13,6 +13,19 @@
 ; ; file comment
 ;
 
+; Due to Apple Mac OS X packaging requirements, files that are in the same
+; directory on other platforms must be located in different directories on
+; Mac OS X. The following defines allow specifying the Mac OS X bundle
+; location which also work on other platforms.
+;
+; @BINPATH@
+; Equals Contents/MacOS/ on Mac OS X and is the path to the main binary on other
+; platforms.
+;
+; @RESPATH@
+; Equals Contents/Resources/ on Mac OS X and is equivalent to @BINPATH@ on other
+; platforms.
+
 #filter substitution
 
 #ifdef XP_UNIX
@@ -25,54 +38,42 @@
 ; Mac bundle stuff
 @APPNAME@/Contents/Info.plist
 @APPNAME@/Contents/PkgInfo
-@APPNAME@/Contents/Resources/seamonkey.icns
-@APPNAME@/Contents/Resources/@AB@.lproj/*
+@RESPATH@/seamonkey.icns
+@RESPATH@/@AB@.lproj/*
 #endif
 
 [@AB_CD@]
-@BINPATH@/chrome/@AB_CD@@JAREXT@
-@BINPATH@/chrome/@AB_CD@.manifest
-@BINPATH@/defaults/messenger/mailViews.dat
-@BINPATH@/defaults/profile/bookmarks.html
-@BINPATH@/defaults/profile/chrome/*
-@BINPATH@/defaults/profile/mimeTypes.rdf
-@BINPATH@/defaults/profile/panels.rdf
-@BINPATH@/dictionaries/*
-@BINPATH@/hyphenation/*
-@BINPATH@/@PREF_DIR@/suite-l10n.js
-@BINPATH@/searchplugins/*
+@RESPATH@/chrome/@AB_CD@@JAREXT@
+@RESPATH@/chrome/@AB_CD@.manifest
+@RESPATH@/defaults/messenger/mailViews.dat
+@RESPATH@/defaults/profile/bookmarks.html
+@RESPATH@/defaults/profile/chrome/*
+@RESPATH@/defaults/profile/mimeTypes.rdf
+@RESPATH@/defaults/profile/panels.rdf
+@RESPATH@/dictionaries/*
+@RESPATH@/hyphenation/*
+@RESPATH@/@PREF_DIR@/suite-l10n.js
+@RESPATH@/searchplugins/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
-@BINPATH@/update.locale
-@BINPATH@/updater.ini
+@RESPATH@/update.locale
+@RESPATH@/updater.ini
 #endif
 
 [xpcom]
-@BINPATH@/dependentlibs.list
+@RESPATH@/dependentlibs.list
 #ifdef GKMEDIAS_SHARED_LIBRARY
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#endif
 #ifdef MOZ_SHARED_MOZGLUE
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozglue@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_STATIC_JS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_NATIVE_NSPR
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@@ -81,13 +82,13 @@
 #endif
 #endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/XUL
+@BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_CHILD_PROCESS_NAME@.app/
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
@@ -145,531 +146,531 @@
 ; [Base Browser Files]
 #ifdef XP_WIN32
 @BINPATH@/@MOZ_APP_NAME@.exe
-#elif XP_MACOSX
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin
-@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 @BINPATH@/@MOZ_APP_NAME@
 #endif
-@BINPATH@/application.ini
-@BINPATH@/platform.ini
+@RESPATH@/application.ini
+@RESPATH@/platform.ini
 #ifdef MOZ_UPDATER
-@BINPATH@/update-settings.ini
+@RESPATH@/update-settings.ini
 #endif
 #ifndef MOZ_NATIVE_SQLITE
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #endif
-@BINPATH@/license.txt
-@BINPATH@/blocklist.xml
+@RESPATH@/license.txt
+@RESPATH@/blocklist.xml
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/run-mozilla.sh
+@RESPATH@/run-mozilla.sh
 #endif
 
 ; [Components]
 ; Although components.manifest ends up being shipped inside omni.jar
 ; it still needs listing here as it is parsed for various binary
 ; components before being packaged inside omni.jar.
-@BINPATH@/components/components.manifest
+@RESPATH@/components/components.manifest
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
-@BINPATH@/components/accessibility.xpt
+@RESPATH@/components/accessibility.xpt
 #endif
-@BINPATH@/components/alerts.xpt
-@BINPATH@/components/appshell.xpt
-@BINPATH@/components/appstartup.xpt
-@BINPATH@/components/autocomplete.xpt
-@BINPATH@/components/autoconfig.xpt
-@BINPATH@/components/browser-element.xpt
-@BINPATH@/components/caps.xpt
-@BINPATH@/components/chrome.xpt
-@BINPATH@/components/commandhandler.xpt
-@BINPATH@/components/commandlines.xpt
-@BINPATH@/components/commuconv.xpt
-@BINPATH@/components/composer.xpt
-@BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_geckomediaplugins.xpt
-@BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_xslt.xpt
-@BINPATH@/components/cookie.xpt
+@RESPATH@/components/alerts.xpt
+@RESPATH@/components/appshell.xpt
+@RESPATH@/components/appstartup.xpt
+@RESPATH@/components/autocomplete.xpt
+@RESPATH@/components/autoconfig.xpt
+@RESPATH@/components/browser-element.xpt
+@RESPATH@/components/caps.xpt
+@RESPATH@/components/chrome.xpt
+@RESPATH@/components/commandhandler.xpt
+@RESPATH@/components/commandlines.xpt
+@RESPATH@/components/commuconv.xpt
+@RESPATH@/components/composer.xpt
+@RESPATH@/components/content_events.xpt
+@RESPATH@/components/content_geckomediaplugins.xpt
+@RESPATH@/components/content_html.xpt
+@RESPATH@/components/content_xslt.xpt
+@RESPATH@/components/cookie.xpt
 #ifdef MOZ_ENABLE_DBUS
-@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 #endif
-@BINPATH@/components/directory.xpt
-@BINPATH@/components/docshell.xpt
-@BINPATH@/components/dom.xpt
-@BINPATH@/components/dom_alarm.xpt
-@BINPATH@/components/dom_apps.xpt
-@BINPATH@/components/dom_base.xpt
-@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_core.xpt
-@BINPATH@/components/dom_css.xpt
-@BINPATH@/components/dom_datastore.xpt
-@BINPATH@/components/dom_devicestorage.xpt
-@BINPATH@/components/dom_events.xpt
+@RESPATH@/components/directory.xpt
+@RESPATH@/components/docshell.xpt
+@RESPATH@/components/dom.xpt
+@RESPATH@/components/dom_alarm.xpt
+@RESPATH@/components/dom_apps.xpt
+@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_canvas.xpt
+@RESPATH@/components/dom_core.xpt
+@RESPATH@/components/dom_css.xpt
+@RESPATH@/components/dom_datastore.xpt
+@RESPATH@/components/dom_devicestorage.xpt
+@RESPATH@/components/dom_events.xpt
 #ifdef MOZ_GAMEPAD
-@BINPATH@/components/dom_gamepad.xpt
+@RESPATH@/components/dom_gamepad.xpt
 #endif
-@BINPATH@/components/dom_geolocation.xpt
-@BINPATH@/components/dom_html.xpt
-@BINPATH@/components/dom_json.xpt
-@BINPATH@/components/dom_media.xpt
-@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_network.xpt
-@BINPATH@/components/dom_notification.xpt
-@BINPATH@/components/dom_offline.xpt
-@BINPATH@/components/dom_permissionsettings.xpt
-@BINPATH@/components/dom_power.xpt
-@BINPATH@/components/dom_quota.xpt
-@BINPATH@/components/dom_range.xpt
-@BINPATH@/components/dom_settings.xpt
-@BINPATH@/components/dom_sidebar.xpt
-@BINPATH@/components/dom_smil.xpt
-@BINPATH@/components/dom_storage.xpt
-@BINPATH@/components/dom_stylesheets.xpt
-@BINPATH@/components/dom_svg.xpt
-@BINPATH@/components/dom_system.xpt
-@BINPATH@/components/dom_traversal.xpt
+@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_html.xpt
+@RESPATH@/components/dom_json.xpt
+@RESPATH@/components/dom_media.xpt
+@RESPATH@/components/dom_mobilemessage.xpt
+@RESPATH@/components/dom_network.xpt
+@RESPATH@/components/dom_notification.xpt
+@RESPATH@/components/dom_offline.xpt
+@RESPATH@/components/dom_permissionsettings.xpt
+@RESPATH@/components/dom_power.xpt
+@RESPATH@/components/dom_quota.xpt
+@RESPATH@/components/dom_range.xpt
+@RESPATH@/components/dom_settings.xpt
+@RESPATH@/components/dom_sidebar.xpt
+@RESPATH@/components/dom_smil.xpt
+@RESPATH@/components/dom_storage.xpt
+@RESPATH@/components/dom_stylesheets.xpt
+@RESPATH@/components/dom_svg.xpt
+@RESPATH@/components/dom_system.xpt
+@RESPATH@/components/dom_traversal.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeechrecognition.xpt
-@BINPATH@/components/dom_webspeechsynth.xpt
+@RESPATH@/components/dom_webspeechrecognition.xpt
+@RESPATH@/components/dom_webspeechsynth.xpt
 #endif
-@BINPATH@/components/dom_xbl.xpt
-@BINPATH@/components/dom_xpath.xpt
-@BINPATH@/components/dom_xul.xpt
-@BINPATH@/components/downloads.xpt
-@BINPATH@/components/editor.xpt
-@BINPATH@/components/embed_base.xpt
-@BINPATH@/components/extensions.xpt
-@BINPATH@/components/extensions.manifest
-@BINPATH@/components/exthandler.xpt
-@BINPATH@/components/exthelper.xpt
-@BINPATH@/components/fastfind.xpt
-@BINPATH@/components/feeds.xpt
+@RESPATH@/components/dom_xbl.xpt
+@RESPATH@/components/dom_xpath.xpt
+@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/downloads.xpt
+@RESPATH@/components/editor.xpt
+@RESPATH@/components/embed_base.xpt
+@RESPATH@/components/extensions.xpt
+@RESPATH@/components/extensions.manifest
+@RESPATH@/components/exthandler.xpt
+@RESPATH@/components/exthelper.xpt
+@RESPATH@/components/fastfind.xpt
+@RESPATH@/components/feeds.xpt
 #ifdef MOZ_GTK2
-@BINPATH@/components/filepicker.xpt
+@RESPATH@/components/filepicker.xpt
 #endif
-@BINPATH@/components/find.xpt
-@BINPATH@/components/gfx.xpt
-@BINPATH@/components/html5.xpt
-@BINPATH@/components/htmlparser.xpt
-@BINPATH@/components/identity.xpt
-@BINPATH@/components/imgicon.xpt
-@BINPATH@/components/imglib2.xpt
-@BINPATH@/components/inspector.xpt
-@BINPATH@/components/intl.xpt
-@BINPATH@/components/jar.xpt
-@BINPATH@/components/jsdebugger.xpt
-@BINPATH@/components/jsinspector.xpt
-@BINPATH@/components/layout_base.xpt
+@RESPATH@/components/find.xpt
+@RESPATH@/components/gfx.xpt
+@RESPATH@/components/html5.xpt
+@RESPATH@/components/htmlparser.xpt
+@RESPATH@/components/identity.xpt
+@RESPATH@/components/imgicon.xpt
+@RESPATH@/components/imglib2.xpt
+@RESPATH@/components/inspector.xpt
+@RESPATH@/components/intl.xpt
+@RESPATH@/components/jar.xpt
+@RESPATH@/components/jsdebugger.xpt
+@RESPATH@/components/jsinspector.xpt
+@RESPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
-@BINPATH@/components/layout_printing.xpt
+@RESPATH@/components/layout_printing.xpt
 #endif
-@BINPATH@/components/layout_xul_tree.xpt
-@BINPATH@/components/layout_xul.xpt
-@BINPATH@/components/locale.xpt
-@BINPATH@/components/loginmgr.xpt
-@BINPATH@/components/lwbrk.xpt
-@BINPATH@/components/mimetype.xpt
-@BINPATH@/components/mozfind.xpt
+@RESPATH@/components/layout_xul_tree.xpt
+@RESPATH@/components/layout_xul.xpt
+@RESPATH@/components/locale.xpt
+@RESPATH@/components/loginmgr.xpt
+@RESPATH@/components/lwbrk.xpt
+@RESPATH@/components/mimetype.xpt
+@RESPATH@/components/mozfind.xpt
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
-@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
-@BINPATH@/components/necko.xpt
-@BINPATH@/components/necko_about.xpt
-@BINPATH@/components/necko_cache.xpt
-@BINPATH@/components/necko_cache2.xpt
-@BINPATH@/components/necko_cookie.xpt
-@BINPATH@/components/necko_dns.xpt
-@BINPATH@/components/necko_file.xpt
-@BINPATH@/components/necko_ftp.xpt
-@BINPATH@/components/necko_http.xpt
-@BINPATH@/components/necko_res.xpt
-@BINPATH@/components/necko_socket.xpt
-@BINPATH@/components/necko_strconv.xpt
-@BINPATH@/components/necko_viewsource.xpt
-@BINPATH@/components/necko_websocket.xpt
+@RESPATH@/components/necko.xpt
+@RESPATH@/components/necko_about.xpt
+@RESPATH@/components/necko_cache.xpt
+@RESPATH@/components/necko_cache2.xpt
+@RESPATH@/components/necko_cookie.xpt
+@RESPATH@/components/necko_dns.xpt
+@RESPATH@/components/necko_file.xpt
+@RESPATH@/components/necko_ftp.xpt
+@RESPATH@/components/necko_http.xpt
+@RESPATH@/components/necko_res.xpt
+@RESPATH@/components/necko_socket.xpt
+@RESPATH@/components/necko_strconv.xpt
+@RESPATH@/components/necko_viewsource.xpt
+@RESPATH@/components/necko_websocket.xpt
 #ifdef NECKO_WIFI
-@BINPATH@/components/necko_wifi.xpt
+@RESPATH@/components/necko_wifi.xpt
 #endif
-@BINPATH@/components/necko_wyciwyg.xpt
+@RESPATH@/components/necko_wyciwyg.xpt
 #ifdef MOZ_ENABLE_GNOMEVFS
-@BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
+@RESPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 #endif
-@BINPATH@/components/parentalcontrols.xpt
+@RESPATH@/components/parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/peerconnection.xpt
+@RESPATH@/components/peerconnection.xpt
 #endif
-@BINPATH@/components/places.xpt
-@BINPATH@/components/plugin.xpt
-@BINPATH@/components/pref.xpt
-@BINPATH@/components/prefetch.xpt
-@BINPATH@/components/profile.xpt
+@RESPATH@/components/places.xpt
+@RESPATH@/components/plugin.xpt
+@RESPATH@/components/pref.xpt
+@RESPATH@/components/prefetch.xpt
+@RESPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@BINPATH@/components/profiler.xpt
+@RESPATH@/components/profiler.xpt
 #endif
-@BINPATH@/components/rdf.xpt
-@BINPATH@/components/satchel.xpt
-@BINPATH@/components/satchel.manifest
-@BINPATH@/components/saxparser.xpt
-@BINPATH@/components/services-crypto-component.xpt
-@BINPATH@/components/shellservice.xpt
-@BINPATH@/components/shistory.xpt
-@BINPATH@/components/smile.xpt
-@BINPATH@/components/spellchecker.xpt
-@BINPATH@/components/startupcache.xpt
-@BINPATH@/components/storage.xpt
-@BINPATH@/components/@DLL_PREFIX@suite@DLL_SUFFIX@
-@BINPATH@/components/SuiteBrowser.manifest
-@BINPATH@/components/suitecommon.xpt
-@BINPATH@/components/SuiteCommon.manifest
-@BINPATH@/components/suitefeeds.xpt
-@BINPATH@/components/SuiteFeeds.manifest
-@BINPATH@/components/suitemigration.xpt
-@BINPATH@/components/telemetry.xpt
-@BINPATH@/components/toolkit_finalizationwitness.xpt
-@BINPATH@/components/toolkit_formautofill.xpt
-@BINPATH@/components/toolkit_osfile.xpt
-@BINPATH@/components/toolkit_xulstore.xpt
-@BINPATH@/components/toolkitplaces.manifest
-@BINPATH@/components/toolkitprofile.xpt
+@RESPATH@/components/rdf.xpt
+@RESPATH@/components/satchel.xpt
+@RESPATH@/components/satchel.manifest
+@RESPATH@/components/saxparser.xpt
+@RESPATH@/components/services-crypto-component.xpt
+@RESPATH@/components/shellservice.xpt
+@RESPATH@/components/shistory.xpt
+@RESPATH@/components/smile.xpt
+@RESPATH@/components/spellchecker.xpt
+@RESPATH@/components/startupcache.xpt
+@RESPATH@/components/storage.xpt
+@RESPATH@/components/@DLL_PREFIX@suite@DLL_SUFFIX@
+@RESPATH@/components/SuiteBrowser.manifest
+@RESPATH@/components/suitecommon.xpt
+@RESPATH@/components/SuiteCommon.manifest
+@RESPATH@/components/suitefeeds.xpt
+@RESPATH@/components/SuiteFeeds.manifest
+@RESPATH@/components/suitemigration.xpt
+@RESPATH@/components/telemetry.xpt
+@RESPATH@/components/toolkit_finalizationwitness.xpt
+@RESPATH@/components/toolkit_formautofill.xpt
+@RESPATH@/components/toolkit_osfile.xpt
+@RESPATH@/components/toolkit_xulstore.xpt
+@RESPATH@/components/toolkitplaces.manifest
+@RESPATH@/components/toolkitprofile.xpt
 #ifdef UNIX_BUT_NOT_MAC
-@BINPATH@/components/toolkitremote.xpt
+@RESPATH@/components/toolkitremote.xpt
 #endif
-@BINPATH@/components/toolkitsearch.manifest
-@BINPATH@/components/txmgr.xpt
-@BINPATH@/components/txtsvc.xpt
-@BINPATH@/components/uconv.xpt
-@BINPATH@/components/unicharutil.xpt
-@BINPATH@/components/update.xpt
-@BINPATH@/components/uriloader.xpt
+@RESPATH@/components/toolkitsearch.manifest
+@RESPATH@/components/txmgr.xpt
+@RESPATH@/components/txtsvc.xpt
+@RESPATH@/components/uconv.xpt
+@RESPATH@/components/unicharutil.xpt
+@RESPATH@/components/update.xpt
+@RESPATH@/components/uriloader.xpt
 #ifdef MOZ_URL_CLASSIFIER
-@BINPATH@/components/url-classifier.xpt
-#endif
-@BINPATH@/components/urlformatter.xpt
-@BINPATH@/components/webBrowser_core.xpt
-@BINPATH@/components/webbrowserpersist.xpt
-@BINPATH@/components/widget.xpt
-#ifdef XP_MACOSX
-@BINPATH@/components/widget_cocoa.xpt
+@RESPATH@/components/url-classifier.xpt
 #endif
-@BINPATH@/components/windowds.xpt
-@BINPATH@/components/windowwatcher.xpt
-@BINPATH@/components/xpcom_base.xpt
-@BINPATH@/components/xpcom_components.xpt
-@BINPATH@/components/xpcom_ds.xpt
-@BINPATH@/components/xpcom_io.xpt
-@BINPATH@/components/xpcom_system.xpt
-@BINPATH@/components/xpcom_threads.xpt
-@BINPATH@/components/xpcom_xpti.xpt
-@BINPATH@/components/xpconnect.xpt
-@BINPATH@/components/xulapp.xpt
-@BINPATH@/components/xul.xpt
-@BINPATH@/components/xultmpl.xpt
-@BINPATH@/components/zipwriter.xpt
+@RESPATH@/components/urlformatter.xpt
+@RESPATH@/components/webBrowser_core.xpt
+@RESPATH@/components/webbrowserpersist.xpt
+@RESPATH@/components/widget.xpt
+#ifdef XP_MACOSX
+@RESPATH@/components/widget_cocoa.xpt
+#endif
+@RESPATH@/components/windowds.xpt
+@RESPATH@/components/windowwatcher.xpt
+@RESPATH@/components/xpcom_base.xpt
+@RESPATH@/components/xpcom_components.xpt
+@RESPATH@/components/xpcom_ds.xpt
+@RESPATH@/components/xpcom_io.xpt
+@RESPATH@/components/xpcom_system.xpt
+@RESPATH@/components/xpcom_threads.xpt
+@RESPATH@/components/xpcom_xpti.xpt
+@RESPATH@/components/xpconnect.xpt
+@RESPATH@/components/xulapp.xpt
+@RESPATH@/components/xul.xpt
+@RESPATH@/components/xultmpl.xpt
+@RESPATH@/components/zipwriter.xpt
 
 ; JavaScript components
-@BINPATH@/components/addonManager.js
-@BINPATH@/components/AlarmsManager.js
-@BINPATH@/components/AlarmsManager.manifest
-@BINPATH@/components/amContentHandler.js
-@BINPATH@/components/amInstallTrigger.js
-@BINPATH@/components/amWebInstallListener.js
-@BINPATH@/components/AppsService.js
-@BINPATH@/components/AppsService.manifest
-@BINPATH@/components/BrowserElementParent.js
-@BINPATH@/components/BrowserElementParent.manifest
-@BINPATH@/components/ColorAnalyzer.js
-@BINPATH@/components/ConsoleAPIStorage.js
-@BINPATH@/components/ConsoleAPI.manifest
-@BINPATH@/components/ContactManager.js
-@BINPATH@/components/ContactManager.manifest
-@BINPATH@/components/contentAreaDropListener.js
-@BINPATH@/components/contentAreaDropListener.manifest
-@BINPATH@/components/crypto-SDR.js
-@BINPATH@/components/cryptoComponents.manifest
-@BINPATH@/components/DataStoreImpl.js
-@BINPATH@/components/DataStore.manifest
-@BINPATH@/components/Downloads.manifest
-@BINPATH@/components/DownloadLegacy.js
-@BINPATH@/components/FeedConverter.js
-@BINPATH@/components/FeedProcessor.js
-@BINPATH@/components/FeedProcessor.manifest
-@BINPATH@/components/FeedWriter.js
-@BINPATH@/components/folderLookupService.js
-@BINPATH@/components/formautofill.manifest
-@BINPATH@/components/FormAutofillContentService.js
-@BINPATH@/components/Identity.manifest
-@BINPATH@/components/jsconsole-clhandler.js
-@BINPATH@/components/jsconsole-clhandler.manifest
-@BINPATH@/components/messageWakeupService.js
-@BINPATH@/components/messageWakeupService.manifest
-@BINPATH@/components/NetworkGeolocationProvider.js
-@BINPATH@/components/NetworkGeolocationProvider.manifest
-@BINPATH@/components/nsAbout.js
-@BINPATH@/components/nsBlocklistService.js
-@BINPATH@/components/nsBrowserContentHandler.js
-@BINPATH@/components/nsComposerCmdLineHandler.js
-@BINPATH@/components/nsComposerCmdLineHandler.manifest
-@BINPATH@/components/nsContentDispatchChooser.js
-@BINPATH@/components/nsContentDispatchChooser.manifest
-@BINPATH@/components/nsContentPrefService.js
-@BINPATH@/components/nsContentPrefService.manifest
-@BINPATH@/components/nsDefaultCLH.js
-@BINPATH@/components/nsDefaultCLH.manifest
-@BINPATH@/components/nsDOMIdentity.js
+@RESPATH@/components/addonManager.js
+@RESPATH@/components/AlarmsManager.js
+@RESPATH@/components/AlarmsManager.manifest
+@RESPATH@/components/amContentHandler.js
+@RESPATH@/components/amInstallTrigger.js
+@RESPATH@/components/amWebInstallListener.js
+@RESPATH@/components/AppsService.js
+@RESPATH@/components/AppsService.manifest
+@RESPATH@/components/BrowserElementParent.js
+@RESPATH@/components/BrowserElementParent.manifest
+@RESPATH@/components/ColorAnalyzer.js
+@RESPATH@/components/ConsoleAPIStorage.js
+@RESPATH@/components/ConsoleAPI.manifest
+@RESPATH@/components/ContactManager.js
+@RESPATH@/components/ContactManager.manifest
+@RESPATH@/components/contentAreaDropListener.js
+@RESPATH@/components/contentAreaDropListener.manifest
+@RESPATH@/components/crypto-SDR.js
+@RESPATH@/components/cryptoComponents.manifest
+@RESPATH@/components/DataStoreImpl.js
+@RESPATH@/components/DataStore.manifest
+@RESPATH@/components/Downloads.manifest
+@RESPATH@/components/DownloadLegacy.js
+@RESPATH@/components/FeedConverter.js
+@RESPATH@/components/FeedProcessor.js
+@RESPATH@/components/FeedProcessor.manifest
+@RESPATH@/components/FeedWriter.js
+@RESPATH@/components/folderLookupService.js
+@RESPATH@/components/formautofill.manifest
+@RESPATH@/components/FormAutofillContentService.js
+@RESPATH@/components/Identity.manifest
+@RESPATH@/components/jsconsole-clhandler.js
+@RESPATH@/components/jsconsole-clhandler.manifest
+@RESPATH@/components/messageWakeupService.js
+@RESPATH@/components/messageWakeupService.manifest
+@RESPATH@/components/NetworkGeolocationProvider.js
+@RESPATH@/components/NetworkGeolocationProvider.manifest
+@RESPATH@/components/nsAbout.js
+@RESPATH@/components/nsBlocklistService.js
+@RESPATH@/components/nsBrowserContentHandler.js
+@RESPATH@/components/nsComposerCmdLineHandler.js
+@RESPATH@/components/nsComposerCmdLineHandler.manifest
+@RESPATH@/components/nsContentDispatchChooser.js
+@RESPATH@/components/nsContentDispatchChooser.manifest
+@RESPATH@/components/nsContentPrefService.js
+@RESPATH@/components/nsContentPrefService.manifest
+@RESPATH@/components/nsDefaultCLH.js
+@RESPATH@/components/nsDefaultCLH.manifest
+@RESPATH@/components/nsDOMIdentity.js
 #ifdef MOZ_GTK2
-@BINPATH@/components/nsFilePicker.js
-@BINPATH@/components/nsFilePicker.manifest
+@RESPATH@/components/nsFilePicker.js
+@RESPATH@/components/nsFilePicker.manifest
 #endif
-@BINPATH@/components/nsFormAutoComplete.js
-@BINPATH@/components/nsFormHistory.js
-@BINPATH@/components/FormHistoryStartup.js
-@BINPATH@/components/nsGopherProtocolStubHandler.js
-@BINPATH@/components/nsHandlerService.js
-@BINPATH@/components/nsHandlerService.manifest
-@BINPATH@/components/nsHelperAppDlg.js
-@BINPATH@/components/nsHelperAppDlg.manifest
-@BINPATH@/components/nsIDService.js
-@BINPATH@/components/nsINIProcessor.js
-@BINPATH@/components/nsINIProcessor.manifest
-@BINPATH@/components/nsInputListAutoComplete.js
-@BINPATH@/components/nsLivemarkService.js
-@BINPATH@/components/nsLoginInfo.js
-@BINPATH@/components/nsLoginManager.js
-@BINPATH@/components/nsLoginManagerPrompter.js
-@BINPATH@/components/nsPlacesAutoComplete.js
-@BINPATH@/components/nsPlacesAutoComplete.manifest
-@BINPATH@/components/nsPlacesExpiration.js
-@BINPATH@/components/nsPrompter.js
-@BINPATH@/components/nsPrompter.manifest
-@BINPATH@/components/nsSearchService.js
-@BINPATH@/components/nsSearchSuggestions.js
-@BINPATH@/components/nsSessionStartup.js
-@BINPATH@/components/nsSessionStore.js
-@BINPATH@/components/nsSidebar.js
-@BINPATH@/components/nsSuiteDownloadManagerUI.js
-@BINPATH@/components/nsSuiteGlue.js
-@BINPATH@/components/nsSetDefault.js
-@BINPATH@/components/nsSetDefault.manifest
-@BINPATH@/components/nsTaggingService.js
-@BINPATH@/components/nsTypeAheadFind.js
+@RESPATH@/components/nsFormAutoComplete.js
+@RESPATH@/components/nsFormHistory.js
+@RESPATH@/components/FormHistoryStartup.js
+@RESPATH@/components/nsGopherProtocolStubHandler.js
+@RESPATH@/components/nsHandlerService.js
+@RESPATH@/components/nsHandlerService.manifest
+@RESPATH@/components/nsHelperAppDlg.js
+@RESPATH@/components/nsHelperAppDlg.manifest
+@RESPATH@/components/nsIDService.js
+@RESPATH@/components/nsINIProcessor.js
+@RESPATH@/components/nsINIProcessor.manifest
+@RESPATH@/components/nsInputListAutoComplete.js
+@RESPATH@/components/nsLivemarkService.js
+@RESPATH@/components/nsLoginInfo.js
+@RESPATH@/components/nsLoginManager.js
+@RESPATH@/components/nsLoginManagerPrompter.js
+@RESPATH@/components/nsPlacesAutoComplete.js
+@RESPATH@/components/nsPlacesAutoComplete.manifest
+@RESPATH@/components/nsPlacesExpiration.js
+@RESPATH@/components/nsPrompter.js
+@RESPATH@/components/nsPrompter.manifest
+@RESPATH@/components/nsSearchService.js
+@RESPATH@/components/nsSearchSuggestions.js
+@RESPATH@/components/nsSessionStartup.js
+@RESPATH@/components/nsSessionStore.js
+@RESPATH@/components/nsSidebar.js
+@RESPATH@/components/nsSuiteDownloadManagerUI.js
+@RESPATH@/components/nsSuiteGlue.js
+@RESPATH@/components/nsSetDefault.js
+@RESPATH@/components/nsSetDefault.manifest
+@RESPATH@/components/nsTaggingService.js
+@RESPATH@/components/nsTypeAheadFind.js
 #ifdef MOZ_UPDATER
-@BINPATH@/components/nsUpdateService.js
-@BINPATH@/components/nsUpdateService.manifest
-@BINPATH@/components/nsUpdateServiceStub.js
+@RESPATH@/components/nsUpdateService.js
+@RESPATH@/components/nsUpdateService.manifest
+@RESPATH@/components/nsUpdateServiceStub.js
 #endif
-@BINPATH@/components/nsUpdateTimerManager.js
-@BINPATH@/components/nsUpdateTimerManager.manifest
+@RESPATH@/components/nsUpdateTimerManager.js
+@RESPATH@/components/nsUpdateTimerManager.manifest
 #ifdef MOZ_URL_CLASSIFIER
-@BINPATH@/components/nsURLClassifier.manifest
-@BINPATH@/components/nsUrlClassifierHashCompleter.js
-@BINPATH@/components/nsUrlClassifierLib.js
-@BINPATH@/components/nsUrlClassifierListManager.js
-#endif
-@BINPATH@/components/nsURLFormatter.js
-@BINPATH@/components/nsURLFormatter.manifest
-@BINPATH@/components/nsWebHandlerApp.js
-@BINPATH@/components/nsWebHandlerApp.manifest
-@BINPATH@/components/passwordmgr.manifest
+@RESPATH@/components/nsURLClassifier.manifest
+@RESPATH@/components/nsUrlClassifierHashCompleter.js
+@RESPATH@/components/nsUrlClassifierLib.js
+@RESPATH@/components/nsUrlClassifierListManager.js
+#endif
+@RESPATH@/components/nsURLFormatter.js
+@RESPATH@/components/nsURLFormatter.manifest
+@RESPATH@/components/nsWebHandlerApp.js
+@RESPATH@/components/nsWebHandlerApp.manifest
+@RESPATH@/components/passwordmgr.manifest
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/PeerConnection.js
-@BINPATH@/components/PeerConnection.manifest
+@RESPATH@/components/PeerConnection.js
+@RESPATH@/components/PeerConnection.manifest
 #endif
-@BINPATH@/components/PermissionSettings.js
-@BINPATH@/components/PermissionSettings.manifest
-@BINPATH@/components/PhoneNumberService.js
-@BINPATH@/components/PhoneNumberService.manifest
-@BINPATH@/components/PlacesCategoriesStarter.js
-@BINPATH@/components/pluginGlue.manifest
-@BINPATH@/components/servicesComponents.manifest
-@BINPATH@/components/SettingsManager.js
-@BINPATH@/components/SettingsManager.manifest
-@BINPATH@/components/SiteSpecificUserAgent.js
-@BINPATH@/components/SiteSpecificUserAgent.manifest
-@BINPATH@/components/SlowScriptDebug.js
-@BINPATH@/components/SlowScriptDebug.manifest
-@BINPATH@/components/smileApplication.js
-@BINPATH@/components/smileApplication.manifest
-@BINPATH@/components/storage-json.js
-@BINPATH@/components/SuiteProfileMigrator.js
-@BINPATH@/components/SuiteProfileMigrator.manifest
+@RESPATH@/components/PermissionSettings.js
+@RESPATH@/components/PermissionSettings.manifest
+@RESPATH@/components/PhoneNumberService.js
+@RESPATH@/components/PhoneNumberService.manifest
+@RESPATH@/components/PlacesCategoriesStarter.js
+@RESPATH@/components/pluginGlue.manifest
+@RESPATH@/components/ProcessSingleton.manifest
+@RESPATH@/components/MainProcessSingleton.js
+@RESPATH@/components/ContentProcessSingleton.js
+@RESPATH@/components/servicesComponents.manifest
+@RESPATH@/components/SettingsManager.js
+@RESPATH@/components/SettingsManager.manifest
+@RESPATH@/components/SiteSpecificUserAgent.js
+@RESPATH@/components/SiteSpecificUserAgent.manifest
+@RESPATH@/components/SlowScriptDebug.js
+@RESPATH@/components/SlowScriptDebug.manifest
+@RESPATH@/components/smileApplication.js
+@RESPATH@/components/smileApplication.manifest
+@RESPATH@/components/storage-json.js
+@RESPATH@/components/SuiteProfileMigrator.js
+@RESPATH@/components/SuiteProfileMigrator.manifest
 #ifdef MOZ_SERVICES_SYNC
-@BINPATH@/components/SyncComponents.manifest
+@RESPATH@/components/SyncComponents.manifest
 #endif
-@BINPATH@/components/TCPSocket.js
-@BINPATH@/components/TCPSocket.manifest
-@BINPATH@/components/TCPSocketParentIntermediary.js
-@BINPATH@/components/txEXSLTRegExFunctions.js
-@BINPATH@/components/txEXSLTRegExFunctions.manifest
-@BINPATH@/components/UnifiedComplete.manifest
-@BINPATH@/components/UnifiedComplete.js
+@RESPATH@/components/TCPSocket.js
+@RESPATH@/components/TCPSocket.manifest
+@RESPATH@/components/TCPSocketParentIntermediary.js
+@RESPATH@/components/txEXSLTRegExFunctions.js
+@RESPATH@/components/txEXSLTRegExFunctions.manifest
+@RESPATH@/components/UnifiedComplete.manifest
+@RESPATH@/components/UnifiedComplete.js
 #ifdef MOZ_SERVICES_SYNC
-@BINPATH@/components/Weave.js
+@RESPATH@/components/Weave.js
 #endif
-@BINPATH@/components/Webapps.js
-@BINPATH@/components/Webapps.manifest
-@BINPATH@/components/WebContentConverter.js
-@BINPATH@/components/XULStore.js
-@BINPATH@/components/XULStore.manifest
+@RESPATH@/components/Webapps.js
+@RESPATH@/components/Webapps.manifest
+@RESPATH@/components/WebContentConverter.js
+@RESPATH@/components/XULStore.js
+@RESPATH@/components/XULStore.manifest
 
 ; Modules
-@BINPATH@/modules/*
+@RESPATH@/modules/*
 
 ; [Browser Chrome Files]
-@BINPATH@/chrome/comm@JAREXT@
-@BINPATH@/chrome/comm.manifest
-@BINPATH@/chrome/toolkit@JAREXT@
-@BINPATH@/chrome/toolkit.manifest
+@RESPATH@/chrome/comm@JAREXT@
+@RESPATH@/chrome/comm.manifest
+@RESPATH@/chrome/toolkit@JAREXT@
+@RESPATH@/chrome/toolkit.manifest
 
 ; classic theme
-@BINPATH@/chrome/classic@JAREXT@
-@BINPATH@/chrome/classic.manifest
+@RESPATH@/chrome/classic@JAREXT@
+@RESPATH@/chrome/classic.manifest
 #ifdef MOZ_OMNIJAR
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 #else
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 #endif
 
 ; modern theme
 #ifdef MOZ_OMNIJAR
-@BINPATH@/extensions/modern@themes.mozilla.org.xpi
+@RESPATH@/extensions/modern@themes.mozilla.org.xpi
 #else
-@BINPATH@/extensions/modern@themes.mozilla.org/chrome/modern@JAREXT@
-@BINPATH@/extensions/modern@themes.mozilla.org/chrome.manifest
-@BINPATH@/extensions/modern@themes.mozilla.org/icon.png
-@BINPATH@/extensions/modern@themes.mozilla.org/install.rdf
-@BINPATH@/extensions/modern@themes.mozilla.org/preview.png
+@RESPATH@/extensions/modern@themes.mozilla.org/chrome/modern@JAREXT@
+@RESPATH@/extensions/modern@themes.mozilla.org/chrome.manifest
+@RESPATH@/extensions/modern@themes.mozilla.org/icon.png
+@RESPATH@/extensions/modern@themes.mozilla.org/install.rdf
+@RESPATH@/extensions/modern@themes.mozilla.org/preview.png
 #endif
 
 ; shell icons
 #ifdef MOZ_GTK2
-@BINPATH@/chrome/icons/default/bookmarkproperties.png
-@BINPATH@/chrome/icons/default/bookmarkproperties16.png
-@BINPATH@/chrome/icons/default/bookmarkproperties48.png
-@BINPATH@/chrome/icons/default/default.png
-@BINPATH@/chrome/icons/default/default16.png
-@BINPATH@/chrome/icons/default/default48.png
-@BINPATH@/chrome/icons/default/downloadManager.png
-@BINPATH@/chrome/icons/default/downloadManager16.png
-@BINPATH@/chrome/icons/default/downloadManager48.png
-@BINPATH@/chrome/icons/default/editorWindow.png
-@BINPATH@/chrome/icons/default/editorWindow16.png
-@BINPATH@/chrome/icons/default/editorWindow48.png
-@BINPATH@/chrome/icons/default/findBookmarkWindow.png
-@BINPATH@/chrome/icons/default/findBookmarkWindow16.png
-@BINPATH@/chrome/icons/default/findBookmarkWindow48.png
-@BINPATH@/chrome/icons/default/findHistoryWindow.png
-@BINPATH@/chrome/icons/default/findHistoryWindow16.png
-@BINPATH@/chrome/icons/default/findHistoryWindow48.png
-@BINPATH@/chrome/icons/default/history-window.png
-@BINPATH@/chrome/icons/default/history-window16.png
-@BINPATH@/chrome/icons/default/history-window48.png
-@BINPATH@/chrome/icons/default/JSConsoleWindow.png
-@BINPATH@/chrome/icons/default/JSConsoleWindow16.png
-@BINPATH@/chrome/icons/default/JSConsoleWindow48.png
-@BINPATH@/chrome/icons/default/main-window.png
-@BINPATH@/chrome/icons/default/main-window16.png
-@BINPATH@/chrome/icons/default/main-window48.png
-@BINPATH@/chrome/icons/default/places.png
-@BINPATH@/chrome/icons/default/places16.png
-@BINPATH@/chrome/icons/default/places48.png
-@BINPATH@/chrome/icons/default/seamonkey.png
+@RESPATH@/chrome/icons/default/bookmarkproperties.png
+@RESPATH@/chrome/icons/default/bookmarkproperties16.png
+@RESPATH@/chrome/icons/default/bookmarkproperties48.png
+@RESPATH@/chrome/icons/default/default.png
+@RESPATH@/chrome/icons/default/default16.png
+@RESPATH@/chrome/icons/default/default48.png
+@RESPATH@/chrome/icons/default/downloadManager.png
+@RESPATH@/chrome/icons/default/downloadManager16.png
+@RESPATH@/chrome/icons/default/downloadManager48.png
+@RESPATH@/chrome/icons/default/editorWindow.png
+@RESPATH@/chrome/icons/default/editorWindow16.png
+@RESPATH@/chrome/icons/default/editorWindow48.png
+@RESPATH@/chrome/icons/default/findBookmarkWindow.png
+@RESPATH@/chrome/icons/default/findBookmarkWindow16.png
+@RESPATH@/chrome/icons/default/findBookmarkWindow48.png
+@RESPATH@/chrome/icons/default/findHistoryWindow.png
+@RESPATH@/chrome/icons/default/findHistoryWindow16.png
+@RESPATH@/chrome/icons/default/findHistoryWindow48.png
+@RESPATH@/chrome/icons/default/history-window.png
+@RESPATH@/chrome/icons/default/history-window16.png
+@RESPATH@/chrome/icons/default/history-window48.png
+@RESPATH@/chrome/icons/default/JSConsoleWindow.png
+@RESPATH@/chrome/icons/default/JSConsoleWindow16.png
+@RESPATH@/chrome/icons/default/JSConsoleWindow48.png
+@RESPATH@/chrome/icons/default/main-window.png
+@RESPATH@/chrome/icons/default/main-window16.png
+@RESPATH@/chrome/icons/default/main-window48.png
+@RESPATH@/chrome/icons/default/places.png
+@RESPATH@/chrome/icons/default/places16.png
+@RESPATH@/chrome/icons/default/places48.png
+@RESPATH@/chrome/icons/default/seamonkey.png
 #ifdef MOZ_UPDATER
-@BINPATH@/icons/updater.png
+@RESPATH@/icons/updater.png
 #endif
 #elifdef XP_WIN32
-@BINPATH@/chrome/icons/default/bookmarkproperties.ico
-@BINPATH@/chrome/icons/default/downloadManager.ico
-@BINPATH@/chrome/icons/default/editorWindow.ico
-@BINPATH@/chrome/icons/default/findBookmarkWindow.ico
-@BINPATH@/chrome/icons/default/findHistoryWindow.ico
-@BINPATH@/chrome/icons/default/gif-file.ico
-@BINPATH@/chrome/icons/default/history-window.ico
-@BINPATH@/chrome/icons/default/html-file.ico
-@BINPATH@/chrome/icons/default/image-file.ico
-@BINPATH@/chrome/icons/default/jpeg-file.ico
-@BINPATH@/chrome/icons/default/JSConsoleWindow.ico
-@BINPATH@/chrome/icons/default/main-window.ico
-@BINPATH@/chrome/icons/default/misc-file.ico
-@BINPATH@/chrome/icons/default/places.ico
-@BINPATH@/chrome/icons/default/script-file.ico
-@BINPATH@/chrome/icons/default/xml-file.ico
-@BINPATH@/chrome/icons/default/xul-file.ico
+@RESPATH@/chrome/icons/default/bookmarkproperties.ico
+@RESPATH@/chrome/icons/default/downloadManager.ico
+@RESPATH@/chrome/icons/default/editorWindow.ico
+@RESPATH@/chrome/icons/default/findBookmarkWindow.ico
+@RESPATH@/chrome/icons/default/findHistoryWindow.ico
+@RESPATH@/chrome/icons/default/gif-file.ico
+@RESPATH@/chrome/icons/default/history-window.ico
+@RESPATH@/chrome/icons/default/html-file.ico
+@RESPATH@/chrome/icons/default/image-file.ico
+@RESPATH@/chrome/icons/default/jpeg-file.ico
+@RESPATH@/chrome/icons/default/JSConsoleWindow.ico
+@RESPATH@/chrome/icons/default/main-window.ico
+@RESPATH@/chrome/icons/default/misc-file.ico
+@RESPATH@/chrome/icons/default/places.ico
+@RESPATH@/chrome/icons/default/script-file.ico
+@RESPATH@/chrome/icons/default/xml-file.ico
+@RESPATH@/chrome/icons/default/xul-file.ico
 #endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
-@BINPATH@/@PREF_DIR@/browser-prefs.js
+@RESPATH@/@PREF_DIR@/browser-prefs.js
 #ifdef LIBXUL_SDK
-@BINPATH@/@PREF_DIR@/channel-prefs.js
+@RESPATH@/@PREF_DIR@/channel-prefs.js
 #endif
 #ifdef MOZ_SERVICES_SYNC
-@BINPATH@/@PREF_DIR@/services-sync.js
+@RESPATH@/@PREF_DIR@/services-sync.js
 #endif
-@BINPATH@/@PREF_DIR@/composer.js
-@BINPATH@/greprefs.js
-@BINPATH@/defaults/autoconfig/platform.js
-@BINPATH@/defaults/autoconfig/prefcalls.js
+@RESPATH@/@PREF_DIR@/composer.js
+@RESPATH@/greprefs.js
+@RESPATH@/defaults/autoconfig/platform.js
+@RESPATH@/defaults/autoconfig/prefcalls.js
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs. (Bug 756325)
-@BINPATH@/defaults/pref/channel-prefs.js
+@RESPATH@/defaults/pref/channel-prefs.js
 #endif
 
 ; [Layout Engine Resources]
 ; Layout debug extension.
 #ifdef ENABLE_TESTS
 #ifdef MOZ_DEBUG
-@BINPATH@/chrome/layoutdebug@JAREXT@
-@BINPATH@/chrome/layoutdebug.manifest
-@BINPATH@/components/layout_debug.xpt
+@RESPATH@/chrome/layoutdebug@JAREXT@
+@RESPATH@/chrome/layoutdebug.manifest
+@RESPATH@/components/layout_debug.xpt
 #endif
 #endif
 ; Style Sheets, Graphics and other Resources used by the layout engine.
-@BINPATH@/res/contenteditable.css
-@BINPATH@/res/designmode.css
-@BINPATH@/res/EditorOverride.css
-@BINPATH@/res/grabber.gif
-@BINPATH@/res/langGroups.properties
-@BINPATH@/res/language.properties
-@BINPATH@/res/svg.css
-@BINPATH@/res/table-add-column-after-active.gif
-@BINPATH@/res/table-add-column-after-hover.gif
-@BINPATH@/res/table-add-column-after.gif
-@BINPATH@/res/table-add-column-before-active.gif
-@BINPATH@/res/table-add-column-before-hover.gif
-@BINPATH@/res/table-add-column-before.gif
-@BINPATH@/res/table-add-row-after-active.gif
-@BINPATH@/res/table-add-row-after-hover.gif
-@BINPATH@/res/table-add-row-after.gif
-@BINPATH@/res/table-add-row-before-active.gif
-@BINPATH@/res/table-add-row-before-hover.gif
-@BINPATH@/res/table-add-row-before.gif
-@BINPATH@/res/table-remove-column-active.gif
-@BINPATH@/res/table-remove-column-hover.gif
-@BINPATH@/res/table-remove-column.gif
-@BINPATH@/res/table-remove-row-active.gif
-@BINPATH@/res/table-remove-row-hover.gif
-@BINPATH@/res/table-remove-row.gif
-@BINPATH@/res/ImageDocument.css
-@BINPATH@/res/TopLevelImageDocument.css
-@BINPATH@/res/TopLevelVideoDocument.css
-#ifdef XP_MACOSX
-@BINPATH@/res/cursors/*
-#endif
-@BINPATH@/res/fonts/*
-@BINPATH@/res/dtd/*
-@BINPATH@/res/html/*
-@BINPATH@/res/entityTables/*
+@RESPATH@/res/contenteditable.css
+@RESPATH@/res/designmode.css
+@RESPATH@/res/EditorOverride.css
+@RESPATH@/res/grabber.gif
+@RESPATH@/res/langGroups.properties
+@RESPATH@/res/language.properties
+@RESPATH@/res/svg.css
+@RESPATH@/res/table-add-column-after-active.gif
+@RESPATH@/res/table-add-column-after-hover.gif
+@RESPATH@/res/table-add-column-after.gif
+@RESPATH@/res/table-add-column-before-active.gif
+@RESPATH@/res/table-add-column-before-hover.gif
+@RESPATH@/res/table-add-column-before.gif
+@RESPATH@/res/table-add-row-after-active.gif
+@RESPATH@/res/table-add-row-after-hover.gif
+@RESPATH@/res/table-add-row-after.gif
+@RESPATH@/res/table-add-row-before-active.gif
+@RESPATH@/res/table-add-row-before-hover.gif
+@RESPATH@/res/table-add-row-before.gif
+@RESPATH@/res/table-remove-column-active.gif
+@RESPATH@/res/table-remove-column-hover.gif
+@RESPATH@/res/table-remove-column.gif
+@RESPATH@/res/table-remove-row-active.gif
+@RESPATH@/res/table-remove-row-hover.gif
+@RESPATH@/res/table-remove-row.gif
+@RESPATH@/res/ImageDocument.css
+@RESPATH@/res/TopLevelImageDocument.css
+@RESPATH@/res/TopLevelVideoDocument.css
+#ifdef XP_MACOSX
+@RESPATH@/res/cursors/*
+#endif
+@RESPATH@/res/fonts/*
+@RESPATH@/res/dtd/*
+@RESPATH@/res/html/*
+@RESPATH@/res/entityTables/*
 #ifdef XP_MACOSX
-@BINPATH@/res/MainMenu.nib/
+@RESPATH@/res/MainMenu.nib/
 #endif
 
 ; [Personal Security Manager]
@@ -678,45 +679,29 @@
 ; meaning their .chk files are created there directly.
 ;
 #ifndef MOZ_NATIVE_NSS
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@freebl3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nss3@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#endif
 #ifndef NSS_DISABLE_DBM
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
 #endif
-#endif
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
-#ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@softokn3@DLL_SUFFIX@
-#else
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
-#endif
-@BINPATH@/chrome/pippki@JAREXT@
-@BINPATH@/chrome/pippki.manifest
-@BINPATH@/components/pipboot.xpt
-@BINPATH@/components/pipnss.xpt
-@BINPATH@/components/pippki.xpt
+@RESPATH@/chrome/pippki@JAREXT@
+@RESPATH@/chrome/pippki.manifest
+@RESPATH@/components/pipboot.xpt
+@RESPATH@/components/pipnss.xpt
+@RESPATH@/components/pippki.xpt
 
 ; For process sandboxing
+#if defined(MOZ_SANDBOX)
 #if defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
-#elif defined(XP_LINUX)
-#if defined(MOZ_CONTENT_SANDBOX) || defined(MOZ_GMP_SANDBOX)
-@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
 #endif
 #endif
 
@@ -728,16 +713,12 @@
 #endif
 
 ; LDAP components need to be in the browser for AutoConfig
-@BINPATH@/components/mozldap.xpt
-@BINPATH@/components/nsLDAPProtocolHandler.js
+@RESPATH@/components/mozldap.xpt
+@RESPATH@/components/nsLDAPProtocolHandler.js
 #ifdef XP_WIN32
 @BINPATH@/nsldap32v60.dll
 @BINPATH@/nsldappr32v60.dll
 @BINPATH@/nsldif32v60.dll
-#elif defined(XP_MACOSX)
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@ldap60@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@ldif60@DLL_SUFFIX@
-@APPNAME@/Contents/MacOS/@DLL_PREFIX@prldap60@DLL_SUFFIX@
 #else
 @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
@@ -748,7 +729,7 @@
 ;
 #ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/updater.app/
+@BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
@@ -757,19 +738,19 @@
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
-@BINPATH@/components/CrashService.manifest
-@BINPATH@/components/CrashService.js
-@BINPATH@/components/toolkit_crashservice.xpt
+@RESPATH@/components/CrashService.manifest
+@RESPATH@/components/CrashService.js
+@RESPATH@/components/toolkit_crashservice.xpt
 #ifdef XP_MACOSX
-@APPNAME@/Contents/MacOS/crashreporter.app/
+@BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
-@BINPATH@/crashreporter.ini
+@RESPATH@/crashreporter.ini
 #ifdef XP_UNIX
-@BINPATH@/Throbber-small.gif
+@RESPATH@/Throbber-small.gif
 #endif
 #endif
-@BINPATH@/crashreporter-override.ini
+@RESPATH@/crashreporter-override.ini
 #ifdef MOZ_CRASHREPORTER_INJECTOR
 @BINPATH@/breakpadinjector.dll
 #endif
@@ -777,83 +758,83 @@
 
 [mail]
 ; MailNews component xpts
-@BINPATH@/components/addrbook.xpt
-@BINPATH@/components/nsAddrbook.manifest
-@BINPATH@/components/fts3tok.xpt
-@BINPATH@/components/import.xpt
-@BINPATH@/components/ldapComponents.manifest
-@BINPATH@/components/mailview.xpt
-@BINPATH@/components/mime.xpt
+@RESPATH@/components/addrbook.xpt
+@RESPATH@/components/nsAddrbook.manifest
+@RESPATH@/components/fts3tok.xpt
+@RESPATH@/components/import.xpt
+@RESPATH@/components/ldapComponents.manifest
+@RESPATH@/components/mailview.xpt
+@RESPATH@/components/mime.xpt
 #ifdef MOZ_MAPI_SUPPORT
-@BINPATH@/components/mapihook.xpt
+@RESPATH@/components/mapihook.xpt
 #endif
-@BINPATH@/components/msgbase.xpt
-@BINPATH@/components/msgBase.manifest
-@BINPATH@/components/msgcompose.xpt
-@BINPATH@/components/msgdb.xpt
-@BINPATH@/components/msgimap.xpt
-@BINPATH@/components/msglocal.xpt
-@BINPATH@/components/msgnews.xpt
-@BINPATH@/components/msgsearch.xpt
-@BINPATH@/components/msgsmime.xpt
+@RESPATH@/components/msgbase.xpt
+@RESPATH@/components/msgBase.manifest
+@RESPATH@/components/msgcompose.xpt
+@RESPATH@/components/msgdb.xpt
+@RESPATH@/components/msgimap.xpt
+@RESPATH@/components/msglocal.xpt
+@RESPATH@/components/msgnews.xpt
+@RESPATH@/components/msgsearch.xpt
+@RESPATH@/components/msgsmime.xpt
 
 ; MailNews JS components
-@BINPATH@/components/mdn-service.js
-@BINPATH@/components/mdn-service.manifest
-@BINPATH@/components/mimeJSComponents.js
-@BINPATH@/components/msgAsyncPrompter.js
-@BINPATH@/components/msgMime.manifest
-@BINPATH@/components/newsblog.js
-@BINPATH@/components/newsblog.manifest
-@BINPATH@/components/nsAbAutoCompleteMyDomain.js
-@BINPATH@/components/nsAbAutoCompleteSearch.js
-@BINPATH@/components/nsAbLDAPAttributeMap.js
-@BINPATH@/components/nsAbLDAPAutoCompleteSearch.js
-@BINPATH@/components/nsMailNewsCommandLineHandler.js
-@BINPATH@/components/nsMsgTraitService.js
-@BINPATH@/components/nsMsgTraitService.manifest
-@BINPATH@/components/nsNewsAutoCompleteSearch.js
-@BINPATH@/components/nsNewsAutoCompleteSearch.manifest
-@BINPATH@/components/nsSMTPProtocolHandler.js
-@BINPATH@/components/nsSMTPProtocolHandler.manifest
-@BINPATH@/components/offlineStartup.js
-@BINPATH@/components/offlineStartup.manifest
-@BINPATH@/components/smime-service.js
-@BINPATH@/components/smime-service.manifest
+@RESPATH@/components/mdn-service.js
+@RESPATH@/components/mdn-service.manifest
+@RESPATH@/components/mimeJSComponents.js
+@RESPATH@/components/msgAsyncPrompter.js
+@RESPATH@/components/msgMime.manifest
+@RESPATH@/components/newsblog.js
+@RESPATH@/components/newsblog.manifest
+@RESPATH@/components/nsAbAutoCompleteMyDomain.js
+@RESPATH@/components/nsAbAutoCompleteSearch.js
+@RESPATH@/components/nsAbLDAPAttributeMap.js
+@RESPATH@/components/nsAbLDAPAutoCompleteSearch.js
+@RESPATH@/components/nsMailNewsCommandLineHandler.js
+@RESPATH@/components/nsMsgTraitService.js
+@RESPATH@/components/nsMsgTraitService.manifest
+@RESPATH@/components/nsNewsAutoCompleteSearch.js
+@RESPATH@/components/nsNewsAutoCompleteSearch.manifest
+@RESPATH@/components/nsSMTPProtocolHandler.js
+@RESPATH@/components/nsSMTPProtocolHandler.manifest
+@RESPATH@/components/offlineStartup.js
+@RESPATH@/components/offlineStartup.manifest
+@RESPATH@/components/smime-service.js
+@RESPATH@/components/smime-service.manifest
 
 ; MailNews chrome
-@BINPATH@/chrome/messenger@JAREXT@
-@BINPATH@/chrome/messenger.manifest
-@BINPATH@/chrome/newsblog@JAREXT@
-@BINPATH@/chrome/newsblog.manifest
+@RESPATH@/chrome/messenger@JAREXT@
+@RESPATH@/chrome/messenger.manifest
+@RESPATH@/chrome/newsblog@JAREXT@
+@RESPATH@/chrome/newsblog.manifest
 #ifdef MOZ_GTK2
-@BINPATH@/chrome/icons/default/abcardWindow.png
-@BINPATH@/chrome/icons/default/abcardWindow16.png
-@BINPATH@/chrome/icons/default/abcardWindow48.png
-@BINPATH@/chrome/icons/default/ablistWindow.png
-@BINPATH@/chrome/icons/default/ablistWindow16.png
-@BINPATH@/chrome/icons/default/ablistWindow48.png
-@BINPATH@/chrome/icons/default/addressbookWindow.png
-@BINPATH@/chrome/icons/default/addressbookWindow16.png
-@BINPATH@/chrome/icons/default/addressbookWindow48.png
-@BINPATH@/chrome/icons/default/messengerWindow.png
-@BINPATH@/chrome/icons/default/messengerWindow16.png
-@BINPATH@/chrome/icons/default/messengerWindow48.png
-@BINPATH@/chrome/icons/default/msgcomposeWindow.png
-@BINPATH@/chrome/icons/default/msgcomposeWindow16.png
-@BINPATH@/chrome/icons/default/msgcomposeWindow48.png
+@RESPATH@/chrome/icons/default/abcardWindow.png
+@RESPATH@/chrome/icons/default/abcardWindow16.png
+@RESPATH@/chrome/icons/default/abcardWindow48.png
+@RESPATH@/chrome/icons/default/ablistWindow.png
+@RESPATH@/chrome/icons/default/ablistWindow16.png
+@RESPATH@/chrome/icons/default/ablistWindow48.png
+@RESPATH@/chrome/icons/default/addressbookWindow.png
+@RESPATH@/chrome/icons/default/addressbookWindow16.png
+@RESPATH@/chrome/icons/default/addressbookWindow48.png
+@RESPATH@/chrome/icons/default/messengerWindow.png
+@RESPATH@/chrome/icons/default/messengerWindow16.png
+@RESPATH@/chrome/icons/default/messengerWindow48.png
+@RESPATH@/chrome/icons/default/msgcomposeWindow.png
+@RESPATH@/chrome/icons/default/msgcomposeWindow16.png
+@RESPATH@/chrome/icons/default/msgcomposeWindow48.png
 #elifdef XP_WIN32
-@BINPATH@/chrome/icons/default/abcardWindow.ico
-@BINPATH@/chrome/icons/default/ablistWindow.ico
-@BINPATH@/chrome/icons/default/addressbookWindow.ico
-@BINPATH@/chrome/icons/default/messengerWindow.ico
-@BINPATH@/chrome/icons/default/msgcomposeWindow.ico
+@RESPATH@/chrome/icons/default/abcardWindow.ico
+@RESPATH@/chrome/icons/default/ablistWindow.ico
+@RESPATH@/chrome/icons/default/addressbookWindow.ico
+@RESPATH@/chrome/icons/default/messengerWindow.ico
+@RESPATH@/chrome/icons/default/msgcomposeWindow.ico
 #endif
 
 ; [MailNews Default Preferences]
-@BINPATH@/@PREF_DIR@/mailnews.js
-@BINPATH@/@PREF_DIR@/mdn.js
-@BINPATH@/@PREF_DIR@/smime.js
+@RESPATH@/@PREF_DIR@/mailnews.js
+@RESPATH@/@PREF_DIR@/mdn.js
+@RESPATH@/@PREF_DIR@/smime.js
 
 #ifdef MOZ_MAPI_SUPPORT
 @BINPATH@/MapiProxy.dll
@@ -861,24 +842,24 @@
 #endif
 
 #ifdef MOZ_MOVEMAIL
-@BINPATH@/isp/movemail.rdf
+@RESPATH@/isp/movemail.rdf
 #endif
-@BINPATH@/isp/rss.rdf
-@BINPATH@/isp/Bogofilter.sfd
-@BINPATH@/isp/DSPAM.sfd
-@BINPATH@/isp/POPFile.sfd
-@BINPATH@/isp/SpamAssassin.sfd
-@BINPATH@/isp/SpamPal.sfd
+@RESPATH@/isp/rss.rdf
+@RESPATH@/isp/Bogofilter.sfd
+@RESPATH@/isp/DSPAM.sfd
+@RESPATH@/isp/POPFile.sfd
+@RESPATH@/isp/SpamAssassin.sfd
+@RESPATH@/isp/SpamPal.sfd
 
 ; Gloda
-@BINPATH@/chrome/gloda@JAREXT@
-@BINPATH@/chrome/gloda.manifest
-@BINPATH@/components/glautocomp.js
-@BINPATH@/components/jsmimeemitter.js
-@BINPATH@/components/gloda.manifest
+@RESPATH@/chrome/gloda@JAREXT@
+@RESPATH@/chrome/gloda.manifest
+@RESPATH@/components/glautocomp.js
+@RESPATH@/components/jsmimeemitter.js
+@RESPATH@/components/gloda.manifest
 
 ; New message notification
-@BINPATH@/components/newMailNotificationService.js
+@RESPATH@/components/newMailNotificationService.js
 
 ; Address Sanitizer
 #ifdef MOZ_ASAN
@@ -892,56 +873,56 @@
 
 [chatzilla]
 #ifdef MOZ_OMNIJAR
-@BINPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
+@RESPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
 #else
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
 #ifdef MOZ_GTK2
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
 #elifdef XP_WIN32
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
 #endif
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
 #endif
 #ifdef LOCALE_BUILD
 #ifdef MOZ_OMNIJAR
-@BINPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
+@RESPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
 #else
-@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
-@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
-@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
-@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
 #endif
 #endif
 
 [inspector]
 #ifdef MOZ_OMNIJAR
-@BINPATH@/distribution/extensions/inspector@mozilla.org.xpi
+@RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
 #else
-@BINPATH@/extensions/inspector@mozilla.org/install.rdf
-@BINPATH@/extensions/inspector@mozilla.org/chrome.manifest
-@BINPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
+@RESPATH@/extensions/inspector@mozilla.org/install.rdf
+@RESPATH@/extensions/inspector@mozilla.org/chrome.manifest
+@RESPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
 #ifdef MOZ_GTK2
-@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
-@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
+@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
+@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
 #elifdef XP_WIN32
-@BINPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
+@RESPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
 #endif
-@BINPATH@/extensions/inspector@mozilla.org/components/components.list
-@BINPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
-@BINPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+@RESPATH@/extensions/inspector@mozilla.org/components/components.list
+@RESPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+@RESPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
 #endif
 
 [debugqa]
 #ifdef MOZ_PACKAGE_DEBUGQA
 #ifdef MOZ_OMNIJAR
-@BINPATH@/distribution/extensions/debugQA@mozilla.org.xpi
+@RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #else
-@BINPATH@/extensions/debugQA@mozilla.org/install.rdf
-@BINPATH@/extensions/debugQA@mozilla.org/chrome.manifest
-@BINPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
+@RESPATH@/extensions/debugQA@mozilla.org/install.rdf
+@RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
+@RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
 #endif
 #endif
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/common/dataman/dataman.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/common/dataman/dataman.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/common/dataman/dataman.properties	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/common/dataman/dataman.properties	2014-11-26 21:44:57.000000000 +0000
@@ -32,6 +32,7 @@
 perm.stylesheet.label=Load Stylesheets
 perm.sts/use.label=Use Strict Transport Security
 perm.sts/subd.label=Apply Strict Transport Security to subdomains
+perm.trackingprotection.label=Tracking Activity
 
 perm.type.default=Select a type
 
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/common/notification.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/common/notification.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/common/notification.properties	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/common/notification.properties	2014-11-26 21:44:58.000000000 +0000
@@ -16,14 +16,10 @@
 carbonfailurepluginsMessage.button.accesskey=R
 
 missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
-missingpluginsMessage.button.label=Install Missing Plugins…
-missingpluginsMessage.button.accesskey=I
 
 blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
 blockedpluginsMessage.infoButton.label=Details…
 blockedpluginsMessage.infoButton.accesskey=D
-blockedpluginsMessage.searchButton.label=Update Plugins…
-blockedpluginsMessage.searchButton.accesskey=U
 
 crashedpluginsMessage.title=The %S plugin has crashed.
 crashedpluginsMessage.reloadButton.label=Reload page
@@ -184,8 +180,10 @@
 SecurityTitle=Security Warning
 MixedContentMessage=You have requested an encrypted page that contains some unencrypted information. Information that you see or enter on this page could easily be read by a third party.
 MixedActiveContentMessage=You have requested an encrypted page that contains insecure information. Information that you see or enter on this page could easily be read by a third party.
+TrackingContentMessage=Parts of this page may be tracking your online activity.
 MixedDisplayContentMessage=You have requested a page that is only partially encrypted and does not prevent eavesdropping.
 BlockedActiveContentMessage=Insecure information on this page was blocked.
+BlockedTrackingContentMessage=Parts of the page that track your online activity were blocked.
 BlockedDisplayContentMessage=Unencrypted information on this page was blocked.
 EnterInsecureMessage=You have left an encrypted page. Information you send or receive from now on could easily be read by a third party.
 EnterSecureMessage=You have requested an encrypted page. The website has identified itself correctly, and information you see or enter on this page can't easily be read by a third party.
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/common/pref/pref-security.dtd thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/common/pref/pref-security.dtd
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/common/pref/pref-security.dtd	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/common/pref/pref-security.dtd	2014-11-26 21:44:58.000000000 +0000
@@ -12,6 +12,8 @@
 <!ENTITY doNotTrack.accesskey             "T">
 <!ENTITY trackProtect.label               "Prevent tracking activities by known sites">
 <!ENTITY trackProtect.accesskey           "n">
+<!ENTITY warnTrackContent.label           "Warn me when known tracking activities were detected">
+<!ENTITY warnTrackContent.accesskey       "W">
 
 <!ENTITY geoLocation.label                "Location Aware Browsing">
 <!ENTITY geoIntro.label                   "Websites may request more information about your current location.">
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/mailnews/charsetTitles.properties thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/locales/en-US/chrome/mailnews/charsetTitles.properties	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/locales/en-US/chrome/mailnews/charsetTitles.properties	2014-11-26 21:44:58.000000000 +0000
@@ -35,21 +35,17 @@
 euc-jp.title = Japanese (EUC-JP)
 big5.title = Chinese Traditional (Big5)
 big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
-x-euc-tw.title = Chinese Traditional (EUC-TW)
 gb2312.title = Chinese Simplified (GB2312)
 hz-gb-2312.title = Chinese Simplified (HZ)
 gbk.title = Chinese Simplified (GBK)
-iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
-iso-2022-kr.title = Korean (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16LE)
 utf-16be.title = Unicode (UTF-16BE)
 iso-8859-5.title = Cyrillic (ISO-8859-5)
-iso-ir-111.title = Cyrillic (ISO-IR-111)
 windows-1251.title = Cyrillic (Windows-1251)
 x-mac-cyrillic.title = Cyrillic (MacCyrillic)
 x-mac-ukrainian.title = Cyrillic/Ukrainian (MacUkrainian)
@@ -63,7 +59,6 @@
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
-ibm874.title = Thai (IBM-874)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-6-i.title = Arabic (ISO-8859-6-I)
@@ -75,11 +70,6 @@
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined
 ibm866.title = Cyrillic/Russian (CP-866)
-ibm850.title = Western (IBM-850)
-ibm852.title = Central European (IBM-852)
-ibm855.title = Cyrillic (IBM-855)
-ibm857.title = Turkish (IBM-857)
-ibm862.title = Hebrew (IBM-862)
 gb18030.title = Chinese Simplified (GB18030)
 x-mac-arabic.title = Arabic (MacArabic)
 x-mac-farsi.title = Farsi (MacFarsi)
@@ -88,7 +78,6 @@
 x-mac-gujarati.title = Gujarati (MacGujarati)
 x-mac-gurmukhi.title = Gurmukhi (MacGurmukhi)
 
-
 chardet.off.title                           = (Off)
 chardet.universal_charset_detector.title    = Universal
 chardet.ja_parallel_state_machine.title     = Japanese
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/mailnews/addrbook/abCommon.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/mailnews/addrbook/abCommon.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/mailnews/addrbook/abCommon.js	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/mailnews/addrbook/abCommon.js	2014-11-26 21:44:58.000000000 +0000
@@ -504,10 +504,19 @@
 
 function goEditListDialog(abCard, listURI)
 {
+  var params = {
+    abCard: abCard,
+    listURI: listURI,
+    refresh: false, // This is an out param, true if OK in dialog is clicked.
+  };
+
   window.openDialog("chrome://messenger/content/addressbook/abEditListDialog.xul",
                     "",
                     "chrome,modal,resizable,centerscreen",
-                    {abCard:abCard, listURI:listURI});
+                    params);
+
+  if (params.refresh)
+    ChangeDirectoryByURI(listURI); // force refresh
 }
 
 function goNewCardDialog(selectedAB)
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/mailnews/addrbook/abListOverlay.xul thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/mailnews/addrbook/abListOverlay.xul
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/mailnews/addrbook/abListOverlay.xul	2014-11-14 09:36:39.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/mailnews/addrbook/abListOverlay.xul	2014-11-26 21:44:58.000000000 +0000
@@ -17,7 +17,6 @@
   <script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
   <script type="application/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
-  <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
 
 <vbox id="editlist">
   <grid>
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/mailnews/prefs/pref-mailnews.js thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/mailnews/prefs/pref-mailnews.js
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/mailnews/prefs/pref-mailnews.js	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/mailnews/prefs/pref-mailnews.js	2014-11-26 21:44:58.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 if ("@mozilla.org/suite/shell-service;1" in Components.classes)
-  const nsIShellService = Components.interfaces.nsIShellService;
+  var nsIShellService = Components.interfaces.nsIShellService;
 
 function Startup()
 {
diff -Nru thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/shell/src/nsMacShellService.cpp thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/shell/src/nsMacShellService.cpp
--- thunderbird-trunk-36.0~a1~hg20141114r17084.215607/suite/shell/src/nsMacShellService.cpp	2014-11-14 09:36:40.000000000 +0000
+++ thunderbird-trunk-36.0~a1~hg20141126r17147.217518/suite/shell/src/nsMacShellService.cpp	2014-11-26 21:44:58.000000000 +0000
@@ -243,7 +243,9 @@
     loadContext = do_QueryInterface(docShell);
   }
 
-  return wbp->SaveURI(imageURI, nullptr, docURI, nullptr, nullptr,
+  return wbp->SaveURI(imageURI, nullptr, docURI,
+                      content->OwnerDoc()->GetReferrerPolicy(),
+                      nullptr, nullptr,
                       mBackgroundFile, loadContext);
 }